diff --git a/package.bak/4th/0001-avoid-regen-during-install.patch b/package.bak/4th/0001-avoid-regen-during-install.patch deleted file mode 100644 index 436cff1fd6..0000000000 --- a/package.bak/4th/0001-avoid-regen-during-install.patch +++ /dev/null @@ -1,17 +0,0 @@ -avoid regen during install - -Signed-off-by: Francois Perrad - ---- a/sources/Makefile -+++ b/sources/Makefile -@@ -120,7 +120,7 @@ - ln -sf $(SHARED_LIB) $(LIBRARIES)/lib4th.so - endif - --mostlyinstall: libinstall all -+mostlyinstall: libinstall - cp 4th 4tsh pp4th $(BINARIES) - - install: mostlyinstall --- - diff --git a/package.bak/4th/4th.hash b/package.bak/4th/4th.hash deleted file mode 100644 index 97083da8f6..0000000000 --- a/package.bak/4th/4th.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 1c7adbb1a56dad4c4c781e6e023d77ac862842560c05246b691d07e9a4460ab2 4th-3.62.4-unix.tar.gz diff --git a/package.bak/4th/4th.mk b/package.bak/4th/4th.mk deleted file mode 100644 index f272e02808..0000000000 --- a/package.bak/4th/4th.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# 4th -# -################################################################################ - -4TH_VERSION = 3.62.4 -4TH_SOURCE = 4th-$(4TH_VERSION)-unix.tar.gz -4TH_SITE = http://downloads.sourceforge.net/project/forth-4th/4th-$(4TH_VERSION) -4TH_LICENSE = GPL-3.0+, LGPL-3.0+ -# The COPYING file only contains the text of the LGPL-3.0, but the -# source code really contains parts under GPL-3.0+. -4TH_LICENSE_FILES = COPYING -4TH_DEPENDENCIES = host-4th -4TH_INSTALL_STAGING = YES - -4TH_CFLAGS = $(TARGET_CFLAGS) -DUNIX -fsigned-char - -ifeq ($(BR2_STATIC_LIBS),y) -4TH_MAKE_ENV = $(TARGET_MAKE_ENV) STATIC=1 -else -4TH_MAKE_ENV = $(TARGET_MAKE_ENV) SHARED=1 -4TH_CFLAGS += -fPIC -endif - -define 4TH_BUILD_CMDS - $(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources all \ - CROSS="$(TARGET_CROSS)" \ - CFLAGS="$(4TH_CFLAGS)" \ - FOURTH=$(HOST_DIR)/bin/4th -endef - -define 4TH_INSTALL_STAGING_CMDS - $(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources libinstall \ - LIBRARIES=$(STAGING_DIR)/usr/lib - $(INSTALL) -D -m 0644 $(@D)/sources/4th.h \ - $(STAGING_DIR)/usr/include/4th.h -endef - -define 4TH_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/bin - mkdir -p $(TARGET_DIR)/usr/lib - $(4TH_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \ - BINARIES=$(TARGET_DIR)/usr/bin \ - LIBRARIES=$(TARGET_DIR)/usr/lib - mkdir -p $(TARGET_DIR)/usr/share/4th/lib - cp -dpf $(@D)/4th/*.4th $(TARGET_DIR)/usr/share/4th - cp -dpf $(@D)/4th/lib/*.4th $(TARGET_DIR)/usr/share/4th/lib - mkdir -p $(TARGET_DIR)/usr/share/4th/demo - cp -dpf $(@D)/4th/demo/*.4th $(TARGET_DIR)/usr/share/4th/demo - mkdir -p $(TARGET_DIR)/usr/share/4th/4pp/lib - cp -dpf $(@D)/4th/4pp/*.4pp $(TARGET_DIR)/usr/share/4th/4pp - cp -dpf $(@D)/4th/4pp/lib/*.4pp $(TARGET_DIR)/usr/share/4th/4pp/lib -endef - -define HOST_4TH_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources all \ - CFLAGS="$(HOST_CFLAGS) -DUNIX -fsigned-char" -endef - -define HOST_4TH_INSTALL_CMDS - mkdir -p $(HOST_DIR)/bin - mkdir -p $(HOST_DIR)/lib - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sources mostlyinstall \ - BINARIES=$(HOST_DIR)/bin \ - LIBRARIES=$(HOST_DIR)/lib -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/4th/Config.in b/package.bak/4th/Config.in deleted file mode 100644 index 4554664ab4..0000000000 --- a/package.bak/4th/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_4TH - bool "4th" - help - 4tH is a Forth compiler that can create bytecode, - C-embeddable bytecode, standalone executables, but also - works fine as a scripting language - - http://thebeez.home.xs4all.nl/4tH/ diff --git a/package.bak/Config.in b/package.bak/Config.in deleted file mode 100644 index 3200c43907..0000000000 --- a/package.bak/Config.in +++ /dev/null @@ -1,1826 +0,0 @@ -menu "Target packages" - - source "package/busybox/Config.in" - source "package/skeleton/Config.in" - -menu "Audio and video applications" - source "package/alsa-utils/Config.in" - source "package/aumix/Config.in" - source "package/bellagio/Config.in" - source "package/dvblast/Config.in" - source "package/dvdauthor/Config.in" - source "package/dvdrw-tools/Config.in" - source "package/espeak/Config.in" - source "package/faad2/Config.in" - source "package/ffmpeg/Config.in" - source "package/flac/Config.in" - source "package/flite/Config.in" - source "package/gmrender-resurrect/Config.in" - source "package/gstreamer/Config.in" - source "package/gstreamer1/Config.in" - source "package/jack2/Config.in" - source "package/kodi/Config.in" - source "package/lame/Config.in" - source "package/madplay/Config.in" - source "package/mimic/Config.in" - source "package/miraclecast/Config.in" - source "package/mjpegtools/Config.in" - source "package/modplugtools/Config.in" - source "package/motion/Config.in" - source "package/mpd/Config.in" - source "package/mpd-mpc/Config.in" - source "package/mpg123/Config.in" - source "package/mplayer/Config.in" - source "package/mpv/Config.in" - source "package/multicat/Config.in" - source "package/musepack/Config.in" - source "package/ncmpc/Config.in" - source "package/omxplayer/Config.in" - source "package/on2-8170-libs/Config.in" - source "package/opus-tools/Config.in" - source "package/pulseaudio/Config.in" - source "package/sox/Config.in" - source "package/squeezelite/Config.in" - source "package/tidsp-binaries/Config.in" - source "package/tovid/Config.in" - source "package/tstools/Config.in" - source "package/twolame/Config.in" - source "package/udpxy/Config.in" - source "package/upmpdcli/Config.in" - source "package/v4l2grab/Config.in" - source "package/vlc/Config.in" - source "package/vorbis-tools/Config.in" - source "package/wavpack/Config.in" - source "package/yavta/Config.in" - source "package/ympd/Config.in" -endmenu - -menu "Compressors and decompressors" - source "package/bzip2/Config.in" - source "package/gzip/Config.in" - source "package/lz4/Config.in" - source "package/lzip/Config.in" - source "package/lzop/Config.in" - source "package/p7zip/Config.in" - source "package/unrar/Config.in" - source "package/unzip/Config.in" - source "package/xz/Config.in" - source "package/zip/Config.in" -endmenu - -menu "Debugging, profiling and benchmark" - source "package/blktrace/Config.in" - source "package/bonnie/Config.in" - source "package/cache-calibrator/Config.in" - source "package/dhrystone/Config.in" - source "package/dmalloc/Config.in" - source "package/dropwatch/Config.in" - source "package/dstat/Config.in" - source "package/dt/Config.in" - source "package/duma/Config.in" - source "package/fio/Config.in" - source "package/fwts/Config.in" - source "package/gdb/Config.in" - source "package/google-breakpad/Config.in" - source "package/iozone/Config.in" - source "package/kexec/Config.in" - source "package/kexec-lite/Config.in" - source "package/ktap/Config.in" - source "package/kvm-unit-tests/Config.in" - source "package/kyua/Config.in" - source "package/latencytop/Config.in" - source "package/lmbench/Config.in" - source "package/lsof/Config.in" - source "package/ltp-testsuite/Config.in" - source "package/ltrace/Config.in" - 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/netsniff-ng/Config.in" - source "package/nmon/Config.in" - source "package/oprofile/Config.in" - source "package/pax-utils/Config.in" - source "package/pv/Config.in" - source "package/racehound/Config.in" - source "package/ramsmp/Config.in" - source "package/ramspeed/Config.in" - source "package/rt-tests/Config.in" - source "package/spidev_test/Config.in" - source "package/strace/Config.in" - source "package/stress/Config.in" - source "package/stress-ng/Config.in" - source "package/sysdig/Config.in" - source "package/sysprof/Config.in" - source "package/tinymembench/Config.in" - source "package/trace-cmd/Config.in" - source "package/trinity/Config.in" - source "package/uclibc-ng-test/Config.in" - source "package/valgrind/Config.in" - source "package/whetstone/Config.in" -endmenu - -menu "Development tools" - source "package/binutils/Config.in" - source "package/bsdiff/Config.in" - source "package/bustle/Config.in" - source "package/check/Config.in" - source "package/cmake/Config.in" - source "package/cppunit/Config.in" - source "package/cvs/Config.in" - source "package/cxxtest/Config.in" - source "package/diffutils/Config.in" - source "package/dos2unix/Config.in" - source "package/findutils/Config.in" - source "package/flex/Config.in" - source "package/gawk/Config.in" - source "package/gettext/Config.in" - source "package/git/Config.in" - source "package/git-crypt/Config.in" - source "package/gperf/Config.in" - source "package/grep/Config.in" - source "package/jq/Config.in" - source "package/libtool/Config.in" - source "package/make/Config.in" - source "package/patch/Config.in" - source "package/pkgconf/Config.in" - source "package/sed/Config.in" - source "package/subversion/Config.in" - source "package/tree/Config.in" - source "package/yasm/Config.in" -endmenu - -menu "Filesystem and flash utilities" - source "package/aufs/Config.in" - source "package/aufs-util/Config.in" - source "package/autofs/Config.in" - source "package/btrfs-progs/Config.in" - source "package/cifs-utils/Config.in" - source "package/cpio/Config.in" - source "package/cramfs/Config.in" - source "package/curlftpfs/Config.in" - source "package/dosfstools/Config.in" - source "package/e2fsprogs/Config.in" - source "package/e2tools/Config.in" - source "package/ecryptfs-utils/Config.in" - source "package/exfat/Config.in" - source "package/exfat-utils/Config.in" - source "package/f2fs-tools/Config.in" - source "package/flashbench/Config.in" - source "package/fwup/Config.in" - source "package/genext2fs/Config.in" - source "package/genpart/Config.in" - source "package/genromfs/Config.in" - source "package/mmc-utils/Config.in" - source "package/mtd/Config.in" - source "package/mtools/Config.in" - source "package/nfs-utils/Config.in" - source "package/ntfs-3g/Config.in" - source "package/simicsfs/Config.in" - source "package/sp-oops-extract/Config.in" - source "package/squashfs/Config.in" - source "package/sshfs/Config.in" - source "package/sunxi-tools/Config.in" - source "package/unionfs/Config.in" - source "package/xfsprogs/Config.in" -endmenu - -menu "Fonts, cursors, icons, sounds and themes" - -comment "Cursors" - source "package/comix-cursors/Config.in" - source "package/obsidian-cursors/Config.in" - -comment "Fonts" - source "package/bitstream-vera/Config.in" - source "package/cantarell/Config.in" - source "package/dejavu/Config.in" - source "package/font-awesome/Config.in" - source "package/ghostscript-fonts/Config.in" - source "package/inconsolata/Config.in" - source "package/liberation/Config.in" - -comment "Icons" - source "package/adwaita-icon-theme/Config.in" - source "package/google-material-design-icons/Config.in" - source "package/hicolor-icon-theme/Config.in" - -comment "Sounds" - source "package/sound-theme-borealis/Config.in" - source "package/sound-theme-freedesktop/Config.in" - -comment "Themes" - source "package/gtk2-engines/Config.in" - -endmenu - -menu "Games" - source "package/chocolate-doom/Config.in" - source "package/doom-wad/Config.in" - source "package/gnuchess/Config.in" - source "package/lbreakout2/Config.in" - source "package/ltris/Config.in" - source "package/opentyrian/Config.in" - source "package/opentyrian-data/Config.in" - source "package/prboom/Config.in" - source "package/rubix/Config.in" - source "package/sl/Config.in" - source "package/stella/Config.in" - source "package/supertuxkart/Config.in" -endmenu - -menu "Graphic libraries and applications (graphic/text)" - -comment "Graphic applications" - source "package/expedite/Config.in" - source "package/fswebcam/Config.in" - source "package/glmark2/Config.in" - source "package/gnuplot/Config.in" - source "package/jhead/Config.in" - source "package/mesa3d-demos/Config.in" - source "package/qt5cinex/Config.in" - source "package/rrdtool/Config.in" - -comment "Graphic libraries" - source "package/cegui06/Config.in" - source "package/directfb/Config.in" - source "package/directfb-examples/Config.in" - source "package/efl/Config.in" - source "package/fbdump/Config.in" - source "package/fbgrab/Config.in" - source "package/fbset/Config.in" - source "package/fb-test-app/Config.in" - source "package/fbterm/Config.in" - source "package/fbv/Config.in" - source "package/freerdp/Config.in" - source "package/imagemagick/Config.in" - source "package/linux-fusion/Config.in" - source "package/lite/Config.in" - source "package/mesa3d/Config.in" - source "package/mesa3d-headers/Config.in" - source "package/ocrad/Config.in" - source "package/psplash/Config.in" - source "package/sdl/Config.in" - source "package/sdl_gfx/Config.in" - source "package/sdl_image/Config.in" - source "package/sdl_mixer/Config.in" - source "package/sdl_net/Config.in" - source "package/sdl_sound/Config.in" - source "package/sdl_ttf/Config.in" - source "package/sdl2/Config.in" - source "package/sdl2_gfx/Config.in" - source "package/sdl2_image/Config.in" - source "package/sdl2_ttf/Config.in" - -comment "Other GUIs" - source "package/qt/Config.in" - source "package/qt5/Config.in" -if BR2_PACKAGE_QT || BR2_PACKAGE_QT5 -comment "QT libraries and helper libraries" - source "package/grantlee/Config.in" - source "package/qextserialport/Config.in" - source "package/qjson/Config.in" - source "package/qtuio/Config.in" - source "package/quazip/Config.in" - source "package/qwt/Config.in" -endif - source "package/tekui/Config.in" - source "package/weston/Config.in" - source "package/x11r7/Config.in" - -comment "X applications" - depends on BR2_PACKAGE_XORG7 - - source "package/alsamixergui/Config.in" - source "package/apitrace/Config.in" - source "package/dillo/Config.in" - source "package/docker/Config.in" - source "package/feh/Config.in" - source "package/gmpc/Config.in" - source "package/gqview/Config.in" - source "package/gtkperf/Config.in" - source "package/leafpad/Config.in" - source "package/midori/Config.in" - source "package/nodm/Config.in" - source "package/pcmanfm/Config.in" - source "package/qt-webkit-kiosk/Config.in" - source "package/rdesktop/Config.in" - source "package/synergy/Config.in" - source "package/wmctrl/Config.in" - source "package/x11vnc/Config.in" - source "package/xdotool/Config.in" - source "package/xscreensaver/Config.in" - source "package/xterm/Config.in" - source "package/xvkbd/Config.in" - source "package/yad/Config.in" - -comment "X libraries and helper libraries" - depends on BR2_PACKAGE_XORG7 - - source "package/libsexy/Config.in" - source "package/x11r7/xkeyboard-config/Config.in" - -comment "X window managers" - depends on BR2_PACKAGE_XORG7 - - source "package/enlightenment/Config.in" - source "package/fluxbox/Config.in" - source "package/matchbox/Config.in" - source "package/metacity/Config.in" - source "package/openbox/Config.in" -endmenu - -menu "Hardware handling" -menu "Firmware" - source "package/am33x-cm3/Config.in" - source "package/b43-firmware/Config.in" - source "package/linux-firmware/Config.in" - source "package/rpi-firmware/Config.in" - source "package/sunxi-boards/Config.in" - source "package/ts4900-fpga/Config.in" - source "package/ux500-firmware/Config.in" - source "package/wilc1000-firmware/Config.in" - source "package/zd1211-firmware/Config.in" -endmenu - source "package/a10disp/Config.in" - source "package/acpica/Config.in" - source "package/acpid/Config.in" - source "package/acpitool/Config.in" - source "package/aer-inject/Config.in" - source "package/am335x-pru-package/Config.in" - source "package/amd-catalyst/Config.in" - source "package/avrdude/Config.in" - source "package/bcache-tools/Config.in" - source "package/biosdevname/Config.in" - source "package/cbootimage/Config.in" - source "package/cc-tool/Config.in" - source "package/cdrkit/Config.in" - source "package/cryptsetup/Config.in" - source "package/cwiid/Config.in" - source "package/dbus/Config.in" - source "package/dbus-cpp/Config.in" - source "package/dbus-glib/Config.in" - source "package/dbus-python/Config.in" - source "package/dbus-triggerd/Config.in" - source "package/devmem2/Config.in" - source "package/dmidecode/Config.in" - source "package/dmraid/Config.in" - source "package/dtv-scan-tables/Config.in" - source "package/dvb-apps/Config.in" - source "package/dvbsnoop/Config.in" - source "package/edid-decode/Config.in" - source "package/eeprog/Config.in" - source "package/eudev/Config.in" - source "package/ev3dev-linux-drivers/Config.in" - source "package/evemu/Config.in" - source "package/evtest/Config.in" - source "package/fan-ctrl/Config.in" - source "package/fbtft/Config.in" - source "package/fconfig/Config.in" - source "package/fis/Config.in" - source "package/flashrom/Config.in" - source "package/fmtools/Config.in" - source "package/freescale-imx/Config.in" - source "package/fxload/Config.in" - source "package/gadgetfs-test/Config.in" - source "package/gpm/Config.in" - source "package/gpsd/Config.in" - source "package/gptfdisk/Config.in" - source "package/gvfs/Config.in" - source "package/hdparm/Config.in" - source "package/hwdata/Config.in" - source "package/hwloc/Config.in" - source "package/i2c-tools/Config.in" - source "package/i7z/Config.in" - source "package/input-event-daemon/Config.in" - source "package/input-tools/Config.in" - source "package/intel-microcode/Config.in" - source "package/iostat/Config.in" - source "package/ipmitool/Config.in" - source "package/ipmiutil/Config.in" - source "package/iqvlinux/Config.in" - source "package/irda-utils/Config.in" - source "package/iucode-tool/Config.in" - source "package/kbd/Config.in" - source "package/lcdproc/Config.in" - source "package/libuio/Config.in" - source "package/libump/Config.in" - source "package/linux-backports/Config.in" - source "package/lirc-tools/Config.in" - source "package/lm-sensors/Config.in" - source "package/lshw/Config.in" - source "package/lsuio/Config.in" - source "package/lvm2/Config.in" - source "package/mali-t76x/Config.in" - source "package/mdadm/Config.in" - source "package/memtest86/Config.in" - source "package/memtester/Config.in" - source "package/minicom/Config.in" - source "package/msr-tools/Config.in" - source "package/nanocom/Config.in" - source "package/neard/Config.in" - source "package/nvidia-driver/Config.in" - source "package/nvidia-tegra23/Config.in" - source "package/nvme/Config.in" - source "package/odroid-mali/Config.in" - source "package/odroid-scripts/Config.in" - source "package/ofono/Config.in" - source "package/ola/Config.in" - source "package/on2-8170-modules/Config.in" - source "package/open2300/Config.in" - source "package/openipmi/Config.in" - source "package/openocd/Config.in" - source "package/openpowerlink/Config.in" - source "package/owl-linux/Config.in" - source "package/parted/Config.in" - source "package/pciutils/Config.in" - source "package/pdbg/Config.in" - source "package/picocom/Config.in" - source "package/pifmrds/Config.in" - source "package/powertop/Config.in" - source "package/pps-tools/Config.in" - source "package/pru-software-support/Config.in" - source "package/pulseview/Config.in" - source "package/read-edid/Config.in" - source "package/rfkill/Config.in" - source "package/rng-tools/Config.in" - source "package/rpi-armmem/Config.in" - source "package/rpi-userland/Config.in" - source "package/rs485conf/Config.in" - source "package/rtl8188eu/Config.in" - source "package/rtl8723bs/Config.in" - source "package/rtl8821au/Config.in" - source "package/sane-backends/Config.in" - source "package/sdparm/Config.in" - source "package/setserial/Config.in" - source "package/sg3_utils/Config.in" - source "package/sigrok-cli/Config.in" - source "package/sispmctl/Config.in" - source "package/smartmontools/Config.in" - source "package/smstools3/Config.in" - source "package/spi-tools/Config.in" - source "package/sredird/Config.in" - source "package/statserial/Config.in" - source "package/stm32flash/Config.in" - source "package/sunxi-cedarx/Config.in" - source "package/sunxi-mali/Config.in" - source "package/sysstat/Config.in" - source "package/targetcli-fb/Config.in" - source "package/ti-gfx/Config.in" - source "package/ti-sgx-demos/Config.in" - source "package/ti-sgx-km/Config.in" - source "package/ti-sgx-um/Config.in" - source "package/ti-uim/Config.in" - source "package/ti-utils/Config.in" - source "package/triggerhappy/Config.in" - source "package/uboot-tools/Config.in" - source "package/ubus/Config.in" - source "package/udev/Config.in" - source "package/udisks/Config.in" - source "package/upower/Config.in" - source "package/usb_modeswitch/Config.in" - source "package/usb_modeswitch_data/Config.in" - source "package/usbmount/Config.in" - source "package/usbutils/Config.in" - source "package/w_scan/Config.in" - source "package/wf111/Config.in" - source "package/wipe/Config.in" - source "package/xorriso/Config.in" -endmenu - -menu "Interpreter languages and scripting" - source "package/4th/Config.in" - source "package/enscript/Config.in" - source "package/erlang/Config.in" -if BR2_PACKAGE_ERLANG -menu "Erlang libraries/modules" - source "package/erlang-goldrush/Config.in" - source "package/erlang-lager/Config.in" - source "package/erlang-p1-cache-tab/Config.in" - source "package/erlang-p1-iconv/Config.in" - source "package/erlang-p1-sip/Config.in" - source "package/erlang-p1-stringprep/Config.in" - source "package/erlang-p1-stun/Config.in" - source "package/erlang-p1-tls/Config.in" - source "package/erlang-p1-utils/Config.in" - source "package/erlang-p1-xml/Config.in" - source "package/erlang-p1-yaml/Config.in" - source "package/erlang-p1-zlib/Config.in" -endmenu -endif - source "package/ficl/Config.in" - source "package/gauche/Config.in" - source "package/guile/Config.in" - source "package/haserl/Config.in" - source "package/jamvm/Config.in" - source "package/jimtcl/Config.in" - source "package/lua/Config.in" - source "package/luainterpreter/Config.in" - source "package/luajit/Config.in" -if BR2_PACKAGE_HAS_LUAINTERPRETER && !BR2_STATIC_LIBS -# lua modules are dynamically loaded, so not available on static builds -menu "Lua libraries/modules" - source "package/argparse/Config.in" - source "package/cgilua/Config.in" - source "package/copas/Config.in" - source "package/cosmo/Config.in" - source "package/coxpcall/Config.in" - source "package/dado/Config.in" - source "package/easydbus/Config.in" - source "package/lbase64/Config.in" - source "package/ljlinenoise/Config.in" - source "package/ljsyscall/Config.in" - source "package/lpeg/Config.in" - source "package/lpty/Config.in" - source "package/lrandom/Config.in" - source "package/lsqlite3/Config.in" - source "package/lua-cjson/Config.in" - source "package/lua-coat/Config.in" - source "package/lua-coatpersistent/Config.in" - source "package/lua-csnappy/Config.in" - source "package/lua-ev/Config.in" - source "package/lua-iconv/Config.in" - source "package/lua-messagepack/Config.in" - source "package/lua-msgpack-native/Config.in" - source "package/lua-periphery/Config.in" - source "package/lua-testmore/Config.in" - source "package/luabitop/Config.in" - source "package/luacrypto/Config.in" - source "package/luaexpat/Config.in" - source "package/luaexpatutils/Config.in" - source "package/luafilesystem/Config.in" - source "package/luajson/Config.in" - source "package/lualogging/Config.in" - source "package/luaposix/Config.in" - source "package/luasec/Config.in" - source "package/luasocket/Config.in" - source "package/luasql-sqlite3/Config.in" - source "package/lunit/Config.in" - source "package/luv/Config.in" - source "package/luvi/Config.in" - source "package/lzlib/Config.in" - source "package/orbit/Config.in" - source "package/rings/Config.in" - source "package/turbolua/Config.in" - source "package/wsapi/Config.in" - source "package/xavante/Config.in" -endmenu -endif - source "package/lutok/Config.in" - source "package/micropython/Config.in" - source "package/micropython-lib/Config.in" - source "package/moarvm/Config.in" - source "package/mono/Config.in" -if BR2_PACKAGE_MONO -menu "Mono libraries/modules" - source "package/mono-gtksharp3/Config.in" -endmenu -endif - source "package/nodejs/Config.in" - source "package/perl/Config.in" -if BR2_PACKAGE_PERL -menu "Perl libraries/modules" - source "package/perl-crypt-openssl-random/Config.in" - source "package/perl-crypt-openssl-rsa/Config.in" - source "package/perl-datetime-tiny/Config.in" - source "package/perl-digest-hmac/Config.in" - source "package/perl-digest-sha1/Config.in" - source "package/perl-encode-detect/Config.in" - source "package/perl-encode-locale/Config.in" - source "package/perl-file-listing/Config.in" - source "package/perl-file-util/Config.in" - source "package/perl-gd/Config.in" - source "package/perl-gdgraph/Config.in" - source "package/perl-gdtextutil/Config.in" - source "package/perl-html-parser/Config.in" - source "package/perl-html-tagset/Config.in" - source "package/perl-http-cookies/Config.in" - source "package/perl-http-daemon/Config.in" - source "package/perl-http-date/Config.in" - source "package/perl-http-message/Config.in" - source "package/perl-http-negotiate/Config.in" - source "package/perl-io-html/Config.in" - source "package/perl-io-socket-ssl/Config.in" - source "package/perl-json-tiny/Config.in" - source "package/perl-libwww-perl/Config.in" - source "package/perl-lwp-mediatypes/Config.in" - source "package/perl-mail-dkim/Config.in" - source "package/perl-mailtools/Config.in" - source "package/perl-mime-base64/Config.in" - source "package/perl-mojolicious/Config.in" - source "package/perl-net-dns/Config.in" - source "package/perl-net-http/Config.in" - source "package/perl-net-ssleay/Config.in" - source "package/perl-netaddr-ip/Config.in" - source "package/perl-path-tiny/Config.in" - source "package/perl-time-hires/Config.in" - source "package/perl-timedate/Config.in" - source "package/perl-try-tiny/Config.in" - source "package/perl-uri/Config.in" - source "package/perl-www-robotrules/Config.in" - source "package/perl-xml-libxml/Config.in" - source "package/perl-xml-namespacesupport/Config.in" - source "package/perl-xml-sax/Config.in" - source "package/perl-xml-sax-base/Config.in" -endmenu -endif - source "package/php/Config.in" -if BR2_PACKAGE_PHP -if !BR2_STATIC_LIBS -menu "External php extensions" - source "package/php-amqp/Config.in" - source "package/php-geoip/Config.in" - source "package/php-gnupg/Config.in" - source "package/php-imagick/Config.in" - source "package/php-memcached/Config.in" - source "package/php-ssh2/Config.in" - source "package/php-yaml/Config.in" - source "package/php-zmq/Config.in" -endmenu -endif -if BR2_STATIC_LIBS -comment "External PHP extensions need a toolchain w/ dynamic library" -endif -endif - source "package/python/Config.in" - source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 -menu "External python modules" - source "package/python-alsaaudio/Config.in" - source "package/python-argh/Config.in" - source "package/python-arrow/Config.in" - source "package/python-attrs/Config.in" - source "package/python-autobahn/Config.in" - source "package/python-babel/Config.in" - source "package/python-backports-abc/Config.in" - source "package/python-beautifulsoup4/Config.in" - source "package/python-bitstring/Config.in" - source "package/python-bottle/Config.in" - source "package/python-can/Config.in" - source "package/python-cbor/Config.in" - source "package/python-certifi/Config.in" - source "package/python-cffi/Config.in" - source "package/python-characteristic/Config.in" - source "package/python-chardet/Config.in" - source "package/python-cheetah/Config.in" - source "package/python-cherrypy/Config.in" - source "package/python-click/Config.in" - source "package/python-coherence/Config.in" - source "package/python-configobj/Config.in" - source "package/python-configshell-fb/Config.in" - source "package/python-constantly/Config.in" - source "package/python-couchdb/Config.in" - source "package/python-crc16/Config.in" - source "package/python-crcmod/Config.in" - source "package/python-crossbar/Config.in" - source "package/python-cryptography/Config.in" - source "package/python-cssselect/Config.in" - source "package/python-cssutils/Config.in" - source "package/python-daemon/Config.in" - source "package/python-dataproperty/Config.in" - source "package/python-dateutil/Config.in" - source "package/python-dialog/Config.in" - source "package/python-dialog3/Config.in" - source "package/python-dicttoxml/Config.in" - source "package/python-django/Config.in" - source "package/python-docopt/Config.in" - source "package/python-docutils/Config.in" - source "package/python-dominate/Config.in" - source "package/python-dpkt/Config.in" - source "package/python-ecdsa/Config.in" - source "package/python-engineio/Config.in" - source "package/python-enum/Config.in" - source "package/python-enum34/Config.in" - source "package/python-flask/Config.in" - source "package/python-flask-babel/Config.in" - source "package/python-flask-jsonrpc/Config.in" - source "package/python-flask-login/Config.in" - source "package/python-flup/Config.in" - source "package/python-functools32/Config.in" - source "package/python-futures/Config.in" - source "package/python-gobject/Config.in" - source "package/python-gunicorn/Config.in" - source "package/python-html5lib/Config.in" - source "package/python-httplib2/Config.in" - source "package/python-humanize/Config.in" - source "package/python-id3/Config.in" - source "package/python-idna/Config.in" - source "package/python-incremental/Config.in" - source "package/python-iniparse/Config.in" - source "package/python-iowait/Config.in" - source "package/python-ipaddr/Config.in" - source "package/python-ipaddress/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-jsonschema/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-lmdb/Config.in" - source "package/python-logbook/Config.in" - source "package/python-lxml/Config.in" - source "package/python-mad/Config.in" - source "package/python-mako/Config.in" - source "package/python-markdown/Config.in" - source "package/python-markdown2/Config.in" - source "package/python-markupsafe/Config.in" - source "package/python-mbstrdecoder/Config.in" - source "package/python-meld3/Config.in" - source "package/python-mistune/Config.in" - source "package/python-msgpack/Config.in" - source "package/python-mutagen/Config.in" - source "package/python-mwclient/Config.in" - source "package/python-mwscrape/Config.in" - source "package/python-mwscrape2slob/Config.in" - source "package/python-netaddr/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-paho-mqtt/Config.in" - source "package/python-pam/Config.in" - source "package/python-paramiko/Config.in" - source "package/python-pathpy/Config.in" - source "package/python-pathtools/Config.in" - source "package/python-pathvalidate/Config.in" - source "package/python-pexpect/Config.in" - source "package/python-pillow/Config.in" - source "package/python-picamera/Config.in" - source "package/python-posix-ipc/Config.in" - source "package/python-prompt-toolkit/Config.in" - source "package/python-protobuf/Config.in" - source "package/python-psutil/Config.in" - source "package/python-ptyprocess/Config.in" - source "package/python-pudb/Config.in" - source "package/python-pyasn/Config.in" - source "package/python-pyasn-modules/Config.in" - source "package/python-pycli/Config.in" - source "package/python-pycparser/Config.in" - source "package/python-pycrypto/Config.in" - source "package/python-pycurl/Config.in" - source "package/python-pydal/Config.in" - source "package/python-pyelftools/Config.in" - source "package/python-pyftpdlib/Config.in" - source "package/python-pygame/Config.in" - source "package/python-pygments/Config.in" - source "package/python-pyicu/Config.in" - source "package/python-pyinotify/Config.in" - source "package/python-pylru/Config.in" - source "package/python-pymongo/Config.in" - source "package/python-pymysql/Config.in" - source "package/python-pynacl/Config.in" - source "package/python-pyopenssl/Config.in" - source "package/python-pyparsing/Config.in" - source "package/python-pyparted/Config.in" - source "package/python-pypcap/Config.in" - source "package/python-pyqrcode/Config.in" - source "package/python-pyqt/Config.in" - source "package/python-pyqt5/Config.in" - source "package/python-pyratemp/Config.in" - source "package/python-pyro/Config.in" - source "package/python-pyroute2/Config.in" - source "package/python-pysendfile/Config.in" - source "package/python-pysmb/Config.in" - source "package/python-pysnmp/Config.in" - source "package/python-pysnmp-apps/Config.in" - source "package/python-pysnmp-mibs/Config.in" - source "package/python-pysocks/Config.in" - source "package/python-pytablereader/Config.in" - source "package/python-pytablewriter/Config.in" - source "package/python-pytrie/Config.in" - source "package/python-pytz/Config.in" - source "package/python-pyudev/Config.in" - source "package/python-pyusb/Config.in" - source "package/python-pyxb/Config.in" - source "package/python-pyyaml/Config.in" - source "package/python-pyzmq/Config.in" - source "package/python-requests/Config.in" - source "package/python-requests-toolbelt/Config.in" - source "package/python-rpi-gpio/Config.in" - source "package/python-rtslib-fb/Config.in" - source "package/python-scapy3k/Config.in" - source "package/python-sdnotify/Config.in" - source "package/python-serial/Config.in" - source "package/python-service-identity/Config.in" - source "package/python-setproctitle/Config.in" - source "package/python-setuptools/Config.in" - source "package/python-sh/Config.in" - source "package/python-shutilwhich/Config.in" - source "package/python-simpleaudio/Config.in" - source "package/python-simplejson/Config.in" - source "package/python-singledispatch/Config.in" - source "package/python-sip/Config.in" - source "package/python-six/Config.in" - source "package/python-slob/Config.in" - source "package/python-smbus-cffi/Config.in" - source "package/python-socketio/Config.in" - source "package/python-spidev/Config.in" - source "package/python-thrift/Config.in" - source "package/python-tomako/Config.in" - source "package/python-toml/Config.in" - source "package/python-tornado/Config.in" - source "package/python-treq/Config.in" - source "package/python-twisted/Config.in" - source "package/python-txaio/Config.in" - source "package/python-u-msgpack/Config.in" - source "package/python-ubjson/Config.in" - source "package/python-ujson/Config.in" - source "package/python-urllib3/Config.in" - source "package/python-urwid/Config.in" - source "package/python-versiontools/Config.in" - source "package/python-watchdog/Config.in" - source "package/python-wcwidth/Config.in" - source "package/python-web2py/Config.in" - source "package/python-webpy/Config.in" - source "package/python-werkzeug/Config.in" - source "package/python-whoosh/Config.in" - source "package/python-ws4py/Config.in" - source "package/python-wsaccel/Config.in" - source "package/python-xlrd/Config.in" - source "package/python-xlsxwriter/Config.in" - source "package/python-xlutils/Config.in" - source "package/python-xlwt/Config.in" - source "package/python-zope-interface/Config.in" -endmenu -endif - source "package/ruby/Config.in" - source "package/tcl/Config.in" -if BR2_PACKAGE_TCL -menu "Tcl libraries/modules" - source "package/expect/Config.in" - source "package/tcllib/Config.in" -endmenu -endif -endmenu - -menu "Libraries" - -menu "Audio/Sound" - source "package/alsa-lib/Config.in" - source "package/aubio/Config.in" - source "package/audiofile/Config.in" - source "package/celt051/Config.in" - source "package/fdk-aac/Config.in" - source "package/libao/Config.in" - source "package/libasplib/Config.in" - source "package/libbroadvoice/Config.in" - source "package/libcdaudio/Config.in" - source "package/libcddb/Config.in" - source "package/libcdio/Config.in" - source "package/libcodec2/Config.in" - source "package/libcue/Config.in" - source "package/libcuefile/Config.in" - source "package/libebur128/Config.in" - source "package/libg7221/Config.in" - source "package/libgsm/Config.in" - source "package/libid3tag/Config.in" - source "package/libilbc/Config.in" - source "package/liblo/Config.in" - source "package/libmad/Config.in" - source "package/libmodplug/Config.in" - source "package/libmpd/Config.in" - source "package/libmpdclient/Config.in" - source "package/libreplaygain/Config.in" - source "package/libsamplerate/Config.in" - source "package/libsidplay2/Config.in" - source "package/libsilk/Config.in" - source "package/libsndfile/Config.in" - source "package/libsoundtouch/Config.in" - source "package/libsoxr/Config.in" - source "package/libvorbis/Config.in" - source "package/mp4v2/Config.in" - source "package/openal/Config.in" - source "package/opencore-amr/Config.in" - source "package/opus/Config.in" - source "package/opusfile/Config.in" - source "package/portaudio/Config.in" - source "package/sbc/Config.in" - source "package/speex/Config.in" - source "package/taglib/Config.in" - source "package/tinyalsa/Config.in" - source "package/tremor/Config.in" - source "package/vo-aacenc/Config.in" - source "package/webrtc-audio-processing/Config.in" -endmenu - -menu "Compression and decompression" - source "package/libarchive/Config.in" - source "package/libsquish/Config.in" - source "package/libzip/Config.in" - source "package/lzo/Config.in" - source "package/minizip/Config.in" - source "package/snappy/Config.in" - source "package/szip/Config.in" - source "package/zlib/Config.in" -endmenu - -menu "Crypto" - source "package/beecrypt/Config.in" - source "package/botan/Config.in" - source "package/ca-certificates/Config.in" - source "package/cryptodev/Config.in" - source "package/gcr/Config.in" - source "package/gnutls/Config.in" - source "package/libassuan/Config.in" - source "package/libgcrypt/Config.in" - source "package/libgpg-error/Config.in" - source "package/libgpgme/Config.in" - source "package/libksba/Config.in" - source "package/libmcrypt/Config.in" - source "package/libmhash/Config.in" - source "package/libnss/Config.in" - source "package/libsecret/Config.in" - source "package/libsha1/Config.in" - source "package/libsodium/Config.in" - source "package/libssh/Config.in" - source "package/libssh2/Config.in" - source "package/libtomcrypt/Config.in" - source "package/libuecc/Config.in" - source "package/mbedtls/Config.in" - source "package/nettle/Config.in" - source "package/openssl/Config.in" - source "package/polarssl/Config.in" - source "package/tinydtls/Config.in" - source "package/trousers/Config.in" - source "package/ustream-ssl/Config.in" -endmenu - -menu "Database" - source "package/berkeleydb/Config.in" - source "package/cppdb/Config.in" - source "package/gdbm/Config.in" - source "package/hiredis/Config.in" - source "package/kompexsqlite/Config.in" - source "package/leveldb/Config.in" - source "package/libpqxx/Config.in" - source "package/mongodb/Config.in" - source "package/mysql/Config.in" - source "package/postgresql/Config.in" - source "package/redis/Config.in" - source "package/sqlcipher/Config.in" - source "package/sqlite/Config.in" - source "package/unixodbc/Config.in" -endmenu - -menu "Filesystem" - source "package/gamin/Config.in" - source "package/libconfig/Config.in" - source "package/libconfuse/Config.in" - source "package/libfuse/Config.in" - source "package/liblockfile/Config.in" - source "package/libnfs/Config.in" - source "package/libsysfs/Config.in" - source "package/lockdev/Config.in" -endmenu - -menu "Graphics" - source "package/assimp/Config.in" - source "package/atk/Config.in" - source "package/atkmm/Config.in" - source "package/bullet/Config.in" - source "package/cairo/Config.in" - source "package/cairomm/Config.in" - source "package/exiv2/Config.in" - source "package/fltk/Config.in" - source "package/fontconfig/Config.in" - source "package/freetype/Config.in" - source "package/gd/Config.in" - source "package/gdk-pixbuf/Config.in" - source "package/giblib/Config.in" - source "package/giflib/Config.in" - source "package/granite/Config.in" - source "package/graphite2/Config.in" - source "package/gtkmm3/Config.in" - source "package/gtksourceview/Config.in" - source "package/harfbuzz/Config.in" - source "package/ijs/Config.in" - source "package/imlib2/Config.in" - source "package/jasper/Config.in" - source "package/jpeg/Config.in" - source "package/kmsxx/Config.in" - source "package/lcms2/Config.in" - source "package/lesstif/Config.in" - source "package/libart/Config.in" - source "package/libdmtx/Config.in" - source "package/libdri2/Config.in" - source "package/libdrm/Config.in" - source "package/libepoxy/Config.in" - source "package/libexif/Config.in" - source "package/libfm/Config.in" - source "package/libfm-extra/Config.in" - source "package/libfreeglut/Config.in" - source "package/libfreeimage/Config.in" - source "package/libgdiplus/Config.in" - source "package/libgeotiff/Config.in" - source "package/libglade/Config.in" - source "package/libglew/Config.in" - source "package/libglfw/Config.in" - source "package/libglu/Config.in" - source "package/libgtk2/Config.in" - source "package/libgtk3/Config.in" - source "package/libmng/Config.in" - source "package/libpng/Config.in" - source "package/libqrencode/Config.in" - source "package/libraw/Config.in" - source "package/librsvg/Config.in" - source "package/libsoil/Config.in" - source "package/libsvg/Config.in" - source "package/libsvg-cairo/Config.in" - source "package/libsvgtiny/Config.in" - source "package/libva/Config.in" - source "package/libva-intel-driver/Config.in" - source "package/libvdpau/Config.in" - source "package/libvips/Config.in" - source "package/menu-cache/Config.in" - source "package/opencv/Config.in" - source "package/opencv3/Config.in" - source "package/opengl/Config.in" - source "package/openjpeg/Config.in" - source "package/pango/Config.in" - source "package/pangomm/Config.in" - source "package/pixman/Config.in" - source "package/poppler/Config.in" - source "package/powervr/Config.in" - source "package/tiff/Config.in" - source "package/wayland/Config.in" - source "package/wayland-protocols/Config.in" - source "package/webkitgtk/Config.in" - source "package/webp/Config.in" - source "package/zbar/Config.in" - source "package/zxing-cpp/Config.in" -endmenu - -menu "Hardware handling" - source "package/acsccid/Config.in" - source "package/bcm2835/Config.in" - source "package/c-periphery/Config.in" - source "package/ccid/Config.in" - source "package/dtc/Config.in" - source "package/gnu-efi/Config.in" - source "package/hidapi/Config.in" - source "package/lcdapi/Config.in" - source "package/libaio/Config.in" - source "package/libatasmart/Config.in" - source "package/libcec/Config.in" - source "package/libfreefare/Config.in" - source "package/libftdi/Config.in" - source "package/libftdi1/Config.in" - source "package/libgpiod/Config.in" - source "package/libgudev/Config.in" - source "package/libhid/Config.in" - source "package/libiio/Config.in" - source "package/libinput/Config.in" - source "package/libiqrf/Config.in" - source "package/libllcp/Config.in" - source "package/libmbim/Config.in" - source "package/libnfc/Config.in" - source "package/libpciaccess/Config.in" - source "package/libphidget/Config.in" - source "package/libqmi/Config.in" - source "package/libraw1394/Config.in" - source "package/librtas/Config.in" - source "package/librtlsdr/Config.in" - source "package/libserial/Config.in" - source "package/libserialport/Config.in" - source "package/libsigrok/Config.in" - source "package/libsigrokdecode/Config.in" - source "package/libsoc/Config.in" - source "package/libusb/Config.in" - source "package/libusb-compat/Config.in" - source "package/libusbgx/Config.in" - source "package/libv4l/Config.in" - source "package/libxkbcommon/Config.in" - source "package/mraa/Config.in" - source "package/mtdev/Config.in" - source "package/ne10/Config.in" - source "package/neardal/Config.in" - source "package/owfs/Config.in" - source "package/pcsc-lite/Config.in" - source "package/tslib/Config.in" - source "package/urg/Config.in" - source "package/wiringpi/Config.in" -endmenu - -menu "Javascript" - source "package/angularjs/Config.in" -if BR2_PACKAGE_ANGULARJS -menu "External AngularJS plugins" - source "package/angular-websocket/Config.in" -endmenu -endif - source "package/bootstrap/Config.in" - source "package/explorercanvas/Config.in" - source "package/flot/Config.in" - source "package/jquery/Config.in" -if BR2_PACKAGE_JQUERY -menu "External jQuery plugins" - source "package/jquery-datetimepicker/Config.in" - source "package/jquery-keyboard/Config.in" - source "package/jquery-mobile/Config.in" - source "package/jquery-sidebar/Config.in" - source "package/jquery-sparkline/Config.in" - source "package/jquery-ui/Config.in" - source "package/jquery-ui-themes/Config.in" - source "package/jquery-validation/Config.in" -endmenu -endif - source "package/jsmin/Config.in" - source "package/json-javascript/Config.in" -endmenu - -menu "JSON/XML" - source "package/benejson/Config.in" - source "package/cjson/Config.in" - source "package/expat/Config.in" - source "package/ezxml/Config.in" - source "package/jansson/Config.in" - source "package/jsmn/Config.in" - source "package/json-c/Config.in" - source "package/json-glib/Config.in" - source "package/jsoncpp/Config.in" - source "package/libfastjson/Config.in" - source "package/libjson/Config.in" - source "package/libroxml/Config.in" - source "package/libucl/Config.in" - source "package/libxml2/Config.in" - source "package/libxmlpp/Config.in" - source "package/libxmlrpc/Config.in" - source "package/libxslt/Config.in" - source "package/libyaml/Config.in" - source "package/mxml/Config.in" - source "package/pugixml/Config.in" - source "package/rapidjson/Config.in" - source "package/rapidxml/Config.in" - source "package/raptor/Config.in" - source "package/tinyxml/Config.in" - source "package/tinyxml2/Config.in" - source "package/valijson/Config.in" - source "package/xerces/Config.in" - source "package/yajl/Config.in" - source "package/yaml-cpp/Config.in" -endmenu - -menu "Logging" - source "package/eventlog/Config.in" - source "package/glog/Config.in" - source "package/liblog4c-localtime/Config.in" - source "package/liblogging/Config.in" - source "package/log4cplus/Config.in" - source "package/log4cpp/Config.in" - source "package/log4cxx/Config.in" - source "package/zlog/Config.in" -endmenu - -menu "Multimedia" - source "package/bitstream/Config.in" - source "package/libaacs/Config.in" - source "package/libamcodec/Config.in" - source "package/libass/Config.in" - source "package/libbdplus/Config.in" - source "package/libbluray/Config.in" - source "package/libdcadec/Config.in" - source "package/libdvbcsa/Config.in" - source "package/libdvbpsi/Config.in" - source "package/libdvbsi/Config.in" - source "package/libdvdcss/Config.in" - source "package/libdvdnav/Config.in" - source "package/libdvdread/Config.in" - source "package/libebml/Config.in" - source "package/libhdhomerun/Config.in" - source "package/libimxvpuapi/Config.in" - source "package/libmatroska/Config.in" - source "package/libmms/Config.in" - source "package/libmpeg2/Config.in" - source "package/libogg/Config.in" - source "package/libopenh264/Config.in" - source "package/libplayer/Config.in" - source "package/libtheora/Config.in" - source "package/libvpx/Config.in" - source "package/libyuv/Config.in" - source "package/live555/Config.in" - source "package/mediastreamer/Config.in" - source "package/x264/Config.in" - source "package/x265/Config.in" -endmenu - -menu "Networking" - source "package/agentpp/Config.in" - source "package/alljoyn/Config.in" - source "package/alljoyn-base/Config.in" - source "package/alljoyn-tcl/Config.in" - source "package/alljoyn-tcl-base/Config.in" - source "package/batman-adv/Config.in" - source "package/c-ares/Config.in" - source "package/canfestival/Config.in" - source "package/cgic/Config.in" - source "package/cppzmq/Config.in" - source "package/czmq/Config.in" - source "package/filemq/Config.in" - source "package/flickcurl/Config.in" - source "package/fmlib/Config.in" - source "package/freeradius-client/Config.in" - source "package/geoip/Config.in" - source "package/glib-networking/Config.in" - source "package/gssdp/Config.in" - source "package/gupnp/Config.in" - source "package/gupnp-av/Config.in" - source "package/gupnp-dlna/Config.in" - source "package/ibrcommon/Config.in" - source "package/ibrdtn/Config.in" - source "package/libcgi/Config.in" - source "package/libcgicc/Config.in" - source "package/libcoap/Config.in" - source "package/libcurl/Config.in" - source "package/libdnet/Config.in" - source "package/libeXosip2/Config.in" - source "package/libfcgi/Config.in" - source "package/libgsasl/Config.in" - source "package/libhttpparser/Config.in" - source "package/libidn/Config.in" - source "package/libiscsi/Config.in" - source "package/libldns/Config.in" - source "package/libmbus/Config.in" - source "package/libmemcached/Config.in" - source "package/libmicrohttpd/Config.in" - source "package/libminiupnpc/Config.in" - source "package/libmnl/Config.in" - source "package/libmodbus/Config.in" - source "package/libnatpmp/Config.in" - source "package/libndp/Config.in" - source "package/libnet/Config.in" - source "package/libnetfilter_acct/Config.in" - source "package/libnetfilter_conntrack/Config.in" - source "package/libnetfilter_cthelper/Config.in" - source "package/libnetfilter_cttimeout/Config.in" - source "package/libnetfilter_log/Config.in" - source "package/libnetfilter_queue/Config.in" - source "package/libnfnetlink/Config.in" - source "package/libnftnl/Config.in" - source "package/libnice/Config.in" - source "package/libnl/Config.in" - source "package/liboauth/Config.in" - source "package/liboping/Config.in" - source "package/libosip2/Config.in" - source "package/libpcap/Config.in" - source "package/libpjsip/Config.in" - source "package/librsync/Config.in" - source "package/libshairplay/Config.in" - source "package/libshout/Config.in" - source "package/libsocketcan/Config.in" - source "package/libsoup/Config.in" - source "package/libsrtp/Config.in" - source "package/libstrophe/Config.in" - source "package/libtirpc/Config.in" - 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/libwebsock/Config.in" - source "package/libwebsockets/Config.in" - source "package/lksctp-tools/Config.in" - source "package/mongoose/Config.in" - source "package/neon/Config.in" - source "package/norm/Config.in" - source "package/nss-mdns/Config.in" - source "package/nss-pam-ldapd/Config.in" - source "package/omniorb/Config.in" - source "package/openldap/Config.in" - source "package/openmpi/Config.in" - source "package/openpgm/Config.in" - source "package/openzwave/Config.in" - source "package/ortp/Config.in" - source "package/paho-mqtt-c/Config.in" - source "package/qdecoder/Config.in" - source "package/qpid-proton/Config.in" - source "package/rabbitmq-c/Config.in" - source "package/rtmpdump/Config.in" - source "package/slirp/Config.in" - source "package/snmppp/Config.in" - source "package/sofia-sip/Config.in" - source "package/thrift/Config.in" - source "package/usbredir/Config.in" - source "package/zeromq/Config.in" - source "package/zmqpp/Config.in" - source "package/zyre/Config.in" -endmenu - -menu "Other" - source "package/apr/Config.in" - source "package/apr-util/Config.in" - source "package/argp-standalone/Config.in" - source "package/armadillo/Config.in" - source "package/atf/Config.in" - source "package/bctoolbox/Config.in" - source "package/bdwgc/Config.in" - source "package/boost/Config.in" - source "package/clapack/Config.in" - source "package/classpath/Config.in" - source "package/cppcms/Config.in" - source "package/dawgdic/Config.in" - source "package/ding-libs/Config.in" - source "package/eigen/Config.in" - source "package/elfutils/Config.in" - source "package/fftw/Config.in" - source "package/flann/Config.in" - source "package/gflags/Config.in" - source "package/glibmm/Config.in" - source "package/glm/Config.in" - source "package/gmock/Config.in" - source "package/gmp/Config.in" - source "package/gsl/Config.in" - source "package/gtest/Config.in" - source "package/jemalloc/Config.in" - source "package/lapack/Config.in" - source "package/libargtable2/Config.in" - source "package/libatomic_ops/Config.in" - source "package/libbsd/Config.in" - source "package/libcap/Config.in" - source "package/libcap-ng/Config.in" - source "package/libcgroup/Config.in" - source "package/libcofi/Config.in" - source "package/libcroco/Config.in" - source "package/libcrossguid/Config.in" - source "package/libdaemon/Config.in" - source "package/libee/Config.in" - source "package/libev/Config.in" - source "package/libevdev/Config.in" - source "package/libevent/Config.in" - source "package/libffi/Config.in" - source "package/libgee/Config.in" - source "package/libglib2/Config.in" - source "package/libglob/Config.in" - source "package/libical/Config.in" - source "package/libite/Config.in" - source "package/liblinear/Config.in" - source "package/libnspr/Config.in" - source "package/libpfm4/Config.in" - source "package/libplatform/Config.in" - source "package/libplist/Config.in" - source "package/libpthread-stubs/Config.in" - source "package/libpthsem/Config.in" - source "package/libseccomp/Config.in" - source "package/libsigc/Config.in" - source "package/libsigsegv/Config.in" - source "package/libtasn1/Config.in" - source "package/libtommath/Config.in" - source "package/libtpl/Config.in" - source "package/libubox/Config.in" - source "package/libuci/Config.in" - source "package/libunwind/Config.in" - source "package/liburcu/Config.in" - source "package/libuv/Config.in" - source "package/lightning/Config.in" - source "package/linux-pam/Config.in" -if BR2_PACKAGE_LINUX_PAM -comment "linux-pam plugins" - source "package/libpam-radius-auth/Config.in" - source "package/libpam-tacplus/Config.in" -endif - source "package/liquid-dsp/Config.in" - source "package/lttng-libust/Config.in" - source "package/mpc/Config.in" - source "package/mpdecimal/Config.in" - source "package/mpfr/Config.in" - source "package/msgpack/Config.in" - source "package/mtdev2tuio/Config.in" - source "package/musl-compat-headers/Config.in" - source "package/openblas/Config.in" - source "package/orc/Config.in" - source "package/p11-kit/Config.in" - source "package/poco/Config.in" - source "package/protobuf/Config.in" - source "package/protobuf-c/Config.in" - source "package/qhull/Config.in" - source "package/qlibc/Config.in" - source "package/riemann-c-client/Config.in" - source "package/shapelib/Config.in" - source "package/skalibs/Config.in" - source "package/sphinxbase/Config.in" - source "package/startup-notification/Config.in" - source "package/tinycbor/Config.in" - source "package/tz/Config.in" - source "package/tzdata/Config.in" -endmenu - -menu "Security" - source "package/libselinux/Config.in" - source "package/libsemanage/Config.in" - source "package/libsepol/Config.in" -endmenu - -menu "Text and terminal handling" - source "package/enchant/Config.in" - source "package/icu/Config.in" - source "package/libcli/Config.in" - source "package/libedit/Config.in" - source "package/libenca/Config.in" - source "package/libestr/Config.in" - source "package/libfribidi/Config.in" - source "package/libiconv/Config.in" - source "package/libunistring/Config.in" - source "package/linenoise/Config.in" - source "package/ncurses/Config.in" - source "package/newt/Config.in" - source "package/pcre/Config.in" - source "package/popt/Config.in" - source "package/readline/Config.in" - source "package/slang/Config.in" - source "package/tclap/Config.in" - source "package/ustr/Config.in" -endmenu - -endmenu - -menu "Mail" - source "package/dovecot/Config.in" - source "package/exim/Config.in" - source "package/fetchmail/Config.in" - source "package/heirloom-mailx/Config.in" - source "package/libesmtp/Config.in" - source "package/msmtp/Config.in" - source "package/mutt/Config.in" - source "package/sylpheed/Config.in" -endmenu - -menu "Miscellaneous" - source "package/aespipe/Config.in" - source "package/bc/Config.in" - source "package/clamav/Config.in" - source "package/collectd/Config.in" - source "package/domoticz/Config.in" - source "package/empty/Config.in" - source "package/gnuradio/Config.in" - source "package/googlefontdirectory/Config.in" - source "package/gr-osmosdr/Config.in" - source "package/gsettings-desktop-schemas/Config.in" - source "package/haveged/Config.in" - source "package/linux-syscall-support/Config.in" - source "package/mcrypt/Config.in" - source "package/mobile-broadband-provider-info/Config.in" - source "package/qemu/Config.in" - source "package/qpdf/Config.in" - source "package/shared-mime-info/Config.in" - source "package/taskd/Config.in" - source "package/wine/Config.in" - source "package/xutil_util-macros/Config.in" -endmenu - -menu "Networking applications" - source "package/aiccu/Config.in" - source "package/aircrack-ng/Config.in" - source "package/apache/Config.in" - source "package/argus/Config.in" - source "package/arptables/Config.in" - source "package/atftp/Config.in" - source "package/autossh/Config.in" - source "package/avahi/Config.in" - source "package/axel/Config.in" - source "package/babeld/Config.in" - source "package/bandwidthd/Config.in" - source "package/batctl/Config.in" - source "package/bcusdk/Config.in" - source "package/bind/Config.in" - source "package/bluez_utils/Config.in" - source "package/bluez5_utils/Config.in" - source "package/bmon/Config.in" - source "package/boa/Config.in" - source "package/bridge-utils/Config.in" - source "package/bwm-ng/Config.in" - source "package/c-icap/Config.in" - source "package/c-icap-modules/Config.in" - source "package/can-utils/Config.in" - source "package/cannelloni/Config.in" - source "package/chrony/Config.in" - source "package/civetweb/Config.in" - source "package/connman/Config.in" - source "package/connman-gtk/Config.in" - source "package/conntrack-tools/Config.in" - source "package/crda/Config.in" - source "package/ctorrent/Config.in" - source "package/cups/Config.in" - source "package/dante/Config.in" - source "package/darkhttpd/Config.in" - source "package/dhcp/Config.in" - source "package/dhcpcd/Config.in" - source "package/dhcpdump/Config.in" - source "package/dnsmasq/Config.in" - source "package/drbd-utils/Config.in" - source "package/dropbear/Config.in" - source "package/ebtables/Config.in" - source "package/ejabberd/Config.in" - source "package/ethtool/Config.in" - source "package/faifa/Config.in" - source "package/fastd/Config.in" - source "package/fcgiwrap/Config.in" - source "package/flannel/Config.in" - source "package/fmc/Config.in" - source "package/fping/Config.in" - source "package/freeswitch/Config.in" - source "package/gesftpserver/Config.in" - source "package/gupnp-tools/Config.in" - source "package/gutenprint/Config.in" - source "package/hans/Config.in" - source "package/hiawatha/Config.in" - source "package/hostapd/Config.in" - source "package/hplip/Config.in" - source "package/httping/Config.in" - source "package/ibrdtn-tools/Config.in" - source "package/ibrdtnd/Config.in" - source "package/ifenslave/Config.in" - source "package/ifplugd/Config.in" - source "package/iftop/Config.in" - source "package/ifupdown/Config.in" - source "package/igd2-for-linux/Config.in" - source "package/igh-ethercat/Config.in" - source "package/igmpproxy/Config.in" - source "package/inadyn/Config.in" - source "package/iodine/Config.in" - source "package/iperf/Config.in" - source "package/iperf3/Config.in" - source "package/iproute2/Config.in" - source "package/ipsec-tools/Config.in" - source "package/ipset/Config.in" - source "package/iptables/Config.in" - source "package/iptraf-ng/Config.in" - source "package/iputils/Config.in" - source "package/irssi/Config.in" - source "package/iw/Config.in" - source "package/janus-gateway/Config.in" - source "package/kismet/Config.in" - source "package/knock/Config.in" - source "package/leafnode2/Config.in" - source "package/lft/Config.in" - source "package/lftp/Config.in" - source "package/lighttpd/Config.in" - source "package/linknx/Config.in" - source "package/links/Config.in" - source "package/linphone/Config.in" - source "package/linux-zigbee/Config.in" - source "package/lldpd/Config.in" - source "package/lrzsz/Config.in" - source "package/macchanger/Config.in" - source "package/memcached/Config.in" - source "package/mii-diag/Config.in" - source "package/minidlna/Config.in" - source "package/minissdpd/Config.in" - source "package/mjpg-streamer/Config.in" - source "package/modem-manager/Config.in" - source "package/mongrel2/Config.in" - source "package/monkey/Config.in" - source "package/mosh/Config.in" - source "package/mosquitto/Config.in" - source "package/mrouted/Config.in" - source "package/mtr/Config.in" - source "package/nbd/Config.in" - source "package/ncftp/Config.in" - source "package/ndisc6/Config.in" - source "package/netatalk/Config.in" - source "package/netcat/Config.in" - source "package/netcat-openbsd/Config.in" - source "package/netplug/Config.in" - source "package/netsnmp/Config.in" - source "package/netstat-nat/Config.in" - source "package/net-tools/Config.in" - source "package/network-manager/Config.in" - source "package/nfacct/Config.in" - source "package/nftables/Config.in" - source "package/nginx/Config.in" -if BR2_PACKAGE_NGINX -menu "External nginx modules" - source "package/nginx-dav-ext/Config.in" - source "package/nginx-naxsi/Config.in" - source "package/nginx-upload/Config.in" -endmenu -endif - source "package/ngircd/Config.in" - source "package/ngrep/Config.in" - source "package/nload/Config.in" - source "package/nmap/Config.in" - source "package/noip/Config.in" - source "package/ntp/Config.in" - source "package/nuttcp/Config.in" - source "package/odhcp6c/Config.in" - source "package/odhcploc/Config.in" - source "package/olsr/Config.in" - source "package/open-plc-utils/Config.in" - source "package/openntpd/Config.in" - source "package/openobex/Config.in" - source "package/openssh/Config.in" - source "package/openswan/Config.in" - source "package/openvpn/Config.in" - source "package/p910nd/Config.in" - source "package/phidgetwebservice/Config.in" - source "package/portmap/Config.in" - source "package/pound/Config.in" - source "package/pppd/Config.in" - source "package/pptp-linux/Config.in" - source "package/privoxy/Config.in" - source "package/proftpd/Config.in" - source "package/proxychains-ng/Config.in" - source "package/ptpd/Config.in" - source "package/ptpd2/Config.in" - source "package/pure-ftpd/Config.in" - source "package/putty/Config.in" - source "package/quagga/Config.in" - source "package/rabbitmq-server/Config.in" - source "package/radvd/Config.in" - source "package/rp-pppoe/Config.in" - source "package/rpcbind/Config.in" - source "package/rsh-redone/Config.in" - source "package/rsync/Config.in" - source "package/rtorrent/Config.in" - source "package/rtptools/Config.in" - source "package/samba4/Config.in" - source "package/sconeserver/Config.in" - source "package/ser2net/Config.in" - source "package/shairport-sync/Config.in" - source "package/shellinabox/Config.in" - source "package/smcroute/Config.in" - source "package/sngrep/Config.in" - source "package/socat/Config.in" - source "package/socketcand/Config.in" - source "package/softether/Config.in" - source "package/spawn-fcgi/Config.in" - source "package/spice/Config.in" - source "package/spice-protocol/Config.in" - source "package/squid/Config.in" - source "package/sshpass/Config.in" - source "package/sslh/Config.in" - source "package/strongswan/Config.in" - source "package/stunnel/Config.in" - source "package/tcpdump/Config.in" - source "package/tcping/Config.in" - source "package/tcpreplay/Config.in" - source "package/tftpd/Config.in" - source "package/thttpd/Config.in" - source "package/tinc/Config.in" - source "package/tinyhttpd/Config.in" - source "package/tn5250/Config.in" - source "package/tor/Config.in" - source "package/transmission/Config.in" - source "package/tunctl/Config.in" - source "package/tvheadend/Config.in" - source "package/udpcast/Config.in" - source "package/uhttpd/Config.in" - source "package/ulogd/Config.in" - source "package/ushare/Config.in" - source "package/ussp-push/Config.in" - source "package/vde2/Config.in" - source "package/vdr/Config.in" - source "package/vdr-plugin-vnsiserver/Config.in" - source "package/vnstat/Config.in" - source "package/vpnc/Config.in" - source "package/vsftpd/Config.in" - source "package/vtun/Config.in" - source "package/wavemon/Config.in" - source "package/wget/Config.in" - source "package/whois/Config.in" - source "package/wireless-regdb/Config.in" - source "package/wireless_tools/Config.in" - source "package/wireshark/Config.in" - source "package/wpa_supplicant/Config.in" - source "package/wpan-tools/Config.in" - source "package/xinetd/Config.in" - source "package/xl2tp/Config.in" - source "package/xtables-addons/Config.in" - source "package/znc/Config.in" - -endmenu - -menu "Package managers" -comment "-------------------------------------------------------" -comment "Please note: " -comment "- Buildroot does *not* generate binary packages, " -comment "- Buildroot does *not* install any package database. " -comment "* " -comment "It is up to you to provide those by yourself if you " -comment "want to use any of those package managers. " -comment "* " -comment "See the manual: " -comment "http://buildroot.org/manual.html#faq-no-binary-packages" -comment "-------------------------------------------------------" - source "package/opkg/Config.in" - source "package/rpm/Config.in" -endmenu - -menu "Real-Time" - source "package/rtai/Config.in" - source "package/xenomai/Config.in" -endmenu - -menu "Security" - source "package/policycoreutils/Config.in" - source "package/setools/Config.in" -endmenu - -menu "Shell and utilities" -comment "Shells" - source "package/bash/Config.in" - source "package/dash/Config.in" - source "package/mksh/Config.in" - source "package/zsh/Config.in" -comment "Utilities" - source "package/at/Config.in" - source "package/ccrypt/Config.in" - source "package/crudini/Config.in" - source "package/dialog/Config.in" - source "package/dtach/Config.in" - source "package/file/Config.in" - source "package/gnupg/Config.in" - source "package/gnupg2/Config.in" - source "package/inotify-tools/Config.in" - source "package/lockfile-progs/Config.in" - source "package/logrotate/Config.in" - source "package/logsurfer/Config.in" - source "package/pinentry/Config.in" - source "package/ranger/Config.in" - source "package/screen/Config.in" - source "package/sudo/Config.in" - source "package/terminology/Config.in" - source "package/time/Config.in" - source "package/tmux/Config.in" - source "package/which/Config.in" - source "package/xmlstarlet/Config.in" - source "package/xxhash/Config.in" -endmenu - -menu "System tools" - source "package/acl/Config.in" - source "package/android-tools/Config.in" - source "package/atop/Config.in" - source "package/attr/Config.in" - source "package/audit/Config.in" - source "package/bootutils/Config.in" - source "package/cgroupfs-mount/Config.in" - source "package/circus/Config.in" - source "package/coreutils/Config.in" - source "package/cpuload/Config.in" - source "package/dcron/Config.in" - source "package/ddrescue/Config.in" - source "package/debianutils/Config.in" - source "package/docker-containerd/Config.in" - source "package/docker-engine/Config.in" - source "package/dsp-tools/Config.in" - source "package/efibootmgr/Config.in" - source "package/efivar/Config.in" - source "package/emlog/Config.in" - source "package/ftop/Config.in" - source "package/getent/Config.in" - source "package/htop/Config.in" - source "package/initscripts/Config.in" - source "package/iotop/Config.in" - source "package/iprutils/Config.in" - source "package/irqbalance/Config.in" - source "package/keyutils/Config.in" - source "package/kmod/Config.in" - source "package/kvmtool/Config.in" - source "package/lxc/Config.in" - source "package/monit/Config.in" - source "package/ncdu/Config.in" - source "package/numactl/Config.in" - source "package/nut/Config.in" - source "package/openvmtools/Config.in" - source "package/polkit/Config.in" - source "package/powerpc-utils/Config.in" - source "package/procps-ng/Config.in" - source "package/procrank_linux/Config.in" - source "package/psmisc/Config.in" - source "package/pwgen/Config.in" - source "package/quota/Config.in" - source "package/rsyslog/Config.in" - source "package/runc/Config.in" - source "package/scrub/Config.in" - source "package/scrypt/Config.in" - source "package/smack/Config.in" - source "package/start-stop-daemon/Config.in" - source "package/supervisor/Config.in" - source "package/swupdate/Config.in" - source "package/sysklogd/Config.in" - source "package/syslog-ng/Config.in" - source "package/systemd/Config.in" - source "package/systemd-bootchart/Config.in" - source "package/sysvinit/Config.in" - source "package/tar/Config.in" - source "package/tpm-tools/Config.in" - source "package/unscd/Config.in" - source "package/util-linux/Config.in" - source "package/xen/Config.in" - source "package/xvisor/Config.in" -endmenu - -menu "Text editors and viewers" - source "package/ed/Config.in" - source "package/joe/Config.in" - source "package/less/Config.in" - source "package/mc/Config.in" - source "package/nano/Config.in" - source "package/uemacs/Config.in" - source "package/vim/Config.in" -endmenu - -endmenu diff --git a/package.bak/Config.in.host b/package.bak/Config.in.host deleted file mode 100644 index 8da79c303c..0000000000 --- a/package.bak/Config.in.host +++ /dev/null @@ -1,52 +0,0 @@ -menu "Host utilities" - - source "package/aespipe/Config.in.host" - source "package/android-tools/Config.in.host" - source "package/cbootimage/Config.in.host" - source "package/checkpolicy/Config.in.host" - source "package/cramfs/Config.in.host" - source "package/dfu-util/Config.in.host" - source "package/dos2unix/Config.in.host" - source "package/dosfstools/Config.in.host" - source "package/dtc/Config.in.host" - source "package/e2fsprogs/Config.in.host" - source "package/e2tools/Config.in.host" - source "package/faketime/Config.in.host" - source "package/fwup/Config.in.host" - source "package/genext2fs/Config.in.host" - source "package/genimage/Config.in.host" - source "package/genpart/Config.in.host" - source "package/go/Config.in.host" - source "package/gptfdisk/Config.in.host" - source "package/imx-usb-loader/Config.in.host" - source "package/jq/Config.in.host" - source "package/jsmin/Config.in.host" - source "package/lpc3250loader/Config.in.host" - source "package/lttng-babeltrace/Config.in.host" - source "package/mfgtools/Config.in.host" - source "package/mke2img/Config.in.host" - source "package/mkpasswd/Config.in.host" - source "package/mtd/Config.in.host" - source "package/mtools/Config.in.host" - source "package/mxsldr/Config.in.host" - source "package/omap-u-boot-utils/Config.in.host" - source "package/openocd/Config.in.host" - source "package/opkg-utils/Config.in.host" - source "package/parted/Config.in.host" - source "package/patchelf/Config.in.host" - source "package/pru-software-support/Config.in.host" - source "package/pwgen/Config.in.host" - source "package/qemu/Config.in.host" - source "package/raspberrypi-usbboot/Config.in.host" - source "package/sam-ba/Config.in.host" - source "package/squashfs/Config.in.host" - source "package/sunxi-tools/Config.in.host" - source "package/tegrarcm/Config.in.host" - source "package/ti-cgt-pru/Config.in.host" - source "package/uboot-tools/Config.in.host" - source "package/util-linux/Config.in.host" - source "package/vboot-utils/Config.in.host" - source "package/xorriso/Config.in.host" - source "package/zip/Config.in.host" - -endmenu diff --git a/package.bak/Makefile.in b/package.bak/Makefile.in deleted file mode 100644 index 4a3eb26963..0000000000 --- a/package.bak/Makefile.in +++ /dev/null @@ -1,400 +0,0 @@ -ifndef MAKE -MAKE := make -endif -ifndef HOSTMAKE -HOSTMAKE = $(MAKE) -endif -HOSTMAKE := $(shell which $(HOSTMAKE) || type -p $(HOSTMAKE) || echo make) - -# If BR2_JLEVEL is 0, scale the maximum concurrency with the number of -# CPUs. An additional job is used in order to keep processors busy -# while waiting on I/O. -# If the number of processors is not available, assume one. -ifeq ($(BR2_JLEVEL),0) -PARALLEL_JOBS := $(shell echo \ - $$((1 + `getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1`))) -else -PARALLEL_JOBS := $(BR2_JLEVEL) -endif - -MAKE1 := $(HOSTMAKE) -j1 -override MAKE = $(HOSTMAKE) \ - $(if $(findstring j,$(filter-out --%,$(MAKEFLAGS))),,-j$(PARALLEL_JOBS)) - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -TARGET_VENDOR = $(call qstrip,$(BR2_TOOLCHAIN_BUILDROOT_VENDOR)) -else -TARGET_VENDOR = buildroot -endif - -# Sanity checks -ifeq ($(TARGET_VENDOR),) -$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR is not allowed to be empty) -endif -ifeq ($(TARGET_VENDOR),unknown) -$(error BR2_TOOLCHAIN_BUILDROOT_VENDOR cannot be 'unknown'. \ - It might be confused with the native toolchain) -endif - -# Compute GNU_TARGET_NAME -GNU_TARGET_NAME = $(ARCH)-$(TARGET_VENDOR)-$(TARGET_OS)-$(LIBC)$(ABI) - -# FLAT binary format needs uclinux -ifeq ($(BR2_BINFMT_FLAT),y) -TARGET_OS = uclinux -else -TARGET_OS = linux -endif - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -LIBC = uclibc -else ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LIBC = musl -else -LIBC = gnu -endif - -# The ABI suffix is a bit special on ARM, as it needs to be -# -uclibcgnueabi for uClibc EABI, and -gnueabi for glibc EABI. -# This means that the LIBC and ABI aren't strictly orthogonal, -# which explains why we need the test on LIBC below. -ifeq ($(BR2_arm)$(BR2_armeb),y) -ifeq ($(LIBC),uclibc) -ABI = gnueabi -else -ABI = eabi -endif - -ifeq ($(BR2_ARM_EABIHF),y) -ABI := $(ABI)hf -endif -endif - -# For FSL PowerPC there's SPE -ifeq ($(BR2_powerpc_SPE),y) -ABI = spe -# MPC8540s are e500v1 with single precision FP -ifeq ($(BR2_powerpc_8540),y) -TARGET_ABI += -mabi=spe -mfloat-gprs=single -Wa,-me500 -endif -ifeq ($(BR2_powerpc_8548),y) -TARGET_ABI += -mabi=spe -mfloat-gprs=double -Wa,-me500x2 -endif -ifeq ($(BR2_powerpc_e500mc),y) -TARGET_ABI += -mabi=spe -mfloat-gprs=double -Wa,-me500mc -endif -endif - -# Use longcalls option for Xtensa globally. -# The 'longcalls' option allows calls across a greater range of addresses, -# and is required for some packages. While this option can degrade both -# code size and performance, the linker can usually optimize away the -# overhead when a call ends up within a certain range. -# -# Use auto-litpools for Xtensa globally. -# Collecting literals into separate section can be advantageous if that -# section is placed into DTCM at link time. This is applicable for code -# running on bare metal, but makes no sense under linux, where userspace -# is isolated from the physical memory details. OTOH placing literals into -# separate section breaks build of huge source files, because l32r -# instruction can only access literals in 256 KBytes range. -# -ifeq ($(BR2_xtensa),y) -TARGET_ABI += -mlongcalls -mauto-litpools -endif - -ifeq ($(BR2_arc)$(BR2_ARC_ATOMIC_EXT),yy) -TARGET_ABI += -matomic -endif - -STAGING_SUBDIR = usr/$(GNU_TARGET_NAME)/sysroot -STAGING_DIR = $(HOST_DIR)/$(STAGING_SUBDIR) - -ifeq ($(BR2_OPTIMIZE_0),y) -TARGET_OPTIMIZATION = -O0 -endif -ifeq ($(BR2_OPTIMIZE_1),y) -TARGET_OPTIMIZATION = -O1 -endif -ifeq ($(BR2_OPTIMIZE_2),y) -TARGET_OPTIMIZATION = -O2 -endif -ifeq ($(BR2_OPTIMIZE_3),y) -TARGET_OPTIMIZATION = -O3 -endif -ifeq ($(BR2_OPTIMIZE_G),y) -TARGET_OPTIMIZATION = -Og -endif -ifeq ($(BR2_OPTIMIZE_S),y) -TARGET_OPTIMIZATION = -Os -endif -ifeq ($(BR2_DEBUG_1),y) -TARGET_DEBUGGING = -g1 -endif -ifeq ($(BR2_DEBUG_2),y) -TARGET_DEBUGGING = -g2 -endif -ifeq ($(BR2_DEBUG_3),y) -TARGET_DEBUGGING = -g3 -endif - -TARGET_CPPFLAGS += -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -TARGET_CFLAGS = $(TARGET_CPPFLAGS) $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -TARGET_CXXFLAGS = $(TARGET_CFLAGS) -TARGET_FCFLAGS = $(TARGET_ABI) $(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) -TARGET_LDFLAGS = $(call qstrip,$(BR2_TARGET_LDFLAGS)) - -ifeq ($(BR2_BINFMT_FLAT),y) -TARGET_CFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\ - -Wl$(comma)-elf2flt) -TARGET_CXXFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\ - -Wl$(comma)-elf2flt) -TARGET_FCFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),\ - -Wl$(comma)-elf2flt) -TARGET_LDFLAGS += $(if $($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt=-s$($(PKG)_FLAT_STACKSIZE),-Wl$(comma)-elf2flt) -endif - -ifeq ($(BR2_BINFMT_FLAT_SHARED),y) -TARGET_LDFLAGS += -mid-shared-library -mshared-library-id=0 -TARGET_CFLAGS += -mid-shared-library -mshared-library-id=0 -TARGET_FCFLAGS += -mid-shared-library -mshared-library-id=0 -TARGET_CXXFLAGS += -mid-shared-library -mshared-library-id=0 -endif -ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y) -TARGET_LDFLAGS += -msep-data -TARGET_CFLAGS += -msep-data -TARGET_FCFLAGS += -msep-data -TARGET_CXXFLAGS += -msep-data -endif - -ifeq ($(BR2_SSP_REGULAR),y) -TARGET_CFLAGS += -fstack-protector -TARGET_CXXFLAGS += -fstack-protector -TARGET_FCFLAGS += -fstack-protector -else ifeq ($(BR2_SSP_STRONG),y) -TARGET_CFLAGS += -fstack-protector-strong -TARGET_CXXFLAGS += -fstack-protector-strong -TARGET_FCFLAGS += -fstack-protector-strong -else ifeq ($(BR2_SSP_ALL),y) -TARGET_CFLAGS += -fstack-protector-all -TARGET_CXXFLAGS += -fstack-protector-all -TARGET_FCFLAGS += -fstack-protector-all -endif - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) -TARGET_CROSS = $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)- -else -TARGET_CROSS = $(HOST_DIR)/usr/bin/$(TOOLCHAIN_EXTERNAL_PREFIX)- -endif - -# Define TARGET_xx variables for all common binutils/gcc -TARGET_AR = $(TARGET_CROSS)ar -TARGET_AS = $(TARGET_CROSS)as -TARGET_CC = $(TARGET_CROSS)gcc -TARGET_CPP = $(TARGET_CROSS)cpp -TARGET_CXX = $(TARGET_CROSS)g++ -TARGET_FC = $(TARGET_CROSS)gfortran -TARGET_LD = $(TARGET_CROSS)ld -TARGET_NM = $(TARGET_CROSS)nm -TARGET_RANLIB = $(TARGET_CROSS)ranlib -TARGET_READELF = $(TARGET_CROSS)readelf -TARGET_OBJCOPY = $(TARGET_CROSS)objcopy -TARGET_OBJDUMP = $(TARGET_CROSS)objdump - -ifeq ($(BR2_STRIP_strip),y) -STRIP_STRIP_DEBUG := --strip-debug -TARGET_STRIP = $(TARGET_CROSS)strip -STRIPCMD = $(TARGET_CROSS)strip --remove-section=.comment --remove-section=.note -endif -ifeq ($(BR2_STRIP_none),y) -TARGET_STRIP = true -STRIPCMD = $(TARGET_STRIP) -endif -INSTALL := $(shell which install || type -p install) -FLEX := $(shell which flex || type -p flex) -BISON := $(shell which bison || type -p bison) -UNZIP := $(shell which unzip || type -p unzip) -q - -APPLY_PATCHES = PATH=$(HOST_DIR)/usr/bin:$$PATH support/scripts/apply-patches.sh $(if $(QUIET),-s) - -HOST_CPPFLAGS = -I$(HOST_DIR)/usr/include -HOST_CFLAGS ?= -O2 -HOST_CFLAGS += $(HOST_CPPFLAGS) -HOST_CXXFLAGS += $(HOST_CFLAGS) -HOST_LDFLAGS += -L$(HOST_DIR)/lib -L$(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib - -# host-intltool should be executed with the system perl, so we save -# the path to the system perl, before a host-perl built by Buildroot -# might get installed into $(HOST_DIR)/usr/bin and therefore appears -# in our PATH. This system perl will be used as INTLTOOL_PERL. -export PERL=$(shell which perl) - -# host-intltool needs libxml-parser-perl, which Buildroot installs in -# $(HOST_DIR)/usr/lib/perl, so we must make sure that the system perl -# finds this perl module by exporting the proper value for PERL5LIB. -export PERL5LIB=$(HOST_DIR)/usr/lib/perl - -TARGET_MAKE_ENV = PATH=$(BR_PATH) - -TARGET_CONFIGURE_OPTS = \ - $(TARGET_MAKE_ENV) \ - AR="$(TARGET_AR)" \ - AS="$(TARGET_AS)" \ - LD="$(TARGET_LD)" \ - NM="$(TARGET_NM)" \ - CC="$(TARGET_CC)" \ - GCC="$(TARGET_CC)" \ - CPP="$(TARGET_CPP)" \ - CXX="$(TARGET_CXX)" \ - FC="$(TARGET_FC)" \ - F77="$(TARGET_FC)" \ - RANLIB="$(TARGET_RANLIB)" \ - READELF="$(TARGET_READELF)" \ - STRIP="$(TARGET_STRIP)" \ - OBJCOPY="$(TARGET_OBJCOPY)" \ - OBJDUMP="$(TARGET_OBJDUMP)" \ - AR_FOR_BUILD="$(HOSTAR)" \ - AS_FOR_BUILD="$(HOSTAS)" \ - CC_FOR_BUILD="$(HOSTCC)" \ - GCC_FOR_BUILD="$(HOSTCC)" \ - CXX_FOR_BUILD="$(HOSTCXX)" \ - LD_FOR_BUILD="$(HOSTLD)" \ - CPPFLAGS_FOR_BUILD="$(HOST_CPPFLAGS)" \ - CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ - CXXFLAGS_FOR_BUILD="$(HOST_CXXFLAGS)" \ - LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ - FCFLAGS_FOR_BUILD="$(HOST_FCFLAGS)" \ - DEFAULT_ASSEMBLER="$(TARGET_AS)" \ - DEFAULT_LINKER="$(TARGET_LD)" \ - CPPFLAGS="$(TARGET_CPPFLAGS)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - CXXFLAGS="$(TARGET_CXXFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - FCFLAGS="$(TARGET_FCFLAGS)" \ - FFLAGS="$(TARGET_FCFLAGS)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - STAGING_DIR="$(STAGING_DIR)" \ - INTLTOOL_PERL=$(PERL) - - -HOST_MAKE_ENV = \ - PATH=$(BR_PATH) \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" - -HOST_CONFIGURE_OPTS = \ - $(HOST_MAKE_ENV) \ - AR="$(HOSTAR)" \ - AS="$(HOSTAS)" \ - LD="$(HOSTLD)" \ - NM="$(HOSTNM)" \ - CC="$(HOSTCC)" \ - GCC="$(HOSTCC)" \ - CXX="$(HOSTCXX)" \ - CPP="$(HOSTCPP)" \ - OBJCOPY="$(HOSTOBJCOPY)" \ - RANLIB="$(HOSTRANLIB)" \ - CPPFLAGS="$(HOST_CPPFLAGS)" \ - CFLAGS="$(HOST_CFLAGS)" \ - CXXFLAGS="$(HOST_CXXFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - INTLTOOL_PERL=$(PERL) - -# This is extra environment we can not export ourselves (eg. because some -# packages use that variable internally, eg. uboot), so we have to -# explicitly pass it to user-supplied external hooks (eg. post-build, -# post-images) -EXTRA_ENV = \ - PATH=$(BR_PATH) \ - BR2_DL_DIR=$(BR2_DL_DIR) \ - BUILD_DIR=$(BUILD_DIR) - -################################################################################ -# settings we need to pass to configure - -# does unaligned access trap? -BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=yes -ifeq ($(BR2_i386),y) -BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no -endif -ifeq ($(BR2_x86_64),y) -BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no -endif -ifeq ($(BR2_m68k),y) -BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no -endif -ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) -BR2_AC_CV_TRAP_CHECK = ac_cv_lbl_unaligned_fail=no -endif - -ifeq ($(BR2_ENDIAN),"BIG") -BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=yes -else -BR2_AC_CV_C_BIGENDIAN = ac_cv_c_bigendian=no -endif - -# AM_GNU_GETTEXT misdetects musl gettext support. -# musl currently implements api level 1 and 2 (basic + ngettext) -# http://www.openwall.com/lists/musl/2015/04/16/3 -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -BR2_GT_CV_FUNC_GNUGETTEXT_LIBC = \ - gt_cv_func_gnugettext1_libc=yes \ - gt_cv_func_gnugettext2_libc=yes -endif - -TARGET_CONFIGURE_ARGS = \ - $(BR2_AC_CV_TRAP_CHECK) \ - ac_cv_func_mmap_fixed_mapped=yes \ - ac_cv_func_memcmp_working=yes \ - ac_cv_have_decl_malloc=yes \ - gl_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_calloc_0_nonnull=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - lt_cv_sys_lib_search_path_spec="" \ - $(BR2_AC_CV_C_BIGENDIAN) \ - $(BR2_GT_CV_FUNC_GNUGETTEXT_LIBC) - -################################################################################ - -ifeq ($(BR2_ENABLE_LOCALE),y) -DISABLE_NLS := -else -DISABLE_NLS :=--disable-nls -endif - -ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -TARGET_CONFIGURE_OPTS += CXX=false -endif - -ifeq ($(BR2_STATIC_LIBS),y) -SHARED_STATIC_LIBS_OPTS = --enable-static --disable-shared -TARGET_CFLAGS += -static -TARGET_CXXFLAGS += -static -TARGET_FCFLAGS += -static -TARGET_LDFLAGS += -static -else ifeq ($(BR2_SHARED_LIBS),y) -SHARED_STATIC_LIBS_OPTS = --disable-static --enable-shared -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -SHARED_STATIC_LIBS_OPTS = --enable-static --enable-shared -endif - -ifeq ($(BR2_COMPILER_PARANOID_UNSAFE_PATH),y) -export BR_COMPILER_PARANOID_UNSAFE_PATH=enabled -endif - -include package/pkg-download.mk -include package/pkg-autotools.mk -include package/pkg-cmake.mk -include package/pkg-luarocks.mk -include package/pkg-perl.mk -include package/pkg-python.mk -include package/pkg-virtual.mk -include package/pkg-generic.mk -include package/pkg-kconfig.mk -include package/pkg-rebar.mk -include package/pkg-kernel-module.mk -include package/pkg-waf.mk diff --git a/package.bak/a10disp/Config.in b/package.bak/a10disp/Config.in deleted file mode 100644 index 99ae0aad6f..0000000000 --- a/package.bak/a10disp/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_A10DISP - bool "a10disp" - depends on BR2_arm - depends on BR2_LINUX_KERNEL - help - Program to change the display mode of Allwinner ARM SOCs - running the linux-sunxi kernel (and not the mainline kernel.) - - http://github.com/hglm/a10disp - -comment "a10disp needs a Linux kernel to be built" - depends on BR2_arm - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/a10disp/a10disp.hash b/package.bak/a10disp/a10disp.hash deleted file mode 100644 index a1ec11c759..0000000000 --- a/package.bak/a10disp/a10disp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5077405030e8f97a1edd4b86d469466abbc4d32b4a4609e58459347fcd1ba35b a10disp-v0.6.1.tar.gz diff --git a/package.bak/a10disp/a10disp.mk b/package.bak/a10disp/a10disp.mk deleted file mode 100644 index 7353edea62..0000000000 --- a/package.bak/a10disp/a10disp.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# a10disp -# -################################################################################ - -A10DISP_VERSION = v0.6.1 -A10DISP_SITE = $(call github,hglm,a10disp,$(A10DISP_VERSION)) -A10DISP_LICENSE = MIT - -A10DISP_DEPENDENCIES = linux - -define A10DISP_BUILD_CMDS - cp -f $(LINUX_DIR)/include/video/sunxi_disp_ioctl.h $(@D)/ - $(TARGET_CC) $(TARGET_CFLAGS) $(@D)/a10disp.c -o $(@D)/a10disp -endef - -define A10DISP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/a10disp $(TARGET_DIR)/usr/bin/a10disp -endef - -$(eval $(generic-package)) diff --git a/package.bak/acl/0001-support-static-installation.patch b/package.bak/acl/0001-support-static-installation.patch deleted file mode 100644 index 4cb473ffc2..0000000000 --- a/package.bak/acl/0001-support-static-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -Support installation of .a file when doing static linking - -When doing static linking (i.e ENABLE_SHARED != yes), the acl build -logic wasn't installing any library at all, not even the .a file which -is needed for static linking. This patch fixes that. - -Signed-off-by: Thomas Petazzoni - -Index: b/include/buildmacros -=================================================================== ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -97,7 +97,15 @@ - - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ -+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ -+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -+ fi - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ diff --git a/package.bak/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch b/package.bak/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch deleted file mode 100644 index f9a5d9bd1e..0000000000 --- a/package.bak/acl/0002-add-__acl_-prefixes-to-internal-symbols.patch +++ /dev/null @@ -1,292 +0,0 @@ -From debbe4f7b591b3f35d0ed65c17fa81b196b2eb2d Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 12 Aug 2014 08:37:25 -0400 -Subject: [PATCH] add __acl_ prefixes to internal symbols - -When static linking libacl, people sometimes run into symbol collisions -because their own code defines symbols like "quote". So for acl internal -symbols, use an __acl_ prefix. - -[Rahul Bedarkar: backported from upstream - http://git.savannah.gnu.org/cgit/acl.git/commit/?id=a2c4d71c2e84419a49db503ed59de4d3d1dca7dd ] -Signed-off-by: Rahul Bedarkar ---- - exports | 12 ++---------- - getfacl/getfacl.c | 4 ++-- - include/misc.h | 8 ++++---- - libacl/__acl_to_any_text.c | 4 ++-- - libacl/acl_from_text.c | 4 ++-- - libmisc/high_water_alloc.c | 2 +- - libmisc/next_line.c | 6 +++--- - libmisc/quote.c | 4 ++-- - libmisc/unquote.c | 2 +- - setfacl/parse.c | 10 +++++----- - setfacl/setfacl.c | 4 ++-- - 11 files changed, 26 insertions(+), 34 deletions(-) - -diff --git a/exports b/exports -index 7d8e69e..bf15d84 100644 ---- a/exports -+++ b/exports -@@ -59,22 +59,14 @@ ACL_1.0 { - acl_to_any_text; - - local: -- # Library internal stuff -+ # Library internal stuff - __new_var_obj_p; - __new_obj_p_here; - __free_obj_p; - __check_obj_p; - __ext2int_and_check; -- __acl_reorder_entry_obj_p; -- __acl_reorder_obj_p; -- __acl_init_obj; -- __acl_create_entry_obj; -- __acl_free_acl_obj; -- __acl_to_any_text; -+ __acl_*; - __apply_mask_to_mode; -- -- quote; -- unquote; - }; - - ACL_1.1 { -diff --git a/getfacl/getfacl.c b/getfacl/getfacl.c -index f8eaf25..af9e225 100644 ---- a/getfacl/getfacl.c -+++ b/getfacl/getfacl.c -@@ -90,7 +90,7 @@ int opt_numeric; /* don't convert id's to symbolic names */ - - static const char *xquote(const char *str, const char *quote_chars) - { -- const char *q = quote(str, quote_chars); -+ const char *q = __acl_quote(str, quote_chars); - if (q == NULL) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - exit(1); -@@ -718,7 +718,7 @@ int main(int argc, char *argv[]) - do { - if (optind == argc || - strcmp(argv[optind], "-") == 0) { -- while ((line = next_line(stdin)) != NULL) { -+ while ((line = __acl_next_line(stdin)) != NULL) { - if (*line == '\0') - continue; - -diff --git a/include/misc.h b/include/misc.h -index 0c5fdcc..c25accf 100644 ---- a/include/misc.h -+++ b/include/misc.h -@@ -15,9 +15,9 @@ - along with this program. If not, see . - */ - --extern int high_water_alloc(void **buf, size_t *bufsize, size_t newsize); -+extern int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize); - --extern const char *quote(const char *str, const char *quote_chars); --extern char *unquote(char *str); -+extern const char *__acl_quote(const char *str, const char *quote_chars); -+extern char *__acl_unquote(char *str); - --extern char *next_line(FILE *file); -+extern char *__acl_next_line(FILE *file); -diff --git a/libacl/__acl_to_any_text.c b/libacl/__acl_to_any_text.c -index a4f9c34..19f1ccc 100644 ---- a/libacl/__acl_to_any_text.c -+++ b/libacl/__acl_to_any_text.c -@@ -159,7 +159,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, - if (options & TEXT_NUMERIC_IDS) - str = NULL; - else -- str = quote(user_name( -+ str = __acl_quote(user_name( - entry_obj_p->eid.qid), ":, \t\n\r"); - if (str != NULL) { - strncpy(text_p, str, size); -@@ -182,7 +182,7 @@ acl_entry_to_any_str(const acl_entry_t entry_d, char *text_p, ssize_t size, - if (options & TEXT_NUMERIC_IDS) - str = NULL; - else -- str = quote(group_name( -+ str = __acl_quote(group_name( - entry_obj_p->eid.qid), ":, \t\n\r"); - if (str != NULL) { - strncpy(text_p, str, size); -diff --git a/libacl/acl_from_text.c b/libacl/acl_from_text.c -index 1e05322..f6165be 100644 ---- a/libacl/acl_from_text.c -+++ b/libacl/acl_from_text.c -@@ -206,7 +206,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) - str = get_token(text_p); - if (str) { - entry_obj.etag = ACL_USER; -- error = get_uid(unquote(str), -+ error = get_uid(__acl_unquote(str), - &entry_obj.eid.qid); - free(str); - if (error) { -@@ -225,7 +225,7 @@ parse_acl_entry(const char **text_p, acl_t *acl_p) - str = get_token(text_p); - if (str) { - entry_obj.etag = ACL_GROUP; -- error = get_gid(unquote(str), -+ error = get_gid(__acl_unquote(str), - &entry_obj.eid.qid); - free(str); - if (error) { -diff --git a/libmisc/high_water_alloc.c b/libmisc/high_water_alloc.c -index c127dc1..951f4bb 100644 ---- a/libmisc/high_water_alloc.c -+++ b/libmisc/high_water_alloc.c -@@ -21,7 +21,7 @@ - #include - #include "misc.h" - --int high_water_alloc(void **buf, size_t *bufsize, size_t newsize) -+int __acl_high_water_alloc(void **buf, size_t *bufsize, size_t newsize) - { - #define CHUNK_SIZE 256 - /* -diff --git a/libmisc/next_line.c b/libmisc/next_line.c -index 0566d7a..126a364 100644 ---- a/libmisc/next_line.c -+++ b/libmisc/next_line.c -@@ -23,7 +23,7 @@ - - #define LINE_SIZE getpagesize() - --char *next_line(FILE *file) -+char *__acl_next_line(FILE *file) - { - static char *line; - static size_t line_size; -@@ -31,7 +31,7 @@ char *next_line(FILE *file) - int eol = 0; - - if (!line) { -- if (high_water_alloc((void **)&line, &line_size, LINE_SIZE)) -+ if (__acl_high_water_alloc((void **)&line, &line_size, LINE_SIZE)) - return NULL; - } - c = line; -@@ -47,7 +47,7 @@ char *next_line(FILE *file) - if (feof(file)) - break; - if (!eol) { -- if (high_water_alloc((void **)&line, &line_size, -+ if (__acl_high_water_alloc((void **)&line, &line_size, - 2 * line_size)) - return NULL; - c = strrchr(line, '\0'); -diff --git a/libmisc/quote.c b/libmisc/quote.c -index bf8f9eb..a28800c 100644 ---- a/libmisc/quote.c -+++ b/libmisc/quote.c -@@ -23,7 +23,7 @@ - #include - #include "misc.h" - --const char *quote(const char *str, const char *quote_chars) -+const char *__acl_quote(const char *str, const char *quote_chars) - { - static char *quoted_str; - static size_t quoted_str_len; -@@ -40,7 +40,7 @@ const char *quote(const char *str, const char *quote_chars) - if (nonpr == 0) - return str; - -- if (high_water_alloc((void **)"ed_str, "ed_str_len, -+ if (__acl_high_water_alloc((void **)"ed_str, "ed_str_len, - (s - (unsigned char *)str) + nonpr * 3 + 1)) - return NULL; - for (s = (unsigned char *)str, q = quoted_str; *s != '\0'; s++) { -diff --git a/libmisc/unquote.c b/libmisc/unquote.c -index bffebf9..4f4ce7c 100644 ---- a/libmisc/unquote.c -+++ b/libmisc/unquote.c -@@ -22,7 +22,7 @@ - #include - #include "misc.h" - --char *unquote(char *str) -+char *__acl_unquote(char *str) - { - unsigned char *s, *t; - -diff --git a/setfacl/parse.c b/setfacl/parse.c -index e7e6add..7433459 100644 ---- a/setfacl/parse.c -+++ b/setfacl/parse.c -@@ -226,7 +226,7 @@ user_entry: - str = get_token(text_p); - if (str) { - cmd->c_tag = ACL_USER; -- error = get_uid(unquote(str), &cmd->c_id); -+ error = get_uid(__acl_unquote(str), &cmd->c_id); - free(str); - if (error) { - *text_p = backup; -@@ -245,7 +245,7 @@ user_entry: - str = get_token(text_p); - if (str) { - cmd->c_tag = ACL_GROUP; -- error = get_gid(unquote(str), &cmd->c_id); -+ error = get_gid(__acl_unquote(str), &cmd->c_id); - free(str); - if (error) { - *text_p = backup; -@@ -466,7 +466,7 @@ read_acl_comments( - if (strncmp(cp, "file:", 5) == 0) { - cp += 5; - SKIP_WS(cp); -- cp = unquote(cp); -+ cp = __acl_unquote(cp); - - if (path_p) { - if (*path_p) -@@ -483,7 +483,7 @@ read_acl_comments( - if (uid_p) { - if (*uid_p != ACL_UNDEFINED_ID) - goto fail; -- if (get_uid(unquote(cp), uid_p) != 0) -+ if (get_uid(__acl_unquote(cp), uid_p) != 0) - continue; - } - } else if (strncmp(cp, "group:", 6) == 0) { -@@ -493,7 +493,7 @@ read_acl_comments( - if (gid_p) { - if (*gid_p != ACL_UNDEFINED_ID) - goto fail; -- if (get_gid(unquote(cp), gid_p) != 0) -+ if (get_gid(__acl_unquote(cp), gid_p) != 0) - continue; - } - } else if (strncmp(cp, "flags:", 6) == 0) { -diff --git a/setfacl/setfacl.c b/setfacl/setfacl.c -index 81062a6..fb2d172 100644 ---- a/setfacl/setfacl.c -+++ b/setfacl/setfacl.c -@@ -92,7 +92,7 @@ int promote_warning; - - static const char *xquote(const char *str, const char *quote_chars) - { -- const char *q = quote(str, quote_chars); -+ const char *q = __acl_quote(str, quote_chars); - if (q == NULL) { - fprintf(stderr, "%s: %s\n", progname, strerror(errno)); - exit(1); -@@ -311,7 +311,7 @@ int next_file(const char *arg, seq_t seq) - args.seq = seq; - - if (strcmp(arg, "-") == 0) { -- while ((line = next_line(stdin))) -+ while ((line = __acl_next_line(stdin))) - errors = walk_tree(line, walk_flags, 0, do_set, &args); - if (!feof(stdin)) { - fprintf(stderr, _("%s: Standard input: %s\n"), --- -2.6.2 - diff --git a/package.bak/acl/Config.in b/package.bak/acl/Config.in deleted file mode 100644 index 92f2251878..0000000000 --- a/package.bak/acl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_ACL - bool "acl" - select BR2_PACKAGE_ATTR - help - POSIX Access Control Lists, which are used to define more - fine-grained discretionary access rights for files and - directories. - This package also provides libacl. - - http://savannah.nongnu.org/projects/acl diff --git a/package.bak/acl/acl.hash b/package.bak/acl/acl.hash deleted file mode 100644 index 3f9d7900d3..0000000000 --- a/package.bak/acl/acl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 179074bb0580c06c4b4137be4c5a92a701583277967acdb5546043c7874e0d23 acl-2.2.52.src.tar.gz diff --git a/package.bak/acl/acl.mk b/package.bak/acl/acl.mk deleted file mode 100644 index 4d30059390..0000000000 --- a/package.bak/acl/acl.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# acl -# -################################################################################ - -ACL_VERSION = 2.2.52 -ACL_SOURCE = acl-$(ACL_VERSION).src.tar.gz -ACL_SITE = http://download.savannah.gnu.org/releases/acl -ACL_INSTALL_STAGING = YES -ACL_DEPENDENCIES = attr -ACL_CONF_OPTS = --enable-gettext=no -ACL_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) -ACL_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL - -# While the configuration system uses autoconf, the Makefiles are -# hand-written and do not use automake. Therefore, we have to hack -# around their deficiencies by: -# - explicitly passing CFLAGS (LDFLAGS are passed on from configure, -# CFLAGS are not). -# - explicitly passing the installation prefix, not using DESTDIR. - -ACL_MAKE_ENV = CFLAGS="$(TARGET_CFLAGS)" - -ACL_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ - install-dev install-lib - -ACL_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ - install install-lib - -# The libdir variable in libacl.la is empty, so let's fix it. This is -# probably due to acl not using automake, and not doing fully the -# right thing with libtool. -define ACL_FIX_LIBTOOL_LA_LIBDIR - $(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \ - $(STAGING_DIR)/usr/lib/libacl.la -endef - -ACL_POST_INSTALL_STAGING_HOOKS += ACL_FIX_LIBTOOL_LA_LIBDIR - -HOST_ACL_DEPENDENCIES = host-attr -HOST_ACL_CONF_OPTS = --enable-gettext=no -HOST_ACL_MAKE_ENV = CFLAGS="$(HOST_CFLAGS)" -HOST_ACL_INSTALL_OPTS = \ - prefix=$(HOST_DIR) \ - exec_prefix=$(HOST_DIR) \ - PKG_DEVLIB_DIR=$(HOST_DIR)/lib \ - install-dev install-lib -# For the host, libacl.la is correct, no fixup needed. - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/acpica/0001-build-do-not-use-Werror.patch b/package.bak/acpica/0001-build-do-not-use-Werror.patch deleted file mode 100644 index e7449e982b..0000000000 --- a/package.bak/acpica/0001-build-do-not-use-Werror.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9382ae2431d2962c430e7149302c8690f5bc159c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 10 Jul 2016 15:06:15 +0200 -Subject: [PATCH] build: do not use -Werror - -Warnings come and go with various compiler versions, so using -Werror is -prone to cause build failures with various compiler versions, especially -newer versions that introduce new warnings. - -Remove use of -Werror. - -[Vincent: tweak patch for 20170531 release] - -Signed-off-by: "Yann E. MORIN" -Signed-off-by: "Vicente Olivert Riera" ---- - generate/unix/Makefile.config | 1 - - generate/unix/iasl/Makefile | 12 ++++++------ - 2 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/generate/unix/Makefile.config b/generate/unix/Makefile.config -index 4d4f182..a7120e3 100644 ---- a/generate/unix/Makefile.config -+++ b/generate/unix/Makefile.config -@@ -194,7 +194,6 @@ CWARNINGFLAGS = \ - -Wall\ - -Wbad-function-cast\ - -Wdeclaration-after-statement\ -- -Werror\ - -Wformat=2\ - -Wmissing-declarations\ - -Wmissing-prototypes\ -diff --git a/generate/unix/iasl/Makefile b/generate/unix/iasl/Makefile -index 156c23a..28ffc06 100644 ---- a/generate/unix/iasl/Makefile -+++ b/generate/unix/iasl/Makefile -@@ -335,24 +335,24 @@ $(OBJDIR)/prparserparse.c $(OBJDIR)/prparser.y.h : $(ASL_COMPILER)/prparse - # - $(OBJDIR)/aslcompilerlex.o : $(OBJDIR)/aslcompilerlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/aslcompilerparse.o : $(OBJDIR)/aslcompilerparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserlex.o : $(OBJDIR)/dtparserlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/dtparserparse.o : $(OBJDIR)/dtparserparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/prparserlex.o : $(OBJDIR)/prparserlex.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< - - $(OBJDIR)/prparserparse.o : $(OBJDIR)/prparserparse.c - @echo "- " "Intermediate" $< -- @$(CC) -c $(CFLAGS) -Wall -Werror -o$@ $< -+ @$(CC) -c $(CFLAGS) -Wall -o$@ $< diff --git a/package.bak/acpica/Config.in b/package.bak/acpica/Config.in deleted file mode 100644 index c5ffb005f5..0000000000 --- a/package.bak/acpica/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_ACPICA - bool "acpica" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The ACPI Component Architecture (ACPICA) project provides an - operating system (OS)-independent reference implementation - of the Advanced Configuration and Power Interface - Specification (ACPI). - - https://www.acpica.org - -comment "acpica needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/acpica/acpica.hash b/package.bak/acpica/acpica.hash deleted file mode 100644 index 4942fe4548..0000000000 --- a/package.bak/acpica/acpica.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 0b979b778bcf711a2b8702b1831affd7dac4a776235d7877fd185651b6a390a3 acpica-unix2-20170531.tar.gz diff --git a/package.bak/acpica/acpica.mk b/package.bak/acpica/acpica.mk deleted file mode 100644 index 57cc37f85e..0000000000 --- a/package.bak/acpica/acpica.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# acpica -# -################################################################################ - -ACPICA_VERSION = 20170531 -ACPICA_SOURCE = acpica-unix2-$(ACPICA_VERSION).tar.gz -ACPICA_SITE = https://acpica.org/sites/acpica/files -ACPICA_LICENSE = BSD-3-Clause or GPL-2.0 -ACPICA_LICENSE_FILES = source/include/acpi.h -ACPICA_DEPENDENCIES = host-bison host-flex - -define ACPICA_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - HARDWARE_NAME=$(BR2_ARCH) HOST=_LINUX CC="$(TARGET_CC)" \ - all -endef - -define HOST_ACPICA_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - all -endef - -define ACPICA_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - HARDWARE_NAME=$(BR2_ARCH) DESTDIR="$(TARGET_DIR)" \ - INSTALLFLAGS=-m755 install -endef - -define HOST_ACPICA_INSTALL_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - PREFIX="$(HOST_DIR)" \ - INSTALLFLAGS=-m755 install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/acpid/0001-dont-use-isfdtype.patch b/package.bak/acpid/0001-dont-use-isfdtype.patch deleted file mode 100644 index 2fe6c2183b..0000000000 --- a/package.bak/acpid/0001-dont-use-isfdtype.patch +++ /dev/null @@ -1,20 +0,0 @@ -Partially roll back upstream commit 4711119089e1ad08dad206f4fded68f1972fdeed -since released versions of uClibc don't support isfdtype(). - -Signed-off-by: Gustavo Zaarias - -diff -Nura acpid-2.0.22.orig/sock.c acpid-2.0.22/sock.c ---- acpid-2.0.22.orig/sock.c 2014-04-22 18:04:19.706841764 -0300 -+++ acpid-2.0.22/sock.c 2014-04-22 18:05:08.285479625 -0300 -@@ -53,7 +53,10 @@ - int - is_socket(int fd) - { -- return (isfdtype(fd, S_IFSOCK) == 1); -+ int v; -+ socklen_t l = sizeof(int); -+ -+ return (getsockopt(fd, SOL_SOCKET, SO_TYPE, (char *)&v, &l) == 0); - } - - /* accept a new client connection */ diff --git a/package.bak/acpid/0002-add-missing-defines.patch b/package.bak/acpid/0002-add-missing-defines.patch deleted file mode 100644 index a85315911f..0000000000 --- a/package.bak/acpid/0002-add-missing-defines.patch +++ /dev/null @@ -1,40 +0,0 @@ -Add missing MSG_CMSG_CLOEXEC - -Unpatched uClibc toolchains, even using the latest 0.9.33.2, do not -have the MSG_CMSG_CLOEXEC definition. Even though the Buildroot -internal toolchain backend has a uClibc patch to provide it, it -doesn't apply to external toolchains. This patch provides the -definition of MSG_CMSG_CLOEXEC. - -Signed-off-by: Thomas Petazzoni - -Index: b/libnetlink.h -=================================================================== ---- a/libnetlink.h -+++ b/libnetlink.h -@@ -7,6 +7,10 @@ - #include - #include - -+#ifndef MSG_CMSG_CLOEXEC -+#define MSG_CMSG_CLOEXEC 0x40000000 -+#endif -+ - struct rtnl_handle - { - int fd; -Index: b/kacpimon/libnetlink.h -=================================================================== ---- a/kacpimon/libnetlink.h -+++ b/kacpimon/libnetlink.h -@@ -7,6 +7,10 @@ - #include - #include - -+#ifndef MSG_CMSG_CLOEXEC -+#define MSG_CMSG_CLOEXEC 0x40000000 -+#endif -+ - struct rtnl_handle - { - int fd; diff --git a/package.bak/acpid/Config.in b/package.bak/acpid/Config.in deleted file mode 100644 index 2bd83ea8b9..0000000000 --- a/package.bak/acpid/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_ACPID - bool "acpid" - depends on BR2_x86_64 || BR2_i386 - help - Advanced Configuration and Power Interface event daemon. - - Acpid is designed to notify user-space programs of ACPI - events, and allows you to configure specific actions for - specific events. - - http://sourceforge.net/projects/acpid2/ diff --git a/package.bak/acpid/S02acpid b/package.bak/acpid/S02acpid deleted file mode 100755 index e8d3661674..0000000000 --- a/package.bak/acpid/S02acpid +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting acpid: " - start-stop-daemon -S -q -m -b -p /var/run/acpid.pid --exec /usr/sbin/acpid -- -n - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping acpid: " - start-stop-daemon -K -q -p /var/run/acpid.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/acpid/acpid.hash b/package.bak/acpid/acpid.hash deleted file mode 100644 index 9cf91d9333..0000000000 --- a/package.bak/acpid/acpid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/acpid2/files/ -md5 0432407b5ff75ae8e08afb43052fde2b acpid-2.0.28.tar.xz -sha1 a5cb34d53eb6965293c436db23dc81550273975b acpid-2.0.28.tar.xz diff --git a/package.bak/acpid/acpid.mk b/package.bak/acpid/acpid.mk deleted file mode 100644 index 2141a1a9e0..0000000000 --- a/package.bak/acpid/acpid.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# acpid -# -################################################################################ - -ACPID_VERSION = 2.0.28 -ACPID_SOURCE = acpid-$(ACPID_VERSION).tar.xz -ACPID_SITE = http://downloads.sourceforge.net/project/acpid2 -ACPID_LICENSE = GPL-2.0+ -ACPID_LICENSE_FILES = COPYING - -define ACPID_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/acpid/S02acpid \ - $(TARGET_DIR)/etc/init.d/S02acpid -endef - -define ACPID_SET_EVENTS - mkdir -p $(TARGET_DIR)/etc/acpi/events - printf "event=button[ /]power\naction=/sbin/poweroff\n" \ - >$(TARGET_DIR)/etc/acpi/events/powerbtn -endef - -ACPID_POST_INSTALL_TARGET_HOOKS += ACPID_SET_EVENTS - -$(eval $(autotools-package)) diff --git a/package.bak/acpitool/Config.in b/package.bak/acpitool/Config.in deleted file mode 100644 index a6f082cc5c..0000000000 --- a/package.bak/acpitool/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_ACPITOOL - bool "acpitool" - depends on !BR2_bfin - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - help - A small, convenient command-line ACPI client with a lot of - features for Linux - - http://acpitool.sourceforge.net - -comment "acpitool needs a toolchain w/ threads, C++, dynamic library" - depends on !BR2_bfin - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/acpitool/acpitool.hash b/package.bak/acpitool/acpitool.hash deleted file mode 100644 index e25dc546f3..0000000000 --- a/package.bak/acpitool/acpitool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 004fb6cd43102918b6302cf537a2db7ceadda04aef2e0906ddf230f820dad34f acpitool-0.5.1.tar.bz2 diff --git a/package.bak/acpitool/acpitool.mk b/package.bak/acpitool/acpitool.mk deleted file mode 100644 index 547da3756c..0000000000 --- a/package.bak/acpitool/acpitool.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# acpitool -# -################################################################################ - -ACPITOOL_VERSION = 0.5.1 -ACPITOOL_SOURCE = acpitool-$(ACPITOOL_VERSION).tar.bz2 -ACPITOOL_SITE = http://downloads.sourceforge.net/sourceforge/acpitool -ACPITOOL_LICENSE = GPL-2.0+ -ACPITOOL_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/acsccid/Config.in b/package.bak/acsccid/Config.in deleted file mode 100644 index 90624ee797..0000000000 --- a/package.bak/acsccid/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_ACSCCID - bool "acsccid" - depends on BR2_TOOLCHAIN_HAS_THREADS # pcsc-lite, libusb - depends on BR2_USE_MMU # pcsc-lite - depends on !BR2_STATIC_LIBS # pcsc-lite - select BR2_PACKAGE_PCSC_LITE - # Even though there is a --disable-libusb option, it has in - # fact no effect, and acsccid really requires libusb. - select BR2_PACKAGE_LIBUSB - help - acsccid is a PC/SC driver for Linux/Mac OS X and it supports - ACS CCID smart card readers. - - http://acsccid.sourceforge.net/ - -comment "acsccid needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/acsccid/acsccid.hash b/package.bak/acsccid/acsccid.hash deleted file mode 100644 index 24d2fa735f..0000000000 --- a/package.bak/acsccid/acsccid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/acsccid/files/acsccid/1.1.4/ -sha1 8c0b42ff79032289731916d18a2698b258dfd6a2 acsccid-1.1.4.tar.bz2 -md5 ac77b3aeae0a11723c96c7f98769490e acsccid-1.1.4.tar.bz2 diff --git a/package.bak/acsccid/acsccid.mk b/package.bak/acsccid/acsccid.mk deleted file mode 100644 index 06a04185e2..0000000000 --- a/package.bak/acsccid/acsccid.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# acsccid -# -################################################################################ - -ACSCCID_VERSION = 1.1.4 -ACSCCID_SOURCE = acsccid-$(ACSCCID_VERSION).tar.bz2 -ACSCCID_SITE = http://downloads.sourceforge.net/acsccid -ACSCCID_LICENSE = LGPL-2.1+ -ACSCCID_LICENSE_FILES = COPYING -ACSCCID_INSTALL_STAGING = YES -ACSCCID_DEPENDENCIES = pcsc-lite host-flex host-pkgconf libusb - -$(eval $(autotools-package)) diff --git a/package.bak/adwaita-icon-theme/Config.in b/package.bak/adwaita-icon-theme/Config.in deleted file mode 100644 index d200570e76..0000000000 --- a/package.bak/adwaita-icon-theme/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_ADWAITA_ICON_THEME - bool "adwaita icon theme" - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3 - help - Adwaita icon theme diff --git a/package.bak/adwaita-icon-theme/adwaita-icon-theme.hash b/package.bak/adwaita-icon-theme/adwaita-icon-theme.hash deleted file mode 100644 index 61b5f14d25..0000000000 --- a/package.bak/adwaita-icon-theme/adwaita-icon-theme.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/3.22/adwaita-icon-theme-3.22.0.sha256sum -sha256 c18bf6e26087d9819a962c77288b291efab25d0419b73d909dd771716a45dcb7 adwaita-icon-theme-3.22.0.tar.xz diff --git a/package.bak/adwaita-icon-theme/adwaita-icon-theme.mk b/package.bak/adwaita-icon-theme/adwaita-icon-theme.mk deleted file mode 100644 index 8c9dec14f5..0000000000 --- a/package.bak/adwaita-icon-theme/adwaita-icon-theme.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# adwaita-icon-theme -# -################################################################################ - -ADWAITA_ICON_THEME_VERSION_MAJOR = 3.22 -ADWAITA_ICON_THEME_VERSION = $(ADWAITA_ICON_THEME_VERSION_MAJOR).0 -ADWAITA_ICON_THEME_SITE = http://ftp.gnome.org/pub/gnome/sources/adwaita-icon-theme/$(ADWAITA_ICON_THEME_VERSION_MAJOR) -ADWAITA_ICON_THEME_SOURCE = adwaita-icon-theme-$(ADWAITA_ICON_THEME_VERSION).tar.xz -ADWAITA_ICON_THEME_INSTALL_STAGING = YES -ADWAITA_ICON_THEME_LICENSE = LGPL-3.0 or CC-BY-SA-3.0 -ADWAITA_ICON_THEME_LICENSE_FILES = COPYING COPYING_LGPL COPYING_CCBYSA3 -ADWAITA_ICON_THEME_DEPENDENCIES = host-intltool host-libgtk3 - -$(eval $(autotools-package)) diff --git a/package.bak/aer-inject/Config.in b/package.bak/aer-inject/Config.in deleted file mode 100644 index 7c737d4280..0000000000 --- a/package.bak/aer-inject/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_AER_INJECT - bool "aer-inject" - help - aer-inject allows to inject PCIE AER errors on the software - level into a running Linux kernel. This is intended for - validation of the PCIE driver error recovery handler and - PCIE AER core handler. - - Requires a new Linux kernel with PCIE AER error injection - patches. - - https://git.kernel.org/cgit/linux/kernel/git/gong.chen/aer-inject.git/ diff --git a/package.bak/aer-inject/aer-inject.hash b/package.bak/aer-inject/aer-inject.hash deleted file mode 100644 index 6329de6df7..0000000000 --- a/package.bak/aer-inject/aer-inject.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 49a44b7a9e3983dc15fdc5bacd0e095df650296024f43f9d6c080ad54de0b07f aer-inject-9bd5e2c7886fca72f139cd8402488a2235957d41.tar.gz diff --git a/package.bak/aer-inject/aer-inject.mk b/package.bak/aer-inject/aer-inject.mk deleted file mode 100644 index 72495bbea2..0000000000 --- a/package.bak/aer-inject/aer-inject.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# aer-inject -# -################################################################################ - -AER_INJECT_VERSION = 9bd5e2c7886fca72f139cd8402488a2235957d41 -AER_INJECT_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/gong.chen/aer-inject.git -AER_INJECT_LICENSE = GPL-2.0 -AER_INJECT_LICENSE_FILES = README -AER_INJECT_DEPENDENCIES = host-flex host-bison - -define AER_INJECT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define AER_INJECT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR=$(TARGET_DIR) PREFIX=/usr/bin install -endef - -$(eval $(generic-package)) diff --git a/package.bak/aespipe/Config.in b/package.bak/aespipe/Config.in deleted file mode 100644 index 2c2ff5cd8c..0000000000 --- a/package.bak/aespipe/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_AESPIPE - bool "aespipe" - depends on BR2_USE_MMU # fork() - help - aespipe program is AES encrypting or decrypting pipe. It reads - from standard input and writes to standard output. It can be - used to create and restore encrypted tar or cpio archives. - It can be used to encrypt and decrypt loop-AES compatible - encrypted disk images. - - http://koti.tnnet.fi/jari.ruusu/linux/ diff --git a/package.bak/aespipe/Config.in.host b/package.bak/aespipe/Config.in.host deleted file mode 100644 index b64868ce74..0000000000 --- a/package.bak/aespipe/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_AESPIPE - bool "host aespipe" - help - aespipe program is AES encrypting or decrypting pipe. It - reads from standard input and writes to standard output. It - can be used to create and restore encrypted tar or cpio - archives. It can be used to encrypt and decrypt loop-AES - compatible encrypted disk images. - - http://koti.tnnet.fi/jari.ruusu/linux/ diff --git a/package.bak/aespipe/aespipe.hash b/package.bak/aespipe/aespipe.hash deleted file mode 100644 index cc7640a0d0..0000000000 --- a/package.bak/aespipe/aespipe.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c5ce656e0ade49b93e1163ec7b35450721d5743d8d804ad3a9e39add0389e50f aespipe-v2.4d.tar.bz2 diff --git a/package.bak/aespipe/aespipe.mk b/package.bak/aespipe/aespipe.mk deleted file mode 100644 index 5ef95d5206..0000000000 --- a/package.bak/aespipe/aespipe.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# aespipe -# -################################################################################ - -AESPIPE_VERSION = 2.4d -AESPIPE_SOURCE = aespipe-v$(AESPIPE_VERSION).tar.bz2 -AESPIPE_SITE = http://loop-aes.sourceforge.net/aespipe -AESPIPE_LICENSE = GPL - -# Recent Debian, Gentoo and Ubuntu enable -fPIE by default, breaking the build: -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837393 -# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=835148 -# Older gcc versions however don't support the -no-pie flag, so we have to -# check its availability. -HOST_AESPIPE_NO_PIE_FLAG = $(call host-cc-option,-no-pie) -HOST_AESPIPE_CONF_ENV = \ - CFLAGS="$(HOST_CFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" \ - LDFLAGS="$(HOST_LDFLAGS) $(HOST_AESPIPE_NO_PIE_FLAG)" - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/agentpp/Config.in b/package.bak/agentpp/Config.in deleted file mode 100644 index 8c6b11d644..0000000000 --- a/package.bak/agentpp/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_AGENTPP - bool "agent++" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # snmp++ - depends on !BR2_STATIC_LIBS # snmp++ - select BR2_PACKAGE_SNMPPP - help - AGENT++ is a set of C++ classes which provides a complete - protocol engine and dispatch table for the development of - SNMP agents. AGENT++ is a multilingual API which supports - SNMPv1, SNMPv2c, and SNMPv3. It provides various C++ classes - implementing prototypes for scalar and table SNMP managed - objects that can be customized by derivation. Additional - classes support the development of proxy agents as well as - sending notifications. - - SNMPv3 support is enabled if SNMP++ enables it. - - http://www.agentpp.com/agentpp3_5/agentpp3_5.html - -comment "agent++ needs a toolchain w/ threads, C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/agentpp/agentpp.hash b/package.bak/agentpp/agentpp.hash deleted file mode 100644 index 131edc4a17..0000000000 --- a/package.bak/agentpp/agentpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 6775fa2a038801edddedc148d7846427ddc4d438e3bb33362d9eec6074918a88 agent++-4.0.7.tar.gz diff --git a/package.bak/agentpp/agentpp.mk b/package.bak/agentpp/agentpp.mk deleted file mode 100644 index 12cf2089e9..0000000000 --- a/package.bak/agentpp/agentpp.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# agentpp -# -################################################################################ - -AGENTPP_VERSION = 4.0.7 -AGENTPP_SOURCE = agent++-$(AGENTPP_VERSION).tar.gz -AGENTPP_SITE = http://www.agentpp.com/download -AGENTPP_LICENSE = Apache-2.0 -AGENTPP_LICENSE_FILES = LICENSE-2_0.txt -AGENTPP_INSTALL_STAGING = YES -AGENTPP_DEPENDENCIES = host-pkgconf snmppp -AGENTPP_CONF_OPTS += \ - --disable-proxy \ - --disable-forwarder \ - --disable-rpath - -$(eval $(autotools-package)) diff --git a/package.bak/aircrack-ng/0001-stack-protector.patch b/package.bak/aircrack-ng/0001-stack-protector.patch deleted file mode 100644 index 5f2bd1b18f..0000000000 --- a/package.bak/aircrack-ng/0001-stack-protector.patch +++ /dev/null @@ -1,58 +0,0 @@ -Added option to disable stack-protector support auto-detection in gcc. - -Downloaded from upstream commit: -http://trac.aircrack-ng.org/changeset/2889/ - -Signed-off-by: Bernd Kuhls - -Index: /trunk/INSTALLING -=================================================================== ---- trunk/INSTALLING (revision 2888) -+++ trunk/INSTALLING (revision 2889) -@@ -83,4 +83,6 @@ - * macport: Set this flag to true to compile on OS X with macports. - -+* stackprotector: Allows to enable/disable auto-detection of stack-protector support in gcc -+ - Example: - -Index: /trunk/common.mak -=================================================================== ---- trunk/common.mak (revision 2888) -+++ trunk/common.mak (revision 2889) -@@ -64,4 +64,13 @@ - ifeq ($(PCRE), true) - COMMON_CFLAGS += $(shell $(PKG_CONFIG) --cflags libpcre) -DHAVE_PCRE -+endif -+ -+STACK_PROTECTOR = true -+ifeq ($(stackprotector), false) -+ STACK_PROTECTOR = false -+endif -+ -+ifeq ($(STACKPROTECTOR), false) -+ STACK_PROTECTOR = false - endif - -@@ -235,12 +244,14 @@ - endif - --ifeq ($(GCC_OVER49), 0) -- ifeq ($(GCC_OVER41), 1) -- COMMON_CFLAGS += -fstack-protector -+ifeq ($(STACK_PROTECTOR), true) -+ ifeq ($(GCC_OVER49), 0) -+ ifeq ($(GCC_OVER41), 1) -+ COMMON_CFLAGS += -fstack-protector -+ endif - endif --endif -- --ifeq ($(GCC_OVER49), 1) -- COMMON_CFLAGS += -fstack-protector-strong -+ -+ ifeq ($(GCC_OVER49), 1) -+ COMMON_CFLAGS += -fstack-protector-strong -+ endif - endif - diff --git a/package.bak/aircrack-ng/Config.in b/package.bak/aircrack-ng/Config.in deleted file mode 100644 index 12fda1cbf2..0000000000 --- a/package.bak/aircrack-ng/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_AIRCRACK_NG - bool "aircrack-ng" - depends on BR2_USE_MMU # uses fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - # libnl has issues when linking statically - # they need fixing in libnl itself - select BR2_PACKAGE_LIBNL if !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - A set of tools for auditing wireless networks - - For complete functionality, also select ethtool, iw, - util-linux (utilities and rfkill), and wireless_tools. - - http://www.aircrack-ng.org/ - -comment "aircrack-ng needs a toolchain w/ threads, C++" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/aircrack-ng/aircrack-ng.hash b/package.bak/aircrack-ng/aircrack-ng.hash deleted file mode 100644 index e210ad2e4a..0000000000 --- a/package.bak/aircrack-ng/aircrack-ng.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://www.aircrack-ng.org/downloads.html -sha1 2b2fbe50fedb606b3bd96a34d49f07760e8e618a aircrack-ng-1.2-rc4.tar.gz -md5 3bbc7d5035a98ec01e78774d05c3fcce aircrack-ng-1.2-rc4.tar.gz diff --git a/package.bak/aircrack-ng/aircrack-ng.mk b/package.bak/aircrack-ng/aircrack-ng.mk deleted file mode 100644 index 6b384c0720..0000000000 --- a/package.bak/aircrack-ng/aircrack-ng.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# aircrack-ng -# -################################################################################ - -AIRCRACK_NG_VERSION = 1.2-rc4 -AIRCRACK_NG_SITE = http://download.aircrack-ng.org -AIRCRACK_NG_LICENSE = GPL-2.0+ -AIRCRACK_NG_LICENSE_FILES = LICENSE -AIRCRACK_NG_DEPENDENCIES = openssl zlib host-pkgconf -# Enable buddy-ng, easside-ng, tkiptun-ng, wesside-ng -AIRCRACK_NG_MAKE_OPTS = unstable=true - -# Account for libpthread in static -AIRCRACK_NG_LDFLAGS = $(TARGET_LDFLAGS) \ - $(if $(BR2_STATIC_LIBS),-lpthread -lz) - -# libnl support has issues when building static -ifeq ($(BR2_STATIC_LIBS),y) -AIRCRACK_NG_MAKE_OPTS += libnl=false -else -AIRCRACK_NG_MAKE_OPTS += libnl=true -AIRCRACK_NG_DEPENDENCIES += libnl -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_SSP),y) -AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=true -else -AIRCRACK_NG_MAKE_OPTS += STACK_PROTECTOR=false -endif - -ifeq ($(BR2_PACKAGE_LIBPCAP),y) -AIRCRACK_NG_DEPENDENCIES += libpcap -AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=yes \ - $(if $(BR2_STATIC_LIBS),LIBPCAP="-lpcap `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`") -else -AIRCRACK_NG_MAKE_OPTS += HAVE_PCAP=no -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -AIRCRACK_NG_DEPENDENCIES += pcre -AIRCRACK_NG_MAKE_OPTS += pcre=true -else -AIRCRACK_NG_MAKE_OPTS += pcre=false -endif - -# Duplicate -lpthread, because it is also needed by sqlite -ifeq ($(BR2_PACKAGE_SQLITE),y) -AIRCRACK_NG_DEPENDENCIES += sqlite -AIRCRACK_NG_MAKE_OPTS += sqlite=true LIBSQL="-lsqlite3 $(if $(BR2_STATIC_LIBS),-lpthread)" -else -AIRCRACK_NG_MAKE_OPTS += sqlite=false -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -AIRCRACK_NG_MAKE_OPTS += NEWSSE=true -else -AIRCRACK_NG_MAKE_OPTS += NEWSSE=false -endif - -define AIRCRACK_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(AIRCRACK_NG_LDFLAGS)" \ - $(MAKE) -C $(@D) $(AIRCRACK_NG_MAKE_OPTS) -endef - -define AIRCRACK_NG_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - prefix=/usr $(AIRCRACK_NG_MAKE_OPTS) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/alljoyn-base/Config.in b/package.bak/alljoyn-base/Config.in deleted file mode 100644 index 8556d66c60..0000000000 --- a/package.bak/alljoyn-base/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_BASE - bool "alljoyn-base" - depends on BR2_USE_MMU # alljoyn - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # alljoyn - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # alljoyn - select BR2_PACKAGE_ALLJOYN - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL if \ - !BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION && \ - !BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING - help - - AllJoyn Base Services are common services used by many - devices, providing a set of interfaces for different devices - to interact and interoperate with one another. - - https://allseenalliance.org - -if BR2_PACKAGE_ALLJOYN_BASE - -config BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL - bool "controlpanel" - help - Enable AllJoyn Control Panel base service which allows - devices to advertise a virtual control panel to be - controlled remotely. - -config BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION - bool "notification" - help - Enable AllJoyn Notification base service which allows - text-based notifications to be sent and received by devices - on the AllJoyn network. Also supports audio and images via - URLs. - -config BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING - bool "onboarding" - help - Enable AllJoyn Onboarding base service which provides a - consistent way to bring a new device onto the Wi-Fi network. - -endif # BR2_PACKAGE_ALLJOYN_BASE - -comment "alljoyn-base needs a toolchain w/ C++, threads, wchar, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/alljoyn-base/alljoyn-base.hash b/package.bak/alljoyn-base/alljoyn-base.hash deleted file mode 100644 index dbec3a3539..0000000000 --- a/package.bak/alljoyn-base/alljoyn-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 742f724b3a06c8fc4039591dba24871755728221ca5dc4afb78ebd9a7e3beb44 alljoyn-base-16.04.00.tar.gz diff --git a/package.bak/alljoyn-base/alljoyn-base.mk b/package.bak/alljoyn-base/alljoyn-base.mk deleted file mode 100644 index ad19802823..0000000000 --- a/package.bak/alljoyn-base/alljoyn-base.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# alljoyn-base -# -################################################################################ - -ALLJOYN_BASE_REV = 16.04 -ALLJOYN_BASE_VERSION = $(ALLJOYN_BASE_REV).00 -ALLJOYN_BASE_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_BASE_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_BASE_LICENSE = ISC - -ALLJOYN_BASE_DEPENDENCIES = host-scons alljoyn openssl -ALLJOYN_BASE_INSTALL_STAGING = YES - -ALLJOYN_BASE_CRYPTO = openssl - -# AllJoyn can be compiled in debug or release mode. By default, -# AllJoyn is built in debug mode. -ALLJOYN_BASE_VARIANT = release - -ALLJOYN_BASE_BINDINGS = c,cpp - -# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely -# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined -# otherwise compilation will fail. -# CROSS_COMPILE option should not be used as it works only for linux/ARM. -ALLJOYN_BASE_OS = openwrt -ALLJOYN_BASE_CPU = openwrt - -# AllJoyn install everything in this relative path -ALLJOYN_BASE_DISTDIR = \ - build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist - -ALLJOYN_BASE_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - OS=$(ALLJOYN_BASE_OS) \ - CPU=$(ALLJOYN_BASE_CPU) \ - VARIANT=$(ALLJOYN_BASE_VARIANT) \ - BR=off \ - CRYPTO=$(ALLJOYN_BASE_CRYPTO) \ - BINDINGS=$(ALLJOYN_BASE_BINDINGS) \ - ALLJOYN_DISTDIR="$(STAGING_DIR)"\ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ - TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CXX="$(TARGET_CXX)" \ - TARGET_LD="$(TARGET_LD)" \ - TARGET_LINK="$(TARGET_CXX)" \ - TARGET_AR="$(TARGET_AR)" \ - TARGET_RANLIB="$(TARGET_RANLIB)" \ - TARGET_PATH="$(BR_PATH)" - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_CONTROLPANEL), y) -ALLJOYN_BASE_TARGETS += controlpanel -endif - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_NOTIFICATION), y) -ALLJOYN_BASE_TARGETS += notification -endif - -ifeq ($(BR2_PACKAGE_ALLJOYN_BASE_ONBOARDING), y) -ALLJOYN_BASE_TARGETS += onboarding -endif - -define ALLJOYN_BASE_BUILD_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cd $(@D)/$(target); $(SCONS) $(ALLJOYN_BASE_SCONS_OPTS) - ) -endef - -define ALLJOYN_BASE_INSTALL_STAGING_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \ - $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/inc/* \ - $(STAGING_DIR)/usr/include/ - ) -endef - -define ALLJOYN_BASE_INSTALL_TARGET_CMDS - $(foreach target,$(ALLJOYN_BASE_TARGETS),\ - cp -a $(@D)/$(target)/$(ALLJOYN_BASE_DISTDIR)/*/lib/lib* \ - $(TARGET_DIR)/usr/lib/ - ) -endef - -$(eval $(generic-package)) diff --git a/package.bak/alljoyn-tcl-base/Config.in b/package.bak/alljoyn-tcl-base/Config.in deleted file mode 100644 index ebc3370afb..0000000000 --- a/package.bak/alljoyn-tcl-base/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_TCL_BASE - bool "alljoyn-tcl-base" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # alljoyn-tcl - select BR2_PACKAGE_ALLJOYN_TCL - help - AllJoyn Base Services are common services used by many - devices, providing a set of interfaces for different devices - to interact and interoperate with one another. - - Thin Client Library is designed to bring the benefits of the - AllJoyn distributed programming environment to embedded - systems. - - https://allseenalliance.org - -comment "alljoyn-tcl-base needs a toolchain w/ threads and dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.hash b/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.hash deleted file mode 100644 index 882839d7de..0000000000 --- a/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 741f7a71929ccd6a66bf75d2b03affc62411e229b70bb89399be9b1b2ce40629 alljoyn-base_tcl-16.04.00.tar.gz diff --git a/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.mk b/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.mk deleted file mode 100644 index 461cd097d6..0000000000 --- a/package.bak/alljoyn-tcl-base/alljoyn-tcl-base.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# alljoyn-tcl-base -# -################################################################################ - -ALLJOYN_TCL_BASE_REV = 16.04 -ALLJOYN_TCL_BASE_VERSION = $(ALLJOYN_TCL_BASE_REV).00 -ALLJOYN_TCL_BASE_SOURCE = alljoyn-base_tcl-$(ALLJOYN_TCL_BASE_VERSION).tar.gz -ALLJOYN_TCL_BASE_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_BASE_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_TCL_BASE_LICENSE = ISC - -ALLJOYN_TCL_BASE_DEPENDENCIES = host-scons alljoyn-tcl -ALLJOYN_TCL_BASE_INSTALL_STAGING = YES - -# AllJoyn Base Thin Core can be compiled in debug or release mode. By default, -# AllJoyn Base Thin Core is built in debug mode. -ALLJOYN_TCL_BASE_VARIANT = release - -ALLJOYN_TCL_BASE_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - VARIANT=$(ALLJOYN_TCL_BASE_VARIANT) \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - AJTCL_DIST=$(STAGING_DIR) \ - WS=off - -define ALLJOYN_TCL_BASE_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_BASE_SCONS_OPTS) -endef - -define ALLJOYN_TCL_BASE_INSTALL_STAGING_CMDS - cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/ -endef - -# Only install AllJoyn Base Thin Core dynamic libraries into target directory -define ALLJOYN_TCL_BASE_INSTALL_TARGET_CMDS - cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/alljoyn-tcl/Config.in b/package.bak/alljoyn-tcl/Config.in deleted file mode 100644 index fe54af08d4..0000000000 --- a/package.bak/alljoyn-tcl/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_ALLJOYN_TCL - bool "alljoyn-tcl" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The AllJoyn framework defines a common way for devices and - apps to communicate with one another regardless of brands, - categories, transports, and OSes. Developers write - applications that discover nearby devices, and communicate - with each other directly and through the cloud, unleashing - new possibilities in the Internet of Things. - - AllJoyn Thin Core Library (AJTCL) is designed to bring the - benefits of the AllJoyn distributed programming environment - to embedded systems. - - https://allseenalliance.org - -comment "alljoyn-tcl needs a toolchain w/ threads and dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/alljoyn-tcl/alljoyn-tcl.hash b/package.bak/alljoyn-tcl/alljoyn-tcl.hash deleted file mode 100644 index 208d676c8b..0000000000 --- a/package.bak/alljoyn-tcl/alljoyn-tcl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 da13614a9db79067937b744a87328fed84d99ba62e3de19b0ddc4a83e4b2447e ajtcl-16.04.00a-src.tar.gz diff --git a/package.bak/alljoyn-tcl/alljoyn-tcl.mk b/package.bak/alljoyn-tcl/alljoyn-tcl.mk deleted file mode 100644 index cabdf8992a..0000000000 --- a/package.bak/alljoyn-tcl/alljoyn-tcl.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# alljoyn-tcl -# -################################################################################ - -ALLJOYN_TCL_REV = 16.04 -ALLJOYN_TCL_VERSION = $(ALLJOYN_TCL_REV).00a -ALLJOYN_TCL_SOURCE = ajtcl-$(ALLJOYN_TCL_VERSION)-src.tar.gz -ALLJOYN_TCL_SITE = \ - https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_TCL_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_TCL_LICENSE = ISC - -ALLJOYN_TCL_DEPENDENCIES = host-scons -ALLJOYN_TCL_INSTALL_STAGING = YES - -# AllJoyn Thin Core can be compiled in debug or release mode. By default, -# AllJoyn Thin Core is built in debug mode. -ALLJOYN_TCL_VARIANT = release - -ALLJOYN_TCL_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - VARIANT=$(ALLJOYN_TCL_VARIANT) \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" - -define ALLJOYN_TCL_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_TCL_SCONS_OPTS) -endef - -define ALLJOYN_TCL_INSTALL_STAGING_CMDS - cp -a $(@D)/dist/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/dist/include/* $(STAGING_DIR)/usr/include/ -endef - -# Only install AllJoyn Thin Core dynamic libraries into target directory -define ALLJOYN_TCL_INSTALL_TARGET_CMDS - cp -a $(@D)/dist/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch b/package.bak/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch deleted file mode 100644 index efca67feae..0000000000 --- a/package.bak/alljoyn/0001-UARTStreamLinux-fix-build-on-sparc.patch +++ /dev/null @@ -1,56 +0,0 @@ -From b8e35cf95184ff18bcf923f900439f56c93609db Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 16 Jul 2016 15:23:41 +0200 -Subject: [PATCH] UARTStreamLinux: fix build on sparc - -Some of the serial port highest speed are not defined on SPARC, so -alljoyn should not use them, so we add a patch to fix that. - -From: -https://git.buildroot.org/buildroot/commit/?id=c5e96d8935016456bea342db170ae6a139a8470f - -Fixes: -http://autobuild.buildroot.net/results/e5b/e5b30b5e0d86b44b97410d434b771e1fb7b18de0 - -Signed-off-by: Romain Naour ---- - common/os/posix/UARTStreamLinux.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/common/os/posix/UARTStreamLinux.cc b/common/os/posix/UARTStreamLinux.cc -index c193b70..ae81d9d 100644 ---- a/common/os/posix/UARTStreamLinux.cc -+++ b/common/os/posix/UARTStreamLinux.cc -@@ -111,21 +111,29 @@ QStatus UART(const qcc::String& devName, uint32_t baud, uint8_t databits, const - speed = B2000000; - break; - -+#ifdef B2500000 - case 2500000: - speed = B2500000; - break; -+#endif - -+#ifdef B3000000 - case 3000000: - speed = B3000000; - break; -+#endif - -+#ifdef B3500000 - case 3500000: - speed = B3500000; - break; -+#endif - -+#ifdef B4000000 - case 4000000: - speed = B4000000; - break; -+#endif - - default: - QCC_LogError(ER_BAD_ARG_2, ("Invalid baud %d", baud)); --- -2.5.5 - diff --git a/package.bak/alljoyn/Config.in b/package.bak/alljoyn/Config.in deleted file mode 100644 index 6eb417daf8..0000000000 --- a/package.bak/alljoyn/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_ALLJOYN - bool "alljoyn" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_OPENSSL - help - The AllJoyn framework defines a common way for devices and - apps to communicate with one another regardless of brands, - categories, transports, and OSes. Developers write - applications that discover nearby devices, and communicate - with each other directly and through the cloud, unleashing - new possibilities in the Internet of Things. - - https://allseenalliance.org - -comment "alljoyn needs a toolchain w/ C++, threads, wchar and dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/alljoyn/alljoyn.hash b/package.bak/alljoyn/alljoyn.hash deleted file mode 100644 index 47dd0d4de4..0000000000 --- a/package.bak/alljoyn/alljoyn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fc437d96cf1213f18048240b5d12a374b31894d21830a0a6ccf562ffa13425d5 alljoyn-16.04.00a-src.tar.gz diff --git a/package.bak/alljoyn/alljoyn.mk b/package.bak/alljoyn/alljoyn.mk deleted file mode 100644 index 69d5dedc41..0000000000 --- a/package.bak/alljoyn/alljoyn.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# alljoyn -# -################################################################################ - -ALLJOYN_REV = 16.04 -ALLJOYN_VERSION = $(ALLJOYN_REV).00a -ALLJOYN_SOURCE = alljoyn-$(ALLJOYN_VERSION)-src.tar.gz -ALLJOYN_SITE = https://mirrors.kernel.org/allseenalliance/alljoyn/$(ALLJOYN_REV) -# See https://allseenalliance.org/alliance/ip-policy -ALLJOYN_LICENSE = ISC - -ALLJOYN_DEPENDENCIES = host-scons libcap openssl -ALLJOYN_INSTALL_STAGING = YES - -ALLJOYN_CRYPTO = openssl - -# AllJoyn can be compiled in debug or release mode. By default, AllJoyn is built -# in debug mode. -ALLJOYN_VARIANT = release - -ALLJOYN_BINDINGS = c,cpp - -# By setting openwrt for OS and CPU, AllJoyn cross-compilation can be finely -# tuned through TARGET_xxx options. All TARGET_xxx variables must be defined -# otherwise compilation will fail. -# CROSS_COMPILE option should not be used as it works only for linux/ARM. -ALLJOYN_OS = openwrt -ALLJOYN_CPU = openwrt - -# AllJoyn installs everything in this relative path -ALLJOYN_DISTDIR = build/$(ALLJOYN_OS)/$(ALLJOYN_CPU)/$(ALLJOYN_VARIANT)/dist/ - -ALLJOYN_SCONS_OPTS = \ - -j$(PARALLEL_JOBS) \ - V=1 \ - OS=$(ALLJOYN_OS) \ - CPU=$(ALLJOYN_CPU) \ - VARIANT=$(ALLJOYN_VARIANT) \ - BR=off \ - CRYPTO=$(ALLJOYN_CRYPTO) \ - BINDINGS=$(ALLJOYN_BINDINGS) \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_CPPFLAGS="$(TARGET_CPPFLAGS)" \ - TARGET_LINKFLAGS="$(TARGET_LINKFLAGS)" \ - TARGET_CC="$(TARGET_CC)" \ - TARGET_CXX="$(TARGET_CXX)" \ - TARGET_LD="$(TARGET_LD)" \ - TARGET_LINK="$(TARGET_CXX)" \ - TARGET_AR="$(TARGET_AR)" \ - TARGET_RANLIB="$(TARGET_RANLIB)" \ - TARGET_PATH="$(BR_PATH)" - -define ALLJOYN_BUILD_CMDS - cd $(@D); $(SCONS) $(ALLJOYN_SCONS_OPTS) -endef - -define ALLJOYN_INSTALL_STAGING_CMDS - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/inc/* $(STAGING_DIR)/usr/include/ -endef - -# Only install alljoyn dynamic libraries into target directory -define ALLJOYN_INSTALL_TARGET_CMDS - cp -a $(@D)/$(ALLJOYN_DISTDIR)/*/lib/lib*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/alsa-lib/0001-musl-pcm-h.patch b/package.bak/alsa-lib/0001-musl-pcm-h.patch deleted file mode 100644 index ce1528c572..0000000000 --- a/package.bak/alsa-lib/0001-musl-pcm-h.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix musl-related build errors in packages depending on alsa, in our case -this fixes openal. - -Downloaded from -http://git.alpinelinux.org/cgit/aports/tree/main/alsa-lib/alsa-lib_pcm_h.patch - -Signed-off-by: Bernd Kuhls - ---- alsa-lib-1.0.25/include/pcm.h -+++ alsa-lib-1.0.25.patched/include/pcm.h -@@ -33,6 +33,7 @@ - extern "C" { - #endif - -+#include - /** - * \defgroup PCM PCM Interface - * See the \ref pcm page for more details. -@@ -941,10 +942,10 @@ - int snd_pcm_format_physical_width(snd_pcm_format_t format); /* in bits */ - snd_pcm_format_t snd_pcm_build_linear_format(int width, int pwidth, int unsignd, int big_endian); - ssize_t snd_pcm_format_size(snd_pcm_format_t format, size_t samples); --u_int8_t snd_pcm_format_silence(snd_pcm_format_t format); --u_int16_t snd_pcm_format_silence_16(snd_pcm_format_t format); --u_int32_t snd_pcm_format_silence_32(snd_pcm_format_t format); --u_int64_t snd_pcm_format_silence_64(snd_pcm_format_t format); -+uint8_t snd_pcm_format_silence(snd_pcm_format_t format); -+uint16_t snd_pcm_format_silence_16(snd_pcm_format_t format); -+uint32_t snd_pcm_format_silence_32(snd_pcm_format_t format); -+uint64_t snd_pcm_format_silence_64(snd_pcm_format_t format); - int snd_pcm_format_set_silence(snd_pcm_format_t format, void *buf, unsigned int samples); - - snd_pcm_sframes_t snd_pcm_bytes_to_frames(snd_pcm_t *pcm, ssize_t bytes); diff --git a/package.bak/alsa-lib/0002-no-mmu.patch b/package.bak/alsa-lib/0002-no-mmu.patch deleted file mode 100644 index 2ae0f67158..0000000000 --- a/package.bak/alsa-lib/0002-no-mmu.patch +++ /dev/null @@ -1,45 +0,0 @@ -Don't use fork() on noMMU platforms - -[Gustavo: update patch for 1.0.28] -Signed-off-by: Thomas Petazzoni - -Index: alsa-lib-1.0.26/configure.ac -=================================================================== ---- alsa-lib-1.0.26.orig/configure.ac 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/configure.ac 2013-03-09 16:22:08.000000000 +0100 -@@ -66,6 +66,8 @@ - AM_CONDITIONAL(ALSA_HSEARCH_R, [test "x$HAVE_HSEARCH_R" != xyes]) - AC_CHECK_FUNCS([uselocale]) - -+AC_CHECK_FUNC([fork]) -+ - SAVE_LIBRARY_VERSION - AC_SUBST(LIBTOOL_VERSION_INFO) - -Index: alsa-lib-1.0.26/src/pcm/pcm_direct.c -=================================================================== ---- alsa-lib-1.0.26.orig/src/pcm/pcm_direct.c 2012-09-06 10:55:14.000000000 +0200 -+++ alsa-lib-1.0.26/src/pcm/pcm_direct.c 2013-03-09 16:22:51.000000000 +0100 -@@ -424,13 +424,21 @@ - close(dmix->server_fd); - return ret; - } -- -+ -+#ifdef HAVE_FORK - ret = fork(); -+#else -+ ret = vfork(); -+#endif - if (ret < 0) { - close(dmix->server_fd); - return ret; - } else if (ret == 0) { -+#ifdef HAVE_FORK - ret = fork(); -+#else -+ ret = vfork(); -+#endif - if (ret == 0) - server_job(dmix); - _exit(EXIT_SUCCESS); diff --git a/package.bak/alsa-lib/0003-dlmisc.patch b/package.bak/alsa-lib/0003-dlmisc.patch deleted file mode 100644 index 24b7230cae..0000000000 --- a/package.bak/alsa-lib/0003-dlmisc.patch +++ /dev/null @@ -1,59 +0,0 @@ -alsa-lib: provide dummy definitions of RTLD_* if necessary - -The FLAT GNU toolchain (e.g. blackfin) doesn't include the dlfcn.h header -file, so we need to guard that include. Additionally, provide dummy -definitions for parameters RTLD_GLOBAL / RTLD_NOW which are normally -provided by dlfcn.h. - -Signed-off-by: Sonic Zhang -[Thomas: don't add separate dlmisc.h, move dummy defs to global.h] -Signed-off-by: Thomas De Schampheleire - -diff --git a/include/global.h b/include/global.h ---- a/include/global.h -+++ b/include/global.h -@@ -97,6 +97,16 @@ extern struct snd_dlsym_link *snd_dlsym_ - /** \brief Returns the version of a dynamic symbol as a string. */ - #define SND_DLSYM_VERSION(version) __STRING(version) - -+/* RTLD_NOW and RTLD_GLOBAL (used for 'mode' in snd_dlopen) are not defined -+ * on all arches (e.g. blackfin), so provide a dummy definition here. */ -+#ifndef RTLD_NOW -+#define RTLD_NOW 0 -+#endif -+ -+#ifndef RTLD_GLOBAL -+#define RTLD_GLOBAL 0 -+#endif -+ - void *snd_dlopen(const char *file, int mode); - void *snd_dlsym(void *handle, const char *name, const char *version); - int snd_dlclose(void *handle); -diff --git a/modules/mixer/simple/sbasedl.c b/modules/mixer/simple/sbasedl.c ---- a/modules/mixer/simple/sbasedl.c -+++ b/modules/mixer/simple/sbasedl.c -@@ -27,7 +27,9 @@ - #include - #include - #include -+#include "config.h" -+#ifdef HAVE_DLFCN - #include -+#endif --#include "config.h" - #include "asoundlib.h" - #include "mixer_abst.h" -diff --git a/src/mixer/simple_abst.c b/src/mixer/simple_abst.c ---- a/src/mixer/simple_abst.c -+++ b/src/mixer/simple_abst.c -@@ -34,7 +34,9 @@ - #include - #include - #include -+#include "config.h" -+#ifdef HAVE_DLFCN - #include -+#endif --#include "config.h" - #include "asoundlib.h" - #include "mixer_simple.h" diff --git a/package.bak/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch b/package.bak/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch deleted file mode 100644 index c533419baa..0000000000 --- a/package.bak/alsa-lib/0004-conditional-enabling-of-libdl-in-m4.patch +++ /dev/null @@ -1,35 +0,0 @@ -alsa-lib: conditionally enable libdl in AM_PATH_ALSA m4 macro - -The AM_PATH_ALSA macro in utils/alsa.m4 unconditionally uses -ldl. This -breaks compilation of alsa-utils (and probably other packages using this -macro) for targets that do not support dynamic loading, such as for -Blackfin FLAT binaries. - -This patch updates the macro to check if dlopen is available, and use that -result to conditionally add -ldl to the list of libraries. - -Signed-off-by: Thomas De Schampheleire - ---- - -diff --git a/utils/alsa.m4 b/utils/alsa.m4 ---- a/utils/alsa.m4 -+++ b/utils/alsa.m4 -@@ -44,6 +44,8 @@ if test "$alsa_inc_prefix" != "" ; then - fi - AC_MSG_RESULT($ALSA_CFLAGS) - -+AC_CHECK_LIB(c, dlopen, LIBDL="", [AC_CHECK_LIB(dl, dlopen, LIBDL="-ldl")]) -+ - dnl add any special lib dirs - AC_MSG_CHECKING(for ALSA LDFLAGS) - if test "$alsa_prefix" != "" ; then -@@ -52,7 +54,7 @@ if test "$alsa_prefix" != "" ; then - fi - - dnl add the alsa library --ALSA_LIBS="$ALSA_LIBS -lasound -lm -ldl -lpthread" -+ALSA_LIBS="$ALSA_LIBS -lasound -lm $LIBDL -lpthread" - LIBS="$ALSA_LIBS $LIBS" - AC_MSG_RESULT($ALSA_LIBS) - diff --git a/package.bak/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch b/package.bak/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch deleted file mode 100644 index 72646dda8d..0000000000 --- a/package.bak/alsa-lib/0005-src-rawmidi-rawmidi_symbols.c-use-rawmidi_virt-only-.patch +++ /dev/null @@ -1,52 +0,0 @@ -From da16e18f03fc63e1206b93d6a719b177d4f4bb99 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Aug 2017 22:33:01 +0200 -Subject: [PATCH] src/rawmidi/rawmidi_symbols.c: use rawmidi_virt only when - available - -src/rawmidi/Makefile.am only brings rawmidi_virt.c into the build when -BUILD_SEQ is defined (i.e when --enable-seq is passed). However, -rawmidi_symbols.c unconditionally refers to _snd_module_rawmidi_virt, -defined in rawmidi_virt.c. - -This causes a link failure when BUILD_SEQ is disabled. For example -when linking ffmpeg against alsa-lib: - -/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(pcm_dmix.o): In function `snd_pcm_dmix_sync_ptr': -pcm_dmix.c:(.text+0x83c): warning: -/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libasound.a(rawmidi_symbols.o):(.data+0x4): undefined reference to `_snd_module_rawmidi_virt' -collect2: error: ld returned 1 exit status - -To fix this, we make sure that rawmidi_symbols.c only uses -_snd_module_rawmidi_virt when available. - -Signed-off-by: Thomas Petazzoni - -Patch sent upstream: https://www.spinics.net/lists/alsa-devel/msg65902.html ---- - src/rawmidi/rawmidi_symbols.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/rawmidi/rawmidi_symbols.c b/src/rawmidi/rawmidi_symbols.c -index cdc06d7..6473433 100644 ---- a/src/rawmidi/rawmidi_symbols.c -+++ b/src/rawmidi/rawmidi_symbols.c -@@ -21,11 +21,15 @@ - #ifndef PIC - - extern const char *_snd_module_rawmidi_hw; -+#ifdef BUILD_SEQ - extern const char *_snd_module_rawmidi_virt; -+#endif - - static const char **snd_rawmidi_open_objects[] = { - &_snd_module_rawmidi_hw, -+#ifdef BUILD_SEQ - &_snd_module_rawmidi_virt -+#endif - }; - - void *snd_rawmidi_open_symbols(void) --- -2.9.4 - diff --git a/package.bak/alsa-lib/Config.in b/package.bak/alsa-lib/Config.in deleted file mode 100644 index 995d379167..0000000000 --- a/package.bak/alsa-lib/Config.in +++ /dev/null @@ -1,78 +0,0 @@ -comment "alsa-lib needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -menuconfig BR2_PACKAGE_ALSA_LIB - bool "alsa-lib" - # Even though some parts of alsa-lib use threads only when - # available, some PCM plugins use them unconditionally. Since - # the usage of alsa-lib on no-thread systems is pretty - # unlikely, just require thread support globally for alsa-lib. - depends on BR2_TOOLCHAIN_HAS_THREADS - # Temporary until - # https://bugtrack.alsa-project.org/alsa-bug/view.php?id=4913 - # is fixed - select BR2_PACKAGE_ALSA_LIB_PCM - help - The Advanced Linux Sound Architecture (ALSA) provides audio - and MIDI functionality to the Linux operating system. - - http://www.alsa-project.org/ - -if BR2_PACKAGE_ALSA_LIB - -config BR2_PACKAGE_ALSA_LIB_PYTHON - bool "Python support for alsa-lib" - depends on BR2_PACKAGE_PYTHON - help - Add python support for alsa-lib. - Python will be built and libpython will be installed - in the target directory - http://www.alsa-project.org/ - -config BR2_PACKAGE_ALSA_LIB_DEVDIR - string "directory with ALSA device files" - default "/dev/snd" - -config BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS - string "built PCM plugins" - default "all" if BR2_USE_MMU - default "copy linear route mulaw alaw adpcm rate plug multi file null empty share meter hooks lfloat ladspa dmix dshare dsnoop asym iec958 softvol extplug ioplug mmap_emul" if !BR2_USE_MMU - -config BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS - string "built control plugins" - default "all" - -config BR2_PACKAGE_ALSA_LIB_ALOAD - bool "aload" - default y - -config BR2_PACKAGE_ALSA_LIB_MIXER - bool "mixer" - default y - -config BR2_PACKAGE_ALSA_LIB_PCM - bool "pcm" - default y - -config BR2_PACKAGE_ALSA_LIB_RAWMIDI - bool "rawmidi" - default y - -config BR2_PACKAGE_ALSA_LIB_HWDEP - bool "hwdep" - default y - -config BR2_PACKAGE_ALSA_LIB_SEQ - bool "seq" - default y - -config BR2_PACKAGE_ALSA_LIB_ALISP - bool "alisp" - default y - depends on BR2_USE_MMU - -config BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS - bool "old-symbols" - default y - -endif diff --git a/package.bak/alsa-lib/alsa-lib.hash b/package.bak/alsa-lib/alsa-lib.hash deleted file mode 100644 index cf2a705b39..0000000000 --- a/package.bak/alsa-lib/alsa-lib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 91bb870c14d1c7c269213285eeed874fa3d28112077db061a3af8010d0885b76 alsa-lib-1.1.4.1.tar.bz2 diff --git a/package.bak/alsa-lib/alsa-lib.mk b/package.bak/alsa-lib/alsa-lib.mk deleted file mode 100644 index 12fa408cff..0000000000 --- a/package.bak/alsa-lib/alsa-lib.mk +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################ -# -# alsa-lib -# -################################################################################ - -ALSA_LIB_VERSION = 1.1.4.1 -ALSA_LIB_SOURCE = alsa-lib-$(ALSA_LIB_VERSION).tar.bz2 -ALSA_LIB_SITE = ftp://ftp.alsa-project.org/pub/lib -ALSA_LIB_LICENSE = LGPL-2.1+ (library), GPL-2.0+ (aserver) -ALSA_LIB_LICENSE_FILES = COPYING aserver/COPYING -ALSA_LIB_INSTALL_STAGING = YES -ALSA_LIB_CFLAGS = $(TARGET_CFLAGS) -ALSA_LIB_AUTORECONF = YES -ALSA_LIB_CONF_OPTS = \ - --with-alsa-devdir=$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_DEVDIR)) \ - --with-pcm-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_PCM_PLUGINS))" \ - --with-ctl-plugins="$(call qstrip,$(BR2_PACKAGE_ALSA_LIB_CTL_PLUGINS))" \ - --without-versioned - -# Can't build with static & shared at the same time (1.0.25+) -ifeq ($(BR2_STATIC_LIBS),y) -ALSA_LIB_CONF_OPTS += \ - --enable-shared=no \ - --without-libdl -else -ALSA_LIB_CONF_OPTS += --enable-static=no -endif - -ifneq ($(BR2_PACKAGE_ALSA_LIB_ALOAD),y) -ALSA_LIB_CONF_OPTS += --disable-aload -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y) -ALSA_LIB_CONF_OPTS += --disable-mixer -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) -ALSA_LIB_CONF_OPTS += --disable-pcm -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_RAWMIDI),y) -ALSA_LIB_CONF_OPTS += --disable-rawmidi -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_HWDEP),y) -ALSA_LIB_CONF_OPTS += --disable-hwdep -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_SEQ),y) -ALSA_LIB_CONF_OPTS += --disable-seq -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_ALISP),y) -ALSA_LIB_CONF_OPTS += --disable-alisp -endif -ifneq ($(BR2_PACKAGE_ALSA_LIB_OLD_SYMBOLS),y) -ALSA_LIB_CONF_OPTS += --disable-old-symbols -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB_PYTHON),y) -ALSA_LIB_CONF_OPTS += \ - --with-pythonlibs=-lpython$(PYTHON_VERSION_MAJOR) \ - --with-pythonincludes=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_CFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -ALSA_LIB_DEPENDENCIES = python -else -ALSA_LIB_CONF_OPTS += --disable-python -endif - -ifeq ($(BR2_bfin),y) -# blackfin external toolchains don't have versionsort. Fake it using alphasort -# instead -ALSA_LIB_CFLAGS += -Dversionsort=alphasort -endif - -ALSA_LIB_CONF_ENV = \ - CFLAGS="$(ALSA_LIB_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lm" - -$(eval $(autotools-package)) diff --git a/package.bak/alsa-utils/Config.in b/package.bak/alsa-utils/Config.in deleted file mode 100644 index 1a48fc0315..0000000000 --- a/package.bak/alsa-utils/Config.in +++ /dev/null @@ -1,89 +0,0 @@ -comment "alsa-utils needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU # fork - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -menuconfig BR2_PACKAGE_ALSA_UTILS - bool "alsa-utils" - depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - depends on !BR2_STATIC_LIBS # uses dlfcn.h - select BR2_PACKAGE_ALSA_LIB - help - This package contains the command line utilities for the ALSA - project. - - http://www.alsa-project.org/ - -if BR2_PACKAGE_ALSA_UTILS - -config BR2_PACKAGE_ALSA_UTILS_ALSACONF - bool "alsaconf" - -config BR2_PACKAGE_ALSA_UTILS_ACONNECT - bool "aconnect" - select BR2_PACKAGE_ALSA_LIB_SEQ - -config BR2_PACKAGE_ALSA_UTILS_ALSACTL - bool "alsactl" - default y - -config BR2_PACKAGE_ALSA_UTILS_ALSALOOP - bool "alsaloop" - -config BR2_PACKAGE_ALSA_UTILS_ALSAMIXER - bool "alsamixer" - default y - depends on BR2_USE_WCHAR - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_ALSA_LIB_MIXER - -comment "alsamixer needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_ALSA_UTILS_ALSAUCM - bool "alsaucm" - -config BR2_PACKAGE_ALSA_UTILS_ALSATPLG - bool "alsatplg" - -config BR2_PACKAGE_ALSA_UTILS_AMIDI - bool "amidi" - select BR2_PACKAGE_ALSA_LIB_RAWMIDI - -config BR2_PACKAGE_ALSA_UTILS_AMIXER - bool "amixer" - select BR2_PACKAGE_ALSA_LIB_MIXER - -config BR2_PACKAGE_ALSA_UTILS_APLAY - bool "aplay/arecord" - select BR2_PACKAGE_ALSA_LIB_PCM - -config BR2_PACKAGE_ALSA_UTILS_APLAYMIDI - bool "aplaymidi" - select BR2_PACKAGE_ALSA_LIB_SEQ - -config BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI - bool "arecordmidi" - select BR2_PACKAGE_ALSA_LIB_SEQ - -config BR2_PACKAGE_ALSA_UTILS_ASEQDUMP - bool "aseqdump" - select BR2_PACKAGE_ALSA_LIB_SEQ - -config BR2_PACKAGE_ALSA_UTILS_ASEQNET - bool "aseqnet" - select BR2_PACKAGE_ALSA_LIB_SEQ - -config BR2_PACKAGE_ALSA_UTILS_BAT - bool "bat" - select BR2_PACKAGE_FFTW - -config BR2_PACKAGE_ALSA_UTILS_IECSET - bool "iecset" - select BR2_PACKAGE_ALSA_LIB_PCM - -config BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST - bool "speaker-test" - select BR2_PACKAGE_ALSA_LIB_PCM - -endif diff --git a/package.bak/alsa-utils/alsa-utils.hash b/package.bak/alsa-utils/alsa-utils.hash deleted file mode 100644 index 538990bded..0000000000 --- a/package.bak/alsa-utils/alsa-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a7831044de92c5bf33bf3365a3f36e49397f4191e934df460ae1ca15138c9d9d alsa-utils-1.1.4.tar.bz2 diff --git a/package.bak/alsa-utils/alsa-utils.mk b/package.bak/alsa-utils/alsa-utils.mk deleted file mode 100644 index e9fd942e57..0000000000 --- a/package.bak/alsa-utils/alsa-utils.mk +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################ -# -# alsa-utils -# -################################################################################ - -ALSA_UTILS_VERSION = 1.1.4 -ALSA_UTILS_SOURCE = alsa-utils-$(ALSA_UTILS_VERSION).tar.bz2 -ALSA_UTILS_SITE = ftp://ftp.alsa-project.org/pub/utils -ALSA_UTILS_LICENSE = GPL-2.0 -ALSA_UTILS_LICENSE_FILES = COPYING -ALSA_UTILS_INSTALL_STAGING = YES -ALSA_UTILS_DEPENDENCIES = host-pkgconf alsa-lib \ - $(if $(BR2_PACKAGE_NCURSES),ncurses) \ - $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ - $(TARGET_NLS_DEPENDENCIES) -# Regenerate aclocal.m4 to pick the patched -# version of alsa.m4 from alsa-lib -ALSA_UTILS_AUTORECONF = YES -ALSA_UTILS_GETTEXTIZE = YES - -ALSA_UTILS_CONF_ENV = \ - ac_cv_prog_ncurses5_config=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) \ - LIBS=$(TARGET_NLS_LIBS) - -ALSA_UTILS_CONF_OPTS = \ - --disable-xmlto \ - --disable-rst2man \ - --with-curses=$(if $(BR2_PACKAGE_NCURSES_WCHAR),ncursesw,ncurses) - -ifeq ($(BR2_PACKAGE_ALSA_UTILS_ALSALOOP),y) -ALSA_UTILS_CONF_OPTS += --enable-alsaloop -else -ALSA_UTILS_CONF_OPTS += --disable-alsaloop -endif - -ifneq ($(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER),y) -ALSA_UTILS_CONF_OPTS += --disable-alsamixer --disable-alsatest -endif - -ifeq ($(BR2_PACKAGE_ALSA_UTILS_BAT),y) -ALSA_UTILS_CONF_OPTS += --enable-bat -ALSA_UTILS_DEPENDENCIES += fftw -else -ALSA_UTILS_CONF_OPTS += --disable-bat -endif - -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACONF) += usr/sbin/alsaconf -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSACTL) += usr/sbin/alsactl -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSALOOP) += usr/bin/alsaloop -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAMIXER) += usr/bin/alsamixer -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSATPLG) += usr/bin/alsatplg -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIDI) += usr/bin/amidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_AMIXER) += usr/bin/amixer -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAY) += usr/bin/aplay usr/bin/arecord -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_BAT) += usr/bin/alsabat -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_IECSET) += usr/bin/iecset -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ACONNECT) += usr/bin/aconnect -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ALSAUCM) += usr/bin/alsaucm -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_APLAYMIDI) += usr/bin/aplaymidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ARECORDMIDI) += usr/bin/arecordmidi -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQDUMP) += usr/bin/aseqdump -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_ASEQNET) += usr/bin/aseqnet -ALSA_UTILS_TARGETS_$(BR2_PACKAGE_ALSA_UTILS_SPEAKER_TEST) += usr/bin/speaker-test - -define ALSA_UTILS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/var/lib/alsa - for i in $(ALSA_UTILS_TARGETS_y); do \ - $(INSTALL) -D -m 755 $(STAGING_DIR)/$$i $(TARGET_DIR)/$$i || exit 1; \ - done - if [ -x "$(TARGET_DIR)/usr/bin/speaker-test" ]; then \ - mkdir -p $(TARGET_DIR)/usr/share/alsa/speaker-test; \ - mkdir -p $(TARGET_DIR)/usr/share/sounds/alsa; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/speaker-test/* $(TARGET_DIR)/usr/share/alsa/speaker-test/; \ - cp -rdpf $(STAGING_DIR)/usr/share/sounds/alsa/* $(TARGET_DIR)/usr/share/sounds/alsa/; \ - fi - if [ -x "$(TARGET_DIR)/usr/sbin/alsactl" ]; then \ - mkdir -p $(TARGET_DIR)/usr/share/; \ - rm -rf $(TARGET_DIR)/usr/share/alsa/; \ - cp -rdpf $(STAGING_DIR)/usr/share/alsa/ $(TARGET_DIR)/usr/share/alsa/; \ - fi -endef - -$(eval $(autotools-package)) diff --git a/package.bak/alsamixergui/0001-misc-fixes.patch b/package.bak/alsamixergui/0001-misc-fixes.patch deleted file mode 100644 index 6b498dadf9..0000000000 --- a/package.bak/alsamixergui/0001-misc-fixes.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/configure.in -+++ b/configure.in -@@ -11,7 +11,10 @@ - AC_PROG_LN_S - - dnl Checks for libraries. --AC_CHECK_LIB(fltk,numericsort,,AC_MSG_ERROR("missing fltk")) -+AC_CHECK_LIB(fltk,numericsort,, -+AC_CHECK_LIB(fltk,fl_numericsort,, -+AC_MSG_ERROR("missing fltk")) -+) - AM_PATH_ALSA(0.9.0) - - dnl Checks for header files. ---- a/src/alsamixer.cxx 2007-10-21 12:39:11.000000000 -0400 -+++ b/src/alsamixer.cxx 2007-10-21 12:49:10.000000000 -0400 -@@ -2081,8 +2081,8 @@ static void - mixer_signal_handler (int signal) - { - if (signal != SIGSEGV) -- mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0); -- else -+ // mixer_abort (ERR_SIGNAL, sys_siglist[signal], 0); -+ //else - { - fprintf (stderr, "\nSegmentation fault.\n"); - _exit (11); ---- a/src/alsamixer.cxx 2006-01-16 12:41:54.000000000 -0600 -+++ b/src/alsamixer.cxx 2006-01-16 12:45:44.000000000 -0600 -@@ -653,8 +653,8 @@ - if (vleft >= 0 && vright >= 0) { - if (joined) { - #ifdef ALSAMIXER_GUI -- for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; -- snd_mixer_selem_channel_id_t(int(chn)++)) -+ for (chn = snd_mixer_selem_channel_id_t(0); chn < SND_MIXER_SCHN_LAST; -+ snd_mixer_selem_channel_id_t(int(chn)+1)) - #else - for (chn = 0; chn < SND_MIXER_SCHN_LAST; chn++) - #endif diff --git a/package.bak/alsamixergui/Config.in b/package.bak/alsamixergui/Config.in deleted file mode 100644 index 2016a28ad1..0000000000 --- a/package.bak/alsamixergui/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_ALSAMIXERGUI - bool "alsamixergui" - depends on BR2_PACKAGE_XORG7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fltk fork() - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - select BR2_PACKAGE_FLTK - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_PCM - select BR2_PACKAGE_ALSA_LIB_MIXER - help - A nice GUI mixer for Alsa using fltk - - http://www.iua.upf.es/~mdeboer/projects/alsamixergui/ - -comment "alsamixergui needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/alsamixergui/alsamixergui.hash b/package.bak/alsamixergui/alsamixergui.hash deleted file mode 100644 index 5cea490a49..0000000000 --- a/package.bak/alsamixergui/alsamixergui.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui/alsamixergui_0.9.0rc2-1-9.dsc -md5 af942a41b81ba27e2e4d0a1e1ab0decb alsamixergui_0.9.0rc2-1.orig.tar.gz diff --git a/package.bak/alsamixergui/alsamixergui.mk b/package.bak/alsamixergui/alsamixergui.mk deleted file mode 100644 index 24e2497f3b..0000000000 --- a/package.bak/alsamixergui/alsamixergui.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# alsamixergui -# -################################################################################ - -ALSAMIXERGUI_VERSION = 0.9.0rc2-1 -ALSAMIXERGUI_SOURCE = alsamixergui_$(ALSAMIXERGUI_VERSION).orig.tar.gz -ALSAMIXERGUI_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/alsamixergui -ALSAMIXERGUI_LICENSE = GPL-2.0+ -ALSAMIXERGUI_LICENSE_FILES = debian/copyright -ALSAMIXERGUI_AUTORECONF = YES - -ALSAMIXERGUI_CONF_ENV = \ - ac_cv_lib_fltk_numericsort=yes \ - ac_cv_lib_fltk_fl_numericsort=yes \ - ac_cv_lib_asound_snd_ctl_open=yes - -ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib - -$(eval $(autotools-package)) diff --git a/package.bak/am335x-pru-package/0001-install-does-not-build.patch b/package.bak/am335x-pru-package/0001-install-does-not-build.patch deleted file mode 100644 index e2f2928441..0000000000 --- a/package.bak/am335x-pru-package/0001-install-does-not-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -Makefile: do not force the release build on install - -If we did build any of the other targets, and are just interested -in those and not the release one, we still want to use the 'install' -rule, but not build (and install) the release libraries. - -So, remove the dependency on the 'release' target from the 'install' -rule. - -Signed-off-by: "Yann E. MORIN" - -diff -durN am335x-pru-package-506e074859891a2b350eb4f5fcb451c4961410ea.orig/pru_sw/app_loader/interface/Makefile am335x-pru-package-506e074859891a2b350eb4f5fcb451c4961410ea/pru_sw/app_loader/interface/Makefile ---- am335x-pru-package-506e074859891a2b350eb4f5fcb451c4961410ea.orig/pru_sw/app_loader/interface/Makefile 2014-08-18 00:24:36.000000000 +0200 -+++ am335x-pru-package-506e074859891a2b350eb4f5fcb451c4961410ea/pru_sw/app_loader/interface/Makefile 2014-10-12 11:39:17.144682697 +0200 -@@ -38,7 +38,7 @@ - - all: debug release sodebug sorelease - --install: release -+install: - install -m 0755 -d $(DESTDIR)$(PREFIX)/lib - install -m 0755 -d $(DESTDIR)$(PREFIX)/include - install -m 0644 $(LIBDIR)/* $(DESTDIR)$(PREFIX)/lib diff --git a/package.bak/am335x-pru-package/Config.in b/package.bak/am335x-pru-package/Config.in deleted file mode 100644 index 66d777338e..0000000000 --- a/package.bak/am335x-pru-package/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_AM335X_PRU_PACKAGE - bool "am335x-pru-package" - depends on BR2_arm # only relevant for TI am335x - help - TI AM335X PRU program loader - - https://github.com/beagleboard/am335x_pru_package diff --git a/package.bak/am335x-pru-package/am335x-pru-package.hash b/package.bak/am335x-pru-package/am335x-pru-package.hash deleted file mode 100644 index 36671b488a..0000000000 --- a/package.bak/am335x-pru-package/am335x-pru-package.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2a902f825ccc1885c5dccd83e1ccee104aa30e601c9964a24f49459f76f674b9 am335x-pru-package-5f374ad57cc195f28bf5e585c3d446aba6ee7096.tar.gz diff --git a/package.bak/am335x-pru-package/am335x-pru-package.mk b/package.bak/am335x-pru-package/am335x-pru-package.mk deleted file mode 100644 index b2e89d3710..0000000000 --- a/package.bak/am335x-pru-package/am335x-pru-package.mk +++ /dev/null @@ -1,74 +0,0 @@ -################################################################################ -# -# am335x-pru-package -# -################################################################################ - -AM335X_PRU_PACKAGE_VERSION = 5f374ad57cc195f28bf5e585c3d446aba6ee7096 -AM335X_PRU_PACKAGE_SITE = $(call github,beagleboard,am335x_pru_package,$(AM335X_PRU_PACKAGE_VERSION)) -AM335X_PRU_PACKAGE_LICENSE = BSD-3-Clause -AM335X_PRU_PACKAGE_LICENSE_FILES = pru_sw/utils/LICENCE.txt -AM335X_PRU_PACKAGE_DEPENDENCIES = host-am335x-pru-package -AM335X_PRU_PACKAGE_INSTALL_STAGING = YES - -# The default 'all' rule builds everything, when we just need the library -ifeq ($(BR2_ENABLE_DEBUG),y) -AM335X_MAKE_TARGET = debug $(if $(BR2_STATIC_LIBS),,sodebug) -else -AM335X_MAKE_TARGET = release $(if $(BR2_STATIC_LIBS),,sorelease) -endif - -define AM335X_PRU_PACKAGE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \ - -C $(@D)/pru_sw/app_loader/interface $(AM335X_MAKE_TARGET) -endef - -# 'install' installs whatever was built, and our patch removes the dependency -# on the release build, so we can use it to install whatever we built above. -define AM335X_PRU_PACKAGE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(STAGING_DIR)" PREFIX="/usr" \ - -C $(@D)/pru_sw/app_loader/interface install -endef - -define AM335X_PRU_PACKAGE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \ - -C $(@D)/pru_sw/app_loader/interface install -endef - -# The debug libraries are named differently than the release ones, -# so we must provide a symlink to still be able to link with them. -ifeq ($(BR2_ENABLE_DEBUG),y) - -define AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_STATIC - ln -sf libprussdrvd.a $(STAGING_DIR)/usr/lib/libprussdrv.a -endef -AM335X_PRU_PACKAGE_POST_INSTALL_STAGING_HOOKS += AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_STATIC - -ifeq ($(BR2_STATIC_LIBS),) - -define AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_SHARED - ln -sf libprussdrvd.so $(STAGING_DIR)/usr/lib/libprussdrv.so -endef -AM335X_PRU_PACKAGE_POST_INSTALL_STAGING_HOOKS += AM335X_PRU_PACKAGE_LN_DEBUG_STAGING_SHARED - -define AM335X_PRU_PACKAGE_LN_DEBUG_TARGET - ln -sf libprussdrvd.so $(TARGET_DIR)/usr/lib/libprussdrv.so -endef -AM335X_PRU_PACKAGE_POST_INSTALL_TARGET_HOOKS += AM335X_PRU_PACKAGE_LN_DEBUG_TARGET - -endif # !STATIC - -endif # DEBUG - -define HOST_AM335X_PRU_PACKAGE_BUILD_CMDS - cd $(@D)/pru_sw/utils/pasm_source; \ - $(HOSTCC) -Wall -D_UNIX_ pasm.c pasmpp.c pasmexp.c pasmop.c \ - pasmdot.c pasmstruct.c pasmmacro.c path_utils.c -o ../pasm -endef - -define HOST_AM335X_PRU_PACKAGE_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/pru_sw/utils/pasm $(HOST_DIR)/bin/pasm -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/am33x-cm3/0001-fix-makefile.patch b/package.bak/am33x-cm3/0001-fix-makefile.patch deleted file mode 100644 index f3cdb5e2b9..0000000000 --- a/package.bak/am33x-cm3/0001-fix-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -Enforce correct -march option - -Buildroot uses a normal ARM compiler to build the AM33X CM3 firmware -(which runs on a Cortex-M3 processor), but Buildroot will have a -default -march value that doesn't necessarily match the one needed for -Cortex-M3, leading to build failures (gcc complains that the --mcpu=cortex-m3 option being passed is not compatible with the -selected -march). - -Fix this by explicitly indicating -march=armv7-m. - -Signed-off-by: Thomas Petazzoni - -Updated the patch to the latest version of the Makefile - -Signed-off-by: Anders Darander - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -13,7 +13,7 @@ SRCDIR = src - BINDIR = bin - - INCLUDES = $(SRCDIR)/include --CFLAGS =-mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \ -+CFLAGS =-march=armv7-m -mcpu=cortex-m3 -mthumb -nostdlib -Wall -Wundef \ - -Werror-implicit-function-declaration -Wstrict-prototypes \ - -Wdeclaration-after-statement -fno-delete-null-pointer-checks \ - -Wempty-body -fno-strict-overflow -g -I$(INCLUDES) -O2 diff --git a/package.bak/am33x-cm3/Config.in b/package.bak/am33x-cm3/Config.in deleted file mode 100644 index d33dfaa613..0000000000 --- a/package.bak/am33x-cm3/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_AM33X_CM3 - bool "am33x-cm3" - depends on BR2_arm # only relevant for TI am335x - depends on BR2_BINFMT_ELF # assumes the compiler builds ELF file - help - Cortex-M3 binary blob for suspend-resume on am335x - - http://arago-project.org/git/projects/am33x-cm3.git diff --git a/package.bak/am33x-cm3/S93-am335x-pm-firmware-load b/package.bak/am33x-cm3/S93-am335x-pm-firmware-load deleted file mode 100755 index 56c17b334d..0000000000 --- a/package.bak/am33x-cm3/S93-am335x-pm-firmware-load +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# Load the PM CM3 firmware -echo 1 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading -cat /lib/firmware/am335x-pm-firmware.bin > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/data -echo 0 > /sys/devices/ocp.2/44d00000.wkup_m3/firmware/am335x-pm-firmware.bin/loading diff --git a/package.bak/am33x-cm3/am33x-cm3.hash b/package.bak/am33x-cm3/am33x-cm3.hash deleted file mode 100644 index bb8c2f665e..0000000000 --- a/package.bak/am33x-cm3/am33x-cm3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 a722098b362f58f4dfb2a7c30afd604424d435b3d5ebe6ebf5d76ad942f796d0 am33x-cm3-11107db2f1e9e58ee75d4fe9cc38423c9a6e4365.tar.gz diff --git a/package.bak/am33x-cm3/am33x-cm3.mk b/package.bak/am33x-cm3/am33x-cm3.mk deleted file mode 100644 index 629a83238c..0000000000 --- a/package.bak/am33x-cm3/am33x-cm3.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# am33x-cm3 -# -################################################################################ - -# This should correpsond to v05.00.00.02 -AM33X_CM3_VERSION = 11107db2f1e9e58ee75d4fe9cc38423c9a6e4365 -AM33X_CM3_SITE = http://arago-project.org/git/projects/am33x-cm3.git -AM33X_CM3_SITE_METHOD = git -AM33X_CM3_LICENSE = TI Publicly Available Software License -AM33X_CM3_LICENSE_FILES = License.txt - -# The build command below will use the standard cross-compiler (normally -# build for Cortex-A8, to build the FW for the Cortex-M3. -define AM33X_CM3_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) all -endef - -# Not all of the firmware files are used -define AM33X_CM3_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/bin/am335x-pm-firmware.bin \ - $(TARGET_DIR)/lib/firmware/am335x-pm-firmware.bin -endef - -define AM33X_CM3_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/am33x-cm3/S93-am335x-pm-firmware-load \ - $(TARGET_DIR)/etc/init.d/S93-am335x-pm-firmware-load -endef - -$(eval $(generic-package)) diff --git a/package.bak/amd-catalyst/0001-Add-support-for-Linux-4.0.patch b/package.bak/amd-catalyst/0001-Add-support-for-Linux-4.0.patch deleted file mode 100644 index a0db9621a1..0000000000 --- a/package.bak/amd-catalyst/0001-Add-support-for-Linux-4.0.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c35482bc0cc56b40263b74c3e58e42be867fd9f2 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:41:46 +0200 -Subject: [PATCH] Add support for Linux 4.0 - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 5 +++++ - common/lib/modules/fglrx/build_mod/kcl_str.c | 4 ++++ - 2 files changed, 9 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 677565d..6017e89 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -285,6 +285,11 @@ MODULE_DEVICE_TABLE(pci, fglrx_pci_table); - - MODULE_INFO(supported, "external"); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -+#define read_cr4() __read_cr4() -+#define write_cr4(cr4) __write_cr4(cr4) -+#endif -+ - /* globals constants */ - const char* KCL_SYSINFO_OsVersionString = UTS_RELEASE; - const unsigned int KCL_SYSINFO_PageSize = PAGE_SIZE; -diff --git a/common/lib/modules/fglrx/build_mod/kcl_str.c b/common/lib/modules/fglrx/build_mod/kcl_str.c -index 2d89eb0..bacdb69 100755 ---- a/common/lib/modules/fglrx/build_mod/kcl_str.c -+++ b/common/lib/modules/fglrx/build_mod/kcl_str.c -@@ -42,6 +42,10 @@ - #include "kcl_type.h" - #include "kcl_str.h" - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 20, 0) -+#define strnicmp strncasecmp -+#endif -+ - /** \brief Fill memory with a constant byte - * \param s Pointer to memory - * \param c Initializing value --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0002-Add-support-for-Linux-4.1.patch b/package.bak/amd-catalyst/0002-Add-support-for-Linux-4.1.patch deleted file mode 100644 index cc95916e1e..0000000000 --- a/package.bak/amd-catalyst/0002-Add-support-for-Linux-4.1.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e9c8ccb4c8c842042542b792c51f9a7ec6c85e06 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:44:59 +0200 -Subject: [PATCH] Add support for Linux 4.1 - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 6017e89..94778f1 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -3508,10 +3508,12 @@ int ATI_API_CALL KCL_InstallInterruptHandler( - KCL_PUB_InterruptHandlerWrap, - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,22) - ((useMSI) ? (SA_INTERRUPT) : (SA_SHIRQ)), --#else -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(4,1,0) - //when MSI enabled. keep irq disabled when calling the action handler, - //exclude this IRQ from irq balancing (only on one CPU) - ((useMSI) ? (IRQF_DISABLED) : (IRQF_SHARED)), -+#else -+ ((useMSI) ? (0x0) : (IRQF_SHARED)), - #endif - dev_name, - context); --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0003-Add-support-for-Linux-4.2.patch b/package.bak/amd-catalyst/0003-Add-support-for-Linux-4.2.patch deleted file mode 100644 index 7458162965..0000000000 --- a/package.bak/amd-catalyst/0003-Add-support-for-Linux-4.2.patch +++ /dev/null @@ -1,121 +0,0 @@ -From e2e6c2dac2a0311a022208dd289374b832538329 Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Tue, 14 Jul 2015 12:56:37 +0200 -Subject: [PATCH] Add support for Linux 4.2 - -Deal with the FPU code renaming - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 38 ++++++++++++++++++++++ - 1 file changed, 38 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 94778f1..749ea51 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -191,9 +191,17 @@ - #include - #include - #include -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - #include "asm/i387.h" -+#else -+#include -+#endif - #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - #include -+#else -+#include -+#endif - #endif - - #include "firegl_public.h" -@@ -1711,6 +1719,9 @@ void ATI_API_CALL KCL_SetCurrentProcessState(KCL_ENUM_ProcessState state) - - #if defined(__i386__) - #ifndef __HAVE_ARCH_CMPXCHG -+#ifndef __xg -+#define __xg(x) ((volatile long *)(x)) -+#endif - static inline - unsigned long __fgl_cmpxchg(volatile void *ptr, unsigned long old, - unsigned long new, int size) -@@ -1747,7 +1758,11 @@ unsigned long ATI_API_CALL kcl__cmpxchg(volatile void *ptr, unsigned long old, - unsigned long new, int size) - { - #ifndef __HAVE_ARCH_CMPXCHG -+#if defined(__i386__) - return __fgl_cmpxchg(ptr,old,new,size); -+#elif defined(__x86_64__) -+ return cmpxchg((unsigned long*)ptr,old,new); -+#endif - #else - /* On kernel version 2.6.34 passing a variable or unsupported size - * argument to the __cmpxchg macro causes the default-clause of a -@@ -6443,21 +6458,36 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - struct fpu *fpu = &tsk->thread.fpu; - - if(static_cpu_has(X86_FEATURE_XSAVE)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - fpu_xsave(fpu); - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) -+#else -+ copy_xregs_to_kernel(&fpu->state.xsave); -+ if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) -+#endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - fpu_fxsave(fpu); -+#else -+ copy_fxregs_to_kernel(fpu); -+#endif - } else { - asm volatile("fnsave %[fx]; fwait" -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - : [fx] "=m" (fpu->state->fsave)); -+#else -+ : [fx] "=m" (fpu->state.fsave)); -+#endif - return 0; - } - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - if (unlikely(fpu->state->fxsave.swd & X87_FSW_ES)) { - asm volatile("fnclex"); - return 0; - } -+#endif - return 1; - } - #endif -@@ -6469,8 +6499,12 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - void ATI_API_CALL KCL_fpu_begin(void) - { - #ifdef CONFIG_X86_64 -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - kernel_fpu_begin(); - #else -+ __kernel_fpu_begin(); -+#endif -+#else - #ifdef TS_USEDFPU - struct thread_info *cur_thread = current_thread_info(); - struct task_struct *cur_task = get_current(); -@@ -6515,7 +6549,11 @@ void ATI_API_CALL KCL_fpu_begin(void) - */ - void ATI_API_CALL KCL_fpu_end(void) - { -+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) - kernel_fpu_end(); -+#else -+ __kernel_fpu_end(); -+#endif - } - - /** Create new directory entry under "/proc/...." --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch b/package.bak/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch deleted file mode 100644 index 4d375b8ad8..0000000000 --- a/package.bak/amd-catalyst/0004-Use-fpregs_active-instead-of-has_fpu.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7120f00015570a2e4d9b6532731960d509c71cba Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:48:30 +0200 -Subject: [PATCH] Use fpregs_active instead of has_fpu - -This is for Linux 4.2 - -Thanks to Tim Gardner for the patch. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 749ea51..4c1f9a5 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -6528,7 +6528,11 @@ void ATI_API_CALL KCL_fpu_begin(void) - /* The thread structure is changed with the commit below for kernel 3.3: - * https://github.com/torvalds/linux/commit/7e16838d94b566a17b65231073d179bc04d590c8 - */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) -+ if (cur_task->thread.fpu.fpregs_active) -+#else - if (cur_task->thread.fpu.has_fpu) -+#endif - #else - if (cur_task->thread.has_fpu) - #endif --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch b/package.bak/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch deleted file mode 100644 index c9513ef188..0000000000 --- a/package.bak/amd-catalyst/0005-Use-a-local-copy-of-copy_xregs_to_kernel.patch +++ /dev/null @@ -1,79 +0,0 @@ -From eb703737be5c91c1a0817351db8ec152c523c85d Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Thu, 17 Sep 2015 15:49:46 +0200 -Subject: [PATCH] Use a local copy of copy_xregs_to_kernel - -This is needed for Linux 4.2. - -Thanks to Tim Gardner for the patch. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 44 +++++++++++++++++++++- - 1 file changed, 43 insertions(+), 1 deletion(-) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 4c1f9a5..bb67bba 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -6443,6 +6443,48 @@ int ATI_API_CALL kcl_sscanf(const char * buf, const char * fmt, ...) - return i; - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,2,0) -+/* -+ * Save processor xstate to xsave area. -+ */ -+static void _copy_xregs_to_kernel(struct xregs_state *xstate) -+{ -+ u64 mask = -1; -+ u32 lmask = mask; -+ u32 hmask = mask >> 32; -+ int err = 0; -+ -+ /*WARN_ON(!alternatives_patched);*/ -+ -+ /* -+ * If xsaves is enabled, xsaves replaces xsaveopt because -+ * it supports compact format and supervisor states in addition to -+ * modified optimization in xsaveopt. -+ * -+ * Otherwise, if xsaveopt is enabled, xsaveopt replaces xsave -+ * because xsaveopt supports modified optimization which is not -+ * supported by xsave. -+ * -+ * If none of xsaves and xsaveopt is enabled, use xsave. -+ */ -+ alternative_input_2( -+ "1:"XSAVE, -+ XSAVEOPT, -+ X86_FEATURE_XSAVEOPT, -+ XSAVES, -+ X86_FEATURE_XSAVES, -+ [xstate] "D" (xstate), "a" (lmask), "d" (hmask) : -+ "memory"); -+ asm volatile("2:\n\t" -+ xstate_fault(err) -+ : "0" (err) -+ : "memory"); -+ -+ /* We should never fault when copying to a kernel buffer: */ -+ WARN_ON_FPU(err); -+} -+#endif -+ - /** \brief Generate UUID - * \param buf pointer to the generated UUID - * \return None -@@ -6462,7 +6504,7 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - fpu_xsave(fpu); - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else -- copy_xregs_to_kernel(&fpu->state.xsave); -+ _copy_xregs_to_kernel(&fpu->state.xsave); - if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) - #endif - return 1; --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0006-Add-support-for-Linux-4.4.patch b/package.bak/amd-catalyst/0006-Add-support-for-Linux-4.4.patch deleted file mode 100644 index 104e2c599d..0000000000 --- a/package.bak/amd-catalyst/0006-Add-support-for-Linux-4.4.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 54b230e26a1889c08507e791ab043f8a4b4ff771 Mon Sep 17 00:00:00 2001 -From: Romain Perier -Date: Thu, 7 Jul 2016 14:40:53 +0200 -Subject: [PATCH] Add support for Linux 4.4 - -It fixes various things like the use of seq_printf because its API -changed. It also replaces the call to mtrr_add and mtrr_del by -arch_phys_wc_add and arch_phys_wc_del because these symbols are -no longer exported for Linux >= 4.3.x. - -Signed-off-by: Romain Perier ---- - common/lib/modules/fglrx/build_mod/firegl_public.c | 21 +++++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index bb67bba..b4b2d30 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -636,9 +636,16 @@ static int firegl_major_proc_read(struct seq_file *m, void* data) - - len = snprintf(buf, request, "%d\n", major); - #else -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ seq_printf(m, "%d\n", major); -+ len = 0; -+#else - len = seq_printf(m, "%d\n", major); - #endif - -+#endif -+ - KCL_DEBUG1(FN_FIREGL_PROC, "return len=%i\n",len); - - return len; -@@ -3432,7 +3439,11 @@ int ATI_API_CALL KCL_MEM_MTRR_Support(void) - int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ return arch_phys_wc_add(base, size); -+#else - return mtrr_add(base, size, MTRR_TYPE_WRCOMB, 1); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ -@@ -3441,7 +3452,12 @@ int ATI_API_CALL KCL_MEM_MTRR_AddRegionWc(unsigned long base, unsigned long size - int ATI_API_CALL KCL_MEM_MTRR_DeleteRegion(int reg, unsigned long base, unsigned long size) - { - #ifdef CONFIG_MTRR -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,3,0) -+ arch_phys_wc_del(reg); -+ return 0; -+#else - return mtrr_del(reg, base, size); -+#endif - #else /* !CONFIG_MTRR */ - return -EPERM; - #endif /* !CONFIG_MTRR */ -@@ -6505,8 +6521,13 @@ static int KCL_fpu_save_init(struct task_struct *tsk) - if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP)) - #else - _copy_xregs_to_kernel(&fpu->state.xsave); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,0) -+ if (!(fpu->state.xsave.header.xfeatures & XFEATURE_MASK_FP)) -+#else - if (!(fpu->state.xsave.header.xfeatures & XSTATE_FP)) - #endif -+ -+#endif - return 1; - } else if (static_cpu_has(X86_FEATURE_FXSR)) { - #if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0) --- -2.8.1 - diff --git a/package.bak/amd-catalyst/0007-remove-gpl-symbols.patch b/package.bak/amd-catalyst/0007-remove-gpl-symbols.patch deleted file mode 100644 index d0094b0934..0000000000 --- a/package.bak/amd-catalyst/0007-remove-gpl-symbols.patch +++ /dev/null @@ -1,54 +0,0 @@ -Author: Manuel Rüger -Date: Sat, 2 Jan 2016 17:24:30 +0100 -URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/x11-drivers/ati-drivers/files?id=179aa11ed2f1bd79cf1b190263c3a7a07279fc50 - -Signed-off-by: Romain Perier ---- ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:02.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c 2015-09-18 23:57:11.000000000 -0400 -@@ -136,7 +136,6 @@ - #include - #include - #include --#include // for flush_tlb_page - #include - #ifdef CONFIG_MTRR - #include -@@ -251,6 +250,26 @@ - #define WRITE_CR4(x) write_cr4(x) - #endif - -+#define __flush_tlb_one(addr) asm volatile("invlpg (%0)" ::"r" (addr) : "memory") -+#define __flush_tlb() native_write_cr3(native_read_cr3()) -+ -+static inline void __flush_tlb_all(void) -+{ -+ if (cpu_has_pge) -+ { -+ unsigned long flags, cr4; -+ raw_local_irq_save(flags); -+ cr4 = native_read_cr4(); -+ native_write_cr4(cr4 & ~X86_CR4_PGE); -+ native_write_cr4(cr4); -+ raw_local_irq_restore(flags); -+ } -+ else -+ { -+ __flush_tlb(); -+ } -+} -+ - // ============================================================ - /* globals */ - ---- a/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:35.000000000 -0400 -+++ b/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2015-09-19 00:43:48.000000000 -0400 -@@ -868,7 +868,7 @@ void ATI_API_CALL KCL_ACPI_No_Hotplug(vo - #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) - if(pdev) - { --#if (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) -+#if 0 && (UTS_UBUNTU_RELEASE_ABI < 0 && LINUX_VERSION_CODE < KERNEL_VERSION(4,1,3)) || (UTS_UBUNTU_RELEASE_ABI >= 0 && UTS_UBUNTU_RELEASE_ABI < 26 && LINUX_VERSION_CODE <= KERNEL_VERSION(3,19,8)) - pci_ignore_hotplug(pdev); - #else - pdev->ignore_hotplug = 1; diff --git a/package.bak/amd-catalyst/20-fglrx.conf b/package.bak/amd-catalyst/20-fglrx.conf deleted file mode 100644 index d83ff582f6..0000000000 --- a/package.bak/amd-catalyst/20-fglrx.conf +++ /dev/null @@ -1,4 +0,0 @@ -Section "Device" - Identifier "AMD Radeon GPU" - Driver "fglrx" -EndSection diff --git a/package.bak/amd-catalyst/Config.in b/package.bak/amd-catalyst/Config.in deleted file mode 100644 index 85551ed803..0000000000 --- a/package.bak/amd-catalyst/Config.in +++ /dev/null @@ -1,81 +0,0 @@ -comment "amd-catalyst needs a glibc toolchain" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_AMD_CATALYST - bool "amd-catalyst" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_USES_GLIBC - help - The binary-only driver blob for AMD cards. - This driver supports AMD Radeon HD 5xxx and newer graphics - cards. - - http://www.amd.com/ - -if BR2_PACKAGE_AMD_CATALYST - -comment "amd-catalyst X.org drivers needs a modular Xorg server <= 1.17" - depends on !BR2_PACKAGE_XORG7 \ - || !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR \ - || !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - -config BR2_PACKAGE_AMD_CATALYST_XORG - bool "X.org drivers" - default y - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - select BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX - select BR2_PACKAGE_ACPID # runtime - select BR2_PACKAGE_XLIB_LIBX11 # runtime - select BR2_PACKAGE_XLIB_LIBXEXT # runtime - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE # runtime - # This package does not have standard GL headers - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_HAS_LIBGL - -if BR2_PACKAGE_AMD_CATALYST_XORG - -config BR2_PACKAGE_PROVIDES_LIBGL - default "amd-catalyst" - -config BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS - bool "command-line configuration tools" - help - Build and install the AMD command line tools. - -comment "Catalyst Control Center needs Qt4 with X11 and PNG support" - depends on !BR2_PACKAGE_QT || !BR2_PACKAGE_QT_X11 \ - || BR2_PACKAGE_QT_NOPNG - -config BR2_PACKAGE_AMD_CATALYST_CCCLE - bool "Catalyst Control Center" - depends on BR2_PACKAGE_QT - depends on BR2_PACKAGE_QT_X11 - depends on !BR2_PACKAGE_QT_NOPNG - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps-ng - select BR2_PACKAGE_PROCPS_NG # runtime - select BR2_PACKAGE_QT_ACCESSIBILITY - help - Installs the Catalyst Control Center, a Qt graphical tool to - control AMD graphics accelerators. - -endif - -comment "amd-catalyst kernel module needs a kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_AMD_CATALYST_MODULE - bool "fglrx kernel module" - depends on BR2_LINUX_KERNEL - help - Builds and install the fglrx kernel module - -config BR2_PACKAGE_AMD_CATALYST_OPENCL - bool "OpenCL support" - help - Installs the OpenCL binary blobs and the ICD profile - for GPGPU computing. - -endif # BR2_PACKAGE_AMD_CATALYST diff --git a/package.bak/amd-catalyst/amd-catalyst.hash b/package.bak/amd-catalyst/amd-catalyst.hash deleted file mode 100644 index 9f9b0a3149..0000000000 --- a/package.bak/amd-catalyst/amd-catalyst.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 bf3e6e7d5c51db3d075410a3f116f865b82823debc1d66698d187249feec6a91 amd-catalyst-15.9-linux-installer-15.201.1151-x86.x86_64.zip diff --git a/package.bak/amd-catalyst/amd-catalyst.mk b/package.bak/amd-catalyst/amd-catalyst.mk deleted file mode 100644 index 5636f81c9d..0000000000 --- a/package.bak/amd-catalyst/amd-catalyst.mk +++ /dev/null @@ -1,174 +0,0 @@ -################################################################################ -# -# amd-catalyst -# -################################################################################ - -AMD_CATALYST_VERSION = 15.9 -AMD_CATALYST_VERBOSE_VER = 15.201.1151 -AMD_CATALYST_SITE = http://www2.ati.com/drivers/linux -AMD_CATALYST_DL_OPTS = --referer='http://support.amd.com' -AMD_CATALYST_SOURCE = amd-catalyst-$(AMD_CATALYST_VERSION)-linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.zip -AMD_CATALYST_LICENSE = AMD Software License -AMD_CATALYST_LICENSE_FILES = LICENSE.TXT -AMD_CATALYST_INSTALL_STAGING = YES -AMD_CATALYST_SUFFIX = $(if $(BR2_x86_64),_64) -AMD_CATALYST_ARCH_DIR = $(@D)/arch/x86$(AMD_CATALYST_SUFFIX) -AMD_CATALYST_LIB_SUFFIX = $(if $(BR2_x86_64),64) - - -define AMD_CATALYST_EXTRACT_CMDS - unzip -q $(DL_DIR)/$(AMD_CATALYST_SOURCE) -d $(@D) - $(SHELL) $(@D)/AMD-Catalyst-$(AMD_CATALYST_VERSION)-Linux-installer-$(AMD_CATALYST_VERBOSE_VER)-x86.x86_64.run --extract $(@D) -endef - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_MODULE),y) -AMD_CATALYST_MODULE_SUBDIRS = common/lib/modules/fglrx/build_mod/2.6.x -AMD_CATALYST_MODULE_MAKE_OPTS = \ - CFLAGS_MODULE="-DCOMPAT_ALLOC_USER_SPACE=arch_compat_alloc_user_space" - -define AMD_CATALYST_PREPARE_MODULE - # The Makefile expects to have source in the folder 2.6.x - cp $(@D)/common/lib/modules/fglrx/build_mod/*.{c,h} \ - $(@D)/common/lib/modules/fglrx/build_mod/2.6.x - # This static lib is required during the link - cp $(@D)/arch/x86$(AMD_CATALYST_SUFFIX)/lib/modules/fglrx/build_mod/libfglrx_ip.a \ - $(@D)/common/lib/modules/fglrx/build_mod/2.6.x -endef - -AMD_CATALYST_POST_PATCH_HOOKS += AMD_CATALYST_PREPARE_MODULE - -$(eval $(kernel-module)) -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_OPENCL),y) - -AMD_CATALYST_OCL_SUFFIX = $(if $(BR2_x86_64),64,32) -AMD_CATALYST_OPENCL_FILES = \ - libOpenCL.so.1 \ - libaticalcl.so \ - libamdocl$(AMD_CATALYST_OCL_SUFFIX).so \ - libamdocl12cl$(AMD_CATALYST_OCL_SUFFIX).so - -define AMD_CATALYST_INSTALL_OPENCL - $(foreach f,$(AMD_CATALYST_OPENCL_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/$(f) $(TARGET_DIR)/usr/lib/$(f) - ) - ln -sf libOpenCL.so.1 \ - $(TARGET_DIR)/usr/lib/libOpenCL.so - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/bin/clinfo \ - $(TARGET_DIR)/usr/bin/clinfo - $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd \ - $(TARGET_DIR)/etc/OpenCL/vendors/amdocl$(AMD_CATALYST_OCL_SUFFIX).icd -endef - -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_XORG), y) - -# GL headers are needed by any package that wants to use libgl, so they need to -# be installed before any user of it. The only way to do so is to have this -# package depends on mesa3d-headers. -AMD_CATALYST_DEPENDENCIES += mesa3d-headers -AMD_CATALYST_PROVIDES = libgl -AMD_CATALYST_X11R6_LIB = $(@D)/xpic$(if $(BR2_x86_64),_64a)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX) - -define AMD_CATALYST_INSTALL_GL_LIBS - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/fglrx/fglrx-libGL.so.1.2 \ - $(1)/usr/lib - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1.2 - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so.1 - ln -sf fglrx-libGL.so.1.2 $(1)/usr/lib/libGL.so -endef - -define AMD_CATALYST_INSTALL_STAGING_XORG - $(call AMD_CATALYST_INSTALL_GL_LIBS,$(STAGING_DIR)) - $(INSTALL) -D -m 0644 package/amd-catalyst/gl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc -endef - -AMD_CATALYST_XORG_DRIVERS_FILES = modules/amdxmm.so \ - modules/drivers/fglrx_drv.so \ - modules/linux/libfglrxdrm.so - -define AMD_CATALYST_INSTALL_XORG - # Xorg drivers - $(foreach f,$(AMD_CATALYST_XORG_DRIVERS_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_X11R6_LIB)/$(f) \ - $(TARGET_DIR)/usr/lib/xorg/$(f) - ) - - # Xorg is not able to detect the driver automatically - $(INSTALL) -D -m 0644 package/amd-catalyst/20-fglrx.conf \ - $(TARGET_DIR)/etc/X11/xorg.conf.d/20-fglrx.conf - - - # Common files: containing binary profiles about GPUs, - # required by the fglrx_drv xorg driver - $(INSTALL) -d $(TARGET_DIR)/etc/ati - $(INSTALL) -m 0644 $(@D)/common/etc/ati/* $(TARGET_DIR)/etc/ati/ - - # DRI and GLX xorg modules: by default DRI is activated, - # these modules are required by the fglrx_drv.so xorg driver - $(INSTALL) -D -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/modules/dri/fglrx_dri.so \ - $(TARGET_DIR)/usr/lib/dri/fglrx_dri.so - $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/extensions/fglrx/fglrx-libglx.so \ - $(TARGET_DIR)/usr/lib/xorg/modules/extensions/libglx.so - $(INSTALL) -D -m 0644 $(AMD_CATALYST_X11R6_LIB)/modules/glesx.so \ - $(TARGET_DIR)/usr/lib/xorg/modules/glesx.so - - # Userspace GL libraries, also runtime dependency of most of the cmdline - # tools - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/lib$(AMD_CATALYST_LIB_SUFFIX)/*.so \ - $(TARGET_DIR)/usr/lib/ - $(call AMD_CATALYST_INSTALL_GL_LIBS,$(TARGET_DIR)) - - # Runtime dependency required by libfglrxdrm.so - $(INSTALL) -m 0644 $(AMD_CATALYST_ARCH_DIR)/usr/lib$(AMD_CATALYST_LIB_SUFFIX)/libatiuki.so.1.0 \ - $(TARGET_DIR)/usr/lib/ - ln -sf libatiuki.so.1.0 \ - $(TARGET_DIR)/usr/lib/libatiuki.so.1 -endef - -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_CMDLINE_TOOLS), y) -AMD_CATALYST_CMDLINE_TOOLS_FILES = \ - atiode \ - atiodcli \ - fgl_glxgears \ - aticonfig \ - amd-console-helper \ - fglrxinfo - -define AMD_CATALYST_INSTALL_CMDLINE_TOOLS - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/atieventsd \ - $(TARGET_DIR)/usr/sbin - $(foreach f,$(AMD_CATALYST_CMDLINE_TOOLS_FILES), \ - $(INSTALL) -D -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/$(f) \ - $(TARGET_DIR)/usr/bin/$(f) - ) -endef -endif - -ifeq ($(BR2_PACKAGE_AMD_CATALYST_CCCLE), y) -define AMD_CATALYST_INSTALL_CCCLE - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/X11R6/bin/amdcccle \ - $(TARGET_DIR)/usr/bin/amdcccle - $(INSTALL) -m 0755 $(AMD_CATALYST_ARCH_DIR)/usr/sbin/amdnotifyui \ - $(TARGET_DIR)/usr/sbin/amdnotifyui -endef -endif - -define AMD_CATALYST_INSTALL_STAGING_CMDS - $(call AMD_CATALYST_INSTALL_STAGING_XORG) -endef - -define AMD_CATALYST_INSTALL_TARGET_CMDS - $(call AMD_CATALYST_INSTALL_XORG) - $(call AMD_CATALYST_INSTALL_CMDLINE_TOOLS) - $(call AMD_CATALYST_INSTALL_CCCLE) - $(call AMD_CATALYST_INSTALL_OPENCL) -endef - -$(eval $(generic-package)) diff --git a/package.bak/amd-catalyst/gl.pc b/package.bak/amd-catalyst/gl.pc deleted file mode 100644 index 8729271fa0..0000000000 --- a/package.bak/amd-catalyst/gl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: gl -Description: AMD Catalyst OpenGL library -Version: 15.9 -Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl -Cflags: -I${includedir} -glx_tls: no - diff --git a/package.bak/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch b/package.bak/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch deleted file mode 100644 index af0723620f..0000000000 --- a/package.bak/android-tools/0001-Fix-makefiles-for-out-of-tree-build.patch +++ /dev/null @@ -1,162 +0,0 @@ -[PATCH] Fix makefiles for out-of-tree build - -Signed-off-by: Gary Bisson ---- - debian/makefiles/adb.mk | 10 +++++----- - debian/makefiles/adbd.mk | 33 ++++++++++++++++----------------- - debian/makefiles/fastboot.mk | 17 +++++++++-------- - 3 files changed, 30 insertions(+), 30 deletions(-) - -diff --git a/debian/makefiles/adb.mk b/debian/makefiles/adb.mk -index d9d4feb..654b9f1 100644 ---- a/debian/makefiles/adb.mk -+++ b/debian/makefiles/adb.mk -@@ -1,5 +1,6 @@ - # Makefile for adb; from https://heiher.info/2227.html - -+VPATH+= $(SRCDIR)/core/adb - SRCS+= adb.c - SRCS+= adb_client.c - SRCS+= adb_auth_host.c -@@ -17,7 +18,7 @@ SRCS+= usb_linux.c - SRCS+= usb_vendors.c - SRCS+= utils.c - --VPATH+= ../libcutils -+VPATH+= $(SRCDIR)/core/libcutils - SRCS+= abort_socket.c - SRCS+= socket_inaddr_any_server.c - SRCS+= socket_local_client.c -@@ -28,7 +29,7 @@ SRCS+= socket_network_client.c - SRCS+= list.c - SRCS+= load_file.c - --VPATH+= ../libzipfile -+VPATH+= $(SRCDIR)/core/libzipfile - SRCS+= centraldir.c - SRCS+= zipfile.c - -@@ -37,9 +38,8 @@ CPPFLAGS+= -DADB_HOST=1 - CPPFLAGS+= -DHAVE_FORKEXEC=1 - CPPFLAGS+= -DHAVE_SYMLINKS - CPPFLAGS+= -DHAVE_TERMIO_H --CPPFLAGS+= -I. --CPPFLAGS+= -I../include --CPPFLAGS+= -I../../../external/zlib -+CPPFLAGS+= -I$(SRCDIR)/core/adb -+CPPFLAGS+= -I$(SRCDIR)/core/include - - LIBS+= -lc -lpthread -lz -lcrypto - -diff --git a/debian/makefiles/adbd.mk b/debian/makefiles/adbd.mk -index 94d3a90..49dab8c 100644 ---- a/debian/makefiles/adbd.mk -+++ b/debian/makefiles/adbd.mk -@@ -1,18 +1,6 @@ - # Makefile for adbd - --VPATH+= ../libcutils --SRCS+= abort_socket.c --SRCS+= socket_inaddr_any_server.c --SRCS+= socket_local_client.c --SRCS+= socket_local_server.c --SRCS+= socket_loopback_client.c --SRCS+= socket_loopback_server.c --SRCS+= socket_network_client.c --SRCS+= list.c --SRCS+= load_file.c --SRCS+= android_reboot.c -- --#VPATH+= ../adb -+VPATH+= $(SRCDIR)/core/adbd - SRCS+= adb.c - SRCS+= backup_service.c - SRCS+= fdevent.c -@@ -31,7 +19,19 @@ SRCS+= log_service.c - SRCS+= utils.c - SRCS+= base64.c - --VPATH+= ../libzipfile -+VPATH+= $(SRCDIR)/core/libcutils -+SRCS+= abort_socket.c -+SRCS+= socket_inaddr_any_server.c -+SRCS+= socket_local_client.c -+SRCS+= socket_local_server.c -+SRCS+= socket_loopback_client.c -+SRCS+= socket_loopback_server.c -+SRCS+= socket_network_client.c -+SRCS+= list.c -+SRCS+= load_file.c -+SRCS+= android_reboot.c -+ -+VPATH+= $(SRCDIR)/core/libzipfile - SRCS+= centraldir.c - SRCS+= zipfile.c - -@@ -40,10 +40,9 @@ CPPFLAGS+= -O2 -g -Wall -Wno-unused-parameter - CPPFLAGS+= -DADB_HOST=0 -DHAVE_FORKEXEC=1 -D_XOPEN_SOURCE -D_GNU_SOURCE -DALLOW_ADBD_ROOT=1 - CPPFLAGS+= -DHAVE_SYMLINKS -DBOARD_ALWAYS_INSECURE - CPPFLAGS+= -DHAVE_TERMIO_H --CPPFLAGS+= -I. --CPPFLAGS+= -I../include --CPPFLAGS+= -I../../../external/zlib - CPPFLAGS+= `pkg-config --cflags glib-2.0 gio-2.0` -+CPPFLAGS+= -I$(SRCDIR)/core/adbd -+CPPFLAGS+= -I$(SRCDIR)/core/include - - LIBS+= -lc -lpthread -lz -lcrypto -lcrypt `pkg-config --libs glib-2.0 gio-2.0` - -diff --git a/debian/makefiles/fastboot.mk b/debian/makefiles/fastboot.mk -index 9e8b751..94a069b 100644 ---- a/debian/makefiles/fastboot.mk -+++ b/debian/makefiles/fastboot.mk -@@ -1,5 +1,6 @@ - # Makefile for fastboot; from https://heiher.info/2227.html - -+VPATH+= $(SRCDIR)/core/fastboot - SRCS+= bootimg.c - SRCS+= engine.c - SRCS+= fastboot.c -@@ -7,11 +8,11 @@ SRCS+= protocol.c - SRCS+= usb_linux.c - SRCS+= util_linux.c - --VPATH+= ../libzipfile -+VPATH+= $(SRCDIR)/core/libzipfile - SRCS+= centraldir.c - SRCS+= zipfile.c - --VPATH+= ../libsparse -+VPATH+= $(SRCDIR)/core/libsparse - SRCS+= backed_block.c - SRCS+= sparse_crc32.c - SRCS+= sparse.c -@@ -19,7 +20,7 @@ SRCS+= sparse_read.c - SRCS+= sparse_err.c - SRCS+= output_file.c - --VPATH+= ../../extras/ext4_utils/ -+VPATH+= $(SRCDIR)/extras/ext4_utils/ - SRCS+= make_ext4fs.c - SRCS+= crc16.c - SRCS+= ext4_utils.c -@@ -31,11 +32,11 @@ SRCS+= extent.c - SRCS+= wipe.c - SRCS+= sha1.c - --CPPFLAGS+= -I. --CPPFLAGS+= -I../include --CPPFLAGS+= -I../mkbootimg --CPPFLAGS+= -I../../extras/ext4_utils/ --CPPFLAGS+= -I../libsparse/include/ -+CPPFLAGS+= -I$(SRCDIR)/core/fastboot -+CPPFLAGS+= -I$(SRCDIR)/core/include -+CPPFLAGS+= -I$(SRCDIR)/core/mkbootimg -+CPPFLAGS+= -I$(SRCDIR)/extras/ext4_utils/ -+CPPFLAGS+= -I$(SRCDIR)/core/libsparse/include/ - - LIBS+= -lz -lselinux - --- -2.5.1 - diff --git a/package.bak/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch b/package.bak/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch deleted file mode 100644 index 35f6c8a3be..0000000000 --- a/package.bak/android-tools/0002-Fix-adbd-for-non-Ubuntu-systems.patch +++ /dev/null @@ -1,264 +0,0 @@ -[PATCH] Fix adbd for non-Ubuntu systems - -Remove glib/dbus dependencies and partially restore services.c to be -closer to the original source code in order to run on systems without -sudo. - -Signed-off-by: Gary Bisson ---- - core/adbd/adb.c | 1 - - core/adbd/services.c | 160 ++++------------------------------------------- - debian/makefiles/adbd.mk | 4 +- - 3 files changed, 14 insertions(+), 151 deletions(-) - -diff --git a/core/adbd/adb.c b/core/adbd/adb.c -index d90e6b8..7fe6445 100644 ---- a/core/adbd/adb.c -+++ b/core/adbd/adb.c -@@ -1165,7 +1165,6 @@ void build_local_name(char* target_str, size_t target_size, int server_port) - - #if !ADB_HOST - static int should_drop_privileges() { -- return 1; - #ifndef ALLOW_ADBD_ROOT - return 1; - #else /* ALLOW_ADBD_ROOT */ -diff --git a/core/adbd/services.c b/core/adbd/services.c -index 05bd0d0..5adcefe 100644 ---- a/core/adbd/services.c -+++ b/core/adbd/services.c -@@ -20,15 +20,6 @@ - #include - #include - #include --#include --#include -- --#define UNITY_SERVICE "com.canonical.UnityGreeter" --#define GREETER_OBJ "/" --#define GREETER_INTERFACE "com.canonical.UnityGreeter" --#define PROPERTIES_INTERFACE "org.freedesktop.DBus.Properties" --#define ACTIVE_PROPERTY "IsActive" --#define UNLOCK_PATH "/userdata/.adb_onlock" - - #include "sysdeps.h" - -@@ -268,11 +259,11 @@ static int create_service_thread(void (*func)(int, void *), void *cookie) - } - - #if !ADB_HOST --static int create_subprocess(const char *cmd, const char *arg0, const char *arg1, const char *arg2, const char *arg3, const char *arg4, pid_t *pid) -+static int create_subprocess(const char *cmd, const char *arg0, const char *arg1, pid_t *pid) - { - #ifdef HAVE_WIN32_PROC -- D("create_subprocess(cmd=%s, arg0=%s, arg1=%s, arg2=%s, arg3=%, arg4=%ss)\n", cmd, arg0, arg1, arg2, arg3, arg4); -- fprintf(stderr, "error: create_subprocess not implemented on Win32 (%s %s %s %s %s %s)\n", cmd, arg0, arg1, arg2, arg3, arg4); -+ D("create_subprocess(cmd=%s, arg0=%s, arg1=%s)\n", cmd, arg0, arg1); -+ fprintf(stderr, "error: create_subprocess not implemented on Win32 (%s %s %s)\n", cmd, arg0, arg1); - return -1; - #else /* !HAVE_WIN32_PROC */ - char *devname; -@@ -327,7 +318,7 @@ static int create_subprocess(const char *cmd, const char *arg0, const char *arg1 - } else { - D("adb: unable to open %s\n", text); - } -- execl(cmd, cmd, arg0, arg1, arg2, arg3, arg4, NULL); -+ execl(cmd, cmd, arg0, arg1, NULL); - fprintf(stderr, "- exec '%s' failed: %s (%d) -\n", - cmd, strerror(errno), errno); - exit(-1); -@@ -342,7 +333,7 @@ static int create_subprocess(const char *cmd, const char *arg0, const char *arg1 - } - #endif /* !ABD_HOST */ - --#if ADB_HOST -+#if ADB_HOST || ADBD_NON_ANDROID - #define SHELL_COMMAND "/bin/sh" - #else - #define SHELL_COMMAND "/system/bin/sh" -@@ -380,139 +371,16 @@ static void subproc_waiter_service(int fd, void *cookie) - } - } - --int is_phone_locked() { -- GError *error = NULL; -- GVariant *variant = NULL; -- GDBusConnection *connection = NULL; -- -- if (g_file_test(UNLOCK_PATH, G_FILE_TEST_EXISTS)) { -- D("unlock path present."); -- return 0; -- } -- -- // check if the environment variable is present, if not we grab it from -- // the phablet user -- if (g_getenv("DBUS_SESSION_BUS_ADDRESS") == NULL) { -- D("DBUS_SESSION_BUS_ADDRESS missing.\n"); -- struct passwd *pw = getpwuid(AID_SHELL); -- char user_id[15]; -- gchar *path = NULL; -- gchar *contents = NULL; -- gchar *session_path = NULL; -- -- snprintf(user_id, sizeof user_id, "%d", pw->pw_uid); -- -- path = g_build_filename("/run", "user", user_id, "dbus-session", NULL); -- -- g_file_get_contents(path, &contents, NULL, &error); -- session_path = g_strstrip(g_strsplit(contents, "DBUS_SESSION_BUS_ADDRESS=", -1)[1]); -- D("Session bus is %s\n", session_path); -- -- // path is not longer used -- g_free(path); -- -- if (error != NULL) { -- g_clear_error(&error); -- D("Couldn't set session bus\n"); -- return 1; -- } -- -- g_setenv("DBUS_SESSION_BUS_ADDRESS", session_path, TRUE); -- g_free(contents); -- } -- -- // set the uid to be able to connect to the phablet user session bus -- setuid(AID_SHELL); -- connection = g_dbus_connection_new_for_address_sync(g_getenv("DBUS_SESSION_BUS_ADDRESS"), -- G_DBUS_CONNECTION_FLAGS_AUTHENTICATION_CLIENT | G_DBUS_CONNECTION_FLAGS_MESSAGE_BUS_CONNECTION, -- NULL, -- NULL, -- &error); -- if (connection == NULL) { -- D("session bus not available: %s", error->message); -- g_error_free (error); -- return 1; -- } -- -- variant = g_dbus_connection_call_sync(connection, -- UNITY_SERVICE, -- GREETER_OBJ, -- PROPERTIES_INTERFACE, -- "Get", -- g_variant_new("(ss)", GREETER_INTERFACE, ACTIVE_PROPERTY), -- g_variant_type_new("(v)"), -- G_DBUS_CALL_FLAGS_NONE, -- -1, -- NULL, -- &error); -- -- if (error != NULL) { -- D("Could not get property: %s", error->message); -- g_object_unref(connection); -- g_error_free(error); -- return 1; -- } -- -- if (variant == NULL) { -- D("Failed to get property '%s': %s", "IsActive", error->message); -- g_object_unref(connection); -- g_error_free(error); -- return 1; -- } -- -- variant = g_variant_get_variant(g_variant_get_child_value(variant, 0)); -- -- int active = 1; -- if (!g_variant_get_boolean(variant)) { -- active = 0; -- } -- -- // get back to be root and return the value -- g_object_unref(connection); -- g_variant_unref(variant); -- setuid(0); -- return active; --} -- - static int create_subproc_thread(const char *name) - { -- if (is_phone_locked() ) { -- fprintf(stderr, "device is locked\n"); -- return -1; -- } -- - stinfo *sti; - adb_thread_t t; - int ret_fd; - pid_t pid; -- -- struct passwd *user = getpwuid(getuid()); -- char *shell; -- char *shellopts = "-c"; -- char *home; -- char *sudo = "/usr/bin/sudo"; -- char useropt[256] = "-u"; -- -- if (user->pw_name) -- strcat(useropt, user->pw_name); -- -- if (user && user->pw_shell) { -- shell = user->pw_shell; -- shellopts = "-cl"; -- } else { -- shell = SHELL_COMMAND; -- } -- -- if (user->pw_dir) -- home = user->pw_dir; -- if(chdir(home) < 0 ) -- return 1; -- - if(name) { -- ret_fd = create_subprocess(sudo, useropt, "-i", shell, shellopts, name, &pid); -+ ret_fd = create_subprocess(SHELL_COMMAND, "-c", name, &pid); - } else { -- shellopts = "-l"; -- ret_fd = create_subprocess(sudo, useropt, "-i", shell, shellopts, 0, &pid); -+ ret_fd = create_subprocess(SHELL_COMMAND, "-", 0, &pid); - } - D("create_subprocess() ret_fd=%d pid=%d\n", ret_fd, pid); - -@@ -585,17 +453,13 @@ int service_to_fd(const char *name) - } else if (!strncmp(name, "log:", 4)) { - ret = create_service_thread(log_service, get_log_file_path(name + 4)); - } else if(!HOST && !strncmp(name, "shell:", 6)) { -- if (!is_phone_locked() ) { -- if(name[6]) { -- ret = create_subproc_thread(name + 6); -- } else { -- ret = create_subproc_thread(0); -- } -+ if(name[6]) { -+ ret = create_subproc_thread(name + 6); -+ } else { -+ ret = create_subproc_thread(0); - } - } else if(!strncmp(name, "sync:", 5)) { -- if (!is_phone_locked() ) { -- ret = create_service_thread(file_sync_service, NULL); -- } -+ ret = create_service_thread(file_sync_service, NULL); - } else if(!strncmp(name, "remount:", 8)) { - ret = create_service_thread(remount_service, NULL); - } else if(!strncmp(name, "reboot:", 7)) { -diff --git a/debian/makefiles/adbd.mk b/debian/makefiles/adbd.mk -index 49dab8c..22c1816 100644 ---- a/debian/makefiles/adbd.mk -+++ b/debian/makefiles/adbd.mk -@@ -40,11 +40,11 @@ CPPFLAGS+= -O2 -g -Wall -Wno-unused-parameter - CPPFLAGS+= -DADB_HOST=0 -DHAVE_FORKEXEC=1 -D_XOPEN_SOURCE -D_GNU_SOURCE -DALLOW_ADBD_ROOT=1 - CPPFLAGS+= -DHAVE_SYMLINKS -DBOARD_ALWAYS_INSECURE - CPPFLAGS+= -DHAVE_TERMIO_H --CPPFLAGS+= `pkg-config --cflags glib-2.0 gio-2.0` -+CPPFLAGS+= -DADBD_NON_ANDROID - CPPFLAGS+= -I$(SRCDIR)/core/adbd - CPPFLAGS+= -I$(SRCDIR)/core/include - --LIBS+= -lc -lpthread -lz -lcrypto -lcrypt `pkg-config --libs glib-2.0 gio-2.0` -+LIBS+= -lc -lpthread -lz -lcrypto -lcrypt - - OBJS= $(patsubst %, %.o, $(basename $(SRCS))) - --- -2.5.1 - diff --git a/package.bak/android-tools/0003-Fix-build-issue-with-uclibc.patch b/package.bak/android-tools/0003-Fix-build-issue-with-uclibc.patch deleted file mode 100644 index 95517c307b..0000000000 --- a/package.bak/android-tools/0003-Fix-build-issue-with-uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -[PATCH] Fix build issue with uclibc - -Signed-off-by: Gary Bisson ---- - core/adbd/adb_auth_client.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/core/adb/adb_auth_client.c b/core/adb/adb_auth_client.c -index 0b4913e..068d837 100644 ---- a/core/adb/adb_auth_client.c -+++ b/core/adb/adb_auth_client.c -@@ -72,7 +72,7 @@ static void read_keys(const char *file, struct listnode *list) - if (sep) - *sep = '\0'; - -- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); -+ ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); - if (ret != sizeof(key->key)) { - D("%s: Invalid base64 data ret=%d\n", file, ret); - free(key); -diff --git a/core/adbd/adb_auth_client.c b/core/adbd/adb_auth_client.c -index 0b4913e..068d837 100644 ---- a/core/adbd/adb_auth_client.c -+++ b/core/adbd/adb_auth_client.c -@@ -72,7 +72,7 @@ static void read_keys(const char *file, struct listnode *list) - if (sep) - *sep = '\0'; - -- ret = __b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); -+ ret = b64_pton(buf, (u_char *)&key->key, sizeof(key->key) + 4); - if (ret != sizeof(key->key)) { - D("%s: Invalid base64 data ret=%d\n", file, ret); - free(key); --- -2.6.1 - diff --git a/package.bak/android-tools/0004-Fix-build-issue-with-musl.patch b/package.bak/android-tools/0004-Fix-build-issue-with-musl.patch deleted file mode 100644 index 964eb87a6d..0000000000 --- a/package.bak/android-tools/0004-Fix-build-issue-with-musl.patch +++ /dev/null @@ -1,54 +0,0 @@ -[PATCH] Fix build issue with musl - -arpa/nameser.h doesn't use the same macro name to avoid several -inclusions. - -Finally had an issue with framebuffer_service.c since it was missing the -TEMP_FAILURE_RETRY macro. - -Signed-off-by: Gary Bisson ---- - core/adbd/arpa_nameser.h | 12 +++++++++--- - core/adbd/base64.c | 1 - - core/adbd/framebuffer_service.c | 1 + - core/adbd/qemu_pipe.h | 1 - - core/include/cutils/android_reboot.h | 8 ++++++-- - core/include/cutils/bitops.h | 10 ++++++---- - core/include/cutils/partition_utils.h | 8 ++++++-- - extras/ext4_utils/sha1.c | 3 --- - extras/ext4_utils/sha1.h | 13 ++++++------- - 9 files changed, 34 insertions(+), 23 deletions(-) - -diff --git a/core/adbd/arpa_nameser.h b/core/adbd/arpa_nameser.h -index 438dc04..b2a28d6 100644 ---- a/core/adbd/arpa_nameser.h -+++ b/core/adbd/arpa_nameser.h -@@ -52,6 +52,8 @@ - - #ifndef _ARPA_NAMESER_H_ - #define _ARPA_NAMESER_H_ -+#ifndef _ARPA_NAMESER_H -+#define _ARPA_NAMESER_H - - #define BIND_4_COMPAT - -@@ -574,4 +579,5 @@ __END_DECLS - #define XLOG(...) do {} while (0) - #endif - -+#endif /* !_ARPA_NAMESER_H */ - #endif /* !_ARPA_NAMESER_H_ */ -diff --git a/core/adbd/framebuffer_service.c b/core/adbd/framebuffer_service.c -index 20c08d2..48e0241 100644 ---- a/core/adbd/framebuffer_service.c -+++ b/core/adbd/framebuffer_service.c -@@ -26,6 +26,7 @@ - #include "fdevent.h" - #include "adb.h" - -+#include - #include - #include - #include --- -2.6.1 diff --git a/package.bak/android-tools/0005-fix-static-link-zlib.patch b/package.bak/android-tools/0005-fix-static-link-zlib.patch deleted file mode 100644 index dff4df6e79..0000000000 --- a/package.bak/android-tools/0005-fix-static-link-zlib.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix static linking of adb/adbd - -Both adb and adbd use OpenSSL, which indirectly uses zlib. Since -adb/adbd also use zlib directly -lz is included in the linker flags, -but not at the right position to ensure that static linking works: to -make it possible for OpenSSL symbols to see zlib symbols, -lz must -appear after -lcrypto. - -Signed-off-by: Thomas Petazzoni - -Index: b/debian/makefiles/adb.mk -=================================================================== ---- a/debian/makefiles/adb.mk -+++ b/debian/makefiles/adb.mk -@@ -41,7 +41,7 @@ - CPPFLAGS+= -I$(SRCDIR)/core/adb - CPPFLAGS+= -I$(SRCDIR)/core/include - --LIBS+= -lc -lpthread -lz -lcrypto -+LIBS+= -lc -lpthread -lcrypto -lz - - OBJS= $(SRCS:.c=.o) - -Index: b/debian/makefiles/adbd.mk -=================================================================== ---- a/debian/makefiles/adbd.mk -+++ b/debian/makefiles/adbd.mk -@@ -44,7 +44,7 @@ - CPPFLAGS+= -I$(SRCDIR)/core/adbd - CPPFLAGS+= -I$(SRCDIR)/core/include - --LIBS+= -lc -lpthread -lz -lcrypto -lcrypt -+LIBS+= -lc -lpthread -lcrypto -lz -lcrypt - - OBJS= $(patsubst %, %.o, $(basename $(SRCS))) - diff --git a/package.bak/android-tools/0006-fix-big-endian-build.patch b/package.bak/android-tools/0006-fix-big-endian-build.patch deleted file mode 100644 index c35fdcb8c4..0000000000 --- a/package.bak/android-tools/0006-fix-big-endian-build.patch +++ /dev/null @@ -1,61 +0,0 @@ -Fix build on big endian systems - -The usb_linux_client.c file defines cpu_to_le16/32 by using the C -library htole16/32 function calls. However, cpu_to_le16/32 are used -when initializing structures, i.e in a context where a function call -is not allowed. - -It works fine on little endian systems because htole16/32 are defined -by the C library as no-ops. But on big-endian systems, they are -actually doing something, which might involve calling a function, -causing build failures. - -To solve this, we simply open-code cpu_to_le16/32 in a way that allows -them to be used when initializing structures. - -Signed-off-by: Thomas Petazzoni - -Index: b/core/adb/usb_linux_client.c -=================================================================== ---- a/core/adb/usb_linux_client.c -+++ b/core/adb/usb_linux_client.c -@@ -34,8 +34,15 @@ - #define MAX_PACKET_SIZE_FS 64 - #define MAX_PACKET_SIZE_HS 512 - --#define cpu_to_le16(x) htole16(x) --#define cpu_to_le32(x) htole32(x) -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# define cpu_to_le16(x) (x) -+# define cpu_to_le32(x) (x) -+#else -+# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) -+# define cpu_to_le32(x) \ -+ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ -+ (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) -+#endif - - struct usb_handle - { -Index: b/core/adbd/usb_linux_client.c -=================================================================== ---- a/core/adbd/usb_linux_client.c -+++ b/core/adbd/usb_linux_client.c -@@ -34,8 +34,15 @@ - #define MAX_PACKET_SIZE_FS 64 - #define MAX_PACKET_SIZE_HS 512 - --#define cpu_to_le16(x) htole16(x) --#define cpu_to_le32(x) htole32(x) -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+# define cpu_to_le16(x) (x) -+# define cpu_to_le32(x) (x) -+#else -+# define cpu_to_le16(x) ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) -+# define cpu_to_le32(x) \ -+ ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ -+ (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) -+#endif - - struct usb_handle - { diff --git a/package.bak/android-tools/0007-include-cdefs-h-when-needed.patch b/package.bak/android-tools/0007-include-cdefs-h-when-needed.patch deleted file mode 100644 index da4ee13a17..0000000000 --- a/package.bak/android-tools/0007-include-cdefs-h-when-needed.patch +++ /dev/null @@ -1,41 +0,0 @@ -Include cdefs.h wherever it is needed - -cdefs.h is included from within a lot of glibc headers, so it almost -invariably and automagically gets pulled in with glibc. - -However, this might not be the case with other C libraries. musl does -not provide cdefs.h so it does not include it from its own headers -(cdefs.h must be provided separately). - -So we must include it when we are going to use macros it provides. - -Signed-off-by: "Yann E. MORIN" ---- - core/adbd/services.c | 1 + - core/libcutils/android_reboot.c | 1 + - 2 files changed, 2 insertions(+), 0 deletion(-) - -diff --git a/core/adbd/services.c b/core/adbd/services.c -index 20c08d2..48e0241 100644 ---- a/core/adbd/services.c -+++ b/core/adbd/services.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "sysdeps.h" - -diff --git a/core/libcutils/android_reboot.c b/core/libcutils/android_reboot.c -index 20c08d2..48e0241 100644 ---- a/core/libcutils/android_reboot.c -+++ b/core/libcutils/android_reboot.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include - diff --git a/package.bak/android-tools/Config.in b/package.bak/android-tools/Config.in deleted file mode 100644 index 19772ad4d7..0000000000 --- a/package.bak/android-tools/Config.in +++ /dev/null @@ -1,82 +0,0 @@ -config BR2_PACKAGE_ANDROID_TOOLS - bool "android-tools" - # Technically, fastboot could build on noMMU systems. But - # since we need at least one of the three sub-options enabled, - # and adb/adbd can't be built on noMMU systems, and fastboot - # has some complicated dependencies, we simply make the whole - # package not available on noMMU platforms. - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_ANDROID_TOOLS_ADBD if \ - !BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT && \ - !BR2_PACKAGE_ANDROID_TOOLS_ADB - help - This package contains the fastboot and adb utilities, that - can be used to interact with target devices using of these - protocols. - -if BR2_PACKAGE_ANDROID_TOOLS - -# We need kernel headers that support the __SANE_USERSPACE_TYPES__ -# mechanism for 64 bits architectures, so that u64 gets defined as -# "unsigned long long" and not "unsigned long". We know that >= 3.16 -# is needed for MIPS64 (kernel commit -# f4b3aa7cd9d32407670e67238c5ee752bb98f481) and >= 3.10 is needed for -# PowerPC64 (kernel commit -# 2c9c6ce0199a4d252e20c531cfdc9d24e39235c0). Without this, the build -# fails with a bad redefinition of u64 (the android-tools fastboot -# code defines it as "unsigned long long"). -config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS - bool - default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_10 && (BR2_powerpc64 || BR2_powerpc64le) - default y if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16 && (BR2_mips64 || BR2_mips64el) - default y if !BR2_powerpc64 && !BR2_powerpc64le && !BR2_mips64 && !BR2_mips64el - -config BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT - bool "fastboot" - select BR2_PACKAGE_LIBSELINUX - select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_HAS_THREADS # libselinux - depends on !BR2_STATIC_LIBS # libselinux - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux - depends on !BR2_arc # libselinux - depends on BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS - help - This option will build and install the fastboot utility for - the target, which can be used to reflash other target devices - implementing the fastboot protocol. - -comment "fastboot needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC - -comment "fastboot needs headers >= 3.10 (PowerPC64), headers >= 3.16 (MIPS64)" - depends on !BR2_arc - depends on !BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT_GOOD_KERNEL_HEADERS - -config BR2_PACKAGE_ANDROID_TOOLS_ADB - bool "adb" - depends on BR2_USE_MMU # uses fork() - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - This option will build and install the adb utility for the - target, which can be used to interact with other target - devices implementing the ADB protocol. - -config BR2_PACKAGE_ANDROID_TOOLS_ADBD - bool "adbd" - depends on BR2_USE_MMU # uses fork() - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - This option will build and install the adbd utility for the - target, which can be used to interact with a host machine - implementing the ADB protocol. - -endif - -comment "android-tools needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/android-tools/Config.in.host b/package.bak/android-tools/Config.in.host deleted file mode 100644 index 993c4c9fdc..0000000000 --- a/package.bak/android-tools/Config.in.host +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_HOST_ANDROID_TOOLS - bool "host android-tools" - select BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB if \ - !BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT - help - This package contains the fastboot and adb utilities, that - can be used to interact with target devices using of these - protocols. - -if BR2_PACKAGE_HOST_ANDROID_TOOLS - -config BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT - bool "fastboot" - help - This option will build and install the fastboot utility for - the host, which can be used to reflash target devices - implementing the fastboot protocol. - -config BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB - bool "adb" - help - This option will build and install the adb utility for the - host, which can be used to interact with target devices - implementing the ADB protocol. - -endif diff --git a/package.bak/android-tools/android-tools.hash b/package.bak/android-tools/android-tools.hash deleted file mode 100644 index 7afa04430b..0000000000 --- a/package.bak/android-tools/android-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 9bfba987e1351b12aa983787b9ae4424ab752e9e646d8e93771538dc1e5d932f android-tools_4.2.2+git20130218.orig.tar.xz -sha256 73c3078de3e44d8a3cadf7a360863c63155d9d558c2f0933cf38ad901a3f5998 android-tools_4.2.2+git20130218-3ubuntu41.debian.tar.gz diff --git a/package.bak/android-tools/android-tools.mk b/package.bak/android-tools/android-tools.mk deleted file mode 100644 index 45103923eb..0000000000 --- a/package.bak/android-tools/android-tools.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# android-tools -# -################################################################################ - -ANDROID_TOOLS_SITE = https://launchpad.net/ubuntu/+archive/primary/+files -ANDROID_TOOLS_VERSION = 4.2.2+git20130218 -ANDROID_TOOLS_SOURCE = android-tools_$(ANDROID_TOOLS_VERSION).orig.tar.xz -ANDROID_TOOLS_EXTRA_DOWNLOADS = android-tools_$(ANDROID_TOOLS_VERSION)-3ubuntu41.debian.tar.gz -HOST_ANDROID_TOOLS_EXTRA_DOWNLOADS = $(ANDROID_TOOLS_EXTRA_DOWNLOADS) -ANDROID_TOOLS_LICENSE = Apache-2.0 -ANDROID_TOOLS_LICENSE_FILES = debian/copyright - -# Extract the Debian tarball inside the sources -define ANDROID_TOOLS_DEBIAN_EXTRACT - $(call suitable-extractor,$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS))) \ - $(DL_DIR)/$(notdir $(ANDROID_TOOLS_EXTRA_DOWNLOADS)) | \ - $(TAR) -C $(@D) $(TAR_OPTIONS) - -endef - -HOST_ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT -ANDROID_TOOLS_POST_EXTRACT_HOOKS += ANDROID_TOOLS_DEBIAN_EXTRACT - -# Apply the Debian patches before applying the Buildroot patches -define ANDROID_TOOLS_DEBIAN_PATCH - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \* -endef - -HOST_ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH -ANDROID_TOOLS_PRE_PATCH_HOOKS += ANDROID_TOOLS_DEBIAN_PATCH - -ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_FASTBOOT),y) -HOST_ANDROID_TOOLS_TARGETS += fastboot -HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-libselinux -endif - -ifeq ($(BR2_PACKAGE_HOST_ANDROID_TOOLS_ADB),y) -HOST_ANDROID_TOOLS_TARGETS += adb -HOST_ANDROID_TOOLS_DEPENDENCIES += host-zlib host-openssl -endif - -ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_FASTBOOT),y) -ANDROID_TOOLS_TARGETS += fastboot -ANDROID_TOOLS_DEPENDENCIES += zlib libselinux -endif - -ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADB),y) -ANDROID_TOOLS_TARGETS += adb -ANDROID_TOOLS_DEPENDENCIES += zlib openssl -endif - -ifeq ($(BR2_PACKAGE_ANDROID_TOOLS_ADBD),y) -ANDROID_TOOLS_TARGETS += adbd -ANDROID_TOOLS_DEPENDENCIES += zlib openssl -endif - -# Build each tool in its own directory not to share object files - -define HOST_ANDROID_TOOLS_BUILD_CMDS - $(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\ - mkdir -p $(@D)/build-$(t) && \ - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \ - -C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep)) -endef - -define ANDROID_TOOLS_BUILD_CMDS - $(foreach t,$(ANDROID_TOOLS_TARGETS),\ - mkdir -p $(@D)/build-$(t) && \ - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) SRCDIR=$(@D) \ - -C $(@D)/build-$(t) -f $(@D)/debian/makefiles/$(t).mk$(sep)) -endef - -define HOST_ANDROID_TOOLS_INSTALL_CMDS - $(foreach t,$(HOST_ANDROID_TOOLS_TARGETS),\ - $(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(HOST_DIR)/usr/bin/$(t)$(sep)) -endef - -define ANDROID_TOOLS_INSTALL_TARGET_CMDS - $(foreach t,$(ANDROID_TOOLS_TARGETS),\ - $(INSTALL) -D -m 0755 $(@D)/build-$(t)/$(t) $(TARGET_DIR)/usr/bin/$(t)$(sep)) -endef - -$(eval $(host-generic-package)) -$(eval $(generic-package)) diff --git a/package.bak/angular-websocket/Config.in b/package.bak/angular-websocket/Config.in deleted file mode 100644 index 0981bd0d52..0000000000 --- a/package.bak/angular-websocket/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ANGULAR_WEBSOCKET - bool "angular-websocket" - help - An AngularJS WebSocket service for connecting client - applications to servers. - - https://github.com/AngularClass/angular-websocket diff --git a/package.bak/angular-websocket/angular-websocket.hash b/package.bak/angular-websocket/angular-websocket.hash deleted file mode 100644 index 36700684b9..0000000000 --- a/package.bak/angular-websocket/angular-websocket.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 69d752896bc17c08750a2fda24b5eb3c6d653afc6f406dd90a6b7c920b22a14a angular-websocket-v2.0.0.tar.gz diff --git a/package.bak/angular-websocket/angular-websocket.mk b/package.bak/angular-websocket/angular-websocket.mk deleted file mode 100644 index b422847e2d..0000000000 --- a/package.bak/angular-websocket/angular-websocket.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# angular-websocket -# -################################################################################ - -ANGULAR_WEBSOCKET_VERSION = v2.0.0 -ANGULAR_WEBSOCKET_SITE = $(call github,AngularClass,angular-websocket,$(ANGULAR_WEBSOCKET_VERSION)) -ANGULAR_WEBSOCKET_LICENSE = MIT -ANGULAR_WEBSOCKET_LICENSE_FILES = LICENSE - -# install .min.js as .js -define ANGULAR_WEBSOCKET_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/angular-websocket.min.js \ - $(TARGET_DIR)/var/www/angular-websocket.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/angularjs/Config.in b/package.bak/angularjs/Config.in deleted file mode 100644 index f0d2015a70..0000000000 --- a/package.bak/angularjs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_ANGULARJS - bool "angularjs" - help - AngularJS web application framework. - - http://angularjs.org diff --git a/package.bak/angularjs/angularjs.hash b/package.bak/angularjs/angularjs.hash deleted file mode 100644 index 100b6dc667..0000000000 --- a/package.bak/angularjs/angularjs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a99e3c22b54178b7646856efd95e825650d32d3125904a28216aeba52e221bad angular-1.4.3.zip diff --git a/package.bak/angularjs/angularjs.mk b/package.bak/angularjs/angularjs.mk deleted file mode 100644 index 08a4b60845..0000000000 --- a/package.bak/angularjs/angularjs.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# angularjs -# -################################################################################ - -ANGULARJS_VERSION = 1.4.3 -ANGULARJS_SOURCE = angular-$(ANGULARJS_VERSION).zip -ANGULARJS_SITE = https://code.angularjs.org/$(ANGULARJS_VERSION) -ANGULARJS_LICENSE = MIT -# There's no separate license file in the archive, so use angular.js instead. -ANGULARJS_LICENSE_FILES = angular.js - -define ANGULARJS_EXTRACT_CMDS - unzip $(DL_DIR)/$(ANGULARJS_SOURCE) -d $(@D) - mv $(@D)/angular-$(ANGULARJS_VERSION)/* $(@D) - rmdir $(@D)/angular-$(ANGULARJS_VERSION) -endef - -# install .min.js as .js -define ANGULARJS_INSTALL_TARGET_CMDS - $(foreach f,$(notdir $(wildcard $(@D)/*.min.js)), - $(INSTALL) -m 0644 -D $(@D)/$(f) \ - $(TARGET_DIR)/var/www/$(f:.min.js=.js)$(sep)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/apache/0001-cross-compile.patch b/package.bak/apache/0001-cross-compile.patch deleted file mode 100644 index 790b7a0490..0000000000 --- a/package.bak/apache/0001-cross-compile.patch +++ /dev/null @@ -1,63 +0,0 @@ -Fix cross-compilation - -Fetched httpd-2.4.x-cross_compile.diff from upstream bugtracker: -https://issues.apache.org/bugzilla/show_bug.cgi?id=51257#c6 - -which is a bundle of upstream revisions: - http://svn.apache.org/viewvc?view=revision&revision=1327907 - http://svn.apache.org/viewvc?view=revision&revision=1328390 - http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Signed-off-by: Bernd Kuhls - -Index: server/Makefile.in -=================================================================== ---- a/server/Makefile.in (revision 1328714) -+++ b/server/Makefile.in (working copy) -@@ -22,9 +22,14 @@ - include $(top_builddir)/build/rules.mk - include $(top_srcdir)/build/library.mk - -+ifdef CC_FOR_BUILD -+gen_test_char: gen_test_char.c -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - gen_test_char_OBJECTS = gen_test_char.lo - gen_test_char: $(gen_test_char_OBJECTS) - $(LINK) $(EXTRA_LDFLAGS) $(gen_test_char_OBJECTS) $(EXTRA_LIBS) -+endif - - test_char.h: gen_test_char - ./gen_test_char > test_char.h -Index: configure.in -=================================================================== ---- a/configure.in (revision 1328714) -+++ b/configure.in (working copy) -@@ -193,6 +193,14 @@ - dnl Try to get c99 support for variadic macros - ifdef([AC_PROG_CC_C99], [AC_PROG_CC_C99]) - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+ - if test "x${cache_file}" = "x/dev/null"; then - # Likewise, ensure that CC and CPP are passed through to the pcre - # configure script iff caching is disabled (the autoconf 2.5x default). -Index: acinclude.m4 -=================================================================== ---- a/acinclude.m4 (revision 1328714) -+++ ab/cinclude.m4 (working copy) -@@ -53,6 +53,8 @@ - APACHE_SUBST(CPPFLAGS) - APACHE_SUBST(CFLAGS) - APACHE_SUBST(CXXFLAGS) -+ APACHE_SUBST(CC_FOR_BUILD) -+ APACHE_SUBST(CFLAGS_FOR_BUILD) - APACHE_SUBST(LTFLAGS) - APACHE_SUBST(LDFLAGS) - APACHE_SUBST(LT_LDFLAGS) diff --git a/package.bak/apache/0002-nios2_is_not_os2.patch b/package.bak/apache/0002-nios2_is_not_os2.patch deleted file mode 100644 index 9da8ccac02..0000000000 --- a/package.bak/apache/0002-nios2_is_not_os2.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix nios2 detection. - -Apache treats nios2 as OS/2. - -Signed-off-by: Bernd Kuhls - -diff -uNr httpd-2.4.12.org/configure.in httpd-2.4.12/configure.in ---- httpd-2.4.12.org/configure.in 2015-01-22 18:33:07.000000000 +0100 -+++ httpd-2.4.12/configure.in 2015-04-02 22:01:32.851102219 +0200 -@@ -268,7 +268,7 @@ - AC_MSG_NOTICE([]) - - case $host in -- *os2*) -+ *-os2*) - # Use a custom made libtool replacement - echo "using aplibtool" - LIBTOOL="$abs_srcdir/srclib/apr/build/aplibtool" diff --git a/package.bak/apache/Config.in b/package.bak/apache/Config.in deleted file mode 100644 index 511876d2eb..0000000000 --- a/package.bak/apache/Config.in +++ /dev/null @@ -1,47 +0,0 @@ -config BR2_PACKAGE_APACHE - bool "apache" - select BR2_PACKAGE_APR_UTIL - select BR2_PACKAGE_PCRE - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # apr - help - The Apache HTTP Server Project is an effort to develop and maintain an - open-source HTTP server for modern operating systems including UNIX - and Windows NT. The goal of this project is to provide a secure, - efficient and extensible server that provides HTTP services in sync - with the current HTTP standards. - - http://httpd.apache.org - -if BR2_PACKAGE_APACHE - -choice - prompt "Multi-Processing Module (MPM)" - default BR2_PACKAGE_APACHE_MPM_WORKER - help - Select the Multi-Processing Module (MPM). - -config BR2_PACKAGE_APACHE_MPM_EVENT - bool "event" - help - A variant of the worker MPM with the goal of consuming threads - only for connections with active processing - -config BR2_PACKAGE_APACHE_MPM_PREFORK - bool "prefork" - help - Implements a non-threaded, pre-forking web server - -config BR2_PACKAGE_APACHE_MPM_WORKER - bool "worker" - help - Implements a hybrid multi-threaded multi-process web server - -endchoice - -endif - -comment "apache needs a toolchain w/ dynamic library, threads" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/apache/apache.hash b/package.bak/apache/apache.hash deleted file mode 100644 index 38fd883f82..0000000000 --- a/package.bak/apache/apache.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.apache.org/dist/httpd/httpd-2.4.23.tar.bz2.sha1 -sha1 bd6d138c31c109297da2346c6e7b93b9283993d2 httpd-2.4.25.tar.bz2 diff --git a/package.bak/apache/apache.mk b/package.bak/apache/apache.mk deleted file mode 100644 index ae629bd2ca..0000000000 --- a/package.bak/apache/apache.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# apache -# -################################################################################ - -APACHE_VERSION = 2.4.25 -APACHE_SOURCE = httpd-$(APACHE_VERSION).tar.bz2 -APACHE_SITE = http://archive.apache.org/dist/httpd -APACHE_LICENSE = Apache-2.0 -APACHE_LICENSE_FILES = LICENSE -# Needed for mod_php -APACHE_INSTALL_STAGING = YES -# We have a patch touching configure.in and Makefile.in, -# so we need to autoreconf: -APACHE_AUTORECONF = YES -APACHE_DEPENDENCIES = apr apr-util pcre - -APACHE_CONF_ENV= \ - ap_cv_void_ptr_lt_long=no \ - PCRE_CONFIG=$(STAGING_DIR)/usr/bin/pcre-config - -ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT),y) -APACHE_MPM = event -else ifeq ($(BR2_PACKAGE_APACHE_MPM_PREFORK),y) -APACHE_MPM = prefork -else ifeq ($(BR2_PACKAGE_APACHE_MPM_WORKER),y) -APACHE_MPM = worker -endif - -APACHE_CONF_OPTS = \ - --sysconfdir=/etc/apache2 \ - --with-apr=$(STAGING_DIR)/usr \ - --with-apr-util=$(STAGING_DIR)/usr \ - --with-pcre=$(STAGING_DIR)/usr/bin/pcre-config \ - --enable-http \ - --enable-dbd \ - --enable-proxy \ - --enable-mime-magic \ - --without-suexec-bin \ - --enable-mods-shared=all \ - --with-mpm=$(APACHE_MPM) \ - --disable-lua \ - --disable-luajit - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -APACHE_DEPENDENCIES += libxml2 -# Apache wants the path to the header file, where it can find -# . -APACHE_CONF_OPTS += \ - --enable-xml2enc \ - --enable-proxy-html \ - --with-libxml2=$(STAGING_DIR)/usr/include/libxml2 -else -APACHE_CONF_OPTS += \ - --disable-xml2enc \ - --disable-proxy-html -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -APACHE_DEPENDENCIES += openssl -APACHE_CONF_OPTS += \ - --enable-ssl \ - --with-ssl=$(STAGING_DIR)/usr -else -APACHE_CONF_OPTS += --disable-ssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -APACHE_DEPENDENCIES += zlib -APACHE_CONF_OPTS += \ - --enable-deflate \ - --with-z=$(STAGING_DIR)/usr -else -APACHE_CONF_OPTS += --disable-deflate -endif - -define APACHE_FIX_STAGING_APACHE_CONFIG - $(SED) 's%/usr/build%$(STAGING_DIR)/usr/build%' $(STAGING_DIR)/usr/bin/apxs - $(SED) 's%^prefix =.*%prefix = $(STAGING_DIR)/usr%' $(STAGING_DIR)/usr/build/config_vars.mk -endef -APACHE_POST_INSTALL_STAGING_HOOKS += APACHE_FIX_STAGING_APACHE_CONFIG - -define APACHE_CLEANUP_TARGET - $(RM) -rf $(TARGET_DIR)/usr/manual $(TARGET_DIR)/usr/build -endef -APACHE_POST_INSTALL_TARGET_HOOKS += APACHE_CLEANUP_TARGET - -$(eval $(autotools-package)) diff --git a/package.bak/apitrace/Config.in b/package.bak/apitrace/Config.in deleted file mode 100644 index 7fdd35af3e..0000000000 --- a/package.bak/apitrace/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -comment "apitrace needs a glibc toolchain w/ C++, gcc >= 4.6" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - -config BR2_PACKAGE_APITRACE - bool "apitrace" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_USES_GLIBC # uses glibc specific __libc_dlsym - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_LIBPNG - help - Trace and replay OpenGL and OpenGL ES APIs calls to/from a - file. You may install apitrace GUI from your distribution to - inspect generated traces. - - http://apitrace.github.io/ diff --git a/package.bak/apitrace/apitrace.hash b/package.bak/apitrace/apitrace.hash deleted file mode 100644 index eac470b03d..0000000000 --- a/package.bak/apitrace/apitrace.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 21d0cc765b84e537c5a3a117073818942653b85685b9633d364836ccfe0b9fd5 apitrace-7.0.tar.gz diff --git a/package.bak/apitrace/apitrace.mk b/package.bak/apitrace/apitrace.mk deleted file mode 100644 index fbd957c617..0000000000 --- a/package.bak/apitrace/apitrace.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# apitrace -# -################################################################################ - -APITRACE_VERSION = 7.0 -APITRACE_SITE = $(call github,apitrace,apitrace,$(APITRACE_VERSION)) -APITRACE_LICENSE = MIT -APITRACE_LICENSE_FILES = LICENSE - -APITRACE_DEPENDENCIES = xlib_libX11 host-python libpng - -# Gui was never tested, so we prefer to explicitly disable it -APITRACE_CONF_OPTS += -DENABLE_GUI=false - -$(eval $(cmake-package)) diff --git a/package.bak/apr-util/0001-remove-checkapr.patch b/package.bak/apr-util/0001-remove-checkapr.patch deleted file mode 100644 index 42ad12fcbe..0000000000 --- a/package.bak/apr-util/0001-remove-checkapr.patch +++ /dev/null @@ -1,21 +0,0 @@ -remove check apr - -this patch removes the check of apr which fails the build - -Signed-off-by: Rico Bachmann ---- -v1: disable the check for APU_FIND_APR because the check only looks into folders -named apr, and our source-tree is called apr-versionnumber (e.g. apr-1.4.6) - -diff -rupN apr-util-1.4.1/configure.in apr-util-1.4.1-fix/configure.in ---- apr-util-1.4.1/configure.in 2009-12-17 20:15:19.000000000 +0100 -+++ apr-util-1.4.1-fix/configure.in 2012-04-24 10:10:32.000000000 +0200 -@@ -99,7 +99,7 @@ fi - dnl - dnl Find the APR includes directory and (possibly) the source (base) dir. - dnl --APU_FIND_APR -+dnl APU_FIND_APR - - dnl - dnl even though we use apr_rules.mk for building apr-util, we need diff --git a/package.bak/apr-util/Config.in b/package.bak/apr-util/Config.in deleted file mode 100644 index 1d7db2bd77..0000000000 --- a/package.bak/apr-util/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_APR_UTIL - bool "apr-util" - select BR2_PACKAGE_APR - select BR2_PACKAGE_EXPAT - # apr really needs shared library support - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # apr - help - The utility library for the apache runtime project - - http://apr.apache.org/ - -comment "apr-util needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/apr-util/apr-util.hash b/package.bak/apr-util/apr-util.hash deleted file mode 100644 index 3db4396058..0000000000 --- a/package.bak/apr-util/apr-util.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://archive.apache.org/dist/apr/apr-util-1.5.4.tar.gz.sha1 -sha1 72cc3ac693b52fb831063d5c0de18723bc8e0095 apr-util-1.5.4.tar.gz diff --git a/package.bak/apr-util/apr-util.mk b/package.bak/apr-util/apr-util.mk deleted file mode 100644 index bc0572e110..0000000000 --- a/package.bak/apr-util/apr-util.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# apr-util -# -################################################################################ - -APR_UTIL_VERSION = 1.5.4 -APR_UTIL_SITE = http://archive.apache.org/dist/apr -APR_UTIL_LICENSE = Apache-2.0 -APR_UTIL_LICENSE_FILES = LICENSE -APR_UTIL_INSTALL_STAGING = YES -APR_UTIL_DEPENDENCIES = apr expat -APR_UTIL_CONF_OPTS = \ - --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config -APR_UTIL_CONFIG_SCRIPTS = apu-1-config - -# When iconv is available, then use it to provide charset conversion -# features. -APR_UTIL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -ifeq ($(BR2_PACKAGE_BERKELEYDB),y) -APR_UTIL_CONF_OPTS += --with-dbm=db53 --with-berkeley-db="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += berkeleydb -else -APR_UTIL_CONF_OPTS += --without-berkeley-db -endif - -ifeq ($(BR2_PACKAGE_GDBM),y) -APR_UTIL_CONF_OPTS += --with-gdbm="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += gdbm -else -APR_UTIL_CONF_OPTS += --without-gdbm -endif - -ifeq ($(BR2_PACKAGE_MYSQL),y) -APR_UTIL_CONF_OPTS += --with-mysql="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += mysql -else -APR_UTIL_CONF_OPTS += --without-mysql -endif - -ifeq ($(BR2_PACKAGE_SQLITE),y) -APR_UTIL_CONF_OPTS += --with-sqlite3="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += sqlite -else -APR_UTIL_CONF_OPTS += --without-sqlite3 -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -APR_UTIL_CONF_OPTS += --with-crypto --with-openssl="$(STAGING_DIR)/usr" -APR_UTIL_DEPENDENCIES += openssl -else -APR_UTIL_CONF_OPTS += --without-crypto -endif - -ifeq ($(BR2_PACKAGE_UNIXODBC),y) -APR_UTIL_CONF_OPTS += --with-odbc="$(STAGING_DIR)/usr" -# avoid using target binary $(STAGING_DIR)/usr/bin/odbc_config -APR_UTIL_CONF_ENV += ac_cv_path_ODBC_CONFIG="" -APR_UTIL_DEPENDENCIES += unixodbc -else -APR_UTIL_CONF_OPTS += --without-odbc -endif - -$(eval $(autotools-package)) diff --git a/package.bak/apr/0001-cross-compile.patch b/package.bak/apr/0001-cross-compile.patch deleted file mode 100644 index 5b596fb20f..0000000000 --- a/package.bak/apr/0001-cross-compile.patch +++ /dev/null @@ -1,58 +0,0 @@ -Fix cross-compilation - -Patch was backported from Apache httpd: -http://svn.apache.org/viewvc?view=revision&revision=1327907 -http://svn.apache.org/viewvc?view=revision&revision=1328390 -http://svn.apache.org/viewvc?view=revision&revision=1328714 - -Patch submitted upstream: -https://issues.apache.org/bugzilla/show_bug.cgi?id=57058 - -Signed-off-by: Bernd Kuhls - -diff -uNr apr-1.5.1.org/configure.in apr-1.5.1/configure.in ---- apr-1.5.1.org/configure.in 2014-01-25 16:17:29.000000000 +0100 -+++ apr-1.5.1/configure.in 2014-10-05 11:20:40.080746760 +0200 -@@ -118,6 +118,16 @@ - echo "Configuring APR library" - echo "Platform: $host" - -+dnl In case of cross compilation we set CC_FOR_BUILD to cc unless -+dnl we got already CC_FOR_BUILD from environment. -+if test "x${build_alias}" != "x${host_alias}"; then -+ if test "x${CC_FOR_BUILD}" = "x"; then -+ CC_FOR_BUILD=cc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+AC_SUBST(CFLAGS_FOR_BUILD) -+ - dnl Some initial steps for configuration. We setup the default directory - dnl and which files are to be configured. - -diff -uNr apr-1.5.1.org/Makefile.in apr-1.5.1/Makefile.in ---- apr-1.5.1.org/Makefile.in 2014-03-17 16:10:26.000000000 +0100 -+++ apr-1.5.1/Makefile.in 2014-10-05 11:22:53.031070519 +0200 -@@ -8,6 +8,8 @@ - # APR (Apache Portable Runtime) library Makefile. - # - CPP = @CPP@ -+CC_FOR_BUILD = @CC_FOR_BUILD@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - - # get substituted into some targets - APR_MAJOR_VERSION=@APR_MAJOR_VERSION@ -@@ -134,8 +136,13 @@ - - OBJECTS_gen_test_char = tools/gen_test_char.lo $(LOCAL_LIBS) - tools/gen_test_char.lo: make_tools_dir -+ifdef CC_FOR_BUILD -+tools/gen_test_char@EXEEXT@: tools/gen_test_char.c $(LOCAL_LIBS) -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -DCROSS_COMPILE -o $@ $< -+else - tools/gen_test_char@EXEEXT@: $(OBJECTS_gen_test_char) - $(LINK_PROG) $(OBJECTS_gen_test_char) $(ALL_LIBS) -+endif - - include/private/apr_escape_test_char.h: tools/gen_test_char@EXEEXT@ - $(APR_MKDIR) include/private diff --git a/package.bak/apr/Config.in b/package.bak/apr/Config.in deleted file mode 100644 index 5757272450..0000000000 --- a/package.bak/apr/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_APR - bool "apr" - # apr really needs shared library support - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # fork() in apr_proc_fork() - help - The mission of the Apache Portable Runtime (APR) project is to create - and maintain software libraries that provide a predictable and - consistent interface to underlying platform-specific implementations - - http://apr.apache.org/ - -comment "apr needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/apr/apr.hash b/package.bak/apr/apr.hash deleted file mode 100644 index 50d657a8cb..0000000000 --- a/package.bak/apr/apr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://archive.apache.org/dist/apr/apr-1.5.1.tar.gz.sha1 -sha1 9caa83e3f50f3abc9fab7c4a3f2739a12b14c3a3 apr-1.5.1.tar.gz diff --git a/package.bak/apr/apr.mk b/package.bak/apr/apr.mk deleted file mode 100644 index 361a79f99b..0000000000 --- a/package.bak/apr/apr.mk +++ /dev/null @@ -1,74 +0,0 @@ -################################################################################ -# -# apr -# -################################################################################ - -APR_VERSION = 1.5.1 -APR_SITE = http://archive.apache.org/dist/apr -APR_LICENSE = Apache-2.0 -APR_LICENSE_FILES = LICENSE -APR_INSTALL_STAGING = YES -# We have a patch touching configure.in and Makefile.in, -# so we need to autoreconf: -APR_AUTORECONF = YES - -APR_CONF_ENV = \ - CC_FOR_BUILD="$(HOSTCC)" \ - CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ - ac_cv_file__dev_zero=yes \ - ac_cv_func_setpgrp_void=yes \ - apr_cv_process_shared_works=yes \ - apr_cv_mutex_robust_shared=no \ - apr_cv_tcp_nodelay_with_cork=yes \ - ac_cv_sizeof_struct_iovec=8 \ - ac_cv_struct_rlimit=yes \ - ac_cv_o_nonblock_inherited=no \ - apr_cv_mutex_recursive=yes -APR_CONFIG_SCRIPTS = apr-1-config - -# Doesn't even try to guess when cross compiling -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -APR_CONF_ENV += apr_cv_pthreads_lib="-lpthread" -endif - -# Fix lfs detection when cross compiling -APR_CONF_ENV += apr_cv_use_lfs64=yes - -# Use non-portable atomics when available: 8 bytes atomics are used on -# 64-bits architectures, 4 bytes atomics on 32-bits architectures. We -# have to override ap_cv_atomic_builtins because the test used to -# check for atomic builtins uses AC_TRY_RUN, which doesn't work when -# cross-compiling. -ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_8),y:y) -APR_CONF_OPTS += --enable-nonportable-atomics -APR_CONF_ENV += ap_cv_atomic_builtins=yes -else ifeq ($(BR2_ARCH_IS_64):$(BR2_TOOLCHAIN_HAS_SYNC_4),:y) -APR_CONF_OPTS += --enable-nonportable-atomics -APR_CONF_ENV += ap_cv_atomic_builtins=yes -else -APR_CONF_OPTS += --disable-nonportable-atomics -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -APR_DEPENDENCIES += util-linux -endif - -define APR_CLEANUP_UNNEEDED_FILES - $(RM) -rf $(TARGET_DIR)/usr/build-1/ -endef - -APR_POST_INSTALL_TARGET_HOOKS += APR_CLEANUP_UNNEEDED_FILES - -define APR_FIXUP_RULES_MK - $(SED) 's%apr_builddir=%apr_builddir=$(STAGING_DIR)%' \ - $(STAGING_DIR)/usr/build-1/apr_rules.mk - $(SED) 's%apr_builders=%apr_builders=$(STAGING_DIR)%' \ - $(STAGING_DIR)/usr/build-1/apr_rules.mk - $(SED) 's%top_builddir=%top_builddir=$(STAGING_DIR)%' \ - $(STAGING_DIR)/usr/build-1/apr_rules.mk -endef - -APR_POST_INSTALL_STAGING_HOOKS += APR_FIXUP_RULES_MK - -$(eval $(autotools-package)) diff --git a/package.bak/argp-standalone/0001-throw-in-funcdef.patch b/package.bak/argp-standalone/0001-throw-in-funcdef.patch deleted file mode 100644 index 4a90751e1e..0000000000 --- a/package.bak/argp-standalone/0001-throw-in-funcdef.patch +++ /dev/null @@ -1,79 +0,0 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# -# T2 SDE: package/.../rng-tools/throw-in-funcdef.patch.argp-standalone -# Copyright (C) 2006 The T2 SDE Project -# -# More information can be found in the files COPYING and README. -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# --- T2-COPYRIGHT-NOTE-END --- - - -No __THROW in function implementation. - --jsaw - ---- argp-standalone-1.4-test2/argp.h.orig 2006-01-06 02:29:59.000000000 +0100 -+++ argp-standalone-1.4-test2/argp.h 2006-01-06 02:41:10.000000000 +0100 -@@ -560,17 +560,17 @@ - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern inline - # endif - - ARGP_EI void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - ARGP_EI int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -582,7 +582,7 @@ - } - - ARGP_EI int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } ---- argp-standalone-1.4-test2/argp-parse.c.orig 2006-01-06 02:47:48.000000000 +0100 -+++ argp-standalone-1.4-test2/argp-parse.c 2006-01-06 02:48:16.000000000 +0100 -@@ -1290,13 +1290,13 @@ - /* Defined here, in case a user is not inlining the definitions in - * argp.h */ - void --__argp_usage (__const struct argp_state *__state) __THROW -+__argp_usage (__const struct argp_state *__state) - { - __argp_state_help (__state, stderr, ARGP_HELP_STD_USAGE); - } - - int --__option_is_short (__const struct argp_option *__opt) __THROW -+__option_is_short (__const struct argp_option *__opt) - { - if (__opt->flags & OPTION_DOC) - return 0; -@@ -1310,7 +1310,7 @@ - } - - int --__option_is_end (__const struct argp_option *__opt) __THROW -+__option_is_end (__const struct argp_option *__opt) - { - return !__opt->key && !__opt->name && !__opt->doc && !__opt->group; - } diff --git a/package.bak/argp-standalone/0002-isprint.patch b/package.bak/argp-standalone/0002-isprint.patch deleted file mode 100644 index 9c08366f68..0000000000 --- a/package.bak/argp-standalone/0002-isprint.patch +++ /dev/null @@ -1,45 +0,0 @@ -Subject: restrict value range passed to isprint function - -According to C standards isprint argument shall be representable as an -unsigned char or be equal to EOF, otherwise the behaviour is undefined. - -Passing arbitrary ints leads to segfault in nm program from elfutils. - -Restrict isprint argument range to values representable by unsigned char. - -Signed-off-by: Max Filippov ---- -Index: b/argp.h -=================================================================== ---- a/argp.h -+++ b/argp.h -@@ -23,6 +23,7 @@ - - #include - #include -+#include - - #define __need_error_t - #include -@@ -577,7 +578,7 @@ - else - { - int __key = __opt->key; -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - -Index: b/argp-parse.c -=================================================================== ---- a/argp-parse.c -+++ b/argp-parse.c -@@ -1292,7 +1292,7 @@ - int __key = __opt->key; - /* FIXME: whether or not a particular key implies a short option - * ought not to be locale dependent. */ -- return __key > 0 && isprint (__key); -+ return __key > 0 && __key <= UCHAR_MAX && isprint (__key); - } - } - diff --git a/package.bak/argp-standalone/0003-fix_build_with_c99_compilers.patch b/package.bak/argp-standalone/0003-fix_build_with_c99_compilers.patch deleted file mode 100644 index bfa0bb53e1..0000000000 --- a/package.bak/argp-standalone/0003-fix_build_with_c99_compilers.patch +++ /dev/null @@ -1,80 +0,0 @@ -From b2dfa011a3fdcb7d22764d143517d0fbd1c2a201 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus -Date: Wed, 22 Jan 2014 14:47:23 +0100 -Subject: [PATCH] Fix build with c99 compilers - -BUG: 764655 -Change-Id: If5dfdc9c7427bd3d39d8da8f79e33ae2da6a3137 -Signed-off-by: Emmanuel Dreyfus -Reviewed-on: http://review.gluster.org/6034 -Reviewed-by: Harshavardhana -Tested-by: Gluster Build System ---- - -diff --git a/argp-fmtstream.c b/argp-fmtstream.c -index 7f79285..494b6b3 100644 ---- a/argp-fmtstream.c -+++ b/argp-fmtstream.c -@@ -389,6 +389,7 @@ - weak_alias (__argp_fmtstream_printf, argp_fmtstream_printf) - #endif - -+#if __STDC_VERSION__ - 199900L < 1 - /* Duplicate the inline definitions in argp-fmtstream.h, for compilers - * that don't do inlining. */ - size_t -@@ -471,5 +472,6 @@ - __argp_fmtstream_update (__fs); - return __fs->point_col >= 0 ? __fs->point_col : 0; - } -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - #endif /* !ARGP_FMTSTREAM_USE_LINEWRAP */ -diff --git a/argp-fmtstream.h b/argp-fmtstream.h -index e797b11..828f435 100644 ---- a/argp-fmtstream.h -+++ b/argp-fmtstream.h -@@ -153,6 +153,7 @@ - __const char *__fmt, ...) - PRINTF_STYLE(2,3); - -+#if __STDC_VERSION__ - 199900L < 1 - extern int __argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); - extern int argp_fmtstream_putc (argp_fmtstream_t __fs, int __ch); - -@@ -163,6 +164,7 @@ - __const char *__str, size_t __len); - extern size_t argp_fmtstream_write (argp_fmtstream_t __fs, - __const char *__str, size_t __len); -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - /* Access macros for various bits of state. */ - #define argp_fmtstream_lmargin(__fs) ((__fs)->lmargin) -@@ -172,6 +174,7 @@ - #define __argp_fmtstream_rmargin argp_fmtstream_rmargin - #define __argp_fmtstream_wmargin argp_fmtstream_wmargin - -+#if __STDC_VERSION__ - 199900L < 1 - /* Set __FS's left margin to LMARGIN and return the old value. */ - extern size_t argp_fmtstream_set_lmargin (argp_fmtstream_t __fs, - size_t __lmargin); -@@ -193,6 +196,7 @@ - /* Return the column number of the current output point in __FS. */ - extern size_t argp_fmtstream_point (argp_fmtstream_t __fs); - extern size_t __argp_fmtstream_point (argp_fmtstream_t __fs); -+#endif /* __STDC_VERSION__ - 199900L < 1 */ - - /* Internal routines. */ - extern void _argp_fmtstream_update (argp_fmtstream_t __fs); -@@ -216,7 +220,11 @@ - #endif - - #ifndef ARGP_FS_EI -+#if defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__) - #define ARGP_FS_EI extern inline -+#else -+#define ARGP_FS_EI inline -+#endif - #endif - - ARGP_FS_EI size_t diff --git a/package.bak/argp-standalone/Config.in b/package.bak/argp-standalone/Config.in deleted file mode 100644 index 3319dd945c..0000000000 --- a/package.bak/argp-standalone/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ARGP_STANDALONE - bool "argp-standalone" - # glibc provides its own argp implementation. - depends on !BR2_TOOLCHAIN_USES_GLIBC - help - Glibc hierarchical argument parsing standalone library. - - http://www.lysator.liu.se/~nisse/misc/ diff --git a/package.bak/argp-standalone/argp-standalone.hash b/package.bak/argp-standalone/argp-standalone.hash deleted file mode 100644 index 5798214406..0000000000 --- a/package.bak/argp-standalone/argp-standalone.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 dec79694da1319acd2238ce95df57f3680fea2482096e483323fddf3d818d8be argp-standalone-1.3.tar.gz diff --git a/package.bak/argp-standalone/argp-standalone.mk b/package.bak/argp-standalone/argp-standalone.mk deleted file mode 100644 index b87b923f49..0000000000 --- a/package.bak/argp-standalone/argp-standalone.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# argp-standalone -# -################################################################################ - -ARGP_STANDALONE_VERSION = 1.3 -ARGP_STANDALONE_SITE = http://www.lysator.liu.se/~nisse/archive -ARGP_STANDALONE_INSTALL_STAGING = YES -ARGP_STANDALONE_LICENSE = LGPLv2+ - -ARGP_STANDALONE_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" - -define ARGP_STANDALONE_INSTALL_STAGING_CMDS - $(INSTALL) -D $(@D)/libargp.a $(STAGING_DIR)/usr/lib/libargp.a - $(INSTALL) -D $(@D)/argp.h $(STAGING_DIR)/usr/include/argp.h -endef - -define ARGP_STANDALONE_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/libargp.a $(TARGET_DIR)/usr/lib/libargp.a - $(INSTALL) -D $(@D)/argp.h $(TARGET_DIR)/usr/include/argp.h -endef - -$(eval $(autotools-package)) diff --git a/package.bak/argparse/Config.in b/package.bak/argparse/Config.in deleted file mode 100644 index d207b0482c..0000000000 --- a/package.bak/argparse/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_ARGPARSE - bool "argparse" - help - Argparse is a feature-rich command line parser for Lua - inspired by argparse for Python. Argparse supports - positional arguments, options, flags, optional arguments, - subcommands and more. Argparse automatically generates - usage, help and error messages. - - https://github.com/mpeterv/argparse diff --git a/package.bak/argparse/argparse.hash b/package.bak/argparse/argparse.hash deleted file mode 100644 index a4746bc6af..0000000000 --- a/package.bak/argparse/argparse.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e00e5637c937d7bfca96025f2c598ba4fffe9eb818d69952e77b4c08167a6be3 argparse-0.5.0-1.src.rock diff --git a/package.bak/argparse/argparse.mk b/package.bak/argparse/argparse.mk deleted file mode 100644 index 095f0a315c..0000000000 --- a/package.bak/argparse/argparse.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# argparse -# -################################################################################ - -ARGPARSE_VERSION_UPSTREAM = 0.5.0 -ARGPARSE_VERSION = $(ARGPARSE_VERSION_UPSTREAM)-1 -ARGPARSE_SUBDIR = argparse -ARGPARSE_LICENSE = MIT -ARGPARSE_LICENSE_FILES = $(ARGPARSE_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/argus/Config.in b/package.bak/argus/Config.in deleted file mode 100644 index 7a7d2b650f..0000000000 --- a/package.bak/argus/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ARGUS - bool "argus" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - A Real Time Flow Monitor-based audit engine. - - http://qosient.com/argus/ - -comment "argus needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/argus/argus.hash b/package.bak/argus/argus.hash deleted file mode 100644 index 84edce61ec..0000000000 --- a/package.bak/argus/argus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://qosient.com/argus/src/argus-3.0.8.tar.gz.md5 -md5 84daae71a502e4f6d088c279de3aa36b argus-3.0.8.tar.gz diff --git a/package.bak/argus/argus.mk b/package.bak/argus/argus.mk deleted file mode 100644 index bd1c55904a..0000000000 --- a/package.bak/argus/argus.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# argus -# -################################################################################ - -ARGUS_VERSION = 3.0.8 -ARGUS_SITE = http://qosient.com/argus/src -ARGUS_DEPENDENCIES = libpcap -ARGUS_CONF_ENV = arg_cv_sys_errlist=yes -# Code is really v2+ though COPYING is v3 so ship README to avoid confusion -ARGUS_LICENSE = GPLv2+ -ARGUS_LICENSE_FILES = README - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -ARGUS_DEPENDENCIES += libtirpc host-pkgconf -ARGUS_CONF_ENV += \ - CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/armadillo/Config.in b/package.bak/armadillo/Config.in deleted file mode 100644 index 9483f181cf..0000000000 --- a/package.bak/armadillo/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -comment "armadillo needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) - depends on !BR2_powerpc - depends on !BR2_bfin - depends on !BR2_m68k_cf - -comment "armadillo needs a glibc toolchain w/ C++" - depends on BR2_powerpc - depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_UCLIBC - -config BR2_PACKAGE_ARMADILLO - bool "armadillo" - depends on BR2_INSTALL_LIBSTDCPP - depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) # clapack - depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC # clapack - depends on !BR2_bfin # clapack - depends on !BR2_m68k_cf # clapack - select BR2_PACKAGE_CLAPACK - help - Armadillo: An Open Source C++ Linear Algebra Library for - Fast Prototyping and Computationally Intensive Experiments. - - http://arma.sourceforge.net/ diff --git a/package.bak/armadillo/armadillo.hash b/package.bak/armadillo/armadillo.hash deleted file mode 100644 index 4149a777de..0000000000 --- a/package.bak/armadillo/armadillo.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/arma/files/?source=navbar -md5 a39f27197d24b3d25437fab6bb1d118f armadillo-6.500.4.tar.gz -sha1 68166e67521a720c72917d196b0807bc6cab8b2e armadillo-6.500.4.tar.gz -# Locally computed: -sha256 813de85fa61ba5077ed871d801ba7070d369e7e9742002e4c11474c75ff6d1c6 armadillo-6.500.4.tar.gz diff --git a/package.bak/armadillo/armadillo.mk b/package.bak/armadillo/armadillo.mk deleted file mode 100644 index 813a41bdc7..0000000000 --- a/package.bak/armadillo/armadillo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# armadillo -# -################################################################################ - -ARMADILLO_VERSION = 6.500.4 -ARMADILLO_SITE = http://downloads.sourceforge.net/project/arma -ARMADILLO_DEPENDENCIES = clapack -ARMADILLO_INSTALL_STAGING = YES -ARMADILLO_LICENSE = MPLv2.0 -ARMADILLO_LICENSE_FILES = LICENSE.txt - -$(eval $(cmake-package)) diff --git a/package.bak/arptables/0001-arptables-disable-dlfcn.h-include.patch b/package.bak/arptables/0001-arptables-disable-dlfcn.h-include.patch deleted file mode 100644 index a5d56d22a6..0000000000 --- a/package.bak/arptables/0001-arptables-disable-dlfcn.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 948a96d710f377fb0ed8d78c7fb85b299c80ef13 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 8 Nov 2014 10:12:54 -0300 -Subject: [PATCH] arptables: disable dlfcn.h include - -The relevant code is disabled in libarptc_incl.c so it's not required -and breaks the ability to build it in a pure-static toolchain. - -Status: sent upstream. - -Signed-off-by: Gustavo Zacarias ---- - arptables.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arptables.c b/arptables.c -index 64ac3aa..fe270bc 100644 ---- a/arptables.c -+++ b/arptables.c -@@ -35,7 +35,9 @@ - #include - #include - #include -+#if 0 - #include -+#endif - #include - #include - #include --- -2.0.4 - diff --git a/package.bak/arptables/0002-src-Use-stdint-types.patch b/package.bak/arptables/0002-src-Use-stdint-types.patch deleted file mode 100644 index 8a85e705d1..0000000000 --- a/package.bak/arptables/0002-src-Use-stdint-types.patch +++ /dev/null @@ -1,134 +0,0 @@ -From 24957c135eaacd718f3c788285de33d64316b32e Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 10:31:24 +0200 -Subject: [PATCH 1/2] src: Use stdint types - -Backport of upstream commit 047f37b1d5d865084a435fd7594b8c5c332ccb8d - -Please note that the backported patch does not include two changes -to arptables.h from the upstream - these modified lines added in commit -dbbe9f7de36aa3c7dd61dc89092c03f7902e474e which was committed after -the 0.0.4 release. - -Upstream-status: backport -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Brendan Heading ---- - arptables.c | 8 ++++---- - include/arptables.h | 3 ++- - include/libarptc/libarptc.h | 7 ++++--- - libarptc/libarptc.c | 4 ++-- - libarptc/libarptc_incl.c | 2 +- - 5 files changed, 13 insertions(+), 11 deletions(-) - -diff --git a/arptables.c b/arptables.c -index 5535ab2..6d1377f 100644 ---- a/arptables.c -+++ b/arptables.c -@@ -230,7 +230,7 @@ extern void dump_entries(const arptc_handle_t handle); - /etc/protocols */ - struct pprot { - char *name; -- u_int8_t num; -+ uint8_t num; - }; - - /* Primitive headers... */ -@@ -925,7 +925,7 @@ mask_to_dotted(const struct in_addr *mask) - { - int i; - static char buf[20]; -- u_int32_t maskaddr, bits; -+ uint32_t maskaddr, bits; - - maskaddr = ntohl(mask->s_addr); - -@@ -967,7 +967,7 @@ string_to_number(const char *s, unsigned int min, unsigned int max, - } - - static void --set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, -+set_option(unsigned int *options, unsigned int option, uint16_t *invflg, - int invert) - { - if (*options & option) -@@ -1107,7 +1107,7 @@ register_target(struct arptables_target *me) - } - - static void --print_num(u_int64_t number, unsigned int format) -+print_num(uint64_t number, unsigned int format) - { - if (format & FMT_KILOMEGAGIGA) { - if (number > 99999) { -diff --git a/include/arptables.h b/include/arptables.h -index 820b664..e6a6ba6 100644 ---- a/include/arptables.h -+++ b/include/arptables.h -@@ -1,6 +1,7 @@ - #ifndef _ARPTABLES_USER_H - #define _ARPTABLES_USER_H - -+#include - #include "arptables_common.h" - #include "libarptc/libarptc.h" - -@@ -126,7 +127,7 @@ extern char *mask_to_dotted(const struct in_addr *mask); - - extern void parse_hostnetworkmask(const char *name, struct in_addr **addrpp, - struct in_addr *maskp, unsigned int *naddrs); --extern u_int16_t parse_protocol(const char *s); -+extern uint16_t parse_protocol(const char *s); - - extern int do_command(int argc, char *argv[], char **table, - arptc_handle_t *handle); -diff --git a/include/libarptc/libarptc.h b/include/libarptc/libarptc.h -index e4f1175..76fbfab 100644 ---- a/include/libarptc/libarptc.h -+++ b/include/libarptc/libarptc.h -@@ -6,9 +6,10 @@ - #include - - #ifndef ARPT_MIN_ALIGN --/* arpt_entry has pointers and u_int64_t's in it, so if you align to -- it, you'll also align to any crazy matches and targets someone -- might write */ -+/* arpt_entry has pointers and uint64_t's in it, so if you align to -+ * it, you'll also align to any crazy matches and targets someone -+ * might write. -+ */ - #define ARPT_MIN_ALIGN (__alignof__(struct arpt_entry)) - #endif - -diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c -index 2dcaaef..701bae0 100644 ---- a/libarptc/libarptc.c -+++ b/libarptc/libarptc.c -@@ -256,8 +256,8 @@ unconditional(const struct arpt_arp *arp) - { - unsigned int i; - -- for (i = 0; i < sizeof(*arp)/sizeof(u_int32_t); i++) -- if (((u_int32_t *)arp)[i]) -+ for (i = 0; i < sizeof(*arp) / sizeof(uint32_t); i++) -+ if (((uint32_t *)arp)[i]) - return 0; - - return 1; -diff --git a/libarptc/libarptc_incl.c b/libarptc/libarptc_incl.c -index 2fa3d43..b41fcb2 100644 ---- a/libarptc/libarptc_incl.c -+++ b/libarptc/libarptc_incl.c -@@ -1706,7 +1706,7 @@ TC_COMMIT(TC_HANDLE_T *handle) - /* Kernel will think that pointer should be 64-bits, and get - padding. So we accomodate here (assumption: alignment of - `counters' is on 64-bit boundary). */ -- u_int64_t *kernptr = (u_int64_t *)&newcounters->counters; -+ uint64_t *kernptr = (uint64_t *)&newcounters->counters; - if ((unsigned long)&newcounters->counters % 8 != 0) { - fprintf(stderr, - "counters alignment incorrect! Mail rusty!\n"); --- -2.4.3 - diff --git a/package.bak/arptables/0003-src-Remove-support-for-libc5.patch b/package.bak/arptables/0003-src-Remove-support-for-libc5.patch deleted file mode 100644 index 15e893dd0c..0000000000 --- a/package.bak/arptables/0003-src-Remove-support-for-libc5.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5f1379ff68bfedb56309527bee266a591b27a19e Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 10:31:41 +0200 -Subject: [PATCH 2/2] src: Remove support for libc5 - -Fixes compilation with musl libc - -Backport of upstream commit f4ab8f63f11a72f14687a6646d04ae1bae3fa45f -Upstream status: backport -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -Signed-off-by: Brendan Heading ---- - include/libarptc/arpt_kernel_headers.h | 12 ------------ - libarptc/libarptc.c | 4 ---- - 2 files changed, 16 deletions(-) - -diff --git a/include/libarptc/arpt_kernel_headers.h b/include/libarptc/arpt_kernel_headers.h -index 442cc54..140e999 100644 ---- a/include/libarptc/arpt_kernel_headers.h -+++ b/include/libarptc/arpt_kernel_headers.h -@@ -5,7 +5,6 @@ - - #include - --#if defined(__GLIBC__) && __GLIBC__ == 2 - #include - #include - #include -@@ -14,16 +13,5 @@ - #include - #include - #include --#else --#include --#include --#include --#include --#include --#include --#include --#include --#include --#endif - - #endif -diff --git a/libarptc/libarptc.c b/libarptc/libarptc.c -index 701bae0..9c5a5b0 100644 ---- a/libarptc/libarptc.c -+++ b/libarptc/libarptc.c -@@ -23,10 +23,6 @@ - #define inline - #endif - --#if !defined(__GLIBC__) || (__GLIBC__ < 2) --typedef unsigned int socklen_t; --#endif -- - #include "libarptc/libarptc.h" - - #define IP_VERSION 4 --- -2.4.3 - diff --git a/package.bak/arptables/0004-Fix-musl-build-issue.patch b/package.bak/arptables/0004-Fix-musl-build-issue.patch deleted file mode 100644 index e9419b0a96..0000000000 --- a/package.bak/arptables/0004-Fix-musl-build-issue.patch +++ /dev/null @@ -1,71 +0,0 @@ -From cbf84a0bc377c6a368d30571f37ebfab27784697 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 2 Dec 2015 04:57:33 +0100 -Subject: [PATCH 4/4] Fix musl build issue -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Due to clashes in the namespace between the Linux Kernel headers and the -netinet headers building arptables with the musl C library fails. - -Best advice from the musl developers is to not include both headers in a -userspace tool (see the thread on the musl mailing list [1], especially [2]). - -Since arptables only requires a few definitions from the Linux Kernel headers -we opt-out the clashing header files and define the needed definitions. - -[1] http://www.openwall.com/lists/musl/2012/10/09/1 -[2] http://www.openwall.com/lists/musl/2012/10/11/1 - -Signed-off-by: Jörg Krause ---- - extensions/arpt_CLASSIFY.c | 7 +++++++ - include/linux/netfilter_arp.h | 11 +++++++++++ - 2 files changed, 18 insertions(+) - -diff --git a/extensions/arpt_CLASSIFY.c b/extensions/arpt_CLASSIFY.c -index cb5770b..c58129f 100644 ---- a/extensions/arpt_CLASSIFY.c -+++ b/extensions/arpt_CLASSIFY.c -@@ -21,7 +21,14 @@ - #include - #include - #include -+ -+#ifdef __KERNEL__ - #include -+#else -+struct xt_classify_target_info { -+ uint32_t priority; -+}; -+#endif - - #define TC_H_MAJ_MASK (0xFFFF0000U) - #define TC_H_MIN_MASK (0x0000FFFFU) -diff --git a/include/linux/netfilter_arp.h b/include/linux/netfilter_arp.h -index 92bc6dd..2a63e82 100644 ---- a/include/linux/netfilter_arp.h -+++ b/include/linux/netfilter_arp.h -@@ -5,7 +5,18 @@ - * (C)2002 Rusty Russell IBM -- This code is GPL. - */ - -+#ifdef __KERNEL__ - #include -+#else -+/* Responses from hook functions. */ -+#define NF_DROP 0 -+#define NF_ACCEPT 1 -+#define NF_STOLEN 2 -+#define NF_QUEUE 3 -+#define NF_REPEAT 4 -+#define NF_STOP 5 -+#define NF_MAX_VERDICT NF_STOP -+#endif - - /* There is no PF_ARP. */ - #define NF_ARP 0 --- -2.6.2 - diff --git a/package.bak/arptables/Config.in b/package.bak/arptables/Config.in deleted file mode 100644 index 873e791e81..0000000000 --- a/package.bak/arptables/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ARPTABLES - bool "arptables" - depends on BR2_USE_MMU # needs fork() - help - Tool to set up, maintain, and inspect the tables of ARP rules. - - http://ebtables.sourceforge.net diff --git a/package.bak/arptables/arptables.hash b/package.bak/arptables/arptables.hash deleted file mode 100644 index 95b9997569..0000000000 --- a/package.bak/arptables/arptables.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 277985e29ecd93bd759a58242cad0e02ba9d4a6e1b7795235e3b507661bc0049 arptables-v0.0.4.tar.gz diff --git a/package.bak/arptables/arptables.mk b/package.bak/arptables/arptables.mk deleted file mode 100644 index 888d396e17..0000000000 --- a/package.bak/arptables/arptables.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# arptables -# -################################################################################ - -ARPTABLES_VERSION = 0.0.4 -ARPTABLES_SOURCE = arptables-v$(ARPTABLES_VERSION).tar.gz -ARPTABLES_SITE = http://downloads.sourceforge.net/project/ebtables/arptables/arptables-v$(ARPTABLES_VERSION) -ARPTABLES_LICENSE = GPLv2+ - -define ARPTABLES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" COPT_FLAGS="$(TARGET_CFLAGS)" -endef - -define ARPTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/arptables $(TARGET_DIR)/usr/sbin/arptables -endef - -$(eval $(generic-package)) diff --git a/package.bak/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch b/package.bak/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch deleted file mode 100644 index bfcbeb55e3..0000000000 --- a/package.bak/assimp/0001-Fix-FBXConverter-use-proper-64-bit-constant.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 30a2ecc7939449f235282eb6de42e367fc5b1867 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 14 Jan 2016 22:13:15 +0100 -Subject: [PATCH] Fix FBXConverter: use proper 64-bit constant - -Use proper 64-bit constant for CONVERT_FBX_TIME(time) conversion, fixes: - - code/FBXConverter.cpp:2025: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2026: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2794: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2868: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2878: error: integer constant is too large for 'long' type - code/FBXConverter.cpp:2888: error: integer constant is too large for 'long' type - -Signed-off-by: Peter Seiderer ---- - code/FBXConverter.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/code/FBXConverter.cpp b/code/FBXConverter.cpp -index e0c6b9c..b1e9a71 100644 ---- a/code/FBXConverter.cpp -+++ b/code/FBXConverter.cpp -@@ -67,7 +67,7 @@ namespace FBX { - - #define MAGIC_NODE_TAG "_$AssimpFbx$" - --#define CONVERT_FBX_TIME(time) static_cast(time) / 46186158000L -+#define CONVERT_FBX_TIME(time) static_cast(time) / 46186158000LL - - // XXX vc9's debugger won't step into anonymous namespaces - //namespace { --- -2.1.4 - diff --git a/package.bak/assimp/0002-fix-compilation-on-BigEndian.patch b/package.bak/assimp/0002-fix-compilation-on-BigEndian.patch deleted file mode 100644 index 93cba5d120..0000000000 --- a/package.bak/assimp/0002-fix-compilation-on-BigEndian.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8457f3eff89dae35d43f679a66842ceedfd08808 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?IOhannes=20m=20zm=C3=B6lnig?= - -Date: Fri, 13 Nov 2015 22:33:20 +0100 -Subject: [PATCH] fix compilation on BigEndian - -cannot pass a function by reference where an lvalue is expected -(only applies to bigendian, where a macro expands to a byteswap function) - -Closes https://github.com/assimp/assimp/issues/613 - -Taken from [1] for buildroot assimp package compile fix. - -[1] https://github.com/assimp/assimp/commit/756cfd4f74b866e3183caede69daa8c105b73bab.patch - -Signed-off-by: Peter Seiderer ---- - code/Bitmap.cpp | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/code/Bitmap.cpp b/code/Bitmap.cpp -index 13ec372..829fd02 100644 ---- a/code/Bitmap.cpp -+++ b/code/Bitmap.cpp -@@ -84,7 +84,12 @@ namespace Assimp { - - template - inline std::size_t Copy(uint8_t* data, T& field) { -+#ifdef AI_BUILD_BIG_ENDIAN -+ T field_swapped=AI_BE(field); -+ std::memcpy(data, &field_swapped, sizeof(field)); return sizeof(field); -+#else - std::memcpy(data, &AI_BE(field), sizeof(field)); return sizeof(field); -+#endif - } - - void Bitmap::WriteHeader(Header& header, IOStream* file) { --- -2.1.4 - diff --git a/package.bak/assimp/Config.in b/package.bak/assimp/Config.in deleted file mode 100644 index 93020f7238..0000000000 --- a/package.bak/assimp/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_ASSIMP - bool "assimp" - # All gcc versions affected by - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71124, that - # cause an infinite loop in gcc when building this package. - depends on !BR2_microblaze - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_ZLIB - help - Open Asset Import Library (assimp) is a portable Open Source - library to import various well-known 3D model formats in a uniform - manner. The most recent version also knows how to export 3d files - and is therefore suitable as a general-purpose 3D model converter. - - http://www.assimp.org - -comment "assimp needs a toolchain w/ C++" - depends on !BR2_microblaze - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/assimp/assimp.hash b/package.bak/assimp/assimp.hash deleted file mode 100644 index bee26fb4f3..0000000000 --- a/package.bak/assimp/assimp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 187f825c563e84b1b17527a4da0351aa3d575dfd696a9d204ae4bb19ee7df94a assimp-v3.2.tar.gz diff --git a/package.bak/assimp/assimp.mk b/package.bak/assimp/assimp.mk deleted file mode 100644 index acd3701a38..0000000000 --- a/package.bak/assimp/assimp.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# assimp -# -################################################################################ - -ASSIMP_VERSION = v3.2 -ASSIMP_SITE = $(call github,assimp,assimp,$(ASSIMP_VERSION)) -ASSIMP_LICENSE = BSD-3c -ASSIMP_LICENSE_FILES = LICENSE -ASSIMP_DEPENDENCIES = zlib -ASSIMP_INSTALL_STAGING = YES - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k),y) -ASSIMP_CXXFLAGS += -mxgot -endif - -# workaround SuperH compiler failure when static linking (i.e -fPIC is -# not passed) in gcc versions 5.x or older. The -Os optimization level -# causes a "unable to find a register to spill in class -# ‘GENERAL_REGS’" error. -O2 works fine. -ifeq ($(BR2_sh):$(BR2_STATIC_LIBS):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:y:) -ASSIMP_CXXFLAGS += -O2 -endif - -ASSIMP_CONF_OPTS += -DASSIMP_BUILD_TESTS=OFF \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(ASSIMP_CXXFLAGS)" - -$(eval $(cmake-package)) diff --git a/package.bak/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch b/package.bak/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch deleted file mode 100644 index e4276ac208..0000000000 --- a/package.bak/at/0001-configure.ac-convert-AC_TRY_COMPILE-AC_COMPILE_IFELS.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e12c96cccab550eda31cf7bb1dedddd3670ffe69 Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 17:22:22 +0100 -Subject: [PATCH 2/5] configure.ac: convert AC_TRY_COMPILE -> AC_COMPILE_IFELSE - -Signed-off-by: Marc Kleine-Budde ---- - configure.ac | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 997a37f..cab80ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -40,11 +40,11 @@ case "$host" in - esac - - AC_MSG_CHECKING(__attribute__((noreturn))) --AC_TRY_COMPILE([], [void __attribute__((noreturn)) panic(void);], -- AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, -- [Define to 1 if compiler supports __attribute__((noreturn))]), -- AC_MSG_RESULT(no) -+AC_COMPILE_IFELSE( -+ [AC_LANG_PROGRAM([[]], [[void __attribute__((noreturn)) panic(void);]])], -+ [AC_MSG_RESULT(yes) -+ AC_DEFINE(HAVE_ATTRIBUTE_NORETURN, 1, Define to 1 if compiler supports __attribute__((noreturn)))], -+ [AC_MSG_RESULT(no)] - ) - dnl Checks for libraries. - --- -1.6.5.3 - diff --git a/package.bak/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch b/package.bak/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch deleted file mode 100644 index 856b6c8d08..0000000000 --- a/package.bak/at/0002-Makefile.in-replace-IROOT-by-DESTDIR.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 195d30e2e01fe2f91ed3bdaeec3982aa66b309dd Mon Sep 17 00:00:00 2001 -From: Marc Kleine-Budde -Date: Tue, 1 Dec 2009 20:57:45 +0100 -Subject: [PATCH 5/5] Makefile.in: replace IROOT by DESTDIR - -This patch replaces IROOT by DESTDIR, which is the autotools standard -variable. For backwards compatibilty IROOT overwrites the DESTDIR. - -[Vincent: tweak the patch for the new version] - -Signed-off-by: Marc Kleine-Budde -Signed-off-by: Vicente Olivert Riera ---- - Makefile.in | 68 ++++++++++++++++++++++++++++++++----------------------------- - 1 file changed, 36 insertions(+), 32 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 06544f9..1f699d9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -17,6 +17,10 @@ atdocdir = $(docdir)/at - etcdir = @ETCDIR@ - systemdsystemunitdir = @systemdsystemunitdir@ - -+ifdef IROOT -+DESTDIR = $(DESTDIR) -+endif -+ - DAEMON_USERNAME = @DAEMON_USERNAME@ - DAEMON_GROUPNAME= @DAEMON_GROUPNAME@ - LOADAVG_MX = @LOADAVG_MX@ -@@ -91,41 +95,41 @@ atrun: atrun.in - $(CC) -c $(CFLAGS) $(DEFS) $*.c - - install: all -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(etcdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(bindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(docdir) -- $(INSTALL) -g root -o root -m 755 -d $(IROOT)$(atdocdir) -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- chmod 1770 $(IROOT)$(ATSPOOL_DIR) $(IROOT)$(ATJOB_DIR) -- touch $(IROOT)$(LFILE) -- chmod 600 $(IROOT)$(LFILE) -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(IROOT)$(LFILE) -- test -f $(IROOT)$(etcdir)/at.allow || test -f $(IROOT)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(IROOT)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(IROOT)$(bindir) -- $(LN_S) -f at $(IROOT)$(bindir)/atq -- $(LN_S) -f at $(IROOT)$(bindir)/atrm -- $(INSTALL) -g root -o root -m 755 batch $(IROOT)$(bindir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man1dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man5dir) -- $(INSTALL) -d -o root -g root -m 755 $(IROOT)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 755 atrun $(IROOT)$(sbindir) -- $(INSTALL) -g root -o root -m 644 at.1 $(IROOT)$(man1dir)/ -- cd $(IROOT)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -- $(INSTALL) -g root -o root -m 644 atd.8 $(IROOT)$(man8dir)/ -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) -+ $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ touch $(DESTDIR)$(LFILE) -+ chmod 600 $(DESTDIR)$(LFILE) -+ chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ -+ $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atq -+ $(LN_S) -f at $(DESTDIR)$(bindir)/atrm -+ $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) -+ $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) -+ $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ -+ cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -+ $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/ - sed "s,\$${exec_prefix},$(exec_prefix),g" tmpman -- $(INSTALL) -g root -o root -m 644 tmpman $(IROOT)$(man8dir)/atrun.8 -+ $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 - rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at.allow.5 $(IROOT)$(man5dir)/ -- cd $(IROOT)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(IROOT)$(atdocdir) -- rm -f $(IROOT)$(mandir)/cat1/at.1* $(IROOT)$(mandir)/cat1/batch.1* \ -- $(IROOT)$(mandir)/cat1/atq.1* -- rm -f $(IROOT)$(mandir)/cat1/atd.8* -+ $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ -+ cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -+ $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) -+ rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ -+ $(DESTDIR)$(mandir)/cat1/atq.1* -+ rm -f $(DESTDIR)$(mandir)/cat1/atd.8* - if test x"$(systemdsystemunitdir)" != xno; then \ -- $(INSTALL) -o root -g root -m 755 -d $(IROOT)$(systemdsystemunitdir); \ -- $(INSTALL) -o root -g root -m 644 atd.service $(IROOT)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ -+ $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ - fi - - dist: checkin $(DIST) $(LIST) Filelist.asc --- -2.4.10 - diff --git a/package.bak/at/0003-Makefile.in-make-install-fix.patch b/package.bak/at/0003-Makefile.in-make-install-fix.patch deleted file mode 100644 index 831ea1a3a9..0000000000 --- a/package.bak/at/0003-Makefile.in-make-install-fix.patch +++ /dev/null @@ -1,83 +0,0 @@ -[PATCH]: Makefile.in: fix make install for non-root, don't strip - -Buildroot will ensure all files are owned by root and stripped anyway -(if needed) before the rootfs is created. - -[Vincent: tweak the patch for the new version] - -Signed-off-by: Peter Korsgaard -Signed-off-by: Vicente Olivert Riera ---- - Makefile.in | 43 +++++++++++++++++++++---------------------- - 1 file changed, 21 insertions(+), 22 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 1f699d9..f313f9b 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -95,41 +95,40 @@ atrun: atrun.in - $(CC) -c $(CFLAGS) $(DEFS) $*.c - - install: all -- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(etcdir) -- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(bindir) -- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(sbindir) -- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(docdir) -- $(INSTALL) -g root -o root -m 755 -d $(DESTDIR)$(atdocdir) -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(etcdir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(bindir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(sbindir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(docdir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(atdocdir) -+ $(INSTALL) -m 755 -d $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) - chmod 1770 $(DESTDIR)$(ATSPOOL_DIR) $(DESTDIR)$(ATJOB_DIR) - touch $(DESTDIR)$(LFILE) - chmod 600 $(DESTDIR)$(LFILE) -- chown $(DAEMON_USERNAME):$(DAEMON_GROUPNAME) $(DESTDIR)$(LFILE) -- test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -o root -g $(DAEMON_GROUPNAME) -m 640 at.deny $(DESTDIR)$(etcdir)/ -- $(INSTALL) -g $(DAEMON_GROUPNAME) -o $(DAEMON_USERNAME) -m 6755 at $(DESTDIR)$(bindir) -+ test -f $(DESTDIR)$(etcdir)/at.allow || test -f $(DESTDIR)$(etcdir)/at.deny || $(INSTALL) -m 640 at.deny $(DESTDIR)$(etcdir)/ -+ $(INSTALL) -m 6755 at $(DESTDIR)$(bindir) - $(LN_S) -f at $(DESTDIR)$(bindir)/atq - $(LN_S) -f at $(DESTDIR)$(bindir)/atrm -- $(INSTALL) -g root -o root -m 755 batch $(DESTDIR)$(bindir) -- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man1dir) -- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man5dir) -- $(INSTALL) -d -o root -g root -m 755 $(DESTDIR)$(man8dir) -- $(INSTALL) -g root -o root -m 755 atd $(DESTDIR)$(sbindir) -- $(INSTALL) -g root -o root -m 755 atrun $(DESTDIR)$(sbindir) -- $(INSTALL) -g root -o root -m 644 at.1 $(DESTDIR)$(man1dir)/ -+ $(INSTALL) -m 755 batch $(DESTDIR)$(bindir) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(man5dir) -+ $(INSTALL) -d -m 755 $(DESTDIR)$(man8dir) -+ $(INSTALL) -m 755 atd $(DESTDIR)$(sbindir) -+ $(INSTALL) -m 755 atrun $(DESTDIR)$(sbindir) -+ $(INSTALL) -m 644 at.1 $(DESTDIR)$(man1dir)/ - cd $(DESTDIR)$(man1dir) && $(LN_S) -f at.1 atq.1 && $(LN_S) -f at.1 batch.1 && $(LN_S) -f at.1 atrm.1 -- $(INSTALL) -g root -o root -m 644 atd.8 $(DESTDIR)$(man8dir)/ -+ $(INSTALL) -m 644 atd.8 $(DESTDIR)$(man8dir)/ - sed "s,\$${exec_prefix},$(exec_prefix),g" tmpman -- $(INSTALL) -g root -o root -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 -+ $(INSTALL) -m 644 tmpman $(DESTDIR)$(man8dir)/atrun.8 - rm -f tmpman -- $(INSTALL) -g root -o root -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ -+ $(INSTALL) -m 644 at.allow.5 $(DESTDIR)$(man5dir)/ - cd $(DESTDIR)$(man5dir) && $(LN_S) -f at.allow.5 at.deny.5 -- $(INSTALL) -g root -o root -m 644 $(DOCS) $(DESTDIR)$(atdocdir) -+ $(INSTALL) -m 644 $(DOCS) $(DESTDIR)$(atdocdir) - rm -f $(DESTDIR)$(mandir)/cat1/at.1* $(DESTDIR)$(mandir)/cat1/batch.1* \ - $(DESTDIR)$(mandir)/cat1/atq.1* - rm -f $(DESTDIR)$(mandir)/cat1/atd.8* - if test x"$(systemdsystemunitdir)" != xno; then \ -- $(INSTALL) -o root -g root -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ -- $(INSTALL) -o root -g root -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ -+ $(INSTALL) -m 755 -d $(DESTDIR)$(systemdsystemunitdir); \ -+ $(INSTALL) -m 644 atd.service $(DESTDIR)$(systemdsystemunitdir); \ - fi - - dist: checkin $(DIST) $(LIST) Filelist.asc --- -2.4.10 - diff --git a/package.bak/at/0004-getloadavg.c-fix.patch b/package.bak/at/0004-getloadavg.c-fix.patch deleted file mode 100644 index e0739271ef..0000000000 --- a/package.bak/at/0004-getloadavg.c-fix.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH]: fix getloadavg.c compilation, revert to 3.1.10 version - -getloadavg.c shipped with 3.1.13 doesn't compile because it references -headers not shipped. Fix it by simply reverting to the 3.1.10 version. - -Signed-off-by: Peter Korsgaard ---- - getloadavg.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -Index: at-3.1.13/getloadavg.c -=================================================================== ---- at-3.1.13.orig/getloadavg.c -+++ at-3.1.13/getloadavg.c -@@ -66,11 +66,12 @@ Boston, MA 02110-1301 USA */ - - /* This should always be first. */ - #ifdef HAVE_CONFIG_H --#include -+#include "config.h" - #endif - --#include "lisp.h" --#include "sysfile.h" /* for encapsulated open, close, read, write */ -+#include -+#include -+#include - - #ifndef HAVE_GETLOADAVG - diff --git a/package.bak/at/0005-parsetime.l-include-config-h.patch b/package.bak/at/0005-parsetime.l-include-config-h.patch deleted file mode 100644 index f4111ebf67..0000000000 --- a/package.bak/at/0005-parsetime.l-include-config-h.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make sure to include config.h so that NEEDS_* macros are properly -taken into account. This was a problem for NEEDS_YYWRAP, which was set -to 1 in config.h, but the corresponding code wasn't compiled in. - -Index: at-3.1.13/parsetime.l -=================================================================== ---- at-3.1.13.orig/parsetime.l -+++ at-3.1.13/parsetime.l -@@ -4,6 +4,7 @@ - #include - #include "y.tab.h" - #include "parsetime.h" -+#include "config.h" - - char *last_token = NULL; - char **my_argv; diff --git a/package.bak/at/0006-remove-glibc-__isleap-assumption.patch b/package.bak/at/0006-remove-glibc-__isleap-assumption.patch deleted file mode 100644 index 21522492c8..0000000000 --- a/package.bak/at/0006-remove-glibc-__isleap-assumption.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 7f811d9c4ebc9444e613e251c31d6bf537a24dc1 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 16:35:30 -0700 -Subject: [PATCH] remove glibc assumption - -glibc time.h header has an undocumented __isleap macro -that we are using anf musl is missing it. -Since it is undocumented & does not appear -on any other libc, stop using it and just define the macro in -locally instead. - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[patch from: http://patchwork.openembedded.org/patch/91893/ ] -Signed-off-by: "Yann E. MORIN" - ---- - parsetime.y | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/parsetime.y b/parsetime.y -index 7005e88..324e6d3 100644 ---- a/parsetime.y -+++ b/parsetime.y -@@ -8,6 +8,9 @@ - - #define YYDEBUG 1 - -+#define is_leap_year(y) \ -+ ((y) % 4 == 0 && ((y) % 100 != 0 || (y) % 400 == 0)) -+ - struct tm exectm; - static int isgmt; - static int yearspec; -@@ -217,8 +220,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); -@@ -261,8 +264,8 @@ date : month_name day_number - mnum == 12) && dnum > 31) - || ((mnum == 4 || mnum == 6 || mnum == 9 || - mnum == 11) && dnum > 30) -- || (mnum == 2 && dnum > 29 && __isleap(ynum+1900)) -- || (mnum == 2 && dnum > 28 && !__isleap(ynum+1900)) -+ || (mnum == 2 && dnum > 29 && is_leap_year(ynum+1900)) -+ || (mnum == 2 && dnum > 28 && !is_leap_year(ynum+1900)) - ) - { - yyerror("Error in day of month"); --- -2.1.4 diff --git a/package.bak/at/Config.in b/package.bak/at/Config.in deleted file mode 100644 index 17fabf7f6b..0000000000 --- a/package.bak/at/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_AT - bool "at" - depends on BR2_USE_MMU - help - At and batch read shell commands from standard input and - store them as jobs to be scheduled for execution in the - future. - - at - run the job at a specified time - batch - run the job when system load levels permit diff --git a/package.bak/at/S99at b/package.bak/at/S99at deleted file mode 100755 index 666d39b546..0000000000 --- a/package.bak/at/S99at +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Starts at daemon -# - -umask 077 - -start() { - printf "Starting atd: " - start-stop-daemon --start --quiet --make-pidfile --pidfile /var/run/atd.pid --background --exec /usr/sbin/atd -- -f - echo "OK" -} -stop() { - printf "Stopping atd: " - start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/at/at.hash b/package.bak/at/at.hash deleted file mode 100644 index 22c732cc7e..0000000000 --- a/package.bak/at/at.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at/at_3.1.16-1.dsc -sha256 cb9af59c6a54edce9536ba629841055409d1f89d8ae26494727a97141fb4d5c1 at_3.1.16.orig.tar.gz diff --git a/package.bak/at/at.mk b/package.bak/at/at.mk deleted file mode 100644 index 8865360427..0000000000 --- a/package.bak/at/at.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# at -# -################################################################################ - -AT_VERSION = 3.1.16 -AT_SOURCE = at_$(AT_VERSION).orig.tar.gz -AT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/a/at -# missing deps for parsetime.l -AT_MAKE = $(MAKE1) -AT_AUTORECONF = YES -AT_DEPENDENCIES = $(if $(BR2_PACKAGE_FLEX),flex) host-bison host-flex -AT_LICENSE = GPLv2+, GPLv3+, ISC -AT_LICENSE_FILES = Copyright COPYING - -AT_CONF_OPTS = \ - --with-jobdir=/var/spool/cron/atjobs \ - --with-atspool=/var/spool/cron/atspool \ - --with-daemon_username=root \ - --with-daemon_groupname=root \ - SENDMAIL=/usr/sbin/sendmail - -define AT_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/at/S99at $(TARGET_DIR)/etc/init.d/S99at -endef - -$(eval $(autotools-package)) diff --git a/package.bak/atf/Config.in b/package.bak/atf/Config.in deleted file mode 100644 index 43a5d4f2c9..0000000000 --- a/package.bak/atf/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_ATF - bool "atf" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - help - ATF, or Automated Testing Framework, is a collection of - libraries to write test programs in C, C++ and POSIX shell. - - https://github.com/jmmv/atf - -comment "atf needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU diff --git a/package.bak/atf/atf.hash b/package.bak/atf/atf.hash deleted file mode 100644 index 78cd3c6828..0000000000 --- a/package.bak/atf/atf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 92bc64180135eea8fe84c91c9f894e678767764f6dbc8482021d4dde09857505 atf-0.21.tar.gz diff --git a/package.bak/atf/atf.mk b/package.bak/atf/atf.mk deleted file mode 100644 index ed2080e225..0000000000 --- a/package.bak/atf/atf.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# atf -# -################################################################################ - -ATF_VERSION = 0.21 -ATF_SITE = https://github.com/jmmv/atf/releases/download/atf-$(ATF_VERSION) -ATF_INSTALL_STAGING = YES -ATF_LICENSE = BSD-2c, BSD-3c -ATF_LICENSE_FILES = COPYING -# Ships a beta libtool version hence our patch doesn't apply. -ATF_AUTORECONF = YES -# Do not install precompiled tests. -ATF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec - -# ATF_SHELL defaults to the host's bash -ATF_CONF_ENV = \ - kyua_cv_getopt_plus=yes \ - kyua_cv_attribute_noreturn=yes \ - kyua_cv_getcwd_works=yes \ - ATF_SHELL=/bin/sh - -$(eval $(autotools-package)) diff --git a/package.bak/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch b/package.bak/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch deleted file mode 100644 index e879df5b3b..0000000000 --- a/package.bak/atftp/0001-Makefile.am-link-against-libpthread-for-atftp.patch +++ /dev/null @@ -1,26 +0,0 @@ -Makefile.am: link against libpthread for atftp - -atftp client needs to link against libpthread as static builds do not -work otherwise. - -Signed-off-by: Ryan Barnett ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index e59592f..200829a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -28,7 +28,7 @@ noinst_HEADERS = argz.h logger.h options.h stats.h tftp.h tftp_def.h tftp_io.h - tftpd.h tftpd_pcre.h tftpd_mtftp.h - - bin_PROGRAMS = atftp --atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) -+atftp_LDADD = $(LIBTERMCAP) $(LIBREADLINE) $(LIBPTHREAD) - atftp_SOURCES = tftp.c tftp_io.c logger.c options.c tftp_def.c tftp_file.c \ - argz.c tftp_mtftp.c - --- -1.9.1 - diff --git a/package.bak/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch b/package.bak/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch deleted file mode 100644 index 0679ef3b44..0000000000 --- a/package.bak/atftp/0002-argz.h-fix-musl-compile-add-missing-defines.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 543e67919f5cacf309ac88ab091331e41af4224b Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 16 Apr 2015 22:41:57 +0200 -Subject: [PATCH] argz.h: fix musl compile (add missing defines) - -Add __THROW, __BEGIN_DECLS, __END_DECLS and __attribute_pure__ defines. - -Signed-off-by: Peter Seiderer ---- - argz.h | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/argz.h b/argz.h -index 582be55..bdf9f62 100644 ---- a/argz.h -+++ b/argz.h -@@ -48,6 +48,22 @@ - # define __const const - #endif - -+#ifndef __THROW -+# define __THROW -+#endif -+ -+#ifndef __BEGIN_DECLS -+# define __BEGIN_DECLS -+#endif -+ -+#ifndef __END_DECLS -+# define __END_DECLS -+#endif -+ -+#ifndef __attribute_pure__ -+# define __attribute_pure__ -+#endif -+ - #ifndef __error_t_defined - typedef int error_t; - #endif --- -2.1.4 - diff --git a/package.bak/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch b/package.bak/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch deleted file mode 100644 index 485e71a84b..0000000000 --- a/package.bak/atftp/0003-tftp.h-tftpd.h-fix-musl-compile-missing-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 77e399899d9d7297d23c321811b628febdf0fd92 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 16 Apr 2015 22:43:49 +0200 -Subject: [PATCH] tftp.h/tftpd.h: fix musl compile (missing include) - -Add sys/types.h include for u_char typedef. - -Signed-off-by: Peter Seiderer ---- - tftp.h | 1 + - tftpd.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/tftp.h b/tftp.h -index 12bd6aa..32a3f63 100644 ---- a/tftp.h -+++ b/tftp.h -@@ -19,6 +19,7 @@ - - #include - #include -+#include - #include "tftp_def.h" - #include "config.h" - -diff --git a/tftpd.h b/tftpd.h -index 945065e..60d3a49 100644 ---- a/tftpd.h -+++ b/tftpd.h -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "tftp_io.h" - - /* --- -2.1.4 - diff --git a/package.bak/atftp/Config.in b/package.bak/atftp/Config.in deleted file mode 100644 index 7074716370..0000000000 --- a/package.bak/atftp/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_ATFTP - bool "atftp" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - atftp is a client/server implementation of the TFTP - protocol that implements RFCs 1350, 2090, 2347, 2348, - and 2349. The server is multi-threaded and the client - presents a friendly interface using libreadline - (if enabled). - - http://sourceforge.net/projects/atftp/ - -comment "atftp needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/atftp/atftp.hash b/package.bak/atftp/atftp.hash deleted file mode 100644 index b7860c7681..0000000000 --- a/package.bak/atftp/atftp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha1 fc9e9f821dfd2f257b4a5c32b948ed60b4e31fd1 atftp-0.7.1.tar.gz diff --git a/package.bak/atftp/atftp.mk b/package.bak/atftp/atftp.mk deleted file mode 100644 index 615b6eadbb..0000000000 --- a/package.bak/atftp/atftp.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# atftp -# -################################################################################ - -ATFTP_VERSION = 0.7.1 -ATFTP_SITE = http://sourceforge.net/projects/atftp/files -ATFTP_LICENSE = GPLv2+ -ATFTP_LICENSE_FILES = LICENSE -ATFTP_CONF_OPTS = --disable-libwrap --disable-mtftp -# For static we need to explicitly link against libpthread -ATFTP_LIBS = -lpthread -# We use CPPFLAGS for -fgnu89-inline even though it's a compiler flag -# because atftp discards configure environment CFLAGS. -fgnu89-inline -# is needed to avoid multiple definition error with gcc 5. See -# https://gcc.gnu.org/gcc-5/porting_to.html. -ATFTP_CONF_ENV = LIBS="$(ATFTP_LIBS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -fgnu89-inline" - -ifeq ($(BR2_PACKAGE_READLINE),y) -ATFTP_DEPENDENCIES += readline -ATFTP_CONF_OPTS += --enable-libreadline -# For static, readline links with ncurses -ATFTP_LIBS += -lncurses -else -ATFTP_CONF_OPTS += --disable-libreadline -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -ATFTP_DEPENDENCIES += pcre -ATFTP_CONF_OPTS += --enable-libpcre -else -ATFTP_CONF_OPTS += --disable-libpcre -endif - -$(eval $(autotools-package)) diff --git a/package.bak/atk/Config.in b/package.bak/atk/Config.in deleted file mode 100644 index 1120a94dd0..0000000000 --- a/package.bak/atk/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_ATK - bool "atk" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - help - The ATK accessibility toolkit, needed to build GTK+-2.x. - -comment "atk needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/atk/atk.hash b/package.bak/atk/atk.hash deleted file mode 100644 index 12c98706dd..0000000000 --- a/package.bak/atk/atk.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atk/2.22/atk-2.22.0.sha256sum -sha256 d349f5ca4974c9c76a4963e5b254720523b0c78672cbc0e1a3475dbd9b3d44b6 atk-2.22.0.tar.xz diff --git a/package.bak/atk/atk.mk b/package.bak/atk/atk.mk deleted file mode 100644 index 90d329ae23..0000000000 --- a/package.bak/atk/atk.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# atk -# -################################################################################ - -ATK_VERSION_MAJOR = 2.22 -ATK_VERSION = $(ATK_VERSION_MAJOR).0 -ATK_SOURCE = atk-$(ATK_VERSION).tar.xz -ATK_SITE = http://ftp.gnome.org/pub/gnome/sources/atk/$(ATK_VERSION_MAJOR) -ATK_LICENSE = LGPLv2+ -ATK_LICENSE_FILES = COPYING -ATK_INSTALL_STAGING = YES -ATK_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -ATK_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no -ATK_DEPENDENCIES = libglib2 host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/atkmm/Config.in b/package.bak/atkmm/Config.in deleted file mode 100644 index 2091eabeb4..0000000000 --- a/package.bak/atkmm/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_ATKMM - bool "atkmm" - select BR2_PACKAGE_ATK - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - depends on BR2_INSTALL_LIBSTDCPP # glibmm - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # atk/glibmm -> libglib2 - depends on BR2_USE_MMU # atk/glibmm -> libglib2 - depends on BR2_USE_WCHAR # atk/glibmm -> libglib2 - - help - The atkmm package is a set of C++ bindings for Atk. - - http://www.gtkmm.org/ - -comment "atkmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/atkmm/atkmm.hash b/package.bak/atkmm/atkmm.hash deleted file mode 100644 index 4b3577c88d..0000000000 --- a/package.bak/atkmm/atkmm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/atkmm/2.24/atkmm-2.24.2.sha256sum -sha256 ff95385759e2af23828d4056356f25376cfabc41e690ac1df055371537e458bd atkmm-2.24.2.tar.xz diff --git a/package.bak/atkmm/atkmm.mk b/package.bak/atkmm/atkmm.mk deleted file mode 100644 index 2c070f250e..0000000000 --- a/package.bak/atkmm/atkmm.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# atkmm -# -################################################################################ - -ATKMM_VERSION_MAJOR = 2.24 -ATKMM_VERSION = $(ATKMM_VERSION_MAJOR).2 -ATKMM_SOURCE = atkmm-$(ATKMM_VERSION).tar.xz -ATKMM_SITE = http://ftp.gnome.org/pub/gnome/sources/atkmm/$(ATKMM_VERSION_MAJOR) -ATKMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) -ATKMM_LICENSE_FILES = COPYING COPYING.tools -ATKMM_INSTALL_STAGING = YES -ATKMM_DEPENDENCIES = atk glibmm libsigc host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/atop/0001-remove-unused-include-of-termio.h.patch b/package.bak/atop/0001-remove-unused-include-of-termio.h.patch deleted file mode 100644 index 3a04b05e60..0000000000 --- a/package.bak/atop/0001-remove-unused-include-of-termio.h.patch +++ /dev/null @@ -1,52 +0,0 @@ -remove unused include of termio.h - -This header is not provided by musl, leading to build failures. - -Patch status: accepted upstream. - -Signed-off-by: Ricardo Martincoski ---- -diff -purN atop-2.2-3.orig/showgeneric.c atop-2.2-3/showgeneric.c ---- atop-2.2-3.orig/showgeneric.c 2016-07-19 22:07:43.275324499 -0300 -+++ atop-2.2-3/showgeneric.c 2016-07-19 22:08:16.171453283 -0300 -@@ -268,7 +268,6 @@ static const char rcsid[] = "$Id: showge - #include - #include - #include --#include - #include - #include - #include -diff -purN atop-2.2-3.orig/showlinux.c atop-2.2-3/showlinux.c ---- atop-2.2-3.orig/showlinux.c 2016-07-19 22:07:43.275324499 -0300 -+++ atop-2.2-3/showlinux.c 2016-07-19 22:08:20.979472459 -0300 -@@ -274,7 +274,6 @@ static const char rcsid[] = "$Id: showli - #include - #include - #include --#include - #include - #include - #include -diff -purN atop-2.2-3.orig/showprocs.c atop-2.2-3/showprocs.c ---- atop-2.2-3.orig/showprocs.c 2016-07-19 22:07:43.275324499 -0300 -+++ atop-2.2-3/showprocs.c 2016-07-19 22:08:25.083488900 -0300 -@@ -94,7 +94,6 @@ static const char rcsid[] = "$Id: showpr - #include - #include - #include --#include - #include - #include - #include -diff -purN atop-2.2-3.orig/showsys.c atop-2.2-3/showsys.c ---- atop-2.2-3.orig/showsys.c 2016-07-19 22:07:43.275324499 -0300 -+++ atop-2.2-3/showsys.c 2016-07-19 22:08:29.099505047 -0300 -@@ -80,7 +80,6 @@ static const char rcsid[] = "XXXXXX"; - #include - #include - #include --#include - #include - #include - #include diff --git a/package.bak/atop/Config.in b/package.bak/atop/Config.in deleted file mode 100644 index d42a201bd9..0000000000 --- a/package.bak/atop/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_ATOP - bool "atop" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_ZLIB - help - Atop is an ASCII full-screen performance monitor for Linux - that is capable of reporting the activity of all processes - (even if processes have finished during the interval), daily - logging of system and process activity for long-term analysis, - highlighting overloaded system resources by using colors, etc. - At regular intervals, it shows system-level activity related - to the CPU, memory, swap, disks (including LVM) and network - layers, and for every process (and thread) it shows e.g. the - CPU utilization, memory growth, disk utilization, priority, - username, state, and exit code. - - http://www.atoptool.nl diff --git a/package.bak/atop/atop.hash b/package.bak/atop/atop.hash deleted file mode 100644 index bbf268d06e..0000000000 --- a/package.bak/atop/atop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d atop-2.2-3.tar.gz diff --git a/package.bak/atop/atop.mk b/package.bak/atop/atop.mk deleted file mode 100644 index 27e1f82154..0000000000 --- a/package.bak/atop/atop.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# atop -# -################################################################################ - -ATOP_VERSION = 2.2-3 -ATOP_SITE = http://www.atoptool.nl/download -ATOP_LICENSE = GPLv2+ -ATOP_LICENSE_FILES = COPYING -ATOP_DEPENDENCIES = ncurses zlib - -define ATOP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define ATOP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/atop $(TARGET_DIR)/usr/bin/atop -endef - -$(eval $(generic-package)) diff --git a/package.bak/attr/0001-support-static-installation.patch b/package.bak/attr/0001-support-static-installation.patch deleted file mode 100644 index 87858ac75e..0000000000 --- a/package.bak/attr/0001-support-static-installation.patch +++ /dev/null @@ -1,29 +0,0 @@ -Support installation of .a file when doing static linking - -When doing static linking (i.e ENABLE_SHARED != yes), the attr build -logic wasn't installing any library at all, not even the .a file which -is needed for static linking. This patch fixes that. - -Signed-off-by: Thomas Petazzoni - -Index: b/include/buildmacros -=================================================================== ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -97,7 +97,15 @@ - - INSTALL_LTLIB_STATIC = \ - cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); -+ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ -+ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ -+ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ -+ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ -+ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ -+ fi - - INSTALL_MAN = \ - @for d in $(MAN_PAGES); do \ diff --git a/package.bak/attr/0002-avoid-glibc-specific-decls-defines.patch b/package.bak/attr/0002-avoid-glibc-specific-decls-defines.patch deleted file mode 100644 index 8c71678cf4..0000000000 --- a/package.bak/attr/0002-avoid-glibc-specific-decls-defines.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 667137acaffb8d0cc62b47821a67a52ba0637d5c Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 10 Jan 2014 13:56:37 +0000 -Subject: avoid glibc-specific DECLS defines - -This matches what we do in all the other headers. - -Signed-off-by: Thomas Petazzoni ---- -diff --git a/include/xattr.h b/include/xattr.h -index 70a84be..070d7c5 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -30,8 +30,9 @@ - #define XATTR_CREATE 0x1 /* set value, fail if attr already exists */ - #define XATTR_REPLACE 0x2 /* set value, fail if attr does not exist */ - -- --__BEGIN_DECLS -+#ifdef __cplusplus -+extern "C" { -+#endif - - extern int setxattr (const char *__path, const char *__name, - const void *__value, size_t __size, int __flags) __THROW; -@@ -58,6 +59,8 @@ extern int removexattr (const char *__path, const char *__name) __THROW; - extern int lremovexattr (const char *__path, const char *__name) __THROW; - extern int fremovexattr (int __filedes, const char *__name) __THROW; - --__END_DECLS -+#ifdef __cplusplus -+} -+#endif - - #endif /* __XATTR_H__ */ --- -cgit v0.9.0.2 diff --git a/package.bak/attr/0003-portability-fixes.patch b/package.bak/attr/0003-portability-fixes.patch deleted file mode 100644 index c5dc8c865b..0000000000 --- a/package.bak/attr/0003-portability-fixes.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 92247401984dd9a80d9d0c8c030692323f980678 Mon Sep 17 00:00:00 2001 -From: Emmanuel Dreyfus -Date: Mon, 30 Jun 2014 13:06:05 +0000 -Subject: Portability fixes - -- is Linux specific -- Define __THROW for non glibc based systems - -Signed-off-by: Thomas Petazzoni ---- -(limited to 'include/xattr.h') - -diff --git a/include/xattr.h b/include/xattr.h -index 070d7c5..fd1f268 100644 ---- a/include/xattr.h -+++ b/include/xattr.h -@@ -20,7 +20,18 @@ - #ifndef __XATTR_H__ - #define __XATTR_H__ - -+#if defined(linux) - #include -+#endif -+ -+/* Portability non glibc c++ build systems */ -+#ifndef __THROW -+# if defined __cplusplus -+# define __THROW throw () -+# else -+# define __THROW -+# endif -+#endif - - #include - #ifndef ENOATTR --- -cgit v0.9.0.2 diff --git a/package.bak/attr/Config.in b/package.bak/attr/Config.in deleted file mode 100644 index 554772b75d..0000000000 --- a/package.bak/attr/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ATTR - bool "attr" - help - Commands for Manipulating Filesystem Extended Attributes. - This package also provides libattr. - - http://savannah.nongnu.org/projects/attr diff --git a/package.bak/attr/attr.hash b/package.bak/attr/attr.hash deleted file mode 100644 index d2d1c2ed50..0000000000 --- a/package.bak/attr/attr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 attr-2.4.47.src.tar.gz diff --git a/package.bak/attr/attr.mk b/package.bak/attr/attr.mk deleted file mode 100644 index 4d5a07df0b..0000000000 --- a/package.bak/attr/attr.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# attr -# -################################################################################ - -ATTR_VERSION = 2.4.47 -ATTR_SOURCE = attr-$(ATTR_VERSION).src.tar.gz -ATTR_SITE = http://download.savannah.gnu.org/releases/attr -ATTR_INSTALL_STAGING = YES -ATTR_CONF_OPTS = --enable-gettext=no -HOST_ATTR_CONF_OPTS = --enable-gettext=no -ATTR_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) -ATTR_LICENSE_FILES = doc/COPYING doc/COPYING.LGPL - -# While the configuration system uses autoconf, the Makefiles are -# hand-written and do not use automake. Therefore, we have to hack -# around their deficiencies by passing installation paths. -ATTR_INSTALL_STAGING_OPTS = \ - prefix=$(STAGING_DIR)/usr \ - exec_prefix=$(STAGING_DIR)/usr \ - PKG_DEVLIB_DIR=$(STAGING_DIR)/usr/lib \ - install-dev install-lib - -ATTR_INSTALL_TARGET_OPTS = \ - prefix=$(TARGET_DIR)/usr \ - exec_prefix=$(TARGET_DIR)/usr \ - install install-lib - -HOST_ATTR_INSTALL_OPTS = \ - prefix=$(HOST_DIR)/usr \ - exec_prefix=$(HOST_DIR)/usr \ - install-dev install-lib - -# The libdir variable in libattr.la is empty, so let's fix it. This is -# probably due to attr not using automake, and not doing fully the -# right thing with libtool. -define ATTR_FIX_LIBTOOL_LA_LIBDIR - $(SED) "s,libdir=.*,libdir='$(STAGING_DIR)'," \ - $(STAGING_DIR)/usr/lib/libattr.la -endef - -ATTR_POST_INSTALL_STAGING_HOOKS += ATTR_FIX_LIBTOOL_LA_LIBDIR - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/aubio/Config.in b/package.bak/aubio/Config.in deleted file mode 100644 index c4c60db2f3..0000000000 --- a/package.bak/aubio/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_AUBIO - bool "aubio" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - aubio is a tool designed for the extraction of annotations from - audio signals. Its features include segmenting a sound file - before each of its attacks, performing pitch detection, tapping - the beat and producing midi streams from live audio. - - Because these tasks are difficult, we thought it was important - to gather them in a dedicated library. To increase the fun, we - have made these algorithms work in a causal way, so as to be - used in real time applications with as low delay as possible. - Functions can be used offline in sound editors and software - samplers, or online in audio effects and virtual instruments. - - https://aubio.org - -comment "aubio needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/aubio/aubio.hash b/package.bak/aubio/aubio.hash deleted file mode 100644 index e4478477d7..0000000000 --- a/package.bak/aubio/aubio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://aubio.org/pub/aubio-0.4.3.tar.bz2.sha256 -sha256 b62cdb073c0c64ae301917fa162969d42cba45e478bdf1e74490bd87e9cceaab aubio-0.4.3.tar.bz2 diff --git a/package.bak/aubio/aubio.mk b/package.bak/aubio/aubio.mk deleted file mode 100644 index f3330c2b89..0000000000 --- a/package.bak/aubio/aubio.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# aubio -# -################################################################################ - -AUBIO_VERSION = 0.4.3 -AUBIO_SITE = https://aubio.org/pub -AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2 -AUBIO_LICENSE = GPLv3+ -AUBIO_LICENSE_FILES = COPYING -AUBIO_INSTALL_STAGING = YES - -AUBIO_CONF_OPTS = \ - --disable-docs \ - --disable-atlas - -# Add --notests for each build step to avoid running unit tests on the -# build machine. -AUBIO_WAF_OPTS = --notests - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -AUBIO_DEPENDENCIES += libsndfile -AUBIO_CONF_OPTS += --enable-sndfile -else -AUBIO_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) -AUBIO_DEPENDENCIES += libsamplerate -AUBIO_CONF_OPTS += --enable-samplerate -else -AUBIO_CONF_OPTS += --disable-samplerate -endif - -ifeq ($(BR2_PACKAGE_JACK2),y) -AUBIO_DEPENDENCIES += jack2 -AUBIO_CONF_OPTS += --enable-jack -else -AUBIO_CONF_OPTS += --disable-jack -endif - -ifeq ($(BR2_PACKAGE_FFTW),y) -AUBIO_DEPENDENCIES += fftw -# fftw3 require double otherwise it will look for fftw3f -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) -AUBIO_CONF_OPTS += --enable-fftw3 --enable-double -else ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) -AUBIO_CONF_OPTS += --enable-fftw3f --disable-double -endif -else # !BR2_PACKAGE_FFTW -AUBIO_CONF_OPTS += --disable-fftw3 -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) -AUBIO_DEPENDENCIES += ffmpeg -AUBIO_CONF_OPTS += --enable-avcodec -else -AUBIO_CONF_OPTS += --disable-avcodec -endif - -$(eval $(waf-package)) diff --git a/package.bak/audiofile/0001-Fix-pkg-config-for-static-linking.patch b/package.bak/audiofile/0001-Fix-pkg-config-for-static-linking.patch deleted file mode 100644 index 54757abbd5..0000000000 --- a/package.bak/audiofile/0001-Fix-pkg-config-for-static-linking.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2abf7d2e5c533bf4d7407c2c8057a329cd49a3cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 24 Nov 2015 21:57:27 +0100 -Subject: [PATCH 1/1] Fix pkg-config for static linking -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Static linking userspace programs such as MPD against libaudiofile fails if -FLAC is available, because libaudiofile is linked against FLAC, but this isn't -expressed in the pkg-config file: - -[..] -arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::reset2()': -FLAC.cpp:(.text+0x58): undefined reference to `FLAC__stream_decoder_seek_absolute' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACEncoder::sync2()': -FLAC.cpp:(.text+0x88): undefined reference to `FLAC__stream_encoder_finish' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::~FLACDecoder()': -FLAC.cpp:(.text+0xc4): undefined reference to `FLAC__stream_decoder_delete' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACEncoder::~FLACEncoder()': -FLAC.cpp:(.text+0x164): undefined reference to `FLAC__stream_encoder_delete' -/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libaudiofile.a(FLAC.o): In function `FLACDecoder::runPull()': -[..] - -The Libs.private field is specifically designed for such usage: - -From pkg-config documentation: - - Libs.private: - - This line should list any private libraries in use. Private - libraries are libraries which are not exposed through your - library, but are needed in the case of static linking. - -Therefore, this patch adds a reference to FLAC as well as to lcov in the -Libs.private field of the pkg-config file. - -Signed-off-by: Jörg Krause ---- - audiofile.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/audiofile.pc.in b/audiofile.pc.in -index ad5956a..d6055ef 100644 ---- a/audiofile.pc.in -+++ b/audiofile.pc.in -@@ -8,5 +8,5 @@ Description: audiofile - Requires: - Version: @VERSION@ - Libs: -L${libdir} -laudiofile --Libs.private: -lm -+Libs.private: @FLAC_LIBS@ @COVERAGE_LIBS@ -lm - Cflags: -I${includedir} --- -2.6.2 - diff --git a/package.bak/audiofile/0002-cast-to-unsigned-gcc6.patch b/package.bak/audiofile/0002-cast-to-unsigned-gcc6.patch deleted file mode 100644 index 01baeb5e63..0000000000 --- a/package.bak/audiofile/0002-cast-to-unsigned-gcc6.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 28cfdbbcb96a69087c3d21faf69b5eae7bcf6d69 Mon Sep 17 00:00:00 2001 -From: Hodorgasm -Date: Wed, 11 May 2016 21:42:07 -0400 -Subject: [PATCH] Cast to unsigned while left bit-shifting - -GCC-6 now treats the left bitwise-shift of a negative integer as nonconformant so explicitly cast to an unsigned int while bit-shifting. - -Downloaded from upstream PR: -https://github.com/mpruett/audiofile/pull/28 - -Signed-off-by: Bernd Kuhls ---- - libaudiofile/modules/SimpleModule.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libaudiofile/modules/SimpleModule.h b/libaudiofile/modules/SimpleModule.h -index 03c6c69..4014fb2 100644 ---- a/libaudiofile/modules/SimpleModule.h -+++ b/libaudiofile/modules/SimpleModule.h -@@ -123,7 +123,7 @@ struct signConverter - typedef typename IntTypes::UnsignedType UnsignedType; - - static const int kScaleBits = (Format + 1) * CHAR_BIT - 1; -- static const int kMinSignedValue = -1 << kScaleBits; -+ static const int kMinSignedValue = static_cast(static_cast(-1) << kScaleBits);; - - struct signedToUnsigned : public std::unary_function - { diff --git a/package.bak/audiofile/Config.in b/package.bak/audiofile/Config.in deleted file mode 100644 index 4aa8d69c87..0000000000 --- a/package.bak/audiofile/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_AUDIOFILE - bool "audiofile" - depends on BR2_INSTALL_LIBSTDCPP - help - The Audio File Library handles reading and writing audio files - in many common formats. - - http://www.68k.org/~michael/audiofile/ - -comment "audiofile needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/audiofile/audiofile.hash b/package.bak/audiofile/audiofile.hash deleted file mode 100644 index 3b9cba64f1..0000000000 --- a/package.bak/audiofile/audiofile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cdc60df19ab08bfe55344395739bb08f50fc15c92da3962fac334d3bff116965 audiofile-0.3.6.tar.gz diff --git a/package.bak/audiofile/audiofile.mk b/package.bak/audiofile/audiofile.mk deleted file mode 100644 index ee3f833a4d..0000000000 --- a/package.bak/audiofile/audiofile.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# audiofile -# -################################################################################ - -AUDIOFILE_VERSION = 0.3.6 -AUDIOFILE_SITE = http://audiofile.68k.org -AUDIOFILE_INSTALL_STAGING = YES -AUDIOFILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -AUDIOFILE_CONF_OPTS = --disable-examples -AUDIOFILE_DEPENDENCIES = host-pkgconf -# configure is outdated and has old bugs because of it -AUDIOFILE_AUTORECONF = YES -AUDIOFILE_LICENSE = GPLv2+, LGPLv2.1+ -AUDIOFILE_LICENSE_FILES = COPYING COPYING.GPL - -ifeq ($(BR2_PACKAGE_FLAC),y) -AUDIOFILE_DEPENDENCIES += flac -AUDIOFILE_CONF_OPTS += --enable-flac -else -AUDIOFILE_CONF_OPTS += --disable-flac -endif - -$(eval $(autotools-package)) diff --git a/package.bak/audit/Config.in b/package.bak/audit/Config.in deleted file mode 100644 index 023ac79d30..0000000000 --- a/package.bak/audit/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -# audit has some builtin per-architecture system call tables -config BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - bool - default y if BR2_aarch64 || BR2_arm || BR2_armeb || \ - BR2_i386 || BR2_powerpc || BR2_powerpc64 || \ - BR2_x86_64 - -config BR2_PACKAGE_AUDIT - bool "audit" - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # strndupa() - help - The audit package contains the user space utilities for - storing and searching the audit records generated by - the audit subsystem in the Linux 2.6 kernel - - Note: The z/OS remote plugin is disabled in this package - - http://people.redhat.com/sgrubb/audit/ - -comment "audit needs a uClibc or glibc toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS diff --git a/package.bak/audit/S01auditd b/package.bak/audit/S01auditd deleted file mode 100644 index 2ecf0f1df9..0000000000 --- a/package.bak/audit/S01auditd +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh -# -# auditd This starts and stops auditd -# -# description: This starts the Linux Auditing System Daemon, -# which collects security related events in a dedicated -# audit log. If this daemon is turned off, audit events -# will be sent to syslog. -# - -NAME=auditd -DAEMON=/usr/sbin/${NAME} -CONFIG=/etc/audit/auditd.conf -PIDFILE=/var/run/${NAME}.pid - -start(){ - printf "Starting ${NAME}: " - - # Create dir to store log files in if one doesn't exist. Create - # the directory with SELinux permissions if possible - command -v matchpathcon >/dev/null 2>&1 - if [ $? = 0 ]; then - mkdir -p /var/log/audit -Z `matchpathcon -n /var/log/audit` - else - mkdir -p /var/log/audit - fi - - # Run audit daemon executable - start-stop-daemon -S -q -p ${PIDFILE} --exec ${DAEMON} - - if [ $? = 0 ]; then - # Load the default rules - test -f /etc/audit/rules.d/audit.rules && /usr/sbin/auditctl -R /etc/audit/rules.d/audit.rules >/dev/null - echo "OK" - else - echo "FAIL" - fi -} - -stop(){ - printf "Stopping ${NAME}: " - - start-stop-daemon -K -q -p ${PIDFILE} - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -reload(){ - printf "Reloading ${NAME} configuration: " - start-stop-daemon --stop -s 1 -p ${PIDFILE} 1>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -rotate(){ - printf "Rotating ${NAME} logs: " - start-stop-daemon --stop -s 10 -p ${PIDFILE} 1>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - reload - ;; - rotate) - rotate - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|rotate}" - exit 1 - ;; -esac diff --git a/package.bak/audit/audit.hash b/package.bak/audit/audit.hash deleted file mode 100644 index 2ae8f99bb7..0000000000 --- a/package.bak/audit/audit.hash +++ /dev/null @@ -1,2 +0,0 @@ -#Locally computed -sha256 0441790794fd9375dbca598fa0ffb46c57ff37b3a24b94ffec0bbee3215cca09 audit-2.7.1.tar.gz diff --git a/package.bak/audit/audit.mk b/package.bak/audit/audit.mk deleted file mode 100644 index 298ef20b7b..0000000000 --- a/package.bak/audit/audit.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# audit -# -################################################################################ - -AUDIT_VERSION = 2.7.1 -AUDIT_SITE = http://people.redhat.com/sgrubb/audit -AUDIT_LICENSE = GPLv2+ (programs), unclear (libraries) -AUDIT_LICENSE_FILES = COPYING - -AUDIT_INSTALL_STAGING = YES - -AUDIT_CONF_OPTS = --without-python --without-python3 --disable-zos-remote - -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -AUDIT_DEPENDENCIES += libcap-ng -AUDIT_CONF_OPTS += --with-libcap-ng=yes -else -AUDIT_CONF_OPTS += --with-libcap-ng=no -endif - -# For i386, x86-64 and PowerPC, the system call tables are -# unconditionally included. However, for ARM(eb) and AArch64, then -# need to be explicitly enabled. - -ifeq ($(BR2_arm)$(BR2_armeb),y) -AUDIT_CONF_OPTS += --with-arm -endif -ifeq ($(BR2_aarch64),y) -AUDIT_CONF_OPTS += --with-aarch64 -endif - -ifeq ($(BR2_INIT_SYSTEMD),y) -AUDIT_CONF_OPTS += --enable-systemd -else -AUDIT_CONF_OPTS += --disable-systemd -endif - -define AUDIT_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/audit/S01auditd $(TARGET_DIR)/etc/init.d/S01auditd -endef - -define AUDIT_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/auditd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/auditd.service - - $(INSTALL) -D -m 644 package/audit/audit_tmpfiles.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/audit.conf -endef - -define AUDIT_INSTALL_CLEANUP - $(RM) -rf $(TARGET_DIR)/etc/rc.d - $(RM) -rf $(TARGET_DIR)/etc/sysconfig -endef -AUDIT_POST_INSTALL_TARGET_HOOKS += AUDIT_INSTALL_CLEANUP - -HOST_AUDIT_CONF_OPTS = \ - --without-python \ - --without-python3 \ - --disable-zos-remote \ - --without-libcap-ng - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/audit/audit_tmpfiles.conf b/package.bak/audit/audit_tmpfiles.conf deleted file mode 100644 index 6b8325b595..0000000000 --- a/package.bak/audit/audit_tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/log/audit 0755 - - diff --git a/package.bak/aufs-util/0001-remove-user-settings.patch b/package.bak/aufs-util/0001-remove-user-settings.patch deleted file mode 100644 index 7eebc95dd4..0000000000 --- a/package.bak/aufs-util/0001-remove-user-settings.patch +++ /dev/null @@ -1,16 +0,0 @@ -install: drop setting ownership - -Signed-off-by: "Yann E. MORIN" - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -21,7 +21,7 @@ - override CPPFLAGS += -DAUFHSM_CMD=\"/usr/bin/aufhsm\" - override CFLAGS += -O -Wall - INSTALL ?= install --Install = ${INSTALL} -o root -g root -p -+Install = ${INSTALL} -p - ManDir = /usr/share/man - - # diff --git a/package.bak/aufs-util/0002-no-check-ver.patch b/package.bak/aufs-util/0002-no-check-ver.patch deleted file mode 100644 index 5fe692072f..0000000000 --- a/package.bak/aufs-util/0002-no-check-ver.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile: do not check version - -The aufs-util package tries to ensure that its version is compatible -with the one in the running kernel. However, this test is flawed: the -version string in the aufs4x branch for aufs-util is aufs3.x, so it does -not match the version in the kernel when it is aufs4.x. - -Disengage this check, ion the assumption the user knows what he is -doing. - -Signed-off-by: "Yann E. MORIN" - -diff --git a/Makefile b/Makefile ---- a/Makefile -+++ b/Makefile -@@ -62,7 +62,7 @@ - $(foreach v, CPPFLAGS CFLAGS INSTALL Install ManDir LibUtilHdr, \ - $(eval MAKE += ${v}="$${${v}}")) - --all: ver_test ${Man} ${Bin} ${Etc} -+all: ${Man} ${Bin} ${Etc} - ${MAKE} -C libau $@ - ln -sf ./libau/libau*.so . - $(call MakeFHSM, $@) diff --git a/package.bak/aufs-util/0003-no-strip-lib.patch b/package.bak/aufs-util/0003-no-strip-lib.patch deleted file mode 100644 index 15830503b5..0000000000 --- a/package.bak/aufs-util/0003-no-strip-lib.patch +++ /dev/null @@ -1,18 +0,0 @@ -install: do not strip libs when installing - -We want unstripped binaries in staging; stripping is done by Buildroot -as a whole in target-finalize if needed, anyway. - -Signed-off-by: "Yann E. MORIN" - -diff --git a/libau/Makefile b/libau/Makefile ---- a/libau/Makefile -+++ b/libau/Makefile -@@ -37,7 +37,6 @@ - ln -sf $< $@ - ${LibSo}.${LibSoMajor}: ${LibSo}.${LibSoMajor}.${LibSoMinor} - ln -sf $< $@ --${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDFLAGS += -s - ${LibSo}.${LibSoMajor}.${LibSoMinor}: override LDLIBS += -ldl -lpthread - ${LibSo}.${LibSoMajor}.${LibSoMinor}: ${LibSoObj} - ${CC} --shared -Wl,-soname,${LibSo}.${LibSoMajor} ${LDFLAGS} \ diff --git a/package.bak/aufs-util/Config.in b/package.bak/aufs-util/Config.in deleted file mode 100644 index 93999fb606..0000000000 --- a/package.bak/aufs-util/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -comment "aufs-util needs a linux kernel and a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_AUFS_UTIL - bool "aufs-util" - depends on BR2_USE_MMU - depends on BR2_LINUX_KERNEL - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Aufs command line utilities. - - Needs a kernel with aufs support. A kernel - extension package is available. - - http://sourceforge.net/p/aufs/aufs-util/ - -if BR2_PACKAGE_AUFS_UTIL - -config BR2_PACKAGE_AUFS_UTIL_VERSION - string "aufs-util version" - default "" - help - The version you choose must match that of the aufs support - in your kernel. Usually, this is aufs3.x for 3.x kernels and - aufs4.x for 4.x kernels. - - Usually, the sha1 of the cset you want to use; avoid using a - branch name as this yields non-reproducible builds. - - See the following resources to see what versions are available: - - https://sourceforge.net/p/aufs/aufs-util/ci/master/tree/ - -endif diff --git a/package.bak/aufs-util/aufs-util.mk b/package.bak/aufs-util/aufs-util.mk deleted file mode 100644 index d41b4ac4fd..0000000000 --- a/package.bak/aufs-util/aufs-util.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# aufs-util -# -################################################################################ - -# linux-headers -AUFS_UTIL_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_UTIL_VERSION)) -AUFS_UTIL_SITE = http://git.code.sf.net/p/aufs/aufs-util -AUFS_UTIL_SITE_METHOD = git -AUFS_UTIL_LICENSE = GPLv2 -AUFS_UTIL_LICENSE_FILES = COPYING - -AUFS_UTIL_DEPENDENCIES = linux - -# Building aufs-util requires access to the kernel headers of aufs, -# which are only available in the kernel build directory, which is why -# we add -I$(LINUX_DIR)/include/uapi. These headers have not been -# prepared for usage by userspace, so to workaround this we have to -# defined the "__user" macro as empty. -AUFS_UTIL_HOST_CPPFLAGS = \ - $(HOST_CPPFLAGS) \ - -I$(LINUX_DIR)/include/uapi \ - -D__user= - -AUFS_UTIL_CPPFLAGS = \ - $(TARGET_CPPFLAGS) \ - -I$(LINUX_DIR)/include/uapi \ - -D__user= - -# rdu64 is supposed to provide the LFS variant of readdir(), -# readdir64(). However, because Buildroot is always LFS-enabled, -# readdir() is always the LFS variant. Drop rdu64 from the build, as -# it causes build failures due to multiple implementations of -# readdir64(). -define AUFS_UTIL_REMOVE_RDU64 - $(SED) 's% rdu64.o%%' $(@D)/libau/Makefile -endef - -AUFS_UTIL_POST_PATCH_HOOKS += AUFS_UTIL_REMOVE_RDU64 - -# First, we build the host tools, needed to build the target tools. -define AUFS_UTIL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(AUFS_UTIL_HOST_CPPFLAGS)" \ - HOSTCC="$(HOSTCC)" HOSTLD="$(HOSTLD)" \ - INSTALL="$(INSTALL)" c2sh c2tmac - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - CPPFLAGS="$(AUFS_UTIL_CPPFLAGS)" \ - INSTALL="$(INSTALL)" all -endef - -define AUFS_UTIL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL="$(INSTALL)" DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/aufs/Config.in b/package.bak/aufs/Config.in deleted file mode 100644 index cc5ff365fe..0000000000 --- a/package.bak/aufs/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -# Automatically selected by the corresponding linux extension -config BR2_PACKAGE_AUFS - bool - -if BR2_PACKAGE_AUFS - -# Both come from the selection of the linux extension. -config BR2_PACKAGE_AUFS_SERIES - int - default BR2_LINUX_KERNEL_EXT_AUFS_SERIES - -config BR2_PACKAGE_AUFS_VERSION - string - default BR2_LINUX_KERNEL_EXT_AUFS_VERSION - -endif diff --git a/package.bak/aufs/aufs.mk b/package.bak/aufs/aufs.mk deleted file mode 100644 index 1ba5508ac3..0000000000 --- a/package.bak/aufs/aufs.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# aufs -# -################################################################################ - -AUFS_VERSION = $(call qstrip,$(BR2_PACKAGE_AUFS_VERSION)) -AUFS_LICENSE = GPLv2 -AUFS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_AUFS_SERIES),3) -AUFS_SITE = http://git.code.sf.net/p/aufs/aufs3-standalone -AUFS_SITE_METHOD = git -else ifeq ($(BR2_PACKAGE_AUFS_SERIES),4) -AUFS_SITE = $(call github,sfjro,aufs4-standalone,$(AUFS_VERSION)) -endif - -ifeq ($(BR_BUILDING):$(BR2_PACKAGE_AUFS):$(AUFS_VERSION),y:y:) -$(error No aufs version specified) -endif - -$(eval $(generic-package)) diff --git a/package.bak/aumix/0001-fix-incorrect-makefile-am.patch b/package.bak/aumix/0001-fix-incorrect-makefile-am.patch deleted file mode 100644 index 143174deec..0000000000 --- a/package.bak/aumix/0001-fix-incorrect-makefile-am.patch +++ /dev/null @@ -1,28 +0,0 @@ -Aumix's src/Makefile.am incorrect adds @includedir@ to the list of -include paths and @libdir@ to the list of libraries paths. This is -incorrect, as @includedir@ and @libdir@ are respectively /usr/include -and /usr/lib, even in cross-compilation mode. - -At the same time, use AM_CFLAGS instead of CFLAGS, as is done on the -similar patch found in OpenEmbedded. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile.am | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -Index: aumix-2.8/src/Makefile.am -=================================================================== ---- aumix-2.8.orig/src/Makefile.am -+++ aumix-2.8/src/Makefile.am -@@ -9,9 +9,8 @@ - mouse.c common.h curses.h gpm-xterm.h gtk.h interactive.h \ - mouse.h play.xpm record.xpm - localedir = $(datadir)/locale --INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" -I@includedir@ -+INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\" - AM_CFLAGS = @CFLAGS@ @GLIB_CFLAGS@ @GTK_CFLAGS@ --LDADD = -L@libdir@ - LIBS = @LIBS@ @GTK_LIBS@ @LIBINTL@ - DEFS = @DEFS@ - diff --git a/package.bak/aumix/Config.in b/package.bak/aumix/Config.in deleted file mode 100644 index 3d3208250c..0000000000 --- a/package.bak/aumix/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_AUMIX - bool "aumix" - select BR2_PACKAGE_NCURSES - help - aumix is a small, easy-to-use program to control the mixer - of your sound card. It runs in text mode using the ncurses - library, or from the command line (non-interactively). - It can read default settings from a file, and it can also - automatically save and restore the mixer settings at shutdown - and boot. - - http://jpj.net/~trevor/aumix.html diff --git a/package.bak/aumix/aumix.hash b/package.bak/aumix/aumix.hash deleted file mode 100644 index 0463ea01a6..0000000000 --- a/package.bak/aumix/aumix.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d2ce43d532ef75072c8d4e7922e3bc06be6d97765a508d9ceb0d1766bbe70e29 aumix-2.9.1.tar.bz2 diff --git a/package.bak/aumix/aumix.mk b/package.bak/aumix/aumix.mk deleted file mode 100644 index eae34d0fbc..0000000000 --- a/package.bak/aumix/aumix.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# aumix -# -################################################################################ - -AUMIX_VERSION = 2.9.1 -AUMIX_SOURCE = aumix-$(AUMIX_VERSION).tar.bz2 -AUMIX_SITE = http://jpj.net/~trevor/aumix/releases -AUMIX_AUTORECONF = YES -AUMIX_GETTEXTIZE = YES -AUMIX_LICENSE = GPLv2+ -AUMIX_LICENSE_FILES = COPYING - -AUMIX_CONF_OPTS = \ - --without-gtk \ - --without-gtk1 \ - --without-alsa \ - --without-gpm \ - --without-sysmouse - -AUMIX_DEPENDENCIES = host-gettext ncurses - -$(eval $(autotools-package)) diff --git a/package.bak/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch b/package.bak/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch deleted file mode 100644 index 6d345d3468..0000000000 --- a/package.bak/autoconf-archive/0001-AX_TLS-fix-syntax-error.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1870301013d79be781ead2b0e62fc08f91715ca9 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 3 May 2015 23:02:34 +0200 -Subject: [PATCH] AX_TLS: fix syntax error - -The commit e012eb17b3d67f31dee477592328207437206c33 introduce -a syntax error due to an empty "else" statement. - -confifure: -if test "$ac_cv_tls" != "none"; then : -cat >>confdefs.h <<_ACEOF -_ACEOF -else - -fi - -Remove the [] on the third part of AS_IF. - -Signed-off-by: Romain Naour ---- - m4/ax_tls.m4 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/m4/ax_tls.m4 b/m4/ax_tls.m4 -index 809b761..2135dd2 100644 ---- a/m4/ax_tls.m4 -+++ b/m4/ax_tls.m4 -@@ -44,7 +44,7 @@ - # modified version of the Autoconf Macro, you may extend this special - # exception to the GPL to apply to your modified version as well. - --#serial 11 -+#serial 12 - - AC_DEFUN([AX_TLS], [ - AC_MSG_CHECKING([for thread local storage (TLS) class]) -@@ -70,5 +70,5 @@ AC_DEFUN([AX_TLS], [ - AS_IF([test "$ac_cv_tls" != "none"], - [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here]) - m4_ifnblank([$1],[$1])], -- [m4_ifnblank([$2],[$2])]) -+ m4_ifnblank([$2],[$2])) - ]) --- -1.9.3 - diff --git a/package.bak/autoconf-archive/autoconf-archive.hash b/package.bak/autoconf-archive/autoconf-archive.hash deleted file mode 100644 index 6982a4dd67..0000000000 --- a/package.bak/autoconf-archive/autoconf-archive.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Computed locally -sha256 88fb2efff640eddd28a52ae550ff5561bca3bd2bba09e1d7b0580e719875e437 autoconf-archive-2016.03.20.tar.xz diff --git a/package.bak/autoconf-archive/autoconf-archive.mk b/package.bak/autoconf-archive/autoconf-archive.mk deleted file mode 100644 index 86956eb672..0000000000 --- a/package.bak/autoconf-archive/autoconf-archive.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# autoconf-archive -# -################################################################################ - -AUTOCONF_ARCHIVE_VERSION = 2016.03.20 -AUTOCONF_ARCHIVE_SOURCE = autoconf-archive-$(AUTOCONF_ARCHIVE_VERSION).tar.xz -AUTOCONF_ARCHIVE_SITE = $(BR2_GNU_MIRROR)/autoconf-archive -AUTOCONF_ARCHIVE_LICENSE = GPLv3+ with exception -AUTOCONF_ARCHIVE_LICENSE_FILES = COPYING COPYING.EXCEPTION -HOST_AUTOCONF_ARCHIVE_INSTALL_OPTS = aclocaldir=$(HOST_DIR)/usr/share/autoconf-archive install - -$(eval $(host-autotools-package)) diff --git a/package.bak/autoconf/0001-dont-add-dirty-to-version.patch b/package.bak/autoconf/0001-dont-add-dirty-to-version.patch deleted file mode 100644 index e8d9f6a29d..0000000000 --- a/package.bak/autoconf/0001-dont-add-dirty-to-version.patch +++ /dev/null @@ -1,28 +0,0 @@ -autoconf: don't append -dirty to version - -Don't append -dirty to autoconf version number if the buildroot git tree -has uncommited changes. - -This script is meant for the autoconf developers, but it also activates -if you build autoconf in a subdirectory of a git tree (E.G. like how it's -commonly done in buildroot). - -The affect is that autoconf gets built as being version 2.65-dirty, which -breaks programs (like Python) which explicitly checks for autoconf-2.65. - -[Gustavo: update for autoconf 2.69] -Signed-off-by: Peter Korsgaard -Signed-off-by: Gustavo Zacarias - -diff -Nura autoconf-2.69.orig/build-aux/git-version-gen autoconf-2.69/build-aux/git-version-gen ---- autoconf-2.69.orig/build-aux/git-version-gen 2013-06-27 11:31:02.340200154 -0300 -+++ autoconf-2.69/build-aux/git-version-gen 2013-06-27 11:31:13.734577033 -0300 -@@ -203,7 +203,7 @@ - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; -- *) v="$v-dirty" ;; -+ #*) v="$v-dirty" ;; - esac ;; - esac - fi diff --git a/package.bak/autoconf/autoconf.hash b/package.bak/autoconf/autoconf.hash deleted file mode 100644 index f35f6f8d0a..0000000000 --- a/package.bak/autoconf/autoconf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684 autoconf-2.69.tar.xz diff --git a/package.bak/autoconf/autoconf.mk b/package.bak/autoconf/autoconf.mk deleted file mode 100644 index fd91961e85..0000000000 --- a/package.bak/autoconf/autoconf.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# autoconf -# -################################################################################ - -AUTOCONF_VERSION = 2.69 -AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.xz -AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf - -AUTOCONF_LICENSE = GPLv3+ with exceptions -AUTOCONF_LICENSE_FILES = COPYINGv3 COPYING.EXCEPTION - -HOST_AUTOCONF_CONF_ENV = \ - EMACS="no" \ - ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \ - ac_cv_prog_gnu_m4_gnu=no - -HOST_AUTOCONF_DEPENDENCIES = host-m4 host-libtool - -$(eval $(host-autotools-package)) - -# variables used by other packages -AUTOCONF = $(HOST_DIR)/usr/bin/autoconf -AUTOHEADER = $(HOST_DIR)/usr/bin/autoheader -AUTORECONF = $(HOST_CONFIGURE_OPTS) ACLOCAL="$(ACLOCAL)" AUTOCONF="$(AUTOCONF)" AUTOHEADER="$(AUTOHEADER)" AUTOMAKE="$(AUTOMAKE)" AUTOPOINT=/bin/true $(HOST_DIR)/usr/bin/autoreconf -f -i -I "$(ACLOCAL_DIR)" -I "$(ACLOCAL_HOST_DIR)" diff --git a/package.bak/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch b/package.bak/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch deleted file mode 100644 index 26e86c325f..0000000000 --- a/package.bak/autofs/0001-include-linux-nfs.h-directly-in-rpc_sub.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Pending - -From 44bdce8c6ed9b30c1643e5981172a4f9025f013c Mon Sep 17 00:00:00 2001 -From: Andreas Oberritter -Date: Wed, 13 Mar 2013 16:17:08 +0100 -Subject: [PATCH] autofs-5.0.7: include linux/nfs.h directly in rpc_subs.h - -Fixes compile error with uclibc. Glibc's nfs/nfs.h contains -nothing but "#include linux/nfs.h". rpc_subs.h already includes -other linux/nfs*.h files directly. - -Signed-off-by: Andreas Oberritter -Signed-off-by: Thomas Petazzoni ---- - include/rpc_subs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/rpc_subs.h b/include/rpc_subs.h -index b6d59f9..a2d9648 100644 ---- a/include/rpc_subs.h -+++ b/include/rpc_subs.h -@@ -18,7 +18,7 @@ - - #include - #include --#include -+#include - #include - #include - --- -1.7.10.4 - diff --git a/package.bak/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch b/package.bak/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch deleted file mode 100644 index ade6d1cdb3..0000000000 --- a/package.bak/autofs/0002-autofs-build-check-for-clock_gettime-in-librt.patch +++ /dev/null @@ -1,62 +0,0 @@ -From a38ab6c0f2790e047fc64867865eb2a073135618 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 19 Jun 2016 00:17:41 -0300 -Subject: [PATCH] autofs: build: check for clock_gettime in librt - -Glibc versions older than 2.17 define clock_gettime() in librt, so add a -check for this. - -Signed-off-by: Gustavo Zacarias ---- -Patch status: sent to autofs@ mailing list - - Makefile.conf.in | 3 +++ - Makefile.rules | 2 ++ - configure.in | 4 ++++ - 3 files changed, 9 insertions(+) - -diff --git a/Makefile.conf.in b/Makefile.conf.in -index cb53e66..2bc3202 100644 ---- a/Makefile.conf.in -+++ b/Makefile.conf.in -@@ -11,6 +11,9 @@ - DAEMON_CFLAGS = @DAEMON_CFLAGS@ - DAEMON_LDFLAGS = @DAEMON_LDFLAGS@ - -+# Glibc < 2.17 requires librt for clock_gettime() -+LIBCLOCK_GETTIME = @LIBCLOCK_GETTIME@ -+ - # Special parameters for glibc (libc 6) - LIBNSL = @LIBNSL@ - LIBRESOLV = @LIBRESOLV@ -diff --git a/Makefile.rules b/Makefile.rules -index 6fa3e02..7d1af2e 100644 ---- a/Makefile.rules -+++ b/Makefile.rules -@@ -56,6 +56,8 @@ endif - - LIBS += $(LIBNSL) - -+LIBS += $(LIBCLOCK_GETTIME) -+ - # Standard rules - - .SUFFIXES: .c .o .s .so -diff --git a/configure.in b/configure.in -index 25d7c4e..a4318e8 100644 ---- a/configure.in -+++ b/configure.in -@@ -177,6 +177,10 @@ if test "$ac_cv_search_versionsort" = "no"; then - [Define if your C library does not provide versionsort]) - fi - -+# glibc < 2.17 needs librt for clock_gettime() -+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt") -+AC_SUBST(LIBCLOCK_GETTIME) -+ - # - # glibc/libc 6 new libraries - # --- -2.7.3 - diff --git a/package.bak/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch b/package.bak/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch deleted file mode 100644 index 93f3f9cf2a..0000000000 --- a/package.bak/autofs/0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bb5cc9cee1963362fe56b4fac65fed4912da4215 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 30 Jul 2016 22:30:01 +0200 -Subject: [PATCH] configure: add cache variable for Linux proc filesystem check - -When cross-compiling, whether the /proc filesystem is available in the -build environment does not give any indication as to whether it will -be available in the execution environment. - -This commit therefore adjust the AF_LINUX_PROCFS macro to use -AC_CACHE_CHECK(), so that an ac_cv_linux_procfs variable can be -preseeded in the environment to force the result of this check. - -Signed-off-by: Thomas Petazzoni ---- - aclocal.m4 | 15 +++++---------- - 1 file changed, 5 insertions(+), 10 deletions(-) - -diff --git a/aclocal.m4 b/aclocal.m4 -index 2115204..333699c 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -80,16 +80,11 @@ dnl - dnl Check for the Linux /proc filesystem - dnl -------------------------------------------------------------------------- - AC_DEFUN(AF_LINUX_PROCFS, --[AC_MSG_CHECKING(for Linux proc filesystem) --if test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" --then -- linux_procfs=yes --else -- linux_procfs=no --fi --AC_MSG_RESULT($linux_procfs) --if test $linux_procfs = yes --then -+[AC_CACHE_CHECK([for Linux proc filesystem], [ac_cv_linux_procfs], -+ [ac_cv_linux_procfs=no -+ test "x`cat /proc/sys/kernel/ostype 2>&-`" = "xLinux" && ac_cv_linux_procfs=yes]) -+ if test $ac_cv_linux_procfs = yes -+ then - AC_DEFINE(HAVE_LINUX_PROCFS, 1, - [Define if you have the Linux /proc filesystem.]) - fi]) --- -2.7.4 - diff --git a/package.bak/autofs/Config.in b/package.bak/autofs/Config.in deleted file mode 100644 index 8e08357a4e..0000000000 --- a/package.bak/autofs/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_AUTOFS - bool "autofs" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on !BR2_STATIC_LIBS # dlfcn - help - Autofs controls the operation of the automount daemons. The - automount daemons automatically mount filesystems when they - are used and unmount them after a period of inactivity based - on a set of pre-configured maps defined by default in - /etc/auto.master. The kernel automounter implements SunOS - style automounter under Linux and requires a kernel version - of at least 2.6.17 and the autofs4 kernel module. - - http://www.linuxfromscratch.org/blfs/view/svn/general/autofs.html - -comment "autofs needs a toolchain w/ NPTL, RPC, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/package.bak/autofs/autofs.hash b/package.bak/autofs/autofs.hash deleted file mode 100644 index 72b1378595..0000000000 --- a/package.bak/autofs/autofs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/daemons/autofs/v5/sha256sums.asc -sha256 88b7de39088aead983e02072a7b753d5ee52ce419c8913f7a3d4ff5521313f0c autofs-5.1.2.tar.xz diff --git a/package.bak/autofs/autofs.mk b/package.bak/autofs/autofs.mk deleted file mode 100644 index 23e683688b..0000000000 --- a/package.bak/autofs/autofs.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# autofs -# -################################################################################ - -AUTOFS_VERSION = 5.1.2 -AUTOFS_SOURCE = autofs-$(AUTOFS_VERSION).tar.xz -AUTOFS_SITE = $(BR2_KERNEL_MIRROR)/linux/daemons/autofs/v5 -AUTOFS_LICENSE = GPLv2+ -AUTOFS_LICENSE_FILES = COPYING COPYRIGHT -AUTOFS_DEPENDENCIES = host-flex host-bison -# For 0002-autofs-configure-check-for-clock_gettime-in-librt.patch and -# 0003-configure-add-cache-variable-for-Linux-proc-filesyst.patch. -AUTOFS_AUTORECONF = YES - -# autofs looks on the build machine for the path of modprobe, so tell -# it explicitly where it will be located on the target. -AUTOFS_CONF_ENV = \ - ac_cv_path_KRB5_CONFIG=no \ - ac_cv_path_MODPROBE=/sbin/modprobe \ - ac_cv_linux_procfs=yes - -# instead of looking in the PATH like any reasonable package, autofs -# configure looks only in an hardcoded search path for host tools, -# which we have to override with --with-path. -AUTOFS_CONF_OPTS = \ - --disable-mount-locking \ - --enable-ignore-busy \ - --without-openldap \ - --without-sasl \ - --with-path="$(BR_PATH)" \ - --with-hesiod=no - -AUTOFS_MAKE_ENV = DONTSTRIP=1 - -$(eval $(autotools-package)) diff --git a/package.bak/automake/0001-noman.patch b/package.bak/automake/0001-noman.patch deleted file mode 100644 index a4ad16ddfb..0000000000 --- a/package.bak/automake/0001-noman.patch +++ /dev/null @@ -1,27 +0,0 @@ -Disable manpages build and installation, seems the bundled version of -help2man is somewhat old and breaks on modern distributions such as -Fedora 20, as reported by Kanibal on IRC. - -Signed-off-by: Gustavo Zacarias - -diff -Nura automake-1.14.1.orig/Makefile.in automake-1.14.1/Makefile.in ---- automake-1.14.1.orig/Makefile.in 2014-09-10 18:40:57.554164448 -0300 -+++ automake-1.14.1/Makefile.in 2014-09-10 18:42:01.050348068 -0300 -@@ -3387,7 +3387,7 @@ - check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) check-TESTS check-local - check: check-am --all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(MANS) $(DATA) -+all-am: Makefile $(INFO_DEPS) $(SCRIPTS) $(DATA) - installdirs: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(infodir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(amdir)" "$(DESTDIR)$(automake_acdir)" "$(DESTDIR)$(automake_internal_acdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(perllibdir)" "$(DESTDIR)$(pkgvdatadir)" "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(system_acdir)" "$(DESTDIR)$(perllibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ -@@ -3454,7 +3454,7 @@ - install-dist_automake_internal_acDATA install-dist_docDATA \ - install-dist_perllibDATA install-dist_pkgvdataDATA \ - install-dist_scriptDATA install-dist_system_acDATA \ -- install-info-am install-man install-nodist_perllibDATA -+ install-info-am install-nodist_perllibDATA - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-data-hook - install-dvi: install-dvi-am diff --git a/package.bak/automake/automake.hash b/package.bak/automake/automake.hash deleted file mode 100644 index 83aca90549..0000000000 --- a/package.bak/automake/automake.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 automake-1.15.tar.xz diff --git a/package.bak/automake/automake.mk b/package.bak/automake/automake.mk deleted file mode 100644 index 84f05dce39..0000000000 --- a/package.bak/automake/automake.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# automake -# -################################################################################ - -AUTOMAKE_VERSION = 1.15 -AUTOMAKE_SOURCE = automake-$(AUTOMAKE_VERSION).tar.xz -AUTOMAKE_SITE = $(BR2_GNU_MIRROR)/automake -AUTOMAKE_LICENSE = GPLv2+ -AUTOMAKE_LICENSE_FILES = COPYING - -HOST_AUTOMAKE_DEPENDENCIES = host-autoconf - -ACLOCAL_HOST_DIR = $(HOST_DIR)/usr/share/aclocal - -define GTK_DOC_M4_INSTALL - $(INSTALL) -D -m 0644 package/automake/gtk-doc.m4 \ - $(ACLOCAL_HOST_DIR)/gtk-doc.m4 -endef - -# ensure staging aclocal dir exists -define HOST_AUTOMAKE_MAKE_ACLOCAL - mkdir -p $(ACLOCAL_DIR) -endef - -HOST_AUTOMAKE_POST_INSTALL_HOOKS += GTK_DOC_M4_INSTALL -HOST_AUTOMAKE_POST_INSTALL_HOOKS += HOST_AUTOMAKE_MAKE_ACLOCAL - -$(eval $(host-autotools-package)) - -# variables used by other packages -AUTOMAKE = $(HOST_DIR)/usr/bin/automake -ACLOCAL_DIR = $(STAGING_DIR)/usr/share/aclocal -ACLOCAL = $(HOST_DIR)/usr/bin/aclocal -I $(ACLOCAL_DIR) diff --git a/package.bak/automake/gtk-doc.m4 b/package.bak/automake/gtk-doc.m4 deleted file mode 100644 index 36755432b5..0000000000 --- a/package.bak/automake/gtk-doc.m4 +++ /dev/null @@ -1,88 +0,0 @@ -dnl -*- mode: autoconf -*- - -# serial 2 - -dnl Usage: -dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -AC_DEFUN([GTK_DOC_CHECK], -[ - AC_REQUIRE([PKG_PROG_PKG_CONFIG]) - AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first - AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first - - ifelse([$1],[],[gtk_doc_requires="gtk-doc"],[gtk_doc_requires="gtk-doc >= $1"]) - AC_MSG_CHECKING([for gtk-doc]) - PKG_CHECK_EXISTS([$gtk_doc_requires],[have_gtk_doc=yes],[have_gtk_doc=no]) - AC_MSG_RESULT($have_gtk_doc) - - if test "$have_gtk_doc" = "no"; then - AC_MSG_WARN([ - You will not be able to create source packages with 'make dist' - because $gtk_doc_requires is not found.]) - fi - - dnl check for tools we added during development - dnl Use AC_CHECK_PROG to avoid the check target using an absolute path that - dnl may not be writable by the user. Currently, automake requires that the - dnl test name must end in '.test'. - dnl https://bugzilla.gnome.org/show_bug.cgi?id=701638 - AC_CHECK_PROG([GTKDOC_CHECK],[gtkdoc-check],[gtkdoc-check.test]) - AC_PATH_PROG([GTKDOC_CHECK_PATH],[gtkdoc-check]) - AC_PATH_PROGS([GTKDOC_REBASE],[gtkdoc-rebase],[true]) - AC_PATH_PROG([GTKDOC_MKPDF],[gtkdoc-mkpdf]) - - dnl for overriding the documentation installation directory - AC_ARG_WITH([html-dir], - AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, - [with_html_dir='${datadir}/gtk-doc/html']) - HTML_DIR="$with_html_dir" - AC_SUBST([HTML_DIR]) - - dnl enable/disable documentation building - AC_ARG_ENABLE([gtk-doc], - AS_HELP_STRING([--enable-gtk-doc], - [use gtk-doc to build documentation [[default=no]]]),, - [enable_gtk_doc=no]) - - AC_MSG_CHECKING([whether to build gtk-doc documentation]) - AC_MSG_RESULT($enable_gtk_doc) - - if test "x$enable_gtk_doc" = "xyes" && test "$have_gtk_doc" = "no"; then - AC_MSG_ERROR([ - You must have $gtk_doc_requires installed to build documentation for - $PACKAGE_NAME. Please install gtk-doc or disable building the - documentation by adding '--disable-gtk-doc' to '[$]0'.]) - fi - - dnl don't check for glib if we build glib - if test "x$PACKAGE_NAME" != "xglib"; then - dnl don't fail if someone does not have glib - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) - fi - - dnl enable/disable output formats - AC_ARG_ENABLE([gtk-doc-html], - AS_HELP_STRING([--enable-gtk-doc-html], - [build documentation in html format [[default=yes]]]),, - [enable_gtk_doc_html=yes]) - AC_ARG_ENABLE([gtk-doc-pdf], - AS_HELP_STRING([--enable-gtk-doc-pdf], - [build documentation in pdf format [[default=no]]]),, - [enable_gtk_doc_pdf=no]) - - if test -z "$GTKDOC_MKPDF"; then - enable_gtk_doc_pdf=no - fi - - if test -z "$AM_DEFAULT_VERBOSITY"; then - AM_DEFAULT_VERBOSITY=1 - fi - AC_SUBST([AM_DEFAULT_VERBOSITY]) - - AM_CONDITIONAL([HAVE_GTK_DOC], [test x$have_gtk_doc = xyes]) - AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) - AM_CONDITIONAL([GTK_DOC_BUILD_PDF], [test x$enable_gtk_doc_pdf = xyes]) - AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) - AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) -]) diff --git a/package.bak/autossh/0001-honour-LDFLAGS.patch b/package.bak/autossh/0001-honour-LDFLAGS.patch deleted file mode 100644 index 2e6160b8fd..0000000000 --- a/package.bak/autossh/0001-honour-LDFLAGS.patch +++ /dev/null @@ -1,16 +0,0 @@ -Honour LDFLAGS, especially required when static linking - -Signed-off-by: Waldemar Brodkorb - -diff -Nur autossh-1.4e.orig/Makefile.in autossh-1.4e/Makefile.in ---- autossh-1.4e.orig/Makefile.in 2015-02-10 05:41:58.000000000 +0100 -+++ autossh-1.4e/Makefile.in 2016-11-25 12:49:06.052122855 +0100 -@@ -31,7 +31,7 @@ - - - $(TARGET): $(OFILES) -- $(CC) $(CPPFLAGS) -o $(TARGET) $(OFILES) $(LIBS) -+ $(CC) $(CPPFLAGS) $(LDFLAGS) -o $(TARGET) $(OFILES) $(LIBS) - - clean: - - /bin/rm -f *.o *.a *.core *~ diff --git a/package.bak/autossh/Config.in b/package.bak/autossh/Config.in deleted file mode 100644 index 6d1a0853ed..0000000000 --- a/package.bak/autossh/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_AUTOSSH - bool "autossh" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_DROPBEAR || BR2_PACKAGE_OPENSSH - help - autossh is a program to start a copy of ssh and monitor it, - restarting it as necessary should it die or stop passing traffic. - - http://www.harding.motd.ca/autossh/ diff --git a/package.bak/autossh/autossh.hash b/package.bak/autossh/autossh.hash deleted file mode 100644 index 4f3de137a5..0000000000 --- a/package.bak/autossh/autossh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.harding.motd.ca/autossh/autossh-1.4e.cksums -sha256 9e8e10a59d7619176f4b986e256f776097a364d1be012781ea52e08d04679156 autossh-1.4e.tgz diff --git a/package.bak/autossh/autossh.mk b/package.bak/autossh/autossh.mk deleted file mode 100644 index d52b4e9666..0000000000 --- a/package.bak/autossh/autossh.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# autossh -# -################################################################################ - -AUTOSSH_VERSION = 1.4e -AUTOSSH_SITE = http://www.harding.motd.ca/autossh -AUTOSSH_SOURCE = autossh-$(AUTOSSH_VERSION).tgz -AUTOSSH_LICENSE = Modified BSD -AUTOSSH_LICENSE_FILES = autossh.c - -# Bundled ./configure is not up-to-date with what is in configure.ac -AUTOSSH_AUTORECONF = YES - -AUTOSSH_CONF_OPTS = --with-ssh=/usr/bin/ssh - -define AUTOSSH_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/autossh $(TARGET_DIR)/usr/bin/autossh -endef - -$(eval $(autotools-package)) diff --git a/package.bak/avahi/Config.in b/package.bak/avahi/Config.in deleted file mode 100644 index a6b4ac83f1..0000000000 --- a/package.bak/avahi/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -config BR2_PACKAGE_AVAHI - bool "avahi" - # libdaemon uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Avahi is a system which facilitates service - discovery on a local network. - - http://www.avahi.org/ - -if BR2_PACKAGE_AVAHI - -config BR2_PACKAGE_AVAHI_AUTOIPD - bool "IPv4LL network address configuration daemon" - default y - select BR2_PACKAGE_LIBDAEMON - help - Avahi-autoipd implements IPv4LL, "Dynamic Configuration of - IPv4 Link-Local Addresses" (IETF RFC3927), a protocol for - automatic IP address configuration from the link-local - 169.254.0.0/16 range without the need for a central server. - It is primarily intended to be used in ad-hoc networks which - lack a DHCP server. - -config BR2_PACKAGE_AVAHI_DAEMON - bool "mDNS/DNS-SD daemon" - select BR2_PACKAGE_LIBDAEMON - select BR2_PACKAGE_EXPAT - help - The Avahi mDNS/DNS-SD daemon implementing Apple's ZeroConf - architecture (also known as "Rendezvous" or "Bonjour"). - The daemon registers local IP addresses and services using - mDNS/DNS-SD. - -config BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY - bool "libdns_sd compatibility (Bonjour)" - depends on BR2_PACKAGE_AVAHI_DAEMON - select BR2_PACKAGE_DBUS - help - Enable the libdns_sd (Bonjour) compatibility library support - for legacy applications. - -endif - -comment "avahi needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/avahi/S05avahi-setup.sh b/package.bak/avahi/S05avahi-setup.sh deleted file mode 100755 index 90ccbceacc..0000000000 --- a/package.bak/avahi/S05avahi-setup.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case "$1" in - start|"") - if [ ! -d /tmp/avahi-autoipd ]; then - rm -rf /tmp/avahi-autoipd - mkdir /tmp/avahi-autoipd - chown avahi.avahi /tmp/avahi-autoipd - fi - ;; - stop) ;; - *) - echo "Usage: S05avahi-setup.sh {start|stop}" >&2 - exit 1 - ;; -esac diff --git a/package.bak/avahi/S50avahi-daemon b/package.bak/avahi/S50avahi-daemon deleted file mode 100755 index 81ac51316e..0000000000 --- a/package.bak/avahi/S50avahi-daemon +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# avahi-daemon init script - -DAEMON=/usr/sbin/avahi-daemon -case "$1" in - start) - $DAEMON -c || $DAEMON -D - ;; - stop) - $DAEMON -c && $DAEMON -k - ;; - reload) - $DAEMON -c && $DAEMON -r - ;; - *) - echo "Usage: S50avahi-daemon {start|stop|reload}" >&2 - exit 1 - ;; -esac diff --git a/package.bak/avahi/avahi.hash b/package.bak/avahi/avahi.hash deleted file mode 100644 index 09c5d42433..0000000000 --- a/package.bak/avahi/avahi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d54991185d514a0aba54ebeb408d7575b60f5818a772e28fa0e18b98bc1db454 avahi-0.6.32.tar.gz diff --git a/package.bak/avahi/avahi.mk b/package.bak/avahi/avahi.mk deleted file mode 100644 index 069b45a96d..0000000000 --- a/package.bak/avahi/avahi.mk +++ /dev/null @@ -1,233 +0,0 @@ -################################################################################ -# -# avahi -# -################################################################################ - -# -# This program is free software; you can redistribute it -# and/or modify it under the terms of the GNU Lesser General -# Public License as published by the Free Software Foundation -# either version 2.1 of the License, or (at your option) any -# later version. - -AVAHI_VERSION = 0.6.32 -AVAHI_SITE = https://github.com/lathiat/avahi/releases/download/v$(AVAHI_VERSION) -AVAHI_LICENSE = LGPLv2.1+ -AVAHI_LICENSE_FILES = LICENSE -AVAHI_INSTALL_STAGING = YES - -AVAHI_CONF_ENV = \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - avahi_cv_sys_cxx_works=yes \ - DATADIRNAME=share - -# Note: even if we have Gtk2 and Gtk3 support in Buildroot, we -# explicitly disable support for them, in order to avoid the following -# circular dependencies: -# -# avahi -> libglade -> libgtk2 -> cups -> avahi -# avahi -> libgtk3 -> cups -> avahi -# -# Since Gtk2 and Gtk3 in Avahi are only used for some example/demo -# programs, we decided to disable their support to solve the circular -# dependency. -AVAHI_CONF_OPTS = \ - --disable-qt3 \ - --disable-qt4 \ - --disable-gtk \ - --disable-gtk3 \ - --disable-gdbm \ - --disable-pygtk \ - --disable-mono \ - --disable-monodoc \ - --disable-stack-protector \ - --with-distro=none \ - --disable-manpages \ - $(if $(BR2_PACKAGE_AVAHI_AUTOIPD),--enable,--disable)-autoipd \ - --with-avahi-user=avahi \ - --with-avahi-group=avahi \ - --with-autoipd-user=avahi \ - --with-autoipd-group=avahi - -AVAHI_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-intltool \ - host-pkgconf host-gettext - -AVAHI_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -AVAHI_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system -else -AVAHI_CONF_OPTS += --with-systemdsystemunitdir=no -AVAHI_CFLAGS += -DDISABLE_SYSTEMD -endif - -ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) -AVAHI_DEPENDENCIES += libdaemon -else -AVAHI_CONF_OPTS += --disable-libdaemon -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -AVAHI_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) -AVAHI_DEPENDENCIES += expat -AVAHI_CONF_OPTS += --with-xml=expat -else -AVAHI_CONF_OPTS += --with-xml=none -endif - -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) -AVAHI_CONF_OPTS += --enable-compat-libdns_sd -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -AVAHI_DEPENDENCIES += dbus -else -AVAHI_CONF_OPTS += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -AVAHI_DEPENDENCIES += libglib2 -else -AVAHI_CONF_OPTS += --disable-glib --disable-gobject -endif - -ifeq ($(BR2_PACKAGE_PYTHON),y) -AVAHI_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - am_cv_path_PYTHON=$(PYTHON_TARGET_BINARY) \ - 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 \ - py_cv_mod_socket_=yes - -AVAHI_DEPENDENCIES += python -AVAHI_CONF_OPTS += --enable-python -else -AVAHI_CONF_OPTS += --disable-python -endif - -ifeq ($(BR2_PACKAGE_DBUS_PYTHON),y) -AVAHI_CONF_OPTS += --enable-python-dbus -AVAHI_CONF_ENV += py_cv_mod_dbus_=yes -AVAHI_DEPENDENCIES += dbus-python -else -AVAHI_CONF_OPTS += --disable-python-dbus -endif - -AVAHI_CONF_ENV += CFLAGS="$(AVAHI_CFLAGS)" - -AVAHI_MAKE_OPTS += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl) - -define AVAHI_USERS - avahi -1 avahi -1 * - - - -endef - -define AVAHI_REMOVE_INITSCRIPT - rm -rf $(TARGET_DIR)/etc/init.d/avahi-* -endef - -AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_REMOVE_INITSCRIPT - -ifeq ($(BR2_PACKAGE_AVAHI_AUTOIPD),y) -define AVAHI_INSTALL_AUTOIPD - rm -f $(TARGET_DIR)/var/lib/avahi-autoipd - $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/lib - ln -sf /tmp/avahi-autoipd $(TARGET_DIR)/var/lib/avahi-autoipd -endef - -define AVAHI_INSTALL_AUTOIPD_INIT_SYSV - $(INSTALL) -D -m 0755 package/avahi/S05avahi-setup.sh $(TARGET_DIR)/etc/init.d/S05avahi-setup.sh -endef - -AVAHI_POST_INSTALL_TARGET_HOOKS += AVAHI_INSTALL_AUTOIPD -endif - -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON),y) - -define AVAHI_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/avahi-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-daemon.service - - ln -fs ../../../../usr/lib/systemd/system/avahi-dnsconfd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/avahi-dnsconfd.service - - $(INSTALL) -D -m 644 package/avahi/avahi_tmpfiles.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/avahi.conf -endef - -define AVAHI_INSTALL_DAEMON_INIT_SYSV - $(INSTALL) -D -m 0755 package/avahi/S50avahi-daemon $(TARGET_DIR)/etc/init.d/S50avahi-daemon -endef - -endif - -define AVAHI_INSTALL_INIT_SYSV - $(AVAHI_INSTALL_AUTOIPD_INIT_SYSV) - $(AVAHI_INSTALL_DAEMON_INIT_SYSV) -endef - -ifeq ($(BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY),y) -# applications expects to be able to #include -define AVAHI_STAGING_INSTALL_LIBDNSSD_LINK - ln -sf avahi-compat-libdns_sd/dns_sd.h \ - $(STAGING_DIR)/usr/include/dns_sd.h -endef - -AVAHI_POST_INSTALL_STAGING_HOOKS += AVAHI_STAGING_INSTALL_LIBDNSSD_LINK -endif - -$(eval $(autotools-package)) diff --git a/package.bak/avahi/avahi_tmpfiles.conf b/package.bak/avahi/avahi_tmpfiles.conf deleted file mode 100644 index f9aebdfd0d..0000000000 --- a/package.bak/avahi/avahi_tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /tmp/avahi-autopid 0755 avahi avahi diff --git a/package.bak/avrdude/Config.in b/package.bak/avrdude/Config.in deleted file mode 100644 index 8aca841282..0000000000 --- a/package.bak/avrdude/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_AVRDUDE - bool "avrdude" - select BR2_PACKAGE_ELFUTILS - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - select BR2_PACKAGE_NCURSES - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # elfutils - depends on !BR2_STATIC_LIBS # elfutils - depends on !BR2_bfin # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - help - avrdude is a programmer for Atmel AVR microcontrollers - this package provides a version with new linuxspi driver - - https://github.com/kcuzner/avrdude - -comment "avrdude needs a uClibc or glibc toolchain w/ threads, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - depends on !BR2_bfin diff --git a/package.bak/avrdude/avrdude.hash b/package.bak/avrdude/avrdude.hash deleted file mode 100644 index b2c6125908..0000000000 --- a/package.bak/avrdude/avrdude.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b32128f4812d5e852cfba2e863d950ec30e0f72f09bc14fb41c02528bbc5dd18 avrdude-ad04c429a90f4c34f000ea4ae11db2705915a31f.tar.gz diff --git a/package.bak/avrdude/avrdude.mk b/package.bak/avrdude/avrdude.mk deleted file mode 100644 index 27a74de164..0000000000 --- a/package.bak/avrdude/avrdude.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# avrdude -# -################################################################################ - -AVRDUDE_VERSION = ad04c429a90f4c34f000ea4ae11db2705915a31f -AVRDUDE_SITE = $(call github,kcuzner,avrdude,$(AVRDUDE_VERSION)) -AVRDUDE_LICENSE = GPLv2+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING -AVRDUDE_SUBDIR = avrdude -# Sources coming from git, without generated configure and Makefile.in -# files. -AVRDUDE_AUTORECONF = YES -AVRDUDE_DEPENDENCIES = elfutils libusb libusb-compat ncurses \ - host-flex host-bison -AVRDUDE_LICENSE = GPLv2+ -AVRDUDE_LICENSE_FILES = avrdude/COPYING - -ifeq ($(BR2_PACKAGE_LIBFTDI1),y) -AVRDUDE_DEPENDENCIES += libftdi1 -else ifeq ($(BR2_PACKAGE_LIBFTDI),y) -AVRDUDE_DEPENDENCIES += libftdi -endif - -# if /etc/avrdude.conf exists, the installation process creates a -# backup file, which we do not want in the context of Buildroot. -define AVRDUDE_REMOVE_BACKUP_FILE - $(RM) -f $(TARGET_DIR)/etc/avrdude.conf.bak -endef - -AVRDUDE_POST_INSTALL_TARGET_HOOKS += AVRDUDE_REMOVE_BACKUP_FILE - -$(eval $(autotools-package)) diff --git a/package.bak/axel/Config.in b/package.bak/axel/Config.in deleted file mode 100644 index aa93f2a11f..0000000000 --- a/package.bak/axel/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_AXEL - bool "axel" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on BR2_TOOLCHAIN_HAS_THREADS - help - HTTP/FTP download accelerator. - - http://axel.alioth.debian.org/ - -comment "axel needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/axel/axel.hash b/package.bak/axel/axel.hash deleted file mode 100644 index 8957670118..0000000000 --- a/package.bak/axel/axel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 359a57ab4e354bcb6075430d977c59d33eb3e2f1415a811948fa8ae657ca8036 axel-2.4.tar.gz diff --git a/package.bak/axel/axel.mk b/package.bak/axel/axel.mk deleted file mode 100644 index 6cf0fa8d75..0000000000 --- a/package.bak/axel/axel.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# axel -# -################################################################################ - -AXEL_VERSION = 2.4 -AXEL_SITE = http://sources.buildroot.net -AXEL_LICENSE = GPLv2+ -AXEL_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -AXEL_DEPENDENCIES += gettext -AXEL_LDFLAGS += -lintl -endif - -# -lintl may use symbols from -lpthread -AXEL_LDFLAGS += -lpthread - -ifneq ($(BR2_ENABLE_LOCALE),y) -AXEL_DISABLE_I18N = --i18n=0 -endif - -define AXEL_CONFIGURE_CMDS - (cd $(@D); \ - ./configure \ - --prefix=/usr \ - --debug=1 \ - $(AXEL_DISABLE_I18N) \ - ) -endef - -define AXEL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LFLAGS="$(TARGET_LDFLAGS) $(AXEL_LDFLAGS)" -C $(@D) -endef - -define AXEL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/axfsutils/0001-fix-cflags.patch b/package.bak/axfsutils/0001-fix-cflags.patch deleted file mode 100644 index 0415d82f45..0000000000 --- a/package.bak/axfsutils/0001-fix-cflags.patch +++ /dev/null @@ -1,19 +0,0 @@ -Makefile: complement CFLAGS provided by the user - -In some circumstances, the user may want to pass its own CFLAGS, -like for when the zlib headers are not located in the standard gcc -search paths. - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile ---- a/mkfs.axfs-legacy/Makefile -+++ b/mkfs.axfs-legacy/Makefile -@@ -1,5 +1,5 @@ --INC = -I./ --CFLAGS = -g $(INC) -O0 -+INC += -I./ -+CFLAGS += -g $(INC) -O0 - - MKFSOBJS = mkfs.axfs.o - diff --git a/package.bak/axfsutils/0002-use-ldflags.patch b/package.bak/axfsutils/0002-use-ldflags.patch deleted file mode 100644 index 20e03a9bb5..0000000000 --- a/package.bak/axfsutils/0002-use-ldflags.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile: use LDFLAGS as provided by the user - -In some circumstances, the user may want to pass some LDFLAGS, like --L flags to point to the zlib location if it was not installed in a -standard location. - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/mkfs.axfs-legacy/Makefile b/mkfs.axfs-legacy/Makefile ---- a/mkfs.axfs-legacy/Makefile -+++ b/mkfs.axfs-legacy/Makefile -@@ -6,7 +6,7 @@ - all: mkfs.axfs - - mkfs.axfs: $(MKFSOBJS) -- $(CC) $(CFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz -+ $(CC) $(CFLAGS) $(LDFLAGS) -o mkfs.axfs $(MKFSOBJS) -lz - - clean_mkfs.axfs: - rm -rf $(MKFSOBJS) mkfs.axfs diff --git a/package.bak/axfsutils/axfsutils.hash b/package.bak/axfsutils/axfsutils.hash deleted file mode 100644 index bde94a0b90..0000000000 --- a/package.bak/axfsutils/axfsutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 80dd97305b005262643e9fad04ec03b860430ea2c58666ce5b007897afbc9693 axfsutils-64886703fdff6cfc64eb20fbe7d7295bbeec867b.tar.gz diff --git a/package.bak/axfsutils/axfsutils.mk b/package.bak/axfsutils/axfsutils.mk deleted file mode 100644 index 1bd62809af..0000000000 --- a/package.bak/axfsutils/axfsutils.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# axfsutils -# -################################################################################ - -AXFSUTILS_VERSION = 64886703fdff6cfc64eb20fbe7d7295bbeec867b -AXFSUTILS_SITE = $(call github,jaredeh,axfs,$(AXFSUTILS_VERSION)) -AXFSUTILS_LICENSE = GPLv2 -AXFSUTILS_LICENSE_FILES = mkfs.axfs-legacy/COPYING -HOST_AXFSUTILS_DEPENDENCIES = host-zlib - -# The 'new' mkfs.axfs version requires GNUstep which is not a buildroot -# prerequisite. The 'legacy' one works just as well without that requirement. -define HOST_AXFSUTILS_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/mkfs.axfs-legacy -endef - -define HOST_AXFSUTILS_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/mkfs.axfs-legacy/mkfs.axfs \ - $(HOST_DIR)/usr/bin/mkfs.axfs -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/b43-firmware/Config.in b/package.bak/b43-firmware/Config.in deleted file mode 100644 index bc69bbcbed..0000000000 --- a/package.bak/b43-firmware/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_B43_FIRMWARE - bool "b43-firmware" - help - Firmware for the Broadcom Wifi devices supported by the b43 - kernel driver. - -if BR2_PACKAGE_B43_FIRMWARE - -choice - prompt "Kernel version" - default BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2 - help - Select the kernel version you're using. The b43 driver in - kernel >= 3.2 need a different firmware than the b43 drivers - from kernel < 3.2. - - config BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2 - bool ">= 3.2" - - config BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2 - bool "< 3.2" - -endchoice - -endif diff --git a/package.bak/b43-firmware/b43-firmware.hash b/package.bak/b43-firmware/b43-firmware.hash deleted file mode 100644 index efc1a6cf0f..0000000000 --- a/package.bak/b43-firmware/b43-firmware.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 f1e7067aac5b62b67b8b6e4c517990277804339ac16065eb13c731ff909ae46f broadcom-wl-5.100.138.tar.bz2 -sha256 26a8c370f48fc129d0731cfd751c36cae1419b0bc8ca35781126744e60eae009 broadcom-wl-5.10.56.27.3_mipsel.tar.bz2 diff --git a/package.bak/b43-firmware/b43-firmware.mk b/package.bak/b43-firmware/b43-firmware.mk deleted file mode 100644 index 601ab6661c..0000000000 --- a/package.bak/b43-firmware/b43-firmware.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# b43-firmware -# -################################################################################ - -ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_AFTER_3_2),y) -B43_FIRMWARE_VERSION = 5.100.138 -B43_FIRMWARE_SITE = http://www.lwfinger.com/b43-firmware -B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION).tar.bz2 -B43_FIRMWARE_DRIVER_FILE = linux/wl_apsta.o -else ifeq ($(BR2_PACKAGE_B43_FIRMWARE_KERNEL_BEFORE_3_2),y) -B43_FIRMWARE_VERSION = 5.10.56.27.3 -B43_FIRMWARE_SITE = http://mirror2.openwrt.org/sources -B43_FIRMWARE_SOURCE = broadcom-wl-$(B43_FIRMWARE_VERSION)_mipsel.tar.bz2 -B43_FIRMWARE_DRIVER_FILE = driver/wl_apsta/wl_prebuilt.o -endif - -B43_FIRMWARE_LICENSE = PROPRIETARY -B43_FIRMWARE_REDISTRIBUTE = NO - -B43_FIRMWARE_DEPENDENCIES = host-b43-fwcutter - -define B43_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/ - $(HOST_DIR)/usr/bin/b43-fwcutter -w $(TARGET_DIR)/lib/firmware/ $(@D)/$(B43_FIRMWARE_DRIVER_FILE) -endef - -$(eval $(generic-package)) diff --git a/package.bak/b43-fwcutter/b43-fwcutter.hash b/package.bak/b43-fwcutter/b43-fwcutter.hash deleted file mode 100644 index 3181c76960..0000000000 --- a/package.bak/b43-fwcutter/b43-fwcutter.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 4c6a53d1f5d76b8aa224d294bee47726b1477f35327f4e23e8cb799865e0f6eb b43-fwcutter-015.tar.bz2 diff --git a/package.bak/b43-fwcutter/b43-fwcutter.mk b/package.bak/b43-fwcutter/b43-fwcutter.mk deleted file mode 100644 index d264b64940..0000000000 --- a/package.bak/b43-fwcutter/b43-fwcutter.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# b43-fwcutter -# -################################################################################ - -B43_FWCUTTER_VERSION = 015 -B43_FWCUTTER_SITE = http://bues.ch/b43/fwcutter -B43_FWCUTTER_SOURCE = b43-fwcutter-$(B43_FWCUTTER_VERSION).tar.bz2 -B43_FWCUTTER_LICENSE = BSD-2c -B43_FWCUTTER_LICENSE_FILES = COPYING - -define HOST_B43_FWCUTTER_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define HOST_B43_FWCUTTER_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/b43-fwcutter $(HOST_DIR)/usr/bin/b43-fwcutter -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch b/package.bak/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch deleted file mode 100644 index efadd2038a..0000000000 --- a/package.bak/babeld/0001-kernel_netlink.c-don-t-include-linux-if_bridge.h.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 723bbfd8bdb76012a3da937c7499cf3c0b111dd5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 20 Aug 2016 11:13:56 +0200 -Subject: [PATCH] kernel_netlink.c: don't include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Including causes the inclusion of , -which defines 'struct in6_addr', also defined in , causing -a build failure with the musl C library: - -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:32:8: error: redefinition of ‘struct in6_addr’ - struct in6_addr { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:23:8: note: originally defined here - struct in6_addr { - ^ -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:49:8: error: redefinition of ‘struct sockaddr_in6’ - struct sockaddr_in6 { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:34:8: note: originally defined here - struct sockaddr_in6 { - ^ -In file included from /home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/if_bridge.h:18:0, - from kernel_netlink.c:42, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/linux/in6.h:59:8: error: redefinition of ‘struct ipv6_mreq’ - struct ipv6_mreq { - ^ -In file included from kernel_netlink.c:33:0, - from kernel.c:31: -/home/thomas/projets/buildroot/output/host/usr/x86_64-buildroot-linux-musl/sysroot/usr/include/netinet/in.h:42:8: note: originally defined here - struct ipv6_mreq { - ^ - -In order to address this, this patch removes the -inclusion, and instead defines BRCTL_GET_BRIDGES to the appropriate -value if it's not provided by the C library. - -Signed-off-by: Thomas Petazzoni ---- - kernel_netlink.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/kernel_netlink.c b/kernel_netlink.c -index 4eadc39..1a5b3dd 100644 ---- a/kernel_netlink.c -+++ b/kernel_netlink.c -@@ -39,10 +39,14 @@ THE SOFTWARE. - #include - #include - #include --#include - #include - #include - -+/* From */ -+#ifndef BRCTL_GET_BRIDGES -+#define BRCTL_GET_BRIDGES 1 -+#endif -+ - #if(__GLIBC__ < 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ <= 5) - #define RTA_TABLE 15 - #endif --- -2.7.4 - diff --git a/package.bak/babeld/Config.in b/package.bak/babeld/Config.in deleted file mode 100644 index 5d08c0842a..0000000000 --- a/package.bak/babeld/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BABELD - bool "babeld" - depends on BR2_USE_MMU # fork() - help - Babel is a loop-avoiding distance-vector routing protocol for IPv6 - and IPv4 with fast convergence properties. - - http://www.pps.univ-paris-diderot.fr/~jch/software/babel/ diff --git a/package.bak/babeld/S50babeld b/package.bak/babeld/S50babeld deleted file mode 100644 index c75b4c378a..0000000000 --- a/package.bak/babeld/S50babeld +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Starts babeld. -# - -# Allow a few customizations from a config file -test -r /etc/default/babeld && . /etc/default/babeld - -start() { - printf "Starting babeld: " - start-stop-daemon -S -q -p /run/babeld.pid \ - --exec /usr/sbin/babeld -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping babeld: " - start-stop-daemon -K -q -p /run/babeld.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/babeld/babeld.hash b/package.bak/babeld/babeld.hash deleted file mode 100644 index 0ee64c4f9c..0000000000 --- a/package.bak/babeld/babeld.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2c955e7d4ad971da1e860e5cedbaf1dd79903468ff6488b3f67102b2a8d087b6 babeld-1.7.1.tar.gz diff --git a/package.bak/babeld/babeld.mk b/package.bak/babeld/babeld.mk deleted file mode 100644 index d718237d98..0000000000 --- a/package.bak/babeld/babeld.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# babeld -# -################################################################################ - -BABELD_VERSION = 1.7.1 -BABELD_SITE = http://www.pps.univ-paris-diderot.fr/~jch/software/files -BABELD_LICENSE = MIT -BABELD_LICENSE_FILES = LICENCE - -define BABELD_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define BABELD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/babeld $(TARGET_DIR)/usr/sbin/babeld -endef - -define BABELD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/babeld/S50babeld \ - $(TARGET_DIR)/etc/init.d/S50babeld -endef - -define BABELD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/babeld/babeld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/babeld.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/babeld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/babeld.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/babeld/babeld.service b/package.bak/babeld/babeld.service deleted file mode 100644 index abe72a8cd0..0000000000 --- a/package.bak/babeld/babeld.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Babel daemon - -[Service] -EnvironmentFile=-/etc/default/babeld -ExecStart=/usr/sbin/babeld $DAEMON_ARGS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/bandwidthd/Config.in b/package.bak/bandwidthd/Config.in deleted file mode 100644 index b4a47f2ec6..0000000000 --- a/package.bak/bandwidthd/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -config BR2_PACKAGE_BANDWIDTHD - bool "bandwidthd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_GD - help - BandwidthD - Bandwidth monitoring - - Provides a method to measure the bandwidth that travels - through the machine, grouped by subnet and IP. This - information can be stored locally in /var/lib/bandwidthd and - can be configured to generate static HTML pages which can be - hosted by a web server. - - It is highly recommended that the target has some way of - retaining the time between reboots. (e.g. NTP on boot or an - RTC) - - It is suggested to use sqlite for logfile storage but works - fine without, and can be completely ignored if the - postgresql portion is used. - - As upstream is no longer actively maintained, a fork is - available on github that works on making BandwidthD's build - process more compatible with buildroot's. - - Upstream: http://bandwidthd.sourceforge.net/ - Github fork: http://github.com/nroach44/bandwidthd - -if BR2_PACKAGE_BANDWIDTHD - -config BR2_PACKAGE_BANDWIDTHD_POSTGRESQL - bool "enable postgresql log target support" - select BR2_PACKAGE_POSTGRESQL - depends on !BR2_STATIC_LIBS - help - Enable support for logging the bandwidthd data to a remote - (or local) postgresql server. This data can then be viewed - through a php site. See README in the source code - (github.com/nroach44/bandwidthd) for more information. - -comment "postgresql support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_BANDWIDTHD_SQLITE3 - bool "enable sqlite3 log storage" - select BR2_PACKAGE_SQLITE - help - Enable support for storing the aggregated data in an sqlite - db instead of a plain text file. - -endif diff --git a/package.bak/bandwidthd/bandwidthd.hash b/package.bak/bandwidthd/bandwidthd.hash deleted file mode 100644 index 248f9ff961..0000000000 --- a/package.bak/bandwidthd/bandwidthd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0270d0def6cc53c8d47d59a9dd093d51fbca1620adeef85c15e35a32010e26ab bandwidthd-v2.0.1-auto-r11.tar.gz diff --git a/package.bak/bandwidthd/bandwidthd.mk b/package.bak/bandwidthd/bandwidthd.mk deleted file mode 100644 index 2773490428..0000000000 --- a/package.bak/bandwidthd/bandwidthd.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# bandwidthd -# -################################################################################ - -BANDWIDTHD_VERSION = v2.0.1-auto-r11 -BANDWIDTHD_SITE = $(call github,nroach44,bandwidthd,$(BANDWIDTHD_VERSION)) - -# Specified as "any version of the GPL that is current as of your -# download" by upstream. -BANDWIDTHD_LICENSE = GPL - -BANDWIDTHD_DEPENDENCIES = gd libpng libpcap host-pkgconf - -BANDWIDTHD_AUTORECONF = YES - -BANDWIDTHD_CONF_OPTS += --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config - -ifeq ($(BR2_PACKAGE_BANDWIDTHD_POSTGRESQL),y) -BANDWIDTHD_DEPENDENCIES += postgresql -BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=true -else -BANDWIDTHD_CONF_OPTS += --with-postgresql-logging=false -endif - -ifeq ($(BR2_PACKAGE_BANDWIDTHD_SQLITE3),y) -BANDWIDTHD_DEPENDENCIES += sqlite -BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=true -else -BANDWIDTHD_CONF_OPTS += --with-sqlite-storage=false -endif - -define BANDWIDTHD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/bandwidthd/bandwidthd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/bandwidthd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/bandwidthd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/bandwidthd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/bandwidthd/bandwidthd.service b/package.bak/bandwidthd/bandwidthd.service deleted file mode 100644 index 9c03d42946..0000000000 --- a/package.bak/bandwidthd/bandwidthd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Bandwidth usage monitor and reporter -After=network.target - -[Service] -Type=forking -ExecStart=/usr/bin/bandwidthd -PIDFile=/var/run/bandwidthd.pid - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/bash/Config.in b/package.bak/bash/Config.in deleted file mode 100644 index 783e4b38b5..0000000000 --- a/package.bak/bash/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_BASH - bool "bash" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - # uses fork() - depends on BR2_USE_MMU - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - The standard GNU Bourne again shell. - - http://tiswww.case.edu/php/chet/bash/bashtop.html diff --git a/package.bak/bash/bash.hash b/package.bak/bash/bash.hash deleted file mode 100644 index adbd60868a..0000000000 --- a/package.bak/bash/bash.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb bash-4.4.tar.gz diff --git a/package.bak/bash/bash.mk b/package.bak/bash/bash.mk deleted file mode 100644 index 090cf5224c..0000000000 --- a/package.bak/bash/bash.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# bash -# -################################################################################ - -BASH_VERSION = 4.4 -BASH_SITE = $(BR2_GNU_MIRROR)/bash -# Build after since bash is better than busybox shells -BASH_DEPENDENCIES = ncurses readline host-bison \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) -BASH_CONF_OPTS = --with-installed-readline -BASH_LICENSE = GPLv3+ -BASH_LICENSE_FILES = COPYING - -BASH_CONF_ENV += \ - ac_cv_rl_prefix="$(STAGING_DIR)" \ - ac_cv_rl_version="$(READLINE_VERSION)" \ - bash_cv_getcwd_malloc=yes \ - bash_cv_job_control_missing=present \ - bash_cv_sys_named_pipes=present \ - bash_cv_func_sigsetjmp=present \ - bash_cv_printf_a_format=yes - -# The static build needs some trickery -ifeq ($(BR2_STATIC_LIBS),y) -BASH_CONF_OPTS += --enable-static-link --without-bash-malloc -# bash wants to redefine the getenv() function. To check whether this is -# possible, AC_TRY_RUN is used which is not possible in -# cross-compilation. -# On uClibc, redefining getenv is not possible; on glibc and musl it is. -# Related: -# http://lists.gnu.org/archive/html/bug-bash/2012-03/msg00052.html -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -BASH_CONF_ENV += bash_cv_getenv_redef=no -else -BASH_CONF_ENV += bash_cv_getenv_redef=yes -endif -endif - -# Make /bin/sh -> bash (no other shell, better than busybox shells) -define BASH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) exec_prefix=/ install - rm -f $(TARGET_DIR)/bin/bashbug -endef - -$(eval $(autotools-package)) diff --git a/package.bak/bash/bash44-001.patch b/package.bak/bash/bash44-001.patch deleted file mode 100644 index 842aea4313..0000000000 --- a/package.bak/bash/bash44-001.patch +++ /dev/null @@ -1,64 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-001 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-001 - -Bug-Reported-by: Sean Zha -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00107.html - -Bug-Description: - -Bash-4.4 changed the way the history list is initially allocated to reduce -the number of reallocations and copies. Users who set HISTSIZE to a very -large number to essentially unlimit the size of the history list will get -memory allocation errors - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/lib/readline/history.c 2015-12-28 13:50:31.000000000 -0500 ---- b/lib/readline/history.c 2016-09-30 14:28:40.000000000 -0400 -*************** -*** 58,61 **** ---- 58,63 ---- - #define DEFAULT_HISTORY_INITIAL_SIZE 502 - -+ #define MAX_HISTORY_INITIAL_SIZE 8192 -+ - /* The number of slots to increase the_history by. */ - #define DEFAULT_HISTORY_GROW_SIZE 50 -*************** -*** 308,312 **** - { - if (history_stifled && history_max_entries > 0) -! history_size = history_max_entries + 2; - else - history_size = DEFAULT_HISTORY_INITIAL_SIZE; ---- 310,316 ---- - { - if (history_stifled && history_max_entries > 0) -! history_size = (history_max_entries > MAX_HISTORY_INITIAL_SIZE) -! ? MAX_HISTORY_INITIAL_SIZE -! : history_max_entries + 2; - else - history_size = DEFAULT_HISTORY_INITIAL_SIZE; -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 0 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-002.patch b/package.bak/bash/bash44-002.patch deleted file mode 100644 index 6f4a809fb2..0000000000 --- a/package.bak/bash/bash44-002.patch +++ /dev/null @@ -1,73 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-002 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-002 - -Bug-Reported-by: Eric Pruitt -Bug-Reference-ID: <20160916055120.GA28272@sinister.codevat.com> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-09/msg00015.html - -Bug-Description: - -Bash-4.4 warns when discarding NUL bytes in command substitution output -instead of silently dropping them. This patch changes the warnings from -one per NUL byte encountered to one warning per command substitution. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2016-09-26 10:20:19.000000000 -0400 -*************** -*** 5932,5935 **** ---- 5933,5937 ---- - int istring_index, istring_size, c, tflag, skip_ctlesc, skip_ctlnul; - ssize_t bufn; -+ int nullbyte; - - istring = (char *)NULL; -*************** -*** 5939,5942 **** ---- 5941,5946 ---- - skip_ctlesc |= *s == CTLESC, skip_ctlnul |= *s == CTLNUL; - -+ nullbyte = 0; -+ - /* Read the output of the command through the pipe. This may need to be - changed to understand multibyte characters in the future. */ -*************** -*** 5957,5961 **** - { - #if 1 -! internal_warning ("%s", _("command substitution: ignored null byte in input")); - #endif - continue; ---- 5961,5969 ---- - { - #if 1 -! if (nullbyte == 0) -! { -! internal_warning ("%s", _("command substitution: ignored null byte in input")); -! nullbyte = 1; -! } - #endif - continue; -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 1 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-003.patch b/package.bak/bash/bash44-003.patch deleted file mode 100644 index cdfc206f8a..0000000000 --- a/package.bak/bash/bash44-003.patch +++ /dev/null @@ -1,62 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-003 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-003 - -Bug-Reported-by: op7ic \x00 -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00005.html - -Bug-Description: - -Specially-crafted input, in this case an incomplete pathname expansion -bracket expression containing an invalid collating symbol, can cause the -shell to crash. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/lib/glob/sm_loop.c 2016-04-10 11:23:21.000000000 -0400 ---- b/lib/glob/sm_loop.c 2016-11-02 14:03:34.000000000 -0400 -*************** -*** 331,334 **** ---- 331,340 ---- - if (p[pc] == L('.') && p[pc+1] == L(']')) - break; -+ if (p[pc] == 0) -+ { -+ if (vp) -+ *vp = INVALID; -+ return (p + pc); -+ } - val = COLLSYM (p, pc); - if (vp) -*************** -*** 484,487 **** ---- 490,496 ---- - c = FOLD (c); - -+ if (c == L('\0')) -+ return ((test == L('[')) ? savep : (CHAR *)0); -+ - if ((flags & FNM_PATHNAME) && c == L('/')) - /* [/] can never match when matching a pathname. */ -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 2 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-004.patch b/package.bak/bash/bash44-004.patch deleted file mode 100644 index ba6ff62689..0000000000 --- a/package.bak/bash/bash44-004.patch +++ /dev/null @@ -1,88 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-004 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-004 - -Bug-Reported-by: Christian Weisgerber -Bug-Reference-ID: <20161101160302.GB54856@lorvorc.mips.inka.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00004.html - -Bug-Description: - -There is a race condition that can result in bash referencing freed memory -when freeing data associated with the last process substitution. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/jobs.c 2016-08-23 16:38:44.000000000 -0400 ---- b/jobs.c 2016-11-02 18:24:45.000000000 -0400 -*************** -*** 454,457 **** ---- 454,472 ---- - } - -+ void -+ discard_last_procsub_child () -+ { -+ PROCESS *disposer; -+ sigset_t set, oset; -+ -+ BLOCK_CHILD (set, oset); -+ disposer = last_procsub_child; -+ last_procsub_child = (PROCESS *)NULL; -+ UNBLOCK_CHILD (oset); -+ -+ if (disposer) -+ discard_pipeline (disposer); -+ } -+ - struct pipeline_saver * - alloc_pipeline_saver () -*** a/bash-4.4/jobs.h 2016-04-27 10:35:51.000000000 -0400 ---- b/jobs.h 2016-11-02 18:25:08.000000000 -0400 -*************** -*** 191,194 **** ---- 191,195 ---- - extern void stop_making_children __P((void)); - extern void cleanup_the_pipeline __P((void)); -+ extern void discard_last_procsub_child __P((void)); - extern void save_pipeline __P((int)); - extern PROCESS *restore_pipeline __P((int)); -*** a/bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2016-11-02 18:23:24.000000000 -0400 -*************** -*** 5809,5816 **** - #if defined (JOB_CONTROL) - if (last_procsub_child) -! { -! discard_pipeline (last_procsub_child); -! last_procsub_child = (PROCESS *)NULL; -! } - last_procsub_child = restore_pipeline (0); - #endif ---- 5834,5838 ---- - #if defined (JOB_CONTROL) - if (last_procsub_child) -! discard_last_procsub_child (); - last_procsub_child = restore_pipeline (0); - #endif -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 3 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-005.patch b/package.bak/bash/bash44-005.patch deleted file mode 100644 index 0278e31dfb..0000000000 --- a/package.bak/bash/bash44-005.patch +++ /dev/null @@ -1,51 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-005 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-005 - -Bug-Reported-by: Dr. Werner Fink -Bug-Reference-ID: <20161107100936.ajnojd7dspirdflf@noether.suse.de> -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00054.html - -Bug-Description: - -Under certain circumstances, a simple command is optimized to eliminate a -fork, resulting in an EXIT trap not being executed. - -Patch (apply with `patch -p0'): - -*** a/bash-4.4/builtins/evalstring.c 2016-08-11 14:18:51.000000000 -0400 ---- b/builtins/evalstring.c 2016-11-08 15:05:07.000000000 -0500 -*************** -*** 105,114 **** - *bash_input.location.string == '\0' && - command->type == cm_simple && -- #if 0 - signal_is_trapped (EXIT_TRAP) == 0 && - signal_is_trapped (ERROR_TRAP) == 0 && -- #else - any_signals_trapped () < 0 && -- #endif - command->redirects == 0 && command->value.Simple->redirects == 0 && - ((command->flags & CMD_TIME_PIPELINE) == 0) && ---- 105,111 ---- -*** a/bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 4 - - #endif /* _PATCHLEVEL_H_ */ ---- 26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-006.patch b/package.bak/bash/bash44-006.patch deleted file mode 100644 index ba58ed40c3..0000000000 --- a/package.bak/bash/bash44-006.patch +++ /dev/null @@ -1,63 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-006 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-006 - -Bug-Reported-by: -Bug-Reference-ID: -Bug-Reference-URL: - -Bug-Description: - -Out-of-range negative offsets to popd can cause the shell to crash attempting -to free an invalid memory block. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/builtins/pushd.def 2016-01-25 13:31:49.000000000 -0500 ---- b/builtins/pushd.def 2016-10-28 10:46:49.000000000 -0400 -*************** -*** 366,370 **** - } - -! if (which > directory_list_offset || (directory_list_offset == 0 && which == 0)) - { - pushd_error (directory_list_offset, which_word ? which_word : ""); ---- b/366,370 ---- - } - -! if (which > directory_list_offset || (which < -directory_list_offset) || (directory_list_offset == 0 && which == 0)) - { - pushd_error (directory_list_offset, which_word ? which_word : ""); -*************** -*** 388,391 **** ---- b/388,396 ---- - of the list into place. */ - i = (direction == '+') ? directory_list_offset - which : which; -+ if (i < 0 || i > directory_list_offset) -+ { -+ pushd_error (directory_list_offset, which_word ? which_word : ""); -+ return (EXECUTION_FAILURE); -+ } - free (pushd_directory_list[i]); - directory_list_offset--; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 5 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-007.patch b/package.bak/bash/bash44-007.patch deleted file mode 100644 index 71e771d6cf..0000000000 --- a/package.bak/bash/bash44-007.patch +++ /dev/null @@ -1,155 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-007 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-007 - -Bug-Reported-by: Jens Heyens -Bug-Reference-ID: -Bug-Reference-URL: https://savannah.gnu.org/support/?109224 - -Bug-Description: - -When performing filename completion, bash dequotes the directory name being -completed, which can result in match failures and potential unwanted -expansion. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/bashline.c 2016-08-05 21:44:05.000000000 -0400 ---- b/bashline.c 2017-01-19 13:15:51.000000000 -0500 -*************** -*** 143,147 **** - static void restore_directory_hook __P((rl_icppfunc_t)); - -! static int directory_exists __P((const char *)); - - static void cleanup_expansion_error __P((void)); ---- b/144,148 ---- - static void restore_directory_hook __P((rl_icppfunc_t)); - -! static int directory_exists __P((const char *, int)); - - static void cleanup_expansion_error __P((void)); -*************** -*** 3103,3111 **** - } - -! /* Check whether not the (dequoted) version of DIRNAME, with any trailing slash -! removed, exists. */ - static int -! directory_exists (dirname) - const char *dirname; - { - char *new_dirname; ---- b/3107,3116 ---- - } - -! /* Check whether not DIRNAME, with any trailing slash removed, exists. If -! SHOULD_DEQUOTE is non-zero, we dequote the directory name first. */ - static int -! directory_exists (dirname, should_dequote) - const char *dirname; -+ int should_dequote; - { - char *new_dirname; -*************** -*** 3113,3118 **** - struct stat sb; - -! /* First, dequote the directory name */ -! new_dirname = bash_dequote_filename ((char *)dirname, rl_completion_quote_character); - dirlen = STRLEN (new_dirname); - if (new_dirname[dirlen - 1] == '/') ---- b/3118,3124 ---- - struct stat sb; - -! /* We save the string and chop the trailing slash because stat/lstat behave -! inconsistently if one is present. */ -! new_dirname = should_dequote ? bash_dequote_filename ((char *)dirname, rl_completion_quote_character) : savestring (dirname); - dirlen = STRLEN (new_dirname); - if (new_dirname[dirlen - 1] == '/') -*************** -*** 3146,3150 **** - should_expand_dirname = '`'; - -! if (should_expand_dirname && directory_exists (local_dirname)) - should_expand_dirname = 0; - ---- b/3152,3156 ---- - should_expand_dirname = '`'; - -! if (should_expand_dirname && directory_exists (local_dirname, 0)) - should_expand_dirname = 0; - -*************** -*** 3156,3160 **** - global_nounset = unbound_vars_is_error; - unbound_vars_is_error = 0; -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */ - unbound_vars_is_error = global_nounset; - if (wl) ---- b/3162,3166 ---- - global_nounset = unbound_vars_is_error; - unbound_vars_is_error = 0; -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */ - unbound_vars_is_error = global_nounset; - if (wl) -*************** -*** 3245,3249 **** - } - -! if (should_expand_dirname && directory_exists (local_dirname)) - should_expand_dirname = 0; - ---- b/3262,3266 ---- - } - -! if (should_expand_dirname && directory_exists (local_dirname, 1)) - should_expand_dirname = 0; - -*************** -*** 3251,3255 **** - { - new_dirname = savestring (local_dirname); -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_COMPLETE); /* does the right thing */ - if (wl) - { ---- b/3268,3272 ---- - { - new_dirname = savestring (local_dirname); -! wl = expand_prompt_string (new_dirname, 0, W_NOCOMSUB|W_NOPROCSUB|W_COMPLETE); /* does the right thing */ - if (wl) - { -*** bash-4.4/subst.c 2016-08-30 16:46:38.000000000 -0400 ---- b/subst.c 2017-01-19 07:09:57.000000000 -0500 -*************** -*** 9459,9462 **** ---- b/9459,9466 ---- - if (word->flags & W_COMPLETE) - tword->flags |= W_COMPLETE; /* for command substitutions */ -+ if (word->flags & W_NOCOMSUB) -+ tword->flags |= W_NOCOMSUB; -+ if (word->flags & W_NOPROCSUB) -+ tword->flags |= W_NOPROCSUB; - - temp = (char *)NULL; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 6 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-008.patch b/package.bak/bash/bash44-008.patch deleted file mode 100644 index 931033c5b7..0000000000 --- a/package.bak/bash/bash44-008.patch +++ /dev/null @@ -1,88 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-008 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-008 - -Bug-Reported-by: Koichi MURASE -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00050.html - -Bug-Description: - -Under certain circumstances, bash will evaluate arithmetic expressions as -part of reading an expression token even when evaluation is suppressed. This -happens while evaluating a conditional expression and skipping over the -failed branch of the expression. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/expr.c 2015-10-11 14:46:36.000000000 -0400 ---- b/expr.c 2016-11-08 11:55:46.000000000 -0500 -*************** -*** 579,585 **** - if (curtok == QUES) /* found conditional expr */ - { -- readtok (); -- if (curtok == 0 || curtok == COL) -- evalerror (_("expression expected")); - if (cval == 0) - { ---- b/579,582 ---- -*************** -*** 588,591 **** ---- b/585,592 ---- - } - -+ readtok (); -+ if (curtok == 0 || curtok == COL) -+ evalerror (_("expression expected")); -+ - val1 = EXP_HIGHEST (); - -*************** -*** 594,600 **** - if (curtok != COL) - evalerror (_("`:' expected for conditional expression")); -! readtok (); -! if (curtok == 0) -! evalerror (_("expression expected")); - set_noeval = 0; - if (cval) ---- b/595,599 ---- - if (curtok != COL) - evalerror (_("`:' expected for conditional expression")); -! - set_noeval = 0; - if (cval) -*************** -*** 604,608 **** ---- b/603,611 ---- - } - -+ readtok (); -+ if (curtok == 0) -+ evalerror (_("expression expected")); - val2 = expcond (); -+ - if (set_noeval) - noeval--; -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 7 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-009.patch b/package.bak/bash/bash44-009.patch deleted file mode 100644 index 3ba1b3fe0f..0000000000 --- a/package.bak/bash/bash44-009.patch +++ /dev/null @@ -1,111 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-009 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-009 - -Bug-Reported-by: Hong Cho -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-12/msg00043.html - -Bug-Description: - -There is a race condition in add_history() that can be triggered by a fatal -signal arriving between the time the history length is updated and the time -the history list update is completed. A later attempt to reference an -invalid history entry can cause a crash. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/lib/readline/history.c 2016-11-11 13:42:49.000000000 -0500 ---- b/lib/readline/history.c 2016-12-05 10:37:51.000000000 -0500 -*************** -*** 280,283 **** ---- b/280,284 ---- - { - HIST_ENTRY *temp; -+ int new_length; - - if (history_stifled && (history_length == history_max_entries)) -*************** -*** 296,306 **** - /* Copy the rest of the entries, moving down one slot. Copy includes - trailing NULL. */ -- #if 0 -- for (i = 0; i < history_length; i++) -- the_history[i] = the_history[i + 1]; -- #else - memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); -- #endif - - history_base++; - } ---- b/297,303 ---- - /* Copy the rest of the entries, moving down one slot. Copy includes - trailing NULL. */ - memmove (the_history, the_history + 1, history_length * sizeof (HIST_ENTRY *)); - -+ new_length = history_length; - history_base++; - } -*************** -*** 316,320 **** - history_size = DEFAULT_HISTORY_INITIAL_SIZE; - the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); -! history_length = 1; - } - else ---- b/313,317 ---- - history_size = DEFAULT_HISTORY_INITIAL_SIZE; - the_history = (HIST_ENTRY **)xmalloc (history_size * sizeof (HIST_ENTRY *)); -! new_length = 1; - } - else -*************** -*** 326,330 **** - xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); - } -! history_length++; - } - } ---- b/323,327 ---- - xrealloc (the_history, history_size * sizeof (HIST_ENTRY *)); - } -! new_length = history_length + 1; - } - } -*************** -*** 332,337 **** - temp = alloc_history_entry ((char *)string, hist_inittime ()); - -! the_history[history_length] = (HIST_ENTRY *)NULL; -! the_history[history_length - 1] = temp; - } - ---- b/329,335 ---- - temp = alloc_history_entry ((char *)string, hist_inittime ()); - -! the_history[new_length] = (HIST_ENTRY *)NULL; -! the_history[new_length - 1] = temp; -! history_length = new_length; - } - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 8 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-010.patch b/package.bak/bash/bash44-010.patch deleted file mode 100644 index 8da1ec5bea..0000000000 --- a/package.bak/bash/bash44-010.patch +++ /dev/null @@ -1,53 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-010 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-010 - -Bug-Reported-by: Clark Wang -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00104.html - -Bug-Description: - -Depending on compiler optimizations and behavior, the `read' builtin may not -save partial input when a timeout occurs. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/builtins/read.def 2016-05-16 14:24:56.000000000 -0400 ---- b/builtins/read.def 2016-11-25 12:37:56.000000000 -0500 -*************** -*** 182,186 **** - { - register char *varname; -! int size, i, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2; - int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul; - int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno; ---- b/182,187 ---- - { - register char *varname; -! int size, nr, pass_next, saw_escape, eof, opt, retval, code, print_ps2; -! volatile int i; - int input_is_tty, input_is_pipe, unbuffered_read, skip_ctlesc, skip_ctlnul; - int raw, edit, nchars, silent, have_timeout, ignore_delim, fd, lastsig, t_errno; - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 9 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-011.patch b/package.bak/bash/bash44-011.patch deleted file mode 100644 index cca66aad26..0000000000 --- a/package.bak/bash/bash44-011.patch +++ /dev/null @@ -1,54 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-011 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-011 - -Bug-Reported-by: Russell King -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2017-01/msg00000.html - -Bug-Description: - -Subshells begun to run command and process substitutions may attempt to -set the terminal's process group to an incorrect value if they receive -a fatal signal. This depends on the behavior of the process that starts -the shell. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/sig.c 2016-02-11 15:02:45.000000000 -0500 ---- b/sig.c 2017-01-04 09:09:47.000000000 -0500 -*************** -*** 586,590 **** - if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)))) - hangup_all_jobs (); -! end_job_control (); - #endif /* JOB_CONTROL */ - ---- b/571,576 ---- - if (sig == SIGHUP && (interactive || (subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)))) - hangup_all_jobs (); -! if ((subshell_environment & (SUBSHELL_COMSUB|SUBSHELL_PROCSUB)) == 0) -! end_job_control (); - #endif /* JOB_CONTROL */ - -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 10 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/bash/bash44-012.patch b/package.bak/bash/bash44-012.patch deleted file mode 100644 index ef081f9198..0000000000 --- a/package.bak/bash/bash44-012.patch +++ /dev/null @@ -1,165 +0,0 @@ -From https://ftp.gnu.org/gnu/bash/bash-4.4-patches/bash44-012 - -Signed-off-by: Peter Korsgaard - - BASH PATCH REPORT - ================= - -Bash-Release: 4.4 -Patch-ID: bash44-012 - -Bug-Reported-by: Clark Wang -Bug-Reference-ID: -Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2016-11/msg00106.html - -Bug-Description: - -When -N is used, the input is not supposed to be split using $IFS, but -leading and trailing IFS whitespace was still removed. - -Patch (apply with `patch -p0'): - -*** bash-4.4-patched/subst.c 2017-01-20 14:22:01.000000000 -0500 ---- b/subst.c 2017-01-25 13:43:22.000000000 -0500 -*************** -*** 2826,2834 **** - /* Parse a single word from STRING, using SEPARATORS to separate fields. - ENDPTR is set to the first character after the word. This is used by -! the `read' builtin. This is never called with SEPARATORS != $IFS; -! it should be simplified. - - XXX - this function is very similar to list_string; they should be - combined - XXX */ - char * - get_word_from_string (stringp, separators, endptr) ---- b/2826,2838 ---- - /* Parse a single word from STRING, using SEPARATORS to separate fields. - ENDPTR is set to the first character after the word. This is used by -! the `read' builtin. -! -! This is never called with SEPARATORS != $IFS, and takes advantage of that. - - XXX - this function is very similar to list_string; they should be - combined - XXX */ -+ -+ #define islocalsep(c) (local_cmap[(unsigned char)(c)] != 0) -+ - char * - get_word_from_string (stringp, separators, endptr) -*************** -*** 2838,2841 **** ---- b/2842,2846 ---- - char *current_word; - int sindex, sh_style_split, whitesep, xflags; -+ unsigned char local_cmap[UCHAR_MAX+1]; /* really only need single-byte chars here */ - size_t slen; - -*************** -*** 2847,2854 **** - separators[2] == '\n' && - separators[3] == '\0'; -! for (xflags = 0, s = ifs_value; s && *s; s++) - { - if (*s == CTLESC) xflags |= SX_NOCTLESC; - if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; - } - ---- b/2852,2861 ---- - separators[2] == '\n' && - separators[3] == '\0'; -! memset (local_cmap, '\0', sizeof (local_cmap)); -! for (xflags = 0, s = separators; s && *s; s++) - { - if (*s == CTLESC) xflags |= SX_NOCTLESC; - if (*s == CTLNUL) xflags |= SX_NOESCCTLNUL; -+ local_cmap[(unsigned char)*s] = 1; /* local charmap of separators */ - } - -*************** -*** 2857,2864 **** - - /* Remove sequences of whitespace at the beginning of STRING, as -! long as those characters appear in IFS. */ -! if (sh_style_split || !separators || !*separators) - { -! for (; *s && spctabnl (*s) && isifs (*s); s++); - - /* If the string is nothing but whitespace, update it and return. */ ---- b/2864,2872 ---- - - /* Remove sequences of whitespace at the beginning of STRING, as -! long as those characters appear in SEPARATORS. This happens if -! SEPARATORS == $' \t\n' or if IFS is unset. */ -! if (sh_style_split || separators == 0) - { -! for (; *s && spctabnl (*s) && islocalsep (*s); s++); - - /* If the string is nothing but whitespace, update it and return. */ -*************** -*** 2879,2885 **** - This obeys the field splitting rules in Posix.2. */ - sindex = 0; -! /* Don't need string length in ADVANCE_CHAR or string_extract_verbatim -! unless multibyte chars are possible. */ -! slen = (MB_CUR_MAX > 1) ? STRLEN (s) : 1; - current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags); - ---- b/2887,2893 ---- - This obeys the field splitting rules in Posix.2. */ - sindex = 0; -! /* Don't need string length in ADVANCE_CHAR unless multibyte chars are -! possible, but need it in string_extract_verbatim for bounds checking */ -! slen = STRLEN (s); - current_word = string_extract_verbatim (s, slen, &sindex, separators, xflags); - -*************** -*** 2900,2904 **** - /* Now skip sequences of space, tab, or newline characters if they are - in the list of separators. */ -! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex])) - sindex++; - ---- b/2908,2912 ---- - /* Now skip sequences of space, tab, or newline characters if they are - in the list of separators. */ -! while (s[sindex] && spctabnl (s[sindex]) && islocalsep (s[sindex])) - sindex++; - -*************** -*** 2907,2916 **** - delimiter, not a separate delimiter that would result in an empty field. - Look at POSIX.2, 3.6.5, (3)(b). */ -! if (s[sindex] && whitesep && isifs (s[sindex]) && !spctabnl (s[sindex])) - { - sindex++; - /* An IFS character that is not IFS white space, along with any adjacent - IFS white space, shall delimit a field. */ -! while (s[sindex] && spctabnl (s[sindex]) && isifs (s[sindex])) - sindex++; - } ---- b/2915,2924 ---- - delimiter, not a separate delimiter that would result in an empty field. - Look at POSIX.2, 3.6.5, (3)(b). */ -! if (s[sindex] && whitesep && islocalsep (s[sindex]) && !spctabnl (s[sindex])) - { - sindex++; - /* An IFS character that is not IFS white space, along with any adjacent - IFS white space, shall delimit a field. */ -! while (s[sindex] && spctabnl (s[sindex]) && islocalsep(s[sindex])) - sindex++; - } -*** bash-4.4/patchlevel.h 2016-06-22 14:51:03.000000000 -0400 ---- b/patchlevel.h 2016-10-01 11:01:28.000000000 -0400 -*************** -*** 26,30 **** - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 11 - - #endif /* _PATCHLEVEL_H_ */ ---- b/26,30 ---- - looks for to find the patch level (for the sccs version string). */ - -! #define PATCHLEVEL 12 - - #endif /* _PATCHLEVEL_H_ */ diff --git a/package.bak/batctl/Config.in b/package.bak/batctl/Config.in deleted file mode 100644 index 2557418928..0000000000 --- a/package.bak/batctl/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_BATCTL - bool "batctl" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_LIBNL - help - Batctl is the configuration and debugging tool for batman-adv. - - http://www.open-mesh.org/projects/batman-adv/wiki/Using-batctl - -comment "batctl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/batctl/batctl.hash b/package.bak/batctl/batctl.hash deleted file mode 100644 index 5920ff09db..0000000000 --- a/package.bak/batctl/batctl.hash +++ /dev/null @@ -1,4 +0,0 @@ -# http://downloads.open-mesh.org/batman/releases/batman-adv-2016.1/batctl-2016.1.tar.gz.sha1 -sha1 72b974bde707594e2cf0cc122d7d7da0f1f65160 batctl-2016.1.tar.gz -# Locally calculated -sha256 c854397b2ddd2cb8d15d1e65839819380648ccb37507d0303e133011fe6f03c9 batctl-2016.1.tar.gz diff --git a/package.bak/batctl/batctl.mk b/package.bak/batctl/batctl.mk deleted file mode 100644 index ed1b06ca2e..0000000000 --- a/package.bak/batctl/batctl.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# batctl -# -################################################################################ - -BATCTL_VERSION = 2016.1 -BATCTL_SITE = http://downloads.open-mesh.org/batman/releases/batman-adv-$(BATCTL_VERSION) -BATCTL_LICENSE = GPLv2 -BATCTL_DEPENDENCIES = libnl host-pkgconf - -define BATCTL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all -endef - -define BATCTL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - PREFIX=/usr DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/batman-adv/Config.in b/package.bak/batman-adv/Config.in deleted file mode 100644 index fbef0d8d6b..0000000000 --- a/package.bak/batman-adv/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -comment "batman-adv needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_BATMAN_ADV - bool "batman-adv" - depends on BR2_LINUX_KERNEL - help - batman-adv mesh networking kernel module - - https://www.open-mesh.org/projects/batman-adv/ - -if BR2_PACKAGE_BATMAN_ADV - -config BR2_PACKAGE_BATMAN_ADV_DEBUG - bool "enable debugging" - help - Enables B.A.T.M.A.N. debugging. - -config BR2_PACKAGE_BATMAN_ADV_NC - bool "enable network coding" - help - Enables B.A.T.M.A.N. network coding. - Note: this requires promiscuous mode on ALL nodes! - - https://www.open-mesh.org/projects/batman-adv/wiki/NetworkCoding - -config BR2_PACKAGE_BATMAN_ADV_BATMAN_V - bool "enable B.A.T.M.A.N. V protocol (experimental)" - help - Enables B.A.T.M.A.N. V network protocol. - This is the next-gen protocol and is experimental at this time. - - https://www.open-mesh.org/projects/batman-adv/wiki/BATMAN_V - -endif diff --git a/package.bak/batman-adv/batman-adv.hash b/package.bak/batman-adv/batman-adv.hash deleted file mode 100644 index 6c0e5cacf9..0000000000 --- a/package.bak/batman-adv/batman-adv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2016.1.tar.gz.sha1 -sha1 c9ca52c913fbf81aca266695a77359ecdbcc8bd8 batman-adv-2016.1.tar.gz diff --git a/package.bak/batman-adv/batman-adv.mk b/package.bak/batman-adv/batman-adv.mk deleted file mode 100644 index 256781f0f2..0000000000 --- a/package.bak/batman-adv/batman-adv.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# batman-adv -# -################################################################################ - -BATMAN_ADV_VERSION = 2016.1 -BATMAN_ADV_SITE = https://downloads.open-mesh.org/batman/stable/sources/batman-adv -BATMAN_ADV_LICENSE = GPLv2 - -# Bridge Loop Avoidance, Distributed Arp Table are always enabled -BATMAN_ADV_CFLAGS = \ - -I$(@D)/compat-include/ \ - -include $(@D)/compat.h \ - -DBATADV_SOURCE_VERSION=\"\\\"$(BATMAN_ADV_VERSION)\\\"\" -BATMAN_ADV_MODULE_MAKE_OPTS = \ - KVER=$(LINUX_VERSION_PROBED) \ - INSTALL_MOD_DIR=updates/net/batman-adv \ - NOSTDINC_FLAGS="$(BATMAN_ADV_CFLAGS)" \ - CONFIG_BATMAN_ADV=m \ - CONFIG_BATMAN_ADV_BATMAN_V=$(BR2_PACKAGE_BATMAN_ADV_BATMAN_V) \ - CONFIG_BATMAN_ADV_BLA=y \ - CONFIG_BATMAN_ADV_DAT=y \ - CONFIG_BATMAN_ADV_DEBUG=$(BR2_PACKAGE_BATMAN_ADV_DEBUG) \ - CONFIG_BATMAN_ADV_MCAST=y \ - CONFIG_BATMAN_ADV_NC=$(BR2_PACKAGE_BATMAN_ADV_NC) -BATMAN_ADV_MODULE_SUBDIRS = net/batman-adv - -define BATMAN_ADV_CONFIGURE_CMDS - $(BATMAN_ADV_MODULE_MAKE_OPTS) $(@D)/gen-compat-autoconf.sh $(@D)/compat-autoconf.h -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/bc/01_array_initialize.patch b/package.bak/bc/01_array_initialize.patch deleted file mode 100644 index 9520d824af..0000000000 --- a/package.bak/bc/01_array_initialize.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Fix array initialization bug -Author: Phil Nelson -Origin: upstream -Bug-Debian: http://bugs.debian.org/586969 -Bug-Debian: http://bugs.debian.org/671513 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -Index: bc/bc/storage.c -=================================================================== ---- bc.orig/bc/storage.c 2013-06-02 20:34:09.401273864 -0400 -+++ bc/bc/storage.c 2013-06-02 20:34:11.000000000 -0400 -@@ -179,7 +179,7 @@ - - - /* Initialize the new elements. */ -- for (; indx < v_count; indx++) -+ for (; indx < a_count; indx++) - arrays[indx] = NULL; - - /* Free the old elements. */ diff --git a/package.bak/bc/02_notice_read_write_errors.patch b/package.bak/bc/02_notice_read_write_errors.patch deleted file mode 100644 index 73e6ec91ca..0000000000 --- a/package.bak/bc/02_notice_read_write_errors.patch +++ /dev/null @@ -1,708 +0,0 @@ -Description: notice read and write errors on input and output - Quoting from the bug report: - +bc (1.06-19ubuntu1) dapper; urgency=low - + - + * Make dc notice read and write errors on its input and output. - + I grepped for mentions of the strings `putc', `print', `getc', `FILE', - + `stdin', `stdout' and `stderr' and added calls to new error-checking - + functions unless it was clear from the immediately-surrounding code - + that the program was exiting nonzero, or would exit nonzero if the - + call failed. I ignored hits in lib/getopt*, which seems to - + pervasively ignore write errors when printing usage messages, in the - + hope that these were correct. I _think_ I got them all. -iwj. - + - + -- Ian Jackson Tue, 4 Apr 2006 17:21:02 +0100 -Author: Ian Jackson -Origin: other -Bug-Debian: http://bugs.debian.org/488735 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/bc/execute.c b/bc/execute.c -index e4e8ef7..8787048 100644 ---- a/bc/execute.c -+++ b/bc/execute.c -@@ -108,6 +108,7 @@ execute () - } - out_char ('\n'); - } -+ checkferror_output(stdout); - } - #endif - -@@ -222,6 +223,7 @@ execute () - } - } - fflush (stdout); -+ checkferror_output(stdout); - break; - - case 'R' : /* Return from function */ -@@ -257,6 +259,7 @@ execute () - if (inst == 'W') out_char ('\n'); - store_var (4); /* Special variable "last". */ - fflush (stdout); -+ checkferror_output(stdout); - pop (); - break; - -@@ -338,6 +341,7 @@ execute () - case 'w' : /* Write a string to the output. */ - while ((ch = byte(&pc)) != '"') out_schar (ch); - fflush (stdout); -+ checkferror_output(stdout); - break; - - case 'x' : /* Exchange Top of Stack with the one under the tos. */ -@@ -545,7 +549,10 @@ execute () - { - signal (SIGINT, use_quit); - if (had_sigint) -- printf ("\ninterrupted execution.\n"); -+ { -+ printf ("\ninterrupted execution.\n"); -+ checkferror_output(stdout); -+ } - } - } - -@@ -580,6 +587,7 @@ input_char () - out_col = 0; /* Saw a new line */ - } - } -+ checkferror_input(stdin); - - /* Classify and preprocess the input character. */ - if (isdigit(in_ch)) -diff --git a/bc/load.c b/bc/load.c -index 1035198..4039e86 100644 ---- a/bc/load.c -+++ b/bc/load.c -@@ -217,6 +217,7 @@ load_code (code) - if (label_no > 65535L) - { /* Better message? */ - fprintf (stderr,"Program too big.\n"); -+ checkferror_output(stderr); - exit(1); - } - addbyte ( (char) (label_no & 0xFF)); -diff --git a/bc/main.c b/bc/main.c -index 9a2461e..3ae427d 100644 ---- a/bc/main.c -+++ b/bc/main.c -@@ -358,6 +358,9 @@ use_quit (sig) - errno = save; - #else - write (1, "\n(interrupt) Exiting bc.\n", 26); -+#ifdef READLINE -+ rl_initialize (); /* Clear readline buffer */ -+#endif - #if defined(LIBEDIT) - if (edit != NULL) - el_end(edit); -diff --git a/bc/sbc.y b/bc/sbc.y -index 0ded29e..6fcc1fa 100644 ---- a/bc/sbc.y -+++ b/bc/sbc.y -@@ -86,7 +86,9 @@ program : /* empty */ - if (interactive && !quiet) - { - show_bc_version (); -+ checkferror_output(stdout); - welcome (); -+ checkferror_output(stdout); - } - } - | program input_item -diff --git a/bc/scan.c b/bc/scan.c -index 1f78ec2..2b5eeb4 100644 ---- a/bc/scan.c -+++ b/bc/scan.c -@@ -799,6 +799,7 @@ bcel_input (buf, result, max) - if (bcel_len != 0) - history (hist, &histev, H_ENTER, bcel_line); - fflush (stdout); -+ checkferror_output(stdout); - } - - if (bcel_len <= max) -@@ -874,6 +875,7 @@ rl_input (buf, result, max) - add_history (rl_line); - rl_line[rl_len-1] = '\n'; - fflush (stdout); -+ checkferror_output(stdout); - } - - if (rl_len <= max) -diff --git a/bc/scan.l b/bc/scan.l -index 841c3df..16cd62e 100644 ---- a/bc/scan.l -+++ b/bc/scan.l -@@ -111,6 +111,7 @@ bcel_input (buf, result, max) - if (bcel_len != 0) - history (hist, &histev, H_ENTER, bcel_line); - fflush (stdout); -+ checkferror_output(stdout); - } - - if (bcel_len <= max) -@@ -186,6 +187,7 @@ rl_input (buf, result, max) - add_history (rl_line); - rl_line[rl_len-1] = '\n'; - fflush (stdout); -+ checkferror_output(stdout); - } - - if (rl_len <= max) -@@ -310,6 +312,7 @@ limits return(Limits); - if (c == EOF) - { - fprintf (stderr,"EOF encountered in a comment.\n"); -+ checkferror_output(stderr); - break; - } - } -diff --git a/bc/storage.c b/bc/storage.c -index 699729a..37b4c6c 100644 ---- a/bc/storage.c -+++ b/bc/storage.c -@@ -99,6 +99,7 @@ more_functions (VOID) - { - f = &functions[indx]; - f->f_defined = FALSE; -+ f->f_void = FALSE; - f->f_body = (char *) bc_malloc (BC_START_SIZE); - f->f_body_size = BC_START_SIZE; - f->f_code_size = 0; -diff --git a/bc/util.c b/bc/util.c -index 30beaf9..669235f 100644 ---- a/bc/util.c -+++ b/bc/util.c -@@ -260,9 +260,10 @@ init_gen () - continue_label = 0; - next_label = 1; - out_count = 2; -- if (compile_only) -+ if (compile_only) { - printf ("@i"); -- else -+ checkferror_output(stdout); -+ } else - init_load (); - had_error = FALSE; - did_gen = FALSE; -@@ -286,6 +287,7 @@ generate (str) - printf ("\n"); - out_count = 0; - } -+ checkferror_output(stdout); - } - else - load_code (str); -@@ -303,6 +305,7 @@ run_code() - if (compile_only) - { - printf ("@r\n"); -+ checkferror_output(stdout); - out_count = 0; - } - else -@@ -341,6 +344,7 @@ out_char (ch) - } - putchar (ch); - } -+ checkferror_output(stdout); - } - - /* Output routines: Write a character CH to the standard output. -@@ -371,6 +375,7 @@ out_schar (ch) - } - putchar (ch); - } -+ checkferror_output(stdout); - } - - -@@ -657,6 +662,7 @@ limits() - #ifdef OLD_EQ_OP - printf ("Old assignment operatiors are valid. (=-, =+, ...)\n"); - #endif -+ checkferror_output(stdout); - } - - /* bc_malloc will check the return value so all other places do not -@@ -721,6 +727,7 @@ yyerror (str, va_alist) - fprintf (stderr,"%s %d: ",name,line_no); - vfprintf (stderr, str, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - had_error = TRUE; - va_end (args); - } -@@ -761,6 +768,7 @@ warn (mesg, va_alist) - fprintf (stderr,"%s %d: Error: ",name,line_no); - vfprintf (stderr, mesg, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - had_error = TRUE; - } - else -@@ -773,6 +781,7 @@ warn (mesg, va_alist) - fprintf (stderr,"%s %d: (Warning) ",name,line_no); - vfprintf (stderr, mesg, args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - va_end (args); - } -@@ -807,6 +816,7 @@ rt_error (mesg, va_alist) - va_end (args); - - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - runtime_error = TRUE; - } - -@@ -843,4 +853,5 @@ rt_warn (mesg, va_alist) - va_end (args); - - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } -diff --git a/dc/dc.c b/dc/dc.c -index e03f094..0faf03a 100644 ---- a/dc/dc.c -+++ b/dc/dc.c -@@ -61,6 +61,7 @@ static void - bug_report_info DC_DECLVOID() - { - printf("Email bug reports to: bug-dc@gnu.org .\n"); -+ checkferror_output(stdout); - } - - static void -@@ -71,6 +72,7 @@ show_version DC_DECLVOID() - This is free software; see the source for copying conditions. There is NO\n\ - warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE,\n\ - to the extent permitted by law.\n", DC_COPYRIGHT); -+ checkferror_output(stdout); - } - - /* your generic usage function */ -@@ -87,6 +89,7 @@ Usage: %s [OPTION] [file ...]\n\ - \n\ - ", progname); - bug_report_info(); -+ checkferror_output(f); - } - - /* returns a pointer to one past the last occurance of c in s, -diff --git a/dc/eval.c b/dc/eval.c -index 4af7200..153d331 100644 ---- a/dc/eval.c -+++ b/dc/eval.c -@@ -94,12 +94,15 @@ static int input_pushback; - static int - input_fil DC_DECLVOID() - { -+ int c; - if (input_pushback != EOF){ -- int c = input_pushback; -+ c = input_pushback; - input_pushback = EOF; - return c; - } -- return getc(input_fil_fp); -+ c = getc(input_fil_fp); -+ checkferror_input(input_fil_fp); -+ return c; - } - - /* passed as an argument to dc_getnum */ -@@ -298,11 +301,13 @@ dc_func DC_DECLARG((c, peekc, negcmp)) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (2 <= tmpint && tmpint <= DC_IBASE_MAX) - dc_ibase = tmpint; -- else -+ else { - fprintf(stderr, - "%s: input base must be a number \ - between 2 and %d (inclusive)\n", - progname, DC_IBASE_MAX); -+ checkferror_output(stderr); -+ } - } - break; - case 'k': /* set scale to value on top of stack */ -@@ -310,11 +315,12 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint >= 0) ) -+ if ( ! (tmpint >= 0) ) { - fprintf(stderr, - "%s: scale must be a nonnegative number\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_scale = tmpint; - } - break; -@@ -338,11 +344,12 @@ between 2 and %d (inclusive)\n", - tmpint = 0; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if ( ! (tmpint > 1) ) -+ if ( ! (tmpint > 1) ) { - fprintf(stderr, - "%s: output base must be a number greater than 1\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_obase = tmpint; - } - break; -@@ -383,6 +390,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: square root of nonnumeric attempted\n", - progname); -+ checkferror_output(stderr); - }else if (dc_sqrt(datum.v.number, dc_scale, &tmpnum) == DC_SUCCESS){ - dc_free_num(&datum.v.number); - datum.v.number = tmpnum; -@@ -444,6 +452,7 @@ between 2 and %d (inclusive)\n", - fprintf(stderr, - "%s: Q command requires a number >= 1\n", - progname); -+ checkferror_output(stderr); - } - break; - #if 0 -@@ -489,11 +498,12 @@ between 2 and %d (inclusive)\n", - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); - if (dc_pop(&datum) == DC_SUCCESS){ -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_array_set(peekc, tmpint, datum); - } - } -@@ -505,17 +515,19 @@ between 2 and %d (inclusive)\n", - tmpint = -1; - if (datum.dc_type == DC_NUMBER) - tmpint = dc_num2int(datum.v.number, DC_TOSS); -- if (tmpint < 0) -+ if (tmpint < 0) { - fprintf(stderr, - "%s: array index must be a nonnegative integer\n", - progname); -- else -+ checkferror_output(stderr); -+ } else - dc_push(dc_array_get(peekc, tmpint)); - } - return DC_EATONE; - - default: /* What did that user mean? */ - fprintf(stderr, "%s: ", progname); -+ checkferror_output(stderr); - dc_show_id(stdout, c, " unimplemented\n"); - break; - } -@@ -544,6 +556,7 @@ dc_evalstr DC_DECLARG((string)) - fprintf(stderr, - "%s: eval called with non-string argument\n", - progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - interrupt_seen = 0; -@@ -640,6 +653,7 @@ dc_evalstr DC_DECLARG((string)) - return DC_FAIL; - } - fprintf(stderr, "%s: unexpected EOS\n", progname); -+ checkferror_output(stderr); - return DC_OKAY; - } - } -@@ -665,6 +679,7 @@ dc_evalfile DC_DECLARG((fp)) - stdin_lookahead = EOF; - for (c=getc(fp); c!=EOF; c=peekc){ - peekc = getc(fp); -+ checkferror_input(stdin); - /* - * The following if() is the only place where ``stdin_lookahead'' - * might be set to other than EOF: -@@ -716,6 +731,7 @@ dc_evalfile DC_DECLARG((fp)) - return DC_SUCCESS; - fprintf(stderr, "%s: Q command argument exceeded \ - string execution depth\n", progname); -+ checkferror_output(stderr); - } - }else{ - dc_garbage("at top of stack", -1); -@@ -728,8 +744,11 @@ string execution depth\n", progname); - fprintf(stderr, - "%s: Q command argument exceeded string execution depth\n", - progname); -- if (stdin_lookahead != peekc && fp == stdin) -+ checkferror_output(stderr); -+ if (stdin_lookahead != peekc && fp == stdin) { - peekc = getc(fp); -+ checkferror_input(stdin); -+ } - break; - - case DC_INT: -@@ -771,6 +790,7 @@ string execution depth\n", progname); - if (ferror(fp)) - goto error_fail; - fprintf(stderr, "%s: unexpected EOF\n", progname); -+ checkferror_output(stderr); - return DC_FAIL; - } - } -diff --git a/dc/misc.c b/dc/misc.c -index f2388b0..1be56fe 100644 ---- a/dc/misc.c -+++ b/dc/misc.c -@@ -91,6 +91,7 @@ dc_show_id DC_DECLARG((fp, id, suffix)) - fprintf(fp, "'%c' (%#o)%s", (unsigned int) id, id, suffix); - else - fprintf(fp, "%#o%s", (unsigned int) id, suffix); -+ checkferror_output(fp); - } - - -diff --git a/dc/numeric.c b/dc/numeric.c -index 8e5e70f..c875eba 100644 ---- a/dc/numeric.c -+++ b/dc/numeric.c -@@ -134,6 +134,7 @@ dc_div DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_divide(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -156,6 +157,7 @@ dc_divrem DC_DECLARG((a, b, kscale, quotient, remainder)) - if (bc_divmod(CastNum(a), CastNum(b), - CastNumPtr(quotient), CastNumPtr(remainder), kscale)){ - fprintf(stderr, "%s: divide by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -174,6 +176,7 @@ dc_rem DC_DECLARG((a, b, kscale, result)) - bc_init_num(CastNumPtr(result)); - if (bc_modulo(CastNum(a), CastNum(b), CastNumPtr(result), kscale)){ - fprintf(stderr, "%s: remainder by zero\n", progname); -+ checkferror_output(stderr); - return DC_DOMAIN_ERROR; - } - return DC_SUCCESS; -@@ -226,6 +229,7 @@ dc_sqrt DC_DECLARG((value, kscale, result)) - tmp = bc_copy_num(CastNum(value)); - if (!bc_sqrt(&tmp, kscale)){ - fprintf(stderr, "%s: square root of negative number\n", progname); -+ checkferror_output(stderr); - bc_free_num(&tmp); - return DC_DOMAIN_ERROR; - } -@@ -429,8 +433,10 @@ dc_out_num DC_DECLARG((value, obase, newline_p, discard_p)) - { - out_char('\0'); /* clear the column counter */ - bc_out_num(CastNum(value), obase, out_char, 0); -- if (newline_p == DC_WITHNL) -+ if (newline_p == DC_WITHNL) { - putchar ('\n'); -+ checkferror_output(stdout); -+ } - if (discard_p == DC_TOSS) - dc_free_num(&value); - } -@@ -475,6 +481,7 @@ dc_dump_num DC_DECLARG((dcvalue, discard_p)) - - for (cur=top_of_stack; cur; cur=next) { - putchar(cur->digit); -+ checkferror_output(stdout); - next = cur->link; - free(cur); - } -@@ -592,6 +599,7 @@ out_char (ch) - out_col = 1; - } - putchar(ch); -+ checkferror_output(stderr); - } - } - -@@ -631,6 +639,7 @@ rt_error (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - - -@@ -664,6 +673,7 @@ rt_warn (mesg, va_alist) - vfprintf (stderr, mesg, args); - va_end (args); - fprintf (stderr, "\n"); -+ checkferror_output(stderr); - } - - -diff --git a/dc/stack.c b/dc/stack.c -index 0730e9c..5db3975 100644 ---- a/dc/stack.c -+++ b/dc/stack.c -@@ -38,7 +38,10 @@ - #include "dc-regdef.h" - - /* an oft-used error message: */ --#define Empty_Stack fprintf(stderr, "%s: stack empty\n", progname) -+#define Empty_Stack do{ \ -+ fprintf(stderr, "%s: stack empty\n", progname); \ -+ checkferror_output(stderr); \ -+ }while(0) - - - /* simple linked-list implementation suffices: */ -@@ -94,6 +97,7 @@ dc_binop DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -134,6 +138,7 @@ dc_binop2 DC_DECLARG((op, kscale)) - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&b); -@@ -172,6 +177,7 @@ dc_cmpop DC_DECLVOID() - if (dc_stack->value.dc_type!=DC_NUMBER - || dc_stack->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return 0; - } - (void)dc_pop(&b); -@@ -209,6 +215,7 @@ dc_triop DC_DECLARG((op, kscale)) - || dc_stack->link->value.dc_type!=DC_NUMBER - || dc_stack->link->link->value.dc_type!=DC_NUMBER){ - fprintf(stderr, "%s: non-numeric value\n", progname); -+ checkferror_output(stderr); - return; - } - (void)dc_pop(&c); -@@ -327,6 +334,7 @@ dc_register_get DC_DECLARG((regid, result)) - r = dc_register[regid]; - if (r==NULL || r->value.dc_type==DC_UNINITIALIZED){ - fprintf(stderr, "%s: register ", progname); -+ checkferror_output(stderr); - dc_show_id(stderr, regid, " is empty\n"); - return DC_FAIL; - } -@@ -401,6 +409,7 @@ dc_register_pop DC_DECLARG((stackid, result)) - r = dc_register[stackid]; - if (r == NULL){ - fprintf(stderr, "%s: stack register ", progname); -+ checkferror_output(stderr); - dc_show_id(stderr, stackid, " is empty\n"); - return DC_FAIL; - } -diff --git a/dc/string.c b/dc/string.c -index ff1e7f1..e24092d 100644 ---- a/dc/string.c -+++ b/dc/string.c -@@ -101,6 +101,7 @@ dc_out_str DC_DECLARG((value, newline, discard_flag)) - fwrite(value->s_ptr, value->s_len, sizeof *value->s_ptr, stdout); - if (newline == DC_WITHNL) - putchar('\n'); -+ checkferror_output(stdout); - if (discard_flag == DC_TOSS) - dc_free_str(&value); - } -@@ -176,6 +177,7 @@ dc_readstring DC_DECLARG((fp, ldelim, rdelim)) - } - *p++ = c; - } -+ checkferror_input(fp); - return dc_makestring(line_buf, (size_t)(p-line_buf)); - } - -diff --git a/h/number.h b/h/number.h -index 9b034b6..3a00a92 100644 ---- a/h/number.h -+++ b/h/number.h -@@ -150,4 +150,7 @@ _PROTOTYPE(int bc_sqrt, (bc_num *num, int scale)); - _PROTOTYPE(void bc_out_num, (bc_num num, int o_base, void (* out_char)(int), - int leading_zero)); - -+_PROTOTYPE(void checkferror_input, (FILE*)); -+_PROTOTYPE(void checkferror_output, (FILE*)); -+ - #endif -diff --git a/lib/number.c b/lib/number.c -index e211840..4d3ce46 100644 ---- a/lib/number.c -+++ b/lib/number.c -@@ -1776,6 +1776,7 @@ static void - out_char (int c) - { - putchar(c); -+ checkferror_output(stdout); - } - - -@@ -1785,6 +1786,7 @@ pn (num) - { - bc_out_num (num, 10, out_char, 0); - out_char ('\n'); -+ checkferror_output(stdout); - } - - -@@ -1799,6 +1801,28 @@ pv (name, num, len) - printf ("%s=", name); - for (i=0; i - -diff -Nura bc-1.06.95.orig/doc/Makefile.in bc-1.06.95/doc/Makefile.in ---- bc-1.06.95.orig/doc/Makefile.in 2015-06-13 09:39:46.946620294 -0300 -+++ bc-1.06.95/doc/Makefile.in 2015-06-13 09:40:10.019407630 -0300 -@@ -96,7 +96,7 @@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LTLIBOBJS = @LTLIBOBJS@ --MAKEINFO = makeinfo --no-split -+MAKEINFO = @MAKEINFO@ --no-split - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ diff --git a/package.bak/bc/Config.in b/package.bak/bc/Config.in deleted file mode 100644 index a28978d2e5..0000000000 --- a/package.bak/bc/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_BC - bool "bc" - help - 'bc' is an arbitrary precision numeric processing language - Its syntax is similar to C, but differs in many substantial - areas. It supports interactive execution of statements. 'Bc' - is a utility included in the POSIX P1003.2/D11 draft standard. - This version does not use the historical method of having bc - be a compiler for the dc calculator (the POSIX document doesn't - specify how bc must be implemented). This version has a single - executable that both compiles the language and runs the resulting - 'byte code.' The byte code is not the dc language. - - http://www.gnu.org/software/bc diff --git a/package.bak/bc/bc.hash b/package.bak/bc/bc.hash deleted file mode 100644 index 5f1ed63536..0000000000 --- a/package.bak/bc/bc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc bc-1.06.95.tar.bz2 diff --git a/package.bak/bc/bc.mk b/package.bak/bc/bc.mk deleted file mode 100644 index 8f3e08dda6..0000000000 --- a/package.bak/bc/bc.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# bc -# -################################################################################ - -BC_VERSION = 1.06.95 -BC_SOURCE = bc-$(BC_VERSION).tar.bz2 -BC_SITE = http://alpha.gnu.org/gnu/bc -BC_DEPENDENCIES = host-flex -BC_LICENSE = GPLv2+, LGPLv2.1+ -BC_LICENSE_FILES = COPYING COPYING.LIB - -# Build after busybox so target ends up with bc's "dc" version -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -BC_DEPENDENCIES += busybox -endif - -$(eval $(autotools-package)) diff --git a/package.bak/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch b/package.bak/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch deleted file mode 100644 index 1a437a84fb..0000000000 --- a/package.bak/bcache-tools/0001-Don-t-inline-crc64-for-gcc-5-compatability.patch +++ /dev/null @@ -1,35 +0,0 @@ -Don't inline crc64 for gcc-5 compatability - -This patch is backported from Debian and it fixes the following error: - -bcache.c:125:9: warning: 'crc_table' is static but used in inline -function 'crc64' which is not static -... -make-bcache.c:277: undefined reference to `crc64' - -Signed-off-by: Vicente Olivert Riera - -From: David Mohr -Date: Tue, 26 May 2015 20:34:31 -0600 -Subject: Don't inline crc64 for gcc-5 compatability - -Forwarded: http://article.gmane.org/gmane.linux.kernel.bcache.devel/2919 - -By James Cowgill, see Debian bug #777798 ---- - bcache.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bcache.c b/bcache.c -index 8f37445..8b4b986 100644 ---- a/bcache.c -+++ b/bcache.c -@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = { - 0x9AFCE626CE85B507ULL - }; - --inline uint64_t crc64(const void *_data, size_t len) -+uint64_t crc64(const void *_data, size_t len) - { - uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; - const unsigned char *data = _data; diff --git a/package.bak/bcache-tools/Config.in b/package.bak/bcache-tools/Config.in deleted file mode 100644 index 7e6319bce7..0000000000 --- a/package.bak/bcache-tools/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_BCACHE_TOOLS - bool "bcache tools" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_MMU # util-linux (libblkid) - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - Bcache is a Linux kernel block layer cache. It allows one or - more fast disk drives such as flash-based solid state drives (SSDs) - to act as a cache for one or more slower hard disk drives. - - http://bcache.evilpiepirate.org/ - - This is the user space bcache tools, required to setup the linux - bcache feature of the Linux kernel. - -comment "bcache-tools needs udev /dev management" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/bcache-tools/bcache-tools.hash b/package.bak/bcache-tools/bcache-tools.hash deleted file mode 100644 index 6d3502fc29..0000000000 --- a/package.bak/bcache-tools/bcache-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d56923936f37287efc57a46315679102ef2c86cd0be5874590320acd48c1201c bcache-tools-v1.0.8.tar.gz diff --git a/package.bak/bcache-tools/bcache-tools.mk b/package.bak/bcache-tools/bcache-tools.mk deleted file mode 100644 index 09604f6bf5..0000000000 --- a/package.bak/bcache-tools/bcache-tools.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# bcache-tools -# -################################################################################ - -BCACHE_TOOLS_VERSION = v1.0.8 -BCACHE_TOOLS_SITE = $(call github,g2p,bcache-tools,$(BCACHE_TOOLS_VERSION)) -BCACHE_TOOLS_LICENSE = GPLv2 -BCACHE_TOOLS_LICENSE_FILES = COPYING -BCACHE_TOOLS_DEPENDENCIES = host-pkgconf util-linux - -# We pass $(TARGET_CONFIGURE_OPTS) as environment variable to allow -# the bcache-tools Makefile to alter CFLAGS -define BCACHE_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# The bcache-tools Makefile expects the man8 directory to exist -# expects the /lib/udev/rules.d directory to exist. -define BCACHE_TOOLS_CREATE_MISSING_DIRS - $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/share/man/man8 - $(INSTALL) -m 0755 -d $(TARGET_DIR)/lib/udev/rules.d -endef - -BCACHE_TOOLS_PRE_INSTALL_TARGET_HOOKS += BCACHE_TOOLS_CREATE_MISSING_DIRS - -define BCACHE_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/bcm2835/Config.in b/package.bak/bcm2835/Config.in deleted file mode 100644 index 4c3eb2cbfc..0000000000 --- a/package.bak/bcm2835/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_BCM2835 - bool "bcm2835" - depends on BR2_arm - help - C library for Broadcom BCM 2835 as used in Raspberry Pi. - It provides access to GPIO and other IO functions on the - Broadcom BCM 2835 chip, allowing access to the GPIO pins - on the 26 pin IDE plug on the RPi board so you can control - and interface with various external devices. - - WARNING: the opinion of the Buildroot developers is that - such library is a complete abomination as it entirely works - around the standard Linux interfaces to access GPIOs, I2C, - SPI busses or other IOs. The library directly remaps the - hardware registers in user-space, completely bypassing what - the kernel drivers are doing, and potentially conflicting - with them. - - http://www.airspayce.com/mikem/bcm2835 diff --git a/package.bak/bcm2835/bcm2835.hash b/package.bak/bcm2835/bcm2835.hash deleted file mode 100644 index 1aea3ae3dd..0000000000 --- a/package.bak/bcm2835/bcm2835.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 295f66dab533592ce41db8e07befe985645a2e661bbf75dce9c383e61e24cb5f bcm2835-1.48.tar.gz diff --git a/package.bak/bcm2835/bcm2835.mk b/package.bak/bcm2835/bcm2835.mk deleted file mode 100644 index c111a0ad5d..0000000000 --- a/package.bak/bcm2835/bcm2835.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# bcm2835 -# -################################################################################ - -BCM2835_VERSION = 1.48 -BCM2835_SITE = http://www.airspayce.com/mikem/bcm2835 -BCM2835_LICENSE = GPLv2 -BCM2835_LICENSE_FILES = COPYING -BCM2835_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch b/package.bak/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch deleted file mode 100644 index a70c7c633a..0000000000 --- a/package.bak/bctoolbox/0001-Fix-Libs.private-flags-for-mbedtls.patch +++ /dev/null @@ -1,49 +0,0 @@ -From c0b3dbb43aa3a38c47311556c85eadc6072e2d68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 14 Feb 2017 22:02:26 +0100 -Subject: [PATCH] Fix Libs.private flags for mbedtls -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Static linking with bctoolbox fails when using pkg-config as the -generated bctoolbox.pc file only consists of an '-L' string without any -search path or libraries flags. - -That's because of an typo in `mbedtls_library_path`. However, -`mbedtls_library_path` contains a string of the mbedtls libraries -concatenated by an ';' which cannot be parsed by pkg-config. - -Therefore, use `MBEDTLS_LIBRARY` instead of `MBEDTLS_LIBRARIES` to get -the library path. - -Furthermore, add the three mbedtls libraries *mbedtls*, *mbedcrypto*, and -*mbedx509* to `LIBS_PRIVATE` so these libraries are added to the -`Libs.private` field of bctoolbox.pc. - -Upstream status: Pending -https://github.com/BelledonneCommunications/bctoolbox/pull/4 - -Signed-off-by: Jörg Krause ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index ed7aa00..4127f0e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -103,8 +103,8 @@ else() - endif() - - if(MBEDTLS_FOUND) -- get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARIES}" PATH) -- set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedlts_library_path}") -+ get_filename_component(mbedtls_library_path "${MBEDTLS_LIBRARY}" PATH) -+ set(LIBS_PRIVATE "${LIBS_PRIVATE} -L${mbedtls_library_path} -lmbedtls -lmbedcrypto -lmbedx509") - endif() - if(POLARSSL_FOUND) - get_filename_component(polarssl_library_path "${POLARSSL_LIBRARIES}" PATH) --- -2.11.1 - diff --git a/package.bak/bctoolbox/Config.in b/package.bak/bctoolbox/Config.in deleted file mode 100644 index e9e69205f8..0000000000 --- a/package.bak/bctoolbox/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_BCTOOLBOX - bool "bctoolbox" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Utilities library used by Belledonne Communications - softwares like belle-sip, mediastreamer2 and linphone. - - Select BR2_PACKAGE_MBEDTLS (preferred) or - BR2_PACKAGE_POLARSSL for crypto support. - - https://github.com/BelledonneCommunications/bctoolbox - -comment "bctoolbox needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/bctoolbox/bctoolbox.hash b/package.bak/bctoolbox/bctoolbox.hash deleted file mode 100644 index 70be55c3d7..0000000000 --- a/package.bak/bctoolbox/bctoolbox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 da7df7ff359a9829e9e6ef98dfe9fead0cf735b8a4a5da1b1047f467dee1b2a9 bctoolbox-0.4.0.tar.gz diff --git a/package.bak/bctoolbox/bctoolbox.mk b/package.bak/bctoolbox/bctoolbox.mk deleted file mode 100644 index 78269751ef..0000000000 --- a/package.bak/bctoolbox/bctoolbox.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# bctoolbox -# -################################################################################ - -BCTOOLBOX_VERSION = 0.4.0 -BCTOOLBOX_SITE = $(call github,BelledonneCommunications,bctoolbox,$(BCTOOLBOX_VERSION)) -BCTOOLBOX_LICENSE = GPLv2+ -BCTOOLBOX_LICENSE_FILES = COPYING -BCTOOLBOX_INSTALL_STAGING = YES - -# Set CMAKE_SKIP_RPATH to prevent bctoolbox from adding the rpath to -# shared library. -BCTOOLBOX_CONF_OPTS = \ - -DENABLE_STRICT=OFF \ - -DENABLE_TESTS_COMPONENT=OFF \ - -DENABLE_TESTS=OFF \ - -DGIT_EXECUTABLE=OFF \ - -DCMAKE_SKIP_RPATH=ON - -# bctoolbox can be build with mbedTLS or PolarSSL support. If both -# libraries are present, mbedTLS is preferred over PolarSSL. -ifeq ($(BR2_PACKAGE_MBEDTLS),y) -BCTOOLBOX_DEPENDENCIES += mbedtls -BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=ON -else -BCTOOLBOX_CONF_OPTS += -DENABLE_MBEDTLS=OFF -endif - -ifeq ($(BR2_PACKAGE_POLARSSL),y) -BCTOOLBOX_DEPENDENCIES += polarssl -BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=ON -else -BCTOOLBOX_CONF_OPTS += -DENABLE_POLARSSL=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=OFF -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=ON -else ifeq ($(BR2_SHARED_LIBS),y) -BCTOOLBOX_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_STATIC=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch b/package.bak/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch deleted file mode 100644 index 723de5c1a2..0000000000 --- a/package.bak/bcusdk/0001-fd_set-requires-inclusion-of-sys-select.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2541ee3d709803096b17e45610ccc1404e2e5eee Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 17:46:34 +0200 -Subject: [PATCH] fd_set requires inclusion of - -According to POSIX.1-2001, the definition fd_set and related macros is -in , so it should be included in files using fd_set to -make the code compatible with all standard C libraries. - -Submitted upstream: https://sourceforge.net/p/bcusdk/patches/3/ - -Signed-off-by: Thomas Petazzoni ---- - eibd/examples/common.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eibd/examples/common.h b/eibd/examples/common.h -index 51fc514..f038da1 100644 ---- a/eibd/examples/common.h -+++ b/eibd/examples/common.h -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include "eibclient.h" - - /** unsigned char*/ --- -2.5.0 - diff --git a/package.bak/bcusdk/Config.in b/package.bak/bcusdk/Config.in deleted file mode 100644 index 8f9330e0d1..0000000000 --- a/package.bak/bcusdk/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_BCUSDK - bool "bcusdk" - depends on BR2_USE_MMU # libpthsem - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBPTHSEM - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - help - A free development environment for the Bus Coupling Units of - the European Installation Bus. - - The European Installation Bus EIB is a home and building - automation bus system. It is optimized for low-speed control - applications like lighting and blinds control. - - BCUs (Bus Coupling Units) are standardized, generic - platforms for embedded EIB devices. They include the entire - physical layer network interface, power supply and a - microcontroller with an implementation of the EIB protocol - stack stored in the ROM. - - http://www.auto.tuwien.ac.at/~mkoegler/eib/ - -comment "bcusdk needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/bcusdk/bcusdk.hash b/package.bak/bcusdk/bcusdk.hash deleted file mode 100644 index 219498bcbb..0000000000 --- a/package.bak/bcusdk/bcusdk.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 014cdaafc36f223c584b39ae5d698dd037a8e15aba4e78a2e531b51ff1331304 bcusdk_0.0.5.tar.gz diff --git a/package.bak/bcusdk/bcusdk.mk b/package.bak/bcusdk/bcusdk.mk deleted file mode 100644 index 697b5ce237..0000000000 --- a/package.bak/bcusdk/bcusdk.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# bcusdk -# -################################################################################ - -BCUSDK_VERSION = 0.0.5 -BCUSDK_SOURCE = bcusdk_$(BCUSDK_VERSION).tar.gz -BCUSDK_SITE = http://www.auto.tuwien.ac.at/~mkoegler/eib -BCUSDK_LICENSE = GPLv2+ -BCUSDK_LICENSE_FILES = COPYING -BCUSDK_INSTALL_STAGING = YES -BCUSDK_CONF_OPTS = \ - --enable-onlyeibd \ - --enable-ft12 \ - --enable-pei16 \ - --enable-eibnetip \ - --enable-eibnetipserver \ - --enable-eibnetiptunnel \ - --without-pth-test \ - --with-pth=$(STAGING_DIR)/usr - -BCUSDK_DEPENDENCIES = \ - libpthsem \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) - - -define BCUSDK_REMOVE_EXAMPLES - $(RM) -rf $(TARGET_DIR)/usr/share/bcusdk -endef - -BCUSDK_POST_INSTALL_TARGET_HOOKS += BCUSDK_REMOVE_EXAMPLES - -$(eval $(autotools-package)) diff --git a/package.bak/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/package.bak/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 393ad9039a..0000000000 --- a/package.bak/bdwgc/0001-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,28 +0,0 @@ -configure.ac: add check for NO_GETCONTEXT definition - -Signed-off-by: Samuel Martin -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" -Cc: Thomas Petazzoni - ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- bdwgc-7.2f.orig/configure.ac 2014-06-01 19:00:47.000000000 +0200 -+++ bdwgc-7.2f/configure.ac 2014-12-23 14:13:11.585716713 +0100 -@@ -365,6 +365,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/package.bak/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch b/package.bak/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch deleted file mode 100644 index 40c9063103..0000000000 --- a/package.bak/bdwgc/0002-Do-not-include-sigcontext.h-and-asm-sigcontext.h.patch +++ /dev/null @@ -1,61 +0,0 @@ -From c887470e0e3310c81ecdb7e736bc5d2ead45db2a Mon Sep 17 00:00:00 2001 -From: Ivan Maidanski -Date: Mon, 6 Apr 2015 20:06:47 +0300 -Subject: [PATCH 1/1] Do not include sigcontext.h and asm/sigcontext.h (these - Linux headers define sigcontext which is no longer used as replaced with - ucontext_t in GC 7.0alpha1) - -* os_dep.c: Do not include linux/version.h (do not test -LINUX_VERSION_CODE), asm/signal.h, sigcontext.h, asm/sigcontext.h -since struct sigcontext not used in GC v7+. - -Signed-off-by: Brendan Heading -Upstream-status: backport ---- - os_dep.c | 30 ------------------------------ - 1 file changed, 30 deletions(-) - -diff --git a/os_dep.c b/os_dep.c -index f62d4ed..a1bafbd 100644 ---- a/os_dep.c -+++ b/os_dep.c -@@ -16,36 +16,6 @@ - - #include "private/gc_priv.h" - --#if defined(LINUX) && !defined(POWERPC) && !defined(NO_SIGCONTEXT_H) --# include --# if (LINUX_VERSION_CODE <= 0x10400) -- /* Ugly hack to get struct sigcontext_struct definition. Required */ -- /* for some early 1.3.X releases. Will hopefully go away soon. */ -- /* in some later Linux releases, asm/sigcontext.h may have to */ -- /* be included instead. */ --# define __KERNEL__ --# include --# undef __KERNEL__ --# else -- /* Kernels prior to 2.1.1 defined struct sigcontext_struct instead of */ -- /* struct sigcontext. libc6 (glibc2) uses "struct sigcontext" in */ -- /* prototypes, so we have to include the top-level sigcontext.h to */ -- /* make sure the former gets defined to be the latter if appropriate. */ --# include --# if 2 <= __GLIBC__ --# if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ -- /* glibc 2.1 no longer has sigcontext.h. But signal.h */ -- /* has the right declaration for glibc 2.1. */ --# include --# endif /* 0 == __GLIBC_MINOR__ */ --# else /* __GLIBC__ < 2 */ -- /* libc5 doesn't have : go directly with the kernel */ -- /* one. Check LINUX_VERSION_CODE to see which we should reference. */ --# include --# endif /* __GLIBC__ < 2 */ --# endif --#endif /* LINUX && !POWERPC */ -- - #if !defined(OS2) && !defined(PCR) && !defined(AMIGA) && !defined(MACOS) \ - && !defined(MSWINCE) && !defined(__CC_ARM) - # include --- -2.4.3 - diff --git a/package.bak/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch b/package.bak/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch deleted file mode 100644 index 03af6a3990..0000000000 --- a/package.bak/bdwgc/0003-Revert-Move-asm-machine-dependent-files-to-src-folde.patch +++ /dev/null @@ -1,424 +0,0 @@ -Signed-off-by: Waldemar Brodkorb - -From 5e756d4d8df2949cb3b6e51532d3016cbb276fd7 Mon Sep 17 00:00:00 2001 -From: Ivan Maidanski -Date: Fri, 27 Feb 2015 21:32:22 +0300 -Subject: [PATCH 004/135] Revert "Move asm machine-dependent files to 'src' - folder" (partly) - -Asm files moved back to base folder to avoid build issues (reported -for NetBSD and Solaris on Sparc). Alternative way is to adjust -configure.ac and Makefile.am properly but it requires more efforts -(including testing). - -* Makefile.am (EXTRA_libgc_la_SOURCES): Remove "src/" prefix. -* Makefile.direct (SRCS, mach_dep.o): Likewise. -* src/ia64_save_regs_in_stack.s: Move to base folder. -* src/sparc_mach_dep.S: Likewise. -* src/sparc_netbsd_mach_dep.s: Likewise. -* src/sparc_sunos4_mach_dep.s: Likewise. - ---- - Makefile.am | 4 +-- - Makefile.direct | 20 +++++++------- - ia64_save_regs_in_stack.s | 11 ++++++++ - sparc_mach_dep.S | 61 +++++++++++++++++++++++++++++++++++++++++ - sparc_netbsd_mach_dep.s | 34 +++++++++++++++++++++++ - sparc_sunos4_mach_dep.s | 32 +++++++++++++++++++++ - src/ia64_save_regs_in_stack.s | 11 -------- - src/sparc_mach_dep.S | 61 ----------------------------------------- - src/sparc_netbsd_mach_dep.s | 34 ----------------------- - src/sparc_sunos4_mach_dep.s | 32 --------------------- - 11 files changed, 151 insertions(+), 151 deletions(-) - create mode 100644 ia64_save_regs_in_stack.s - create mode 100644 sparc_mach_dep.S - create mode 100644 sparc_netbsd_mach_dep.s - create mode 100644 sparc_sunos4_mach_dep.s - delete mode 100644 src/ia64_save_regs_in_stack.s - delete mode 100644 src/sparc_mach_dep.S - delete mode 100644 src/sparc_netbsd_mach_dep.s - delete mode 100644 src/sparc_sunos4_mach_dep.s - -diff --git a/Makefile.am b/Makefile.am -index f8057db..1688be2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -100,8 +100,8 @@ libgc_la_LIBADD = @addobjs@ $(THREADDLLIBS) $(UNWINDLIBS) $(ATOMIC_OPS_LIBS) - libgc_la_DEPENDENCIES = @addobjs@ - libgc_la_LDFLAGS = $(extra_ldflags_libgc) -version-info 1:3:0 -no-undefined - --EXTRA_libgc_la_SOURCES = src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ -- src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s -+EXTRA_libgc_la_SOURCES = ia64_save_regs_in_stack.s sparc_mach_dep.S \ -+ sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s - - - # C++ Interface -diff --git a/Makefile.direct b/Makefile.direct -index d64598b..8ab80e8 100644 ---- a/Makefile.direct -+++ b/Makefile.direct -@@ -108,8 +108,8 @@ SRCS= $(CSRCS) \ - include/gc_config_macros.h include/private/pthread_support.h \ - include/private/pthread_stop_world.h include/private/darwin_semaphore.h \ - include/private/darwin_stop_world.h include/private/thread_local_alloc.h \ -- src/ia64_save_regs_in_stack.s src/sparc_mach_dep.S \ -- src/sparc_netbsd_mach_dep.s src/sparc_sunos4_mach_dep.s $(CORD_SRCS) -+ ia64_save_regs_in_stack.s sparc_mach_dep.S \ -+ sparc_netbsd_mach_dep.s sparc_sunos4_mach_dep.s $(CORD_SRCS) - - DOC_FILES= README.QUICK TODO doc/README.Mac doc/README.OS2 \ - doc/README.amiga doc/README.cords doc/debugging.html \ -@@ -309,17 +309,17 @@ dyn_test: - # gcc -shared -Wl,-soname=libgc.so.0 -o libgc.so.0 $(LIBOBJS) dyn_load.lo - # touch liblinuxgc.so - --mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/src/sparc_mach_dep.S \ -- $(srcdir)/src/sparc_sunos4_mach_dep.s \ -- $(srcdir)/src/ia64_save_regs_in_stack.s \ -- $(srcdir)/src/sparc_netbsd_mach_dep.s $(UTILS) -+mach_dep.o: $(srcdir)/mach_dep.c $(srcdir)/sparc_mach_dep.S \ -+ $(srcdir)/sparc_sunos4_mach_dep.s \ -+ $(srcdir)/ia64_save_regs_in_stack.s \ -+ $(srcdir)/sparc_netbsd_mach_dep.s $(UTILS) - rm -f mach_dep.o -- ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/src/sparc_mach_dep.S -- ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_sunos4_mach_dep.s -- ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/src/sparc_netbsd_mach_dep.s -+ ./if_mach SPARC SOLARIS $(CC) -c -o mach_dep2.o $(srcdir)/sparc_mach_dep.S -+ ./if_mach SPARC OPENBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_sunos4_mach_dep.s -+ ./if_mach SPARC NETBSD $(AS) -o mach_dep2.o $(srcdir)/sparc_netbsd_mach_dep.s - ./if_mach SPARC "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c - ./if_mach SPARC "" ld -r -o mach_dep.o mach_dep1.o mach_dep2.o -- ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/src/ia64_save_regs_in_stack.s -+ ./if_mach IA64 "" as $(AS_ABI_FLAG) -o ia64_save_regs_in_stack.o $(srcdir)/ia64_save_regs_in_stack.s - ./if_mach IA64 "" $(CC) -c -o mach_dep1.o $(SPECIALCFLAGS) $(srcdir)/mach_dep.c - ./if_mach IA64 "" ld -r -o mach_dep.o mach_dep1.o ia64_save_regs_in_stack.o - ./if_not_there mach_dep.o $(CC) -c $(SPECIALCFLAGS) $(srcdir)/mach_dep.c -diff --git a/ia64_save_regs_in_stack.s b/ia64_save_regs_in_stack.s -new file mode 100644 -index 0000000..2b81edf ---- /dev/null -+++ b/ia64_save_regs_in_stack.s -@@ -0,0 +1,11 @@ -+ .text -+ .align 16 -+ .global GC_save_regs_in_stack -+ .proc GC_save_regs_in_stack -+GC_save_regs_in_stack: -+ .body -+ flushrs -+ ;; -+ mov r8=ar.bsp -+ br.ret.sptk.few rp -+ .endp GC_save_regs_in_stack -diff --git a/sparc_mach_dep.S b/sparc_mach_dep.S -new file mode 100644 -index 0000000..d204dc4 ---- /dev/null -+++ b/sparc_mach_dep.S -@@ -0,0 +1,61 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 5, not SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+ .seg "text" -+ .globl GC_save_regs_in_stack -+GC_save_regs_in_stack: -+#if defined(__arch64__) || defined(__sparcv9) -+ save %sp,-128,%sp -+ flushw -+ ret -+ restore %sp,2047+128,%o0 -+#else /* 32 bit SPARC */ -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+#endif /* 32 bit SPARC */ -+.GC_save_regs_in_stack_end: -+ .size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack -+ -+! GC_clear_stack_inner(arg, limit) clears stack area up to limit and -+! returns arg. Stack clearing is crucial on SPARC, so we supply -+! an assembly version that s more careful. Assumes limit is hotter -+! than sp, and limit is 8 byte aligned. -+ .globl GC_clear_stack_inner -+GC_clear_stack_inner: -+#if defined(__arch64__) || defined(__sparcv9) -+ mov %sp,%o2 ! Save sp -+ add %sp,2047-8,%o3 ! p = sp+bias-8 -+ add %o1,-2047-192,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ stx %g0,[%o3] ! *(long *)p = 0 -+ cmp %o3,%o1 -+ bgu,pt %xcc, loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -+#else /* 32 bit SPARC */ -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -+#endif /* 32 bit SPARC */ -+.GC_clear_stack_inner_end: -+ .size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner -diff --git a/sparc_netbsd_mach_dep.s b/sparc_netbsd_mach_dep.s -new file mode 100644 -index 0000000..14feb15 ---- /dev/null -+++ b/sparc_netbsd_mach_dep.s -@@ -0,0 +1,34 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+#include "machine/asm.h" -+ -+ .seg "text" -+ .globl _C_LABEL(GC_save_regs_in_stack) -+ .globl _C_LABEL(GC_push_regs) -+_C_LABEL(GC_save_regs_in_stack): -+_C_LABEL(GC_push_regs): -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+ -+ .globl _C_LABEL(GC_clear_stack_inner) -+_C_LABEL(GC_clear_stack_inner): -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -diff --git a/sparc_sunos4_mach_dep.s b/sparc_sunos4_mach_dep.s -new file mode 100644 -index 0000000..923f5ea ---- /dev/null -+++ b/sparc_sunos4_mach_dep.s -@@ -0,0 +1,32 @@ -+! SPARCompiler 3.0 and later apparently no longer handles -+! asm outside functions. So we need a separate .s file -+! This is only set up for SunOS 4. -+! Assumes this is called before the stack contents are -+! examined. -+ -+ .seg "text" -+ .globl _GC_save_regs_in_stack -+ .globl _GC_push_regs -+_GC_save_regs_in_stack: -+_GC_push_regs: -+ ta 0x3 ! ST_FLUSH_WINDOWS -+ mov %sp,%o0 -+ retl -+ nop -+ -+ .globl _GC_clear_stack_inner -+_GC_clear_stack_inner: -+ mov %sp,%o2 ! Save sp -+ add %sp,-8,%o3 ! p = sp-8 -+ clr %g1 ! [g0,g1] = 0 -+ add %o1,-0x60,%sp ! Move sp out of the way, -+ ! so that traps still work. -+ ! Includes some extra words -+ ! so we can be sloppy below. -+loop: -+ std %g0,[%o3] ! *(long long *)p = 0 -+ cmp %o3,%o1 -+ bgu loop ! if (p > limit) goto loop -+ add %o3,-8,%o3 ! p -= 8 (delay slot) -+ retl -+ mov %o2,%sp ! Restore sp., delay slot -diff --git a/src/ia64_save_regs_in_stack.s b/src/ia64_save_regs_in_stack.s -deleted file mode 100644 -index 2b81edf..0000000 ---- a/src/ia64_save_regs_in_stack.s -+++ /dev/null -@@ -1,11 +0,0 @@ -- .text -- .align 16 -- .global GC_save_regs_in_stack -- .proc GC_save_regs_in_stack --GC_save_regs_in_stack: -- .body -- flushrs -- ;; -- mov r8=ar.bsp -- br.ret.sptk.few rp -- .endp GC_save_regs_in_stack -diff --git a/src/sparc_mach_dep.S b/src/sparc_mach_dep.S -deleted file mode 100644 -index d204dc4..0000000 ---- a/src/sparc_mach_dep.S -+++ /dev/null -@@ -1,61 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 5, not SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- -- .seg "text" -- .globl GC_save_regs_in_stack --GC_save_regs_in_stack: --#if defined(__arch64__) || defined(__sparcv9) -- save %sp,-128,%sp -- flushw -- ret -- restore %sp,2047+128,%o0 --#else /* 32 bit SPARC */ -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop --#endif /* 32 bit SPARC */ --.GC_save_regs_in_stack_end: -- .size GC_save_regs_in_stack,.GC_save_regs_in_stack_end-GC_save_regs_in_stack -- --! GC_clear_stack_inner(arg, limit) clears stack area up to limit and --! returns arg. Stack clearing is crucial on SPARC, so we supply --! an assembly version that s more careful. Assumes limit is hotter --! than sp, and limit is 8 byte aligned. -- .globl GC_clear_stack_inner --GC_clear_stack_inner: --#if defined(__arch64__) || defined(__sparcv9) -- mov %sp,%o2 ! Save sp -- add %sp,2047-8,%o3 ! p = sp+bias-8 -- add %o1,-2047-192,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- stx %g0,[%o3] ! *(long *)p = 0 -- cmp %o3,%o1 -- bgu,pt %xcc, loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --#else /* 32 bit SPARC */ -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --#endif /* 32 bit SPARC */ --.GC_clear_stack_inner_end: -- .size GC_clear_stack_inner,.GC_clear_stack_inner_end-GC_clear_stack_inner -diff --git a/src/sparc_netbsd_mach_dep.s b/src/sparc_netbsd_mach_dep.s -deleted file mode 100644 -index 14feb15..0000000 ---- a/src/sparc_netbsd_mach_dep.s -+++ /dev/null -@@ -1,34 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- --#include "machine/asm.h" -- -- .seg "text" -- .globl _C_LABEL(GC_save_regs_in_stack) -- .globl _C_LABEL(GC_push_regs) --_C_LABEL(GC_save_regs_in_stack): --_C_LABEL(GC_push_regs): -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop -- -- .globl _C_LABEL(GC_clear_stack_inner) --_C_LABEL(GC_clear_stack_inner): -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot -diff --git a/src/sparc_sunos4_mach_dep.s b/src/sparc_sunos4_mach_dep.s -deleted file mode 100644 -index 923f5ea..0000000 ---- a/src/sparc_sunos4_mach_dep.s -+++ /dev/null -@@ -1,32 +0,0 @@ --! SPARCompiler 3.0 and later apparently no longer handles --! asm outside functions. So we need a separate .s file --! This is only set up for SunOS 4. --! Assumes this is called before the stack contents are --! examined. -- -- .seg "text" -- .globl _GC_save_regs_in_stack -- .globl _GC_push_regs --_GC_save_regs_in_stack: --_GC_push_regs: -- ta 0x3 ! ST_FLUSH_WINDOWS -- mov %sp,%o0 -- retl -- nop -- -- .globl _GC_clear_stack_inner --_GC_clear_stack_inner: -- mov %sp,%o2 ! Save sp -- add %sp,-8,%o3 ! p = sp-8 -- clr %g1 ! [g0,g1] = 0 -- add %o1,-0x60,%sp ! Move sp out of the way, -- ! so that traps still work. -- ! Includes some extra words -- ! so we can be sloppy below. --loop: -- std %g0,[%o3] ! *(long long *)p = 0 -- cmp %o3,%o1 -- bgu loop ! if (p > limit) goto loop -- add %o3,-8,%o3 ! p -= 8 (delay slot) -- retl -- mov %o2,%sp ! Restore sp., delay slot --- -1.7.10.4 - diff --git a/package.bak/bdwgc/0004-configure-match-uclinux-pattern.patch b/package.bak/bdwgc/0004-configure-match-uclinux-pattern.patch deleted file mode 100644 index 78bad1c595..0000000000 --- a/package.bak/bdwgc/0004-configure-match-uclinux-pattern.patch +++ /dev/null @@ -1,32 +0,0 @@ -From f8ecc7fb09adf34a23d324f373e667c81311fc1c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 6 Aug 2016 23:24:35 +0200 -Subject: [PATCH] configure: match uclinux pattern - -bdwgc does not recognize "uclinux" as a valid OS part of the target -tuple which is used by some arm cortex-M toolchains. - -Fixes: -http://autobuild.buildroot.net/results/94f/94fbc1e5afe183e5b071d1e869b2d780025389e2 - -Signed-off-by: Romain Naour ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b1ce2b2..a69d101 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ case "$THREADS" in - AC_DEFINE(THREAD_LOCAL_ALLOC) - AC_MSG_WARN("Explicit GC_INIT() calls may be required."); - ;; -- *-*-linux*) -+ *-*-*linux*) - AC_DEFINE(GC_LINUX_THREADS) - AC_DEFINE(_REENTRANT) - ;; --- -2.5.5 - diff --git a/package.bak/bdwgc/Config.in b/package.bak/bdwgc/Config.in deleted file mode 100644 index 95139efb93..0000000000 --- a/package.bak/bdwgc/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_BDWGC - bool "bdwgc" - depends on BR2_PACKAGE_LIBATOMIC_OPS_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.bak/bdwgc/bdwgc.hash b/package.bak/bdwgc/bdwgc.hash deleted file mode 100644 index 44414e4efa..0000000000 --- a/package.bak/bdwgc/bdwgc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 63320ad7c45460e4a40e03f5aa4c6893783f21a16416c3282b994f933312afa2 gc-7.4.2.tar.gz diff --git a/package.bak/bdwgc/bdwgc.mk b/package.bak/bdwgc/bdwgc.mk deleted file mode 100644 index 0e9054df3c..0000000000 --- a/package.bak/bdwgc/bdwgc.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# bdwgc -# -################################################################################ - -BDWGC_VERSION = 7.4.2 -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 -HOST_BDWGC_DEPENDENCIES = host-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 - -BDWGC_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_sparc),y) -BDWGC_CFLAGS += -DAO_NO_SPARC_V9 -endif -ifeq ($(BR2_STATIC_LIBS),y) -BDWGC_CFLAGS += -DGC_NO_DLOPEN -endif - -# Ensure we use the system libatomic_ops, and not the internal one. -BDWGC_CONF_OPTS = --with-libatomic-ops=yes CFLAGS="$(BDWGC_CFLAGS)" -HOST_BDWGC_CONF_OPTS = --with-libatomic-ops=yes - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/beecrypt/0001-cppglue.cxx-cplusplus-only.patch b/package.bak/beecrypt/0001-cppglue.cxx-cplusplus-only.patch deleted file mode 100644 index 298e3eba93..0000000000 --- a/package.bak/beecrypt/0001-cppglue.cxx-cplusplus-only.patch +++ /dev/null @@ -1,28 +0,0 @@ -Makefile.am: Only compile/link cppglue.cxx if --with-cplusplus is used - -Bloats libbeecrypt for no use and breaks build on systems without a C++ -compiler. - -Signed-off-by: Peter Korsgaard ---- - Makefile.am | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -Index: beecrypt-4.2.1/Makefile.am -=================================================================== ---- beecrypt-4.2.1.orig/Makefile.am -+++ beecrypt-4.2.1/Makefile.am -@@ -62,7 +62,12 @@ - - lib_LTLIBRARIES = libbeecrypt.la - --libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c cppglue.cxx -+libbeecrypt_la_SOURCES = aes.c base64.c beecrypt.c blockmode.c blockpad.c blowfish.c dhies.c dldp.c dlkp.c dlpk.c dlsvdp-dh.c dsa.c elgamal.c endianness.c entropy.c fips186.c hmac.c hmacmd5.c hmacsha1.c hmacsha224.c hmacsha256.c md4.c md5.c hmacsha384.c hmacsha512.c memchunk.c mp.c mpbarrett.c mpnumber.c mpprime.c mtprng.c pkcs1.c pkcs12.c ripemd128.c ripemd160.c ripemd256.c ripemd320.c rsa.c rsakp.c rsapk.c sha1.c sha224.c sha256.c sha384.c sha512.c sha2k32.c sha2k64.c timestamp.c -+ -+if WITH_CPLUSPLUS -+libbeecrypt_la_SOURCES += cppglue.cxx -+endif -+ - libbeecrypt_la_DEPENDENCIES = $(BEECRYPT_OBJECTS) - libbeecrypt_la_LIBADD = blowfishopt.lo mpopt.lo sha1opt.lo $(OPENMP_LIBS) - libbeecrypt_la_LDFLAGS = -no-undefined -version-info $(LIBBEECRYPT_LT_CURRENT):$(LIBBEECRYPT_LT_REVISION):$(LIBBEECRYPT_LT_AGE) diff --git a/package.bak/beecrypt/0002-icu-check-cross-compile.patch b/package.bak/beecrypt/0002-icu-check-cross-compile.patch deleted file mode 100644 index cc02116506..0000000000 --- a/package.bak/beecrypt/0002-icu-check-cross-compile.patch +++ /dev/null @@ -1,31 +0,0 @@ -configure: Use AC_COMPILE_IFELSE for ICU check for cross compilation compat - -AC_RUN_IFELSE doesn't work when cross compiling, but we can do the -check in the preprocessor instead, so use AC_COMPILE_IFELSE instead. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -Index: beecrypt-4.2.1/configure.ac -=================================================================== ---- beecrypt-4.2.1.orig/configure.ac -+++ beecrypt-4.2.1/configure.ac -@@ -295,13 +295,13 @@ - if test "$ac_with_cplusplus" = yes; then - AC_MSG_CHECKING([for IBM's ICU library version >= 2.8]) - AC_LANG_PUSH(C) -- AC_RUN_IFELSE([ -+ AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([[#include ]],[[ - #if U_ICU_VERSION_MAJOR_NUM < 2 -- exit(1); -+ #error too old - #elif U_ICU_VERSION_MAJOR_NUM == 2 - # if U_ICU_VERSION_MINOR_NUM < 8 -- exit(1); -+ #error too old - # else - exit(0); - # endif diff --git a/package.bak/beecrypt/0003-build-system.patch b/package.bak/beecrypt/0003-build-system.patch deleted file mode 100644 index 05746899ef..0000000000 --- a/package.bak/beecrypt/0003-build-system.patch +++ /dev/null @@ -1,173 +0,0 @@ -Fix build with BR2_ENABLE_DEBUG=yes, no need for expert mode anymore - -Otherwise configure issues this error message: -configure: error: --enable-debug cannot be used in conjunction with --enable-expert-mode - -Downloaded from Gentoo: -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/beecrypt/files/beecrypt-4.2.1-build-system.patch?revision=1.2&view=markup - -This patch also removes the hard-coded CFLAGS provided by beecrypt in favour -of the CFLAGS provided by buildroot. - -Signed-off-by: Bernd Kuhls - ---- beecrypt-4.2.1/configure.ac -+++ beecrypt-4.2.1/configure.ac -@@ -11,7 +11,7 @@ - - # Checks for package options - AC_ARG_ENABLE(expert-mode, [ --enable-expert-mode follow user-defined CFLAGS settings [[default=no]]],[ -- ac_enable_expert_mode=yes -+ ac_enable_expert_mode=$enableval - ],[ - if test "X$CFLAGS" != "X"; then - echo "enabling expert mode" -@@ -25,7 +25,7 @@ - if test "$ac_enable_expert_mode" = yes; then - AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode]) - fi -- ac_enable_debug=yes -+ ac_enable_debug=$enableval - ],[ - ac_enable_debug=no - ]) -@@ -456,7 +456,7 @@ - ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`" - ]) - AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [ -- ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'` -+ ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'` - ]) - fi - fi ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -498,15 +498,6 @@ AC_DEFUN([BEE_GNU_CC],[ - AC_SUBST(OPENMP_LIBS,"-lgomp") - fi - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona) -- CC="$CC -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CC="$CC -m32" -- CCAS="$CCAS -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -525,17 +516,8 @@ AC_DEFUN([BEE_GNU_CC],[ - aix*) - CC="$CC -maix64" - ;; -- linux*) -- CC="$CC -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CC="$CC -m32" -- ;; -- sparc64 | sparcv9*) -- CC="$CC -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then -@@ -646,14 +646,6 @@ dnl BEE_GNU_CXX - AC_DEFUN([BEE_GNU_CXX],[ - AC_REQUIRE([AC_PROG_CXX]) - case $bc_target_arch in -- x86_64 | athlon64 | athlon-fx | k8 | opteron | em64t | nocona | core2) -- CXX="$CXX -m64" -- ;; -- i[[3456]]86 | \ -- pentium* | \ -- athlon*) -- CXX="$CXX -m32" -- ;; - ia64) - case $target_os in - # HP/UX on Itanium needs to be told that a long is 64-bit! -@@ -672,17 +664,8 @@ AC_DEFUN([BEE_GNU_CXX],[ - aix*) - CXX="$CXX -maix64" - ;; -- linux*) -- CXX="$CXX -m64" -- ;; - esac - ;; -- sparc | sparcv8*) -- CXX="$CXX -m32" -- ;; -- sparc64 | sparcv9*) -- CXX="$CXX -m64" -- ;; - esac - # Certain platforms needs special flags for multi-threaded code - if test "$ac_enable_threads" = yes; then ---- beecrypt-4.2.1/java/Makefile.am -+++ beecrypt-4.2.1/java/Makefile.am -@@ -26,7 +26,7 @@ - - INCLUDES = -I$(top_srcdir)/include - --libaltdir=$(prefix)/lib@LIBALT@ -+libaltdir=$(libdir) - - libalt_LTLIBRARIES = libbeecrypt_java.la - ---- beecrypt-4.2.1/acinclude.m4 -+++ beecrypt-4.2.1/acinclude.m4 -@@ -1589,20 +1589,5 @@ - AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t) - ]) -- --AH_BOTTOM([ --#if ENABLE_THREADS --# ifndef _REENTRANT --# define _REENTRANT --# endif --# if LINUX --# define _LIBC_REENTRANT --# endif --#else --# ifdef _REENTRANT --# undef _REENTRANT --# endif --#endif --]) - - - dnl BEE_THREAD_LOCAL_STORAGE -@@ -1623,7 +1609,5 @@ - ]) - - AH_BOTTOM([ --#if !ENABLE_THREAD_LOCAL_STORAGE --# define __thread --#endif -+#include "config.threads.h" - ]) ---- beecrypt-4.2.1/config.threads.h -+++ beecrypt-4.2.1/config.threads.h -@@ -0,0 +1,16 @@ -+#if ENABLE_THREADS -+# ifndef _REENTRANT -+# define _REENTRANT -+# endif -+# if LINUX -+# define _LIBC_REENTRANT -+# endif -+#else -+# ifdef _REENTRANT -+# undef _REENTRANT -+# endif -+#endif -+ -+#if !ENABLE_THREAD_LOCAL_STORAGE -+# define __thread -+#endif diff --git a/package.bak/beecrypt/0004-gcc-4.7.patch b/package.bak/beecrypt/0004-gcc-4.7.patch deleted file mode 100644 index 767f789069..0000000000 --- a/package.bak/beecrypt/0004-gcc-4.7.patch +++ /dev/null @@ -1,19 +0,0 @@ -Really fixes gcc-4.7 related compile error: -../../include/beecrypt/c++/util/AbstractSet.h:59:27: error: 'containsAll' was not declared in this scope, and no declarations were found by argument-dependent lookup at the point of instantiation [-fpermissive] - -Downloaded from upstream bugtracker: -http://sourceforge.net/p/beecrypt/patches/10/ - -Signed-off-by: Bernd Kuhls - ---- a/include/beecrypt/c++/util/AbstractSet.h -+++ b/include/beecrypt/c++/util/AbstractSet.h -@@ -56,7 +56,7 @@ - if (c->size() != size()) - return false; - -- return containsAll(*c); -+ return this->containsAll(*c); - } - return false; - } diff --git a/package.bak/beecrypt/Config.in b/package.bak/beecrypt/Config.in deleted file mode 100644 index 069f3d5cfd..0000000000 --- a/package.bak/beecrypt/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -comment "beecrypt needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_BEECRYPT - bool "beecrypt" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Beecrypt is a general-purpose cryptography library. - - http://beecrypt.sf.net - -if BR2_PACKAGE_BEECRYPT - -config BR2_PACKAGE_BEECRYPT_CPP - bool "C++ support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # icu - depends on !BR2_BINFMT_FLAT # icu - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ICU - help - Enable C++ support. This pulls in the (large) icu package. - -comment "C++ support needs a toolchain w/ C++, wchar, dynamic libraries" - depends on !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR \ - || BR2_STATIC_LIBS - -endif # BR2_PACKAGE_BEECRYPT diff --git a/package.bak/beecrypt/beecrypt.hash b/package.bak/beecrypt/beecrypt.hash deleted file mode 100644 index e697c26f08..0000000000 --- a/package.bak/beecrypt/beecrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 286f1f56080d1a6b1d024003a5fa2158f4ff82cae0c6829d3c476a4b5898c55d beecrypt-4.2.1.tar.gz diff --git a/package.bak/beecrypt/beecrypt.mk b/package.bak/beecrypt/beecrypt.mk deleted file mode 100644 index bd29b3b2c8..0000000000 --- a/package.bak/beecrypt/beecrypt.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# beecrypt -# -################################################################################ - -BEECRYPT_VERSION = 4.2.1 -BEECRYPT_SITE = http://downloads.sourceforge.net/project/beecrypt/beecrypt/$(BEECRYPT_VERSION) -BEECRYPT_AUTORECONF = YES -BEECRYPT_INSTALL_STAGING = YES -BEECRYPT_LICENSE = LGPLv2.1+ -BEECRYPT_LICENSE_FILES = COPYING.LIB - -BEECRYPT_CONF_OPTS = \ - --disable-expert-mode \ - --without-java \ - --without-python \ - --disable-openmp - -# disable optimized m68k assembly as it doesn't compile for coldfire -ifeq ($(BR2_m68k_cf),y) -BEECRYPT_CONF_OPTS += --enable-debug -endif - -# arm asm optimization doesn't work for thumb-only -ifeq ($(BR2_arm):$(BR2_ARM_CPU_HAS_ARM),y:) -BEECRYPT_CONF_OPTS += --enable-debug -endif - -ifeq ($(BR2_PACKAGE_BEECRYPT_CPP),y) -BEECRYPT_DEPENDENCIES += icu -BEECRYPT_CONF_OPTS += --with-cplusplus -else -BEECRYPT_CONF_OPTS += --without-cplusplus - -# automake/libtool uses the C++ compiler to link libbeecrypt because of -# (the optional) cppglue.cxx. Force it to use the C compiler instead. -define BEECRYPT_LINK_WITH_CC - $(SED) 's/--tag=CXX/--tag=CC/g' $(@D)/Makefile -endef - -BEECRYPT_POST_CONFIGURE_HOOKS += BEECRYPT_LINK_WITH_CC -endif - -$(eval $(autotools-package)) diff --git a/package.bak/bellagio/0001-drop-werror.patch b/package.bak/bellagio/0001-drop-werror.patch deleted file mode 100644 index 39baf421bb..0000000000 --- a/package.bak/bellagio/0001-drop-werror.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] don't force -Werror in CFLAGS - -Released software shouldn't get built with -Werror. - -Signed-of-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libomxil-bellagio-0.9.3/configure.ac -=================================================================== ---- libomxil-bellagio-0.9.3.orig/configure.ac -+++ libomxil-bellagio-0.9.3/configure.ac -@@ -5,7 +5,7 @@ - AC_PREREQ([2.59]) - - AC_CONFIG_HEADERS([config.h]) --CFLAGS="${CFLAGS} -Wall -Werror" -+CFLAGS="${CFLAGS} -Wall" - - ################################################################################ - # Set the shared versioning info, according to section 6.3 of the libtool info # diff --git a/package.bak/bellagio/0002-dynamicloader-linking.patch b/package.bak/bellagio/0002-dynamicloader-linking.patch deleted file mode 100644 index 5e4243d5e1..0000000000 --- a/package.bak/bellagio/0002-dynamicloader-linking.patch +++ /dev/null @@ -1,16 +0,0 @@ -When libomxdynamicloader.so is loaded, it complains that RM_Deinit can't be resolved. -Link explicitly against omxil-bellagio so that ld.so can find the reference. - -Signed-off-by: Qais Yousef - ---- bellagio-0.9.3/src/dynamic_loader/Makefile.am.old 2012-03-23 15:07:47.379021034 +0000 -+++ bellagio-0.9.3/src/dynamic_loader/Makefile.am 2012-03-23 15:08:47.563034818 +0000 -@@ -3,7 +3,7 @@ - omxdynamicloader_LTLIBRARIES = libomxdynamicloader.la - libomxdynamicloader_la_SOURCES = ste_dynamic_component_loader.c ste_dynamic_component_loader.h - --libomxdynamicloader_la_LDFLAGS = -+libomxdynamicloader_la_LDFLAGS = -lomxil-bellagio -L$(abs_top_srcdir)/src/.libs - libomxdynamicloader_la_CFLAGS = -I$(top_srcdir)/include \ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/base \ diff --git a/package.bak/bellagio/0003-parallel-build.patch b/package.bak/bellagio/0003-parallel-build.patch deleted file mode 100644 index 767bbeb2aa..0000000000 --- a/package.bak/bellagio/0003-parallel-build.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix dependency issue to allow parallel build - -Signed-off-by: Qais Yousef - -Index: bellagio-0.9.3/src/Makefile.am -=================================================================== ---- bellagio-0.9.3.orig/src/Makefile.am -+++ bellagio-0.9.3/src/Makefile.am -@@ -8,6 +8,7 @@ omxregister_bellagio_SOURCES = omxregist - omxregister_bellagio_CFLAGS = -DOMXILCOMPONENTSPATH=\"$(plugindir)/\" \ - -I$(top_srcdir)/include - omxregister_bellagio_LDFLAGS = -lomxil-bellagio -L$(builddir) -+omxregister_bellagio_DEPENDENCIES = libomxil-bellagio.la - - lib_LTLIBRARIES = libomxil-bellagio.la - libomxil_bellagio_la_SOURCES = component_loader.h \ diff --git a/package.bak/bellagio/0004-segfault-on-removeFromWaitResource.patch b/package.bak/bellagio/0004-segfault-on-removeFromWaitResource.patch deleted file mode 100644 index f52a2c33f4..0000000000 --- a/package.bak/bellagio/0004-segfault-on-removeFromWaitResource.patch +++ /dev/null @@ -1,37 +0,0 @@ -We always access globalComponentList[] at indexComponent=-1 which causes a -segfault. Use i as the index instead. - -Signed-off-by: Qais Yousef - ---- bellagio-0.9.3/src/omx_reference_resource_manager.c.old 2012-03-13 10:15:25.743940980 +0000 -+++ bellagio-0.9.3/src/omx_reference_resource_manager.c 2012-03-13 10:18:02.201971009 +0000 -@@ -485,7 +485,6 @@ - OMX_ERRORTYPE RM_removeFromWaitForResource(OMX_COMPONENTTYPE *openmaxStandComp) { - omx_base_component_PrivateType* omx_base_component_Private; - int i = 0; -- int indexComponent = -1; - - DEBUG(DEB_LEV_FUNCTION_NAME, "In %s\n", __func__); - omx_base_component_Private = (omx_base_component_PrivateType*)openmaxStandComp->pComponentPrivate; -@@ -493,16 +492,13 @@ - while(listOfcomponentRegistered[i].component_name != NULL ) { - if (!strcmp(listOfcomponentRegistered[i].component_name, omx_base_component_Private->name)) { - // found component in the list of the resource manager -- removeElemFromList(&globalComponentList[indexComponent], openmaxStandComp); -- break; -+ removeElemFromList(&globalComponentList[i], openmaxStandComp); -+ DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ return OMX_ErrorNone; - } - i++; - } -- if (indexComponent <0) { -- // No resource to be handled -- DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); -- return OMX_ErrorNone; -- } -- DEBUG(DEB_LEV_FUNCTION_NAME, "Out of %s\n", __func__); -+ // No resource to be handled -+ DEBUG(DEB_LEV_ERR, "In %s No resource to be handled\n", __func__); - return OMX_ErrorNone; - } diff --git a/package.bak/bellagio/0005-fix-doc-installation-path.patch b/package.bak/bellagio/0005-fix-doc-installation-path.patch deleted file mode 100644 index 06b0743e26..0000000000 --- a/package.bak/bellagio/0005-fix-doc-installation-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile.am: fix bogus docdir definition - -The definition of the docdir variable uses $(DESTDIR). However, -automake already prefixes all *dir variables automatically with -DESTDIR, which causes the documentation to be installed in -$(DESTDIR)/$(DESTDIR)/usr/share/doc/... - -Fix this by removing the $(DESTDIR) part of the docdir definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -7,7 +7,7 @@ - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libomxil-bellagio.pc - --docdir = $(DESTDIR)$(prefix)/share/doc/@PACKAGE@ -+docdir = $(prefix)/share/doc/@PACKAGE@ - doc_DATA = README \ - ChangeLog \ - TODO diff --git a/package.bak/bellagio/Config.in b/package.bak/bellagio/Config.in deleted file mode 100644 index 8ad1867399..0000000000 --- a/package.bak/bellagio/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_BELLAGIO - bool "bellagio" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HAS_LIBOPENMAX - help - Bellagio is an opensource implementation of the - OpenMAX IL API. - - OpenMAX Integration Layer (IL) is a standard API - to access Multimedia Components on mobile platforms. - It has been defined by the Khronos group. - By means of the OpenMAX IL API, multimedia frameworks - can access hardware accelerators on platforms that - provide it. - - http://omxil.sourceforge.net/ - -if BR2_PACKAGE_BELLAGIO - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - default "bellagio" - -endif - -comment "bellagio needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/bellagio/bellagio.hash b/package.bak/bellagio/bellagio.hash deleted file mode 100644 index 914dd7c369..0000000000 --- a/package.bak/bellagio/bellagio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 593c0729c8ef8c1467b3bfefcf355ec19a46dd92e31bfc280e17d96b0934d74c libomxil-bellagio-0.9.3.tar.gz diff --git a/package.bak/bellagio/bellagio.mk b/package.bak/bellagio/bellagio.mk deleted file mode 100644 index 6db753d504..0000000000 --- a/package.bak/bellagio/bellagio.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# bellagio -# -################################################################################ - -BELLAGIO_VERSION = 0.9.3 -BELLAGIO_SOURCE = libomxil-bellagio-$(BELLAGIO_VERSION).tar.gz -BELLAGIO_SITE = http://downloads.sourceforge.net/project/omxil/omxil/Bellagio%20$(BELLAGIO_VERSION) -BELLAGIO_AUTORECONF = YES -BELLAGIO_INSTALL_STAGING = YES -BELLAGIO_LICENSE = LGPLv2.1+ -BELLAGIO_LICENSE_FILES = COPYING -BELLAGIO_PROVIDES = libopenmax - -$(eval $(autotools-package)) diff --git a/package.bak/benejson/0001-c-std.patch b/package.bak/benejson/0001-c-std.patch deleted file mode 100644 index 2330b7905f..0000000000 --- a/package.bak/benejson/0001-c-std.patch +++ /dev/null @@ -1,22 +0,0 @@ -Some older toolchains do not recognize c11 as a valid standard. -Since the code actually builds well with c99, use that instead. - -The only two non-standard features used are // comments -and for(int i ...) declarations in C. - -Signed-off-by: Alex Suykov - ---- a/SConstruct -+++ b/SConstruct -@@ -9,9 +9,8 @@ mydir = os.getcwd() - #Set default C++ building flags for both libraries and executables - default_env = Environment(ENV = os.environ) - default_env.Append(CPPPATH = [mydir + '/include']) --default_env.Append(CCFLAGS = ' -Wall -pedantic') --default_env.Append(CFLAGS = ' -std=c11') --default_env.Append(CXXFLAGS = ' -std=c++11') -+default_env.Append(CFLAGS = ' -Wall') -+default_env.Append(CFLAGS = ' -std=c99') - #default_env.Append(CCFLAGS = ' -O2 -fomit-frame-pointer') - default_env.Append(CCFLAGS = ' -O0 -g') - diff --git a/package.bak/benejson/Config.in b/package.bak/benejson/Config.in deleted file mode 100644 index cb86d672d4..0000000000 --- a/package.bak/benejson/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_BENEJSON - bool "benejson" - depends on BR2_INSTALL_LIBSTDCPP - help - benejson is a buffering SAX-style JSON parser library. - The library package contains 3 major components: - - - benejson.js: SAX-style parser written in Javascript - - PullParser: A C++ class for JSON pull parsing - - Core: The parsing core with minimal dependencies - - https://codehero.github.io/benejson/ - -comment "benejson needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/benejson/benejson.hash b/package.bak/benejson/benejson.hash deleted file mode 100644 index 1dfda90d3f..0000000000 --- a/package.bak/benejson/benejson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Localy computed -sha256 2ce5f3c2323500bdf651e7fcaecbd1011997141e6067567b8d2caa4cf7182f4a benejson-0.9.7.tar.gz diff --git a/package.bak/benejson/benejson.mk b/package.bak/benejson/benejson.mk deleted file mode 100644 index 680e5b5bda..0000000000 --- a/package.bak/benejson/benejson.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# benejson -# -################################################################################ - -BENEJSON_VERSION = 0.9.7 -BENEJSON_SITE = $(call github,codehero,benejson,$(BENEJSON_VERSION)) -BENEJSON_LICENSE = MIT -BENEJSON_LICENSE_FILES = LICENSE -BENEJSON_INSTALL_STAGING = YES -BENEJSON_DEPENDENCIES = host-scons - -# wchar support needs to be manually disabled -ifeq ($(BR2_USE_WCHAR),) -define BENEJSON_DISABLE_WCHAR - $(SED) 's,^#define BNJ_WCHAR_SUPPORT,#undef BNJ_WCHAR_SUPPORT,' \ - $(@D)/benejson/benejson.h -endef -BENEJSON_POST_PATCH_HOOKS += BENEJSON_DISABLE_WCHAR -endif - -BENEJSON_SCONS_TARGETS = include - -ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -BENEJSON_SCONS_TARGETS += lib/libbenejson.a -define BENEJSON_INSTALL_STATIC_LIB - $(INSTALL) -D -m 0644 $(@D)/lib/libbenejson.a \ - $(1)/usr/lib/libbenejson.a -endef -endif # Static enabled - -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -BENEJSON_SCONS_TARGETS += lib/libbenejson.so -define BENEJSON_INSTALL_SHARED_LIB - $(INSTALL) -D -m 0644 $(@D)/lib/libbenejson.so \ - $(1)/usr/lib/libbenejson.so -endef -endif # Shared enabled - -define BENEJSON_BUILD_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) CROSS=$(TARGET_CROSS) \ - $(SCONS) $(BENEJSON_SCONS_TARGETS)) -endef - -define BENEJSON_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/include/benejson/benejson.h \ - $(STAGING_DIR)/usr/include/benejson/benejson.h; \ - $(INSTALL) -D -m 0644 $(@D)/include/benejson/pull.hh \ - $(STAGING_DIR)/usr/include/benejson/pull.hh - $(call BENEJSON_INSTALL_STATIC_LIB,$(STAGING_DIR)) - $(call BENEJSON_INSTALL_SHARED_LIB,$(STAGING_DIR)) -endef - -define BENEJSON_INSTALL_TARGET_CMDS - $(call BENEJSON_INSTALL_SHARED_LIB,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/berkeleydb/Config.in b/package.bak/berkeleydb/Config.in deleted file mode 100644 index 5531b04463..0000000000 --- a/package.bak/berkeleydb/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_BERKELEYDB - bool "berkeleydb" - help - The Berkeley database. A very common library for database - applications. - - http://www.sleepycat.com/products/db.shtml - -if BR2_PACKAGE_BERKELEYDB - -config BR2_PACKAGE_BERKELEYDB_COMPAT185 - bool "DB 1.85 compatibility" - help - Build and install DB 1.85 compatibility API. - -config BR2_PACKAGE_BERKELEYDB_TOOLS - bool "install tools" - help - Install berkeleydb tools, mostly useful for debugging purposes. - -endif diff --git a/package.bak/berkeleydb/berkeleydb.hash b/package.bak/berkeleydb/berkeleydb.hash deleted file mode 100644 index e47c578cbe..0000000000 --- a/package.bak/berkeleydb/berkeleydb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 76a25560d9e52a198d37a31440fd07632b5f1f8f9f2b6d5438f4bc3e7c9013ef db-5.3.28.NC.tar.gz diff --git a/package.bak/berkeleydb/berkeleydb.mk b/package.bak/berkeleydb/berkeleydb.mk deleted file mode 100644 index a315943ee6..0000000000 --- a/package.bak/berkeleydb/berkeleydb.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# berkeleydb -# -################################################################################ - -# Since BerkeleyDB version 6 and above are licensed under the Affero -# GPL (AGPL), we want to keep this 'bdb' package at version 5.x to -# avoid licensing issues. -# BerkeleyDB version 6 or above should be provided by a dedicated -# package instead. -BERKELEYDB_VERSION = 5.3.28 -BERKELEYDB_SITE = http://download.oracle.com/berkeley-db -BERKELEYDB_SOURCE = db-$(BERKELEYDB_VERSION).NC.tar.gz -BERKELEYDB_SUBDIR = build_unix -BERKELEYDB_LICENSE = BerkeleyDB License -BERKELEYDB_LICENSE_FILES = LICENSE -BERKELEYDB_INSTALL_STAGING = YES -BERKELEYDB_BINARIES = db_archive db_checkpoint db_deadlock db_dump \ - db_hotbackup db_load db_log_verify db_printlog db_recover db_replicate \ - db_stat db_tuner db_upgrade db_verify - -# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 -ifeq ($(BR2_m68k_cf),y) -BERKELEYDB_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" -endif - -# build directory can't be the directory where configure are there, so.. -define BERKELEYDB_CONFIGURE_CMDS - (cd $(@D)/build_unix; rm -rf config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - $(BERKELEYDB_CONF_ENV) \ - ../dist/configure $(QUIET) \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --with-gnu-ld \ - $(if $(BR2_INSTALL_LIBSTDCPP),--enable-cxx,--disable-cxx) \ - --disable-java \ - --disable-tcl \ - $(if $(BR2_PACKAGE_BERKELEYDB_COMPAT185),--enable-compat185,--disable-compat185) \ - $(SHARED_STATIC_LIBS_OPTS) \ - --with-pic \ - --enable-o_direct \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-mutexsupport,--disable-mutexsupport) \ - ) -endef - -ifneq ($(BR2_PACKAGE_BERKELEYDB_TOOLS),y) - -define BERKELEYDB_REMOVE_TOOLS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/, $(BERKELEYDB_BINARIES)) -endef - -BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_TOOLS - -endif - -define BERKELEYDB_REMOVE_DOCS - rm -rf $(TARGET_DIR)/usr/docs -endef - -BERKELEYDB_POST_INSTALL_TARGET_HOOKS += BERKELEYDB_REMOVE_DOCS - -$(eval $(autotools-package)) diff --git a/package.bak/bind/0002-cross.patch b/package.bak/bind/0002-cross.patch deleted file mode 100644 index 5b4b1cd836..0000000000 --- a/package.bak/bind/0002-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -Use host compiler to build 'gen' since it's run when building. - -Signed-off-by: Gustavo Zacarias - -diff -Nura bind-9.5.1-P1/lib/dns/Makefile.in bind-9.5.1-P1.gencross/lib/dns/Makefile.in ---- bind-9.5.1-P1/lib/dns/Makefile.in 2007-09-11 22:09:08.000000000 -0300 -+++ bind-9.5.1-P1.gencross/lib/dns/Makefile.in 2009-03-04 16:35:23.000000000 -0200 -@@ -160,8 +160,8 @@ - ./gen -s ${srcdir} > code.h - - gen: gen.c -- ${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \ -- ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} -o $@ ${srcdir}/gen.c ${BUILD_LIBS} -+ ${HOSTCC} ${HOST_CFLAGS} -I${top_srcdir}/lib/isc/include \ -+ ${HOST_LDFLAGS} -o $@ ${srcdir}/gen.c - - rbtdb64.@O@: rbtdb.c - diff --git a/package.bak/bind/0003-Rename-ptrsize-to-ptr_size.patch b/package.bak/bind/0003-Rename-ptrsize-to-ptr_size.patch deleted file mode 100644 index e3b58e202d..0000000000 --- a/package.bak/bind/0003-Rename-ptrsize-to-ptr_size.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 254dc19788ba2a03504fc6d1036fef477a60035f Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 22 Jan 2016 08:31:02 -0300 -Subject: [PATCH] Rename ptrsize to ptr_size - -This is to compensate for a uClibc mess caused by commit -70a04a287a2875c82e6822c36e071afba5b63a62 where ptrsize is defined for -mips, hence causing build breakage under certain conditions for programs -that use this variable name. - -Status: definitely not upstreamable. - -Signed-off-by: Gustavo Zacarias ---- - lib/dns/rbt.c | 6 +++--- - lib/dns/rbtdb.c | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/dns/rbt.c b/lib/dns/rbt.c -index 86b5183..5fd55de 100644 ---- a/lib/dns/rbt.c -+++ b/lib/dns/rbt.c -@@ -113,7 +113,7 @@ struct file_header { - * information about the system on which the map file was generated - * will be used to tell if we can load the map file or not - */ -- isc_uint32_t ptrsize; -+ isc_uint32_t ptr_size; - unsigned int bigendian:1; /* big or little endian system */ - unsigned int rdataset_fixed:1; /* compiled with --enable-rrset-fixed */ - unsigned int nodecount; /* shadow from rbt structure */ -@@ -517,7 +517,7 @@ write_header(FILE *file, dns_rbt_t *rbt, isc_uint64_t first_node_offset, - memmove(header.version1, FILE_VERSION, sizeof(header.version1)); - memmove(header.version2, FILE_VERSION, sizeof(header.version2)); - header.first_node_offset = first_node_offset; -- header.ptrsize = (isc_uint32_t) sizeof(void *); -+ header.ptr_size = (isc_uint32_t) sizeof(void *); - header.bigendian = (1 == htonl(1)) ? 1 : 0; - - #ifdef DNS_RDATASET_FIXED -@@ -902,7 +902,7 @@ dns_rbt_deserialize_tree(void *base_address, size_t filesize, - } - #endif - -- if (header->ptrsize != (isc_uint32_t) sizeof(void *)) { -+ if (header->ptr_size != (isc_uint32_t) sizeof(void *)) { - result = ISC_R_INVALIDFILE; - goto cleanup; - } -diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c -index c7168cb..dbcf944 100644 ---- a/lib/dns/rbtdb.c -+++ b/lib/dns/rbtdb.c -@@ -114,7 +114,7 @@ typedef struct rbtdb_file_header rbtdb_file_header_t; - - struct rbtdb_file_header { - char version1[32]; -- isc_uint32_t ptrsize; -+ isc_uint32_t ptr_size; - unsigned int bigendian:1; - isc_uint64_t tree; - isc_uint64_t nsec; -@@ -7593,7 +7593,7 @@ rbtdb_write_header(FILE *rbtfile, off_t tree_location, off_t nsec_location, - memset(&header, 0, sizeof(rbtdb_file_header_t)); - memmove(header.version1, FILE_VERSION, sizeof(header.version1)); - memmove(header.version2, FILE_VERSION, sizeof(header.version2)); -- header.ptrsize = (isc_uint32_t) sizeof(void *); -+ header.ptr_size = (isc_uint32_t) sizeof(void *); - header.bigendian = (1 == htonl(1)) ? 1 : 0; - header.tree = (isc_uint64_t) tree_location; - header.nsec = (isc_uint64_t) nsec_location; --- -2.4.10 - diff --git a/package.bak/bind/Config.in b/package.bak/bind/Config.in deleted file mode 100644 index a580f0ee66..0000000000 --- a/package.bak/bind/Config.in +++ /dev/null @@ -1,43 +0,0 @@ -config BR2_PACKAGE_BIND - bool "bind" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - BIND (Berkeley Internet Name Domain) is an implementation of - the Domain Name System (DNS) protocols and provides an openly - redistributable reference implementation of the major - components of the Domain Name System, including: - - * a Domain Name System server (named) - * a Domain Name System resolver library - * tools for verifying the proper operation of the DNS server - - The BIND DNS Server is used on the vast majority of name - serving machines on the Internet, providing a robust and - stable architecture on top of which an organization's naming - architecture can be built. The resolver library included in - the BIND distribution provides the standard APIs for - translation between domain names and Internet addresses and is - intended to be linked with applications requiring name service. - - http://www.isc.org/sw/bind/ - -if BR2_PACKAGE_BIND - -config BR2_PACKAGE_BIND_SERVER - bool "Install server components" - default y - help - Install server components (named, lwresd) - -config BR2_PACKAGE_BIND_TOOLS - bool "Install tools" - help - Install tools (dig, host, nslookup, nsupdate) - -endif - -comment "bind needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/bind/S81named b/package.bak/bind/S81named deleted file mode 100644 index bc4bb0f246..0000000000 --- a/package.bak/bind/S81named +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -CONFIG=/etc/bind/named.conf -DAEMON=/usr/sbin/named - -[ -x $DAEMON ] || exit 0 -[ -f $CONFIG ] || exit 0 - -case "$1" in - start) - if [ ! -f /etc/rndc.key ]; then - printf "Initializing bind control key: " - # if rndc.key is a symlink, the target must exist - touch /etc/rndc.key - rndc-confgen -a -r /dev/urandom 2>/dev/null && echo "OK" || echo "FAIL" - fi - printf "Starting domain name daemon: " - start-stop-daemon -S -x $DAEMON -- -c $CONFIG -u named - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping domain name daemon: " - rndc stop || start-stop-daemon -K -x $DAEMON - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - $0 stop || true - sleep 1 - $0 start - ;; - reload|force-reload) - rndc reload || $0 restart - ;; - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" - exit 1 -esac - -exit 0 diff --git a/package.bak/bind/bind.hash b/package.bak/bind/bind.hash deleted file mode 100644 index 780e43b9a0..0000000000 --- a/package.bak/bind/bind.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Verified from http://ftp.isc.org/isc/bind9/9.11.0-P3/bind-9.11.0-P3.tar.gz.sha256.asc -sha256 0feee0374bcbdee73a9d4277f3c5007622279572d520d7c27a4b64015d8ca9e9 bind-9.11.0-P3.tar.gz diff --git a/package.bak/bind/bind.mk b/package.bak/bind/bind.mk deleted file mode 100644 index 860ee9d5e8..0000000000 --- a/package.bak/bind/bind.mk +++ /dev/null @@ -1,120 +0,0 @@ -################################################################################ -# -# bind -# -################################################################################ - -BIND_VERSION = 9.11.0-P3 -BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION) -# bind does not support parallel builds. -BIND_MAKE = $(MAKE1) -BIND_INSTALL_STAGING = YES -BIND_CONFIG_SCRIPTS = bind9-config isc-config.sh -BIND_LICENSE = MPLv2.0 -BIND_LICENSE_FILES = COPYRIGHT -BIND_TARGET_SERVER_SBIN = arpaname ddns-confgen dnssec-checkds dnssec-coverage -BIND_TARGET_SERVER_SBIN += dnssec-importkey dnssec-keygen dnssec-revoke -BIND_TARGET_SERVER_SBIN += dnssec-settime dnssec-verify genrandom -BIND_TARGET_SERVER_SBIN += isc-hmac-fixup named-journalprint nsec3hash -BIND_TARGET_SERVER_SBIN += lwresd named named-checkconf named-checkzone -BIND_TARGET_SERVER_SBIN += named-compilezone rndc rndc-confgen dnssec-dsfromkey -BIND_TARGET_SERVER_SBIN += dnssec-keyfromlabel dnssec-signzone -BIND_TARGET_TOOLS_BIN = dig host nslookup nsupdate -BIND_CONF_ENV = \ - BUILD_CC="$(TARGET_CC)" \ - BUILD_CFLAGS="$(TARGET_CFLAGS)" -BIND_CONF_OPTS = \ - --with-libjson=no \ - --with-randomdev=/dev/urandom \ - --enable-epoll \ - --with-libtool \ - --with-gssapi=no \ - --enable-rrl \ - --enable-filter-aaaa - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BIND_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr/include -BIND_DEPENDENCIES += zlib -else -BIND_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -BIND_CONF_OPTS += --enable-linux-caps -BIND_DEPENDENCIES += libcap -else -BIND_CONF_OPTS += --disable-linux-caps -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -BIND_CONF_OPTS += --with-libxml2=$(STAGING_DIR)/usr --enable-newstats -BIND_DEPENDENCIES += libxml2 -else -BIND_CONF_OPTS += --with-libxml2=no -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -BIND_DEPENDENCIES += openssl -BIND_CONF_ENV += \ - ac_cv_func_EVP_sha256=yes \ - ac_cv_func_EVP_sha384=yes \ - ac_cv_func_EVP_sha512=yes -BIND_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr LIBS="-lz" \ - --with-ecdsa=yes -# GOST cipher support requires openssl extra engines -ifeq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) -BIND_CONF_OPTS += --with-gost=yes -else -BIND_CONF_OPTS += --with-gost=no -endif -else -BIND_CONF_OPTS += --with-openssl=no -endif - -# Used by dnssec-checkds and dnssec-coverage -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),) -BIND_CONF_OPTS += --with-python=no -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -BIND_DEPENDENCIES += readline -else -BIND_CONF_OPTS += --with-readline=no -endif - -define BIND_TARGET_REMOVE_SERVER - rm -rf $(addprefix $(TARGET_DIR)/usr/sbin/, $(BIND_TARGET_SERVER_SBIN)) -endef - -define BIND_TARGET_REMOVE_TOOLS - rm -rf $(addprefix $(TARGET_DIR)/usr/bin/, $(BIND_TARGET_TOOLS_BIN)) -endef - -ifeq ($(BR2_PACKAGE_BIND_SERVER),y) -define BIND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/bind/S81named \ - $(TARGET_DIR)/etc/init.d/S81named -endef -define BIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/bind/named.service \ - $(TARGET_DIR)/usr/lib/systemd/system/named.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/named.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/named.service -endef -else -BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_SERVER -endif - -ifeq ($(BR2_PACKAGE_BIND_TOOLS),) -BIND_POST_INSTALL_TARGET_HOOKS += BIND_TARGET_REMOVE_TOOLS -endif - -define BIND_USERS - named -1 named -1 * /etc/bind - - BIND daemon -endef - -$(eval $(autotools-package)) diff --git a/package.bak/bind/named.service b/package.bak/bind/named.service deleted file mode 100644 index be0158b234..0000000000 --- a/package.bak/bind/named.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=BIND Domain Name Server -Documentation=man:named(8) -After=network.target - -[Service] -ExecStart=/usr/sbin/named -f -u named -ExecReload=/usr/sbin/rndc reload -ExecStop=/usr/sbin/rndc stop - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/binutils/2.25.1/120-sh-conf.patch b/package.bak/binutils/2.25.1/120-sh-conf.patch deleted file mode 100644 index ea3d1b6068..0000000000 --- a/package.bak/binutils/2.25.1/120-sh-conf.patch +++ /dev/null @@ -1,29 +0,0 @@ -r10231 | lethal | 2005-05-02 09:58:00 -0400 (Mon, 02 May 2005) | 13 lines - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - ---- a/configure -+++ b/configure -@@ -1495,7 +1495,7 @@ - mips*-*-*) - noconfigdirs="$noconfigdirs gprof" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; ---- a/configure.ac -+++ b/configure.ac -@@ -712,7 +712,7 @@ - mips*-*-*) - noconfigdirs="$noconfigdirs gprof" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; diff --git a/package.bak/binutils/2.25.1/300-001_ld_makefile_patch.patch b/package.bak/binutils/2.25.1/300-001_ld_makefile_patch.patch deleted file mode 100644 index 5cb0f614d8..0000000000 --- a/package.bak/binutils/2.25.1/300-001_ld_makefile_patch.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.am binutils-2.17.50.0.17/ld/Makefile.am ---- binutils-2.17.50.0.17.oorig/ld/Makefile.am 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.am 2007-06-25 10:00:36.000000000 +0200 -@@ -18,7 +18,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff -u binutils-2.17.50.0.17.oorig/ld/Makefile.in binutils-2.17.50.0.17/ld/Makefile.in ---- binutils-2.17.50.0.17.oorig/ld/Makefile.in 2007-06-18 19:29:29.000000000 +0200 -+++ binutils-2.17.50.0.17/ld/Makefile.in 2007-06-25 10:00:36.000000000 +0200 -@@ -287,7 +287,7 @@ - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include diff --git a/package.bak/binutils/2.25.1/300-012_check_ldrunpath_length.patch b/package.bak/binutils/2.25.1/300-012_check_ldrunpath_length.patch deleted file mode 100644 index df783109bb..0000000000 --- a/package.bak/binutils/2.25.1/300-012_check_ldrunpath_length.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Nura binutils-2.21.orig/ld/emultempl/elf32.em binutils-2.21/ld/emultempl/elf32.em ---- binutils-2.21.orig/ld/emultempl/elf32.em 2010-10-29 09:10:36.000000000 -0300 -+++ binutils-2.21/ld/emultempl/elf32.em 2010-12-10 09:26:56.746102724 -0300 -@@ -1270,6 +1270,8 @@ - && command_line.rpath == NULL) - { - lib_path = (const char *) getenv ("LD_RUN_PATH"); -+ if ((lib_path) && (strlen (lib_path) == 0)) -+ lib_path = NULL; - if (gld${EMULATION_NAME}_search_needed (lib_path, &n, - force)) - break; -@@ -1497,6 +1499,8 @@ - rpath = command_line.rpath; - if (rpath == NULL) - rpath = (const char *) getenv ("LD_RUN_PATH"); -+ if ((rpath) && (strlen (rpath) == 0)) -+ rpath = NULL; - - for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) diff --git a/package.bak/binutils/2.25.1/500-sysroot.patch b/package.bak/binutils/2.25.1/500-sysroot.patch deleted file mode 100644 index e49c795332..0000000000 --- a/package.bak/binutils/2.25.1/500-sysroot.patch +++ /dev/null @@ -1,37 +0,0 @@ -Signed-off-by: Sven Rebhan - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -308,18 +308,25 @@ - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) diff --git a/package.bak/binutils/2.25.1/600-poison-system-directories.patch b/package.bak/binutils/2.25.1/600-poison-system-directories.patch deleted file mode 100644 index ec3622bcea..0000000000 --- a/package.bak/binutils/2.25.1/600-poison-system-directories.patch +++ /dev/null @@ -1,276 +0,0 @@ -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman - -diff -Nura a/ld/config.in b/ld/config.in ---- a/ld/config.in 2014-10-14 04:32:04.000000000 -0300 -+++ b/ld/config.in 2014-12-24 08:07:28.997918918 -0300 -@@ -11,6 +11,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff -Nura a/ld/configure b/ld/configure ---- a/ld/configure 2014-12-23 11:22:07.000000000 -0300 -+++ b/ld/configure 2014-12-24 08:07:29.002919088 -0300 -@@ -783,6 +783,7 @@ - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_werror -@@ -1439,6 +1440,8 @@ - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15487,7 +15490,18 @@ - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff -Nura a/ld/configure.ac b/ld/configure.ac ---- a/ld/configure.ac 2014-10-14 04:32:04.000000000 -0300 -+++ b/ld/configure.ac 2014-12-24 08:07:29.002919088 -0300 -@@ -94,6 +94,16 @@ - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff -Nura a/ld/ldfile.c b/ld/ldfile.c ---- a/ld/ldfile.c 2014-10-14 04:32:04.000000000 -0300 -+++ b/ld/ldfile.c 2014-12-24 08:07:29.002919088 -0300 -@@ -114,6 +114,23 @@ - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff -Nura a/ld/ld.h b/ld/ld.h ---- a/ld/ld.h 2014-10-14 04:32:04.000000000 -0300 -+++ b/ld/ld.h 2014-12-24 08:07:29.003919122 -0300 -@@ -161,6 +161,14 @@ - /* If TRUE we'll just print the default output on stdout. */ - bfd_boolean print_output_format; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff -Nura a/ld/ldlex.h b/ld/ldlex.h ---- a/ld/ldlex.h 2014-11-04 06:54:41.000000000 -0300 -+++ b/ld/ldlex.h 2014-12-24 08:09:47.477644294 -0300 -@@ -140,6 +140,8 @@ - OPTION_IGNORE_UNRESOLVED_SYMBOL, - OPTION_PUSH_STATE, - OPTION_POP_STATE, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff -Nura a/ld/ldmain.c b/ld/ldmain.c ---- a/ld/ldmain.c 2014-10-14 04:32:04.000000000 -0300 -+++ b/ld/ldmain.c 2014-12-24 08:07:29.003919122 -0300 -@@ -266,6 +266,8 @@ - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff -Nura a/ld/ld.texinfo b/ld/ld.texinfo ---- a/ld/ld.texinfo 2014-12-23 05:47:10.000000000 -0300 -+++ b/ld/ld.texinfo 2014-12-24 08:07:29.005919191 -0300 -@@ -2212,6 +2212,18 @@ - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff -Nura a/ld/lexsup.c b/ld/lexsup.c ---- a/ld/lexsup.c 2014-11-04 06:54:41.000000000 -0300 -+++ b/ld/lexsup.c 2014-12-24 08:48:50.136583414 -0300 -@@ -513,6 +513,14 @@ - { {"pop-state", no_argument, NULL, OPTION_POP_STATE}, - '\0', NULL, N_("Pop state of flags governing input file handling"), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -525,6 +533,7 @@ - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1458,6 +1467,14 @@ - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1483,6 +1500,10 @@ - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); diff --git a/package.bak/binutils/2.25.1/800-microblaze-musl.patch b/package.bak/binutils/2.25.1/800-microblaze-musl.patch deleted file mode 100644 index 34e69fd548..0000000000 --- a/package.bak/binutils/2.25.1/800-microblaze-musl.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix the genetation of GOT entries for the Microblaze target. - -PR target/19516 -* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): -Always produce a RELATIVE reloc for a local symbol. - -[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.] -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c ---- binutils-2.25.1.orig/bfd/elf32-microblaze.c 2015-07-21 10:20:58.000000000 +0200 -+++ binutils-2.25.1/bfd/elf32-microblaze.c 2016-02-14 11:38:45.822387506 +0100 -@@ -3293,8 +3293,7 @@ - The entry in the global offset table will already have been - initialized in the relocate_section function. */ - if (info->shared -- && (info->symbolic || h->dynindx == -1) -- && h->def_regular) -+ && ((info->symbolic && h->def_regular) || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; - microblaze_elf_output_dynamic_relocation (output_bfd, diff --git a/package.bak/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch b/package.bak/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch deleted file mode 100644 index 8aeb06428a..0000000000 --- a/package.bak/binutils/2.25.1/905-Fix-trampolines-search-code-for-conditional-branches.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 415480d6471e67aef97c0241d451ef2423a1da9d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 25 Nov 2014 21:33:21 +0300 -Subject: [PATCH] Fix trampolines search code for conditional branches - -For conditional branches that need more than one trampoline to reach its -target assembler couldn't always find suitable trampoline because -post-loop condition check was placed inside the loop, resulting in -premature loop termination. Move check outside the loop. - -This fixes the following build errors seen when assembling huge files -produced by gcc: - Error: jump target out of range; no usable trampoline found - Error: operand 1 of 'j' has out of range value '307307' - -2014-11-25 Max Filippov - -gas/ - * config/tc-xtensa.c (search_trampolines): Move post-loop - condition check outside the search loop. - -gas/testsuite/ - * gas/xtensa/trampoline.d: Add expected output for branches. - * gas/xtensa/trampoline.s: Add test case for branches. - -Signed-off-by: Max Filippov ---- -Backported from: d92b6eece424f0ad35d96fdd85bf207295e8c4c3 -Changes to ChangeLogs are dropped. - - gas/config/tc-xtensa.c | 8 ++++---- - gas/testsuite/gas/xtensa/trampoline.d | 9 +++++++++ - gas/testsuite/gas/xtensa/trampoline.s | 7 +++++++ - 3 files changed, 20 insertions(+), 4 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index d11b0c7..f23ccf8 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -9514,11 +9514,11 @@ search_trampolines (TInsn *tinsn, fragS *fragP, bfd_boolean unreachable_only) - if (next_addr == 0 || addr - next_addr > J_RANGE) - break; - } -- if (abs (addr - this_addr) < J_RANGE) -- return tf; -- -- return NULL; - } -+ if (abs (addr - this_addr) < J_RANGE) -+ return tf; -+ -+ return NULL; - } - for ( ; tf; tf = tf->next) - { -diff --git a/gas/testsuite/gas/xtensa/trampoline.d b/gas/testsuite/gas/xtensa/trampoline.d -index b4f65dc..5ae32a6 100644 ---- a/gas/testsuite/gas/xtensa/trampoline.d -+++ b/gas/testsuite/gas/xtensa/trampoline.d -@@ -24,3 +24,12 @@ - .*33462:.*j.0x49407 - #... - .*49407:.*j.0x49407 -+.*4940a:.*beqz.n.a2,.0x4940f -+.*4940c:.*j.0x693d1 -+#... -+.*693d1:.*j.0x7ddd4 -+#... -+.*7ddd4:.*j.0x927f5 -+#... -+.*927f5:.*j.0x927f5 -+#... -diff --git a/gas/testsuite/gas/xtensa/trampoline.s b/gas/testsuite/gas/xtensa/trampoline.s -index 259a3bb..4465786 100644 ---- a/gas/testsuite/gas/xtensa/trampoline.s -+++ b/gas/testsuite/gas/xtensa/trampoline.s -@@ -19,3 +19,10 @@ - .endr - 3: - j 3b -+ bnez a2, 4f -+ .rep 50000 -+ and a2, a2, a3 -+ _ret -+ .endr -+4: -+ j 4b --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch b/package.bak/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch deleted file mode 100644 index 8a211004f3..0000000000 --- a/package.bak/binutils/2.25.1/906-xtensa-optimize-check_section_ebb_pcrels_fit.patch +++ /dev/null @@ -1,502 +0,0 @@ -From 20c79baf82273a0b368587f761f152c4d3a593a4 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 27 Mar 2015 07:13:55 +0300 -Subject: [PATCH 1/4] xtensa: optimize check_section_ebb_pcrels_fit - -The original check_section_ebb_pcrels_fit algorithm checks that text -actions proposed for current EBB are OK for every relocation in a -section. There's no need to check every relocation, because text actions -for EBB can only change size of that EBB, thus only affecting -relocations that in any way cross that EBB. In addition EBBs are -iterated in ascending order of their VMA, making it easier to track -relevant relocations. - -Introduce a structure that can track relocations that cross the range of -VMAs of EBB and use it to only check relocations relevant to current EBB -in check_section_ebb_pcrels_fit. -It takes O(N log N) operations to build it and O(N) operations to move -current EBB VMA window through its entire range, where N is the number -of relocations in a section. The resulting complexity of -compute_text_actions is thus reduced from O(N^2) to O(N log N + N * M), -where M is the average number of relocations crossing each EBB. - -Original profile: - -% time self children called name ------------------------------------------ - 44.26 71.53 6429/6429 compute_text_actions - 50.2 44.26 71.53 6429 check_section_ebb_pcrels_fit - 1.16 20.12 347506666/347576152 pcrel_reloc_fits - 2.95 16.52 347506666/348104944 get_relocation_opnd - 2.01 9.74 347575100/361252208 r_reloc_init - 0.55 7.53 347575100/363381467 r_reloc_get_section - 5.76 0.02 695013332/695013332 xlate_offset_with_removed_text - 0.68 3.89 347575100/363483827 bfd_octets_per_byte - 0.32 0.00 347506666/349910253 is_alt_relocation - 0.18 0.11 6391/6391 build_xlate_map - 0.00 0.00 6429/19417168 get_xtensa_relax_info - 0.00 0.00 6391/6391 free_xlate_map ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 2.56 3.08 6429/6429 compute_text_actions - 8.2 2.56 3.08 6429 check_section_ebb_pcrels_fit - 0.08 0.91 17721075/17790561 pcrel_reloc_fits - 0.17 0.47 17721075/31685977 r_reloc_init - 0.43 0.00 35442150/35442150 xlate_offset_with_removed_text - 0.02 0.37 17721075/33815236 r_reloc_get_section - 0.22 0.11 6391/6391 build_xlate_map - 0.05 0.22 17721075/33917596 bfd_octets_per_byte - 0.03 0.00 17721075/20405299 is_alt_relocation - 0.01 0.00 6429/6429 reloc_range_list_update_range - 0.00 0.00 6429/19417168 get_xtensa_relax_info - 0.00 0.00 6391/6391 free_xlate_map ------------------------------------------ - -2015-04-01 Max Filippov -bfd/ - * elf32-xtensa.c (reloc_range_list, reloc_range_list_entry, - reloc_range): new typedef. - (reloc_range_list_struct, reloc_range_list_entry_struct, - reloc_range_struct): new structures. - (reloc_range_compare, build_reloc_ranges, - reloc_range_list_append, reloc_range_list_remove, - reloc_range_list_update_range, free_reloc_range_list): new - functions. - (compute_text_actions): precompute relocation opcodes before the - loop. Add relevant_relocs variable, initialize it before the - loop, pass it to the check_section_ebb_pcrels_fit. - (check_section_ebb_pcrels_fit): add new parameter: - relevant_relocs. Update address range in the relevant_relocs if - it's non-NULL and iterate only over relevant relocations. - -Backported from: b2b326d246f839ee218192ac88da2384d929a072 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 321 +++++++++++++++++++++++++++++++++++++++++++++++++---- - 1 file changed, 298 insertions(+), 23 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 0b6f584..872370b 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -6619,8 +6619,10 @@ static bfd_boolean compute_text_actions - (bfd *, asection *, struct bfd_link_info *); - static bfd_boolean compute_ebb_proposed_actions (ebb_constraint *); - static bfd_boolean compute_ebb_actions (ebb_constraint *); -+typedef struct reloc_range_list_struct reloc_range_list; - static bfd_boolean check_section_ebb_pcrels_fit -- (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, const ebb_constraint *, -+ (bfd *, asection *, bfd_byte *, Elf_Internal_Rela *, -+ reloc_range_list *, const ebb_constraint *, - const xtensa_opcode *); - static bfd_boolean check_section_ebb_reduces (const ebb_constraint *); - static void text_action_add_proposed -@@ -7219,6 +7221,221 @@ build_reloc_opcodes (bfd *abfd, - return reloc_opcodes; - } - -+struct reloc_range_struct -+{ -+ bfd_vma addr; -+ bfd_boolean add; /* TRUE if start of a range, FALSE otherwise. */ -+ /* Original irel index in the array of relocations for a section. */ -+ unsigned irel_index; -+}; -+typedef struct reloc_range_struct reloc_range; -+ -+typedef struct reloc_range_list_entry_struct reloc_range_list_entry; -+struct reloc_range_list_entry_struct -+{ -+ reloc_range_list_entry *next; -+ reloc_range_list_entry *prev; -+ Elf_Internal_Rela *irel; -+ xtensa_opcode opcode; -+ int opnum; -+}; -+ -+struct reloc_range_list_struct -+{ -+ /* The rest of the structure is only meaningful when ok is TRUE. */ -+ bfd_boolean ok; -+ -+ unsigned n_range; /* Number of range markers. */ -+ reloc_range *range; /* Sorted range markers. */ -+ -+ unsigned first; /* Index of a first range element in the list. */ -+ unsigned last; /* One past index of a last range element in the list. */ -+ -+ unsigned n_list; /* Number of list elements. */ -+ reloc_range_list_entry *reloc; /* */ -+ reloc_range_list_entry list_root; -+}; -+ -+static int -+reloc_range_compare (const void *a, const void *b) -+{ -+ const reloc_range *ra = a; -+ const reloc_range *rb = b; -+ -+ if (ra->addr != rb->addr) -+ return ra->addr < rb->addr ? -1 : 1; -+ if (ra->add != rb->add) -+ return ra->add ? -1 : 1; -+ return 0; -+} -+ -+static void -+build_reloc_ranges (bfd *abfd, asection *sec, -+ bfd_byte *contents, -+ Elf_Internal_Rela *internal_relocs, -+ xtensa_opcode *reloc_opcodes, -+ reloc_range_list *list) -+{ -+ unsigned i; -+ size_t n = 0; -+ size_t max_n = 0; -+ reloc_range *ranges = NULL; -+ reloc_range_list_entry *reloc = -+ bfd_malloc (sec->reloc_count * sizeof (*reloc)); -+ -+ memset (list, 0, sizeof (*list)); -+ list->ok = TRUE; -+ -+ for (i = 0; i < sec->reloc_count; i++) -+ { -+ Elf_Internal_Rela *irel = &internal_relocs[i]; -+ int r_type = ELF32_R_TYPE (irel->r_info); -+ reloc_howto_type *howto = &elf_howto_table[r_type]; -+ r_reloc r_rel; -+ -+ if (r_type == R_XTENSA_ASM_SIMPLIFY -+ || r_type == R_XTENSA_32_PCREL -+ || !howto->pc_relative) -+ continue; -+ -+ r_reloc_init (&r_rel, abfd, irel, contents, -+ bfd_get_section_limit (abfd, sec)); -+ -+ if (r_reloc_get_section (&r_rel) != sec) -+ continue; -+ -+ if (n + 2 > max_n) -+ { -+ max_n = (max_n + 2) * 2; -+ ranges = bfd_realloc (ranges, max_n * sizeof (*ranges)); -+ } -+ -+ ranges[n].addr = irel->r_offset; -+ ranges[n + 1].addr = r_rel.target_offset; -+ -+ ranges[n].add = ranges[n].addr < ranges[n + 1].addr; -+ ranges[n + 1].add = !ranges[n].add; -+ -+ ranges[n].irel_index = i; -+ ranges[n + 1].irel_index = i; -+ -+ n += 2; -+ -+ reloc[i].irel = irel; -+ -+ /* Every relocation won't possibly be checked in the optimized version of -+ check_section_ebb_pcrels_fit, so this needs to be done here. */ -+ if (is_alt_relocation (ELF32_R_TYPE (irel->r_info))) -+ { -+ /* None of the current alternate relocs are PC-relative, -+ and only PC-relative relocs matter here. */ -+ } -+ else -+ { -+ xtensa_opcode opcode; -+ int opnum; -+ -+ if (reloc_opcodes) -+ opcode = reloc_opcodes[i]; -+ else -+ opcode = get_relocation_opcode (abfd, sec, contents, irel); -+ -+ if (opcode == XTENSA_UNDEFINED) -+ { -+ list->ok = FALSE; -+ break; -+ } -+ -+ opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -+ if (opnum == XTENSA_UNDEFINED) -+ { -+ list->ok = FALSE; -+ break; -+ } -+ -+ /* Record relocation opcode and opnum as we've calculated them -+ anyway and they won't change. */ -+ reloc[i].opcode = opcode; -+ reloc[i].opnum = opnum; -+ } -+ } -+ -+ if (list->ok) -+ { -+ ranges = bfd_realloc (ranges, n * sizeof (*ranges)); -+ qsort (ranges, n, sizeof (*ranges), reloc_range_compare); -+ -+ list->n_range = n; -+ list->range = ranges; -+ list->reloc = reloc; -+ list->list_root.prev = &list->list_root; -+ list->list_root.next = &list->list_root; -+ } -+ else -+ { -+ free (ranges); -+ free (reloc); -+ } -+} -+ -+static void reloc_range_list_append (reloc_range_list *list, -+ unsigned irel_index) -+{ -+ reloc_range_list_entry *entry = list->reloc + irel_index; -+ -+ entry->prev = list->list_root.prev; -+ entry->next = &list->list_root; -+ entry->prev->next = entry; -+ entry->next->prev = entry; -+ ++list->n_list; -+} -+ -+static void reloc_range_list_remove (reloc_range_list *list, -+ unsigned irel_index) -+{ -+ reloc_range_list_entry *entry = list->reloc + irel_index; -+ -+ entry->next->prev = entry->prev; -+ entry->prev->next = entry->next; -+ --list->n_list; -+} -+ -+/* Update relocation list object so that it lists all relocations that cross -+ [first; last] range. Range bounds should not decrease with successive -+ invocations. */ -+static void reloc_range_list_update_range (reloc_range_list *list, -+ bfd_vma first, bfd_vma last) -+{ -+ /* This should not happen: EBBs are iterated from lower addresses to higher. -+ But even if that happens there's no need to break: just flush current list -+ and start from scratch. */ -+ if ((list->last > 0 && list->range[list->last - 1].addr > last) || -+ (list->first > 0 && list->range[list->first - 1].addr >= first)) -+ { -+ list->first = 0; -+ list->last = 0; -+ list->n_list = 0; -+ list->list_root.next = &list->list_root; -+ list->list_root.prev = &list->list_root; -+ fprintf (stderr, "%s: move backwards requested\n", __func__); -+ } -+ -+ for (; list->last < list->n_range && -+ list->range[list->last].addr <= last; ++list->last) -+ if (list->range[list->last].add) -+ reloc_range_list_append (list, list->range[list->last].irel_index); -+ -+ for (; list->first < list->n_range && -+ list->range[list->first].addr < first; ++list->first) -+ if (!list->range[list->first].add) -+ reloc_range_list_remove (list, list->range[list->first].irel_index); -+} -+ -+static void free_reloc_range_list (reloc_range_list *list) -+{ -+ free (list->range); -+ free (list->reloc); -+} - - /* The compute_text_actions function will build a list of potential - transformation actions for code in the extended basic block of each -@@ -7245,6 +7462,7 @@ compute_text_actions (bfd *abfd, - property_table_entry *prop_table = 0; - int ptblsize = 0; - bfd_size_type sec_size; -+ reloc_range_list relevant_relocs; - - relax_info = get_xtensa_relax_info (sec); - BFD_ASSERT (relax_info); -@@ -7277,6 +7495,12 @@ compute_text_actions (bfd *abfd, - goto error_return; - } - -+ /* Precompute the opcode for each relocation. */ -+ reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, internal_relocs); -+ -+ build_reloc_ranges (abfd, sec, contents, internal_relocs, reloc_opcodes, -+ &relevant_relocs); -+ - for (i = 0; i < sec->reloc_count; i++) - { - Elf_Internal_Rela *irel = &internal_relocs[i]; -@@ -7340,17 +7564,13 @@ compute_text_actions (bfd *abfd, - ebb->start_reloc_idx = i; - ebb->end_reloc_idx = i; - -- /* Precompute the opcode for each relocation. */ -- if (reloc_opcodes == NULL) -- reloc_opcodes = build_reloc_opcodes (abfd, sec, contents, -- internal_relocs); -- - if (!extend_ebb_bounds (ebb) - || !compute_ebb_proposed_actions (&ebb_table) - || !compute_ebb_actions (&ebb_table) - || !check_section_ebb_pcrels_fit (abfd, sec, contents, -- internal_relocs, &ebb_table, -- reloc_opcodes) -+ internal_relocs, -+ &relevant_relocs, -+ &ebb_table, reloc_opcodes) - || !check_section_ebb_reduces (&ebb_table)) - { - /* If anything goes wrong or we get unlucky and something does -@@ -7372,6 +7592,8 @@ compute_text_actions (bfd *abfd, - free_ebb_constraint (&ebb_table); - } - -+ free_reloc_range_list (&relevant_relocs); -+ - #if DEBUG - if (relax_info->action_list.head) - print_action_list (stderr, &relax_info->action_list); -@@ -7974,14 +8196,17 @@ check_section_ebb_pcrels_fit (bfd *abfd, - asection *sec, - bfd_byte *contents, - Elf_Internal_Rela *internal_relocs, -+ reloc_range_list *relevant_relocs, - const ebb_constraint *constraint, - const xtensa_opcode *reloc_opcodes) - { - unsigned i, j; -+ unsigned n = sec->reloc_count; - Elf_Internal_Rela *irel; - xlate_map_t *xmap = NULL; - bfd_boolean ok = TRUE; - xtensa_relax_info *relax_info; -+ reloc_range_list_entry *entry = NULL; - - relax_info = get_xtensa_relax_info (sec); - -@@ -7992,7 +8217,40 @@ check_section_ebb_pcrels_fit (bfd *abfd, - can still be used. */ - } - -- for (i = 0; i < sec->reloc_count; i++) -+ if (relevant_relocs && constraint->action_count) -+ { -+ if (!relevant_relocs->ok) -+ { -+ ok = FALSE; -+ n = 0; -+ } -+ else -+ { -+ bfd_vma min_offset, max_offset; -+ min_offset = max_offset = constraint->actions[0].offset; -+ -+ for (i = 1; i < constraint->action_count; ++i) -+ { -+ proposed_action *action = &constraint->actions[i]; -+ bfd_vma offset = action->offset; -+ -+ if (offset < min_offset) -+ min_offset = offset; -+ if (offset > max_offset) -+ max_offset = offset; -+ } -+ reloc_range_list_update_range (relevant_relocs, min_offset, -+ max_offset); -+ n = relevant_relocs->n_list; -+ entry = &relevant_relocs->list_root; -+ } -+ } -+ else -+ { -+ relevant_relocs = NULL; -+ } -+ -+ for (i = 0; i < n; i++) - { - r_reloc r_rel; - bfd_vma orig_self_offset, orig_target_offset; -@@ -8001,7 +8259,15 @@ check_section_ebb_pcrels_fit (bfd *abfd, - reloc_howto_type *howto; - int self_removed_bytes, target_removed_bytes; - -- irel = &internal_relocs[i]; -+ if (relevant_relocs) -+ { -+ entry = entry->next; -+ irel = entry->irel; -+ } -+ else -+ { -+ irel = internal_relocs + i; -+ } - r_type = ELF32_R_TYPE (irel->r_info); - - howto = &elf_howto_table[r_type]; -@@ -8067,21 +8333,30 @@ check_section_ebb_pcrels_fit (bfd *abfd, - xtensa_opcode opcode; - int opnum; - -- if (reloc_opcodes) -- opcode = reloc_opcodes[i]; -- else -- opcode = get_relocation_opcode (abfd, sec, contents, irel); -- if (opcode == XTENSA_UNDEFINED) -+ if (relevant_relocs) - { -- ok = FALSE; -- break; -+ opcode = entry->opcode; -+ opnum = entry->opnum; - } -- -- opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -- if (opnum == XTENSA_UNDEFINED) -+ else - { -- ok = FALSE; -- break; -+ if (reloc_opcodes) -+ opcode = reloc_opcodes[relevant_relocs ? -+ (unsigned)(entry - relevant_relocs->reloc) : i]; -+ else -+ opcode = get_relocation_opcode (abfd, sec, contents, irel); -+ if (opcode == XTENSA_UNDEFINED) -+ { -+ ok = FALSE; -+ break; -+ } -+ -+ opnum = get_relocation_opnd (opcode, ELF32_R_TYPE (irel->r_info)); -+ if (opnum == XTENSA_UNDEFINED) -+ { -+ ok = FALSE; -+ break; -+ } - } - - if (!pcrel_reloc_fits (opcode, opnum, self_offset, target_offset)) -@@ -8778,7 +9053,7 @@ move_shared_literal (asection *sec, - /* Check all of the PC-relative relocations to make sure they still fit. */ - relocs_fit = check_section_ebb_pcrels_fit (target_sec->owner, target_sec, - target_sec_cache->contents, -- target_sec_cache->relocs, -+ target_sec_cache->relocs, NULL, - &ebb_table, NULL); - - if (!relocs_fit) --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch b/package.bak/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch deleted file mode 100644 index 9df8065307..0000000000 --- a/package.bak/binutils/2.25.1/907-xtensa-optimize-removed_by_actions.patch +++ /dev/null @@ -1,356 +0,0 @@ -From 3e3f60207399ab29dd55af109e5ae9facc7d8e83 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 28 Mar 2015 08:46:28 +0300 -Subject: [PATCH 2/4] xtensa: optimize removed_by_actions - -The function removed_by_actions iterates through text actions to -calculate an offset applied by text actions to a given VMA. Although it -has a parameter p_start_action that allows for incremental offset -calculation, in many places it's used with p_start_action explicitly set -to the first action. After the first relaxation pass when the list of -text actions is finalized, an array of offsets sorted by VMA may be used -to speed up this function. - -Original profile: - -% time self children called name ------------------------------------------ - 0.35 0.00 33872/4808961 relax_section_symbols - 3.32 0.00 326022/4808961 relax_property_section - 12.83 0.00 1259379/4808961 offset_with_removed_text - 32.50 0.00 3189688/4808961 translate_reloc - 71.5 49.00 0.00 4808961 removed_by_actions ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 33872/4808537 relax_section_symbols - 0.01 0.00 326022/4808537 relax_property_section - 0.05 0.00 1258955/4808537 offset_with_removed_text_map - 0.13 0.00 3189688/4808537 translate_reloc - 1.0 0.20 0.00 4808537 removed_by_actions_map - 0.00 0.00 120/120 map_removal_by_action ------------------------------------------ - -2015-04-01 Max Filippov -bfd/ - * elf32-xtensa.c (removal_by_action_entry_struct, - removal_by_action_map_struct): new structures. - (removal_by_action_entry, removal_by_action_map): new typedefs. - (text_action_list_struct): add new field: map. - (map_removal_by_action, removed_by_actions_map, - offset_with_removed_text_map): new functions. - (relax_section): replace offset_with_removed_text with - offset_with_removed_text_map. - (translate_reloc, relax_property_section, relax_section_symbols): - replace removed_by_actions with removed_by_actions_map. - -Backported from: 071aa5c98a31c966f5fbfc573fcee61350fd1936 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 181 +++++++++++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 156 insertions(+), 25 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 872370b..21b2871 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -5420,11 +5420,28 @@ struct text_action_struct - text_action *next; - }; - -+struct removal_by_action_entry_struct -+{ -+ bfd_vma offset; -+ int removed; -+ int eq_removed; -+ int eq_removed_before_fill; -+}; -+typedef struct removal_by_action_entry_struct removal_by_action_entry; -+ -+struct removal_by_action_map_struct -+{ -+ unsigned n_entries; -+ removal_by_action_entry *entry; -+}; -+typedef struct removal_by_action_map_struct removal_by_action_map; -+ - - /* List of all of the actions taken on a text section. */ - struct text_action_list_struct - { - text_action *head; -+ removal_by_action_map map; - }; - - -@@ -5636,6 +5653,101 @@ action_list_count (text_action_list *action_list) - return count; - } - -+static void -+map_removal_by_action (text_action_list *action_list) -+{ -+ text_action *r; -+ int removed = 0; -+ removal_by_action_map map; -+ bfd_boolean eq_complete; -+ -+ map.n_entries = 0; -+ map.entry = bfd_malloc (action_list_count (action_list) * -+ sizeof (removal_by_action_entry)); -+ eq_complete = FALSE; -+ -+ for (r = action_list->head; r;) -+ { -+ removal_by_action_entry *ientry = map.entry + map.n_entries; -+ -+ if (map.n_entries && (ientry - 1)->offset == r->offset) -+ { -+ --ientry; -+ } -+ else -+ { -+ ++map.n_entries; -+ eq_complete = FALSE; -+ ientry->offset = r->offset; -+ ientry->eq_removed_before_fill = removed; -+ } -+ -+ if (!eq_complete) -+ { -+ if (r->action != ta_fill || r->removed_bytes >= 0) -+ { -+ ientry->eq_removed = removed; -+ eq_complete = TRUE; -+ } -+ else -+ ientry->eq_removed = removed + r->removed_bytes; -+ } -+ -+ removed += r->removed_bytes; -+ ientry->removed = removed; -+ r = r->next; -+ } -+ action_list->map = map; -+} -+ -+static int -+removed_by_actions_map (text_action_list *action_list, bfd_vma offset, -+ bfd_boolean before_fill) -+{ -+ unsigned a, b; -+ -+ if (!action_list->map.entry) -+ map_removal_by_action (action_list); -+ -+ if (!action_list->map.n_entries) -+ return 0; -+ -+ a = 0; -+ b = action_list->map.n_entries; -+ -+ while (b - a > 1) -+ { -+ unsigned c = (a + b) / 2; -+ -+ if (action_list->map.entry[c].offset <= offset) -+ a = c; -+ else -+ b = c; -+ } -+ -+ if (action_list->map.entry[a].offset < offset) -+ { -+ return action_list->map.entry[a].removed; -+ } -+ else if (action_list->map.entry[a].offset == offset) -+ { -+ return before_fill ? -+ action_list->map.entry[a].eq_removed_before_fill : -+ action_list->map.entry[a].eq_removed; -+ } -+ else -+ { -+ return 0; -+ } -+} -+ -+static bfd_vma -+offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset) -+{ -+ int removed = removed_by_actions_map (action_list, offset, FALSE); -+ return offset - removed; -+} -+ - - /* The find_insn_action routine will only find non-fill actions. */ - -@@ -5909,6 +6021,9 @@ init_xtensa_relax_info (asection *sec) - - relax_info->action_list.head = NULL; - -+ relax_info->action_list.map.n_entries = 0; -+ relax_info->action_list.map.entry = NULL; -+ - relax_info->fix_list = NULL; - relax_info->fix_array = NULL; - relax_info->fix_array_count = 0; -@@ -9218,7 +9333,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - if (elf_hash_table (link_info)->dynamic_sections_created) - shrink_dynamic_reloc_sections (link_info, abfd, sec, irel); - irel->r_info = ELF32_R_INFO (0, R_XTENSA_NONE); -- irel->r_offset = offset_with_removed_text -+ irel->r_offset = offset_with_removed_text_map - (&relax_info->action_list, irel->r_offset); - continue; - } -@@ -9255,7 +9370,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - } - } - -- source_offset = offset_with_removed_text -+ source_offset = offset_with_removed_text_map - (&relax_info->action_list, irel->r_offset); - irel->r_offset = source_offset; - } -@@ -9352,7 +9467,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - break; - } - -- new_end_offset = offset_with_removed_text -+ new_end_offset = offset_with_removed_text_map - (&target_relax_info->action_list, - r_rel.target_offset + diff_value); - diff_value = new_end_offset - new_reloc.target_offset; -@@ -9750,7 +9865,6 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec) - xtensa_relax_info *relax_info; - removed_literal *removed; - bfd_vma target_offset, base_offset; -- text_action *act; - - *new_rel = *orig_rel; - -@@ -9803,19 +9917,26 @@ translate_reloc (const r_reloc *orig_rel, r_reloc *new_rel, asection *sec) - offset. */ - - base_offset = r_reloc_get_target_offset (new_rel) - new_rel->rela.r_addend; -- act = relax_info->action_list.head; - if (base_offset <= target_offset) - { -- int base_removed = removed_by_actions (&act, base_offset, FALSE); -- int addend_removed = removed_by_actions (&act, target_offset, FALSE); -+ int base_removed = removed_by_actions_map (&relax_info->action_list, -+ base_offset, FALSE); -+ int addend_removed = removed_by_actions_map (&relax_info->action_list, -+ target_offset, FALSE) - -+ base_removed; -+ - new_rel->target_offset = target_offset - base_removed - addend_removed; - new_rel->rela.r_addend -= addend_removed; - } - else - { - /* Handle a negative addend. The base offset comes first. */ -- int tgt_removed = removed_by_actions (&act, target_offset, FALSE); -- int addend_removed = removed_by_actions (&act, base_offset, FALSE); -+ int tgt_removed = removed_by_actions_map (&relax_info->action_list, -+ target_offset, FALSE); -+ int addend_removed = removed_by_actions_map (&relax_info->action_list, -+ base_offset, FALSE) - -+ tgt_removed; -+ - new_rel->target_offset = target_offset - tgt_removed; - new_rel->rela.r_addend += addend_removed; - } -@@ -10138,9 +10259,10 @@ relax_property_section (bfd *abfd, - bfd_vma old_offset = val.r_rel.target_offset; - bfd_vma new_offset; - long old_size, new_size; -- text_action *act = target_relax_info->action_list.head; -- new_offset = old_offset - -- removed_by_actions (&act, old_offset, FALSE); -+ int removed_by_old_offset = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset, FALSE); -+ new_offset = old_offset - removed_by_old_offset; - - /* Assert that we are not out of bounds. */ - old_size = bfd_get_32 (abfd, size_p); -@@ -10164,9 +10286,10 @@ relax_property_section (bfd *abfd, - - /* Recompute the new_offset, but this time don't - include any fill inserted by relaxation. */ -- act = target_relax_info->action_list.head; -- new_offset = old_offset - -- removed_by_actions (&act, old_offset, TRUE); -+ removed_by_old_offset = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset, TRUE); -+ new_offset = old_offset - removed_by_old_offset; - - /* If it is not unreachable and we have not yet - seen an unreachable at this address, place it -@@ -10182,8 +10305,12 @@ relax_property_section (bfd *abfd, - } - } - else -- new_size -= -- removed_by_actions (&act, old_offset + old_size, TRUE); -+ { -+ int removed_by_old_offset_size = -+ removed_by_actions_map (&target_relax_info->action_list, -+ old_offset + old_size, TRUE); -+ new_size -= removed_by_old_offset_size - removed_by_old_offset; -+ } - - if (new_size != old_size) - { -@@ -10441,14 +10568,16 @@ relax_section_symbols (bfd *abfd, asection *sec) - - if (isym->st_shndx == sec_shndx) - { -- text_action *act = relax_info->action_list.head; - bfd_vma orig_addr = isym->st_value; -+ int removed = removed_by_actions_map (&relax_info->action_list, -+ orig_addr, FALSE); - -- isym->st_value -= removed_by_actions (&act, orig_addr, FALSE); -- -+ isym->st_value -= removed; - if (ELF32_ST_TYPE (isym->st_info) == STT_FUNC) - isym->st_size -= -- removed_by_actions (&act, orig_addr + isym->st_size, FALSE); -+ removed_by_actions_map (&relax_info->action_list, -+ orig_addr + isym->st_size, FALSE) - -+ removed; - } - } - -@@ -10466,15 +10595,17 @@ relax_section_symbols (bfd *abfd, asection *sec) - || sym_hash->root.type == bfd_link_hash_defweak) - && sym_hash->root.u.def.section == sec) - { -- text_action *act = relax_info->action_list.head; - bfd_vma orig_addr = sym_hash->root.u.def.value; -+ int removed = removed_by_actions_map (&relax_info->action_list, -+ orig_addr, FALSE); - -- sym_hash->root.u.def.value -= -- removed_by_actions (&act, orig_addr, FALSE); -+ sym_hash->root.u.def.value -= removed; - - if (sym_hash->type == STT_FUNC) - sym_hash->size -= -- removed_by_actions (&act, orig_addr + sym_hash->size, FALSE); -+ removed_by_actions_map (&relax_info->action_list, -+ orig_addr + sym_hash->size, FALSE) - -+ removed; - } - } - --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch b/package.bak/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch deleted file mode 100644 index 96d526fe30..0000000000 --- a/package.bak/binutils/2.25.1/908-xtensa-optimize-find_removed_literal.patch +++ /dev/null @@ -1,146 +0,0 @@ -From 288c2b709e5e6841484e1a129eaccd299db36877 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 4 Apr 2015 14:49:42 +0300 -Subject: [PATCH 3/4] xtensa: optimize find_removed_literal - -find_removed_literal uses linear search to find removed literal by its -VMA. The list of literals is fixed at that point, build an ordered index -array and use binary search instead. - -Original profile: - -% time self children called name ------------------------------------------ - 56.72 0.00 297578/669392 translate_reloc - 70.86 0.00 371814/669392 relax_section - 67.9 127.58 0.00 669392 find_removed_literal ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 297578/669392 translate_reloc - 0.00 0.00 371814/669392 relax_section - 0.0 0.00 0.00 669392 find_removed_literal - 0.00 0.00 23838/23838 map_removed_literal ------------------------------------------ - -2015-04-03 Max Filippov -bfd/ - * elf32-xtensa.c (removed_literal_map_entry): new typedef. - (removed_literal_map_entry_struct): new structure. - (removed_literal_list_struct): add new fields: n_map and map. - (map_removed_literal, removed_literal_compare): new functions. - (find_removed_literal): build index array for literals ordered - by VMA, use binary search to find removed literal. - -Backported from: 3439c466273378021821473d3fc84990e089ae34 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 file changed, 58 insertions(+), 6 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 21b2871..51733ad 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -5832,6 +5832,7 @@ print_action_list (FILE *fp, text_action_list *action_list) - by the "from" offset field. */ - - typedef struct removed_literal_struct removed_literal; -+typedef struct removed_literal_map_entry_struct removed_literal_map_entry; - typedef struct removed_literal_list_struct removed_literal_list; - - struct removed_literal_struct -@@ -5841,10 +5842,19 @@ struct removed_literal_struct - removed_literal *next; - }; - -+struct removed_literal_map_entry_struct -+{ -+ bfd_vma addr; -+ removed_literal *literal; -+}; -+ - struct removed_literal_list_struct - { - removed_literal *head; - removed_literal *tail; -+ -+ unsigned n_map; -+ removed_literal_map_entry *map; - }; - - -@@ -5893,6 +5903,39 @@ add_removed_literal (removed_literal_list *removed_list, - } - } - -+static void -+map_removed_literal (removed_literal_list *removed_list) -+{ -+ unsigned n_map = 0; -+ unsigned i; -+ removed_literal_map_entry *map = NULL; -+ removed_literal *r = removed_list->head; -+ -+ for (i = 0; r; ++i, r = r->next) -+ { -+ if (i == n_map) -+ { -+ n_map = (n_map * 2) + 2; -+ map = bfd_realloc (map, n_map * sizeof (*map)); -+ } -+ map[i].addr = r->from.target_offset; -+ map[i].literal = r; -+ } -+ removed_list->map = map; -+ removed_list->n_map = i; -+} -+ -+static int -+removed_literal_compare (const void *a, const void *b) -+{ -+ const removed_literal_map_entry *pa = a; -+ const removed_literal_map_entry *pb = b; -+ -+ if (pa->addr == pb->addr) -+ return 0; -+ else -+ return pa->addr < pb->addr ? -1 : 1; -+} - - /* Check if the list of removed literals contains an entry for the - given address. Return the entry if found. */ -@@ -5900,12 +5943,21 @@ add_removed_literal (removed_literal_list *removed_list, - static removed_literal * - find_removed_literal (removed_literal_list *removed_list, bfd_vma addr) - { -- removed_literal *r = removed_list->head; -- while (r && r->from.target_offset < addr) -- r = r->next; -- if (r && r->from.target_offset == addr) -- return r; -- return NULL; -+ removed_literal_map_entry *p; -+ removed_literal *r = NULL; -+ -+ if (removed_list->map == NULL) -+ map_removed_literal (removed_list); -+ -+ p = bsearch (&addr, removed_list->map, removed_list->n_map, -+ sizeof (*removed_list->map), removed_literal_compare); -+ if (p) -+ { -+ while (p != removed_list->map && (p - 1)->addr == addr) -+ --p; -+ r = p->literal; -+ } -+ return r; - } - - --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch b/package.bak/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch deleted file mode 100644 index 3090cc21e5..0000000000 --- a/package.bak/binutils/2.25.1/909-xtensa-replace-action-list-with-splay-tree.patch +++ /dev/null @@ -1,826 +0,0 @@ -From e5409aedd3ee2192855018a564650ffb75c26e60 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 5 Apr 2015 17:04:22 +0300 -Subject: [PATCH 4/4] xtensa: replace action list with splay tree - -text_action_add uses linear list search to order text actions list by -action VMA. The list is used at the first relaxation pass, when it's not -fixed yet. -Replace the list with splay tree from libiberty. - -Original profile: - -% time self children called name ------------------------------------------ - 0.00 0.00 14/158225 compute_text_actions - 3.62 0.00 25211/158225 remove_dead_literal - 8.42 0.00 58645/158225 coalesce_shared_literal - 10.68 0.00 74355/158225 text_action_add_proposed - 38.8 22.73 0.00 158225 text_action_add - 0.00 0.00 144527/293246 bfd_zmalloc ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.00 0.00 14/158225 compute_text_actions - 0.00 0.00 25211/158225 remove_dead_literal - 0.00 0.01 58645/158225 coalesce_shared_literal - 0.00 0.01 74355/158225 text_action_add_proposed - 0.1 0.00 0.02 158225 text_action_add - 0.01 0.00 144527/144527 splay_tree_insert - 0.00 0.00 144527/195130 splay_tree_lookup - 0.00 0.00 144527/293246 bfd_zmalloc ------------------------------------------ - -2015-04-03 Max Filippov -bfd/ - * elf32-xtensa.c (splay-tree.h): include header. - (text_action_struct): drop next pointer. - (text_action_list_struct): drop head pointer, add count and - tree fields. - (find_fill_action): instead of linear search in text_action_list - search in the tree. - (text_action_compare, action_first, action_next): new functions. - (text_action_add, text_action_add_literal): instead of linear - search and insertion insert new node into the tree. - (removed_by_actions): pass additional parameter: action_list, - use it to traverse the tree. - (offset_with_removed_text): pass additional action_list parameter - to removed_by_actions. - (map_action_fn_context): new typedef. - (map_action_fn_context_struct): new structure. - (map_action_fn): new function. - (map_removal_by_action): use splay_tree_foreach to build map. - (find_insn_action): replace linear search in text_action_list - with series of splay_tree_lookups. - (print_action, print_action_list_fn): new functions. - (print_action_list): use splay_tree_foreach. - (init_xtensa_relax_info): drop action_list.head initialization. - Initialize the tree. - (compute_text_actions): use non-zero action_list_count instead of - non-NULL action list. - (xlate_map_context): new typedef. - (xlate_map_context_struct): new structure. - (xlate_map_fn): new function. - (build_xlate_map): use splay_tree_foreach to build map. - (action_remove_bytes_fn): new function. - (relax_section): use zero action_list_count instead of NULL - action list. Use splay_tree_foreach to count final section size. - Drop unused variable 'removed'. - -Backported from: 4c2af04fe8b4452bf51d2debf1bb467fafcd0f08 -Signed-off-by: Max Filippov ---- - bfd/elf32-xtensa.c | 488 +++++++++++++++++++++++++++++++---------------------- - 1 file changed, 282 insertions(+), 206 deletions(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 51733ad..53af1c6 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -28,6 +28,7 @@ - #include "libbfd.h" - #include "elf-bfd.h" - #include "elf/xtensa.h" -+#include "splay-tree.h" - #include "xtensa-isa.h" - #include "xtensa-config.h" - -@@ -5416,8 +5417,6 @@ struct text_action_struct - bfd_vma virtual_offset; /* Zero except for adding literals. */ - int removed_bytes; - literal_value value; /* Only valid when adding literals. */ -- -- text_action *next; - }; - - struct removal_by_action_entry_struct -@@ -5440,7 +5439,8 @@ typedef struct removal_by_action_map_struct removal_by_action_map; - /* List of all of the actions taken on a text section. */ - struct text_action_list_struct - { -- text_action *head; -+ unsigned count; -+ splay_tree tree; - removal_by_action_map map; - }; - -@@ -5448,20 +5448,18 @@ struct text_action_list_struct - static text_action * - find_fill_action (text_action_list *l, asection *sec, bfd_vma offset) - { -- text_action **m_p; -+ text_action a; - - /* It is not necessary to fill at the end of a section. */ - if (sec->size == offset) - return NULL; - -- for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next) -- { -- text_action *t = *m_p; -- /* When the action is another fill at the same address, -- just increase the size. */ -- if (t->offset == offset && t->action == ta_fill) -- return t; -- } -+ a.offset = offset; -+ a.action = ta_fill; -+ -+ splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a); -+ if (node) -+ return (text_action *)node->value; - return NULL; - } - -@@ -5509,6 +5507,49 @@ adjust_fill_action (text_action *ta, int fill_diff) - } - - -+static int -+text_action_compare (splay_tree_key a, splay_tree_key b) -+{ -+ text_action *pa = (text_action *)a; -+ text_action *pb = (text_action *)b; -+ static const int action_priority[] = -+ { -+ [ta_fill] = 0, -+ [ta_none] = 1, -+ [ta_convert_longcall] = 2, -+ [ta_narrow_insn] = 3, -+ [ta_remove_insn] = 4, -+ [ta_remove_longcall] = 5, -+ [ta_remove_literal] = 6, -+ [ta_widen_insn] = 7, -+ [ta_add_literal] = 8, -+ }; -+ -+ if (pa->offset == pb->offset) -+ { -+ if (pa->action == pb->action) -+ return 0; -+ return action_priority[pa->action] - action_priority[pb->action]; -+ } -+ else -+ return pa->offset < pb->offset ? -1 : 1; -+} -+ -+static text_action * -+action_first (text_action_list *action_list) -+{ -+ splay_tree_node node = splay_tree_min (action_list->tree); -+ return node ? (text_action *)node->value : NULL; -+} -+ -+static text_action * -+action_next (text_action_list *action_list, text_action *action) -+{ -+ splay_tree_node node = splay_tree_successor (action_list->tree, -+ (splay_tree_key)action); -+ return node ? (text_action *)node->value : NULL; -+} -+ - /* Add a modification action to the text. For the case of adding or - removing space, modify any current fill and assume that - "unreachable_space" bytes can be freely contracted. Note that a -@@ -5521,8 +5562,8 @@ text_action_add (text_action_list *l, - bfd_vma offset, - int removed) - { -- text_action **m_p; - text_action *ta; -+ text_action a; - - /* It is not necessary to fill at the end of a section. */ - if (action == ta_fill && sec->size == offset) -@@ -5532,34 +5573,30 @@ text_action_add (text_action_list *l, - if (action == ta_fill && removed == 0) - return; - -- for (m_p = &l->head; *m_p && (*m_p)->offset <= offset; m_p = &(*m_p)->next) -+ a.action = action; -+ a.offset = offset; -+ -+ if (action == ta_fill) - { -- text_action *t = *m_p; -+ splay_tree_node node = splay_tree_lookup (l->tree, (splay_tree_key)&a); - -- if (action == ta_fill) -+ if (node) - { -- /* When the action is another fill at the same address, -- just increase the size. */ -- if (t->offset == offset && t->action == ta_fill) -- { -- t->removed_bytes += removed; -- return; -- } -- /* Fills need to happen before widens so that we don't -- insert fill bytes into the instruction stream. */ -- if (t->offset == offset && t->action == ta_widen_insn) -- break; -+ ta = (text_action *)node->value; -+ ta->removed_bytes += removed; -+ return; - } - } -+ else -+ BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)&a) == NULL); - -- /* Create a new record and fill it up. */ - ta = (text_action *) bfd_zmalloc (sizeof (text_action)); - ta->action = action; - ta->sec = sec; - ta->offset = offset; - ta->removed_bytes = removed; -- ta->next = (*m_p); -- *m_p = ta; -+ splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta); -+ ++l->count; - } - - -@@ -5570,7 +5607,6 @@ text_action_add_literal (text_action_list *l, - const literal_value *value, - int removed) - { -- text_action **m_p; - text_action *ta; - asection *sec = r_reloc_get_section (loc); - bfd_vma offset = loc->target_offset; -@@ -5578,14 +5614,6 @@ text_action_add_literal (text_action_list *l, - - BFD_ASSERT (action == ta_add_literal); - -- for (m_p = &l->head; *m_p != NULL; m_p = &(*m_p)->next) -- { -- if ((*m_p)->offset > offset -- && ((*m_p)->offset != offset -- || (*m_p)->virtual_offset > virtual_offset)) -- break; -- } -- - /* Create a new record and fill it up. */ - ta = (text_action *) bfd_zmalloc (sizeof (text_action)); - ta->action = action; -@@ -5594,8 +5622,10 @@ text_action_add_literal (text_action_list *l, - ta->virtual_offset = virtual_offset; - ta->value = *value; - ta->removed_bytes = removed; -- ta->next = (*m_p); -- *m_p = ta; -+ -+ BFD_ASSERT (splay_tree_lookup (l->tree, (splay_tree_key)ta) == NULL); -+ splay_tree_insert (l->tree, (splay_tree_key)ta, (splay_tree_value)ta); -+ ++l->count; - } - - -@@ -5606,7 +5636,8 @@ text_action_add_literal (text_action_list *l, - so that each search may begin where the previous one left off. */ - - static int --removed_by_actions (text_action **p_start_action, -+removed_by_actions (text_action_list *action_list, -+ text_action **p_start_action, - bfd_vma offset, - bfd_boolean before_fill) - { -@@ -5614,6 +5645,13 @@ removed_by_actions (text_action **p_start_action, - int removed = 0; - - r = *p_start_action; -+ if (r) -+ { -+ splay_tree_node node = splay_tree_lookup (action_list->tree, -+ (splay_tree_key)r); -+ BFD_ASSERT (node != NULL && r == (text_action *)node->value); -+ } -+ - while (r) - { - if (r->offset > offset) -@@ -5625,7 +5663,7 @@ removed_by_actions (text_action **p_start_action, - - removed += r->removed_bytes; - -- r = r->next; -+ r = action_next (action_list, r); - } - - *p_start_action = r; -@@ -5636,68 +5674,74 @@ removed_by_actions (text_action **p_start_action, - static bfd_vma - offset_with_removed_text (text_action_list *action_list, bfd_vma offset) - { -- text_action *r = action_list->head; -- return offset - removed_by_actions (&r, offset, FALSE); -+ text_action *r = action_first (action_list); -+ -+ return offset - removed_by_actions (action_list, &r, offset, FALSE); - } - - - static unsigned - action_list_count (text_action_list *action_list) - { -- text_action *r = action_list->head; -- unsigned count = 0; -- for (r = action_list->head; r != NULL; r = r->next) -- { -- count++; -- } -- return count; -+ return action_list->count; - } - --static void --map_removal_by_action (text_action_list *action_list) -+typedef struct map_action_fn_context_struct map_action_fn_context; -+struct map_action_fn_context_struct - { -- text_action *r; -- int removed = 0; -+ int removed; - removal_by_action_map map; - bfd_boolean eq_complete; -+}; - -- map.n_entries = 0; -- map.entry = bfd_malloc (action_list_count (action_list) * -- sizeof (removal_by_action_entry)); -- eq_complete = FALSE; -+static int -+map_action_fn (splay_tree_node node, void *p) -+{ -+ map_action_fn_context *ctx = p; -+ text_action *r = (text_action *)node->value; -+ removal_by_action_entry *ientry = ctx->map.entry + ctx->map.n_entries; - -- for (r = action_list->head; r;) -+ if (ctx->map.n_entries && (ientry - 1)->offset == r->offset) - { -- removal_by_action_entry *ientry = map.entry + map.n_entries; -+ --ientry; -+ } -+ else -+ { -+ ++ctx->map.n_entries; -+ ctx->eq_complete = FALSE; -+ ientry->offset = r->offset; -+ ientry->eq_removed_before_fill = ctx->removed; -+ } - -- if (map.n_entries && (ientry - 1)->offset == r->offset) -+ if (!ctx->eq_complete) -+ { -+ if (r->action != ta_fill || r->removed_bytes >= 0) - { -- --ientry; -+ ientry->eq_removed = ctx->removed; -+ ctx->eq_complete = TRUE; - } - else -- { -- ++map.n_entries; -- eq_complete = FALSE; -- ientry->offset = r->offset; -- ientry->eq_removed_before_fill = removed; -- } -+ ientry->eq_removed = ctx->removed + r->removed_bytes; -+ } - -- if (!eq_complete) -- { -- if (r->action != ta_fill || r->removed_bytes >= 0) -- { -- ientry->eq_removed = removed; -- eq_complete = TRUE; -- } -- else -- ientry->eq_removed = removed + r->removed_bytes; -- } -+ ctx->removed += r->removed_bytes; -+ ientry->removed = ctx->removed; -+ return 0; -+} - -- removed += r->removed_bytes; -- ientry->removed = removed; -- r = r->next; -- } -- action_list->map = map; -+static void -+map_removal_by_action (text_action_list *action_list) -+{ -+ map_action_fn_context ctx; -+ -+ ctx.removed = 0; -+ ctx.map.n_entries = 0; -+ ctx.map.entry = bfd_malloc (action_list_count (action_list) * -+ sizeof (removal_by_action_entry)); -+ ctx.eq_complete = FALSE; -+ -+ splay_tree_foreach (action_list->tree, map_action_fn, &ctx); -+ action_list->map = ctx.map; - } - - static int -@@ -5754,28 +5798,26 @@ offset_with_removed_text_map (text_action_list *action_list, bfd_vma offset) - static text_action * - find_insn_action (text_action_list *action_list, bfd_vma offset) - { -- text_action *t; -- for (t = action_list->head; t; t = t->next) -+ static const text_action_t action[] = - { -- if (t->offset == offset) -- { -- switch (t->action) -- { -- case ta_none: -- case ta_fill: -- break; -- case ta_remove_insn: -- case ta_remove_longcall: -- case ta_convert_longcall: -- case ta_narrow_insn: -- case ta_widen_insn: -- return t; -- case ta_remove_literal: -- case ta_add_literal: -- BFD_ASSERT (0); -- break; -- } -- } -+ ta_convert_longcall, -+ ta_remove_longcall, -+ ta_widen_insn, -+ ta_narrow_insn, -+ ta_remove_insn, -+ }; -+ text_action a; -+ unsigned i; -+ -+ a.offset = offset; -+ for (i = 0; i < sizeof (action) / sizeof (*action); ++i) -+ { -+ splay_tree_node node; -+ -+ a.action = action[i]; -+ node = splay_tree_lookup (action_list->tree, (splay_tree_key)&a); -+ if (node) -+ return (text_action *)node->value; - } - return NULL; - } -@@ -5784,40 +5826,50 @@ find_insn_action (text_action_list *action_list, bfd_vma offset) - #if DEBUG - - static void --print_action_list (FILE *fp, text_action_list *action_list) -+print_action (FILE *fp, text_action *r) -+{ -+ const char *t = "unknown"; -+ switch (r->action) -+ { -+ case ta_remove_insn: -+ t = "remove_insn"; break; -+ case ta_remove_longcall: -+ t = "remove_longcall"; break; -+ case ta_convert_longcall: -+ t = "convert_longcall"; break; -+ case ta_narrow_insn: -+ t = "narrow_insn"; break; -+ case ta_widen_insn: -+ t = "widen_insn"; break; -+ case ta_fill: -+ t = "fill"; break; -+ case ta_none: -+ t = "none"; break; -+ case ta_remove_literal: -+ t = "remove_literal"; break; -+ case ta_add_literal: -+ t = "add_literal"; break; -+ } -+ -+ fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n", -+ r->sec->owner->filename, -+ r->sec->name, (unsigned long) r->offset, t, r->removed_bytes); -+} -+ -+static int -+print_action_list_fn (splay_tree_node node, void *p) - { -- text_action *r; -+ text_action *r = (text_action *)node->value; - -- fprintf (fp, "Text Action\n"); -- for (r = action_list->head; r != NULL; r = r->next) -- { -- const char *t = "unknown"; -- switch (r->action) -- { -- case ta_remove_insn: -- t = "remove_insn"; break; -- case ta_remove_longcall: -- t = "remove_longcall"; break; -- case ta_convert_longcall: -- t = "convert_longcall"; break; -- case ta_narrow_insn: -- t = "narrow_insn"; break; -- case ta_widen_insn: -- t = "widen_insn"; break; -- case ta_fill: -- t = "fill"; break; -- case ta_none: -- t = "none"; break; -- case ta_remove_literal: -- t = "remove_literal"; break; -- case ta_add_literal: -- t = "add_literal"; break; -- } -+ print_action (p, r); -+ return 0; -+} - -- fprintf (fp, "%s: %s[0x%lx] \"%s\" %d\n", -- r->sec->owner->filename, -- r->sec->name, (unsigned long) r->offset, t, r->removed_bytes); -- } -+static void -+print_action_list (FILE *fp, text_action_list *action_list) -+{ -+ fprintf (fp, "Text Action\n"); -+ splay_tree_foreach (action_list->tree, print_action_list_fn, fp); - } - - #endif /* DEBUG */ -@@ -6071,8 +6123,8 @@ init_xtensa_relax_info (asection *sec) - relax_info->removed_list.head = NULL; - relax_info->removed_list.tail = NULL; - -- relax_info->action_list.head = NULL; -- -+ relax_info->action_list.tree = splay_tree_new (text_action_compare, -+ NULL, NULL); - relax_info->action_list.map.n_entries = 0; - relax_info->action_list.map.entry = NULL; - -@@ -7762,7 +7814,7 @@ compute_text_actions (bfd *abfd, - free_reloc_range_list (&relevant_relocs); - - #if DEBUG -- if (relax_info->action_list.head) -+ if (action_list_count (&relax_info->action_list)) - print_action_list (stderr, &relax_info->action_list); - #endif - -@@ -8263,6 +8315,54 @@ xlate_offset_with_removed_text (const xlate_map_t *map, - return e->new_address - e->orig_address + offset; - } - -+typedef struct xlate_map_context_struct xlate_map_context; -+struct xlate_map_context_struct -+{ -+ xlate_map_t *map; -+ xlate_map_entry_t *current_entry; -+ int removed; -+}; -+ -+static int -+xlate_map_fn (splay_tree_node node, void *p) -+{ -+ text_action *r = (text_action *)node->value; -+ xlate_map_context *ctx = p; -+ unsigned orig_size = 0; -+ -+ switch (r->action) -+ { -+ case ta_none: -+ case ta_remove_insn: -+ case ta_convert_longcall: -+ case ta_remove_literal: -+ case ta_add_literal: -+ break; -+ case ta_remove_longcall: -+ orig_size = 6; -+ break; -+ case ta_narrow_insn: -+ orig_size = 3; -+ break; -+ case ta_widen_insn: -+ orig_size = 2; -+ break; -+ case ta_fill: -+ break; -+ } -+ ctx->current_entry->size = -+ r->offset + orig_size - ctx->current_entry->orig_address; -+ if (ctx->current_entry->size != 0) -+ { -+ ctx->current_entry++; -+ ctx->map->entry_count++; -+ } -+ ctx->current_entry->orig_address = r->offset + orig_size; -+ ctx->removed += r->removed_bytes; -+ ctx->current_entry->new_address = r->offset + orig_size - ctx->removed; -+ ctx->current_entry->size = 0; -+ return 0; -+} - - /* Build a binary searchable offset translation map from a section's - action list. */ -@@ -8270,75 +8370,40 @@ xlate_offset_with_removed_text (const xlate_map_t *map, - static xlate_map_t * - build_xlate_map (asection *sec, xtensa_relax_info *relax_info) - { -- xlate_map_t *map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t)); - text_action_list *action_list = &relax_info->action_list; - unsigned num_actions = 0; -- text_action *r; -- int removed; -- xlate_map_entry_t *current_entry; -+ xlate_map_context ctx; - -- if (map == NULL) -+ ctx.map = (xlate_map_t *) bfd_malloc (sizeof (xlate_map_t)); -+ -+ if (ctx.map == NULL) - return NULL; - - num_actions = action_list_count (action_list); -- map->entry = (xlate_map_entry_t *) -+ ctx.map->entry = (xlate_map_entry_t *) - bfd_malloc (sizeof (xlate_map_entry_t) * (num_actions + 1)); -- if (map->entry == NULL) -+ if (ctx.map->entry == NULL) - { -- free (map); -+ free (ctx.map); - return NULL; - } -- map->entry_count = 0; -+ ctx.map->entry_count = 0; - -- removed = 0; -- current_entry = &map->entry[0]; -+ ctx.removed = 0; -+ ctx.current_entry = &ctx.map->entry[0]; - -- current_entry->orig_address = 0; -- current_entry->new_address = 0; -- current_entry->size = 0; -+ ctx.current_entry->orig_address = 0; -+ ctx.current_entry->new_address = 0; -+ ctx.current_entry->size = 0; - -- for (r = action_list->head; r != NULL; r = r->next) -- { -- unsigned orig_size = 0; -- switch (r->action) -- { -- case ta_none: -- case ta_remove_insn: -- case ta_convert_longcall: -- case ta_remove_literal: -- case ta_add_literal: -- break; -- case ta_remove_longcall: -- orig_size = 6; -- break; -- case ta_narrow_insn: -- orig_size = 3; -- break; -- case ta_widen_insn: -- orig_size = 2; -- break; -- case ta_fill: -- break; -- } -- current_entry->size = -- r->offset + orig_size - current_entry->orig_address; -- if (current_entry->size != 0) -- { -- current_entry++; -- map->entry_count++; -- } -- current_entry->orig_address = r->offset + orig_size; -- removed += r->removed_bytes; -- current_entry->new_address = r->offset + orig_size - removed; -- current_entry->size = 0; -- } -+ splay_tree_foreach (action_list->tree, xlate_map_fn, &ctx); - -- current_entry->size = (bfd_get_section_limit (sec->owner, sec) -- - current_entry->orig_address); -- if (current_entry->size != 0) -- map->entry_count++; -+ ctx.current_entry->size = (bfd_get_section_limit (sec->owner, sec) -+ - ctx.current_entry->orig_address); -+ if (ctx.current_entry->size != 0) -+ ctx.map->entry_count++; - -- return map; -+ return ctx.map; - } - - -@@ -9302,6 +9367,16 @@ move_shared_literal (asection *sec, - - /* Second relaxation pass. */ - -+static int -+action_remove_bytes_fn (splay_tree_node node, void *p) -+{ -+ bfd_size_type *final_size = p; -+ text_action *action = (text_action *)node->value; -+ -+ *final_size -= action->removed_bytes; -+ return 0; -+} -+ - /* Modify all of the relocations to point to the right spot, and if this - is a relaxable section, delete the unwanted literals and fix the - section size. */ -@@ -9334,7 +9409,7 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - internal_relocs = retrieve_internal_relocs (abfd, sec, - link_info->keep_memory); -- if (!internal_relocs && !relax_info->action_list.head) -+ if (!internal_relocs && !action_list_count (&relax_info->action_list)) - return TRUE; - - contents = retrieve_contents (abfd, sec, link_info->keep_memory); -@@ -9412,6 +9487,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - } - /* Update the action so that the code that moves - the contents will do the right thing. */ -+ /* ta_remove_longcall and ta_remove_insn actions are -+ grouped together in the tree as well as -+ ta_convert_longcall and ta_none, so that changes below -+ can be done w/o removing and reinserting action into -+ the tree. */ -+ - if (action->action == ta_remove_longcall) - action->action = ta_remove_insn; - else -@@ -9584,13 +9665,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - - if ((relax_info->is_relaxable_literal_section - || relax_info->is_relaxable_asm_section) -- && relax_info->action_list.head) -+ && action_list_count (&relax_info->action_list)) - { - /* Walk through the planned actions and build up a table - of move, copy and fill records. Use the move, copy and - fill records to perform the actions once. */ - -- int removed = 0; - bfd_size_type final_size, copy_size, orig_insn_size; - bfd_byte *scratch = NULL; - bfd_byte *dup_contents = NULL; -@@ -9601,15 +9681,12 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - bfd_vma orig_dot_vo = 0; /* Virtual offset from orig_dot. */ - bfd_vma dup_dot = 0; - -- text_action *action = relax_info->action_list.head; -+ text_action *action; - - final_size = sec->size; -- for (action = relax_info->action_list.head; action; -- action = action->next) -- { -- final_size -= action->removed_bytes; -- } - -+ splay_tree_foreach (relax_info->action_list.tree, -+ action_remove_bytes_fn, &final_size); - scratch = (bfd_byte *) bfd_zmalloc (final_size); - dup_contents = (bfd_byte *) bfd_zmalloc (final_size); - -@@ -9618,8 +9695,8 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - print_action_list (stderr, &relax_info->action_list); - #endif - -- for (action = relax_info->action_list.head; action; -- action = action->next) -+ for (action = action_first (&relax_info->action_list); action; -+ action = action_next (&relax_info->action_list, action)) - { - virtual_action = FALSE; - if (action->offset > orig_dot) -@@ -9748,7 +9825,6 @@ relax_section (bfd *abfd, asection *sec, struct bfd_link_info *link_info) - break; - } - -- removed += action->removed_bytes; - BFD_ASSERT (dup_dot <= final_size); - BFD_ASSERT (orig_dot <= orig_size); - } --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch b/package.bak/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch deleted file mode 100644 index 043ff4df1e..0000000000 --- a/package.bak/binutils/2.25.1/910-xtensa-optimize-trampolines-relaxation.patch +++ /dev/null @@ -1,345 +0,0 @@ -From cbe53e134d4c3a656880a906738ce19fdcd38e8b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 1 May 2015 11:39:12 +0300 -Subject: [PATCH] xtensa: optimize trampolines relaxation - -Currently every fixup in the current segment is checked when relaxing -trampoline frag. This is very expensive. Make a searchable array of -fixups pointing at potentially oversized jumps at the beginning of every -relaxation pass and only check subset of this cache in the reach of -single jump from the trampoline frag currently being relaxed. - -Original profile: - -% time self children called name ------------------------------------------ - 370.16 593.38 12283048/12283048 relax_segment - 98.4 370.16 593.38 12283048 xtensa_relax_frag - 58.91 269.26 2691463834/2699602236 xtensa_insnbuf_from_chars - 68.35 68.17 811266668/813338977 S_GET_VALUE - 36.85 29.51 2684369246/2685538060 xtensa_opcode_decode - 28.34 8.84 2684369246/2685538060 xtensa_format_get_slot - 12.39 5.94 2691463834/2699775044 xtensa_format_decode - 0.03 4.60 4101109/4101109 relax_frag_for_align - 0.18 1.76 994617/994617 relax_frag_immed - 0.07 0.09 24556277/24851220 new_logical_line - 0.06 0.00 12283048/14067410 as_where - 0.04 0.00 7094588/15460506 xtensa_format_num_slots - 0.00 0.00 1/712477 xtensa_insnbuf_alloc ------------------------------------------ - -Same data, after optimization: - -% time self children called name ------------------------------------------ - 0.51 7.47 12283048/12283048 relax_segment - 58.0 0.51 7.47 12283048 xtensa_relax_frag - 0.02 4.08 4101109/4101109 relax_frag_for_align - 0.18 1.39 994617/994617 relax_frag_immed - 0.01 0.98 555/555 xtensa_cache_relaxable_fixups - 0.21 0.25 7094588/16693271 xtensa_insnbuf_from_chars - 0.06 0.12 24556277/24851220 new_logical_line - 0.06 0.00 7094588/15460506 xtensa_format_num_slots - 0.02 0.04 7094588/16866079 xtensa_format_decode - 0.05 0.00 12283048/14067410 as_where - 0.00 0.00 1/712477 xtensa_insnbuf_alloc - 0.00 0.00 93808/93808 xtensa_find_first_cached_fixup ------------------------------------------ - -2015-05-02 Max Filippov -gas/ - * config/tc-xtensa.c (cached_fixupS, fixup_cacheS): New typedefs. - (struct cached_fixup, struct fixup_cache): New structures. - (fixup_order, xtensa_make_cached_fixup), - (xtensa_realloc_fixup_cache, xtensa_cache_relaxable_fixups), - (xtensa_find_first_cached_fixup, xtensa_delete_cached_fixup), - (xtensa_add_cached_fixup): New functions. - (xtensa_relax_frag): Cache fixups pointing at potentially - oversized jumps at the beginning of every relaxation pass. Only - check subset of this cache in the reach of single jump from the - trampoline frag currently being relaxed. - -Signed-off-by: Max Filippov ---- -Backported from: b76f99d702c3501ac320396ea06bc7f9237173c3 -Changes to ChangeLog are dropped. - - gas/config/tc-xtensa.c | 220 +++++++++++++++++++++++++++++++++++++++++++------ - 1 file changed, 194 insertions(+), 26 deletions(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 3e85b69..31c0b6b 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -8785,6 +8785,154 @@ static long relax_frag_for_align (fragS *, long); - static long relax_frag_immed - (segT, fragS *, long, int, xtensa_format, int, int *, bfd_boolean); - -+typedef struct cached_fixup cached_fixupS; -+struct cached_fixup -+{ -+ int addr; -+ int target; -+ int delta; -+ fixS *fixP; -+}; -+ -+typedef struct fixup_cache fixup_cacheS; -+struct fixup_cache -+{ -+ cached_fixupS *fixups; -+ unsigned n_fixups; -+ unsigned n_max; -+ -+ segT seg; -+ fragS *first_frag; -+}; -+ -+static int fixup_order (const void *a, const void *b) -+{ -+ const cached_fixupS *pa = a; -+ const cached_fixupS *pb = b; -+ -+ if (pa->addr == pb->addr) -+ { -+ if (pa->target == pb->target) -+ { -+ if (pa->fixP->fx_r_type == pb->fixP->fx_r_type) -+ return 0; -+ return pa->fixP->fx_r_type < pb->fixP->fx_r_type ? -1 : 1; -+ } -+ return pa->target - pb->target; -+ } -+ return pa->addr - pb->addr; -+} -+ -+static bfd_boolean xtensa_make_cached_fixup (cached_fixupS *o, fixS *fixP) -+{ -+ xtensa_isa isa = xtensa_default_isa; -+ int addr = fixP->fx_frag->fr_address; -+ int target; -+ int delta; -+ symbolS *s = fixP->fx_addsy; -+ int slot; -+ xtensa_format fmt; -+ xtensa_opcode opcode; -+ -+ if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP || -+ fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP) -+ return FALSE; -+ target = S_GET_VALUE (s); -+ delta = target - addr; -+ -+ if (abs(delta) < J_RANGE / 2) -+ return FALSE; -+ -+ xtensa_insnbuf_from_chars (isa, trampoline_buf, -+ (unsigned char *) fixP->fx_frag->fr_literal + -+ fixP->fx_where, 0); -+ fmt = xtensa_format_decode (isa, trampoline_buf); -+ gas_assert (fmt != XTENSA_UNDEFINED); -+ slot = fixP->tc_fix_data.slot; -+ xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf); -+ opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf); -+ if (opcode != xtensa_j_opcode) -+ return FALSE; -+ -+ o->addr = addr; -+ o->target = target; -+ o->delta = delta; -+ o->fixP = fixP; -+ -+ return TRUE; -+} -+ -+static void xtensa_realloc_fixup_cache (fixup_cacheS *cache, unsigned add) -+{ -+ if (cache->n_fixups + add > cache->n_max) -+ { -+ cache->n_max = (cache->n_fixups + add) * 2; -+ cache->fixups = xrealloc (cache->fixups, -+ sizeof (*cache->fixups) * cache->n_max); -+ } -+} -+ -+static void xtensa_cache_relaxable_fixups (fixup_cacheS *cache, -+ segment_info_type *seginfo) -+{ -+ fixS *fixP; -+ -+ cache->n_fixups = 0; -+ -+ for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next) -+ { -+ xtensa_realloc_fixup_cache (cache, 1); -+ -+ if (xtensa_make_cached_fixup (cache->fixups + cache->n_fixups, fixP)) -+ ++cache->n_fixups; -+ } -+ qsort (cache->fixups, cache->n_fixups, sizeof (*cache->fixups), fixup_order); -+} -+ -+static unsigned xtensa_find_first_cached_fixup (const fixup_cacheS *cache, -+ int addr) -+{ -+ unsigned a = 0; -+ unsigned b = cache->n_fixups; -+ -+ while (b - a > 1) -+ { -+ unsigned c = (a + b) / 2; -+ -+ if (cache->fixups[c].addr < addr) -+ a = c; -+ else -+ b = c; -+ } -+ return a; -+} -+ -+static void xtensa_delete_cached_fixup (fixup_cacheS *cache, unsigned i) -+{ -+ memmove (cache->fixups + i, cache->fixups + i + 1, -+ (cache->n_fixups - i - 1) * sizeof (*cache->fixups)); -+ --cache->n_fixups; -+} -+ -+static bfd_boolean xtensa_add_cached_fixup (fixup_cacheS *cache, fixS *fixP) -+{ -+ cached_fixupS o; -+ unsigned i; -+ -+ if (!xtensa_make_cached_fixup (&o, fixP)) -+ return FALSE; -+ xtensa_realloc_fixup_cache (cache, 1); -+ i = xtensa_find_first_cached_fixup (cache, o.addr); -+ if (i < cache->n_fixups) -+ { -+ ++i; -+ memmove (cache->fixups + i + 1, cache->fixups + i, -+ (cache->n_fixups - i) * sizeof (*cache->fixups)); -+ } -+ cache->fixups[i] = o; -+ ++cache->n_fixups; -+ return TRUE; -+} - - /* Return the number of bytes added to this fragment, given that the - input has been stretched already by "stretch". */ -@@ -8896,35 +9044,42 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - case RELAX_TRAMPOLINE: - if (fragP->tc_frag_data.relax_seen) - { -- segment_info_type *seginfo = seg_info (now_seg); -- fragS *fP; /* The out-of-range jump. */ -- fixS *fixP; -+ static fixup_cacheS fixup_cache; -+ segment_info_type *seginfo = seg_info (now_seg); -+ int trampaddr = fragP->fr_address + fragP->fr_fix; -+ int searchaddr = trampaddr < J_RANGE ? 0 : trampaddr - J_RANGE; -+ unsigned i; -+ -+ if (now_seg != fixup_cache.seg || -+ fragP == fixup_cache.first_frag || -+ fixup_cache.first_frag == NULL) -+ { -+ xtensa_cache_relaxable_fixups (&fixup_cache, seginfo); -+ fixup_cache.seg = now_seg; -+ fixup_cache.first_frag = fragP; -+ } - - /* Scan for jumps that will not reach. */ -- for (fixP = seginfo->fix_root; fixP ; fixP = fixP->fx_next) -+ for (i = xtensa_find_first_cached_fixup (&fixup_cache, searchaddr); -+ i < fixup_cache.n_fixups; ++i) -+ - { -- symbolS *s = fixP->fx_addsy; -- xtensa_opcode opcode; -- int target; -- int addr; -- int delta; -- -- if (fixP->fx_r_type < BFD_RELOC_XTENSA_SLOT0_OP || -- fixP->fx_r_type > BFD_RELOC_XTENSA_SLOT14_OP) -- continue; -- xtensa_insnbuf_from_chars (isa, trampoline_buf, -- (unsigned char *) fixP->fx_frag->fr_literal + fixP->fx_where, -- 0); -- fmt = xtensa_format_decode (isa, trampoline_buf); -- gas_assert (fmt != XTENSA_UNDEFINED); -- slot = fixP->tc_fix_data.slot; -- xtensa_format_get_slot (isa, fmt, slot, trampoline_buf, trampoline_slotbuf); -- opcode = xtensa_opcode_decode (isa, fmt, slot, trampoline_slotbuf); -- if (opcode != xtensa_j_opcode) -+ fixS *fixP = fixup_cache.fixups[i].fixP; -+ int target = fixup_cache.fixups[i].target; -+ int addr = fixup_cache.fixups[i].addr; -+ int delta = fixup_cache.fixups[i].delta + stretch; -+ -+ trampaddr = fragP->fr_address + fragP->fr_fix; -+ -+ if (addr + J_RANGE < trampaddr) - continue; -- target = S_GET_VALUE (s); -- addr = fixP->fx_frag->fr_address; -- delta = target - addr + stretch; -+ if (addr > trampaddr + J_RANGE) -+ break; -+ if (abs (delta) < J_RANGE) -+ continue; -+ -+ slot = fixP->tc_fix_data.slot; -+ - if (delta > J_RANGE || delta < -1 * J_RANGE) - { /* Found an out-of-range jump; scan the list of trampolines for the best match. */ - struct trampoline_seg *ts = find_trampoline_seg (now_seg); -@@ -8978,14 +9133,13 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - } - if (tf->fragP == fragP) - { -- int trampaddr = fragP->fr_address + fragP->fr_fix; -- - if (abs (addr - trampaddr) < J_RANGE) - { /* The trampoline is in range of original; fix it! */ - fixS *newfixP; - int offset; - TInsn insn; - symbolS *lsym; -+ fragS *fP; /* The out-of-range jump. */ - - new_stretch += init_trampoline_frag (tf); - offset = fragP->fr_fix; /* Where to assemble the j insn. */ -@@ -9009,10 +9163,20 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - newfixP->tc_fix_data.X_add_symbol = lsym; - newfixP->tc_fix_data.X_add_number = offset; - newfixP->tc_fix_data.slot = slot; -+ -+ xtensa_delete_cached_fixup (&fixup_cache, i); -+ xtensa_add_cached_fixup (&fixup_cache, newfixP); -+ - /* Move the fix-up from the original j insn to this one. */ - fixP->fx_frag = fragP; - fixP->fx_where = fragP->fr_fix - 3; - fixP->tc_fix_data.slot = 0; -+ -+ xtensa_add_cached_fixup (&fixup_cache, fixP); -+ -+ /* re-do current fixup */ -+ --i; -+ - /* Adjust the jump around this trampoline (if present). */ - if (tf->fixP != NULL) - { -@@ -9027,6 +9191,8 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - fragP->fr_subtype = 0; - /* Remove from the trampoline_list. */ - prev->next = tf->next; -+ if (fragP == fixup_cache.first_frag) -+ fixup_cache.first_frag = NULL; - break; - } - } --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch b/package.bak/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch deleted file mode 100644 index 9ad6b3be05..0000000000 --- a/package.bak/binutils/2.25.1/911-xtensa-fix-localized-symbol-refcounting-with-gc-sect.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 8ec76b16f62d1bf386fb2c39af5f66c3afddc5cb Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 14 May 2015 05:22:55 +0300 -Subject: [PATCH] xtensa: fix localized symbol refcounting with --gc-sections - -elf_xtensa_gc_sweep_hook doesn't correctly unreference symbols that were -made local, that results in link failure with the following message: - - BFD (GNU Binutils) 2.24 internal error, aborting at elf32-xtensa.c line - 3372 in elf_xtensa_finish_dynamic_sections - -elf_xtensa_gc_sweep_hook determines symbol reference type (PLT or GOT) by -relocation type. Relocation types are not changed when symbol becomes -local, but its PLT references are added to GOT references and -plt.refcount is set to 0. Such symbol cannot be unreferences in the -elf_xtensa_gc_sweep_hook and its extra references make calculated GOT -relocations section size not match number of GOT relocations. - -Fix it by treating PLT reference as GOT reference when plt.refcount is -not positive. - -2015-05-14 Max Filippov -bfd/ - * elf32-xtensa.c (elf_xtensa_gc_sweep_hook): Treat PLT reference - as GOT reference when plt.refcount is not positive. - -Signed-off-by: Max Filippov ---- -Backported from: e6c9a083ec5ae7a45bd71682b26aae1939849388 -Changes to ChangeLog are dropped. - - bfd/elf32-xtensa.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/bfd/elf32-xtensa.c b/bfd/elf32-xtensa.c -index 53af1c6..2523670 100644 ---- a/bfd/elf32-xtensa.c -+++ b/bfd/elf32-xtensa.c -@@ -1360,10 +1360,14 @@ elf_xtensa_gc_sweep_hook (bfd *abfd, - { - if (is_plt) - { -+ /* If the symbol has been localized its plt.refcount got moved -+ to got.refcount. Handle it as GOT. */ - if (h->plt.refcount > 0) - h->plt.refcount--; -+ else -+ is_got = TRUE; - } -- else if (is_got) -+ if (is_got) - { - if (h->got.refcount > 0) - h->got.refcount--; --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch b/package.bak/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch deleted file mode 100644 index 4a3de2c839..0000000000 --- a/package.bak/binutils/2.25.1/912-xtensa-fix-gas-segfault-with-text-section-literals.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2d0522e76e4afeeb2e104e0a4332d94fa0d2fbf6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sun, 17 May 2015 06:46:15 +0300 -Subject: [PATCH] xtensa: fix gas segfault with --text-section-literals - -When --text-section-literals is used and code in the .init or .fini -emits literal in the absence of .literal_position, xtensa_move_literals -segfaults. - -Check that search_frag is non-NULL in the xtensa_move_literals and -report error otherwise. - -2015-05-26 Max Filippov -gas/ - * config/tc-xtensa.c (xtensa_move_literals): Check that - search_frag is non-NULL. Report error if literal frag is not - found. - -Signed-off-by: Max Filippov ---- -Backported from: 4de0562a4c69fef4952aa7e19d7bda359f02e8b4 -Changes to ChangeLog are dropped. - - gas/config/tc-xtensa.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 31c0b6b..18307c1 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -10808,13 +10808,21 @@ xtensa_move_literals (void) - frchain_to = NULL; - frag_splice = &(frchain_from->frch_root); - -- while (!search_frag->tc_frag_data.literal_frag) -+ while (search_frag && !search_frag->tc_frag_data.literal_frag) - { - gas_assert (search_frag->fr_fix == 0 - || search_frag->fr_type == rs_align); - search_frag = search_frag->fr_next; - } - -+ if (!search_frag) -+ { -+ search_frag = frchain_from->frch_root; -+ as_bad_where (search_frag->fr_file, search_frag->fr_line, -+ _("literal pool location required for text-section-literals; specify with .literal_position")); -+ continue; -+ } -+ - gas_assert (search_frag->tc_frag_data.literal_frag->fr_subtype - == RELAX_LITERAL_POOL_BEGIN); - xtensa_switch_section_emit_state (&state, segment->seg, 0); --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch b/package.bak/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch deleted file mode 100644 index 3ed9af1283..0000000000 --- a/package.bak/binutils/2.25.1/913-xtensa-add-auto-litpools-option.patch +++ /dev/null @@ -1,699 +0,0 @@ -From 978adaaa4cd3921842e2be8a31c05f081fb17fcf Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 29 Jul 2015 17:42:54 +0300 -Subject: [PATCH] xtensa: add --auto-litpools option - -Auto-litpools is the automated version of text-section-literals: literal -pool candidate frags are planted every N frags and during relaxation -they are turned into actual literal pools where literals are moved to -become reachable for their first reference by L32R instruction. - -2015-08-12 David Weatherford -gas/ - * config/tc-xtensa.c (struct litpool_frag, struct litpool_seg): - New structures. - (xtensa_maybe_create_literal_pool_frag): New function. - (litpool_seg_list, auto_litpools, auto_litpool_limit) - (litpool_buf, litpool_slotbuf): New static variables. - (option_auto_litpools, option_no_auto_litpools) - (option_auto_litpool_limit): New enum identifiers. - (md_longopts): Add entries for auto-litpools, no-auto-litpools - and auto-litpool-limit. - (md_parse_option): Handle option_auto_litpools, - option_no_auto_litpools and option_auto_litpool_limit. - (md_show_usage): Add help for --[no-]auto-litpools and - --auto-litpool-limit. - (xtensa_mark_literal_pool_location): Record a place for literal - pool with a call to xtensa_maybe_create_literal_pool_frag. - (get_literal_pool_location): Find highest priority literal pool - or convert candidate to literal pool when auto-litpools are used. - (xg_assemble_vliw_tokens): Create literal pool after jump - instruction. - (xtensa_check_frag_count): Create candidate literal pool every - auto_litpool_limit frags. - (xtensa_relax_frag): Add jump around literals to non-empty - literal pool. - (xtensa_move_literals): Estimate literal pool addresses and move - unreachable literals closer to their users, converting candidate - to literal pool if needed. - (xtensa_switch_to_non_abs_literal_fragment): Only emit error - about missing .literal_position in case auto-litpools are not - used. - * config/tc-xtensa.h (xtensa_relax_statesE): New relaxation - state: RELAX_LITERAL_POOL_CANDIDATE_BEGIN. - -2015-08-12 Max Filippov -gas/testsuite/ - * gas/xtensa/all.exp: Add auto-litpools to the list of xtensa - tests. - * gas/xtensa/auto-litpools.s: New file: auto-litpools test. - * gas/xtensa/auto-litpools.s: New file: auto-litpools test - result pattern. - -Signed-off-by: Max Filippov ---- -Backported from: b46824bd49648c575372e6d9bc6a6defeabd6ed5 -Changes to ChangeLogs and documentation are dropped. - - gas/config/tc-xtensa.c | 432 ++++++++++++++++++++++++++++++- - gas/config/tc-xtensa.h | 1 + - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/auto-litpools.d | 12 + - gas/testsuite/gas/xtensa/auto-litpools.s | 13 + - 5 files changed, 454 insertions(+), 5 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.d - create mode 100644 gas/testsuite/gas/xtensa/auto-litpools.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 7311a05..b8b1e7d 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -440,6 +440,29 @@ bfd_boolean directive_state[] = - #endif - }; - -+/* A circular list of all potential and actual literal pool locations -+ in a segment. */ -+struct litpool_frag -+{ -+ struct litpool_frag *next; -+ struct litpool_frag *prev; -+ fragS *fragP; -+ addressT addr; -+ short priority; /* 1, 2, or 3 -- 1 is highest */ -+ short original_priority; -+}; -+ -+/* Map a segment to its litpool_frag list. */ -+struct litpool_seg -+{ -+ struct litpool_seg *next; -+ asection *seg; -+ struct litpool_frag frag_list; -+ int frag_count; /* since last litpool location */ -+}; -+ -+static struct litpool_seg litpool_seg_list; -+ - - /* Directive functions. */ - -@@ -474,6 +497,9 @@ static void xtensa_create_trampoline_frag (bfd_boolean); - static void xtensa_maybe_create_trampoline_frag (void); - struct trampoline_frag; - static int init_trampoline_frag (struct trampoline_frag *); -+static void xtensa_maybe_create_literal_pool_frag (bfd_boolean, bfd_boolean); -+static bfd_boolean auto_litpools = FALSE; -+static int auto_litpool_limit = 10000; - - /* Alignment Functions. */ - -@@ -698,6 +724,10 @@ enum - - option_trampolines, - option_no_trampolines, -+ -+ option_auto_litpools, -+ option_no_auto_litpools, -+ option_auto_litpool_limit, - }; - - const char *md_shortopts = ""; -@@ -773,6 +803,10 @@ struct option md_longopts[] = - { "trampolines", no_argument, NULL, option_trampolines }, - { "no-trampolines", no_argument, NULL, option_no_trampolines }, - -+ { "auto-litpools", no_argument, NULL, option_auto_litpools }, -+ { "no-auto-litpools", no_argument, NULL, option_no_auto_litpools }, -+ { "auto-litpool-limit", required_argument, NULL, option_auto_litpool_limit }, -+ - { NULL, no_argument, NULL, 0 } - }; - -@@ -961,6 +995,34 @@ md_parse_option (int c, char *arg) - use_trampolines = FALSE; - return 1; - -+ case option_auto_litpools: -+ auto_litpools = TRUE; -+ use_literal_section = FALSE; -+ return 1; -+ -+ case option_no_auto_litpools: -+ auto_litpools = FALSE; -+ auto_litpool_limit = -1; -+ return 1; -+ -+ case option_auto_litpool_limit: -+ { -+ int value = 0; -+ if (auto_litpool_limit < 0) -+ as_fatal (_("no-auto-litpools is incompatible with auto-litpool-limit")); -+ if (*arg == 0 || *arg == '-') -+ as_fatal (_("invalid auto-litpool-limit argument")); -+ value = strtol (arg, &arg, 10); -+ if (*arg != 0) -+ as_fatal (_("invalid auto-litpool-limit argument")); -+ if (value < 100 || value > 10000) -+ as_fatal (_("invalid auto-litpool-limit argument (range is 100-10000)")); -+ auto_litpool_limit = value; -+ auto_litpools = TRUE; -+ use_literal_section = FALSE; -+ return 1; -+ } -+ - default: - return 0; - } -@@ -986,7 +1048,12 @@ Xtensa options:\n\ - flix bundles\n\ - --rename-section old=new Rename section 'old' to 'new'\n\ - --[no-]trampolines [Do not] generate trampolines (jumps to jumps)\n\ -- when jumps do not reach their targets\n", stream); -+ when jumps do not reach their targets\n\ -+ --[no-]auto-litpools [Do not] automatically create literal pools\n\ -+ --auto-litpool-limit=\n\ -+ (range 100-10000) Maximum number of blocks of\n\ -+ instructions to emit between literal pool\n\ -+ locations; implies --auto-litpools flag\n", stream); - } - - -@@ -4728,6 +4795,8 @@ xtensa_mark_literal_pool_location (void) - pool_location = frag_now; - frag_now->tc_frag_data.lit_frchain = frchain_now; - frag_now->tc_frag_data.literal_frag = frag_now; -+ /* Just record this frag. */ -+ xtensa_maybe_create_literal_pool_frag (FALSE, FALSE); - frag_variant (rs_machine_dependent, 0, 0, - RELAX_LITERAL_POOL_BEGIN, NULL, 0, NULL); - xtensa_set_frag_assembly_state (frag_now); -@@ -4832,6 +4901,31 @@ get_expanded_loop_offset (xtensa_opcode opcode) - static fragS * - get_literal_pool_location (segT seg) - { -+ struct litpool_seg *lps = litpool_seg_list.next; -+ struct litpool_frag *lpf; -+ for ( ; lps && lps->seg->id != seg->id; lps = lps->next) -+ ; -+ if (lps) -+ { -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { /* Skip "candidates" for now. */ -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN && -+ lpf->priority == 1) -+ return lpf->fragP; -+ } -+ /* Must convert a lower-priority pool. */ -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN) -+ return lpf->fragP; -+ } -+ /* Still no match -- try for a low priority pool. */ -+ for (lpf = lps->frag_list.prev; lpf->fragP; lpf = lpf->prev) -+ { -+ if (lpf->fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN) -+ return lpf->fragP; -+ } -+ } - return seg_info (seg)->tc_segment_info_data.literal_pool_loc; - } - -@@ -7098,6 +7192,11 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn) - frag_now->tc_frag_data.slot_symbols[slot] = tinsn->symbol; - frag_now->tc_frag_data.slot_offsets[slot] = tinsn->offset; - frag_now->tc_frag_data.literal_frags[slot] = tinsn->literal_frag; -+ if (tinsn->opcode == xtensa_l32r_opcode) -+ { -+ frag_now->tc_frag_data.literal_frags[slot] = -+ tinsn->tok[1].X_add_symbol->sy_frag; -+ } - if (tinsn->literal_space != 0) - xg_assemble_literal_space (tinsn->literal_space, slot); - frag_now->tc_frag_data.free_reg[slot] = tinsn->extra_arg; -@@ -7170,6 +7269,8 @@ xg_assemble_vliw_tokens (vliw_insn *vinsn) - frag_now->fr_symbol, frag_now->fr_offset, NULL); - xtensa_set_frag_assembly_state (frag_now); - xtensa_maybe_create_trampoline_frag (); -+ /* Always create one here. */ -+ xtensa_maybe_create_literal_pool_frag (TRUE, FALSE); - } - else if (is_branch && do_align_targets ()) - { -@@ -7314,11 +7415,18 @@ xtensa_check_frag_count (void) - clear_frag_count (); - unreachable_count = 0; - } -+ -+ /* We create an area for a possible literal pool every N (default 5000) -+ frags or so. */ -+ xtensa_maybe_create_literal_pool_frag (TRUE, TRUE); - } - - static xtensa_insnbuf trampoline_buf = NULL; - static xtensa_insnbuf trampoline_slotbuf = NULL; - -+static xtensa_insnbuf litpool_buf = NULL; -+static xtensa_insnbuf litpool_slotbuf = NULL; -+ - #define TRAMPOLINE_FRAG_SIZE 3000 - - static void -@@ -7410,6 +7518,135 @@ dump_trampolines (void) - } - } - -+static void dump_litpools (void) __attribute__ ((unused)); -+ -+static void -+dump_litpools (void) -+{ -+ struct litpool_seg *lps = litpool_seg_list.next; -+ struct litpool_frag *lpf; -+ -+ for ( ; lps ; lps = lps->next ) -+ { -+ printf("litpool seg %s\n", lps->seg->name); -+ for ( lpf = lps->frag_list.next; lpf->fragP; lpf = lpf->next ) -+ { -+ fragS *litfrag = lpf->fragP->fr_next; -+ int count = 0; -+ while (litfrag && litfrag->fr_subtype != RELAX_LITERAL_POOL_END) -+ { -+ if (litfrag->fr_fix == 4) -+ count++; -+ litfrag = litfrag->fr_next; -+ } -+ printf(" %ld <%d:%d> (%d) [%d]: ", -+ lpf->addr, lpf->priority, lpf->original_priority, -+ lpf->fragP->fr_line, count); -+ //dump_frag(lpf->fragP); -+ } -+ } -+} -+ -+static void -+xtensa_maybe_create_literal_pool_frag (bfd_boolean create, -+ bfd_boolean only_if_needed) -+{ -+ struct litpool_seg *lps = litpool_seg_list.next; -+ fragS *fragP; -+ struct litpool_frag *lpf; -+ bfd_boolean needed = FALSE; -+ -+ if (use_literal_section || !auto_litpools) -+ return; -+ -+ for ( ; lps ; lps = lps->next ) -+ { -+ if (lps->seg == now_seg) -+ break; -+ } -+ -+ if (lps == NULL) -+ { -+ lps = (struct litpool_seg *)xcalloc (sizeof (struct litpool_seg), 1); -+ lps->next = litpool_seg_list.next; -+ litpool_seg_list.next = lps; -+ lps->seg = now_seg; -+ lps->frag_list.next = &lps->frag_list; -+ lps->frag_list.prev = &lps->frag_list; -+ } -+ -+ lps->frag_count++; -+ -+ if (create) -+ { -+ if (only_if_needed) -+ { -+ if (past_xtensa_end || !use_transform() || -+ frag_now->tc_frag_data.is_no_transform) -+ { -+ return; -+ } -+ if (auto_litpool_limit <= 0) -+ { -+ /* Don't create a litpool based only on frag count. */ -+ return; -+ } -+ else if (lps->frag_count > auto_litpool_limit) -+ { -+ needed = TRUE; -+ } -+ else -+ { -+ return; -+ } -+ } -+ else -+ { -+ needed = TRUE; -+ } -+ } -+ -+ if (needed) -+ { -+ int size = (only_if_needed) ? 3 : 0; /* Space for a "j" insn. */ -+ /* Create a potential site for a literal pool. */ -+ frag_wane (frag_now); -+ frag_new (0); -+ xtensa_set_frag_assembly_state (frag_now); -+ fragP = frag_now; -+ fragP->tc_frag_data.lit_frchain = frchain_now; -+ fragP->tc_frag_data.literal_frag = fragP; -+ frag_var (rs_machine_dependent, size, size, -+ (only_if_needed) ? -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN : -+ RELAX_LITERAL_POOL_BEGIN, -+ NULL, 0, NULL); -+ frag_now->tc_frag_data.lit_seg = now_seg; -+ frag_variant (rs_machine_dependent, 0, 0, -+ RELAX_LITERAL_POOL_END, NULL, 0, NULL); -+ xtensa_set_frag_assembly_state (frag_now); -+ } -+ else -+ { -+ /* RELAX_LITERAL_POOL_BEGIN frag is being created; -+ just record it here. */ -+ fragP = frag_now; -+ } -+ -+ lpf = (struct litpool_frag *)xmalloc(sizeof (struct litpool_frag)); -+ /* Insert at tail of circular list. */ -+ lpf->addr = 0; -+ lps->frag_list.prev->next = lpf; -+ lpf->next = &lps->frag_list; -+ lpf->prev = lps->frag_list.prev; -+ lps->frag_list.prev = lpf; -+ lpf->fragP = fragP; -+ lpf->priority = (needed) ? (only_if_needed) ? 3 : 2 : 1; -+ lpf->original_priority = lpf->priority; -+ -+ lps->frag_count = 0; -+} -+ - static void - xtensa_cleanup_align_frags (void) - { -@@ -9029,7 +9266,41 @@ xtensa_relax_frag (fragS *fragP, long stretch, int *stretched_p) - break; - - case RELAX_LITERAL_POOL_BEGIN: -+ if (fragP->fr_var != 0) -+ { -+ /* We have a converted "candidate" literal pool; -+ assemble a jump around it. */ -+ TInsn insn; -+ if (!litpool_slotbuf) -+ { -+ litpool_buf = xtensa_insnbuf_alloc (isa); -+ litpool_slotbuf = xtensa_insnbuf_alloc (isa); -+ } -+ new_stretch += 3; -+ fragP->tc_frag_data.relax_seen = FALSE; /* Need another pass. */ -+ fragP->tc_frag_data.is_insn = TRUE; -+ tinsn_init (&insn); -+ insn.insn_type = ITYPE_INSN; -+ insn.opcode = xtensa_j_opcode; -+ insn.ntok = 1; -+ set_expr_symbol_offset (&insn.tok[0], fragP->fr_symbol, -+ fragP->fr_fix); -+ fmt = xg_get_single_format (xtensa_j_opcode); -+ tinsn_to_slotbuf (fmt, 0, &insn, litpool_slotbuf); -+ xtensa_format_set_slot (isa, fmt, 0, litpool_buf, litpool_slotbuf); -+ xtensa_insnbuf_to_chars (isa, litpool_buf, -+ (unsigned char *)fragP->fr_literal + -+ fragP->fr_fix, 3); -+ fragP->fr_fix += 3; -+ fragP->fr_var -= 3; -+ /* Add a fix-up. */ -+ fix_new (fragP, 0, 3, fragP->fr_symbol, 0, TRUE, -+ BFD_RELOC_XTENSA_SLOT0_OP); -+ } -+ break; -+ - case RELAX_LITERAL_POOL_END: -+ case RELAX_LITERAL_POOL_CANDIDATE_BEGIN: - case RELAX_MAYBE_UNREACHABLE: - case RELAX_MAYBE_DESIRE_ALIGN: - /* No relaxation required. */ -@@ -10789,12 +11060,115 @@ xtensa_move_literals (void) - segT dest_seg; - fixS *fix, *next_fix, **fix_splice; - sym_list *lit; -+ struct litpool_seg *lps; - - mark_literal_frags (literal_head->next); - - if (use_literal_section) - return; - -+ /* Assign addresses (rough estimates) to the potential literal pool locations -+ and create new ones if the gaps are too large. */ -+ -+ for (lps = litpool_seg_list.next; lps; lps = lps->next) -+ { -+ frchainS *frchP = seg_info (lps->seg)->frchainP; -+ struct litpool_frag *lpf = lps->frag_list.next; -+ addressT addr = 0; -+ -+ for ( ; frchP; frchP = frchP->frch_next) -+ { -+ fragS *fragP; -+ for (fragP = frchP->frch_root; fragP; fragP = fragP->fr_next) -+ { -+ if (lpf && fragP == lpf->fragP) -+ { -+ gas_assert(fragP->fr_type == rs_machine_dependent && -+ (fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN || -+ fragP->fr_subtype == RELAX_LITERAL_POOL_CANDIDATE_BEGIN)); -+ /* Found a litpool location. */ -+ lpf->addr = addr; -+ lpf = lpf->next; -+ } -+ if (fragP->fr_type == rs_machine_dependent && -+ fragP->fr_subtype == RELAX_SLOTS) -+ { -+ int slot; -+ for (slot = 0; slot < MAX_SLOTS; slot++) -+ { -+ if (fragP->tc_frag_data.literal_frags[slot]) -+ { -+ /* L32R; point its literal to the nearest litpool -+ preferring non-"candidate" positions to avoid -+ the jump-around. */ -+ fragS *litfrag = fragP->tc_frag_data.literal_frags[slot]; -+ struct litpool_frag *lp = lpf->prev; -+ if (!lp->fragP) -+ { -+ break; -+ } -+ while (lp->fragP->fr_subtype == -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN) -+ { -+ lp = lp->prev; -+ if (lp->fragP == NULL) -+ { -+ /* End of list; have to bite the bullet. -+ Take the nearest. */ -+ lp = lpf->prev; -+ break; -+ } -+ /* Does it (conservatively) reach? */ -+ if (addr - lp->addr <= 128 * 1024) -+ { -+ if (lp->fragP->fr_subtype == RELAX_LITERAL_POOL_BEGIN) -+ { -+ /* Found a good one. */ -+ break; -+ } -+ else if (lp->prev->fragP && -+ addr - lp->prev->addr > 128 * 1024) -+ { -+ /* This is still a "candidate" but the next one -+ will be too far away, so revert to the nearest -+ one, convert it and add the jump around. */ -+ fragS *poolbeg; -+ fragS *poolend; -+ symbolS *lsym; -+ char label[10 + 2 * sizeof (fragS *)]; -+ lp = lpf->prev; -+ poolbeg = lp->fragP; -+ lp->priority = 1; -+ poolbeg->fr_subtype = RELAX_LITERAL_POOL_BEGIN; -+ poolend = poolbeg->fr_next; -+ gas_assert (poolend->fr_type == rs_machine_dependent && -+ poolend->fr_subtype == RELAX_LITERAL_POOL_END); -+ /* Create a local symbol pointing to the -+ end of the pool. */ -+ sprintf (label, ".L0_LT_%p", poolbeg); -+ lsym = (symbolS *)local_symbol_make (label, lps->seg, -+ 0, poolend); -+ poolbeg->fr_symbol = lsym; -+ /* Rest is done in xtensa_relax_frag. */ -+ } -+ } -+ } -+ if (! litfrag->tc_frag_data.literal_frag) -+ { -+ /* Take earliest use of this literal to avoid -+ forward refs. */ -+ litfrag->tc_frag_data.literal_frag = lp->fragP; -+ } -+ } -+ } -+ } -+ addr += fragP->fr_fix; -+ if (fragP->fr_type == rs_fill) -+ addr += fragP->fr_offset; -+ } -+ } -+ } -+ - for (segment = literal_head->next; segment; segment = segment->next) - { - /* Keep the literals for .init and .fini in separate sections. */ -@@ -10839,9 +11213,6 @@ xtensa_move_literals (void) - while (search_frag != frag_now) - { - next_frag = search_frag->fr_next; -- -- /* First, move the frag out of the literal section and -- to the appropriate place. */ - if (search_frag->tc_frag_data.literal_frag) - { - literal_pool = search_frag->tc_frag_data.literal_frag; -@@ -10849,8 +11220,56 @@ xtensa_move_literals (void) - frchain_to = literal_pool->tc_frag_data.lit_frchain; - gas_assert (frchain_to); - } -+ -+ if (search_frag->fr_type == rs_fill && search_frag->fr_fix == 0) -+ { -+ /* Skip empty fill frags. */ -+ *frag_splice = next_frag; -+ search_frag = next_frag; -+ continue; -+ } -+ -+ if (search_frag->fr_type == rs_align) -+ { -+ /* Skip alignment frags, because the pool as a whole will be -+ aligned if used, and we don't want to force alignment if the -+ pool is unused. */ -+ *frag_splice = next_frag; -+ search_frag = next_frag; -+ continue; -+ } -+ -+ /* First, move the frag out of the literal section and -+ to the appropriate place. */ -+ -+ /* Insert an aligmnent frag at start of pool. */ -+ if (literal_pool->fr_next->fr_type == rs_machine_dependent && -+ literal_pool->fr_next->fr_subtype == RELAX_LITERAL_POOL_END) -+ { -+ segT pool_seg = literal_pool->fr_next->tc_frag_data.lit_seg; -+ emit_state prev_state; -+ fragS *prev_frag; -+ fragS *align_frag; -+ xtensa_switch_section_emit_state (&prev_state, pool_seg, 0); -+ prev_frag = frag_now; -+ frag_variant (rs_fill, 0, 0, 0, NULL, 0, NULL); -+ align_frag = frag_now; -+ frag_align (2, 0, 0); -+ /* Splice it into the right place. */ -+ prev_frag->fr_next = align_frag->fr_next; -+ align_frag->fr_next = literal_pool->fr_next; -+ literal_pool->fr_next = align_frag; -+ /* Insert after this one. */ -+ literal_pool->tc_frag_data.literal_frag = align_frag; -+ xtensa_restore_emit_state (&prev_state); -+ } - insert_after = literal_pool->tc_frag_data.literal_frag; - dest_seg = insert_after->fr_next->tc_frag_data.lit_seg; -+ /* Skip align frag. */ -+ if (insert_after->fr_next->fr_type == rs_align) -+ { -+ insert_after = insert_after->fr_next; -+ } - - *frag_splice = next_frag; - search_frag->fr_next = insert_after->fr_next; -@@ -11014,7 +11433,10 @@ xtensa_switch_to_non_abs_literal_fragment (emit_state *result) - && !recursive - && !is_init && ! is_fini) - { -- as_bad (_("literal pool location required for text-section-literals; specify with .literal_position")); -+ if (!auto_litpools) -+ { -+ as_bad (_("literal pool location required for text-section-literals; specify with .literal_position")); -+ } - - /* When we mark a literal pool location, we want to put a frag in - the literal pool that points to it. But to do that, we want to -diff --git a/gas/config/tc-xtensa.h b/gas/config/tc-xtensa.h -index b2e43fa..290d902 100644 ---- a/gas/config/tc-xtensa.h -+++ b/gas/config/tc-xtensa.h -@@ -124,6 +124,7 @@ enum xtensa_relax_statesE - - RELAX_LITERAL_POOL_BEGIN, - RELAX_LITERAL_POOL_END, -+ RELAX_LITERAL_POOL_CANDIDATE_BEGIN, - /* Technically these are not relaxations at all but mark a location - to store literals later. Note that fr_var stores the frchain for - BEGIN frags and fr_var stores now_seg for END frags. */ -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index d197ec8..db39629 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -100,6 +100,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "jlong" - run_dump_test "trampoline" - run_dump_test "first_frag_align" -+ run_dump_test "auto-litpools" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/auto-litpools.d b/gas/testsuite/gas/xtensa/auto-litpools.d -new file mode 100644 -index 0000000..4d1a690 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/auto-litpools.d -@@ -0,0 +1,12 @@ -+#as: --auto-litpools -+#objdump: -d -+#name: auto literal pool placement -+ -+.*: +file format .*xtensa.* -+#... -+.*4:.*l32r.a2, 0 .* -+#... -+.*3e437:.*j.3e440 .* -+#... -+.*40750:.*l32r.a2, 3e43c .* -+#... -diff --git a/gas/testsuite/gas/xtensa/auto-litpools.s b/gas/testsuite/gas/xtensa/auto-litpools.s -new file mode 100644 -index 0000000..9a5b26b ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/auto-litpools.s -@@ -0,0 +1,13 @@ -+ .text -+ .align 4 -+ .literal .L0, 0x12345 -+ .literal .L1, 0x12345 -+ -+f: -+ l32r a2, .L0 -+ .rep 44000 -+ _nop -+ _nop -+ .endr -+ l32r a2, .L1 -+ ret --- -1.8.1.4 - diff --git a/package.bak/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch b/package.bak/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch deleted file mode 100644 index bd751661b8..0000000000 --- a/package.bak/binutils/2.25.1/914-xtensa-fix-signedness-of-gas-relocations.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 6c7c5c477ef9ccf2d2548cf2ac3cec9bd3c9c5b6 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 2 Feb 2016 17:11:38 +0300 -Subject: [PATCH] xtensa: fix signedness of gas relocations - -Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation -offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations -substituted for BFD_RELOC_*. This made it impossible to encode arbitrary -8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc -directive. Revert this part and add test. - -gas/ -2016-02-03 Max Filippov - * config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF* - substitutions for BFD_RELOC_* as unsigned. - -gas/testsuite/ -2016-02-03 Max Filippov - * gas/xtensa/all.exp: Add loc to list of xtensa tests. - * gas/xtensa/loc.d: New file: loc test result patterns. - * gas/xtensa/loc.s: New file: loc test. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 6 +++--- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/loc.d | 10 ++++++++++ - gas/testsuite/gas/xtensa/loc.s | 7 +++++++ - 4 files changed, 21 insertions(+), 3 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/loc.d - create mode 100644 gas/testsuite/gas/xtensa/loc.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index a119871..36a06cc 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - { - case BFD_RELOC_8: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_16: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_32: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - default: - break; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 31b725b..7ff7bd7 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "trampoline" - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" -+ run_dump_test "loc" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -new file mode 100644 -index 0000000..71983cc ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -0,0 +1,10 @@ -+#as: -+#objdump: -r -+#name: .loc directive relocs -+ -+.*: +file format .*xtensa.* -+ -+RELOCATION RECORDS FOR \[\.debug_line\]: -+#... -+.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+#... -diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s -new file mode 100644 -index 0000000..029e14e ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.s -@@ -0,0 +1,7 @@ -+ .text -+ .file 1 "loc.s" -+ .loc 1 3 -+ nop -+ .space 40000 -+ .loc 1 5 -+ nop --- -2.1.4 - diff --git a/package.bak/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch b/package.bak/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch deleted file mode 100644 index 6ae9d9afc4..0000000000 --- a/package.bak/binutils/2.25.1/915-Correct-assertion-in-NIOS2-linker-to-allow-signed-16.patch +++ /dev/null @@ -1,70 +0,0 @@ -From d07f38875f37f4608e8ecb761619d84716896f14 Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Wed, 10 Feb 2016 11:25:59 +0000 -Subject: [PATCH] Correct assertion in NIOS2 linker to allow signed 16-buit - immediate values. - - PR 19405 - * elf32-nios2.c (nios2_elf32_install_imm16): Allow for signed - immediate values. - * elf-eh-frame.c (_bfd_elf_discard_section_eh_frame): Limit the - number of messages about FDE encoding preventing .eh_frame_hdr - generation. - -[Romain: rebase on 2.25.1] -Signed-off-by: Romain Naour ---- - bfd/elf-eh-frame.c | 18 +++++++++++++++--- - bfd/elf32-nios2.c | 2 +- - 2 files changed, 16 insertions(+), 4 deletions(-) - -diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c -index 002932d..22430f9 100644 ---- a/bfd/elf-eh-frame.c -+++ b/bfd/elf-eh-frame.c -@@ -1181,14 +1181,26 @@ _bfd_elf_discard_section_eh_frame - && ent->make_relative == 0) - || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned)) - { -+ static int num_warnings_issued = 0; -+ - /* If a shared library uses absolute pointers - which we cannot turn into PC relative, - don't create the binary search table, - since it is affected by runtime relocations. */ - hdr_info->table = FALSE; -- (*info->callbacks->einfo) -- (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr" -- " table being created.\n"), abfd, sec); -+ if (num_warnings_issued < 10) -+ { -+ (*info->callbacks->einfo) -+ (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr" -+ " table being created.\n"), abfd, sec); -+ num_warnings_issued ++; -+ } -+ else if (num_warnings_issued == 10) -+ { -+ (*info->callbacks->einfo) -+ (_("%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation dropped.\n")); -+ num_warnings_issued ++; -+ } - } - ent->removed = 0; - hdr_info->fde_count++; -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index 0105b70..726647d 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -1035,7 +1035,7 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) - { - bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); - -- BFD_ASSERT(value <= 0xffff); -+ BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); - - bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), - sec->contents + offset); --- -2.4.3 - diff --git a/package.bak/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch b/package.bak/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch deleted file mode 100644 index ead3e42b75..0000000000 --- a/package.bak/binutils/2.25.1/915-xtensa-fix-.init-.fini-literals-moving.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 16 Feb 2016 02:23:28 +0300 -Subject: [PATCH] xtensa: fix .init/.fini literals moving - -Despite the documentation and the comment in xtensa_move_literals, in -the presence of --text-section-literals and --auto-litpools literals are -moved from the separate literal sections into .init and .fini, because -the check in the xtensa_move_literals is incorrect. - -This moving was broken with introduction of auto litpools: some literals -now may be lost. This happens because literal frags emitted from .init -and .fini are not closed when new .literal_position marks new literal -pool. Then frag_align(2, 0, 0) changes type of the last literal frag to -rs_align. rs_align frags are skipped in the xtensa_move_literals. As a -result fixups against such literals are not moved out of .init.literal/ -.fini.literal sections producing the following assembler error: - - test.S: Warning: fixes not all moved from .init.literal - test.S: Internal error! - -Fix check for .init.literal/.fini.literal in the xtensa_move_literals -and don't let it move literals from there in the presence of ---text-section-literals or --auto-litpools. - -2016-02-17 Max Filippov -gas/ - * config/tc-xtensa.c (xtensa_move_literals): Fix check for - .init.literal/.fini.literal section name. - * testsuite/gas/xtensa/all.exp: Add init-fini-literals to the - list of xtensa tests. - * testsuite/gas/xtensa/init-fini-literals.d: New file: - init-fini-literals test result patterns. - * testsuite/gas/xtensa/init-fini-literals.s: New file: - init-fini-literals test. - -Signed-off-by: Max Filippov ---- -Backported from: 4111950f363221c4641dc2f33bea61cc94f34906 - - gas/config/tc-xtensa.c | 12 ++++++++++-- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++ - gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++ - 4 files changed, 54 insertions(+), 2 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 36a06cc..5773634 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -11061,6 +11061,10 @@ xtensa_move_literals (void) - fixS *fix, *next_fix, **fix_splice; - sym_list *lit; - struct litpool_seg *lps; -+ const char *init_name = INIT_SECTION_NAME; -+ const char *fini_name = FINI_SECTION_NAME; -+ int init_name_len = strlen(init_name); -+ int fini_name_len = strlen(fini_name); - - mark_literal_frags (literal_head->next); - -@@ -11171,9 +11175,13 @@ xtensa_move_literals (void) - - for (segment = literal_head->next; segment; segment = segment->next) - { -+ const char *seg_name = segment_name (segment->seg); -+ - /* Keep the literals for .init and .fini in separate sections. */ -- if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME) -- || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME)) -+ if ((!memcmp (seg_name, init_name, init_name_len) && -+ !strcmp (seg_name + init_name_len, ".literal")) || -+ (!memcmp (seg_name, fini_name, fini_name_len) && -+ !strcmp (seg_name + fini_name_len, ".literal"))) - continue; - - frchain_from = seg_info (segment->seg)->frchainP; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 7ff7bd7..6b67320 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" - run_dump_test "loc" -+ run_dump_test "init-fini-literals" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d -new file mode 100644 -index 0000000..19ed121 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d -@@ -0,0 +1,24 @@ -+#as: --text-section-literals -+#objdump: -r -+#name: check that literals for .init and .fini always go to separate sections -+ -+.*: +file format .*xtensa.* -+#... -+RELOCATION RECORDS FOR \[\.init\.literal\]: -+#... -+00000000 R_XTENSA_PLT init -+#... -+RELOCATION RECORDS FOR \[\.fini\.literal\]: -+#... -+00000000 R_XTENSA_PLT fini -+#... -+RELOCATION RECORDS FOR \[\.init\]: -+#... -+.* R_XTENSA_SLOT0_OP \.init\.literal -+.* R_XTENSA_SLOT0_OP \.init\.literal\+0x00000004 -+#... -+RELOCATION RECORDS FOR \[\.fini\]: -+#... -+.* R_XTENSA_SLOT0_OP \.fini\.literal -+.* R_XTENSA_SLOT0_OP \.fini\.literal\+0x00000004 -+#... -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s -new file mode 100644 -index 0000000..7c9ec17 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s -@@ -0,0 +1,19 @@ -+ .section .init,"ax",@progbits -+ .literal_position -+ .literal .LC0, init@PLT -+ .literal_position -+ .literal .LC1, 1 -+ .align 4 -+ -+ l32r a2, .LC0 -+ l32r a2, .LC1 -+ -+ .section .fini,"ax",@progbits -+ .literal_position -+ .literal .LC2, fini@PLT -+ .literal_position -+ .literal .LC3, 1 -+ .align 4 -+ -+ l32r a2, .LC2 -+ l32r a2, .LC3 --- -2.1.4 - diff --git a/package.bak/binutils/2.25.1/916-microblaze-pr21180.patch b/package.bak/binutils/2.25.1/916-microblaze-pr21180.patch deleted file mode 100644 index 2ffae49f62..0000000000 --- a/package.bak/binutils/2.25.1/916-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.25.1.orig/bfd/elf32-microblaze.c binutils-2.25.1/bfd/elf32-microblaze.c ---- binutils-2.25.1.orig/bfd/elf32-microblaze.c 2015-07-21 10:20:58.000000000 +0200 -+++ binutils-2.25.1/bfd/elf32-microblaze.c 2017-02-23 19:43:24.560776208 +0100 -@@ -3297,13 +3297,20 @@ - && h->def_regular) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/package.bak/binutils/2.26.1/0120-sh-conf.patch b/package.bak/binutils/2.26.1/0120-sh-conf.patch deleted file mode 100644 index cc14ef4029..0000000000 --- a/package.bak/binutils/2.26.1/0120-sh-conf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 34b66f7..905bc7b 100755 ---- a/configure -+++ b/configure -@@ -3939,7 +3939,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 4977d97..1e69ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1276,7 +1276,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0300-ld-makefile.patch b/package.bak/binutils/2.26.1/0300-ld-makefile.patch deleted file mode 100644 index 73cc098024..0000000000 --- a/package.bak/binutils/2.26.1/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0301-check-ldrunpath-length.patch b/package.bak/binutils/2.26.1/0301-check-ldrunpath-length.patch deleted file mode 100644 index 3b4c204c7f..0000000000 --- a/package.bak/binutils/2.26.1/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1242,6 +1242,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch b/package.bak/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index f67a43efdf..0000000000 --- a/package.bak/binutils/2.26.1/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 96f9ecc..1439309 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0600-poison-system-directories.patch b/package.bak/binutils/2.26.1/0600-poison-system-directories.patch deleted file mode 100644 index d16994ec0c..0000000000 --- a/package.bak/binutils/2.26.1/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -14,6 +14,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -786,6 +786,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1442,6 +1443,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15491,7 +15494,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -164,6 +164,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -144,6 +144,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -257,6 +257,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0800-microblaze-musl.patch b/package.bak/binutils/2.26.1/0800-microblaze-musl.patch deleted file mode 100644 index 5e45058f6c..0000000000 --- a/package.bak/binutils/2.26.1/0800-microblaze-musl.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix the genetation of GOT entries for the Microblaze target. - -PR target/19516 -* elf32-microblaze.c (microblaze_elf_finish_dynamic_symbol): -Always produce a RELATIVE reloc for a local symbol. - -[Taken from https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=47993b4af18c6ef1cad300f6393bf896d3cb5e5c.] -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c ---- binutils-2.26.1.orig/bfd/elf32-microblaze.c 2015-11-13 09:27:40.000000000 +0100 -+++ binutils-2.26.1/bfd/elf32-microblaze.c 2016-10-20 19:06:58.655565765 +0200 -@@ -3296,8 +3296,8 @@ - The entry in the global offset table will already have been - initialized in the relocate_section function. */ - if (bfd_link_pic (info) -- && (info->symbolic || h->dynindx == -1) -- && h->def_regular) -+ && ((info->symbolic && h->def_regular) -+ || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; - microblaze_elf_output_dynamic_relocation (output_bfd, diff --git a/package.bak/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch b/package.bak/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch deleted file mode 100644 index 81986f51b9..0000000000 --- a/package.bak/binutils/2.26.1/0900-Correct-nios2-_gp-address-computation.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 5eeb7401eed2f26d5fc255de816ca70a2cb9374e Mon Sep 17 00:00:00 2001 -From: Sandra Loosemore -Date: Sun, 27 Dec 2015 12:30:26 -0800 -Subject: [PATCH 900/901] Correct nios2 _gp address computation. - -2015-12-27 Sandra Loosemore - - bfd/ - * elf32-nios2.c (nios2_elf_assign_gp): Correct computation of _gp - address. - (nios2_elf32_relocate_section): Tidy code for R_NIOS2_GPREL error - messages. - -[Romain: - - backport upstream patch on 2.26 - - drop bfd/ChangeLog entry] -Signed-off-by: Romain Naour ---- - bfd/elf32-nios2.c | 31 +++++++++++++++++++++---------- - 1 file changed, 21 insertions(+), 10 deletions(-) - -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index 6b29d8b..01ebd6e 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -3086,7 +3086,15 @@ lookup: - case bfd_link_hash_defined: - case bfd_link_hash_defweak: - gp_found = TRUE; -- *pgp = lh->u.def.value; -+ { -+ asection *sym_sec = lh->u.def.section; -+ bfd_vma sym_value = lh->u.def.value; -+ -+ if (sym_sec->output_section) -+ sym_value = (sym_value + sym_sec->output_offset -+ + sym_sec->output_section->vma); -+ *pgp = sym_value; -+ } - break; - case bfd_link_hash_indirect: - case bfd_link_hash_warning: -@@ -3719,7 +3727,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - struct elf32_nios2_link_hash_entry *eh; - bfd_vma relocation; - bfd_vma gp; -- bfd_vma reloc_address; - bfd_reloc_status_type r = bfd_reloc_ok; - const char *name = NULL; - int r_type; -@@ -3762,12 +3769,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - if (bfd_link_relocatable (info)) - continue; - -- if (sec && sec->output_section) -- reloc_address = (sec->output_section->vma + sec->output_offset -- + rel->r_offset); -- else -- reloc_address = 0; -- - if (howto) - { - switch (howto->type) -@@ -3816,6 +3817,15 @@ nios2_elf32_relocate_section (bfd *output_bfd, - /* Turns an absolute address into a gp-relative address. */ - if (!nios2_elf_assign_gp (output_bfd, &gp, info)) - { -+ bfd_vma reloc_address; -+ -+ if (sec && sec->output_section) -+ reloc_address = (sec->output_section->vma -+ + sec->output_offset -+ + rel->r_offset); -+ else -+ reloc_address = 0; -+ - format = _("global pointer relative relocation at address " - "0x%08x when _gp not defined\n"); - sprintf (msgbuf, format, reloc_address); -@@ -3825,7 +3835,7 @@ nios2_elf32_relocate_section (bfd *output_bfd, - else - { - bfd_vma symbol_address = rel->r_addend + relocation; -- relocation = relocation + rel->r_addend - gp; -+ relocation = symbol_address - gp; - rel->r_addend = 0; - if (((signed) relocation < -32768 - || (signed) relocation > 32767) -@@ -3833,6 +3843,8 @@ nios2_elf32_relocate_section (bfd *output_bfd, - || h->root.type == bfd_link_hash_defined - || h->root.type == bfd_link_hash_defweak)) - { -+ if (h) -+ name = h->root.root.string; - format = _("Unable to reach %s (at 0x%08x) from the " - "global pointer (at 0x%08x) because the " - "offset (%d) is out of the allowed range, " -@@ -3848,7 +3860,6 @@ nios2_elf32_relocate_section (bfd *output_bfd, - rel->r_offset, relocation, - rel->r_addend); - } -- - break; - case R_NIOS2_UJMP: - r = nios2_elf32_do_ujmp_relocate (input_bfd, howto, --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch b/package.bak/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch deleted file mode 100644 index a490780f7e..0000000000 --- a/package.bak/binutils/2.26.1/0901-Fix-assertion-reduce-number-of-messages-about-FDE-en.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 39c481c2fb0e7fb127a15facf70b55d517462809 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 6 Feb 2016 00:35:31 +0100 -Subject: [PATCH 901/901] Fix assertion, reduce number of messages about FDE - encoding - -Patch by Nick Clifton [1] - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19405 - -Signed-off-by: Romain Naour ---- - bfd/elf-eh-frame.c | 17 ++++++++++++++--- - bfd/elf32-nios2.c | 4 ++-- - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/bfd/elf-eh-frame.c b/bfd/elf-eh-frame.c -index e303189..e79bff0 100644 ---- a/bfd/elf-eh-frame.c -+++ b/bfd/elf-eh-frame.c -@@ -1369,14 +1369,25 @@ _bfd_elf_discard_section_eh_frame - && ent->make_relative == 0) - || (ent->fde_encoding & 0x70) == DW_EH_PE_aligned)) - { -+ static int num_warnings_issued = 0; - /* If a shared library uses absolute pointers - which we cannot turn into PC relative, - don't create the binary search table, - since it is affected by runtime relocations. */ - hdr_info->u.dwarf.table = FALSE; -- (*info->callbacks->einfo) -- (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr" -- " table being created.\n"), abfd, sec); -+ if (num_warnings_issued < 10) -+ { -+ (*info->callbacks->einfo) -+ (_("%P: FDE encoding in %B(%A) prevents .eh_frame_hdr" -+ " table being created.\n"), abfd, sec); -+ num_warnings_issued ++; -+ } -+ else if (num_warnings_issued == 10) -+ { -+ (*info->callbacks->einfo) -+ (_("%P: Further warnings about FDE encoding preventing .eh_frame_hdr generation dropped.\n")); -+ num_warnings_issued ++; -+ } - } - ent->removed = 0; - hdr_info->u.dwarf.fde_count++; -diff --git a/bfd/elf32-nios2.c b/bfd/elf32-nios2.c -index 01ebd6e..d1b7f83 100644 ---- a/bfd/elf32-nios2.c -+++ b/bfd/elf32-nios2.c -@@ -1905,8 +1905,8 @@ nios2_elf32_install_imm16 (asection *sec, bfd_vma offset, bfd_vma value) - { - bfd_vma word = bfd_get_32 (sec->owner, sec->contents + offset); - -- BFD_ASSERT(value <= 0xffff); -- -+ BFD_ASSERT (value <= 0xffff || ((bfd_signed_vma) value) >= -0xffff); -+ - bfd_put_32 (sec->owner, word | ((value & 0xffff) << 6), - sec->contents + offset); - } --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch b/package.bak/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch deleted file mode 100644 index 4ba2f75cc8..0000000000 --- a/package.bak/binutils/2.26.1/0902-xtensa-fix-signedness-of-gas-relocations.patch +++ /dev/null @@ -1,101 +0,0 @@ -From eb3e02b484ff75f4a2f54192422a88baa275bdfc Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 2 Feb 2016 17:11:38 +0300 -Subject: [PATCH] xtensa: fix signedness of gas relocations - -Change 1058c7532d0b "Use signed data type for R_XTENSA_DIFF* relocation -offsets." changed signedness of BFD_RELOC_XTENSA_DIFF* relocations -substituted for BFD_RELOC_*. This made it impossible to encode arbitrary -8-, 16- and 32-bit values, which broke e.g. debug info encoding by .loc -directive. Revert this part and add test. - -gas/ -2016-02-03 Max Filippov - * config/tc-xtensa.c (md_apply_fix): Mark BFD_RELOC_XTENSA_DIFF* - substitutions for BFD_RELOC_* as unsigned. - -gas/testsuite/ -2016-02-03 Max Filippov - * gas/xtensa/all.exp: Add loc to list of xtensa tests. - * gas/xtensa/loc.d: New file: loc test result patterns. - * gas/xtensa/loc.s: New file: loc test. - -Signed-off-by: Max Filippov -[Rebase on 2.26] -Signed-off-by: Romain Naour ---- - gas/config/tc-xtensa.c | 6 +++--- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/loc.d | 10 ++++++++++ - gas/testsuite/gas/xtensa/loc.s | 7 +++++++ - 4 files changed, 21 insertions(+), 3 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/loc.d - create mode 100644 gas/testsuite/gas/xtensa/loc.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index d707da8..f623add 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -5961,15 +5961,15 @@ md_apply_fix (fixS *fixP, valueT *valP, segT seg) - { - case BFD_RELOC_8: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF8; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_16: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF16; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - case BFD_RELOC_32: - fixP->fx_r_type = BFD_RELOC_XTENSA_DIFF32; -- fixP->fx_signed = 1; -+ fixP->fx_signed = 0; - break; - default: - break; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index db39629..4daeff2 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -101,6 +101,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "trampoline" - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" -+ run_dump_test "loc" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/loc.d b/gas/testsuite/gas/xtensa/loc.d -new file mode 100644 -index 0000000..71983cc ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.d -@@ -0,0 +1,10 @@ -+#as: -+#objdump: -r -+#name: .loc directive relocs -+ -+.*: +file format .*xtensa.* -+ -+RELOCATION RECORDS FOR \[\.debug_line\]: -+#... -+.*R_XTENSA_DIFF16.*\.text\+0x00009c42 -+#... -diff --git a/gas/testsuite/gas/xtensa/loc.s b/gas/testsuite/gas/xtensa/loc.s -new file mode 100644 -index 0000000..029e14e ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/loc.s -@@ -0,0 +1,7 @@ -+ .text -+ .file 1 "loc.s" -+ .loc 1 3 -+ nop -+ .space 40000 -+ .loc 1 5 -+ nop --- -2.4.3 - diff --git a/package.bak/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch b/package.bak/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch deleted file mode 100644 index ead3e42b75..0000000000 --- a/package.bak/binutils/2.26.1/0903-xtensa-fix-.init-.fini-literals-moving.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 7db2accc3fdea0aaa0c3a76a413d8e8030e022c3 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 16 Feb 2016 02:23:28 +0300 -Subject: [PATCH] xtensa: fix .init/.fini literals moving - -Despite the documentation and the comment in xtensa_move_literals, in -the presence of --text-section-literals and --auto-litpools literals are -moved from the separate literal sections into .init and .fini, because -the check in the xtensa_move_literals is incorrect. - -This moving was broken with introduction of auto litpools: some literals -now may be lost. This happens because literal frags emitted from .init -and .fini are not closed when new .literal_position marks new literal -pool. Then frag_align(2, 0, 0) changes type of the last literal frag to -rs_align. rs_align frags are skipped in the xtensa_move_literals. As a -result fixups against such literals are not moved out of .init.literal/ -.fini.literal sections producing the following assembler error: - - test.S: Warning: fixes not all moved from .init.literal - test.S: Internal error! - -Fix check for .init.literal/.fini.literal in the xtensa_move_literals -and don't let it move literals from there in the presence of ---text-section-literals or --auto-litpools. - -2016-02-17 Max Filippov -gas/ - * config/tc-xtensa.c (xtensa_move_literals): Fix check for - .init.literal/.fini.literal section name. - * testsuite/gas/xtensa/all.exp: Add init-fini-literals to the - list of xtensa tests. - * testsuite/gas/xtensa/init-fini-literals.d: New file: - init-fini-literals test result patterns. - * testsuite/gas/xtensa/init-fini-literals.s: New file: - init-fini-literals test. - -Signed-off-by: Max Filippov ---- -Backported from: 4111950f363221c4641dc2f33bea61cc94f34906 - - gas/config/tc-xtensa.c | 12 ++++++++++-- - gas/testsuite/gas/xtensa/all.exp | 1 + - gas/testsuite/gas/xtensa/init-fini-literals.d | 24 ++++++++++++++++++++++++ - gas/testsuite/gas/xtensa/init-fini-literals.s | 19 +++++++++++++++++++ - 4 files changed, 54 insertions(+), 2 deletions(-) - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.d - create mode 100644 gas/testsuite/gas/xtensa/init-fini-literals.s - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index 36a06cc..5773634 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -11061,6 +11061,10 @@ xtensa_move_literals (void) - fixS *fix, *next_fix, **fix_splice; - sym_list *lit; - struct litpool_seg *lps; -+ const char *init_name = INIT_SECTION_NAME; -+ const char *fini_name = FINI_SECTION_NAME; -+ int init_name_len = strlen(init_name); -+ int fini_name_len = strlen(fini_name); - - mark_literal_frags (literal_head->next); - -@@ -11171,9 +11175,13 @@ xtensa_move_literals (void) - - for (segment = literal_head->next; segment; segment = segment->next) - { -+ const char *seg_name = segment_name (segment->seg); -+ - /* Keep the literals for .init and .fini in separate sections. */ -- if (!strcmp (segment_name (segment->seg), INIT_SECTION_NAME) -- || !strcmp (segment_name (segment->seg), FINI_SECTION_NAME)) -+ if ((!memcmp (seg_name, init_name, init_name_len) && -+ !strcmp (seg_name + init_name_len, ".literal")) || -+ (!memcmp (seg_name, fini_name, fini_name_len) && -+ !strcmp (seg_name + fini_name_len, ".literal"))) - continue; - - frchain_from = seg_info (segment->seg)->frchainP; -diff --git a/gas/testsuite/gas/xtensa/all.exp b/gas/testsuite/gas/xtensa/all.exp -index 7ff7bd7..6b67320 100644 ---- a/gas/testsuite/gas/xtensa/all.exp -+++ b/gas/testsuite/gas/xtensa/all.exp -@@ -102,6 +102,7 @@ if [istarget xtensa*-*-*] then { - run_dump_test "first_frag_align" - run_dump_test "auto-litpools" - run_dump_test "loc" -+ run_dump_test "init-fini-literals" - } - - if [info exists errorInfo] then { -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.d b/gas/testsuite/gas/xtensa/init-fini-literals.d -new file mode 100644 -index 0000000..19ed121 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.d -@@ -0,0 +1,24 @@ -+#as: --text-section-literals -+#objdump: -r -+#name: check that literals for .init and .fini always go to separate sections -+ -+.*: +file format .*xtensa.* -+#... -+RELOCATION RECORDS FOR \[\.init\.literal\]: -+#... -+00000000 R_XTENSA_PLT init -+#... -+RELOCATION RECORDS FOR \[\.fini\.literal\]: -+#... -+00000000 R_XTENSA_PLT fini -+#... -+RELOCATION RECORDS FOR \[\.init\]: -+#... -+.* R_XTENSA_SLOT0_OP \.init\.literal -+.* R_XTENSA_SLOT0_OP \.init\.literal\+0x00000004 -+#... -+RELOCATION RECORDS FOR \[\.fini\]: -+#... -+.* R_XTENSA_SLOT0_OP \.fini\.literal -+.* R_XTENSA_SLOT0_OP \.fini\.literal\+0x00000004 -+#... -diff --git a/gas/testsuite/gas/xtensa/init-fini-literals.s b/gas/testsuite/gas/xtensa/init-fini-literals.s -new file mode 100644 -index 0000000..7c9ec17 ---- /dev/null -+++ b/gas/testsuite/gas/xtensa/init-fini-literals.s -@@ -0,0 +1,19 @@ -+ .section .init,"ax",@progbits -+ .literal_position -+ .literal .LC0, init@PLT -+ .literal_position -+ .literal .LC1, 1 -+ .align 4 -+ -+ l32r a2, .LC0 -+ l32r a2, .LC1 -+ -+ .section .fini,"ax",@progbits -+ .literal_position -+ .literal .LC2, fini@PLT -+ .literal_position -+ .literal .LC3, 1 -+ .align 4 -+ -+ l32r a2, .LC2 -+ l32r a2, .LC3 --- -2.1.4 - diff --git a/package.bak/binutils/2.26.1/0904-bfin-fdpic-upstream.patch b/package.bak/binutils/2.26.1/0904-bfin-fdpic-upstream.patch deleted file mode 100644 index ffbacc4c0e..0000000000 --- a/package.bak/binutils/2.26.1/0904-bfin-fdpic-upstream.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ed3056ebdb9795446157af03d3e08fbb93c1b01d Mon Sep 17 00:00:00 2001 -From: Nick Clifton -Date: Tue, 29 Mar 2016 10:24:16 +0100 -Subject: [PATCH] Relax assertion in BFIN linker to allow for discard GOT relocs. - - PR 17334 - * elf32-bfin.c (elf32_bfinfdpic_finish_dynamic_sections): Relax - assertion on the size of the got section to allow it to be bigger - than the number of relocs. -diff --git a/bfd/elf32-bfin.c b/bfd/elf32-bfin.c -index 7cc8b6d..b2fcf38 100644 ---- a/bfd/elf32-bfin.c -+++ b/bfd/elf32-bfin.c -@@ -4457,7 +4457,13 @@ elf32_bfinfdpic_finish_dynamic_sections (bfd *output_bfd, - if (bfinfdpic_got_section (info)) - { - BFD_ASSERT (bfinfdpic_gotrel_section (info)->size -- == (bfinfdpic_gotrel_section (info)->reloc_count -+ /* PR 17334: It appears that the GOT section can end up -+ being bigger than the number of relocs. Presumably -+ because some relocs have been deleted. A test case has -+ yet to be generated for verify this, but in the meantime -+ the test below has been changed from == to >= so that -+ applications can continue to be built. */ -+ >= (bfinfdpic_gotrel_section (info)->reloc_count - * sizeof (Elf32_External_Rel))); - - if (bfinfdpic_gotfixup_section (info)) --- -1.7.1 diff --git a/package.bak/binutils/2.26.1/0905-bfin-rofixup-bug.patch b/package.bak/binutils/2.26.1/0905-bfin-rofixup-bug.patch deleted file mode 100644 index da9d586551..0000000000 --- a/package.bak/binutils/2.26.1/0905-bfin-rofixup-bug.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes: LINKER BUG: .rofixup section size mismatch - -Workaround from adi-toolchain commit: -af414ec1fb628ddb1562f062f3db49823ca14ca2 -[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c ---- binutils-2.26.1.orig/bfd/elf32-bfin.c 2015-11-13 09:27:40.000000000 +0100 -+++ binutils-2.26.1/bfd/elf32-bfin.c 2016-07-31 00:50:48.357995132 +0200 -@@ -4879,7 +4879,8 @@ - - case R_BFIN_FUNCDESC: - picrel->fd++; -- picrel->relocsfd++; -+ if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) -+ picrel->relocsfd++; - break; - - /* This relocation describes the C++ object vtable hierarchy. diff --git a/package.bak/binutils/2.26.1/0906-microblaze-pr21180.patch b/package.bak/binutils/2.26.1/0906-microblaze-pr21180.patch deleted file mode 100644 index 8104db3462..0000000000 --- a/package.bak/binutils/2.26.1/0906-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.26.1.orig/bfd/elf32-microblaze.c binutils-2.26.1/bfd/elf32-microblaze.c ---- binutils-2.26.1.orig/bfd/elf32-microblaze.c 2015-11-13 09:27:40.000000000 +0100 -+++ binutils-2.26.1/bfd/elf32-microblaze.c 2017-02-23 19:43:18.536542964 +0100 -@@ -3300,13 +3300,20 @@ - && h->def_regular) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/package.bak/binutils/2.27/0100-elf32-arm-no-data-fix.patch b/package.bak/binutils/2.27/0100-elf32-arm-no-data-fix.patch deleted file mode 100644 index c6b0e7efe8..0000000000 --- a/package.bak/binutils/2.27/0100-elf32-arm-no-data-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -bfd/ChangeLog -2016-08-23 Nick Clifton - - * elf32-arm.c (elf32_arm_count_additional_relocs): Return zero if - there is no arm data associated with the section. - -[Thomas: taken from https://lists.gnu.org/archive/html/bug-binutils/2016-08/msg00165.html.] -Signed-off-by: Thomas Petazzoni - -diff --git a/bfd/elf32-arm.c b/bfd/elf32-arm.c -index 1eba21b..4478238 100644 ---- a/bfd/elf32-arm.c -+++ b/bfd/elf32-arm.c -@@ -18688,7 +18688,7 @@ elf32_arm_count_additional_relocs (asection *sec) - { - struct _arm_elf_section_data *arm_data; - arm_data = get_arm_elf_section_data (sec); -- return arm_data->additional_reloc_count; -+ return arm_data == NULL ? 0 : arm_data->additional_reloc_count; - } - - /* Called to set the sh_flags, sh_link and sh_info fields of OSECTION which diff --git a/package.bak/binutils/2.27/0120-sh-conf.patch b/package.bak/binutils/2.27/0120-sh-conf.patch deleted file mode 100644 index cc14ef4029..0000000000 --- a/package.bak/binutils/2.27/0120-sh-conf.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ceee199e9a32034c6def7700fdbb26335ca76a3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:38:13 +0100 -Subject: [PATCH] sh-conf - -Likewise, binutils has no idea about any of these new targets either, so we -fix that up too.. now we're able to actually build a real toolchain for -sh2a_nofpu- and other more ineptly named toolchains (and yes, there are more -inept targets than that one, really. Go look, I promise). - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - configure | 2 +- - configure.ac | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 34b66f7..905bc7b 100755 ---- a/configure -+++ b/configure -@@ -3939,7 +3939,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; -diff --git a/configure.ac b/configure.ac -index 4977d97..1e69ee2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1276,7 +1276,7 @@ case "${target}" in - or1k*-*-*) - noconfigdirs="$noconfigdirs gdb" - ;; -- sh-*-* | sh64-*-*) -+ sh*-*-* | sh64-*-*) - case "${target}" in - sh*-*-elf) - ;; --- -2.4.3 - diff --git a/package.bak/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch b/package.bak/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch deleted file mode 100644 index 7973607884..0000000000 --- a/package.bak/binutils/2.27/0130-tc-xtensa.c-fixup-xg_reverse_shift_count-typo.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 78fb7e37eb8bb08ae537d6c487996ff17c810332 Mon Sep 17 00:00:00 2001 -From: Trevor Saunders -Date: Mon, 26 Sep 2016 12:42:11 -0400 -Subject: [PATCH] tc-xtensa.c: fixup xg_reverse_shift_count typo - -gas/ChangeLog: - -2016-09-26 Trevor Saunders - - * config/tc-xtensa.c (xg_reverse_shift_count): Pass cnt_arg instead of - cnt_argp to concat. - -Signed-off-by: Max Filippov ---- - gas/config/tc-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gas/config/tc-xtensa.c b/gas/config/tc-xtensa.c -index d062044..ca261ae 100644 ---- a/gas/config/tc-xtensa.c -+++ b/gas/config/tc-xtensa.c -@@ -2228,7 +2228,7 @@ xg_reverse_shift_count (char **cnt_argp) - cnt_arg = *cnt_argp; - - /* replace the argument with "31-(argument)" */ -- new_arg = concat ("31-(", cnt_argp, ")", (char *) NULL); -+ new_arg = concat ("31-(", cnt_arg, ")", (char *) NULL); - - free (cnt_arg); - *cnt_argp = new_arg; --- -2.1.4 - diff --git a/package.bak/binutils/2.27/0300-ld-makefile.patch b/package.bak/binutils/2.27/0300-ld-makefile.patch deleted file mode 100644 index 73cc098024..0000000000 --- a/package.bak/binutils/2.27/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/package.bak/binutils/2.27/0301-check-ldrunpath-length.patch b/package.bak/binutils/2.27/0301-check-ldrunpath-length.patch deleted file mode 100644 index 3b4c204c7f..0000000000 --- a/package.bak/binutils/2.27/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1242,6 +1242,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/package.bak/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch b/package.bak/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index f67a43efdf..0000000000 --- a/package.bak/binutils/2.27/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 96f9ecc..1439309 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.4.3 - diff --git a/package.bak/binutils/2.27/0600-poison-system-directories.patch b/package.bak/binutils/2.27/0600-poison-system-directories.patch deleted file mode 100644 index d16994ec0c..0000000000 --- a/package.bak/binutils/2.27/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -14,6 +14,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -786,6 +786,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1442,6 +1443,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15491,7 +15494,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -164,6 +164,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -144,6 +144,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -257,6 +257,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/package.bak/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch b/package.bak/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch deleted file mode 100644 index f1ec259988..0000000000 --- a/package.bak/binutils/2.27/0900-Revert-part-Set-dynamic-tag-VMA-and-size-from-dynami.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c646b02fdcae5f37bd88f33a0c4683ef13ad5c82 Mon Sep 17 00:00:00 2001 -From: Alan Modra -Date: Mon, 31 Oct 2016 12:46:38 +1030 -Subject: [PATCH] Revert part "Set dynamic tag VMA and size from dynamic - section when possible" - - PR 20748 - * elf32-microblaze.c (microblaze_elf_finish_dynamic_sections): Revert - 2016-05-13 change. - -Signed-off-by: Alan Modra -Signed-off-by: Waldemar Brodkorb - -diff --git a/bfd/elf32-microblaze.c b/bfd/elf32-microblaze.c -index 477e7b3..5c66808 100644 ---- a/bfd/elf32-microblaze.c -+++ b/bfd/elf32-microblaze.c -@@ -3396,13 +3396,13 @@ microblaze_elf_finish_dynamic_sections (bfd *output_bfd, - { - asection *s; - -- s = bfd_get_linker_section (dynobj, name); -+ s = bfd_get_section_by_name (output_bfd, name); - if (s == NULL) - dyn.d_un.d_val = 0; - else - { - if (! size) -- dyn.d_un.d_ptr = s->output_section->vma + s->output_offset; -+ dyn.d_un.d_ptr = s->vma; - else - dyn.d_un.d_val = s->size; - } --- -2.1.4 - diff --git a/package.bak/binutils/2.27/0905-bfin-rofixup-bug.patch b/package.bak/binutils/2.27/0905-bfin-rofixup-bug.patch deleted file mode 100644 index da9d586551..0000000000 --- a/package.bak/binutils/2.27/0905-bfin-rofixup-bug.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes: LINKER BUG: .rofixup section size mismatch - -Workaround from adi-toolchain commit: -af414ec1fb628ddb1562f062f3db49823ca14ca2 -[#6798] binutils-2.21/bfd: temp workaround for rofixup mismatch errors. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.26.1.orig/bfd/elf32-bfin.c binutils-2.26.1/bfd/elf32-bfin.c ---- binutils-2.26.1.orig/bfd/elf32-bfin.c 2015-11-13 09:27:40.000000000 +0100 -+++ binutils-2.26.1/bfd/elf32-bfin.c 2016-07-31 00:50:48.357995132 +0200 -@@ -4879,7 +4879,8 @@ - - case R_BFIN_FUNCDESC: - picrel->fd++; -- picrel->relocsfd++; -+ if (bfd_get_section_flags (abfd, sec) & SEC_ALLOC) -+ picrel->relocsfd++; - break; - - /* This relocation describes the C++ object vtable hierarchy. diff --git a/package.bak/binutils/2.27/0906-microblaze-pr21180.patch b/package.bak/binutils/2.27/0906-microblaze-pr21180.patch deleted file mode 100644 index 48e5e14b45..0000000000 --- a/package.bak/binutils/2.27/0906-microblaze-pr21180.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix ld segfault for microblaze when --gc-sections is used -Upstream: pending -https://sourceware.org/bugzilla/show_bug.cgi?id=21180 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur binutils-2.27.orig/bfd/elf32-microblaze.c binutils-2.27/bfd/elf32-microblaze.c ---- binutils-2.27.orig/bfd/elf32-microblaze.c 2016-08-03 09:36:50.000000000 +0200 -+++ binutils-2.27/bfd/elf32-microblaze.c 2017-02-23 19:43:12.612313590 +0100 -@@ -3297,13 +3297,20 @@ - || h->dynindx == -1)) - { - asection *sec = h->root.u.def.section; -+ bfd_vma value; -+ -+ value = h->root.u.def.value; -+ if (sec->output_section != NULL) -+ /* PR 21180: If the output section is NULL, then the symbol is no -+ longer needed, and in theory the GOT entry is redundant. But -+ it is too late to change our minds now... */ -+ value += sec->output_section->vma + sec->output_offset; -+ - microblaze_elf_output_dynamic_relocation (output_bfd, - srela, srela->reloc_count++, - /* symindex= */ 0, - R_MICROBLAZE_REL, offset, -- h->root.u.def.value -- + sec->output_section->vma -- + sec->output_offset); -+ value); - } - else - { diff --git a/package.bak/binutils/Config.in b/package.bak/binutils/Config.in deleted file mode 100644 index fdfdfe9052..0000000000 --- a/package.bak/binutils/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_BINUTILS - bool "binutils" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on !BR2_nios2 - depends on BR2_USE_WCHAR - help - Install binutils on the target - -if BR2_PACKAGE_BINUTILS - -config BR2_PACKAGE_BINUTILS_TARGET - bool "binutils binaries" - help - The GNU Binutils are a collection of binary tools: - - ld - the GNU linker. - as - the GNU assembler. - and others... - - http://www.gnu.org/software/binutils/ - -endif - -comment "binutils needs a toolchain w/ wchar" - depends on !BR2_nios2 - depends on !BR2_USE_WCHAR diff --git a/package.bak/binutils/Config.in.host b/package.bak/binutils/Config.in.host deleted file mode 100644 index 99a4a9650b..0000000000 --- a/package.bak/binutils/Config.in.host +++ /dev/null @@ -1,37 +0,0 @@ -comment "Binutils Options" - -choice - prompt "Binutils Version" - depends on !BR2_arc - default BR2_BINUTILS_VERSION_2_26_X - help - Select the version of binutils you wish to use. - - config BR2_BINUTILS_VERSION_2_25_X - bool "binutils 2.25.1" - # supported but broken on Blackfin - depends on !BR2_bfin - - config BR2_BINUTILS_VERSION_2_26_X - bool "binutils 2.26.1" - - config BR2_BINUTILS_VERSION_2_27_X - bool "binutils 2.27" - -endchoice - -config BR2_BINUTILS_VERSION - string - default "arc-2016.09-release" if BR2_arc - default "2.25.1" if BR2_BINUTILS_VERSION_2_25_X - default "2.26.1" if BR2_BINUTILS_VERSION_2_26_X - default "2.27" if BR2_BINUTILS_VERSION_2_27_X - -config BR2_BINUTILS_ENABLE_LTO - bool - -config BR2_BINUTILS_EXTRA_CONFIG_OPTIONS - string "Additional binutils options" - default "" - help - Any additional binutils options you may want to include. diff --git a/package.bak/binutils/arc-2016.09-release/0300-ld-makefile.patch b/package.bak/binutils/arc-2016.09-release/0300-ld-makefile.patch deleted file mode 100644 index 73cc098024..0000000000 --- a/package.bak/binutils/arc-2016.09-release/0300-ld-makefile.patch +++ /dev/null @@ -1,41 +0,0 @@ -From d76a7549b43974fe8564971a3f40459bc495a8a7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:40:53 +0100 -Subject: [PATCH] ld-makefile - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/Makefile.am | 2 +- - ld/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ld/Makefile.am b/ld/Makefile.am -index 0b3b049..3871c74 100644 ---- a/ld/Makefile.am -+++ b/ld/Makefile.am -@@ -57,7 +57,7 @@ endif - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - - EMUL = @EMUL@ - EMULATION_OFILES = @EMULATION_OFILES@ -diff --git a/ld/Makefile.in b/ld/Makefile.in -index ed98f87..530e4c9 100644 ---- a/ld/Makefile.in -+++ b/ld/Makefile.in -@@ -413,7 +413,7 @@ AM_CFLAGS = $(WARN_CFLAGS) $(ELF_CLFAGS) - # We put the scripts in the directory $(scriptdir)/ldscripts. - # We can't put the scripts in $(datadir) because the SEARCH_DIR - # directives need to be different for native and cross linkers. --scriptdir = $(tooldir)/lib -+scriptdir = $(libdir) - BASEDIR = $(srcdir)/.. - BFDDIR = $(BASEDIR)/bfd - INCDIR = $(BASEDIR)/include --- -2.4.3 - diff --git a/package.bak/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch b/package.bak/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch deleted file mode 100644 index 3b4c204c7f..0000000000 --- a/package.bak/binutils/arc-2016.09-release/0301-check-ldrunpath-length.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ebe1cba46df52d7bf86def3d681271fd05fb453b Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:41:47 +0100 -Subject: [PATCH] check-ldrunpath-length - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/emultempl/elf32.em | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em -index 0405d4f..efd3300 100644 ---- a/ld/emultempl/elf32.em -+++ b/ld/emultempl/elf32.em -@@ -1242,6 +1242,8 @@ fragment <link.next) - if (bfd_get_flavour (abfd) == bfd_target_elf_flavour) --- -2.4.3 - diff --git a/package.bak/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch b/package.bak/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch deleted file mode 100644 index f67a43efdf..0000000000 --- a/package.bak/binutils/arc-2016.09-release/0500-add-sysroot-fix-from-bug-3049.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 30628870e583375f8927c04398c7219c6e9f703c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:42:48 +0100 -Subject: [PATCH] add sysroot fix from bug #3049 - -Always try to prepend the sysroot prefix to absolute filenames first. - -http://bugs.gentoo.org/275666 -http://sourceware.org/bugzilla/show_bug.cgi?id=10340 - -Signed-off-by: Sven Rebhan -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour ---- - ld/ldfile.c | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 96f9ecc..1439309 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -335,18 +335,25 @@ ldfile_open_file_search (const char *arch, - directory first. */ - if (! entry->flags.maybe_archive) - { -- if (entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename)) -+ /* For absolute pathnames, try to always open the file in the -+ sysroot first. If this fails, try to open the file at the -+ given location. */ -+ entry->flags.sysrooted = is_sysrooted_pathname (entry->filename); -+ if (!entry->flags.sysrooted && IS_ABSOLUTE_PATH (entry->filename) -+ && ld_sysroot) - { - char *name = concat (ld_sysroot, entry->filename, - (const char *) NULL); - if (ldfile_try_open_bfd (name, entry)) - { - entry->filename = name; -+ entry->flags.sysrooted = TRUE; - return TRUE; - } - free (name); - } -- else if (ldfile_try_open_bfd (entry->filename, entry)) -+ -+ if (ldfile_try_open_bfd (entry->filename, entry)) - return TRUE; - - if (IS_ABSOLUTE_PATH (entry->filename)) --- -2.4.3 - diff --git a/package.bak/binutils/arc-2016.09-release/0600-poison-system-directories.patch b/package.bak/binutils/arc-2016.09-release/0600-poison-system-directories.patch deleted file mode 100644 index d16994ec0c..0000000000 --- a/package.bak/binutils/arc-2016.09-release/0600-poison-system-directories.patch +++ /dev/null @@ -1,306 +0,0 @@ -From be366461dd49e760440fb28eaee5164eb281adcc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 25 Dec 2015 11:45:38 +0100 -Subject: [PATCH] poison-system-directories - -Patch adapted to binutils 2.23.2 and extended to use -BR_COMPILER_PARANOID_UNSAFE_PATH by Thomas Petazzoni. - -[Romain: rebase on top of 2.26] -Signed-off-by: Romain Naour -[Gustavo: adapt to binutils 2.25] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -Upstream-Status: Inappropriate [distribution: codesourcery] - -Patch originally created by Mark Hatle, forward-ported to -binutils 2.21 by Scott Garman. - -purpose: warn for uses of system directories when cross linking - -Code Merged from Sourcery G++ binutils 2.19 - 4.4-277 - -2008-07-02 Joseph Myers - - ld/ - * ld.h (args_type): Add error_poison_system_directories. - * ld.texinfo (--error-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.error_poison_system_directories. - * ldmain.c (main): Initialize - command_line.error_poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_ERROR_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --error-poison-system-directories. - (parse_args): Handle new option. - -2007-06-13 Joseph Myers - - ld/ - * config.in: Regenerate. - * ld.h (args_type): Add poison_system_directories. - * ld.texinfo (--no-poison-system-directories): Document. - * ldfile.c (ldfile_add_library_path): Check - command_line.poison_system_directories. - * ldmain.c (main): Initialize - command_line.poison_system_directories. - * lexsup.c (enum option_values): Add - OPTION_NO_POISON_SYSTEM_DIRECTORIES. - (ld_options): Add --no-poison-system-directories. - (parse_args): Handle new option. - -2007-04-20 Joseph Myers - - Merge from Sourcery G++ binutils 2.17: - - 2007-03-20 Joseph Myers - Based on patch by Mark Hatle . - ld/ - * configure.ac (--enable-poison-system-directories): New option. - * configure, config.in: Regenerate. - * ldfile.c (ldfile_add_library_path): If - ENABLE_POISON_SYSTEM_DIRECTORIES defined, warn for use of /lib, - /usr/lib, /usr/local/lib or /usr/X11R6/lib. - -Signed-off-by: Mark Hatle -Signed-off-by: Scott Garman ---- - ld/config.in | 3 +++ - ld/configure | 14 ++++++++++++++ - ld/configure.ac | 10 ++++++++++ - ld/ld.h | 8 ++++++++ - ld/ld.texinfo | 12 ++++++++++++ - ld/ldfile.c | 17 +++++++++++++++++ - ld/ldlex.h | 2 ++ - ld/ldmain.c | 2 ++ - ld/lexsup.c | 21 +++++++++++++++++++++ - 9 files changed, 89 insertions(+) - -diff --git a/ld/config.in b/ld/config.in -index 276fb77..35c58eb 100644 ---- a/ld/config.in -+++ b/ld/config.in -@@ -14,6 +14,9 @@ - language is requested. */ - #undef ENABLE_NLS - -+/* Define to warn for use of native system library directories */ -+#undef ENABLE_POISON_SYSTEM_DIRECTORIES -+ - /* Additional extension a shared object might have. */ - #undef EXTRA_SHLIB_EXTENSION - -diff --git a/ld/configure b/ld/configure -index a446283..d1f9504 100755 ---- a/ld/configure -+++ b/ld/configure -@@ -786,6 +786,7 @@ with_lib_path - enable_targets - enable_64_bit_bfd - with_sysroot -+enable_poison_system_directories - enable_gold - enable_got - enable_compressed_debug_sections -@@ -1442,6 +1443,8 @@ Optional Features: - --disable-largefile omit support for large files - --enable-targets alternative target configurations - --enable-64-bit-bfd 64-bit support (on hosts with narrower word sizes) -+ --enable-poison-system-directories -+ warn for use of native system library directories - --enable-gold[=ARG] build gold [ARG={default,yes,no}] - --enable-got= GOT handling scheme (target, single, negative, - multigot) -@@ -15491,7 +15494,18 @@ else - fi - - -+# Check whether --enable-poison-system-directories was given. -+if test "${enable_poison_system_directories+set}" = set; then : -+ enableval=$enable_poison_system_directories; -+else -+ enable_poison_system_directories=no -+fi -+ -+if test "x${enable_poison_system_directories}" = "xyes"; then - -+$as_echo "#define ENABLE_POISON_SYSTEM_DIRECTORIES 1" >>confdefs.h -+ -+fi - - # Check whether --enable-got was given. - if test "${enable_got+set}" = set; then : -diff --git a/ld/configure.ac b/ld/configure.ac -index 188172d..2cd8443 100644 ---- a/ld/configure.ac -+++ b/ld/configure.ac -@@ -95,6 +95,16 @@ AC_SUBST(use_sysroot) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) - -+AC_ARG_ENABLE([poison-system-directories], -+ AS_HELP_STRING([--enable-poison-system-directories], -+ [warn for use of native system library directories]),, -+ [enable_poison_system_directories=no]) -+if test "x${enable_poison_system_directories}" = "xyes"; then -+ AC_DEFINE([ENABLE_POISON_SYSTEM_DIRECTORIES], -+ [1], -+ [Define to warn for use of native system library directories]) -+fi -+ - dnl Use --enable-gold to decide if this linker should be the default. - dnl "install_as_default" is set to false if gold is the default linker. - dnl "installed_linker" is the installed BFD linker name. -diff --git a/ld/ld.h b/ld/ld.h -index d84ec4e..3476b26 100644 ---- a/ld/ld.h -+++ b/ld/ld.h -@@ -164,6 +164,14 @@ typedef struct { - /* If set, display the target memory usage (per memory region). */ - bfd_boolean print_memory_usage; - -+ /* If TRUE (the default) warn for uses of system directories when -+ cross linking. */ -+ bfd_boolean poison_system_directories; -+ -+ /* If TRUE (default FALSE) give an error for uses of system -+ directories when cross linking instead of a warning. */ -+ bfd_boolean error_poison_system_directories; -+ - /* Big or little endian as set on command line. */ - enum endian_enum endian; - -diff --git a/ld/ld.texinfo b/ld/ld.texinfo -index 1dd7492..fb1438e 100644 ---- a/ld/ld.texinfo -+++ b/ld/ld.texinfo -@@ -2332,6 +2332,18 @@ string identifying the original linked file does not change. - - Passing @code{none} for @var{style} disables the setting from any - @code{--build-id} options earlier on the command line. -+ -+@kindex --no-poison-system-directories -+@item --no-poison-system-directories -+Do not warn for @option{-L} options using system directories such as -+@file{/usr/lib} when cross linking. This option is intended for use -+in chroot environments when such directories contain the correct -+libraries for the target system rather than the host. -+ -+@kindex --error-poison-system-directories -+@item --error-poison-system-directories -+Give an error instead of a warning for @option{-L} options using -+system directories when cross linking. - @end table - - @c man end -diff --git a/ld/ldfile.c b/ld/ldfile.c -index 1439309..086b354 100644 ---- a/ld/ldfile.c -+++ b/ld/ldfile.c -@@ -114,6 +114,23 @@ ldfile_add_library_path (const char *name, bfd_boolean cmdline) - new_dirs->name = concat (ld_sysroot, name + 1, (const char *) NULL); - else - new_dirs->name = xstrdup (name); -+ -+#ifdef ENABLE_POISON_SYSTEM_DIRECTORIES -+ if (command_line.poison_system_directories -+ && ((!strncmp (name, "/lib", 4)) -+ || (!strncmp (name, "/usr/lib", 8)) -+ || (!strncmp (name, "/usr/local/lib", 14)) -+ || (!strncmp (name, "/usr/X11R6/lib", 14)))) -+ { -+ if (command_line.error_poison_system_directories) -+ einfo (_("%X%P: error: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ else -+ einfo (_("%P: warning: library search path \"%s\" is unsafe for " -+ "cross-compilation\n"), name); -+ } -+#endif -+ - } - - /* Try to open a BFD for a lang_input_statement. */ -diff --git a/ld/ldlex.h b/ld/ldlex.h -index 6f11e7b..0ca3110 100644 ---- a/ld/ldlex.h -+++ b/ld/ldlex.h -@@ -144,6 +144,8 @@ enum option_values - OPTION_PRINT_MEMORY_USAGE, - OPTION_REQUIRE_DEFINED_SYMBOL, - OPTION_ORPHAN_HANDLING, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES, - }; - - /* The initial parser states. */ -diff --git a/ld/ldmain.c b/ld/ldmain.c -index bb0b9cc..a23c56c 100644 ---- a/ld/ldmain.c -+++ b/ld/ldmain.c -@@ -257,6 +257,8 @@ main (int argc, char **argv) - command_line.warn_mismatch = TRUE; - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = -1; -+ command_line.poison_system_directories = TRUE; -+ command_line.error_poison_system_directories = FALSE; - - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the -diff --git a/ld/lexsup.c b/ld/lexsup.c -index 4cad209..be7d584 100644 ---- a/ld/lexsup.c -+++ b/ld/lexsup.c -@@ -530,6 +530,14 @@ static const struct ld_option ld_options[] = - { {"orphan-handling", required_argument, NULL, OPTION_ORPHAN_HANDLING}, - '\0', N_("=MODE"), N_("Control how orphan sections are handled."), - TWO_DASHES }, -+ { {"no-poison-system-directories", no_argument, NULL, -+ OPTION_NO_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Do not warn for -L options using system directories"), -+ TWO_DASHES }, -+ { {"error-poison-system-directories", no_argument, NULL, -+ OPTION_ERROR_POISON_SYSTEM_DIRECTORIES}, -+ '\0', NULL, N_("Give an error for -L options using system directories"), -+ TWO_DASHES }, - }; - - #define OPTION_COUNT ARRAY_SIZE (ld_options) -@@ -542,6 +550,7 @@ parse_args (unsigned argc, char **argv) - int ingroup = 0; - char *default_dirlist = NULL; - char *shortopts; -+ char *BR_paranoid_env; - struct option *longopts; - struct option *really_longopts; - int last_optind; -@@ -1516,6 +1525,14 @@ parse_args (unsigned argc, char **argv) - } - break; - -+ case OPTION_NO_POISON_SYSTEM_DIRECTORIES: -+ command_line.poison_system_directories = FALSE; -+ break; -+ -+ case OPTION_ERROR_POISON_SYSTEM_DIRECTORIES: -+ command_line.error_poison_system_directories = TRUE; -+ break; -+ - case OPTION_PUSH_STATE: - input_flags.pushed = xmemdup (&input_flags, - sizeof (input_flags), -@@ -1559,6 +1576,10 @@ parse_args (unsigned argc, char **argv) - command_line.soname = NULL; - } - -+ BR_paranoid_env = getenv("BR_COMPILER_PARANOID_UNSAFE_PATH"); -+ if (BR_paranoid_env && strlen(BR_paranoid_env) > 0) -+ command_line.error_poison_system_directories = TRUE; -+ - while (ingroup) - { - lang_leave_group (); --- -2.4.3 - diff --git a/package.bak/binutils/binutils.hash b/package.bak/binutils/binutils.hash deleted file mode 100644 index cf56b1ab59..0000000000 --- a/package.bak/binutils/binutils.hash +++ /dev/null @@ -1,8 +0,0 @@ -# From ftp://gcc.gnu.org/pub/binutils/releases/sha512.sum -sha512 5ec95ad47d49b12c4558a8db0ca2109d3ee1955e3776057f3330c4506f8f4d1cf5e505fbf8a16b98403a0fcdeaaf986fe0a22be6456247dbdace63ce1f776b12 binutils-2.24.tar.bz2 -sha512 0b36dda0e6d32cd25613c0e64b56b28312515c54d6a159efd3db9a86717f114ab0a0a1f69d08975084d55713ebaeab64e4085c9b3d1c3fa86712869f80eb954d binutils-2.25.1.tar.bz2 -sha512 9d9165609fd3b0f20d616f9891fc8e2b466eb13e2bfce40125e12427f8f201d20e2b8322bb6cb2b45e8df812f0e8ac059149f8a1f69ba3ed9d86a35c6a540b67 binutils-2.26.1.tar.bz2 -sha512 cf276f84935312361a2ca077e04d0b469d23a3aed979d8ba5d92ea590904ffb2c2e7ed12cc842822bfc402836be86f479660cef3791aa62f3753d8a1a6f564cb binutils-2.27.tar.bz2 - -# Locally calculated (fetched from Github) -sha512 b94f43bd084aef1cbe75da947775c7d9ad1873fb27f7b0b99244813c97bb44cd7fd4c11855418d74b731aa889bff615694777f41f4cd68429d8136d9bac2a239 binutils-arc-2016.09-release.tar.gz diff --git a/package.bak/binutils/binutils.mk b/package.bak/binutils/binutils.mk deleted file mode 100644 index d8ca5d6660..0000000000 --- a/package.bak/binutils/binutils.mk +++ /dev/null @@ -1,139 +0,0 @@ -################################################################################ -# -# binutils -# -################################################################################ - -# Version is set when using buildroot toolchain. -# If not, we do like other packages -BINUTILS_VERSION = $(call qstrip,$(BR2_BINUTILS_VERSION)) -ifeq ($(BINUTILS_VERSION),) -ifeq ($(BR2_arc),y) -BINUTILS_VERSION = arc-2016.09-release -else -BINUTILS_VERSION = 2.25.1 -endif -endif # BINUTILS_VERSION - -ifeq ($(BR2_arc),y) -BINUTILS_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(BINUTILS_VERSION)) -BINUTILS_SOURCE = binutils-$(BINUTILS_VERSION).tar.gz -BINUTILS_FROM_GIT = y -endif -BINUTILS_SITE ?= $(BR2_GNU_MIRROR)/binutils -BINUTILS_SOURCE ?= binutils-$(BINUTILS_VERSION).tar.bz2 -BINUTILS_EXTRA_CONFIG_OPTIONS = $(call qstrip,$(BR2_BINUTILS_EXTRA_CONFIG_OPTIONS)) -BINUTILS_INSTALL_STAGING = YES -BINUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -BINUTILS_LICENSE = GPLv3+, libiberty LGPLv2.1+ -BINUTILS_LICENSE_FILES = COPYING3 COPYING.LIB - -ifeq ($(BINUTILS_FROM_GIT),y) -BINUTILS_DEPENDENCIES += host-flex host-bison -HOST_BINUTILS_DEPENDENCIES += host-flex host-bison -endif - -# When binutils sources are fetched from the binutils-gdb repository, -# they also contain the gdb sources, but gdb shouldn't be built, so we -# disable it. -BINUTILS_DISABLE_GDB_CONF_OPTS = \ - --disable-sim \ - --disable-gdb - -# We need to specify host & target to avoid breaking ARM EABI -BINUTILS_CONF_OPTS = \ - --disable-multilib \ - --disable-werror \ - --host=$(GNU_TARGET_NAME) \ - --target=$(GNU_TARGET_NAME) \ - --enable-install-libiberty \ - --enable-build-warnings=no \ - $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ - $(BINUTILS_EXTRA_CONFIG_OPTIONS) - -ifeq ($(BR2_STATIC_LIBS),y) -BINUTILS_CONF_OPTS += --disable-plugins -endif - -# Don't build documentation. It takes up extra space / build time, -# and sometimes needs specific makeinfo versions to work -BINUTILS_CONF_ENV += MAKEINFO=true -BINUTILS_MAKE_OPTS += MAKEINFO=true -BINUTILS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MAKEINFO=true install -HOST_BINUTILS_CONF_ENV += MAKEINFO=true -HOST_BINUTILS_MAKE_OPTS += MAKEINFO=true -HOST_BINUTILS_INSTALL_OPTS += MAKEINFO=true install - -# gcc bug with Os/O2/O3, PR77311 -# error: unable to find a register to spill in class 'CCREGS' -ifeq ($(BR2_bfin),y) -BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" -endif - -# Workaround a build issue with -Os for ARM Cortex-M cpus. -# (Binutils 2.25.1 and 2.26.1) -# https://sourceware.org/bugzilla/show_bug.cgi?id=20552 -ifeq ($(BR2_ARM_CPU_ARMV7M)$(BR2_OPTIMIZE_S),yy) -BINUTILS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O2" -endif - -# Install binutils after busybox to prefer full-blown utilities -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -BINUTILS_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BINUTILS_DEPENDENCIES += zlib -endif - -# "host" binutils should actually be "cross" -# We just keep the convention of "host utility" for now -HOST_BINUTILS_CONF_OPTS = \ - --disable-multilib \ - --disable-werror \ - --target=$(GNU_TARGET_NAME) \ - --disable-shared \ - --enable-static \ - --with-sysroot=$(STAGING_DIR) \ - --enable-poison-system-directories \ - $(BINUTILS_DISABLE_GDB_CONF_OPTS) \ - $(BINUTILS_EXTRA_CONFIG_OPTIONS) - -# binutils run configure script of subdirs at make time, so ensure -# our TARGET_CONFIGURE_ARGS are taken into consideration for those -define BINUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_ARGS) $(MAKE) $(BINUTILS_MAKE_OPTS) -C $(@D) -endef - -# We just want libbfd, libiberty and libopcodes, -# not the full-blown binutils in staging -define BINUTILS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(STAGING_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/opcodes DESTDIR=$(STAGING_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install -endef - -# If we don't want full binutils on target -ifneq ($(BR2_PACKAGE_BINUTILS_TARGET),y) -define BINUTILS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/bfd DESTDIR=$(TARGET_DIR) install - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libiberty DESTDIR=$(STAGING_DIR) install -endef -endif - -XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME)) -ifneq ($(XTENSA_CORE_NAME),) -define BINUTILS_XTENSA_PRE_PATCH - tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \ - -C $(@D) --strip-components=1 binutils -endef -BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH -HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH -endif - -ifeq ($(BR2_BINUTILS_ENABLE_LTO),y) -HOST_BINUTILS_CONF_OPTS += --enable-plugins --enable-lto -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/biosdevname/Config.in b/package.bak/biosdevname/Config.in deleted file mode 100644 index f9202ac4b8..0000000000 --- a/package.bak/biosdevname/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_BIOSDEVNAME - bool "biosdevname" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PCIUTILS - select BR2_PACKAGE_ZLIB - help - Biosdevname is a udev helper that looks at various BIOS tables to - figure out what the actual hardware names are for Ethernet ports - and renames the ports accordingly. This has the advantage of - always referring to the same port regardless of system or - hardware changes that might otherwise alter the typical ethX - naming. - - http://linux.dell.com/biosdevname/ diff --git a/package.bak/biosdevname/biosdevname.hash b/package.bak/biosdevname/biosdevname.hash deleted file mode 100644 index a00077711e..0000000000 --- a/package.bak/biosdevname/biosdevname.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed hashes, not provided by upstream -sha1 a926961d6adb673aed062683ab8b80e6418523ea biosdevname-0.6.0.tar.gz -sha256 c75bf92d3184f7dd1973af002de152498145021efdd5de46d6bf796acef43914 biosdevname-0.6.0.tar.gz diff --git a/package.bak/biosdevname/biosdevname.mk b/package.bak/biosdevname/biosdevname.mk deleted file mode 100644 index 82f3338a95..0000000000 --- a/package.bak/biosdevname/biosdevname.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# biosdevname -# -################################################################################ - -BIOSDEVNAME_VERSION = 0.6.0 -BIOSDEVNAME_SITE = http://linux.dell.com/biosdevname/biosdevname-$(BIOSDEVNAME_VERSION) -BIOSDEVNAME_LICENSE = GPL -BIOSDEVNAME_LICENSE_FILES = COPYING -BIOSDEVNAME_CONF_OPTS = --exec-prefix=/ -BIOSDEVNAME_DEPENDENCIES = pciutils udev zlib - -$(eval $(autotools-package)) diff --git a/package.bak/bison/bison.hash b/package.bak/bison/bison.hash deleted file mode 100644 index 16913f28b0..0000000000 --- a/package.bak/bison/bison.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1 bison-3.0.4.tar.xz diff --git a/package.bak/bison/bison.mk b/package.bak/bison/bison.mk deleted file mode 100644 index 5779673e12..0000000000 --- a/package.bak/bison/bison.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# bison -# -################################################################################ - -BISON_VERSION = 3.0.4 -BISON_SOURCE = bison-$(BISON_VERSION).tar.xz -BISON_SITE = $(BR2_GNU_MIRROR)/bison -BISON_LICENSE = GPLv3+ -BISON_LICENSE_FILES = COPYING -HOST_BISON_DEPENDENCIES = host-m4 - -$(eval $(host-autotools-package)) diff --git a/package.bak/bitstream-vera/Config.in b/package.bak/bitstream-vera/Config.in deleted file mode 100644 index 034f115b4b..0000000000 --- a/package.bak/bitstream-vera/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_BITSTREAM_VERA - bool "Bitstream Vera" - help - Bitstream Vera font family. - - https://www.gnome.org/fonts/ diff --git a/package.bak/bitstream-vera/bitstream-vera.hash b/package.bak/bitstream-vera/bitstream-vera.hash deleted file mode 100644 index e18b38bb65..0000000000 --- a/package.bak/bitstream-vera/bitstream-vera.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/1.10/ttf-bitstream-vera-1.10.tar.bz2.sha256sum -sha256 db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc ttf-bitstream-vera-1.10.tar.bz2 diff --git a/package.bak/bitstream-vera/bitstream-vera.mk b/package.bak/bitstream-vera/bitstream-vera.mk deleted file mode 100644 index f487d637c2..0000000000 --- a/package.bak/bitstream-vera/bitstream-vera.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# bitstream-vera -# -################################################################################ - -BITSTREAM_VERA_VERSION = 1.10 -BITSTREAM_VERA_SITE = http://ftp.gnome.org/pub/GNOME/sources/ttf-bitstream-vera/$(BITSTREAM_VERA_VERSION) -BITSTREAM_VERA_SOURCE = ttf-bitstream-vera-$(BITSTREAM_VERA_VERSION).tar.bz2 -BITSTREAM_VERA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/ttf-bitstream-vera -BITSTREAM_VERA_LICENSE = BitstreamVera -BITSTREAM_VERA_LICENSE_FILES = COPYRIGHT.TXT - -define BITSTREAM_VERA_INSTALL_TARGET_CMDS - mkdir -p $(BITSTREAM_VERA_TARGET_DIR) - $(INSTALL) -m 644 $(@D)/*.ttf $(BITSTREAM_VERA_TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/bitstream/Config.in b/package.bak/bitstream/Config.in deleted file mode 100644 index 9d967a0f58..0000000000 --- a/package.bak/bitstream/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BITSTREAM - bool "bitstream" - help - biTStream is a set of C headers allowing a simpler access to - binary structures such as specified by MPEG, DVB, IETF, - SMPTE, IEEE, SCTE, etc. - - http://www.videolan.org/developers/bitstream.html diff --git a/package.bak/bitstream/bitstream.hash b/package.bak/bitstream/bitstream.hash deleted file mode 100644 index 7a3b7f8633..0000000000 --- a/package.bak/bitstream/bitstream.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://get.videolan.org/bitstream/1.1/bitstream-1.1.tar.bz2.md5 -md5 88e6e786242196b4d73a5b6075aeb1a2 bitstream-1.1.tar.bz2 -# locally calculated -sha256 90b65f619895d31e652386d5d7d2d2d62cccd44383c1fac9145d659013a2de9e bitstream-1.1.tar.bz2 diff --git a/package.bak/bitstream/bitstream.mk b/package.bak/bitstream/bitstream.mk deleted file mode 100644 index 9c8c6f5ca2..0000000000 --- a/package.bak/bitstream/bitstream.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# bitstream -# -################################################################################ - -BITSTREAM_VERSION = 1.1 -BITSTREAM_SOURCE = bitstream-$(BITSTREAM_VERSION).tar.bz2 -BITSTREAM_SITE = https://get.videolan.org/bitstream/$(BITSTREAM_VERSION) -BITSTREAM_LICENSE = MIT -BITSTREAM_LICENSE_FILES = COPYING - -# package consists of header files only -BITSTREAM_INSTALL_STAGING = YES -BITSTREAM_INSTALL_TARGET = NO - -define BITSTREAM_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/blktrace/0001-iowatcher-link-with-lrt.patch b/package.bak/blktrace/0001-iowatcher-link-with-lrt.patch deleted file mode 100644 index 689a67814a..0000000000 --- a/package.bak/blktrace/0001-iowatcher-link-with-lrt.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 80d87b99d72034441ea4fbab81f5c80c1ef3b067 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 23 Aug 2016 16:36:14 +0200 -Subject: [PATCH] iowatcher: link with -lrt - -Some C libraries (notably uClibc) have the posix_spawn*() functions in -librt, so let's link iowatcher with -lrt. - -Signed-off-by: Thomas Petazzoni -Upstream-status: merged - (http://git.kernel.org/cgit/linux/kernel/git/axboe/blktrace.git/commit/?id=d1ab783430f5a832e973ed9a293da146c04c6702) ---- - iowatcher/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iowatcher/Makefile b/iowatcher/Makefile -index 7b5101c..502476d 100644 ---- a/iowatcher/Makefile -+++ b/iowatcher/Makefile -@@ -19,7 +19,7 @@ all: $(ALL) - $(CC) -o $*.o -c $(ALL_CFLAGS) $< - - iowatcher: blkparse.o plot.o main.o tracers.o mpstat.o fio.o -- $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -+ $(CC) $(ALL_CFLAGS) -o $@ $(filter %.o,$^) -lm -lrt - - depend: - @$(CC) -MM $(ALL_CFLAGS) *.c 1> .depend --- -2.7.4 - diff --git a/package.bak/blktrace/Config.in b/package.bak/blktrace/Config.in deleted file mode 100644 index dedfa03f03..0000000000 --- a/package.bak/blktrace/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_BLKTRACE - bool "blktrace" - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() - depends on BR2_USE_MMU # system() - select BR2_PACKAGE_LIBAIO - help - blktrace is a block layer IO tracing mechanism which provides - detailed information about request queue operations - up to user space. - - http://git.kernel.dk/?p=blktrace.git;a=summary - -comment "blktrace needs a toolchain w/ NPTL" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/blktrace/blktrace.hash b/package.bak/blktrace/blktrace.hash deleted file mode 100644 index acd42fb199..0000000000 --- a/package.bak/blktrace/blktrace.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://brick.kernel.dk/snaps/MD5SUMS -md5 9a6ca62330c8adb0b6a4ea6cf8a55694 blktrace-1.1.0.tar.gz diff --git a/package.bak/blktrace/blktrace.mk b/package.bak/blktrace/blktrace.mk deleted file mode 100644 index de583cf844..0000000000 --- a/package.bak/blktrace/blktrace.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# blktrace -# -################################################################################ - -BLKTRACE_VERSION = 1.1.0 -BLKTRACE_SITE = http://brick.kernel.dk/snaps -BLKTRACE_DEPENDENCIES = libaio -BLKTRACE_LICENSE = GPLv2+ -BLKTRACE_LICENSE_FILES = COPYING - -define BLKTRACE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define BLKTRACE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ - DESTDIR=$(TARGET_DIR) prefix=/usr -endef - -$(eval $(generic-package)) diff --git a/package.bak/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch b/package.bak/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch deleted file mode 100644 index e8a3ff47bf..0000000000 --- a/package.bak/bluez5_utils/0001-tools-bneptest.c-Remove-include-linux-if_bridge.h-to.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 7c136b4f1941e5bb2a6c8d93985c5734c6aefb29 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 22 May 2016 09:48:57 +0200 -Subject: [PATCH 1/1] tools/bneptest.c: Remove include linux/if_bridge.h to fix - musl build - -Inspired by busybox commit: -https://git.busybox.net/busybox/commit/networking/brctl.c?id=5fa6d1a632505789409a2ba6cf8e112529f9db18 - -The build error was found by the autobuilders of the buildroot project: -http://autobuild.buildroot.net/results/eba/ebaa0bcb9c325aa6ed0bbd6c7ec75d44befa7645/build-end.log - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: - http://article.gmane.org/gmane.linux.bluez.kernel/67621) ---- - tools/bneptest.c | 12 +++++++++++- - 1 file changed, 11 insertions(+), 1 deletion(-) - -diff --git a/tools/bneptest.c b/tools/bneptest.c -index 1404252..b832d72 100644 ---- a/tools/bneptest.c -+++ b/tools/bneptest.c -@@ -36,7 +36,17 @@ - #include - #include - #include --#include -+/* #include -+ * breaks on musl: we already included netinet/in.h, -+ * if we also include here, we get this: -+ * In file included from /usr/include/linux/if_bridge.h:18, -+ * from networking/brctl.c:67: -+ * /usr/include/linux/in6.h:32: error: redefinition of 'struct in6_addr' -+ * /usr/include/linux/in6.h:49: error: redefinition of 'struct sockaddr_in6' -+ * /usr/include/linux/in6.h:59: error: redefinition of 'struct ipv6_mreq' -+ */ -+/* From */ -+#define BRCTL_SET_BRIDGE_FORWARD_DELAY 8 - - #include - --- -2.8.1 - diff --git a/package.bak/bluez5_utils/Config.in b/package.bak/bluez5_utils/Config.in deleted file mode 100644 index a7c0ee4ba4..0000000000 --- a/package.bak/bluez5_utils/Config.in +++ /dev/null @@ -1,90 +0,0 @@ -config BR2_PACKAGE_BLUEZ5_UTILS - bool "bluez-utils 5.x" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus - depends on !BR2_STATIC_LIBS # uses dlfcn - depends on !BR2_PACKAGE_BLUEZ_UTILS # conflicts with 4.x version - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - help - bluez utils version 5.x - - With this release BlueZ only supports the new Bluetooth - Management kernel interface (introduced in Linux 3.4). - - For Low Energy support at least kernel version 3.5 is - needed. - - The API is not backward compatible with BlueZ 4. - - Bluez utils will use systemd and/or udev if enabled. - - http://www.bluez.org - http://www.kernel.org/pub/linux/bluetooth - -if BR2_PACKAGE_BLUEZ5_UTILS - -config BR2_PACKAGE_BLUEZ5_UTILS_OBEX - bool "build OBEX support" - select BR2_PACKAGE_LIBICAL - depends on BR2_INSTALL_LIBSTDCPP - help - Enable the OBEX support in Bluez 5.x. - -comment "OBEX support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_BLUEZ5_UTILS_CLIENT - bool "build CLI client" - # wordexp support not in our uClibc configuration - depends on !BR2_TOOLCHAIN_USES_UCLIBC - select BR2_PACKAGE_READLINE - help - Enable the Bluez 5.x command line client. - -comment "bluez5-utils client needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC - -config BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL - bool "install GATT tool" - depends on BR2_PACKAGE_BLUEZ5_UTILS_CLIENT - help - Generic Attribute Profile (GATT) support. This provides - profile discovery and description services for Bluetooth Low - Energy. This will install the gatttool utility. - - It is always built with BlueZ 5.x, but upstream choose not - to install it by default. - -config BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL - bool "build experimental plugins" - help - Build BlueZ 5.x experimental plugins (SAP, NFC, ...). - -config BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS - bool "build sixaxis plugin" - depends on BR2_PACKAGE_HAS_UDEV - help - Build BlueZ 5.x sixaxis plugin (support Sony Dualshock controller) - -comment "sixaxis plugin needs udev /dev management" - depends on !BR2_PACKAGE_HAS_UDEV - -config BR2_PACKAGE_BLUEZ5_UTILS_TEST - bool "build tests" - help - Build BlueZ 5.x tests - -endif - -comment "bluez5-utils needs a toolchain w/ wchar, threads, headers >= 3.4, dynamic library" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 || BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_MMU - -comment "bluez5-utils conflicts with older bluez-utils version" - depends on BR2_PACKAGE_BLUEZ_UTILS diff --git a/package.bak/bluez5_utils/bluez5_utils.hash b/package.bak/bluez5_utils/bluez5_utils.hash deleted file mode 100644 index b030f1a08a..0000000000 --- a/package.bak/bluez5_utils/bluez5_utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 16c9c05d2a1da644ce3570d975ada3643d2e60c007a955bac09c0a0efeb58d15 bluez-5.43.tar.xz diff --git a/package.bak/bluez5_utils/bluez5_utils.mk b/package.bak/bluez5_utils/bluez5_utils.mk deleted file mode 100644 index 66c3eab1e9..0000000000 --- a/package.bak/bluez5_utils/bluez5_utils.mk +++ /dev/null @@ -1,87 +0,0 @@ -################################################################################ -# -# bluez5_utils -# -################################################################################ - -BLUEZ5_UTILS_VERSION = 5.43 -BLUEZ5_UTILS_SOURCE = bluez-$(BLUEZ5_UTILS_VERSION).tar.xz -BLUEZ5_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth -BLUEZ5_UTILS_INSTALL_STAGING = YES -BLUEZ5_UTILS_DEPENDENCIES = dbus libglib2 -BLUEZ5_UTILS_LICENSE = GPLv2+, LGPLv2.1+ -BLUEZ5_UTILS_LICENSE_FILES = COPYING COPYING.LIB - -BLUEZ5_UTILS_CONF_OPTS = \ - --enable-tools \ - --enable-library \ - --disable-cups - -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_OBEX),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-obex -BLUEZ5_UTILS_DEPENDENCIES += libical -else -BLUEZ5_UTILS_CONF_OPTS += --disable-obex -endif - -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_CLIENT),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-client -BLUEZ5_UTILS_DEPENDENCIES += readline -else -BLUEZ5_UTILS_CONF_OPTS += --disable-client -endif - -# experimental plugins -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_EXPERIMENTAL),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-experimental -else -BLUEZ5_UTILS_CONF_OPTS += --disable-experimental -endif - -# enable sixaxis plugin -ifeq ($(BR2_PACKAGE_BLUEZ5_PLUGINS_SIXAXIS),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-sixaxis -else -BLUEZ5_UTILS_CONF_OPTS += --disable-sixaxis -endif - -# install gatttool (For some reason upstream choose not to do it by default) -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_GATTTOOL),y) -define BLUEZ5_UTILS_INSTALL_GATTTOOL - $(INSTALL) -D -m 0755 $(@D)/attrib/gatttool $(TARGET_DIR)/usr/bin/gatttool -endef -BLUEZ5_UTILS_POST_INSTALL_TARGET_HOOKS += BLUEZ5_UTILS_INSTALL_GATTTOOL -endif - -# enable test -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS_TEST),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-test -else -BLUEZ5_UTILS_CONF_OPTS += --disable-test -endif - -# use udev if available -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-udev -BLUEZ5_UTILS_DEPENDENCIES += udev -else -BLUEZ5_UTILS_CONF_OPTS += --disable-udev -endif - -# integrate with systemd if available -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -BLUEZ5_UTILS_CONF_OPTS += --enable-systemd -BLUEZ5_UTILS_DEPENDENCIES += systemd -else -BLUEZ5_UTILS_CONF_OPTS += --disable-systemd -endif - -define BLUEZ5_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants - ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/bluetooth.target.wants/bluetooth.service - ln -fs ../../../../usr/lib/systemd/system/bluetooth.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.bluez.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch b/package.bak/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch deleted file mode 100644 index e80af5fd90..0000000000 --- a/package.bak/bluez_utils/0001-enable_cg2900_on_upstream_4.91.patch +++ /dev/null @@ -1,106 +0,0 @@ -From ac7992081abba87627c9e91735b3309584b48585 Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Wed, 14 Nov 2012 14:27:02 +0100 -Subject: [PATCH] add support for the ST-Ericsson CG2900 GPS FM Bluetooth - combo controller - - -Signed-off-by: Gregory Hermant ---- - tools/hciattach.c | 22 +++++++++++++++------- - tools/hciattach.h | 1 + - 2 files changed, 16 insertions(+), 7 deletions(-) - -diff --git a/tools/hciattach.c b/tools/hciattach.c -index e4d5aa1..7f08243 100644 ---- a/tools/hciattach.c -+++ b/tools/hciattach.c -@@ -1066,6 +1066,11 @@ struct uart_t uart[] = { - { "texasalt", 0x0000, 0x0000, HCI_UART_LL, 115200, 115200, - FLOW_CTL, DISABLE_PM, NULL, texasalt, NULL }, - -+ /* ST-Ericsson CG2900 GPS FM Bluetooth combo controller */ -+ { "cg2900", 0x0000, 0x0000, HCI_UART_STE, 115200, 115200, -+ FLOW_CTL, DISABLE_PM, NULL, NULL }, -+ -+ - /* ST Microelectronics minikits based on STLC2410/STLC2415 */ - { "st", 0x0000, 0x0000, HCI_UART_H4, 57600, 115200, - FLOW_CTL, DISABLE_PM, NULL, st }, -@@ -1157,10 +1162,10 @@ static struct uart_t * get_by_type(char *type) - } - - /* Initialize UART driver */ --static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) -+static int init_uart(char *dev, struct uart_t *u, int send_break, int raw, int line_disc) - { - struct termios ti; -- int fd, i; -+ int fd; - unsigned long flags = 0; - - if (raw) -@@ -1217,8 +1222,7 @@ static int init_uart(char *dev, struct uart_t *u, int send_break, int raw) - } - - /* Set TTY to N_HCI line discipline */ -- i = N_HCI; -- if (ioctl(fd, TIOCSETD, &i) < 0) { -+ if (ioctl(fd, TIOCSETD, &line_disc) < 0) { - perror("Can't set line discipline"); - return -1; - } -@@ -1243,7 +1247,7 @@ static void usage(void) - { - printf("hciattach - HCI UART driver initialization utility\n"); - printf("Usage:\n"); -- printf("\thciattach [-n] [-p] [-b] [-r] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); -+ printf("\thciattach [-n] [-p] [-a line_disc_nr] [-b] [-r] [-t timeout] [-s initial_speed] [speed] [flow|noflow] [bdaddr]\n"); - printf("\thciattach -l\n"); - } - -@@ -1252,6 +1256,7 @@ int main(int argc, char *argv[]) - struct uart_t *u = NULL; - int detach, printpid, raw, opt, i, n, ld, err; - int to = 10; -+ int line_disc = N_HCI; - int init_speed = 0; - int send_break = 0; - pid_t pid; -@@ -1264,8 +1269,11 @@ int main(int argc, char *argv[]) - printpid = 0; - raw = 0; - -- while ((opt=getopt(argc, argv, "bnpt:s:lr")) != EOF) { -+ while ((opt=getopt(argc, argv, "bnpt:s:lra:")) != EOF) { - switch(opt) { -+ case 'a': -+ line_disc = atoi(optarg); -+ break; - case 'b': - send_break = 1; - break; -@@ -1381,7 +1389,7 @@ int main(int argc, char *argv[]) - alarm(to); - bcsp_max_retries = to; - -- n = init_uart(dev, u, send_break, raw); -+ n = init_uart(dev, u, send_break, raw, line_disc); - if (n < 0) { - perror("Can't initialize device"); - exit(1); -diff --git a/tools/hciattach.h b/tools/hciattach.h -index fed0d11..09b534d 100644 ---- a/tools/hciattach.h -+++ b/tools/hciattach.h -@@ -39,6 +39,7 @@ - #define HCI_UART_H4DS 3 - #define HCI_UART_LL 4 - #define HCI_UART_ATH3K 5 -+#define HCI_UART_STE 6 - - #define HCI_UART_RAW_DEVICE 0 - --- -1.7.9.5 - diff --git a/package.bak/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch b/package.bak/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch deleted file mode 100644 index 7d0763ff03..0000000000 --- a/package.bak/bluez_utils/0002-tools-hciconfig-include-fcntl.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ae607756a5f2a09bce1fc3a52e74b5f471245e33 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 6 Apr 2015 23:54:19 +0200 -Subject: [PATCH] tools/hciconfig: include - -Needed to get the definition of mode_t in musl. - -Signed-off-by: Thomas Petazzoni ---- - tools/hciconfig.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/hciconfig.c b/tools/hciconfig.c -index f1458b9..6776d62 100644 ---- a/tools/hciconfig.c -+++ b/tools/hciconfig.c -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.1.0 - diff --git a/package.bak/bluez_utils/0003-fix-compilation-issues-with-musl.patch b/package.bak/bluez_utils/0003-fix-compilation-issues-with-musl.patch deleted file mode 100644 index d8b48eaad2..0000000000 --- a/package.bak/bluez_utils/0003-fix-compilation-issues-with-musl.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 8aa6aa4ba2d9d00c91e36e146895af20cbc00d17 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Wed, 2 Sep 2015 12:10:58 +0100 -Subject: [PATCH 1/1] fix compilation issues with musl. - -- sys/time.h needed for struct timeval -- unistd.h should not be included due to clash with encrypt(3) -- sys/types.h needed for mode_t - -Note that this version of bluez is 3 years old. Recent fixes have gone -into the upstream to address musl compatibility issues, but the upstream -has changed so much that it makes little sense to try to backport these. -This patch is really a stopgap until we move to the latest upstream. - -Upstream-Status: not needed -Signed-off-by: Brendan Heading ---- - compat/bnep.c | 1 + - compat/dund.c | 1 - - src/textfile.h | 1 + - 3 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/compat/bnep.c b/compat/bnep.c -index 281350b..49226c1 100644 ---- a/compat/bnep.c -+++ b/compat/bnep.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #include - #include -diff --git a/compat/dund.c b/compat/dund.c -index af1b536..c2f085f 100644 ---- a/compat/dund.c -+++ b/compat/dund.c -@@ -29,7 +29,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/src/textfile.h b/src/textfile.h -index dc5fc2b..0148b30 100644 ---- a/src/textfile.h -+++ b/src/textfile.h -@@ -24,6 +24,7 @@ - #ifndef __TEXTFILE_H - #define __TEXTFILE_H - -+#include - int create_dirs(const char *filename, const mode_t mode); - int create_file(const char *filename, const mode_t mode); - int create_name(char *buf, size_t size, const char *path, --- -2.4.3 - diff --git a/package.bak/bluez_utils/Config.in b/package.bak/bluez_utils/Config.in deleted file mode 100644 index 3848162697..0000000000 --- a/package.bak/bluez_utils/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config BR2_PACKAGE_BLUEZ_UTILS - bool "bluez-utils" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - help - bluez utils - - http://www.kernel.org/pub/linux/bluetooth - -if BR2_PACKAGE_BLUEZ_UTILS - -config BR2_PACKAGE_BLUEZ_UTILS_COMPAT - bool "BlueZ 3.x compatibility binaries" - help - BlueZ 3.x compatibility binaries like pand, hidd, sdp - -config BR2_PACKAGE_BLUEZ_UTILS_AUDIO - bool "audio support" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_LIBSNDFILE - help - Audio support - -config BR2_PACKAGE_BLUEZ_UTILS_USB - bool "USB support" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - USB support - -config BR2_PACKAGE_BLUEZ_UTILS_GATT - bool "GATT support" - select BR2_PACKAGE_READLINE - help - Generic Attribute Profile (GATT) support. This provides profile - discovery and description services for Bluetooth Low Energy. - This will install the gatttool utility. -endif - -comment "bluez-utils needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/bluez_utils/bluez_utils.hash b/package.bak/bluez_utils/bluez_utils.hash deleted file mode 100644 index 09b7b21d82..0000000000 --- a/package.bak/bluez_utils/bluez_utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc: -sha256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d bluez-4.101.tar.xz diff --git a/package.bak/bluez_utils/bluez_utils.mk b/package.bak/bluez_utils/bluez_utils.mk deleted file mode 100644 index 1c93f2e5f5..0000000000 --- a/package.bak/bluez_utils/bluez_utils.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# bluez_utils -# -################################################################################ - -BLUEZ_UTILS_VERSION = 4.101 -BLUEZ_UTILS_SOURCE = bluez-$(BLUEZ_UTILS_VERSION).tar.xz -BLUEZ_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth -BLUEZ_UTILS_INSTALL_STAGING = YES -BLUEZ_UTILS_DEPENDENCIES = dbus libglib2 -BLUEZ_UTILS_CONF_OPTS = --enable-test --enable-tools -BLUEZ_UTILS_AUTORECONF = YES -BLUEZ_UTILS_LICENSE = GPLv2+, LGPLv2.1+ -BLUEZ_UTILS_LICENSE_FILES = COPYING COPYING.LIB - -# BlueZ 3.x compatibility -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_COMPAT),y) -BLUEZ_UTILS_CONF_OPTS += \ - --enable-hidd \ - --enable-pand \ - --enable-sdp \ - --enable-dund -endif - -# audio support -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_AUDIO),y) -BLUEZ_UTILS_DEPENDENCIES += \ - alsa-lib \ - libsndfile -BLUEZ_UTILS_CONF_OPTS += \ - --enable-alsa \ - --enable-audio -else -BLUEZ_UTILS_CONF_OPTS += \ - --disable-alsa \ - --disable-audio -endif - -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_GATT),y) -BLUEZ_UTILS_DEPENDENCIES += readline -BLUEZ_UTILS_CONF_OPTS += --enable-gatt -else -BLUEZ_UTILS_CONF_OPTS += --disable-gatt -endif - -# USB support -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS_USB),y) -BLUEZ_UTILS_DEPENDENCIES += libusb -BLUEZ_UTILS_CONF_OPTS += \ - --enable-usb -else -BLUEZ_UTILS_CONF_OPTS += \ - --disable-usb -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -BLUEZ_UTILS_CONF_OPTS += --disable-pie -endif - -$(eval $(autotools-package)) diff --git a/package.bak/bmon/Config.in b/package.bak/bmon/Config.in deleted file mode 100644 index bb796936cc..0000000000 --- a/package.bak/bmon/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_BMON - bool "bmon" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBNL - select BR2_PACKAGE_NCURSES - help - bmon is a bandwidth monitor capable of retrieving statistics from - various input modules. It provides various output methods - including a curses based interface. - - https://github.com/tgraf/bmon/ - -comment "bmon needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/bmon/bmon.hash b/package.bak/bmon/bmon.hash deleted file mode 100644 index dec0c7d81a..0000000000 --- a/package.bak/bmon/bmon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 02fdc312b8ceeb5786b28bf905f54328f414040ff42f45c83007f24b76cc9f7a bmon-4.0.tar.gz diff --git a/package.bak/bmon/bmon.mk b/package.bak/bmon/bmon.mk deleted file mode 100644 index 32889a69f3..0000000000 --- a/package.bak/bmon/bmon.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# bmon -# -################################################################################ - -BMON_VERSION = 4.0 -BMON_SITE = https://github.com/tgraf/bmon/releases/download/v$(BMON_VERSION) -BMON_DEPENDENCIES = host-pkgconf libconfuse libnl ncurses -BMON_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -BMON_LICENSE = BSD-2c, MIT -BMON_LICENSE_FILES = LICENSE.BSD LICENSE.MIT - -# link dynamically unless explicitly requested otherwise -ifeq ($(BR2_STATIC_LIBS),) -BMON_CONF_OPTS += --disable-static -else -# forgets to explicitly link with pthread for libnl -BMON_CONF_OPTS += LIBS=-lpthread -endif - -$(eval $(autotools-package)) diff --git a/package.bak/boa/0001-use-name-max.patch b/package.bak/boa/0001-use-name-max.patch deleted file mode 100644 index 055e56c3e1..0000000000 --- a/package.bak/boa/0001-use-name-max.patch +++ /dev/null @@ -1,21 +0,0 @@ -Use NAME_MAX instead of MAXNAMLEN - -NAME_MAX is POSIX, and available in all C libraries, generally in -, while MAXNAMLEN is BSD-specific, and only available in -musl in . So let's use NAME_MAX instead of MAXNAMLEN. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/index_dir.c -=================================================================== ---- a/src/index_dir.c -+++ b/src/index_dir.c -@@ -29,7 +29,7 @@ - #include - #include "compat.h" - --#define MAX_FILE_LENGTH MAXNAMLEN -+#define MAX_FILE_LENGTH NAME_MAX - #define MAX_PATH_LENGTH PATH_MAX - - #define INT_TO_HEX(x) \ diff --git a/package.bak/boa/Config.in b/package.bak/boa/Config.in deleted file mode 100644 index cb085a2494..0000000000 --- a/package.bak/boa/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BOA - bool "boa" - depends on BR2_USE_MMU # uses fork() - help - A very small and very fast http daemon. Not intended as - a feature-packed server. - - http://www.boa.org/ diff --git a/package.bak/boa/boa.conf b/package.bak/boa/boa.conf deleted file mode 100644 index e94029665f..0000000000 --- a/package.bak/boa/boa.conf +++ /dev/null @@ -1,187 +0,0 @@ -# Boa v0.94 configuration file -# File format has not changed from 0.93 -# File format has changed little from 0.92 -# version changes are noted in the comments -# -# The Boa configuration file is parsed with a lex/yacc or flex/bison -# generated parser. If it reports an error, the line number will be -# provided; it should be easy to spot. The syntax of each of these -# rules is very simple, and they can occur in any order. Where possible -# these directives mimic those of NCSA httpd 1.3; I saw no reason to -# introduce gratuitous differences. - -# $Id: boa.conf,v 1.1 2004/10/09 02:48:37 andersen Exp $ - -# The "ServerRoot" is not in this configuration file. It can be compiled -# into the server (see defines.h) or specified on the command line with -# the -c option, for example: -# -# boa -c /usr/local/boa - - -# Port: The port Boa runs on. The default port for http servers is 80. -# If it is less than 1024, the server must be started as root. - -Port 80 - -# Listen: the Internet address to bind(2) to. If you leave it out, -# it takes the behavior before 0.93.17.2, which is to bind to all -# addresses (INADDR_ANY). You only get one "Listen" directive, -# if you want service on multiple IP addresses, you have three choices: -# 1. Run boa without a "Listen" directive -# a. All addresses are treated the same; makes sense if the addresses -# are localhost, ppp, and eth0. -# b. Use the VirtualHost directive below to point requests to different -# files. Should be good for a very large number of addresses (web -# hosting clients). -# 2. Run one copy of boa per IP address, each has its own configuration -# with a "Listen" directive. No big deal up to a few tens of addresses. -# Nice separation between clients. -# The name you provide gets run through inet_aton(3), so you have to use dotted -# quad notation. This configuration is too important to trust some DNS. - -#Listen 192.68.0.5 - -# User: The name or UID the server should run as. -# Group: The group name or GID the server should run as. - -User nobody -Group nogroup - -# ServerAdmin: The email address where server problems should be sent. -# Note: this is not currently used, except as an environment variable -# for CGIs. - -#ServerAdmin root@localhost - -# ErrorLog: The location of the error log file. If this does not start -# with /, it is considered relative to the server root. -# Set to /dev/null if you don't want errors logged. -# If unset, defaults to /dev/stderr - -ErrorLog /var/log/boa/error_log -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#ErrorLog "|/usr/sbin/cronolog --symlink=/var/log/boa/error_log /var/log/boa/error-%Y%m%d.log" - -# AccessLog: The location of the access log file. If this does not -# start with /, it is considered relative to the server root. -# Comment out or set to /dev/null (less effective) to disable -# Access logging. - -AccessLog /var/log/boa/access_log -# Please NOTE: Sending the logs to a pipe ('|'), as shown below, -# is somewhat experimental and might fail under heavy load. -# "Usual libc implementations of printf will stall the whole -# process if the receiving end of a pipe stops reading." -#AccessLog "|/usr/sbin/cronolog --symlink=/var/log/boa/access_log /var/log/boa/access-%Y%m%d.log" - -# UseLocaltime: Logical switch. Uncomment to use localtime -# instead of UTC time -#UseLocaltime - -# VerboseCGILogs: this is just a logical switch. -# It simply notes the start and stop times of cgis in the error log -# Comment out to disable. - -#VerboseCGILogs - -# ServerName: the name of this server that should be sent back to -# clients if different than that returned by gethostname + gethostbyname - -#ServerName www.your.org.here - -# VirtualHost: a logical switch. -# Comment out to disable. -# Given DocumentRoot /var/www, requests on interface 'A' or IP 'IP-A' -# become /var/www/IP-A. -# Example: http://localhost/ becomes /var/www/127.0.0.1 -# -# Not used until version 0.93.17.2. This "feature" also breaks commonlog -# output rules, it prepends the interface number to each access_log line. -# You are expected to fix that problem with a postprocessing script. - -#VirtualHost - -# DocumentRoot: The root directory of the HTML documents. -# Comment out to disable server non user files. - -DocumentRoot /var/www - -# UserDir: The name of the directory which is appended onto a user's home -# directory if a ~user request is recieved. - -UserDir public_html - -# DirectoryIndex: Name of the file to use as a pre-written HTML -# directory index. Please MAKE AND USE THESE FILES. On the -# fly creation of directory indexes can be _slow_. -# Comment out to always use DirectoryMaker - -DirectoryIndex index.html - -# DirectoryMaker: Name of program used to create a directory listing. -# Comment out to disable directory listings. If both this and -# DirectoryIndex are commented out, accessing a directory will give -# an error (though accessing files in the directory are still ok). - -DirectoryMaker /usr/lib/boa/boa_indexer - -# DirectoryCache: If DirectoryIndex doesn't exist, and DirectoryMaker -# has been commented out, the the on-the-fly indexing of Boa can be used -# to generate indexes of directories. Be warned that the output is -# extremely minimal and can cause delays when slow disks are used. -# Note: The DirectoryCache must be writable by the same user/group that -# Boa runs as. - -# DirectoryCache /var/spool/boa/dircache - -# KeepAliveMax: Number of KeepAlive requests to allow per connection -# Comment out, or set to 0 to disable keepalive processing - -KeepAliveMax 1000 - -# KeepAliveTimeout: seconds to wait before keepalive connection times out - -KeepAliveTimeout 10 - -# MimeTypes: This is the file that is used to generate mime type pairs -# and Content-Type fields for boa. -# Set to /dev/null if you do not want to load a mime types file. -# Do *not* comment out (better use AddType!) - -MimeTypes /etc/mime.types - -# DefaultType: MIME type used if the file extension is unknown, or there -# is no file extension. - -DefaultType text/plain - -# AddType: adds types without editing mime.types -# Example: AddType type extension [extension ...] - -# Uncomment the next line if you want .cgi files to execute from anywhere -#AddType application/x-httpd-cgi cgi - -# Redirect, Alias, and ScriptAlias all have the same semantics -- they -# match the beginning of a request and take appropriate action. Use -# Redirect for other servers, Alias for the same server, and ScriptAlias -# to enable directories for script execution. - -# Redirect allows you to tell clients about documents which used to exist in -# your server's namespace, but do not anymore. This allows you to tell the -# clients where to look for the relocated document. -# Example: Redirect /bar http://elsewhere/feh/bar - -# Aliases: Aliases one path to another. -# Example: Alias /path1/bar /path2/foo - -# Alias /doc /usr/doc - -# ScriptAlias: Maps a virtual path to a directory for serving scripts -# Example: ScriptAlias /htbin/ /www/htbin/ - -ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/ - diff --git a/package.bak/boa/boa.hash b/package.bak/boa/boa.hash deleted file mode 100644 index 37760fd51d..0000000000 --- a/package.bak/boa/boa.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 02c51bf25f29d56e641b662f0767759654c28d88ec31f55c5a73d57edfe13cf6 boa-0.94.14rc21.tar.gz diff --git a/package.bak/boa/boa.mk b/package.bak/boa/boa.mk deleted file mode 100644 index ab23d901cc..0000000000 --- a/package.bak/boa/boa.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# boa -# -################################################################################ - -BOA_VERSION = 0.94.14rc21 -BOA_SITE = http://www.boa.org -BOA_LICENSE = GPLv2+ -BOA_LICENSE_FILES = COPYING - -define BOA_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/src/boa $(TARGET_DIR)/usr/sbin/boa - $(INSTALL) -D -m 755 $(@D)/src/boa_indexer $(TARGET_DIR)/usr/lib/boa/boa_indexer - $(INSTALL) -D -m 644 package/boa/boa.conf $(TARGET_DIR)/etc/boa/boa.conf - $(INSTALL) -D -m 644 package/boa/mime.types $(TARGET_DIR)/etc/mime.types -endef - -$(eval $(autotools-package)) diff --git a/package.bak/boa/mime.types b/package.bak/boa/mime.types deleted file mode 100644 index 53f6ea1011..0000000000 --- a/package.bak/boa/mime.types +++ /dev/null @@ -1,205 +0,0 @@ -############################################################################### -# -# MIME-TYPES and the extensions that represent them -# -# This file is part of the "mime-support" package. Please send email (not a -# bug report) to mime-support@packages.debian.org if you would like new types -# and/or extensions to be added. -# -# Note: Compression schemes like "gzip", "bzip", and "compress" are not -# actually "mime-types". They are "encodings" and hence must _not_ have -# entries in this file to map their extensions. The "mime-type" of an -# encoded file refers to the type of data that has been encoded, not the -# type of the encoding. -# -############################################################################### - - -application/activemessage -application/andrew-inset -application/applefile -application/atomicmail -application/cu-seeme csm cu -application/dca-rft -application/dec-dx -application/dsptype tsp -application/futuresplash spl -application/ghostview -application/mac-binhex40 hqx -application/macwriteii -application/msaccess mdb -application/msword doc dot -application/news-message-id -application/news-transmission -application/octet-stream bin -application/oda oda -application/pdf pdf -application/pgp-signature pgp -application/postscript ps ai eps -application/remote-printing -application/rtf rtf -application/slate -application/vnd.ms-excel xls xlb -application/vnd.ms-powerpoint ppt pps pot -application/vnd.wap.wmlc wmlc -application/vnd.wap.wmlscriptc wmlsc -application/wita -application/wordperfect5.1 wp5 -application/zip zip -application/x-123 wk -application/x-bcpio bcpio -application/x-chess-pgn pgn -application/x-core -application/x-cpio cpio -application/x-csh -application/x-debian-package deb -application/x-director dcr dir dxr -application/x-dms dms -application/x-dvi dvi -application/x-executable -application/x-font pfa pfb gsf pcf pcf.Z -application/x-gnumeric gnumeric -application/x-gtar gtar tgz -application/x-hdf hdf -application/x-httpd-php phtml pht php -application/x-httpd-php3 php3 -application/x-httpd-php3-source phps -application/x-httpd-php3-preprocessed php3p -application/x-httpd-php4 php4 -application/x-ica ica -application/x-java class -application/x-javascript js -application/x-kdelnk -application/x-kchart chrt -application/x-killustrator kil -application/x-kpresenter kpr kpt -application/x-kspread ksp -application/x-kword kwd kwt -application/x-latex latex -application/x-lha lha -application/x-lzh lzh -application/x-lzx lzx -application/x-maker frm maker frame fm fb book fbdoc -application/x-mif mif -application/x-msdos-program com exe bat dll -application/x-msi msi -application/x-netcdf nc cdf -application/x-ns-proxy-autoconfig pac -application/x-object o -application/x-ogg ogg -application/x-oz-application oza -application/x-perl pl pm -application/x-redhat-package-manager rpm -application/x-rx -application/x-sh -application/x-shar shar -application/x-shellscript -application/x-shockwave-flash swf swfl -application/x-stuffit sit -application/x-sv4cpio sv4cpio -application/x-sv4crc sv4crc -application/x-tar tar -application/x-tcl -application/x-tex -application/x-tex-gf gf -application/x-tex-pk pk PK -application/x-texinfo texinfo texi -application/x-trash ~ % bak old sik -application/x-troff t tr roff -application/x-troff-man man -application/x-troff-me me -application/x-troff-ms ms -application/x-ustar ustar -application/x-wais-source src -application/x-wingz wz - -audio/basic au snd -audio/midi mid midi -audio/mpeg mpga mpega mp2 mp3 -audio/mpegurl m3u -audio/prs.sid sid -audio/x-aiff aif aiff aifc -audio/x-gsm gsm -audio/x-pn-realaudio ra rm ram -audio/x-wav wav - -image/bitmap bmp -image/gif gif -image/ief ief -image/jpeg jpeg jpg jpe -image/pcx pcx -image/png png -image/tiff tiff tif -image/vnd.wap.wbmp wbmp -image/x-cmu-raster ras -image/x-coreldraw cdr -image/x-coreldrawpattern pat -image/x-coreldrawtemplate cdt -image/x-corelphotopaint cpt -image/x-jng jng -image/x-portable-anymap pnm -image/x-portable-bitmap pbm -image/x-portable-graymap pgm -image/x-portable-pixmap ppm -image/x-rgb rgb -image/x-xbitmap xbm -image/x-xpixmap xpm -image/x-xwindowdump xwd - -inode/chardevice -inode/blockdevice -inode/directory-locked -inode/directory -inode/fifo -inode/socket - -message/external-body -message/news -message/partial -message/rfc822 - -multipart/alternative -multipart/appledouble -multipart/digest -multipart/mixed -multipart/parallel - -text/comma-separated-values csv -text/css css -text/english -text/html htm html xhtml -text/mathml mml -text/plain txt text diff -text/richtext rtx -text/tab-separated-values tsv -text/vnd.wap.wml wml -text/vnd.wap.wmlscript wmls -text/xml xml -text/x-c++hdr h++ hpp hxx hh -text/x-c++src c++ cpp cxx cc -text/x-chdr h -text/x-crontab -text/x-csh csh -text/x-csrc c -text/x-java java -text/x-makefile -text/x-moc moc -text/x-pascal p pas -text/x-setext etx -text/x-sh sh -text/x-tcl tcl tk -text/x-tex tex ltx sty cls -text/x-vcalendar vcs -text/x-vcard vcf - -video/dl dl -video/fli fli -video/gl gl -video/mpeg mpeg mpg mpe -video/quicktime qt mov -video/x-mng mng -video/x-ms-asf asf asx -video/x-msvideo avi -video/x-sgi-movie movie - -x-world/x-vrml vrm vrml wrl diff --git a/package.bak/bonnie/Config.in b/package.bak/bonnie/Config.in deleted file mode 100644 index 4b0adda0d0..0000000000 --- a/package.bak/bonnie/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_BONNIE - bool "bonnie++" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - help - A benchmark suite that is aimed at performing a number of - simple tests of hard drive and file system performance. - - http://www.coker.com.au/bonnie++/ - -comment "bonnie++ needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/bonnie/bonnie.hash b/package.bak/bonnie/bonnie.hash deleted file mode 100644 index acf00fdbe9..0000000000 --- a/package.bak/bonnie/bonnie.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cb3866116634bf65760b6806be4afa7e24a1cad6f145c876df8721f01ba2e2cb bonnie++-1.03e.tgz diff --git a/package.bak/bonnie/bonnie.mk b/package.bak/bonnie/bonnie.mk deleted file mode 100644 index 787d1804fa..0000000000 --- a/package.bak/bonnie/bonnie.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# bonnie -# -################################################################################ - -BONNIE_VERSION = 1.03e -BONNIE_SOURCE = bonnie++-$(BONNIE_VERSION).tgz -BONNIE_SITE = http://www.coker.com.au/bonnie++ -BONNIE_LICENSE = GPLv2 -BONNIE_LICENSE_FILES = copyright.txt - -define BONNIE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/bonnie++ $(TARGET_DIR)/usr/sbin/bonnie++ - $(INSTALL) -D -m 755 $(@D)/zcav $(TARGET_DIR)/usr/sbin/zcav -endef - -$(eval $(autotools-package)) diff --git a/package.bak/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch b/package.bak/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch deleted file mode 100644 index e8972fd726..0000000000 --- a/package.bak/boost/0001-fix-ambiguous-format-call-on-64bit-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -boost: fix ambiguous format call on 64-bit builds - -Fixes problem: - -libs/locale/src/icu/formatter.cpp: In member function -'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format::format(boost::int64_t, size_t&) const': -libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous -/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const -/ec/include/unicode/numfmt.h:330: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const -/ec/include/unicode/numfmt.h:343: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const - -Signed-off-by: Thomas De Schampheleire -Backported-from: https://svn.boost.org/trac/boost/ticket/6851 - - -diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp ---- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100 -+++ boost_1_49_0/libs/locale/src/icu/formatter.cpp 2012-05-01 14:27:54.000000000 +0100 -@@ -58,7 +58,7 @@ - virtual string_type format(int64_t value,size_t &code_points) const - { - icu::UnicodeString tmp; -- icu_fmt_->format(value,tmp); -+ icu_fmt_->format(::int64_t(value),tmp); - code_points=tmp.countChar32(); - return cvt_.std(tmp); - } diff --git a/package.bak/boost/0002-fix-uclibc-eventfd.patch b/package.bak/boost/0002-fix-uclibc-eventfd.patch deleted file mode 100644 index 1b7eb8723c..0000000000 --- a/package.bak/boost/0002-fix-uclibc-eventfd.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use eventfd() function with uClibc - -The Boost eventfd code either directly makes the eventfd system call -using __NR_eventfd (when __GLIBC_MINOR is less than 8), or otherwise -uses the eventfd() function provided by the C library. - -However, since uClibc pretends to be glibc 2.2, the Boost eventfd code -directly uses the system call. While it works fine on most -architectures, it doesn't on ARC since __NR_eventfd is not defined on -this architecture. However, eventfd() is properly implemented. - -So, this patch adjusts the logic used by Boost to consider uClibc as a -C library providing the eventfd() function. - -Signed-off-by: Thomas Petazzoni - -Index: b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -=================================================================== ---- a/boost/asio/detail/impl/eventfd_select_interrupter.ipp -+++ b/boost/asio/detail/impl/eventfd_select_interrupter.ipp -@@ -23,7 +23,7 @@ - #include - #include - #include --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - # include - #else // __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 - # include -@@ -46,7 +46,7 @@ - - void eventfd_select_interrupter::open_descriptors() - { --#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ < 8 && !defined(__UCLIBC__) - write_descriptor_ = read_descriptor_ = syscall(__NR_eventfd, 0); - if (read_descriptor_ != -1) - { diff --git a/package.bak/boost/0003-fenv.patch b/package.bak/boost/0003-fenv.patch deleted file mode 100644 index 95c769aea2..0000000000 --- a/package.bak/boost/0003-fenv.patch +++ /dev/null @@ -1,37 +0,0 @@ -Disable fenv.h in certain configurations - -The boost build system does not properly test whether fenv.h is -available, and if it is, if it supports all the features used by -Boost. This causes build failures with uClibc (reported upstream at -https://svn.boost.org/trac/boost/ticket/11756) but also with glibc on -specific architectures that don't have a full fenv implementation, -such as NIOSII or Microblaze. - -To address this, we forcefully disable the use of fenv support in the -affected configurations. - -Signed-off-by: Bernd Kuhls -[Thomas: add Microblaze/NIOSII exclusions.] -Signed-off-by: Thomas Petazzoni - -Index: b/boost/config/platform/linux.hpp -=================================================================== ---- a/boost/config/platform/linux.hpp -+++ b/boost/config/platform/linux.hpp -@@ -47,6 +47,16 @@ - #endif - - // -+// uClibc has no support for fenv.h, and also a few architectures -+// don't have fenv.h support at all (or incomplete support) even with -+// glibc. -+ -+// -+#if defined(__UCLIBC__) || defined(__nios2__) || defined(__microblaze__) -+# define BOOST_NO_FENV_H -+#endif -+ -+// - // If glibc is past version 2 then we definitely have - // gettimeofday, earlier versions may or may not have it: - // diff --git a/package.bak/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch b/package.bak/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch deleted file mode 100644 index 960f0ea2f9..0000000000 --- a/package.bak/boost/0004-fix-getchar-with-uclibc-and-gcc-bug-58952.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 4f1c6784b37a11c78fe84bb238fb7cc377ce0d36 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 30 Mar 2016 23:28:33 +0200 -Subject: [PATCH] Fix for uClibc and gcc <= 4.8.2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -getchar() is defined as a macro in uClibc. This hits gcc bug 58952 [1] for all -gcc version <= 4.8.2 and building boost/test fails: - -./boost/test/impl/unit_test_main.ipp: In function 'int boost::unit_test::unit_test_main(boost::unit_test::init_unit_test_func, int, char**)': -./boost/test/impl/unit_test_main.ipp:194:18: error: expected unqualified-id before '(' token - -To allow building boost/test with uClibc based toolchains with gcc <= 4.8.2 use -parenthesis for std::getchar. - -[1] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58952 - -Upstream status: Pending -https://github.com/boostorg/test/pull/97 - -Signed-off-by: Jörg Krause ---- - include/boost/test/impl/unit_test_main.ipp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/boost/test/impl/unit_test_main.ipp b/boost/test/impl/unit_test_main.ipp -index 1f30c02..db61930 100644 ---- a/boost/test/impl/unit_test_main.ipp -+++ b/boost/test/impl/unit_test_main.ipp -@@ -191,7 +191,9 @@ unit_test_main( init_unit_test_func init_func, int argc, char* argv[] ) - if( runtime_config::get( runtime_config::WAIT_FOR_DEBUGGER ) ) { - results_reporter::get_stream() << "Press any key to continue..." << std::endl; - -- std::getchar(); -+ // getchar is defined as a macro in uClibc. Use parenthesis to fix -+ // gcc bug 58952 for gcc <= 4.8.2. -+ (std::getchar)(); - results_reporter::get_stream() << "Continuing..." << std::endl; - } - --- -2.7.4 - diff --git a/package.bak/boost/Config.in b/package.bak/boost/Config.in deleted file mode 100644 index 403bbf3100..0000000000 --- a/package.bak/boost/Config.in +++ /dev/null @@ -1,166 +0,0 @@ -comment "boost needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - -config BR2_PACKAGE_BOOST - bool "boost" - depends on BR2_INSTALL_LIBSTDCPP - # Boost could theorically be built with threading=single, but - # that unfortunately doesn't work. Until someone fixes that, - # let's depend on threads. - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - help - A general purpose C++ library - - http://www.boost.org/ - -if BR2_PACKAGE_BOOST - -choice - prompt "Layout" - default BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - help - Selects the layout of Boost binary names - -config BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - bool "system" - help - Boost binary names do not include the Boost version number - or the name and version number of the compiler. - -config BR2_PACKAGE_BOOST_LAYOUT_TAGGED - bool "tagged" - help - Boost binary names include the encoded build properties such - as variant and threading, but do not include compiler name - and version, or Boost version. This option is useful if you - build several variants of Boost, using the same compiler. - -config BR2_PACKAGE_BOOST_LAYOUT_VERSIONED - bool "versioned" - help - Boost binary names include the Boost version number, name - and version of the compiler and encoded build properties. - -endchoice - -config BR2_PACKAGE_BOOST_LAYOUT - string - default "system" if BR2_PACKAGE_BOOST_LAYOUT_SYSTEM - default "tagged" if BR2_PACKAGE_BOOST_LAYOUT_TAGGED - default "versioned" if BR2_PACKAGE_BOOST_LAYOUT_VERSIONED - -config BR2_PACKAGE_BOOST_ATOMIC - bool "boost-atomic" - -config BR2_PACKAGE_BOOST_CHRONO - bool "boost-chrono" - -config BR2_PACKAGE_BOOST_CONTAINER - bool "boost-container" - -# see -# http://www.boost.org/doc/libs/1_59_0/libs/context/doc/html/context/architectures.html -# for the list of supported architectures. Sparc pretends to be -# supported, but it doesn't build. -config BR2_PACKAGE_BOOST_CONTEXT - bool "boost-context" - depends on ((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_i386 || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_x86_64 - -config BR2_PACKAGE_BOOST_COROUTINE - bool "boost-coroutine" - depends on BR2_PACKAGE_BOOST_CONTEXT - -config BR2_PACKAGE_BOOST_COROUTINE2 - bool "boost-coroutine2" - depends on BR2_PACKAGE_BOOST_CONTEXT - -config BR2_PACKAGE_BOOST_DATE_TIME - bool "boost-date_time" - -config BR2_PACKAGE_BOOST_EXCEPTION - bool "boost-exception" - -config BR2_PACKAGE_BOOST_FILESYSTEM - bool "boost-filesystem" - -config BR2_PACKAGE_BOOST_GRAPH - bool "boost-graph" - -config BR2_PACKAGE_BOOST_GRAPH_PARALLEL - bool "boost-graph_parallel" - -config BR2_PACKAGE_BOOST_IOSTREAMS - bool "boost-iostreams" - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_BOOST_LOCALE - bool "boost-locale" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - -config BR2_PACKAGE_BOOST_LOG - bool "boost-log" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - # for some reason, uClibc on PowerPC fails to build the boost - # log module - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) - -comment "boost-log needs a toolchain w/ NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) - -config BR2_PACKAGE_BOOST_MATH - bool "boost-math" - -config BR2_PACKAGE_BOOST_METAPARSE - depends on BR2_USE_MMU # boost-test - select BR2_PACKAGE_BOOST_TEST - bool "boost-metaparse" - -config BR2_PACKAGE_BOOST_MPI - bool "boost-mpi" - -config BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - bool "boost-program_options" - -config BR2_PACKAGE_BOOST_PYTHON - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - bool "boost-python" - -config BR2_PACKAGE_BOOST_RANDOM - bool "boost-random" - -config BR2_PACKAGE_BOOST_REGEX - bool "boost-regex" - -config BR2_PACKAGE_BOOST_SERIALIZATION - bool "boost-serialization" - -config BR2_PACKAGE_BOOST_SIGNALS - bool "boost-signals" - -config BR2_PACKAGE_BOOST_SYSTEM - bool "boost-system" - -config BR2_PACKAGE_BOOST_TEST - bool "boost-test" - depends on BR2_USE_MMU # fork() - -config BR2_PACKAGE_BOOST_THREAD - bool "boost-thread" - -config BR2_PACKAGE_BOOST_TIMER - bool "boost-timer" - -config BR2_PACKAGE_BOOST_TYPE_ERASURE - bool "boost-type_erasure" - -config BR2_PACKAGE_BOOST_WAVE - bool "boost-wave" - # limitation of assembler for coldfire - # error: Tried to convert PC relative branch to absolute jump - depends on !BR2_m68k_cf - -endif diff --git a/package.bak/boost/boost.hash b/package.bak/boost/boost.hash deleted file mode 100644 index c4af22e57f..0000000000 --- a/package.bak/boost/boost.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/boost/files/boost/1.61.0/ -md5 6095876341956f65f9d35939ccea1a9f boost_1_61_0.tar.bz2 -sha1 f84b1a1ce764108ec3c2b7bd7704cf8dfd3c9d01 boost_1_61_0.tar.bz2 diff --git a/package.bak/boost/boost.mk b/package.bak/boost/boost.mk deleted file mode 100644 index bb8d799c48..0000000000 --- a/package.bak/boost/boost.mk +++ /dev/null @@ -1,183 +0,0 @@ -################################################################################ -# -# boost -# -################################################################################ - -BOOST_VERSION = 1.61.0 -BOOST_SOURCE = boost_$(subst .,_,$(BOOST_VERSION)).tar.bz2 -BOOST_SITE = http://downloads.sourceforge.net/project/boost/boost/$(BOOST_VERSION) -BOOST_INSTALL_STAGING = YES -BOOST_LICENSE = Boost Software License 1.0 -BOOST_LICENSE_FILES = LICENSE_1_0.txt - -# keep host variant as minimal as possible -HOST_BOOST_FLAGS = --without-icu \ - --without-libraries=$(subst $(space),$(comma),atomic chrono context \ - coroutine coroutine2 date_time exception filesystem graph \ - graph_parallel iostreams locale log math mpi program_options python \ - random regex serialization signals system test thread timer type_erasure \ - wave) - -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_ATOMIC),,atomic) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CHRONO),,chrono) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTAINER),,container) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_CONTEXT),,context) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE),,coroutine) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_COROUTINE2),,coroutine2) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_DATE_TIME),,date_time) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_EXCEPTION),,exception) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_FILESYSTEM),,filesystem) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH),,graph) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_GRAPH_PARALLEL),,graph_parallel) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_IOSTREAMS),,iostreams) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOCALE),,locale) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_LOG),,log) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MATH),,math) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_METAPARSE),,metaparse) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_MPI),,mpi) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PROGRAM_OPTIONS),,program_options) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_PYTHON),,python) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_RANDOM),,random) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_REGEX),,regex) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SERIALIZATION),,serialization) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SIGNALS),,signals) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_SYSTEM),,system) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TEST),,test) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_THREAD),,thread) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TIMER),,timer) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_TYPE_ERASURE),,type_erasure) -BOOST_WITHOUT_FLAGS += $(if $(BR2_PACKAGE_BOOST_WAVE),,wave) - -BOOST_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) - -ifeq ($(BR2_PACKAGE_ICU),y) -BOOST_FLAGS += --with-icu=$(STAGING_DIR)/usr -BOOST_DEPENDENCIES += icu -else -BOOST_FLAGS += --without-icu -endif - -ifeq ($(BR2_PACKAGE_BOOST_IOSTREAMS),y) -BOOST_DEPENDENCIES += bzip2 zlib -endif - -ifeq ($(BR2_PACKAGE_BOOST_PYTHON),y) -BOOST_FLAGS += --with-python-root=$(HOST_DIR) -ifeq ($(BR2_PACKAGE_PYTHON3),y) -BOOST_FLAGS += --with-python=$(HOST_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m -BOOST_DEPENDENCIES += python3 -else -BOOST_FLAGS += --with-python=$(HOST_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR) -BOOST_TARGET_CXXFLAGS += -I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) -BOOST_DEPENDENCIES += python -endif -endif - -HOST_BOOST_OPTS += toolset=gcc threading=multi variant=release link=shared \ - runtime-link=shared - -ifeq ($(BR2_MIPS_OABI32),y) -BOOST_ABI = o32 -else ifeq ($(BR2_arm),y) -BOOST_ABI = aapcs -else -BOOST_ABI = sysv -endif - -BOOST_OPTS += toolset=gcc \ - threading=multi \ - abi=$(BOOST_ABI) \ - variant=$(if $(BR2_ENABLE_DEBUG),debug,release) - -ifeq ($(BR2_sparc64),y) -BOOST_OPTS += architecture=sparc instruction-set=ultrasparc -endif - -ifeq ($(BR2_sparc),y) -BOOST_OPTS += architecture=sparc instruction-set=v8 -endif - -# By default, Boost build and installs both the shared and static -# variants. Override that if we want static only or shared only. -ifeq ($(BR2_STATIC_LIBS),y) -BOOST_OPTS += link=static runtime-link=static -else ifeq ($(BR2_SHARED_LIBS),y) -BOOST_OPTS += link=shared runtime-link=shared -endif - -ifeq ($(BR2_PACKAGE_BOOST_LOCALE),y) -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# posix backend needs monetary.h which isn't available on uClibc -BOOST_OPTS += boost.locale.posix=off -endif - -BOOST_DEPENDENCIES += $(if $(BR2_ENABLE_LOCALE),,libiconv) -endif - -BOOST_WITHOUT_FLAGS_COMMASEPARATED += $(subst $(space),$(comma),$(strip $(BOOST_WITHOUT_FLAGS))) -BOOST_FLAGS += $(if $(BOOST_WITHOUT_FLAGS_COMMASEPARATED), --without-libraries=$(BOOST_WITHOUT_FLAGS_COMMASEPARATED)) -BOOST_LAYOUT = $(call qstrip, $(BR2_PACKAGE_BOOST_LAYOUT)) - -# how verbose should the build be? -BOOST_OPTS += $(if $(QUIET),-d,-d+1) -HOST_BOOST_OPTS += $(if $(QUIET),-d,-d+1) - -define BOOST_CONFIGURE_CMDS - (cd $(@D) && ./bootstrap.sh $(BOOST_FLAGS)) - echo "using gcc : `$(TARGET_CC) -dumpversion` : $(TARGET_CXX) : \"$(BOOST_TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > $(@D)/user-config.jam - echo "" >> $(@D)/user-config.jam -endef - -define BOOST_BUILD_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT)) -endef - -define BOOST_INSTALL_TARGET_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --prefix=$(TARGET_DIR)/usr \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install ) -endef - -define BOOST_INSTALL_STAGING_CMDS - (cd $(@D) && $(TARGET_MAKE_ENV) ./bjam -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(BOOST_OPTS) \ - --prefix=$(STAGING_DIR)/usr \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install) -endef - -define HOST_BOOST_CONFIGURE_CMDS - (cd $(@D) && ./bootstrap.sh $(HOST_BOOST_FLAGS)) - echo "using gcc : `$(HOST_CC) -dumpversion` : $(HOSTCXX) : \"$(HOST_CXXFLAGS)\" \"$(HOST_LDFLAGS)\" ;" > $(@D)/user-config.jam - echo "" >> $(@D)/user-config.jam -endef - -define HOST_BOOST_BUILD_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(HOST_BOOST_OPTS) \ - --ignore-site-config \ - --prefix=$(HOST_DIR)/usr ) -endef - -define HOST_BOOST_INSTALL_CMDS - (cd $(@D) && ./b2 -j$(PARALLEL_JOBS) -q \ - --user-config=$(@D)/user-config.jam \ - $(HOST_BOOST_OPTS) \ - --prefix=$(HOST_DIR)/usr \ - --ignore-site-config \ - --layout=$(BOOST_LAYOUT) install ) -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/bootstrap/Config.in b/package.bak/bootstrap/Config.in deleted file mode 100644 index 743d8a324a..0000000000 --- a/package.bak/bootstrap/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_BOOTSTRAP - bool "bootstrap" - help - Bootstrap is the most popular HTML, CSS, and JS framework - for developing responsive, mobile first projects on the web. - - http://getbootstrap.com diff --git a/package.bak/bootstrap/bootstrap.hash b/package.bak/bootstrap/bootstrap.hash deleted file mode 100644 index acb06b4246..0000000000 --- a/package.bak/bootstrap/bootstrap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 95ca4a02aff37570660c81a87065b53ebc281c33fa86b91a6a7a650eee10678f bootstrap-3.3.1-dist.zip diff --git a/package.bak/bootstrap/bootstrap.mk b/package.bak/bootstrap/bootstrap.mk deleted file mode 100644 index 17752ce068..0000000000 --- a/package.bak/bootstrap/bootstrap.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# bootstrap -# -################################################################################ - -BOOTSTRAP_VERSION = 3.3.1 -BOOTSTRAP_SITE = https://github.com/twbs/bootstrap/releases/download/v$(BOOTSTRAP_VERSION) -BOOTSTRAP_SOURCE = bootstrap-$(BOOTSTRAP_VERSION)-dist.zip -BOOTSTRAP_LICENSE = MIT - -define BOOTSTRAP_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(BOOTSTRAP_SOURCE) -d $(@D) -endef - -define BOOTSTRAP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap-theme.min.css \ - $(TARGET_DIR)/var/www/bootstrap/css/bootstrap-theme.min.css - $(INSTALL) -m 0644 -D $(@D)/dist/css/bootstrap.min.css \ - $(TARGET_DIR)/var/www/bootstrap/css/bootstrap.min.css - $(INSTALL) -m 0644 -D $(@D)/dist/js/bootstrap.min.js \ - $(TARGET_DIR)/var/www/bootstrap/js/bootstrap.min.js - cp -r $(@D)/dist/fonts $(TARGET_DIR)/var/www/bootstrap/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/bootutils/0001-fix-musl-compilation-issue.patch b/package.bak/bootutils/0001-fix-musl-compilation-issue.patch deleted file mode 100644 index ccb6ef61ec..0000000000 --- a/package.bak/bootutils/0001-fix-musl-compilation-issue.patch +++ /dev/null @@ -1,31 +0,0 @@ -From e4c2c18b9d1d7a6dc17d8f7705b26fc2e2efc5a9 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Sun, 30 Aug 2015 20:12:40 +0100 -Subject: [PATCH 1/1] fix musl compilation issue - -makedev(3) requires sys/types.h to be included. - -Note upstream has not issued releases since 2009. No mailing list activity -since January 2010, and even before then it seems to be mostly spam. - -Upstream-Status: dormant -Signed-off-by: Brendan Heading ---- - raidscan.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/raidscan.c b/raidscan.c -index fab3b02..3cb1a0d 100644 ---- a/raidscan.c -+++ b/raidscan.c -@@ -22,6 +22,7 @@ - #include "config.h" - - #include -+#include - #include - #include - #include --- -2.4.3 - diff --git a/package.bak/bootutils/Config.in b/package.bak/bootutils/Config.in deleted file mode 100644 index af4a170ca3..0000000000 --- a/package.bak/bootutils/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_BOOTUTILS - bool "bootutils" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - BootUtils is a collection of utilities to facilitate booting of - Linux 2.6-based systems. The process of finding the root volume - either by label or explicit label= on the kernel command line, - mounting it, and 'switchroot'ing is automated. - - http://bootutils.sourceforge.net/ diff --git a/package.bak/bootutils/bootutils.hash b/package.bak/bootutils/bootutils.hash deleted file mode 100644 index 576c324c0f..0000000000 --- a/package.bak/bootutils/bootutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 78549714e7c7fa246a4019c245f4da044aee6cfe48ad6887c4013ac4c749c7b9 bootutils-1.0.0.tar.gz diff --git a/package.bak/bootutils/bootutils.mk b/package.bak/bootutils/bootutils.mk deleted file mode 100644 index eb3cb4f4b4..0000000000 --- a/package.bak/bootutils/bootutils.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# bootutils -# -################################################################################ - -BOOTUTILS_VERSION = 1.0.0 -BOOTUTILS_SITE = http://downloads.sourceforge.net/project/bootutils/Stable/v$(BOOTUTILS_VERSION) -BOOTUTILS_CONF_OPTS = --prefix=/ --exec-prefix=/ -BOOTUTILS_LICENSE = GPLv2+ -BOOTUTILS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/botan/0001-remove-mips64-explicit-mabi.patch b/package.bak/botan/0001-remove-mips64-explicit-mabi.patch deleted file mode 100644 index 3fddd54e9a..0000000000 --- a/package.bak/botan/0001-remove-mips64-explicit-mabi.patch +++ /dev/null @@ -1,18 +0,0 @@ -Remove explicit mips64 -mabi parameter - -This breaks when building for n32 ABI on mips64. - -Signed-off-by: Baruch Siach ---- - -diff -Nuar Botan-1.10.8-orig/src/build-data/cc/gcc.txt Botan-1.10.8/src/build-data/cc/gcc.txt ---- Botan-1.10.8-orig/src/build-data/cc/gcc.txt 2014-04-10 17:11:44.000000000 +0300 -+++ Botan-1.10.8/src/build-data/cc/gcc.txt 2014-10-23 09:20:34.506722323 +0300 -@@ -92,7 +92,6 @@ - # The 'linking' bit means "use this for both compiling *and* linking" - - x86_64 -> "-m64" --mips64 -> "-mabi=64" - s390 -> "-m31" - s390x -> "-m64" - sparc32 -> "-m32 -mno-app-regs" diff --git a/package.bak/botan/Config.in b/package.bak/botan/Config.in deleted file mode 100644 index 733dc8965a..0000000000 --- a/package.bak/botan/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_powerpc64 || BR2_sparc || BR2_sh || \ - BR2_x86_64 - -config BR2_PACKAGE_BOTAN - bool "botan" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS - help - Botan is a crypto library for C++ - - http://botan.randombit.net - -comment "botan needs a toolchain w/ C++, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_BOTAN_ARCH_SUPPORTS diff --git a/package.bak/botan/botan.hash b/package.bak/botan/botan.hash deleted file mode 100644 index 3da5f690ce..0000000000 --- a/package.bak/botan/botan.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 23ec973d4b4a4fe04f490d409e08ac5638afe3aa09acd7f520daaff38ba19b90 Botan-1.10.13.tgz diff --git a/package.bak/botan/botan.mk b/package.bak/botan/botan.mk deleted file mode 100644 index 94f1edd2c8..0000000000 --- a/package.bak/botan/botan.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# botan -# -################################################################################ - -BOTAN_VERSION = 1.10.13 -BOTAN_SOURCE = Botan-$(BOTAN_VERSION).tgz -BOTAN_SITE = http://botan.randombit.net/releases -BOTAN_LICENSE = BSD-2c -BOTAN_LICENSE_FILES = doc/license.txt - -BOTAN_INSTALL_STAGING = YES - -BOTAN_CONF_OPTS = \ - --cpu=$(BR2_ARCH) \ - --os=linux \ - --cc=gcc \ - --cc-bin="$(TARGET_CXX)" \ - --prefix=/usr - -ifeq ($(BR2_STATIC_LIBS),y) -BOTAN_CONF_OPTS += --disable-shared --no-autoload -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -BOTAN_DEPENDENCIES += bzip2 -BOTAN_CONF_OPTS += --with-bzip2 -endif - -ifeq ($(BR2_PACKAGE_GMP),y) -BOTAN_DEPENDENCIES += gmp -BOTAN_CONF_OPTS += --with-gnump -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -BOTAN_DEPENDENCIES += openssl -BOTAN_CONF_OPTS += --with-openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -BOTAN_DEPENDENCIES += zlib -BOTAN_CONF_OPTS += --with-zlib -endif - -define BOTAN_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure.py $(BOTAN_CONF_OPTS)) -endef - -define BOTAN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) AR="$(TARGET_AR) crs" -endef - -define BOTAN_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)/usr" install -endef - -define BOTAN_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)/usr" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/bridge-utils/0001-build-system.patch b/package.bak/bridge-utils/0001-build-system.patch deleted file mode 100644 index f44737750b..0000000000 --- a/package.bak/bridge-utils/0001-build-system.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- bridge-utils-0.9.6/libbridge/Makefile.in.dist 2004-03-01 20:55:52.000000000 -0600 -+++ bridge-utils-0.9.6/libbridge/Makefile.in 2004-03-01 20:56:23.000000000 -0600 -@@ -5,7 +5,7 @@ - RANLIB=@RANLIB@ - - CC=@CC@ --CFLAGS = -Wall -g $(KERNEL_HEADERS) -+CFLAGS = -Wall -g @CFLAGS@ $(KERNEL_HEADERS) - - prefix=@prefix@ - exec_prefix=@exec_prefix@ diff --git a/package.bak/bridge-utils/Config.in b/package.bak/bridge-utils/Config.in deleted file mode 100644 index fb9c7df427..0000000000 --- a/package.bak/bridge-utils/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_BRIDGE_UTILS - bool "bridge-utils" - help - Manage ethernet bridging; a way to connect networks together to - form a larger network. - - https://git.kernel.org/cgit/linux/kernel/git/shemminger/bridge-utils.git/ diff --git a/package.bak/bridge-utils/bridge-utils.hash b/package.bak/bridge-utils/bridge-utils.hash deleted file mode 100644 index e699b24a63..0000000000 --- a/package.bak/bridge-utils/bridge-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/net/bridge-utils/sha256sums.asc -sha256 cc67efb5d5fb8928a6569b3fade2b4042ec17da04678dab127d96b46489e26c8 bridge-utils-1.6.tar.xz diff --git a/package.bak/bridge-utils/bridge-utils.mk b/package.bak/bridge-utils/bridge-utils.mk deleted file mode 100644 index efe57cd979..0000000000 --- a/package.bak/bridge-utils/bridge-utils.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# bridge-utils -# -################################################################################ - -BRIDGE_UTILS_VERSION = 1.6 -BRIDGE_UTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/bridge-utils -BRIDGE_UTILS_SOURCE = bridge-utils-1.6.tar.xz -BRIDGE_UTILS_AUTORECONF = YES -BRIDGE_UTILS_CONF_OPTS = --with-linux-headers=$(LINUX_HEADERS_DIR) -BRIDGE_UTILS_LICENSE = GPLv2+ -BRIDGE_UTILS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/bsdiff/0001-Add-missing-header-for-u_char.patch b/package.bak/bsdiff/0001-Add-missing-header-for-u_char.patch deleted file mode 100644 index 56affb4102..0000000000 --- a/package.bak/bsdiff/0001-Add-missing-header-for-u_char.patch +++ /dev/null @@ -1,17 +0,0 @@ -bspatch: Fix missing header for u_char - -Fixes http://autobuild.buildroot.net/results/31a/31a837cf6e34b02dce498f2b12e40d6d16a5a8e6/ - -Signed-off-by: Jörg Krause - -diff -purN bsdiff-4.3.orig/bspatch.c bsdiff-4.3/bspatch.c ---- bsdiff-4.3.orig/bspatch.c 2015-04-30 13:47:26.485903359 +0200 -+++ bsdiff-4.3/bspatch.c 2015-04-30 13:48:14.808908672 +0200 -@@ -35,6 +35,7 @@ __FBSDID("$FreeBSD: src/usr.bin/bsdiff/b - #include - #include - #include -+#include - - static off_t offtin(u_char *buf) - { diff --git a/package.bak/bsdiff/Config.in b/package.bak/bsdiff/Config.in deleted file mode 100644 index 11fd8b9d35..0000000000 --- a/package.bak/bsdiff/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BSDIFF - bool "bsdiff" - select BR2_PACKAGE_BZIP2 - help - Binary patch/diff like xdelta but creates smaller diffs. - Needs bzip2 support. - - http://www.daemonology.net/bsdiff/ diff --git a/package.bak/bsdiff/bsdiff.hash b/package.bak/bsdiff/bsdiff.hash deleted file mode 100644 index 989fcf1f12..0000000000 --- a/package.bak/bsdiff/bsdiff.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.daemonology.net/bsdiff/: -md5 e6d812394f0e0ecc8d5df255aa1db22a bsdiff-4.3.tar.gz diff --git a/package.bak/bsdiff/bsdiff.mk b/package.bak/bsdiff/bsdiff.mk deleted file mode 100644 index eb903e053f..0000000000 --- a/package.bak/bsdiff/bsdiff.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# bsdiff -# -################################################################################ - -BSDIFF_VERSION = 4.3 -BSDIFF_SITE = http://www.daemonology.net/bsdiff -BSDIFF_DEPENDENCIES = bzip2 -BSDIFF_LICENSE = BSD-2c -BSDIFF_LICENSE_FILES = bsdiff.c - -define BSDIFF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bsdiff.c -lbz2 -o $(@D)/bsdiff - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/bspatch.c -lbz2 -o $(@D)/bspatch -endef - -define BSDIFF_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/bsdiff $(TARGET_DIR)/usr/bin/bsdiff - $(INSTALL) -D -m 755 $(@D)/bspatch $(TARGET_DIR)/usr/bin/bspatch -endef - -$(eval $(generic-package)) diff --git a/package.bak/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch b/package.bak/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch deleted file mode 100644 index d861dfc80a..0000000000 --- a/package.bak/btrfs-progs/0001-Makefile.in-install-static-library-and-headers-in-in.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 2c2c2d992c3b298793983317588f73cf41675652 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 27 Jul 2016 22:49:58 +0200 -Subject: [PATCH] Makefile.in: install static library and headers in - install-static - -Currently, the install-static target only installs the statically -compiled tools. However, some programs outside of btrfs-progs (for -example docker) link with the btrfs libraries. If such programs want -to link statically against the btrfs-progs library, then this library -should be installed by "install-static". Indeed, "make install" cannot -be used if the support for shared library is not enabled. - -Signed-off-by: Thomas Petazzoni -[Gustavo: Rebase for btrfs-progs 4.7.2] -Signed-off-by: Gustavo Zacarias ---- - Makefile.in | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 19697ff..5870a58 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -219,7 +219,7 @@ test: test-fsck test-mkfs test-convert test-misc test-fuzz - # NOTE: For static compiles, you need to have all the required libs - # static equivalent available - # --static: $(progs_static) -+static: $(progs_static) $(libs_static) - - version.h: version.sh version.h.in configure.ac - @echo " [SH] $@" -@@ -384,6 +384,10 @@ install-static: $(progs_static) $(INSTALLDIRS) - done - # btrfsck is a link to btrfs in the src tree, make it so for installed file as well - $(LN_S) -f btrfs.static $(DESTDIR)$(bindir)/btrfsck.static -+ $(INSTALL) -m755 -d $(DESTDIR)$(libdir) -+ $(INSTALL) $(libs_static) $(DESTDIR)$(libdir) -+ $(INSTALL) -m755 -d $(DESTDIR)$(incdir) -+ $(INSTALL) -m644 $(headers) $(DESTDIR)$(incdir) - - $(INSTALLDIRS): - @echo "Making install in $(patsubst install-%,%,$@)" --- -2.7.3 - diff --git a/package.bak/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch b/package.bak/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch deleted file mode 100644 index 9c1173b3fe..0000000000 --- a/package.bak/btrfs-progs/0002-kerncompat.h-define-BTRFS_DISABLE_BACKTRACE-when-bui.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1fc5444f5620670bb9d293be4f92df59661e1810 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 20 Feb 2017 23:31:24 +0100 -Subject: [PATCH] kerncompat.h: define BTRFS_DISABLE_BACKTRACE when building - with uClibc - -uClibc does not provide backtrace() nor . When building -btrfs-progs, passing --disable-backtrace is enough to make it build with -uClibc. But once btrfs-progs is installed and another program/library -includes kerncompat.h, it fails to build with uClibc, because -BTRFS_DISABLE_BACKTRACE is not defined. - -The most correct fix for this would be to have kerncompat.h generated -from kerncompat.h.in during the btrfs-progs build process, and tuned -depending on autoconf/automake variables. But as a quick fix that -follows the current strategy, we simply tweak the existing __GLIBC__ -conditional. Indeed, uClibc pretends to be glibc and defines __GLIBC__, -but it does not replace it completely, hence the need to define -BTRFS_DISABLE_BACKTRACE when __GLIBC__ is not defined *or* when -__UCLIBC__ is defined. - -Signed-off-by: Thomas Petazzoni ---- - kerncompat.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kerncompat.h b/kerncompat.h -index 0f207b7..e47d164 100644 ---- a/kerncompat.h -+++ b/kerncompat.h -@@ -32,7 +32,7 @@ - - #include - --#ifndef __GLIBC__ -+#if !defined(__GLIBC__) || defined(__UCLIBC__) - #ifndef BTRFS_DISABLE_BACKTRACE - #define BTRFS_DISABLE_BACKTRACE - #endif --- -2.7.4 - diff --git a/package.bak/btrfs-progs/Config.in b/package.bak/btrfs-progs/Config.in deleted file mode 100644 index ad86bab580..0000000000 --- a/package.bak/btrfs-progs/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_BTRFS_PROGS - bool "btrfs-progs" - depends on BR2_USE_MMU # util-linux - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_E2FSPROGS - select BR2_PACKAGE_LZO - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_ZLIB - help - Btrfs filesystem utilities - - https://btrfs.wiki.kernel.org/index.php/Main_Page - -comment "btrfs-progs needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/btrfs-progs/btrfs-progs.hash b/package.bak/btrfs-progs/btrfs-progs.hash deleted file mode 100644 index f9809289b0..0000000000 --- a/package.bak/btrfs-progs/btrfs-progs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 464a9bfd2b5eda76b0246ee0a4043f4de8d17c10312bc8b84abc5fbf9317fede btrfs-progs-v4.9.1.tar.xz diff --git a/package.bak/btrfs-progs/btrfs-progs.mk b/package.bak/btrfs-progs/btrfs-progs.mk deleted file mode 100644 index f73397ca8e..0000000000 --- a/package.bak/btrfs-progs/btrfs-progs.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# btrfs-progs -# -################################################################################ - -BTRFS_PROGS_VERSION = 4.9.1 -BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs -BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz -BTRFS_PROGS_DEPENDENCIES = host-pkgconf e2fsprogs lzo util-linux zlib -BTRFS_PROGS_CONF_OPTS = --disable-backtrace -BTRFS_PROGS_LICENSE = GPLv2 -BTRFS_PROGS_LICENSE_FILES = COPYING -BTRFS_PROGS_INSTALL_STAGING = YES - -# Doesn't autodetect static-only and tries to build both -ifeq ($(BR2_STATIC_LIBS),y) -BTRFS_PROGS_MAKE_OPTS = static -BTRFS_PROGS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static -BTRFS_PROGS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static -endif - -$(eval $(autotools-package)) diff --git a/package.bak/bullet/Config.in b/package.bak/bullet/Config.in deleted file mode 100644 index d4d69d2c9e..0000000000 --- a/package.bak/bullet/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_BULLET - bool "bullet" - depends on BR2_INSTALL_LIBSTDCPP - # Affected by - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68476 - depends on !BR2_microblaze - help - Bullet is a Collision Detection and Rigid Body Dynamics - Library. - - http://bulletphysics.org - -comment "bullet needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on !BR2_microblaze diff --git a/package.bak/bullet/bullet.hash b/package.bak/bullet/bullet.hash deleted file mode 100644 index cccc42580e..0000000000 --- a/package.bak/bullet/bullet.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6e157c0b50373bc0e860de27f06397827bb28a4205bc568ae79d76a0f919ed62 bullet-2.85.1.tar.gz diff --git a/package.bak/bullet/bullet.mk b/package.bak/bullet/bullet.mk deleted file mode 100644 index 99ff423632..0000000000 --- a/package.bak/bullet/bullet.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# bullet -# -################################################################################ - -BULLET_VERSION = 2.85.1 -BULLET_SITE = $(call github,bulletphysics,bullet3,$(BULLET_VERSION)) -BULLET_INSTALL_STAGING = YES -BULLET_LICENSE = zlib license -BULLET_LICENSE_FILES = LICENSE.txt - -# Disable demos apps and unit tests. -# Disable Bullet3 library. -BULLET_CONF_OPTS = -DBUILD_UNIT_TESTS=OFF \ - -DBUILD_BULLET2_DEMOS=OFF \ - -DBUILD_BULLET3=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/bustle/Config.in b/package.bak/bustle/Config.in deleted file mode 100644 index f213da503e..0000000000 --- a/package.bak/bustle/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_BUSTLE - bool "bustle" - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_PACKAGE_DBUS # runtime - help - Bustle is a better dbus-monitor! It records and draws - sequence diagrams of D-Bus activity, showing signal - emissions, method calls and their corresponding returns, - with timestamps for each individual event and the duration - of each method call. This can help you check for unwanted - D-Bus traffic, and pinpoint why your D-Bus-based application - isn't performing as well as you like. - - This only installs the command line bustle-pcap tool, not - the graphical viewer. - - http://www.willthompson.co.uk/bustle/ - -comment "bustle needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_DBUS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/bustle/bustle.hash b/package.bak/bustle/bustle.hash deleted file mode 100644 index 9c6df56718..0000000000 --- a/package.bak/bustle/bustle.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6c76cb5182c20b8ce7d6911f8aebc4fae43f919e747a003f1a66698628b27682 bustle-0.4.3.tar.gz diff --git a/package.bak/bustle/bustle.mk b/package.bak/bustle/bustle.mk deleted file mode 100644 index 0b85536ea9..0000000000 --- a/package.bak/bustle/bustle.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# bustle -# -################################################################################ - -BUSTLE_VERSION = 0.4.3 -BUSTLE_SITE = http://www.willthompson.co.uk/bustle/releases/$(BUSTLE_VERSION) -BUSTLE_LICENSE = LGPLv2.1+ -BUSTLE_LICENSE_FILES = LICENSE -BUSTLE_DEPENDENCIES = libglib2 libpcap host-pkgconf - -BUSTLE_PCAP_FLAGS = "-lpcap" -ifeq ($(BR2_STATIC_LIBS),y) -BUSTLE_PCAP_FLAGS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -endif - -define BUSTLE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PCAP_FLAGS="$(BUSTLE_PCAP_FLAGS)" -C $(@D) dist/build/bustle-pcap -endef - -define BUSTLE_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/dist/build/bustle-pcap \ - $(TARGET_DIR)/usr/bin/bustle-pcap -endef - -$(eval $(generic-package)) diff --git a/package.bak/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch b/package.bak/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch deleted file mode 100644 index 3aabc96053..0000000000 --- a/package.bak/busybox/0001-networking-libiproute-use-linux-if_packet.h-instead-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d4fec31889ad660a58dab633c511221feb66e817 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 5 Oct 2013 15:55:06 +0200 -Subject: [PATCH] networking/libiproute: use instead of - - -The musl C library doesn't provide the since the -corresponding kernel headers already provides the -necessary definitions. Replacing by - also removes the need to include - - -This commit fixes the build of iplink with the musl C library. - -Signed-off-by: Thomas Petazzoni -[Gustavo: update for busybox 1.22.0] - -diff -Nura busybox-1.22.0.orig/networking/libiproute/iplink.c busybox-1.22.0/networking/libiproute/iplink.c ---- busybox-1.22.0.orig/networking/libiproute/iplink.c 2014-01-01 09:42:40.301137882 -0300 -+++ busybox-1.22.0/networking/libiproute/iplink.c 2014-01-01 09:43:01.282827700 -0300 -@@ -7,7 +7,7 @@ - */ - #include - /*#include - not needed? */ --#include -+#include - #include - - #include diff --git a/package.bak/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch b/package.bak/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch deleted file mode 100644 index 105626cbe2..0000000000 --- a/package.bak/busybox/0002-Makefile.flags-strip-non-l-arguments-returned-by-pkg.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 67eb23d2be8aba3c474dac81a15b0fa11e5847b7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 25 Nov 2013 22:51:53 +0100 -Subject: [PATCH] Makefile.flags: strip non -l arguments returned by pkg-config - -Signed-off-by: Thomas Petazzoni ---- - Makefile.flags | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.flags b/Makefile.flags -index 307afa7..885e323 100644 ---- a/Makefile.flags -+++ b/Makefile.flags -@@ -141,7 +141,9 @@ ifeq ($(CONFIG_SELINUX),y) - SELINUX_PC_MODULES = libselinux libsepol - $(eval $(call pkg_check_modules,SELINUX,$(SELINUX_PC_MODULES))) - CPPFLAGS += $(SELINUX_CFLAGS) --LDLIBS += $(if $(SELINUX_LIBS),$(SELINUX_LIBS:-l%=%),$(SELINUX_PC_MODULES:lib%=%)) -+LDLIBS += $(if $(SELINUX_LIBS),\ -+ $(patsubst -l%,%,$(filter -l%,$(SELINUX_LIBS))),\ -+ $(SELINUX_PC_MODULES:lib%=%)) - endif - - ifeq ($(CONFIG_EFENCE),y) --- -1.8.1.2 - diff --git a/package.bak/busybox/Config.in b/package.bak/busybox/Config.in deleted file mode 100644 index 504cd8a65a..0000000000 --- a/package.bak/busybox/Config.in +++ /dev/null @@ -1,89 +0,0 @@ -config BR2_PACKAGE_BUSYBOX - bool "BusyBox" - default y - help - The Swiss Army Knife of embedded Linux. It slices, it dices, it - makes Julian Fries. - - http://busybox.net/ - - Most people will answer Y. - -if BR2_PACKAGE_BUSYBOX - -config BR2_PACKAGE_BUSYBOX_CONFIG - string "BusyBox configuration file to use?" - default "package/busybox/busybox.config" - help - Some people may wish to use their own modified BusyBox configuration - file, and will specify their config file location with this option. - - Most people will just use the default BusyBox configuration file. - -config BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES - string "Additional BusyBox configuration fragment files" - help - A space-separated list of configuration fragment files, - that will be merged to the main BusyBox configuration file. - -# This option is not an option of Busybox, it can be selected even -# if Busybox is not enabled. -config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - bool "Show packages that are also provided by busybox" - help - Show packages in menuconfig that are potentially also provided - by busybox. - -config BR2_PACKAGE_BUSYBOX_SELINUX - select BR2_PACKAGE_LIBSELINUX - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_arc - bool "Enable SELinux support" - help - Enable SELinux support in BusyBox. Please note that - depending on your BusyBox configuration and the SELinux - policy implementation, you may want to also enable - BR2_PACKAGE_BUSYBOX_INDIVIDUAL_BINARIES. - - For instance, if your BusyBox configuration only uses a - couple of minor BusyBox features, such as simple command - line utilities, the symlinked version of BusyBox can be used - to save space. If BusyBox provides more features, such as - crond, then individual binaries have to be enabled for the - SELinux type transitions to occur properly. - -config BR2_PACKAGE_BUSYBOX_WATCHDOG - bool "Install the watchdog daemon startup script" - help - Install the watchdog daemon startup script, - that just start at the boot the busybox watchdog daemon. - -if BR2_PACKAGE_BUSYBOX_WATCHDOG - -config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD - string "Delay between reset" - default "5" - help - Select the number of seconds between each - reset of the watchdog (default 5) - - Use ms suffix to specify milliseconds (e.g. 500ms) - -endif - -endif - -if !BR2_PACKAGE_BUSYBOX # kconfig doesn't support else - -comment "You may need to enable other packages to get a working system" -comment "You better know what you're doing!" - -# This option is not an option of Busybox, it can be selected even if -# Busybox is not enabled. This dummy option ensures that packages that -# depend on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS are visible when Busybox -# is disabled. -config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - default y -endif diff --git a/package.bak/busybox/S01logging b/package.bak/busybox/S01logging deleted file mode 100644 index 4632a4cc99..0000000000 --- a/package.bak/busybox/S01logging +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Start logging -# - -SYSLOGD_ARGS=-n -KLOGD_ARGS=-n -[ -r /etc/default/logging ] && . /etc/default/logging - -start() { - printf "Starting logging: " - start-stop-daemon -b -S -q -m -p /var/run/syslogd.pid --exec /sbin/syslogd -- $SYSLOGD_ARGS - start-stop-daemon -b -S -q -m -p /var/run/klogd.pid --exec /sbin/klogd -- $KLOGD_ARGS - echo "OK" -} - -stop() { - printf "Stopping logging: " - start-stop-daemon -K -q -p /var/run/syslogd.pid - start-stop-daemon -K -q -p /var/run/klogd.pid - echo "OK" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/busybox/S10mdev b/package.bak/busybox/S10mdev deleted file mode 100644 index 63ca955b1c..0000000000 --- a/package.bak/busybox/S10mdev +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Start mdev.... -# - -case "$1" in - start) - echo "Starting mdev..." - echo /sbin/mdev >/proc/sys/kernel/hotplug - /sbin/mdev -s - # coldplug modules - find /sys/ -name modalias -print0 | xargs -0 sort -u -z | xargs -0 modprobe -abq - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/busybox/S15watchdog b/package.bak/busybox/S15watchdog deleted file mode 100644 index 470c6d7301..0000000000 --- a/package.bak/busybox/S15watchdog +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Start watchdog -# - -case "$1" in - start) - echo "Starting watchdog..." - watchdog -t PERIOD /dev/watchdog - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/busybox/S50telnet b/package.bak/busybox/S50telnet deleted file mode 100755 index 82952b8cb8..0000000000 --- a/package.bak/busybox/S50telnet +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Start telnet.... -# - -TELNETD_ARGS=-F -[ -r /etc/default/telnet ] && . /etc/default/telnet - -start() { - printf "Starting telnetd: " - start-stop-daemon -S -q -m -b -p /var/run/telnetd.pid \ - -x /usr/sbin/telnetd -- $TELNETD_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping telnetd: " - start-stop-daemon -K -q -p /var/run/telnetd.pid \ - -x /usr/sbin/telnetd - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/busybox/busybox-minimal.config b/package.bak/busybox/busybox-minimal.config deleted file mode 100644 index 2abf458b78..0000000000 --- a/package.bak/busybox/busybox-minimal.config +++ /dev/null @@ -1,1084 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.26.0 -# Thu Dec 29 21:13:55 2016 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# -# CONFIG_DESKTOP is not set -# CONFIG_EXTRA_COMPAT is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -# CONFIG_SHOW_USAGE is not set -# CONFIG_FEATURE_VERBOSE_USAGE is not set -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_PAM is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -CONFIG_FEATURE_CLEAN_UP=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_PID_FILE_PATH="" -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set - -# -# Build Options -# -CONFIG_STATIC=y -# CONFIG_PIE is not set -CONFIG_NOMMU=y -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_DEBUG_SANITIZE is not set -# CONFIG_UNIT_TEST is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Busybox Library Tuning -# -# CONFIG_FEATURE_USE_BSS_TAIL is not set -CONFIG_FEATURE_RTMINMAX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SMALL=1 -CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=999 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -CONFIG_FEATURE_REVERSE_SEARCH=y -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_UNICODE_SUPPORT is not set -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=0 -CONFIG_LAST_SUPPORTED_WCHAR=0 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -# CONFIG_AR is not set -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -# CONFIG_FEATURE_AR_CREATE is not set -# CONFIG_UNCOMPRESS is not set -# CONFIG_GUNZIP is not set -CONFIG_ZCAT=y -# CONFIG_FEATURE_GUNZIP_LONG_OPTIONS is not set -# CONFIG_BUNZIP2 is not set -CONFIG_BZCAT=y -# CONFIG_UNLZMA is not set -CONFIG_LZCAT=y -# CONFIG_LZMA is not set -# CONFIG_FEATURE_LZMA_FAST is not set -# CONFIG_UNXZ is not set -CONFIG_XZCAT=y -# CONFIG_XZ is not set -# CONFIG_BZIP2 is not set -# CONFIG_CPIO is not set -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -# CONFIG_GZIP is not set -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -CONFIG_GZIP_FAST=0 -# CONFIG_FEATURE_GZIP_LEVELS is not set -# CONFIG_LZOP is not set -CONFIG_UNLZOP=y -CONFIG_LZOPCAT=y -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -# CONFIG_TAR is not set -# CONFIG_FEATURE_TAR_CREATE is not set -# CONFIG_FEATURE_TAR_AUTODETECT is not set -# CONFIG_FEATURE_TAR_FROM is not set -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_GNU_EXTENSIONS is not set -# CONFIG_FEATURE_TAR_LONG_OPTIONS is not set -# CONFIG_FEATURE_TAR_TO_COMMAND is not set -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -# CONFIG_UNZIP is not set - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -CONFIG_CKSUM=y -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_FEATURE_DD_STATUS=y -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -# CONFIG_GROUPS is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -# CONFIG_SHUF is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_FEATURE_STAT_FILESYSTEM is not set -CONFIG_STTY=y -# CONFIG_SUM is not set -CONFIG_SYNC=y -# CONFIG_FEATURE_SYNC_FANCY is not set -# CONFIG_TAC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_TEST1=y -CONFIG_TEST2=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TRUNCATE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNAME_OSNAME="GNU/Linux" -CONFIG_UNIQ=y -CONFIG_UNLINK=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -# CONFIG_BASE64 is not set -CONFIG_UUENCODE=y -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y -CONFIG_WHO=y -# CONFIG_USERS is not set -CONFIG_YES=y - -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Console Utilities -# -# CONFIG_CHVT is not set -# CONFIG_CLEAR is not set -# CONFIG_DEALLOCVT is not set -# CONFIG_DUMPKMAP is not set -# CONFIG_FGCONSOLE is not set -# CONFIG_KBD_MODE is not set -# CONFIG_LOADFONT is not set -# CONFIG_SETFONT is not set -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" -# CONFIG_FEATURE_LOADFONT_PSF2 is not set -# CONFIG_FEATURE_LOADFONT_RAW is not set -# CONFIG_LOADKMAP is not set -# CONFIG_OPENVT is not set -# CONFIG_RESET is not set -# CONFIG_RESIZE is not set -# CONFIG_FEATURE_RESIZE_PRINT is not set -# CONFIG_SETCONSOLE is not set -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -# CONFIG_SETKEYCODES is not set -# CONFIG_SETLOGCONS is not set -# CONFIG_SHOWKEY is not set - -# -# Debian Utilities -# -# CONFIG_MKTEMP is not set -# CONFIG_PIPE_PROGRESS is not set -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -CONFIG_FEATURE_RUN_PARTS_FANCY=y -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -# CONFIG_AWK is not set -# CONFIG_FEATURE_AWK_LIBM is not set -# CONFIG_FEATURE_AWK_GNU_EXTENSIONS is not set -# CONFIG_CMP is not set -# CONFIG_DIFF is not set -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -# CONFIG_FEATURE_DIFF_DIR is not set -# CONFIG_ED is not set -# CONFIG_PATCH is not set -CONFIG_SED=y -# CONFIG_VI is not set -CONFIG_FEATURE_VI_MAX_LEN=0 -# CONFIG_FEATURE_VI_8BIT is not set -# CONFIG_FEATURE_VI_COLON is not set -# CONFIG_FEATURE_VI_YANKMARK is not set -# CONFIG_FEATURE_VI_SEARCH is not set -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -# CONFIG_FEATURE_VI_USE_SIGNALS is not set -# CONFIG_FEATURE_VI_DOT_CMD is not set -# CONFIG_FEATURE_VI_READONLY is not set -# CONFIG_FEATURE_VI_SETOPTS is not set -# CONFIG_FEATURE_VI_SET is not set -# CONFIG_FEATURE_VI_WIN_RESIZE is not set -# CONFIG_FEATURE_VI_ASK_TERMINAL is not set -# CONFIG_FEATURE_VI_UNDO is not set -# CONFIG_FEATURE_VI_UNDO_QUEUE is not set -CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=0 -# CONFIG_FEATURE_ALLOW_EXEC is not set - -# -# Finding Utilities -# -# CONFIG_FIND is not set -# CONFIG_FEATURE_FIND_PRINT0 is not set -# CONFIG_FEATURE_FIND_MTIME is not set -# CONFIG_FEATURE_FIND_MMIN is not set -# CONFIG_FEATURE_FIND_PERM is not set -# CONFIG_FEATURE_FIND_TYPE is not set -# CONFIG_FEATURE_FIND_XDEV is not set -# CONFIG_FEATURE_FIND_MAXDEPTH is not set -# CONFIG_FEATURE_FIND_NEWER is not set -# CONFIG_FEATURE_FIND_INUM is not set -# CONFIG_FEATURE_FIND_EXEC is not set -# CONFIG_FEATURE_FIND_EXEC_PLUS is not set -# CONFIG_FEATURE_FIND_USER is not set -# CONFIG_FEATURE_FIND_GROUP is not set -# CONFIG_FEATURE_FIND_NOT is not set -# CONFIG_FEATURE_FIND_DEPTH is not set -# CONFIG_FEATURE_FIND_PAREN is not set -# CONFIG_FEATURE_FIND_SIZE is not set -# CONFIG_FEATURE_FIND_PRUNE is not set -# CONFIG_FEATURE_FIND_DELETE is not set -# CONFIG_FEATURE_FIND_PATH is not set -# CONFIG_FEATURE_FIND_REGEX is not set -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_EGREP=y -CONFIG_FGREP=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y -CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -CONFIG_POWEROFF=y -CONFIG_REBOOT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -CONFIG_LINUXRC=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=0 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y -CONFIG_MESG=y -CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set -# CONFIG_ADDGROUP is not set -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_LAST_ID=60000 -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 -# CONFIG_CHPASSWD is not set -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="des" -# CONFIG_CRYPTPW is not set -# CONFIG_MKPASSWD is not set -# CONFIG_DELUSER is not set -# CONFIG_DELGROUP is not set -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -CONFIG_GETTY=y -CONFIG_LOGIN=y -# CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -# CONFIG_SU is not set -# CONFIG_FEATURE_SU_SYSLOG is not set -# CONFIG_FEATURE_SU_CHECKS_SHELLS is not set -# CONFIG_SULOGIN is not set -# CONFIG_VLOCK is not set - -# -# Linux Ext2 FS Progs -# -# CONFIG_CHATTR is not set -# CONFIG_FSCK is not set -# CONFIG_LSATTR is not set -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_DEPMOD is not set -# CONFIG_INSMOD is not set -# CONFIG_LSMOD is not set -# CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT is not set -# CONFIG_MODINFO is not set -# CONFIG_MODPROBE is not set -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -# CONFIG_RMMOD is not set - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -# CONFIG_FEATURE_CHECK_TAINTED_MODULE is not set -# CONFIG_FEATURE_MODUTILS_ALIAS is not set -# CONFIG_FEATURE_MODUTILS_SYMBOLS is not set -CONFIG_DEFAULT_MODULES_DIR="" -CONFIG_DEFAULT_DEPMOD_FILE="" - -# -# Linux System Utilities -# -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKDISCARD is not set -# CONFIG_BLKID is not set -# CONFIG_FEATURE_BLKID_TYPE is not set -# CONFIG_BLOCKDEV is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FATATTR is not set -# CONFIG_FBSET is not set -# CONFIG_FEATURE_FBSET_FANCY is not set -# CONFIG_FEATURE_FBSET_READMODE is not set -# CONFIG_FDFORMAT is not set -# CONFIG_FDISK is not set -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -# CONFIG_FEATURE_FDISK_WRITABLE is not set -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -# CONFIG_FEATURE_GPT_LABEL is not set -# CONFIG_FEATURE_FDISK_ADVANCED is not set -# CONFIG_FINDFS is not set -# CONFIG_FLOCK is not set -# CONFIG_FDFLUSH is not set -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -# CONFIG_FSTRIM is not set -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -# CONFIG_HEXDUMP is not set -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -# CONFIG_HWCLOCK is not set -# CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS is not set -# CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS is not set -# CONFIG_IPCRM is not set -# CONFIG_IPCS is not set -# CONFIG_LOSETUP is not set -# CONFIG_LSPCI is not set -# CONFIG_LSUSB is not set -# CONFIG_MDEV is not set -# CONFIG_FEATURE_MDEV_CONF is not set -# CONFIG_FEATURE_MDEV_RENAME is not set -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -# CONFIG_FEATURE_MDEV_EXEC is not set -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKE2FS=y -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -CONFIG_MKDOSFS=y -# CONFIG_MKFS_VFAT is not set -# CONFIG_MKSWAP is not set -# CONFIG_FEATURE_MKSWAP_UUID is not set -CONFIG_MORE=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_FEATURE_MOUNT_OTHERTAB=y -# CONFIG_NSENTER is not set -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set -# CONFIG_PIVOT_ROOT is not set -# CONFIG_RDATE is not set -# CONFIG_RDEV is not set -# CONFIG_READPROFILE is not set -# CONFIG_REV is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -# CONFIG_SETARCH is not set -CONFIG_LINUX32=y -CONFIG_LINUX64=y -CONFIG_SWAPON=y -# CONFIG_FEATURE_SWAPON_DISCARD is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWAPOFF=y -# CONFIG_SWITCH_ROOT is not set -# CONFIG_UEVENT is not set -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y -# CONFIG_UNSHARE is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_BCACHE is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -# CONFIG_FEATURE_VOLUMEID_EXFAT is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set -# CONFIG_FEATURE_VOLUMEID_F2FS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_NILFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -# CONFIG_FEATURE_VOLUMEID_UBIFS is not set -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -# CONFIG_CHRT is not set -# CONFIG_CONSPY is not set -# CONFIG_CROND is not set -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="" -# CONFIG_CRONTAB is not set -# CONFIG_DC is not set -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -# CONFIG_DEVMEM is not set -# CONFIG_EJECT is not set -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -# CONFIG_HDPARM is not set -# CONFIG_FEATURE_HDPARM_GET_IDENTITY is not set -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -# CONFIG_I2CGET is not set -# CONFIG_I2CSET is not set -# CONFIG_I2CDUMP is not set -# CONFIG_I2CDETECT is not set -# CONFIG_INOTIFYD is not set -# CONFIG_IONICE is not set -# CONFIG_LAST is not set -# CONFIG_FEATURE_LAST_FANCY is not set -# CONFIG_LESS is not set -CONFIG_FEATURE_LESS_MAXLINES=0 -# CONFIG_FEATURE_LESS_BRACKETS is not set -# CONFIG_FEATURE_LESS_FLAGS is not set -# CONFIG_FEATURE_LESS_TRUNCATE is not set -# CONFIG_FEATURE_LESS_MARKS is not set -# CONFIG_FEATURE_LESS_REGEXP is not set -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -# CONFIG_MAKEDEVS is not set -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -# CONFIG_FEATURE_MAKEDEVS_TABLE is not set -# CONFIG_MAN is not set -# CONFIG_MICROCOM is not set -# CONFIG_MOUNTPOINT is not set -# CONFIG_MT is not set -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -# CONFIG_RUNLEVEL is not set -# CONFIG_RX is not set -CONFIG_SETSERIAL=y -# CONFIG_SETSID is not set -# CONFIG_STRINGS is not set -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -# CONFIG_TIME is not set -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -# CONFIG_UBIRENAME is not set -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -# CONFIG_WATCHDOG is not set - -# -# Networking Utilities -# -# CONFIG_FEATURE_IPV6 is not set -# CONFIG_FEATURE_UNIX_LOCAL is not set -# CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -# CONFIG_ARP is not set -# CONFIG_ARPING is not set -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -# CONFIG_DNSD is not set -# CONFIG_ETHER_WAKE is not set -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTPD_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -CONFIG_DNSDOMAINNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -# CONFIG_FEATURE_IFCONFIG_SLIP is not set -# CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ is not set -CONFIG_FEATURE_IFCONFIG_HW=y -CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS=y -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -CONFIG_IFUP=y -CONFIG_IFDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN=y -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -# CONFIG_FEATURE_IFUPDOWN_IPV6 is not set -# CONFIG_FEATURE_IFUPDOWN_MAPPING is not set -CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP=y -# CONFIG_INETD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME is not set -# CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN is not set -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" -# CONFIG_FEATURE_IP_TUNNEL is not set -# CONFIG_FEATURE_IP_RULE is not set -# CONFIG_FEATURE_IP_NEIGH is not set -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -# CONFIG_IPTUNNEL is not set -# CONFIG_IPRULE is not set -# CONFIG_IPNEIGH is not set -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_FAKEIDENTD is not set -# CONFIG_NAMEIF is not set -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -CONFIG_NC=y -CONFIG_NC_SERVER=y -# CONFIG_NC_EXTRA is not set -# CONFIG_NC_110_COMPAT is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -CONFIG_FEATURE_NETSTAT_PRG=y -# CONFIG_NSLOOKUP is not set -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_FEATURE_NTPD_CONF is not set -CONFIG_PING=y -# CONFIG_PING6 is not set -# CONFIG_FEATURE_FANCY_PING is not set -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -# CONFIG_TFTP is not set -# CONFIG_TFTPD is not set -# CONFIG_FEATURE_TFTP_GET is not set -# CONFIG_FEATURE_TFTP_PUT is not set -# CONFIG_FEATURE_TFTP_BLOCKSIZE is not set -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -# CONFIG_TRACEROUTE is not set -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -# CONFIG_VCONFIG is not set -CONFIG_WGET=y -# CONFIG_FEATURE_WGET_STATUSBAR is not set -# CONFIG_FEATURE_WGET_AUTHENTICATION is not set -# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set -# CONFIG_FEATURE_WGET_TIMEOUT is not set -# CONFIG_FEATURE_WGET_OPENSSL is not set -# CONFIG_FEATURE_WGET_SSL_HELPER is not set -# CONFIG_WHOIS is not set -# CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" -CONFIG_UDHCPC=y -# CONFIG_FEATURE_UDHCPC_ARPING is not set -CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=9 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -# CONFIG_FEATURE_UDHCP_8021Q is not set -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" - -# -# Process Utilities -# -# CONFIG_FREE is not set -# CONFIG_FUSER is not set -# CONFIG_IOSTAT is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -# CONFIG_LSOF is not set -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -# CONFIG_PKILL is not set -# CONFIG_PIDOF is not set -# CONFIG_FEATURE_PIDOF_SINGLE is not set -# CONFIG_FEATURE_PIDOF_OMIT is not set -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -CONFIG_PS=y -CONFIG_FEATURE_PS_WIDE=y -CONFIG_FEATURE_PS_LONG=y -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -# CONFIG_RENICE is not set -# CONFIG_SMEMCAP is not set -# CONFIG_BB_SYSCTL is not set -# CONFIG_TOP is not set -# CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE is not set -# CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS is not set -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -# CONFIG_UPTIME is not set -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -# CONFIG_WATCH is not set -# CONFIG_FEATURE_SHOW_THREADS is not set - -# -# Runit Utilities -# -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -CONFIG_SVC=y -# CONFIG_SVLOGD is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SESTATUS is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_RESTORECON is not set -# CONFIG_SETSEBOOL is not set - -# -# Shells -# -# CONFIG_ASH is not set -# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set -# CONFIG_ASH_INTERNAL_GLOB is not set -# CONFIG_ASH_RANDOM_SUPPORT is not set -# CONFIG_ASH_EXPAND_PRMT is not set -# CONFIG_ASH_BASH_COMPAT is not set -# CONFIG_ASH_IDLE_TIMEOUT is not set -# CONFIG_ASH_JOB_CONTROL is not set -# CONFIG_ASH_ALIAS is not set -# CONFIG_ASH_GETOPTS is not set -# CONFIG_ASH_BUILTIN_ECHO is not set -# CONFIG_ASH_BUILTIN_PRINTF is not set -# CONFIG_ASH_BUILTIN_TEST is not set -# CONFIG_ASH_HELP is not set -# CONFIG_ASH_CMDCMD is not set -# CONFIG_ASH_MAIL is not set -# CONFIG_CTTYHACK is not set -CONFIG_HUSH=y -CONFIG_HUSH_BASH_COMPAT=y -CONFIG_HUSH_BRACE_EXPANSION=y -CONFIG_HUSH_HELP=y -CONFIG_HUSH_INTERACTIVE=y -CONFIG_HUSH_SAVEHISTORY=y -CONFIG_HUSH_JOB=y -CONFIG_HUSH_TICK=y -CONFIG_HUSH_IF=y -CONFIG_HUSH_LOOPS=y -CONFIG_HUSH_CASE=y -CONFIG_HUSH_FUNCTIONS=y -CONFIG_HUSH_LOCAL=y -CONFIG_HUSH_RANDOM_SUPPORT=y -CONFIG_HUSH_EXPORT_N=y -CONFIG_HUSH_MODE_X=y -# CONFIG_MSH is not set -# CONFIG_FEATURE_SH_IS_ASH is not set -CONFIG_FEATURE_SH_IS_HUSH=y -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -# CONFIG_KLOGD is not set -# CONFIG_FEATURE_KLOGD_KLOGCTL is not set -# CONFIG_LOGGER is not set -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -# CONFIG_SYSLOGD is not set -# CONFIG_FEATURE_ROTATE_LOGFILE is not set -# CONFIG_FEATURE_REMOTE_LOG is not set -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=0 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_FEATURE_KMSG_SYSLOG is not set diff --git a/package.bak/busybox/busybox.config b/package.bak/busybox/busybox.config deleted file mode 100644 index c45de21808..0000000000 --- a/package.bak/busybox/busybox.config +++ /dev/null @@ -1,1096 +0,0 @@ -# -# Automatically generated make config: don't edit -# Busybox version: 1.26.0 -# Thu Dec 29 21:01:56 2016 -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Busybox Settings -# -CONFIG_DESKTOP=y -# CONFIG_EXTRA_COMPAT is not set -CONFIG_INCLUDE_SUSv2=y -# CONFIG_USE_PORTABLE_CODE is not set -CONFIG_PLATFORM_LINUX=y -CONFIG_SHOW_USAGE=y -CONFIG_FEATURE_VERBOSE_USAGE=y -# CONFIG_FEATURE_COMPRESS_USAGE is not set -CONFIG_BUSYBOX=y -CONFIG_FEATURE_INSTALLER=y -# CONFIG_INSTALL_NO_USR is not set -# CONFIG_PAM is not set -CONFIG_LONG_OPTS=y -CONFIG_FEATURE_DEVPTS=y -CONFIG_FEATURE_CLEAN_UP=y -CONFIG_FEATURE_UTMP=y -CONFIG_FEATURE_WTMP=y -# CONFIG_FEATURE_PIDFILE is not set -CONFIG_PID_FILE_PATH="" -CONFIG_FEATURE_SUID=y -# CONFIG_FEATURE_SUID_CONFIG is not set -# CONFIG_FEATURE_SUID_CONFIG_QUIET is not set -# CONFIG_SELINUX is not set -# CONFIG_FEATURE_PREFER_APPLETS is not set -CONFIG_BUSYBOX_EXEC_PATH="/proc/self/exe" -CONFIG_FEATURE_SYSLOG=y -# CONFIG_FEATURE_HAVE_RPC is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -# CONFIG_PIE is not set -# CONFIG_NOMMU is not set -# CONFIG_BUILD_LIBBUSYBOX is not set -# CONFIG_FEATURE_INDIVIDUAL is not set -# CONFIG_FEATURE_SHARED_BUSYBOX is not set -CONFIG_LFS=y -CONFIG_CROSS_COMPILER_PREFIX="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" - -# -# Installation Options ("make install" behavior) -# -CONFIG_INSTALL_APPLET_SYMLINKS=y -# CONFIG_INSTALL_APPLET_HARDLINKS is not set -# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set -# CONFIG_INSTALL_APPLET_DONT is not set -# CONFIG_INSTALL_SH_APPLET_SYMLINK is not set -# CONFIG_INSTALL_SH_APPLET_HARDLINK is not set -# CONFIG_INSTALL_SH_APPLET_SCRIPT_WRAPPER is not set -CONFIG_PREFIX="./_install" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_DEBUG_PESSIMIZE is not set -# CONFIG_DEBUG_SANITIZE is not set -# CONFIG_UNIT_TEST is not set -# CONFIG_WERROR is not set -CONFIG_NO_DEBUG_LIB=y -# CONFIG_DMALLOC is not set -# CONFIG_EFENCE is not set - -# -# Busybox Library Tuning -# -# CONFIG_FEATURE_USE_BSS_TAIL is not set -CONFIG_FEATURE_RTMINMAX=y -CONFIG_FEATURE_BUFFERS_USE_MALLOC=y -# CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set -# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set -CONFIG_PASSWORD_MINLEN=6 -CONFIG_MD5_SMALL=1 -CONFIG_SHA3_SMALL=1 -# CONFIG_FEATURE_FAST_TOP is not set -# CONFIG_FEATURE_ETC_NETWORKS is not set -CONFIG_FEATURE_USE_TERMIOS=y -CONFIG_FEATURE_EDITING=y -CONFIG_FEATURE_EDITING_MAX_LEN=1024 -CONFIG_FEATURE_EDITING_VI=y -CONFIG_FEATURE_EDITING_HISTORY=999 -CONFIG_FEATURE_EDITING_SAVEHISTORY=y -# CONFIG_FEATURE_EDITING_SAVE_ON_EXIT is not set -CONFIG_FEATURE_REVERSE_SEARCH=y -CONFIG_FEATURE_TAB_COMPLETION=y -# CONFIG_FEATURE_USERNAME_COMPLETION is not set -CONFIG_FEATURE_EDITING_FANCY_PROMPT=y -# CONFIG_FEATURE_EDITING_ASK_TERMINAL is not set -# CONFIG_LOCALE_SUPPORT is not set -# CONFIG_UNICODE_SUPPORT is not set -# CONFIG_UNICODE_USING_LOCALE is not set -# CONFIG_FEATURE_CHECK_UNICODE_IN_ENV is not set -CONFIG_SUBST_WCHAR=0 -CONFIG_LAST_SUPPORTED_WCHAR=0 -# CONFIG_UNICODE_COMBINING_WCHARS is not set -# CONFIG_UNICODE_WIDE_WCHARS is not set -# CONFIG_UNICODE_BIDI_SUPPORT is not set -# CONFIG_UNICODE_NEUTRAL_TABLE is not set -# CONFIG_UNICODE_PRESERVE_BROKEN is not set -CONFIG_FEATURE_NON_POSIX_CP=y -# CONFIG_FEATURE_VERBOSE_CP_MESSAGE is not set -CONFIG_FEATURE_USE_SENDFILE=y -CONFIG_FEATURE_COPYBUF_KB=4 -CONFIG_FEATURE_SKIP_ROOTFS=y -CONFIG_MONOTONIC_SYSCALL=y -CONFIG_IOCTL_HEX2STR_ERROR=y -CONFIG_FEATURE_HWIB=y - -# -# Applets -# - -# -# Archival Utilities -# -# CONFIG_FEATURE_SEAMLESS_XZ is not set -# CONFIG_FEATURE_SEAMLESS_LZMA is not set -# CONFIG_FEATURE_SEAMLESS_BZ2 is not set -# CONFIG_FEATURE_SEAMLESS_GZ is not set -# CONFIG_FEATURE_SEAMLESS_Z is not set -CONFIG_AR=y -# CONFIG_FEATURE_AR_LONG_FILENAMES is not set -CONFIG_FEATURE_AR_CREATE=y -# CONFIG_UNCOMPRESS is not set -CONFIG_GUNZIP=y -CONFIG_ZCAT=y -CONFIG_FEATURE_GUNZIP_LONG_OPTIONS=y -CONFIG_BUNZIP2=y -CONFIG_BZCAT=y -CONFIG_UNLZMA=y -CONFIG_LZCAT=y -CONFIG_LZMA=y -# CONFIG_FEATURE_LZMA_FAST is not set -CONFIG_UNXZ=y -CONFIG_XZCAT=y -CONFIG_XZ=y -# CONFIG_BZIP2 is not set -CONFIG_CPIO=y -# CONFIG_FEATURE_CPIO_O is not set -# CONFIG_FEATURE_CPIO_P is not set -# CONFIG_DPKG is not set -# CONFIG_DPKG_DEB is not set -CONFIG_GZIP=y -# CONFIG_FEATURE_GZIP_LONG_OPTIONS is not set -CONFIG_GZIP_FAST=0 -# CONFIG_FEATURE_GZIP_LEVELS is not set -# CONFIG_LZOP is not set -CONFIG_UNLZOP=y -CONFIG_LZOPCAT=y -# CONFIG_LZOP_COMPR_HIGH is not set -# CONFIG_RPM2CPIO is not set -# CONFIG_RPM is not set -CONFIG_TAR=y -CONFIG_FEATURE_TAR_CREATE=y -# CONFIG_FEATURE_TAR_AUTODETECT is not set -CONFIG_FEATURE_TAR_FROM=y -# CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY is not set -# CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY is not set -CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y -CONFIG_FEATURE_TAR_LONG_OPTIONS=y -CONFIG_FEATURE_TAR_TO_COMMAND=y -# CONFIG_FEATURE_TAR_UNAME_GNAME is not set -# CONFIG_FEATURE_TAR_NOPRESERVE_TIME is not set -# CONFIG_FEATURE_TAR_SELINUX is not set -CONFIG_UNZIP=y - -# -# Coreutils -# -CONFIG_BASENAME=y -# CONFIG_CAL is not set -CONFIG_CAT=y -CONFIG_CATV=y -CONFIG_CHGRP=y -CONFIG_CHMOD=y -CONFIG_CHOWN=y -# CONFIG_FEATURE_CHOWN_LONG_OPTIONS is not set -CONFIG_CHROOT=y -CONFIG_CKSUM=y -# CONFIG_COMM is not set -CONFIG_CP=y -# CONFIG_FEATURE_CP_LONG_OPTIONS is not set -CONFIG_CUT=y -CONFIG_DATE=y -CONFIG_FEATURE_DATE_ISOFMT=y -# CONFIG_FEATURE_DATE_NANO is not set -CONFIG_FEATURE_DATE_COMPAT=y -CONFIG_DD=y -CONFIG_FEATURE_DD_SIGNAL_HANDLING=y -# CONFIG_FEATURE_DD_THIRD_STATUS_LINE is not set -CONFIG_FEATURE_DD_IBS_OBS=y -CONFIG_FEATURE_DD_STATUS=y -CONFIG_DF=y -# CONFIG_FEATURE_DF_FANCY is not set -CONFIG_DIRNAME=y -CONFIG_DOS2UNIX=y -CONFIG_UNIX2DOS=y -CONFIG_DU=y -CONFIG_FEATURE_DU_DEFAULT_BLOCKSIZE_1K=y -CONFIG_ECHO=y -CONFIG_FEATURE_FANCY_ECHO=y -CONFIG_ENV=y -# CONFIG_FEATURE_ENV_LONG_OPTIONS is not set -# CONFIG_EXPAND is not set -# CONFIG_FEATURE_EXPAND_LONG_OPTIONS is not set -# CONFIG_UNEXPAND is not set -# CONFIG_FEATURE_UNEXPAND_LONG_OPTIONS is not set -CONFIG_EXPR=y -CONFIG_EXPR_MATH_SUPPORT_64=y -CONFIG_FALSE=y -CONFIG_FOLD=y -# CONFIG_FSYNC is not set -CONFIG_HEAD=y -CONFIG_FEATURE_FANCY_HEAD=y -CONFIG_HOSTID=y -CONFIG_ID=y -# CONFIG_GROUPS is not set -CONFIG_INSTALL=y -CONFIG_FEATURE_INSTALL_LONG_OPTIONS=y -CONFIG_LN=y -CONFIG_LOGNAME=y -CONFIG_LS=y -CONFIG_FEATURE_LS_FILETYPES=y -CONFIG_FEATURE_LS_FOLLOWLINKS=y -CONFIG_FEATURE_LS_RECURSIVE=y -CONFIG_FEATURE_LS_SORTFILES=y -CONFIG_FEATURE_LS_TIMESTAMPS=y -CONFIG_FEATURE_LS_USERNAME=y -CONFIG_FEATURE_LS_COLOR=y -CONFIG_FEATURE_LS_COLOR_IS_DEFAULT=y -CONFIG_MD5SUM=y -CONFIG_SHA1SUM=y -CONFIG_SHA256SUM=y -CONFIG_SHA512SUM=y -CONFIG_SHA3SUM=y - -# -# Common options for md5sum, sha1sum, sha256sum, sha512sum, sha3sum -# -CONFIG_FEATURE_MD5_SHA1_SUM_CHECK=y -CONFIG_MKDIR=y -CONFIG_FEATURE_MKDIR_LONG_OPTIONS=y -CONFIG_MKFIFO=y -CONFIG_MKNOD=y -CONFIG_MV=y -CONFIG_FEATURE_MV_LONG_OPTIONS=y -CONFIG_NICE=y -CONFIG_NOHUP=y -CONFIG_OD=y -CONFIG_PRINTENV=y -CONFIG_PRINTF=y -CONFIG_PWD=y -CONFIG_READLINK=y -CONFIG_FEATURE_READLINK_FOLLOW=y -CONFIG_REALPATH=y -CONFIG_RM=y -CONFIG_RMDIR=y -# CONFIG_FEATURE_RMDIR_LONG_OPTIONS is not set -CONFIG_SEQ=y -# CONFIG_SHUF is not set -CONFIG_SLEEP=y -CONFIG_FEATURE_FANCY_SLEEP=y -CONFIG_FEATURE_FLOAT_SLEEP=y -CONFIG_SORT=y -CONFIG_FEATURE_SORT_BIG=y -# CONFIG_SPLIT is not set -# CONFIG_FEATURE_SPLIT_FANCY is not set -# CONFIG_STAT is not set -# CONFIG_FEATURE_STAT_FORMAT is not set -# CONFIG_FEATURE_STAT_FILESYSTEM is not set -CONFIG_STTY=y -# CONFIG_SUM is not set -CONFIG_SYNC=y -# CONFIG_FEATURE_SYNC_FANCY is not set -# CONFIG_TAC is not set -CONFIG_TAIL=y -CONFIG_FEATURE_FANCY_TAIL=y -CONFIG_TEE=y -CONFIG_FEATURE_TEE_USE_BLOCK_IO=y -CONFIG_TEST=y -CONFIG_TEST1=y -CONFIG_TEST2=y -CONFIG_FEATURE_TEST_64=y -CONFIG_TOUCH=y -# CONFIG_FEATURE_TOUCH_NODEREF is not set -CONFIG_FEATURE_TOUCH_SUSV3=y -CONFIG_TR=y -CONFIG_FEATURE_TR_CLASSES=y -CONFIG_FEATURE_TR_EQUIV=y -CONFIG_TRUE=y -CONFIG_TRUNCATE=y -CONFIG_TTY=y -CONFIG_UNAME=y -CONFIG_UNAME_OSNAME="GNU/Linux" -CONFIG_UNIQ=y -CONFIG_UNLINK=y -CONFIG_USLEEP=y -CONFIG_UUDECODE=y -# CONFIG_BASE64 is not set -CONFIG_UUENCODE=y -CONFIG_WC=y -# CONFIG_FEATURE_WC_LARGE is not set -CONFIG_WHOAMI=y -CONFIG_WHO=y -# CONFIG_USERS is not set -CONFIG_YES=y - -# -# Common options -# -CONFIG_FEATURE_VERBOSE=y - -# -# Common options for cp and mv -# -CONFIG_FEATURE_PRESERVE_HARDLINKS=y - -# -# Common options for ls, more and telnet -# -CONFIG_FEATURE_AUTOWIDTH=y - -# -# Common options for df, du, ls -# -CONFIG_FEATURE_HUMAN_READABLE=y - -# -# Console Utilities -# -CONFIG_CHVT=y -CONFIG_CLEAR=y -CONFIG_DEALLOCVT=y -CONFIG_DUMPKMAP=y -# CONFIG_FGCONSOLE is not set -# CONFIG_KBD_MODE is not set -CONFIG_LOADFONT=y -# CONFIG_SETFONT is not set -# CONFIG_FEATURE_SETFONT_TEXTUAL_MAP is not set -CONFIG_DEFAULT_SETFONT_DIR="" - -# -# Common options for loadfont and setfont -# -CONFIG_FEATURE_LOADFONT_PSF2=y -CONFIG_FEATURE_LOADFONT_RAW=y -CONFIG_LOADKMAP=y -CONFIG_OPENVT=y -CONFIG_RESET=y -CONFIG_RESIZE=y -CONFIG_FEATURE_RESIZE_PRINT=y -CONFIG_SETCONSOLE=y -# CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS is not set -CONFIG_SETKEYCODES=y -CONFIG_SETLOGCONS=y -# CONFIG_SHOWKEY is not set - -# -# Debian Utilities -# -CONFIG_MKTEMP=y -CONFIG_PIPE_PROGRESS=y -CONFIG_RUN_PARTS=y -CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y -# CONFIG_FEATURE_RUN_PARTS_FANCY is not set -CONFIG_START_STOP_DAEMON=y -CONFIG_FEATURE_START_STOP_DAEMON_FANCY=y -CONFIG_FEATURE_START_STOP_DAEMON_LONG_OPTIONS=y -CONFIG_WHICH=y - -# -# Editors -# -CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set -CONFIG_FEATURE_AWK_GNU_EXTENSIONS=y -CONFIG_CMP=y -CONFIG_DIFF=y -# CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -CONFIG_FEATURE_DIFF_DIR=y -# CONFIG_ED is not set -CONFIG_PATCH=y -CONFIG_SED=y -CONFIG_VI=y -CONFIG_FEATURE_VI_MAX_LEN=4096 -CONFIG_FEATURE_VI_8BIT=y -CONFIG_FEATURE_VI_COLON=y -CONFIG_FEATURE_VI_YANKMARK=y -CONFIG_FEATURE_VI_SEARCH=y -# CONFIG_FEATURE_VI_REGEX_SEARCH is not set -CONFIG_FEATURE_VI_USE_SIGNALS=y -CONFIG_FEATURE_VI_DOT_CMD=y -CONFIG_FEATURE_VI_READONLY=y -CONFIG_FEATURE_VI_SETOPTS=y -CONFIG_FEATURE_VI_SET=y -CONFIG_FEATURE_VI_WIN_RESIZE=y -CONFIG_FEATURE_VI_ASK_TERMINAL=y -CONFIG_FEATURE_VI_UNDO=y -CONFIG_FEATURE_VI_UNDO_QUEUE=y -CONFIG_FEATURE_VI_UNDO_QUEUE_MAX=256 -CONFIG_FEATURE_ALLOW_EXEC=y - -# -# Finding Utilities -# -CONFIG_FIND=y -CONFIG_FEATURE_FIND_PRINT0=y -CONFIG_FEATURE_FIND_MTIME=y -CONFIG_FEATURE_FIND_MMIN=y -CONFIG_FEATURE_FIND_PERM=y -CONFIG_FEATURE_FIND_TYPE=y -CONFIG_FEATURE_FIND_XDEV=y -CONFIG_FEATURE_FIND_MAXDEPTH=y -CONFIG_FEATURE_FIND_NEWER=y -# CONFIG_FEATURE_FIND_INUM is not set -CONFIG_FEATURE_FIND_EXEC=y -CONFIG_FEATURE_FIND_EXEC_PLUS=y -CONFIG_FEATURE_FIND_USER=y -CONFIG_FEATURE_FIND_GROUP=y -CONFIG_FEATURE_FIND_NOT=y -CONFIG_FEATURE_FIND_DEPTH=y -CONFIG_FEATURE_FIND_PAREN=y -CONFIG_FEATURE_FIND_SIZE=y -CONFIG_FEATURE_FIND_PRUNE=y -# CONFIG_FEATURE_FIND_DELETE is not set -CONFIG_FEATURE_FIND_PATH=y -CONFIG_FEATURE_FIND_REGEX=y -# CONFIG_FEATURE_FIND_CONTEXT is not set -# CONFIG_FEATURE_FIND_LINKS is not set -CONFIG_GREP=y -CONFIG_EGREP=y -CONFIG_FGREP=y -CONFIG_FEATURE_GREP_CONTEXT=y -CONFIG_XARGS=y -# CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION is not set -CONFIG_FEATURE_XARGS_SUPPORT_QUOTES=y -CONFIG_FEATURE_XARGS_SUPPORT_TERMOPT=y -CONFIG_FEATURE_XARGS_SUPPORT_ZERO_TERM=y -CONFIG_FEATURE_XARGS_SUPPORT_REPL_STR=y - -# -# Init Utilities -# -# CONFIG_BOOTCHARTD is not set -# CONFIG_FEATURE_BOOTCHARTD_BLOATED_HEADER is not set -# CONFIG_FEATURE_BOOTCHARTD_CONFIG_FILE is not set -CONFIG_HALT=y -CONFIG_POWEROFF=y -CONFIG_REBOOT=y -# CONFIG_FEATURE_CALL_TELINIT is not set -CONFIG_TELINIT_PATH="" -CONFIG_INIT=y -CONFIG_LINUXRC=y -CONFIG_FEATURE_USE_INITTAB=y -CONFIG_FEATURE_KILL_REMOVED=y -CONFIG_FEATURE_KILL_DELAY=0 -CONFIG_FEATURE_INIT_SCTTY=y -CONFIG_FEATURE_INIT_SYSLOG=y -CONFIG_FEATURE_EXTRA_QUIET=y -# CONFIG_FEATURE_INIT_COREDUMPS is not set -CONFIG_INIT_TERMINAL_TYPE="linux" -CONFIG_FEATURE_INIT_MODIFY_CMDLINE=y -CONFIG_MESG=y -CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP=y - -# -# Login/Password Management Utilities -# -CONFIG_FEATURE_SHADOWPASSWDS=y -# CONFIG_USE_BB_PWD_GRP is not set -# CONFIG_USE_BB_SHADOW is not set -CONFIG_USE_BB_CRYPT=y -# CONFIG_USE_BB_CRYPT_SHA is not set -CONFIG_ADDGROUP=y -# CONFIG_FEATURE_ADDGROUP_LONG_OPTIONS is not set -# CONFIG_FEATURE_ADDUSER_TO_GROUP is not set -# CONFIG_ADD_SHELL is not set -# CONFIG_REMOVE_SHELL is not set -CONFIG_ADDUSER=y -# CONFIG_FEATURE_ADDUSER_LONG_OPTIONS is not set -# CONFIG_FEATURE_CHECK_NAMES is not set -CONFIG_LAST_ID=60000 -CONFIG_FIRST_SYSTEM_ID=100 -CONFIG_LAST_SYSTEM_ID=999 -# CONFIG_CHPASSWD is not set -CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="md5" -# CONFIG_CRYPTPW is not set -CONFIG_MKPASSWD=y -CONFIG_DELUSER=y -CONFIG_DELGROUP=y -# CONFIG_FEATURE_DEL_USER_FROM_GROUP is not set -CONFIG_GETTY=y -CONFIG_LOGIN=y -# CONFIG_LOGIN_SESSION_AS_CHILD is not set -# CONFIG_LOGIN_SCRIPTS is not set -CONFIG_FEATURE_NOLOGIN=y -CONFIG_FEATURE_SECURETTY=y -CONFIG_PASSWD=y -CONFIG_FEATURE_PASSWD_WEAK_CHECK=y -CONFIG_SU=y -CONFIG_FEATURE_SU_SYSLOG=y -CONFIG_FEATURE_SU_CHECKS_SHELLS=y -CONFIG_SULOGIN=y -CONFIG_VLOCK=y - -# -# Linux Ext2 FS Progs -# -CONFIG_CHATTR=y -CONFIG_FSCK=y -CONFIG_LSATTR=y -# CONFIG_TUNE2FS is not set - -# -# Linux Module Utilities -# -# CONFIG_DEPMOD is not set -CONFIG_INSMOD=y -CONFIG_LSMOD=y -CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y -# CONFIG_MODINFO is not set -CONFIG_MODPROBE=y -# CONFIG_FEATURE_MODPROBE_BLACKLIST is not set -# CONFIG_MODPROBE_SMALL is not set -# CONFIG_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE is not set -# CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED is not set -CONFIG_RMMOD=y - -# -# Options common to multiple modutils -# -# CONFIG_FEATURE_2_4_MODULES is not set -# CONFIG_FEATURE_INSMOD_TRY_MMAP is not set -# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set -# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set -# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set -# CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL is not set -CONFIG_FEATURE_CHECK_TAINTED_MODULE=y -CONFIG_FEATURE_MODUTILS_ALIAS=y -CONFIG_FEATURE_MODUTILS_SYMBOLS=y -CONFIG_DEFAULT_MODULES_DIR="/lib/modules" -CONFIG_DEFAULT_DEPMOD_FILE="modules.dep" - -# -# Linux System Utilities -# -# CONFIG_ACPID is not set -# CONFIG_FEATURE_ACPID_COMPAT is not set -# CONFIG_BLKDISCARD is not set -CONFIG_BLKID=y -# CONFIG_FEATURE_BLKID_TYPE is not set -# CONFIG_BLOCKDEV is not set -CONFIG_DMESG=y -CONFIG_FEATURE_DMESG_PRETTY=y -# CONFIG_FATATTR is not set -CONFIG_FBSET=y -CONFIG_FEATURE_FBSET_FANCY=y -CONFIG_FEATURE_FBSET_READMODE=y -CONFIG_FDFORMAT=y -CONFIG_FDISK=y -# CONFIG_FDISK_SUPPORT_LARGE_DISKS is not set -CONFIG_FEATURE_FDISK_WRITABLE=y -# CONFIG_FEATURE_AIX_LABEL is not set -# CONFIG_FEATURE_SGI_LABEL is not set -# CONFIG_FEATURE_SUN_LABEL is not set -# CONFIG_FEATURE_OSF_LABEL is not set -CONFIG_FEATURE_GPT_LABEL=y -CONFIG_FEATURE_FDISK_ADVANCED=y -# CONFIG_FINDFS is not set -CONFIG_FLOCK=y -CONFIG_FDFLUSH=y -CONFIG_FREERAMDISK=y -# CONFIG_FSCK_MINIX is not set -CONFIG_FSTRIM=y -CONFIG_GETOPT=y -CONFIG_FEATURE_GETOPT_LONG=y -CONFIG_HEXDUMP=y -# CONFIG_FEATURE_HEXDUMP_REVERSE is not set -# CONFIG_HD is not set -CONFIG_HWCLOCK=y -CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS=y -CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS=y -CONFIG_IPCRM=y -CONFIG_IPCS=y -CONFIG_LOSETUP=y -CONFIG_LSPCI=y -CONFIG_LSUSB=y -CONFIG_MDEV=y -CONFIG_FEATURE_MDEV_CONF=y -CONFIG_FEATURE_MDEV_RENAME=y -# CONFIG_FEATURE_MDEV_RENAME_REGEXP is not set -CONFIG_FEATURE_MDEV_EXEC=y -# CONFIG_FEATURE_MDEV_LOAD_FIRMWARE is not set -CONFIG_MKE2FS=y -# CONFIG_MKFS_EXT2 is not set -# CONFIG_MKFS_MINIX is not set -# CONFIG_FEATURE_MINIX2 is not set -# CONFIG_MKFS_REISER is not set -CONFIG_MKDOSFS=y -# CONFIG_MKFS_VFAT is not set -CONFIG_MKSWAP=y -# CONFIG_FEATURE_MKSWAP_UUID is not set -CONFIG_MORE=y -CONFIG_MOUNT=y -# CONFIG_FEATURE_MOUNT_FAKE is not set -# CONFIG_FEATURE_MOUNT_VERBOSE is not set -# CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set -# CONFIG_FEATURE_MOUNT_NFS is not set -CONFIG_FEATURE_MOUNT_CIFS=y -CONFIG_FEATURE_MOUNT_FLAGS=y -CONFIG_FEATURE_MOUNT_FSTAB=y -CONFIG_FEATURE_MOUNT_OTHERTAB=y -# CONFIG_NSENTER is not set -# CONFIG_FEATURE_NSENTER_LONG_OPTS is not set -CONFIG_PIVOT_ROOT=y -CONFIG_RDATE=y -# CONFIG_RDEV is not set -CONFIG_READPROFILE=y -# CONFIG_REV is not set -# CONFIG_RTCWAKE is not set -# CONFIG_SCRIPT is not set -# CONFIG_SCRIPTREPLAY is not set -CONFIG_SETARCH=y -CONFIG_LINUX32=y -CONFIG_LINUX64=y -CONFIG_SWAPON=y -# CONFIG_FEATURE_SWAPON_DISCARD is not set -# CONFIG_FEATURE_SWAPON_PRI is not set -CONFIG_SWAPOFF=y -CONFIG_SWITCH_ROOT=y -CONFIG_UEVENT=y -CONFIG_UMOUNT=y -CONFIG_FEATURE_UMOUNT_ALL=y -# CONFIG_UNSHARE is not set - -# -# Common options for mount/umount -# -CONFIG_FEATURE_MOUNT_LOOP=y -CONFIG_FEATURE_MOUNT_LOOP_CREATE=y -# CONFIG_FEATURE_MTAB_SUPPORT is not set -CONFIG_VOLUMEID=y - -# -# Filesystem/Volume identification -# -# CONFIG_FEATURE_VOLUMEID_BCACHE is not set -# CONFIG_FEATURE_VOLUMEID_BTRFS is not set -# CONFIG_FEATURE_VOLUMEID_CRAMFS is not set -CONFIG_FEATURE_VOLUMEID_EXFAT=y -CONFIG_FEATURE_VOLUMEID_EXT=y -CONFIG_FEATURE_VOLUMEID_F2FS=y -CONFIG_FEATURE_VOLUMEID_FAT=y -# CONFIG_FEATURE_VOLUMEID_HFS is not set -# CONFIG_FEATURE_VOLUMEID_ISO9660 is not set -# CONFIG_FEATURE_VOLUMEID_JFS is not set -# CONFIG_FEATURE_VOLUMEID_LINUXRAID is not set -# CONFIG_FEATURE_VOLUMEID_LINUXSWAP is not set -# CONFIG_FEATURE_VOLUMEID_LUKS is not set -# CONFIG_FEATURE_VOLUMEID_NILFS is not set -# CONFIG_FEATURE_VOLUMEID_NTFS is not set -# CONFIG_FEATURE_VOLUMEID_OCFS2 is not set -# CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_ROMFS is not set -# CONFIG_FEATURE_VOLUMEID_SQUASHFS is not set -# CONFIG_FEATURE_VOLUMEID_SYSV is not set -CONFIG_FEATURE_VOLUMEID_UBIFS=y -# CONFIG_FEATURE_VOLUMEID_UDF is not set -# CONFIG_FEATURE_VOLUMEID_XFS is not set - -# -# Miscellaneous Utilities -# -# CONFIG_ADJTIMEX is not set -# CONFIG_BBCONFIG is not set -# CONFIG_FEATURE_COMPRESS_BBCONFIG is not set -# CONFIG_BEEP is not set -CONFIG_FEATURE_BEEP_FREQ=0 -CONFIG_FEATURE_BEEP_LENGTH_MS=0 -# CONFIG_CHAT is not set -# CONFIG_FEATURE_CHAT_NOFAIL is not set -# CONFIG_FEATURE_CHAT_TTY_HIFI is not set -# CONFIG_FEATURE_CHAT_IMPLICIT_CR is not set -# CONFIG_FEATURE_CHAT_SWALLOW_OPTS is not set -# CONFIG_FEATURE_CHAT_SEND_ESCAPES is not set -# CONFIG_FEATURE_CHAT_VAR_ABORT_LEN is not set -# CONFIG_FEATURE_CHAT_CLR_ABORT is not set -CONFIG_CHRT=y -# CONFIG_CONSPY is not set -CONFIG_CROND=y -# CONFIG_FEATURE_CROND_D is not set -# CONFIG_FEATURE_CROND_CALL_SENDMAIL is not set -CONFIG_FEATURE_CROND_DIR="/var/spool/cron" -CONFIG_CRONTAB=y -CONFIG_DC=y -# CONFIG_FEATURE_DC_LIBM is not set -# CONFIG_DEVFSD is not set -# CONFIG_DEVFSD_MODLOAD is not set -# CONFIG_DEVFSD_FG_NP is not set -# CONFIG_DEVFSD_VERBOSE is not set -# CONFIG_FEATURE_DEVFS is not set -CONFIG_DEVMEM=y -CONFIG_EJECT=y -# CONFIG_FEATURE_EJECT_SCSI is not set -# CONFIG_FBSPLASH is not set -# CONFIG_FLASHCP is not set -# CONFIG_FLASH_ERASEALL is not set -# CONFIG_FLASH_LOCK is not set -# CONFIG_FLASH_UNLOCK is not set -CONFIG_HDPARM=y -CONFIG_FEATURE_HDPARM_GET_IDENTITY=y -# CONFIG_FEATURE_HDPARM_HDIO_SCAN_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET is not set -# CONFIG_FEATURE_HDPARM_HDIO_TRISTATE_HWIF is not set -# CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA is not set -CONFIG_I2CGET=y -CONFIG_I2CSET=y -CONFIG_I2CDUMP=y -CONFIG_I2CDETECT=y -# CONFIG_INOTIFYD is not set -# CONFIG_IONICE is not set -CONFIG_LAST=y -# CONFIG_FEATURE_LAST_FANCY is not set -CONFIG_LESS=y -CONFIG_FEATURE_LESS_MAXLINES=9999999 -CONFIG_FEATURE_LESS_BRACKETS=y -CONFIG_FEATURE_LESS_FLAGS=y -CONFIG_FEATURE_LESS_TRUNCATE=y -# CONFIG_FEATURE_LESS_MARKS is not set -CONFIG_FEATURE_LESS_REGEXP=y -# CONFIG_FEATURE_LESS_WINCH is not set -# CONFIG_FEATURE_LESS_ASK_TERMINAL is not set -# CONFIG_FEATURE_LESS_DASHCMD is not set -# CONFIG_FEATURE_LESS_LINENUMS is not set -CONFIG_MAKEDEVS=y -# CONFIG_FEATURE_MAKEDEVS_LEAF is not set -CONFIG_FEATURE_MAKEDEVS_TABLE=y -# CONFIG_MAN is not set -CONFIG_MICROCOM=y -CONFIG_MOUNTPOINT=y -CONFIG_MT=y -# CONFIG_NANDWRITE is not set -# CONFIG_NANDDUMP is not set -# CONFIG_RAIDAUTORUN is not set -# CONFIG_READAHEAD is not set -# CONFIG_RFKILL is not set -CONFIG_RUNLEVEL=y -# CONFIG_RX is not set -CONFIG_SETSERIAL=y -CONFIG_SETSID=y -CONFIG_STRINGS=y -# CONFIG_TASKSET is not set -# CONFIG_FEATURE_TASKSET_FANCY is not set -CONFIG_TIME=y -# CONFIG_TIMEOUT is not set -# CONFIG_TTYSIZE is not set -CONFIG_UBIRENAME=y -# CONFIG_UBIATTACH is not set -# CONFIG_UBIDETACH is not set -# CONFIG_UBIMKVOL is not set -# CONFIG_UBIRMVOL is not set -# CONFIG_UBIRSVOL is not set -# CONFIG_UBIUPDATEVOL is not set -# CONFIG_VOLNAME is not set -# CONFIG_WALL is not set -CONFIG_WATCHDOG=y - -# -# Networking Utilities -# -CONFIG_FEATURE_IPV6=y -# CONFIG_FEATURE_UNIX_LOCAL is not set -CONFIG_FEATURE_PREFER_IPV4_ADDRESS=y -# CONFIG_VERBOSE_RESOLUTION_ERRORS is not set -CONFIG_ARP=y -CONFIG_ARPING=y -# CONFIG_BRCTL is not set -# CONFIG_FEATURE_BRCTL_FANCY is not set -# CONFIG_FEATURE_BRCTL_SHOW is not set -CONFIG_DNSD=y -CONFIG_ETHER_WAKE=y -# CONFIG_FTPD is not set -# CONFIG_FEATURE_FTPD_WRITE is not set -# CONFIG_FEATURE_FTPD_ACCEPT_BROKEN_LIST is not set -# CONFIG_FEATURE_FTPD_AUTHENTICATION is not set -# CONFIG_FTPGET is not set -# CONFIG_FTPPUT is not set -# CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set -CONFIG_HOSTNAME=y -CONFIG_DNSDOMAINNAME=y -# CONFIG_HTTPD is not set -# CONFIG_FEATURE_HTTPD_RANGES is not set -# CONFIG_FEATURE_HTTPD_SETUID is not set -# CONFIG_FEATURE_HTTPD_BASIC_AUTH is not set -# CONFIG_FEATURE_HTTPD_AUTH_MD5 is not set -# CONFIG_FEATURE_HTTPD_CGI is not set -# CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR is not set -# CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV is not set -# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set -# CONFIG_FEATURE_HTTPD_ERROR_PAGES is not set -# CONFIG_FEATURE_HTTPD_PROXY is not set -# CONFIG_FEATURE_HTTPD_GZIP is not set -CONFIG_IFCONFIG=y -CONFIG_FEATURE_IFCONFIG_STATUS=y -CONFIG_FEATURE_IFCONFIG_SLIP=y -CONFIG_FEATURE_IFCONFIG_MEMSTART_IOADDR_IRQ=y -CONFIG_FEATURE_IFCONFIG_HW=y -# CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set -# CONFIG_IFENSLAVE is not set -# CONFIG_IFPLUGD is not set -CONFIG_IFUP=y -CONFIG_IFDOWN=y -CONFIG_IFUPDOWN_IFSTATE_PATH="/var/run/ifstate" -CONFIG_FEATURE_IFUPDOWN_IP=y -# CONFIG_FEATURE_IFUPDOWN_IP_BUILTIN is not set -# CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN is not set -CONFIG_FEATURE_IFUPDOWN_IPV4=y -CONFIG_FEATURE_IFUPDOWN_IPV6=y -CONFIG_FEATURE_IFUPDOWN_MAPPING=y -# CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP is not set -CONFIG_INETD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_ECHO=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DISCARD=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_TIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_DAYTIME=y -CONFIG_FEATURE_INETD_SUPPORT_BUILTIN_CHARGEN=y -# CONFIG_FEATURE_INETD_RPC is not set -CONFIG_IP=y -CONFIG_FEATURE_IP_ADDRESS=y -CONFIG_FEATURE_IP_LINK=y -CONFIG_FEATURE_IP_ROUTE=y -CONFIG_FEATURE_IP_ROUTE_DIR="/etc/iproute2" -CONFIG_FEATURE_IP_TUNNEL=y -CONFIG_FEATURE_IP_RULE=y -CONFIG_FEATURE_IP_NEIGH=y -CONFIG_FEATURE_IP_SHORT_FORMS=y -# CONFIG_FEATURE_IP_RARE_PROTOCOLS is not set -CONFIG_IPADDR=y -CONFIG_IPLINK=y -CONFIG_IPROUTE=y -CONFIG_IPTUNNEL=y -CONFIG_IPRULE=y -CONFIG_IPNEIGH=y -# CONFIG_IPCALC is not set -# CONFIG_FEATURE_IPCALC_FANCY is not set -# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set -# CONFIG_FAKEIDENTD is not set -CONFIG_NAMEIF=y -# CONFIG_FEATURE_NAMEIF_EXTENDED is not set -# CONFIG_NBDCLIENT is not set -# CONFIG_NC is not set -# CONFIG_NC_SERVER is not set -# CONFIG_NC_EXTRA is not set -# CONFIG_NC_110_COMPAT is not set -CONFIG_NETSTAT=y -# CONFIG_FEATURE_NETSTAT_WIDE is not set -# CONFIG_FEATURE_NETSTAT_PRG is not set -CONFIG_NSLOOKUP=y -# CONFIG_NTPD is not set -# CONFIG_FEATURE_NTPD_SERVER is not set -# CONFIG_FEATURE_NTPD_CONF is not set -CONFIG_PING=y -# CONFIG_PING6 is not set -CONFIG_FEATURE_FANCY_PING=y -# CONFIG_PSCAN is not set -CONFIG_ROUTE=y -# CONFIG_SLATTACH is not set -# CONFIG_TCPSVD is not set -# CONFIG_UDPSVD is not set -CONFIG_TELNET=y -CONFIG_FEATURE_TELNET_TTYPE=y -CONFIG_FEATURE_TELNET_AUTOLOGIN=y -# CONFIG_TELNETD is not set -# CONFIG_FEATURE_TELNETD_STANDALONE is not set -# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set -CONFIG_TFTP=y -# CONFIG_TFTPD is not set - -# -# Common options for tftp/tftpd -# -CONFIG_FEATURE_TFTP_GET=y -CONFIG_FEATURE_TFTP_PUT=y -CONFIG_FEATURE_TFTP_BLOCKSIZE=y -# CONFIG_FEATURE_TFTP_PROGRESS_BAR is not set -# CONFIG_TFTP_DEBUG is not set -CONFIG_TRACEROUTE=y -# CONFIG_TRACEROUTE6 is not set -# CONFIG_FEATURE_TRACEROUTE_VERBOSE is not set -# CONFIG_FEATURE_TRACEROUTE_USE_ICMP is not set -# CONFIG_TUNCTL is not set -# CONFIG_FEATURE_TUNCTL_UG is not set -CONFIG_VCONFIG=y -CONFIG_WGET=y -CONFIG_FEATURE_WGET_STATUSBAR=y -CONFIG_FEATURE_WGET_AUTHENTICATION=y -CONFIG_FEATURE_WGET_LONG_OPTIONS=y -CONFIG_FEATURE_WGET_TIMEOUT=y -# CONFIG_FEATURE_WGET_OPENSSL is not set -# CONFIG_FEATURE_WGET_SSL_HELPER is not set -# CONFIG_WHOIS is not set -# CONFIG_ZCIP is not set -# CONFIG_UDHCPC6 is not set -# CONFIG_UDHCPD is not set -# CONFIG_DHCPRELAY is not set -# CONFIG_DUMPLEASES is not set -# CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY is not set -# CONFIG_FEATURE_UDHCPD_BASE_IP_ON_MAC is not set -CONFIG_DHCPD_LEASES_FILE="" -CONFIG_UDHCPC=y -CONFIG_FEATURE_UDHCPC_ARPING=y -CONFIG_FEATURE_UDHCPC_SANITIZEOPT=y -# CONFIG_FEATURE_UDHCP_PORT is not set -CONFIG_UDHCP_DEBUG=0 -# CONFIG_FEATURE_UDHCP_RFC3397 is not set -CONFIG_FEATURE_UDHCP_8021Q=y -CONFIG_UDHCPC_DEFAULT_SCRIPT="/usr/share/udhcpc/default.script" -CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS=80 -CONFIG_IFUPDOWN_UDHCPC_CMD_OPTIONS="-R -n" - -# -# Print Utilities -# -# CONFIG_LPD is not set -# CONFIG_LPR is not set -# CONFIG_LPQ is not set - -# -# Mail Utilities -# -# CONFIG_MAKEMIME is not set -# CONFIG_POPMAILDIR is not set -# CONFIG_FEATURE_POPMAILDIR_DELIVERY is not set -# CONFIG_REFORMIME is not set -# CONFIG_FEATURE_REFORMIME_COMPAT is not set -# CONFIG_SENDMAIL is not set -CONFIG_FEATURE_MIME_CHARSET="" - -# -# Process Utilities -# -CONFIG_FREE=y -CONFIG_FUSER=y -# CONFIG_IOSTAT is not set -CONFIG_KILL=y -CONFIG_KILLALL=y -CONFIG_KILLALL5=y -CONFIG_LSOF=y -# CONFIG_MPSTAT is not set -# CONFIG_NMETER is not set -# CONFIG_PGREP is not set -# CONFIG_PKILL is not set -CONFIG_PIDOF=y -CONFIG_FEATURE_PIDOF_SINGLE=y -CONFIG_FEATURE_PIDOF_OMIT=y -# CONFIG_PMAP is not set -# CONFIG_POWERTOP is not set -CONFIG_PS=y -# CONFIG_FEATURE_PS_WIDE is not set -# CONFIG_FEATURE_PS_LONG is not set -# CONFIG_FEATURE_PS_TIME is not set -# CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS is not set -# CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS is not set -# CONFIG_PSTREE is not set -# CONFIG_PWDX is not set -CONFIG_RENICE=y -# CONFIG_SMEMCAP is not set -CONFIG_BB_SYSCTL=y -CONFIG_TOP=y -CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y -CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y -# CONFIG_FEATURE_TOP_SMP_CPU is not set -# CONFIG_FEATURE_TOP_DECIMALS is not set -# CONFIG_FEATURE_TOP_SMP_PROCESS is not set -# CONFIG_FEATURE_TOPMEM is not set -CONFIG_UPTIME=y -# CONFIG_FEATURE_UPTIME_UTMP_SUPPORT is not set -CONFIG_WATCH=y -# CONFIG_FEATURE_SHOW_THREADS is not set - -# -# Runit Utilities -# -# CONFIG_CHPST is not set -# CONFIG_SETUIDGID is not set -# CONFIG_ENVUIDGID is not set -# CONFIG_ENVDIR is not set -# CONFIG_SOFTLIMIT is not set -# CONFIG_RUNSV is not set -# CONFIG_RUNSVDIR is not set -# CONFIG_FEATURE_RUNSVDIR_LOG is not set -# CONFIG_SV is not set -CONFIG_SV_DEFAULT_SERVICE_DIR="" -CONFIG_SVC=y -# CONFIG_SVLOGD is not set -# CONFIG_CHCON is not set -# CONFIG_FEATURE_CHCON_LONG_OPTIONS is not set -# CONFIG_GETENFORCE is not set -# CONFIG_GETSEBOOL is not set -# CONFIG_LOAD_POLICY is not set -# CONFIG_MATCHPATHCON is not set -# CONFIG_RUNCON is not set -# CONFIG_FEATURE_RUNCON_LONG_OPTIONS is not set -# CONFIG_SELINUXENABLED is not set -# CONFIG_SESTATUS is not set -# CONFIG_SETENFORCE is not set -# CONFIG_SETFILES is not set -# CONFIG_FEATURE_SETFILES_CHECK_OPTION is not set -# CONFIG_RESTORECON is not set -# CONFIG_SETSEBOOL is not set - -# -# Shells -# -CONFIG_ASH=y -CONFIG_ASH_OPTIMIZE_FOR_SIZE=y -CONFIG_ASH_INTERNAL_GLOB=y -CONFIG_ASH_RANDOM_SUPPORT=y -CONFIG_ASH_EXPAND_PRMT=y -CONFIG_ASH_BASH_COMPAT=y -CONFIG_ASH_IDLE_TIMEOUT=y -CONFIG_ASH_JOB_CONTROL=y -CONFIG_ASH_ALIAS=y -CONFIG_ASH_GETOPTS=y -CONFIG_ASH_BUILTIN_ECHO=y -CONFIG_ASH_BUILTIN_PRINTF=y -CONFIG_ASH_BUILTIN_TEST=y -CONFIG_ASH_HELP=y -CONFIG_ASH_CMDCMD=y -# CONFIG_ASH_MAIL is not set -# CONFIG_CTTYHACK is not set -# CONFIG_HUSH is not set -# CONFIG_HUSH_BASH_COMPAT is not set -# CONFIG_HUSH_BRACE_EXPANSION is not set -# CONFIG_HUSH_HELP is not set -# CONFIG_HUSH_INTERACTIVE is not set -# CONFIG_HUSH_SAVEHISTORY is not set -# CONFIG_HUSH_JOB is not set -# CONFIG_HUSH_TICK is not set -# CONFIG_HUSH_IF is not set -# CONFIG_HUSH_LOOPS is not set -# CONFIG_HUSH_CASE is not set -# CONFIG_HUSH_FUNCTIONS is not set -# CONFIG_HUSH_LOCAL is not set -# CONFIG_HUSH_RANDOM_SUPPORT is not set -# CONFIG_HUSH_EXPORT_N is not set -# CONFIG_HUSH_MODE_X is not set -# CONFIG_MSH is not set -CONFIG_FEATURE_SH_IS_ASH=y -# CONFIG_FEATURE_SH_IS_HUSH is not set -# CONFIG_FEATURE_SH_IS_NONE is not set -# CONFIG_FEATURE_BASH_IS_ASH is not set -# CONFIG_FEATURE_BASH_IS_HUSH is not set -CONFIG_FEATURE_BASH_IS_NONE=y -CONFIG_SH_MATH_SUPPORT=y -# CONFIG_SH_MATH_SUPPORT_64 is not set -CONFIG_FEATURE_SH_EXTRA_QUIET=y -# CONFIG_FEATURE_SH_STANDALONE is not set -# CONFIG_FEATURE_SH_NOFORK is not set -# CONFIG_FEATURE_SH_HISTFILESIZE is not set - -# -# System Logging Utilities -# -CONFIG_KLOGD=y -CONFIG_FEATURE_KLOGD_KLOGCTL=y -CONFIG_LOGGER=y -# CONFIG_LOGREAD is not set -# CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING is not set -CONFIG_SYSLOGD=y -CONFIG_FEATURE_ROTATE_LOGFILE=y -CONFIG_FEATURE_REMOTE_LOG=y -# CONFIG_FEATURE_SYSLOGD_DUP is not set -# CONFIG_FEATURE_SYSLOGD_CFG is not set -CONFIG_FEATURE_SYSLOGD_READ_BUFFER_SIZE=256 -# CONFIG_FEATURE_IPC_SYSLOG is not set -CONFIG_FEATURE_IPC_SYSLOG_BUFFER_SIZE=0 -# CONFIG_FEATURE_KMSG_SYSLOG is not set diff --git a/package.bak/busybox/busybox.hash b/package.bak/busybox/busybox.hash deleted file mode 100644 index d73f8d546b..0000000000 --- a/package.bak/busybox/busybox.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://busybox.net/downloads/busybox-1.26.2.tar.bz2.sign -md5 bb59d25ee2643db20f212eec539429f1 busybox-1.26.2.tar.bz2 -sha1 0b3e3cd49d6d9e30f66e364bf842663348b23dc9 busybox-1.26.2.tar.bz2 diff --git a/package.bak/busybox/busybox.mk b/package.bak/busybox/busybox.mk deleted file mode 100644 index 577f2f2470..0000000000 --- a/package.bak/busybox/busybox.mk +++ /dev/null @@ -1,264 +0,0 @@ -################################################################################ -# -# busybox -# -################################################################################ - -BUSYBOX_VERSION = 1.26.2 -BUSYBOX_SITE = http://www.busybox.net/downloads -BUSYBOX_SOURCE = busybox-$(BUSYBOX_VERSION).tar.bz2 -BUSYBOX_LICENSE = GPLv2 -BUSYBOX_LICENSE_FILES = LICENSE - -define BUSYBOX_HELP_CMDS - @echo ' busybox-menuconfig - Run BusyBox menuconfig' -endef - -BUSYBOX_CFLAGS = \ - $(TARGET_CFLAGS) - -BUSYBOX_LDFLAGS = \ - $(TARGET_LDFLAGS) - -# Link against libtirpc if available so that we can leverage its RPC -# support for NFS mounting with BusyBox -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -BUSYBOX_DEPENDENCIES += libtirpc host-pkgconf -BUSYBOX_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" -# Don't use LDFLAGS for -ltirpc, because LDFLAGS is used for -# the non-final link of modules as well. -BUSYBOX_CFLAGS_busybox += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" -endif - -BUSYBOX_BUILD_CONFIG = $(BUSYBOX_DIR)/.config -# Allows the build system to tweak CFLAGS -BUSYBOX_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - CFLAGS="$(BUSYBOX_CFLAGS)" \ - CFLAGS_busybox="$(BUSYBOX_CFLAGS_busybox)" - -ifeq ($(BR2_REPRODUCIBLE),y) -BUSYBOX_MAKE_ENV += \ - KCONFIG_NOTIMESTAMP=1 -endif - -BUSYBOX_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - ARCH=$(KERNEL_ARCH) \ - PREFIX="$(TARGET_DIR)" \ - EXTRA_LDFLAGS="$(BUSYBOX_LDFLAGS)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - CONFIG_PREFIX="$(TARGET_DIR)" \ - SKIP_STRIP=y - -ifndef BUSYBOX_CONFIG_FILE - BUSYBOX_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)) -endif - -BUSYBOX_KCONFIG_FILE = $(BUSYBOX_CONFIG_FILE) -BUSYBOX_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG_FRAGMENT_FILES)) -BUSYBOX_KCONFIG_EDITORS = menuconfig xconfig gconfig -BUSYBOX_KCONFIG_OPTS = $(BUSYBOX_MAKE_OPTS) - -define BUSYBOX_PERMISSIONS - /bin/busybox f 4755 0 0 - - - - - -endef - -# If mdev will be used for device creation enable it and copy S10mdev to /etc/init.d -ifeq ($(BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV),y) -define BUSYBOX_INSTALL_MDEV_SCRIPT - $(INSTALL) -D -m 0755 package/busybox/S10mdev \ - $(TARGET_DIR)/etc/init.d/S10mdev -endef -define BUSYBOX_INSTALL_MDEV_CONF - $(INSTALL) -D -m 0644 package/busybox/mdev.conf \ - $(TARGET_DIR)/etc/mdev.conf -endef -define BUSYBOX_SET_MDEV - $(call KCONFIG_ENABLE_OPT,CONFIG_MDEV,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_CONF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_EXEC,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_FEATURE_MDEV_LOAD_FIRMWARE,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -# sha passwords need USE_BB_CRYPT_SHA -ifeq ($(BR2_TARGET_GENERIC_PASSWD_SHA256)$(BR2_TARGET_GENERIC_PASSWD_SHA512),y) -define BUSYBOX_SET_CRYPT_SHA - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_CRYPT_SHA,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -ifeq ($(BR2_USE_MMU),y) -define BUSYBOX_SET_MMU - $(call KCONFIG_DISABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) -endef -else -define BUSYBOX_SET_MMU - $(call KCONFIG_ENABLE_OPT,CONFIG_NOMMU,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPON,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_SWAPOFF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_ASH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BASH_COMPAT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_BRACE_EXPANSION,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_HELP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_INTERACTIVE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_SAVEHISTORY,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_JOB,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_TICK,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_IF,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOOPS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_CASE,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_FUNCTIONS,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_LOCAL,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_RANDOM_SUPPORT,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_EXPORT_N,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_HUSH_MODE_X,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -# If we're using static libs do the same for busybox -ifeq ($(BR2_STATIC_LIBS),y) -define BUSYBOX_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -# Disable shadow passwords support if unsupported by the C library -ifeq ($(BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS),) -define BUSYBOX_INTERNAL_SHADOW_PASSWORDS - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -# We also need to use internal shadow password functions when using -# the musl C library, since some of them are not yet implemented by -# musl. -# -# Do not use utmp/wmtp support. wmtp support is not available in musl, -# and utmp support is not sufficient for Busybox. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -define BUSYBOX_MUSL_TWEAKS - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_PWD_GRP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_USE_BB_SHADOW,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_UTMP,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_DISABLE_OPT,CONFIG_FEATURE_WTMP,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -define BUSYBOX_INSTALL_UDHCPC_SCRIPT - if grep -q CONFIG_UDHCPC=y $(@D)/.config; then \ - $(INSTALL) -m 0755 -D package/busybox/udhcpc.script \ - $(TARGET_DIR)/usr/share/udhcpc/default.script; \ - $(INSTALL) -m 0755 -d \ - $(TARGET_DIR)/usr/share/udhcpc/default.script.d; \ - fi -endef - -ifeq ($(BR2_INIT_BUSYBOX),y) -define BUSYBOX_SET_INIT - $(call KCONFIG_ENABLE_OPT,CONFIG_INIT,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -ifeq ($(BR2_PACKAGE_BUSYBOX_SELINUX),y) -BUSYBOX_DEPENDENCIES += host-pkgconf libselinux libsepol -define BUSYBOX_SET_SELINUX - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUX,$(BUSYBOX_BUILD_CONFIG)) - $(call KCONFIG_ENABLE_OPT,CONFIG_SELINUXENABLED,$(BUSYBOX_BUILD_CONFIG)) -endef -endif - -define BUSYBOX_INSTALL_LOGGING_SCRIPT - if grep -q CONFIG_SYSLOGD=y $(@D)/.config; then \ - $(INSTALL) -m 0755 -D package/busybox/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging; \ - else rm -f $(TARGET_DIR)/etc/init.d/S01logging; fi -endef - -ifeq ($(BR2_INIT_BUSYBOX),y) -define BUSYBOX_INSTALL_INITTAB - $(INSTALL) -D -m 0644 package/busybox/inittab $(TARGET_DIR)/etc/inittab -endef -endif - -ifeq ($(BR2_PACKAGE_BUSYBOX_WATCHDOG),y) -define BUSYBOX_SET_WATCHDOG - $(call KCONFIG_ENABLE_OPT,CONFIG_WATCHDOG,$(BUSYBOX_BUILD_CONFIG)) -endef -define BUSYBOX_INSTALL_WATCHDOG_SCRIPT - $(INSTALL) -D -m 0755 package/busybox/S15watchdog \ - $(TARGET_DIR)/etc/init.d/S15watchdog - $(SED) s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \ - $(TARGET_DIR)/etc/init.d/S15watchdog -endef -endif - -# PAM support requires thread support in the toolchain -ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -define BUSYBOX_LINUX_PAM - $(call KCONFIG_ENABLE_OPT,CONFIG_PAM,$(BUSYBOX_BUILD_CONFIG)) -endef -BUSYBOX_DEPENDENCIES += linux-pam -endif - -# Telnet support -define BUSYBOX_INSTALL_TELNET_SCRIPT - if grep -q CONFIG_FEATURE_TELNETD_STANDALONE=y $(@D)/.config; then \ - $(INSTALL) -m 0755 -D package/busybox/S50telnet \ - $(TARGET_DIR)/etc/init.d/S50telnet ; \ - fi -endef - -# Enable "noclobber" in install.sh, to prevent BusyBox from overwriting any -# full-blown versions of apps installed by other packages with sym/hard links. -define BUSYBOX_NOCLOBBER_INSTALL - $(SED) 's/^noclobber="0"$$/noclobber="1"/' $(@D)/applets/install.sh -endef - -define BUSYBOX_KCONFIG_FIXUP_CMDS - $(BUSYBOX_SET_MMU) - $(BUSYBOX_PREFER_STATIC) - $(BUSYBOX_SET_MDEV) - $(BUSYBOX_SET_CRYPT_SHA) - $(BUSYBOX_LINUX_PAM) - $(BUSYBOX_INTERNAL_SHADOW_PASSWORDS) - $(BUSYBOX_SET_INIT) - $(BUSYBOX_SET_WATCHDOG) - $(BUSYBOX_SET_SELINUX) - $(BUSYBOX_MUSL_TWEAKS) -endef - -define BUSYBOX_CONFIGURE_CMDS - $(BUSYBOX_NOCLOBBER_INSTALL) -endef - -define BUSYBOX_BUILD_CMDS - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) -endef - -define BUSYBOX_INSTALL_TARGET_CMDS - $(BUSYBOX_MAKE_ENV) $(MAKE) $(BUSYBOX_MAKE_OPTS) -C $(@D) install - $(BUSYBOX_INSTALL_INITTAB) - $(BUSYBOX_INSTALL_UDHCPC_SCRIPT) - $(BUSYBOX_INSTALL_MDEV_CONF) -endef - -define BUSYBOX_INSTALL_INIT_SYSV - $(BUSYBOX_INSTALL_MDEV_SCRIPT) - $(BUSYBOX_INSTALL_LOGGING_SCRIPT) - $(BUSYBOX_INSTALL_WATCHDOG_SCRIPT) - $(BUSYBOX_INSTALL_TELNET_SCRIPT) -endef - -# Checks to give errors that the user can understand -# Must be before we call to kconfig-package -ifeq ($(BR2_PACKAGE_BUSYBOX)$(BR_BUILDING),yy) -ifeq ($(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG)),) -$(error No BusyBox configuration file specified, check your BR2_PACKAGE_BUSYBOX_CONFIG setting) -endif -endif - -$(eval $(kconfig-package)) diff --git a/package.bak/busybox/inittab b/package.bak/busybox/inittab deleted file mode 100644 index 3f49f6bd7a..0000000000 --- a/package.bak/busybox/inittab +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/inittab -# -# Copyright (C) 2001 Erik Andersen -# -# Note: BusyBox init doesn't support runlevels. The runlevels field is -# completely ignored by BusyBox init. If you want runlevels, use -# sysvinit. -# -# Format for each entry: ::: -# -# id == tty to run on, or empty for /dev/console -# runlevels == ignored -# action == one of sysinit, respawn, askfirst, wait, and once -# process == program to run - -# Startup the system -::sysinit:/bin/mount -t proc proc /proc -::sysinit:/bin/mount -o remount,rw / -::sysinit:/bin/mkdir -p /dev/pts -::sysinit:/bin/mkdir -p /dev/shm -::sysinit:/bin/mount -a -::sysinit:/bin/hostname -F /etc/hostname -# now run any rc scripts -::sysinit:/etc/init.d/rcS - -# Put a getty on the serial port -#ttyS0::respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL - -# Stuff to do for the 3-finger salute -#::ctrlaltdel:/sbin/reboot - -# Stuff to do before rebooting -::shutdown:/etc/init.d/rcK -::shutdown:/sbin/swapoff -a -::shutdown:/bin/umount -a -r diff --git a/package.bak/busybox/mdev.conf b/package.bak/busybox/mdev.conf deleted file mode 100644 index 241c1c27df..0000000000 --- a/package.bak/busybox/mdev.conf +++ /dev/null @@ -1,39 +0,0 @@ -# null may already exist; therefore ownership has to be changed with command -null root:root 666 @chmod 666 $MDEV -zero root:root 666 -full root:root 666 -random root:root 444 -urandom root:root 444 -hwrandom root:root 444 -grsec root:root 660 - -kmem root:root 640 -mem root:root 640 -port root:root 640 -# console may already exist; therefore ownership has to be changed with command -console root:tty 600 @chmod 600 $MDEV -ptmx root:tty 666 -pty.* root:tty 660 - -# Typical devices -tty root:tty 666 -tty[0-9]* root:tty 660 -vcsa*[0-9]* root:tty 660 -ttyS[0-9]* root:root 660 -ttyUSB[0-9]* root:root 660 - -# alsa sound devices -pcm.* root:audio 660 =snd/ -control.* root:audio 660 =snd/ -midi.* root:audio 660 =snd/ -seq root:audio 660 =snd/ -timer root:audio 660 =snd/ - -# input stuff -event[0-9]+ root:root 640 =input/ -mice root:root 640 =input/ -mouse[0-9] root:root 640 =input/ -ts[0-9] root:root 600 =input/ - -# load modules -$MODALIAS=.* root:root 660 @modprobe "$MODALIAS" diff --git a/package.bak/busybox/udhcpc.script b/package.bak/busybox/udhcpc.script deleted file mode 100755 index ad110d3a7f..0000000000 --- a/package.bak/busybox/udhcpc.script +++ /dev/null @@ -1,82 +0,0 @@ -#!/bin/sh - -# udhcpc script edited by Tim Riker - -[ -z "$1" ] && echo "Error: should be called from udhcpc" && exit 1 - -RESOLV_CONF="/etc/resolv.conf" -[ -e $RESOLV_CONF ] || touch $RESOLV_CONF -[ -n "$broadcast" ] && BROADCAST="broadcast $broadcast" -[ -n "$subnet" ] && NETMASK="netmask $subnet" - -case "$1" in - deconfig) - /sbin/ifconfig $interface up - /sbin/ifconfig $interface 0.0.0.0 - - # drop info from this interface - # resolv.conf may be a symlink to /tmp/, so take care - TMPFILE=$(mktemp) - grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE - cat $TMPFILE > $RESOLV_CONF - rm -f $TMPFILE - - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface - fi - ;; - - leasefail|nak) - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -wD $interface --no-chroot - fi - ;; - - renew|bound) - if [ -x /usr/sbin/avahi-autoipd ]; then - /usr/sbin/avahi-autoipd -k $interface - fi - /sbin/ifconfig $interface $ip $BROADCAST $NETMASK - - if [ -n "$router" ] ; then - echo "deleting routers" - while route del default gw 0.0.0.0 dev $interface 2> /dev/null; do - : - done - - for i in $router ; do - route add default gw $i dev $interface - done - fi - - # drop info from this interface - # resolv.conf may be a symlink to /tmp/, so take care - TMPFILE=$(mktemp) - grep -vE "# $interface\$" $RESOLV_CONF > $TMPFILE - cat $TMPFILE > $RESOLV_CONF - rm -f $TMPFILE - - # prefer rfc3359 domain search list (option 119) if available - if [ -n "$search" ]; then - search_list=$search - elif [ -n "$domain" ]; then - search_list=$domain - fi - - [ -n "$search_list" ] && - echo "search $search_list # $interface" >> $RESOLV_CONF - - for i in $dns ; do - echo adding dns $i - echo "nameserver $i # $interface" >> $RESOLV_CONF - done - ;; -esac - -HOOK_DIR="$0.d" -for hook in "${HOOK_DIR}/"*; do - [ -f "${hook}" -a -x "${hook}" ] || continue - "${hook}" "${@}" -done - -exit 0 diff --git a/package.bak/bwm-ng/Config.in b/package.bak/bwm-ng/Config.in deleted file mode 100644 index f93dd9358b..0000000000 --- a/package.bak/bwm-ng/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_BWM_NG - bool "bwm-ng" - help - Bandwidth Monitor NG is a small and console-based live - network and disk-io bandwidth monitor for Linux, BSD, - Solaris, Mac OS X and others. - - http://www.gropp.org/?id=projects&sub=bwm-ng diff --git a/package.bak/bwm-ng/bwm-ng.hash b/package.bak/bwm-ng/bwm-ng.hash deleted file mode 100644 index 1d3a240a26..0000000000 --- a/package.bak/bwm-ng/bwm-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 027cf3c960cd96fc9ffacdf7713df62d0fc55eeef4a1388289f8a62ae5e50df0 bwm-ng-0.6.1.tar.gz diff --git a/package.bak/bwm-ng/bwm-ng.mk b/package.bak/bwm-ng/bwm-ng.mk deleted file mode 100644 index e285422b92..0000000000 --- a/package.bak/bwm-ng/bwm-ng.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# bwm-ng -# -################################################################################ - -BWM_NG_VERSION = 0.6.1 -BWM_NG_SITE = http://www.gropp.org/bwm-ng -BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats -BWM_NG_LICENSE = GPLv2 -BWM_NG_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_NCURSES),y) -BWM_NG_CONF_OPTS += --with-ncurses -BWM_NG_DEPENDENCIES += ncurses -endif - -$(eval $(autotools-package)) diff --git a/package.bak/bzip2/0001-build-objects-twice.patch b/package.bak/bzip2/0001-build-objects-twice.patch deleted file mode 100644 index 9bde0f6488..0000000000 --- a/package.bak/bzip2/0001-build-objects-twice.patch +++ /dev/null @@ -1,56 +0,0 @@ -Build objects twice for shared and static libraries - -The existing Makefile causes problems on MIPS because the same object -files (not compiled with -fPIC) are used in static and shared libraries. -MIPS will refuce to link non-pic objects in shared libraries. -We fix this problems by creating a new rule for the shared library -and build the shared objects as *.sho instead of *.o. -Then, we use these objects to create the shared library. - -Signed-off-by: Markos Chandras - -Index: bzip2-1.0.6/Makefile-libbz2_so -=================================================================== ---- bzip2-1.0.6.orig/Makefile-libbz2_so -+++ bzip2-1.0.6/Makefile-libbz2_so -@@ -25,13 +25,13 @@ SHELL=/bin/sh - CC=gcc - override CFLAGS += -fpic -fPIC -Wall - --OBJS= blocksort.o \ -- huffman.o \ -- crctable.o \ -- randtable.o \ -- compress.o \ -- decompress.o \ -- bzlib.o -+OBJS= blocksort.sho \ -+ huffman.sho \ -+ crctable.sho \ -+ randtable.sho \ -+ compress.sho \ -+ decompress.sho \ -+ bzlib.sho - - all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) -@@ -45,17 +45,5 @@ install: - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared - --blocksort.o: blocksort.c -- $(CC) $(CFLAGS) -c blocksort.c --huffman.o: huffman.c -- $(CC) $(CFLAGS) -c huffman.c --crctable.o: crctable.c -- $(CC) $(CFLAGS) -c crctable.c --randtable.o: randtable.c -- $(CC) $(CFLAGS) -c randtable.c --compress.o: compress.c -- $(CC) $(CFLAGS) -c compress.c --decompress.o: decompress.c -- $(CC) $(CFLAGS) -c decompress.c --bzlib.o: bzlib.c -- $(CC) $(CFLAGS) -c bzlib.c -+%.sho: %.c -+ $(CC) $(CFLAGS) -o $@ -c $< diff --git a/package.bak/bzip2/0002-improve-build-system.patch b/package.bak/bzip2/0002-improve-build-system.patch deleted file mode 100644 index 90099aa288..0000000000 --- a/package.bak/bzip2/0002-improve-build-system.patch +++ /dev/null @@ -1,84 +0,0 @@ -Improve bzip2 build system - -This patch makes a number of improvements to the bzip2 build system: - - * Remove the BIGFILE variable that was used to force largefile - support. Now, the user of the Makefile is supposed to pass - -D_FILE_OFFSET_BITS=64 when largefile support is desired. - - * Use override CFLAGS += so that additional CFLAGS can be passed on - the command line. - - * Removed "forced" CFLAGS -O2, -g and -Winline. We don't want them by - default, and want the build system to use its own ones. - - * When creating the symbolic links bzegrep, bzfgrep, bzless and - bzcmp, don't link them to an absolute path, or they'll point to - some path on the build machine. - - * Provide an install target for the shared library, which creates the - appropriate symbolic links. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -20,8 +20,7 @@ - RANLIB=ranlib - LDFLAGS= - --BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) -+override CFLAGS += -Wall - - # Where you want it installed when you do 'make install' - PREFIX=/usr/local -@@ -90,14 +89,14 @@ - cp -f libbz2.a $(PREFIX)/lib - chmod a+r $(PREFIX)/lib/libbz2.a - cp -f bzgrep $(PREFIX)/bin/bzgrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzegrep -- ln -s -f $(PREFIX)/bin/bzgrep $(PREFIX)/bin/bzfgrep -+ ln -s -f bzgrep $(PREFIX)/bin/bzegrep -+ ln -s -f bzgrep $(PREFIX)/bin/bzfgrep - chmod a+x $(PREFIX)/bin/bzgrep - cp -f bzmore $(PREFIX)/bin/bzmore -- ln -s -f $(PREFIX)/bin/bzmore $(PREFIX)/bin/bzless -+ ln -s -f bzmore $(PREFIX)/bin/bzless - chmod a+x $(PREFIX)/bin/bzmore - cp -f bzdiff $(PREFIX)/bin/bzdiff -- ln -s -f $(PREFIX)/bin/bzdiff $(PREFIX)/bin/bzcmp -+ ln -s -f bzdiff $(PREFIX)/bin/bzcmp - chmod a+x $(PREFIX)/bin/bzdiff - cp -f bzgrep.1 bzmore.1 bzdiff.1 $(PREFIX)/man/man1 - chmod a+r $(PREFIX)/man/man1/bzgrep.1 -Index: b/Makefile-libbz2_so -=================================================================== ---- a/Makefile-libbz2_so -+++ b/Makefile-libbz2_so -@@ -23,8 +23,7 @@ - - SHELL=/bin/sh - CC=gcc --BIGFILES=-D_FILE_OFFSET_BITS=64 --CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) -+override CFLAGS += -fpic -fPIC -Wall - - OBJS= blocksort.o \ - huffman.o \ -@@ -37,8 +36,11 @@ - all: $(OBJS) - $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) - $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 -- rm -f libbz2.so.1.0 -- ln -s libbz2.so.1.0.6 libbz2.so.1.0 -+ -+install: -+ install -m 0755 -D libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0.6 -+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so -+ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 - - clean: - rm -f $(OBJS) bzip2.o libbz2.so.1.0.6 libbz2.so.1.0 bzip2-shared diff --git a/package.bak/bzip2/Config.in b/package.bak/bzip2/Config.in deleted file mode 100644 index dbc82496df..0000000000 --- a/package.bak/bzip2/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_BZIP2 - bool "bzip2" - help - Freely available, patent free, high-quality data compressor. - It typically compresses files to within 10% to 15% of the best - available techniques, while being around twice as fast at - compression and six times faster at decompression. - - http://www.bzip.org diff --git a/package.bak/bzip2/bzip2.hash b/package.bak/bzip2/bzip2.hash deleted file mode 100644 index 60b0a191ef..0000000000 --- a/package.bak/bzip2/bzip2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.bzip.org/downloads.html -md5 00b516f4704d4a7cb50a1d97e6e8e15b bzip2-1.0.6.tar.gz diff --git a/package.bak/bzip2/bzip2.mk b/package.bak/bzip2/bzip2.mk deleted file mode 100644 index 0597ab97d6..0000000000 --- a/package.bak/bzip2/bzip2.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# bzip2 -# -################################################################################ - -BZIP2_VERSION = 1.0.6 -BZIP2_SITE = http://www.bzip.org/$(BZIP2_VERSION) -BZIP2_INSTALL_STAGING = YES -BZIP2_LICENSE = bzip2 license -BZIP2_LICENSE_FILES = LICENSE - -ifeq ($(BR2_STATIC_LIBS),) -define BZIP2_BUILD_SHARED_CMDS - $(TARGET_MAKE_ENV) - $(MAKE) -C $(@D) -f Makefile-libbz2_so $(TARGET_CONFIGURE_OPTS) -endef -endif - -define BZIP2_BUILD_CMDS - $(TARGET_MAKE_ENV) - $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover $(TARGET_CONFIGURE_OPTS) - $(BZIP2_BUILD_SHARED_CMDS) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define BZIP2_INSTALL_STAGING_SHARED_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -f Makefile-libbz2_so PREFIX=$(STAGING_DIR)/usr -C $(@D) install -endef -endif - -define BZIP2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - PREFIX=$(STAGING_DIR)/usr -C $(@D) install - $(BZIP2_INSTALL_STAGING_SHARED_CMDS) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define BZIP2_INSTALL_TARGET_SHARED_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -f Makefile-libbz2_so PREFIX=$(TARGET_DIR)/usr -C $(@D) install -endef -endif - -# make sure busybox doesn't get overwritten by make install -define BZIP2_INSTALL_TARGET_CMDS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,bzip2 bunzip2 bzcat) - $(TARGET_MAKE_ENV) $(MAKE) \ - PREFIX=$(TARGET_DIR)/usr -C $(@D) install - $(BZIP2_INSTALL_TARGET_SHARED_CMDS) -endef - -define HOST_BZIP2_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) -f Makefile-libbz2_so - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) libbz2.a bzip2 bzip2recover -endef - -define HOST_BZIP2_INSTALL_CMDS - $(HOST_MAKE_ENV) \ - $(MAKE) PREFIX=$(HOST_DIR)/usr -C $(@D) install - $(HOST_MAKE_ENV) \ - $(MAKE) -f Makefile-libbz2_so PREFIX=$(HOST_DIR)/usr -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/c-ares/0001-use_check_build_instead_of_check_user.patch b/package.bak/c-ares/0001-use_check_build_instead_of_check_user.patch deleted file mode 100644 index 8210ed673b..0000000000 --- a/package.bak/c-ares/0001-use_check_build_instead_of_check_user.patch +++ /dev/null @@ -1,17 +0,0 @@ -Use XC_CHECK_BUILD_FLAGS instead of XC_CHECK_USER_FLAGS. -Otherwise it complains of CPPFLAGS in CFLAGS. - -Signed-off-by: Gustavo Zacarias - -diff -Nura c-ares-1.10.0.orig/m4/xc-cc-check.m4 c-ares-1.10.0/m4/xc-cc-check.m4 ---- c-ares-1.10.0.orig/m4/xc-cc-check.m4 2013-12-26 19:40:46.354195974 -0300 -+++ c-ares-1.10.0/m4/xc-cc-check.m4 2013-12-26 19:41:01.850718535 -0300 -@@ -59,7 +59,7 @@ - - AC_DEFUN([_XC_PROG_CC], [ - AC_REQUIRE([_XC_PROG_CC_PREAMBLE])dnl -- AC_REQUIRE([XC_CHECK_USER_FLAGS])dnl -+ AC_REQUIRE([XC_CHECK_BUILD_FLAGS])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AM_PROG_CC_C_O])dnl diff --git a/package.bak/c-ares/Config.in b/package.bak/c-ares/Config.in deleted file mode 100644 index be17b166a5..0000000000 --- a/package.bak/c-ares/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_C_ARES - bool "c-ares" - help - C library for asynchronous DNS requests. - - http://c-ares.haxx.se/ diff --git a/package.bak/c-ares/c-ares.hash b/package.bak/c-ares/c-ares.hash deleted file mode 100644 index f46ef02aba..0000000000 --- a/package.bak/c-ares/c-ares.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 8692f9403cdcdf936130e045c84021665118ee9bfea905d1a76f04d4e6f365fb c-ares-1.12.0.tar.gz diff --git a/package.bak/c-ares/c-ares.mk b/package.bak/c-ares/c-ares.mk deleted file mode 100644 index e817d4add5..0000000000 --- a/package.bak/c-ares/c-ares.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# c-ares -# -################################################################################ - -C_ARES_VERSION = 1.12.0 -C_ARES_SITE = http://c-ares.haxx.se/download -C_ARES_INSTALL_STAGING = YES -C_ARES_CONF_OPTS = --with-random=/dev/urandom -# Rebuild configure to avoid XC_CHECK_USER_CFLAGS -C_ARES_AUTORECONF = YES -C_ARES_LICENSE = MIT -# No standalone, use some source file -C_ARES_LICENSE_FILES = ares_mkquery.c - -$(eval $(autotools-package)) diff --git a/package.bak/c-icap-modules/Config.in b/package.bak/c-icap-modules/Config.in deleted file mode 100644 index 616456b4dc..0000000000 --- a/package.bak/c-icap-modules/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_C_ICAP_MODULES - bool "c-icap-modules" - depends on BR2_PACKAGE_C_ICAP - help - Additionals modules for c-icap server. - - http://c-icap.sourceforge.net/ diff --git a/package.bak/c-icap-modules/c-icap-modules.hash b/package.bak/c-icap-modules/c-icap-modules.hash deleted file mode 100644 index 5df1449871..0000000000 --- a/package.bak/c-icap-modules/c-icap-modules.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/c-icap/files/c-icap-modules/0.4.x/ -md5 5acd9487679ed47fbee00270d436718d c_icap_modules-0.4.2.tar.gz -sha1 e5f4203980b732b9de165c1e83c4703734c3e0e2 c_icap_modules-0.4.2.tar.gz diff --git a/package.bak/c-icap-modules/c-icap-modules.mk b/package.bak/c-icap-modules/c-icap-modules.mk deleted file mode 100644 index cf388aaabc..0000000000 --- a/package.bak/c-icap-modules/c-icap-modules.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# c-icap-modules -# -################################################################################ - -C_ICAP_MODULES_VERSION = 0.4.2 -C_ICAP_MODULES_SOURCE = c_icap_modules-$(C_ICAP_MODULES_VERSION).tar.gz -C_ICAP_MODULES_SITE = http://downloads.sourceforge.net/c-icap -C_ICAP_MODULES_LICENSE = GPLv2+ -C_ICAP_MODULES_LICENSE_FILES = COPYING -C_ICAP_MODULES_DEPENDENCIES = c-icap - -C_ICAP_MODULES_CONF_OPTS = \ - --with-c-icap=$(STAGING_DIR)/usr/ \ - --without-clamav - -ifeq ($(BR2_PACKAGE_ZLIB),y) -C_ICAP_MODULES_CONF_OPTS += --with-zlib -C_ICAP_MODULES_DEPENDENCIES += zlib -else -C_ICAP_MODULES_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_BERKELEYDB),y) -C_ICAP_MODULES_CONF_OPTS += --with-bdb -C_ICAP_MODULES_DEPENDENCIES += berkeleydb -else -C_ICAP_MODULES_CONF_OPTS += --without-bdb -endif - -$(eval $(autotools-package)) diff --git a/package.bak/c-icap/Config.in b/package.bak/c-icap/Config.in deleted file mode 100644 index 8f7963c26a..0000000000 --- a/package.bak/c-icap/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_C_ICAP - bool "c-icap" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - c-icap is an implementation of an ICAP server. It can be - used with HTTP proxies that support the ICAP protocol to - implement content adaptation and filtering services. Most - of the commercial HTTP proxies must support the ICAP - protocol. The open source Squid 3.x proxy server supports - it. - - http://c-icap.sourceforge.net/ - -comment "c-icap needs a toolchain w/ threads and dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/c-icap/S96cicap b/package.bak/c-icap/S96cicap deleted file mode 100644 index 7b95f86009..0000000000 --- a/package.bak/c-icap/S96cicap +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -# (Re)create directories -mkdir -p /var/run/c-icap -mkdir -p /var/log/c-icap - -case "$1" in - start) - printf "Starting c-icap server: " - start-stop-daemon -S -q -b -m -p /var/run/c-icap.pid \ - -x /usr/bin/c-icap -- -N - [ $? == 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping c-icap server: " - start-stop-daemon -K -q -p /var/run/c-icap.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: /etc/init.d/S96cicap {start|stop|restart|reload}" - exit 1 -esac diff --git a/package.bak/c-icap/c-icap.hash b/package.bak/c-icap/c-icap.hash deleted file mode 100644 index 2b083ef659..0000000000 --- a/package.bak/c-icap/c-icap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b138c7d7d9828d54c3307bcfe7b4917911266593832ffc26a60df9a0dfd2511e c_icap-0.4.2.tar.gz diff --git a/package.bak/c-icap/c-icap.mk b/package.bak/c-icap/c-icap.mk deleted file mode 100644 index 3078721bce..0000000000 --- a/package.bak/c-icap/c-icap.mk +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################ -# -# c-icap -# -################################################################################ - -C_ICAP_VERSION = 0.4.2 -C_ICAP_SOURCE = c_icap-$(C_ICAP_VERSION).tar.gz -C_ICAP_SITE = http://downloads.sourceforge.net/c-icap -C_ICAP_LICENSE = LGPLv2.1+ -C_ICAP_LICENSE_FILES = COPYING -C_ICAP_INSTALL_STAGING = YES -C_ICAP_CONFIG_SCRIPTS = c-icap-config c-icap-libicapapi-config -C_ICAP_CONF_OPTS = \ - --with-process-mutexes=posix \ - --without-ldap \ - --without-perl \ - --enable-large-files \ - --enable-ipv6 -# Pre-seed cache variables for tests done with AC_TRY_RUN that are not -# cross-compile friendly -C_ICAP_CONF_ENV = ac_cv_10031b_ipc_sem=yes ac_cv_fcntl=yes -# c-icap adds '-Wl,-rpath -Wl,/usr/lib' to the link command line. This -# causes the linker to search for libraries that are listed as NEEDED -# in the libicapapi.so ELF header in host libraries, which breaks the -# build. The affected library is libz. Forcing AUTORECONF adds -lz to -# the link command line, and that makes the linker look first in -# sysroot, thus avoiding the build breakage. -C_ICAP_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_BERKELEYDB),y) -C_ICAP_CONF_OPTS += --with-berkeleydb -C_ICAP_DEPENDENCIES += berkeleydb -else -C_ICAP_CONF_OPTS += --without-berkeleydb -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -C_ICAP_CONF_OPTS += --with-bzip2 -C_ICAP_DEPENDENCIES += bzip2 -else -C_ICAP_CONF_OPTS += --without-bzip2 -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -C_ICAP_CONF_OPTS += --with-zlib -C_ICAP_DEPENDENCIES += zlib -else -C_ICAP_CONF_OPTS += --without-zlib -endif - -define C_ICAP_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/c-icap/S96cicap $(TARGET_DIR)/etc/init.d/S96cicap -endef - -# Tweak the installation: -# - Removed unneeded sample configuration files (c-icap.*.default), -# since some real ones are also installed -# - Tweak some paths in the c-icap.conf configuration file -# - Tweak the -config scripts, because the generic -# _CONFIG_SCRIPTS logic doesn't tweak them enough -define C_ICAP_TUNE_INSTALLATION - $(RM) -f $(TARGET_DIR)/etc/c-icap.*.default - $(SED) 's%/usr/etc/%/etc/%' $(TARGET_DIR)/etc/c-icap.conf - $(SED) 's%/usr/var/%/var/%' $(TARGET_DIR)/etc/c-icap.conf - $(SED) 's%INCDIR=.*%INCDIR=$(STAGING_DIR)/usr/include%' \ - $(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config - $(SED) 's%INCDIR2=.*%INCDIR2=$(STAGING_DIR)/usr/include/c_icap%' \ - $(STAGING_DIR)/usr/bin/{c-icap,c-icap-libicapapi}-config - $(SED) 's%-L$$LIBDIR %%' $(STAGING_DIR)/usr/bin/c-icap-libicapapi-config -endef - -C_ICAP_POST_INSTALL_TARGET_HOOKS += C_ICAP_TUNE_INSTALLATION - -$(eval $(autotools-package)) diff --git a/package.bak/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/package.bak/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch deleted file mode 100644 index 108297c9c2..0000000000 --- a/package.bak/c-periphery/0001-Add-missing-header-for-musl-compatibility.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 22:42:39 +0200 -Subject: [PATCH] Add missing header for musl compatibility - - is needed to get the definition of _IOC_SIZEBITS and -solve the following build failure: - -src/spi.c: In function 'spi_transfer': -src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function) - if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1) - -Signed-off-by: Thomas Petazzoni ---- - src/spi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/spi.c b/src/spi.c -index 52a8d3d..1a6b17c 100644 ---- a/src/spi.c -+++ b/src/spi.c -@@ -16,6 +16,7 @@ - #include - - #include -+#include - #include - - #include "spi.h" --- -2.5.0 - diff --git a/package.bak/c-periphery/0002-Fix-build-on-SPARC.patch b/package.bak/c-periphery/0002-Fix-build-on-SPARC.patch deleted file mode 100644 index e491f6f728..0000000000 --- a/package.bak/c-periphery/0002-Fix-build-on-SPARC.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 295316c3f44c3e779e85d7453424496a3bb4bc48 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 22:56:09 +0200 -Subject: [PATCH] Fix build on SPARC - -On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000 -are not necessarily available, so use those values only if defined in -the kernel headers. - -It fixes SPARC build failures such as: - -src/serial.c: In function '_serial_baudrate_to_bits': -src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function) - case 2500000: return B2500000; - ^ -src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in -src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function) - case 3000000: return B3000000; - ^ - -Signed-off-by: Thomas Petazzoni ---- - src/serial.c | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/src/serial.c b/src/serial.c -index e385309..efd425e 100644 ---- a/src/serial.c -+++ b/src/serial.c -@@ -70,10 +70,18 @@ static int _serial_baudrate_to_bits(uint32_t baudrate) { - case 1152000: return B1152000; - case 1500000: return B1500000; - case 2000000: return B2000000; -+#ifdef B2500000 - case 2500000: return B2500000; -+#endif -+#ifdef B3000000 - case 3000000: return B3000000; -+#endif -+#ifdef B3500000 - case 3500000: return B3500000; -+#endif -+#ifdef B4000000 - case 4000000: return B4000000; -+#endif - default: return -1; - } - } -@@ -107,10 +115,18 @@ static int _serial_bits_to_baudrate(uint32_t bits) { - case B1152000: return 1152000; - case B1500000: return 1500000; - case B2000000: return 2000000; -+#ifdef B2500000 - case B2500000: return 2500000; -+#endif -+#ifdef B3000000 - case B3000000: return 3000000; -+#endif -+#ifdef B3500000 - case B3500000: return 3500000; -+#endif -+#ifdef B4000000 - case B4000000: return 4000000; -+#endif - default: return -1; - } - } --- -2.5.0 - diff --git a/package.bak/c-periphery/Config.in b/package.bak/c-periphery/Config.in deleted file mode 100644 index 0bfb4b1f11..0000000000 --- a/package.bak/c-periphery/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_C_PERIPHERY - bool "c-periphery" - help - c-periphery is a set of C wrapper functions for GPIO, SPI, - I2C, MMIO, and Serial peripheral I/O interface access in - userspace Linux. The c-periphery wrappers simplify and - consolidate the native Linux APIs to these - interfaces. c-periphery is useful in embedded Linux - environments (including BeagleBone, Raspberry Pi, - etc. platforms) for interfacing with external - peripherals. c-periphery is re-entrant, uses static - allocations, has no dependencies outside the standard C - library and Linux, compiles into a static library for easy - integration with other projects, and is MIT licensed. - - https://github.com/vsergeev/c-periphery diff --git a/package.bak/c-periphery/c-periphery.hash b/package.bak/c-periphery/c-periphery.hash deleted file mode 100644 index 516d340d96..0000000000 --- a/package.bak/c-periphery/c-periphery.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5ae4c3f9de0e64d8153ee58b85c4a5defb9f755c6ae215f11b46719bbbac1335 c-periphery-v1.0.3.tar.gz diff --git a/package.bak/c-periphery/c-periphery.mk b/package.bak/c-periphery/c-periphery.mk deleted file mode 100644 index 730b3bc30b..0000000000 --- a/package.bak/c-periphery/c-periphery.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# c-periphery -# -################################################################################ - -C_PERIPHERY_VERSION = v1.0.3 -C_PERIPHERY_SITE = $(call github,vsergeev,c-periphery,$(C_PERIPHERY_VERSION)) -C_PERIPHERY_INSTALL_STAGING = YES -# only a static library -C_PERIPHERY_INSTALL_TARGET = NO -C_PERIPHERY_LICENSE = MIT -C_PERIPHERY_LICENSE_FILES = LICENSE - -define C_PERIPHERY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# There is no 'install' rule in the Makefile, so we handle things -# manually. -define C_PERIPHERY_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/periphery.a $(STAGING_DIR)/usr/lib/libc-periphery.a - mkdir -p $(STAGING_DIR)/usr/include/c-periphery/ - cp -dpfr $(@D)/src/*.h $(STAGING_DIR)/usr/include/c-periphery/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/ca-certificates/Config.in b/package.bak/ca-certificates/Config.in deleted file mode 100644 index a278a620c7..0000000000 --- a/package.bak/ca-certificates/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_CA_CERTIFICATES - bool "CA Certificates" - help - This package includes PEM files of CA certificates to allow - SSL-based applications to check for the authenticity of SSL - connections. - - It includes, among others, certificate authorities used by the - Debian infrastructure and those shipped with Mozilla's browsers. - - http://anonscm.debian.org/gitweb/?p=collab-maint/ca-certificates.git diff --git a/package.bak/ca-certificates/ca-certificates.hash b/package.bak/ca-certificates/ca-certificates.hash deleted file mode 100644 index ecedba4f63..0000000000 --- a/package.bak/ca-certificates/ca-certificates.hash +++ /dev/null @@ -1,3 +0,0 @@ -# hashes from: $(CA_CERTIFICATES_SITE)/ca-certificates_$(CA_CERTIFICATES_VERSION).dsc : -sha1 b190ca8849697e842e69401b28d4ee27130d8c4d ca-certificates_20161130.tar.xz -sha256 04bca9e142a90a834aca0311f7ced237368d71fee7bd5c9f68ef7f4611aee471 ca-certificates_20161130.tar.xz diff --git a/package.bak/ca-certificates/ca-certificates.mk b/package.bak/ca-certificates/ca-certificates.mk deleted file mode 100644 index d077a1963a..0000000000 --- a/package.bak/ca-certificates/ca-certificates.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# ca-certificates -# -################################################################################ - -CA_CERTIFICATES_VERSION = 20161130 -CA_CERTIFICATES_SOURCE = ca-certificates_$(CA_CERTIFICATES_VERSION).tar.xz -CA_CERTIFICATES_SITE = http://snapshot.debian.org/archive/debian/20161205T153846Z/pool/main/c/ca-certificates -CA_CERTIFICATES_DEPENDENCIES = host-openssl -# ca-certificates can be built with either python 2 or python 3 -# but it must be at least python 2.7 -CA_CERTIFICATES_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) -CA_CERTIFICATES_LICENSE = GPLv2+ (script), MPLv2.0 (data) -CA_CERTIFICATES_LICENSE_FILES = debian/copyright - -define CA_CERTIFICATES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all -endef - -define CA_CERTIFICATES_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/ca-certificates - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/ssl/certs - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) - rm -f $(TARGET_DIR)/usr/sbin/update-ca-certificates - - # Remove any existing certificates under /etc/ssl/certs - rm -f $(TARGET_DIR)/etc/ssl/certs/* - - # Create symlinks to certificates under /etc/ssl/certs - # and generate the bundle - cd $(TARGET_DIR) ;\ - for i in `find usr/share/ca-certificates -name "*.crt"` ; do \ - ln -sf ../../../$$i etc/ssl/certs/`basename $${i} .crt`.pem ;\ - cat $$i >>etc/ssl/certs/ca-certificates.crt ;\ - done - - # Create symlinks to the certificates by their hash values - $(HOST_DIR)/usr/bin/c_rehash $(TARGET_DIR)/etc/ssl/certs -endef - -$(eval $(generic-package)) diff --git a/package.bak/cache-calibrator/0001-Fix-conflicting-round-function.patch b/package.bak/cache-calibrator/0001-Fix-conflicting-round-function.patch deleted file mode 100644 index 71181a6387..0000000000 --- a/package.bak/cache-calibrator/0001-Fix-conflicting-round-function.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 39ac7268c4350040976005da98daf10edf676d3e Mon Sep 17 00:00:00 2001 -From: Stephan Hoffmann -Date: Mon, 28 Jan 2013 17:32:10 +0100 -Subject: [PATCH] Fix conflicting round() function - -calibrator.c defines a local round() function that conflicts -with the one from the standard library. - -This is fixed by renaming the local function. - -Signed-off-by: Stephan Hoffmann ---- - calibrator.c | 30 +++++++++++++++--------------- - 1 files changed, 15 insertions(+), 15 deletions(-) - -diff --git a/calibrator.c b/calibrator.c -index e045dfd..8471c04 100644 ---- a/calibrator.c -+++ b/calibrator.c -@@ -128,7 +128,7 @@ void ErrXit(char *format, ...) { - exit(1); - } - --lng round(dbl x) -+lng lng_round(dbl x) - { - return (lng)(x + 0.5); - } -@@ -890,16 +890,16 @@ void plotCache(cacheInfo *cache, lng **result, lng MHz, char *fn, FILE *fp, lng - fprintf(fp, ")\n"); - fprintf(fp, "set y2tics"); - for (l = 0, s = " ("; l <= cache->levels; l++, s = ", ") { -- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay)); -- else fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay)); -+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(cache->latency1[l] - delay)), NSperIt(cache->latency1[l] - delay)); -+ else fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(cache->latency2[l] - delay)), NSperIt(cache->latency2[l] - delay)); - } - for (y = 1; y <= yh; y *= 10) { - fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y); - } - fprintf(fp, ")\n"); - for (l = 0; l <= cache->levels; l++) { -- if (!delay) z = (dbl)round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz; -- else z = (dbl)round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz; -+ if (!delay) z = (dbl)lng_round(CYperIt(cache->latency1[l] - delay)) * 1000.0 / (dbl)MHz; -+ else z = (dbl)lng_round(CYperIt(cache->latency2[l] - delay)) * 1000.0 / (dbl)MHz; - fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + 1, z, xl, z); - fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z); - } -@@ -986,16 +986,16 @@ void plotTLB(TLBinfo *TLB, lng **result, lng MHz, char *fn, FILE *fp, lng delay) - fprintf(fp, "%s'' %ld)\n", s, TLB->mincachelines); - fprintf(fp, "set y2tics"); - for (l = 0, s = " ("; l <= TLB->levels; l++, s = ", ") { -- if (!delay) fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay)); -- else fprintf(fp, "%s'(%ld)' %f", s, round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay)); -+ if (!delay) fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(TLB->latency1[l] - delay)), NSperIt(TLB->latency1[l] - delay)); -+ else fprintf(fp, "%s'(%ld)' %f", s, lng_round(CYperIt(TLB->latency2[l] - delay)), NSperIt(TLB->latency2[l] - delay)); - } - for (y = 1; y <= yh; y *= 10) { - fprintf(fp, "%s'%1.3g' %ld", s, (dbl)(y * MHz) / 1000.0, y); - } - fprintf(fp, ")\n"); - for (l = 0; l <= TLB->levels; l++) { -- if (!delay) z = (dbl)round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz; -- else z = (dbl)round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz; -+ if (!delay) z = (dbl)lng_round(CYperIt(TLB->latency1[l] - delay)) * 1000.0 / (dbl)MHz; -+ else z = (dbl)lng_round(CYperIt(TLB->latency2[l] - delay)) * 1000.0 / (dbl)MHz; - fprintf(fp, "set label %ld '(%1.3g) ' at %f,%f right\n", l + 1, z, xl, z); - fprintf(fp, "set arrow %ld from %f,%f to %f,%f nohead lt 0\n", l + 1, xl, z, xh, z); - } -@@ -1023,9 +1023,9 @@ void printCPU(cacheInfo *cache, lng MHz, lng delay) - FILE *fp = stdout; - - fprintf(fp, "CPU loop + L1 access: "); -- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), round(CYperIt(cache->latency1[0]))); -+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[0]), lng_round(CYperIt(cache->latency1[0]))); - fprintf(fp, " ( delay: "); -- fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), round(CYperIt(delay))); -+ fprintf(fp, " %6.2f ns = %3ld cy )\n", NSperIt(delay), lng_round(CYperIt(delay))); - fprintf(fp, "\n"); - fflush(fp); - } -@@ -1047,8 +1047,8 @@ void printCache(cacheInfo *cache, lng MHz) - fprintf(fp, " %3ld KB ", cache->size[l] / 1024); - } - fprintf(fp, " %3ld bytes ", cache->linesize[l + 1]); -- fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), round(CYperIt(cache->latency2[l + 1] - cache->latency2[l]))); -- fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), round(CYperIt(cache->latency1[l + 1] - cache->latency1[l]))); -+ fprintf(fp, " %6.2f ns = %3ld cy " , NSperIt(cache->latency2[l + 1] - cache->latency2[l]), lng_round(CYperIt(cache->latency2[l + 1] - cache->latency2[l]))); -+ fprintf(fp, " %6.2f ns = %3ld cy\n", NSperIt(cache->latency1[l + 1] - cache->latency1[l]), lng_round(CYperIt(cache->latency1[l + 1] - cache->latency1[l]))); - } - fprintf(fp, "\n"); - fflush(fp); -@@ -1075,9 +1075,9 @@ void printTLB(TLBinfo *TLB, lng MHz) - } else { - fprintf(fp, " %3ld KB ", TLB->pagesize[l + 1] / 1024); - } -- fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l]))); -+ fprintf(fp, " %6.2f ns = %3ld cy ", NSperIt(TLB->latency2[l + 1] - TLB->latency2[l]), lng_round(CYperIt(TLB->latency2[l + 1] - TLB->latency2[l]))); - /* -- fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l]))); -+ fprintf(fp, " %6.2f ns = %3ld cy" , NSperIt(TLB->latency1[l + 1] - TLB->latency1[l]), lng_round(CYperIt(TLB->latency1[l + 1] - TLB->latency1[l]))); - */ - fprintf(fp, "\n"); - } --- -1.7.0.4 - diff --git a/package.bak/cache-calibrator/Config.in b/package.bak/cache-calibrator/Config.in deleted file mode 100644 index db780e9fcd..0000000000 --- a/package.bak/cache-calibrator/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_CACHE_CALIBRATOR - bool "cache-calibrator" - help - Cache calibrator is a small C program that is supposed to - analyze a computers (cache-) memory system and extract - useful information - - http://homepages.cwi.nl/~manegold/Calibrator/ - - It is also recommended as a load generator for realtime - testing in: - - https://rt.wiki.kernel.org/index.php/RT_PREEMPT_HOWTO diff --git a/package.bak/cache-calibrator/cache-calibrator.hash b/package.bak/cache-calibrator/cache-calibrator.hash deleted file mode 100644 index df61d17e10..0000000000 --- a/package.bak/cache-calibrator/cache-calibrator.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2018ed8fa733155d44ceb1c0066c5cf8df7771cdf7cfca0a07b8dd9bebd9c221 calibrator.c diff --git a/package.bak/cache-calibrator/cache-calibrator.mk b/package.bak/cache-calibrator/cache-calibrator.mk deleted file mode 100644 index d0620655c7..0000000000 --- a/package.bak/cache-calibrator/cache-calibrator.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# cache-calibrator -# -################################################################################ - -CACHE_CALIBRATOR_SOURCE = calibrator.c -CACHE_CALIBRATOR_SITE = http://homepages.cwi.nl/~manegold/Calibrator/src -CACHE_CALIBRATOR_LICENSE = Cache calibrator license -CACHE_CALIBRATOR_LICENSE_FILES = calibrator.c - -define CACHE_CALIBRATOR_EXTRACT_CMDS - cp $(DL_DIR)/$(CACHE_CALIBRATOR_SOURCE) $(@D) -endef - -define CACHE_CALIBRATOR_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) $(@D)/calibrator.c -o $(@D)/cache_calibrator -lm -endef - -define CACHE_CALIBRATOR_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/cache_calibrator $(TARGET_DIR)/usr/bin/cache_calibrator -endef - -$(eval $(generic-package)) diff --git a/package.bak/cairo/0001-blackfin-build-fix.patch b/package.bak/cairo/0001-blackfin-build-fix.patch deleted file mode 100644 index 0e8dd3ad65..0000000000 --- a/package.bak/cairo/0001-blackfin-build-fix.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix build on platforms where __USER_LABEL_PREFIX__ is not empty - -On most platforms, a C language symbol and its assembly equivalent are -identical. However, on the Blackfin architecture, this isn't the case, -the corresponding C language symbol in assembly is prepended with a -"_". Blackfin therefore has __USER_LABEL_PREFIX__ defined to "_". - -Cairo already has some code to cope with __USER_LABEL_PREFIX__, but -this code isn't completely correct: it prepends both assembly symbols -and C symbols with __USER_LABEL_PREFIX__, which cannot work. - -This patch fixes that by using the existing slim_hidden_asmname() to -define assembly symbols, and introduce a new slim_hidden_realname() -for C symbols. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/cairo-compiler-private.h -=================================================================== ---- a/src/cairo-compiler-private.h -+++ b/src/cairo-compiler-private.h -@@ -93,12 +93,13 @@ - __asm__ (slim_hidden_asmname (internal)) - # define slim_hidden_def1(name, internal) \ - extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name)) \ -- __attribute__((__alias__(slim_hidden_asmname(internal)))) -+ __attribute__((__alias__(slim_hidden_realname(internal)))) - # define slim_hidden_ulp slim_hidden_ulp1(__USER_LABEL_PREFIX__) - # define slim_hidden_ulp1(x) slim_hidden_ulp2(x) - # define slim_hidden_ulp2(x) #x - # define slim_hidden_asmname(name) slim_hidden_asmname1(name) - # define slim_hidden_asmname1(name) slim_hidden_ulp #name -+# define slim_hidden_realname(name) #name - #else - # define slim_hidden_proto(name) int _cairo_dummy_prototype(void) - # define slim_hidden_proto_no_warn(name) int _cairo_dummy_prototype(void) -Index: b/util/cairo-script/cairo-script-private.h -=================================================================== ---- a/util/cairo-script/cairo-script-private.h -+++ b/util/cairo-script/cairo-script-private.h -@@ -109,12 +109,13 @@ - __asm__ (slim_hidden_asmname (internal)) - # define slim_hidden_def1(name, internal) \ - extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name)) \ -- __attribute__((__alias__(slim_hidden_asmname(internal)))) -+ __attribute__((__alias__(slim_hidden_realname(internal)))) - # define slim_hidden_ulp slim_hidden_ulp1(__USER_LABEL_PREFIX__) - # define slim_hidden_ulp1(x) slim_hidden_ulp2(x) - # define slim_hidden_ulp2(x) #x - # define slim_hidden_asmname(name) slim_hidden_asmname1(name) - # define slim_hidden_asmname1(name) slim_hidden_ulp #name -+# define slim_hidden_realname(name) #name - #else - # define slim_hidden_proto(name) int _csi_dummy_prototype(void) - # define slim_hidden_proto_no_warn(name) int _csi_dummy_prototype(void) diff --git a/package.bak/cairo/0003-fix-nofork-build.patch b/package.bak/cairo/0003-fix-nofork-build.patch deleted file mode 100644 index 702e9910a5..0000000000 --- a/package.bak/cairo/0003-fix-nofork-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -test: fix build when SHOULD_FORK is false - -The code in test/cairo-test-runner.c properly takes into account -platforms that do have fork() support, and uses the SHOULD_FORK define -to know whether fork is available or not. - -However, this SHOULD_FORK macro is used to guard the inclusion of -, which is needed to get the prototype of other functions -(namely readlink and getppid), that are used in portions of this file -not guarded by SHOULD_FORK. - -Signed-off-by: Thomas Petazzoni - -Index: b/test/cairo-test-runner.c -=================================================================== ---- a/test/cairo-test-runner.c -+++ b/test/cairo-test-runner.c -@@ -36,10 +36,10 @@ - #include /* for version information */ - - #define SHOULD_FORK HAVE_FORK && HAVE_WAITPID --#if SHOULD_FORK - #if HAVE_UNISTD_H - #include - #endif -+#if SHOULD_FORK - #if HAVE_SIGNAL_H - #include - #endif diff --git a/package.bak/cairo/0005-fix-gcc-49-build.patch b/package.bak/cairo/0005-fix-gcc-49-build.patch deleted file mode 100644 index 112c9ea053..0000000000 --- a/package.bak/cairo/0005-fix-gcc-49-build.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix build with gcc 4.9 - -cairo fails to build with gcc 4.9 due to a bad interaction of cairo -modules with the LTO mechanism. The suggested workaround is to pass --ffat-lto-objects. See -https://bugs.freedesktop.org/show_bug.cgi?id=77060 for the upstream -bug report, and -https://bugs.archlinux.org/task/40313?project=1&openedfrom=-1+week for -the ArchLinux bug report. - -This patch passes -ffat-lto-objects when gcc understands this option, -in order to provide compatibility with gcc versions older than 4.8, -which did not provide this option, but are anyway unaffected by the -issue. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -37,6 +37,16 @@ - m4_include(build/configure.ac.pthread) dnl checks for pthreads - AC_CACHE_SAVE - -+old_cflags=$CFLAGS -+CFLAGS=-ffat-lto-objects -+AC_MSG_CHECKING([whether CC supports -ffat-lto-objects]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -+ [AC_MSG_RESULT([yes])] -+ [LTO_CFLAGS=-ffat-lto-objects], -+ [AC_MSG_RESULT([no])] -+) -+CFLAGS="${old_CFLAGS} ${LTO_CFLAGS}" -+ - dnl =========================================================================== - - AC_CHECK_LIB(z, compress, diff --git a/package.bak/cairo/Config.in b/package.bak/cairo/Config.in deleted file mode 100644 index 0c87a2904b..0000000000 --- a/package.bak/cairo/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -config BR2_PACKAGE_CAIRO - bool "cairo" - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - help - Cairo is a 2D graphics library with support for multiple - output devices. Currently supported output targets include - the X Window System, Win32, image buffers, and PostScript, - PDF, and SVG file output. Experimental backends include - OpenGL (through glitz), Quartz, and XCB. - - http://cairographics.org/ - -if BR2_PACKAGE_CAIRO - -config BR2_PACKAGE_CAIRO_PS - bool "postscript support" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_PDF - bool "pdf support" - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_PNG - bool "png support" - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - -config BR2_PACKAGE_CAIRO_SCRIPT - bool "script support" - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_CAIRO_SVG - bool "svg support" - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PDF - -config BR2_PACKAGE_CAIRO_TEE - bool "tee support" - -config BR2_PACKAGE_CAIRO_XML - bool "xml support" - select BR2_PACKAGE_CAIRO_PNG - -endif diff --git a/package.bak/cairo/cairo.hash b/package.bak/cairo/cairo.hash deleted file mode 100644 index dd5365ba7e..0000000000 --- a/package.bak/cairo/cairo.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://cairographics.org/releases/cairo-1.14.8.tar.xz.sha1 -sha1 c6f7b99986f93c9df78653c3e6a3b5043f65145e cairo-1.14.8.tar.xz -# Calculated based on the hash above -sha256 d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20 cairo-1.14.8.tar.xz diff --git a/package.bak/cairo/cairo.mk b/package.bak/cairo/cairo.mk deleted file mode 100644 index 761c6f4df2..0000000000 --- a/package.bak/cairo/cairo.mk +++ /dev/null @@ -1,171 +0,0 @@ -################################################################################ -# -# cairo -# -################################################################################ - -CAIRO_VERSION = 1.14.8 -CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz -CAIRO_LICENSE = LGPLv2.1+ -CAIRO_LICENSE_FILES = COPYING -CAIRO_SITE = http://cairographics.org/releases -CAIRO_INSTALL_STAGING = YES -CAIRO_AUTORECONF = YES - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1" -endif - -# cairo can use C++11 atomics when available, so we need to link with -# libatomic for the architectures who need libatomic. -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -CAIRO_CONF_ENV += LIBS="-latomic" -endif - -CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no - -CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman - -# Just the bare minimum to make other host-* packages happy -HOST_CAIRO_CONF_OPTS = \ - --enable-trace=no \ - --enable-interpreter=no \ - --disable-directfb \ - --enable-ft \ - --disable-gobject \ - --disable-glesv2 \ - --disable-vg \ - --disable-xlib \ - --disable-xcb \ - --without-x \ - --disable-xlib-xrender \ - --disable-ps \ - --disable-pdf \ - --enable-png \ - --disable-script \ - --disable-svg \ - --disable-tee \ - --disable-xml -HOST_CAIRO_DEPENDENCIES = \ - host-freetype \ - host-fontconfig \ - host-libpng \ - host-pixman \ - host-pkgconf - -# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on -# DirectFB. Break circular dependency by disabling DirectFB support in Cairo -# (which is experimental) -ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx) -CAIRO_CONF_OPTS += --enable-directfb -CAIRO_DEPENDENCIES += directfb -else -CAIRO_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -CAIRO_CONF_OPTS += --enable-ft -CAIRO_DEPENDENCIES += freetype -else -CAIRO_CONF_OPTS += --disable-ft -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -CAIRO_CONF_OPTS += --enable-gobject -CAIRO_DEPENDENCIES += libglib2 -else -CAIRO_CONF_OPTS += --disable-gobject -endif - -# Can use GL or GLESv2 but not both -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -CAIRO_CONF_OPTS += --enable-gl --disable-glesv2 -CAIRO_DEPENDENCIES += libgl -else -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -CAIRO_CONF_OPTS += --disable-gl --enable-glesv2 -CAIRO_DEPENDENCIES += libgles -else -CAIRO_CONF_OPTS += --disable-gl --disable-glesv2 -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -CAIRO_CONF_OPTS += --enable-vg -CAIRO_DEPENDENCIES += libopenvg -else -CAIRO_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -CAIRO_DEPENDENCIES += lzo -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x -CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -else -CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -CAIRO_CONF_OPTS += --enable-xlib-xrender -CAIRO_DEPENDENCIES += xlib_libXrender -else -CAIRO_CONF_OPTS += --disable-xlib-xrender -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PS),y) -CAIRO_CONF_OPTS += --enable-ps -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-ps -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PDF),y) -CAIRO_CONF_OPTS += --enable-pdf -CAIRO_DEPENDENCIES += zlib -else -CAIRO_CONF_OPTS += --disable-pdf -endif - -ifeq ($(BR2_PACKAGE_CAIRO_PNG),y) -CAIRO_CONF_OPTS += --enable-png -CAIRO_DEPENDENCIES += libpng -else -CAIRO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y) -CAIRO_CONF_OPTS += --enable-script -else -CAIRO_CONF_OPTS += --disable-script -endif - -ifeq ($(BR2_PACKAGE_CAIRO_SVG),y) -CAIRO_CONF_OPTS += --enable-svg -else -CAIRO_CONF_OPTS += --disable-svg -endif - -ifeq ($(BR2_PACKAGE_CAIRO_TEE),y) -CAIRO_CONF_OPTS += --enable-tee -else -CAIRO_CONF_OPTS += --disable-tee -endif - -ifeq ($(BR2_PACKAGE_CAIRO_XML),y) -CAIRO_CONF_OPTS += --enable-xml -else -CAIRO_CONF_OPTS += --disable-xml -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/cairomm/Config.in b/package.bak/cairomm/Config.in deleted file mode 100644 index c0d5ccd1df..0000000000 --- a/package.bak/cairomm/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_CAIROMM - bool "cairomm" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBSIGC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_INSTALL_LIBSTDCPP - help - The cairomm package is a set of C++ bindings for Cairo. - - http://www.gtkmm.org/ - -comment "cairomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/cairomm/cairomm.hash b/package.bak/cairomm/cairomm.hash deleted file mode 100644 index bebd474b12..0000000000 --- a/package.bak/cairomm/cairomm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/cairomm/1.12/cairomm-1.12.0.sha256sum -sha256 a54ada8394a86182525c0762e6f50db6b9212a2109280d13ec6a0b29bfd1afe6 cairomm-1.12.0.tar.xz diff --git a/package.bak/cairomm/cairomm.mk b/package.bak/cairomm/cairomm.mk deleted file mode 100644 index 7a56a6822a..0000000000 --- a/package.bak/cairomm/cairomm.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# cairomm -# -################################################################################ - -CAIROMM_VERSION_MAJOR = 1.12 -CAIROMM_VERSION = $(CAIROMM_VERSION_MAJOR).0 -CAIROMM_LICENSE = LGPLv2+ -CAIROMM_LICENSE_FILES = COPYING -CAIROMM_SOURCE = cairomm-$(CAIROMM_VERSION).tar.xz -CAIROMM_SITE = http://ftp.gnome.org/pub/gnome/sources/cairomm/$(CAIROMM_VERSION_MAJOR) -CAIROMM_INSTALL_STAGING = YES -CAIROMM_DEPENDENCIES = cairo libglib2 libsigc host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/can-utils/Config.in b/package.bak/can-utils/Config.in deleted file mode 100644 index bfa522d989..0000000000 --- a/package.bak/can-utils/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_CAN_UTILS - bool "can-utils" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() - help - SocketCAN is a set of open source CAN drivers and a - networking stack. - This package provides various tools for this stack. - - http://elinux.org/Can-utils - -comment "can-utils needs a toolchain w/ NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU diff --git a/package.bak/can-utils/can-utils.hash b/package.bak/can-utils/can-utils.hash deleted file mode 100644 index 64c4cf6692..0000000000 --- a/package.bak/can-utils/can-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c4b6b347c1c165a64c1156bb8816bce557945dd770f61b8bdc8fdb7c0744af27 can-utils-c3305fdd515464153d20199db232b6124bc962c0.tar.gz diff --git a/package.bak/can-utils/can-utils.mk b/package.bak/can-utils/can-utils.mk deleted file mode 100644 index 6be41a62b0..0000000000 --- a/package.bak/can-utils/can-utils.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# can-utils -# -################################################################################ - -CAN_UTILS_VERSION = c3305fdd515464153d20199db232b6124bc962c0 -CAN_UTILS_SITE = $(call github,linux-can,can-utils,$(CAN_UTILS_VERSION)) -CAN_UTILS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/canfestival/0001-install-pkgconfig-module-for-canfestival.patch b/package.bak/canfestival/0001-install-pkgconfig-module-for-canfestival.patch deleted file mode 100644 index 23f3d899f1..0000000000 --- a/package.bak/canfestival/0001-install-pkgconfig-module-for-canfestival.patch +++ /dev/null @@ -1,74 +0,0 @@ -From s.martin49@gmail.com Sun Sep 28 14:59:53 2014 -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [PATCH] Install pkgconfig module for canfestival -X-Mercurial-Node: c408fdc77aa18fcda81db4f0d038e8a69ba84bb2 -X-Mercurial-Series-Index: 1 -X-Mercurial-Series-Total: 1 -Message-Id: -X-Mercurial-Series-Id: -User-Agent: Mercurial-patchbomb/3.1.1 -Date: Sun, 28 Sep 2014 14:59:53 +0200 -From: Samuel Martin -To: canfestival-devel@lists.sourceforge.net -Cc: Samuel Martin - -# HG changeset patch -# User "Samuel Martin" -# Date 1411906817 -7200 -# Sun Sep 28 14:20:17 2014 +0200 -# Node ID c408fdc77aa18fcda81db4f0d038e8a69ba84bb2 -# Parent 7740ac6fdedc23e1ed6908d3d7db54833c88572b -Install pkgconfig module for canfestival. - -Signed-off-by: Samuel Martin -Cc: Cluadio Laurita - -diff -r 7740ac6fdedc -r c408fdc77aa1 canfestival.pc.in ---- /dev/null Thu Jan 01 00:00:00 1970 +0000 -+++ b/canfestival.pc.in Sun Sep 28 14:20:17 2014 +0200 -@@ -0,0 +1,12 @@ -+PREFIX = SUB_PREFIX -+TARGET = SUB_TARGET -+ -+prefix=${PREFIX} -+libdir=${prefix}/lib -+includedir=${prefix}/include/canfestival -+ -+Name: Canfestival -+Description: Canfestival CANOpen library -+Version: 1 -+Libs: -L${libdir} -lcanfestival -lcanfestival_${TARGET} -lrt -ldl -lpthread -+Cflags: -I${includedir} -diff -r 7740ac6fdedc -r c408fdc77aa1 configure ---- a/configure Thu Jun 12 14:07:16 2014 +0200 -+++ b/configure Sun Sep 28 14:20:17 2014 +0200 -@@ -813,6 +813,10 @@ - MAKEFILES=$MAKEFILES\ drivers/$SUB_TARGET/Makefile.in - fi - -+if [ "$SUB_TARGET" = "unix" ]; then -+ MAKEFILES=$MAKEFILES\ canfestival.pc.in -+fi -+ - if [ "$SUB_TARGET" = "unix" -a "$SUB_TIMERS_DRIVER" = "kernel" ]; then - MAKEFILES=$MAKEFILES\ - \ examples/kerneltest/Makefile.in\ -diff -r 7740ac6fdedc -r c408fdc77aa1 src/Makefile.in ---- a/src/Makefile.in Thu Jun 12 14:07:16 2014 +0200 -+++ b/src/Makefile.in Sun Sep 28 14:20:17 2014 +0200 -@@ -132,9 +132,10 @@ - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< - - install: libcanfestival.a -- mkdir -p $(DESTDIR)$(PREFIX)/lib/ -+ mkdir -p $(DESTDIR)$(PREFIX)/lib/pkgconfig - mkdir -p $(DESTDIR)$(PREFIX)/include/canfestival - cp libcanfestival.a $(DESTDIR)$(PREFIX)/lib/ -+ cp ../canfestival.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/ - cp ../include/*.h $(DESTDIR)$(PREFIX)/include/canfestival - - uninstall: - - diff --git a/package.bak/canfestival/0002-allow-to-set-python-interpreter.patch b/package.bak/canfestival/0002-allow-to-set-python-interpreter.patch deleted file mode 100644 index bb6031658c..0000000000 --- a/package.bak/canfestival/0002-allow-to-set-python-interpreter.patch +++ /dev/null @@ -1,176 +0,0 @@ -From s.martin49@gmail.com Fri Oct 10 23:43:32 2014 -Content-Type: text/plain; charset="us-ascii" -MIME-Version: 1.0 -Content-Transfer-Encoding: 7bit -Subject: [PATCH] allow to set python interpreter -X-Mercurial-Node: 4805f636c2317d989a5f704ba691369f41be6595 -X-Mercurial-Series-Index: 1 -X-Mercurial-Series-Total: 1 -Message-Id: <4805f636c2317d989a5f.1412977412@bobook> -X-Mercurial-Series-Id: <4805f636c2317d989a5f.1412977412@bobook> -User-Agent: Mercurial-patchbomb/3.1.2 -Date: Fri, 10 Oct 2014 23:43:32 +0200 -From: Samuel Martin -To: canfestival-devel@lists.sourceforge.net -Cc: Samuel Martin - -# HG changeset patch -# User "Samuel Martin" -# Date 1412977082 -7200 -# Fri Oct 10 23:38:02 2014 +0200 -# Node ID 4805f636c2317d989a5f704ba691369f41be6595 -# Parent c408fdc77aa18fcda81db4f0d038e8a69ba84bb2 -allow to set python interpreter - -Canfestival python modules and scripts are not python3 compliant. - -Allow to pass the python interperter to be used to make. - -Signed-off-by: Samuel Martin - -diff --git a/Makefile.in b/Makefile.in ---- a/Makefile.in -+++ b/Makefile.in -@@ -21,6 +21,9 @@ - # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - # - -+PYTHON ?= python -+export PYTHON -+ - all: objdictedit canfestival examples - - examples: canfestival driver -diff --git a/doc/manual/en/manual.tex b/doc/manual/en/manual.tex ---- a/doc/manual/en/manual.tex -+++ b/doc/manual/en/manual.tex -@@ -1134,6 +1134,7 @@ - python objdictedit.py [od files...] - \end{verbatim} - -+Note that Gnosis modules only run with python2 as interpreter. - - \subsubsection{Installation and usage on Windows} - -diff --git a/examples/CANOpenShell/Makefile.in b/examples/CANOpenShell/Makefile.in ---- a/examples/CANOpenShell/Makefile.in -+++ b/examples/CANOpenShell/Makefile.in -@@ -69,11 +69,11 @@ - - CANOpenShellMasterOD.c: CANOpenShellMasterOD.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py CANOpenShellMasterOD.od CANOpenShellMasterOD.c -+ $(PYTHON) ../../objdictgen/objdictgen.py CANOpenShellMasterOD.od CANOpenShellMasterOD.c - - CANOpenShellSlaveOD.c: CANOpenShellSlaveOD.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py CANOpenShellSlaveOD.od CANOpenShellSlaveOD.c -+ $(PYTHON) ../../objdictgen/objdictgen.py CANOpenShellSlaveOD.od CANOpenShellSlaveOD.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/DS401_Master/Makefile.in b/examples/DS401_Master/Makefile.in ---- a/examples/DS401_Master/Makefile.in -+++ b/examples/DS401_Master/Makefile.in -@@ -53,7 +53,7 @@ - - TestMaster.c: TestMaster.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/DS401_Slave_Gui/Makefile.in b/examples/DS401_Slave_Gui/Makefile.in ---- a/examples/DS401_Slave_Gui/Makefile.in -+++ b/examples/DS401_Slave_Gui/Makefile.in -@@ -59,7 +59,7 @@ - - ObjDict.c: ObjDict.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py ObjDict.od ObjDict.c -+ $(PYTHON) ../../objdictgen/objdictgen.py ObjDict.od ObjDict.c - - .cpp.o: - $(CXX) -c $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) `wx-config --cxxflags` $< -o $@ -diff --git a/examples/SillySlave/Makefile.in b/examples/SillySlave/Makefile.in ---- a/examples/SillySlave/Makefile.in -+++ b/examples/SillySlave/Makefile.in -@@ -53,7 +53,7 @@ - - SillySlave.c: SillySlave.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c -+ $(PYTHON) ../../objdictgen/objdictgen.py SillySlave.od SillySlave.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/TestMasterMicroMod/Makefile.in b/examples/TestMasterMicroMod/Makefile.in ---- a/examples/TestMasterMicroMod/Makefile.in -+++ b/examples/TestMasterMicroMod/Makefile.in -@@ -61,7 +61,7 @@ - - TestMaster.c: TestMaster.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/TestMasterSlave/Makefile.in b/examples/TestMasterSlave/Makefile.in ---- a/examples/TestMasterSlave/Makefile.in -+++ b/examples/TestMasterSlave/Makefile.in -@@ -69,11 +69,11 @@ - - TestSlave.c: TestSlave.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c - - TestMaster.c: TestMaster.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/TestMasterSlaveLSS/Makefile.in b/examples/TestMasterSlaveLSS/Makefile.in ---- a/examples/TestMasterSlaveLSS/Makefile.in -+++ b/examples/TestMasterSlaveLSS/Makefile.in -@@ -64,15 +64,15 @@ - - TestSlaveA.c: TestSlaveA.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestSlaveA.od TestSlaveA.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestSlaveA.od TestSlaveA.c - - TestSlaveB.c: TestSlaveB.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestSlaveB.od TestSlaveB.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestSlaveB.od TestSlaveB.c - - TestMaster.c: TestMaster.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c - - %.o: %.c - $(CC) $(CFLAGS) $(PROG_CFLAGS) ${PROGDEFINES} $(INCLUDES) -o $@ -c $< -diff --git a/examples/kerneltest/Makefile.in b/examples/kerneltest/Makefile.in ---- a/examples/kerneltest/Makefile.in -+++ b/examples/kerneltest/Makefile.in -@@ -79,10 +79,10 @@ - - TestSlave.c: TestSlave.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestSlave.od TestSlave.c - - TestMaster.c: TestMaster.od - $(MAKE) -C ../../objdictgen gnosis -- python ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c -+ $(PYTHON) ../../objdictgen/objdictgen.py TestMaster.od TestMaster.c - - #endif - - diff --git a/package.bak/canfestival/Config.in b/package.bak/canfestival/Config.in deleted file mode 100644 index ca949565f5..0000000000 --- a/package.bak/canfestival/Config.in +++ /dev/null @@ -1,90 +0,0 @@ -config BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS - bool - default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_arm - -comment "canfestival needs a glibc or uClibc toolchain w/ threads and dynamic library" - depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -config BR2_PACKAGE_CANFESTIVAL - bool "canfestival" - depends on BR2_PACKAGE_CANFESTIVAL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - CanFestival is an OpenSource CANOpen framework, licensed under - LGPLv2.1 and GPLv2 for some drivers (virtual_kernel, lincan and - copcican_comedi). - - http://www.canfestival.org - -if BR2_PACKAGE_CANFESTIVAL - -choice - prompt "driver" - default BR2_PACKAGE_CANFESTIVAL_SOCKET - -# - The AnaGate CAN(duo) [1], PeakSystem CAN [2] and CO-PCICAN [3] -# drivers are not available (not packaged in Buildroot), so their -# support are disabled. -# - The virtual_kernel driver is disabled because it uses very old -# kernel APIs, that have been renamed, or marked as deprecated or -# removed for a long while. The question has been raised on the -# canfestival mailing list [4]. -# -# [1] http://www.anagate.de/en/index.html -# [2] http://www.peak-system.com/linux/ -# [3] http://www.cosateq.com/ -# [4] http://sourceforge.net/p/canfestival/mailman/message/32519648/ - -config BR2_PACKAGE_CANFESTIVAL_VIRTUAL - bool "virtual" - help - Unix pipe based virtual CAN driver. - -config BR2_PACKAGE_CANFESTIVAL_SOCKET - bool "socket" - help - SocketCAN (the standard mainline CAN bus interface). - - http://developer.berlios.de/projects/socketcan/ - -config BR2_PACKAGE_CANFESTIVAL_LINCAN - bool "lincan" - help - Lincan driver. - - http://www.ocera.org/download/components/WP7/lincan-0.3.3.html - -config BR2_PACKAGE_CANFESTIVAL_CAN4LINUX - bool "can4linux" - help - Can4linux driver. - - http://www.port.de/engl/canprod/hw_can4linux.html - -endchoice - -config BR2_PACKAGE_CANFESTIVAL_DRIVER - string - default "virtual" if BR2_PACKAGE_CANFESTIVAL_VIRTUAL - default "socket" if BR2_PACKAGE_CANFESTIVAL_SOCKET - default "lincan" if BR2_PACKAGE_CANFESTIVAL_LINCAN - default "can4linux" if BR2_PACKAGE_CANFESTIVAL_CAN4LINUX - -config BR2_PACKAGE_CANFESTIVAL_ADDITIONAL_OPTIONS - string "additional configure options" - help - Additional options can be passed directly to the configure script - (e.g.: --MAX_CAN_BUS_ID=..., --SDO_MAX_LENGTH_TRANSFER=..., - --SDO_BLOCK_SIZE=...). - -config BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES - bool "install examples" - help - Install binary application examples. - -endif diff --git a/package.bak/canfestival/canfestival.mk b/package.bak/canfestival/canfestival.mk deleted file mode 100644 index 61578d3162..0000000000 --- a/package.bak/canfestival/canfestival.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# canfestival -# -################################################################################ - -CANFESTIVAL_VERSION = 7740ac6fdedc23e1ed6908d3d7db54833c88572b -CANFESTIVAL_SITE = http://dev.automforge.net/CanFestival-3 -CANFESTIVAL_SITE_METHOD = hg -CANFESTIVAL_LICENSE = LGPLv2.1+ -CANFESTIVAL_LICENSE_FILES = COPYING LICENCE -CANFESTIVAL_INSTALL_STAGING = YES -CANFESTIVAL_INSTALLED-y = src drivers -CANFESTIVAL_INSTALLED-$(BR2_PACKAGE_CANFESTIVAL_INSTALL_EXAMPLES) += examples - -# Canfestival provides and used some python modules and scripts only compliant -# with python2. -CANFESTIVAL_DEPENDENCIES = host-python - -# canfestival uses its own hand-written build-system. Though there is -# a configure script, it does not use the autotools, so, we use the -# generic-package infrastructure. -define CANFESTIVAL_CONFIGURE_CMDS - cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure \ - --target=unix \ - --arch=$(BR2_ARCH) \ - --timers=unix \ - --binutils=$(TARGET_CROSS) \ - --cc="$(TARGET_CC)" \ - --cxx="$(TARGET_CC)" \ - --ld="$(TARGET_CC)" \ - --prefix=/usr \ - --can=$(BR2_PACKAGE_CANFESTIVAL_DRIVER) \ - $(call qstrip,$(BR2_PACKAGE_CANFESTIVAL_ADDITIONAL_OPTIONS)) -endef - -define CANFESTIVAL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all \ - PYTHON=$(HOST_DIR)/usr/bin/python2 -endef - -define CANFESTIVAL_INSTALL_TARGET_CMDS - for d in $(CANFESTIVAL_INSTALLED-y) ; do \ - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - DESTDIR=$(TARGET_DIR) || exit 1 ; \ - done -endef - -define CANFESTIVAL_INSTALL_STAGING_CMDS - for d in $(CANFESTIVAL_INSTALLED-y) ; do \ - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/$$d install \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - DESTDIR=$(STAGING_DIR) || exit 1 ; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/cannelloni/0001-Add-missing-cstdio-include.patch b/package.bak/cannelloni/0001-Add-missing-cstdio-include.patch deleted file mode 100644 index 1e4ad00396..0000000000 --- a/package.bak/cannelloni/0001-Add-missing-cstdio-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From d41f5ec6bb66654558757c3ef9cd2a158ee06ccc Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 15 Feb 2017 09:29:29 +0100 -Subject: [PATCH] Add missing include - -This header defines EOF macro. Some toolchains cannot -find this macro, if is missing. So include it -explicitly. - -Signed-off-by: Yegor Yefremov ---- - sctpthread.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sctpthread.cpp b/sctpthread.cpp -index 6c83fed..d83b472 100644 ---- a/sctpthread.cpp -+++ b/sctpthread.cpp -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - - #include --- -2.1.4 - diff --git a/package.bak/cannelloni/Config.in b/package.bak/cannelloni/Config.in deleted file mode 100644 index e137e60c60..0000000000 --- a/package.bak/cannelloni/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_CANNELLONI - bool "cannelloni" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # lksctp-tools - depends on BR2_TOOLCHAIN_HAS_THREADS # lksctp-tools - depends on !BR2_STATIC_LIBS # lksctp-tools - help - A SocketCAN over Ethernet tunnel. The tunnel supports both - UDP and SCTP protocols. - - https://github.com/mguentner/cannelloni - -comment "cannelloni needs a toolchain w/ C++, threads, dynamic library, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/cannelloni/cannelloni.hash b/package.bak/cannelloni/cannelloni.hash deleted file mode 100644 index c14dceb794..0000000000 --- a/package.bak/cannelloni/cannelloni.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 fe5abb1c9e523049c48dd906603bc762cc55ccd20c16dbec7dc64163b9eefccf cannelloni-20160414.tar.gz diff --git a/package.bak/cannelloni/cannelloni.mk b/package.bak/cannelloni/cannelloni.mk deleted file mode 100644 index fffdb4ba9a..0000000000 --- a/package.bak/cannelloni/cannelloni.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# cannelloni -# -################################################################################ - -CANNELLONI_VERSION = 20160414 -CANNELLONI_SITE = $(call github,mguentner,cannelloni,$(CANNELLONI_VERSION)) -CANNELLONI_LICENSE = GPLv2 -CANNELLONI_LICENSE_FILES = gpl-2.0.txt - -ifeq ($(BR2_PACKAGE_LKSCTP_TOOLS),y) -CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=ON -CANNELLONI_DEPENDENCIES += lksctp-tools -else -CANNELLONI_CONF_OPTS += -DSCTP_SUPPORT=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/cantarell/Config.in b/package.bak/cantarell/Config.in deleted file mode 100644 index 78af96d595..0000000000 --- a/package.bak/cantarell/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_CANTARELL - bool "cantarell" - help - The Cantarell font family is a contemporary Humanist - sans serif designed for on-screen reading. - - https://wiki.gnome.org/Projects/CantarellFonts diff --git a/package.bak/cantarell/cantarell.hash b/package.bak/cantarell/cantarell.hash deleted file mode 100644 index 330e7869d1..0000000000 --- a/package.bak/cantarell/cantarell.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/cantarell-fonts/0.0/cantarell-fonts-0.0.25.sha256sum -sha256 14a228aa0b516dfc367b434a850f955a00c57fc549cbb05348e2b150196a737f cantarell-fonts-0.0.25.tar.xz diff --git a/package.bak/cantarell/cantarell.mk b/package.bak/cantarell/cantarell.mk deleted file mode 100644 index 3cdf600dd2..0000000000 --- a/package.bak/cantarell/cantarell.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# cantarell -# -################################################################################ - -CANTARELL_VERSION_MAJOR = 0.0 -CANTARELL_VERSION = $(CANTARELL_VERSION_MAJOR).25 -CANTARELL_SITE = http://ftp.gnome.org/pub/gnome/sources/cantarell-fonts/$(CANTARELL_VERSION_MAJOR) -CANTARELL_SOURCE = cantarell-fonts-$(CANTARELL_VERSION).tar.xz -CANTARELL_DEPENDENCIES = host-pkgconf -CANTARELL_LICENSE = OFLv1.1 -CANTARELL_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch b/package.bak/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch deleted file mode 100644 index 587d67fc47..0000000000 --- a/package.bak/cbootimage/0001-bct_dump-don-t-crash-on-devices-without-RSA-support.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 64045f993c2cd8989838aeaad3d22107d96d5596 Mon Sep 17 00:00:00 2001 -From: Stephen Warren -Date: Thu, 28 Jul 2016 11:37:45 -0600 -Subject: [PATCH] bct_dump: don't crash on devices without RSA support - -format_rsa_param() currently crashes on chips that don't implement -soc_config->get_value_size(); that is, on all chips before T124. Fix the -function not to crash. Better might be to avoid even dumping RSA -parameters on chips which don't support RSA, but that's a larger change -that needs much more work. - -Fixes: 3c3b992a6814 ("Add support to dump rsa related fields for t210") -Cc: Jimmy Zhang -Signed-off-by: Stephen Warren -Signed-off-by: Misha Komarovskiy ---- - src/bct_dump.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/src/bct_dump.c b/src/bct_dump.c -index 4f50fa2..b4ca9fc 100644 ---- a/src/bct_dump.c -+++ b/src/bct_dump.c -@@ -133,10 +133,14 @@ static void format_rsa_param(parse_token id, char const * message, void * data) - { - #define MAX_BYTE_NUMBER_PER_LINE 16 - u_int8_t *rsa = (u_int8_t *)data; -- int size = g_soc_config->get_value_size(id); -- int byte_index; -+ int size, byte_index; - - printf("%s", message); -+ -+ if (!g_soc_config->get_value_size) -+ return; -+ -+ size = g_soc_config->get_value_size(id); - for (byte_index = 0; byte_index < size; ++byte_index) { - printf(" %02x", *rsa++); - --- -2.1.4 - diff --git a/package.bak/cbootimage/Config.in b/package.bak/cbootimage/Config.in deleted file mode 100644 index b798e5d988..0000000000 --- a/package.bak/cbootimage/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_CBOOTIMAGE - bool "cbootimage" - depends on BR2_arm || BR2_armeb - # uses non-standard u_intXX_t types - # https://github.com/NVIDIA/cbootimage/pull/7 - depends on !BR2_TOOLCHAIN_USES_MUSL - help - This project provides a tool which compiles BCT (Boot - Configuration Table) images to place into the boot flash of - a Tegra-based device. - - https://github.com/NVIDIA/cbootimage - -comment "cbootimage needs a glibc or uClibc toolchain" - depends on BR2_arm || BR2_armeb - depends on BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/cbootimage/Config.in.host b/package.bak/cbootimage/Config.in.host deleted file mode 100644 index 1913afa28f..0000000000 --- a/package.bak/cbootimage/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_CBOOTIMAGE - bool "host cbootimage" - depends on BR2_arm || BR2_armeb - help - This project provides a tool which compiles BCT (Boot - Configuration Table) images to place into the boot flash of - a Tegra-based device. - - https://github.com/NVIDIA/cbootimage diff --git a/package.bak/cbootimage/cbootimage.hash b/package.bak/cbootimage/cbootimage.hash deleted file mode 100644 index 96cf172e39..0000000000 --- a/package.bak/cbootimage/cbootimage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 373c108d7b6778c62a33e59ad0cd5ea9ebb379319a0c8b4cf469eaa8bec5521b cbootimage-v1.7.tar.gz diff --git a/package.bak/cbootimage/cbootimage.mk b/package.bak/cbootimage/cbootimage.mk deleted file mode 100644 index 1b5672dbd4..0000000000 --- a/package.bak/cbootimage/cbootimage.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# cbootimage -# -################################################################################ - -CBOOTIMAGE_VERSION = v1.7 -CBOOTIMAGE_SITE = $(call github,NVIDIA,cbootimage,$(CBOOTIMAGE_VERSION)) -CBOOTIMAGE_LICENSE = GPLv2 -CBOOTIMAGE_LICENSE_FILES = COPYING -CBOOTIMAGE_AUTORECONF = YES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - diff --git a/package.bak/cc-tool/0001-add-missing-stdarg-include.patch b/package.bak/cc-tool/0001-add-missing-stdarg-include.patch deleted file mode 100644 index c4f47fd30c..0000000000 --- a/package.bak/cc-tool/0001-add-missing-stdarg-include.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing include for va_list - -Fixes the build on uClibc. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/common/log.h -=================================================================== ---- a/src/common/log.h -+++ b/src/common/log.h -@@ -13,6 +13,7 @@ - - #include - #include -+#include - #include "common.h" - - class Log diff --git a/package.bak/cc-tool/0002-boost-m4.patch b/package.bak/cc-tool/0002-boost-m4.patch deleted file mode 100644 index dc07701de0..0000000000 --- a/package.bak/cc-tool/0002-boost-m4.patch +++ /dev/null @@ -1,883 +0,0 @@ -The version of boost.m4 initially included in cc-tool has an issue -with gcc5 (one of its tests fails due to the first change described in [1] -"Preprocessor issues"). - -This was fixed upstream (boost.m4 project) in Nov 2014 [2]. - -We add the latest commit [3] of upstream boost.m4 plus a patch from github PR -[4] to add detection for gcc 5.1. - -[1] -https://gcc.gnu.org/gcc-5/porting_to.html - -[2] -https://github.com/tsuna/boost.m4/commit/32553aaf4d5090da19aa0ec33b936982c685009f - -[3] -https://github.com/tsuna/boost.m4/commit/d9ff75b6af66360d76f46f469a26ab18e24e1030 - -[4] -https://github.com/rubenk/boost.m4/commit/b879eb85f112cf054643d2e7f9544c230299c0b2 - -Signed-off-by: Jörg Krause - -diff -purN cc-tool.original/m4/boost.m4 cc-tool/m4/boost.m4 ---- cc-tool.original/m4/boost.m4 2015-07-28 15:43:25.458840000 +0200 -+++ cc-tool/m4/boost.m4 2015-07-28 16:12:02.532791424 +0200 -@@ -1,5 +1,5 @@ - # boost.m4: Locate Boost headers and libraries for autoconf-based projects. --# Copyright (C) 2007, 2008, 2009, 2010, 2011 Benoit Sigoure -+# Copyright (C) 2007-2011, 2014 Benoit Sigoure - # - # This program is free software: you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -22,7 +22,7 @@ - # along with this program. If not, see . - - m4_define([_BOOST_SERIAL], [m4_translit([ --# serial 16 -+# serial 25 - ], [# - ], [])]) - -@@ -59,7 +59,8 @@ m4_pattern_forbid([^_?(BOOST|Boost)_]) - # It could be useful to turn this into a macro which extracts the - # value of any macro. - m4_define([_BOOST_SED_CPP], --[AC_LANG_PREPROC_REQUIRE()dnl -+[AC_LANG_PUSH([C++])dnl -+AC_LANG_PREPROC_REQUIRE()dnl - AC_REQUIRE([AC_PROG_SED])dnl - AC_LANG_CONFTEST([AC_LANG_SOURCE([[$2]])]) - AS_IF([dnl eval is necessary to expand ac_cpp. -@@ -71,13 +72,31 @@ dnl strip `\n' with backquotes, not the - dnl boost_cv_lib_version='1_37\r' for instance, which breaks - dnl everything else. - dnl Cannot use 'dnl' after [$4] because a trailing dnl may break AC_CACHE_CHECK -+dnl -+dnl Beware that GCC 5, when expanding macros, may embed # line directives -+dnl a within single line: -+dnl -+dnl # 1 "conftest.cc" -+dnl # 1 "" -+dnl # 1 "" -+dnl # 1 "conftest.cc" -+dnl # 1 "/opt/local/include/boost/version.hpp" 1 3 -+dnl # 2 "conftest.cc" 2 -+dnl boost-lib-version = -+dnl # 2 "conftest.cc" 3 -+dnl "1_56" -+dnl -+dnl So get rid of the # lines, and glue the remaining ones together. - (eval "$ac_cpp conftest.$ac_ext") 2>&AS_MESSAGE_LOG_FD | -+ grep -v '#' | - tr -d '\r' | -+ tr -s '\n' ' ' | - $SED -n -e "$1" >conftest.i 2>&1], - [$3], - [$4]) - rm -rf conftest* --])# AC_EGREP_CPP -+AC_LANG_POP([C++])dnl -+])# _BOOST_SED_CPP - - - -@@ -206,7 +225,7 @@ AC_LANG_POP([C++])dnl - AC_CACHE_CHECK([for Boost's header version], - [boost_cv_lib_version], - [m4_pattern_allow([^BOOST_LIB_VERSION$])dnl -- _BOOST_SED_CPP([/^boost-lib-version = /{s///;s/\"//g;p;q;}], -+ _BOOST_SED_CPP([[/^boost-lib-version = /{s///;s/[\" ]//g;p;q;}]], - [#include - boost-lib-version = BOOST_LIB_VERSION], - [boost_cv_lib_version=`cat conftest.i`])]) -@@ -214,13 +233,14 @@ boost-lib-version = BOOST_LIB_VERSION], - boost_major_version=`echo "$boost_cv_lib_version" | sed 's/_//;s/_.*//'` - case $boost_major_version in #( - '' | *[[!0-9]]*) -- AC_MSG_ERROR([invalid value: boost_major_version=$boost_major_version]) -+ AC_MSG_ERROR([invalid value: boost_major_version='$boost_major_version']) - ;; - esac - fi - CPPFLAGS=$boost_save_CPPFLAGS - ])# BOOST_REQUIRE - -+ - # BOOST_STATIC() - # -------------- - # Add the "--enable-static-boost" configure argument. If this argument is given -@@ -232,6 +252,7 @@ AC_DEFUN([BOOST_STATIC], - [enable_static_boost=yes], - [enable_static_boost=no])])# BOOST_STATIC - -+ - # BOOST_FIND_HEADER([HEADER-NAME], [ACTION-IF-NOT-FOUND], [ACTION-IF-FOUND]) - # -------------------------------------------------------------------------- - # Wrapper around AC_CHECK_HEADER for Boost headers. Useful to check for -@@ -264,14 +285,16 @@ fi - ])# BOOST_FIND_HEADER - - --# BOOST_FIND_LIB([LIB-NAME], [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], --# [CXX-PROLOGUE]) --# ------------------------------------------------------------------------- --# Look for the Boost library LIB-NAME (e.g., LIB-NAME = `thread', for --# libboost_thread). Check that HEADER-NAME works and check that --# libboost_LIB-NAME can link with the code CXX-TEST. The optional argument --# CXX-PROLOGUE can be used to include some C++ code before the `main' --# function. -+# BOOST_FIND_LIBS([COMPONENT-NAME], [CANDIDATE-LIB-NAMES], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Look for the Boost library COMPONENT-NAME (e.g., `thread', for -+# libboost_thread) under the possible CANDIDATE-LIB-NAMES (e.g., -+# "thread_win32 thread"). Check that HEADER-NAME works and check that -+# libboost_LIB-NAME can link with the code CXX-TEST. The optional -+# argument CXX-PROLOGUE can be used to include some C++ code before -+# the `main' function. - # - # Invokes BOOST_FIND_HEADER([HEADER-NAME]) (see above). - # -@@ -285,7 +308,7 @@ fi - # builds. Some sample values for PREFERRED-RT-OPT: (nothing), mt, d, mt-d, gdp - # ... If you want to make sure you have a specific version of Boost - # (eg, >= 1.33) you *must* invoke BOOST_REQUIRE before this macro. --AC_DEFUN([BOOST_FIND_LIB], -+AC_DEFUN([BOOST_FIND_LIBS], - [AC_REQUIRE([BOOST_REQUIRE])dnl - AC_REQUIRE([_BOOST_FIND_COMPILER_TAG])dnl - AC_REQUIRE([BOOST_STATIC])dnl -@@ -299,32 +322,69 @@ AS_VAR_PUSHDEF([Boost_lib], [boost_cv_li - AS_VAR_PUSHDEF([Boost_lib_LDFLAGS], [boost_cv_lib_$1_LDFLAGS])dnl - AS_VAR_PUSHDEF([Boost_lib_LDPATH], [boost_cv_lib_$1_LDPATH])dnl - AS_VAR_PUSHDEF([Boost_lib_LIBS], [boost_cv_lib_$1_LIBS])dnl --BOOST_FIND_HEADER([$3]) -+BOOST_FIND_HEADER([$4]) - boost_save_CPPFLAGS=$CPPFLAGS - CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS" --# Now let's try to find the library. The algorithm is as follows: first look --# for a given library name according to the user's PREFERRED-RT-OPT. For each --# library name, we prefer to use the ones that carry the tag (toolset name). --# Each library is searched through the various standard paths were Boost is --# usually installed. If we can't find the standard variants, we try to --# enforce -mt (for instance on MacOSX, libboost_threads.dylib doesn't exist --# but there's -obviously- libboost_threads-mt.dylib). - AC_CACHE_CHECK([for the Boost $1 library], [Boost_lib], -- [Boost_lib=no -- case "$2" in #( -- mt | mt-) boost_mt=-mt; boost_rtopt=;; #( -- mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$2" : 'Xmt-*\(.*\)'`;; #( -- *) boost_mt=; boost_rtopt=$2;; -+ [_BOOST_FIND_LIBS($@)]) -+case $Boost_lib in #( -+ (no) _AC_MSG_LOG_CONFTEST -+ AC_MSG_ERROR([cannot find the flags to link with Boost $1]) -+ ;; -+esac -+AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl -+AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl -+AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl -+AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl -+CPPFLAGS=$boost_save_CPPFLAGS -+AS_VAR_POPDEF([Boost_lib])dnl -+AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl -+AS_VAR_POPDEF([Boost_lib_LDPATH])dnl -+AS_VAR_POPDEF([Boost_lib_LIBS])dnl -+AC_LANG_POP([C++])dnl -+fi -+]) -+ -+ -+# BOOST_FIND_LIB([LIB-NAME], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Backward compatibility wrapper for BOOST_FIND_LIBS. -+AC_DEFUN([BOOST_FIND_LIB], -+[BOOST_FIND_LIBS([$1], $@)]) -+ -+ -+# _BOOST_FIND_LIBS([LIB-NAME], [CANDIDATE-LIB-NAMES], -+# [PREFERRED-RT-OPT], [HEADER-NAME], [CXX-TEST], -+# [CXX-PROLOGUE]) -+# -------------------------------------------------------------- -+# Real implementation of BOOST_FIND_LIBS: rely on these local macros: -+# Boost_lib, Boost_lib_LDFLAGS, Boost_lib_LDPATH, Boost_lib_LIBS -+# -+# The algorithm is as follows: first look for a given library name -+# according to the user's PREFERRED-RT-OPT. For each library name, we -+# prefer to use the ones that carry the tag (toolset name). Each -+# library is searched through the various standard paths were Boost is -+# usually installed. If we can't find the standard variants, we try -+# to enforce -mt (for instance on MacOSX, libboost_thread.dylib -+# doesn't exist but there's -obviously- libboost_thread-mt.dylib). -+AC_DEFUN([_BOOST_FIND_LIBS], -+[Boost_lib=no -+ case "$3" in #( -+ (mt | mt-) boost_mt=-mt; boost_rtopt=;; #( -+ (mt* | mt-*) boost_mt=-mt; boost_rtopt=`expr "X$3" : 'Xmt-*\(.*\)'`;; #( -+ (*) boost_mt=; boost_rtopt=$3;; - esac - if test $enable_static_boost = yes; then - boost_rtopt="s$boost_rtopt" - fi - # Find the proper debug variant depending on what we've been asked to find. - case $boost_rtopt in #( -- *d*) boost_rt_d=$boost_rtopt;; #( -- *[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') -+ (*d*) boost_rt_d=$boost_rtopt;; #( -+ (*[[sgpn]]*) # Insert the `d' at the right place (in between `sg' and `pn') - boost_rt_d=`echo "$boost_rtopt" | sed 's/\(s*g*\)\(p*n*\)/\1\2/'`;; #( -- *) boost_rt_d='-d';; -+ (*) boost_rt_d='-d';; - esac - # If the PREFERRED-RT-OPT are not empty, prepend a `-'. - test -n "$boost_rtopt" && boost_rtopt="-$boost_rtopt" -@@ -335,8 +395,8 @@ AC_CACHE_CHECK([for the Boost $1 library - AC_MSG_ERROR([the libext variable is empty, did you invoke Libtool?]) - boost_save_ac_objext=$ac_objext - # Generate the test file. -- AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$3> --$5], [$4])]) -+ AC_LANG_CONFTEST([AC_LANG_PROGRAM([#include <$4> -+$6], [$5])]) - dnl Optimization hacks: compiling C++ is slow, especially with Boost. What - dnl we're trying to do here is guess the right combination of link flags - dnl (LIBS / LDFLAGS) to use a given library. This can take several -@@ -358,21 +418,22 @@ dnl start the for loops). - [AC_MSG_ERROR([cannot compile a test that uses Boost $1])]) - ac_objext=$boost_save_ac_objext - boost_failed_libs= --# Don't bother to ident the 6 nested for loops, only the 2 innermost ones --# matter. -+# Don't bother to ident the following nested for loops, only the 2 -+# innermost ones matter. -+for boost_lib_ in $2; do - for boost_tag_ in -$boost_cv_lib_tag ''; do - for boost_ver_ in -$boost_cv_lib_version ''; do - for boost_mt_ in $boost_mt -mt ''; do - for boost_rtopt_ in $boost_rtopt '' -d; do - for boost_lib in \ -- boost_$1$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_rtopt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_mt_$boost_ver_ \ -- boost_$1$boost_tag_$boost_ver_ -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_rtopt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_rtopt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_mt_$boost_ver_ \ -+ boost_$boost_lib_$boost_tag_$boost_ver_ - do - # Avoid testing twice the same lib - case $boost_failed_libs in #( -- *@$boost_lib@*) continue;; -+ (*@$boost_lib@*) continue;; - esac - # If with_boost is empty, we'll search in /lib first, which is not quite - # right so instead we'll try to a location based on where the headers are. -@@ -382,14 +443,17 @@ for boost_rtopt_ in $boost_rtopt '' -d; - /opt/local/lib* /usr/local/lib* /opt/lib* /usr/lib* \ - "$with_boost" C:/Boost/lib /lib* - do -- test -e "$boost_ldpath" || continue -+ # Don't waste time with directories that don't exist. -+ if test x"$boost_ldpath" != x && test ! -e "$boost_ldpath"; then -+ continue -+ fi - boost_save_LDFLAGS=$LDFLAGS - # Are we looking for a static library? - case $boost_ldpath:$boost_rtopt_ in #( -- *?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) -+ (*?*:*s*) # Yes (Non empty boost_ldpath + s in rt opt) - Boost_lib_LIBS="$boost_ldpath/lib$boost_lib.$libext" - test -e "$Boost_lib_LIBS" || continue;; #( -- *) # No: use -lboost_foo to find the shared library. -+ (*) # No: use -lboost_foo to find the shared library. - Boost_lib_LIBS="-l$boost_lib";; - esac - boost_save_LIBS=$LIBS -@@ -403,9 +467,35 @@ dnl generated only once above (before we - LDFLAGS=$boost_save_LDFLAGS - LIBS=$boost_save_LIBS - if test x"$Boost_lib" = xyes; then -- Boost_lib_LDFLAGS="-L$boost_ldpath -Wl,-rpath,$boost_ldpath" -+ # Check or used cached result of whether or not using -R or -+ # -rpath makes sense. Some implementations of ld, such as for -+ # Mac OSX, require -rpath but -R is the flag known to work on -+ # other systems. https://github.com/tsuna/boost.m4/issues/19 -+ AC_CACHE_VAL([boost_cv_rpath_link_ldflag], -+ [case $boost_ldpath in -+ '') # Nothing to do. -+ boost_cv_rpath_link_ldflag= -+ boost_rpath_link_ldflag_found=yes;; -+ *) -+ for boost_cv_rpath_link_ldflag in -Wl,-R, -Wl,-rpath,; do -+ LDFLAGS="$boost_save_LDFLAGS -L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" -+ LIBS="$boost_save_LIBS $Boost_lib_LIBS" -+ _BOOST_AC_LINK_IFELSE([], -+ [boost_rpath_link_ldflag_found=yes -+ break], -+ [boost_rpath_link_ldflag_found=no]) -+ done -+ ;; -+ esac -+ AS_IF([test "x$boost_rpath_link_ldflag_found" != "xyes"], -+ [AC_MSG_ERROR([Unable to determine whether to use -R or -rpath])]) -+ LDFLAGS=$boost_save_LDFLAGS -+ LIBS=$boost_save_LIBS -+ ]) -+ test x"$boost_ldpath" != x && -+ Boost_lib_LDFLAGS="-L$boost_ldpath $boost_cv_rpath_link_ldflag$boost_ldpath" - Boost_lib_LDPATH="$boost_ldpath" -- break 6 -+ break 7 - else - boost_failed_libs="$boost_failed_libs@$boost_lib@" - fi -@@ -415,25 +505,10 @@ done - done - done - done -+done # boost_lib_ - rm -f conftest.$ac_objext - ]) --case $Boost_lib in #( -- no) _AC_MSG_LOG_CONFTEST -- AC_MSG_ERROR([cannot find the flags to link with Boost $1]) -- ;; --esac --AC_SUBST(AS_TR_CPP([BOOST_$1_LDFLAGS]), [$Boost_lib_LDFLAGS])dnl --AC_SUBST(AS_TR_CPP([BOOST_$1_LDPATH]), [$Boost_lib_LDPATH])dnl --AC_SUBST([BOOST_LDPATH], [$Boost_lib_LDPATH])dnl --AC_SUBST(AS_TR_CPP([BOOST_$1_LIBS]), [$Boost_lib_LIBS])dnl --CPPFLAGS=$boost_save_CPPFLAGS --AS_VAR_POPDEF([Boost_lib])dnl --AS_VAR_POPDEF([Boost_lib_LDFLAGS])dnl --AS_VAR_POPDEF([Boost_lib_LDPATH])dnl --AS_VAR_POPDEF([Boost_lib_LIBS])dnl --AC_LANG_POP([C++])dnl --fi --])# BOOST_FIND_LIB -+ - - - # --------------------------------------- # -@@ -475,20 +550,20 @@ BOOST_FIND_HEADER([boost/asio.hpp])]) - - # BOOST_BIND() - # ------------ --# Look for Boost.Bind -+# Look for Boost.Bind. - BOOST_DEFUN([Bind], - [BOOST_FIND_HEADER([boost/bind.hpp])]) - - - # BOOST_CHRONO() --# ------------------ --# Look for Boost.Chrono -+# -------------- -+# Look for Boost.Chrono. - BOOST_DEFUN([Chrono], - [# Do we have to check for Boost.System? This link-time dependency was - # added as of 1.35.0. If we have a version <1.35, we must not attempt to - # find Boost.System as it didn't exist by then. - if test $boost_major_version -ge 135; then --BOOST_SYSTEM([$1]) -+ BOOST_SYSTEM([$1]) - fi # end of the Boost.System check. - boost_filesystem_save_LIBS=$LIBS - boost_filesystem_save_LDFLAGS=$LDFLAGS -@@ -499,14 +574,40 @@ BOOST_FIND_LIB([chrono], [$1], - [boost/chrono.hpp], - [boost::chrono::thread_clock d;]) - if test $enable_static_boost = yes && test $boost_major_version -ge 135; then -- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"]) -+ BOOST_CHRONO_LIBS="$BOOST_CHRONO_LIBS $BOOST_SYSTEM_LIBS" - fi - LIBS=$boost_filesystem_save_LIBS - LDFLAGS=$boost_filesystem_save_LDFLAGS -- - ])# BOOST_CHRONO - - -+# BOOST_CONTEXT([PREFERRED-RT-OPT]) -+# ----------------------------------- -+# Look for Boost.Context. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -+# 1.51.0 -+BOOST_DEFUN([Context], -+[BOOST_FIND_LIB([context], [$1], -+ [boost/context/all.hpp],[[ -+// creates a stack -+void * stack_pointer = new void*[4096]; -+std::size_t const size = sizeof(void*[4096]); -+ -+// context fc uses f() as context function -+// fcontext_t is placed on top of context stack -+// a pointer to fcontext_t is returned -+fc = ctx::make_fcontext(stack_pointer, size, f); -+return ctx::jump_fcontext(&fcm, fc, 3) == 6;]],[dnl -+namespace ctx = boost::context; -+// context -+static ctx::fcontext_t fcm, *fc; -+// context-function -+static void f(intptr_t i) { -+ ctx::jump_fcontext(fc, &fcm, i * 2); -+}]) -+])# BOOST_CONTEXT -+ -+ - # BOOST_CONVERSION() - # ------------------ - # Look for Boost.Conversion (cast / lexical_cast) -@@ -516,6 +617,52 @@ BOOST_FIND_HEADER([boost/lexical_cast.hp - ])# BOOST_CONVERSION - - -+# BOOST_COROUTINE([PREFERRED-RT-OPT]) -+# ----------------------------------- -+# Look for Boost.Coroutine. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. This library was introduced in Boost -+# 1.53.0 -+BOOST_DEFUN([Coroutine], -+[ -+boost_coroutine_save_LIBS=$LIBS -+boost_coroutine_save_LDFLAGS=$LDFLAGS -+# Link-time dependency from coroutine to context -+BOOST_CONTEXT([$1]) -+# Starting from Boost 1.55 a dependency on Boost.System is added -+if test $boost_major_version -ge 155; then -+ BOOST_SYSTEM([$1]) -+fi -+m4_pattern_allow([^BOOST_(CONTEXT|SYSTEM)_(LIBS|LDFLAGS)]) -+LIBS="$LIBS $BOOST_CONTEXT_LIBS $BOOST_SYSTEM_LIBS" -+LDFLAGS="$LDFLAGS $BOOST_CONTEXT_LDFLAGS" -+ -+BOOST_FIND_LIB([coroutine], [$1], -+ [boost/coroutine/coroutine.hpp], -+ [boost::coroutines::coroutine< int(int) > coro; coro.empty();]) -+ -+# Link-time dependency from coroutine to context, existed only in 1.53, in 1.54 -+# coroutine doesn't use context from its headers but from its library. -+if test $boost_major_version -eq 153 || test $enable_static_boost = yes && test $boost_major_version -ge 154; then -+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_CONTEXT_LIBS" -+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_CONTEXT_LDFLAGS" -+fi -+if test $enable_static_boost = yes && test $boost_major_version -ge 155; then -+ BOOST_COROUTINE_LIBS="$BOOST_COROUTINE_LIBS $BOOST_SYSTEM_LIBS" -+ BOOST_COROUTINE_LDFLAGS="$BOOST_COROUTINE_LDFLAGS $BOOST_SYSTEM_LDFLAGS" -+fi -+LIBS=$boost_coroutine_save_LIBS -+LDFLAGS=$boost_coroutine_save_LDFLAGS -+])# BOOST_COROUTINE -+ -+ -+# BOOST_CRC() -+# ----------- -+# Look for Boost.CRC -+BOOST_DEFUN([CRC], -+[BOOST_FIND_HEADER([boost/crc.hpp]) -+])# BOOST_CRC -+ -+ - # BOOST_DATE_TIME([PREFERRED-RT-OPT]) - # ----------------------------------- - # Look for Boost.Date_Time. For the documentation of PREFERRED-RT-OPT, see the -@@ -538,7 +685,7 @@ BOOST_DEFUN([Filesystem], - # added as of 1.35.0. If we have a version <1.35, we must not attempt to - # find Boost.System as it didn't exist by then. - if test $boost_major_version -ge 135; then --BOOST_SYSTEM([$1]) -+ BOOST_SYSTEM([$1]) - fi # end of the Boost.System check. - boost_filesystem_save_LIBS=$LIBS - boost_filesystem_save_LDFLAGS=$LDFLAGS -@@ -548,23 +695,34 @@ LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" - BOOST_FIND_LIB([filesystem], [$1], - [boost/filesystem/path.hpp], [boost::filesystem::path p;]) - if test $enable_static_boost = yes && test $boost_major_version -ge 135; then -- AC_SUBST([BOOST_FILESYSTEM_LIBS], ["$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS"]) -+ BOOST_FILESYSTEM_LIBS="$BOOST_FILESYSTEM_LIBS $BOOST_SYSTEM_LIBS" - fi - LIBS=$boost_filesystem_save_LIBS - LDFLAGS=$boost_filesystem_save_LDFLAGS - ])# BOOST_FILESYSTEM - - -+# BOOST_FLYWEIGHT() -+# ----------------- -+# Look for Boost.Flyweight. -+BOOST_DEFUN([Flyweight], -+[dnl There's a hidden dependency on pthreads. -+AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl -+BOOST_FIND_HEADER([boost/flyweight.hpp]) -+AC_SUBST([BOOST_FLYWEIGHT_LIBS], [$boost_cv_pthread_flag]) -+]) -+ -+ - # BOOST_FOREACH() - # --------------- --# Look for Boost.Foreach -+# Look for Boost.Foreach. - BOOST_DEFUN([Foreach], - [BOOST_FIND_HEADER([boost/foreach.hpp])]) - - - # BOOST_FORMAT() - # -------------- --# Look for Boost.Format -+# Look for Boost.Format. - # Note: we can't check for boost/format/format_fwd.hpp because the header isn't - # standalone. It can't be compiled because it triggers the following error: - # boost/format/detail/config_macros.hpp:88: error: 'locale' in namespace 'std' -@@ -580,6 +738,14 @@ BOOST_DEFUN([Function], - [BOOST_FIND_HEADER([boost/function.hpp])]) - - -+# BOOST_GEOMETRY() -+# ---------------- -+# Look for Boost.Geometry (new since 1.47.0). -+BOOST_DEFUN([Geometry], -+[BOOST_FIND_HEADER([boost/geometry.hpp]) -+])# BOOST_GEOMETRY -+ -+ - # BOOST_GRAPH([PREFERRED-RT-OPT]) - # ------------------------------- - # Look for Boost.Graphs. For the documentation of PREFERRED-RT-OPT, see the -@@ -615,9 +781,18 @@ BOOST_DEFUN([Lambda], - [BOOST_FIND_HEADER([boost/lambda/lambda.hpp])]) - - -+# BOOST_LOCALE() -+# -------------- -+# Look for Boost.Locale -+BOOST_DEFUN([Locale], -+[BOOST_FIND_LIB([locale], [$1], -+ [boost/locale.hpp], -+ [[boost::locale::generator gen; std::locale::global(gen(""));]]) -+])# BOOST_LOCALE -+ - # BOOST_LOG([PREFERRED-RT-OPT]) - # ----------------------------- --# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the -+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Log], - [BOOST_FIND_LIB([log], [$1], -@@ -628,12 +803,12 @@ BOOST_DEFUN([Log], - - # BOOST_LOG_SETUP([PREFERRED-RT-OPT]) - # ----------------------------------- --# Look for Boost.Log For the documentation of PREFERRED-RT-OPT, see the -+# Look for Boost.Log. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Log_Setup], - [AC_REQUIRE([BOOST_LOG])dnl - BOOST_FIND_LIB([log_setup], [$1], -- [boost/log/utility/init/from_settings.hpp], -+ [boost/log/utility/setup/from_settings.hpp], - [boost::log::basic_settings bs; bs.empty();]) - ])# BOOST_LOG_SETUP - -@@ -650,6 +825,29 @@ BOOST_DEFUN([Math], - [BOOST_FIND_HEADER([boost/math/special_functions.hpp])]) - - -+# BOOST_MPI([PREFERRED-RT-OPT]) -+# ------------------------------- -+# Look for Boost MPI. For the documentation of PREFERRED-RT-OPT, see the -+# documentation of BOOST_FIND_LIB above. Uses MPICXX variable if it is -+# set, otherwise tries CXX -+# -+BOOST_DEFUN([MPI], -+[boost_save_CXX=${CXX} -+boost_save_CXXCPP=${CXXCPP} -+if test x"${MPICXX}" != x; then -+ CXX=${MPICXX} -+ CXXCPP="${MPICXX} -E" -+fi -+BOOST_FIND_LIB([mpi], [$1], -+ [boost/mpi.hpp], -+ [int argc = 0; -+ char **argv = 0; -+ boost::mpi::environment env(argc,argv);]) -+CXX=${boost_save_CXX} -+CXXCPP=${boost_save_CXXCPP} -+])# BOOST_MPI -+ -+ - # BOOST_MULTIARRAY() - # ------------------ - # Look for Boost.MultiArray -@@ -657,6 +855,14 @@ BOOST_DEFUN([MultiArray], - [BOOST_FIND_HEADER([boost/multi_array.hpp])]) - - -+# BOOST_NUMERIC_UBLAS() -+# -------------------------- -+# Look for Boost.NumericUblas (Basic Linear Algebra) -+BOOST_DEFUN([Numeric_Ublas], -+[BOOST_FIND_HEADER([boost/numeric/ublas/vector.hpp]) -+])# BOOST_NUMERIC_UBLAS -+ -+ - # BOOST_NUMERIC_CONVERSION() - # -------------------------- - # Look for Boost.NumericConversion (policy-based numeric conversion) -@@ -679,6 +885,12 @@ BOOST_DEFUN([Preprocessor], - [BOOST_FIND_HEADER([boost/preprocessor/repeat.hpp])]) - - -+# BOOST_RANGE() -+# -------------------- -+# Look for Boost.Range -+BOOST_DEFUN([Range], -+[BOOST_FIND_HEADER([boost/range/adaptors.hpp])]) -+ - # BOOST_UNORDERED() - # ----------------- - # Look for Boost.Unordered -@@ -725,9 +937,9 @@ BOOST_DEFUN([Python], - _BOOST_PYTHON_CONFIG([LDFLAGS], [ldflags]) - _BOOST_PYTHON_CONFIG([LIBS], [libs]) - m4_pattern_allow([^BOOST_PYTHON_MODULE$])dnl --BOOST_FIND_LIB([python], [$1], -- [boost/python.hpp], -- [], [BOOST_PYTHON_MODULE(empty) {}]) -+BOOST_FIND_LIBS([python], [python python3], [$1], -+ [boost/python.hpp], -+ [], [BOOST_PYTHON_MODULE(empty) {}]) - CPPFLAGS=$boost_python_save_CPPFLAGS - LDFLAGS=$boost_python_save_LDFLAGS - LIBS=$boost_python_save_LIBS -@@ -774,17 +986,13 @@ BOOST_DEFUN([Signals], - [boost::signal s;]) - ])# BOOST_SIGNALS - -+ - # BOOST_SIGNALS2() --# ----------------- --# Look for Boost.Signals2 -+# ---------------- -+# Look for Boost.Signals2 (new since 1.39.0). - BOOST_DEFUN([Signals2], --[BOOST_FIND_HEADER([boost/signals2.hpp])]) -- --# BOOST_CRC() --# ----------------- --# Look for Boost.CRC --BOOST_DEFUN([CRC], --[BOOST_FIND_HEADER([boost/crc.hpp])]) -+[BOOST_FIND_HEADER([boost/signals2.hpp]) -+])# BOOST_SIGNALS2 - - - # BOOST_SMART_PTR() -@@ -837,19 +1045,18 @@ BOOST_FIND_LIB([unit_test_framework], [$ - ])# BOOST_TEST - - --# BOOST_THREADS([PREFERRED-RT-OPT]) -+# BOOST_THREAD([PREFERRED-RT-OPT]) - # --------------------------------- - # Look for Boost.Thread. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. --# FIXME: Provide an alias "BOOST_THREAD". --BOOST_DEFUN([Threads], -+BOOST_DEFUN([Thread], - [dnl Having the pthread flag is required at least on GCC3 where - dnl boost/thread.hpp would complain if we try to compile without - dnl -pthread on GNU/Linux. - AC_REQUIRE([_BOOST_PTHREAD_FLAG])dnl --boost_threads_save_LIBS=$LIBS --boost_threads_save_LDFLAGS=$LDFLAGS --boost_threads_save_CPPFLAGS=$CPPFLAGS -+boost_thread_save_LIBS=$LIBS -+boost_thread_save_LDFLAGS=$LDFLAGS -+boost_thread_save_CPPFLAGS=$CPPFLAGS - # Link-time dependency from thread to system was added as of 1.49.0. - if test $boost_major_version -ge 149; then - BOOST_SYSTEM([$1]) -@@ -857,36 +1064,26 @@ fi # end of the Boost.System check. - m4_pattern_allow([^BOOST_SYSTEM_(LIBS|LDFLAGS)$])dnl - LIBS="$LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" - LDFLAGS="$LDFLAGS $BOOST_SYSTEM_LDFLAGS" --# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, --# boost/thread.hpp will trigger a #error if -pthread isn't used: --# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support --# is not turned on. Please set the correct command line options for --# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" - CPPFLAGS="$CPPFLAGS $boost_cv_pthread_flag" - - # When compiling for the Windows platform, the threads library is named - # differently. - case $host_os in -- (*mingw*) -- BOOST_FIND_LIB([thread_win32], [$1], -- [boost/thread.hpp], [boost::thread t; boost::mutex m;]) -- BOOST_THREAD_LDFLAGS=$BOOST_THREAD_WIN32_LDFLAGS -- BOOST_THREAD_LDPATH=$BOOST_THREAD_WIN32_LDPATH -- BOOST_THREAD_LIBS=$BOOST_THREAD_WIN32_LIBS -- ;; -- (*) -- BOOST_FIND_LIB([thread], [$1], -- [boost/thread.hpp], [boost::thread t; boost::mutex m;]) -- ;; -+ (*mingw*) boost_thread_lib_ext=_win32;; - esac -+BOOST_FIND_LIBS([thread], [thread$boost_thread_lib_ext], -+ [$1], -+ [boost/thread.hpp], [boost::thread t; boost::mutex m;]) - - BOOST_THREAD_LIBS="$BOOST_THREAD_LIBS $BOOST_SYSTEM_LIBS $boost_cv_pthread_flag" - BOOST_THREAD_LDFLAGS="$BOOST_SYSTEM_LDFLAGS" - BOOST_CPPFLAGS="$BOOST_CPPFLAGS $boost_cv_pthread_flag" --LIBS=$boost_threads_save_LIBS --LDFLAGS=$boost_threads_save_LDFLAGS --CPPFLAGS=$boost_threads_save_CPPFLAGS --])# BOOST_THREADS -+LIBS=$boost_thread_save_LIBS -+LDFLAGS=$boost_thread_save_LDFLAGS -+CPPFLAGS=$boost_thread_save_CPPFLAGS -+])# BOOST_THREAD -+ -+AU_ALIAS([BOOST_THREADS], [BOOST_THREAD]) - - - # BOOST_TOKENIZER() -@@ -935,10 +1132,23 @@ BOOST_DEFUN([Variant], - BOOST_FIND_HEADER([boost/variant.hpp])]) - - -+# BOOST_POINTER_CONTAINER() -+# ------------------------ -+# Look for Boost.PointerContainer -+BOOST_DEFUN([Pointer_Container], -+[BOOST_FIND_HEADER([boost/ptr_container/ptr_deque.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_list.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_vector.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_array.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_set.hpp]) -+BOOST_FIND_HEADER([boost/ptr_container/ptr_map.hpp]) -+])# BOOST_POINTER_CONTAINER -+ -+ - # BOOST_WAVE([PREFERRED-RT-OPT]) - # ------------------------------ - # NOTE: If you intend to use Wave/Spirit with thread support, make sure you --# call BOOST_THREADS first. -+# call BOOST_THREAD first. - # Look for Boost.Wave. For the documentation of PREFERRED-RT-OPT, see the - # documentation of BOOST_FIND_LIB above. - BOOST_DEFUN([Wave], -@@ -973,8 +1183,16 @@ BOOST_DEFUN([Xpressive], - - # _BOOST_PTHREAD_FLAG() - # --------------------- --# Internal helper for BOOST_THREADS. Based on ACX_PTHREAD: --# http://autoconf-archive.cryp.to/acx_pthread.html -+# Internal helper for BOOST_THREAD. Computes boost_cv_pthread_flag -+# which must be used in CPPFLAGS and LIBS. -+# -+# Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3, -+# boost/thread.hpp will trigger a #error if -pthread isn't used: -+# boost/config/requires_threads.hpp:47:5: #error "Compiler threading support -+# is not turned on. Please set the correct command line options for -+# threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)" -+# -+# Based on ACX_PTHREAD: http://autoconf-archive.cryp.to/acx_pthread.html - AC_DEFUN([_BOOST_PTHREAD_FLAG], - [AC_REQUIRE([AC_PROG_CXX])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl -@@ -1042,6 +1260,14 @@ AC_LANG_POP([C++])dnl - m4_define([_BOOST_gcc_test], - ["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC @ gcc$1$2"])dnl - -+# _BOOST_mingw_test(MAJOR, MINOR) -+# ----------------------------- -+# Internal helper for _BOOST_FIND_COMPILER_TAG. -+m4_define([_BOOST_mingw_test], -+["defined __GNUC__ && __GNUC__ == $1 && __GNUC_MINOR__ == $2 && !defined __ICC && \ -+ (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ -+ || defined __WIN32__ || defined __WINNT || defined __WINNT__) @ mgw$1$2"])dnl -+ - - # _BOOST_FIND_COMPILER_TAG() - # -------------------------- -@@ -1051,7 +1277,8 @@ m4_define([_BOOST_gcc_test], - AC_DEFUN([_BOOST_FIND_COMPILER_TAG], - [AC_REQUIRE([AC_PROG_CXX])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl --AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], [boost_cv_lib_tag], -+AC_CACHE_CHECK([for the toolset name used by Boost for $CXX], -+ [boost_cv_lib_tag], - [boost_cv_lib_tag=unknown - if test x$boost_cv_inc_path != xno; then - AC_LANG_PUSH([C++])dnl -@@ -1069,14 +1296,31 @@ if test x$boost_cv_inc_path != xno; then - # I'm not sure about my test for `il' (be careful: Intel's ICC pre-defines - # the same defines as GCC's). - for i in \ -+ _BOOST_mingw_test(5, 1) \ -+ _BOOST_gcc_test(5, 1) \ -+ _BOOST_mingw_test(5, 0) \ -+ _BOOST_gcc_test(5, 0) \ -+ _BOOST_mingw_test(4, 10) \ -+ _BOOST_gcc_test(4, 10) \ -+ _BOOST_mingw_test(4, 9) \ -+ _BOOST_gcc_test(4, 9) \ -+ _BOOST_mingw_test(4, 8) \ - _BOOST_gcc_test(4, 8) \ -+ _BOOST_mingw_test(4, 7) \ - _BOOST_gcc_test(4, 7) \ -+ _BOOST_mingw_test(4, 6) \ - _BOOST_gcc_test(4, 6) \ -+ _BOOST_mingw_test(4, 5) \ - _BOOST_gcc_test(4, 5) \ -+ _BOOST_mingw_test(4, 4) \ - _BOOST_gcc_test(4, 4) \ -+ _BOOST_mingw_test(4, 3) \ - _BOOST_gcc_test(4, 3) \ -+ _BOOST_mingw_test(4, 2) \ - _BOOST_gcc_test(4, 2) \ -+ _BOOST_mingw_test(4, 1) \ - _BOOST_gcc_test(4, 1) \ -+ _BOOST_mingw_test(4, 0) \ - _BOOST_gcc_test(4, 0) \ - "defined __GNUC__ && __GNUC__ == 3 && !defined __ICC \ - && (defined WIN32 || defined WINNT || defined _WIN32 || defined __WIN32 \ -@@ -1142,6 +1386,7 @@ fi])dnl end of AC_CACHE_CHECK - # Thread) flavors of Boost. Sets boost_guess_use_mt accordingly. - AC_DEFUN([_BOOST_GUESS_WHETHER_TO_USE_MT], - [# Check whether we do better use `mt' even though we weren't ask to. -+AC_LANG_PUSH([C++])dnl - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #if defined _REENTRANT || defined _MT || defined __MT__ - /* use -mt */ -@@ -1149,6 +1394,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - # error MT not needed - #endif - ]])], [boost_guess_use_mt=:], [boost_guess_use_mt=false]) -+AC_LANG_POP([C++])dnl - ]) - - # _BOOST_AC_LINK_IFELSE(PROGRAM, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) -@@ -1172,11 +1418,11 @@ boost_use_source=: - test -f conftest.$ac_objext && ac_ext=$ac_objext && boost_use_source=false && - _AS_ECHO_LOG([re-using the existing conftest.$ac_objext]) - AS_IF([_AC_DO_STDERR($ac_link) && { -- test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || -- test ! -s conftest.err -+ test -z "$ac_[]_AC_LANG_ABBREV[]_werror_flag" || -+ test ! -s conftest.err - } && test -s conftest$ac_exeext && { -- test "$cross_compiling" = yes || -- $as_executable_p conftest$ac_exeext -+ test "$cross_compiling" = yes || -+ $as_executable_p conftest$ac_exeext - dnl FIXME: use AS_TEST_X instead when 2.61 is widespread enough. - }], - [$2], diff --git a/package.bak/cc-tool/Config.in b/package.bak/cc-tool/Config.in deleted file mode 100644 index b2cf97969b..0000000000 --- a/package.bak/cc-tool/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_CC_TOOL - bool "cc-tool" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # boost-filesystem - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_REGEX - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_SIGNALS - help - cc-tool provides support for Texas Instruments CC Debugger - for Linux OS in order to program 8051-based System-On-Chip - devices: CC254x CC253x CC243x CC251x CC111x - - http://sourceforge.net/projects/cctool/ - -comment "cc-tool needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/cc-tool/cc-tool.hash b/package.bak/cc-tool/cc-tool.hash deleted file mode 100644 index 81844eec82..0000000000 --- a/package.bak/cc-tool/cc-tool.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/cctool/files/ -sha1 f313e55f019ea5338438633f5b5e689b699343e1 cc-tool-0.26-src.tgz -md5 26960676f3e6264e612c299fbf8ec5ea cc-tool-0.26-src.tgz diff --git a/package.bak/cc-tool/cc-tool.mk b/package.bak/cc-tool/cc-tool.mk deleted file mode 100644 index d8df0415c0..0000000000 --- a/package.bak/cc-tool/cc-tool.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# cc-tool -# -################################################################################ - -CC_TOOL_VERSION = 0.26 -CC_TOOL_SITE = http://downloads.sourceforge.net/project/cctool -CC_TOOL_SOURCE = cc-tool-$(CC_TOOL_VERSION)-src.tgz -CC_TOOL_LICENSE = GPLv2 -CC_TOOL_LICENSE_FILES = COPYING -CC_TOOL_DEPENDENCIES = boost libusb - -# we're patching boost.m4 -CC_TOOL_AUTORECONF = YES - -# Configure script "discovers" boost in /usr/local if not given explicitly -CC_TOOL_CONF_OPTS = --with-boost=$(STAGING_DIR)/usr - -# Help boost.m4 find the Boost Regex library, which needs the pthread -# library, but isn't detected using a modern (pkg-config) mechanism. -ifeq ($(BR2_STATIC_LIBS),y) -CC_TOOL_CONF_ENV += LIBS="-lpthread" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch b/package.bak/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch deleted file mode 100644 index 33db7d480f..0000000000 --- a/package.bak/ccache/0001-Convert-argument-to-sysroot-option-to-relative-path.patch +++ /dev/null @@ -1,43 +0,0 @@ -From fe42d6f7b739e8d42811bf46bcccfafa728847a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mathias=20De=20Mar=C3=A9?= -Date: Mon, 19 Sep 2016 10:38:13 +0200 -Subject: [PATCH] Convert argument to '--sysroot' option to relative path - -Previously, only the argument to '--sysroot=' was converted. -This changeset adds support for '--sysroot'. - -Signed-off-by: Brandon Maier -Signed-off-by: Matt Weber ---- - ccache.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/ccache.c b/ccache.c -index 8ffadcc..76139b9 100644 ---- a/ccache.c -+++ b/ccache.c -@@ -2407,6 +2407,21 @@ cc_process_args(struct args *args, struct args **preprocessor_args, - free(option); - continue; - } -+ // Alternate form of specifying sysroot without = -+ if (str_eq(argv[i], "--sysroot")) { -+ if (i == argc-1) { -+ cc_log("Missing argument to %s", argv[i]); -+ stats_update(STATS_ARGS); -+ result = false; -+ goto out; -+ } -+ args_add(stripped_args, argv[i]); -+ char *relpath = make_relative_path(x_strdup(argv[i+1])); -+ args_add(stripped_args, relpath); -+ i++; -+ free(relpath); -+ continue; -+ } - if (str_startswith(argv[i], "-Wp,")) { - if (str_eq(argv[i], "-Wp,-P") - || strstr(argv[i], ",-P,") --- -2.8.3 - diff --git a/package.bak/ccache/ccache.hash b/package.bak/ccache/ccache.hash deleted file mode 100644 index bde53f794d..0000000000 --- a/package.bak/ccache/ccache.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Verified key https://samba.org/ftp/ccache/ccache-3.3.3.tar.xz.asc - sha256 computed locally -sha256 3b02a745da1cfa9eb438af7147e0fd3545e2f6163de9e5b07da86f58859f04ec ccache-3.3.3.tar.xz diff --git a/package.bak/ccache/ccache.mk b/package.bak/ccache/ccache.mk deleted file mode 100644 index f174a5d01c..0000000000 --- a/package.bak/ccache/ccache.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# ccache -# -################################################################################ - -CCACHE_VERSION = 3.3.3 -CCACHE_SITE = https://samba.org/ftp/ccache -CCACHE_SOURCE = ccache-$(CCACHE_VERSION).tar.xz -CCACHE_LICENSE = GPLv3+, others -CCACHE_LICENSE_FILES = LICENSE.txt GPL-3.0.txt - -# Force ccache to use its internal zlib. The problem is that without -# this, ccache would link against the zlib of the build system, but we -# might build and install a different version of zlib in $(O)/host -# afterwards, which ccache will pick up. This might break if there is -# a version mismatch. A solution would be to add host-zlib has a -# dependency of ccache, but it would require tuning the zlib .mk file -# to use HOSTCC_NOCCACHE as the compiler. Instead, we take the easy -# path: tell ccache to use its internal copy of zlib, so that ccache -# has zero dependency besides the C library. -HOST_CCACHE_CONF_OPTS += --with-bundled-zlib - -# Patch host-ccache as follows: -# - Use BR_CACHE_DIR instead of CCACHE_DIR, because CCACHE_DIR -# is already used by autotargets for the ccache package. -# BR_CACHE_DIR is exported by Makefile based on config option -# BR2_CCACHE_DIR. -# - Change hard-coded last-ditch default to match path in .config, to avoid -# the need to specify BR_CACHE_DIR when invoking ccache directly. -define HOST_CCACHE_PATCH_CONFIGURATION - sed -i 's,getenv("CCACHE_DIR"),getenv("BR_CACHE_DIR"),' $(@D)/ccache.c - sed -i 's,"%s/.ccache","$(BR_CACHE_DIR)",' $(@D)/conf.c -endef - -HOST_CCACHE_POST_PATCH_HOOKS += HOST_CCACHE_PATCH_CONFIGURATION - -define HOST_CCACHE_MAKE_CACHE_DIR - mkdir -p $(BR_CACHE_DIR) -endef - -HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_MAKE_CACHE_DIR - -# Provide capability to do initial ccache setup (e.g. increase default size) -BR_CCACHE_INITIAL_SETUP = $(call qstrip,$(BR2_CCACHE_INITIAL_SETUP)) -ifneq ($(BR_CCACHE_INITIAL_SETUP),) -define HOST_CCACHE_DO_INITIAL_SETUP - @$(call MESSAGE,"Applying initial settings") - $(CCACHE) $(BR_CCACHE_INITIAL_SETUP) - $(CCACHE) -s -endef - -HOST_CCACHE_POST_INSTALL_HOOKS += HOST_CCACHE_DO_INITIAL_SETUP -endif - -$(eval $(host-autotools-package)) - -ifeq ($(BR2_CCACHE),y) -ccache-stats: host-ccache - $(Q)$(CCACHE) -s - -ccache-options: host-ccache -ifeq ($(CCACHE_OPTIONS),) - $(Q)echo "Usage: make ccache-options CCACHE_OPTIONS=\"opts\"" - $(Q)echo "where 'opts' corresponds to one or more valid ccache options" \ - "(see ccache help text below)" - $(Q)echo -endif - $(Q)$(CCACHE) $(CCACHE_OPTIONS) -endif diff --git a/package.bak/ccid/Config.in b/package.bak/ccid/Config.in deleted file mode 100644 index f5bb5830bb..0000000000 --- a/package.bak/ccid/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_CCID - bool "ccid" - select BR2_PACKAGE_PCSC_LITE - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_USE_MMU # pcsc-lite - depends on !BR2_STATIC_LIBS # pcsc-lite - help - PC/SC driver for USB CCID smart card readers - - http://pcsclite.alioth.debian.org/ccid.html - -comment "ccid needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ccid/ccid.hash b/package.bak/ccid/ccid.hash deleted file mode 100644 index a0e91da46d..0000000000 --- a/package.bak/ccid/ccid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ccid/ccid_1.4.18-1.dsc -sha256 5fdba97a2d2eb1c652b7dd4aa0bb8cee4814bab0cf61aecb84b32b57272541aa ccid_1.4.18.orig.tar.bz2 diff --git a/package.bak/ccid/ccid.mk b/package.bak/ccid/ccid.mk deleted file mode 100644 index 18653d3518..0000000000 --- a/package.bak/ccid/ccid.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# ccid -# -################################################################################ - -CCID_VERSION = 1.4.18 -CCID_SOURCE = ccid_$(CCID_VERSION).orig.tar.bz2 -CCID_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/ccid -CCID_LICENSE = LGPLv2.1+ -CCID_LICENSE_FILES = COPYING -CCID_INSTALL_STAGING = YES -CCID_DEPENDENCIES = pcsc-lite host-pkgconf libusb - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define CCID_INSTALL_UDEV_RULES - if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \ - cp $(@D)/src/92_pcscd_ccid.rules $(TARGET_DIR)/etc/udev/rules.d/ ; \ - fi; -endef - -CCID_POST_INSTALL_TARGET_HOOKS += CCID_INSTALL_UDEV_RULES -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ccrypt/Config.in b/package.bak/ccrypt/Config.in deleted file mode 100644 index ef5a7eef65..0000000000 --- a/package.bak/ccrypt/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_CCRYPT - bool "ccrypt" - help - ccrypt is a utility for encrypting and decrypting files and streams. - - http://ccrypt.sourceforge.net/ diff --git a/package.bak/ccrypt/ccrypt.hash b/package.bak/ccrypt/ccrypt.hash deleted file mode 100644 index a93fcb9afa..0000000000 --- a/package.bak/ccrypt/ccrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 87d66da2170facabf6f2fc073586ae2c7320d4689980cfca415c74688e499ba0 ccrypt-1.10.tar.gz diff --git a/package.bak/ccrypt/ccrypt.mk b/package.bak/ccrypt/ccrypt.mk deleted file mode 100644 index 3beff4084b..0000000000 --- a/package.bak/ccrypt/ccrypt.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# ccrypt -# -################################################################################ - -CCRYPT_VERSION = 1.10 -CCRYPT_SITE = http://ccrypt.sourceforge.net/download - -CCRYPT_LICENSE = GPLv2+ -CCRYPT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/cdrkit/0001-no-rcmd.patch b/package.bak/cdrkit/0001-no-rcmd.patch deleted file mode 100644 index 294779f7a5..0000000000 --- a/package.bak/cdrkit/0001-no-rcmd.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] fix build with uClibc - -cdrkit unconditionally enables code using rcmd(3), which isn't available -on uClibc. - -Signed-off-by: Peter Korsgaard ---- - include/xconfig.h.in | 1 - - 1 file changed, 1 deletion(-) - -Index: cdrkit-1.1.10/include/xconfig.h.in -=================================================================== ---- cdrkit-1.1.10.orig/include/xconfig.h.in -+++ cdrkit-1.1.10/include/xconfig.h.in -@@ -187,7 +187,6 @@ - * they are placed before the large file tests. - */ - --#define HAVE_RCMD 1 /* rcmd() is present in libc/libsocket */ - #define HAVE_SOCKET 1 /* socket() is present in libc/libsocket */ - #define HAVE_SOCKETPAIR 1 /* socketpair() is present in libc/libsocket */ - #define HAVE_GETSERVBYNAME 1 /* getservbyname() is present in libc/libsocket */ diff --git a/package.bak/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch b/package.bak/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch deleted file mode 100644 index 2e0f6d52e3..0000000000 --- a/package.bak/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9454ef47db30caa4359766c8730d9d92f65c64f7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 22:58:57 +0200 -Subject: [PATCH] define __THROW to avoid build issue with musl - -Fixes: -http://autobuild.buildroot.net/results/d27/d2781e70b04a207e2e9397d888032294c7285034/build-end.log - -Signed-off-by: Romain Naour ---- - genisoimage/sha256.h | 4 ++++ - genisoimage/sha512.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/genisoimage/sha256.h b/genisoimage/sha256.h -index e7f4cb9..bcae7ef 100644 ---- a/genisoimage/sha256.h -+++ b/genisoimage/sha256.h -@@ -29,6 +29,10 @@ - #include - #include - -+/* define __THROW to avoid build issue when it's not available from the libc */ -+#ifndef __THROW -+# define __THROW -+#endif - - /* Structure to save state of computation between the single steps. */ - struct sha256_ctx -diff --git a/genisoimage/sha512.h b/genisoimage/sha512.h -index 7298355..8cee8b0 100644 ---- a/genisoimage/sha512.h -+++ b/genisoimage/sha512.h -@@ -29,6 +29,10 @@ - #include - #include - -+/* define __THROW to avoid build issue when it's not available from the libc */ -+#ifndef __THROW -+# define __THROW -+#endif - - /* Structure to save state of computation between the single steps. */ - struct sha512_ctx --- -2.4.3 - diff --git a/package.bak/cdrkit/Config.in b/package.bak/cdrkit/Config.in deleted file mode 100644 index af18ba9302..0000000000 --- a/package.bak/cdrkit/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_CDRKIT - # Needed for libbz - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_ZLIB - depends on BR2_USE_MMU # fork - bool "cdrkit" - help - cdrkit is a suite of programs for recording CDs and DVDs, - blanking CD-RW media, creating ISO-9660 filesystem images, - extracting audio CD data, and more. - - http://www.cdrkit.org/ diff --git a/package.bak/cdrkit/cdrkit.hash b/package.bak/cdrkit/cdrkit.hash deleted file mode 100644 index 6ecb922df6..0000000000 --- a/package.bak/cdrkit/cdrkit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit/cdrkit_1.1.11-3.dsc -sha256 d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da cdrkit_1.1.11.orig.tar.gz diff --git a/package.bak/cdrkit/cdrkit.mk b/package.bak/cdrkit/cdrkit.mk deleted file mode 100644 index 10d118c46a..0000000000 --- a/package.bak/cdrkit/cdrkit.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# cdrkit -# -################################################################################ - -CDRKIT_VERSION = 1.1.11 -CDRKIT_SOURCE = cdrkit_$(CDRKIT_VERSION).orig.tar.gz -CDRKIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cdrkit -CDRKIT_DEPENDENCIES = libcap bzip2 zlib -HOST_CDRKIT_DEPENDENCIES = host-libcap host-bzip2 host-zlib -CDRKIT_LICENSE = GPLv2 -CDRKIT_LICENSE_FILES = COPYING - -ifeq ($(BR2_ENDIAN),"BIG") -CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=1 -else -CDRKIT_CONF_OPTS += -DBITFIELDS_HTOL=0 -endif - -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) diff --git a/package.bak/cegui06/0001-stddef.h.patch b/package.bak/cegui06/0001-stddef.h.patch deleted file mode 100644 index cc16effc25..0000000000 --- a/package.bak/cegui06/0001-stddef.h.patch +++ /dev/null @@ -1,26 +0,0 @@ -includes: ptrdiff_t is defined in stddef.h - -ptrdiff_t is defined in the stddef.h header, so this -header must be included. - -Do the #include in a common header to avoid doing it -all over the place. - -Signed-off-by: "Yann E. MORIN" - ---- -Patch not sent upstream, it's a no-longer-maintained branch. -To be noted, however, is that the current devel branch is -still missing that include. - -diff -durN cegui06-0.6.2.orig/include/CEGUIBase.h cegui06-0.6.2/include/CEGUIBase.h ---- cegui06-0.6.2.orig//include/CEGUIBase.h 2008-02-11 15:38:27.000000000 +0100 -+++ cegui06-0.6.2/include/CEGUIBase.h 2012-08-19 22:51:50.260385978 +0200 -@@ -34,6 +34,7 @@ - #define _CEGUIBase_h_ - - #include -+#include - - // bring in configuration options - #include "CEGUIConfig.h" diff --git a/package.bak/cegui06/Config.in b/package.bak/cegui06/Config.in deleted file mode 100644 index e6a024a399..0000000000 --- a/package.bak/cegui06/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -comment "cegui06 needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS - -config BR2_PACKAGE_CEGUI06 - bool "cegui06" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_PCRE - help - Crazy Eddie's GUI System is a free library providing windowing and - widgets for graphics APIs / engines where such functionality is not - natively available, or severely lacking. The library is object - orientated, written in C++, and targeted at games developers who - should be spending their time creating great games, not building - GUI sub-systems! - - http://www.cegui.org.uk/ diff --git a/package.bak/cegui06/cegui06.hash b/package.bak/cegui06/cegui06.hash deleted file mode 100644 index 21df3ca09f..0000000000 --- a/package.bak/cegui06/cegui06.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 eb77741cd9fcc927a876e8116b98691212e973d2264e2071406423f6ca3e305f CEGUI-0.6.2b.tar.gz diff --git a/package.bak/cegui06/cegui06.mk b/package.bak/cegui06/cegui06.mk deleted file mode 100644 index 43d3b09dd7..0000000000 --- a/package.bak/cegui06/cegui06.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# cegui06 -# -################################################################################ - -# Do not update the version, we need exactly that one for Spice. -CEGUI06_VERSION_MAJOR = 0.6.2 -CEGUI06_VERSION = $(CEGUI06_VERSION_MAJOR)b -CEGUI06_SOURCE = CEGUI-$(CEGUI06_VERSION).tar.gz -CEGUI06_SITE = http://downloads.sourceforge.net/project/crayzedsgui/CEGUI%20Mk-2/$(CEGUI06_VERSION_MAJOR) -CEGUI06_LICENSE = MIT -CEGUI06_LICENSE_FILES = COPYING -CEGUI06_INSTALL_STAGING = YES - -CEGUI06_DEPENDENCIES = \ - expat \ - freetype \ - pcre \ - -CEGUI06_CONF_OPTS = \ - --enable-expat \ - --disable-external-tinyxml \ - --disable-xerces-c \ - --disable-libxml \ - --disable-tinyxml \ - --disable-opengl-renderer \ - --disable-external-glew \ - --disable-irrlicht-renderer \ - --disable-directfb-renderer \ - --disable-samples \ - --disable-lua-module \ - --disable-toluacegui \ - --disable-external-toluapp \ - -$(eval $(autotools-package)) diff --git a/package.bak/celt051/0001-fix-gnuc-prereq.patch b/package.bak/celt051/0001-fix-gnuc-prereq.patch deleted file mode 100644 index 8efd518d97..0000000000 --- a/package.bak/celt051/0001-fix-gnuc-prereq.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix musl build - -musl does not define __GNUC_PREREQ. Use patch from Alpine Linux -(http://git.alpinelinux.org/cgit/aports/plain/main/celt051/fix-gnuc-prereq.patch). - -Fixes http://autobuild.buildroot.net/results/223/223ba6003bdd7e0c896455c21fa8fee943b4e716/ - -Signed-off-by: Jörg Krause - ---- celt-0.5.1.3.orig/libcelt/ecintrin.h -+++ celt-0.5.1.3/libcelt/ecintrin.h -@@ -52,8 +52,7 @@ - /*Count leading zeros. - This macro should only be used for implementing ec_ilog(), if it is defined. - All other code should use EC_ILOG() instead.*/ --#ifdef __GNUC_PREREQ --#if __GNUC_PREREQ(3,4) -+#if defined(__GNUC__) && ((__GNUC__<<16)+__GNUC_MINOR__) >= 0x304 - # if INT_MAX>=2147483647 - # define EC_CLZ0 sizeof(unsigned)*CHAR_BIT - # define EC_CLZ(_x) (__builtin_clz(_x)) -@@ -61,7 +60,6 @@ - # define EC_CLZ0 sizeof(unsigned long)*CHAR_BIT - # define EC_CLZ(_x) (__builtin_clzl(_x)) - # endif --#endif - #endif - - #if defined(EC_CLZ) diff --git a/package.bak/celt051/Config.in b/package.bak/celt051/Config.in deleted file mode 100644 index 035e262d74..0000000000 --- a/package.bak/celt051/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_CELT051 - bool "celt051" - select BR2_PACKAGE_LIBOGG - help - The CELT ultra-low delay audio codec - - The CELT codec is a compression algorithm for audio. Like MP3, - Vorbis, and AAC it is suitable for transmitting music with high - quality. Unlike these formats CELT imposes very little delay on - the signal, even less than is typical for speech centric formats - like Speex, GSM, or G.729. - - Note: this is version 0.5.1.3 of celt. - - http://www.celt-codec.org/ diff --git a/package.bak/celt051/celt051.hash b/package.bak/celt051/celt051.hash deleted file mode 100644 index 4ad212b2d3..0000000000 --- a/package.bak/celt051/celt051.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/celt/SHA1SUMS -sha1 eb05030108c36cb063c3f026c349f16d78e0a497 celt-0.5.1.3.tar.gz diff --git a/package.bak/celt051/celt051.mk b/package.bak/celt051/celt051.mk deleted file mode 100644 index 9e25781873..0000000000 --- a/package.bak/celt051/celt051.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# celt -# -################################################################################ - -# Although version newer than 0.5.1.3 exists, we're -# stuck with 0.5.1.3 for use by Spice (coming later) -CELT051_VERSION = 0.5.1.3 -CELT051_SOURCE = celt-$(CELT051_VERSION).tar.gz -CELT051_SITE = http://downloads.xiph.org/releases/celt -CELT051_LICENSE = BSD-2c -CELT051_LICENSE_FILES = COPYING -CELT051_INSTALL_STAGING = YES -CELT051_DEPENDENCIES = libogg - -# Need to specify --with-ogg, otherwise /usr/lib may be searched for -# if target is the same kind as host (ie. same arch, same bitness, -# same endianness, so that /usr/lib contains libraries linkable by -# our cross-compiler) -CELT051_CONF_OPTS = \ - --enable-fixed-point \ - --disable-fixed-point-debug \ - --disable-experimental-postfilter \ - --disable-static-modes \ - --disable-assertions \ - --disable-oggtest \ - --with-ogg=$(STAGING_DIR)/usr \ - -$(eval $(autotools-package)) diff --git a/package.bak/cgic/0001-prepare_makefile.patch b/package.bak/cgic/0001-prepare_makefile.patch deleted file mode 100644 index 15adc4cda2..0000000000 --- a/package.bak/cgic/0001-prepare_makefile.patch +++ /dev/null @@ -1,44 +0,0 @@ -Makefile: fix for cross-compilation - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it] -Signed-off-by: "Yann E. MORIN" -diff -rupN cgic206/Makefile cgic206-br/Makefile ---- cgic206/Makefile 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206-br/Makefile 2015-01-16 11:18:03.714874000 -0500 -@@ -1,15 +1,14 @@ --CFLAGS=-g -Wall --CC=gcc --AR=ar --RANLIB=ranlib - LIBS=-L./ -lcgic - - all: libcgic.a cgictest.cgi capture - - install: libcgic.a -- cp libcgic.a /usr/local/lib -- cp cgic.h /usr/local/include -- @echo libcgic.a is in /usr/local/lib. cgic.h is in /usr/local/include. -+ cp libcgic.a $(PREFIX)/usr/lib -+ cp cgic.h $(PREFIX)/usr/include -+ @echo libcgic.a is in $(PREFIX)/usr/lib. cgic.h is in $(PREFIX)/usr/include. -+ -+cgi.o: cgic.c cgic.h -+ $(CC) $(CFLAGS) cgic.c -o cgic.o - - libcgic.a: cgic.o cgic.h - rm -f libcgic.a -@@ -19,10 +18,10 @@ libcgic.a: cgic.o cgic.h - #mingw32 and cygwin users: replace .cgi with .exe - - cgictest.cgi: cgictest.o libcgic.a -- gcc cgictest.o -o cgictest.cgi ${LIBS} -+ $(CC) cgictest.o -o cgictest.cgi ${LIBS} - - capture: capture.o libcgic.a -- gcc capture.o -o capture ${LIBS} -+ $(CC) capture.o -o capture ${LIBS} - - clean: - rm -f *.o *.a cgictest.cgi capture diff --git a/package.bak/cgic/0002-file_enhancements.patch b/package.bak/cgic/0002-file_enhancements.patch deleted file mode 100644 index a6f82fce33..0000000000 --- a/package.bak/cgic/0002-file_enhancements.patch +++ /dev/null @@ -1,56 +0,0 @@ -Create better temporary files. - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it; split the patch in two - independent fixes] -Signed-off-by: "Yann E. MORIN" - -diff -rupN cgic206/cgic.c cgic206_tempfile/cgic.c ---- cgic206/cgic.c 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.c 2015-01-21 11:58:45.436384908 -0500 -@@ -22,6 +22,8 @@ - #define CGICDEBUGEND - #endif /* CGICDEBUG */ - -+#define _GNU_SOURCE -+ - #include - #include - #include -@@ -34,11 +36,11 @@ - #include - - /* cgic 2.01 */ --#include - - #else - #include - #endif /* WIN32 */ -+#include - #include "cgic.h" - - #define cgiStrEq(a, b) (!strcmp((a), (b))) -@@ -636,16 +638,17 @@ static cgiParseResultType getTempFileNam - window between the file's creation and the - chmod call (glibc 2.0.6 and lower might - otherwise have allowed this). */ -+ mode_t umode; - int outfd; -+ umode = umask(0600); - strcpy(tfileName, cgicTempDir "/cgicXXXXXX"); -- outfd = mkstemp(tfileName); -+ outfd = mkostemp(tfileName, O_CLOEXEC | O_NOATIME); -+ umask(umode); - if (outfd == -1) { - return cgiParseIO; - } -- close(outfd); -- /* Fix the permissions */ -- if (chmod(tfileName, 0600) != 0) { -- unlink(tfileName); -+ -+ if (close(outfd)) { - return cgiParseIO; - } - #else diff --git a/package.bak/cgic/0003-restore-cgiFormFileGetTempfileName.patch b/package.bak/cgic/0003-restore-cgiFormFileGetTempfileName.patch deleted file mode 100644 index f66227b6a6..0000000000 --- a/package.bak/cgic/0003-restore-cgiFormFileGetTempfileName.patch +++ /dev/null @@ -1,43 +0,0 @@ -Restore lost functionality - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it] -Signed-off-by: "Yann E. MORIN" - -diff -rupN cgic206/cgic.c cgic206_tempfile/cgic.c ---- cgic206/cgic.c 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.c 2015-01-21 11:58:45.436384908 -0500 -@@ -1278,6 +1278,20 @@ cgiFormResultType cgiFormFileContentType - } - } - -+const char* cgiFormFileGetTempfileName( -+ char* name) -+{ -+ cgiFormEntry *e; -+ e = cgiFormEntryFindFirst(name); -+ if (!e) { -+ return NULL; -+ } else if (!strlen(e->tfileName)) { -+ return NULL; -+ } else { -+ return e->tfileName; -+ } -+} -+ - cgiFormResultType cgiFormFileSize( - char *name, int *sizeP) - { -diff -rupN cgic206/cgic.h cgic206_tempfile/cgic.h ---- cgic206/cgic.h 2014-03-16 18:17:11.000000000 -0400 -+++ cgic206_tempfile/cgic.h 2015-01-21 11:53:02.915148026 -0500 -@@ -141,6 +141,8 @@ extern cgiFormResultType cgiFormRadio( - char *name, char **valuesText, int valuesTotal, - int *result, int defaultV); - -+extern const char* cgiFormFileGetTempfileName(char* name); -+ - /* The paths returned by this function are the original names of files - as reported by the uploading web browser and shoult NOT be - blindly assumed to be "safe" names for server-side use! */ diff --git a/package.bak/cgic/Config.in b/package.bak/cgic/Config.in deleted file mode 100644 index 402460d039..0000000000 --- a/package.bak/cgic/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_CGIC - bool "cgic" - help - C CGI library - - http://www.boutell.com/cgic/ diff --git a/package.bak/cgic/cgic.hash b/package.bak/cgic/cgic.hash deleted file mode 100644 index 6c0fee6124..0000000000 --- a/package.bak/cgic/cgic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Localy computed -sha256 9562e0b6af59ebc2090107eab5946ce0788a1de36146ad181970cf53e9be7a33 cgic206.tar.gz diff --git a/package.bak/cgic/cgic.mk b/package.bak/cgic/cgic.mk deleted file mode 100644 index f07c62e97e..0000000000 --- a/package.bak/cgic/cgic.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# cgic -# -################################################################################ - -CGIC_VERSION = 2.06 -CGIC_SOURCE = cgic206.tar.gz -CGIC_SITE = http://boutell.com/cgic -CGIC_LICENSE = Custom -CGIC_LICENSE_FILES = license.txt - -# Installs only a static library and a header file -CGIC_INSTALL_STAGING = YES -CGIC_INSTALL_TARGET = NO - -define CGIC_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) libcgic.a -endef - -define CGIC_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) PREFIX=$(STAGING_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/cgilua/Config.in b/package.bak/cgilua/Config.in deleted file mode 100644 index d1e7fbf0e8..0000000000 --- a/package.bak/cgilua/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_CGILUA - bool "cgilua" - # Runtime dependency only - select BR2_PACKAGE_LUAFILESYSTEM - help - CGILua is a tool for creating dynamic HTML pages - and manipulating input data from Web forms. - - http://keplerproject.github.com/cgilua diff --git a/package.bak/cgilua/cgilua.hash b/package.bak/cgilua/cgilua.hash deleted file mode 100644 index 786791d302..0000000000 --- a/package.bak/cgilua/cgilua.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8e9ef583f8e1c5b600ebc6bb04924a61f72320130410191a9c56d7295fb02be1 cgilua-5.1.4-2.src.rock diff --git a/package.bak/cgilua/cgilua.mk b/package.bak/cgilua/cgilua.mk deleted file mode 100644 index 5934ffda6f..0000000000 --- a/package.bak/cgilua/cgilua.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# cgilua -# -################################################################################ - -CGILUA_VERSION = 5.1.4-2 -CGILUA_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/cgroupfs-mount/Config.in b/package.bak/cgroupfs-mount/Config.in deleted file mode 100644 index 0b2e4ba1e7..0000000000 --- a/package.bak/cgroupfs-mount/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_CGROUPFS_MOUNT - bool "cgroupfs-mount" - depends on !BR2_INIT_SYSTEMD - help - cgroupfs mount and umount scripts. - - requires a Linux kernel >= 3.0 with the following options - enabled: - - - CONFIG_BLK_CGROUP - - CONFIG_CGROUPS - - CONFIG_CGROUP_CPUACCT - - CONFIG_CGROUP_DEVICE - - CONFIG_CGROUP_FREEZER - - CONFIG_CGROUP_WRITEBACK - - CONFIG_CGROUP_SCHED - - CONFIG_CGROUP_PIDS - - https://github.com/tianon/cgroupfs-mount diff --git a/package.bak/cgroupfs-mount/S30cgroupfs b/package.bak/cgroupfs-mount/S30cgroupfs deleted file mode 100644 index aa0a29b120..0000000000 --- a/package.bak/cgroupfs-mount/S30cgroupfs +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Set up cgroupfs mounts. -# - -start() { - printf "Mounting cgroupfs hierarchy: " - /usr/bin/cgroupfs-mount - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Unmounting cgroupfs hierarchy: " - /usr/bin/cgroupfs-umount - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/cgroupfs-mount/cgroupfs-mount.hash b/package.bak/cgroupfs-mount/cgroupfs-mount.hash deleted file mode 100644 index 34f516764c..0000000000 --- a/package.bak/cgroupfs-mount/cgroupfs-mount.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fb32a8d9de491358d28f56ab76a56e1a611b90d5b6326910d3a69395fa539027 cgroupfs-mount-7285bf44402029394808339f69f4f293730fc2c6.tar.gz diff --git a/package.bak/cgroupfs-mount/cgroupfs-mount.mk b/package.bak/cgroupfs-mount/cgroupfs-mount.mk deleted file mode 100644 index b37560509b..0000000000 --- a/package.bak/cgroupfs-mount/cgroupfs-mount.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# cgroupfs-mount -# -################################################################################ - -CGROUPFS_MOUNT_VERSION = 7285bf44402029394808339f69f4f293730fc2c6 -CGROUPFS_MOUNT_SITE = $(call github,tianon,cgroupfs-mount,$(CGROUPFS_MOUNT_VERSION)) -CGROUPFS_MOUNT_LICENSE = GPLv3+ -CGROUPFS_MOUNT_LICENSE_FILES = debian/copyright - -define CGROUPFS_MOUNT_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/cgroupfs-mount $(TARGET_DIR)/usr/bin/cgroupfs-mount - $(INSTALL) -D -m 0755 $(@D)/cgroupfs-umount $(TARGET_DIR)/usr/bin/cgroupfs-umount -endef - -define CGROUPFS_MOUNT_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D $(CGROUPFS_MOUNT_PKGDIR)/S30cgroupfs \ - $(TARGET_DIR)/etc/init.d/S30cgroupfs - -endef - -$(eval $(generic-package)) diff --git a/package.bak/check/Config.in b/package.bak/check/Config.in deleted file mode 100644 index 04682e1481..0000000000 --- a/package.bak/check/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_CHECK - bool "check" - help - Check is a unit testing framework for C. - - http://check.sourceforge.net/ diff --git a/package.bak/check/check.hash b/package.bak/check/check.hash deleted file mode 100644 index 0c3a924b57..0000000000 --- a/package.bak/check/check.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/check/files/check/0.10.0/ -md5 53c5e5c77d090e103a17f3ed7fd7d8b8 check-0.10.0.tar.gz -sha1 35d3a53446aea7b21a770faedb358d0fc7cba76d check-0.10.0.tar.gz diff --git a/package.bak/check/check.mk b/package.bak/check/check.mk deleted file mode 100644 index 92dd033651..0000000000 --- a/package.bak/check/check.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# check -# -################################################################################ - -CHECK_VERSION = 0.10.0 -CHECK_SITE = http://downloads.sourceforge.net/project/check/check/$(CHECK_VERSION) -CHECK_INSTALL_STAGING = YES -CHECK_DEPENDENCIES = host-pkgconf -CHECK_LICENSE = LGPLv2.1+ -CHECK_LICENSE_FILES = COPYING.LESSER - -# Having checkmk in the target makes no sense -define CHECK_REMOVE_CHECKMK - rm -f $(TARGET_DIR)/usr/bin/checkmk -endef -CHECK_POST_INSTALL_TARGET_HOOKS += CHECK_REMOVE_CHECKMK - -$(eval $(autotools-package)) diff --git a/package.bak/checkpolicy/Config.in.host b/package.bak/checkpolicy/Config.in.host deleted file mode 100644 index 240a5b6dc4..0000000000 --- a/package.bak/checkpolicy/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_CHECKPOLICY - bool "host checkpolicy" - help - checkpolicy is the SELinux policy compiler. It uses libsepol - to generate the binary policy. checkpolicy uses the static - libsepol since it deals with low level details of the policy - that have not been encapsulated/abstracted by a proper - shared library interface. - - http://selinuxproject.org/page/Main_Page diff --git a/package.bak/checkpolicy/checkpolicy.hash b/package.bak/checkpolicy/checkpolicy.hash deleted file mode 100644 index 6208d7749c..0000000000 --- a/package.bak/checkpolicy/checkpolicy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 0bebd18688ca8027b1b3b4ff1532c0626f1fe49883ae6cb74d9d385940e74157 checkpolicy-2.6.tar.gz diff --git a/package.bak/checkpolicy/checkpolicy.mk b/package.bak/checkpolicy/checkpolicy.mk deleted file mode 100644 index 8328b39ad0..0000000000 --- a/package.bak/checkpolicy/checkpolicy.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# checkpolicy -# -################################################################################ - -CHECKPOLICY_VERSION = 2.6 -CHECKPOLICY_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -CHECKPOLICY_LICENSE = GPLv2 -CHECKPOLICY_LICENSE_FILES = COPYING - -HOST_CHECKPOLICY_DEPENDENCIES = host-libselinux host-flex host-bison - -HOST_CHECKPOLICY_MAKE_OPTS = $(HOST_CONFIGURE_OPTS) \ - LEX="$(HOST_DIR)/usr/bin/flex" \ - YACC="$(HOST_DIR)/usr/bin/bison -y" - -# DESTDIR is used at build time to find host-libselinux -define HOST_CHECKPOLICY_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) -endef - -define HOST_CHECKPOLICY_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CHECKPOLICY_MAKE_OPTS) DESTDIR=$(HOST_DIR) install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch b/package.bak/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch deleted file mode 100644 index bff8e3ec1b..0000000000 --- a/package.bak/chocolate-doom/0001-Fix-gcc_struct-attribute-directive-ignored-warnings.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d9c517d9a4e168c1f7ed28ad0eb9365d69f5ceb2 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Thu, 22 Oct 2015 11:29:55 -0200 -Subject: [PATCH] Fix "`gcc_struct' attribute directive ignored" warnings -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Compilation for target architectures other than i386, x86_64 or PowerPC -(e.g. ARM) caused multiple warnings like the following to appear: - - doomdata.h:75:1: warning: ‘gcc_struct’ attribute directive ignored - } PACKEDATTR mapsidedef_t; - ^ - -This was due to 'gcc_struct' being undefined for these architectures. -Since that attribute was actually introduced by commit 87db726b9a9ae61ca -to address the fact that -mms-bitfields became the default for GCC on -Windows, limit it to that case. - -Upstream-status: accepted, not yet released. -https://github.com/chocolate-doom/chocolate-doom/pull/629 - -Signed-off-by: Rodrigo Rebello ---- - src/doomtype.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/doomtype.h b/src/doomtype.h -index bf0a40e..77c026c 100644 ---- a/src/doomtype.h -+++ b/src/doomtype.h -@@ -52,10 +52,10 @@ - - #ifdef __GNUC__ - --#ifdef __clang__ --#define PACKEDATTR __attribute__((packed)) --#else -+#if defined(_WIN32) && !defined(__clang__) - #define PACKEDATTR __attribute__((packed,gcc_struct)) -+#else -+#define PACKEDATTR __attribute__((packed)) - #endif - - #else --- -2.1.4 - diff --git a/package.bak/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch b/package.bak/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch deleted file mode 100644 index f4d09f558f..0000000000 --- a/package.bak/chocolate-doom/0002-configure-fix-with-PACKAGE-option-checks.patch +++ /dev/null @@ -1,67 +0,0 @@ -From fd12fa91aa8e35dbd3ffa5bfe055baf6bde0cd63 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Thu, 22 Oct 2015 15:28:11 -0200 -Subject: [PATCH] configure: fix --with-PACKAGE option checks - -Options of the form --with-PACKAGE[=yes] (e.g. --with-libpng), when -passed to configure, were being treated as though --without-PACKAGE had -been given. - -Although the intention is to have configure check and use PACKAGE by -default if it's available, thus requiring the user to pass an option -only if PACKAGE must NOT be used, there are times when the opposite -might be desired (i.e. the user wants to indicate PACKAGE MUST be used). -Moreover, allowing --with-PACKAGE and behaving as if --without-PACKAGE -had been specified is in itself quite confusing. - -Fix that by testing the result of 'with_PACKAGE' in configure.ac and -acting accordingly instead of blindly assuming a 'no'. - -Upstream-status: accepted, not yet released. -https://github.com/chocolate-doom/chocolate-doom/pull/630 - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 18 ++++++++++++++++-- - 1 file changed, 16 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee97fe2..7b03485 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -80,7 +80,14 @@ AC_SDL_MAIN_WORKAROUND([ - [Build without libsamplerate @<:@default=check@:>@]), - [], - [ -- AC_CHECK_LIB(samplerate, src_new) -+ [with_libsamplerate=check] -+ ]) -+ AS_IF([test "x$with_libsamplerate" != xno], [ -+ AC_CHECK_LIB(samplerate, src_new, [], [ -+ AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE( -+ [--with-libsamplerate was given, but test for libsamplerate failed]) -+ ]) -+ ]) - ]) - # Check for libpng. - AC_ARG_WITH([libpng], -@@ -88,8 +95,15 @@ AC_SDL_MAIN_WORKAROUND([ - [Build without libpng @<:@default=check@:>@]), - [], - [ -+ [with_libpng=check] -+ ]) -+ AS_IF([test "x$with_libpng" != xno], [ - AC_CHECK_LIB(z, zlibVersion) -- AC_CHECK_LIB(png, png_get_io_ptr) -+ AC_CHECK_LIB(png, png_get_io_ptr, [], [ -+ AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE( -+ [--with-libpng was given, but test for libpng failed]) -+ ]) -+ ]) - ]) - AC_CHECK_LIB(m, log) - --- -2.1.4 - diff --git a/package.bak/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch b/package.bak/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch deleted file mode 100644 index 860f563d76..0000000000 --- a/package.bak/chocolate-doom/0003-opl-limit-use-of-ioperm-inb-outb-to-x86-architecture.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 87c7399305b30045a856d737bbfd8f59b8f52392 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Fri, 6 Nov 2015 12:14:01 -0200 -Subject: [PATCH] opl: limit use of ioperm/inb/outb to x86 architecture - -The use of I/O ports in the Linux driver to directly control OPL chips -is x86 specific and only really makes sense for x86-based PC's with -compatible hardware. - -For some architectures (e.g. ARM), ioperm, inb and outb do exist and are -detected by the configure script (via AC_CHECK_FUNCS(ioperm)), but their -use is inappropriate in these cases and should be avoided. - -In some other scenarios, like when using a GNU toolchain + uClibc for -PowerPC, the build even fails with the following error: - - opl_linux.c:26:20: fatal error: sys/io.h: No such file or directory - -That is so because ioperm() is exported by uClibc and gets detected by -configure, which enables the "Linux" driver via definition of -HAVE_IOPERM, but in practice 'sys/io.h' is missing for ppc (inb/outb is -not implemented, and the call to ioperm() would return EIO anyway). - -So, besides testing for HAVE_IOPERM, also test if either __i386__ or -__x86_64__ are defined before enabling this OPL driver. - -Upstream-status: accepted, not yet released. -https://github.com/chocolate-doom/chocolate-doom/pull/638 - -Signed-off-by: Rodrigo Rebello ---- - opl/opl.c | 4 ++-- - opl/opl_linux.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/opl/opl.c b/opl/opl.c -index 60f027d..0d25689 100644 ---- a/opl/opl.c -+++ b/opl/opl.c -@@ -27,7 +27,7 @@ - - //#define OPL_DEBUG_TRACE - --#ifdef HAVE_IOPERM -+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) - extern opl_driver_t opl_linux_driver; - #endif - #if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64) -@@ -40,7 +40,7 @@ extern opl_driver_t opl_sdl_driver; - - static opl_driver_t *drivers[] = - { --#ifdef HAVE_IOPERM -+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) - &opl_linux_driver, - #endif - #if defined(HAVE_LIBI386) || defined(HAVE_LIBAMD64) -diff --git a/opl/opl_linux.c b/opl/opl_linux.c -index 5df5d46..19e4c3e 100644 ---- a/opl/opl_linux.c -+++ b/opl/opl_linux.c -@@ -17,7 +17,7 @@ - - #include "config.h" - --#ifdef HAVE_IOPERM -+#if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) - - #include - #include -@@ -99,5 +99,5 @@ opl_driver_t opl_linux_driver = - OPL_Timer_AdjustCallbacks, - }; - --#endif /* #ifdef HAVE_IOPERM */ -+#endif /* #if (defined(__i386__) || defined(__x86_64__)) && defined(HAVE_IOPERM) */ - --- -2.1.4 - diff --git a/package.bak/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch b/package.bak/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch deleted file mode 100644 index 2618396b56..0000000000 --- a/package.bak/chocolate-doom/0004-configure-Switch-to-pkg-config-macros.patch +++ /dev/null @@ -1,217 +0,0 @@ -From 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9 Mon Sep 17 00:00:00 2001 -From: Simon Howard -Date: Thu, 25 Feb 2016 22:55:04 -0500 -Subject: [PATCH] configure: Switch to pkg-config macros. - -All dependency libraries install pkg-config .pc files nowadays, which -makes the process of looking them up a lot simpler. Get rid of the SDL -workaround macro as it's not needed. - -[Backported from upstream commit 3163bf87d7b955d08dedd5ebaccb1b2a86ffdcb9. -Fixes static linking issues with SDL_mixer.] - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 117 ++++++++++++++-------------------------- - opl/examples/Makefile.am | 2 +- - src/Makefile.am | 7 ++- - textscreen/Makefile.am | 2 +- - textscreen/examples/Makefile.am | 2 +- - 5 files changed, 49 insertions(+), 81 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7b03485..48f83ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,89 +33,54 @@ then - CFLAGS="-O$OPT_LEVEL -g $WARNINGS $orig_CFLAGS" - fi - --dnl Search for SDL ... -- --AM_PATH_SDL(1.1.3) -- --# Add the SDL compiler flags to the default compiler flag variables. --# It is important to do this now, before checking for headers and --# library functions. The reason being that on Windows, sdl-config --# sets the -mno-cygwin compiler option in order to generate MinGW --# executables. If we don't do this now, we might end up discovering --# header files that are not actually available to us when we come --# to compile. -- --CFLAGS="$CFLAGS $SDL_CFLAGS" --LDFLAGS="$LDFLAGS $SDL_LIBS" -- --# On some platforms, SDL renames main() to SDL_main() using a #define, --# so that its own main, stored in the SDLmain library, can be run first. --# Unfortunately, this causes problems for autoconf, which builds --# test programs to probe the system. All library/header/symbol checks --# must be run in this block, that performs a workaround for the problem. -- --AC_SDL_MAIN_WORKAROUND([ -- -- # Check for SDL_mixer. -- -- AC_CHECK_LIB(SDL_mixer,Mix_LoadMUS,[ -- SDLMIXER_LIBS="$SDLMIXER_LIBS -lSDL_mixer" -- ],[ -- echo "*** Could not find SDL_mixer. Please install it." -- exit -1 -- ]) -- -- # Check for SDL_net. -- -- AC_CHECK_LIB(SDL_net,SDLNet_UDP_Send,[ -- SDLNET_LIBS="$SDLNET_LIBS -lSDL_net" -- ],[ -- echo "*** Could not find SDL_net. Please install it." -- exit -1 -- ]) -- -- # Check for libsamplerate. -- AC_ARG_WITH([libsamplerate], -- AS_HELP_STRING([--without-libsamplerate], -- [Build without libsamplerate @<:@default=check@:>@]), -- [], -- [ -- [with_libsamplerate=check] -- ]) -- AS_IF([test "x$with_libsamplerate" != xno], [ -- AC_CHECK_LIB(samplerate, src_new, [], [ -- AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE( -- [--with-libsamplerate was given, but test for libsamplerate failed]) -- ]) -+PKG_CHECK_MODULES([SDL], [sdl]) -+PKG_CHECK_MODULES([SDLMIXER], [SDL_mixer]) -+PKG_CHECK_MODULES([SDLNET], [SDL_net]) -+ -+# Check for libsamplerate. -+AC_ARG_WITH([libsamplerate], -+AS_HELP_STRING([--without-libsamplerate], -+ [Build without libsamplerate @<:@default=check@:>@]), -+[], -+[ -+ [with_libsamplerate=check] -+]) -+AS_IF([test "x$with_libsamplerate" != xno], [ -+ PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.1.8], [ -+ AC_DEFINE([HAVE_LIBSAMPLERATE], [1], [libsamplerate installed]) -+ ], [ -+ AS_IF([test "x$with_libsamplerate" != xcheck], [AC_MSG_FAILURE( -+ [--with-libsamplerate was given, but test for libsamplerate failed]) - ]) - ]) -- # Check for libpng. -- AC_ARG_WITH([libpng], -- AS_HELP_STRING([--without-libpng], -- [Build without libpng @<:@default=check@:>@]), -- [], -- [ -- [with_libpng=check] -- ]) -- AS_IF([test "x$with_libpng" != xno], [ -- AC_CHECK_LIB(z, zlibVersion) -- AC_CHECK_LIB(png, png_get_io_ptr, [], [ -- AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE( -- [--with-libpng was given, but test for libpng failed]) -- ]) -+]) -+# Check for libpng. -+AC_ARG_WITH([libpng], -+AS_HELP_STRING([--without-libpng], -+ [Build without libpng @<:@default=check@:>@]), -+[], -+[ -+ [with_libpng=check] -+]) -+AS_IF([test "x$with_libpng" != xno], [ -+ PKG_CHECK_MODULES([PNG], [libpng >= 1.6.10], [ -+ AC_DEFINE([HAVE_LIBPNG], [1], [libpng installed]) -+ ], [ -+ AS_IF([test "x$with_libpng" != xcheck], [AC_MSG_FAILURE( -+ [--with-libpng was given, but test for libpng failed]) - ]) - ]) -- AC_CHECK_LIB(m, log) -+]) -+AC_CHECK_LIB(m, log) - -- AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -- AC_CHECK_FUNCS(mmap ioperm) -+AC_CHECK_HEADERS([linux/kd.h dev/isa/spkrio.h dev/speaker/speaker.h]) -+AC_CHECK_FUNCS(mmap ioperm) - -- # OpenBSD I/O i386 library for I/O port access. -- # (64 bit has the same thing with a different name!) -+# OpenBSD I/O i386 library for I/O port access. -+# (64 bit has the same thing with a different name!) - -- AC_CHECK_LIB(i386, i386_iopl) -- AC_CHECK_LIB(amd64, amd64_iopl) --]) -+AC_CHECK_LIB(i386, i386_iopl) -+AC_CHECK_LIB(amd64, amd64_iopl) - - case $host in - *cygwin* | *mingw* ) -diff --git a/opl/examples/Makefile.am b/opl/examples/Makefile.am -index 9afcd51..54c37f8 100644 ---- a/opl/examples/Makefile.am -+++ b/opl/examples/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/opl -+AM_CFLAGS = -I$(top_srcdir)/opl @SDL_CFLAGS@ - - noinst_PROGRAMS=droplay - -diff --git a/src/Makefile.am b/src/Makefile.am -index 78ee3ba..9624e01 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -21,7 +21,8 @@ execgames_SCRIPTS = $(SETUP_BINARIES) - AM_CFLAGS = -I$(top_srcdir)/textscreen \ - -I$(top_srcdir)/opl \ - -I$(top_srcdir)/pcsound \ -- @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ -+ @SDLMIXER_CFLAGS@ @SDLNET_CFLAGS@ \ -+ @SAMPLERATE_CFLAGS@ @PNG_CFLAGS@ - - # Common source files used by absolutely everything: - -@@ -150,7 +151,9 @@ EXTRA_LIBS = \ - @LDFLAGS@ \ - @SDL_LIBS@ \ - @SDLMIXER_LIBS@ \ -- @SDLNET_LIBS@ -+ @SDLNET_LIBS@ \ -+ @SAMPLERATE_LIBS@ \ -+ @PNG_LIBS@ - - if HAVE_WINDRES - @PROGRAM_PREFIX@doom_SOURCES=$(SOURCE_FILES_WITH_DEH) resource.rc -diff --git a/textscreen/Makefile.am b/textscreen/Makefile.am -index 628d4ff..427ed40 100644 ---- a/textscreen/Makefile.am -+++ b/textscreen/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/src -+AM_CFLAGS = -I$(top_srcdir)/src @SDL_CFLAGS@ - - CTAGS_ARGS=-I TXT_UNCAST_ARG+ - -diff --git a/textscreen/examples/Makefile.am b/textscreen/examples/Makefile.am -index 4632d92..b857748 100644 ---- a/textscreen/examples/Makefile.am -+++ b/textscreen/examples/Makefile.am -@@ -1,5 +1,5 @@ - --AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/textscreen -+AM_CFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/textscreen @SDL_CFLAGS@ - - noinst_PROGRAMS=guitest calculator - --- -2.1.4 - diff --git a/package.bak/chocolate-doom/Config.in b/package.bak/chocolate-doom/Config.in deleted file mode 100644 index 5e0d9c11ea..0000000000 --- a/package.bak/chocolate-doom/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_CHOCOLATE_DOOM - bool "chocolate-doom" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_SDL - select BR2_PACKAGE_SDL_MIXER - select BR2_PACKAGE_SDL_NET - help - Chocolate Doom is a set of conservative source ports for Doom, - Heretic, Hexen and Strife, with a philosophy of preserving the - look, feel, and bugs of the vanilla versions of each. - - http://www.chocolate-doom.org diff --git a/package.bak/chocolate-doom/chocolate-doom.hash b/package.bak/chocolate-doom/chocolate-doom.hash deleted file mode 100644 index bdf56982e2..0000000000 --- a/package.bak/chocolate-doom/chocolate-doom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ad11e2871667c6fa0658abf2dcba0cd9b26fbd651ee8df55adfdc18ad8fd674a chocolate-doom-2.2.1.tar.gz diff --git a/package.bak/chocolate-doom/chocolate-doom.mk b/package.bak/chocolate-doom/chocolate-doom.mk deleted file mode 100644 index dad73528e3..0000000000 --- a/package.bak/chocolate-doom/chocolate-doom.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# chocolate-doom -# -################################################################################ - -CHOCOLATE_DOOM_VERSION = 2.2.1 -CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION) -CHOCOLATE_DOOM_LICENSE = GPLv2+ -CHOCOLATE_DOOM_LICENSE_FILES = COPYING -CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl sdl_mixer sdl_net - -# We're patching configure.ac, so we need to autoreconf -CHOCOLATE_DOOM_AUTORECONF = YES - -# Avoid installing desktop entries, icons, etc. -CHOCOLATE_DOOM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec - -CHOCOLATE_DOOM_CONF_OPTS = \ - --disable-sdltest \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -CHOCOLATE_DOOM_DEPENDENCIES += libpng -CHOCOLATE_DOOM_CONF_OPTS += --with-libpng -else -CHOCOLATE_DOOM_CONF_OPTS += --without-libpng -endif - -ifeq ($(BR2_PACKAGE_LIBSAMPLERATE),y) -CHOCOLATE_DOOM_DEPENDENCIES += libsamplerate -CHOCOLATE_DOOM_CONF_OPTS += --with-libsamplerate -else -CHOCOLATE_DOOM_CONF_OPTS += --without-libsamplerate -endif - -$(eval $(autotools-package)) diff --git a/package.bak/chrony/Config.in b/package.bak/chrony/Config.in deleted file mode 100644 index 05d6fc1a25..0000000000 --- a/package.bak/chrony/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_CHRONY - bool "chrony" - depends on BR2_USE_MMU # fork() - help - Chrony is a pair of programs which are used to maintain the - accuracy of the system clock. - - http://chrony.tuxfamily.org/ diff --git a/package.bak/chrony/S49chrony b/package.bak/chrony/S49chrony deleted file mode 100755 index 6215acc4aa..0000000000 --- a/package.bak/chrony/S49chrony +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Start chrony - -[ -f /etc/chrony.conf ] || exit 0 - -case "$1" in - start) - printf "Starting chrony: " - chronyd && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping chrony: " - killall chronyd && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/chrony/chrony.hash b/package.bak/chrony/chrony.hash deleted file mode 100644 index 66ec0603f7..0000000000 --- a/package.bak/chrony/chrony.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-announce/2016/11/msg00000.html -md5 d08dd5a7d79a89891d119adcccb4397d chrony-2.4.1.tar.gz -sha1 b412375ca90dbef653ad00534f8b73b825e396d4 chrony-2.4.1.tar.gz diff --git a/package.bak/chrony/chrony.mk b/package.bak/chrony/chrony.mk deleted file mode 100644 index 0dca2eef55..0000000000 --- a/package.bak/chrony/chrony.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# chrony -# -################################################################################ - -CHRONY_VERSION = 2.4.1 -CHRONY_SITE = http://download.tuxfamily.org/chrony -CHRONY_LICENSE = GPLv2 -CHRONY_LICENSE_FILES = COPYING - -CHRONY_CONF_OPTS = \ - --host-system=Linux \ - --host-machine=$(BR2_ARCH) \ - --prefix=/usr \ - --without-seccomp \ - --without-tomcrypt - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -CHRONY_DEPENDENCIES += libcap -else -CHRONY_CONF_OPTS += --without-libcap -endif - -ifeq ($(BR2_PACKAGE_LIBNSS),y) -CHRONY_DEPENDENCIES += host-pkgconf libnss -else -CHRONY_CONF_OPTS += --without-nss -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -CHRONY_DEPENDENCIES += readline -else -CHRONY_CONF_OPTS += --disable-readline -endif - -# If pps-tools is available, build it before so the package can use it -# (HAVE_SYS_TIMEPPS_H). -ifeq ($(BR2_PACKAGE_PPS_TOOLS),y) -CHRONY_DEPENDENCIES += pps-tools -endif - -define CHRONY_CONFIGURE_CMDS - cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(CHRONY_CONF_OPTS) -endef - -define CHRONY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define CHRONY_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -define CHRONY_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/chrony/S49chrony $(TARGET_DIR)/etc/init.d/S49chrony -endef - -define CHRONY_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/chrony/chrony.service \ - $(TARGET_DIR)/usr/lib/systemd/system/chrony.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/chrony.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/chrony.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/chrony/chrony.service b/package.bak/chrony/chrony.service deleted file mode 100644 index 325b63c492..0000000000 --- a/package.bak/chrony/chrony.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Chrony Network Time Daemon -After=syslog.target network.target -Conflicts=systemd-timesyncd.service - -[Service] -ExecStart=/usr/sbin/chronyd -n -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/cifs-utils/Config.in b/package.bak/cifs-utils/Config.in deleted file mode 100644 index b433850a18..0000000000 --- a/package.bak/cifs-utils/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_CIFS_UTILS - bool "cifs-utils" - # uses fork() - depends on BR2_USE_MMU - help - The in-kernel CIFS filesystem is generally the preferred - method for mounting SMB/CIFS shares on Linux. The in-kernel - CIFS filesystem relies on a set of user-space tools. That - package of tools is called cifs-utils. Although not really - part of Samba proper, these tools were originally part of - the Samba package. For several reasons, shipping these tools - as part of Samba was problematic and it was deemed better to - split them off into their own package. - - http://wiki.samba.org/index.php/LinuxCIFS_utils diff --git a/package.bak/cifs-utils/cifs-utils.hash b/package.bak/cifs-utils/cifs-utils.hash deleted file mode 100644 index 61ffbd9efb..0000000000 --- a/package.bak/cifs-utils/cifs-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d07152a807de6840566bbcc69a97ff6fa17fca4e09ceb4641d74882a83e67125 cifs-utils-6.6.tar.bz2 diff --git a/package.bak/cifs-utils/cifs-utils.mk b/package.bak/cifs-utils/cifs-utils.mk deleted file mode 100644 index fdb17790cf..0000000000 --- a/package.bak/cifs-utils/cifs-utils.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# cifs-utils -# -################################################################################ - -CIFS_UTILS_VERSION = 6.6 -CIFS_UTILS_SOURCE = cifs-utils-$(CIFS_UTILS_VERSION).tar.bz2 -CIFS_UTILS_SITE = http://ftp.samba.org/pub/linux-cifs/cifs-utils -CIFS_UTILS_LICENSE = GPLv3+ -CIFS_UTILS_LICENSE_FILES = COPYING - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -CIFS_UTILS_CONF_OPTS += --disable-pie -endif - -ifeq ($(BR2_PACKAGE_KEYUTILS),y) -CIFS_UTILS_DEPENDENCIES += keyutils -endif - -define CIFS_UTILS_NO_WERROR - $(SED) 's/-Werror//' $(@D)/Makefile.in -endef - -CIFS_UTILS_POST_PATCH_HOOKS += CIFS_UTILS_NO_WERROR - -$(eval $(autotools-package)) diff --git a/package.bak/circus/Config.in b/package.bak/circus/Config.in deleted file mode 100644 index 5276513076..0000000000 --- a/package.bak/circus/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_CIRCUS - bool "circus" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - depends on BR2_INSTALL_LIBSTDCPP # pyzmq -> zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # pyzmq -> zeromq - depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil - select BR2_PACKAGE_PYTHON_IOWAIT # runtime - select BR2_PACKAGE_PYTHON_PSUTIL # runtime - select BR2_PACKAGE_PYTHON_PYZMQ # runtime - select BR2_PACKAGE_PYTHON_TORNADO # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - help - Circus is a program that will let you run and watch multiple - processes and sockets. - - https://circus.readthedocs.org/en/latest/ - -comment "circus needs Python and a uClibc or glibc toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_USES_MUSL || \ - !(BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) diff --git a/package.bak/circus/circus.hash b/package.bak/circus/circus.hash deleted file mode 100644 index 728cad5239..0000000000 --- a/package.bak/circus/circus.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/circus/json, sha256 locally computed -md5 cddd4a8844907d8b6b402ca9c713d176 circus-0.13.0.tar.gz -sha256 6201800a5fb05144b5e6c5ac9eb901b914305e8beaeb01f8edf54ab6ab1a295a circus-0.13.0.tar.gz diff --git a/package.bak/circus/circus.mk b/package.bak/circus/circus.mk deleted file mode 100644 index 35051c4734..0000000000 --- a/package.bak/circus/circus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# circus -# -################################################################################ - -CIRCUS_VERSION = 0.13.0 -CIRCUS_SITE = https://pypi.python.org/packages/source/c/circus -CIRCUS_SETUP_TYPE = setuptools -CIRCUS_LICENSE = Apache-2.0 -CIRCUS_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch b/package.bak/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch deleted file mode 100644 index aee3cfcbff..0000000000 --- a/package.bak/civetweb/0001-Lua-fix-a-typo-changing-LFS_DIR-to-LFS_DIR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0821066f9adf8410891cd07684ecac50a9bc36a4 Mon Sep 17 00:00:00 2001 -From: Fabio Porcedda -Date: Wed, 25 Feb 2015 18:40:24 +0100 -Subject: [PATCH] Lua: fix a typo changing %(LFS_DIR) to $(LFS_DIR) - -Also this fix a error on GNU Make v4.0: - Makefile:203: *** mixed implicit and normal rules. Stop. - -Signed-off-by: Fabio Porcedda ---- - resources/Makefile.in-lua | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua -index 0902f11..f3d95fd 100644 ---- a/resources/Makefile.in-lua -+++ b/resources/Makefile.in-lua -@@ -57,5 +57,5 @@ LFS_CFLAGS = -I$(LFS_DIR) - - OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) - CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM --SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR) -+SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR) - --- -2.3.0 - diff --git a/package.bak/civetweb/Config.in b/package.bak/civetweb/Config.in deleted file mode 100644 index d68a1ffd53..0000000000 --- a/package.bak/civetweb/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_CIVETWEB - bool "civetweb" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Full featured embedded web server with Lua support. - - https://sourceforge.net/projects/civetweb - -if BR2_PACKAGE_CIVETWEB - -config BR2_PACKAGE_CIVETWEB_WITH_LUA - bool "enable Lua support" - # required by the bundled Sqlite3 and Lua code - depends on !BR2_STATIC_LIBS - help - Enable Lua support in Civetweb. Note that this will use a - version of Lua and Sqlite bundled within the Civetweb - sources, and not the packages from Buildroot. - -comment "lua support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -endif - -comment "civetweb needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/civetweb/civetweb.hash b/package.bak/civetweb/civetweb.hash deleted file mode 100644 index 745f4a8ce6..0000000000 --- a/package.bak/civetweb/civetweb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 79a852a26068eb6d2f8de5ee72e021f0d2c8bd176eb81f41909a876b736815d9 civetweb-v1.5.tar.gz diff --git a/package.bak/civetweb/civetweb.mk b/package.bak/civetweb/civetweb.mk deleted file mode 100644 index d29765b87d..0000000000 --- a/package.bak/civetweb/civetweb.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# civetweb -# -################################################################################ - -CIVETWEB_VERSION = v1.5 -CIVETWEB_SITE = $(call github,sunsetbrew,civetweb,$(CIVETWEB_VERSION)) -CIVETWEB_LICENSE = MIT -CIVETWEB_LICENSE_FILES = LICENSE.md - -CIVETWEB_CONF_OPTS = TARGET_OS=LINUX WITH_IPV6=1 -CIVETWEB_COPT = -DHAVE_POSIX_FALLOCATE=0 -CIVETWEB_LIBS = -lpthread -lm -CIVETWEB_SYSCONFDIR = /etc -CIVETWEB_HTMLDIR = /var/www - -ifeq ($(BR2_PACKAGE_CIVETWEB_WITH_LUA),y) -CIVETWEB_CONF_OPTS += WITH_LUA=1 -CIVETWEB_LIBS += -ldl -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -CIVETWEB_COPT += -DNO_SSL_DL -CIVETWEB_LIBS += -lssl -lcrypto -lz -CIVETWEB_DEPENDENCIES += openssl -else -CIVETWEB_COPT += -DNO_SSL -endif - -define CIVETWEB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) build \ - $(CIVETWEB_CONF_OPTS) \ - COPT="$(CIVETWEB_COPT)" LIBS="$(CIVETWEB_LIBS)" -endef - -define CIVETWEB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \ - DOCUMENT_ROOT="$(CIVETWEB_HTMLDIR)" \ - CONFIG_FILE2="$(CIVETWEB_SYSCONFDIR)/civetweb.conf" \ - HTMLDIR="$(TARGET_DIR)$(CIVETWEB_HTMLDIR)" \ - SYSCONFDIR="$(TARGET_DIR)$(CIVETWEB_SYSCONFDIR)" \ - PREFIX="$(TARGET_DIR)/usr" \ - $(CIVETWEB_CONF_OPTS) \ - COPT='$(CIVETWEB_COPT)' -endef - -$(eval $(generic-package)) diff --git a/package.bak/cjson/Config.in b/package.bak/cjson/Config.in deleted file mode 100644 index 04eff4ca88..0000000000 --- a/package.bak/cjson/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_CJSON - bool "cJSON" - help - An ultra-lightweight, portable, single-file, simple-as-can-be ANSI-C - compliant JSON parser, under MIT license. - - https://github.com/DaveGamble/cJSON diff --git a/package.bak/cjson/cjson.hash b/package.bak/cjson/cjson.hash deleted file mode 100644 index 903880f7c5..0000000000 --- a/package.bak/cjson/cjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 1d976ca423d714b7e836cfbc1980b56f49962d0dfe654edb3c2ffa5c713af242 cjson-v1.2.1.tar.gz diff --git a/package.bak/cjson/cjson.mk b/package.bak/cjson/cjson.mk deleted file mode 100644 index 11c34c5d78..0000000000 --- a/package.bak/cjson/cjson.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# cjson -# -################################################################################ - -CJSON_VERSION = v1.2.1 -CJSON_SITE = $(call github,DaveGamble,cjson,$(CJSON_VERSION)) -CJSON_INSTALL_STAGING = YES -CJSON_LICENSE = MIT -CJSON_LICENSE_FILES = LICENSE - -$(eval $(cmake-package)) diff --git a/package.bak/clamav/0001-clamdscan.patch b/package.bak/clamav/0001-clamdscan.patch deleted file mode 100644 index c395ae1600..0000000000 --- a/package.bak/clamav/0001-clamdscan.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fixes build error - -proto.c: In function ‘dconnect’: -proto.c:86:67: error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr_un’ - if (connect(sockd, (struct sockaddr *)&nixsock, sizeof(nixsock)) == 0) - -Patch sent upstream: http://lurker.clamav.net/message/20140928.130829.5494fd68.en.html - -Signed-off-by: Bernd Kuhls - -diff -uNr clamav-0.98.3.org/clamdscan/proto.c clamav-0.98.3/clamdscan/proto.c ---- clamav-0.98.3.org/clamdscan/proto.c 2014-05-06 20:39:56.000000000 +0200 -+++ clamav-0.98.3/clamdscan/proto.c 2014-05-10 10:41:44.000000000 +0200 -@@ -35,6 +35,7 @@ - #include - #include - #include -+#include - #ifdef HAVE_SYS_SELECT_H - #include - #endif diff --git a/package.bak/clamav/0003-backtrace-uClibc.patch b/package.bak/clamav/0003-backtrace-uClibc.patch deleted file mode 100644 index 82ad67307d..0000000000 --- a/package.bak/clamav/0003-backtrace-uClibc.patch +++ /dev/null @@ -1,22 +0,0 @@ -mbox: do not use backtrace if using uClibc without backtrace support - -Since uClibc can be configured without support for backtrace, disable -the backtrace if we are building with a uClibc that was built without -backtrace. - -This is a bit hacky, and would greatly benefit from a test in ./configure -instead, but does nicely as a quick fix for now. - -Signed-off-by: "Yann E. MORIN" -diff -durN clamav-0.98.4.orig/libclamav/mbox.c clamav-0.98.4/libclamav/mbox.c ---- clamav-0.98.4.orig/libclamav/mbox.c 2014-05-21 17:25:05.000000000 +0200 -+++ clamav-0.98.4/libclamav/mbox.c 2014-11-16 17:21:04.885383286 +0100 -@@ -83,7 +83,7 @@ - #include - #endif - --#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 -+#if __GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 && !defined(__UCLIBC__) || defined(__UCLIBC_HAS_BACKTRACE__) - #define HAVE_BACKTRACE - #endif - #endif diff --git a/package.bak/clamav/Config.in b/package.bak/clamav/Config.in deleted file mode 100644 index 7ec402d9de..0000000000 --- a/package.bak/clamav/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_CLAMAV - bool "clamav" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - ClamAV is an open source antivirus engine for detecting trojans, - viruses, malware & other malicious threats. - - http://www.clamav.net - -comment "clamav needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/clamav/clamav.hash b/package.bak/clamav/clamav.hash deleted file mode 100644 index d2a1a1299e..0000000000 --- a/package.bak/clamav/clamav.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 167bd6a13e05ece326b968fdb539b05c2ffcfef6018a274a10aeda85c2c0027a clamav-0.99.2.tar.gz diff --git a/package.bak/clamav/clamav.mk b/package.bak/clamav/clamav.mk deleted file mode 100644 index 36ab8be0e9..0000000000 --- a/package.bak/clamav/clamav.mk +++ /dev/null @@ -1,76 +0,0 @@ -################################################################################ -# -# clamav -# -################################################################################ - -CLAMAV_VERSION = 0.99.2 -CLAMAV_SITE = https://www.clamav.net/downloads/production -CLAMAV_LICENSE = GPLv2 -CLAMAV_LICENSE_FILES = COPYING COPYING.bzip2 COPYING.file COPYING.getopt \ - COPYING.LGPL COPYING.llvm COPYING.lzma COPYING.pcre COPYING.regex \ - COPYING.unrar COPYING.zlib -CLAMAV_DEPENDENCIES = \ - host-pkgconf \ - openssl \ - zlib \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -# mmap cannot be detected when cross-compiling, needed for mempool support -CLAMAV_CONF_ENV = \ - ac_cv_c_mmap_private=yes \ - have_cv_ipv6=yes - -# UCLIBC_HAS_FTS is disabled, therefore disable fanotify (missing fts.h) -CLAMAV_CONF_OPTS = \ - --with-dbdir=/var/lib/clamav \ - --with-openssl=$(STAGING_DIR)/usr \ - --with-zlib=$(STAGING_DIR)/usr \ - --disable-zlib-vcheck \ - --disable-rpath \ - --disable-clamav \ - --disable-fanotify \ - --disable-milter \ - --disable-llvm \ - --disable-clamdtop \ - --enable-mempool - -ifeq ($(BR2_PACKAGE_BZIP2),y) -CLAMAV_DEPENDENCIES += bzip2 -# autodetection gets confused if host has bzip2, so force it -CLAMAV_CONF_ENV += \ - ac_cv_libbz2_libs=-lbz2 \ - ac_cv_libbz2_ltlibs=-lbz2 -else -CLAMAV_CONF_OPTS += --disable-bzip2 -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -CLAMAV_CONF_OPTS += --with-xml=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += libxml2 -else -CLAMAV_CONF_OPTS += --disable-xml -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -CLAMAV_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += libcurl -else -CLAMAV_CONF_OPTS += --without-libcurl -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -CLAMAV_CONF_OPTS += --with-iconv -CLAMAV_DEPENDENCIES += libiconv -else -CLAMAV_CONF_OPTS += --without-iconv -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -CLAMAV_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr -CLAMAV_DEPENDENCIES += pcre -else -CLAMAV_CONF_OPTS += --without-pcre -endif - -$(eval $(autotools-package)) diff --git a/package.bak/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch b/package.bak/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch deleted file mode 100644 index 8fede9da91..0000000000 --- a/package.bak/clapack/0001-cmake-force-libf2c-to-be-built-as-a-static-library.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4fe2f454e454d9e6b1e83b2ea67581990461ed36 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 11 Jan 2014 22:05:25 +0100 -Subject: [PATCH 1/6] cmake: force libf2c to be built as a static library - -As stated in INSTALL/LAPACK_version.c, liblapack requires to be linked -against the static library of libf2c. - -Signed-off-by: Samuel Martin ---- - F2CLIBS/libf2c/CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt -index 43d7b3f..f98d66a 100644 ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -58,5 +58,10 @@ if(WIN32) - endif() - include_directories(${CLAPACK_SOURCE_DIR}/F2CLIBS/libf2c) - include_directories(${CLAPACK_BINARY_DIR}/F2CLIBS/libf2c) --add_library(f2c ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) -+add_library(f2c STATIC ${OFILES} ${CMAKE_CURRENT_BINARY_DIR}/arith.h) - set_property(TARGET f2c PROPERTY PREFIX lib) -+# Set fPIC on the library when build shared libraries is enabled, because -+# libf2c.a will most likely be included by some shared libraries in such cases. -+if(UNIX AND BUILD_SHARED_LIBS) -+ set_target_properties(f2c PROPERTIES COMPILE_FLAGS "-fPIC") -+endif() --- -1.8.5.3 - diff --git a/package.bak/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch b/package.bak/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch deleted file mode 100644 index eac4164f5d..0000000000 --- a/package.bak/clapack/0002-cmake-make-test-build-sensitive-to-BUILD_TESTING.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 834c221936d9c460b44e3a65b6fedfb3193f491b Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 11 Jan 2014 21:33:12 +0100 -Subject: [PATCH 2/6] cmake: make test build sensitive to BUILD_TESTING - -This patch prevent from wasting time building the tests if it's our -wish. - -The test build takes a significant amount of time, and the binaries -are not installed. - -Signed-off-by: Samuel Martin ---- - BLAS/TESTING/CMakeLists.txt | 3 +++ - CMakeLists.txt | 9 ++++++--- - TESTING/CMakeLists.txt | 4 ++++ - 3 files changed, 13 insertions(+), 3 deletions(-) - -diff --git a/BLAS/TESTING/CMakeLists.txt b/BLAS/TESTING/CMakeLists.txt -index ec2c587..e7dc0b7 100644 ---- a/BLAS/TESTING/CMakeLists.txt -+++ b/BLAS/TESTING/CMakeLists.txt -@@ -25,6 +25,9 @@ - # make single FRC=FRC - # - ####################################################################### -+if(NOT BUILD_TESTING) -+ return() -+endif() - - macro(add_blas_test name src) - get_filename_component(baseNAME ${src} NAME_WE) -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 320ccc6..0a362c0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,5 @@ - cmake_minimum_required(VERSION 2.6) - project(CLAPACK C) --enable_testing() - include(CTest) - - if(WIN32 AND NOT CYGWIN) -@@ -11,7 +10,9 @@ else() - set(SECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/second.c) - set(DSECOND_SRC ${CLAPACK_SOURCE_DIR}/INSTALL/dsecnd.c) - endif() --enable_testing() -+if(NOT BUILD_TESTING) -+ enable_testing() -+endif() - option(USE_BLAS_WRAP "pre-pend f2c_ to each function in blas" OFF) - if(NOT USE_BLAS_WRAP) - # _zrotg_ seems to be missing in the wrap header -@@ -21,7 +22,9 @@ include_directories(${CLAPACK_SOURCE_DIR}/INCLUDE) - add_subdirectory(F2CLIBS) - add_subdirectory(BLAS) - add_subdirectory(SRC) --add_subdirectory(TESTING) -+if(NOT BUILD_TESTING) -+ add_subdirectory(TESTING) -+endif() - set(CLAPACK_VERSION 3.2.1) - set(CPACK_PACKAGE_VERSION_MAJOR 3) - set(CPACK_PACKAGE_VERSION_MINOR 2) -diff --git a/TESTING/CMakeLists.txt b/TESTING/CMakeLists.txt -index d59359d..f6b083a 100644 ---- a/TESTING/CMakeLists.txt -+++ b/TESTING/CMakeLists.txt -@@ -1,3 +1,7 @@ -+if(NOT BUILD_TESTING) -+ return() -+endif() -+ - if(MSVC_VERSION) - # string(REPLACE "/STACK:10000000" "/STACK:900000000000000000" - # CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") --- -1.8.5.3 - diff --git a/package.bak/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch b/package.bak/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch deleted file mode 100644 index cd9828ff38..0000000000 --- a/package.bak/clapack/0003-cmake-do-not-try-to-run-arithchk-when-cross-compilin.patch +++ /dev/null @@ -1,70 +0,0 @@ -From a2f0669fac1f8e7183b15cf7d14f0e99a2d8b012 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 11 Jan 2014 21:47:39 +0100 -Subject: [PATCH 3/6] cmake: do not try to run arithchk when cross-compiling to - generate sources - -Instead, use a predefined arith.h if provided, or generate a default one. - -The arithchk binary is still built (but not installed) to allow the user to -run it on its target and use it; so then allowing to build an optimized -blas library. - -Signed-off-by: Samuel Martin ---- - F2CLIBS/libf2c/CMakeLists.txt | 38 ++++++++++++++++++++++++++++---------- - 1 file changed, 28 insertions(+), 10 deletions(-) - -diff --git a/F2CLIBS/libf2c/CMakeLists.txt b/F2CLIBS/libf2c/CMakeLists.txt -index f98d66a..45a0804 100644 ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -38,17 +38,35 @@ set(TIME dtime_.c etime_.c) - - # For INTEGER*8 support (which requires system-dependent adjustments to - # f2c.h), add ${QINT} to the OFILES assignment below... --add_executable(arithchk arithchk.c) --if(UNIX) -- target_link_libraries(arithchk m) -+if(CMAKE_CROSSCOMPILING) -+ if(ARITH_H) -+ message(STATUS "Using the user-defined '${ARITH_H}' as arith.h header.") -+ configure_file("${ARITH_H}" "${CMAKE_CURRENT_BINARY_DIR}/arith.h" COPYONLY) -+ else() -+ message(STATUS "No user-defined arith.h header.") -+ if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/arith.h") -+ message(WARNING "Generating the default non-optimized 'arith.h' header. -+ -+To generate and provide a custom arith.h header: -+run the cross-compiled arithchk binary on your target, -+and use its output to fill your custom arith.h header.") -+ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/arith.h" -+ "/* default, not optimized arith.h */") -+ endif() -+ endif() -+else() -+ add_executable(arithchk arithchk.c) -+ if(UNIX) -+ target_link_libraries(arithchk m) -+ endif() -+ set_target_properties(arithchk PROPERTIES COMPILE_DEFINITIONS -+ "NO_FPINIT;NO_LONG_LONG") -+ ADD_CUSTOM_COMMAND( -+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/arith.h -+ COMMAND arithchk > ${CMAKE_CURRENT_BINARY_DIR}/arith.h -+ DEPENDS arithchk -+ ) - endif() --set_target_properties(arithchk PROPERTIES COMPILE_DEFINITIONS -- "NO_FPINIT;NO_LONG_LONG") --ADD_CUSTOM_COMMAND( -- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/arith.h -- COMMAND arithchk > ${CMAKE_CURRENT_BINARY_DIR}/arith.h -- DEPENDS arithchk -- ) - - - set(OFILES ${MISC} ${POW} ${CX} ${DCX} ${REAL} ${DBL} ${INT} --- -1.8.5.3 - diff --git a/package.bak/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch b/package.bak/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch deleted file mode 100644 index e83b066dac..0000000000 --- a/package.bak/clapack/0004-cmake-blas-add-library-and-header-install-rules.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 675111e8ffc179276a7e4950fe4a4eda4d38a703 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 11 Jan 2014 21:48:32 +0100 -Subject: [PATCH 4/6] cmake: blas: add library and header install rules - -Signed-off-by: Samuel Martin ---- - BLAS/SRC/CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/BLAS/SRC/CMakeLists.txt b/BLAS/SRC/CMakeLists.txt -index d1caff8..a5de5a1 100644 ---- a/BLAS/SRC/CMakeLists.txt -+++ b/BLAS/SRC/CMakeLists.txt -@@ -141,3 +141,5 @@ if(UNIX) - target_link_libraries(blas m) - endif() - target_link_libraries(blas f2c) -+install(TARGETS blas LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+install(FILES "${CLAPACK_SOURCE_DIR}/INCLUDE/blaswrap.h" DESTINATION include) --- -1.8.5.3 - diff --git a/package.bak/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch b/package.bak/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch deleted file mode 100644 index abba460b6c..0000000000 --- a/package.bak/clapack/0005-cmake-lapack-add-library-and-header-install-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 9dfac0d55a31be59a856bad9d3a5071d65176597 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 11 Jan 2014 21:49:22 +0100 -Subject: [PATCH 5/6] cmake: lapack: add library and header install rules - -Signed-off-by: Samuel Martin ---- - SRC/CMakeLists.txt | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/SRC/CMakeLists.txt b/SRC/CMakeLists.txt -index ac4cce3..aa60555 100644 ---- a/SRC/CMakeLists.txt -+++ b/SRC/CMakeLists.txt -@@ -377,4 +377,5 @@ if(BUILD_COMPLEX16) - endif() - add_library(lapack ${ALLOBJ} ${ALLXOBJ}) - target_link_libraries(lapack blas) -- -+install(TARGETS lapack LIBRARY DESTINATION lib ARCHIVE DESTINATION lib) -+install(FILES "${CLAPACK_SOURCE_DIR}/INCLUDE/clapack.h" DESTINATION include) --- -1.8.5.3 - diff --git a/package.bak/clapack/0006-remove-uninit-f2c.patch b/package.bak/clapack/0006-remove-uninit-f2c.patch deleted file mode 100644 index 83c2c5c75f..0000000000 --- a/package.bak/clapack/0006-remove-uninit-f2c.patch +++ /dev/null @@ -1,24 +0,0 @@ -uninit.c includes glibc-specific not provided by musl. -Somewhat portable replacement is , which is available in musl -but requires non-trivial changes to uninit.c. - -f2c uses _uninit_f2c() from uninit.c to implement its -trapuv option, -pre-initializiing floating-point variables to NaN and asking FPU to send -SIGFPE whenever NaN value is encountered. - -clapack source has already been run through f2c without -trapuv, -so uninit.c code is not used anywhere and can be safely excluded. - -Signed-off-by: Alex Suykov - ---- a/F2CLIBS/libf2c/CMakeLists.txt -+++ b/F2CLIBS/libf2c/CMakeLists.txt -@@ -1,7 +1,7 @@ - set(MISC - f77vers.c i77vers.c main.c s_rnge.c abort_.c exit_.c getarg_.c iargc_.c - getenv_.c signal_.c s_stop.c s_paus.c system_.c cabs.c ctype.c -- derf_.c derfc_.c erf_.c erfc_.c sig_die.c uninit.c) -+ derf_.c derfc_.c erf_.c erfc_.c sig_die.c) - set(POW pow_ci.c pow_dd.c pow_di.c pow_hh.c pow_ii.c pow_ri.c pow_zi.c pow_zz.c) - set(CX c_abs.c c_cos.c c_div.c c_exp.c c_log.c c_sin.c c_sqrt.c) - set(DCX z_abs.c z_cos.c z_div.c z_exp.c z_log.c z_sin.c z_sqrt.c) diff --git a/package.bak/clapack/0007-off64-t.patch b/package.bak/clapack/0007-off64-t.patch deleted file mode 100644 index bf66d3c95f..0000000000 --- a/package.bak/clapack/0007-off64-t.patch +++ /dev/null @@ -1,16 +0,0 @@ -musl only provides off64_t, not __off64_t. -glibc and uclibc have both defined. - -Signed-off-by: Alex Suykov - ---- a/F2CLIBS/libf2c/sysdep1.h -+++ b/F2CLIBS/libf2c/sysdep1.h -@@ -10,7 +10,7 @@ - - #ifdef __linux__ - #define USE_LARGEFILE --#define OFF_T __off64_t -+#define OFF_T off64_t - #endif - - #ifdef _AIX43 diff --git a/package.bak/clapack/Config.in b/package.bak/clapack/Config.in deleted file mode 100644 index 7d1f9401ae..0000000000 --- a/package.bak/clapack/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -comment "clapack needs a glibc toolchain" - depends on BR2_powerpc - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_CLAPACK - bool "cblas/clapack" - depends on !(BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) - # _fpu_control is used on PowerPC, but not available with - # uClibc or musl - depends on !BR2_powerpc || BR2_TOOLCHAIN_USES_GLIBC - # disable clapack on blackfin, it triggers "undefined symbol" failure - # because of the "_" symbol prefix: - # http://autobuild.buildroot.net/results/a28df0ba10803e6e54c2f8160bbd8190cba4d690/ - depends on !BR2_bfin - # assembler: Error: value out of range - depends on !BR2_m68k_cf - help - BLAS and LAPACK C implementation (f2c'ed version of). - - http://www.netlib.org/clapack/ - -config BR2_PACKAGE_CLAPACK_ARITH_H - string "Custom BLAS arith.h" - depends on BR2_PACKAGE_CLAPACK - help - To optimize BLAS library for the hardware, an 'arith.h' header should - be provided. - - If empty, the library will not be optimized by the compiler. - - In any case an 'arithchk' program is built (but not installed), to be run - on the target to generate this arith.h header. diff --git a/package.bak/clapack/clapack.hash b/package.bak/clapack/clapack.hash deleted file mode 100644 index 08657fc594..0000000000 --- a/package.bak/clapack/clapack.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0b3f782bc24845d85f36bafbff0f2f1384dc72df730fda4e7924ec1a70baca5a clapack-3.2.1-CMAKE.tgz diff --git a/package.bak/clapack/clapack.mk b/package.bak/clapack/clapack.mk deleted file mode 100644 index c3841f2d24..0000000000 --- a/package.bak/clapack/clapack.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# clapack -# -################################################################################ - -CLAPACK_VERSION = 3.2.1 -CLAPACK_SOURCE = clapack-$(CLAPACK_VERSION)-CMAKE.tgz -# This package provides 3 libraries: -# - libf2c.a (not installed) -# - libblas (statically linked with libf2c.a) -# - liblapack (statically linked with libf2c.a) -CLAPACK_LICENSE = HPND (libf2c), BSD-3c (libblas and liblapack) -CLAPACK_LICENSE_FILES = F2CLIBS/libf2c/Notice COPYING -CLAPACK_SITE = http://www.netlib.org/clapack -CLAPACK_INSTALL_STAGING = YES - -ifneq ($(BR2_PACKAGE_CLAPACK_ARITH_H),) -CLAPACK_CONF_OPTS += -DARITH_H=$(BR2_PACKAGE_CLAPACK_ARITH_H) -endif - -$(eval $(cmake-package)) diff --git a/package.bak/classpath/0001-fix-gmp-include.patch b/package.bak/classpath/0001-fix-gmp-include.patch deleted file mode 100644 index f7a392093f..0000000000 --- a/package.bak/classpath/0001-fix-gmp-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -The GMP include is hardcoded to /usr/include causing obvious problems. - -From classpath CVS: -http://cvs.savannah.gnu.org/viewvc/classpath/configure.ac?root=classpath&r1=1.245&r2=1.246 - -[Gustavo: ditch -L or libtool complains loudly] - -Signed-off-by: Gustavo Zacarias - ---- a/configure.ac 2010/01/30 01:33:50 1.245 -+++ b/configure.ac 2010/05/04 12:29:23 1.246 -@@ -752,10 +752,32 @@ - dnl __gmpz_mul_si for earlier versions (>= 3.1). - dnl IMPORTANT: if you decide to look for __gmpz_combit, don't forget to - dnl change the name of the corresponding ac_ variable on lines 860... -+ AC_ARG_WITH(gmp, [ --with-gmp=PATH specify prefix directory for the installed GMP package. -+ Equivalent to --with-gmp-include=PATH/include -+ plus --with-gmp-lib=PATH/lib]) -+ AC_ARG_WITH(gmp_include, [ --with-gmp-include=PATH specify directory for installed GMP include files]) -+ AC_ARG_WITH(gmp_lib, [ --with-gmp-lib=PATH specify directory for the installed GMP library]) -+ - if test "x${COMPILE_GMP}" = xyes; then -+ AC_MSG_CHECKING([for GMP directories]) -+ if test "x$with_gmp" != x; then -+ gmplibs="-lgmp" -+ gmpinc="-I$with_gmp/include" -+ if test "x$with_gmp_include" != x; then -+ gmpinc="-I$with_gmp_include $gmpinc" -+ fi -+ if test "x$with_gmp_lib" != x; then -+ gmplibs="$gmplibs" -+ fi -+ else -+ with_gmp="/usr" -+ gmplibs="-lgmp" -+ gmpinc="-I/usr/include" -+ fi -+ AC_MSG_RESULT([prefix=$with_gmp, libs=$gmplibs, inc=$gmpinc]) - AC_CHECK_LIB(gmp, __gmpz_mul_si, -- [GMP_CFLAGS=-I/usr/include -- GMP_LIBS=-lgmp ], -+ [GMP_CFLAGS="$gmpinc" -+ GMP_LIBS="$gmplibs" ], - [GMP_CFLAGS= - GMP_LIBS= ]) - AC_SUBST(GMP_CFLAGS) diff --git a/package.bak/classpath/0002-add-config-rpath.patch b/package.bak/classpath/0002-add-config-rpath.patch deleted file mode 100644 index 3a8a7d0952..0000000000 --- a/package.bak/classpath/0002-add-config-rpath.patch +++ /dev/null @@ -1,680 +0,0 @@ -Add config.rpath from upstream CVS to avoid (re)autoconfiguring errors. - -Signed-off-by: Gustavo Zacarias - -diff -Nura classpath-0.98.orig/config.rpath classpath-0.98/config.rpath ---- classpath-0.98.orig/config.rpath 1969-12-31 21:00:00.000000000 -0300 -+++ classpath-0.98/config.rpath 2013-07-10 09:36:51.894281025 -0300 -@@ -0,0 +1,672 @@ -+#! /bin/sh -+# Output a system dependent set of variables, describing how to set the -+# run time search path of shared libraries in an executable. -+# -+# Copyright 1996-2010 Free Software Foundation, Inc. -+# Taken from GNU libtool, 2001 -+# Originally by Gordon Matzigkeit , 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+# -+# The first argument passed to this file is the canonical host specification, -+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -+# or -+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -+# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld -+# should be set by the caller. -+# -+# The set of defined variables is at the end of this script. -+ -+# Known limitations: -+# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer -+# than 256 bytes, otherwise the compiler driver will dump core. The only -+# known workaround is to choose shorter directory names for the build -+# directory and/or the installation directory. -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+shrext=.so -+ -+host="$1" -+host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -+# Code taken from libtool.m4's _LT_CC_BASENAME. -+ -+for cc_temp in $CC""; do -+ case $cc_temp in -+ compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; -+ distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -+ -+# Code taken from libtool.m4's _LT_COMPILER_PIC. -+ -+wl= -+if test "$GCC" = yes; then -+ wl='-Wl,' -+else -+ case "$host_os" in -+ aix*) -+ wl='-Wl,' -+ ;; -+ darwin*) -+ case $cc_basename in -+ xlc*) -+ wl='-Wl,' -+ ;; -+ esac -+ ;; -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ wl='-Wl,' -+ ;; -+ irix5* | irix6* | nonstopux*) -+ wl='-Wl,' -+ ;; -+ newsos6) -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ ecc*) -+ wl='-Wl,' -+ ;; -+ icc* | ifort*) -+ wl='-Wl,' -+ ;; -+ lf95*) -+ wl='-Wl,' -+ ;; -+ pgcc | pgf77 | pgf90) -+ wl='-Wl,' -+ ;; -+ ccc*) -+ wl='-Wl,' -+ ;; -+ como) -+ wl='-lopt=' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ wl='-Wl,' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ osf3* | osf4* | osf5*) -+ wl='-Wl,' -+ ;; -+ rdos*) -+ ;; -+ solaris*) -+ wl='-Wl,' -+ ;; -+ sunos4*) -+ wl='-Qoption ld ' -+ ;; -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ wl='-Wl,' -+ ;; -+ sysv4*MP*) -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ wl='-Wl,' -+ ;; -+ unicos*) -+ wl='-Wl,' -+ ;; -+ uts4*) -+ ;; -+ esac -+fi -+ -+# Code taken from libtool.m4's _LT_LINKER_SHLIBS. -+ -+hardcode_libdir_flag_spec= -+hardcode_libdir_separator= -+hardcode_direct=no -+hardcode_minus_L=no -+ -+case "$host_os" in -+ cygwin* | mingw* | pw32* | cegcc*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+esac -+ -+ld_shlibs=yes -+if test "$with_gnu_ld" = yes; then -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ # Unlike libtool, we use -rpath here, not --rpath, since the documented -+ # option of GNU ld is called -rpath, not --rpath. -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ case "$host_os" in -+ aix[3-9]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ ld_shlibs=no -+ fi -+ ;; -+ amigaos*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # Samuel A. Falvo II reports -+ # that the semantics of dynamic libraries on AmigaOS, at least up -+ # to version 4, is to share data among multiple programs linked -+ # with the same dynamic library. Since this doesn't match the -+ # behavior of shared libraries on other platforms, we cannot use -+ # them. -+ ld_shlibs=no -+ ;; -+ beos*) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec='-L$libdir' -+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ interix[3-9]*) -+ hardcode_direct=no -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ gnu* | linux* | k*bsd*-gnu) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ netbsd*) -+ ;; -+ solaris*) -+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then -+ ld_shlibs=no -+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) -+ ld_shlibs=no -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ ;; -+ sunos4*) -+ hardcode_direct=yes -+ ;; -+ *) -+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then -+ : -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ esac -+ if test "$ld_shlibs" = no; then -+ hardcode_libdir_flag_spec= -+ fi -+else -+ case "$host_os" in -+ aix3*) -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ hardcode_minus_L=yes -+ if test "$GCC" = yes; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ hardcode_direct=unsupported -+ fi -+ ;; -+ aix[4-9]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ else -+ aix_use_runtimelinking=no -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ fi -+ hardcode_direct=yes -+ hardcode_libdir_separator=':' -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[012]|aix4.[012].*) -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && \ -+ strings "$collect2name" | grep resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ hardcode_direct=unsupported -+ hardcode_minus_L=yes -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_libdir_separator= -+ fi -+ ;; -+ esac -+ fi -+ # Begin _LT_AC_SYS_LIBPATH_AIX. -+ echo 'int main () { return 0; }' > conftest.c -+ ${CC} ${LDFLAGS} conftest.c -o conftest -+ aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+ if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -+}'` -+ fi -+ if test -z "$aix_libpath"; then -+ aix_libpath="/usr/lib:/lib" -+ fi -+ rm -f conftest.c conftest -+ # End _LT_AC_SYS_LIBPATH_AIX. -+ if test "$aix_use_runtimelinking" = yes; then -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ else -+ if test "$host_cpu" = ia64; then -+ hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' -+ else -+ hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" -+ fi -+ fi -+ ;; -+ amigaos*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ # see comment about different semantics on the GNU ld section -+ ld_shlibs=no -+ ;; -+ bsdi[45]*) -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ hardcode_libdir_flag_spec=' ' -+ libext=lib -+ ;; -+ darwin* | rhapsody*) -+ hardcode_direct=no -+ if test "$GCC" = yes ; then -+ : -+ else -+ case $cc_basename in -+ xlc*) -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+ fi -+ ;; -+ dgux*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ ;; -+ freebsd1*) -+ ld_shlibs=no -+ ;; -+ freebsd2.2*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ freebsd2*) -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ ;; -+ freebsd* | dragonfly*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ hpux9*) -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ hpux10*) -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ fi -+ ;; -+ hpux11*) -+ if test "$with_gnu_ld" = no; then -+ hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' -+ hardcode_libdir_separator=: -+ case $host_cpu in -+ hppa*64*|ia64*) -+ hardcode_direct=no -+ ;; -+ *) -+ hardcode_direct=yes -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ hardcode_minus_L=yes -+ ;; -+ esac -+ fi -+ ;; -+ irix5* | irix6* | nonstopux*) -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ netbsd*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ hardcode_direct=yes -+ ;; -+ newsos6) -+ hardcode_direct=yes -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ hardcode_direct=yes -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ else -+ case "$host_os" in -+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ *) -+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ ld_shlibs=no -+ fi -+ ;; -+ os2*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_minus_L=yes -+ ;; -+ osf3*) -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_separator=: -+ ;; -+ osf4* | osf5*) -+ if test "$GCC" = yes; then -+ hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ else -+ # Both cc and cxx compiler support -rpath directly -+ hardcode_libdir_flag_spec='-rpath $libdir' -+ fi -+ hardcode_libdir_separator=: -+ ;; -+ solaris*) -+ hardcode_libdir_flag_spec='-R$libdir' -+ ;; -+ sunos4*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ hardcode_direct=yes -+ hardcode_minus_L=yes -+ ;; -+ sysv4) -+ case $host_vendor in -+ sni) -+ hardcode_direct=yes # is this really true??? -+ ;; -+ siemens) -+ hardcode_direct=no -+ ;; -+ motorola) -+ hardcode_direct=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ ;; -+ sysv4.3*) -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ ld_shlibs=yes -+ fi -+ ;; -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) -+ ;; -+ sysv5* | sco3.2v5* | sco5v6*) -+ hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' -+ hardcode_libdir_separator=':' -+ ;; -+ uts4*) -+ hardcode_libdir_flag_spec='-L$libdir' -+ ;; -+ *) -+ ld_shlibs=no -+ ;; -+ esac -+fi -+ -+# Check dynamic linker characteristics -+# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. -+# Unlike libtool.m4, here we don't care about _all_ names of the library, but -+# only about the one the linker finds when passed -lNAME. This is the last -+# element of library_names_spec in libtool.m4, or possibly two of them if the -+# linker has special search rules. -+library_names_spec= # the last element of library_names_spec in libtool.m4 -+libname_spec='lib$name' -+case "$host_os" in -+ aix3*) -+ library_names_spec='$libname.a' -+ ;; -+ aix[4-9]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ amigaos*) -+ library_names_spec='$libname.a' -+ ;; -+ beos*) -+ library_names_spec='$libname$shrext' -+ ;; -+ bsdi[45]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ cygwin* | mingw* | pw32* | cegcc*) -+ shrext=.dll -+ library_names_spec='$libname.dll.a $libname.lib' -+ ;; -+ darwin* | rhapsody*) -+ shrext=.dylib -+ library_names_spec='$libname$shrext' -+ ;; -+ dgux*) -+ library_names_spec='$libname$shrext' -+ ;; -+ freebsd1*) -+ ;; -+ freebsd* | dragonfly*) -+ case "$host_os" in -+ freebsd[123]*) -+ library_names_spec='$libname$shrext$versuffix' ;; -+ *) -+ library_names_spec='$libname$shrext' ;; -+ esac -+ ;; -+ gnu*) -+ library_names_spec='$libname$shrext' -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $host_cpu in -+ ia64*) -+ shrext=.so -+ ;; -+ hppa*64*) -+ shrext=.sl -+ ;; -+ *) -+ shrext=.sl -+ ;; -+ esac -+ library_names_spec='$libname$shrext' -+ ;; -+ interix[3-9]*) -+ library_names_spec='$libname$shrext' -+ ;; -+ irix5* | irix6* | nonstopux*) -+ library_names_spec='$libname$shrext' -+ case "$host_os" in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; -+ *) libsuff= shlibsuff= ;; -+ esac -+ ;; -+ esac -+ ;; -+ linux*oldld* | linux*aout* | linux*coff*) -+ ;; -+ linux* | k*bsd*-gnu) -+ library_names_spec='$libname$shrext' -+ ;; -+ knetbsd*-gnu) -+ library_names_spec='$libname$shrext' -+ ;; -+ netbsd*) -+ library_names_spec='$libname$shrext' -+ ;; -+ newsos6) -+ library_names_spec='$libname$shrext' -+ ;; -+ nto-qnx*) -+ library_names_spec='$libname$shrext' -+ ;; -+ openbsd*) -+ library_names_spec='$libname$shrext$versuffix' -+ ;; -+ os2*) -+ libname_spec='$name' -+ shrext=.dll -+ library_names_spec='$libname.a' -+ ;; -+ osf3* | osf4* | osf5*) -+ library_names_spec='$libname$shrext' -+ ;; -+ rdos*) -+ ;; -+ solaris*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sunos4*) -+ library_names_spec='$libname$shrext$versuffix' -+ ;; -+ sysv4 | sysv4.3*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sysv4*MP*) -+ library_names_spec='$libname$shrext' -+ ;; -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ library_names_spec='$libname$shrext' -+ ;; -+ uts4*) -+ library_names_spec='$libname$shrext' -+ ;; -+esac -+ -+sed_quote_subst='s/\(["`$\\]\)/\\\1/g' -+escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` -+shlibext=`echo "$shrext" | sed -e 's,^\.,,'` -+escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` -+ -+LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' < - -Index: host-cloop-2.634-1/Makefile -=================================================================== ---- host-cloop-2.634-1.orig/Makefile 2010-12-16 09:17:52.826555645 +0100 -+++ host-cloop-2.634-1/Makefile 2010-12-16 09:18:57.208713338 +0100 -@@ -15,7 +15,7 @@ - endif - - ifdef APPSONLY --CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer -+CLOOP_CFLAGS:=-Wall -Wstrict-prototypes -Wno-trigraphs -O2 -s -I. -fno-strict-aliasing -fno-common -fomit-frame-pointer - endif - - KERNOBJ:=compressed_loop.o -@@ -53,10 +53,10 @@ - ( cd advancecomp-1.15 ; ./configure && $(MAKE) advfs ) - - extract_compressed_fs: extract_compressed_fs.c -- $(CC) -Wall -O2 -s -o $@ $< -lz -+ $(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -Wall -O2 -s -o $@ $< -lz - - cloop_suspend: cloop_suspend.o -- $(CC) -o $@ $< -+ $(CC) $(CFLAGS) $(CLOOP_CFLAGS) $(LDFLAGS) -o $@ $< - - clean: - rm -rf create_compressed_fs extract_compressed_fs zoom *.o *.ko Module.symvers .cloop* .compressed_loop.* .tmp* diff --git a/package.bak/cloop/cloop.hash b/package.bak/cloop/cloop.hash deleted file mode 100644 index 9acbceb05d..0000000000 --- a/package.bak/cloop/cloop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://debian-knoppix.alioth.debian.org/packages/sources/cloop/cloop_2.634-1.dsc -sha256 d6d03e2368e19f9c6c3a313e9c34cf0620d129ce26132a8805580d953769dbbd cloop_2.634-1.tar.gz diff --git a/package.bak/cloop/cloop.mk b/package.bak/cloop/cloop.mk deleted file mode 100644 index caed3f49a3..0000000000 --- a/package.bak/cloop/cloop.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# cloop -# -################################################################################ - -CLOOP_VERSION = 2.634-1 -CLOOP_SOURCE = cloop_$(CLOOP_VERSION).tar.gz -CLOOP_SITE = http://debian-knoppix.alioth.debian.org/packages/sources/cloop -CLOOP_LICENSE = GPLv2 (module), GPLv2+ (advancecomp) -CLOOP_LICENSE_FILES = README advancecomp-1.15/COPYING - -HOST_CLOOP_DEPENDENCIES = host-zlib - -define HOST_CLOOP_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE1) -C $(@D) APPSONLY=yes -endef - -define HOST_CLOOP_INSTALL_CMDS - $(INSTALL) -m 0755 -d $(HOST_DIR)/usr/bin - $(INSTALL) -m 755 $(@D)/create_compressed_fs $(HOST_DIR)/usr/bin - $(INSTALL) -m 755 $(@D)/extract_compressed_fs $(HOST_DIR)/usr/bin -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/cmake/0001-rename_cmake_rootfile.patch b/package.bak/cmake/0001-rename_cmake_rootfile.patch deleted file mode 100644 index 8c168c15a8..0000000000 --- a/package.bak/cmake/0001-rename_cmake_rootfile.patch +++ /dev/null @@ -1,29 +0,0 @@ -ctest fails on the target, because it cannot find CMake.cmake inside -CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake -files are removed at build time via the target-finalize rule. - -This buildroot-specific patch makes sure ctest looks also for -"Modules/CMake.cmake.ctest" before complaining - -[Vincent: tweak patch for 3.6.3] - -Signed-off-by: Davide Viti -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Source/cmake.cxx b/Source/cmake.cxx ---- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100 -+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100 -@@ -771,7 +771,12 @@ int cmake::AddCMakePaths() - "Path to cpack program executable.", cmState::INTERNAL); - #endif - if (!cmSystemTools::FileExists( -- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) { -+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) && -+ !cmSystemTools::FileExists( -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str() -+ ) -+ ) -+ { - // couldn't find modules - cmSystemTools::Error( - "Could not find CMAKE_ROOT !!!\n" diff --git a/package.bak/cmake/Config.in b/package.bak/cmake/Config.in deleted file mode 100644 index 6f04a4ad39..0000000000 --- a/package.bak/cmake/Config.in +++ /dev/null @@ -1,40 +0,0 @@ -config BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - bool - default y - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_m68k || BR2_mips || BR2_mips64 || \ - BR2_mipsel || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sparc || \ - BR2_i386 || BR2_x86_64 || BR2_xtensa - -config BR2_PACKAGE_CMAKE - bool - -config BR2_PACKAGE_CMAKE_CTEST - bool "ctest" - select BR2_PACKAGE_CMAKE - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBARCHIVE - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_XZ - depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp - depends on BR2_USE_WCHAR # libarchive - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - CTest is a testing tool distributed as a part of CMake. It - can be used to automate updating (using CVS for example), - configuring, building, testing, performing memory checking, - performing coverage, and submitting results to a CDash or - Dart dashboard system. - - http://www.cmake.org/ - -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" - depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/cmake/cmake.hash b/package.bak/cmake/cmake.hash deleted file mode 100644 index f846dc9541..0000000000 --- a/package.bak/cmake/cmake.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt -sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz diff --git a/package.bak/cmake/cmake.mk b/package.bak/cmake/cmake.mk deleted file mode 100644 index bc555092c2..0000000000 --- a/package.bak/cmake/cmake.mk +++ /dev/null @@ -1,83 +0,0 @@ -################################################################################ -# -# cmake -# -################################################################################ - -CMAKE_VERSION_MAJOR = 3.6 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 -CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) -CMAKE_LICENSE = BSD-3c -CMAKE_LICENSE_FILES = Copyright.txt - -# CMake is a particular package: -# * CMake can be built using the generic infrastructure or the cmake one. -# Since Buildroot has no requirement regarding the host system cmake -# program presence, it uses the generic infrastructure to build the -# host-cmake package, then the (target-)cmake package can be built -# using the cmake infrastructure; -# * CMake bundles its dependencies within its sources. This is the -# reason why the host-cmake package has no dependencies:, whereas -# the (target-)cmake package has a lot of dependencies, using only -# the system-wide libraries instead of rebuilding and statically -# linking with the ones bundled into the CMake sources. - -CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz - -CMAKE_CONF_OPTS = \ - -DKWSYS_LFS_WORKS=TRUE \ - -DKWSYS_CHAR_IS_SIGNED=TRUE \ - -DCMAKE_USE_SYSTEM_LIBRARIES=1 \ - -DCTEST_USE_XMLRPC=OFF \ - -DBUILD_CursesDialog=OFF - -# Get rid of -I* options from $(HOST_CPPFLAGS) to prevent that a -# header available in $(HOST_DIR)/usr/include is used instead of a -# CMake internal header, e.g. lzma* headers of the xz package -HOST_CMAKE_CFLAGS = $(shell echo $(HOST_CFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") -HOST_CMAKE_CXXFLAGS = $(shell echo $(HOST_CXXFLAGS) | sed -r "s%$(HOST_CPPFLAGS)%%") - -define HOST_CMAKE_CONFIGURE_CMDS - (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CMAKE_CFLAGS)" \ - ./bootstrap --prefix=$(HOST_DIR)/usr \ - --parallel=$(PARALLEL_JOBS) -- \ - -DCMAKE_C_FLAGS="$(HOST_CMAKE_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(HOST_CMAKE_CXXFLAGS)" \ - -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ - -DBUILD_CursesDialog=OFF \ - ) -endef - -define HOST_CMAKE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_CMAKE_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install/fast -endef - -define CMAKE_REMOVE_EXTRA_DATA - rm $(TARGET_DIR)/usr/bin/{cmake,cpack} - rm -fr $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/{completions,editors} - rm -fr $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/{Help,include} -endef - -define CMAKE_INSTALL_CTEST_CFG_FILE - $(INSTALL) -m 0644 -D $(@D)/Modules/CMake.cmake \ - $(TARGET_DIR)/usr/share/cmake-$(CMAKE_VERSION_MAJOR)/Modules/CMake.cmake.ctest -endef - -CMAKE_POST_INSTALL_TARGET_HOOKS += CMAKE_REMOVE_EXTRA_DATA -CMAKE_POST_INSTALL_TARGET_HOOKS += CMAKE_INSTALL_CTEST_CFG_FILE - -define CMAKE_INSTALL_TARGET_CMDS - (cd $(@D); \ - $(HOST_MAKE_ENV) DESTDIR=$(TARGET_DIR) \ - cmake -P cmake_install.cmake \ - ) -endef - -$(eval $(cmake-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/collectd/Config.in b/package.bak/collectd/Config.in deleted file mode 100644 index 47bfe95d98..0000000000 --- a/package.bak/collectd/Config.in +++ /dev/null @@ -1,608 +0,0 @@ -menuconfig BR2_PACKAGE_COLLECTD - bool "collectd" - # Uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - collectd is a daemon which collects system performance - statistics periodically and provides mechanisms to store - the values in a variety of ways, for example in RRD files. - - http://collectd.org/ - -if BR2_PACKAGE_COLLECTD - -menu "match plugins" - -config BR2_PACKAGE_COLLECTD_EMPTY_COUNTER - bool "empty counter" - help - Match counter values which are currently zero. - -config BR2_PACKAGE_COLLECTD_HASHED - bool "hashed" - help - Match values using a hash function of the hostname. - -config BR2_PACKAGE_COLLECTD_REGEX - bool "regex" - help - Match values by their identifier based on regular expressions. - -config BR2_PACKAGE_COLLECTD_TIMEDIFF - bool "timediff" - help - Match values with an invalid timestamp. - -config BR2_PACKAGE_COLLECTD_VALUE - bool "value" - help - Select values by their data sources' values. - -endmenu - -menu "misc plugins" - -config BR2_PACKAGE_COLLECTD_AGGREGATION - bool "aggregation" - help - The Aggregate plugin allows to aggregate multiple values into - a single value using one or several consolidation functions, - e.g. summation and average. - -config BR2_PACKAGE_COLLECTD_LOGFILE - bool "logfile" - default y - help - Writes log messages to a file or STDOUT/STDERR. - -config BR2_PACKAGE_COLLECTD_LOGSTASH - bool "logstash" - select BR2_PACKAGE_YAJL - help - Writes log messages formatted as logstash JSON events. - -config BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL - bool "notify_email" - depends on !BR2_STATIC_LIBS # libesmtp - select BR2_PACKAGE_LIBESMTP - select BR2_PACKAGE_OPENSSL - help - Send an E-mail with the notification message to the - configured recipients. - -comment "notify_email needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS - bool "notify_nagios" - help - Sends notifications to Nagios as a passive check result. - -config BR2_PACKAGE_COLLECTD_SYSLOG - bool "syslog" - default y - help - Logs to the standard UNIX logging mechanism. - -config BR2_PACKAGE_COLLECTD_THRESHOLD - bool "threshold" - help - Checks values against configured thresholds and creates notifications - if values are out of bounds. - -endmenu - -menu "read plugins" - -comment "Select at least one for collectd to be useful" - -config BR2_PACKAGE_COLLECTD_APACHE - bool "apache" - select BR2_PACKAGE_LIBCURL - help - Collects Apache's mod_status information. - -config BR2_PACKAGE_COLLECTD_APCUPS - bool "apcups" - help - Collects UPS statistics from apcupsd. - -config BR2_PACKAGE_COLLECTD_BATTERY - bool "battery" - help - Collects the battery's charge, the drawn current and voltage. - -config BR2_PACKAGE_COLLECTD_BIND - bool "bind" - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBXML2 - help - Collects BIND DNS statistics. - -config BR2_PACKAGE_COLLECTD_CEPH - bool "ceph" - select BR2_PACKAGE_YAJL - help - Statistics from the Ceph distributed storage system. - -config BR2_PACKAGE_COLLECTD_CHRONY - bool "chrony" - help - Collects NTP data from the chrony NTP server. - -config BR2_PACKAGE_COLLECTD_CGROUPS - bool "cgroups" - help - Collects CGroups CPU usage accounting. - -config BR2_PACKAGE_COLLECTD_CONNTRACK - bool "conntrack" - help - Collects the number of entries in Linux's connection tracking table. - -config BR2_PACKAGE_COLLECTD_CONTEXTSWITCH - bool "contextswitch" - help - Collects the number of context switches done by the operating system. - -config BR2_PACKAGE_COLLECTD_CPU - bool "cpu" - help - Collects the amount of time spent by the CPU in various states. - -config BR2_PACKAGE_COLLECTD_CPUFREQ - bool "cpufreq" - help - Collects the current CPU's frequency. - -config BR2_PACKAGE_COLLECTD_CPUSLEEP - bool "cpusleep" - help - Measures time spent by CPU in deep sleep mode. - -config BR2_PACKAGE_COLLECTD_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - help - Uses libcurl to read files and then parses them according - to the configuration. - -config BR2_PACKAGE_COLLECTD_CURL_JSON - bool "curl-json" - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_YAJL - help - Queries JSON data using the cURL library and parses it - according to the user's configuration using YAJL. - -config BR2_PACKAGE_COLLECTD_CURL_XML - bool "curl-xml" - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBXML2 - help - Reads files using libcurl and parses it as XML. - -config BR2_PACKAGE_COLLECTD_DF - bool "df" - help - Collects file system usage information. - -config BR2_PACKAGE_COLLECTD_DISK - bool "disk" - help - Collects performance statistics of hard-disks and partitions. - -config BR2_PACKAGE_COLLECTD_DNS - bool "dns" - select BR2_PACKAGE_LIBPCAP - help - Collects statistics of DNS traffic using libpcap. - -config BR2_PACKAGE_COLLECTD_DRBD - bool "drbd" - help - Collect individual drbd resource statistics. - -config BR2_PACKAGE_COLLECTD_ENTROPY - bool "entropy" - help - Collects the available entropy on a system. - -config BR2_PACKAGE_COLLECTD_ETHSTAT - bool "ethstat" - help - Collects network interface card statistics. - -config BR2_PACKAGE_COLLECTD_EXEC - bool "exec" - help - Executes scripts and reads values back that are printed - to STDOUT by that program. - -config BR2_PACKAGE_COLLECTD_FHCOUNT - bool "fhcount" - help - File handles statistics. - -config BR2_PACKAGE_COLLECTD_FILECOUNT - bool "filecount" - help - Counts the number of files in a directory and all its subdirectories. - -config BR2_PACKAGE_COLLECTD_FSCACHE - bool "fscache" - help - Collects information about the file-system based caching - infrastructure for network file-systems and other slow media. - -config BR2_PACKAGE_COLLECTD_GPS - bool "gps" - select BR2_PACKAGE_GPSD - help - Reports the number of sattelites seen by and precision - of a GPS receiver. - -config BR2_PACKAGE_COLLECTD_HUGEPAGES - bool "hugepages" - help - Reports the number of used and free hugepages on Linux. - -config BR2_PACKAGE_COLLECTD_INTERFACE - bool "interface" - help - Collects information about the traffic of network interfaces. - -config BR2_PACKAGE_COLLECTD_IPC - bool "ipc" - help - IPC counters: semaphores used, number of allocated segments - in shared memory and more. - -config BR2_PACKAGE_COLLECTD_IPTABLES - bool "iptables" - select BR2_PACKAGE_IPTABLES - help - Gather statistics from iptables packet filter. - -config BR2_PACKAGE_COLLECTD_IPVS - bool "ipvs" - help - Extracts statistics from IP Virtual Server (IPVS), the - transport-layer load-balancer of the LVS project. - It stores traffic and connections history for each of the - Real Servers (RS) behind a local Virtual Server (VS). - Collectd must be run on Directors (in LVS jargon). - -config BR2_PACKAGE_COLLECTD_IRQ - bool "irq" - help - Collects the number of interrupts. - -config BR2_PACKAGE_COLLECTD_LOAD - bool "load" - help - Collects the system load. - -config BR2_PACKAGE_COLLECTD_MD - bool "md" - help - Collects software-RAID device information. - -config BR2_PACKAGE_COLLECTD_MEMCACHEC - bool "memcachec" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBMEMCACHED - help - Query and parse data from a memcache daemon. - -comment "memcachec needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_COLLECTD_MEMCACHED - bool "memcached" - help - Collects statistics from a memcached daemon. - -config BR2_PACKAGE_COLLECTD_MEMORY - bool "memory" - help - Collects physical memory utilization. - -config BR2_PACKAGE_COLLECTD_MODBUS - bool "modbus" - select BR2_PACKAGE_LIBMODBUS - help - Reads register values from a modbus "slave" via Modbus/TCP. - -config BR2_PACKAGE_COLLECTD_MYSQL - bool "mysql" - depends on BR2_INSTALL_LIBSTDCPP # mysql - depends on BR2_USE_MMU # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - select BR2_PACKAGE_MYSQL - help - Connects to a MySQL database and issues a "show status" command. - -config BR2_PACKAGE_COLLECTD_NETLINK - bool "netlink" - select BR2_PACKAGE_LIBMNL - help - Get statistics for interfaces, qdiscs, classes, and filters. - -config BR2_PACKAGE_COLLECTD_NFS - bool "nfs" - help - Collects information about the usage of the Network File System. - -config BR2_PACKAGE_COLLECTD_NGINX - bool "nginx" - select BR2_PACKAGE_LIBCURL - help - Collects the number of requests handled by the nginx daemon - since startup and the number of current connections by state. - -config BR2_PACKAGE_COLLECTD_NTPD - bool "ntpd" - help - Queries an NTP server and extracts parameters. - -config BR2_PACKAGE_COLLECTD_OLSRD - bool "olsrd" - help - Reads information about meshed networks from olsrd. - -config BR2_PACKAGE_COLLECTD_OPENLDAP - bool "openldap" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_OPENLDAP - help - Read monitoring information from OpenLDAP's cn=Monitor subtree. - -comment "openldap support needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_COLLECTD_OPENVPN - bool "openvpn" - help - Reads the status file of OpenVPN to collect statistics. - -config BR2_PACKAGE_COLLECTD_PING - bool "ping" - select BR2_PACKAGE_LIBOPING - help - Mesures network latency using ICMP "echo requests". - -config BR2_PACKAGE_COLLECTD_POSTGRESQL - bool "postgresql" - select BR2_PACKAGE_POSTGRESQL - help - Connects to and executes SQL statements on a PostgreSQL - database. It then reads back the results and, depending on the - configuration, the returned values are then converted into - collectd “value lists”. - -config BR2_PACKAGE_COLLECTD_PROCESSES - bool "processes" - help - Collects the number of processes gruped by state. - -config BR2_PACKAGE_COLLECTD_PROTOCOLS - bool "protocols" - help - Collects information about the network protocols. - -config BR2_PACKAGE_COLLECTD_SENSORS - bool "sensors" - select BR2_PACKAGE_LM_SENSORS - help - Collects data from lm-sensors. - -config BR2_PACKAGE_COLLECTD_SERIAL - bool "serial" - help - Collects the traffic on serial interfaces. - -config BR2_PACKAGE_COLLECTD_SMART - bool "SMART" - depends on BR2_PACKAGE_HAS_UDEV # libatasmart - select BR2_PACKAGE_LIBATASMART - help - Collect SMART statistics, notably load cycle count, temperature - and bad sectors. - -comment "SMART requires udev to be enabled" - depends on !BR2_PACKAGE_HAS_UDEV - -config BR2_PACKAGE_COLLECTD_STATSD - bool "StatsD" - help - StatsD network protocol to allow clients to report "events". - -config BR2_PACKAGE_COLLECTD_SNMP - bool "snmp" - select BR2_PACKAGE_NETSNMP - help - Reads values from SNMP devices. - -config BR2_PACKAGE_COLLECTD_SWAP - bool "swap" - help - Collects the amount of memory currently written to disk. - -config BR2_PACKAGE_COLLECTD_TABLE - bool "table" - help - Parses table-like structured plain-text files. - -config BR2_PACKAGE_COLLECTD_TAIL - bool "tail" - help - Tails log files and each line is given to one or more matches - which test if the line is relevant for any statistics. - -config BR2_PACKAGE_COLLECTD_TAIL_CSV - bool "tail csv" - help - Follows (tails) files in CSV format, parses each line and submits - extracted values. - -config BR2_PACKAGE_COLLECTD_TCPCONNS - bool "tcpconns" - help - Counts the number of TCP connections to/from a specified port. - -config BR2_PACKAGE_COLLECTD_THERMAL - bool "thermal" - help - Reads ACPI thermal zone information. - -config BR2_PACKAGE_COLLECTD_UPTIME - bool "uptime" - help - Keeps track of the system uptime. - -config BR2_PACKAGE_COLLECTD_USERS - bool "users" - help - Counts the number of users currently logged in. - -config BR2_PACKAGE_COLLECTD_VMEM - bool "vmem" - help - Collects information about the virtual memory subsystem. - -config BR2_PACKAGE_COLLECTD_WIRELESS - bool "wireless" - help - Collects signal quality, power and noise ratio for WLAN cards. - -config BR2_PACKAGE_COLLECTD_ZOOKEEPER - bool "zookeeper" - help - Read data from Zookeeper's MNTR command. - -endmenu - -menu "target plugins" - -config BR2_PACKAGE_COLLECTD_NOTIFICATION - bool "notification" - help - Create and dispatch a notification. - -config BR2_PACKAGE_COLLECTD_REPLACE - bool "replace" - help - Replace parts of an identifier using regular expressions. - -config BR2_PACKAGE_COLLECTD_SCALE - bool "scale" - help - Scale (multiply) values by an arbitrary number. - -config BR2_PACKAGE_COLLECTD_SET - bool "set" - help - Set (overwrite) entire parts of an identifier. - -endmenu - -menu "write plugins" - -comment "Select at least one for collectd to be useful" - -config BR2_PACKAGE_COLLECTD_CSV - bool "csv" - help - Writes values to a plain-text file in Comma Separated Values format. - -config BR2_PACKAGE_COLLECTD_GRAPHITE - bool "graphite" - help - Writes data collected to Carbon (Graphite's) storage API. - http://graphite.wikidot.com/start - -config BR2_PACKAGE_COLLECTD_MQTT - bool "mqtt" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto - select BR2_PACKAGE_MOSQUITTO - help - Sends metrics to and/or receives metrics from an MQTT broker. - -config BR2_PACKAGE_COLLECTD_NETWORK - bool "network" - help - Send/receive values from other instances of collectd. - -config BR2_PACKAGE_COLLECTD_RRDTOOL - bool "rrdtool" - depends on BR2_USE_WCHAR # rrdtool - select BR2_PACKAGE_RRDTOOL - help - Writes values to RRD-files. - -comment "rrdtool support needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_COLLECTD_RIEMANN - bool "riemann" - depends on BR2_INSTALL_LIBSTDCPP # protobuf - # protobuf-c -> host-protobuf - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_PACKAGE_RIEMANN_C_CLIENT - select BR2_PACKAGE_LIBTOOL - help - Sends data to Riemann, a stream processing and monitoring system. - -config BR2_PACKAGE_COLLECTD_UNIXSOCK - bool "unixsock" - help - Opens a UNIX domain socket and accepts connections. - One can send commands to the daemon and receive information. - -config BR2_PACKAGE_COLLECTD_WRITEHTTP - bool "write_http" - select BR2_PACKAGE_LIBCURL - help - Sends values collected to a web-server using HTTP POST and PUTVAL. - -config BR2_PACKAGE_COLLECTD_WRITELOG - bool "write_log" - help - Writes data to the log. - -config BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS - bool "write_prometheus" - depends on BR2_INSTALL_LIBSTDCPP # protobuf-c - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - select BR2_PACKAGE_LIBMICROHTTPD - select BR2_PACKAGE_PROTOBUF_C - help - Publishes values using an embedded HTTP server, in a format - compatible with Prometheus' collectd_exporter. - -comment "write_prometheus needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - -config BR2_PACKAGE_COLLECTD_WRITESENSU - bool "write_sensu" - help - Sends data to Sensu, a stream processing and monitoring system, - via the Sensu client local TCP socket. - -config BR2_PACKAGE_COLLECTD_WRITETSDB - bool "write_tsdb" - help - Sends data OpenTSDB, a scalable no master, no shared state time - series database. - -endmenu - -endif - -comment "collectd needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/collectd/collectd.hash b/package.bak/collectd/collectd.hash deleted file mode 100644 index be2f646c9c..0000000000 --- a/package.bak/collectd/collectd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://collectd.org/files/SHA256SUM -sha256 7edd3643c0842215553b2421d5456f4e9a8a58b07e216b40a7e8e91026d8e501 collectd-5.7.1.tar.bz2 diff --git a/package.bak/collectd/collectd.mk b/package.bak/collectd/collectd.mk deleted file mode 100644 index 38354ac0b4..0000000000 --- a/package.bak/collectd/collectd.mk +++ /dev/null @@ -1,205 +0,0 @@ -################################################################################ -# -# collectd -# -################################################################################ - -COLLECTD_VERSION = 5.7.1 -COLLECTD_SITE = http://collectd.org/files -COLLECTD_SOURCE = collectd-$(COLLECTD_VERSION).tar.bz2 -COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes -COLLECTD_INSTALL_STAGING = YES -COLLECTD_LICENSE = GPLv2, LGPLv2.1 -COLLECTD_LICENSE_FILES = COPYING - -# These require unmet dependencies, are fringe, pointless or deprecated -COLLECTD_PLUGINS_DISABLE = \ - amqp apple_sensors aquaero ascent barometer dbi dpdkstat email \ - gmond grpc hddtemp intel_rdt ipmi java libvirt lpar lvm \ - madwifi mbmon mic multimeter netapp notify_desktop numa \ - nut onewire oracle perl pf pinba powerdns python redis routeros \ - rrdcached sigrok tape target_v5upgrade teamspeak2 ted \ - tokyotyrant turbostat uuid varnish virt vserver write_kafka \ - write_mongodb write_redis xencpu xmms zfs_arc zone - -COLLECTD_CONF_ENV += LIBS="-lm" - -COLLECTD_CONF_OPTS += \ - --with-nan-emulation \ - --with-fp-layout=nothing \ - --with-perl-bindings=no \ - $(foreach p, $(COLLECTD_PLUGINS_DISABLE), --disable-$(p)) \ - $(if $(BR2_PACKAGE_COLLECTD_AGGREGATION),--enable-aggregation,--disable-aggregation) \ - $(if $(BR2_PACKAGE_COLLECTD_APACHE),--enable-apache,--disable-apache) \ - $(if $(BR2_PACKAGE_COLLECTD_APCUPS),--enable-apcups,--disable-apcups) \ - $(if $(BR2_PACKAGE_COLLECTD_BATTERY),--enable-battery,--disable-battery) \ - $(if $(BR2_PACKAGE_COLLECTD_BIND),--enable-bind,--disable-bind) \ - $(if $(BR2_PACKAGE_COLLECTD_CEPH),--enable-ceph,--disable-ceph) \ - $(if $(BR2_PACKAGE_COLLECTD_CHRONY),--enable-chrony,--disable-chrony) \ - $(if $(BR2_PACKAGE_COLLECTD_CGROUPS),--enable-cgroups,--disable-cgroups) \ - $(if $(BR2_PACKAGE_COLLECTD_CONNTRACK),--enable-conntrack,--disable-conntrack) \ - $(if $(BR2_PACKAGE_COLLECTD_CONTEXTSWITCH),--enable-contextswitch,--disable-contextswitch) \ - $(if $(BR2_PACKAGE_COLLECTD_CPU),--enable-cpu,--disable-cpu) \ - $(if $(BR2_PACKAGE_COLLECTD_CPUFREQ),--enable-cpufreq,--disable-cpufreq) \ - $(if $(BR2_PACKAGE_COLLECTD_CPUSLEEP),--enable-cpusleep,--disable-cpusleep) \ - $(if $(BR2_PACKAGE_COLLECTD_CSV),--enable-csv,--disable-csv) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL),--enable-curl,--disable-curl) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),--enable-curl_json,--disable-curl_json) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),--enable-curl_xml,--disable-curl_xml) \ - $(if $(BR2_PACKAGE_COLLECTD_DF),--enable-df,--disable-df) \ - $(if $(BR2_PACKAGE_COLLECTD_DISK),--enable-disk,--disable-disk) \ - $(if $(BR2_PACKAGE_COLLECTD_DNS),--enable-dns,--disable-dns) \ - $(if $(BR2_PACKAGE_COLLECTD_DRBD),--enable-drbd,--disable-drbd) \ - $(if $(BR2_PACKAGE_COLLECTD_EMPTY_COUNTER),--enable-match_empty_counter,--disable-match_empty_counter) \ - $(if $(BR2_PACKAGE_COLLECTD_ENTROPY),--enable-entropy,--disable-entropy) \ - $(if $(BR2_PACKAGE_COLLECTD_ETHSTAT),--enable-ethstat,--disable-ethstat) \ - $(if $(BR2_PACKAGE_COLLECTD_EXEC),--enable-exec,--disable-exec) \ - $(if $(BR2_PACKAGE_COLLECTD_FHCOUNT),--enable-fhcount,--disable-fhcount) \ - $(if $(BR2_PACKAGE_COLLECTD_FILECOUNT),--enable-filecount,--disable-filecount) \ - $(if $(BR2_PACKAGE_COLLECTD_FSCACHE),--enable-fscache,--disable-fscache) \ - $(if $(BR2_PACKAGE_COLLECTD_GPS),--enable-gps,--disable-gps) \ - $(if $(BR2_PACKAGE_COLLECTD_GRAPHITE),--enable-write_graphite,--disable-write_graphite) \ - $(if $(BR2_PACKAGE_COLLECTD_HASHED),--enable-match_hashed,--disable-match_hashed) \ - $(if $(BR2_PACKAGE_COLLECTD_HUGEPAGES),--enable-hugepages,--disable-hugepages) \ - $(if $(BR2_PACKAGE_COLLECTD_INTERFACE),--enable-interface,--disable-interface) \ - $(if $(BR2_PACKAGE_COLLECTD_IPC),--enable-ipc,--disable-ipc) \ - $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),--enable-iptables,--disable-iptables) \ - $(if $(BR2_PACKAGE_COLLECTD_IPVS),--enable-ipvs,--disable-ipvs) \ - $(if $(BR2_PACKAGE_COLLECTD_IRQ),--enable-irq,--disable-irq) \ - $(if $(BR2_PACKAGE_COLLECTD_LOAD),--enable-load,--disable-load) \ - $(if $(BR2_PACKAGE_COLLECTD_LOGFILE),--enable-logfile,--disable-logfile) \ - $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),--enable-log_logstash,--disable-log_logstash) \ - $(if $(BR2_PACKAGE_COLLECTD_MD),--enable-md,--disable-md) \ - $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),--enable-memcachec,--disable-memcachec) \ - $(if $(BR2_PACKAGE_COLLECTD_MEMCACHED),--enable-memcached,--disable-memcached) \ - $(if $(BR2_PACKAGE_COLLECTD_MEMORY),--enable-memory,--disable-memory) \ - $(if $(BR2_PACKAGE_COLLECTD_MODBUS),--enable-modbus,--disable-modbus) \ - $(if $(BR2_PACKAGE_COLLECTD_MQTT),--enable-mqtt,--disable-mqtt) \ - $(if $(BR2_PACKAGE_COLLECTD_MYSQL),--enable-mysql,--disable-mysql) \ - $(if $(BR2_PACKAGE_COLLECTD_NETLINK),--enable-netlink,--disable-netlink) \ - $(if $(BR2_PACKAGE_COLLECTD_NETWORK),--enable-network,--disable-network) \ - $(if $(BR2_PACKAGE_COLLECTD_NFS),--enable-nfs,--disable-nfs) \ - $(if $(BR2_PACKAGE_COLLECTD_NGINX),--enable-nginx,--disable-nginx) \ - $(if $(BR2_PACKAGE_COLLECTD_NOTIFICATION),--enable-target_notification,--disable-target_notification) \ - $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),--enable-notify_email,--disable-notify_email) \ - $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_NAGIOS),--enable-notify_nagios,--disable-notify_nagios) \ - $(if $(BR2_PACKAGE_COLLECTD_NTPD),--enable-ntpd,--disable-ntpd) \ - $(if $(BR2_PACKAGE_COLLECTD_OLSRD),--enable-olsrd,--disable-olsrd) \ - $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),--enable-openldap,--disable-openldap) \ - $(if $(BR2_PACKAGE_COLLECTD_OPENVPN),--enable-openvpn,--disable-openvpn) \ - $(if $(BR2_PACKAGE_COLLECTD_PING),--enable-ping,--disable-ping) \ - $(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),--enable-postgresql,--disable-postgresql) \ - $(if $(BR2_PACKAGE_COLLECTD_PROCESSES),--enable-processes,--disable-processes) \ - $(if $(BR2_PACKAGE_COLLECTD_PROTOCOLS),--enable-protocols,--disable-protocols) \ - $(if $(BR2_PACKAGE_COLLECTD_REGEX),--enable-match_regex,--disable-match-regex) \ - $(if $(BR2_PACKAGE_COLLECTD_REPLACE),--enable-target_replace,--disable-target_replace) \ - $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),--enable-write_riemann,--disable-write_riemann) \ - $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),--enable-rrdtool,--disable-rrdtool) \ - $(if $(BR2_PACKAGE_COLLECTD_SCALE),--enable-target_scale,--disable-target_scale) \ - $(if $(BR2_PACKAGE_COLLECTD_SENSORS),--enable-sensors,--disable-sensors) \ - $(if $(BR2_PACKAGE_COLLECTD_SERIAL),--enable-serial,--disable-serial) \ - $(if $(BR2_PACKAGE_COLLECTD_STATSD),--enable-statsd,--disable-statsd) \ - $(if $(BR2_PACKAGE_COLLECTD_SET),--enable-target_set,--disable-target_set) \ - $(if $(BR2_PACKAGE_COLLECTD_SMART),--enable-smart,--disable-smart) \ - $(if $(BR2_PACKAGE_COLLECTD_SNMP),--enable-snmp,--disable-snmp) \ - $(if $(BR2_PACKAGE_COLLECTD_SWAP),--enable-swap,--disable-swap) \ - $(if $(BR2_PACKAGE_COLLECTD_SYSLOG),--enable-syslog,--disable-syslog) \ - $(if $(BR2_PACKAGE_COLLECTD_TABLE),--enable-table,--disable-table) \ - $(if $(BR2_PACKAGE_COLLECTD_TAIL),--enable-tail,--disable-tail) \ - $(if $(BR2_PACKAGE_COLLECTD_TAIL_CSV),--enable-tail_csv,--disable-tail_csv) \ - $(if $(BR2_PACKAGE_COLLECTD_TCPCONNS),--enable-tcpconns,--disable-tcpconns) \ - $(if $(BR2_PACKAGE_COLLECTD_THERMAL),--enable-thermal,--disable-thermal) \ - $(if $(BR2_PACKAGE_COLLECTD_THRESHOLD),--enable-threshold,--disable-threshold) \ - $(if $(BR2_PACKAGE_COLLECTD_TIMEDIFF),--enable-match_timediff,--disable-match_timediff) \ - $(if $(BR2_PACKAGE_COLLECTD_UNIXSOCK),--enable-unixsock,--disable-unixsock) \ - $(if $(BR2_PACKAGE_COLLECTD_UPTIME),--enable-uptime,--disable-uptime) \ - $(if $(BR2_PACKAGE_COLLECTD_USERS),--enable-users,--disable-users) \ - $(if $(BR2_PACKAGE_COLLECTD_VALUE),--enable-match_value,--disable-match_value) \ - $(if $(BR2_PACKAGE_COLLECTD_VMEM),--enable-vmem,--disable-vmem) \ - $(if $(BR2_PACKAGE_COLLECTD_WIRELESS),--enable-wireless,--disable-wireless) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),--enable-write_http,--disable-write_http) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITELOG),--enable-write_log,--disable-write_log) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),--enable-write_prometheus,--disable-write_prometheus) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITESENSU),--enable-write_sensu,--disable-write_sensu) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITETSDB),--enable-write_tsdb,--disable-write_tsdb) \ - $(if $(BR2_PACKAGE_COLLECTD_ZOOKEEPER),--enable-zookeeper,--disable-zookeeper) - -COLLECTD_DEPENDENCIES = \ - host-pkgconf \ - $(if $(BR2_PACKAGE_COLLECTD_APACHE),libcurl) \ - $(if $(BR2_PACKAGE_COLLECTD_BIND),libcurl libxml2) \ - $(if $(BR2_PACKAGE_COLLECTD_CEPH),yajl) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL),libcurl) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL_JSON),libcurl yajl) \ - $(if $(BR2_PACKAGE_COLLECTD_CURL_XML),libcurl libxml2) \ - $(if $(BR2_PACKAGE_COLLECTD_DNS),libpcap) \ - $(if $(BR2_PACKAGE_COLLECTD_GPS),gpsd) \ - $(if $(BR2_PACKAGE_COLLECTD_IPTABLES),iptables) \ - $(if $(BR2_PACKAGE_COLLECTD_LOGSTASH),yajl) \ - $(if $(BR2_PACKAGE_COLLECTD_MEMCACHEC),libmemcached) \ - $(if $(BR2_PACKAGE_COLLECTD_MODBUS),libmodbus) \ - $(if $(BR2_PACKAGE_COLLECTD_MQTT),mosquitto) \ - $(if $(BR2_PACKAGE_COLLECTD_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_COLLECTD_NETLINK),libmnl) \ - $(if $(BR2_PACKAGE_COLLECTD_NGINX),libcurl) \ - $(if $(BR2_PACKAGE_COLLECTD_NOTIFY_EMAIL),libesmtp) \ - $(if $(BR2_PACKAGE_COLLECTD_OPENLDAP),openldap) \ - $(if $(BR2_PACKAGE_COLLECTD_PING),liboping) \ - $(if $(BR2_PACKAGE_COLLECTD_POSTGRESQL),postgresql) \ - $(if $(BR2_PACKAGE_COLLECTD_RIEMANN),libtool riemann-c-client) \ - $(if $(BR2_PACKAGE_COLLECTD_RRDTOOL),rrdtool) \ - $(if $(BR2_PACKAGE_COLLECTD_SENSORS),lm-sensors) \ - $(if $(BR2_PACKAGE_COLLECTD_SMART),libatasmart) \ - $(if $(BR2_PACKAGE_COLLECTD_SNMP),netsnmp) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEHTTP),libcurl) \ - $(if $(BR2_PACKAGE_COLLECTD_WRITEPROMETHEUS),libmicrohttpd protobuf-c) - -# include/library fixups -ifeq ($(BR2_PACKAGE_LIBCURL),y) -COLLECTD_CONF_OPTS += --with-libcurl=$(STAGING_DIR)/usr -endif -ifeq ($(BR2_PACKAGE_MYSQL),y) -COLLECTD_CONF_OPTS += --with-libmysql=$(STAGING_DIR)/usr -endif -ifeq ($(BR2_PACKAGE_NETSNMP),y) -COLLECTD_CONF_OPTS += --with-libnetsnmp=$(STAGING_DIR)/usr -endif -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -COLLECTD_CONF_OPTS += --with-libpq=$(STAGING_DIR)/usr/bin/pg_config -COLLECTD_CONF_ENV += LIBS="-lpthread -lm" -endif -ifeq ($(BR2_PACKAGE_YAJL),y) -COLLECTD_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr -endif - -# network can use libgcrypt -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -COLLECTD_DEPENDENCIES += libgcrypt -COLLECTD_CONF_OPTS += --with-libgcrypt=$(STAGING_DIR)/usr/bin/libgcrypt-config -else -COLLECTD_CONF_OPTS += --with-libgcrypt=no -endif - -# released software should not break on minor warnings -define COLLECTD_DROP_WERROR - $(SED) 's/-Werror//' \ - $(@D)/src/Makefile.in $(@D)/src/libcollectdclient/Makefile.in -endef - -COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR - -define COLLECTD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install - rm -f $(TARGET_DIR)/usr/bin/collectd-nagios - rm -f $(TARGET_DIR)/usr/share/collectd/postgresql_default.conf -endef - -define COLLECTD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/collectd/collectd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/collectd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/collectd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/collectd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/collectd/collectd.service b/package.bak/collectd/collectd.service deleted file mode 100644 index e203806f59..0000000000 --- a/package.bak/collectd/collectd.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Statistics collection and monitoring daemon -After=local-fs.target network.target -Requires=local-fs.target network.target -ConditionPathExists=/etc/collectd.conf - -[Service] -Type=notify -NotifyAccess=main -EnvironmentFile=-/etc/default/collectd -ExecStartPre=/usr/sbin/collectd -t -ExecStart=/usr/sbin/collectd -Restart=always -RestartSec=10 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/comix-cursors/Config.in b/package.bak/comix-cursors/Config.in deleted file mode 100644 index ac7a089c36..0000000000 --- a/package.bak/comix-cursors/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_COMIX_CURSORS - bool "comix-cursors" - help - X11 mouse theme with a comics feeling. - - http://kde-look.org/content/show.php/ComixCursors?content=32627 diff --git a/package.bak/comix-cursors/comix-cursors.hash b/package.bak/comix-cursors/comix-cursors.hash deleted file mode 100644 index d7f33ca078..0000000000 --- a/package.bak/comix-cursors/comix-cursors.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3109e4d19d930a6a2a5c3422ebaaa2002640169118f9b12c042bb64995f3ec31 ComixCursors-0.8.2.tar.bz2 diff --git a/package.bak/comix-cursors/comix-cursors.mk b/package.bak/comix-cursors/comix-cursors.mk deleted file mode 100644 index f8e8284055..0000000000 --- a/package.bak/comix-cursors/comix-cursors.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# comix-cursors -# -################################################################################ - -COMIX_CURSORS_VERSION = 0.8.2 -COMIX_CURSORS_SITE = http://limitland.de/downloads/comixcursors -COMIX_CURSORS_SOURCE = ComixCursors-$(COMIX_CURSORS_VERSION).tar.bz2 -COMIX_CURSORS_LICENSE = GPLv3 -COMIX_CURSORS_STRIP_COMPONENTS = 0 - -define COMIX_CURSORS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/cursors/xorg-x11 - cp -a $(@D)/* \ - $(TARGET_DIR)/usr/share/cursors/xorg-x11 -endef - -$(eval $(generic-package)) diff --git a/package.bak/connman-gtk/Config.in b/package.bak/connman-gtk/Config.in deleted file mode 100644 index 467bf7ec88..0000000000 --- a/package.bak/connman-gtk/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -comment "connman-gtk needs libgtk3 and a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || !BR2_PACKAGE_LIBGTK3 || \ - BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_CONNMAN_GTK - bool "connman-gtk" - depends on BR2_USE_WCHAR # libglib2, connman - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2, connman - depends on BR2_USE_MMU # libglib2 - depends on !BR2_STATIC_LIBS # connman - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # connman - depends on !BR2_TOOLCHAIN_USES_MUSL # connman - depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_CONNMAN - select BR2_PACKAGE_LIBGLIB2 - help - GTK GUI for ConnMan. - - https://github.com/jgke/connman-gtk diff --git a/package.bak/connman-gtk/connman-gtk.hash b/package.bak/connman-gtk/connman-gtk.hash deleted file mode 100644 index d71e77d2c1..0000000000 --- a/package.bak/connman-gtk/connman-gtk.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 49bdc4769a7c508b0130e4705eef21aec9df1ea4f5c29fee48a0cae8db828fca connman-gtk-1.1.1.tar.bz2 diff --git a/package.bak/connman-gtk/connman-gtk.mk b/package.bak/connman-gtk/connman-gtk.mk deleted file mode 100644 index 2c9c131477..0000000000 --- a/package.bak/connman-gtk/connman-gtk.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# connman-gtk -# -################################################################################ - -CONNMAN_GTK_VERSION = 1.1.1 -CONNMAN_GTK_SITE = https://github.com/jgke/connman-gtk/releases/download/v$(CONNMAN_GTK_VERSION) -CONNMAN_GTK_SOURCE = connman-gtk-$(CONNMAN_GTK_VERSION).tar.bz2 -CONNMAN_GTK_INSTALL_STAGING = YES -CONNMAN_GTK_DEPENDENCIES = host-intltool connman libglib2 libgtk3 -CONNMAN_GTK_LICENSE = GPLv2+ -CONNMAN_GTK_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/connman/0002-nat-build-failure.patch b/package.bak/connman/0002-nat-build-failure.patch deleted file mode 100644 index 0ab58501d0..0000000000 --- a/package.bak/connman/0002-nat-build-failure.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 68f4b4f5b220f256b17ad2f084d61fe89f3632ae Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 19 Apr 2016 08:38:38 -0300 -Subject: [PATCH] nat: fix build failure - -_GNU_SOURCE needs to be defined so that O_CLOEXEC symbols can be found in -system header files. - -Signed-off-by: Gustavo Zacarias ---- -Status: submitted upstream - - src/nat.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/nat.c b/src/nat.c -index 33ae6df..62e21d4 100644 ---- a/src/nat.c -+++ b/src/nat.c -@@ -24,6 +24,7 @@ - #include - #endif - -+#define _GNU_SOURCE - #include - #include - #include --- -2.7.3 - diff --git a/package.bak/connman/Config.in b/package.bak/connman/Config.in deleted file mode 100644 index 6ed40beab1..0000000000 --- a/package.bak/connman/Config.in +++ /dev/null @@ -1,74 +0,0 @@ -config BR2_PACKAGE_CONNMAN - bool "connman" - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_IPTABLES - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 - depends on !BR2_STATIC_LIBS # needs dlopen() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers - help - The Connection Manager (ConnMan) project provides a daemon - for managing internet connections within embedded devices - running the Linux operating system. - - For more information, see https://01.org/connman - -if BR2_PACKAGE_CONNMAN - -config BR2_PACKAGE_CONNMAN_ETHERNET - bool "enable Ethernet support" - default y - -config BR2_PACKAGE_CONNMAN_WIFI - bool "enable WiFi support" - select BR2_PACKAGE_WPA_SUPPLICANT # runtime - select BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW # runtime - help - Enable WiFi support (scan and static/dhcp interface - setup). ConnMan detects the start of wpa_supplicant - automatically. - -config BR2_PACKAGE_CONNMAN_WISPR - bool "enable WISPr support" - select BR2_PACKAGE_GNUTLS - help - Enable support for Wireless Internet Service Provider - roaming (WISPr). A RADIUS server is used to authenticate the - subscriber's credentials. - -config BR2_PACKAGE_CONNMAN_BLUETOOTH - bool "enable Bluetooth support" - help - Enable Bluetooth support. The start of bluetoothd is - automatically detected and only a runtime dependency. - -config BR2_PACKAGE_CONNMAN_LOOPBACK - bool "enable loopback support" - -config BR2_PACKAGE_CONNMAN_NEARD - bool "enable neard support" - select BR2_PACKAGE_NEARD - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # neard - -config BR2_PACKAGE_CONNMAN_OFONO - bool "enable ofono support" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # ofono - select BR2_PACKAGE_OFONO - -config BR2_PACKAGE_CONNMAN_DEBUG - bool "enable compiling with debugging information" - -config BR2_PACKAGE_CONNMAN_CLIENT - bool "enable command line client" - select BR2_PACKAGE_READLINE - -endif # BR2_PACKAGE_CONNMAN - -comment "connman needs a glibc or uClibc toolchain w/ wchar, threads, resolver, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/connman/S45connman b/package.bak/connman/S45connman deleted file mode 100755 index d3d4bd5df4..0000000000 --- a/package.bak/connman/S45connman +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting connman ... " - start-stop-daemon -S -q -m -b -p /var/run/connmand.pid --exec /usr/sbin/connmand -- -n - echo "done." - ;; - stop) - printf "Stopping connman ..." - start-stop-daemon -K -q -p /var/run/connmand.pid - echo "done." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/connman/connman.hash b/package.bak/connman/connman.hash deleted file mode 100644 index f27af3deac..0000000000 --- a/package.bak/connman/connman.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc -sha256 bc8946036fa70124d663136f9f6b6238d897ca482782df907b07a428b09df5a0 connman-1.33.tar.xz diff --git a/package.bak/connman/connman.mk b/package.bak/connman/connman.mk deleted file mode 100644 index f7c9f2318f..0000000000 --- a/package.bak/connman/connman.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# connman -# -################################################################################ - -CONNMAN_VERSION = 1.33 -CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz -CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman -CONNMAN_DEPENDENCIES = libglib2 dbus iptables -CONNMAN_INSTALL_STAGING = YES -CONNMAN_LICENSE = GPLv2 -CONNMAN_LICENSE_FILES = COPYING -CONNMAN_CONF_OPTS += \ - --with-dbusconfdir=/etc \ - $(if $(BR2_PACKAGE_CONNMAN_DEBUG),--enable-debug,--disable-debug) \ - $(if $(BR2_PACKAGE_CONNMAN_ETHERNET),--enable-ethernet,--disable-ethernet) \ - $(if $(BR2_PACKAGE_CONNMAN_WIFI),--enable-wifi,--disable-wifi) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),--enable-wispr,--disable-wispr) \ - $(if $(BR2_PACKAGE_CONNMAN_BLUETOOTH),--enable-bluetooth,--disable-bluetooth) \ - $(if $(BR2_PACKAGE_CONNMAN_LOOPBACK),--enable-loopback,--disable-loopback) \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),--enable-neard,--disable-neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),--enable-ofono,--disable-ofono) \ - $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system) - -CONNMAN_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_CONNMAN_NEARD),neard) \ - $(if $(BR2_PACKAGE_CONNMAN_OFONO),ofono) \ - $(if $(BR2_PACKAGE_CONNMAN_WISPR),gnutls) - -define CONNMAN_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/connman/S45connman $(TARGET_DIR)/etc/init.d/S45connman -endef - -define CONNMAN_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/connman.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/connman.service -endef - -ifeq ($(BR2_PACKAGE_CONNMAN_CLIENT),y) -CONNMAN_CONF_OPTS += --enable-client -CONNMAN_DEPENDENCIES += readline - -define CONNMAN_INSTALL_CM - $(INSTALL) -m 0755 -D $(@D)/client/connmanctl $(TARGET_DIR)/usr/bin/connmanctl -endef - -CONNMAN_POST_INSTALL_TARGET_HOOKS += CONNMAN_INSTALL_CM -else -CONNMAN_CONF_OPTS += --disable-client -endif - -$(eval $(autotools-package)) diff --git a/package.bak/conntrack-tools/Config.in b/package.bak/conntrack-tools/Config.in deleted file mode 100644 index 87bf2d0c50..0000000000 --- a/package.bak/conntrack-tools/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_CONNTRACK_TOOLS - bool "conntrack-tools" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc - depends on !BR2_STATIC_LIBS # dlopen() - select BR2_PACKAGE_LIBNETFILTER_CONNTRACK - select BR2_PACKAGE_LIBNETFILTER_CTHELPER - select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT - select BR2_PACKAGE_LIBNETFILTER_QUEUE - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - The conntrack-tools are a set of tools targeted at - system administrators. - They are conntrack, the userspace command line interface, - and conntrackd, the userspace daemon. - - http://www.netfilter.org/projects/conntrack-tools/ - -comment "conntrack-tools needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) || \ - BR2_STATIC_LIBS diff --git a/package.bak/conntrack-tools/conntrack-tools.hash b/package.bak/conntrack-tools/conntrack-tools.hash deleted file mode 100644 index 9d6817721d..0000000000 --- a/package.bak/conntrack-tools/conntrack-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/conntrack-tools/conntrack-tools-1.4.4.tar.bz2.{md5sum,sha1sum} -md5 acd9e0b27cf16ae3092ba900e4d7560e conntrack-tools-1.4.4.tar.bz2 -sha1 25b36fb6832373ef899bade3b82adf5382b9a05b conntrack-tools-1.4.4.tar.bz2 diff --git a/package.bak/conntrack-tools/conntrack-tools.mk b/package.bak/conntrack-tools/conntrack-tools.mk deleted file mode 100644 index b73aa7f4db..0000000000 --- a/package.bak/conntrack-tools/conntrack-tools.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# conntrack-tools -# -################################################################################ - -CONNTRACK_TOOLS_VERSION = 1.4.4 -CONNTRACK_TOOLS_SOURCE = conntrack-tools-$(CONNTRACK_TOOLS_VERSION).tar.bz2 -CONNTRACK_TOOLS_SITE = http://www.netfilter.org/projects/conntrack-tools/files -CONNTRACK_TOOLS_DEPENDENCIES = host-pkgconf \ - libnetfilter_conntrack libnetfilter_cthelper libnetfilter_cttimeout \ - libnetfilter_queue host-bison host-flex -CONNTRACK_TOOLS_LICENSE = GPLv2+ -CONNTRACK_TOOLS_LICENSE_FILES = COPYING - -CONNTRACK_TOOLS_CFLAGS = $(TARGET_CFLAGS) - -# Some of conntrack-tools source files include both linux/in.h (via -# linux/netfilter.h for kernel headers >= 4.2) and netinet/in.h, which -# causes some symbol conflicts when musl is used. Defining __GLIBC__ -# works around that issue since the kernel headers are prepared to -# avoid redefinition of certain symbols when they see __GLIBC__. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -CONNTRACK_TOOLS_CFLAGS += -D__GLIBC__ -endif - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -CONNTRACK_TOOLS_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -CONNTRACK_TOOLS_DEPENDENCIES += libtirpc host-pkgconf -endif - -CONNTRACK_TOOLS_CONF_ENV = CFLAGS="$(CONNTRACK_TOOLS_CFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/copas/Config.in b/package.bak/copas/Config.in deleted file mode 100644 index 21dd0eb883..0000000000 --- a/package.bak/copas/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_COPAS - bool "copas" - # Runtime dependency only - select BR2_PACKAGE_COXPCALL - select BR2_PACKAGE_LUASOCKET - help - Copas is a dispatcher based on coroutines that - can be used by TCP/IP servers. - - http://keplerproject.github.com/copas/ diff --git a/package.bak/copas/copas.hash b/package.bak/copas/copas.hash deleted file mode 100644 index 27e33166c8..0000000000 --- a/package.bak/copas/copas.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c94890bdc8899d05163ca963dadf4b74b2ad7a5795ea3923a792b6e928ec142a copas-2.0.1-1.src.rock diff --git a/package.bak/copas/copas.mk b/package.bak/copas/copas.mk deleted file mode 100644 index 132b5d9678..0000000000 --- a/package.bak/copas/copas.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# copas -# -################################################################################ - -COPAS_VERSION = 2.0.1-1 -COPAS_SUBDIR = copas-2_0_1 -COPAS_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/coreutils/0001-fix-for-dummy-man-usage.patch b/package.bak/coreutils/0001-fix-for-dummy-man-usage.patch deleted file mode 100644 index 4c5a088257..0000000000 --- a/package.bak/coreutils/0001-fix-for-dummy-man-usage.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -coreutils: fix for dummy-man usage - -The options should be before the final argument, otherwise, the following error -would appear when compiling. - -"dummy-man: too many non-option arguments" - -Signed-off-by: Chen Qi -[Gustavo: update for 8.24] - -diff -Nura coreutils-8.24.orig/man/local.mk coreutils-8.24/man/local.mk ---- coreutils-8.24.orig/man/local.mk 2015-07-04 11:23:47.190503631 -0300 -+++ coreutils-8.24/man/local.mk 2015-07-04 11:24:25.046741090 -0300 -@@ -186,8 +186,8 @@ - && $(run_help2man) \ - --source='$(PACKAGE_STRING)' \ - --include=$(srcdir)/man/$$name.x \ -- --output=$$t/$$name.1 \ - --info-page='\(aq(coreutils) '$$name' invocation\(aq' \ -+ --output=$$t/$$name.1 \ - $$t/$$argv$(EXEEXT) \ - && sed \ - -e 's|$*\.td/||g' \ diff --git a/package.bak/coreutils/Config.in b/package.bak/coreutils/Config.in deleted file mode 100644 index 11a6019e82..0000000000 --- a/package.bak/coreutils/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_COREUTILS - bool "coreutils" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - All of the basic file/text/shell utilities. These are the - core utilities which are expected to exist on every system. - BusyBox implements many of the most common. - - Things like: - - chmod, cp, dd, dir, ls, etc... - - sort, tr, head, tail, wc, etc... - - whoami, who, etc... - - http://www.gnu.org/software/coreutils/ - -comment "coreutils needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/coreutils/coreutils.hash b/package.bak/coreutils/coreutils.hash deleted file mode 100644 index 37d630bba9..0000000000 --- a/package.bak/coreutils/coreutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 155e94d748f8e2bc327c66e0cbebdb8d6ab265d2f37c3c928f7bf6c3beba9a8e coreutils-8.26.tar.xz diff --git a/package.bak/coreutils/coreutils.mk b/package.bak/coreutils/coreutils.mk deleted file mode 100644 index 409089c332..0000000000 --- a/package.bak/coreutils/coreutils.mk +++ /dev/null @@ -1,129 +0,0 @@ -################################################################################ -# -# coreutils -# -################################################################################ - -COREUTILS_VERSION = 8.26 -COREUTILS_SITE = $(BR2_GNU_MIRROR)/coreutils -COREUTILS_SOURCE = coreutils-$(COREUTILS_VERSION).tar.xz -COREUTILS_LICENSE = GPLv3+ -COREUTILS_LICENSE_FILES = COPYING - -# coreutils-01-fix-for-dummy-man-usage.patch triggers autoreconf on build -COREUTILS_AUTORECONF = YES -COREUTILS_GETTEXTIZE = YES - -COREUTILS_CONF_OPTS = --disable-rpath --enable-single-binary=shebangs \ - $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) -COREUTILS_CONF_ENV = ac_cv_c_restrict=no \ - ac_cv_func_chown_works=yes \ - ac_cv_func_euidaccess=no \ - ac_cv_func_fstatat=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_getloadavg=no \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_strerror_r_char_p=no \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_strtod=yes \ - ac_cv_func_working_mktime=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_fsusage_space=yes \ - ac_use_included_regex=no \ - am_cv_func_working_getline=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - gl_cv_func_gettimeofday_clobber=no \ - gl_cv_func_fstatat_zero_flag=no \ - gl_cv_func_link_follows_symlink=no \ - gl_cv_func_re_compile_pattern_working=yes \ - gl_cv_func_svid_putenv=yes \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_working_mkstemp=yes \ - gl_cv_func_working_utimes=yes \ - gl_getline_needs_run_time_check=no \ - gl_cv_have_proc_uptime=yes \ - utils_cv_localtime_cache=no \ - PERL=missing \ - MAKEINFO=true \ - INSTALL_PROGRAM=$(INSTALL) - -COREUTILS_BIN_PROGS = cat chgrp chmod chown cp date dd df dir echo false \ - ln ls mkdir mknod mv pwd rm rmdir vdir sleep stty sync touch true \ - uname join - -# If both coreutils and busybox are selected, make certain coreutils -# wins the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -COREUTILS_DEPENDENCIES = busybox -endif - -ifeq ($(BR2_PACKAGE_ACL),y) -COREUTILS_DEPENDENCIES += acl -else -COREUTILS_CONF_OPTS += --disable-acl -endif - -ifeq ($(BR2_PACKAGE_ATTR),y) -COREUTILS_DEPENDENCIES += attr -else -COREUTILS_CONF_OPTS += --disable-xattr -endif - -# It otherwise fails to link properly, not mandatory though -ifeq ($(BR2_PACKAGE_GETTEXT),y) -COREUTILS_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr -COREUTILS_DEPENDENCIES += gettext -endif - -ifeq ($(BR2_PACKAGE_GMP),y) -COREUTILS_DEPENDENCIES += gmp -else -COREUTILS_CONF_OPTS += --without-gmp -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -COREUTILS_DEPENDENCIES += libcap -else -COREUTILS_CONF_OPTS += --disable-libcap -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -COREUTILS_CONF_OPTS += --with-openssl=yes -COREUTILS_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_ROOTFS_MERGED_USR),) -define COREUTILS_CLEANUP_BIN - # some things go in root rather than usr - for f in $(COREUTILS_BIN_PROGS); do \ - mv -f $(TARGET_DIR)/usr/bin/$$f $(TARGET_DIR)/bin/$$f || exit 1; \ - done -endef -COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP_BIN -endif - -ifeq ($(BR2_STATIC_LIBS),y) -COREUTILS_CONF_OPTS += --enable-no-install-program=stdbuf -endif - -define COREUTILS_CLEANUP - # link for archaic shells - ln -fs test $(TARGET_DIR)/usr/bin/[ - # gnu thinks chroot is in bin, debian thinks it's in sbin - mv -f $(TARGET_DIR)/usr/bin/chroot $(TARGET_DIR)/usr/sbin/chroot -endef - -COREUTILS_POST_INSTALL_TARGET_HOOKS += COREUTILS_CLEANUP - -# If both coreutils and busybox are selected, the corresponding applets -# may need to be reinstated by the clean targets. - -$(eval $(autotools-package)) diff --git a/package.bak/cosmo/Config.in b/package.bak/cosmo/Config.in deleted file mode 100644 index 869a1072ed..0000000000 --- a/package.bak/cosmo/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_COSMO - bool "cosmo" - # run-time dependency - select BR2_PACKAGE_LPEG - # upstream site does not provide a valid archive - depends on BROKEN - help - Cosmo is a "safe templates" engine for Lua. - - http://mascarenhas.github.io/cosmo/ diff --git a/package.bak/cosmo/cosmo.hash b/package.bak/cosmo/cosmo.hash deleted file mode 100644 index ff88576469..0000000000 --- a/package.bak/cosmo/cosmo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 4e81c1bba7ab3b4633c8d6dadfc8332c59c818829436435b4d5a2ec76adfbb87 cosmo-14.03.04-1.src.rock diff --git a/package.bak/cosmo/cosmo.mk b/package.bak/cosmo/cosmo.mk deleted file mode 100644 index 0ab5324569..0000000000 --- a/package.bak/cosmo/cosmo.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# cosmo -# -################################################################################ - -COSMO_VERSION = 14.03.04-1 -COSMO_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/coxpcall/Config.in b/package.bak/coxpcall/Config.in deleted file mode 100644 index 1237482ffa..0000000000 --- a/package.bak/coxpcall/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_COXPCALL - bool "coxpcall" - help - Coxpcall encapsulates the protected calls with a coroutine - based loop, so errors can be dealed without the usual - pcall/xpcall issues with coroutines. - - http://coxpcall.luaforge.net/ diff --git a/package.bak/coxpcall/coxpcall.hash b/package.bak/coxpcall/coxpcall.hash deleted file mode 100644 index d7a02c2010..0000000000 --- a/package.bak/coxpcall/coxpcall.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ff93d30e0a6cd64bb4e66739757e7eda9f226187829a075747b2ca5d3cfd1075 coxpcall-1.15.0-1.src.rock diff --git a/package.bak/coxpcall/coxpcall.mk b/package.bak/coxpcall/coxpcall.mk deleted file mode 100644 index 9c21143796..0000000000 --- a/package.bak/coxpcall/coxpcall.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# coxpcall -# -################################################################################ - -COXPCALL_VERSION = 1.15.0-1 -COXPCALL_SUBDIR = coxpcall -COXPCALL_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/cpio/0001-fix-CVE-2016-2037.patch b/package.bak/cpio/0001-fix-CVE-2016-2037.patch deleted file mode 100644 index aec2ccb8e5..0000000000 --- a/package.bak/cpio/0001-fix-CVE-2016-2037.patch +++ /dev/null @@ -1,51 +0,0 @@ -From: Pavel Raiskup -Subject: [Bug-cpio] [PATCH] fix 1-byte out-of-bounds write -Date: Tue, 26 Jan 2016 23:17:54 +0100 - -Other calls to cpio_safer_name_suffix seem to be safe. - -* src/copyin.c (process_copy_in): Make sure that file_hdr.c_name -has at least two bytes allocated. -* src/util.c (cpio_safer_name_suffix): Document that use of this -function requires to be careful. - -Signed-off-by: Gustavo Zacarias ---- -Patch status: fetched/submitted -URL: https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html - - src/copyin.c | 2 ++ - src/util.c | 5 ++++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/copyin.c b/src/copyin.c -index cde911e..032d35f 100644 ---- a/src/copyin.c -+++ b/src/copyin.c -@@ -1385,6 +1385,8 @@ process_copy_in () - break; - } - -+ if (file_hdr.c_namesize <= 1) -+ file_hdr.c_name = xrealloc(file_hdr.c_name, 2); - cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag, - false); - -diff --git a/src/util.c b/src/util.c -index 6ff6032..2763ac1 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -1411,7 +1411,10 @@ set_file_times (int fd, - } - - /* Do we have to ignore absolute paths, and if so, does the filename -- have an absolute path? */ -+ have an absolute path? -+ Before calling this function make sure that the allocated NAME buffer has -+ capacity at least 2 bytes to allow us to store the "." string inside. */ -+ - void - cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names, - bool strip_leading_dots) --- -2.5.0 diff --git a/package.bak/cpio/Config.in b/package.bak/cpio/Config.in deleted file mode 100644 index 1210a0bde1..0000000000 --- a/package.bak/cpio/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_CPIO - bool "cpio" - # Need argp.h support - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_WCHAR - help - cpio archive utility for creation and extraction. - - https://www.gnu.org/software/cpio/ - -comment "cpio needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/cpio/cpio.hash b/package.bak/cpio/cpio.hash deleted file mode 100644 index 962a100cc4..0000000000 --- a/package.bak/cpio/cpio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 08a35e92deb3c85d269a0059a27d4140a9667a6369459299d08c17f713a92e73 cpio-2.12.tar.gz diff --git a/package.bak/cpio/cpio.mk b/package.bak/cpio/cpio.mk deleted file mode 100644 index b0b8fa6f7b..0000000000 --- a/package.bak/cpio/cpio.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# cpio -# -################################################################################ - -CPIO_VERSION = 2.12 -CPIO_SITE = $(BR2_GNU_MIRROR)/cpio -CPIO_CONF_OPTS = --bindir=/bin -CPIO_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) -CPIO_LICENSE = GPLv3+ -CPIO_LICENSE_FILES = COPYING - -# cpio uses argp.h which is not provided by uclibc or musl by default. -# Use the argp-standalone package to provide this. -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -CPIO_DEPENDENCIES += argp-standalone -endif - -$(eval $(autotools-package)) diff --git a/package.bak/cppcms/Config.in b/package.bak/cppcms/Config.in deleted file mode 100644 index 2cf70052f8..0000000000 --- a/package.bak/cppcms/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -config BR2_PACKAGE_CPPCMS - bool "cppcms" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_LIBGCRYPT - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_USE_WCHAR - help - CppCMS is a Free High Performance Web Development Framework - (not a CMS) aimed for Rapid Web Application Development. It - differs from most of other web development frameworks like: - Python Django or Java Servlets on the following aspects: - - - It is designed and tuned to handle extremely high loads. - - It uses modern C++ as primary development language in - order to achieve the above goal. - - It is aimed on development of both Web Sites and Web - Services. - - http://cppcms.com - -if BR2_PACKAGE_CPPCMS - -config BR2_PACKAGE_CPPCMS_ICU - bool "enable icu support" - depends on !BR2_BINFMT_FLAT # icu - select BR2_PACKAGE_ICU - help - Using ICU allows advanced localization features into CppCMS, - in another hand ICU is heavier than iconv. - -endif - -comment "cppcms needs a toolchain w/ C++, NPTL, wchar, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/cppcms/cppcms.hash b/package.bak/cppcms/cppcms.hash deleted file mode 100644 index 28e998c6c1..0000000000 --- a/package.bak/cppcms/cppcms.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/cppcms/files/cppcms/1.0.5/ -sha1 15f21897c14acfd4b0c74622e49d95857f2fe939 cppcms-1.0.5.tar.bz2 -md5 d668c201dd31fff8090380ebdc0bcc2b cppcms-1.0.5.tar.bz2 -# Locally computed: -sha256 84b685977bca97c3e997497f227bd5906adb80555066d811a7046b01c2f51865 cppcms-1.0.5.tar.bz2 diff --git a/package.bak/cppcms/cppcms.mk b/package.bak/cppcms/cppcms.mk deleted file mode 100644 index 611020c588..0000000000 --- a/package.bak/cppcms/cppcms.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# cppcms -# -################################################################################ - -CPPCMS_VERSION = 1.0.5 -CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2 -CPPCMS_LICENSE = LGPLv3 -CPPCMS_LICENSE_FILES = COPYING.TXT -CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION) -CPPCMS_INSTALL_STAGING = YES - -CPPCMS_DEPENDENCIES = zlib pcre libgcrypt - -ifeq ($(BR2_PACKAGE_CPPCMS_ICU),y) -CPPCMS_CONF_OPTS += -DDISABLE_ICONV=ON -CPPCMS_DEPENDENCIES += icu -endif - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# posix backend needs monetary.h which isn't available on uClibc -CPPCMS_CONF_OPTS += -DDISABLE_POSIX_LOCALE=on -endif - -# We copy cppcms_tmpl_cc from staging to host because this file can be -# needed for compiling packages using cppcms. And it is not worth -# creating a host package just for a python script. -define CPPCMS_INSTALL_HOST_TOOLS - cp $(STAGING_DIR)/usr/bin/cppcms_tmpl_cc $(HOST_DIR)/usr/bin/cppcms_tmpl_cc -endef -CPPCMS_POST_INSTALL_STAGING_HOOKS += CPPCMS_INSTALL_HOST_TOOLS - -$(eval $(cmake-package)) diff --git a/package.bak/cppdb/0001-mysql-library-suffix.patch b/package.bak/cppdb/0001-mysql-library-suffix.patch deleted file mode 100644 index e65e3e26b6..0000000000 --- a/package.bak/cppdb/0001-mysql-library-suffix.patch +++ /dev/null @@ -1,23 +0,0 @@ -Add mysql/ to PATH_SUFFIXES for the library search for mysql. - -On common distros libmysqlclient* is installed and/or symlinked -into /usr/lib. -Since we install the libraries into /usr/lib/mysql alone cppdb -fails to properly link to it giving runtime errors. - -Status: https://sourceforge.net/p/cppcms/bugs/135/ - -Signed-off-by: Gustavo Zacarias - -diff -Nura cppdb-0.3.1.orig/CMakeLists.txt cppdb-0.3.1/CMakeLists.txt ---- cppdb-0.3.1.orig/CMakeLists.txt 2014-10-17 11:05:57.875429748 -0300 -+++ cppdb-0.3.1/CMakeLists.txt 2014-10-17 11:12:57.486775484 -0300 -@@ -196,7 +196,7 @@ - endif() - - if(NOT DISABLE_MYSQL) -- find_library(MYSQL_LIB mysqlclient) -+ find_library(MYSQL_LIB mysqlclient PATH_SUFFIXES mysql) - find_path(MYSQL_PATH mysql.h PATH_SUFFIXES mysql) - if(MYSQL_LIB AND MYSQL_PATH) - include_directories(${MYSQL_PATH}) diff --git a/package.bak/cppdb/Config.in b/package.bak/cppdb/Config.in deleted file mode 100644 index 9037a7a0c6..0000000000 --- a/package.bak/cppdb/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_CPPDB - bool "cppdb" - # dlfcn.h - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # Can be built without them but it's useless - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE - help - CppDB is an SQL connectivity library that is designed to provide - platform and Database independent connectivity API similarly - to what JDBC, ODBC and other connectivity libraries do. - - http://cppcms.com/sql/cppdb/ - -comment "cppdb needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_MYSQL || BR2_PACKAGE_POSTGRESQL || BR2_PACKAGE_SQLITE - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/cppdb/cppdb.hash b/package.bak/cppdb/cppdb.hash deleted file mode 100644 index efc0eac0df..0000000000 --- a/package.bak/cppdb/cppdb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/cppcms/files/cppdb/0.3.1/ -md5 129f1d75f46114b79160b93807d5223f cppdb-0.3.1.tar.bz2 -sha1 c0410dcc482d71696ac9206044b3a3ac03d31f96 cppdb-0.3.1.tar.bz2 diff --git a/package.bak/cppdb/cppdb.mk b/package.bak/cppdb/cppdb.mk deleted file mode 100644 index 2c26c90939..0000000000 --- a/package.bak/cppdb/cppdb.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# cppdb -# -################################################################################ - -CPPDB_VERSION = 0.3.1 -CPPDB_SOURCE = cppdb-$(CPPDB_VERSION).tar.bz2 -CPPDB_SITE = http://downloads.sourceforge.net/project/cppcms/cppdb/$(CPPDB_VERSION) -CPPDB_INSTALL_STAGING = YES -CPPDB_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) -CPPDB_LICENSE = Boost-v1.0 or MIT -CPPDB_LICENSE_FILES = LICENSE_1_0.txt MIT.txt - -ifeq ($(BR2_PACKAGE_MYSQL),y) -CPPDB_DEPENDENCIES += mysql -else -CPPDB_CONF_OPTS += -DDISABLE_MYSQL=ON -endif - -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -CPPDB_DEPENDENCIES += postgresql -else -CPPDB_CONF_OPTS += -DDISABLE_PQ=ON -endif - -ifeq ($(BR2_PACKAGE_SQLITE),) -CPPDB_CONF_OPTS += -DDISABLE_SQLITE=ON -endif - -$(eval $(cmake-package)) diff --git a/package.bak/cppunit/Config.in b/package.bak/cppunit/Config.in deleted file mode 100644 index efcdcf01a2..0000000000 --- a/package.bak/cppunit/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_CPPUNIT - bool "cppunit" - depends on BR2_INSTALL_LIBSTDCPP - # currently the static situation is not correctly detected. - depends on !BR2_STATIC_LIBS - help - CppUnit is the C++ port of the famous JUnit framework for - unit testing. Test output is in XML or text format for - automatic testing and GUI based for supervised tests. - - http://www.freedesktop.org/wiki/Software/cppunit/ - -comment "cppunit needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package.bak/cppunit/cppunit.hash b/package.bak/cppunit/cppunit.hash deleted file mode 100644 index a097e3256d..0000000000 --- a/package.bak/cppunit/cppunit.hash +++ /dev/null @@ -1,5 +0,0 @@ -# hash from: http://www.freedesktop.org/wiki/Software/cppunit/: -md5 d1c6bdd5a76c66d2c38331e2d287bc01 cppunit-1.13.2.tar.gz - -# Locally calculated: -sha512 8f4be569f321d577cec31931f49f4df143bc94e283605509b6ea50c60690aa91a2aed940e7eebd4b2413a4218f9a6c3978d312d8e587eab040283c6563846ecd cppunit-1.13.2.tar.gz diff --git a/package.bak/cppunit/cppunit.mk b/package.bak/cppunit/cppunit.mk deleted file mode 100644 index b8251c297a..0000000000 --- a/package.bak/cppunit/cppunit.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# cppunit -# -################################################################################ - -CPPUNIT_VERSION = 1.13.2 -CPPUNIT_SITE = http://dev-www.libreoffice.org/src -CPPUNIT_INSTALL_STAGING = YES -CPPUNIT_LICENSE = LGPLv2.1 -CPPUNIT_LICENSE_FILES = COPYING -CPPUNIT_CONF_OPTS = --disable-doxygen - -$(eval $(autotools-package)) diff --git a/package.bak/cppzmq/Config.in b/package.bak/cppzmq/Config.in deleted file mode 100644 index c984c15c96..0000000000 --- a/package.bak/cppzmq/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_CPPZMQ - bool "cppzmq" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - select BR2_PACKAGE_ZEROMQ - help - C++ binding for zeromq (ZeroMQ, 0MQ, zmq). - - http://github.com/zeromq/cppzmq - -comment "cppzmq needs a toolchain w/ C++, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/cppzmq/cppzmq.hash b/package.bak/cppzmq/cppzmq.hash deleted file mode 100644 index 792fb17b2f..0000000000 --- a/package.bak/cppzmq/cppzmq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 812b47f76c609e194b2607a186ff0d1b03b6a0c8ea13b20faa47570ddf38ef2c cppzmq-68a7b09cfce01c4c279fba2cf91686fcfc566848.tar.gz diff --git a/package.bak/cppzmq/cppzmq.mk b/package.bak/cppzmq/cppzmq.mk deleted file mode 100644 index 113b9a070e..0000000000 --- a/package.bak/cppzmq/cppzmq.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# cppzmq -# -################################################################################ - -CPPZMQ_VERSION = 68a7b09cfce01c4c279fba2cf91686fcfc566848 -CPPZMQ_SITE = $(call github,zeromq,cppzmq,$(CPPZMQ_VERSION)) -CPPZMQ_INSTALL_STAGING = YES -CPPZMQ_DEPENDENCIES = zeromq -CPPZMQ_LICENSE = MIT -CPPZMQ_LICENSE_FILES = LICENSE - -define CPPZMQ_INSTALL_STAGING_CMDS - $(INSTALL) -m 0644 -D $(@D)/zmq.hpp $(STAGING_DIR)/usr/include/zmq.hpp -endef - -$(eval $(generic-package)) diff --git a/package.bak/cpuload/Config.in b/package.bak/cpuload/Config.in deleted file mode 100644 index 82bc450afa..0000000000 --- a/package.bak/cpuload/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_CPULOAD - bool "cpuload" - help - cpuload is a simple tool to obtain intuitive vision of CPU load - (including total, user, system, irq and softirq) within a certain - time, which is especially useful for embedded system without GUI. - - https://github.com/kelvincheung/cpuload diff --git a/package.bak/cpuload/cpuload.hash b/package.bak/cpuload/cpuload.hash deleted file mode 100644 index 02861ffa95..0000000000 --- a/package.bak/cpuload/cpuload.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1d61f4776dc3e2746343d68b2ea2faf138e54666b630a6060df4f3945badbcae cpuload-v0.3.tar.gz diff --git a/package.bak/cpuload/cpuload.mk b/package.bak/cpuload/cpuload.mk deleted file mode 100644 index 30c3db6a53..0000000000 --- a/package.bak/cpuload/cpuload.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# cpuload -# -################################################################################ - -CPULOAD_VERSION = v0.3 -CPULOAD_SITE = $(call github,kelvincheung,cpuload,$(CPULOAD_VERSION)) -CPULOAD_LICENSE = GPLv2 -CPULOAD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/cramfs/0001-endian.patch b/package.bak/cramfs/0001-endian.patch deleted file mode 100644 index b2eda5a1db..0000000000 --- a/package.bak/cramfs/0001-endian.patch +++ /dev/null @@ -1,288 +0,0 @@ -Index: cramfs-1.1/mkcramfs.c -=================================================================== ---- cramfs-1.1.orig/mkcramfs.c 2002-02-20 09:03:32.000000000 +0100 -+++ cramfs-1.1/mkcramfs.c 2011-09-09 15:11:00.980895119 +0200 -@@ -93,6 +93,7 @@ - static int opt_verbose = 0; - static char *opt_image = NULL; - static char *opt_name = NULL; -+static int swap_endian = 0; - - static int warn_dev, warn_gid, warn_namelen, warn_skip, warn_size, warn_uid; - -@@ -130,6 +131,8 @@ - " -i file insert a file image into the filesystem (requires >= 2.4.0)\n" - " -n name set name of cramfs filesystem\n" - " -p pad by %d bytes for boot code\n" -+ " -l litte endian filesystem\n" -+ " -b big endian filesystem\n" - " -s sort directory entries (old option, ignored)\n" - " -v be more verbose\n" - " -z make explicit holes (requires >= 2.3.39)\n" -@@ -372,6 +375,50 @@ - return totalsize; - } - -+/* routines to swap endianness/bitfields in inode/superblock block data */ -+static void fix_inode(struct cramfs_inode *inode) -+{ -+#define wswap(x) (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24)) -+ /* attempt #2 */ -+ inode->mode = (inode->mode >> 8) | ((inode->mode&0xff)<<8); -+ inode->uid = (inode->uid >> 8) | ((inode->uid&0xff)<<8); -+ inode->size = (inode->size >> 16) | (inode->size&0xff00) | -+ ((inode->size&0xff)<<16); -+ ((u32*)inode)[2] = wswap(inode->offset | (inode->namelen<<26)); -+} -+ -+static void fix_offset(struct cramfs_inode *inode, u32 offset) -+{ -+ u32 tmp = wswap(((u32*)inode)[2]); -+ ((u32*)inode)[2] = wswap((offset >> 2) | (tmp&0xfc000000)); -+} -+ -+static void fix_block_pointer(u32 *p) -+{ -+ *p = wswap(*p); -+} -+ -+static void fix_super(struct cramfs_super *super) -+{ -+ u32 *p = (u32*)super; -+ -+ /* fix superblock fields */ -+ p[0] = wswap(p[0]); /* magic */ -+ p[1] = wswap(p[1]); /* size */ -+ p[2] = wswap(p[2]); /* flags */ -+ p[3] = wswap(p[3]); /* future */ -+ -+ /* fix filesystem info fields */ -+ p = (u32*)&super->fsid; -+ p[0] = wswap(p[0]); /* crc */ -+ p[1] = wswap(p[1]); /* edition */ -+ p[2] = wswap(p[2]); /* blocks */ -+ p[3] = wswap(p[3]); /* files */ -+ -+ fix_inode(&super->root); -+#undef wswap -+} -+ - /* Returns sizeof(struct cramfs_super), which includes the root inode. */ - static unsigned int write_superblock(struct entry *root, char *base, int size) - { -@@ -405,6 +452,7 @@ - super->root.gid = root->gid; - super->root.size = root->size; - super->root.offset = offset >> 2; -+ if (swap_endian) fix_super(super); - - return offset; - } -@@ -419,7 +467,10 @@ - if (offset >= (1 << (2 + CRAMFS_OFFSET_WIDTH))) { - die(MKFS_ERROR, 0, "filesystem too big"); - } -- inode->offset = (offset >> 2); -+ if (swap_endian) -+ fix_offset(inode, offset); -+ else -+ inode->offset = (offset >> 2); - } - - /* -@@ -515,6 +566,7 @@ - stack_entries++; - } - entry = entry->next; -+ if (swap_endian) fix_inode(inode); - } - - /* -@@ -609,6 +661,7 @@ - } - - *(u32 *) (base + offset) = curr; -+ if (swap_endian) fix_block_pointer((u32*)(base + offset)); - offset += 4; - } while (size); - -@@ -699,7 +752,7 @@ - progname = argv[0]; - - /* command line options */ -- while ((c = getopt(argc, argv, "hEe:i:n:psvz")) != EOF) { -+ while ((c = getopt(argc, argv, "hEe:i:n:psvzlb")) != EOF) { - switch (c) { - case 'h': - usage(MKFS_OK); -@@ -727,6 +780,18 @@ - opt_pad = PAD_SIZE; - fslen_ub += PAD_SIZE; - break; -+ case 'b': -+#if __BYTE_ORDER == __LITTLE_ENDIAN -+ swap_endian = 1; -+ printf("Swapping filesystem endian-ness\n"); -+#endif -+ break; -+ case 'l': -+#if __BYTE_ORDER == __BIG_ENDIAN -+ swap_endian = 1; -+ printf("Swapping filesystem endian-ness\n"); -+#endif -+ break; - case 's': - /* old option, ignored */ - break; -Index: cramfs-1.1/cramfsck.c -=================================================================== ---- cramfs-1.1.orig/cramfsck.c 2002-02-23 01:00:42.000000000 +0100 -+++ cramfs-1.1/cramfsck.c 2011-09-09 15:10:06.810894275 +0200 -@@ -30,6 +30,7 @@ - * 2000/07/15: Daniel Quinlan (initial support for block devices) - * 2002/01/10: Daniel Quinlan (additional checks, test more return codes, - * use read if mmap fails, standardize messages) -+ * 2004/09/01: Alfonso Acosta (Add swapping support) - */ - - /* compile-time options */ -@@ -53,6 +54,7 @@ - #define _LINUX_STRING_H_ - #include - #include -+#include - #include - - /* Exit codes used by fsck-type programs */ -@@ -73,6 +75,7 @@ - static char *filename; /* ROM image filename */ - struct cramfs_super super; /* just find the cramfs superblock once */ - static int opt_verbose = 0; /* 1 = verbose (-v), 2+ = very verbose (-vv) */ -+static int need_swapping = 0; /* fs and host dont have the same endianness */ - #ifdef INCLUDE_FS_TESTS - static int opt_extract = 0; /* extract cramfs (-x) */ - static char *extract_dir = "root"; /* extraction directory (-x) */ -@@ -84,6 +87,9 @@ - static unsigned long start_data = ~0UL; /* start of the data (256 MB = max) */ - static unsigned long end_data = 0; /* end of the data */ - -+/* access 32 byte variables */ -+#define CRAMFS_32(x) (need_swapping ? bswap_32(x) : x) -+ - /* Guarantee access to at least 8kB at a time */ - #define ROMBUFFER_BITS 13 - #define ROMBUFFERSIZE (1 << ROMBUFFER_BITS) -@@ -165,20 +171,34 @@ - if (super.magic == CRAMFS_MAGIC) { - *start = 0; - } -+ else if (super.magic == bswap_32(CRAMFS_MAGIC)) { -+ *start = 0; -+ need_swapping = 1; -+ } -+ - else if (*length >= (PAD_SIZE + sizeof(super))) { - lseek(fd, PAD_SIZE, SEEK_SET); - if (read(fd, &super, sizeof(super)) != sizeof(super)) { - die(FSCK_ERROR, 1, "read failed: %s", filename); - } -- if (super.magic == CRAMFS_MAGIC) { -+ if (super.magic == CRAMFS_32(CRAMFS_MAGIC)) { - *start = PAD_SIZE; - } - } - - /* superblock tests */ -- if (super.magic != CRAMFS_MAGIC) { -+ if (super.magic != CRAMFS_32(CRAMFS_MAGIC)) { - die(FSCK_UNCORRECTED, 0, "superblock magic not found"); - } -+ if (need_swapping){ -+ super.size = bswap_32(super.size); -+ super.flags = bswap_32(super.flags); -+ super.future = bswap_32(super.future); -+ super.fsid.crc = bswap_32(super.fsid.crc); -+ super.fsid.edition = bswap_32(super.fsid.edition); -+ super.fsid.blocks = bswap_32(super.fsid.blocks); -+ super.fsid.files = bswap_32(super.fsid.files); -+ } - if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) { - die(FSCK_ERROR, 0, "unsupported filesystem features"); - } -@@ -213,7 +233,10 @@ - die(FSCK_USAGE, 0, "unable to test CRC: old cramfs format"); - #endif /* not INCLUDE_FS_TESTS */ - } -- -+ else if (need_swapping) { -+ /* crc checking in this case would mean translating the whole file */ -+ return; -+ } - crc = crc32(0L, Z_NULL, 0); - - buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); -@@ -298,12 +321,23 @@ - - static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i) - { -+#define wswap(x) (((x)>>24) | (((x)>>8)&0xff00) | (((x)&0xff00)<<8) | (((x)&0xff)<<24)) - struct cramfs_inode *inode = malloc(sizeof(struct cramfs_inode)); - - if (!inode) { - die(FSCK_ERROR, 1, "malloc failed"); - } -- *inode = *i; -+ if(!need_swapping) { -+ *inode = *i; -+ } -+ else { -+ inode->mode=bswap_16(i->mode); -+ inode->uid=bswap_16(i->uid); -+ inode->size=bswap_32(i->size << 8); -+ inode->gid=i->gid; -+ inode->namelen = bswap_32(((u32*)i)[2]) >> 26; -+ inode->offset = bswap_32(((u32*)i)[2]) & 0x3FFFFFFF; -+ } - return inode; - } - -@@ -322,9 +356,9 @@ - */ - static struct cramfs_inode *read_super(void) - { -- unsigned long offset = super.root.offset << 2; -- -- if (!S_ISDIR(super.root.mode)) -+ struct cramfs_inode *root = cramfs_iget(&super.root); -+ unsigned long offset = root->offset << 2; -+ if (!S_ISDIR(root->mode)) - die(FSCK_UNCORRECTED, 0, "root inode is not directory"); - if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) && - ((offset != sizeof(struct cramfs_super)) && -@@ -332,7 +366,7 @@ - { - die(FSCK_UNCORRECTED, 0, "bad root offset (%lu)", offset); - } -- return cramfs_iget(&super.root); -+ return root; - } - - static int uncompress_block(void *src, int len) -@@ -364,7 +398,7 @@ - - do { - unsigned long out = PAGE_CACHE_SIZE; -- unsigned long next = *(u32 *) romfs_read(offset); -+ unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset)); - - if (next > end_data) { - end_data = next; -@@ -525,7 +559,7 @@ - { - unsigned long offset = i->offset << 2; - unsigned long curr = offset + 4; -- unsigned long next = *(u32 *) romfs_read(offset); -+ unsigned long next = CRAMFS_32(*(u32 *) romfs_read(offset)); - unsigned long size; - - if (offset == 0) { diff --git a/package.bak/cramfs/0002-cygwin_IO.patch b/package.bak/cramfs/0002-cygwin_IO.patch deleted file mode 100644 index 8be333f01b..0000000000 --- a/package.bak/cramfs/0002-cygwin_IO.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: cramfs-1.1/cramfsck.c -=================================================================== ---- cramfs-1.1.orig/cramfsck.c 2011-09-09 15:10:06.000000000 +0200 -+++ cramfs-1.1/cramfsck.c 2011-09-09 15:13:49.950897747 +0200 -@@ -57,6 +57,10 @@ - #include - #include - -+#ifdef __CYGWIN__ -+#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0) -+#endif /* __CYGWIN__ */ -+ - /* Exit codes used by fsck-type programs */ - #define FSCK_OK 0 /* No errors */ - #define FSCK_NONDESTRUCT 1 /* File system errors corrected */ diff --git a/package.bak/cramfs/0003-fix-missing-types.patch b/package.bak/cramfs/0003-fix-missing-types.patch deleted file mode 100644 index 896110011e..0000000000 --- a/package.bak/cramfs/0003-fix-missing-types.patch +++ /dev/null @@ -1,17 +0,0 @@ -mkcramfs; loff_t is guarded by _GNU_SOURCE - -Although already properly done in cramfsck, it was missing in mkcramfs. - -Signed-off-by: "Yann E. MORIN" - -diff -durN cramfs-1.1.orig/mkcramfs.c cramfs-1.1/mkcramfs.c ---- cramfs-1.1.orig/mkcramfs.c 2015-08-05 22:31:16.830543096 +0200 -+++ cramfs-1.1/mkcramfs.c 2015-08-05 22:33:33.136289744 +0200 -@@ -22,6 +22,7 @@ - * If you change the disk format of cramfs, please update fs/cramfs/README. - */ - -+#define _GNU_SOURCE - #include - #include - #include diff --git a/package.bak/cramfs/Config.in b/package.bak/cramfs/Config.in deleted file mode 100644 index b2a0c6c516..0000000000 --- a/package.bak/cramfs/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_CRAMFS - bool "cramfs" - select BR2_PACKAGE_ZLIB - help - cramfs is a compressed read-only filesystem. This package - contains the tools to generate and check a cramfs filesystem. - - http://sourceforge.net/projects/cramfs/ diff --git a/package.bak/cramfs/Config.in.host b/package.bak/cramfs/Config.in.host deleted file mode 100644 index 53b43d4420..0000000000 --- a/package.bak/cramfs/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_CRAMFS - bool "host cramfs" - help - cramfs is a compressed read-only filesystem. This package - contains the tools to generate and check a cramfs filesystem. - - http://sourceforge.net/projects/cramfs/ diff --git a/package.bak/cramfs/cramfs.hash b/package.bak/cramfs/cramfs.hash deleted file mode 100644 index b8c5f5fbcb..0000000000 --- a/package.bak/cramfs/cramfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 133caca2c4e7c64106555154ee0ff693f5cf5beb9421ce2eb86baee997d22368 cramfs-1.1.tar.gz diff --git a/package.bak/cramfs/cramfs.mk b/package.bak/cramfs/cramfs.mk deleted file mode 100644 index 3cbe2744e6..0000000000 --- a/package.bak/cramfs/cramfs.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# cramfs -# -################################################################################ - -CRAMFS_VERSION = 1.1 -CRAMFS_SITE = http://downloads.sourceforge.net/project/cramfs/cramfs/$(CRAMFS_VERSION) -CRAMFS_LICENSE = GPLv2+ -CRAMFS_LICENSE_FILES = COPYING - -CRAMFS_DEPENDENCIES = zlib -HOST_CRAMFS_DEPENDENCIES = host-zlib - -define CRAMFS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) -endef - -define CRAMFS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/mkcramfs $(TARGET_DIR)/usr/bin/mkcramfs - $(INSTALL) -D -m 755 $(@D)/cramfsck $(TARGET_DIR)/usr/bin/cramfsck -endef - -define HOST_CRAMFS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) CFLAGS="$(HOST_CFLAGS) -Wall -O2 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) -endef - -define HOST_CRAMFS_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/mkcramfs $(HOST_DIR)/usr/bin/mkcramfs - $(INSTALL) -D -m 755 $(@D)/cramfsck $(HOST_DIR)/usr/bin/cramfsck -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch b/package.bak/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch deleted file mode 100644 index 99eb11cba7..0000000000 --- a/package.bak/crda/0001-crda-support-python-3-in-utils-key2pub.py.patch +++ /dev/null @@ -1,271 +0,0 @@ -From 797f2836c48f9ba2446629ae4b6867ca1a5ea512 Mon Sep 17 00:00:00 2001 -From: Taahir Ahmed -Date: Wed, 30 Mar 2016 11:23:54 -0300 -Subject: [PATCH 1/2] crda: support python 3 in utils/key2pub.py - -utils/key2pub.py can now be run under either python 2.7 or python 3.x. -This required some minor syntactical changes as well as switching from -M2Crypto to pycrypto, since M2Crypto doesn't support python 3.x. - -In addition, some errors in the generated source file keys-ssl.h are -fixed: - - * The correct OpenSSL header for BN_ULONG is included. - - * The generated constants are given the 'ull' suffix to prevent - warnings about constants that are too large. - -[Gustavo: don't call /utils/key2pub.py since that doesn't compute] - -Signed-off-by: Gustavo Zacarias ---- -Status: submitted upstream by author but not (yet) accepted -URL: http://www.spinics.net/lists/linux-wireless/msg138936.html - - Makefile | 2 +- - utils/key2pub.py | 146 ++++++++++++++++++++++++++++--------------------------- - 2 files changed, 75 insertions(+), 73 deletions(-) - -diff --git a/Makefile b/Makefile -index 1f25509..523a96e 100644 ---- a/Makefile -+++ b/Makefile -@@ -112,7 +112,7 @@ $(REG_BIN): - keys-%.c: utils/key2pub.py $(wildcard $(PUBKEY_DIR)/*.pem) - $(NQ) ' GEN ' $@ - $(NQ) ' Trusted pubkeys:' $(wildcard $(PUBKEY_DIR)/*.pem) -- $(Q)./utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ -+ $(Q) python utils/key2pub.py --$* $(wildcard $(PUBKEY_DIR)/*.pem) $@ - - $(LIBREG): regdb.h reglib.h reglib.c - $(NQ) ' CC ' $@ -diff --git a/utils/key2pub.py b/utils/key2pub.py -index 3e84cd2..c76cbbb 100755 ---- a/utils/key2pub.py -+++ b/utils/key2pub.py -@@ -1,126 +1,128 @@ - #!/usr/bin/env python - -+import io - import sys - try: -- from M2Crypto import RSA --except ImportError, e: -- sys.stderr.write('ERROR: Failed to import the "M2Crypto" module: %s\n' % e.message) -- sys.stderr.write('Please install the "M2Crypto" Python module.\n') -- sys.stderr.write('On Debian GNU/Linux the package is called "python-m2crypto".\n') -- sys.exit(1) -+ from Crypto.PublicKey import RSA -+except ImportError as e: -+ sys.stderr.write('ERROR: Failed to import the "Crypto.PublicKey" module: %s\n' % e.message) -+ sys.stderr.write('Please install the "Crypto.PublicKey" Python module.\n') -+ sys.stderr.write('On Debian GNU/Linux the package is called "python-crypto".\n') -+ sys.exit(1) -+ -+def bitwise_collect(value, radix_bits): -+ words = [] -+ radix_mask = (1 << radix_bits) - 1 -+ while value != 0: -+ words.append(value & radix_mask) -+ value >>= radix_bits -+ return words - - def print_ssl_64(output, name, val): -- while val[0] == '\0': -- val = val[1:] -- while len(val) % 8: -- val = '\0' + val -- vnew = [] -- while len(val): -- vnew.append((val[0], val[1], val[2], val[3], val[4], val[5], val[6], val[7])) -- val = val[8:] -- vnew.reverse() -- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -+ # OpenSSL expects 64-bit words given least-significant-word first. -+ vwords = bitwise_collect(val, 64) -+ -+ output.write(u'static BN_ULONG {}[] = {{\n'.format(name)) - idx = 0 -- for v1, v2, v3, v4, v5, v6, v7, v8 in vnew: -+ for vword in vwords: - if not idx: -- output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4), ord(v5), ord(v6), ord(v7), ord(v8))) -+ output.write(u'\t') -+ output.write(u'0x{:016x}ULL, '.format(vword)) - idx += 1 - if idx == 2: - idx = 0 -- output.write('\n') -+ output.write(u'\n') - if idx: -- output.write('\n') -- output.write('};\n\n') -+ output.write(u'\n') -+ output.write(u'};\n\n') - - def print_ssl_32(output, name, val): -- while val[0] == '\0': -- val = val[1:] -- while len(val) % 4: -- val = '\0' + val -- vnew = [] -- while len(val): -- vnew.append((val[0], val[1], val[2], val[3], )) -- val = val[4:] -- vnew.reverse() -- output.write('static BN_ULONG %s[%d] = {\n' % (name, len(vnew))) -+ # OpenSSL expects 32-bit words given least-significant-word first. -+ vwords = bitwise_collect(val, 32) -+ -+ output.write(u'static BN_ULONG {}[] = {{\n'.format(name)) - idx = 0 -- for v1, v2, v3, v4 in vnew: -+ for vword in vwords: - if not idx: -- output.write('\t') -- output.write('0x%.2x%.2x%.2x%.2x, ' % (ord(v1), ord(v2), ord(v3), ord(v4))) -+ output.write(u'\t') -+ output.write(u'0x{:08x}, '.format(vword)) - idx += 1 - if idx == 4: - idx = 0 -- output.write('\n') -+ output.write(u'\n') - if idx: -- output.write('\n') -- output.write('};\n\n') -+ output.write(u'\n') -+ output.write(u'};\n\n') - - def print_ssl(output, name, val): -+ -+ output.write(u'#include \n') -+ output.write(u'#include \n') -+ - import struct -- output.write('#include \n') - if len(struct.pack('@L', 0)) == 8: - return print_ssl_64(output, name, val) - else: - return print_ssl_32(output, name, val) - - def print_ssl_keys(output, n): -- output.write(r''' -+ output.write(u''' - struct pubkey { - struct bignum_st e, n; - }; - --#define KEY(data) { \ -- .d = data, \ -- .top = sizeof(data)/sizeof(data[0]), \ -+#define KEY(data) { \\ -+ .d = data, \\ -+ .top = sizeof(data)/sizeof(data[0]), \\ - } - --#define KEYS(e,n) { KEY(e), KEY(n), } -+#define KEYS(e,n) { KEY(e), KEY(n), } - - static struct pubkey keys[] = { - ''') - for n in xrange(n + 1): -- output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) -- output.write('};\n') -+ output.write(u' KEYS(e_{0}, n_{0}),\n'.format(n)) -+ output.write(u'};\n') - pass - - def print_gcrypt(output, name, val): -- output.write('#include \n') -- while val[0] == '\0': -- val = val[1:] -- output.write('static const uint8_t %s[%d] = {\n' % (name, len(val))) -+ # gcrypt expects 8-bit words most-significant-word first -+ vwords = bitwise_collect(val, 8) -+ vwords.reverse() -+ -+ output.write(u'#include \n') -+ output.write(u'static const uint8_t %s[%d] = {\n' % (name, len(vwords))) - idx = 0 -- for v in val: -+ for vword in vwords: - if not idx: -- output.write('\t') -- output.write('0x%.2x, ' % ord(v)) -+ output.write(u'\t') -+ output.write(u'0x{:02x}, '.format(vword)) - idx += 1 - if idx == 8: - idx = 0 -- output.write('\n') -+ output.write(u'\n') - if idx: -- output.write('\n') -- output.write('};\n\n') -+ output.write(u'\n') -+ output.write(u'};\n\n') - - def print_gcrypt_keys(output, n): -- output.write(r''' -+ output.write(u''' - struct key_params { - const uint8_t *e, *n; - uint32_t len_e, len_n; - }; - --#define KEYS(_e, _n) { \ -- .e = _e, .len_e = sizeof(_e), \ -- .n = _n, .len_n = sizeof(_n), \ -+#define KEYS(_e, _n) { \\ -+ .e = _e, .len_e = sizeof(_e), \\ -+ .n = _n, .len_n = sizeof(_n), \\ - } - - static const struct key_params keys[] = { - ''') -- for n in xrange(n + 1): -- output.write(' KEYS(e_%d, n_%d),\n' % (n, n)) -- output.write('};\n') -- -+ for n in range(n + 1): -+ output.write(u' KEYS(e_{0}, n_{0}),\n'.format(n)) -+ output.write(u'};\n') -+ - - modes = { - '--ssl': (print_ssl, print_ssl_keys), -@@ -135,21 +137,21 @@ except IndexError: - mode = None - - if not mode in modes: -- print 'Usage: %s [%s] input-file... output-file' % (sys.argv[0], '|'.join(modes.keys())) -+ print('Usage: {} [{}] input-file... output-file'.format(sys.argv[0], '|'.join(modes.keys()))) - sys.exit(2) - --output = open(outfile, 'w') -+output = io.open(outfile, 'w') - - # load key - idx = 0 - for f in files: -- try: -- key = RSA.load_pub_key(f) -- except RSA.RSAError: -- key = RSA.load_key(f) - -- modes[mode][0](output, 'e_%d' % idx, key.e[4:]) -- modes[mode][0](output, 'n_%d' % idx, key.n[4:]) -+ key_contents = io.open(f, 'rb').read() -+ key = RSA.importKey(key_contents) -+ -+ modes[mode][0](output, 'e_{}'.format(idx), key.e) -+ modes[mode][0](output, 'n_{}'.format(idx), key.n) -+ - idx += 1 - - modes[mode][1](output, idx - 1) --- -2.7.3 - diff --git a/package.bak/crda/0002-drop-ldconfig-call.patch b/package.bak/crda/0002-drop-ldconfig-call.patch deleted file mode 100644 index f09e258adb..0000000000 --- a/package.bak/crda/0002-drop-ldconfig-call.patch +++ /dev/null @@ -1,15 +0,0 @@ -Drop ldconfig call, it's useless for cross-compiling. - -Signed-off-by: Gustavo Zacarias - -diff -Nura crda-3.18.orig/Makefile crda-3.18/Makefile ---- crda-3.18.orig/Makefile 2015-02-18 10:34:23.841259401 -0300 -+++ crda-3.18/Makefile 2015-02-18 10:35:10.524201452 -0300 -@@ -127,7 +127,6 @@ - $(NQ) ' INSTALL libreg' - $(Q)mkdir -p $(DESTDIR)/$(LIBDIR) - $(Q)cp $(LIBREG) $(DESTDIR)/$(LIBDIR)/ -- $(Q)ldconfig - - %.o: %.c regdb.h $(LIBREG) - $(NQ) ' CC ' $@ diff --git a/package.bak/crda/0003-drop-werror.patch b/package.bak/crda/0003-drop-werror.patch deleted file mode 100644 index 072e3fc46e..0000000000 --- a/package.bak/crda/0003-drop-werror.patch +++ /dev/null @@ -1,37 +0,0 @@ -From f38253e066dee96b148be1b79a6b4a696ee0ae0b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 1 May 2016 10:05:48 +0200 -Subject: [PATCH] drop werror -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building crda with GCC 6 fails because of all compiler warnings are treated as -errors. Disable the compiler option '-Werror': - -keys-gcrypt.c:94:32: error: ‘keys’ defined but not used [-Werror=unused-const-variable=] - static const struct key_params keys[] = { - ^~~~ -cc1: all warnings being treated as errors - -Signed-off-by: Jörg Krause ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 74f1172..e9b417f 100644 ---- a/Makefile -+++ b/Makefile -@@ -26,7 +26,7 @@ PUBKEY_DIR?=pubkeys - RUNTIME_PUBKEY_DIR?=/etc/wireless-regdb/pubkeys - - CFLAGS += -O2 -fpic --CFLAGS += -std=gnu99 -Wall -Werror -pedantic -+CFLAGS += -std=gnu99 -Wall -pedantic - CFLAGS += -Wall -g - LDLIBREG += -lreg - LDLIBS += $(LDLIBREG) --- -2.8.2 - diff --git a/package.bak/crda/Config.in b/package.bak/crda/Config.in deleted file mode 100644 index 2cb040372f..0000000000 --- a/package.bak/crda/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_CRDA - bool "crda" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBNL - # regdb is a runtime dependency - select BR2_PACKAGE_WIRELESS_REGDB - help - Central Regulatory Domain Agent. - - This package provides a Central Regulatory Domain Agent (CRDA) - to be used by the Linux kernel cf80211 wireless subsystem to - query and apply the regulatory domain settings wireless devices - may operate within for a given location. - - http://linuxwireless.org/en/developers/Regulatory/CRDA - -comment "crda needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/crda/crda.hash b/package.bak/crda/crda.hash deleted file mode 100644 index 45b9d20407..0000000000 --- a/package.bak/crda/crda.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/network/crda/sha256sums.asc -sha256 43fcb9679f8b75ed87ad10944a506292def13e4afb194afa7aa921b01e8ecdbf crda-3.18.tar.xz diff --git a/package.bak/crda/crda.mk b/package.bak/crda/crda.mk deleted file mode 100644 index df879f68bb..0000000000 --- a/package.bak/crda/crda.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# crda -# -################################################################################ - -CRDA_VERSION = 3.18 -CRDA_SOURCE = crda-$(CRDA_VERSION).tar.xz -CRDA_SITE = $(BR2_KERNEL_MIRROR)/software/network/crda -CRDA_DEPENDENCIES = host-pkgconf host-python-pycrypto libnl libgcrypt -CRDA_LICENSE = ISC -CRDA_LICENSE_FILES = LICENSE - -define CRDA_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) all_noverify -C $(@D) -endef - -define CRDA_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/crudini/Config.in b/package.bak/crudini/Config.in deleted file mode 100644 index e4e26e52da..0000000000 --- a/package.bak/crudini/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_CRUDINI - bool "crudini" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_INIPARSE # runtime - help - A utility for handling ini files from the command line and - shell scripts - - https://pypi.python.org/pypi/crudini diff --git a/package.bak/crudini/crudini.hash b/package.bak/crudini/crudini.hash deleted file mode 100644 index 2796e7a8c6..0000000000 --- a/package.bak/crudini/crudini.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0664fa2f9d36e411e839b5394d8c2951, sha256 locally computed -md5 0664fa2f9d36e411e839b5394d8c2951 crudini-0.8.tar.gz -sha256 effdf8feb7efe252af87143c8756bbc69e2679afb6173083d38be02284385e5f crudini-0.8.tar.gz diff --git a/package.bak/crudini/crudini.mk b/package.bak/crudini/crudini.mk deleted file mode 100644 index 501c9e01fb..0000000000 --- a/package.bak/crudini/crudini.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# crudini -# -################################################################################ - -CRUDINI_VERSION = 0.8 -CRUDINI_SITE = https://pypi.python.org/packages/23/4a/934b05bbe5af4fd390207c5e935efbae6439809aad65ab0702e236c1b5f5 -CRUDINI_SETUP_TYPE = setuptools -CRUDINI_LICENSE = GPLv2 -CRUDINI_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/package.bak/cryptodev-linux/cryptodev-linux.hash b/package.bak/cryptodev-linux/cryptodev-linux.hash deleted file mode 100644 index 6d9efcae91..0000000000 --- a/package.bak/cryptodev-linux/cryptodev-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a87e354e1218e6a2e3083f7be6a3e351c42ec55515f1aff1b50bd301cee7d8dd cryptodev-linux-2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8.tar.gz diff --git a/package.bak/cryptodev-linux/cryptodev-linux.mk b/package.bak/cryptodev-linux/cryptodev-linux.mk deleted file mode 100644 index 709c6ed021..0000000000 --- a/package.bak/cryptodev-linux/cryptodev-linux.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# cryptodev-linux -# -################################################################################ - -CRYPTODEV_LINUX_VERSION = 2b29be8ac41414ed19cb4f5d5626d9bd0d7b11a8 -CRYPTODEV_LINUX_SITE = $(call github,cryptodev-linux,cryptodev-linux,$(CRYPTODEV_LINUX_VERSION)) -CRYPTODEV_LINUX_INSTALL_STAGING = YES -CRYPTODEV_LINUX_LICENSE = GPLv2+ -CRYPTODEV_LINUX_LICENSE_FILES = COPYING - -CRYPTODEV_LINUX_PROVIDES = cryptodev - -define CRYPTODEV_LINUX_MODULE_GEN_VERSION_H - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) version.h -endef -CRYPTODEV_LINUX_PRE_BUILD_HOOKS += CRYPTODEV_LINUX_MODULE_GEN_VERSION_H - -define CRYPTODEV_LINUX_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/crypto/cryptodev.h \ - $(STAGING_DIR)/usr/include/crypto/cryptodev.h -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/cryptodev/Config.in b/package.bak/cryptodev/Config.in deleted file mode 100644 index 9f9df02fc3..0000000000 --- a/package.bak/cryptodev/Config.in +++ /dev/null @@ -1,50 +0,0 @@ -comment "cryptodev needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_CRYPTODEV - bool "cryptodev" - depends on BR2_LINUX_KERNEL - help - Select the desired cryptodev implementation. - -if BR2_PACKAGE_CRYPTODEV - -choice - prompt "cryptodev variant" - default BR2_PACKAGE_CRYPTODEV_LINUX if !BR2_microblaze - help - Select the cryptodev implementation. - -config BR2_PACKAGE_CRYPTODEV_LINUX - bool "cryptodev-linux" - depends on !BR2_microblaze - select BR2_PACKAGE_HAS_CRYPTODEV - help - Cryptodev-linux is a device that allows access to Linux kernel - cryptographic drivers; thus allowing userspace applications - to take advantage of hardware accelerators. - - http://cryptodev-linux.org/index.html - -config BR2_PACKAGE_OCF_LINUX - bool "ocf-linux" - select BR2_PACKAGE_HAS_CRYPTODEV - help - OCF-Linux is a Linux port of the OpenBSD/FreeBSD Cryptographic - Framework (OCF). This port aims to bring full asynchronous HW/SW - crypto acceleration to the Linux kernel and applications - running under Linux. - - http://ocf-linux.sourceforge.net/ - -endchoice - -config BR2_PACKAGE_HAS_CRYPTODEV - bool - -config BR2_PACKAGE_PROVIDES_CRYPTODEV - string - default "cryptodev-linux" if BR2_PACKAGE_CRYPTODEV_LINUX - default "ocf-linux" if BR2_PACKAGE_OCF_LINUX - -endif diff --git a/package.bak/cryptodev/cryptodev.mk b/package.bak/cryptodev/cryptodev.mk deleted file mode 100644 index 969d1bd17a..0000000000 --- a/package.bak/cryptodev/cryptodev.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# cryptodev -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch b/package.bak/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch deleted file mode 100644 index 2d0f1d91da..0000000000 --- a/package.bak/cryptopp/0001-Fix-possible-DoS-in-ASN.1-decoders-CVE-2016-9939.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 3d9181d7bdd8e491f745dbc9e34bd20b6f6da069 Mon Sep 17 00:00:00 2001 -From: Gergely Nagy -Date: Wed, 14 Dec 2016 13:19:01 +0100 -Subject: [PATCH] Fix possible DoS in ASN.1 decoders (CVE-2016-9939) - -Signed-off-by: Peter Korsgaard ---- - asn.cpp | 10 ++++++++++ - asn.h | 2 ++ - 2 files changed, 12 insertions(+) - -diff --git a/asn.cpp b/asn.cpp -index 297ff01..2e923ef 100644 ---- a/asn.cpp -+++ b/asn.cpp -@@ -123,6 +123,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, SecByteBlock &str) - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - str.New(bc); - if (bc != bt.Get(str, bc)) -@@ -139,6 +141,8 @@ size_t BERDecodeOctetString(BufferedTransformation &bt, BufferedTransformation & - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - bt.TransferTo(str, bc); - return bc; -@@ -161,6 +165,8 @@ size_t BERDecodeTextString(BufferedTransformation &bt, std::string &str, byte as - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock temp(bc); - if (bc != bt.Get(temp, bc)) -@@ -188,6 +194,10 @@ size_t BERDecodeBitString(BufferedTransformation &bt, SecByteBlock &str, unsigne - size_t bc; - if (!BERLengthDecode(bt, bc)) - BERDecodeError(); -+ if (bc == 0) -+ BERDecodeError(); -+ if (bc > bt.MaxRetrievable()) -+ BERDecodeError(); - - byte unused; - if (!bt.Get(unused)) -diff --git a/asn.h b/asn.h -index ed9de52..33f0dd0 100644 ---- a/asn.h -+++ b/asn.h -@@ -498,6 +498,8 @@ void BERDecodeUnsigned(BufferedTransformation &in, T &w, byte asnTag = INTEGER, - bool definite = BERLengthDecode(in, bc); - if (!definite) - BERDecodeError(); -+ if (bc > in.MaxRetrievable()) -+ BERDecodeError(); - - SecByteBlock buf(bc); - --- -2.10.2 - diff --git a/package.bak/cryptopp/cryptopp.hash b/package.bak/cryptopp/cryptopp.hash deleted file mode 100644 index 577638c1c9..0000000000 --- a/package.bak/cryptopp/cryptopp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 a75ef486fe3128008bbb201efee3dcdcffbe791120952910883b26337ec32c34 cryptopp565.zip diff --git a/package.bak/cryptopp/cryptopp.mk b/package.bak/cryptopp/cryptopp.mk deleted file mode 100644 index 456876c4ee..0000000000 --- a/package.bak/cryptopp/cryptopp.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# cryptopp -# -################################################################################ - -CRYPTOPP_VERSION = 5.6.5 -CRYPTOPP_SOURCE = cryptopp$(subst .,,$(CRYPTOPP_VERSION)).zip -CRYPTOPP_SITE = http://cryptopp.com/ -CRYPTOPP_LICENSE = Boost-v1.0 -CRYPTOPP_LICENSE_FILES = License.txt -CRYPTOPP_INSTALL_STAGING = YES - -define HOST_CRYPTOPP_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(CRYPTOPP_SOURCE) -d $(@D) -endef - -HOST_CRYPTOPP_MAKE_OPTS = \ - $(HOST_CONFIGURE_OPTS) \ - CXXFLAGS="$(HOST_CXXFLAGS) -fPIC" - -define HOST_CRYPTOPP_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CRYPTOPP_MAKE_OPTS) shared -endef - -define HOST_CRYPTOPP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/cryptsetup/0001-mkdir.patch b/package.bak/cryptsetup/0001-mkdir.patch deleted file mode 100644 index d4d70521ad..0000000000 --- a/package.bak/cryptsetup/0001-mkdir.patch +++ /dev/null @@ -1,18 +0,0 @@ -$(mkdir_p) is obsolete for newer automake, use $(MKDIR_P) instead. -Upstream should really gettextize with a newer version before packing up. - -[base on a similar patch from Gustavo Zacarias for Linux-PAM-1.1.7] -Signed-off-by: Axel Lin - -diff -Nura cryptsetup-1.6.3.ori/po/Makefile.in.in cryptsetup-1.6.3/po/Makefile.in.in ---- cryptsetup-1.6.3.ori/po/Makefile.in.in 2013-12-30 11:53:22.731942516 +0800 -+++ cryptsetup-1.6.3/po/Makefile.in.in 2014-01-09 09:46:13.594071188 +0800 -@@ -31,7 +31,7 @@ - INSTALL = @INSTALL@ - INSTALL_DATA = @INSTALL_DATA@ - mkinstalldirs = $(SHELL) @install_sh@ -d --mkdir_p = @mkdir_p@ -+mkdir_p = @MKDIR_P@ - - GMSGFMT_ = @GMSGFMT@ - GMSGFMT_no = @GMSGFMT@ diff --git a/package.bak/cryptsetup/Config.in b/package.bak/cryptsetup/Config.in deleted file mode 100644 index 3ca23ba721..0000000000 --- a/package.bak/cryptsetup/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_CRYPTSETUP - bool "cryptsetup" - depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - select BR2_PACKAGE_POPT - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - This tool helps manipulate dm-crypt and luks partitions for - on-disk encryption. - - https://gitlab.com/cryptsetup/cryptsetup - -comment "cryptsetup needs a glibc or uClibc toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/cryptsetup/cryptsetup.hash b/package.bak/cryptsetup/cryptsetup.hash deleted file mode 100644 index b8c0d2b4e6..0000000000 --- a/package.bak/cryptsetup/cryptsetup.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/cryptsetup/v1.7/sha256sums.asc -sha256 af2b04e8475cf40b8d9ffd97a1acfa73aa787c890430afd89804fb544d6adc02 cryptsetup-1.7.3.tar.xz diff --git a/package.bak/cryptsetup/cryptsetup.mk b/package.bak/cryptsetup/cryptsetup.mk deleted file mode 100644 index 50bf5f2aaf..0000000000 --- a/package.bak/cryptsetup/cryptsetup.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# cryptsetup -# -################################################################################ - -CRYPTSETUP_VERSION_MAJOR = 1.7 -CRYPTSETUP_VERSION = $(CRYPTSETUP_VERSION_MAJOR).3 -CRYPTSETUP_SOURCE = cryptsetup-$(CRYPTSETUP_VERSION).tar.xz -CRYPTSETUP_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/cryptsetup/v$(CRYPTSETUP_VERSION_MAJOR) -CRYPTSETUP_DEPENDENCIES = lvm2 popt util-linux host-pkgconf \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -CRYPTSETUP_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library) -CRYPTSETUP_LICENSE_FILES = COPYING COPYING.LGPL - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -CRYPTSETUP_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lintl" -endif - -# cryptsetup uses libgcrypt by default, but can be configured to use OpenSSL -# or kernel crypto modules instead -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -CRYPTSETUP_DEPENDENCIES += libgcrypt -CRYPTSETUP_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=gcrypt -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -CRYPTSETUP_DEPENDENCIES += openssl -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=openssl -else -CRYPTSETUP_CONF_OPTS += --with-crypto_backend=kernel -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ctorrent/0001-fix-musl-build.patch b/package.bak/ctorrent/0001-fix-musl-build.patch deleted file mode 100644 index 3ba80be31e..0000000000 --- a/package.bak/ctorrent/0001-fix-musl-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -[PATCH] Fix compilation on musl - -Using the ssize_t typedef requires including . - -See : https://sourceforge.net/p/dtorrent/patches/3/ - -Signed-off-by: Brendan Heading -Upstream-status: submitted ---- -diff -Nur a/compat.c b/compat.c ---- a/compat.c 2015-07-29 18:22:24.658415171 +0100 -+++ b/compat.c 2015-07-29 18:36:21.752576311 +0100 -@@ -63,6 +63,7 @@ - - #ifndef HAVE_STRNSTR - #include -+#include - /* FUNCTION PROGRAMER: Siberiaic Sang */ - char *strnstr(const char *haystack, const char *needle, size_t haystacklen) - { diff --git a/package.bak/ctorrent/Config.in b/package.bak/ctorrent/Config.in deleted file mode 100644 index 97552e7841..0000000000 --- a/package.bak/ctorrent/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -comment "ctorrent needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_CTORRENT - bool "ctorrent" - depends on BR2_INSTALL_LIBSTDCPP - help - CTorrent is a BitTorrent client implemented in C++ - to be lightweight and quick. - http://ctorrent.sourceforge.net/ - - This is the enhanced version from - http://www.rahul.net/dholmes/ctorrent/ diff --git a/package.bak/ctorrent/ctorrent.hash b/package.bak/ctorrent/ctorrent.hash deleted file mode 100644 index 6dcb590b95..0000000000 --- a/package.bak/ctorrent/ctorrent.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/dtorrent/files/dtorrent/3.3.2/ -sha1 d4e221f0292268f80e2430ce9d451dd64cf1ffaa ctorrent-dnh3.3.2.tar.gz diff --git a/package.bak/ctorrent/ctorrent.mk b/package.bak/ctorrent/ctorrent.mk deleted file mode 100644 index 55fc95e703..0000000000 --- a/package.bak/ctorrent/ctorrent.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# ctorrent -# -################################################################################ - -CTORRENT_VERSION = dnh3.3.2 -CTORRENT_SITE = http://www.rahul.net/dholmes/ctorrent -CTORRENT_LICENSE = GPLv2 -CTORRENT_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -CTORRENT_CONF_OPTS += --with-ssl=yes -CTORRENT_DEPENDENCIES += openssl -else -CTORRENT_CONF_OPTS += --with-ssl=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch b/package.bak/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch deleted file mode 100644 index 30002d3c8f..0000000000 --- a/package.bak/cups/0001-Remove-man-from-BUILDDIRS-in-configure.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 6bc1d15250841cf17d307cfb4f35c960c23d8797 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 29 May 2016 19:31:50 +0200 -Subject: [PATCH] Remove man from BUILDDIRS in configure - -Signed-off-by: Bernd Kuhls ---- - config-scripts/cups-common.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 -index fbba715..77d0f5c 100644 ---- a/config-scripts/cups-common.m4 -+++ b/config-scripts/cups-common.m4 -@@ -446,7 +446,7 @@ AC_ARG_WITH(components, [ --with-components set components to build: - - case "$COMPONENTS" in - all) -- BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates" -+ BUILDDIRS="filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale doc examples templates" - ;; - - core) --- -2.8.1 - diff --git a/package.bak/cups/0002-Do-not-use-genstrings.patch b/package.bak/cups/0002-Do-not-use-genstrings.patch deleted file mode 100644 index 325483ea8f..0000000000 --- a/package.bak/cups/0002-Do-not-use-genstrings.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 193c8d8c55a3478ca5c9e161ce581e5794098c6d Mon Sep 17 00:00:00 2001 -From: Olivier Schonken -Date: Thu, 21 Jan 2016 23:04:49 +0100 -Subject: [PATCH] Do not use genstrings - -Using cross compiled genstrings while cross-compiling will break -compilation. Genstrings is still compiled because some power users -might want to do ppd compilation on their target machine, and for that -they would need to use the native compiled genstrings binary, to -generate a sample.c file for their target - -Signed-off-by: Olivier Schonken -[Thomas: completely remove call to genstrings rather than commenting -it, remove useless and potentially confusing 'echo' before the -genstrings call.] -Signed-off-by: Thomas Petazzoni ---- - ppdc/Makefile | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/ppdc/Makefile b/ppdc/Makefile -index 68bf6b2..d57a0c9 100644 ---- a/ppdc/Makefile -+++ b/ppdc/Makefile -@@ -242,8 +242,6 @@ genstrings: genstrings.o libcupsppdc.a ../cups/$(LIBCUPSSTATIC) \ - $(CXX) $(ARCHFLAGS) $(LDFLAGS) -o genstrings genstrings.o \ - libcupsppdc.a ../cups/$(LIBCUPSSTATIC) $(LIBGSSAPI) $(SSLLIBS) \ - $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ) -- echo Generating localization strings... -- ./genstrings >sample.c - - - # --- -2.6.4 - diff --git a/package.bak/cups/0003-Sanitize-the-installation-process.patch b/package.bak/cups/0003-Sanitize-the-installation-process.patch deleted file mode 100644 index bf81f682df..0000000000 --- a/package.bak/cups/0003-Sanitize-the-installation-process.patch +++ /dev/null @@ -1,131 +0,0 @@ -From e35f809c435c224954a5c7bff3f5729c5b3bc0ba Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 23:21:06 +0100 -Subject: [PATCH] Sanitize the installation process - -The installation process does two things that are not convenient when -cross-compiling: - - - It uses install's -s option to strip binaries, but this option uses - the host strip and not the cross strip, which fails at stripping - binaries. In addition, we do not necessarily want cups to strip its - binaries, we may want to keep the debugging symbols. - - - It enforces ownership (user, group) which isn't possible since - "make install" isn't executed as root when cross-compiling. - - - It installs many files and directories with permissions that - prevent overwriting those files/directories, which meant calling - "make install" twice was failing. - -[Vincent: tweak the patch for 2.2.2 release] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera ---- - Makedefs.in | 12 ++++++------ - conf/Makefile | 6 +++--- - notifier/Makefile | 2 +- - scheduler/Makefile | 15 +++++++-------- - 4 files changed, 17 insertions(+), 18 deletions(-) - -diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..3e4f1bd 100644 ---- a/Makedefs.in -+++ b/Makedefs.in -@@ -40,14 +40,14 @@ SHELL = /bin/sh - # Installation programs... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ --INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m 755 -+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ - INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ --INSTALL_DATA = $(INSTALL) -c -m 444 -+INSTALL_DATA = $(INSTALL) -c -m 644 - INSTALL_DIR = $(INSTALL) -d --INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 555 @INSTALL_STRIP@ --INSTALL_MAN = $(INSTALL) -c -m 444 --INSTALL_SCRIPT = $(INSTALL) -c -m 555 -+INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m 755 -+INSTALL_MAN = $(INSTALL) -c -m 644 -+INSTALL_SCRIPT = $(INSTALL) -c -m 755 - - # - # Default user, group, and system groups for the scheduler... -diff --git a/conf/Makefile b/conf/Makefile -index 933d7d9..6ac5e19 100644 ---- a/conf/Makefile -+++ b/conf/Makefile -@@ -72,11 +72,11 @@ install: all install-data install-headers install-libs install-exec - install-data: - for file in $(KEEP); do \ - if test -r $(SERVERROOT)/$$file ; then \ -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.N ; \ -+ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.N ; \ - else \ -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT) ; \ -+ $(INSTALL_CONFIG) $$file $(SERVERROOT) ; \ - fi ; \ -- $(INSTALL_CONFIG) -g $(CUPS_GROUP) $$file $(SERVERROOT)/$$file.default; \ -+ $(INSTALL_CONFIG) $$file $(SERVERROOT)/$$file.default; \ - done - $(INSTALL_DIR) -m 755 $(DATADIR)/mime - for file in $(REPLACE); do \ -diff --git a/notifier/Makefile b/notifier/Makefile -index 3206dd0..c34a4d7 100644 ---- a/notifier/Makefile -+++ b/notifier/Makefile -@@ -62,7 +62,7 @@ install: all install-data install-headers install-libs install-exec - # - - install-data: -- $(INSTALL_DIR) -m 775 -g $(CUPS_GROUP) $(CACHEDIR)/rss -+ $(INSTALL_DIR) -m 775 $(CACHEDIR)/rss - - - # -diff --git a/scheduler/Makefile b/scheduler/Makefile -index 251f017..25f2f5f 100644 ---- a/scheduler/Makefile -+++ b/scheduler/Makefile -@@ -146,28 +146,27 @@ install-data: - echo Creating $(SERVERBIN)/driver... - $(INSTALL_DIR) -m 755 $(SERVERBIN)/driver - echo Creating $(SERVERROOT)... -- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT) -+ $(INSTALL_DIR) -m 755 $(SERVERROOT) - echo Creating $(SERVERROOT)/ppd... -- $(INSTALL_DIR) -m 755 -g $(CUPS_GROUP) $(SERVERROOT)/ppd -+ $(INSTALL_DIR) -m 755 $(SERVERROOT)/ppd - if test "x`uname`" != xDarwin; then \ - echo Creating $(SERVERROOT)/ssl...; \ -- $(INSTALL_DIR) -m 700 -g $(CUPS_GROUP) $(SERVERROOT)/ssl; \ -+ $(INSTALL_DIR) -m 700 $(SERVERROOT)/ssl; \ - fi - if test "$(STATEDIR)" != "$(SERVERROOT)"; then \ - echo Creating $(STATEDIR)...; \ - $(INSTALL_DIR) -m 755 $(STATEDIR); \ - fi - echo Creating $(STATEDIR)/certs... -- $(INSTALL_DIR) -m 511 -o $(CUPS_USER) -g $(CUPS_PRIMARY_SYSTEM_GROUP) \ -- $(STATEDIR)/certs -+ $(INSTALL_DIR) -m 711 $(STATEDIR)/certs - echo Creating $(LOGDIR)... - $(INSTALL_DIR) -m 755 $(LOGDIR) - echo Creating $(REQUESTS)... -- $(INSTALL_DIR) -m 710 -g $(CUPS_GROUP) $(REQUESTS) -+ $(INSTALL_DIR) -m 710 $(REQUESTS) - echo Creating $(REQUESTS)/tmp... -- $(INSTALL_DIR) -m 1770 -g $(CUPS_GROUP) $(REQUESTS)/tmp -+ $(INSTALL_DIR) -m 1770 $(REQUESTS)/tmp - echo Creating $(CACHEDIR)... -- $(INSTALL_DIR) -m 770 -g $(CUPS_GROUP) $(CACHEDIR) -+ $(INSTALL_DIR) -m 770 $(CACHEDIR) - if test "x$(INITDIR)" != x; then \ - echo Installing init scripts...; \ - $(INSTALL_DIR) -m 755 $(BUILDROOT)$(INITDIR)/init.d; \ --- -2.6.4 - diff --git a/package.bak/cups/0004-Remove-PIE-flags-from-the-build.patch b/package.bak/cups/0004-Remove-PIE-flags-from-the-build.patch deleted file mode 100644 index 492418f70d..0000000000 --- a/package.bak/cups/0004-Remove-PIE-flags-from-the-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b341a1e1fce48012fc5bcf39337488fd33210616 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 3 Jul 2016 12:20:21 +0200 -Subject: [PATCH] Remove PIE flags from the build - -Generating a statically linked binary built with PIE requires the -Scrt1.o file, which isn't part of Buildroot uClibc toolchains. To -solve this, we simply disable the PIE flags. - -Signed-off-by: Thomas Petazzoni ---- - Makedefs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makedefs.in b/Makedefs.in -index 3afef0a..299b297 100644 ---- a/Makedefs.in -+++ b/Makedefs.in -@@ -142,7 +142,7 @@ IPPFIND_BIN = @IPPFIND_BIN@ - IPPFIND_MAN = @IPPFIND_MAN@ - LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ - -L../scheduler @LDARCHFLAGS@ \ -- @LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM) -+ @LDFLAGS@ @RELROFLAGS@ $(OPTIM) - LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ - LIBS = $(LINKCUPS) $(COMMONLIBS) --- -2.7.4 - diff --git a/package.bak/cups/0005-Fix-static-linking-with-GnuTLS.patch b/package.bak/cups/0005-Fix-static-linking-with-GnuTLS.patch deleted file mode 100644 index 5702caae97..0000000000 --- a/package.bak/cups/0005-Fix-static-linking-with-GnuTLS.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 79a2389f590f4d16885bdd0715f3f04fd9fa6cc5 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 28 Feb 2016 16:35:56 +0100 -Subject: [PATCH] Fix static linking with GnuTLS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -cups forgets to link against the libs found by pkg-config if it is build with -GnuTLS support. - -Otherwise, static build fails with: -../cups/libcups.a(tls.o): In function `http_gnutls_create_credential': -cups-2.1.2/cups/tls-gnutls.c:762: undefined reference to `gnutls_x509_crt_init' -[..] - -Status upstream: Pending - -Signed-off-by: Jörg Krause ---- - Makedefs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makedefs.in b/Makedefs.in -index 299b297..ce9d535 100644 ---- a/Makedefs.in -+++ b/Makedefs.in -@@ -143,7 +143,7 @@ IPPFIND_MAN = @IPPFIND_MAN@ - LDFLAGS = -L../cgi-bin -L../cups -L../filter -L../ppdc \ - -L../scheduler @LDARCHFLAGS@ \ - @LDFLAGS@ @RELROFLAGS@ $(OPTIM) --LINKCUPS = @LINKCUPS@ $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) -+LINKCUPS = @LINKCUPS@ $(SSLLIBS) $(LIBGSSAPI) $(DNSSDLIBS) $(LIBZ) - LINKCUPSIMAGE = @LINKCUPSIMAGE@ - LIBS = $(LINKCUPS) $(COMMONLIBS) - ONDEMANDFLAGS = @ONDEMANDFLAGS@ --- -2.7.4 - diff --git a/package.bak/cups/Config.in b/package.bak/cups/Config.in deleted file mode 100644 index 3f5460c11b..0000000000 --- a/package.bak/cups/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_CUPS - bool "cups" - # needs libstdcpp for ppdc - depends on BR2_INSTALL_LIBSTDCPP - # needs fork() - depends on BR2_USE_MMU - help - The Common Unix Printing System - - http://www.cups.org - -comment "cups needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/cups/cups.hash b/package.bak/cups/cups.hash deleted file mode 100644 index 08c8c3c234..0000000000 --- a/package.bak/cups/cups.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated: -sha256 f589bb7d5d1dc3aa0915d7cf2b808571ef2e1530cd1a6ebe76ae8f9f4994e4f6 cups-2.2.2-source.tar.gz diff --git a/package.bak/cups/cups.mk b/package.bak/cups/cups.mk deleted file mode 100644 index ae3b9caae0..0000000000 --- a/package.bak/cups/cups.mk +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################ -# -# cups -# -################################################################################ - -CUPS_VERSION = 2.2.2 -CUPS_SOURCE = cups-$(CUPS_VERSION)-source.tar.gz -CUPS_SITE = https://github.com/apple/cups/releases/download/v$(CUPS_VERSION) -CUPS_LICENSE = GPLv2, LGPLv2 -CUPS_LICENSE_FILES = LICENSE.txt -CUPS_INSTALL_STAGING = YES -CUPS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) DSTROOT=$(STAGING_DIR) install -CUPS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) DSTROOT=$(TARGET_DIR) install - -# Using autoconf, not autoheader, so we cannot use AUTORECONF = YES. -define CUPS_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/usr/bin/autoconf -f -endef -CUPS_PRE_CONFIGURE_HOOKS += CUPS_RUN_AUTOCONF - -CUPS_CONF_OPTS = \ - --without-perl \ - --without-java \ - --without-php \ - --disable-gssapi \ - --libdir=/usr/lib -CUPS_CONFIG_SCRIPTS = cups-config -CUPS_DEPENDENCIES = \ - host-autoconf \ - host-pkgconf \ - $(if $(BR2_PACKAGE_ZLIB),zlib) - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -CUPS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system \ - --enable-systemd -CUPS_DEPENDENCIES += systemd -else -CUPS_CONF_OPTS += --disable-systemd -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -CUPS_CONF_OPTS += --enable-dbus -CUPS_DEPENDENCIES += dbus -else -CUPS_CONF_OPTS += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -CUPS_CONF_OPTS += --enable-gnutls -CUPS_DEPENDENCIES += gnutls -else -CUPS_CONF_OPTS += --disable-gnutls -endif - -ifeq ($(BR2_PACKAGE_PYTHON),y) -CUPS_CONF_OPTS += --with-python -CUPS_DEPENDENCIES += python -else -CUPS_CONF_OPTS += --without-python -endif - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -CUPS_CONF_OPTS += --enable-libusb -CUPS_DEPENDENCIES += libusb -else -CUPS_CONF_OPTS += --disable-libusb -endif - -ifeq ($(BR2_PACKAGE_LIBPAPER),y) -CUPS_CONF_OPTS += --enable-libpaper -CUPS_DEPENDENCIES += libpaper -else -CUPS_CONF_OPTS += --disable-libpaper -endif - -ifeq ($(BR2_PACKAGE_AVAHI),y) -CUPS_DEPENDENCIES += avahi -CUPS_CONF_OPTS += --enable-avahi -else -CUPS_CONF_OPTS += --disable-avahi -endif - -$(eval $(autotools-package)) diff --git a/package.bak/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch b/package.bak/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch deleted file mode 100644 index dc83af010b..0000000000 --- a/package.bak/curlftpfs/0001-fix-CURLOPT_INFILESIZE.patch +++ /dev/null @@ -1,13 +0,0 @@ -Borrowed from the curlftpfs_0.9.2-5 Debian package. - -CURLOPT_INFILESIZE does not support -1 arg. This fix bug #556012. ---- curlftpfs-0.9.2/ftpfs.c.old 2009-12-13 14:12:25.000000000 +0100 -+++ curlftpfs-0.9.2/ftpfs.c 2009-12-13 14:12:32.000000000 +0100 -@@ -503,7 +503,6 @@ - - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_URL, fh->full_path); - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_UPLOAD, 1); -- curl_easy_setopt_or_die(fh->write_conn, CURLOPT_INFILESIZE, -1); - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READFUNCTION, write_data_bg); - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_READDATA, fh); - curl_easy_setopt_or_die(fh->write_conn, CURLOPT_LOW_SPEED_LIMIT, 1); diff --git a/package.bak/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch b/package.bak/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch deleted file mode 100644 index 4966c9dcfb..0000000000 --- a/package.bak/curlftpfs/0002-free_ftpfs_file-memleak-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -Borrowed from the curlftpfs_0.9.2-5 Debian package. - -Fix a memory leak. See Bug #587250. ---- a/ftpfs.c 2008-04-30 01:05:47.000000000 +0200 -+++ a/ftpfs.c.slesimple 2010-01-01 22:12:10.000000000 +0100 -@@ -615,6 +615,8 @@ static void free_ftpfs_file(struct ftpfs - sem_destroy(&fh->data_need); - sem_destroy(&fh->data_written); - sem_destroy(&fh->ready); -+ if (fh->buf.size) { buf_free(&fh->buf); } -+ if (fh->stream_buf.size) { buf_free(&fh->stream_buf); } - free(fh); - } - diff --git a/package.bak/curlftpfs/0003-nocache-memleak-fix.patch b/package.bak/curlftpfs/0003-nocache-memleak-fix.patch deleted file mode 100644 index 00a4dd64fd..0000000000 --- a/package.bak/curlftpfs/0003-nocache-memleak-fix.patch +++ /dev/null @@ -1,59 +0,0 @@ -Borrowed from the curlftpfs_0.9.2-5 Debian package. - -Fix a memory leak when cache is disabled. Closes: #614347. -diff -ur curlftpfs-0.9.2/cache.c curlftpfs-0.9.2-olexat/cache.c ---- curlftpfs-0.9.2/cache.c 2008-04-30 01:03:09.000000000 +0200 -+++ curlftpfs-0.9.2-olexat/cache.c 2011-02-04 16:43:05.000000000 +0100 -@@ -25,7 +25,7 @@ - time_t last_cleaned; - }; - --static struct cache cache; -+struct cache cache; - - struct node { - struct stat stat; -diff -ur curlftpfs-0.9.2/ftpfs-ls.c curlftpfs-0.9.2-olexat/ftpfs-ls.c ---- curlftpfs-0.9.2/ftpfs-ls.c 2008-04-23 12:55:41.000000000 +0200 -+++ curlftpfs-0.9.2-olexat/ftpfs-ls.c 2011-02-07 17:23:37.000000000 +0100 -@@ -25,6 +25,13 @@ - #include "charset_utils.h" - #include "ftpfs-ls.h" - -+struct cache { -+ int on; -+ char incomplete[]; -+}; -+ -+extern struct cache cache; -+ - static int parse_dir_unix(const char *line, - struct stat *sbuf, - char *file, -@@ -243,8 +256,10 @@ - reallink = g_strdup(link); - } - int linksize = strlen(reallink); -- cache_add_link(full_path, reallink, linksize+1); -- DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink); -+ if (cache.on) { -+ cache_add_link(full_path, reallink, linksize+1); -+ DEBUG(1, "cache_add_link: %s %s\n", full_path, reallink); -+ } - if (linkbuf && linklen) { - if (linksize > linklen) linksize = linklen - 1; - strncpy(linkbuf, reallink, linksize); -@@ -257,8 +272,10 @@ - DEBUG(1, "filler: %s\n", file); - filler(h, file, &stat_buf); - } else { -- DEBUG(1, "cache_add_attr: %s\n", full_path); -- cache_add_attr(full_path, &stat_buf); -+ if (cache.on) { -+ DEBUG(1, "cache_add_attr: %s\n", full_path); -+ cache_add_attr(full_path, &stat_buf); -+ } - } - - DEBUG(2, "comparing %s %s\n", name, file); - diff --git a/package.bak/curlftpfs/0004-fix-musl-build-off-t.patch b/package.bak/curlftpfs/0004-fix-musl-build-off-t.patch deleted file mode 100644 index 9335230520..0000000000 --- a/package.bak/curlftpfs/0004-fix-musl-build-off-t.patch +++ /dev/null @@ -1,39 +0,0 @@ -Use off_t instead of __off_t - -__off_t is an internal C library type, which shouldn't be used by -applications. It is not defined by the musl C library, so use the -public off_t type instead. - -Signed-off-by: Thomas Petazzoni - -Index: b/ftpfs.c -=================================================================== ---- a/ftpfs.c -+++ b/ftpfs.c -@@ -687,7 +687,7 @@ - return ftpfs_getattr(path, &sbuf); - } - --static __off_t test_size(const char* path) -+static off_t test_size(const char* path) - { - struct stat sbuf; - int err = ftpfs_getattr(path, &sbuf); -@@ -950,7 +950,7 @@ - - /* fix openoffice problem, truncating exactly to file length */ - -- __off_t size = (long long int)test_size(path); -+ off_t size = (long long int)test_size(path); - DEBUG(1, "ftpfs_truncate: %s check filesize=%lld\n", path, (long long int)size); - - if (offset == size) -@@ -978,7 +978,7 @@ - } - /* fix openoffice problem, truncating exactly to file length */ - -- __off_t size = test_size(path); -+ off_t size = test_size(path); - DEBUG(1, "ftpfs_ftruncate: %s check filesize=%lld\n", path, (long long int)size); - - if (offset == size) diff --git a/package.bak/curlftpfs/Config.in b/package.bak/curlftpfs/Config.in deleted file mode 100644 index ad3ac241fa..0000000000 --- a/package.bak/curlftpfs/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_CURLFTPFS - bool "curlftpfs (FUSE)" - select BR2_PACKAGE_LIBFUSE - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBCURL - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse, glib2 - depends on !BR2_STATIC_LIBS # libfuse - help - CurlFtpFS is a filesystem for accessing FTP hosts based on FUSE - and libcurl. - - http://curlftpfs.sourceforge.net/ - -comment "curlftpfs needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/curlftpfs/curlftpfs.hash b/package.bak/curlftpfs/curlftpfs.hash deleted file mode 100644 index a94fab1239..0000000000 --- a/package.bak/curlftpfs/curlftpfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958 curlftpfs-0.9.2.tar.gz diff --git a/package.bak/curlftpfs/curlftpfs.mk b/package.bak/curlftpfs/curlftpfs.mk deleted file mode 100644 index 8ec3e4c536..0000000000 --- a/package.bak/curlftpfs/curlftpfs.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# curlftpfs -# -################################################################################ - -CURLFTPFS_VERSION = 0.9.2 -CURLFTPFS_SITE = http://downloads.sourceforge.net/project/curlftpfs/curlftpfs/$(CURLFTPFS_VERSION) -CURLFTPFS_CONF_ENV = ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config -CURLFTPFS_LICENSE = GPLv2 -CURLFTPFS_LICENSE_FILES = COPYING -CURLFTPFS_DEPENDENCIES = \ - libglib2 libfuse openssl libcurl \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - $(if $(BR2_ENABLE_LOCALE),,libiconv) - -$(eval $(autotools-package)) diff --git a/package.bak/cvs/Config.in b/package.bak/cvs/Config.in deleted file mode 100644 index 0036961601..0000000000 --- a/package.bak/cvs/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_CVS - bool "cvs" - depends on BR2_USE_WCHAR - # needs fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_NCURSES - help - Concurrent Versions System - source code revision control tools. - - http://www.nongnu.org/cvs/ - -if BR2_PACKAGE_CVS - -config BR2_PACKAGE_CVS_SERVER - bool "server support" - help - Enable cvs server code - -endif - -comment "cvs needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/cvs/cvs.hash b/package.bak/cvs/cvs.hash deleted file mode 100644 index b386d887b7..0000000000 --- a/package.bak/cvs/cvs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs/cvs_1.12.13-12%2Bsqueeze1.dsc -sha256 b5961c2476b996e5758fa5e22b60af085adca41164cac0d8f68a1d3b49d4e4f1 cvs_1.12.13.orig.tar.gz -sha256 d52a9232d9cf36302a150d782fc7e5b6f92f8115505ae8a7dc6acfc83e809d2f cvs_1.12.13-12+squeeze1.diff.gz diff --git a/package.bak/cvs/cvs.mk b/package.bak/cvs/cvs.mk deleted file mode 100644 index 6f28b4dbec..0000000000 --- a/package.bak/cvs/cvs.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# cvs -# -################################################################################ - -CVS_VERSION = 1.12.13 -CVS_SOURCE = cvs_$(CVS_VERSION).orig.tar.gz -CVS_PATCH = cvs_$(CVS_VERSION)-12+squeeze1.diff.gz -CVS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/c/cvs -CVS_DEPENDENCIES = ncurses - -CVS_CONF_ENV = cvs_cv_func_printf_ptr=yes - -CVS_CONFIGURE_ARGS = --disable-old-info-format-support -ifeq ($(BR2_PACKAGE_CVS_SERVER),y) -CVS_CONFIGURE_ARGS += --enable-server -else -CVS_CONFIGURE_ARGS += --disable-server -endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -CVS_CONFIGURE_ARGS += --with-external-zlib -endif - -CVS_CONF_OPTS = $(CVS_CONFIGURE_ARGS) - -define CVS_BZIP_UNPACK - $(BZCAT) $(@D)/cvs-$(CVS_VERSION).tar.bz2 | tar -C $(BUILD_DIR) $(TAR_OPTIONS) - - rm -f $(@D)/cvs-$(CVS_VERSION).tar.bz2 -endef - -CVS_POST_PATCH_HOOKS += CVS_BZIP_UNPACK - -ifneq ($(CVS_PATCH),) -define CVS_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - (cd $(@D)/debian/patches && for i in *; \ - do $(SED) 's,^\+\+\+ .*cvs-$(CVS_VERSION)/,+++ cvs-$(CVS_VERSION)/,' $$i; \ - done; \ - ); \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*; \ - fi -endef -endif - -CVS_POST_PATCH_HOOKS += CVS_DEBIAN_PATCHES - -define CVS_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/src/cvs $(TARGET_DIR)/usr/bin/cvs -endef - -$(eval $(autotools-package)) diff --git a/package.bak/cwiid/0001-fix-link-options-for-as-needed-90.patch b/package.bak/cwiid/0001-fix-link-options-for-as-needed-90.patch deleted file mode 100644 index 806ddaa3fc..0000000000 --- a/package.bak/cwiid/0001-fix-link-options-for-as-needed-90.patch +++ /dev/null @@ -1,166 +0,0 @@ -From 6af678616531eb1f3d3d0a052313ef9d8125bac7 Mon Sep 17 00:00:00 2001 -From: "L. Donnie Smith" -Date: Thu, 4 Feb 2010 22:53:41 -0500 -Subject: [PATCH] fix link options for --as-needed (#90) - -also fix a couple of includes ---- - common/include/app.mak | 2 +- - common/include/lib.mak.in | 4 ++-- - common/include/plugin.mak | 2 +- - lswm/Makefile.in | 2 +- - python/Makefile.in | 2 +- - python/Wiimote.c | 2 +- - python/cwiidmodule.c | 2 +- - wmdemo/wmdemo.c | 1 + - wmgui/Makefile.in | 2 +- - wminput/Makefile.in | 2 +- - wminput/main.c | 1 + - 11 files changed, 12 insertions(+), 10 deletions(-) - -diff --git a/common/include/app.mak b/common/include/app.mak -index f00cf12..c26d0ff 100644 ---- a/common/include/app.mak -+++ b/common/include/app.mak -@@ -10,7 +10,7 @@ DEST_INST_DIR = $(ROOTDIR)$(INST_DIR) - all: $(APP_NAME) - - $(APP_NAME): $(OBJECTS) -- $(CC) -o $@ $(OBJECTS) $(LDFLAGS) $(LDLIBS) -+ $(CC) $(LDFLAGS) -o $@ $(OBJECTS) $(LDLIBS) - - install: $(APP_NAME) - install -D $(APP_NAME) $(DEST_INST_DIR)/$(APP_NAME) -diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in -index 5e81ff3..3afbb14 100644 ---- a/common/include/lib.mak.in -+++ b/common/include/lib.mak.in -@@ -25,8 +25,8 @@ $(STATIC_LIB): $(OBJECTS) - ar rcs $(STATIC_LIB) $(OBJECTS) - - $(SHARED_LIB): $(OBJECTS) -- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) $(LDLIBS) \ -- -o $(SHARED_LIB) $(OBJECTS) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ -+ $(OBJECTS) $(LDLIBS) - - install: install_header install_static install_shared - -diff --git a/common/include/plugin.mak b/common/include/plugin.mak -index 0f61502..a2d5c85 100644 ---- a/common/include/plugin.mak -+++ b/common/include/plugin.mak -@@ -16,7 +16,7 @@ DEST_INST_DIR = $(INST_DIR) - all: $(LIB_NAME) - - $(LIB_NAME): $(OBJECTS) -- $(CC) -shared $(LDFLAGS) $(LDLIBS) -o $(LIB_NAME) $(OBJECTS) -+ $(CC) -shared $(LDFLAGS) -o $(LIB_NAME) $(OBJECTS) $(LDLIBS) - - install: $(LIB_NAME) - install -D $(LIB_NAME) $(DEST_INST_DIR)/$(LIB_NAME) -diff --git a/lswm/Makefile.in b/lswm/Makefile.in -index 79e8b5b..017104f 100644 ---- a/lswm/Makefile.in -+++ b/lswm/Makefile.in -@@ -8,7 +8,7 @@ SOURCES = lswm.c - - CFLAGS += -I@top_builddir@/libcwiid - LDFLAGS += -L@top_builddir@/libcwiid --LDLIBS += -lcwiid -+LDLIBS += -lcwiid -lbluetooth - INST_DIR = @bindir@ - - include $(COMMON)/include/app.mak -diff --git a/python/Makefile.in b/python/Makefile.in -index 0d7efdf..0ca57ca 100644 ---- a/python/Makefile.in -+++ b/python/Makefile.in -@@ -7,7 +7,7 @@ ifdef ROOTDIR - endif - - all: -- $(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid -+ $(PYTHON) setup.py build_ext $(DEBUGFLAGS) -I@top_builddir@/libcwiid -L@top_builddir@/libcwiid -lcwiid -lbluetooth - - install: - $(PYTHON) setup.py install --install-lib=${libdir}/python@PYTHON_VERSION@/site-packages $(SET_ROOT_DIR) -diff --git a/python/Wiimote.c b/python/Wiimote.c -index 794e7e2..523185e 100644 ---- a/python/Wiimote.c -+++ b/python/Wiimote.c -@@ -24,7 +24,7 @@ - #include "structmember.h" - #include - #include --#include "cwiid.h" -+#include - - #if (PY_VERSION_HEX < 0x02050000) - #ifndef PY_SSIZE_T_MIN -diff --git a/python/cwiidmodule.c b/python/cwiidmodule.c -index f6a8f33..a01ed82 100644 ---- a/python/cwiidmodule.c -+++ b/python/cwiidmodule.c -@@ -24,7 +24,7 @@ - - #include - --#include "cwiid.h" -+#include - #include "structmember.h" - - /* externally defined types */ -diff --git a/wmdemo/wmdemo.c b/wmdemo/wmdemo.c -index 70a25a1..b7aaa7f 100644 ---- a/wmdemo/wmdemo.c -+++ b/wmdemo/wmdemo.c -@@ -2,6 +2,7 @@ - #include - #include - -+#include - #include - - /* This is a sample program written to demonstrate basic CWiid libwiimote -diff --git a/wmgui/Makefile.in b/wmgui/Makefile.in -index 41b205e..14d1c1e 100644 ---- a/wmgui/Makefile.in -+++ b/wmgui/Makefile.in -@@ -8,7 +8,7 @@ SOURCES = main.c interface.c support.c - - CFLAGS += @GTK_CFLAGS@ -I@top_builddir@/libcwiid - LDFLAGS += -L@top_builddir@/libcwiid --LDLIBS += @GTK_LIBS@ -lm -lcwiid -+LDLIBS += @GTK_LIBS@ -lcwiid -lbluetooth -lm - INST_DIR = @bindir@ - - include $(COMMON)/include/app.mak -diff --git a/wminput/Makefile.in b/wminput/Makefile.in -index 009d4d5..d3c3679 100644 ---- a/wminput/Makefile.in -+++ b/wminput/Makefile.in -@@ -14,7 +14,7 @@ CFLAGS += -I@top_builddir@/libcwiid \ - -DWMINPUT_CONFIG_DIR=\"$(WMINPUT_CONFIG_DIR)\" \ - -DCWIID_PLUGINS_DIR=\"$(CWIID_PLUGINS_DIR)\" - --LDLIBS += -lcwiid -ldl -+LDLIBS += -lcwiid -lbluetooth -ldl -lpthread - LDFLAGS += -L@top_builddir@/libcwiid -rdynamic - INST_DIR = @bindir@ - -diff --git a/wminput/main.c b/wminput/main.c -index c3a7445..bbc98d9 100644 ---- a/wminput/main.c -+++ b/wminput/main.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #include - --- -1.8.5.2 - diff --git a/package.bak/cwiid/0002-Update-for-BlueZ-changes.patch b/package.bak/cwiid/0002-Update-for-BlueZ-changes.patch deleted file mode 100644 index c0d78a8ac6..0000000000 --- a/package.bak/cwiid/0002-Update-for-BlueZ-changes.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c5dd7d4a9af5a7d8ead8ad26d9e5e0f8f8292d29 Mon Sep 17 00:00:00 2001 -From: "L. Donnie Smith" -Date: Sun, 30 Nov 2008 22:34:08 +0000 -Subject: [PATCH] Update for BlueZ changes. - -git-svn-id: http://abstrakraft.org/cwiid/svn/trunk@183 918edb2d-ff29-0410-9de2-eb38e7f22bc7 ---- - libcwiid/bluetooth.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libcwiid/bluetooth.c b/libcwiid/bluetooth.c -index 63284a8..e986f75 100644 ---- a/libcwiid/bluetooth.c -+++ b/libcwiid/bluetooth.c -@@ -122,8 +122,8 @@ int cwiid_get_bdinfo_array(int dev_id, unsigned int timeout, int max_bdinfo, - } - - /* timeout (10000) in milliseconds */ -- if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, -- (*bdinfo)[bdinfo_count].name, 10000)) { -+ if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN, -+ (*bdinfo)[bdinfo_count].name, 10000)) { - cwiid_err(NULL, "Bluetooth name read error"); - err = 1; - goto CODA; --- -1.8.5.2 - diff --git a/package.bak/cwiid/0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch b/package.bak/cwiid/0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch deleted file mode 100644 index e1e4ec485e..0000000000 --- a/package.bak/cwiid/0003-wmdemo-fix-linking-by-adding-the-missing-lbluetooth-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From af6bffb5b8b71e99e0f9bbbd2cf1fbd695a643c2 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 8 Dec 2012 13:32:40 +0100 -Subject: [PATCH 1/2] wmdemo: fix linking by adding the missing -lbluetooth to - LDLIBS - -Signed-off-by: Samuel Martin ---- - wmdemo/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wmdemo/Makefile.in b/wmdemo/Makefile.in -index 56aed58..1eccc02 100644 ---- a/wmdemo/Makefile.in -+++ b/wmdemo/Makefile.in -@@ -8,7 +8,7 @@ SOURCES = wmdemo.c - - CFLAGS += -I@top_builddir@/libcwiid - LDFLAGS += -L@top_builddir@/libcwiid --LDLIBS += -lcwiid -+LDLIBS += -lcwiid -lbluetooth - INST_DIR = @bindir@ - - include $(COMMON)/include/app.mak --- -1.8.5.2 - diff --git a/package.bak/cwiid/0004-configure-make-wmgui-build-optional.patch b/package.bak/cwiid/0004-configure-make-wmgui-build-optional.patch deleted file mode 100644 index f5eff33acb..0000000000 --- a/package.bak/cwiid/0004-configure-make-wmgui-build-optional.patch +++ /dev/null @@ -1,64 +0,0 @@ -From dbb578450974db5decc24560da4aeaed838849a1 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 2 Jan 2014 14:03:07 +0100 -Subject: [PATCH 2/2] configure: make wmgui build optional - -So, make gtk-2 and glib2 dependencies optional (only needed by wmgui) - -Signed-off-by: Samuel Martin ---- - Makefile.in | 2 +- - configure.ac | 17 +++++++++++++---- - 2 files changed, 14 insertions(+), 5 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 6d3ac98..3d2fb45 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -3,7 +3,7 @@ - include @top_builddir@/defs.mak - - LIB_DIRS = libcwiid --BIN_DIRS = wmgui wminput lswm -+BIN_DIRS = @WMGUI@ wminput lswm - DOC_DIRS = man doc - ifdef PYTHON - BIND_DIRS = python -diff --git a/configure.ac b/configure.ac -index 82ca3e1..d146cb6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,11 @@ if test "$YACC" != "bison -y"; then - AC_MSG_ERROR([bison not found]) - fi - -+AC_ARG_ENABLE( -+ [wmgui], -+ [AS_HELP_STRING([--disable-wmgui],[Do not build wmgui binary (also drop the gtk-2/glib2 dependency)])], -+ [ENABLE_WMGUI="$enableval"],[ENABLE_WMGUI=yes]) -+ - AC_ARG_WITH( - [python], - [AS_HELP_STRING([--without-python],[compile without python support])], -@@ -98,10 +103,14 @@ else - fi - AC_SUBST(LDCONFIG) - --pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" --PKG_CHECK_MODULES([GTK], [$pkg_modules]) --AC_SUBST(GTK_CFLAGS) --AC_SUBST(GTK_LIBS) -+AS_IF( -+ [test "x$ENABLE_WMGUI" = xyes], -+ [pkg_modules="gtk+-2.0 >= 2.0.0 gthread-2.0" ; -+ PKG_CHECK_MODULES([GTK], [$pkg_modules]) -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ AC_SUBST(WMGUI, wmgui)] -+) - - AC_OUTPUT( - [Makefile] --- -1.8.5.2 - diff --git a/package.bak/cwiid/Config.in b/package.bak/cwiid/Config.in deleted file mode 100644 index 03b7dbbcdb..0000000000 --- a/package.bak/cwiid/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_CWIID - bool "cwiid" - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # bluez_utils -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez_utils -> dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # bluez_utils -> dbus, libglib2 - select BR2_PACKAGE_BLUEZ_UTILS - help - A collection of Linux tools written in C for interfacing to the - Nintendo Wiimote. - - http://abstrakraft.org/cwiid/ - -if BR2_PACKAGE_CWIID -config BR2_PACKAGE_CWIID_WMGUI - bool "wmgui" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk3 -> pango -> harfbuzz - depends on BR2_PACKAGE_XORG7 # libgtk2 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_USE_MMU # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 -endif - -comment "cwiid needs a toolchain w/ dynamic lib, threads, wchar" - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_USE_MMU diff --git a/package.bak/cwiid/cwiid.hash b/package.bak/cwiid/cwiid.hash deleted file mode 100644 index 749c9c3cfc..0000000000 --- a/package.bak/cwiid/cwiid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8880378303d872ea65b037184ad6c96bc68f87764b503c152032f56344b5e81d cwiid-0.6.00.tgz diff --git a/package.bak/cwiid/cwiid.mk b/package.bak/cwiid/cwiid.mk deleted file mode 100644 index 0cfc77479e..0000000000 --- a/package.bak/cwiid/cwiid.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# cwiid -# -################################################################################ - -CWIID_VERSION = 0.6.00 -CWIID_SOURCE = cwiid-$(CWIID_VERSION).tgz -CWIID_SITE = http://abstrakraft.org/cwiid/downloads -CWIID_LICENSE = GPLv2+ -CWIID_LICENSE_FILES = COPYING - -CWIID_AUTORECONF = YES -CWIID_INSTALL_STAGING = YES - -CWIID_DEPENDENCIES = host-pkgconf host-bison host-flex bluez_utils - -# Disable python support. This disables the 2 following things: -# - wminput Python plugin support -# - cwiid Python module -CWIID_CONF_OPTS = --without-python --disable-ldconfig - -ifeq ($(BR2_PACKAGE_CWIID_WMGUI),y) -CWIID_DEPENDENCIES += libgtk2 libglib2 -CWIID_CONF_OPTS += --enable-wmgui -else -CWIID_CONF_OPTS += --disable-wmgui -endif - -$(eval $(autotools-package)) diff --git a/package.bak/cxxtest/Config.in b/package.bak/cxxtest/Config.in deleted file mode 100644 index 207adab127..0000000000 --- a/package.bak/cxxtest/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_CXXTEST - bool "cxxtest" - depends on BR2_INSTALL_LIBSTDCPP - help - CxxTest is a unit testing framework for C++ - - http://cxxtest.com/ - -comment "cxxtest needs a toolchain w/ C++ support" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/cxxtest/cxxtest.hash b/package.bak/cxxtest/cxxtest.hash deleted file mode 100644 index f552e803fa..0000000000 --- a/package.bak/cxxtest/cxxtest.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 1c154fef91c65dbf1cd4519af7ade70a61d85a923b6e0c0b007dc7f4895cf7d8 cxxtest-4.4.tar.gz diff --git a/package.bak/cxxtest/cxxtest.mk b/package.bak/cxxtest/cxxtest.mk deleted file mode 100644 index 93bdd8b8d8..0000000000 --- a/package.bak/cxxtest/cxxtest.mk +++ /dev/null @@ -1,30 +0,0 @@ -####################################################################################### -# -# cxxtest -# -####################################################################################### - -CXXTEST_VERSION = 4.4 -CXXTEST_SITE = https://github.com/CxxTest/cxxtest/releases/download/$(CXXTEST_VERSION) -CXXTEST_LICENSE = LGPLv3 -CXXTEST_LICENSE_FILES = COPYING -CXXTEST_INSTALL_STAGING = YES -CXXTEST_INSTALL_TARGET = NO -CXXTEST_DEPENDENCIES = host-cxxtest -HOST_CXXTEST_SETUP_TYPE = setuptools -HOST_CXXTEST_SUBDIR = python - -# Copy CxxTest header files to staging directory -define CXXTEST_INSTALL_STAGING_CMDS - $(INSTALL) -m 755 -d $(STAGING_DIR)/usr/include/cxxtest - $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/include/cxxtest $(@D)/cxxtest/* -endef - -# CxxTest uses python infrastructure as the build system. It consists of two parts: -# 1. cxxtestgen tool to process tests defined in header files to generate C++ source -# files. cxxtestgen is built as a host package, so that it can be used natively. -# 2. A set of header files which are installed in staging directory. This will be -# used in cross-compiling test harness to generate executable which will run on target. - -$(eval $(generic-package)) -$(eval $(host-python-package)) diff --git a/package.bak/czmq/0001-configure.ac-remove-Werror.patch b/package.bak/czmq/0001-configure.ac-remove-Werror.patch deleted file mode 100644 index 7f2dae2c2b..0000000000 --- a/package.bak/czmq/0001-configure.ac-remove-Werror.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 9a195dc573f4eed130773e6ef67efd5f71693e97 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 5 Nov 2016 15:33:57 +0100 -Subject: [PATCH] configure.ac: remove -Werror - --Werror shouldn't be used in releases, as it can break the build with -newer versions of the compiler or the C library, when new warnings -are introduced. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e92970a..2fd551a 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -344,7 +344,7 @@ AC_C_BIGENDIAN - - # These options are GNU compiler specific. - if test "x$GCC" = "xyes"; then -- CPPFLAGS="-pedantic -Werror -Wall -Wc++-compat ${CPPFLAGS}" -+ CPPFLAGS="-pedantic -Wall -Wc++-compat ${CPPFLAGS}" - fi - - AM_CONDITIONAL(ENABLE_SHARED, test "x$enable_shared" = "xyes") --- -2.7.4 - diff --git a/package.bak/czmq/Config.in b/package.bak/czmq/Config.in deleted file mode 100644 index cfa5152958..0000000000 --- a/package.bak/czmq/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_CZMQ - bool "czmq" - select BR2_PACKAGE_ZEROMQ - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - help - High-level C Binding for 0MQ - - http://czmq.zeromq.org/ - -comment "czmq needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/czmq/czmq.hash b/package.bak/czmq/czmq.hash deleted file mode 100644 index 526ea594b9..0000000000 --- a/package.bak/czmq/czmq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5c76de41f736f0c059e0b26174ef99200f2aba2fa38333683dbe4944b2f80555 czmq-5205ec201e97c3a652c17eb86b18b70350b54512.tar.gz diff --git a/package.bak/czmq/czmq.mk b/package.bak/czmq/czmq.mk deleted file mode 100644 index 8c4de7186b..0000000000 --- a/package.bak/czmq/czmq.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# czmq -# -################################################################################ - -CZMQ_VERSION = 5205ec201e97c3a652c17eb86b18b70350b54512 -CZMQ_SITE = $(call github,zeromq,czmq,$(CZMQ_VERSION)) - -# Autoreconf required as we use the git tree -CZMQ_AUTORECONF = YES -CZMQ_INSTALL_STAGING = YES -CZMQ_DEPENDENCIES = zeromq host-pkgconf -CZMQ_LICENSE = MPLv2.0 -CZMQ_LICENSE_FILES = LICENSE - -# asciidoc is a python script that imports unicodedata, which is not in -# host-python, so disable asciidoc entirely. -CZMQ_CONF_ENV = ac_cv_prog_czmq_have_asciidoc=no - -define CZMQ_CREATE_CONFIG_DIR - mkdir -p $(@D)/config -endef - -CZMQ_POST_PATCH_HOOKS += CZMQ_CREATE_CONFIG_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/dado/Config.in b/package.bak/dado/Config.in deleted file mode 100644 index fb469f40e1..0000000000 --- a/package.bak/dado/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_DADO - bool "dado" - help - Database Facilities for LuaSQL. - - http://www.ccpa.puc-rio.br/software/dado/ diff --git a/package.bak/dado/dado.hash b/package.bak/dado/dado.hash deleted file mode 100644 index 3f17f083d3..0000000000 --- a/package.bak/dado/dado.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b7a68583c36643ad9040937d7e2b99230af7da83c7cbd13c9923881f1eb7490f dado-1.6.0-1.src.rock diff --git a/package.bak/dado/dado.mk b/package.bak/dado/dado.mk deleted file mode 100644 index a09dd6da51..0000000000 --- a/package.bak/dado/dado.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# dado -# -################################################################################ - -DADO_VERSION = 1.6.0-1 -DADO_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/dante/0001-fix-sparc-compile.patch b/package.bak/dante/0001-fix-sparc-compile.patch deleted file mode 100644 index a23e2e228e..0000000000 --- a/package.bak/dante/0001-fix-sparc-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ -Signal handling for sparc is broken, fix it. - -Signed-off-by: Waldemar Brodkorb - ---- dante-1.4.1.orig/lib/tostring.c 2014-08-21 18:21:50.000000000 +0200 -+++ dante-1.4.1/lib/tostring.c 2016-07-10 10:08:39.785662622 +0200 -@@ -1526,7 +1526,7 @@ signal2string(sig) - return "SIGKILL"; - #endif /* SIGKILL */ - --#if (defined SIGLOST) && (!defined SIGABRT || SIGLOST != SIGABRT) -+#if (defined SIGLOST) && (!defined SIGABRT || SIGLOST != SIGABRT || SIGLOST != SIGPWR) - case SIGLOST: - return "SIGLOST"; - #endif /* SIGLOST */ -@@ -1551,7 +1551,7 @@ signal2string(sig) - return "SIGPROF"; - #endif /* SIGPROF */ - --#ifdef SIGPWR -+#if (defined SIGPWR) && SIGPWR != SIGLOST - case SIGPWR: - return "SIGPWR"; - #endif /* SIGPWR */ diff --git a/package.bak/dante/0002-compiler.m4-do-not-remove-g-flag.patch b/package.bak/dante/0002-compiler.m4-do-not-remove-g-flag.patch deleted file mode 100644 index 0b41de6192..0000000000 --- a/package.bak/dante/0002-compiler.m4-do-not-remove-g-flag.patch +++ /dev/null @@ -1,42 +0,0 @@ -From c00e284dd2baa5ecdb0c9586044399cd7cacce3e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 8 Aug 2016 12:31:40 +0200 -Subject: [PATCH] compiler.m4: do not remove -g flag - -A sed expression such as 's/-g//' not only removes the -g -debugging-related flag, but also turns more specific flags such as --mfloat-gprs=double into -mfloatprs=double, which is no longer a valid -flag. - -However, it turns out that removing -g is not necessary: having -g0 -after -g negates the -g, and having -ggdb after -g is enough to produce -debugging information for GDB. - -Signed-off-by: Thomas Petazzoni ---- - compiler.m4 | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/compiler.m4 b/compiler.m4 -index 3a23406..621372c 100644 ---- a/compiler.m4 -+++ b/compiler.m4 -@@ -378,15 +378,9 @@ else - gcc) - if test x"$aixldbug" != x; then - #disable debug info -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" -- fi - CFLAGS="$CFLAGS${CFLAGS:+ }-g0" - else - #use -ggdb also when not debugging -- if echo $CFLAGS | grep -- "-g" >/dev/null; then -- CFLAGS="`echo $CFLAGS | sed -e 's/-g//g'`" -- fi - CFLAGS="$CFLAGS${CFLAGS:+ }-ggdb" - fi - ;; --- -2.7.4 - diff --git a/package.bak/dante/Config.in b/package.bak/dante/Config.in deleted file mode 100644 index 41a89990d2..0000000000 --- a/package.bak/dante/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DANTE - bool "dante" - depends on BR2_USE_MMU # fork() - help - Dante is a product developed by Inferno Nettverk A/S. It - consists of a SOCKS server and a SOCKS client, implementing - RFC 1928 and related standards. It is a flexible product - that can be used to provide convenient and secure network - connectivity. - - http://www.inet.no/dante/ diff --git a/package.bak/dante/S50dante b/package.bak/dante/S50dante deleted file mode 100644 index ed51a8410b..0000000000 --- a/package.bak/dante/S50dante +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Starts dante -# - -# Allow a few customizations from a config file -test -r /etc/default/dante && . /etc/default/dante - -start() { - printf "Starting dante: " - start-stop-daemon -S -q -p /var/run/dante.pid \ - --exec /usr/sbin/sockd -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping dante: " - start-stop-daemon -K -q -p /var/run/dante.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/dante/dante.hash b/package.bak/dante/dante.hash deleted file mode 100644 index 38dea61b0a..0000000000 --- a/package.bak/dante/dante.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b6d232bd6fefc87d14bf97e447e4fcdeef4b28b16b048d804b50b48f261c4f53 dante-1.4.1.tar.gz diff --git a/package.bak/dante/dante.mk b/package.bak/dante/dante.mk deleted file mode 100644 index 1bab648bbf..0000000000 --- a/package.bak/dante/dante.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# dante -# -################################################################################ - -DANTE_VERSION = 1.4.1 -DANTE_SITE = http://www.inet.no/dante/files -DANTE_LICENSE = BSD-3c -DANTE_LICENSE_FILES = LICENSE - -# Dante uses a *VERY* old configure.ac -DANTE_LIBTOOL_PATCH = NO - -DANTE_CONF_OPTS += --disable-client --disable-preload - -define DANTE_INSTALL_CONFIG_FILE - $(INSTALL) -D -m 644 $(@D)/example/sockd.conf \ - $(TARGET_DIR)/etc/sockd.conf -endef - -DANTE_POST_INSTALL_TARGET_HOOKS += DANTE_INSTALL_CONFIG_FILE - -define DANTE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/dante/dante.service \ - $(TARGET_DIR)/usr/lib/systemd/system/dante.service -endef - -define DANTE_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/dante/S50dante \ - $(TARGET_DIR)/etc/init.d/S50dante -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dante/dante.service b/package.bak/dante/dante.service deleted file mode 100644 index b783cee383..0000000000 --- a/package.bak/dante/dante.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=SOCKS v4 and v5 compatible proxy server and client -Requires=network.target -After=network.target - -[Service] -Type=forking -EnvironmentFile=-/etc/default/dante -PIDFile=/run/dante.pid -ExecStart=/usr/sbin/sockd -D -p /run/dante.pid $DAEMON_ARGS -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/darkhttpd/Config.in b/package.bak/darkhttpd/Config.in deleted file mode 100644 index a5ab41ae22..0000000000 --- a/package.bak/darkhttpd/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_DARKHTTPD - bool "darkhttpd" - depends on BR2_USE_MMU # fork() - help - Darkhttpd is a simple, fast HTTP 1.1 web server which only - serves static content. It does not support PHP or CGI. - - The behavior of darkhttpd can be altered by setting some - variables in /etc/default/darkhttpd: - - - DARKHTTPD_ROOT: path to the server document root. - - DARKHTTPD_FLAGS: options to pass to darkhttpd. - - https://unix4lyfe.org/darkhttpd/ diff --git a/package.bak/darkhttpd/S50darkhttpd b/package.bak/darkhttpd/S50darkhttpd deleted file mode 100755 index 913439f5a5..0000000000 --- a/package.bak/darkhttpd/S50darkhttpd +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# -# Starts darkhttpd. -# - -# Allow a few customizations from a config file -test -r /etc/default/darkhttpd && . /etc/default/darkhttpd - -DARKHTTPD_PROG=/usr/sbin/darkhttpd -DARKHTTPD_PIDFILE=/var/run/darkhttpd.pid -DARKHTTPD_ARGS="${DARKHTTPD_ROOT:-/var/www} --log /var/log/darkhttpd.log $DARKHTTPD_FLAGS --chroot --uid nobody --gid www-data" - -start() { - printf "Starting darkhttpd: " - start-stop-daemon -S -q -b -p $DARKHTTPD_PIDFILE -m --exec $DARKHTTPD_PROG -- $DARKHTTPD_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping darkhttpd: " - start-stop-daemon -K -q -p $DARKHTTPD_PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/darkhttpd/darkhttpd.hash b/package.bak/darkhttpd/darkhttpd.hash deleted file mode 100644 index 39152e3cb9..0000000000 --- a/package.bak/darkhttpd/darkhttpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally generated -sha256 a50417b622b32b5f421b3132cb94ebeff04f02c5fb87fba2e31147d23de50505 darkhttpd-1.12.tar.bz2 diff --git a/package.bak/darkhttpd/darkhttpd.mk b/package.bak/darkhttpd/darkhttpd.mk deleted file mode 100644 index df80899371..0000000000 --- a/package.bak/darkhttpd/darkhttpd.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# darkhttpd -# -################################################################################ - -DARKHTTPD_VERSION = 1.12 -DARKHTTPD_SITE = https://unix4lyfe.org/darkhttpd -DARKHTTPD_SOURCE = darkhttpd-$(DARKHTTPD_VERSION).tar.bz2 -DARKHTTPD_LICENSE = MIT - -define DARKHTTPD_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define DARKHTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/darkhttpd \ - $(TARGET_DIR)/usr/sbin/darkhttpd -endef - -define DARKHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/darkhttpd/darkhttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/darkhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/darkhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/darkhttpd.service -endef - -define DARKHTTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/darkhttpd/S50darkhttpd \ - $(TARGET_DIR)/etc/init.d/S50darkhttpd -endef - -$(eval $(generic-package)) diff --git a/package.bak/darkhttpd/darkhttpd.service b/package.bak/darkhttpd/darkhttpd.service deleted file mode 100644 index 17abd98ce7..0000000000 --- a/package.bak/darkhttpd/darkhttpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Darkhttpd Web Server -After=syslog.target network.target auditd.service - -[Service] -Environment="DARKHTTPD_ROOT=/var/www" -EnvironmentFile=-/etc/default/darkhttpd -ExecStart=/usr/sbin/darkhttpd $DARKHTTPD_ROOT $DARKHTTPD_FLAGS --chroot --uid nobody --gid www-data - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/dash/0001-no-config.h-for-helpers.patch b/package.bak/dash/0001-no-config.h-for-helpers.patch deleted file mode 100644 index 9fd449c414..0000000000 --- a/package.bak/dash/0001-no-config.h-for-helpers.patch +++ /dev/null @@ -1,35 +0,0 @@ -[PATCH] Don't include config.h when building helpers using the native compiler - -config.h contains settings for the cross compiler (most importantly -32/64bit versions of functions), so don't include it when calling the -native compiler to build the helpers. - -Otherwise we get build errors like: - -/usr/bin/gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -O2 -Wall -o mkinit mkinit.c -In file included from /usr/include/sys/stat.h:107, - from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/bits/stat.h:117: error: redefinition of ‘struct stat’ -In file included from /usr/include/fcntl.h:38, - from mkinit.c:50: -/usr/include/sys/stat.h:504: error: redefinition of ‘stat’ -/usr/include/sys/stat.h:455: note: previous definition of ‘stat’ was here - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.in | 1 - - 1 file changed, 1 deletion(-) - -Index: dash-0.5.5.1/src/Makefile.in -=================================================================== ---- dash-0.5.5.1.orig/src/Makefile.in -+++ dash-0.5.5.1/src/Makefile.in -@@ -165,7 +165,6 @@ COMMON_CPPFLAGS = \ - AM_CFLAGS = $(COMMON_CFLAGS) - AM_CPPFLAGS = $(COMMON_CPPFLAGS) - AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS) --AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS) - COMPILE_FOR_BUILD = \ - $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \ - $(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD) diff --git a/package.bak/dash/Config.in b/package.bak/dash/Config.in deleted file mode 100644 index af8fba4018..0000000000 --- a/package.bak/dash/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_DASH - bool "dash" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - The Debian/Linux port of the NetBSD version of - ash (the Almquist SHell). - - http://gondor.apana.org.au/~herbert/dash diff --git a/package.bak/dash/dash.hash b/package.bak/dash/dash.hash deleted file mode 100644 index 0198cd8345..0000000000 --- a/package.bak/dash/dash.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://ftp.debian.org/debian/pool/main/d/dash/dash_0.5.8-1.dsc -sha256 c6db3a237747b02d20382a761397563d813b306c020ae28ce25a1c3915fac60f dash_0.5.8.orig.tar.gz -sha256 d751769cc1ef8b825a177e782f1cd3e35bde7c268107fa4febf8d235e12c64d9 dash_0.5.8-1.diff.gz diff --git a/package.bak/dash/dash.mk b/package.bak/dash/dash.mk deleted file mode 100644 index ed8525ce69..0000000000 --- a/package.bak/dash/dash.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# dash -# -################################################################################ - -DASH_VERSION = 0.5.8 -DASH_SOURCE = dash_$(DASH_VERSION).orig.tar.gz -DASH_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/d/dash -DASH_PATCH = dash_$(DASH_VERSION)-1.diff.gz -DASH_LICENSE = BSD-3c, GPLv2+ (mksignames.c) -DASH_LICENSE_FILES = COPYING - -define DASH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/src/dash $(TARGET_DIR)/bin/dash -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dawgdic/Config.in b/package.bak/dawgdic/Config.in deleted file mode 100644 index b67342b194..0000000000 --- a/package.bak/dawgdic/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DAWGDIC - bool "dawgdic" - depends on BR2_INSTALL_LIBSTDCPP - # needs std::strtoll - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - help - dawgdic provides a library for building and accessing - dictionaries implemented with directed acyclic word graphs - (DAWG). A dawg is constructed by minimizing a trie as a - deterministic finite automaton (DFA), and thus the dawg has - an advantage in memory usage. In addition, dawgdic uses a - double-array as a base data structure, so its retrieval - speed is as fast as that of Darts, a library for building - and accessing double-array tries. - - https://github.com/stil/dawgdic - -comment "dawgdic needs a toolchain w/ C++, gcc >= 4.6" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 diff --git a/package.bak/dawgdic/dawgdic.hash b/package.bak/dawgdic/dawgdic.hash deleted file mode 100644 index da03f0b860..0000000000 --- a/package.bak/dawgdic/dawgdic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 54622a3e79ff3ad2c01a830ec52b997b42ead468b18af5acebab3a4ff32a5ad6 dawgdic-16ac537ba9883ff01b63b6d1fdc3072150c68fee.tar.gz diff --git a/package.bak/dawgdic/dawgdic.mk b/package.bak/dawgdic/dawgdic.mk deleted file mode 100644 index 2f0a53b16e..0000000000 --- a/package.bak/dawgdic/dawgdic.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# dawgdic -# -################################################################################ - -DAWGDIC_VERSION = 16ac537ba9883ff01b63b6d1fdc3072150c68fee -DAWGDIC_SITE = $(call github,stil,dawgdic,$(DAWGDIC_VERSION)) -DAWGDIC_LICENSE = BSD-3c -DAWGDIC_LICENSE_FILES = COPYING -DAWGDIC_AUTORECONF = YES -DAWGDIC_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/dbus-cpp/0001-gcc4.7.patch b/package.bak/dbus-cpp/0001-gcc4.7.patch deleted file mode 100644 index ad3046c829..0000000000 --- a/package.bak/dbus-cpp/0001-gcc4.7.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix build failure with gcc 4.7+ -From bugtracker: http://sourceforge.net/p/dbus-cplusplus/patches/13/ - -Signed-off-by: Gustavo Zacarias - -diff --git a/include/dbus-c++/eventloop-integration.h b/include/dbus-c++/eventloop-integration.h -index 1b0302e..3e44304 100644 ---- a/include/dbus-c++/eventloop-integration.h -+++ b/include/dbus-c++/eventloop-integration.h -@@ -26,6 +26,7 @@ - #define __DBUSXX_EVENTLOOP_INTEGRATION_H - - #include -+#include - #include "api.h" - #include "dispatcher.h" - #include "util.h" diff --git a/package.bak/dbus-cpp/0002-cxxflags-ldflags-for-build.patch b/package.bak/dbus-cpp/0002-cxxflags-ldflags-for-build.patch deleted file mode 100644 index fefb9690d3..0000000000 --- a/package.bak/dbus-cpp/0002-cxxflags-ldflags-for-build.patch +++ /dev/null @@ -1,32 +0,0 @@ -Use CXXFLAGS_FOR_BUILD and LDFLAGS_FOR_BUILD for the tools since expat -may not be living in the default include & library path. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libdbus-c++-0.9.0.orig/configure.ac libdbus-c++-0.9.0/configure.ac ---- libdbus-c++-0.9.0.orig/configure.ac 2014-01-05 15:28:03.653886567 -0300 -+++ libdbus-c++-0.9.0/configure.ac 2014-01-05 15:44:32.571172225 -0300 -@@ -65,7 +65,11 @@ - AC_PROG_CXX - - CXX_FOR_BUILD=${CXX_FOR_BUILD-${CXX}} -+CXXFLAGS_FOR_BUILD=${CXXFLAGS_FOR_BUILD-${CXXFLAGS}} -+LDFLAGS_FOR_BUILD=${LDFLAGS_FOR_BUILD-${LDFLAGS}} - AC_SUBST(CXX_FOR_BUILD) -+AC_SUBST(CXXFLAGS_FOR_BUILD) -+AC_SUBST(LDFLAGS_FOR_BUILD) - - AM_PROG_LIBTOOL - -diff -Nura libdbus-c++-0.9.0.orig/tools/Makefile.am libdbus-c++-0.9.0/tools/Makefile.am ---- libdbus-c++-0.9.0.orig/tools/Makefile.am 2014-01-05 15:28:03.652886535 -0300 -+++ libdbus-c++-0.9.0/tools/Makefile.am 2014-01-05 15:44:42.071482390 -0300 -@@ -1,6 +1,8 @@ - # hacky, but ... - - CXX = $(CXX_FOR_BUILD) -+CXXFLAGS = $(CXXFLAGS_FOR_BUILD) -+LDFLAGS = $(LDFLAGS_FOR_BUILD) - - AM_CPPFLAGS = \ - $(dbus_CFLAGS) \ diff --git a/package.bak/dbus-cpp/Config.in b/package.bak/dbus-cpp/Config.in deleted file mode 100644 index e90b211490..0000000000 --- a/package.bak/dbus-cpp/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_DBUS_CPP - bool "dbus-c++" - depends on BR2_PACKAGE_DBUS - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus - depends on BR2_USE_MMU # dbus - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_TOOLCHAIN_USES_MUSL # no PTHREAD_RECURSIVE_MUTEX_* - select BR2_PACKAGE_EXPAT - help - dbus-c++ attempts to provide a C++ API for D-BUS. - The library has a glib/gtk and an Ecore mainloop integration. - It also offers an optional own main loop. - - http://sourceforge.net/projects/dbus-cplusplus/ - -comment "dbus-c++ needs a uClibc or glibc toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_DBUS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/dbus-cpp/dbus-cpp.hash b/package.bak/dbus-cpp/dbus-cpp.hash deleted file mode 100644 index b3fc3efd33..0000000000 --- a/package.bak/dbus-cpp/dbus-cpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 bc11ac297b3cb010be904c72789695543ee3fdf3d75cdc8225fd371385af4e61 libdbus-c++-0.9.0.tar.gz diff --git a/package.bak/dbus-cpp/dbus-cpp.mk b/package.bak/dbus-cpp/dbus-cpp.mk deleted file mode 100644 index 0b51967061..0000000000 --- a/package.bak/dbus-cpp/dbus-cpp.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# dbus-cpp -# -################################################################################ - -DBUS_CPP_VERSION = 0.9.0 -DBUS_CPP_SITE = http://downloads.sourceforge.net/project/dbus-cplusplus/dbus-c++/$(DBUS_CPP_VERSION) -DBUS_CPP_SOURCE = libdbus-c++-$(DBUS_CPP_VERSION).tar.gz -DBUS_CPP_INSTALL_STAGING = YES -# expat is required for the tools irrespective of dbus xml backend -DBUS_CPP_DEPENDENCIES = host-dbus-cpp host-pkgconf dbus expat -HOST_DBUS_CPP_DEPENDENCIES = host-pkgconf host-dbus host-expat -DBUS_CPP_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-doxygen-docs \ - --with-build-libdbus-cxx=$(HOST_DBUS_CPP_BUILDDIR) -HOST_DBUS_CPP_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-doxygen-docs \ - --disable-ecore \ - --disable-glib -DBUS_CPP_AUTORECONF = YES -DBUS_CPP_LICENSE = LGPLv2.1+ -DBUS_CPP_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_EFL),y) -DBUS_CPP_CONF_OPTS += --enable-ecore -DBUS_CPP_DEPENDENCIES += efl -else -DBUS_CPP_CONF_OPTS += --disable-ecore -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -DBUS_CPP_CONF_OPTS += --enable-glib -DBUS_CPP_DEPENDENCIES += libglib2 -else -DBUS_CPP_CONF_OPTS += --disable-glib -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/dbus-glib/Config.in b/package.bak/dbus-glib/Config.in deleted file mode 100644 index 7fe0ac6606..0000000000 --- a/package.bak/dbus-glib/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_DBUS_GLIB - bool "dbus-glib" - depends on BR2_PACKAGE_DBUS - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - GLib bindings for D-Bus. - - http://www.freedesktop.org/software/dbus - -comment "dbus-glib needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_DBUS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/dbus-glib/dbus-glib.hash b/package.bak/dbus-glib/dbus-glib.hash deleted file mode 100644 index 732ae97c86..0000000000 --- a/package.bak/dbus-glib/dbus-glib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9f340c7e2352e9cdf113893ca77ca9075d9f8d5e81476bf2bf361099383c602c dbus-glib-0.108.tar.gz diff --git a/package.bak/dbus-glib/dbus-glib.mk b/package.bak/dbus-glib/dbus-glib.mk deleted file mode 100644 index 4a1e4b40b7..0000000000 --- a/package.bak/dbus-glib/dbus-glib.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# dbus-glib -# -################################################################################ - -DBUS_GLIB_VERSION = 0.108 -DBUS_GLIB_SITE = http://dbus.freedesktop.org/releases/dbus-glib -DBUS_GLIB_INSTALL_STAGING = YES -DBUS_GLIB_LICENSE = AFLv2.1, GPLv2+ -DBUS_GLIB_LICENSE_FILES = COPYING - -DBUS_GLIB_CONF_ENV = \ - ac_cv_have_abstract_sockets=yes \ - ac_cv_func_posix_getpwnam_r=yes \ - have_abstract_sockets=yes - -DBUS_GLIB_CONF_OPTS = \ - --disable-tests \ - --disable-xml-docs \ - --with-introspect-xml=$(DBUS_HOST_INTROSPECT) \ - --with-dbus-binding-tool=$(DBUS_GLIB_HOST_BINARY) \ - --disable-bash-completion \ - --disable-doxygen-docs \ - --enable-asserts=yes - -DBUS_GLIB_DEPENDENCIES = host-pkgconf dbus host-dbus host-dbus-glib libglib2 expat - -HOST_DBUS_GLIB_DEPENDENCIES = host-dbus host-expat host-libglib2 - -HOST_DBUS_GLIB_CONF_OPTS = \ - --disable-tests \ - --disable-xml-docs \ - --disable-bash-completion \ - --disable-doxygen-docs \ - --enable-asserts=yes - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# dbus-glib for the host -DBUS_GLIB_HOST_BINARY = $(HOST_DIR)/usr/bin/dbus-binding-tool diff --git a/package.bak/dbus-python/Config.in b/package.bak/dbus-python/Config.in deleted file mode 100644 index 332726348d..0000000000 --- a/package.bak/dbus-python/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_DBUS_PYTHON - bool "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 || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_DBUS_GLIB - # pyexpat: runtime dependency only - 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 || BR2_PACKAGE_PYTHON3) - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/dbus-python/dbus-python.hash b/package.bak/dbus-python/dbus-python.hash deleted file mode 100644 index 080aada081..0000000000 --- a/package.bak/dbus-python/dbus-python.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 e2f1d6871f74fba23652e51d10873e54f71adab0525833c19bad9e99b1b2f9cc dbus-python-1.2.4.tar.gz diff --git a/package.bak/dbus-python/dbus-python.mk b/package.bak/dbus-python/dbus-python.mk deleted file mode 100644 index 599d019857..0000000000 --- a/package.bak/dbus-python/dbus-python.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# dbus-python -# -################################################################################ - -DBUS_PYTHON_VERSION = 1.2.4 -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_DEPENDENCIES = dbus-glib -DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs - -ifeq ($(BR2_PACKAGE_PYTHON),y) -DBUS_PYTHON_DEPENDENCIES += python host-python - -DBUS_PYTHON_CONF_ENV += \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \ - PYTHON_LIBS="`$(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="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \ - PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/dbus-triggerd/Config.in b/package.bak/dbus-triggerd/Config.in deleted file mode 100644 index a39f911fdb..0000000000 --- a/package.bak/dbus-triggerd/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_DBUS_TRIGGERD - bool "dbus-triggerd" - depends on BR2_USE_MMU # fork(), dbus - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus - depends on BR2_PACKAGE_DBUS - help - dbus-triggerd is a tool to trigger shell-commands upon receiving - a given dbus-signal. - - http://gareus.org/oss/dbustriggerd/start - -comment "dbus-triggerd needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_DBUS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/dbus-triggerd/dbus-triggerd.mk b/package.bak/dbus-triggerd/dbus-triggerd.mk deleted file mode 100644 index 48d5fb29fe..0000000000 --- a/package.bak/dbus-triggerd/dbus-triggerd.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# dbus-triggerd -# -################################################################################ - -DBUS_TRIGGERD_VERSION = ba3dbec805cb707c94c54de21666bf18b79bcc09 -DBUS_TRIGGERD_SITE = git://rg42.org/dbustriggerd.git -DBUS_TRIGGERD_LICENSE = GPLv2+ -DBUS_TRIGGERD_DEPENDENCIES = host-pkgconf dbus - -define DBUS_TRIGGERD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) all -endef - -define DBUS_TRIGGERD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dbus/Config.in b/package.bak/dbus/Config.in deleted file mode 100644 index 653f7482f6..0000000000 --- a/package.bak/dbus/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_DBUS - bool "dbus" - depends on BR2_TOOLCHAIN_HAS_THREADS - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_EXPAT - help - The D-Bus message bus system. - - http://www.freedesktop.org/wiki/Software/dbus - -comment "dbus needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/dbus/S30dbus b/package.bak/dbus/S30dbus deleted file mode 100644 index b4bcf9c7aa..0000000000 --- a/package.bak/dbus/S30dbus +++ /dev/null @@ -1,74 +0,0 @@ -#!/bin/sh -# -# messagebus: The D-BUS systemwide message bus -# -# chkconfig: 345 97 03 -# description: This is a daemon which broadcasts notifications of system events \ -# and other messages. See http://www.freedesktop.org/software/dbus/ -# -# processname: dbus-daemon -# pidfile: /var/run/messagebus.pid -# - -# Sanity checks. -[ -x /usr/bin/dbus-daemon ] || exit 0 - -# Create needed directories. -[ -d /var/run/dbus ] || mkdir -p /var/run/dbus -[ -d /var/lock/subsys ] || mkdir -p /var/lock/subsys -[ -d /tmp/dbus ] || mkdir -p /tmp/dbus - -RETVAL=0 - -start() { - printf "Starting system message bus: " - - dbus-uuidgen --ensure - dbus-daemon --system - RETVAL=$? - echo "done" - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/dbus-daemon -} - -stop() { - printf "Stopping system message bus: " - - ## we don't want to kill all the per-user $processname, we want - ## to use the pid file *only*; because we use the fake nonexistent - ## program name "$servicename" that should be safe-ish - killall dbus-daemon - RETVAL=$? - echo "done" - if [ $RETVAL -eq 0 ]; then - rm -f /var/lock/subsys/dbus-daemon - rm -f /var/run/messagebus.pid - fi -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - reload) - echo "Message bus can't reload its configuration, you have to restart it" - RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|reload}" - ;; -esac -exit $RETVAL diff --git a/package.bak/dbus/dbus.hash b/package.bak/dbus/dbus.hash deleted file mode 100644 index af8143d315..0000000000 --- a/package.bak/dbus/dbus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a7b0ba6ea3e8d0e08afec5e3030d0245614268276620c536726f8fa6e5c43388 dbus-1.10.16.tar.gz diff --git a/package.bak/dbus/dbus.mk b/package.bak/dbus/dbus.mk deleted file mode 100644 index 2d1583e550..0000000000 --- a/package.bak/dbus/dbus.mk +++ /dev/null @@ -1,129 +0,0 @@ -################################################################################ -# -# dbus -# -################################################################################ - -DBUS_VERSION = 1.10.16 -DBUS_SITE = http://dbus.freedesktop.org/releases/dbus -DBUS_LICENSE = AFLv2.1 or GPLv2+ (library, tools), GPLv2+ (tools) -DBUS_LICENSE_FILES = COPYING -DBUS_INSTALL_STAGING = YES - -define DBUS_PERMISSIONS - /usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - - -endef - -define DBUS_USERS - dbus -1 dbus -1 * /var/run/dbus - dbus DBus messagebus user -endef - -DBUS_DEPENDENCIES = host-pkgconf expat - -DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes -DBUS_CONF_OPTS = \ - --with-dbus-user=dbus \ - --disable-tests \ - --disable-asserts \ - --enable-abstract-sockets \ - --disable-selinux \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --disable-dnotify \ - --with-xml=expat \ - --with-system-socket=/var/run/dbus/system_bus_socket \ - --with-system-pid-file=/var/run/messagebus.pid \ - --with-init-scripts=none - -ifeq ($(BR2_STATIC_LIBS),y) -DBUS_CONF_OPTS += LIBS='-pthread' -endif - -ifeq ($(BR2_microblaze),y) -# microblaze toolchain doesn't provide inotify_rm_* but does have sys/inotify.h -DBUS_CONF_OPTS += --disable-inotify -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -DBUS_CONF_OPTS += --enable-selinux -DBUS_DEPENDENCIES += libselinux -else -DBUS_CONF_OPTS += --disable-selinux -endif - -ifeq ($(BR2_PACKAGE_AUDIT)$(BR2_PACKAGE_LIBCAP_NG),yy) -DBUS_CONF_OPTS += --enable-libaudit -DBUS_DEPENDENCIES += audit libcap-ng -else -DBUS_CONF_OPTS += --disable-libaudit -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -DBUS_CONF_OPTS += --with-x -DBUS_DEPENDENCIES += xlib_libX11 -ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) -DBUS_DEPENDENCIES += xlib_libSM -endif -else -DBUS_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_INIT_SYSTEMD),y) -DBUS_CONF_OPTS += \ - --enable-systemd \ - --with-systemdsystemunitdir=/usr/lib/systemd/system -DBUS_DEPENDENCIES += systemd -else -DBUS_CONF_OPTS += --disable-systemd -endif - -# fix rebuild (dbus makefile errors out if /var/lib/dbus is a symlink) -define DBUS_REMOVE_VAR_LIB_DBUS - rm -rf $(TARGET_DIR)/var/lib/dbus -endef - -DBUS_POST_BUILD_HOOKS += DBUS_REMOVE_VAR_LIB_DBUS - -define DBUS_REMOVE_DEVFILES - rm -rf $(TARGET_DIR)/usr/lib/dbus-1.0 -endef - -DBUS_POST_INSTALL_TARGET_HOOKS += DBUS_REMOVE_DEVFILES - -define DBUS_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/dbus/S30dbus \ - $(TARGET_DIR)/etc/init.d/S30dbus - - mkdir -p $(TARGET_DIR)/var/lib - rm -rf $(TARGET_DIR)/var/lib/dbus - ln -sf /tmp/dbus $(TARGET_DIR)/var/lib/dbus -endef - -define DBUS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/var/lib/dbus - ln -sf /etc/machine-id $(TARGET_DIR)/var/lib/dbus/machine-id -endef - -HOST_DBUS_DEPENDENCIES = host-pkgconf host-expat -HOST_DBUS_CONF_OPTS = \ - --with-dbus-user=dbus \ - --disable-tests \ - --disable-asserts \ - --enable-abstract-sockets \ - --disable-selinux \ - --disable-xml-docs \ - --disable-doxygen-docs \ - --enable-dnotify \ - --without-x \ - --with-xml=expat - -# dbus for the host -DBUS_HOST_INTROSPECT = $(HOST_DBUS_DIR)/introspect.xml - -HOST_DBUS_GEN_INTROSPECT = \ - $(HOST_DIR)/usr/bin/dbus-daemon --introspect > $(DBUS_HOST_INTROSPECT) - -HOST_DBUS_POST_INSTALL_HOOKS += HOST_DBUS_GEN_INTROSPECT - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/dcron/Config.in b/package.bak/dcron/Config.in deleted file mode 100644 index d7f66bdb7d..0000000000 --- a/package.bak/dcron/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_DCRON - bool "dcron" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - dcron is a time-based job scheduler with anacron-like - features. It works as a background daemon that parses - individual crontab files and executes commands on behalf of - the users in question. - - Upon installation, this package will enable a system level - cron daemon with hourly, daily, weekly and monthly crontabs. - - However, it doesn't allow non root users to create their own - crontab file. This is because /var/spool/cron/crontabs is - non user writable. - - Typically, a crontab group is created on the system and - users allowed to create crontab entries are added into this - group, while crontab executable is owned by root:crontab - with sgid bit enabled. - - http://www.jimpryor.net/linux/dcron.html diff --git a/package.bak/dcron/S90dcron b/package.bak/dcron/S90dcron deleted file mode 100644 index de21d2ca13..0000000000 --- a/package.bak/dcron/S90dcron +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting cron ... " - start-stop-daemon -S -q -m -b -p /var/run/dcron.pid --exec /usr/sbin/crond -- -f - echo "done." - ;; - stop) - printf "Stopping cron ..." - start-stop-daemon -K -q -p /var/run/dcron.pid - echo "done." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/dcron/dcron.hash b/package.bak/dcron/dcron.hash deleted file mode 100644 index 3e53ddc25f..0000000000 --- a/package.bak/dcron/dcron.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9e50edb6f5bd8153b16bad05087d985e5153ce45cc01ae77e7f842213fb4a824 dcron-4.5.tar.gz diff --git a/package.bak/dcron/dcron.mk b/package.bak/dcron/dcron.mk deleted file mode 100644 index 7e81b63803..0000000000 --- a/package.bak/dcron/dcron.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# dcron -# -################################################################################ - -DCRON_VERSION = 4.5 -DCRON_SITE = http://www.jimpryor.net/linux/releases -# The source code does not specify the version of the GPL that is used. -DCRON_LICENSE = GPL - -# Overwrite cron-related Busybox commands if available -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -DCRON_DEPENDENCIES = busybox -endif - -define DCRON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define DCRON_INSTALL_TARGET_CMDS - $(INSTALL) -D -m0700 $(@D)/crond $(TARGET_DIR)/usr/sbin/crond - $(INSTALL) -D -m4755 $(@D)/crontab $(TARGET_DIR)/usr/bin/crontab - $(INSTALL) -D -m0644 $(@D)/extra/root.crontab $(TARGET_DIR)/etc/cron.d/system - # Busybox provides run-parts, so there is no need to use nor install provided run-cron - $(SED) 's#/usr/sbin/run-cron#/bin/run-parts#g' $(TARGET_DIR)/etc/cron.d/system - $(INSTALL) -d -m0755 $(TARGET_DIR)/var/spool/cron/crontabs \ - $(TARGET_DIR)/etc/cron.daily $(TARGET_DIR)/etc/cron.hourly \ - $(TARGET_DIR)/etc/cron.monthly $(TARGET_DIR)/etc/cron.weekly -endef - -define DCRON_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/dcron/S90dcron $(TARGET_DIR)/etc/init.d/S90dcron -endef - -define DCRON_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/dcron/dcron.service \ - $(TARGET_DIR)/usr/lib/systemd/system/dcron.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/dcron.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dcron.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/dcron/dcron.service b/package.bak/dcron/dcron.service deleted file mode 100644 index 924ed72205..0000000000 --- a/package.bak/dcron/dcron.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Task scheduler daemon -After=syslog.target - -[Service] -ExecStart=/usr/sbin/crond -S -Type=forking - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/ddrescue/0001-io.cc-add-stdio.h-include.patch b/package.bak/ddrescue/0001-io.cc-add-stdio.h-include.patch deleted file mode 100644 index e719c708e8..0000000000 --- a/package.bak/ddrescue/0001-io.cc-add-stdio.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 0f72787b922c53c33d497b17300a959b911e621f Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 14 Feb 2017 20:12:05 +0100 -Subject: [PATCH] io.cc: add stdio.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes buildroot compile failure with uclibc [1]: - - In file included from io.cc:28:0: - block.h:219:22: error: ‘FILE’ has not been declared - int write_mapfile( FILE * f = 0, const bool timestamp = false, - -[1] http://autobuild.buildroot.net/results/4ac0754f1cc5ea934d6437e89d1f4906fb3fd0a8 - -Signed-off-by: Peter Seiderer ---- - io.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/io.cc b/io.cc -index 36b8341..2d6a76e 100644 ---- a/io.cc -+++ b/io.cc -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - - #include "block.h" --- -2.11.0 - diff --git a/package.bak/ddrescue/Config.in b/package.bak/ddrescue/Config.in deleted file mode 100644 index 2ec3e7e303..0000000000 --- a/package.bak/ddrescue/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_DDRESCUE - bool "ddrescue" - depends on BR2_INSTALL_LIBSTDCPP - help - GNU ddrescue is a data recovery tool. It copies data from one file - or block device (hard disc, cdrom, etc) to another, trying to - rescue the good parts first in case of read errors. - - http://www.gnu.org/software/ddrescue/ddrescue.html - -comment "ddrescue needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/ddrescue/ddrescue.hash b/package.bak/ddrescue/ddrescue.hash deleted file mode 100644 index bffa6153fe..0000000000 --- a/package.bak/ddrescue/ddrescue.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2017-02/msg00003.html -sha1 df981672a612639ad0934e3fa6546a41d2feb99e ddrescue-1.22.tar.lz diff --git a/package.bak/ddrescue/ddrescue.mk b/package.bak/ddrescue/ddrescue.mk deleted file mode 100644 index 4e244e6bda..0000000000 --- a/package.bak/ddrescue/ddrescue.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# ddrescue -# -################################################################################ - -DDRESCUE_VERSION = 1.22 -DDRESCUE_SOURCE = ddrescue-$(DDRESCUE_VERSION).tar.lz -DDRESCUE_SITE = http://download.savannah.gnu.org/releases/ddrescue -DDRESCUE_LICENSE = GPLv2+ -DDRESCUE_LICENSE_FILES = COPYING - -define DDRESCUE_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) ./configure \ - --prefix=/usr \ - $(TARGET_CONFIGURE_OPTS) \ - ) -endef - -define DDRESCUE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define DDRESCUE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/debianutils/Config.in b/package.bak/debianutils/Config.in deleted file mode 100644 index c43f330026..0000000000 --- a/package.bak/debianutils/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_DEBIANUTILS - bool "debianutils" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Miscellaneous utilities specific to Debian. - - The specific utilities included are: add-shell installkernel - ischroot remove-shell run-parts savelog tempfile which. - - https://tracker.debian.org/pkg/debianutils diff --git a/package.bak/debianutils/debianutils.hash b/package.bak/debianutils/debianutils.hash deleted file mode 100644 index cd54e0b8b7..0000000000 --- a/package.bak/debianutils/debianutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/debianutils/debianutils_4.8.1.dsc -sha256 2c395c0bdcfe89de30828b1d25cc5549ded5225a6d3625fbcb2cc0881ef5f026 debianutils_4.8.1.tar.xz diff --git a/package.bak/debianutils/debianutils.mk b/package.bak/debianutils/debianutils.mk deleted file mode 100644 index 83cf744413..0000000000 --- a/package.bak/debianutils/debianutils.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# debianutils -# -################################################################################ - -DEBIANUTILS_VERSION = 4.8.1 -DEBIANUTILS_SOURCE = debianutils_$(DEBIANUTILS_VERSION).tar.xz -DEBIANUTILS_SITE = http://snapshot.debian.org/archive/debian/20161118T033019Z/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.bak/dejavu/Config.in b/package.bak/dejavu/Config.in deleted file mode 100644 index 5d21e56088..0000000000 --- a/package.bak/dejavu/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_DEJAVU - bool "DejaVu fonts" - help - The DejaVu fonts are a font family based on the Vera Fonts. - Its purpose is to provide a wider range of characters while - maintaining the original look and feel through the process - of collaborative development, under a Free license. - - http://dejavu-fonts.org - -if BR2_PACKAGE_DEJAVU - -config BR2_PACKAGE_DEJAVU_MONO - bool "mono fonts" - default y - -config BR2_PACKAGE_DEJAVU_SANS - bool "sans fonts" - default y - -config BR2_PACKAGE_DEJAVU_SERIF - bool "serif fonts" - default y - -config BR2_PACKAGE_DEJAVU_SANS_CONDENSED - bool "sans condensed fonts" - default y - -config BR2_PACKAGE_DEJAVU_SERIF_CONDENSED - bool "serif condensed fonts" - default y - -endif diff --git a/package.bak/dejavu/dejavu.hash b/package.bak/dejavu/dejavu.hash deleted file mode 100644 index 37868c13d8..0000000000 --- a/package.bak/dejavu/dejavu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://dejavu-fonts.org/wiki/Download -sha256 f6d7965586101ff3a8a5c3ec503e082bb6a9604ff53413e10702e5917c194d88 dejavu-fonts-ttf-2.35.tar.bz2 diff --git a/package.bak/dejavu/dejavu.mk b/package.bak/dejavu/dejavu.mk deleted file mode 100644 index 3dbcc94e16..0000000000 --- a/package.bak/dejavu/dejavu.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# dejavu -# -################################################################################ - -DEJAVU_VERSION = 2.35 -DEJAVU_SITE = http://sourceforge.net/projects/dejavu/files/dejavu/$(DEJAVU_VERSION) -DEJAVU_SOURCE = dejavu-fonts-ttf-$(DEJAVU_VERSION).tar.bz2 -DEJAVU_LICENSE_FILES = LICENSE - -DEJAVU_FONTS_INSTALL = -DEJAVU_FONTCONFIG_CONF_INSTALL = - -ifeq ($(BR2_PACKAGE_DEJAVU_MONO),y) -DEJAVU_FONTS_INSTALL += DejaVuSansMono*.ttf -DEJAVU_FONTCONFIG_CONF_INSTALL += \ - 20-unhint-small-dejavu-sans-mono.conf \ - 57-dejavu-sans-mono.conf -endif - -ifeq ($(BR2_PACKAGE_DEJAVU_SANS),y) -DEJAVU_FONTS_INSTALL += DejaVuSans.ttf DejaVuSans-*.ttf -DEJAVU_FONTCONFIG_CONF_INSTALL += \ - 20-unhint-small-dejavu-sans.conf \ - 57-dejavu-sans.conf -endif - -ifeq ($(BR2_PACKAGE_DEJAVU_SERIF),y) -DEJAVU_FONTS_INSTALL += DejaVuSerif.ttf DejaVuSerif-*.ttf -DEJAVU_FONTCONFIG_CONF_INSTALL += \ - 20-unhint-small-dejavu-serif.conf \ - 57-dejavu-serif.conf -endif - -ifeq ($(BR2_PACKAGE_DEJAVU_SANS_CONDENSED),y) -DEJAVU_FONTS_INSTALL += DejaVuSansCondensed*.ttf -endif - -ifeq ($(BR2_PACKAGE_DEJAVU_SERIF_CONDENSED),y) -DEJAVU_FONTS_INSTALL += DejaVuSerifCondensed*.ttf -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -define DEJAVU_FONTCONFIG_CONF_INSTALL_CMDS - for i in $(DEJAVU_FONTCONFIG_CONF_INSTALL) ; do \ - $(INSTALL) -D -m 0644 $(@D)/fontconfig/$$i \ - $(TARGET_DIR)/usr/share/fontconfig/conf.avail/$$i || exit 1 ; \ - done -endef -endif - -define DEJAVU_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/fonts/dejavu/ - for i in $(DEJAVU_FONTS_INSTALL) ; do \ - $(INSTALL) -m 0644 $(@D)/ttf/$$i \ - $(TARGET_DIR)/usr/share/fonts/dejavu/ || exit 1 ; \ - done - $(DEJAVU_FONTCONFIG_CONF_INSTALL_CMDS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/devmem2/0001-be-coherent-in-type-usage.patch b/package.bak/devmem2/0001-be-coherent-in-type-usage.patch deleted file mode 100644 index 1777387734..0000000000 --- a/package.bak/devmem2/0001-be-coherent-in-type-usage.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 6570e7afe1eebd64022b871b9ebd9a76be267f57 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 29 Jun 2014 16:27:49 +0200 -Subject: [PATCH] Be coherent in type usage - -- no need to use off_t because it is read from strtoul() -- print unsigned int type correctly - -When built with _FILE_OFFSET_BITS=64, off_t becomes an long long int -and was printed as an unsigned int which lead to a garbled output. - -Signed-off-by: Colin Didier -Signed-off-by: Thomas Petazzoni ---- - devmem2.c | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/devmem2.c b/devmem2.c -index 7732ecb..7aa5c79 100644 ---- a/devmem2.c -+++ b/devmem2.c -@@ -58,8 +58,7 @@ - int main(int argc, char **argv) { - int fd; - void *map_base, *virt_addr; -- unsigned long read_result, writeval; -- off_t target; -+ unsigned long target, read_result, writeval; - int access_type = 'w'; - - if(argc < 2) { -@@ -101,7 +100,7 @@ int main(int argc, char **argv) { - fprintf(stderr, "Illegal data type '%c'.\n", access_type); - exit(2); - } -- printf("Value at address 0x%X (%p): 0x%X\n", target, virt_addr, read_result); -+ printf("Value at address 0x%lX (%p): 0x%X\n", target, virt_addr, read_result); - fflush(stdout); - - if(argc > 3) { -@@ -120,7 +119,7 @@ int main(int argc, char **argv) { - read_result = *((unsigned long *) virt_addr); - break; - } -- printf("Written 0x%X; readback 0x%X\n", writeval, read_result); -+ printf("Written 0x%lX; readback 0x%X\n", writeval, read_result); - fflush(stdout); - } - --- -2.0.0 - diff --git a/package.bak/devmem2/Config.in b/package.bak/devmem2/Config.in deleted file mode 100644 index 64d6400bd8..0000000000 --- a/package.bak/devmem2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_DEVMEM2 - bool "devmem2" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Simple program to read/write from/to any location in memory. - - http://free-electrons.com/pub/mirror/devmem2.c diff --git a/package.bak/devmem2/devmem2.hash b/package.bak/devmem2/devmem2.hash deleted file mode 100644 index fff5306b7e..0000000000 --- a/package.bak/devmem2/devmem2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3b15515693bae1ebd14d914e46d388edfec2175829ea1576a7a0c8606ebbe639 devmem2.c diff --git a/package.bak/devmem2/devmem2.mk b/package.bak/devmem2/devmem2.mk deleted file mode 100644 index 7f0594e21c..0000000000 --- a/package.bak/devmem2/devmem2.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# devmem2 -# -################################################################################ - -DEVMEM2_SITE = http://free-electrons.com/pub/mirror -DEVMEM2_SOURCE = devmem2.c -DEVMEM2_VERSION = 1 -DEVMEM2_LICENSE = GPLv2+ -DEVMEM2_LICENSE_FILES = devmem2.c - -define DEVMEM2_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ -endef - -define DEVMEM2_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) devmem2 -endef - -define DEVMEM2_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/devmem2 $(TARGET_DIR)/sbin/devmem2 -endef - -$(eval $(generic-package)) diff --git a/package.bak/dfu-util/Config.in.host b/package.bak/dfu-util/Config.in.host deleted file mode 100644 index ea47a36c7b..0000000000 --- a/package.bak/dfu-util/Config.in.host +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_HOST_DFU_UTIL - bool "host dfu-util" - help - Dfu-util is the host side implementation of the DFU 1.0 - specification of the USB forum. DFU is intended to download - and upload firmware to devices connected over USB. - - http://dfu-util.sourceforge.net/ diff --git a/package.bak/dfu-util/dfu-util.hash b/package.bak/dfu-util/dfu-util.hash deleted file mode 100644 index bf618d1ae8..0000000000 --- a/package.bak/dfu-util/dfu-util.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://dfu-util.sourceforge.net/releases/dfu-util-0.9.tar.gz.md5 -md5 233bb1e08ef4b405062445d84e28fde6 dfu-util-0.9.tar.gz - -# Locally computed -sha256 36428c6a6cb3088cad5a3592933385253da5f29f2effa61518ee5991ea38f833 dfu-util-0.9.tar.gz diff --git a/package.bak/dfu-util/dfu-util.mk b/package.bak/dfu-util/dfu-util.mk deleted file mode 100644 index 079f875930..0000000000 --- a/package.bak/dfu-util/dfu-util.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# dfu-util -# -################################################################################ - -DFU_UTIL_VERSION = 0.9 -DFU_UTIL_SITE = http://dfu-util.sourceforge.net/releases -DFU_UTIL_LICENSE = GPLv2+ -DFU_UTIL_LICENSE_FILES = COPYING - -HOST_DFU_UTIL_DEPENDENCIES = host-libusb - -$(eval $(host-autotools-package)) diff --git a/package.bak/dhcp/0002-bind-cross-compile.patch b/package.bak/dhcp/0002-bind-cross-compile.patch deleted file mode 100644 index f7c42c6ce2..0000000000 --- a/package.bak/dhcp/0002-bind-cross-compile.patch +++ /dev/null @@ -1,24 +0,0 @@ -bind cross compile support integration - -Pass system types from dhcp configure to bind configure. - -This patch is submitted upstream as part of a cross compiling enhancement -suggestion to dhcp-suggest@isc.org. Reference ISC-Bugs #41502. - -Signed-off-by: Doug Kehn - -Index: dhcp-4.3.3-P1/bind/Makefile.in -=================================================================== ---- dhcp-4.3.3-P1.orig/bind/Makefile.in -+++ dhcp-4.3.3-P1/bind/Makefile.in -@@ -30,7 +30,9 @@ bindconfig = --disable-kqueue --disable- - --without-openssl --without-libxml2 --enable-exportlib \ - --with-gssapi=no --enable-threads=no @BINDCONFIG@ \ - --with-export-includedir=${binddir}/include \ -- --with-export-libdir=${binddir}/lib -+ --with-export-libdir=${binddir}/lib \ -+ --target=@target_alias@ --host=@host_alias@ \ -+ --build=@build_alias@ - - @BIND_ATF_FALSE@cleandirs = ./lib ./include - @BIND_ATF_TRUE@cleandirs = ./lib ./include ./atf diff --git a/package.bak/dhcp/Config.in b/package.bak/dhcp/Config.in deleted file mode 100644 index 4a3049584d..0000000000 --- a/package.bak/dhcp/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_DHCP - bool "dhcp (ISC)" - # fork() - depends on BR2_USE_MMU - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - DHCP relay agent from the ISC DHCP distribution. - - http://www.isc.org/products/DHCP - -if BR2_PACKAGE_DHCP - -config BR2_PACKAGE_DHCP_SERVER - bool "dhcp server" - help - DHCP server from the ISC DHCP distribution. - -config BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK - bool "Enable delayed ACK feature" - depends on BR2_PACKAGE_DHCP_SERVER - help - Enable delayed ACK feature in the ISC DHCP server. - -config BR2_PACKAGE_DHCP_RELAY - bool "dhcp relay" - help - DHCP relay agent from the ISC DHCP distribution. - - -config BR2_PACKAGE_DHCP_CLIENT - bool "dhcp client" - help - DHCP client from the ISC DHCP distribution. - -endif diff --git a/package.bak/dhcp/S80dhcp-relay b/package.bak/dhcp/S80dhcp-relay deleted file mode 100755 index 211431bfff..0000000000 --- a/package.bak/dhcp/S80dhcp-relay +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# -# $Id: dhcp3-relay,v 1.1 2004/04/16 15:41:08 ml Exp $ -# - -# What servers should the DHCP relay forward requests to? -# e.g: SERVERS="192.168.0.1" -SERVERS="" - -# On what interfaces should the DHCP relay (dhrelay) serve DHCP requests? -INTERFACES="" - -# Additional options that are passed to the DHCP relay daemon? -OPTIONS="" - -# Read configuration variable file if it is present -CFG_FILE="/etc/default/dhcrelay" -[ -r "${CFG_FILE}" ] && . "${CFG_FILE}" - -# Sanity checks -test -f /usr/sbin/dhcrelay || exit 0 -test -n "$INTERFACES" || exit 0 -test -n "$SERVERS" || exit 0 - -# Build command line for interfaces (will be passed to dhrelay below.) -IFCMD="" -for I in $INTERFACES; do - IFCMD=${IFCMD}"-i "${I}" " -done - -DHCRELAYPID=/var/run/dhcrelay.pid - -case "$1" in - start) - printf "Starting DHCP relay: " - start-stop-daemon -S -q -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping DHCP relay: " - start-stop-daemon -K -q -x /usr/sbin/dhcrelay - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart | force-reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 -esac - -exit 0 diff --git a/package.bak/dhcp/S80dhcp-server b/package.bak/dhcp/S80dhcp-server deleted file mode 100755 index 21092bab9f..0000000000 --- a/package.bak/dhcp/S80dhcp-server +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# $Id: dhcp3-server.init.d,v 1.4 2003/07/13 19:12:41 mdz Exp $ -# - -# On what interfaces should the DHCP server (dhcpd) serve DHCP requests? -# Separate multiple interfaces with spaces, e.g. "eth0 eth1". -INTERFACES="" - -# Additional options that are passed to the DHCP server daemon? -OPTIONS="" - -NAME="dhcpd" -DAEMON="/usr/sbin/${NAME}" -CFG_FILE="/etc/default/${NAME}" - -# Read configuration variable file if it is present -[ -r "${CFG_FILE}" ] && . "${CFG_FILE}" - -# Sanity checks -test -f /usr/sbin/dhcpd || exit 0 -test -f /etc/dhcp/dhcpd.conf || exit 0 - -case "$1" in - start) - printf "Starting DHCP server: " - test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ - test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases - start-stop-daemon -S -q -x ${DAEMON} -- -q $OPTIONS $INTERFACES - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping DHCP server: " - start-stop-daemon -K -q -x ${DAEMON} - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart | force-reload) - $0 stop - $0 start - if [ "$?" != "0" ]; then - exit 1 - fi - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 -esac - -exit 0 diff --git a/package.bak/dhcp/dhclient-script b/package.bak/dhcp/dhclient-script deleted file mode 100755 index cb292b6fbd..0000000000 --- a/package.bak/dhcp/dhclient-script +++ /dev/null @@ -1,284 +0,0 @@ -#!/bin/sh - -# dhclient-script from OpenWRT project -# http://git.openwrt.org/?p=packages.git;a=blob;f=net/isc-dhcp/files/dhclient-script;h=4afebc0ad20ebac51c5baae5ed01c6713e3a0fd0;hb=HEAD - -make_resolv_conf() { - if [ x"$new_domain_name_servers" != x ]; then - cat /dev/null > /etc/resolv.conf.dhclient - chmod 644 /etc/resolv.conf.dhclient - if [ x"$new_domain_search" != x ]; then - echo search $new_domain_search >> /etc/resolv.conf.dhclient - elif [ x"$new_domain_name" != x ]; then - # Note that the DHCP 'Domain Name Option' is really just a domain - # name, and that this practice of using the domain name option as - # a search path is both nonstandard and deprecated. - echo search $new_domain_name >> /etc/resolv.conf.dhclient - fi - for nameserver in $new_domain_name_servers; do - echo nameserver $nameserver >>/etc/resolv.conf.dhclient - done - - elif [ "x${new_dhcp6_name_servers}" != x ] ; then - cat /dev/null > /etc/resolv.conf.dhclient6 - chmod 644 /etc/resolv.conf.dhclient6 - - if [ "x${new_dhcp6_domain_search}" != x ] ; then - echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6 - fi - for nameserver in ${new_dhcp6_name_servers} ; do - echo nameserver ${nameserver} >> /etc/resolv.conf.dhclient6 - done - fi - - # if both v4 and v6 clients are running, concatenate results - cat /etc/resolv.conf.* > /etc/resolv.conf -} - -# Must be used on exit. Invokes the local dhcp client exit hooks, if any. -exit_with_hooks() { - exit_status=$1 - if [ -f /etc/dhclient-exit-hooks ]; then - . /etc/dhclient-exit-hooks - fi -# probably should do something with exit status of the local script - exit $exit_status -} - -# Invoke the local dhcp client enter hooks, if they exist. -if [ -f /etc/dhclient-enter-hooks ]; then - exit_status=0 - . /etc/dhclient-enter-hooks - # allow the local script to abort processing of this state - # local script must set exit_status variable to nonzero. - if [ $exit_status -ne 0 ]; then - exit $exit_status - fi -fi - -### -### DHCPv4 Handlers -### - -if [ x$new_broadcast_address != x ]; then - new_broadcast_arg="broadcast $new_broadcast_address" -fi -if [ x$new_subnet_mask != x ]; then - new_subnet_arg="netmask $new_subnet_mask" -fi -if [ x$alias_subnet_mask != x ]; then - alias_subnet_arg="netmask $alias_subnet_mask" -fi - -if [ x$reason = xMEDIUM ]; then - # Linux doesn't do mediums (ok, ok, media). - exit_with_hooks 0 -fi - -if [ x$reason = xPREINIT ]; then - if [ x$alias_ip_address != x ]; then - # Bring down alias interface. Its routes will disappear too. - ifconfig $interface:0- 0.0.0.0 - fi - ifconfig $interface 0.0.0.0 up - - # We need to give the kernel some time to get the interface up. - sleep 1 - - exit_with_hooks 0 -fi - -if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then - exit_with_hooks 0 -fi - -if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \ - [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then - current_hostname=`hostname` - if [ x$current_hostname = x ] || \ - [ x$current_hostname = x$old_host_name ]; then - if [ x$current_hostname = x ] || \ - [ x$new_host_name != x$old_host_name ]; then - hostname $new_host_name - fi - fi - - if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \ - [ x$alias_ip_address != x$old_ip_address ]; then - # Possible new alias. Remove old alias. - ifconfig $interface:0- 0.0.0.0 - fi - if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then - # IP address changed. Bringing down the interface will delete all routes, - # and clear the ARP cache. - ifconfig $interface 0.0.0.0 down - - fi - if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \ - [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then - - ifconfig $interface $new_ip_address $new_subnet_arg \ - $new_broadcast_arg - for router in $new_routers; do - if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - route add -host $router dev $interface - fi - route add default gw $router - done - fi - if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ]; - then - ifconfig $interface:0- 0.0.0.0 - ifconfig $interface:0 $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 - fi - make_resolv_conf - exit_with_hooks 0 -fi - -if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \ - || [ x$reason = xSTOP ]; then - if [ x$alias_ip_address != x ]; then - # Turn off alias interface. - ifconfig $interface:0- 0.0.0.0 - fi - if [ x$old_ip_address != x ]; then - # Shut down interface, which will delete routes and clear arp cache. - ifconfig $interface 0.0.0.0 down - fi - if [ x$alias_ip_address != x ]; then - ifconfig $interface:0 $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address $interface:0 - fi - - # remove v4 dns configuration for this interface - rm /etc/resolv.conf.dhclient - cat /etc/resolv.conf.* > /etc/resolv.conf - - exit_with_hooks 0 -fi - -if [ x$reason = xTIMEOUT ]; then - if [ x$alias_ip_address != x ]; then - ifconfig $interface:0- 0.0.0.0 - fi - ifconfig $interface $new_ip_address $new_subnet_arg \ - $new_broadcast_arg - set $new_routers - if ping -q -c 1 $1; then - if [ x$new_ip_address != x$alias_ip_address ] && \ - [ x$alias_ip_address != x ]; then - ifconfig $interface:0 $alias_ip_address $alias_subnet_arg - route add -host $alias_ip_address dev $interface:0 - fi - for router in $new_routers; do - if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then - route add -host $router dev $interface - fi - route add default gw $router - done - make_resolv_conf - exit_with_hooks 0 - fi - ifconfig $interface 0.0.0.0 down - exit_with_hooks 1 -fi - -### -### DHCPv6 Handlers -### - -if [ x$reason = xPREINIT6 ]; then - # Ensure interface is up. - ifconfig ${interface} up - - # Remove any stale addresses from aborted clients. - ip -f inet6 addr flush dev ${interface} scope global - - exit_with_hooks 0 -fi - -if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then - echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix} - - exit_with_hooks 0 -fi - -if [ x$reason = xBOUND6 ]; then - if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then - exit_with_hooks 2; - fi - - ifconfig ${interface} add ${new_ip6_address}/${new_ip6_prefixlen} - - # Check for nameserver options. - make_resolv_conf - -### << - # Set up softwire tunnel - if [ x${new_dhcp6_softwire} != x ] ; then - /etc/init.d/dhclient stop - ifconfig ${interface} 0.0.0.0 - ip -6 tunnel add tun0 mode ipip6 \ - remote ${new_dhcp6_softwire} \ - local ${new_ip6_address} \ - dev ${interface} encaplimit none - ip link set tun0 up - ip route add default dev tun0 - fi -### >> - - exit_with_hooks 0 -fi - -if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ]; then - if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then - exit_with_hooks 2; - fi - - ifconfig ${interface} add ${new_ip6_address}/${new_ip6_prefixlen} - - # Make sure nothing has moved around on us. - - # Nameservers/domains/etc. - if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] || - [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then - make_resolv_conf - fi - - exit_with_hooks 0 -fi - -if [ x$reason = xDEPREF6 ]; then - if [ x${new_ip6_address} = x ] ; then - exit_with_hooks 2; - fi - - # Busybox ifconfig has no way to communicate this to the kernel, so ignore it - - exit_with_hooks 0 -fi - -if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ]; then - if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then - exit_with_hooks 2; - fi - - ifconfig ${interface} del ${old_ip6_address}/${old_ip6_prefixlen} - - # remove v6 dns configuration for this interface - rm /etc/resolv.conf.dhclient6 - cat /etc/resolv.conf.* > /etc/resolv.conf - -### << - # Tear down softwire tunnel - if [ x${old_dhcp6_softwire} != x ] ; then - ip link set tun0 down - ip tunnel del tun0 - fi -### >> - - exit_with_hooks 0 -fi - -exit_with_hooks 0 diff --git a/package.bak/dhcp/dhclient.conf b/package.bak/dhcp/dhclient.conf deleted file mode 100644 index 0e6dcf96c2..0000000000 --- a/package.bak/dhcp/dhclient.conf +++ /dev/null @@ -1,50 +0,0 @@ -# Configuration file for /sbin/dhclient, which is included in Debian's -# dhcp3-client package. -# -# This is a sample configuration file for dhclient. See dhclient.conf's -# man page for more information about the syntax of this file -# and a more comprehensive list of the parameters understood by -# dhclient. -# -# Normally, if the DHCP server provides reasonable information and does -# not leave anything out (like the domain name, for example), then -# few changes must be made to this file, if any. -# - -#send host-name "andare.fugue.com"; -#send dhcp-client-identifier 1:0:a0:24:ab:fb:9c; -#send dhcp-lease-time 3600; -#supersede domain-name "fugue.com home.vix.com"; -#prepend domain-name-servers 127.0.0.1; -request subnet-mask, broadcast-address, time-offset, routers, - domain-name, domain-name-servers, host-name, - netbios-name-servers, netbios-scope; -#require subnet-mask, domain-name-servers; -#timeout 60; -#retry 60; -#reboot 10; -#select-timeout 5; -#initial-interval 2; -#script "/etc/dhcp3/dhclient-script"; -#media "-link0 -link1 -link2", "link0 link1"; -#reject 192.33.137.209; - -#alias { -# interface "eth0"; -# fixed-address 192.5.5.213; -# option subnet-mask 255.255.255.255; -#} - -#lease { -# interface "eth0"; -# fixed-address 192.33.137.200; -# medium "link0 link1"; -# option host-name "andare.swiftmedia.com"; -# option subnet-mask 255.255.255.0; -# option broadcast-address 192.33.137.255; -# option routers 192.33.137.250; -# option domain-name-servers 127.0.0.1; -# renew 2 2000/1/12 00:00:01; -# rebind 2 2000/1/12 00:00:01; -# expire 2 2000/1/12 00:00:01; -#} diff --git a/package.bak/dhcp/dhcp.hash b/package.bak/dhcp/dhcp.hash deleted file mode 100644 index 7898aa45d3..0000000000 --- a/package.bak/dhcp/dhcp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Verified from https://ftp.isc.org/isc/dhcp/4.3.5/dhcp-4.3.5.tar.gz.sha256.asc -sha256 eb95936bf15d2393c55dd505bc527d1d4408289cec5a9fa8abb99f7577e7f954 dhcp-4.3.5.tar.gz diff --git a/package.bak/dhcp/dhcp.mk b/package.bak/dhcp/dhcp.mk deleted file mode 100644 index 4d2cb06352..0000000000 --- a/package.bak/dhcp/dhcp.mk +++ /dev/null @@ -1,118 +0,0 @@ -################################################################################ -# -# dhcp -# -################################################################################ - -DHCP_VERSION = 4.3.5 -DHCP_SITE = http://ftp.isc.org/isc/dhcp/$(DHCP_VERSION) -DHCP_INSTALL_STAGING = YES -DHCP_LICENSE = ISC -DHCP_LICENSE_FILES = LICENSE -DHCP_CONF_ENV = \ - CPPFLAGS='-D_PATH_DHCPD_CONF=\"/etc/dhcp/dhcpd.conf\" \ - -D_PATH_DHCLIENT_CONF=\"/etc/dhcp/dhclient.conf\"' -DHCP_CONF_OPTS = \ - --with-randomdev=/dev/random \ - --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \ - --with-srv6-lease-file=/var/lib/dhcp/dhcpd6.leases \ - --with-cli-lease-file=/var/lib/dhcp/dhclient.leases \ - --with-cli6-lease-file=/var/lib/dhcp/dhclient6.leases \ - --with-srv-pid-file=/var/run/dhcpd.pid \ - --with-srv6-pid-file=/var/run/dhcpd6.pid \ - --with-cli-pid-file=/var/run/dhclient.pid \ - --with-cli6-pid-file=/var/run/dhclient6.pid \ - --with-relay-pid-file=/var/run/dhcrelay.pid \ - --with-relay6-pid-file=/var/run/dhcrelay6.pid - -# The source for the bind libraries used by dhcp are embedded in the dhcp source -# as a tar-ball. Extract the bind source to allow any patches to be applied -# during the patch phase. -define DHCP_EXTRACT_BIND - cd $(@D)/bind; tar -xvf bind.tar.gz -endef -DHCP_POST_EXTRACT_HOOKS += DHCP_EXTRACT_BIND - -# The patchset requires configure et.al. to be regenerated. -DHCP_AUTORECONF = YES - -# bind does not support parallel builds. -DHCP_MAKE = $(MAKE1) - -# bind configure is called via dhcp make instead of dhcp configure. The make env -# needs extra values for bind configure. -DHCP_MAKE_ENV = \ - $(TARGET_CONFIGURE_OPTS) \ - BUILD_CC="$(HOSTCC)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" \ - BUILD_CPPFLAGS="$(HOST_CPPFLAGS)" \ - BUILD_LDFLAGS="$(HOST_LDFLAGS)" - -ifeq ($(BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK),y) -DHCP_CONF_OPTS += --enable-delayed-ack -endif - -ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) -define DHCP_INSTALL_SERVER - mkdir -p $(TARGET_DIR)/var/lib - (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(@D)/server/dhcpd $(TARGET_DIR)/usr/sbin/dhcpd - $(INSTALL) -m 0644 -D package/dhcp/dhcpd.conf \ - $(TARGET_DIR)/etc/dhcp/dhcpd.conf -endef -endif - -ifeq ($(BR2_PACKAGE_DHCP_RELAY),y) -define DHCP_INSTALL_RELAY - mkdir -p $(TARGET_DIR)/var/lib - (cd $(TARGET_DIR)/var/lib; ln -snf /tmp dhcp) - $(INSTALL) -m 0755 -D $(DHCP_DIR)/relay/dhcrelay \ - $(TARGET_DIR)/usr/sbin/dhcrelay -endef -endif - -ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -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)/sbin/dhclient - $(INSTALL) -m 0644 -D package/dhcp/dhclient.conf \ - $(TARGET_DIR)/etc/dhcp/dhclient.conf - $(INSTALL) -m 0755 -D package/dhcp/dhclient-script \ - $(TARGET_DIR)/sbin/dhclient-script -endef -endif - -# Options don't matter, scripts won't start if binaries aren't there -define DHCP_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/dhcp/S80dhcp-server \ - $(TARGET_DIR)/etc/init.d/S80dhcp-server - $(INSTALL) -m 0755 -D package/dhcp/S80dhcp-relay \ - $(TARGET_DIR)/etc/init.d/S80dhcp-relay -endef - -ifeq ($(BR2_PACKAGE_DHCP_SERVER),y) -define DHCP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/dhcp/dhcpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/dhcpd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf ../../../../usr/lib/systemd/system/dhcpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dhcpd.service - - echo "d /var/lib/dhcp 0755 - - - -" > \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf - echo "f /var/lib/dhcp/dhcpd.leases - - - - -" >> \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/dhcpd.conf -endef -endif - -define DHCP_INSTALL_TARGET_CMDS - $(DHCP_INSTALL_RELAY) - $(DHCP_INSTALL_SERVER) - $(DHCP_INSTALL_CLIENT) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dhcp/dhcpd.conf b/package.bak/dhcp/dhcpd.conf deleted file mode 100644 index 0001c0f00e..0000000000 --- a/package.bak/dhcp/dhcpd.conf +++ /dev/null @@ -1,108 +0,0 @@ -# -# Sample configuration file for ISC dhcpd for Debian -# -# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $ -# - -# The ddns-updates-style parameter controls whether or not the server will -# attempt to do a DNS update when a lease is confirmed. We default to the -# behavior of the version 2 packages ('none', since DHCP v2 didn't -# have support for DDNS.) -ddns-update-style none; - -# option definitions common to all supported networks... -option domain-name "example.org"; -option domain-name-servers ns1.example.org, ns2.example.org; - -default-lease-time 600; -max-lease-time 7200; - -# If this DHCP server is the official DHCP server for the local -# network, the authoritative directive should be uncommented. -#authoritative; - -# Use this to send dhcp log messages to a different log file (you also -# have to hack syslog.conf to complete the redirection). -log-facility local7; - -# No service will be given on this subnet, but declaring it helps the -# DHCP server to understand the network topology. - -#subnet 10.152.187.0 netmask 255.255.255.0 { -#} - -# This is a very basic subnet declaration. - -#subnet 10.254.239.0 netmask 255.255.255.224 { -# range 10.254.239.10 10.254.239.20; -# option routers rtr-239-0-1.example.org, rtr-239-0-2.example.org; -#} - -# This declaration allows BOOTP clients to get dynamic addresses, -# which we don't really recommend. - -#subnet 10.254.239.32 netmask 255.255.255.224 { -# range dynamic-bootp 10.254.239.40 10.254.239.60; -# option broadcast-address 10.254.239.31; -# option routers rtr-239-32-1.example.org; -#} - -# A slightly different configuration for an internal subnet. -#subnet 10.5.5.0 netmask 255.255.255.224 { -# range 10.5.5.26 10.5.5.30; -# option domain-name-servers ns1.internal.example.org; -# option domain-name "internal.example.org"; -# option routers 10.5.5.1; -# option broadcast-address 10.5.5.31; -# default-lease-time 600; -# max-lease-time 7200; -#} - -# Hosts which require special configuration options can be listed in -# host statements. If no address is specified, the address will be -# allocated dynamically (if possible), but the host-specific information -# will still come from the host declaration. - -#host passacaglia { -# hardware ethernet 0:0:c0:5d:bd:95; -# filename "vmunix.passacaglia"; -# server-name "toccata.fugue.com"; -#} - -# Fixed IP addresses can also be specified for hosts. These addresses -# should not also be listed as being available for dynamic assignment. -# Hosts for which fixed IP addresses have been specified can boot using -# BOOTP or DHCP. Hosts for which no fixed address is specified can only -# be booted with DHCP, unless there is an address range on the subnet -# to which a BOOTP client is connected which has the dynamic-bootp flag -# set. -#host fantasia { -# hardware ethernet 08:00:07:26:c0:a5; -# fixed-address fantasia.fugue.com; -#} - -# You can declare a class of clients and then do address allocation -# based on that. The example below shows a case where all clients -# in a certain class get addresses on the 10.17.224/24 subnet, and all -# other clients get addresses on the 10.0.29/24 subnet. - -#class "foo" { -# match if substring (option vendor-class-identifier, 0, 4) = "SUNW"; -#} - -#shared-network 224-29 { -# subnet 10.17.224.0 netmask 255.255.255.0 { -# option routers rtr-224.example.org; -# } -# subnet 10.0.29.0 netmask 255.255.255.0 { -# option routers rtr-29.example.org; -# } -# pool { -# allow members of "foo"; -# range 10.17.224.10 10.17.224.250; -# } -# pool { -# deny members of "foo"; -# range 10.0.29.10 10.0.29.230; -# } -#} diff --git a/package.bak/dhcp/dhcpd.service b/package.bak/dhcp/dhcpd.service deleted file mode 100644 index 98cc54b05b..0000000000 --- a/package.bak/dhcp/dhcpd.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=DHCP server -After=network.target - -[Service] -Type=forking -PIDFile=/run/dhcpd.pid -ExecStart=/usr/sbin/dhcpd -q -pf /run/dhcpd.pid $OPTIONS $INTERFACES -KillSignal=SIGINT -EnvironmentFile=-/etc/default/dhcpd - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/dhcpcd/Config.in b/package.bak/dhcpcd/Config.in deleted file mode 100644 index ece08d2c96..0000000000 --- a/package.bak/dhcpcd/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -comment "dhcpcd needs a toolchain w/ headers >= 3.1" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 - -config BR2_PACKAGE_DHCPCD - bool "dhcpcd" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_1 # sa_family_t in linux/socket.h - help - An RFC2131 compliant DHCP client - - http://roy.marples.name/projects/dhcpcd/ diff --git a/package.bak/dhcpcd/dhcpcd.hash b/package.bak/dhcpcd/dhcpcd.hash deleted file mode 100644 index 3be3f7ff51..0000000000 --- a/package.bak/dhcpcd/dhcpcd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated from download (no sig, hash) -sha256 6f9674dc7e27e936cc787175404a6171618675ecfb6903ab9887b1b66a87d69e dhcpcd-6.11.5.tar.xz diff --git a/package.bak/dhcpcd/dhcpcd.mk b/package.bak/dhcpcd/dhcpcd.mk deleted file mode 100644 index 2d446fb7f1..0000000000 --- a/package.bak/dhcpcd/dhcpcd.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# dhcpcd -# -################################################################################ - -DHCPCD_VERSION = 6.11.5 -DHCPCD_SOURCE = dhcpcd-$(DHCPCD_VERSION).tar.xz -DHCPCD_SITE = http://roy.marples.name/downloads/dhcpcd -DHCPCD_DEPENDENCIES = host-pkgconf -DHCPCD_LICENSE = BSD-2c -DHCPCD_LICENSE_FILES = dhcpcd.c - -ifeq ($(BR2_STATIC_LIBS),y) -DHCPCD_CONFIG_OPTS += --enable-static -endif - -ifeq ($(BR2_USE_MMU),) -DHCPCD_CONFIG_OPTS += --disable-fork -endif - -define DHCPCD_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) ./configure \ - --os=linux \ - --libexecdir=/lib/dhcpcd \ - $(DHCPCD_CONFIG_OPTS) ) -endef - -define DHCPCD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) all -endef - -define DHCPCD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install DESTDIR=$(TARGET_DIR) -endef - -# NOTE: Even though this package has a configure script, it is not generated -# using the autotools, so we have to use the generic package infrastructure. - -$(eval $(generic-package)) diff --git a/package.bak/dhcpdump/0001-use-non-bsd-structures.patch b/package.bak/dhcpdump/0001-use-non-bsd-structures.patch deleted file mode 100644 index 40115fb640..0000000000 --- a/package.bak/dhcpdump/0001-use-non-bsd-structures.patch +++ /dev/null @@ -1,23 +0,0 @@ -The udphdr structure has uh_* fields when _FAVOR_BSD is -defined. Otherwise, the fields are just named source, dest, len and -check. See . - -Signed-off-by: Thomas Petazzoni - -Index: dhcpdump-1.8/dhcpdump.c -=================================================================== ---- dhcpdump-1.8.orig/dhcpdump.c 2011-05-17 20:20:46.506980003 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-17 20:20:59.338979999 +0200 -@@ -163,10 +163,10 @@ - strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src)); - strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst)); - -- if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen))) -+ if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len))) - return; - -- printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen)); -+ printdata((u_char *)(sp + offset), ntohs(udp->len)); - } - - // check for matching CHADDR (Peter Apian-Bennewitz ) diff --git a/package.bak/dhcpdump/0002-fix-strsep-feature-test.patch b/package.bak/dhcpdump/0002-fix-strsep-feature-test.patch deleted file mode 100644 index 06bab947c0..0000000000 --- a/package.bak/dhcpdump/0002-fix-strsep-feature-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -Use the official _BSD_SOURCE feature test macro instead of the meaningless -HAVE_STRSEP macro in order to detect the availability of strsep(). - -This allows toolchains supporting strsep() to use it instead of the custom -implementation from dhcpdump, which also avoids the following error with some -toolchains: - - In file included from dhcpdump.c:30:0: - dhcpdump.c: At top level: - strsep.c:65:23: error: register name not specified for ‘delim’ - register const char *delim; - ^ - -Signed-off-by: Benoît Thébaudeau - -diff -Nrdup dhcpdump-1.8.orig/dhcpdump.c dhcpdump-1.8/dhcpdump.c ---- dhcpdump-1.8.orig/dhcpdump.c 2008-06-24 05:26:52.000000000 +0200 -+++ dhcpdump-1.8/dhcpdump.c 2011-05-31 19:22:15.987388498 +0200 -@@ -26,7 +26,7 @@ - #include - #include "dhcp_options.h" - --#ifndef HAVE_STRSEP -+#ifndef _BSD_SOURCE - #include "strsep.c" - #endif - diff --git a/package.bak/dhcpdump/Config.in b/package.bak/dhcpdump/Config.in deleted file mode 100644 index e0abe040fc..0000000000 --- a/package.bak/dhcpdump/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_DHCPDUMP - bool "dhcpdump" - select BR2_PACKAGE_LIBPCAP - help - A tool for monitoring dhcp requests using tcpdump. - - http://www.mavetju.org/unix/general.php diff --git a/package.bak/dhcpdump/dhcpdump.hash b/package.bak/dhcpdump/dhcpdump.hash deleted file mode 100644 index 36040c8a5d..0000000000 --- a/package.bak/dhcpdump/dhcpdump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6d5eb9418162fb738bc56e4c1682ce7f7392dd96e568cc996e44c28de7f77190 dhcpdump-1.8.tar.gz diff --git a/package.bak/dhcpdump/dhcpdump.mk b/package.bak/dhcpdump/dhcpdump.mk deleted file mode 100644 index 3584f4f22d..0000000000 --- a/package.bak/dhcpdump/dhcpdump.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# dhcpdump -# -################################################################################ - -DHCPDUMP_VERSION = 1.8 -DHCPDUMP_SITE = http://www.mavetju.org/download -DHCPDUMP_DEPENDENCIES = libpcap -DHCPDUMP_LICENSE = BSD-2c -DHCPDUMP_LICENSE_FILES = LICENSE - -DHCPDUMP_LIBS = -lpcap -ifeq ($(BR2_STATIC_LIBS),y) -DHCPDUMP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -endif - -define DHCPDUMP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS) \ - -D_GNU_SOURCE" LIBS="$(DHCPDUMP_LIBS)" -endef - -define DHCPDUMP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/dhcpdump $(TARGET_DIR)/usr/bin/dhcpdump -endef - -$(eval $(generic-package)) diff --git a/package.bak/dhrystone/0001-cmdline-nruns.patch b/package.bak/dhrystone/0001-cmdline-nruns.patch deleted file mode 100644 index 1164610cca..0000000000 --- a/package.bak/dhrystone/0001-cmdline-nruns.patch +++ /dev/null @@ -1,53 +0,0 @@ -let people specify the number of runs on the command line - -Patch by Vivi Li - ---- a/dhry_1.c -+++ b/dhry_1.c -@@ -66,7 +70,7 @@ - /* end of variables for time measurement */ - - --main () -+main(int argc, char *argv[]) - /*****/ - - /* main program, corresponds to procedures */ -@@ -101,6 +105,13 @@ - /* Warning: With 16-Bit processors and Number_Of_Runs > 32000, */ - /* overflow may occur for this array element. */ - -+ Number_Of_Runs = 0; -+ if ( argc == 2 ) { -+ if (atoi(argv[1]) > 0) { -+ Number_Of_Runs = atoi(argv[1]); -+ } -+ } -+ - printf ("\n"); - printf ("Dhrystone Benchmark, Version 2.1 (Language: C)\n"); - printf ("\n"); -@@ -114,13 +125,17 @@ - printf ("Program compiled without 'register' attribute\n"); - printf ("\n"); - } -- printf ("Please give the number of runs through the benchmark: "); -- { -- int n; -- scanf ("%d", &n); -- Number_Of_Runs = n; -+ -+ if (!Number_Of_Runs) { -+ printf ("Please give the number of runs through the benchmark: "); -+ fflush (stdout); -+ { -+ int n; -+ scanf ("%d", &n); -+ Number_Of_Runs = n; -+ } -+ printf ("\n"); - } -- printf ("\n"); - - printf ("Execution starts, %d runs through Dhrystone\n", Number_Of_Runs); - diff --git a/package.bak/dhrystone/0002-HZ.patch b/package.bak/dhrystone/0002-HZ.patch deleted file mode 100644 index e3b8a0e05d..0000000000 --- a/package.bak/dhrystone/0002-HZ.patch +++ /dev/null @@ -1,17 +0,0 @@ -Get HZ value from system rather than requiring via CPPFLAGS - -Patch by Robin Getz - ---- a/dhry.h -+++ b/dhry.h -@@ -359,6 +359,10 @@ - /* for "times" */ - #endif - -+#ifndef HZ -+#include -+#endif -+ - #define Mic_secs_Per_Second 1000000.0 - /* Berkeley UNIX C returns process times in seconds/HZ */ - diff --git a/package.bak/dhrystone/0003-exit.patch b/package.bak/dhrystone/0003-exit.patch deleted file mode 100644 index 8d99f4e5d7..0000000000 --- a/package.bak/dhrystone/0003-exit.patch +++ /dev/null @@ -1,14 +0,0 @@ -trust the exit status of the program - -Patch by Robin Getz - ---- a/dhry_1.c -+++ b/dhry_1.c -@@ -274,6 +289,7 @@ - printf ("\n"); - } - -+ exit(0); - } - - diff --git a/package.bak/dhrystone/0004-headers.patch b/package.bak/dhrystone/0004-headers.patch deleted file mode 100644 index 82bb60d92d..0000000000 --- a/package.bak/dhrystone/0004-headers.patch +++ /dev/null @@ -1,15 +0,0 @@ -get prototypes for malloc/exit/strcpy - -Patch by Mike Frysinger - ---- a/dhry.h -+++ b/dhry.h -@@ -388,6 +388,8 @@ - /* General definitions: */ - - #include -+#include -+#include - /* for strcpy, strcmp */ - - #define Null 0 diff --git a/package.bak/dhrystone/0005-prototypes.patch b/package.bak/dhrystone/0005-prototypes.patch deleted file mode 100644 index 7fdcf94ee9..0000000000 --- a/package.bak/dhrystone/0005-prototypes.patch +++ /dev/null @@ -1,35 +0,0 @@ -Avoid collision with C library using NO_PROTOTYPES found in code already - -Patch by Robin Getz - ---- a/dhry_1.c -+++ b/dhry_1.c -@@ -28,7 +28,9 @@ - int Arr_1_Glob [50]; - int Arr_2_Glob [50] [50]; - -+#ifndef NO_PROTOTYPES - extern char *malloc (); -+#endif - Enumeration Func_1 (); - /* forward declaration necessary since Enumeration may not simply be int */ - -@@ -45,14 +45,18 @@ - - #ifdef TIMES - struct tms time_info; -+#ifndef NO_PROTOTYPES - extern int times (); - /* see library function "times" */ -+#endif - #define Too_Small_Time 120 - /* Measurements should last at least about 2 seconds */ - #endif - #ifdef TIME -+#ifndef NO_PROTOTYPES - extern long time(); - /* see library function "time" */ -+#endif - #define Too_Small_Time 2 - /* Measurements should last at least 2 seconds */ - #endif diff --git a/package.bak/dhrystone/Config.in b/package.bak/dhrystone/Config.in deleted file mode 100644 index d6fb7a75c7..0000000000 --- a/package.bak/dhrystone/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_DHRYSTONE - bool "dhrystone" - help - easy-to-use integer benchmark - - http://www.netlib.org/benchmark/dhry-c diff --git a/package.bak/dhrystone/Makefile b/package.bak/dhrystone/Makefile deleted file mode 100644 index f7a212b2fe..0000000000 --- a/package.bak/dhrystone/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -CPPFLAGS += -DNO_PROTOTYPES=1 -DHZ=100 -LDLIBS += -lm - -all: dhrystone - -dhrystone: dhry_1.o dhry_2.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDLIBS) - -clean: - rm -f *.o dhrystone - -.PHONY: all clean diff --git a/package.bak/dhrystone/dhrystone.hash b/package.bak/dhrystone/dhrystone.hash deleted file mode 100644 index 9ea22a360a..0000000000 --- a/package.bak/dhrystone/dhrystone.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 038a7e9169787125c3451a6c941f3aca5db2d2f3863871afcdce154ef17f4e3e dhry-c diff --git a/package.bak/dhrystone/dhrystone.mk b/package.bak/dhrystone/dhrystone.mk deleted file mode 100644 index c0bca9895d..0000000000 --- a/package.bak/dhrystone/dhrystone.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# dhrystone -# -################################################################################ - -DHRYSTONE_VERSION = 2 -DHRYSTONE_SOURCE = dhry-c -DHRYSTONE_SITE = http://www.netlib.org/benchmark - -define DHRYSTONE_EXTRACT_CMDS - (cd $(@D) && $(SHELL) $(DL_DIR)/$($(PKG)_SOURCE)) - $(Q)cp package/dhrystone/Makefile $(@D)/ -endef - -define DHRYSTONE_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define DHRYSTONE_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/dhrystone $(TARGET_DIR)/usr/bin/dhrystone -endef - -$(eval $(generic-package)) diff --git a/package.bak/dialog/Config.in b/package.bak/dialog/Config.in deleted file mode 100644 index 73b71766e7..0000000000 --- a/package.bak/dialog/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_DIALOG - bool "dialog" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - dialog - display dialog boxes from shell scripts - - This application provides a method of displaying several different - types of dialog boxes from shell scripts. This allows a developer - of a script to interact with the user in a much friendlier manner. - - http://invisible-island.net/dialog/dialog.html diff --git a/package.bak/dialog/dialog.hash b/package.bak/dialog/dialog.hash deleted file mode 100644 index 75a79189c8..0000000000 --- a/package.bak/dialog/dialog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 1d98ec7cc81f11f9019fa0b90f1afdaa86579cae1ce8869a6fd61deb9d4b887a dialog-1.2-20150125.tgz diff --git a/package.bak/dialog/dialog.mk b/package.bak/dialog/dialog.mk deleted file mode 100644 index f207f75704..0000000000 --- a/package.bak/dialog/dialog.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# dialog -# -################################################################################ - -DIALOG_VERSION = 1.2-20150125 -DIALOG_SOURCE = dialog-$(DIALOG_VERSION).tgz -DIALOG_SITE = ftp://invisible-island.net/dialog -DIALOG_CONF_OPTS = --with-ncurses --with-curses-dir=$(STAGING_DIR)/usr \ - --disable-rpath-hack -DIALOG_DEPENDENCIES = host-pkgconf ncurses -DIALOG_LICENSE = LGPLv2.1 -DIALOG_LICENSE_FILES = COPYING - -ifneq ($(BR2_ENABLE_LOCALE),y) -DIALOG_DEPENDENCIES += libiconv -endif - -DIALOG_CONF_OPTS += NCURSES_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) - -$(eval $(autotools-package)) diff --git a/package.bak/diffutils/Config.in b/package.bak/diffutils/Config.in deleted file mode 100644 index 97cb38b8f8..0000000000 --- a/package.bak/diffutils/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_DIFFUTILS - bool "diffutils" - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - GNU diff. Compare files per line. - - http://www.gnu.org/software/diffutils/diffutils.html - -comment "diffutils needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/diffutils/diffutils.hash b/package.bak/diffutils/diffutils.hash deleted file mode 100644 index 7e99f1fc65..0000000000 --- a/package.bak/diffutils/diffutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 dad398ccd5b9faca6b0ab219a036453f62a602a56203ac659b43e889bec35533 diffutils-3.5.tar.xz diff --git a/package.bak/diffutils/diffutils.mk b/package.bak/diffutils/diffutils.mk deleted file mode 100644 index d3e608ce05..0000000000 --- a/package.bak/diffutils/diffutils.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# diffutils -# -################################################################################ - -DIFFUTILS_VERSION = 3.5 -DIFFUTILS_SOURCE = diffutils-$(DIFFUTILS_VERSION).tar.xz -DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils -DIFFUTILS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -DIFFUTILS_LICENSE = GPLv3+ -DIFFUTILS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -DIFFUTILS_DEPENDENCIES += busybox -endif - -$(eval $(autotools-package)) diff --git a/package.bak/dillo/0002-usr-local-include.patch b/package.bak/dillo/0002-usr-local-include.patch deleted file mode 100644 index 0c3fed2bfa..0000000000 --- a/package.bak/dillo/0002-usr-local-include.patch +++ /dev/null @@ -1,27 +0,0 @@ -Do not add (possibly poisoned) /usr/local/include and /usr/local/lib -to gcc and ld search paths in configure. - -With BR2_COMPILER_PARANOID_UNSAFE_PATH enabled, poisoned paths result -in hard errors, failing affected configure tests. - -Signed-off-by: Alex Suykov - ---- a/configure.ac -+++ b/configure.ac -@@ -57,16 +57,6 @@ - AC_TYPE_INT32_T - AC_TYPE_UINT32_T - --dnl -------------------------------------- --dnl Check whether to add /usr/local or not --dnl (this is somewhat a religious problem) --dnl -------------------------------------- --dnl --if test "`$CPP -v < /dev/null 2>&1 | grep '/usr/local/include' 2>&1`" = ""; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi -- - dnl ------------------------------------ - dnl Check for socket libs (AIX, Solaris) - dnl ------------------------------------ diff --git a/package.bak/dillo/Config.in b/package.bak/dillo/Config.in deleted file mode 100644 index d06f2d1f51..0000000000 --- a/package.bak/dillo/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_DILLO - bool "dillo" - depends on BR2_PACKAGE_XORG7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fltk fork() - select BR2_PACKAGE_FLTK - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_ZLIB - help - Dillo is a multi-platform graphical web browser known - for its speed and small footprint. - - Enable openssl package to gain https support. - - http://www.dillo.org - -comment "dillo needs a toolchain w/ C++" - depends on BR2_PACKAGE_XORG7 && BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/dillo/dillo.hash b/package.bak/dillo/dillo.hash deleted file mode 100644 index cab0b14abd..0000000000 --- a/package.bak/dillo/dillo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 db1be16c1c5842ebe07b419aa7c6ef11a45603a75df2877f99635f4f8345148b dillo-3.0.5.tar.bz2 diff --git a/package.bak/dillo/dillo.mk b/package.bak/dillo/dillo.mk deleted file mode 100644 index 01ab4f5c8f..0000000000 --- a/package.bak/dillo/dillo.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# dillo -# -################################################################################ - -DILLO_VERSION = 3.0.5 -DILLO_SOURCE = dillo-$(DILLO_VERSION).tar.bz2 -DILLO_SITE = http://www.dillo.org/download -DILLO_LICENSE = GPLv3+ -DILLO_LICENSE_FILES = COPYING -# configure.ac gets patched, so autoreconf is necessary -DILLO_AUTORECONF = YES -DILLO_DEPENDENCIES = fltk zlib \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) -DILLO_CONF_ENV = ac_cv_path_FLTK_CONFIG=$(STAGING_DIR)/usr/bin/fltk-config - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -DILLO_CONF_OPTS += --enable-ssl -DILLO_DEPENDENCIES += openssl -else -DILLO_CONF_OPTS += --disable-ssl -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -DILLO_CONF_OPTS += --enable-png -DILLO_DEPENDENCIES += libpng -DILLO_CONF_ENV += PNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -else -DILLO_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -DILLO_CONF_OPTS += --enable-jpeg -DILLO_DEPENDENCIES += jpeg -else -DILLO_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -DILLO_CONF_OPTS += --enable-threaded-dns -else -DILLO_CONF_OPTS += --disable-threaded-dns -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ding-libs/Config.in b/package.bak/ding-libs/Config.in deleted file mode 100644 index 7af75b7b94..0000000000 --- a/package.bak/ding-libs/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_DING_LIBS - bool "ding-libs" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT - help - The ding-libs packages contain a set of libraries used by - the System Security Services Daemon (SSSD) and other - projects and provide functions to manipulate filesystem - pathnames (libpath_utils), a hash table to manage storage - and access time properties (libdhash), a data type to - collect data in a hierarchical structure (libcollection), a - dynamically growing, reference-counted array (libref_array), - and a library to process configuration files in - initialization format (INI) into a library collection data - structure (libini_config). - - https://git.fedorahosted.org/git/ding-libs.git - -comment "ding-libs needs a toolchain w/ wchar" - depends on BR2_NEEDS_GETTEXT - depends on !BR2_USE_WCHAR diff --git a/package.bak/ding-libs/ding-libs.hash b/package.bak/ding-libs/ding-libs.hash deleted file mode 100644 index 6e35697692..0000000000 --- a/package.bak/ding-libs/ding-libs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 639984a57d6f936a6551c842712619692febaebf4515033fc929620a241ffa6a ding_libs-0_4_0.tar.xz diff --git a/package.bak/ding-libs/ding-libs.mk b/package.bak/ding-libs/ding-libs.mk deleted file mode 100644 index 5b842ffa0e..0000000000 --- a/package.bak/ding-libs/ding-libs.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# ding-libs -# -################################################################################ - -DING_LIBS_VERSION = 0_4_0 -DING_LIBS_SOURCE = ding_libs-$(DING_LIBS_VERSION).tar.xz -DING_LIBS_SITE = https://git.fedorahosted.org/cgit/ding-libs.git/snapshot -DING_LIBS_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) -DING_LIBS_INSTALL_STAGING = YES -DING_LIBS_LICENSE = LGPLv3+ (library),GPLv3+ (test programs) -DING_LIBS_LICENSE_FILES = COPYING COPYING.LESSER - -# autoconf/automake generated files not present in tarball -DING_LIBS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/directfb-examples/0001-remove-bzero.patch b/package.bak/directfb-examples/0001-remove-bzero.patch deleted file mode 100644 index 41616b5c31..0000000000 --- a/package.bak/directfb-examples/0001-remove-bzero.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - src/df_knuckles/matrix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: directfb-examples-1.2.0/src/df_knuckles/matrix.c -=================================================================== ---- directfb-examples-1.2.0.orig/src/df_knuckles/matrix.c -+++ directfb-examples-1.2.0/src/df_knuckles/matrix.c -@@ -19,7 +19,7 @@ - static float Cosine[3600]; - static float Sine[3600]; - --#define M_CLEAR(m) bzero(m, MATRIX_SIZE) -+#define M_CLEAR(m) memset(m, 0, MATRIX_SIZE) - #define M_IDENTITY(m) memcpy(m, IdentityMatrix, MATRIX_SIZE) - - static void MultiplyMatrix(float *A, float *B) diff --git a/package.bak/directfb-examples/Config.in b/package.bak/directfb-examples/Config.in deleted file mode 100644 index eef9f5c041..0000000000 --- a/package.bak/directfb-examples/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_DIRECTFB_EXAMPLES - bool "directfb examples" - depends on BR2_PACKAGE_DIRECTFB - help - The DirectFB-examples package contains a set of simple DirectFB - applications that can be used to test and demonstrate various - DirectFB features. - - http://directfb.org/downloads/Extras/README.DirectFB-examples diff --git a/package.bak/directfb-examples/directfb-examples.hash b/package.bak/directfb-examples/directfb-examples.hash deleted file mode 100644 index 9d59cfef78..0000000000 --- a/package.bak/directfb-examples/directfb-examples.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a DirectFB-examples-1.7.0.tar.gz diff --git a/package.bak/directfb-examples/directfb-examples.mk b/package.bak/directfb-examples/directfb-examples.mk deleted file mode 100644 index 46263da733..0000000000 --- a/package.bak/directfb-examples/directfb-examples.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# directfb-examples -# -################################################################################ - -DIRECTFB_EXAMPLES_VERSION = 1.7.0 -DIRECTFB_EXAMPLES_SITE = http://www.directfb.org/downloads/Extras -DIRECTFB_EXAMPLES_SOURCE = DirectFB-examples-$(DIRECTFB_EXAMPLES_VERSION).tar.gz -DIRECTFB_EXAMPLES_LICENSE = MIT -DIRECTFB_EXAMPLES_LICENSE_FILES = COPYING -DIRECTFB_EXAMPLES_DEPENDENCIES = directfb - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_EXAMPLES_CONF_OPTS += LIBS=-lstdc++ -endif - -$(eval $(autotools-package)) diff --git a/package.bak/directfb/0001-fix-missing-davinci-voodoo-header.patch b/package.bak/directfb/0001-fix-missing-davinci-voodoo-header.patch deleted file mode 100644 index 6ad4958f84..0000000000 --- a/package.bak/directfb/0001-fix-missing-davinci-voodoo-header.patch +++ /dev/null @@ -1,1726 +0,0 @@ -The archive of directfb-1.6.3 is still missing some header files against -the tagged git tree of directfb. The following files are missing. - -gfxdrivers/davinci/davinci_c64x.h -gfxdrivers/davinci/davincifb.h -gfxdrivers/davinci/davinci_gfxdriver.h -tests/voodoo/voodoo_test.h - -The headers of course are needed to be able to build every module of -directfb. The headers are taken from the git tree of directfb -http://git.directfb.org/?p=core/DirectFB.git;a=commit;h=38b784549bc59bb07c58bb29667cb658695d39a7, -tag DIRECTFB_1_6_3, SHA1ID 38b784549bc59bb07c58bb29667cb658695d39a7. - -Signed-off-by: Carsten Schoenert - -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_c64x.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_c64x.h 2013-04-07 21:33:25.928530187 +0200 -@@ -0,0 +1,935 @@ -+/* -+ TI Davinci driver - C64X+ DSP Library -+ -+ (c) Copyright 2008 directfb.org -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp and -+ Olaf Dreesen . -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License -+ version 2 as published by the Free Software Foundation. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_C64X_H__ -+#define __DAVINCI_C64X_H__ -+ -+#include -+ -+#include -+ -+#include -+#include -+ -+#include -+ -+#define mb() __asm__ __volatile__ ("" : : : "memory") -+ -+/**********************************************************************************************************************/ -+ -+typedef struct { -+ int magic; -+ -+ int fd; -+ c64xTaskControl *ctl; -+ void *mem; -+ -+ c64xTask *QueueL; -+} DavinciC64x; -+ -+typedef struct { -+ int magic; -+ unsigned int max_tasks; -+ unsigned int num_tasks; -+ c64xTask *tasks; -+} DavinciC64xTasks; -+ -+typedef enum { -+ C64X_TEF_NONE = 0x0000, -+ C64X_TEF_RESET = 0x0001 -+} DavinciC64xEmitFlags; -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_open ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_close ( DavinciC64x *c64x ); -+ -+DFBResult davinci_c64x_wait_low( DavinciC64x *c64x ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_tasks_init ( DavinciC64xTasks *tasks, -+ unsigned int size ); -+ -+DFBResult davinci_c64x_tasks_destroy( DavinciC64xTasks *tasks ); -+ -+/**********************************************************************************************************************/ -+ -+DFBResult davinci_c64x_emit_tasks( DavinciC64x *c64x, -+ DavinciC64xTasks *tasks, -+ DavinciC64xEmitFlags flags ); -+ -+/**********************************************************************************************************************/ -+ -+static const char *state_names[] = { "DONE", "ERROR", "TODO", "RUNNING" }; -+ -+static inline c64xTask * -+c64x_get_task( DavinciC64x *c64x ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ c64xTask *task = &c64x->QueueL[idx]; -+ int loops = 0; -+ uint32_t idle = 0; -+ -+ /* Wait for the entry (and next) to be processed by the DSP (rare case). */ -+ while (task->c64x_flags & C64X_FLAG_TODO || ctl->QL_dsp == next) { -+ if (loops > 666 || (idle && ctl->idlecounter - idle > 666)) { -+ c64xTask *dsp_task = &c64x->QueueL[ctl->QL_dsp]; -+ -+ D_PERROR( "Davinci/C64X+: Blocked! [DSP %d / %d (%s), ARM %d / %d (%s)]\n", -+ ctl->QL_dsp, -+ (dsp_task->c64x_function >> 2) & 0x3fff, -+ state_names[dsp_task->c64x_function & 3], -+ ctl->QL_arm, -+ (task->c64x_function >> 2) & 0x3fff, -+ state_names[task->c64x_function & 3] ); -+ -+ break; -+ } -+ -+ idle = ctl->idlecounter; -+ -+ /* Queue is full, waiting 10-20ms should not be too bad. */ -+ if (loops++ > 10) -+ usleep( 5000 ); -+ } -+ -+ return task; -+} -+ -+static inline void -+c64x_submit_task( DavinciC64x *c64x, c64xTask *task ) -+{ -+ c64xTaskControl *ctl = c64x->ctl; -+ uint32_t idx = ctl->QL_arm; -+ uint32_t next = (idx + 1) & C64X_QUEUE_MASK; -+ -+ mb(); -+ -+ ctl->QL_arm = next; -+ -+ mb(); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_wb_inv_range( DavinciC64x *c64x, -+ unsigned long start, -+ u32 length, -+ u32 func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = start; -+ task->c64x_arg[1] = length; -+ task->c64x_arg[2] = func; -+ -+ task->c64x_function = C64X_WB_INV_RANGE | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_write_back_all( DavinciC64x *c64x ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_function = C64X_WRITE_BACK_ALL | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_load_block__L( DavinciC64xTasks *tasks, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_load_block( DavinciC64x *c64x, -+ unsigned long words, -+ u32 num, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = words; -+ task->c64x_arg[1] = num; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_LOAD_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fetch_uyvy( DavinciC64x *c64x, -+ unsigned long dest, -+ unsigned long source, -+ u32 pitch, -+ u32 height, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = source; -+ task->c64x_arg[2] = pitch; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_FETCH_UYVY | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_mc( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long source0, -+ unsigned long source1, -+ u32 spitch, -+ u32 height, -+ int func ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = source0; -+ task->c64x_arg[3] = source1; -+ task->c64x_arg[4] = spitch; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = func | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_idct_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_IDCT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_mc_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_MC_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_put_sum_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = flags; -+ -+ task->c64x_function = C64X_PUT_SUM_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame__L( DavinciC64xTasks *tasks, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_begin_frame( DavinciC64x *c64x, -+ u32 pitch, -+ unsigned long current, -+ unsigned long past, -+ unsigned long future, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = pitch; -+ task->c64x_arg[1] = current; -+ task->c64x_arg[2] = past; -+ task->c64x_arg[3] = future; -+ task->c64x_arg[4] = flags; -+ -+ task->c64x_function = C64X_DVA_BEGIN_FRAME | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dva_motion_block__L( DavinciC64xTasks *tasks, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dva_motion_block( DavinciC64x *c64x, -+ unsigned long macroblock ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = macroblock; -+ -+ task->c64x_function = C64X_DVA_MOTION_BLOCK | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_dva_idct( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ -+ task->c64x_function = C64X_DVA_IDCT | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+/**********************************************************************************************************************/ -+ -+static inline void -+davinci_c64x_put_uyvy_16x16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ unsigned long source, -+ u32 flags ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = source; -+ task->c64x_arg[3] = flags; -+ -+ task->c64x_function = C64X_PUT_UYVY_16x16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_dither_argb__L( DavinciC64xTasks *tasks, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_dither_argb( DavinciC64x *c64x, -+ unsigned long dst_rgb, -+ unsigned long dst_alpha, -+ u32 dst_pitch, -+ unsigned long source, -+ u32 src_pitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dst_rgb; -+ task->c64x_arg[1] = dst_alpha; -+ task->c64x_arg[2] = dst_pitch; -+ task->c64x_arg[3] = source; -+ task->c64x_arg[4] = src_pitch; -+ task->c64x_arg[5] = width; -+ task->c64x_arg[6] = height; -+ -+ task->c64x_function = C64X_DITHER_ARGB | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_fill_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_fill_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 pitch, -+ u32 width, -+ u32 height, -+ u32 value ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = pitch; -+ task->c64x_arg[2] = width; -+ task->c64x_arg[3] = height; -+ task->c64x_arg[4] = value; -+ -+ task->c64x_function = C64X_FILL_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width; -+ task->c64x_arg[5] = height; -+ -+ task->c64x_function = C64X_COPY_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_stretch_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_stretch_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 dw, -+ u32 dh, -+ u32 sw, -+ u32 sh, -+ const DFBRegion *clip ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = src; -+ task->c64x_arg[2] = dpitch | (spitch << 16); -+ task->c64x_arg[3] = dh | (dw << 16); -+ task->c64x_arg[4] = sh | (sw << 16); -+ task->c64x_arg[5] = clip->x2 | (clip->y2 << 16); -+ task->c64x_arg[6] = clip->x1 | (clip->y1 << 16); -+ -+ if (sw > dw && sh > dh) -+ task->c64x_function = C64X_STRETCH_32_down | C64X_FLAG_TODO; -+ else -+ task->c64x_function = C64X_STRETCH_32_up | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_blend_32__L( DavinciC64xTasks *tasks, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_blend_32( DavinciC64x *c64x, -+ u32 sub_func, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 argb, -+ u8 alpha ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = dpitch; -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = spitch; -+ task->c64x_arg[4] = width | (height << 16); -+ task->c64x_arg[5] = argb; -+ task->c64x_arg[6] = alpha; -+ -+ task->c64x_function = (sub_func << 16) | C64X_BLEND_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_16( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_16 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32__L( DavinciC64xTasks *tasks, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = &tasks->tasks[tasks->num_tasks]; -+ -+ D_ASSERT( tasks->num_tasks < tasks->max_tasks ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ tasks->num_tasks++; -+} -+ -+static inline void -+davinci_c64x_blit_keyed_32( DavinciC64x *c64x, -+ unsigned long dest, -+ u32 dpitch, -+ unsigned long src, -+ u32 spitch, -+ u32 width, -+ u32 height, -+ u32 key, -+ u32 mask ) -+{ -+ c64xTask *task = c64x_get_task( c64x ); -+ -+ task->c64x_arg[0] = dest; -+ task->c64x_arg[1] = (dpitch << 16) | (spitch & 0xffff); -+ task->c64x_arg[2] = src; -+ task->c64x_arg[3] = width; -+ task->c64x_arg[4] = height; -+ task->c64x_arg[5] = key; -+ task->c64x_arg[6] = mask; -+ -+ task->c64x_function = C64X_COPY_KEYED_32 | C64X_FLAG_TODO; -+ -+ c64x_submit_task( c64x, task ); -+} -+ -+#endif -+ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h directfb-1.6.3/gfxdrivers/davinci/davincifb.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davincifb.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davincifb.h 2013-04-07 21:33:21.488622184 +0200 -@@ -0,0 +1,581 @@ -+/* -+ * Copyright (C) 2006 Texas Instruments Inc -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option)any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -+ * -+ * File: davincifb.h -+ */ -+ -+#ifndef DAVINVI_VPBE_H -+#define DAVINVI_VPBE_H -+ -+/* include Linux files */ -+#include -+ -+/* define the custom FBIO_WAITFORVSYNC ioctl */ -+#define FBIO_WAITFORVSYNC _IOW('F', 0x20, u_int32_t) -+#define FBIO_SETATTRIBUTE _IOW('F', 0x21, struct fb_fillrect) -+ -+/* Backported IOCTLS. */ -+#define FBIO_SETPOSX _IOW('F', 0x22, u_int32_t) -+#define FBIO_SETPOSY _IOW('F', 0x23, u_int32_t) -+#define FBIO_SETZOOM _IOW('F', 0x24, struct zoom_params) -+#define FBIO_GETSTD _IOR('F', 0x25, u_int32_t) -+#define FBIO_RESIZER _IOW('F', 0x26, struct vpfe_resizer_params) -+#define FBIO_SYNC _IOW('F', 0x27, u_int32_t) -+ -+typedef struct zoom_params { -+ u_int32_t window_id; -+ u_int32_t zoom_h; -+ u_int32_t zoom_v; -+} zoom_params_t; -+ -+typedef struct vpfe_resizer_params -+{ -+ u_int32_t rsz_cnt; //busy-lock -+ u_int32_t out_size; //busy-lock -+ u_int32_t in_start; //busy-lock -+ u_int32_t in_size; //busy-lock -+ u_int32_t sdr_inadd; //shadowed -+ u_int32_t sdr_inoff; //shadowed -+ u_int32_t sdr_outadd; //shadowed -+ u_int32_t sdr_outoff; //shadowed -+ u_int32_t hfilt[16]; //busy-lock -+ u_int32_t vfilt[16]; //busy-lock -+ u_int32_t yenh; //busy-lock -+} vpfe_resizer_params_t; -+ -+typedef struct fb_set_start { -+ int offset; /* offset from smem_start */ -+ unsigned long physical; /* absolute physical address when offset < 0 */ -+ -+ u_int64_t sync; /* input: target sync counter for change or 0 for no sync at all, -+ output: sync counter of actual change or 0 if still pending */ -+} fb_set_start_t; -+ -+ -+#ifdef _IOC_TYPECHECK -+#undef _IOC_TYPECHECK -+#define _IOC_TYPECHECK(x) (sizeof(x)) -+#endif -+ -+#define RAM_CLUT_SIZE 256*3 -+#define FBIO_ENABLE_DISABLE_WIN \ -+ _IOW('F', 0x30, unsigned char) -+#define FBIO_SET_BITMAP_BLEND_FACTOR \ -+ _IOW('F', 0x31, vpbe_bitmap_blend_params_t) -+#define FBIO_SET_BITMAP_WIN_RAM_CLUT \ -+ _IOW('F', 0x32, unsigned char)*RAM_CLUT_SIZE) -+#define FBIO_ENABLE_DISABLE_ATTRIBUTE_WIN \ -+ _IOW('F', 0x33, unsigned int) -+#define FBIO_GET_BLINK_INTERVAL \ -+ _IOR('F', 0x34, vpbe_blink_option_t) -+#define FBIO_SET_BLINK_INTERVAL \ -+ _IOW('F', 0x35, vpbe_blink_option_t) -+#define FBIO_GET_VIDEO_CONFIG_PARAMS \ -+ _IOR('F', 0x36, vpbe_video_config_params_t) -+#define FBIO_SET_VIDEO_CONFIG_PARAMS \ -+ _IOW('F', 0x37, vpbe_video_config_params_t) -+#define FBIO_GET_BITMAP_CONFIG_PARAMS \ -+ _IOR('F', 0x38, vpbe_bitmap_config_params_t) -+#define FBIO_SET_BITMAP_CONFIG_PARAMS \ -+ _IOW('F', 0x39, vpbe_bitmap_config_params_t) -+#define FBIO_SET_DCLK \ -+ _IOW('F', 0x40, vpbe_dclk_t) -+#define FBIO_SET_INTERFACE \ -+ _IOW('F', 0x41, unsigned char) -+#define FBIO_GET_INTERFACE \ -+ _IOR('F', 0x42, unsigned char) -+#define FBIO_QUERY_TIMING \ -+ _IOWR('F', 0x43, struct vpbe_mode_info) -+#define FBIO_SET_TIMING \ -+ _IOW('F', 0x44, struct vpbe_fb_videomode) -+#define FBIO_GET_TIMING \ -+ _IOR('F', 0x45, struct vpbe_fb_videomode) -+#define FBIO_SET_VENC_CLK_SOURCE \ -+ _IOW('F', 0x46, unsigned char) -+#define FBIO_SET_BACKG_COLOR \ -+ _IOW('F', 0x47, vpbe_backg_color_t) -+#define FBIO_ENABLE_DISPLAY \ -+ _IOW('F', 0x48, unsigned char) -+#define FBIO_SETPOS \ -+ _IOW('F', 0x49, u_int32_t) -+#define FBIO_SET_CURSOR \ -+ _IOW('F', 0x50, struct fb_cursor) -+#define FBIO_SET_START \ -+ _IOW('F', 0x66, struct fb_set_start) -+ -+/* -+ * Defines and Constants -+ */ -+#ifdef __KERNEL__ -+#define DAVINCIFB_DEVICE "davincifb" -+#define DAVINCIFB_DRIVER "davincifb" -+ -+#define MULTIPLE_BUFFERING 1 -+ -+#ifdef MULTIPLE_BUFFERING -+#define DOUBLE_BUF 2 -+#define TRIPLE_BUF 3 -+#else -+#define DOUBLE_BUF 1 -+#define TRIPLE_BUF 1 -+#endif -+ -+/* usage: if (is_win(info->fix.id, OSD0)) ... */ -+#define is_win(name, x) ((strcmp(name, x ## _FBNAME) == 0) ? 1 : 0) -+ -+/* -+ * display controller register I/O routines -+ */ -+u32 dispc_reg_in(u32 offset); -+u32 dispc_reg_out(u32 offset, u32 val); -+u32 dispc_reg_merge(u32 offset, u32 val, u32 mask); -+ -+#endif /*__KERNEL__*/ -+ -+/* Error return codes */ -+#define VPBE_INVALID_PARA_VALUE 700 -+#define VPBE_WRONG_WINDOW_ID 701 -+#define VPBE_CURRENTLY_IN_REQUIRED_MODE 702 -+#define VPBE_INSUFFICIENT_CLUT_VALUES 703 -+#define VPBE_CLUT_WRITE_TIMEOUT 704 -+#define VPBE_VID0_BUF_ADR_NULL 705 -+#define VPBE_WINDOW_NOT_DISABLED 706 -+#define VPBE_WINDOW_NOT_ENABLED 707 -+ -+#ifndef __KERNEL__ -+/* Window ID definations */ -+#define OSD0 0 -+#define VID0 1 -+#define OSD1 2 -+#define VID1 3 -+#endif -+ -+/* There are 4 framebuffers, each represented by an fb_info and -+ * a dm_win_info structure */ -+#define OSD0_FBNAME "dm_osd0_fb" -+#define OSD1_FBNAME "dm_osd1_fb" -+#define VID0_FBNAME "dm_vid0_fb" -+#define VID1_FBNAME "dm_vid1_fb" -+ -+/* FIXME: Digital LCD RGB matrix coefficients */ -+#define DLCD_DGY_VAL 0 -+#define DLCD_DRV_VAL 0 -+#define DLCD_DGU_VAL 0 -+#define DLCD_DBU_VAL 0 -+ -+/* Defines for bitmap format */ -+#define VPBE_BITMAP_BIT_1 1 -+#define VPBE_BITMAP_BIT_2 2 -+#define VPBE_BITMAP_BIT_4 4 -+#define VPBE_BITMAP_BIT_8 8 -+#define VPBE_BITMAP_RGB565 16 -+#define VPBE_VIDEO_YUV422 16 -+#define VPBE_VIDEO_RGB888 24 -+ -+/* Defines foe cursor parameter validation*/ -+#define MAX_CURSOR_WIDTH 0x3FF -+#define MAX_CURSOR_HEIGHT 0x1FF -+#define MAX_CURSOR_LINEWIDTH 7 -+ -+#define BASEX 0x80 -+#define BASEY 0x12 -+#define BASEX_DLCD 0x59 -+#define BASEY_DLCD 0x22 -+ -+/* -+ * Enumerations -+ */ -+/* Enum for blending factor */ -+typedef enum vpbe_blend_factor { -+ OSD_CONTRIBUTION_ZERO = 0, -+ OSD_CONTRIBUTION_1_BY_8 = 1, -+ OSD_CONTRIBUTION_2_BY_8 = 2, -+ OSD_CONTRIBUTION_3_BY_8 = 3, -+ OSD_CONTRIBUTION_4_BY_8 = 4, -+ OSD_CONTRIBUTION_5_BY_8 = 5, -+ OSD_CONTRIBUTION_6_BY_8 = 6, -+ OSD_CONTRIBUTION_ONE = 7 -+} vpbe_blend_factor_t; -+ -+/* Enum for Boolean variables */ -+typedef enum { -+ SET_0 = 0, -+ SET_1 = 1 -+} CB_CR_ORDER, ATTRIBUTE, ROM_RAM_CLUT; -+ -+/* Defines for Display Interface */ -+#define PRGB 0 -+#define COMPOSITE 1 -+#define SVIDEO 2 -+#define COMPONENT 3 -+#define RGB 4 -+#define YCC16 5 -+#define YCC8 6 -+#define SRGB 7 -+#define EPSON 8 -+#define CASIO1G 9 -+#define UDISP 10 -+#define STN 11 -+#define VPBE_MAX_INTERFACES 12 -+ -+/* Defines for Display Mode */ -+#define LCD 0 -+#define NTSC 1 -+#define PAL 2 -+#define P525 3 -+#define P625 4 -+ -+#define DEFAULT_MODE 0 -+#define P480 0 -+#define P400 1 -+#define P350 2 -+#define NON_EXISTING_MODE 255 -+/* Enable/Disable enum */ -+typedef enum { -+ VPBE_DISABLE = 0, -+ VPBE_ENABLE = 1 -+} ATTENUATION, TRANSPARENCY, EXPANSION, BLINKING; -+ -+typedef enum clk_source { -+ CLK_SOURCE_CLK27 = 0, -+ CLK_SOURCE_CLK54 = 1, -+ CLK_SOURCE_VPBECLK = 2 -+} CLK_SOURCE; -+ -+/* -+ * Structures and Union Definitions -+ */ -+ -+/* Structure for transparency and the blending factor for the bitmap window */ -+typedef struct vpbe_bitmap_blend_params { -+ unsigned int colorkey; /* color key to be blend */ -+ unsigned int enable_colorkeying; /* enable color keying */ -+ unsigned int bf; /* valid range from 0 to 7 only. */ -+} vpbe_bitmap_blend_params_t; -+ -+/* Structure for window expansion */ -+typedef struct vpbe_win_expansion { -+ EXPANSION horizontal; -+ EXPANSION vertical; /* 1: Enable 0:disable */ -+} vpbe_win_expansion_t; -+ -+/* Structure for OSD window blinking options */ -+typedef struct vpbe_blink_option { -+ BLINKING blinking; /* 1: Enable blinking 0: Disable */ -+ unsigned int interval; /* Valid only if blinking is 1 */ -+} vpbe_blink_option_t; -+ -+/* Structure for DCLK parameters */ -+typedef struct vpbe_dclk { -+ unsigned char dclk_pattern_width; -+ unsigned int dclk_pattern0; -+ unsigned int dclk_pattern1; -+ unsigned int dclk_pattern2; -+ unsigned int dclk_pattern3; -+} vpbe_dclk_t; -+ -+/* Structure for display format */ -+typedef struct vpbe_display_format { -+ unsigned char interface; /* Output interface type */ -+ unsigned char mode; /* output mode */ -+} vpbe_display_format_t; -+ -+/* Structure for background color */ -+typedef struct vpbe_backg_color { -+ unsigned char clut_select; /* 2: RAM CLUT 1:ROM1 CLUT 0:ROM0 CLUT */ -+ unsigned char color_offset; /* index of color */ -+} vpbe_backg_color_t; -+ -+/* Structure for Video window configurable parameters */ -+typedef struct vpbe_video_config_params { -+ CB_CR_ORDER cb_cr_order; /*Cb/Cr order in input data for a pixel. */ -+ /* 0: cb cr 1: cr cb */ -+ vpbe_win_expansion_t exp_info; /* HZ/VT Expansion enable disable */ -+} vpbe_video_config_params_t; -+ -+/*Union of structures giving the CLUT index for the 1, 2, 4 bit bitmap values.*/ -+typedef union vpbe_clut_idx { -+ struct _for_4bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char bitmap_val_1; -+ unsigned char bitmap_val_2; -+ unsigned char bitmap_val_3; -+ unsigned char bitmap_val_4; -+ unsigned char bitmap_val_5; -+ unsigned char bitmap_val_6; -+ unsigned char bitmap_val_7; -+ unsigned char bitmap_val_8; -+ unsigned char bitmap_val_9; -+ unsigned char bitmap_val_10; -+ unsigned char bitmap_val_11; -+ unsigned char bitmap_val_12; -+ unsigned char bitmap_val_13; -+ unsigned char bitmap_val_14; -+ unsigned char bitmap_val_15; -+ } for_4bit_bimap; -+ struct _for_2bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[4]; -+ unsigned char bitmap_val_1; -+ unsigned char dummy1[4]; -+ unsigned char bitmap_val_2; -+ unsigned char dummy2[4]; -+ unsigned char bitmap_val_3; -+ } for_2bit_bimap; -+ struct _for_1bit_bimap { -+ unsigned char bitmap_val_0; -+ unsigned char dummy0[14]; -+ unsigned char bitmap_val_1; -+ } for_1bit_bimap; -+} vpbe_clut_idx_t; -+ -+/* Structure for bitmap window configurable parameters */ -+typedef struct vpbe_bitmap_config_params { -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* Attenuation value for YUV o/p for bitmap window */ -+ unsigned char attenuation_enable; -+ /* 0: ROM DM270, 1:ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+} vpbe_bitmap_config_params_t; -+ -+/* Unioun for video/OSD configuration parameters */ -+typedef union vpbe_conf_params { -+ -+ struct vpbe_video_params { -+ CB_CR_ORDER cb_cr_order; -+ /* HZ/VT Expansion enable disable */ -+ vpbe_win_expansion_t exp_info; -+ } video_params; -+ -+ struct vpbe_bitmap_params { -+ /* Attenuation value for YUV o/p */ -+ ATTENUATION attenuation_enable; -+ /* 0: ROM DM270, 1: ROM DM320, 2:RAM CLUT */ -+ unsigned char clut_select; -+ /* Only for bitmap width = 1,2,4 bits */ -+ vpbe_clut_idx_t clut_idx; -+ /* 0: OSD window is bitmap window */ -+ /* 1: OSD window is attribute window */ -+ ATTRIBUTE enable_attribute; -+ /* To hold bps value. -+ Used to switch back from attribute to bitmap. */ -+ unsigned int stored_bits_per_pixel; -+ /* Blending information */ -+ vpbe_bitmap_blend_params_t blend_info; -+ /* OSD Blinking information */ -+ vpbe_blink_option_t blink_info; -+ } bitmap_params; -+ -+} vpbe_conf_params_t; -+ -+typedef struct vpbe_video_params vpbe_video_params_t; -+typedef struct vpbe_bitmap_params vpbe_bitmap_params_t; -+ -+/* Structure to hold window position */ -+typedef struct vpbe_window_position { -+ unsigned int xpos; /* X position of the window */ -+ unsigned int ypos; /* Y position of the window */ -+} vpbe_window_position_t; -+ -+#ifdef __KERNEL__ -+/* Structure for each window */ -+typedef struct vpbe_dm_win_info { -+ struct fb_info info; -+ vpbe_window_position_t win_pos; /* X,Y position of window */ -+ /* Size of window is already there in var_info structure. */ -+ -+ dma_addr_t fb_base_phys; /*framebuffer area */ -+ unsigned int fb_base; /*window memory pointer */ -+ unsigned int fb_size; /*memory size */ -+ unsigned int pseudo_palette[17]; -+ int alloc_fb_mem; -+ /*flag to identify if framebuffer area is fixed or not */ -+ unsigned long sdram_address; -+ struct vpbe_dm_info *dm; -+ unsigned char window_enable; /*Additions for all windows */ -+ zoom_params_t zoom; /*Zooming parameters */ -+ unsigned char field_frame_select; /*To select Field or frame */ -+ unsigned char numbufs; /*Number of buffers valid 2 or 3 */ -+ vpbe_conf_params_t conf_params; -+ /*window configuration parameter union pointer */ -+} vpbe_dm_win_info_t; -+#endif /*__KERNEL__*/ -+ -+/* -+ * Videmode structure for display interface and mode settings -+ */ -+typedef struct vpbe_fb_videomode { -+ unsigned char name[10]; /* Mode name ( NTSC , PAL) */ -+ unsigned int vmode; /* FB_MODE_INTERLACED or FB_MODE_NON_INTERLACED */ -+ unsigned int xres; /* X Resolution of the display */ -+ unsigned int yres; /* Y Resolution of the display */ -+ unsigned int fps; /* frames per second */ -+ /* Timing Parameters applicable for std = 0 only */ -+ unsigned int left_margin; -+ unsigned int right_margin; -+ unsigned int upper_margin; -+ unsigned int lower_margin; -+ unsigned int hsync_len; -+ unsigned int vsync_len; -+ unsigned int sync; /* 0: hsync -ve/vsync -ve */ -+ /*1: hsync -ve/vsync +ve */ -+ /*2: hsync +ve/vsync -ve */ -+ /*3: hsync +ve/vsync +ve */ -+ unsigned int basepx; /* Display x,y start position */ -+ unsigned int basepy; -+/* 1= Mode s available in modelist 0=Mode is not available in modelist */ -+ unsigned int std; -+} vpbe_fb_videomode_t; -+ -+/* Structure to interface videomode to application*/ -+typedef struct vpbe_mode_info { -+ vpbe_fb_videomode_t vid_mode; -+ unsigned char interface; -+ unsigned char mode_idx; -+} vpbe_mode_info_t; -+ -+#ifdef __KERNEL__ -+/* -+ * Structure for the driver holding information of windows, -+ * memory base addresses etc. -+ */ -+typedef struct vpbe_dm_info { -+ vpbe_dm_win_info_t *osd0; -+ vpbe_dm_win_info_t *osd1; -+ vpbe_dm_win_info_t *vid0; -+ vpbe_dm_win_info_t *vid1; -+ -+/* to map the registers */ -+ dma_addr_t mmio_base_phys; -+ unsigned int mmio_base; -+ unsigned int mmio_size; -+ -+ wait_queue_head_t vsync_wait; -+ unsigned int vsync_cnt; -+ int timeout; -+ -+ /* this is the function that configures the output device (NTSC/PAL/LCD) -+ * for the required output format (composite/s-video/component/rgb) -+ */ -+ void (*output_device_config) (void); -+ -+ struct device *dev; -+ -+ vpbe_backg_color_t backg; /* background color */ -+ vpbe_dclk_t dclk; /*DCLK parameters */ -+ vpbe_display_format_t display; /*Display interface and mode */ -+ vpbe_fb_videomode_t videomode; /*Cuurent videomode */ -+ char ram_clut[256][3]; /*RAM CLUT array */ -+ struct fb_cursor cursor; /* cursor config params from fb.h */ -+/*Flag that indicates whether any of the display is enabled or not*/ -+ int display_enable; -+} vpbe_dm_info_t; -+ -+/* -+ * Functions Definitions for 'davincifb' module -+ */ -+int vpbe_mem_alloc_window_buf(vpbe_dm_win_info_t *); -+int vpbe_mem_release_window_buf(vpbe_dm_win_info_t *); -+void init_display_function(vpbe_display_format_t *); -+int vpbe_mem_alloc_struct(vpbe_dm_win_info_t **); -+void set_vid0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd0_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+void set_win_enable(char *, unsigned int); -+int within_vid0_limits(u32, u32, u32, u32); -+void vpbe_set_display_default(void); -+#ifdef __KERNEL__ -+void set_win_position(char *, u32, u32, u32, u32); -+void change_win_param(int); -+void set_interlaced(char *, unsigned int); -+#endif /* __KERNEL__ */ -+ -+/* -+ * Function definations for 'osd' module -+ */ -+ -+int vpbe_enable_window(vpbe_dm_win_info_t *); -+int vpbe_disable_window(vpbe_dm_win_info_t *); -+int vpbe_vid_osd_select_field_frame(u8 *, u8); -+int vpbe_bitmap_set_blend_factor(u8 *, vpbe_bitmap_blend_params_t *); -+int vpbe_bitmap_set_ram_clut(void); -+int vpbe_enable_disable_attribute_window(u32); -+int vpbe_get_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_blinking(u8 *, vpbe_blink_option_t *); -+int vpbe_set_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_get_vid_params(u8 *, vpbe_video_config_params_t *); -+int vpbe_bitmap_get_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_bitmap_set_params(u8 *, vpbe_bitmap_config_params_t *); -+int vpbe_set_cursor_params(struct fb_cursor *); -+int vpbe_set_vid_expansion(vpbe_win_expansion_t *); -+int vpbe_set_dclk(vpbe_dclk_t *); -+int vpbe_set_display_format(vpbe_display_format_t *); -+int vpbe_set_backg_color(vpbe_backg_color_t *); -+int vpbe_set_interface(u8); -+int vpbe_query_mode(vpbe_mode_info_t *); -+int vpbe_set_mode(struct vpbe_fb_videomode *); -+int vpbe_set_venc_clk_source(u8); -+void set_vid0_default_conf(void); -+void set_osd0_default_conf(void); -+void set_vid1_default_conf(void); -+void set_osd1_default_conf(void); -+void set_cursor_default_conf(void); -+void set_dm_default_conf(void); -+/* -+ * Function definations for 'venc' module -+ */ -+ -+void davincifb_ntsc_composite_config(void); -+void davincifb_ntsc_svideo_config(void); -+void davincifb_ntsc_component_config(void); -+void davincifb_pal_composite_config(void); -+void davincifb_pal_svideo_config(void); -+void davincifb_pal_component_config(void); -+ -+void vpbe_davincifb_ntsc_rgb_config(void); -+void vpbe_davincifb_pal_rgb_config(void); -+void vpbe_davincifb_525p_component_config(void); -+void vpbe_davincifb_625p_component_config(void); -+ -+void vpbe_enable_venc(int); -+void vpbe_enable_dacs(int); -+/* -+ * Function definations for 'dlcd' module -+ */ -+void vpbe_davincifb_480p_prgb_config(void); -+void vpbe_davincifb_400p_prgb_config(void); -+void vpbe_davincifb_350p_prgb_config(void); -+void vpbe_set_display_timing(struct vpbe_fb_videomode *); -+ -+void vpbe_enable_lcd(int); -+/* -+ * Following functions are not implemented -+ */ -+void vpbe_davincifb_default_ycc16_config(void); -+void vpbe_davincifb_default_ycc8_config(void); -+void vpbe_davincifb_default_srgb_config(void); -+void vpbe_davincifb_default_epson_config(void); -+void vpbe_davincifb_default_casio_config(void); -+void vpbe_davincifb_default_UDISP_config(void); -+void vpbe_davincifb_default_STN_config(void); -+#endif /*__KERNEL__*/ -+ -+#endif /* End of #ifndef DAVINCI_VPBE_H */ -diff -puNr -Naur directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h ---- directfb-1.6.3-orig/gfxdrivers/davinci/davinci_gfxdriver.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/gfxdrivers/davinci/davinci_gfxdriver.h 2013-04-07 21:33:19.560662133 +0200 -@@ -0,0 +1,169 @@ -+/* -+ TI Davinci driver - Graphics Driver -+ -+ (c) Copyright 2007 Telio AG -+ -+ Written by Denis Oliver Kropp -+ -+ Code is derived from VMWare driver. -+ -+ (c) Copyright 2001-2009 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+#ifndef __DAVINCI_GFXDRIVER_H__ -+#define __DAVINCI_GFXDRIVER_H__ -+ -+#include -+#include -+ -+#include -+ -+#include "davincifb.h" -+ -+#include "davinci_c64x.h" -+ -+ -+typedef struct { -+ /* validation flags */ -+ int v_flags; -+ -+ /* cached/computed values */ -+ void *dst_addr; -+ unsigned long dst_phys; -+ unsigned int dst_size; -+ unsigned long dst_pitch; -+ DFBSurfacePixelFormat dst_format; -+ unsigned long dst_bpp; -+ -+ void *src_addr; -+ unsigned long src_phys; -+ unsigned long src_pitch; -+ DFBSurfacePixelFormat src_format; -+ unsigned long src_bpp; -+ -+ unsigned long source_mult; -+ -+ unsigned long fillcolor; -+ -+ int blit_blend_sub_function; -+ int draw_blend_sub_function; -+ -+ DFBColor color; -+ unsigned long color_argb; -+ unsigned long colorkey; -+ -+ DFBSurfaceBlittingFlags blitting_flags; -+ -+ DFBRegion clip; -+ -+ /** Add shared data here... **/ -+ struct fb_fix_screeninfo fix[4]; -+ -+ CoreSurfacePool *osd_pool; -+ CoreSurfacePool *video_pool; -+ -+ bool synced; -+} DavinciDeviceData; -+ -+ -+typedef struct { -+ int num; -+ int fd; -+ void *mem; -+ int size; -+} DavinciFB; -+ -+typedef struct { -+ DavinciDeviceData *ddev; -+ -+ CoreDFB *core; -+ -+ CoreScreen *screen; -+ CoreLayer *osd; -+ CoreLayer *video; -+ -+ DavinciFB fb[4]; -+ -+ DavinciC64x c64x; -+ bool c64x_present; -+ -+ DavinciC64xTasks tasks; -+} DavinciDriverData; -+ -+ -+static inline DFBResult -+davincifb_pan_display( const DavinciFB *fb, -+ struct fb_var_screeninfo *var, -+ const CoreSurfaceBufferLock *lock, -+ DFBSurfaceFlipFlags flags, -+ int x, -+ int y ) -+{ -+ int ret; -+ -+ if (lock) { -+#ifdef FBIO_SET_START -+ CoreSurfaceBuffer *buffer = lock->buffer; -+ struct fb_set_start set_start; -+ -+ /* physical mode */ -+ set_start.offset = -1; -+ set_start.sync = (flags & DSFLIP_ONSYNC) ? 1 : 0; -+ -+ /* life's so easy */ -+ set_start.physical = lock->phys + DFB_BYTES_PER_LINE( buffer->format, x ) + y * lock->pitch; -+ -+ ret = ioctl( fb->fd, FBIO_SET_START, &set_start ); -+ if (ret < 0) -+ D_DEBUG( "FBIO_SET_START (0x%08lx, sync %llu) failed!\n", -+ set_start.physical, set_start.sync ); -+ -+ if (ret == 0) { -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+ } -+ -+ /* fallback */ -+#endif -+ var->xoffset = x; /* poor version */ -+ var->yoffset = y + lock->offset / lock->pitch; -+ } -+ else { -+ var->xoffset = x; -+ var->yoffset = y; -+ } -+ -+ var->activate = /*(flags & DSFLIP_ONSYNC) ? FB_ACTIVATE_VBL :*/ FB_ACTIVATE_NOW; -+ -+ ret = ioctl( fb->fd, FBIOPAN_DISPLAY, var ); -+ if (ret) -+ D_PERROR( "Davinci/FB: FBIOPAN_DISPLAY (fb%d - %d,%d) failed!\n", -+ fb->num, var->xoffset, var->yoffset ); -+ -+ if (flags & DSFLIP_WAIT) -+ ioctl( fb->fd, FBIO_WAITFORVSYNC ); -+ -+ return DFB_OK; -+} -+ -+#endif -diff -puNr -Naur directfb-1.6.3-orig/tests/voodoo/voodoo_test.h directfb-1.6.3/tests/voodoo/voodoo_test.h ---- directfb-1.6.3-orig/tests/voodoo/voodoo_test.h 1970-01-01 01:00:00.000000000 +0100 -+++ directfb-1.6.3/tests/voodoo/voodoo_test.h 2013-04-07 21:33:31.824408024 +0200 -@@ -0,0 +1,10 @@ -+#ifndef __VOODOO_TEST_H__ -+#define __VOODOO_TEST_H__ -+ -+typedef enum { -+ VOODOO_TEST_INCREASE, -+ VOODOO_TEST_QUERY -+} VoodooTestCall; -+ -+#endif -+ diff --git a/package.bak/directfb/0002-imlib2-config.patch b/package.bak/directfb/0002-imlib2-config.patch deleted file mode 100644 index ea2bf82049..0000000000 --- a/package.bak/directfb/0002-imlib2-config.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 8352c434e515f19dd1ba36256bfcc3ec9480838d Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 5 Mar 2015 22:38:52 +0100 -Subject: [PATCH] imlib2 config - -Call the imlib2-conf variable that are set by ac_cv_path_IMLIB2_CONFIG -with the absolute path because the imlib2-config file is not covered -by the PATH variable. -This is important for cross compiler that need to get the staging settings -instead of the host settings. - -Signed-off-by: Carsten Schoenert -[ patch configure.in instead of configure to survive autoreconf ] -Signed-off-by: Peter Seiderer ---- - configure.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 38d7e78..fa5e87f 100644 ---- a/configure.in -+++ b/configure.in -@@ -1094,8 +1094,8 @@ if test "x$enable_imlib2" = "xyes"; then - AC_MSG_WARN([*** Imlib2 library not found, building without Imlib2 support ***]) - imlib2="no" - else -- IMLIB2_CFLAGS=`imlib2-config --cflags` -- IMLIB2_LIBS=`imlib2-config --libs` -+ IMLIB2_CFLAGS=`$IMLIB2_CONFIG --cflags` -+ IMLIB2_LIBS=`$IMLIB2_CONFIG --libs` - imlib2="yes" - fi - fi --- -2.1.4 - diff --git a/package.bak/directfb/0003-setregion-lock.patch b/package.bak/directfb/0003-setregion-lock.patch deleted file mode 100644 index bec4234645..0000000000 --- a/package.bak/directfb/0003-setregion-lock.patch +++ /dev/null @@ -1,99 +0,0 @@ -This patch fixes builderrors while using '--with-gfxdrivers' and -'--with-inputdrivers' with the current DirectFB version 1.6.3. - -Patch is taken from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/DirectFB/files/DirectFB-1.6.3-setregion.patch - -Signed-off-by: Carsten Schoenert - -Index: b/gfxdrivers/cyber5k/cyber5k.c -=================================================================== ---- a/gfxdrivers/cyber5k/cyber5k.c -+++ b/gfxdrivers/cyber5k/cyber5k.c -@@ -640,7 +640,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - -@@ -648,7 +649,7 @@ - ret = oldPrimaryFuncs.SetRegion( layer, oldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/radeon/radeon_crtc1.c -=================================================================== ---- a/gfxdrivers/radeon/radeon_crtc1.c -+++ b/gfxdrivers/radeon/radeon_crtc1.c -@@ -147,14 +147,15 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - - if (updated & ~CLRCF_OPTIONS) { - return OldPrimaryLayerFuncs.SetRegion( layer, - OldPrimaryLayerDriverData, - layer_data, region_data, -- config, updated, surface, palette, lock ); -+ config, updated, surface, palette, left_lock, right_lock ); - } - - return DFB_OK; -Index: b/gfxdrivers/cle266/uc_primary.c -=================================================================== ---- a/gfxdrivers/cle266/uc_primary.c -+++ b/gfxdrivers/cle266/uc_primary.c -@@ -142,7 +142,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -151,7 +152,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - -Index: b/gfxdrivers/unichrome/uc_primary.c -=================================================================== ---- a/gfxdrivers/unichrome/uc_primary.c -+++ b/gfxdrivers/unichrome/uc_primary.c -@@ -139,7 +139,8 @@ - CoreLayerRegionConfigFlags updated, - CoreSurface *surface, - CorePalette *palette, -- CoreSurfaceBufferLock *lock ) -+ CoreSurfaceBufferLock *left_lock, -+ CoreSurfaceBufferLock *right_lock ) - { - DFBResult ret; - UcDriverData *ucdrv = (UcDriverData*) driver_data; -@@ -148,7 +149,7 @@ - ret = ucOldPrimaryFuncs.SetRegion( layer, ucOldPrimaryDriverData, - layer_data, region_data, - config, updated, surface, -- palette, lock ); -+ palette, left_lock, right_lock ); - if (ret) - return ret; - diff --git a/package.bak/directfb/0004-use-gcc-link.patch b/package.bak/directfb/0004-use-gcc-link.patch deleted file mode 100644 index ec6c0ea501..0000000000 --- a/package.bak/directfb/0004-use-gcc-link.patch +++ /dev/null @@ -1,35 +0,0 @@ -Add patch to use 'gcc' instead of 'ld' for linking - -The patch has been sent upstream but it has not been merged yet - -Signed-off-by: Markos Chandras - -From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 -From: Markos Chandras -Date: Wed, 28 Aug 2013 10:56:32 +0100 -Subject: [PATCH] rules/libobject.make: Use gcc for linking - -Invoking 'ld' directly may miss some necessary linker flags which -are usually passed by gcc. Therefore, use gcc for linking. - -Signed-off-by: Markos Chandras ---- - rules/libobject.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules/libobject.make b/rules/libobject.make -index bc670da..2cba658 100644 ---- a/rules/libobject.make -+++ b/rules/libobject.make -@@ -3,7 +3,7 @@ - if test -d $<.tmp; then rmdir $<.tmp; fi - mkdir $<.tmp - (cd $<.tmp && $(AR) x ../../$<) -- $(LD) -o $@ -r $<.tmp/*.o -+ $(CC) -nostdlib -o $@ -r $<.tmp/*.o - rm -f $<.tmp/*.o && rmdir $<.tmp - - .PHONY: $(LTLIBRARIES:%.la=.libs/%.a) --- -1.8.3.2 - diff --git a/package.bak/directfb/0005-add-missing-idivine-header.patch b/package.bak/directfb/0005-add-missing-idivine-header.patch deleted file mode 100644 index 7823eb76e7..0000000000 --- a/package.bak/directfb/0005-add-missing-idivine-header.patch +++ /dev/null @@ -1,65 +0,0 @@ -Add idivine.h, which is missing from DirectFB tarballs - -The idivine.h file was taken from the DirectFB Git repository. - -Signed-off-by: Thomas Petazzoni - -Index: b/lib/divine/idivine.h -=================================================================== ---- /dev/null -+++ b/lib/divine/idivine.h -@@ -0,0 +1,54 @@ -+/* -+ (c) Copyright 2012-2013 DirectFB integrated media GmbH -+ (c) Copyright 2001-2013 The world wide DirectFB Open Source Community (directfb.org) -+ (c) Copyright 2000-2004 Convergence (integrated media) GmbH -+ -+ All rights reserved. -+ -+ Written by Denis Oliver Kropp , -+ Andreas Shimokawa , -+ Marek Pikarski , -+ Sven Neumann , -+ Ville Syrjälä and -+ Claudio Ciccani . -+ -+ This library is free software; you can redistribute it and/or -+ modify it under the terms of the GNU Lesser General Public -+ License as published by the Free Software Foundation; either -+ version 2 of the License, or (at your option) any later version. -+ -+ This library is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ Lesser General Public License for more details. -+ -+ You should have received a copy of the GNU Lesser General Public -+ License along with this library; if not, write to the -+ Free Software Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. -+*/ -+ -+ -+ -+#ifndef __IDIVINE_H__ -+#define __IDIVINE_H__ -+ -+#include -+ -+/* -+ * private data struct of IDiVine -+ */ -+typedef struct { -+ int ref; /* reference counter */ -+ -+ DiVine *divine; -+} IDiVine_data; -+ -+/* -+ * IDiVine constructor/destructor -+ */ -+DFBResult IDiVine_Construct( IDiVine *thiz ); -+ -+void IDiVine_Destruct ( IDiVine *thiz ); -+ -+#endif diff --git a/package.bak/directfb/0006-fix-client-gfx_state-initialisation.patch b/package.bak/directfb/0006-fix-client-gfx_state-initialisation.patch deleted file mode 100644 index 5b7a202ca3..0000000000 --- a/package.bak/directfb/0006-fix-client-gfx_state-initialisation.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8e53c0b9cedb62b82e2b7680d793d433b647ae20 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Mon, 13 Jun 2016 13:32:44 -0700 -Subject: [PATCH] fix client->gfx_state initialisation - -Shortly before the DirectFB 1.7.7 release, an optimisation was added -to CoreGraphicsStateClient_Init() to avoid creating an extended -Graphics State object if it will not later be required: - - 4d422fb Client: Create extended Graphics State object when needed for later usage - -Unfortunately the client->gfx_state variable used to track the -extended Graphics State object is not initialised, which can lead to -crashes etc due to creation of the Graphics State object erroneously -being skipped. - -Upstream-Status: Pending - -Signed-off-by: Andre McCurdy -Signed-off-by: Philippe Reynes ---- - src/core/CoreGraphicsStateClient.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/core/CoreGraphicsStateClient.cpp b/src/core/CoreGraphicsStateClient.cpp -index 5d46f0e..5007755 100644 ---- a/src/core/CoreGraphicsStateClient.cpp -+++ b/src/core/CoreGraphicsStateClient.cpp -@@ -364,6 +364,7 @@ CoreGraphicsStateClient_Init( CoreGraphicsStateClient *client, - client->renderer = NULL; - client->requestor = NULL; - client->throttle = NULL; -+ client->gfx_state = NULL; - - if (dfb_config->task_manager) { - if (dfb_config->call_nodirect) { --- -1.9.1 - diff --git a/package.bak/directfb/Config.in b/package.bak/directfb/Config.in deleted file mode 100644 index 6a3d71868f..0000000000 --- a/package.bak/directfb/Config.in +++ /dev/null @@ -1,169 +0,0 @@ -config BR2_PACKAGE_DIRECTFB - bool "directfb" - depends on !BR2_STATIC_LIBS # static link issues - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on !BR2_TOOLCHAIN_USES_MUSL # sigval_t issue - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_ZLIB - help - DirectFB (Direct Frame Buffer) is a set of graphics APIs implemented - on top of the Linux Frame Buffer (fbdev) abstraction layer. It is an - alternative to X11 with a smaller memory footprint that still has an - integrated windowing system. As of 4 October 2015, DirectFB's website - http://www.directfb.org/ is down. See alternative site listed below. - - http://elinux.org/DirectFB - -if BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_DIRECTFB_MULTI - bool "directfb multi application" - select BR2_PACKAGE_LINUX_FUSION - depends on BR2_USE_MMU # madvise() - depends on BR2_LINUX_KERNEL - help - Enable use of multiple concurrent DirectFB applications - -comment "directfb multi application needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - bool "directfb debugging support" - default y - help - Compile DirectFB with debugging support. It provides - functions to print debug information, for DirectFB as well as - external DirectFB drivers. - - When disabled, DirectFB does not print any debug information. - The drivers will be installed to and loaded from - /usr/lib/directfb--pure instead of - /usr/lib/directfb-. - -config BR2_PACKAGE_DIRECTFB_DEBUG - bool "directfb debugging" - depends on BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT - help - Compile DirectFB with lots of debug output - -config BR2_PACKAGE_DIRECTFB_TRACE - bool "directfb call trace support" - help - Enable call tracing for DirectFB applications - -config BR2_PACKAGE_DIRECTFB_DIVINE - bool "divine" - help - Enable the DiVine feature (virtual input) - -config BR2_PACKAGE_DIRECTFB_SAWMAN - bool "sawman" - help - Enable the SawMan feature (window manager) - -config BR2_PACKAGE_DIRECTFB_ATI128 - bool "compile ati128 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_MATROX - bool "compile matrox graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_PXA3XX - bool "compile pxa3xx graphics driver" - depends on BR2_arm - help - The Marvell PXA3xx Processor Family is a system-on-chip based - on XScale® microarchitecture. This option enables the graphic - driver support for the PXA3xx processor family. - - http://www.marvell.com/application-processors/pxa-family/ - -config BR2_PACKAGE_DIRECTFB_EP9X - bool "compile ep9x graphics driver" - depends on BR2_arm - help - Enable the graphic driver support for the EP93xx ARMv9 based - processors from Cirrus Logic. - - http://cirrus.com/en/products/arm9.html - -config BR2_PACKAGE_DIRECTFB_I830 - bool "compile i830 graphics driver" - depends on BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_DIRECTFB_LINUXINPUT - bool "compile /dev/input/eventX input driver" - default y - -config BR2_PACKAGE_DIRECTFB_KEYBOARD - bool "compile keyboard input driver" - default y - -config BR2_PACKAGE_DIRECTFB_PS2MOUSE - bool "compile PS2 mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_SERIALMOUSE - bool "compile serial mouse input driver" - default y - -config BR2_PACKAGE_DIRECTFB_TSLIB - bool "enable touchscreen support" - depends on !BR2_STATIC_LIBS # tslib - default y - select BR2_PACKAGE_TSLIB - -comment "touchscreen support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_DIRECTFB_GIF - bool "enable GIF support" - default y - -config BR2_PACKAGE_DIRECTFB_TIFF - bool "enable TIFF support" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_DIRECTFB_IMLIB2 - bool "enable IMLIB2 support" - select BR2_PACKAGE_IMLIB2 - depends on !BR2_STATIC_LIBS - -comment "imlib2 support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_DIRECTFB_JPEG - bool "enable JPEG support" - default y - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_DIRECTFB_PNG - bool "enable PNG support" - default y - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_DIRECTFB_SVG - bool "enable SVG support" - default y - select BR2_PACKAGE_LIBSVG_CAIRO - -config BR2_PACKAGE_DIRECTFB_DITHER_RGB16 - bool "enable advanced dithering of RGB16 surfaces" - help - Enable dithering when loading images to RGB16 surfaces. - This increases the data section by 64 KBytes. - -config BR2_PACKAGE_DIRECTFB_TESTS - bool "build directfb tests" - -endif # BR2_PACKAGE_DIRECTFB - -comment "directfb needs a glibc or uClibc toolchain w/ C++, NPTL, gcc >= 4.5, dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 || BR2_TOOLCHAIN_USES_MUSL || \ - BR2_STATIC_LIBS diff --git a/package.bak/directfb/directfb.hash b/package.bak/directfb/directfb.hash deleted file mode 100644 index 069d8c3f1d..0000000000 --- a/package.bak/directfb/directfb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3 DirectFB-1.7.7.tar.gz diff --git a/package.bak/directfb/directfb.mk b/package.bak/directfb/directfb.mk deleted file mode 100644 index 595d5906c1..0000000000 --- a/package.bak/directfb/directfb.mk +++ /dev/null @@ -1,173 +0,0 @@ -################################################################################ -# -# directfb -# -################################################################################ - -DIRECTFB_VERSION_MAJOR = 1.7 -DIRECTFB_VERSION = $(DIRECTFB_VERSION_MAJOR).7 -DIRECTFB_SITE = http://www.directfb.org/downloads/Core/DirectFB-$(DIRECTFB_VERSION_MAJOR) -DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz -DIRECTFB_LICENSE = LGPLv2.1+ -DIRECTFB_LICENSE_FILES = COPYING -DIRECTFB_INSTALL_STAGING = YES -DIRECTFB_AUTORECONF = YES - -DIRECTFB_CONF_OPTS = \ - --enable-zlib \ - --enable-freetype \ - --enable-fbdev \ - --disable-sdl \ - --disable-vnc \ - --disable-osx \ - --disable-video4linux \ - --disable-video4linux2 \ - --without-tools \ - --disable-x11 - -ifeq ($(BR2_STATIC_LIBS),y) -DIRECTFB_CONF_OPTS += --disable-dynload -endif - -DIRECTFB_CONFIG_SCRIPTS = directfb-config - -DIRECTFB_DEPENDENCIES = freetype zlib - -ifeq ($(BR2_PACKAGE_DIRECTFB_MULTI),y) -DIRECTFB_CONF_OPTS += --enable-multi --enable-multi-kernel -DIRECTFB_DEPENDENCIES += linux-fusion -else -DIRECTFB_CONF_OPTS += --disable-multi --disable-multi-kernel -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG_SUPPORT),y) -DIRECTFB_CONF_OPTS += --enable-debug-support -ifeq ($(BR2_PACKAGE_DIRECTFB_DEBUG),y) -DIRECTFB_CONF_OPTS += --enable-debug -endif -else -DIRECTFB_CONF_OPTS += --disable-debug-support -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TRACE),y) -DIRECTFB_CONF_OPTS += --enable-trace -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DIVINE),y) -DIRECTFB_CONF_OPTS += --enable-divine -else -DIRECTFB_CONF_OPTS += --disable-divine -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SAWMAN),y) -DIRECTFB_CONF_OPTS += --enable-sawman -else -DIRECTFB_CONF_OPTS += --disable-sawman -endif - -DIRECTFB_GFX = \ - $(if $(BR2_PACKAGE_DIRECTFB_ATI128),ati128) \ - $(if $(BR2_PACKAGE_DIRECTFB_CYBER5K),cyber5k) \ - $(if $(BR2_PACKAGE_DIRECTFB_MATROX),matrox) \ - $(if $(BR2_PACKAGE_DIRECTFB_PXA3XX),pxa3xx) \ - $(if $(BR2_PACKAGE_DIRECTFB_I830),i830) \ - $(if $(BR2_PACKAGE_DIRECTFB_EP9X),ep9x) - -ifeq ($(strip $(DIRECTFB_GFX)),) -DIRECTFB_CONF_OPTS += --with-gfxdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-gfxdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_GFX))) -endif - -DIRECTFB_INPUT = \ - $(if $(BR2_PACKAGE_DIRECTFB_LINUXINPUT),linuxinput) \ - $(if $(BR2_PACKAGE_DIRECTFB_KEYBOARD),keyboard) \ - $(if $(BR2_PACKAGE_DIRECTFB_PS2MOUSE),ps2mouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_SERIALMOUSE),serialmouse) \ - $(if $(BR2_PACKAGE_DIRECTFB_TSLIB),tslib) - -ifeq ($(BR2_PACKAGE_DIRECTFB_TSLIB),y) -DIRECTFB_DEPENDENCIES += tslib -endif - -ifeq ($(strip $(DIRECTFB_INPUT)),) -DIRECTFB_CONF_OPTS += --with-inputdrivers=none -else -DIRECTFB_CONF_OPTS += \ - --with-inputdrivers=$(subst $(space),$(comma),$(strip $(DIRECTFB_INPUT))) -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_GIF),y) -DIRECTFB_CONF_OPTS += --enable-gif -else -DIRECTFB_CONF_OPTS += --disable-gif -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TIFF),y) -DIRECTFB_CONF_OPTS += --enable-tiff -DIRECTFB_DEPENDENCIES += tiff -else -DIRECTFB_CONF_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_PNG),y) -DIRECTFB_CONF_OPTS += --enable-png -DIRECTFB_DEPENDENCIES += libpng -DIRECTFB_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -else -DIRECTFB_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_JPEG),y) -DIRECTFB_CONF_OPTS += --enable-jpeg -DIRECTFB_DEPENDENCIES += jpeg -else -DIRECTFB_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_SVG),y) -DIRECTFB_CONF_OPTS += --enable-svg -# needs some help to find cairo includes -DIRECTFB_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -I$(STAGING_DIR)/usr/include/cairo" -DIRECTFB_DEPENDENCIES += libsvg-cairo -else -DIRECTFB_CONF_OPTS += --disable-svg -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_IMLIB2),y) -DIRECTFB_CONF_OPTS += --enable-imlib2 -DIRECTFB_DEPENDENCIES += imlib2 -DIRECTFB_CONF_ENV += ac_cv_path_IMLIB2_CONFIG=$(STAGING_DIR)/usr/bin/imlib2-config -else -DIRECTFB_CONF_OPTS += --disable-imlib2 -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_DITHER_RGB16),y) -DIRECTFB_CONF_OPTS += --with-dither-rgb16=advanced -else -DIRECTFB_CONF_OPTS += --with-dither-rgb16=none -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB_TESTS),y) -DIRECTFB_CONF_OPTS += --with-tests -endif - -HOST_DIRECTFB_DEPENDENCIES = host-pkgconf host-libpng -HOST_DIRECTFB_CONF_OPTS = \ - --disable-multi \ - --enable-png \ - --with-gfxdrivers=none \ - --with-inputdrivers=none - -HOST_DIRECTFB_BUILD_CMDS = \ - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/tools directfb-csource - -HOST_DIRECTFB_INSTALL_CMDS = \ - $(INSTALL) -m 0755 $(@D)/tools/directfb-csource $(HOST_DIR)/usr/bin - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# directfb-csource for the host -DIRECTFB_HOST_BINARY = $(HOST_DIR)/usr/bin/directfb-csource diff --git a/package.bak/dmalloc/0001-add-fpic.patch b/package.bak/dmalloc/0001-add-fpic.patch deleted file mode 100644 index 230a9e15f1..0000000000 --- a/package.bak/dmalloc/0001-add-fpic.patch +++ /dev/null @@ -1,58 +0,0 @@ -Without -fPIC, dmalloc does not build with: - -/home/test/mips-4.4/bin/mips-linux-gnu-ld --sysroot=/home/test/outputs/test-35/staging -shared --whole-archive -soname libdmallocxx.so -o libdmallocxx.so.t libdmallocxx.a -/home/test/mips-4.4/bin/mips-linux-gnu-ld: libdmalloc.a(arg_check.o): relocation R_MIPS_HI16 against `_dmalloc_flags' can not be used when making a shared object; recompile with -fPIC -libdmalloc.a(arg_check.o): could not read symbols: Bad value - -This patch, taken from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/dmalloc/files/dmalloc-5.2.4-fpic.patch?hideattic=0&view=markup, -fixes the problem by passing the -fPIC flag. It isn't passed through -the ./configure environment in order to not clutter the configuration -cache with incorrect values. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - ---- a/Makefile.in -+++ b/Makefile.in -@@ -318,17 +318,17 @@ - # special _th versions of objects with the LOCK_THREADS variable defined to 1 - chunk_th.o : $(srcdir)/chunk.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/chunk.c -o ./$@ - - error_th.o : $(srcdir)/error.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/error.c -o ./$@ - - malloc_th.o : $(srcdir)/malloc.c - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -DLOCK_THREADS=1 \ - -c $(srcdir)/malloc.c -o ./$@ - - tests : $(TEST) $(TEST_FC) -@@ -360,7 +360,7 @@ - - .c.o : - rm -f $@ -- $(CC) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ -+ $(CC) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $< -o ./$@ - - # - # .cc.o auto-target doesn't work on some systems. -@@ -368,7 +368,7 @@ - # - dmallocc.o : $(srcdir)/dmallocc.cc - rm -f $@ -- $(CXX) $(CFLAGS) $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ -+ $(CXX) $(CFLAGS) -fPIC $(CPPFLAGS) $(DEFS) $(INCS) -c $(srcdir)/dmallocc.cc \ - -o ./$@ - - # diff --git a/package.bak/dmalloc/0002-mips.patch b/package.bak/dmalloc/0002-mips.patch deleted file mode 100644 index 3e6b00e361..0000000000 --- a/package.bak/dmalloc/0002-mips.patch +++ /dev/null @@ -1,43 +0,0 @@ ---- a/configure -+++ b/configure -@@ -7107,7 +7107,7 @@ - echo $ECHO_N "checking return.h macros work... $ECHO_C" >&6 - if test "$cross_compiling" = yes; then - cat >>confdefs.h <<\_ACEOF --#define RETURN_MACROS_WORK 0 -+#define RETURN_MACROS_WORK 1 - _ACEOF - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 ---- a/return.h -+++ b/return.h -@@ -106,26 +106,16 @@ - /*************************************/ - - /* -- * For DEC Mips machines running Ultrix -+ * For Mips machines running Linux - */ - #if __mips - - /* -- * I have no idea how to get inline assembly with the default cc. -- * Anyone know how? -- */ -- --#if 0 -- --/* - * NOTE: we assume here that file is global. - * -- * $31 is the frame pointer. $2 looks to be the return address but maybe -- * not consistently. -+ * $31 is the return address. - */ --#define GET_RET_ADDR(file) asm("sw $2, file") -- --#endif -+#define GET_RET_ADDR(file) asm("sw $31, %0" : "=m" (file)) - - #endif /* __mips */ - diff --git a/package.bak/dmalloc/0003-fix-parallel-build.patch b/package.bak/dmalloc/0003-fix-parallel-build.patch deleted file mode 100644 index c521a114bb..0000000000 --- a/package.bak/dmalloc/0003-fix-parallel-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix parallel build issue - -Missing dmallocc.o <- dmalloc.h dependency may break parallel builds. -dmalloc.h is generated,and may not be around by the time gcc starts -parsing dmallocc.cc. - -Signed-off-by: Alex Suykov - ---- a/Makefile.in -+++ b/Makefile.in -@@ -401,6 +401,7 @@ - compat.o: compat.c conf.h settings.h dmalloc.h compat.h dmalloc_loc.h - dmalloc.o: dmalloc.c conf.h settings.h dmalloc_argv.h dmalloc.h compat.h \ - debug_tok.h dmalloc_loc.h env.h error_val.h version.h -+dmallocc.o: dmallocc.cc dmalloc.h return.h conf.h settings.h - dmalloc_argv.o: dmalloc_argv.c conf.h settings.h dmalloc_argv.h \ - dmalloc_argv_loc.h compat.h - dmalloc_fc_t.o: dmalloc_fc_t.c conf.h settings.h dmalloc.h dmalloc_argv.h \ diff --git a/package.bak/dmalloc/0004-fix-shlibs.patch b/package.bak/dmalloc/0004-fix-shlibs.patch deleted file mode 100644 index a99d926daf..0000000000 --- a/package.bak/dmalloc/0004-fix-shlibs.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix shared library rules - -dmalloc uses ld -shared --whole-archive -o lib.so lib.a, -but for some reason lists regular objects in addition -to the archive, ending up with two copies of each symbol. - -Signed-off-by: Alex Suykov - ---- a/Makefile.in -+++ b/Makefile.in -@@ -257,7 +257,7 @@ shlib : $(BUILD_SL) - # via: http://256.com/gray/email.html - $(LIB_SL) : $(LIBRARY) - rm -f $@ $@.t -- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) -+ @shlinkargs@ $(LIBRARY) - mv $@.t $@ - - $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) -@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) - - $(LIB_TH_SL) : $(LIB_TH) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) -+ @shlinkargs@ $(LIB_TH) - mv $@.t $@ - - $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) - - $(LIB_CXX_SL) : $(LIB_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_CXX) - mv $@.t $@ - - $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) - - $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) - rm -f $@ $@.t -- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) -+ @shlinkargs@ $(LIB_TH_CXX) - mv $@.t $@ - - threadssl : $(LIB_TH_SL) diff --git a/package.bak/dmalloc/Config.in b/package.bak/dmalloc/Config.in deleted file mode 100644 index 03d9f975f3..0000000000 --- a/package.bak/dmalloc/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_DMALLOC - bool "dmalloc" - # On some packages, Microblaze gcc has issues when debugging - # symbols are enabled: "Error: operation combines symbols in - # different segments". - depends on !(BR2_microblaze && BR2_ENABLE_DEBUG) - help - A debug memory allocation library which is a drop in replacement for - the system's malloc, realloc, calloc, free and other memory management - routines while providing powerful debugging facilities configurable at - runtime. - - http://dmalloc.com/ diff --git a/package.bak/dmalloc/dmalloc.hash b/package.bak/dmalloc/dmalloc.hash deleted file mode 100644 index e74ef741b9..0000000000 --- a/package.bak/dmalloc/dmalloc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 d3be5c6eec24950cb3bd67dbfbcdf036f1278fae5fd78655ef8cdf9e911e428a dmalloc-5.5.2.tgz diff --git a/package.bak/dmalloc/dmalloc.mk b/package.bak/dmalloc/dmalloc.mk deleted file mode 100644 index 6ebb44c5c0..0000000000 --- a/package.bak/dmalloc/dmalloc.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# dmalloc -# -################################################################################ - -DMALLOC_VERSION = 5.5.2 -DMALLOC_SOURCE = dmalloc-$(DMALLOC_VERSION).tgz -DMALLOC_SITE = http://dmalloc.com/releases - -DMALLOC_LICENSE = MIT-like -# license is in each file, dmalloc.h.1 is the smallest one -DMALLOC_LICENSE_FILES = dmalloc.h.1 - -DMALLOC_INSTALL_STAGING = YES -DMALLOC_CONF_OPTS = --enable-shlib -DMALLOC_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -DMALLOC_CONF_OPTS += --enable-cxx -else -DMALLOC_CONF_OPTS += --disable-cxx -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -DMALLOC_CONF_OPTS += --enable-threads -else -DMALLOC_CONF_OPTS += --disable-threads -endif - -# dmalloc has some assembly function that are not present in thumb1 mode: -# Error: lo register required -- `str lr,[sp,#4]' -# so, we desactivate thumb mode -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -DMALLOC_CFLAGS += -marm -endif - -DMALLOC_CONF_ENV = CFLAGS="$(DMALLOC_CFLAGS)" - -define DMALLOC_POST_PATCH - $(SED) 's/^ac_cv_page_size=0$$/ac_cv_page_size=12/' $(@D)/configure - $(SED) 's/(ld -/($${LD-ld} -/' $(@D)/configure - $(SED) 's/'\''ld -/"$${LD-ld}"'\'' -/' $(@D)/configure - $(SED) 's/ar cr/$$(AR) cr/' $(@D)/Makefile.in -endef - -DMALLOC_POST_PATCH_HOOKS += DMALLOC_POST_PATCH - -# both DESTDIR and PREFIX are ignored.. -define DMALLOC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) includedir="$(STAGING_DIR)/usr/include" \ - bindir="$(STAGING_DIR)/usr/bin" \ - libdir="$(STAGING_DIR)/usr/lib" \ - shlibdir="$(STAGING_DIR)/usr/lib" \ - infodir="$(STAGING_DIR)/usr/share/info/" \ - -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define DMALLOC_INSTALL_SHARED_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libdmalloc*.so $(TARGET_DIR)/usr/lib -endef -endif - -define DMALLOC_INSTALL_TARGET_CMDS - $(DMALLOC_INSTALL_SHARED_LIB) - cp -dpf $(STAGING_DIR)/usr/bin/dmalloc $(TARGET_DIR)/usr/bin/dmalloc -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dmidecode/0001-build-system-fixes.patch b/package.bak/dmidecode/0001-build-system-fixes.patch deleted file mode 100644 index 00897f82ad..0000000000 --- a/package.bak/dmidecode/0001-build-system-fixes.patch +++ /dev/null @@ -1,35 +0,0 @@ -Minor build system fixes - -Usual build system fixes to allow CC/CFLAGS/LDFLAGS to be overriden -from the command line, and completed by additional flags from the -Makefile. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -12,9 +12,10 @@ - # (at your option) any later version. - # - --CC = gcc --CFLAGS = -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ -- -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef -+CC ?= gcc -+override CFLAGS += \ -+ -W -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual \ -+ -Wcast-align -Wwrite-strings -Wmissing-prototypes -Winline -Wundef - - # Let lseek and mmap support 64-bit wide offsets - CFLAGS += -D_FILE_OFFSET_BITS=64 -@@ -27,7 +28,7 @@ CFLAGS += -O2 - #CFLAGS += -g - - # Pass linker flags here --LDFLAGS = -+override LDFLAGS += - - DESTDIR = - prefix = /usr/local diff --git a/package.bak/dmidecode/Config.in b/package.bak/dmidecode/Config.in deleted file mode 100644 index 22272ed294..0000000000 --- a/package.bak/dmidecode/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_DMIDECODE - bool "dmidecode" - depends on BR2_i386 || BR2_x86_64 - help - Dmidecode reports information about your system's hardware - as described in your system BIOS according to the SMBIOS/DMI - standard. - - http://www.nongnu.org/dmidecode/ diff --git a/package.bak/dmidecode/dmidecode.hash b/package.bak/dmidecode/dmidecode.hash deleted file mode 100644 index 307c306ad7..0000000000 --- a/package.bak/dmidecode/dmidecode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# http://http.debian.net/debian/pool/main/d/dmidecode/dmidecode_3.0-2.dsc -sha256 7ec35bb193729c1d593a1460b59d82d24b89102ab23fd0416e6cf4325d077e45 dmidecode-3.0.tar.xz diff --git a/package.bak/dmidecode/dmidecode.mk b/package.bak/dmidecode/dmidecode.mk deleted file mode 100644 index cd30aa7df5..0000000000 --- a/package.bak/dmidecode/dmidecode.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# dmidecode -# -################################################################################ - -DMIDECODE_VERSION = 3.0 -DMIDECODE_SOURCE = dmidecode-$(DMIDECODE_VERSION).tar.xz -DMIDECODE_SITE = http://download.savannah.gnu.org/releases/dmidecode -DMIDECODE_LICENSE = GPLv2+ -DMIDECODE_LICENSE_FILES = LICENSE - -define DMIDECODE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define DMIDECODE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) prefix=/usr DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dmraid/0001-fix-compilation-under-musl.patch b/package.bak/dmraid/0001-fix-compilation-under-musl.patch deleted file mode 100644 index 7cf8792862..0000000000 --- a/package.bak/dmraid/0001-fix-compilation-under-musl.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 89c7fc15e064dd407e6d5ccefe78985b86b8a036 Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Tue, 1 Sep 2015 12:26:36 +0100 -Subject: [PATCH 1/1] fix compilation under musl - -Patch borrowed from Void Linux : - -https://github.com/voidlinux/void-packages/blob/master/srcpkgs/dmraid/patches/25_musl-libc.patch - -Upstream package appears dormant, no mailing list and no -maintainence releases since Nov 2010. - -Upstream-Status: dormant -Signed-off-by: Brendan Heading - ---- - 1.0.0.rc16-3/dmraid/include/dmraid/misc.h | 1 + - 1.0.0.rc16-3/dmraid/lib/device/scan.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/1.0.0.rc16-3/dmraid/include/dmraid/misc.h b/1.0.0.rc16-3/dmraid/include/dmraid/misc.h -index 247a68e..1b1dfdf 100644 ---- a/1.0.0.rc16-3/dmraid/include/dmraid/misc.h -+++ b/1.0.0.rc16-3/dmraid/include/dmraid/misc.h -@@ -10,6 +10,7 @@ - - #ifndef _MISC_H_ - #define _MISC_H_ -+#include - - #define DM_ASSERT(__cond) do { if (!(__cond)) { printf("ASSERT file:%s line:%d fuction:%s cond: %s\n", __FILE__, __LINE__, __FUNCTION__, #__cond); } } while(0); - -diff --git a/1.0.0.rc16-3/dmraid/lib/device/scan.c b/1.0.0.rc16-3/dmraid/lib/device/scan.c -index a040d53..6897146 100644 ---- a/1.0.0.rc16-3/dmraid/lib/device/scan.c -+++ b/1.0.0.rc16-3/dmraid/lib/device/scan.c -@@ -10,6 +10,7 @@ - # include - # include - #else -+# include - # include - # include - #endif --- -2.4.3 - diff --git a/package.bak/dmraid/Config.in b/package.bak/dmraid/Config.in deleted file mode 100644 index 583f3f272c..0000000000 --- a/package.bak/dmraid/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_DMRAID - bool "dmraid" - depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - select BR2_PACKAGE_LVM2 - help - dmraid discovers, activates, deactivates and displays properties - of software RAID sets (eg, ATARAID) and contained DOS partitions. - - dmraid uses the Linux device-mapper to create devices with - respective mappings for the ATARAID sets discovered. - -comment "dmraid needs a glibc or uClibc toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/dmraid/S20dmraid b/package.bak/dmraid/S20dmraid deleted file mode 100644 index fd2ad9e845..0000000000 --- a/package.bak/dmraid/S20dmraid +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -set -e - -[ -x /usr/sbin/dmraid ] || exit 0 - -# try to load module in case that hasn't been done yet -modprobe dm-mod >/dev/null 2>&1 - -case "$1" in - start|"") - echo "Setting up DMRAID devices..." - /usr/sbin/dmraid --activate yes --ignorelocking --verbose - ;; - - stop) - echo "Shutting down DMRAID devices... " - /usr/sbin/dmraid --activate no --ignorelocking --verbose - ;; - - restart|force-reload) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "Usage: dmraid {start|stop|restart|force-reload}" - exit 1 - ;; -esac diff --git a/package.bak/dmraid/dmraid.hash b/package.bak/dmraid/dmraid.hash deleted file mode 100644 index 31669218e8..0000000000 --- a/package.bak/dmraid/dmraid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2.md5.sum -md5 819338fcef98e8e25819f0516722beeb dmraid-1.0.0.rc16-3.tar.bz2 diff --git a/package.bak/dmraid/dmraid.mk b/package.bak/dmraid/dmraid.mk deleted file mode 100644 index fbb23871fc..0000000000 --- a/package.bak/dmraid/dmraid.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# dmraid -# -################################################################################ - -DMRAID_VERSION = 1.0.0.rc16-3 -DMRAID_SOURCE = dmraid-$(DMRAID_VERSION).tar.bz2 -DMRAID_SITE = http://people.redhat.com/~heinzm/sw/dmraid/src -DMRAID_SUBDIR = $(DMRAID_VERSION)/dmraid -# lib and tools race with parallel make -DMRAID_MAKE = $(MAKE1) -DMRAID_INSTALL_STAGING = YES -DMRAID_LICENSE = GPLv2 -DMRAID_LICENSE_FILES = $(DMRAID_SUBDIR)/LICENSE_GPL $(DMRAID_SUBDIR)/LICENSE - -DMRAID_DEPENDENCIES = lvm2 - -define DMRAID_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/dmraid/S20dmraid \ - $(TARGET_DIR)/etc/init.d/S20dmraid -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dnsmasq/Config.in b/package.bak/dnsmasq/Config.in deleted file mode 100644 index b4f34b8d2b..0000000000 --- a/package.bak/dnsmasq/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_DNSMASQ - bool "dnsmasq" - help - A lightweight DNS and DHCP server. It is intended to provide - coupled DNS and DHCP service to a LAN. - - http://www.thekelleys.org.uk/dnsmasq/ - -if BR2_PACKAGE_DNSMASQ - -config BR2_PACKAGE_DNSMASQ_TFTP - bool "tftp support" - default y - help - Enable TFTP support in dnsmasq. - -config BR2_PACKAGE_DNSMASQ_DHCP - bool "dhcp support" - default y - help - Enable DHCP server support in dnsmasq. - -config BR2_PACKAGE_DNSMASQ_DNSSEC - bool "DNSSEC support" - select BR2_PACKAGE_GMP - select BR2_PACKAGE_NETTLE - help - Enable DNSSEC validation and caching support. - -config BR2_PACKAGE_DNSMASQ_IDN - bool "IDN support" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBIDN - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Enable IDN support in dnsmasq. - This option is a big space taker since it pulls in many libraries. - -config BR2_PACKAGE_DNSMASQ_LUA - bool "Lua scripting support" - depends on BR2_PACKAGE_LUA - help - Enable Lua scripting for dnsmasq - -config BR2_PACKAGE_DNSMASQ_CONNTRACK - bool "conntrack marking support" - select BR2_PACKAGE_LIBNETFILTER_CONNTRACK - help - Enable DNS query connection marking in netfilter. - -endif diff --git a/package.bak/dnsmasq/S80dnsmasq b/package.bak/dnsmasq/S80dnsmasq deleted file mode 100755 index d2f8b0f6b4..0000000000 --- a/package.bak/dnsmasq/S80dnsmasq +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -[ -x /usr/sbin/dnsmasq ] || exit 0 -[ -f /etc/dnsmasq.conf ] || exit 0 - -case "$1" in - start) - printf "Starting dnsmasq: " - start-stop-daemon -S -x /usr/sbin/dnsmasq - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping dnsmasq: " - start-stop-daemon -K -q -x /usr/sbin/dnsmasq - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/package.bak/dnsmasq/dnsmasq.hash b/package.bak/dnsmasq/dnsmasq.hash deleted file mode 100644 index a73e911a26..0000000000 --- a/package.bak/dnsmasq/dnsmasq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 4b92698dee19ca0cb2a8f2e48f1d2dffd01a21eb15d1fbed4cf085630c8c9f96 dnsmasq-2.76.tar.xz diff --git a/package.bak/dnsmasq/dnsmasq.mk b/package.bak/dnsmasq/dnsmasq.mk deleted file mode 100644 index e8240b9003..0000000000 --- a/package.bak/dnsmasq/dnsmasq.mk +++ /dev/null @@ -1,114 +0,0 @@ -################################################################################ -# -# dnsmasq -# -################################################################################ - -DNSMASQ_VERSION = 2.76 -DNSMASQ_SOURCE = dnsmasq-$(DNSMASQ_VERSION).tar.xz -DNSMASQ_SITE = http://thekelleys.org.uk/dnsmasq -DNSMASQ_MAKE_ENV = $(TARGET_MAKE_ENV) CC="$(TARGET_CC)" -DNSMASQ_MAKE_OPTS = COPTS="$(DNSMASQ_COPTS)" PREFIX=/usr CFLAGS="$(TARGET_CFLAGS)" -DNSMASQ_MAKE_OPTS += DESTDIR=$(TARGET_DIR) LDFLAGS="$(TARGET_LDFLAGS)" -DNSMASQ_DEPENDENCIES = host-pkgconf -DNSMASQ_LICENSE = GPLv2 or GPLv3 -DNSMASQ_LICENSE_FILES = COPYING COPYING-v3 - -ifneq ($(BR2_PACKAGE_DNSMASQ_DHCP),y) -DNSMASQ_COPTS += -DNO_DHCP -endif - -ifeq ($(BR2_PACKAGE_DNSMASQ_DNSSEC),y) -DNSMASQ_DEPENDENCIES += gmp nettle -DNSMASQ_COPTS += -DHAVE_DNSSEC -ifeq ($(BR2_STATIC_LIBS),y) -DNSMASQ_COPTS += -DHAVE_DNSSEC_STATIC -endif -endif - -ifneq ($(BR2_PACKAGE_DNSMASQ_TFTP),y) -DNSMASQ_COPTS += -DNO_TFTP -endif - -# NLS requires IDN so only enable it (i18n) when IDN is true -ifeq ($(BR2_PACKAGE_DNSMASQ_IDN),y) -DNSMASQ_DEPENDENCIES += libidn $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext -DNSMASQ_MAKE_OPTS += LIBS+="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" -DNSMASQ_COPTS += -DHAVE_IDN -DNSMASQ_I18N = $(if $(BR2_ENABLE_LOCALE),-i18n) -endif - -ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) -DNSMASQ_DEPENDENCIES += libnetfilter_conntrack -endif - -ifeq ($(BR2_PACKAGE_DNSMASQ_CONNTRACK),y) -define DNSMASQ_ENABLE_CONNTRACK - $(SED) 's^.*#define HAVE_CONNTRACK.*^#define HAVE_CONNTRACK^' \ - $(DNSMASQ_DIR)/src/config.h -endef -endif - -ifeq ($(BR2_PACKAGE_DNSMASQ_LUA),y) -DNSMASQ_DEPENDENCIES += lua - -# liblua uses dlopen when dynamically linked -ifneq ($(BR2_STATIC_LIBS),y) -DNSMASQ_MAKE_OPTS += LIBS+="-ldl" -endif - -define DNSMASQ_ENABLE_LUA - $(SED) 's/lua5.1/lua/g' $(DNSMASQ_DIR)/Makefile - $(SED) 's^.*#define HAVE_LUASCRIPT.*^#define HAVE_LUASCRIPT^' \ - $(DNSMASQ_DIR)/src/config.h -endef -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -DNSMASQ_DEPENDENCIES += dbus -endif - -define DNSMASQ_FIX_PKGCONFIG - $(SED) 's^PKG_CONFIG = pkg-config^PKG_CONFIG = $(PKG_CONFIG_HOST_BINARY)^' \ - $(DNSMASQ_DIR)/Makefile -endef - -ifeq ($(BR2_PACKAGE_DBUS),y) -define DNSMASQ_ENABLE_DBUS - $(SED) 's^.*#define HAVE_DBUS.*^#define HAVE_DBUS^' \ - $(DNSMASQ_DIR)/src/config.h -endef -else -define DNSMASQ_ENABLE_DBUS - $(SED) 's^.*#define HAVE_DBUS.*^/* #define HAVE_DBUS */^' \ - $(DNSMASQ_DIR)/src/config.h -endef -endif - -define DNSMASQ_BUILD_CMDS - $(DNSMASQ_FIX_PKGCONFIG) - $(DNSMASQ_ENABLE_DBUS) - $(DNSMASQ_ENABLE_LUA) - $(DNSMASQ_ENABLE_CONNTRACK) - $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) all$(DNSMASQ_I18N) -endef - -ifeq ($(BR2_PACKAGE_DBUS),y) -define DNSMASQ_INSTALL_DBUS - $(INSTALL) -m 0644 -D $(@D)/dbus/dnsmasq.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/dnsmasq.conf -endef -endif - -define DNSMASQ_INSTALL_TARGET_CMDS - $(DNSMASQ_MAKE_ENV) $(MAKE) -C $(@D) $(DNSMASQ_MAKE_OPTS) install$(DNSMASQ_I18N) - mkdir -p $(TARGET_DIR)/var/lib/misc/ - $(DNSMASQ_INSTALL_DBUS) -endef - -define DNSMASQ_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/dnsmasq/S80dnsmasq \ - $(TARGET_DIR)/etc/init.d/S80dnsmasq -endef - -$(eval $(generic-package)) diff --git a/package.bak/doc-asciidoc.mk b/package.bak/doc-asciidoc.mk deleted file mode 100644 index cb6e616603..0000000000 --- a/package.bak/doc-asciidoc.mk +++ /dev/null @@ -1,186 +0,0 @@ -# we can't use suitable-host-package here because that's not available in -# the context of 'make release' -asciidoc-check-dependencies: - $(Q)if [ -z "$(shell support/dependencies/check-host-asciidoc.sh)" ]; then \ - echo "You need a sufficiently recent asciidoc on your host" \ - "to generate documents"; \ - exit 1; \ - fi - $(Q)if [ -z "`which w3m 2>/dev/null`" ]; then \ - echo "You need w3m on your host to generate documents"; \ - exit 1; \ - fi - -asciidoc-check-dependencies-pdf: - $(Q)if [ -z "`which dblatex 2>/dev/null`" ]; then \ - echo "You need dblatex on your host to generate PDF documents"; \ - exit 1; \ - fi - -# PDF generation is broken because of a bug in xsltproc program provided -# by libxslt <=1.1.28, which does not honor an option we need to set. -# Fortunately, this bug is already fixed upstream: -# https://gitorious.org/libxslt/libxslt/commit/5af7ad745323004984287e48b42712e7305de35c -# -# So, bail out when trying to build a PDF using a buggy version of the -# xsltproc program. -# -# So, to overcome this issue and being able to build a PDF, you can -# build xsltproc from its source repository, then run: -# $ PATH=/path/to/custom-xsltproc/bin:${PATH} make manual -GENDOC_XSLTPROC_IS_BROKEN = \ - $(shell xsltproc --maxvars 0 >/dev/null 2>/dev/null || echo y) - -# Apply this configuration to all documents -BR_ASCIIDOC_CONF = docs/conf/asciidoc.conf - -################################################################################ -# ASCIIDOC_INNER -- generates the make targets needed to build a specific type of -# asciidoc documentation. -# -# argument 1 is the name of the document and the top-level asciidoc file must -# have the same name -# argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document -# argument 4 is the type of document to generate (-f argument of a2x) -# argument 5 is the document type as used in the make target -# argument 6 is the output file extension for the document type -# argument 7 is the human text for the document type -# argument 8 (optional) are extra arguments for a2x -# -# The variable _SOURCES defines the dependencies. -# -# Since this function will be called from within an $(eval ...) -# all variable references except the arguments must be $$-quoted. -################################################################################ -define ASCIIDOC_INNER -$(1): $(1)-$(5) -.PHONY: $(1)-$(5) -$(1)-$(5): $$(O)/docs/$(1)/$(1).$(6) - -# Single line, because splitting a foreach is not easy... -asciidoc-check-dependencies-$(5): -$(1)-check-dependencies-$(5): asciidoc-check-dependencies-$(5) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_$$(call UPPERCASE,$(5))_HOOKS),$$(call $$(hook))$$(sep)) - -# Include Buildroot's AsciiDoc configuration first: -# - generic configuration, -# - then output-specific configuration -ifneq ($$(wildcard $$(BR_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_ASCIIDOC_CONF) -endif -BR_$(4)_ASCIIDOC_CONF = docs/conf/asciidoc-$(4).conf -ifneq ($$(wildcard $$(BR_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$(BR_$(4)_ASCIIDOC_CONF) -endif - -# Then include the document's AsciiDoc configuration: -# - generic configuration, -# - then output-specific configuration -ifneq ($$(wildcard $$($(2)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_ASCIIDOC_CONF) -endif -$(2)_$(4)_ASCIIDOC_CONF = $(3)/asciidoc-$(4).conf -ifneq ($$(wildcard $$($(2)_$(4)_ASCIIDOC_CONF)),) -$(2)_$(4)_ASCIIDOC_OPTS += -f $$($(2)_$(4)_ASCIIDOC_CONF) -endif - -# Handle a2x warning about --destination-dir option only applicable to HTML -# based outputs. So: -# - use the --destination-dir option if possible (html and split-html), -# - otherwise copy the generated document to the output directory -$(2)_$(4)_A2X_OPTS = -ifneq ($$(filter $(5),html split-html),) -$(2)_$(4)_A2X_OPTS += --destination-dir="$$(@D)" -else -define $(2)_$(4)_INSTALL_CMDS - $$(Q)cp -f $$(BUILD_DIR)/docs/$(1)/$(1).$(6) $$(@D) -endef -endif - -$$(O)/docs/$(1)/$(1).$(6): export TZ=UTC - -ifeq ($(6)-$$(GENDOC_XSLTPROC_IS_BROKEN),pdf-y) -$$(O)/docs/$(1)/$(1).$(6): - $$(warning PDF generation is disabled because of a bug in \ - xsltproc. To be able to generate a PDF, you should \ - build xsltproc from the libxslt sources >=1.1.29 and pass it \ - to make through the command line: \ - 'PATH=/path/to/custom-xsltproc/bin:$$$${PATH} make $(1)-pdf') -else -# -r $(@D) is there for documents that use external filters; those filters -# generate code at the same location it finds the document's source files. -$$(O)/docs/$(1)/$(1).$(6): $$($(2)_SOURCES) \ - $(1)-check-dependencies \ - $(1)-check-dependencies-$(5) \ - $(1)-prepare-sources - $$(Q)$$(call MESSAGE,"Generating $(7) $(1)...") - $$(Q)mkdir -p $$(@D) - $$(Q)a2x $(8) -f $(4) -d book -L \ - $$(foreach r,$$($(2)_RESOURCES) $$(@D), \ - --resource="$$(abspath $$(r))") \ - $$($(2)_$(4)_A2X_OPTS) \ - --asciidoc-opts="$$($(2)_$(4)_ASCIIDOC_OPTS)" \ - $$(BUILD_DIR)/docs/$(1)/$(1).txt -# install the generated document - $$($(2)_$(4)_INSTALL_CMDS) -endif -endef - -################################################################################ -# ASCIIDOC -- generates the make targets needed to build asciidoc documentation. -# -# argument 1 is the lowercase name of the document; the document's main file -# must have the same name, with the .txt extension -# argument 2 is the uppercase name of the document -# argument 3 is the directory containing the document's sources -# -# The variable _SOURCES defines the dependencies. -# The variable _RESOURCES defines where the document's -# resources, such as images, are located; must be an absolute path. -################################################################################ -define ASCIIDOC -# Single line, because splitting a foreach is not easy... -$(1)-check-dependencies: asciidoc-check-dependencies $$($(2)_DEPENDENCIES) - $$(Q)$$(foreach hook,$$($(2)_CHECK_DEPENDENCIES_HOOKS),$$(call $$(hook))$$(sep)) - -# Single line, because splitting a foreach is not easy... -# Do not touch the stamp file, so we get to rsync again every time we build -# the document. -$$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced: - $$(Q)$$(call MESSAGE,"Preparing the $(1) sources...") - $$(Q)mkdir -p $$(@D) - $$(Q)rsync -a $(3) $$(@D) - $$(Q)$$(foreach hook,$$($(2)_POST_RSYNC_HOOKS),$$(call $$(hook))$$(sep)) - -$(1)-prepare-sources: $$(BUILD_DIR)/docs/$(1)/.stamp_doc_rsynced - -$(2)_ASCIIDOC_CONF = $(3)/asciidoc.conf - -$(call ASCIIDOC_INNER,$(1),$(2),$(3),xhtml,html,html,HTML,\ - --xsltproc-opts "--stringparam toc.section.depth 1") - -$(call ASCIIDOC_INNER,$(1),$(2),$(3),chunked,split-html,chunked,split HTML,\ - --xsltproc-opts "--stringparam toc.section.depth 1") - -# dblatex needs to pass the '--maxvars ...' option to xsltproc to prevent it -# from reaching the template recursion limit when processing the (long) target -# package table and bailing out. -$(call ASCIIDOC_INNER,$(1),$(2),$(3),pdf,pdf,pdf,PDF,\ - --dblatex-opts "-P latex.output.revhistory=0 -x '--maxvars 100000'") - -$(call ASCIIDOC_INNER,$(1),$(2),$(3),text,text,text,text) - -$(call ASCIIDOC_INNER,$(1),$(2),$(3),epub,epub,epub,ePUB) - -clean: $(1)-clean -$(1)-clean: - $$(Q)$$(RM) -rf $$(BUILD_DIR)/docs/$(1) -.PHONY: $(1) $(1)-clean -endef - -################################################################################ -# asciidoc-document -- the target generator macro for asciidoc documents -################################################################################ - -asciidoc-document = $(call ASCIIDOC,$(pkgname),$(call UPPERCASE,$(pkgname)),$(pkgdir)) diff --git a/package.bak/docker-containerd/Config.in b/package.bak/docker-containerd/Config.in deleted file mode 100644 index 2f7bf71af1..0000000000 --- a/package.bak/docker-containerd/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_DOCKER_CONTAINERD - bool "docker-containerd" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # util-linux - select BR2_PACKAGE_RUNC # runtime dependency - select BR2_PACKAGE_UTIL_LINUX # runtime dependency - select BR2_PACKAGE_UTIL_LINUX_BINARIES - select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT - select BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT - select BR2_PACKAGE_UTIL_LINUX_MOUNT - help - containerd is a daemon to control runC. - - https://github.com/docker/containerd - -comment "docker-containerd needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/docker-containerd/docker-containerd.hash b/package.bak/docker-containerd/docker-containerd.hash deleted file mode 100644 index f27e38ed23..0000000000 --- a/package.bak/docker-containerd/docker-containerd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Computed locally -sha256 88e099af66b50abe7f2159f13bdab793fa5199d8d5b9a9ef7a68171abb4359be docker-containerd-v0.2.5.tar.gz diff --git a/package.bak/docker-containerd/docker-containerd.mk b/package.bak/docker-containerd/docker-containerd.mk deleted file mode 100644 index c04552a68e..0000000000 --- a/package.bak/docker-containerd/docker-containerd.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# docker-containerd -# -################################################################################ - -DOCKER_CONTAINERD_VERSION = v0.2.5 -DOCKER_CONTAINERD_SITE = $(call github,docker,containerd,$(DOCKER_CONTAINERD_VERSION)) -DOCKER_CONTAINERD_LICENSE = Apache-2.0 -DOCKER_CONTAINERD_LICENSE_FILES = LICENSE.code - -DOCKER_CONTAINERD_DEPENDENCIES = host-go - -DOCKER_CONTAINERD_GOPATH = "$(@D)/vendor" -DOCKER_CONTAINERD_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_CONTAINERD_GOPATH)" - -DOCKER_CONTAINERD_GLDFLAGS = \ - -X github.com/docker/containerd.GitCommit=$(DOCKER_CONTAINERD_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_CONTAINERD_GLDFLAGS += -extldflags '-static' -endif - -define DOCKER_CONTAINERD_CONFIGURE_CMDS - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker - ln -s $(@D) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/docker/containerd - mkdir -p $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers - ln -s $(RUNC_SRCDIR) $(DOCKER_CONTAINERD_GOPATH)/src/github.com/opencontainers/runc -endef - -define DOCKER_CONTAINERD_BUILD_CMDS - $(foreach d,ctr containerd containerd-shim,\ - cd $(@D); $(DOCKER_CONTAINERD_MAKE_ENV) $(HOST_DIR)/usr/bin/go build \ - -v -o $(@D)/bin/$(d) -ldflags "$(DOCKER_CONTAINERD_GLDFLAGS)" ./$(d)$(sep)) -endef - -define DOCKER_CONTAINERD_INSTALL_TARGET_CMDS - ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc - $(INSTALL) -D -m 0755 $(@D)/bin/containerd $(TARGET_DIR)/usr/bin/docker-containerd - $(INSTALL) -D -m 0755 $(@D)/bin/containerd-shim $(TARGET_DIR)/usr/bin/containerd-shim - ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim -endef - -$(eval $(generic-package)) diff --git a/package.bak/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch b/package.bak/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch deleted file mode 100644 index 413cfd6f7b..0000000000 --- a/package.bak/docker-engine/0001-Fix-issues-with-tailing-rotated-jsonlog-file.patch +++ /dev/null @@ -1,297 +0,0 @@ -From 8d6f2e3fe8851b581309da25fc4c32f8be675932 Mon Sep 17 00:00:00 2001 -From: Brian Goff -Date: Mon, 11 Jul 2016 16:31:42 -0400 -Subject: [PATCH] Fix issues with tailing rotated jsonlog file - -Fixes a race where the log reader would get events for both an actual -rotation as we from fsnotify (`fsnotify.Rename`). -This issue becomes extremely apparent when rotations are fast, for -example: - -``` -$ docker run -d --name test --log-opt max-size=1 --log-opt max-file=2 -busybox sh -c 'while true; do echo hello; usleep 100000; done' -``` - -With this change the log reader for jsonlogs can handle rotations that -happen as above. - -Instead of listening for both fs events AND rotation events -simultaneously, potentially meaning we see 2 rotations for only a single -rotation due to channel buffering, only listen for fs events (like -`Rename`) and then wait to be notified about rotation by the logger. -This makes sure that we don't see 2 rotations for 1, and that we don't -start trying to read until the logger is actually ready for us to. - -Signed-off-by: Brian Goff - -This commit is pending upstream commit fixing broken log tailing. The -original commit can be found in the PR here: - - - https://github.com/docker/docker/pull/24514 - -Signed-off-by: Christian Stewart ---- - daemon/logger/jsonfilelog/read.go | 180 +++++++++++++++++++++++++------------- - 1 file changed, 119 insertions(+), 61 deletions(-) - -diff --git a/daemon/logger/jsonfilelog/read.go b/daemon/logger/jsonfilelog/read.go -index bea83dd..0cb44af 100644 ---- a/daemon/logger/jsonfilelog/read.go -+++ b/daemon/logger/jsonfilelog/read.go -@@ -3,11 +3,14 @@ package jsonfilelog - import ( - "bytes" - "encoding/json" -+ "errors" - "fmt" - "io" - "os" - "time" - -+ "gopkg.in/fsnotify.v1" -+ - "github.com/Sirupsen/logrus" - "github.com/docker/docker/daemon/logger" - "github.com/docker/docker/pkg/filenotify" -@@ -44,6 +47,10 @@ func (l *JSONFileLogger) ReadLogs(config logger.ReadConfig) *logger.LogWatcher { - func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) { - defer close(logWatcher.Msg) - -+ // lock so the read stream doesn't get corrupted do to rotations or other log data written while we read -+ // This will block writes!!! -+ l.mu.Lock() -+ - pth := l.writer.LogPath() - var files []io.ReadSeeker - for i := l.writer.MaxFiles(); i > 1; i-- { -@@ -61,6 +68,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - latestFile, err := os.Open(pth) - if err != nil { - logWatcher.Err <- err -+ l.mu.Unlock() - return - } - -@@ -80,6 +88,7 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - if err := latestFile.Close(); err != nil { - logrus.Errorf("Error closing file: %v", err) - } -+ l.mu.Unlock() - return - } - -@@ -87,7 +96,6 @@ func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.R - latestFile.Seek(0, os.SEEK_END) - } - -- l.mu.Lock() - l.readers[logWatcher] = struct{}{} - l.mu.Unlock() - -@@ -128,92 +136,142 @@ func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since ti - } - } - -+func watchFile(name string) (filenotify.FileWatcher, error) { -+ fileWatcher, err := filenotify.New() -+ if err != nil { -+ return nil, err -+ } -+ -+ if err := fileWatcher.Add(name); err != nil { -+ logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err) -+ fileWatcher.Close() -+ fileWatcher = filenotify.NewPollingWatcher() -+ -+ if err := fileWatcher.Add(name); err != nil { -+ fileWatcher.Close() -+ logrus.Debugf("error watching log file for modifications: %v", err) -+ return nil, err -+ } -+ } -+ return fileWatcher, nil -+} -+ - func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan interface{}, since time.Time) { - dec := json.NewDecoder(f) - l := &jsonlog.JSONLog{} - -- fileWatcher, err := filenotify.New() -+ name := f.Name() -+ fileWatcher, err := watchFile(name) - if err != nil { - logWatcher.Err <- err -+ return - } - defer func() { - f.Close() - fileWatcher.Close() - }() -- name := f.Name() - -- if err := fileWatcher.Add(name); err != nil { -- logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err) -- fileWatcher.Close() -- fileWatcher = filenotify.NewPollingWatcher() -+ var retries int -+ handleRotate := func() error { -+ f.Close() -+ fileWatcher.Remove(name) - -+ // retry when the file doesn't exist -+ for retries := 0; retries <= 5; retries++ { -+ f, err = os.Open(name) -+ if err == nil || !os.IsNotExist(err) { -+ break -+ } -+ } -+ if err != nil { -+ return err -+ } - if err := fileWatcher.Add(name); err != nil { -- logrus.Debugf("error watching log file for modifications: %v", err) -- logWatcher.Err <- err -- return -+ return err - } -+ dec = json.NewDecoder(f) -+ return nil - } - -- var retries int -- for { -- msg, err := decodeLogLine(dec, l) -- if err != nil { -- if err != io.EOF { -- // try again because this shouldn't happen -- if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry { -- dec = json.NewDecoder(f) -- retries++ -- continue -+ errRetry := errors.New("retry") -+ errDone := errors.New("done") -+ waitRead := func() error { -+ select { -+ case e := <-fileWatcher.Events(): -+ switch e.Op { -+ case fsnotify.Write: -+ dec = json.NewDecoder(f) -+ return nil -+ case fsnotify.Rename, fsnotify.Remove: -+ <-notifyRotate -+ if err := handleRotate(); err != nil { -+ return err - } -- -- // io.ErrUnexpectedEOF is returned from json.Decoder when there is -- // remaining data in the parser's buffer while an io.EOF occurs. -- // If the json logger writes a partial json log entry to the disk -- // while at the same time the decoder tries to decode it, the race condition happens. -- if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry { -- reader := io.MultiReader(dec.Buffered(), f) -- dec = json.NewDecoder(reader) -- retries++ -- continue -+ return nil -+ } -+ return errRetry -+ case err := <-fileWatcher.Errors(): -+ logrus.Debug("logger got error watching file: %v", err) -+ // Something happened, let's try and stay alive and create a new watcher -+ if retries <= 5 { -+ fileWatcher, err = watchFile(name) -+ if err != nil { -+ return err - } -- -- return -+ retries++ -+ return errRetry - } -+ return err -+ case <-logWatcher.WatchClose(): -+ fileWatcher.Remove(name) -+ return errDone -+ } -+ } - -- select { -- case <-fileWatcher.Events(): -- dec = json.NewDecoder(f) -- continue -- case <-fileWatcher.Errors(): -- logWatcher.Err <- err -- return -- case <-logWatcher.WatchClose(): -- fileWatcher.Remove(name) -- return -- case <-notifyRotate: -- f.Close() -- fileWatcher.Remove(name) -- -- // retry when the file doesn't exist -- for retries := 0; retries <= 5; retries++ { -- f, err = os.Open(name) -- if err == nil || !os.IsNotExist(err) { -- break -- } -+ handleDecodeErr := func(err error) error { -+ if err == io.EOF { -+ for err := waitRead(); err != nil; { -+ if err == errRetry { -+ // retry the waitRead -+ continue - } -+ return err -+ } -+ return nil -+ } -+ // try again because this shouldn't happen -+ if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry { -+ dec = json.NewDecoder(f) -+ retries++ -+ return nil -+ } -+ // io.ErrUnexpectedEOF is returned from json.Decoder when there is -+ // remaining data in the parser's buffer while an io.EOF occurs. -+ // If the json logger writes a partial json log entry to the disk -+ // while at the same time the decoder tries to decode it, the race condition happens. -+ if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry { -+ reader := io.MultiReader(dec.Buffered(), f) -+ dec = json.NewDecoder(reader) -+ retries++ -+ return nil -+ } -+ return err -+ } - -- if err = fileWatcher.Add(name); err != nil { -- logWatcher.Err <- err -- return -- } -- if err != nil { -- logWatcher.Err <- err -+ // main loop -+ for { -+ msg, err := decodeLogLine(dec, l) -+ if err != nil { -+ if err := handleDecodeErr(err); err != nil { -+ if err == errDone { - return - } -- -- dec = json.NewDecoder(f) -- continue -+ // we got an unrecoverable error, so return -+ logWatcher.Err <- err -+ return - } -+ // ready to try again -+ continue - } - - retries = 0 // reset retries since we've succeeded --- -2.7.3 - diff --git a/package.bak/docker-engine/Config.in b/package.bak/docker-engine/Config.in deleted file mode 100644 index 1879a56fdd..0000000000 --- a/package.bak/docker-engine/Config.in +++ /dev/null @@ -1,65 +0,0 @@ -config BR2_PACKAGE_DOCKER_ENGINE - bool "docker-engine" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Docker is a platform to build, ship, - and run applications as lightweight containers. - - https://github.com/docker/docker - -if BR2_PACKAGE_DOCKER_ENGINE - -config BR2_PACKAGE_DOCKER_ENGINE_DAEMON - bool "docker daemon" - depends on BR2_USE_MMU # docker-containerd - select BR2_PACKAGE_DOCKER_CONTAINERD # runtime dependency - select BR2_PACKAGE_IPTABLES # runtime dependency - select BR2_PACKAGE_SQLITE # runtime dependency - default y - help - Build the Docker system daemon. - If not selected, will build client only. - -config BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL - bool "build experimental features" - -if BR2_PACKAGE_DOCKER_ENGINE_DAEMON - -config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS - bool "btrfs filesystem driver" - depends on BR2_USE_MMU # btrfs-progs - depends on BR2_TOOLCHAIN_HAS_THREADS # btrfs-progs - select BR2_PACKAGE_BTRFS_PROGS - help - Build the btrfs filesystem driver for Docker. - -config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER - bool "devicemapper filesystem driver" - depends on BR2_TOOLCHAIN_HAS_THREADS # lvm2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LVM2_APP_LIBRARY - help - Build the devicemapper filesystem driver for Docker. - -config BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS - bool "vfs filesystem driver" - depends on BR2_USE_WCHAR # gvfs - depends on BR2_USE_MMU # gvfs - depends on BR2_TOOLCHAIN_HAS_THREADS # gvfs - select BR2_PACKAGE_GVFS - help - Build the vfs filesystem driver for Docker. - -endif - -endif - -comment "docker-engine needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/docker-engine/docker-engine.hash b/package.bak/docker-engine/docker-engine.hash deleted file mode 100644 index 5e09453e49..0000000000 --- a/package.bak/docker-engine/docker-engine.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0413f3513c2a6842ed9cf837154c8a722e9b34cb36b33430348489baa183707e docker-engine-v1.12.6.tar.gz diff --git a/package.bak/docker-engine/docker-engine.mk b/package.bak/docker-engine/docker-engine.mk deleted file mode 100644 index d575662dde..0000000000 --- a/package.bak/docker-engine/docker-engine.mk +++ /dev/null @@ -1,113 +0,0 @@ -################################################################################ -# -# docker-engine -# -################################################################################ - -DOCKER_ENGINE_VERSION = v1.12.6 -DOCKER_ENGINE_COMMIT = 78d18021ecba00c00730dec9d56de6896f9e708d -DOCKER_ENGINE_SITE = $(call github,docker,docker,$(DOCKER_ENGINE_VERSION)) - -DOCKER_ENGINE_LICENSE = Apache-2.0 -DOCKER_ENGINE_LICENSE_FILES = LICENSE - -DOCKER_ENGINE_DEPENDENCIES = host-go host-pkgconf - -DOCKER_ENGINE_GOPATH = "$(@D)/vendor" -DOCKER_ENGINE_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - CGO_NO_EMULATION=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(DOCKER_ENGINE_GOPATH)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - $(TARGET_MAKE_ENV) - -DOCKER_ENGINE_GLDFLAGS = \ - -X main.GitCommit=$(DOCKER_ENGINE_VERSION) \ - -X main.Version=$(DOCKER_ENGINE_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -DOCKER_ENGINE_GLDFLAGS += -extldflags '-static' -endif - -DOCKER_ENGINE_BUILD_TAGS = cgo exclude_graphdriver_zfs autogen -DOCKER_ENGINE_BUILD_TARGETS = docker - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -DOCKER_ENGINE_BUILD_TAGS += seccomp -DOCKER_ENGINE_DEPENDENCIES += libseccomp -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) -DOCKER_ENGINE_BUILD_TAGS += daemon -DOCKER_ENGINE_BUILD_TARGETS += dockerd -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_EXPERIMENTAL),y) -DOCKER_ENGINE_BUILD_TAGS += experimental -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_BTRFS),y) -DOCKER_ENGINE_DEPENDENCIES += btrfs-progs -else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_btrfs -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_DEVICEMAPPER),y) -DOCKER_ENGINE_DEPENDENCIES += lvm2 -else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_devicemapper -endif - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DRIVER_VFS),y) -DOCKER_ENGINE_DEPENDENCIES += gvfs -else -DOCKER_ENGINE_BUILD_TAGS += exclude_graphdriver_vfs -endif - -define DOCKER_ENGINE_CONFIGURE_CMDS - ln -fs $(@D) $(DOCKER_ENGINE_GOPATH)/src/github.com/docker/docker - cd $(@D) && \ - GITCOMMIT="$$(echo $(DOCKER_ENGINE_COMMIT) | head -c7)" \ - BUILDTIME="$$(date)" \ - VERSION="$(patsubst v%,%,$(DOCKER_ENGINE_VERSION))" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" $(TARGET_MAKE_ENV) \ - bash ./hack/make/.go-autogen -endef - -ifeq ($(BR2_PACKAGE_DOCKER_ENGINE_DAEMON),y) - -define DOCKER_ENGINE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.service \ - $(TARGET_DIR)/usr/lib/systemd/system/docker.service - $(INSTALL) -D -m 0644 $(@D)/contrib/init/systemd/docker.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/docker.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/docker.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/docker.service -endef - -define DOCKER_ENGINE_USERS - - - docker -1 * - - - Docker Application Container Framework -endef - -endif - -define DOCKER_ENGINE_BUILD_CMDS - $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - cd $(@D); $(DOCKER_ENGINE_MAKE_ENV) \ - $(HOST_DIR)/usr/bin/go build -v \ - -o $(@D)/bin/$(target) \ - -tags "$(DOCKER_ENGINE_BUILD_TAGS)" \ - -ldflags "$(DOCKER_ENGINE_GLDFLAGS)" \ - ./cmd/$(target) - ) -endef - -define DOCKER_ENGINE_INSTALL_TARGET_CMDS - $(foreach target,$(DOCKER_ENGINE_BUILD_TARGETS), \ - $(INSTALL) -D -m 0755 $(@D)/bin/$(target) $(TARGET_DIR)/usr/bin/$(target) - ) -endef - -$(eval $(generic-package)) diff --git a/package.bak/docker/Config.in b/package.bak/docker/Config.in deleted file mode 100644 index 12f8432bc1..0000000000 --- a/package.bak/docker/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_DOCKER - bool "docker" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_XLIB_LIBX11 - help - a system tray dock for X - - http://icculus.org/openbox/2/docker - -comment "docker needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/docker/docker.hash b/package.bak/docker/docker.hash deleted file mode 100644 index 710a0eb57c..0000000000 --- a/package.bak/docker/docker.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 47629578e89d96d1541c91d040aec4316f03ad6d01dc3eecb8f82a33445c1e4e docker-1.5.tar.gz diff --git a/package.bak/docker/docker.mk b/package.bak/docker/docker.mk deleted file mode 100644 index 9a9d26bb85..0000000000 --- a/package.bak/docker/docker.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# docker -# -################################################################################ - -DOCKER_VERSION = 1.5 -DOCKER_SITE = http://icculus.org/openbox/2/docker -DOCKER_DEPENDENCIES = host-pkgconf libglib2 xlib_libX11 - -DOCKER_LICENSE = GPLv2+ -# The 'or later' is specified at the end of the README, so include that one too. -DOCKER_LICENSE_FILES = COPYING README - -define DOCKER_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - XLIBPATH=$(STAGING_DIR)/usr/lib -endef - -define DOCKER_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - XLIBPATH=$(STAGING_DIR)/usr/lib PREFIX=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/domoticz/Config.in b/package.bak/domoticz/Config.in deleted file mode 100644 index c6550d2ad0..0000000000 --- a/package.bak/domoticz/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_DOMOTICZ - bool "domoticz" - depends on BR2_USE_MMU # mosquitto - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mosquitto - depends on !BR2_STATIC_LIBS # mosquitto - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3 - # These result in internal compiler error - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_THREAD - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_MOSQUITTO - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_ZLIB - help - Domoticz is a Home Automation System that lets you monitor - and configure various devices like: Lights, Switches, - various sensors/meters like Temperature, Rain, Wind, UV, - Electra, Gas, Water and much more. Notifications/Alerts can - be sent to any mobile device. - - http://domoticz.com - -comment "domoticz needs lua >= 5.2 and a toolchain w/ C++, threads, wchar, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - !(BR2_PACKAGE_LUA_5_2 || BR2_PACKAGE_LUA_5_3) diff --git a/package.bak/domoticz/S99domoticz b/package.bak/domoticz/S99domoticz deleted file mode 100644 index a16cacadde..0000000000 --- a/package.bak/domoticz/S99domoticz +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -NAME=domoticz -PIDFILE=/var/run/$NAME.pid -DAEMON=/opt/domoticz/$NAME -DAEMON_ARGS="-daemon -www 8080 -sslwww 443" - -start() { - printf "Starting $NAME: " - start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/domoticz/domoticz.hash b/package.bak/domoticz/domoticz.hash deleted file mode 100644 index 7feab8fbca..0000000000 --- a/package.bak/domoticz/domoticz.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fb88edbe428851a7a337a85faa93f6da00713b3ad086ff6957031dc9b3b58bba domoticz-3.5877.tar.gz diff --git a/package.bak/domoticz/domoticz.mk b/package.bak/domoticz/domoticz.mk deleted file mode 100644 index f43dbda49e..0000000000 --- a/package.bak/domoticz/domoticz.mk +++ /dev/null @@ -1,77 +0,0 @@ -################################################################################ -# -# domoticz -# -################################################################################ - -DOMOTICZ_VERSION = 3.5877 -DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) -DOMOTICZ_LICENSE = GPLv3 -DOMOTICZ_LICENSE_FILES = License.txt -DOMOTICZ_DEPENDENCIES = \ - boost \ - host-pkgconf \ - libcurl \ - lua \ - mosquitto \ - openssl \ - sqlite \ - zlib - -# Due to the dependency on mosquitto, domoticz depends on -# !BR2_STATIC_LIBS so set USE_STATIC_BOOST to OFF -DOMOTICZ_CONF_OPTS += -DUSE_STATIC_BOOST=OFF - -# Do not use any built-in libraries which are enabled by default for -# lua, sqlite and mqtt -DOMOTICZ_CONF_OPTS += \ - -DUSE_BUILTIN_LUA=OFF \ - -DUSE_BUILTIN_SQLITE=OFF \ - -DUSE_BUILTIN_MQTT=OFF - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -DOMOTICZ_DEPENDENCIES += libusb -endif - -ifeq ($(BR2_PACKAGE_OPENZWAVE),y) -DOMOTICZ_DEPENDENCIES += openzwave - -# Due to the dependency on mosquitto, domoticz depends on -# !BR2_STATIC_LIBS so set USE_STATIC_OPENZWAVE to OFF otherwise -# domoticz will not find the openzwave library as it searches by -# default a static library. -DOMOTICZ_CONF_OPTS += -DUSE_STATIC_OPENZWAVE=OFF -endif - -# Install domoticz in a dedicated directory (/opt/domoticz) as -# domoticz expects by default that all its subdirectories (www, -# Config, scripts, ...) are in the binary directory. -DOMOTICZ_TARGET_DIR = /opt/domoticz -DOMOTICZ_CONF_OPTS += -DCMAKE_INSTALL_PREFIX=$(DOMOTICZ_TARGET_DIR) - -# Delete License.txt and updatedomo files installed by domoticz in target -# directory -# Do not delete History.txt as it is used in source code -define DOMOTICZ_REMOVE_UNNEEDED_FILES - $(RM) $(TARGET_DIR)/$(DOMOTICZ_TARGET_DIR)/License.txt - $(RM) $(TARGET_DIR)/$(DOMOTICZ_TARGET_DIR)/updatedomo -endef - -DOMOTICZ_POST_INSTALL_TARGET_HOOKS += DOMOTICZ_REMOVE_UNNEEDED_FILES - -# Use dedicated init scripts for systemV and systemd instead of using -# domoticz.sh as it is not compatible with buildroot init system -define DOMOTICZ_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/domoticz/S99domoticz \ - $(TARGET_DIR)/etc/init.d/S99domoticz -endef - -define DOMOTICZ_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/domoticz/domoticz.service \ - $(TARGET_DIR)/usr/lib/systemd/system/domoticz.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/domoticz.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/domoticz.service -endef - -$(eval $(cmake-package)) diff --git a/package.bak/domoticz/domoticz.service b/package.bak/domoticz/domoticz.service deleted file mode 100644 index 446b41a51b..0000000000 --- a/package.bak/domoticz/domoticz.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Domoticz Home Automation System -After=network.target - -[Service] -ExecStart=/opt/domoticz/domoticz -daemon -www 8080 -sslwww 443 -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/doom-wad/Config.in b/package.bak/doom-wad/Config.in deleted file mode 100644 index edd299b5e8..0000000000 --- a/package.bak/doom-wad/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_DOOM_WAD - bool "shareware Doom WAD file" - depends on BR2_PACKAGE_CHOCOLATE_DOOM || BR2_PACKAGE_PRBOOM - help - This will install the shareware wad data file for the doom game. - - The wad file will be placed in the /usr/share/games/doom directory. diff --git a/package.bak/doom-wad/doom-wad.hash b/package.bak/doom-wad/doom-wad.hash deleted file mode 100644 index fa069c1b77..0000000000 --- a/package.bak/doom-wad/doom-wad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 cacf0142b31ca1af00796b4a0339e07992ac5f21bc3f81e7532fe1b5e1b486e6 doom19s.zip diff --git a/package.bak/doom-wad/doom-wad.mk b/package.bak/doom-wad/doom-wad.mk deleted file mode 100644 index d3ac731bd5..0000000000 --- a/package.bak/doom-wad/doom-wad.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# doom-wad -# -################################################################################ - -DOOM_WAD_VERSION = 1.9 -DOOM_WAD_SOURCE = doom$(subst .,,$(DOOM_WAD_VERSION))s.zip -# Official server currently unavailable -# DOOM_WAD_SITE = ftp://ftp.idsoftware.com/idstuff/doom -DOOM_WAD_SITE = http://www.jbserver.com/downloads/games/doom/misc/shareware - -define DOOM_WAD_EXTRACT_CMDS - $(UNZIP) -p $(DL_DIR)/$($(PKG)_SOURCE) 'DOOMS_19.[12]' > \ - $(@D)/doom-$(DOOM_WAD_VERSION).zip - $(UNZIP) -d $(@D) $(@D)/doom-$(DOOM_WAD_VERSION).zip DOOM1.WAD -endef - -define DOOM_WAD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/DOOM1.WAD \ - $(TARGET_DIR)/usr/share/games/doom/doom1.wad -endef - -$(eval $(generic-package)) diff --git a/package.bak/dos2unix/Config.in b/package.bak/dos2unix/Config.in deleted file mode 100644 index 0a4f5e2fff..0000000000 --- a/package.bak/dos2unix/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_DOS2UNIX - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - bool "dos2unix" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - dos2unix converts text file line endings between CRLF and LF - - http://waterlan.home.xs4all.nl/dos2unix.html diff --git a/package.bak/dos2unix/Config.in.host b/package.bak/dos2unix/Config.in.host deleted file mode 100644 index 5ec6033a8e..0000000000 --- a/package.bak/dos2unix/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_DOS2UNIX - bool "host dos2unix" - help - dos2unix converts text file line endings between CRLF and LF - - http://waterlan.home.xs4all.nl/dos2unix.html diff --git a/package.bak/dos2unix/dos2unix.hash b/package.bak/dos2unix/dos2unix.hash deleted file mode 100644 index 1169592fce..0000000000 --- a/package.bak/dos2unix/dos2unix.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769b572ef25150fde4056c5f30c5 dos2unix-7.3.4.tar.gz diff --git a/package.bak/dos2unix/dos2unix.mk b/package.bak/dos2unix/dos2unix.mk deleted file mode 100644 index df2094e4a5..0000000000 --- a/package.bak/dos2unix/dos2unix.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# dos2unix -# -################################################################################ - -DOS2UNIX_VERSION = 7.3.4 -DOS2UNIX_SITE = http://waterlan.home.xs4all.nl/dos2unix -DOS2UNIX_LICENSE = BSD-2c -DOS2UNIX_LICENSE_FILES = COPYING.txt -DOS2UNIX_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) - -ifeq ($(BR2_ENABLE_LOCALE),y) -DOS2UNIX_DEPENDENCIES += host-gettext -else -DOS2UNIX_MAKE_OPTS += ENABLE_NLS= -endif - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -DOS2UNIX_DEPENDENCIES += gettext -DOS2UNIX_MAKE_OPTS += LIBS_EXTRA=-lintl -endif - -ifeq ($(BR2_USE_WCHAR),) -DOS2UNIX_MAKE_OPTS += UCS= -endif - -define DOS2UNIX_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(DOS2UNIX_MAKE_OPTS) -endef - -define DOS2UNIX_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - $(DOS2UNIX_MAKE_OPTS) install -endef - -define HOST_DOS2UNIX_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) ENABLE_NLS= -endef - -define HOST_DOS2UNIX_INSTALL_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) ENABLE_NLS= \ - install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch b/package.bak/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch deleted file mode 100644 index ff3c3ffa44..0000000000 --- a/package.bak/dosfstools/0001-mkfs-Default-to-64-32-heads-sectors-for-targets-smalle.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 1e76e5778a1885452939a79d9145b80634a5b023 Mon Sep 17 00:00:00 2001 -From: Andreas Bombe -Date: Wed, 11 May 2016 03:44:58 +0200 -Subject: [PATCH] mkfs: Default to 64/32 heads/sectors for targets smaller than - 512 MB - -This may put defaults in certain use cases a little bit more in line -with the old defaults in versions up to 3.0.28. It has mostly aesthetic -value in most cases. - -Signed-off-by: Andreas Bombe -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - src/mkfs.fat.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/mkfs.fat.c b/src/mkfs.fat.c -index 8a320fd..bad492b 100644 ---- a/src/mkfs.fat.c -+++ b/src/mkfs.fat.c -@@ -519,6 +519,16 @@ static void establish_params(struct device_info *info) - unsigned int cluster_size = 4; /* starting point for FAT12 and FAT16 */ - int def_root_dir_entries = 512; - -+ if (info->size < 512 * 1024 * 1024) { -+ /* -+ * These values are more or less meaningless, but we can at least -+ * use less extreme values for smaller filesystems where the large -+ * dummy values signifying LBA only access are not needed. -+ */ -+ sec_per_track = 32; -+ heads = 64; -+ } -+ - if (info->type != TYPE_FIXED) { - /* enter default parameters for floppy disks if the size matches */ - switch (info->size / 1024) { --- -2.7.3 - diff --git a/package.bak/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch b/package.bak/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch deleted file mode 100644 index 9740304603..0000000000 --- a/package.bak/dosfstools/0002-src-device_info.c-Fix-undefined-PATH_MAX-under-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 06ce096dabd8a29c72dc0bc5110d2c4867baa490 Mon Sep 17 00:00:00 2001 -From: Alessio Sergi -Date: Fri, 6 May 2016 18:18:18 +0200 -Subject: [PATCH] src/device_info.c: Fix undefined PATH_MAX under musl - -In musl libc, PATH_MAX is defined in . - -Status: pending -https://github.com/dosfstools/dosfstools/pull/27 - -[Romain: add patch status] -Signed-off-by: Romain Naour ---- - src/device_info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/device_info.c b/src/device_info.c -index f5d11ac..cd57388 100644 ---- a/src/device_info.c -+++ b/src/device_info.c -@@ -17,6 +17,7 @@ - */ - - -+#include - #include - #include - #include --- -2.5.5 - diff --git a/package.bak/dosfstools/Config.in b/package.bak/dosfstools/Config.in deleted file mode 100644 index 33c64b34a2..0000000000 --- a/package.bak/dosfstools/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_DOSFSTOOLS - bool "dosfstools" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Tools for creating and checking DOS FAT filesystems. - - https://github.com/dosfstools/dosfstools - -if BR2_PACKAGE_DOSFSTOOLS - -config BR2_PACKAGE_DOSFSTOOLS_FATLABEL - bool "fatlabel" - help - Get or set the DOS FAT filesystem label. - -config BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT - bool "fsck.fat" - help - Check a DOS FAT filesystem. - -config BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT - bool "mkfs.fat" - help - Creates a DOS FAT filesystem on a device. - -endif - -comment "dosfstools needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/dosfstools/Config.in.host b/package.bak/dosfstools/Config.in.host deleted file mode 100644 index fc488c0c6f..0000000000 --- a/package.bak/dosfstools/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_DOSFSTOOLS - bool "host dosfstools" - help - Tools for creating and checking DOS FAT filesystems. - - https://github.com/dosfstools/dosfstools diff --git a/package.bak/dosfstools/dosfstools.hash b/package.bak/dosfstools/dosfstools.hash deleted file mode 100644 index 777b8d9e3f..0000000000 --- a/package.bak/dosfstools/dosfstools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf dosfstools-4.0.tar.xz diff --git a/package.bak/dosfstools/dosfstools.mk b/package.bak/dosfstools/dosfstools.mk deleted file mode 100644 index 67c6f73103..0000000000 --- a/package.bak/dosfstools/dosfstools.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# dosfstools -# -################################################################################ - -DOSFSTOOLS_VERSION = 4.0 -DOSFSTOOLS_SOURCE = dosfstools-$(DOSFSTOOLS_VERSION).tar.xz -DOSFSTOOLS_SITE = https://github.com/dosfstools/dosfstools/releases/download/v$(DOSFSTOOLS_VERSION) -DOSFSTOOLS_LICENSE = GPLv3+ -DOSFSTOOLS_LICENSE_FILES = COPYING -DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks --exec-prefix=/ -HOST_DOSFSTOOLS_CONF_OPTS = --enable-compat-symlinks - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -DOSFSTOOLS_CONF_OPTS += --with-udev -DOSFSTOOLS_DEPENDENCIES += udev -else -DOSFSTOOLS_CONF_OPTS += --without-udev -endif - -ifneq ($(BR2_ENABLE_LOCALE),y) -DOSFSTOOLS_CONF_OPTS += LIBS="-liconv" -DOSFSTOOLS_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FATLABEL),) -define DOSFSTOOLS_REMOVE_FATLABEL - rm -f $(addprefix $(TARGET_DIR)/sbin/,dosfslabel fatlabel) -endef -DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FATLABEL -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT),) -define DOSFSTOOLS_REMOVE_FSCK_FAT - rm -f $(addprefix $(TARGET_DIR)/sbin/,fsck.fat dosfsck fsck.msdos fsck.vfat) -endef -DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_FSCK_FAT -endif - -ifeq ($(BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT),) -define DOSFSTOOLS_REMOVE_MKFS_FAT - rm -f $(addprefix $(TARGET_DIR)/sbin/,mkfs.fat mkdosfs mkfs.msdos mkfs.vfat) -endef -DOSFSTOOLS_POST_INSTALL_TARGET_HOOKS += DOSFSTOOLS_REMOVE_MKFS_FAT -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/dovecot-pigeonhole/Config.in b/package.bak/dovecot-pigeonhole/Config.in deleted file mode 100644 index 83f528766a..0000000000 --- a/package.bak/dovecot-pigeonhole/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_DOVECOT_PIGEONHOLE - bool "dovecot-pigeonhole" - help - Pigeonhole is the name of the project that adds support for the Sieve - language (RFC 5228) and the ManageSieve protocol (RFC 5804) to the - Dovecot Secure IMAP Server. - - http://pigeonhole.dovecot.org diff --git a/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.hash b/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.hash deleted file mode 100644 index 95325a95de..0000000000 --- a/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed after checking signature -sha256 8f0b98f18062d6e241eef74ebe16cc167cd246361cbe6657d94f0ecc5d7d3234 dovecot-2.2-pigeonhole-0.4.16.tar.gz diff --git a/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.mk b/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.mk deleted file mode 100644 index 846e7f97dd..0000000000 --- a/package.bak/dovecot-pigeonhole/dovecot-pigeonhole.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# dovecot-pigeonhole -# -################################################################################ - -DOVECOT_PIGEONHOLE_VERSION = 0.4.16 -DOVECOT_PIGEONHOLE_SOURCE = dovecot-2.2-pigeonhole-$(DOVECOT_PIGEONHOLE_VERSION).tar.gz -DOVECOT_PIGEONHOLE_SITE = http://pigeonhole.dovecot.org/releases/2.2 -DOVECOT_PIGEONHOLE_LICENSE = LGPLv2.1 -DOVECOT_PIGEONHOLE_LICENSE_FILES = COPYING -DOVECOT_PIGEONHOLE_DEPENDENCIES = dovecot - -DOVECOT_PIGEONHOLE_CONF_OPTS = --with-dovecot=$(STAGING_DIR)/usr/lib - -$(eval $(autotools-package)) diff --git a/package.bak/dovecot/Config.in b/package.bak/dovecot/Config.in deleted file mode 100644 index d1ff7bce91..0000000000 --- a/package.bak/dovecot/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_DOVECOT - bool "dovecot" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - Dovecot is an open source IMAP and POP3 email server for Linux/UNIX- - like systems, written with security primarily in mind. Dovecot is an - excellent choice for both small and large installations. It's fast, - simple to set up, requires no special administration and it uses very - little memory. - - http://www.dovecot.org - -if BR2_PACKAGE_DOVECOT - -config BR2_PACKAGE_DOVECOT_MYSQL - bool "mysql support" - select BR2_PACKAGE_MYSQL - depends on BR2_INSTALL_LIBSTDCPP # mysql - depends on BR2_TOOLCHAIN_HAS_THREADS # mysql - help - Enable MySQL support. - -comment "mysql support needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_DOVECOT_SQLITE - bool "sqlite support" - select BR2_PACKAGE_SQLITE - help - Enable SQLite support. - -source package/dovecot-pigeonhole/Config.in - -endif # BR2_PACKAGE_DOVECOT - -comment "dovecot needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/dovecot/dovecot.hash b/package.bak/dovecot/dovecot.hash deleted file mode 100644 index e7b9c3375e..0000000000 --- a/package.bak/dovecot/dovecot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed after checking signature -sha256 897f92a87cda4b27b243f8149ce0ba7b7e71a2be8fb7994eb0a025e54cde18e9 dovecot-2.2.27.tar.gz diff --git a/package.bak/dovecot/dovecot.mk b/package.bak/dovecot/dovecot.mk deleted file mode 100644 index fe0afa5064..0000000000 --- a/package.bak/dovecot/dovecot.mk +++ /dev/null @@ -1,115 +0,0 @@ -################################################################################ -# -# dovecot -# -################################################################################ - -DOVECOT_VERSION_MAJOR = 2.2 -DOVECOT_VERSION = $(DOVECOT_VERSION_MAJOR).27 -DOVECOT_SITE = http://www.dovecot.org/releases/$(DOVECOT_VERSION_MAJOR) -DOVECOT_INSTALL_STAGING = YES -DOVECOT_LICENSE = LGPLv2.1 -DOVECOT_LICENSE_FILES = COPYING COPYING.LGPL COPYING.MIT -DOVECOT_DEPENDENCIES = \ - host-pkgconf \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - openssl - -DOVECOT_CONF_ENV = \ - RPCGEN=__disable_RPCGEN_rquota \ - i_cv_epoll_works=yes \ - i_cv_inotify_works=yes \ - i_cv_posix_fallocate_works=no \ - i_cv_signed_size_t=no \ - i_cv_gmtime_max_time_t=32 \ - i_cv_signed_time_t=yes \ - i_cv_mmap_plays_with_write=yes \ - i_cv_fd_passing=yes \ - i_cv_c99_vsnprintf=yes \ - lib_cv_va_copy=yes \ - lib_cv___va_copy=yes \ - lib_cv_va_val_copy=yes - -DOVECOT_CONF_OPTS = --without-docs --with-ssl=openssl - -ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL)$(BR2_PACKAGE_DOVECOT_SQLITE),) -DOVECOT_CONF_OPTS += --without-sql -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -DOVECOT_CONF_OPTS += --with-bzlib -DOVECOT_DEPENDENCIES += bzip2 -else -DOVECOT_CONF_OPTS += --without-bzlib -endif - -ifeq ($(BR2_PACKAGE_ICU),y) -DOVECOT_CONF_OPTS += --with-icu -DOVECOT_DEPENDENCIES += icu -else -DOVECOT_CONF_OPTS += --without-icu -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -DOVECOT_CONF_OPTS += --with-libcap -DOVECOT_DEPENDENCIES += libcap -else -DOVECOT_CONF_OPTS += --without-libcap -endif - -ifeq ($(BR2_PACKAGE_DOVECOT_MYSQL),y) -DOVECOT_CONF_ENV += MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" -DOVECOT_CONF_OPTS += --with-mysql -DOVECOT_DEPENDENCIES += mysql -else -DOVECOT_CONF_OPTS += --without-mysql -endif - -ifeq ($(BR2_PACKAGE_DOVECOT_SQLITE),y) -DOVECOT_CONF_OPTS += --with-sqlite -DOVECOT_DEPENDENCIES += sqlite -else -DOVECOT_CONF_OPTS += --without-sqlite -endif - -ifeq ($(BR2_PACKAGE_LZ4),y) -DOVECOT_CONF_OPTS += --with-lz4 -DOVECOT_DEPENDENCIES += lz4 -else -DOVECOT_CONF_OPTS += --without-lz4 -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -DOVECOT_CONF_OPTS += --with-lzma -DOVECOT_DEPENDENCIES += xz -else -DOVECOT_CONF_OPTS += --without-lzma -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -DOVECOT_CONF_OPTS += --with-zlib -DOVECOT_DEPENDENCIES += zlib -else -DOVECOT_CONF_OPTS += --without-zlib -endif - -# fix paths to avoid using /usr/lib/dovecot -define DOVECOT_POST_CONFIGURE - for i in $$(find $(@D) -name "Makefile"); do \ - $(SED) 's%^pkglibdir =.*%pkglibdir = \$$(libdir)%' $$i; \ - $(SED) 's%^pkglibexecdir =.*%pkglibexecdir = \$$(libexecdir)%' $$i; \ - done -endef - -DOVECOT_POST_CONFIGURE_HOOKS += DOVECOT_POST_CONFIGURE - -# dovecot installs dovecot-config in usr/lib/, therefore -# DOVECOT_CONFIG_SCRIPTS can not be used to rewrite paths -define DOVECOT_FIX_STAGING_DOVECOT_CONFIG - $(SED) 's,^LIBDOVECOT_INCLUDE=.*$$,LIBDOVECOT_INCLUDE=\"-I$(STAGING_DIR)/usr/include/dovecot\",' $(STAGING_DIR)/usr/lib/dovecot-config - $(SED) 's,^LIBDOVECOT=.*$$,LIBDOVECOT=\"-L$(STAGING_DIR)/usr/lib -ldovecot\",' $(STAGING_DIR)/usr/lib/dovecot-config -endef - -DOVECOT_POST_INSTALL_STAGING_HOOKS += DOVECOT_FIX_STAGING_DOVECOT_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/doxygen/doxygen.hash b/package.bak/doxygen/doxygen.hash deleted file mode 100644 index 40cfe16a17..0000000000 --- a/package.bak/doxygen/doxygen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Computed locally -sha256 d4ab6e28d4d45d8956cad17470aade3fbe2356e8f64b92167e738c1887feccec doxygen-1.8.9.1.src.tar.gz diff --git a/package.bak/doxygen/doxygen.mk b/package.bak/doxygen/doxygen.mk deleted file mode 100644 index cf7dfee2a5..0000000000 --- a/package.bak/doxygen/doxygen.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# doxygen -# -################################################################################ - -DOXYGEN_VERSION = 1.8.9.1 -DOXYGEN_SOURCE = doxygen-$(DOXYGEN_VERSION).src.tar.gz -DOXYGEN_SITE = http://ftp.stack.nl/pub/users/dimitri -DOXYGEN_LICENSE = GPLv2 -DOXYGEN_LICENSE_FILES = LICENSE -HOST_DOXYGEN_DEPENDENCIES = host-flex host-bison - -define HOST_DOXYGEN_CONFIGURE_CMDS - (cd $(@D); $(HOST_MAKE_ENV) ./configure --shared --prefix=$(HOST_DIR)/usr) -endef - -define HOST_DOXYGEN_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_DOXYGEN_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -# Doxygen's configure is a handwritten script, not an autotools-generated one. -# It doesn't accept host-autotools-package default arguments, so we have to -# call host-generic-package here. -$(eval $(host-generic-package)) diff --git a/package.bak/drbd-utils/Config.in b/package.bak/drbd-utils/Config.in deleted file mode 100644 index be6861988f..0000000000 --- a/package.bak/drbd-utils/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_DRBD_UTILS - bool "drbd-utils" - depends on BR2_USE_MMU # needs fork() - help - DRBD utilities to manage the DRBD kernel module. - - http://oss.linbit.com/drbd/ diff --git a/package.bak/drbd-utils/drbd-utils.hash b/package.bak/drbd-utils/drbd-utils.hash deleted file mode 100644 index ebd13ef09e..0000000000 --- a/package.bak/drbd-utils/drbd-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 38929279d1bf549fd1ade4ce6773a6fe209db51bbb0efe7bf6d2b7871ba0afbc drbd-utils-8.9.4.tar.gz diff --git a/package.bak/drbd-utils/drbd-utils.mk b/package.bak/drbd-utils/drbd-utils.mk deleted file mode 100644 index eb6042d2b6..0000000000 --- a/package.bak/drbd-utils/drbd-utils.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# drbd-utils -# -################################################################################ - -DRBD_UTILS_VERSION = 8.9.4 -DRBD_UTILS_SITE = http://oss.linbit.com/drbd -DRBD_UTILS_LICENSE = GPLv2+ -DRBD_UTILS_LICENSE_FILES = COPYING -DRBD_UTILS_DEPENDENCIES = host-flex - -DRBD_UTILS_CONF_OPTS = --with-distro=generic --without-manual - -ifeq ($(BR2_INIT_SYSTEMD),y) -DRBD_UTILS_CONF_OPTS += --with-initscripttype=systemd -DRBD_UTILS_DEPENDENCIES += systemd -else -DRBD_UTILS_CONF_OPTS += --with-initscripttype=sysv -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -DRBD_UTILS_CONF_OPTS += --with-udev=yes -DRBD_UTILS_DEPENDENCIES += udev -else -DRBD_UTILS_CONF_OPTS += --with-udev=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/dropbear/Config.in b/package.bak/dropbear/Config.in deleted file mode 100644 index d92361fa39..0000000000 --- a/package.bak/dropbear/Config.in +++ /dev/null @@ -1,58 +0,0 @@ -config BR2_PACKAGE_DROPBEAR - bool "dropbear" - select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL - help - A small SSH 2 server designed for small memory environments. - - Note that dropbear requires a per-device unique host key. The - key will be generated when dropbear starts, but it is not - persistent over reboot (if you have a read-only rootfs) or - upgrade (if you have a read-write rootfs). To make the key - persistent, replace /etc/dropbear with a symlink to a - directory on a persistent, writeable filesystem. - Alternatively, mount a persistent unionfs over your root - filesystem. - - http://matt.ucc.asn.au/dropbear/dropbear.html - -if BR2_PACKAGE_DROPBEAR - -config BR2_PACKAGE_DROPBEAR_CLIENT - bool "client programs" - default y - help - Provides the programs: dbclient, ssh - - Note that the following programs are also used server-side - and are therefore always build regardless this setting: - dropbear, dropbearkey, dropbearconvert, scp - -config BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS - bool "disable reverse DNS lookups" - help - Disable reverse DNS lookups on connection. This can be handy - on systems without working DNS, as connections otherwise - stall until DNS times out. - -config BR2_PACKAGE_DROPBEAR_SMALL - bool "optimize for size" - default y - help - Compile dropbear for the smallest possible binary size. - - Tradeoffs are slower hashes and ciphers, and disabling of the - blowfish cipher and zlib. - -config BR2_PACKAGE_DROPBEAR_WTMP - bool "log dropbear access to wtmp" - help - Enable logging of dropbear access to wtmp. Notice that - Buildroot does not generate wtmp by default. - -config BR2_PACKAGE_DROPBEAR_LASTLOG - bool "log dropbear access to lastlog" - help - Enable logging of dropbear access to lastlog. Notice that - Buildroot does not generate lastlog by default. - -endif diff --git a/package.bak/dropbear/S50dropbear b/package.bak/dropbear/S50dropbear deleted file mode 100644 index 9474eaafaa..0000000000 --- a/package.bak/dropbear/S50dropbear +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# -# Starts dropbear sshd. -# - -# Allow a few customizations from a config file -test -r /etc/default/dropbear && . /etc/default/dropbear - -start() { - DROPBEAR_ARGS="$DROPBEAR_ARGS -R" - - # If /etc/dropbear is a symlink to /var/run/dropbear, and - # - the filesystem is RO (i.e. we can not rm the symlink), - # create the directory pointed to by the symlink. - # - the filesystem is RW (i.e. we can rm the symlink), - # replace the symlink with an actual directory - if [ -L /etc/dropbear \ - -a "$(readlink /etc/dropbear)" = "/var/run/dropbear" ] - then - if rm -f /etc/dropbear >/dev/null 2>&1; then - mkdir -p /etc/dropbear - else - echo "No persistent location to store SSH host keys. New keys will be" - echo "generated at each boot. Are you sure this is what you want to do?" - mkdir -p "$(readlink /etc/dropbear)" - fi - fi - - printf "Starting dropbear sshd: " - umask 077 - - start-stop-daemon -S -q -p /var/run/dropbear.pid \ - --exec /usr/sbin/dropbear -- $DROPBEAR_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping dropbear sshd: " - start-stop-daemon -K -q -p /var/run/dropbear.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/dropbear/dropbear.hash b/package.bak/dropbear/dropbear.hash deleted file mode 100644 index 88f3e6ed5d..0000000000 --- a/package.bak/dropbear/dropbear.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891 dropbear-2016.74.tar.bz2 diff --git a/package.bak/dropbear/dropbear.mk b/package.bak/dropbear/dropbear.mk deleted file mode 100644 index 743d52479e..0000000000 --- a/package.bak/dropbear/dropbear.mk +++ /dev/null @@ -1,99 +0,0 @@ -################################################################################ -# -# dropbear -# -################################################################################ - -DROPBEAR_VERSION = 2016.74 -DROPBEAR_SITE = http://matt.ucc.asn.au/dropbear/releases -DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2 -DROPBEAR_LICENSE = MIT, BSD-2c-like, BSD-2c -DROPBEAR_LICENSE_FILES = LICENSE -DROPBEAR_TARGET_BINS = dropbearkey dropbearconvert scp -DROPBEAR_PROGRAMS = dropbear $(DROPBEAR_TARGET_BINS) - -ifeq ($(BR2_PACKAGE_DROPBEAR_CLIENT),y) -# Build dbclient, and create a convenience symlink named ssh -DROPBEAR_PROGRAMS += dbclient -DROPBEAR_TARGET_BINS += dbclient ssh -endif - -DROPBEAR_MAKE = \ - $(MAKE) MULTI=1 SCPPROGRESS=1 \ - PROGRAMS="$(DROPBEAR_PROGRAMS)" - -ifeq ($(BR2_STATIC_LIBS),y) -DROPBEAR_MAKE += STATIC=1 -endif - -define DROPBEAR_FIX_XAUTH - $(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h -endef - -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH - -define DROPBEAR_ENABLE_REVERSE_DNS - $(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h -endef - -define DROPBEAR_BUILD_SMALL - $(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h -endef - -define DROPBEAR_BUILD_FEATURED - $(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h - $(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h -endef - -define DROPBEAR_DISABLE_STANDALONE - $(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h -endef - -define DROPBEAR_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/dropbear/dropbear.service \ - $(TARGET_DIR)/usr/lib/systemd/system/dropbear.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/dropbear.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/dropbear.service -endef - -ifeq ($(BR2_USE_MMU),y) -define DROPBEAR_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/dropbear/S50dropbear \ - $(TARGET_DIR)/etc/init.d/S50dropbear -endef -else -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_DISABLE_STANDALONE -endif - -ifeq ($(BR2_PACKAGE_DROPBEAR_DISABLE_REVERSEDNS),) -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS -endif - -ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y) -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL -DROPBEAR_CONF_OPTS += --disable-zlib -else -DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED -DROPBEAR_DEPENDENCIES += zlib -endif - -ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y) -DROPBEAR_CONF_OPTS += --disable-wtmp -endif - -ifneq ($(BR2_PACKAGE_DROPBEAR_LASTLOG),y) -DROPBEAR_CONF_OPTS += --disable-lastlog -endif - -define DROPBEAR_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(@D)/dropbearmulti $(TARGET_DIR)/usr/sbin/dropbear - for f in $(DROPBEAR_TARGET_BINS); do \ - ln -snf ../sbin/dropbear $(TARGET_DIR)/usr/bin/$$f ; \ - done - ln -snf /var/run/dropbear $(TARGET_DIR)/etc/dropbear -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dropbear/dropbear.service b/package.bak/dropbear/dropbear.service deleted file mode 100644 index 620cdd7a50..0000000000 --- a/package.bak/dropbear/dropbear.service +++ /dev/null @@ -1,27 +0,0 @@ -[Unit] -Description=Dropbear SSH daemon -After=syslog.target network.target auditd.service - -[Service] -# If /etc/dropbear is a symlink to /var/run/dropbear, and -# - the filesystem is RO (i.e. we can not rm the symlink), -# create the directory pointed to by the symlink. -# - the filesystem is RW (i.e. we can rm the symlink), -# replace the symlink with an actual directory -ExecStartPre=/bin/sh -c '\ -if [ -L /etc/dropbear \ - -a "$(readlink /etc/dropbear)" = "/var/run/dropbear" ]; then \ - if rm -f /etc/dropbear >/dev/null 2>&1; then \ - mkdir -p /etc/dropbear; \ - else \ - echo "No persistent location to store SSH host keys. New keys will be"; \ - echo "generated at each boot. Are you sure this is what you want to do?"; \ - mkdir -p "$(readlink /etc/dropbear)"; \ - fi; \ -fi' -EnvironmentFile=-/etc/default/dropbear -ExecStart=/usr/sbin/dropbear -F -R $DROPBEAR_ARGS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/dropwatch/0001-build.patch b/package.bak/dropwatch/0001-build.patch deleted file mode 100644 index eed43e8dd7..0000000000 --- a/package.bak/dropwatch/0001-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 03bab84ca3f102274837e83ee6da4c997a9da018 Mon Sep 17 00:00:00 2001 -From: Tzu-Jung Lee -Date: Fri, 12 Jul 2013 20:00:57 +0800 -Subject: [PATCH] build: modify hardcoded gcc to support buildroot - -Signed-off-by: Tzu-Jung Lee - -diff --git a/src/Makefile b/src/Makefile -index 026b6ba..b87ae9f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -5,10 +5,10 @@ OBJFILES := main.o lookup.o\ - lookup_bfd.o lookup_kas.o - - dropwatch: $(OBJFILES) -- gcc -g -o dropwatch $(OBJFILES) $(LDFLAGS) -+ $(CC) -g -o dropwatch $(OBJFILES) $(LDFLAGS) - - %.o: %.c -- gcc $(CFLAGS) $< -+ $(CC) $(CFLAGS) $< - clean: - rm -f dropwatch *.o - --- -1.8.3.2 - diff --git a/package.bak/dropwatch/0002-binutils-2.23.1.patch b/package.bak/dropwatch/0002-binutils-2.23.1.patch deleted file mode 100644 index 4d43356a6a..0000000000 --- a/package.bak/dropwatch/0002-binutils-2.23.1.patch +++ /dev/null @@ -1,74 +0,0 @@ -libbfd from binutils 2.23.1+ requires PACKAGE* definitions from autoconf. -Patch from https://fedorahosted.org/dropwatch/ticket/5 -Upstream status: new. - -Signed-off-by: Gustavo Zacarias - -diff -aurd src.orig/lookup.c src/lookup.c ---- a/src/lookup.c 2011-10-03 22:51:38.000000000 +0400 -+++ b/src/lookup.c 2013-02-18 09:13:56.683214438 +0400 -@@ -27,13 +27,13 @@ - #include - #include - #include --#include - #include - #include - #include - #include - - #include "lookup.h" -+#include - - extern struct lookup_methods bfd_methods; - extern struct lookup_methods kallsym_methods; -diff -aurd src.orig/lookup.h src/lookup.h ---- a/src/lookup.h 2011-10-03 22:51:38.000000000 +0400 -+++ b/src/lookup.h 2013-02-18 09:11:00.506895026 +0400 -@@ -28,6 +28,9 @@ - #include - #include - -+// satisfy PR 14072 in bfd.h -+#define PACKAGE 1 -+#define PACKAGE_VERSION 1 - - /* - * Initalization routine -diff -aurd src.orig/lookup_bfd.c src/lookup_bfd.c ---- a/src/lookup_bfd.c 2012-01-16 22:34:11.000000000 +0400 -+++ b/src/lookup_bfd.c 2013-02-18 09:14:02.472984310 +0400 -@@ -25,13 +25,13 @@ - #include - #include - #include --#include - #include - #include - #include - #include - - #include "lookup.h" -+#include - - - static int lookup_bfd_init(void) -diff -aurd src.orig/lookup_kas.c src/lookup_kas.c ---- a/src/lookup_kas.c 2012-05-31 02:43:23.000000000 +0400 -+++ b/src/lookup_kas.c 2013-02-18 09:14:07.906101713 +0400 -@@ -25,7 +25,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -33,6 +32,7 @@ - #include - - #include "lookup.h" -+#include - - struct symbol_entry { - char *sym_name; diff --git a/package.bak/dropwatch/0003-remove-werror.patch b/package.bak/dropwatch/0003-remove-werror.patch deleted file mode 100644 index 97b26b74c4..0000000000 --- a/package.bak/dropwatch/0003-remove-werror.patch +++ /dev/null @@ -1,18 +0,0 @@ --Werror shouldn't be used in released code since it can -cause random build failures on moderate warnings. It also -depends on the used toolchain since different toolchains may -or may not print the same warnings. - -Signed-off-by: Markos Chandras - -Index: dropwatch-1.4/src/Makefile -=================================================================== ---- dropwatch-1.4.orig/src/Makefile -+++ dropwatch-1.4/src/Makefile -@@ -1,5 +1,5 @@ - all: dropwatch --CFLAGS+=-c -g -D_GNU_SOURCE -Wall -Werror `pkg-config --cflags libnl-3.0` -+CFLAGS+=-c -g -D_GNU_SOURCE -Wall `pkg-config --cflags libnl-3.0` - LDFLAGS=-lbfd -lreadline -lnl-3 -lnl-genl-3 - OBJFILES := main.o lookup.o\ - lookup_bfd.o lookup_kas.o diff --git a/package.bak/dropwatch/Config.in b/package.bak/dropwatch/Config.in deleted file mode 100644 index 6f04c85dd6..0000000000 --- a/package.bak/dropwatch/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_DROPWATCH - bool "dropwatch" - select BR2_PACKAGE_BINUTILS - depends on !BR2_nios2 # binutils - depends on BR2_USE_WCHAR # binutils - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_LIBNL - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - help - Dropwatch is an interactive utility for monitoring and - recording packets that are dropped by the kernel - - https://fedorahosted.org/dropwatch/ - -comment "dropwatch needs a toolchain w/ threads, wchar" - depends on !BR2_nios2 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/dropwatch/dropwatch.hash b/package.bak/dropwatch/dropwatch.hash deleted file mode 100644 index 3f15c84ec1..0000000000 --- a/package.bak/dropwatch/dropwatch.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c2348b8d72781ab0f3ca52b8415d78ea98808280e14e7d68e76605f196bb5c4a dropwatch-1.4.tar.xz diff --git a/package.bak/dropwatch/dropwatch.mk b/package.bak/dropwatch/dropwatch.mk deleted file mode 100644 index 3565927e29..0000000000 --- a/package.bak/dropwatch/dropwatch.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# dropwatch -# -################################################################################ - -DROPWATCH_VERSION = 1.4 -DROPWATCH_SOURCE = dropwatch-$(DROPWATCH_VERSION).tar.xz -DROPWATCH_SITE = https://git.fedorahosted.org/cgit/dropwatch.git/snapshot -DROPWATCH_DEPENDENCIES = binutils libnl readline host-pkgconf -DROPWATCH_LICENSE = GPLv2 -DROPWATCH_LICENSE_FILES = COPYING - -# libbfd may be linked to libintl -# Ugly... but LDFLAGS are hardcoded anyway -DROPWATCH_LDFLAGS = \ - $(TARGET_LDFLAGS) -lbfd -lreadline -lnl-3 -lnl-genl-3 \ - -lpthread -lncurses -lm - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -DROPWATCH_LDFLAGS += -lintl -endif - -define DROPWATCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - LDFLAGS="$(DROPWATCH_LDFLAGS)" build -endef - -define DROPWATCH_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/dropwatch \ - $(TARGET_DIR)/usr/bin/dropwatch -endef - -$(eval $(generic-package)) diff --git a/package.bak/dsp-tools/Config.in b/package.bak/dsp-tools/Config.in deleted file mode 100644 index 0267454be9..0000000000 --- a/package.bak/dsp-tools/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_DSP_TOOLS - bool "dsp-tools" - depends on BR2_cortex_a8 - select BR2_PACKAGE_TIDSP_BINARIES - help - Utilities for TI OMAP3 DSP. - - http://github.com/felipec/dsp-tools diff --git a/package.bak/dsp-tools/dsp-tools.hash b/package.bak/dsp-tools/dsp-tools.hash deleted file mode 100644 index cfcf06c8d6..0000000000 --- a/package.bak/dsp-tools/dsp-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 734a1d5f21fb388bdbe64f7b599fef52357c3c72ff860f38456a352e7c1c3e78 dsp-tools-v2.0.tar.gz diff --git a/package.bak/dsp-tools/dsp-tools.mk b/package.bak/dsp-tools/dsp-tools.mk deleted file mode 100644 index c91ed20629..0000000000 --- a/package.bak/dsp-tools/dsp-tools.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# dsp-tools -# -################################################################################ - -DSP_TOOLS_VERSION = v2.0 -DSP_TOOLS_SITE = $(call github,felipec,dsp-tools,$(DSP_TOOLS_VERSION)) -DSP_TOOLS_DEPENDENCIES = tidsp-binaries -DSP_TOOLS_LICENSE = LGPLv2.1 -DSP_TOOLS_LICENSE_FILES = LICENSE - -define DSP_TOOLS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -endef - -define DSP_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dstat/Config.in b/package.bak/dstat/Config.in deleted file mode 100644 index 6536a5e544..0000000000 --- a/package.bak/dstat/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_DSTAT - bool "dstat" - depends on BR2_USE_WCHAR # python - depends on BR2_USE_MMU # python - depends on BR2_TOOLCHAIN_HAS_THREADS # python - depends on !BR2_STATIC_LIBS # python - select BR2_PACKAGE_PYTHON - help - Dstat, written in Python, is a versatile replacement for vmstat, - iostat, netstat and ifstat. Dstat overcomes some of their limitations - and adds some extra features, more counters and flexibility. Dstat is - handy for monitoring systems during performance tuning tests, - benchmarks or troubleshooting. - Dstat allows you to view all of your system resources in real-time, - you can e.g. compare disk utilization in combination with interrupts - from your IDE controller, or compare the network bandwidth numbers - directly with the disk throughput (in the same interval). - - Note that to get proper output, your terminal size should be known by - the termios subsystem. This can be done by running the 'resize' - utility of busybox. - - http://dag.wieers.com/home-made/dstat/ - -comment "dstat needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/dstat/dstat.hash b/package.bak/dstat/dstat.hash deleted file mode 100644 index f701561747..0000000000 --- a/package.bak/dstat/dstat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 34a986d9d7c028bd9dcb6b2ef1c740f7220de5c9cf976870a2b62aca23b33bae dstat-0.7.2.tar.bz2 diff --git a/package.bak/dstat/dstat.mk b/package.bak/dstat/dstat.mk deleted file mode 100644 index 180031f20a..0000000000 --- a/package.bak/dstat/dstat.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# dstat -# -################################################################################ - -DSTAT_VERSION = 0.7.2 -DSTAT_SOURCE = dstat-$(DSTAT_VERSION).tar.bz2 -DSTAT_SITE = http://dag.wieers.com/home-made/dstat -DSTAT_LICENSE = GPLv2 -DSTAT_LICENSE_FILES = COPYING - -define DSTAT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dt/0001-adjust-os-symlink.patch b/package.bak/dt/0001-adjust-os-symlink.patch deleted file mode 100644 index 1af9d64d67..0000000000 --- a/package.bak/dt/0001-adjust-os-symlink.patch +++ /dev/null @@ -1,19 +0,0 @@ -Don't force build-dir-in-build-dir logic, symlink the os-specific SCSI -support file in place. - -Status: not suitable for upstream. - -Signed-off-by: Gustavo Zacarias - -diff -Nura Makefile.linux Makefile.linux ---- a/Makefile.linux 2016-01-26 09:10:03.939963780 -0300 -+++ b/Makefile.linux 2016-01-26 09:10:27.140763863 -0300 -@@ -129,7 +129,7 @@ - echo "Please specify OS={aix,linux,hpux,solaris,windows}"; \ - exit 1; \ - fi; \ -- ln -sf ../scsilib-$(OS).c scsilib.c -+ ln -sf scsilib-$(OS).c scsilib.c - - print:; - @$(PRINTER) $(PRINTFLAGS) $(ALL_CFILES) diff --git a/package.bak/dt/0002-dt-default-source-define.patch b/package.bak/dt/0002-dt-default-source-define.patch deleted file mode 100644 index 8c9daaeaef..0000000000 --- a/package.bak/dt/0002-dt-default-source-define.patch +++ /dev/null @@ -1,20 +0,0 @@ -Patch taken from Fedora: -http://pkgs.fedoraproject.org/cgit/rpms/dt.git/commit/dt-default-source-define.patch?id=a3107b34a3efc6af66a5f892514f233bb66eb6b5 - -_BSD_SOURCE was deprecated, hence switch to use _DEFAULT_SOURCE as well -to avoid the build from breaking on newer toolchains. - -Signed-off-by: Gustavo Zacarias - -diff -rupN dt.v18.32.old/common.h dt.v18.32/common.h ---- dt.v18.32.old/common.h 2013-03-01 23:52:30.000000000 +0100 -+++ dt.v18.32/common.h 2014-09-24 17:41:40.777604710 +0200 -@@ -127,7 +127,7 @@ typedef volatile slarge_t v_slarge; - - #endif /* defined(_WIN64) */ - --#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) -+#elif defined(__GNUC__) && defined(_BSD_SOURCE) || defined (_DEFAULT_SOURCE) || defined(SCO) || defined(__QNXNTO__) || defined(SOLARIS) || defined(HP_UX) || defined(AIX) || defined(_NT_SOURCE) - - #define QuadIsLongLong - typedef unsigned long long int large_t; diff --git a/package.bak/dt/Config.in b/package.bak/dt/Config.in deleted file mode 100644 index 826a66ebd5..0000000000 --- a/package.bak/dt/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -comment "dt needs a glibc or uClibc toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_DT - bool "dt" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - # Build fails because of several BSDisms - depends on !BR2_TOOLCHAIN_USES_MUSL - help - dt is a generic data test program used to verify proper - operation of peripherals, file systems, device drivers, - or any data stream supported by the operating system. - In its' simplest mode of operation, dt writes and then - verifys its' default data pattern, then displays - performance statisics and other test parameters - before exiting. Since verification of data is performed, - dt can be thought of as a generic diagnostic tool. - - http://www.scsifaq.org/RMiller_Tools/dt.html diff --git a/package.bak/dt/dt.hash b/package.bak/dt/dt.hash deleted file mode 100644 index 7cd8c643e1..0000000000 --- a/package.bak/dt/dt.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://pkgs.fedoraproject.org/repo/pkgs/dt/dt-source-v18.32.tar.gz -# (directory name is md5 hash) -md5 3054aeaaba047a1dbe90c2132a382ee2 dt-source-v18.32.tar.gz -# Calculated based on the hash above -sha256 10d164676e918a4d07f233bcd11e4cb6bfd1052c996182cd1827ccd0c063fcc6 dt-source-v18.32.tar.gz diff --git a/package.bak/dt/dt.mk b/package.bak/dt/dt.mk deleted file mode 100644 index 8ec7788883..0000000000 --- a/package.bak/dt/dt.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# dt -# -################################################################################ - -DT_VERSION = v18.32 -DT_SITE = http://pkgs.fedoraproject.org/repo/pkgs/dt/$(DT_SOURCE)/3054aeaaba047a1dbe90c2132a382ee2 -DT_SOURCE = dt-source-$(DT_VERSION).tar.gz -DT_STRIP_COMPONENTS = 2 -DT_LICENSE = ISC-like -DT_LICENSE_FILES = LICENSE - -DT_CFLAGS = \ - -std=c99 \ - -DMMAP \ - -D__linux__ \ - -D_GNU_SOURCE \ - -D_FILE_OFFSET_BITS=64 \ - -DTHREADS \ - -DSCSI - -# uClibc doesn't provide POSIX AIO -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),) -DT_CFLAGS += -DAIO -endif - -define DT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -f Makefile.linux \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) $(DT_CFLAGS)" \ - OS=linux -endef - -define DT_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/dt $(TARGET_DIR)/usr/bin/dt -endef - -$(eval $(generic-package)) diff --git a/package.bak/dtach/Config.in b/package.bak/dtach/Config.in deleted file mode 100644 index bea112b36d..0000000000 --- a/package.bak/dtach/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_DTACH - bool "dtach" - depends on BR2_USE_MMU # fork() - help - dtach is a tiny program that emulates the detach feature of screen, - allowing you to run a program in an environment that is protected - from the controlling terminal and attach to it later. - - http://dtach.sourceforge.net/ diff --git a/package.bak/dtach/dtach.hash b/package.bak/dtach/dtach.hash deleted file mode 100644 index c643264f84..0000000000 --- a/package.bak/dtach/dtach.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5f7e8c835ee49a9e6dcf89f4e8ccbe724b061c0fc8565b504dd8b3e67ab79f82 dtach-v0.9.tar.gz diff --git a/package.bak/dtach/dtach.mk b/package.bak/dtach/dtach.mk deleted file mode 100644 index 75c443470e..0000000000 --- a/package.bak/dtach/dtach.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# dtach -# -################################################################################ - -DTACH_VERSION = v0.9 -DTACH_SITE = $(call github,crigler,dtach,$(DTACH_VERSION)) -DTACH_LICENSE = GPLv2+ -DTACH_LICENSE_FILES = COPYING - -# The Makefile does not have an install target. -define DTACH_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/dtach $(TARGET_DIR)/usr/bin/dtach -endef - -$(eval $(autotools-package)) diff --git a/package.bak/dtc/0002-extra-cflags.patch b/package.bak/dtc/0002-extra-cflags.patch deleted file mode 100644 index f070692c0f..0000000000 --- a/package.bak/dtc/0002-extra-cflags.patch +++ /dev/null @@ -1,32 +0,0 @@ -Makefile: append the CFLAGS to existing ones - -Allow the user to pass custom CFLAGS (eg. optimisation flags). - -Do not use EXTRA_CFLAGS, append to existing CFLAGS with += (Arnout) - -Signed-off-by: "Yann E. MORIN" -Cc: Arnout Vandecappelle - ---- -Patch not sent upstream. - -Although not specific to buildroot, I am not sure this is the best -way to handle user-supplied CFLAGS. - -diff --git a/Makefile b/Makefile -index 962f94eba661..bf6b317158cf 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,9 +16,10 @@ LOCAL_VERSION = - CONFIG_LOCALVERSION = - - CPPFLAGS = -I libfdt -I . --WARNINGS = -Werror -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ -+WARNINGS = -Wall -Wpointer-arith -Wcast-qual -Wnested-externs \ - -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wshadow --CFLAGS = -g -Os -fPIC -Werror $(WARNINGS) -+CFLAGS ?= -g -Os -+CFLAGS += -fPIC $(WARNINGS) - - BISON = bison - LEX = flex diff --git a/package.bak/dtc/Config.in b/package.bak/dtc/Config.in deleted file mode 100644 index 39223f7226..0000000000 --- a/package.bak/dtc/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_DTC - bool "dtc (libfdt)" - depends on !BR2_STATIC_LIBS - help - The Device Tree Compiler, dtc, takes as input a device-tree in - a given format and outputs a device-tree in another format. - - Note that only the library is installed. - If you want the programs, say 'y' here, and to "dtc programs", below. - - https://git.kernel.org/cgit/utils/dtc/dtc.git - -if BR2_PACKAGE_DTC - -config BR2_PACKAGE_DTC_PROGRAMS - bool "dtc programs" - help - Say 'y' here if you also want the programs on the target: - - convert-dtsv0 convert from version 0 to version 1 - - dtc the device tree compiler - - dtdiff compare two device trees (needs bash) - - fdtdump print a readable version of a flat device tree - - fdtget read values from device tree - - fdtput write a property value to a device tree - - Note: dtdiff requires bash, so if bash is not selected, dtdiff will - be removed from the target file system. Enable bash if you - need dtdiff on the target. - -comment "dtdiff will not be installed: it requires bash" - depends on BR2_PACKAGE_DTC_PROGRAMS - depends on !BR2_PACKAGE_BASH - -endif - -comment "dtc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/dtc/Config.in.host b/package.bak/dtc/Config.in.host deleted file mode 100644 index cbabf0a240..0000000000 --- a/package.bak/dtc/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_DTC - bool "host dtc" - help - The Device Tree Compiler, dtc, takes as input a device-tree in - a given format and outputs a device-tree in another format. - - Install host tools: dtc, convert-dtsv0, fdtdump, fdtget and fdtput. - - https://git.kernel.org/cgit/utils/dtc/dtc.git diff --git a/package.bak/dtc/dtc.hash b/package.bak/dtc/dtc.hash deleted file mode 100644 index 8b3af331fd..0000000000 --- a/package.bak/dtc/dtc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# from https://www.kernel.org/pub/software/utils/dtc/sha256sums.asc -sha256 77992ad8eac7b68f553d0ba58e5b51604ac803d126196c99e3ae38aaae28bb94 dtc-1.4.1.tar.xz diff --git a/package.bak/dtc/dtc.mk b/package.bak/dtc/dtc.mk deleted file mode 100644 index f6800f36b3..0000000000 --- a/package.bak/dtc/dtc.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# dtc -# -################################################################################ - -DTC_VERSION = 1.4.1 -DTC_SOURCE = dtc-$(DTC_VERSION).tar.xz -DTC_SITE = https://www.kernel.org/pub/software/utils/dtc -DTC_LICENSE = GPLv2+ or BSD-2c (library) -DTC_LICENSE_FILES = README.license GPL -DTC_INSTALL_STAGING = YES -DTC_DEPENDENCIES = host-bison host-flex -HOST_DTC_DEPENDENCIES = host-bison host-flex - -define DTC_POST_INSTALL_TARGET_RM_DTDIFF - rm -f $(TARGET_DIR)/usr/bin/dtdiff -endef - -ifeq ($(BR2_PACKAGE_DTC_PROGRAMS),y) - -DTC_LICENSE := $(DTC_LICENSE), GPLv2+ (programs) -DTC_INSTALL_GOAL = install -ifeq ($(BR2_PACKAGE_BASH),) -DTC_POST_INSTALL_TARGET_HOOKS += DTC_POST_INSTALL_TARGET_RM_DTDIFF -endif - -else # $(BR2_PACKAGE_DTC_PROGRAMS) != y - -DTC_INSTALL_GOAL = install-lib - -endif # $(BR2_PACKAGE_DTC_PROGRAMS) != y - -define DTC_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr -endef - -# For staging, only the library is needed -define DTC_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) PREFIX=/usr install-lib \ - install-includes -endef - -define DTC_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr $(DTC_INSTALL_GOAL) -endef - -# host build -define HOST_DTC_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr -endef - -define HOST_DTC_INSTALL_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install-bin -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/dtv-scan-tables/Config.in b/package.bak/dtv-scan-tables/Config.in deleted file mode 100644 index e102ca730c..0000000000 --- a/package.bak/dtv-scan-tables/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_DTV_SCAN_TABLES - bool "dtv-scan-tables" - help - The Digital TV scan tables. - - http://git.linuxtv.org/dtv-scan-tables.git diff --git a/package.bak/dtv-scan-tables/dtv-scan-tables.mk b/package.bak/dtv-scan-tables/dtv-scan-tables.mk deleted file mode 100644 index 8a782cb404..0000000000 --- a/package.bak/dtv-scan-tables/dtv-scan-tables.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# dtv-scan-tables -# -################################################################################ - -DTV_SCAN_TABLES_VERSION = ceb11833b35f05813b1f0397a60e0f3b99430aab -DTV_SCAN_TABLES_SITE = http://git.linuxtv.org/cgit.cgi/dtv-scan-tables.git -DTV_SCAN_TABLES_SITE_METHOD = git - -# This package only contains the transponders data. This is not a 'work' -# as per traditional copyright, but just a collection of 'facts', so there's -# probably no license to apply to these data files. -# However, the package prominently contains the COPYING and COPYING.LIB -# license files (respectively for the GPLv2 and the LGPLv2.1), so we use -# that as the licensing information. -DTV_SCAN_TABLES_LICENSE = GPLv2, LGPLv2.1 -DTV_SCAN_TABLES_LICENSE_FILES = COPYING COPYING.LGPL - -# In order to avoid issues with file name encodings, we rename the -# only dtv-scan-tables file that has non-ASCII characters to have a -# name using only ASCII characters (pl-Krosno_Sucha_Gora) -define DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES - mv $(@D)/dvb-t/pl-Krosno_Sucha* $(@D)/dvb-t/pl-Krosno_Sucha_Gora -endef - -DTV_SCAN_TABLES_POST_PATCH_HOOKS += DTV_SCAN_TABLES_FIX_NONASCII_FILENAMES - -define DTV_SCAN_TABLES_INSTALL_TARGET_CMDS - for f in atsc dvb-c dvb-s dvb-t; do \ - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/dvb/$$f; \ - $(INSTALL) $(@D)/$$f/* $(TARGET_DIR)/usr/share/dvb/$$f; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/duma/0001-fix-cross-compilation.patch b/package.bak/duma/0001-fix-cross-compilation.patch deleted file mode 100644 index eceaf06bec..0000000000 --- a/package.bak/duma/0001-fix-cross-compilation.patch +++ /dev/null @@ -1,37 +0,0 @@ -Allow cross compilation. Adapted from crosstool-ng. - -Signed-off-by: Baruch Siach - -Index: b/GNUmakefile -=================================================================== ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -93,10 +93,6 @@ - # also define 'WIN32' - - # some defaults: --CC=gcc --CXX=g++ --AR=ar --RANLIB=ranlib - INSTALL=install - RM=rm - RMFORCE=rm -f -@@ -471,7 +467,7 @@ - - createconf$(EXEPOSTFIX): createconf.o - - $(RMFORCE) createconf$(EXEPOSTFIX) -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) createconf.o -o createconf$(EXEPOSTFIX) - - tstheap$(EXEPOSTFIX): libduma.a tstheap.o - - $(RMFORCE) tstheap$(EXEPOSTFIX) -@@ -532,7 +528,7 @@ - # define rules how to build objects for createconf - # - createconf.o: -- $(CC) $(CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ -+ $(CC_FOR_BUILD) $(HOST_CFLAGS) $(DUMA_OPTIONS) -c createconf.c -o $@ - - - # diff --git a/package.bak/duma/0002-no-tests.patch b/package.bak/duma/0002-no-tests.patch deleted file mode 100644 index 6fe76f725f..0000000000 --- a/package.bak/duma/0002-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Do not build test programs - -Biulding test programs does not work when we want to do a static link, -because duma.a redefines memcpy and strcpy, so the link fails. - -Signed-off-by: "Yann E. MORIN" - -diff -durN duma-2.5.15.orig/GNUmakefile duma-2.5.15/GNUmakefile ---- duma-2.5.15.orig/GNUmakefile 2014-11-16 14:47:05.874448560 +0100 -+++ duma-2.5.15/GNUmakefile 2014-11-16 14:54:50.792048921 +0100 -@@ -294,7 +294,7 @@ - SO_OBJECTS=dumapp_so.o duma_so.o sem_inc_so.o print_so.o - - # Make all the top-level targets the makefile knows about. --all: libduma.a tstheap$(EXEPOSTFIX) dumatest$(EXEPOSTFIX) thread-test$(EXEPOSTFIX) testmt$(EXEPOSTFIX) dumatestpp$(EXEPOSTFIX) testoperators$(EXEPOSTFIX) $(DUMA_DYN_DEPS) -+all: libduma.a $(DUMA_DYN_DEPS) - - # Perform self tests on the program this makefile builds. - check test: diff --git a/package.bak/duma/0003-fix-C++14.patch b/package.bak/duma/0003-fix-C++14.patch deleted file mode 100644 index d19213ca7a..0000000000 --- a/package.bak/duma/0003-fix-C++14.patch +++ /dev/null @@ -1,65 +0,0 @@ -dumapp: fix for C++14 - -With C++14, the way exceptions are specified has changed (somehow, don't -ask me), thus causing build failures: - - dumapp.cpp: In function ‘void* operator new(std::size_t)’: - dumapp.cpp:192:19: error: declaration of ‘void* operator new(std::size_t) throw (std::bad_alloc)’ has a different exception specifier - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) - ^~~~~~~~ - In file included from dumapp.cpp:39:0: - dumapp.h:91:23: note: from previous declaration ‘void* operator new(std::size_t)’ - void * DUMA_CDECL operator new(DUMA_SIZE_T) throw(std::bad_alloc); - ^~~~~~~~ - -This is most evident with gcc-6.x, since the default C++ standard has -changed from C++11 to C++14, thus exposing these new failures. - -Fix that by guarding the exception handling, a bit like was done -with GRASS GIS (thanks DuckDuckGo): - - https://trac.osgeo.org/grass/changeset?old_path=%2F&old=68817&new_path=%2F&new=68818&sfp_email=&sfph_mail= - -Signed-off-by: "Yann E. MORIN" - ---- -Note: The last commit in DUMA's CVS repo was more than 7 years ago. -I doubt it is still active, so the patch was not sent upstream. :-/ - -diff -durN duma-2.5.15.orig/dumapp.cpp duma-2.5.15/dumapp.cpp ---- duma-2.5.15.orig/dumapp.cpp 2008-08-03 22:46:06.000000000 +0200 -+++ duma-2.5.15/dumapp.cpp 2016-07-10 21:55:22.670386099 +0200 -@@ -190,7 +190,9 @@ - * (11) = (a) ; ASW - */ - void * DUMA_CDECL operator new( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ELEM, true DUMA_PARAMS_UK); - } -@@ -254,7 +256,9 @@ - * (21) = (a) ; AAW - */ - void * DUMA_CDECL operator new[]( DUMA_SIZE_T size ) -+#ifdef DUMA_EXCEPTION_SPECS - throw(std::bad_alloc) -+#endif - { - return duma_new_operator(size, EFA_NEW_ARRAY, true DUMA_PARAMS_UK); - } -diff -durN duma-2.5.15.orig/dumapp.h duma-2.5.15/dumapp.h ---- duma-2.5.15.orig/dumapp.h 2009-04-11 14:41:44.000000000 +0200 -+++ duma-2.5.15/dumapp.h 2016-07-10 21:55:22.670386099 +0200 -@@ -35,6 +35,10 @@ - - #include "duma.h" - -+#if __cplusplus < 201103L -+ #define DUMA_EXCEPTION_SPECS 1 -+#endif -+ - /* remove previous macro definitions */ - #include "noduma.h" - diff --git a/package.bak/duma/Config.in b/package.bak/duma/Config.in deleted file mode 100644 index b1f55faa73..0000000000 --- a/package.bak/duma/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_DUMA - bool "duma" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # By design, duma uses page mapping to isolate - # allocations. Non-MMU platforms cannot perform such - # things. - depends on BR2_USE_MMU - # duma works using LD_PRELOAD, so it always needs to build a - # shared library - depends on !BR2_STATIC_LIBS - help - D.U.M.A. - Detect Unintended Memory Access. A fork of the - Electric Fence library. Detects buffer overflow and - underflow, and also memory leaks. - - http://duma.sourceforge.net - -if BR2_PACKAGE_DUMA - -config BR2_PACKAGE_DUMA_NO_LEAKDETECTION - bool "disable memory leak detection" - -endif # BR2_PACKAGE_DUMA - -comment "duma needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/duma/duma.hash b/package.bak/duma/duma.hash deleted file mode 100644 index f664d4033b..0000000000 --- a/package.bak/duma/duma.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 baaf794854e3093ad1bddadbfb8ad4b220a7117d70359ee216bd59e353734e17 duma_2_5_15.tar.gz diff --git a/package.bak/duma/duma.mk b/package.bak/duma/duma.mk deleted file mode 100644 index cd7f33edca..0000000000 --- a/package.bak/duma/duma.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# duma -# -################################################################################ - -DUMA_VERSION = 2.5.15 -DUMA_SOURCE = duma_$(subst .,_,$(DUMA_VERSION)).tar.gz -DUMA_SITE = http://downloads.sourceforge.net/project/duma/duma/$(DUMA_VERSION) -DUMA_LICENSE = GPLv2+, LGPLv2.1+ -DUMA_LICENSE_FILES = COPYING-GPL COPYING-LGPL - -DUMA_INSTALL_STAGING = YES - -DUMA_OPTIONS = \ - $(if $(BR2_PACKAGE_DUMA_NO_LEAKDETECTION),-DDUMA_LIB_NO_LEAKDETECTION) - -# The dependency of some source files in duma_config.h, which is generated at -# build time, is not specified in the Makefile. Force non-parallel build. -define DUMA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) \ - OS=linux \ - DUMA_OPTIONS="$(DUMA_OPTIONS)" \ - $(DUMA_CPP) -C $(@D) -endef - -define DUMA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(STAGING_DIR)/usr install -C $(@D) -endef - -define DUMA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) OS=linux prefix=$(TARGET_DIR)/usr install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/dvb-apps/0001-Fix-generate-keynames.patch b/package.bak/dvb-apps/0001-Fix-generate-keynames.patch deleted file mode 100644 index 498607d97d..0000000000 --- a/package.bak/dvb-apps/0001-Fix-generate-keynames.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix generate-keynames.sh script for cross-compilation - -generate-keynames.sh reads /usr/include/linux to find the keyname -symbols. However, when cross-compiling, the include path points -somewhere else. Allow the user to pass CROSS_ROOT to point to the -root of the cross-compilation environment. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh ---- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100 -+++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200 -@@ -18,7 +18,7 @@ echo "};" >> $1 - echo >> $1 - echo >> $1 - echo "static struct input_key_name key_name [] = {" >> $1 --for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ - egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \ - cut -f 1 | cut -f 2 -d " " | sort -u) ; do - echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 -@@ -26,7 +26,7 @@ done - echo "};" >> $1 - echo >> $1 - echo "static struct input_key_name btn_name [] = {" >> $1 --for x in $(cat /usr/include/linux/input.h input_fake.h | \ -+for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ - egrep "#define[ \t]+BTN_" | \ - cut -f 1 | cut -f 2 -d " " | sort -u) ; do - echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 diff --git a/package.bak/dvb-apps/0002-Fix-compiler-warning-flags.patch b/package.bak/dvb-apps/0002-Fix-compiler-warning-flags.patch deleted file mode 100644 index 9c6276beb7..0000000000 --- a/package.bak/dvb-apps/0002-Fix-compiler-warning-flags.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9b8f1df41f7579da63c27763ff184d351e4c7fef Mon Sep 17 00:00:00 2001 -From: Simon Dawson -Date: Sun, 4 Jan 2015 12:06:18 +0100 -Subject: [PATCH] Fix compiler warning flags - - When building for bfin, the build fails as follows. - - cc1: error: unrecognized command line option "-Wno-packed-bitfield-compat" - -An example of an autobuild failure arising from this is the following. - - http://autobuild.buildroot.net/results/92e/92e472004812a3616f62d766a9ea07a997a66e89/ - http://autobuild.buildroot.net/results/6e7/6e7b48ad9768349d983985c3067c4267cde80541/ - -Clearly, not all toolchains provide a gcc that understands -the -Wno-packed-bitfield-compat flag; remove usage of this flag. - -Wno-packed-bitfield-compat option was added in gcc 4.4. - -[Romain: - - This patch is also needed for bfin toolchains which use gcc 4.3.5 - - Add a link to bfin build failure] -Signed-off-by: Simon Dawson -Signed-off-by: Romain Naour ---- - util/scan/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/util/scan/Makefile b/util/scan/Makefile -index d48c478..88667c5 100644 ---- a/util/scan/Makefile -+++ b/util/scan/Makefile -@@ -14,7 +14,7 @@ inst_bin = $(binaries) - - removing = atsc_psip_section.c atsc_psip_section.h - --CPPFLAGS += -Wno-packed-bitfield-compat -D__KERNEL_STRICT_NAMES -+CPPFLAGS += -D__KERNEL_STRICT_NAMES - - .PHONY: all - --- -1.9.3 - diff --git a/package.bak/dvb-apps/0003-handle-static-shared-only-build.patch b/package.bak/dvb-apps/0003-handle-static-shared-only-build.patch deleted file mode 100644 index 4dc7c68ac2..0000000000 --- a/package.bak/dvb-apps/0003-handle-static-shared-only-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a826c7c722db40bfedf00e51ce38411550ae8216 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 25 Dec 2014 19:22:16 +0100 -Subject: [PATCH] Make.rules: Handle static/shared only build - -Do not build .a library when enable_static is set to "no" -Do not build .so library when enable_shared is set to "no" - -Signed-off-by: Romain Naour ---- - Make.rules | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/Make.rules b/Make.rules -index 3410d7b..d274e16 100644 ---- a/Make.rules -+++ b/Make.rules -@@ -9,7 +9,13 @@ ifneq ($(lib_name),) - CFLAGS_LIB ?= -fPIC - CFLAGS += $(CFLAGS_LIB) - --libraries = $(lib_name).so $(lib_name).a -+ifneq ($(enable_static),no) -+libraries += $(lib_name).a -+endif -+ -+ifneq ($(enable_shared),no) -+libraries += $(lib_name).so -+endif - - .PHONY: library - -@@ -23,7 +29,7 @@ prerequisites = $(subst .o,.d,$(objects)) $(addsuffix .d,$(binaries)) - - .PHONY: clean install - --ifeq ($(static),1) -+ifneq ($(enable_static),no) - LDFLAGS += -static - endif - --- -1.9.3 - diff --git a/package.bak/dvb-apps/0004-Makefile-remove-test.patch b/package.bak/dvb-apps/0004-Makefile-remove-test.patch deleted file mode 100644 index 45bfad914c..0000000000 --- a/package.bak/dvb-apps/0004-Makefile-remove-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c578772d6abc5fdf3ec83f632c371373e5baf9f1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 26 Dec 2014 01:04:58 +0100 -Subject: [PATCH] Makefile: remove test - -Tests needs static libraries, remove them for shared only build. - -Signed-off-by: Romain Naour ---- - Makefile | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 65a2273..105c460 100644 ---- a/Makefile -+++ b/Makefile -@@ -10,7 +10,6 @@ DVB_API_MINOR := $(word 3, $(shell grep -m1 "DVB_API_VERSION_MINOR" $(VERSION_FI - - all clean install: - $(MAKE) -C lib $@ -- $(MAKE) -C test $@ - $(MAKE) -C util $@ - - update: --- -1.9.3 - diff --git a/package.bak/dvb-apps/Config.in b/package.bak/dvb-apps/Config.in deleted file mode 100644 index 75cc14eb9b..0000000000 --- a/package.bak/dvb-apps/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_DVB_APPS - bool "dvb-apps" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Install a small number of DVB test and utility programs, - including szap and dvbscan. - - http://linuxtv.org/projects.php - http://linuxtv.org/hg/dvb-apps - -comment "dvb-apps utils needs a toolchain w/ threads, headers >= 3.3" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 diff --git a/package.bak/dvb-apps/dvb-apps.mk b/package.bak/dvb-apps/dvb-apps.mk deleted file mode 100644 index c52252c816..0000000000 --- a/package.bak/dvb-apps/dvb-apps.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# dvb-apps -# -################################################################################ - -DVB_APPS_VERSION = 3d43b280298c39a67d1d889e01e173f52c12da35 -DVB_APPS_SITE = http://linuxtv.org/hg/dvb-apps -DVB_APPS_SITE_METHOD = hg -DVB_APPS_LICENSE = GPLv2, GPLv2+, LGPLv2.1+ -DVB_APPS_LICENSE_FILES = COPYING COPYING.LGPL - -ifeq ($(BR2_ENABLE_LOCALE),) -DVB_APPS_DEPENDENCIES = libiconv -DVB_APPS_LDLIBS += -liconv -endif - -ifeq ($(BR2_STATIC_LIBS),y) -DVB_APPS_MAKE_OPTS += enable_shared=no -else ifeq ($(BR2_SHARED_LIBS),y) -DVB_APPS_MAKE_OPTS += enable_static=no -endif - -DVB_APPS_INSTALL_STAGING = YES - -define DVB_APPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDLIBS="$(DVB_APPS_LDLIBS)" \ - $(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) \ - $(DVB_APPS_MAKE_OPTS) -endef - -define DVB_APPS_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(DVB_APPS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endef - -define DVB_APPS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(DVB_APPS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dvblast/0001-missing-lm.patch b/package.bak/dvblast/0001-missing-lm.patch deleted file mode 100644 index 2efbec4648..0000000000 --- a/package.bak/dvblast/0001-missing-lm.patch +++ /dev/null @@ -1,29 +0,0 @@ -dvblast: fix static linking - -dvblast links to -lev, wihch uses functions from the maths library, -like floor(). - -When linking to a shared libev.so, that dependency is automatically -pulled in because libev as a DT_NEEDED ELF tag on libm.so. - -But when lnking to the static libev.a, since there is no way to express -such dependencies in static libraries, libm is not pulled in, which -leads to build failures such as; - http://autobuild.buildroot.org/results/1f0/1f02f84fb926839a1adbe3af457bb909fdc44433/build-end.log - -Fix that by always linking to -lm (which must come *after* -lev). - -Signed-off-by: "Yann E. MORIN" - -diff -durN dvblast-3.0.orig/Makefile dvblast-3.0/Makefile ---- dvblast-3.0.orig/Makefile 2015-10-05 17:51:14.000000000 +0200 -+++ dvblast-3.0/Makefile 2015-10-30 15:57:19.547123894 +0100 -@@ -28,7 +28,7 @@ - LDLIBS += -lstreammaster - endif - --LDLIBS_DVBLAST += -lpthread -lev -+LDLIBS_DVBLAST += -lpthread -lev -lm - - OBJ_DVBLAST = dvblast.o util.o dvb.o udp.o asi.o demux.o output.o en50221.o comm.o mrtg-cnt.o asi-deltacast.o - OBJ_DVBLASTCTL = util.o dvblastctl.o diff --git a/package.bak/dvblast/0002-fix-int-types.patch b/package.bak/dvblast/0002-fix-int-types.patch deleted file mode 100644 index d741cc6cb6..0000000000 --- a/package.bak/dvblast/0002-fix-int-types.patch +++ /dev/null @@ -1,24 +0,0 @@ -Standard integer types are uintXX_t not u_intXX_t - -This fixes the build with the musl C library. - -Signed-off-by: "Yann E. MORIN" - -diff -durN dvblast-3.0.orig/dvblast.h dvblast-3.0/dvblast.h ---- dvblast-3.0.orig/dvblast.h 2015-10-05 17:51:14.000000000 +0200 -+++ dvblast-3.0/dvblast.h 2015-10-30 16:29:25.586125193 +0100 -@@ -49,10 +49,10 @@ - * Raw udp packet structure with flexible-array payload - *****************************************************************************/ - struct udpheader { // FAVOR_BSD hell ... -- u_int16_t source; -- u_int16_t dest; -- u_int16_t len; -- u_int16_t check; -+ uint16_t source; -+ uint16_t dest; -+ uint16_t len; -+ uint16_t check; - }; - - #if defined(__FreeBSD__) || defined(__APPLE__) diff --git a/package.bak/dvblast/Config.in b/package.bak/dvblast/Config.in deleted file mode 100644 index b7f0c065bf..0000000000 --- a/package.bak/dvblast/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_DVBLAST - bool "dvblast" - select BR2_PACKAGE_BITSTREAM - select BR2_PACKAGE_LIBEV - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on !BR2_bfin # libev - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # clock_nanosleep() - help - DVBlast is a simple and powerful MPEG-2/TS demux and - streaming application. - - http://www.videolan.org/projects/dvblast.html - -comment "dvblast needs a toolchain w/ NPTL" - depends on !BR2_bfin # libev - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/dvblast/dvblast.hash b/package.bak/dvblast/dvblast.hash deleted file mode 100644 index 198549f4c0..0000000000 --- a/package.bak/dvblast/dvblast.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://get.videolan.org/dvblast/3.0/dvblast-3.0.tar.bz2.md5 -md5 89ea9ffb16476d47b8853e52a8a3ee63 dvblast-3.0.tar.bz2 -# locally calculated -sha256 4fc3eb2a3d3545cb76a5c515a16671d1c34fe2f5dad57b71e89bd54c14c3045e dvblast-3.0.tar.bz2 diff --git a/package.bak/dvblast/dvblast.mk b/package.bak/dvblast/dvblast.mk deleted file mode 100644 index ef9a6669e3..0000000000 --- a/package.bak/dvblast/dvblast.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# dvblast -# -################################################################################ - -DVBLAST_VERSION = 3.0 -DVBLAST_SOURCE = dvblast-$(DVBLAST_VERSION).tar.bz2 -DVBLAST_SITE = https://get.videolan.org/dvblast/$(DVBLAST_VERSION) -DVBLAST_LICENSE = GPLv2+, WTFPL -DVBLAST_LICENSE_FILES = COPYING COPYING.WTFPL -DVBLAST_DEPENDENCIES = bitstream libev - -DVBLAST_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -DVBLAST_DEPENDENCIES += libiconv -DVBLAST_MAKE_ENV += LDLIBS=-liconv -endif - -define DVBLAST_BUILD_CMDS - $(DVBLAST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define DVBLAST_INSTALL_TARGET_CMDS - $(DVBLAST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/dvbsnoop/0001-musl-types-h.patch b/package.bak/dvbsnoop/0001-musl-types-h.patch deleted file mode 100644 index 1149df0d07..0000000000 --- a/package.bak/dvbsnoop/0001-musl-types-h.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr dvbsnoop-1.4.50.org/src/misc/helper.h dvbsnoop-1.4.50/src/misc/helper.h ---- dvbsnoop-1.4.50.org/src/misc/helper.h 2006-01-02 20:04:56.000000000 +0100 -+++ dvbsnoop-1.4.50/src/misc/helper.h 2016-01-24 14:35:02.000000000 +0100 -@@ -16,6 +16,7 @@ - #ifndef __HELPER_H - #define __HELPER_H - -+#include - - u_long outBit_Sx (int verbosity, const char *text, u_char *buf, int startbit, int bitlen); - u_long outBit_Sx_NL (int verbosity, const char *text, u_char *buf, int startbit, int bitlen); diff --git a/package.bak/dvbsnoop/Config.in b/package.bak/dvbsnoop/Config.in deleted file mode 100644 index fc34c349f1..0000000000 --- a/package.bak/dvbsnoop/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_DVBSNOOP - bool "dvbsnoop" - help - Dvbsnoop is just a simple tool to analyze, view or debug a transport - stream (TS), program elementary stream (PES) or even a program stream - (PS). Dvbsnoop is trying to get input mostly direct from a frontend - (satellite or cable tuner inside a set-top box for example) via DVB - APIv3 to view into a TS, or a demux to view PES or PS (also mostly - inside the set-top box or even PCI Card or USB Plug) but also from a - file (recorded TS). - Dvbsnoop is working well on SD transport streams but may have some - limited functionality on HD transport streams (DVB-{C,S,T}2 because - of missing knowledge how to handle it. - - Dvbsnoop itself doesn't do the tuning on the frontend, this has to be - done by external helpers or manually driver call. - The dvbsnoop tool was written while developing the software Neutrino - on the set-top box DBox2. - - http://dvbsnoop.sourceforge.net - http://en.wikipedia.org/wiki/DBox2 diff --git a/package.bak/dvbsnoop/dvbsnoop.hash b/package.bak/dvbsnoop/dvbsnoop.hash deleted file mode 100644 index 05939f9e31..0000000000 --- a/package.bak/dvbsnoop/dvbsnoop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 7658498b26a5d2a0242e81f0cfafa0e43a2bec56f8674e7ac197dfc310866ec6 dvbsnoop-1.4.50.tar.gz diff --git a/package.bak/dvbsnoop/dvbsnoop.mk b/package.bak/dvbsnoop/dvbsnoop.mk deleted file mode 100644 index 3bd8f8191d..0000000000 --- a/package.bak/dvbsnoop/dvbsnoop.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# dvbsnoop -# -################################################################################ - -DVBSNOOP_VERSION = 1.4.50 -DVBSNOOP_SITE = http://downloads.sourceforge.net/project/dvbsnoop/dvbsnoop/dvbsnoop-$(DVBSNOOP_VERSION) -DVBSNOOP_LICENSE = GPLv2 -DVBSNOOP_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/dvdauthor/0001-configure.ac-fix-static-build.patch b/package.bak/dvdauthor/0001-configure.ac-fix-static-build.patch deleted file mode 100644 index 0e016b8cb4..0000000000 --- a/package.bak/dvdauthor/0001-configure.ac-fix-static-build.patch +++ /dev/null @@ -1,55 +0,0 @@ -From da77704c575f0583fa871ff02bd52906a7979576 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 15 Feb 2015 11:05:43 +0100 -Subject: [PATCH] configure.ac: fix static build - -Add LT_INIT macro to handle --enable-shared option. - -If enable-shared=no then add --static flag to resolve FREETYPE_LIBS. - -Otherwise, dvdauthor forget to link witk -lbz2 when linking with freetype2. - -Fixes: -http://autobuild.buildroot.net/results/1d8/1d83390a3dd9f6bb595e9fc7b321500b4dc533a8/ - -Signed-off-by: Romain Naour ---- - configure.ac | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c43df92..d78d56a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,6 +4,7 @@ AM_CONFIG_HEADER(src/config.h) - AC_CONFIG_AUX_DIR(autotools) - - AM_INIT_AUTOMAKE -+LT_INIT - - AC_PROG_INSTALL - -@@ -39,6 +40,11 @@ PKG_CHECK_MODULES(LIBPNG, [libpng]) - AC_SUBST(LIBPNG_CFLAGS) - AC_SUBST(LIBPNG_LIBS) - -+config_static='' -+if test "$enable_shared" = 'no'; then -+ config_static='--static' -+fi -+ - usemagick=0 - - AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) -@@ -95,7 +101,7 @@ AC_SUBST(FRIBIDI_LIBS) - AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config]) - if test -n "$FREETYPECONFIG"; then - FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`" -- FREETYPE_LIBS="`$FREETYPECONFIG --libs`" -+ FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`" - AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available]) - - ac_save_CPPFLAGS="$CPPFLAGS" --- -1.9.3 - diff --git a/package.bak/dvdauthor/Config.in b/package.bak/dvdauthor/Config.in deleted file mode 100644 index 8b2bcb3d6f..0000000000 --- a/package.bak/dvdauthor/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_DVDAUTHOR - bool "dvdauthor" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_LIBPNG - help - DVDAuthor is a set of tools to help you author the file and directory - structure of a DVD-Video disc, including programmatic commands for - implementing interactive behaviour. It is driven by command lines and - XML control files, though there are other programs that provide - GUI-based front ends if you prefer - - http://dvdauthor.sourceforge.net - -if BR2_PACKAGE_DVDAUTHOR - -config BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR - bool "dvdunauthor" - select BR2_PACKAGE_LIBDVDREAD - help - This option enables the dvdunauthor program, which requires - libdvdread. - -endif diff --git a/package.bak/dvdauthor/dvdauthor.hash b/package.bak/dvdauthor/dvdauthor.hash deleted file mode 100644 index fe92b29c55..0000000000 --- a/package.bak/dvdauthor/dvdauthor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 501fb11b09c6eb9c5a229dcb400bd81e408cc78d34eab6749970685023c51fe9 dvdauthor-0.7.1.tar.gz diff --git a/package.bak/dvdauthor/dvdauthor.mk b/package.bak/dvdauthor/dvdauthor.mk deleted file mode 100644 index e982a40e40..0000000000 --- a/package.bak/dvdauthor/dvdauthor.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# dvdauthor -# -################################################################################ - -DVDAUTHOR_VERSION = 0.7.1 -DVDAUTHOR_SITE = http://sourceforge.net/projects/dvdauthor/files/dvdauthor/$(DVDAUTHOR_VERSION) -DVDAUTHOR_DEPENDENCIES = host-pkgconf libxml2 freetype libpng -DVDAUTHOR_LICENSE = GPLv2+ -DVDAUTHOR_LICENSE_FILES = COPYING -DVDAUTHOR_CONF_ENV = \ - ac_cv_prog_FREETYPECONFIG=$(STAGING_DIR)/usr/bin/freetype-config \ - ac_cv_path_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config \ - ac_cv_prog_GMAGICKCONFIG= - -# configure.ac patched by 0001-configure.ac-fix-static-build.patch -DVDAUTHOR_AUTORECONF = YES -# add host-gettext for AM_ICONV macro -DVDAUTHOR_DEPENDENCIES += host-gettext - -ifeq ($(BR2_PACKAGE_IMAGEMAGICK),y) -DVDAUTHOR_DEPENDENCIES += imagemagick -DVDAUTHOR_CONF_ENV += \ - ac_cv_prog_MAGICKCONFIG=$(STAGING_DIR)/usr/bin/Magick-config -else -DVDAUTHOR_CONF_ENV += \ - ac_cv_prog_MAGICKCONFIG= -endif - -# Automatically detected by dvdauthor configure script, no way to -# disable. -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -DVDAUTHOR_DEPENDENCIES += fontconfig -endif - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -DVDAUTHOR_DEPENDENCIES += libfribidi -endif - -ifeq ($(BR2_PACKAGE_DVDAUTHOR_DVDUNAUTHOR),y) -DVDAUTHOR_DEPENDENCIES += libdvdread -# dvdauthor configure does not use pkg-config to detect libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -DVDAUTHOR_CONF_ENV += LIBS="-ldvdcss" -endif -DVDAUTHOR_CONF_OPTS += --enable-dvdunauthor -else -DVDAUTHOR_CONF_OPTS += --disable-dvdunauthor -endif - -$(eval $(autotools-package)) diff --git a/package.bak/dvdrw-tools/0001-limits.h.patch b/package.bak/dvdrw-tools/0001-limits.h.patch deleted file mode 100644 index ccda8eeb72..0000000000 --- a/package.bak/dvdrw-tools/0001-limits.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -transport.hxx: add limits.h include now needed because of kernel changes - -Signed-off-by: Steve Kenton - -diff -pruN dvd+rw-tools-7.1.ori/transport.hxx dvd+rw-tools-7.1/transport.hxx ---- dvd+rw-tools-7.1.ori/transport.hxx 2008-03-01 04:34:43.000000000 -0600 -+++ dvd+rw-tools-7.1/transport.hxx 2015-01-18 15:47:24.245863631 -0600 -@@ -9,6 +9,7 @@ - #if defined(__unix) || defined(__unix__) - #include - #include -+#include - #include - #include - #include -@@ -40,6 +41,7 @@ inline long getmsecs() - #include - #include - #include -+#include - #define ssize_t LONG_PTR - #define off64_t __int64 - diff --git a/package.bak/dvdrw-tools/Config.in b/package.bak/dvdrw-tools/Config.in deleted file mode 100644 index d4d6bd2cd3..0000000000 --- a/package.bak/dvdrw-tools/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -comment "dvdrw-tools needs a toolchain w/ threads, C++, wchar" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR - -config BR2_PACKAGE_DVDRW_TOOLS - bool "dvdrw-tools" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - help - The dvd+rw-tools are used to master Blu-ray Disc - and DVD Disc media, both +RW/+R and -RW/-R. Note: - The +RW in the name is a historical artifact. This - package contains the widely used growisofs program. - - Buildroot does not support packages with a '+' sign - in their name, which explains why it is named - dvdrw-tools and not dvd+rw-tools. - - Because dvd+rw-tools does not directly interact with - disc media it uses a separate media backend program. - The usual backend is mkisofs from the cdrtools package. - However, cdrtools is not currently part of buildroot. - - The Linux From Scratch project uses uses xorriso for the - media backend and Ubuntu uses cdrkit for the backend. - Choose the one which seems most appropriate for your use. - NOTE: xorriso does not currently support UDF. - - http://fy.chalmers.se/~appro/linux/DVD+RW/tools - -if BR2_PACKAGE_DVDRW_TOOLS -choice - prompt "Media Backend" - help - Choose which media backend program to use. - -config BR2_PACKAGE_DVDRW_TOOLS_CDRKIT_BACKEND - bool "cdrkit" - select BR2_PACKAGE_CDRKIT - help - Symlink mkisofs to genisoimage from the cdrkit package. - -config BR2_PACKAGE_DVDRW_TOOLS_XORRISO_BACKEND - bool "xorriso" - select BR2_PACKAGE_XORRISO - help - Symlink mkisofs to xorrisofs from the xorriso package. - -endchoice -endif diff --git a/package.bak/dvdrw-tools/dvdrw-tools.hash b/package.bak/dvdrw-tools/dvdrw-tools.hash deleted file mode 100644 index 17d48f1d1f..0000000000 --- a/package.bak/dvdrw-tools/dvdrw-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed using sha256sum -sha256 f8d60f822e914128bcbc5f64fbe3ed131cbff9045dca7e12c5b77b26edde72ca dvd+rw-tools-7.1.tar.gz diff --git a/package.bak/dvdrw-tools/dvdrw-tools.mk b/package.bak/dvdrw-tools/dvdrw-tools.mk deleted file mode 100644 index 24daac1bd0..0000000000 --- a/package.bak/dvdrw-tools/dvdrw-tools.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# dvdrw-tools -# -################################################################################ - -DVDRW_TOOLS_VERSION = 7.1 -DVDRW_TOOLS_SOURCE = dvd+rw-tools-$(DVDRW_TOOLS_VERSION).tar.gz -DVDRW_TOOLS_SITE = http://fy.chalmers.se/~appro/linux/DVD+RW/tools -DVDRW_TOOLS_LICENSE = GPLv2 -DVDRW_TOOLS_LICENSE_FILES = LICENSE -DVDRW_TOOLS_DEPENDENCIES = host-m4 - -define DVDRW_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -ifeq ($(BR2_PACKAGE_DVDRW_TOOLS_CDRKIT_BACKEND),y) -DVDRW_TOOLS_BACKEND = genisoimage -DVDRW_TOOLS_DEPENDENCIES += cdrkit -else ifeq ($(BR2_PACKAGE_DVDRW_TOOLS_XORRISO_BACKEND),y) -DVDRW_TOOLS_BACKEND = xorrisofs -DVDRW_TOOLS_DEPENDENCIES += xorriso -endif - -define DVDRW_TOOLS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/dvd-ram-control $(TARGET_DIR)/usr/bin/dvd-ram-control - $(INSTALL) -m 0755 -D $(@D)/dvd+rw-booktype $(TARGET_DIR)/usr/bin/dvd+rw-booktype - $(INSTALL) -m 0755 -D $(@D)/dvd+rw-format $(TARGET_DIR)/usr/bin/dvd+rw-format - $(INSTALL) -m 0755 -D $(@D)/dvd+rw-mediainfo $(TARGET_DIR)/usr/bin/dvd+rw-mediainfo - $(INSTALL) -m 0755 -D $(@D)/growisofs $(TARGET_DIR)/usr/bin/growisofs - ln -s -f $(DVDRW_TOOLS_BACKEND) $(TARGET_DIR)/usr/bin/mkisofs -endef - -$(eval $(generic-package)) diff --git a/package.bak/e2fsprogs/0001-sem-init-libs.patch b/package.bak/e2fsprogs/0001-sem-init-libs.patch deleted file mode 100644 index 56f1cc2c15..0000000000 --- a/package.bak/e2fsprogs/0001-sem-init-libs.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- e2fsprogs-1.41.9/MCONFIG.in.orig 2009-10-07 20:25:07.000000000 +0800 -+++ e2fsprogs-1.41.9/MCONFIG.in 2009-10-07 20:21:41.000000000 +0800 -@@ -85,7 +85,7 @@ - # - LIB = $(top_builddir)/lib - LIBSS = $(LIB)/libss@LIB_EXT@ @PRIVATE_LIBS_CMT@ @DLOPEN_LIB@ --LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @PRIVATE_LIBS_CMT@ @SEM_INIT_LIB@ -+LIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ @SEM_INIT_LIB@ - LIBE2P = $(LIB)/libe2p@LIB_EXT@ - LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@ - LIBUUID = @LIBUUID@ @SOCKET_LIB@ diff --git a/package.bak/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch b/package.bak/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch deleted file mode 100644 index bd86c4e21a..0000000000 --- a/package.bak/e2fsprogs/0002-MCONFIG.in-handle-CLOCK_GETTIME_LIB.patch +++ /dev/null @@ -1,35 +0,0 @@ -From b5baf15b36107925186d89af9097b4b8e2d7cad6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 21 Sep 2016 08:38:21 +0200 -Subject: [PATCH] MCONFIG.in: handle CLOCK_GETTIME_LIB - -Commit 62bc243f1bfe623312a350e4cd0d2e17a69aac45 ("fuse2fs: might need -librt") added a check for the clock_gettime() to verify whether linking -with the librt library is needed or not to use this function. - -However, this commit forgot the change in MCONFIG.in that allows to -define the make variable CLOCK_GETTIME_LIB from the CLOCK_GETTIME_LIB -variable substituted by the configure script. Due to this, from a make -perspective $(CLOCK_GETTIME_LIB) is always empty, and we get link -failure on platforms where clock_gettime() is available in librt. - -Signed-off-by: Thomas Petazzoni ---- - MCONFIG.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/MCONFIG.in b/MCONFIG.in -index e82963d..9ba9ce2 100644 ---- a/MCONFIG.in -+++ b/MCONFIG.in -@@ -125,6 +125,7 @@ LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@ - LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID) - LIBINTL = @LIBINTL@ - SYSLIBS = @LIBS@ -+CLOCK_GETTIME_LIB = @CLOCK_GETTIME_LIB@ - DEPLIBSS = $(LIB)/libss@LIB_EXT@ - DEPLIBCOM_ERR = $(LIB)/libcom_err@LIB_EXT@ - DEPLIBUUID = @DEPLIBUUID@ --- -2.7.4 - diff --git a/package.bak/e2fsprogs/Config.in b/package.bak/e2fsprogs/Config.in deleted file mode 100644 index d1914a9953..0000000000 --- a/package.bak/e2fsprogs/Config.in +++ /dev/null @@ -1,101 +0,0 @@ -config BR2_PACKAGE_E2FSPROGS - bool "e2fsprogs" - depends on BR2_USE_MMU # util-linux/libblkid - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - The EXT2 file system utilities. - - http://e2fsprogs.sf.net - -if BR2_PACKAGE_E2FSPROGS - -config BR2_PACKAGE_E2FSPROGS_BADBLOCKS - bool "badblocks" - default y - -config BR2_PACKAGE_E2FSPROGS_CHATTR - bool "chattr" - default y - -config BR2_PACKAGE_E2FSPROGS_DEBUGFS - bool "debugfs" - -config BR2_PACKAGE_E2FSPROGS_DUMPE2FS - bool "dumpe2fs" - default y - -config BR2_PACKAGE_E2FSPROGS_E2FREEFRAG - bool "e2freefrag" - default y - -config BR2_PACKAGE_E2FSPROGS_E2FSCK - bool "e2fsck" - default y - -config BR2_PACKAGE_E2FSPROGS_E2IMAGE - bool "e2image" - -config BR2_PACKAGE_E2FSPROGS_E2LABEL - bool "e2label" - default y - -config BR2_PACKAGE_E2FSPROGS_E2UNDO - bool "e2undo" - default y - -config BR2_PACKAGE_E2FSPROGS_E4DEFRAG - bool "e4defrag" - depends on !BR2_nios2 # fallocate not implemented - depends on !BR2_TOOLCHAIN_USES_UCLIBC # sync_file_range not impl - -comment "e4defrag needs a glibc or musl toolchain" - depends on BR2_TOOLCHAIN_USES_UCLIBC - -config BR2_PACKAGE_E2FSPROGS_FILEFRAG - bool "filefrag" - default y - -config BR2_PACKAGE_E2FSPROGS_FSCK - bool "fsck" - default y - -config BR2_PACKAGE_E2FSPROGS_FUSE2FS - bool "fuse2fs" - depends on !BR2_STATIC_LIBS # libfuse - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse - select BR2_PACKAGE_LIBFUSE - -comment "fuse2fs needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_E2FSPROGS_LOGSAVE - bool "logsave" - default y - -config BR2_PACKAGE_E2FSPROGS_LSATTR - bool "lsattr" - default y - -config BR2_PACKAGE_E2FSPROGS_MKE2FS - bool "mke2fs" - default y - -config BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND - bool "mklost+found" - default y - -config BR2_PACKAGE_E2FSPROGS_RESIZE2FS - bool "resize2fs" - -config BR2_PACKAGE_E2FSPROGS_TUNE2FS - bool "tune2fs" - default y - select BR2_PACKAGE_E2FSPROGS_E2LABEL - -config BR2_PACKAGE_E2FSPROGS_UUIDGEN - bool "uuidgen" - default y - -endif diff --git a/package.bak/e2fsprogs/Config.in.host b/package.bak/e2fsprogs/Config.in.host deleted file mode 100644 index de9148e31d..0000000000 --- a/package.bak/e2fsprogs/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_E2FSPROGS - bool "host e2fsprogs" - help - The EXT2/3/4 file system utilities. - - http://e2fsprogs.sourceforge.net diff --git a/package.bak/e2fsprogs/e2fsprogs.hash b/package.bak/e2fsprogs/e2fsprogs.hash deleted file mode 100644 index 5fd9f3d6b4..0000000000 --- a/package.bak/e2fsprogs/e2fsprogs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v1.43.3/sha256sums.asc -sha256 744ca4e9a8e6c943601b2744d1ae658e5f37d35b5ea5b1dea86985320bd87f37 e2fsprogs-1.43.3.tar.xz diff --git a/package.bak/e2fsprogs/e2fsprogs.mk b/package.bak/e2fsprogs/e2fsprogs.mk deleted file mode 100644 index 3829053d71..0000000000 --- a/package.bak/e2fsprogs/e2fsprogs.mk +++ /dev/null @@ -1,165 +0,0 @@ -################################################################################ -# -# e2fsprogs -# -################################################################################ - -E2FSPROGS_VERSION = 1.43.3 -E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz -E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) -E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet) -E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h -E2FSPROGS_INSTALL_STAGING = YES -E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux -# we don't have a host-util-linux -HOST_E2FSPROGS_DEPENDENCIES = host-pkgconf - -# e4defrag doesn't build on older systems like RHEL5.x, and we don't -# need it on the host anyway. -# Disable fuse2fs as well to avoid carrying over deps, and it's unused -HOST_E2FSPROGS_CONF_OPTS += --disable-defrag --disable-fuse2fs - -E2FSPROGS_CONF_OPTS = \ - $(if $(BR2_STATIC_LIBS),,--enable-elf-shlibs) \ - $(if $(BR2_PACKAGE_E2FSPROGS_DEBUGFS),,--disable-debugfs) \ - $(if $(BR2_PACKAGE_E2FSPROGS_E2IMAGE),,--disable-imager) \ - $(if $(BR2_PACKAGE_E2FSPROGS_E4DEFRAG),,--disable-defrag) \ - $(if $(BR2_PACKAGE_E2FSPROGS_RESIZE2FS),,--disable-resizer) \ - --disable-uuidd \ - --disable-libblkid \ - --disable-libuuid \ - --enable-fsck \ - --disable-e2initrd-helper \ - --disable-testio-debug \ - --disable-rpath - -ifeq ($(BR2_PACKAGE_E2FSPROGS_FUSE2FS),y) -E2FSPROGS_CONF_OPTS += --enable-fuse2fs -E2FSPROGS_DEPENDENCIES += libfuse -else -E2FSPROGS_CONF_OPTS += --disable-fuse2fs -endif - -ifeq ($(BR2_nios2),y) -E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no -endif - -# Some programs are built for the host, but use definitions guessed by -# the configure script (i.e with the cross-compiler). Help them by -# saying that is available on the host, which is needed -# for util/subst.c to build properly. -E2FSPROGS_CONF_ENV += BUILD_CFLAGS="-DHAVE_SYS_STAT_H" - -# Disable use of the host magic.h, as on older hosts (e.g. RHEL 5) -# it doesn't provide definitions expected by e2fsprogs support lib. -HOST_E2FSPROGS_CONF_ENV += \ - ac_cv_header_magic_h=no \ - ac_cv_lib_magic_magic_file=no - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -# util-linux libuuid pulls in libintl if needed, so ensure we also -# link against it, otherwise static linking fails -E2FSPROGS_CONF_ENV += LIBS=-lintl -endif - -E2FSPROGS_MAKE_OPTS = LDCONFIG=true -E2FSPROGS_INSTALL_STAGING_OPTS = \ - DESTDIR=$(STAGING_DIR) \ - LDCONFIG=true \ - install-libs -E2FSPROGS_INSTALL_TARGET_OPTS = \ - DESTDIR=$(TARGET_DIR) \ - LDCONFIG=true \ - install - -define HOST_E2FSPROGS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install install-libs -endef - -# binaries to keep or remove -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_BADBLOCKS) += usr/sbin/badblocks -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_CHATTR) += usr/bin/chattr -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_DUMPE2FS) += usr/sbin/dumpe2fs -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FREEFRAG) += usr/sbin/e2freefrag -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2FSCK) += usr/sbin/e2fsck -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2LABEL) += usr/sbin/e2label -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E2UNDO) += usr/sbin/e2undo -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_E4DEFRAG) += usr/sbin/e4defrag -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FILEFRAG) += usr/sbin/filefrag -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_FSCK) += usr/sbin/fsck -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LOGSAVE) += usr/sbin/logsave -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_LSATTR) += usr/bin/lsattr -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKE2FS) += usr/sbin/mke2fs -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_MKLOSTFOUND) += usr/sbin/mklost+found -E2FSPROGS_BINTARGETS_$(BR2_PACKAGE_E2FSPROGS_UUIDGEN) += usr/bin/uuidgen - -# files to remove -E2FSPROGS_TXTTARGETS_ = \ - usr/sbin/mkfs.ext[234] \ - usr/sbin/mkfs.ext4dev \ - usr/sbin/fsck.ext[234] \ - usr/sbin/fsck.ext4dev \ - usr/sbin/tune2fs - -define E2FSPROGS_TARGET_REMOVE_UNNEEDED - rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_BINTARGETS_)) - rm -f $(addprefix $(TARGET_DIR)/, $(E2FSPROGS_TXTTARGETS_)) -endef - -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_REMOVE_UNNEEDED - -define E2FSPROGS_TARGET_MKE2FS_SYMLINKS - ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext2 - ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext3 - ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4 - ln -sf mke2fs $(TARGET_DIR)/usr/sbin/mkfs.ext4dev -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_MKE2FS),y) -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_MKE2FS_SYMLINKS -endif - -define E2FSPROGS_TARGET_E2FSCK_SYMLINKS - ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext2 - ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext3 - ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4 - ln -sf e2fsck $(TARGET_DIR)/usr/sbin/fsck.ext4dev -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_E2FSCK),y) -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_E2FSCK_SYMLINKS -endif - -# If BusyBox is included, its configuration may supply its own variant -# of ext2-related tools. Since Buildroot desires having full blown -# variants take precedence (in this case, e2fsprogs), we want to remove -# BusyBox's variant of e2fsprogs provided binaries. e2fsprogs targets -# /usr/{bin,sbin} where BusyBox targets /{bin,sbin}. We will attempt to -# remove BusyBox-generated ext2-related tools from /{bin,sbin}. We need -# to do this in the pre-install stage to ensure we do not accidentally -# remove e2fsprogs's binaries in usr-merged environments (ie. if they -# are removed, they would be re-installed in this package's install -# stage). -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -E2FSPROGS_DEPENDENCIES += busybox - -define E2FSPROGS_REMOVE_BUSYBOX_APPLETS - $(RM) -f $(TARGET_DIR)/bin/chattr - $(RM) -f $(TARGET_DIR)/bin/lsattr - $(RM) -f $(TARGET_DIR)/sbin/fsck - $(RM) -f $(TARGET_DIR)/sbin/tune2fs - $(RM) -f $(TARGET_DIR)/sbin/e2label -endef -E2FSPROGS_PRE_INSTALL_TARGET_HOOKS += E2FSPROGS_REMOVE_BUSYBOX_APPLETS -endif - -define E2FSPROGS_TARGET_TUNE2FS_SYMLINK - ln -sf e2label $(TARGET_DIR)/usr/sbin/tune2fs -endef - -ifeq ($(BR2_PACKAGE_E2FSPROGS_TUNE2FS),y) -E2FSPROGS_POST_INSTALL_TARGET_HOOKS += E2FSPROGS_TARGET_TUNE2FS_SYMLINK -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/e2tools/Config.in b/package.bak/e2tools/Config.in deleted file mode 100644 index 75029f74aa..0000000000 --- a/package.bak/e2tools/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_E2TOOLS - bool "e2tools" - select BR2_PACKAGE_E2FSPROGS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # uses wchar_t - depends on BR2_USE_MMU # e2fsprogs - help - E2tools is a simple set of GPL'ed utilities to read, write, - and manipulate files in an ext2/ext3 filesystem. These - utilities access a filesystem directly using the ext2fs - library. - - https://github.com/ndim/e2tools - -comment "e2tools needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_USE_MMU diff --git a/package.bak/e2tools/Config.in.host b/package.bak/e2tools/Config.in.host deleted file mode 100644 index 859c47bdc5..0000000000 --- a/package.bak/e2tools/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_E2TOOLS - bool "host e2tools" - select BR2_PACKAGE_HOST_E2FSPROGS - help - E2tools is a simple set of GPL'ed utilities to read, write, - and manipulate files in an ext2/ext3 filesystem. These - utilities access a filesystem directly using the ext2fs - library. - - https://github.com/ndim/e2tools diff --git a/package.bak/e2tools/e2tools.hash b/package.bak/e2tools/e2tools.hash deleted file mode 100644 index 4cec81e942..0000000000 --- a/package.bak/e2tools/e2tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 37bbd705170dff80720d68916f8d90803d71987e1b60f7149a285a7fcd539214 e2tools-3158ef18a903ca4a98b8fa220c9fc5c133d8bdf6.tar.gz diff --git a/package.bak/e2tools/e2tools.mk b/package.bak/e2tools/e2tools.mk deleted file mode 100644 index 1f3bb5cfb6..0000000000 --- a/package.bak/e2tools/e2tools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# e2tools -# -################################################################################ - -E2TOOLS_VERSION = 3158ef18a903ca4a98b8fa220c9fc5c133d8bdf6 -E2TOOLS_SITE = $(call github,ndim,e2tools,$(E2TOOLS_VERSION)) - -# Source coming from GitHub, no configure included. -E2TOOLS_AUTORECONF = YES -E2TOOLS_LICENSE = GPLv2 -E2TOOLS_LICENSE_FILES = COPYING -E2TOOLS_DEPENDENCIES = e2fsprogs -E2TOOLS_CONF_ENV = LIBS="-lpthread" -HOST_E2TOOLS_DEPENDENCIES = host-e2fsprogs -HOST_E2TOOLS_CONF_ENV = LIBS="-lpthread" - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/easydbus/Config.in b/package.bak/easydbus/Config.in deleted file mode 100644 index 51519d61d2..0000000000 --- a/package.bak/easydbus/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_EASYDBUS - bool "easydbus" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - Easy to use DBus library for Lua. - - https://github.com/mniestroj/easydbus - -comment "easydbus needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/easydbus/easydbus.hash b/package.bak/easydbus/easydbus.hash deleted file mode 100644 index 0ef73f23f9..0000000000 --- a/package.bak/easydbus/easydbus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3e5907664f5dfebbc0e652faf87564fd58dbd639742f442c100ef2db8be46e52 easydbus-59c340f2cd2c92ded82f9d4436866847f295faab.tar.gz diff --git a/package.bak/easydbus/easydbus.mk b/package.bak/easydbus/easydbus.mk deleted file mode 100644 index 376b09bfca..0000000000 --- a/package.bak/easydbus/easydbus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# easydbus -# -################################################################################ - -EASYDBUS_VERSION = 59c340f2cd2c92ded82f9d4436866847f295faab -EASYDBUS_SITE = $(call github,mniestroj,easydbus,$(EASYDBUS_VERSION)) -EASYDBUS_DEPENDENCIES = luainterpreter libglib2 -EASYDBUS_LICENSE = MIT -EASYDBUS_LICENSE_FILES = LICENSE - -$(eval $(cmake-package)) diff --git a/package.bak/ebtables/Config.in b/package.bak/ebtables/Config.in deleted file mode 100644 index fa123b196e..0000000000 --- a/package.bak/ebtables/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_EBTABLES - bool "ebtables" - depends on !BR2_TOOLCHAIN_USES_MUSL # mixes userspace and kernel headers - depends on BR2_USE_MMU # fork() - help - Ethernet bridge frame table administration - - http://ebtables.netfilter.org/ - -comment "ebtables needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU diff --git a/package.bak/ebtables/ebtables.hash b/package.bak/ebtables/ebtables.hash deleted file mode 100644 index 45262765c2..0000000000 --- a/package.bak/ebtables/ebtables.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 dc6f7b484f207dc712bfca81645f45120cb6aee3380e77a1771e9c34a9a4455d ebtables-v2.0.10-4.tar.gz diff --git a/package.bak/ebtables/ebtables.mk b/package.bak/ebtables/ebtables.mk deleted file mode 100644 index 639593070a..0000000000 --- a/package.bak/ebtables/ebtables.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# ebtables -# -################################################################################ - -EBTABLES_VERSION = 2.0.10-4 -EBTABLES_SOURCE = ebtables-v$(EBTABLES_VERSION).tar.gz -EBTABLES_SITE = http://ftp.netfilter.org/pub/ebtables -EBTABLES_LICENSE = GPLv2+ -EBTABLES_LICENSE_FILES = COPYING -EBTABLES_STATIC = $(if $(BR2_STATIC_LIBS),static) -EBTABLES_K64U32 = $(if $(BR2_KERNEL_64_USERLAND_32),-DKERNEL_64_USERSPACE_32) - -define EBTABLES_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) LIBDIR=/lib/ebtables $(EBTABLES_STATIC) \ - CFLAGS="$(TARGET_CFLAGS) $(EBTABLES_K64U32)" -C $(@D) -endef - -ifeq ($(BR2_STATIC_LIBS),y) -define EBTABLES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/static \ - $(TARGET_DIR)/sbin/ebtables -endef -else -define EBTABLES_INSTALL_TARGET_CMDS - for so in $(@D)/$(EBTABLES_SUBDIR)/*.so \ - $(@D)/$(EBTABLES_SUBDIR)/extensions/*.so; \ - do \ - $(INSTALL) -m 0755 -D $${so} \ - $(TARGET_DIR)/lib/ebtables/`basename $${so}` || exit 1; \ - done - $(INSTALL) -m 0755 -D $(@D)/$(EBTABLES_SUBDIR)/ebtables \ - $(TARGET_DIR)/sbin/ebtables - $(INSTALL) -m 0644 -D $(@D)/ethertypes $(TARGET_DIR)/etc/ethertypes -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/ecryptfs-utils/0001-musl.patch b/package.bak/ecryptfs-utils/0001-musl.patch deleted file mode 100644 index 4a3b8a707e..0000000000 --- a/package.bak/ecryptfs-utils/0001-musl.patch +++ /dev/null @@ -1,35 +0,0 @@ -fix musl build - -Patch inspired by -https://github.com/kraj/meta-musl/blob/master/recipes-core/util-linux/util-linux-2.25/0001-switch_root-use-typeof-instead-of-__SWORD_TYPE-for-s.patch - -Signed-off-by: Bernd Kuhls - -diff -uNr ecryptfs-utils-109.org/src/utils/mount.ecryptfs_private.c ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c ---- ecryptfs-utils-109.org/src/utils/mount.ecryptfs_private.c 2016-01-22 17:04:52.000000000 +0100 -+++ ecryptfs-utils-109/src/utils/mount.ecryptfs_private.c 2016-01-24 16:52:37.000000000 +0100 -@@ -224,6 +224,7 @@ - - static int check_cwd_f_type() - { -+ struct statfs buf; - /** - * This is *not* a list of compatible lower filesystems list for - * eCryptfs. This is a list of filesystems that we reasonably expect to -@@ -235,7 +236,7 @@ - * deceive other programs with a crafted /proc/self/*. See - * https://launchpad.net/bugs/1530566 for more details. - */ -- __SWORD_TYPE f_type_whitelist[] = { -+ typeof(buf.f_type) f_type_whitelist[] = { - 0x61756673 /* AUFS_SUPER_MAGIC */, - 0x9123683E /* BTRFS_SUPER_MAGIC */, - 0x00C36400 /* CEPH_SUPER_MAGIC */, -@@ -259,7 +260,6 @@ - 0x58465342 /* XFS_SB_MAGIC */, - 0x2FC12FC1 /* ZFS_SUPER_MAGIC */, - }; -- struct statfs buf; - size_t i, whitelist_len; - - if (statfs(".", &buf) != 0) { diff --git a/package.bak/ecryptfs-utils/Config.in b/package.bak/ecryptfs-utils/Config.in deleted file mode 100644 index cb70e000ae..0000000000 --- a/package.bak/ecryptfs-utils/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_ECRYPTFS_UTILS - bool "ecryptfs-utils" - select BR2_PACKAGE_KEYUTILS - select BR2_PACKAGE_LIBNSS - # runtime dependency only, some scripts are using the - # 'gettext' program to get translations - select BR2_PACKAGE_GETTEXT - # runtime dependency only - select BR2_PACKAGE_GETENT - depends on BR2_USE_WCHAR # gettext - depends on BR2_USE_MMU # keyutils - depends on !BR2_microblaze # keyutils - depends on BR2_TOOLCHAIN_HAS_THREADS # libnss -> libnspr - depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnss -> libnspr - depends on !BR2_MIPS_NABI32 # libnss - depends on !BR2_STATIC_LIBS # libnss, keyutils - help - eCryptfs is a POSIX-compliant enterprise cryptographic - filesystem for Linux. It is stacked on top of any other - Linux filesystem, it stores cryptographic metadata in the header - of each file written. - - The eCryptfs kernel module is available in all Linux kernels - since version 2.6.19. This package provides userspace utilities - needed to mount eCryptfs. - - Files are encrypted using a passphrase. Consider building openssl - for another method. - - http://ecryptfs.org - -comment "ecryptfs-utils needs a toolchain w/ threads, wchar, dynamic library" - depends on !BR2_microblaze - depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS diff --git a/package.bak/ecryptfs-utils/ecryptfs-utils.hash b/package.bak/ecryptfs-utils/ecryptfs-utils.hash deleted file mode 100644 index 40cc17cdd6..0000000000 --- a/package.bak/ecryptfs-utils/ecryptfs-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://launchpad.net/ecryptfs/trunk/109/+download/ecryptfs-utils_109.orig.tar.gz/+md5 -md5 8e33f096c8cb8288f9c29a9936cd0d28 ecryptfs-utils_109.orig.tar.gz diff --git a/package.bak/ecryptfs-utils/ecryptfs-utils.mk b/package.bak/ecryptfs-utils/ecryptfs-utils.mk deleted file mode 100644 index 81a4b4bd7d..0000000000 --- a/package.bak/ecryptfs-utils/ecryptfs-utils.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# ecryptfs-utils -# -################################################################################ - -ECRYPTFS_UTILS_VERSION = 109 -ECRYPTFS_UTILS_SOURCE = ecryptfs-utils_$(ECRYPTFS_UTILS_VERSION).orig.tar.gz -ECRYPTFS_UTILS_SITE = https://launchpad.net/ecryptfs/trunk/$(ECRYPTFS_UTILS_VERSION)/+download -ECRYPTFS_UTILS_LICENSE = GPLv2+ -ECRYPTFS_UTILS_LICENSE_FILES = COPYING - -ECRYPTFS_UTILS_DEPENDENCIES = keyutils libnss host-intltool -ECRYPTFS_UTILS_CONF_OPTS = --disable-pywrap --disable-pam - -#Needed for build system to find pk11func.h and libnss3.so -ECRYPTFS_UTILS_CONF_ENV = \ - NSS_CFLAGS="-I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr" \ - NSS_LIBS="-lnss3" - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ECRYPTFS_UTILS_CONF_OPTS += --enable-openssl -ECRYPTFS_UTILS_DEPENDENCIES += openssl -else -ECRYPTFS_UTILS_CONF_OPTS += --disable-openssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ed/Config.in b/package.bak/ed/Config.in deleted file mode 100644 index 21ba79e158..0000000000 --- a/package.bak/ed/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ED - bool "ed" - help - A line-oriented text editor. Used to create, display, modify, - and otherwise manipulate text files. Often used in scripts - rather than invoked directly. - - http://www.gnu.org/software/ed/ diff --git a/package.bak/ed/ed.hash b/package.bak/ed/ed.hash deleted file mode 100644 index 22c1e671dc..0000000000 --- a/package.bak/ed/ed.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.gnu.org/archive/html/bug-ed/2017-01/msg00002.html -sha1 a91f785f7e16dc68e1c9c86d532ebd9698171ba0 ed-1.14.1.tar.lz -# Locally computed -sha256 ffb97eb8f2a2b5a71a9b97e3872adce953aa1b8958e04c5b7bf11d556f32552a ed-1.14.1.tar.lz diff --git a/package.bak/ed/ed.mk b/package.bak/ed/ed.mk deleted file mode 100644 index 6b9f65ec52..0000000000 --- a/package.bak/ed/ed.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# ed -# -################################################################################ - -ED_VERSION = 1.14.1 -ED_SITE = $(BR2_GNU_MIRROR)/ed -ED_SOURCE = ed-$(ED_VERSION).tar.lz -ED_CONF_OPTS = \ - CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -ED_LICENSE = GPLv3+ -ED_LICENSE_FILES = COPYING - -define ED_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) ./configure \ - --prefix=/usr \ - $(TARGET_CONFIGURE_OPTS) \ - ) -endef - -define ED_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define ED_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/edid-decode/Config.in b/package.bak/edid-decode/Config.in deleted file mode 100644 index 64297b494d..0000000000 --- a/package.bak/edid-decode/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_EDID_DECODE - bool "edid-decode" - help - Decode EDID data in human-readable format. - - http://cgit.freedesktop.org/xorg/app/edid-decode/ diff --git a/package.bak/edid-decode/edid-decode.mk b/package.bak/edid-decode/edid-decode.mk deleted file mode 100644 index 243ccfbea6..0000000000 --- a/package.bak/edid-decode/edid-decode.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# edid-decode -# -################################################################################ - -EDID_DECODE_VERSION = 681153145d5e05ee15032ea792e967cda06e7622 -EDID_DECODE_SITE = git://anongit.freedesktop.org/git/xorg/app/edid-decode.git -EDID_DECODE_LICENSE = MIT -EDID_DECODE_LICENSE_FILES = edid-decode.c - -define EDID_DECODE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -endef - -define EDID_DECODE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/eeprog/Config.in b/package.bak/eeprog/Config.in deleted file mode 100644 index ff313bdbae..0000000000 --- a/package.bak/eeprog/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_EEPROG - bool "eeprog" - help - Simple tool to read/write i2c eeprom chips. - - http://codesink.org/eeprog.html diff --git a/package.bak/eeprog/eeprog.hash b/package.bak/eeprog/eeprog.hash deleted file mode 100644 index c91be72332..0000000000 --- a/package.bak/eeprog/eeprog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 35155cc3844d2c3ae8ed6935fda72768c7f24fddc4a0fca89e4ffbb34880d9ef eeprog-0.7.6.tar.gz diff --git a/package.bak/eeprog/eeprog.mk b/package.bak/eeprog/eeprog.mk deleted file mode 100644 index 93aeb5e372..0000000000 --- a/package.bak/eeprog/eeprog.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# eeprog -# -################################################################################ - -EEPROG_VERSION = 0.7.6 -EEPROG_SITE = http://www.codesink.org/download -EEPROG_LICENSE = GPLv2+ -EEPROG_LICENSE_FILES = eeprog.c - -define EEPROG_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define EEPROG_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/eeprog $(TARGET_DIR)/usr/bin/eeprog -endef - -$(eval $(generic-package)) diff --git a/package.bak/efibootmgr/0001-Allow-build-with-uClibc.patch b/package.bak/efibootmgr/0001-Allow-build-with-uClibc.patch deleted file mode 100644 index fd29233dc3..0000000000 --- a/package.bak/efibootmgr/0001-Allow-build-with-uClibc.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bbfcc60497c326576bb23cb01d90115ef3cf6947 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Fri, 25 Nov 2016 20:26:52 +0200 -Subject: [PATCH] Remove unneeded include - -This fixes the build with uClibc. - -Signed-off-by: Andy Shevchenko ---- - src/efibootdump.c | 1 - - src/eficonman.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/src/efibootdump.c b/src/efibootdump.c -index 6ff8360..7c5a1c5 100644 ---- a/src/efibootdump.c -+++ b/src/efibootdump.c -@@ -19,7 +19,6 @@ - #include - #include - #include --#include - #include - - #include "error.h" -diff --git a/src/eficonman.c b/src/eficonman.c -index 2c2be38..9bfae79 100644 ---- a/src/eficonman.c -+++ b/src/eficonman.c -@@ -17,7 +17,6 @@ - #include - #include - #include --#include - #include - - #define _(String) gettext (String) --- -2.10.2 - diff --git a/package.bak/efibootmgr/Config.in b/package.bak/efibootmgr/Config.in deleted file mode 100644 index 57874fc426..0000000000 --- a/package.bak/efibootmgr/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_EFIBOOTMGR - bool "efibootmgr" - depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS # efivar - depends on !BR2_STATIC_LIBS # efivar - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # efivar - depends on !BR2_TOOLCHAIN_USES_MUSL # efivar - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # efivar - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS - depends on BR2_USE_WCHAR # gettext - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_EFIVAR - help - A Linux user-space application to modify the Intel Extensible - Firmware Interface (EFI) Boot Manager. This application can create - and destroy boot entries, change the boot order, change the next - running boot option, and more. - - https://github.com/rhinstaller/efibootmgr - -comment "efibootmgr needs a glibc or uClibc toolchain w/ wchar, dynamic library, headers >= 3.12, gcc >= 4.9" - depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || \ - !BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package.bak/efibootmgr/efibootmgr.hash b/package.bak/efibootmgr/efibootmgr.hash deleted file mode 100644 index f71dced53f..0000000000 --- a/package.bak/efibootmgr/efibootmgr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 3f260491e2c62e93cb6347ea6f21aaa5f93152e9e7f0269d314623769d82e473 efibootmgr-14.tar.gz diff --git a/package.bak/efibootmgr/efibootmgr.mk b/package.bak/efibootmgr/efibootmgr.mk deleted file mode 100644 index 487c8ca666..0000000000 --- a/package.bak/efibootmgr/efibootmgr.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# efibootmgr -# -################################################################################ - -EFIBOOTMGR_VERSION = 14 -EFIBOOTMGR_SITE = $(call github,rhinstaller,efibootmgr,$(EFIBOOTMGR_VERSION)) -EFIBOOTMGR_LICENSE = GPLv2+ -EFIBOOTMGR_LICENSE_FILES = COPYING -EFIBOOTMGR_DEPENDENCIES = efivar $(if $(BR2_NEEDS_GETTEXT),gettext) -EFIBOOTMGR_LDFLAGS = $(TARGET_LDFLAGS) $(if $(BR2_NEEDS_GETTEXT),-lintl) - -define EFIBOOTMSR_PATCH_HEADER_PATH - $(SED) 's,-I/,-I$(STAGING_DIR)/,' $(@D)/Makefile -endef - -EFIBOOTMGR_POST_PATCH_HOOKS += EFIBOOTMSR_PATCH_HEADER_PATH - -define EFIBOOTMGR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(EFIBOOTMGR_LDFLAGS)" $(MAKE1) -C $(@D) -endef - -define EFIBOOTMGR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch b/package.bak/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch deleted file mode 100644 index 2bc3ff243f..0000000000 --- a/package.bak/efivar/0001-Use-z-muldefs-to-avoid-the-multiple-definitions-bug-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 314eb67b239e60c2ed3700e2baf9cd0e590465f3 Mon Sep 17 00:00:00 2001 -From: Peter Jones -Date: Thu, 27 Oct 2016 09:19:18 -0400 -Subject: [PATCH] Use -z muldefs to avoid the multiple definitions bug - without -flto - -This fixes github issue #64 - -Signed-off-by: Peter Jones -Signed-off-by: Andy Shevchenko ---- - Make.defaults | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Make.defaults b/Make.defaults -index aa974d9..c9d599f 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -32,6 +32,7 @@ cflags = $(CFLAGS) -I${TOPDIR}/src/include/efivar/ \ - clang_ccldflags = - gcc_ccldflags = - ccldflags = $(cflags) -L. $(CCLDFLAGS) $(LDFLAGS) \ -+ -Wl,-z,muldefs \ - $(if $(findstring clang,$(CCLD)),$(clang_ccldflags),) \ - $(if $(findstring gcc,$(CCLD)),$(gcc_ccldflags),) \ - $(call pkg-config-ccldflags) --- -2.10.2 - diff --git a/package.bak/efivar/0002-Allow-build-with-uClibc.patch b/package.bak/efivar/0002-Allow-build-with-uClibc.patch deleted file mode 100644 index 7c195872b0..0000000000 --- a/package.bak/efivar/0002-Allow-build-with-uClibc.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2255601757a8a58baddad2d37d0bcc6b003a3732 Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko -Date: Fri, 25 Nov 2016 19:42:27 +0200 -Subject: [PATCH] Allow build with uClibc - -Basically this replaces type definitions in . - -Signed-off-by: Andy Shevchenko ---- - src/export.c | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/src/export.c b/src/export.c -index 7f2d4dd..72c02d1 100644 ---- a/src/export.c -+++ b/src/export.c -@@ -21,11 +21,17 @@ - #include - #include - #include --#include - - #include - #include "lib.h" - -+#ifdef __UCLIBC__ -+typedef int_least16_t char16_t; -+typedef int_least32_t char32_t; -+#else -+#include -+#endif -+ - #define EFIVAR_MAGIC 0xf3df1597 - - #define ATTRS_UNSET 0xa5a5a5a5a5a5a5a5 --- -2.10.2 - diff --git a/package.bak/efivar/Config.in b/package.bak/efivar/Config.in deleted file mode 100644 index 0ec836007b..0000000000 --- a/package.bak/efivar/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - bool - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 \ - || BR2_powerpc64le || BR2_mipsel || BR2_mips64el - default y - -config BR2_PACKAGE_EFIVAR - bool "efivar" - depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 # linux/nvme.h - # linux/nvme.h has been renamed to linux/nvme_ioctl.h since 4.4, - # and the efivar source handles that situation. However, some - # Sourcery CodeBench toolchains use 4.4 kernel headers but they - # don't have that header file renamed, and that is causing build - # failures. So, prevent this package to be built using those - # toolchains. - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS - # doesn't build with musl due to lack of __bswap_constant_16 - depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - select BR2_PACKAGE_POPT - help - Tools and libraries to manipulate EFI variables - - https://github.com/rhinstaller/efivar - -comment "efivar needs a glibc or uClibc toolchain w/ dynamic library, headers >= 3.12, gcc >= 4.9" - depends on BR2_PACKAGE_EFIVAR_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS diff --git a/package.bak/efivar/efivar.hash b/package.bak/efivar/efivar.hash deleted file mode 100644 index e337b96450..0000000000 --- a/package.bak/efivar/efivar.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 20709c76311f8eb8be92977b7ac008ce62501fa9f7fe885a784321540fc352f9 efivar-30.tar.gz diff --git a/package.bak/efivar/efivar.mk b/package.bak/efivar/efivar.mk deleted file mode 100644 index c31d87b840..0000000000 --- a/package.bak/efivar/efivar.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# efivar -# -################################################################################ - -EFIVAR_VERSION = 30 -EFIVAR_SITE = $(call github,rhinstaller,efivar,$(EFIVAR_VERSION)) -EFIVAR_LICENSE = LGPLv2.1 -EFIVAR_LICENSE_FILES = COPYING -EFIVAR_DEPENDENCIES = popt -EFIVAR_INSTALL_STAGING = YES - -# BINTARGETS is set to skip efivar-static which requires static popt, -# and since we depend on dynamic libraries, efivar will never be built -# in a static-only environment. -# -fPIC is needed at least on MIPS, otherwise fails to build shared -# -library. -EFIVAR_MAKE_OPTS = \ - libdir=/usr/lib \ - BINTARGETS=efivar \ - LDFLAGS="$(TARGET_LDFLAGS) -fPIC" - -define EFIVAR_BUILD_CMDS - # makeguids is an internal host tool and must be built separately with - # $(HOST_CC), otherwise it gets cross-built. - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -std=gnu99" \ - $(MAKE) -C $(@D)/src gcc_cflags= makeguids - - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) \ - AR=$(TARGET_AR) NM=$(TARGET_NM) RANLIB=$(TARGET_RANLIB) \ - $(EFIVAR_MAKE_OPTS) \ - all -endef - -define EFIVAR_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) \ - $(EFIVAR_MAKE_OPTS) \ - DESTDIR="$(STAGING_DIR)" \ - install -endef - -define EFIVAR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D) \ - $(EFIVAR_MAKE_OPTS) \ - DESTDIR="$(TARGET_DIR)" \ - install -endef - -$(eval $(generic-package)) diff --git a/package.bak/efl/Config.in b/package.bak/efl/Config.in deleted file mode 100644 index 5e89af602c..0000000000 --- a/package.bak/efl/Config.in +++ /dev/null @@ -1,311 +0,0 @@ -config BR2_PACKAGE_EFL - bool "efl" - # g++ issue with 4.4.5, tested with g++ 4.7.2 - depends on BR2_HOST_GCC_AT_LEAST_4_7 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS # luajit - depends on BR2_TOOLCHAIN_HAS_THREADS # untested without threads - depends on BR2_USE_MMU - depends on BR2_USE_WCHAR # use wchar_t - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_JPEG # Emile needs libjpeg - select BR2_PACKAGE_LIBCURL # Ecore_con_url, runtime dependency - # https://phab.enlightenment.org/T2728 - select BR2_PACKAGE_LUAJIT # Lua support broken - select BR2_PACKAGE_LZ4 - select BR2_PACKAGE_ZLIB - help - Enlightenment Foundation Libraries - - https://enlightenment.org - -if BR2_PACKAGE_EFL - -config BR2_PACKAGE_EFL_BULLET - bool "Enable bullet support (recommended)" - select BR2_PACKAGE_BULLET - default y - help - If you have chosen to disable physics support, this disables - lots of core functionality and is effectively never - tested. You are going to find features that suddenly don't - work and as a result cause a series of breakages. This is - simply not tested so you are on your own in terms of - ensuring everything works if you do this. - -config BR2_PACKAGE_EFL_EEZE - bool "Enable eeze (udev) support (recommended)" - depends on BR2_PACKAGE_HAS_UDEV # libudev - default y - help - Eeze is EFL's hardware abstraction layer on top of udev. - Having it off will disable some hardware detection, such as - 'drm' graphics engine or 'elput', as well as mounting - removable media. - -comment "eeze needs udev /dev management" - depends on !BR2_PACKAGE_HAS_UDEV - -config BR2_PACKAGE_EFL_FONTCONFIG - bool "Enable fontconfig support (recommended)" - select BR2_PACKAGE_FONTCONFIG - default y - help - If fontconfig is disabled, this is going to make general - font searching not work, and only some very direct 'load - /path/file.ttf' will work alongside some old-school ttf file - path searching. This is very likely not what you want, so - highly reconsider turning fontconfig off. Having it off will - lead to visual problems like missing text in many UI areas - etc... - -config BR2_PACKAGE_EFL_GSTREAMER1 - bool "Enable gstreamer1 support (recommended)" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - default y - help - If Gstreamer 1.x support is disabled, it will heavily limit - your media support options and render some functionality as - useless, leading to visible application bugs. - -config BR2_PACKAGE_EFL_LIBFRIBIDI - bool "Enable libfribidi support (recommended)" - select BR2_PACKAGE_LIBFRIBIDI - default y - help - Fribidi is used for handling right-to-left text (like - Arabic, Hebrew, Farsi, Persian etc.) and is very likely not - a feature you want to disable unless you know for absolute - certain you will never encounter and have to display such - scripts. Also note that we don't test with fribidi disabled - so you may also trigger code paths with bugs that are never - normally used. - -config BR2_PACKAGE_EFL_LIBSNDFILE - bool "Enable libsndfile support (recommended)" - select BR2_PACKAGE_LIBSNDFILE - default y - help - If you disabled audio support in Ecore, this is not tested - and may create bugs for you due to it creating untested code - paths. Reconsider disabling audio. - -config BR2_PACKAGE_EFL_PULSEAUDIO - bool "Enable pulseaudio support (recommended)" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c - select BR2_PACKAGE_PULSEAUDIO - default y - help - The only audio output method supported by Ecore right now is - via Pulseaudio. You have disabled that and likely have - broken a whole bunch of things in the process. Reconsider - your configure options. - - NOTE: multisense support is automatically enabled with - pulseaudio. - -config BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT - bool "Enable libmount support (recommended)" - depends on BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - # libblkid is part of required tools, see EFL's README. - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - default y - help - Libmount is used heavily inside Eeze for support of removable - devices etc... and disabling this will hurt support for - Enlightenment and its filemanager. - -comment "efl's libmount support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE - -config BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG - bool - default y if BR2_PACKAGE_EFL_BULLET && \ - BR2_PACKAGE_EFL_EEZE && \ - BR2_PACKAGE_EFL_FONTCONFIG && \ - BR2_PACKAGE_EFL_GSTREAMER1 && \ - BR2_PACKAGE_EFL_LIBFRIBIDI && \ - BR2_PACKAGE_EFL_LIBSNDFILE && \ - BR2_PACKAGE_EFL_PULSEAUDIO && \ - BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT - - -comment "Warning: one of the recommended option for EFL is not enabled" - depends on !BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG - -config BR2_PACKAGE_EFL_EOLIAN_CPP - bool "Enable Eolian C++ bindings" - depends on BR2_HOST_GCC_AT_LEAST_4_8 # Eolian (host) needs C++11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # Eolian needs C++11 - help - Eolian is an EO object parser and code generator. - With this option enabled Eolian will handle automatic generation - of EFL bindings for the C++11 language. - -comment "Eolian needs host and target gcc >= 4.8" - depends on !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -comment "libecore video support" - -config BR2_PACKAGE_EFL_FB - bool "FB support" - -config BR2_PACKAGE_EFL_X_XLIB - bool "X11 support (xlib)" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXP - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXSCRNSAVER - select BR2_PACKAGE_XLIB_LIBXTST - select BR2_PACKAGE_XPROTO_GLPROTO - -config BR2_PACKAGE_EFL_WAYLAND - bool "Wayland support" - depends on BR2_PACKAGE_WAYLAND - depends on BR2_TOOLCHAIN_HAS_THREADS # Evas DRM Engine -> libdrm - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # Evas DRM Engine - depends on BR2_PACKAGE_EFL_EEZE # efl drm - depends on BR2_PACKAGE_EFL_OPENGLES # OpenGL ES with EGL support only - select BR2_PACKAGE_EFL_DRM - -comment "Wayland support needs udev /dev management (eeze) and OpenGL ES w/ EGL, threads" - depends on BR2_PACKAGE_WAYLAND - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_OPENGLES || !BR2_PACKAGE_EFL_EEZE - -choice - bool "OpenGL support" - help - libevas can be configured to use HW acceleration with OpenGL or - OpenGL ES. - -config BR2_PACKAGE_EFL_OPENGL - bool "OpenGL" - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_EFL_X_XLIB - -comment "OpenGL support needs X11 and an OpenGL provider" - depends on !BR2_PACKAGE_HAS_LIBGL || !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_EFL_OPENGLES - bool "OpenGL ES (w/ EGL)" - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES - -comment "OpenGL ES support needs an OpenGL ES w/ EGL provider" - depends on !BR2_PACKAGE_HAS_LIBGLES || !BR2_PACKAGE_HAS_LIBEGL - -config BR2_PACKAGE_EFL_OPENGL_NONE - bool "none" - -endchoice # OpenGL support - -config BR2_PACKAGE_EFL_ELPUT - bool "Elput" - depends on BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_LIBXKBCOMMON - help - The elput library is an efl abstraction for the libinput library - which can be used by various other subsystems (ecore_fb, - ecore_drm, etc) to handle interfacing with libinput without - having to duplicate the code in each subsystem. - -comment "Elput support needs udev /dev management (eeze)" - depends on !BR2_PACKAGE_EFL_EEZE - -config BR2_PACKAGE_EFL_DRM - bool "Evas DRM Engine" - depends on BR2_PACKAGE_EFL_EEZE - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # require libgbm from mesa3d - select BR2_PACKAGE_EFL_ELPUT - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBXKBCOMMON - help - This option enable building support for the Evas DRM Engine. - -comment "Evas DRM Engine needs udev /dev management (eeze) and mesa3d w/ EGL support, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_MESA3D_OPENGL_EGL \ - || !BR2_PACKAGE_EFL_EEZE - -comment "libevas loaders" - -config BR2_PACKAGE_EFL_PNG - bool "libevas png loader" - select BR2_PACKAGE_LIBPNG - help - This enables the loader code that loads png files using - libpng. - -# JP2K support require openjpeg 1.x (libopenjpeg1.pc) which is not -# available in Buildroot anymore. -config BR2_PACKAGE_EFL_JP2K - bool "libevas jp2k loader" - select BR2_PACKAGE_OPENJPEG - depends on BROKEN # require openjpeg 1.x - help - This enables the loader code that loads jp2k files using - openjpeg. - -config BR2_PACKAGE_EFL_JPEG - bool "libevas jpeg loader" - help - This enables the loader code that loads jpeg files using - libjpeg. - -config BR2_PACKAGE_EFL_GIF - bool "libevas gif loader" - select BR2_PACKAGE_GIFLIB - help - This enables the loader code that loads gif files using - giflib. - -config BR2_PACKAGE_EFL_TIFF - bool "libevas tiff loader" - select BR2_PACKAGE_TIFF - help - This enables the loader code that loads tiff files. - -config BR2_PACKAGE_EFL_WEBP - bool "libevas webp image loader" - select BR2_PACKAGE_WEBP - help - This enables the loader code that loads images using WebP. - -config BR2_PACKAGE_EFL_LIBRAW - bool "libraw loader" - select BR2_PACKAGE_LIBRAW - help - This option enables the Evas generic Libraw loader - -config BR2_PACKAGE_EFL_SVG - bool "SVG loader" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - select BR2_PACKAGE_CAIRO - help - This option enables the Evas generic SVG loader - -endif # BR2_PACKAGE_EFL - -comment "efl needs a toolchain w/ C++, dynamic library, gcc >= 4.7, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP \ - || !BR2_HOST_GCC_AT_LEAST_4_7 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS - depends on BR2_USE_MMU diff --git a/package.bak/efl/efl.hash b/package.bak/efl/efl.hash deleted file mode 100644 index 5d7a90d680..0000000000 --- a/package.bak/efl/efl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://download.enlightenment.org/rel/libs/efl/efl-1.18.4.tar.xz.sha256 -sha256 39ebc07e37437d6ecdeb0f645783484e28a882b38f7e619ad12c2bf9b5548025 efl-1.18.4.tar.xz diff --git a/package.bak/efl/efl.mk b/package.bak/efl/efl.mk deleted file mode 100644 index 1e54f72810..0000000000 --- a/package.bak/efl/efl.mk +++ /dev/null @@ -1,383 +0,0 @@ -################################################################################ -# -# efl -# -################################################################################ - -EFL_VERSION = 1.18.4 -EFL_SOURCE = efl-$(EFL_VERSION).tar.xz -EFL_SITE = http://download.enlightenment.org/rel/libs/efl -EFL_LICENSE = BSD-2c, LGPLv2.1+, GPLv2+ -EFL_LICENSE_FILES = \ - COMPLIANCE \ - COPYING \ - licenses/COPYING.BSD \ - licenses/COPYING.FTL \ - licenses/COPYING.GPL \ - licenses/COPYING.LGPL \ - licenses/COPYING.SMALL - -EFL_INSTALL_STAGING = YES - -EFL_DEPENDENCIES = host-pkgconf host-efl host-luajit dbus freetype \ - jpeg luajit lz4 zlib - -# Configure options: -# --disable-lua-old: build elua for the target. -# --disable-poppler: disable poppler image loader. -# --disable-sdl: disable sdl2 support. -# --disable-spectre: disable spectre image loader. -# --disable-xinput22: disable X11 XInput v2.2+ support. -# --enable-liblz4: use liblz4 from lz4 package. -# --with-doxygen: disable doxygen documentation -EFL_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ - --with-elementary-codegen=$(HOST_DIR)/usr/bin/elementary_codegen \ - --with-elm-prefs-cc=$(HOST_DIR)/usr/bin/elm_prefs_cc \ - --with-elua=$(HOST_DIR)/usr/bin/elua \ - --with-eolian-gen=$(HOST_DIR)/usr/bin/eolian_gen \ - --disable-lua-old \ - --disable-poppler \ - --disable-sdl \ - --disable-spectre \ - --disable-xinput22 \ - --disable-wayland \ - --enable-liblz4 \ - --with-doxygen=no - -# Disable untested configuration warning. -ifeq ($(BR2_PACKAGE_EFL_HAS_RECOMMENDED_CONFIG),) -EFL_CONF_OPTS += --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb -endif - -ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -EFL_CONF_OPTS += --enable-cxx-bindings \ - --with-eolian-cxx=$(HOST_DIR)/usr/bin/eolian_cxx -else -EFL_CONF_OPTS += --disable-cxx-bindings -endif - -ifeq ($(BR2_PACKAGE_EFL_EEZE),y) -EFL_DEPENDENCIES += udev -EFL_CONF_OPTS += --enable-libeeze -else -EFL_CONF_OPTS += --disable-libeeze -endif - -ifeq ($(BR2_PACKAGE_EFL_UTIL_LINUX_LIBMOUNT),y) -EFL_DEPENDENCIES += util-linux -EFL_CONF_OPTS += --enable-libmount -else -EFL_CONF_OPTS += --disable-libmount -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -EFL_CONF_OPTS += --enable-systemd -EFL_DEPENDENCIES += systemd -else -EFL_CONF_OPTS += --disable-systemd -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -EFL_CONF_OPTS += --enable-fontconfig -EFL_DEPENDENCIES += fontconfig -else -EFL_CONF_OPTS += --disable-fontconfig -endif - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -EFL_CONF_OPTS += --enable-fribidi -EFL_DEPENDENCIES += libfribidi -else -EFL_CONF_OPTS += --disable-fribidi -endif - -ifeq ($(BR2_PACKAGE_GSTREAMER1)$(BR2_PACKAGE_GST1_PLUGINS_BASE),yy) -EFL_CONF_OPTS += --enable-gstreamer1 -EFL_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -EFL_CONF_OPTS += --disable-gstreamer1 -endif - -ifeq ($(BR2_PACKAGE_BULLET),y) -EFL_CONF_OPTS += --enable-physics -EFL_DEPENDENCIES += bullet -else -EFL_CONF_OPTS += --disable-physics -endif - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -EFL_CONF_OPTS += --enable-audio -EFL_DEPENDENCIES += libsndfile -else -EFL_CONF_OPTS += --disable-audio -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -EFL_CONF_OPTS += --enable-pulseaudio -EFL_DEPENDENCIES += pulseaudio -else -EFL_CONF_OPTS += --disable-pulseaudio -endif - -ifeq ($(BR2_PACKAGE_HARFBUZZ),y) -EFL_DEPENDENCIES += harfbuzz -EFL_CONF_OPTS += --enable-harfbuzz -else -EFL_CONF_OPTS += --disable-harfbuzz -endif - -ifeq ($(BR2_PACKAGE_TSLIB),y) -EFL_DEPENDENCIES += tslib -EFL_CONF_OPTS += --enable-tslib -else -EFL_CONF_OPTS += --disable-tslib -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -EFL_DEPENDENCIES += libglib2 -EFL_CONF_OPTS += --with-glib=yes -else -EFL_CONF_OPTS += --with-glib=no -endif - -# Prefer openssl (the default) over gnutls. -ifeq ($(BR2_PACKAGE_OPENSSL),y) -EFL_DEPENDENCIES += openssl -EFL_CONF_OPTS += --with-crypto=openssl -else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -EFL_DEPENDENCIES += gnutls libgcrypt -EFL_CONF_OPTS += --with-crypto=gnutls \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -EFL_CONF_OPTS += --with-crypto=none -endif # BR2_PACKAGE_OPENSSL - -ifeq ($(BR2_PACKAGE_EFL_ELPUT),y) -EFL_CONF_OPTS += --enable-elput -EFL_DEPENDENCIES += libinput -else -EFL_CONF_OPTS += --disable-elput -endif - -ifeq ($(BR2_PACKAGE_EFL_FB),y) -EFL_CONF_OPTS += --enable-fb -else -EFL_CONF_OPTS += --disable-fb -endif - -ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y) -EFL_CONF_OPTS += \ - --with-x11=xlib \ - --with-x=$(STAGING_DIR) \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib - -EFL_DEPENDENCIES += \ - xlib_libX11 \ - xlib_libXcomposite \ - xlib_libXcursor \ - xlib_libXdamage \ - xlib_libXext \ - xlib_libXinerama \ - xlib_libXrandr \ - xlib_libXrender \ - xlib_libXScrnSaver \ - xlib_libXtst -else -EFL_CONF_OPTS += --with-x11=none -endif - -ifeq ($(BR2_PACKAGE_EFL_OPENGL),y) -EFL_CONF_OPTS += --with-opengl=full -EFL_DEPENDENCIES += libgl -# OpenGL ES requires EGL -else ifeq ($(BR2_PACKAGE_EFL_OPENGLES),y) -EFL_CONF_OPTS += --with-opengl=es --enable-egl -EFL_DEPENDENCIES += libegl libgles -else ifeq ($(BR2_PACKAGE_EFL_OPENGL_NONE),y) -EFL_CONF_OPTS += --with-opengl=none -endif - -ifeq ($(BR2_PACKAGE_EFL_DRM),y) -EFL_CONF_OPTS += --enable-drm -EFL_DEPENDENCIES += libdrm libegl mesa3d -else -EFL_CONF_OPTS += --disable-drm -endif - -# The EFL Wayland support requires Evas GLES DRM engine support -# which depends on wayland-client to build. -# So enable gl_drm only when wayland support is selected. -ifeq ($(BR2_PACKAGE_EFL_WAYLAND),y) -EFL_DEPENDENCIES += wayland -EFL_CONF_OPTS += --enable-wayland --enable-gl-drm -else -EFL_CONF_OPTS += --disable-wayland --disable-gl-drm -endif - -EFL_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBXKBCOMMON),libxkbcommon) - -# Loaders that need external dependencies needs to be --enable-XXX=yes -# otherwise the default is '=static'. -# All other loaders are statically built-in -ifeq ($(BR2_PACKAGE_EFL_PNG),y) -EFL_CONF_OPTS += --enable-image-loader-png=yes -EFL_DEPENDENCIES += libpng -else -EFL_CONF_OPTS += --disable-image-loader-png -endif - -ifeq ($(BR2_PACKAGE_EFL_JPEG),y) -EFL_CONF_OPTS += --enable-image-loader-jpeg=yes -# efl already depends on jpeg. -else -EFL_CONF_OPTS += --disable-image-loader-jpeg -endif - -ifeq ($(BR2_PACKAGE_EFL_GIF),y) -EFL_CONF_OPTS += --enable-image-loader-gif=yes -EFL_DEPENDENCIES += giflib -else -EFL_CONF_OPTS += --disable-image-loader-gif -endif - -ifeq ($(BR2_PACKAGE_EFL_TIFF),y) -EFL_CONF_OPTS += --enable-image-loader-tiff=yes -EFL_DEPENDENCIES += tiff -else -EFL_CONF_OPTS += --disable-image-loader-tiff -endif - -ifeq ($(BR2_PACKAGE_EFL_JP2K),y) -EFL_CONF_OPTS += --enable-image-loader-jp2k=yes -EFL_DEPENDENCIES += openjpeg -else -EFL_CONF_OPTS += --disable-image-loader-jp2k -endif - -ifeq ($(BR2_PACKAGE_EFL_WEBP),y) -EFL_CONF_OPTS += --enable-image-loader-webp=yes -EFL_DEPENDENCIES += webp -else -EFL_CONF_OPTS += --disable-image-loader-webp -endif - -ifeq ($(BR2_PACKAGE_EFL_LIBRAW),y) -EFL_DEPENDENCIES += libraw -EFL_CONF_OPTS += --enable-libraw -else -EFL_CONF_OPTS += --disable-libraw -endif - -ifeq ($(BR2_PACKAGE_EFL_SVG),y) -EFL_DEPENDENCIES += librsvg cairo -EFL_CONF_OPTS += --enable-librsvg -else -EFL_CONF_OPTS += --disable-librsvg -endif - -ifeq ($(BR2_PACKAGE_UPOWER),) -# upower ecore system module is only useful if upower -# dbus service is available. -# It's not essential, only used to notify applications -# of power state, such as low battery or AC power, so -# they can adapt their power consumption. -define EFL_HOOK_REMOVE_UPOWER - rm -fr $(TARGET_DIR)/usr/lib/ecore/system/upower -endef -EFL_POST_INSTALL_TARGET_HOOKS = EFL_HOOK_REMOVE_UPOWER -endif - -$(eval $(autotools-package)) - -################################################################################ -# -# host-efl -# -################################################################################ - -# We want to build only some host tools used later in the build. -# Actually we want: edje_cc, eet and embryo_cc. eolian_cxx is built only -# if selected for the target. - -# Host dependencies: -# * host-dbus: for Eldbus -# * host-freetype: for libevas -# * host-libglib2: for libecore -# * host-libjpeg, host-libpng: for libevas image loader -# * host-luajit for Elua tool for the host -HOST_EFL_DEPENDENCIES = \ - host-pkgconf \ - host-dbus \ - host-freetype \ - host-libglib2 \ - host-libjpeg \ - host-libpng \ - host-luajit \ - host-zlib - -# Configure options: -# --disable-audio, --disable-multisense remove libsndfile dependency. -# --disable-fontconfig: remove dependency on fontconfig. -# --disable-fribidi: remove dependency on libfribidi. -# --disable-gstreamer1: remove dependency on gtreamer 1.0. -# --disable-libeeze: remove libudev dependency. -# --disable-libmount: remove dependency on host-util-linux libmount. -# --disable-lua-old: build elua for the host. -# --disable-physics: remove Bullet dependency. -# --disable-poppler: disable poppler image loader. -# --disable-spectre: disable spectre image loader. -# --enable-image-loader-gif=no: disable Gif dependency. -# --enable-image-loader-tiff=no: disable Tiff dependency. -# --with-crypto=none: remove dependencies on openssl or gnutls. -# --with-doxygen: disable doxygen documentation -# --with-x11=none: remove dependency on X.org. -# Yes I really know what I am doing. -HOST_EFL_CONF_OPTS += \ - --disable-audio \ - --disable-fontconfig \ - --disable-fribidi \ - --disable-gstreamer1 \ - --disable-libeeze \ - --disable-libmount \ - --disable-libraw \ - --disable-librsvg \ - --disable-lua-old \ - --disable-multisense \ - --disable-physics \ - --disable-poppler \ - --disable-spectre \ - --disable-xcf \ - --enable-image-loader-gif=no \ - --enable-image-loader-jpeg=yes \ - --enable-image-loader-png=yes \ - --enable-image-loader-tiff=no \ - --with-crypto=none \ - --with-doxygen=no \ - --with-glib=yes \ - --with-opengl=none \ - --with-x11=none \ - --enable-i-really-know-what-i-am-doing-and-that-this-will-probably-break-things-and-i-will-fix-them-myself-and-send-patches-abb - -# Enable Eolian language bindings to provide eolian_cxx tool for the -# host which is required to build Eolian language bindings for the -# target. -ifeq ($(BR2_PACKAGE_EFL_EOLIAN_CPP),y) -HOST_EFL_CONF_OPTS += --enable-cxx-bindings -else -HOST_EFL_CONF_OPTS += --disable-cxx-bindings -endif - -# Always disable upower system module from host as it's -# not useful and would try to use the output/host/var -# system bus which is non-existent and does not contain -# any upower service in it. -define HOST_EFL_HOOK_REMOVE_UPOWER - rm -fr $(HOST_DIR)/usr/lib/ecore/system/upower -endef -HOST_EFL_POST_INSTALL_HOOKS = HOST_EFL_HOOK_REMOVE_UPOWER - -$(eval $(host-autotools-package)) diff --git a/package.bak/eigen/Config.in b/package.bak/eigen/Config.in deleted file mode 100644 index 03d65b19d1..0000000000 --- a/package.bak/eigen/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_EIGEN - bool "eigen" - depends on BR2_INSTALL_LIBSTDCPP - help - Eigen is a C++ template library for linear algebra: vectors, - matrices, and related algorithms. It is versatile, fast, elegant - and works on many platforms (OS/Compilers). - - This package only installs header files to the include path. - If you just want to use Eigen, you can use the header files - right away. There is no binary to link to. Eigen is a pure - template library defined in the headers. - - http://eigen.tuxfamily.org/ - -if BR2_PACKAGE_EIGEN - -config BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES - bool "unsupported modules" - help - Install eigen unsupported modules -endif - -comment "eigen needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/eigen/eigen.mk b/package.bak/eigen/eigen.mk deleted file mode 100644 index 730bb5ffd2..0000000000 --- a/package.bak/eigen/eigen.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# eigen -# -################################################################################ - -EIGEN_VERSION = 3.2.5 -EIGEN_SITE = https://bitbucket.org/eigen/eigen -EIGEN_SITE_METHOD = hg -EIGEN_LICENSE = MPL2, BSD-3c, LGPLv2.1 -EIGEN_LICENSE_FILES = COPYING.MPL2 COPYING.BSD COPYING.LGPL COPYING.README -EIGEN_INSTALL_STAGING = YES -EIGEN_INSTALL_TARGET = NO -EIGEN_DEST_DIR = $(STAGING_DIR)/usr/include/eigen3 - -ifeq ($(BR2_PACKAGE_EIGEN_UNSUPPORTED_MODULES),y) -define EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS - mkdir -p $(EIGEN_DEST_DIR)/unsupported - cp -a $(@D)/unsupported/Eigen $(EIGEN_DEST_DIR)/unsupported -endef -endif - -# Generate the .pc file at build time -define EIGEN_BUILD_CMDS - sed -r -e 's,^Version: .*,Version: $(EIGEN_VERSION),' \ - -e 's,^Cflags: .*,Cflags: -I$(EIGEN_DEST_DIR),' \ - $(@D)/eigen3.pc.in >$(@D)/eigen3.pc -endef - -# This package only consists of headers that need to be -# copied over to the sysroot for compile time use -define EIGEN_INSTALL_STAGING_CMDS - $(RM) -r $(EIGEN_DEST_DIR) - mkdir -p $(EIGEN_DEST_DIR) - cp -a $(@D)/Eigen $(EIGEN_DEST_DIR) - $(EIGEN_INSTALL_UNSUPPORTED_MODULES_CMDS) - $(INSTALL) -D -m 0644 $(@D)/eigen3.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/eigen3.pc -endef - -$(eval $(generic-package)) diff --git a/package.bak/ejabberd/0001-remove-make-targets-for-deps.patch b/package.bak/ejabberd/0001-remove-make-targets-for-deps.patch deleted file mode 100644 index 6917f71f31..0000000000 --- a/package.bak/ejabberd/0001-remove-make-targets-for-deps.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 21d1f05a8882657c151397d0e4723535402f1757 Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Wed, 20 Jan 2016 10:22:57 -0500 -Subject: [PATCH] remove make targets for deps - -Without this patch, dependencies would be downloaded and compiled -using rebar at build time. - -Signed-off-by: Frank Hunleth ---- - Makefile.in | 26 +++----------------------- - 1 file changed, 3 insertions(+), 23 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 08cd837..2a6457c 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,26 +77,11 @@ else - INIT_USER=$(INSTALLUSER) - endif - --all: deps src -+all: src - --deps: deps/.got -- --deps/.got: -- rm -rf deps/.got -- rm -rf deps/.built -- $(REBAR) get-deps && :> deps/.got -- --deps/.built: deps/.got -- $(REBAR) compile && :> deps/.built -- --src: deps/.built -+src: - $(REBAR) skip_deps=true compile - --update: -- rm -rf deps/.got -- rm -rf deps/.built -- $(REBAR) update-deps && :> deps/.got -- - xref: all - $(REBAR) skip_deps=true xref - -@@ -152,16 +137,13 @@ $(foreach file,$(DEPS_FILES_FILTERED) $(MAIN_FILES),$(eval $(call COPY_template, - $(sort $(call TO_DEST,$(MAIN_DIRS) $(DEPS_DIRS))): - $(INSTALL) -d $@ - --$(call TO_DEST,deps/p1_pam/priv/bin/epam): $(LIBDIR)/%: deps/p1_pam/priv/bin/epam $(call TO_DEST,deps/p1_pam/priv/bin/) -- $(INSTALL) -m 750 $(O_USER) $< $@ -- - $(call TO_DEST,priv/sql/lite.sql): sql/lite.sql $(call TO_DEST,priv/sql) - $(INSTALL) -m 644 $< $@ - - $(call TO_DEST,priv/bin/captcha.sh): tools/captcha.sh $(call TO_DEST,priv/bin) - $(INSTALL) -m 750 $(O_USER) $< $@ - --copy-files-sub2: $(call TO_DEST,$(DEPS_FILES) $(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql) -+copy-files-sub2: $(call TO_DEST,$(MAIN_FILES) priv/bin/captcha.sh priv/sql/lite.sql) - - endif - -@@ -287,8 +269,6 @@ TAGS: - - Makefile: Makefile.in - --deps := $(wildcard deps/*/ebin) -- - dialyzer/erlang.plt: - @mkdir -p dialyzer - @dialyzer --build_plt --output_plt dialyzer/erlang.plt \ --- -2.5.0 - diff --git a/package.bak/ejabberd/0002-remove-dependencies-from-rebar-config.patch b/package.bak/ejabberd/0002-remove-dependencies-from-rebar-config.patch deleted file mode 100644 index 9dcea1c320..0000000000 --- a/package.bak/ejabberd/0002-remove-dependencies-from-rebar-config.patch +++ /dev/null @@ -1,85 +0,0 @@ -From d399ecdd99e62b5554210a3b5c733e738e4d54be Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Wed, 20 Jan 2016 08:08:42 -0500 -Subject: [PATCH] remove dependencies from rebar config - -Without this patch, dependencies would be downloaded and compiled -by rebar at build time. - -Signed-off-by: Frank Hunleth ---- - rebar.config | 51 --------------------------------------------------- - 1 file changed, 51 deletions(-) - -diff --git a/rebar.config b/rebar.config -index 30c0360..d6a5b4d 100644 ---- a/rebar.config -+++ b/rebar.config -@@ -7,48 +7,6 @@ - %%% Created : 1 May 2013 by Evgeniy Khramtsov - %%%------------------------------------------------------------------- - --{deps, [{if_var_true, lager, {lager, ".*", {git, "https://github.com/basho/lager", {tag, "3.0.2"}}}}, -- {if_var_false, lager, {p1_logger, ".*", {git, "https://github.com/processone/p1_logger", {tag, "1.0.0"}}}}, -- {p1_utils, ".*", {git, "https://github.com/processone/p1_utils", {tag, "1.0.2"}}}, -- {cache_tab, ".*", {git, "https://github.com/processone/cache_tab", {tag, "1.0.1"}}}, -- {p1_tls, ".*", {git, "https://github.com/processone/tls", {tag, "1.0.0"}}}, -- {p1_stringprep, ".*", {git, "https://github.com/processone/stringprep", {tag, "1.0.0"}}}, -- {p1_xml, ".*", {git, "https://github.com/processone/xml", {tag, "1.1.1"}}}, -- {p1_stun, ".*", {git, "https://github.com/processone/stun", "0.9.0"}}, -- {esip, ".*", {git, "https://github.com/processone/p1_sip", "1.0.0"}}, -- {p1_yaml, ".*", {git, "https://github.com/processone/p1_yaml", {tag, "1.0.0"}}}, -- {jiffy, ".*", {git, "https://github.com/davisp/jiffy", {tag, "0.14.5"}}}, -- {oauth2, ".*", {git, "https://github.com/kivra/oauth2", "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8"}}, -- {xmlrpc, ".*", {git, "https://github.com/rds13/xmlrpc", {tag, "1.15"}}}, -- {if_var_true, mysql, {p1_mysql, ".*", {git, "https://github.com/processone/mysql", {tag, "1.0.0"}}}}, -- {if_var_true, pgsql, {p1_pgsql, ".*", {git, "https://github.com/processone/pgsql", {tag, "1.0.0"}}}}, -- {if_var_true, sqlite, {sqlite3, ".*", {git, "https://github.com/alexeyr/erlang-sqlite3", "cbc3505f7a131254265d3ef56191b2581b8cc172"}}}, -- {if_var_true, pam, {p1_pam, ".*", {git, "https://github.com/processone/epam", {tag, "1.0.0"}}}}, -- {if_var_true, zlib, {p1_zlib, ".*", {git, "https://github.com/processone/zlib", {tag, "1.0.0"}}}}, -- {if_var_true, riak, {hamcrest, ".*", {git, "https://github.com/hyperthunk/hamcrest-erlang", "908a24fda4a46776a5135db60ca071e3d783f9f6"}}}, % for riak_pb-2.1.0.7 -- {if_var_true, riak, {riakc, ".*", {git, "https://github.com/basho/riak-erlang-client", "527722d12d0433b837cdb92a60900c2cb5df8942"}}}, -- {if_var_true, elixir, {elixir, ".*", {git, "https://github.com/elixir-lang/elixir", {tag, "v1.1.0"}}}}, -- {if_var_true, elixir, {rebar_elixir_plugin, ".*", {git, "https://github.com/processone/rebar_elixir_plugin", "0.1.0"}}}, -- {if_var_true, iconv, {p1_iconv, ".*", {git, "https://github.com/processone/eiconv", {tag, "0.9.0"}}}}, -- {if_var_true, tools, {meck, "0.8.2", {git, "https://github.com/eproxus/meck", {tag, "0.8.2"}}}}, -- {if_var_true, redis, {eredis, ".*", {git, "https://github.com/wooga/eredis", {tag, "v1.0.8"}}}}]}. -- --{if_var_true, latest_deps, -- {floating_deps, [p1_logger, -- cache_tab, -- p1_tls, -- p1_stringprep, -- p1_xml, -- esip, -- p1_stun, -- p1_yaml, -- p1_utils, -- p1_mysql, -- p1_pgsql, -- p1_pam, -- p1_zlib, -- p1_iconv]}}. -- - {erl_opts, [nowarn_deprecated_function, - {if_var_true, roster_gateway_workaround, {d, 'ROSTER_GATWAY_WORKAROUND'}}, - {if_var_match, db_type, mssql, {d, 'mssql'}}, -@@ -92,15 +50,6 @@ - - {eunit_compile_opts, [{i, "tools"}]}. - --{post_hook_configure, [{"p1_tls", []}, -- {"p1_stringprep", []}, -- {"p1_yaml", []}, -- {"esip", []}, -- {"p1_xml", [{if_var_true, full_xml, "--enable-full-xml"}]}, -- {if_var_true, pam, {"p1_pam", []}}, -- {if_var_true, zlib, {"p1_zlib", []}}, -- {if_var_true, iconv, {"p1_iconv", []}}]}. -- - {port_env, [{"CFLAGS", "-g -O2 -Wall"}]}. - - {port_specs, [{"priv/lib/jid.so", ["c_src/jid.c"]}]}. --- -2.5.0 - diff --git a/package.bak/ejabberd/0003-remove-checking-erlang-version.patch b/package.bak/ejabberd/0003-remove-checking-erlang-version.patch deleted file mode 100644 index ebcdd54645..0000000000 --- a/package.bak/ejabberd/0003-remove-checking-erlang-version.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f384518dedec4ad657ad69d55754076c13c22d96 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 20 Jan 2016 08:11:32 -0500 -Subject: [PATCH] remove checking erlang version - -Without this patch, the configure will try to run erlang to simply check -if the version is supported by ejabberd. Instead, we do this test -statically. ---- - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 97e89a2..cd1ab08 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,10 +39,8 @@ AC_ARG_ENABLE(erlang-version-check, - [Check Erlang/OTP version @<:@default=yes@:>@])]) - case "$enable_erlang_version_check" in - yes|'') -- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX]) - ;; - no) -- ERLANG_VERSION_CHECK([$REQUIRE_ERLANG_MIN],[$REQUIRE_ERLANG_MAX],[warn]) - ;; - esac - --- -2.5.0 - diff --git a/package.bak/ejabberd/0004-correct-include.patch b/package.bak/ejabberd/0004-correct-include.patch deleted file mode 100644 index fd1dee2850..0000000000 --- a/package.bak/ejabberd/0004-correct-include.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 705a9ad229de49cd9cce226a2025716902455663 Mon Sep 17 00:00:00 2001 -From: Philipp Huebner -Date: Wed, 20 Jan 2016 08:13:21 -0500 -Subject: [PATCH] correct include - -This part of the code was moved into it's own project and was packaged -separately by me. To make the build process work, this small fix is -necessary. ---- - src/mod_sip.erl | 2 +- - src/mod_sip_proxy.erl | 2 +- - src/mod_sip_registrar.erl | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/mod_sip.erl b/src/mod_sip.erl -index c8c9533..7f188a0 100644 ---- a/src/mod_sip.erl -+++ b/src/mod_sip.erl -@@ -38,7 +38,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - %%%=================================================================== - %%% API -diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl -index bf297bc..d8b65cd 100644 ---- a/src/mod_sip_proxy.erl -+++ b/src/mod_sip_proxy.erl -@@ -40,7 +40,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(SIGN_LIFETIME, 300). %% in seconds. - -diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl -index 44091ed..4d2ec82 100644 ---- a/src/mod_sip_registrar.erl -+++ b/src/mod_sip_registrar.erl -@@ -37,7 +37,7 @@ - - -include("ejabberd.hrl"). - -include("logger.hrl"). ---include_lib("esip/include/esip.hrl"). -+-include_lib("p1_sip/include/esip.hrl"). - - -define(CALL_TIMEOUT, timer:seconds(30)). - -define(DEFAULT_EXPIRES, 3600). --- -2.5.0 - diff --git a/package.bak/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch b/package.bak/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch deleted file mode 100644 index 4b68f5ff85..0000000000 --- a/package.bak/ejabberd/0005-disable-ERLANG_DEPRECATED_CHECK.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d43a65b112ec995a5ee52aca2a16e5cf9699d7c1 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 20 Jan 2016 08:16:26 -0500 -Subject: [PATCH] disable ERLANG_DEPRECATED_CHECK - -Without this patch, the configure will try to execute erlang to check -if it uses deprecated types. Assume the answer is false. ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cd1ab08..a4f1533 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -235,7 +235,7 @@ if test "$ENABLEUSER" != ""; then - AC_SUBST([INSTALLUSER], [$ENABLEUSER]) - fi - --ERLANG_DEPRECATED_TYPES_CHECK -+AC_SUBST(erlang_deprecated_types, false) - - if test "$sqlite" = "true"; then - AX_LIB_SQLITE3([3.6.19]) --- -2.5.0 - diff --git a/package.bak/ejabberd/0006-fix-install-permissions.patch b/package.bak/ejabberd/0006-fix-install-permissions.patch deleted file mode 100644 index 4d77044902..0000000000 --- a/package.bak/ejabberd/0006-fix-install-permissions.patch +++ /dev/null @@ -1,82 +0,0 @@ -From ef847479778cc58818e066b87aa1789ba1c4148b Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 20 Jan 2016 09:34:07 -0500 -Subject: [PATCH] fix install permissions - -Without this patch, the makefile will try to install directories and -files with incompatible permissions for ejabberd, which run as an -ejabberd user. - -Signed-off-by: Frank Hunleth ---- - Makefile.in | 38 +++++--------------------------------- - 1 file changed, 5 insertions(+), 33 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 2a6457c..0be4c50 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -155,10 +155,8 @@ copy-files-sub: copy-files-sub2 - install: all copy-files - # - # Configuration files -- $(INSTALL) -d -m 750 $(G_USER) $(ETCDIR) -- [ -f $(ETCDIR)/ejabberd.yml ] \ -- && $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml-new \ -- || $(INSTALL) -b -m 640 $(G_USER) ejabberd.yml.example $(ETCDIR)/ejabberd.yml -+ $(INSTALL) -d $(ETCDIR) -+ $(INSTALL) -b -m 644 ejabberd.yml.example $(ETCDIR)/ejabberd.yml - $(SED) -e "s*{{rootdir}}*@prefix@*" \ - -e "s*{{installuser}}*@INSTALLUSER@*" \ - -e "s*{{bindir}}*@bindir@*" \ -@@ -168,14 +166,11 @@ install: all copy-files - -e "s*{{docdir}}*@docdir@*" \ - -e "s*{{erl}}*@ERL@*" ejabberdctl.template \ - > ejabberdctl.example -- [ -f $(ETCDIR)/ejabberdctl.cfg ] \ -- && $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \ -- || $(INSTALL) -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -- $(INSTALL) -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc -+ $(INSTALL) -b -m 644 ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg -+ $(INSTALL) -b -m 644 inetrc $(ETCDIR)/inetrc - # - # Administration script -- [ -d $(SBINDIR) ] || $(INSTALL) -d -m 755 $(SBINDIR) -- $(INSTALL) -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl -+ $(INSTALL) -D ejabberdctl.example $(SBINDIR)/ejabberdctl - # Elixir binaries - [ -d $(BINDIR) ] || $(INSTALL) -d -m 755 $(BINDIR) - [ -f deps/elixir/bin/iex ] && $(INSTALL) -m 550 $(G_USER) deps/elixir/bin/iex $(BINDIR)/iex || true -@@ -187,29 +182,6 @@ install: all copy-files - -e "s*@installuser@*$(INIT_USER)*" ejabberd.init.template \ - > ejabberd.init - chmod 755 ejabberd.init -- # -- # Spool directory -- $(INSTALL) -d -m 750 $(O_USER) $(SPOOLDIR) -- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(SPOOLDIR) >$(CHOWN_OUTPUT) -- chmod -R 750 $(SPOOLDIR) -- [ ! -f $(COOKIEFILE) ] || { $(CHOWN_COMMAND) @INSTALLUSER@ $(COOKIEFILE) >$(CHOWN_OUTPUT) ; chmod 400 $(COOKIEFILE) ; } -- # -- # ejabberdctl lock directory -- $(INSTALL) -d -m 750 $(O_USER) $(CTLLOCKDIR) -- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(CTLLOCKDIR) >$(CHOWN_OUTPUT) -- chmod -R 750 $(CTLLOCKDIR) -- # -- # Log directory -- $(INSTALL) -d -m 750 $(O_USER) $(LOGDIR) -- $(CHOWN_COMMAND) -R @INSTALLUSER@ $(LOGDIR) >$(CHOWN_OUTPUT) -- chmod -R 750 $(LOGDIR) -- # -- # Documentation -- $(INSTALL) -d $(DOCDIR) -- [ -f doc/guide.html ] \ -- && $(INSTALL) -m 644 doc/guide.html $(DOCDIR) \ -- || echo "Documentation not included in sources" -- $(INSTALL) -m 644 COPYING $(DOCDIR) - - uninstall: uninstall-binary - --- -2.5.0 - diff --git a/package.bak/ejabberd/0007-fix-ejabberdctl.patch b/package.bak/ejabberd/0007-fix-ejabberdctl.patch deleted file mode 100644 index 36aa3a707f..0000000000 --- a/package.bak/ejabberd/0007-fix-ejabberdctl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53d7d654026afa163a55b860e33c6901129e8dc1 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet -Date: Wed, 20 Jan 2016 09:35:07 -0500 -Subject: [PATCH] fix ejabberdctl - -Change default values so ejabberdctl run commands as ejabberd user -Also add a way for the user to change default values. - -Signed-off-by: Johan Oudinet ---- - ejabberdctl.template | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/ejabberdctl.template b/ejabberdctl.template -index f65c21f..ff9225f 100755 ---- a/ejabberdctl.template -+++ b/ejabberdctl.template -@@ -14,9 +14,12 @@ SCRIPT_DIR=`cd ${0%/*} && pwd` - ERL={{erl}} - IEX={{bindir}}/iex - EPMD={{bindir}}/epmd --INSTALLUSER={{installuser}} -+INSTALLUSER=ejabberd - ERL_LIBS={{libdir}} - -+# Read default configuration file if present -+[ ! -r /etc/default/ejabberd ] || . /etc/default/ejabberd -+ - # check the proper system user is used if defined - if [ "$INSTALLUSER" != "" ] ; then - EXEC_CMD="false" --- -2.5.0 - diff --git a/package.bak/ejabberd/Config.in b/package.bak/ejabberd/Config.in deleted file mode 100644 index 5d176c3af6..0000000000 --- a/package.bak/ejabberd/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_EJABBERD - bool "ejabberd" - depends on BR2_PACKAGE_ERLANG - depends on BR2_INSTALL_LIBSTDCPP # stringprep - select BR2_PACKAGE_ERLANG_LAGER - select BR2_PACKAGE_ERLANG_P1_CACHE_TAB - select BR2_PACKAGE_ERLANG_P1_ICONV - select BR2_PACKAGE_ERLANG_P1_SIP - select BR2_PACKAGE_ERLANG_P1_STRINGPREP - select BR2_PACKAGE_ERLANG_P1_XML - select BR2_PACKAGE_ERLANG_P1_YAML - select BR2_PACKAGE_ERLANG_P1_ZLIB - select BR2_PACKAGE_GETENT - select BR2_PACKAGE_OPENSSL - help - Ejabberd is a Jabber/XMPP instant messaging server, written - in Erlang/OTP. Among other features, ejabberd is - cross-platform, fault-tolerant, clusterable and modular. - - http://www.ejabberd.im - -comment "ejabberd needs erlang, toolchain w/ C++" - depends on !BR2_PACKAGE_ERLANG || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/ejabberd/S50ejabberd b/package.bak/ejabberd/S50ejabberd deleted file mode 100644 index 830fcb85a7..0000000000 --- a/package.bak/ejabberd/S50ejabberd +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -# Start/stop ejabberd -# - -CTL=/usr/sbin/ejabberdctl -DEFAULT=/etc/default/ejabberd -INSTALLUSER=ejabberd -RUNDIR=/var/run/ejabberd - -# Read default configuration file if present. -[ -r "$DEFAULT" ] && . "$DEFAULT" - -# Create RUNDIR. -mkrundir() { - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" -} - -case "$1" in - start) - mkrundir || exit 1 - printf "Starting ejabberd... " - "$CTL" start - # Wait until ejabberd is up and running. - if "$CTL" started; then - echo "done" - else - echo "failed" - fi - ;; - stop) - printf "Stopping ejabberd... " - "$CTL" stop > /dev/null - if [ $? -eq 3 ] || "$CTL" stopped; then - echo "OK" - else - echo "failed" - fi - ;; - status) - "$CTL" status - ;; - restart|force-reload) - "$0" stop || true - "$0" start - ;; - live) - mkrundir || exit 1 - "$CTL" live - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|live}" - exit 1 -esac diff --git a/package.bak/ejabberd/check-erlang-lib b/package.bak/ejabberd/check-erlang-lib deleted file mode 100755 index 63f8bf1926..0000000000 --- a/package.bak/ejabberd/check-erlang-lib +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/sh -e -# Helper to bypass AC_ERLANG_CHECK_LIB -# -# Ejabberd releases do not download specific versions of its erlang -# dependencies. Instead, it clones the master branch of a git -# repository and asks erl to provide the library version. However, -# the target erl program cannot be called from the host. So, this -# script aims at finding the library version installed on the target, -# without calling erlang. - -usage() { - cat <&2 - exit 1 -} - -if [ $# -ne 1 ]; then - usage - exit 0 -else - library="$1" -fi - -target_dir="${TARGET_DIR:-output/target}" - -[ -d "$target_dir" ] || die "TARGET_DIR is not a directory. Please \ -specify the TARGET_DIR environment variable." - -case "$(ls -1d -- "$target_dir/usr/lib/erlang/lib/$library-"* | wc -l)" in - 0) - echo "not found" - ;; - 1) - echo "$target_dir/usr/lib/erlang/lib/$library-"* \ - | sed -e "s,^$target_dir,," - ;; - *) - die "Several versions of $library have been found. Please \ - remove the unused ones." - ;; -esac diff --git a/package.bak/ejabberd/ejabberd.hash b/package.bak/ejabberd/ejabberd.hash deleted file mode 100644 index 4284eec8fb..0000000000 --- a/package.bak/ejabberd/ejabberd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.process-one.net/downloads/ejabberd/16.01/ejabberd-16.01.tgz.md5 -md5 5e525c25c8f04287217b8a9522d7c942 ejabberd-16.01.tgz -# Locally computed -sha256 e2cc479d5870539b2e6756690b227969c88a541d464d1fc6e1cbf7270ad7d681 ejabberd-16.01.tgz diff --git a/package.bak/ejabberd/ejabberd.mk b/package.bak/ejabberd/ejabberd.mk deleted file mode 100644 index 1140eb1741..0000000000 --- a/package.bak/ejabberd/ejabberd.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# ejabberd -# -################################################################################ - -EJABBERD_VERSION = 16.01 -EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz -EJABBERD_SITE = https://www.process-one.net/downloads/ejabberd/$(EJABBERD_VERSION) -EJABBERD_LICENSE = GPLv2+ with OpenSSL exception -EJABBERD_LICENSE_FILES = COPYING -EJABBERD_DEPENDENCIES = getent openssl host-erlang-lager erlang-lager \ - erlang-p1-cache-tab erlang-p1-iconv erlang-p1-sip \ - erlang-p1-stringprep erlang-p1-xml erlang-p1-yaml erlang-p1-zlib - -# 0001-remove-make-targets-for-deps.patch updates Makefile.in -EJABBERD_USE_AUTOCONF = YES -EJABBERD_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -EJABBERD_DEPENDENCIES += linux-pam -endif - -EJABBERD_ERLANG_LIBS = sasl crypto public_key ssl mnesia inets compiler - -# Guess answers for these tests, configure will bail out otherwise -# saying error: cannot run test program while cross compiling. -EJABBERD_CONF_ENV = \ - ac_cv_erlang_root_dir="$(HOST_DIR)/usr/lib/erlang" \ - $(foreach lib,$(EJABBERD_ERLANG_LIBS), \ - ac_cv_erlang_lib_dir_$(lib)="`package/ejabberd/check-erlang-lib $(lib)`") - -define EJABBERD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) install -C $(@D) -endef - -# Delete HOST_DIR prefix from ERL path in ejabberctl script. -define EJABBERD_FIX_EJABBERDCTL - $(SED) 's,ERL=$(HOST_DIR),ERL=,' '$(TARGET_DIR)/usr/sbin/ejabberdctl' -endef - -EJABBERD_POST_INSTALL_TARGET_HOOKS += EJABBERD_FIX_EJABBERDCTL - -define EJABBERD_USERS - ejabberd -1 ejabberd -1 * /var/lib/ejabberd /bin/sh - ejabberd daemon -endef - -define EJABBERD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/ejabberd/S50ejabberd \ - $(TARGET_DIR)/etc/init.d/S50ejabberd -endef - -$(eval $(rebar-package)) diff --git a/package.bak/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch b/package.bak/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch deleted file mode 100644 index b9615ab34e..0000000000 --- a/package.bak/elf2flt/0001-elf2flt-fix-relocation-support-for-R_ARM_TARGET-type.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dedce8765d203c1c162a57e6259375e0b457173f Mon Sep 17 00:00:00 2001 -From: Greg Ungerer -Date: Fri, 19 Aug 2016 23:49:51 +1000 -Subject: [PATCH] elf2flt: fix relocation support for R_ARM_TARGET types - -R_ARM_TARGET1 (and I think R_ARM_TARGET2) relocation types should be -treated in the same way as R_ARM_ABS32. Fix them to write out the addend -to the flat binary in network byte order. - -Signed-off-by: Greg Ungerer -Tested-by: Waldemar Brodkorb - ---- - elf2flt.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/elf2flt.c b/elf2flt.c -index 5ae7dd9..3f31569 100644 ---- a/elf2flt.c -+++ b/elf2flt.c -@@ -1505,7 +1505,9 @@ DIS29_RELOCATION: - (((*p)->howto->type != R_ARM_PC24) && - ((*p)->howto->type != R_ARM_PLT32))) - tmp.c[i3] = (hl >> 24) & 0xff; -- if ((*p)->howto->type == R_ARM_ABS32) -+ if (((*p)->howto->type == R_ARM_ABS32) || -+ ((*p)->howto->type == R_ARM_TARGET1) || -+ ((*p)->howto->type == R_ARM_TARGET2)) - *(uint32_t *)r_mem = htonl(hl); - else - *(uint32_t *)r_mem = tmp.l; --- -1.9.1 - diff --git a/package.bak/elf2flt/Config.in.host b/package.bak/elf2flt/Config.in.host deleted file mode 100644 index b93795baa4..0000000000 --- a/package.bak/elf2flt/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_ELF2FLT - bool "Enable elf2flt support?" - depends on BR2_arm || BR2_sh || BR2_sparc || BR2_xtensa - depends on !BR2_USE_MMU - help - uCLinux uses a Binary Flat format commonly known as BFLT. It - is a relatively simple and lightweight executable format - based on the original a.out format. - - This option compiles the required tools and makes the required - modifications on your toolchain (linker). diff --git a/package.bak/elf2flt/elf2flt.hash b/package.bak/elf2flt/elf2flt.hash deleted file mode 100644 index 9c18ba5d3e..0000000000 --- a/package.bak/elf2flt/elf2flt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6a45a787a08da64f0f3036d3ae1865bc13f8f40d13f07511a2bf1b736acc4808 elf2flt-9dbc458c6122c495bbdec8dc975a15c9d39e5ff2.tar.gz diff --git a/package.bak/elf2flt/elf2flt.mk b/package.bak/elf2flt/elf2flt.mk deleted file mode 100644 index bd15ea2a15..0000000000 --- a/package.bak/elf2flt/elf2flt.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# elf2flt -# -################################################################################ - -ELF2FLT_VERSION = 9dbc458c6122c495bbdec8dc975a15c9d39e5ff2 -ELF2FLT_SITE = $(call github,uclinux-dev,elf2flt,$(ELF2FLT_VERSION)) -ELF2FLT_LICENSE = GPLv2+ -ELF2FLT_LICENSE_FILES = LICENSE.TXT - -HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib - -# It is not exactly a host variant, but more a cross variant, which is -# why we pass a special --target option. -HOST_ELF2FLT_CONF_OPTS = \ - --with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \ - --with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \ - --with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \ - --with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \ - --target=$(GNU_TARGET_NAME) \ - --disable-werror - -HOST_ELF2FLT_LIBS = -lz - -ifeq ($(BR2_GCC_ENABLE_LTO),y) -HOST_ELF2FLT_LIBS += -ldl -endif - -HOST_ELF2FLT_CONF_ENV = LIBS="$(HOST_ELF2FLT_LIBS)" - -$(eval $(host-autotools-package)) diff --git a/package.bak/elftosb/0001-fixes-includes.patch b/package.bak/elftosb/0001-fixes-includes.patch deleted file mode 100644 index eaf8ebad98..0000000000 --- a/package.bak/elftosb/0001-fixes-includes.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch uses system include files instead of a hard coded system path to fixe -potential compilation failure on systems that do not populate system header -files in /usr/include/.. - -Signed-off-by: Eric Jarrige ---- -Index: host-elftosb-10.12.01/common/stdafx.h -=================================================================== ---- host-elftosb-10.12.01.orig/common/stdafx.h 2012-01-30 12:43:35.000000000 +0100 -+++ host-elftosb-10.12.01/common/stdafx.h 2012-01-30 12:43:54.000000000 +0100 -@@ -27,7 +27,7 @@ - // For Linux systems only, types.h only defines the signed - // integer types. This is not professional code. - // Update: They are defined in the header files in the more recent version of redhat enterprise gcc. --#include "/usr/include/sys/types.h" -+#include - #include - //typedef unsigned long uint32_t; - //typedef unsigned short uint16_t; diff --git a/package.bak/elftosb/0002-force-cxx-compiler.patch b/package.bak/elftosb/0002-force-cxx-compiler.patch deleted file mode 100644 index 14df0dbe46..0000000000 --- a/package.bak/elftosb/0002-force-cxx-compiler.patch +++ /dev/null @@ -1,98 +0,0 @@ -Subject: [PATCH 1/1] elftosb: force host C++ compiler - -Because Freescale provides *.cpp sources and elftosb links again libstdc++, -force to use the host c++ compiler. - -This patch avoids the following error occurs: - -gcc AESKey.o Blob.o crc.o DataSource.o DataTarget.o ELFSourceFile.o EncoreBootImage.o EvalContext.o GHSSecInfo.o GlobMatcher.o HexValues.o Logging.o Operation.o OptionDictionary.o options.o OutputSection.o Random.o RijndaelCBCMAC.o rijndael.o SHA1.o SourceFile.o SRecordSourceFile.o stdafx.o StELFFile.o StExecutableImage.o StSRecordFile.o Value.o Version.o format_string.o ExcludesListMatcher.o SearchPath.o DataSourceImager.o IVTDataSource.o BootImageGenerator.o ConversionController.o ElftosbAST.o elftosb.o elftosb_lexer.o ElftosbLexer.o elftosb_parser.tab.o EncoreBootImageGenerator.o -lstdc++ -o elftosb -/usr/bin/ld: ElftosbAST.o: undefined reference to symbol 'powf@@GLIBC_2.2.5' -/usr/bin/ld: note: 'powf@@GLIBC_2.2.5' is defined in DSO /lib64/libm.so.6 so try adding it to the linker command line -/lib64/libm.so.6: could not read symbols: Invalid operation -collect2: error: ld returned 1 exit status - -When compiling with gcc and linking against libstdc++, ld uses libc instead of -libstdc++. -However, libc does not provide all functions libstdc++ does. -Indeed, maths functions are provided by libm, not libc. -Thus, elftosb should either: -- use gcc and link against libc and libm; -- or use g++ and link against libstdc++. - -Because elftosb is written in C++, this patch implement the sencond option, using -g++ and linking against libstdc++. - -Signed-off-by: Samuel Martin - ---- -Index: host-elftosb-10.12.01/makefile.rules -=================================================================== ---- host-elftosb-10.12.01.orig/makefile.rules 2012-06-09 21:12:23.557526100 +0200 -+++ host-elftosb-10.12.01/makefile.rules 2012-06-09 21:15:21.659894571 +0200 -@@ -15,6 +15,8 @@ - # UNAMES is going to be set to either "Linux" or "CYGWIN_NT-5.1" - UNAMES = $(shell uname -s) - -+CXX ?= g++ -+ - #******************************************************************************* - # Directories - -@@ -37,9 +39,9 @@ - #******************************************************************************* - # Build flags --# gcc Compiler flags -+# Compiler flags - # -g : Produce debugging information. - --CFLAGS = -g $(INC_PATH) -D${UNAMES} -+CXXFLAGS = -g $(INC_PATH) -D${UNAMES} - - #******************************************************************************* - # File lists -@@ -137,13 +139,13 @@ clean: - ${EXEC_FILE_ELFTOSB2} ${EXEC_FILE_SBTOOL} ${EXEC_FILE_KEYGEN} - - elftosb: ${OBJ_FILES_ELFTOSB2} -- gcc ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} -+ $(CXX) ${OBJ_FILES_ELFTOSB2} ${LIBS} -o ${EXEC_FILE_ELFTOSB2} - - sbtool: ${OBJ_FILES_SBTOOL} -- gcc ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} -+ $(CXX) ${OBJ_FILES_SBTOOL} ${LIBS} -o ${EXEC_FILE_SBTOOL} - - keygen: ${OBJ_FILES_KEYGEN} -- gcc ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} -+ $(CXX) ${OBJ_FILES_KEYGEN} ${LIBS} -o ${EXEC_FILE_KEYGEN} - - - #ifeq ("${UNAMES}", "Linux") -@@ -153,10 +155,10 @@ keygen: ${OBJ_FILES_KEYGEN} - .SUFFIXES : .c .cpp - - .c.o : -- gcc ${CFLAGS} -c $< -+ $(CC) ${CXXFLAGS} -c $< - - .cpp.o : -- gcc ${CFLAGS} -c $< -+ $(CXX) ${CXXFLAGS} -c $< - - #endif - -@@ -165,13 +167,13 @@ keygen: ${OBJ_FILES_KEYGEN} - - %.d: %.c - @set -e; \ -- $(CC) -MM $(CFLAGS) $< | \ -+ $(CC) -MM $(CXXFLAGS) $< | \ - sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \ - [ -s $@ ] || rm -f $@ - - %.d: %.cpp - @set -e; \ -- $(CC) -MM $(CFLAGS) $< | \ -+ $(CXX) -MM $(CXXFLAGS) $< | \ - sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@; \ - [ -s $@ ] || rm -f $@ - diff --git a/package.bak/elftosb/elftosb.hash b/package.bak/elftosb/elftosb.hash deleted file mode 100644 index 2b9f02b14f..0000000000 --- a/package.bak/elftosb/elftosb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://repository.timesys.com/buildsources/e/elftosb/elftosb-10.12.01/elftosb-10.12.01.tar.gz.md5sum -md5 e8005d606c1e0bb3507c82f6eceb3056 elftosb-10.12.01.tar.gz diff --git a/package.bak/elftosb/elftosb.mk b/package.bak/elftosb/elftosb.mk deleted file mode 100644 index ac9aa32538..0000000000 --- a/package.bak/elftosb/elftosb.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# elftosb -# -################################################################################ - -ELFTOSB_VERSION = 10.12.01 -ELFTOSB_SITE = http://repository.timesys.com/buildsources/e/elftosb/elftosb-$(ELFTOSB_VERSION) -ELFTOSB_LICENSE = BSD-3c -ELFTOSB_LICENSE_FILES = COPYING - -define HOST_ELFTOSB_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) all -endef - -define HOST_ELFTOSB_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bld/linux/elftosb $(HOST_DIR)/usr/bin/elftosb - $(INSTALL) -D -m 0755 $(@D)/bld/linux/keygen $(HOST_DIR)/usr/bin/keygen - $(INSTALL) -D -m 0755 $(@D)/bld/linux/sbtool $(HOST_DIR)/usr/bin/sbtool -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/elfutils/0002-disable-progs.patch b/package.bak/elfutils/0002-disable-progs.patch deleted file mode 100644 index ea6b934dfc..0000000000 --- a/package.bak/elfutils/0002-disable-progs.patch +++ /dev/null @@ -1,50 +0,0 @@ -Add a --{enable,disable}-progs configure option - -Add a --{enable,disable}-progs configuration option to elfutils. This -allows to selectively disable the compilation of the elfutils programs -(in which case only the libraries are built and installed). This is -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). - -Based on the former patch by Thomas Petazzoni. - -[Vincent: tweak patch for 0.166] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2016-03-31 09:48:08.000000000 +0100 -+++ b/configure.ac 2016-06-17 14:47:03.561704498 +0100 -@@ -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, -+ enable_progs=yes) -+AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) -+ - dnl zlib is mandatory. - save_LIBS="$LIBS" - LIBS= -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2016-01-12 12:49:19.000000000 +0000 -+++ b/Makefile.am 2016-06-17 14:48:02.585861468 +0100 -@@ -26,9 +26,13 @@ AM_MAKEFLAGS = --no-print-directory - - 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.bak/elfutils/0003-fts.patch b/package.bak/elfutils/0003-fts.patch deleted file mode 100644 index 0131b750f8..0000000000 --- a/package.bak/elfutils/0003-fts.patch +++ /dev/null @@ -1,1307 +0,0 @@ -Add an implementation of the fts_*() functions - -The fts_*() functions are optional in uClibc, and not compiled in our -default configuration. The best option would be to migrate this -elfutils code to the nftw family of functions, but it requires quite -some work. - -So we have several options here: - - *) Enable fts_*() functions in our default uClibc configuration. Not - nice since only one package needs them (the help text of uClibc - for fts_*() functions explicitly mention that they have been added - to be able to build elfutils). - - *) Use gnulib, but it is quite heavy to setup, requires modifications - to configure.ac, and other things. - - *) Copy the fts function from uClibc into elfutils source code. This - is the solution used below. uClibc is LGPL, and elfutils is - LGPL/GPL, so there should not be any licensing issue. - -Of course, the fts_*() functions are only built if they are not -already provided by the C library. - -Based on the former patch by Thomas Petazzoni. - -[Vincent: tweak patch for 0.166] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2016-06-17 14:47:03.561704498 +0100 -+++ b/configure.ac 2016-06-17 14:52:35.038200412 +0100 -@@ -259,6 +259,10 @@ AC_ARG_ENABLE([progs], - enable_progs=yes) - AM_CONDITIONAL(ENABLE_PROGS, test "$enable_progs" = yes) - -+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) -+ - dnl zlib is mandatory. - save_LIBS="$LIBS" - LIBS= -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 2016-06-17 14:57:26.649912084 +0100 -@@ -0,0 +1,1095 @@ -+/*- -+ * Copyright (c) 1990, 1993, 1994 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include "fts_.h" -+#include -+#include -+#include -+ -+/* Largest alignment size needed, minus one. -+ Usually long double is the worst case. */ -+#ifndef ALIGNBYTES -+#define ALIGNBYTES (__alignof__ (long double) - 1) -+#endif -+/* Align P to that size. */ -+#ifndef ALIGN -+#define ALIGN(p) (((unsigned long int) (p) + ALIGNBYTES) & ~ALIGNBYTES) -+#endif -+ -+ -+static FTSENT *fts_alloc (FTS *, const char *, size_t); -+static FTSENT *fts_build (FTS *, int); -+static void fts_lfree (FTSENT *); -+static void fts_load (FTS *, FTSENT *); -+static size_t fts_maxarglen (char * const *); -+static void fts_padjust (FTS *, FTSENT *); -+static int fts_palloc (FTS *, size_t); -+static FTSENT *fts_sort (FTS *, FTSENT *, int); -+static u_short fts_stat (FTS *, FTSENT *, int); -+static int fts_safe_changedir (FTS *, FTSENT *, int, const char *); -+ -+#ifndef MAX -+#define MAX(a, b) ({ __typeof__ (a) _a = (a); \ -+ __typeof__ (b) _b = (b); \ -+ _a > _b ? _a : _b; }) -+#endif -+ -+#define ISDOT(a) (a[0] == '.' && (!a[1] || (a[1] == '.' && !a[2]))) -+ -+#define CLR(opt) (sp->fts_options &= ~(opt)) -+#define ISSET(opt) (sp->fts_options & (opt)) -+#define SET(opt) (sp->fts_options |= (opt)) -+ -+#define FCHDIR(sp, fd) (!ISSET(FTS_NOCHDIR) && fchdir(fd)) -+ -+/* fts_build flags */ -+#define BCHILD 1 /* fts_children */ -+#define BNAMES 2 /* fts_children, names only */ -+#define BREAD 3 /* fts_read */ -+ -+FTS * -+fts_open( char * const *argv, register int options, -+ int (*compar) (const FTSENT **, const FTSENT **)) -+{ -+ register FTS *sp; -+ register FTSENT *p, *root; -+ register int nitems; -+ FTSENT *parent = NULL; -+ FTSENT *tmp = NULL; -+ -+ /* Options check. */ -+ if (options & ~FTS_OPTIONMASK) { -+ errno = EINVAL; -+ return (NULL); -+ } -+ -+ /* Allocate/initialize the stream */ -+ if ((sp = malloc((u_int)sizeof(FTS))) == NULL) -+ return (NULL); -+ memset(sp, 0, sizeof(FTS)); -+ sp->fts_compar = (int (*) (const void *, const void *)) compar; -+ sp->fts_options = options; -+ -+ /* Logical walks turn on NOCHDIR; symbolic links are too hard. */ -+ if (ISSET(FTS_LOGICAL)) -+ SET(FTS_NOCHDIR); -+ -+ /* -+ * Start out with 1K of path space, and enough, in any case, -+ * to hold the user's paths. -+ */ -+#ifndef MAXPATHLEN -+#define MAXPATHLEN 1024 -+#endif -+ size_t maxarglen = fts_maxarglen(argv); -+ if (fts_palloc(sp, MAX(maxarglen, MAXPATHLEN))) -+ goto mem1; -+ -+ /* Allocate/initialize root's parent. */ -+ if (*argv != NULL) { -+ if ((parent = fts_alloc(sp, "", 0)) == NULL) -+ goto mem2; -+ parent->fts_level = FTS_ROOTPARENTLEVEL; -+ } -+ -+ /* Allocate/initialize root(s). */ -+ for (root = NULL, nitems = 0; *argv != NULL; ++argv, ++nitems) { -+ /* Don't allow zero-length paths. */ -+ size_t len = strlen(*argv); -+ if (len == 0) { -+ errno = ENOENT; -+ goto mem3; -+ } -+ -+ p = fts_alloc(sp, *argv, len); -+ p->fts_level = FTS_ROOTLEVEL; -+ p->fts_parent = parent; -+ p->fts_accpath = p->fts_name; -+ p->fts_info = fts_stat(sp, p, ISSET(FTS_COMFOLLOW)); -+ -+ /* Command-line "." and ".." are real directories. */ -+ if (p->fts_info == FTS_DOT) -+ p->fts_info = FTS_D; -+ -+ /* -+ * If comparison routine supplied, traverse in sorted -+ * order; otherwise traverse in the order specified. -+ */ -+ if (compar) { -+ p->fts_link = root; -+ root = p; -+ } else { -+ p->fts_link = NULL; -+ if (root == NULL) -+ tmp = root = p; -+ else { -+ tmp->fts_link = p; -+ tmp = p; -+ } -+ } -+ } -+ if (compar && nitems > 1) -+ root = fts_sort(sp, root, nitems); -+ -+ /* -+ * Allocate a dummy pointer and make fts_read think that we've just -+ * finished the node before the root(s); set p->fts_info to FTS_INIT -+ * so that everything about the "current" node is ignored. -+ */ -+ if ((sp->fts_cur = fts_alloc(sp, "", 0)) == NULL) -+ goto mem3; -+ sp->fts_cur->fts_link = root; -+ sp->fts_cur->fts_info = FTS_INIT; -+ -+ /* -+ * If using chdir(2), grab a file descriptor pointing to dot to ensure -+ * that we can get back here; this could be avoided for some paths, -+ * but almost certainly not worth the effort. Slashes, symbolic links, -+ * and ".." are all fairly nasty problems. Note, if we can't get the -+ * descriptor we run anyway, just more slowly. -+ */ -+ if (!ISSET(FTS_NOCHDIR) -+ && (sp->fts_rfd = open(".", O_RDONLY, 0)) < 0) -+ SET(FTS_NOCHDIR); -+ -+ return (sp); -+ -+mem3: fts_lfree(root); -+ free(parent); -+mem2: free(sp->fts_path); -+mem1: free(sp); -+ return (NULL); -+} -+ -+static void -+fts_load(FTS *sp, register FTSENT *p) -+{ -+ register int len; -+ register char *cp; -+ -+ /* -+ * Load the stream structure for the next traversal. Since we don't -+ * actually enter the directory until after the preorder visit, set -+ * the fts_accpath field specially so the chdir gets done to the right -+ * place and the user can access the first node. From fts_open it's -+ * known that the path will fit. -+ */ -+ len = p->fts_pathlen = p->fts_namelen; -+ memmove(sp->fts_path, p->fts_name, len + 1); -+ if ((cp = strrchr(p->fts_name, '/')) && (cp != p->fts_name || cp[1])) { -+ len = strlen(++cp); -+ memmove(p->fts_name, cp, len + 1); -+ p->fts_namelen = len; -+ } -+ p->fts_accpath = p->fts_path = sp->fts_path; -+ sp->fts_dev = p->fts_dev; -+} -+ -+int -+fts_close(FTS *sp) -+{ -+ register FTSENT *freep, *p; -+ int saved_errno; -+ -+ /* -+ * This still works if we haven't read anything -- the dummy structure -+ * points to the root list, so we step through to the end of the root -+ * list which has a valid parent pointer. -+ */ -+ if (sp->fts_cur) { -+ for (p = sp->fts_cur; p->fts_level >= FTS_ROOTLEVEL;) { -+ freep = p; -+ p = p->fts_link != NULL ? p->fts_link : p->fts_parent; -+ free(freep); -+ } -+ free(p); -+ } -+ -+ /* Free up child linked list, sort array, path buffer. */ -+ if (sp->fts_child) -+ fts_lfree(sp->fts_child); -+ free(sp->fts_array); -+ free(sp->fts_path); -+ -+ /* Return to original directory, save errno if necessary. */ -+ if (!ISSET(FTS_NOCHDIR)) { -+ saved_errno = fchdir(sp->fts_rfd) ? errno : 0; -+ (void)close(sp->fts_rfd); -+ -+ /* Set errno and return. */ -+ if (saved_errno != 0) { -+ /* Free up the stream pointer. */ -+ free(sp); -+ errno = saved_errno; -+ return (-1); -+ } -+ } -+ -+ /* Free up the stream pointer. */ -+ free(sp); -+ return (0); -+} -+ -+/* -+ * Special case of "/" at the end of the path so that slashes aren't -+ * appended which would cause paths to be written as "....//foo". -+ */ -+#define NAPPEND(p) \ -+ (p->fts_path[p->fts_pathlen - 1] == '/' \ -+ ? p->fts_pathlen - 1 : p->fts_pathlen) -+ -+FTSENT * -+fts_read(register FTS *sp) -+{ -+ register FTSENT *p, *tmp; -+ register int instr; -+ register char *t; -+ int saved_errno; -+ -+ /* If finished or unrecoverable error, return NULL. */ -+ if (sp->fts_cur == NULL || ISSET(FTS_STOP)) -+ return (NULL); -+ -+ /* Set current node pointer. */ -+ p = sp->fts_cur; -+ -+ /* Save and zero out user instructions. */ -+ instr = p->fts_instr; -+ p->fts_instr = FTS_NOINSTR; -+ -+ /* Any type of file may be re-visited; re-stat and re-turn. */ -+ if (instr == FTS_AGAIN) { -+ p->fts_info = fts_stat(sp, p, 0); -+ return (p); -+ } -+ -+ /* -+ * Following a symlink -- SLNONE test allows application to see -+ * SLNONE and recover. If indirecting through a symlink, have -+ * keep a pointer to current location. If unable to get that -+ * pointer, follow fails. -+ */ -+ if (instr == FTS_FOLLOW && -+ (p->fts_info == FTS_SL || p->fts_info == FTS_SLNONE)) { -+ p->fts_info = fts_stat(sp, p, 1); -+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -+ if ((p->fts_symfd = open(".", O_RDONLY, 0)) < 0) { -+ p->fts_errno = errno; -+ p->fts_info = FTS_ERR; -+ } else -+ p->fts_flags |= FTS_SYMFOLLOW; -+ } -+ return (p); -+ } -+ -+ /* Directory in pre-order. */ -+ if (p->fts_info == FTS_D) { -+ /* If skipped or crossed mount point, do post-order visit. */ -+ if (instr == FTS_SKIP || -+ (ISSET(FTS_XDEV) && p->fts_dev != sp->fts_dev)) { -+ if (p->fts_flags & FTS_SYMFOLLOW) -+ (void)close(p->fts_symfd); -+ if (sp->fts_child) { -+ fts_lfree(sp->fts_child); -+ sp->fts_child = NULL; -+ } -+ p->fts_info = FTS_DP; -+ return (p); -+ } -+ -+ /* Rebuild if only read the names and now traversing. */ -+ if (sp->fts_child != NULL && ISSET(FTS_NAMEONLY)) { -+ CLR(FTS_NAMEONLY); -+ fts_lfree(sp->fts_child); -+ sp->fts_child = NULL; -+ } -+ -+ /* -+ * Cd to the subdirectory. -+ * -+ * If have already read and now fail to chdir, whack the list -+ * to make the names come out right, and set the parent errno -+ * so the application will eventually get an error condition. -+ * Set the FTS_DONTCHDIR flag so that when we logically change -+ * directories back to the parent we don't do a chdir. -+ * -+ * If haven't read do so. If the read fails, fts_build sets -+ * FTS_STOP or the fts_info field of the node. -+ */ -+ if (sp->fts_child != NULL) { -+ if (fts_safe_changedir(sp, p, -1, p->fts_accpath)) { -+ p->fts_errno = errno; -+ p->fts_flags |= FTS_DONTCHDIR; -+ for (p = sp->fts_child; p != NULL; -+ p = p->fts_link) -+ p->fts_accpath = -+ p->fts_parent->fts_accpath; -+ } -+ } else if ((sp->fts_child = fts_build(sp, BREAD)) == NULL) { -+ if (ISSET(FTS_STOP)) -+ return (NULL); -+ return (p); -+ } -+ p = sp->fts_child; -+ sp->fts_child = NULL; -+ sp->fts_cur = p; -+ goto name; -+ } -+ -+ /* Move to the next node on this level. */ -+next: tmp = p; -+ if ((p = p->fts_link) != NULL) { -+ sp->fts_cur = p; -+ free(tmp); -+ -+ /* -+ * If reached the top, return to the original directory (or -+ * the root of the tree), and load the paths for the next root. -+ */ -+ if (p->fts_level == FTS_ROOTLEVEL) { -+ if (FCHDIR(sp, sp->fts_rfd)) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ fts_load(sp, p); -+ return p; -+ } -+ -+ /* -+ * User may have called fts_set on the node. If skipped, -+ * ignore. If followed, get a file descriptor so we can -+ * get back if necessary. -+ */ -+ if (p->fts_instr == FTS_SKIP) -+ goto next; -+ if (p->fts_instr == FTS_FOLLOW) { -+ p->fts_info = fts_stat(sp, p, 1); -+ if (p->fts_info == FTS_D && !ISSET(FTS_NOCHDIR)) { -+ if ((p->fts_symfd = -+ open(".", O_RDONLY, 0)) < 0) { -+ p->fts_errno = errno; -+ p->fts_info = FTS_ERR; -+ } else -+ p->fts_flags |= FTS_SYMFOLLOW; -+ } -+ p->fts_instr = FTS_NOINSTR; -+ } -+ -+name: t = sp->fts_path + NAPPEND(p->fts_parent); -+ *t++ = '/'; -+ memmove(t, p->fts_name, p->fts_namelen + 1); -+ return p; -+ } -+ -+ /* Move up to the parent node. */ -+ p = tmp->fts_parent; -+ sp->fts_cur = p; -+ free(tmp); -+ -+ if (p->fts_level == FTS_ROOTPARENTLEVEL) { -+ /* -+ * Done; free everything up and set errno to 0 so the user -+ * can distinguish between error and EOF. -+ */ -+ free(p); -+ errno = 0; -+ return (sp->fts_cur = NULL); -+ } -+ -+ /* NUL terminate the pathname. */ -+ sp->fts_path[p->fts_pathlen] = '\0'; -+ -+ /* -+ * Return to the parent directory. If at a root node or came through -+ * a symlink, go back through the file descriptor. Otherwise, cd up -+ * one directory. -+ */ -+ if (p->fts_level == FTS_ROOTLEVEL) { -+ if (FCHDIR(sp, sp->fts_rfd)) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ } else if (p->fts_flags & FTS_SYMFOLLOW) { -+ if (FCHDIR(sp, p->fts_symfd)) { -+ saved_errno = errno; -+ (void)close(p->fts_symfd); -+ errno = saved_errno; -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ (void)close(p->fts_symfd); -+ } else if (!(p->fts_flags & FTS_DONTCHDIR) && -+ fts_safe_changedir(sp, p->fts_parent, -1, "..")) { -+ SET(FTS_STOP); -+ return (NULL); -+ } -+ p->fts_info = p->fts_errno ? FTS_ERR : FTS_DP; -+ return p; -+} -+ -+/* -+ * Fts_set takes the stream as an argument although it's not used in this -+ * implementation; it would be necessary if anyone wanted to add global -+ * semantics to fts using fts_set. An error return is allowed for similar -+ * reasons. -+ */ -+/* ARGSUSED */ -+int -+fts_set(FTS *sp, FTSENT *p, int instr) -+{ -+ if (instr != 0 && instr != FTS_AGAIN && instr != FTS_FOLLOW && -+ instr != FTS_NOINSTR && instr != FTS_SKIP) { -+ errno = EINVAL; -+ return (1); -+ } -+ p->fts_instr = instr; -+ return (0); -+} -+ -+FTSENT * -+fts_children(register FTS *sp, int instr) -+{ -+ register FTSENT *p; -+ int fd; -+ -+ if (instr != 0 && instr != FTS_NAMEONLY) { -+ errno = EINVAL; -+ return (NULL); -+ } -+ -+ /* Set current node pointer. */ -+ p = sp->fts_cur; -+ -+ /* -+ * Errno set to 0 so user can distinguish empty directory from -+ * an error. -+ */ -+ errno = 0; -+ -+ /* Fatal errors stop here. */ -+ if (ISSET(FTS_STOP)) -+ return (NULL); -+ -+ /* Return logical hierarchy of user's arguments. */ -+ if (p->fts_info == FTS_INIT) -+ return (p->fts_link); -+ -+ /* -+ * If not a directory being visited in pre-order, stop here. Could -+ * allow FTS_DNR, assuming the user has fixed the problem, but the -+ * same effect is available with FTS_AGAIN. -+ */ -+ if (p->fts_info != FTS_D /* && p->fts_info != FTS_DNR */) -+ return (NULL); -+ -+ /* Free up any previous child list. */ -+ if (sp->fts_child != NULL) -+ fts_lfree(sp->fts_child); -+ -+ if (instr == FTS_NAMEONLY) { -+ SET(FTS_NAMEONLY); -+ instr = BNAMES; -+ } else -+ instr = BCHILD; -+ -+ /* -+ * If using chdir on a relative path and called BEFORE fts_read does -+ * its chdir to the root of a traversal, we can lose -- we need to -+ * chdir into the subdirectory, and we don't know where the current -+ * directory is, so we can't get back so that the upcoming chdir by -+ * fts_read will work. -+ */ -+ if (p->fts_level != FTS_ROOTLEVEL || p->fts_accpath[0] == '/' || -+ ISSET(FTS_NOCHDIR)) -+ return (sp->fts_child = fts_build(sp, instr)); -+ -+ if ((fd = open(".", O_RDONLY, 0)) < 0) -+ return (NULL); -+ sp->fts_child = fts_build(sp, instr); -+ if (fchdir(fd)) -+ return (NULL); -+ (void)close(fd); -+ return (sp->fts_child); -+} -+ -+/* -+ * This is the tricky part -- do not casually change *anything* in here. The -+ * idea is to build the linked list of entries that are used by fts_children -+ * and fts_read. There are lots of special cases. -+ * -+ * The real slowdown in walking the tree is the stat calls. If FTS_NOSTAT is -+ * set and it's a physical walk (so that symbolic links can't be directories), -+ * we can do things quickly. First, if it's a 4.4BSD file system, the type -+ * of the file is in the directory entry. Otherwise, we assume that the number -+ * of subdirectories in a node is equal to the number of links to the parent. -+ * The former skips all stat calls. The latter skips stat calls in any leaf -+ * directories and for any files after the subdirectories in the directory have -+ * been found, cutting the stat calls by about 2/3. -+ */ -+static FTSENT * -+fts_build(register FTS *sp, int type) -+{ -+ register struct dirent *dp; -+ register FTSENT *p, *head; -+ register int nitems; -+ FTSENT *cur, *tail; -+ DIR *dirp; -+ void *oldaddr; -+ int cderrno, descend, len, level, nlinks, saved_errno, -+ nostat, doadjust; -+ size_t maxlen; -+ char *cp; -+ -+ /* Set current node pointer. */ -+ cur = sp->fts_cur; -+ -+ /* -+ * Open the directory for reading. If this fails, we're done. -+ * If being called from fts_read, set the fts_info field. -+ */ -+#if defined FTS_WHITEOUT && 0 -+ if (ISSET(FTS_WHITEOUT)) -+ oflag = DTF_NODUP|DTF_REWIND; -+ else -+ oflag = DTF_HIDEW|DTF_NODUP|DTF_REWIND; -+#else -+# define opendir2(path, flag) opendir(path) -+#endif -+ if ((dirp = opendir2(cur->fts_accpath, oflag)) == NULL) { -+ if (type == BREAD) { -+ cur->fts_info = FTS_DNR; -+ cur->fts_errno = errno; -+ } -+ return (NULL); -+ } -+ -+ /* -+ * Nlinks is the number of possible entries of type directory in the -+ * directory if we're cheating on stat calls, 0 if we're not doing -+ * any stat calls at all, -1 if we're doing stats on everything. -+ */ -+ if (type == BNAMES) { -+ nlinks = 0; -+ /* Be quiet about nostat, GCC. */ -+ nostat = 0; -+ } else if (ISSET(FTS_NOSTAT) && ISSET(FTS_PHYSICAL)) { -+ nlinks = cur->fts_nlink - (ISSET(FTS_SEEDOT) ? 0 : 2); -+ nostat = 1; -+ } else { -+ nlinks = -1; -+ nostat = 0; -+ } -+ -+#ifdef notdef -+ (void)printf("nlinks == %d (cur: %d)\n", nlinks, cur->fts_nlink); -+ (void)printf("NOSTAT %d PHYSICAL %d SEEDOT %d\n", -+ ISSET(FTS_NOSTAT), ISSET(FTS_PHYSICAL), ISSET(FTS_SEEDOT)); -+#endif -+ /* -+ * If we're going to need to stat anything or we want to descend -+ * and stay in the directory, chdir. If this fails we keep going, -+ * but set a flag so we don't chdir after the post-order visit. -+ * We won't be able to stat anything, but we can still return the -+ * names themselves. Note, that since fts_read won't be able to -+ * chdir into the directory, it will have to return different path -+ * names than before, i.e. "a/b" instead of "b". Since the node -+ * has already been visited in pre-order, have to wait until the -+ * post-order visit to return the error. There is a special case -+ * here, if there was nothing to stat then it's not an error to -+ * not be able to stat. This is all fairly nasty. If a program -+ * needed sorted entries or stat information, they had better be -+ * checking FTS_NS on the returned nodes. -+ */ -+ cderrno = 0; -+ if (nlinks || type == BREAD) { -+ if (fts_safe_changedir(sp, cur, dirfd(dirp), NULL)) { -+ if (nlinks && type == BREAD) -+ cur->fts_errno = errno; -+ cur->fts_flags |= FTS_DONTCHDIR; -+ descend = 0; -+ cderrno = errno; -+ (void)closedir(dirp); -+ dirp = NULL; -+ } else -+ descend = 1; -+ } else -+ descend = 0; -+ -+ /* -+ * Figure out the max file name length that can be stored in the -+ * current path -- the inner loop allocates more path as necessary. -+ * We really wouldn't have to do the maxlen calculations here, we -+ * could do them in fts_read before returning the path, but it's a -+ * lot easier here since the length is part of the dirent structure. -+ * -+ * If not changing directories set a pointer so that can just append -+ * each new name into the path. -+ */ -+ len = NAPPEND(cur); -+ if (ISSET(FTS_NOCHDIR)) { -+ cp = sp->fts_path + len; -+ *cp++ = '/'; -+ } else { -+ /* GCC, you're too verbose. */ -+ cp = NULL; -+ } -+ len++; -+ maxlen = sp->fts_pathlen - len; -+ -+ level = cur->fts_level + 1; -+ -+ /* Read the directory, attaching each entry to the `link' pointer. */ -+ doadjust = 0; -+ for (head = tail = NULL, nitems = 0; dirp && (dp = readdir(dirp));) { -+ if (!ISSET(FTS_SEEDOT) && ISDOT(dp->d_name)) -+ continue; -+ -+ if ((p = fts_alloc(sp, dp->d_name, _D_EXACT_NAMLEN (dp))) == NULL) -+ goto mem1; -+ if (_D_EXACT_NAMLEN (dp) >= maxlen) {/* include space for NUL */ -+ oldaddr = sp->fts_path; -+ if (fts_palloc(sp, _D_EXACT_NAMLEN (dp) + len + 1)) { -+ /* -+ * No more memory for path or structures. Save -+ * errno, free up the current structure and the -+ * structures already allocated. -+ */ -+mem1: saved_errno = errno; -+ free(p); -+ fts_lfree(head); -+ (void)closedir(dirp); -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ errno = saved_errno; -+ return (NULL); -+ } -+ /* Did realloc() change the pointer? */ -+ if (oldaddr != sp->fts_path) { -+ doadjust = 1; -+ if (ISSET(FTS_NOCHDIR)) -+ cp = sp->fts_path + len; -+ } -+ maxlen = sp->fts_pathlen - len; -+ } -+ -+ if (len + _D_EXACT_NAMLEN (dp) >= USHRT_MAX) { -+ /* -+ * In an FTSENT, fts_pathlen is a u_short so it is -+ * possible to wraparound here. If we do, free up -+ * the current structure and the structures already -+ * allocated, then error out with ENAMETOOLONG. -+ */ -+ free(p); -+ fts_lfree(head); -+ (void)closedir(dirp); -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ errno = ENAMETOOLONG; -+ return (NULL); -+ } -+ p->fts_level = level; -+ p->fts_parent = sp->fts_cur; -+ p->fts_pathlen = len + _D_EXACT_NAMLEN (dp); -+ -+#if defined FTS_WHITEOUT && 0 -+ if (dp->d_type == DT_WHT) -+ p->fts_flags |= FTS_ISW; -+#endif -+ -+#if 0 -+ /* Unreachable code. cderrno is only ever set to a nonnull -+ value if dirp is closed at the same time. But then we -+ cannot enter this loop. */ -+ if (cderrno) { -+ if (nlinks) { -+ p->fts_info = FTS_NS; -+ p->fts_errno = cderrno; -+ } else -+ p->fts_info = FTS_NSOK; -+ p->fts_accpath = cur->fts_accpath; -+ } else -+#endif -+ if (nlinks == 0 -+#if defined DT_DIR && defined _DIRENT_HAVE_D_TYPE -+ || (nostat && -+ dp->d_type != DT_DIR && dp->d_type != DT_UNKNOWN) -+#endif -+ ) { -+ p->fts_accpath = -+ ISSET(FTS_NOCHDIR) ? p->fts_path : p->fts_name; -+ p->fts_info = FTS_NSOK; -+ } else { -+ /* Build a file name for fts_stat to stat. */ -+ if (ISSET(FTS_NOCHDIR)) { -+ p->fts_accpath = p->fts_path; -+ memmove(cp, p->fts_name, p->fts_namelen + 1); -+ } else -+ p->fts_accpath = p->fts_name; -+ /* Stat it. */ -+ p->fts_info = fts_stat(sp, p, 0); -+ -+ /* Decrement link count if applicable. */ -+ if (nlinks > 0 && (p->fts_info == FTS_D || -+ p->fts_info == FTS_DC || p->fts_info == FTS_DOT)) -+ --nlinks; -+ } -+ -+ /* We walk in directory order so "ls -f" doesn't get upset. */ -+ p->fts_link = NULL; -+ if (head == NULL) -+ head = tail = p; -+ else { -+ tail->fts_link = p; -+ tail = p; -+ } -+ ++nitems; -+ } -+ if (dirp) -+ (void)closedir(dirp); -+ -+ /* -+ * If realloc() changed the address of the path, adjust the -+ * addresses for the rest of the tree and the dir list. -+ */ -+ if (doadjust) -+ fts_padjust(sp, head); -+ -+ /* -+ * If not changing directories, reset the path back to original -+ * state. -+ */ -+ if (ISSET(FTS_NOCHDIR)) { -+ if (len == sp->fts_pathlen || nitems == 0) -+ --cp; -+ *cp = '\0'; -+ } -+ -+ /* -+ * If descended after called from fts_children or after called from -+ * fts_read and nothing found, get back. At the root level we use -+ * the saved fd; if one of fts_open()'s arguments is a relative path -+ * to an empty directory, we wind up here with no other way back. If -+ * can't get back, we're done. -+ */ -+ if (descend && (type == BCHILD || !nitems) && -+ (cur->fts_level == FTS_ROOTLEVEL ? -+ FCHDIR(sp, sp->fts_rfd) : -+ fts_safe_changedir(sp, cur->fts_parent, -1, ".."))) { -+ cur->fts_info = FTS_ERR; -+ SET(FTS_STOP); -+ fts_lfree(head); -+ return (NULL); -+ } -+ -+ /* If didn't find anything, return NULL. */ -+ if (!nitems) { -+ if (type == BREAD) -+ cur->fts_info = FTS_DP; -+ fts_lfree(head); -+ return (NULL); -+ } -+ -+ /* Sort the entries. */ -+ if (sp->fts_compar && nitems > 1) -+ head = fts_sort(sp, head, nitems); -+ return (head); -+} -+ -+static u_short -+fts_stat(FTS *sp, register FTSENT *p, int follow) -+{ -+ register FTSENT *t; -+ register dev_t dev; -+ register ino_t ino; -+ struct stat *sbp, sb; -+ int saved_errno; -+ -+ /* If user needs stat info, stat buffer already allocated. */ -+ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; -+ -+#if defined FTS_WHITEOUT && 0 -+ /* check for whiteout */ -+ if (p->fts_flags & FTS_ISW) { -+ if (sbp != &sb) { -+ memset(sbp, '\0', sizeof (*sbp)); -+ sbp->st_mode = S_IFWHT; -+ } -+ return (FTS_W); -+ } -+#endif -+ -+ /* -+ * If doing a logical walk, or application requested FTS_FOLLOW, do -+ * a stat(2). If that fails, check for a non-existent symlink. If -+ * fail, set the errno from the stat call. -+ */ -+ if (ISSET(FTS_LOGICAL) || follow) { -+ if (stat(p->fts_accpath, sbp)) { -+ saved_errno = errno; -+ if (!lstat(p->fts_accpath, sbp)) { -+ errno = 0; -+ return (FTS_SLNONE); -+ } -+ p->fts_errno = saved_errno; -+ goto err; -+ } -+ } else if (lstat(p->fts_accpath, sbp)) { -+ p->fts_errno = errno; -+err: memset(sbp, 0, sizeof(struct stat)); -+ return (FTS_NS); -+ } -+ -+ if (S_ISDIR(sbp->st_mode)) { -+ /* -+ * Set the device/inode. Used to find cycles and check for -+ * crossing mount points. Also remember the link count, used -+ * in fts_build to limit the number of stat calls. It is -+ * understood that these fields are only referenced if fts_info -+ * is set to FTS_D. -+ */ -+ dev = p->fts_dev = sbp->st_dev; -+ ino = p->fts_ino = sbp->st_ino; -+ p->fts_nlink = sbp->st_nlink; -+ -+ if (ISDOT(p->fts_name)) -+ return (FTS_DOT); -+ -+ /* -+ * Cycle detection is done by brute force when the directory -+ * is first encountered. If the tree gets deep enough or the -+ * number of symbolic links to directories is high enough, -+ * something faster might be worthwhile. -+ */ -+ for (t = p->fts_parent; -+ t->fts_level >= FTS_ROOTLEVEL; t = t->fts_parent) -+ if (ino == t->fts_ino && dev == t->fts_dev) { -+ p->fts_cycle = t; -+ return (FTS_DC); -+ } -+ return (FTS_D); -+ } -+ if (S_ISLNK(sbp->st_mode)) -+ return (FTS_SL); -+ if (S_ISREG(sbp->st_mode)) -+ return (FTS_F); -+ return (FTS_DEFAULT); -+} -+ -+static FTSENT * -+fts_sort(FTS *sp, FTSENT *head, register int nitems) -+{ -+ register FTSENT **ap, *p; -+ -+ /* -+ * Construct an array of pointers to the structures and call qsort(3). -+ * Reassemble the array in the order returned by qsort. If unable to -+ * sort for memory reasons, return the directory entries in their -+ * current order. Allocate enough space for the current needs plus -+ * 40 so don't realloc one entry at a time. -+ */ -+ if (nitems > sp->fts_nitems) { -+ struct _ftsent **a; -+ -+ sp->fts_nitems = nitems + 40; -+ if ((a = realloc(sp->fts_array, -+ (size_t)(sp->fts_nitems * sizeof(FTSENT *)))) == NULL) { -+ free(sp->fts_array); -+ sp->fts_array = NULL; -+ sp->fts_nitems = 0; -+ return (head); -+ } -+ sp->fts_array = a; -+ } -+ for (ap = sp->fts_array, p = head; p; p = p->fts_link) -+ *ap++ = p; -+ qsort((void *)sp->fts_array, nitems, sizeof(FTSENT *), sp->fts_compar); -+ for (head = *(ap = sp->fts_array); --nitems; ++ap) -+ ap[0]->fts_link = ap[1]; -+ ap[0]->fts_link = NULL; -+ return (head); -+} -+ -+static FTSENT * -+fts_alloc(FTS *sp, const char *name, size_t namelen) -+{ -+ register FTSENT *p; -+ size_t len; -+ -+ /* -+ * The file name is a variable length array and no stat structure is -+ * necessary if the user has set the nostat bit. Allocate the FTSENT -+ * structure, the file name and the stat structure in one chunk, but -+ * be careful that the stat structure is reasonably aligned. Since the -+ * fts_name field is declared to be of size 1, the fts_name pointer is -+ * namelen + 2 before the first possible address of the stat structure. -+ */ -+ len = sizeof(FTSENT) + namelen; -+ if (!ISSET(FTS_NOSTAT)) -+ len += sizeof(struct stat) + ALIGNBYTES; -+ if ((p = malloc(len)) == NULL) -+ return (NULL); -+ -+ /* Copy the name and guarantee NUL termination. */ -+ memmove(p->fts_name, name, namelen); -+ p->fts_name[namelen] = '\0'; -+ -+ if (!ISSET(FTS_NOSTAT)) -+ p->fts_statp = (struct stat *)ALIGN(p->fts_name + namelen + 2); -+ p->fts_namelen = namelen; -+ p->fts_path = sp->fts_path; -+ p->fts_errno = 0; -+ p->fts_flags = 0; -+ p->fts_instr = FTS_NOINSTR; -+ p->fts_number = 0; -+ p->fts_pointer = NULL; -+ return (p); -+} -+ -+static void -+fts_lfree(register FTSENT *head) -+{ -+ register FTSENT *p; -+ -+ /* Free a linked list of structures. */ -+ while ((p = head)) { -+ head = head->fts_link; -+ free(p); -+ } -+} -+ -+/* -+ * Allow essentially unlimited paths; find, rm, ls should all work on any tree. -+ * Most systems will allow creation of paths much longer than MAXPATHLEN, even -+ * though the kernel won't resolve them. Add the size (not just what's needed) -+ * plus 256 bytes so don't realloc the path 2 bytes at a time. -+ */ -+static int -+fts_palloc(FTS *sp, size_t more) -+{ -+ char *p; -+ -+ sp->fts_pathlen += more + 256; -+ /* -+ * Check for possible wraparound. In an FTS, fts_pathlen is -+ * a signed int but in an FTSENT it is an unsigned short. -+ * We limit fts_pathlen to USHRT_MAX to be safe in both cases. -+ */ -+ if (sp->fts_pathlen < 0 || sp->fts_pathlen >= USHRT_MAX) { -+ free(sp->fts_path); -+ sp->fts_path = NULL; -+ errno = ENAMETOOLONG; -+ return (1); -+ } -+ p = realloc(sp->fts_path, sp->fts_pathlen); -+ if (p == NULL) { -+ free(sp->fts_path); -+ sp->fts_path = NULL; -+ return 1; -+ } -+ sp->fts_path = p; -+ return 0; -+} -+ -+/* -+ * When the path is realloc'd, have to fix all of the pointers in structures -+ * already returned. -+ */ -+static void -+fts_padjust(FTS *sp, FTSENT *head) -+{ -+ FTSENT *p; -+ char *addr = sp->fts_path; -+ -+#define ADJUST(p) do { \ -+ if ((p)->fts_accpath != (p)->fts_name) { \ -+ (p)->fts_accpath = \ -+ (char *)addr + ((p)->fts_accpath - (p)->fts_path); \ -+ } \ -+ (p)->fts_path = addr; \ -+} while (0) -+ /* Adjust the current set of children. */ -+ for (p = sp->fts_child; p; p = p->fts_link) -+ ADJUST(p); -+ -+ /* Adjust the rest of the tree, including the current level. */ -+ for (p = head; p->fts_level >= FTS_ROOTLEVEL;) { -+ ADJUST(p); -+ p = p->fts_link ? p->fts_link : p->fts_parent; -+ } -+} -+ -+static size_t -+fts_maxarglen(char * const *argv) -+{ -+ size_t len, max; -+ -+ for (max = 0; *argv; ++argv) -+ if ((len = strlen(*argv)) > max) -+ max = len; -+ return (max + 1); -+} -+ -+/* -+ * Change to dir specified by fd or p->fts_accpath without getting -+ * tricked by someone changing the world out from underneath us. -+ * Assumes p->fts_dev and p->fts_ino are filled in. -+ */ -+static int -+fts_safe_changedir(FTS *sp, FTSENT *p, int fd, const char *path) -+{ -+ int ret, oerrno, newfd; -+ struct stat64 sb; -+ -+ newfd = fd; -+ if (ISSET(FTS_NOCHDIR)) -+ return (0); -+ if (fd < 0 && (newfd = open(path, O_RDONLY, 0)) < 0) -+ return (-1); -+ if (fstat64(newfd, &sb)) { -+ ret = -1; -+ goto bail; -+ } -+ if (p->fts_dev != sb.st_dev || p->fts_ino != sb.st_ino) { -+ errno = ENOENT; /* disinformation */ -+ ret = -1; -+ goto bail; -+ } -+ ret = fchdir(newfd); -+bail: -+ oerrno = errno; -+ if (fd < 0) -+ (void)close(newfd); -+ errno = oerrno; -+ return (ret); -+} -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 2016-06-17 14:58:42.003387566 +0100 -@@ -0,0 +1,131 @@ -+/* -+ * Copyright (c) 1989, 1993 -+ * The Regents of the University of California. All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * 4. Neither the name of the University nor the names of its contributors -+ * may be used to endorse or promote products derived from this software -+ * without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ * @(#)fts.h 8.3 (Berkeley) 8/14/94 -+ */ -+ -+#ifndef _FTS_H -+#define _FTS_H 1 -+ -+#include -+#include -+ -+/* The fts interface is incompatible with the LFS interface which -+ transparently uses the 64-bit file access functions. */ -+#ifdef __USE_FILE_OFFSET64 -+# error " cannot be used with -D_FILE_OFFSET_BITS==64" -+#endif -+ -+ -+typedef struct { -+ struct _ftsent *fts_cur; /* current node */ -+ struct _ftsent *fts_child; /* linked list of children */ -+ struct _ftsent **fts_array; /* sort array */ -+ dev_t fts_dev; /* starting device # */ -+ char *fts_path; /* path for this descent */ -+ int fts_rfd; /* fd for root */ -+ int fts_pathlen; /* sizeof(path) */ -+ int fts_nitems; /* elements in the sort array */ -+ int (*fts_compar) (const void *, const void *); /* compare fn */ -+ -+#define FTS_COMFOLLOW 0x0001 /* follow command line symlinks */ -+#define FTS_LOGICAL 0x0002 /* logical walk */ -+#define FTS_NOCHDIR 0x0004 /* don't change directories */ -+#define FTS_NOSTAT 0x0008 /* don't get stat info */ -+#define FTS_PHYSICAL 0x0010 /* physical walk */ -+#define FTS_SEEDOT 0x0020 /* return dot and dot-dot */ -+#define FTS_XDEV 0x0040 /* don't cross devices */ -+#define FTS_WHITEOUT 0x0080 /* return whiteout information */ -+#define FTS_OPTIONMASK 0x00ff /* valid user option mask */ -+ -+#define FTS_NAMEONLY 0x0100 /* (private) child names only */ -+#define FTS_STOP 0x0200 /* (private) unrecoverable error */ -+ int fts_options; /* fts_open options, global flags */ -+} FTS; -+ -+typedef struct _ftsent { -+ struct _ftsent *fts_cycle; /* cycle node */ -+ struct _ftsent *fts_parent; /* parent directory */ -+ struct _ftsent *fts_link; /* next file in directory */ -+ long fts_number; /* local numeric value */ -+ void *fts_pointer; /* local address value */ -+ char *fts_accpath; /* access path */ -+ char *fts_path; /* root path */ -+ int fts_errno; /* errno for this node */ -+ int fts_symfd; /* fd for symlink */ -+ u_short fts_pathlen; /* strlen(fts_path) */ -+ u_short fts_namelen; /* strlen(fts_name) */ -+ -+ ino_t fts_ino; /* inode */ -+ dev_t fts_dev; /* device */ -+ nlink_t fts_nlink; /* link count */ -+ -+#define FTS_ROOTPARENTLEVEL -1 -+#define FTS_ROOTLEVEL 0 -+ short fts_level; /* depth (-1 to N) */ -+ -+#define FTS_D 1 /* preorder directory */ -+#define FTS_DC 2 /* directory that causes cycles */ -+#define FTS_DEFAULT 3 /* none of the above */ -+#define FTS_DNR 4 /* unreadable directory */ -+#define FTS_DOT 5 /* dot or dot-dot */ -+#define FTS_DP 6 /* postorder directory */ -+#define FTS_ERR 7 /* error; errno is set */ -+#define FTS_F 8 /* regular file */ -+#define FTS_INIT 9 /* initialized only */ -+#define FTS_NS 10 /* stat(2) failed */ -+#define FTS_NSOK 11 /* no stat(2) requested */ -+#define FTS_SL 12 /* symbolic link */ -+#define FTS_SLNONE 13 /* symbolic link without target */ -+#define FTS_W 14 /* whiteout object */ -+ u_short fts_info; /* user flags for FTSENT structure */ -+ -+#define FTS_DONTCHDIR 0x01 /* don't chdir .. to the parent */ -+#define FTS_SYMFOLLOW 0x02 /* followed a symlink to get here */ -+ u_short fts_flags; /* private flags for FTSENT structure */ -+ -+#define FTS_AGAIN 1 /* read node again */ -+#define FTS_FOLLOW 2 /* follow symbolic link */ -+#define FTS_NOINSTR 3 /* no instructions */ -+#define FTS_SKIP 4 /* discard node */ -+ u_short fts_instr; /* fts_set() instructions */ -+ -+ struct stat *fts_statp; /* stat(2) information */ -+ char fts_name[1]; /* file name */ -+} FTSENT; -+ -+__BEGIN_DECLS -+FTSENT *fts_children (FTS *, int); -+int fts_close (FTS *); -+FTS *fts_open (char * const *, int, -+ int (*)(const FTSENT **, const FTSENT **)); -+FTSENT *fts_read (FTS *); -+int fts_set (FTS *, FTSENT *, int) __THROW; -+__END_DECLS -+ -+#endif /* fts.h */ -diff -Nrup a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c ---- a/libdwfl/linux-kernel-modules.c 2016-03-02 16:25:38.000000000 +0000 -+++ b/libdwfl/linux-kernel-modules.c 2016-06-17 14:59:50.267724089 +0100 -@@ -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 -+#endif - - #include - -diff -Nrup a/libdwfl/Makefile.am b/libdwfl/Makefile.am ---- a/libdwfl/Makefile.am 2016-01-12 12:49:19.000000000 +0000 -+++ b/libdwfl/Makefile.am 2016-06-17 15:01:03.492157569 +0100 -@@ -77,6 +77,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.bak/elfutils/0004-disable-po.patch b/package.bak/elfutils/0004-disable-po.patch deleted file mode 100644 index c45c580463..0000000000 --- a/package.bak/elfutils/0004-disable-po.patch +++ /dev/null @@ -1,24 +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. - -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.bak/elfutils/0005-really-make-werror-conditional-to-build-werror.patch b/package.bak/elfutils/0005-really-make-werror-conditional-to-build-werror.patch deleted file mode 100644 index aa4d12d6a2..0000000000 --- a/package.bak/elfutils/0005-really-make-werror-conditional-to-build-werror.patch +++ /dev/null @@ -1,26 +0,0 @@ -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 - -[Vincent: tweak patch for 0.166] - -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 2016-03-02 16:25:38.000000000 +0000 -+++ b/config/eu.am 2016-06-17 15:05:08.270974835 +0100 -@@ -65,7 +65,6 @@ AM_CFLAGS = -std=gnu99 -Wall -Wshadow -W - -Wold-style-definition -Wstrict-prototypes \ - $(LOGICAL_OP_WARNING) $(DUPLICATED_COND_WARNING) \ - $(NULL_DEREFERENCE_WARNING) \ -- $(if $($(*F)_no_Werror),,-Werror) \ - $(if $($(*F)_no_Wunused),,-Wunused -Wextra) \ - $(if $($(*F)_no_Wstack_usage),,$(STACK_USAGE_WARNING)) \ - $($(*F)_CFLAGS) diff --git a/package.bak/elfutils/0006-memcpy-def.patch b/package.bak/elfutils/0006-memcpy-def.patch deleted file mode 100644 index 509482774c..0000000000 --- a/package.bak/elfutils/0006-memcpy-def.patch +++ /dev/null @@ -1,26 +0,0 @@ -Provide a compatibility alias __memcpy - -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. - -Based on the former patch by Thomas Petazzoni. - -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.bak/elfutils/Config.in b/package.bak/elfutils/Config.in deleted file mode 100644 index 0419e27902..0000000000 --- a/package.bak/elfutils/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -comment "elfutils needs a uClibc or glibc toolchain w/ wchar, dynamic library" - depends on !BR2_bfin - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) - -config BR2_PACKAGE_ELFUTILS - bool "elfutils" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS - # Only glibc and uClibc implement the myriad of required GNUisms - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC - # build issue caused by the _ prefix used on blackfin for - # assembly symbols - depends on !BR2_bfin - help - Libraries/utilities to handle ELF objects (drop in - replacement for libelf). - - Note that this option only installs the libraries, and not - the programs. - - https://fedorahosted.org/elfutils - -if BR2_PACKAGE_ELFUTILS - -config BR2_PACKAGE_ELFUTILS_PROGS - bool "Install programs" - depends on BR2_TOOLCHAIN_USES_GLIBC - help - This option tells elfutils to not only install the libelf - libraries, but also the elfutils programs. - -endif diff --git a/package.bak/elfutils/elfutils.hash b/package.bak/elfutils/elfutils.hash deleted file mode 100644 index 9fa9403f3f..0000000000 --- a/package.bak/elfutils/elfutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3c056914c8a438b210be0d790463b960fc79d234c3f05ce707cbff80e94cba30 elfutils-0.166.tar.bz2 diff --git a/package.bak/elfutils/elfutils.mk b/package.bak/elfutils/elfutils.mk deleted file mode 100644 index 566e0bf840..0000000000 --- a/package.bak/elfutils/elfutils.mk +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################ -# -# elfutils -# -################################################################################ - -ELFUTILS_VERSION = 0.166 -ELFUTILS_SOURCE = elfutils-$(ELFUTILS_VERSION).tar.bz2 -ELFUTILS_SITE = https://fedorahosted.org/releases/e/l/elfutils/$(ELFUTILS_VERSION) -ELFUTILS_INSTALL_STAGING = YES -ELFUTILS_LICENSE = GPLv2+ or LGPLv3+ (library) -ELFUTILS_LICENSE_FILES = COPYING-GPLV2 COPYING-LGPLV3 -ELFUTILS_DEPENDENCIES = zlib -HOST_ELFUTILS_DEPENDENCIES = host-zlib host-bzip2 host-xz - -# We patch configure.ac -ELFUTILS_AUTORECONF = YES -HOST_ELFUTILS_AUTORECONF = YES - -# Pass a custom program prefix to avoid a naming conflict between -# elfutils binaries and binutils binaries. -ELFUTILS_CONF_OPTS += \ - --disable-werror \ - --program-prefix="eu-" - -HOST_ELFUTILS_CONF_OPTS = \ - --disable-werror \ - --with-bzlib \ - --with-lzma \ - --disable-progs - -# elfutils gets confused when lfs mode is forced, so don't -ELFUTILS_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -ELFUTILS_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) - -# sparc64 needs -fPIC instead of -fpic -ifeq ($(BR2_sparc64),y) -ELFUTILS_CFLAGS += -fPIC -endif - -ELFUTILS_CONF_ENV += \ - CFLAGS="$(ELFUTILS_CFLAGS)" \ - CPPFLAGS="$(ELFUTILS_CPPFLAGS)" - -ELFUTILS_LDFLAGS = $(TARGET_LDFLAGS) - -# Unconditionnally requires gettext. -ifeq ($(BR2_NEEDS_GETTEXT),y) -ELFUTILS_DEPENDENCIES += gettext -ELFUTILS_LDFLAGS += -lintl -endif - -ELFUTILS_CONF_ENV += \ - LDFLAGS="$(ELFUTILS_LDFLAGS)" - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -ELFUTILS_DEPENDENCIES += argp-standalone -ELFUTILS_CONF_OPTS += --disable-symbol-versioning -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -ELFUTILS_DEPENDENCIES += bzip2 -ELFUTILS_CONF_OPTS += --with-bzlib -else -ELFUTILS_CONF_OPTS += --without-bzlib -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -ELFUTILS_DEPENDENCIES += xz -ELFUTILS_CONF_OPTS += --with-lzma -else -ELFUTILS_CONF_OPTS += --without-lzma -endif - -ifeq ($(BR2_PACKAGE_ELFUTILS_PROGS),y) -ELFUTILS_CONF_OPTS += --enable-progs -ELFUTILS_LICENSE := $(ELFUTILS_LICENSE), GPLv3+ (programs) -ELFUTILS_LICENSE_FILES += COPYING -else -ELFUTILS_CONF_OPTS += --disable-progs -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/emlog/Config.in b/package.bak/emlog/Config.in deleted file mode 100644 index 77d0ca35e5..0000000000 --- a/package.bak/emlog/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_EMLOG - bool "emlog" - depends on BR2_LINUX_KERNEL - help - emlog is a Linux kernel module that makes it easy to access - the most recent (and only the most recent) output from a - process. It works just like "tail -f" on a log file, except - that the storage required never grows. This can be useful in - embedded systems where there isn't enough memory or disk - space for keeping complete log files, but the most recent - debugging messages are sometimes needed (e.g., after an - error is observed). - - https://github.com/nicupavel/emlog - -comment "emlog needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/emlog/emlog.hash b/package.bak/emlog/emlog.hash deleted file mode 100644 index e94691758a..0000000000 --- a/package.bak/emlog/emlog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0d82f06301b8486c54e5e36f304d5a83c2347c23b93c1344eacb0b5b3044485a emlog-576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1.tar.gz diff --git a/package.bak/emlog/emlog.mk b/package.bak/emlog/emlog.mk deleted file mode 100644 index bf0bcf77cc..0000000000 --- a/package.bak/emlog/emlog.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# emlog -# -################################################################################ - -EMLOG_VERSION = 576a6c0fcf76dfeff48124b2f5fc0b4207d88ca1 -EMLOG_SITE = $(call github,nicupavel,emlog,$(EMLOG_VERSION)) -EMLOG_LICENSE = GPLv2 -EMLOG_LICENSE_FILES = COPYING - -define EMLOG_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) nbcat -endef - -# make install tries to strip, so install manually. -define EMLOG_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/nbcat $(TARGET_DIR)/usr/bin/nbcat -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/empty/0001-respect-LDFLAGS.patch b/package.bak/empty/0001-respect-LDFLAGS.patch deleted file mode 100644 index b98af07eac..0000000000 --- a/package.bak/empty/0001-respect-LDFLAGS.patch +++ /dev/null @@ -1,22 +0,0 @@ -downloaded from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-misc/empty/files/empty-respect-LDFLAGS.patch?view=markup - -Reported on the Gentoo bug tracker -https://bugs.gentoo.org/show_bug.cgi?id=429664 - -and reported upstream -https://sourceforge.net/tracker/?func=detail&aid=3554236&group_id=136798&atid=736886 - -Signed-off-by: Bernd Kuhls - ---- empty-0.6.18b/Makefile -+++ empty-0.6.18b/Makefile -@@ -16,7 +16,7 @@ - PREFIX = /usr/local - - all: -- ${CC} ${CFLAGS} -Wall ${LIBS} -o empty empty.c -+ ${CC} ${CFLAGS} ${LDFLAGS} empty.c ${LIBS} -o empty - - FreeBSD: all - NetBSD: all diff --git a/package.bak/empty/0002-fix-non-thread-build.patch b/package.bak/empty/0002-fix-non-thread-build.patch deleted file mode 100644 index a7e8d90a21..0000000000 --- a/package.bak/empty/0002-fix-non-thread-build.patch +++ /dev/null @@ -1,49 +0,0 @@ -empty uses SysV semaphores, so the ifdef is wrong here. - -Signed-off-by: Waldemar Brodkorb - ---- empty-0.6.19b.orig/empty.c 2012-09-19 13:24:05.000000000 +0200 -+++ empty-0.6.19b/empty.c 2015-07-09 02:00:09.000000000 +0200 -@@ -179,25 +179,23 @@ int main (int argc, char *argv[]) { - 2 - unknown */ - - /* semaphores */ --#ifdef _POSIX_SEMAPHORES -- #if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) -- /* union semun is defined by including */ -- #else -- union semun { -- int val; -- struct semid_ds *buf; -- #ifdef __SVR4 -- ushort_t *array; -- #endif -- #ifdef __hpux__ -- ushort *array; -- #endif -- #ifdef __linux__ -- unsigned short *array; -- struct seminfo *__buf; /* buffer for IPC_INFO */ -- #endif -- }; -- #endif -+#if defined(__linux__) && defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED) -+ /* union semun is defined by including */ -+#else -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ #ifdef __SVR4 -+ ushort_t *array; -+ #endif -+ #ifdef __hpux__ -+ ushort *array; -+ #endif -+ #ifdef __linux__ -+ unsigned short *array; -+ struct seminfo *__buf; /* buffer for IPC_INFO */ -+ #endif -+ }; - #endif - union semun semu; - diff --git a/package.bak/empty/Config.in b/package.bak/empty/Config.in deleted file mode 100644 index 7fd0877cbb..0000000000 --- a/package.bak/empty/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EMPTY - bool "empty" - depends on BR2_USE_MMU # uses fork() - help - Run processes and applications under pseudo-terminal (PTY) sessions. - - http://empty.sourceforge.net/ diff --git a/package.bak/empty/empty.hash b/package.bak/empty/empty.hash deleted file mode 100644 index 91402889fa..0000000000 --- a/package.bak/empty/empty.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 05b7cb361ef815774abda325c09c573f8c9039ccbb71eedc743439e4637c314a empty-0.6.19b.tgz diff --git a/package.bak/empty/empty.mk b/package.bak/empty/empty.mk deleted file mode 100644 index 3339ff6b9a..0000000000 --- a/package.bak/empty/empty.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# empty -# -################################################################################ - -EMPTY_VERSION = 0.6.19b -EMPTY_SOURCE = empty-$(EMPTY_VERSION).tgz -EMPTY_SITE = http://downloads.sourceforge.net/project/empty/empty/empty-$(EMPTY_VERSION) -EMPTY_LICENSE = BSD-3c -EMPTY_LICENSE_FILES = COPYRIGHT - -define EMPTY_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define EMPTY_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/empty $(TARGET_DIR)/usr/bin/empty -endef - -$(eval $(generic-package)) diff --git a/package.bak/enchant/Config.in b/package.bak/enchant/Config.in deleted file mode 100644 index 86b2fade8f..0000000000 --- a/package.bak/enchant/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_ENCHANT - bool "enchant" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - Enchant is a spell-checking library that provides a consistent - API across a number of spell-checking system backends. - - http://www.abisource.com/projects/enchant/ - -comment "enchant needs a toolchain w/ C++, threads, wchar" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/enchant/enchant.hash b/package.bak/enchant/enchant.hash deleted file mode 100644 index 884a8b59f2..0000000000 --- a/package.bak/enchant/enchant.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.abisource.com/downloads/enchant/1.6.0/MD5SUM -md5 de11011aff801dc61042828041fb59c7 enchant-1.6.0.tar.gz diff --git a/package.bak/enchant/enchant.mk b/package.bak/enchant/enchant.mk deleted file mode 100644 index 4a23293873..0000000000 --- a/package.bak/enchant/enchant.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# enchant -# -################################################################################ - -ENCHANT_VERSION = 1.6.0 -ENCHANT_SITE = http://www.abisource.com/downloads/enchant/$(ENCHANT_VERSION) -ENCHANT_INSTALL_STAGING = YES -ENCHANT_DEPENDENCIES = libglib2 host-pkgconf -ENCHANT_LICENSE = LGPLv2.1+ -ENCHANT_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) diff --git a/package.bak/enlightenment/Config.in b/package.bak/enlightenment/Config.in deleted file mode 100644 index d1dee25f86..0000000000 --- a/package.bak/enlightenment/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_ENLIGHTENMENT - bool "enlightenment" - # libevas-generic-loaders-svg -> librsvg -> glib2 / pango - depends on BR2_USE_WCHAR - depends on BR2_INSTALL_LIBSTDCPP - # libedbus -> dbus - # libedbus -> glib2, libevas - depends on BR2_TOOLCHAIN_HAS_THREADS - # libedbus -> dbus, efl libraries - depends on BR2_USE_MMU - depends on BR2_PACKAGE_EFL - depends on BR2_PACKAGE_HAS_UDEV # efl (eeze) -> libudev - depends on BR2_PACKAGE_XORG7 - # libevas-generic-loaders-svg -> librsvg -> pango -> harfbuzz - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_EFL_X_XLIB - select BR2_PACKAGE_EFL_EEZE - select BR2_PACKAGE_EFL_JPEG # needed at runtime by enlightenment_start - select BR2_PACKAGE_EFL_PNG # needed at runtime by enlightenment_start - select BR2_PACKAGE_EFL_SVG - select BR2_PACKAGE_XCB_UTIL_KEYSYMS - help - Enlightenment, also known simply as E, is a stacking window - manager for the X Window System which can be used alone or - in conjunction with a desktop environment such as GNOME or - KDE. Enlightenment can be used as a substitute for a full - desktop environment. - - http://www.enlightenment.org/ - -comment "enlightenment needs udev /dev management and a toolchain w/ wchar, C++, threads" - depends on BR2_PACKAGE_EFL && BR2_PACKAGE_XORG7 && BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/enlightenment/enlightenment.hash b/package.bak/enlightenment/enlightenment.hash deleted file mode 100644 index 1548f200b2..0000000000 --- a/package.bak/enlightenment/enlightenment.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.enlightenment.org/news/e-0.21.5-release -sha256 f0745a660f70851c4ada9866b2a525185bfc5cd1685aa86e4cdb68f2c1c154bb enlightenment-0.21.5.tar.xz diff --git a/package.bak/enlightenment/enlightenment.mk b/package.bak/enlightenment/enlightenment.mk deleted file mode 100644 index 7037afe11c..0000000000 --- a/package.bak/enlightenment/enlightenment.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# enlightenment -# -################################################################################ - -ENLIGHTENMENT_VERSION = 0.21.5 -ENLIGHTENMENT_SOURCE = enlightenment-$(ENLIGHTENMENT_VERSION).tar.xz -ENLIGHTENMENT_SITE = http://download.enlightenment.org/rel/apps/enlightenment -ENLIGHTENMENT_LICENSE = BSD-2c -ENLIGHTENMENT_LICENSE_FILES = COPYING - -ENLIGHTENMENT_DEPENDENCIES = \ - host-pkgconf \ - host-efl \ - efl \ - xcb-util-keysyms - -ENLIGHTENMENT_CONF_OPTS = \ - --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ - --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ - --with-eldbus_codegen=$(HOST_DIR)/usr/bin/eldbus-codegen \ - --disable-pam \ - --disable-rpath - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -ENLIGHTENMENT_CONF_OPTS += --enable-systemd -ENLIGHTENMENT_DEPENDENCIES += systemd -else -ENLIGHTENMENT_CONF_OPTS += --disable-systemd -endif - -# alsa backend needs mixer support -ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) -ENLIGHTENMENT_DEPENDENCIES += alsa-lib -else -ENLIGHTENMENT_CONF_ENV += enable_alsa=no -endif - -define ENLIGHTENMENT_REMOVE_DOCUMENTATION - rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/ - rm -f $(TARGET_DIR)/usr/share/enlightenment/COPYING - rm -f $(TARGET_DIR)/usr/share/enlightenment/AUTHORS -endef -ENLIGHTENMENT_POST_INSTALL_TARGET_HOOKS += ENLIGHTENMENT_REMOVE_DOCUMENTATION - -$(eval $(autotools-package)) diff --git a/package.bak/enscript/Config.in b/package.bak/enscript/Config.in deleted file mode 100644 index 26c45e1e2f..0000000000 --- a/package.bak/enscript/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_ENSCRIPT - bool "enscript" - help - GNU Enscript is a free replacement for Adobe's enscript program. - - GNU Enscript converts ASCII files to PostScript, HTML, or RTF and - stores generated output to a file or sends it directly to the - printer. It includes features for `pretty-printing' (language- - sensitive code highlighting) in several programming languages. - - http://www.gnu.org/software/enscript diff --git a/package.bak/enscript/enscript.hash b/package.bak/enscript/enscript.hash deleted file mode 100644 index 8b7694d408..0000000000 --- a/package.bak/enscript/enscript.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 6d56bada6934d055b34b6c90399aa85975e66457ac5bf513427ae7fc77f5c0bb enscript-1.6.6.tar.gz diff --git a/package.bak/enscript/enscript.mk b/package.bak/enscript/enscript.mk deleted file mode 100644 index fc2cd41534..0000000000 --- a/package.bak/enscript/enscript.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# enscript -# -################################################################################ - -ENSCRIPT_VERSION = 1.6.6 -ENSCRIPT_SITE = $(BR2_GNU_MIRROR)/enscript -ENSCRIPT_LICENSE = GPLv3+ -ENSCRIPT_LICENSE_FILES = COPYING - -# Enable pthread threads if toolchain supports threads -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -ENSCRIPT_CONF_OPTS += --enable-threads=pth -else -ENSCRIPT_CONF_OPTS += --disable-threads -endif - -$(eval $(autotools-package)) diff --git a/package.bak/erlang-goldrush/Config.in b/package.bak/erlang-goldrush/Config.in deleted file mode 100644 index 2ee579a7a5..0000000000 --- a/package.bak/erlang-goldrush/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ERLANG_GOLDRUSH - bool "erlang-goldrush" - help - Goldrush is a small Erlang app that provides fast event - stream processing. - - https://github.com/DeadZen/goldrush diff --git a/package.bak/erlang-goldrush/erlang-goldrush.hash b/package.bak/erlang-goldrush/erlang-goldrush.hash deleted file mode 100644 index 00ccb43ca6..0000000000 --- a/package.bak/erlang-goldrush/erlang-goldrush.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 739d8ce15049c54f7e00528edbf536f63a24fdb9dfa053d176e6f97a9832b834 erlang-goldrush-0.1.8.tar.gz diff --git a/package.bak/erlang-goldrush/erlang-goldrush.mk b/package.bak/erlang-goldrush/erlang-goldrush.mk deleted file mode 100644 index 2fa88107e1..0000000000 --- a/package.bak/erlang-goldrush/erlang-goldrush.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-goldrush -# -################################################################################ - -ERLANG_GOLDRUSH_VERSION = 0.1.8 -ERLANG_GOLDRUSH_SITE = $(call github,DeadZen,goldrush,$(ERLANG_GOLDRUSH_VERSION)) -ERLANG_GOLDRUSH_LICENSE = ISC -ERLANG_GOLDRUSH_LICENSE_FILES = LICENSE -ERLANG_GOLDRUSH_INSTALL_STAGING = YES - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package.bak/erlang-lager/Config.in b/package.bak/erlang-lager/Config.in deleted file mode 100644 index d088821a55..0000000000 --- a/package.bak/erlang-lager/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_ERLANG_LAGER - bool "erlang-lager" - select BR2_PACKAGE_ERLANG_GOLDRUSH - help - Lager (as in the beer) is a logging framework for - Erlang. Its purpose is to provide a more traditional way to - perform logging in an erlang application that plays nicely - with traditional UNIX logging tools like logrotate and - syslog. - - https://github.com/basho/lager diff --git a/package.bak/erlang-lager/erlang-lager.hash b/package.bak/erlang-lager/erlang-lager.hash deleted file mode 100644 index e436fdc7d5..0000000000 --- a/package.bak/erlang-lager/erlang-lager.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 168a8e48646b04bcee1ab0c97c1ff63563bd7fd25638f1504b8d8f674d2ddd1b erlang-lager-2.2.0.tar.gz diff --git a/package.bak/erlang-lager/erlang-lager.mk b/package.bak/erlang-lager/erlang-lager.mk deleted file mode 100644 index b55b6f7b78..0000000000 --- a/package.bak/erlang-lager/erlang-lager.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# erlang-lager -# -################################################################################ - -ERLANG_LAGER_VERSION = 2.2.0 -ERLANG_LAGER_SITE = $(call github,basho,lager,$(ERLANG_LAGER_VERSION)) -ERLANG_LAGER_LICENSE = Apache-2.0 -ERLANG_LAGER_LICENSE_FILES = LICENSE -ERLANG_LAGER_DEPENDENCIES = erlang-goldrush -HOST_ERLANG_LAGER_DEPENDENCIES = host-erlang-goldrush - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package.bak/erlang-p1-cache-tab/Config.in b/package.bak/erlang-p1-cache-tab/Config.in deleted file mode 100644 index eed26766c8..0000000000 --- a/package.bak/erlang-p1-cache-tab/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_CACHE_TAB - bool "erlang-p1-cache-tab" - select BR2_PACKAGE_ERLANG_P1_UTILS - help - Erlang library implementing cache tables - - https://github.com/processone/cache_tab diff --git a/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.hash deleted file mode 100644 index d8b09f95a0..0000000000 --- a/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 752b649f695e9f2777efd6b2d8dfdcc1f435104b4e363f5f0454b99fd009015c erlang-p1-cache-tab-1.0.1.tar.gz diff --git a/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.mk deleted file mode 100644 index 8f131237c6..0000000000 --- a/package.bak/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# erlang-p1-cache-tab -# -################################################################################ - -ERLANG_P1_CACHE_TAB_VERSION = 1.0.1 -ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION)) -ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0 -ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt -ERLANG_P1_CACHE_TAB_DEPENDENCIES = erlang-p1-utils - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-iconv/Config.in b/package.bak/erlang-p1-iconv/Config.in deleted file mode 100644 index 98efb217d4..0000000000 --- a/package.bak/erlang-p1-iconv/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_ICONV - bool "erlang-p1-iconv" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Erlang interface to libiconv - - https://github.com/processone/eiconv diff --git a/package.bak/erlang-p1-iconv/erlang-p1-iconv.hash b/package.bak/erlang-p1-iconv/erlang-p1-iconv.hash deleted file mode 100644 index a284189a32..0000000000 --- a/package.bak/erlang-p1-iconv/erlang-p1-iconv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3ef1fb814fdf23e8ad8a210efb66681fa67cd42753be536521bf9686158880d3 erlang-p1-iconv-0.9.0.tar.gz diff --git a/package.bak/erlang-p1-iconv/erlang-p1-iconv.mk b/package.bak/erlang-p1-iconv/erlang-p1-iconv.mk deleted file mode 100644 index d2d2626d20..0000000000 --- a/package.bak/erlang-p1-iconv/erlang-p1-iconv.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# erlang-p1-iconv -# -################################################################################ - -ERLANG_P1_ICONV_VERSION = 0.9.0 -ERLANG_P1_ICONV_SITE = $(call github,processone,eiconv,$(ERLANG_P1_ICONV_VERSION)) -ERLANG_P1_ICONV_LICENSE = GPLv2+ -ERLANG_P1_ICONV_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ERLANG_P1_ICONV_DEPENDENCIES += libiconv -endif - -ERLANG_P1_ICONV_USE_AUTOCONF = YES - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-sip/0001-fix-includes.patch b/package.bak/erlang-p1-sip/0001-fix-includes.patch deleted file mode 100644 index 80e2ab36c2..0000000000 --- a/package.bak/erlang-p1-sip/0001-fix-includes.patch +++ /dev/null @@ -1,19 +0,0 @@ -Description: correct include - This part of the code was moved into it's own project and was packaged - separately by me. To make the build process work, this small fix is - necessary. -Author: Philipp Huebner - -Index: erlang-p1-sip/src/esip_socket.erl -=================================================================== ---- erlang-p1-sip.orig/src/esip_socket.erl -+++ erlang-p1-sip/src/esip_socket.erl -@@ -22,7 +22,7 @@ - - -include("esip.hrl"). - -include("esip_lib.hrl"). ---include("stun.hrl"). -+-include_lib("p1_stun/include/stun.hrl"). - - -define(TCP_SEND_TIMEOUT, 15000). - -define(CONNECT_TIMEOUT, 20000). diff --git a/package.bak/erlang-p1-sip/Config.in b/package.bak/erlang-p1-sip/Config.in deleted file mode 100644 index 70cf819a37..0000000000 --- a/package.bak/erlang-p1-sip/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_SIP - bool "erlang-p1-sip" - select BR2_PACKAGE_ERLANG_P1_STUN - select BR2_PACKAGE_ERLANG_P1_TLS - select BR2_PACKAGE_ERLANG_P1_UTILS - help - SIP library for Erlang - - https://github.com/processone/p1_sip diff --git a/package.bak/erlang-p1-sip/erlang-p1-sip.hash b/package.bak/erlang-p1-sip/erlang-p1-sip.hash deleted file mode 100644 index 74382cca9a..0000000000 --- a/package.bak/erlang-p1-sip/erlang-p1-sip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2d6dfad997931668eb83a0cb127ccca8c51f8a383d76f9dea393c0b3a4eabae7 erlang-p1-sip-1.0.0.tar.gz diff --git a/package.bak/erlang-p1-sip/erlang-p1-sip.mk b/package.bak/erlang-p1-sip/erlang-p1-sip.mk deleted file mode 100644 index 24075a7ae1..0000000000 --- a/package.bak/erlang-p1-sip/erlang-p1-sip.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-p1-sip -# -################################################################################ - -ERLANG_P1_SIP_VERSION = 1.0.0 -ERLANG_P1_SIP_SITE = $(call github,processone,p1_sip,$(ERLANG_P1_SIP_VERSION)) -ERLANG_P1_SIP_LICENSE = GPLv2 with OpenSSL exception -ERLANG_P1_SIP_LICENSE_FILES = COPYING -ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils -ERLANG_P1_SIP_INSTALL_STAGING = YES - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch b/package.bak/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch deleted file mode 100644 index 7385503b71..0000000000 --- a/package.bak/erlang-p1-stringprep/0001-Stdint-is-required-on-windows.patch +++ /dev/null @@ -1,28 +0,0 @@ -From f5a2b8b78afb253630ee8833f16f131b3b52701e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pawe=C5=82=20Chmielowski?= -Date: Mon, 29 Feb 2016 10:56:32 +0100 -Subject: [PATCH] Stdint is required on windows - -[Backport from upstream commit -4fc5cae81122540fff983e40dda1fa905c329fd0, which happens to not only -fix the build on Windows, but also with the musl C library.] -Signed-off-by: Thomas Petazzoni ---- - c_src/stringprep.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/c_src/stringprep.cpp b/c_src/stringprep.cpp -index 461cf09..26215cf 100644 ---- a/c_src/stringprep.cpp -+++ b/c_src/stringprep.cpp -@@ -19,6 +19,7 @@ - */ - - #include -+#include - #include - - #include "uni_data.c" --- -2.7.4 - diff --git a/package.bak/erlang-p1-stringprep/Config.in b/package.bak/erlang-p1-stringprep/Config.in deleted file mode 100644 index 4beac048af..0000000000 --- a/package.bak/erlang-p1-stringprep/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -comment "erlang-p1-stringprep needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_ERLANG_P1_STRINGPREP - bool "erlang-p1-stringprep" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_ERLANG_P1_UTILS - help - Erlang interface to stringprep - - https://github.com/processone/stringprep diff --git a/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.hash deleted file mode 100644 index 23bc6fbdce..0000000000 --- a/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5a74277e7bfb18b8f35838fa78fcde83f0acdb5b2a5b90c4b6d2470a33f7911e erlang-p1-stringprep-1.0.0.tar.gz diff --git a/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.mk deleted file mode 100644 index 3bc8c7290b..0000000000 --- a/package.bak/erlang-p1-stringprep/erlang-p1-stringprep.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# erlang-p1-stringprep -# -################################################################################ - -ERLANG_P1_STRINGPREP_VERSION = 1.0.0 -ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION)) -ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest) -ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt -ERLANG_P1_STRINGPREP_DEPENDENCIES = erlang-p1-utils - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-stun/Config.in b/package.bak/erlang-p1-stun/Config.in deleted file mode 100644 index 70cdd91599..0000000000 --- a/package.bak/erlang-p1-stun/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_STUN - bool "erlang-p1-stun" - select BR2_PACKAGE_ERLANG_P1_TLS - select BR2_PACKAGE_ERLANG_P1_UTILS - help - STUN library for Erlang - - https://github.com/processone/stun diff --git a/package.bak/erlang-p1-stun/erlang-p1-stun.hash b/package.bak/erlang-p1-stun/erlang-p1-stun.hash deleted file mode 100644 index be56608097..0000000000 --- a/package.bak/erlang-p1-stun/erlang-p1-stun.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ca33833f4b6ef70a7628e6f3697d15cb4e26d32ef4e5a31bbddee86cabe19c50 erlang-p1-stun-0.9.0.tar.gz diff --git a/package.bak/erlang-p1-stun/erlang-p1-stun.mk b/package.bak/erlang-p1-stun/erlang-p1-stun.mk deleted file mode 100644 index 4d26f917ee..0000000000 --- a/package.bak/erlang-p1-stun/erlang-p1-stun.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-p1-stun -# -################################################################################ - -ERLANG_P1_STUN_VERSION = 0.9.0 -ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION)) -ERLANG_P1_STUN_LICENSE = GPLv2+ -ERLANG_P1_STUN_LICENSE_FILES = COPYING -ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils -ERLANG_P1_STUN_INSTALL_STAGING = YES - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-tls/Config.in b/package.bak/erlang-p1-tls/Config.in deleted file mode 100644 index 0df334820d..0000000000 --- a/package.bak/erlang-p1-tls/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_TLS - bool "erlang-p1-tls" - select BR2_PACKAGE_OPENSSL - help - Erlang interface to OpenSSL - - https://github.com/processone/tls diff --git a/package.bak/erlang-p1-tls/erlang-p1-tls.hash b/package.bak/erlang-p1-tls/erlang-p1-tls.hash deleted file mode 100644 index fd8d801f90..0000000000 --- a/package.bak/erlang-p1-tls/erlang-p1-tls.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8e8b848a112ff6bf146df34b4f6bc50160a8858a18499a7a6124193b37237a40 erlang-p1-tls-1.0.0.tar.gz diff --git a/package.bak/erlang-p1-tls/erlang-p1-tls.mk b/package.bak/erlang-p1-tls/erlang-p1-tls.mk deleted file mode 100644 index 77f06e6b4d..0000000000 --- a/package.bak/erlang-p1-tls/erlang-p1-tls.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-p1-tls -# -################################################################################ - -ERLANG_P1_TLS_VERSION = 1.0.0 -ERLANG_P1_TLS_SITE = $(call github,processone,tls,$(ERLANG_P1_TLS_VERSION)) -ERLANG_P1_TLS_LICENSE = GPLv2+ with OpenSSL exception -ERLANG_P1_TLS_LICENSE_FILES = COPYING -ERLANG_P1_TLS_INSTALL_STAGING = YES -ERLANG_P1_TLS_DEPENDENCIES = openssl - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-utils/Config.in b/package.bak/erlang-p1-utils/Config.in deleted file mode 100644 index a82e5f71b9..0000000000 --- a/package.bak/erlang-p1-utils/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_UTILS - bool "erlang-p1-utils" - help - Set of small Erlang libraries - - https://github.com/processone/p1_utils diff --git a/package.bak/erlang-p1-utils/erlang-p1-utils.hash b/package.bak/erlang-p1-utils/erlang-p1-utils.hash deleted file mode 100644 index c41e5ef525..0000000000 --- a/package.bak/erlang-p1-utils/erlang-p1-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9c7e9fa2990edd419953a6ae609ffed0b90e671b57c468d97c0d85d866d80210 erlang-p1-utils-1.0.3.tar.gz diff --git a/package.bak/erlang-p1-utils/erlang-p1-utils.mk b/package.bak/erlang-p1-utils/erlang-p1-utils.mk deleted file mode 100644 index 733cf87f36..0000000000 --- a/package.bak/erlang-p1-utils/erlang-p1-utils.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# erlang-p1-utils -# -################################################################################ - -ERLANG_P1_UTILS_VERSION = 1.0.3 -ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION)) -ERLANG_P1_UTILS_LICENSE = GPLv2+ -ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt -ERLANG_P1_UTILS_INSTALL_STAGING = YES - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-xml/Config.in b/package.bak/erlang-p1-xml/Config.in deleted file mode 100644 index 504501d912..0000000000 --- a/package.bak/erlang-p1-xml/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_XML - bool "erlang-p1-xml" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_EXPAT - help - XML utilities for Erlang - - https://github.com/processone/xml diff --git a/package.bak/erlang-p1-xml/erlang-p1-xml.hash b/package.bak/erlang-p1-xml/erlang-p1-xml.hash deleted file mode 100644 index 8e4a79fee1..0000000000 --- a/package.bak/erlang-p1-xml/erlang-p1-xml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4c163c5b9572baa93eb97e03544db57dc751c7995a5279081a0d56f5fdaa2521 erlang-p1-xml-1.1.1.tar.gz diff --git a/package.bak/erlang-p1-xml/erlang-p1-xml.mk b/package.bak/erlang-p1-xml/erlang-p1-xml.mk deleted file mode 100644 index 31bab2311d..0000000000 --- a/package.bak/erlang-p1-xml/erlang-p1-xml.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# erlang-p1-xml -# -################################################################################ - -ERLANG_P1_XML_VERSION = 1.1.1 -ERLANG_P1_XML_SITE = $(call github,processone,xml,$(ERLANG_P1_XML_VERSION)) -ERLANG_P1_XML_LICENSE = Apache-2.0 -ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt -ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils -ERLANG_P1_XML_INSTALL_STAGING = YES - -ERLANG_P1_XML_USE_AUTOCONF = YES - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-yaml/Config.in b/package.bak/erlang-p1-yaml/Config.in deleted file mode 100644 index 2ab78d1296..0000000000 --- a/package.bak/erlang-p1-yaml/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_YAML - bool "erlang-p1-yaml" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_LIBYAML - help - Erlang wrapper for libyaml C library - - https://github.com/processone/p1_yaml diff --git a/package.bak/erlang-p1-yaml/erlang-p1-yaml.hash b/package.bak/erlang-p1-yaml/erlang-p1-yaml.hash deleted file mode 100644 index 0e11e45003..0000000000 --- a/package.bak/erlang-p1-yaml/erlang-p1-yaml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8eaaddda056f1ebb515a5456ba2be855e5b71b9b6eb35788527f39c6600ac6b4 erlang-p1-yaml-1.0.0.tar.gz diff --git a/package.bak/erlang-p1-yaml/erlang-p1-yaml.mk b/package.bak/erlang-p1-yaml/erlang-p1-yaml.mk deleted file mode 100644 index 22fcda43f8..0000000000 --- a/package.bak/erlang-p1-yaml/erlang-p1-yaml.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# erlang-p1-yaml -# -################################################################################ - -ERLANG_P1_YAML_VERSION = 1.0.0 -ERLANG_P1_YAML_SITE = $(call github,processone,p1_yaml,$(ERLANG_P1_YAML_VERSION)) -ERLANG_P1_YAML_LICENSE = Apache-2.0 -ERLANG_P1_YAML_LICENSE_FILES = COPYING -ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-p1-zlib/Config.in b/package.bak/erlang-p1-zlib/Config.in deleted file mode 100644 index b7e48a1496..0000000000 --- a/package.bak/erlang-p1-zlib/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_ZLIB - bool "erlang-p1-zlib" - select BR2_PACKAGE_ZLIB - help - Erlang interface to zlib - - https://github.com/processone/zlib diff --git a/package.bak/erlang-p1-zlib/erlang-p1-zlib.hash b/package.bak/erlang-p1-zlib/erlang-p1-zlib.hash deleted file mode 100644 index 488e75294c..0000000000 --- a/package.bak/erlang-p1-zlib/erlang-p1-zlib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cb534ee8d8746e38027ada0ccd7e910daa025c74461286ded60ffaa933e3cf7b erlang-p1-zlib-1.0.0.tar.gz diff --git a/package.bak/erlang-p1-zlib/erlang-p1-zlib.mk b/package.bak/erlang-p1-zlib/erlang-p1-zlib.mk deleted file mode 100644 index 1f8ae0063d..0000000000 --- a/package.bak/erlang-p1-zlib/erlang-p1-zlib.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# erlang-p1-zlib -# -################################################################################ - -ERLANG_P1_ZLIB_VERSION = 1.0.0 -ERLANG_P1_ZLIB_SITE = $(call github,processone,zlib,$(ERLANG_P1_ZLIB_VERSION)) -ERLANG_P1_ZLIB_LICENSE = GPLv2+ -ERLANG_P1_ZLIB_LICENSE_FILES = COPYING -ERLANG_P1_ZLIB_DEPENDENCIES = zlib - -$(eval $(rebar-package)) diff --git a/package.bak/erlang-rebar/erlang-rebar.hash b/package.bak/erlang-rebar/erlang-rebar.hash deleted file mode 100644 index 27cc91affc..0000000000 --- a/package.bak/erlang-rebar/erlang-rebar.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 577246bafa2eb2b2c3f1d0c157408650446884555bf87901508ce71d5cc0bd07 erlang-rebar-2.6.4.tar.gz diff --git a/package.bak/erlang-rebar/erlang-rebar.mk b/package.bak/erlang-rebar/erlang-rebar.mk deleted file mode 100644 index 031ff47460..0000000000 --- a/package.bak/erlang-rebar/erlang-rebar.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# erlang-rebar -# -################################################################################ - -ERLANG_REBAR_VERSION = 2.6.4 - -# Upstream publishes a release, but we can not use it as it is a release of -# a generated rebar script, when we want the sources. So we have to use the -# gihub helper in this case. -ERLANG_REBAR_SITE = $(call github,rebar,rebar,$(ERLANG_REBAR_VERSION)) - -# Although the file LICENSE state Apache-2.0, a lot (if not all) the files -# in src/ bear the MIT licence. -ERLANG_REBAR_LICENSE = Apache-2.0, MIT -ERLANG_REBAR_LICENSE_FILES = LICENSE - -# We do not have a target variant, so just define the dependencies, -# configure and build commands for the host variant. -HOST_ERLANG_REBAR_DEPENDENCIES = host-erlang - -define HOST_ERLANG_REBAR_BUILD_CMDS - cd $(@D) && $(HOST_MAKE_ENV) $(MAKE) -endef - -define HOST_ERLANG_REBAR_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/rebar $(HOST_DIR)/usr/bin/rebar -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/erlang/0001-build-fix.patch b/package.bak/erlang/0001-build-fix.patch deleted file mode 100644 index ff821c9fc0..0000000000 --- a/package.bak/erlang/0001-build-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -apply-patches.sh deletes this file from the source directory. - ---- erlang-R15B01.old/lib/tools/emacs/Makefile 2012-04-04 -+++ erlang-R15B01/lib/tools/emacs/Makefile 2012-04-04 15:55:16.978957307 +0100 -@@ -51,7 +51,7 @@ - - ELC_FILES = $(EMACS_FILES:%=%.elc) - --TEST_FILES = test.erl.indented test.erl.orig -+TEST_FILES = test.erl.indented - - # ---------------------------------------------------- - # Targets diff --git a/package.bak/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch b/package.bak/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch deleted file mode 100644 index 8e401430fe..0000000000 --- a/package.bak/erlang/0002-erts-ethread-instruct-libatomic_ops-we-do-require-CA.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 439fa2eae78a8900bda120072335be19d626498c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 28 Dec 2014 23:39:40 +0100 -Subject: [PATCH] erts/ethread: instruct libatomic_ops we do require CAS - -We do require compare-and-swap (CAS), so we must instruct libatomic_ops -to provide it, even if the architecture does not have instructions for -it. - -For example, on ARM, LDREX is required for fast CAS. But LDREX is only -available on ARMv6, so by default libatomic_ops will not have CAS for -anything below, like ARMv5. But ARMv5 is always UP, so using an -emulated CAS (that is signal-asyn-safe) is still possible (albeit much -slower). - -Tell libatomic_ops to provide CAS, even if the hardware is not capable -of it, by using emulated CAS, as per libatomic_ops dosc: - https://github.com/ivmai/libatomic_ops/blob/master/doc/README.txt#L28 - - If this is included after defining AO_REQUIRE_CAS, then the package - will make an attempt to emulate compare-and-swap in a way that (at - least on Linux) should still be async-signal-safe. - -Thanks go to Thomas for all this insight! :-) -Thanks go to Frank for reporting the issue! :-) - -Signed-off-by: "Yann E. MORIN" -Cc: Thomas Petazzoni -Cc: Frank Hunleth ---- - erts/include/internal/libatomic_ops/ethread.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/erts/include/internal/libatomic_ops/ethread.h b/erts/include/internal/libatomic_ops/ethread.h -index d65ee19..71d3598 100644 ---- a/erts/include/internal/libatomic_ops/ethread.h -+++ b/erts/include/internal/libatomic_ops/ethread.h -@@ -35,6 +35,7 @@ - - #define ETHR_NATIVE_IMPL__ "libatomic_ops" - -+#define AO_REQUIRE_CAS - #include "atomic_ops.h" - #include "ethr_membar.h" - #include "ethr_atomic.h" -diff --git a/erts/aclocal.m4 b/erts/aclocal.m4 -index d65ee19..71d3598 100644 ---- a/erts/aclocal.m4 -+++ b/erts/aclocal.m4 -@@ -1414,7 +1414,8 @@ - fi;; - esac - ethr_have_libatomic_ops=no -- AC_TRY_LINK([#include "atomic_ops.h"], -+ AC_TRY_LINK([#define AO_REQUIRE_CAS -+ #include "atomic_ops.h"], - [ - volatile AO_t x; - AO_t y; -@@ -1455,6 +1455,7 @@ - AC_CHECK_SIZEOF(AO_t, , - [ - #include -+ #define AO_REQUIRE_CAS - #include "atomic_ops.h" - ]) - AC_DEFINE_UNQUOTED(ETHR_SIZEOF_AO_T, $ac_cv_sizeof_AO_t, [Define to the size of AO_t if libatomic_ops is used]) --- -1.9.1 - diff --git a/package.bak/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch b/package.bak/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch deleted file mode 100644 index c17eefc2a1..0000000000 --- a/package.bak/erlang/0003-erts-emulator-reorder-inclued-headers-paths.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 85a3e5b4f65e5284e59dcdd90e92ea7d50ef6907 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 8 Feb 2015 17:23:13 +0100 -Subject: [PATCH] erts/emulator: reorder inclued headers paths - -If the Perl Compatible Regular Expressions is installed on the -host and the path to the headers is added to the CFLAGS, the -pcre.h from the host is used instead of the one provided by -erlang. - -Erlang use an old version of this file which is incompatible -with the upstream one. - -Move INCLUDES before CFLAGS to use pcre.h from erlang. - -http://autobuild.buildroot.net/results/cbd/cbd8b54eef535f19d7d400fd269af1b3571d6143/build-end.log - -Signed-off-by: Romain Naour ---- - erts/emulator/Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in -index 7145824..d079487 100644 ---- a/erts/emulator/Makefile.in -+++ b/erts/emulator/Makefile.in -@@ -678,11 +678,11 @@ else - # Usually the same as the default rule, but certain platforms (e.g. win32) mix - # different compilers - $(OBJDIR)/beam_emu.o: beam/beam_emu.c -- $(V_EMU_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -+ $(V_EMU_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - endif - - $(OBJDIR)/%.o: beam/%.c -- $(V_CC) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) $(INCLUDES) -c $< -o $@ -+ $(V_CC) $(INCLUDES) $(subst -O2, $(GEN_OPT_FLGS), $(CFLAGS)) -c $< -o $@ - - $(OBJDIR)/%.o: $(TARGET)/%.c - $(V_CC) $(CFLAGS) $(INCLUDES) -Idrivers/common -c $< -o $@ --- -1.9.3 - diff --git a/package.bak/erlang/Config.in b/package.bak/erlang/Config.in deleted file mode 100644 index 11407db129..0000000000 --- a/package.bak/erlang/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config BR2_PACKAGE_ERLANG_ARCH_SUPPORTS - bool - # see HOWTO/INSTALL.md for Erlang's supported platforms - # when using its native atomic ops implementation - default y if BR2_i386 || BR2_x86_64 || BR2_powerpc || \ - BR2_sparc_v9 || BR2_arm || BR2_aarch64 || BR2_mipsel - -comment "erlang needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_ERLANG - bool "erlang" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_ERLANG_ARCH_SUPPORTS - help - Erlang is a programming language used to build massively scalable - soft real-time systems with requirements on high availability. - Some of its uses are in telecoms, banking, e-commerce, computer - telephony and instant messaging. Erlang's runtime system has - built-in support for concurrency, distribution and fault tolerance. - - http://www.erlang.org - -if BR2_PACKAGE_ERLANG - -config BR2_PACKAGE_ERLANG_SMP - bool "enable SMP support" - help - Erlang provides both a UP and an SMP emulator. The UP emulator - is always built, and this option enables compilation of the SMP - emulator. The choice of which emulator to use is made at runtime. - If you do not need SMP support, turning this option off reduces - compile time and the size of the Erlang installation. - -config BR2_PACKAGE_ERLANG_MEGACO - bool "install megaco application" - help - The Megaco application is a framework for building applications - on top of the Megaco/H.248 protocol. It is approximately 14MB in - size so if you do not need it then it is recommended not to - enable it. - -endif # BR2_PACKAGE_ERLANG diff --git a/package.bak/erlang/erlang.hash b/package.bak/erlang/erlang.hash deleted file mode 100644 index c39c26e30a..0000000000 --- a/package.bak/erlang/erlang.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from http://www.erlang.org/download/MD5, sha256 locally computed -md5 7e4ff32f97c36fb3dab736f8d481830b otp_src_18.3.tar.gz -sha256 fdab8129a1cb935db09f1832e3a7d511a4aeb2b9bb3602ca6a7ccb9730d5c9c3 otp_src_18.3.tar.gz diff --git a/package.bak/erlang/erlang.mk b/package.bak/erlang/erlang.mk deleted file mode 100644 index 364085c4dd..0000000000 --- a/package.bak/erlang/erlang.mk +++ /dev/null @@ -1,106 +0,0 @@ -################################################################################ -# -# erlang -# -################################################################################ - -# See note below when updating Erlang -ERLANG_VERSION = 18.3 -ERLANG_SITE = http://www.erlang.org/download -ERLANG_SOURCE = otp_src_$(ERLANG_VERSION).tar.gz -ERLANG_DEPENDENCIES = host-erlang - -ERLANG_LICENSE = Apache-2.0 -ERLANG_LICENSE_FILES = LICENSE.txt -ERLANG_INSTALL_STAGING = YES - -# Patched erts/aclocal.m4 -ERLANG_AUTORECONF = YES - -# Whenever updating Erlang, this value should be updated as well, to the -# value of EI_VSN in the file lib/erl_interface/vsn.mk -ERLANG_EI_VSN = 3.8.2 - -# The configure checks for these functions fail incorrectly -ERLANG_CONF_ENV = ac_cv_func_isnan=yes ac_cv_func_isinf=yes - -# Set erl_xcomp variables. See xcomp/erl-xcomp.conf.template -# for documentation. -ERLANG_CONF_ENV += erl_xcomp_sysroot=$(STAGING_DIR) - -ERLANG_CONF_OPTS = --without-javac - -# Force ERL_TOP to the downloaded source directory. This prevents -# Erlang's configure script from inadvertantly using files from -# a version of Erlang installed on the host. -ERLANG_CONF_ENV += ERL_TOP=$(@D) -HOST_ERLANG_CONF_ENV += ERL_TOP=$(@D) - -# erlang uses openssl for all things crypto. Since the host tools (such as -# rebar) uses crypto, we need to build host-erlang with support for openssl. -HOST_ERLANG_DEPENDENCIES = host-openssl -HOST_ERLANG_CONF_OPTS = --without-javac --with-ssl=$(HOST_DIR)/usr - -HOST_ERLANG_CONF_OPTS += --without-termcap - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -ERLANG_CONF_OPTS += --disable-threads -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -ERLANG_CONF_OPTS += --with-termcap -ERLANG_DEPENDENCIES += ncurses -else -ERLANG_CONF_OPTS += --without-termcap -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ERLANG_CONF_OPTS += --with-ssl -ERLANG_DEPENDENCIES += openssl -else -ERLANG_CONF_OPTS += --without-ssl -endif - -# ODBC support in erlang requires threads -ifeq ($(BR2_PACKAGE_UNIXODBC)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -ERLANG_DEPENDENCIES += unixodbc -ERLANG_CONF_OPTS += --with-odbc -else -ERLANG_CONF_OPTS += --without-odbc -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -ERLANG_CONF_OPTS += --enable-shared-zlib -ERLANG_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_ERLANG_SMP),) -ERLANG_CONF_OPTS += --disable-smp-support -endif - -# Remove source, example, gs and wx files from staging and target. -ERLANG_REMOVE_PACKAGES = gs wx - -ifneq ($(BR2_PACKAGE_ERLANG_MEGACO),y) -ERLANG_REMOVE_PACKAGES += megaco -endif - -define ERLANG_REMOVE_STAGING_UNUSED - for package in $(ERLANG_REMOVE_PACKAGES); do \ - rm -rf $(STAGING_DIR)/usr/lib/erlang/lib/$${package}-*; \ - done -endef - -define ERLANG_REMOVE_TARGET_UNUSED - find $(TARGET_DIR)/usr/lib/erlang -type d -name src -prune -exec rm -rf {} \; - find $(TARGET_DIR)/usr/lib/erlang -type d -name examples -prune -exec rm -rf {} \; - for package in $(ERLANG_REMOVE_PACKAGES); do \ - rm -rf $(TARGET_DIR)/usr/lib/erlang/lib/$${package}-*; \ - done -endef - -ERLANG_POST_INSTALL_STAGING_HOOKS += ERLANG_REMOVE_STAGING_UNUSED -ERLANG_POST_INSTALL_TARGET_HOOKS += ERLANG_REMOVE_TARGET_UNUSED - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch b/package.bak/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch deleted file mode 100644 index 2590e15841..0000000000 --- a/package.bak/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 08a464e2b6bd31bb2bf4e258ebfa9b9d65805abf Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 27 Nov 2015 15:17:02 +0100 -Subject: [PATCH] Fix build of shared library on architectures needing -fPIC - -Certain architectures, like Sparc and Sparc64 require objects to be -built with -fPIC (and not just -fpic) to be usable in shared -libraries. On other architectures, -fPIC is the same as -fpic so this -patch doesn't affect such architectures. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index 95fe549..c293611 100755 ---- a/src/Makefile -+++ b/src/Makefile -@@ -110,7 +110,7 @@ $(BIN2_NAME): $(OBJS3) $(LIB_NAME) - - - x_%.o: %.cpp -- $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fpic -fvisibility=hidden -pedantic \ -+ $(CXX) $(CXXFLAGS) $(USE_AUDIO) -D PATH_ESPEAK_DATA=\"$(DATADIR)\" -Wall -fPIC -fvisibility=hidden -pedantic \ - -I. -D LIBRARY -c -fno-exceptions $< -o x_$*.o - - $(LIB_NAME): $(OBJS2) --- -2.6.3 - diff --git a/package.bak/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch b/package.bak/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch deleted file mode 100644 index d37e64c6ea..0000000000 --- a/package.bak/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 451330d09a6a3500b40bc4f5896ba790ab46cd6c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 15 Jan 2017 19:37:31 +0100 -Subject: [PATCH 2/2] tr_languages: cast string_ordinal init values - -On some architecture, "char" is signed (x86_64, nios2...) so the -compiler try to convert int 0xc2 and 0xba to a signed char. -This is an error since gcc6 (Wnarrowing). - -Fixes: -http://autobuild.buildroot.net/results/bae/baef9888b1979d18171668a675985e3f3b45fda6 - -Signed-off-by: Romain Naour ---- - src/tr_languages.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp -index 5c80286..dbc6e36 100644 ---- a/src/tr_languages.cpp -+++ b/src/tr_languages.cpp -@@ -200,7 +200,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { - 0x200d, 1, // zero width joiner - 0, 0 }; - --const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 -+const char string_ordinal[] = {(char)0xc2,(char)0xba,0}; // masculine ordinal character, UTF-8 - - - static Translator* NewTranslator(void) --- -2.9.3 - diff --git a/package.bak/espeak/Config.in b/package.bak/espeak/Config.in deleted file mode 100644 index aed627af92..0000000000 --- a/package.bak/espeak/Config.in +++ /dev/null @@ -1,40 +0,0 @@ -comment "espeak needs a toolchain w/ C++, wchar, threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS - depends on BR2_USE_MMU - -config BR2_PACKAGE_ESPEAK - bool "espeak" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - # does not properly support building only a static version - depends on !BR2_STATIC_LIBS - help - espeak is a speech synthesizer software for English and - other languages. - - http://espeak.sourceforge.net/ - -if BR2_PACKAGE_ESPEAK - -choice - prompt "choose audio backend" - default BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE - -config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_NONE - bool "No sound backend, only produce wav files" - -config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA - bool "alsa via portaudio" - select BR2_PACKAGE_PORTAUDIO - select BR2_PACKAGE_PORTAUDIO_CXX - -config BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO - bool "pulseaudio" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c - select BR2_PACKAGE_PULSEAUDIO - -endchoice - -endif # BR2_PACKAGE_ESPEAK diff --git a/package.bak/espeak/espeak.hash b/package.bak/espeak/espeak.hash deleted file mode 100644 index 8f4a1ab95b..0000000000 --- a/package.bak/espeak/espeak.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 bf9a17673adffcc28ff7ea18764f06136547e97bbd9edf2ec612f09b207f0659 espeak-1.48.04-source.zip diff --git a/package.bak/espeak/espeak.mk b/package.bak/espeak/espeak.mk deleted file mode 100644 index 734ec30e54..0000000000 --- a/package.bak/espeak/espeak.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# espeak -# -################################################################################ - -ESPEAK_VERSION_MAJOR = 1.48 -ESPEAK_VERSION = $(ESPEAK_VERSION_MAJOR).04 -ESPEAK_SOURCE = espeak-$(ESPEAK_VERSION)-source.zip -ESPEAK_SITE = http://downloads.sourceforge.net/project/espeak/espeak/espeak-$(ESPEAK_VERSION_MAJOR) -ESPEAK_LICENSE = GPLv3+ -ESPEAK_LICENSE_FILES = License.txt - -ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_ALSA),y) -ESPEAK_AUDIO_BACKEND = portaudio -ESPEAK_DEPENDENCIES = portaudio -endif -ifeq ($(BR2_PACKAGE_ESPEAK_AUDIO_BACKEND_PULSEAUDIO),y) -ESPEAK_AUDIO_BACKEND = pulseaudio -ESPEAK_DEPENDENCIES = pulseaudio -endif - -define ESPEAK_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(ESPEAK_SOURCE) - mv $(@D)/espeak-$(ESPEAK_VERSION)-source/* $(@D) - $(RM) -r $(@D)/espeak-$(ESPEAK_VERSION)-source -endef - -define ESPEAK_CONFIGURE_CMDS - # Buildroot provides portaudio V19, see ReadMe file for more details. - cp $(@D)/src/portaudio19.h $(@D)/src/portaudio.h -endef - -define ESPEAK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src $(TARGET_CONFIGURE_OPTS) \ - AUDIO="$(ESPEAK_AUDIO_BACKEND)" all -endef - -define ESPEAK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/ethtool/Config.in b/package.bak/ethtool/Config.in deleted file mode 100644 index 48c6062a61..0000000000 --- a/package.bak/ethtool/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ETHTOOL - bool "ethtool" - help - ethtool is a small utility for examining and tuning your - ethernet-based network interface. - - http://sourceforge.net/projects/gkernel/ diff --git a/package.bak/ethtool/ethtool.hash b/package.bak/ethtool/ethtool.hash deleted file mode 100644 index 7deb92adae..0000000000 --- a/package.bak/ethtool/ethtool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/network/ethtool/sha256sums.asc -sha256 403dfe288e2d8031eab0be3f5d0ca9128e120d61c52c3dc434474fa026eb4a43 ethtool-4.8.tar.xz diff --git a/package.bak/ethtool/ethtool.mk b/package.bak/ethtool/ethtool.mk deleted file mode 100644 index bb3ed926a7..0000000000 --- a/package.bak/ethtool/ethtool.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# ethtool -# -################################################################################ - -ETHTOOL_VERSION = 4.8 -ETHTOOL_SOURCE = ethtool-$(ETHTOOL_VERSION).tar.xz -ETHTOOL_SITE = $(BR2_KERNEL_MIRROR)/software/network/ethtool -ETHTOOL_LICENSE = GPLv2 -ETHTOOL_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch b/package.bak/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch deleted file mode 100644 index 3046ba528b..0000000000 --- a/package.bak/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dc8aa43b7b6d0cead7d8a0c1a151d289a5233a10 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Wed, 2 Apr 2014 12:36:52 +0200 -Subject: [PATCH] libudev: Only use #pragma for ignoring diagnostics if GCC - version supports it. - -[Peter: update for 2.1.1, fix shared_assert issue] -Signed-off-by: Eric Le Bihan ---- - src/shared/macro.h | 8 +++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/shared/macro.h b/src/shared/macro.h ---- a/src/shared/macro.h -+++ b/src/shared/macro.h -@@ -38,6 +38,7 @@ - #define _cleanup_(x) __attribute__((cleanup(x))) - - /* Temporarily disable some warnings */ -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) - #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") -@@ -48,6 +49,13 @@ - - #define REENABLE_WARNING \ - _Pragma("GCC diagnostic pop") -+#else -+#define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT -+#define DISABLE_WARNING_FORMAT_NONLITERAL -+#define REENABLE_WARNING -+/* glibc unconditionally defines this, but it needs GCC 4.6+ */ -+#undef static_assert -+#endif - - #define XCONCATENATE(x, y) x ## y - #define CONCATENATE(x, y) XCONCATENATE(x, y) --- -1.7.9.5 diff --git a/package.bak/eudev/0002-missing-defines-for-old-kernels.patch b/package.bak/eudev/0002-missing-defines-for-old-kernels.patch deleted file mode 100644 index 6966b07fe4..0000000000 --- a/package.bak/eudev/0002-missing-defines-for-old-kernels.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c0f63850ad29ec978d070a08b816dc2bfca337e3 Mon Sep 17 00:00:00 2001 -From: Gustavo Sverzut Barbieri -Date: Fri, 30 Dec 2016 11:28:41 -0200 -Subject: [PATCH] udev-builtin-input_id.c: add missing kernel header defines. - -Add missing defines so eudev builds for older kernels such as 2.6 - -Signed-off-by: Gustavo Sverzut Barbieri ---- - src/shared/missing.h | 8 ++++++++ - src/udev/udev-builtin-input_id.c | 1 + - 2 files changed, 9 insertions(+) - -diff --git a/src/shared/missing.h b/src/shared/missing.h -index 5ad599795..bebbb42be 100644 ---- a/src/shared/missing.h -+++ b/src/shared/missing.h -@@ -171,3 +171,11 @@ static inline int name_to_handle_at(int fd, const char *name, struct file_handle - (char *)memcpy(__new, __old, __len); \ - }) - #endif -+ -+#ifndef BTN_TRIGGER_HAPPY -+#define BTN_TRIGGER_HAPPY 0x2c0 -+#endif -+ -+#ifndef INPUT_PROP_MAX -+#define INPUT_PROP_MAX 0x1f -+#endif -diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c -index b14190e42..ca545be5d 100644 ---- a/src/udev/udev-builtin-input_id.c -+++ b/src/udev/udev-builtin-input_id.c -@@ -32,6 +32,7 @@ - - #include "udev.h" - #include "util.h" -+#include "missing.h" - - /* we must use this kernel-compatible implementation */ - #define BITS_PER_LONG (sizeof(unsigned long) * 8) --- -2.11.0 - diff --git a/package.bak/eudev/Config.in b/package.bak/eudev/Config.in deleted file mode 100644 index 02fcc7e14b..0000000000 --- a/package.bak/eudev/Config.in +++ /dev/null @@ -1,43 +0,0 @@ -config BR2_PACKAGE_EUDEV - bool "eudev" - depends on BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV - depends on BR2_USE_MMU # uses fork() - depends on BR2_USE_WCHAR # needs C99 compiler - depends on !BR2_STATIC_LIBS # kmod - select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_KMOD - help - eudev is a fork of systemd-udev with the goal of obtaining better - compatibility with existing software such as OpenRC and Upstart, - older kernels, various toolchains and anything else required by - users and various distributions. - - https://wiki.gentoo.org/wiki/Project:Eudev - -if BR2_PACKAGE_EUDEV - -config BR2_PACKAGE_PROVIDES_UDEV - default "eudev" - -config BR2_PACKAGE_EUDEV_RULES_GEN - bool "enable rules generator" - help - Enable persistent rules generator - -config BR2_PACKAGE_EUDEV_ENABLE_HWDB - bool "enable hwdb installation" - default y - help - Enables hardware database installation to /etc/udev/hwdb.d - -endif - -comment "eudev needs eudev /dev management" - depends on BR2_USE_MMU - depends on !BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV - -comment "eudev needs a toolchain w/ wchar, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/eudev/S10udev b/package.bak/eudev/S10udev deleted file mode 100755 index 8382bec2bb..0000000000 --- a/package.bak/eudev/S10udev +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# -# udev This is a minimal non-LSB version of a UDEV startup script. It -# was derived by stripping down the udev-058 LSB version for use -# with buildroot on embedded hardware using Linux 2.6.34+ kernels. -# -# You may need to customize this for your system's resource limits -# (including startup time!) and administration. For example, if -# your early userspace has a custom initramfs or initrd you might -# need /dev much earlier; or without hotpluggable busses (like USB, -# PCMCIA, MMC/SD, and so on) your /dev might be static after boot. -# -# This script assumes your system boots right into the eventual root -# filesystem, and that init runs this udev script before any programs -# needing more device nodes than the bare-bones set -- /dev/console, -# /dev/zero, /dev/null -- that's needed to boot and run this script. -# - -# Check for missing binaries -UDEV_BIN=/sbin/udevd -test -x $UDEV_BIN || exit 5 - -# Check for config file and read it -UDEV_CONFIG=/etc/udev/udev.conf -test -r $UDEV_CONFIG || exit 6 -. $UDEV_CONFIG - -case "$1" in - start) - printf "Populating ${udev_root:-/dev} using udev: " - printf '\000\000\000\000' > /proc/sys/kernel/hotplug - $UDEV_BIN -d || (echo "FAIL" && exit 1) - udevadm trigger --type=subsystems --action=add - udevadm trigger --type=devices --action=add - udevadm settle --timeout=30 || echo "udevadm settle failed" - echo "done" - ;; - stop) - # Stop execution of events - udevadm control --stop-exec-queue - killall udevd - ;; - *) - echo "Usage: $0 {start|stop}" - exit 1 - ;; -esac - - -exit 0 diff --git a/package.bak/eudev/eudev.hash b/package.bak/eudev/eudev.hash deleted file mode 100644 index 108b0c6e50..0000000000 --- a/package.bak/eudev/eudev.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://dev.gentoo.org/~blueness/eudev/ -md5 49f71f6c271ffa95b3c20d757d45c2e5 eudev-3.2.1.tar.gz -# Locally calculated -sha256 57e3d9e51cfefbdad431848ea0ad8ae1cde04928da42474f44bd200b12f5fe19 eudev-3.2.1.tar.gz diff --git a/package.bak/eudev/eudev.mk b/package.bak/eudev/eudev.mk deleted file mode 100644 index 2f5bd6cf19..0000000000 --- a/package.bak/eudev/eudev.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# eudev -# -################################################################################ - -EUDEV_VERSION = 3.2.1 -EUDEV_SITE = http://dev.gentoo.org/~blueness/eudev -EUDEV_LICENSE = GPLv2+ (programs), LGPLv2.1+ (libraries) -EUDEV_LICENSE_FILES = COPYING -EUDEV_INSTALL_STAGING = YES - -# mq_getattr is in librt -EUDEV_CONF_ENV += LIBS=-lrt - -EUDEV_CONF_OPTS = \ - --disable-manpages \ - --sbindir=/sbin \ - --libexecdir=/lib \ - --disable-introspection \ - --enable-kmod \ - --enable-blkid - -EUDEV_DEPENDENCIES = host-gperf host-pkgconf util-linux kmod -EUDEV_PROVIDES = udev - -ifeq ($(BR2_ROOTFS_MERGED_USR),) -EUDEV_CONF_OPTS += --with-rootlibdir=/lib --enable-split-usr -endif - -ifeq ($(BR2_PACKAGE_EUDEV_RULES_GEN),y) -EUDEV_CONF_OPTS += --enable-rule-generator -else -EUDEV_CONF_OPTS += --disable-rule-generator -endif - -ifeq ($(BR2_PACKAGE_EUDEV_ENABLE_HWDB),y) -EUDEV_CONF_OPTS += --enable-hwdb -else -EUDEV_CONF_OPTS += --disable-hwdb -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -EUDEV_CONF_OPTS += --enable-selinux -EUDEV_DEPENDENCIES += libselinux -else -EUDEV_CONF_OPTS += --disable-selinux -endif - -define EUDEV_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/eudev/S10udev $(TARGET_DIR)/etc/init.d/S10udev -endef - -# Required by default rules for input devices -define EUDEV_USERS - - - input -1 * - - - Input device group -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ev3dev-linux-drivers/Config.in b/package.bak/ev3dev-linux-drivers/Config.in deleted file mode 100644 index 9be2f282e9..0000000000 --- a/package.bak/ev3dev-linux-drivers/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -# Prompt-less option, because this package is not doing anything except -# downloading the ev3dev driver sources. The real work is done by a Linux -# extension. -config BR2_PACKAGE_EV3DEV_LINUX_DRIVERS - bool - depends on BR2_LINUX_KERNEL - help - Linux drivers for LEGO MINDSTORMS EV3 - - This is only the download helper for the kernel patch. - - https://github.com/ev3dev/lego-linux-drivers diff --git a/package.bak/ev3dev-linux-drivers/ev3dev-linux-drivers.mk b/package.bak/ev3dev-linux-drivers/ev3dev-linux-drivers.mk deleted file mode 100644 index 55e26f0411..0000000000 --- a/package.bak/ev3dev-linux-drivers/ev3dev-linux-drivers.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# ev3dev Linux drivers -# -################################################################################ - -EV3DEV_LINUX_DRIVERS_VERSION = 0e551eb25ae8600c1f178814781bfb42dc835496 -EV3DEV_LINUX_DRIVERS_SITE = $(call github,ev3dev,lego-linux-drivers,$(EV3DEV_LINUX_DRIVERS_VERSION)) -EV3DEV_LINUX_DRIVERS_LICENSE = GPLv2 - -$(eval $(generic-package)) diff --git a/package.bak/ev3dev-linux-drivers/lego-linux-drivers.hash b/package.bak/ev3dev-linux-drivers/lego-linux-drivers.hash deleted file mode 100644 index cc48f65395..0000000000 --- a/package.bak/ev3dev-linux-drivers/lego-linux-drivers.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9d2740b348c8d43e7e15fedc4cec99bf351a3a2ba8691f2a07c439a9c034bc04 lego-linux-drivers-0e551eb25ae8600c1f178814781bfb42dc835496.tar.gz diff --git a/package.bak/evemu/Config.in b/package.bak/evemu/Config.in deleted file mode 100644 index 07b7174e16..0000000000 --- a/package.bak/evemu/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EVEMU - bool "evemu" - select BR2_PACKAGE_LIBEVDEV - help - evemu records and replays device descriptions and events - - http://www.freedesktop.org/wiki/Evemu/ diff --git a/package.bak/evemu/evemu.hash b/package.bak/evemu/evemu.hash deleted file mode 100644 index 5e653f7d59..0000000000 --- a/package.bak/evemu/evemu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2016-September/001330.html -sha256 541cc138f0215b7d0cd4ad5e6bb1402518ffc5e31294c36bb67b4ff1791bb27f evemu-2.5.0.tar.xz diff --git a/package.bak/evemu/evemu.mk b/package.bak/evemu/evemu.mk deleted file mode 100644 index 4f59789a08..0000000000 --- a/package.bak/evemu/evemu.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# evemu -# -################################################################################ - -EVEMU_VERSION = 2.5.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 - -# asciidoc used to generate manpages, which we don't need, and if it's -# present on the build host, it ends getting called with our host-python -# which doesn't have all the needed modules enabled, breaking the build -EVEMU_CONF_ENV = ac_cv_path_ASCIIDOC="" - -# disable tests generation because of C++ dependency -EVEMU_CONF_OPTS += --disable-tests - -# Uses PKG_CHECK_MODULES() in configure.ac -EVEMU_DEPENDENCIES = host-pkgconf libevdev - -# Check for target python -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -EVEMU_CONF_OPTS += --enable-python-bindings -EVEMU_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON3),python3,python) -else -EVEMU_CONF_OPTS += --disable-python-bindings -endif - -$(eval $(autotools-package)) diff --git a/package.bak/eventlog/Config.in b/package.bak/eventlog/Config.in deleted file mode 100644 index f9442f6187..0000000000 --- a/package.bak/eventlog/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_EVENTLOG - bool "eventlog" - help - eventlog is a library for creating structured events from - applications, and is the workhorse behind syslog-ng's own - messages. - - https://my.balabit.com/downloads/eventlog/ diff --git a/package.bak/eventlog/eventlog.hash b/package.bak/eventlog/eventlog.hash deleted file mode 100644 index b8f2ec6141..0000000000 --- a/package.bak/eventlog/eventlog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://my.balabit.com/downloads/eventlog/0.2/eventlog_0.2.12.dsc -sha256 494dac8e01dc5ce323df2ad554d94874938dab51aa025987677b2bc6906a9c66 eventlog_0.2.12.tar.gz diff --git a/package.bak/eventlog/eventlog.mk b/package.bak/eventlog/eventlog.mk deleted file mode 100644 index 76da002e1a..0000000000 --- a/package.bak/eventlog/eventlog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# eventlog -# -################################################################################ - -EVENTLOG_VERSION_MAJOR = 0.2 -EVENTLOG_VERSION = $(EVENTLOG_VERSION_MAJOR).12 -EVENTLOG_SOURCE = eventlog_$(EVENTLOG_VERSION).tar.gz -EVENTLOG_SITE = https://my.balabit.com/downloads/eventlog/$(EVENTLOG_VERSION_MAJOR) -EVENTLOG_LICENSE = BSD-3c -EVENTLOG_LICENSE_FILES = COPYING -EVENTLOG_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/evtest/Config.in b/package.bak/evtest/Config.in deleted file mode 100644 index 1087217ee4..0000000000 --- a/package.bak/evtest/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_EVTEST - bool "evtest" - help - evtest displays information on the input device specified on - the command line, including all the events supported by the - device. It then monitors the device and displays all the - events layer events generated. - - http://cgit.freedesktop.org/evtest diff --git a/package.bak/evtest/evtest.hash b/package.bak/evtest/evtest.hash deleted file mode 100644 index e131318f47..0000000000 --- a/package.bak/evtest/evtest.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9fb68236a6871c163e52433ba8f2cce142c0f4208163a2962768c13f262d549f evtest-1.33.tar.gz diff --git a/package.bak/evtest/evtest.mk b/package.bak/evtest/evtest.mk deleted file mode 100644 index 5ff2bf3dd2..0000000000 --- a/package.bak/evtest/evtest.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# evtest -# -################################################################################ - -EVTEST_VERSION = 1.33 -EVTEST_SITE = http://cgit.freedesktop.org/evtest/snapshot -EVTEST_LICENSE = GPLv2+ -EVTEST_LICENSE_FILES = COPYING -EVTEST_DEPENDENCIES = host-pkgconf -# needed because source package contains no generated files -EVTEST_AUTORECONF = YES - -# asciidoc used to generate manpages, which we don't need, and if it's -# present on the build host, it ends getting called with our host-python -# which doesn't have all the needed modules enabled, breaking the build -EVTEST_CONF_ENV = ac_cv_path_ASCIIDOC="" - -$(eval $(autotools-package)) diff --git a/package.bak/exfat-utils/Config.in b/package.bak/exfat-utils/Config.in deleted file mode 100644 index 9dfbbfcfb8..0000000000 --- a/package.bak/exfat-utils/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_EXFAT_UTILS - bool "exfat-utils" - depends on BR2_USE_WCHAR - help - exFAT filesystem utilities. - - https://github.com/relan/exfat - -comment "exfat-utils needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/exfat-utils/exfat-utils.hash b/package.bak/exfat-utils/exfat-utils.hash deleted file mode 100644 index b40e632a5a..0000000000 --- a/package.bak/exfat-utils/exfat-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6aa51926416b9d0977b456902f4c4cd10bcce4b2d160859a7a2fc9ca6bcbbb11 exfat-utils-1.2.4.tar.gz diff --git a/package.bak/exfat-utils/exfat-utils.mk b/package.bak/exfat-utils/exfat-utils.mk deleted file mode 100644 index 259c2dabf7..0000000000 --- a/package.bak/exfat-utils/exfat-utils.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# exfat-utils -# -################################################################################ - -EXFAT_UTILS_VERSION = 1.2.4 -EXFAT_UTILS_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_UTILS_VERSION) -EXFAT_UTILS_LICENSE = GPLv3+ -EXFAT_UTILS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/exfat/Config.in b/package.bak/exfat/Config.in deleted file mode 100644 index c0b4eabe11..0000000000 --- a/package.bak/exfat/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_EXFAT - bool "exFAT (FUSE)" - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse - depends on BR2_USE_MMU # libfuse - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # libfuse - select BR2_PACKAGE_LIBFUSE - help - A full-featured exFAT file system implementation for GNU/Linux - and other Unix-like systems as a FUSE module. - - https://github.com/relan/exfat - -comment "exfat needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/exfat/exfat.hash b/package.bak/exfat/exfat.hash deleted file mode 100644 index cf3aab19f7..0000000000 --- a/package.bak/exfat/exfat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9312d23a5d82543ad2e9ab7f0a0b471aea53eeb8eae664451c881b46d849756e fuse-exfat-1.2.4.tar.gz diff --git a/package.bak/exfat/exfat.mk b/package.bak/exfat/exfat.mk deleted file mode 100644 index 84b6001db4..0000000000 --- a/package.bak/exfat/exfat.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# exfat -# -################################################################################ - -EXFAT_VERSION = 1.2.4 -EXFAT_SITE = https://github.com/relan/exfat/releases/download/v$(EXFAT_VERSION) -EXFAT_SOURCE = fuse-exfat-$(EXFAT_VERSION).tar.gz -EXFAT_DEPENDENCIES = libfuse host-pkgconf -EXFAT_LICENSE = GPLv3+ -EXFAT_LICENSE_FILES = COPYING -EXFAT_CFLAGS = $(TARGET_CFLAGS) -std=c99 - -$(eval $(autotools-package)) diff --git a/package.bak/exim/0001-Build-buildconfig-for-the-host.patch b/package.bak/exim/0001-Build-buildconfig-for-the-host.patch deleted file mode 100644 index a926fbdab3..0000000000 --- a/package.bak/exim/0001-Build-buildconfig-for-the-host.patch +++ /dev/null @@ -1,23 +0,0 @@ -buildconfig is meant to be executed on the host, so it has to be compiled -using $(HOSTCC), not $(CC). - -Signed-off-by: Luca Ceresoli ---- - OS/Makefile-Base | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/OS/Makefile-Base b/OS/Makefile-Base -index 29a6ad3..420ba60 100644 ---- a/OS/Makefile-Base -+++ b/OS/Makefile-Base -@@ -114,8 +114,8 @@ allexim: config.h $(EXIM_MONITOR) exicyclog exinext exiwhat \ - - # Targets for special-purpose configuration header builders - buildconfig: buildconfig.c -- @echo "$(CC) buildconfig.c" -- $(FE)$(CC) $(CFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) -+ @echo "$(HOSTCC) buildconfig.c" -+ $(FE)$(HOSTCC) $(HOSTCFLAGS) $(INCLUDE) -o buildconfig buildconfig.c $(LIBS) - - - # Target for the exicyclog utility script diff --git a/package.bak/exim/0002-Don-t-make-backup-copies-of-installed-files.patch b/package.bak/exim/0002-Don-t-make-backup-copies-of-installed-files.patch deleted file mode 100644 index 0cdaa744bc..0000000000 --- a/package.bak/exim/0002-Don-t-make-backup-copies-of-installed-files.patch +++ /dev/null @@ -1,40 +0,0 @@ -If exim had already been installed, the install script makes backup -copies of the pre-existing executables with a ".0" suffix. - -This leads to useless duplicated files on the target, so disable this -piece of code. - -Signed-off-by: Luca Ceresoli ---- - scripts/exim_install | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) - -diff --git a/scripts/exim_install b/scripts/exim_install -index 616ab3c..e68e7d5 100755 ---- a/scripts/exim_install -+++ b/scripts/exim_install -@@ -344,15 +344,15 @@ while [ $# -gt 0 ]; do - - else - if ../scripts/newer ${name} ${BIN_DIRECTORY}/${name}; then -- if [ -f ${BIN_DIRECTORY}/${name} ]; then -- echo ${CP} ${BIN_DIRECTORY}/${name} ${BIN_DIRECTORY}/${name}.O -- ${real} ${CP} ${BIN_DIRECTORY}/${name} ${BIN_DIRECTORY}/${name}.O -- if [ $? -ne 0 ]; then -- echo $com "" -- echo $com "*** Exim installation ${ver}failed ***" -- exit 1 -- fi -- fi -+# if [ -f ${BIN_DIRECTORY}/${name} ]; then -+# echo ${CP} ${BIN_DIRECTORY}/${name} ${BIN_DIRECTORY}/${name}.O -+# ${real} ${CP} ${BIN_DIRECTORY}/${name} ${BIN_DIRECTORY}/${name}.O -+# if [ $? -ne 0 ]; then -+# echo $com "" -+# echo $com "*** Exim installation ${ver}failed ***" -+# exit 1 -+# fi -+# fi - echo ${CP} ${name} ${BIN_DIRECTORY} - ${real} ${CP} ${name} ${BIN_DIRECTORY} - if [ $? -ne 0 ]; then diff --git a/package.bak/exim/0003-Skip-version-check-and-symlink-installation.patch b/package.bak/exim/0003-Skip-version-check-and-symlink-installation.patch deleted file mode 100644 index 94d21ae114..0000000000 --- a/package.bak/exim/0003-Skip-version-check-and-symlink-installation.patch +++ /dev/null @@ -1,40 +0,0 @@ -The exim install script installs a binary named exim-, plus a symlink -to it named exim. -In order to achieve this "feature" (of dubious usefulness) it runs the -executable (on the host) and then filters its output to grab the version number. -This clearly cannot work if the executable is cross-compiled, so get rid of all -of it and just install an executable file called exim. - -Inspired by: -http://patch-tracker.debian.org/patch/series/view/exim4/4.76-2/35_install.dpatch - -Signed-off-by: Luca Ceresoli ---- - scripts/exim_install | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/scripts/exim_install b/scripts/exim_install -index e68e7d5..487a4e1 100755 ---- a/scripts/exim_install -+++ b/scripts/exim_install -@@ -59,6 +59,8 @@ while [ $# -gt 0 ] ; do - shift - done - -+do_symlink=no -+ - # Get the values of BIN_DIRECTORY, CONFIGURE_FILE, INFO_DIRECTORY, NO_SYMLINK, - # SYSTEM_ALIASES_FILE, and EXE from the global Makefile (in the build - # directory). EXE is empty except in the Cygwin environment. In each case, keep -@@ -218,8 +220,9 @@ while [ $# -gt 0 ]; do - # The exim binary is handled specially - - if [ $name = exim${EXE} ]; then -- version=exim-`./exim -bV -C /dev/null | \ -- awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} -+ version=exim -+# version=exim-`./exim -bV -C /dev/null | \ -+# awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE} - - if [ "${version}" = "exim-${EXE}" ]; then - echo $com "" diff --git a/package.bak/exim/Config.in b/package.bak/exim/Config.in deleted file mode 100644 index 230ac86f96..0000000000 --- a/package.bak/exim/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -comment "exim needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_EXIM - bool "exim" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_BERKELEYDB - help - Exim is a message transfer agent (MTA) developed at the University of - Cambridge for use on Unix systems connected to the Internet. - - http://www.exim.org/ - -if BR2_PACKAGE_EXIM - -config BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE - string "Custom configuration file" - help - By default, when this option is left empty, Buildroot - generates a configuration file for exim with reasonable - settings. - - If you want to override the configuration file generated by - Buildroot with a customized file, set here the path to your - configuration file with this option. - - This file shall comply with the syntax defined in the exim - documentation (http://www.exim.org/docs.html). - Buildroot will generate a configuration file composed of the - content of the file you provide plus the toolchain-related - settings needed for cross-compilation. - -endif diff --git a/package.bak/exim/Local-Makefile b/package.bak/exim/Local-Makefile deleted file mode 100644 index 191f0e0da6..0000000000 --- a/package.bak/exim/Local-Makefile +++ /dev/null @@ -1,15 +0,0 @@ -BIN_DIRECTORY=/usr/sbin -CONFIGURE_FILE=/etc/exim/configure -EXIM_USER=ref:exim -EXIM_GROUP=mail -SPOOL_DIRECTORY=/var/spool/exim -ROUTER_ACCEPT=yes -TRANSPORT_LMTP=yes -LOOKUP_DBM=yes -LOOKUP_LSEARCH=yes -PCRE_LIBS=-lpcre -FIXED_NEVER_USERS=root -HEADERS_CHARSET="ISO-8859-1" -HAVE_ICONV=no -SYSLOG_LOG_PID=yes -TMPDIR="/tmp" diff --git a/package.bak/exim/S86exim b/package.bak/exim/S86exim deleted file mode 100644 index bec88fc222..0000000000 --- a/package.bak/exim/S86exim +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh -# -# Start/stop exim -# - -PIDFILE=/var/lock/exim/exim-daemon.pid - -case "$1" in - start) - echo "Starting exim..." - start-stop-daemon -S -x exim -- -bd - ;; - stop) - printf "Stopping exim..." - start-stop-daemon -K -o -p $PIDFILE - ;; - restart|reload) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/exim/exim.hash b/package.bak/exim/exim.hash deleted file mode 100644 index ef2d03ba21..0000000000 --- a/package.bak/exim/exim.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d4b7994c89240d2f9a9fcd7a2dffa4b72f14379001a24266f4dbb0fbe5131514 exim-4.87.1.tar.bz2 diff --git a/package.bak/exim/exim.mk b/package.bak/exim/exim.mk deleted file mode 100644 index a9f4685eb9..0000000000 --- a/package.bak/exim/exim.mk +++ /dev/null @@ -1,154 +0,0 @@ -################################################################################ -# -# exim -# -################################################################################ - -EXIM_VERSION = 4.87.1 -EXIM_SOURCE = exim-$(EXIM_VERSION).tar.bz2 -EXIM_SITE = ftp://ftp.exim.org/pub/exim/exim4/old -EXIM_LICENSE = GPLv2+ -EXIM_LICENSE_FILES = LICENCE -EXIM_DEPENDENCIES = pcre berkeleydb host-pkgconf - -# Modify a variable value. It must already exist in the file, either -# commented or not. -define exim-config-change # variable-name, variable-value - $(SED) 's,^[#[:space:]]*$1[[:space:]]*=.*$$,$1=$2,' \ - $(@D)/Local/Makefile -endef - -# Comment-out a variable. Has no effect if it does not exits. -define exim-config-unset # variable-name - $(SED) 's,^\([[:space:]]*$1[[:space:]]*=.*$$\),# \1,' \ - $(@D)/Local/Makefile -endef - -# Add a variable definition. It must not already exist in the file, -# otherwise it would be defined twice with potentially different values. -define exim-config-add # variable-name, variable-value - echo "$1=$2" >>$(@D)/Local/Makefile -endef - -define EXIM_USE_CUSTOM_CONFIG_FILE - $(INSTALL) -m 0644 $(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE) \ - $(@D)/Local/Makefile -endef - -define EXIM_USE_DEFAULT_CONFIG_FILE - $(INSTALL) -m 0644 $(@D)/src/EDITME $(@D)/Local/Makefile - $(call exim-config-change,BIN_DIRECTORY,/usr/sbin) - $(call exim-config-change,CONFIGURE_FILE,/etc/exim/configure) - $(call exim-config-change,EXIM_USER,ref:exim) - $(call exim-config-change,EXIM_GROUP,mail) - $(call exim-config-change,TRANSPORT_LMTP,yes) - $(call exim-config-change,PCRE_LIBS,-lpcre) - $(call exim-config-change,PCRE_CONFIG,no) - $(call exim-config-change,HAVE_ICONV,no) - $(call exim-config-unset,EXIM_MONITOR) - $(call exim-config-change,AUTH_PLAINTEXT,yes) - $(call exim-config-change,AUTH_CRAM_MD5,yes) -endef - -ifeq ($(BR2_PACKAGE_DOVECOT),y) -EXIM_DEPENDENCIES += dovecot -define EXIM_USE_DEFAULT_CONFIG_FILE_DOVECOT - $(call exim-config-change,AUTH_DOVECOT,yes) -endef -endif - -ifeq ($(BR2_PACKAGE_CLAMAV),y) -EXIM_DEPENDENCIES += clamav -define EXIM_USE_DEFAULT_CONFIG_FILE_CLAMAV - $(call exim-config-change,WITH_CONTENT_SCAN,yes) -endef -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -EXIM_DEPENDENCIES += openssl -define EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL - $(call exim-config-change,SUPPORT_TLS,yes) - $(call exim-config-change,USE_OPENSSL_PC,openssl) -endef -endif - -# only glibc provides libnsl, remove -lnsl for all other toolchains -# http://bugs.exim.org/show_bug.cgi?id=1564 -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) -define EXIM_REMOVE_LIBNSL_FROM_MAKEFILE - $(SED) 's/-lnsl//g' $(@D)/OS/Makefile-Linux -endef -endif - -# musl does not provide struct ip_options nor struct ip_opts (but it is -# available with both glibc and uClibc) -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -define EXIM_FIX_IP_OPTIONS_FOR_MUSL - $(SED) 's/#define GLIBC_IP_OPTIONS/#define DARWIN_IP_OPTIONS/' \ - $(@D)/OS/os.h-Linux -endef -endif - -define EXIM_CONFIGURE_TOOLCHAIN - $(call exim-config-add,CC,$(TARGET_CC)) - $(call exim-config-add,CFLAGS,$(TARGET_CFLAGS)) - $(call exim-config-add,AR,$(TARGET_AR) cq) - $(call exim-config-add,RANLIB,$(TARGET_RANLIB)) - $(call exim-config-add,HOSTCC,$(HOSTCC)) - $(call exim-config-add,HOSTCFLAGS,$(HOSTCFLAGS)) - $(EXIM_REMOVE_LIBNSL_FROM_MAKEFILE) - $(EXIM_FIX_IP_OPTIONS_FOR_MUSL) -endef - -ifneq ($(call qstrip,$(BR2_PACKAGE_EXIM_CUSTOM_CONFIG_FILE)),) -define EXIM_CONFIGURE_CMDS - $(EXIM_USE_CUSTOM_CONFIG_FILE) - $(EXIM_CONFIGURE_TOOLCHAIN) -endef -else # CUSTOM_CONFIG -define EXIM_CONFIGURE_CMDS - $(EXIM_USE_DEFAULT_CONFIG_FILE) - $(EXIM_USE_DEFAULT_CONFIG_FILE_DOVECOT) - $(EXIM_USE_DEFAULT_CONFIG_FILE_CLAMAV) - $(EXIM_USE_DEFAULT_CONFIG_FILE_OPENSSL) - $(EXIM_CONFIGURE_TOOLCHAIN) -endef -endif # CUSTOM_CONFIG - -# exim needs a bit of love to build statically -ifeq ($(BR2_STATIC_LIBS),y) -EXIM_STATIC_FLAGS = LFLAGS="-pthread --static" -endif - -# "The -j (parallel) flag must not be used with make" -# (http://www.exim.org/exim-html-current/doc/html/spec_html/ch04.html) -define EXIM_BUILD_CMDS - $(TARGET_MAKE_ENV) build=br $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) -endef - -# Need to replicate the LFLAGS in install, as exim still wants to build -# something when installing... -define EXIM_INSTALL_TARGET_CMDS - DESTDIR=$(TARGET_DIR) INSTALL_ARG="-no_chown -no_symlink" build=br \ - $(MAKE1) -C $(@D) $(EXIM_STATIC_FLAGS) install - chmod u+s $(TARGET_DIR)/usr/sbin/exim -endef - -define EXIM_USERS - exim 88 mail 8 * - - - exim -endef - -define EXIM_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/exim/S86exim \ - $(TARGET_DIR)/etc/init.d/S86exim -endef - -define EXIM_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/exim/exim.service \ - $(TARGET_DIR)/usr/lib/systemd/system/exim.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/exim.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/exim.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/exim/exim.service b/package.bak/exim/exim.service deleted file mode 100644 index 26daabc4c0..0000000000 --- a/package.bak/exim/exim.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Exim MTA -After=syslog.target network.target - -[Service] -ExecStart=/usr/bin/exim -bdf -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/exiv2/Config.in b/package.bak/exiv2/Config.in deleted file mode 100644 index 8ca95ebcaf..0000000000 --- a/package.bak/exiv2/Config.in +++ /dev/null @@ -1,59 +0,0 @@ -comment "exiv2 needs a toolchain w/ C++, wchar, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR - -config BR2_PACKAGE_EXIV2 - bool "exiv2" - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - 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.bak/exiv2/exiv2.hash b/package.bak/exiv2/exiv2.hash deleted file mode 100644 index b1e78d2c94..0000000000 --- a/package.bak/exiv2/exiv2.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.exiv2.org/download.html -md5 258d4831b30f75a01e0234065c6c2806 exiv2-0.25.tar.gz -# Locally calculated -sha256 c80bfc778a15fdb06f71265db2c3d49d8493c382e516cb99b8c9f9cbde36efa4 exiv2-0.25.tar.gz diff --git a/package.bak/exiv2/exiv2.mk b/package.bak/exiv2/exiv2.mk deleted file mode 100644 index 45f9289199..0000000000 --- a/package.bak/exiv2/exiv2.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# exiv2 -# -################################################################################ - -EXIV2_VERSION = 0.25 -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.bak/expat/Config.in b/package.bak/expat/Config.in deleted file mode 100644 index 758fb7d516..0000000000 --- a/package.bak/expat/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_EXPAT - bool "expat" - help - The Expat XML Parser. - - http://expat.sourceforge.net diff --git a/package.bak/expat/expat.hash b/package.bak/expat/expat.hash deleted file mode 100644 index 371abdec91..0000000000 --- a/package.bak/expat/expat.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://sourceforge.net/projects/expat/files/expat/2.2.0/ -md5 2f47841c829facb346eb6e3fab5212e2 expat-2.2.0.tar.bz2 -sha1 8453bc52324be4c796fd38742ec48470eef358b3 expat-2.2.0.tar.bz2 -# Calculated based on the hashes above -sha256 d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff expat-2.2.0.tar.bz2 diff --git a/package.bak/expat/expat.mk b/package.bak/expat/expat.mk deleted file mode 100644 index e7bb74a966..0000000000 --- a/package.bak/expat/expat.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# expat -# -################################################################################ - -EXPAT_VERSION = 2.2.0 -EXPAT_SITE = http://downloads.sourceforge.net/project/expat/expat/$(EXPAT_VERSION) -EXPAT_SOURCE = expat-$(EXPAT_VERSION).tar.bz2 -EXPAT_INSTALL_STAGING = YES -EXPAT_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) installlib -EXPAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) installlib -EXPAT_DEPENDENCIES = host-pkgconf -HOST_EXPAT_DEPENDENCIES = host-pkgconf -EXPAT_LICENSE = MIT -EXPAT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/expect/0001-enable-cross-compilation.patch b/package.bak/expect/0001-enable-cross-compilation.patch deleted file mode 100644 index fd31a01f11..0000000000 --- a/package.bak/expect/0001-enable-cross-compilation.patch +++ /dev/null @@ -1,120 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] enable cross compilation for expect - -This patch was created by running ./configure on a modern Linux machine -and inserting the results into the cross compilation section of -each AC_MSG_CHECKING that bombed out with an error. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/configure.in -=================================================================== ---- expect-5.45.orig/configure.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/configure.in 2013-11-14 07:59:58.732100595 -0600 -@@ -481,7 +481,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if any value exists for WNOHANG]) -@@ -506,7 +506,8 @@ - AC_MSG_RESULT(no) - AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) -+ AC_DEFINE(WNOHANG_BACKUP_VALUE, 1) - ) - - # -@@ -574,7 +575,7 @@ - AC_DEFINE(REARM_SIG) - , - AC_MSG_RESULT(no) --, AC_MSG_WARN([Expect can't be cross compiled]) -+, AC_MSG_RESULT(no) - ) - - # HPUX7 has trouble with the big cat so split it -@@ -725,7 +726,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # mach systems have include files for unimplemented features -@@ -749,7 +750,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIO) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - - # now check for the new style ttys (not yet posix) -@@ -771,7 +774,9 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_DEFINE(HAVE_TERMIOS) -+ PTY_TYPE=termios -+ AC_MSG_RESULT(yes) - ) - fi - -@@ -794,7 +799,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - AC_MSG_CHECKING([if TIOCGWINSZ in termios.h]) -@@ -816,7 +821,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # finally check for Cray style ttys -@@ -837,7 +842,7 @@ - , - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(no) - ) - - # -@@ -869,7 +874,9 @@ - AC_HAVE_FUNCS(getpty) - - # following test sets SETPGRP_VOID if setpgrp takes 0 args, else takes 2 --AC_FUNC_SETPGRP -+cat >>expect_cf.h <<\_ACEOF -+#define SETPGRP_VOID 1 -+_ACEOF - - # - # check for timezones -@@ -889,7 +896,7 @@ - AC_MSG_RESULT(yes), - AC_MSG_RESULT(no) - , -- AC_MSG_ERROR([Expect can't be cross compiled]) -+ AC_MSG_RESULT(yes) - ) - - diff --git a/package.bak/expect/0002-allow-tcl-build-directory.patch b/package.bak/expect/0002-allow-tcl-build-directory.patch deleted file mode 100644 index 83ede7acb6..0000000000 --- a/package.bak/expect/0002-allow-tcl-build-directory.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] Allow tcl build directory for linking - -Some small changes to use TCL_BUILD_LIB_SPEC instead of TCL_LIB_SPEC for -linking against tcl directly out of its build directory. - -Signed-off-by: Andrew Ruder ---- - -Index: expect-5.45/Makefile.in -=================================================================== ---- expect-5.45.orig/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -+++ expect-5.45/Makefile.in 2013-11-14 07:59:58.732100595 -0600 -@@ -393,7 +393,7 @@ - @LDFLAGS_DEFAULT@ \ - -o expect exp_main_exp.o \ - @EXP_BUILD_LIB_SPEC@ \ -- @TCL_LIB_SPEC@ \ -+ @TCL_BUILD_LIB_SPEC@ \ - @TCL_DL_LIBS@ @PKG_LIBS@ @MATH_LIBS@ \ - @TCL_CC_SEARCH_FLAGS@ \ - @EXP_CC_SEARCH_FLAGS@ -Index: expect-5.45/tclconfig/tcl.m4 -=================================================================== ---- expect-5.45.orig/tclconfig/tcl.m4 2010-11-09 13:42:10.000000000 -0600 -+++ expect-5.45/tclconfig/tcl.m4 2013-11-14 08:02:08.424100580 -0600 -@@ -412,6 +412,7 @@ - AC_SUBST(TCL_LIB_FILE) - AC_SUBST(TCL_LIB_FLAG) - AC_SUBST(TCL_LIB_SPEC) -+ AC_SUBST(TCL_BUILD_LIB_SPEC) - - AC_SUBST(TCL_STUB_LIB_FILE) - AC_SUBST(TCL_STUB_LIB_FLAG) diff --git a/package.bak/expect/Config.in b/package.bak/expect/Config.in deleted file mode 100644 index 5557f4aee6..0000000000 --- a/package.bak/expect/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_EXPECT - bool "expect" - help - Expect is a tool for automating interactive applications - such as telnet, ftp, passwd, fsck, rlogin, ssh, tip, etc. - - http://expect.sourceforge.net/ diff --git a/package.bak/expect/expect.mk b/package.bak/expect/expect.mk deleted file mode 100644 index d78ff6c208..0000000000 --- a/package.bak/expect/expect.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# expect -# -################################################################################ - -# Version 5.45.3 -EXPECT_VERSION = 2014-05-02 -EXPECT_SITE = cvs://expect.cvs.sourceforge.net:/cvsroot/expect -EXPECT_LICENSE = Public domain -EXPECT_LICENSE_FILES = README - -EXPECT_AUTORECONF = YES -EXPECT_DEPENDENCIES = tcl -EXPECT_CONF_OPTS = --with-tcl=$(BUILD_DIR)/tcl-$(TCL_VERSION)/unix - -# Since we don't want examples installed -EXPECT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-binaries - -$(eval $(autotools-package)) diff --git a/package.bak/expedite/Config.in b/package.bak/expedite/Config.in deleted file mode 100644 index 0bcf34349b..0000000000 --- a/package.bak/expedite/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_EXPEDITE - bool "expedite" - depends on BR2_PACKAGE_EFL - depends on BR2_INSTALL_LIBSTDCPP - help - Expedite is the official Evas benchmark tool. It can test different - engines, such as X11, XRender, OpenGL (also ES variant), SDL, - DirectFB and so on. Its tests are quite extensive, trying to - reproduce real world usage cases. - -comment "expedite needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/expedite/expedite.hash b/package.bak/expedite/expedite.hash deleted file mode 100644 index 85c4444eb6..0000000000 --- a/package.bak/expedite/expedite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 a8690a714c16d6b67e7fd6d70973e9805c3569a9131900b1feaf183220496831 expedite-ffa005ea3de26b4219f32c285cb1665bb1366163.tar.gz diff --git a/package.bak/expedite/expedite.mk b/package.bak/expedite/expedite.mk deleted file mode 100644 index 0b2901d80d..0000000000 --- a/package.bak/expedite/expedite.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# expedite -# -################################################################################ - -EXPEDITE_VERSION = ffa005ea3de26b4219f32c285cb1665bb1366163 -EXPEDITE_SITE = http://git.enlightenment.org/tools/expedite.git -EXPEDITE_SITE_METHOD = git -EXPEDITE_LICENSE = BSD-2c -EXPEDITE_LICENSE_FILES = COPYING - -EXPEDITE_DEPENDENCIES = host-efl host-pkgconf efl - -# There is no configure script in the git tree. -EXPEDITE_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_EFL_X_XLIB),y) -EXPEDITE_CONF_OPTS += --with-x=$(STAGING_DIR) \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/explorercanvas/Config.in b/package.bak/explorercanvas/Config.in deleted file mode 100644 index 9714a580ce..0000000000 --- a/package.bak/explorercanvas/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_EXPLORERCANVAS - bool "explorercanvas" - help - Modern browsers like Firefox, Safari, Chrome and Opera - support the HTML5 canvas tag to allow 2D command-based - drawing. ExplorerCanvas brings the same functionality to - Internet Explorer ( -Date: Mon, 14 Sep 2015 22:25:12 +0200 -Subject: [PATCH] sha2.c: explicitly include endian.h for BYTE_ORDER macro - -Fixes a build issue with the musl C library, which doesn't indirectly -include endian.h from any of the included system headers: - -http://autobuild.buildroot.net/results/17b/17bde543db253c008079b04c5e341f804160f59c/build-end.log - -Upstream-Status: submitted (https://github.com/ffainelli/faifa/pull/12) - -Signed-off-by: Peter Korsgaard ---- - sha2.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sha2.c b/sha2.c -index f2f5132..4c8a72d 100644 ---- a/sha2.c -+++ b/sha2.c -@@ -40,6 +40,7 @@ - #include - #include - -+#include "endian.h" - #include "sha2.h" - - /* --- -2.1.4 - diff --git a/package.bak/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch b/package.bak/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch deleted file mode 100644 index 6f340c3509..0000000000 --- a/package.bak/faifa/0002-hpav_cfg.c-do-not-include-linux-if_ether.h-for-musl-.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 36eed08a3783df6bb8d92d3c80cd47d0660eeb12 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 16:27:37 +0100 -Subject: [PATCH 1/1] hpav_cfg.c: do not include linux/if_ether.h for musl - compatibility - -Fixes a build issue with the musl C library -http://autobuild.buildroot.net/results/dc6/dc6e4d7327d2031ef921cccd814605dec73a0f9c/build-end.log - -Patch sent upstream: https://github.com/ffainelli/faifa/pull/13 - -Signed-off-by: Bernd Kuhls ---- - hpav_cfg.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/hpav_cfg.c b/hpav_cfg.c -index 7cc53af..45d3f0a 100644 ---- a/hpav_cfg.c -+++ b/hpav_cfg.c -@@ -53,8 +53,6 @@ - #include - #include - --#include -- - #include "homeplug_av.h" - #include "crypto.h" - --- -2.7.0.rc3 - diff --git a/package.bak/faifa/Config.in b/package.bak/faifa/Config.in deleted file mode 100644 index de2cc7979e..0000000000 --- a/package.bak/faifa/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FAIFA - bool "faifa" - select BR2_PACKAGE_LIBPCAP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Faifa can configure any Intellon-based Power Line - Communication device using Intellon INT5000 and INT6000 - series chips (6000 and 6300 chips). It supports all - Intellon-specific management and control frames as well as - standard management frames. - - https://dev.open-plc.org - -comment "faifa needs a toolchain w/ dynamic library, threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/faifa/faifa.hash b/package.bak/faifa/faifa.hash deleted file mode 100644 index b4c27418f7..0000000000 --- a/package.bak/faifa/faifa.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 6eada81f3d21f80b5848338b627784981064d728f8e377e5cf973d31640d4489 faifa-v0.1.tar.gz diff --git a/package.bak/faifa/faifa.mk b/package.bak/faifa/faifa.mk deleted file mode 100644 index a56a8c0332..0000000000 --- a/package.bak/faifa/faifa.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# faifa -# -################################################################################ - -FAIFA_VERSION = v0.1 -FAIFA_SITE = $(call github,ffainelli,faifa,$(FAIFA_VERSION)) -FAIFA_INSTALL_STAGING = YES -FAIFA_DEPENDENCIES = libpcap host-autoconf -FAIFA_LICENSE = BSD-3c -FAIFA_LICENSE_FILES = COPYING - -FAIFA_MAKE_OPTS += GIT_REV=$(FAIFA_VERSION) - -# This package uses autoconf, but not automake, so we need to call -# their special autogen.sh script, and have custom target and staging -# installation commands. - -define FAIFA_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -FAIFA_PRE_CONFIGURE_HOOKS += FAIFA_RUN_AUTOGEN - -define FAIFA_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - PREFIX=/usr \ - STRIP=/bin/true \ - DESTDIR=$(TARGET_DIR) \ - install -endef - -define FAIFA_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - PREFIX=/usr \ - STRIP=/bin/true \ - DESTDIR=$(STAGING_DIR) \ - install -endef - -$(eval $(autotools-package)) diff --git a/package.bak/fakedate/fakedate b/package.bak/fakedate/fakedate deleted file mode 100755 index 4a9b9b5e64..0000000000 --- a/package.bak/fakedate/fakedate +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# vim: set sw=4 expandtab: -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Copyright (C) 2016 Jérôme Pouiller -# - -# Sanity check -if ! readlink -f "$0" | grep -q fakedate; then - echo "fakedate: Please name this script \`fakedate'" - exit 1 -fi - -DATE_BIN=false -# Do not call `date' directly since it will produce an infinite recursion. -# Instead, find path of true `date' binary. -for P in `echo $PATH | tr ':' ' '`; do - if [ -x "$P/date" ]; then - if readlink -f "$P/date" | grep -qv fakedate; then - DATE_BIN="$P/date" - break; - fi - fi -done - -if [ -n "$SOURCE_DATE_EPOCH" ]; then - FORCE_EPOCH=1 - for i in "$@"; do - # Use of --date, --file and --reference (and their short option counter - # parts) is incompatible with SOURCE_DATE_EPOCH. - # -u and -R are the only short options without argument. So they could - # appear between '-' and option we want to match. - if echo "$i" | grep -qE '^-([uR]*d|-date|[uR]*f|-file|[uR]*r|--reference)'; then - FORCE_EPOCH=0 - break; - fi - done - if [ $FORCE_EPOCH -eq 1 ]; then - echo "date: Warning: using \$SOURCE_DATE_EPOCH instead of true time" >&2 - exec $DATE_BIN -d "@$SOURCE_DATE_EPOCH" "$@" - fi -fi - -exec $DATE_BIN "$@" diff --git a/package.bak/fakedate/fakedate.mk b/package.bak/fakedate/fakedate.mk deleted file mode 100644 index 61d4bd702e..0000000000 --- a/package.bak/fakedate/fakedate.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# fakedate -# -################################################################################ - -# source included in buildroot -HOST_FAKEDATE_LICENSE = GPLv2+ - -define HOST_FAKEDATE_INSTALL_CMDS - $(INSTALL) -D -m 755 package/fakedate/fakedate $(HOST_DIR)/usr/bin/fakedate - ln -sfn fakedate $(HOST_DIR)/usr/bin/date -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/fakeroot/0001-hide-dlsym-error.patch b/package.bak/fakeroot/0001-hide-dlsym-error.patch deleted file mode 100644 index 2c61fab248..0000000000 --- a/package.bak/fakeroot/0001-hide-dlsym-error.patch +++ /dev/null @@ -1,34 +0,0 @@ -Description: Hide error from dlsym() - dlsym(), starting in glibc 2.24 actually reports errors. In our case, - we try to get ACL functions which are not in the glibc. This causes - failures in test suites, so hide those messages for non-debugging - purposes for now. It also makes the build logs annoying to read. -Author: Julian Andres Klode -Origin: vendor -Bug-Debian: https://bugs.debian.org/830912 -Forwarded: no -Last-Update: 2016-08-12 - -Signed-off-by: Maxime Hadjinlian - ---- a/libfakeroot.c -+++ b/libfakeroot.c -@@ -256,10 +256,16 @@ void load_library_symbols(void){ - /* clear dlerror() just in case dlsym() legitimately returns NULL */ - msg = dlerror(); - *(next_wrap[i].doit)=dlsym(get_libc(), next_wrap[i].name); -+ - if ( (msg = dlerror()) != NULL){ -- fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); --/* abort ();*/ -+#ifdef LIBFAKEROOT_DEBUGGING -+ if (fakeroot_debug) { -+ fprintf (stderr, "dlsym(%s): %s\n", next_wrap[i].name, msg); -+/* abort ();*/ -+ } -+#endif - } -+ - } - } - diff --git a/package.bak/fakeroot/fakeroot.hash b/package.bak/fakeroot/fakeroot.hash deleted file mode 100644 index f0d436e5c3..0000000000 --- a/package.bak/fakeroot/fakeroot.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://snapshot.debian.org/package/fakeroot/1.20.2-1/ -sha1 367040df07043edb630942b21939e493f3fad888 fakeroot_1.20.2.orig.tar.bz2 -# Calculated based on the hash above -sha256 7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c fakeroot_1.20.2.orig.tar.bz2 diff --git a/package.bak/fakeroot/fakeroot.mk b/package.bak/fakeroot/fakeroot.mk deleted file mode 100644 index 168cd13a48..0000000000 --- a/package.bak/fakeroot/fakeroot.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# fakeroot -# -################################################################################ - -FAKEROOT_VERSION = 1.20.2 -FAKEROOT_SOURCE = fakeroot_$(FAKEROOT_VERSION).orig.tar.bz2 -FAKEROOT_SITE = http://snapshot.debian.org/archive/debian/20141005T221953Z/pool/main/f/fakeroot -# Force capabilities detection off -# For now these are process capabilities (faked) rather than file -# so they're of no real use -HOST_FAKEROOT_CONF_ENV = \ - ac_cv_header_sys_capability_h=no \ - ac_cv_func_capset=no - -FAKEROOT_LICENSE = GPLv3+ -FAKEROOT_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) diff --git a/package.bak/faketime/Config.in.host b/package.bak/faketime/Config.in.host deleted file mode 100644 index 0ebb9638cf..0000000000 --- a/package.bak/faketime/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_FAKETIME - bool "host faketime" - help - Faketime reports faked system time to programs without - having to change the system-wide time. - - https://github.com/wolfcw/libfaketime diff --git a/package.bak/faketime/faketime.hash b/package.bak/faketime/faketime.hash deleted file mode 100644 index a17ef8526b..0000000000 --- a/package.bak/faketime/faketime.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 56bc32006f4c5b021ff648cc1fd458c5316f40aadfd2031879229a234189b031 faketime-v0.9.6.tar.gz diff --git a/package.bak/faketime/faketime.mk b/package.bak/faketime/faketime.mk deleted file mode 100644 index 292fe175cb..0000000000 --- a/package.bak/faketime/faketime.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libfaketime -# -################################################################################ - -FAKETIME_VERSION = v0.9.6 -FAKETIME_SITE = $(call github,wolfcw,libfaketime,$(FAKETIME_VERSION)) -FAKETIME_LICENSE = GPLv2 -FAKETIME_LICENSE_FILES = COPYING - -define HOST_FAKETIME_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr -endef - -define HOST_FAKETIME_INSTALL_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR)/usr install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/fan-ctrl/Config.in b/package.bak/fan-ctrl/Config.in deleted file mode 100644 index 869631683b..0000000000 --- a/package.bak/fan-ctrl/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_FAN_CTRL - bool "fan-ctrl" - depends on BR2_USE_MMU # fork() - help - Fan-ctrl is a little daemon that controls the speed of one - or more system or CPU fans. It does so by monitoring - temperature inputs and selecting a fan speed from an array - of available speeds based on a set of temperature - thresholds. - - http://fan-ctrl.sourceforge.net/ diff --git a/package.bak/fan-ctrl/fan-ctrl.hash b/package.bak/fan-ctrl/fan-ctrl.hash deleted file mode 100644 index 0bd5d60977..0000000000 --- a/package.bak/fan-ctrl/fan-ctrl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha1 d8ba5bac15e90c36a4e908ca1c98fac83bf702ea fan-ctrl.c?revision=1.3 diff --git a/package.bak/fan-ctrl/fan-ctrl.mk b/package.bak/fan-ctrl/fan-ctrl.mk deleted file mode 100644 index 4232286120..0000000000 --- a/package.bak/fan-ctrl/fan-ctrl.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# fan-ctrl -# -################################################################################ - -# no release, so grab .c file directly from viewvc -FAN_CTRL_VERSION = 1.3 -FAN_CTRL_SOURCE = fan-ctrl.c?revision=$(FAN_CTRL_VERSION) -FAN_CTRL_SITE = http://fan-ctrl.cvs.sourceforge.net/viewvc/fan-ctrl/fan-ctrl -FAN_CTRL_LICENSE = GPLv2+ -FAN_CTRL_LICENSE_FILES = fan-ctrl.c - -define FAN_CTRL_EXTRACT_CMDS - cp $(DL_DIR)/$(FAN_CTRL_SOURCE) $(@D)/fan-ctrl.c -endef - -define FAN_CTRL_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) \ - $(@D)/fan-ctrl.c -o $(@D)/fan-ctrl -endef - -define FAN_CTRL_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/fan-ctrl $(TARGET_DIR)/usr/sbin/fan-ctrl -endef - -$(eval $(generic-package)) diff --git a/package.bak/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch b/package.bak/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch deleted file mode 100644 index 489c7269f8..0000000000 --- a/package.bak/fastd/0001-cmake-use-INTERPROCEDURAL_OPTIMIZATION-target-proper.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: Alexander Dahl -Date: Wed, 28 Oct 2015 16:04:13 +0100 -Subject: [PATCH] cmake: use INTERPROCEDURAL_OPTIMIZATION target property - -Instead of hacking on compiler flags use the cmake way for handling -interprocedural optimization. Tests showed cmake currently ignores this -for gcc and clang, at least on Debian Wheezy and Jessie. This actually -results in no interprocedural optimization for the moment. However it -allows to compile fastd against a toolchain without LTO support, which -was broken because of a hack included here for finding binutils. - -According to the upstream author of fastd the main reason for enabling -LTO was binary size on an OpenWRT target for Freifunk Gluon, where they -have very few space left on devices with only 4 MB flash memory. - -Signed-off-by: Alexander Dahl ---- - cmake/checks.cmake | 14 -------------- - src/CMakeLists.txt | 9 +++++++++ - 2 files changed, 9 insertions(+), 14 deletions(-) - -diff --git a/cmake/checks.cmake b/cmake/checks.cmake -index 27c073f..8a671a1 100644 ---- a/cmake/checks.cmake -+++ b/cmake/checks.cmake -@@ -10,20 +10,6 @@ if(ARCH_X86 OR ARCH_X86_64) - endif(ARCH_X86 OR ARCH_X86_64) - - -- --if(ENABLE_LTO) -- set(CFLAGS_LTO "-flto") -- set(CFLAGS_NO_LTO "-fno-lto") -- -- check_c_compiler_flag("-fwhole-program" HAVE_FLAG_WHOLE_PROGRAM) -- if(HAVE_FLAG_WHOLE_PROGRAM) -- set(LDFLAGS_LTO "-flto -fwhole-program") -- else(HAVE_FLAG_WHOLE_PROGRAM) -- set(LDFLAGS_LTO "-flto") -- endif(HAVE_FLAG_WHOLE_PROGRAM) --endif(ENABLE_LTO) -- -- - check_c_source_compiles(" - #include - #include -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 829b3ab..7612b40 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -48,6 +48,15 @@ add_executable(fastd - set_property(TARGET fastd PROPERTY COMPILE_FLAGS "${FASTD_CFLAGS}") - set_property(TARGET fastd PROPERTY LINK_FLAGS "${PTHREAD_LDFLAGS} ${LIBUECC_LDFLAGS_OTHER} ${NACL_LDFLAGS_OTHER} ${JSON_C_LDFLAGS_OTHER} ${LDFLAGS_LTO}") - set_property(TARGET fastd APPEND PROPERTY INCLUDE_DIRECTORIES ${LIBCAP_INCLUDE_DIR} ${NACL_INCLUDE_DIRS} ${JSON_C_INCLUDE_DIR}) -+if(ENABLE_LTO) -+ set_target_properties(fastd PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION ON -+ ) -+else(ENABLE_LTO) -+ set_target_properties(fastd PROPERTIES -+ INTERPROCEDURAL_OPTIMIZATION OFF -+ ) -+endif(ENABLE_LTO) - target_link_libraries(fastd protocols methods ciphers macs ${RT_LIBRARY} ${LIBCAP_LIBRARY} ${LIBUECC_LIBRARIES} ${NACL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARY} ${JSON_C_LIBRARIES}) - - add_dependencies(fastd version) --- -2.1.4 - diff --git a/package.bak/fastd/Config.in b/package.bak/fastd/Config.in deleted file mode 100644 index 546d449471..0000000000 --- a/package.bak/fastd/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_FASTD - bool "fastd" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # libuecc - select BR2_PACKAGE_LIBUECC - select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_LIBCAP - help - Fast and Secure Tunneling Daemon - - https://projects.universe-factory.net/projects/fastd/wiki - -if BR2_PACKAGE_FASTD - -config BR2_PACKAGE_FASTD_STATUS_SOCKET - bool "status socket support" - default y - select BR2_PACKAGE_JSON_C - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - help - Enable support for a socket to get fastd's status. - -endif - -comment "fastd needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS diff --git a/package.bak/fastd/fastd.hash b/package.bak/fastd/fastd.hash deleted file mode 100644 index 3c6a99e986..0000000000 --- a/package.bak/fastd/fastd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 e53236d3049f64f7955ad9556da099eb fastd-18.tar.xz -# computed locally -sha256 714ff09d7bd75f79783f744f6f8c5af2fe456c8cf876feaa704c205a73e043c9 fastd-18.tar.xz diff --git a/package.bak/fastd/fastd.mk b/package.bak/fastd/fastd.mk deleted file mode 100644 index 0e510db879..0000000000 --- a/package.bak/fastd/fastd.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# fastd -# -################################################################################ - -FASTD_VERSION = 18 -FASTD_SITE = https://projects.universe-factory.net/attachments/download/86 -FASTD_SOURCE = fastd-$(FASTD_VERSION).tar.xz -FASTD_LICENSE = BSD-2c -FASTD_LICENSE_FILES = COPYRIGHT -FASTD_CONF_OPTS = -DENABLE_LIBSODIUM=ON -FASTD_DEPENDENCIES = host-bison host-pkgconf libuecc libsodium libcap - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -FASTD_CONF_OPTS += -DENABLE_OPENSSL=ON -FASTD_DEPENDENCIES += openssl -else -FASTD_CONF_OPTS += -DENABLE_OPENSSL=OFF -endif - -ifeq ($(BR2_PACKAGE_FASTD_STATUS_SOCKET),y) -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=ON -FASTD_DEPENDENCIES += json-c -else -FASTD_CONF_OPTS += -DWITH_STATUS_SOCKET=OFF -endif - -ifeq ($(BR2_INIT_SYSTEMD),y) -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=ON -else -FASTD_CONF_OPTS += -DENABLE_SYSTEMD=OFF -endif - -ifeq ($(BR2_GCC_ENABLE_LTO),y) -FASTD_CONF_OPTS += -DENABLE_LTO=ON -else -FASTD_CONF_OPTS += -DENABLE_LTO=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/fb-test-app/Config.in b/package.bak/fb-test-app/Config.in deleted file mode 100644 index 23b5568d80..0000000000 --- a/package.bak/fb-test-app/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_FB_TEST_APP - bool "fb-test-app" - help - Test suite for Linux framebuffer. - - https://github.com/prpplague/fb-test-app diff --git a/package.bak/fb-test-app/fb-test-app.hash b/package.bak/fb-test-app/fb-test-app.hash deleted file mode 100644 index 7f7375316c..0000000000 --- a/package.bak/fb-test-app/fb-test-app.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6baf6b45968d0bb9a5527c6c4bf18661e9f9eb9be973a6d1952c38168c90d58f fb-test-app-rosetta-1.1.0.tar.gz diff --git a/package.bak/fb-test-app/fb-test-app.mk b/package.bak/fb-test-app/fb-test-app.mk deleted file mode 100644 index 9cd0aece44..0000000000 --- a/package.bak/fb-test-app/fb-test-app.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# fb-test-app -# -################################################################################ - -FB_TEST_APP_VERSION = rosetta-1.1.0 -FB_TEST_APP_SITE = $(call github,prpplague,fb-test-app,$(FB_TEST_APP_VERSION)) -FB_TEST_APP_LICENSE = GPLv2 -FB_TEST_APP_LICENSE_FILES = COPYING - -define FB_TEST_APP_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define FB_TEST_APP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/perf $(TARGET_DIR)/usr/bin/fb-test-perf - $(INSTALL) -D -m 0755 $(@D)/rect $(TARGET_DIR)/usr/bin/fb-test-rect - $(INSTALL) -D -m 0755 $(@D)/fb-test $(TARGET_DIR)/usr/bin/fb-test - $(INSTALL) -D -m 0755 $(@D)/offset $(TARGET_DIR)/usr/bin/fb-test-offset -endef - -$(eval $(generic-package)) diff --git a/package.bak/fbdump/Config.in b/package.bak/fbdump/Config.in deleted file mode 100644 index 982448dd59..0000000000 --- a/package.bak/fbdump/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_FBDUMP - bool "fbdump (Framebuffer Capture Tool)" - help - fbdump is a simple tool to capture snapshots from the Linux kernel - framebuffer device and write them out as a PPM file. Currently, - most packed-pixel framebuffer formats and the vga16 framebuffer - are supported. - - http://www.rcdrummond.net/fbdump diff --git a/package.bak/fbdump/fbdump.hash b/package.bak/fbdump/fbdump.hash deleted file mode 100644 index 15cc8392d6..0000000000 --- a/package.bak/fbdump/fbdump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c4d521a86229b3106cf69786008ad94f899da5288a19a067deae84951880722d fbdump-0.4.2.tar.gz diff --git a/package.bak/fbdump/fbdump.mk b/package.bak/fbdump/fbdump.mk deleted file mode 100644 index 9295acd0f5..0000000000 --- a/package.bak/fbdump/fbdump.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# fbdump -# -################################################################################ - -FBDUMP_VERSION = 0.4.2 -FBDUMP_SITE = http://www.rcdrummond.net/fbdump -FBDUMP_LICENSE = GPLv2 -FBDUMP_LICENSE_FILES = COPYING - -# The VGA16 specific feature of fbdump doesn't make much sense outside -# of the x86/x86-64 architectures, and causes build problems on some -# architectures as outw() is not always available. -ifeq ($(BR2_i386)$(BR2_x86_64),y) -FBDUMP_CONF_OPTS += --enable-vga16fb -else -FBDUMP_CONF_OPTS += --disable-vga16fb -endif - -$(eval $(autotools-package)) diff --git a/package.bak/fbgrab/0001-fix-static-build.patch b/package.bak/fbgrab/0001-fix-static-build.patch deleted file mode 100644 index fe5ae2cab1..0000000000 --- a/package.bak/fbgrab/0001-fix-static-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -Fix static build - -fbgrab links against libpng, which depends on libm. For shared library -builds, there is nothing special to do about this, but for static -library builds, it is necessary to pass -lm when linking fbgrab. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -12,7 +12,7 @@ - all: fbgrab fbgrab.1.gz - - fbgrab: fbgrab.c -- $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) $< -lpng -lz -o $@ -+ $(CC) -g -Wall $(CFLAGS) $(LDFLAGS) $< -lpng -lz -lm -o $@ - - fbgrab.1.gz: fbgrab.1.man - $(GZIP) $(GZIPFLAGS) $< > $@ diff --git a/package.bak/fbgrab/Config.in b/package.bak/fbgrab/Config.in deleted file mode 100644 index f3b29d9f99..0000000000 --- a/package.bak/fbgrab/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FBGRAB - bool "fbgrab" - select BR2_PACKAGE_LIBPNG - help - FBGrab is a framebuffer screenshot program, capturing the linux - frambuffer and converting it to a png-picture. - - http://fbgrab.monells.se/ diff --git a/package.bak/fbgrab/fbgrab.hash b/package.bak/fbgrab/fbgrab.hash deleted file mode 100644 index de3bc1ffd7..0000000000 --- a/package.bak/fbgrab/fbgrab.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5fab478cbf8731fbacefaa76236a8f8b38ccff920c53b3a8253bc35509fba8ed fbgrab-1.3.tar.gz diff --git a/package.bak/fbgrab/fbgrab.mk b/package.bak/fbgrab/fbgrab.mk deleted file mode 100644 index 4455423126..0000000000 --- a/package.bak/fbgrab/fbgrab.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# fbgrab -# -################################################################################ - -FBGRAB_VERSION = 1.3 -FBGRAB_SITE = http://fbgrab.monells.se -FBGRAB_DEPENDENCIES = libpng -FBGRAB_LICENSE = GPLv2 -FBGRAB_LICENSE_FILES = COPYING - -define FBGRAB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define FBGRAB_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/fbgrab $(TARGET_DIR)/usr/bin/fbgrab -endef - -$(eval $(generic-package)) diff --git a/package.bak/fbset/0001-Fix-musl-compile.patch b/package.bak/fbset/0001-Fix-musl-compile.patch deleted file mode 100644 index 65d84c5777..0000000000 --- a/package.bak/fbset/0001-Fix-musl-compile.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6d42be24b62b94df8e2f01956842b7ee4b640e97 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 11 Jul 2016 22:07:42 +0200 -Subject: [PATCH] Fix musl compile. - -Unconditional include for __u32 type. - -Fixes: - - error: unknown type name '__u32' - -Signed-off-by: Peter Seiderer ---- - fbset.h | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/fbset.h b/fbset.h -index 9b1d2ac..3c511e1 100644 ---- a/fbset.h -+++ b/fbset.h -@@ -15,9 +15,7 @@ - #include - #include - --#ifdef __GLIBC__ - #include --#endif - - #define VERSION "Linux Frame Buffer Device Configuration " \ - "Version 2.1 (23/06/1999)\n" \ --- -2.8.1 - diff --git a/package.bak/fbset/Config.in b/package.bak/fbset/Config.in deleted file mode 100644 index c3f8d0ba7f..0000000000 --- a/package.bak/fbset/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_FBSET - bool "fbset" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Fbset is a system utility to show or change the settings of the frame - buffer device. The frame buffer device provides a simple and unique - interface to access different kinds of graphic displays. - - http://users.telenet.be/geertu/Linux/fbdev/ diff --git a/package.bak/fbset/fbset.hash b/package.bak/fbset/fbset.hash deleted file mode 100644 index ca8cc6d1f0..0000000000 --- a/package.bak/fbset/fbset.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 40ff4ab0247b75138a0887ed40f81c1a6184f340b77126c16d074b1075b41c20 fbset-2.1.tar.gz diff --git a/package.bak/fbset/fbset.mk b/package.bak/fbset/fbset.mk deleted file mode 100644 index 16581c4183..0000000000 --- a/package.bak/fbset/fbset.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# fbset -# -################################################################################ - -FBSET_VERSION = 2.1 -FBSET_SITE = http://users.telenet.be/geertu/Linux/fbdev -FBSET_DEPENDENCIES = host-bison host-flex -FBSET_LICENSE = GPLv2 - -# Make sure full fbset wins over busybox fbset -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -FBSET_DEPENDENCIES += busybox -endif - -define FBSET_BUILD_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FBSET_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/fbset $(TARGET_DIR)/usr/sbin/fbset -endef - -$(eval $(generic-package)) diff --git a/package.bak/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch b/package.bak/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch deleted file mode 100644 index 27e1e91068..0000000000 --- a/package.bak/fbterm/0001-fbio.cpp-improxy.cpp-fbterm.cpp-fix-musl-compile.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 1072d60c6c8f1f51feb740527a8a056bfead9318 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 8 Oct 2015 19:53:47 +0200 -Subject: [PATCH] fbio.cpp, improxy.cpp, fbterm.cpp: fix musl compile -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -- add missing include, fixes: - - fbio.cpp:33:8: error: ‘fd_set’ does not name a type - static fd_set fds; - - improxy.cpp:439:3: error: ‘fd_set’ was not declared in this scope - -- add missing WAIT_ANY define, fixes: - - fbterm.cpp: In member function ‘void FbTerm::processSignal(u32)’: - fbterm.cpp:212:22: error: ‘WAIT_ANY’ was not declared in this scope - s32 pid = waitpid(WAIT_ANY, 0, WNOHANG); - -Signed-off-by: Peter Seiderer ---- - src/fbio.cpp | 1 + - src/fbterm.cpp | 4 ++++ - src/improxy.cpp | 1 + - 3 files changed, 6 insertions(+) - -diff --git a/src/fbio.cpp b/src/fbio.cpp -index e5afc44..88c632c 100644 ---- a/src/fbio.cpp -+++ b/src/fbio.cpp -@@ -30,6 +30,7 @@ - #define NR_EPOLL_FDS 10 - s32 epollFd; - #else -+#include - static fd_set fds; - static u32 maxfd = 0; - #endif -diff --git a/src/fbterm.cpp b/src/fbterm.cpp -index 38d4014..60288e4 100644 ---- a/src/fbterm.cpp -+++ b/src/fbterm.cpp -@@ -37,6 +37,10 @@ - #include "input_key.h" - #include "mouse.h" - -+#ifndef WAIT_ANY -+#define WAIT_ANY (-1) -+#endif -+ - #ifdef HAVE_SIGNALFD - // offered by some systems has bug with g++ - #include "signalfd.h" -diff --git a/src/improxy.cpp b/src/improxy.cpp -index 3d03e66..4e046d2 100644 ---- a/src/improxy.cpp -+++ b/src/improxy.cpp -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - #include - #include "improxy.h" - #include "immessage.h" --- -2.1.4 - diff --git a/package.bak/fbterm/0002-mouse.cpp-fix-musl-compile.patch b/package.bak/fbterm/0002-mouse.cpp-fix-musl-compile.patch deleted file mode 100644 index 5182d8ba61..0000000000 --- a/package.bak/fbterm/0002-mouse.cpp-fix-musl-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 18 Feb 2016 22:32:38 +0100 -Subject: [PATCH] mouse.cpp: fix musl compile - -Add missing include, fixes: - - mouse.cpp:58:37: error: 'memset' was not declared in this scope - mouse.cpp:60:64: error: 'strncpy' was not declared in this scope - -Signed-off-by: Peter Seiderer ---- - src/mouse.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mouse.cpp b/src/mouse.cpp -index 0435dd9..f173137 100644 ---- a/src/mouse.cpp -+++ b/src/mouse.cpp -@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse) - #include - #include - #include -+#include - #include - #include - #include --- -2.1.4 - diff --git a/package.bak/fbterm/0003-C++11-compliance.patch b/package.bak/fbterm/0003-C++11-compliance.patch deleted file mode 100644 index 1a06da3d16..0000000000 --- a/package.bak/fbterm/0003-C++11-compliance.patch +++ /dev/null @@ -1,93 +0,0 @@ -lib/vterm_states: fix C++11 compliance - -In C++11, narrowing a type is no longer allowed in structure -initializers: - - struct foo { u16 u; }; - foo f[] = { {0}, {-1} }; - -results in the gcc-6 to whine out loudly, and fail: - - error: narrowing conversion of ‘-1’ from ‘int’ to ‘u16 {aka short unsigned int}’ inside { } [-Wnarrowing] - }; - ^ - -Signed-off-by: "Yann E. MORIN" - -diff -durN fbterm-1.7.0.orig/src/lib/vterm_states.cpp fbterm-1.7.0/src/lib/vterm_states.cpp ---- fbterm-1.7.0.orig/src/lib/vterm_states.cpp 2010-10-06 06:23:08.000000000 +0200 -+++ fbterm-1.7.0/src/lib/vterm_states.cpp 2016-08-13 16:54:29.495451127 +0200 -@@ -22,6 +22,7 @@ - #include "vterm.h" - - #define ADDSAME(len) ((len) << 8) -+#define ENDSEQ { ((u16)-1) } - - const VTerm::Sequence VTerm::control_sequences[] = { - { 0, 0, ESkeep }, -@@ -39,14 +40,14 @@ - { 0x1B, 0, ESesc }, - { 0x7F, 0, ESkeep }, - { 0x9B, 0, ESsquare }, -- { -1} -+ ENDSEQ - }; - - const VTerm::Sequence VTerm::escape_sequences[] = { - { 0, 0, ESnormal }, - - // ESnormal -- { -1 }, -+ ENDSEQ, - - // ESesc - { '[', &VTerm::clear_param, ESsquare }, -@@ -65,7 +66,7 @@ - { '8', &VTerm::restore_cursor, ESnormal }, - { '>', &VTerm::keypad_numeric, ESnormal }, - { '=', &VTerm::keypad_application, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // ESsquare - { '[', 0, ESfunckey }, -@@ -104,7 +105,7 @@ - { '`', &VTerm::cursor_position_col, ESnormal }, - { ']', &VTerm::linux_specific, ESnormal }, - { '}', &VTerm::fbterm_specific, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // ESnonstd - { '0' | ADDSAME(9), &VTerm::set_palette, ESkeep }, -@@ -112,25 +113,25 @@ - { 'a' | ADDSAME(5), &VTerm::set_palette, ESkeep }, - { 'P', &VTerm::begin_set_palette, ESkeep }, - { 'R', &VTerm::reset_palette, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // ESpercent - { '@', &VTerm::clear_utf8, ESnormal }, - { 'G', &VTerm::set_utf8, ESnormal }, - { '8', &VTerm::set_utf8, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // EScharset - { '0', &VTerm::set_charset, ESnormal }, - { 'B', &VTerm::set_charset, ESnormal }, - { 'U', &VTerm::set_charset, ESnormal }, - { 'K', &VTerm::set_charset, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // EShash - { '8', &VTerm::screen_align, ESnormal }, -- { -1 }, -+ ENDSEQ, - - // ESfunckey -- { -1 }, -+ ENDSEQ, - }; diff --git a/package.bak/fbterm/0004-iconv.patch b/package.bak/fbterm/0004-iconv.patch deleted file mode 100644 index 39c9182e4e..0000000000 --- a/package.bak/fbterm/0004-iconv.patch +++ /dev/null @@ -1,41 +0,0 @@ -Fix building against libiconv - -Downloaded from -https://github.com/kyak/openwrt-packages/blob/master/fbterm/patches/001-iconv.patch - -Signed-off-by: Bernd Kuhls - ---- a/src/lib/io.cpp -+++ b/src/lib/io.cpp -@@ -119,10 +119,10 @@ void IoPipe::setCodec(const s8 *up, cons - if (!strcasecmp(up, down)) return; - - mCodecRead = iconv_open(up, down); -- if (mCodecRead == (void*)-1) mCodecRead = 0; -+ if (mCodecRead == (iconv_t)(-1)) mCodecRead = 0; - - mCodecWrite = iconv_open(down, up); -- if (mCodecWrite == (void*)-1) mCodecWrite = 0; -+ if (mCodecWrite == (iconv_t)(-1)) mCodecWrite = 0; - } - - #define BUF_SIZE 10240 ---- a/src/lib/io.h -+++ b/src/lib/io.h -@@ -23,6 +23,7 @@ - - #include "type.h" - #include "instance.h" -+#include - - class IoPipe { - public: -@@ -47,7 +48,7 @@ private: - void writeIo(s8 *buf, u32 len); - - s32 mFd; -- void *mCodecRead, *mCodecWrite; -+ iconv_t mCodecRead, mCodecWrite; - s8 mBufRead[16], mBufWrite[16]; - u32 mBufLenRead, mBufLenWrite; - }; diff --git a/package.bak/fbterm/Config.in b/package.bak/fbterm/Config.in deleted file mode 100644 index 3ab8bdb4d4..0000000000 --- a/package.bak/fbterm/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_FBTERM - bool "fbterm" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_ENABLE_LOCALE - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_LIBERATION - help - fbterm is a fast terminal emulator for Linux with frame buffer - device or VESA video card. - - http://code.google.com/p/fbterm/ - -comment "fbterm needs a toolchain w/ C++, wchar, locale" - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR) diff --git a/package.bak/fbterm/fbterm.hash b/package.bak/fbterm/fbterm.hash deleted file mode 100644 index 20a3e8f083..0000000000 --- a/package.bak/fbterm/fbterm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://code.google.com/p/fbterm/downloads/detail?name=fbterm-1.7.0.tar.gz&can=2&q= -sha1 dc7b7ff29212c1551f35bf7a50967454d3b8c67c fbterm-1.7.0.tar.gz diff --git a/package.bak/fbterm/fbterm.mk b/package.bak/fbterm/fbterm.mk deleted file mode 100644 index be3cbe24fd..0000000000 --- a/package.bak/fbterm/fbterm.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# fbterm -# -################################################################################ - -FBTERM_VERSION = 1.7.0 -FBTERM_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm -FBTERM_LICENSE = GPLv2+ -FBTERM_LICENSE_FILES = COPYING -FBTERM_DEPENDENCIES = fontconfig liberation - -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -# fontconfig uses pthreads if available, but fbterm forgets to link -# with it breaking static builds -FBTERM_CONF_ENV += LIBS='-lpthread' -endif - -ifeq ($(BR2_PACKAGE_GPM),y) -FBTERM_DEPENDENCIES += gpm -FBTERM_CONF_OPTS += --enable-gpm -else -FBTERM_CONF_OPTS += --disable-gpm -endif - -$(eval $(autotools-package)) diff --git a/package.bak/fbtft/Config.in b/package.bak/fbtft/Config.in deleted file mode 100644 index 0a4de19091..0000000000 --- a/package.bak/fbtft/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -# Prompt-less option, because this package is not doing anything -# except downloading the FB TFT sources. The real work is done by a -# Linux extension. -config BR2_PACKAGE_FBTFT - bool - depends on BR2_LINUX_KERNEL - help - Linux Framebuffer drivers for small TFT LCD display modules, - e.g. Adafruit PiTFT displays for Raspberry Pi. - - This is only the download helper for the kernel patch. - - https://github.com/notro/fbtft diff --git a/package.bak/fbtft/fbtft.hash b/package.bak/fbtft/fbtft.hash deleted file mode 100644 index 894d9794a9..0000000000 --- a/package.bak/fbtft/fbtft.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 0e81de89fdd7ab810716fc0549e767527f342e829309dee5c2cca1e9d1728770 fbtft-274035404701245e7491c0c6471c5b72ade4d491.tar.gz diff --git a/package.bak/fbtft/fbtft.mk b/package.bak/fbtft/fbtft.mk deleted file mode 100644 index 913627dfc9..0000000000 --- a/package.bak/fbtft/fbtft.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# fbtft -# -################################################################################ - -FBTFT_VERSION = 274035404701245e7491c0c6471c5b72ade4d491 -FBTFT_SITE = $(call github,notro,fbtft,$(FBTFT_VERSION)) -FBTFT_LICENSE = GPLv2 - -$(eval $(generic-package)) diff --git a/package.bak/fbv/0002-cross.patch b/package.bak/fbv/0002-cross.patch deleted file mode 100644 index ab5f0fb48c..0000000000 --- a/package.bak/fbv/0002-cross.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -urpN fbv-1.0b.orig/configure fbv-1.0b/configure ---- fbv-1.0b.orig/configure 2004-09-07 13:29:27.000000000 +0200 -+++ fbv-1.0b/configure 2008-04-24 10:52:37.000000000 +0200 -@@ -80,6 +80,7 @@ while true ; do - esac - done - -+[ -z "$CC" ] && CC=cc - [ -z "$prefix" ] && prefix="/usr/local" - [ -z "$bindir" ] && bindir="${prefix}/bin" - [ -z "$mandir" ] && mandir="${prefix}/man" -@@ -106,12 +107,12 @@ xdir="/usr/X11R6" - ungif="no" - echo "libungif check" >>./config.log - echo " 1st:" >>./config.log --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs - if [ -e \$\$~test ]; then - libs="-lungif $libs" ; ungif="yes" - else - echo " 2nd: -lX11 -L$xdir/lib" >>./config.log -- cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs -+ $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs - if [ -e \$\$~test ]; then - libs="-lungif -lX11 -L$xdir/lib $libs" ; ungif="yes" - fi -@@ -124,7 +125,7 @@ echo "libungif: $ungif" >> ./config.log - echo -n "checking for libjpeg presence... " - if [ "$jpeg" != "disabled" ]; then - jpeg="no" --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -ljpeg $libs - if [ -e \$\$~test ]; then - libs="-ljpeg $libs" ; jpeg="yes" - fi -@@ -135,7 +136,7 @@ echo "libjpeg: $jpeg" >> ./config.log - echo -n "checking for libpng presence... " - if [ "$png" != "disabled" ]; then - png="no" --cc 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lpng $libs - if [ -e \$\$~test ]; then - libs="-lpng $libs" ; png="yes" - fi diff --git a/package.bak/fbv/0003-fix-24bpp-support-on-big-endian.patch b/package.bak/fbv/0003-fix-24bpp-support-on-big-endian.patch deleted file mode 100644 index 23185ac46b..0000000000 --- a/package.bak/fbv/0003-fix-24bpp-support-on-big-endian.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -upr a/fb_display.c b/fb_display.c ---- a/fb_display.c 2007-06-01 16:52:45.000000000 +0200 -+++ b/fb_display.c 2007-06-01 16:51:43.000000000 +0200 -@@ -307,7 +307,7 @@ void* convertRGB2FB(int fh, unsigned cha - { - unsigned long i; - void *fbbuff = NULL; -- u_int8_t *c_fbbuff; -+ u_int8_t *c_fbbuff; - u_int16_t *s_fbbuff; - u_int32_t *i_fbbuff; - -@@ -335,6 +335,16 @@ void* convertRGB2FB(int fh, unsigned cha - fbbuff = (void *) s_fbbuff; - break; - case 24: -+ *cpp = 3; -+ c_fbbuff = (unsigned char *) malloc(count * 3 * sizeof(unsigned char)); -+ for(i = 0; i < (3 * count); i += 3) { -+ /* Big endian framebuffer. */ -+ c_fbbuff[i] = rgbbuff[i+2]; -+ c_fbbuff[i+1] = rgbbuff[i+1]; -+ c_fbbuff[i+2] = rgbbuff[i]; -+ } -+ fbbuff = (void *) c_fbbuff; -+ break; - case 32: - *cpp = 4; - i_fbbuff = (unsigned int *) malloc(count * sizeof(unsigned int)); -Only in build_avr32/fbv-1.0b-modified: .fb_display.c.swp -Binary files build_avr32/fbv-1.0b/fb_display.o and build_avr32/fbv-1.0b-modified/fb_display.o differ -Binary files build_avr32/fbv-1.0b/fbv and build_avr32/fbv-1.0b-modified/fbv differ diff --git a/package.bak/fbv/0004-fix-bgr555.patch b/package.bak/fbv/0004-fix-bgr555.patch deleted file mode 100644 index 8f185f0a37..0000000000 --- a/package.bak/fbv/0004-fix-bgr555.patch +++ /dev/null @@ -1,64 +0,0 @@ -[PATCH] fbv: support bgr555 format - -Signed-off-by: Josh.Wu -diff -Naur fbv-1.0b-ori/fb_display.c fbv-1.0b/fb_display.c ---- fbv-1.0b-ori/fb_display.c 2010-04-02 09:38:15.000000000 +0800 -+++ fbv-1.0b/fb_display.c 2010-04-01 18:54:15.000000000 +0800 -@@ -297,6 +297,14 @@ - ((b >> 3) & 31) ); - } - -+inline static unsigned short make15color_bgr(unsigned char r, unsigned char g, unsigned char b) -+{ -+ return ( -+ (((b >> 3) & 31) << 10) | -+ (((g >> 3) & 31) << 5) | -+ ((r >> 3) & 31) ); -+} -+ - inline static unsigned short make16color(unsigned char r, unsigned char g, unsigned char b) - { - return ( -@@ -313,6 +321,14 @@ - u_int16_t *s_fbbuff; - u_int32_t *i_fbbuff; - -+ int is_bgr555 = 0; -+ struct fb_var_screeninfo var; -+ getVarScreenInfo(fh, &var); -+ if(var.red.offset == 0 && -+ var.green.offset == 5 && -+ var.blue.offset == 10) -+ is_bgr555 = 1; -+ - switch(bpp) - { - case 8: -@@ -325,15 +341,23 @@ - case 15: - *cpp = 2; - s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); -- for(i = 0; i < count ; i++) -- s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ if(is_bgr555) -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ else -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); - fbbuff = (void *) s_fbbuff; - break; - case 16: - *cpp = 2; - s_fbbuff = (unsigned short *) malloc(count * sizeof(unsigned short)); -- for(i = 0; i < count ; i++) -- s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ if(is_bgr555) -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make15color_bgr(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); -+ else -+ for(i = 0; i < count ; i++) -+ s_fbbuff[i] = make16color(rgbbuff[i*3], rgbbuff[i*3+1], rgbbuff[i*3+2]); - fbbuff = (void *) s_fbbuff; - break; - case 24: diff --git a/package.bak/fbv/0005-giflib.patch b/package.bak/fbv/0005-giflib.patch deleted file mode 100644 index 7043353586..0000000000 --- a/package.bak/fbv/0005-giflib.patch +++ /dev/null @@ -1,84 +0,0 @@ -Adjust source code to work with giflib 5.1x - -Downloaded patch for gif.c from -https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib-5.1.patch?h=packages/fbv - -Signed-off-by: Bernd Kuhls - -diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c ---- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400 -+++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400 -@@ -31,10 +31,10 @@ - #include - #define min(a,b) ((a) < (b) ? (a) : (b)) - #define gflush return(FH_ERROR_FILE); --#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } --#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); } -+#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } -+#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } - #define agflush return(FH_ERROR_FORMAT); --#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } -+#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } - - - int fh_gif_id(char *name) -@@ -81,7 +81,7 @@ - ColorMapObject *cmap; - int cmaps; - -- gft=DGifOpenFileName(name); -+ gft=DGifOpenFileName(name, NULL); - if(gft==NULL){printf("err5\n"); gflush;} ////////// - do - { -@@ -170,7 +170,7 @@ - } - } - while( rt!= TERMINATE_RECORD_TYPE ); -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_OK); - } - -@@ -184,7 +184,7 @@ - int extcode; - GifRecordType rt; - -- gft=DGifOpenFileName(name); -+ gft=DGifOpenFileName(name, NULL); - if(gft==NULL) gflush; - do - { -@@ -197,7 +197,7 @@ - px=gft->Image.Width; - py=gft->Image.Height; - *x=px; *y=py; -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_OK); - break; - case EXTENSION_RECORD_TYPE: -@@ -210,7 +210,7 @@ - } - } - while( rt!= TERMINATE_RECORD_TYPE ); -- DGifCloseFile(gft); -+ DGifCloseFile(gft, NULL); - return(FH_ERROR_FORMAT); - } - #endif -diff -uNr fbv-1.0b.org/configure fbv-1.0b/configure ---- fbv-1.0b.org/configure 2004-09-07 13:29:27.000000000 +0200 -+++ fbv-1.0b/configure 2015-01-29 19:58:30.374599874 +0100 -@@ -106,9 +106,9 @@ - ungif="no" - echo "libungif check" >>./config.log - echo " 1st:" >>./config.log --$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif $libs -+$CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lgif $libs - if [ -e \$\$~test ]; then -- libs="-lungif $libs" ; ungif="yes" -+ libs="-lgif $libs" ; ungif="yes" - else - echo " 2nd: -lX11 -L$xdir/lib" >>./config.log - $CC 2>>./config.log >>./config.log -o \$\$~test \$\$~test.c -lungif -lX11 -L$xdir/lib $libs diff --git a/package.bak/fbv/0006-include.patch b/package.bak/fbv/0006-include.patch deleted file mode 100644 index 3d1cc17f74..0000000000 --- a/package.bak/fbv/0006-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -urpN fbv-1.0b.orig/fb_display.c fbv-1.0b/fb_display.c ---- fbv-1.0b.orig/fb_display.c 2004-09-07 14:09:43.000000000 +0200 -+++ fbv-1.0b/fb_display.c 2008-04-24 10:48:29.000000000 +0200 -@@ -18,8 +18,6 @@ - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - --#include -- - #include - #include - #include -@@ -31,6 +29,7 @@ - #include - #include - #include -+#include - #include "config.h" - /* Public Use Functions: - * diff --git a/package.bak/fbv/0007-libpng15.patch b/package.bak/fbv/0007-libpng15.patch deleted file mode 100644 index 7872a73cf6..0000000000 --- a/package.bak/fbv/0007-libpng15.patch +++ /dev/null @@ -1,24 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/png.c -+++ b/png.c -@@ -69,7 +69,7 @@ - fclose(fh); return(FH_ERROR_FORMAT); - } - rp=0; -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if(rp) free(rp); -@@ -161,7 +161,7 @@ - fclose(fh); return(FH_ERROR_FORMAT); - } - rp=0; -- if (setjmp(png_ptr->jmpbuf)) -+ if (setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL); - if(rp) free(rp); diff --git a/package.bak/fbv/Config.in b/package.bak/fbv/Config.in deleted file mode 100644 index 3160a85552..0000000000 --- a/package.bak/fbv/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_FBV - bool "fbv" - help - fbv is a very simple graphic file viewer for the framebuffer console, - capable of displaying GIF, JPEG, PNG and BMP files using libungif, - libjpeg and libpng. - - http://freshmeat.net/projects/fbv/ - -if BR2_PACKAGE_FBV - -config BR2_PACKAGE_FBV_PNG - bool "PNG support" - default y - select BR2_PACKAGE_LIBPNG - help - Enable support for PNG using libpng. - -config BR2_PACKAGE_FBV_JPEG - bool "JPEG support" - default y - select BR2_PACKAGE_JPEG - help - Enable support for JPEG using IJG's libjpeg. - -config BR2_PACKAGE_FBV_GIF - bool "GIF support" - default y - select BR2_PACKAGE_GIFLIB - help - Enable support for GIF using giflib. - -endif # BR2_PACKAGE_FBV diff --git a/package.bak/fbv/fbv.hash b/package.bak/fbv/fbv.hash deleted file mode 100644 index 892012b3d9..0000000000 --- a/package.bak/fbv/fbv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9b55b9dafd5eb01562060d860e267e309a1876e8ba5ce4d3303484b94129ab3c fbv-1.0b.tar.gz diff --git a/package.bak/fbv/fbv.mk b/package.bak/fbv/fbv.mk deleted file mode 100644 index d12b9f455f..0000000000 --- a/package.bak/fbv/fbv.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# fbv -# -################################################################################ - -FBV_VERSION = 1.0b -FBV_SITE = http://s-tech.elsat.net.pl/fbv - -FBV_LICENSE = GPLv2 -FBV_LICENSE_FILES = COPYING - -### image format dependencies and configure options -FBV_DEPENDENCIES = # empty -FBV_CONFIGURE_OPTS = # empty -ifeq ($(BR2_PACKAGE_FBV_PNG),y) -FBV_DEPENDENCIES += libpng - -# libpng in turn depends on other libraries -ifeq ($(BR2_STATIC_LIBS),y) -FBV_CONFIGURE_OPTS += "--libs=`$(PKG_CONFIG_HOST_BINARY) --libs libpng`" -endif - -else -FBV_CONFIGURE_OPTS += --without-libpng -endif -ifeq ($(BR2_PACKAGE_FBV_JPEG),y) -FBV_DEPENDENCIES += jpeg -else -FBV_CONFIGURE_OPTS += --without-libjpeg -endif -ifeq ($(BR2_PACKAGE_FBV_GIF),y) -FBV_DEPENDENCIES += giflib -else -FBV_CONFIGURE_OPTS += --without-libungif -endif - -#fbv doesn't support cross-compilation -define FBV_CONFIGURE_CMDS - (cd $(FBV_DIR); rm -f config.cache; \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - $(FBV_CONFIGURE_OPTS) \ - ) -endef - -define FBV_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FBV_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/fbv $(TARGET_DIR)/usr/bin/fbv -endef - -$(eval $(autotools-package)) diff --git a/package.bak/fcgiwrap/0001-use-LIBS-from-configure.patch b/package.bak/fcgiwrap/0001-use-LIBS-from-configure.patch deleted file mode 100644 index 12563c4275..0000000000 --- a/package.bak/fcgiwrap/0001-use-LIBS-from-configure.patch +++ /dev/null @@ -1,22 +0,0 @@ -Makefile.in: Use LIBS from configure rather than specifying -lfcgi manually. - -libfcgi needs libm and fcgiwrap does not use libtool or pkgconf to -detect libfcgi, so we need to add -lm explicitely when using static -libs. Buildroot does this by providing LIBS=-lm to configure when -needed. However fcgiwrap does not use Automake and its Makefile.in -ignores LIBS from configure. Fix it with this patch. - -Signed-off-by: Thomas Claveirole - -diff -ur a/Makefile.in b/Makefile.in ---- a/Makefile.in 2013-02-03 14:25:17.000000000 +0100 -+++ b/Makefile.in 2015-05-29 16:33:23.895280138 +0200 -@@ -16,7 +16,7 @@ - install -m 644 systemd/fcgiwrap.service $(DESTDIR)@systemdsystemunitdir@ - endif - --LDLIBS = -lfcgi @systemd_LIBS@ -+LDLIBS = @LIBS@ @systemd_LIBS@ - CFLAGS = @AM_CFLAGS@ - - fcgiwrap: fcgiwrap.c diff --git a/package.bak/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch b/package.bak/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch deleted file mode 100644 index e88706f8ba..0000000000 --- a/package.bak/fcgiwrap/0002-link-with-libsystemd-instead-of-libsystemd-daemon.patch +++ /dev/null @@ -1,20 +0,0 @@ -configure.ac: Check for libsystemd, not libsystemd-daemon. - -Newer versions of systemd do not provide libsystemd-daemon anymore. -Therefore, use libsystemd instead. - -Signed-off-by: Thomas Claveirole - -diff --git a/configure.ac b/configure.ac -index bb3674e..2b02ef4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -28,7 +28,7 @@ AC_ARG_WITH([systemd], - [], [with_systemd=check]) - have_systemd=no - if test "x$with_systemd" != "xno"; then -- PKG_CHECK_MODULES(systemd, [libsystemd-daemon], -+ PKG_CHECK_MODULES(systemd, [libsystemd], - [AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is available]) - have_systemd=yes], - have_systemd=no) diff --git a/package.bak/fcgiwrap/Config.in b/package.bak/fcgiwrap/Config.in deleted file mode 100644 index b1dbd72d48..0000000000 --- a/package.bak/fcgiwrap/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_FCGIWRAP - bool "fcgiwrap" - depends on BR2_USE_MMU # libfcgi - select BR2_PACKAGE_LIBFCGI - help - fcgiwrap is a simple server for running CGI applications - over FastCGI. It hopes to provide clean CGI support to Nginx - (and other web servers that may need it). - - https://github.com/gnosek/fcgiwrap diff --git a/package.bak/fcgiwrap/fcgiwrap.hash b/package.bak/fcgiwrap/fcgiwrap.hash deleted file mode 100644 index 4ad8b0bb77..0000000000 --- a/package.bak/fcgiwrap/fcgiwrap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c72f2933669ebd21605975c5a11f26b9739e32e4f9d324fb9e1a1925e9c2ae88 fcgiwrap-99c942c90063c73734e56bacaa65f947772d9186.tar.gz diff --git a/package.bak/fcgiwrap/fcgiwrap.mk b/package.bak/fcgiwrap/fcgiwrap.mk deleted file mode 100644 index dd74c1ef72..0000000000 --- a/package.bak/fcgiwrap/fcgiwrap.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# fcgiwrap -# -################################################################################ - -FCGIWRAP_VERSION = 99c942c90063c73734e56bacaa65f947772d9186 -FCGIWRAP_SITE = $(call github,gnosek,fcgiwrap,$(FCGIWRAP_VERSION)) -FCGIWRAP_DEPENDENCIES = host-pkgconf libfcgi -FCGIWRAP_LICENSE = MIT -FCGIWRAP_LICENSE_FILES = COPYING -FCGIWRAP_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -FCGIWRAP_DEPENDENCIES += systemd -FCGIWRAP_CONF_OPTS += --with-systemd -else -FCGIWRAP_CONF_OPTS += --without-systemd -endif - -# libfcgi needs libm and fcgiwrap does not use libtool or pkgconf to -# detect libfcgi, so we need to add -lm explicitely when using static -# libs. -ifeq ($(BR2_STATIC_LIBS),y) -FCGIWRAP_CONF_OPTS += LIBS=-lm -endif - -# fcgiwrap uses Autoconf, but not Automake, so we need to provide -# these to make. -FCGIWRAP_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) - -$(eval $(autotools-package)) diff --git a/package.bak/fconfig/Config.in b/package.bak/fconfig/Config.in deleted file mode 100644 index e7dd58a84a..0000000000 --- a/package.bak/fconfig/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_FCONFIG - bool "fconfig" - help - fconfig - get/set RedBoot configuration parameters from Linux. - - http://andrzejekiert.ovh.org/software.html.en diff --git a/package.bak/fconfig/fconfig.hash b/package.bak/fconfig/fconfig.hash deleted file mode 100644 index eae26e2b14..0000000000 --- a/package.bak/fconfig/fconfig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4ff0e8f07e35e46b705c0dbe9d9544ede01ea092a69e3f7db03e55a3f2bb8eb7 fconfig-20080329.tar.gz diff --git a/package.bak/fconfig/fconfig.mk b/package.bak/fconfig/fconfig.mk deleted file mode 100644 index 509fc2c77d..0000000000 --- a/package.bak/fconfig/fconfig.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# fconfig -# -################################################################################ - -FCONFIG_VERSION = 20080329 -# Real upstream location has been disabled -# FCONFIG_SITE = http://andrzejekiert.ovh.org/software/fconfig -FCONFIG_SITE = http://sources.buildroot.net -FCONFIG_LICENSE = GPLv2+ -FCONFIG_LICENSE_FILES = fconfig.c - -define FCONFIG_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FCONFIG_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/fconfig $(TARGET_DIR)/sbin/fconfig -endef - -$(eval $(generic-package)) diff --git a/package.bak/fdk-aac/Config.in b/package.bak/fdk-aac/Config.in deleted file mode 100644 index f51c5ab19c..0000000000 --- a/package.bak/fdk-aac/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -# These are the architectures supported by FDK AAC -config BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS - bool - default y if BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_sh - -config BR2_PACKAGE_FDK_AAC - bool "fdk-aac" - depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - help - The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") - is software that implements the MPEG Advanced Audio Coding ("AAC") - encoding and decoding scheme for digital audio - - http://sourceforge.net/projects/opencore-amr/files/fdk-aac/ - -comment "fdk-aac needs a toolchain w/ C++" - depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/fdk-aac/fdk-aac.hash b/package.bak/fdk-aac/fdk-aac.hash deleted file mode 100644 index 28a1eeeb93..0000000000 --- a/package.bak/fdk-aac/fdk-aac.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5910fe788677ca13532e3f47b7afaa01d72334d46a2d5e1d1f080f1173ff15ab fdk-aac-0.1.4.tar.gz diff --git a/package.bak/fdk-aac/fdk-aac.mk b/package.bak/fdk-aac/fdk-aac.mk deleted file mode 100644 index 45a3cf5e57..0000000000 --- a/package.bak/fdk-aac/fdk-aac.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# fdk-aac -# -################################################################################ - -FDK_AAC_VERSION = 0.1.4 -FDK_AAC_SITE = http://downloads.sourceforge.net/project/opencore-amr/fdk-aac -FDK_AAC_LICENSE = fdk-aac license -FDK_AAC_LICENSE_FILES = NOTICE - -FDK_AAC_INSTALL_STAGING = YES - -# Not compatible with GCC 6 which defaults to GNU++14 -FDK_AAC_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++98" - -$(eval $(autotools-package)) diff --git a/package.bak/feh/Config.in b/package.bak/feh/Config.in deleted file mode 100644 index 19b4abe0e3..0000000000 --- a/package.bak/feh/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_FEH - bool "feh" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_IMLIB2 - select BR2_PACKAGE_IMLIB2_PNG - select BR2_PACKAGE_IMLIB2_JPEG - select BR2_PACKAGE_IMLIB2_X - select BR2_PACKAGE_LIBCURL - help - feh is an X11 image viewer aimed mostly at console users. - - http://feh.finalrewind.org/ diff --git a/package.bak/feh/feh.hash b/package.bak/feh/feh.hash deleted file mode 100644 index faca43dbed..0000000000 --- a/package.bak/feh/feh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a9e818a4ad6ab427597e1799527a7576856c233525e67afb1eb2cb3ae709d853 feh-2.17.1.tar.bz2 diff --git a/package.bak/feh/feh.mk b/package.bak/feh/feh.mk deleted file mode 100644 index 03651cdb76..0000000000 --- a/package.bak/feh/feh.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# feh -# -################################################################################ - -FEH_VERSION = 2.17.1 -FEH_SOURCE = feh-$(FEH_VERSION).tar.bz2 -FEH_SITE = http://feh.finalrewind.org -FEH_DEPENDENCIES = libcurl imlib2 libpng xlib_libXinerama xlib_libXt -FEH_LICENSE = MIT -FEH_LICENSE_FILES = COPYING - -define FEH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ - -C $(@D) all -endef - -define FEH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) " \ - PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/fetchmail/0001-fix-openssl-static-link.patch b/package.bak/fetchmail/0001-fix-openssl-static-link.patch deleted file mode 100644 index 1a5f4d6f71..0000000000 --- a/package.bak/fetchmail/0001-fix-openssl-static-link.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix checking for statically build OpenSSL with libz dependency - -Fixes -http://autobuild.buildroot.net/results/48a/48ad6d3659cf1f04581b7e3d115bebf454ff17fd/ - -configure: Enabling OpenSSL support in /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr. -checking for additional library dependencies of SSL... error -configure: error: cannot link with SSL - check config.log - -In config.log multiple linking errors to libz can be found: - -configure:10099: /home/br/br/output/host/usr/bin/i486-ctng-linux-uclibc-gcc -o - conftest -D_LARGEFILE_SOURCE -D_LARGEFILE64 - /home/br/br/output/host/usr/i486-buildroot-linux-uclibc/sysroot/usr/lib/libcrypto.a(c_zlib.o): - In function `zlib_stateful_c_zlib.c:(.text+0x56): undefined reference to `inflate' - -Signed-off-by: Bernd Kuhls - -diff -uNr fetchmail-6.3.26.org/configure.ac fetchmail-6.3.26/configure.ac ---- fetchmail-6.3.26.org/configure.ac 2013-04-23 22:51:10.000000000 +0200 -+++ fetchmail-6.3.26/configure.ac 2014-07-27 09:20:25.000000000 +0200 -@@ -778,7 +778,7 @@ - AC_MSG_ERROR([SSL support enabled, but OpenSSL not found]) - fi - LDFLAGS="$LDFLAGS -L$with_ssl/lib" -- LIBS="$LIBS -lssl -lcrypto" -+ LIBS="-lssl -lcrypto $LIBS" - dnl check if -ldl is needed - AC_MSG_CHECKING([for additional library dependencies of SSL]) - found=0 diff --git a/package.bak/fetchmail/0002-enable-libressl.patch b/package.bak/fetchmail/0002-enable-libressl.patch deleted file mode 100644 index a98e19dda4..0000000000 --- a/package.bak/fetchmail/0002-enable-libressl.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fetched from upstream git and tweaked for the release: -https://gitlab.com/fetchmail/fetchmail/commit/a2ae6f8d15d7caf815d7bdd13df833fd1b2af5cc - -Signed-off-by: Gustavo Zacarias - -diff -Nura fetchmail-6.3.26.orig/config.h.in fetchmail-6.3.26/config.h.in ---- fetchmail-6.3.26.orig/config.h.in 2015-12-30 10:44:33.467746835 -0300 -+++ fetchmail-6.3.26/config.h.in 2015-12-30 10:45:50.271403589 -0300 -@@ -53,6 +53,10 @@ - if you don't. */ - #undef HAVE_DECL_SSLV2_CLIENT_METHOD - -+/* Define to 1 if you have the declaration of `SSLv3_client_method', and to 0 -+ if you don't. */ -+#undef HAVE_DECL_SSLV3_CLIENT_METHOD -+ - /* Define to 1 if you have the declaration of `strerror', and to 0 if you - don't. */ - #undef HAVE_DECL_STRERROR -diff -Nura fetchmail-6.3.26.orig/configure.ac fetchmail-6.3.26/configure.ac ---- fetchmail-6.3.26.orig/configure.ac 2015-12-30 10:44:33.465746766 -0300 -+++ fetchmail-6.3.26/configure.ac 2015-12-30 10:46:03.708868409 -0300 -@@ -803,6 +803,7 @@ - - case "$LIBS" in *-lssl*) - AC_CHECK_DECLS([SSLv2_client_method],,,[#include ]) -+ AC_CHECK_DECLS([SSLv3_client_method],,,[#include ]) - ;; - esac - -diff -Nura fetchmail-6.3.26.orig/fetchmail.c fetchmail-6.3.26/fetchmail.c ---- fetchmail-6.3.26.orig/fetchmail.c 2015-12-30 10:44:33.469746904 -0300 -+++ fetchmail-6.3.26/fetchmail.c 2015-12-30 10:46:03.708868409 -0300 -@@ -263,6 +263,12 @@ - #ifdef SSL_ENABLE - "+SSL" - #endif -+#if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 == 0 -+ "-SSLv2" -+#endif -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 == 0 -+ "-SSLv3" -+#endif - #ifdef OPIE_ENABLE - "+OPIE" - #endif /* OPIE_ENABLE */ -diff -Nura fetchmail-6.3.26.orig/socket.c fetchmail-6.3.26/socket.c ---- fetchmail-6.3.26.orig/socket.c 2015-12-30 10:44:33.464746731 -0300 -+++ fetchmail-6.3.26/socket.c 2015-12-30 10:46:03.709868443 -0300 -@@ -910,11 +910,16 @@ - #if HAVE_DECL_SSLV2_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv2_client_method()); - #else -- report(stderr, GT_("Your operating system does not support SSLv2.\n")); -+ report(stderr, GT_("Your OpenSSL version does not support SSLv2.\n")); - return -1; - #endif - } else if(!strcasecmp("ssl3",myproto)) { -+#if HAVE_DECL_SSLV3_CLIENT_METHOD + 0 > 0 - _ctx[sock] = SSL_CTX_new(SSLv3_client_method()); -+#else -+ report(stderr, GT_("Your OpenSSL version does not support SSLv3.\n")); -+ return -1; -+#endif - } else if(!strcasecmp("tls1",myproto)) { - _ctx[sock] = SSL_CTX_new(TLSv1_client_method()); - } else if (!strcasecmp("ssl23",myproto)) { diff --git a/package.bak/fetchmail/Config.in b/package.bak/fetchmail/Config.in deleted file mode 100644 index 1eb0359003..0000000000 --- a/package.bak/fetchmail/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_FETCHMAIL - bool "fetchmail" - select BR2_PACKAGE_CA_CERTIFICATES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on BR2_USE_MMU # fork() - help - Fetchmail - the mail-retrieval daemon - Client daemon to move mail from POP and IMAP to your local computer - - http://www.fetchmail.info/ diff --git a/package.bak/fetchmail/fetchmail.hash b/package.bak/fetchmail/fetchmail.hash deleted file mode 100644 index c67ee1a4e1..0000000000 --- a/package.bak/fetchmail/fetchmail.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 fetchmail-6.3.26.tar.xz diff --git a/package.bak/fetchmail/fetchmail.mk b/package.bak/fetchmail/fetchmail.mk deleted file mode 100644 index 6aa0a2c918..0000000000 --- a/package.bak/fetchmail/fetchmail.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# fetchmail -# -################################################################################ - -FETCHMAIL_VERSION_MAJOR = 6.3 -FETCHMAIL_VERSION = $(FETCHMAIL_VERSION_MAJOR).26 -FETCHMAIL_SOURCE = fetchmail-$(FETCHMAIL_VERSION).tar.xz -FETCHMAIL_SITE = http://downloads.sourceforge.net/project/fetchmail/branch_$(FETCHMAIL_VERSION_MAJOR) -FETCHMAIL_LICENSE = GPLv2; some exceptions are mentioned in COPYING -FETCHMAIL_LICENSE_FILES = COPYING -FETCHMAIL_AUTORECONF = YES -FETCHMAIL_GETTEXTIZE = YES - -FETCHMAIL_CONF_ENV += LIBS="-lz" - -FETCHMAIL_CONF_OPTS = \ - --with-ssl=$(STAGING_DIR)/usr - -FETCHMAIL_DEPENDENCIES = \ - ca-certificates \ - openssl \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -# fetchmailconf.py script is not (yet) python3-compliant. -# Prevent the pyc-compilation with python-3 from failing by removing this -# non-critical script. -ifeq ($(BR2_PACKAGE_PYTHON3),y) -define FETCHMAIL_REMOVE_FETCHMAILCONF_PY - $(RM) -f $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/fetchmailconf.py -endef -FETCHMAIL_POST_INSTALL_TARGET_HOOKS += FETCHMAIL_REMOVE_FETCHMAILCONF_PY -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ffmpeg/0001-bfin-disable-optimization.patch b/package.bak/ffmpeg/0001-bfin-disable-optimization.patch deleted file mode 100644 index 1d8a4f015d..0000000000 --- a/package.bak/ffmpeg/0001-bfin-disable-optimization.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix bfin compile error - -See gcc bug report: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77311 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c ffmpeg-2.8.7/libavcodec/hevcdsp_template.c ---- ffmpeg-2.8.7.orig/libavcodec/hevcdsp_template.c 2016-03-29 04:25:16.000000000 +0200 -+++ ffmpeg-2.8.7/libavcodec/hevcdsp_template.c 2016-08-12 21:32:36.728178969 +0200 -@@ -1517,7 +1517,14 @@ - #define TQ2 pix[2 * xstride + 3 * ystride] - #define TQ3 pix[3 * xstride + 3 * ystride] - --static void FUNC(hevc_loop_filter_luma)(uint8_t *_pix, -+// Blackfin gcc 6.1.x fails with -+// unable to find a register to spill in class CCREGS -+#if defined(__bfin__) -+#define disable_opt __attribute__ ((optimize("O1"))) -+#else -+#define disable_opt -+#endif -+static void disable_opt FUNC(hevc_loop_filter_luma)(uint8_t *_pix, - ptrdiff_t _xstride, ptrdiff_t _ystride, - int beta, int *_tc, - uint8_t *_no_p, uint8_t *_no_q) diff --git a/package.bak/ffmpeg/Config.in b/package.bak/ffmpeg/Config.in deleted file mode 100644 index ed87ddd492..0000000000 --- a/package.bak/ffmpeg/Config.in +++ /dev/null @@ -1,183 +0,0 @@ -config BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - bool - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - # No support for ARMv7-M in the ARM assembly logic - # Microblaze build affected by gcc PR71124 (infinite loop) - # m68k coldfire causes a build failure, because the check for - # atomics (atomic_store) succeeds, which causes ffmpeg to - # think atomic intrinsics are available, while they are - # not. See https://patchwork.ozlabs.org/patch/756664/ and - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68467 for more - # details. - default y if !BR2_nios2 && !BR2_ARM_CPU_ARMV7M && !BR2_microblaze && !BR2_m68k_cf - -menuconfig BR2_PACKAGE_FFMPEG - bool "ffmpeg" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - help - FFmpeg is a complete, cross-platform solution to record, - convert and stream audio and video. - - http://www.ffmpeg.org - -if BR2_PACKAGE_FFMPEG - -config BR2_PACKAGE_FFMPEG_GPL - bool "Enable GPL code" - help - allow use of GPL code, the resulting libs and binaries will - be under GPL - -config BR2_PACKAGE_FFMPEG_NONFREE - bool "Enable nonfree code" - help - allow use of nonfree code, the resulting libs and binaries - will be unredistributable - -config BR2_PACKAGE_FFMPEG_FFMPEG - bool "Build ffmpeg (the command line application)" - default y - help - FFmpeg is a very fast video and audio converter. - It can also grab from a live audio/video source. - - It is not needed if you want to link the FFmpeg libraries - to your application. - -config BR2_PACKAGE_FFMPEG_FFPLAY - bool "Build ffplay" - depends on !BR2_STATIC_LIBS # sdl2 - select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_SDL2 - help - FFplay is a very simple and portable media player using the - FFmpeg libraries and the SDL library. - It is mostly used as a testbed for the various FFmpeg APIs. - -comment "ffplay needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_FFMPEG_FFSERVER - bool "Build ffserver" - depends on BR2_USE_MMU # fork() - help - FFserver is a streaming server for both audio and video. - -config BR2_PACKAGE_FFMPEG_FFPROBE - bool "Build ffprobe" - help - FFprobe is a utility to determine the audio and video - characteristics of a container file. - -config BR2_PACKAGE_FFMPEG_AVRESAMPLE - bool "Build libavresample" - help - Avresample is a audio conversion library for compatibility. - -config BR2_PACKAGE_FFMPEG_POSTPROC - bool "Build libpostproc" - depends on BR2_PACKAGE_FFMPEG_GPL - help - Postproc is a library of video postprocessing routines. - -config BR2_PACKAGE_FFMPEG_SWSCALE - bool "Build libswscale" - help - Swscale is a library of video scaling routines. - -config BR2_PACKAGE_FFMPEG_ENCODERS - string "Enabled encoders" - default "all" - help - Space-separated list of encoders to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-encoders in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_DECODERS - string "Enabled decoders" - default "all" - help - Space-separated list of decoders to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-decoders in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_MUXERS - string "Enabled muxers" - default "all" - help - Space-separated list of muxers to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-muxers in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_DEMUXERS - string "Enabled demuxers" - default "all" - help - Space-separated list of demuxers to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-demuxers in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_PARSERS - string "Enabled parsers" - default "all" - help - Space-separated list of parsers to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-parsers in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_BSFS - string "Enabled bitstreams" - default "all" - help - Space-separated list of bitstream filters to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-bsfs in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_PROTOCOLS - string "Enabled protocols" - default "all" - help - Space-separated list of protocols to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-protocols in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_FILTERS - string "Enabled filters" - default "all" - help - Space-separated list of filters to build in FFmpeg, - or "all" to build all of them. - - Run ./configure --list-filters in the ffmpeg sources - directory to know the available options. - -config BR2_PACKAGE_FFMPEG_INDEVS - bool "Enable input devices" - default y - -config BR2_PACKAGE_FFMPEG_OUTDEVS - bool "Enable output devices" - default y - -config BR2_PACKAGE_FFMPEG_EXTRACONF - string "Additional parameters for ./configure" - default "" - help - Extra parameters that will be appended to FFmpeg's - ./configure commandline. - -endif diff --git a/package.bak/ffmpeg/ffmpeg.hash b/package.bak/ffmpeg/ffmpeg.hash deleted file mode 100644 index 42cfeed68e..0000000000 --- a/package.bak/ffmpeg/ffmpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957 ffmpeg-3.3.4.tar.xz diff --git a/package.bak/ffmpeg/ffmpeg.mk b/package.bak/ffmpeg/ffmpeg.mk deleted file mode 100644 index 801615c077..0000000000 --- a/package.bak/ffmpeg/ffmpeg.mk +++ /dev/null @@ -1,520 +0,0 @@ -################################################################################ -# -# ffmpeg -# -################################################################################ - -FFMPEG_VERSION = 3.3.4 -FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz -FFMPEG_SITE = http://ffmpeg.org/releases -FFMPEG_INSTALL_STAGING = YES - -FFMPEG_LICENSE = LGPL-2.1+, libjpeg license -FFMPEG_LICENSE_FILES = LICENSE.md COPYING.LGPLv2.1 -ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) -FFMPEG_LICENSE += and GPL-2.0+ -FFMPEG_LICENSE_FILES += COPYING.GPLv2 -endif - -FFMPEG_CONF_OPTS = \ - --prefix=/usr \ - --enable-avfilter \ - --disable-version3 \ - --enable-logging \ - --enable-optimizations \ - --disable-extra-warnings \ - --enable-avdevice \ - --enable-avcodec \ - --enable-avformat \ - --enable-network \ - --disable-gray \ - --enable-swscale-alpha \ - --disable-small \ - --enable-dct \ - --enable-fft \ - --enable-mdct \ - --enable-rdft \ - --disable-crystalhd \ - --disable-dxva2 \ - --enable-runtime-cpudetect \ - --disable-hardcoded-tables \ - --disable-mipsdsp \ - --disable-mipsdspr2 \ - --disable-msa \ - --enable-hwaccels \ - --disable-cuda \ - --disable-cuvid \ - --disable-nvenc \ - --disable-avisynth \ - --disable-frei0r \ - --disable-libopencore-amrnb \ - --disable-libopencore-amrwb \ - --disable-libcdio \ - --disable-libdc1394 \ - --disable-libgsm \ - --disable-libilbc \ - --disable-libnut \ - --disable-libopenjpeg \ - --disable-libschroedinger \ - --disable-libvo-amrwbenc \ - --disable-symver \ - --disable-doc - -FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf - -ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y) -FFMPEG_CONF_OPTS += --enable-gpl -else -FFMPEG_CONF_OPTS += --disable-gpl -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_NONFREE),y) -FFMPEG_CONF_OPTS += --enable-nonfree -else -FFMPEG_CONF_OPTS += --disable-nonfree -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_FFMPEG),y) -FFMPEG_CONF_OPTS += --enable-ffmpeg -else -FFMPEG_CONF_OPTS += --disable-ffmpeg -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_FFPLAY),y) -FFMPEG_DEPENDENCIES += sdl2 -FFMPEG_CONF_OPTS += --enable-ffplay -FFMPEG_CONF_ENV += SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl2-config -else -FFMPEG_CONF_OPTS += --disable-ffplay -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_FFSERVER),y) -FFMPEG_CONF_OPTS += --enable-ffserver -else -FFMPEG_CONF_OPTS += --disable-ffserver -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y) -FFMPEG_CONF_OPTS += --enable-avresample -else -FFMPEG_CONF_OPTS += --disable-avresample -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_FFPROBE),y) -FFMPEG_CONF_OPTS += --enable-ffprobe -else -FFMPEG_CONF_OPTS += --disable-ffprobe -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y) -FFMPEG_CONF_OPTS += --enable-postproc -else -FFMPEG_CONF_OPTS += --disable-postproc -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) -FFMPEG_CONF_OPTS += --enable-swscale -else -FFMPEG_CONF_OPTS += --disable-swscale -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),all) -FFMPEG_CONF_OPTS += --disable-encoders \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),--enable-encoder=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),all) -FFMPEG_CONF_OPTS += --disable-decoders \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DECODERS)),--enable-decoder=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),all) -FFMPEG_CONF_OPTS += --disable-muxers \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_MUXERS)),--enable-muxer=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),all) -FFMPEG_CONF_OPTS += --disable-demuxers \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_DEMUXERS)),--enable-demuxer=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),all) -FFMPEG_CONF_OPTS += --disable-parsers \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PARSERS)),--enable-parser=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),all) -FFMPEG_CONF_OPTS += --disable-bsfs \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_BSFS)),--enable-bsfs=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),all) -FFMPEG_CONF_OPTS += --disable-protocols \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_PROTOCOLS)),--enable-protocol=$(x)) -endif - -ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),all) -FFMPEG_CONF_OPTS += --disable-filters \ - $(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_FILTERS)),--enable-filter=$(x)) -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y) -FFMPEG_CONF_OPTS += --enable-indevs -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -FFMPEG_DEPENDENCIES += alsa-lib -endif -else -FFMPEG_CONF_OPTS += --disable-indevs -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_OUTDEVS),y) -FFMPEG_CONF_OPTS += --enable-outdevs -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -FFMPEG_DEPENDENCIES += alsa-lib -endif -else -FFMPEG_CONF_OPTS += --disable-outdevs -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -FFMPEG_CONF_OPTS += --enable-pthreads -else -FFMPEG_CONF_OPTS += --disable-pthreads -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -FFMPEG_CONF_OPTS += --enable-zlib -FFMPEG_DEPENDENCIES += zlib -else -FFMPEG_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -FFMPEG_CONF_OPTS += --enable-bzlib -FFMPEG_DEPENDENCIES += bzip2 -else -FFMPEG_CONF_OPTS += --disable-bzlib -endif - -ifeq ($(BR2_PACKAGE_FDK_AAC)$(BR2_PACKAGE_FFMPEG_NONFREE),yy) -FFMPEG_CONF_OPTS += --enable-libfdk-aac -FFMPEG_DEPENDENCIES += fdk-aac -else -FFMPEG_CONF_OPTS += --disable-libfdk-aac -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl -FFMPEG_DEPENDENCIES += gnutls -else -FFMPEG_CONF_OPTS += --disable-gnutls -ifeq ($(BR2_PACKAGE_OPENSSL),y) -# openssl isn't license compatible with GPL -ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx) -FFMPEG_CONF_OPTS += --disable-openssl -else -FFMPEG_CONF_OPTS += --enable-openssl -FFMPEG_DEPENDENCIES += openssl -endif -else -FFMPEG_CONF_OPTS += --disable-openssl -endif -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_GPL)$(BR2_PACKAGE_LIBEBUR128),yy) -FFMPEG_DEPENDENCIES += libebur128 -endif - -ifeq ($(BR2_PACKAGE_LIBOPENH264),y) -FFMPEG_CONF_OPTS += --enable-libopenh264 -FFMPEG_DEPENDENCIES += libopenh264 -else -FFMPEG_CONF_OPTS += --disable-libopenh264 -endif - -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -FFMPEG_DEPENDENCIES += libvorbis -FFMPEG_CONF_OPTS += \ - --enable-libvorbis \ - --enable-muxer=ogg \ - --enable-encoder=libvorbis -endif - -ifeq ($(BR2_PACKAGE_LIBVA),y) -FFMPEG_CONF_OPTS += --enable-vaapi -FFMPEG_DEPENDENCIES += libva -else -FFMPEG_CONF_OPTS += --disable-vaapi -endif - -ifeq ($(BR2_PACKAGE_LIBVDPAU),y) -FFMPEG_CONF_OPTS += --enable-vdpau -FFMPEG_DEPENDENCIES += libvdpau -else -FFMPEG_CONF_OPTS += --disable-vdpau -endif - -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE)$(BR2_PACKAGE_RPI_USERLAND),yy) -FFMPEG_CONF_OPTS += --enable-mmal --enable-omx --enable-omx-rpi \ - --extra-cflags=-I$(STAGING_DIR)/usr/include/IL -FFMPEG_DEPENDENCIES += rpi-firmware rpi-userland -else -FFMPEG_CONF_OPTS += --disable-mmal --disable-omx --disable-omx-rpi -endif - -# To avoid a circular dependency only use opencv if opencv itself does -# not depend on ffmpeg. -ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx) -FFMPEG_CONF_OPTS += --enable-libopencv -FFMPEG_DEPENDENCIES += opencv -else ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx) -FFMPEG_CONF_OPTS += --enable-libopencv -FFMPEG_DEPENDENCIES += opencv3 -else -FFMPEG_CONF_OPTS += --disable-libopencv -endif - -ifeq ($(BR2_PACKAGE_OPUS),y) -FFMPEG_CONF_OPTS += --enable-libopus -FFMPEG_DEPENDENCIES += opus -else -FFMPEG_CONF_OPTS += --disable-libopus -endif - -ifeq ($(BR2_PACKAGE_LIBVPX),y) -FFMPEG_CONF_OPTS += --enable-libvpx -FFMPEG_DEPENDENCIES += libvpx -else -FFMPEG_CONF_OPTS += --disable-libvpx -endif - -ifeq ($(BR2_PACKAGE_LIBASS),y) -FFMPEG_CONF_OPTS += --enable-libass -FFMPEG_DEPENDENCIES += libass -else -FFMPEG_CONF_OPTS += --disable-libass -endif - -ifeq ($(BR2_PACKAGE_LIBBLURAY),y) -FFMPEG_CONF_OPTS += --enable-libbluray -FFMPEG_DEPENDENCIES += libbluray -else -FFMPEG_CONF_OPTS += --disable-libbluray -endif - -ifeq ($(BR2_PACKAGE_RTMPDUMP),y) -FFMPEG_CONF_OPTS += --enable-librtmp -FFMPEG_DEPENDENCIES += rtmpdump -else -FFMPEG_CONF_OPTS += --disable-librtmp -endif - -ifeq ($(BR2_PACKAGE_LAME),y) -FFMPEG_CONF_OPTS += --enable-libmp3lame -FFMPEG_DEPENDENCIES += lame -else -FFMPEG_CONF_OPTS += --disable-libmp3lame -endif - -ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) -FFMPEG_CONF_OPTS += --enable-libmodplug -FFMPEG_DEPENDENCIES += libmodplug -else -FFMPEG_CONF_OPTS += --disable-libmodplug -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -FFMPEG_CONF_OPTS += --enable-libspeex -FFMPEG_DEPENDENCIES += speex -else -FFMPEG_CONF_OPTS += --disable-libspeex -endif - -ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -FFMPEG_CONF_OPTS += --enable-libtheora -FFMPEG_DEPENDENCIES += libtheora -else -FFMPEG_CONF_OPTS += --disable-libtheora -endif - -ifeq ($(BR2_PACKAGE_WAVPACK),y) -FFMPEG_CONF_OPTS += --enable-libwavpack -FFMPEG_DEPENDENCIES += wavpack -else -FFMPEG_CONF_OPTS += --disable-libwavpack -endif - -# ffmpeg freetype support require fenv.h which is only -# available/working on glibc. -# The microblaze variant doesn't provide the needed exceptions -ifeq ($(BR2_PACKAGE_FREETYPE)$(BR2_TOOLCHAIN_USES_GLIBC)x$(BR2_microblaze),yyx) -FFMPEG_CONF_OPTS += --enable-libfreetype -FFMPEG_DEPENDENCIES += freetype -else -FFMPEG_CONF_OPTS += --disable-libfreetype -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -FFMPEG_CONF_OPTS += --enable-fontconfig -FFMPEG_DEPENDENCIES += fontconfig -else -FFMPEG_CONF_OPTS += --disable-fontconfig -endif - -ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy) -FFMPEG_CONF_OPTS += --enable-libx264 -FFMPEG_DEPENDENCIES += x264 -else -FFMPEG_CONF_OPTS += --disable-libx264 -endif - -ifeq ($(BR2_PACKAGE_X265)$(BR2_PACKAGE_FFMPEG_GPL),yy) -FFMPEG_CONF_OPTS += --enable-libx265 -FFMPEG_DEPENDENCIES += x265 -else -FFMPEG_CONF_OPTS += --disable-libx265 -endif - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -FFMPEG_CONF_OPTS += --enable-yasm -FFMPEG_DEPENDENCIES += host-yasm -else -FFMPEG_CONF_OPTS += --disable-yasm -FFMPEG_CONF_OPTS += --disable-mmx -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -FFMPEG_CONF_OPTS += --enable-sse -else -FFMPEG_CONF_OPTS += --disable-sse -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -FFMPEG_CONF_OPTS += --enable-sse2 -else -FFMPEG_CONF_OPTS += --disable-sse2 -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE3),y) -FFMPEG_CONF_OPTS += --enable-sse3 -else -FFMPEG_CONF_OPTS += --disable-sse3 -endif - -ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) -FFMPEG_CONF_OPTS += --enable-ssse3 -else -FFMPEG_CONF_OPTS += --disable-ssse3 -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE4),y) -FFMPEG_CONF_OPTS += --enable-sse4 -else -FFMPEG_CONF_OPTS += --disable-sse4 -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE42),y) -FFMPEG_CONF_OPTS += --enable-sse42 -else -FFMPEG_CONF_OPTS += --disable-sse42 -endif - -ifeq ($(BR2_X86_CPU_HAS_AVX),y) -FFMPEG_CONF_OPTS += --enable-avx -else -FFMPEG_CONF_OPTS += --disable-avx -endif - -ifeq ($(BR2_X86_CPU_HAS_AVX2),y) -FFMPEG_CONF_OPTS += --enable-avx2 -else -FFMPEG_CONF_OPTS += --disable-avx2 -endif - -# Explicitly disable everything that doesn't match for ARM -# FFMPEG "autodetects" by compiling an extended instruction via AS -# This works on compilers that aren't built for generic by default -ifeq ($(BR2_ARM_CPU_ARMV4),y) -FFMPEG_CONF_OPTS += --disable-armv5te -endif -ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y) -FFMPEG_CONF_OPTS += --enable-armv6 -else -FFMPEG_CONF_OPTS += --disable-armv6 --disable-armv6t2 -endif -ifeq ($(BR2_ARM_CPU_HAS_VFPV2),y) -FFMPEG_CONF_OPTS += --enable-vfp -else -FFMPEG_CONF_OPTS += --disable-vfp -endif -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -FFMPEG_CONF_OPTS += --enable-neon -else ifeq ($(BR2_aarch64),y) -FFMPEG_CONF_OPTS += --enable-neon -else -FFMPEG_CONF_OPTS += --disable-neon -endif - -ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) -ifeq ($(BR2_MIPS_SOFT_FLOAT),y) -FFMPEG_CONF_OPTS += --disable-mipsfpu -else -FFMPEG_CONF_OPTS += --enable-mipsfpu -endif -endif # MIPS - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -FFMPEG_CONF_OPTS += --enable-altivec -else -FFMPEG_CONF_OPTS += --disable-altivec -endif - -# Uses __atomic_fetch_add_4 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -FFMPEG_CONF_OPTS += --extra-libs=-latomic -endif - -ifeq ($(BR2_STATIC_LIBS),) -FFMPEG_CONF_OPTS += --enable-pic -else -FFMPEG_CONF_OPTS += --disable-pic -endif - -# Default to --cpu=generic for MIPS architecture, in order to avoid a -# warning from ffmpeg's configure script. -ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) -FFMPEG_CONF_OPTS += --cpu=generic -else ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) -FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_CPU) -else ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) -FFMPEG_CONF_OPTS += --cpu=$(BR2_GCC_TARGET_ARCH) -endif - -FFMPEG_CONF_OPTS += $(call qstrip,$(BR2_PACKAGE_FFMPEG_EXTRACONF)) - -# Override FFMPEG_CONFIGURE_CMDS: FFmpeg does not support --target and others -define FFMPEG_CONFIGURE_CMDS - (cd $(FFMPEG_SRCDIR) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - $(FFMPEG_CONF_ENV) \ - ./configure \ - --enable-cross-compile \ - --cross-prefix=$(TARGET_CROSS) \ - --sysroot=$(STAGING_DIR) \ - --host-cc="$(HOSTCC)" \ - --arch=$(BR2_ARCH) \ - --target-os="linux" \ - --disable-stripping \ - --pkg-config="$(PKG_CONFIG_HOST_BINARY)" \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(FFMPEG_CONF_OPTS) \ - ) -endef - -define FFMPEG_REMOVE_EXAMPLE_SRC_FILES - rm -rf $(TARGET_DIR)/usr/share/ffmpeg/examples -endef -FFMPEG_POST_INSTALL_TARGET_HOOKS += FFMPEG_REMOVE_EXAMPLE_SRC_FILES - -$(eval $(autotools-package)) diff --git a/package.bak/fftw/Config.in b/package.bak/fftw/Config.in deleted file mode 100644 index ef1138493f..0000000000 --- a/package.bak/fftw/Config.in +++ /dev/null @@ -1,78 +0,0 @@ -config BR2_PACKAGE_FFTW - bool "fftw" - help - Library for computing Fast Fourier Transforms. - - This library computes Fast Fourier Transforms (FFT) in one - or more dimensions. It is extremely fast. This package - contains the shared library version of the fftw libraries in - double precision. - - http://www.fftw.org - -if BR2_PACKAGE_FFTW - -config BR2_PACKAGE_FFTW_USE_SSE - bool - -config BR2_PACKAGE_FFTW_USE_SSE2 - bool - -config BR2_PACKAGE_FFTW_USE_NEON - bool - -choice - prompt "fftw precision" - default BR2_PACKAGE_FFTW_PRECISION_DOUBLE - help - Selects fftw precision - -config BR2_PACKAGE_FFTW_PRECISION_SINGLE - bool "single" - select BR2_PACKAGE_FFTW_USE_SSE if BR2_X86_CPU_HAS_SSE - select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2 - select BR2_PACKAGE_FFTW_USE_NEON if BR2_ARM_CPU_HAS_NEON && !BR2_ARM_SOFT_FLOAT - help - Compile fftw in single precision, i.e. use 'float' for floating - point type. - -config BR2_PACKAGE_FFTW_PRECISION_DOUBLE - bool "double" - select BR2_PACKAGE_FFTW_USE_SSE2 if BR2_X86_CPU_HAS_SSE2 - help - Compile fftw in double precision (the default), i.e. use 'double' - for floating point type. - -config BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE - bool "long double" - # long-double precision require long-double trigonometric routines - depends on !(BR2_TOOLCHAIN_BUILDROOT_UCLIBC && \ - (BR2_arm || BR2_mips || BR2_mipsel)) - help - Compile fftw in long double precision, i.e. use 'long double' - for floating point type. - -config BR2_PACKAGE_FFTW_PRECISION_QUAD - bool "quad" - # quad-precision needs to have a gcc with libquadmath - depends on (BR2_i386 || BR2_x86_64) && BR2_USE_WCHAR - help - Compile fftw in quadruple precision, i.e. use '__float128' for - floating point type. - -endchoice - -config BR2_PACKAGE_FFTW_FAST - bool "optimise for speed over accuracy" - help - Optimise for fast math functions, at the expense of accuracy. - - Say 'y' if you need speed and can live with inaccuracies in - the results. Say 'n' (the default) if accuracy is of utmost - importance. - - This basically uses gcc's -Ofast optimisation level, which in - turn is basically using gcc's -ffast-math. See the gcc manual - for what this means. - -endif diff --git a/package.bak/fftw/fftw.hash b/package.bak/fftw/fftw.hash deleted file mode 100644 index 62b8f0f0d4..0000000000 --- a/package.bak/fftw/fftw.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.fftw.org/fftw-3.3.4.tar.gz.md5sum -md5 2edab8c06b24feeb3b82bbb3ebf3e7b3 fftw-3.3.4.tar.gz diff --git a/package.bak/fftw/fftw.mk b/package.bak/fftw/fftw.mk deleted file mode 100644 index 5bd39a8ff2..0000000000 --- a/package.bak/fftw/fftw.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# fftw -# -################################################################################ - -FFTW_VERSION = 3.3.4 -FFTW_SITE = http://www.fftw.org -FFTW_INSTALL_STAGING = YES -FFTW_LICENSE = GPLv2+ -FFTW_LICENSE_FILES = COPYING - -# fortran support only enables generation and installation of fortran sources -ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) -FFTW_CONF_OPTS += --enable-fortran -FFTW_CONF_ENV += FLIBS="-lgfortran -lm" -else -FFTW_CONF_OPTS += --disable-fortran -endif - -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_SINGLE),--enable,--disable)-single -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),--enable,--disable)-long-double -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_PRECISION_QUAD),--enable,--disable)-quad-precision - -FFTW_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_PACKAGE_FFTW_FAST),y) -FFTW_CFLAGS += -O3 -ffast-math -endif - -# x86 optimisations -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE),--enable,--disable)-sse -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_SSE2),--enable,--disable)-sse2 - -# ARM optimisations -FFTW_CONF_OPTS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),--enable,--disable)-neon -FFTW_CFLAGS += $(if $(BR2_PACKAGE_FFTW_USE_NEON),-mfpu=neon) - -# Generic optimisations -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -FFTW_CONF_OPTS += --enable-threads -FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--without,--with)-combined-threads -else -FFTW_CONF_OPTS += --disable-threads -endif -FFTW_CONF_OPTS += $(if $(BR2_GCC_ENABLE_OPENMP),--enable,--disable)-openmp - -FFTW_CONF_OPTS += CFLAGS="$(FFTW_CFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/ficl/0001-fix-Makefile.patch b/package.bak/ficl/0001-fix-Makefile.patch deleted file mode 100644 index d5a25c43f0..0000000000 --- a/package.bak/ficl/0001-fix-Makefile.patch +++ /dev/null @@ -1,47 +0,0 @@ -fix dependency in Makefiles - -there is no longer a sysdep.h file. - -Signed-off-by: Francois Perrad - -diff --git a/Makefile b/Makefile -index 976d00a..7f73c44 100644 ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ libficl.so.$(MAJOR).$(MINOR): $(OBJECTS) - -o libficl.so.$(MAJOR).$(MINOR) $(OBJECTS) - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so - --main: main.o ficl.h sysdep.h libficl.so.$(MAJOR).$(MINOR) -+main: main.o ficl.h libficl.so.$(MAJOR).$(MINOR) - $(CC) $(CFLAGS) $(LDFLAGS) main.o -o main -L. -lficl -lm - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so.$(MAJOR) - -diff --git a/Makefile.ansi b/Makefile.ansi -index e510fcd..170e6eb 100644 ---- a/Makefile.ansi -+++ b/Makefile.ansi -@@ -29,7 +29,7 @@ libficl.so.$(MAJOR).$(MINOR): $(OBJECTS) - -o libficl.so.$(MAJOR).$(MINOR) $(OBJECTS) - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so - --main: main.o ficl.h sysdep.h libficl.so.$(MAJOR).$(MINOR) -+main: main.o ficl.h libficl.so.$(MAJOR).$(MINOR) - $(CC) main.o -o main -L. -lficl -lm - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so.$(MAJOR) - -diff --git a/Makefile.linux b/Makefile.linux -index d447e7e..7f2cdfe 100644 ---- a/Makefile.linux -+++ b/Makefile.linux -@@ -29,7 +29,7 @@ libficl.so.$(MAJOR).$(MINOR): $(OBJECTS) - -o libficl.so.$(MAJOR).$(MINOR) $(OBJECTS) - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so - --main: main.o ficl.h sysdep.h libficl.so.$(MAJOR).$(MINOR) -+main: main.o ficl.h libficl.so.$(MAJOR).$(MINOR) - $(CC) main.o -o main -L. -lficl -lm - ln -sf libficl.so.$(MAJOR).$(MINOR) libficl.so.$(MAJOR) - --- - diff --git a/package.bak/ficl/Config.in b/package.bak/ficl/Config.in deleted file mode 100644 index 3445a6428f..0000000000 --- a/package.bak/ficl/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_FICL - bool "ficl" - help - Ficl is a programming language interpreter designed to be embedded - into other systems as a command, macro, and development - prototyping language. - Ficl is an acronym for "Forth Inspired Command Language". - - http://ficl.sourceforge.net diff --git a/package.bak/ficl/ficl.hash b/package.bak/ficl/ficl.hash deleted file mode 100644 index 4bfbbd070a..0000000000 --- a/package.bak/ficl/ficl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4daf74f3d3d6f8b86ea7cb47bc24931d50b4809b50ba34ca32e0ca1e972bd3a3 ficl-4.1.0.tar.gz diff --git a/package.bak/ficl/ficl.mk b/package.bak/ficl/ficl.mk deleted file mode 100644 index 65df146785..0000000000 --- a/package.bak/ficl/ficl.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# ficl -# -################################################################################ - -FICL_VERSION_MAJOR = 4.1 -FICL_VERSION = $(FICL_VERSION_MAJOR).0 -FICL_SITE = http://downloads.sourceforge.net/project/ficl/ficl-all/ficl$(FICL_VERSION_MAJOR) -FICL_LICENSE = BSD-2c -FICL_LICENSE_FILES = ReadMe.txt -FICL_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),y) -FICL_BUILD_TARGETS += ficl -define FICL_INSTALL_STATIC_BIN - $(INSTALL) -D -m 0755 $(@D)/ficl $(TARGET_DIR)/usr/bin/ficl -endef -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -FICL_BUILD_TARGETS += libficl.a -define FICL_INSTALL_STATIC_LIB - $(INSTALL) -D -m 0644 $(@D)/libficl.a $(STAGING_DIR)/usr/lib/libficl.a -endef -endif - -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -FICL_BUILD_TARGETS += main libficl.so.$(FICL_VERSION) -define FICL_INSTALL_SHARED_BIN - $(INSTALL) -D -m 0755 $(@D)/main $(TARGET_DIR)/usr/bin/ficl -endef -define FICL_INSTALL_SHARED_LIB - $(INSTALL) -D -m 0755 $(@D)/libficl.so.$(FICL_VERSION) $(1)/usr/lib/libficl.so.$(FICL_VERSION) - ln -sf libficl.so.$(FICL_VERSION) $(1)/usr/lib/libficl.so.4 - ln -sf libficl.so.$(FICL_VERSION) $(1)/usr/lib/libficl.so -endef -endif - -define FICL_BUILD_CMDS - $(MAKE) -C $(@D) -f Makefile.linux $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC -I. -Dlinux" CPPFLAGS="" $(FICL_BUILD_TARGETS) -endef - -define FICL_INSTALL_STAGING_CMDS - $(FICL_INSTALL_STATIC_LIB) - $(call FICL_INSTALL_SHARED_LIB,$(STAGING_DIR)) - $(INSTALL) -D -m 0644 $(@D)/ficl.h $(STAGING_DIR)/usr/include/ficl.h - $(INSTALL) -D -m 0644 $(@D)/ficllocal.h $(STAGING_DIR)/usr/include/ficllocal.h - $(INSTALL) -D -m 0644 $(@D)/ficlplatform/unix.h $(STAGING_DIR)/usr/include/ficlplatform/unix.h -endef - -define FICL_INSTALL_TARGET_CMDS - $(FICL_INSTALL_STATIC_BIN) - $(FICL_INSTALL_SHARED_BIN) - $(call FICL_INSTALL_SHARED_LIB,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/file/Config.in b/package.bak/file/Config.in deleted file mode 100644 index 13934b2239..0000000000 --- a/package.bak/file/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FILE - bool "file" - select BR2_PACKAGE_ZLIB - help - Program to identify a file's format by scanning binary data - for known patterns. - - http://www.darwinsys.com/file/ diff --git a/package.bak/file/file.hash b/package.bak/file/file.hash deleted file mode 100644 index 9a4c9f1197..0000000000 --- a/package.bak/file/file.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ea661277cd39bf8f063d3a83ee875432cc3680494169f952787e002bdd3884c0 file-5.29.tar.gz diff --git a/package.bak/file/file.mk b/package.bak/file/file.mk deleted file mode 100644 index 39d1781ff0..0000000000 --- a/package.bak/file/file.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# file -# -################################################################################ - -FILE_VERSION = 5.29 -FILE_SITE = ftp://ftp.astron.com/pub/file -FILE_DEPENDENCIES = host-file zlib -HOST_FILE_DEPENDENCIES = host-zlib -FILE_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -FILE_INSTALL_STAGING = YES -FILE_LICENSE = BSD-2c, BSD-4c (one file), BSD-3c (one file) -FILE_LICENSE_FILES = COPYING src/mygetopt.h src/vasprintf.c - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/filemq/Config.in b/package.bak/filemq/Config.in deleted file mode 100644 index e06a267469..0000000000 --- a/package.bak/filemq/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FILEMQ - bool "filemq" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_CZMQ - select BR2_PACKAGE_ZEROMQ - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - depends on BR2_USE_MMU # czmq - help - FileMQ is a publish-subscribe file service based on 0MQ. - - http://github.com/zeromq/filemq - -comment "filemq needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/filemq/filemq.hash b/package.bak/filemq/filemq.hash deleted file mode 100644 index 1a7997ede2..0000000000 --- a/package.bak/filemq/filemq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c373eddd5154cfe63f6cc6b3255ec20dca1f70c1f1881b611930931df47babad filemq-e59951489045825d6fc5bdc6a5a5ecf1abf51943.tar.gz diff --git a/package.bak/filemq/filemq.mk b/package.bak/filemq/filemq.mk deleted file mode 100644 index d57208ec72..0000000000 --- a/package.bak/filemq/filemq.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# filemq -# -################################################################################ - -FILEMQ_VERSION = e59951489045825d6fc5bdc6a5a5ecf1abf51943 -FILEMQ_SITE = $(call github,zeromq,filemq,$(FILEMQ_VERSION)) - -FILEMQ_AUTORECONF = YES -FILEMQ_CONF_ENV = filemq_have_asciidoc=no -FILEMQ_INSTALL_STAGING = YES -FILEMQ_DEPENDENCIES = czmq openssl zeromq -FILEMQ_LICENSE = LGPLv3+ with exceptions -FILEMQ_LICENSE_FILES = COPYING COPYING.LESSER - -define FILEMQ_CREATE_CONFIG_DIR - mkdir -p $(@D)/config -endef - -FILEMQ_POST_PATCH_HOOKS += FILEMQ_CREATE_CONFIG_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/findutils/Config.in b/package.bak/findutils/Config.in deleted file mode 100644 index b0eee5a626..0000000000 --- a/package.bak/findutils/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_FINDUTILS - bool "findutils" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Basic directory searching utilities. Provides the - common 'find', 'xargs', 'locate', and 'updatedb' binaries. - - http://www.gnu.org/software/findutils/findutils.html - -comment "findutils needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/findutils/findutils.hash b/package.bak/findutils/findutils.hash deleted file mode 100644 index d5c5519304..0000000000 --- a/package.bak/findutils/findutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ded4c9f73731cd48fec3b6bdaccce896473b6d8e337e9612e16cf1431bb1169d findutils-4.6.0.tar.gz diff --git a/package.bak/findutils/findutils.mk b/package.bak/findutils/findutils.mk deleted file mode 100644 index 8f6b099065..0000000000 --- a/package.bak/findutils/findutils.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# findutils -# -################################################################################ - -FINDUTILS_VERSION = 4.6.0 -FINDUTILS_SITE = $(BR2_GNU_MIRROR)/findutils -FINDUTILS_LICENSE = GPLv3+ -FINDUTILS_LICENSE_FILES = COPYING -FINDUTILS_CONF_ENV = \ - gl_cv_func_stdin=yes \ - ac_cv_func_working_mktime=yes \ - gl_cv_func_wcwidth_works=yes - -$(eval $(autotools-package)) diff --git a/package.bak/fio/Config.in b/package.bak/fio/Config.in deleted file mode 100644 index 89f54f99a2..0000000000 --- a/package.bak/fio/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_FIO - bool "fio" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_HAS_THREADS - # fio uses posix_madvise(), which is not part of any official - # release of uClibc, but is part of uClibc Git, and backported - # in Buildroot patch set of uClibc 0.9.33. Therefore, we - # disable the build of fio for external uClibc toolchains - # (which use an unknown uClibc version) - depends on !BR2_TOOLCHAIN_EXTERNAL_UCLIBC - # fio uses fallocate() which becomes fallocate64() while compiling with - # largefile support, but fallocate64() is not available on nios2 - depends on !BR2_nios2 - help - fio is an I/O tool meant to be used both for benchmark - and stress/hardware verification. - - http://git.kernel.dk/?p=fio.git;a=summary - -comment "fio needs a toolchain w/ dynamic library, threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_nios2 - depends on BR2_USE_MMU diff --git a/package.bak/fio/fio.mk b/package.bak/fio/fio.mk deleted file mode 100644 index 5c02bc92ee..0000000000 --- a/package.bak/fio/fio.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# fio -# -################################################################################ - -FIO_VERSION = fio-2.13 -FIO_SITE = git://git.kernel.dk/fio.git -FIO_LICENSE = GPLv2 + special obligations -FIO_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBAIO),y) -FIO_DEPENDENCIES += libaio -endif - -ifeq ($(BR2_PACKAGE_NUMACTL),y) -FIO_DEPENDENCIES += numactl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -FIO_DEPENDENCIES += zlib -endif - -define FIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure --cc="$(TARGET_CC)" --extra-cflags="$(TARGET_CFLAGS)") -endef - -define FIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define FIO_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/fio $(TARGET_DIR)/usr/bin/fio -endef - -$(eval $(generic-package)) diff --git a/package.bak/fis/0001-checksum.patch b/package.bak/fis/0001-checksum.patch deleted file mode 100644 index a6325eb01a..0000000000 --- a/package.bak/fis/0001-checksum.patch +++ /dev/null @@ -1,274 +0,0 @@ -diff -uN fis.orig/crc.c fis/crc.c ---- fis.orig/crc.c 1970-01-01 10:00:00.000000000 +1000 -+++ fis/crc.c 2008-04-01 11:39:13.000000000 +1100 -@@ -0,0 +1,88 @@ -+/* -+ * crc.c -+ * -+ * $Id: crc.c,v 1.1 2006/02/13 09:58:08 andrzej Exp $ -+ * -+ * Gary S. Brown's CRC -+ * Code based on Gary S. Brown CRC (1986). -+ * Generation polynomial is: -+ * X^32+X^26+X^23+X^22+X^16+X^12+X^11+X^10+X^8+X^7+X^5+X^4+X^2+X^1+X^0 -+ * -+ * Copyright (C) 2006 Ekiert sp z o.o. -+ * Author: Andrzej Ekiert -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#include -+ -+#include "crc.h" -+ -+static const uint32_t crc32_tab[] = { -+ 0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L, -+ 0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L, -+ 0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L, -+ 0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL, -+ 0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L, -+ 0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L, -+ 0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L, -+ 0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL, -+ 0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L, -+ 0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL, -+ 0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L, -+ 0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L, -+ 0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L, -+ 0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL, -+ 0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL, -+ 0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L, -+ 0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL, -+ 0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L, -+ 0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L, -+ 0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L, -+ 0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL, -+ 0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L, -+ 0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L, -+ 0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL, -+ 0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L, -+ 0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L, -+ 0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L, -+ 0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L, -+ 0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L, -+ 0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL, -+ 0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL, -+ 0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L, -+ 0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L, -+ 0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL, -+ 0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL, -+ 0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L, -+ 0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL, -+ 0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L, -+ 0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL, -+ 0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L, -+ 0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL, -+ 0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L, -+ 0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L, -+ 0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL, -+ 0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L, -+ 0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L, -+ 0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L, -+ 0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L, -+ 0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L, -+ 0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L, -+ 0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL, -+ 0x2d02ef8dL -+ }; -+ -+uint32_t crc32(uint8_t *s, uint32_t len) -+{ -+ uint32_t i, val = 0; -+ -+ for (i = 0; i < len; i++) { -+ val = crc32_tab[(val^s[i]) & 0xff] ^ (val >> 8); -+ } -+ return val; -+} -+ -diff -uN fis.orig/crc.h fis/crc.h ---- fis.orig/crc.h 1970-01-01 10:00:00.000000000 +1000 -+++ fis/crc.h 2008-04-01 11:39:13.000000000 +1100 -@@ -0,0 +1,25 @@ -+/* -+ * crc.h -+ * -+ * $Id: crc.h,v 1.1 2006/02/13 09:58:08 andrzej Exp $ -+ * -+ * Gary S. Brown's CRC - header. -+ * -+ * Copyright (C) 2006 Ekiert sp z o.o. -+ * Author: Andrzej Ekiert -+ * -+ * This program is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License -+ * as published by the Free Software Foundation; either version -+ * 2 of the License, or (at your option) any later version. -+ */ -+ -+#ifndef CRC_H -+#define CRC_H -+ -+#include -+ -+uint32_t crc32(uint8_t *s, uint32_t len); -+ -+#endif //CRC_H -+ -diff -uN fis.orig/fis.c fis/fis.c ---- fis.orig/fis.c 2007-05-03 06:42:51.000000000 +1000 -+++ fis/fis.c 2008-04-01 11:52:11.000000000 +1100 -@@ -30,6 +30,7 @@ - #include - #include - -+#include "crc.h" - - // Report an error and terminate: - -@@ -141,8 +142,8 @@ - - static void dump_desc(FILE* f, const struct fis_image_desc* d) - { -- fprintf(f,"%16s: addr = 0x%08x, size = 0x%08x\n", -- d->name, d->flash_base, d->size); -+ fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n", -+ d->name, d->flash_base, d->mem_base, d->size, d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip" - uint32_t offset = d->skips[i+1]; -@@ -332,6 +333,7 @@ - d->size = swap_end_32(d->size); - d->entry_point = swap_end_32(d->entry_point); - d->data_length = swap_end_32(d->data_length); -+ d->file_cksum = swap_end_32(d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - d->skips[i] = swap_end_32(d->skips[i]); - } -@@ -446,19 +448,25 @@ - char* arg=argv[i]; - if (strcmp(arg,"-l")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -l"); -+ fatal("argument missing for -l"); - } - ++i; - d->size = str_to_int_maybe_hex(argv[i]); - } else if (strcmp(arg,"-f")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -f"); -+ fatal("argument missing for -f"); - } - ++i; - d->flash_base = str_to_int_maybe_hex(argv[i]); -+ } else if (strcmp(arg,"-m")==0) { -+ if (i==argc-1) { -+ fatal("argument missing for -m"); -+ } -+ ++i; -+ d->mem_base = str_to_int_maybe_hex(argv[i]); - } else if (strcmp(arg,"-n")==0) { - if (i==argc-1) { -- fatal("argumnet missing for -n"); -+ fatal("argument missing for -n"); - } - ++i; - char* name = argv[i]; -@@ -499,6 +507,66 @@ - save_dir(fd,offset,size,swap_endianness,dir); - } - -+static void fis_checksum(const char* device, int offset, int size, bool swap_endianness, -+ int argc, char* argv[]) -+{ -+ char* name = NULL; -+ char* filename = NULL; -+ -+ for (int i=0; i=16) { -+ fatal("name too long, max 16 chars including terminating null"); -+ } -+ } else { -+ fputs("Unrecognised option '",stderr); -+ fputs(arg,stderr); -+ fputs("'\n",stderr); -+ exit(1); -+ } -+ } -+ -+ if (name == NULL || filename == NULL) -+ fatal("filename and partition name must be specified"); -+ -+ int fd; -+ char *buf; -+ struct stat stat_buf; -+ uint32_t crc; -+ -+ CHECK(fd=open(filename,O_RDONLY),-1); -+ CHECK(stat(filename, &stat_buf),-1); -+ buf = (char*)chk_malloc(stat_buf.st_size); -+ CHECK(read(fd,buf,stat_buf.st_size),-1); -+ crc = crc32(buf,stat_buf.st_size); -+ close(fd); -+ free(buf); -+ -+ CHECK(fd=open(device,O_RDWR),-1); -+ dir_t dir; -+ load_dir(fd,offset,&size,swap_endianness,&dir); -+ iter_t after = NULL; -+ FOR_EACH_DIR_ENTRY(dir,i) { -+ if (strcmp(get(i)->name, name) == 0) { -+ get(i)->file_cksum = crc; -+ get(i)->data_length = stat_buf.st_size; -+ break; -+ } -+ } -+ save_dir(fd,offset,size,swap_endianness,dir); -+} - - static void fis_delete(const char* device, int offset, int size, bool swap_endianness, - char* name) -@@ -526,8 +594,9 @@ - fputs("Usage:\n" - " fis [options] list\n" - " fis [options] init\n" -- " fis [options] create -f address -l size -n name\n" -+ " fis [options] create -f address -l size -n name [-m memory_address]\n" - " fis [options] delete name\n" -+ " fis [options] checksum -f filename -n name\n" - "Options:\n" - " -d device specify /dev/mtd* device containing directory\n" - " -o offset specify offset into device of start of directory\n" -@@ -597,9 +666,14 @@ - fis_create(device,offset,size,swap_endianness, - argc-i-1,&argv[i+1]); - break; -+ } else if (strcmp(arg,"checksum")==0) { -+ check_dev(device); -+ fis_checksum(device,offset,size,swap_endianness, -+ argc-i-1,&argv[i+1]); -+ break; - } else if (strcmp(arg,"delete")==0) { - if (i!=argc-2) { -- fatal("Exactly one argumnet required after 'delete'"); -+ fatal("Exactly one argument required after 'delete'"); - } - ++i; - char* name = argv[i]; diff --git a/package.bak/fis/0003-list_output.patch b/package.bak/fis/0003-list_output.patch deleted file mode 100644 index 6c1e4eb9dd..0000000000 --- a/package.bak/fis/0003-list_output.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- fis.orig/fis.c 2010-05-12 10:22:10.000000000 -0700 -+++ fis/fis.c 2010-05-12 10:19:24.000000000 -0700 -@@ -142,8 +142,8 @@ - - static void dump_desc(FILE* f, const struct fis_image_desc* d) - { -- fprintf(f,"%16s: flash addr = 0x%08x, mem addr = 0x%08x, size = 0x%08x, checksum = 0x%08x\n", -- d->name, d->flash_base, d->mem_base, d->size, d->file_cksum); -+ fprintf(f,"%-16s 0x%08x 0x%08x 0x%08x 0x%08x 0x%08x\n", -+ d->name, d->flash_base, d->mem_base, d->size, d->entry_point, d->file_cksum); - for (unsigned int i=0; i<(sizeof(d->skips)/4); ++i) { - if (d->skips[i]==0x736b6970 || d->skips[i]==0x70696b73) { // "skip" - uint32_t offset = d->skips[i+1]; -@@ -400,6 +400,7 @@ - CHECK(fd=open(device,O_RDONLY),-1); - dir_t dir; - load_dir(fd,offset,&size,swap_endianness,&dir); -+ fprintf(stdout,"Name FLASH addr Mem addr Length Entry point Checksum\n"); - FOR_EACH_DIR_ENTRY(dir,i) { - dump_desc(stdout,get(i)); - } diff --git a/package.bak/fis/0004-sorted_list.patch b/package.bak/fis/0004-sorted_list.patch deleted file mode 100644 index 6854977ba4..0000000000 --- a/package.bak/fis/0004-sorted_list.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- fis.orig/fis.c 2010-05-12 11:09:22.000000000 -0700 -+++ fis/fis.c 2010-05-12 11:05:45.000000000 -0700 -@@ -401,9 +401,24 @@ - dir_t dir; - load_dir(fd,offset,&size,swap_endianness,&dir); - fprintf(stdout,"Name FLASH addr Mem addr Length Entry point Checksum\n"); -- FOR_EACH_DIR_ENTRY(dir,i) { -- dump_desc(stdout,get(i)); -- } -+ uint32_t last_addr = 0; -+ bool image_found; -+ do { -+ uint32_t lowest_addr = 0xffffffff; -+ iter_t index; -+ image_found = false; -+ FOR_EACH_DIR_ENTRY(dir,i) { -+ const struct fis_image_desc *d = get(i); -+ if ((d->flash_base >= last_addr) && (d->flash_base < lowest_addr)) { -+ lowest_addr = d->flash_base; -+ image_found = true; -+ index = i; -+ } -+ } -+ if (image_found) -+ dump_desc(stdout,get(index)); -+ last_addr = lowest_addr + 1; -+ } while (image_found == true); - } - - diff --git a/package.bak/fis/Config.in b/package.bak/fis/Config.in deleted file mode 100644 index c5bfbb82cc..0000000000 --- a/package.bak/fis/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_FIS - bool "fis" - help - fis - manipulate RedBoot partition table from Linux. diff --git a/package.bak/fis/fis.mk b/package.bak/fis/fis.mk deleted file mode 100644 index 876b127268..0000000000 --- a/package.bak/fis/fis.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# fis -# -################################################################################ - -FIS_SITE = http://svn.chezphil.org/utils/trunk -FIS_SITE_METHOD = svn -FIS_VERSION = 2892 -FIS_LICENSE = GPLv2+ -FIS_LICENSE_FILES = fis.c - -define FIS_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) -std=c99 -o $(@D)/fis \ - $(@D)/fis.c $(@D)/crc.c $(TARGE_LDFLAGS) -endef - -define FIS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/fis $(TARGET_DIR)/sbin/fis -endef - -$(eval $(generic-package)) diff --git a/package.bak/flac/0001-configure.ac-relax-linux-OS-detection.patch b/package.bak/flac/0001-configure.ac-relax-linux-OS-detection.patch deleted file mode 100644 index baf07bc16e..0000000000 --- a/package.bak/flac/0001-configure.ac-relax-linux-OS-detection.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 8589b44c573d4228a9df3ba7bffdfdf584e7b033 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 9 Jan 2017 21:38:29 +0100 -Subject: [PATCH] configure.ac: relax linux OS detection - -Not all linux hosts match the *-pc-linux-gnu wildcard, causing build -failures for older glibc versions where we need to link with -lrt for -clock_gettime - E.G.: - - - arm-unknown-linux-musleabihf - - powerpc-unknown-linux-gnuspe - - bfin-linux-linux-uclibc - .. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 070ab357..235d2717 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -186,7 +186,7 @@ esac - AM_CONDITIONAL(OS_IS_WINDOWS, test "x$os_is_windows" = xyes) - - case "$host" in -- *-pc-linux-gnu) -+ *-linux-*) - sys_linux=true - AC_DEFINE(FLAC__SYS_LINUX) - AH_TEMPLATE(FLAC__SYS_LINUX, [define if building for Linux]) --- -2.11.0 - diff --git a/package.bak/flac/Config.in b/package.bak/flac/Config.in deleted file mode 100644 index 267acb7f34..0000000000 --- a/package.bak/flac/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_FLAC - bool "flac" - depends on BR2_USE_WCHAR - help - FLAC is an Open Source lossless audio codec. - - http://flac.sourceforge.net/ - -comment "flac needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/flac/flac.hash b/package.bak/flac/flac.hash deleted file mode 100644 index 7ce76f107c..0000000000 --- a/package.bak/flac/flac.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/flac/SHA256SUMS.txt -sha256 91cfc3ed61dc40f47f050a109b08610667d73477af6ef36dcad31c31a4a8d53f flac-1.3.2.tar.xz diff --git a/package.bak/flac/flac.mk b/package.bak/flac/flac.mk deleted file mode 100644 index 43e0410df5..0000000000 --- a/package.bak/flac/flac.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# flac -# -################################################################################ - -FLAC_VERSION = 1.3.2 -FLAC_SITE = http://downloads.xiph.org/releases/flac -FLAC_SOURCE = flac-$(FLAC_VERSION).tar.xz -FLAC_INSTALL_STAGING = 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 -# 0001-configure.ac-relax-linux-OS-detection.patch patches configure.ac -FLAC_AUTORECONF = YES -FLAC_CONF_OPTS = \ - --disable-cpplibs \ - --disable-xmms-plugin \ - --disable-altivec - -ifeq ($(BR2_PACKAGE_LIBOGG),y) -FLAC_CONF_OPTS += --with-ogg=$(STAGING_DIR)/usr -FLAC_DEPENDENCIES += libogg -else -FLAC_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -FLAC_DEPENDENCIES += host-nasm -FLAC_CONF_OPTS += --enable-sse -else -FLAC_CONF_OPTS += --disable-sse -endif - -$(eval $(autotools-package)) diff --git a/package.bak/flann/Config.in b/package.bak/flann/Config.in deleted file mode 100644 index a2cd50c867..0000000000 --- a/package.bak/flann/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_FLANN - bool "flann" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - # all gcc versions fail to build flann on Microblaze due to - # gcc bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69401 - depends on !BR2_microblaze - help - FLANN is a library for performing fast approximate nearest - neighbor searches in high dimensional spaces. It contains a - collection of algorithms we found to work best for nearest - neighbor search and a system for automatically choosing the - best algorithm and optimum parameters depending on the - dataset. - - http://www.cs.ubc.ca/research/flann/ - -if BR2_PACKAGE_FLANN - -config BR2_PACKAGE_FLANN_EXAMPLES - bool "flann examples" - help - Build and install flann example applications. - -endif - -comment "flann needs a toolchain w/ C++, dynamic library" - depends on !BR2_microblaze - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package.bak/flann/flann.hash b/package.bak/flann/flann.hash deleted file mode 100644 index 08242eb2de..0000000000 --- a/package.bak/flann/flann.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3fec86866987c792c3fce7ecc8ba9d09a003f5d2d1a1ad94864550aad73a5c0b flann-3645f0c30a47267e56e5acdecfc7bac2b76bc3d5.tar.gz diff --git a/package.bak/flann/flann.mk b/package.bak/flann/flann.mk deleted file mode 100644 index af86a02f04..0000000000 --- a/package.bak/flann/flann.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# flann -# -################################################################################ - -FLANN_VERSION = 3645f0c30a47267e56e5acdecfc7bac2b76bc3d5 -FLANN_SITE = $(call github,mariusmuja,flann,$(FLANN_VERSION)) -FLANN_INSTALL_STAGING = YES -FLANN_LICENSE = BSD-3c -FLANN_LICENSE_FILES = COPYING -FLANN_CONF_OPTS = \ - -DBUILD_C_BINDINGS=ON \ - -DBUILD_PYTHON_BINDINGS=OFF \ - -DBUILD_MATLAB_BINDINGS=OFF \ - -DBUILD_EXAMPLES=$(if $(BR2_PACKAGE_FLANN_EXAMPLES),ON,OFF) \ - -DUSE_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) \ - -DPYTHON_EXECUTABLE=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/flannel/Config.in b/package.bak/flannel/Config.in deleted file mode 100644 index 134111b1c0..0000000000 --- a/package.bak/flannel/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -comment "flannel needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_FLANNEL - bool "flannel" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Flannel is a virtual network that gives a subnet to each - host for use with container runtimes. - - https://github.com/coreos/flannel diff --git a/package.bak/flannel/flannel.hash b/package.bak/flannel/flannel.hash deleted file mode 100644 index 3e0b25cb4d..0000000000 --- a/package.bak/flannel/flannel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 dbbcb08c0e70713b0c920387a9967e5b30ef833c8118c847edbbca4f68ff0562 v0.5.5.tar.gz diff --git a/package.bak/flannel/flannel.mk b/package.bak/flannel/flannel.mk deleted file mode 100644 index 18c0af1605..0000000000 --- a/package.bak/flannel/flannel.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# flannel -# -################################################################################ - -FLANNEL_VERSION = v0.5.5 -FLANNEL_SITE = https://github.com/coreos/flannel/archive -FLANNEL_SOURCE = $(FLANNEL_VERSION).tar.gz - -FLANNEL_LICENSE = Apache-2.0 -FLANNEL_LICENSE_FILES = LICENSE - -FLANNEL_DEPENDENCIES = host-go - -FLANNEL_MAKE_ENV = \ - $(HOST_GO_TARGET_ENV) \ - GOBIN="$(@D)/bin" \ - GOPATH="$(@D)/gopath" \ - CGO_ENABLED=1 - -FLANNEL_GLDFLAGS = \ - -X github.com/coreos/flannel/version.Version=$(FLANNEL_VERSION) \ - -ifeq ($(BR2_STATIC_LIBS),y) -FLANNEL_GLDFLAGS += -extldflags '-static' -endif - -define FLANNEL_CONFIGURE_CMDS - # Put sources at prescribed GOPATH location. - mkdir -p $(@D)/gopath/src/github.com/coreos - ln -s $(@D) $(@D)/gopath/src/github.com/coreos/flannel -endef - -define FLANNEL_BUILD_CMDS - cd $(@D) && $(FLANNEL_MAKE_ENV) $(HOST_DIR)/usr/bin/go \ - build -v -o $(@D)/bin/flanneld -ldflags "$(FLANNEL_GLDFLAGS)" . -endef - -define FLANNEL_INSTALL_TARGET_CMDS - # Install flannel to its well known location. - $(INSTALL) -D -m 0755 $(@D)/bin/flanneld $(TARGET_DIR)/opt/bin/flanneld - $(INSTALL) -D -m 0755 $(@D)/dist/mk-docker-opts.sh $(TARGET_DIR)/opt/bin/mk-docker-opts.sh -endef - -$(eval $(generic-package)) diff --git a/package.bak/flashbench/Config.in b/package.bak/flashbench/Config.in deleted file mode 100644 index 7be1ea9bc3..0000000000 --- a/package.bak/flashbench/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_FLASHBENCH - bool "flashbench" - help - Flashbench - Identify characteristics of flash media. - - This is the tool used to identify the properties of - SD cards and other media for the Linaro flash memory - survey. - - https://wiki.linaro.org/WorkingGroups/KernelConsolidation/Projects/FlashCardSurvey diff --git a/package.bak/flashbench/flashbench.mk b/package.bak/flashbench/flashbench.mk deleted file mode 100644 index 6759338a2e..0000000000 --- a/package.bak/flashbench/flashbench.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# flashbench -# -################################################################################ - -FLASHBENCH_VERSION = 2e30b1968a66147412f21002ea844122a0d5e2f0 -FLASHBENCH_SITE = git://git.linaro.org/people/arnd/flashbench.git -FLASHBENCH_LICENSE = GPLv2 -FLASHBENCH_LICENSE_FILES = COPYING - -FLASHBENCH_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_microblaze)$(BR2_sh2a),y) -# microblaze and sh2a toolchains only provide LLONG_MAX when used with gnu99 dialect -FLASHBENCH_CFLAGS += -std=gnu99 -endif - -define FLASHBENCH_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(FLASHBENCH_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS) -lrt" -endef - -define FLASHBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/flashbench $(TARGET_DIR)/usr/bin/flashbench - $(INSTALL) -m 755 -D $(@D)/erase $(TARGET_DIR)/usr/bin/erase -endef - -$(eval $(generic-package)) diff --git a/package.bak/flashrom/0001-spi.patch b/package.bak/flashrom/0001-spi.patch deleted file mode 100644 index 22ffcb54dc..0000000000 --- a/package.bak/flashrom/0001-spi.patch +++ /dev/null @@ -1,25 +0,0 @@ -linux_spi: add missing include - -Some defines (e.g. _IOC_SIZEBITS) are defined in linux/ioctl.h, -so it must be included before it is used, by SPI_IOC_MESSAGE -from linux/spi/spidev.h - -Fixes build errors with the musl C library, as seen in these -Buildroot autobuilder failures: - - http://autobuild.buildroot.org/results/2a3/2a3744007c630c267575a638ebcd83a4b97644f5/build-end.log - http://autobuild.buildroot.org/results/3de/3de936d9be79e151e66af15193084d82a0f2c04a/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/linux_spi.c flashrom-0.9.8/linux_spi.c ---- flashrom-0.9.8.orig/linux_spi.c 2015-10-28 19:42:38.480285847 +0100 -+++ flashrom-0.9.8/linux_spi.c 2015-10-28 19:43:15.492994613 +0100 -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include "flash.h" diff --git a/package.bak/flashrom/0002-sys-io.h.patch b/package.bak/flashrom/0002-sys-io.h.patch deleted file mode 100644 index 8d990c6f91..0000000000 --- a/package.bak/flashrom/0002-sys-io.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -hwaccess: sys/io.h is not specific to glibc - -Under Linux, sys/io.h provides inb and outb, so we really need it. -However, its inclusion is conditional to the _GLIBC_ define. This is -usually OK under Linux, since both glibc and uClibc define it (uclibc -fakes being glibc). - -But the musl C library does not impersonate glibc, so we're missing -including sys/io.h in this case. - -Change the include from checking _GLIBC_ to checking whether this is -Linux, looking for the __linux__ define. - -Signed-off-by: "Yann E. MORIN" - -diff -durN flashrom-0.9.8.orig/hwaccess.h flashrom-0.9.8/hwaccess.h ---- flashrom-0.9.8.orig/hwaccess.h 2015-02-10 09:03:10.000000000 +0100 -+++ flashrom-0.9.8/hwaccess.h 2015-10-28 20:01:54.259202484 +0100 -@@ -27,7 +27,7 @@ - #include "platform.h" - - #if IS_X86 --#if defined(__GLIBC__) -+#if defined(__linux__) - #include - #endif - #endif diff --git a/package.bak/flashrom/Config.in b/package.bak/flashrom/Config.in deleted file mode 100644 index adc068cbfa..0000000000 --- a/package.bak/flashrom/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_FLASHROM - bool "flashrom" - select BR2_PACKAGE_PCIUTILS - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - select BR2_PACKAGE_LIBFTDI - # dmidecode is only a runtime dependency - select BR2_PACKAGE_DMIDECODE - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - flashrom is a utility for identifying, reading, writing, - verifying and erasing flash chips. It is designed to flash - BIOS/EFI/coreboot/firmware/optionROM images on mainboards, - network/graphics/storage controller cards, and various other - programmer devices. - - http://flashrom.org/ - -comment "flashrom needs a toolchain w/ threads" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/flashrom/flashrom.hash b/package.bak/flashrom/flashrom.hash deleted file mode 100644 index a2168699f3..0000000000 --- a/package.bak/flashrom/flashrom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 13dc7c895e583111ecca370363a3527d237d178a134a94b20db7df177c05f934 flashrom-0.9.8.tar.bz2 diff --git a/package.bak/flashrom/flashrom.mk b/package.bak/flashrom/flashrom.mk deleted file mode 100644 index 7e0fcf27b3..0000000000 --- a/package.bak/flashrom/flashrom.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# flashrom -# -################################################################################ - -FLASHROM_VERSION = 0.9.8 -FLASHROM_SOURCE = flashrom-$(FLASHROM_VERSION).tar.bz2 -FLASHROM_SITE = http://download.flashrom.org/releases -FLASHROM_DEPENDENCIES = pciutils libusb libusb-compat libftdi host-pkgconf -FLASHROM_LICENSE = GPLv2+ -FLASHROM_LICENSE_FILES = COPYING - -define FLASHROM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define FLASHROM_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/flashrom $(TARGET_DIR)/usr/sbin/flashrom -endef - -$(eval $(generic-package)) diff --git a/package.bak/flex/0001-prog-ar.patch b/package.bak/flex/0001-prog-ar.patch deleted file mode 100644 index e0626ff95f..0000000000 --- a/package.bak/flex/0001-prog-ar.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -rup flex-2.5.33.orig/Makefile.in flex-2.5.33/Makefile.in ---- flex-2.5.33.orig/Makefile.in 2007-01-18 17:29:25.000000000 +0100 -+++ flex-2.5.33/Makefile.in 2007-01-18 18:28:22.000000000 +0100 -@@ -105,7 +105,6 @@ am__installdirs = "$(DESTDIR)$(libdir)" - "$(DESTDIR)$(includedir)" - libLIBRARIES_INSTALL = $(INSTALL_DATA) - LIBRARIES = $(lib_LIBRARIES) --AR = ar - ARFLAGS = cru - libfl_a_AR = $(AR) $(ARFLAGS) - libfl_a_LIBADD = diff --git a/package.bak/flex/0002-fix-CVE-2016-6354.patch b/package.bak/flex/0002-fix-CVE-2016-6354.patch deleted file mode 100644 index b0c780b993..0000000000 --- a/package.bak/flex/0002-fix-CVE-2016-6354.patch +++ /dev/null @@ -1,25 +0,0 @@ -From a5cbe929ac3255d371e698f62dc256afe7006466 Mon Sep 17 00:00:00 2001 -From: Will Estes -Date: Sat, 27 Feb 2016 11:56:05 -0500 -Subject: [PATCH] Fixed incorrect integer type - -Signed-off-by: Gustavo Zacarias ---- -Status: upstream - - flex.skl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/flex.skl b/src/flex.skl -index 36a526a..64f853d 100644 ---- a/flex.skl -+++ b/flex.skl -@@ -1703,7 +1703,7 @@ int yyFlexLexer::yy_get_next_buffer() - - else - { -- yy_size_t num_to_read = -+ int num_to_read = - YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1; - - while ( num_to_read <= 0 ) diff --git a/package.bak/flex/Config.in b/package.bak/flex/Config.in deleted file mode 100644 index 0a70a1c69e..0000000000 --- a/package.bak/flex/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FLEX - bool "flex" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - A fast lexical analyser generator. A tool for generating - programs that perform pattern-matching on text. - - http://flex.sourceforge.net/ diff --git a/package.bak/flex/flex.hash b/package.bak/flex/flex.hash deleted file mode 100644 index b91ab57d98..0000000000 --- a/package.bak/flex/flex.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 bf693433a3effe6b1f42e44abd787491e4e213984b1859545b92267a86088dd3 flex-2.5.37.tar.gz diff --git a/package.bak/flex/flex.mk b/package.bak/flex/flex.mk deleted file mode 100644 index 9a3f840b11..0000000000 --- a/package.bak/flex/flex.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# flex -# -################################################################################ - -FLEX_VERSION = 2.5.37 -FLEX_SITE = http://download.sourceforge.net/project/flex -FLEX_INSTALL_STAGING = YES -FLEX_LICENSE = FLEX -FLEX_LICENSE_FILES = COPYING -FLEX_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_GETTEXT_IF_LOCALE),gettext) host-m4 -FLEX_CONF_ENV = ac_cv_path_M4=/usr/bin/m4 -# we don't have a host-gettext/libintl -HOST_FLEX_DEPENDENCIES = host-m4 - -define FLEX_DISABLE_PROGRAM - $(SED) 's/^bin_PROGRAMS.*//' $(@D)/Makefile.in -endef -FLEX_POST_PATCH_HOOKS += FLEX_DISABLE_PROGRAM - -# flex++ symlink is broken when flex binary is not installed -define FLEX_REMOVE_BROKEN_SYMLINK - rm -f $(TARGET_DIR)/usr/bin/flex++ -endef -FLEX_POST_INSTALL_TARGET_HOOKS += FLEX_REMOVE_BROKEN_SYMLINK - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/flickcurl/Config.in b/package.bak/flickcurl/Config.in deleted file mode 100644 index 426ceecba1..0000000000 --- a/package.bak/flickcurl/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_FLICKCURL - bool "flickcurl" - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBXML2 - # Ensure that libcurl is built with crypto support, since - # flickcurl must access https:// URLs. - select BR2_PACKAGE_OPENSSL if !(BR2_PACKAGE_GNUTLS || BR2_PACKAGE_LIBNSS) - select BR2_PACKAGE_CA_CERTIFICATES # runtime - help - Flickcurl is a C library for the Flickr API, handling - creating the requests, signing, token management, calling - the API, marshalling request parameters and decoding - responses. - - http://librdf.org/flickcurl/ - -config BR2_PACKAGE_FLICKCURL_UTILS - bool "flickcurl utilities" - depends on BR2_PACKAGE_FLICKCURL - help - Install flickcurl utilites (flickcurl + flickrdf) to target. diff --git a/package.bak/flickcurl/flickcurl.hash b/package.bak/flickcurl/flickcurl.hash deleted file mode 100644 index fd091ec4a5..0000000000 --- a/package.bak/flickcurl/flickcurl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ff42a36c7c1c7d368246f6bc9b7d792ed298348e5f0f5d432e49f6803562f5a3 flickcurl-1.26.tar.gz diff --git a/package.bak/flickcurl/flickcurl.mk b/package.bak/flickcurl/flickcurl.mk deleted file mode 100644 index ce836f765c..0000000000 --- a/package.bak/flickcurl/flickcurl.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# flickcurl -# -################################################################################ - -FLICKCURL_VERSION = 1.26 -FLICKCURL_SITE = http://download.dajobe.org/flickcurl -FLICKCURL_LICENSE = LGPLv2.1+ or GPLv2+ or Apache 2.0+ -FLICKCURL_LICENSE_FILES = COPYING COPYING.LIB LICENSE-2.0.txt LICENSE.html -FLICKCURL_INSTALL_STAGING = YES -FLICKCURL_CONFIG_SCRIPTS = flickcurl-config -FLICKCURL_CONF_OPTS = --without-curl-config --without-xml2-config --without-raptor -FLICKCURL_DEPENDENCIES = libcurl libxml2 host-pkgconf - -ifeq ($(BR2_PACKAGE_FLICKCURL_UTILS),) -define FLICKCURL_REMOVE_UTILS - rm -f $(TARGET_DIR)/usr/bin/flickcurl $(TARGET_DIR)/usr/bin/flickrdf -endef -FLICKCURL_POST_INSTALL_TARGET_HOOKS += FLICKCURL_REMOVE_UTILS -endif - -$(eval $(autotools-package)) diff --git a/package.bak/flite/0001-now-honor-DESTDIR-env.-var.patch b/package.bak/flite/0001-now-honor-DESTDIR-env.-var.patch deleted file mode 100644 index 2d5fb68532..0000000000 --- a/package.bak/flite/0001-now-honor-DESTDIR-env.-var.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 658f3243238efe951f6242fa384e990d77078afc Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Fri, 27 Dec 2013 17:42:39 +0100 -Subject: [PATCH] now honor DESTDIR env. var. - -Flite used a handwritten a Makefile which doesn't honor DESTDIR environment -variable, though it uses autoconf. - -Signed-off-by: Samuel Martin ---- - config/config.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/config/config.in b/config/config.in -index 914d2bf..43f1a56 100644 ---- a/flite-1.4-release/config/config.in -+++ b/flite-1.4-release/config/config.in -@@ -49,6 +49,6 @@ include $(TOP)/config/$(langvox).lv - prefix = @prefix@ - exec_prefix = @exec_prefix@ - EXEEXT = @EXEEXT@ --INSTALLBINDIR = @bindir@ --INSTALLLIBDIR = @libdir@ --INSTALLINCDIR = @includedir@/flite -+INSTALLBINDIR = $(DESTDIR)@bindir@ -+INSTALLLIBDIR = $(DESTDIR)@libdir@ -+INSTALLINCDIR = $(DESTDIR)@includedir@/flite --- -1.8.5.2 - diff --git a/package.bak/flite/0002-fix-alsa-static.patch b/package.bak/flite/0002-fix-alsa-static.patch deleted file mode 100644 index 12adb9e018..0000000000 --- a/package.bak/flite/0002-fix-alsa-static.patch +++ /dev/null @@ -1,19 +0,0 @@ -Use pkg-config to determine alsa link flags. This fixes static linking. - -Signed-off-by: Baruch Siach - -diff -Nuar flite-1.4-release.orig/configure.in flite-1.4-release/configure.in ---- flite-1.4-release.orig/flite-1.4-release/configure.in 2009-08-14 23:46:38.000000000 +0300 -+++ flite-1.4-release/flite-1.4-release/configure.in 2014-04-30 18:52:33.253297236 +0300 -@@ -275,7 +275,10 @@ - #endif], - [AUDIODRIVER="alsa" - AUDIODEFS=-DCST_AUDIO_ALSA -- AUDIOLIBS=-lasound]) -+ AUDIOLIBS=`pkg-config --libs alsa` -+ if test "$shared" = false; then -+ AUDIOLIBS=`pkg-config --libs --static alsa` -+ fi]) - AC_CHECK_HEADER(mmsystem.h, - [AUDIODRIVER="wince" - AUDIODEFS=-DCST_AUDIO_WINCE diff --git a/package.bak/flite/0003-fix-alsa-version-check.patch b/package.bak/flite/0003-fix-alsa-version-check.patch deleted file mode 100644 index 8832ac371c..0000000000 --- a/package.bak/flite/0003-fix-alsa-version-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] fix alsa version check - -Check the entire alsa version, and not just the subminor - As this broke -with the recent alsa 1.0.x -> 1.1.0 release. - -It is not clear what major/minor versions the check was supposed to be -against (0.9 or 1.0). I went with 1.0.11 to be on the safe side. - -Signed-off-by: Peter Korsgaard ---- - flite-1.4-release/configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: flite-1.4/flite-1.4-release/configure.in -=================================================================== ---- flite-1.4.orig/flite-1.4-release/configure.in -+++ flite-1.4/flite-1.4-release/configure.in -@@ -270,7 +270,7 @@ - # the one I know -- you can still specific --with-audio=alsa - AC_TRY_COMPILE([#include ], - [int j= -- #if SND_LIB_SUBMINOR >= 11 -+ #if SND_LIB_VERSION >= 0x1000b - 3; - #endif], - [AUDIODRIVER="alsa" diff --git a/package.bak/flite/Config.in b/package.bak/flite/Config.in deleted file mode 100644 index 2bbd256f21..0000000000 --- a/package.bak/flite/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FLITE - bool "flite" - depends on BR2_USE_WCHAR - help - Flite: a small, fast run time synthesis engine. - - Flite (festival-lite) is a small, fast run-time synthesis - engine developed at CMU and primarily designed for small - embedded machines and/or large servers. Flite is designed as - an alternative synthesis engine to Festival for voices built - using the FestVox suite of voice building tools. - - http://www.speech.cs.cmu.edu/flite - -comment "flite needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/flite/flite.hash b/package.bak/flite/flite.hash deleted file mode 100644 index e4dd0c633b..0000000000 --- a/package.bak/flite/flite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 45c662160aeca6560589f78daf42ab62c6111dd4d244afc28118c4e6f553cd0c flite-1.4-release.tar.bz2 diff --git a/package.bak/flite/flite.mk b/package.bak/flite/flite.mk deleted file mode 100644 index 611e33452a..0000000000 --- a/package.bak/flite/flite.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# flite -# -################################################################################ - -FLITE_VERSION = 1.4 -FLITE_SOURCE = flite-$(FLITE_VERSION)-release.tar.bz2 -FLITE_SITE = http://www.speech.cs.cmu.edu/flite/packed/flite-$(FLITE_VERSION) -# $ tar tf flite-1.4-release.tar.bz2 -# ... -# flite-1.4-release//install-sh -# flite-1.4-release//mkinstalldirs -# flite-1.4-release//Exports.def -# flite-1.4-release//flite.sln -# flite-1.4-release//fliteDll.vcproj -# flite-1.4-release/config/Makefile -# flite-1.4-release/config/common_make_rules -# flite-1.4-release/config/project.mak -# flite-1.4-release/config/config.in -# flite-1.4-release/config/system.mak.in -# -# So, we set FLITE_STRIP_COMPONENTS=0 to avoid writing to "/", and then -# build in flite-1.4-release/ -FLITE_STRIP_COMPONENTS = 0 -FLITE_SUBDIR = flite-$(FLITE_VERSION)-release -FLITE_LICENSE = BSD-4c -FLITE_LICENSE_FILES = $(FLITE_SUBDIR)/COPYING - -FLITE_INSTALL_STAGING = YES -# Patching configure.in -FLITE_AUTORECONF = YES -FLITE_DEPENDENCIES = host-pkgconf - -# Sadly, Flite does not support parallel build, especially when building its -# shared libraries. -FLITE_MAKE = $(MAKE1) - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -FLITE_DEPENDENCIES += alsa-lib -FLITE_CONF_OPTS += --with-audio=alsa -else -FLITE_CONF_OPTS += --with-audio=oss -endif - -$(eval $(autotools-package)) diff --git a/package.bak/flot/Config.in b/package.bak/flot/Config.in deleted file mode 100644 index 4c0d3ec334..0000000000 --- a/package.bak/flot/Config.in +++ /dev/null @@ -1,95 +0,0 @@ -config BR2_PACKAGE_FLOT - bool "flot" - select BR2_PACKAGE_JQUERY - help - Flot is a pure Javascript plotting library for jQuery. It - produces graphical plots of arbitrary datasets on-the-fly - client-side. - - The focus is on simple usage (all settings are optional), - attractive looks and interactive features like zooming and - mouse tracking. - - The plugin works with Internet Explorer 6+, Firefox 2.x+, - Safari 3.0+, Opera 9.5+ and Konqueror 4.x+ with the HTML - canvas tag. - - http://www.flotcharts.org/ - -if BR2_PACKAGE_FLOT - -comment "flot plugins" - -config BR2_PACKAGE_FLOT_CANVAS - bool "canvas" - help - Flot plugin to render axis tick labels directly to the canvas - -config BR2_PACKAGE_FLOT_CATEGORIES - bool "categories" - help - Flot plugin for plotting textual data or categories - -config BR2_PACKAGE_FLOT_CROSSHAIR - bool "crosshair" - help - Flot plugin for showing crosshairs when the mouse hovers - over the plot - -config BR2_PACKAGE_FLOT_ERRORBARS - bool "errorbars" - help - Flot plugin for plotting error bars - -config BR2_PACKAGE_FLOT_FILLBETWEEN - bool "fillbetween" - help - Flot plugin for computing bottoms for filled line and bar charts - -config BR2_PACKAGE_FLOT_IMAGE - bool "image" - help - Flot plugin for plotting images - -config BR2_PACKAGE_FLOT_NAVIGATE - bool "navigate" - help - Flot plugin for adding panning and zooming capabilities to a plot - -config BR2_PACKAGE_FLOT_PIE - bool "pie" - help - Flot plugin for rendering pie charts - -config BR2_PACKAGE_FLOT_RESIZE - bool "resize" - help - Flot plugin for automatically redrawing plots when the - placeholder size changes. - -config BR2_PACKAGE_FLOT_SELECTION - bool "selection" - help - Flot plugin for selecting regions - -config BR2_PACKAGE_FLOT_STACK - bool "stack" - help - Flot plugin for stacking data sets - -config BR2_PACKAGE_FLOT_SYMBOL - bool "symbol" - help - Flot plugin that adds some extra symbols for plotting points - -config BR2_PACKAGE_FLOT_THRESHOLD - bool "threshold" - help - Flot plugin for thresholding data - -config BR2_PACKAGE_FLOT_TIME - bool "time" - help - Flot plugin for handling time axes - -endif diff --git a/package.bak/flot/flot.hash b/package.bak/flot/flot.hash deleted file mode 100644 index cb9f9ec9d0..0000000000 --- a/package.bak/flot/flot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ef9a873befe3ff5ea42ebf1c3657887265a1717744ca8ed0c2bd3dd736d16b21 flot-0.8.3.tar.gz diff --git a/package.bak/flot/flot.mk b/package.bak/flot/flot.mk deleted file mode 100644 index 58e3ff1276..0000000000 --- a/package.bak/flot/flot.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# flot -# -################################################################################ - -FLOT_VERSION = 0.8.3 -FLOT_SITE = http://www.flotcharts.org/downloads -FLOT_LICENSE = MIT -FLOT_LICENSE_FILES = LICENSE.txt -FLOT_FILES = jquery.flot $(addprefix jquery.flot.,\ - $(if $(BR2_PACKAGE_FLOT_CANVAS),canvas) \ - $(if $(BR2_PACKAGE_FLOT_CATEGORIES),categories) \ - $(if $(BR2_PACKAGE_FLOT_CROSSHAIR),crosshair) \ - $(if $(BR2_PACKAGE_FLOT_ERRORBARS),errorbars) \ - $(if $(BR2_PACKAGE_FLOT_FILLBETWEEN),fillbetween) \ - $(if $(BR2_PACKAGE_FLOT_IMAGE),image) \ - $(if $(BR2_PACKAGE_FLOT_NAVIGATE),navigate) \ - $(if $(BR2_PACKAGE_FLOT_PIE),pie) \ - $(if $(BR2_PACKAGE_FLOT_RESIZE),resize) \ - $(if $(BR2_PACKAGE_FLOT_SELECTION),selection) \ - $(if $(BR2_PACKAGE_FLOT_STACK),stack) \ - $(if $(BR2_PACKAGE_FLOT_SYMBOL),symbol) \ - $(if $(BR2_PACKAGE_FLOT_THRESHOLD),threshold) \ - $(if $(BR2_PACKAGE_FLOT_TIME),time) \ - ) - -define FLOT_INSTALL_TARGET_CMDS - for i in $(FLOT_FILES); do \ - $(INSTALL) -m 0644 -D $(@D)/$$i.min.js $(TARGET_DIR)/var/www/$$i.js || exit 1; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/fltk/0001-disable-tests.patch b/package.bak/fltk/0001-disable-tests.patch deleted file mode 100644 index 957145312c..0000000000 --- a/package.bak/fltk/0001-disable-tests.patch +++ /dev/null @@ -1,16 +0,0 @@ -Disable tests, slower to build and would need host-fltk. - -Signed-off-by: Gustavo Zacarias - -diff -Nura fltk-1.3.2.orig/Makefile fltk-1.3.2/Makefile ---- fltk-1.3.2.orig/Makefile 2013-10-27 18:19:39.693208127 -0300 -+++ fltk-1.3.2/Makefile 2013-10-27 18:20:08.032136885 -0300 -@@ -18,7 +18,7 @@ - - include makeinclude - --DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation -+DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid documentation - - all: makeinclude fltk-config - for dir in $(DIRS); do\ diff --git a/package.bak/fltk/0002-jpeg-9.patch b/package.bak/fltk/0002-jpeg-9.patch deleted file mode 100644 index 11ae85ee28..0000000000 --- a/package.bak/fltk/0002-jpeg-9.patch +++ /dev/null @@ -1,26 +0,0 @@ -From http://www.fltk.org/str.php?L2920 -However it's not yet applied apparently until bundled jpeg is upgraded. - -Signed-off-by: Gustavo Zacarias - -diff -Nura fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx fltk-1.3.2/src/Fl_JPEG_Image.cxx ---- fltk-1.3.2.orig/src/Fl_JPEG_Image.cxx 2014-07-03 12:56:27.731197463 -0300 -+++ fltk-1.3.2/src/Fl_JPEG_Image.cxx 2014-07-03 12:56:57.907218257 -0300 -@@ -155,7 +155,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_stdio_src(&dinfo, fp); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; -@@ -333,7 +333,7 @@ - - jpeg_create_decompress(&dinfo); - jpeg_mem_src(&dinfo, data); -- jpeg_read_header(&dinfo, 1); -+ jpeg_read_header(&dinfo, TRUE); - - dinfo.quantize_colors = (boolean)FALSE; - dinfo.out_color_space = JCS_RGB; diff --git a/package.bak/fltk/Config.in b/package.bak/fltk/Config.in deleted file mode 100644 index 8e9977a154..0000000000 --- a/package.bak/fltk/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_FLTK - bool "fltk" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - help - A cross-platform C++ GUI toolkit for UNIX/Linux (X11), - Microsoft Windows, and MacOS X. - - http://www.fltk.org/ - -comment "fltk needs a toolchain w/ C++" - depends on BR2_USE_MMU && BR2_PACKAGE_XORG7 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/fltk/fltk.hash b/package.bak/fltk/fltk.hash deleted file mode 100644 index 7b9b67dcfb..0000000000 --- a/package.bak/fltk/fltk.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.fltk.org/software.php?VERSION=1.3.3 -md5 9ccdb0d19dc104b87179bd9fd10822e3 fltk-1.3.3-source.tar.gz -# Locally generated -sha256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 fltk-1.3.3-source.tar.gz diff --git a/package.bak/fltk/fltk.mk b/package.bak/fltk/fltk.mk deleted file mode 100644 index 9b67bd32ae..0000000000 --- a/package.bak/fltk/fltk.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# fltk -# -################################################################################ - -FLTK_VERSION = 1.3.3 -FLTK_SOURCE = fltk-$(FLTK_VERSION)-source.tar.gz -FLTK_SITE = http://fltk.org/pub/fltk/$(FLTK_VERSION) -FLTK_INSTALL_STAGING = YES -# We force --libdir=/usr/lib, because by default, it is set to -# ${exec_prefix}/lib, which doesn't match the condition used by the -# fltk build system to decide whether it should pass a -rpath,/usr/lib -# or not. Since this rpath breaks the build, we want the fltk build -# system to not pass it, which requires having --libdir set to -# /usr/lib. -FLTK_CONF_OPTS = --enable-threads --with-x --disable-gl \ - --disable-localjpeg --disable-localpng --disable-localzlib \ - --libdir=/usr/lib -FLTK_DEPENDENCIES = jpeg libpng xlib_libX11 xlib_libXext xlib_libXt -FLTK_CONFIG_SCRIPTS = fltk-config -FLTK_LICENSE = LGPLv2 with exceptions -FLTK_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_CAIRO),y) -FLTK_CONF_OPTS += --enable-cairo -FLTK_DEPENDENCIES += cairo -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -FLTK_DEPENDENCIES += xlib_libXcursor -FLTK_CONF_OPTS += --enable-xcursor -else -FLTK_CONF_OPTS += --disable-xcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -FLTK_DEPENDENCIES += xlib_libXfixes -FLTK_CONF_OPTS += --enable-xfixes -else -FLTK_CONF_OPTS += --disable-xfixes -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -FLTK_CONF_ENV += ac_cv_path_FTCONFIG=$(STAGING_DIR)/usr/bin/freetype-config -FLTK_DEPENDENCIES += xlib_libXft -else -FLTK_CONF_OPTS += --disable-xft -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -FLTK_DEPENDENCIES += xlib_libXinerama -else -FLTK_CONF_OPTS += --disable-xinerama -endif - -$(eval $(autotools-package)) diff --git a/package.bak/fluxbox/Config.in b/package.bak/fluxbox/Config.in deleted file mode 100644 index ab479a9f69..0000000000 --- a/package.bak/fluxbox/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_FLUXBOX - bool "fluxbox" - depends on BR2_PACKAGE_XORG7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - # Runtime dependency, needed by startup script - select BR2_PACKAGE_XAPP_XMODMAP - help - The Fluxbox lightweight window manager for X - - http://fluxbox.org - -comment "fluxbox needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 && !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/fluxbox/fluxbox.hash b/package.bak/fluxbox/fluxbox.hash deleted file mode 100644 index b18582b6c0..0000000000 --- a/package.bak/fluxbox/fluxbox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fc8c75fe94c54ed5a5dd3fd4a752109f8949d6df67a48e5b11a261403c382ec0 fluxbox-1.3.7.tar.xz diff --git a/package.bak/fluxbox/fluxbox.mk b/package.bak/fluxbox/fluxbox.mk deleted file mode 100644 index 305dd9abae..0000000000 --- a/package.bak/fluxbox/fluxbox.mk +++ /dev/null @@ -1,88 +0,0 @@ -################################################################################ -# -# fluxbox -# -################################################################################ - -FLUXBOX_VERSION = 1.3.7 -FLUXBOX_SOURCE = fluxbox-$(FLUXBOX_VERSION).tar.xz -FLUXBOX_SITE = http://downloads.sourceforge.net/project/fluxbox/fluxbox/$(FLUXBOX_VERSION) -FLUXBOX_LICENSE = MIT -FLUXBOX_LICENSE_FILES = COPYING - -FLUXBOX_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib -FLUXBOX_DEPENDENCIES = xlib_libX11 $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -FLUXBOX_CONF_OPTS += --enable-freetype2 -FLUXBOX_DEPENDENCIES += freetype -else -FLUXBOX_CONF_OPTS += --disable-freetype2 -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_X),y) -FLUXBOX_CONF_OPTS += --enable-imlib2 -FLUXBOX_DEPENDENCIES += imlib2 -else -FLUXBOX_CONF_OPTS += --disable-imlib2 -endif - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -FLUXBOX_CONF_OPTS += --enable-fribidi -FLUXBOX_DEPENDENCIES += libfribidi -else -FLUXBOX_CONF_OPTS += --disable-fribidi -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -FLUXBOX_CONF_OPTS += --enable-xft -FLUXBOX_DEPENDENCIES += xlib_libXft -else -FLUXBOX_CONF_OPTS += --disable-xft -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -FLUXBOX_CONF_OPTS += --enable-xrender -FLUXBOX_DEPENDENCIES += xlib_libXrender -else -FLUXBOX_CONF_OPTS += --disable-xrender -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) -FLUXBOX_CONF_OPTS += --enable-xpm -FLUXBOX_DEPENDENCIES += xlib_libXpm -else -FLUXBOX_CONF_OPTS += --disable-xpm -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -FLUXBOX_CONF_OPTS += --enable-xinerama -FLUXBOX_DEPENDENCIES += xlib_libXinerama -else -FLUXBOX_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y) -FLUXBOX_CONF_OPTS += --enable-xext -FLUXBOX_DEPENDENCIES += xlib_libXext -else -FLUXBOX_CONF_OPTS += --disable-xext -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -FLUXBOX_CONF_OPTS += --enable-xrandr -FLUXBOX_DEPENDENCIES += xlib_libXrandr -else -FLUXBOX_CONF_OPTS += --disable-xrandr -endif - -define FLUXBOX_INSTALL_XSESSION_FILE - $(INSTALL) -m 0755 -D package/fluxbox/xsession \ - $(TARGET_DIR)/root/.xsession -endef - -FLUXBOX_POST_INSTALL_TARGET_HOOKS += FLUXBOX_INSTALL_XSESSION_FILE - -$(eval $(autotools-package)) diff --git a/package.bak/fluxbox/xsession b/package.bak/fluxbox/xsession deleted file mode 100644 index b51acff48d..0000000000 --- a/package.bak/fluxbox/xsession +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec startfluxbox diff --git a/package.bak/fmc/Config.in b/package.bak/fmc/Config.in deleted file mode 100644 index b7398e2bf6..0000000000 --- a/package.bak/fmc/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -comment "fmc needs a toolchain w/ C++" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 - depends on !BR2_INSTALL_LIBSTDCPP - -comment "fmc needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_FMC - bool "fmc" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_LINUX_KERNEL # fmlib - select BR2_PACKAGE_TCLAP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_FMLIB - help - The Frame Manager Configuration tool is Freescale PowerPC platform - software package whose primary purpose is converting - Parse-Classify-Police-Distribute (PCD) descriptions of network - packets flow into hardware configuration. The tool provides an - abstraction layer between the end customer's vision of the PCD task - definition and real hardware implementation. - - http://cache.freescale.com/files/32bit/doc/app_note/AN4760.pdf diff --git a/package.bak/fmc/fmc.hash b/package.bak/fmc/fmc.hash deleted file mode 100644 index 2402831855..0000000000 --- a/package.bak/fmc/fmc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally Computed -sha256sum a91e0c9b7c7f238634c64a755c05671f33f2acdb6ae2d09cad4d683b364ee8e4 fmc-fsl-sdk-v2.0.tar.gz diff --git a/package.bak/fmc/fmc.mk b/package.bak/fmc/fmc.mk deleted file mode 100644 index 2a95fec0b7..0000000000 --- a/package.bak/fmc/fmc.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# fmc -# -################################################################################ - -FMC_VERSION = fsl-sdk-v2.0 -FMC_SITE = git://git.freescale.com/ppc/sdk/fmc.git -FMC_LICENSE = MIT -FMC_LICENSE_FILES = COPYING -FMC_DEPENDENCIES = libxml2 tclap fmlib - -FMC_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - FMD_USPACE_HEADER_PATH="$(STAGING_DIR)/usr/include/fmd" \ - FMD_USPACE_LIB_PATH="$(STAGING_DIR)/usr/lib" \ - LIBXML2_HEADER_PATH="$(STAGING_DIR)/usr/include/libxml2" \ - TCLAP_HEADER_PATH="$(STAGING_DIR)/usr/include" - -ifeq ($(BR2_powerpc64),y) -FMC_MAKE_OPTS += M64BIT=1 -endif - -# fmc's platform is the same as fmlib's. -FMC_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) - -define FMC_BUILD_CMDS - $(SED) "s:P4080:$(FMC_PLATFORM):g" $(@D)/source/Makefile - # The linking step has dependency issues so using MAKE1 - $(TARGET_MAKE_ENV) $(MAKE1) $(FMC_MAKE_OPTS) -C $(@D)/source -endef - -define FMC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/source/fmc $(TARGET_DIR)/usr/sbin/fmc - cp -dpfr $(@D)/etc/fmc $(TARGET_DIR)/etc/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/fmlib/Config.in b/package.bak/fmlib/Config.in deleted file mode 100644 index d399cabe2a..0000000000 --- a/package.bak/fmlib/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -comment "fmlib needs a Linux kernel to be built" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_FMLIB - bool "fmlib" - depends on BR2_powerpc_e500mc || BR2_powerpc_e6500 - depends on BR2_LINUX_KERNEL - help - The Frame Manager library provides Freescale PowerPC platforms an - API on top of the Frame Manager driver ioctl calls, that provides - a user space application with a simple way to configure driver - parameters and PCD (parse - classify - distribute) rules. - - http://git.freescale.com/git/cgit.cgi/ppc/sdk/fmlib.git/tree/README - -if BR2_PACKAGE_FMLIB -choice - prompt "QorIQ Target Family" - help - Select the family of QorIQ processor. - -config BR2_FMLIB_QORIQ_FAMILY_P4080 - bool "p40xx" - depends on BR2_powerpc_e500mc - -config BR2_FMLIB_QORIQ_FAMILY_T4240 - bool "t42xx" - depends on BR2_powerpc_e500mc - -config BR2_FMLIB_QORIQ_FAMILY_T2080 - bool "t208x" - depends on BR2_powerpc_e6500 - -endchoice - -config BR2_PACKAGE_FMLIB_ARCHTYPE - string - default "e500mc" if BR2_powerpc_e500mc - default "ppc64e6500" if BR2_powerpc_e6500 && BR2_powerpc64 - default "ppc32e6500" if BR2_powerpc_e6500 && BR2_powerpc - -config BR2_PACKAGE_FMLIB_PLATFORM - string - default "P4080" if BR2_FMLIB_QORIQ_FAMILY_P4080 - default "T4240" if BR2_FMLIB_QORIQ_FAMILY_T4240 - default "FMAN_V3H" if BR2_FMLIB_QORIQ_FAMILY_T2080 - -endif diff --git a/package.bak/fmlib/fmlib.hash b/package.bak/fmlib/fmlib.hash deleted file mode 100644 index 3746695db9..0000000000 --- a/package.bak/fmlib/fmlib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e5870756c7432b15f7a48b860625808f3c95d5f7fa5e251552eb2324ca51b0fa fmlib-fsl-sdk-v2.0.tar.gz diff --git a/package.bak/fmlib/fmlib.mk b/package.bak/fmlib/fmlib.mk deleted file mode 100644 index 16e817699e..0000000000 --- a/package.bak/fmlib/fmlib.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# fmlib -# -################################################################################ - -FMLIB_VERSION = fsl-sdk-v2.0 -FMLIB_SITE = git://git.freescale.com/ppc/sdk/fmlib.git -FMLIB_LICENSE = BSD-3c, GPLv2+ -FMLIB_LICENSE_FILES = COPYING -FMLIB_DEPENDENCIES = linux -FMLIB_INSTALL_STAGING = YES - -# This package installs a static library only, so there's -# nothing to install to the target -FMLIB_INSTALL_TARGET = NO - -FMLIB_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - KERNEL_SRC="$(LINUX_DIR)" \ - PREFIX="$(STAGING_DIR)/usr" - -FMLIB_ARCHTYPE = $(call qstrip,$(BR2_PACKAGE_FMLIB_ARCHTYPE)) -FMLIB_PLATFORM = $(call qstrip,$(BR2_PACKAGE_FMLIB_PLATFORM)) - -define FMLIB_BUILD_CMDS - $(SED) "s:P4080:$(FMLIB_PLATFORM):g" $(@D)/Makefile - $(TARGET_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) libfm-$(FMLIB_ARCHTYPE).a -endef - -define FMLIB_INSTALL_STAGING_CMDS - $(RM) $(STAGING_DIR)/usr/lib/libfm.a - $(TARGET_MAKE_ENV) $(MAKE) $(FMLIB_MAKE_OPTS) -C $(@D) install-libfm-$(FMLIB_ARCHTYPE) -endef - -$(eval $(generic-package)) diff --git a/package.bak/fmtools/Config.in b/package.bak/fmtools/Config.in deleted file mode 100644 index 182b5179cf..0000000000 --- a/package.bak/fmtools/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_FMTOOLS - bool "fmtools" - help - fmtools is a pair of simple command-line utilities for - "video4linux2" radio tuner cards under Linux. It includes - fm for power control, tuning, and volume and fmscan for - scanning for stations. - - http://benpfaff.org/fmtools/ diff --git a/package.bak/fmtools/fmtools.hash b/package.bak/fmtools/fmtools.hash deleted file mode 100644 index 435cf0adc7..0000000000 --- a/package.bak/fmtools/fmtools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 75174e07d8cde6d4a8a5d7bbaa3a3b0760a850e7f6840cb7c6246227b18f5a39 fmtools-2.0.7.tar.gz diff --git a/package.bak/fmtools/fmtools.mk b/package.bak/fmtools/fmtools.mk deleted file mode 100644 index 4b1b64fc92..0000000000 --- a/package.bak/fmtools/fmtools.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# fmtools -# -################################################################################ - -FMTOOLS_VERSION = 2.0.7 -FMTOOLS_SITE = http://benpfaff.org/fmtools -FMTOOLS_LICENSE = GPLv2+ -FMTOOLS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/font-awesome/Config.in b/package.bak/font-awesome/Config.in deleted file mode 100644 index 694d74e5a8..0000000000 --- a/package.bak/font-awesome/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_FONT_AWESOME - bool "font-awesome" - help - Font Awesome is a full suite of 605 pictographic icons for - easy scalable vector graphics on websites. - - https://github.com/FortAwesome/Font-Awesome diff --git a/package.bak/font-awesome/font-awesome.hash b/package.bak/font-awesome/font-awesome.hash deleted file mode 100644 index 9f3715e5b6..0000000000 --- a/package.bak/font-awesome/font-awesome.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7813f416057da622b16229b10fef550e1dc64c5bb59871cd38fa86e76dfdbae8 font-awesome-v4.5.0.tar.gz diff --git a/package.bak/font-awesome/font-awesome.mk b/package.bak/font-awesome/font-awesome.mk deleted file mode 100644 index 3d2cccaefc..0000000000 --- a/package.bak/font-awesome/font-awesome.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# font-awesome -# -################################################################################ - -FONT_AWESOME_VERSION = v4.5.0 -FONT_AWESOME_SITE = $(call github,FortAwesome,Font-Awesome,$(FONT_AWESOME_VERSION)) -FONT_AWESOME_LICENSE = OFLv1.1 (font), MIT (CSS, LESS and Sass files) -FONT_AWESOME_DIRECTORIES_LIST = css fonts less scss - -define FONT_AWESOME_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/font-awesome/ - $(foreach d,$(FONT_AWESOME_DIRECTORIES_LIST),\ - cp -dpfr $(@D)/$(d) $(TARGET_DIR)/usr/share/font-awesome$(sep)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/fontconfig/Config.in b/package.bak/fontconfig/Config.in deleted file mode 100644 index 1c54a43361..0000000000 --- a/package.bak/fontconfig/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FONTCONFIG - bool "fontconfig" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_EXPAT - help - Fontconfig is a library for configuring and customizing font access. - - http://www.fontconfig.org/ diff --git a/package.bak/fontconfig/fontconfig.hash b/package.bak/fontconfig/fontconfig.hash deleted file mode 100644 index ad3582557b..0000000000 --- a/package.bak/fontconfig/fontconfig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/fontconfig/2016-August/005794.html -sha256 b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3 fontconfig-2.12.1.tar.bz2 diff --git a/package.bak/fontconfig/fontconfig.mk b/package.bak/fontconfig/fontconfig.mk deleted file mode 100644 index 93f2a15938..0000000000 --- a/package.bak/fontconfig/fontconfig.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# fontconfig -# -################################################################################ - -FONTCONFIG_VERSION = 2.12.1 -FONTCONFIG_SITE = http://fontconfig.org/release -FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VERSION).tar.bz2 -FONTCONFIG_INSTALL_STAGING = YES -FONTCONFIG_DEPENDENCIES = freetype expat host-pkgconf -HOST_FONTCONFIG_DEPENDENCIES = host-freetype host-expat host-pkgconf -FONTCONFIG_LICENSE = fontconfig license -FONTCONFIG_LICENSE_FILES = COPYING - -FONTCONFIG_CONF_OPTS = \ - --with-arch=$(GNU_TARGET_NAME) \ - --with-cache-dir=/var/cache/fontconfig \ - --disable-docs - -HOST_FONTCONFIG_CONF_OPTS = \ - --disable-static - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/fping/Config.in b/package.bak/fping/Config.in deleted file mode 100644 index 686102a45e..0000000000 --- a/package.bak/fping/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FPING - bool "fping" - help - fping is a program to send ICMP echo probes to network hosts, - similar to ping, but much better performing when pinging - multiple hosts. - - http://fping.org/ diff --git a/package.bak/fping/fping.hash b/package.bak/fping/fping.hash deleted file mode 100644 index 99c01cfad0..0000000000 --- a/package.bak/fping/fping.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d86f2281bda4653c7049e6ba8fce24ba67edbf9193b7bb1cf6219b0c8ddce4e6 fping-3.12.tar.gz diff --git a/package.bak/fping/fping.mk b/package.bak/fping/fping.mk deleted file mode 100644 index c576dd1abd..0000000000 --- a/package.bak/fping/fping.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# fping -# -################################################################################ - -FPING_VERSION = 3.12 -FPING_SITE = http://fping.org/dist -FPING_LICENSE = BSD-like -FPING_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/freeradius-client/0001-fix-for-nettle.patch b/package.bak/freeradius-client/0001-fix-for-nettle.patch deleted file mode 100644 index a862c749ba..0000000000 --- a/package.bak/freeradius-client/0001-fix-for-nettle.patch +++ /dev/null @@ -1,20 +0,0 @@ -lib/rc-md5: fix build when nettle is enabled - -rc-md5 uses size_t, which is defined in string.h. This include is -missing when built against nettle. - -Just add it. - -Signed-off-by: "Yann E. MORIN" - -diff -durN freeradius-client-1.1.7.orig/lib/rc-md5.h freeradius-client-1.1.7/lib/rc-md5.h ---- freeradius-client-1.1.7.orig/lib/rc-md5.h 2015-01-19 17:18:26.000000000 +0100 -+++ freeradius-client-1.1.7/lib/rc-md5.h 2015-01-25 22:56:07.815626476 +0100 -@@ -13,6 +13,7 @@ - - #ifdef HAVE_NETTLE - -+#include /* size_t */ - #include - - #else diff --git a/package.bak/freeradius-client/Config.in b/package.bak/freeradius-client/Config.in deleted file mode 100644 index 773adb8a09..0000000000 --- a/package.bak/freeradius-client/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_FREERADIUS_CLIENT - bool "freeradius-client" - help - FreeRADIUS Client is a framework and library for - writing RADIUS Clients. - - http://wiki.freeradius.org/project/Radiusclient diff --git a/package.bak/freeradius-client/freeradius-client.hash b/package.bak/freeradius-client/freeradius-client.hash deleted file mode 100644 index 5931ac2b00..0000000000 --- a/package.bak/freeradius-client/freeradius-client.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 eada2861b8f4928e3ac6b5bbfe11e92cd6cdcacfce40cae1085e77c1b6add0e9 freeradius-client-1.1.7.tar.gz diff --git a/package.bak/freeradius-client/freeradius-client.mk b/package.bak/freeradius-client/freeradius-client.mk deleted file mode 100644 index 0ed7fbeb8c..0000000000 --- a/package.bak/freeradius-client/freeradius-client.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# freeradius-client -# -################################################################################ - -FREERADIUS_CLIENT_VERSION = 1.1.7 -FREERADIUS_CLIENT_SITE = ftp://ftp.freeradius.org/pub/freeradius -FREERADIUS_CLIENT_LICENSE = BSD-2c -FREERADIUS_CLIENT_LICENSE_FILES = COPYRIGHT -FREERADIUS_CLIENT_INSTALL_STAGING = YES - -FREERADIUS_CLIENT_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_NETTLE),y) -FREERADIUS_CLIENT_DEPENDENCIES += nettle -FREERADIUS_CLIENT_CONF_OPTS += --with-nettle=yes -else -FREERADIUS_CLIENT_CONF_OPTS += --with-nettle=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/freerdp/0001-fix-building-shared-libs.patch b/package.bak/freerdp/0001-fix-building-shared-libs.patch deleted file mode 100644 index 8922cb15b6..0000000000 --- a/package.bak/freerdp/0001-fix-building-shared-libs.patch +++ /dev/null @@ -1,26 +0,0 @@ -winpr/tools: fix building shared libs - -libwinpr-makecert-tool.a is used to build libxfreerdp-server.so, so even -if we are building a static libwinpr-makecert-tool.a library, we need to -build it with -fPIC. - -Patch and commit log suggested by Samuel MARTIN. - -Signed-off-by: "Yann E. MORIN" -Cc: Samuel Martin - -diff -durN freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt ---- freerdp-440916eae2e07463912d5fe507677e67096eb083.orig/winpr/tools/makecert/CMakeLists.txt 2014-08-25 06:52:43.000000000 -0700 -+++ freerdp-440916eae2e07463912d5fe507677e67096eb083/winpr/tools/makecert/CMakeLists.txt 2014-10-24 15:39:39.600319523 -0700 -@@ -37,4 +37,11 @@ - add_subdirectory(cli) - - set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "WinPR/Tools") -+ -+if(BUILD_SHARED_LIBS) -+ # build libwinpr-makecert-tool.a with PIC because it is used to build -+ # the shared library libxfreerdp-server.so. -+ set_property(TARGET ${MODULE_NAME} PROPERTY POSITION_INDEPENDENT_CODE TRUE) -+endif() -+ - export_complex_library(LIBNAME ${MODULE_NAME}) diff --git a/package.bak/freerdp/0002-add-support-for-tz-package.patch b/package.bak/freerdp/0002-add-support-for-tz-package.patch deleted file mode 100644 index 93e4afde17..0000000000 --- a/package.bak/freerdp/0002-add-support-for-tz-package.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 605d0a85183d2f9d5b0da5629cbadf01173bbb2f Mon Sep 17 00:00:00 2001 -From: Scott Fan -Date: Mon, 13 Jul 2015 15:01:17 +0800 -Subject: [PATCH] Add support for tz package - -Fixes error message while freerdp connected the remote desktop: -Unable to detect time zone - -Signed-off-by: Scott Fan ---- - libfreerdp/locale/timezone.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libfreerdp/locale/timezone.c b/libfreerdp/locale/timezone.c -index 3070f1f..4a06786 100644 ---- a/libfreerdp/locale/timezone.c -+++ b/libfreerdp/locale/timezone.c -@@ -1539,7 +1539,8 @@ char* freerdp_get_unix_timezone_identifier() - * America/Montreal for example. - */ - -- if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1) -+ if ((len = readlink("/etc/localtime", buf, sizeof(buf) - 1)) != -1 || -+ (len = readlink("/etc/TZ", buf, sizeof(buf) - 1)) != -1) - { - int num = 0; - int pos = len; --- -2.4.5 - diff --git a/package.bak/freerdp/0003-add-missing-define.patch b/package.bak/freerdp/0003-add-missing-define.patch deleted file mode 100644 index a8f669e102..0000000000 --- a/package.bak/freerdp/0003-add-missing-define.patch +++ /dev/null @@ -1,44 +0,0 @@ -libwinpr/comm_seria: fix missing define - -FreeRDP uses CMSPAR, which is defined by glibc in bits/termios.h . - -glibc has two flavours of bits/termios.h: a genmeric one and an -architecture-specific one. When installing, glibc will install the -architecture-specific file if it exists, otherwise it installs the -generic file. Only Alpha, MIPS, PPC and Sparc have their own -bits/termios.h. - -The generic bits/termios.h, as well as the Alpha, PPC and Sparc flavours -do define CMSPAR. However, the MIPS flavour does not define it. - -Define CMSPAR to the value from the generic value, which is also the -value known to the Linux kernel for MIPS. - -Fixes: - http://autobuild.buildroot.org/results/0b4/0b4793f0bf9f4c57933897f3480054a4e06528ad/ - http://autobuild.buildroot.org/results/7a2/7a2284d0a2987158fa2e78f789b07c8c6fcdb974/ - http://autobuild.buildroot.org/results/387/3874088c3ccd4bbf76ea0c911ca1ef64c7dc9d1c/ - ... - -Signed-off-by: "Yann E. MORIN" -Cc: Peter Korsgaard -Cc: Thomas Petazzoni - -diff -durN freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c ---- freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.orig/winpr/libwinpr/comm/comm_serial_sys.c 2015-09-04 16:20:17.000000000 +0100 -+++ freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16/winpr/libwinpr/comm/comm_serial_sys.c 2015-10-04 11:07:41.868513726 +0100 -@@ -27,6 +27,14 @@ - #include - #include - #include -+ -+/* glibc for MIPS has its own bits/termios.h which does not define -+ * CMSPAR, so we vampirise the value from the generic bits/termios.h -+ */ -+#ifndef CMSPAR -+#define CMSPAR 010000000000 -+#endif -+ - #include - - #include "comm_serial_sys.h" diff --git a/package.bak/freerdp/0004-ffmpeg30.patch b/package.bak/freerdp/0004-ffmpeg30.patch deleted file mode 100644 index a7998b7894..0000000000 --- a/package.bak/freerdp/0004-ffmpeg30.patch +++ /dev/null @@ -1,74 +0,0 @@ -From b7b66968f93f6ce75dd06d12638e14029bf3717b Mon Sep 17 00:00:00 2001 -From: Alexis Ballier -Date: Thu, 17 Sep 2015 10:36:44 +0200 -Subject: [PATCH] channels/tsmf/client/ffmpeg: Fix build with ffmpeg git - master. - -Replace old, deprecated and now removed, APIs with their new equivalent while retaining backward compatibility with old ffmpeg versions. - -Signed-off-by: Bernd Kuhls -[Downloaded from upstream commit: - https://github.com/FreeRDP/FreeRDP/commit/f8ceb3f6061583c650bd4f6cddc10bc0471f2076] ---- - channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c | 17 ++++++++++++++++- - 1 file changed, 16 insertions(+), 1 deletion(-) - -diff --git a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -index d0880e7..e1b9f83 100644 ---- a/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -+++ b/channels/tsmf/client/ffmpeg/tsmf_ffmpeg.c -@@ -61,6 +61,9 @@ - #define AV_CODEC_ID_AC3 CODEC_ID_AC3 - #endif - -+#if LIBAVUTIL_VERSION_MAJOR < 52 -+#define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P -+#endif - - typedef struct _TSMFFFmpegDecoder - { -@@ -102,7 +105,11 @@ static BOOL tsmf_ffmpeg_init_video_stream(ITSMFDecoder* decoder, const TS_AM_MED - mdecoder->codec_context->bit_rate = media_type->BitRate; - mdecoder->codec_context->time_base.den = media_type->SamplesPerSecond.Numerator; - mdecoder->codec_context->time_base.num = media_type->SamplesPerSecond.Denominator; -+#if LIBAVCODEC_VERSION_MAJOR < 55 - mdecoder->frame = avcodec_alloc_frame(); -+#else -+ mdecoder->frame = av_frame_alloc(); -+#endif - return TRUE; - } - -@@ -328,7 +335,11 @@ static BOOL tsmf_ffmpeg_decode_video(ITSMFDecoder* decoder, const BYTE *data, UI - if (!mdecoder->decoded_data) - return FALSE; - -+#if LIBAVCODEC_VERSION_MAJOR < 55 - frame = avcodec_alloc_frame(); -+#else -+ frame = av_frame_alloc(); -+#endif - avpicture_fill((AVPicture*) frame, mdecoder->decoded_data, - mdecoder->codec_context->pix_fmt, - mdecoder->codec_context->width, mdecoder->codec_context->height); -@@ -400,7 +411,11 @@ static BOOL tsmf_ffmpeg_decode_audio(ITSMFDecoder* decoder, const BYTE *data, UI - (int16_t *) dst, &frame_size, src, src_size); - #else - { -+#if LIBAVCODEC_VERSION_MAJOR < 55 - AVFrame *decoded_frame = avcodec_alloc_frame(); -+#else -+ AVFrame *decoded_frame = av_frame_alloc(); -+#endif - int got_frame = 0; - AVPacket pkt; - av_init_packet(&pkt); -@@ -480,7 +495,7 @@ static UINT32 tsmf_ffmpeg_get_decoded_format(ITSMFDecoder* decoder) - - switch (mdecoder->codec_context->pix_fmt) - { -- case PIX_FMT_YUV420P: -+ case AV_PIX_FMT_YUV420P: - return RDP_PIXFMT_I420; - default: - WLog_ERR(TAG, "unsupported pixel format %u", diff --git a/package.bak/freerdp/Config.in b/package.bak/freerdp/Config.in deleted file mode 100644 index 9dd2505a44..0000000000 --- a/package.bak/freerdp/Config.in +++ /dev/null @@ -1,90 +0,0 @@ -config BR2_PACKAGE_FREERDP - bool "freerdp" - # FreeRDP does not have a single C++ source file, however it - # insists on having a C++ compiler. Removing that requirement - # is a bit too much involving, so we just depend on it... - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # uses dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBGLIB2 - help - FreeRDP is a free implementation of the Remote Desktop - Protocol (RDP), released under the Apache license - - This only installs the freerdp libraries. - - http://www.freerdp.com/ - - Note: this also installs a key and certificate in - /etc/freerdp/keys/ . These are publicly-known, as they - are present in FreeRDP's source tree. It is strongly - suggested that you overwrite them with your own set, - either in an overlay rootfs or in a post-build script. - -if BR2_PACKAGE_FREERDP - -choice - bool "gstreamer support" - depends on BR2_PACKAGE_XORG7 # xlib-libxrandr - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 - -config BR2_PACKAGE_FREERDP_GSTREAMER1 - bool "gstreamer-1.x" - depends on BR2_PACKAGE_GSTREAMER1 - # gstreamer-1.x dependencies already dependencies of FreeRDP - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_XLIB_LIBXRANDR - -config BR2_PACKAGE_FREERDP_GSTREAMER - bool "gstreamer-0.x" - depends on BR2_PACKAGE_GSTREAMER - # gstreamer-0.x dependencies already dependencies of FreeRDP - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_FREERDP_GSTREAMER_NO - bool "none" - -endchoice - -comment "gstreamer support needs X.Org" - depends on !BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_GSTREAMER || BR2_PACKAGE_GSTREAMER1 - -config BR2_PACKAGE_FREERDP_SERVER - bool "server" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -config BR2_PACKAGE_FREERDP_CLIENT_X11 - bool "X11 client" - default y - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - -comment "server and X11 client need X.Org" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_FREERDP_CLIENT_WL - bool "wayland client" - default y - depends on BR2_PACKAGE_WAYLAND - -endif - -comment "freerdp needs a toolchain w/ wchar, dynamic library, threads, C++" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/freerdp/freerdp.hash b/package.bak/freerdp/freerdp.hash deleted file mode 100644 index 2ced373b38..0000000000 --- a/package.bak/freerdp/freerdp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1db496cca391f76382ef284db2d0306d5c15bf515ee2c964319c22272d969a32 freerdp-17834af7bb378f85a3b3cc4dcadaa5125a337e16.tar.gz diff --git a/package.bak/freerdp/freerdp.mk b/package.bak/freerdp/freerdp.mk deleted file mode 100644 index c3a3e55d05..0000000000 --- a/package.bak/freerdp/freerdp.mk +++ /dev/null @@ -1,257 +0,0 @@ -################################################################################ -# -# freerdp -# -################################################################################ - -# Changeset on the master branch -FREERDP_VERSION = 17834af7bb378f85a3b3cc4dcadaa5125a337e16 -FREERDP_SITE = $(call github,FreeRDP,FreeRDP,$(FREERDP_VERSION)) -FREERDP_DEPENDENCIES = libglib2 openssl zlib -FREERDP_LICENSE = Apache-2.0 -FREERDP_LICENSE_FILES = LICENSE - -FREERDP_INSTALL_STAGING = YES - -FREERDP_CONF_OPTS = -DWITH_MANPAGES=OFF -Wno-dev - -ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER),y) -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -FREERDP_DEPENDENCIES += gstreamer gst-plugins-base libxml2 host-pkgconf -else -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - -ifeq ($(BR2_PACKAGE_FREERDP_GSTREAMER1),y) -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_1_0=ON -FREERDP_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -FREERDP_CONF_OPTS += -DWITH_GSTREAMER_1_0=OFF -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -FREERDP_CONF_OPTS += -DWITH_CUPS=ON -FREERDP_DEPENDENCIES += cups -else -FREERDP_CONF_OPTS += -DWITH_CUPS=OFF -endif - -ifeq ($(BR2_PACKAGE_FFMPEG),y) -FREERDP_CONF_OPTS += -DWITH_FFMPEG=ON -FREERDP_DEPENDENCIES += ffmpeg -else -FREERDP_CONF_OPTS += -DWITH_FFMPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER),y) -FREERDP_CONF_OPTS += -DWITH_ALSA=ON -FREERDP_DEPENDENCIES += alsa-lib -else -FREERDP_CONF_OPTS += -DWITH_ALSA=OFF -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=ON -FREERDP_DEPENDENCIES += pulseaudio -else -FREERDP_CONF_OPTS += -DWITH_PULSEAUDIO=OFF -endif - -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -FREERDP_CONF_OPTS += -DWITH_NEON=ON -else -FREERDP_CONF_OPTS += -DWITH_NEON=OFF -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -FREERDP_CONF_OPTS += -DWITH_SSE2=ON -else -FREERDP_CONF_OPTS += -DWITH_SSE2=OFF -endif - -ifeq ($(BR2_arm)$(BR2_armeb),y) -FREERDP_CONF_OPTS += -DARM_FP_ABI=$(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) -endif - -#--------------------------------------- -# Enabling server and/or client - -# Clients and server interface must always be enabled to build the -# corresponding libraries. -FREERDP_CONF_OPTS += -DWITH_SERVER_INTERFACE=ON -FREERDP_CONF_OPTS += -DWITH_CLIENT_INTERFACE=ON - -ifeq ($(BR2_PACKAGE_FREERDP_SERVER),y) -FREERDP_CONF_OPTS += -DWITH_SERVER=ON -endif - -ifneq ($(BR2_PACKAGE_FREERDP_CLIENT_X11)$(BR2_PACKAGE_FREERDP_CLIENT_WL),) -FREERDP_CONF_OPTS += -DWITH_CLIENT=ON -endif - -#--------------------------------------- -# Libraries for client and/or server - -# The FreeRDP buildsystem uses non-orthogonal options. For example it -# is not possible to build the server and the wayland client without -# also building the X client. That's because the dependencies of the -# server (the X libraries) are a superset of those of the X client. -# So, as soon as FreeRDP is configured for the server and the wayland -# client, it will believe it also has to build the X client, because -# the libraries it needs are enabled. -# -# Furthermore, the shadow server is always built, even if there's nothing -# it can serve (i.e. the X libs are disabled). -# -# So, we do not care whether we build too much; we remove, as -# post-install hooks, whatever we do not want. - -# If Xorg is enabled, and the server or the X client are, then libX11 -# and libXext are forcibly enabled at the Kconfig level. However, if -# Xorg is enabled but neither the server nor the X client are, then -# there's nothing that guarantees those two libs are enabled. So we -# really must check for them. -ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXEXT),yy) -FREERDP_DEPENDENCIES += xlib_libX11 xlib_libXext -FREERDP_CONF_OPTS += -DWITH_X11=ON -else -FREERDP_CONF_OPTS += -DWITH_X11=OFF -endif - -# The following libs are either optional or mandatory only for either -# the server or the client. A mandatory library for either one is -# selected from Kconfig, so we can make it conditional here -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -FREERDP_CONF_OPTS += -DWITH_XCURSOR=ON -FREERDP_DEPENDENCIES += xlib_libXcursor -else -FREERDP_CONF_OPTS += -DWITH_XCURSOR=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -FREERDP_CONF_OPTS += -DWITH_XDAMAGE=ON -FREERDP_DEPENDENCIES += xlib_libXdamage -else -FREERDP_CONF_OPTS += -DWITH_XDAMAGE=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -FREERDP_CONF_OPTS += -DWITH_XFIXES=ON -FREERDP_DEPENDENCIES += xlib_libXfixes -else -FREERDP_CONF_OPTS += -DWITH_XFIXES=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -FREERDP_CONF_OPTS += -DWITH_XI=ON -FREERDP_DEPENDENCIES += xlib_libXi -else -FREERDP_CONF_OPTS += -DWITH_XI=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -FREERDP_CONF_OPTS += -DWITH_XINERAMA=ON -FREERDP_DEPENDENCIES += xlib_libXinerama -else -FREERDP_CONF_OPTS += -DWITH_XINERAMA=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -FREERDP_CONF_OPTS += -DWITH_XKBFILE=ON -FREERDP_DEPENDENCIES += xlib_libxkbfile -else -FREERDP_CONF_OPTS += -DWITH_XKBFILE=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -FREERDP_CONF_OPTS += -DWITH_XRANDR=ON -FREERDP_DEPENDENCIES += xlib_libXrandr -else -FREERDP_CONF_OPTS += -DWITH_XRANDR=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -FREERDP_CONF_OPTS += -DWITH_XRENDER=ON -FREERDP_DEPENDENCIES += xlib_libXrender -else -FREERDP_CONF_OPTS += -DWITH_XRENDER=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXTST),y) -FREERDP_CONF_OPTS += -DWITH_XTEST=ON -FREERDP_DEPENDENCIES += xlib_libXtst -else -FREERDP_CONF_OPTS += -DWITH_XTEST=OFF -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -FREERDP_CONF_OPTS += -DWITH_XV=ON -FREERDP_DEPENDENCIES += xlib_libXv -else -FREERDP_CONF_OPTS += -DWITH_XV=OFF -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -FREERDP_DEPENDENCIES += wayland -FREERDP_CONF_OPTS += -DWITH_WAYLAND=ON -else -FREERDP_CONF_OPTS += -DWITH_WAYLAND=OFF -endif - -#--------------------------------------- -# Post-install hooks to cleanup and install missing stuff - -# Shadow server is always installed, no matter what, so we manually -# remove it if the user does not want the server. -ifeq ($(BR2_PACKAGE_FREERDP_SERVER),) -define FREERDP_RM_SHADOW_SERVER - rm -f $(TARGET_DIR)/usr/bin/freerdp-shadow -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_RM_SHADOW_SERVER -endif # ! server - -# X client is always built as soon as a client is enabled and the -# necessary libs are enabled (e.g. because of the server), so manually -# remove it if the user does not want it. -ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_X11),) -define FREERDP_RM_CLIENT_X11 - rm -f $(TARGET_DIR)/usr/bin/xfreerdp - rm -f $(TARGET_DIR)/usr/lib/libxfreerdp-client* -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_RM_CLIENT_X11 -define FREERDP_RM_CLIENT_X11_LIB - rm -f $(STAGING_DIR)/usr/lib/libxfreerdp-client* -endef -FREERDP_POST_INSTALL_STAGING_HOOKS += FREERDP_RM_CLIENT_X11_LIB -endif # ! X client - -# Wayland client is always built as soon as wayland is enabled, so -# manually remove it if the user does not want it. -ifeq ($(BR2_PACKAGE_FREERDP_CLIENT_WL),) -define FREERDP_RM_CLIENT_WL - rm -f $(TARGET_DIR)/usr/bin/wlfreerdp -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_RM_CLIENT_WL -endif - -# Remove static libraries in unusual dir -define FREERDP_CLEANUP - rm -rf $(TARGET_DIR)/usr/lib/freerdp -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_CLEANUP - -# Install the server key and certificate, so that a client can connect. -# A user can override them with its own in a post-build script, if needed. -# We install them even if the server is not enabled, since another server -# can be built and linked with libfreerdp (e.g. weston with the RDP -# backend). Key and cert are installed world-readable, so non-root users -# can start a server. -define FREERDP_INSTALL_KEYS - $(INSTALL) -m 0644 -D $(@D)/server/Sample/server.key \ - $(TARGET_DIR)/etc/freerdp/keys/server.key - $(INSTALL) -m 0644 -D $(@D)/server/Sample/server.crt \ - $(TARGET_DIR)/etc/freerdp/keys/server.crt -endef -FREERDP_POST_INSTALL_TARGET_HOOKS += FREERDP_INSTALL_KEYS - -$(eval $(cmake-package)) diff --git a/package.bak/freescale-imx/Config.in b/package.bak/freescale-imx/Config.in deleted file mode 100644 index 056728ff09..0000000000 --- a/package.bak/freescale-imx/Config.in +++ /dev/null @@ -1,69 +0,0 @@ -menuconfig BR2_PACKAGE_FREESCALE_IMX - bool "Freescale i.MX libraries" - depends on BR2_arm - help - Those packages provide hardware acceleration for GPU or VPU, hardware - optimization or some hardware tools for Freescale i.MX platforms. - -if BR2_PACKAGE_FREESCALE_IMX -choice - prompt "i.MX platform" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - bool "imx25-3stack" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - bool "imx27ads" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK - bool "imx37-3stack" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 - bool "imx50" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - bool "imx51" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - bool "imx53" - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - bool "imx6q" - -endchoice - -config BR2_PACKAGE_FREESCALE_IMX_PLATFORM - string - default "IMX25_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - default "IMX27ADS" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default "IMX37_3STACK" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK - default "IMX50" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 - default "IMX51" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default "IMX53" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default "IMX6Q" if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - -config BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - bool - default y if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 || \ - BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - -source "package/freescale-imx/imx-codec/Config.in" -source "package/freescale-imx/imx-kobs/Config.in" -source "package/freescale-imx/imx-lib/Config.in" -source "package/freescale-imx/imx-parser/Config.in" -source "package/freescale-imx/imx-uuc/Config.in" -source "package/freescale-imx/imx-vpu/Config.in" -source "package/freescale-imx/imx-vpuwrap/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/gpu-amd-bin-mx51/Config.in" -source "package/freescale-imx/libz160/Config.in" -endif -if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q -source "package/freescale-imx/imx-gpu-viv/Config.in" -source "package/freescale-imx/kernel-module-imx-gpu-viv/Config.in" -endif - -endif diff --git a/package.bak/freescale-imx/firmware-imx/Config.in b/package.bak/freescale-imx/firmware-imx/Config.in deleted file mode 100644 index fca280a85a..0000000000 --- a/package.bak/freescale-imx/firmware-imx/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_FIRMWARE_IMX - bool "firmware-imx" - depends on BR2_arm # Only relevant for i.MX - help - Firmware blobs for the Freescale i.MX SoCs. - - It contains blobs for SDMA and VPU. - - This library is provided by Freescale as-is and doesn't have - an upstream. diff --git a/package.bak/freescale-imx/firmware-imx/firmware-imx.hash b/package.bak/freescale-imx/firmware-imx/firmware-imx.hash deleted file mode 100644 index a6e5bd58ef..0000000000 --- a/package.bak/freescale-imx/firmware-imx/firmware-imx.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 c5bd4bff48cce9715a5d6d2c190ff3cd2262c7196f7facb9b0eda231c92cc223 firmware-imx-5.4.bin diff --git a/package.bak/freescale-imx/firmware-imx/firmware-imx.mk b/package.bak/freescale-imx/firmware-imx/firmware-imx.mk deleted file mode 100644 index 08fb4636a0..0000000000 --- a/package.bak/freescale-imx/firmware-imx/firmware-imx.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# firmware-imx -# -################################################################################ - -FIRMWARE_IMX_VERSION = 5.4 -FIRMWARE_IMX_SITE = $(FREESCALE_IMX_SITE) -FIRMWARE_IMX_SOURCE = firmware-imx-$(FIRMWARE_IMX_VERSION).bin - -FIRMWARE_IMX_LICENSE = NXP Semiconductor Software License Agreement -FIRMWARE_IMX_LICENSE_FILES = EULA COPYING -FIRMWARE_IMX_REDISTRIBUTE = NO - -FIRMWARE_IMX_BLOBS = sdma vpu - -define FIRMWARE_IMX_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(FIRMWARE_IMX_SOURCE)) -endef - -define FIRMWARE_IMX_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/imx - for blobdir in $(FIRMWARE_IMX_BLOBS); do \ - cp -r $(@D)/firmware/$${blobdir} $(TARGET_DIR)/lib/firmware; \ - done - cp -r $(@D)/firmware/epdc $(TARGET_DIR)/lib/firmware/imx - mv $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw.nonrestricted \ - $(TARGET_DIR)/lib/firmware/imx/epdc/epdc_ED060XH2C1.fw - rm $(TARGET_DIR)/lib/firmware/imx/epdc/fsl-epdc.mk -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/freescale-imx.mk b/package.bak/freescale-imx/freescale-imx.mk deleted file mode 100644 index e8ca77f17b..0000000000 --- a/package.bak/freescale-imx/freescale-imx.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# freescale-imx -# -################################################################################ - -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.bak/freescale-imx/gpu-amd-bin-mx51/Config.in b/package.bak/freescale-imx/gpu-amd-bin-mx51/Config.in deleted file mode 100644 index 337713c720..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/Config.in +++ /dev/null @@ -1,60 +0,0 @@ -comment "gpu-amd-bin-mx51 needs a glibc EABI toolchain w/ C++" - depends on BR2_arm - depends on !BR2_ARM_EABI || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GPU_AMD_BIN_MX51 - bool "gpu-amd-bin-mx51 (also imx53)" - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENVG - depends on BR2_ARM_EABI - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_INSTALL_LIBSTDCPP - help - Freescale libraries, headers and executables for the - AMD GPU on i.MX5x, containing OpenGL/ES, OpenVG - and EGL support. - -if BR2_PACKAGE_GPU_AMD_BIN_MX51 - -choice - prompt "Output option" - help - There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. - Choose here which version to install. - -config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXAU - bool "X11" - -comment "X11 backend needs X.org enabled" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_FB - bool "Framebuffer" - -endchoice - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "gpu-amd-bin-mx51" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "gpu-amd-bin-mx51" - -config BR2_PACKAGE_PROVIDES_LIBOPENVG - default "gpu-amd-bin-mx51" - -config BR2_PACKAGE_GPU_AMD_BIN_MX51_EXAMPLES - bool "install examples" - help - Copy the examples to the target. - -endif diff --git a/package.bak/freescale-imx/gpu-amd-bin-mx51/egl.pc b/package.bak/freescale-imx/gpu-amd-bin-mx51/egl.pc deleted file mode 100644 index b0ff229fba..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/egl.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: Freescale amd-gpu-bin-mx51 implementation of EGL -Version: 7.11.0 -Libs: -L${libdir} -lEGL -Cflags: -I${includedir} diff --git a/package.bak/freescale-imx/gpu-amd-bin-mx51/glesv2.pc b/package.bak/freescale-imx/gpu-amd-bin-mx51/glesv2.pc deleted file mode 100644 index 6f9b7fc841..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: Freescale amd-gpu-bin-mx51 implementation of OpenGL ESv2 -Version: 7.11.0 -Libs: -L${libdir} -lGLESv2 -Cflags: -I${includedir} diff --git a/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash b/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash deleted file mode 100644 index 9c08e4aa10..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -sha256 c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db amd-gpu-x11-bin-mx51-11.09.01.bin -sha256 f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9 amd-gpu-bin-mx51-11.09.01.bin diff --git a/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk b/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk deleted file mode 100644 index 44a6b4c7d2..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/gpu-amd-bin-mx51.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# gpu-amd-bin-mx51 -# -################################################################################ - -GPU_AMD_BIN_MX51_SITE = $(FREESCALE_IMX_SITE) -GPU_AMD_BIN_MX51_BASE_VERSION = 11.09.01 -ifeq ($(BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_FB),y) -GPU_AMD_BIN_MX51_VERSION = $(GPU_AMD_BIN_MX51_BASE_VERSION)-fb -GPU_AMD_BIN_MX51_SOURCE = amd-gpu-bin-mx51-$(GPU_AMD_BIN_MX51_BASE_VERSION).bin -else -GPU_AMD_BIN_MX51_VERSION = $(GPU_AMD_BIN_MX51_BASE_VERSION)-x11 -GPU_AMD_BIN_MX51_SOURCE = amd-gpu-x11-bin-mx51-$(GPU_AMD_BIN_MX51_BASE_VERSION).bin -GPU_AMD_BIN_MX51_DEPENDENCIES = libxcb xlib_libX11 xlib_libXext \ - xlib_libXrender xlib_libXau xlib_libXdmcp -endif -GPU_AMD_BIN_MX51_PROVIDES = libegl libgles libopenvg -GPU_AMD_BIN_MX51_INSTALL_STAGING = YES - -GPU_AMD_BIN_MX51_LICENSE = Freescale Semiconductor Software License Agreement -GPU_AMD_BIN_MX51_LICENSE_FILES = EULA -GPU_AMD_BIN_MX51_REDISTRIBUTE = NO - -define GPU_AMD_BIN_MX51_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(GPU_AMD_BIN_MX51_SOURCE)) -endef - -# Upstream headers need to be compiled with -D_LINUX. It is more convenient -# to rely on __linux__ which is defined in compiler itself -define GPU_AMD_BIN_MX51_FIXUP_HEADERS - $(SED) 's/_LINUX/__linux__/g' $(@D)/usr/include/*/*.h -endef -GPU_AMD_BIN_MX51_POST_PATCH_HOOKS += GPU_AMD_BIN_MX51_FIXUP_HEADERS - -# eglplatform_1.4.h contains X11 compatible headers -ifeq ($(BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11),y) -define GPU_AMD_BIN_MX51_FIXUP_EGL_HEADERS - mv $(STAGING_DIR)/usr/include/EGL/eglplatform_1.4.h $(STAGING_DIR)/usr/include/EGL/eglplatform.h -endef -endif - -define GPU_AMD_BIN_MX51_INSTALL_STAGING_CMDS - $(INSTALL) -d $(STAGING_DIR)/usr/lib/pkgconfig - $(INSTALL) -m 644 package/freescale-imx/gpu-amd-bin-mx51/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - $(INSTALL) -m 755 $(@D)/usr/lib/lib* $(STAGING_DIR)/usr/lib/ - cp -r $(@D)/usr/include/* $(STAGING_DIR)/usr/include - $(GPU_AMD_BIN_MX51_FIXUP_EGL_HEADERS) -endef - -ifeq ($(BR2_PACKAGE_GPU_AMD_BIN_MX51_EXAMPLES),y) -define GPU_AMD_BIN_MX51_INSTALL_EXAMPLES - $(INSTALL) -d $(TARGET_DIR)/usr/share/examples/gpu_amd_samples - $(INSTALL) -m 755 $(@D)/usr/bin/* $(TARGET_DIR)/usr/share/examples/gpu_amd_samples -endef -endif - -define GPU_AMD_BIN_MX51_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(@D)/usr/lib/lib*so* $(TARGET_DIR)/usr/lib/ - $(GPU_AMD_BIN_MX51_INSTALL_EXAMPLES) -endef - -define GPU_AMD_BIN_MX51_DEVICES - /dev/gsl_kmod c 640 0 0 249 0 1 4 -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/gpu-amd-bin-mx51/vg.pc b/package.bak/freescale-imx/gpu-amd-bin-mx51/vg.pc deleted file mode 100644 index 8fe956e11e..0000000000 --- a/package.bak/freescale-imx/gpu-amd-bin-mx51/vg.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: vg -Description: Freescale amd-gpu-bin-mx51 implementation of OpenVG -Version: 1.1 -Libs: -L${libdir} -lOpenVG -Cflags: -I${includedir}/ diff --git a/package.bak/freescale-imx/imx-codec/Config.in b/package.bak/freescale-imx/imx-codec/Config.in deleted file mode 100644 index df248b0cf2..0000000000 --- a/package.bak/freescale-imx/imx-codec/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_IMX_CODEC - bool "imx-codec" - depends on BR2_arm # Only relevant for i.MX - depends on BR2_TOOLCHAIN_USES_GLIBC # prebuilt binaries - help - Binary codec libraries for the NXP i.MX SoCs. - - This library is provided by NXP as-is and doesn't have - an upstream. - -comment "imx-codec needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/freescale-imx/imx-codec/imx-codec.hash b/package.bak/freescale-imx/imx-codec/imx-codec.hash deleted file mode 100644 index 2bb7a242e9..0000000000 --- a/package.bak/freescale-imx/imx-codec/imx-codec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 98fe71cb44f7e858c64c5eda81741ed02f40afaadc3d4ed1e693c7d1e684b81d imx-codec-4.1.4.bin diff --git a/package.bak/freescale-imx/imx-codec/imx-codec.mk b/package.bak/freescale-imx/imx-codec/imx-codec.mk deleted file mode 100644 index 911ad8b1b0..0000000000 --- a/package.bak/freescale-imx/imx-codec/imx-codec.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# imx-codec -# -################################################################################ - -IMX_CODEC_VERSION = 4.1.4 -IMX_CODEC_SITE = $(FREESCALE_IMX_SITE) -IMX_CODEC_SOURCE = imx-codec-$(IMX_CODEC_VERSION).bin -IMX_CODEC_INSTALL_STAGING = YES - -IMX_CODEC_LICENSE = NXP Semiconductor Software License Agreement, BSD-3c (flac, ogg headers) -IMX_CODEC_LICENSE_FILES = EULA COPYING -IMX_CODEC_REDISTRIBUTE = NO - -ifeq ($(BR2_ARM_EABIHF),y) -IMX_CODEC_CONF_OPTS += --enable-fhw -endif - -ifeq ($(BR2_PACKAGE_IMX_VPU),y) -IMX_CODEC_CONF_OPTS += --enable-vpu -endif - -define IMX_CODEC_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_CODEC_SOURCE)) -endef - -# FIXME The Makefile installs both the arm9 and arm11 versions of the -# libraries, but we only need one of them. - -# Upstream installs libraries into usr/lib/imx-mm, but the dynamic -# loader only looks in usr/lib, so move the libraries there -define IMX_CODEC_FIXUP_TARGET_PATH - find $(TARGET_DIR)/usr/lib/imx-mm -not -type d \ - -exec mv {} $(TARGET_DIR)/usr/lib \; - rm -rf $(TARGET_DIR)/usr/lib/imx-mm -endef -IMX_CODEC_POST_INSTALL_TARGET_HOOKS += IMX_CODEC_FIXUP_TARGET_PATH - -$(eval $(autotools-package)) diff --git a/package.bak/freescale-imx/imx-gpu-viv/Config.in b/package.bak/freescale-imx/imx-gpu-viv/Config.in deleted file mode 100644 index effb24b3b2..0000000000 --- a/package.bak/freescale-imx/imx-gpu-viv/Config.in +++ /dev/null @@ -1,92 +0,0 @@ -comment "imx-gpu-viv needs a glibc toolchain with armhf enabled" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF - -config BR2_PACKAGE_IMX_GPU_VIV - bool "imx-gpu-viv" - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENVG - # Pre-built binaries only available for ARM EABIhf - depends on BR2_ARM_EABIHF - # Library binaries are linked against libc.so.6 - depends on BR2_TOOLCHAIN_USES_GLIBC - help - Userspace libraries for Vivante GPU on i.MX6 platforms - - It contains libraries and headers for GLES, OpenCL, and - OpenVG. It also contains a DRI plugin for X11. It also - contains a plugin for DirectFB-1.4.0, but that doesn't work - together with buildroot's DirectFB version. - - This library is provided by Freescale as-is and doesn't have - an upstream. - -if BR2_PACKAGE_IMX_GPU_VIV - -choice - prompt "Output option" - help - There are two versions of this library: one for - direct framebuffer access, one for X11 rendering. - Choose here which version to install. - -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - bool "X11" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "X11 backend needs Xorg package" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB - bool "Framebuffer" - -endchoice - -config BR2_PACKAGE_IMX_GPU_VIV_OUTPUT - string - default "x11" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - default "fb" if BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_FB - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "imx-gpu-viv" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "imx-gpu-viv" - -config BR2_PACKAGE_PROVIDES_LIBOPENVG - default "imx-gpu-viv" - -config BR2_PACKAGE_IMX_GPU_VIV_APITRACE - bool "install apitrace tools" - select BR2_PACKAGE_IMX_GPU_VIV_G2D - select BR2_PACKAGE_LIBPNG - help - Copy the apitrace tool to the target. Apitrace consists - of a set of tools to trace, replay and/or inspect OpenGL, - OpenGL ES APIs calls - - http://apitrace.github.io/ - -config BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES - bool "install examples" - help - Copy the Vivante examples to the target. - - Warning: examples take approximately 150 MB of disk space. - -config BR2_PACKAGE_IMX_GPU_VIV_G2D - bool "install G2D libraries" - help - Copy the GPU2D libraries to the target. - -config BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO - bool "install gmem_info tool" - help - Copy the gmem_info tool to the target which provides - information about GPU memory consumption. - -endif diff --git a/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash b/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash deleted file mode 100644 index 6c526c5876..0000000000 --- a/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 caaabd59a259e29aa5b7f9d1d7f3fe71cff9336ba44904485d258baef276351f imx-gpu-viv-5.0.11.p8.6-hfp.bin diff --git a/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk b/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk deleted file mode 100644 index 961f574c8b..0000000000 --- a/package.bak/freescale-imx/imx-gpu-viv/imx-gpu-viv.mk +++ /dev/null @@ -1,130 +0,0 @@ -################################################################################ -# -# imx-gpu-viv -# -################################################################################ - -IMX_GPU_VIV_VERSION = 5.0.11.p8.6-hfp -IMX_GPU_VIV_SITE = $(FREESCALE_IMX_SITE) -IMX_GPU_VIV_SOURCE = imx-gpu-viv-$(IMX_GPU_VIV_VERSION).bin - -IMX_GPU_VIV_INSTALL_STAGING = YES - -IMX_GPU_VIV_LICENSE = NXP Semiconductor Software License Agreement -IMX_GPU_VIV_LICENSE_FILES = EULA COPYING -IMX_GPU_VIV_REDISTRIBUTE = NO - -IMX_GPU_VIV_PROVIDES = libegl libgles libopenvg -IMX_GPU_VIV_LIB_TARGET = $(call qstrip,$(BR2_PACKAGE_IMX_GPU_VIV_OUTPUT)) - -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -# The libGAL.so library provided by imx-gpu-viv uses X functions. Packages -# may want to link against libGAL.so (QT5 Base with OpenGL and X support -# does so). For this to work we need build dependencies to libXdamage, -# libXext and libXfixes so that X functions used in libGAL.so are referenced. -IMX_GPU_VIV_DEPENDENCIES += xlib_libXdamage xlib_libXext xlib_libXfixes -endif - -define IMX_GPU_VIV_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_GPU_VIV_SOURCE)) -endef - -# Instead of building, we fix up the inconsistencies that exist -# in the upstream archive here. -# Make sure these commands are idempotent. -define IMX_GPU_VIV_BUILD_CMDS - $(SED) 's/defined(LINUX)/defined(__linux__)/g' $(@D)/gpu-core/usr/include/*/*.h - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1 - ln -sf libGL.so.1.2 $(@D)/gpu-core/usr/lib/libGL.so.1.2.0 - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1 - ln -sf libEGL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libEGL.so.1.0 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2 - ln -sf libGLESv2-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGLESv2.so.2.0.0 - ln -sf libVIVANTE-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libVIVANTE.so - ln -sf libGAL-$(IMX_GPU_VIV_LIB_TARGET).so $(@D)/gpu-core/usr/lib/libGAL.so -endef - -ifeq ($(IMX_GPU_VIV_LIB_TARGET),fb) -define IMX_GPU_VIV_FIXUP_FB_HEADERS - $(SED) '39i\ - #if !defined(EGL_API_X11) && !defined(EGL_API_DFB) && !defined(EGL_API_FB) \n\ - #define EGL_API_FB \n\ - #endif' $(STAGING_DIR)/usr/include/EGL/eglvivante.h -endef -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) -define IMX_GPU_VIV_INSTALL_G2D_STAGING - cp -dpfr $(@D)/g2d/usr/include/* $(STAGING_DIR)/usr/include/ - cp -dpfr $(@D)/g2d/usr/lib/* $(STAGING_DIR)/usr/lib/ -endef -endif - -define IMX_GPU_VIV_INSTALL_STAGING_CMDS - cp -r $(@D)/gpu-core/usr/* $(STAGING_DIR)/usr - $(IMX_GPU_VIV_FIXUP_FB_HEADERS) - $(IMX_GPU_VIV_INSTALL_G2D_STAGING) - for lib in egl glesv2 vg; do \ - $(INSTALL) -m 0644 -D \ - $(@D)/gpu-core/usr/lib/pkgconfig/$${lib}.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/$${lib}.pc; \ - done -endef - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_APITRACE),y) -IMX_GPU_VIV_DEPENDENCIES += libpng -ifeq ($(IMX_GPU_VIV_LIB_TARGET),x11) -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -else -define IMX_GPU_VIV_INSTALL_APITRACE - cp -dpfr $(@D)/apitrace/non-x11/usr/bin/* $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/apitrace/non-x11/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_EXAMPLES),y) -define IMX_GPU_VIV_INSTALL_EXAMPLES - mkdir -p $(TARGET_DIR)/usr/share/examples/ - cp -r $(@D)/gpu-demos/opt/* $(TARGET_DIR)/usr/share/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_G2D),y) -define IMX_GPU_VIV_INSTALL_G2D - cp -dpfr $(@D)/g2d/usr/lib/* $(TARGET_DIR)/usr/lib/ -endef -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV_GMEM_INFO),y) -define IMX_GPU_VIV_INSTALL_GMEM_INFO - cp -dpfr $(@D)/gpu-tools/gmem-info/usr/bin/* $(TARGET_DIR)/usr/bin/ -endef -endif - -# On the target, remove the unused libraries. -# Note that this is _required_, else ldconfig may create symlinks -# to the wrong library -define IMX_GPU_VIV_INSTALL_TARGET_CMDS - $(IMX_GPU_VIV_INSTALL_APITRACE) - $(IMX_GPU_VIV_INSTALL_EXAMPLES) - $(IMX_GPU_VIV_INSTALL_G2D) - $(IMX_GPU_VIV_INSTALL_GMEM_INFO) - cp -a $(@D)/gpu-core/usr/lib $(TARGET_DIR)/usr - for lib in EGL GAL VIVANTE GLESv2; do \ - for f in $(TARGET_DIR)/usr/lib/lib$${lib}-*.so; do \ - case $$f in \ - *-$(IMX_GPU_VIV_LIB_TARGET).so) : ;; \ - *) $(RM) $$f ;; \ - esac; \ - done; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/imx-kobs/0001-Fix-musl-build.patch b/package.bak/freescale-imx/imx-kobs/0001-Fix-musl-build.patch deleted file mode 100644 index ce123de9cc..0000000000 --- a/package.bak/freescale-imx/imx-kobs/0001-Fix-musl-build.patch +++ /dev/null @@ -1,39 +0,0 @@ -[PATCH] Fix musl build - -Signed-off-by: Gary Bisson ---- - src/mtd.c | 1 + - src/mtd.h | 5 +++++ - 2 files changed, 6 insertions(+) - -diff --git a/src/mtd.c b/src/mtd.c -index 1edc441..6d2264c 100644 ---- a/src/mtd.c -+++ b/src/mtd.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/src/mtd.h b/src/mtd.h -index bd21add..debfc84 100644 ---- a/src/mtd.h -+++ b/src/mtd.h -@@ -31,6 +31,11 @@ - #include "BootControlBlocks.h" - #include "rom_nand_hamming_code_ecc.h" - -+// musl library doesn't define loff_t -+#if !defined(__GLIBC__) && !defined(__UCLIBC__) -+#define loff_t off_t -+#endif -+ - //------------------------------------------------------------------------------ - // Re-definitions of true and false, because the standard ones aren't good - // enough? --- -2.5.1 - diff --git a/package.bak/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch b/package.bak/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch deleted file mode 100644 index c5cfb80224..0000000000 --- a/package.bak/freescale-imx/imx-kobs/0002-Fix-build-for-recent-toolchains.patch +++ /dev/null @@ -1,26 +0,0 @@ -[PATCH] Fix build for recent toolchains - -Starting with Linux 4.4 headers, mtd-user.h isn't including stdint.h -anymore which breaks the build. - -Signed-off-by: Gary Bisson ---- - src/BootControlBlocks.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/BootControlBlocks.h b/src/BootControlBlocks.h -index 192eb61..aacdb64 100644 ---- a/src/BootControlBlocks.h -+++ b/src/BootControlBlocks.h -@@ -20,6 +20,8 @@ - #ifndef BOOTCONTROLBLOCKS_H_ - #define BOOTCONTROLBLOCKS_H_ - -+#include -+ - #define NCB_FINGERPRINT1 0x504d5453 //!< 'STMP' - #define NCB_FINGERPRINT2 0x2042434e //!< 'NCB' - NAND Control Block - #define NCB_FINGERPRINT3 0x4e494252 //!< 'RBIN' - ROM Boot Image Block - N --- -2.6.4 - diff --git a/package.bak/freescale-imx/imx-kobs/Config.in b/package.bak/freescale-imx/imx-kobs/Config.in deleted file mode 100644 index fc2344ed0d..0000000000 --- a/package.bak/freescale-imx/imx-kobs/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_IMX_KOBS - bool "imx-kobs" - depends on BR2_arm # Only relevant for i.MX - help - The imx-kobs tool is used for writing images to NAND on i.MX - platforms. - - This library is provided by Freescale as-is and doesn't have - an upstream. - diff --git a/package.bak/freescale-imx/imx-kobs/imx-kobs.hash b/package.bak/freescale-imx/imx-kobs/imx-kobs.hash deleted file mode 100644 index 258d08c7e9..0000000000 --- a/package.bak/freescale-imx/imx-kobs/imx-kobs.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 5b040de6e3db5d47371b311e7068380926827a7a6ef02e45fb2ba08b680d0ec5 imx-kobs-b402243a04e5a6760a860445e5ff6a931d86f794.tar.gz diff --git a/package.bak/freescale-imx/imx-kobs/imx-kobs.mk b/package.bak/freescale-imx/imx-kobs/imx-kobs.mk deleted file mode 100644 index 8f490c2499..0000000000 --- a/package.bak/freescale-imx/imx-kobs/imx-kobs.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# imx-kobs -# -################################################################################ - -IMX_KOBS_VERSION = b402243a04e5a6760a860445e5ff6a931d86f794 -IMX_KOBS_SITE = $(call github,NXPmicro,imx-kobs,$(IMX_KOBS_VERSION)) -IMX_KOBS_LICENSE = GPLv2+ -IMX_KOBS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/freescale-imx/imx-lib/Config.in b/package.bak/freescale-imx/imx-lib/Config.in deleted file mode 100644 index 3b0f7a921d..0000000000 --- a/package.bak/freescale-imx/imx-lib/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "imx-lib needs an imx-specific Linux kernel to be built" - depends on BR2_arm && !BR2_LINUX_KERNEL - -config BR2_PACKAGE_IMX_LIB - bool "imx-lib" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - help - Library of userspace helpers specific for the Freescale i.MX - platform. It wraps the kernel interfaces for some i.MX platform - specific drivers. It requires a kernel that includes the i.MX - specific headers to be built. - - This library is provided by Freescale as-is and doesn't have - an upstream. - diff --git a/package.bak/freescale-imx/imx-lib/imx-lib.hash b/package.bak/freescale-imx/imx-lib/imx-lib.hash deleted file mode 100644 index 76dcb23f6f..0000000000 --- a/package.bak/freescale-imx/imx-lib/imx-lib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 8d12c4a0a44d29569f1ead3a36adc28402b9c4036b53e11dd3ebf2295e3ce1d0 imx-lib-5.4.tar.gz diff --git a/package.bak/freescale-imx/imx-lib/imx-lib.mk b/package.bak/freescale-imx/imx-lib/imx-lib.mk deleted file mode 100644 index d3603ca919..0000000000 --- a/package.bak/freescale-imx/imx-lib/imx-lib.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# imx-lib -# -################################################################################ - -IMX_LIB_VERSION = 5.4 -IMX_LIB_SITE = $(FREESCALE_IMX_SITE) -IMX_LIB_LICENSE = LGPLv2.1+ -IMX_LIB_LICENSE_FILES = COPYING-LGPL-2.1 - -IMX_LIB_INSTALL_STAGING = YES - -# imx-lib needs access to imx-specific kernel headers -IMX_LIB_DEPENDENCIES += linux -IMX_LIB_INCLUDE = \ - -I$(LINUX_DIR)/drivers/mxc/security/rng/include \ - -I$(LINUX_DIR)/drivers/mxc/security/sahara2/include \ - -idirafter $(LINUX_DIR)/include/uapi - -IMX_LIB_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - $(TARGET_CONFIGURE_OPTS) \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) \ - INCLUDE="$(IMX_LIB_INCLUDE)" - -define IMX_LIB_BUILD_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) -endef - -define IMX_LIB_INSTALL_STAGING_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install -endef - -define IMX_LIB_INSTALL_TARGET_CMDS - $(IMX_LIB_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/imx-parser/Config.in b/package.bak/freescale-imx/imx-parser/Config.in deleted file mode 100644 index 526f066387..0000000000 --- a/package.bak/freescale-imx/imx-parser/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_IMX_PARSER - bool "imx-parser" - depends on BR2_arm # Only relevant for i.MX - help - Binary parser libraries for the NXP i.MX SoCs. - - This library is provided by NXP as-is and doesn't have - an upstream. diff --git a/package.bak/freescale-imx/imx-parser/imx-parser.hash b/package.bak/freescale-imx/imx-parser/imx-parser.hash deleted file mode 100644 index f6e82338aa..0000000000 --- a/package.bak/freescale-imx/imx-parser/imx-parser.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d3a03e60780bbbd0c92932f60bd34d2fe14ffecf6aa6b810723c3edf798cad1f imx-parser-4.1.4.bin diff --git a/package.bak/freescale-imx/imx-parser/imx-parser.mk b/package.bak/freescale-imx/imx-parser/imx-parser.mk deleted file mode 100644 index a57647c03b..0000000000 --- a/package.bak/freescale-imx/imx-parser/imx-parser.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# imx-parser -# -################################################################################ - -IMX_PARSER_VERSION = 4.1.4 -IMX_PARSER_SITE = $(FREESCALE_IMX_SITE) -IMX_PARSER_SOURCE = imx-parser-$(IMX_PARSER_VERSION).bin -IMX_PARSER_INSTALL_STAGING = YES - -IMX_PARSER_LICENSE = NXP Semiconductor Software License Agreement -IMX_PARSER_LICENSE_FILES = EULA COPYING -IMX_PARSER_REDISTRIBUTE = NO - -ifeq ($(BR2_ARM_EABIHF),y) -IMX_PARSER_CONF_OPTS += --enable-fhw -else -IMX_PARSER_CONF_OPTS += --enable-fsw -endif - -define IMX_PARSER_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_PARSER_SOURCE)) -endef - -# The Makefile installs several versions of the libraries, but we only -# need one of them, depending on the platform. - -# Upstream installs libraries into usr/lib/imx-mm, but the dynamic -# loader only looks in usr/lib, so move the libraries there -define IMX_PARSER_FIXUP_TARGET_PATH - find $(TARGET_DIR)/usr/lib/imx-mm -not -type d \ - -exec mv {} $(TARGET_DIR)/usr/lib \; - rm -rf $(TARGET_DIR)/usr/lib/imx-mm -endef -IMX_PARSER_POST_INSTALL_TARGET_HOOKS += IMX_PARSER_FIXUP_TARGET_PATH - -$(eval $(autotools-package)) diff --git a/package.bak/freescale-imx/imx-uuc/Config.in b/package.bak/freescale-imx/imx-uuc/Config.in deleted file mode 100644 index ed734ad7e2..0000000000 --- a/package.bak/freescale-imx/imx-uuc/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_IMX_UUC - bool "imx-uuc" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm # Only relevant for i.MX - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_HOST_DOSFSTOOLS - help - This package provides the Universal Adapter user-space - utility that is used to receive commands from the - Manufacturing Tool using the Freescale UTP Protocol. - - It requires a Freescale/NXP kernel whose configuration - contains the CONFIG_FSL_UTP option. - - This package is provided by Freescale/NXP as-is and doesn't - have an upstream. - -comment "imx-uuc needs a toolchain w/ threads" - depends on BR2_arm - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/freescale-imx/imx-uuc/S80imx-uuc b/package.bak/freescale-imx/imx-uuc/S80imx-uuc deleted file mode 100644 index 8a02f88e50..0000000000 --- a/package.bak/freescale-imx/imx-uuc/S80imx-uuc +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - -NAME=uuc -DAEMON=/usr/bin/$NAME - -case "$1" in - start) - printf "Starting $NAME: " - start-stop-daemon -S -q -b -p /var/run/${NAME}.pid -x $DAEMON - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping $NAME: " - start-stop-daemon -K -q -p /var/run/${NAME}.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/freescale-imx/imx-uuc/imx-uuc.hash b/package.bak/freescale-imx/imx-uuc/imx-uuc.hash deleted file mode 100644 index d6e4d97ea0..0000000000 --- a/package.bak/freescale-imx/imx-uuc/imx-uuc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 eac0c3e288c845cd9b82d02993f8358731a7a03e51591b27feeb453b143beb73 imx-uuc-3440b1108373e79669cc17ba1d2be91a123a2053.tar.gz diff --git a/package.bak/freescale-imx/imx-uuc/imx-uuc.mk b/package.bak/freescale-imx/imx-uuc/imx-uuc.mk deleted file mode 100644 index 12d9312155..0000000000 --- a/package.bak/freescale-imx/imx-uuc/imx-uuc.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# imx-uuc -# -################################################################################ - -IMX_UUC_VERSION = 3440b1108373e79669cc17ba1d2be91a123a2053 -IMX_UUC_SITE = $(call github,NXPmicro,imx-uuc,$(IMX_UUC_VERSION)) -IMX_UUC_LICENSE = GPLv2+ -IMX_UUC_LICENSE_FILES = COPYING - -# mkfs.vfat is needed to create a FAT partition used by g_mass_storage -# so Windows do not offer to format the device when connected to the PC. -IMX_UUC_DEPENDENCIES = host-dosfstools - -define IMX_UUC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC=$(TARGET_CC) -endef - -define IMX_UUC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/uuc $(TARGET_DIR)/usr/bin/uuc - $(INSTALL) -D -m 755 $(@D)/sdimage $(TARGET_DIR)/usr/bin/sdimage - dd if=/dev/zero of=$(TARGET_DIR)/fat bs=1M count=1 - $(HOST_DIR)/usr/sbin/mkfs.vfat $(TARGET_DIR)/fat -endef - -define IMX_UUC_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/freescale-imx/imx-uuc/S80imx-uuc \ - $(TARGET_DIR)/etc/init.d/S80imx-uuc -endef - -define IMX_UUC_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/freescale-imx/imx-uuc/imx-uuc.service \ - $(TARGET_DIR)/usr/lib/systemd/system/imx-uuc.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/imx-uuc.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/imx-uuc.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/imx-uuc/imx-uuc.service b/package.bak/freescale-imx/imx-uuc/imx-uuc.service deleted file mode 100644 index fae7fc64dd..0000000000 --- a/package.bak/freescale-imx/imx-uuc/imx-uuc.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=i.MX Universal UTP Communication Service -After=systemd-modules-load.service - -[Service] -Type=simple -ExecStart=/usr/bin/uuc - -[Install] -WantedBy=multi-user.target - diff --git a/package.bak/freescale-imx/imx-vpu/Config.in b/package.bak/freescale-imx/imx-vpu/Config.in deleted file mode 100644 index 779717f5ed..0000000000 --- a/package.bak/freescale-imx/imx-vpu/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -comment "imx-vpu needs an i.MX platform with VPU support" - depends on BR2_arm - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - -config BR2_PACKAGE_IMX_VPU - bool "imx-vpu" - depends on BR2_arm # Only relevant for i.MX - depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_FIRMWARE_IMX - help - Library of userspace helpers specific for the Freescale i.MX - platform. It wraps the kernel interfaces for the i.MX platform - Video Processing Unit (VPU) driver. It requires a kernel that - includes the i.MX specific headers to be built. - - This library is provided by Freescale as-is and doesn't have - an upstream. diff --git a/package.bak/freescale-imx/imx-vpu/imx-vpu.hash b/package.bak/freescale-imx/imx-vpu/imx-vpu.hash deleted file mode 100644 index b3d617ded9..0000000000 --- a/package.bak/freescale-imx/imx-vpu/imx-vpu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e1d6550426dfc59e4fd0352f1d312ea7eff5dcf18974f923ed7a85007cb40e27 imx-vpu-5.4.35.bin diff --git a/package.bak/freescale-imx/imx-vpu/imx-vpu.mk b/package.bak/freescale-imx/imx-vpu/imx-vpu.mk deleted file mode 100644 index 0b464d854d..0000000000 --- a/package.bak/freescale-imx/imx-vpu/imx-vpu.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# imx-vpu -# -################################################################################ - -IMX_VPU_VERSION = 5.4.35 -IMX_VPU_SITE = $(FREESCALE_IMX_SITE) -IMX_VPU_SOURCE = imx-vpu-$(IMX_VPU_VERSION).bin - -IMX_VPU_INSTALL_STAGING = YES - -IMX_VPU_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - $(TARGET_CONFIGURE_OPTS) \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - PLATFORM=$(BR2_PACKAGE_FREESCALE_IMX_PLATFORM) - -IMX_VPU_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPU_LICENSE_FILES = EULA COPYING -IMX_VPU_REDISTRIBUTE = NO - -define IMX_VPU_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPU_SOURCE)) -endef - -define IMX_VPU_BUILD_CMDS - $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) -endef - -define IMX_VPU_INSTALL_STAGING_CMDS - $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(STAGING_DIR) install -endef - -define IMX_VPU_INSTALL_TARGET_CMDS - $(IMX_VPU_MAKE_ENV) $(MAKE1) -C $(@D) DEST_DIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/imx-vpuwrap/Config.in b/package.bak/freescale-imx/imx-vpuwrap/Config.in deleted file mode 100644 index 35095955c2..0000000000 --- a/package.bak/freescale-imx/imx-vpuwrap/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -comment "imx-vpuwrap needs an imx-specific Linux kernel to be built" - depends on BR2_arm - depends on !BR2_LINUX_KERNEL - -comment "imx-vpuwrap needs an i.MX platform with VPU support" - depends on BR2_arm - depends on BR2_LINUX_KERNEL && !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - -config BR2_PACKAGE_IMX_VPUWRAP - bool "imx-vpuwrap" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_VPU - help - Wrapper library for the vpu library, giving it a different API. - - This library is provided by NXP as-is and doesn't have - an upstream. diff --git a/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash b/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash deleted file mode 100644 index 2999984d2c..0000000000 --- a/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 282e7f8766ce385d8752bd29f04ddeff709ece0846be97547cf982183bbe241e imx-vpuwrap-1.0.68.bin diff --git a/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk b/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk deleted file mode 100644 index 7cbf7784c9..0000000000 --- a/package.bak/freescale-imx/imx-vpuwrap/imx-vpuwrap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# imx-vpuwrap -# -################################################################################ - -IMX_VPUWRAP_VERSION = 1.0.68 -IMX_VPUWRAP_SITE = $(FREESCALE_IMX_SITE) -IMX_VPUWRAP_SOURCE = imx-vpuwrap-$(IMX_VPUWRAP_VERSION).bin -IMX_VPUWRAP_DEPENDENCIES = imx-vpu -IMX_VPUWRAP_INSTALL_STAGING = YES - -IMX_VPUWRAP_LICENSE = NXP Semiconductor Software License Agreement -IMX_VPUWRAP_LICENSE_FILES = EULA COPYING -IMX_VPUWRAP_REDISTRIBUTE = NO - -define IMX_VPUWRAP_EXTRACT_CMDS - $(call FREESCALE_IMX_EXTRACT_HELPER,$(DL_DIR)/$(IMX_VPUWRAP_SOURCE)) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/Config.in b/package.bak/freescale-imx/kernel-module-imx-gpu-viv/Config.in deleted file mode 100644 index bcc55175bc..0000000000 --- a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "kernel-module-imx-gpu-viv needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_KERNEL_MODULE_IMX_GPU_VIV - bool "kernel-module-imx-gpu-viv" - depends on BR2_LINUX_KERNEL - help - Kernel loadable module for Vivante GPU. - - This package uses an exact copy of the GPU kernel driver source code - of the same version as base and include fixes and improvements - developed by FSL Community - - https://github.com/Freescale/kernel-module-imx-gpu-viv diff --git a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash b/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash deleted file mode 100644 index 9c43ea39e7..0000000000 --- a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 51dd137bd67ae991fa58fff4151c6bd7dd46bafd613f43e83d8403ec37217a90 kernel-module-imx-gpu-viv-bfa78b095a892705a09afe9514fc5d236b3124d2.tar.gz diff --git a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk b/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk deleted file mode 100644 index bcbd8d2532..0000000000 --- a/package.bak/freescale-imx/kernel-module-imx-gpu-viv/kernel-module-imx-gpu-viv.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# kernel-module-imx-gpu-viv -# -################################################################################ - -KERNEL_MODULE_IMX_GPU_VIV_VERSION = bfa78b095a892705a09afe9514fc5d236b3124d2 -KERNEL_MODULE_IMX_GPU_VIV_SITE = \ - $(call github,Freescale,kernel-module-imx-gpu-viv,$(KERNEL_MODULE_IMX_GPU_VIV_VERSION)) -KERNEL_MODULE_IMX_GPU_VIV_LICENSE = GPLv2 -KERNEL_MODULE_IMX_GPU_VIV_LICENSE_FILES = COPYING - -KERNEL_MODULE_IMX_GPU_VIV_MODULE_MAKE_OPTS = \ - AQROOT=$(@D)/kernel-module-imx-gpu-viv-src \ - KERNEL_DIR=$(LINUX_DIR) - -KERNEL_MODULE_IMX_GPU_VIV_MODULE_SUBDIRS = kernel-module-imx-gpu-viv-src - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/freescale-imx/libz160/Config.in b/package.bak/freescale-imx/libz160/Config.in deleted file mode 100644 index 012efb9e7b..0000000000 --- a/package.bak/freescale-imx/libz160/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBZ160 - bool "libz160" - depends on BR2_ARM_EABI - depends on BR2_TOOLCHAIN_USES_GLIBC - help - An API for user space programs to perform 2D accelerated graphics - operations on AMD GPU (included for examples in iMX5x chipsets) - -comment "libz160 needs an EABI toolchain w/ glibc" - depends on !BR2_ARM_EABI || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/freescale-imx/libz160/libz160.hash b/package.bak/freescale-imx/libz160/libz160.hash deleted file mode 100644 index ee10630fdf..0000000000 --- a/package.bak/freescale-imx/libz160/libz160.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 08767eb269a0a30ca0aa3d3b5aa9a53a2d17ed1c24651b7e8cefc7704b883f19 libz160-bin-11.09.01.bin diff --git a/package.bak/freescale-imx/libz160/libz160.mk b/package.bak/freescale-imx/libz160/libz160.mk deleted file mode 100644 index af43b1859d..0000000000 --- a/package.bak/freescale-imx/libz160/libz160.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# 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.bak/freeswitch/0001-libvpx-cross.patch b/package.bak/freeswitch/0001-libvpx-cross.patch deleted file mode 100644 index a2583dac35..0000000000 --- a/package.bak/freeswitch/0001-libvpx-cross.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix cross-compiling libvpx - -Freeswitch since version 1.6.7 only uses an in-tree-version of libvpx: -https://freeswitch.org/fisheye/changelog/freeswitch?cs=febe0f8dacea2d2a31902b3dc469be757f8c3c4d - -It is not possible to use an external version of libvpx anymore. -Unfortunately the freeswitch build system has no support for cross- -compiling libvpx so we need to patch Makefile to pass CROSS from -package/freeswitch/freeswitch.mk and add target=generic-gnu as -configure parameter: -https://freeswitch.org/stash/projects/FS/repos/freeswitch/browse/libs/libvpx/README#110 - -And yes, autoreconf is also broken, so we patch Makefile.in instead -of Makefile.am. - -Signed-off-by: Bernd Kuhls - -diff -uNr freeswitch-1.6.7.org/Makefile.in freeswitch-1.6.7/Makefile.in ---- freeswitch-1.6.7.org/Makefile.in 2016-04-01 18:09:54.000000000 +0200 -+++ freeswitch-1.6.7/Makefile.in 2016-04-22 20:11:37.938961730 +0200 -@@ -3491,7 +3491,7 @@ - cd libs/libzrtp && $(MAKE) - - libs/libvpx/Makefile: -- cd libs/libvpx && CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" -+ cd libs/libvpx && CROSS=$(CROSS) CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --target=generic-gnu --enable-pic --disable-docs --disable-examples --disable-install-bins --disable-install-srcs --disable-unit-tests --extra-cflags="$(VISIBILITY_FLAG)" - - libs/libvpx/libvpx.a: libs/libvpx/Makefile - @cd libs/libvpx && $(MAKE) diff --git a/package.bak/freeswitch/Config.in b/package.bak/freeswitch/Config.in deleted file mode 100644 index 1f6459335d..0000000000 --- a/package.bak/freeswitch/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_FREESWITCH - bool "freeswitch" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # apr, included in freeswitch source - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # apr, included in freeswitch source - depends on BR2_USE_WCHAR # uses wchar_t - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_JPEG - # src/mod/applications/mod_cv/mod_cv.cpp includes - # highgui.h, imgproc.hpp & objdetect.hpp - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_IMGPROC if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_SPEEX - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_ZLIB - help - FreeSWITCH is a scalable open source cross-platform - telephony platform designed to route and interconnect - popular communication protocols using audio, video, text or - any other form of media. - - https://www.freeswitch.org - -comment "freeswitch needs a toolchain w/ C++, dynamic library, threads, wchar" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/freeswitch/freeswitch.hash b/package.bak/freeswitch/freeswitch.hash deleted file mode 100644 index 6412511d5f..0000000000 --- a/package.bak/freeswitch/freeswitch.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://files.freeswitch.org/freeswitch-releases/freeswitch-1.6.14.tar.xz.sha256 -sha256 759cb79800c02b9476fcec4c88822942ed6183d9c2686015e4c293e22790cf35 freeswitch-1.6.14.tar.xz diff --git a/package.bak/freeswitch/freeswitch.mk b/package.bak/freeswitch/freeswitch.mk deleted file mode 100644 index 8c107e9900..0000000000 --- a/package.bak/freeswitch/freeswitch.mk +++ /dev/null @@ -1,291 +0,0 @@ -################################################################################ -# -# freeswitch -# -################################################################################ - -FREESWITCH_VERSION = 1.6.14 -FREESWITCH_SOURCE = freeswitch-$(FREESWITCH_VERSION).tar.xz -FREESWITCH_SITE = http://files.freeswitch.org/freeswitch-releases -FREESWITCH_LICENSE = MPLv1.1, \ - GPLv3+ with font exception (fonts), \ - Apache-2.0 (apr, apr-util), \ - LGPLv2+ (sofia-sip), \ - LGPLv2.1, GPLv2 (spandsp), \ - BSD-3c (libsrtp), \ - tiff license - -FREESWITCH_LICENSE_FILES = \ - COPYING \ - libs/apr/LICENSE \ - libs/apr-util/LICENSE \ - libs/sofia-sip/COPYING \ - libs/sofia-sip/COPYRIGHTS \ - libs/spandsp/COPYING \ - libs/srtp/LICENSE \ - libs/tiff-4.0.2/COPYRIGHT - -# required dependencies -FREESWITCH_DEPENDENCIES = \ - host-pkgconf \ - jpeg \ - libcurl \ - openssl \ - pcre \ - speex \ - sqlite \ - util-linux \ - zlib - -# we neither need host-perl nor host-php -FREESWITCH_CONF_ENV += \ - ac_cv_prog_PERL=false \ - ac_cv_have_perl=no \ - ac_cv_prog_PHP=false \ - ac_cv_have_php=no \ - ac_cv_prog_PHP_CONFIG=false \ - ac_cv_have_php_config=no - -# copied from freeswitch/configure.ac, line 258+ -FREESWITCH_CONF_ENV += \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_va_copy=yes \ - ac_cv_file__dev_urandom=yes \ - ac_cv_func_realloc_0_nonnull=yes \ - ac_cv_func_malloc_0_nonnull=yes \ - ac_cv_func_setpgrp_void=yes \ - ac_cv_file__dev_zero=yes \ - apr_cv_tcp_nodelay_with_cork=yes \ - ac_cv_file_dbd_apr_dbd_mysql_c=no \ - ac_cv_sizeof_ssize_t=4 \ - apr_cv_mutex_recursive=yes \ - ac_cv_func_pthread_rwlock_init=yes \ - apr_cv_type_rwlock_t=yes \ - apr_cv_process_shared_works=yes \ - apr_cv_mutex_robust_shared=yes - -# build breaks with -Werror enabled -FREESWITCH_CONF_ENV += \ - ac_cv_gcc_supports_w_no_unused_result=no - -FREESWITCH_CONF_OPTS = \ - --without-erlang \ - --enable-fhs \ - --without-python \ - --disable-system-xmlrpc-c - -# zrtp supports a limited set of archs, sparc support is also broken due -# to a broken ld call by gcc, see libs/libzrtp/include/zrtp_config.h -ifeq ($(BR2_i386)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_aarch64_be)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpcle)$(BR2_x86_64),y) -FREESWITCH_LICENSE_FILES += libs/libzrtp/src/zrtp_legal.c -FREESWITCH_CONF_OPTS += --enable-zrtp -else -FREESWITCH_CONF_OPTS += --disable-zrtp -endif - -# Enable optional modules -FREESWITCH_ENABLED_MODULES += \ - applications/mod_avmd \ - applications/mod_blacklist \ - applications/mod_callcenter \ - applications/mod_commands \ - applications/mod_conference \ - applications/mod_curl \ - applications/mod_db \ - applications/mod_directory \ - applications/mod_dptools \ - applications/mod_easyroute \ - applications/mod_esf \ - applications/mod_esl \ - applications/mod_expr \ - applications/mod_fifo \ - applications/mod_fsk \ - applications/mod_hash \ - applications/mod_httapi \ - applications/mod_lcr \ - applications/mod_sms \ - applications/mod_snom \ - applications/mod_spandsp \ - applications/mod_spy \ - applications/mod_valet_parking \ - applications/mod_voicemail \ - codecs/mod_g723_1 \ - codecs/mod_g729 \ - dialplans/mod_dialplan_asterisk \ - dialplans/mod_dialplan_xml \ - endpoints/mod_loopback \ - endpoints/mod_rtc \ - endpoints/mod_rtmp \ - endpoints/mod_sofia \ - endpoints/mod_verto \ - event_handlers/mod_cdr_csv \ - event_handlers/mod_cdr_sqlite \ - event_handlers/mod_event_socket \ - formats/mod_local_stream \ - formats/mod_native_file \ - formats/mod_tone_stream \ - loggers/mod_console \ - loggers/mod_logfile \ - loggers/mod_syslog \ - say/mod_say_de \ - say/mod_say_en \ - say/mod_say_es \ - say/mod_say_es_ar \ - say/mod_say_fa \ - say/mod_say_fr \ - say/mod_say_he \ - say/mod_say_hr \ - say/mod_say_hu \ - say/mod_say_it \ - say/mod_say_ja \ - say/mod_say_nl \ - say/mod_say_pl \ - say/mod_say_pt \ - say/mod_say_ru \ - say/mod_say_sv \ - say/mod_say_th \ - say/mod_say_zh \ - xml_int/mod_xml_cdr \ - xml_int/mod_xml_rpc \ - xml_int/mod_xml_scgi - -define FREESWITCH_ENABLE_MODULES - $(Q)echo $(FREESWITCH_ENABLED_MODULES) \ - | tr ' ' '\n' \ - > $(@D)/modules.conf -endef -FREESWITCH_PRE_CONFIGURE_HOOKS += FREESWITCH_ENABLE_MODULES - -# mod_isac supports a limited set of archs -# src/mod/codecs/mod_isac/typedefs.h -ifeq ($(BR2_i386)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_x86_64),y) -FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (mod_isac) -FREESWITCH_LICENSE_FILES += src/mod/codecs/mod_isac/LICENSE -FREESWITCH_ENABLED_MODULES += codecs/mod_isac -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -FREESWITCH_DEPENDENCIES += alsa-lib -FREESWITCH_ENABLED_MODULES += endpoints/mod_alsa -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -FREESWITCH_DEPENDENCIES += freetype -endif - -ifeq ($(BR2_PACKAGE_LIBBROADVOICE),y) -FREESWITCH_DEPENDENCIES += libbroadvoice -FREESWITCH_ENABLED_MODULES += codecs/mod_bv -endif - -ifeq ($(BR2_PACKAGE_LIBCODEC2),y) -FREESWITCH_DEPENDENCIES += libcodec2 -FREESWITCH_ENABLED_MODULES += codecs/mod_codec2 -endif - -ifeq ($(BR2_PACKAGE_LIBEDIT),y) -FREESWITCH_DEPENDENCIES += libedit -FREESWITCH_CONF_OPTS += --enable-core-libedit-support -else -FREESWITCH_CONF_OPTS += --disable-core-libedit-support -endif - -ifeq ($(BR2_PACKAGE_LIBG7221),y) -FREESWITCH_DEPENDENCIES += libg7221 -endif - -ifeq ($(BR2_PACKAGE_LIBILBC),y) -FREESWITCH_DEPENDENCIES += libilbc -FREESWITCH_ENABLED_MODULES += codecs/mod_ilbc -endif - -ifeq ($(BR2_PACKAGE_LIBLDNS),y) -FREESWITCH_DEPENDENCIES += libldns -FREESWITCH_ENABLED_MODULES += applications/mod_enum -endif - -ifeq ($(BR2_PACKAGE_LIBMEMCACHED),y) -FREESWITCH_DEPENDENCIES += libmemcached -FREESWITCH_ENABLED_MODULES += applications/mod_memcache -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -FREESWITCH_DEPENDENCIES += libpng -FREESWITCH_ENABLED_MODULES += formats/mod_png -endif - -ifeq ($(BR2_PACKAGE_LIBYAML),y) -FREESWITCH_DEPENDENCIES += libyaml -FREESWITCH_ENABLED_MODULES += languages/mod_yaml -endif - -ifeq ($(BR2_PACKAGE_LUA),y) -FREESWITCH_DEPENDENCIES += lua -FREESWITCH_ENABLED_MODULES += languages/mod_lua -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -FREESWITCH_DEPENDENCIES += openldap -FREESWITCH_ENABLED_MODULES += directories/mod_ldap xml_int/mod_xml_ldap -endif - -ifeq ($(BR2_PACKAGE_OPUS),y) -FREESWITCH_DEPENDENCIES += opus -FREESWITCH_ENABLED_MODULES += codecs/mod_opus -endif - -ifeq ($(BR2_PACKAGE_PORTAUDIO),y) -FREESWITCH_DEPENDENCIES += portaudio -FREESWITCH_ENABLED_MODULES += endpoints/mod_portaudio -endif - -ifeq ($(BR2_PACKAGE_LAME)$(BR2_PACKAGE_LIBSHOUT)$(BR2_PACKAGE_MPG123),yyy) -FREESWITCH_DEPENDENCIES += lame libshout mpg123 -FREESWITCH_ENABLED_MODULES += formats/mod_shout -endif - -ifeq ($(BR2_PACKAGE_LIBSILK),y) -FREESWITCH_DEPENDENCIES += libsilk -FREESWITCH_ENABLED_MODULES += codecs/mod_silk -endif - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -FREESWITCH_DEPENDENCIES += libsndfile -FREESWITCH_ENABLED_MODULES += formats/mod_sndfile -endif - -ifeq ($(BR2_PACKAGE_LIBSOUNDTOUCH),y) -FREESWITCH_DEPENDENCIES += libsoundtouch -FREESWITCH_ENABLED_MODULES += applications/mod_soundtouch -endif - -ifeq ($(BR2_PACKAGE_OPENCV),y) -FREESWITCH_DEPENDENCIES += opencv -FREESWITCH_ENABLED_MODULES += applications/mod_cv -endif - -ifeq ($(BR2_PACKAGE_UNIXODBC),y) -FREESWITCH_DEPENDENCIES += unixodbc -FREESWITCH_CONF_OPTS += \ - --enable-core-odbc-support \ - --with-odbc=$(STAGING_DIR)/usr -else -FREESWITCH_CONF_OPTS += --disable-core-odbc-support -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -FREESWITCH_DEPENDENCIES += xz -endif - -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8)$(BR2_PACKAGE_FFMPEG),yy) -FREESWITCH_LICENSE := $(FREESWITCH_LICENSE), BSD-3c (libvpx, libyuv) -FREESWITCH_LICENSE_FILES += libs/libvpx/LICENSE libs/libyuv/LICENSE -FREESWITCH_CONF_OPTS += --enable-libvpx --enable-libyuv -FREESWITCH_DEPENDENCIES += host-yasm ffmpeg -FREESWITCH_ENABLED_MODULES += applications/mod_av applications/mod_fsv -FREESWITCH_MAKE_ENV += CROSS=$(TARGET_CROSS) -else -FREESWITCH_CONF_OPTS += --disable-libvpx --disable-libyuv -endif - -$(eval $(autotools-package)) diff --git a/package.bak/freetype/Config.in b/package.bak/freetype/Config.in deleted file mode 100644 index ded87388e8..0000000000 --- a/package.bak/freetype/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_FREETYPE - bool "freetype" - help - a free, high-quality and portable font engine. - - http://www.freetype.org/ diff --git a/package.bak/freetype/freetype.hash b/package.bak/freetype/freetype.hash deleted file mode 100644 index b2cec04d3b..0000000000 --- a/package.bak/freetype/freetype.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88 freetype-2.7.1.tar.bz2 diff --git a/package.bak/freetype/freetype.mk b/package.bak/freetype/freetype.mk deleted file mode 100644 index 9484758700..0000000000 --- a/package.bak/freetype/freetype.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# freetype -# -################################################################################ - -FREETYPE_VERSION = 2.7.1 -FREETYPE_SOURCE = freetype-$(FREETYPE_VERSION).tar.bz2 -FREETYPE_SITE = http://download.savannah.gnu.org/releases/freetype -FREETYPE_INSTALL_STAGING = YES -FREETYPE_MAKE_OPTS = CCexe="$(HOSTCC)" -FREETYPE_LICENSE = Dual FTL/GPLv2+ -FREETYPE_LICENSE_FILES = docs/FTL.TXT docs/GPLv2.TXT -FREETYPE_DEPENDENCIES = host-pkgconf -FREETYPE_CONFIG_SCRIPTS = freetype-config - -HOST_FREETYPE_DEPENDENCIES = host-pkgconf -HOST_FREETYPE_CONF_OPTS = --without-zlib --without-bzip2 --without-png - -# Regen required because the tarball ships with an experimental ltmain.sh -# that can't be patched by our infra. -# autogen.sh is because autotools stuff lives in other directories and -# even AUTORECONF with _OPTS doesn't do it properly. -# POST_PATCH is because we still need to patch libtool after the regen. -define FREETYPE_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN -HOST_FREETYPE_POST_PATCH_HOOKS += FREETYPE_RUN_AUTOGEN -FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool -HOST_FREETYPE_DEPENDENCIES += host-automake host-autoconf host-libtool - -ifeq ($(BR2_PACKAGE_ZLIB),y) -FREETYPE_DEPENDENCIES += zlib -FREETYPE_CONF_OPTS += --with-zlib -else -FREETYPE_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -FREETYPE_DEPENDENCIES += bzip2 -FREETYPE_CONF_OPTS += --with-bzip2 -else -FREETYPE_CONF_OPTS += --without-bzip2 -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -FREETYPE_DEPENDENCIES += libpng -FREETYPE_CONF_OPTS += LIBPNG_CFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --cflags`" \ - LIBPNG_LDFLAGS="`$(STAGING_DIR)/usr/bin/libpng-config --ldflags`" -FREETYPE_LIBPNG_LIBS = "`$(STAGING_DIR)/usr/bin/libpng-config --libs`" -else -FREETYPE_CONF_OPTS += --without-png -endif - -# Extra fixing since includedir and libdir are expanded from configure values -define FREETYPE_FIX_CONFIG_FILE - $(SED) 's:^includedir=.*:includedir="$${prefix}/include":' \ - -e 's:^libdir=.*:libdir="$${exec_prefix}/lib":' \ - $(STAGING_DIR)/usr/bin/freetype-config -endef -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE - -# libpng isn't included in freetype-config & freetype2.pc :-/ -define FREETYPE_FIX_CONFIG_FILE_LIBS - $(SED) "s,^Libs.private:,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/lib/pkgconfig/freetype2.pc - $(SED) "s,-lfreetype,& $(FREETYPE_LIBPNG_LIBS)," \ - $(STAGING_DIR)/usr/bin/freetype-config -endef -FREETYPE_POST_INSTALL_STAGING_HOOKS += FREETYPE_FIX_CONFIG_FILE_LIBS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# freetype-patch and host-freetype-patch use autogen.sh so add -# host-automake as a order-only-prerequisite because it is a phony -# target. -$(FREETYPE_TARGET_PATCH) $(HOST_FREETYPE_TARGET_PATCH): | host-automake diff --git a/package.bak/fswebcam/Config.in b/package.bak/fswebcam/Config.in deleted file mode 100644 index d268454aae..0000000000 --- a/package.bak/fswebcam/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_FSWEBCAM - bool "fswebcam" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_GD - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - help - fswebcam is a neat and simple webcam app. It captures images - from a V4L1/V4L2 compatible device or file, averages them to - reduce noise and draws a caption using the GD Graphics - Library which also handles compressing the image to PNG or - JPEG. The resulting image is saved to a file or sent to - stdio where it can be piped to something like ncftpput or - scp. - - http://www.firestorm.cx/fswebcam/ - -comment "fswebcam needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/fswebcam/fswebcam.hash b/package.bak/fswebcam/fswebcam.hash deleted file mode 100644 index 3822a27377..0000000000 --- a/package.bak/fswebcam/fswebcam.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3ee389f72a7737700d22e0c954720b1e3bbadc8a0daad6426c25489ba9dc3199 fswebcam-20140113.tar.gz diff --git a/package.bak/fswebcam/fswebcam.mk b/package.bak/fswebcam/fswebcam.mk deleted file mode 100644 index 8cb40d6930..0000000000 --- a/package.bak/fswebcam/fswebcam.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# fswebcam -# -################################################################################ - -FSWEBCAM_VERSION = 20140113 -FSWEBCAM_SITE = http://www.firestorm.cx/fswebcam/files -FSWEBCAM_LICENSE = GPLv2 -FSWEBCAM_LICENSE_FILES = LICENSE - -FSWEBCAM_DEPENDENCIES += freetype jpeg libpng gd - -$(eval $(autotools-package)) diff --git a/package.bak/ftop/0001-overflow.patch b/package.bak/ftop/0001-overflow.patch deleted file mode 100644 index a3a27c3772..0000000000 --- a/package.bak/ftop/0001-overflow.patch +++ /dev/null @@ -1,17 +0,0 @@ -Set tmp_buf and rate_buf to something ridiculously high to fix a buffer -overflow when COLUMNS is large. - JeR - -(Taken from gentoo portage) -Signed-off-by: Gustavo Zacarias - ---- a/src/ftop.c 2009-02-16 07:00:00.000000000 +0100 -+++ b/src/ftop.c 2013-09-06 14:42:41.788852952 +0200 -@@ -736,7 +736,7 @@ - { - size_t i, j, bytes, bar_total; - char more_procs_ch, more_files_ch, expanded_ch; -- char tmp_buf[80], rate_buf[80]; -+ char tmp_buf[2048], rate_buf[2048]; - char *tmp_str; - snapshot *s, *s_prev; - file_info *tmp_file; diff --git a/package.bak/ftop/Config.in b/package.bak/ftop/Config.in deleted file mode 100644 index 1f5ebbbbfa..0000000000 --- a/package.bak/ftop/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_FTOP - bool "ftop" - select BR2_PACKAGE_NCURSES - help - Ftop is to files what top is to processes. - The progress of all open files and file systems can be monitored. - - https://code.google.com/p/ftop/ diff --git a/package.bak/ftop/ftop.hash b/package.bak/ftop/ftop.hash deleted file mode 100644 index 06f2fb1f40..0000000000 --- a/package.bak/ftop/ftop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://code.google.com/p/ftop/downloads/detail?name=ftop-1.0.tar.gz&can=2&q= -sha1 a0523862dd63ed3bec14846b6e05afcfdebb15c2 ftop-1.0.tar.gz diff --git a/package.bak/ftop/ftop.mk b/package.bak/ftop/ftop.mk deleted file mode 100644 index c8d0f93b92..0000000000 --- a/package.bak/ftop/ftop.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# ftop -# -################################################################################ - -FTOP_VERSION = 1.0 -FTOP_SITE = http://ftop.googlecode.com/files -FTOP_DEPENDENCIES = ncurses -FTOP_LICENSE = GPLv3+ -FTOP_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/fwts/0001-build-do-not-use-Werror.patch b/package.bak/fwts/0001-build-do-not-use-Werror.patch deleted file mode 100644 index 5246fd62d2..0000000000 --- a/package.bak/fwts/0001-build-do-not-use-Werror.patch +++ /dev/null @@ -1,69 +0,0 @@ -From db480b9f3e3a5c6c12e9dd04e87c8dff9381b8e7 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 12 Aug 2016 23:11:56 +0200 -Subject: [PATCH] fwts: do not use -Werror - -Warnings come and go with various compiler versions, so using -Werror is -prone to cause build failures with various compiler versions, especially -newer versions that introduce new warnings. - -Remove use of -Werror. - -Signed-off-by: Erico Nunes ---- - configure.ac | 2 +- - src/Makefile.am | 2 +- - src/lib/src/Makefile.am | 2 +- - src/utilities/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index e3e7512..64034fa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1,5 +1,5 @@ - AC_INIT([fwts],[0.1],[fwts-devel@lists.ubuntu.com]) -- AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) -+ AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) - m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) - AC_CANONICAL_HOST - AC_CONFIG_MACRO_DIR([m4]) -diff --git a/src/Makefile.am b/src/Makefile.am -index bc23e8d..599765d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -14,7 +14,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` \ - -pthread `pkg-config --cflags glib-2.0 gio-2.0` \ -- -Wall -Werror -Wextra -+ -Wall -Wextra - - bin_PROGRAMS = fwts - -diff --git a/src/lib/src/Makefile.am b/src/lib/src/Makefile.am -index 1b8fd74..163c9ae 100644 ---- a/src/lib/src/Makefile.am -+++ b/src/lib/src/Makefile.am -@@ -6,7 +6,7 @@ AM_CPPFLAGS = \ - `pkg-config --silence-errors --cflags json-c` \ - `pkg-config --cflags glib-2.0 gio-2.0` \ - -DDATAROOTDIR=\"$(datarootdir)\" \ -- -Wall -Werror -Wextra -+ -Wall -Wextra - - pkglib_LTLIBRARIES = libfwts.la - -diff --git a/src/utilities/Makefile.am b/src/utilities/Makefile.am -index 9a47980..14997df 100644 ---- a/src/utilities/Makefile.am -+++ b/src/utilities/Makefile.am -@@ -1,4 +1,4 @@ --AM_CPPFLAGS = -Wall -Werror -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ -+AM_CPPFLAGS = -Wall -Wextra -DDATAROOTDIR=\"$(datarootdir)\" \ - `pkg-config --silence-errors --cflags json` \ - `pkg-config --silence-errors --cflags json-c` - --- -2.7.4 - diff --git a/package.bak/fwts/Config.in b/package.bak/fwts/Config.in deleted file mode 100644 index 37759c61cb..0000000000 --- a/package.bak/fwts/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_FWTS - bool "fwts" - depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on BR2_TOOLCHAIN_USES_GLIBC # execinfo.h - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_JSON_C - help - Firmware Test Suite (FWTS) is a test suite that performs - sanity checks on firmware. It is intended to identify BIOS and - ACPI errors and if appropriate it will try to explain the - errors and give advice to help workaround or fix firmware - bugs. - - dtc (libfdt) is an optional dependency for fdt related tests. - - https://wiki.ubuntu.com/FirmwareTestSuite - -comment "fwts needs a glibc toolchain w/ wchar, threads" - depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/fwts/fwts.hash b/package.bak/fwts/fwts.hash deleted file mode 100644 index e23386e1fd..0000000000 --- a/package.bak/fwts/fwts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://fwts.ubuntu.com/release/SHA256SUMS -sha256 077b57864515ffdd6d655201da750829f9ccffb8f280eb86d01c2ef184cdcb16 fwts-V16.11.00.tar.gz diff --git a/package.bak/fwts/fwts.mk b/package.bak/fwts/fwts.mk deleted file mode 100644 index 984e368fd9..0000000000 --- a/package.bak/fwts/fwts.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# fwts -# -################################################################################ - -FWTS_VERSION = V16.11.00 -FWTS_SITE = http://fwts.ubuntu.com/release -FWTS_STRIP_COMPONENTS = 0 -FWTS_LICENSE = GPLv2, LGPLv2.1, Custom -FWTS_LICENSE_FILES = debian/copyright -FWTS_AUTORECONF = YES -FWTS_DEPENDENCIES = host-bison host-flex host-pkgconf json-c libglib2 \ - $(if $(BR2_PACKAGE_DTC),dtc) - -$(eval $(autotools-package)) diff --git a/package.bak/fwup/Config.in b/package.bak/fwup/Config.in deleted file mode 100644 index fd40cf3261..0000000000 --- a/package.bak/fwup/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_FWUP - bool "fwup" - depends on BR2_USE_MMU - depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBARCHIVE - # required by libarchive to include zip compression - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBSODIUM - help - Fwup is a scriptable embedded Linux firmware update creator - and runner. - - https://github.com/fhunleth/fwup - -comment "fwup needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/fwup/Config.in.host b/package.bak/fwup/Config.in.host deleted file mode 100644 index 4e21c7db03..0000000000 --- a/package.bak/fwup/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_FWUP - bool "host fwup" - help - Fwup is a scriptable embedded Linux firmware update creator - and runner. - - https://github.com/fhunleth/fwup diff --git a/package.bak/fwup/fwup.hash b/package.bak/fwup/fwup.hash deleted file mode 100644 index e21eff0a6d..0000000000 --- a/package.bak/fwup/fwup.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 64c3a0ac38dc11c0c05b2588a89638cbc37f5552ac0f1c290f7ee5365f2bba49 fwup-v0.8.2.tar.gz diff --git a/package.bak/fwup/fwup.mk b/package.bak/fwup/fwup.mk deleted file mode 100644 index d87bdca96d..0000000000 --- a/package.bak/fwup/fwup.mk +++ /dev/null @@ -1,17 +0,0 @@ -############################################################# -# -# fwup -# -############################################################# - -FWUP_VERSION = v0.8.2 -FWUP_SITE = $(call github,fhunleth,fwup,$(FWUP_VERSION)) -FWUP_LICENSE = Apache-2.0 -FWUP_LICENSE_FILES = LICENSE -FWUP_DEPENDENCIES = host-pkgconf libconfuse libarchive libsodium -HOST_FWUP_DEPENDENCIES = host-pkgconf host-libconfuse host-libarchive host-libsodium -FWUP_AUTORECONF = YES -FWUP_CONF_ENV = ac_cv_path_HELP2MAN="" - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/fxload/Config.in b/package.bak/fxload/Config.in deleted file mode 100644 index ac190f043e..0000000000 --- a/package.bak/fxload/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_FXLOAD - bool "fxload" - help - This program is conveniently able to download firmware into FX, FX2, - and FX2LP EZ-USB devices, as well as the original AnchorChips EZ-USB. - It is intended to be invoked by hotplug scripts when the unprogrammed - device appears on the bus. - - http://sourceforge.net/projects/linux-hotplug/ diff --git a/package.bak/fxload/fxload.hash b/package.bak/fxload/fxload.hash deleted file mode 100644 index 7febbccf1d..0000000000 --- a/package.bak/fxload/fxload.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0cc8bfd2a7cbba2f68e0c5767477634922287943c91dd9fcf029fc8b9d577858 fxload-2008_10_13.tar.gz diff --git a/package.bak/fxload/fxload.mk b/package.bak/fxload/fxload.mk deleted file mode 100644 index b34dccd7f1..0000000000 --- a/package.bak/fxload/fxload.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# fxload -# -################################################################################ - -FXLOAD_VERSION = 2008_10_13 -FXLOAD_SITE = http://downloads.sourceforge.net/project/linux-hotplug/fxload/$(FXLOAD_VERSION) -FXLOAD_LICENSE = GPLv2+ -FXLOAD_LICENSE_FILES = COPYING - -define FXLOAD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define FXLOAD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) prefix=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/gadgetfs-test/0001-fix-usb-ch9-include.patch b/package.bak/gadgetfs-test/0001-fix-usb-ch9-include.patch deleted file mode 100644 index 3d7ce82b4f..0000000000 --- a/package.bak/gadgetfs-test/0001-fix-usb-ch9-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8cf5909c6f8e0a892155dea14a07adfad445762d Mon Sep 17 00:00:00 2001 -From: Haavard Skinnemoen -Date: Sat, 23 Jun 2007 18:34:09 +0200 -Subject: [PATCH] Include usb/ch9.h instead of usb_ch9.h - -Signed-off-by: Haavard Skinnemoen ---- - usb.c | 2 +- - usbstring.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/usb.c b/usb.c -index ea6c7de..b161154 100644 ---- a/usb.c -+++ b/usb.c -@@ -35,7 +35,7 @@ - - #include - #include --#include -+#include - - #ifdef AIO - /* this aio code works with libaio-0.3.106 */ -diff --git a/usbstring.c b/usbstring.c -index 4bf2965..993acc2 100644 ---- a/usbstring.c -+++ b/usbstring.c -@@ -11,7 +11,7 @@ - #include - - #include --#include -+#include - - #include "usbstring.h" - --- -1.5.2.2 - diff --git a/package.bak/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch b/package.bak/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch deleted file mode 100644 index ffc2da377d..0000000000 --- a/package.bak/gadgetfs-test/0002-rename-include-usb_gadgetfs-to-usb-dir.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr gadgetfs-test-orig/usb.c gadgetfs-test/usb.c ---- gadgetfs-test-orig/usb.c 2007-07-18 14:38:38.000000000 +0200 -+++ gadgetfs-test/usb.c 2007-07-18 15:33:04.000000000 +0200 -@@ -34,7 +34,7 @@ - #include - - #include --#include -+#include - #include - - #ifdef AIO diff --git a/package.bak/gadgetfs-test/Config.in b/package.bak/gadgetfs-test/Config.in deleted file mode 100644 index 9a603066e7..0000000000 --- a/package.bak/gadgetfs-test/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_GADGETFS_TEST - bool "gadgetfs-test" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Test program for gadgetfs from linux-usb.org - -if BR2_PACKAGE_GADGETFS_TEST - -config BR2_PACKAGE_GADGETFS_TEST_USE_AIO - bool "use asynchronous i/o" - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - select BR2_PACKAGE_LIBAIO - help - Select this to have gadgetfs-test do asynchronous I/O using - the libaio library. - -endif - -comment "gadgetfs-test needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gadgetfs-test/gadgetfs-test.hash b/package.bak/gadgetfs-test/gadgetfs-test.hash deleted file mode 100644 index b96190a574..0000000000 --- a/package.bak/gadgetfs-test/gadgetfs-test.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bd8ebcf7ce86f4b022a4e7ba6b1cc16ffc4022bb58c1910fe4ac96c88217e7ec gadgetfs-test.tar.bz2 diff --git a/package.bak/gadgetfs-test/gadgetfs-test.mk b/package.bak/gadgetfs-test/gadgetfs-test.mk deleted file mode 100644 index ca47738f5c..0000000000 --- a/package.bak/gadgetfs-test/gadgetfs-test.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# gadgetfs-test -# -################################################################################ - -GADGETFS_TEST_SOURCE = gadgetfs-test.tar.bz2 -GADGETFS_TEST_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/GadgetFsTest - -GADGETFS_TEST_MAKEOPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" - -ifeq ($(BR2_PACKAGE_GADGETFS_TEST_USE_AIO),y) -GADGETFS_TEST_DEPENDENCIES = libaio -GADGETFS_TEST_MAKEOPTS += USE_AIO=y -endif - -define GADGETFS_TEST_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(GADGETFS_TEST_MAKEOPTS) -endef - -define GADGETFS_TEST_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) prefix=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/gamin/0001-no-abstract-sockets.patch b/package.bak/gamin/0001-no-abstract-sockets.patch deleted file mode 100644 index 3d659015ec..0000000000 --- a/package.bak/gamin/0001-no-abstract-sockets.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH]: Remove abstract socket namespace check breaking cross compilation - -Taken from openembedded: - -http://git.openembedded.org/cgit.cgi/openembedded/tree/recipes/gamin/files/no-abstract-sockets.patch - -Signed-off-by: Peter Korsgaard ---- /tmp/configure.in 2007-04-30 13:08:49.000000000 +0200 -+++ gamin-0.1.8/configure.in 2007-04-30 13:10:53.285251000 +0200 -@@ -354,51 +354,6 @@ - AC_DEFINE(HAVE_CMSGCRED,1,[Have cmsgcred structure]) - fi - --#### Abstract sockets -- --AC_MSG_CHECKING(abstract socket namespace) --AC_LANG_PUSH(C) --AC_RUN_IFELSE([AC_LANG_PROGRAM( --[[ --#include --#include --#include --#include --#include --#include --#include --]], --[[ -- int listen_fd; -- struct sockaddr_un addr; -- -- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); -- -- if (listen_fd < 0) -- { -- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); -- exit (1); -- } -- -- memset (&addr, '\0', sizeof (addr)); -- addr.sun_family = AF_UNIX; -- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); -- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ -- -- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) -- { -- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", -- strerror (errno)); -- exit (1); -- } -- else -- exit (0); --]])], -- [have_abstract_sockets=yes], -- [have_abstract_sockets=no]) --AC_LANG_POP(C) --AC_MSG_RESULT($have_abstract_sockets) -- - if test x$enable_abstract_sockets = xyes; then - if test x$have_abstract_sockets = xno; then - AC_MSG_ERROR([Abstract sockets explicitly required, and support not detected.]) diff --git a/package.bak/gamin/0002-no-const-return.patch b/package.bak/gamin/0002-no-const-return.patch deleted file mode 100644 index 3e6e905214..0000000000 --- a/package.bak/gamin/0002-no-const-return.patch +++ /dev/null @@ -1,57 +0,0 @@ -G_CONST_RETURN is deprecated in glib 2.30 so remove to to avoid -build failures. - -Upstream-Status: Pending - -Index: gamin-0.1.10/server/gam_node.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.c 2011-10-12 15:25:45.217178314 +0100 -+++ gamin-0.1.10/server/gam_node.c 2011-10-12 15:26:17.807178293 +0100 -@@ -122,7 +122,7 @@ - * it has finished with the string. If it must keep it longer, it - * should makes its own copy. The returned string must not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_node_get_path(GamNode * node) - { - g_assert(node); -Index: gamin-0.1.10/server/gam_node.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_node.h 2011-10-12 15:25:46.857178269 +0100 -+++ gamin-0.1.10/server/gam_node.h 2011-10-12 15:26:28.637178297 +0100 -@@ -58,7 +58,7 @@ - void gam_node_set_is_dir (GamNode *node, - gboolean is_dir); - --G_CONST_RETURN char *gam_node_get_path (GamNode *node); -+const char *gam_node_get_path (GamNode *node); - - GList *gam_node_get_subscriptions (GamNode *node); - -Index: gamin-0.1.10/server/gam_subscription.c -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.c 2011-10-12 15:25:40.497177525 +0100 -+++ gamin-0.1.10/server/gam_subscription.c 2011-10-12 15:26:39.867178304 +0100 -@@ -141,7 +141,7 @@ - * @param sub the GamSubscription - * @returns The path being monitored. It should not be freed. - */ --G_CONST_RETURN char * -+const char * - gam_subscription_get_path(GamSubscription * sub) - { - if (sub == NULL) -Index: gamin-0.1.10/server/gam_subscription.h -=================================================================== ---- gamin-0.1.10.orig/server/gam_subscription.h 2011-10-12 15:25:28.507178266 +0100 -+++ gamin-0.1.10/server/gam_subscription.h 2011-10-12 15:25:58.817178285 +0100 -@@ -21,7 +21,7 @@ - - int gam_subscription_get_reqno (GamSubscription *sub); - --G_CONST_RETURN char *gam_subscription_get_path (GamSubscription *sub); -+const char *gam_subscription_get_path (GamSubscription *sub); - - GamListener *gam_subscription_get_listener (GamSubscription *sub); - diff --git a/package.bak/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch b/package.bak/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch deleted file mode 100644 index b5f2e6c521..0000000000 --- a/package.bak/gamin/0003-fix-missing-PTHREAD_MUTEX_RECURSIVE_NP.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix missing PTHREAD_MUTEX_RECURSIVE_NP - -The musl C library does not provide the non portable -PTHREAD_MUTEX_RECURSIVE_NP. In addition, uClibc does not define it as -a #define, but as an enum value, so doing a #if defined() check -doesn't work properly. Instead, add a AC_CHECK_DECL() autoconf check. - -Signed-off-by: Baruch Siach -[Thomas: switch to an autoconf check.] -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -294,6 +294,10 @@ - AC_DEFINE([HAVE_LIBPTHREAD], [], [Define if pthread library is there (-lpthread)]) - AC_DEFINE([HAVE_PTHREAD_H], [], [Define if is there]) - WITH_THREADS="1"])) -+ -+ AC_CHECK_DECL([PTHREAD_MUTEX_RECURSIVE_NP], -+ [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE_NP], [], [whether HAVE_PTHREAD_MUTEX_RECURSIVE_NP is defined])], -+ [], [#include ]) - fi - - dnl Use weak symbols on linux/gcc to avoid imposing libpthreads to apps -Index: b/libgamin/gam_data.c -=================================================================== ---- a/libgamin/gam_data.c -+++ b/libgamin/gam_data.c -@@ -470,7 +470,7 @@ - } - if (is_threaded > 0) { - pthread_mutexattr_init(&attr); --#if defined(linux) || defined(PTHREAD_MUTEX_RECURSIVE_NP) -+#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE_NP) - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - #else - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); diff --git a/package.bak/gamin/Config.in b/package.bak/gamin/Config.in deleted file mode 100644 index 55e037a4a4..0000000000 --- a/package.bak/gamin/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_GAMIN - bool "gamin" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - the File Alteration Monitor - - http://www.gnome.org/~veillard/gamin/sources - -comment "gamin needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gamin/gamin.hash b/package.bak/gamin/gamin.hash deleted file mode 100644 index 0a43706193..0000000000 --- a/package.bak/gamin/gamin.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 28085f0ae8be10eab582ff186af4fb0be92cc6c62b5cc19cd09b295c7c2899a1 gamin-0.1.10.tar.gz diff --git a/package.bak/gamin/gamin.mk b/package.bak/gamin/gamin.mk deleted file mode 100644 index d908b90dcd..0000000000 --- a/package.bak/gamin/gamin.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# gamin -# -################################################################################ - -GAMIN_VERSION = 0.1.10 -GAMIN_SITE = http://www.gnome.org/~veillard/gamin/sources -GAMIN_AUTORECONF = YES -GAMIN_INSTALL_STAGING = YES -GAMIN_LICENSE = LGPLv2+ -GAMIN_LICENSE_FILES = COPYING - -# python support broken -GAMIN_CONF_OPTS += --without-python - -GAMIN_CONF_ENV = have_abstract_sockets=no - -GAMIN_DEPENDENCIES = libglib2 - -$(eval $(autotools-package)) diff --git a/package.bak/gauche/0001-fix-so-suffix.patch b/package.bak/gauche/0001-fix-so-suffix.patch deleted file mode 100644 index b65e269981..0000000000 --- a/package.bak/gauche/0001-fix-so-suffix.patch +++ /dev/null @@ -1,31 +0,0 @@ -With uclibc or musl configuration, $host does not match to '*-linux-gnu*'. -I touch configure directly instead of configure.ac because autoreconf -failed by version mismatch of autotools. - -Signed-off-by: Hiroshi Kawashima - -diff -ur a/configure b/configure ---- a/configure 2014-07-20 15:15:05.000000000 +0900 -+++ b/configure 2015-10-20 21:52:32.791442291 +0900 -@@ -6843,7 +6843,7 @@ - SHLIB_MAIN_LDFLAGS="" - SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) - SHLIB_SO_CFLAGS="-fPIC" - SHLIB_SO_LDFLAGS="$rpath -shared -o" - SHLIB_SO_SUFFIX="so" - -diff -ur a/configure.ac b/configure.ac ---- a/configure.ac 2015-10-21 21:33:17.370000200 +0900 -+++ b/configure.ac 2015-10-21 21:33:39.784110527 +0900 -@@ -572,7 +572,7 @@ - SHLIB_MAIN_LDFLAGS="" - SHLIB_OK=ok - ;; -- *-linux-gnu*|*-*-gnu*|*freebsd*|*dragonfly*) -+ *-linux-*|*-*-gnu*|*freebsd*|*dragonfly*) - SHLIB_SO_CFLAGS="-fPIC" - SHLIB_SO_LDFLAGS="$rpath -shared -o" - SHLIB_SO_SUFFIX="so" diff --git a/package.bak/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch b/package.bak/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch deleted file mode 100644 index 6cc065693f..0000000000 --- a/package.bak/gauche/0002-gc-configure.ac-add-check-for-NO_GETCONTEXT-definition.patch +++ /dev/null @@ -1,62 +0,0 @@ -gc/configure.ac: add check for NO_GETCONTEXT definition - -This patch is ported from bdwgc package. Since Gauche uses an internal -copy of the boehm gc code, it is affected by the same problem. - -Both configure and configure.ac are modified because autoreconf fails -due to an incompatibility with the version of the autotools used by -Buildroot. - -Signed-off-by: Hiroshi Kawashima - -Original credits of patch in bdwgc package: -Signed-off-by: Samuel Martin -[yann.morin.1998@free.fr: add a comment, change variable name, use - AS_IF, remove debug traces, use AC_CHECK_FUNCS (as suggested by - Thomas)] -Signed-off-by: "Yann E. MORIN" -Cc: Thomas Petazzoni - -diff -ur a/gc/configure b/gc/configure ---- a/gc/configure 2015-11-12 21:41:02.394822056 +0900 -+++ b/gc/configure 2015-11-12 22:04:14.655157423 +0900 -@@ -16153,6 +16153,23 @@ - $as_echo "$ac_cv_fno_strict_aliasing" >&6; } - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+for ac_func in getcontext -+do : -+ ac_fn_c_check_func "$LINENO" "getcontext" "ac_cv_func_getcontext" -+if test "x$ac_cv_func_getcontext" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_GETCONTEXT 1 -+_ACEOF -+ -+fi -+done -+ -+if test "$ac_cv_func_getcontext" = "no"; then : -+ CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT" -+fi -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. -diff -ur a/gc/configure.ac b/gc/configure.ac ---- a/gc/configure.ac 2015-11-12 22:31:44.851510997 +0900 -+++ b/gc/configure.ac 2015-11-12 22:33:39.292191227 +0900 -@@ -459,6 +459,12 @@ - AC_MSG_RESULT($ac_cv_fno_strict_aliasing) - fi - -+# Check for getcontext (uClibc can be configured without it, for example) -+AC_CHECK_FUNCS([getcontext]) -+AS_IF([test "$ac_cv_func_getcontext" = "no"], -+ [CFLAGS="$CFLAGS -DNO_GETCONTEXT" -+ CPPFLAGS="$CPPFLAGS -DNO_GETCONTEXT"]) -+ - case "$host" in - # While IRIX 6 has libdl for the O32 and N32 ABIs, it's missing for N64 - # and unnecessary everywhere. diff --git a/package.bak/gauche/Config.in b/package.bak/gauche/Config.in deleted file mode 100644 index c5f2a51948..0000000000 --- a/package.bak/gauche/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -# Architecture dependency from the bundled bdwgc. -config BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_m68k || \ - BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sh || BR2_x86_64 - -config BR2_PACKAGE_GAUCHE - bool "gauche" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS - help - Gauche is an R7RS Scheme implementation developed to be a - handy script interpreter, which allows programmers and - system administrators to write small to large scripts for - their daily chores. Quick startup, built-in system - interface, native multilingual support are some of its - goals. - - http://practical-scheme.net/gauche/ - -comment "gauche needs a toolchain w/ NPTL, dynamic library" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_GAUCHE_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS diff --git a/package.bak/gauche/gauche.hash b/package.bak/gauche/gauche.hash deleted file mode 100644 index 975e958a08..0000000000 --- a/package.bak/gauche/gauche.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 7b18bcd70beaced1e004594be46c8cff95795318f6f5830dd2a8a700410fc149 Gauche-0.9.4.tgz -sha256 0ff5986540d8ad89eee595de766810f09e489a6a3363b47a65ce7ad18701ee01 13a196557848f22a1607a300643131345e9f32b3.patch diff --git a/package.bak/gauche/gauche.mk b/package.bak/gauche/gauche.mk deleted file mode 100644 index 85fcc71848..0000000000 --- a/package.bak/gauche/gauche.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# gauche -# -################################################################################ - -GAUCHE_VERSION = 0.9.4 -GAUCHE_SOURCE = Gauche-$(GAUCHE_VERSION).tgz -GAUCHE_SITE = http://downloads.sourceforge.net/project/gauche/Gauche -GAUCHE_LICENSE = BSD-3c, Boehm-gc, SRFI (srfi-11.scm), reload (reload.scm) -GAUCHE_LICENSE_FILES = COPYING -GAUCHE_DEPENDENCIES = host-gauche -GAUCHE_PATCH = https://github.com/shirok/Gauche/commit/13a196557848f22a1607a300643131345e9f32b3.patch - -HOST_GAUCHE_CONF_OPTS = --without-zlib -GAUCHE_CONF_OPTS = --without-libatomic-ops - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GAUCHE_CONF_OPTS += --with-zlib=$(STAGING_DIR) -GAUCHE_DEPENDENCIES += zlib -else -GAUCHE_CONF_OPTS += --without-zlib -endif - -# Detection of c99 support in configure fails without WCHAR. To enable -# automatic detection of c99 support by configure, we need to enable -# WCHAR in toolchain. But actually we do not need WCHAR at gauche -# runtime. So reuesting WCHAR in toolchain just for automatic detection -# will be overkill. To solve this, explicitly -std=gnu99 is specified -# here. -GAUCHE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" - -$(eval $(host-autotools-package)) -$(eval $(autotools-package)) diff --git a/package.bak/gawk/0001-no-versioned.patch b/package.bak/gawk/0001-no-versioned.patch deleted file mode 100644 index 0c35088e86..0000000000 --- a/package.bak/gawk/0001-no-versioned.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disabled versioned installation of binaries to save space. -Also use symlinks where it's appropiate. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for 4.1.2] - -diff -Nura gawk-4.1.2.orig/Makefile.in gawk-4.1.2/Makefile.in ---- gawk-4.1.2.orig/Makefile.in 2015-04-29 16:11:09.367925925 -0300 -+++ gawk-4.1.2/Makefile.in 2015-04-29 16:11:25.308466495 -0300 -@@ -554,7 +554,7 @@ - CLEANFILES = core core.* - - # We want hard links for install-exec-hook, below --LN = ln -+LN = $(LN_S) - - # For some make's, e.g. OpenBSD, that don't define this - RM = rm -f -@@ -1173,6 +1173,7 @@ - # (This is done universally, which may not always be right, but - # there's no easy way to distinguish GNU from non-GNU systems.) - install-exec-hook: -+foo: - (cd $(DESTDIR)$(bindir); \ - $(LN) gawk$(EXEEXT) gawk-$(VERSION)$(EXEEXT) 2>/dev/null ; \ - if [ ! -f awk$(EXEEXT) ]; \ diff --git a/package.bak/gawk/Config.in b/package.bak/gawk/Config.in deleted file mode 100644 index 36e70eb7ad..0000000000 --- a/package.bak/gawk/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_GAWK - bool "gawk" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - A special-purpose programming language which is data driven - rather than procedural. Allows for simple data-reformatting jobs - with just a few lines of code. - - http://www.gnu.org/software/gawk/ - -comment "gawk needs a toolchain w/ wchar, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/gawk/gawk.hash b/package.bak/gawk/gawk.hash deleted file mode 100644 index e2c7806cc5..0000000000 --- a/package.bak/gawk/gawk.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 53e184e2d0f90def9207860531802456322be091c7b48f23fdc79cda65adc266 gawk-4.1.4.tar.xz diff --git a/package.bak/gawk/gawk.mk b/package.bak/gawk/gawk.mk deleted file mode 100644 index 7c6689b30c..0000000000 --- a/package.bak/gawk/gawk.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# gawk -# -################################################################################ - -GAWK_VERSION = 4.1.4 -GAWK_SOURCE = gawk-$(GAWK_VERSION).tar.xz -GAWK_SITE = $(BR2_GNU_MIRROR)/gawk -GAWK_DEPENDENCIES = host-gawk -GAWK_LICENSE = GPLv3+ -GAWK_LICENSE_FILES = COPYING - -# Prefer full-blown gawk over busybox awk -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -GAWK_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_LIBSIGSEGV),y) -GAWK_DEPENDENCIES += libsigsegv -endif - -# --with-mpfr requires an argument so just let -# configure find it automatically -ifeq ($(BR2_PACKAGE_MPFR),y) -GAWK_DEPENDENCIES += mpfr -else -GAWK_CONF_OPTS += --without-mpfr -endif - -# --with-readline requires an argument so just let -# configure find it automatically -ifeq ($(BR2_PACKAGE_READLINE),y) -GAWK_DEPENDENCIES += readline -else -GAWK_CONF_OPTS += --without-readline -endif - -HOST_GAWK_CONF_OPTS = --without-readline --without-mpfr - -define GAWK_CREATE_SYMLINK - ln -sf /usr/bin/gawk $(TARGET_DIR)/usr/bin/awk -endef - -GAWK_POST_INSTALL_TARGET_HOOKS += GAWK_CREATE_SYMLINK - -# Assume we support shared libs -# The check isn't cross-compile friendly and it's mandatory anyway -define GAWK_DISABLE_SHARED_CHECK - $(SED) 's/ check-for-shared-lib-support//' $(@D)/extension/Makefile.in -endef - -GAWK_POST_PATCH_HOOKS += GAWK_DISABLE_SHARED_CHECK - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package.bak/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch deleted file mode 100644 index d8c6723ed3..0000000000 --- a/package.bak/gcc/4.8.5/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From edb9057c195c41dd7bcd8603e5fd420359edd520 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Mon, 23 Nov 2015 15:17:55 +0000 -Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for - printing fatal error - -libgcc/ - PR target/68059 - * config/arm/linux-atomic-64bit.c (__write): Rename to... - (write): ...this and fix the return type. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c -index 7aa8dfc..570b4ce 100644 ---- a/libgcc/config/arm/linux-atomic-64bit.c -+++ b/libgcc/config/arm/linux-atomic-64bit.c -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - kernels; we check for that in an init section and bail out rather - unceremoneously. */ - --extern unsigned int __write (int fd, const void *buf, unsigned int count); -+extern int write (int fd, const void *buf, unsigned int count); - extern void abort (void); - - /* Kernel helper for compare-and-exchange. */ -@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) - for the user - I'm not sure I can rely on much else being - available at this point, so do the same as generic-morestack.c - write () and abort (). */ -- __write (2 /* stderr. */, err, sizeof (err)); -+ write (2 /* stderr. */, err, sizeof (err)); - abort (); - } - }; --- -2.10.2 - diff --git a/package.bak/gcc/4.8.5/100-uclibc-conf.patch b/package.bak/gcc/4.8.5/100-uclibc-conf.patch deleted file mode 100644 index d56bf0a194..0000000000 --- a/package.bak/gcc/4.8.5/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gcc-4.8.0/contrib/regression/objs-gcc.sh -=================================================================== ---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package.bak/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional b/package.bak/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index b7094fe652..0000000000 --- a/package.bak/gcc/4.8.5/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,122 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - ---- - libgcc/Makefile.in | 4 +++- - libgcc/configure | 32 ++++++++++++++++++++++++++++++++ - libgcc/configure.ac | 21 +++++++++++++++++++++ - 3 files changed, 56 insertions(+), 1 deletion(-) - -Index: gcc-4.8.0/libgcc/Makefile.in -=================================================================== ---- gcc-4.8.0.orig/libgcc/Makefile.in 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.0/libgcc/Makefile.in 2013-03-24 09:12:43.000000000 +0100 -@@ -41,6 +41,7 @@ - decimal_float = @decimal_float@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -927,9 +928,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -Index: gcc-4.8.0/libgcc/configure -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure 2012-11-05 00:08:42.000000000 +0100 -+++ gcc-4.8.0/libgcc/configure 2013-03-24 09:12:43.000000000 +0100 -@@ -564,6 +564,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4481,6 +4482,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -Index: gcc-4.8.0/libgcc/configure.ac -=================================================================== ---- gcc-4.8.0.orig/libgcc/configure.ac 2012-10-15 15:10:30.000000000 +0200 -+++ gcc-4.8.0/libgcc/configure.ac 2013-03-24 09:12:43.000000000 +0100 -@@ -326,6 +326,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/package.bak/gcc/4.8.5/111-pr65730.patch b/package.bak/gcc/4.8.5/111-pr65730.patch deleted file mode 100644 index f195e308da..0000000000 --- a/package.bak/gcc/4.8.5/111-pr65730.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 Apr 2015 17:46:30 +0300 -Subject: [PATCH] Fix PR target/65730 - -2015-05-20 Max Filippov -gcc/ - * config/xtensa/xtensa.c (init_alignment_context): Replace MULT - by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT). - -Signed-off-by: Max Filippov ---- -Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452 -Changes to ChangeLog are dropped. - - gcc/config/xtensa/xtensa.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..7296e36 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -1461,8 +1461,9 @@ init_alignment_context (struct alignment_context *ac, rtx mem) - if (ac->shift != NULL_RTX) - { - /* Shift is the byte count, but we need the bitcount. */ -- ac->shift = expand_simple_binop (SImode, MULT, ac->shift, -- GEN_INT (BITS_PER_UNIT), -+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0); -+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift, -+ GEN_INT (exact_log2 (BITS_PER_UNIT)), - NULL_RTX, 1, OPTAB_DIRECT); - ac->modemask = expand_simple_binop (SImode, ASHIFT, - GEN_INT (GET_MODE_MASK (mode)), --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/package.bak/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index c11ad35aac..0000000000 --- a/package.bak/gcc/4.8.5/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 4a7cbd2..9cc765e 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -439,7 +439,7 @@ powerpc*-*-*) - cpu_type=rs6000 - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac --- -2.6.2 - diff --git a/package.bak/gcc/4.8.5/130-fix_build_with_gcc-6.patch b/package.bak/gcc/4.8.5/130-fix_build_with_gcc-6.patch deleted file mode 100644 index 62ac3cbd65..0000000000 --- a/package.bak/gcc/4.8.5/130-fix_build_with_gcc-6.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 1e5f1089dec3af328fd03125d6778f666d0bd4e4 Mon Sep 17 00:00:00 2001 -From: edlinger -Date: Thu, 25 Feb 2016 15:33:50 +0000 -Subject: [PATCH 1/1] 2016-02-25 Bernd Edlinger - - Backported from mainline - 2016-02-19 Jakub Jelinek - Bernd Edlinger - - * Make-lang.in: Invoke gperf with -L C++. - * cfns.gperf: Remove prototypes for hash and libc_name_p - inlines. - * cfns.h: Regenerated. - * except.c (nothrow_libfn_p): Adjust. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@233720 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Samuel Martin ---- - gcc/cp/Make-lang.in | 2 +- - gcc/cp/cfns.gperf | 10 ++-------- - gcc/cp/cfns.h | 41 ++++++++++++++--------------------------- - gcc/cp/except.c | 3 ++- - 5 files changed, 31 insertions(+), 37 deletions(-) - -diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in -index e98beb1..b09fb02 100644 ---- a/gcc/cp/Make-lang.in -+++ b/gcc/cp/Make-lang.in -@@ -111,7 +111,7 @@ else - # deleting the $(srcdir)/cp/cfns.h file. - $(srcdir)/cp/cfns.h: - endif -- gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L ANSI-C \ -+ gperf -o -C -E -k '1-6,$$' -j1 -D -N 'libc_name_p' -L C++ \ - $(srcdir)/cp/cfns.gperf --output-file $(srcdir)/cp/cfns.h - - # -diff --git a/gcc/cp/cfns.gperf b/gcc/cp/cfns.gperf -index 68acd3d..214ecf6 100644 ---- a/gcc/cp/cfns.gperf -+++ b/gcc/cp/cfns.gperf -@@ -1,3 +1,5 @@ -+%language=C++ -+%define class-name libc_name - %{ - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -16,14 +18,6 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - %} - %% - # The standard C library functions, for feeding to gperf; the result is used -diff --git a/gcc/cp/cfns.h b/gcc/cp/cfns.h -index 1c6665d..596f413 100644 ---- a/gcc/cp/cfns.h -+++ b/gcc/cp/cfns.h -@@ -1,5 +1,5 @@ --/* ANSI-C code produced by gperf version 3.0.3 */ --/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L ANSI-C cfns.gperf */ -+/* C++ code produced by gperf version 3.0.4 */ -+/* Command-line: gperf -o -C -E -k '1-6,$' -j1 -D -N libc_name_p -L C++ --output-file cfns.h cfns.gperf */ - - #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ - && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \ -@@ -28,7 +28,7 @@ - #error "gperf generated tables don't work with this execution character set. Please report a bug to ." - #endif - --#line 1 "cfns.gperf" -+#line 3 "cfns.gperf" - - /* Copyright (C) 2000-2015 Free Software Foundation, Inc. - -@@ -47,25 +47,18 @@ for more details. - You should have received a copy of the GNU General Public License - along with GCC; see the file COPYING3. If not see - . */ --#ifdef __GNUC__ --__inline --#endif --static unsigned int hash (const char *, unsigned int); --#ifdef __GNUC__ --__inline --#endif --const char * libc_name_p (const char *, unsigned int); - /* maximum key range = 391, duplicates = 0 */ - --#ifdef __GNUC__ --__inline --#else --#ifdef __cplusplus --inline --#endif --#endif --static unsigned int --hash (register const char *str, register unsigned int len) -+class libc_name -+{ -+private: -+ static inline unsigned int hash (const char *str, unsigned int len); -+public: -+ static const char *libc_name_p (const char *str, unsigned int len); -+}; -+ -+inline unsigned int -+libc_name::hash (register const char *str, register unsigned int len) - { - static const unsigned short asso_values[] = - { -@@ -122,14 +115,8 @@ hash (register const char *str, register unsigned int len) - return hval + asso_values[(unsigned char)str[len - 1]]; - } - --#ifdef __GNUC__ --__inline --#ifdef __GNUC_STDC_INLINE__ --__attribute__ ((__gnu_inline__)) --#endif --#endif - const char * --libc_name_p (register const char *str, register unsigned int len) -+libc_name::libc_name_p (register const char *str, register unsigned int len) - { - enum - { -diff --git a/gcc/cp/except.c b/gcc/cp/except.c -index 3ff1ce6..2f2e396 100644 ---- a/gcc/cp/except.c -+++ b/gcc/cp/except.c -@@ -1040,7 +1040,8 @@ nothrow_libfn_p (const_tree fn) - unless the system headers are playing rename tricks, and if - they are, we don't want to be confused by them. */ - id = DECL_NAME (fn); -- return !!libc_name_p (IDENTIFIER_POINTER (id), IDENTIFIER_LENGTH (id)); -+ return !!libc_name::libc_name_p (IDENTIFIER_POINTER (id), -+ IDENTIFIER_LENGTH (id)); - } - - /* Returns nonzero if an exception of type FROM will be caught by a --- -1.7.1 diff --git a/package.bak/gcc/4.8.5/130-pr43538.patch b/package.bak/gcc/4.8.5/130-pr43538.patch deleted file mode 100644 index 19e57bb059..0000000000 --- a/package.bak/gcc/4.8.5/130-pr43538.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001 -From: glisse -Date: Fri, 25 Apr 2014 08:03:08 +0000 -Subject: [PATCH] 2014-04-25 Marc Glisse - - PR target/43538 - * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Max Filippov ---- - config/mt-gnu | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mt-gnu b/config/mt-gnu -index 15bf417..5c696f5 100644 ---- a/config/mt-gnu -+++ b/config/mt-gnu -@@ -1 +1 @@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE -+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE --- -2.1.4 - diff --git a/package.bak/gcc/4.8.5/301-missing-execinfo_h.patch b/package.bak/gcc/4.8.5/301-missing-execinfo_h.patch deleted file mode 100644 index 00efda24aa..0000000000 --- a/package.bak/gcc/4.8.5/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/boehm-gc/include/gc.h -=================================================================== ---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 -+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/4.8.5/305-libmudflap-susv3-legacy.patch b/package.bak/gcc/4.8.5/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 35d5f50207..0000000000 --- a/package.bak/gcc/4.8.5/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.8.0/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.8.0.orig/libmudflap/mf-hooks2.c 2013-02-03 18:48:05.000000000 +0100 -+++ gcc-4.8.0/libmudflap/mf-hooks2.c 2013-03-23 17:39:43.000000000 +0100 -@@ -424,7 +424,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -434,7 +434,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -444,7 +444,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -453,7 +453,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -462,7 +462,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/package.bak/gcc/4.8.5/810-arm-softfloat-libgcc.patch b/package.bak/gcc/4.8.5/810-arm-softfloat-libgcc.patch deleted file mode 100644 index c8cb377d55..0000000000 --- a/package.bak/gcc/4.8.5/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: gcc-4.8.0/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.8.0.orig/gcc/config/arm/linux-elf.h 2013-01-10 21:38:27.000000000 +0100 -+++ gcc-4.8.0/gcc/config/arm/linux-elf.h 2013-03-23 17:40:00.000000000 +0100 -@@ -55,7 +55,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: gcc-4.8.0/libgcc/config/arm/t-linux -=================================================================== ---- gcc-4.8.0.orig/libgcc/config/arm/t-linux 2012-03-22 16:14:46.000000000 +0100 -+++ gcc-4.8.0/libgcc/config/arm/t-linux 2013-03-23 17:40:54.000000000 +0100 -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package.bak/gcc/4.8.5/830-arm_unbreak_armv4t.patch b/package.bak/gcc/4.8.5/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54d..0000000000 --- a/package.bak/gcc/4.8.5/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package.bak/gcc/4.8.5/841-PR57717-E500v2.patch b/package.bak/gcc/4.8.5/841-PR57717-E500v2.patch deleted file mode 100644 index a011e24112..0000000000 --- a/package.bak/gcc/4.8.5/841-PR57717-E500v2.patch +++ /dev/null @@ -1,23 +0,0 @@ -This backports fix from http://gcc.gnu.org/bugzilla/show_bug.cgi?id=57717 - -Upstream-Status: Backport -Signed-off-by: Julian Brown -[Gustavo: Update for gcc 4.8.3] - -fix for PR57717 (PowerPC E500v2) -http://gcc.gnu.org/ml/gcc-patches/2013-08/msg00668.html - -diff -Nura gcc-4.8.3/gcc/config/rs6000/rs6000.c gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c ---- gcc-4.8.3/gcc/config/rs6000/rs6000.c 2014-05-04 23:18:35.000000000 -0300 -+++ gcc-4.8.3-pr57717/gcc/config/rs6000/rs6000.c 2014-05-22 15:20:12.554270919 -0300 -@@ -7343,9 +7343,7 @@ - && GET_CODE (XEXP (x, 1)) == CONST_INT - && reg_offset_p - && !SPE_VECTOR_MODE (mode) -- && !(TARGET_E500_DOUBLE && (mode == DFmode || mode == TFmode -- || mode == DDmode || mode == TDmode -- || mode == DImode)) -+ && !(TARGET_E500_DOUBLE && GET_MODE_SIZE (mode) > UNITS_PER_WORD) - && (!VECTOR_MODE_P (mode) || VECTOR_MEM_NONE_P (mode))) - { - HOST_WIDE_INT val = INTVAL (XEXP (x, 1)); diff --git a/package.bak/gcc/4.8.5/842-PR60155.patch b/package.bak/gcc/4.8.5/842-PR60155.patch deleted file mode 100644 index 7bc2122fd4..0000000000 --- a/package.bak/gcc/4.8.5/842-PR60155.patch +++ /dev/null @@ -1,111 +0,0 @@ -From gcc bugzilla https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60155 -Upstream status: in trunk. - -Signed-off-by: Gustavo Zacarias - ---- trunk/gcc/gcse.c 2014/02/12 14:50:06 207726 -+++ trunk/gcc/gcse.c 2014/04/04 22:25:51 209134 -@@ -2502,6 +2502,65 @@ - } - } - -+struct set_data -+{ -+ rtx insn; -+ const_rtx set; -+ int nsets; -+}; -+ -+/* Increment number of sets and record set in DATA. */ -+ -+static void -+record_set_data (rtx dest, const_rtx set, void *data) -+{ -+ struct set_data *s = (struct set_data *)data; -+ -+ if (GET_CODE (set) == SET) -+ { -+ /* We allow insns having multiple sets, where all but one are -+ dead as single set insns. In the common case only a single -+ set is present, so we want to avoid checking for REG_UNUSED -+ notes unless necessary. */ -+ if (s->nsets == 1 -+ && find_reg_note (s->insn, REG_UNUSED, SET_DEST (s->set)) -+ && !side_effects_p (s->set)) -+ s->nsets = 0; -+ -+ if (!s->nsets) -+ { -+ /* Record this set. */ -+ s->nsets += 1; -+ s->set = set; -+ } -+ else if (!find_reg_note (s->insn, REG_UNUSED, dest) -+ || side_effects_p (set)) -+ s->nsets += 1; -+ } -+} -+ -+static const_rtx -+single_set_gcse (rtx insn) -+{ -+ struct set_data s; -+ rtx pattern; -+ -+ gcc_assert (INSN_P (insn)); -+ -+ /* Optimize common case. */ -+ pattern = PATTERN (insn); -+ if (GET_CODE (pattern) == SET) -+ return pattern; -+ -+ s.insn = insn; -+ s.nsets = 0; -+ note_stores (pattern, record_set_data, &s); -+ -+ /* Considered invariant insns have exactly one set. */ -+ gcc_assert (s.nsets == 1); -+ return s.set; -+} -+ - /* Emit move from SRC to DEST noting the equivalence with expression computed - in INSN. */ - -@@ -2509,7 +2568,8 @@ - gcse_emit_move_after (rtx dest, rtx src, rtx insn) - { - rtx new_rtx; -- rtx set = single_set (insn), set2; -+ const_rtx set = single_set_gcse (insn); -+ rtx set2; - rtx note; - rtx eqv = NULL_RTX; - -@@ -3369,13 +3429,12 @@ - FOR_EACH_VEC_ELT (occrs_to_hoist, j, occr) - { - rtx insn; -- rtx set; -+ const_rtx set; - - gcc_assert (!occr->deleted_p); - - insn = occr->insn; -- set = single_set (insn); -- gcc_assert (set); -+ set = single_set_gcse (insn); - - /* Create a pseudo-reg to store the result of reaching - expressions into. Get the mode for the new pseudo -@@ -3456,10 +3515,8 @@ - { - rtx reg; - enum reg_class pressure_class; -- rtx set = single_set (insn); -+ const_rtx set = single_set_gcse (insn); - -- /* Considered invariant insns have only one set. */ -- gcc_assert (set != NULL_RTX); - reg = SET_DEST (set); - if (GET_CODE (reg) == SUBREG) - reg = SUBREG_REG (reg); diff --git a/package.bak/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch b/package.bak/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch deleted file mode 100644 index afa650c8b9..0000000000 --- a/package.bak/gcc/4.8.5/843-aarch64-vmlaq_lane_s32-typo.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 845478644ba54a6947e9b224f2e5cd342e8257a9 Mon Sep 17 00:00:00 2001 -From: Andrew Hsieh -Date: Wed, 25 Jun 2014 22:13:48 -0700 -Subject: [PATCH] Fix a typo in vmlaq_lane_s32 - -BUG=15526898 - -Change-Id: I4e35a764d369d378808dab29beefe34d1f93249b -Signed-off-by: Peter Korsgaard ---- - -diff --git a/gcc/config/aarch64/arm_neon.h b/gcc/config/aarch64/arm_neon.h -index 73c7e7d..92b0119 100644 ---- a/gcc/config/aarch64/arm_neon.h -+++ b/gcc/config/aarch64/arm_neon.h -@@ -9984,7 +9984,7 @@ - #define vmlaq_lane_s32(a, b, c, d) \ - __extension__ \ - ({ \ -- int32x4_t c_ = (c); \ -+ int32x2_t c_ = (c); \ - int32x4_t b_ = (b); \ - int32x4_t a_ = (a); \ - int32x4_t result; \ diff --git a/package.bak/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch b/package.bak/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 792976fd51..0000000000 --- a/package.bak/gcc/4.8.5/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -2809,7 +2809,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) \ - && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) - - #include -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -987,7 +987,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough (most probably sufficient - // for non-ios_base::fixed outputs) - int __cs_size = __max_digits * 3; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -572,7 +572,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -182,7 +182,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -139,7 +139,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -180,7 +180,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2571,7 +2571,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -787,7 +787,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -139,7 +139,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/package.bak/gcc/4.8.5/851-PR-other-56780.patch b/package.bak/gcc/4.8.5/851-PR-other-56780.patch deleted file mode 100644 index feb433920d..0000000000 --- a/package.bak/gcc/4.8.5/851-PR-other-56780.patch +++ /dev/null @@ -1,244 +0,0 @@ -From afe990251bd9b3a063f03da31a3b8d139d033bc3 Mon Sep 17 00:00:00 2001 -From: ian -Date: Sat, 1 Jun 2013 00:20:49 +0000 -Subject: [PATCH] PR other/56780 - -* libiberty/configure.ac: Move test for --enable-install-libiberty -outside of the 'with_target_subdir' test so that it actually gets -run. Add output messages to show the test result. -* libiberty/configure: Regenerate. -* libiberty/Makefile.in (install_to_libdir): Place the -installation of the libiberty library in the same guard as that -used for the headers to prevent it being installed unless -requested via --enable-install-libiberty. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199570 138bc75d-0d04-0410-961f-82ee72b054a4 - -libiberty: fix --enable-install-libiberty flag [PR 56780] - -Commit 199570 fixed the --disable-install-libiberty behavior, but it also -added a bug where the enable path never works because the initial clear -of target_header_dir wasn't deleted. So we end up initializing properly -at the top only to reset it at the end all the time. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@206367 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Romain - squash the two upstream commits - Remove the ChangeLog] -Signed-off-by: Romain Naour ---- - libiberty/Makefile.in | 24 ++++++++++----------- - libiberty/configure | 57 +++++++++++++++++++++++++++----------------------- - libiberty/configure.ac | 47 ++++++++++++++++++++++------------------- - 3 files changed, 68 insertions(+), 60 deletions(-) - -diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in -index f6a3ebd..75ff82d 100644 ---- a/libiberty/Makefile.in -+++ b/libiberty/Makefile.in -@@ -355,19 +355,19 @@ install-strip: install - # since it will be passed the multilib flags. - MULTIOSDIR = `$(CC) $(CFLAGS) -print-multi-os-directory` - install_to_libdir: all -- ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR) -- $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n -- ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ) -- mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB) - if test -n "${target_header_dir}"; then \ -- case "${target_header_dir}" in \ -- /*) thd=${target_header_dir};; \ -- *) thd=${includedir}/${target_header_dir};; \ -- esac; \ -- ${mkinstalldirs} $(DESTDIR)$${thd}; \ -- for h in ${INSTALLED_HEADERS}; do \ -- ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -- done; \ -+ ${mkinstalldirs} $(DESTDIR)$(libdir)/$(MULTIOSDIR); \ -+ $(INSTALL_DATA) $(TARGETLIB) $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n; \ -+ ( cd $(DESTDIR)$(libdir)/$(MULTIOSDIR) ; chmod 644 $(TARGETLIB)n ;$(RANLIB) $(TARGETLIB)n ); \ -+ mv -f $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB)n $(DESTDIR)$(libdir)/$(MULTIOSDIR)/$(TARGETLIB); \ -+ case "${target_header_dir}" in \ -+ /*) thd=${target_header_dir};; \ -+ *) thd=${includedir}/${target_header_dir};; \ -+ esac; \ -+ ${mkinstalldirs} $(DESTDIR)$${thd}; \ -+ for h in ${INSTALLED_HEADERS}; do \ -+ ${INSTALL_DATA} $$h $(DESTDIR)$${thd}; \ -+ done; \ - fi - @$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=install - -diff --git a/libiberty/configure b/libiberty/configure -index 5367027..4feb95a 100755 ---- a/libiberty/configure -+++ b/libiberty/configure -@@ -675,8 +675,8 @@ with_cross_host - with_newlib - enable_maintainer_mode - enable_multilib --enable_largefile - enable_install_libiberty -+enable_largefile - ' - ac_precious_vars='build_alias - host_alias -@@ -1303,8 +1303,8 @@ Optional Features: - enable make rules and dependencies not useful - (and sometimes confusing) to the casual installer - --enable-multilib build many library versions (default) -+ --enable-install-libiberty Install headers and library for end users - --disable-largefile omit support for large files -- --enable-install-libiberty Install headers for end users - - Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -@@ -2784,6 +2784,35 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to install libiberty headers and static library" >&5 -+$as_echo_n "checking whether to install libiberty headers and static library... " >&6; } -+ -+# Check whether --enable-install-libiberty was given. -+if test "${enable_install_libiberty+set}" = set; then : -+ enableval=$enable_install_libiberty; enable_install_libiberty=$enableval -+else -+ enable_install_libiberty=no -+fi -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_install_libiberty" >&5 -+$as_echo "$enable_install_libiberty" >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: target_header_dir = $target_header_dir" >&5 -+$as_echo "$as_me: target_header_dir = $target_header_dir" >&6;} -+ - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -5476,7 +5505,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -5759,29 +5787,6 @@ _ACEOF - - esac - -- # We may wish to install the target headers somewhere. -- # Check whether --enable-install-libiberty was given. --if test "${enable_install_libiberty+set}" = set; then : -- enableval=$enable_install_libiberty; enable_install_libiberty=$enableval --else -- enable_install_libiberty=no --fi -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. -diff --git a/libiberty/configure.ac b/libiberty/configure.ac -index c763894..f17e6b6 100644 ---- a/libiberty/configure.ac -+++ b/libiberty/configure.ac -@@ -128,6 +128,31 @@ if test $cross_compiling = no && test $multilib = yes \ - cross_compiling=maybe - fi - -+# We may wish to install the target headers somewhere. -+AC_MSG_CHECKING([whether to install libiberty headers and static library]) -+dnl install-libiberty is disabled by default -+ -+AC_ARG_ENABLE(install-libiberty, -+[ --enable-install-libiberty Install headers and library for end users], -+enable_install_libiberty=$enableval, -+enable_install_libiberty=no)dnl -+ -+# Option parsed, now set things appropriately. -+case x"$enable_install_libiberty" in -+ xyes|x) -+ target_header_dir=libiberty -+ ;; -+ xno) -+ target_header_dir= -+ ;; -+ *) -+ # This could be sanity-checked in various ways... -+ target_header_dir="${enable_install_libiberty}" -+ ;; -+esac -+AC_MSG_RESULT($enable_install_libiberty) -+AC_MSG_NOTICE([target_header_dir = $target_header_dir]) -+ - GCC_NO_EXECUTABLES - AC_PROG_CC - AC_SYS_LARGEFILE -@@ -380,7 +405,6 @@ fi - - setobjs= - CHECK= --target_header_dir= - if test -n "${with_target_subdir}"; then - - # We are being configured as a target library. AC_REPLACE_FUNCS -@@ -492,27 +516,6 @@ if test -n "${with_target_subdir}"; then - - esac - -- # We may wish to install the target headers somewhere. -- AC_ARG_ENABLE(install-libiberty, -- [ --enable-install-libiberty Install headers for end users], -- enable_install_libiberty=$enableval, -- enable_install_libiberty=no)dnl -- -- # Option parsed, now set things appropriately. -- case x"$enable_install_libiberty" in -- xyes|x) -- target_header_dir=libiberty -- ;; -- xno) -- target_header_dir= -- ;; -- *) -- # This could be sanity-checked in various ways... -- target_header_dir="${enable_install_libiberty}" -- ;; -- esac -- -- - else - - # Not a target library, so we set things up to run the test suite. --- -1.9.3 - diff --git a/package.bak/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch b/package.bak/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index aa1376c44c..0000000000 --- a/package.bak/gcc/4.8.5/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md -index 30f4c1f..773d4f9 100644 ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h -index e59bede..12056f7 100644 ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index 675aacf..5b0243a 100644 ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md -index e02209e..d7dfa11 100644 ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..206ff80 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands) - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return !TARGET_WINDOWED_ABI -@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode) - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter) - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..0e673a3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -761,8 +761,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -774,15 +774,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -796,21 +797,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -881,7 +883,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -896,8 +898,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -912,13 +914,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -991,7 +994,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1002,8 +1005,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt -index 2fd6cee..21c6e96 100644 ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ mtext-section-literals - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch b/package.bak/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index abc7a08e8d..0000000000 --- a/package.bak/gcc/4.8.5/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 3ac8c1d..2e678af 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif -+ retw -+#else -+ mov a8, a8 - retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - - -@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/package.bak/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch deleted file mode 100644 index f23a5c0737..0000000000 --- a/package.bak/gcc/4.8.5/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 14 Aug 2015 02:45:02 +0300 -Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde - -This allows having exception cleanup code in binaries that don't -register their unwind tables. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde - with unwind-dw2-fde-dip. - -Signed-off-by: Max Filippov ---- -Backported from: r226963 - - libgcc/config/xtensa/t-xtensa | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa -index 27399e6..66d0eb3 100644 ---- a/libgcc/config/xtensa/t-xtensa -+++ b/libgcc/config/xtensa/t-xtensa -@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \ - LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S - - LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ -- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch b/package.bak/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch deleted file mode 100644 index dc405132cc..0000000000 --- a/package.bak/gcc/4.8.5/873-xtensa-fix-_Unwind_GetCFA.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 15 Aug 2015 05:12:11 +0300 -Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA - -Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame -higher than what was actually used by code at context->ra. This results -in invalid CFA value in signal frames and premature unwinding completion -in forced unwinding used by uClibc NPTL thread cancellation. -Returning context->sp from _Unwind_GetCFA makes all CFA values valid and -matching code that used them. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return - context->sp instead of context->cfa. - -Signed-off-by: Max Filippov ---- -Backported from: r226964 - - libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c -index 35f7797..ef6b900 100644 ---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c -+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c -@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) - _Unwind_Word - _Unwind_GetCFA (struct _Unwind_Context *context) - { -- return (_Unwind_Ptr) context->cfa; -+ return (_Unwind_Ptr) context->sp; - } - - /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/874-xtensa-add-uclinux-support.patch b/package.bak/gcc/4.8.5/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 23db3d863c..0000000000 --- a/package.bak/gcc/4.8.5/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index c52f5a8..56797bd 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2995,6 +2995,11 @@ xtensa*-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h -new file mode 100644 -index 0000000..4606020 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free -+Software Foundation; either version 3, or (at your option) any later -+version. -+ -+GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or -+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt -new file mode 100644 -index 0000000..95ef777 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC is free software; you can redistribute it and/or modify it under -+; the terms of the GNU General Public License as published by the Free -+; Software Foundation; either version 3, or (at your option) any later -+; version. -+; -+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+; WARRANTY; without even the implied warranty of MERCHANTABILITY or -+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+; for more details. -+; -+; You should have received a copy of the GNU General Public License -+; along with GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -diff --git a/libgcc/config.host b/libgcc/config.host -index 2c64756..2ee92c1 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1295,6 +1295,11 @@ xtensa*-*-linux*) - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" --- -1.8.1.4 - diff --git a/package.bak/gcc/4.8.5/890-fix-m68k-compile.patch b/package.bak/gcc/4.8.5/890-fix-m68k-compile.patch deleted file mode 100644 index 124e8427f8..0000000000 --- a/package.bak/gcc/4.8.5/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c gcc-4.8.5/libgcc/config/m68k/linux-atomic.c ---- gcc-4.8.5.orig/libgcc/config/m68k/linux-atomic.c 2013-02-04 20:06:20.000000000 +0100 -+++ gcc-4.8.5/libgcc/config/m68k/linux-atomic.c 2016-03-19 00:18:12.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/package.bak/gcc/4.8.5/891-fix-m68k-uclinux.patch b/package.bak/gcc/4.8.5/891-fix-m68k-uclinux.patch deleted file mode 100644 index 37c7ac406b..0000000000 --- a/package.bak/gcc/4.8.5/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config.host gcc-4.8.5/libgcc/config.host ---- gcc-4.8.5.orig/libgcc/config.host 2014-03-20 17:12:30.000000000 +0100 -+++ gcc-4.8.5/libgcc/config.host 2016-04-27 15:04:01.521171537 +0200 -@@ -689,7 +689,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package.bak/gcc/4.8.5/900-musl-support.patch b/package.bak/gcc/4.8.5/900-musl-support.patch deleted file mode 100644 index 6840fccea4..0000000000 --- a/package.bak/gcc/4.8.5/900-musl-support.patch +++ /dev/null @@ -1,648 +0,0 @@ -Add musl support to gcc - -This patch comes from the musl-cross project at -https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version: - - * the config.sub modifications have been removed, because Buildroot - already overwrites all config.sub with a more recent config.sub - that has musl support. - - * change to ensure that a dummy dynamic linker path - MUSL_DYNAMIC_LINKER is defined for all architectures, - otherwise building gcc for architectures not supported by musl was - causing build failure. Bug reported upstream at - https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on. - - * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic - and only add the musl one as an addition, not as a replacement. Not - doing this breaks C++ exception handling with glibc, because - USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script - not testing dl_iterate_phdr() on any system except Solaris. - -Signed-off-by: Thomas Petazzoni -[Gustavo: Update for gcc 4.8.3] - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -21,7 +21,12 @@ - #ifndef GCC_AARCH64_LINUX_H - #define GCC_AARCH64_LINUX_H - -+/* The AArch64 port currently supports two dynamic linkers: -+ - ld-linux-aarch64.so.1 - GLIBC dynamic linker -+ - ld-musl-aarch64.so.1 - musl libc dynamic linker */ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64.so.1" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,5 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -53,18 +55,21 @@ - uClibc or Bionic is the default C library and whether - -muclibc or -mglibc or -mbionic has been passed to change the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -82,23 +87,32 @@ - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" - -+/* Musl dynamic linker paths must be defined on a per-architecture -+ basis, for each architecture supported by Musl. However, in order -+ to let other architectures continue to build with other C -+ libraries, we provide a dummy definition of the following defines. */ -+#define MUSL_DYNAMIC_LINKER "invalid" -+#define MUSL_DYNAMIC_LINKER32 "invalid" -+#define MUSL_DYNAMIC_LINKER64 "invalid" -+#define MUSL_DYNAMIC_LINKERX32 "invalid" -+ - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) - - /* Determine whether the entire c99 runtime - is present in the runtime library. */ - #undef TARGET_C99_FUNCTIONS --#define TARGET_C99_FUNCTIONS (OPTION_GLIBC) -+#define TARGET_C99_FUNCTIONS (OPTION_GLIBC || OPTION_MUSL) - - /* Whether we have sincos that follows the GNU extension. */ - #undef TARGET_HAS_SINCOS -@@ -107,3 +121,74 @@ - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) -+ -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -30,3 +30,7 @@ - muclibc - Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) -+Use musl C library -Index: b/gcc/config/microblaze/linux.h -=================================================================== ---- a/gcc/config/microblaze/linux.h -+++ b/gcc/config/microblaze/linux.h -@@ -25,7 +25,23 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } -Index: b/gcc/config/mips/linux64.h -=================================================================== ---- a/gcc/config/mips/linux64.h -+++ b/gcc/config/mips/linux64.h -@@ -29,4 +29,4 @@ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER) -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -18,3 +18,11 @@ - . */ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -374,17 +374,23 @@ - #endif - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" - #elif DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - #undef DEFAULT_ASM_ENDIAN - #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -Index: b/gcc/config/rs6000/secureplt.h -=================================================================== ---- a/gcc/config/rs6000/secureplt.h -+++ b/gcc/config/rs6000/secureplt.h -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -Index: b/gcc/config/rs6000/sysv4.h -=================================================================== ---- a/gcc/config/rs6000/sysv4.h -+++ b/gcc/config/rs6000/sysv4.h -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #define CC1_SPEC "%{G*} %(cc1_cpu)" \ -@@ -585,7 +588,8 @@ - - /* Override the default target of the linker. */ - #define LINK_TARGET_SPEC \ -- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") -+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ -+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" - - /* Any specific OS flags. */ - #define LINK_OS_SPEC "\ -@@ -763,15 +767,18 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -894,6 +901,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -Index: b/gcc/config/sh/linux.h -=================================================================== ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -43,7 +43,15 @@ - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ -+#define MUSL_DYNAMIC_LINKER_E "eb" -+#else -+#define MUSL_DYNAMIC_LINKER_E -+#endif -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" - - #undef SUBTARGET_LINK_EMUL_SUFFIX - #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -550,7 +550,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # Common parts for widely ported systems. - case ${target} in -@@ -653,6 +653,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -@@ -2135,6 +2138,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ *-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -26936,6 +26940,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -4848,6 +4852,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/ginclude/stddef.h -=================================================================== ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -181,6 +181,7 @@ - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -197,6 +198,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -214,6 +216,7 @@ - typedef long ssize_t; - #endif /* __BEOS__ */ - #endif /* !(defined (__GNUG__) && defined (size_t)) */ -+#endif /* __DEFINED_size_t */ - #endif /* __size_t */ - #endif /* _SIZET_ */ - #endif /* _GCC_SIZE_T */ -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -75,6 +75,13 @@ - # define USE_PT_GNU_EH_FRAME - #endif - -+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure -+ script. */ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) -+# define USE_PT_GNU_EH_FRAME -+#endif -+ - #if defined(USE_PT_GNU_EH_FRAME) - - #include -Index: b/libgomp/config/posix/time.c -=================================================================== ---- a/libgomp/config/posix/time.c -+++ b/libgomp/config/posix/time.c -@@ -28,6 +28,8 @@ - The following implementation uses the most simple POSIX routines. - If present, POSIX 4 clocks should be used instead. */ - -+#define _POSIX_C_SOURCE 199309L /* for clocks */ -+ - #include "libgomp.h" - #include - #if TIME_WITH_SYS_TIME -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -264,6 +264,13 @@ - os_include_dir="os/bsd/freebsd" - ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -+ # check for musl by target -+ case "${host_os}" in -+ *-musl*) -+ os_include_dir="os/generic" -+ ;; -+ *) -+ - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" - elif [ "$bionic" = "yes" ]; then -@@ -272,6 +279,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; diff --git a/package.bak/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch b/package.bak/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 7799c1286e..0000000000 --- a/package.bak/gcc/4.8.5/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/libgcc/config/t-stack gcc-4.8.5/libgcc/config/t-stack ---- gcc-4.8.5.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-4.8.5/libgcc/config/t-stack 2016-03-07 05:28:12.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/package.bak/gcc/4.8.5/940-uclinux-enable-threads.patch b/package.bak/gcc/4.8.5/940-uclinux-enable-threads.patch deleted file mode 100644 index e58e824938..0000000000 --- a/package.bak/gcc/4.8.5/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.8.5.orig/gcc/config.gcc gcc-4.8.5/gcc/config.gcc ---- gcc-4.8.5.orig/gcc/config.gcc 2015-05-21 22:57:29.000000000 +0200 -+++ gcc-4.8.5/gcc/config.gcc 2016-07-02 20:35:24.107644834 +0200 -@@ -741,6 +741,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package.bak/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch b/package.bak/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch deleted file mode 100644 index fd2bc69538..0000000000 --- a/package.bak/gcc/4.9.4/0001-ARM-PR-target-68059-libgcc-should-not-use-__write-fo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 80bc14a5249da7054b716229206b453f339b4a5e Mon Sep 17 00:00:00 2001 -From: nsz -Date: Mon, 23 Nov 2015 15:17:55 +0000 -Subject: [PATCH] [ARM] PR target/68059 libgcc should not use __write for - printing fatal error - -libgcc/ - PR target/68059 - * config/arm/linux-atomic-64bit.c (__write): Rename to... - (write): ...this and fix the return type. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@230762 138bc75d-0d04-0410-961f-82ee72b054a4 - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - libgcc/config/arm/linux-atomic-64bit.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgcc/config/arm/linux-atomic-64bit.c b/libgcc/config/arm/linux-atomic-64bit.c -index 5b8c6e2..9078673 100644 ---- a/libgcc/config/arm/linux-atomic-64bit.c -+++ b/libgcc/config/arm/linux-atomic-64bit.c -@@ -33,7 +33,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - kernels; we check for that in an init section and bail out rather - unceremoneously. */ - --extern unsigned int __write (int fd, const void *buf, unsigned int count); -+extern int write (int fd, const void *buf, unsigned int count); - extern void abort (void); - - /* Kernel helper for compare-and-exchange. */ -@@ -56,7 +56,7 @@ static void __check_for_sync8_kernelhelper (void) - for the user - I'm not sure I can rely on much else being - available at this point, so do the same as generic-morestack.c - write () and abort (). */ -- __write (2 /* stderr. */, err, sizeof (err)); -+ write (2 /* stderr. */, err, sizeof (err)); - abort (); - } - }; --- -2.10.2 - diff --git a/package.bak/gcc/4.9.4/100-uclibc-conf.patch b/package.bak/gcc/4.9.4/100-uclibc-conf.patch deleted file mode 100644 index d56bf0a194..0000000000 --- a/package.bak/gcc/4.9.4/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gcc-4.8.0/contrib/regression/objs-gcc.sh -=================================================================== ---- gcc-4.8.0.orig/contrib/regression/objs-gcc.sh 2009-04-09 17:00:19.000000000 +0200 -+++ gcc-4.8.0/contrib/regression/objs-gcc.sh 2013-03-23 17:39:04.000000000 +0100 -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package.bak/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional b/package.bak/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional deleted file mode 100644 index 5e0484fbb4..0000000000 --- a/package.bak/gcc/4.9.4/1000-powerpc-link-with-math-lib.patch.conditional +++ /dev/null @@ -1,122 +0,0 @@ -http://gcc.gnu.org/ml/gcc-patches/2008-10/msg00269.html - -On glibc the libc.so carries a copy of the math function copysignl() but -on uClibc math functions like copysignl() live in libm. Since libgcc_s -contains unresolved symbols, any attempt to link against libgcc_s -without explicitely specifying -lm fails, resulting in a broken -bootstrap of the compiler. - -Forward port to gcc 4.5.1 by Gustavo Zacarias - ---- - libgcc/Makefile.in | 4 +++- - libgcc/configure | 32 ++++++++++++++++++++++++++++++++ - libgcc/configure.ac | 21 +++++++++++++++++++++ - 3 files changed, 56 insertions(+), 1 deletion(-) - -Index: b/libgcc/Makefile.in -=================================================================== ---- a/libgcc/Makefile.in -+++ b/libgcc/Makefile.in -@@ -42,6 +42,7 @@ - enable_vtable_verify = @enable_vtable_verify@ - enable_decimal_float = @enable_decimal_float@ - fixed_point = @fixed_point@ -+LIBGCC_LIBM = @LIBGCC_LIBM@ - - host_noncanonical = @host_noncanonical@ - target_noncanonical = @target_noncanonical@ -@@ -943,9 +944,10 @@ - @multilib_dir@,$(MULTIDIR),$(subst \ - @shlib_objs@,$(objects) libgcc.a,$(subst \ - @shlib_base_name@,libgcc_s,$(subst \ -+ @libgcc_libm@,$(LIBGCC_LIBM),$(subst \ - @shlib_map_file@,$(mapfile),$(subst \ - @shlib_slibdir_qual@,$(MULTIOSSUBDIR),$(subst \ -- @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK)))))))) -+ @shlib_slibdir@,$(shlib_slibdir),$(SHLIB_LINK))))))))) - - libunwind$(SHLIB_EXT): $(libunwind-s-objects) $(extra-parts) - # @multilib_flags@ is still needed because this may use -Index: b/libgcc/configure -=================================================================== ---- a/libgcc/configure -+++ b/libgcc/configure -@@ -564,6 +564,7 @@ - tmake_file - sfp_machine_header - set_use_emutls -+LIBGCC_LIBM - set_have_cc_tls - vis_hide - fixed_point -@@ -4535,6 +4536,37 @@ - fi - fi - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+echo "$as_me:$LINENO: checking for library containing copysignl" >&5 -+echo $ECHO_N "checking for library containing copysignl... $ECHO_C" >&6 -+if test "${libgcc_cv_copysignl_lib+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if { ac_try='${CC-cc} -S conftest.c -o conftest.s 1>&5' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ -+fi -+echo "$as_me:$LINENO: result: $libgcc_cv_copysignl_lib" >&5 -+echo "${ECHO_T}$libgcc_cv_copysignl_lib" >&6 -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac - - # Conditionalize the makefile for this target machine. - tmake_file_= -Index: b/libgcc/configure.ac -=================================================================== ---- a/libgcc/configure.ac -+++ b/libgcc/configure.ac -@@ -357,6 +357,27 @@ - fi - AC_SUBST(set_have_cc_tls) - -+# On powerpc libgcc_s references copysignl which is a libm function but -+# glibc apparently also provides it via libc as opposed to uClibc where -+# it lives in libm. -+AC_CACHE_CHECK -+ libgcc_cv_copysignl_lib, -+ echo '#include ' > conftest.c -+ echo 'int the_libc = __UCLIBC__ + __powerpc__;' >> conftest.c -+ libgcc_cv_copysignl_lib="-lc" -+ if AC_TRY_COMMAND(${CC-cc} -S conftest.c -o conftest.s 1>&AS_MESSAGE_LOG_FD) -+ then -+ libgcc_cv_copysignl_lib="-lm" -+ fi -+ rm -f conftest.* -+ ]) -+ -+case /${libgcc_cv_copysignl_lib}/ in -+ /-lm/) LIBGCC_LIBM="$LIBGCC_LIBM -lm" ;; -+ *) LIBGCC_LIBM= ;; -+esac -+AC_SUBST(LIBGCC_LIBM) -+ - # See if we have emulated thread-local storage. - GCC_CHECK_EMUTLS - set_use_emutls= diff --git a/package.bak/gcc/4.9.4/111-pr65730.patch b/package.bak/gcc/4.9.4/111-pr65730.patch deleted file mode 100644 index 8a41fd2a10..0000000000 --- a/package.bak/gcc/4.9.4/111-pr65730.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b9a7775674d91c7af8043a83211ffeaa576327d7 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 10 Apr 2015 17:46:30 +0300 -Subject: [PATCH] Fix PR target/65730 - -2015-05-20 Max Filippov -gcc/ - * config/xtensa/xtensa.c (init_alignment_context): Replace MULT - by BITS_PER_UNIT with ASHIFT by exact_log2 (BITS_PER_UNIT). - -Signed-off-by: Max Filippov ---- -Backported from: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223452 -Changes to ChangeLog are dropped. - - gcc/config/xtensa/xtensa.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -Index: b/gcc/config/xtensa/xtensa.c -=================================================================== ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -1436,8 +1436,9 @@ - if (ac->shift != NULL_RTX) - { - /* Shift is the byte count, but we need the bitcount. */ -- ac->shift = expand_simple_binop (SImode, MULT, ac->shift, -- GEN_INT (BITS_PER_UNIT), -+ gcc_assert (exact_log2 (BITS_PER_UNIT) >= 0); -+ ac->shift = expand_simple_binop (SImode, ASHIFT, ac->shift, -+ GEN_INT (exact_log2 (BITS_PER_UNIT)), - NULL_RTX, 1, OPTAB_DIRECT); - ac->modemask = expand_simple_binop (SImode, ASHIFT, - GEN_INT (GET_MODE_MASK (mode)), diff --git a/package.bak/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/package.bak/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index bb77c4b9ef..0000000000 --- a/package.bak/gcc/4.9.4/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -441,7 +441,7 @@ - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - need_64bit_hwint=yes - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac diff --git a/package.bak/gcc/4.9.4/130-pr43538.patch b/package.bak/gcc/4.9.4/130-pr43538.patch deleted file mode 100644 index 19e57bb059..0000000000 --- a/package.bak/gcc/4.9.4/130-pr43538.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c037df1be41f8daf4d581d7ffa4ec8cfa640bccf Mon Sep 17 00:00:00 2001 -From: glisse -Date: Fri, 25 Apr 2014 08:03:08 +0000 -Subject: [PATCH] 2014-04-25 Marc Glisse - - PR target/43538 - * mt-gnu: Don't reset CXXFLAGS_FOR_TARGET. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@209784 138bc75d-0d04-0410-961f-82ee72b054a4 -Signed-off-by: Max Filippov ---- - config/mt-gnu | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mt-gnu b/config/mt-gnu -index 15bf417..5c696f5 100644 ---- a/config/mt-gnu -+++ b/config/mt-gnu -@@ -1 +1 @@ --CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE -+CXXFLAGS_FOR_TARGET += -D_GNU_SOURCE --- -2.1.4 - diff --git a/package.bak/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch b/package.bak/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch deleted file mode 100644 index 55f32288f5..0000000000 --- a/package.bak/gcc/4.9.4/140-sanitizer-Fix-build-with-_FILE_OFFSET_BITS-64.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3c536954a67a883630f4a7513a27f02a892c3dcb Mon Sep 17 00:00:00 2001 -From: Evgeniy Stepanov -Date: Tue, 21 Oct 2014 21:08:13 +0000 -Subject: [PATCH] [sanitizer] Fix build with _FILE_OFFSET_BITS=64. - -Sanitizer source is not affected by _FILE_OFFSET_BITS in general, -but this one file must be built with 32-bit off_t. More details in the code. - -git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@220328 91177308-0d34-0410-b5e6-96231b3b80d8 -Signed-off-by: Max Filippov ---- - lib/sanitizer_common/sanitizer_platform_limits_posix.cc | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -index bbc1108..fc09522 100644 ---- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -+++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc -@@ -13,7 +13,15 @@ - - #include "sanitizer_platform.h" - #if SANITIZER_LINUX || SANITIZER_MAC -+// Tests in this file assume that off_t-dependent data structures match the -+// libc ABI. For example, struct dirent here is what readdir() function (as -+// exported from libc) returns, and not the user-facing "dirent", which -+// depends on _FILE_OFFSET_BITS setting. -+// To get this "true" dirent definition, we undefine _FILE_OFFSET_BITS below. -+#ifdef _FILE_OFFSET_BITS -+#undef _FILE_OFFSET_BITS -+#endif - - #include "sanitizer_internal_defs.h" - #include "sanitizer_platform_limits_posix.h" - --- -2.1.4 - diff --git a/package.bak/gcc/4.9.4/301-missing-execinfo_h.patch b/package.bak/gcc/4.9.4/301-missing-execinfo_h.patch deleted file mode 100644 index 00efda24aa..0000000000 --- a/package.bak/gcc/4.9.4/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.8.0/boehm-gc/include/gc.h -=================================================================== ---- gcc-4.8.0.orig/boehm-gc/include/gc.h 2007-04-23 23:10:09.000000000 +0200 -+++ gcc-4.8.0/boehm-gc/include/gc.h 2013-03-23 17:39:20.000000000 +0100 -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/4.9.4/810-arm-softfloat-libgcc.patch b/package.bak/gcc/4.9.4/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1bc..0000000000 --- a/package.bak/gcc/4.9.4/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package.bak/gcc/4.9.4/830-arm_unbreak_armv4t.patch b/package.bak/gcc/4.9.4/830-arm_unbreak_armv4t.patch deleted file mode 100644 index 37f8f2a54d..0000000000 --- a/package.bak/gcc/4.9.4/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,13 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package.bak/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch b/package.bak/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch deleted file mode 100644 index 03fc47f192..0000000000 --- a/package.bak/gcc/4.9.4/840-microblaze-enable-dwarf-eh-support.patch +++ /dev/null @@ -1,166 +0,0 @@ -Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc - -From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001 -From: "Edgar E. Iglesias" -Date: Mon, 18 Jun 2012 20:18:13 +0200 -Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support. - -Changelog - -2013-03-18 Edgar E. Iglesias - David Holsgrove - - * common/config/microblaze/microblaze-common.c: Remove - TARGET_EXCEPT_UNWIND_INFO definition. - * config/microblaze/microblaze-protos.h: Add - microblaze_eh_return prototype. - * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register, - microblaze_expand_epilogue, microblaze_return_addr): Handle - calls_eh_return - (microblaze_eh_return): New function. - * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET, - EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX, - ASM_PREFERRED_EH_DATA_FORMAT - * gcc/config/microblaze/microblaze.md: Define eh_return pattern. - -Signed-off-by: David Holsgrove -Signed-off-by: Edgar E. Iglesias ---- - gcc/common/config/microblaze/microblaze-common.c | 3 --- - gcc/config/microblaze/microblaze-protos.h | 1 + - gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++---- - gcc/config/microblaze/microblaze.h | 15 ++++++++++++ - gcc/config/microblaze/microblaze.md | 11 +++++++++ - 5 files changed, 52 insertions(+), 7 deletions(-) - -Index: b/gcc/common/config/microblaze/microblaze-common.c -=================================================================== ---- a/gcc/common/config/microblaze/microblaze-common.c -+++ b/gcc/common/config/microblaze/microblaze-common.c -@@ -37,7 +37,4 @@ - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table - --#undef TARGET_EXCEPT_UNWIND_INFO --#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info -- - struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; -Index: b/gcc/config/microblaze/microblaze-protos.h -=================================================================== ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -54,6 +54,7 @@ - extern int symbol_mentioned_p (rtx); - extern int label_mentioned_p (rtx); - extern bool microblaze_cannot_force_const_mem (enum machine_mode, rtx); -+extern void microblaze_eh_return (rtx op0); - #endif /* RTX_CODE */ - - /* Declare functions in microblaze-c.c. */ -Index: b/gcc/config/microblaze/microblaze.c -=================================================================== ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -1906,6 +1906,11 @@ - if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) - return 1; - -+ if (crtl->calls_eh_return -+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) { -+ return 1; -+ } -+ - if (!crtl->is_leaf) - { - if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -@@ -1933,6 +1938,13 @@ - return 1; - } - -+ if (crtl->calls_eh_return -+ && (regno == EH_RETURN_DATA_REGNO (0) -+ || regno == EH_RETURN_DATA_REGNO (1))) -+ { -+ return 1; -+ } -+ - return 0; - } - -@@ -2962,6 +2974,12 @@ - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); - } - -+ if (crtl->calls_eh_return) -+ emit_insn (gen_addsi3 (stack_pointer_rtx, -+ stack_pointer_rtx, -+ gen_rtx_raw_REG (SImode, -+ MB_EH_STACKADJ_REGNUM))); -+ - emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + - MB_ABI_SUB_RETURN_ADDR_REGNUM))); - } -@@ -3256,10 +3274,13 @@ - if (count != 0) - return NULL_RTX; - -- return gen_rtx_PLUS (Pmode, -- get_hard_reg_initial_val (Pmode, -- MB_ABI_SUB_RETURN_ADDR_REGNUM), -- GEN_INT (8)); -+ return get_hard_reg_initial_val (Pmode, -+ MB_ABI_SUB_RETURN_ADDR_REGNUM); -+} -+ -+void microblaze_eh_return (rtx op0) -+{ -+ emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0)); - } - - /* Queue an .ident string in the queue of top-level asm statements. -Index: b/gcc/config/microblaze/microblaze.h -=================================================================== ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -184,6 +184,21 @@ - #define INCOMING_RETURN_ADDR_RTX \ - gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) - -+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ -+#define RETURN_ADDR_OFFSET (8) -+ -+/* Describe how we implement __builtin_eh_return. */ -+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) -+ -+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM -+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) -+ -+/* Select a format to encode pointers in exception handling data. CODE -+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is -+ true if the symbol may be affected by dynamic relocations. */ -+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ -+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) -+ - /* Use DWARF 2 debugging information by default. */ - #define DWARF2_DEBUGGING_INFO - #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -Index: b/gcc/config/microblaze/microblaze.md -=================================================================== ---- a/gcc/config/microblaze/microblaze.md -+++ b/gcc/config/microblaze/microblaze.md -@@ -2261,4 +2261,15 @@ - (set_attr "mode" "SI") - (set_attr "length" "4")]) - -+; This is used in compiling the unwind routines. -+(define_expand "eh_return" -+ [(use (match_operand 0 "general_operand" ""))] -+ "" -+ " -+{ -+ microblaze_eh_return(operands[0]); -+ DONE; -+}") -+ - (include "sync.md") -+ diff --git a/package.bak/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch b/package.bak/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 533d01fad5..0000000000 --- a/package.bak/gcc/4.9.4/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,274 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni -[Gustavo: update for 4.9.3] - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -2843,7 +2843,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -572,7 +572,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -987,7 +987,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough (most probably sufficient - // for non-ios_base::fixed outputs) - int __cs_size = __max_digits * 3; -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -182,7 +182,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -180,7 +180,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); diff --git a/package.bak/gcc/4.9.4/860-cilk-wchar.patch b/package.bak/gcc/4.9.4/860-cilk-wchar.patch deleted file mode 100644 index 1837405151..0000000000 --- a/package.bak/gcc/4.9.4/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- host-gcc-final-4.9.2.orig/libcilkrts/include/cilk/reducer_min_max.h -+++ host-gcc-final-4.9.2/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package.bak/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch b/package.bak/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index 98c7b3f32c..0000000000 --- a/package.bak/gcc/4.9.4/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,287 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -Index: b/gcc/config/xtensa/constraints.md -=================================================================== ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -Index: b/gcc/config/xtensa/elf.h -=================================================================== ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -Index: b/gcc/config/xtensa/linux.h -=================================================================== ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -Index: b/gcc/config/xtensa/predicates.md -=================================================================== ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -Index: b/gcc/config/xtensa/xtensa.c -=================================================================== ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -477,6 +477,9 @@ - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return (mode == SImode -@@ -1044,7 +1047,7 @@ - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2428,6 +2431,20 @@ - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -Index: b/gcc/config/xtensa/xtensa.md -=================================================================== ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -799,8 +799,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -812,15 +812,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -834,21 +835,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -919,7 +921,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -934,8 +936,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -950,13 +952,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -997,7 +1000,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1008,8 +1011,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -Index: b/gcc/config/xtensa/xtensa.opt -=================================================================== ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions diff --git a/package.bak/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch b/package.bak/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index abc7a08e8d..0000000000 --- a/package.bak/gcc/4.9.4/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 05154174b369505238b759cf80d595d8cfc8c731 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 3ac8c1d..2e678af 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -33,10 +33,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif -+ retw -+#else -+ mov a8, a8 - retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - - -@@ -58,10 +77,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/package.bak/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/package.bak/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch deleted file mode 100644 index f23a5c0737..0000000000 --- a/package.bak/gcc/4.9.4/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f66206679a0ad604f13673559f230160cd3d1189 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 14 Aug 2015 02:45:02 +0300 -Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde - -This allows having exception cleanup code in binaries that don't -register their unwind tables. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/t-xtensa (LIB2ADDEH): Replace unwind-dw2-fde - with unwind-dw2-fde-dip. - -Signed-off-by: Max Filippov ---- -Backported from: r226963 - - libgcc/config/xtensa/t-xtensa | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/t-xtensa b/libgcc/config/xtensa/t-xtensa -index 27399e6..66d0eb3 100644 ---- a/libgcc/config/xtensa/t-xtensa -+++ b/libgcc/config/xtensa/t-xtensa -@@ -13,4 +13,4 @@ LIB1ASMFUNCS = _mulsi3 _divsi3 _modsi3 _udivsi3 _umodsi3 \ - LIB2ADD = $(srcdir)/config/xtensa/lib2funcs.S - - LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ -- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c --- -1.8.1.4 - diff --git a/package.bak/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch b/package.bak/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch deleted file mode 100644 index dc405132cc..0000000000 --- a/package.bak/gcc/4.9.4/873-xtensa-fix-_Unwind_GetCFA.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 15c7c4d39b317f0d902ef28fd43eca5c3369f891 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 15 Aug 2015 05:12:11 +0300 -Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA - -Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame -higher than what was actually used by code at context->ra. This results -in invalid CFA value in signal frames and premature unwinding completion -in forced unwinding used by uClibc NPTL thread cancellation. -Returning context->sp from _Unwind_GetCFA makes all CFA values valid and -matching code that used them. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return - context->sp instead of context->cfa. - -Signed-off-by: Max Filippov ---- -Backported from: r226964 - - libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c -index 35f7797..ef6b900 100644 ---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c -+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c -@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) - _Unwind_Word - _Unwind_GetCFA (struct _Unwind_Context *context) - { -- return (_Unwind_Ptr) context->cfa; -+ return (_Unwind_Ptr) context->sp; - } - - /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ --- -1.8.1.4 - diff --git a/package.bak/gcc/4.9.4/874-xtensa-add-uclinux-support.patch b/package.bak/gcc/4.9.4/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 881aec09d9..0000000000 --- a/package.bak/gcc/4.9.4/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2871,6 +2871,11 @@ - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -Index: b/gcc/config/xtensa/uclinux.h -=================================================================== ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free -+Software Foundation; either version 3, or (at your option) any later -+version. -+ -+GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or -+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -Index: b/gcc/config/xtensa/uclinux.opt -=================================================================== ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC is free software; you can redistribute it and/or modify it under -+; the terms of the GNU General Public License as published by the Free -+; Software Foundation; either version 3, or (at your option) any later -+; version. -+; -+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+; WARRANTY; without even the implied warranty of MERCHANTABILITY or -+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+; for more details. -+; -+; You should have received a copy of the GNU General Public License -+; along with GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -Index: b/libgcc/config.host -=================================================================== ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1213,6 +1213,11 @@ - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" diff --git a/package.bak/gcc/4.9.4/880-nios2_legitimize_address.patch b/package.bak/gcc/4.9.4/880-nios2_legitimize_address.patch deleted file mode 100644 index 4623f295a7..0000000000 --- a/package.bak/gcc/4.9.4/880-nios2_legitimize_address.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b0ea54f3f995754881e0ea6651133aa7b58eeaa2 Mon Sep 17 00:00:00 2001 -From: cltang -Date: Tue, 22 Sep 2015 12:23:20 +0000 -Subject: [PATCH] nios2_legitimize_address 2015-09-22 Chung-Lin Tang - - - Backport from mainline - 2015-09-22 Chung-Lin Tang - - * config/nios2/nios2.c (nios2_legitimize_address): When handling - 'reg + reloc' cases, allow first operand to be non-REG, and use - force_reg() to enforce address pattern. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@228013 138bc75d-0d04-0410-961f-82ee72b054a4 - -Fixes: -http://autobuild.buildroot.net/results/901/90186d1fe134b804c0101554296b1235dc0ccbb0 - -[backported to 4.9.3] -Signed-off-by: Romain Naour ---- - gcc/config/nios2/nios2.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c -index 047b615..41dd6f9 100644 ---- a/gcc/config/nios2/nios2.c -+++ b/gcc/config/nios2/nios2.c -@@ -1786,15 +1786,15 @@ nios2_legitimize_address (rtx x, rtx oldx ATTRIBUTE_UNUSED, - - Which will be output as '%tls_le(var+48)(r23)' in assembly. */ - if (GET_CODE (x) == PLUS -- && GET_CODE (XEXP (x, 0)) == REG - && GET_CODE (XEXP (x, 1)) == CONST) - { -- rtx unspec, offset, reg = XEXP (x, 0); -+ rtx unspec, offset; - split_const (XEXP (x, 1), &unspec, &offset); - if (GET_CODE (unspec) == UNSPEC - && !nios2_large_offset_p (XINT (unspec, 1)) - && offset != const0_rtx) - { -+ rtx reg = force_reg (Pmode, XEXP (x, 0)); - unspec = copy_rtx (unspec); - XVECEXP (unspec, 0, 0) - = plus_constant (Pmode, XVECEXP (unspec, 0, 0), INTVAL (offset)); --- -2.5.0 - diff --git a/package.bak/gcc/4.9.4/890-fix-m68k-compile.patch b/package.bak/gcc/4.9.4/890-fix-m68k-compile.patch deleted file mode 100644 index 140977b3cd..0000000000 --- a/package.bak/gcc/4.9.4/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c gcc-4.9.3/libgcc/config/m68k/linux-atomic.c ---- gcc-4.9.3.orig/libgcc/config/m68k/linux-atomic.c 2014-01-02 23:25:22.000000000 +0100 -+++ gcc-4.9.3/libgcc/config/m68k/linux-atomic.c 2016-03-18 22:24:40.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/package.bak/gcc/4.9.4/891-fix-m68k-uclinux.patch b/package.bak/gcc/4.9.4/891-fix-m68k-uclinux.patch deleted file mode 100644 index 4347642d67..0000000000 --- a/package.bak/gcc/4.9.4/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config.host gcc-4.9.3/libgcc/config.host ---- gcc-4.9.3.orig/libgcc/config.host 2014-03-27 16:40:31.000000000 +0100 -+++ gcc-4.9.3/libgcc/config.host 2016-04-05 16:20:53.422809885 +0200 -@@ -750,7 +750,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package.bak/gcc/4.9.4/900-musl-support.patch b/package.bak/gcc/4.9.4/900-musl-support.patch deleted file mode 100644 index a862d01116..0000000000 --- a/package.bak/gcc/4.9.4/900-musl-support.patch +++ /dev/null @@ -1,640 +0,0 @@ -Add musl support to gcc - -This patch comes from the musl-cross project at -https://bitbucket.org/GregorR/musl-cross/src. Compared to the upstream version: - - * the config.sub modifications have been removed, because Buildroot - already overwrites all config.sub with a more recent config.sub - that has musl support. - - * change to ensure that a dummy dynamic linker path - MUSL_DYNAMIC_LINKER is defined for all architectures, - otherwise building gcc for architectures not supported by musl was - causing build failure. Bug reported upstream at - https://bitbucket.org/GregorR/musl-gcc-patches/issue/4/musl-gcc-patches-break-the-build-on. - - * change the USE_PT_GNU_EH_FRAME logic to keep the existing gcc logic - and only add the musl one as an addition, not as a replacement. Not - doing this breaks C++ exception handling with glibc, because - USE_PT_GNU_EH_FRAME doesn't get defined due to the configure script - not testing dl_iterate_phdr() on any system except Solaris. - -[Gustavo: remove upstream applied gcc/config/sh/sh.c chunk for 4.9.1] -Signed-off-by: Thomas Petazzoni ---- - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -594,7 +594,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # 32-bit x86 processors supported by --with-arch=. Each processor - # MUST be separated by exactly one space. -@@ -719,6 +719,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -@@ -2338,6 +2341,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ *-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -22,6 +22,8 @@ - #define GCC_AARCH64_LINUX_H - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}.so.1" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64.so.1" - - #define CPP_SPEC "%{pthread:-D_REENTRANT}" - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,5 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -53,18 +55,21 @@ - uClibc or Bionic is the default C library and whether - -muclibc or -mglibc or -mbionic has been passed to change the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -82,23 +87,103 @@ - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" - -+/* Musl dynamic linker paths must be defined on a per-architecture -+ basis, for each architecture supported by Musl. However, in order -+ to let other architectures continue to build with other C -+ libraries, we provide a dummy definition of the following defines. */ -+#define MUSL_DYNAMIC_LINKER "invalid" -+#define MUSL_DYNAMIC_LINKER32 "invalid" -+#define MUSL_DYNAMIC_LINKER64 "invalid" -+#define MUSL_DYNAMIC_LINKERX32 "invalid" -+ - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKER32) - - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) - -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -+ - #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ - /* This is a *uclinux* target. We don't define below macros to normal linux - versions, because doing so would require *uclinux* targets to include -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -30,3 +30,7 @@ - muclibc - Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mglibc) -+Use musl C library -Index: b/gcc/config/microblaze/linux.h -=================================================================== ---- a/gcc/config/microblaze/linux.h -+++ b/gcc/config/microblaze/linux.h -@@ -28,7 +28,23 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -371,17 +371,23 @@ - #endif - #define UCLIBC_DYNAMIC_LINKER32 "/lib/ld-uClibc.so.0" - #define UCLIBC_DYNAMIC_LINKER64 "/lib/ld64-uClibc.so.0" -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-powerpc.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-powerpc64.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" - #elif DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER32 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - - #undef DEFAULT_ASM_ENDIAN - #if (TARGET_DEFAULT & MASK_LITTLE_ENDIAN) -Index: b/gcc/config/rs6000/secureplt.h -=================================================================== ---- a/gcc/config/rs6000/secureplt.h -+++ b/gcc/config/rs6000/secureplt.h -@@ -18,3 +18,4 @@ - . */ - - #define CC1_SECURE_PLT_DEFAULT_SPEC "-msecure-plt" -+#define LINK_SECURE_PLT_DEFAULT_SPEC "--secure-plt" -Index: b/gcc/config/rs6000/sysv4.h -=================================================================== ---- a/gcc/config/rs6000/sysv4.h -+++ b/gcc/config/rs6000/sysv4.h -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #define CC1_SPEC "%{G*} %(cc1_cpu)" \ -@@ -585,7 +588,8 @@ - - /* Override the default target of the linker. */ - #define LINK_TARGET_SPEC \ -- ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") -+ ENDIAN_SELECT("", " --oformat elf32-powerpcle", "") \ -+ "%{!mbss-plt: %{!msecure-plt: %(link_secure_plt_default)}}" - - /* Any specific OS flags. */ - #define LINK_OS_SPEC "\ -@@ -763,15 +767,18 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-powerpc.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -894,6 +901,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -Index: b/gcc/config/sh/linux.h -=================================================================== ---- a/gcc/config/sh/linux.h -+++ b/gcc/config/sh/linux.h -@@ -43,7 +43,15 @@ - - #define TARGET_ASM_FILE_END file_end_indicate_exec_stack - -+#if TARGET_BIG_ENDIAN_DEFAULT /* BE */ -+#define MUSL_DYNAMIC_LINKER_E "eb" -+#else -+#define MUSL_DYNAMIC_LINKER_E -+#endif -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-sh" MUSL_DYNAMIC_LINKER_E ".so.1" - - #undef SUBTARGET_LINK_EMUL_SUFFIX - #define SUBTARGET_LINK_EMUL_SUFFIX "_linux" -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -27601,6 +27601,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5173,6 +5173,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/ginclude/stddef.h -=================================================================== ---- a/gcc/ginclude/stddef.h -+++ b/gcc/ginclude/stddef.h -@@ -181,6 +181,7 @@ - #ifndef _GCC_SIZE_T - #ifndef _SIZET_ - #ifndef __size_t -+#ifndef __DEFINED_size_t /* musl */ - #define __size_t__ /* BeOS */ - #define __SIZE_T__ /* Cray Unicos/Mk */ - #define _SIZE_T -@@ -197,6 +198,7 @@ - #define ___int_size_t_h - #define _GCC_SIZE_T - #define _SIZET_ -+#define __DEFINED_size_t /* musl */ - #if (defined (__FreeBSD__) && (__FreeBSD__ >= 5)) \ - || defined(__FreeBSD_kernel__) - /* __size_t is a typedef on FreeBSD 5, must not trash it. */ -@@ -214,6 +216,7 @@ - typedef long ssize_t; - #endif /* __BEOS__ */ - #endif /* !(defined (__GNUG__) && defined (size_t)) */ -+#endif /* __DEFINED_size_t */ - #endif /* __size_t */ - #endif /* _SIZET_ */ - #endif /* _GCC_SIZE_T */ -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -73,6 +73,13 @@ - && defined(TARGET_DL_ITERATE_PHDR) \ - && defined(__sun__) && defined(__svr4__) - # define USE_PT_GNU_EH_FRAME -+ #endif -+ -+/* For musl libc, TARGET_DL_ITERATE_PHDR gets defined by the configure -+ script. */ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) -+# define USE_PT_GNU_EH_FRAME - #endif - - #if defined(USE_PT_GNU_EH_FRAME) -Index: b/libgomp/config/posix/time.c -=================================================================== ---- a/libgomp/config/posix/time.c -+++ b/libgomp/config/posix/time.c -@@ -28,6 +28,8 @@ - The following implementation uses the most simple POSIX routines. - If present, POSIX 4 clocks should be used instead. */ - -+#define _POSIX_C_SOURCE 199309L /* for clocks */ -+ - #include "libgomp.h" - #include - #if TIME_WITH_SYS_TIME -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,11 @@ - - #ifdef __linux__ - #include -+#ifdef __GLIBC__ - #include -+#else -+#include -+#endif - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -266,6 +266,13 @@ - os_include_dir="os/bsd/freebsd" - ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) -+ # check for musl by target -+ case "${host_os}" in -+ *-musl*) -+ os_include_dir="os/generic" -+ ;; -+ *) -+ - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" - elif [ "$bionic" = "yes" ]; then -@@ -274,6 +281,9 @@ - os_include_dir="os/gnu-linux" - fi - ;; -+ -+ esac -+ ;; - hpux*) - os_include_dir="os/hpux" - ;; -Index: b/gcc/config/mips/linux64.h -=================================================================== ---- a/gcc/config/mips/linux64.h -+++ b/gcc/config/mips/linux64.h -@@ -41,4 +41,4 @@ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKER) -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -23,3 +23,11 @@ - #undef UCLIBC_DYNAMIC_LINKER - #define UCLIBC_DYNAMIC_LINKER \ - "%{mnan=2008:/lib/ld-uClibc-mipsn8.so.0;:/lib/ld-uClibc.so.0}" -+ -+#if TARGET_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-mips" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" diff --git a/package.bak/gcc/4.9.4/901-microblaze-uclibc.patch b/package.bak/gcc/4.9.4/901-microblaze-uclibc.patch deleted file mode 100644 index 82c44e149f..0000000000 --- a/package.bak/gcc/4.9.4/901-microblaze-uclibc.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add dynamic linker support for uClibc - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/gcc/config/microblaze/linux.h gcc-4.9.3/gcc/config/microblaze/linux.h ---- gcc-4.9.3.orig/gcc/config/microblaze/linux.h 2016-06-04 21:21:09.430646655 +0200 -+++ gcc-4.9.3/gcc/config/microblaze/linux.h 2016-06-04 21:21:44.596003509 +0200 -@@ -36,10 +36,13 @@ - - #undef MUSL_DYNAMIC_LINKER - #define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - - #if DEFAULT_LIBC == LIBC_MUSL - #define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#elif DEFAULT_LIBC == LIBC_UCLIBC -+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER - #else - #define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER - #endif diff --git a/package.bak/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch b/package.bak/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 670cf8dae1..0000000000 --- a/package.bak/gcc/4.9.4/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-4.9.3.orig/libgcc/config/t-stack gcc-4.9.3/libgcc/config/t-stack ---- gcc-4.9.3.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-4.9.3/libgcc/config/t-stack 2016-03-07 01:34:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/package.bak/gcc/4.9.4/940-uclinux-enable-threads.patch b/package.bak/gcc/4.9.4/940-uclinux-enable-threads.patch deleted file mode 100644 index 5108147627..0000000000 --- a/package.bak/gcc/4.9.4/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,20 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -810,6 +810,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package.bak/gcc/5.4.0/100-uclibc-conf.patch b/package.bak/gcc/5.4.0/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a9..0000000000 --- a/package.bak/gcc/5.4.0/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package.bak/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch b/package.bak/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch deleted file mode 100644 index c11ad35aac..0000000000 --- a/package.bak/gcc/5.4.0/120-gcc-config.gcc-fix-typo-for-powerpc-e6500-cpu_is_64b.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9bf6066d588632dab9f78932df15b5b4140f31f3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 6 Nov 2015 14:27:23 +0100 -Subject: [PATCH] gcc/config.gcc: fix typo for powerpc e6500 cpu_is_64bit - -Otherwise it is not recognized as a 64-bit powerpc and gcc will not generate -64-bit binaries by default. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gcc/config.gcc | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 4a7cbd2..9cc765e 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -439,7 +439,7 @@ powerpc*-*-*) - cpu_type=rs6000 - extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h" - case x$with_cpu in -- xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|Xe6500) -+ xpowerpc64|xdefault64|x6[23]0|x970|xG5|xpower[345678]|xpower6x|xrs64a|xcell|xa2|xe500mc64|xe5500|xe6500) - cpu_is_64bit=yes - ;; - esac --- -2.6.2 - diff --git a/package.bak/gcc/5.4.0/301-missing-execinfo_h.patch b/package.bak/gcc/5.4.0/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa44..0000000000 --- a/package.bak/gcc/5.4.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/5.4.0/810-arm-softfloat-libgcc.patch b/package.bak/gcc/5.4.0/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1bc..0000000000 --- a/package.bak/gcc/5.4.0/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package.bak/gcc/5.4.0/830-arm_unbreak_armv4t.patch b/package.bak/gcc/5.4.0/830-arm_unbreak_armv4t.patch deleted file mode 100644 index b730059183..0000000000 --- a/package.bak/gcc/5.4.0/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package.bak/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/package.bak/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch deleted file mode 100644 index d8c74f959e..0000000000 --- a/package.bak/gcc/5.4.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 89bd94250827f887b38211ac048b4006229dc9c0 Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Fri, 26 Aug 2016 10:23:20 +0000 -Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton - - PR target/70473 - * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce - reservation duration to 15 cycles. - (cortex_a8_vfp_macs): Likewise. - (cortex_a8_vfp_macd): Likewise. - (cortex_a8_vfp_divs): Likewise. - (cortex_a8_vfp_divd): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] -Signed-off-by: Thomas Petazzoni ---- - gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md -index 04fa01e..4e6d05d 100644 ---- a/gcc/config/arm/cortex-a8-neon.md -+++ b/gcc/config/arm/cortex-a8-neon.md -@@ -357,30 +357,34 @@ - (eq_attr "type" "fmuls")) - "cortex_a8_vfp,cortex_a8_vfplite*11") - -+;; Don't model a reservation for more than 15 cycles as this explodes the -+;; state space of the automaton for little gain. It is unlikely that the -+;; scheduler will find enough instructions to hide the full latency of the -+;; instructions. - (define_insn_reservation "cortex_a8_vfp_muld" 17 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmuld")) -- "cortex_a8_vfp,cortex_a8_vfplite*16") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macs" 21 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacs,ffmas")) -- "cortex_a8_vfp,cortex_a8_vfplite*20") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macd" 26 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacd,ffmad")) -- "cortex_a8_vfp,cortex_a8_vfplite*25") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divs" 37 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivs, fsqrts")) -- "cortex_a8_vfp,cortex_a8_vfplite*36") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divd" 65 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivd, fsqrtd")) -- "cortex_a8_vfp,cortex_a8_vfplite*64") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - ;; Comparisons can actually take 7 cycles sometimes instead of four, - ;; but given all the other instructions lumped into type=ffarith that --- -2.7.4 - diff --git a/package.bak/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch b/package.bak/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch deleted file mode 100644 index 9d29090a2a..0000000000 --- a/package.bak/gcc/5.4.0/840-microblaze-enable-dwarf-eh-support.patch +++ /dev/null @@ -1,166 +0,0 @@ -Fetched from Xilinx gcc git at https://github.com/Xilinx/gcc - -From 23c35173490ac2d6348a668dfc9c1a6eb62171f2 Mon Sep 17 00:00:00 2001 -From: "Edgar E. Iglesias" -Date: Mon, 18 Jun 2012 20:18:13 +0200 -Subject: [PATCH] [Patch, microblaze]: Enable DWARF exception handling support. - -Changelog - -2013-03-18 Edgar E. Iglesias - David Holsgrove - - * common/config/microblaze/microblaze-common.c: Remove - TARGET_EXCEPT_UNWIND_INFO definition. - * config/microblaze/microblaze-protos.h: Add - microblaze_eh_return prototype. - * gcc/config/microblaze/microblaze.c: (microblaze_must_save_register, - microblaze_expand_epilogue, microblaze_return_addr): Handle - calls_eh_return - (microblaze_eh_return): New function. - * gcc/config/microblaze/microblaze.h: Define RETURN_ADDR_OFFSET, - EH_RETURN_DATA_REGNO, MB_EH_STACKADJ_REGNUM, EH_RETURN_STACKADJ_RTX, - ASM_PREFERRED_EH_DATA_FORMAT - * gcc/config/microblaze/microblaze.md: Define eh_return pattern. - -Signed-off-by: David Holsgrove -Signed-off-by: Edgar E. Iglesias ---- - gcc/common/config/microblaze/microblaze-common.c | 3 --- - gcc/config/microblaze/microblaze-protos.h | 1 + - gcc/config/microblaze/microblaze.c | 29 ++++++++++++++++++++---- - gcc/config/microblaze/microblaze.h | 15 ++++++++++++ - gcc/config/microblaze/microblaze.md | 11 +++++++++ - 5 files changed, 52 insertions(+), 7 deletions(-) - -Index: b/gcc/common/config/microblaze/microblaze-common.c -=================================================================== ---- a/gcc/common/config/microblaze/microblaze-common.c -+++ b/gcc/common/config/microblaze/microblaze-common.c -@@ -37,7 +37,4 @@ - #undef TARGET_OPTION_OPTIMIZATION_TABLE - #define TARGET_OPTION_OPTIMIZATION_TABLE microblaze_option_optimization_table - --#undef TARGET_EXCEPT_UNWIND_INFO --#define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info -- - struct gcc_targetm_common targetm_common = TARGETM_COMMON_INITIALIZER; -Index: b/gcc/config/microblaze/microblaze-protos.h -=================================================================== ---- a/gcc/config/microblaze/microblaze-protos.h -+++ b/gcc/config/microblaze/microblaze-protos.h -@@ -56,6 +56,7 @@ - extern int symbol_mentioned_p (rtx); - extern int label_mentioned_p (rtx); - extern bool microblaze_cannot_force_const_mem (machine_mode, rtx); -+extern void microblaze_eh_return (rtx op0); - #endif /* RTX_CODE */ - - /* Declare functions in microblaze-c.c. */ -Index: b/gcc/config/microblaze/microblaze.c -=================================================================== ---- a/gcc/config/microblaze/microblaze.c -+++ b/gcc/config/microblaze/microblaze.c -@@ -1959,6 +1959,11 @@ - if (frame_pointer_needed && (regno == HARD_FRAME_POINTER_REGNUM)) - return 1; - -+ if (crtl->calls_eh_return -+ && regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) { -+ return 1; -+ } -+ - if (!crtl->is_leaf) - { - if (regno == MB_ABI_SUB_RETURN_ADDR_REGNUM) -@@ -1986,6 +1991,13 @@ - return 1; - } - -+ if (crtl->calls_eh_return -+ && (regno == EH_RETURN_DATA_REGNO (0) -+ || regno == EH_RETURN_DATA_REGNO (1))) -+ { -+ return 1; -+ } -+ - return 0; - } - -@@ -3067,6 +3079,12 @@ - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, fsiz_rtx)); - } - -+ if (crtl->calls_eh_return) -+ emit_insn (gen_addsi3 (stack_pointer_rtx, -+ stack_pointer_rtx, -+ gen_rtx_raw_REG (SImode, -+ MB_EH_STACKADJ_REGNUM))); -+ - emit_jump_insn (gen_return_internal (gen_rtx_REG (Pmode, GP_REG_FIRST + - MB_ABI_SUB_RETURN_ADDR_REGNUM))); - } -@@ -3364,10 +3382,13 @@ - if (count != 0) - return NULL_RTX; - -- return gen_rtx_PLUS (Pmode, -- get_hard_reg_initial_val (Pmode, -- MB_ABI_SUB_RETURN_ADDR_REGNUM), -- GEN_INT (8)); -+ return get_hard_reg_initial_val (Pmode, -+ MB_ABI_SUB_RETURN_ADDR_REGNUM); -+} -+ -+void microblaze_eh_return (rtx op0) -+{ -+ emit_insn (gen_movsi(gen_rtx_MEM(Pmode, stack_pointer_rtx), op0)); - } - - /* Queue an .ident string in the queue of top-level asm statements. -Index: b/gcc/config/microblaze/microblaze.h -=================================================================== ---- a/gcc/config/microblaze/microblaze.h -+++ b/gcc/config/microblaze/microblaze.h -@@ -184,6 +184,21 @@ - #define INCOMING_RETURN_ADDR_RTX \ - gen_rtx_REG (VOIDmode, GP_REG_FIRST + MB_ABI_SUB_RETURN_ADDR_REGNUM) - -+/* Specifies the offset from INCOMING_RETURN_ADDR_RTX and the actual return PC. */ -+#define RETURN_ADDR_OFFSET (8) -+ -+/* Describe how we implement __builtin_eh_return. */ -+#define EH_RETURN_DATA_REGNO(N) (((N) < 2) ? MB_ABI_FIRST_ARG_REGNUM + (N) : INVALID_REGNUM) -+ -+#define MB_EH_STACKADJ_REGNUM MB_ABI_INT_RETURN_VAL2_REGNUM -+#define EH_RETURN_STACKADJ_RTX gen_rtx_REG (Pmode, MB_EH_STACKADJ_REGNUM) -+ -+/* Select a format to encode pointers in exception handling data. CODE -+ is 0 for data, 1 for code labels, 2 for function pointers. GLOBAL is -+ true if the symbol may be affected by dynamic relocations. */ -+#define ASM_PREFERRED_EH_DATA_FORMAT(CODE,GLOBAL) \ -+ ((flag_pic || GLOBAL) ? DW_EH_PE_aligned : DW_EH_PE_absptr) -+ - /* Use DWARF 2 debugging information by default. */ - #define DWARF2_DEBUGGING_INFO - #define PREFERRED_DEBUGGING_TYPE DWARF2_DEBUG -Index: b/gcc/config/microblaze/microblaze.md -=================================================================== ---- a/gcc/config/microblaze/microblaze.md -+++ b/gcc/config/microblaze/microblaze.md -@@ -2272,4 +2272,15 @@ - (set_attr "mode" "SI") - (set_attr "length" "4")]) - -+; This is used in compiling the unwind routines. -+(define_expand "eh_return" -+ [(use (match_operand 0 "general_operand" ""))] -+ "" -+ " -+{ -+ microblaze_eh_return(operands[0]); -+ DONE; -+}") -+ - (include "sync.md") -+ diff --git a/package.bak/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch b/package.bak/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 9e97d945d3..0000000000 --- a/package.bak/gcc/5.4.0/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -5239,7 +5239,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -992,7 +992,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // Precision is always used except for hexfloat format. - const bool __use_prec = - (__io.flags() & ios_base::floatfield) != ios_base::floatfield; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -578,7 +578,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -195,7 +195,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -192,7 +192,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/package.bak/gcc/5.4.0/860-cilk-wchar.patch b/package.bak/gcc/5.4.0/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f554..0000000000 --- a/package.bak/gcc/5.4.0/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package.bak/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch b/package.bak/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch deleted file mode 100644 index aa1376c44c..0000000000 --- a/package.bak/gcc/5.4.0/870-xtensa-add-mauto-litpools-option.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 6d852ffb43b111a39162135c95249e749c4e285b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 6 Aug 2015 01:16:02 +0300 -Subject: [PATCH] xtensa: add -mauto-litpools option - -With support from assembler this option allows compiling huge functions, -where single literal pool at the beginning of a function may not be -reachable by L32R instructions at its end. - -Currently assembler --auto-litpools option cannot deal with literals -used from multiple locations separated by more than 256 KBytes of code. -Don't turn constants into literals, instead use MOVI instruction to load -them into registers and let the assembler turn them into literals as -necessary. - -2015-08-12 Max Filippov -gcc/ - * config/xtensa/constraints.md (define_constraint "Y"): New - constraint. - * config/xtensa/elf.h (ASM_SPEC): Add m(no-)auto-litpools. - * config/xtensa/linux.h (ASM_SPEC): Likewise. - * config/xtensa/predicates.md (move_operand): Match constants - and symbols in the presence of TARGET_AUTO_LITPOOLS. - * config/xtensa/xtensa.c (xtensa_valid_move): Don't allow - immediate references to TLS data. - (xtensa_emit_move_sequence): Don't force constants to memory in - the presence of TARGET_AUTO_LITPOOLS. - (print_operand): Add 'y' format, same as default, but capable of - printing SF mode constants as well. - * config/xtensa/xtensa.md (movsi_internal, movhi_internal) - (movsf_internal): Add movi pattern that loads literal. - (movsf, movdf): Don't force constants to memory in the presence - of TARGET_AUTO_LITPOOLS. - (movdf_internal): Add 'Y' constraint. - * config/xtensa/xtensa.opt (mauto-litpools): New option. - -Signed-off-by: Max Filippov ---- -Backported from: r226828 -Changes to ChangeLogs and documentation are dropped. - - gcc/config/xtensa/constraints.md | 5 +++++ - gcc/config/xtensa/elf.h | 4 +++- - gcc/config/xtensa/linux.h | 4 +++- - gcc/config/xtensa/predicates.md | 3 ++- - gcc/config/xtensa/xtensa.c | 19 ++++++++++++++++++- - gcc/config/xtensa/xtensa.md | 35 +++++++++++++++++++---------------- - gcc/config/xtensa/xtensa.opt | 4 ++++ - 7 files changed, 54 insertions(+), 20 deletions(-) - -diff --git a/gcc/config/xtensa/constraints.md b/gcc/config/xtensa/constraints.md -index 30f4c1f..773d4f9 100644 ---- a/gcc/config/xtensa/constraints.md -+++ b/gcc/config/xtensa/constraints.md -@@ -111,6 +111,11 @@ - (and (match_code "const_int") - (match_test "xtensa_mask_immediate (ival)"))) - -+(define_constraint "Y" -+ "A constant that can be used in relaxed MOVI instructions." -+ (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -+ (match_test "TARGET_AUTO_LITPOOLS"))) -+ - ;; Memory constraints. Do not use define_memory_constraint here. Doing so - ;; causes reload to force some constants into the constant pool, but since - ;; the Xtensa constant pool can only be accessed with L32R instructions, it -diff --git a/gcc/config/xtensa/elf.h b/gcc/config/xtensa/elf.h -index e59bede..12056f7 100644 ---- a/gcc/config/xtensa/elf.h -+++ b/gcc/config/xtensa/elf.h -@@ -48,7 +48,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #undef LIB_SPEC - #define LIB_SPEC "-lc -lsim -lc -lhandlers-sim -lhal" -diff --git a/gcc/config/xtensa/linux.h b/gcc/config/xtensa/linux.h -index 675aacf..5b0243a 100644 ---- a/gcc/config/xtensa/linux.h -+++ b/gcc/config/xtensa/linux.h -@@ -42,7 +42,9 @@ along with GCC; see the file COPYING3. If not see - %{mtarget-align:--target-align} \ - %{mno-target-align:--no-target-align} \ - %{mlongcalls:--longcalls} \ -- %{mno-longcalls:--no-longcalls}" -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - -diff --git a/gcc/config/xtensa/predicates.md b/gcc/config/xtensa/predicates.md -index e02209e..d7dfa11 100644 ---- a/gcc/config/xtensa/predicates.md -+++ b/gcc/config/xtensa/predicates.md -@@ -142,7 +142,8 @@ - (match_test "GET_MODE_CLASS (mode) == MODE_INT - && xtensa_simm12b (INTVAL (op))")) - (and (match_code "const_int,const_double,const,symbol_ref,label_ref") -- (match_test "TARGET_CONST16 && CONSTANT_P (op) -+ (match_test "(TARGET_CONST16 || TARGET_AUTO_LITPOOLS) -+ && CONSTANT_P (op) - && GET_MODE_SIZE (mode) % UNITS_PER_WORD == 0"))))) - - ;; Accept the floating point constant 1 in the appropriate mode. -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index eb039ba..206ff80 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -501,6 +501,9 @@ xtensa_valid_move (machine_mode mode, rtx *operands) - { - int dst_regnum = xt_true_regnum (operands[0]); - -+ if (xtensa_tls_referenced_p (operands[1])) -+ return FALSE; -+ - /* The stack pointer can only be assigned with a MOVSP opcode. */ - if (dst_regnum == STACK_POINTER_REGNUM) - return !TARGET_WINDOWED_ABI -@@ -1069,7 +1072,7 @@ xtensa_emit_move_sequence (rtx *operands, machine_mode mode) - return 1; - } - -- if (! TARGET_CONST16) -+ if (! TARGET_AUTO_LITPOOLS && ! TARGET_CONST16) - { - src = force_const_mem (SImode, src); - operands[1] = src; -@@ -2449,6 +2452,20 @@ print_operand (FILE *file, rtx x, int letter) - } - break; - -+ case 'y': -+ if (GET_CODE (x) == CONST_DOUBLE && -+ GET_MODE (x) == SFmode) -+ { -+ REAL_VALUE_TYPE r; -+ long l; -+ REAL_VALUE_FROM_CONST_DOUBLE (r, x); -+ REAL_VALUE_TO_TARGET_SINGLE (r, l); -+ fprintf (file, "0x%08lx", l); -+ break; -+ } -+ -+ /* fall through */ -+ - default: - if (GET_CODE (x) == REG || GET_CODE (x) == SUBREG) - fprintf (file, "%s", reg_names[xt_true_regnum (x)]); -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..0e673a3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -761,8 +761,8 @@ - }) - - (define_insn "movsi_internal" -- [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,W,a,a,U,*a,*A") -- (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,i,T,U,r,*A,*r"))] -+ [(set (match_operand:SI 0 "nonimmed_operand" "=D,D,D,D,R,R,a,q,a,a,W,a,a,U,*a,*A") -+ (match_operand:SI 1 "move_operand" "M,D,d,R,D,d,r,r,I,Y,i,T,U,r,*A,*r"))] - "xtensa_valid_move (SImode, operands)" - "@ - movi.n\t%0, %x1 -@@ -774,15 +774,16 @@ - mov\t%0, %1 - movsp\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,load,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,load,store,store,move,move,move,move,move,load,load,store,rsr,wsr") - (set_attr "mode" "SI") -- (set_attr "length" "2,2,2,2,2,2,3,3,3,6,3,3,3,3,3")]) -+ (set_attr "length" "2,2,2,2,2,2,3,3,3,3,6,3,3,3,3,3")]) - - ;; 16-bit Integer moves - -@@ -796,21 +797,22 @@ - }) - - (define_insn "movhi_internal" -- [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,U,*a,*A") -- (match_operand:HI 1 "move_operand" "M,d,r,I,U,r,*A,*r"))] -+ [(set (match_operand:HI 0 "nonimmed_operand" "=D,D,a,a,a,a,U,*a,*A") -+ (match_operand:HI 1 "move_operand" "M,d,r,I,Y,U,r,*A,*r"))] - "xtensa_valid_move (HImode, operands)" - "@ - movi.n\t%0, %x1 - mov.n\t%0, %1 - mov\t%0, %1 - movi\t%0, %x1 -+ movi\t%0, %1 - %v1l16ui\t%0, %1 - %v0s16i\t%1, %0 - rsr\t%0, ACCLO - wsr\t%1, ACCLO" -- [(set_attr "type" "move,move,move,move,load,store,rsr,wsr") -+ [(set_attr "type" "move,move,move,move,move,load,store,rsr,wsr") - (set_attr "mode" "HI") -- (set_attr "length" "2,2,3,3,3,3,3,3")]) -+ (set_attr "length" "2,2,3,3,3,3,3,3,3")]) - - ;; 8-bit Integer moves - -@@ -881,7 +883,7 @@ - (match_operand:SF 1 "general_operand" ""))] - "" - { -- if (!TARGET_CONST16 && CONSTANT_P (operands[1])) -+ if (!TARGET_CONST16 && !TARGET_AUTO_LITPOOLS && CONSTANT_P (operands[1])) - operands[1] = force_const_mem (SFmode, operands[1]); - - if ((!register_operand (operands[0], SFmode) -@@ -896,8 +898,8 @@ - }) - - (define_insn "movsf_internal" -- [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,W,a,a,U") -- (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,iF,T,U,r"))] -+ [(set (match_operand:SF 0 "nonimmed_operand" "=f,f,U,D,D,R,a,f,a,a,W,a,a,U") -+ (match_operand:SF 1 "move_operand" "f,U,f,d,R,d,r,r,f,Y,iF,T,U,r"))] - "((register_operand (operands[0], SFmode) - || register_operand (operands[1], SFmode)) - && !(FP_REG_P (xt_true_regnum (operands[0])) -@@ -912,13 +914,14 @@ - mov\t%0, %1 - wfr\t%0, %1 - rfr\t%0, %1 -+ movi\t%0, %y1 - const16\t%0, %t1\;const16\t%0, %b1 - %v1l32r\t%0, %1 - %v1l32i\t%0, %1 - %v0s32i\t%1, %0" -- [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,load,load,store") -+ [(set_attr "type" "farith,fload,fstore,move,load,store,move,farith,farith,move,move,load,load,store") - (set_attr "mode" "SF") -- (set_attr "length" "3,3,3,2,2,2,3,3,3,6,3,3,3")]) -+ (set_attr "length" "3,3,3,2,2,2,3,3,3,3,6,3,3,3")]) - - (define_insn "*lsiu" - [(set (match_operand:SF 0 "register_operand" "=f") -@@ -991,7 +994,7 @@ - (match_operand:DF 1 "general_operand" ""))] - "" - { -- if (CONSTANT_P (operands[1]) && !TARGET_CONST16) -+ if (CONSTANT_P (operands[1]) && !TARGET_CONST16 && !TARGET_AUTO_LITPOOLS) - operands[1] = force_const_mem (DFmode, operands[1]); - - if (!register_operand (operands[0], DFmode) -@@ -1002,8 +1005,8 @@ - }) - - (define_insn_and_split "movdf_internal" -- [(set (match_operand:DF 0 "nonimmed_operand" "=a,W,a,a,U") -- (match_operand:DF 1 "move_operand" "r,iF,T,U,r"))] -+ [(set (match_operand:DF 0 "nonimmed_operand" "=a,a,W,a,a,U") -+ (match_operand:DF 1 "move_operand" "r,Y,iF,T,U,r"))] - "register_operand (operands[0], DFmode) - || register_operand (operands[1], DFmode)" - "#" -diff --git a/gcc/config/xtensa/xtensa.opt b/gcc/config/xtensa/xtensa.opt -index 2fd6cee..21c6e96 100644 ---- a/gcc/config/xtensa/xtensa.opt -+++ b/gcc/config/xtensa/xtensa.opt -@@ -38,6 +38,10 @@ mtext-section-literals - Target - Intersperse literal pools with code in the text section - -+mauto-litpools -+Target Report Mask(AUTO_LITPOOLS) -+Relax literals in assembler and place them automatically in the text section -+ - mserialize-volatile - Target Report Mask(SERIALIZE_VOLATILE) - -mno-serialize-volatile Do not serialize volatile memory references with MEMW instructions --- -1.8.1.4 - diff --git a/package.bak/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch b/package.bak/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch deleted file mode 100644 index 4056f8b8ed..0000000000 --- a/package.bak/gcc/5.4.0/871-xtensa-reimplement-register-spilling.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 40507bf199440082ed69b777986d50c31efe2520 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 10 Aug 2015 21:35:20 +0300 -Subject: [PATCH 1/3] xtensa: reimplement register spilling - -Spilling windowed registers in userspace is much easier, more portable, -less error-prone and equally effective as in kernel. Now that register -spilling syscall is considered obsolete in the xtensa linux kernel -replace it with CALL12 followed by series of ENTRY in libgcc. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/lib2funcs.S (__xtensa_libgcc_window_spill): Use - CALL12 followed by series of ENTRY to spill windowed registers. - (__xtensa_nonlocal_goto): Call __xtensa_libgcc_window_spill - instead of making linux spill syscall. - -Signed-off-by: Max Filippov ---- -Backported from: r226962 - - libgcc/config/xtensa/lib2funcs.S | 30 +++++++++++++++++++++++------- - 1 file changed, 23 insertions(+), 7 deletions(-) - -diff --git a/libgcc/config/xtensa/lib2funcs.S b/libgcc/config/xtensa/lib2funcs.S -index 4d451c8..ef0703f 100644 ---- a/libgcc/config/xtensa/lib2funcs.S -+++ b/libgcc/config/xtensa/lib2funcs.S -@@ -34,10 +34,29 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - .global __xtensa_libgcc_window_spill - .type __xtensa_libgcc_window_spill,@function - __xtensa_libgcc_window_spill: -- entry sp, 32 -- movi a2, 0 -- syscall -+ entry sp, 48 -+#if XCHAL_NUM_AREGS > 16 -+ call12 1f -+ retw -+ .align 4 -+1: -+ .rept (XCHAL_NUM_AREGS - 24) / 12 -+ _entry sp, 48 -+ mov a12, a0 -+ .endr -+ _entry sp, 16 -+#if XCHAL_NUM_AREGS % 12 == 0 -+ mov a4, a4 -+#elif XCHAL_NUM_AREGS % 12 == 4 -+ mov a8, a8 -+#elif XCHAL_NUM_AREGS % 12 == 8 -+ mov a12, a12 -+#endif - retw -+#else -+ mov a8, a8 -+ retw -+#endif - .size __xtensa_libgcc_window_spill, .-__xtensa_libgcc_window_spill - #endif - -@@ -61,10 +80,7 @@ __xtensa_nonlocal_goto: - entry sp, 32 - - /* Flush registers. */ -- mov a5, a2 -- movi a2, 0 -- syscall -- mov a2, a5 -+ call8 __xtensa_libgcc_window_spill - - /* Because the save area for a0-a3 is stored one frame below - the one identified by a2, the only way to restore those --- -1.8.1.4 - diff --git a/package.bak/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch b/package.bak/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch deleted file mode 100644 index 9707f6881c..0000000000 --- a/package.bak/gcc/5.4.0/872-xtensa-use-unwind-dw2-fde-dip-instead-of-unwind-dw2-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7d7a85f75ba218df4a4226e95865fc8fa561cb86 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Fri, 14 Aug 2015 02:45:02 +0300 -Subject: [PATCH 2/3] xtensa: use unwind-dw2-fde-dip instead of unwind-dw2-fde - -This allows having exception cleanup code in binaries that don't -register their unwind tables. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/t-windowed (LIB2ADDEH): Replace unwind-dw2-fde - with unwind-dw2-fde-dip. - -Signed-off-by: Max Filippov ---- -Backported from: r226963 - - libgcc/config/xtensa/t-windowed | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/t-windowed b/libgcc/config/xtensa/t-windowed -index 7d9e9db..a99156c 100644 ---- a/libgcc/config/xtensa/t-windowed -+++ b/libgcc/config/xtensa/t-windowed -@@ -1,2 +1,2 @@ - LIB2ADDEH = $(srcdir)/config/xtensa/unwind-dw2-xtensa.c \ -- $(srcdir)/unwind-dw2-fde.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c -+ $(srcdir)/unwind-dw2-fde-dip.c $(srcdir)/unwind-sjlj.c $(srcdir)/unwind-c.c --- -1.8.1.4 - diff --git a/package.bak/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch b/package.bak/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch deleted file mode 100644 index 2d8eb7c778..0000000000 --- a/package.bak/gcc/5.4.0/873-xtensa-fix-_Unwind_GetCFA.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b33905dc310f475ddbde4c9fb7230724b2068a2b Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 15 Aug 2015 05:12:11 +0300 -Subject: [PATCH 3/3] xtensa: fix _Unwind_GetCFA - -Returning context->cfa in _Unwind_GetCFA makes CFA point one stack frame -higher than what was actually used by code at context->ra. This results -in invalid CFA value in signal frames and premature unwinding completion -in forced unwinding used by uClibc NPTL thread cancellation. -Returning context->sp from _Unwind_GetCFA makes all CFA values valid and -matching code that used them. - -2015-08-18 Max Filippov -libgcc/ - * config/xtensa/unwind-dw2-xtensa.c (_Unwind_GetCFA): Return - context->sp instead of context->cfa. - -Signed-off-by: Max Filippov ---- -Backported from: r226964 - - libgcc/config/xtensa/unwind-dw2-xtensa.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgcc/config/xtensa/unwind-dw2-xtensa.c b/libgcc/config/xtensa/unwind-dw2-xtensa.c -index 82b0e63..8e579c7 100644 ---- a/libgcc/config/xtensa/unwind-dw2-xtensa.c -+++ b/libgcc/config/xtensa/unwind-dw2-xtensa.c -@@ -130,7 +130,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index) - _Unwind_Word - _Unwind_GetCFA (struct _Unwind_Context *context) - { -- return (_Unwind_Ptr) context->cfa; -+ return (_Unwind_Ptr) context->sp; - } - - /* Overwrite the saved value for register INDEX in CONTEXT with VAL. */ --- -1.8.1.4 - diff --git a/package.bak/gcc/5.4.0/874-xtensa-add-uclinux-support.patch b/package.bak/gcc/5.4.0/874-xtensa-add-uclinux-support.patch deleted file mode 100644 index 23db3d863c..0000000000 --- a/package.bak/gcc/5.4.0/874-xtensa-add-uclinux-support.patch +++ /dev/null @@ -1,174 +0,0 @@ -From 70c2cb98fb129b4766b5da0f945dc41fd568c77a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Sat, 22 Aug 2015 08:44:26 +0300 -Subject: [PATCH] xtensa: add uclinux support - -2015-10-03 Max Filippov -gcc/ - * config.gcc (xtensa*-*-uclinux*): New configuration. - * config/xtensa/uclinux.h: New file. - * config/xtensa/uclinux.opt: New file. - -libgcc/ - * config.host (xtensa*-*-uclinux*): New configuration. - -Signed-off-by: Max Filippov ---- -Backported from: r228450 - - gcc/config.gcc | 5 ++++ - gcc/config/xtensa/uclinux.h | 69 +++++++++++++++++++++++++++++++++++++++++++ - gcc/config/xtensa/uclinux.opt | 32 ++++++++++++++++++++ - libgcc/config.host | 5 ++++ - 4 files changed, 111 insertions(+) - create mode 100644 gcc/config/xtensa/uclinux.h - create mode 100644 gcc/config/xtensa/uclinux.opt - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index c52f5a8..56797bd 100644 ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -2995,6 +2995,11 @@ xtensa*-*-linux*) - tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/linux.h" - tmake_file="${tmake_file} xtensa/t-xtensa" - ;; -+xtensa*-*-uclinux*) -+ tm_file="${tm_file} dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h xtensa/uclinux.h" -+ tmake_file="${tmake_file} xtensa/t-xtensa" -+ extra_options="${extra_options} xtensa/uclinux.opt" -+ ;; - am33_2.0-*-linux*) - tm_file="mn10300/mn10300.h dbxelf.h elfos.h gnu-user.h linux.h glibc-stdint.h mn10300/linux.h" - gas=yes gnu_ld=yes -diff --git a/gcc/config/xtensa/uclinux.h b/gcc/config/xtensa/uclinux.h -new file mode 100644 -index 0000000..4606020 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.h -@@ -0,0 +1,69 @@ -+/* Xtensa uClinux configuration. -+ Derived from the configuration for GCC for Intel i386 running Linux. -+ Copyright (C) 2001-2015 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free -+Software Foundation; either version 3, or (at your option) any later -+version. -+ -+GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or -+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+. */ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ GNU_USER_TARGET_OS_CPP_BUILTINS (); \ -+ builtin_define ("__uClinux__"); \ -+ } \ -+ while (0) -+ -+#undef SUBTARGET_CPP_SPEC -+#define SUBTARGET_CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ -+#undef SIZE_TYPE -+#define SIZE_TYPE "unsigned int" -+ -+#undef PTRDIFF_TYPE -+#define PTRDIFF_TYPE "int" -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "long int" -+ -+#undef WCHAR_TYPE_SIZE -+#define WCHAR_TYPE_SIZE 32 -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%{mtext-section-literals:--text-section-literals} \ -+ %{mno-text-section-literals:--no-text-section-literals} \ -+ %{mtarget-align:--target-align} \ -+ %{mno-target-align:--no-target-align} \ -+ %{mlongcalls:--longcalls} \ -+ %{mno-longcalls:--no-longcalls} \ -+ %{mauto-litpools:--auto-litpools} \ -+ %{mno-auto-litpools:--no-auto-litpools}" -+ -+#undef LINK_SPEC -+#define LINK_SPEC "%{!no-elf2flt:%{!elf2flt*:-elf2flt}}" -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* Always enable "-fpic" for Xtensa Linux. */ -+#define XTENSA_ALWAYS_PIC 1 -+ -+#undef TARGET_LIBC_HAS_FUNCTION -+#define TARGET_LIBC_HAS_FUNCTION no_c99_libc_has_function -+ -+#undef DBX_REGISTER_NUMBER -+ -diff --git a/gcc/config/xtensa/uclinux.opt b/gcc/config/xtensa/uclinux.opt -new file mode 100644 -index 0000000..95ef777 ---- /dev/null -+++ b/gcc/config/xtensa/uclinux.opt -@@ -0,0 +1,32 @@ -+; Xtensa uClinux options. -+ -+; Copyright (C) 2015 Free Software Foundation, Inc. -+; -+; This file is part of GCC. -+; -+; GCC is free software; you can redistribute it and/or modify it under -+; the terms of the GNU General Public License as published by the Free -+; Software Foundation; either version 3, or (at your option) any later -+; version. -+; -+; GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+; WARRANTY; without even the implied warranty of MERCHANTABILITY or -+; FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+; for more details. -+; -+; You should have received a copy of the GNU General Public License -+; along with GCC; see the file COPYING3. If not see -+; . -+ -+; See the GCC internals manual (options.texi) for a description of -+; this file's format. -+ -+; Please try to keep this file in ASCII collating order. -+ -+elf2flt -+Driver -+ -+elf2flt= -+Driver JoinedOrMissing -+ -+; This comment is to ensure we retain the blank line above. -diff --git a/libgcc/config.host b/libgcc/config.host -index 2c64756..2ee92c1 100644 ---- a/libgcc/config.host -+++ b/libgcc/config.host -@@ -1295,6 +1295,11 @@ xtensa*-*-linux*) - tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" - md_unwind_header=xtensa/linux-unwind.h - ;; -+xtensa*-*-uclinux*) -+ tmake_file="$tmake_file xtensa/t-xtensa xtensa/t-linux t-slibgcc-libgcc" -+ md_unwind_header=xtensa/linux-unwind.h -+ extra_parts="$extra_parts crtbeginS.o crtbeginT.o crtendS.o" -+ ;; - am33_2.0-*-linux*) - # Don't need crtbeginT.o from *-*-linux* default. - extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o" --- -1.8.1.4 - diff --git a/package.bak/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch b/package.bak/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch deleted file mode 100644 index 870b079e38..0000000000 --- a/package.bak/gcc/5.4.0/875-xtensa-implement-trap-pattern.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 2b4b5775554c91a63ccae4ee566db696b633652e Mon Sep 17 00:00:00 2001 -From: jcmvbkbc -Date: Wed, 10 Jun 2015 15:07:40 +0000 -Subject: [PATCH] xtensa: implement trap pattern - -2015-06-10 Max Filippov -gcc/ - * config/xtensa/xtensa.h (TARGET_DEBUG): New definition. - * config/xtensa/xtensa.md (define_attr "type"): New type "trap". - (define_insn "trap"): New definition. - -Signed-off-by: Max Filippov - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224330 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - gcc/config/xtensa/xtensa.h | 1 + - gcc/config/xtensa/xtensa.md | 15 ++++++++++++++- - 2 files changed, 15 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h -index 615f741..fb8702c 100644 ---- a/gcc/config/xtensa/xtensa.h -+++ b/gcc/config/xtensa/xtensa.h -@@ -67,6 +67,7 @@ extern unsigned xtensa_current_frame_size; - #define TARGET_THREADPTR XCHAL_HAVE_THREADPTR - #define TARGET_LOOPS XCHAL_HAVE_LOOPS - #define TARGET_WINDOWED_ABI (XSHAL_ABI == XTHAL_ABI_WINDOWED) -+#define TARGET_DEBUG XCHAL_HAVE_DEBUG - - #define TARGET_DEFAULT \ - ((XCHAL_HAVE_L32R ? 0 : MASK_CONST16) | \ -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index 6d84384..a577aa3 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -86,7 +86,7 @@ - ;; Attributes. - - (define_attr "type" -- "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry" -+ "unknown,jump,call,load,store,move,arith,multi,nop,farith,fmadd,fconv,fload,fstore,mul16,mul32,div32,mac16,rsr,wsr,entry,trap" - (const_string "unknown")) - - (define_attr "mode" -@@ -1764,6 +1764,19 @@ - [(set_attr "length" "0") - (set_attr "type" "nop")]) - -+(define_insn "trap" -+ [(trap_if (const_int 1) (const_int 0))] -+ "" -+{ -+ if (TARGET_DEBUG) -+ return "break\t1, 15"; -+ else -+ return (TARGET_DENSITY ? "ill.n" : "ill"); -+} -+ [(set_attr "type" "trap") -+ (set_attr "mode" "none") -+ (set_attr "length" "3")]) -+ - ;; Setting up a frame pointer is tricky for Xtensa because GCC doesn't - ;; know if a frame pointer is required until the reload pass, and - ;; because there may be an incoming argument value in the hard frame --- -2.1.4 - diff --git a/package.bak/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch b/package.bak/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch deleted file mode 100644 index 628268ada4..0000000000 --- a/package.bak/gcc/5.4.0/876-xtensa-Fix-PR-target-78603.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e178289a12a829ec47dc5038d91401f65381e71d Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 29 Nov 2016 13:09:17 -0800 -Subject: [PATCH 8/8] xtensa: Fix PR target/78603 - -2016-11-29 Max Filippov -gcc/ - * config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero - overhead loop start between a call and its CALL_ARG_LOCATION - note. - -Signed-off-by: Max Filippov ---- -Backported from: r242979 - - gcc/config/xtensa/xtensa.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index 206ff80..36ab1e3 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -4182,7 +4182,10 @@ hwloop_optimize (hwloop_info loop) - entry_after = BB_END (entry_bb); - while (DEBUG_INSN_P (entry_after) - || (NOTE_P (entry_after) -- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) -+ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK -+ /* Make sure we don't split a call and its corresponding -+ CALL_ARG_LOCATION note. */ -+ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION)) - entry_after = PREV_INSN (entry_after); - - emit_insn_after (seq, entry_after); --- -2.1.4 - diff --git a/package.bak/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch b/package.bak/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch deleted file mode 100644 index 7a8c843e55..0000000000 --- a/package.bak/gcc/5.4.0/880-gcc-nios2-Add-IJMP_REGS-enum.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 920a898d2a04933c13eb808a513bc5822e91f70a Mon Sep 17 00:00:00 2001 -From: sandra -Date: Tue, 12 May 2015 15:57:22 +0000 -Subject: [PATCH] gcc/nios2: Add IJMP_REGS enum - -2015-05-12 Chung-Lin Tang - Sandra Loosemore - - gcc/ - * config/nios2/nios2.h (enum reg_class): Add IJMP_REGS enum - value. - (REG_CLASS_NAMES): Add "IJMP_REGS". - (REG_CLASS_CONTENTS): Add new entry for IJMP_REGS. - * config/nios2/nios2.md (indirect_jump,*tablejump): Adjust to - use new "c" register constraint. - * config/nios2/constraint.md (c): New register constraint - corresponding to IJMP_REGS. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223082 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Romain: rebase on gcc 5.4] -Signed-off-by: Romain Naour ---- - gcc/config/nios2/constraints.md | 3 +++ - gcc/config/nios2/nios2.h | 11 +++++++---- - gcc/config/nios2/nios2.md | 4 ++-- - 3 files changed, 12 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/nios2/constraints.md b/gcc/config/nios2/constraints.md -index f4bd9f7..735f892 100644 ---- a/gcc/config/nios2/constraints.md -+++ b/gcc/config/nios2/constraints.md -@@ -39,6 +39,9 @@ - - ;; Register constraints - -+(define_register_constraint "c" "IJMP_REGS" -+ "A register suitable for an indirect jump.") -+ - (define_register_constraint "j" "SIB_REGS" - "A register suitable for an indirect sibcall.") - -diff --git a/gcc/config/nios2/nios2.h b/gcc/config/nios2/nios2.h -index 117983d..7c329ae 100644 ---- a/gcc/config/nios2/nios2.h -+++ b/gcc/config/nios2/nios2.h -@@ -173,6 +173,7 @@ enum reg_class - { - NO_REGS, - SIB_REGS, -+ IJMP_REGS, - GP_REGS, - ALL_REGS, - LIM_REG_CLASSES -@@ -183,6 +184,7 @@ enum reg_class - #define REG_CLASS_NAMES \ - { "NO_REGS", \ - "SIB_REGS", \ -+ "IJMP_REGS", \ - "GP_REGS", \ - "ALL_REGS" } - -@@ -190,10 +192,11 @@ enum reg_class - - #define REG_CLASS_CONTENTS \ - { \ -- /* NO_REGS */ { 0, 0}, \ -- /* SIB_REGS */ { 0xfe0c, 0}, \ -- /* GP_REGS */ {~0, 0}, \ -- /* ALL_REGS */ {~0,~0} \ -+ /* NO_REGS */ { 0, 0}, \ -+ /* SIB_REGS */ { 0xfe0c, 0}, \ -+ /* IJMP_REGS */ { 0x7fffffff, 0}, \ -+ /* GP_REGS */ {~0, 0}, \ -+ /* ALL_REGS */ {~0,~0} \ - } - - -diff --git a/gcc/config/nios2/nios2.md b/gcc/config/nios2/nios2.md -index 7b35d269..36ef101 100644 ---- a/gcc/config/nios2/nios2.md -+++ b/gcc/config/nios2/nios2.md -@@ -697,7 +697,7 @@ - ; check or adjust for overflow. - - (define_insn "indirect_jump" -- [(set (pc) (match_operand:SI 0 "register_operand" "r"))] -+ [(set (pc) (match_operand:SI 0 "register_operand" "c"))] - "" - "jmp\\t%0" - [(set_attr "type" "control")]) -@@ -811,7 +811,7 @@ - - (define_insn "*tablejump" - [(set (pc) -- (match_operand:SI 0 "register_operand" "r")) -+ (match_operand:SI 0 "register_operand" "c")) - (use (label_ref (match_operand 1 "" "")))] - "" - "jmp\\t%0" --- -2.5.5 - diff --git a/package.bak/gcc/5.4.0/890-fix-m68k-compile.patch b/package.bak/gcc/5.4.0/890-fix-m68k-compile.patch deleted file mode 100644 index 6e63de0cd1..0000000000 --- a/package.bak/gcc/5.4.0/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c ---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c 2015-01-05 13:33:28.000000000 +0100 -+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c 2016-03-19 09:25:07.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/package.bak/gcc/5.4.0/891-fix-m68k-uclinux.patch b/package.bak/gcc/5.4.0/891-fix-m68k-uclinux.patch deleted file mode 100644 index 4e186bd3d3..0000000000 --- a/package.bak/gcc/5.4.0/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config.host gcc-5.3.0/libgcc/config.host ---- gcc-5.3.0.orig/libgcc/config.host 2015-10-01 14:01:18.000000000 +0200 -+++ gcc-5.3.0/libgcc/config.host 2016-04-26 21:30:25.353691745 +0200 -@@ -794,7 +794,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package.bak/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch b/package.bak/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch deleted file mode 100644 index fdf4ee724d..0000000000 --- a/package.bak/gcc/5.4.0/900-libitm-fixes-for-musl-support.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:11:25 +0000 (+0000) -Subject: libitm fixes for musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=e53a4d49c3d03ab8eaddb073cf972c1c46d75338 - -libitm fixes for musl support - -On behalf of Szabolcs.Nagy@arm.com - -2015-04-22 Gregor Richards - - * config/arm/hwcap.cc: Use fcntl.h instead of sys/fcntl.h. - * config/linux/x86/tls.h: Only use __GLIBC_PREREQ if defined. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222325 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libitm/config/arm/hwcap.cc -=================================================================== ---- a/libitm/config/arm/hwcap.cc -+++ b/libitm/config/arm/hwcap.cc -@@ -40,7 +40,7 @@ - - #ifdef __linux__ - #include --#include -+#include - #include - - static void __attribute__((constructor)) -Index: b/libitm/config/linux/x86/tls.h -=================================================================== ---- a/libitm/config/linux/x86/tls.h -+++ b/libitm/config/linux/x86/tls.h -@@ -25,16 +25,19 @@ - #ifndef LIBITM_X86_TLS_H - #define LIBITM_X86_TLS_H 1 - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - /* Use slots in the TCB head rather than __thread lookups. - GLIBC has reserved words 10 through 13 for TM. */ - #define HAVE_ARCH_GTM_THREAD 1 - #define HAVE_ARCH_GTM_THREAD_DISP 1 - #endif -+#endif - - #include "config/generic/tls.h" - --#if defined(__GLIBC_PREREQ) && __GLIBC_PREREQ(2, 10) -+#if defined(__GLIBC_PREREQ) -+#if __GLIBC_PREREQ(2, 10) - namespace GTM HIDDEN { - - #ifdef __x86_64__ -@@ -101,5 +104,6 @@ - - } // namespace GTM - #endif /* >= GLIBC 2.10 */ -+#endif - - #endif // LIBITM_X86_TLS_H diff --git a/package.bak/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch b/package.bak/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch deleted file mode 100644 index 13c08d6b96..0000000000 --- a/package.bak/gcc/5.4.0/901-fixincludes-update-for-musl-support.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:18:16 +0000 (+0000) -Subject: fixincludes update for musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2dc727de2e87c2756a514cbb43cea23c99deaa3d - -fixincludes update for musl support - -On behalf of Szabolcs.Nagy@arm.com - -2015-04-22 Gregor Richards - - * mkfixinc.sh: Add *-musl* with no fixes. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222327 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/fixincludes/mkfixinc.sh -=================================================================== ---- a/fixincludes/mkfixinc.sh -+++ b/fixincludes/mkfixinc.sh -@@ -19,7 +19,8 @@ - powerpc-*-eabi* | \ - powerpc-*-rtems* | \ - powerpcle-*-eabisim* | \ -- powerpcle-*-eabi* ) -+ powerpcle-*-eabi* | \ -+ *-musl* ) - # IF there is no include fixing, - # THEN create a no-op fixer and exit - (echo "#! /bin/sh" ; echo "exit 0" ) > ${target} diff --git a/package.bak/gcc/5.4.0/902-unwind-fix-for-musl.patch b/package.bak/gcc/5.4.0/902-unwind-fix-for-musl.patch deleted file mode 100644 index ef470540d9..0000000000 --- a/package.bak/gcc/5.4.0/902-unwind-fix-for-musl.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:20:01 +0000 (+0000) -Subject: unwind fix for musl -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a2e31d0681d8a47389b8a3552622fbd9827bcef4 - -unwind fix for musl - -On behalf of szabolcs.nagy@arm.com - -2015-04-22 Gregor Richards - Szabolcs Nagy - - * unwind-dw2-fde-dip.c (USE_PT_GNU_EH_FRAME): Define it on - Linux if target provides dl_iterate_phdr. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222328 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libgcc/unwind-dw2-fde-dip.c -=================================================================== ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -59,6 +59,12 @@ - - #if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ - && defined(TARGET_DL_ITERATE_PHDR) \ -+ && defined(__linux__) -+# define USE_PT_GNU_EH_FRAME -+#endif -+ -+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \ -+ && defined(TARGET_DL_ITERATE_PHDR) \ - && (defined(__DragonFly__) || defined(__FreeBSD__)) - # define ElfW __ElfN - # define USE_PT_GNU_EH_FRAME diff --git a/package.bak/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch b/package.bak/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch deleted file mode 100644 index c852131258..0000000000 --- a/package.bak/gcc/5.4.0/903-libstdc++-libgfortran-gthr-workaround-for-musl.patch +++ /dev/null @@ -1,80 +0,0 @@ -From: ktkachov -Date: Wed, 22 Apr 2015 14:24:11 +0000 (+0000) -Subject: libstdc++, libgfortran gthr workaround for musl -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=1e5f711c11cb80ce609db9e9c1d8b2da0f7b5b61 - -libstdc++, libgfortran gthr workaround for musl - -On behalf of szabolcs.nagy@arm.com - -[libstdc++-v3/] -2015-04-22 Szabolcs Nagy - - * config/os/generic/os_defines.h (_GLIBCXX_GTHREAD_USE_WEAK): Define. - * configure.host (os_include_dir): Set to "os/generic" for linux-musl*. - -[libgfortran/] -2015-04-22 Szabolcs Nagy - - * acinclude.m4 (GTHREAD_USE_WEAK): Define as 0 for *-*-musl*. - * configure: Regenerate. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222329 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/libgfortran/acinclude.m4 -=================================================================== ---- a/libgfortran/acinclude.m4 -+++ b/libgfortran/acinclude.m4 -@@ -100,7 +100,7 @@ - [Define to 1 if the target supports #pragma weak]) - fi - case "$host" in -- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) -+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) - AC_DEFINE(GTHREAD_USE_WEAK, 0, - [Define to 0 if the target shouldn't use #pragma weak]) - ;; -Index: b/libgfortran/configure -=================================================================== ---- a/libgfortran/configure -+++ b/libgfortran/configure -@@ -26447,7 +26447,7 @@ - - fi - case "$host" in -- *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* ) -+ *-*-darwin* | *-*-hpux* | *-*-cygwin* | *-*-mingw* | *-*-musl* ) - - $as_echo "#define GTHREAD_USE_WEAK 0" >>confdefs.h - -Index: b/libstdc++-v3/config/os/generic/os_defines.h -=================================================================== ---- a/libstdc++-v3/config/os/generic/os_defines.h -+++ b/libstdc++-v3/config/os/generic/os_defines.h -@@ -33,4 +33,9 @@ - // System-specific #define, typedefs, corrections, etc, go here. This - // file will come before all others. - -+// Disable the weak reference logic in gthr.h for os/generic because it -+// is broken on every platform unless there is implementation specific -+// workaround in gthr-posix.h and at link-time for static linking. -+#define _GLIBCXX_GTHREAD_USE_WEAK 0 -+ - #endif -Index: b/libstdc++-v3/configure.host -=================================================================== ---- a/libstdc++-v3/configure.host -+++ b/libstdc++-v3/configure.host -@@ -271,6 +271,9 @@ - freebsd*) - os_include_dir="os/bsd/freebsd" - ;; -+ linux-musl*) -+ os_include_dir="os/generic" -+ ;; - gnu* | linux* | kfreebsd*-gnu | knetbsd*-gnu) - if [ "$uclibc" = "yes" ]; then - os_include_dir="os/uclibc" diff --git a/package.bak/gcc/5.4.0/904-musl-libc-config.patch b/package.bak/gcc/5.4.0/904-musl-libc-config.patch deleted file mode 100644 index 85491406cf..0000000000 --- a/package.bak/gcc/5.4.0/904-musl-libc-config.patch +++ /dev/null @@ -1,285 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 08:25:47 +0000 (+0000) -Subject: [PATCH 2/13] musl libc config -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=a9173ceabaf29c16f8ef226fbf98af373a4b2ceb - -[PATCH 2/13] musl libc config - -2015-05-08 Gregor Richards - Szabolcs Nagy - - * config.gcc (LIBC_MUSL): New tm_defines macro. - * config/linux.h (OPTION_MUSL): Define. - (MUSL_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER32,) - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32,) - (INCLUDE_DEFAULTS_MUSL_GPP, INCLUDE_DEFAULTS_MUSL_LOCAL,) - (INCLUDE_DEFAULTS_MUSL_PREFIX, INCLUDE_DEFAULTS_MUSL_CROSS,) - (INCLUDE_DEFAULTS_MUSL_TOOL, INCLUDE_DEFAULTS_MUSL_NATIVE): Define. - * config/linux.opt (mmusl): New option. - * doc/invoke.texi (GNU/Linux Options): Document -mmusl. - * configure.ac (gcc_cv_libc_provides_ssp): Add *-*-musl*. - (gcc_cv_target_dl_iterate_phdr): Add *-linux-musl*. - * configure: Regenerate. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222904 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config.gcc -=================================================================== ---- a/gcc/config.gcc -+++ b/gcc/config.gcc -@@ -575,7 +575,7 @@ - esac - - # Common C libraries. --tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3" -+tm_defines="$tm_defines LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4" - - # 32-bit x86 processors supported by --with-arch=. Each processor - # MUST be separated by exactly one space. -@@ -720,6 +720,9 @@ - *-*-*uclibc*) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC" - ;; -+ *-*-*musl*) -+ tm_defines="$tm_defines DEFAULT_LIBC=LIBC_MUSL" -+ ;; - *) - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_GLIBC" - ;; -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,10 +32,12 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - #define GNU_USER_TARGET_OS_CPP_BUILTINS() \ -@@ -50,21 +52,25 @@ - } while (0) - - /* Determine which dynamic linker to use depending on whether GLIBC or -- uClibc or Bionic is the default C library and whether -- -muclibc or -mglibc or -mbionic has been passed to change the default. */ -+ uClibc or Bionic or musl is the default C library and whether -+ -muclibc or -mglibc or -mbionic or -mmusl has been passed to change -+ the default. */ - --#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LD1, LD2, LD3) \ -- "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:" LD1 "}}" -+#define CHOOSE_DYNAMIC_LINKER1(LIBC1, LIBC2, LIBC3, LIBC4, LD1, LD2, LD3, LD4) \ -+ "%{" LIBC2 ":" LD2 ";:%{" LIBC3 ":" LD3 ";:%{" LIBC4 ":" LD4 ";:" LD1 "}}}" - - #if DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", G, U, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mglibc", "muclibc", "mbionic", "mmusl", G, U, B, M) - #elif DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", U, G, B) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("muclibc", "mglibc", "mbionic", "mmusl", U, G, B, M) - #elif DEFAULT_LIBC == LIBC_BIONIC --#define CHOOSE_DYNAMIC_LINKER(G, U, B) \ -- CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", B, G, U) -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mbionic", "mglibc", "muclibc", "mmusl", B, G, U, M) -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, B, M) \ -+ CHOOSE_DYNAMIC_LINKER1 ("mmusl", "mglibc", "muclibc", "mbionic", M, G, U, B) - #else - #error "Unsupported DEFAULT_LIBC" - #endif /* DEFAULT_LIBC */ -@@ -81,24 +87,100 @@ - #define BIONIC_DYNAMIC_LINKER32 "/system/bin/linker" - #define BIONIC_DYNAMIC_LINKER64 "/system/bin/linker64" - #define BIONIC_DYNAMIC_LINKERX32 "/system/bin/linkerx32" -+/* Should be redefined for each target that supports musl. */ -+#define MUSL_DYNAMIC_LINKER "/dev/null" -+#define MUSL_DYNAMIC_LINKER32 "/dev/null" -+#define MUSL_DYNAMIC_LINKER64 "/dev/null" -+#define MUSL_DYNAMIC_LINKERX32 "/dev/null" - - #define GNU_USER_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, \ -- BIONIC_DYNAMIC_LINKER) -+ BIONIC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - #define GNU_USER_DYNAMIC_LINKER32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER32, UCLIBC_DYNAMIC_LINKER32, \ -- BIONIC_DYNAMIC_LINKER32) -+ BIONIC_DYNAMIC_LINKER32, MUSL_DYNAMIC_LINKER32) - #define GNU_USER_DYNAMIC_LINKER64 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64, \ -- BIONIC_DYNAMIC_LINKER64) -+ BIONIC_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKER64) - #define GNU_USER_DYNAMIC_LINKERX32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERX32, UCLIBC_DYNAMIC_LINKERX32, \ -- BIONIC_DYNAMIC_LINKERX32) -+ BIONIC_DYNAMIC_LINKERX32, MUSL_DYNAMIC_LINKERX32) - - /* Whether we have Bionic libc runtime */ - #undef TARGET_HAS_BIONIC - #define TARGET_HAS_BIONIC (OPTION_BIONIC) - -+/* musl avoids problematic includes by rearranging the include directories. -+ * Unfortunately, this is mostly duplicated from cppdefault.c */ -+#if DEFAULT_LIBC == LIBC_MUSL -+#define INCLUDE_DEFAULTS_MUSL_GPP \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GPLUSPLUS_TOOL_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 1 }, \ -+ { GPLUSPLUS_BACKWARD_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, -+ -+#ifdef LOCAL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_LOCAL \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, \ -+ { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_LOCAL -+#endif -+ -+#ifdef PREFIX_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ { PREFIX_INCLUDE_DIR, 0, 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_PREFIX -+#endif -+ -+#ifdef CROSS_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_CROSS \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#ifdef TOOL_INCLUDE_DIR -+#define INCLUDE_DEFAULTS_MUSL_TOOL \ -+ { TOOL_INCLUDE_DIR, "BINUTILS", 0, 1, 0, 0}, -+#else -+#define INCLUDE_DEFAULTS_MUSL_TOOL -+#endif -+ -+#ifdef NATIVE_SYSTEM_HEADER_DIR -+#define INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 2 }, \ -+ { NATIVE_SYSTEM_HEADER_DIR, 0, 0, 0, 1, 0 }, -+#else -+#define INCLUDE_DEFAULTS_MUSL_NATIVE -+#endif -+ -+#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) -+# undef INCLUDE_DEFAULTS_MUSL_LOCAL -+# define INCLUDE_DEFAULTS_MUSL_LOCAL -+# undef INCLUDE_DEFAULTS_MUSL_NATIVE -+# define INCLUDE_DEFAULTS_MUSL_NATIVE -+#else -+# undef INCLUDE_DEFAULTS_MUSL_CROSS -+# define INCLUDE_DEFAULTS_MUSL_CROSS -+#endif -+ -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ INCLUDE_DEFAULTS_MUSL_GPP \ -+ INCLUDE_DEFAULTS_MUSL_PREFIX \ -+ INCLUDE_DEFAULTS_MUSL_CROSS \ -+ INCLUDE_DEFAULTS_MUSL_TOOL \ -+ INCLUDE_DEFAULTS_MUSL_NATIVE \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 1, 0, 0 }, \ -+ { 0, 0, 0, 0, 0, 0 } \ -+ } -+#endif -+ - #if (DEFAULT_LIBC == LIBC_UCLIBC) && defined (SINGLE_LIBC) /* uClinux */ - /* This is a *uclinux* target. We don't define below macros to normal linux - versions, because doing so would require *uclinux* targets to include -Index: b/gcc/config/linux.opt -=================================================================== ---- a/gcc/config/linux.opt -+++ b/gcc/config/linux.opt -@@ -28,5 +28,9 @@ - Use GNU C library - - muclibc --Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mbionic) -+Target Report RejectNegative Var(linux_libc,LIBC_UCLIBC) Negative(mmusl) - Use uClibc C library -+ -+mmusl -+Target Report RejectNegative Var(linux_libc,LIBC_MUSL) Negative(mbionic) -+Use musl C library -Index: b/gcc/configure -=================================================================== ---- a/gcc/configure -+++ b/gcc/configure -@@ -27809,6 +27813,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/configure.ac -=================================================================== ---- a/gcc/configure.ac -+++ b/gcc/configure.ac -@@ -5298,6 +5302,9 @@ - gcc_cv_target_dl_iterate_phdr=no - fi - ;; -+ *-linux-musl*) -+ gcc_cv_target_dl_iterate_phdr=yes -+ ;; - esac - GCC_TARGET_TEMPLATE([TARGET_DL_ITERATE_PHDR]) - if test x$gcc_cv_target_dl_iterate_phdr = xyes; then -Index: b/gcc/doc/invoke.texi -=================================================================== ---- a/gcc/doc/invoke.texi -+++ b/gcc/doc/invoke.texi -@@ -667,7 +667,7 @@ - -mcpu=@var{cpu}} - - @emph{GNU/Linux Options} --@gccoptlist{-mglibc -muclibc -mbionic -mandroid @gol -+@gccoptlist{-mglibc -muclibc -mmusl -mbionic -mandroid @gol - -tno-android-cc -tno-android-ld} - - @emph{H8/300 Options} -@@ -15324,13 +15324,19 @@ - @item -mglibc - @opindex mglibc - Use the GNU C library. This is the default except --on @samp{*-*-linux-*uclibc*} and @samp{*-*-linux-*android*} targets. -+on @samp{*-*-linux-*uclibc*}, @samp{*-*-linux-*musl*} and -+@samp{*-*-linux-*android*} targets. - - @item -muclibc - @opindex muclibc - Use uClibc C library. This is the default on - @samp{*-*-linux-*uclibc*} targets. - -+@item -mmusl -+@opindex mmusl -+Use the musl C library. This is the default on -+@samp{*-*-linux-*musl*} targets. -+ - @item -mbionic - @opindex mbionic - Use Bionic C library. This is the default on diff --git a/package.bak/gcc/5.4.0/905-add-musl-support-to-gcc.patch b/package.bak/gcc/5.4.0/905-add-musl-support-to-gcc.patch deleted file mode 100644 index 92e743685b..0000000000 --- a/package.bak/gcc/5.4.0/905-add-musl-support-to-gcc.patch +++ /dev/null @@ -1,130 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 08:30:40 +0000 (+0000) -Subject: [PATCH 0/13] Add musl support to GCC -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=f2d678afa5b8385d763b93772d73d6bf80a9739e - -[PATCH 0/13] Add musl support to GCC - -2015-05-08 Szabolcs Nagy - - * config/glibc-stdint.h (OPTION_MUSL): Define. - (INT_FAST16_TYPE, INT_FAST32_TYPE, UINT_FAST16_TYPE, UINT_FAST32_TYPE): - Change the definition based on OPTION_MUSL for 64 bit targets. - * config/linux.h (OPTION_MUSL): Redefine. - * config/alpha/linux.h (OPTION_MUSL): Redefine. - * config/rs6000/linux.h (OPTION_MUSL): Redefine. - * config/rs6000/linux64.h (OPTION_MUSL): Redefine. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222905 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/alpha/linux.h -=================================================================== ---- a/gcc/config/alpha/linux.h -+++ b/gcc/config/alpha/linux.h -@@ -61,10 +61,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; -Index: b/gcc/config/glibc-stdint.h -=================================================================== ---- a/gcc/config/glibc-stdint.h -+++ b/gcc/config/glibc-stdint.h -@@ -22,6 +22,12 @@ - see the files COPYING3 and COPYING.RUNTIME respectively. If not, see - . */ - -+/* Systems using musl libc should use this header and make sure -+ OPTION_MUSL is defined correctly before using the TYPE macros. */ -+#ifndef OPTION_MUSL -+#define OPTION_MUSL 0 -+#endif -+ - #define SIG_ATOMIC_TYPE "int" - - #define INT8_TYPE "signed char" -@@ -43,12 +49,12 @@ - #define UINT_LEAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") - - #define INT_FAST8_TYPE "signed char" --#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") --#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") -+#define INT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") -+#define INT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long int" : "int") - #define INT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "long long int") - #define UINT_FAST8_TYPE "unsigned char" --#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") --#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int") -+#define UINT_FAST16_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") -+#define UINT_FAST32_TYPE (LONG_TYPE_SIZE == 64 && !OPTION_MUSL ? "long unsigned int" : "unsigned int") - #define UINT_FAST64_TYPE (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int") - - #define INTPTR_TYPE (LONG_TYPE_SIZE == 64 ? "long int" : "int") -Index: b/gcc/config/linux.h -=================================================================== ---- a/gcc/config/linux.h -+++ b/gcc/config/linux.h -@@ -32,11 +32,13 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL - #define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL - #define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - -Index: b/gcc/config/rs6000/linux.h -=================================================================== ---- a/gcc/config/rs6000/linux.h -+++ b/gcc/config/rs6000/linux.h -@@ -30,10 +30,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; -Index: b/gcc/config/rs6000/linux64.h -=================================================================== ---- a/gcc/config/rs6000/linux64.h -+++ b/gcc/config/rs6000/linux64.h -@@ -299,10 +299,14 @@ - #define OPTION_GLIBC (DEFAULT_LIBC == LIBC_GLIBC) - #define OPTION_UCLIBC (DEFAULT_LIBC == LIBC_UCLIBC) - #define OPTION_BIONIC (DEFAULT_LIBC == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (DEFAULT_LIBC == LIBC_MUSL) - #else - #define OPTION_GLIBC (linux_libc == LIBC_GLIBC) - #define OPTION_UCLIBC (linux_libc == LIBC_UCLIBC) - #define OPTION_BIONIC (linux_libc == LIBC_BIONIC) -+#undef OPTION_MUSL -+#define OPTION_MUSL (linux_libc == LIBC_MUSL) - #endif - - /* Determine what functions are present at the runtime; diff --git a/package.bak/gcc/5.4.0/906-mips-musl-support.patch b/package.bak/gcc/5.4.0/906-mips-musl-support.patch deleted file mode 100644 index 6b473f9898..0000000000 --- a/package.bak/gcc/5.4.0/906-mips-musl-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: ktkachov -Date: Fri, 8 May 2015 15:16:50 +0000 (+0000) -Subject: [PATCH 6/13] mips musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=2550b6a866c887472b587bef87d433c51cf1ebc8 - -[PATCH 6/13] mips musl support - -2015-05-08 Gregor Richards - Szabolcs Nagy - - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Define. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Define. - (GNU_USER_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@222915 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/mips/linux.h -=================================================================== ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -37,7 +37,13 @@ - #define UCLIBC_DYNAMIC_LINKERN32 \ - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+ - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKERN32, UCLIBC_DYNAMIC_LINKERN32, \ -- BIONIC_DYNAMIC_LINKERN32) -+ BIONIC_DYNAMIC_LINKERN32, MUSL_DYNAMIC_LINKERN32) diff --git a/package.bak/gcc/5.4.0/907-x86-musl-support.patch b/package.bak/gcc/5.4.0/907-x86-musl-support.patch deleted file mode 100644 index 3f2fe5df77..0000000000 --- a/package.bak/gcc/5.4.0/907-x86-musl-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: ktkachov -Date: Fri, 15 May 2015 13:20:01 +0000 (+0000) -Subject: [PATCH 9/13] x86 musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=5551c8d927c17f60837f15f8dfe46f945ba3fa9c - -[PATCH 9/13] x86 musl support - -On behalf of Szabolcs Nagy. - -2015-05-15 Gregor Richards - - * config/i386/linux.h (MUSL_DYNAMIC_LINKER): Define. - * config/i386/linux64.h (MUSL_DYNAMIC_LINKER32): Define. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERX32): Define. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223218 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/i386/linux.h -=================================================================== ---- a/gcc/config/i386/linux.h -+++ b/gcc/config/i386/linux.h -@@ -21,3 +21,6 @@ - - #define GNU_USER_LINK_EMULATION "elf_i386" - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-i386.so.1" -Index: b/gcc/config/i386/linux64.h -=================================================================== ---- a/gcc/config/i386/linux64.h -+++ b/gcc/config/i386/linux64.h -@@ -30,3 +30,10 @@ - #define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2" - #define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2" - #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2" -+ -+#undef MUSL_DYNAMIC_LINKER32 -+#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-i386.so.1" -+#undef MUSL_DYNAMIC_LINKER64 -+#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-x86_64.so.1" -+#undef MUSL_DYNAMIC_LINKERX32 -+#define MUSL_DYNAMIC_LINKERX32 "/lib/ld-musl-x32.so.1" diff --git a/package.bak/gcc/5.4.0/908-arm-musl-support.patch b/package.bak/gcc/5.4.0/908-arm-musl-support.patch deleted file mode 100644 index 906355a79a..0000000000 --- a/package.bak/gcc/5.4.0/908-arm-musl-support.patch +++ /dev/null @@ -1,45 +0,0 @@ -From: ktkachov -Date: Wed, 27 May 2015 13:17:11 +0000 (+0000) -Subject: [PATCH 4/13] arm musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=de799bd087ab9a179768fea75bd195a31d3432a4 - -[PATCH 4/13] arm musl support - -On behalf of szabolcs.nagy@arm.com - -2015-05-27 Gregor Richards - - * config/arm/linux-eabi.h (MUSL_DYNAMIC_LINKER): Define. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223749 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -77,6 +77,23 @@ - %{mfloat-abi=soft*:" GLIBC_DYNAMIC_LINKER_SOFT_FLOAT "} \ - %{!mfloat-abi=*:" GLIBC_DYNAMIC_LINKER_DEFAULT "}" - -+/* For ARM musl currently supports four dynamic linkers: -+ - ld-musl-arm.so.1 - for the EABI-derived soft-float ABI -+ - ld-musl-armhf.so.1 - for the EABI-derived hard-float ABI -+ - ld-musl-armeb.so.1 - for the EABI-derived soft-float ABI, EB -+ - ld-musl-armebhf.so.1 - for the EABI-derived hard-float ABI, EB -+ musl does not support the legacy OABI mode. -+ All the dynamic linkers live in /lib. -+ We default to soft-float, EL. */ -+#undef MUSL_DYNAMIC_LINKER -+#if TARGET_BIG_ENDIAN_DEFAULT -+#define MUSL_DYNAMIC_LINKER_E "%{mlittle-endian:;:eb}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{mbig-endian:eb}" -+#endif -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-arm" MUSL_DYNAMIC_LINKER_E "%{mfloat-abi=hard:hf}.so.1" -+ - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ - #undef LINK_SPEC diff --git a/package.bak/gcc/5.4.0/909-aarch64-musl-support.patch b/package.bak/gcc/5.4.0/909-aarch64-musl-support.patch deleted file mode 100644 index 3d032f51bc..0000000000 --- a/package.bak/gcc/5.4.0/909-aarch64-musl-support.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: jgreenhalgh -Date: Wed, 27 May 2015 16:46:39 +0000 (+0000) -Subject: [PATCH 3/13] aarch64 musl support -X-Git-Url: https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff_plain;h=b3ff21cf0531be91bc3fb8200296a7633090ec78 - -[PATCH 3/13] aarch64 musl support - -gcc/Changelog: - -2015-05-27 Gregor Richards - Szabolcs Nagy - - * config/aarch64/aarch64-linux.h (MUSL_DYNAMIC_LINKER): Define. - - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@223766 138bc75d-0d04-0410-961f-82ee72b054a4 ---- - -Index: b/gcc/config/aarch64/aarch64-linux.h -=================================================================== ---- a/gcc/config/aarch64/aarch64-linux.h -+++ b/gcc/config/aarch64/aarch64-linux.h -@@ -23,6 +23,9 @@ - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" - -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-aarch64%{mbig-endian:_be}%{mabi=ilp32:_ilp32}.so.1" -+ - #undef ASAN_CC1_SPEC - #define ASAN_CC1_SPEC "%{%:sanitize(address):-funwind-tables}" - diff --git a/package.bak/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch b/package.bak/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch deleted file mode 100644 index 6fe4993406..0000000000 --- a/package.bak/gcc/5.4.0/910-microblaze-musl-and-uclibc.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add dynamic linker support for uClibc-ng/musl - -Signed-off-by: Waldemar Brodkorb - - -diff -Nur gcc-5.4.0.orig/gcc/config/microblaze/linux.h gcc-5.4.0/gcc/config/microblaze/linux.h ---- gcc-5.4.0.orig/gcc/config/microblaze/linux.h 2015-05-28 16:08:19.000000000 +0200 -+++ gcc-5.4.0/gcc/config/microblaze/linux.h 2016-10-23 17:09:46.962010871 +0200 -@@ -28,7 +28,26 @@ - #undef TLS_NEEDS_GOT - #define TLS_NEEDS_GOT 1 - --#define DYNAMIC_LINKER "/lib/ld.so.1" -+#define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+ -+#if TARGET_BIG_ENDIAN_DEFAULT == 0 /* LE */ -+#define MUSL_DYNAMIC_LINKER_E "%{EB:;:el}" -+#else -+#define MUSL_DYNAMIC_LINKER_E "%{EL:el}" -+#endif -+ -+#undef MUSL_DYNAMIC_LINKER -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-microblaze" MUSL_DYNAMIC_LINKER_E ".so.1" -+ -+#if DEFAULT_LIBC == LIBC_UCLIBC -+#define DYNAMIC_LINKER UCLIBC_DYNAMIC_LINKER -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define DYNAMIC_LINKER MUSL_DYNAMIC_LINKER -+#else -+#define DYNAMIC_LINKER GLIBC_DYNAMIC_LINKER -+#endif -+ - #undef SUBTARGET_EXTRA_SPECS - #define SUBTARGET_EXTRA_SPECS \ - { "dynamic_linker", DYNAMIC_LINKER } diff --git a/package.bak/gcc/5.4.0/911-ppc-musl-support.patch b/package.bak/gcc/5.4.0/911-ppc-musl-support.patch deleted file mode 100644 index f4905a4232..0000000000 --- a/package.bak/gcc/5.4.0/911-ppc-musl-support.patch +++ /dev/null @@ -1,75 +0,0 @@ -Add support for musl on ppc32 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h gcc-5.4.0/gcc/config/rs6000/sysv4.h ---- gcc-5.4.0.orig/gcc/config/rs6000/sysv4.h 2015-09-24 15:46:45.000000000 +0200 -+++ gcc-5.4.0/gcc/config/rs6000/sysv4.h 2016-11-27 13:12:33.226953738 +0100 -@@ -537,6 +537,9 @@ - #ifndef CC1_SECURE_PLT_DEFAULT_SPEC - #define CC1_SECURE_PLT_DEFAULT_SPEC "" - #endif -+#ifndef LINK_SECURE_PLT_DEFAULT_SPEC -+#define LINK_SECURE_PLT_DEFAULT_SPEC "" -+#endif - - /* Pass -G xxx to the compiler. */ - #undef CC1_SPEC -@@ -757,17 +760,23 @@ - - #define LINK_START_LINUX_SPEC "" - -+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","") -+ - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" - #define UCLIBC_DYNAMIC_LINKER "/lib/ld-uClibc.so.0" -+#define MUSL_DYNAMIC_LINKER \ -+ "/lib/ld-musl-powerpc" MUSL_DYNAMIC_LINKER_E "%{msoft-float:-sf}.so.1" - #if DEFAULT_LIBC == LIBC_UCLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{mglibc:" G ";:" U "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{mmusl:" M ";:" U "}}" -+#elif DEFAULT_LIBC == LIBC_MUSL -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{mglibc:" G ";:%{muclibc:" U ";:" M "}}" - #elif !defined (DEFAULT_LIBC) || DEFAULT_LIBC == LIBC_GLIBC --#define CHOOSE_DYNAMIC_LINKER(G, U) "%{muclibc:" U ";:" G "}" -+#define CHOOSE_DYNAMIC_LINKER(G, U, M) "%{muclibc:" U ";:%{mmusl:" M ";:" G "}}" - #else - #error "Unsupported DEFAULT_LIBC" - #endif - #define GNU_USER_DYNAMIC_LINKER \ -- CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) -+ CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER, MUSL_DYNAMIC_LINKER) - - #define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ -@@ -889,6 +898,7 @@ - { "link_os_openbsd", LINK_OS_OPENBSD_SPEC }, \ - { "link_os_default", LINK_OS_DEFAULT_SPEC }, \ - { "cc1_secure_plt_default", CC1_SECURE_PLT_DEFAULT_SPEC }, \ -+ { "link_secure_plt_default", LINK_SECURE_PLT_DEFAULT_SPEC }, \ - { "cpp_os_ads", CPP_OS_ADS_SPEC }, \ - { "cpp_os_yellowknife", CPP_OS_YELLOWKNIFE_SPEC }, \ - { "cpp_os_mvme", CPP_OS_MVME_SPEC }, \ -diff -Nur gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h gcc-5.4.0/gcc/config/rs6000/sysv4le.h ---- gcc-5.4.0.orig/gcc/config/rs6000/sysv4le.h 2015-09-24 15:46:45.000000000 +0200 -+++ gcc-5.4.0/gcc/config/rs6000/sysv4le.h 2016-11-27 13:12:33.226953738 +0100 -@@ -31,3 +31,5 @@ - /* Little-endian PowerPC64 Linux uses the ELF v2 ABI by default. */ - #define LINUX64_DEFAULT_ABI_ELFv2 - -+#undef MUSL_DYNAMIC_LINKER_E -+#define MUSL_DYNAMIC_LINKER_E ENDIAN_SELECT("","le","le") -diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc ---- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200 -+++ gcc-5.4.0/gcc/config.gcc 2016-11-27 13:14:17.149638148 +0100 -@@ -2413,6 +2413,10 @@ - powerpc*-*-linux*paired*) - tm_file="${tm_file} rs6000/750cl.h" ;; - esac -+ case ${target} in -+ powerpc*-*-linux*-musl*) -+ enable_secureplt=yes ;; -+ esac - if test x${enable_secureplt} = xyes; then - tm_file="rs6000/secureplt.h ${tm_file}" - fi diff --git a/package.bak/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/package.bak/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 07f9a7395b..0000000000 --- a/package.bak/gcc/5.4.0/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack ---- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-5.3.0/libgcc/config/t-stack 2016-03-07 03:25:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/package.bak/gcc/5.4.0/940-uclinux-enable-threads.patch b/package.bak/gcc/5.4.0/940-uclinux-enable-threads.patch deleted file mode 100644 index 490a55b45d..0000000000 --- a/package.bak/gcc/5.4.0/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.4.0.orig/gcc/config.gcc gcc-5.4.0/gcc/config.gcc ---- gcc-5.4.0.orig/gcc/config.gcc 2015-09-10 16:17:53.000000000 +0200 -+++ gcc-5.4.0/gcc/config.gcc 2016-07-01 21:26:02.772958441 +0200 -@@ -808,6 +808,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package.bak/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch b/package.bak/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch deleted file mode 100644 index 337d376b75..0000000000 --- a/package.bak/gcc/5.4.0/941-mips-Add-support-for-mips-r6-musl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Thu, 25 Aug 2016 14:13:02 +0000 -Subject: [PATCH] [mips] Add support for mips*r6-*-musl - -gcc/ - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Vincent: tweak to not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - gcc/config/mips/linux.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index fa253b6..dc51c45 100644 ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - - #undef MUSL_DYNAMIC_LINKER32 --#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER32 \ -+ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - #undef MUSL_DYNAMIC_LINKER64 --#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" --#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER64 \ -+ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 \ -+ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ --- -2.10.0 - diff --git a/package.bak/gcc/6.3.0/100-uclibc-conf.patch b/package.bak/gcc/6.3.0/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a9..0000000000 --- a/package.bak/gcc/6.3.0/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package.bak/gcc/6.3.0/301-missing-execinfo_h.patch b/package.bak/gcc/6.3.0/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa44..0000000000 --- a/package.bak/gcc/6.3.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/6.3.0/810-arm-softfloat-libgcc.patch b/package.bak/gcc/6.3.0/810-arm-softfloat-libgcc.patch deleted file mode 100644 index 5efa7fd1bc..0000000000 --- a/package.bak/gcc/6.3.0/810-arm-softfloat-libgcc.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: b/gcc/config/arm/linux-elf.h -=================================================================== ---- a/gcc/config/arm/linux-elf.h -+++ b/gcc/config/arm/linux-elf.h -@@ -60,7 +60,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux.so.2" - -Index: b/libgcc/config/arm/t-linux -=================================================================== ---- a/libgcc/config/arm/t-linux -+++ b/libgcc/config/arm/t-linux -@@ -1,6 +1,11 @@ - LIB1ASMSRC = arm/lib1funcs.S - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx _clzsi2 _clzdi2 \ -- _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 -+ _ctzsi2 _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_addsubdf3 _arm_addsubsf3 \ -+ _arm_negdf2 _arm_muldivdf3 _arm_cmpdf2 _arm_unorddf2 \ -+ _arm_fixdfsi _arm_fixunsdfsi _arm_truncdfsf2 \ -+ _arm_negsf2 _arm_muldivsf3 _arm_cmpsf2 _arm_unordsf2 \ -+ _arm_fixsfsi _arm_fixunssfsi - - # Just for these, we omit the frame pointer since it makes such a big - # difference. diff --git a/package.bak/gcc/6.3.0/830-arm_unbreak_armv4t.patch b/package.bak/gcc/6.3.0/830-arm_unbreak_armv4t.patch deleted file mode 100644 index b730059183..0000000000 --- a/package.bak/gcc/6.3.0/830-arm_unbreak_armv4t.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://sourceware.org/ml/crossgcc/2008-05/msg00009.html - -Index: b/gcc/config/arm/linux-eabi.h -=================================================================== ---- a/gcc/config/arm/linux-eabi.h -+++ b/gcc/config/arm/linux-eabi.h -@@ -45,7 +45,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/package.bak/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch b/package.bak/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch deleted file mode 100644 index af9fb1d6b2..0000000000 --- a/package.bak/gcc/6.3.0/831-ARM-PR-target-70473-Reduce-size-of-Cortex-A8-automat.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 07453188b18a2cbe815917dbb893b4ebfdd793b6 Mon Sep 17 00:00:00 2001 -From: ktkachov -Date: Fri, 26 Aug 2016 10:23:20 +0000 -Subject: [PATCH] [ARM] PR target/70473: Reduce size of Cortex-A8 automaton - - PR target/70473 - * config/arm/cortex-a8-neon.md (cortex_a8_vfp_muld): Reduce - reservation duration to 15 cycles. - (cortex_a8_vfp_macs): Likewise. - (cortex_a8_vfp_macd): Likewise. - (cortex_a8_vfp_divs): Likewise. - (cortex_a8_vfp_divd): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239772 -138bc75d-0d04-0410-961f-82ee72b054a4 - -[Backport from gcc upstream commit 79f5d5e3cd5a668d5ecb2b6b0cce80ef5706ac53.] -Signed-off-by: Thomas Petazzoni ---- - gcc/config/arm/cortex-a8-neon.md | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/gcc/config/arm/cortex-a8-neon.md b/gcc/config/arm/cortex-a8-neon.md -index 45f861f..b16c299 100644 ---- a/gcc/config/arm/cortex-a8-neon.md -+++ b/gcc/config/arm/cortex-a8-neon.md -@@ -357,30 +357,34 @@ - (eq_attr "type" "fmuls")) - "cortex_a8_vfp,cortex_a8_vfplite*11") - -+;; Don't model a reservation for more than 15 cycles as this explodes the -+;; state space of the automaton for little gain. It is unlikely that the -+;; scheduler will find enough instructions to hide the full latency of the -+;; instructions. - (define_insn_reservation "cortex_a8_vfp_muld" 17 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmuld")) -- "cortex_a8_vfp,cortex_a8_vfplite*16") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macs" 21 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacs,ffmas")) -- "cortex_a8_vfp,cortex_a8_vfplite*20") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_macd" 26 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fmacd,ffmad")) -- "cortex_a8_vfp,cortex_a8_vfplite*25") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divs" 37 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivs, fsqrts")) -- "cortex_a8_vfp,cortex_a8_vfplite*36") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - (define_insn_reservation "cortex_a8_vfp_divd" 65 - (and (eq_attr "tune" "cortexa8") - (eq_attr "type" "fdivd, fsqrtd")) -- "cortex_a8_vfp,cortex_a8_vfplite*64") -+ "cortex_a8_vfp,cortex_a8_vfplite*15") - - ;; Comparisons can actually take 7 cycles sometimes instead of four, - ;; but given all the other instructions lumped into type=ffarith that --- -2.7.4 - diff --git a/package.bak/gcc/6.3.0/860-cilk-wchar.patch b/package.bak/gcc/6.3.0/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f554..0000000000 --- a/package.bak/gcc/6.3.0/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package.bak/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch b/package.bak/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch deleted file mode 100644 index 0598c76c2f..0000000000 --- a/package.bak/gcc/6.3.0/870-xtensa-Fix-PR-target-78118.patch +++ /dev/null @@ -1,320 +0,0 @@ -From 0d2556fa652cc85b3d042e862a38dd07d454175a Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Wed, 26 Oct 2016 08:02:51 +0000 -Subject: [PATCH 1/2] xtensa: Fix PR target/78118 - -It started failing after the following commit: 32e90dc6a0cda45 ("PR -rtl-optimization/61047"). - -The change that made xtensa backend go ICE looks completely unrelated, -and indeed, the issue is caused by the side effect of -compute_frame_size() function call hidden in the -INITIAL_ELIMINATION_OFFSET macro. This call updates the value of the -xtensa_current_frame_size static variable, used in "return" instruction -predicate. Prior to the change the value of xtensa_current_frame_size was -set to 0 after the end of epilogue generation, which enabled the "return" -instruction for the CALL0 ABI, but after the change the additional -INITIAL_ELIMINATION_OFFSET calls make xtensa_current_frame_size non-zero -and "return" pattern unavailable. - -Get rid of the global xtensa_current_frame_size and -xtensa_callee_save_size variables by moving them into the -machine_function structure. Implement predicate for the "return" pattern -as a function. Don't communicate completion of epilogue generation -through zeroing of xtensa_current_frame_size, add explicit epilogue_done -variable to the machine_function structure. Don't update stack frame -layout after the completion of reload. - -2016-10-26 Max Filippov -gcc/ - * config/xtensa/xtensa-protos.h - (xtensa_use_return_instruction_p): New prototype. - * config/xtensa/xtensa.c (xtensa_current_frame_size, - xtensa_callee_save_size): Remove. - (struct machine_function): Add new fields: current_frame_size, - callee_save_size, frame_laid_out and epilogue_done. - (compute_frame_size, xtensa_expand_prologue, - xtensa_expand_epilogue): Replace xtensa_callee_save_size with - cfun->machine->callee_save_size and xtensa_current_frame_size - with cfun->machine->current_frame_size. - (compute_frame_size): Update cfun->machine->frame_laid_out and - don't update frame layout after reload completion. - (xtensa_expand_epilogue): Set cfun->machine->epilogue_done - instead of zeroing xtensa_current_frame_size. - (xtensa_use_return_instruction_p): New function. - * config/xtensa/xtensa.h (xtensa_current_frame_size): Remove - declaration. - (INITIAL_ELIMINATION_OFFSET): Use return value of - compute_frame_size instead of xtensa_current_frame_size value. - * config/xtensa/xtensa.md ("return" pattern): Use new predicate - function xtensa_use_return_instruction_p instead of inline code. - -Signed-off-by: Max Filippov ---- -Backported from: r241748 - - gcc/config/xtensa/xtensa-protos.h | 1 + - gcc/config/xtensa/xtensa.c | 82 ++++++++++++++++++++++++--------------- - gcc/config/xtensa/xtensa.h | 6 +-- - gcc/config/xtensa/xtensa.md | 2 +- - 4 files changed, 55 insertions(+), 36 deletions(-) - -diff --git a/gcc/config/xtensa/xtensa-protos.h b/gcc/config/xtensa/xtensa-protos.h -index f2ca526..873557f 100644 ---- a/gcc/config/xtensa/xtensa-protos.h -+++ b/gcc/config/xtensa/xtensa-protos.h -@@ -68,6 +68,7 @@ extern rtx xtensa_return_addr (int, rtx); - extern void xtensa_setup_frame_addresses (void); - extern int xtensa_dbx_register_number (int); - extern long compute_frame_size (int); -+extern bool xtensa_use_return_instruction_p (void); - extern void xtensa_expand_prologue (void); - extern void xtensa_expand_epilogue (void); - extern void order_regs_for_local_alloc (void); -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index 64d089b..e49f784 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -78,11 +78,6 @@ enum internal_test - can support a given mode. */ - char xtensa_hard_regno_mode_ok[(int) MAX_MACHINE_MODE][FIRST_PSEUDO_REGISTER]; - --/* Current frame size calculated by compute_frame_size. */ --unsigned xtensa_current_frame_size; --/* Callee-save area size in the current frame calculated by compute_frame_size. */ --int xtensa_callee_save_size; -- - /* Largest block move to handle in-line. */ - #define LARGEST_MOVE_RATIO 15 - -@@ -94,6 +89,13 @@ struct GTY(()) machine_function - bool vararg_a7; - rtx vararg_a7_copy; - rtx_insn *set_frame_ptr_insn; -+ /* Current frame size calculated by compute_frame_size. */ -+ unsigned current_frame_size; -+ /* Callee-save area size in the current frame calculated by -+ compute_frame_size. */ -+ int callee_save_size; -+ bool frame_laid_out; -+ bool epilogue_done; - }; - - /* Vector, indexed by hard register number, which contains 1 for a -@@ -2628,24 +2630,29 @@ compute_frame_size (int size) - { - int regno; - -+ if (reload_completed && cfun->machine->frame_laid_out) -+ return cfun->machine->current_frame_size; -+ - /* Add space for the incoming static chain value. */ - if (cfun->static_chain_decl != NULL) - size += (1 * UNITS_PER_WORD); - -- xtensa_callee_save_size = 0; -+ cfun->machine->callee_save_size = 0; - for (regno = 0; regno < FIRST_PSEUDO_REGISTER; ++regno) - { - if (xtensa_call_save_reg(regno)) -- xtensa_callee_save_size += UNITS_PER_WORD; -+ cfun->machine->callee_save_size += UNITS_PER_WORD; - } - -- xtensa_current_frame_size = -+ cfun->machine->current_frame_size = - XTENSA_STACK_ALIGN (size -- + xtensa_callee_save_size -+ + cfun->machine->callee_save_size - + crtl->outgoing_args_size - + (WINDOW_SIZE * UNITS_PER_WORD)); -- xtensa_callee_save_size = XTENSA_STACK_ALIGN (xtensa_callee_save_size); -- return xtensa_current_frame_size; -+ cfun->machine->callee_save_size = -+ XTENSA_STACK_ALIGN (cfun->machine->callee_save_size); -+ cfun->machine->frame_laid_out = true; -+ return cfun->machine->current_frame_size; - } - - -@@ -2696,6 +2703,7 @@ xtensa_expand_prologue (void) - { - int regno; - HOST_WIDE_INT offset = 0; -+ int callee_save_size = cfun->machine->callee_save_size; - - /* -128 is a limit of single addi instruction. */ - if (total_size > 0 && total_size <= 128) -@@ -2709,7 +2717,7 @@ xtensa_expand_prologue (void) - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); - offset = total_size - UNITS_PER_WORD; - } -- else if (xtensa_callee_save_size) -+ else if (callee_save_size) - { - /* 1020 is maximal s32i offset, if the frame is bigger than that - * we move sp to the end of callee-saved save area, save and then -@@ -2717,13 +2725,13 @@ xtensa_expand_prologue (void) - if (total_size > 1024) - { - insn = emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, -- GEN_INT (-xtensa_callee_save_size))); -+ GEN_INT (-callee_save_size))); - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, -- -xtensa_callee_save_size)); -+ -callee_save_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); -- offset = xtensa_callee_save_size - UNITS_PER_WORD; -+ offset = callee_save_size - UNITS_PER_WORD; - } - else - { -@@ -2759,13 +2767,13 @@ xtensa_expand_prologue (void) - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); - emit_move_insn (tmp_reg, GEN_INT (total_size - -- xtensa_callee_save_size)); -+ callee_save_size)); - insn = emit_insn (gen_subsi3 (stack_pointer_rtx, - stack_pointer_rtx, tmp_reg)); - RTX_FRAME_RELATED_P (insn) = 1; - note_rtx = gen_rtx_SET (stack_pointer_rtx, - plus_constant (Pmode, stack_pointer_rtx, -- xtensa_callee_save_size - -+ callee_save_size - - total_size)); - add_reg_note (insn, REG_FRAME_RELATED_EXPR, note_rtx); - } -@@ -2833,21 +2841,21 @@ xtensa_expand_epilogue (void) - int regno; - HOST_WIDE_INT offset; - -- if (xtensa_current_frame_size > (frame_pointer_needed ? 127 : 1024)) -+ if (cfun->machine->current_frame_size > (frame_pointer_needed ? 127 : 1024)) - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); -- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size - -- xtensa_callee_save_size)); -+ emit_move_insn (tmp_reg, GEN_INT (cfun->machine->current_frame_size - -+ cfun->machine->callee_save_size)); - emit_insn (gen_addsi3 (stack_pointer_rtx, frame_pointer_needed ? - hard_frame_pointer_rtx : stack_pointer_rtx, - tmp_reg)); -- offset = xtensa_callee_save_size - UNITS_PER_WORD; -+ offset = cfun->machine->callee_save_size - UNITS_PER_WORD; - } - else - { - if (frame_pointer_needed) - emit_move_insn (stack_pointer_rtx, hard_frame_pointer_rtx); -- offset = xtensa_current_frame_size - UNITS_PER_WORD; -+ offset = cfun->machine->current_frame_size - UNITS_PER_WORD; - } - - /* Prevent reordering of saved a0 update and loading it back from -@@ -2867,16 +2875,16 @@ xtensa_expand_epilogue (void) - } - } - -- if (xtensa_current_frame_size > 0) -+ if (cfun->machine->current_frame_size > 0) - { - if (frame_pointer_needed || /* always reachable with addi */ -- xtensa_current_frame_size > 1024 || -- xtensa_current_frame_size <= 127) -+ cfun->machine->current_frame_size > 1024 || -+ cfun->machine->current_frame_size <= 127) - { -- if (xtensa_current_frame_size <= 127) -- offset = xtensa_current_frame_size; -+ if (cfun->machine->current_frame_size <= 127) -+ offset = cfun->machine->current_frame_size; - else -- offset = xtensa_callee_save_size; -+ offset = cfun->machine->callee_save_size; - - emit_insn (gen_addsi3 (stack_pointer_rtx, - stack_pointer_rtx, -@@ -2885,7 +2893,8 @@ xtensa_expand_epilogue (void) - else - { - rtx tmp_reg = gen_rtx_REG (Pmode, A9_REG); -- emit_move_insn (tmp_reg, GEN_INT (xtensa_current_frame_size)); -+ emit_move_insn (tmp_reg, -+ GEN_INT (cfun->machine->current_frame_size)); - emit_insn (gen_addsi3 (stack_pointer_rtx, stack_pointer_rtx, - tmp_reg)); - } -@@ -2896,11 +2905,22 @@ xtensa_expand_epilogue (void) - stack_pointer_rtx, - EH_RETURN_STACKADJ_RTX)); - } -- xtensa_current_frame_size = 0; -- xtensa_callee_save_size = 0; -+ cfun->machine->epilogue_done = true; - emit_jump_insn (gen_return ()); - } - -+bool -+xtensa_use_return_instruction_p (void) -+{ -+ if (!reload_completed) -+ return false; -+ if (TARGET_WINDOWED_ABI) -+ return true; -+ if (compute_frame_size (get_frame_size ()) == 0) -+ return true; -+ return cfun->machine->epilogue_done; -+} -+ - void - xtensa_set_return_address (rtx address, rtx scratch) - { -diff --git a/gcc/config/xtensa/xtensa.h b/gcc/config/xtensa/xtensa.h -index 82e9900..58eb1b2 100644 ---- a/gcc/config/xtensa/xtensa.h -+++ b/gcc/config/xtensa/xtensa.h -@@ -23,8 +23,6 @@ along with GCC; see the file COPYING3. If not see - - /* External variables defined in xtensa.c. */ - --extern unsigned xtensa_current_frame_size; -- - /* Macros used in the machine description to select various Xtensa - configuration options. */ - #ifndef XCHAL_HAVE_MUL32_HIGH -@@ -477,14 +475,14 @@ enum reg_class - /* Specify the initial difference between the specified pair of registers. */ - #define INITIAL_ELIMINATION_OFFSET(FROM, TO, OFFSET) \ - do { \ -- compute_frame_size (get_frame_size ()); \ -+ long frame_size = compute_frame_size (get_frame_size ()); \ - switch (FROM) \ - { \ - case FRAME_POINTER_REGNUM: \ - (OFFSET) = 0; \ - break; \ - case ARG_POINTER_REGNUM: \ -- (OFFSET) = xtensa_current_frame_size; \ -+ (OFFSET) = frame_size; \ - break; \ - default: \ - gcc_unreachable (); \ -diff --git a/gcc/config/xtensa/xtensa.md b/gcc/config/xtensa/xtensa.md -index db54a12..fcdb6c8 100644 ---- a/gcc/config/xtensa/xtensa.md -+++ b/gcc/config/xtensa/xtensa.md -@@ -1663,7 +1663,7 @@ - (define_insn "return" - [(return) - (use (reg:SI A0_REG))] -- "(TARGET_WINDOWED_ABI || !xtensa_current_frame_size) && reload_completed" -+ "xtensa_use_return_instruction_p ()" - { - return TARGET_WINDOWED_ABI ? - (TARGET_DENSITY ? "retw.n" : "retw") : --- -2.1.4 - diff --git a/package.bak/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch b/package.bak/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch deleted file mode 100644 index 0331814398..0000000000 --- a/package.bak/gcc/6.3.0/871-xtensa-Fix-PR-target-78603.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 59cce7b304a8cbbb508ba21ab2f9052d3ee9a9e3 Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Tue, 29 Nov 2016 13:09:17 -0800 -Subject: [PATCH 2/2] xtensa: Fix PR target/78603 - -2016-11-29 Max Filippov -gcc/ - * config/xtensa/xtensa.c (hwloop_optimize): Don't emit zero - overhead loop start between a call and its CALL_ARG_LOCATION - note. - -Signed-off-by: Max Filippov ---- -Backported from: r242979 - - gcc/config/xtensa/xtensa.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/xtensa/xtensa.c b/gcc/config/xtensa/xtensa.c -index e49f784..70f698a 100644 ---- a/gcc/config/xtensa/xtensa.c -+++ b/gcc/config/xtensa/xtensa.c -@@ -4158,7 +4158,10 @@ hwloop_optimize (hwloop_info loop) - entry_after = BB_END (entry_bb); - while (DEBUG_INSN_P (entry_after) - || (NOTE_P (entry_after) -- && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK)) -+ && NOTE_KIND (entry_after) != NOTE_INSN_BASIC_BLOCK -+ /* Make sure we don't split a call and its corresponding -+ CALL_ARG_LOCATION note. */ -+ && NOTE_KIND (entry_after) != NOTE_INSN_CALL_ARG_LOCATION)) - entry_after = PREV_INSN (entry_after); - - emit_insn_after (seq, entry_after); --- -2.1.4 - diff --git a/package.bak/gcc/6.3.0/890-fix-m68k-compile.patch b/package.bak/gcc/6.3.0/890-fix-m68k-compile.patch deleted file mode 100644 index 6e63de0cd1..0000000000 --- a/package.bak/gcc/6.3.0/890-fix-m68k-compile.patch +++ /dev/null @@ -1,15 +0,0 @@ -remove unused header, which breaks the toolchain building - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c gcc-5.3.0/libgcc/config/m68k/linux-atomic.c ---- gcc-5.3.0.orig/libgcc/config/m68k/linux-atomic.c 2015-01-05 13:33:28.000000000 +0100 -+++ gcc-5.3.0/libgcc/config/m68k/linux-atomic.c 2016-03-19 09:25:07.000000000 +0100 -@@ -33,7 +33,6 @@ - using the kernel helper defined below. There is no support for - 64-bit operations yet. */ - --#include - #include - - #ifndef __NR_atomic_cmpxchg_32 diff --git a/package.bak/gcc/6.3.0/891-fix-m68k-uclinux.patch b/package.bak/gcc/6.3.0/891-fix-m68k-uclinux.patch deleted file mode 100644 index 754aa74e88..0000000000 --- a/package.bak/gcc/6.3.0/891-fix-m68k-uclinux.patch +++ /dev/null @@ -1,18 +0,0 @@ -avoids internal compiler error while compiling linux-atomic.c -See here: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53833 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.1.0.orig/libgcc/config.host gcc-6.1.0/libgcc/config.host ---- gcc-6.1.0.orig/libgcc/config.host 2016-02-26 21:02:28.000000000 +0100 -+++ gcc-6.1.0/libgcc/config.host 2016-04-29 09:18:40.377989160 +0200 -@@ -812,7 +812,7 @@ - m68k*-*-openbsd*) - ;; - m68k-*-uclinux*) # Motorola m68k/ColdFire running uClinux with uClibc -- tmake_file="$tmake_file m68k/t-floatlib m68k/t-linux" -+ tmake_file="$tmake_file m68k/t-floatlib" - md_unwind_header=m68k/linux-unwind.h - ;; - m68k-*-linux*) # Motorola m68k's running GNU/Linux diff --git a/package.bak/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch b/package.bak/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch deleted file mode 100644 index 73ee6c5faa..0000000000 --- a/package.bak/gcc/6.3.0/892-libgcc-mkmap-symver-support-skip_underscore.patch +++ /dev/null @@ -1,60 +0,0 @@ -From ae9c3e354440c4a0f105a9eabfb2f77be085ebc1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 18 Aug 2016 17:59:16 +0200 -Subject: [PATCH] libgcc/mkmap-symver: support skip_underscore - -Some platforms, such as Blackfin, have a special prefix for assembly -symbols as opposed to C symbols. For this reason, a function named -"foo()" in C will in fact be visible as a symbol called "_foo" in the -ELF binary. - -The current linker version script logic in libgcc doesn't take into -account this situation properly. The Blackfin specific -libgcc/config/bfin/libgcc-glibc.ver has an additional "_" in front of -every symbol so that it matches the output of "nm" (which gets parsed to -produce the final linker version script). But due to this additional -"_", ld no longer matches with the symbols since "ld" does the matching -with the original symbol name, not the one prefixed with "_". - -Due to this, none of the symbols in libgcc/config/bfin/libgcc-glibc.ver -are actually matched with symbols in libgcc. This causes all libgcc -symbols to be left as "LOCAL", which causes lots of "undefined -reference" whenever some C or C++ code that calls a function of libgcc -is compiled. - -To address this, this commit introduces a "skip_underscore" variable to -the mkmap-symver script. It tells mkmap-symver to ignore the leading -underscore from the "nm" output. - -Note that this new argument is different from the existing -"leading_underscore" argument, which *adds* an additional underscore to -the generated linker version script. - -Having this functionality paves the way to using the generic linker -version information for Blackfin, instead of using a custom one. - -Signed-off-by: Thomas Petazzoni ---- - libgcc/mkmap-symver.awk | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/libgcc/mkmap-symver.awk b/libgcc/mkmap-symver.awk -index 266832a..30bb179 100644 ---- a/libgcc/mkmap-symver.awk -+++ b/libgcc/mkmap-symver.awk -@@ -47,7 +47,11 @@ state == "nm" && ($1 == "U" || $2 == "U") { - - state == "nm" && NF == 3 { - split ($3, s, "@") -- def[s[1]] = 1; -+ if (skip_underscore) -+ symname = substr(s[1], 2); -+ else -+ symname = s[1]; -+ def[symname] = 1; - sawsymbol = 1; - next; - } --- -2.7.4 - diff --git a/package.bak/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch b/package.bak/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch deleted file mode 100644 index 454295d0ed..0000000000 --- a/package.bak/gcc/6.3.0/893-libgcc-config-bfin-use-the-generic-linker-version-in.patch +++ /dev/null @@ -1,1944 +0,0 @@ -From 56d606931716de30a89a40dc69a9282c1b4e2880 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 18 Aug 2016 18:04:06 +0200 -Subject: [PATCH] libgcc/config/bfin: use the generic linker version - information - -This commit makes the Blackfin platform use the generic linker version -information, rather than a completely duplicated file, specific for the -Blackfin architecture. - -This is made possible using the newly introduced skip_underscore -variable of the mkmap-symver script. - -This also allows to get a correct linker version file, with symbol names -matching the ones found in libgcc. Thanks to this, the necessary symbols -are marked "GLOBAL" instead of "LOCAL", which makes them visible at link -time, and solves a large number of "undefined reference" -issues. Indeed, the Blackfin specific linker version script had an extra -underscore in front of all symbols, which meant none of them matched the -symbols in libgcc, and therefore all libgcc symbols were marked as -"LOCAL", making them invisible for linking. - -Signed-off-by: Thomas Petazzoni ---- - libgcc/config/bfin/libgcc-glibc.ver | 1894 +---------------------------------- - libgcc/config/bfin/t-linux | 3 +- - 2 files changed, 4 insertions(+), 1893 deletions(-) - -diff --git a/libgcc/config/bfin/libgcc-glibc.ver b/libgcc/config/bfin/libgcc-glibc.ver -index b1bd2df..2af3df7 100644 ---- a/libgcc/config/bfin/libgcc-glibc.ver -+++ b/libgcc/config/bfin/libgcc-glibc.ver -@@ -16,1898 +16,8 @@ - # along with GCC; see the file COPYING3. If not see - # . - --GCC_3.0 { -- # libgcc1 integer symbols -- ___absvsi2 -- ___addvsi3 -- ___ashlsi3 -- ___ashrsi3 -- ___divsi3 -- ___lshrsi3 -- ___modsi3 -- ___mulsi3 -- ___mulvsi3 -- ___negvsi2 -- ___subvsi3 -- ___udivsi3 -- ___umodsi3 -- -- # libgcc1 floating point symbols -- ___addsf3 -- ___adddf3 -- ___addxf3 -- ___addtf3 -- ___divsf3 -- ___divdf3 -- ___divxf3 -- ___divtf3 -- ___eqsf2 -- ___eqdf2 -- ___eqxf2 -- ___eqtf2 -- ___extenddfxf2 -- ___extenddftf2 -- ___extendsfdf2 -- ___extendsfxf2 -- ___extendsftf2 -- ___fixsfsi -- ___fixdfsi -- ___fixxfsi -- ___fixtfsi -- ___floatsisf -- ___floatsidf -- ___floatsixf -- ___floatsitf -- ___gesf2 -- ___gedf2 -- ___gexf2 -- ___getf2 -- ___gtsf2 -- ___gtdf2 -- ___gtxf2 -- ___gttf2 -- ___lesf2 -- ___ledf2 -- ___lexf2 -- ___letf2 -- ___ltsf2 -- ___ltdf2 -- ___ltxf2 -- ___lttf2 -- ___mulsf3 -- ___muldf3 -- ___mulxf3 -- ___multf3 -- ___negsf2 -- ___negdf2 -- ___negxf2 -- ___negtf2 -- ___nesf2 -- ___nedf2 -- ___nexf2 -- ___netf2 -- ___subsf3 -- ___subdf3 -- ___subxf3 -- ___subtf3 -- ___truncdfsf2 -- ___truncxfsf2 -- ___trunctfsf2 -- ___truncxfdf2 -- ___trunctfdf2 -- -- # libgcc2 DImode arithmetic (for 32-bit targets). -- ___absvdi2 -- ___addvdi3 -- ___ashldi3 -- ___ashrdi3 -- ___cmpdi2 -- ___divdi3 -- ___ffsdi2 -- ___fixdfdi -- ___fixsfdi -- ___fixtfdi -- ___fixxfdi -- ___fixunsdfdi -- ___fixunsdfsi -- ___fixunssfsi -- ___fixunssfdi -- ___fixunstfdi -- ___fixunstfsi -- ___fixunsxfdi -- ___fixunsxfsi -- ___floatdidf -- ___floatdisf -- ___floatdixf -- ___floatditf -- ___lshrdi3 -- ___moddi3 -- ___muldi3 -- ___mulvdi3 -- ___negdi2 -- ___negvdi2 -- ___subvdi3 -- ___ucmpdi2 -- ___udivdi3 -- ___udivmoddi4 -- ___umoddi3 -- -- # libgcc2 TImode arithmetic (for 64-bit targets). -- ___ashlti3 -- ___ashrti3 -- ___cmpti2 -- ___divti3 -- ___ffsti2 -- ___fixdfti -- ___fixsfti -- ___fixtfti -- ___fixxfti -- ___lshrti3 -- ___modti3 -- ___multi3 -- ___negti2 -- ___ucmpti2 -- ___udivmodti4 -- ___udivti3 -- ___umodti3 -- ___fixunsdfti -- ___fixunssfti -- ___fixunstfti -- ___fixunsxfti -- ___floattidf -- ___floattisf -- ___floattixf -- ___floattitf -- -- # Used to deal with trampoline initialization on some platforms -- ___clear_cache -- -- # EH symbols -- __Unwind_DeleteException -- __Unwind_Find_FDE -- __Unwind_ForcedUnwind -- __Unwind_GetGR -- __Unwind_GetIP -- __Unwind_GetLanguageSpecificData -- __Unwind_GetRegionStart -- __Unwind_GetTextRelBase -- __Unwind_GetDataRelBase -- __Unwind_RaiseException -- __Unwind_Resume -- __Unwind_SetGR -- __Unwind_SetIP -- ___deregister_frame -- ___deregister_frame_info -- ___deregister_frame_info_bases -- ___register_frame -- ___register_frame_info -- ___register_frame_info_bases -- ___register_frame_info_table -- ___register_frame_info_table_bases -- ___register_frame_table -- -- # SjLj EH symbols -- __Unwind_SjLj_Register -- __Unwind_SjLj_Unregister -- __Unwind_SjLj_RaiseException -- __Unwind_SjLj_ForcedUnwind -- __Unwind_SjLj_Resume --} -- --%inherit GCC_3.3 GCC_3.0 --GCC_3.3 { -- __Unwind_FindEnclosingFunction -- __Unwind_GetCFA -- __Unwind_Backtrace -- __Unwind_Resume_or_Rethrow -- __Unwind_SjLj_Resume_or_Rethrow --} -- --%inherit GCC_3.3.1 GCC_3.3 --GCC_3.3.1 { -- ___gcc_personality_sj0 -- ___gcc_personality_v0 --} -- --%inherit GCC_3.3.2 GCC_3.3.1 --GCC_3.3.2 { --} --%inherit GCC_3.3.4 GCC_3.3.2 --GCC_3.3.4 { -- ___unorddf2 -- ___unordsf2 --} -- --%inherit GCC_3.4 GCC_3.3.4 --GCC_3.4 { -- # bit scanning and counting built-ins -- ___clzsi2 -- ___clzdi2 -- ___clzti2 -- ___ctzsi2 -- ___ctzdi2 -- ___ctzti2 -- ___popcountsi2 -- ___popcountdi2 -- ___popcountti2 -- ___paritysi2 -- ___paritydi2 -- ___parityti2 --} -- --%inherit GCC_3.4.2 GCC_3.4 --GCC_3.4.2 { -- # Used to deal with trampoline initialization on some platforms -- ___enable_execute_stack -- ___trampoline_setup --} -- --%inherit GCC_3.4.4 GCC_3.4.2 --GCC_3.4.4 { -- # libgcc2 TImode arithmetic (for 64-bit targets). -- ___absvti2 -- ___addvti3 -- ___mulvti3 -- ___negvti2 -- ___subvti3 --} -- --%inherit GCC_4.0.0 GCC_3.4.4 --GCC_4.0.0 { -- # libgcc2 __builtin_powi helpers. -- ___powisf2 -- ___powidf2 -- ___powixf2 -- ___powitf2 -- -- # c99 compliant complex arithmetic -- ___divsc3 -- ___divdc3 -- ___divxc3 -- ___divtc3 -- ___mulsc3 -- ___muldc3 -- ___mulxc3 -- ___multc3 --} -- - %inherit GCC_4.1.0 GCC_4.0.0 - GCC_4.1.0 { -- ___smulsi3_highpart -- ___umulsi3_highpart --} -- --%inherit GCC_4.2.0 GCC_4.1.0 --GCC_4.2.0 { -- # unsigned-to-floating conversions -- ___floatunsisf -- ___floatunsidf -- ___floatunsixf -- ___floatunsitf -- ___floatundidf -- ___floatundisf -- ___floatundixf -- ___floatunditf -- ___floatuntidf -- ___floatuntisf -- ___floatuntixf -- ___floatuntitf -- __Unwind_GetIPInfo --} -- --%inherit GCC_4.3.0 GCC_4.2.0 --GCC_4.3.0 { -- # byte swapping routines -- ___bswapsi2 -- ___bswapdi2 -- ___emutls_get_address -- ___emutls_register_common -- ___ffssi2 -- ___extendxftf2 -- ___trunctfxf2 -- -- # fixed-point routines -- ___addqq3 -- ___addhq3 -- ___addsq3 -- ___adddq3 -- ___addtq3 -- ___adduqq3 -- ___adduhq3 -- ___addusq3 -- ___addudq3 -- ___addutq3 -- ___addha3 -- ___addsa3 -- ___addda3 -- ___addta3 -- ___adduha3 -- ___addusa3 -- ___adduda3 -- ___adduta3 -- ___ssaddqq3 -- ___ssaddhq3 -- ___ssaddsq3 -- ___ssadddq3 -- ___ssaddtq3 -- ___ssaddha3 -- ___ssaddsa3 -- ___ssaddda3 -- ___ssaddta3 -- ___usadduqq3 -- ___usadduhq3 -- ___usaddusq3 -- ___usaddudq3 -- ___usaddutq3 -- ___usadduha3 -- ___usaddusa3 -- ___usadduda3 -- ___usadduta3 -- ___subqq3 -- ___subhq3 -- ___subsq3 -- ___subdq3 -- ___subtq3 -- ___subuqq3 -- ___subuhq3 -- ___subusq3 -- ___subudq3 -- ___subutq3 -- ___subha3 -- ___subsa3 -- ___subda3 -- ___subta3 -- ___subuha3 -- ___subusa3 -- ___subuda3 -- ___subuta3 -- ___sssubqq3 -- ___sssubhq3 -- ___sssubsq3 -- ___sssubdq3 -- ___sssubtq3 -- ___sssubha3 -- ___sssubsa3 -- ___sssubda3 -- ___sssubta3 -- ___ussubuqq3 -- ___ussubuhq3 -- ___ussubusq3 -- ___ussubudq3 -- ___ussubutq3 -- ___ussubuha3 -- ___ussubusa3 -- ___ussubuda3 -- ___ussubuta3 -- ___mulqq3 -- ___mulhq3 -- ___mulsq3 -- ___muldq3 -- ___multq3 -- ___muluqq3 -- ___muluhq3 -- ___mulusq3 -- ___muludq3 -- ___mulutq3 -- ___mulha3 -- ___mulsa3 -- ___mulda3 -- ___multa3 -- ___muluha3 -- ___mulusa3 -- ___muluda3 -- ___muluta3 -- ___ssmulqq3 -- ___ssmulhq3 -- ___ssmulsq3 -- ___ssmuldq3 -- ___ssmultq3 -- ___ssmulha3 -- ___ssmulsa3 -- ___ssmulda3 -- ___ssmulta3 -- ___usmuluqq3 -- ___usmuluhq3 -- ___usmulusq3 -- ___usmuludq3 -- ___usmulutq3 -- ___usmuluha3 -- ___usmulusa3 -- ___usmuluda3 -- ___usmuluta3 -- ___divqq3 -- ___divhq3 -- ___divsq3 -- ___divdq3 -- ___divtq3 -- ___divha3 -- ___divsa3 -- ___divda3 -- ___divta3 -- ___udivuqq3 -- ___udivuhq3 -- ___udivusq3 -- ___udivudq3 -- ___udivutq3 -- ___udivuha3 -- ___udivusa3 -- ___udivuda3 -- ___udivuta3 -- ___ssdivqq3 -- ___ssdivhq3 -- ___ssdivsq3 -- ___ssdivdq3 -- ___ssdivtq3 -- ___ssdivha3 -- ___ssdivsa3 -- ___ssdivda3 -- ___ssdivta3 -- ___usdivuqq3 -- ___usdivuhq3 -- ___usdivusq3 -- ___usdivudq3 -- ___usdivutq3 -- ___usdivuha3 -- ___usdivusa3 -- ___usdivuda3 -- ___usdivuta3 -- ___negqq2 -- ___neghq2 -- ___negsq2 -- ___negdq2 -- ___negtq2 -- ___neguqq2 -- ___neguhq2 -- ___negusq2 -- ___negudq2 -- ___negutq2 -- ___negha2 -- ___negsa2 -- ___negda2 -- ___negta2 -- ___neguha2 -- ___negusa2 -- ___neguda2 -- ___neguta2 -- ___ssnegqq2 -- ___ssneghq2 -- ___ssnegsq2 -- ___ssnegdq2 -- ___ssnegtq2 -- ___ssnegha2 -- ___ssnegsa2 -- ___ssnegda2 -- ___ssnegta2 -- ___usneguqq2 -- ___usneguhq2 -- ___usnegusq2 -- ___usnegudq2 -- ___usnegutq2 -- ___usneguha2 -- ___usnegusa2 -- ___usneguda2 -- ___usneguta2 -- ___ashlqq3 -- ___ashlhq3 -- ___ashlsq3 -- ___ashldq3 -- ___ashltq3 -- ___ashluqq3 -- ___ashluhq3 -- ___ashlusq3 -- ___ashludq3 -- ___ashlutq3 -- ___ashlha3 -- ___ashlsa3 -- ___ashlda3 -- ___ashlta3 -- ___ashluha3 -- ___ashlusa3 -- ___ashluda3 -- ___ashluta3 -- ___ashrqq3 -- ___ashrhq3 -- ___ashrsq3 -- ___ashrdq3 -- ___ashrtq3 -- ___ashrha3 -- ___ashrsa3 -- ___ashrda3 -- ___ashrta3 -- ___lshruqq3 -- ___lshruhq3 -- ___lshrusq3 -- ___lshrudq3 -- ___lshrutq3 -- ___lshruha3 -- ___lshrusa3 -- ___lshruda3 -- ___lshruta3 -- ___ssashlqq3 -- ___ssashlhq3 -- ___ssashlsq3 -- ___ssashldq3 -- ___ssashltq3 -- ___ssashlha3 -- ___ssashlsa3 -- ___ssashlda3 -- ___ssashlta3 -- ___usashluqq3 -- ___usashluhq3 -- ___usashlusq3 -- ___usashludq3 -- ___usashlutq3 -- ___usashluha3 -- ___usashlusa3 -- ___usashluda3 -- ___usashluta3 -- ___cmpqq2 -- ___cmphq2 -- ___cmpsq2 -- ___cmpdq2 -- ___cmptq2 -- ___cmpuqq2 -- ___cmpuhq2 -- ___cmpusq2 -- ___cmpudq2 -- ___cmputq2 -- ___cmpha2 -- ___cmpsa2 -- ___cmpda2 -- ___cmpta2 -- ___cmpuha2 -- ___cmpusa2 -- ___cmpuda2 -- ___cmputa2 -- ___fractqqhq2 -- ___fractqqsq2 -- ___fractqqdq2 -- ___fractqqtq2 -- ___fractqqha -- ___fractqqsa -- ___fractqqda -- ___fractqqta -- ___fractqquqq -- ___fractqquhq -- ___fractqqusq -- ___fractqqudq -- ___fractqqutq -- ___fractqquha -- ___fractqqusa -- ___fractqquda -- ___fractqquta -- ___fractqqqi -- ___fractqqhi -- ___fractqqsi -- ___fractqqdi -- ___fractqqti -- ___fractqqsf -- ___fractqqdf -- ___fracthqqq2 -- ___fracthqsq2 -- ___fracthqdq2 -- ___fracthqtq2 -- ___fracthqha -- ___fracthqsa -- ___fracthqda -- ___fracthqta -- ___fracthquqq -- ___fracthquhq -- ___fracthqusq -- ___fracthqudq -- ___fracthqutq -- ___fracthquha -- ___fracthqusa -- ___fracthquda -- ___fracthquta -- ___fracthqqi -- ___fracthqhi -- ___fracthqsi -- ___fracthqdi -- ___fracthqti -- ___fracthqsf -- ___fracthqdf -- ___fractsqqq2 -- ___fractsqhq2 -- ___fractsqdq2 -- ___fractsqtq2 -- ___fractsqha -- ___fractsqsa -- ___fractsqda -- ___fractsqta -- ___fractsquqq -- ___fractsquhq -- ___fractsqusq -- ___fractsqudq -- ___fractsqutq -- ___fractsquha -- ___fractsqusa -- ___fractsquda -- ___fractsquta -- ___fractsqqi -- ___fractsqhi -- ___fractsqsi -- ___fractsqdi -- ___fractsqti -- ___fractsqsf -- ___fractsqdf -- ___fractdqqq2 -- ___fractdqhq2 -- ___fractdqsq2 -- ___fractdqtq2 -- ___fractdqha -- ___fractdqsa -- ___fractdqda -- ___fractdqta -- ___fractdquqq -- ___fractdquhq -- ___fractdqusq -- ___fractdqudq -- ___fractdqutq -- ___fractdquha -- ___fractdqusa -- ___fractdquda -- ___fractdquta -- ___fractdqqi -- ___fractdqhi -- ___fractdqsi -- ___fractdqdi -- ___fractdqti -- ___fractdqsf -- ___fractdqdf -- ___fracttqqq2 -- ___fracttqhq2 -- ___fracttqsq2 -- ___fracttqdq2 -- ___fracttqha -- ___fracttqsa -- ___fracttqda -- ___fracttqta -- ___fracttquqq -- ___fracttquhq -- ___fracttqusq -- ___fracttqudq -- ___fracttqutq -- ___fracttquha -- ___fracttqusa -- ___fracttquda -- ___fracttquta -- ___fracttqqi -- ___fracttqhi -- ___fracttqsi -- ___fracttqdi -- ___fracttqti -- ___fracttqsf -- ___fracttqdf -- ___fracthaqq -- ___fracthahq -- ___fracthasq -- ___fracthadq -- ___fracthatq -- ___fracthasa2 -- ___fracthada2 -- ___fracthata2 -- ___fracthauqq -- ___fracthauhq -- ___fracthausq -- ___fracthaudq -- ___fracthautq -- ___fracthauha -- ___fracthausa -- ___fracthauda -- ___fracthauta -- ___fracthaqi -- ___fracthahi -- ___fracthasi -- ___fracthadi -- ___fracthati -- ___fracthasf -- ___fracthadf -- ___fractsaqq -- ___fractsahq -- ___fractsasq -- ___fractsadq -- ___fractsatq -- ___fractsaha2 -- ___fractsada2 -- ___fractsata2 -- ___fractsauqq -- ___fractsauhq -- ___fractsausq -- ___fractsaudq -- ___fractsautq -- ___fractsauha -- ___fractsausa -- ___fractsauda -- ___fractsauta -- ___fractsaqi -- ___fractsahi -- ___fractsasi -- ___fractsadi -- ___fractsati -- ___fractsasf -- ___fractsadf -- ___fractdaqq -- ___fractdahq -- ___fractdasq -- ___fractdadq -- ___fractdatq -- ___fractdaha2 -- ___fractdasa2 -- ___fractdata2 -- ___fractdauqq -- ___fractdauhq -- ___fractdausq -- ___fractdaudq -- ___fractdautq -- ___fractdauha -- ___fractdausa -- ___fractdauda -- ___fractdauta -- ___fractdaqi -- ___fractdahi -- ___fractdasi -- ___fractdadi -- ___fractdati -- ___fractdasf -- ___fractdadf -- ___fracttaqq -- ___fracttahq -- ___fracttasq -- ___fracttadq -- ___fracttatq -- ___fracttaha2 -- ___fracttasa2 -- ___fracttada2 -- ___fracttauqq -- ___fracttauhq -- ___fracttausq -- ___fracttaudq -- ___fracttautq -- ___fracttauha -- ___fracttausa -- ___fracttauda -- ___fracttauta -- ___fracttaqi -- ___fracttahi -- ___fracttasi -- ___fracttadi -- ___fracttati -- ___fracttasf -- ___fracttadf -- ___fractuqqqq -- ___fractuqqhq -- ___fractuqqsq -- ___fractuqqdq -- ___fractuqqtq -- ___fractuqqha -- ___fractuqqsa -- ___fractuqqda -- ___fractuqqta -- ___fractuqquhq2 -- ___fractuqqusq2 -- ___fractuqqudq2 -- ___fractuqqutq2 -- ___fractuqquha -- ___fractuqqusa -- ___fractuqquda -- ___fractuqquta -- ___fractuqqqi -- ___fractuqqhi -- ___fractuqqsi -- ___fractuqqdi -- ___fractuqqti -- ___fractuqqsf -- ___fractuqqdf -- ___fractuhqqq -- ___fractuhqhq -- ___fractuhqsq -- ___fractuhqdq -- ___fractuhqtq -- ___fractuhqha -- ___fractuhqsa -- ___fractuhqda -- ___fractuhqta -- ___fractuhquqq2 -- ___fractuhqusq2 -- ___fractuhqudq2 -- ___fractuhqutq2 -- ___fractuhquha -- ___fractuhqusa -- ___fractuhquda -- ___fractuhquta -- ___fractuhqqi -- ___fractuhqhi -- ___fractuhqsi -- ___fractuhqdi -- ___fractuhqti -- ___fractuhqsf -- ___fractuhqdf -- ___fractusqqq -- ___fractusqhq -- ___fractusqsq -- ___fractusqdq -- ___fractusqtq -- ___fractusqha -- ___fractusqsa -- ___fractusqda -- ___fractusqta -- ___fractusquqq2 -- ___fractusquhq2 -- ___fractusqudq2 -- ___fractusqutq2 -- ___fractusquha -- ___fractusqusa -- ___fractusquda -- ___fractusquta -- ___fractusqqi -- ___fractusqhi -- ___fractusqsi -- ___fractusqdi -- ___fractusqti -- ___fractusqsf -- ___fractusqdf -- ___fractudqqq -- ___fractudqhq -- ___fractudqsq -- ___fractudqdq -- ___fractudqtq -- ___fractudqha -- ___fractudqsa -- ___fractudqda -- ___fractudqta -- ___fractudquqq2 -- ___fractudquhq2 -- ___fractudqusq2 -- ___fractudqutq2 -- ___fractudquha -- ___fractudqusa -- ___fractudquda -- ___fractudquta -- ___fractudqqi -- ___fractudqhi -- ___fractudqsi -- ___fractudqdi -- ___fractudqti -- ___fractudqsf -- ___fractudqdf -- ___fractutqqq -- ___fractutqhq -- ___fractutqsq -- ___fractutqdq -- ___fractutqtq -- ___fractutqha -- ___fractutqsa -- ___fractutqda -- ___fractutqta -- ___fractutquqq2 -- ___fractutquhq2 -- ___fractutqusq2 -- ___fractutqudq2 -- ___fractutquha -- ___fractutqusa -- ___fractutquda -- ___fractutquta -- ___fractutqqi -- ___fractutqhi -- ___fractutqsi -- ___fractutqdi -- ___fractutqti -- ___fractutqsf -- ___fractutqdf -- ___fractuhaqq -- ___fractuhahq -- ___fractuhasq -- ___fractuhadq -- ___fractuhatq -- ___fractuhaha -- ___fractuhasa -- ___fractuhada -- ___fractuhata -- ___fractuhauqq -- ___fractuhauhq -- ___fractuhausq -- ___fractuhaudq -- ___fractuhautq -- ___fractuhausa2 -- ___fractuhauda2 -- ___fractuhauta2 -- ___fractuhaqi -- ___fractuhahi -- ___fractuhasi -- ___fractuhadi -- ___fractuhati -- ___fractuhasf -- ___fractuhadf -- ___fractusaqq -- ___fractusahq -- ___fractusasq -- ___fractusadq -- ___fractusatq -- ___fractusaha -- ___fractusasa -- ___fractusada -- ___fractusata -- ___fractusauqq -- ___fractusauhq -- ___fractusausq -- ___fractusaudq -- ___fractusautq -- ___fractusauha2 -- ___fractusauda2 -- ___fractusauta2 -- ___fractusaqi -- ___fractusahi -- ___fractusasi -- ___fractusadi -- ___fractusati -- ___fractusasf -- ___fractusadf -- ___fractudaqq -- ___fractudahq -- ___fractudasq -- ___fractudadq -- ___fractudatq -- ___fractudaha -- ___fractudasa -- ___fractudada -- ___fractudata -- ___fractudauqq -- ___fractudauhq -- ___fractudausq -- ___fractudaudq -- ___fractudautq -- ___fractudauha2 -- ___fractudausa2 -- ___fractudauta2 -- ___fractudaqi -- ___fractudahi -- ___fractudasi -- ___fractudadi -- ___fractudati -- ___fractudasf -- ___fractudadf -- ___fractutaqq -- ___fractutahq -- ___fractutasq -- ___fractutadq -- ___fractutatq -- ___fractutaha -- ___fractutasa -- ___fractutada -- ___fractutata -- ___fractutauqq -- ___fractutauhq -- ___fractutausq -- ___fractutaudq -- ___fractutautq -- ___fractutauha2 -- ___fractutausa2 -- ___fractutauda2 -- ___fractutaqi -- ___fractutahi -- ___fractutasi -- ___fractutadi -- ___fractutati -- ___fractutasf -- ___fractutadf -- ___fractqiqq -- ___fractqihq -- ___fractqisq -- ___fractqidq -- ___fractqitq -- ___fractqiha -- ___fractqisa -- ___fractqida -- ___fractqita -- ___fractqiuqq -- ___fractqiuhq -- ___fractqiusq -- ___fractqiudq -- ___fractqiutq -- ___fractqiuha -- ___fractqiusa -- ___fractqiuda -- ___fractqiuta -- ___fracthiqq -- ___fracthihq -- ___fracthisq -- ___fracthidq -- ___fracthitq -- ___fracthiha -- ___fracthisa -- ___fracthida -- ___fracthita -- ___fracthiuqq -- ___fracthiuhq -- ___fracthiusq -- ___fracthiudq -- ___fracthiutq -- ___fracthiuha -- ___fracthiusa -- ___fracthiuda -- ___fracthiuta -- ___fractsiqq -- ___fractsihq -- ___fractsisq -- ___fractsidq -- ___fractsitq -- ___fractsiha -- ___fractsisa -- ___fractsida -- ___fractsita -- ___fractsiuqq -- ___fractsiuhq -- ___fractsiusq -- ___fractsiudq -- ___fractsiutq -- ___fractsiuha -- ___fractsiusa -- ___fractsiuda -- ___fractsiuta -- ___fractdiqq -- ___fractdihq -- ___fractdisq -- ___fractdidq -- ___fractditq -- ___fractdiha -- ___fractdisa -- ___fractdida -- ___fractdita -- ___fractdiuqq -- ___fractdiuhq -- ___fractdiusq -- ___fractdiudq -- ___fractdiutq -- ___fractdiuha -- ___fractdiusa -- ___fractdiuda -- ___fractdiuta -- ___fracttiqq -- ___fracttihq -- ___fracttisq -- ___fracttidq -- ___fracttitq -- ___fracttiha -- ___fracttisa -- ___fracttida -- ___fracttita -- ___fracttiuqq -- ___fracttiuhq -- ___fracttiusq -- ___fracttiudq -- ___fracttiutq -- ___fracttiuha -- ___fracttiusa -- ___fracttiuda -- ___fracttiuta -- ___fractsfqq -- ___fractsfhq -- ___fractsfsq -- ___fractsfdq -- ___fractsftq -- ___fractsfha -- ___fractsfsa -- ___fractsfda -- ___fractsfta -- ___fractsfuqq -- ___fractsfuhq -- ___fractsfusq -- ___fractsfudq -- ___fractsfutq -- ___fractsfuha -- ___fractsfusa -- ___fractsfuda -- ___fractsfuta -- ___fractdfqq -- ___fractdfhq -- ___fractdfsq -- ___fractdfdq -- ___fractdftq -- ___fractdfha -- ___fractdfsa -- ___fractdfda -- ___fractdfta -- ___fractdfuqq -- ___fractdfuhq -- ___fractdfusq -- ___fractdfudq -- ___fractdfutq -- ___fractdfuha -- ___fractdfusa -- ___fractdfuda -- ___fractdfuta -- ___satfractqqhq2 -- ___satfractqqsq2 -- ___satfractqqdq2 -- ___satfractqqtq2 -- ___satfractqqha -- ___satfractqqsa -- ___satfractqqda -- ___satfractqqta -- ___satfractqquqq -- ___satfractqquhq -- ___satfractqqusq -- ___satfractqqudq -- ___satfractqqutq -- ___satfractqquha -- ___satfractqqusa -- ___satfractqquda -- ___satfractqquta -- ___satfracthqqq2 -- ___satfracthqsq2 -- ___satfracthqdq2 -- ___satfracthqtq2 -- ___satfracthqha -- ___satfracthqsa -- ___satfracthqda -- ___satfracthqta -- ___satfracthquqq -- ___satfracthquhq -- ___satfracthqusq -- ___satfracthqudq -- ___satfracthqutq -- ___satfracthquha -- ___satfracthqusa -- ___satfracthquda -- ___satfracthquta -- ___satfractsqqq2 -- ___satfractsqhq2 -- ___satfractsqdq2 -- ___satfractsqtq2 -- ___satfractsqha -- ___satfractsqsa -- ___satfractsqda -- ___satfractsqta -- ___satfractsquqq -- ___satfractsquhq -- ___satfractsqusq -- ___satfractsqudq -- ___satfractsqutq -- ___satfractsquha -- ___satfractsqusa -- ___satfractsquda -- ___satfractsquta -- ___satfractdqqq2 -- ___satfractdqhq2 -- ___satfractdqsq2 -- ___satfractdqtq2 -- ___satfractdqha -- ___satfractdqsa -- ___satfractdqda -- ___satfractdqta -- ___satfractdquqq -- ___satfractdquhq -- ___satfractdqusq -- ___satfractdqudq -- ___satfractdqutq -- ___satfractdquha -- ___satfractdqusa -- ___satfractdquda -- ___satfractdquta -- ___satfracttqqq2 -- ___satfracttqhq2 -- ___satfracttqsq2 -- ___satfracttqdq2 -- ___satfracttqha -- ___satfracttqsa -- ___satfracttqda -- ___satfracttqta -- ___satfracttquqq -- ___satfracttquhq -- ___satfracttqusq -- ___satfracttqudq -- ___satfracttqutq -- ___satfracttquha -- ___satfracttqusa -- ___satfracttquda -- ___satfracttquta -- ___satfracthaqq -- ___satfracthahq -- ___satfracthasq -- ___satfracthadq -- ___satfracthatq -- ___satfracthasa2 -- ___satfracthada2 -- ___satfracthata2 -- ___satfracthauqq -- ___satfracthauhq -- ___satfracthausq -- ___satfracthaudq -- ___satfracthautq -- ___satfracthauha -- ___satfracthausa -- ___satfracthauda -- ___satfracthauta -- ___satfractsaqq -- ___satfractsahq -- ___satfractsasq -- ___satfractsadq -- ___satfractsatq -- ___satfractsaha2 -- ___satfractsada2 -- ___satfractsata2 -- ___satfractsauqq -- ___satfractsauhq -- ___satfractsausq -- ___satfractsaudq -- ___satfractsautq -- ___satfractsauha -- ___satfractsausa -- ___satfractsauda -- ___satfractsauta -- ___satfractdaqq -- ___satfractdahq -- ___satfractdasq -- ___satfractdadq -- ___satfractdatq -- ___satfractdaha2 -- ___satfractdasa2 -- ___satfractdata2 -- ___satfractdauqq -- ___satfractdauhq -- ___satfractdausq -- ___satfractdaudq -- ___satfractdautq -- ___satfractdauha -- ___satfractdausa -- ___satfractdauda -- ___satfractdauta -- ___satfracttaqq -- ___satfracttahq -- ___satfracttasq -- ___satfracttadq -- ___satfracttatq -- ___satfracttaha2 -- ___satfracttasa2 -- ___satfracttada2 -- ___satfracttauqq -- ___satfracttauhq -- ___satfracttausq -- ___satfracttaudq -- ___satfracttautq -- ___satfracttauha -- ___satfracttausa -- ___satfracttauda -- ___satfracttauta -- ___satfractuqqqq -- ___satfractuqqhq -- ___satfractuqqsq -- ___satfractuqqdq -- ___satfractuqqtq -- ___satfractuqqha -- ___satfractuqqsa -- ___satfractuqqda -- ___satfractuqqta -- ___satfractuqquhq2 -- ___satfractuqqusq2 -- ___satfractuqqudq2 -- ___satfractuqqutq2 -- ___satfractuqquha -- ___satfractuqqusa -- ___satfractuqquda -- ___satfractuqquta -- ___satfractuhqqq -- ___satfractuhqhq -- ___satfractuhqsq -- ___satfractuhqdq -- ___satfractuhqtq -- ___satfractuhqha -- ___satfractuhqsa -- ___satfractuhqda -- ___satfractuhqta -- ___satfractuhquqq2 -- ___satfractuhqusq2 -- ___satfractuhqudq2 -- ___satfractuhqutq2 -- ___satfractuhquha -- ___satfractuhqusa -- ___satfractuhquda -- ___satfractuhquta -- ___satfractusqqq -- ___satfractusqhq -- ___satfractusqsq -- ___satfractusqdq -- ___satfractusqtq -- ___satfractusqha -- ___satfractusqsa -- ___satfractusqda -- ___satfractusqta -- ___satfractusquqq2 -- ___satfractusquhq2 -- ___satfractusqudq2 -- ___satfractusqutq2 -- ___satfractusquha -- ___satfractusqusa -- ___satfractusquda -- ___satfractusquta -- ___satfractudqqq -- ___satfractudqhq -- ___satfractudqsq -- ___satfractudqdq -- ___satfractudqtq -- ___satfractudqha -- ___satfractudqsa -- ___satfractudqda -- ___satfractudqta -- ___satfractudquqq2 -- ___satfractudquhq2 -- ___satfractudqusq2 -- ___satfractudqutq2 -- ___satfractudquha -- ___satfractudqusa -- ___satfractudquda -- ___satfractudquta -- ___satfractutqqq -- ___satfractutqhq -- ___satfractutqsq -- ___satfractutqdq -- ___satfractutqtq -- ___satfractutqha -- ___satfractutqsa -- ___satfractutqda -- ___satfractutqta -- ___satfractutquqq2 -- ___satfractutquhq2 -- ___satfractutqusq2 -- ___satfractutqudq2 -- ___satfractutquha -- ___satfractutqusa -- ___satfractutquda -- ___satfractutquta -- ___satfractuhaqq -- ___satfractuhahq -- ___satfractuhasq -- ___satfractuhadq -- ___satfractuhatq -- ___satfractuhaha -- ___satfractuhasa -- ___satfractuhada -- ___satfractuhata -- ___satfractuhauqq -- ___satfractuhauhq -- ___satfractuhausq -- ___satfractuhaudq -- ___satfractuhautq -- ___satfractuhausa2 -- ___satfractuhauda2 -- ___satfractuhauta2 -- ___satfractusaqq -- ___satfractusahq -- ___satfractusasq -- ___satfractusadq -- ___satfractusatq -- ___satfractusaha -- ___satfractusasa -- ___satfractusada -- ___satfractusata -- ___satfractusauqq -- ___satfractusauhq -- ___satfractusausq -- ___satfractusaudq -- ___satfractusautq -- ___satfractusauha2 -- ___satfractusauda2 -- ___satfractusauta2 -- ___satfractudaqq -- ___satfractudahq -- ___satfractudasq -- ___satfractudadq -- ___satfractudatq -- ___satfractudaha -- ___satfractudasa -- ___satfractudada -- ___satfractudata -- ___satfractudauqq -- ___satfractudauhq -- ___satfractudausq -- ___satfractudaudq -- ___satfractudautq -- ___satfractudauha2 -- ___satfractudausa2 -- ___satfractudauta2 -- ___satfractutaqq -- ___satfractutahq -- ___satfractutasq -- ___satfractutadq -- ___satfractutatq -- ___satfractutaha -- ___satfractutasa -- ___satfractutada -- ___satfractutata -- ___satfractutauqq -- ___satfractutauhq -- ___satfractutausq -- ___satfractutaudq -- ___satfractutautq -- ___satfractutauha2 -- ___satfractutausa2 -- ___satfractutauda2 -- ___satfractqiqq -- ___satfractqihq -- ___satfractqisq -- ___satfractqidq -- ___satfractqitq -- ___satfractqiha -- ___satfractqisa -- ___satfractqida -- ___satfractqita -- ___satfractqiuqq -- ___satfractqiuhq -- ___satfractqiusq -- ___satfractqiudq -- ___satfractqiutq -- ___satfractqiuha -- ___satfractqiusa -- ___satfractqiuda -- ___satfractqiuta -- ___satfracthiqq -- ___satfracthihq -- ___satfracthisq -- ___satfracthidq -- ___satfracthitq -- ___satfracthiha -- ___satfracthisa -- ___satfracthida -- ___satfracthita -- ___satfracthiuqq -- ___satfracthiuhq -- ___satfracthiusq -- ___satfracthiudq -- ___satfracthiutq -- ___satfracthiuha -- ___satfracthiusa -- ___satfracthiuda -- ___satfracthiuta -- ___satfractsiqq -- ___satfractsihq -- ___satfractsisq -- ___satfractsidq -- ___satfractsitq -- ___satfractsiha -- ___satfractsisa -- ___satfractsida -- ___satfractsita -- ___satfractsiuqq -- ___satfractsiuhq -- ___satfractsiusq -- ___satfractsiudq -- ___satfractsiutq -- ___satfractsiuha -- ___satfractsiusa -- ___satfractsiuda -- ___satfractsiuta -- ___satfractdiqq -- ___satfractdihq -- ___satfractdisq -- ___satfractdidq -- ___satfractditq -- ___satfractdiha -- ___satfractdisa -- ___satfractdida -- ___satfractdita -- ___satfractdiuqq -- ___satfractdiuhq -- ___satfractdiusq -- ___satfractdiudq -- ___satfractdiutq -- ___satfractdiuha -- ___satfractdiusa -- ___satfractdiuda -- ___satfractdiuta -- ___satfracttiqq -- ___satfracttihq -- ___satfracttisq -- ___satfracttidq -- ___satfracttitq -- ___satfracttiha -- ___satfracttisa -- ___satfracttida -- ___satfracttita -- ___satfracttiuqq -- ___satfracttiuhq -- ___satfracttiusq -- ___satfracttiudq -- ___satfracttiutq -- ___satfracttiuha -- ___satfracttiusa -- ___satfracttiuda -- ___satfracttiuta -- ___satfractsfqq -- ___satfractsfhq -- ___satfractsfsq -- ___satfractsfdq -- ___satfractsftq -- ___satfractsfha -- ___satfractsfsa -- ___satfractsfda -- ___satfractsfta -- ___satfractsfuqq -- ___satfractsfuhq -- ___satfractsfusq -- ___satfractsfudq -- ___satfractsfutq -- ___satfractsfuha -- ___satfractsfusa -- ___satfractsfuda -- ___satfractsfuta -- ___satfractdfqq -- ___satfractdfhq -- ___satfractdfsq -- ___satfractdfdq -- ___satfractdftq -- ___satfractdfha -- ___satfractdfsa -- ___satfractdfda -- ___satfractdfta -- ___satfractdfuqq -- ___satfractdfuhq -- ___satfractdfusq -- ___satfractdfudq -- ___satfractdfutq -- ___satfractdfuha -- ___satfractdfusa -- ___satfractdfuda -- ___satfractdfuta -- ___fractunsqqqi -- ___fractunsqqhi -- ___fractunsqqsi -- ___fractunsqqdi -- ___fractunsqqti -- ___fractunshqqi -- ___fractunshqhi -- ___fractunshqsi -- ___fractunshqdi -- ___fractunshqti -- ___fractunssqqi -- ___fractunssqhi -- ___fractunssqsi -- ___fractunssqdi -- ___fractunssqti -- ___fractunsdqqi -- ___fractunsdqhi -- ___fractunsdqsi -- ___fractunsdqdi -- ___fractunsdqti -- ___fractunstqqi -- ___fractunstqhi -- ___fractunstqsi -- ___fractunstqdi -- ___fractunstqti -- ___fractunshaqi -- ___fractunshahi -- ___fractunshasi -- ___fractunshadi -- ___fractunshati -- ___fractunssaqi -- ___fractunssahi -- ___fractunssasi -- ___fractunssadi -- ___fractunssati -- ___fractunsdaqi -- ___fractunsdahi -- ___fractunsdasi -- ___fractunsdadi -- ___fractunsdati -- ___fractunstaqi -- ___fractunstahi -- ___fractunstasi -- ___fractunstadi -- ___fractunstati -- ___fractunsuqqqi -- ___fractunsuqqhi -- ___fractunsuqqsi -- ___fractunsuqqdi -- ___fractunsuqqti -- ___fractunsuhqqi -- ___fractunsuhqhi -- ___fractunsuhqsi -- ___fractunsuhqdi -- ___fractunsuhqti -- ___fractunsusqqi -- ___fractunsusqhi -- ___fractunsusqsi -- ___fractunsusqdi -- ___fractunsusqti -- ___fractunsudqqi -- ___fractunsudqhi -- ___fractunsudqsi -- ___fractunsudqdi -- ___fractunsudqti -- ___fractunsutqqi -- ___fractunsutqhi -- ___fractunsutqsi -- ___fractunsutqdi -- ___fractunsutqti -- ___fractunsuhaqi -- ___fractunsuhahi -- ___fractunsuhasi -- ___fractunsuhadi -- ___fractunsuhati -- ___fractunsusaqi -- ___fractunsusahi -- ___fractunsusasi -- ___fractunsusadi -- ___fractunsusati -- ___fractunsudaqi -- ___fractunsudahi -- ___fractunsudasi -- ___fractunsudadi -- ___fractunsudati -- ___fractunsutaqi -- ___fractunsutahi -- ___fractunsutasi -- ___fractunsutadi -- ___fractunsutati -- ___fractunsqiqq -- ___fractunsqihq -- ___fractunsqisq -- ___fractunsqidq -- ___fractunsqitq -- ___fractunsqiha -- ___fractunsqisa -- ___fractunsqida -- ___fractunsqita -- ___fractunsqiuqq -- ___fractunsqiuhq -- ___fractunsqiusq -- ___fractunsqiudq -- ___fractunsqiutq -- ___fractunsqiuha -- ___fractunsqiusa -- ___fractunsqiuda -- ___fractunsqiuta -- ___fractunshiqq -- ___fractunshihq -- ___fractunshisq -- ___fractunshidq -- ___fractunshitq -- ___fractunshiha -- ___fractunshisa -- ___fractunshida -- ___fractunshita -- ___fractunshiuqq -- ___fractunshiuhq -- ___fractunshiusq -- ___fractunshiudq -- ___fractunshiutq -- ___fractunshiuha -- ___fractunshiusa -- ___fractunshiuda -- ___fractunshiuta -- ___fractunssiqq -- ___fractunssihq -- ___fractunssisq -- ___fractunssidq -- ___fractunssitq -- ___fractunssiha -- ___fractunssisa -- ___fractunssida -- ___fractunssita -- ___fractunssiuqq -- ___fractunssiuhq -- ___fractunssiusq -- ___fractunssiudq -- ___fractunssiutq -- ___fractunssiuha -- ___fractunssiusa -- ___fractunssiuda -- ___fractunssiuta -- ___fractunsdiqq -- ___fractunsdihq -- ___fractunsdisq -- ___fractunsdidq -- ___fractunsditq -- ___fractunsdiha -- ___fractunsdisa -- ___fractunsdida -- ___fractunsdita -- ___fractunsdiuqq -- ___fractunsdiuhq -- ___fractunsdiusq -- ___fractunsdiudq -- ___fractunsdiutq -- ___fractunsdiuha -- ___fractunsdiusa -- ___fractunsdiuda -- ___fractunsdiuta -- ___fractunstiqq -- ___fractunstihq -- ___fractunstisq -- ___fractunstidq -- ___fractunstitq -- ___fractunstiha -- ___fractunstisa -- ___fractunstida -- ___fractunstita -- ___fractunstiuqq -- ___fractunstiuhq -- ___fractunstiusq -- ___fractunstiudq -- ___fractunstiutq -- ___fractunstiuha -- ___fractunstiusa -- ___fractunstiuda -- ___fractunstiuta -- ___satfractunsqiqq -- ___satfractunsqihq -- ___satfractunsqisq -- ___satfractunsqidq -- ___satfractunsqitq -- ___satfractunsqiha -- ___satfractunsqisa -- ___satfractunsqida -- ___satfractunsqita -- ___satfractunsqiuqq -- ___satfractunsqiuhq -- ___satfractunsqiusq -- ___satfractunsqiudq -- ___satfractunsqiutq -- ___satfractunsqiuha -- ___satfractunsqiusa -- ___satfractunsqiuda -- ___satfractunsqiuta -- ___satfractunshiqq -- ___satfractunshihq -- ___satfractunshisq -- ___satfractunshidq -- ___satfractunshitq -- ___satfractunshiha -- ___satfractunshisa -- ___satfractunshida -- ___satfractunshita -- ___satfractunshiuqq -- ___satfractunshiuhq -- ___satfractunshiusq -- ___satfractunshiudq -- ___satfractunshiutq -- ___satfractunshiuha -- ___satfractunshiusa -- ___satfractunshiuda -- ___satfractunshiuta -- ___satfractunssiqq -- ___satfractunssihq -- ___satfractunssisq -- ___satfractunssidq -- ___satfractunssitq -- ___satfractunssiha -- ___satfractunssisa -- ___satfractunssida -- ___satfractunssita -- ___satfractunssiuqq -- ___satfractunssiuhq -- ___satfractunssiusq -- ___satfractunssiudq -- ___satfractunssiutq -- ___satfractunssiuha -- ___satfractunssiusa -- ___satfractunssiuda -- ___satfractunssiuta -- ___satfractunsdiqq -- ___satfractunsdihq -- ___satfractunsdisq -- ___satfractunsdidq -- ___satfractunsditq -- ___satfractunsdiha -- ___satfractunsdisa -- ___satfractunsdida -- ___satfractunsdita -- ___satfractunsdiuqq -- ___satfractunsdiuhq -- ___satfractunsdiusq -- ___satfractunsdiudq -- ___satfractunsdiutq -- ___satfractunsdiuha -- ___satfractunsdiusa -- ___satfractunsdiuda -- ___satfractunsdiuta -- ___satfractunstiqq -- ___satfractunstihq -- ___satfractunstisq -- ___satfractunstidq -- ___satfractunstitq -- ___satfractunstiha -- ___satfractunstisa -- ___satfractunstida -- ___satfractunstita -- ___satfractunstiuqq -- ___satfractunstiuhq -- ___satfractunstiusq -- ___satfractunstiudq -- ___satfractunstiutq -- ___satfractunstiuha -- ___satfractunstiusa -- ___satfractunstiuda -- ___satfractunstiuta --} -- --%inherit GCC_4.4.0 GCC_4.3.0 --GCC_4.4.0 { -- ___sync_fetch_and_add_1 -- ___sync_fetch_and_sub_1 -- ___sync_fetch_and_or_1 -- ___sync_fetch_and_and_1 -- ___sync_fetch_and_xor_1 -- ___sync_fetch_and_nand_1 -- ___sync_add_and_fetch_1 -- ___sync_sub_and_fetch_1 -- ___sync_or_and_fetch_1 -- ___sync_and_and_fetch_1 -- ___sync_xor_and_fetch_1 -- ___sync_nand_and_fetch_1 -- ___sync_bool_compare_and_swap_1 -- ___sync_val_compare_and_swap_1 -- ___sync_lock_test_and_set_1 -- -- ___sync_fetch_and_add_2 -- ___sync_fetch_and_sub_2 -- ___sync_fetch_and_or_2 -- ___sync_fetch_and_and_2 -- ___sync_fetch_and_xor_2 -- ___sync_fetch_and_nand_2 -- ___sync_add_and_fetch_2 -- ___sync_sub_and_fetch_2 -- ___sync_or_and_fetch_2 -- ___sync_and_and_fetch_2 -- ___sync_xor_and_fetch_2 -- ___sync_nand_and_fetch_2 -- ___sync_bool_compare_and_swap_2 -- ___sync_val_compare_and_swap_2 -- ___sync_lock_test_and_set_2 -- -- ___sync_fetch_and_add_4 -- ___sync_fetch_and_sub_4 -- ___sync_fetch_and_or_4 -- ___sync_fetch_and_and_4 -- ___sync_fetch_and_xor_4 -- ___sync_fetch_and_nand_4 -- ___sync_add_and_fetch_4 -- ___sync_sub_and_fetch_4 -- ___sync_or_and_fetch_4 -- ___sync_and_and_fetch_4 -- ___sync_xor_and_fetch_4 -- ___sync_nand_and_fetch_4 -- ___sync_bool_compare_and_swap_4 -- ___sync_val_compare_and_swap_4 -- ___sync_lock_test_and_set_4 -- -- ___sync_fetch_and_add_8 -- ___sync_fetch_and_sub_8 -- ___sync_fetch_and_or_8 -- ___sync_fetch_and_and_8 -- ___sync_fetch_and_xor_8 -- ___sync_fetch_and_nand_8 -- ___sync_add_and_fetch_8 -- ___sync_sub_and_fetch_8 -- ___sync_or_and_fetch_8 -- ___sync_and_and_fetch_8 -- ___sync_xor_and_fetch_8 -- ___sync_nand_and_fetch_8 -- ___sync_bool_compare_and_swap_8 -- ___sync_val_compare_and_swap_8 -- ___sync_lock_test_and_set_8 -- -- ___sync_fetch_and_add_16 -- ___sync_fetch_and_sub_16 -- ___sync_fetch_and_or_16 -- ___sync_fetch_and_and_16 -- ___sync_fetch_and_xor_16 -- ___sync_fetch_and_nand_16 -- ___sync_add_and_fetch_16 -- ___sync_sub_and_fetch_16 -- ___sync_or_and_fetch_16 -- ___sync_and_and_fetch_16 -- ___sync_xor_and_fetch_16 -- ___sync_nand_and_fetch_16 -- ___sync_bool_compare_and_swap_16 -- ___sync_val_compare_and_swap_16 -- ___sync_lock_test_and_set_16 -- -- ___sync_synchronize --} -- --%inherit GCC_4.5.0 GCC_4.4.0 --GCC_4.5.0 { -- ___unordxf2 -- ___unordtf2 -+ __smulsi3_highpart -+ __umulsi3_highpart - } -diff --git a/libgcc/config/bfin/t-linux b/libgcc/config/bfin/t-linux -index 1c42e48..8898157 100644 ---- a/libgcc/config/bfin/t-linux -+++ b/libgcc/config/bfin/t-linux -@@ -1 +1,2 @@ --SHLIB_MAPFILES = $(srcdir)/config/bfin/libgcc-glibc.ver -+SHLIB_MAPFILES += $(srcdir)/config/bfin/libgcc-glibc.ver -+SHLIB_MKMAP_OPTS = -v skip_underscore=1 --- -2.7.4 - diff --git a/package.bak/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch b/package.bak/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch deleted file mode 100644 index ce49de7ee9..0000000000 --- a/package.bak/gcc/6.3.0/894-libgcc-fix-DWARF-compilation-with-FDPIC-targets.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9d9f97ca5d1ceba66677bf406c9b31027dc1f22e Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 19 Aug 2016 13:54:46 +0200 -Subject: [PATCH] libgcc: fix DWARF compilation with FDPIC targets - -The build of unwind-dw2-fde-dip.c currently fails for FDPIC targets with -the following error: - -libgcc/unwind-dw2-fde-dip.c:167:31: error: storage size of 'load_base' isn't known - struct elf32_fdpic_loadaddr load_base; - -This patch addresses that by defining load_base with the appropriate -type on FDPIC targets. It has been tested on FRV and Blackfin. - -Fixes PR gcc/68468. - -Signed-off-by: Waldemar Brodkorb -Signed-off-by: Thomas Petazzoni ---- - libgcc/unwind-dw2-fde-dip.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/libgcc/unwind-dw2-fde-dip.c b/libgcc/unwind-dw2-fde-dip.c -index f7a1c3f..801bce8 100644 ---- a/libgcc/unwind-dw2-fde-dip.c -+++ b/libgcc/unwind-dw2-fde-dip.c -@@ -124,7 +124,11 @@ static struct frame_hdr_cache_element - { - _Unwind_Ptr pc_low; - _Unwind_Ptr pc_high; -+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__ -+ struct elf32_fdpic_loadaddr load_base; -+#else - _Unwind_Ptr load_base; -+#endif - const ElfW(Phdr) *p_eh_frame_hdr; - const ElfW(Phdr) *p_dynamic; - struct frame_hdr_cache_element *link; -@@ -163,7 +167,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) - struct unw_eh_callback_data *data = (struct unw_eh_callback_data *) ptr; - const ElfW(Phdr) *phdr, *p_eh_frame_hdr, *p_dynamic; - long n, match; --#ifdef __FRV_FDPIC__ -+#if defined __FRV_FDPIC__ || defined __BFIN_FDPIC__ - struct elf32_fdpic_loadaddr load_base; - #else - _Unwind_Ptr load_base; -@@ -347,7 +351,7 @@ _Unwind_IteratePhdrCallback (struct dl_phdr_info *info, size_t size, void *ptr) - break; - } - } --# elif defined __FRV_FDPIC__ && defined __linux__ -+# elif (defined __FRV_FDPIC__ || defined __BFIN_FDPIC__) && defined __linux__ - data->dbase = load_base.got_value; - # else - # error What is DW_EH_PE_datarel base on this platform? --- -2.7.4 - diff --git a/package.bak/gcc/6.3.0/895-bfin-define-REENTRANT.patch b/package.bak/gcc/6.3.0/895-bfin-define-REENTRANT.patch deleted file mode 100644 index e2828a5106..0000000000 --- a/package.bak/gcc/6.3.0/895-bfin-define-REENTRANT.patch +++ /dev/null @@ -1,17 +0,0 @@ -enable _REENTRANT when -lpthread is used - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.2.0.orig/gcc/config/bfin/linux.h gcc-6.2.0/gcc/config/bfin/linux.h ---- gcc-6.2.0.orig/gcc/config/bfin/linux.h 2016-01-04 15:30:50.000000000 +0100 -+++ gcc-6.2.0/gcc/config/bfin/linux.h 2016-09-30 20:48:17.446636819 +0200 -@@ -38,6 +38,9 @@ - "%{static:--start-group} %{mfast-fp:-lbffastfp} %G %L %{static:--end-group} \ - %{!static:%{mfast-fp:-lbffastfp} %G}" - -+#undef CPP_SPEC -+#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}" -+ - #undef LINK_SPEC - #define LINK_SPEC "\ - %{mfdpic: -m elf32bfinfd -z text} %{shared} %{pie} \ diff --git a/package.bak/gcc/6.3.0/940-uclinux-enable-threads.patch b/package.bak/gcc/6.3.0/940-uclinux-enable-threads.patch deleted file mode 100644 index 5532656725..0000000000 --- a/package.bak/gcc/6.3.0/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.1.0.orig/gcc/config.gcc gcc-6.1.0/gcc/config.gcc ---- gcc-6.1.0.orig/gcc/config.gcc 2016-04-11 12:14:59.000000000 +0200 -+++ gcc-6.1.0/gcc/config.gcc 2016-07-02 20:04:25.732169982 +0200 -@@ -833,6 +833,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package.bak/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch b/package.bak/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch deleted file mode 100644 index 337d376b75..0000000000 --- a/package.bak/gcc/6.3.0/941-mips-Add-support-for-mips-r6-musl.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 83717065090bb8b954556d1216dd9dc397dc0243 Mon Sep 17 00:00:00 2001 -From: nsz -Date: Thu, 25 Aug 2016 14:13:02 +0000 -Subject: [PATCH] [mips] Add support for mips*r6-*-musl - -gcc/ - * config/mips/linux.h (MUSL_DYNAMIC_LINKER32): Update. - (MUSL_DYNAMIC_LINKER64, MUSL_DYNAMIC_LINKERN32): Update. - - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@239760 138bc75d-0d04-0410-961f-82ee72b054a4 - -[Vincent: tweak to not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - gcc/config/mips/linux.h | 9 ++++++--- - 1 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/mips/linux.h b/gcc/config/mips/linux.h -index fa253b6..dc51c45 100644 ---- a/gcc/config/mips/linux.h -+++ b/gcc/config/mips/linux.h -@@ -38,10 +38,13 @@ along with GCC; see the file COPYING3. If not see - "%{mnan=2008:/lib32/ld-uClibc-mipsn8.so.0;:/lib32/ld-uClibc.so.0}" - - #undef MUSL_DYNAMIC_LINKER32 --#define MUSL_DYNAMIC_LINKER32 "/lib/ld-musl-mips%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER32 \ -+ "/lib/ld-musl-mips%{mips32r6|mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - #undef MUSL_DYNAMIC_LINKER64 --#define MUSL_DYNAMIC_LINKER64 "/lib/ld-musl-mips64%{EL:el}%{msoft-float:-sf}.so.1" --#define MUSL_DYNAMIC_LINKERN32 "/lib/ld-musl-mipsn32%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKER64 \ -+ "/lib/ld-musl-mips64%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" -+#define MUSL_DYNAMIC_LINKERN32 \ -+ "/lib/ld-musl-mipsn32%{mips64r6:r6}%{EL:el}%{msoft-float:-sf}.so.1" - - #define BIONIC_DYNAMIC_LINKERN32 "/system/bin/linker32" - #define GNU_USER_DYNAMIC_LINKERN32 \ --- -2.10.0 - diff --git a/package.bak/gcc/Config.in.host b/package.bak/gcc/Config.in.host deleted file mode 100644 index eb41aa465a..0000000000 --- a/package.bak/gcc/Config.in.host +++ /dev/null @@ -1,176 +0,0 @@ -comment "GCC Options" - -choice - prompt "GCC compiler Version" - default BR2_GCC_VERSION_ARC if BR2_arc - default BR2_GCC_VERSION_OR1K if BR2_or1k - default BR2_GCC_VERSION_5_X - help - Select the version of gcc you wish to use. - - config BR2_GCC_VERSION_4_8_X - bool "gcc 4.8.x" - # Broken or unsupported architectures - depends on !BR2_microblaze && !BR2_arc && !BR2_or1k \ - && !BR2_powerpc64le && !BR2_nios2 && !BR2_bfin - # Broken or unsupported ARM cores - depends on !BR2_cortex_a12 && !BR2_cortex_a17 && !BR2_ARM_CPU_ARMV8 - # Broken or unsupported PPC cores - depends on !BR2_powerpc_power8 - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - # gcc-4.8.x + binutils-2.25 is broken for MIPS - depends on !((BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el) && BR2_BINUTILS_VERSION_2_25_X) - # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # musl mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - - config BR2_GCC_VERSION_ARC - bool "gcc arc (6.x)" - # Only supported architecture - depends on BR2_arc - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - - config BR2_GCC_VERSION_OR1K - bool "gcc or1k (5.x)" - # Only supported architecture - depends on BR2_or1k - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - - config BR2_GCC_VERSION_4_9_X - bool "gcc 4.9.x" - # Broken or unsupported architectures - depends on !BR2_arc && !BR2_bfin && !BR2_or1k - # Broken or unsupported ARM cores - depends on !BR2_cortex_a17 && !BR2_cortex_a72 - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv - # Unsupported for MIPS R5 - depends on !BR2_MIPS_CPU_MIPS32R5 && !BR2_MIPS_CPU_MIPS64R5 - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # musl microblaze unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_microblazeel || BR2_microblazebe)) - # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # musl mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - # PR60102 https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60102 - select BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - - config BR2_GCC_VERSION_5_X - bool "gcc 5.x" - # Broken or unsupported architectures - depends on !BR2_arc && !BR2_bfin && !BR2_or1k - # musl ppc64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_powerpc64 || BR2_powerpc64le)) - # Unsupported MIPS cores - depends on !BR2_mips_interaptiv && !BR2_mips_m5150 && \ - !BR2_mips_m6250 && !BR2_mips_i6400 && !BR2_mips_p6600 - # musl mips64 unsupported - depends on !(BR2_TOOLCHAIN_USES_MUSL && (BR2_mips64 || BR2_mips64el)) - select BR2_TOOLCHAIN_GCC_AT_LEAST_5 - - config BR2_GCC_VERSION_6_X - bool "gcc 6.x" - # Broken or unsupported architectures - depends on !BR2_arc - depends on !BR2_microblaze - depends on !BR2_or1k - # Unsupported MIPS cores - depends on !BR2_mips_m6250 && !BR2_mips_p6600 - select BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -endchoice - -# Indicates if GCC for architecture supports --with-{arch,cpu,..} to -# set default CFLAGS, otherwise values will be used by toolchain -# wrapper. -config BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS - bool - default y if !BR2_bfin - -config BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE - bool - default y - -config BR2_GCC_VERSION - string - default "4.8.5" if BR2_GCC_VERSION_4_8_X - default "4.9.4" if BR2_GCC_VERSION_4_9_X - default "5.4.0" if BR2_GCC_VERSION_5_X - default "6.3.0" if BR2_GCC_VERSION_6_X - default "arc-2016.09-release" if BR2_GCC_VERSION_ARC - default "musl-5.4.0" if BR2_GCC_VERSION_OR1K - -config BR2_EXTRA_GCC_CONFIG_OPTIONS - string "Additional gcc options" - default "" - help - Any additional gcc configure options you may want to - include. Those options are applied for all of the gcc - initial, gcc intermediate and gcc final passes. - -config BR2_TOOLCHAIN_BUILDROOT_CXX - bool "Enable C++ support" - select BR2_INSTALL_LIBSTDCPP - help - Enable this option if you want your toolchain to support the - C++ language and you want C++ libraries to be installed on - your target system. - -comment "Fortran support needs a toolchain w/ wchar" - depends on BR2_TOOLCHAIN_HAS_LIBQUADMATH - depends on !BR2_USE_WCHAR # libquadmath - -config BR2_TOOLCHAIN_BUILDROOT_FORTRAN - bool "Enable Fortran support" - # on architecture building libquadmath, wchar is required - depends on !BR2_TOOLCHAIN_HAS_LIBQUADMATH || \ - (BR2_TOOLCHAIN_HAS_LIBQUADMATH && BR2_USE_WCHAR) - select BR2_TOOLCHAIN_HAS_FORTRAN - help - Enable this option if you want your toolchain to support the - Fortran language and you want Fortran libraries to be - installed on your target system. - -config BR2_GCC_ENABLE_LTO - bool "Enable compiler link-time-optimization support" - select BR2_BINUTILS_ENABLE_LTO - help - This option enables link-time optimization (LTO) support in - gcc. - -config BR2_GCC_ENABLE_OPENMP - bool "Enable compiler OpenMP support" - depends on !BR2_PTHREADS_NONE && !BR2_arc && !BR2_microblaze - help - Enable OpenMP support for the compiler - -config BR2_GCC_ENABLE_LIBMUDFLAP - bool "Enable libmudflap support" - # There are architectures, or specific configurations for - # which mudflap is not supported. - depends on !BR2_ARM_INSTRUCTIONS_THUMB && !BR2_powerpc_SPE - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - libmudflap is a gcc library used for the mudflap pointer - debugging functionality. It is only needed if you intend to - use the -fmudflap gcc flag. - - See http://gcc.gnu.org/wiki/Mudflap_Pointer_Debugging and - the help of the gcc -fmudflap option for more details. - - If you're unsure, leave this option disabled. - -config BR2_GCC_ENABLE_GRAPHITE - bool "Enable graphite support" - help - This option enables the graphite optimizations in the - compiler. diff --git a/package.bak/gcc/arc-2016.09-release/301-missing-execinfo_h.patch b/package.bak/gcc/arc-2016.09-release/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa44..0000000000 --- a/package.bak/gcc/arc-2016.09-release/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/arc-2016.09-release/860-cilk-wchar.patch b/package.bak/gcc/arc-2016.09-release/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f554..0000000000 --- a/package.bak/gcc/arc-2016.09-release/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package.bak/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch b/package.bak/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch deleted file mode 100644 index 5532656725..0000000000 --- a/package.bak/gcc/arc-2016.09-release/940-uclinux-enable-threads.patch +++ /dev/null @@ -1,19 +0,0 @@ -Enable POSIX threads for uClinux targets -Reported upstream: -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71721 - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-6.1.0.orig/gcc/config.gcc gcc-6.1.0/gcc/config.gcc ---- gcc-6.1.0.orig/gcc/config.gcc 2016-04-11 12:14:59.000000000 +0200 -+++ gcc-6.1.0/gcc/config.gcc 2016-07-02 20:04:25.732169982 +0200 -@@ -833,6 +833,9 @@ - *-*-uclinux*) - extra_options="$extra_options gnu-user.opt" - use_gcc_stdint=wrap -+ case ${enable_threads} in -+ "" | yes | posix) thread_file='posix' ;; -+ esac - tm_defines="$tm_defines DEFAULT_LIBC=LIBC_UCLIBC SINGLE_LIBC" - ;; - *-*-rdos*) diff --git a/package.bak/gcc/gcc-final/gcc-final.hash b/package.bak/gcc/gcc-final/gcc-final.hash deleted file mode 120000 index 7ac9361ab2..0000000000 --- a/package.bak/gcc/gcc-final/gcc-final.hash +++ /dev/null @@ -1 +0,0 @@ -../gcc.hash \ No newline at end of file diff --git a/package.bak/gcc/gcc-final/gcc-final.mk b/package.bak/gcc/gcc-final/gcc-final.mk deleted file mode 100644 index c9ee476fb7..0000000000 --- a/package.bak/gcc/gcc-final/gcc-final.mk +++ /dev/null @@ -1,205 +0,0 @@ -################################################################################ -# -# gcc-final -# -################################################################################ - -GCC_FINAL_VERSION = $(GCC_VERSION) -GCC_FINAL_SITE = $(GCC_SITE) -GCC_FINAL_SOURCE = $(GCC_SOURCE) - -HOST_GCC_FINAL_DEPENDENCIES = \ - $(HOST_GCC_COMMON_DEPENDENCIES) \ - $(BR_LIBC) - -HOST_GCC_FINAL_EXCLUDES = $(HOST_GCC_EXCLUDES) -HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE - -ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) -HOST_GCC_FINAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT -endif - -HOST_GCC_FINAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES - -# gcc doesn't support in-tree build, so we create a 'build' -# subdirectory in the gcc sources, and build from there. -HOST_GCC_FINAL_SUBDIR = build - -HOST_GCC_FINAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK - -# We want to always build the static variants of all the gcc libraries, -# of which libstdc++, libgomp, libmudflap... -# To do so, we can not just pass --enable-static to override the generic -# --disable-static flag, otherwise gcc fails to build some of those -# libraries, see; -# http://lists.busybox.net/pipermail/buildroot/2013-October/080412.html -# -# So we must completely override the generic commands and provide our own. -# -define HOST_GCC_FINAL_CONFIGURE_CMDS - (cd $(HOST_GCC_FINAL_SRCDIR) && rm -rf config.cache; \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - $(HOST_GCC_FINAL_CONF_ENV) \ - ./configure \ - --prefix="$(HOST_DIR)/usr" \ - --sysconfdir="$(HOST_DIR)/etc" \ - --enable-static \ - $(QUIET) $(HOST_GCC_FINAL_CONF_OPTS) \ - ) -endef - - -# Languages supported by the cross-compiler -GCC_FINAL_CROSS_LANGUAGES-y = c -GCC_FINAL_CROSS_LANGUAGES-$(BR2_INSTALL_LIBSTDCPP) += c++ -GCC_FINAL_CROSS_LANGUAGES-$(BR2_TOOLCHAIN_BUILDROOT_FORTRAN) += fortran -GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGES-y)) - -HOST_GCC_FINAL_CONF_OPTS = \ - $(HOST_GCC_COMMON_CONF_OPTS) \ - --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ - --with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin - -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib* -# The kernel wants to use the -m4-nofpu option to make sure that it -# doesn't use floating point operations. -ifeq ($(BR2_sh4)$(BR2_sh4eb),y) -HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4,m4-nofpu" -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib/!m4* -endif -ifeq ($(BR2_sh4a)$(BR2_sh4aeb),y) -HOST_GCC_FINAL_CONF_OPTS += "--with-multilib-list=m4a,m4a-nofpu" -HOST_GCC_FINAL_GCC_LIB_DIR = $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/lib/!m4* -endif - -ifeq ($(BR2_bfin),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-symvers -endif - -# Disable shared libs like libstdc++ if we do static since it confuses linking -# In that case also disable libcilkrts as there is no static version -ifeq ($(BR2_STATIC_LIBS),y) -HOST_GCC_FINAL_CONF_OPTS += --disable-shared --disable-libcilkrts -else -HOST_GCC_FINAL_CONF_OPTS += --enable-shared -endif - -ifeq ($(BR2_GCC_ENABLE_OPENMP),y) -HOST_GCC_FINAL_CONF_OPTS += --enable-libgomp -else -HOST_GCC_FINAL_CONF_OPTS += --disable-libgomp -endif - -# End with user-provided options, so that they can override previously -# defined options. -HOST_GCC_FINAL_CONF_OPTS += \ - $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) - -HOST_GCC_FINAL_CONF_ENV = \ - $(HOST_GCC_COMMON_CONF_ENV) - -HOST_GCC_FINAL_MAKE_OPTS += $(HOST_GCC_COMMON_MAKE_OPTS) - -# Make sure we have 'cc' -define HOST_GCC_FINAL_CREATE_CC_SYMLINKS - if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \ - ln -f $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-gcc \ - $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc; \ - fi -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_CREATE_CC_SYMLINKS - -HOST_GCC_FINAL_TOOLCHAIN_WRAPPER_ARGS += $(HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS) -HOST_GCC_FINAL_POST_BUILD_HOOKS += TOOLCHAIN_WRAPPER_BUILD -HOST_GCC_FINAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL -# Note: this must be done after CREATE_CC_SYMLINKS, otherwise the -# -cc symlink to the wrapper is not created. -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS - -# coldfire is not working without removing these object files from libgcc.a -ifeq ($(BR2_m68k_cf),y) -define HOST_GCC_FINAL_M68K_LIBGCC_FIXUP - find $(STAGING_DIR) -name libgcc.a -print | \ - while read t; do $(GNU_TARGET_NAME)-ar dv "$t" _ctors.o; done -endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_M68K_LIBGCC_FIXUP -endif - -# Cannot use the HOST_GCC_FINAL_USR_LIBS mechanism below, because we want -# libgcc_s to be installed in /lib and not /usr/lib. -define HOST_GCC_FINAL_INSTALL_LIBGCC - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libgcc_s* \ - $(STAGING_DIR)/lib/ - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libgcc_s* \ - $(TARGET_DIR)/lib/ -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBGCC - -define HOST_GCC_FINAL_INSTALL_LIBATOMIC - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libatomic* \ - $(STAGING_DIR)/lib/ - -cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/libatomic* \ - $(TARGET_DIR)/lib/ -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_LIBATOMIC - -# Handle the installation of libraries in /usr/lib -HOST_GCC_FINAL_USR_LIBS = - -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -HOST_GCC_FINAL_USR_LIBS += libstdc++ -endif - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_FORTRAN),y) -HOST_GCC_FINAL_USR_LIBS += libgfortran -# fortran needs quadmath on x86 and x86_64 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBQUADMATH),y) -HOST_GCC_FINAL_USR_LIBS += libquadmath -endif -endif - -ifeq ($(BR2_GCC_ENABLE_OPENMP),y) -HOST_GCC_FINAL_USR_LIBS += libgomp -endif - -ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y) -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -HOST_GCC_FINAL_USR_LIBS += libmudflapth -else -HOST_GCC_FINAL_USR_LIBS += libmudflap -endif -endif - -ifneq ($(HOST_GCC_FINAL_USR_LIBS),) -define HOST_GCC_FINAL_INSTALL_STATIC_LIBS - for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.a \ - $(STAGING_DIR)/usr/lib/ ; \ - done -endef - -ifeq ($(BR2_STATIC_LIBS),) -define HOST_GCC_FINAL_INSTALL_SHARED_LIBS - for i in $(HOST_GCC_FINAL_USR_LIBS) ; do \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(STAGING_DIR)/usr/lib/ ; \ - cp -dpf $(HOST_GCC_FINAL_GCC_LIB_DIR)/$${i}.so* \ - $(TARGET_DIR)/usr/lib/ ; \ - done -endef -endif - -define HOST_GCC_FINAL_INSTALL_USR_LIBS - mkdir -p $(TARGET_DIR)/usr/lib - $(HOST_GCC_FINAL_INSTALL_STATIC_LIBS) - $(HOST_GCC_FINAL_INSTALL_SHARED_LIBS) -endef -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_INSTALL_USR_LIBS -endif - -$(eval $(host-autotools-package)) diff --git a/package.bak/gcc/gcc-initial/gcc-initial.hash b/package.bak/gcc/gcc-initial/gcc-initial.hash deleted file mode 120000 index 7ac9361ab2..0000000000 --- a/package.bak/gcc/gcc-initial/gcc-initial.hash +++ /dev/null @@ -1 +0,0 @@ -../gcc.hash \ No newline at end of file diff --git a/package.bak/gcc/gcc-initial/gcc-initial.mk b/package.bak/gcc/gcc-initial/gcc-initial.mk deleted file mode 100644 index a51e29cfc7..0000000000 --- a/package.bak/gcc/gcc-initial/gcc-initial.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# gcc-initial -# -################################################################################ - -GCC_INITIAL_VERSION = $(GCC_VERSION) -GCC_INITIAL_SITE = $(GCC_SITE) -GCC_INITIAL_SOURCE = $(GCC_SOURCE) - -HOST_GCC_INITIAL_DEPENDENCIES = $(HOST_GCC_COMMON_DEPENDENCIES) - -HOST_GCC_INITIAL_EXCLUDES = $(HOST_GCC_EXCLUDES) -HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_FAKE_TESTSUITE - -ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) -HOST_GCC_INITIAL_POST_EXTRACT_HOOKS += HOST_GCC_XTENSA_OVERLAY_EXTRACT -endif - -HOST_GCC_INITIAL_POST_PATCH_HOOKS += HOST_GCC_APPLY_PATCHES - -# gcc doesn't support in-tree build, so we create a 'build' -# subdirectory in the gcc sources, and build from there. -HOST_GCC_INITIAL_SUBDIR = build - -HOST_GCC_INITIAL_PRE_CONFIGURE_HOOKS += HOST_GCC_CONFIGURE_SYMLINK - -HOST_GCC_INITIAL_CONF_OPTS = \ - $(HOST_GCC_COMMON_CONF_OPTS) \ - --enable-languages=c \ - --disable-shared \ - --without-headers \ - --disable-threads \ - --with-newlib \ - --disable-largefile \ - --disable-nls \ - $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) - -HOST_GCC_INITIAL_CONF_ENV = \ - $(HOST_GCC_COMMON_CONF_ENV) - -HOST_GCC_INITIAL_MAKE_OPTS = $(HOST_GCC_COMMON_MAKE_OPTS) all-gcc -HOST_GCC_INITIAL_INSTALL_OPTS = install-gcc - -ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INITIAL_MAKE_OPTS += all-target-libgcc -HOST_GCC_INITIAL_INSTALL_OPTS += install-target-libgcc -endif - -HOST_GCC_INITIAL_TOOLCHAIN_WRAPPER_ARGS += $(HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS) -HOST_GCC_INITIAL_POST_BUILD_HOOKS += TOOLCHAIN_WRAPPER_BUILD -HOST_GCC_INITIAL_POST_INSTALL_HOOKS += TOOLCHAIN_WRAPPER_INSTALL -HOST_GCC_INITIAL_POST_INSTALL_HOOKS += HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS - -$(eval $(host-autotools-package)) diff --git a/package.bak/gcc/gcc.hash b/package.bak/gcc/gcc.hash deleted file mode 100644 index 4376db4131..0000000000 --- a/package.bak/gcc/gcc.hash +++ /dev/null @@ -1,17 +0,0 @@ -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.5.4/sha512.sum -sha512 78696b287d46aacd6f150920da376ea32f58ad9f0dafd2d3b7fa6dbdd8dd7afe659108d1dfaa5807617fc5248719f50b39c37ade0173ea5b9fec2091f4656115 gcc-4.5.4.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.7.4/sha512.sum -sha512 dfcb737073191e628231031a3571ec77ee760a59377630f4a6e4fdfa66f9ddad39fde47e3f0f227eb43cdf90e0d34cde5abdc9ac892c1e111a911062a66c9189 gcc-4.7.4.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.8.5/sha512.sum -sha512 47fdfeca0c0a624cdec9c4ae47137d056c918d5c386d4b96985bb3c8172aba377cb66cbcc30e80832fd244a7d98f562c20198056915c70cfef0977545073a8ea gcc-4.8.5.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-4.9.4/sha512.sum -sha512 93abb78e16277454f41a8e9810f41f66c0fdffdc539a762ff6b67d3037f78db971378683fd2ebf707d1d51c059fad2161fe42d110c330027f40214b7db0f3efe gcc-4.9.4.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-5.4.0/sha512.sum -sha512 2941cc950c8f2409a314df497631f9b0266211aa74746c1839c46e04f1c7c299afe2528d1ef16ea39def408a644ba48f97519ec7a7dd37d260c3e9423514265b gcc-5.4.0.tar.bz2 -# From ftp://gcc.gnu.org/pub/gcc/releases/gcc-6.3.0/sha512.sum -sha512 234dd9b1bdc9a9c6e352216a7ef4ccadc6c07f156006a59759c5e0e6a69f0abcdc14630eff11e3826dd6ba5933a8faa43043f3d1d62df6bd5ab1e82862f9bf78 gcc-6.3.0.tar.bz2 - -# Locally calculated (fetched from Github) -sha512 faae6dc3f7843412068a52de5919797cd23e6ed1b8d140c230d0381f13fd38af67baaa4a09e581c03602127da3dd2fab6f9f5d7ac5d4270585bd079c673dda9a gcc-arc-2016.09-release.tar.gz -# Locally calculated (fetched from Github) -sha512 841101f7de45f327bf2e92f3efc73ca88a021e4b9b541458ce80a16e55882bd8606a8492d75c57c589ee2c10d42ae2865b67690155d7289a541df1d68096402f gcc-musl-5.4.0.tar.gz diff --git a/package.bak/gcc/gcc.mk b/package.bak/gcc/gcc.mk deleted file mode 100644 index 241f3575c0..0000000000 --- a/package.bak/gcc/gcc.mk +++ /dev/null @@ -1,362 +0,0 @@ -################################################################################ -# -# Common variables for the gcc-initial and gcc-final packages. -# -################################################################################ - -# -# Version, site and source -# - -GCC_VERSION = $(call qstrip,$(BR2_GCC_VERSION)) - -ifeq ($(BR2_arc),y) -GCC_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,gcc,$(GCC_VERSION)) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz -else ifeq ($(BR2_or1k),y) -GCC_SITE = $(call github,openrisc,or1k-gcc,$(GCC_VERSION)) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.gz -else -GCC_SITE = $(BR2_GNU_MIRROR:/=)/gcc/gcc-$(GCC_VERSION) -GCC_SOURCE = gcc-$(GCC_VERSION).tar.bz2 -endif - -# -# Xtensa special hook -# - -HOST_GCC_XTENSA_OVERLAY_TAR = $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,$(BR2_XTENSA_CORE_NAME)).tar - -define HOST_GCC_XTENSA_OVERLAY_EXTRACT - tar xf $(HOST_GCC_XTENSA_OVERLAY_TAR) -C $(@D) --strip-components=1 gcc -endef - -# -# Apply patches -# - -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -define HOST_GCC_APPLY_POWERPC_PATCH - $(APPLY_PATCHES) $(@D) package/gcc/$(GCC_VERSION) 1000-powerpc-link-with-math-lib.patch.conditional -endef -endif -endif - -# gcc is a special package, not named gcc, but gcc-initial and -# gcc-final, but patches are nonetheless stored in package/gcc in the -# tree, and potentially in BR2_GLOBAL_PATCH_DIR directories as well. -define HOST_GCC_APPLY_PATCHES - for patchdir in \ - package/gcc/$(GCC_VERSION) \ - $(addsuffix /gcc/$(GCC_VERSION),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ - $(addsuffix /gcc,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) ; do \ - if test -d $${patchdir}; then \ - $(APPLY_PATCHES) $(@D) $${patchdir} \*.patch || exit 1; \ - fi; \ - done - $(HOST_GCC_APPLY_POWERPC_PATCH) -endef - -HOST_GCC_EXCLUDES = \ - libjava/* libgo/* \ - gcc/testsuite/* libstdc++-v3/testsuite/* - -define HOST_GCC_FAKE_TESTSUITE - mkdir -p $(@D)/libstdc++-v3/testsuite/ - echo "all:" > $(@D)/libstdc++-v3/testsuite/Makefile.in - echo "install:" >> $(@D)/libstdc++-v3/testsuite/Makefile.in -endef - -# -# Create 'build' directory and configure symlink -# - -define HOST_GCC_CONFIGURE_SYMLINK - mkdir -p $(@D)/build - ln -sf ../configure $(@D)/build/configure -endef - -# -# Common configuration options -# - -HOST_GCC_COMMON_DEPENDENCIES = \ - host-binutils \ - host-gmp \ - host-mpc \ - host-mpfr \ - $(if $(BR2_BINFMT_FLAT),host-elf2flt) - -HOST_GCC_COMMON_CONF_OPTS = \ - --target=$(GNU_TARGET_NAME) \ - --with-sysroot=$(STAGING_DIR) \ - --disable-__cxa_atexit \ - --with-gnu-ld \ - --disable-libssp \ - --disable-multilib \ - --with-gmp=$(HOST_DIR)/usr \ - --with-mpc=$(HOST_DIR)/usr \ - --with-mpfr=$(HOST_DIR)/usr \ - --with-pkgversion="Buildroot $(BR2_VERSION_FULL)" \ - --with-bugurl="http://bugs.buildroot.net/" - -# Don't build documentation. It takes up extra space / build time, -# and sometimes needs specific makeinfo versions to work -HOST_GCC_COMMON_CONF_ENV = \ - MAKEINFO=missing - -GCC_COMMON_TARGET_CFLAGS = $(TARGET_CFLAGS) -GCC_COMMON_TARGET_CXXFLAGS = $(TARGET_CXXFLAGS) - -# Propagate options used for target software building to GCC target libs -HOST_GCC_COMMON_CONF_ENV += CFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CFLAGS)" -HOST_GCC_COMMON_CONF_ENV += CXXFLAGS_FOR_TARGET="$(GCC_COMMON_TARGET_CXXFLAGS)" - -# libitm needs sparc V9+ -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -HOST_GCC_COMMON_CONF_OPTS += --disable-libitm -endif - -# libmpx uses secure_getenv and struct _libc_fpstate not present in musl -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_MUSL)$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),yy) -HOST_GCC_COMMON_CONF_OPTS += --disable-libmpx -endif - -# quadmath support requires wchar -ifeq ($(BR2_USE_WCHAR)$(BR2_TOOLCHAIN_HAS_LIBQUADMATH),yy) -HOST_GCC_COMMON_CONF_OPTS += --enable-libquadmath -else -HOST_GCC_COMMON_CONF_OPTS += --disable-libquadmath -endif - -# libsanitizer requires wordexp, not in default uClibc config. Also -# doesn't build properly with musl. -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC)$(BR2_TOOLCHAIN_BUILDROOT_MUSL),y) -HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer -endif - -# libsanitizer is broken for SPARC -# https://bugs.busybox.net/show_bug.cgi?id=7951 -ifeq ($(BR2_sparc)$(BR2_sparc64),y) -HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer -endif - -# TLS support is not needed on uClibc/no-thread and -# uClibc/linux-threads, otherwise, for all other situations (glibc, -# musl and uClibc/NPTL), we need it. -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_UCLIBC)$(BR2_PTHREADS)$(BR2_PTHREADS_NONE),yy) -HOST_GCC_COMMON_CONF_OPTS += --disable-tls -else -HOST_GCC_COMMON_CONF_OPTS += --enable-tls -endif - -ifeq ($(BR2_GCC_ENABLE_LTO),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-plugins --enable-lto -endif - -ifeq ($(BR2_GCC_ENABLE_LIBMUDFLAP),y) -HOST_GCC_COMMON_CONF_OPTS += --enable-libmudflap -else -HOST_GCC_COMMON_CONF_OPTS += --disable-libmudflap -endif - -ifeq ($(BR2_PTHREADS_NONE),y) -HOST_GCC_COMMON_CONF_OPTS += \ - --disable-threads \ - --disable-libitm \ - --disable-libatomic -else -HOST_GCC_COMMON_CONF_OPTS += --enable-threads -endif - -ifeq ($(BR2_GCC_ENABLE_GRAPHITE),y) -HOST_GCC_COMMON_DEPENDENCIES += host-isl -HOST_GCC_COMMON_CONF_OPTS += --with-isl=$(HOST_DIR)/usr -# gcc 5 doesn't need cloog any more, see -# https://gcc.gnu.org/gcc-5/changes.html -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),) -HOST_GCC_COMMON_DEPENDENCIES += host-cloog -HOST_GCC_COMMON_CONF_OPTS += --with-cloog=$(HOST_DIR)/usr -endif -else -HOST_GCC_COMMON_CONF_OPTS += --without-isl --without-cloog -endif - -ifeq ($(BR2_arc)$(BR2_or1k),y) -HOST_GCC_COMMON_DEPENDENCIES += host-flex host-bison -endif - -ifeq ($(BR2_SOFT_FLOAT),y) -# only mips*-*-*, arm*-*-* and sparc*-*-* accept --with-float -# powerpc seems to be needing it as well -ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),y) -HOST_GCC_COMMON_CONF_OPTS += --with-float=soft -endif -endif - -ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_COMMON_CONF_OPTS += --disable-decimal-float -endif - -# Determine arch/tune/abi/cpu options -ifeq ($(BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS),y) -ifneq ($(call qstrip,$(BR2_GCC_TARGET_ARCH)),) -HOST_GCC_COMMON_CONF_OPTS += --with-arch=$(BR2_GCC_TARGET_ARCH) -endif -ifneq ($(call qstrip,$(BR2_GCC_TARGET_ABI)),) -HOST_GCC_COMMON_CONF_OPTS += --with-abi=$(BR2_GCC_TARGET_ABI) -endif -ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU)),) -ifneq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) -HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) -else -HOST_GCC_COMMON_CONF_OPTS += --with-cpu=$(call qstrip,$(BR2_GCC_TARGET_CPU)) -endif -endif - -GCC_TARGET_FPU = $(call qstrip,$(BR2_GCC_TARGET_FPU)) -ifneq ($(GCC_TARGET_FPU),) -HOST_GCC_COMMON_CONF_OPTS += --with-fpu=$(GCC_TARGET_FPU) -endif - -GCC_TARGET_FLOAT_ABI = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) -ifneq ($(GCC_TARGET_FLOAT_ABI),) -HOST_GCC_COMMON_CONF_OPTS += --with-float=$(GCC_TARGET_FLOAT_ABI) -endif - -GCC_TARGET_MODE = $(call qstrip,$(BR2_GCC_TARGET_MODE)) -ifneq ($(GCC_TARGET_MODE),) -HOST_GCC_COMMON_CONF_OPTS += --with-mode=$(GCC_TARGET_MODE) -endif -endif # BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS - -# Enable proper double/long double for SPE ABI -ifeq ($(BR2_powerpc_SPE),y) -HOST_GCC_COMMON_CONF_OPTS += \ - --enable-e500_double \ - --with-long-double-128 -endif - -# PowerPC64 big endian by default uses the elfv1 ABI, and PowerPC 64 -# little endian by default uses the elfv2 ABI. However, musl has -# decided to use the elfv2 ABI for both, so we force the elfv2 ABI for -# Power64 big endian when the selected C library is musl. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL)$(BR2_powerpc64),yy) -HOST_GCC_COMMON_CONF_OPTS += \ - --with-abi=elfv2 \ - --without-long-double-128 -endif - -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CROSS_PATH_SUFFIX='".br_real"' -ifeq ($(BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS),) -ifeq ($(call qstrip,$(BR2_GCC_TARGET_CPU_REVISION)),) -HOST_GCC_COMMON_WRAPPER_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)) -else -HOST_GCC_COMMON_WRAPPER_TARGET_CPU := $(call qstrip,$(BR2_GCC_TARGET_CPU)-$(BR2_GCC_TARGET_CPU_REVISION)) -endif -HOST_GCC_COMMON_WRAPPER_TARGET_ARCH := $(call qstrip,$(BR2_GCC_TARGET_ARCH)) -HOST_GCC_COMMON_WRAPPER_TARGET_ABI := $(call qstrip,$(BR2_GCC_TARGET_ABI)) -HOST_GCC_COMMON_WRAPPER_TARGET_FPU := $(call qstrip,$(BR2_GCC_TARGET_FPU)) -HOST_GCC_COMMON_WRAPPER_TARGET_FLOAT_ABI := $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) -HOST_GCC_COMMON_WRAPPER_TARGET_MODE := $(call qstrip,$(BR2_GCC_TARGET_MODE)) - -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_ARCH),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_ARCH='"$(HOST_GCC_COMMON_WRAPPER_TARGET_ARCH)"' -endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_CPU),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_CPU)"' -endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_ABI),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_ABI)"' -endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FPU),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FPU='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FPU)"' -endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_FLOAT_ABI='"$(HOST_GCC_COMMON_WRAPPER_TARGET_FLOATABI_)"' -endif -ifneq ($(HOST_GCC_COMMON_WRAPPER_TARGET_MODE),) -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_MODE='"$(HOST_GCC_COMMON_WRAPPER_TARGET_MODE)"' -endif -endif # !BR2_GCC_ARCH_HAS_CONFIGURABLE_DEFAULTS - -# For gcc-initial, we need to tell gcc that the C library will be -# providing the ssp support, as it can't guess it since the C library -# hasn't been built yet. -# -# For gcc-final, the gcc logic to detect whether SSP support is -# available or not in the C library is not working properly for -# uClibc, so let's be explicit as well. -HOST_GCC_COMMON_MAKE_OPTS = \ - gcc_cv_libc_provides_ssp=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) - -ifeq ($(BR2_CCACHE),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(DL_DIR)/$(GCC_SOURCE) - -# Cfr. PATCH_BASE_DIRS in .stamp_patched, but we catch both versioned -# and unversioned patches unconditionally. Moreover, to facilitate the -# addition of gcc patches in BR2_GLOBAL_PATCH_DIR, we allow them to be -# stored in a sub-directory called 'gcc' even if it's not technically -# the name of the package. -HOST_GCC_COMMON_CCACHE_HASH_FILES += \ - $(sort $(wildcard \ - package/gcc/$(GCC_VERSION)/*.patch \ - $(addsuffix /$($(PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ - $(addsuffix /$($(PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ - $(addsuffix /gcc/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \ - $(addsuffix /gcc/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))))) -ifeq ($(BR2_xtensa),y) -HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_XTENSA_OVERLAY_TAR) -endif -ifeq ($(ARCH),powerpc) -ifneq ($(BR2_SOFT_FLOAT),) -HOST_GCC_COMMON_CCACHE_HASH_FILES += package/gcc/$(GCC_VERSION)/1000-powerpc-link-with-math-lib.patch.conditional -endif -endif - -# _CONF_OPTS contains some references to the absolute path of $(HOST_DIR) -# and a reference to the Buildroot git revision (BR2_VERSION_FULL), -# so substitute those away. -HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_HASH=\"`\ - printf '%s\n' $(subst $(HOST_DIR),@HOST_DIR@,\ - $(subst --with-pkgversion="Buildroot $(BR2_VERSION_FULL)",,$($(PKG)_CONF_OPTS))) \ - | sha256sum - $(HOST_GCC_COMMON_CCACHE_HASH_FILES) \ - | cut -c -64 | tr -d '\n'`\" -endif # BR2_CCACHE - -# The LTO support in gcc creates wrappers for ar, ranlib and nm which load -# the lto plugin. These wrappers are called *-gcc-ar, *-gcc-ranlib, and -# *-gcc-nm and should be used instead of the real programs when -flto is -# used. However, we should not add the toolchain wrapper for them, and they -# match the *cc-* pattern. Therefore, an additional case is added for *-ar, -# *-ranlib and *-nm. -# According to gfortran manpage, it supports all options supported by gcc, so -# add gfortran to the list of the program called via the Buildroot wrapper. -# Avoid that a .br_real is symlinked a second time. -# Also create -linux- symlinks. -define HOST_GCC_INSTALL_WRAPPER_AND_SIMPLE_SYMLINKS - $(Q)cd $(HOST_DIR)/usr/bin; \ - for i in $(GNU_TARGET_NAME)-*; do \ - case "$$i" in \ - *.br_real) \ - ;; \ - *-ar|*-ranlib|*-nm) \ - ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \ - ;; \ - *cc|*cc-*|*++|*++-*|*cpp|*-gfortran) \ - rm -f $$i.br_real; \ - mv $$i $$i.br_real; \ - ln -sf toolchain-wrapper $$i; \ - ln -sf toolchain-wrapper $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \ - ln -snf $$i.br_real $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}.br_real; \ - ;; \ - *) \ - ln -snf $$i $(ARCH)-linux$${i##$(GNU_TARGET_NAME)}; \ - ;; \ - esac; \ - done - -endef - -include $(sort $(wildcard package/gcc/*/*.mk)) diff --git a/package.bak/gcc/musl-5.4.0/100-uclibc-conf.patch b/package.bak/gcc/musl-5.4.0/100-uclibc-conf.patch deleted file mode 100644 index 73d1f0d3a9..0000000000 --- a/package.bak/gcc/musl-5.4.0/100-uclibc-conf.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: b/contrib/regression/objs-gcc.sh -=================================================================== ---- a/contrib/regression/objs-gcc.sh -+++ b/contrib/regression/objs-gcc.sh -@@ -106,6 +106,10 @@ - then - make all-gdb all-dejagnu all-ld || exit 1 - make install-gdb install-dejagnu install-ld || exit 1 -+elif [ $H_REAL_TARGET = $H_REAL_HOST -a $H_REAL_TARGET = i686-pc-linux-uclibc ] -+ then -+ make all-gdb all-dejagnu all-ld || exit 1 -+ make install-gdb install-dejagnu install-ld || exit 1 - elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then - make bootstrap || exit 1 - make install || exit 1 diff --git a/package.bak/gcc/musl-5.4.0/301-missing-execinfo_h.patch b/package.bak/gcc/musl-5.4.0/301-missing-execinfo_h.patch deleted file mode 100644 index 2d0e7baa44..0000000000 --- a/package.bak/gcc/musl-5.4.0/301-missing-execinfo_h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/boehm-gc/include/gc.h -=================================================================== ---- a/boehm-gc/include/gc.h -+++ b/boehm-gc/include/gc.h -@@ -503,7 +503,7 @@ - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/package.bak/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch b/package.bak/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch deleted file mode 100644 index 9e97d945d3..0000000000 --- a/package.bak/gcc/musl-5.4.0/850-libstdcxx-uclibc-c99.patch +++ /dev/null @@ -1,273 +0,0 @@ -Allow C99-depending features of libstdc++ with uClibc - -The libstdc++ code is fairly restrictive on how it checks for C99 -compatibility: it requires *complete* C99 support to enable certain -features. For example, uClibc provides a good number of C99 features, -but not C99 complex number support. For this reason, libstdc++ -completely disables many the standard C++ methods that can in fact -work because uClibc provides the necessary functions. - -This patch is similar and highly inspired from -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58393, but implemented in -a way that doesn't involve changing the configure.ac script, as -autoreconfiguring gcc is complicated. It simply relies on the fact -that uClibc defines the __UCLIBC__ definition. - -Signed-off-by: Thomas Petazzoni - -Index: b/libstdc++-v3/config/locale/generic/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/generic/c_locale.h -+++ b/libstdc++-v3/config/locale/generic/c_locale.h -@@ -70,7 +70,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/config/locale/gnu/c_locale.h -=================================================================== ---- a/libstdc++-v3/config/locale/gnu/c_locale.h -+++ b/libstdc++-v3/config/locale/gnu/c_locale.h -@@ -88,7 +88,7 @@ - __builtin_va_list __args; - __builtin_va_start(__args, __fmt); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - const int __ret = __builtin_vsnprintf(__out, __size, __fmt, __args); - #else - const int __ret = __builtin_vsprintf(__out, __fmt, __args); -Index: b/libstdc++-v3/include/bits/basic_string.h -=================================================================== ---- a/libstdc++-v3/include/bits/basic_string.h -+++ b/libstdc++-v3/include/bits/basic_string.h -@@ -5239,7 +5239,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if __cplusplus >= 201103L && defined(_GLIBCXX_USE_C99) -+#if __cplusplus >= 201103L && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__)) - - #include - -Index: b/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets.tcc -+++ b/libstdc++-v3/include/bits/locale_facets.tcc -@@ -992,7 +992,7 @@ - char __fbuf[16]; - __num_base::_S_format_float(__io, __fbuf, __mod); - --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // Precision is always used except for hexfloat format. - const bool __use_prec = - (__io.flags() & ios_base::floatfield) != ios_base::floatfield; -Index: b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -=================================================================== ---- a/libstdc++-v3/include/bits/locale_facets_nonio.tcc -+++ b/libstdc++-v3/include/bits/locale_facets_nonio.tcc -@@ -578,7 +578,7 @@ - { - const locale __loc = __io.getloc(); - const ctype<_CharT>& __ctype = use_facet >(__loc); --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - // First try a buffer perhaps big enough. - int __cs_size = 64; - char* __cs = static_cast(__builtin_alloca(__cs_size)); -Index: b/libstdc++-v3/include/c_compatibility/math.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/math.h -+++ b/libstdc++-v3/include/c_compatibility/math.h -@@ -56,7 +56,7 @@ - using std::floor; - using std::fmod; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::fpclassify; - using std::isfinite; - using std::isinf; -Index: b/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- a/libstdc++-v3/include/c_compatibility/wchar.h -+++ b/libstdc++-v3/include/c_compatibility/wchar.h -@@ -103,7 +103,7 @@ - using std::wmemset; - using std::wcsftime; - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_global/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdlib -+++ b/libstdc++-v3/include/c_global/cstdlib -@@ -195,7 +195,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_global/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_global/cwchar -+++ b/libstdc++-v3/include/c_global/cwchar -@@ -232,7 +232,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -@@ -289,7 +289,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdio -+++ b/libstdc++-v3/include/c_std/cstdio -@@ -144,7 +144,7 @@ - using ::vsprintf; - } // namespace std - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf -Index: b/libstdc++-v3/include/c_std/cstdlib -=================================================================== ---- a/libstdc++-v3/include/c_std/cstdlib -+++ b/libstdc++-v3/include/c_std/cstdlib -@@ -192,7 +192,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef _Exit - #undef llabs -Index: b/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- a/libstdc++-v3/include/c_std/cwchar -+++ b/libstdc++-v3/include/c_std/cwchar -@@ -228,7 +228,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef wcstold - #undef wcstoll -Index: b/libstdc++-v3/include/ext/vstring.h -=================================================================== ---- a/libstdc++-v3/include/ext/vstring.h -+++ b/libstdc++-v3/include/ext/vstring.h -@@ -2680,7 +2680,7 @@ - _GLIBCXX_END_NAMESPACE_VERSION - } // namespace - --#if ((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99)) -+#if ((__cplusplus >= 201103L) && (defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__))) - - #include - -Index: b/libstdc++-v3/include/tr1/cstdio -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdio -+++ b/libstdc++-v3/include/tr1/cstdio -@@ -33,7 +33,7 @@ - - #include - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cstdlib -=================================================================== ---- a/libstdc++-v3/include/tr1/cstdlib -+++ b/libstdc++-v3/include/tr1/cstdlib -@@ -35,7 +35,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - namespace std _GLIBCXX_VISIBILITY(default) - { -Index: b/libstdc++-v3/include/tr1/cwchar -=================================================================== ---- a/libstdc++-v3/include/tr1/cwchar -+++ b/libstdc++-v3/include/tr1/cwchar -@@ -52,7 +52,7 @@ - using std::vwscanf; - #endif - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - using std::wcstold; - using std::wcstoll; - using std::wcstoull; -Index: b/libstdc++-v3/include/tr1/stdlib.h -=================================================================== ---- a/libstdc++-v3/include/tr1/stdlib.h -+++ b/libstdc++-v3/include/tr1/stdlib.h -@@ -33,7 +33,7 @@ - - #if _GLIBCXX_HOSTED - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - using std::tr1::atoll; - using std::tr1::strtoll; -Index: b/libstdc++-v3/src/c++11/debug.cc -=================================================================== ---- a/libstdc++-v3/src/c++11/debug.cc -+++ b/libstdc++-v3/src/c++11/debug.cc -@@ -788,7 +788,7 @@ - int __n __attribute__ ((__unused__)), - const char* __fmt, _Tp __s) const throw () - { --#ifdef _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - std::snprintf(__buf, __n, __fmt, __s); - #else - std::sprintf(__buf, __fmt, __s); -Index: b/libstdc++-v3/include/c_global/cstdio -=================================================================== ---- a/libstdc++-v3/include/c_global/cstdio -+++ b/libstdc++-v3/include/c_global/cstdio -@@ -146,7 +146,7 @@ - using ::vsprintf; - } // namespace - --#if _GLIBCXX_USE_C99 -+#if defined(_GLIBCXX_USE_C99) || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/package.bak/gcc/musl-5.4.0/860-cilk-wchar.patch b/package.bak/gcc/musl-5.4.0/860-cilk-wchar.patch deleted file mode 100644 index 1d9916f554..0000000000 --- a/package.bak/gcc/musl-5.4.0/860-cilk-wchar.patch +++ /dev/null @@ -1,56 +0,0 @@ -[PATCH] cilk: fix build without wchar - -When building against uClibc with wchar support disabled, WCHAR_MIN and -WCHAR_MAX are not defined leading to compilation errors. - -Fix it by only including the wchar code if available. - -Signed-off-by: Peter Korsgaard ---- - libcilkrts/include/cilk/reducer_min_max.h | 8 ++++++++ - 1 file changed, 8 insertions(+) - -Index: b/libcilkrts/include/cilk/reducer_min_max.h -=================================================================== ---- a/libcilkrts/include/cilk/reducer_min_max.h -+++ b/libcilkrts/include/cilk/reducer_min_max.h -@@ -3154,7 +3154,9 @@ - CILK_C_REDUCER_MAX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INSTANCE(int, int, INT_MIN) -@@ -3306,7 +3308,9 @@ - CILK_C_REDUCER_MAX_INDEX_INSTANCE(char, char, CHAR_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned char, uchar, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(signed char, schar, SCHAR_MIN) -+#ifdef WCHAR_MIN - CILK_C_REDUCER_MAX_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MIN) -+#endif - CILK_C_REDUCER_MAX_INDEX_INSTANCE(short, short, SHRT_MIN) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(unsigned short, ushort, 0) - CILK_C_REDUCER_MAX_INDEX_INSTANCE(int, int, INT_MIN) -@@ -3432,7 +3436,9 @@ - CILK_C_REDUCER_MIN_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INSTANCE(int, int, INT_MAX) -@@ -3584,7 +3590,9 @@ - CILK_C_REDUCER_MIN_INDEX_INSTANCE(char, char, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned char, uchar, CHAR_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(signed char, schar, SCHAR_MAX) -+#ifdef WCHAR_MAX - CILK_C_REDUCER_MIN_INDEX_INSTANCE(wchar_t, wchar_t, WCHAR_MAX) -+#endif - CILK_C_REDUCER_MIN_INDEX_INSTANCE(short, short, SHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(unsigned short, ushort, USHRT_MAX) - CILK_C_REDUCER_MIN_INDEX_INSTANCE(int, int, INT_MAX) diff --git a/package.bak/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch b/package.bak/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch deleted file mode 100644 index 07f9a7395b..0000000000 --- a/package.bak/gcc/musl-5.4.0/930-libgcc-disable-split-stack-nothreads.patch +++ /dev/null @@ -1,14 +0,0 @@ -disable split-stack for non-thread builds - -Signed-off-by: Waldemar Brodkorb - -diff -Nur gcc-5.3.0.orig/libgcc/config/t-stack gcc-5.3.0/libgcc/config/t-stack ---- gcc-5.3.0.orig/libgcc/config/t-stack 2010-10-01 21:31:49.000000000 +0200 -+++ gcc-5.3.0/libgcc/config/t-stack 2016-03-07 03:25:32.000000000 +0100 -@@ -1,4 +1,6 @@ - # Makefile fragment to provide generic support for -fsplit-stack. - # This should be used in config.host for any host which supports - # -fsplit-stack. -+ifeq ($(enable_threads),yes) - LIB2ADD_ST += $(srcdir)/generic-morestack.c $(srcdir)/generic-morestack-thread.c -+endif diff --git a/package.bak/gcr/Config.in b/package.bak/gcr/Config.in deleted file mode 100644 index e233fffed0..0000000000 --- a/package.bak/gcr/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_GCR - bool "gcr" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # gnupg2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on !BR2_STATIC_LIBS # p11-kit - select BR2_PACKAGE_GNUPG2 # runtime - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_P11_KIT - help - Library for cryptographic UIs and accessing PKCS#11 modules. - - https://developer.gnome.org/gcr/ - -comment "gcr needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/gcr/gcr.hash b/package.bak/gcr/gcr.hash deleted file mode 100644 index 8b8b748b9e..0000000000 --- a/package.bak/gcr/gcr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gcr/3.20/gcr-3.20.0.sha256sum -sha256 90572c626d8a708225560c42b4421f7941315247fa1679d4ef569bde7f4bb379 gcr-3.20.0.tar.xz diff --git a/package.bak/gcr/gcr.mk b/package.bak/gcr/gcr.mk deleted file mode 100644 index d8cb667d15..0000000000 --- a/package.bak/gcr/gcr.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# gcr -# -################################################################################ - -GCR_VERSION_MAJOR = 3.20 -GCR_VERSION = $(GCR_VERSION_MAJOR).0 -GCR_SITE = http://ftp.acc.umu.se/pub/gnome/sources/gcr/$(GCR_VERSION_MAJOR) -GCR_SOURCE = gcr-$(GCR_VERSION).tar.xz -GCR_DEPENDENCIES = host-intltool host-pkgconf libgcrypt libglib2 p11-kit -GCR_INSTALL_STAGING = YES -GCR_CONF_ENV = ac_cv_path_GNUPG=/usr/bin/gpg2 -GCR_CONF_OPTS = \ - --disable-gtk-doc \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -# Even though COPYING is v2 the code states v2.1+ -GCR_LICENSE = LGPLv2.1+ -GCR_LICENSE_FILES = COPYING - -# Only the X11 backend is supported for the simple GUI -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -GCR_DEPENDENCIES += libgtk3 -GCR_CONF_OPTS += --with-gtk -else -GCR_CONF_OPTS += --without-gtk -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gd/0001-gdlib-config.patch b/package.bak/gd/0001-gdlib-config.patch deleted file mode 100644 index 7756bf1240..0000000000 --- a/package.bak/gd/0001-gdlib-config.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix gdlib-config - -Since the @LIBICONV@ macro doesn't get replaced at compile time, we -end up installing an invalid gdlib-config: the gdlib-config --libs -says that one should link against @LIBICONV@ which obviously doesn't -work. - -Use the OpenWRT patch from -https://dev.openwrt.org/browser/packages/libs/gd/patches/101-gdlib-config.patch - -Signed-off-by: Thomas Petazzoni - ---- a/config/gdlib-config.in -+++ b/config/gdlib-config.in -@@ -71,7 +71,7 @@ while test $# -gt 0; do - echo @LDFLAGS@ - ;; - --libs) -- echo -lgd @LIBS@ @LIBICONV@ -+ echo -lgd @LIBS@ - ;; - --cflags|--includes) - echo -I@includedir@ -@@ -84,7 +84,7 @@ while test $# -gt 0; do - echo "includedir: $includedir" - echo "cflags: -I@includedir@" - echo "ldflags: @LDFLAGS@" -- echo "libs: @LIBS@ @LIBICONV@" -+ echo "libs: @LIBS@" - echo "libdir: $libdir" - echo "features: @FEATURES@" - ;; diff --git a/package.bak/gd/0002-gd_bmp-fix-build-with-uClibc.patch b/package.bak/gd/0002-gd_bmp-fix-build-with-uClibc.patch deleted file mode 100644 index 89bc39186e..0000000000 --- a/package.bak/gd/0002-gd_bmp-fix-build-with-uClibc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ea2a03e983acf34a1320b460dcad43b7e0b0b14f Mon Sep 17 00:00:00 2001 -Message-Id: -From: Baruch Siach -Date: Thu, 10 Apr 2014 15:49:13 +0300 -Subject: [PATCH] gd_bmp: fix build with uClibc - -Some architectures (like ARM) don't have the long double variants of math -functions under uClibc. Add a local ceill definition in this case. - -Patch status: reported upstream, -https://bitbucket.org/libgd/gd-libgd/issue/123/build-failure-agains-uclibc-arm - -Signed-off-by: Baruch Siach ---- - src/gd_bmp.c | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/gd_bmp.c b/src/gd_bmp.c -index 0fc021909f1b..11b3ec1baa01 100644 ---- a/src/gd_bmp.c -+++ b/src/gd_bmp.c -@@ -25,6 +25,11 @@ - #include "gdhelpers.h" - #include "bmp.h" - -+#include -+#if defined (__UCLIBC__) && !defined(__UCLIBC_HAS_LONG_DOUBLE_MATH__) -+#define NO_LONG_DOUBLE -+#endif -+ - static int compress_row(unsigned char *uncompressed_row, int length); - static int build_rle_packet(unsigned char *row, int packet_type, int length, unsigned char *data); - -@@ -42,6 +47,13 @@ static int bmp_read_rle(gdImagePtr im, gdIOCtxPtr infile, bmp_info_t *info); - - #define BMP_DEBUG(s) - -+#ifdef NO_LONG_DOUBLE -+long double ceill(long double x) -+{ -+ return (long double) ceil((double) x); -+} -+#endif -+ - static int gdBMPPutWord(gdIOCtx *out, int w) - { - /* Byte order is little-endian */ --- -1.9.1 - diff --git a/package.bak/gd/Config.in b/package.bak/gd/Config.in deleted file mode 100644 index 861cef885c..0000000000 --- a/package.bak/gd/Config.in +++ /dev/null @@ -1,58 +0,0 @@ -menuconfig BR2_PACKAGE_GD - bool "gd" - help - GD is a graphics library. It allows your code to quickly - draw images complete with lines, arcs, text, multiple - colours, cut and paste from other images, flood fills, and - write out the result as a PNG file. This is particularly - useful in World Wide Web applications, where PNG is one of - the formats accepted for inline images by most browsers. - - https://libgd.github.io/ - -if BR2_PACKAGE_GD - -config BR2_PACKAGE_GD_ANNOTATE - bool "annotate" - -config BR2_PACKAGE_GD_BDFTOGD - bool "bdftogd" - depends on BR2_PACKAGE_PERL - -config BR2_PACKAGE_GD_GD2COPYPAL - bool "gd2copypal" - -config BR2_PACKAGE_GD_GD2TOGIF - bool "gd2togif" - -config BR2_PACKAGE_GD_GD2TOPNG - bool "gd2topng" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GD_GDCMPGIF - bool "gdcmpgif" - -config BR2_PACKAGE_GD_GDPARTTOPNG - bool "gdparttopng" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GD_GDTOPNG - bool "gdtopng" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GD_GIFTOGD2 - bool "giftogd2" - -config BR2_PACKAGE_GD_PNGTOGD - bool "pngtogd" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GD_PNGTOGD2 - bool "pngtogd2" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GD_WEBPNG - bool "webpng" - select BR2_PACKAGE_LIBPNG - -endif diff --git a/package.bak/gd/gd.hash b/package.bak/gd/gd.hash deleted file mode 100644 index a1991b1820..0000000000 --- a/package.bak/gd/gd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 137f13a7eb93ce72e32ccd7cebdab6874f8cf7ddf31d3a455a68e016ecd9e4e6 libgd-2.2.4.tar.xz diff --git a/package.bak/gd/gd.mk b/package.bak/gd/gd.mk deleted file mode 100644 index 63d16eb3ca..0000000000 --- a/package.bak/gd/gd.mk +++ /dev/null @@ -1,96 +0,0 @@ -################################################################################ -# -# gd -# -################################################################################ - -GD_VERSION = 2.2.4 -GD_SOURCE = libgd-$(GD_VERSION).tar.xz -GD_SITE = https://github.com/libgd/libgd/releases/download/gd-$(GD_VERSION) -GD_INSTALL_STAGING = YES -GD_LICENSE = GD license -GD_LICENSE_FILES = COPYING -GD_CONFIG_SCRIPTS = gdlib-config -GD_CONF_OPTS = --without-x --disable-rpath --disable-werror -GD_DEPENDENCIES = host-pkgconf - -# gd forgets to link utilities with -pthread even though it uses -# pthreads, causing linking errors with static linking -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -GD_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -GD_DEPENDENCIES += fontconfig -GD_CONF_OPTS += --with-fontconfig -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -GD_DEPENDENCIES += freetype -GD_CONF_OPTS += --with-freetype=$(STAGING_DIR)/usr -else -GD_CONF_OPTS += --without-freetype -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -GD_DEPENDENCIES += libiconv -# not strictly needed for gd, but ensures -liconv ends up in -# gdlib-config --libs output -GD_CONF_ENV += LIBS="-liconv" -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -GD_DEPENDENCIES += jpeg -GD_CONF_OPTS += --with-jpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -GD_DEPENDENCIES += libpng -GD_CONF_OPTS += --with-png -else -GD_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_WEBP),y) -GD_DEPENDENCIES += webp -GD_CONF_OPTS += --with-webp -else -GD_CONF_OPTS += --without-webp -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -GD_DEPENDENCIES += tiff -GD_CONF_OPTS += --with-tiff -else -GD_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) -GD_DEPENDENCIES += xlib_libXpm -GD_CONF_OPTS += --with-xpm -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GD_DEPENDENCIES += zlib -endif - -GD_TOOLS_$(BR2_PACKAGE_GD_ANNOTATE) += annotate -GD_TOOLS_$(BR2_PACKAGE_GD_BDFTOGD) += bdftogd -GD_TOOLS_$(BR2_PACKAGE_GD_GD2COPYPAL) += gd2copypal -GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOGIF) += gd2togif -GD_TOOLS_$(BR2_PACKAGE_GD_GD2TOPNG) += gd2topng -GD_TOOLS_$(BR2_PACKAGE_GD_GDCMPGIF) += gdcmpgif -GD_TOOLS_$(BR2_PACKAGE_GD_GDPARTTOPNG) += gdparttopng -GD_TOOLS_$(BR2_PACKAGE_GD_GDTOPNG) += gdtopng -GD_TOOLS_$(BR2_PACKAGE_GD_GIFTOGD2) += giftogd2 -GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD) += pngtogd -GD_TOOLS_$(BR2_PACKAGE_GD_PNGTOGD2) += pngtogd2 -GD_TOOLS_$(BR2_PACKAGE_GD_WEBPNG) += webpng - -define GD_REMOVE_TOOLS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GD_TOOLS_)) -endef - -GD_POST_INSTALL_TARGET_HOOKS += GD_REMOVE_TOOLS - -$(eval $(autotools-package)) diff --git a/package.bak/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch b/package.bak/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch deleted file mode 100644 index 863e26aac3..0000000000 --- a/package.bak/gdb/7.10.1/0001-Add-some-casts-for-building-on-musl.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d41401ace01c234f42697e190a2ac95991780626 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:20:12 -0700 -Subject: [PATCH] Add some casts for building on musl. - -gdb/ChangeLog: - - * linux-thread-db.c (find_new_threads_callback): Cast ti.ti_tid to - unsigned long for debug_printf. - (thread_db_pid_to_str): Ditto. - -gdb/gdbserver/ChangeLog: - - * thread-db.c (find_one_thread): Cast ti.ti_tid to unsigned long - for debug_printf. - (attach_thread, find_new_threads_callback): Ditto. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 5 +++++ - gdb/gdbserver/ChangeLog | 6 ++++++ - gdb/gdbserver/thread-db.c | 9 +++++---- - gdb/linux-thread-db.c | 5 +++-- - 4 files changed, 19 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/thread-db.c b/gdb/gdbserver/thread-db.c -index ffe722d..3df10ff 100644 ---- a/gdb/gdbserver/thread-db.c -+++ b/gdb/gdbserver/thread-db.c -@@ -278,7 +278,7 @@ find_one_thread (ptid_t ptid) - - if (debug_threads) - debug_printf ("Found thread %ld (LWP %d)\n", -- ti.ti_tid, ti.ti_lid); -+ (unsigned long) ti.ti_tid, ti.ti_lid); - - if (lwpid != ti.ti_lid) - { -@@ -319,12 +319,12 @@ attach_thread (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p) - - if (debug_threads) - debug_printf ("Attaching to thread %ld (LWP %d)\n", -- ti_p->ti_tid, ti_p->ti_lid); -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid); - err = linux_attach_lwp (ptid); - if (err != 0) - { - warning ("Could not attach to thread %ld (LWP %d): %s\n", -- ti_p->ti_tid, ti_p->ti_lid, -+ (unsigned long) ti_p->ti_tid, ti_p->ti_lid, - linux_ptrace_attach_fail_reason_string (ptid, err)); - return 0; - } -@@ -392,7 +392,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) - glibc PR17707. */ - if (debug_threads) - debug_printf ("thread_db: skipping exited and " -- "joined thread (0x%lx)\n", ti.ti_tid); -+ "joined thread (0x%lx)\n", -+ (unsigned long) ti.ti_tid); - return 0; - } - -diff --git a/gdb/linux-thread-db.c b/gdb/linux-thread-db.c -index 66e9595..41db29a 100644 ---- a/gdb/linux-thread-db.c -+++ b/gdb/linux-thread-db.c -@@ -1585,7 +1585,8 @@ find_new_threads_callback (const td_thrhandle_t *th_p, void *data) - if (libthread_db_debug) - fprintf_unfiltered (gdb_stdlog, - "thread_db: skipping exited and " -- "joined thread (0x%lx)\n", ti.ti_tid); -+ "joined thread (0x%lx)\n", -+ (unsigned long) ti.ti_tid); - return 0; - } - -@@ -1816,7 +1817,7 @@ thread_db_pid_to_str (struct target_ops *ops, ptid_t ptid) - - tid = thread_info->priv->tid; - snprintf (buf, sizeof (buf), "Thread 0x%lx (LWP %ld)", -- tid, ptid_get_lwp (ptid)); -+ (unsigned long) tid, ptid_get_lwp (ptid)); - - return buf; - } --- -1.9.4 - diff --git a/package.bak/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch b/package.bak/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch deleted file mode 100644 index 60c357cd80..0000000000 --- a/package.bak/gdb/7.10.1/0002-musl-Move-W_STOPCODE-to-common-gdb_wait-h.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 963843d4d07aef6caa296dacf191f8adc9518596 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:24:01 -0700 -Subject: [PATCH] musl: Move W_STOPCODE to common/gdb_wait.h. - -gdb/ChangeLog: - - * common/gdb_wait.h (W_STOPCODE): Define, moved here from - gdbserver/linux-low.c. - (WSETSTOP): Simplify. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (W_STOPCODE): Moved to common/gdb_wait.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 6 ++++++ - gdb/common/gdb_wait.h | 8 ++++---- - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 4 ---- - 4 files changed, 14 insertions(+), 8 deletions(-) - -diff --git a/gdb/common/gdb_wait.h b/gdb/common/gdb_wait.h -index 9b250d2..412f813 100644 ---- a/gdb/common/gdb_wait.h -+++ b/gdb/common/gdb_wait.h -@@ -85,12 +85,12 @@ - # endif - #endif - -+#ifndef W_STOPCODE -+#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) -+#endif -+ - #ifndef WSETSTOP --# ifdef W_STOPCODE - #define WSETSTOP(w,sig) ((w) = W_STOPCODE(sig)) --# else --#define WSETSTOP(w,sig) ((w) = (0177 | ((sig) << 8))) --# endif - #endif - - /* For native GNU/Linux we may use waitpid and the __WCLONE option. -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 0c552b8..7ed67c7 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,10 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --#ifndef W_STOPCODE --#define W_STOPCODE(sig) ((sig) << 8 | 0x7f) --#endif -- - /* This is the kernel's hard limit. Not to be confused with - SIGRTMIN. */ - #ifndef __SIGRTMIN --- -1.9.4 - diff --git a/package.bak/gdb/7.10.1/0003-move-__SIGRTMIN.patch b/package.bak/gdb/7.10.1/0003-move-__SIGRTMIN.patch deleted file mode 100644 index 38ba1f028a..0000000000 --- a/package.bak/gdb/7.10.1/0003-move-__SIGRTMIN.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 682b25469e66ea45b214e95962671373983c118f Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Mon, 26 Oct 2015 13:30:57 -0700 -Subject: [PATCH] Move __SIGRTMIN. - -gdb/ChangeLog: - - * nat/linux-nat.h (__SIGRTMIN): Move here from gdbserver/linux-low.c. - -gdb/gdbserver/ChangeLog: - - * linux-low.c (__SIGRTMIN): Move to nat/linux-nat.h. - -[Arnout: removed the parts that don't apply, including ChangeLog] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gdb/ChangeLog | 4 ++++ - gdb/gdbserver/ChangeLog | 4 ++++ - gdb/gdbserver/linux-low.c | 6 ------ - gdb/nat/linux-nat.h | 5 +++++ - 4 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/gdb/gdbserver/linux-low.c b/gdb/gdbserver/linux-low.c -index 7ed67c7..e778c4c 100644 ---- a/gdb/gdbserver/linux-low.c -+++ b/gdb/gdbserver/linux-low.c -@@ -70,12 +70,6 @@ - #define O_LARGEFILE 0 - #endif - --/* This is the kernel's hard limit. Not to be confused with -- SIGRTMIN. */ --#ifndef __SIGRTMIN --#define __SIGRTMIN 32 --#endif -- - /* Some targets did not define these ptrace constants from the start, - so gdbserver defines them locally here. In the future, these may - be removed after they are added to asm/ptrace.h. */ -diff --git a/gdb/nat/linux-nat.h b/gdb/nat/linux-nat.h -index 0633fa9..70e6274 100644 ---- a/gdb/nat/linux-nat.h -+++ b/gdb/nat/linux-nat.h -@@ -25,6 +25,11 @@ - struct lwp_info; - struct arch_lwp_info; - -+/* This is the kernel's hard limit. Not to be confused with SIGRTMIN. */ -+#ifndef __SIGRTMIN -+#define __SIGRTMIN 32 -+#endif -+ - /* Unlike other extended result codes, WSTOPSIG (status) on - PTRACE_O_TRACESYSGOOD syscall events doesn't return SIGTRAP, but - instead SIGTRAP with bit 7 set. */ --- -1.9.4 - diff --git a/package.bak/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch b/package.bak/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch deleted file mode 100644 index e7bc74ea53..0000000000 --- a/package.bak/gdb/7.10.1/0004-xtensa-implement-NPTL-helpers.patch +++ /dev/null @@ -1,267 +0,0 @@ -From d4eb69fc4b50f9a0babd70b28d0601b40f31bd0f Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Thu, 2 Jul 2015 15:10:58 +0300 -Subject: [PATCH] xtensa: implement NPTL helpers - -These changes allow debugging multithreaded NPTL xtensa applications. - -2015-08-20 Max Filippov -gdb/gdbserver/ - * configure.srv (xtensa*-*-linux*): Add srv_linux_thread_db=yes. - * linux-xtensa-low.c (arch/xtensa.h gdb_proc_service.h): New - #includes. - (ps_get_thread_area): New function. - -2015-08-20 Max Filippov -gdb/ - * arch/xtensa.h: New file. - * xtensa-linux-nat.c (gdb_proc_service.h): New #include. - (ps_get_thread_area): New function. - * xtensa-linux-tdep.c (xtensa_linux_init_abi): Add call to - set_gdbarch_fetch_tls_load_module_address to enable TLS support. - * xtensa-tdep.c (osabi.h): New #include. - (xtensa_gdbarch_init): Call gdbarch_init_osabi to register - xtensa-specific hooks. - * xtensa-tdep.h (struct xtensa_elf_gregset_t): Add threadptr - member and move the structure to arch/xtensa.h. - -Signed-off-by: Max Filippov ---- -Backported from: 40045d91812b25c88c8275b8c08d27c234b68ba8 -Changes to ChangeLog files are dropped. - - gdb/arch/xtensa.h | 46 ++++++++++++++++++++++++++++++++++++++++ - gdb/gdbserver/configure.srv | 1 + - gdb/gdbserver/linux-xtensa-low.c | 21 ++++++++++++++++++ - gdb/xtensa-linux-nat.c | 22 ++++++++++++++++++ - gdb/xtensa-linux-tdep.c | 4 ++++ - gdb/xtensa-tdep.c | 4 ++++ - gdb/xtensa-tdep.h | 24 ++------------------ - 7 files changed, 100 insertions(+), 22 deletions(-) - create mode 100644 gdb/arch/xtensa.h - -diff --git a/gdb/arch/xtensa.h b/gdb/arch/xtensa.h -new file mode 100644 -index 0000000..fe96584 ---- /dev/null -+++ b/gdb/arch/xtensa.h -@@ -0,0 +1,46 @@ -+/* Common Target-dependent code for the Xtensa port of GDB, the GNU debugger. -+ -+ Copyright (C) 2003-2015 Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef XTENSA_H -+#define XTENSA_H -+ -+/* Xtensa ELF core file register set representation ('.reg' section). -+ Copied from target-side ELF header . */ -+ -+typedef uint32_t xtensa_elf_greg_t; -+ -+typedef struct -+{ -+ xtensa_elf_greg_t pc; -+ xtensa_elf_greg_t ps; -+ xtensa_elf_greg_t lbeg; -+ xtensa_elf_greg_t lend; -+ xtensa_elf_greg_t lcount; -+ xtensa_elf_greg_t sar; -+ xtensa_elf_greg_t windowstart; -+ xtensa_elf_greg_t windowbase; -+ xtensa_elf_greg_t threadptr; -+ xtensa_elf_greg_t reserved[7+48]; -+ xtensa_elf_greg_t ar[64]; -+} xtensa_elf_gregset_t; -+ -+#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -+ / sizeof (xtensa_elf_greg_t)) -+ -+#endif -diff --git a/gdb/gdbserver/configure.srv b/gdb/gdbserver/configure.srv -index 0b18d1d..320c26a 100644 ---- a/gdb/gdbserver/configure.srv -+++ b/gdb/gdbserver/configure.srv -@@ -352,6 +352,7 @@ case "${target}" in - xtensa*-*-linux*) srv_regobj=reg-xtensa.o - srv_tgtobj="$srv_linux_obj linux-xtensa-low.o" - srv_linux_regsets=yes -+ srv_linux_thread_db=yes - ;; - tilegx-*-linux*) srv_regobj=reg-tilegx.o - srv_regobj="${srv_regobj} reg-tilegx32.o" -diff --git a/gdb/gdbserver/linux-xtensa-low.c b/gdb/gdbserver/linux-xtensa-low.c -index 4daccee..debe467 100644 ---- a/gdb/gdbserver/linux-xtensa-low.c -+++ b/gdb/gdbserver/linux-xtensa-low.c -@@ -26,6 +26,8 @@ extern const struct target_desc *tdesc_xtensa; - - #include - #include -+#include "arch/xtensa.h" -+#include "gdb_proc_service.h" - - #include "xtensa-xtregs.c" - -@@ -179,6 +181,25 @@ xtensa_breakpoint_at (CORE_ADDR where) - xtensa_breakpoint, xtensa_breakpoint_len) == 0; - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - static struct regsets_info xtensa_regsets_info = - { - xtensa_regsets, /* regsets */ -diff --git a/gdb/xtensa-linux-nat.c b/gdb/xtensa-linux-nat.c -index 77ad3e0..5538d5b 100644 ---- a/gdb/xtensa-linux-nat.c -+++ b/gdb/xtensa-linux-nat.c -@@ -37,6 +37,9 @@ - #include "gregset.h" - #include "xtensa-tdep.h" - -+/* Defines ps_err_e, struct ps_prochandle. */ -+#include "gdb_proc_service.h" -+ - /* Extended register set depends on hardware configs. - Keeping these definitions separately allows to introduce - hardware-specific overlays. */ -@@ -280,6 +283,25 @@ xtensa_linux_store_inferior_registers (struct target_ops *ops, - store_xtregs (regcache, regnum); - } - -+/* Called by libthread_db. */ -+ -+ps_err_e -+ps_get_thread_area (const struct ps_prochandle *ph, -+ lwpid_t lwpid, int idx, void **base) -+{ -+ xtensa_elf_gregset_t regs; -+ -+ if (ptrace (PTRACE_GETREGS, lwpid, NULL, ®s) != 0) -+ return PS_ERR; -+ -+ /* IDX is the bias from the thread pointer to the beginning of the -+ thread descriptor. It has to be subtracted due to implementation -+ quirks in libthread_db. */ -+ *base = (void *) ((char *) regs.threadptr - idx); -+ -+ return PS_OK; -+} -+ - void _initialize_xtensa_linux_nat (void); - - void -diff --git a/gdb/xtensa-linux-tdep.c b/gdb/xtensa-linux-tdep.c -index 61ea9b0..99e0d3e 100644 ---- a/gdb/xtensa-linux-tdep.c -+++ b/gdb/xtensa-linux-tdep.c -@@ -106,6 +106,10 @@ xtensa_linux_init_abi (struct gdbarch_info info, struct gdbarch *gdbarch) - xtensa_linux_gdb_signal_from_target); - set_gdbarch_gdb_signal_to_target (gdbarch, - xtensa_linux_gdb_signal_to_target); -+ -+ /* Enable TLS support. */ -+ set_gdbarch_fetch_tls_load_module_address (gdbarch, -+ svr4_fetch_objfile_link_map); - } - - /* Provide a prototype to silence -Wmissing-prototypes. */ -diff --git a/gdb/xtensa-tdep.c b/gdb/xtensa-tdep.c -index 55e7d98..4b693ed 100644 ---- a/gdb/xtensa-tdep.c -+++ b/gdb/xtensa-tdep.c -@@ -28,6 +28,7 @@ - #include "value.h" - #include "dis-asm.h" - #include "inferior.h" -+#include "osabi.h" - #include "floatformat.h" - #include "regcache.h" - #include "reggroups.h" -@@ -3273,6 +3274,9 @@ xtensa_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) - set_solib_svr4_fetch_link_map_offsets - (gdbarch, svr4_ilp32_fetch_link_map_offsets); - -+ /* Hook in the ABI-specific overrides, if they have been registered. */ -+ gdbarch_init_osabi (info, gdbarch); -+ - return gdbarch; - } - -diff --git a/gdb/xtensa-tdep.h b/gdb/xtensa-tdep.h -index caa2988..5b28cab 100644 ---- a/gdb/xtensa-tdep.h -+++ b/gdb/xtensa-tdep.h -@@ -18,6 +18,8 @@ - along with this program. If not, see . */ - - -+#include "arch/xtensa.h" -+ - /* XTENSA_TDEP_VERSION can/should be changed along with XTENSA_CONFIG_VERSION - whenever the "tdep" structure changes in an incompatible way. */ - -@@ -81,28 +83,6 @@ typedef enum - } xtensa_target_flags_t; - - --/* Xtensa ELF core file register set representation ('.reg' section). -- Copied from target-side ELF header . */ -- --typedef uint32_t xtensa_elf_greg_t; -- --typedef struct --{ -- xtensa_elf_greg_t pc; -- xtensa_elf_greg_t ps; -- xtensa_elf_greg_t lbeg; -- xtensa_elf_greg_t lend; -- xtensa_elf_greg_t lcount; -- xtensa_elf_greg_t sar; -- xtensa_elf_greg_t windowstart; -- xtensa_elf_greg_t windowbase; -- xtensa_elf_greg_t reserved[8+48]; -- xtensa_elf_greg_t ar[64]; --} xtensa_elf_gregset_t; -- --#define XTENSA_ELF_NGREG (sizeof (xtensa_elf_gregset_t) \ -- / sizeof (xtensa_elf_greg_t)) -- - /* Mask. */ - - typedef struct --- -1.8.1.4 - diff --git a/package.bak/gdb/7.10.1/0005-target.h-include-sys-types.h.patch b/package.bak/gdb/7.10.1/0005-target.h-include-sys-types.h.patch deleted file mode 100644 index ba5419d244..0000000000 --- a/package.bak/gdb/7.10.1/0005-target.h-include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From cd68d0ebe7748a5448c86eb021b717df6fe83f35 Mon Sep 17 00:00:00 2001 -From: Doug Evans -Date: Sun, 22 Nov 2015 17:24:03 -0800 -Subject: [PATCH] target.h: #include . - -For musl. - -[Romain: - rebase on gdb 7.10.1 from upstream (7.11) - remove ChangeLog entry] -Signed-off-by: Romain Naour ---- - gdb/gdbserver/target.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gdb/gdbserver/target.h b/gdb/gdbserver/target.h -index 9a40867..6af043c 100644 ---- a/gdb/gdbserver/target.h -+++ b/gdb/gdbserver/target.h -@@ -21,6 +21,7 @@ - #ifndef TARGET_H - #define TARGET_H - -+#include /* for mode_t */ - #include "target/target.h" - #include "target/resume.h" - #include "target/wait.h" --- -2.5.5 - diff --git a/package.bak/gdb/7.10.1/0006-Revert-sim-unify-SIM_CPU-definition.patch b/package.bak/gdb/7.10.1/0006-Revert-sim-unify-SIM_CPU-definition.patch deleted file mode 100644 index 20b7fb2341..0000000000 --- a/package.bak/gdb/7.10.1/0006-Revert-sim-unify-SIM_CPU-definition.patch +++ /dev/null @@ -1,372 +0,0 @@ -From 4d913bb73965fdb9c756e8d5916a829b60aa3a44 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 4 Aug 2016 23:44:24 +0200 -Subject: [PATCH] Revert "sim: unify SIM_CPU definition" - -This reverts commit 20bca71d82598a015de0991196e45f0b5f7ead81. - -This change causes a redefinition of SIM_CPU on the Blackfin -architecture, as it is defined in both the common sim/common/sim-base.h -and the architecture specific sim/bfin/sim-main.h. - -Signed-off-by: Thomas Petazzoni ---- - sim/arm/sim-main.h | 3 +++ - sim/avr/sim-main.h | 2 ++ - sim/bfin/sim-main.h | 2 -- - sim/common/sim-base.h | 2 -- - sim/cr16/sim-main.h | 2 ++ - sim/cris/sim-main.h | 5 +++++ - sim/d10v/sim-main.h | 2 ++ - sim/frv/sim-main.h | 10 ++++++++++ - sim/ft32/sim-main.h | 2 ++ - sim/h8300/sim-main.h | 3 +++ - sim/iq2000/sim-main.h | 5 +++++ - sim/lm32/sim-main.h | 5 +++++ - sim/m32r/sim-main.h | 5 +++++ - sim/m68hc11/sim-main.h | 3 +++ - sim/mcore/sim-main.h | 2 ++ - sim/microblaze/sim-main.h | 3 +++ - sim/mips/sim-main.h | 3 +++ - sim/mn10300/sim-main.h | 2 ++ - sim/moxie/sim-main.h | 3 +++ - sim/msp430/sim-main.h | 3 +++ - sim/sh/sim-main.h | 3 +++ - sim/sh64/sim-main.h | 5 +++++ - sim/v850/sim-main.h | 3 +++ - 23 files changed, 74 insertions(+), 4 deletions(-) - -diff --git a/sim/arm/sim-main.h b/sim/arm/sim-main.h -index 9a37b98..ae622bd 100644 ---- a/sim/arm/sim-main.h -+++ b/sim/arm/sim-main.h -@@ -20,6 +20,9 @@ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/avr/sim-main.h b/sim/avr/sim-main.h -index e0cac22..52904e3 100644 ---- a/sim/avr/sim-main.h -+++ b/sim/avr/sim-main.h -@@ -23,6 +23,8 @@ along with this program. If not, see . */ - - extern unsigned int pc; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - struct _sim_cpu { -diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h -index 806fe15..53e1774 100644 ---- a/sim/bfin/sim-main.h -+++ b/sim/bfin/sim-main.h -@@ -24,8 +24,6 @@ - #include "sim-basics.h" - #include "sim-signal.h" - --/* TODO: Delete this. Need to convert bu32/etc... to common sim types -- and unwind the bfin-sim.h/machs.h include below first though. */ - typedef struct _sim_cpu SIM_CPU; - - #include "bfin-sim.h" -diff --git a/sim/common/sim-base.h b/sim/common/sim-base.h -index 21f61f4..e90e07c 100644 ---- a/sim/common/sim-base.h -+++ b/sim/common/sim-base.h -@@ -72,8 +72,6 @@ typedef address_word sim_cia; - #define INVALID_INSTRUCTION_ADDRESS ((address_word)0 - 1) - #endif - --/* TODO: Probably should just delete SIM_CPU. */ --typedef struct _sim_cpu SIM_CPU; - typedef struct _sim_cpu sim_cpu; - - #include "sim-module.h" -diff --git a/sim/cr16/sim-main.h b/sim/cr16/sim-main.h -index a63b93e..1a80229 100644 ---- a/sim/cr16/sim-main.h -+++ b/sim/cr16/sim-main.h -@@ -24,6 +24,8 @@ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/cris/sim-main.h b/sim/cris/sim-main.h -index 4dc04a2..fec0039 100644 ---- a/sim/cris/sim-main.h -+++ b/sim/cris/sim-main.h -@@ -24,6 +24,11 @@ along with this program. If not, see . */ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+#define USING_SIM_BASE_H -+ -+struct _sim_cpu; -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/d10v/sim-main.h b/sim/d10v/sim-main.h -index 0b87811..a7d59dd 100644 ---- a/sim/d10v/sim-main.h -+++ b/sim/d10v/sim-main.h -@@ -24,6 +24,8 @@ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/frv/sim-main.h b/sim/frv/sim-main.h -index d5a67cb..fd12c4f 100644 ---- a/sim/frv/sim-main.h -+++ b/sim/frv/sim-main.h -@@ -19,6 +19,16 @@ along with this program. If not, see . */ - - /* Main header for the frv. */ - -+#define USING_SIM_BASE_H /* FIXME: quick hack */ -+ -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ -+/* Set the mask of unsupported traces. */ -+#define WITH_TRACE \ -+ (~(TRACE_alu | TRACE_decode | TRACE_memory | TRACE_model | TRACE_fpu \ -+ | TRACE_branch | TRACE_debug)) -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/ft32/sim-main.h b/sim/ft32/sim-main.h -index b27a690..a270a5d 100644 ---- a/sim/ft32/sim-main.h -+++ b/sim/ft32/sim-main.h -@@ -25,6 +25,8 @@ - #include "sim-base.h" - #include "bfd.h" - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "ft32-sim.h" - - struct _sim_cpu { -diff --git a/sim/h8300/sim-main.h b/sim/h8300/sim-main.h -index 6dbc1ac..e95c4d9 100644 ---- a/sim/h8300/sim-main.h -+++ b/sim/h8300/sim-main.h -@@ -87,6 +87,9 @@ enum h8_typecodes { - }; - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - /* Structure used to describe addressing */ -diff --git a/sim/iq2000/sim-main.h b/sim/iq2000/sim-main.h -index 992520a..ce3baba 100644 ---- a/sim/iq2000/sim-main.h -+++ b/sim/iq2000/sim-main.h -@@ -4,6 +4,11 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+#define USING_SIM_BASE_H /* FIXME: quick hack */ -+ -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/lm32/sim-main.h b/sim/lm32/sim-main.h -index 4894e8d..210bb8b 100644 ---- a/sim/lm32/sim-main.h -+++ b/sim/lm32/sim-main.h -@@ -23,6 +23,11 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+#define USING_SIM_BASE_H /* FIXME: quick hack */ -+ -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/m32r/sim-main.h b/sim/m32r/sim-main.h -index cd39e98..74bb513 100644 ---- a/sim/m32r/sim-main.h -+++ b/sim/m32r/sim-main.h -@@ -3,6 +3,11 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+#define USING_SIM_BASE_H /* FIXME: quick hack */ -+ -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "symcat.h" - #include "sim-basics.h" - #include "cgen-types.h" -diff --git a/sim/m68hc11/sim-main.h b/sim/m68hc11/sim-main.h -index d1fc582..4f41db9 100644 ---- a/sim/m68hc11/sim-main.h -+++ b/sim/m68hc11/sim-main.h -@@ -25,6 +25,9 @@ along with this program. If not, see . */ - #define SIM_HANDLES_LMA 1 - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-signal.h" - #include "sim-base.h" - -diff --git a/sim/mcore/sim-main.h b/sim/mcore/sim-main.h -index be50ec1..25698c1 100644 ---- a/sim/mcore/sim-main.h -+++ b/sim/mcore/sim-main.h -@@ -24,6 +24,8 @@ along with this program. If not, see . */ - typedef long int word; - typedef unsigned long int uword; - -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/microblaze/sim-main.h b/sim/microblaze/sim-main.h -index 6781374..6b7b776 100644 ---- a/sim/microblaze/sim-main.h -+++ b/sim/microblaze/sim-main.h -@@ -20,6 +20,9 @@ - - #include "microblaze.h" - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - /* The machine state. -diff --git a/sim/mips/sim-main.h b/sim/mips/sim-main.h -index 8d698ad..9729804 100644 ---- a/sim/mips/sim-main.h -+++ b/sim/mips/sim-main.h -@@ -29,6 +29,9 @@ along with this program. If not, see . */ - mips_core_signal ((SD), (CPU), (CIA), (MAP), (NR_BYTES), (ADDR), (TRANSFER), (ERROR)) - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/mn10300/sim-main.h b/sim/mn10300/sim-main.h -index 847506e..2ddbfb9 100644 ---- a/sim/mn10300/sim-main.h -+++ b/sim/mn10300/sim-main.h -@@ -42,6 +42,8 @@ - #include "itable.h" - #include "idecode.h" - -+typedef struct _sim_cpu SIM_CPU; -+ - #define WITH_WATCHPOINTS 1 - - #define SIM_CORE_SIGNAL(SD,CPU,CIA,MAP,NR_BYTES,ADDR,TRANSFER,ERROR) \ -diff --git a/sim/moxie/sim-main.h b/sim/moxie/sim-main.h -index b1a64fc..c60437e 100644 ---- a/sim/moxie/sim-main.h -+++ b/sim/moxie/sim-main.h -@@ -21,6 +21,9 @@ along with this program. If not, see . */ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - #include "bfd.h" - -diff --git a/sim/msp430/sim-main.h b/sim/msp430/sim-main.h -index 19c8cca..37bb42d 100644 ---- a/sim/msp430/sim-main.h -+++ b/sim/msp430/sim-main.h -@@ -23,6 +23,9 @@ - - #include "sim-basics.h" - #include "sim-signal.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "msp430-sim.h" - #include "sim-base.h" - -diff --git a/sim/sh/sim-main.h b/sim/sh/sim-main.h -index e67df28..e2e17d7 100644 ---- a/sim/sh/sim-main.h -+++ b/sim/sh/sim-main.h -@@ -20,6 +20,9 @@ along with this program. If not, see . */ - #define SIM_MAIN_H - - #include "sim-basics.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - typedef struct -diff --git a/sim/sh64/sim-main.h b/sim/sh64/sim-main.h -index 7b24ab0..8fb595e 100644 ---- a/sim/sh64/sim-main.h -+++ b/sim/sh64/sim-main.h -@@ -3,6 +3,11 @@ - #ifndef SIM_MAIN_H - #define SIM_MAIN_H - -+#define USING_SIM_BASE_H /* FIXME: quick hack */ -+ -+struct _sim_cpu; /* FIXME: should be in sim-basics.h */ -+typedef struct _sim_cpu SIM_CPU; -+ - /* sim-basics.h includes config.h but cgen-types.h must be included before - sim-basics.h and cgen-types.h needs config.h. */ - #include "config.h" -diff --git a/sim/v850/sim-main.h b/sim/v850/sim-main.h -index 5127d28..16cbd97 100644 ---- a/sim/v850/sim-main.h -+++ b/sim/v850/sim-main.h -@@ -16,6 +16,9 @@ - #include "sim-basics.h" - #include "sim-signal.h" - #include "sim-fpu.h" -+ -+typedef struct _sim_cpu SIM_CPU; -+ - #include "sim-base.h" - - #include "simops.h" --- -2.7.4 - diff --git a/package.bak/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch b/package.bak/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch deleted file mode 100644 index 5841cfd4d1..0000000000 --- a/package.bak/gdb/7.11.1/0001-sim-bfin-split-out-common-mach-model-defines-into-ar.patch +++ /dev/null @@ -1,155 +0,0 @@ -From 7a09ed68e203a813d88fb7fc6eeb1e92209561a5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 8 Aug 2016 13:06:49 +0800 -Subject: [PATCH] sim: bfin: split out common mach/model defines into arch.h - [PR sim/20438] - -The current machs.h mixes common enums with Blackfin-specific defines. -This causes us troubles with header inclusion order such that we can't -drop the old SIM_CPU typedef (which is duplicated in common code). By -splitting the two up, we can unwind this dependency chain, and drop the -old typedef. It also fixes building with older gcc versions. - -[Romain: backport from gdb 7.12] -Signed-off-by: Romain Naour - ---- - sim/bfin/ChangeLog | 9 +++++++++ - sim/bfin/arch.h | 44 ++++++++++++++++++++++++++++++++++++++++++++ - sim/bfin/machs.h | 20 -------------------- - sim/bfin/sim-main.h | 8 ++------ - 4 files changed, 55 insertions(+), 26 deletions(-) - create mode 100644 sim/bfin/arch.h - -diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog -index 3dea7c9..a995436 100644 ---- a/sim/bfin/ChangeLog -+++ b/sim/bfin/ChangeLog -@@ -1,3 +1,12 @@ -+2016-08-13 Mike Frysinger -+ -+ PR sim/20438 -+ * machs.h (MODEL_TYPE, MACH_ATTR, BFIN_INSN_*): Move ... -+ * arch.h: ... to this new header file. -+ * sim-main.h (SIM_CPU): Delete. -+ Include arch.h before sim-base.h, and move sim-base.h before -+ bfin-sim.h. -+ - 2016-01-10 Mike Frysinger - - * config.in, configure: Regenerate. -diff --git a/sim/bfin/arch.h b/sim/bfin/arch.h -new file mode 100644 -index 0000000..b86d3e9 ---- /dev/null -+++ b/sim/bfin/arch.h -@@ -0,0 +1,44 @@ -+/* Simulator for Analog Devices Blackfin processors. -+ -+ Copyright (C) 2005-2016 Free Software Foundation, Inc. -+ Contributed by Analog Devices, Inc. -+ -+ This file is part of simulators. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 3 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program. If not, see . */ -+ -+#ifndef BFIN_ARCH_H -+#define BFIN_ARCH_H -+ -+typedef enum model_type { -+#define P(n) MODEL_BF##n, -+#include "proc_list.def" -+#undef P -+ MODEL_MAX -+} MODEL_TYPE; -+ -+typedef enum mach_attr { -+ MACH_BASE, -+ MACH_BFIN, -+ MACH_MAX -+} MACH_ATTR; -+ -+enum { -+#define I(insn) BFIN_INSN_##insn, -+#include "insn_list.def" -+#undef I -+ BFIN_INSN_MAX -+}; -+ -+#endif -diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h -index 0372982..36819ae 100644 ---- a/sim/bfin/machs.h -+++ b/sim/bfin/machs.h -@@ -21,19 +21,6 @@ - #ifndef _BFIN_MACHS_H_ - #define _BFIN_MACHS_H_ - --typedef enum model_type { --#define P(n) MODEL_BF##n, --#include "proc_list.def" --#undef P -- MODEL_MAX --} MODEL_TYPE; -- --typedef enum mach_attr { -- MACH_BASE, -- MACH_BFIN, -- MACH_MAX --} MACH_ATTR; -- - #define CPU_MODEL_NUM(cpu) MODEL_NUM (CPU_MODEL (cpu)) - - /* XXX: Some of this probably belongs in CPU_MODEL. */ -@@ -46,13 +33,6 @@ void bfin_model_cpu_init (SIM_DESC, SIM_CPU *); - bu32 bfin_model_get_chipid (SIM_DESC); - bu32 bfin_model_get_dspid (SIM_DESC); - --enum { --#define I(insn) BFIN_INSN_##insn, --#include "insn_list.def" --#undef I -- BFIN_INSN_MAX --}; -- - #define BFIN_COREMMR_CEC_BASE 0xFFE02100 - #define BFIN_COREMMR_CEC_SIZE (4 * 5) - #define BFIN_COREMMR_CTIMER_BASE 0xFFE03000 -diff --git a/sim/bfin/sim-main.h b/sim/bfin/sim-main.h -index 51fb87e..34fd153 100644 ---- a/sim/bfin/sim-main.h -+++ b/sim/bfin/sim-main.h -@@ -23,17 +23,13 @@ - - #include "sim-basics.h" - #include "sim-signal.h" -- --/* TODO: Delete this. Need to convert bu32/etc... to common sim types -- and unwind the bfin-sim.h/machs.h include below first though. */ --typedef struct _sim_cpu SIM_CPU; -+#include "arch.h" -+#include "sim-base.h" - - #include "bfin-sim.h" - - #include "machs.h" - --#include "sim-base.h" -- - struct _sim_cpu { - /* ... simulator specific members ... */ - struct bfin_cpu_state state; --- -2.9.3 - diff --git a/package.bak/gdb/Config.in b/package.bak/gdb/Config.in deleted file mode 100644 index 809e02d076..0000000000 --- a/package.bak/gdb/Config.in +++ /dev/null @@ -1,72 +0,0 @@ -comment "gdb/gdbserver needs a toolchain w/ threads, threads debug" - depends on !BR2_nios2 && !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HAS_THREADS_DEBUG - -config BR2_PACKAGE_GDB - bool "gdb" - # When the external toolchain gdbserver is copied to the - # target, we don't allow building a separate gdbserver. The - # one from the external toolchain should be used. - select BR2_PACKAGE_GDB_SERVER if \ - (!BR2_PACKAGE_GDB_DEBUGGER && !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY) - depends on BR2_TOOLCHAIN_HAS_THREADS && BR2_TOOLCHAIN_HAS_THREADS_DEBUG - depends on !BR2_nios2 && !BR2_bfin - help - GDB, the GNU Project debugger, allows you to see what is - going on `inside' another program while it executes -- or - what another program was doing at the moment it crashed. - - This option allows to build gdbserver and/or the gdb - debugger for the target. - - For embedded development, the most common solution is to - build only 'gdbserver' for the target, and use a cross-gdb - on the host. See BR2_PACKAGE_HOST_GDB in the Toolchain menu - to enable one. Notice that external toolchains often provide - their own pre-built cross-gdb and gdbserver binaries. - - http://www.gnu.org/software/gdb/ - -if BR2_PACKAGE_GDB - -config BR2_PACKAGE_GDB_SERVER - bool "gdbserver" - depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY - help - Build the gdbserver stub to run on the target. - A full gdb is needed to debug the progam. - -config BR2_PACKAGE_GDB_DEBUGGER - bool "full debugger" - select BR2_PACKAGE_NCURSES - depends on BR2_USE_WCHAR - depends on !BR2_sh && !BR2_microblaze - -comment "full gdb on target needs a toolchain w/ wchar" - depends on !BR2_sh && !BR2_microblaze - depends on !BR2_USE_WCHAR - -if BR2_PACKAGE_GDB_DEBUGGER - -config BR2_PACKAGE_GDB_TUI - bool "TUI support" - help - This option enables terminal user interface (TUI) for gdb - - "The GDB Text User Interface (TUI) is a terminal interface - which uses the curses library to show the source file, the - assembly output, the program registers and GDB commands in - separate text windows." - - https://sourceware.org/gdb/current/onlinedocs/gdb/TUI.html - -config BR2_PACKAGE_GDB_PYTHON - bool "Python support" - # Only Python 2.x is supported by gdb for now - depends on BR2_PACKAGE_PYTHON - help - This option enables Python support in the target gdb. - -endif - -endif diff --git a/package.bak/gdb/Config.in.host b/package.bak/gdb/Config.in.host deleted file mode 100644 index 24e2274cc0..0000000000 --- a/package.bak/gdb/Config.in.host +++ /dev/null @@ -1,63 +0,0 @@ -comment "Host GDB Options" - -config BR2_PACKAGE_HOST_GDB - bool "Build cross gdb for the host" - # When the external toolchain gdbserver is used, we shouldn't - # allow to build a cross-gdb, as the one of the external - # toolchain should be used. - depends on !BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY - depends on !BR2_nios2 - help - Build a cross gdb that runs on the host machine and debugs - programs running on the target. It requires 'gdbserver' - installed on the target, see BR2_PACKAGE_GDB_SERVER to - enable it. - -if BR2_PACKAGE_HOST_GDB - -config BR2_PACKAGE_HOST_GDB_TUI - bool "TUI support" - help - This option enables terminal user interface (TUI) for gdb - -config BR2_PACKAGE_HOST_GDB_PYTHON - bool "Python support" - help - This option enables the Python support in the cross gdb. - -config BR2_PACKAGE_HOST_GDB_SIM - bool "Simulator support" - depends on !BR2_arc && !BR2_microblaze - help - This option enables the simulator support in the cross gdb. - -choice - prompt "GDB debugger Version" - depends on !BR2_arc - depends on !BR2_microblaze - default BR2_GDB_VERSION_7_11 - help - Select the version of gdb you wish to use. - - config BR2_GDB_VERSION_7_10 - bool "gdb 7.10.x" - - config BR2_GDB_VERSION_7_11 - bool "gdb 7.11.x" - - config BR2_GDB_VERSION_7_12 - bool "gdb 7.12.x" - -endchoice - -endif - -# If cross-gdb is not enabled, the latest working version is chosen. -config BR2_GDB_VERSION - string - depends on BR2_PACKAGE_GDB || BR2_PACKAGE_HOST_GDB - default "arc-2016.09-release-gdb" if BR2_arc - default "6be65fb56ea6694a9260733a536a023a1e2d4d57" if BR2_microblaze - default "7.10.1" if BR2_GDB_VERSION_7_10 - default "7.11.1" if BR2_GDB_VERSION_7_11 || !BR2_PACKAGE_HOST_GDB - default "7.12.1" if BR2_GDB_VERSION_7_12 diff --git a/package.bak/gdb/gdb-python-config b/package.bak/gdb/gdb-python-config deleted file mode 100755 index 0f002281d7..0000000000 --- a/package.bak/gdb/gdb-python-config +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# This shell script is used to fake Python. Gdb wants to be passed a -# Python interpreter, to run its own python-config.py program, which -# uses sysconfig. However, when cross-compiling, this doesn't work -# well since we would have to use the host Python, whose sysconfig -# module would return host values. -# -# As recommended at -# https://sourceware.org/gdb/wiki/CrossCompilingWithPythonSupport, -# this wrapper shell script can be used as a replacement. It ignores -# the python-config.py script passed as first arguments, and -# "emulates" its behavior. - -if [ $# -ne 2 ] ; then - echo "Bad # args." >&2 - exit 1 -fi - -# The first argument is the path to python-config.py, ignore it. - -case "$2" in - --includes) - echo "-I${STAGING_DIR}/usr/include/python2.7" - ;; - --ldflags) - echo "-lpthread -ldl -lutil -lm -lpython2.7" - ;; - --exec-prefix) - echo "/usr" - ;; - *) - echo "Bad arg $2." >&2 - exit 1 - ;; -esac diff --git a/package.bak/gdb/gdb.hash b/package.bak/gdb/gdb.hash deleted file mode 100644 index 1e205dbe9e..0000000000 --- a/package.bak/gdb/gdb.hash +++ /dev/null @@ -1,8 +0,0 @@ -# From ftp://gcc.gnu.org/pub/gdb/releases/sha512.sum -sha512 17a5138277a31685a5c2a841cb47ed9bc4626ea617b8ca77750513b300299f4fbbffe504958b5372de610dcb952c679cf8fa9c1bdadd380294fbf59b6e366010 gdb-7.10.1.tar.xz -sha512 f80ec6c8a0f0b54c8b945666e875809174402b7e121efb378ebac931a91f9a1cc0048568f8e2f42ae8ae2392ff8d144c2e51d41c7398935017450aaf29838360 gdb-7.11.1.tar.xz -sha512 0ac8d0a495103611ef41167a08313a010dce6ca4c6d827cbe8558a0c1a1a8a6bfa53f1b7704251289cababbfaaf9e075550cdf741a54d6cd9ca3433d910efcd8 gdb-7.12.1.tar.xz - -# Locally calculated (fetched from Github) -sha512 0a467091d4b01fbecabb4b8da1cb743025c70e7f4874a0b5c8fa2ec623569a39bde6762b91806de0be6e63711aeb6909715cfbe43860de73d8aec6159a9f10a7 gdb-6be65fb56ea6694a9260733a536a023a1e2d4d57.tar.gz -sha512 3b204108821ba687974e61bb47f0ab91621ac233503cec6c82913bcb665a8c0cea0c8b992177b2fb6befade774c2491d94c72a1bf859f9b79d44755be05dcd64 gdb-arc-2016.09-release-gdb.tar.gz diff --git a/package.bak/gdb/gdb.mk b/package.bak/gdb/gdb.mk deleted file mode 100644 index 606f1f9600..0000000000 --- a/package.bak/gdb/gdb.mk +++ /dev/null @@ -1,227 +0,0 @@ -################################################################################ -# -# gdb -# -################################################################################ - -GDB_VERSION = $(call qstrip,$(BR2_GDB_VERSION)) -GDB_SITE = $(BR2_GNU_MIRROR)/gdb -GDB_SOURCE = gdb-$(GDB_VERSION).tar.xz - -ifeq ($(BR2_arc),y) -GDB_SITE = $(call github,foss-for-synopsys-dwc-arc-processors,binutils-gdb,$(GDB_VERSION)) -GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz -GDB_FROM_GIT = y -endif - -ifeq ($(BR2_microblaze),y) -GDB_SITE = $(call github,Xilinx,gdb,$(GDB_VERSION)) -GDB_SOURCE = gdb-$(GDB_VERSION).tar.gz -GDB_FROM_GIT = y -endif - -GDB_LICENSE = GPLv2+, LGPLv2+, GPLv3+, LGPLv3+ -GDB_LICENSE_FILES = COPYING COPYING.LIB COPYING3 COPYING3.LIB - -# We only want gdbserver and not the entire debugger. -ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),) -GDB_SUBDIR = gdb/gdbserver -HOST_GDB_SUBDIR = . -else -GDB_DEPENDENCIES = ncurses \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) -endif - -# For the host variant, we really want to build with XML support, -# which is needed to read XML descriptions of target architectures. We -# also need ncurses. -HOST_GDB_DEPENDENCIES = host-expat host-ncurses - -# Disable building documentation -GDB_MAKE_OPTS += MAKEINFO=true -GDB_INSTALL_TARGET_OPTS += MAKEINFO=true DESTDIR=$(TARGET_DIR) install -HOST_GDB_MAKE_OPTS += MAKEINFO=true -HOST_GDB_INSTALL_OPTS += MAKEINFO=true install - -# Apply the Xtensa specific patches -XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME)) -ifneq ($(XTENSA_CORE_NAME),) -define GDB_XTENSA_PRE_PATCH - tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \ - -C $(@D) --strip-components=1 gdb -endef -GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH -HOST_GDB_PRE_PATCH_HOOKS += GDB_XTENSA_PRE_PATCH -endif - -ifeq ($(GDB_FROM_GIT),y) -GDB_DEPENDENCIES += host-flex host-bison -HOST_GDB_DEPENDENCIES += host-flex host-bison -endif - -# When gdb sources are fetched from the binutils-gdb repository, they -# also contain the binutils sources, but binutils shouldn't be built, -# so we disable it. -GDB_DISABLE_BINUTILS_CONF_OPTS = \ - --disable-binutils \ - --disable-ld \ - --disable-gas - -# Starting with gdb 7.11, the bundled gnulib tries to use -# rpl_gettimeofday (gettimeofday replacement) due to the code being -# unable to determine if the replacement function should be used or -# not when cross-compiling with uClibc or musl as C libraries. So use -# gl_cv_func_gettimeofday_clobber=no to not use rpl_gettimeofday, -# assuming musl and uClibc have a properly working gettimeofday -# implementation. -GDB_CONF_ENV = \ - ac_cv_type_uintptr_t=yes \ - gt_cv_func_gettext_libintl=yes \ - ac_cv_func_dcgettext=yes \ - gdb_cv_func_sigsetjmp=yes \ - bash_cv_func_strcoll_broken=no \ - bash_cv_must_reinstall_sighandlers=no \ - bash_cv_func_sigsetjmp=present \ - bash_cv_have_mbstate_t=yes \ - gdb_cv_func_sigsetjmp=yes \ - gl_cv_func_gettimeofday_clobber=no - -# The shared only build is not supported by gdb, so enable static build for -# build-in libraries with --enable-static. -GDB_CONF_OPTS = \ - --without-uiout \ - --disable-gdbtk \ - --without-x \ - --disable-sim \ - $(GDB_DISABLE_BINUTILS_CONF_OPTS) \ - $(if $(BR2_PACKAGE_GDB_SERVER),--enable-gdbserver) \ - --with-curses \ - --without-included-gettext \ - --disable-werror \ - --enable-static - -# When gdb is built as C++ application for ARC it segfaults at runtime -# So we pass --disable-build-with-cxx config option to force gdb not to -# be built as C++ app. -ifeq ($(BR2_arc),y) -GDB_CONF_OPTS += --disable-build-with-cxx -endif - -# gdb 7.12+ by default builds with a C++ compiler, which doesn't work -# when we don't have C++ support in the toolchain -ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -GDB_CONF_OPTS += --disable-build-with-cxx -endif - -ifeq ($(BR2_PACKAGE_GDB_TUI),y) -GDB_CONF_OPTS += --enable-tui -else -GDB_CONF_OPTS += --disable-tui -endif - -ifeq ($(BR2_PACKAGE_GDB_PYTHON),y) -GDB_CONF_OPTS += --with-python=$(TOPDIR)/package/gdb/gdb-python-config -GDB_DEPENDENCIES += python -else -GDB_CONF_OPTS += --without-python -endif - -ifeq ($(BR2_PACKAGE_EXPAT),y) -GDB_CONF_OPTS += --with-expat -GDB_CONF_OPTS += --with-libexpat-prefix=$(STAGING_DIR)/usr -GDB_DEPENDENCIES += expat -else -GDB_CONF_OPTS += --without-expat -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -GDB_CONF_OPTS += --with-lzma -GDB_CONF_OPTS += --with-liblzma-prefix=$(STAGING_DIR)/usr -GDB_DEPENDENCIES += xz -else -GDB_CONF_OPTS += --without-lzma -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GDB_CONF_OPTS += --with-zlib -GDB_DEPENDENCIES += zlib -else -GDB_CONF_OPTS += --without-zlib -endif - -# This removes some unneeded Python scripts and XML target description -# files that are not useful for a normal usage of the debugger. -define GDB_REMOVE_UNNEEDED_FILES - $(RM) -rf $(TARGET_DIR)/usr/share/gdb -endef - -GDB_POST_INSTALL_TARGET_HOOKS += GDB_REMOVE_UNNEEDED_FILES - -# This installs the gdbserver somewhere into the $(HOST_DIR) so that -# it becomes an integral part of the SDK, if the toolchain generated -# by Buildroot is later used as an external toolchain. We install it -# in debug-root/usr/bin/gdbserver so that it matches what Crosstool-NG -# does. -define GDB_SDK_INSTALL_GDBSERVER - $(INSTALL) -D -m 0755 $(TARGET_DIR)/usr/bin/gdbserver \ - $(HOST_DIR)/usr/$(GNU_TARGET_NAME)/debug-root/usr/bin/gdbserver -endef - -ifeq ($(BR2_PACKAGE_GDB_SERVER),y) -GDB_POST_INSTALL_TARGET_HOOKS += GDB_SDK_INSTALL_GDBSERVER -endif - -# A few notes: -# * --target, because we're doing a cross build rather than a real -# host build. -# * --enable-static because gdb really wants to use libbfd.a -HOST_GDB_CONF_OPTS = \ - --target=$(GNU_TARGET_NAME) \ - --enable-static \ - --without-uiout \ - --disable-gdbtk \ - --without-x \ - --enable-threads \ - --disable-werror \ - --without-included-gettext \ - $(GDB_DISABLE_BINUTILS_CONF_OPTS) - -ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y) -HOST_GDB_CONF_OPTS += --enable-tui -else -HOST_GDB_CONF_OPTS += --disable-tui -endif - -ifeq ($(BR2_PACKAGE_HOST_GDB_PYTHON),y) -HOST_GDB_CONF_OPTS += --with-python=$(HOST_DIR)/usr/bin/python2 -HOST_GDB_DEPENDENCIES += host-python -else -HOST_GDB_CONF_OPTS += --without-python -endif - -# workaround a bug if in-tree build is used for bfin sim -define HOST_GDB_BFIN_SIM_WORKAROUND - $(RM) $(@D)/sim/common/tconfig.h -endef - -ifeq ($(BR2_PACKAGE_HOST_GDB_SIM),y) -HOST_GDB_CONF_OPTS += --enable-sim -ifeq ($(BR2_bfin),y) -HOST_GDB_PRE_CONFIGURE_HOOKS += HOST_GDB_BFIN_SIM_WORKAROUND -endif -else -HOST_GDB_CONF_OPTS += --disable-sim -endif - -# legacy $arch-linux-gdb symlink -define HOST_GDB_ADD_SYMLINK - cd $(HOST_DIR)/usr/bin && \ - ln -snf $(GNU_TARGET_NAME)-gdb $(ARCH)-linux-gdb -endef - -HOST_GDB_POST_INSTALL_HOOKS += HOST_GDB_ADD_SYMLINK - -HOST_GDB_POST_INSTALL_HOOKS += gen_gdbinit_file - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gdbm/Config.in b/package.bak/gdbm/Config.in deleted file mode 100644 index 8ad0fc6ce0..0000000000 --- a/package.bak/gdbm/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GDBM - bool "gdbm" - help - GNU dbm is a set of database routines that use extensible hashing. - It works similar to the standard UNIX dbm routines. - - http://www.gnu.org/software/gdbm/gdbm.html diff --git a/package.bak/gdbm/gdbm.hash b/package.bak/gdbm/gdbm.hash deleted file mode 100644 index 9759d87072..0000000000 --- a/package.bak/gdbm/gdbm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2016-05/msg00009.html -md5 9ce96ff4c99e74295ea19040931c8fb9 gdbm-1.12.tar.gz -sha1 86513e8871bb376bc014e9e5a2d18a8e0a8ea2f5 gdbm-1.12.tar.gz diff --git a/package.bak/gdbm/gdbm.mk b/package.bak/gdbm/gdbm.mk deleted file mode 100644 index 55ece8802a..0000000000 --- a/package.bak/gdbm/gdbm.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# gdbm -# -################################################################################ - -GDBM_VERSION = 1.12 -GDBM_SITE = $(BR2_GNU_MIRROR)/gdbm -GDBM_LICENSE = GPLv3+ -GDBM_LICENSE_FILES = COPYING -GDBM_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -GDBM_DEPENDENCIES += gettext -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gdk-pixbuf/Config.in b/package.bak/gdk-pixbuf/Config.in deleted file mode 100644 index 44942ac4f6..0000000000 --- a/package.bak/gdk-pixbuf/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GDK_PIXBUF - bool "gdk-pixbuf" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Gdk-Pixbuf is an image loader and scaler. It uses GObject - and the GLib, to integrate well with GNOME applications. - - http://www.gtk.org/ - -comment "gdk-pixbuf needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gdk-pixbuf/gdk-pixbuf.hash b/package.bak/gdk-pixbuf/gdk-pixbuf.hash deleted file mode 100644 index 827b386380..0000000000 --- a/package.bak/gdk-pixbuf/gdk-pixbuf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.4.sha256sum -sha256 0b19901c3eb0596141d2d48ddb9dac79ad1524bdf59366af58ab38fcb9ee7463 gdk-pixbuf-2.36.4.tar.xz diff --git a/package.bak/gdk-pixbuf/gdk-pixbuf.mk b/package.bak/gdk-pixbuf/gdk-pixbuf.mk deleted file mode 100644 index 4fe6bd7b7f..0000000000 --- a/package.bak/gdk-pixbuf/gdk-pixbuf.mk +++ /dev/null @@ -1,77 +0,0 @@ -################################################################################ -# -# gdk-pixbuf -# -################################################################################ - -GDK_PIXBUF_VERSION_MAJOR = 2.36 -GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).4 -GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz -GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR) -GDK_PIXBUF_LICENSE = LGPLv2+ -GDK_PIXBUF_LICENSE_FILES = COPYING -GDK_PIXBUF_INSTALL_STAGING = YES -GDK_PIXBUF_DEPENDENCIES = \ - host-gdk-pixbuf host-libglib2 host-pkgconf \ - libglib2 $(if $(BR2_ENABLE_LOCALE),,libiconv) -HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2 - -GDK_PIXBUF_CONF_ENV = \ - ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \ - gio_can_sniff=no - -GDK_PIXBUF_CONF_OPTS = --disable-glibtest - -ifneq ($(BR2_PACKAGE_LIBPNG),y) -GDK_PIXBUF_CONF_OPTS += --without-libpng -else -GDK_PIXBUF_DEPENDENCIES += libpng -endif - -ifneq ($(BR2_PACKAGE_JPEG),y) -HOST_GDK_PIXBUF_CONF_OPTS += --without-libjpeg -GDK_PIXBUF_CONF_OPTS += --without-libjpeg -else -GDK_PIXBUF_DEPENDENCIES += jpeg -HOST_GDK_PIXBUF_DEPENDENCIES += host-libjpeg -endif - -ifneq ($(BR2_PACKAGE_TIFF),y) -GDK_PIXBUF_CONF_OPTS += --without-libtiff -HOST_GDK_PIXBUF_CONF_OPTS += --without-libtiff -else -GDK_PIXBUF_DEPENDENCIES += tiff -GDK_PIXBUF_CONF_ENV += \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" -HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GDK_PIXBUF_CONF_OPTS += --with-x11 -GDK_PIXBUF_DEPENDENCIES += xlib_libX11 -endif - -# gdk-pixbuf requires the loaders.cache file populated to work properly -# Rather than doing so at runtime, since the fs can be read-only, do so -# here after building and installing to target. -# And since the cache file will contain absolute host directory names we -# need to sanitize (strip) them. -ifeq ($(BR2_STATIC_LIBS),) -define GDK_PIXBUF_UPDATE_CACHE - GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders \ - $(HOST_DIR)/usr/bin/gdk-pixbuf-query-loaders \ - > $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache - $(SED) "s,$(HOST_DIR),,g" \ - $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache -endef -GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE -endif - -# Tests don't build correctly with uClibc -define GDK_PIXBUF_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef -GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch b/package.bak/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch deleted file mode 100644 index 755ee9dee2..0000000000 --- a/package.bak/genext2fs/0001-update-genext2fs.c-to-rev-1.118.patch +++ /dev/null @@ -1,2971 +0,0 @@ -[PATCH] update genext2fs.c to CVS rev 1.118 - -See http://genext2fs.cvs.sourceforge.net/viewvc/genext2fs/genext2fs/genext2fs.c?view=log -for details. - -Numerous bugfixes, large file and filesystem support, rev 1 filesystems, -volume id support, block size, .. - -Signed-off-by: Peter Korsgaard ---- - cache.h | 128 ++++ - genext2fs.c | 1870 ++++++++++++++++++++++++++++++++++++++++++------------------ - list.h | 78 ++ - 3 files changed, 1527 insertions(+), 549 deletions(-) - -Index: genext2fs-1.4.1/genext2fs.c -=================================================================== ---- genext2fs-1.4.1.orig/genext2fs.c -+++ genext2fs-1.4.1/genext2fs.c -@@ -53,6 +53,12 @@ - // along with -q, -P, -U - - -+/* -+ * Allow fseeko/off_t to be 64-bit offsets to allow filesystems and -+ * individual files >2GB. -+ */ -+#define _FILE_OFFSET_BITS 64 -+ - #include - #include - -@@ -107,10 +113,8 @@ - - #if HAVE_DIRENT_H - # include --# define NAMLEN(dirent) strlen((dirent)->d_name) - #else - # define dirent direct --# define NAMLEN(dirent) (dirent)->d_namlen - # if HAVE_SYS_NDIR_H - # include - # endif -@@ -144,6 +148,8 @@ - # include - #endif - -+#include "cache.h" -+ - struct stats { - unsigned long nblocks; - unsigned long ninodes; -@@ -151,13 +157,42 @@ - - // block size - --#define BLOCKSIZE 1024 -+static int blocksize = 1024; -+ -+#define SUPERBLOCK_OFFSET 1024 -+#define SUPERBLOCK_SIZE 1024 -+ -+#define BLOCKSIZE blocksize - #define BLOCKS_PER_GROUP 8192 - #define INODES_PER_GROUP 8192 - /* Percentage of blocks that are reserved.*/ - #define RESERVED_BLOCKS 5/100 - #define MAX_RESERVED_BLOCKS 25/100 - -+/* The default value for s_creator_os. */ -+#if defined(__linux__) && defined(EXT2_OS_LINUX) -+#define CREATOR_OS EXT2_OS_LINUX -+#define CREATOR_OS_NAME "linux" -+#else -+#if defined(__GNU__) && defined(EXT2_OS_HURD) -+#define CREATOR_OS EXT2_OS_HURD -+#define CREATOR_OS_NAME "hurd" -+#else -+#if defined(__FreeBSD__) && defined(EXT2_OS_FREEBSD) -+#define CREATOR_OS EXT2_OS_FREEBSD -+#define CREATOR_OS_NAME "freebsd" -+#else -+#if defined(LITES) && defined(EXT2_OS_LITES) -+#define CREATOR_OS EXT2_OS_LITES -+#define CREATOR_OS_NAME "lites" -+#else -+#define CREATOR_OS EXT2_OS_LINUX /* by default */ -+#define CREATOR_OS_NAME "linux" -+#endif /* defined(LITES) && defined(EXT2_OS_LITES) */ -+#endif /* defined(__FreeBSD__) && defined(EXT2_OS_FREEBSD) */ -+#endif /* defined(__GNU__) && defined(EXT2_OS_HURD) */ -+#endif /* defined(__linux__) && defined(EXT2_OS_LINUX) */ -+ - - // inode block size (why is it != BLOCKSIZE ?!?) - /* The field i_blocks in the ext2 inode stores the number of data blocks -@@ -190,6 +225,14 @@ - #define EXT2_TIND_BLOCK 14 // triple indirect block - #define EXT2_INIT_BLOCK 0xFFFFFFFF // just initialized (not really a block address) - -+// codes for operating systems -+ -+#define EXT2_OS_LINUX 0 -+#define EXT2_OS_HURD 1 -+#define EXT2_OS_MASIX 2 -+#define EXT2_OS_FREEBSD 3 -+#define EXT2_OS_LITES 4 -+ - // end of a block walk - - #define WALK_END 0xFFFFFFFE -@@ -227,44 +270,46 @@ - #define FM_IWOTH 0000002 // write - #define FM_IXOTH 0000001 // execute - --// options -- --#define OP_HOLES 0x01 // make files with holes -- - /* Defines for accessing group details */ - - // Number of groups in the filesystem - #define GRP_NBGROUPS(fs) \ -- (((fs)->sb.s_blocks_count - fs->sb.s_first_data_block + \ -- (fs)->sb.s_blocks_per_group - 1) / (fs)->sb.s_blocks_per_group) -+ (((fs)->sb->s_blocks_count - fs->sb->s_first_data_block + \ -+ (fs)->sb->s_blocks_per_group - 1) / (fs)->sb->s_blocks_per_group) - - // Get group block bitmap (bbm) given the group number --#define GRP_GET_GROUP_BBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_block_bitmap) ) -+#define GRP_GET_GROUP_BBM(fs,grp,bi) (get_blk((fs),(grp)->bg_block_bitmap,(bi))) -+#define GRP_PUT_GROUP_BBM(bi) ( put_blk((bi)) ) - - // Get group inode bitmap (ibm) given the group number --#define GRP_GET_GROUP_IBM(fs,grp) ( get_blk((fs),(fs)->gd[(grp)].bg_inode_bitmap) ) -- -+#define GRP_GET_GROUP_IBM(fs,grp,bi) (get_blk((fs), (grp)->bg_inode_bitmap,(bi))) -+#define GRP_PUT_GROUP_IBM(bi) ( put_blk((bi)) ) -+ - // Given an inode number find the group it belongs to --#define GRP_GROUP_OF_INODE(fs,nod) ( ((nod)-1) / (fs)->sb.s_inodes_per_group) -+#define GRP_GROUP_OF_INODE(fs,nod) ( ((nod)-1) / (fs)->sb->s_inodes_per_group) - - //Given an inode number get the inode bitmap that covers it --#define GRP_GET_INODE_BITMAP(fs,nod) \ -- ( GRP_GET_GROUP_IBM((fs),GRP_GROUP_OF_INODE((fs),(nod))) ) -+#define GRP_GET_INODE_BITMAP(fs,nod,bi,gi) \ -+ ( GRP_GET_GROUP_IBM((fs),get_gd(fs,GRP_GROUP_OF_INODE((fs),(nod)),gi),bi) ) -+#define GRP_PUT_INODE_BITMAP(bi,gi) \ -+ ( GRP_PUT_GROUP_IBM((bi)),put_gd((gi)) ) - - //Given an inode number find its offset within the inode bitmap that covers it - #define GRP_IBM_OFFSET(fs,nod) \ -- ( (nod) - GRP_GROUP_OF_INODE((fs),(nod))*(fs)->sb.s_inodes_per_group ) -+ ( (nod) - GRP_GROUP_OF_INODE((fs),(nod))*(fs)->sb->s_inodes_per_group ) - - // Given a block number find the group it belongs to --#define GRP_GROUP_OF_BLOCK(fs,blk) ( ((blk)-1) / (fs)->sb.s_blocks_per_group) -+#define GRP_GROUP_OF_BLOCK(fs,blk) ( ((blk)-1) / (fs)->sb->s_blocks_per_group) - --//Given a block number get the block bitmap that covers it --#define GRP_GET_BLOCK_BITMAP(fs,blk) \ -- ( GRP_GET_GROUP_BBM((fs),GRP_GROUP_OF_BLOCK((fs),(blk))) ) -+//Given a block number get/put the block bitmap that covers it -+#define GRP_GET_BLOCK_BITMAP(fs,blk,bi,gi) \ -+ ( GRP_GET_GROUP_BBM((fs),get_gd(fs,GRP_GROUP_OF_BLOCK((fs),(blk)),(gi)),(bi)) ) -+#define GRP_PUT_BLOCK_BITMAP(bi,gi) \ -+ ( GRP_PUT_GROUP_BBM((bi)),put_gd((gi)) ) - - //Given a block number find its offset within the block bitmap that covers it - #define GRP_BBM_OFFSET(fs,blk) \ -- ( (blk) - GRP_GROUP_OF_BLOCK((fs),(blk))*(fs)->sb.s_blocks_per_group ) -+ ( (blk) - GRP_GROUP_OF_BLOCK((fs),(blk))*(fs)->sb->s_blocks_per_group ) - - - // used types -@@ -286,7 +331,9 @@ - // older solaris. Note that this is still not very portable, in that - // the return value cannot be trusted. - --#if SCANF_CAN_MALLOC -+#if 0 // SCANF_CAN_MALLOC -+// C99 define "a" for floating point, so you can have runtime surprise -+// according the library versions - # define SCANF_PREFIX "a" - # define SCANF_STRING(s) (&s) - #else -@@ -430,6 +477,17 @@ - ((val<<8)&0xFF0000) | (val<<24)); - } - -+static inline int -+is_blk_empty(uint8 *b) -+{ -+ uint32 i; -+ uint32 *v = (uint32 *) b; -+ -+ for(i = 0; i < BLOCKSIZE / 4; i++) -+ if (*v++) -+ return 0; -+ return 1; -+} - - // on-disk structures - // this trick makes me declare things only once -@@ -460,7 +518,22 @@ - udecl32(s_creator_os) /* Indicator of which OS created the filesystem */ \ - udecl32(s_rev_level) /* The revision level of the filesystem */ \ - udecl16(s_def_resuid) /* The default uid for reserved blocks */ \ -- udecl16(s_def_resgid) /* The default gid for reserved blocks */ -+ udecl16(s_def_resgid) /* The default gid for reserved blocks */ \ -+ /* rev 1 version fields start here */ \ -+ udecl32(s_first_ino) /* First non-reserved inode */ \ -+ udecl16(s_inode_size) /* size of inode structure */ \ -+ udecl16(s_block_group_nr) /* block group # of this superblock */ \ -+ udecl32(s_feature_compat) /* compatible feature set */ \ -+ udecl32(s_feature_incompat) /* incompatible feature set */ \ -+ udecl32(s_feature_ro_compat) /* readonly-compatible feature set */ \ -+ utdecl8(s_uuid,16) /* 128-bit uuid for volume */ \ -+ utdecl8(s_volume_name,16) /* volume name */ \ -+ utdecl8(s_last_mounted,64) /* directory where last mounted */ \ -+ udecl32(s_algorithm_usage_bitmap) /* For compression */ -+ -+#define EXT2_GOOD_OLD_FIRST_INO 11 -+#define EXT2_GOOD_OLD_INODE_SIZE 128 -+#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE 0x0002 - - #define groupdescriptor_decl \ - udecl32(bg_block_bitmap) /* Block number of the block bitmap */ \ -@@ -500,6 +573,7 @@ - - #define decl8(x) int8 x; - #define udecl8(x) uint8 x; -+#define utdecl8(x,n) uint8 x[n]; - #define decl16(x) int16 x; - #define udecl16(x) uint16 x; - #define decl32(x) int32 x; -@@ -509,7 +583,7 @@ - typedef struct - { - superblock_decl -- uint32 s_reserved[235]; // Reserved -+ uint32 s_reserved[205]; // Reserved - } superblock; - - typedef struct -@@ -527,10 +601,9 @@ - typedef struct - { - directory_decl -- char d_name[0]; - } directory; - --typedef uint8 block[BLOCKSIZE]; -+typedef uint8 *block; - - /* blockwalker fields: - The blockwalker is used to access all the blocks of a file (including -@@ -567,23 +640,41 @@ - uint32 bptind; - } blockwalker; - -+#define HDLINK_CNT 16 -+struct hdlink_s -+{ -+ uint32 src_inode; -+ uint32 dst_nod; -+}; -+ -+struct hdlinks_s -+{ -+ int32 count; -+ struct hdlink_s *hdl; -+}; - - /* Filesystem structure that support groups */ --#if BLOCKSIZE == 1024 - typedef struct - { -- block zero; // The famous block 0 -- superblock sb; // The superblock -- groupdescriptor gd[0]; // The group descriptors -+ FILE *f; -+ superblock *sb; -+ int swapit; -+ int32 hdlink_cnt; -+ struct hdlinks_s hdlinks; -+ -+ int holes; -+ -+ listcache blks; -+ listcache gds; -+ listcache inodes; -+ listcache blkmaps; - } filesystem; --#else --#error UNHANDLED BLOCKSIZE --#endif - - // now the endianness swap - - #undef decl8 - #undef udecl8 -+#undef utdecl8 - #undef decl16 - #undef udecl16 - #undef decl32 -@@ -592,28 +683,13 @@ - - #define decl8(x) - #define udecl8(x) -+#define utdecl8(x,n) - #define decl16(x) this->x = swab16(this->x); - #define udecl16(x) this->x = swab16(this->x); - #define decl32(x) this->x = swab32(this->x); - #define udecl32(x) this->x = swab32(this->x); - #define utdecl32(x,n) { int i; for(i=0; ix[i] = swab32(this->x[i]); } - --#define HDLINK_CNT 16 --static int32 hdlink_cnt = HDLINK_CNT; --struct hdlink_s --{ -- uint32 src_inode; -- uint32 dst_nod; --}; -- --struct hdlinks_s --{ -- int32 count; -- struct hdlink_s *hdl; --}; -- --static struct hdlinks_s hdlinks; -- - static void - swap_sb(superblock *sb) - { -@@ -633,9 +709,24 @@ - static void - swap_nod(inode *nod) - { -+ uint32 nblk; -+ - #define this nod - inode_decl - #undef this -+ -+ // block and character inodes store the major and minor in the -+ // i_block, so we need to unswap to get those. Also, if it's -+ // zero iblocks, put the data back like it belongs. -+ nblk = nod->i_blocks / INOBLK; -+ if ((nod->i_size && !nblk) -+ || ((nod->i_mode & FM_IFBLK) == FM_IFBLK) -+ || ((nod->i_mode & FM_IFCHR) == FM_IFCHR)) -+ { -+ int i; -+ for(i = 0; i <= EXT2_TIND_BLOCK; i++) -+ nod->i_block[i] = swab32(nod->i_block[i]); -+ } - } - - static void -@@ -657,6 +748,7 @@ - - #undef decl8 - #undef udecl8 -+#undef utdecl8 - #undef decl16 - #undef udecl16 - #undef decl32 -@@ -770,15 +862,15 @@ - } - - int --is_hardlink(ino_t inode) -+is_hardlink(filesystem *fs, ino_t inode) - { - int i; - -- for(i = 0; i < hdlinks.count; i++) { -- if(hdlinks.hdl[i].src_inode == inode) -+ for(i = 0; i < fs->hdlinks.count; i++) { -+ if(fs->hdlinks.hdl[i].src_inode == inode) - return i; - } -- return -1; -+ return -1; - } - - // printf helper macro -@@ -789,6 +881,8 @@ - get_workblk(void) - { - unsigned char* b=calloc(1,BLOCKSIZE); -+ if (!b) -+ error_msg_and_die("get_workblk() failed, out of memory"); - return b; - } - static inline void -@@ -811,24 +905,464 @@ - return b[(item-1) / 8] & (1 << ((item-1) % 8)); - } - --// return a given block from a filesystem -+// Used by get_blk/put_blk to hold information about a block owned -+// by the user. -+typedef struct -+{ -+ cache_link link; -+ -+ filesystem *fs; -+ uint32 blk; -+ uint8 *b; -+ uint32 usecount; -+} blk_info; -+ -+#define MAX_FREE_CACHE_BLOCKS 100 -+ -+static uint32 -+blk_elem_val(cache_link *elem) -+{ -+ blk_info *bi = container_of(elem, blk_info, link); -+ return bi->blk; -+} -+ -+static void -+blk_freed(cache_link *elem) -+{ -+ blk_info *bi = container_of(elem, blk_info, link); -+ -+ if (fseeko(bi->fs->f, ((off_t) bi->blk) * BLOCKSIZE, SEEK_SET)) -+ perror_msg_and_die("fseek"); -+ if (fwrite(bi->b, BLOCKSIZE, 1, bi->fs->f) != 1) -+ perror_msg_and_die("get_blk: write"); -+ free(bi->b); -+ free(bi); -+} -+ -+// Return a given block from a filesystem. Make sure to call -+// put_blk when you are done with it. - static inline uint8 * --get_blk(filesystem *fs, uint32 blk) -+get_blk(filesystem *fs, uint32 blk, blk_info **rbi) - { -- return (uint8*)fs + blk*BLOCKSIZE; -+ cache_link *curr; -+ blk_info *bi; -+ -+ if (blk >= fs->sb->s_blocks_count) -+ error_msg_and_die("Internal error, block out of range"); -+ -+ curr = cache_find(&fs->blks, blk); -+ if (curr) { -+ bi = container_of(curr, blk_info, link); -+ bi->usecount++; -+ goto out; -+ } -+ -+ bi = malloc(sizeof(*bi)); -+ if (!bi) -+ error_msg_and_die("get_blk: out of memory"); -+ bi->fs = fs; -+ bi->blk = blk; -+ bi->usecount = 1; -+ bi->b = malloc(BLOCKSIZE); -+ if (!bi->b) -+ error_msg_and_die("get_blk: out of memory"); -+ cache_add(&fs->blks, &bi->link); -+ if (fseeko(fs->f, ((off_t) blk) * BLOCKSIZE, SEEK_SET)) -+ perror_msg_and_die("fseek"); -+ if (fread(bi->b, BLOCKSIZE, 1, fs->f) != 1) { -+ if (ferror(fs->f)) -+ perror_msg_and_die("fread"); -+ memset(bi->b, 0, BLOCKSIZE); -+ } -+ -+out: -+ *rbi = bi; -+ return bi->b; - } - - // return a given inode from a filesystem --static inline inode * --get_nod(filesystem *fs, uint32 nod) -+static inline void -+put_blk(blk_info *bi) -+{ -+ if (bi->usecount == 0) -+ error_msg_and_die("Internal error: put_blk usecount zero"); -+ bi->usecount--; -+ if (bi->usecount == 0) -+ /* Free happens in the cache code */ -+ cache_item_set_unused(&bi->fs->blks, &bi->link); -+} -+ -+typedef struct - { -- int grp,offset; -+ cache_link link; -+ -+ filesystem *fs; -+ int gds; -+ blk_info *bi; -+ groupdescriptor *gd; -+ uint32 usecount; -+} gd_info; -+ -+#define MAX_FREE_CACHE_GDS 100 -+ -+static uint32 -+gd_elem_val(cache_link *elem) -+{ -+ gd_info *gi = container_of(elem, gd_info, link); -+ return gi->gds; -+} -+ -+static void -+gd_freed(cache_link *elem) -+{ -+ gd_info *gi = container_of(elem, gd_info, link); -+ -+ if (gi->fs->swapit) -+ swap_gd(gi->gd); -+ put_blk(gi->bi); -+ free(gi); -+} -+ -+#define GDS_START ((SUPERBLOCK_OFFSET + SUPERBLOCK_SIZE + BLOCKSIZE - 1) / BLOCKSIZE) -+#define GDS_PER_BLOCK (BLOCKSIZE / sizeof(groupdescriptor)) -+// the group descriptors are aligned on the block size -+static inline groupdescriptor * -+get_gd(filesystem *fs, uint32 no, gd_info **rgi) -+{ -+ uint32 gdblk; -+ uint32 offset; -+ gd_info *gi; -+ cache_link *curr; -+ -+ curr = cache_find(&fs->gds, no); -+ if (curr) { -+ gi = container_of(curr, gd_info, link); -+ gi->usecount++; -+ goto out; -+ } -+ -+ gi = malloc(sizeof(*gi)); -+ if (!gi) -+ error_msg_and_die("get_gd: out of memory"); -+ gi->fs = fs; -+ gi->gds = no; -+ gi->usecount = 1; -+ gdblk = GDS_START + (no / GDS_PER_BLOCK); -+ offset = no % GDS_PER_BLOCK; -+ gi->gd = ((groupdescriptor *) get_blk(fs, gdblk, &gi->bi)) + offset; -+ cache_add(&fs->gds, &gi->link); -+ if (fs->swapit) -+ swap_gd(gi->gd); -+ out: -+ *rgi = gi; -+ -+ return gi->gd; -+} -+ -+static inline void -+put_gd(gd_info *gi) -+{ -+ if (gi->usecount == 0) -+ error_msg_and_die("Internal error: put_gd usecount zero"); -+ -+ gi->usecount--; -+ if (gi->usecount == 0) -+ /* Free happens in the cache code */ -+ cache_item_set_unused(&gi->fs->gds, &gi->link); -+} -+ -+// Used by get_blkmap/put_blkmap to hold information about an block map -+// owned by the user. -+typedef struct -+{ -+ cache_link link; -+ -+ filesystem *fs; -+ uint32 blk; -+ uint8 *b; -+ blk_info *bi; -+ uint32 usecount; -+} blkmap_info; -+ -+#define MAX_FREE_CACHE_BLOCKMAPS 100 -+ -+static uint32 -+blkmap_elem_val(cache_link *elem) -+{ -+ blkmap_info *bmi = container_of(elem, blkmap_info, link); -+ return bmi->blk; -+} -+ -+static void -+blkmap_freed(cache_link *elem) -+{ -+ blkmap_info *bmi = container_of(elem, blkmap_info, link); -+ -+ if (bmi->fs->swapit) -+ swap_block(bmi->b); -+ put_blk(bmi->bi); -+ free(bmi); -+} -+ -+// Return a given block map from a filesystem. Make sure to call -+// put_blkmap when you are done with it. -+static inline uint32 * -+get_blkmap(filesystem *fs, uint32 blk, blkmap_info **rbmi) -+{ -+ blkmap_info *bmi; -+ cache_link *curr; -+ -+ curr = cache_find(&fs->blkmaps, blk); -+ if (curr) { -+ bmi = container_of(curr, blkmap_info, link); -+ bmi->usecount++; -+ goto out; -+ } -+ -+ bmi = malloc(sizeof(*bmi)); -+ if (!bmi) -+ error_msg_and_die("get_blkmap: out of memory"); -+ bmi->fs = fs; -+ bmi->blk = blk; -+ bmi->b = get_blk(fs, blk, &bmi->bi); -+ bmi->usecount = 1; -+ cache_add(&fs->blkmaps, &bmi->link); -+ -+ if (fs->swapit) -+ swap_block(bmi->b); -+ out: -+ *rbmi = bmi; -+ return (uint32 *) bmi->b; -+} -+ -+static inline void -+put_blkmap(blkmap_info *bmi) -+{ -+ if (bmi->usecount == 0) -+ error_msg_and_die("Internal error: put_blkmap usecount zero"); -+ -+ bmi->usecount--; -+ if (bmi->usecount == 0) -+ /* Free happens in the cache code */ -+ cache_item_set_unused(&bmi->fs->blkmaps, &bmi->link); -+} -+ -+// Used by get_nod/put_nod to hold information about an inode owned -+// by the user. -+typedef struct -+{ -+ cache_link link; -+ -+ filesystem *fs; -+ uint32 nod; -+ uint8 *b; -+ blk_info *bi; - inode *itab; -+ uint32 usecount; -+} nod_info; -+ -+#define MAX_FREE_CACHE_INODES 100 -+ -+static uint32 -+inode_elem_val(cache_link *elem) -+{ -+ nod_info *ni = container_of(elem, nod_info, link); -+ return ni->nod; -+} -+ -+static void -+inode_freed(cache_link *elem) -+{ -+ nod_info *ni = container_of(elem, nod_info, link); -+ -+ if (ni->fs->swapit) -+ swap_nod(ni->itab); -+ put_blk(ni->bi); -+ free(ni); -+} -+ -+#define INODES_PER_BLOCK (BLOCKSIZE / sizeof(inode)) - -- offset = GRP_IBM_OFFSET(fs,nod); -+// return a given inode from a filesystem -+static inline inode * -+get_nod(filesystem *fs, uint32 nod, nod_info **rni) -+{ -+ uint32 grp, boffset, offset; -+ cache_link *curr; -+ groupdescriptor *gd; -+ gd_info *gi; -+ nod_info *ni; -+ -+ curr = cache_find(&fs->inodes, nod); -+ if (curr) { -+ ni = container_of(curr, nod_info, link); -+ ni->usecount++; -+ goto out; -+ } -+ -+ ni = malloc(sizeof(*ni)); -+ if (!ni) -+ error_msg_and_die("get_nod: out of memory"); -+ ni->fs = fs; -+ ni->nod = nod; -+ ni->usecount = 1; -+ cache_add(&fs->inodes, &ni->link); -+ -+ offset = GRP_IBM_OFFSET(fs,nod) - 1; -+ boffset = offset / INODES_PER_BLOCK; -+ offset %= INODES_PER_BLOCK; - grp = GRP_GROUP_OF_INODE(fs,nod); -- itab = (inode *)get_blk(fs, fs->gd[grp].bg_inode_table); -- return itab+offset-1; -+ gd = get_gd(fs, grp, &gi); -+ ni->b = get_blk(fs, gd->bg_inode_table + boffset, &ni->bi); -+ ni->itab = ((inode *) ni->b) + offset; -+ if (fs->swapit) -+ swap_nod(ni->itab); -+ put_gd(gi); -+ out: -+ *rni = ni; -+ return ni->itab; -+} -+ -+static inline void -+put_nod(nod_info *ni) -+{ -+ if (ni->usecount == 0) -+ error_msg_and_die("Internal error: put_nod usecount zero"); -+ -+ ni->usecount--; -+ if (ni->usecount == 0) -+ /* Free happens in the cache code */ -+ cache_item_set_unused(&ni->fs->inodes, &ni->link); -+} -+ -+// Used to hold state information while walking a directory inode. -+typedef struct -+{ -+ directory d; -+ filesystem *fs; -+ uint32 nod; -+ directory *last_d; -+ uint8 *b; -+ blk_info *bi; -+} dirwalker; -+ -+// Start a directory walk on the given inode. You must pass in a -+// dirwalker structure, then use that dirwalker for future operations. -+// Call put_dir when you are done walking the directory. -+static inline directory * -+get_dir(filesystem *fs, uint32 nod, dirwalker *dw) -+{ -+ dw->fs = fs; -+ dw->b = get_blk(fs, nod, &dw->bi); -+ dw->nod = nod; -+ dw->last_d = (directory *) dw->b; -+ -+ memcpy(&dw->d, dw->last_d, sizeof(directory)); -+ if (fs->swapit) -+ swap_dir(&dw->d); -+ return &dw->d; -+} -+ -+// Move to the next directory. -+static inline directory * -+next_dir(dirwalker *dw) -+{ -+ directory *next_d = (directory *)((int8*)dw->last_d + dw->d.d_rec_len); -+ -+ if (dw->fs->swapit) -+ swap_dir(&dw->d); -+ memcpy(dw->last_d, &dw->d, sizeof(directory)); -+ -+ if (((int8 *) next_d) >= ((int8 *) dw->b + BLOCKSIZE)) -+ return NULL; -+ -+ dw->last_d = next_d; -+ memcpy(&dw->d, next_d, sizeof(directory)); -+ if (dw->fs->swapit) -+ swap_dir(&dw->d); -+ return &dw->d; -+} -+ -+// Call then when you are done with the directory walk. -+static inline void -+put_dir(dirwalker *dw) -+{ -+ if (dw->fs->swapit) -+ swap_dir(&dw->d); -+ memcpy(dw->last_d, &dw->d, sizeof(directory)); -+ -+ if (dw->nod == 0) -+ free_workblk(dw->b); -+ else -+ put_blk(dw->bi); -+} -+ -+// Create a new directory block with the given inode as it's destination -+// and append it to the current dirwalker. -+static directory * -+new_dir(filesystem *fs, uint32 dnod, const char *name, int nlen, dirwalker *dw) -+{ -+ directory *d; -+ -+ dw->fs = fs; -+ dw->b = get_workblk(); -+ dw->nod = 0; -+ dw->last_d = (directory *) dw->b; -+ d = &dw->d; -+ d->d_inode = dnod; -+ d->d_rec_len = BLOCKSIZE; -+ d->d_name_len = nlen; -+ strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen); -+ return d; -+} -+ -+// Shrink the current directory entry, make a new one with the free -+// space, and return the new directory entry (making it current). -+static inline directory * -+shrink_dir(dirwalker *dw, uint32 nod, const char *name, int nlen) -+{ -+ int reclen, preclen; -+ directory *d = &dw->d; -+ -+ reclen = d->d_rec_len; -+ d->d_rec_len = sizeof(directory) + rndup(d->d_name_len, 4); -+ preclen = d->d_rec_len; -+ reclen -= preclen; -+ if (dw->fs->swapit) -+ swap_dir(&dw->d); -+ memcpy(dw->last_d, &dw->d, sizeof(directory)); -+ -+ dw->last_d = (directory *) (((int8 *) dw->last_d) + preclen); -+ d->d_rec_len = reclen; -+ d->d_inode = nod; -+ d->d_name_len = nlen; -+ strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen); -+ -+ return d; -+} -+ -+// Return the current block the directory is walking -+static inline uint8 * -+dir_data(dirwalker *dw) -+{ -+ return dw->b; -+} -+ -+// Return the pointer to the name for the current directory -+static inline char * -+dir_name(dirwalker *dw) -+{ -+ return ((char *) dw->last_d) + sizeof(directory); -+} -+ -+// Set the name for the current directory. Note that this doesn't -+// verify that there is space for the directory name, you must do -+// that yourself. -+static void -+dir_set_name(dirwalker *dw, const char *name, int nlen) -+{ -+ dw->d.d_name_len = nlen; -+ strncpy(((char *) dw->last_d) + sizeof(directory), name, nlen); - } - - // allocate a given block/inode in the bitmap -@@ -870,21 +1404,34 @@ - { - uint32 bk=0; - uint32 grp,nbgroups; -+ blk_info *bi; -+ groupdescriptor *gd; -+ gd_info *gi; - - grp = GRP_GROUP_OF_INODE(fs,nod); - nbgroups = GRP_NBGROUPS(fs); -- if(!(bk = allocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), 0))) { -- for(grp=0;grpgd[grp].bg_block_bitmap),0); -+ gd = get_gd(fs, grp, &gi); -+ bk = allocate(GRP_GET_GROUP_BBM(fs, gd, &bi), 0); -+ GRP_PUT_GROUP_BBM(bi); -+ put_gd(gi); -+ if (!bk) { -+ for (grp=0; grpgd[grp].bg_free_blocks_count--)) -+ gd = get_gd(fs, grp, &gi); -+ if(!(gd->bg_free_blocks_count--)) - error_msg_and_die("group descr %d. free blocks count == 0 (corrupted fs?)",grp); -- if(!(fs->sb.s_free_blocks_count--)) -+ put_gd(gi); -+ if(!(fs->sb->s_free_blocks_count--)) - error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)"); -- return fs->sb.s_blocks_per_group*grp + bk; -+ return fs->sb->s_first_data_block + fs->sb->s_blocks_per_group*grp + (bk-1); - } - - // free a block -@@ -892,12 +1439,18 @@ - free_blk(filesystem *fs, uint32 bk) - { - uint32 grp; -- -- grp = bk / fs->sb.s_blocks_per_group; -- bk %= fs->sb.s_blocks_per_group; -- deallocate(get_blk(fs,fs->gd[grp].bg_block_bitmap), bk); -- fs->gd[grp].bg_free_blocks_count++; -- fs->sb.s_free_blocks_count++; -+ blk_info *bi; -+ gd_info *gi; -+ groupdescriptor *gd; -+ -+ grp = bk / fs->sb->s_blocks_per_group; -+ bk %= fs->sb->s_blocks_per_group; -+ gd = get_gd(fs, grp, &gi); -+ deallocate(GRP_GET_GROUP_BBM(fs, gd, &bi), bk); -+ GRP_PUT_GROUP_BBM(bi); -+ gd->bg_free_blocks_count++; -+ put_gd(gi); -+ fs->sb->s_free_blocks_count++; - } - - // allocate an inode -@@ -906,6 +1459,9 @@ - { - uint32 nod,best_group=0; - uint32 grp,nbgroups,avefreei; -+ blk_info *bi; -+ gd_info *gi, *bestgi; -+ groupdescriptor *gd, *bestgd; - - nbgroups = GRP_NBGROUPS(fs); - -@@ -914,22 +1470,32 @@ - /* find the one with the most free blocks and allocate node there */ - /* Idea from find_group_dir in fs/ext2/ialloc.c in 2.4.19 kernel */ - /* We do it for all inodes. */ -- avefreei = fs->sb.s_free_inodes_count / nbgroups; -+ avefreei = fs->sb->s_free_inodes_count / nbgroups; -+ bestgd = get_gd(fs, best_group, &bestgi); - for(grp=0; grpgd[grp].bg_free_inodes_count < avefreei || -- fs->gd[grp].bg_free_inodes_count == 0) -+ gd = get_gd(fs, grp, &gi); -+ if (gd->bg_free_inodes_count < avefreei || -+ gd->bg_free_inodes_count == 0) { -+ put_gd(gi); - continue; -- if (!best_group || -- fs->gd[grp].bg_free_blocks_count > fs->gd[best_group].bg_free_blocks_count) -+ } -+ if (!best_group || gd->bg_free_blocks_count > bestgd->bg_free_blocks_count) { -+ put_gd(bestgi); - best_group = grp; -+ bestgd = gd; -+ bestgi = gi; -+ } else -+ put_gd(gi); - } -- if (!(nod = allocate(get_blk(fs,fs->gd[best_group].bg_inode_bitmap),0))) -+ if (!(nod = allocate(GRP_GET_GROUP_IBM(fs, bestgd, &bi), 0))) - error_msg_and_die("couldn't allocate an inode (no free inode)"); -- if(!(fs->gd[best_group].bg_free_inodes_count--)) -+ GRP_PUT_GROUP_IBM(bi); -+ if(!(bestgd->bg_free_inodes_count--)) - error_msg_and_die("group descr. free blocks count == 0 (corrupted fs?)"); -- if(!(fs->sb.s_free_inodes_count--)) -+ put_gd(bestgi); -+ if(!(fs->sb->s_free_inodes_count--)) - error_msg_and_die("superblock free blocks count == 0 (corrupted fs?)"); -- return fs->sb.s_inodes_per_group*best_group+nod; -+ return fs->sb->s_inodes_per_group*best_group+nod; - } - - // print a bitmap allocation -@@ -962,30 +1528,40 @@ - // used after being freed, so once you start - // freeing blocks don't stop until the end of - // the file. moreover, i_blocks isn't updated. --// in fact, don't do that, just use extend_blk - // if hole!=0, create a hole in the file - static uint32 - walk_bw(filesystem *fs, uint32 nod, blockwalker *bw, int32 *create, uint32 hole) - { - uint32 *bkref = 0; -+ uint32 bk = 0; -+ blkmap_info *bmi1 = NULL, *bmi2 = NULL, *bmi3 = NULL; - uint32 *b; - int extend = 0, reduce = 0; -+ inode *inod; -+ nod_info *ni; -+ uint32 *iblk; -+ - if(create && (*create) < 0) - reduce = 1; -- if(bw->bnum >= get_nod(fs, nod)->i_blocks / INOBLK) -+ inod = get_nod(fs, nod, &ni); -+ if(bw->bnum >= inod->i_blocks / INOBLK) - { - if(create && (*create) > 0) - { - (*create)--; - extend = 1; - } -- else -+ else -+ { -+ put_nod(ni); - return WALK_END; -+ } - } -+ iblk = inod->i_block; - // first direct block - if(bw->bpdir == EXT2_INIT_BLOCK) - { -- bkref = &get_nod(fs, nod)->i_block[bw->bpdir = 0]; -+ bkref = &iblk[bw->bpdir = 0]; - if(extend) // allocate first block - *bkref = hole ? 0 : alloc_blk(fs,nod); - if(reduce) // free first block -@@ -994,7 +1570,7 @@ - // direct block - else if(bw->bpdir < EXT2_NDIR_BLOCKS) - { -- bkref = &get_nod(fs, nod)->i_block[++bw->bpdir]; -+ bkref = &iblk[++bw->bpdir]; - if(extend) // allocate block - *bkref = hole ? 0 : alloc_blk(fs,nod); - if(reduce) // free block -@@ -1007,10 +1583,10 @@ - bw->bpdir = EXT2_IND_BLOCK; - bw->bpind = 0; - if(extend) // allocate indirect block -- get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod); -+ iblk[bw->bpdir] = alloc_blk(fs,nod); - if(reduce) // free indirect block -- free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ free_blk(fs, iblk[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - bkref = &b[bw->bpind]; - if(extend) // allocate first block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1021,7 +1597,7 @@ - else if((bw->bpdir == EXT2_IND_BLOCK) && (bw->bpind < BLOCKSIZE/4 - 1)) - { - bw->bpind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - bkref = &b[bw->bpind]; - if(extend) // allocate block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1036,15 +1612,15 @@ - bw->bpind = 0; - bw->bpdind = 0; - if(extend) // allocate double indirect block -- get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod); -+ iblk[bw->bpdir] = alloc_blk(fs,nod); - if(reduce) // free double indirect block -- free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ free_blk(fs, iblk[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - if(extend) // allocate first indirect block - b[bw->bpind] = alloc_blk(fs,nod); - if(reduce) // free firstindirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - bkref = &b[bw->bpdind]; - if(extend) // allocate first block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1055,8 +1631,8 @@ - else if((bw->bpdir == EXT2_DIND_BLOCK) && (bw->bpdind < BLOCKSIZE/4 - 1)) - { - bw->bpdind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - bkref = &b[bw->bpdind]; - if(extend) // allocate block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1069,12 +1645,12 @@ - bw->bnum++; - bw->bpdind = 0; - bw->bpind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - if(extend) // allocate indirect block - b[bw->bpind] = alloc_blk(fs,nod); - if(reduce) // free indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - bkref = &b[bw->bpdind]; - if(extend) // allocate first block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1094,20 +1670,20 @@ - bw->bpdind = 0; - bw->bptind = 0; - if(extend) // allocate triple indirect block -- get_nod(fs, nod)->i_block[bw->bpdir] = alloc_blk(fs,nod); -+ iblk[bw->bpdir] = alloc_blk(fs,nod); - if(reduce) // free triple indirect block -- free_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ free_blk(fs, iblk[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - if(extend) // allocate first double indirect block - b[bw->bpind] = alloc_blk(fs,nod); - if(reduce) // free first double indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - if(extend) // allocate first indirect block - b[bw->bpdind] = alloc_blk(fs,nod); - if(reduce) // free first indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpdind]); -+ b = get_blkmap(fs, b[bw->bpdind], &bmi3); - bkref = &b[bw->bptind]; - if(extend) // allocate first data block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1121,9 +1697,9 @@ - (bw->bptind < BLOCKSIZE/4 -1) ) - { - bw->bptind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpdind]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); -+ b = get_blkmap(fs, b[bw->bpdind], &bmi3); - bkref = &b[bw->bptind]; - if(extend) // allocate data block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1140,13 +1716,13 @@ - bw->bnum++; - bw->bptind = 0; - bw->bpdind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - if(extend) // allocate single indirect block - b[bw->bpdind] = alloc_blk(fs,nod); - if(reduce) // free indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpdind]); -+ b = get_blkmap(fs, b[bw->bpdind], &bmi3); - bkref = &b[bw->bptind]; - if(extend) // allocate first data block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1163,17 +1739,17 @@ - bw->bpdind = 0; - bw->bptind = 0; - bw->bpind++; -- b = (uint32*)get_blk(fs, get_nod(fs, nod)->i_block[bw->bpdir]); -+ b = get_blkmap(fs, iblk[bw->bpdir], &bmi1); - if(extend) // allocate double indirect block - b[bw->bpind] = alloc_blk(fs,nod); - if(reduce) // free double indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpind]); -+ b = get_blkmap(fs, b[bw->bpind], &bmi2); - if(extend) // allocate single indirect block - b[bw->bpdind] = alloc_blk(fs,nod); - if(reduce) // free indirect block - free_blk(fs, b[bw->bpind]); -- b = (uint32*)get_blk(fs, b[bw->bpdind]); -+ b = get_blkmap(fs, b[bw->bpdind], &bmi3); - bkref = &b[bw->bptind]; - if(extend) // allocate first block - *bkref = hole ? 0 : alloc_blk(fs,nod); -@@ -1184,56 +1760,105 @@ - error_msg_and_die("file too big !"); - /* End change for walking triple indirection */ - -- if(*bkref) -- { -+ bk = *bkref; -+ if (bmi3) -+ put_blkmap(bmi3); -+ if (bmi2) -+ put_blkmap(bmi2); -+ if (bmi1) -+ put_blkmap(bmi1); -+ -+ if(bk) -+ { -+ blk_info *bi; -+ gd_info *gi; -+ uint8 *block; - bw->bnum++; -- if(!reduce && !allocated(GRP_GET_BLOCK_BITMAP(fs,*bkref), GRP_BBM_OFFSET(fs,*bkref))) -- error_msg_and_die("[block %d of inode %d is unallocated !]", *bkref, nod); -+ block = GRP_GET_BLOCK_BITMAP(fs,bk,&bi,&gi); -+ if(!reduce && !allocated(block, GRP_BBM_OFFSET(fs,bk))) -+ error_msg_and_die("[block %d of inode %d is unallocated !]", bk, nod); -+ GRP_PUT_BLOCK_BITMAP(bi, gi); - } - if(extend) -- get_nod(fs, nod)->i_blocks = bw->bnum * INOBLK; -- return *bkref; -+ inod->i_blocks = bw->bnum * INOBLK; -+ put_nod(ni); -+ return bk; - } - --// add blocks to an inode (file/dir/etc...) --static void --extend_blk(filesystem *fs, uint32 nod, block b, int amount) -+typedef struct - { -- int create = amount; -- blockwalker bw, lbw; -- uint32 bk; -- init_bw(&bw); -- if(amount < 0) -- { -- uint32 i; -- for(i = 0; i < get_nod(fs, nod)->i_blocks / INOBLK + amount; i++) -- walk_bw(fs, nod, &bw, 0, 0); -- while(walk_bw(fs, nod, &bw, &create, 0) != WALK_END) -+ blockwalker bw; -+ uint32 nod; -+ nod_info *ni; -+ inode *inod; -+} inode_pos; -+#define INODE_POS_TRUNCATE 0 -+#define INODE_POS_EXTEND 1 -+ -+// Call this to set up an ipos structure for future use with -+// extend_inode_blk to append blocks to the given inode. If -+// op is INODE_POS_TRUNCATE, the inode is truncated to zero size. -+// If op is INODE_POS_EXTEND, the position is moved to the end -+// of the inode's data blocks. -+// Call inode_pos_finish when done with the inode_pos structure. -+static void -+inode_pos_init(filesystem *fs, inode_pos *ipos, uint32 nod, int op, -+ blockwalker *endbw) -+{ -+ blockwalker lbw; -+ -+ init_bw(&ipos->bw); -+ ipos->nod = nod; -+ ipos->inod = get_nod(fs, nod, &ipos->ni); -+ if (op == INODE_POS_TRUNCATE) { -+ int32 create = -1; -+ while(walk_bw(fs, nod, &ipos->bw, &create, 0) != WALK_END) - /*nop*/; -- get_nod(fs, nod)->i_blocks += amount * INOBLK; -+ ipos->inod->i_blocks = 0; - } -- else -+ -+ if (endbw) -+ ipos->bw = *endbw; -+ else { -+ /* Seek to the end */ -+ init_bw(&ipos->bw); -+ lbw = ipos->bw; -+ while(walk_bw(fs, nod, &ipos->bw, 0, 0) != WALK_END) -+ lbw = ipos->bw; -+ ipos->bw = lbw; -+ } -+} -+ -+// Clean up the inode_pos structure. -+static void -+inode_pos_finish(filesystem *fs, inode_pos *ipos) -+{ -+ put_nod(ipos->ni); -+} -+ -+// add blocks to an inode (file/dir/etc...) at the given position. -+// This will only work when appending to the end of an inode. -+static void -+extend_inode_blk(filesystem *fs, inode_pos *ipos, block b, int amount) -+{ -+ uint32 bk; -+ uint32 pos; -+ -+ if (amount < 0) -+ error_msg_and_die("extend_inode_blk: Got negative amount"); -+ -+ for (pos = 0; amount; pos += BLOCKSIZE) - { -- lbw = bw; -- while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END) -- lbw = bw; -- bw = lbw; -- while(create) -- { -- int i, copyb = 0; -- if(!(fs->sb.s_reserved[200] & OP_HOLES)) -- copyb = 1; -- else -- for(i = 0; i < BLOCKSIZE / 4; i++) -- if(((int32*)(b + BLOCKSIZE * (amount - create)))[i]) -- { -- copyb = 1; -- break; -- } -- if((bk = walk_bw(fs, nod, &bw, &create, !copyb)) == WALK_END) -- break; -- if(copyb) -- memcpy(get_blk(fs, bk), b + BLOCKSIZE * (amount - create - 1), BLOCKSIZE); -+ int hole = (fs->holes && is_blk_empty(b + pos)); -+ -+ bk = walk_bw(fs, ipos->nod, &ipos->bw, &amount, hole); -+ if (bk == WALK_END) -+ error_msg_and_die("extend_inode_blk: extend failed"); -+ if (!hole) { -+ blk_info *bi; -+ uint8 *block = get_blk(fs, bk, &bi); -+ memcpy(block, b + pos, BLOCKSIZE); -+ put_blk(bi); - } - } - } -@@ -1242,15 +1867,17 @@ - static void - add2dir(filesystem *fs, uint32 dnod, uint32 nod, const char* name) - { -- blockwalker bw; -+ blockwalker bw, lbw; - uint32 bk; -- uint8 *b; - directory *d; -+ dirwalker dw; - int reclen, nlen; - inode *node; - inode *pnode; -+ nod_info *dni, *ni; -+ inode_pos ipos; - -- pnode = get_nod(fs, dnod); -+ pnode = get_nod(fs, dnod, &dni); - if((pnode->i_mode & FM_IFMT) != FM_IFDIR) - error_msg_and_die("can't add '%s' to a non-directory", name); - if(!*name) -@@ -1262,52 +1889,52 @@ - if(reclen > BLOCKSIZE) - error_msg_and_die("bad name '%s' (too long)", name); - init_bw(&bw); -+ lbw = bw; - while((bk = walk_bw(fs, dnod, &bw, 0, 0)) != WALK_END) // for all blocks in dir - { -- b = get_blk(fs, bk); - // for all dir entries in block -- for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len)) -+ for(d = get_dir(fs, bk, &dw); d; d = next_dir(&dw)) - { - // if empty dir entry, large enough, use it - if((!d->d_inode) && (d->d_rec_len >= reclen)) - { - d->d_inode = nod; -- node = get_nod(fs, nod); -+ node = get_nod(fs, nod, &ni); -+ dir_set_name(&dw, name, nlen); -+ put_dir(&dw); - node->i_links_count++; -- d->d_name_len = nlen; -- strncpy(d->d_name, name, nlen); -- return; -+ put_nod(ni); -+ goto out; - } - // if entry with enough room (last one?), shrink it & use it - if(d->d_rec_len >= (sizeof(directory) + rndup(d->d_name_len, 4) + reclen)) - { -- reclen = d->d_rec_len; -- d->d_rec_len = sizeof(directory) + rndup(d->d_name_len, 4); -- reclen -= d->d_rec_len; -- d = (directory*) (((int8*)d) + d->d_rec_len); -- d->d_rec_len = reclen; -- d->d_inode = nod; -- node = get_nod(fs, nod); -+ d = shrink_dir(&dw, nod, name, nlen); -+ put_dir(&dw); -+ node = get_nod(fs, nod, &ni); - node->i_links_count++; -- d->d_name_len = nlen; -- strncpy(d->d_name, name, nlen); -- return; -+ put_nod(ni); -+ goto out; - } - } -+ put_dir(&dw); -+ lbw = bw; - } - // we found no free entry in the directory, so we add a block -- if(!(b = get_workblk())) -- error_msg_and_die("get_workblk() failed."); -- d = (directory*)b; -- d->d_inode = nod; -- node = get_nod(fs, nod); -+ node = get_nod(fs, nod, &ni); -+ d = new_dir(fs, nod, name, nlen, &dw); - node->i_links_count++; -- d->d_rec_len = BLOCKSIZE; -- d->d_name_len = nlen; -- strncpy(d->d_name, name, nlen); -- extend_blk(fs, dnod, b, 1); -- get_nod(fs, dnod)->i_size += BLOCKSIZE; -- free_workblk(b); -+ put_nod(ni); -+ next_dir(&dw); // Force the data into the buffer -+ -+ inode_pos_init(fs, &ipos, dnod, INODE_POS_EXTEND, &lbw); -+ extend_inode_blk(fs, &ipos, dir_data(&dw), 1); -+ inode_pos_finish(fs, &ipos); -+ -+ put_dir(&dw); -+ pnode->i_size += BLOCKSIZE; -+out: -+ put_nod(dni); - } - - // find an entry in a directory -@@ -1321,11 +1948,13 @@ - while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END) - { - directory *d; -- uint8 *b; -- b = get_blk(fs, bk); -- for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len)) -- if(d->d_inode && (nlen == d->d_name_len) && !strncmp(d->d_name, name, nlen)) -+ dirwalker dw; -+ for (d = get_dir(fs, bk, &dw); d; d=next_dir(&dw)) -+ if(d->d_inode && (nlen == d->d_name_len) && !strncmp(dir_name(&dw), name, nlen)) { -+ put_dir(&dw); - return d->d_inode; -+ } -+ put_dir(&dw); - } - return 0; - } -@@ -1356,47 +1985,55 @@ - return nod; - } - -+// chmod an inode -+void -+chmod_fs(filesystem *fs, uint32 nod, uint16 mode, uint16 uid, uint16 gid) -+{ -+ inode *node; -+ nod_info *ni; -+ node = get_nod(fs, nod, &ni); -+ node->i_mode = (node->i_mode & ~FM_IMASK) | (mode & FM_IMASK); -+ node->i_uid = uid; -+ node->i_gid = gid; -+ put_nod(ni); -+} -+ - // create a simple inode - static uint32 - mknod_fs(filesystem *fs, uint32 parent_nod, const char *name, uint16 mode, uint16 uid, uint16 gid, uint8 major, uint8 minor, uint32 ctime, uint32 mtime) - { - uint32 nod; - inode *node; -- if((nod = find_dir(fs, parent_nod, name))) -- { -- node = get_nod(fs, nod); -- if((node->i_mode & FM_IFMT) != (mode & FM_IFMT)) -- error_msg_and_die("node '%s' already exists and isn't of the same type", name); -- node->i_mode = mode; -- } -- else -+ nod_info *ni; -+ gd_info *gi; -+ -+ nod = alloc_nod(fs); -+ node = get_nod(fs, nod, &ni); -+ node->i_mode = mode; -+ add2dir(fs, parent_nod, nod, name); -+ switch(mode & FM_IFMT) - { -- nod = alloc_nod(fs); -- node = get_nod(fs, nod); -- node->i_mode = mode; -- add2dir(fs, parent_nod, nod, name); -- switch(mode & FM_IFMT) -- { -- case FM_IFLNK: -- mode = FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO; -- break; -- case FM_IFBLK: -- case FM_IFCHR: -- ((uint8*)get_nod(fs, nod)->i_block)[0] = minor; -- ((uint8*)get_nod(fs, nod)->i_block)[1] = major; -- break; -- case FM_IFDIR: -- add2dir(fs, nod, nod, "."); -- add2dir(fs, nod, parent_nod, ".."); -- fs->gd[GRP_GROUP_OF_INODE(fs,nod)].bg_used_dirs_count++; -- break; -- } -+ case FM_IFLNK: -+ mode = FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO; -+ break; -+ case FM_IFBLK: -+ case FM_IFCHR: -+ ((uint8*)node->i_block)[0] = minor; -+ ((uint8*)node->i_block)[1] = major; -+ break; -+ case FM_IFDIR: -+ add2dir(fs, nod, nod, "."); -+ add2dir(fs, nod, parent_nod, ".."); -+ get_gd(fs,GRP_GROUP_OF_INODE(fs,nod),&gi)->bg_used_dirs_count++; -+ put_gd(gi); -+ break; - } - node->i_uid = uid; - node->i_gid = gid; - node->i_atime = mtime; - node->i_ctime = ctime; - node->i_mtime = mtime; -+ put_nod(ni); - return nod; - } - -@@ -1413,33 +2050,73 @@ - mklink_fs(filesystem *fs, uint32 parent_nod, const char *name, size_t size, uint8 *b, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime) - { - uint32 nod = mknod_fs(fs, parent_nod, name, FM_IFLNK | FM_IRWXU | FM_IRWXG | FM_IRWXO, uid, gid, 0, 0, ctime, mtime); -- extend_blk(fs, nod, 0, - (int)get_nod(fs, nod)->i_blocks / INOBLK); -- get_nod(fs, nod)->i_size = size; -- if(size <= 4 * (EXT2_TIND_BLOCK+1)) -- { -- strncpy((char*)get_nod(fs, nod)->i_block, (char*)b, size); -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ inode_pos ipos; -+ -+ inode_pos_init(fs, &ipos, nod, INODE_POS_TRUNCATE, NULL); -+ node->i_size = size; -+ if(size < 4 * (EXT2_TIND_BLOCK+1)) -+ { -+ strncpy((char*)node->i_block, (char*)b, size); -+ ((char*)node->i_block)[size+1] = '\0'; -+ inode_pos_finish(fs, &ipos); -+ put_nod(ni); - return nod; - } -- extend_blk(fs, nod, b, rndup(size, BLOCKSIZE) / BLOCKSIZE); -+ extend_inode_blk(fs, &ipos, b, rndup(size, BLOCKSIZE) / BLOCKSIZE); -+ inode_pos_finish(fs, &ipos); -+ put_nod(ni); - return nod; - } - -+static void -+fs_upgrade_rev1_largefile(filesystem *fs) -+{ -+ fs->sb->s_rev_level = 1; -+ fs->sb->s_first_ino = EXT2_GOOD_OLD_FIRST_INO; -+ fs->sb->s_inode_size = EXT2_GOOD_OLD_INODE_SIZE; -+} -+ -+#define COPY_BLOCKS 16 -+#define CB_SIZE (COPY_BLOCKS * BLOCKSIZE) -+ - // make a file from a FILE* - static uint32 --mkfile_fs(filesystem *fs, uint32 parent_nod, const char *name, uint32 mode, size_t size, FILE *f, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime) -+mkfile_fs(filesystem *fs, uint32 parent_nod, const char *name, uint32 mode, FILE *f, uid_t uid, gid_t gid, uint32 ctime, uint32 mtime) - { - uint8 * b; - uint32 nod = mknod_fs(fs, parent_nod, name, mode|FM_IFREG, uid, gid, 0, 0, ctime, mtime); -- extend_blk(fs, nod, 0, - (int)get_nod(fs, nod)->i_blocks / INOBLK); -- get_nod(fs, nod)->i_size = size; -- if (size) { -- if(!(b = (uint8*)calloc(rndup(size, BLOCKSIZE), 1))) -- error_msg_and_die("not enough mem to read file '%s'", name); -- if(f) -- fread(b, size, 1, f); // FIXME: ugly. use mmap() ... -- extend_blk(fs, nod, b, rndup(size, BLOCKSIZE) / BLOCKSIZE); -- free(b); -- } -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ off_t size = 0; -+ size_t readbytes; -+ inode_pos ipos; -+ int fullsize; -+ -+ b = malloc(CB_SIZE); -+ if (!b) -+ error_msg_and_die("mkfile_fs: out of memory"); -+ inode_pos_init(fs, &ipos, nod, INODE_POS_TRUNCATE, NULL); -+ readbytes = fread(b, 1, CB_SIZE, f); -+ while (readbytes) { -+ fullsize = rndup(readbytes, BLOCKSIZE); -+ // Fill to end of block with zeros. -+ memset(b + readbytes, 0, fullsize - readbytes); -+ extend_inode_blk(fs, &ipos, b, fullsize / BLOCKSIZE); -+ size += readbytes; -+ readbytes = fread(b, 1, CB_SIZE, f); -+ } -+ if (size > 0x7fffffff) { -+ if (fs->sb->s_rev_level < 1) -+ fs_upgrade_rev1_largefile(fs); -+ fs->sb->s_feature_ro_compat |= EXT2_FEATURE_RO_COMPAT_LARGE_FILE; -+ } -+ node->i_dir_acl = size >> 32; -+ node->i_size = size; -+ inode_pos_finish(fs, &ipos); -+ put_nod(ni); -+ free(b); - return nod; - } - -@@ -1591,13 +2268,24 @@ - dname = malloc(len + 1); - for(i = start; i < count; i++) - { -+ uint32 oldnod; - SNPRINTF(dname, len, "%s%lu", name, i); -- mknod_fs(fs, nod, dname, mode, uid, gid, major, minor + (i * increment - start), ctime, mtime); -+ oldnod = find_dir(fs, nod, dname); -+ if(oldnod) -+ chmod_fs(fs, oldnod, mode, uid, gid); -+ else -+ mknod_fs(fs, nod, dname, mode, uid, gid, major, minor + (i * increment - start), ctime, mtime); - } - free(dname); - } - else -- mknod_fs(fs, nod, name, mode, uid, gid, major, minor, ctime, mtime); -+ { -+ uint32 oldnod = find_dir(fs, nod, name); -+ if(oldnod) -+ chmod_fs(fs, oldnod, mode, uid, gid); -+ else -+ mknod_fs(fs, nod, name, mode, uid, gid, major, minor, ctime, mtime); -+ } - } - } - if (line) -@@ -1643,6 +2331,10 @@ - switch(st.st_mode & S_IFMT) - { - case S_IFLNK: -+ if((st.st_mode & S_IFMT) == S_IFREG || st.st_size >= 4 * (EXT2_TIND_BLOCK+1)) -+ stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE; -+ stats->ninodes++; -+ break; - case S_IFREG: - if((st.st_mode & S_IFMT) == S_IFREG || st.st_size > 4 * (EXT2_TIND_BLOCK+1)) - stats->nblocks += (st.st_size + BLOCKSIZE - 1) / BLOCKSIZE; -@@ -1657,19 +2349,33 @@ - if(chdir(dent->d_name) < 0) - perror_msg_and_die(dent->d_name); - add2fs_from_dir(fs, this_nod, squash_uids, squash_perms, fs_timestamp, stats); -- chdir(".."); -+ if (chdir("..") == -1) -+ perror_msg_and_die(".."); -+ - break; - default: - break; - } - else - { -+ if((nod = find_dir(fs, this_nod, name))) -+ { -+ error_msg("ignoring duplicate entry %s", name); -+ if(S_ISDIR(st.st_mode)) { -+ if(chdir(dent->d_name) < 0) -+ perror_msg_and_die(name); -+ add2fs_from_dir(fs, nod, squash_uids, squash_perms, fs_timestamp, stats); -+ if (chdir("..") == -1) -+ perror_msg_and_die(".."); -+ } -+ continue; -+ } - save_nod = 0; - /* Check for hardlinks */ - if (!S_ISDIR(st.st_mode) && !S_ISLNK(st.st_mode) && st.st_nlink > 1) { -- int32 hdlink = is_hardlink(st.st_ino); -+ int32 hdlink = is_hardlink(fs, st.st_ino); - if (hdlink >= 0) { -- add2dir(fs, this_nod, hdlinks.hdl[hdlink].dst_nod, name); -+ add2dir(fs, this_nod, fs->hdlinks.hdl[hdlink].dst_nod, name); - continue; - } else { - save_nod = 1; -@@ -1697,8 +2403,12 @@ - free(lnk); - break; - case S_IFREG: -- fh = xfopen(dent->d_name, "rb"); -- nod = mkfile_fs(fs, this_nod, name, mode, st.st_size, fh, uid, gid, ctime, mtime); -+ fh = fopen(dent->d_name, "rb"); -+ if (!fh) { -+ error_msg("Unable to open file %s", dent->d_name); -+ break; -+ } -+ nod = mkfile_fs(fs, this_nod, name, mode, fh, uid, gid, ctime, mtime); - fclose(fh); - break; - case S_IFDIR: -@@ -1706,199 +2416,128 @@ - if(chdir(dent->d_name) < 0) - perror_msg_and_die(name); - add2fs_from_dir(fs, nod, squash_uids, squash_perms, fs_timestamp, stats); -- chdir(".."); -+ if (chdir("..") == -1) -+ perror_msg_and_die(".."); - break; - default: - error_msg("ignoring entry %s", name); - } - if (save_nod) { -- if (hdlinks.count == hdlink_cnt) { -- if ((hdlinks.hdl = -- realloc (hdlinks.hdl, (hdlink_cnt + HDLINK_CNT) * -+ if (fs->hdlinks.count == fs->hdlink_cnt) { -+ if ((fs->hdlinks.hdl = -+ realloc (fs->hdlinks.hdl, (fs->hdlink_cnt + HDLINK_CNT) * - sizeof (struct hdlink_s))) == NULL) { - error_msg_and_die("Not enough memory"); - } -- hdlink_cnt += HDLINK_CNT; -+ fs->hdlink_cnt += HDLINK_CNT; - } -- hdlinks.hdl[hdlinks.count].src_inode = st.st_ino; -- hdlinks.hdl[hdlinks.count].dst_nod = nod; -- hdlinks.count++; -+ fs->hdlinks.hdl[fs->hdlinks.count].src_inode = st.st_ino; -+ fs->hdlinks.hdl[fs->hdlinks.count].dst_nod = nod; -+ fs->hdlinks.count++; - } - } - } - closedir(dh); - } - --// endianness swap of x-indirect blocks -+// Copy size blocks from src to dst, putting holes in the output -+// file (if possible) if the input block is all zeros. -+// Copy size blocks from src to dst, putting holes in the output -+// file (if possible) if the input block is all zeros. - static void --swap_goodblocks(filesystem *fs, inode *nod) -+copy_file(filesystem *fs, FILE *dst, FILE *src, size_t size) - { -- uint32 i,j; -- int done=0; -- uint32 *b,*b2; -+ uint8 *b; - -- uint32 nblk = nod->i_blocks / INOBLK; -- if((nod->i_size && !nblk) || ((nod->i_mode & FM_IFBLK) == FM_IFBLK) || ((nod->i_mode & FM_IFCHR) == FM_IFCHR)) -- for(i = 0; i <= EXT2_TIND_BLOCK; i++) -- nod->i_block[i] = swab32(nod->i_block[i]); -- if(nblk <= EXT2_IND_BLOCK) -- return; -- swap_block(get_blk(fs, nod->i_block[EXT2_IND_BLOCK])); -- if(nblk <= EXT2_DIND_BLOCK + BLOCKSIZE/4) -- return; -- /* Currently this will fail b'cos the number of blocks as stored -- in i_blocks also includes the indirection blocks (see -- walk_bw). But this function assumes that i_blocks only -- stores the count of data blocks ( Actually according to -- "Understanding the Linux Kernel" (Table 17-3 p502 1st Ed) -- i_blocks IS supposed to store the count of data blocks). so -- with a file of size 268K nblk would be 269.The above check -- will be false even though double indirection hasn't been -- started.This is benign as 0 means block 0 which has been -- zeroed out and therefore points back to itself from any offset -- */ -- // FIXME: I have fixed that, but I have the feeling the rest of -- // ths function needs to be fixed for the same reasons - Xav -- assert(nod->i_block[EXT2_DIND_BLOCK] != 0); -- for(i = 0; i < BLOCKSIZE/4; i++) -- if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i ) -- swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])); -- swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK])); -- if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4) -- return; -- /* Adding support for triple indirection */ -- b = (uint32*)get_blk(fs,nod->i_block[EXT2_TIND_BLOCK]); -- for(i=0;i < BLOCKSIZE/4 && !done ; i++) { -- b2 = (uint32*)get_blk(fs,b[i]); -- for(j=0; j ( EXT2_IND_BLOCK + BLOCKSIZE/4 + -- (BLOCKSIZE/4)*(BLOCKSIZE/4) + -- i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + -- j*(BLOCKSIZE/4)) ) -- swap_block(get_blk(fs,b2[j])); -- else { -- done = 1; -- break; -- } -+ b = malloc(BLOCKSIZE); -+ if (!b) -+ error_msg_and_die("copy_file: out of memory"); -+ if (fseek(src, 0, SEEK_SET)) -+ perror_msg_and_die("fseek"); -+ if (ftruncate(fileno(dst), 0)) -+ perror_msg_and_die("copy_file: ftruncate"); -+ while (size > 0) { -+ if (fread(b, BLOCKSIZE, 1, src) != 1) -+ perror_msg_and_die("copy failed on read"); -+ if ((dst != stdout) && fs->holes && is_blk_empty(b)) { -+ /* Empty block, just skip it */ -+ if (fseek(dst, BLOCKSIZE, SEEK_CUR)) -+ perror_msg_and_die("fseek"); -+ } else { -+ if (fwrite(b, BLOCKSIZE, 1, dst) != 1) -+ perror_msg_and_die("copy failed on write"); - } -- swap_block((uint8 *)b2); -+ size--; - } -- swap_block((uint8 *)b); -- return; -+ free(b); - } - --static void --swap_badblocks(filesystem *fs, inode *nod) -+// Allocate a new filesystem structure, allocate internal memory, -+// and initialize the contents. -+static filesystem * -+alloc_fs(int swapit, char *fname, uint32 nbblocks, FILE *srcfile) - { -- uint32 i,j; -- int done=0; -- uint32 *b,*b2; -+ filesystem *fs; -+ struct stat srcstat, dststat; - -- uint32 nblk = nod->i_blocks / INOBLK; -- if((nod->i_size && !nblk) || ((nod->i_mode & FM_IFBLK) == FM_IFBLK) || ((nod->i_mode & FM_IFCHR) == FM_IFCHR)) -- for(i = 0; i <= EXT2_TIND_BLOCK; i++) -- nod->i_block[i] = swab32(nod->i_block[i]); -- if(nblk <= EXT2_IND_BLOCK) -- return; -- swap_block(get_blk(fs, nod->i_block[EXT2_IND_BLOCK])); -- if(nblk <= EXT2_DIND_BLOCK + BLOCKSIZE/4) -- return; -- /* See comment in swap_goodblocks */ -- assert(nod->i_block[EXT2_DIND_BLOCK] != 0); -- swap_block(get_blk(fs, nod->i_block[EXT2_DIND_BLOCK])); -- for(i = 0; i < BLOCKSIZE/4; i++) -- if(nblk > EXT2_IND_BLOCK + BLOCKSIZE/4 + (BLOCKSIZE/4)*i ) -- swap_block(get_blk(fs, ((uint32*)get_blk(fs, nod->i_block[EXT2_DIND_BLOCK]))[i])); -- if(nblk <= EXT2_IND_BLOCK + BLOCKSIZE/4 + BLOCKSIZE/4 * BLOCKSIZE/4) -- return; -- /* Adding support for triple indirection */ -- b = (uint32*)get_blk(fs,nod->i_block[EXT2_TIND_BLOCK]); -- swap_block((uint8 *)b); -- for(i=0;i < BLOCKSIZE/4 && !done ; i++) { -- b2 = (uint32*)get_blk(fs,b[i]); -- swap_block((uint8 *)b2); -- for(j=0; j ( EXT2_IND_BLOCK + BLOCKSIZE/4 + -- (BLOCKSIZE/4)*(BLOCKSIZE/4) + -- i*(BLOCKSIZE/4)*(BLOCKSIZE/4) + -- j*(BLOCKSIZE/4)) ) -- swap_block(get_blk(fs,b2[j])); -- else { -- done = 1; -- break; -- } -- } -- } -- return; --} -+ fs = malloc(sizeof(*fs)); -+ if (!fs) -+ error_msg_and_die("not enough memory for filesystem"); -+ memset(fs, 0, sizeof(*fs)); -+ fs->swapit = swapit; -+ cache_init(&fs->blks, MAX_FREE_CACHE_BLOCKS, blk_elem_val, blk_freed); -+ cache_init(&fs->gds, MAX_FREE_CACHE_GDS, gd_elem_val, gd_freed); -+ cache_init(&fs->blkmaps, MAX_FREE_CACHE_BLOCKMAPS, -+ blkmap_elem_val, blkmap_freed); -+ cache_init(&fs->inodes, MAX_FREE_CACHE_INODES, -+ inode_elem_val, inode_freed); -+ fs->hdlink_cnt = HDLINK_CNT; -+ fs->hdlinks.hdl = calloc(sizeof(struct hdlink_s), fs->hdlink_cnt); -+ if (!fs->hdlinks.hdl) -+ error_msg_and_die("Not enough memory"); -+ fs->hdlinks.count = 0 ; - --// endianness swap of the whole filesystem --static void --swap_goodfs(filesystem *fs) --{ -- uint32 i; -- for(i = 1; i < fs->sb.s_inodes_count; i++) -- { -- inode *nod = get_nod(fs, i); -- if(nod->i_mode & FM_IFDIR) -- { -- blockwalker bw; -- uint32 bk; -- init_bw(&bw); -- while((bk = walk_bw(fs, i, &bw, 0, 0)) != WALK_END) -- { -- directory *d; -- uint8 *b; -- b = get_blk(fs, bk); -- for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + swab16(d->d_rec_len))) -- swap_dir(d); -- } -- } -- swap_goodblocks(fs, nod); -- swap_nod(nod); -- } -- for(i=0;igd[i])); -- swap_sb(&fs->sb); -+ if (strcmp(fname, "-") == 0) -+ fs->f = tmpfile(); -+ else if (srcfile) { -+ if (fstat(fileno(srcfile), &srcstat)) -+ perror_msg_and_die("fstat srcfile"); -+ if (stat(fname, &dststat) == 0 -+ && srcstat.st_ino == dststat.st_ino -+ && srcstat.st_dev == dststat.st_dev) -+ { -+ // source and destination are the same file, don't -+ // truncate or copy, just use the file. -+ fs->f = fopen(fname, "r+b"); -+ } else { -+ fs->f = fopen(fname, "w+b"); -+ if (fs->f) -+ copy_file(fs, fs->f, srcfile, nbblocks); -+ } -+ } else -+ fs->f = fopen(fname, "w+b"); -+ if (!fs->f) -+ perror_msg_and_die("opening %s", fname); -+ return fs; - } - -+/* Make sure the output file is the right size */ - static void --swap_badfs(filesystem *fs) -+set_file_size(filesystem *fs) - { -- uint32 i; -- swap_sb(&fs->sb); -- for(i=0;igd[i])); -- for(i = 1; i < fs->sb.s_inodes_count; i++) -- { -- inode *nod = get_nod(fs, i); -- swap_nod(nod); -- swap_badblocks(fs, nod); -- if(nod->i_mode & FM_IFDIR) -- { -- blockwalker bw; -- uint32 bk; -- init_bw(&bw); -- while((bk = walk_bw(fs, i, &bw, 0, 0)) != WALK_END) -- { -- directory *d; -- uint8 *b; -- b = get_blk(fs, bk); -- for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len)) -- swap_dir(d); -- } -- } -- } -+ if (ftruncate(fileno(fs->f), -+ ((off_t) fs->sb->s_blocks_count) * BLOCKSIZE)) -+ perror_msg_and_die("set_file_size: ftruncate"); - } - - // initialize an empty filesystem - static filesystem * --init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, uint32 fs_timestamp) -+init_fs(int nbblocks, int nbinodes, int nbresrvd, int holes, -+ uint32 fs_timestamp, uint32 creator_os, int swapit, char *fname) - { - uint32 i; - filesystem *fs; -- directory *d; -- uint8 * b; -+ dirwalker dw; - uint32 nod, first_block; - uint32 nbgroups,nbinodes_per_group,overhead_per_group,free_blocks, - free_blocks_per_group,nbblocks_per_group,min_nbgroups; -@@ -1906,6 +2545,11 @@ - uint32 j; - uint8 *bbm,*ibm; - inode *itab0; -+ blk_info *bi; -+ nod_info *ni; -+ groupdescriptor *gd; -+ gd_info *gi; -+ inode_pos ipos; - - if(nbresrvd < 0) - error_msg_and_die("reserved blocks value is invalid. Note: options have changed, see --help or the man page."); -@@ -1919,10 +2563,14 @@ - */ - min_nbgroups = (nbinodes + INODES_PER_GROUP - 1) / INODES_PER_GROUP; - -+ /* On filesystems with 1k block size, the bootloader area uses a full -+ * block. For 2048 and up, the superblock can be fitted into block 0. -+ */ -+ first_block = (BLOCKSIZE == 1024); -+ - /* nbblocks is the total number of blocks in the filesystem. - * a block group can have no more than 8192 blocks. - */ -- first_block = (BLOCKSIZE == 1024); - nbgroups = (nbblocks - first_block + BLOCKS_PER_GROUP - 1) / BLOCKS_PER_GROUP; - if(nbgroups < min_nbgroups) nbgroups = min_nbgroups; - nbblocks_per_group = rndup((nbblocks - first_block + nbgroups - 1)/nbgroups, 8); -@@ -1934,51 +2582,59 @@ - gdsz = rndup(nbgroups*sizeof(groupdescriptor),BLOCKSIZE)/BLOCKSIZE; - itblsz = nbinodes_per_group * sizeof(inode)/BLOCKSIZE; - overhead_per_group = 3 /*sb,bbm,ibm*/ + gdsz + itblsz; -- if((uint32)nbblocks - 1 < overhead_per_group * nbgroups) -- error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page."); -- free_blocks = nbblocks - overhead_per_group*nbgroups - 1 /*boot block*/; -+ free_blocks = nbblocks - overhead_per_group*nbgroups - first_block; - free_blocks_per_group = nbblocks_per_group - overhead_per_group; -+ if(free_blocks < 0) -+ error_msg_and_die("too much overhead, try fewer inodes or more blocks. Note: options have changed, see --help or the man page."); - -- if(!(fs = (filesystem*)calloc(nbblocks, BLOCKSIZE))) -- error_msg_and_die("not enough memory for filesystem"); -+ fs = alloc_fs(swapit, fname, nbblocks, NULL); -+ fs->sb = calloc(1, SUPERBLOCK_SIZE); -+ if (!fs->sb) -+ error_msg_and_die("error allocating header memory"); - - // create the superblock for an empty filesystem -- fs->sb.s_inodes_count = nbinodes_per_group * nbgroups; -- fs->sb.s_blocks_count = nbblocks; -- fs->sb.s_r_blocks_count = nbresrvd; -- fs->sb.s_free_blocks_count = free_blocks; -- fs->sb.s_free_inodes_count = fs->sb.s_inodes_count - EXT2_FIRST_INO + 1; -- fs->sb.s_first_data_block = first_block; -- fs->sb.s_log_block_size = BLOCKSIZE >> 11; -- fs->sb.s_log_frag_size = BLOCKSIZE >> 11; -- fs->sb.s_blocks_per_group = nbblocks_per_group; -- fs->sb.s_frags_per_group = nbblocks_per_group; -- fs->sb.s_inodes_per_group = nbinodes_per_group; -- fs->sb.s_wtime = fs_timestamp; -- fs->sb.s_magic = EXT2_MAGIC_NUMBER; -- fs->sb.s_lastcheck = fs_timestamp; -+ fs->sb->s_inodes_count = nbinodes_per_group * nbgroups; -+ fs->sb->s_blocks_count = nbblocks; -+ fs->sb->s_r_blocks_count = nbresrvd; -+ fs->sb->s_free_blocks_count = free_blocks; -+ fs->sb->s_free_inodes_count = fs->sb->s_inodes_count - EXT2_FIRST_INO + 1; -+ fs->sb->s_first_data_block = first_block; -+ fs->sb->s_log_block_size = BLOCKSIZE >> 11; -+ fs->sb->s_log_frag_size = BLOCKSIZE >> 11; -+ fs->sb->s_blocks_per_group = nbblocks_per_group; -+ fs->sb->s_frags_per_group = nbblocks_per_group; -+ fs->sb->s_inodes_per_group = nbinodes_per_group; -+ fs->sb->s_wtime = fs_timestamp; -+ fs->sb->s_magic = EXT2_MAGIC_NUMBER; -+ fs->sb->s_lastcheck = fs_timestamp; -+ fs->sb->s_creator_os = creator_os; -+ -+ set_file_size(fs); - - // set up groupdescriptors -- for(i=0, bbmpos=gdsz+2, ibmpos=bbmpos+1, itblpos=ibmpos+1; -+ for(i=0, bbmpos=first_block+1+gdsz, ibmpos=bbmpos+1, itblpos=ibmpos+1; - i free_blocks_per_group) { -- fs->gd[i].bg_free_blocks_count = free_blocks_per_group; -+ gd->bg_free_blocks_count = free_blocks_per_group; - free_blocks -= free_blocks_per_group; - } else { -- fs->gd[i].bg_free_blocks_count = free_blocks; -+ gd->bg_free_blocks_count = free_blocks; - free_blocks = 0; // this is the last block group - } - if(i) -- fs->gd[i].bg_free_inodes_count = nbinodes_per_group; -+ gd->bg_free_inodes_count = nbinodes_per_group; - else -- fs->gd[i].bg_free_inodes_count = nbinodes_per_group - -+ gd->bg_free_inodes_count = nbinodes_per_group - - EXT2_FIRST_INO + 2; -- fs->gd[i].bg_used_dirs_count = 0; -- fs->gd[i].bg_block_bitmap = bbmpos; -- fs->gd[i].bg_inode_bitmap = ibmpos; -- fs->gd[i].bg_inode_table = itblpos; -+ gd->bg_used_dirs_count = 0; -+ gd->bg_block_bitmap = bbmpos; -+ gd->bg_inode_bitmap = ibmpos; -+ gd->bg_inode_table = itblpos; -+ put_gd(gi); - } - - /* Mark non-filesystem blocks and inodes as allocated */ -@@ -1984,110 +2640,143 @@ - /* Mark non-filesystem blocks and inodes as allocated */ - /* Mark system blocks and inodes as allocated */ - for(i = 0; igd[i].bg_block_bitmap); -+ gd = get_gd(fs, i, &gi); -+ bbm = GRP_GET_GROUP_BBM(fs, gd, &bi); - //non-filesystem blocks -- for(j = fs->gd[i].bg_free_blocks_count -+ for(j = gd->bg_free_blocks_count - + overhead_per_group + 1; j <= BLOCKSIZE * 8; j++) - allocate(bbm, j); - //system blocks - for(j = 1; j <= overhead_per_group; j++) - allocate(bbm, j); -- -+ GRP_PUT_GROUP_BBM(bi); -+ - /* Inode bitmap */ -- ibm = get_blk(fs,fs->gd[i].bg_inode_bitmap); -+ ibm = GRP_GET_GROUP_IBM(fs, gd, &bi); - //non-filesystem inodes -- for(j = fs->sb.s_inodes_per_group+1; j <= BLOCKSIZE * 8; j++) -+ for(j = fs->sb->s_inodes_per_group+1; j <= BLOCKSIZE * 8; j++) - allocate(ibm, j); - - //system inodes - if(i == 0) - for(j = 1; j < EXT2_FIRST_INO; j++) - allocate(ibm, j); -+ GRP_PUT_GROUP_IBM(bi); -+ put_gd(gi); - } - - // make root inode and directory - /* We have groups now. Add the root filesystem in group 0 */ - /* Also increment the directory count for group 0 */ -- fs->gd[0].bg_free_inodes_count--; -- fs->gd[0].bg_used_dirs_count = 1; -- itab0 = (inode *)get_blk(fs,fs->gd[0].bg_inode_table); -- itab0[EXT2_ROOT_INO-1].i_mode = FM_IFDIR | FM_IRWXU | FM_IRGRP | FM_IROTH | FM_IXGRP | FM_IXOTH; -- itab0[EXT2_ROOT_INO-1].i_ctime = fs_timestamp; -- itab0[EXT2_ROOT_INO-1].i_mtime = fs_timestamp; -- itab0[EXT2_ROOT_INO-1].i_atime = fs_timestamp; -- itab0[EXT2_ROOT_INO-1].i_size = BLOCKSIZE; -- itab0[EXT2_ROOT_INO-1].i_links_count = 2; -- -- if(!(b = get_workblk())) -- error_msg_and_die("get_workblk() failed."); -- d = (directory*)b; -- d->d_inode = EXT2_ROOT_INO; -- d->d_rec_len = sizeof(directory)+4; -- d->d_name_len = 1; -- strcpy(d->d_name, "."); -- d = (directory*)(b + d->d_rec_len); -- d->d_inode = EXT2_ROOT_INO; -- d->d_rec_len = BLOCKSIZE - (sizeof(directory)+4); -- d->d_name_len = 2; -- strcpy(d->d_name, ".."); -- extend_blk(fs, EXT2_ROOT_INO, b, 1); -+ gd = get_gd(fs, 0, &gi); -+ gd->bg_free_inodes_count--; -+ gd->bg_used_dirs_count = 1; -+ put_gd(gi); -+ itab0 = get_nod(fs, EXT2_ROOT_INO, &ni); -+ itab0->i_mode = FM_IFDIR | FM_IRWXU | FM_IRGRP | FM_IROTH | FM_IXGRP | FM_IXOTH; -+ itab0->i_ctime = fs_timestamp; -+ itab0->i_mtime = fs_timestamp; -+ itab0->i_atime = fs_timestamp; -+ itab0->i_size = BLOCKSIZE; -+ itab0->i_links_count = 2; -+ put_nod(ni); -+ -+ new_dir(fs, EXT2_ROOT_INO, ".", 1, &dw); -+ shrink_dir(&dw, EXT2_ROOT_INO, "..", 2); -+ next_dir(&dw); // Force the data into the buffer -+ inode_pos_init(fs, &ipos, EXT2_ROOT_INO, INODE_POS_EXTEND, NULL); -+ extend_inode_blk(fs, &ipos, dir_data(&dw), 1); -+ inode_pos_finish(fs, &ipos); -+ put_dir(&dw); - -- // make lost+found directory and reserve blocks -- if(fs->sb.s_r_blocks_count) -+ // make lost+found directory -+ if(fs->sb->s_r_blocks_count) - { -- nod = mkdir_fs(fs, EXT2_ROOT_INO, "lost+found", FM_IRWXU, 0, 0, fs_timestamp, fs_timestamp); -+ inode *node; -+ uint8 *b; -+ -+ nod = mkdir_fs(fs, EXT2_ROOT_INO, "lost+found", FM_IRWXU, -+ 0, 0, fs_timestamp, fs_timestamp); -+ b = get_workblk(); - memset(b, 0, BLOCKSIZE); - ((directory*)b)->d_rec_len = BLOCKSIZE; -- /* We run into problems with e2fsck if directory lost+found grows -- * bigger than this. Need to find out why this happens - sundar -- */ -- if (fs->sb.s_r_blocks_count > fs->sb.s_blocks_count * MAX_RESERVED_BLOCKS ) -- fs->sb.s_r_blocks_count = fs->sb.s_blocks_count * MAX_RESERVED_BLOCKS; -- for(i = 1; i < fs->sb.s_r_blocks_count; i++) -- extend_blk(fs, nod, b, 1); -- get_nod(fs, nod)->i_size = fs->sb.s_r_blocks_count * BLOCKSIZE; -+ inode_pos_init(fs, &ipos, nod, INODE_POS_EXTEND, NULL); -+ // It is always 16 blocks to start out with -+ for(i = 1; i < 16; i++) -+ extend_inode_blk(fs, &ipos, b, 1); -+ inode_pos_finish(fs, &ipos); -+ free_workblk(b); -+ node = get_nod(fs, nod, &ni); -+ node->i_size = 16 * BLOCKSIZE; -+ put_nod(ni); - } -- free_workblk(b); - - // administrative info -- fs->sb.s_state = 1; -- fs->sb.s_max_mnt_count = 20; -+ fs->sb->s_state = 1; -+ fs->sb->s_max_mnt_count = 20; - - // options for me -- if(holes) -- fs->sb.s_reserved[200] |= OP_HOLES; -+ fs->holes = holes; - - return fs; - } - - // loads a filesystem from disk - static filesystem * --load_fs(FILE * fh, int swapit) -+load_fs(FILE *fh, int swapit, char *fname) - { -- size_t fssize; -+ off_t fssize; - filesystem *fs; -- if((fseek(fh, 0, SEEK_END) < 0) || ((ssize_t)(fssize = ftell(fh)) == -1)) -+ -+ if((fseek(fh, 0, SEEK_END) < 0) || ((fssize = ftello(fh)) == -1)) - perror_msg_and_die("input filesystem image"); - rewind(fh); -- fssize = (fssize + BLOCKSIZE - 1) / BLOCKSIZE; -+ if ((fssize % BLOCKSIZE) != 0) -+ error_msg_and_die("Input file not a multiple of block size"); -+ fssize /= BLOCKSIZE; - if(fssize < 16) // totally arbitrary - error_msg_and_die("too small filesystem"); -- if(!(fs = (filesystem*)calloc(fssize, BLOCKSIZE))) -- error_msg_and_die("not enough memory for filesystem"); -- if(fread(fs, BLOCKSIZE, fssize, fh) != fssize) -- perror_msg_and_die("input filesystem image"); -+ fs = alloc_fs(swapit, fname, fssize, fh); -+ -+ /* Read and check the superblock, then read the superblock -+ * and all the group descriptors */ -+ fs->sb = malloc(SUPERBLOCK_SIZE); -+ if (!fs->sb) -+ error_msg_and_die("error allocating header memory"); -+ if (fseek(fs->f, SUPERBLOCK_OFFSET, SEEK_SET)) -+ perror_msg_and_die("fseek"); -+ if (fread(fs->sb, SUPERBLOCK_SIZE, 1, fs->f) != 1) -+ perror_msg_and_die("fread filesystem image superblock"); - if(swapit) -- swap_badfs(fs); -- if(fs->sb.s_rev_level || (fs->sb.s_magic != EXT2_MAGIC_NUMBER)) -+ swap_sb(fs->sb); -+ -+ if((fs->sb->s_rev_level > 1) || (fs->sb->s_magic != EXT2_MAGIC_NUMBER)) - error_msg_and_die("not a suitable ext2 filesystem"); -+ if (fs->sb->s_rev_level > 0) { -+ if (fs->sb->s_first_ino != EXT2_GOOD_OLD_FIRST_INO) -+ error_msg_and_die("First inode incompatible"); -+ if (fs->sb->s_inode_size != EXT2_GOOD_OLD_INODE_SIZE) -+ error_msg_and_die("inode size incompatible"); -+ if (fs->sb->s_feature_compat) -+ error_msg_and_die("Unsupported compat features"); -+ if (fs->sb->s_feature_incompat) -+ error_msg_and_die("Unsupported incompat features"); -+ if (fs->sb->s_feature_ro_compat -+ & ~EXT2_FEATURE_RO_COMPAT_LARGE_FILE) -+ error_msg_and_die("Unsupported ro compat features"); -+ } -+ -+ set_file_size(fs); - return fs; - } - - static void - free_fs(filesystem *fs) - { -+ free(fs->hdlinks.hdl); -+ fclose(fs->f); -+ free(fs->sb); - free(fs); - } - -@@ -2123,16 +2812,23 @@ - { - blockwalker bw; - uint32 bk; -- int32 fsize = get_nod(fs, nod)->i_size; -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ int32 fsize = node->i_size; -+ blk_info *bi; -+ - init_bw(&bw); - while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END) - { - if(fsize <= 0) - error_msg_and_die("wrong size while saving inode %d", nod); -- if(fwrite(get_blk(fs, bk), (fsize > BLOCKSIZE) ? BLOCKSIZE : fsize, 1, f) != 1) -+ if(fwrite(get_blk(fs, bk, &bi), -+ (fsize > BLOCKSIZE) ? BLOCKSIZE : fsize, 1, f) != 1) - error_msg_and_die("error while saving inode %d", nod); -+ put_blk(bi); - fsize -= BLOCKSIZE; - } -+ put_nod(ni); - } - - -@@ -2141,8 +2837,11 @@ - print_dev(filesystem *fs, uint32 nod) - { - int minor, major; -- minor = ((uint8*)get_nod(fs, nod)->i_block)[0]; -- major = ((uint8*)get_nod(fs, nod)->i_block)[1]; -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ minor = ((uint8*)node->i_block)[0]; -+ major = ((uint8*)node->i_block)[1]; -+ put_nod(ni); - printf("major: %d, minor: %d\n", major, minor); - } - -@@ -2157,17 +2856,15 @@ - while((bk = walk_bw(fs, nod, &bw, 0, 0)) != WALK_END) - { - directory *d; -- uint8 *b; -- b = get_blk(fs, bk); -- for(d = (directory*)b; (int8*)d + sizeof(*d) < (int8*)b + BLOCKSIZE; d = (directory*)((int8*)d + d->d_rec_len)) -+ dirwalker dw; -+ for (d = get_dir(fs, bk, &dw); d; d = next_dir(&dw)) - if(d->d_inode) - { -- int i; - printf("entry '"); -- for(i = 0; i < d->d_name_len; i++) -- putchar(d->d_name[i]); -+ fwrite(dir_name(&dw), 1, d->d_name_len, stdout); - printf("' (inode %d): rec_len: %d (name_len: %d)\n", d->d_inode, d->d_rec_len, d->d_name_len); - } -+ put_dir(&dw); - } - } - -@@ -2175,14 +2872,18 @@ - static void - print_link(filesystem *fs, uint32 nod) - { -- if(!get_nod(fs, nod)->i_blocks) -- printf("links to '%s'\n", (char*)get_nod(fs, nod)->i_block); -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ -+ if(!node->i_blocks) -+ printf("links to '%s'\n", (char*)node->i_block); - else - { - printf("links to '"); - write_blocks(fs, nod, stdout); - printf("'\n"); - } -+ put_nod(ni); - } - - // make a ls-like printout of permissions -@@ -2251,8 +2952,13 @@ - { - char *s; - char perms[11]; -- if(!get_nod(fs, nod)->i_mode) -- return; -+ nod_info *ni; -+ inode *node = get_nod(fs, nod, &ni); -+ blk_info *bi; -+ gd_info *gi; -+ -+ if(!node->i_mode) -+ goto out; - switch(nod) - { - case EXT2_BAD_INO: -@@ -2274,15 +2980,18 @@ - default: - s = (nod >= EXT2_FIRST_INO) ? "normal" : "unknown reserved"; - } -- printf("inode %d (%s, %d links): ", nod, s, get_nod(fs, nod)->i_links_count); -- if(!allocated(GRP_GET_INODE_BITMAP(fs,nod), GRP_IBM_OFFSET(fs,nod))) -+ printf("inode %d (%s, %d links): ", nod, s, node->i_links_count); -+ if(!allocated(GRP_GET_INODE_BITMAP(fs,nod,&bi,&gi), GRP_IBM_OFFSET(fs,nod))) - { -+ GRP_PUT_INODE_BITMAP(bi,gi); - printf("unallocated\n"); -- return; -+ goto out; - } -- make_perms(get_nod(fs, nod)->i_mode, perms); -- printf("%s, size: %d byte%s (%d block%s)\n", perms, plural(get_nod(fs, nod)->i_size), plural(get_nod(fs, nod)->i_blocks / INOBLK)); -- switch(get_nod(fs, nod)->i_mode & FM_IFMT) -+ GRP_PUT_INODE_BITMAP(bi,gi); -+ make_perms(node->i_mode, perms); -+ printf("%s, size: %d byte%s (%d block%s)\n", perms, -+ plural(node->i_size), plural(node->i_blocks / INOBLK)); -+ switch(node->i_mode & FM_IFMT) - { - case FM_IFSOCK: - list_blocks(fs, nod); -@@ -2310,6 +3019,8 @@ - list_blocks(fs, nod); - } - printf("Done with inode %d\n",nod); -+out: -+ put_nod(ni); - } - - // describes various fields in a filesystem -@@ -2317,49 +3028,65 @@ - print_fs(filesystem *fs) - { - uint32 i; -+ blk_info *bi; -+ groupdescriptor *gd; -+ gd_info *gi; - uint8 *ibm; - - printf("%d blocks (%d free, %d reserved), first data block: %d\n", -- fs->sb.s_blocks_count, fs->sb.s_free_blocks_count, -- fs->sb.s_r_blocks_count, fs->sb.s_first_data_block); -- printf("%d inodes (%d free)\n", fs->sb.s_inodes_count, -- fs->sb.s_free_inodes_count); -+ fs->sb->s_blocks_count, fs->sb->s_free_blocks_count, -+ fs->sb->s_r_blocks_count, fs->sb->s_first_data_block); -+ printf("%d inodes (%d free)\n", fs->sb->s_inodes_count, -+ fs->sb->s_free_inodes_count); - printf("block size = %d, frag size = %d\n", -- fs->sb.s_log_block_size ? (fs->sb.s_log_block_size << 11) : 1024, -- fs->sb.s_log_frag_size ? (fs->sb.s_log_frag_size << 11) : 1024); -+ fs->sb->s_log_block_size ? (fs->sb->s_log_block_size << 11) : 1024, -+ fs->sb->s_log_frag_size ? (fs->sb->s_log_frag_size << 11) : 1024); - printf("number of groups: %d\n",GRP_NBGROUPS(fs)); - printf("%d blocks per group,%d frags per group,%d inodes per group\n", -- fs->sb.s_blocks_per_group, fs->sb.s_frags_per_group, -- fs->sb.s_inodes_per_group); -+ fs->sb->s_blocks_per_group, fs->sb->s_frags_per_group, -+ fs->sb->s_inodes_per_group); - printf("Size of inode table: %d blocks\n", -- (int)(fs->sb.s_inodes_per_group * sizeof(inode) / BLOCKSIZE)); -+ (int)(fs->sb->s_inodes_per_group * sizeof(inode) / BLOCKSIZE)); - for (i = 0; i < GRP_NBGROUPS(fs); i++) { - printf("Group No: %d\n", i+1); -+ gd = get_gd(fs, i, &gi); - printf("block bitmap: block %d,inode bitmap: block %d, inode table: block %d\n", -- fs->gd[i].bg_block_bitmap, fs->gd[i].bg_inode_bitmap, -- fs->gd[i].bg_inode_table); -+ gd->bg_block_bitmap, -+ gd->bg_inode_bitmap, -+ gd->bg_inode_table); - printf("block bitmap allocation:\n"); -- print_bm(GRP_GET_GROUP_BBM(fs, i),fs->sb.s_blocks_per_group); -+ print_bm(GRP_GET_GROUP_BBM(fs, gd, &bi),fs->sb->s_blocks_per_group); -+ GRP_PUT_GROUP_BBM(bi); - printf("inode bitmap allocation:\n"); -- ibm = GRP_GET_GROUP_IBM(fs, i); -- print_bm(ibm, fs->sb.s_inodes_per_group); -- for (i = 1; i <= fs->sb.s_inodes_per_group; i++) -+ ibm = GRP_GET_GROUP_IBM(fs, gd, &bi); -+ print_bm(ibm, fs->sb->s_inodes_per_group); -+ for (i = 1; i <= fs->sb->s_inodes_per_group; i++) - if (allocated(ibm, i)) - print_inode(fs, i); -+ GRP_PUT_GROUP_IBM(bi); -+ put_gd(gi); - } - } - - static void --dump_fs(filesystem *fs, FILE * fh, int swapit) -+finish_fs(filesystem *fs) - { -- uint32 nbblocks = fs->sb.s_blocks_count; -- fs->sb.s_reserved[200] = 0; -- if(swapit) -- swap_goodfs(fs); -- if(fwrite(fs, BLOCKSIZE, nbblocks, fh) < nbblocks) -- perror_msg_and_die("output filesystem image"); -- if(swapit) -- swap_badfs(fs); -+ if (cache_flush(&fs->inodes)) -+ error_msg_and_die("entry mismatch on inode cache flush"); -+ if (cache_flush(&fs->blkmaps)) -+ error_msg_and_die("entry mismatch on blockmap cache flush"); -+ if (cache_flush(&fs->gds)) -+ error_msg_and_die("entry mismatch on gd cache flush"); -+ if (cache_flush(&fs->blks)) -+ error_msg_and_die("entry mismatch on block cache flush"); -+ if(fs->swapit) -+ swap_sb(fs->sb); -+ if (fseek(fs->f, SUPERBLOCK_OFFSET, SEEK_SET)) -+ perror_msg_and_die("fseek"); -+ if(fwrite(fs->sb, SUPERBLOCK_SIZE, 1, fs->f) != 1) -+ perror_msg_and_die("output filesystem superblock"); -+ if(fs->swapit) -+ swap_sb(fs->sb); - } - - static void -@@ -2419,10 +3146,12 @@ - " -x, --starting-image \n" - " -d, --root \n" - " -D, --devtable \n" -+ " -B, --block-size \n" - " -b, --size-in-blocks \n" - " -i, --bytes-per-inode \n" - " -N, --number-of-inodes \n" - " -m, --reserved-percentage \n" -+ " -o, --creator-os 'linux' (default), 'hurd', 'freebsd' or number.\n" - " -g, --block-map Generate a block map file for this path.\n" - " -e, --fill-value Fill unallocated blocks with value.\n" - " -z, --allow-holes Allow files with holes.\n" -@@ -2444,15 +3173,34 @@ - extern char* optarg; - extern int optind, opterr, optopt; - -+// parse the value for -o -+int -+lookup_creator_os(const char *name) -+{ -+ if (isdigit (*name)) -+ return atoi(name); -+ else if (strcasecmp(name, "linux") == 0) -+ return EXT2_OS_LINUX; -+ else if (strcasecmp(name, "GNU") == 0 || strcasecmp(name, "hurd") == 0) -+ return EXT2_OS_HURD; -+ else if (strcasecmp(name, "freebsd") == 0) -+ return EXT2_OS_FREEBSD; -+ else if (strcasecmp(name, "lites") == 0) -+ return EXT2_OS_LITES; -+ else -+ return EXT2_OS_LINUX; -+} -+ - int - main(int argc, char **argv) - { -- int nbblocks = -1; -+ long long nbblocks = -1; - int nbinodes = -1; - int nbresrvd = -1; - float bytes_per_inode = -1; - float reserved_frac = -1; - int fs_timestamp = -1; -+ int creator_os = CREATOR_OS; - char * fsout = "-"; - char * fsin = 0; - char * dopt[MAX_DOPT]; -@@ -2466,6 +3214,7 @@ - int squash_perms = 0; - uint16 endian = 1; - int bigendian = !*(char*)&endian; -+ char *volumelabel = NULL; - filesystem *fs; - int i; - int c; -@@ -2476,13 +3225,16 @@ - { "starting-image", required_argument, NULL, 'x' }, - { "root", required_argument, NULL, 'd' }, - { "devtable", required_argument, NULL, 'D' }, -+ { "block-size", required_argument, NULL, 'B' }, - { "size-in-blocks", required_argument, NULL, 'b' }, - { "bytes-per-inode", required_argument, NULL, 'i' }, - { "number-of-inodes", required_argument, NULL, 'N' }, -+ { "volume-label", required_argument, NULL, 'L' }, - { "reserved-percentage", required_argument, NULL, 'm' }, -+ { "creator-os", required_argument, NULL, 'o' }, - { "block-map", required_argument, NULL, 'g' }, - { "fill-value", required_argument, NULL, 'e' }, -- { "allow-holes", no_argument, NULL, 'z' }, -+ { "allow-holes", no_argument, NULL, 'z' }, - { "faketime", no_argument, NULL, 'f' }, - { "squash", no_argument, NULL, 'q' }, - { "squash-uids", no_argument, NULL, 'U' }, -@@ -2495,11 +3247,11 @@ - - app_name = argv[0]; - -- while((c = getopt_long(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv", longopts, NULL)) != EOF) { -+ while((c = getopt_long(argc, argv, "x:d:D:B:b:i:N:L:m:o:g:e:zfqUPhVv", longopts, NULL)) != EOF) { - #else - app_name = argv[0]; - -- while((c = getopt(argc, argv, "x:d:D:b:i:N:m:g:e:zfqUPhVv")) != EOF) { -+ while((c = getopt(argc, argv, "x:d:D:B:b:i:N:L:m:o:g:e:zfqUPhVv")) != EOF) { - #endif /* HAVE_GETOPT_LONG */ - switch(c) - { -@@ -2510,6 +3262,9 @@ - case 'D': - dopt[didx++] = optarg; - break; -+ case 'B': -+ blocksize = SI_atof(optarg); -+ break; - case 'b': - nbblocks = SI_atof(optarg); - break; -@@ -2519,9 +3274,15 @@ - case 'N': - nbinodes = SI_atof(optarg); - break; -+ case 'L': -+ volumelabel = optarg; -+ break; - case 'm': - reserved_frac = SI_atof(optarg) / 100; - break; -+ case 'o': -+ creator_os = lookup_creator_os(optarg); -+ break; - case 'g': - gopt[gidx++] = optarg; - break; -@@ -2565,21 +3326,21 @@ - error_msg_and_die("Not enough arguments. Try --help or else see the man page."); - fsout = argv[optind]; - -- hdlinks.hdl = (struct hdlink_s *)malloc(hdlink_cnt * sizeof(struct hdlink_s)); -- if (!hdlinks.hdl) -- error_msg_and_die("Not enough memory"); -- hdlinks.count = 0 ; -+ if(blocksize != 1024 && blocksize != 2048 && blocksize != 4096) -+ error_msg_and_die("Valid block sizes: 1024, 2048 or 4096."); -+ if(creator_os < 0) -+ error_msg_and_die("Creator OS unknown."); - - if(fsin) - { - if(strcmp(fsin, "-")) - { - FILE * fh = xfopen(fsin, "rb"); -- fs = load_fs(fh, bigendian); -+ fs = load_fs(fh, bigendian, fsout); - fclose(fh); - } - else -- fs = load_fs(stdin, bigendian); -+ fs = load_fs(stdin, bigendian, fsout); - } - else - { -@@ -2609,16 +3370,29 @@ - } - if(fs_timestamp == -1) - fs_timestamp = time(NULL); -- fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, fs_timestamp); -+ fs = init_fs(nbblocks, nbinodes, nbresrvd, holes, -+ fs_timestamp, creator_os, bigendian, fsout); - } -+ if (volumelabel != NULL) -+ strncpy((char *)fs->sb->s_volume_name, volumelabel, -+ sizeof(fs->sb->s_volume_name)); - - populate_fs(fs, dopt, didx, squash_uids, squash_perms, fs_timestamp, NULL); - - if(emptyval) { - uint32 b; -- for(b = 1; b < fs->sb.s_blocks_count; b++) -- if(!allocated(GRP_GET_BLOCK_BITMAP(fs,b),GRP_BBM_OFFSET(fs,b))) -- memset(get_blk(fs, b), emptyval, BLOCKSIZE); -+ for(b = 1; b < fs->sb->s_blocks_count; b++) { -+ blk_info *bi; -+ gd_info *gi; -+ if(!allocated(GRP_GET_BLOCK_BITMAP(fs,b,&bi,&gi), -+ GRP_BBM_OFFSET(fs,b))) { -+ blk_info *bi2; -+ memset(get_blk(fs, b, &bi2), emptyval, -+ BLOCKSIZE); -+ put_blk(bi2); -+ } -+ GRP_PUT_BLOCK_BITMAP(bi,gi); -+ } - } - if(verbose) - print_fs(fs); -@@ -2628,24 +3402,22 @@ - char fname[MAX_FILENAME]; - char *p; - FILE *fh; -+ nod_info *ni; - if(!(nod = find_path(fs, EXT2_ROOT_INO, gopt[i]))) - error_msg_and_die("path %s not found in filesystem", gopt[i]); - while((p = strchr(gopt[i], '/'))) - *p = '_'; - SNPRINTF(fname, MAX_FILENAME-1, "%s.blk", gopt[i]); - fh = xfopen(fname, "wb"); -- fprintf(fh, "%d:", get_nod(fs, nod)->i_size); -+ fprintf(fh, "%d:", get_nod(fs, nod, &ni)->i_size); -+ put_nod(ni); - flist_blocks(fs, nod, fh); - fclose(fh); - } -- if(strcmp(fsout, "-")) -- { -- FILE * fh = xfopen(fsout, "wb"); -- dump_fs(fs, fh, bigendian); -- fclose(fh); -- } -- else -- dump_fs(fs, stdout, bigendian); -+ finish_fs(fs); -+ if(strcmp(fsout, "-") == 0) -+ copy_file(fs, stdout, fs->f, fs->sb->s_blocks_count); -+ - free_fs(fs); - return 0; - } -Index: genext2fs-1.4.1/cache.h -=================================================================== ---- /dev/null -+++ genext2fs-1.4.1/cache.h -@@ -0,0 +1,128 @@ -+#ifndef __CACHE_H__ -+#define __CACHE_H__ -+ -+#include "list.h" -+ -+#define CACHE_LISTS 256 -+ -+typedef struct -+{ -+ list_elem link; -+ list_elem lru_link; -+} cache_link; -+ -+typedef struct -+{ -+ /* LRU list holds unused items */ -+ unsigned int lru_entries; -+ list_elem lru_list; -+ unsigned int max_free_entries; -+ -+ unsigned int entries; -+ list_elem lists[CACHE_LISTS]; -+ unsigned int (*elem_val)(cache_link *elem); -+ void (*freed)(cache_link *elem); -+} listcache; -+ -+static inline void -+cache_add(listcache *c, cache_link *elem) -+{ -+ unsigned int hash = c->elem_val(elem) % CACHE_LISTS; -+ int delcount = c->lru_entries - c->max_free_entries; -+ -+ if (delcount > 0) { -+ /* Delete some unused items. */ -+ list_elem *lru, *next; -+ cache_link *l; -+ list_for_each_elem_safe(&c->lru_list, lru, next) { -+ l = container_of(lru, cache_link, lru_link); -+ list_del(lru); -+ list_del(&l->link); -+ c->entries--; -+ c->lru_entries--; -+ c->freed(l); -+ delcount--; -+ if (delcount <= 0) -+ break; -+ } -+ } -+ -+ c->entries++; -+ list_item_init(&elem->lru_link); /* Mark it not in the LRU list */ -+ list_add_after(&c->lists[hash], &elem->link); -+} -+ -+static inline void -+cache_item_set_unused(listcache *c, cache_link *elem) -+{ -+ list_add_before(&c->lru_list, &elem->lru_link); -+ c->lru_entries++; -+} -+ -+static inline cache_link * -+cache_find(listcache *c, unsigned int val) -+{ -+ unsigned int hash = val % CACHE_LISTS; -+ list_elem *elem; -+ -+ list_for_each_elem(&c->lists[hash], elem) { -+ cache_link *l = container_of(elem, cache_link, link); -+ if (c->elem_val(l) == val) { -+ if (!list_empty(&l->lru_link)) { -+ /* It's in the unused list, remove it. */ -+ list_del(&l->lru_link); -+ list_item_init(&l->lru_link); -+ c->lru_entries--; -+ } -+ return l; -+ } -+ } -+ return NULL; -+} -+ -+static inline int -+cache_flush(listcache *c) -+{ -+ list_elem *elem, *next; -+ cache_link *l; -+ int i; -+ -+ list_for_each_elem_safe(&c->lru_list, elem, next) { -+ l = container_of(elem, cache_link, lru_link); -+ list_del(elem); -+ list_del(&l->link); -+ c->entries--; -+ c->lru_entries--; -+ c->freed(l); -+ } -+ -+ for (i = 0; i < CACHE_LISTS; i++) { -+ list_for_each_elem_safe(&c->lists[i], elem, next) { -+ l = container_of(elem, cache_link, link); -+ list_del(&l->link); -+ c->entries--; -+ c->freed(l); -+ } -+ } -+ -+ return c->entries || c->lru_entries; -+} -+ -+static inline void -+cache_init(listcache *c, unsigned int max_free_entries, -+ unsigned int (*elem_val)(cache_link *elem), -+ void (*freed)(cache_link *elem)) -+{ -+ int i; -+ -+ c->entries = 0; -+ c->lru_entries = 0; -+ c->max_free_entries = max_free_entries; -+ list_init(&c->lru_list); -+ for (i = 0; i < CACHE_LISTS; i++) -+ list_init(&c->lists[i]); -+ c->elem_val = elem_val; -+ c->freed = freed; -+} -+ -+#endif /* __CACHE_H__ */ -Index: genext2fs-1.4.1/list.h -=================================================================== ---- /dev/null -+++ genext2fs-1.4.1/list.h -@@ -0,0 +1,78 @@ -+#ifndef __LIST_H__ -+#define __LIST_H__ -+ -+#if STDC_HEADERS -+# include -+# include -+#else -+# if HAVE_STDLIB_H -+# include -+# endif -+# if HAVE_STDDEF_H -+# include -+# endif -+#endif -+ -+#ifndef offsetof -+#define offsetof(st, m) \ -+ ((size_t) ( (char *)&((st *)(0))->m - (char *)0 )) -+#endif -+ -+#define container_of(ptr, type, member) ({ \ -+ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ -+ (type *)( (char *)__mptr - offsetof(type,member) );}) -+ -+typedef struct list_elem -+{ -+ struct list_elem *next; -+ struct list_elem *prev; -+} list_elem; -+ -+static inline void list_init(list_elem *list) -+{ -+ list->next = list; -+ list->prev = list; -+} -+ -+static inline void list_add_after(list_elem *pos, list_elem *elem) -+{ -+ elem->next = pos->next; -+ elem->prev = pos; -+ pos->next->prev = elem; -+ pos->next = elem; -+} -+ -+static inline void list_add_before(list_elem *pos, list_elem *elem) -+{ -+ elem->prev = pos->prev; -+ elem->next = pos; -+ pos->prev->next = elem; -+ pos->prev = elem; -+} -+ -+static inline void list_del(list_elem *elem) -+{ -+ elem->next->prev = elem->prev; -+ elem->prev->next = elem->next; -+} -+ -+static inline void list_item_init(list_elem *elem) -+{ -+ elem->next = elem; -+ elem->prev = elem; -+} -+ -+static inline int list_empty(list_elem *elem) -+{ -+ return elem->next == elem; -+} -+ -+#define list_for_each_elem(list, curr) \ -+ for ((curr) = (list)->next; (curr) != (list); (curr) = (curr)->next) -+ -+#define list_for_each_elem_safe(list, curr, next) \ -+ for ((curr) = (list)->next, (next) = (curr)->next; \ -+ (curr) != (list); \ -+ (curr) = (next), (next) = (curr)->next) -+ -+#endif /* __LIST_H__ */ diff --git a/package.bak/genext2fs/Config.in b/package.bak/genext2fs/Config.in deleted file mode 100644 index 2251684d1d..0000000000 --- a/package.bak/genext2fs/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_GENEXT2FS - bool "genext2fs" - help - genext2fs generates an ext2 filesystem as a normal (non-root) - user. It does not require you to mount the image file to - copy files on it, nor does it require that you become the - superuser to make device nodes. - - http://genext2fs.sourceforge.net/ diff --git a/package.bak/genext2fs/Config.in.host b/package.bak/genext2fs/Config.in.host deleted file mode 100644 index a03e16b2e2..0000000000 --- a/package.bak/genext2fs/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_GENEXT2FS - bool "host genext2fs" - help - genext2fs generates an ext2 filesystem as a normal (non-root) - user. It does not require you to mount the image file to - copy files on it, nor does it require that you become the - superuser to make device nodes. - - http://genext2fs.sourceforge.net/ diff --git a/package.bak/genext2fs/genext2fs.hash b/package.bak/genext2fs/genext2fs.hash deleted file mode 100644 index 46b8af352d..0000000000 --- a/package.bak/genext2fs/genext2fs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 404dbbfa7a86a6c3de8225c8da254d026b17fd288e05cec4df2cc7e1f4feecfc genext2fs-1.4.1.tar.gz diff --git a/package.bak/genext2fs/genext2fs.mk b/package.bak/genext2fs/genext2fs.mk deleted file mode 100644 index 528912e9d7..0000000000 --- a/package.bak/genext2fs/genext2fs.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# genext2fs -# -################################################################################ - -GENEXT2FS_VERSION = 1.4.1 -GENEXT2FS_SITE = http://downloads.sourceforge.net/project/genext2fs/genext2fs/$(GENEXT2FS_VERSION) -GENEXT2FS_LICENSE = GPLv2 -GENEXT2FS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch b/package.bak/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch deleted file mode 100644 index 88961e6690..0000000000 --- a/package.bak/gengetopt/0001-fix-compilation-warnings-in-generated-code.patch +++ /dev/null @@ -1,65 +0,0 @@ -Fix compilation warnings in generated code - -Patch taken from open bug report http://savannah.gnu.org/bugs/?40243 -(project gengetopt seems to be dead; no hope for a new release soon) - -Imported by Philippe Mariman. -This description by Thomas De Schampheleire. - -Signed-off-by: Thomas De Schampheleire - -Index: gengetopt-2.22.6/src/skels/c_source.cc -=================================================================== ---- gengetopt-2.22.6.orig/src/skels/c_source.cc 2012-11-07 20:58:29.000000000 +0100 -+++ gengetopt-2.22.6/src/skels/c_source.cc 2014-11-20 12:05:02.597527761 +0100 -@@ -2424,9 +2424,12 @@ - stream << " FIX_UNUSED (field);"; - stream << "\n"; - stream << indent_str; -+ stream << " FIX_UNUSED (stop_char);"; -+ stream << "\n"; -+ stream << indent_str; -+ stream << " FIX_UNUSED (val);"; - stream << "\n"; - stream << indent_str; -- stream << " stop_char = 0;"; - stream << "\n"; - stream << indent_str; - stream << " found = 0;"; -@@ -3981,6 +3984,12 @@ - stream << "\n"; - stream << indent_str; - } -+ else -+ { -+ stream << " FIX_UNUSED (check_required);"; -+ stream << "\n"; -+ stream << indent_str; -+ } - stream << "\n"; - stream << indent_str; - indent = 2; -Index: gengetopt-2.22.6/src/skels/c_source.h_skel -=================================================================== ---- gengetopt-2.22.6.orig/src/skels/c_source.h_skel 2012-11-02 18:43:24.000000000 +0100 -+++ gengetopt-2.22.6/src/skels/c_source.h_skel 2014-11-20 12:05:22.501528424 +0100 -@@ -767,8 +767,9 @@ - char **string_field; - @ENDIF@ - FIX_UNUSED (field); -+ FIX_UNUSED (stop_char); -+ FIX_UNUSED (val); - -- stop_char = 0; - found = 0; - - if (!multiple_option && prev_given && (*prev_given || (check_ambiguity && *field_given))) -@@ -1327,6 +1328,8 @@ - { - error_occurred += @parser_name@_required2 (args_info, argv[0], additional_error); - } -+@ELSE@ -+ FIX_UNUSED (check_required); - @ENDIF@ - - @parser_name@_release (&local_args_info); diff --git a/package.bak/gengetopt/gengetopt.hash b/package.bak/gengetopt/gengetopt.hash deleted file mode 100644 index 4f411ac8b3..0000000000 --- a/package.bak/gengetopt/gengetopt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 30b05a88604d71ef2a42a2ef26cd26df242b41f5b011ad03083143a31d9b01f7 gengetopt-2.22.6.tar.gz diff --git a/package.bak/gengetopt/gengetopt.mk b/package.bak/gengetopt/gengetopt.mk deleted file mode 100644 index b7cbc7f68a..0000000000 --- a/package.bak/gengetopt/gengetopt.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# gengetopt -# -################################################################################ - -GENGETOPT_VERSION = 2.22.6 -GENGETOPT_SITE = $(BR2_GNU_MIRROR)/gengetopt -GENGETOPT_LICENSE = GPLv3+ -GENGETOPT_LICENSE_FILES = COPYING LICENSE - -# Parallel build broken -GENGETOPT_MAKE = $(MAKE1) - -$(eval $(host-autotools-package)) diff --git a/package.bak/genimage/Config.in.host b/package.bak/genimage/Config.in.host deleted file mode 100644 index 5c5a8a8a2c..0000000000 --- a/package.bak/genimage/Config.in.host +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_HOST_GENIMAGE - bool "host genimage" - help - genimage is a tool to generate multiple filesystem and flash - images from a given root filesystem tree. genimage is - intended to be run in a fakeroot environment. - - Configuration is done in a config file parsed by - libconfuse. Options like the path to tools can be given in - environment variables, the config file or commandline - switches. - - http://www.pengutronix.de/software/genimage/ diff --git a/package.bak/genimage/genimage.hash b/package.bak/genimage/genimage.hash deleted file mode 100644 index 4be2fca873..0000000000 --- a/package.bak/genimage/genimage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 69f35af7edf6f4dbdac7a18ddc69dcf38c501e43d8b50c524555754c51479078 genimage-9.tar.xz diff --git a/package.bak/genimage/genimage.mk b/package.bak/genimage/genimage.mk deleted file mode 100644 index 4343d14d48..0000000000 --- a/package.bak/genimage/genimage.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# genimage -# -################################################################################ - -GENIMAGE_VERSION = 9 -GENIMAGE_SOURCE = genimage-$(GENIMAGE_VERSION).tar.xz -GENIMAGE_SITE = http://www.pengutronix.de/software/genimage/download -HOST_GENIMAGE_DEPENDENCIES = host-pkgconf host-libconfuse -GENIMAGE_LICENSE = GPLv2 -GENIMAGE_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) diff --git a/package.bak/genpart/0001-fix-return-code.patch b/package.bak/genpart/0001-fix-return-code.patch deleted file mode 100644 index ec18c82f8c..0000000000 --- a/package.bak/genpart/0001-fix-return-code.patch +++ /dev/null @@ -1,25 +0,0 @@ -genpart: return 0 if partition writen OK, with no do_magic - -If do_magic is false, we don't won't write the 0xaa55 magic. -However, if we succesfully wrote the partition entry, we still -want to return 0 to indicate success. - -Signed-off-by: "Yann E. MORIN" -Cc: Robert Schwebel - --- -Patch sent upstream, but no mailing list. -Status: accepted upstream, not yet released. - -diff -durN host-genpart-1.0.2.orig/src/genpart.c host-genpart-1.0.2/src/genpart.c ---- host-genpart-1.0.2.orig/src/genpart.c 2009-12-20 21:54:56.000000000 +0100 -+++ host-genpart-1.0.2/src/genpart.c 2013-01-22 23:13:24.109752579 +0100 -@@ -92,6 +92,8 @@ - if (do_magic) { - if (fwrite(&magic, 2, 1, stdout) > 0) - rc=0; -+ } else { -+ rc=0; - } - } - return rc; diff --git a/package.bak/genpart/Config.in b/package.bak/genpart/Config.in deleted file mode 100644 index 8d9ec795c9..0000000000 --- a/package.bak/genpart/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_GENPART - bool "genpart" - help - Generate a 16 byte partition table entry defined by command line - arguments and dump it to stdout. No CHS magic is done, only lba - entries are filled out. - - http://www.pengutronix.de/software/genpart/index_en.html diff --git a/package.bak/genpart/Config.in.host b/package.bak/genpart/Config.in.host deleted file mode 100644 index 6cc2a59a70..0000000000 --- a/package.bak/genpart/Config.in.host +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_HOST_GENPART - bool "host genpart" - help - Generate a 16 byte partition table entry defined by command line - arguments and dump it to stdout. No CHS magic is done, only lba - entries are filled out. - - http://www.pengutronix.de/software/genpart/index_en.html diff --git a/package.bak/genpart/genpart.hash b/package.bak/genpart/genpart.hash deleted file mode 100644 index b741dbda14..0000000000 --- a/package.bak/genpart/genpart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bfb39434f31d10f1b8c7b6bc6ec612309838c2819022561541c4d2d5a424e3f2 genpart-1.0.2.tar.bz2 diff --git a/package.bak/genpart/genpart.mk b/package.bak/genpart/genpart.mk deleted file mode 100644 index 2aa2c710c0..0000000000 --- a/package.bak/genpart/genpart.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# genpart -# -################################################################################ - -GENPART_VERSION = 1.0.2 -GENPART_SOURCE = genpart-$(GENPART_VERSION).tar.bz2 -GENPART_SITE = http://www.pengutronix.de/software/genpart/download -# genpart has no license embedded in its source release. -# However, their project page mentions: -# > This community portal offers an overview about our own OSS -# > projects and projects Pengutronix is or was involved with. -# We can thus assume genpart is under a FLOSS license. -# So, until the authors have clarified the licensing terms: -GENPART_LICENSE = Unknown (clarification has been asked to the authors) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/genromfs/0001-build-system.patch b/package.bak/genromfs/0001-build-system.patch deleted file mode 100644 index 827fe75bd2..0000000000 --- a/package.bak/genromfs/0001-build-system.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- - Makefile | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -Index: genromfs-0.5.2/Makefile -=================================================================== ---- genromfs-0.5.2.orig/Makefile -+++ genromfs-0.5.2/Makefile -@@ -6,8 +6,6 @@ - PACKAGE = genromfs - VERSION = 0.5.2 - CC = gcc --CFLAGS = -O2 -Wall -DVERSION=\"$(VERSION)\"#-g# --LDFLAGS = -s#-g - - DISTDIR = $(PACKAGE)-$(VERSION) - -@@ -24,7 +22,7 @@ - $(CC) $(LDFLAGS) genromfs.o -o genromfs - - .c.o: -- $(CC) $(CFLAGS) $< -c -o $@ -+ $(CC) $(CFLAGS) -DVERSION=\"$(VERSION)\" $< -c -o $@ - - clean: - rm -f genromfs *.o diff --git a/package.bak/genromfs/Config.in b/package.bak/genromfs/Config.in deleted file mode 100644 index e4eba9f16a..0000000000 --- a/package.bak/genromfs/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GENROMFS - bool "genromfs" - help - Tool to generate a ROMFS filesystem. - - http://romfs.sourceforge.net/ diff --git a/package.bak/genromfs/genromfs.hash b/package.bak/genromfs/genromfs.hash deleted file mode 100644 index 477e5d2dcb..0000000000 --- a/package.bak/genromfs/genromfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 30f37fc734572c1dbaa2504585bc23ba6b8fd7df767ae7155995b2ca0ebed960 genromfs-0.5.2.tar.gz diff --git a/package.bak/genromfs/genromfs.mk b/package.bak/genromfs/genromfs.mk deleted file mode 100644 index 8db0899812..0000000000 --- a/package.bak/genromfs/genromfs.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# genromfs -# -################################################################################ - -GENROMFS_VERSION = 0.5.2 -GENROMFS_SITE = http://downloads.sourceforge.net/project/romfs/genromfs/$(GENROMFS_VERSION) -GENROMFS_LICENSE = GPLv2+ -GENROMFS_LICENSE_FILES = COPYING - -define GENROMFS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -define GENROMFS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR) install -endef - -define HOST_GENROMFS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_GENROMFS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) PREFIX=$(HOST_DIR) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/geoip/Config.in b/package.bak/geoip/Config.in deleted file mode 100644 index 739a8da0f6..0000000000 --- a/package.bak/geoip/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_GEOIP - bool "geoip" - help - GeoIP is a C library that enables the user to find - geographical and network information of an IP address. - - To use this library, you need to download MaxMind's free - GeoLite or commercial GeoIP binary databases into the - target's /usr/share/GeoIP directory in uncompressed form. - - Note that GeoIP2 / GeoLite2 are not supported by this - library. - - https://github.com/maxmind/geoip-api-c diff --git a/package.bak/geoip/geoip.hash b/package.bak/geoip/geoip.hash deleted file mode 100644 index 505c38f941..0000000000 --- a/package.bak/geoip/geoip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4b446491843de67c1af9b887da17a3e5939e0aeed4826923a5f4bf09d845096f GeoIP-1.6.9.tar.gz diff --git a/package.bak/geoip/geoip.mk b/package.bak/geoip/geoip.mk deleted file mode 100644 index cf3bc1a042..0000000000 --- a/package.bak/geoip/geoip.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# geoip -# -################################################################################ - -GEOIP_VERSION = 1.6.9 -GEOIP_SOURCE = GeoIP-$(GEOIP_VERSION).tar.gz -GEOIP_SITE = https://github.com/maxmind/geoip-api-c/releases/download/v$(GEOIP_VERSION) -GEOIP_INSTALL_STAGING = YES -GEOIP_LICENSE = LGPLv2.1+ -GEOIP_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/gesftpserver/Config.in b/package.bak/gesftpserver/Config.in deleted file mode 100644 index 81cbce9f33..0000000000 --- a/package.bak/gesftpserver/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_GESFTPSERVER - bool "gesftpserver" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Green End SFTP Server - - This is an SFTP server supporting up to protocol version 6. - It is possible to use it as a drop-in replacement for the - OpenSSH server, or to provide sftp support for Dropbear. - - http://www.greenend.org.uk/rjk/sftpserver/ - -comment "gesftpserver needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gesftpserver/gesftpserver.hash b/package.bak/gesftpserver/gesftpserver.hash deleted file mode 100644 index b4c9fdf52c..0000000000 --- a/package.bak/gesftpserver/gesftpserver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5f744c38df9bb82f5ab500858a0fb4767ac3ee2254301da03cbcf8e6c587cbf5 sftpserver-0.2.1.tar.gz diff --git a/package.bak/gesftpserver/gesftpserver.mk b/package.bak/gesftpserver/gesftpserver.mk deleted file mode 100644 index 25c947a78b..0000000000 --- a/package.bak/gesftpserver/gesftpserver.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# gesftpserver -# -################################################################################ - -GESFTPSERVER_VERSION = 0.2.1 -GESFTPSERVER_SOURCE = sftpserver-$(GESFTPSERVER_VERSION).tar.gz -GESFTPSERVER_SITE = http://www.greenend.org.uk/rjk/sftpserver -GESFTPSERVER_LICENSE = GPLv2+ -GESFTPSERVER_LICENSE_FILES = COPYING -# forgets to link against pthread when cross compiling -GESFTPSERVER_CONF_ENV = LIBS=-lpthread - -# overwrite openssh version if enabled -GESFTPSERVER_DEPENDENCIES += \ - $(if $(BR2_ENABLE_LOCALE),,libiconv) \ - $(if $(BR2_PACKAGE_OPENSSH),openssh) - -# openssh/dropbear looks here -define GESFTPSERVER_ADD_SYMLINK - ln -sf gesftpserver $(TARGET_DIR)/usr/libexec/sftp-server -endef - -GESFTPSERVER_POST_INSTALL_TARGET_HOOKS += GESFTPSERVER_ADD_SYMLINK - -$(eval $(autotools-package)) diff --git a/package.bak/getent/Config.in b/package.bak/getent/Config.in deleted file mode 100644 index a7303cb969..0000000000 --- a/package.bak/getent/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GETENT - bool "getent" - help - This package installs the 'getent' utility, which allows to - get entries from Name Service Switch libraries. For glibc - toolchains, it's the real getent program from the C library - that gets installed, which is NSS-capable. For uclibc and - musl toolchains, it's a simple wrapper script that emulates - getent's behavior, since there is no NSS support in uclibc - and musl. diff --git a/package.bak/getent/getent b/package.bak/getent/getent deleted file mode 100644 index fdda79363a..0000000000 --- a/package.bak/getent/getent +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# $Header: /var/cvs/uClibc/extra/scripts/getent,v 1.2 2005/02/02 14:18:01 solar Exp $ -# -# Closely (not perfectly) emulate the behavior of glibc's getent utility -# -#passwd|shadow|group|aliases|hosts|networks|ethers|netgroup|protocols|services|rpc -# only returns the first match (by design) -# dns based search is not supported (hosts,networks) -# case-insensitive matches not supported (ethers; others?) -# may return false-positives (hosts,protocols,rpc,services,ethers) -# -# Taken from uClibc 0.9.33. - -export PATH="${PATH}:/bin:/usr/bin" - -file="/etc/$1" -case $1 in - passwd|group) - match="^$2:\|^[^:]*:[^:]*:$2:" ;; - shadow) - match="^$2:" ;; - networks|netgroup) - match="^[[:space:]]*$2\>" ;; - hosts|protocols|rpc|services|ethers) - match="\<$2\>" ;; - aliases) - match="^[[:space:]]*$2[[:space:]]*:" ;; - ""|-h|--help) - echo "USAGE: $0 database [key]" - exit 0 ;; - *) - echo "$0: Unknown database: $1" 1>&2 - exit 1 ;; -esac - -if [ ! -f "$file" ] ; then - echo "$0: Could not find database file for $1" 1>&2 - exit 1 -fi - -if [ $# -eq 1 ] ; then - exec cat "$file" -else - sed "s/#.*//; /$match/q; d" "$file" | grep . || exit 2 -fi diff --git a/package.bak/getent/getent.mk b/package.bak/getent/getent.mk deleted file mode 100644 index ed249e8d45..0000000000 --- a/package.bak/getent/getent.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# getent -# -################################################################################ - -GETENT_LICENSE = LGPLv2.1+ - -# For glibc toolchains, we use the getent program built/installed by -# the C library. For other toolchains, we use the wrapper script -# included in this package. -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),y) -# Sourcery toolchains install it in sysroot/usr/lib/bin -# Buildroot toolchains install it in sysroot/usr/bin -GETENT_LOCATION = $(firstword $(wildcard \ - $(STAGING_DIR)/usr/bin/getent \ - $(STAGING_DIR)/usr/lib/bin/getent)) -else -GETENT_LOCATION = package/getent/getent -endif - -define GETENT_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(GETENT_LOCATION) $(TARGET_DIR)/usr/bin/getent -endef - -$(eval $(generic-package)) diff --git a/package.bak/gettext/0001-error_print_progname.patch b/package.bak/gettext/0001-error_print_progname.patch deleted file mode 100644 index 189d28b576..0000000000 --- a/package.bak/gettext/0001-error_print_progname.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- gettext-0.16.1.oorig/gettext-tools/gnulib-lib/error.h 2006-11-27 18:14:50.000000000 +0100 -+++ gettext-0.16.1/gettext-tools/gnulib-lib/error.h 2007-06-20 13:29:32.000000000 +0200 -@@ -50,7 +50,10 @@ extern void error_at_line (int __status, - /* If NULL, error will flush stdout, then print on stderr the program - name, a colon and a space. Otherwise, error will call this - function without parameters instead. */ --extern DLL_VARIABLE void (*error_print_progname) (void); -+#ifndef __UCLIBC__ -+extern DLL_VARIABLE -+#endif -+void (*error_print_progname) (void); - - /* This variable is incremented each time `error' is called. */ - extern DLL_VARIABLE unsigned int error_message_count; diff --git a/package.bak/gettext/Config.in b/package.bak/gettext/Config.in deleted file mode 100644 index 7871a480a8..0000000000 --- a/package.bak/gettext/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_GETTEXT - bool "gettext" - depends on BR2_USE_WCHAR - help - The GNU `gettext' utilities are a set of tools that provide a - framework to help other GNU packages produce multi-lingual - messages. - - Only the libintl library will be installed in the - target. The full gettext suite, including tools, will be - installed in the staging directory. - - http://www.gnu.org/software/gettext/ - -comment "gettext needs a toolchain w/ wchar" - depends on BR2_NEEDS_GETTEXT - depends on !BR2_USE_WCHAR diff --git a/package.bak/gettext/gettext.hash b/package.bak/gettext/gettext.hash deleted file mode 100644 index cff6eb1090..0000000000 --- a/package.bak/gettext/gettext.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.gnu.org/archive/html/bug-gettext/2016-06/msg00008.html -md5 df3f5690eaa30fd228537b00cb7b7590 gettext-0.19.8.1.tar.xz -sha1 e0fe90ede22f7f16bbde7bdea791a835f2773fc9 gettext-0.19.8.1.tar.xz diff --git a/package.bak/gettext/gettext.mk b/package.bak/gettext/gettext.mk deleted file mode 100644 index 1435388ead..0000000000 --- a/package.bak/gettext/gettext.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# gettext -# -################################################################################ - -GETTEXT_VERSION = 0.19.8.1 -GETTEXT_SITE = $(BR2_GNU_MIRROR)/gettext -GETTEXT_SOURCE = gettext-$(GETTEXT_VERSION).tar.xz -GETTEXT_INSTALL_STAGING = YES -GETTEXT_LICENSE = LGPLv2.1+ (libintl), GPLv3+ (the rest) -GETTEXT_LICENSE_FILES = COPYING gettext-runtime/intl/COPYING.LIB - -GETTEXT_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -# Avoid using the bundled subset of libxml2 -HOST_GETTEXT_DEPENDENCIES = host-libxml2 - -GETTEXT_CONF_OPTS += \ - --disable-libasprintf \ - --disable-acl \ - --disable-openmp \ - --disable-rpath \ - --disable-java \ - --disable-native-java \ - --disable-csharp \ - --disable-relocatable \ - --without-emacs - -HOST_GETTEXT_CONF_OPTS = \ - --disable-libasprintf \ - --disable-acl \ - --disable-openmp \ - --disable-rpath \ - --disable-java \ - --disable-native-java \ - --disable-csharp \ - --disable-relocatable \ - --without-emacs - -# For the target version, we only need the runtime, and for the host -# version, we only need the tools. -GETTEXT_SUBDIR = gettext-runtime -HOST_GETTEXT_SUBDIR = gettext-tools - -# Disable the build of documentation and examples of gettext-tools, -# and the build of documentation and tests of gettext-runtime. -define HOST_GETTEXT_DISABLE_UNNEEDED - $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/examples$$//' $(@D)/gettext-tools/Makefile.in - $(SED) '/^SUBDIRS/s/ doc //;/^SUBDIRS/s/tests$$//' $(@D)/gettext-runtime/Makefile.in -endef - -GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED -HOST_GETTEXT_POST_PATCH_HOOKS += HOST_GETTEXT_DISABLE_UNNEEDED - -define GETTEXT_REMOVE_UNNEEDED - $(RM) -rf $(TARGET_DIR)/usr/share/gettext/ABOUT-NLS - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/gettext -endef - -GETTEXT_POST_INSTALL_TARGET_HOOKS += GETTEXT_REMOVE_UNNEEDED - -# Force build with NLS support, otherwise libintl is not built -# This is needed because some packages (eg. libglib2) requires -# locales, but do not properly depend on BR2_ENABLE_LOCALE, and -# instead select BR2_PACKAGE_GETTEXT. Those packages need to be -# fixed before we can remove the following 3 lines... :-( -ifeq ($(BR2_ENABLE_LOCALE),) -GETTEXT_CONF_OPTS += --enable-nls -endif - -# Disable interactive confirmation in host gettextize for package fixups -define HOST_GETTEXT_GETTEXTIZE_CONFIRMATION - $(SED) '/read dummy/d' $(HOST_DIR)/usr/bin/gettextize -endef -HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_GETTEXTIZE_CONFIRMATION - -# autoreconf expects gettextize to install ABOUT-NLS, but it only gets -# installed by gettext-runtime which we don't build/install for the -# host, so do it manually -define HOST_GETTEXT_ADD_ABOUT_NLS - $(INSTALL) -m 0644 $(@D)/$(HOST_GETTEXT_SUBDIR)/ABOUT-NLS \ - $(HOST_DIR)/usr/share/gettext/ABOUT-NLS -endef - -HOST_GETTEXT_POST_INSTALL_HOOKS += HOST_GETTEXT_ADD_ABOUT_NLS - -GETTEXTIZE = $(HOST_CONFIGURE_OPTS) AUTOM4TE=$(HOST_DIR)/usr/bin/autom4te $(HOST_DIR)/usr/bin/gettextize -f - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gflags/Config.in b/package.bak/gflags/Config.in deleted file mode 100644 index ed059445ba..0000000000 --- a/package.bak/gflags/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GFLAGS - bool "gflags" - depends on BR2_INSTALL_LIBSTDCPP - help - The gflags package contains a C++ library that implements - commandline flags processing. It includes built-in support for - standard types such as string and the ability to define flags - in the source file in which they are used. - - https://github.com/gflags/gflags - -comment "gflags needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/gflags/gflags.hash b/package.bak/gflags/gflags.hash deleted file mode 100644 index 5b224113d9..0000000000 --- a/package.bak/gflags/gflags.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d8331bd0f7367c8afd5fcb5f5e85e96868a00fd24b7276fa5fcee1e5575c2662 gflags-v2.1.2.tar.gz diff --git a/package.bak/gflags/gflags.mk b/package.bak/gflags/gflags.mk deleted file mode 100644 index 89111ed987..0000000000 --- a/package.bak/gflags/gflags.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gflags -# -################################################################################ - -GFLAGS_VERSION = v2.1.2 -GFLAGS_SITE = $(call github,gflags,gflags,$(GFLAGS_VERSION)) -GFLAGS_INSTALL_STAGING = YES -GFLAGS_LICENSE = BSD-3c -GFLAGS_LICENSE_FILES = COPYING.txt - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -GFLAGS_CONF_OPTS = -DBUILD_gflags_LIB=OFF \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -DNO_THREADS" -endif - -$(eval $(cmake-package)) diff --git a/package.bak/ghostscript-fonts/Config.in b/package.bak/ghostscript-fonts/Config.in deleted file mode 100644 index 80bfbd03ef..0000000000 --- a/package.bak/ghostscript-fonts/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_GHOSTSCRIPT_FONTS - bool "ghostscript-fonts" - help - Fonts and font metrics customarily distributed with Ghostscript. - Currently includes the 35 standard PostScript fonts and a - grab-bag of others. - - http://sourceforge.net/projects/gs-fonts diff --git a/package.bak/ghostscript-fonts/ghostscript-fonts.hash b/package.bak/ghostscript-fonts/ghostscript-fonts.hash deleted file mode 100644 index e9c7fdf999..0000000000 --- a/package.bak/ghostscript-fonts/ghostscript-fonts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/gs-fonts/files/gs-fonts/8.11%20%28base%2035%2C%20GPL%29/ -sha1 2a7198e8178b2e7dba87cb5794da515200b568f5 ghostscript-fonts-std-8.11.tar.gz diff --git a/package.bak/ghostscript-fonts/ghostscript-fonts.mk b/package.bak/ghostscript-fonts/ghostscript-fonts.mk deleted file mode 100644 index fa5c4b7e97..0000000000 --- a/package.bak/ghostscript-fonts/ghostscript-fonts.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# ghostscript-fonts -# -################################################################################ - -GHOSTSCRIPT_FONTS_VERSION = 8.11 -GHOSTSCRIPT_FONTS_SITE = http://downloads.sourceforge.net/project/gs-fonts/gs-fonts/8.11%20%28base%2035%2C%20GPL%29 -GHOSTSCRIPT_FONTS_SOURCE = ghostscript-fonts-std-$(GHOSTSCRIPT_FONTS_VERSION).tar.gz -GHOSTSCRIPT_FONTS_LICENSE = GPLv2 -GHOSTSCRIPT_FONTS_LICENSE_FILES = COPYING - -GHOSTSCRIPT_FONTS_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/gs - -define GHOSTSCRIPT_FONTS_INSTALL_TARGET_CMDS - mkdir -p $(GHOSTSCRIPT_FONTS_TARGET_DIR) - $(INSTALL) -m 644 $(@D)/*.afm $(GHOSTSCRIPT_FONTS_TARGET_DIR) - $(INSTALL) -m 644 $(@D)/*.pfb $(GHOSTSCRIPT_FONTS_TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/giblib/0001-fix-imlib2-detection.patch b/package.bak/giblib/0001-fix-imlib2-detection.patch deleted file mode 100644 index 2323107941..0000000000 --- a/package.bak/giblib/0001-fix-imlib2-detection.patch +++ /dev/null @@ -1,127 +0,0 @@ -configure.ac + Makefile.am: fix the imlib2 detection - -Although imlib2 is correctly checked for, the variables used to get -the CFLAGS and LIBS are wrong (perhaps a remnant of the pre-imlib2 -era, when giblib was using imlib). - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.ac b/configure.ac -index 6807d86..c8874f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,16 +18,10 @@ AM_MAINTAINER_MODE - AM_WITH_DMALLOC - - AC_PATH_GENERIC(imlib2, 1.0.0, [ -- AC_SUBST(IMLIB_LIBS) -- AC_SUBST(IMLIB_CFLAGS) ], -+ AC_SUBST(IMLIB2_LIBS) -+ AC_SUBST(IMLIB2_CFLAGS) ], - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) - --dnl the above doesn't work for some reason :/ --IMLIB_LIBS=`imlib2-config --libs` --IMLIB_CFLAGS=`imlib2-config --cflags` --AC_SUBST(IMLIB_LIBS) --AC_SUBST(IMLIB_CFLAGS) -- - LIBS="$LIBS -lm" - CFLAGS="$CFLAGS -Wall" - -@@ -48,7 +42,7 @@ $PACKAGE $VERSION - Configuration: - -------------- - --Imlib2 libs: $IMLIB_LIBS --Imlib2 cflags: $IMLIB_CFLAGS -+Imlib2 libs: $IMLIB2_LIBS -+Imlib2 cflags: $IMLIB2_CFLAGS - CFLAGS: $CFLAGS - " -diff --git a/configure.in b/configure.in -index 432cb16..6999095 100644 ---- a/configure.in -+++ b/configure.in -@@ -17,16 +17,10 @@ AM_MAINTAINER_MODE - AM_WITH_DMALLOC - - AC_PATH_GENERIC(imlib2, 1.0.0, [ -- AC_SUBST(IMLIB_LIBS) -- AC_SUBST(IMLIB_CFLAGS) ], -+ AC_SUBST(IMLIB2_LIBS) -+ AC_SUBST(IMLIB2_CFLAGS) ], - AC_MSG_ERROR(Cannot find imlib2: Is imlib2-config in the path?) ) - --dnl the above doesn't work for some reason :/ --IMLIB_LIBS=`imlib2-config --libs` --IMLIB_CFLAGS=`imlib2-config --cflags` --AC_SUBST(IMLIB_LIBS) --AC_SUBST(IMLIB_CFLAGS) -- - LIBS="$LIBS -lm" - CFLAGS="$CFLAGS -Wall" - -@@ -45,7 +39,7 @@ $PACKAGE $VERSION - Configuration: - -------------- - --Imlib2 libs: $IMLIB_LIBS --Imlib2 cflags: $IMLIB_CFLAGS -+Imlib2 libs: $IMLIB2_LIBS -+Imlib2 cflags: $IMLIB2_CFLAGS - CFLAGS: $CFLAGS - " -diff --git a/giblib-config.in b/giblib-config.in -index f3a7db6..cef1620 100644 ---- a/giblib-config.in -+++ b/giblib-config.in -@@ -42,11 +42,11 @@ while test $# -gt 0; do - if test @includedir@ != /usr/include ; then - includes=-I@includedir@ - fi -- echo $includes -I$prefix/include/giblib @IMLIB_CFLAGS@ -+ echo $includes -I$prefix/include/giblib @IMLIB2_CFLAGS@ - ;; - --libs) - libdirs=-L@libdir@ -- echo $libdirs -lgiblib @LDFLAGS@ @IMLIB_LIBS@ -+ echo $libdirs -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ - ;; - *) - echo "${usage}" 1>&2 -diff --git a/giblib.pc.in b/giblib.pc.in -index df520ae..783e6e1 100644 ---- a/giblib.pc.in -+++ b/giblib.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: giblib - Description: wrapper library for imlib2, and other stuff - Version: @VERSION@ --Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB_LIBS@ --Cflags: -I${includedir} -I${includedir}/giblib @IMLIB_CFLAGS@ -+Libs: -L${libdir} -lgiblib @LDFLAGS@ @IMLIB2_LIBS@ -+Cflags: -I${includedir} -I${includedir}/giblib @IMLIB2_CFLAGS@ - -diff --git a/giblib/Makefile.am b/giblib/Makefile.am -index d1edc09..49d8ac4 100644 ---- a/giblib/Makefile.am -+++ b/giblib/Makefile.am -@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in - - INCLUDES = \ - -I. -I$(top_srcdir) \ ---DPREFIX=\""$(prefix)"\" @IMLIB_CFLAGS@ -+-DPREFIX=\""$(prefix)"\" @IMLIB2_CFLAGS@ - - lib_LTLIBRARIES = libgiblib.la - -@@ -24,7 +24,7 @@ libgiblib_la_SOURCES = \ - gib_utils.c gib_utils.h \ - gib_queue.c gib_queue.h - --libgiblib_la_LIBADD = @IMLIB_LIBS@ -+libgiblib_la_LIBADD = @IMLIB2_LIBS@ - libgiblib_la_DEPENDENCIES = giblib_config.h - libgiblib_la_LDFLAGS = -version-info 1:6:0 - diff --git a/package.bak/giblib/Config.in b/package.bak/giblib/Config.in deleted file mode 100644 index f50271ac53..0000000000 --- a/package.bak/giblib/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GIBLIB - bool "giblib" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_IMLIB2 - select BR2_PACKAGE_IMLIB2_X - help - Giblib is a simple library which wraps imlib2. - - http://linuxbrit.co.uk/giblib/ - -comment "giblib support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/giblib/giblib.hash b/package.bak/giblib/giblib.hash deleted file mode 100644 index 942aee705b..0000000000 --- a/package.bak/giblib/giblib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 176611c4d88d742ea4013991ad54c2f9d2feefbc97a28434c0f48922ebaa8bac giblib-1.2.4.tar.gz diff --git a/package.bak/giblib/giblib.mk b/package.bak/giblib/giblib.mk deleted file mode 100644 index b0a962001d..0000000000 --- a/package.bak/giblib/giblib.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# giblib -# -################################################################################ - -GIBLIB_VERSION = 1.2.4 -GIBLIB_SITE = http://linuxbrit.co.uk/downloads -GIBLIB_INSTALL_STAGING = YES -GIBLIB_DEPENDENCIES = imlib2 -GIBLIB_AUTORECONF = YES -GIBLIB_CONF_OPTS = \ - --with-imlib2-prefix=$(STAGING_DIR)/usr \ - --with-imlib2-exec-prefix=$(STAGING_DIR)/usr -GIBLIB_CONFIG_SCRIPTS = giblib-config -GIBLIB_LICENSE = MIT -GIBLIB_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/giflib/Config.in b/package.bak/giflib/Config.in deleted file mode 100644 index fc1f85d093..0000000000 --- a/package.bak/giflib/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GIFLIB - bool "giflib" - help - giflib is a library for reading and writing gif images. - - http://sourceforge.net/projects/giflib diff --git a/package.bak/giflib/giflib.hash b/package.bak/giflib/giflib.hash deleted file mode 100644 index cdd7bbdecd..0000000000 --- a/package.bak/giflib/giflib.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/giflib/files -md5 2c171ced93c0e83bb09e6ccad8e3ba2b giflib-5.1.4.tar.bz2 -sha1 5f1157cfc377916280849e247b8e34fa0446513f giflib-5.1.4.tar.bz2 diff --git a/package.bak/giflib/giflib.mk b/package.bak/giflib/giflib.mk deleted file mode 100644 index 799ae73226..0000000000 --- a/package.bak/giflib/giflib.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# giflib -# -################################################################################ - -GIFLIB_VERSION = 5.1.4 -GIFLIB_SOURCE = giflib-$(GIFLIB_VERSION).tar.bz2 -GIFLIB_SITE = http://downloads.sourceforge.net/project/giflib -GIFLIB_INSTALL_STAGING = YES -GIFLIB_LICENSE = MIT -GIFLIB_LICENSE_FILES = COPYING - -GIFLIB_BINS = \ - gif2epsn gif2ps gif2rgb gif2x11 gifasm gifbg gifbuild gifburst gifclip \ - gifclrmp gifcolor gifcomb gifcompose gifecho giffiltr giffix gifflip \ - gifhisto gifinfo gifinter gifinto gifovly gifpos gifrotat \ - gifrsize gifspnge giftext giftool gifwedge icon2gif raw2gif rgb2gif \ - text2gif - -define GIFLIB_BINS_CLEANUP - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,$(GIFLIB_BINS)) -endef - -GIFLIB_POST_INSTALL_TARGET_HOOKS += GIFLIB_BINS_CLEANUP - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/git-crypt/Config.in b/package.bak/git-crypt/Config.in deleted file mode 100644 index 362fe9a600..0000000000 --- a/package.bak/git-crypt/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_GIT_CRYPT - bool "git-crypt" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # git - select BR2_PACKAGE_GIT # runtime - select BR2_PACKAGE_OPENSSL - help - git-crypt enables transparent encryption and decryption of - files in a git repository. - - https://www.agwa.name/projects/git-crypt/ - -comment "git-crypt needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU diff --git a/package.bak/git-crypt/git-crypt.hash b/package.bak/git-crypt/git-crypt.hash deleted file mode 100644 index 8589f03f71..0000000000 --- a/package.bak/git-crypt/git-crypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: https://lists.cloudmutt.com/pipermail/git-crypt-announce/2015-May/000003.html -sha256 0a8f92c0a0a125bf768d0c054d947ca4e4b8d6556454b0e7e87fb907ee17cf06 git-crypt-0.5.0.tar.gz diff --git a/package.bak/git-crypt/git-crypt.mk b/package.bak/git-crypt/git-crypt.mk deleted file mode 100644 index 7785ddcfd9..0000000000 --- a/package.bak/git-crypt/git-crypt.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# git-crypt -# -################################################################################ - -GIT_CRYPT_VERSION = 0.5.0 -GIT_CRYPT_SITE = https://www.agwa.name/projects/git-crypt/downloads -GIT_CRYPT_DEPENDENCIES = host-pkgconf openssl -GIT_CRYPT_LICENSE = GPLv3+, MIT -GIT_CRYPT_LICENSE_FILES = COPYING parse_options.hpp - -GIT_CRYPT_LIBS = `$(PKG_CONFIG_HOST_BINARY) --libs openssl` - -define GIT_CRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(TARGET_LDFLAGS) $(GIT_CRYPT_LIBS)" PREFIX=/usr -endef - -define GIT_CRYPT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/git/Config.in b/package.bak/git/Config.in deleted file mode 100644 index 9babbecf06..0000000000 --- a/package.bak/git/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GIT - bool "git" - depends on BR2_USE_MMU # uses fork() - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Git is a free and open source distributed version control system - designed to handle everything from small to very large projects. - - http://git-scm.com diff --git a/package.bak/git/git.hash b/package.bak/git/git.hash deleted file mode 100644 index 07ed47bd03..0000000000 --- a/package.bak/git/git.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: https://www.kernel.org/pub/software/scm/git/sha256sums.asc -sha256 c0a779cae325d48a1d5ba08b6ee1febcc31d0657a6da01fd1dec1c6e10976415 git-2.11.1.tar.xz diff --git a/package.bak/git/git.mk b/package.bak/git/git.mk deleted file mode 100644 index 1c15740076..0000000000 --- a/package.bak/git/git.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# git -# -################################################################################ - -GIT_VERSION = 2.11.1 -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 - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -GIT_DEPENDENCIES += openssl -GIT_CONF_OPTS += --with-openssl -GIT_CONF_ENV_LIBS += $(if $(BR2_STATIC_LIBS),-lz) -else -GIT_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_PERL),y) -GIT_DEPENDENCIES += perl -GIT_CONF_OPTS += --with-libpcre -else -GIT_CONF_OPTS += --without-libpcre -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -GIT_DEPENDENCIES += libcurl -GIT_CONF_OPTS += --with-curl -GIT_CONF_ENV += \ - ac_cv_prog_curl_config=$(STAGING_DIR)/usr/bin/$(LIBCURL_CONFIG_SCRIPTS) -else -GIT_CONF_OPTS += --without-curl -endif - -ifeq ($(BR2_PACKAGE_EXPAT),y) -GIT_DEPENDENCIES += expat -GIT_CONF_OPTS += --with-expat -else -GIT_CONF_OPTS += --without-expat -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -GIT_DEPENDENCIES += libiconv -GIT_CONF_ENV_LIBS += -liconv -GIT_CONF_OPTS += --with-iconv=/usr/lib -else -GIT_CONF_OPTS += --without-iconv -endif - -ifeq ($(BR2_PACKAGE_TCL),y) -GIT_DEPENDENCIES += tcl -GIT_CONF_OPTS += --with-tcltk -else -GIT_CONF_OPTS += --without-tcltk -endif - -# assume yes for these tests, configure will bail out otherwise -# saying error: cannot run test program while cross compiling -GIT_CONF_ENV += \ - ac_cv_fread_reads_directories=yes \ - ac_cv_snprintf_returns_bogus=yes LIBS='$(GIT_CONF_ENV_LIBS)' - -$(eval $(autotools-package)) diff --git a/package.bak/glib-networking/Config.in b/package.bak/glib-networking/Config.in deleted file mode 100644 index 01d8552f80..0000000000 --- a/package.bak/glib-networking/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GLIB_NETWORKING - bool "glib-networking" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - Network-related GIO modules for glib. - -comment "glib-networking needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/glib-networking/glib-networking.hash b/package.bak/glib-networking/glib-networking.hash deleted file mode 100644 index bbcecb7ad2..0000000000 --- a/package.bak/glib-networking/glib-networking.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.50/glib-networking-2.50.0.sha256sum -sha256 3f1a442f3c2a734946983532ce59ed49120319fdb10c938447c373d5e5286bee glib-networking-2.50.0.tar.xz diff --git a/package.bak/glib-networking/glib-networking.mk b/package.bak/glib-networking/glib-networking.mk deleted file mode 100644 index d3077e9a9b..0000000000 --- a/package.bak/glib-networking/glib-networking.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# glib-networking -# -################################################################################ - -GLIB_NETWORKING_VERSION_MAJOR = 2.50 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0 -GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR) -GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz -GLIB_NETWORKING_INSTALL_STAGING = YES -GLIB_NETWORKING_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - host-pkgconf \ - host-intltool \ - libglib2 -GLIB_NETWORKING_CONF_OPTS = \ - --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt -GLIB_NETWORKING_LICENSE = LGPLv2+ -GLIB_NETWORKING_LICENSE_FILES = COPYING -GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \ - GIO_MODULE_DIR=/usr/lib/gio/modules install - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -GLIB_NETWORKING_DEPENDENCIES += gnutls -GLIB_NETWORKING_CONF_OPTS += --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -GLIB_NETWORKING_CONF_OPTS += --without-gnutls -endif - -$(eval $(autotools-package)) diff --git a/package.bak/glibc/2.22/0001-fix-CVE-2015-7547.patch b/package.bak/glibc/2.22/0001-fix-CVE-2015-7547.patch deleted file mode 100644 index 19b8b6ebd8..0000000000 --- a/package.bak/glibc/2.22/0001-fix-CVE-2015-7547.patch +++ /dev/null @@ -1,236 +0,0 @@ -Fetched from gentoo glibc patchball -Original patch filename: 10_all_glibc-CVE-2015-7547.patch -Based on: https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html - -Fixes: -CVE-2015-7547 - glibc getaddrinfo stack-based buffer overflow. - -Signed-off-by: Gustavo Zacarias - ---- a/resolv/nss_dns/dns-host.c -+++ b/resolv/nss_dns/dns-host.c -@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, - int h_namelen = 0; - - if (ancount == 0) -- return NSS_STATUS_NOTFOUND; -+ { -+ *h_errnop = HOST_NOT_FOUND; -+ return NSS_STATUS_NOTFOUND; -+ } - - while (ancount-- > 0 && cp < end_of_message && had_error == 0) - { -@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname, - /* Special case here: if the resolver sent a result but it only - contains a CNAME while we are looking for a T_A or T_AAAA record, - we fail with NOTFOUND instead of TRYAGAIN. */ -- return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND; -+ if (canon != NULL) -+ { -+ *h_errnop = HOST_NOT_FOUND; -+ return NSS_STATUS_NOTFOUND; -+ } -+ -+ *h_errnop = NETDB_INTERNAL; -+ return NSS_STATUS_TRYAGAIN; - } - - -@@ -1242,8 +1252,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2, - &pat, &buffer, &buflen, - errnop, h_errnop, ttlp, - &first); -+ /* Use the second response status in some cases. */ - if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND) - status = status2; -+ /* Do not return a truncated second response (unless it was -+ unavoidable e.g. unrecoverable TRYAGAIN). */ -+ if (status == NSS_STATUS_SUCCESS -+ && (status2 == NSS_STATUS_TRYAGAIN -+ && *errnop == ERANGE && *h_errnop != NO_RECOVERY)) -+ status = NSS_STATUS_TRYAGAIN; - } - - return status; ---- a/resolv/res_query.c -+++ b/resolv/res_query.c -@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - } -@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - -@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp, - { - free (*answerp2); - *answerp2 = NULL; -+ *nanswerp2 = 0; - *answerp2_malloced = 0; - } - if (saved_herrno != -1) ---- a/resolv/res_send.c -+++ b/resolv/res_send.c -@@ -639,11 +639,7 @@ send_vc(res_state statp, - { - const HEADER *hp = (HEADER *) buf; - const HEADER *hp2 = (HEADER *) buf2; -- u_char *ans = *ansp; -- int orig_anssizp = *anssizp; -- // XXX REMOVE -- // int anssiz = *anssizp; -- HEADER *anhp = (HEADER *) ans; -+ HEADER *anhp = (HEADER *) *ansp; - struct sockaddr *nsap = get_nsaddr (statp, ns); - int truncating, connreset, n; - /* On some architectures compiler might emit a warning indicating -@@ -767,35 +763,6 @@ send_vc(res_state statp, - assert (anscp != NULL || ansp2 == NULL); - thisresplenp = &resplen; - } else { -- if (*anssizp != MAXPACKET) { -- /* No buffer allocated for the first -- reply. We can try to use the rest -- of the user-provided buffer. */ --#if __GNUC_PREREQ (4, 7) -- DIAG_PUSH_NEEDS_COMMENT; -- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized"); --#endif --#if _STRING_ARCH_unaligned -- *anssizp2 = orig_anssizp - resplen; -- *ansp2 = *ansp + resplen; --#else -- int aligned_resplen -- = ((resplen + __alignof__ (HEADER) - 1) -- & ~(__alignof__ (HEADER) - 1)); -- *anssizp2 = orig_anssizp - aligned_resplen; -- *ansp2 = *ansp + aligned_resplen; --#endif --#if __GNUC_PREREQ (4, 7) -- DIAG_POP_NEEDS_COMMENT; --#endif -- } else { -- /* The first reply did not fit into the -- user-provided buffer. Maybe the second -- answer will. */ -- *anssizp2 = orig_anssizp; -- *ansp2 = *ansp; -- } -- - thisanssizp = anssizp2; - thisansp = ansp2; - thisresplenp = resplen2; -@@ -804,10 +771,14 @@ send_vc(res_state statp, - anhp = (HEADER *) *thisansp; - - *thisresplenp = rlen; -- if (rlen > *thisanssizp) { -- /* Yes, we test ANSCP here. If we have two buffers -- both will be allocatable. */ -- if (__glibc_likely (anscp != NULL)) { -+ /* Is the answer buffer too small? */ -+ if (*thisanssizp < rlen) { -+ /* If the current buffer is not the the static -+ user-supplied buffer then we can reallocate -+ it. */ -+ if (thisansp != NULL && thisansp != ansp) { -+ /* Always allocate MAXPACKET, callers expect -+ this specific size. */ - u_char *newp = malloc (MAXPACKET); - if (newp == NULL) { - *terrno = ENOMEM; -@@ -957,8 +928,6 @@ send_dg(res_state statp, - { - const HEADER *hp = (HEADER *) buf; - const HEADER *hp2 = (HEADER *) buf2; -- u_char *ans = *ansp; -- int orig_anssizp = *anssizp; - struct timespec now, timeout, finish; - struct pollfd pfd[1]; - int ptimeout; -@@ -1154,50 +1123,48 @@ send_dg(res_state statp, - assert (anscp != NULL || ansp2 == NULL); - thisresplenp = &resplen; - } else { -- if (*anssizp != MAXPACKET) { -- /* No buffer allocated for the first -- reply. We can try to use the rest -- of the user-provided buffer. */ --#if _STRING_ARCH_unaligned -- *anssizp2 = orig_anssizp - resplen; -- *ansp2 = *ansp + resplen; --#else -- int aligned_resplen -- = ((resplen + __alignof__ (HEADER) - 1) -- & ~(__alignof__ (HEADER) - 1)); -- *anssizp2 = orig_anssizp - aligned_resplen; -- *ansp2 = *ansp + aligned_resplen; --#endif -- } else { -- /* The first reply did not fit into the -- user-provided buffer. Maybe the second -- answer will. */ -- *anssizp2 = orig_anssizp; -- *ansp2 = *ansp; -- } -- - thisanssizp = anssizp2; - thisansp = ansp2; - thisresplenp = resplen2; - } - - if (*thisanssizp < MAXPACKET -- /* Yes, we test ANSCP here. If we have two buffers -- both will be allocatable. */ -- && anscp -+ /* If the current buffer is not the the static -+ user-supplied buffer then we can reallocate -+ it. */ -+ && (thisansp != NULL && thisansp != ansp) - #ifdef FIONREAD -+ /* Is the size too small? */ - && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0 - || *thisanssizp < *thisresplenp) - #endif - ) { -+ /* Always allocate MAXPACKET, callers expect -+ this specific size. */ - u_char *newp = malloc (MAXPACKET); - if (newp != NULL) { -- *anssizp = MAXPACKET; -- *thisansp = ans = newp; -+ *thisanssizp = MAXPACKET; -+ *thisansp = newp; - if (thisansp == ansp2) - *ansp2_malloced = 1; - } - } -+ /* We could end up with truncation if anscp was NULL -+ (not allowed to change caller's buffer) and the -+ response buffer size is too small. This isn't a -+ reliable way to detect truncation because the ioctl -+ may be an inaccurate report of the UDP message size. -+ Therefore we use this only to issue debug output. -+ To do truncation accurately with UDP we need -+ MSG_TRUNC which is only available on Linux. We -+ can abstract out the Linux-specific feature in the -+ future to detect truncation. */ -+ if (__glibc_unlikely (*thisanssizp < *thisresplenp)) { -+ Dprint(statp->options & RES_DEBUG, -+ (stdout, ";; response may be truncated (UDP)\n") -+ ); -+ } -+ - HEADER *anhp = (HEADER *) *thisansp; - socklen_t fromlen = sizeof(struct sockaddr_in6); - assert (sizeof(from) <= fromlen); diff --git a/package.bak/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch b/package.bak/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch deleted file mode 100644 index 28f4b6e0f1..0000000000 --- a/package.bak/glibc/2.22/0002-microblaze-include-unix-sysdep.h.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8415fb8d4f05c023b9d79e44dff197cc285fd1e5 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Thu, 6 Aug 2015 02:10:46 -0400 -Subject: [PATCH] microblaze: include unix/sysdep.h - -The semi-recent SYSCALL_CANCEL inclusion broke microblaze due to the -sysdep.h header not including the unix/sysdep.h header. Include it -here like all other ports. - -(cherry picked from commit 5d5de49c3ccd69f65b801f1ca490a0112d1cbd7d) - -Signed-off-by: Thomas Petazzoni -[edited to remove ChangeLog modifications, which cause conflicts.] ---- - sysdeps/unix/sysv/linux/microblaze/sysdep.h | 7 ++++++- - 2 files changed, 12 insertions(+), 1 deletion(-) - -diff --git a/sysdeps/unix/sysv/linux/microblaze/sysdep.h b/sysdeps/unix/sysv/linux/microblaze/sysdep.h -index 83c0340..9d5c542 100644 ---- a/sysdeps/unix/sysv/linux/microblaze/sysdep.h -+++ b/sysdeps/unix/sysv/linux/microblaze/sysdep.h -@@ -16,8 +16,11 @@ - License along with the GNU C Library; if not, see - . */ - -+#ifndef _LINUX_MICROBLAZE_SYSDEP_H -+#define _LINUX_MICROBLAZE_SYSDEP_H 1 -+ -+#include - #include --#include - - /* Defines RTLD_PRIVATE_ERRNO. */ - #include -@@ -305,3 +308,5 @@ SYSCALL_ERROR_LABEL_DCL: \ - # define PTR_DEMANGLE(var) (void) (var) - - #endif /* not __ASSEMBLER__ */ -+ -+#endif /* _LINUX_MICROBLAZE_SYSDEP_H */ --- -2.6.4 - diff --git a/package.bak/glibc/2.22/0003-fix-CVE-2016-3075.patch b/package.bak/glibc/2.22/0003-fix-CVE-2016-3075.patch deleted file mode 100644 index 1ceb1f62f0..0000000000 --- a/package.bak/glibc/2.22/0003-fix-CVE-2016-3075.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 883dceebc8f11921a9890211a4e202e5be17562f Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 29 Mar 2016 12:57:56 +0200 -Subject: [PATCH 1/1] CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879] - -The defensive copy is not needed because the name may not alias the -output buffer. - -(cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4) - -Signed-off-by: Bernd Kuhls -(downloaded from upstream git repo and removed changes to Changelog: - https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=883dceebc8f11921a9890211a4e202e5be17562f;hp=5a1a5f0dd2744044801c91bf2588444c29cda533) ---- - ChangeLog | 7 +++++++ - resolv/nss_dns/dns-network.c | 5 +---- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c -index 00f4490..89f8783 100644 ---- a/resolv/nss_dns/dns-network.c -+++ b/resolv/nss_dns/dns-network.c -@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, - } net_buffer; - querybuf *orig_net_buffer; - int anslen; -- char *qbuf; - enum nss_status status; - - if (__res_maybe_init (&_res, 0) == -1) - return NSS_STATUS_UNAVAIL; - -- qbuf = strdupa (name); -- - net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); - -- anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, -+ anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf, - 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL); - if (anslen < 0) - { --- -1.7.1 - diff --git a/package.bak/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/package.bak/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch deleted file mode 100644 index 740b3221c9..0000000000 --- a/package.bak/glibc/2.22/0004-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Sat, 18 Jun 2016 19:11:23 +0200 -Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so - -With recent binutils versions the GNU libc fails to build on at least -MISP and SPARC, with this kind of error: - - /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' - /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here - -It appears that on these architectures pt-vfork.S includes vfork.S -(through the alpha version of pt-vfork.S) and that the __vfork aliases -are not conditionalized on IS_IN (libc) like on other architectures. -Therefore the aliases are also wrongly included in libpthread.so. - -Fix this by properly conditionalizing the aliases like on other -architectures. - -Changelog: - * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize - hidden_def, weak_alias and strong_alias on [IS_IN (libc)]. - * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. - * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. - -[Vincent: do not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - sysdeps/unix/sysv/linux/mips/vfork.S | 2 ++ - sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++ - sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S -index 8c66151..c0c0ce6 100644 ---- a/sysdeps/unix/sysv/linux/mips/vfork.S -+++ b/sysdeps/unix/sysv/linux/mips/vfork.S -@@ -106,6 +106,8 @@ L(error): - #endif - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def(__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -index dc32e0a..94f2c8d 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -@@ -44,6 +44,8 @@ ENTRY(__vfork) - nop - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def (__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -index 05be3c2..a7479e9 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -@@ -44,6 +44,8 @@ ENTRY(__vfork) - nop - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def (__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif --- -2.7.3 - diff --git a/package.bak/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/package.bak/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch deleted file mode 100644 index 3c53f6d050..0000000000 --- a/package.bak/glibc/2.22/0005-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch +++ /dev/null @@ -1,122 +0,0 @@ -From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Tue, 21 Jun 2016 23:59:37 +0200 -Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so - -Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS -and SPARC, but failed to do it correctly, introducing an ABI change. - -This patch does the remaining changes needed to align the MIPS and SPARC -vfork implementations with the other architectures. That way the the -alpha version of pt-vfork.S works correctly for MIPS and SPARC. The -changes for alpha were done in 82aab97c. - -Changelog: - * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into - __libc_vfork. - (__vfork) [IS_IN (libc)]: Remove alias. - (__libc_vfork) [IS_IN (libc)]: Define as an alias. - * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. - * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. - -[Vincent: do not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - sysdeps/unix/sysv/linux/mips/vfork.S | 12 ++++++------ - sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 8 ++++---- - sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 8 ++++---- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S -index c0c0ce6..1867c86 100644 ---- a/sysdeps/unix/sysv/linux/mips/vfork.S -+++ b/sysdeps/unix/sysv/linux/mips/vfork.S -@@ -31,13 +31,13 @@ - LOCALSZ= 1 - FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK - GPOFF= FRAMESZ-(1*SZREG) --NESTED(__vfork,FRAMESZ,sp) -+NESTED(__libc_vfork,FRAMESZ,sp) - #ifdef __PIC__ - SETUP_GP - #endif - PTR_SUBU sp, FRAMESZ - cfi_adjust_cfa_offset (FRAMESZ) -- SETUP_GP64_REG (a5, __vfork) -+ SETUP_GP64_REG (a5, __libc_vfork) - #ifdef __PIC__ - SAVE_GP (GPOFF) - #endif -@@ -104,10 +104,10 @@ L(error): - RESTORE_GP64_REG - j __syscall_error - #endif -- END(__vfork) -+ END(__libc_vfork) - - #if IS_IN (libc) --libc_hidden_def(__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) -+libc_hidden_def (__vfork) - #endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -index 94f2c8d..0d0a3b5 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -@@ -21,7 +21,7 @@ - - .text - .globl __syscall_error --ENTRY(__vfork) -+ENTRY(__libc_vfork) - ld [%g7 + PID], %o5 - cmp %o5, 0 - bne 1f -@@ -42,10 +42,10 @@ ENTRY(__vfork) - st %o5, [%g7 + PID] - 1: retl - nop --END(__vfork) -+END(__libc_vfork) - - #if IS_IN (libc) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) - libc_hidden_def (__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) - #endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -index a7479e9..0818eba 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -@@ -21,7 +21,7 @@ - - .text - .globl __syscall_error --ENTRY(__vfork) -+ENTRY(__libc_vfork) - ld [%g7 + PID], %o5 - sethi %hi(0x80000000), %o3 - cmp %o5, 0 -@@ -42,10 +42,10 @@ ENTRY(__vfork) - st %o5, [%g7 + PID] - 1: retl - nop --END(__vfork) -+END(__libc_vfork) - - #if IS_IN (libc) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) - libc_hidden_def (__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) - #endif --- -2.7.3 - diff --git a/package.bak/glibc/2.23/0001-fix-CVE-2016-3075.patch b/package.bak/glibc/2.23/0001-fix-CVE-2016-3075.patch deleted file mode 100644 index 6b07116cb2..0000000000 --- a/package.bak/glibc/2.23/0001-fix-CVE-2016-3075.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 146b58d11fddbef15b888906e3be4f33900c416f Mon Sep 17 00:00:00 2001 -From: Florian Weimer -Date: Tue, 29 Mar 2016 12:57:56 +0200 -Subject: [PATCH 1/1] CVE-2016-3075: Stack overflow in _nss_dns_getnetbyname_r [BZ #19879] - -The defensive copy is not needed because the name may not alias the -output buffer. - -(cherry picked from commit 317b199b4aff8cfa27f2302ab404d2bb5032b9a4) -(cherry picked from commit 883dceebc8f11921a9890211a4e202e5be17562f) - -Signed-off-by: Bernd Kuhls -(downloaded from upstream git repo and removed changes to files - Changelog and NEWS: - https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=146b58d11fddbef15b888906e3be4f33900c416f;hp=0eb234232eaf925fe4dca3bd60a3e1b4a7ab2882) ---- - ChangeLog | 7 +++++++ - NEWS | 10 ++++++++-- - resolv/nss_dns/dns-network.c | 5 +---- - 3 files changed, 16 insertions(+), 6 deletions(-) - -diff --git a/resolv/nss_dns/dns-network.c b/resolv/nss_dns/dns-network.c -index 2eb2f67..8f301a7 100644 ---- a/resolv/nss_dns/dns-network.c -+++ b/resolv/nss_dns/dns-network.c -@@ -118,17 +118,14 @@ _nss_dns_getnetbyname_r (const char *name, struct netent *result, - } net_buffer; - querybuf *orig_net_buffer; - int anslen; -- char *qbuf; - enum nss_status status; - - if (__res_maybe_init (&_res, 0) == -1) - return NSS_STATUS_UNAVAIL; - -- qbuf = strdupa (name); -- - net_buffer.buf = orig_net_buffer = (querybuf *) alloca (1024); - -- anslen = __libc_res_nsearch (&_res, qbuf, C_IN, T_PTR, net_buffer.buf->buf, -+ anslen = __libc_res_nsearch (&_res, name, C_IN, T_PTR, net_buffer.buf->buf, - 1024, &net_buffer.ptr, NULL, NULL, NULL, NULL); - if (anslen < 0) - { --- -1.7.1 - diff --git a/package.bak/glibc/2.23/0002-gcc6.patch b/package.bak/glibc/2.23/0002-gcc6.patch deleted file mode 100644 index f831cae2ca..0000000000 --- a/package.bak/glibc/2.23/0002-gcc6.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 5769d5d17cdb4770f1e08167b76c1684ad4e1f73 Mon Sep 17 00:00:00 2001 -From: Yvan Roux -Date: Fri, 15 Apr 2016 13:29:26 +0200 -Subject: [PATCH 1/1] Suppress GCC 6 warning about ambiguous 'else' with -Wparentheses - -(cherry picked from commit df1cf48777fe4cd81ad7fb09ecbe5b31432b7c1c) - -Signed-off-by: Bernd Kuhls -(downloaded from upstream git repo and removed changes to Changelog: - https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5769d5d17cdb4770f1e08167b76c1684ad4e1f73;hp=f1e182acaaa84e844eb96462a92ba532e1c1fff4) ---- - ChangeLog | 5 +++++ - nis/nis_call.c | 20 +++++++++++--------- - stdlib/setenv.c | 26 ++++++++++++++------------ - 3 files changed, 30 insertions(+), 21 deletions(-) - -diff --git a/nis/nis_call.c b/nis/nis_call.c -index 3fa37e4..cb7839a 100644 ---- a/nis/nis_call.c -+++ b/nis/nis_call.c -@@ -680,16 +680,18 @@ nis_server_cache_add (const_nis_name name, int search_parent, - /* Choose which entry should be evicted from the cache. */ - loc = &nis_server_cache[0]; - if (*loc != NULL) -- for (i = 1; i < 16; ++i) -- if (nis_server_cache[i] == NULL) -- { -+ { -+ for (i = 1; i < 16; ++i) -+ if (nis_server_cache[i] == NULL) -+ { -+ loc = &nis_server_cache[i]; -+ break; -+ } -+ else if ((*loc)->uses > nis_server_cache[i]->uses -+ || ((*loc)->uses == nis_server_cache[i]->uses -+ && (*loc)->expires > nis_server_cache[i]->expires)) - loc = &nis_server_cache[i]; -- break; -- } -- else if ((*loc)->uses > nis_server_cache[i]->uses -- || ((*loc)->uses == nis_server_cache[i]->uses -- && (*loc)->expires > nis_server_cache[i]->expires)) -- loc = &nis_server_cache[i]; -+ } - old = *loc; - *loc = new; - -diff --git a/stdlib/setenv.c b/stdlib/setenv.c -index da61ee0..e66045f 100644 ---- a/stdlib/setenv.c -+++ b/stdlib/setenv.c -@@ -278,18 +278,20 @@ unsetenv (const char *name) - ep = __environ; - if (ep != NULL) - while (*ep != NULL) -- if (!strncmp (*ep, name, len) && (*ep)[len] == '=') -- { -- /* Found it. Remove this pointer by moving later ones back. */ -- char **dp = ep; -- -- do -- dp[0] = dp[1]; -- while (*dp++); -- /* Continue the loop in case NAME appears again. */ -- } -- else -- ++ep; -+ { -+ if (!strncmp (*ep, name, len) && (*ep)[len] == '=') -+ { -+ /* Found it. Remove this pointer by moving later ones back. */ -+ char **dp = ep; -+ -+ do -+ dp[0] = dp[1]; -+ while (*dp++); -+ /* Continue the loop in case NAME appears again. */ -+ } -+ else -+ ++ep; -+ } - - UNLOCK; - --- -1.7.1 - diff --git a/package.bak/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch b/package.bak/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch deleted file mode 100644 index 740b3221c9..0000000000 --- a/package.bak/glibc/2.23/0003-MIPS-SPARC-fix-wrong-vfork-aliases-in-libpthread.so.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 43c2948756bb6e144c7b871e827bba37d61ad3a3 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Sat, 18 Jun 2016 19:11:23 +0200 -Subject: [PATCH] MIPS, SPARC: fix wrong vfork aliases in libpthread.so - -With recent binutils versions the GNU libc fails to build on at least -MISP and SPARC, with this kind of error: - - /home/aurel32/glibc/glibc-build/nptl/libpthread.so:(*IND*+0x0): multiple definition of `vfork@GLIBC_2.0' - /home/aurel32/glibc/glibc-build/nptl/libpthread.so::(.text+0xee50): first defined here - -It appears that on these architectures pt-vfork.S includes vfork.S -(through the alpha version of pt-vfork.S) and that the __vfork aliases -are not conditionalized on IS_IN (libc) like on other architectures. -Therefore the aliases are also wrongly included in libpthread.so. - -Fix this by properly conditionalizing the aliases like on other -architectures. - -Changelog: - * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Conditionalize - hidden_def, weak_alias and strong_alias on [IS_IN (libc)]. - * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. - * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. - -[Vincent: do not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - sysdeps/unix/sysv/linux/mips/vfork.S | 2 ++ - sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 2 ++ - sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 2 ++ - 3 files changed, 6 insertions(+) - -diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S -index 8c66151..c0c0ce6 100644 ---- a/sysdeps/unix/sysv/linux/mips/vfork.S -+++ b/sysdeps/unix/sysv/linux/mips/vfork.S -@@ -106,6 +106,8 @@ L(error): - #endif - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def(__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -index dc32e0a..94f2c8d 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -@@ -44,6 +44,8 @@ ENTRY(__vfork) - nop - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def (__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -index 05be3c2..a7479e9 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -@@ -44,6 +44,8 @@ ENTRY(__vfork) - nop - END(__vfork) - -+#if IS_IN (libc) - libc_hidden_def (__vfork) - weak_alias (__vfork, vfork) - strong_alias (__vfork, __libc_vfork) -+#endif --- -2.7.3 - diff --git a/package.bak/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch b/package.bak/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch deleted file mode 100644 index 3c53f6d050..0000000000 --- a/package.bak/glibc/2.23/0004-MIPS-SPARC-more-fixes-to-the-vfork-aliases-in-libpth.patch +++ /dev/null @@ -1,122 +0,0 @@ -From b87c1ec3fa398646f042a68f0ce0f7d09c1348c7 Mon Sep 17 00:00:00 2001 -From: Aurelien Jarno -Date: Tue, 21 Jun 2016 23:59:37 +0200 -Subject: [PATCH] MIPS, SPARC: more fixes to the vfork aliases in libpthread.so - -Commit 43c29487 tried to fix the vfork aliases in libpthread.so on MIPS -and SPARC, but failed to do it correctly, introducing an ABI change. - -This patch does the remaining changes needed to align the MIPS and SPARC -vfork implementations with the other architectures. That way the the -alpha version of pt-vfork.S works correctly for MIPS and SPARC. The -changes for alpha were done in 82aab97c. - -Changelog: - * sysdeps/unix/sysv/linux/mips/vfork.S (__vfork): Rename into - __libc_vfork. - (__vfork) [IS_IN (libc)]: Remove alias. - (__libc_vfork) [IS_IN (libc)]: Define as an alias. - * sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise. - * sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise. - -[Vincent: do not patch ChangeLog] - -Signed-off-by: Vicente Olivert Riera ---- - sysdeps/unix/sysv/linux/mips/vfork.S | 12 ++++++------ - sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S | 8 ++++---- - sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S | 8 ++++---- - 3 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/sysdeps/unix/sysv/linux/mips/vfork.S b/sysdeps/unix/sysv/linux/mips/vfork.S -index c0c0ce6..1867c86 100644 ---- a/sysdeps/unix/sysv/linux/mips/vfork.S -+++ b/sysdeps/unix/sysv/linux/mips/vfork.S -@@ -31,13 +31,13 @@ - LOCALSZ= 1 - FRAMESZ= (((NARGSAVE+LOCALSZ)*SZREG)+ALSZ)&ALMASK - GPOFF= FRAMESZ-(1*SZREG) --NESTED(__vfork,FRAMESZ,sp) -+NESTED(__libc_vfork,FRAMESZ,sp) - #ifdef __PIC__ - SETUP_GP - #endif - PTR_SUBU sp, FRAMESZ - cfi_adjust_cfa_offset (FRAMESZ) -- SETUP_GP64_REG (a5, __vfork) -+ SETUP_GP64_REG (a5, __libc_vfork) - #ifdef __PIC__ - SAVE_GP (GPOFF) - #endif -@@ -104,10 +104,10 @@ L(error): - RESTORE_GP64_REG - j __syscall_error - #endif -- END(__vfork) -+ END(__libc_vfork) - - #if IS_IN (libc) --libc_hidden_def(__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) -+libc_hidden_def (__vfork) - #endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -index 94f2c8d..0d0a3b5 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S -@@ -21,7 +21,7 @@ - - .text - .globl __syscall_error --ENTRY(__vfork) -+ENTRY(__libc_vfork) - ld [%g7 + PID], %o5 - cmp %o5, 0 - bne 1f -@@ -42,10 +42,10 @@ ENTRY(__vfork) - st %o5, [%g7 + PID] - 1: retl - nop --END(__vfork) -+END(__libc_vfork) - - #if IS_IN (libc) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) - libc_hidden_def (__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) - #endif -diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -index a7479e9..0818eba 100644 ---- a/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S -@@ -21,7 +21,7 @@ - - .text - .globl __syscall_error --ENTRY(__vfork) -+ENTRY(__libc_vfork) - ld [%g7 + PID], %o5 - sethi %hi(0x80000000), %o3 - cmp %o5, 0 -@@ -42,10 +42,10 @@ ENTRY(__vfork) - st %o5, [%g7 + PID] - 1: retl - nop --END(__vfork) -+END(__libc_vfork) - - #if IS_IN (libc) -+weak_alias (__libc_vfork, vfork) -+strong_alias (__libc_vfork, __vfork) - libc_hidden_def (__vfork) --weak_alias (__vfork, vfork) --strong_alias (__vfork, __libc_vfork) - #endif --- -2.7.3 - diff --git a/package.bak/glibc/Config.in b/package.bak/glibc/Config.in deleted file mode 100644 index 85aace6e29..0000000000 --- a/package.bak/glibc/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -if BR2_TOOLCHAIN_BUILDROOT_GLIBC - -config BR2_PACKAGE_GLIBC - bool - default y - select BR2_PACKAGE_LINUX_HEADERS - select BR2_TOOLCHAIN_HAS_SSP - -choice - prompt "glibc version" - default BR2_GLIBC_VERSION_2_23 - -config BR2_GLIBC_VERSION_2_22 - bool "2.22" - # Too old to build with gcc >= 6.x - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_6 - -config BR2_GLIBC_VERSION_2_23 - bool "2.23" - -config BR2_GLIBC_VERSION_2_24 - bool "2.24" - # Linux 3.2 or later kernel headers are required on all arches. - # See: https://sourceware.org/ml/libc-alpha/2016-08/msg00212.html - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - -comment "glibc-2.24 needs kernel headers >= 3.2" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - -endchoice - -endif - -config BR2_GLIBC_VERSION_STRING - string - default "2.22" if BR2_GLIBC_VERSION_2_22 - default "2.23" if BR2_GLIBC_VERSION_2_23 - default "2.24" if BR2_GLIBC_VERSION_2_24 diff --git a/package.bak/glibc/glibc.hash b/package.bak/glibc/glibc.hash deleted file mode 100644 index befe80c3c5..0000000000 --- a/package.bak/glibc/glibc.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated after checking pgp signature (glibc) -sha256 eb731406903befef1d8f878a46be75ef862b9056ab0cde1626d08a7a05328948 glibc-2.22.tar.xz -sha256 94efeb00e4603c8546209cefb3e1a50a5315c86fa9b078b6fad758e187ce13e9 glibc-2.23.tar.xz -sha256 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 glibc-2.24.tar.xz diff --git a/package.bak/glibc/glibc.mk b/package.bak/glibc/glibc.mk deleted file mode 100644 index ee5253968d..0000000000 --- a/package.bak/glibc/glibc.mk +++ /dev/null @@ -1,148 +0,0 @@ -################################################################################ -# -# glibc -# -################################################################################ - -GLIBC_VERSION = $(call qstrip,$(BR2_GLIBC_VERSION_STRING)) -GLIBC_SITE = $(BR2_GNU_MIRROR)/libc -GLIBC_SOURCE = glibc-$(GLIBC_VERSION).tar.xz -GLIBC_SRC_SUBDIR = . - -GLIBC_LICENSE = GPLv2+ (programs), LGPLv2.1+, BSD-3c, MIT (library) -GLIBC_LICENSE_FILES = $(addprefix $(GLIBC_SRC_SUBDIR)/,COPYING COPYING.LIB LICENSES) - -# glibc is part of the toolchain so disable the toolchain dependency -GLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO - -# Before glibc is configured, we must have the first stage -# cross-compiler and the kernel headers -GLIBC_DEPENDENCIES = host-gcc-initial linux-headers host-gawk - -GLIBC_SUBDIR = build - -GLIBC_INSTALL_STAGING = YES - -GLIBC_INSTALL_STAGING_OPTS = install_root=$(STAGING_DIR) install - -# Thumb build is broken, build in ARM mode -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -GLIBC_EXTRA_CFLAGS += -marm -endif - -# MIPS64 defaults to n32 so pass the correct -mabi if -# we are using a different ABI. OABI32 is also used -# in MIPS so we pass -mabi=32 in this case as well -# even though it's not strictly necessary. -ifeq ($(BR2_MIPS_NABI64),y) -GLIBC_EXTRA_CFLAGS += -mabi=64 -else ifeq ($(BR2_MIPS_OABI32),y) -GLIBC_EXTRA_CFLAGS += -mabi=32 -endif - -ifeq ($(BR2_ENABLE_DEBUG),y) -GLIBC_EXTRA_CFLAGS += -g -endif - -# The stubs.h header is not installed by install-headers, but is -# needed for the gcc build. An empty stubs.h will work, as explained -# in http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html. The same trick -# is used by Crosstool-NG. -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_GLIBC),y) -define GLIBC_ADD_MISSING_STUB_H - mkdir -p $(STAGING_DIR)/usr/include/gnu - touch $(STAGING_DIR)/usr/include/gnu/stubs.h -endef -endif - -# Even though we use the autotools-package infrastructure, we have to -# override the default configure commands for several reasons: -# -# 1. We have to build out-of-tree, but we can't use the same -# 'symbolic link to configure' used with the gcc packages. -# -# 2. We have to execute the configure script with bash and not sh. -# -# Note that as mentionned in -# http://patches.openembedded.org/patch/38849/, glibc must be -# built with -O2, so we pass our own CFLAGS and CXXFLAGS below. -define GLIBC_CONFIGURE_CMDS - mkdir -p $(@D)/build - # Do the configuration - (cd $(@D)/build; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" CPPFLAGS="" \ - CXXFLAGS="-O2 $(GLIBC_EXTRA_CFLAGS)" \ - $(SHELL) $(@D)/$(GLIBC_SRC_SUBDIR)/configure \ - ac_cv_path_BASH_SHELL=/bin/bash \ - libc_cv_forced_unwind=yes \ - libc_cv_ssp=no \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --enable-shared \ - $(if $(BR2_SOFT_FLOAT),--without-fp,--with-fp) \ - $(if $(BR2_x86_64),--enable-lock-elision) \ - --with-pkgversion="Buildroot" \ - --without-cvs \ - --disable-profile \ - --without-gd \ - --enable-obsolete-rpc \ - --enable-kernel=$(call qstrip,$(BR2_TOOLCHAIN_HEADERS_AT_LEAST)) \ - --with-headers=$(STAGING_DIR)/usr/include) - $(GLIBC_ADD_MISSING_STUB_H) -endef - - -# -# We also override the install to target commands since we only want -# to install the libraries, and nothing more. -# - -GLIBC_LIBS_LIB = \ - ld*.so.* libanl.so.* libc.so.* libcrypt.so.* libdl.so.* libgcc_s.so.* \ - libm.so.* libnsl.so.* libpthread.so.* libresolv.so.* librt.so.* \ - libutil.so.* libnss_files.so.* libnss_dns.so.* libmvec.so.* - -ifeq ($(BR2_PACKAGE_GDB),y) -GLIBC_LIBS_LIB += libthread_db.so.* -endif - -define GLIBC_INSTALL_TARGET_CMDS - for libs in $(GLIBC_LIBS_LIB); do \ - $(call copy_toolchain_lib_root,$$libs) ; \ - done -endef - -# MIPS R6 requires to have NaN2008 support which is currently not -# supported by the Linux kernel. In order to prevent building the -# glibc against kernels not having NaN2008 support on platforms that -# requires it, glibc currently checks for an (inexisting) 10.0.0 -# kernel headers version. -# -# Since in practice the kernel support for NaN2008 is not really -# required for things to work properly, we adjust the glibc check to -# make it believe that NaN2008 support was added in the kernel -# starting from version 4.0.0. -# -# In general the compatibility issues introduced by mis-matched NaN -# encodings will not cause a problem as signalling NaNs are rarely used -# in average code. For MIPS R6 there isn't actually any compatibility -# issue as the hardware is always NaN2008 and software is always -# NaN2008. The problem only comes from when older MIPS code is linked in -# via a DSO and multiple NaN encodings are introduced. Since Buildroot -# is intended to have all code built from source then this scenario is -# highly unlikely. The failure mode, if it ever occurs, would be either -# that a signalling NaN fails to raise an invalid operation exception or -# (more likely) an ordinary NaN raises an invalid operation exception. -ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -define GLIBC_FIX_MIPS_R6 - $(SED) 's#10.0.0#4.0.0#' \ - $(@D)/sysdeps/unix/sysv/linux/mips/configure \ - $(@D)/sysdeps/unix/sysv/linux/mips/configure.ac -endef -GLIBC_POST_EXTRACT_HOOKS += GLIBC_FIX_MIPS_R6 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/glibc/nsswitch.conf b/package.bak/glibc/nsswitch.conf deleted file mode 100644 index 5c384918d8..0000000000 --- a/package.bak/glibc/nsswitch.conf +++ /dev/null @@ -1,13 +0,0 @@ -# /etc/nsswitch.conf - -passwd: files -group: files -shadow: files - -hosts: files dns -networks: files dns - -protocols: files -services: files -ethers: files -rpc: files diff --git a/package.bak/glibmm/Config.in b/package.bak/glibmm/Config.in deleted file mode 100644 index fdbb43812c..0000000000 --- a/package.bak/glibmm/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_GLIBMM - bool "glibmm" - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBSIGC - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - The GLibmm package is a set of C++ bindings for GLib. - - http://www.gtkmm.org/ - -comment "glibmm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/glibmm/glibmm.hash b/package.bak/glibmm/glibmm.hash deleted file mode 100644 index fbcf855649..0000000000 --- a/package.bak/glibmm/glibmm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/glibmm/2.50/glibmm-2.50.0.sha256sum -sha256 df726e3c6ef42b7621474b03b644a2e40ec4eef94a1c5a932c1e740a78f95e94 glibmm-2.50.0.tar.xz diff --git a/package.bak/glibmm/glibmm.mk b/package.bak/glibmm/glibmm.mk deleted file mode 100644 index 0daca5853f..0000000000 --- a/package.bak/glibmm/glibmm.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# glibmm -# -################################################################################ - -GLIBMM_VERSION_MAJOR = 2.50 -GLIBMM_VERSION = $(GLIBMM_VERSION_MAJOR).0 -GLIBMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) -GLIBMM_LICENSE_FILES = COPYING COPYING.tools -GLIBMM_SOURCE = glibmm-$(GLIBMM_VERSION).tar.xz -GLIBMM_SITE = http://ftp.gnome.org/pub/gnome/sources/glibmm/$(GLIBMM_VERSION_MAJOR) -GLIBMM_INSTALL_STAGING = YES -GLIBMM_DEPENDENCIES = libglib2 libsigc host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/glm/Config.in b/package.bak/glm/Config.in deleted file mode 100644 index 41b3608377..0000000000 --- a/package.bak/glm/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GLM - bool "glm" - depends on BR2_INSTALL_LIBSTDCPP - help - OpenGL Mathematics (GLM) - - http://glm.g-truc.net - -comment "glm needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/glm/glm.hash b/package.bak/glm/glm.hash deleted file mode 100644 index 30bb923783..0000000000 --- a/package.bak/glm/glm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 39c7ee0db54289f78350c7629ea2531664d71c6a494bbb86db48a86536de9ff2 glm-0.9.5.4.tar.gz diff --git a/package.bak/glm/glm.mk b/package.bak/glm/glm.mk deleted file mode 100644 index ff9423da17..0000000000 --- a/package.bak/glm/glm.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# glm -# -################################################################################ - -GLM_VERSION = 0.9.5.4 -GLM_SITE = $(call github,g-truc,glm,$(GLM_VERSION)) -GLM_LICENSE = MIT -GLM_LICENSE_FILES = copying.txt - -# GLM is a header-only library, it only makes sense -# to have it installed into the staging directory. -GLM_INSTALL_STAGING = YES -GLM_INSTALL_TARGET = NO - -$(eval $(cmake-package)) diff --git a/package.bak/glmark2/Config.in b/package.bak/glmark2/Config.in deleted file mode 100644 index addd7a906e..0000000000 --- a/package.bak/glmark2/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_GLMARK2_EGL_GLES - bool - default y - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - depends on BR2_PACKAGE_MESA3D_OPENGL_ES - -config BR2_PACKAGE_GLMARK2_GL - bool - default y - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - -comment "glmark2 needs a toolchain w/ C++, gcc >= 4.9" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - -comment "glmark2 needs an OpenGL or an openGL ES and EGL backend provided by mesa3d" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 && BR2_INSTALL_LIBSTDCPP - depends on !BR2_PACKAGE_GLMARK2_GL && !BR2_PACKAGE_GLMARK2_EGL_GLES - -config BR2_PACKAGE_GLMARK2 - bool "glmark2" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - depends on BR2_PACKAGE_GLMARK2_GL || BR2_PACKAGE_GLMARK2_EGL_GLES - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - help - glmark2 is an OpenGL 2.0 and ES 2.0 benchmark. - - https://github.com/glmark2/glmark2 diff --git a/package.bak/glmark2/glmark2.hash b/package.bak/glmark2/glmark2.hash deleted file mode 100644 index 92c53e5410..0000000000 --- a/package.bak/glmark2/glmark2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ea59bd267a88e2c773423eec43f7cb90b0ca1c369762e836dec575ebdcdcc012 glmark2-7215c0f337dae0b232535549c37fca441747a891.tar.gz diff --git a/package.bak/glmark2/glmark2.mk b/package.bak/glmark2/glmark2.mk deleted file mode 100644 index c7cefeb16c..0000000000 --- a/package.bak/glmark2/glmark2.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# glmark2 -# -################################################################################ - -GLMARK2_VERSION = 7215c0f337dae0b232535549c37fca441747a891 -GLMARK2_SITE = $(call github,glmark2,glmark2,$(GLMARK2_VERSION)) -GLMARK2_LICENSE = GPLv3+, SGIv1 -GLMARK2_LICENSE_FILES = COPYING COPYING.SGI -GLMARK2_DEPENDENCIES = host-pkgconf jpeg libpng \ - $(if $(BR2_PACKAGE_HAS_LIBEGL),libegl) \ - $(if $(BR2_PACKAGE_HAS_LIBGLES),libgles) \ - $(if $(BR2_PACKAGE_HAS_LIBGL),libgl) - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GLMARK2_DEPENDENCIES += xlib_libX11 -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) -GLMARK2_FLAVORS += x11-glesv2 -endif -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -GLMARK2_FLAVORS += x11-gl -endif -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yy) -GLMARK2_FLAVORS += drm-glesv2 -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL),yy) -GLMARK2_FLAVORS += drm-gl -endif - -ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGLES),yyy) -GLMARK2_DEPENDENCIES += wayland -GLMARK2_FLAVORS += wayland-glesv2 -endif - -ifeq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL),yyy) -GLMARK2_DEPENDENCIES += wayland -GLMARK2_FLAVORS += wayland-gl -endif - -GLMARK2_CONF_OPTS += \ - --prefix=/usr \ - --with-flavors=$(subst $(space),$(comma),$(GLMARK2_FLAVORS)) - -$(eval $(waf-package)) diff --git a/package.bak/glog/Config.in b/package.bak/glog/Config.in deleted file mode 100644 index 534997af49..0000000000 --- a/package.bak/glog/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GLOG - bool "glog" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - C++ implementation of the Google logging module - - https://github.com/google/glog - -comment "glog needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/glog/glog.hash b/package.bak/glog/glog.hash deleted file mode 100644 index 4548ebac2c..0000000000 --- a/package.bak/glog/glog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ce99d58dce74458f7656a68935d7a0c048fa7b4626566a71b7f4e545920ceb10 glog-v0.3.4.tar.gz diff --git a/package.bak/glog/glog.mk b/package.bak/glog/glog.mk deleted file mode 100644 index aa7cacbdd3..0000000000 --- a/package.bak/glog/glog.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# glog -# -################################################################################ - -GLOG_VERSION = v0.3.4 -GLOG_SITE = $(call github,google,glog,$(GLOG_VERSION)) -GLOG_INSTALL_STAGING = YES -GLOG_LICENSE = BSD-3c -GLOG_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_GFLAGS),y) -GLOG_DEPENDENCIES = gflags -endif - -# glog can optionally use atomic __sync built-ins. However, its -# configure script only checks for the availability of the 4 bytes -# version, but the code also uses the 1 byte version. While this works -# on most architectures, it does not on architectures that implement -# only the 4 bytes version, such as Microblaze. So if the architecture -# does not implement the 1 byte version, we hint the configure script -# that atomic built-ins should not be used. -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_1),) -GLOG_CONF_ENV += ac_cv___sync_val_compare_and_swap=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gmock/0001-force-use-python2.patch b/package.bak/gmock/0001-force-use-python2.patch deleted file mode 100644 index 5dcb231168..0000000000 --- a/package.bak/gmock/0001-force-use-python2.patch +++ /dev/null @@ -1,20 +0,0 @@ -Force use of Python 2 even when Python 3 is the default Python interpreter. - -Signed-off-by: Carlos Santos - ---- ./gtest/scripts/fuse_gtest_files.py.orig 2013-09-18 14:48:30.000000000 -0300 -+++ ./gtest/scripts/fuse_gtest_files.py 2015-07-22 15:42:53.291591205 -0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright 2009, Google Inc. - # All rights reserved. ---- ./scripts/generator/gmock_gen.py.orig 2013-09-18 14:50:15.000000000 -0300 -+++ ./scripts/generator/gmock_gen.py 2015-07-22 17:06:51.071815634 -0300 -@@ -1,4 +1,4 @@ --#!/usr/bin/env python -+#!/usr/bin/env python2 - # - # Copyright 2008 Google Inc. All Rights Reserved. - # diff --git a/package.bak/gmock/Config.in b/package.bak/gmock/Config.in deleted file mode 100644 index ec3eb921d1..0000000000 --- a/package.bak/gmock/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_GMOCK - bool "gmock" - select BR2_PACKAGE_GTEST - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - help - Inspired by jMock, EasyMock, and Hamcrest, and designed with C++'s - specifics in mind, Google C++ Mocking Framework (or Google Mock for - short) is a library for writing and using C++ mock classes. - - Google Mock: - - * lets you create mock classes trivially using simple macros, - * supports a rich set of matchers and actions, - * handles unordered, partially ordered, or completely ordered - expectations, - * is extensible by users, and - * works on Linux, Mac OS X, Windows, Windows Mobile, minGW, and - Symbian. - - http://code.google.com/p/googlemock/ - - There are both host and target packages. The target one has include - files required to compile the tests and the static libraries required - to link/run them. The host package installs gmock_gen, a Python script - used to generate code mocks. - -comment "gmock needs a toolchain w/ C++, wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/gmock/gmock.hash b/package.bak/gmock/gmock.hash deleted file mode 100644 index 2b7173988f..0000000000 --- a/package.bak/gmock/gmock.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b gmock-1.7.0.zip diff --git a/package.bak/gmock/gmock.mk b/package.bak/gmock/gmock.mk deleted file mode 100644 index 4f04422a5d..0000000000 --- a/package.bak/gmock/gmock.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# gmock -# -################################################################################ - -# Make sure this remains the same version as the gtest one -GMOCK_VERSION = 1.7.0 -GMOCK_SOURCE = gmock-$(GMOCK_VERSION).zip -GMOCK_SITE = http://googlemock.googlecode.com/files -GMOCK_INSTALL_STAGING = YES -GMOCK_INSTALL_TARGET = NO -GMOCK_LICENSE = BSD-3c -GMOCK_LICENSE_FILES = LICENSE -GMOCK_DEPENDENCIES = gtest host-gmock - -# GMock 1.7.0 relies on Python 2.7 syntax which is NOT compatible with Python3. -HOST_GMOCK_DEPENDENCIES = host-python -HOST_GMOCK_PYTHONPATH=$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -# Static linking is required in order to keep the GMock package completely -# separated from GTest. According to GMock's README file: -# -# "Google Mock can be used as a DLL, but the same DLL must contain Google -# Test as well. See Google Test's README file for instructions on how to -# set up necessary compiler settings". -GMOCK_CONF_OPTS = --enable-static --disable-shared - -define GMOCK_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(BUILD_DIR) -endef - -# We can't use the default rule for autotools-package staging because it fails -# because it tries to rebuild/install gtest stuff and fails after this error: -# "'make install' is dangerous and not supported. Instead, see README for -# how to integrate Google Test into your build system." -define GMOCK_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock.a $(STAGING_DIR)/usr/lib/libgmock.a - $(INSTALL) -D -m 0755 $(@D)/lib/.libs/libgmock_main.a $(STAGING_DIR)/usr/lib/libgmock_main.a - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gmock/ - cp -rp $(@D)/include/gmock/* $(STAGING_DIR)/usr/include/gmock/ - $(INSTALL) -D -m 0755 package/gmock/gmock.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gmock.pc -endef - -# Unzipping inside $(@D) and moving everything from the created subdirectory is -# required because unzipping directly in $(BUILD_DIR) would cause host-gmock to -# overwrite the gmock subdir instead of unzipping in a host-gmock subdir. -define HOST_GMOCK_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(GMOCK_SOURCE) -d $(@D) - mv $(@D)/gmock-$(GMOCK_VERSION)/* $(@D) - rmdir $(@D)/gmock-$(GMOCK_VERSION) -endef - -define HOST_GMOCK_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/scripts/generator/gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen.py - ln -sf gmock_gen.py $(HOST_DIR)/usr/bin/gmock_gen - cp -rp $(@D)/scripts/generator/cpp $(HOST_GMOCK_PYTHONPATH) -endef - -$(eval $(autotools-package)) -# The host package does not build anything, just installs gmock_gen stuff, so -# it does not need to be a host-autotools-package. -$(eval $(host-generic-package)) diff --git a/package.bak/gmock/gmock.pc b/package.bak/gmock/gmock.pc deleted file mode 100644 index 2f900682ef..0000000000 --- a/package.bak/gmock/gmock.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gmock -Description: Google C++ Mocking Framework -Version: 1.7.0 -Libs: -L${libdir} -lgmock -Libs.private: -lpthread -Cflags: -I${includedir} diff --git a/package.bak/gmp/Config.in b/package.bak/gmp/Config.in deleted file mode 100644 index 226e0887d8..0000000000 --- a/package.bak/gmp/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GMP - bool "gmp" - help - GNU Multiple Precision Arithmetic Library. - - http://gmplib.org/ diff --git a/package.bak/gmp/gmp.hash b/package.bak/gmp/gmp.hash deleted file mode 100644 index f4793cd93c..0000000000 --- a/package.bak/gmp/gmp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 87b565e89a9a684fe4ebeeddb8399dce2599f9c9049854ca8c0dfbdea0e21912 gmp-6.1.2.tar.xz diff --git a/package.bak/gmp/gmp.mk b/package.bak/gmp/gmp.mk deleted file mode 100644 index 33b5d542b4..0000000000 --- a/package.bak/gmp/gmp.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# gmp -# -################################################################################ - -GMP_VERSION = 6.1.2 -GMP_SITE = $(BR2_GNU_MIRROR)/gmp -GMP_SOURCE = gmp-$(GMP_VERSION).tar.xz -GMP_INSTALL_STAGING = YES -GMP_LICENSE = LGPLv3+ or GPLv2+ -GMP_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -GMP_DEPENDENCIES = host-m4 -HOST_GMP_DEPENDENCIES = host-m4 - -# GMP doesn't support assembly for coldfire or mips r6 ISA yet -# Disable for ARM v7m since it has different asm constraints -ifeq ($(BR2_m68k_cf)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6)$(BR2_ARM_CPU_ARMV7M)$(BR2_arc),y) -GMP_CONF_OPTS += --disable-assembly -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gmpc/Config.in b/package.bak/gmpc/Config.in deleted file mode 100644 index 43bc642d74..0000000000 --- a/package.bak/gmpc/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_GMPC - bool "gmpc" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_LIBMPD - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_LIBSM - select BR2_PACKAGE_XLIB_LIBX11 - help - Gnome Music Player Client is a GNOME/GTK2.2 client for - Music Player Daemon. - - http://gmpcwiki.sarine.nl/index.php?title=GMPC - -comment "gmpc needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 && BR2_PACKAGE_LIBGTK2 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gmpc/gmpc.hash b/package.bak/gmpc/gmpc.hash deleted file mode 100644 index cd39822c39..0000000000 --- a/package.bak/gmpc/gmpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a69414f35396846733632ca9619921d7acda537ffd6d49bd84b444945cb76b2c gmpc-11.8.16.tar.gz diff --git a/package.bak/gmpc/gmpc.mk b/package.bak/gmpc/gmpc.mk deleted file mode 100644 index 03d95d456c..0000000000 --- a/package.bak/gmpc/gmpc.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gmpc -# -################################################################################ - -GMPC_VERSION = 11.8.16 -GMPC_SITE = http://download.sarine.nl/Programs/gmpc/$(GMPC_VERSION) -GMPC_CONF_ENV = ac_cv_path_GOB2=$(GOB2_HOST_BINARY) -GMPC_CONF_OPTS = --disable-mmkeys --disable-unique -GMPC_LICENSE = GPLv2+ -GMPC_LICENSE_FILES = COPYING -GMPC_DEPENDENCIES = host-gob2 host-intltool host-pkgconf host-vala \ - libglib2 libgtk2 libmpd libsoup sqlite \ - xlib_libICE xlib_libSM xlib_libX11 \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -$(eval $(autotools-package)) diff --git a/package.bak/gmrender-resurrect/Config.in b/package.bak/gmrender-resurrect/Config.in deleted file mode 100644 index 631c407f5d..0000000000 --- a/package.bak/gmrender-resurrect/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_GMRENDER_RESURRECT - bool "gmrender-resurrect" - depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2, libupnp - depends on BR2_USE_MMU # gstreamer1 - # uses - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE # run-time only - select BR2_PACKAGE_LIBUPNP - help - UPnP (DLNA) media renderer based on gstreamer - - https://github.com/hzeller/gmrender-resurrect - -comment "gmrender-resurrect needs a glibc or uClibc toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/gmrender-resurrect/gmrender-resurrect.hash b/package.bak/gmrender-resurrect/gmrender-resurrect.hash deleted file mode 100644 index ba4561ea21..0000000000 --- a/package.bak/gmrender-resurrect/gmrender-resurrect.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8cd9eae3e6be75684c9b7c4d29702fcbbeead0ded1d4f7cf8fb65fe1dc718596 gmrender-resurrect-48caaa4f6c386fd1586126c801cd326f96d5fa5c.tar.gz diff --git a/package.bak/gmrender-resurrect/gmrender-resurrect.mk b/package.bak/gmrender-resurrect/gmrender-resurrect.mk deleted file mode 100644 index 24608a1c08..0000000000 --- a/package.bak/gmrender-resurrect/gmrender-resurrect.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gmrender-resurrect -# -################################################################################ - -GMRENDER_RESURRECT_VERSION = 48caaa4f6c386fd1586126c801cd326f96d5fa5c -GMRENDER_RESURRECT_SITE = $(call github,hzeller,gmrender-resurrect,$(GMRENDER_RESURRECT_VERSION)) -# Original distribution does not have default configure, -# so we need to autoreconf: -GMRENDER_RESURRECT_AUTORECONF = YES -GMRENDER_RESURRECT_LICENSE = GPLv2+ -GMRENDER_RESURRECT_LICENSE_FILES = COPYING -GMRENDER_RESURRECT_DEPENDENCIES = gstreamer1 libupnp - -$(eval $(autotools-package)) diff --git a/package.bak/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch b/package.bak/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch deleted file mode 100644 index eee0a9a221..0000000000 --- a/package.bak/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch +++ /dev/null @@ -1,80 +0,0 @@ -From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 17 Jan 2015 18:33:37 +0100 -Subject: [PATCH 1/2] Allow CFLAGS/CPPFLAGS to be completed from the - environment - -Buildroot passes its own CPPFLAGS and CFLAGS in the environment, so -the CFLAGS += and CPPFLAGS += statements in gnu-efi Makefile have no -effect. Change these to override += so that they extend the -flags passed by Buildroot. - -[Romain: - - rebase on top of 3.0.1 release] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Romain Naour ---- - Make.defaults | 16 ++++++++-------- - 1 file changed, 8 insertions(+), 8 deletions(-) - -diff --git a/Make.defaults b/Make.defaults -index 169273d..b0ddea0 100644 ---- a/Make.defaults -+++ b/Make.defaults -@@ -80,14 +80,14 @@ endif - # - - # Arch-specific compilation flags --CPPFLAGS += -DCONFIG_$(ARCH) -+override CPPFLAGS += -DCONFIG_$(ARCH) - - ifeq ($(ARCH),ia64) -- CFLAGS += -mfixed-range=f32-f127 -+ override CFLAGS += -mfixed-range=f32-f127 - endif - - ifeq ($(ARCH),ia32) -- CFLAGS += -mno-mmx -mno-sse -+ override CFLAGS += -mno-mmx -mno-sse - ifeq ($(HOSTARCH),x86_64) - ARCH3264 = -m32 - endif -@@ -103,10 +103,10 @@ ifeq ($(ARCH),x86_64) - && [ $(GCCMINOR) -ge "7" ] ) ) \ - && echo 1) - ifeq ($(GCCNEWENOUGH),1) -- CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 -+ override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11 - endif - -- CFLAGS += -mno-red-zone -mno-mmx -mno-sse -+ override CFLAGS += -mno-red-zone -mno-mmx -mno-sse - ifeq ($(HOSTARCH),ia32) - ARCH3264 = -m64 - endif -@@ -127,7 +127,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name) - endif - - ifeq ($(ARCH),arm) --CFLAGS += -marm -+override CFLAGS += -marm - endif - - # Generic compilation flags -@@ -135,10 +135,10 @@ INCDIR += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \ - -I$(TOPDIR)/inc/protocol - - ifeq (FreeBSD, $(findstring FreeBSD, $(OS))) --CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ -+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ - -ffreestanding -fno-stack-protector - else --CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ -+override CFLAGS += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \ - -fno-merge-constants -ffreestanding -fno-stack-protector \ - -fno-stack-check - endif --- -1.9.3 - diff --git a/package.bak/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch b/package.bak/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch deleted file mode 100644 index 6e12388d10..0000000000 --- a/package.bak/gnu-efi/0002-Fix-parallel-make-failure-for-archives.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 7e9a26b0fc0bd8ed64a5eced5ea78bcea8ae3bbc Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 17 Jan 2015 18:44:04 +0100 -Subject: [PATCH 2/2] Fix parallel make failure for archives - -Upstream-Status: Pending - -The lib and gnuefi makefiles were using the lib.a() form which compiles -and ar's as a pair instead of compiling all and then ar'ing which can -parallelize better. This was resulting in build failures on larger values -of -j. - -See http://www.chemie.fu-berlin.de/chemnet/use/info/make/make_toc.html#TOC105 -for details. - -[Romain: - - rebase on top of 3.0.1 release] - -Signed-off-by: Saul Wold -Signed-off-by: Darren Hart -Signed-off-by: Romain Naour ---- - gnuefi/Makefile | 3 ++- - lib/Makefile | 3 ++- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/gnuefi/Makefile b/gnuefi/Makefile -index d234ac0..d29575d 100644 ---- a/gnuefi/Makefile -+++ b/gnuefi/Makefile -@@ -54,7 +54,8 @@ TARGETS = crt0-efi-$(ARCH).o libgnuefi.a - - all: $(TARGETS) - --libgnuefi.a: $(patsubst %,libgnuefi.a(%),$(OBJS)) -+libgnuefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) - - clean: - rm -f $(TARGETS) *~ *.o $(OBJS) -diff --git a/lib/Makefile b/lib/Makefile -index 019ad57..c6abcae 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -73,7 +73,8 @@ all: libsubdirs libefi.a - libsubdirs: - for sdir in $(SUBDIRS); do mkdir -p $$sdir; done - --libefi.a: $(patsubst %,libefi.a(%),$(OBJS)) -+libefi.a: $(OBJS) -+ $(AR) rv $@ $(OBJS) - - clean: - rm -f libefi.a *~ $(OBJS) */*.o --- -1.9.3 - diff --git a/package.bak/gnu-efi/Config.in b/package.bak/gnu-efi/Config.in deleted file mode 100644 index 982102faa5..0000000000 --- a/package.bak/gnu-efi/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_GNU_EFI - bool "gnu-efi" - depends on BR2_i386 || BR2_x86_64 - help - Develop EFI applications for IA-64 (IPF), IA-32 (x86), and - x86_64 platforms using the GNU toolchain and the EFI - development environment. - - http://gnu-efi.sourceforge.net/ diff --git a/package.bak/gnu-efi/gnu-efi.hash b/package.bak/gnu-efi/gnu-efi.hash deleted file mode 100644 index 21033bddc2..0000000000 --- a/package.bak/gnu-efi/gnu-efi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/gnu-efi/files -md5 c4099c443b6b0c2b04dedc33e7814ec0 gnu-efi-3.0.1.tar.bz2 -sha1 07eea4d72f7ecb7229aaa77ddd411de5673c67b6 gnu-efi-3.0.1.tar.bz2 diff --git a/package.bak/gnu-efi/gnu-efi.mk b/package.bak/gnu-efi/gnu-efi.mk deleted file mode 100644 index a11ff819ca..0000000000 --- a/package.bak/gnu-efi/gnu-efi.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# gnu-efi -# -################################################################################ - -GNU_EFI_VERSION = 3.0.1 -GNU_EFI_SOURCE = gnu-efi-$(GNU_EFI_VERSION).tar.bz2 -GNU_EFI_SITE = http://downloads.sourceforge.net/project/gnu-efi -GNU_EFI_INSTALL_STAGING = YES -GNU_EFI_LICENSE = BSD-3c and/or GPLv2+ (gnuefi), BSD-3c (efilib) -GNU_EFI_LICENSE_FILES = README.efilib - -# gnu-efi is a set of library and header files used to build -# standalone EFI applications such as bootloaders. There is no point -# in installing these libraries to the target. -GNU_EFI_INSTALL_TARGET = NO - -ifeq ($(BR2_i386),y) -GNU_EFI_PLATFORM = ia32 -else ifeq ($(BR2_x86_64),y) -GNU_EFI_PLATFORM = x86_64 -endif - -define GNU_EFI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - ARCH=$(GNU_EFI_PLATFORM) -endef - -define GNU_EFI_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - INSTALLROOT=$(STAGING_DIR) \ - PREFIX=/usr ARCH=$(GNU_EFI_PLATFORM) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/gnuchess/0001-fix-static-build-with-uClibc.patch b/package.bak/gnuchess/0001-fix-static-build-with-uClibc.patch deleted file mode 100644 index 20a0835e6d..0000000000 --- a/package.bak/gnuchess/0001-fix-static-build-with-uClibc.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5bb2bc6384024c2344ef5cc6785131b382c38170 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 10 May 2015 22:19:03 +0200 -Subject: [PATCH] fix static build with uClibc - -uClibc doesn't provide lintl which should be provided -by gettext. If gnuchess is linked statically, -lintl should -be placed after libfrontend.a libadapter.a libengine.a. - -Fixes: -http://autobuild.buildroot.net/results/dcb/dcb1c0eb7212bd8d1e0d8b51fd517b73b7569cea/ - -Signed-off-by: Romain Naour ---- - src/Makefile.am | 2 +- - src/Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index ba90bce..fc02543 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -34,7 +34,7 @@ DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ - DISTCLEANFILES = *~ - - SUBDIRS = frontend adapter engine --gnuchess_LDADD = $(LIBINTL) frontend/libfrontend.a adapter/libadapter.a engine/libengine.a -+gnuchess_LDADD = frontend/libfrontend.a adapter/libadapter.a engine/libengine.a $(LIBINTL) - - configmake.h: Makefile - rm -f $@-t $@ -diff --git a/src/Makefile.in b/src/Makefile.in -index 9460bfd..424da52 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -395,7 +395,7 @@ AM_LDFLAGS = $(PTHREAD_LDFLAGS) $(PTHREAD_LIBS) - AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_builddir)/lib - DISTCLEANFILES = *~ - SUBDIRS = frontend adapter engine --gnuchess_LDADD = $(LIBINTL) frontend/libfrontend.a adapter/libadapter.a engine/libengine.a -+gnuchess_LDADD = frontend/libfrontend.a adapter/libadapter.a engine/libengine.a $(LIBINTL) - BUILT_SOURCES = configmake.h - CLEANFILES = configmake.h configmake.h-t - all: $(BUILT_SOURCES) config.h --- -1.9.3 - diff --git a/package.bak/gnuchess/Config.in b/package.bak/gnuchess/Config.in deleted file mode 100644 index 4993b1adf0..0000000000 --- a/package.bak/gnuchess/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GNUCHESS - bool "gnuchess" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_FLEX - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - GNU Chess lets most modern computers play a full game of chess. - - http://ftp.gnu.org/pub/gnu/chess - -comment "gnuchess needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gnuchess/gnuchess.hash b/package.bak/gnuchess/gnuchess.hash deleted file mode 100644 index 064a845eda..0000000000 --- a/package.bak/gnuchess/gnuchess.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 3c425c0264f253fc5cc2ba969abe667d77703c728770bd4b23c456cbe5e082ef gnuchess-6.2.4.tar.gz diff --git a/package.bak/gnuchess/gnuchess.mk b/package.bak/gnuchess/gnuchess.mk deleted file mode 100644 index e066b01fe5..0000000000 --- a/package.bak/gnuchess/gnuchess.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gnuchess -# -################################################################################ - -GNUCHESS_VERSION = 6.2.4 -GNUCHESS_SITE = $(BR2_GNU_MIRROR)/chess -GNUCHESS_LICENSE = GPLv2+ -GNUCHESS_LICENSE_FILES = COPYING - -GNUCHESS_DEPENDENCIES = host-flex flex -GNUCHESS_DEPENDENCIES += $(if $(BR2_PACKAGE_READLINE),readline) \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -$(eval $(autotools-package)) diff --git a/package.bak/gnupg/Config.in b/package.bak/gnupg/Config.in deleted file mode 100644 index 30f215fed8..0000000000 --- a/package.bak/gnupg/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config BR2_PACKAGE_GNUPG - bool "gnupg" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_NCURSES - depends on !BR2_PACKAGE_GNUPG2 - help - GnuPG is the GNU project's complete and free implementation - of the OpenPGP standard as defined by RFC4880. GnuPG allows - to encrypt and sign your data and communication, features a - versatile key management system as well as access modules - for all kinds of public key directories. GnuPG, also known - as GPG, is a command line tool with features for easy - integration with other applications. - - http://gnupg.org/ - -if BR2_PACKAGE_GNUPG - -config BR2_PACKAGE_GNUPG_AES - bool "AES support" - help - Support for the AES cipher - -config BR2_PACKAGE_GNUPG_RSA - bool "RSA support" - help - Support for RSA public key algorithm - -config BR2_PACKAGE_GNUPG_GPGV - bool "gpgv" - help - gpgv is an OpenPGP signature verification tool. - - This program is actually a stripped-down version of gpg - which is only able to check signatures. It is somewhat - smaller than the fully-blown gpg and uses a different (and - simpler) way to check that the public keys used to make the - signature are valid. There are no configuration files and - only a few options are implemented. - -config BR2_PACKAGE_GNUPG_GPGSPLIT - bool "gpgsplit" - help - gpgsplit splits an OpenPGP message into packets. - -endif diff --git a/package.bak/gnupg/gnupg.hash b/package.bak/gnupg/gnupg.hash deleted file mode 100644 index 8968b00d2b..0000000000 --- a/package.bak/gnupg/gnupg.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.gnu.org/archive/html/info-gnu/2016-08/msg00008.html -sha1 e3bdb585026f752ae91360f45c28e76e4a15d338 gnupg-1.4.21.tar.bz2 -# Locally computed -sha256 6b47a3100c857dcab3c60e6152e56a997f2c7862c1b8b2b25adf3884a1ae2276 gnupg-1.4.21.tar.bz2 diff --git a/package.bak/gnupg/gnupg.mk b/package.bak/gnupg/gnupg.mk deleted file mode 100644 index 182abd6709..0000000000 --- a/package.bak/gnupg/gnupg.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# gnupg -# -################################################################################ - -GNUPG_VERSION = 1.4.21 -GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 -GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg -GNUPG_LICENSE = GPLv3+ -GNUPG_LICENSE_FILES = COPYING -GNUPG_DEPENDENCIES = zlib ncurses $(if $(BR2_PACKAGE_LIBICONV),libiconv) -GNUPG_CONF_ENV = ac_cv_sys_symbol_underscore=no -GNUPG_CONF_OPTS = --disable-rpath --enable-minimal --disable-regex - -# gnupg doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) -GNUPG_CONF_OPTS += --disable-asm -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GNUPG_CONF_OPTS += --enable-bzip2 -GNUPG_DEPENDENCIES += bzip2 -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -GNUPG_CONF_ENV += ac_cv_path__libcurl_config=$(STAGING_DIR)/usr/bin/curl-config -GNUPG_DEPENDENCIES += libcurl -else -GNUPG_CONF_OPTS += --without-libcurl -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -GNUPG_DEPENDENCIES += readline -else -GNUPG_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_GNUPG_AES),y) -GNUPG_CONF_OPTS += --enable-aes -else -GNUPG_CONF_OPTS += --disable-aes -endif - -ifeq ($(BR2_PACKAGE_GNUPG_RSA),y) -GNUPG_CONF_OPTS += --enable-rsa -else -GNUPG_CONF_OPTS += --disable-rsa -endif - -ifneq ($(BR2_PACKAGE_GNUPG_GPGV),y) -define GNUPG_REMOVE_GPGV - rm -f $(TARGET_DIR)/usr/bin/gpgv -endef -GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGV -endif - -ifneq ($(BR2_PACKAGE_GNUPG_GPGSPLIT),y) -define GNUPG_REMOVE_GPGSPLIT - rm -f $(TARGET_DIR)/usr/bin/gpgsplit -endef -GNUPG_POST_INSTALL_TARGET_HOOKS += GNUPG_REMOVE_GPGSPLIT -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gnupg2/0001-fix-pth-config-usage.patch b/package.bak/gnupg2/0001-fix-pth-config-usage.patch deleted file mode 100644 index 756d351397..0000000000 --- a/package.bak/gnupg2/0001-fix-pth-config-usage.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix usage of PTH_CONFIG to work with pthsem - -The pthsem re-implement of pth provides a compatibility layer for pth, -but its pth-config script behaves slightly differently than the -original one when reporting the version number. This patch to gnupg2's -configure script adjusts the version checking to support this -difference, since Buildroot uses pth-config from pthsem. - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: adapt to patch m4 macro for autoreconfiguring] -Signed-off-by: "Yann E. MORIN" - -diff -durN gnupg2-2.0.29.orig/m4/gnupg-pth.m4 gnupg2-2.0.29/m4/gnupg-pth.m4 ---- gnupg2-2.0.29.orig/m4/gnupg-pth.m4 2015-09-08 14:39:24.000000000 +0200 -+++ gnupg2-2.0.29/m4/gnupg-pth.m4 2015-12-16 18:30:54.336513493 +0100 -@@ -17,7 +17,7 @@ - # Taken and modified from the m4 macros which come with Pth. - AC_DEFUN([GNUPG_PTH_VERSION_CHECK], - [ -- _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'` -+ _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]2}'` - _req_version="ifelse([$1],,1.2.0,$1)" - - AC_MSG_CHECKING(for PTH - version >= $_req_version) diff --git a/package.bak/gnupg2/0002-missing-include.patch b/package.bak/gnupg2/0002-missing-include.patch deleted file mode 100644 index f20994cedb..0000000000 --- a/package.bak/gnupg2/0002-missing-include.patch +++ /dev/null @@ -1,15 +0,0 @@ -tools/watchgnupg: select() is from sys/select.h - -Signed-off-by: "Yann E. MORIN" - -diff -durN gnupg2-2.0.29.orig/tools/watchgnupg.c gnupg2-2.0.29/tools/watchgnupg.c ---- gnupg2-2.0.29.orig/tools/watchgnupg.c 2015-09-08 14:39:24.000000000 +0200 -+++ gnupg2-2.0.29/tools/watchgnupg.c 2015-12-16 18:17:17.758057787 +0100 -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - - #define PGM "watchgnupg" - diff --git a/package.bak/gnupg2/0003-dont-run-tests.patch b/package.bak/gnupg2/0003-dont-run-tests.patch deleted file mode 100644 index 1858a0de09..0000000000 --- a/package.bak/gnupg2/0003-dont-run-tests.patch +++ /dev/null @@ -1,39 +0,0 @@ -tests: really don't run tests in cross-compilation - -Signed-off-by: "Yann E. MORIN" - -diff -durN gnupg2-2.0.29.orig/tests/Makefile.am gnupg2-2.0.29/tests/Makefile.am ---- gnupg2-2.0.29.orig/tests/Makefile.am 2015-09-08 14:39:24.000000000 +0200 -+++ gnupg2-2.0.29/tests/Makefile.am 2015-12-16 18:27:55.778227183 +0100 -@@ -64,6 +64,7 @@ - asschk_SOURCES = asschk.c - - -+if RUN_GPG_TESTS - all-local: inittests.stamp - - clean-local: -@@ -72,4 +73,5 @@ - inittests.stamp: inittests - srcdir=$(srcdir) $(TESTS_ENVIRONMENT) $(srcdir)/inittests - echo timestamp >./inittests.stamp -+endif # RUN_GPG_TESTS - -diff -durN gnupg2-2.0.29.orig/tests/pkits/Makefile.am gnupg2-2.0.29/tests/pkits/Makefile.am ---- gnupg2-2.0.29.orig/tests/pkits/Makefile.am 2015-09-01 08:52:21.000000000 +0200 -+++ gnupg2-2.0.29/tests/pkits/Makefile.am 2015-12-16 18:44:06.422655594 +0100 -@@ -52,6 +52,7 @@ - - DISTCLEANFILES = pubring.kbx~ random_seed - -+if RUN_GPG_TESTS - all-local: inittests.stamp - - clean-local: -@@ -71,5 +72,5 @@ - elif test $$? -eq 77; then echo "- SKIP $$tst"; \ - fi; \ - done -- -+endif # RUN_GPG_TESTS - diff --git a/package.bak/gnupg2/0004-silence-git-when-not-in-git-tree.patch b/package.bak/gnupg2/0004-silence-git-when-not-in-git-tree.patch deleted file mode 100644 index 5eaefe4bda..0000000000 --- a/package.bak/gnupg2/0004-silence-git-when-not-in-git-tree.patch +++ /dev/null @@ -1,26 +0,0 @@ -configure: silence autoreconf when not in a git tree - -When autoreconfiguring ourside of a git tree, the output is verbose -with git errors. - -Silence that by consigning stderr to oblivion. - -Signed-off-by: "Yann E. MORIN" - -diff -durN gnupg2-2.0.29.orig/configure.ac gnupg2-2.0.29/configure.ac ---- gnupg2-2.0.29.orig/configure.ac 2015-09-08 14:39:24.000000000 +0200 -+++ gnupg2-2.0.29/configure.ac 2015-12-16 18:34:47.099493863 +0100 -@@ -33,11 +33,11 @@ - # flag indicating a development version (mym4_isgit). Note that the - # m4 processing is done by autoconf and not during the configure run. - m4_define([mym4_revision], -- m4_esyscmd([git rev-parse --short HEAD | tr -d '\n\r'])) -+ m4_esyscmd([git rev-parse --short HEAD 2>/dev/null | tr -d '\n\r'])) - m4_define([mym4_revision_dec], - m4_esyscmd_s([echo $((0x$(echo ]mym4_revision[|head -c 4)))])) - m4_define([mym4_betastring], -- m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long|\ -+ m4_esyscmd_s([git describe --match 'gnupg-2.[0-9].*[0-9]' --long 2>/dev/null |\ - awk -F- '$3!=0{print"-beta"$3}'])) - m4_define([mym4_isgit],m4_if(mym4_betastring,[],[no],[yes])) - m4_define([mym4_full_version],[mym4_version[]mym4_betastring]) diff --git a/package.bak/gnupg2/Config.in b/package.bak/gnupg2/Config.in deleted file mode 100644 index ba2a6bcff5..0000000000 --- a/package.bak/gnupg2/Config.in +++ /dev/null @@ -1,43 +0,0 @@ -comment "gnupg2 needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_GNUPG2 - bool "gnupg2" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBGPG_ERROR - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBASSUAN - select BR2_PACKAGE_LIBKSBA - select BR2_PACKAGE_LIBPTHSEM - select BR2_PACKAGE_LIBPTHSEM_COMPAT - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - depends on BR2_USE_MMU # libassuan - depends on !BR2_STATIC_LIBS - help - GnuPG is the GNU project's complete and free implementation - of the OpenPGP standard as defined by RFC4880. GnuPG allows - to encrypt and sign your data and communication, features a - versatile key management system as well as access modules - for all kinds of public key directories. GnuPG, also known - as GPG, is a command line tool with features for easy - integration with other applications. - - http://gnupg.org/ - -if BR2_PACKAGE_GNUPG2 - -config BR2_PACKAGE_GNUPG2_GPGV2 - bool "gpgv2" - help - gpgv2 is an OpenPGP signature verification tool. - - This program is actually a stripped-down version of gpg - which is only able to check signatures. It is somewhat - smaller than the fully-blown gpg and uses a different (and - simpler) way to check that the public keys used to make the - signature are valid. There are no configuration files and - only a few options are implemented. - -endif diff --git a/package.bak/gnupg2/gnupg2.hash b/package.bak/gnupg2/gnupg2.hash deleted file mode 100644 index 67f7d9da36..0000000000 --- a/package.bak/gnupg2/gnupg2.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000385.html -sha1 a9f024588c356a55e2fd413574bfb55b2e18794a gnupg-2.0.30.tar.bz2 -# Calculated based on the hash above -sha256 e329785a4f366ba5d72c2c678a7e388b0892ac8440c2f4e6810042123c235d71 gnupg-2.0.30.tar.bz2 diff --git a/package.bak/gnupg2/gnupg2.mk b/package.bak/gnupg2/gnupg2.mk deleted file mode 100644 index 763e9454a9..0000000000 --- a/package.bak/gnupg2/gnupg2.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# gnupg2 -# -################################################################################ - -GNUPG2_VERSION = 2.0.30 -GNUPG2_SOURCE = gnupg-$(GNUPG2_VERSION).tar.bz2 -GNUPG2_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg -GNUPG2_LICENSE = GPLv3+ -GNUPG2_LICENSE_FILES = COPYING -GNUPG2_DEPENDENCIES = zlib libgpg-error libgcrypt libassuan libksba libpthsem \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -# Patching configure.ac and m4 macros, as well as Makefile.am -GNUPG2_AUTORECONF = YES - -GNUPG2_CONF_OPTS = \ - --disable-rpath --disable-regex --disable-doc \ - --with-libgpg-error-prefix=$(STAGING_DIR)/usr \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ - --with-libassuan-prefix=$(STAGING_DIR)/usr \ - --with-ksba-prefix=$(STAGING_DIR)/usr \ - --with-pth-prefix=$(STAGING_DIR)/usr -GNUPG2_CONF_ENV = gl_cv_header_working_stdint_h=yes - -ifneq ($(BR2_PACKAGE_GNUPG2_GPGV2),y) -define GNUPG2_REMOVE_GPGV2 - rm -f $(TARGET_DIR)/usr/bin/gpgv2 -endef -GNUPG2_POST_INSTALL_TARGET_HOOKS += GNUPG2_REMOVE_GPGV2 -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GNUPG2_CONF_OPTS += --enable-bzip2 --with-bzip2=$(STAGING_DIR) -GNUPG2_DEPENDENCIES += bzip2 -else -GNUPG2_CONF_OPTS += --disable-bzip2 -endif - -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) -GNUPG2_CONF_OPTS += --enable-ccid-driver -GNUPG2_DEPENDENCIES += libusb-compat -else -GNUPG2_CONF_OPTS += --disable-ccid-driver -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -GNUPG2_CONF_OPTS += --with-readline=$(STAGING_DIR) -GNUPG2_DEPENDENCIES += readline -else -GNUPG2_CONF_OPTS += --without-readline -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gnuplot/0001-configure-add-without-demo-option.patch b/package.bak/gnuplot/0001-configure-add-without-demo-option.patch deleted file mode 100644 index a9abfd06ba..0000000000 --- a/package.bak/gnuplot/0001-configure-add-without-demo-option.patch +++ /dev/null @@ -1,67 +0,0 @@ -Add options to enable/disable docs and demos - -Originally written by Anthony Viallard -. - -[Vincent: adapt patch to 5.0.5 version] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -rup a/configure.in b/configure.in ---- a/configure.in 2016-09-07 05:14:29.000000000 +0100 -+++ b/configure.in 2016-12-01 12:09:31.487464774 +0000 -@@ -818,6 +818,16 @@ if test "$with_cwdrc" = yes; then - [ Define if you want to read .gnuplot from current directory (SECURITY RISK!).]) - fi - -+dnl Whether we want to build the doc files -+dnl Does nothing here, is passed on to the doc subdir -+AC_ARG_ENABLE(doc,dnl -+[ --disable-doc do not build doc files]) -+ -+dnl Whether we want to build the demo files -+dnl Does nothing here, is passed on to the demo subdir -+AC_ARG_ENABLE(demo,dnl -+[ --disable-demo do not build demo files]) -+ - dnl Sort help/subtopic tables by row or column - AC_ARG_WITH(row-help,dnl - [ --with-row-help format help and subtopic tables by row (default) -@@ -1303,6 +1313,24 @@ fi - dnl No configuration option for this one yet - AC_DEFINE(MAX_PARALLEL_AXES,7, [Maximum number of parallel axes supported]) - -+dnl build doc files -+if test "$enable_doc" != no; then -+ AC_CONFIG_SUBDIRS(docs) -+ DOCSUBDIR=docs -+else -+ DOCSUBDIR= -+fi -+AC_SUBST(DOCSUBDIR) -+ -+dnl build demo files -+if test "$enable_demo" != no; then -+ AC_CONFIG_SUBDIRS(demo) -+ DEMOSUBDIR=demo -+else -+ DEMOSUBDIR= -+fi -+AC_SUBST(DEMOSUBDIR) -+ - dnl Substitute variables - AC_SUBST(PACKAGE) - AC_SUBST(VERSION_MAJOR) -diff -rup a/Makefile.am b/Makefile.am ---- a/Makefile.am 2014-05-30 17:38:08.000000000 +0100 -+++ b/Makefile.am 2016-12-01 12:09:31.488464794 +0000 -@@ -1,7 +1,7 @@ - ## Process this file with automake to produce Makefile.in -*-Makefile-*- - AUTOMAKE_OPTIONS = foreign - --SUBDIRS = config m4 term src docs $(LISPDIR) man demo tutorial share -+SUBDIRS = config m4 term src $(DOCSUBDIR) $(LISPDIR) man $(DEMOSUBDIR) tutorial share - - EXTRA_DIST = BUGS CodeStyle Copyright FAQ.pdf GNUmakefile INSTALL INSTALL.gnu \ - Makefile.maint PATCHLEVEL PGPKEYS PORTING README RELEASE_NOTES \ diff --git a/package.bak/gnuplot/0002-use-gdlib-config-properly.patch b/package.bak/gnuplot/0002-use-gdlib-config-properly.patch deleted file mode 100644 index 690a82652a..0000000000 --- a/package.bak/gnuplot/0002-use-gdlib-config-properly.patch +++ /dev/null @@ -1,27 +0,0 @@ -Fix usage of gdlib-config - -gnuplot configure.in script properly takes care of finding -gdlib-config using AC_PATH_PROG... but then directly uses gdlib-config -instead of going through the GDLIB_CONFIG variable that AC_PATH_PROG -has defined. Which means that whenever a gdlib-config binary not in -the PATH is being used, it does not use it. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -537,9 +537,9 @@ - if test "$with_gd" != no; then - AC_PATH_PROG([GDLIB_CONFIG], [gdlib-config]) - if test -n "$GDLIB_CONFIG"; then -- libgd_CPPFLAGS=`gdlib-config --cflags` -- libgd_LDFLAGS=`gdlib-config --ldflags` -- libgd_LIBS=`gdlib-config --libs` -+ libgd_CPPFLAGS=`$GDLIB_CONFIG --cflags` -+ libgd_LDFLAGS=`$GDLIB_CONFIG --ldflags` -+ libgd_LIBS=`$GDLIB_CONFIG --libs` - elif test -d "$with_gd"; then - libgd_CPPFLAGS="-I$with_gd/include" - libgd_LDFLAGS="-L$with_gd/lib" diff --git a/package.bak/gnuplot/Config.in b/package.bak/gnuplot/Config.in deleted file mode 100644 index 603c194fe5..0000000000 --- a/package.bak/gnuplot/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_GNUPLOT - bool "gnuplot" - help - A portable command-line driven graphing utility. - - http://www.gnuplot.info/ diff --git a/package.bak/gnuplot/gnuplot.hash b/package.bak/gnuplot/gnuplot.hash deleted file mode 100644 index a71d006594..0000000000 --- a/package.bak/gnuplot/gnuplot.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/gnuplot/files/gnuplot/5.0.5/ -md5 c5e96fca73afbee4f57cbc1bfce6b3b8 gnuplot-5.0.5.tar.gz -sha1 c35f55657fdc33217dd70bbf3148578563ecaad1 gnuplot-5.0.5.tar.gz diff --git a/package.bak/gnuplot/gnuplot.mk b/package.bak/gnuplot/gnuplot.mk deleted file mode 100644 index 3e00eefef8..0000000000 --- a/package.bak/gnuplot/gnuplot.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# gnuplot -# -################################################################################ - -GNUPLOT_VERSION = 5.0.5 -GNUPLOT_SITE = http://downloads.sourceforge.net/project/gnuplot/gnuplot/$(GNUPLOT_VERSION) -GNUPLOT_LICENSE = gnuplot license (open source) -GNUPLOT_LICENSE_FILES = Copyright - -GNUPLOT_AUTORECONF = YES - -GNUPLOT_CONF_OPTS = \ - --without-x \ - --disable-raise-console \ - --disable-mouse \ - --without-tutorial \ - --disable-demo \ - --without-row-help \ - --disable-history-file \ - --disable-wxwidgets \ - --without-lua \ - --without-latex \ - --without-cairo - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -GNUPLOT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) -GNUPLOT_CONF_OPTS += --with-gd -GNUPLOT_DEPENDENCIES += gd -GNUPLOT_CONF_ENV += \ - ac_cv_path_GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config -else -GNUPLOT_CONF_OPTS += --without-gd -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -GNUPLOT_CONF_OPTS += --with-readline=gnu -GNUPLOT_DEPENDENCIES += readline -else -GNUPLOT_CONF_OPTS += --without-readline -endif - -# Remove Javascript scripts, lua scripts, PostScript files -define GNUPLOT_REMOVE_UNNEEDED_FILES - $(RM) -rf $(TARGET_DIR)/usr/share/gnuplot -endef - -GNUPLOT_POST_INSTALL_TARGET_HOOKS += GNUPLOT_REMOVE_UNNEEDED_FILES - -$(eval $(autotools-package)) diff --git a/package.bak/gnuradio/0001-suppress-boost_unitest-detection.patch b/package.bak/gnuradio/0001-suppress-boost_unitest-detection.patch deleted file mode 100644 index f1713dc349..0000000000 --- a/package.bak/gnuradio/0001-suppress-boost_unitest-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ -By default, the boost test option is mandatory for build environment -detection. -This patch suppress this dependency and allows the test part only if -build_test is enabled at the Buildroot level. - -Signed-off-by: Gwenhael Goavec-Merou ---- -Index: gnuradio-3.7.5/volk/cmake/VolkBoost.cmake -=================================================================== ---- gnuradio-3.7.5.orig/volk/cmake/Modules/VolkBoost.cmake -+++ gnuradio-3.7.5/volk/cmake/Modules/VolkBoost.cmake -@@ -29,7 +29,6 @@ set(__INCLUDED_VOLK_BOOST_CMAKE TRUE) - set(BOOST_REQUIRED_COMPONENTS - filesystem - system -- unit_test_framework - program_options - ) - -Index: gnuradio-3.7.5/volk/lib/CMakeLists.txt -=================================================================== ---- gnuradio-3.7.5.orig/volk/lib/CMakeLists.txt -+++ gnuradio-3.7.5/volk/lib/CMakeLists.txt -@@ -580,7 +580,10 @@ - ######################################################################## - # Build the QA test application - ######################################################################## --if(ENABLE_TESTING) -+ -+find_package(Boost "1.35" COMPONENTS "unit_test_framework") -+ -+if(ENABLE_TESTING AND BUILD_TEST) - - #include Boost headers - include_directories(${Boost_INCLUDE_DIRS}) -@@ -597,4 +600,4 @@ - TARGET_DEPS volk - ) - --endif(ENABLE_TESTING) -+endif(ENABLE_TESTING AND BUILD_TEST) diff --git a/package.bak/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch b/package.bak/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch deleted file mode 100644 index 15d7dea7da..0000000000 --- a/package.bak/gnuradio/0002-fix_cmake_3_5_0_build_failure.patch +++ /dev/null @@ -1,175 +0,0 @@ -Changing CMAKE_{SOURCE,BINARY}_DIR like volk does in its top-level -CMakeLists.txt no longer works with CMake 3.5.0. - -Use PROJECT_{BINARY,SOURCE}_DIR instead. - -Obtained from: http://pkgs.fedoraproject.org/cgit/rpms/gnuradio.git/commit/?id=b50c7e66f6e3a1e6a84e25505d3fd873756c2027 -Upstream patch and discussion: https://github.com/gnuradio/volk/pull/65 - -Signed-off-by: Gwenhael Goavec-Merou ---- - apps/CMakeLists.txt | 12 ++++++------ - lib/CMakeLists.txt | 48 ++++++++++++++++++++++++------------------------ - 2 files changed, 30 insertions(+), 30 deletions(-) - -diff --git a/volk/apps/CMakeLists.txt b/volk/apps/CMakeLists.txt -index 74ed18d..f9ef6e0 100644 ---- a/volk/apps/CMakeLists.txt -+++ b/volk/apps/CMakeLists.txt -@@ -19,23 +19,23 @@ - # Setup profiler - ######################################################################## - if(MSVC) -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - endif(MSVC) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_BINARY_DIR} -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/lib -- ${CMAKE_BINARY_DIR}/lib -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/lib -+ ${PROJECT_BINARY_DIR}/lib - ${Boost_INCLUDE_DIRS} - ) - - # MAKE volk_profile - add_executable(volk_profile - ${CMAKE_CURRENT_SOURCE_DIR}/volk_profile.cc -- ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc -+ ${PROJECT_SOURCE_DIR}/lib/qa_utils.cc - ) - - -diff --git a/volk/lib/CMakeLists.txt b/volk/lib/CMakeLists.txt -index 35b67dc..f00200a 100644 ---- a/volk/lib/CMakeLists.txt -+++ b/volk/lib/CMakeLists.txt -@@ -90,7 +90,7 @@ endif() - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "arch_flags" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE arch_flag_lines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -278,7 +278,7 @@ message(STATUS "Available architectures: ${available_archs}") - ######################################################################## - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machines" --archs "${available_archs}" - OUTPUT_VARIABLE available_machines OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -310,9 +310,9 @@ message(STATUS "Available machines: ${available_machines}") - ######################################################################## - - #dependencies are all python, xml, and header implementation files --file(GLOB xml_files ${CMAKE_SOURCE_DIR}/gen/*.xml) --file(GLOB py_files ${CMAKE_SOURCE_DIR}/gen/*.py) --file(GLOB h_files ${CMAKE_SOURCE_DIR}/kernels/volk/*.h) -+file(GLOB xml_files ${PROJECT_SOURCE_DIR}/gen/*.xml) -+file(GLOB py_files ${PROJECT_SOURCE_DIR}/gen/*.py) -+file(GLOB h_files ${PROJECT_SOURCE_DIR}/kernels/volk/*.h) - - macro(gen_template tmpl output) - list(APPEND volk_gen_sources ${output}) -@@ -320,21 +320,21 @@ macro(gen_template tmpl output) - OUTPUT ${output} - DEPENDS ${xml_files} ${py_files} ${h_files} ${tmpl} - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_tmpl_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_tmpl_utils.py - --input ${tmpl} --output ${output} ${ARGN} - ) - endmacro(gen_template) - --make_directory(${CMAKE_BINARY_DIR}/include/volk) -+make_directory(${PROJECT_BINARY_DIR}/include/volk) - --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_typedefs.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_cpu.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_cpu.c) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${CMAKE_BINARY_DIR}/include/volk/volk_config_fixed.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${CMAKE_BINARY_DIR}/lib/volk_machines.h) --gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${CMAKE_BINARY_DIR}/lib/volk_machines.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_typedefs.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_typedefs.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_cpu.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_cpu.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_cpu.c) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_config_fixed.tmpl.h ${PROJECT_BINARY_DIR}/include/volk/volk_config_fixed.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.h ${PROJECT_BINARY_DIR}/lib/volk_machines.h) -+gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machines.tmpl.c ${PROJECT_BINARY_DIR}/lib/volk_machines.c) - - set(BASE_CFLAGS NONE) - string(TOUPPER ${CMAKE_BUILD_TYPE} CBTU) -@@ -362,12 +362,12 @@ set(COMPILER_INFO "${CMAKE_C_COMPILER}:::${CMAKE_C_FLAGS_${GRCBTU}} ${CMAKE_C_FL - foreach(machine_name ${available_machines}) - #generate machine source - set(machine_source ${CMAKE_CURRENT_BINARY_DIR}/volk_machine_${machine_name}.c) -- gen_template(${CMAKE_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) -+ gen_template(${PROJECT_SOURCE_DIR}/tmpl/volk_machine_xxx.tmpl.c ${machine_source} ${machine_name}) - - #determine machine flags - execute_process( - COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B} -- ${CMAKE_SOURCE_DIR}/gen/volk_compile_utils.py -+ ${PROJECT_SOURCE_DIR}/gen/volk_compile_utils.py - --mode "machine_flags" --machine "${machine_name}" --compiler "${COMPILER_NAME}" - OUTPUT_VARIABLE ${machine_name}_flags OUTPUT_STRIP_TRAILING_WHITESPACE - ) -@@ -393,9 +393,9 @@ string(REPLACE "\n" " \\n" COMPILER_INFO ${COMPILER_INFO}) - # Set local include directories first - ######################################################################## - include_directories( -- ${CMAKE_BINARY_DIR}/include -- ${CMAKE_SOURCE_DIR}/include -- ${CMAKE_SOURCE_DIR}/kernels -+ ${PROJECT_BINARY_DIR}/include -+ ${PROJECT_SOURCE_DIR}/include -+ ${PROJECT_SOURCE_DIR}/kernels - ${CMAKE_CURRENT_BINARY_DIR} - ${CMAKE_CURRENT_SOURCE_DIR} - ) -@@ -420,8 +420,8 @@ if(${CMAKE_VERSION} VERSION_GREATER "2.8.9") - # setup architecture specific assembler flags - set(ARCH_ASM_FLAGS "-mfpu=neon -g") - # then add the files -- include_directories(${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon) -- file(GLOB asm_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/neon/*.s) -+ include_directories(${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon) -+ file(GLOB asm_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/neon/*.s) - foreach(asm_file ${asm_files}) - list(APPEND volk_sources ${asm_file}) - message(STATUS "Adding source file: ${asm_file}") -@@ -453,7 +453,7 @@ if(ORC_FOUND) - list(APPEND volk_libraries ${ORC_LIBRARIES}) - - #setup orc functions -- file(GLOB orc_files ${CMAKE_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) -+ file(GLOB orc_files ${PROJECT_SOURCE_DIR}/kernels/volk/asm/orc/*.orc) - foreach(orc_file ${orc_files}) - - #extract the name for the generated c source from the orc file -@@ -511,7 +511,7 @@ PROPERTIES COMPILE_DEFINITIONS "${machine_defs}") - - if(MSVC) - #add compatibility includes for stdint types -- include_directories(${CMAKE_SOURCE_DIR}/cmake/msvc) -+ include_directories(${PROJECT_SOURCE_DIR}/cmake/msvc) - add_definitions(-DHAVE_CONFIG_H) - #compile the sources as C++ due to the lack of complex.h under MSVC - set_source_files_properties(${volk_sources} PROPERTIES LANGUAGE CXX) --- -2.7.3 - diff --git a/package.bak/gnuradio/0003-fix_compilation_in_gcc-6.patch b/package.bak/gnuradio/0003-fix_compilation_in_gcc-6.patch deleted file mode 100644 index f50af85681..0000000000 --- a/package.bak/gnuradio/0003-fix_compilation_in_gcc-6.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit a1cf11937665392bcfa223a5095ff903eb44c69b -Author: Jaroslav #karvada -Date: Fri Feb 12 18:29:13 2016 +0100 - -Backport patch from -http://gnuradio.org/redmine/projects/gnuradio/repository/revisions/a1cf11937665392bcfa223a5095ff903eb44c69b - -Fix compilation in gcc-6 - -Signed-off-by: Jaroslav #karvada -Signed-off-by: Gwenhael Goavec-Merou ---- -diff --git a/gr-fec/include/gnuradio/fec/polar_decoder_common.h b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -index b0ecb85..a39ee4f 100644 ---- a/gr-fec/include/gnuradio/fec/polar_decoder_common.h -+++ b/gr-fec/include/gnuradio/fec/polar_decoder_common.h -@@ -28,6 +28,10 @@ - #include - #include - -+#ifndef BOOST_CONSTEXPR_OR_CONST -+#define BOOST_CONSTEXPR_OR_CONST const -+#endif -+ - namespace gr { - namespace fec { - namespace code { -@@ -64,7 +68,7 @@ namespace gr { - bool set_frame_size(unsigned int frame_size){return false;}; - - private: -- static const float D_LLR_FACTOR = -2.19722458f; -+ static BOOST_CONSTEXPR_OR_CONST float D_LLR_FACTOR = -2.19722458f; - unsigned int d_frozen_bit_counter; - - protected: diff --git a/package.bak/gnuradio/Config.in b/package.bak/gnuradio/Config.in deleted file mode 100644 index 8301afe8f2..0000000000 --- a/package.bak/gnuradio/Config.in +++ /dev/null @@ -1,129 +0,0 @@ -comment "gnuradio needs a toolchain w/ C++, NPTL, wchar, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - -config BR2_PACKAGE_GNURADIO - bool "gnuradio" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU # use fork() - depends on BR2_USE_WCHAR # boost - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_DATE_TIME - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_THREAD - help - GNU Radio is a free & open-source software development - toolkit that provides signal processing blocks to implement - software radios. It can be used with readily-available - low-cost external RF hardware to create software-defined - radios, or without hardware in a simulation-like - environment. It is widely used in hobbyist, academic and - commercial environments to support both wireless - communications research and real-world radio systems. - - http://gnuradio.org/ - -if BR2_PACKAGE_GNURADIO - -config BR2_PACKAGE_GNURADIO_AUDIO - bool "gr-audio" - depends on BR2_PACKAGE_ALSA_LIB || BR2_PACKAGE_PORTAUDIO - help - Add audio source/sink to GNU Radio - -config BR2_PACKAGE_GNURADIO_BLOCKS - bool "blocks support" - help - GNU Radio basic block library - -config BR2_PACKAGE_GNURADIO_CTRLPORT - bool "ctrlport support" - help - GNU Radio ctrlport block - -config BR2_PACKAGE_GNURADIO_FEC - bool "gr-fec support" - select BR2_PACKAGE_GNURADIO_BLOCKS - select BR2_PACKAGE_GSL - help - FEC signal processing blocks - -config BR2_PACKAGE_GNURADIO_PYTHON - bool "python support" - depends on BR2_PACKAGE_PYTHON - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - select BR2_PACKAGE_BOOST_PYTHON - select BR2_PACKAGE_PYTHON_NUMPY # runtime - help - Enable python component - -config BR2_PACKAGE_GNURADIO_UTILS - bool "gr-utils support" - depends on BR2_PACKAGE_GNURADIO_PYTHON - help - Misc python utilities - -comment "gr-fft, -filter, -analog, -channels, -digital, -trellis, -pager, -qtgui depends fftw's single precision" - depends on !BR2_PACKAGE_FFTW_PRECISION_SINGLE - -if BR2_PACKAGE_FFTW_PRECISION_SINGLE - -config BR2_PACKAGE_GNURADIO_ANALOG - bool "gr-analog support" - select BR2_PACKAGE_GNURADIO_FILTER - help - Analog communications blocks - -config BR2_PACKAGE_GNURADIO_CHANNELS - bool "gr-channels support" - select BR2_PACKAGE_GNURADIO_ANALOG - help - Channel model blocks - -config BR2_PACKAGE_GNURADIO_DIGITAL - bool "gr-digital support" - select BR2_PACKAGE_GNURADIO_ANALOG - help - Digital communications blocks - -config BR2_PACKAGE_GNURADIO_FFT - bool "gr-fft support" - select BR2_PACKAGE_GNURADIO_BLOCKS - help - FFT signal processing blocks - -config BR2_PACKAGE_GNURADIO_FILTER - bool "gr-filter support" - select BR2_PACKAGE_GNURADIO_FFT - help - Filter signal processing blocks - -config BR2_PACKAGE_GNURADIO_PAGER - bool "gr-flex support" - select BR2_PACKAGE_GNURADIO_ANALOG - help - FLEX pager decoder implementation blocks - -config BR2_PACKAGE_GNURADIO_QTGUI - bool "gr-qtgui" - depends on BR2_PACKAGE_PYTHON_PYQT - depends on BR2_PACKAGE_QWT - depends on BR2_PACKAGE_QT_STL - select BR2_PACKAGE_GNURADIO_FFT - select BR2_PACKAGE_GNURADIO_FILTER - help - GNU Radio Qt scopes - -config BR2_PACKAGE_GNURADIO_TRELLIS - bool "gr-trellis support" - select BR2_PACKAGE_GNURADIO_DIGITAL - help - Trellis coded modulation blocks - -endif -endif diff --git a/package.bak/gnuradio/gnuradio.hash b/package.bak/gnuradio/gnuradio.hash deleted file mode 100644 index bb934e2b92..0000000000 --- a/package.bak/gnuradio/gnuradio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gnuradio.org/releases/gnuradio/sha256sums -sha256 9c06f0f1ec14113203e0486fd526dd46ecef216dfe42f12d78d9b781b1ef967e gnuradio-3.7.9.1.tar.gz diff --git a/package.bak/gnuradio/gnuradio.mk b/package.bak/gnuradio/gnuradio.mk deleted file mode 100644 index f1817f61c2..0000000000 --- a/package.bak/gnuradio/gnuradio.mk +++ /dev/null @@ -1,143 +0,0 @@ -################################################################################ -# -# gnuradio -# -################################################################################ - -GNURADIO_VERSION = 3.7.9.1 -GNURADIO_SITE = http://gnuradio.org/releases/gnuradio -GNURADIO_LICENSE = GPLv3+ -GNURADIO_LICENSE_FILES = COPYING - -GNURADIO_SUPPORTS_IN_SOURCE_BUILD = NO - -# host-python-cheetah is needed for volk to compile -GNURADIO_DEPENDENCIES = \ - host-python-cheetah \ - host-swig \ - boost - -ifeq ($(BR2_PACKAGE_ORC),y) -GNURADIO_DEPENDENCIES += orc -endif - -GNURADIO_CONF_OPTS = \ - -DENABLE_DEFAULT=OFF \ - -DENABLE_VOLK=ON \ - -DENABLE_GNURADIO_RUNTIME=ON - -# For third-party blocks, the gnuradio libraries are mandatory at -# compile time. -GNURADIO_INSTALL_STAGING = YES - -# Yes, this is silly, because -march is already known by the compiler -# with the internal toolchain, and passed by the external wrapper for -# external toolchains. Nonetheless, gnuradio does some matching on the -# CFLAGS to decide whether to build the NEON functions or not, and -# wants to see the string 'armv7' in the CFLAGS. -ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_ARM_CPU_HAS_NEON),yy) -GNURADIO_CONF_OPTS += -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -march=armv7-a" -endif - -# As soon as -mfpu=neon is supported by the compiler, gnuradio will try -# to use it. But having NEON support in the compiler doesn't necessarily -# mean we have NEON support in our CPU. -ifeq ($(BR2_ARM_CPU_HAS_NEON),) -GNURADIO_CONF_OPTS += -Dhave_mfpu_neon=0 -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_ANALOG),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_ANALOG=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_AUDIO),y) -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -GNURADIO_DEPENDENCIES += alsa-lib -endif -ifeq ($(BR2_PACKAGE_PORTAUDIO),y) -GNURADIO_DEPENDENCIES += portaudio -endif -GNURADIO_CONF_OPTS += -DENABLE_GR_AUDIO=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_AUDIO=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_BLOCKS),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_BLOCKS=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_CHANNELS),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_CHANNELS=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_CTRLPORT),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_CTRLPORT=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_CTRLPORT=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_DIGITAL),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_DIGITAL=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_FEC),y) -GNURADIO_DEPENDENCIES += gsl -GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_FEC=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_FFT),y) -GNURADIO_DEPENDENCIES += fftw -GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_FFT=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_FILTER),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_FILTER=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_PYTHON),y) -GNURADIO_DEPENDENCIES += python -GNURADIO_CONF_OPTS += -DENABLE_PYTHON=ON -else -GNURADIO_CONF_OPTS += -DENABLE_PYTHON=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_PAGER),y) -GNURADIO_CONF_OPTS += -DENABLE_PAGER=ON -else -GNURADIO_CONF_OPTS += -DENABLE_PAGER=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_QTGUI),y) -GNURADIO_DEPENDENCIES += python-pyqt qwt -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_QTGUI=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_TRELLIS),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_TRELLIS=OFF -endif - -ifeq ($(BR2_PACKAGE_GNURADIO_UTILS),y) -GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=ON -else -GNURADIO_CONF_OPTS += -DENABLE_GR_UTILS=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/gnutls/Config.in b/package.bak/gnutls/Config.in deleted file mode 100644 index cfb7cb3f3b..0000000000 --- a/package.bak/gnutls/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_GNUTLS - bool "gnutls" - select BR2_PACKAGE_LIBTASN1 - select BR2_PACKAGE_LIBUNISTRING - select BR2_PACKAGE_NETTLE - select BR2_PACKAGE_PCRE - depends on BR2_USE_WCHAR - help - GnuTLS is a secure communications library implementing the SSL - and TLS protocols and technologies around them. - - http://www.gnutls.org - -if BR2_PACKAGE_GNUTLS - -config BR2_PACKAGE_GNUTLS_TOOLS - bool "install tools" - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - help - Install GnuTLS command line tools for various cryptographic tasks. - -endif - -comment "gnutls needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/gnutls/gnutls.hash b/package.bak/gnutls/gnutls.hash deleted file mode 100644 index 121f75a702..0000000000 --- a/package.bak/gnutls/gnutls.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0e97f243ae72b70307d684b84c7fe679385aa7a7a0e37e5be810193dcc17d4ff gnutls-3.5.8.tar.xz diff --git a/package.bak/gnutls/gnutls.mk b/package.bak/gnutls/gnutls.mk deleted file mode 100644 index 4fab812819..0000000000 --- a/package.bak/gnutls/gnutls.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# gnutls -# -################################################################################ - -GNUTLS_VERSION_MAJOR = 3.5 -GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 -GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz -GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) -GNUTLS_LICENSE = LGPLv2.1+ (core library), GPLv3+ (gnutls-openssl library) -GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER -GNUTLS_DEPENDENCIES = host-pkgconf libunistring libtasn1 nettle pcre -GNUTLS_CONF_OPTS = \ - --disable-doc \ - --disable-guile \ - --disable-libdane \ - --disable-rpath \ - --enable-local-libopts \ - --enable-openssl-compatibility \ - --with-libnettle-prefix=$(STAGING_DIR)/usr \ - --with-libunistring-prefix=$(STAGING_DIR)/usr \ - --with-librt-prefix=$(STAGING_DIR) \ - --without-tpm \ - $(if $(BR2_PACKAGE_GNUTLS_TOOLS),--enable-tools,--disable-tools) -GNUTLS_CONF_ENV = gl_cv_socket_ipv6=yes \ - ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \ - gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \ - gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no) \ - gl_cv_func_gettimeofday_clobber=no -GNUTLS_INSTALL_STAGING = YES - -# libpthread and libz autodetection poison the linkpath -GNUTLS_CONF_OPTS += $(if $(BR2_TOOLCHAIN_HAS_THREADS),--with-libpthread-prefix=$(STAGING_DIR)/usr) -GNUTLS_CONF_OPTS += $(if $(BR2_PACKAGE_ZLIB),--with-libz-prefix=$(STAGING_DIR)/usr) - -# gnutls needs libregex, but pcre can be used too -# The check isn't cross-compile friendly -GNUTLS_CONF_ENV += libopts_cv_with_libregex=yes -GNUTLS_CONF_OPTS += \ - --with-regex-header=pcreposix.h \ - --with-libregex-cflags="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --cflags`" \ - --with-libregex-libs="`$(PKG_CONFIG_HOST_BINARY) libpcreposix --libs`" - -# Consider crywrap as part of tools because it needs WCHAR, and it's so too -ifeq ($(BR2_PACKAGE_GNUTLS_TOOLS),) -GNUTLS_CONF_OPTS += --disable-crywrap -endif - -# Prerequisite for crywrap -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -GNUTLS_CONF_ENV += LIBS="-largp" -GNUTLS_DEPENDENCIES += argp-standalone -endif - -# libidn support for nommu must exclude the crywrap wrapper (uses fork) -GNUTLS_CONF_OPTS += $(if $(BR2_USE_MMU),,--disable-crywrap) - -ifeq ($(BR2_PACKAGE_CRYPTODEV_LINUX),y) -GNUTLS_CONF_OPTS += --enable-cryptodev -GNUTLS_DEPENDENCIES += cryptodev-linux -endif - -ifeq ($(BR2_PACKAGE_LIBIDN),y) -GNUTLS_CONF_OPTS += --with-idn -GNUTLS_DEPENDENCIES += libidn -else -GNUTLS_CONF_OPTS += --without-idn -endif - -ifeq ($(BR2_PACKAGE_P11_KIT),y) -GNUTLS_CONF_OPTS += --with-p11-kit -GNUTLS_DEPENDENCIES += p11-kit -else -GNUTLS_CONF_OPTS += --without-p11-kit -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GNUTLS_CONF_OPTS += --with-zlib -GNUTLS_DEPENDENCIES += zlib -else -GNUTLS_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/go-bootstrap/go-bootstrap.hash b/package.bak/go-bootstrap/go-bootstrap.hash deleted file mode 100644 index 8938266f2d..0000000000 --- a/package.bak/go-bootstrap/go-bootstrap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959 go1.4.3.src.tar.gz diff --git a/package.bak/go-bootstrap/go-bootstrap.mk b/package.bak/go-bootstrap/go-bootstrap.mk deleted file mode 100644 index f403f78475..0000000000 --- a/package.bak/go-bootstrap/go-bootstrap.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# go-bootstrap -# -################################################################################ - -GO_BOOTSTRAP_VERSION = 1.4.3 -GO_BOOTSTRAP_SITE = https://storage.googleapis.com/golang -GO_BOOTSTRAP_SOURCE = go$(GO_BOOTSTRAP_VERSION).src.tar.gz - -GO_BOOTSTRAP_LICENSE = BSD-3c -GO_BOOTSTRAP_LICENSE_FILES = LICENSE - -# To build programs that need cgo support the toolchain needs to be -# available, so the toolchain is not needed to build host-go-bootstrap -# itself, but needed by other packages that depend on -# host-go-bootstrap. -HOST_GO_BOOTSTRAP_DEPENDENCIES = toolchain - -HOST_GO_BOOTSTRAP_ROOT = $(HOST_DIR)/usr/lib/go-$(GO_BOOTSTRAP_VERSION) - -# The go build system is not compatable with ccache, so use HOSTCC_NOCCACHE -# here. See https://github.com/golang/go/issues/11685. -HOST_GO_BOOTSTRAP_MAKE_ENV = \ - GOOS=linux \ - GOROOT_FINAL="$(HOST_GO_BOOTSTRAP_ROOT)" \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - CC=$(HOSTCC_NOCCACHE) \ - CGO_ENABLED=0 - -define HOST_GO_BOOTSTRAP_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_BOOTSTRAP_MAKE_ENV) ./make.bash -endef - -define HOST_GO_BOOTSTRAP_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/go $(HOST_GO_BOOTSTRAP_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(@D)/bin/gofmt $(HOST_GO_BOOTSTRAP_ROOT)/bin/gofmt - - cp -a $(@D)/lib $(HOST_GO_BOOTSTRAP_ROOT)/ - cp -a $(@D)/pkg $(HOST_GO_BOOTSTRAP_ROOT)/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_BOOTSTRAP_ROOT)/ -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/go/Config.in.host b/package.bak/go/Config.in.host deleted file mode 100644 index a210033efd..0000000000 --- a/package.bak/go/Config.in.host +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - bool - default y - depends on (BR2_arm && BR2_TOOLCHAIN_SUPPORTS_PIE) || BR2_aarch64 \ - || BR2_i386 || BR2_x86_64 || BR2_powerpc64le \ - || BR2_mips64 || BR2_mips64el - depends on !BR2_ARM_CPU_ARMV4 - # MIPS R6 support in Go has not yet been developed. - depends on !BR2_MIPS_CPU_MIPS64R6 - -config BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - bool - default y - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - # Go doesn't support CGO linking on MIPS64x platforms - # See: https://github.com/karalabe/xgo/issues/46 - depends on !BR2_mips64 && !BR2_mips64el diff --git a/package.bak/go/go.hash b/package.bak/go/go.hash deleted file mode 100644 index e50f0041f1..0000000000 --- a/package.bak/go/go.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4c189111e9ba651a2bb3ee868aa881fab36b2f2da3409e80885ca758a6b614cc go1.7.4.src.tar.gz diff --git a/package.bak/go/go.mk b/package.bak/go/go.mk deleted file mode 100644 index bd308902b2..0000000000 --- a/package.bak/go/go.mk +++ /dev/null @@ -1,120 +0,0 @@ -################################################################################ -# -# go -# -################################################################################ - -GO_VERSION = 1.7.4 -GO_SITE = https://storage.googleapis.com/golang -GO_SOURCE = go$(GO_VERSION).src.tar.gz - -GO_LICENSE = BSD-3c -GO_LICENSE_FILES = LICENSE - -ifeq ($(BR2_arm),y) -GO_GOARCH = arm -ifeq ($(BR2_ARM_CPU_ARMV5),y) -GO_GOARM = 5 -else ifeq ($(BR2_ARM_CPU_ARMV6),y) -GO_GOARM = 6 -else ifeq ($(BR2_ARM_CPU_ARMV7A),y) -GO_GOARM = 7 -endif -else ifeq ($(BR2_aarch64),y) -GO_GOARCH = arm64 -else ifeq ($(BR2_i386),y) -GO_GOARCH = 386 -else ifeq ($(BR2_x86_64),y) -GO_GOARCH = amd64 -else ifeq ($(BR2_powerpc64),y) -GO_GOARCH = ppc64 -else ifeq ($(BR2_powerpc64le),y) -GO_GOARCH = ppc64le -else ifeq ($(BR2_mips64),y) -GO_GOARCH = mips64 -else ifeq ($(BR2_mips64el),y) -GO_GOARCH = mips64le -endif - -HOST_GO_DEPENDENCIES = host-go-bootstrap -HOST_GO_ROOT = $(HOST_DIR)/usr/lib/go - -# For the convienience of target packages. -HOST_GO_TOOLDIR = $(HOST_GO_ROOT)/pkg/tool/linux_$(GO_GOARCH) -HOST_GO_TARGET_ENV = \ - GOARCH=$(GO_GOARCH) \ - GOROOT="$(HOST_GO_ROOT)" \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ - GOTOOLDIR="$(HOST_GO_TOOLDIR)" - -# The go compiler's cgo support uses threads. If BR2_TOOLCHAIN_HAS_THREADS is -# set, build in cgo support for any go programs that may need it. Note that -# any target package needing cgo support must include -# 'depends on BR2_TOOLCHAIN_HAS_THREADS' in its config file. -ifeq (BR2_TOOLCHAIN_HAS_THREADS,y) -HOST_GO_CGO_ENABLED = 1 -else -HOST_GO_CGO_ENABLED = 0 -endif - -# The go build system doesn't have the notion of cross compiling, but just the -# notion of architecture. When the host and target architectures are different -# it expects to be given a target cross compiler in CC_FOR_TARGET. When the -# architectures are the same it will use CC_FOR_TARGET for both host and target -# compilation. To work around this limitation build and install a set of -# compiler and tool binaries built with CC_FOR_TARGET set to the host compiler. -# Also, the go build system is not compatible with ccache, so use -# HOSTCC_NOCCACHE. See https://github.com/golang/go/issues/11685. -HOST_GO_MAKE_ENV = \ - GOROOT_BOOTSTRAP=$(HOST_GO_BOOTSTRAP_ROOT) \ - GOROOT_FINAL=$(HOST_GO_ROOT) \ - GOROOT="$(@D)" \ - GOBIN="$(@D)/bin" \ - GOARCH=$(GO_GOARCH) \ - $(if $(GO_GOARM),GOARM=$(GO_GOARM)) \ - GOOS=linux \ - CGO_ENABLED=$(HOST_GO_CGO_ENABLED) \ - CC=$(HOSTCC_NOCCACHE) - -HOST_GO_TARGET_CC = \ - CC_FOR_TARGET="$(TARGET_CC)" \ - CXX_FOR_TARGET="$(TARGET_CXX)" - -HOST_GO_HOST_CC = \ - CC_FOR_TARGET=$(HOSTCC_NOCCACHE) \ - CXX_FOR_TARGET=$(HOSTCC_NOCCACHE) - -HOST_GO_TMP = $(@D)/host-go-tmp - -define HOST_GO_BUILD_CMDS - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_HOST_CC) ./make.bash - mkdir -p $(HOST_GO_TMP) - mv $(@D)/pkg/tool $(HOST_GO_TMP)/ - mv $(@D)/bin/ $(HOST_GO_TMP)/ - cd $(@D)/src && $(HOST_GO_MAKE_ENV) $(HOST_GO_TARGET_CC) ./make.bash -endef - -define HOST_GO_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/go $(HOST_GO_ROOT)/bin/go - $(INSTALL) -D -m 0755 $(HOST_GO_TMP)/bin/gofmt $(HOST_GO_ROOT)/bin/gofmt - - ln -sf ../lib/go/bin/go $(HOST_DIR)/usr/bin/ - ln -sf ../lib/go/bin/gofmt $(HOST_DIR)/usr/bin/ - - cp -a $(@D)/lib $(HOST_GO_ROOT)/ - - mkdir -p $(HOST_GO_ROOT)/pkg - cp -a $(@D)/pkg/include $(@D)/pkg/linux_* $(HOST_GO_ROOT)/pkg/ - cp -a $(HOST_GO_TMP)/tool $(HOST_GO_ROOT)/pkg/ - - # There is a known issue which requires the go sources to be installed - # https://golang.org/issue/2775 - cp -a $(@D)/src $(HOST_GO_ROOT)/ - - # Set all file timestamps to prevent the go compiler from rebuilding any - # built in packages when programs are built. - find $(HOST_GO_ROOT) -type f -exec touch -r $(HOST_GO_TMP)/bin/go {} \; -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/gob2/0001-dont-include-from-prefix.patch b/package.bak/gob2/0001-dont-include-from-prefix.patch deleted file mode 100644 index 1b603d754f..0000000000 --- a/package.bak/gob2/0001-dont-include-from-prefix.patch +++ /dev/null @@ -1,40 +0,0 @@ -[PATCH] Don't search $prefix/include for header files - -Don't add $prefix/include to the header file search path, as that breaks -cross compilation (build $prefix/include isn't the same as target -$prefix/include). - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.am | 3 +-- - src/Makefile.in | 3 +-- - 2 files changed, 2 insertions(+), 4 deletions(-) - -Index: gob2-2.0.15/src/Makefile.am -=================================================================== ---- gob2-2.0.15.orig/src/Makefile.am -+++ gob2-2.0.15/src/Makefile.am -@@ -17,8 +17,7 @@ INCLUDES = \ - -I$(top_builddir) \ - -I$(top_builddir)/src \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/src \ -- -I$(includedir) -+ -I$(top_srcdir)/src - - if NOINSTGOB - noinst_PROGRAMS = @NOINSTGOB@ -Index: gob2-2.0.15/src/Makefile.in -=================================================================== ---- gob2-2.0.15.orig/src/Makefile.in -+++ gob2-2.0.15/src/Makefile.in -@@ -193,8 +193,7 @@ INCLUDES = \ - -I$(top_builddir) \ - -I$(top_builddir)/src \ - -I$(top_srcdir) \ -- -I$(top_srcdir)/src \ -- -I$(includedir) -+ -I$(top_srcdir)/src - - @NOINSTGOB_TRUE@noinst_PROGRAMS = @NOINSTGOB@ - @NOINSTGOB_FALSE@bin_PROGRAMS = @INSTGOB@ diff --git a/package.bak/gob2/gob2.hash b/package.bak/gob2/gob2.hash deleted file mode 100644 index 3678bdd5c9..0000000000 --- a/package.bak/gob2/gob2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f7ee84c07ca88ae96e5a60461957cc4dd0aa69d61804433d1c85de3d50be8026 gob2-2.0.20.tar.xz diff --git a/package.bak/gob2/gob2.mk b/package.bak/gob2/gob2.mk deleted file mode 100644 index 04d02e115c..0000000000 --- a/package.bak/gob2/gob2.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# gob2 -# -################################################################################ - -GOB2_VERSION = 2.0.20 -GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.xz -GOB2_SITE = http://ftp.5z.com/pub/gob -HOST_GOB2_DEPENDENCIES = host-bison host-flex host-libglib2 - -$(eval $(host-autotools-package)) - -# gob2 for the host -GOB2_HOST_BINARY = $(HOST_DIR)/usr/bin/gob2 diff --git a/package.bak/google-breakpad/0001-add-missing-asm-ptrace-include.patch b/package.bak/google-breakpad/0001-add-missing-asm-ptrace-include.patch deleted file mode 100644 index 281c7a042a..0000000000 --- a/package.bak/google-breakpad/0001-add-missing-asm-ptrace-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -Include to get necessary definitions on AArch64 - -In glibc commit -https://sourceware.org/git/?p=glibc.git;a=commit;h=7d05a8168b45c0580e1f9a79c2dd26c8f0d31fca, -including from on AArch64 has been -removed. So the Google Breakpad code, which used to build fine on -glibc 2.18 (CodeSourcery toolchain for example), no longer builds with -glibc 2.19 (Linaro toolchain for example). - -To fix this, this patch adds the missing include (for -AArch64 only, to be conservative). - -This patch has not been submitted upstream, since more recent versions -of Google Breakpad have completely changed this part of the code. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/client/linux/minidump_writer/linux_dumper.h -=================================================================== ---- a/src/client/linux/minidump_writer/linux_dumper.h -+++ b/src/client/linux/minidump_writer/linux_dumper.h -@@ -43,6 +43,9 @@ - #include - #include - #include -+#if defined(__aarch64__) -+#include -+#endif - - #include "common/memory.h" - #include "google_breakpad/common/minidump_format.h" diff --git a/package.bak/google-breakpad/Config.in b/package.bak/google-breakpad/Config.in deleted file mode 100644 index e0e91068be..0000000000 --- a/package.bak/google-breakpad/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - bool - default y if BR2_i386 || BR2_x86_64 || BR2_arm || BR2_aarch64 || \ - BR2_mips || BR2_mipsel - -config BR2_PACKAGE_GOOGLE_BREAKPAD - bool "google-breakpad" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - select BR2_PACKAGE_LINUX_SYSCALL_SUPPORT - help - Google-Breakpad is a library and tool suite that allows you - to distribute an application to users with compiler-provided - debugging information removed, record crashes in compact - "minidump" files, send them back to your server, and produce - C and C++ stack traces from these minidumps. Breakpad can - also write minidumps on request for programs that have not - crashed. - - You may want to set BR2_ENABLE_DEBUG, in order to get useful - results. - - This target package installs a static library named - libbreakpad_client.a which should be linked into programs - willing to use Google Breakpad. A host variant of this - package is also available, and provides the different tools - needed to extract the debugging symbols from target - binaries. - - https://chromium.googlesource.com/breakpad/breakpad - -comment "google-breakpad requires a glibc or uClibc toolchain w/ wchar, thread, C++, gcc >= 4.8" - depends on BR2_PACKAGE_GOOGLE_BREAKPAD_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || \ - !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC) || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 diff --git a/package.bak/google-breakpad/gen-syms.sh b/package.bak/google-breakpad/gen-syms.sh deleted file mode 100755 index 2bc0afafb6..0000000000 --- a/package.bak/google-breakpad/gen-syms.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -NAME="${0##*/}" -STAGING_DIR="${1}" -TARGET_DIR="${2}" -shift 2 - -SYMBOLS_DIR="${STAGING_DIR}/usr/share/google-breakpad-symbols" -rm -rf "${SYMBOLS_DIR}" -mkdir -p "${SYMBOLS_DIR}" - -error() { - fmt="${1}"; shift - printf "%s: ${fmt}" "${NAME}" "${@}" >&2 - exit 1 -} - -for FILE in ${@}; do - f="${TARGET_DIR}${FILE}" - if [ ! -e "${f}" ]; then - error "%s: No such file or directory\n" "${FILE}" - fi - if [ -d "${f}" ]; then - error "%s: Is a directory\n" "${FILE}" - fi - if dump_syms "${f}" > "${SYMBOLS_DIR}/tmp.sym" 2>/dev/null; then - hash=$(head -n1 "${SYMBOLS_DIR}/tmp.sym" | cut -d ' ' -f 4); - filename=$(basename "${FILE}"); - mkdir -p "${SYMBOLS_DIR}/${filename}/${hash}" - mv "${SYMBOLS_DIR}/tmp.sym" "${SYMBOLS_DIR}/${filename}/${hash}/${filename}.sym"; - else - error "Error dumping symbols for: '%s'\n" "${FILE}" - fi -done -rm -rf "${SYMBOLS_DIR}/tmp" diff --git a/package.bak/google-breakpad/google-breakpad.hash b/package.bak/google-breakpad/google-breakpad.hash deleted file mode 100644 index 79e8d08b28..0000000000 --- a/package.bak/google-breakpad/google-breakpad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6f444233e88957c30cc2d5497ee9d72d104122ce2c25a7ef7f6be3af1b3f7353 google-breakpad-7515ab13768c7edc09f0f2ec2354dc6c928239a6.tar.gz diff --git a/package.bak/google-breakpad/google-breakpad.mk b/package.bak/google-breakpad/google-breakpad.mk deleted file mode 100644 index 7a11c72cf5..0000000000 --- a/package.bak/google-breakpad/google-breakpad.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# google-breakpad -# -################################################################################ - -GOOGLE_BREAKPAD_VERSION = 7515ab13768c7edc09f0f2ec2354dc6c928239a6 -GOOGLE_BREAKPAD_SITE = https://chromium.googlesource.com/breakpad/breakpad -GOOGLE_BREAKPAD_SITE_METHOD = git -GOOGLE_BREAKPAD_CONF_OPTS = --disable-processor --disable-tools -# Only a static library is installed -GOOGLE_BREAKPAD_INSTALL_TARGET = NO -GOOGLE_BREAKPAD_INSTALL_STAGING = YES -GOOGLE_BREAKPAD_LICENSE = BSD-3c -GOOGLE_BREAKPAD_LICENSE_FILES = LICENSE -GOOGLE_BREAKPAD_DEPENDENCIES = host-google-breakpad linux-syscall-support - -HOST_GOOGLE_BREAKPAD_DEPENDENCIES = host-linux-syscall-support - -# Avoid using depot-tools to download this file. -define HOST_GOOGLE_BREAKPAD_LSS - $(INSTALL) -D -m 0644 \ - $(HOST_DIR)/usr/include/linux_syscall_support.h \ - $(@D)/src/third_party/lss/linux_syscall_support.h -endef -HOST_GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += HOST_GOOGLE_BREAKPAD_LSS - -define GOOGLE_BREAKPAD_LSS - $(INSTALL) -D -m 0644 \ - $(STAGING_DIR)/usr/include/linux_syscall_support.h \ - $(@D)/src/third_party/lss/linux_syscall_support.h -endef -GOOGLE_BREAKPAD_POST_EXTRACT_HOOKS += GOOGLE_BREAKPAD_LSS - -define GOOGLE_BREAKPAD_EXTRACT_SYMBOLS - $(EXTRA_ENV) package/google-breakpad/gen-syms.sh $(STAGING_DIR) \ - $(TARGET_DIR) $(call qstrip,$(BR2_GOOGLE_BREAKPAD_INCLUDE_FILES)) -endef -GOOGLE_BREAKPAD_TARGET_FINALIZE_HOOKS += GOOGLE_BREAKPAD_EXTRACT_SYMBOLS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/google-material-design-icons/Config.in b/package.bak/google-material-design-icons/Config.in deleted file mode 100644 index a20042988e..0000000000 --- a/package.bak/google-material-design-icons/Config.in +++ /dev/null @@ -1,40 +0,0 @@ -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS - bool "google-material-design-icons" - help - Material design icons are the official icon set from Google that - are designed under the material design guidelines. - - https://github.com/google/material-design-icons - -if BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS - -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_PNG - bool "Install PNG icons" - help - Use PNG icon types. - - The default. Traditional format; simplicity and compatibility. - -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_SVG - bool "Install SVG icons" - help - Use SVG icon types. - - Vector format that is limitlessly scalable. - -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_FONT - bool "Install TrueType font" - help - Install the Material TrueType font (ttf) on the target system. - -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_SPRITES_CSS - bool "Install CSS sprites" - help - Install CSS (PNG) spritesheets. - -config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_SPRITES_SVG - bool "Install SVG sprites" - help - Install SVG spritesheets. - -endif diff --git a/package.bak/google-material-design-icons/google-material-design-icons.hash b/package.bak/google-material-design-icons/google-material-design-icons.hash deleted file mode 100644 index 9a66336494..0000000000 --- a/package.bak/google-material-design-icons/google-material-design-icons.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 769547061a51f81623bf5174767c08fc587fd6946339592fbd6cd0dd45f56b4c 2.2.3.tar.gz diff --git a/package.bak/google-material-design-icons/google-material-design-icons.mk b/package.bak/google-material-design-icons/google-material-design-icons.mk deleted file mode 100644 index d410a45e30..0000000000 --- a/package.bak/google-material-design-icons/google-material-design-icons.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# google-material-design-icons -# -################################################################################ - -GOOGLE_MATERIAL_DESIGN_ICONS_VERSION = 2.2.3 -GOOGLE_MATERIAL_DESIGN_ICONS_SOURCE = \ - $(GOOGLE_MATERIAL_DESIGN_ICONS_VERSION).tar.gz -GOOGLE_MATERIAL_DESIGN_ICONS_SITE = \ - https://github.com/google/material-design-icons/archive -GOOGLE_MATERIAL_DESIGN_ICONS_LICENSE = CC-BY-4.0 -GOOGLE_MATERIAL_DESIGN_ICONS_LICENSE_FILES = LICENSE - -GOOGLE_MATERIAL_DESIGN_ICONS_LIST = \ - action alert av communication content device editor file \ - hardware image maps navigation notification places social toggle - -ifneq ($(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_PNG)$(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_SVG),) -define GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_IMAGES - $(foreach family,$(GOOGLE_MATERIAL_DESIGN_ICONS_LIST),\ - $(INSTALL) -d $(TARGET_DIR)/usr/share/google-material/$(family) \ - || exit 1; \ - $(if $(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_PNG), \ - $(INSTALL) -D -m 0644 $(@D)/$(family)/1x_web/*.png \ - $(TARGET_DIR)/usr/share/google-material/$(family) || exit 1;) \ - $(if $(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_TYPE_SVG), \ - $(INSTALL) -D -m 0644 $(@D)/$(family)/svg/production/*.svg \ - $(TARGET_DIR)/usr/share/google-material/$(family) || exit 1;) \ - ) -endef -endif - -ifeq ($(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_FONT),y) -define GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_FONT - $(INSTALL) -D -m 0644 $(@D)/iconfont/MaterialIcons-Regular.ttf \ - $(TARGET_DIR)/usr/share/fonts/google-material/MaterialIcons-Regular.ttf \ - || exit 1 -endef -endif - -define GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_SPRITES - $(if $(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_SPRITES_CSS), \ - $(INSTALL) -d $(TARGET_DIR)/usr/share/google-material/css-sprite \ - || exit 1; \ - $(INSTALL) -D -m 0644 $(@D)/sprites/css-sprite/* \ - $(TARGET_DIR)/usr/share/google-material/css-sprite || exit 1) - $(if $(BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS_SPRITES_SVG), \ - $(INSTALL) -d $(TARGET_DIR)/usr/share/google-material/svg-sprite \ - || exit 1; \ - $(INSTALL) -D -m 0644 $(@D)/sprites/svg-sprite/* \ - $(TARGET_DIR)/usr/share/google-material/svg-sprite || exit 1) -endef - -define GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_TARGET_CMDS - $(GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_FONT) - $(GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_IMAGES) - $(GOOGLE_MATERIAL_DESIGN_ICONS_INSTALL_ICONS_SPRITES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/googlefontdirectory/Config.in b/package.bak/googlefontdirectory/Config.in deleted file mode 100644 index 762c1b1775..0000000000 --- a/package.bak/googlefontdirectory/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GOOGLEFONTDIRECTORY - bool "Google font directory" - help - Google font directory - - http://code.google.com/p/googlefontdirectory/ - -if BR2_PACKAGE_GOOGLEFONTDIRECTORY - -config BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS - string "List of fonts to install" - default "droid" - help - Specify a space-separated list of fonts to install - -endif diff --git a/package.bak/googlefontdirectory/googlefontdirectory.hash b/package.bak/googlefontdirectory/googlefontdirectory.hash deleted file mode 100644 index 6b15b2b8b7..0000000000 --- a/package.bak/googlefontdirectory/googlefontdirectory.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8a7d04feef21fdfc09d90cd3e2c0c05dcb2fdd4e15f971e8ceaf4d90c1c123cd googlewebfonts.tgz diff --git a/package.bak/googlefontdirectory/googlefontdirectory.mk b/package.bak/googlefontdirectory/googlefontdirectory.mk deleted file mode 100644 index 0e60892bb2..0000000000 --- a/package.bak/googlefontdirectory/googlefontdirectory.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# googlefontdirectory -# -################################################################################ - -GOOGLEFONTDIRECTORY_SITE = \ - https://s3.amazonaws.com/joemaller_google_webfonts -GOOGLEFONTDIRECTORY_SOURCE = googlewebfonts.tgz -GOOGLEFONTDIRECTORY_LICENSE = OFLv1.1 - -GOOGLEFONTDIRECTORY_FONTS = \ - $(call qstrip,$(BR2_PACKAGE_GOOGLEFONTDIRECTORY_FONTS)) - -define GOOGLEFONTDIRECTORY_INSTALL_TARGET_CMDS - for i in $(GOOGLEFONTDIRECTORY_FONTS); \ - do \ - $(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/$$i && \ - $(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/share/fonts/$$i $(@D)/$$i/*.ttf || exit 1; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/gperf/Config.in b/package.bak/gperf/Config.in deleted file mode 100644 index e6d51fca72..0000000000 --- a/package.bak/gperf/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GPERF - bool "gperf" - depends on BR2_INSTALL_LIBSTDCPP - help - A 'perfect hash function' generator - - http://www.gnu.org/software/gperf/ - -comment "gperf needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/gperf/gperf.hash b/package.bak/gperf/gperf.hash deleted file mode 100644 index 370235c627..0000000000 --- a/package.bak/gperf/gperf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e gperf-3.0.4.tar.gz diff --git a/package.bak/gperf/gperf.mk b/package.bak/gperf/gperf.mk deleted file mode 100644 index 8ce3c95ffb..0000000000 --- a/package.bak/gperf/gperf.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# gperf -# -################################################################################ - -GPERF_VERSION = 3.0.4 -GPERF_SITE = $(BR2_GNU_MIRROR)/gperf -GPERF_LICENSE = GPLv3+ -GPERF_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch b/package.bak/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch deleted file mode 100644 index 1e1e919416..0000000000 --- a/package.bak/gpm/0001-Added-musl-support-to-libgpm-and-the-daemon.patch +++ /dev/null @@ -1,71 +0,0 @@ -From eb0e14f8a5c414603b2e882df54b9fec138104ec Mon Sep 17 00:00:00 2001 -From: Dima Krasner -Date: Wed, 12 Nov 2014 23:06:46 +0200 -Subject: [PATCH] Added musl support to libgpm and the daemon. - -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/d88fb1de5803c366ab62f7de9ee5d83207fb2afe.] - -Signed-off-by: Thomas Petazzoni ---- - src/daemon/open_console.c | 1 + - src/prog/display-buttons.c | 1 + - src/prog/display-coords.c | 1 + - src/prog/gpm-root.y | 4 ++-- - 4 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/src/daemon/open_console.c b/src/daemon/open_console.c -index 98297c9..4d6c0af 100644 ---- a/src/daemon/open_console.c -+++ b/src/daemon/open_console.c -@@ -21,6 +21,7 @@ - - #include /* open and co. */ - #include /* stat() */ -+#include /* major() */ - #include /* ioctl */ - - /* Linux specific (to be outsourced in gpm2 */ -diff --git a/src/prog/display-buttons.c b/src/prog/display-buttons.c -index de8e5b2..38d2f11 100644 ---- a/src/prog/display-buttons.c -+++ b/src/prog/display-buttons.c -@@ -36,6 +36,7 @@ - #include /* printf() */ - #include /* time() */ - #include /* errno */ -+#include /* fd_set and FD_* */ - #include /* gpm information */ - - /* display resulting data */ -diff --git a/src/prog/display-coords.c b/src/prog/display-coords.c -index ed15c8a..411283a 100644 ---- a/src/prog/display-coords.c -+++ b/src/prog/display-coords.c -@@ -37,6 +37,7 @@ - #include /* printf() */ - #include /* time() */ - #include /* errno */ -+#include /* fd_set and FD_* */ - #include /* gpm information */ - - /* display resulting data */ -diff --git a/src/prog/gpm-root.y b/src/prog/gpm-root.y -index 069d801..188ae35 100644 ---- a/src/prog/gpm-root.y -+++ b/src/prog/gpm-root.y -@@ -1199,9 +1199,9 @@ int main(int argc, char **argv) - #if defined(__GLIBC__) - __sigemptyset(&childaction.sa_mask); - #else /* __GLIBC__ */ -- childaction.sa_mask=0; -+ sigemptyset(&childaction.sa_mask); - #endif /* __GLIBC__ */ -- childaction.sa_flags=SA_INTERRUPT; /* need to break the select() call */ -+ childaction.sa_flags=0; - sigaction(SIGCHLD,&childaction,NULL); - - /*....................................... Connect and get your buffer */ --- -2.1.0 - diff --git a/package.bak/gpm/0002-Install-unversioned-solibrary.patch b/package.bak/gpm/0002-Install-unversioned-solibrary.patch deleted file mode 100644 index 27e97acb32..0000000000 --- a/package.bak/gpm/0002-Install-unversioned-solibrary.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa Mon Sep 17 00:00:00 2001 -From: Kamil Rytarowski -Date: Sat, 4 May 2013 01:30:17 +0200 -Subject: [PATCH] Install unversioned solibrary - -Unversioned solibraries are shipped with -devel packages in Linux -distros. Generate and install it for the consistency. - -[Upstream patch backported from the github repository, -https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa] - -Signed-off-by: Bernd Kuhls ---- - src/Makefile.in | 7 +++---- - 1 file changed, 3 insertions(+), 4 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 6b60ad3..7e9e2ef 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -79,7 +79,7 @@ prog/%: prog/%.o - # | $(SED) '\''s/\($*\)\.o\([ :]*\)/\1.o \1.lo\2/g'\'' > $(DEPDIR)/$@' - - # Do it all! --all: gpm lib/libgpm.so.@abi_lev@ @LIBGPM_A@ $(PROG) -+all: gpm lib/libgpm.so.@abi_lev@ lib/libgpm.so @LIBGPM_A@ $(PROG) - - gpm: $(GOBJ) - $(CC) @LDFLAGS@ $(LDFLAGS) -o $@ $(GOBJ) @LIBS@ $(LIBS) -lm -@@ -168,9 +168,8 @@ lib/libgpm.so.@abi_full@: $(PICS) - @LDFLAGS@ $(LDFLAGS) -o lib/libgpm.so.@abi_full@ $^ @LIBS@ @SHARED_LIBS@ $(LIBS) - lib/libgpm.so.@abi_lev@: lib/libgpm.so.@abi_full@ - $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so.@abi_lev@ --# unneeded, isn't it? --#lib/libgpm.so: lib/libgpm.so.@abi_full@ --# $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so -+lib/libgpm.so: lib/libgpm.so.@abi_full@ -+ $(LN_S) -f libgpm.so.@abi_full@ lib/libgpm.so - - include $(DEPFILE) - diff --git a/package.bak/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch b/package.bak/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch deleted file mode 100644 index 58b260ce24..0000000000 --- a/package.bak/gpm/0003-src-Makefile.in-Really-install-unversioned-solibrary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 445be05fba32c512fd87a0c98b4e9936629ef95e Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 20 Feb 2016 17:59:52 +0100 -Subject: [PATCH 1/1] src/Makefile.in: Really install unversioned solibrary - -This commit is a follow-up to -https://github.com/telmich/gpm/commit/06b00d53d8bd513ad5d262dc94a016c6fbf2d3aa -which created libgpm.so but failed to include it in the install target. - -Patch sent upstream: https://github.com/telmich/gpm/pull/11 - -Signed-off-by: Bernd Kuhls ---- - src/Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 7e9e2ef..bca226f 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -115,6 +115,7 @@ install: check - if test "x@SHLIB@" != "x" ; then \ - $(INSTALL_DATA) -m 755 lib/libgpm.so.@abi_full@ $(libdir)/libgpm.so.@abi_full@ ; \ - cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so.@abi_lev@ ; \ -+ cd $(libdir) && $(LN_S) -f libgpm.so.@abi_full@ libgpm.so ; \ - echo "WARNING: We installed a lib, you should now call ldconfig" ; \ - echo "f.i.: ldconfig -n -l $(libdir)/libgpm.so.@abi_full@" ; \ - echo "Or to update everything just type ldconfig" ; \ --- -2.7.0 - diff --git a/package.bak/gpm/Config.in b/package.bak/gpm/Config.in deleted file mode 100644 index 2d0d366d7e..0000000000 --- a/package.bak/gpm/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_GPM - bool "gpm" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # fork() - help - "gpm" means general purpose mouse (server) and provides mouse support - for Linux virtual consoles. - gpm-root (to draw menus in current virtual console; config file in - /etc/gpm-root.conf) and disable-paste (to disable paste buffer for - security reasons), will also be installed. - - http://www.nico.schottelius.org/software/gpm/ - -if BR2_PACKAGE_GPM - -config BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS - bool "install test tools" - help - Install gpm test tools (get-versions, mev, hltest, mouse-test, - display-buttons & display-coords). - -endif - -comment "gpm mouse server needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/gpm/gpm.hash b/package.bak/gpm/gpm.hash deleted file mode 100644 index 7bbc43dd40..0000000000 --- a/package.bak/gpm/gpm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a955053b36556ffa7c628ce18fd6de7d625966573fa412fb08869533d8f7385c gpm-1.20.7.tar.lzma diff --git a/package.bak/gpm/gpm.mk b/package.bak/gpm/gpm.mk deleted file mode 100644 index ed4c1fd305..0000000000 --- a/package.bak/gpm/gpm.mk +++ /dev/null @@ -1,71 +0,0 @@ -################################################################################ -# -# gpm -# -################################################################################ - -GPM_VERSION = 1.20.7 -GPM_SOURCE = gpm-$(GPM_VERSION).tar.lzma -GPM_SITE = http://www.nico.schottelius.org/software/gpm/archives -GPM_LICENSE = GPLv2+ -GPM_LICENSE_FILES = COPYING -GPM_INSTALL_STAGING = YES -GPM_DEPENDENCIES = host-bison - -# if not already installed in staging dir, gpm Makefile may fail to find some -# of the headers needed to generate build dependencies, the first time it is -# built. CPPFLAGS is used to pass the right include path to dependency rules. -GPM_CONF_ENV = \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I$(@D)/src/headers/" \ - ac_cv_path_emacs=no - -# For some reason, Microblaze gcc does not define __ELF__, which gpm -# configure script uses to determine whether the architecture uses ELF -# binaries and therefore can build shared libraries. We fix this by -# telling GPM that ELF is used on Microblaze. -ifeq ($(BR2_microblaze),y) -GPM_CONF_ENV += itz_cv_sys_elf=yes -endif - -# gpm and ncurses have a circular dependency. As gpm function GPM_Wgetch() -# (requiring ncurses) is not recommended for use by ncurses people themselves -# and as it's better to have gpm support in ncurses that the contrary, we force -# gpm to not look after ncurses explicitly. -# http://invisible-island.net/ncurses/ncurses.faq.html#using_gpm_lib -GPM_CONF_OPTS = --without-curses - -# configure is missing but gpm seems not compatible with our autoreconf -# mechanism so we have to do it manually instead of using GPM_AUTORECONF = YES -define GPM_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef -GPM_PRE_CONFIGURE_HOOKS += GPM_RUN_AUTOGEN - -GPM_DEPENDENCIES += host-automake host-autoconf host-libtool - -# gpm tries to build/install .info doc even if makeinfo isn't installed on the -# host, so we have to disable global doc installation to prevent autobuild -# errors. -define GPM_DISABLE_DOC_INSTALL - $(SED) 's/SUBDIRS = src doc contrib/SUBDIRS = src contrib/' \ - $(@D)/Makefile.in -endef -GPM_POST_PATCH_HOOKS += GPM_DISABLE_DOC_INSTALL - -ifeq ($(BR2_PACKAGE_GPM_INSTALL_TEST_TOOLS),) -define GPM_REMOVE_TEST_TOOLS_FROM_TARGET - for tools in mev hltest mouse-test display-buttons \ - get-versions display-coords; do \ - rm -f $(TARGET_DIR)/usr/bin/$$tools ; \ - done -endef -GPM_POST_INSTALL_TARGET_HOOKS += GPM_REMOVE_TEST_TOOLS_FROM_TARGET -endif - -define GPM_INSTALL_GPM_ROOT_CONF_ON_TARGET - $(INSTALL) -m 0644 -D $(@D)/conf/gpm-root.conf $(TARGET_DIR)/etc/ -endef - -GPM_POST_INSTALL_TARGET_HOOKS += GPM_INSTALL_GPM_ROOT_CONF_ON_TARGET - -$(eval $(autotools-package)) diff --git a/package.bak/gpsd/Config.in b/package.bak/gpsd/Config.in deleted file mode 100644 index 876ab9b03a..0000000000 --- a/package.bak/gpsd/Config.in +++ /dev/null @@ -1,237 +0,0 @@ -comment "gpsd needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -menuconfig BR2_PACKAGE_GPSD - bool "gpsd" - # Uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - # Always tries to build a shared library - depends on !BR2_STATIC_LIBS - help - gpsd is a service daemon that monitors one or more GPSes or AIS - receivers attached to a host computer through serial or USB ports, - making all data on the location/course/velocity of the sensors - available to be queried on TCP port 2947 of the host computer. - - The D-Bus interface is included if dbus-glib is enabled. - - http://www.catb.org/gpsd/ - -if BR2_PACKAGE_GPSD - -config BR2_PACKAGE_GPSD_DEVICES - string "Where to look for GPSes" - default "/dev/ttyS1" - -comment "Features" - -config BR2_PACKAGE_GPSD_CLIENT_DEBUG - bool "client debugging support" - -config BR2_PACKAGE_GPSD_OLDSTYLE - bool "oldstyle (pre-JSON) protocol support" - -config BR2_PACKAGE_GPSD_PROFILING - bool "profiling support" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_aarch64 - -comment "profiling support not available with uClibc-based toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_GPSD_NTP_SHM - bool "NTP time hinting support" - -config BR2_PACKAGE_GPSD_PPS - bool "PPS time syncing support" - select BR2_PACKAGE_GPSD_NTP_SHM - -config BR2_PACKAGE_GPSD_USER - bool "GPSD privilege revocation user" - -config BR2_PACKAGE_GPSD_USER_VALUE - string "user to run as" - default "nobody" - depends on BR2_PACKAGE_GPSD_USER - -config BR2_PACKAGE_GPSD_GROUP - bool "GPSD privilege revocation group" - -config BR2_PACKAGE_GPSD_GROUP_VALUE - string "group to run as" - default "nobody" - depends on BR2_PACKAGE_GPSD_GROUP - -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - bool "compile with fixed serial port speed" - -config BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE - int "serial port speed" - default "9600" - depends on BR2_PACKAGE_GPSD_FIXED_PORT_SPEED - -config BR2_PACKAGE_GPSD_MAX_CLIENT - bool "compile with limited maximum clients" - -config BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE - int "maximum number of clients" - default "10" - depends on BR2_PACKAGE_GPSD_MAX_CLIENT - -config BR2_PACKAGE_GPSD_MAX_DEV - bool "compile with maximum allowed devices" - -config BR2_PACKAGE_GPSD_MAX_DEV_VALUE - int "maximum allowed devices" - default "2" - depends on BR2_PACKAGE_GPSD_MAX_DEV - -config BR2_PACKAGE_GPSD_RECONFIGURE - bool "allow gpsd to change device settings" - default y - -config BR2_PACKAGE_GPSD_CONTROLSEND - bool "allow gpsctl/gpsmon to change device settings" - default y - -config BR2_PACKAGE_GPSD_SQUELCH - bool "squelch gpsd_report and gpsd_hexdump to save cpu" - -comment "Protocols" - -config BR2_PACKAGE_GPSD_AIVDM - bool "Aivdm" - help - Aivdm support - -config BR2_PACKAGE_GPSD_ASHTECH - bool "Ashtech" - help - Ashtech support - -config BR2_PACKAGE_GPSD_EARTHMATE - bool "Earthmate" - help - DeLorme EarthMate Zodiac support - -config BR2_PACKAGE_GPSD_EVERMORE - bool "EverMore" - help - EverMore binary support - -config BR2_PACKAGE_GPSD_FURY - bool "Fury" - help - Jackson Labs Fury and Firefly support - -config BR2_PACKAGE_GPSD_FV18 - bool "FV-18" - help - San Jose Navigation FV-18 support - -config BR2_PACKAGE_GPSD_GARMIN - bool "Garmin (kernel)" - help - Garmin kernel driver support - -config BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT - bool "Garmin (simple text)" - help - Garmin Simple Text support - -config BR2_PACKAGE_GPSD_GEOSTAR - bool "Geostar" - help - Geostar Protocol support - -config BR2_PACKAGE_GPSD_GPSCLOCK - bool "GPSClock" - help - GPSClock support - -config BR2_PACKAGE_GPSD_ITRAX - bool "iTrax" - help - iTrax support - -config BR2_PACKAGE_GPSD_MTK3301 - bool "MTK-3301" - help - Mediatek MTK-3301 support - -config BR2_PACKAGE_GPSD_NAVCOM - bool "Navcom" - help - Navcom binary support - -config BR2_PACKAGE_GPSD_NMEA - bool "NMEA" - default y - help - Generic NMEA support - -config BR2_PACKAGE_GPSD_NMEA2000 - bool "NMEA2000" - select BR2_PACKAGE_GPSD_NAVCOM - select BR2_PACKAGE_GPSD_AIVDM - help - NMEA2000/CAN support - -config BR2_PACKAGE_GPSD_NTRIP - bool "NTRIP" - help - NTRIP support - -config BR2_PACKAGE_GPSD_OCEANSERVER - bool "OceanServer" - help - OceanServer Digital Compass support - -config BR2_PACKAGE_GPSD_ONCORE - bool "OnCore" - help - OnCore support - -config BR2_PACKAGE_GPSD_RTCM104V2 - bool "RTCM104 v2" - help - RTCM104 v2 support - -config BR2_PACKAGE_GPSD_RTCM104V3 - bool "RTCM104 v3" - help - RTCM104 v3 support - -config BR2_PACKAGE_GPSD_SIRF - bool "SiRF" - help - SiRF binary support - -config BR2_PACKAGE_GPSD_SUPERSTAR2 - bool "SuperStarII" - help - Novatel SuperStarII binary support - -config BR2_PACKAGE_GPSD_TRIMBLE_TSIP - bool "Trimble TSIP" - help - Trimble TSIP support - -config BR2_PACKAGE_GPSD_TRIPMATE - bool "TripMate" - help - Delorme TripMate support - -config BR2_PACKAGE_GPSD_TRUE_NORTH - bool "True North Technologies" - help - True North Technologies support - -config BR2_PACKAGE_GPSD_UBX - bool "UBX" - help - uBlox UBX binary support - -endif diff --git a/package.bak/gpsd/S50gpsd b/package.bak/gpsd/S50gpsd deleted file mode 100644 index 39bf232061..0000000000 --- a/package.bak/gpsd/S50gpsd +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh -# -# Starts the gps daemon. -# - -NAME=gpsd -DAEMON=/usr/sbin/$NAME -DEVICES=/dev/ttyS1 -PIDFILE=/var/run/$NAME.pid - -start() { - printf "Starting $NAME: " - start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -P $PIDFILE $DEVICES && echo "OK" || echo "Failed" -} -stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE && echo "OK" || echo "Failed" - rm -f $PIDFILE -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/gpsd/gpsd.hash b/package.bak/gpsd/gpsd.hash deleted file mode 100644 index 3083af24f1..0000000000 --- a/package.bak/gpsd/gpsd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 03579af13a4d3fe0c5b79fa44b5f75c9f3cac6749357f1d99ce5d38c09bc2029 gpsd-3.16.tar.gz diff --git a/package.bak/gpsd/gpsd.mk b/package.bak/gpsd/gpsd.mk deleted file mode 100644 index 73067d3b15..0000000000 --- a/package.bak/gpsd/gpsd.mk +++ /dev/null @@ -1,252 +0,0 @@ -################################################################################ -# -# gpsd -# -################################################################################ - -GPSD_VERSION = 3.16 -GPSD_SITE = http://download-mirror.savannah.gnu.org/releases/gpsd -GPSD_LICENSE = BSD-3c -GPSD_LICENSE_FILES = COPYING -GPSD_INSTALL_STAGING = YES - -GPSD_DEPENDENCIES = host-scons host-pkgconf - -GPSD_LDFLAGS = $(TARGET_LDFLAGS) -GPSD_CFLAGS = $(TARGET_CFLAGS) - -GPSD_SCONS_ENV = $(TARGET_CONFIGURE_OPTS) - -GPSD_SCONS_OPTS = \ - arch=$(ARCH)\ - prefix=/usr\ - sysroot=$(STAGING_DIR)\ - strip=no\ - python=no - -ifeq ($(BR2_PACKAGE_NCURSES),y) -GPSD_DEPENDENCIES += ncurses -else -GPSD_SCONS_OPTS += ncurses=no -endif - -# Build libgpsmm if we've got C++ -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) -GPSD_LDFLAGS += -lstdc++ -GPSD_CFLAGS += -std=gnu++98 -GPSD_CXXFLAGS += -std=gnu++98 -GPSD_SCONS_OPTS += libgpsmm=yes -else -GPSD_SCONS_OPTS += libgpsmm=no -endif - -# prevents from triggering GCC ICE -# A bug was reported to the gcc bug tracker: -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=68485 -ifeq ($(BR2_microblaze),y) -GPSD_CFLAGS += -fno-expensive-optimizations -fno-schedule-insns -endif - -# Enable or disable Qt binding -ifeq ($(BR2_PACKAGE_QT_NETWORK),y) -GPSD_SCONS_ENV += QMAKE="$(QT_QMAKE)" -GPSD_DEPENDENCIES += qt -else -GPSD_SCONS_OPTS += qt=no -endif - -# If libusb is available build it before so the package can use it -ifeq ($(BR2_PACKAGE_LIBUSB),y) -GPSD_DEPENDENCIES += libusb -else -GPSD_SCONS_OPTS += usb=no -endif - -# If bluetooth is available build it before so the package can use it -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -GPSD_DEPENDENCIES += bluez_utils -else -GPSD_SCONS_OPTS += bluez=no -endif - -# If pps-tools is available, build it before so the package can use it -# (HAVE_SYS_TIMEPPS_H). -ifeq ($(BR2_PACKAGE_PPS_TOOLS),y) -GPSD_DEPENDENCIES += pps-tools -endif - -ifeq ($(BR2_PACKAGE_DBUS_GLIB),y) -GPSD_SCONS_OPTS += dbus_export=yes -GPSD_DEPENDENCIES += dbus-glib -endif - -# Protocol support -ifneq ($(BR2_PACKAGE_GPSD_ASHTECH),y) -GPSD_SCONS_OPTS += ashtech=no -endif -ifneq ($(BR2_PACKAGE_GPSD_AIVDM),y) -GPSD_SCONS_OPTS += aivdm=no -endif -ifneq ($(BR2_PACKAGE_GPSD_EARTHMATE),y) -GPSD_SCONS_OPTS += earthmate=no -endif -ifneq ($(BR2_PACKAGE_GPSD_EVERMORE),y) -GPSD_SCONS_OPTS += evermore=no -endif -ifneq ($(BR2_PACKAGE_GPSD_FURY),y) -GPSD_SCONS_OPTS += fury=no -endif -ifneq ($(BR2_PACKAGE_GPSD_FV18),y) -GPSD_SCONS_OPTS += fv18=no -endif -ifneq ($(BR2_PACKAGE_GPSD_GARMIN),y) -GPSD_SCONS_OPTS += garmin=no -endif -ifneq ($(BR2_PACKAGE_GPSD_GARMIN_SIMPLE_TXT),y) -GPSD_SCONS_OPTS += garmintxt=no -endif -ifneq ($(BR2_PACKAGE_GPSD_GEOSTAR),y) -GPSD_SCONS_OPTS += geostar=no -endif -ifneq ($(BR2_PACKAGE_GPSD_GPSCLOCK),y) -GPSD_SCONS_OPTS += gpsclock=no -endif -ifneq ($(BR2_PACKAGE_GPSD_ITRAX),y) -GPSD_SCONS_OPTS += itrax=no -endif -ifneq ($(BR2_PACKAGE_GPSD_MTK3301),y) -GPSD_SCONS_OPTS += mtk3301=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NMEA),y) -GPSD_SCONS_OPTS += nmea0183=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NTRIP),y) -GPSD_SCONS_OPTS += ntrip=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NAVCOM),y) -GPSD_SCONS_OPTS += navcom=no -endif -ifneq ($(BR2_PACKAGE_GPSD_NMEA2000),y) -GPSD_SCONS_OPTS += nmea2000=no -endif -ifneq ($(BR2_PACKAGE_GPSD_OCEANSERVER),y) -GPSD_SCONS_OPTS += oceanserver=no -endif -ifneq ($(BR2_PACKAGE_GPSD_ONCORE),y) -GPSD_SCONS_OPTS += oncore=no -endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V2),y) -GPSD_SCONS_OPTS += rtcm104v2=no -endif -ifneq ($(BR2_PACKAGE_GPSD_RTCM104V3),y) -GPSD_SCONS_OPTS += rtcm104v3=no -endif -ifneq ($(BR2_PACKAGE_GPSD_SIRF),y) -GPSD_SCONS_OPTS += sirf=no -endif -ifneq ($(BR2_PACKAGE_GPSD_SUPERSTAR2),y) -GPSD_SCONS_OPTS += superstar2=no -endif -ifneq ($(BR2_PACKAGE_GPSD_TRIMBLE_TSIP),y) -GPSD_SCONS_OPTS += tsip=no -endif -ifneq ($(BR2_PACKAGE_GPSD_TRIPMATE),y) -GPSD_SCONS_OPTS += tripmate=no -endif -ifneq ($(BR2_PACKAGE_GPSD_TRUE_NORTH),y) -GPSD_SCONS_OPTS += tnt=no -endif -ifneq ($(BR2_PACKAGE_GPSD_UBX),y) -GPSD_SCONS_OPTS += ublox=no -endif - -# Features -ifneq ($(BR2_PACKAGE_GPSD_NTP_SHM),y) -GPSD_SCONS_OPTS += ntpshm=no -endif -ifneq ($(BR2_PACKAGE_GPSD_PPS),y) -GPSD_SCONS_OPTS += pps=no -endif -ifeq ($(BR2_PACKAGE_GPSD_SQUELCH),y) -GPSD_SCONS_OPTS += squelch=yes -endif -ifneq ($(BR2_PACKAGE_GPSD_RECONFIGURE),y) -GPSD_SCONS_OPTS += reconfigure=no -endif -ifneq ($(BR2_PACKAGE_GPSD_CONTROLSEND),y) -GPSD_SCONS_OPTS += controlsend=no -endif -ifneq ($(BR2_PACKAGE_GPSD_OLDSTYLE),y) -GPSD_SCONS_OPTS += oldstyle=no -endif -ifeq ($(BR2_PACKAGE_GPSD_PROFILING),y) -GPSD_SCONS_OPTS += profiling=yes -endif -ifneq ($(BR2_PACKAGE_GPSD_CLIENT_DEBUG),y) -GPSD_SCONS_OPTS += clientdebug=no -endif -ifeq ($(BR2_PACKAGE_GPSD_USER),y) -GPSD_SCONS_OPTS += gpsd_user=$(BR2_PACKAGE_GPSD_USER_VALUE) -endif -ifeq ($(BR2_PACKAGE_GPSD_GROUP),y) -GPSD_SCONS_OPTS += gpsd_group=$(BR2_PACKAGE_GPSD_GROUP_VALUE) -endif -ifeq ($(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED),y) -GPSD_SCONS_OPTS += fixed_port_speed=$(BR2_PACKAGE_GPSD_FIXED_PORT_SPEED_VALUE) -endif -ifeq ($(BR2_PACKAGE_GPSD_MAX_CLIENT),y) -GPSD_SCONS_OPTS += limited_max_clients=$(BR2_PACKAGE_GPSD_MAX_CLIENT_VALUE) -endif -ifeq ($(BR2_PACKAGE_GPSD_MAX_DEV),y) -GPSD_SCONS_OPTS += limited_max_devices=$(BR2_PACKAGE_GPSD_MAX_DEV_VALUE) -endif - -GPSD_SCONS_ENV += LDFLAGS="$(GPSD_LDFLAGS)" CFLAGS="$(GPSD_CFLAGS)" - -define GPSD_BUILD_CMDS - (cd $(@D); \ - $(GPSD_SCONS_ENV) \ - $(SCONS) \ - $(GPSD_SCONS_OPTS)) -endef - -define GPSD_INSTALL_TARGET_CMDS - (cd $(@D); \ - $(GPSD_SCONS_ENV) \ - DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ - $(GPSD_SCONS_OPTS) \ - install) -endef - -define GPSD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/gpsd/S50gpsd $(TARGET_DIR)/etc/init.d/S50gpsd - $(SED) 's,^DEVICES=.*,DEVICES=$(BR2_PACKAGE_GPSD_DEVICES),' $(TARGET_DIR)/etc/init.d/S50gpsd -endef - -define GPSD_INSTALL_STAGING_CMDS - (cd $(@D); \ - $(GPSD_SCONS_ENV) \ - DESTDIR=$(STAGING_DIR) \ - $(SCONS) \ - $(GPSD_SCONS_OPTS) \ - install) -endef - -# After installing the udev rule, make it writable so that this -# package can be re-built/re-installed. -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define GPSD_INSTALL_UDEV_RULES - (cd $(@D); \ - $(GPSD_SCONS_ENV) \ - DESTDIR=$(TARGET_DIR) \ - $(SCONS) \ - $(GPSD_SCONS_OPTS) \ - udev-install) - chmod u+w $(TARGET_DIR)/lib/udev/rules.d/25-gpsd.rules -endef - -GPSD_POST_INSTALL_TARGET_HOOKS += GPSD_INSTALL_UDEV_RULES -endif - -$(eval $(generic-package)) diff --git a/package.bak/gptfdisk/0001-ldlibs.patch b/package.bak/gptfdisk/0001-ldlibs.patch deleted file mode 100644 index ca1d7fbfea..0000000000 --- a/package.bak/gptfdisk/0001-ldlibs.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add $(LDLIBS) support to enable clean static builds (for libintl). - -Signed-off-by: Gustavo Zacarias - -diff -Nura gptfdisk-0.8.10.orig/Makefile gptfdisk-0.8.10/Makefile ---- gptfdisk-0.8.10.orig/Makefile 2015-05-01 08:45:14.667748141 -0300 -+++ gptfdisk-0.8.10/Makefile 2015-05-01 08:45:42.685699419 -0300 -@@ -14,19 +14,19 @@ - all: cgdisk gdisk sgdisk fixparts - - gdisk: $(LIB_OBJS) gdisk.o gpttext.o -- $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid -o gdisk -+ $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -luuid $(LDLIBS) -o gdisk - # $(CXX) $(LIB_OBJS) gdisk.o gpttext.o $(LDFLAGS) -licuio -licuuc -luuid -o gdisk - - cgdisk: $(LIB_OBJS) cgdisk.o gptcurses.o -- $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw -o cgdisk -+ $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -luuid -lncursesw $(LDLIBS) -o cgdisk - # $(CXX) $(LIB_OBJS) cgdisk.o gptcurses.o $(LDFLAGS) -licuio -licuuc -luuid -lncurses -o cgdisk - - sgdisk: $(LIB_OBJS) sgdisk.o gptcl.o -- $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt -o sgdisk -+ $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -luuid -lpopt $(LDLIBS) -o sgdisk - # $(CXX) $(LIB_OBJS) sgdisk.o gptcl.o $(LDFLAGS) -licuio -licuuc -luuid -lpopt -o sgdisk - - fixparts: $(MBR_LIB_OBJS) fixparts.o -- $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) -o fixparts -+ $(CXX) $(MBR_LIB_OBJS) fixparts.o $(LDFLAGS) $(LDLIBS) -o fixparts - - lint: #no pre-reqs - lint $(SRCS) diff --git a/package.bak/gptfdisk/Config.in b/package.bak/gptfdisk/Config.in deleted file mode 100644 index 22dc4014ac..0000000000 --- a/package.bak/gptfdisk/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -comment "gptfdisk needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GPTFDISK - bool "gptfdisk" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_GPTFDISK_GDISK if \ - !(BR2_PACKAGE_GPTFDISK_SGDISK || BR2_PACKAGE_GPTFDISK_CGDISK) - help - GPT fdisk (consisting of the gdisk and sgdisk programs) is a - text-mode partitioning tool that works on Globally Unique Identifier - (GUID) Partition Table (GPT) disks, rather than on the more common - (through 2010) Master Boot Record (MBR) partition tables. - - http://www.rodsbooks.com/gdisk/ - -if BR2_PACKAGE_GPTFDISK - -config BR2_PACKAGE_GPTFDISK_GDISK - bool "interactive gdisk" - help - Install the interactive GUID partition table (GPT) manipulator - /usr/sbin/gdisk which is modelled after and quite similar in use - to the traditional MBR based fdisk tool. - -config BR2_PACKAGE_GPTFDISK_SGDISK - bool "command line sgdisk" - select BR2_PACKAGE_POPT - help - Install the command-line GUID partition table (GPT) manipulator - /usr/sbin/sgdisk which is named after the traditional MBR based - sfdisk tool albeit with an entirely different option syntax. - -config BR2_PACKAGE_GPTFDISK_CGDISK - bool "ncurses cgdisk" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NCURSES_WCHAR # needed because of UTF-16 - depends on BR2_USE_WCHAR # ncurses wchar - depends on !(BR2_bfin && BR2_BINFMT_FLAT) # ncurses wchar support - help - Install the ncurses-based GUID partition table (GPT) - manipulator /usr/sbin/cgdisk. - -endif diff --git a/package.bak/gptfdisk/Config.in.host b/package.bak/gptfdisk/Config.in.host deleted file mode 100644 index 1300d024e5..0000000000 --- a/package.bak/gptfdisk/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_GPTFDISK - bool "host gptfdisk" - select BR2_PACKAGE_HOST_UTIL_LINUX - help - GPT fdisk (consisting of the gdisk and sgdisk programs) is a - text-mode partitioning tool that works on Globally Unique - Identifier (GUID) Partition Table (GPT) disks, rather than - on the more common (through 2010) Master Boot Record (MBR) - partition tables. - - http://www.rodsbooks.com/gdisk/ diff --git a/package.bak/gptfdisk/gptfdisk.hash b/package.bak/gptfdisk/gptfdisk.hash deleted file mode 100644 index 0a72e0d922..0000000000 --- a/package.bak/gptfdisk/gptfdisk.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/gptfdisk/files/gptfdisk/1.0.0/ -md5 2061f917af084215898d4fea04d8388f gptfdisk-1.0.0.tar.gz -sha1 97f25db2def1c1939ed3954520bfd9948806d95a gptfdisk-1.0.0.tar.gz diff --git a/package.bak/gptfdisk/gptfdisk.mk b/package.bak/gptfdisk/gptfdisk.mk deleted file mode 100644 index 274591c7d4..0000000000 --- a/package.bak/gptfdisk/gptfdisk.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# gptfdisk -# -################################################################################ - -GPTFDISK_VERSION = 1.0.0 -GPTFDISK_SITE = http://downloads.sourceforge.net/sourceforge/gptfdisk -GPTFDISK_LICENSE = GPLv2+ -GPTFDISK_LICENSE_FILES = COPYING - -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_GDISK) += gdisk -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_SGDISK) += sgdisk -GPTFDISK_TARGETS_$(BR2_PACKAGE_GPTFDISK_CGDISK) += cgdisk - -GPTFDISK_DEPENDENCIES += util-linux -ifeq ($(BR2_PACKAGE_GPTFDISK_SGDISK),y) -GPTFDISK_DEPENDENCIES += popt -endif -ifeq ($(BR2_PACKAGE_GPTFDISK_CGDISK),y) -GPTFDISK_DEPENDENCIES += ncurses -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# gptfdisk dependencies may link against libintl/libiconv, so we need -# to do so as well when linking statically -ifeq ($(BR2_PACKAGE_GETTEXT),y) -GPTFDISK_DEPENDENCIES += gettext -GPTFDISK_LDLIBS += -lintl -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -GPTFDISK_DEPENDENCIES += libiconv -GPTFDISK_LDLIBS += -liconv -endif -endif - -define GPTFDISK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - LDLIBS='$(GPTFDISK_LDLIBS)' $(GPTFDISK_TARGETS_y) -endef - -define GPTFDISK_INSTALL_TARGET_CMDS - for i in $(GPTFDISK_TARGETS_y); do \ - $(INSTALL) -D -m 0755 $(@D)/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \ - done -endef - -HOST_GPTFDISK_DEPENDENCIES = host-util-linux host-popt - -define HOST_GPTFDISK_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) sgdisk -endef - -define HOST_GPTFDISK_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/sgdisk $(HOST_DIR)/usr/sbin/sgdisk -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/gqview/0001-make.patch b/package.bak/gqview/0001-make.patch deleted file mode 100644 index 0b1626ffc5..0000000000 --- a/package.bak/gqview/0001-make.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/src/Makefile.in 2006-12-02 20:41:25.000000000 -0500 -+++ b/src/Makefile.in 2008-02-13 14:00:25.000000000 -0500 -@@ -200,7 +200,7 @@ SUBDIRS = icons - DIST_SUBDIRS = icons - INCLUDES = -I$(srcdir) -I$(builddir) \ - -I$(top_srcdir) -I$(top_builddir) \ -- -I$(includedir) $(GTK_CFLAGS) -+ $(GTK_CFLAGS) - - module_SLIK = \ - intl.h \ diff --git a/package.bak/gqview/Config.in b/package.bak/gqview/Config.in deleted file mode 100644 index c1df40cc19..0000000000 --- a/package.bak/gqview/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GQVIEW - bool "gqview" - depends on BR2_PACKAGE_LIBGTK2 - help - GQview is an image viewer for Unix operating systems - - http://prdownloads.sourceforge.net/gqview diff --git a/package.bak/gqview/gqview.hash b/package.bak/gqview/gqview.hash deleted file mode 100644 index eb65497131..0000000000 --- a/package.bak/gqview/gqview.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 12fea494e607a69eff31cdca13d306ef1b0b3b7850be0f8b236f267d8f2e9546 gqview-2.1.5.tar.gz diff --git a/package.bak/gqview/gqview.mk b/package.bak/gqview/gqview.mk deleted file mode 100644 index 89620258bd..0000000000 --- a/package.bak/gqview/gqview.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# gqview -# -################################################################################ - -GQVIEW_VERSION = 2.1.5 -GQVIEW_SITE = http://prdownloads.sourceforge.net/gqview -GQVIEW_DEPENDENCIES = host-pkgconf libgtk2 -GQVIEW_CONF_ENV = LIBS="-lm" -GQVIEW_LICENSE = GPLv2 -GQVIEW_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/gr-osmosdr/Config.in b/package.bak/gr-osmosdr/Config.in deleted file mode 100644 index aa6ef0d4c2..0000000000 --- a/package.bak/gr-osmosdr/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_GR_OSMOSDR - bool "gr-osmosdr" - depends on BR2_PACKAGE_GNURADIO - select BR2_PACKAGE_GNURADIO_BLOCKS - help - GNU Radio block for interfacing with various radio hardware - -if BR2_PACKAGE_GR_OSMOSDR - -config BR2_PACKAGE_GR_OSMOSDR_PYTHON - bool "python support" - depends on BR2_PACKAGE_GNURADIO_PYTHON - help - Enable Python support - -config BR2_PACKAGE_GR_OSMOSDR_IQFILE - bool "IQ File Source support" - help - Enable IQ File Source support - -config BR2_PACKAGE_GR_OSMOSDR_RTLSDR - bool "Osmocom RTLSDR support" - select BR2_PACKAGE_LIBRTLSDR - help - Enable Osmocom RTLSDR support - -config BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP - bool "RTLSDR TCP Client support" - help - Enable RTLSDR TCP client support - -config BR2_PACKAGE_GR_OSMOSDR_RFSPACE - bool "RFSPACE Receivers support" - help - Enable RFSPACE Receivers support - -endif diff --git a/package.bak/gr-osmosdr/gr-osmosdr.hash b/package.bak/gr-osmosdr/gr-osmosdr.hash deleted file mode 100644 index 337f3ef86b..0000000000 --- a/package.bak/gr-osmosdr/gr-osmosdr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated: -sha256 274960cd32bc8a7216eeed8967bf078efd6123332808b405ec42c24a7e426b7c gr-osmosdr-164a09fc11cec2d8b15b38e8b512fa542d6cecc7.tar.gz diff --git a/package.bak/gr-osmosdr/gr-osmosdr.mk b/package.bak/gr-osmosdr/gr-osmosdr.mk deleted file mode 100644 index d7c3d624c4..0000000000 --- a/package.bak/gr-osmosdr/gr-osmosdr.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# gr-osmosdr -# -################################################################################ - -GR_OSMOSDR_VERSION = 164a09fc11cec2d8b15b38e8b512fa542d6cecc7 -GR_OSMOSDR_SITE = $(call github,osmocom,gr-osmosdr,$(GR_OSMOSDR_VERSION)) -GR_OSMOSDR_LICENSE = GPLv3+ -GR_OSMOSDR_LICENSE_FILES = COPYING - -# gr-osmosdr prevents doing an in-source-tree build -GR_OSMOSDR_SUPPORTS_IN_SOURCE_BUILD = NO - -GR_OSMOSDR_DEPENDENCIES = gnuradio - -GR_OSMOSDR_CONF_OPTS = -DENABLE_DEFAULT=OFF - -# For third-party blocks, the gr-osmosdr libraries are mandatory at -# compile time. -GR_OSMOSDR_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_PYTHON),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=ON -GR_OSMOSDR_DEPENDENCIES += python -else -GR_OSMOSDR_CONF_OPTS += -DENABLE_PYTHON=OFF -endif - -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_IQFILE),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_FILE=ON -else -GR_OSMOSDR_CONF_OPTS += -DENABLE_FILE=OFF -endif - -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RTLSDR),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL=ON -GR_OSMOSDR_DEPENDENCIES += librtlsdr -else -GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL=OFF -endif - -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RTLSDR_TCP),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL_TCP=ON -else -GR_OSMOSDR_CONF_OPTS += -DENABLE_RTL_TCP=OFF -endif - -ifeq ($(BR2_PACKAGE_GR_OSMOSDR_RFSPACE),y) -GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=ON -else -GR_OSMOSDR_CONF_OPTS += -DENABLE_RFSPACE=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/granite/Config.in b/package.bak/granite/Config.in deleted file mode 100644 index fef5e27add..0000000000 --- a/package.bak/granite/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_GRANITE - bool "granite" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBGEE - select BR2_PACKAGE_LIBGLIB2 - help - An extension to GTK+ that provides several useful widgets and - classes to ease application development. - - https://launchpad.net/granite - -comment "granite needs libgtk3 and a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_LIBGTK3 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/granite/granite.hash b/package.bak/granite/granite.hash deleted file mode 100644 index 3c89685155..0000000000 --- a/package.bak/granite/granite.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://launchpad.net/granite/0.4/0.4.0.1/+download/granite-0.4.0.1.tar.xz/+md5 -md5 db41150ca6e77162392362686e848086 granite-0.3.1.tar.xz -# Calculated based on the hash above -sha256 95a142a8befeedc35a089d638e759b657905508dc3007036d6c1fa3efe94c4dd granite-0.4.0.1.tar.xz diff --git a/package.bak/granite/granite.mk b/package.bak/granite/granite.mk deleted file mode 100644 index 3faedf9cd0..0000000000 --- a/package.bak/granite/granite.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# granite -# -################################################################################ - -GRANITE_VERSION_MAJOR = 0.4 -GRANITE_VERSION = $(GRANITE_VERSION_MAJOR).0.1 -GRANITE_SITE = https://launchpad.net/granite/$(GRANITE_VERSION_MAJOR)/$(GRANITE_VERSION)/+download -GRANITE_SOURCE = granite-$(GRANITE_VERSION).tar.xz -GRANITE_DEPENDENCIES = host-pkgconf host-vala libgee libglib2 libgtk3 -GRANITE_INSTALL_STAGING = YES -GRANITE_LICENSE = LGPLv3+ -GRANITE_LICENSE_FILES = COPYING - -$(eval $(cmake-package)) diff --git a/package.bak/grantlee/Config.in b/package.bak/grantlee/Config.in deleted file mode 100644 index 779306bc2e..0000000000 --- a/package.bak/grantlee/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_GRANTLEE - bool "grantlee" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE && BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5SCRIPT - select BR2_PACKAGE_QT5BASE_GUI - help - Qt implementation of the Django template framework - - http://www.grantlee.org diff --git a/package.bak/grantlee/grantlee.hash b/package.bak/grantlee/grantlee.hash deleted file mode 100644 index cdff778041..0000000000 --- a/package.bak/grantlee/grantlee.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ea2e402466c74bb533eee2c7252209ec61cd93a5d236fecd625b4a0eb13a1478 grantlee-5.1.0.tar.gz diff --git a/package.bak/grantlee/grantlee.mk b/package.bak/grantlee/grantlee.mk deleted file mode 100644 index f921d7b941..0000000000 --- a/package.bak/grantlee/grantlee.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# grantlee -# -################################################################################ -GRANTLEE_VERSION = 5.1.0 -GRANTLEE_SITE = http://downloads.grantlee.org -GRANTLEE_INSTALL_STAGING = YES -GRANTLEE_LICENSE = LGPLv2.1+ -GRANTLEE_LICENSE_FILES = COPYING.LIB -GRANTLEE_DEPENDENCIES = qt5base qt5script - -$(eval $(cmake-package)) diff --git a/package.bak/graphite2/0001-disable-double-promotion.patch b/package.bak/graphite2/0001-disable-double-promotion.patch deleted file mode 100644 index 3bda3d7c63..0000000000 --- a/package.bak/graphite2/0001-disable-double-promotion.patch +++ /dev/null @@ -1,21 +0,0 @@ -Don't use -Wdouble-promotion gcc option - -The warning flag isn't recognized for older GCC versions (blackfin), -so just disable it. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for 1.3.5] - -diff -Nura graphite2-1.3.5.orig/src/CMakeLists.txt graphite2-1.3.5/src/CMakeLists.txt ---- graphite2-1.3.5.orig/src/CMakeLists.txt 2016-02-15 11:46:45.941906112 -0300 -+++ graphite2-1.3.5/src/CMakeLists.txt 2016-02-15 11:46:54.237194222 -0300 -@@ -111,9 +111,6 @@ - COMPILE_FLAGS "-Wall -Wextra -Wno-unknown-pragmas -Wendif-labels -Wshadow -Wctor-dtor-privacy -Wnon-virtual-dtor -fno-rtti -fno-exceptions -fvisibility=hidden -fvisibility-inlines-hidden -fno-stack-protector" - LINK_FLAGS "-nodefaultlibs ${GRAPHITE_LINK_FLAGS}" - LINKER_LANGUAGE C) -- if (CMAKE_COMPILER_IS_GNUCXX) -- add_definitions(-Wdouble-promotion) -- endif (CMAKE_COMPILER_IS_GNUCXX) - message(STATUS "Compiler ID is: ${CMAKE_CXX_COMPILER_ID}") - if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") - add_definitions(-Wimplicit-fallthrough) diff --git a/package.bak/graphite2/Config.in b/package.bak/graphite2/Config.in deleted file mode 100644 index 5499e17e27..0000000000 --- a/package.bak/graphite2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GRAPHITE2 - bool "graphite2" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - Graphite is a project within SIL's scripts and software dev - groups to provide cross-platform rendering for complex - writing systems. - - http://graphite.sil.org/ - -comment "graphite2 needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package.bak/graphite2/graphite2.hash b/package.bak/graphite2/graphite2.hash deleted file mode 100644 index 86be69e178..0000000000 --- a/package.bak/graphite2/graphite2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/silgraphite/files/graphite2 -md5 17e6a3b1a88c100c9e3fc0763c85d269 graphite2-1.3.9.tgz -sha1 0693e9eef87edf1792db247dd38794211666a1b9 graphite2-1.3.9.tgz diff --git a/package.bak/graphite2/graphite2.mk b/package.bak/graphite2/graphite2.mk deleted file mode 100644 index 5f6848fa87..0000000000 --- a/package.bak/graphite2/graphite2.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# graphite2 -# -################################################################################ - -GRAPHITE2_VERSION = 1.3.9 -GRAPHITE2_SOURCE = graphite2-$(GRAPHITE2_VERSION).tgz -GRAPHITE2_SITE = http://downloads.sourceforge.net/project/silgraphite/graphite2 -GRAPHITE2_INSTALL_STAGING = YES -GRAPHITE2_LICENSE = LGPLv2.1+ -GRAPHITE2_LICENSE_FILES = LICENSE - -# Avoid building docs and tests to save time -define GRAPHITE2_DISABLE_TESTS_DOC - $(SED) '/^add_subdirectory(doc)/d' \ - -e '/^add_subdirectory(tests)/d' \ - -e '/add_subdirectory(gr2fonttest)/d' \ - $(@D)/CMakeLists.txt -endef -GRAPHITE2_POST_PATCH_HOOKS += GRAPHITE2_DISABLE_TESTS_DOC - -$(eval $(cmake-package)) diff --git a/package.bak/grep/Config.in b/package.bak/grep/Config.in deleted file mode 100644 index 64276506f0..0000000000 --- a/package.bak/grep/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GREP - bool "grep" - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - The GNU regular expression matcher. - - http://www.gnu.org/software/grep/grep.html - -comment "grep needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/grep/grep.hash b/package.bak/grep/grep.hash deleted file mode 100644 index 326737a2fd..0000000000 --- a/package.bak/grep/grep.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking signature -sha256 ad4cc44d23074a1c3a8baae8fbafff2a8c60f38a9a6108f985eef6fbee6dcaeb grep-2.27.tar.xz diff --git a/package.bak/grep/grep.mk b/package.bak/grep/grep.mk deleted file mode 100644 index 7615f30bac..0000000000 --- a/package.bak/grep/grep.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# grep -# -################################################################################ - -GREP_VERSION = 2.27 -GREP_SITE = $(BR2_GNU_MIRROR)/grep -GREP_SOURCE = grep-$(GREP_VERSION).tar.xz -GREP_LICENSE = GPLv3+ -GREP_LICENSE_FILES = COPYING -GREP_CONF_OPTS = --disable-perl-regexp \ - $(if $(BR2_TOOLCHAIN_USES_MUSL),--with-included-regex) -GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -# link with iconv if enabled -ifeq ($(BR2_PACKAGE_LIBICONV),y) -GREP_CONF_ENV += LIBS=-liconv -GREP_DEPENDENCIES += libiconv -endif - -# link with pcre if enabled -ifeq ($(BR2_PACKAGE_PCRE),y) -GREP_CONF_OPTS += --enable-perl-regexp -GREP_DEPENDENCIES += pcre -endif - -# Full grep preferred over busybox grep -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -GREP_DEPENDENCIES += busybox -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gsettings-desktop-schemas/Config.in b/package.bak/gsettings-desktop-schemas/Config.in deleted file mode 100644 index 0dfffc3850..0000000000 --- a/package.bak/gsettings-desktop-schemas/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GSETTINGS_DESKTOP_SCHEMAS - bool "gsettings-desktop-schemas" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - gsettings-desktop-schemas contains a collection of GSettings - schemas for settings shared by various components of a - desktop. - - https://github.com/GNOME/gsettings-desktop-schemas - -comment "gsettings-desktop-schemas needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.hash b/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.hash deleted file mode 100644 index 05ec7a418f..0000000000 --- a/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/gsettings-desktop-schemas/3.22/gsettings-desktop-schemas-3.22.0.sha256sum -sha256 0f06c7ba34c3a99e4d58b10889496133c9aaad6698ea2d8405d481c7f1a7eae1 gsettings-desktop-schemas-3.22.0.tar.xz diff --git a/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.mk b/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.mk deleted file mode 100644 index 7fa61817c1..0000000000 --- a/package.bak/gsettings-desktop-schemas/gsettings-desktop-schemas.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gsettings-desktop-schemas -# -################################################################################ - -GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR = 3.22 -GSETTINGS_DESKTOP_SCHEMAS_VERSION = $(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR).0 -GSETTINGS_DESKTOP_SCHEMAS_SOURCE = gsettings-desktop-schemas-$(GSETTINGS_DESKTOP_SCHEMAS_VERSION).tar.xz -GSETTINGS_DESKTOP_SCHEMAS_SITE = http://ftp.gnome.org/pub/gnome/sources/gsettings-desktop-schemas/$(GSETTINGS_DESKTOP_SCHEMAS_VERSION_MAJOR) -GSETTINGS_DESKTOP_SCHEMAS_INSTALL_STAGING = YES -GSETTINGS_DESKTOP_SCHEMAS_DEPENDENCIES = host-intltool host-pkgconf libglib2 -GSETTINGS_DESKTOP_SCHEMAS_LICENSE = LGPLv2.1+ -GSETTINGS_DESKTOP_SCHEMAS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/gsl/Config.in b/package.bak/gsl/Config.in deleted file mode 100644 index 5b82ac2a0b..0000000000 --- a/package.bak/gsl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GSL - bool "gsl" - help - The GNU Scientific Library (GSL) is a numerical library for - C and C++ programmers. The library provides a wide range of - mathematical routines such as random number generators, - special functions and least-squares fitting. There are over - 1000 functions in total with an extensive test suite. - - http://www.gnu.org/software/gsl diff --git a/package.bak/gsl/gsl.hash b/package.bak/gsl/gsl.hash deleted file mode 100644 index bc33e4e2d1..0000000000 --- a/package.bak/gsl/gsl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 73bc2f51b90d2a780e6d266d43e487b3dbd78945dd0b04b14ca5980fe28d2f53 gsl-1.16.tar.gz diff --git a/package.bak/gsl/gsl.mk b/package.bak/gsl/gsl.mk deleted file mode 100644 index 0ad5377ece..0000000000 --- a/package.bak/gsl/gsl.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# gsl -# -################################################################################ - -GSL_VERSION = 1.16 -GSL_SITE = $(BR2_GNU_MIRROR)/gsl -GSL_INSTALL_STAGING = YES -GSL_LICENSE = GPLv3 -GSL_LICENSE_FILES = COPYING -GSL_CONFIG_SCRIPTS = gsl-config - -# uClibc pretends to have fenv support as it installs , but in -# practice, it only implements it for i386. Problem reported upstream -# at: http://lists.busybox.net/pipermail/uclibc/2012-October/047067.html. -# So we tell gsl that fenv related functions are not available in this -# case. -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -ifneq ($(BR2_i386),y) -GSL_CONF_ENV = \ - ac_cv_have_decl_feenableexcept=no \ - ac_cv_have_decl_fesettrapenable=no -endif -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gssdp/Config.in b/package.bak/gssdp/Config.in deleted file mode 100644 index 83149718da..0000000000 --- a/package.bak/gssdp/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_GSSDP - bool "gssdp" - depends on BR2_USE_WCHAR # glib2, libsoup - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, libsoup - depends on BR2_USE_MMU # glib2, libsoup - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBSOUP - help - GSSDP implements resource discovery and announcement over SSDP. - - http://www.gupnp.org - -comment "gssdp needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gssdp/gssdp.hash b/package.bak/gssdp/gssdp.hash deleted file mode 100644 index b646d185ba..0000000000 --- a/package.bak/gssdp/gssdp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gssdp/1.0/gssdp-1.0.1.sha256sum: -sha256 601d67f40bc28c067742b7c46f3018da96b364fd3e83f30ddac6e190e323d2e1 gssdp-1.0.1.tar.xz diff --git a/package.bak/gssdp/gssdp.mk b/package.bak/gssdp/gssdp.mk deleted file mode 100644 index fa44a2ca9c..0000000000 --- a/package.bak/gssdp/gssdp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gssdp -# -################################################################################ - -GSSDP_VERSION_MAJOR = 1.0 -GSSDP_VERSION = $(GSSDP_VERSION_MAJOR).1 -GSSDP_SOURCE = gssdp-$(GSSDP_VERSION).tar.xz -GSSDP_SITE = http://ftp.gnome.org/pub/gnome/sources/gssdp/$(GSSDP_VERSION_MAJOR) -GSSDP_LICENSE = LGPLv2+ -GSSDP_LICENSE_FILES = COPYING -GSSDP_INSTALL_STAGING = YES -GSSDP_DEPENDENCIES = host-pkgconf libglib2 libsoup - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/Config.in b/package.bak/gstreamer/Config.in deleted file mode 100644 index c6292f4a7e..0000000000 --- a/package.bak/gstreamer/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -# Gstreamer 0.10.x & Plugins -source "package/gstreamer/gstreamer/Config.in" - -if BR2_PACKAGE_GSTREAMER -source "package/gstreamer/gst-plugins-base/Config.in" -source "package/gstreamer/gst-plugins-good/Config.in" -source "package/gstreamer/gst-plugins-bad/Config.in" -source "package/gstreamer/gst-plugins-ugly/Config.in" -source "package/gstreamer/gst-ffmpeg/Config.in" -source "package/gstreamer/gst-dsp/Config.in" -source "package/gstreamer/gst-fsl-plugins/Config.in" -source "package/gstreamer/gst-omapfb/Config.in" -source "package/gstreamer/gst-plugin-x170/Config.in" -endif diff --git a/package.bak/gstreamer/gst-dsp/Config.in b/package.bak/gstreamer/gst-dsp/Config.in deleted file mode 100644 index 102cf69b45..0000000000 --- a/package.bak/gstreamer/gst-dsp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_GST_DSP - bool "gst-dsp" - depends on BR2_cortex_a8 - select BR2_PACKAGE_TIDSP_BINARIES - help - GStreamer plug-in to access TI OMAP3 DSP algorithms. - - http://code.google.com/p/gst-dsp/ diff --git a/package.bak/gstreamer/gst-dsp/gst-dsp.hash b/package.bak/gstreamer/gst-dsp/gst-dsp.hash deleted file mode 100644 index 3bccfc1c3a..0000000000 --- a/package.bak/gstreamer/gst-dsp/gst-dsp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 45437a038979916de74e78a2cc7a0b01ba3982d0848e1e483a054c9cf0ce5883 gst-dsp-v0.10.2.tar.gz diff --git a/package.bak/gstreamer/gst-dsp/gst-dsp.mk b/package.bak/gstreamer/gst-dsp/gst-dsp.mk deleted file mode 100644 index dedffb9822..0000000000 --- a/package.bak/gstreamer/gst-dsp/gst-dsp.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# gst-dsp -# -################################################################################ - -GST_DSP_VERSION = v0.10.2 -GST_DSP_SITE = $(call github,felipec,gst-dsp,$(GST_DSP_VERSION)) - -define GST_DSP_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -endef - -define GST_DSP_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install -endef - -GST_DSP_DEPENDENCIES = gstreamer tidsp-binaries host-pkgconf - -$(eval $(generic-package)) diff --git a/package.bak/gstreamer/gst-ffmpeg/0001-gcc47.patch b/package.bak/gstreamer/gst-ffmpeg/0001-gcc47.patch deleted file mode 100644 index 16744abae3..0000000000 --- a/package.bak/gstreamer/gst-ffmpeg/0001-gcc47.patch +++ /dev/null @@ -1,65 +0,0 @@ -gst-ffmpeg libav: Fixes compiling gst-ffmpeg with gcc-4.7 - -Fetch from: http://www.slackware.com/~alien/slackbuilds/gst-plugins-ffmpeg/build/gst-ffmpeg-0.10.13_gcc47.patch - -Signed-off-by: Bernd Kuhls ---- -Submitted By: Andrew Benton -Date: 2012-06-15 -Initial Package Version: 0.10.13 -Upstream Status: From upstream -Origin: -http://git.videolan.org/?p=ffmpeg.git;a=patch;h=5f654897e325349dacf2546674e0510bb72ecb50 - -Description: Fixes compiling gst-ffmpeg with gcc-4.7 - -libavcodec/x86/h264_qpel_mmx.c: Assembler messages: -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1294: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:1298: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -libavcodec/x86/h264_qpel_mmx.c:964: Error: operand type mismatch for `cmp' -make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1 - -Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c -=================================================================== ---- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700 -+++ gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:54:08.152564075 -0700 -@@ -398,7 +398,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : "memory"\ - );\ - src += 4-(h+5)*srcStride;\ -@@ -446,7 +446,7 @@ - QPEL_H264HV(%%mm3, %%mm4, %%mm5, %%mm0, %%mm1, %%mm2, 15*48)\ - "2: \n\t"\ - : "+a"(src)\ -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size)\ -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size)\ - : "memory"\ - );\ - tmp += 4;\ -@@ -823,7 +823,7 @@ - "2: \n\t"\ - \ - : "+a"(src), "+c"(dst)\ -- : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "g"(h)\ -+ : "S"((x86_reg)srcStride), "D"((x86_reg)dstStride), "rm"(h)\ - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", \ - "%xmm4", "%xmm5", "%xmm6", "%xmm7",)\ - "memory"\ -@@ -878,7 +878,7 @@ - QPEL_H264HV_XMM(%%xmm3, %%xmm4, %%xmm5, %%xmm0, %%xmm1, %%xmm2, 15*48) - "2: \n\t" - : "+a"(src) -- : "c"(tmp), "S"((x86_reg)srcStride), "g"(size) -+ : "c"(tmp), "S"((x86_reg)srcStride), "rm"(size) - : XMM_CLOBBERS("%xmm0", "%xmm1", "%xmm2", "%xmm3", - "%xmm4", "%xmm5", "%xmm6", "%xmm7",) - "memory" diff --git a/package.bak/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch b/package.bak/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch deleted file mode 100644 index 288dc3d6e8..0000000000 --- a/package.bak/gstreamer/gst-ffmpeg/0002-arm-avoid-using-the-movw-instruction.patch +++ /dev/null @@ -1,41 +0,0 @@ -Date: Mon, 1 Aug 2011 20:21:04 +0300 -Subject: [libavcodec] arm: Avoid using the movw instruction needlessly -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -This fixes building for ARM11 without Thumb2. - -Signed-off-by: Martin Storsjö - -[Arnout: backported to gst-ffmpeg, from ffmpeg 9a83adaf3] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -index d3058ff..b6aee86 100644 ---- a/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -+++ b/gst-libs/ext/libav/libavcodec/arm/ac3dsp_armv6.S -@@ -37,7 +37,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - ldrb r10, [r4], #1 - 1: - ldrsh r9, [r0], #2 @ mask[band] -- movw r8, #0x1fe0 -+ mov r8, #0xff0 - sub r9, r9, r12 @ - snr_offset - mov r11, r10 - ldrb r10, [r4], #1 @ band_start_tab[band++] -@@ -44,7 +44,7 @@ function ff_ac3_bit_alloc_calc_bap_armv6, export=1 - subs r9, r9, r5 @ - floor - movlt r9, #0 - cmp r10, r3 @ - end -- and r9, r9, r8 @ & 0x1fe0 -+ and r9, r9, r8, lsl #1 @ & 0x1fe0 - subgt r8, r3, r11 - suble r8, r10, r11 - add r9, r9, r5 @ + floor => m --- -1.7.10.4 - diff --git a/package.bak/gstreamer/gst-ffmpeg/Config.in b/package.bak/gstreamer/gst-ffmpeg/Config.in deleted file mode 100644 index 2164ea2e05..0000000000 --- a/package.bak/gstreamer/gst-ffmpeg/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_GST_FFMPEG - bool "gst-ffmpeg" - # Unsupported for MIPS R6. It bundles a version of libav which - # doesn't have support for MIPS R6. - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - # triggers https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65151 on sh - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_5 || !BR2_sh - select BR2_PACKAGE_GST_PLUGINS_BASE - help - GStreamer plugin containing one plugin with a set of elements using - the Libav library. It contains most popular decoders as well as - colorspace conversion elements. - - This package is configured to use an internal copy of the Libav - library. - - http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html - -if BR2_PACKAGE_GST_FFMPEG - -config BR2_PACKAGE_GST_FFMPEG_GPL - bool "Enable GPL code" - help - Allow use of GPL code. The resulting libs and binaries will - be under GPL. - -endif - -comment "gst-ffmpeg needs a toolchain w/ gcc >= 5" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_5 && BR2_sh diff --git a/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.hash b/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.hash deleted file mode 100644 index 5f7f35d9a4..0000000000 --- a/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-ffmpeg/gst-ffmpeg-0.10.13.tar.bz2.md5 -md5 7f5beacaf1312db2db30a026b36888c4 gst-ffmpeg-0.10.13.tar.bz2 diff --git a/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.mk b/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.mk deleted file mode 100644 index b1d8f8bd85..0000000000 --- a/package.bak/gstreamer/gst-ffmpeg/gst-ffmpeg.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# gst-ffmpeg -# -################################################################################ - -GST_FFMPEG_VERSION = 0.10.13 -GST_FFMPEG_SOURCE = gst-ffmpeg-$(GST_FFMPEG_VERSION).tar.bz2 -GST_FFMPEG_SITE = http://gstreamer.freedesktop.org/src/gst-ffmpeg -GST_FFMPEG_INSTALL_STAGING = YES -GST_FFMPEG_DEPENDENCIES = host-pkgconf gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_FFMPEG_GPL),y) -GST_FFMPEG_CONF_OPTS += --disable-lgpl -GST_FFMPEG_LICENSE = GPLv2+ (gst-ffmpeg), GPLv2+/GPLv3+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING gst-libs/ext/libav/COPYING.GPLv2 gst-libs/ext/libav/COPYING.GPLv3 -else -GST_FFMPEG_CONF_OPTS += --enable-lgpl -GST_FFMPEG_LICENSE = LGPLv2+ (gst-ffmpeg), LGPLv2.1+/LGPLv3+ (libav) -GST_FFMPEG_LICENSE_FILES = COPYING.LIB gst-libs/ext/libav/COPYING.LGPLv2.1 gst-libs/ext/libav/COPYING.LGPLv3 -endif - -GST_FFMPEG_CONF_EXTRA_OPTS = \ - --cross-prefix=$(TARGET_CROSS) \ - --target-os=linux \ - --pkg-config='$(PKG_CONFIG_HOST_BINARY)' - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-zlib -GST_FFMPEG_DEPENDENCIES += zlib -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-bzlib -GST_FFMPEG_DEPENDENCIES += bzip2 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-bzlib -endif - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-yasm -GST_FFMPEG_DEPENDENCIES += host-yasm -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-yasm -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-mmx -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-sse -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-sse -endif - -ifeq ($(BR2_X86_CPU_HAS_SSSE3),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-ssse3 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-ssse3 -endif - -# Explicitly disable everything that doesn't match for ARM -# FFMPEG "autodetects" by compiling an extended instruction via AS -# This works on compilers that aren't built for generic by default -ifeq ($(BR2_ARM_CPU_ARMV4),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv5te -endif -ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-armv6 -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-armv6 --disable-armv6t2 -endif -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-neon -endif - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-altivec -else -GST_FFMPEG_CONF_EXTRA_OPTS += --disable-altivec -endif - -ifeq ($(BR2_STATIC_LIBS),) -GST_FFMPEG_CONF_EXTRA_OPTS += --enable-pic -endif - -GST_FFMPEG_CONF_OPTS += --with-ffmpeg-extra-configure="$(GST_FFMPEG_CONF_EXTRA_OPTS)" - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch b/package.bak/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch deleted file mode 100644 index 19753bc787..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/0001-gplay-add-missing-include.patch +++ /dev/null @@ -1,23 +0,0 @@ -From ed649ccb8ddc724546172d329fca39b23c49b804 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 17:58:28 +0100 -Subject: [PATCH] gplay: add missing include - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - tools/gplay/gst_snapshot.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/gplay/gst_snapshot.c b/tools/gplay/gst_snapshot.c -index 40dbb6f..596f399 100755 ---- a/tools/gplay/gst_snapshot.c -+++ b/tools/gplay/gst_snapshot.c -@@ -22,6 +22,7 @@ - - #include - #include -+#include - #include "gst_snapshot.h" - - static void --- diff --git a/package.bak/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch b/package.bak/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch deleted file mode 100644 index 471c48364d..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/0002-Fix-bashism-in-configure-script.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 83b4f84b1c490b9bb816e1ecbc743d80d48cc06d Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:05:22 +0100 -Subject: [PATCH] Fix bashism in configure script. - -The configure script uses +=, which is not POSIX. Debians that -have the default dash as /bin/sh define a variable ending with -+ instead of appending to it. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5968eb6..1a31a06 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -152,7 +152,7 @@ AC_SUBST(GST_PLUGINS_BASE_LIBS) - AC_CHECK_HEADERS([vpu_lib.h], [HAVE_VPU_LIB=yes], [HAVE_VPU_LIB=no]) - if test "x$HAVE_VPU_LIB" = "xyes"; then - VPU_LIBS=`$PKG_CONFIG --libs libfslvpuwrap 2>/dev/null` -- VPU_LIBS+=" -lvpu" -+ VPU_LIBS="$VPU_LIBS -lvpu" - fi - AC_SUBST(VPU_LIBS) - -@@ -176,14 +176,14 @@ AC_SUBST(RT_CFLAGS) - AC_SUBST(RT_LIBS) - - FSL_MM_CORE_CFLAGS=`$PKG_CONFIG --cflags libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslparser 2>/dev/null` --FSL_MM_CORE_CFLAGS+=`$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null` -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslparser 2>/dev/null`" -+FSL_MM_CORE_CFLAGS="$FSL_MM_CORE_CFLAGS `$PKG_CONFIG --cflags libfslvpuwrap 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_CFLAGS) - - FSL_MM_CORE_LIBS=`$PKG_CONFIG --libs libfslaudiocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslvideocodec 2>/dev/null` --FSL_MM_CORE_LIBS+=`$PKG_CONFIG --libs libfslparser 2>/dev/null` -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslvideocodec 2>/dev/null`" -+FSL_MM_CORE_LIBS="$FSL_MM_CORE_LIBS `$PKG_CONFIG --libs libfslparser 2>/dev/null`" - AC_SUBST(FSL_MM_CORE_LIBS) - - EXTRAPLATFORMCFLAGS="-DARM -D_GNUC_" --- diff --git a/package.bak/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch b/package.bak/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch deleted file mode 100644 index b7b8c9f740..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/0003-Use-proper-objdump.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c58b658a93b1b6d6e94ba0306d58de845012cef6 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 18 Dec 2012 12:22:52 +0100 -Subject: [PATCH] Use proper objdump - -If the OBJDUMP environment variable is set, that should be used rather -than the objdump in PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1a31a06..cc7557d 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -17,7 +17,7 @@ AC_DEFUN([FIND_PARSER_SONAME], - AC_MSG_CHECKING([for lib_$1_parser_$2_elinux.3.0.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslparser` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/lib_$1_parser_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then -@@ -36,7 +36,7 @@ AC_DEFUN([FIND_ACODEC_SONAME], - AC_MSG_CHECKING([for lib_$1_wrap_$2_elinux.so soname]) - path=`$PKG_CONFIG --variable=libdir libfslaudiocodec` - SONAME=$( $CC -print-file-name=$PKG_CONFIG_SYSROOT_DIR$path/wrap/lib_$1_wrap_$2_elinux.so | \ -- while read output; do objdump -p $output | \ -+ while read output; do $OBJDUMP -p $output | \ - grep "SONAME" | \ - sed -e 's/ \+SONAME \+//'; done 2> /dev/null ) - if [[ -z "$SONAME" ]]; then --- diff --git a/package.bak/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch b/package.bak/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch deleted file mode 100644 index 763703c27c..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/0004-Fix-libgstfsl-linkage-add-lrt-for-shared-memory-func.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 1ca4251d1284f2cb56e31aaec4d369809e2139c9 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 24 Feb 2014 16:30:39 +0100 -Subject: [PATCH] Fix libgstfsl linkage (add -lrt for shared memory functions). - -Fixes runtime failure of gst-fsl-plugins, e.g.: -(gst-plugin-scanner:1700): GStreamer-WARNING **: Failed to load - plugin '/usr/lib/gstreamer-0.10/libmfw_vpu.so': - /usr/lib/libgstfsl-0.10.so.0: undefined symbol: shm_open) - -Signed-off-by: Peter Seiderer ---- - configure.ac | 3 +++ - libs/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index a5d1655..7b5a7a6 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,9 @@ AC_CHECK_LIB(ipu, mxc_ipu_lib_task_init, [IPU_LIBS=-lipu], [echo "No libipu arou - AC_SUBST(IPU_CFLAGS) - AC_SUBST(IPU_LIBS) - -+AC_SEARCH_LIBS([shm_open], [rt], [SHM_LIBS="-lrt"]) -+AC_SUBST(SHM_LIBS) -+ - dnl of the POSIX Real-Time Extensions. - AC_CHECK_LIB(rt, clock_gettime) - AC_SUBST(RT_CFLAGS) -diff --git a/libs/Makefile.am b/libs/Makefile.am -index 2f56bba..5b30657 100755 ---- a/libs/Makefile.am -+++ b/libs/Makefile.am -@@ -42,7 +42,7 @@ libgstfsl_@GST_MAJORMINOR@_la_CFLAGS += -DIPULIB - endif - - libgstfsl_@GST_MAJORMINOR@_la_LDFLAGS = -version-info @GSTMXLIBS_VERSION@ --libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) -+libgstfsl_@GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) -lgstvideo-@GST_MAJORMINOR@ -lgstinterfaces-$(GST_MAJORMINOR) $(IPU_LIBS) $(RT_LIBS) $(SHM_LIBS) - - libgstfsl_@GST_MAJORMINOR@includedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/imx-mm - libgstfsl_@GST_MAJORMINOR@include_HEADERS = \ --- -1.8.1.4 - diff --git a/package.bak/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch b/package.bak/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch deleted file mode 100644 index 56352753a0..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/0005-Remove-use-of-obsolete-VIDIOC_DBG_G_CHIP_IDENT.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ce90794a3458af0aed43b8570cf44cd87900185d Mon Sep 17 00:00:00 2001 -From: Gary Bisson -Date: Fri, 25 Jul 2014 16:44:53 -0700 -Subject: [PATCH] Remove use of obsolete VIDIOC_DBG_G_CHIP_IDENT - -This ioctl should never be used in application as -stated in videodev2.h header. -Moreover, its use in this plugin was very limited. - -Signed-off-by: Gary Bisson ---- - src/misc/tvsrc/src/mfw_gst_tvsrc.c | 8 -------- - src/misc/v4l_source/src/mfw_gst_v4lsrc.c | 7 ------- - 2 files changed, 15 deletions(-) - -diff --git a/src/misc/tvsrc/src/mfw_gst_tvsrc.c b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -index 67e0cd2..f495b6f 100755 ---- a/src/misc/tvsrc/src/mfw_gst_tvsrc.c -+++ b/src/misc/tvsrc/src/mfw_gst_tvsrc.c -@@ -450,7 +450,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - struct v4l2_format fmt; - struct v4l2_control ctrl; - struct v4l2_streamparm parm; -- struct v4l2_dbg_chip_ident chip; - gint fd_v4l = 0; - struct v4l2_mxc_offset off; - gint in_width = 0, in_height = 0; -@@ -461,13 +460,6 @@ mfw_gst_tvsrc_capture_setup (MFWGstTVSRC * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- g_print ("VIDIOC_DBG_G_CHIP_IDENT failed.\n"); -- } else -- g_print ("sensor chip is %s\n", chip.match.name); -- -- -- - if (ioctl (fd_v4l, VIDIOC_G_STD, &id) < 0) { - g_print ("VIDIOC_G_STD failed\n"); - close (fd_v4l); -diff --git a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -index 2c2e838..85e7ff0 100755 ---- a/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -+++ b/src/misc/v4l_source/src/mfw_gst_v4lsrc.c -@@ -464,7 +464,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - struct v4l2_format fmt = {0}; - struct v4l2_control ctrl = {0}; - struct v4l2_streamparm parm = {0}; -- struct v4l2_dbg_chip_ident chip = {0}; - struct v4l2_frmsizeenum fszenum = {0}; - gint input; - gint fd_v4l = 0; -@@ -476,12 +475,6 @@ mfw_gst_v4lsrc_capture_setup (MFWGstV4LSrc * v4l_src) - return 0; - } - -- if (ioctl (fd_v4l, VIDIOC_DBG_G_CHIP_IDENT, &chip)) { -- GST_ERROR ("VIDIOC_DBG_G_CHIP_IDENT failed."); -- } else -- GST_INFO ("sensor chip is %s", chip.match.name); -- -- - if (v4l_src->crop_pixel) { - in_width = v4l_src->capture_width - (2 * v4l_src->crop_pixel); - in_height = v4l_src->capture_height - (2 * v4l_src->crop_pixel); --- -2.0.1 - diff --git a/package.bak/gstreamer/gst-fsl-plugins/Config.in b/package.bak/gstreamer/gst-fsl-plugins/Config.in deleted file mode 100644 index 8921aa33ba..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/Config.in +++ /dev/null @@ -1,104 +0,0 @@ -comment "gst-fsl-plugins needs an imx-specific Linux kernel to be built" - depends on BR2_arm && !BR2_LINUX_KERNEL - -comment "gst-fsl-plugins needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_GST_FSL_PLUGINS - bool "gst-fsl-plugins" - depends on BR2_LINUX_KERNEL - depends on BR2_arm # Only relevant for i.MX - depends on BR2_TOOLCHAIN_USES_GLIBC # imx-codec - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_IMX_VPUWRAP if BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_LIB - select BR2_PACKAGE_IMX_PARSER - select BR2_PACKAGE_IMX_CODEC - select BR2_PACKAGE_FREESCALE_IMX - help - GStreamer plugins for hardware-accelerated audio and video - parsers and codecs on i.MX platforms. It requires a kernel that - includes the i.MX specific headers to be built. - - To use the VPU, its firmware blob must be installed as well. This - can be found in the firmware-imx package in the "Hardware handling" - menu. - - This library is provided by Freescale as-is and doesn't have - an upstream. Pengutronix maintains gst-fsl-plugins at - git://git.pengutronix.de/git/imx/gst-plugins-fsl-vpu.git - but it diverges heavily from Freescale's original implementation. - -if BR2_PACKAGE_GST_FSL_PLUGINS -choice - prompt "i.MX platform" - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX25_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX27ADS - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX37_3STACK - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX50 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX51 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX53 - default BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 if BR2_PACKAGE_FREESCALE_IMX_PLATFORM_IMX6Q - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - bool "imx233" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX25_3STACK - bool "imx25" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX27ADS - bool "imx27" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - bool "imx28" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - bool "imx31" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - bool "imx35" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX37_3STACK - bool "imx37" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX50 - bool "imx50" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX51 - bool "imx51" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX53 - bool "imx53" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX5X - bool "imx5X" - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 - select BR2_PACKAGE_IMX_LIB_PLATFORM_IMX6Q - bool "imx6" - -endchoice - -config BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM - string - default "MX233" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX233 - default "MX25" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX25 - default "MX27" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX27 - default "MX28" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX28 - default "MX31" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX31 - default "MX35" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX35 - default "MX37" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX37 - default "MX50" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX50 - default "MX51" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX51 - default "MX53" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX53 - default "MX5X" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX5X - default "MX6" if BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM_MX6 -endif diff --git a/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash b/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash deleted file mode 100644 index f1d639142f..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 568883b2a1d8d32e4004cb3f123790d0b4286c91c1fac38c9dc8e20bd1250764 gst-fsl-plugins-4.0.3.tar.gz diff --git a/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk b/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk deleted file mode 100644 index 65993a278a..0000000000 --- a/package.bak/gstreamer/gst-fsl-plugins/gst-fsl-plugins.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# gst-fsl-plugins -# -################################################################################ - -GST_FSL_PLUGINS_VERSION = 4.0.3 -GST_FSL_PLUGINS_SITE = $(FREESCALE_IMX_SITE) - -# Most is LGPLv2+, but some sources are copied from upstream and are -# LGPLv2.1+, which essentially makes it LGPLv2.1+ -GST_FSL_PLUGINS_LICENSE = LGPLv2+, LGPLv2.1+, PROPRIETARY (asf.h) -GST_FSL_PLUGINS_LICENSE_FILES = COPYING-LGPL-2.1 COPYING-LGPL-2 - -GST_FSL_PLUGINS_INSTALL_STAGING = YES -GST_FSL_PLUGINS_AUTORECONF = YES - -GST_FSL_PLUGINS_DEPENDENCIES += host-pkgconf gstreamer gst-plugins-base \ - imx-lib imx-parser imx-codec - -ifeq ($(BR2_PACKAGE_FREESCALE_IMX_HAS_VPU),y) -GST_FSL_PLUGINS_DEPENDENCIES += imx-vpuwrap -endif - -GST_FSL_PLUGINS_CONF_ENV = \ - PLATFORM=$(BR2_PACKAGE_GST_FSL_PLUGINS_PLATFORM) \ - CROSS_ROOT="$(STAGING_DIR)" - -# needs access to imx-specific kernel headers -GST_FSL_PLUGINS_DEPENDENCIES += linux -GST_FSL_PLUGINS_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -idirafter $(LINUX_DIR)/include/uapi" - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GST_FSL_PLUGINS_DEPENDENCIES += xlib_libX11 -GST_FSL_PLUGINS_CONF_OPTS += --enable-x11 -else -GST_FSL_PLUGINS_CONF_OPTS += --disable-x11 -endif - -# Autoreconf requires an m4 directory to exist -define GST_FSL_PLUGINS_PATCH_M4 - mkdir -p $(@D)/m4 -endef - -GST_FSL_PLUGINS_POST_PATCH_HOOKS += GST_FSL_PLUGINS_PATCH_M4 - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-omapfb/Config.in b/package.bak/gstreamer/gst-omapfb/Config.in deleted file mode 100644 index cfe5bba6bc..0000000000 --- a/package.bak/gstreamer/gst-omapfb/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_GST_OMAPFB - bool "gst-omapfb" - depends on BR2_cortex_a8 - help - GStreamer plug-in to use OMAP framebuffer. - - http://github.com/felipec/gst-omapfb diff --git a/package.bak/gstreamer/gst-omapfb/gst-omapfb.hash b/package.bak/gstreamer/gst-omapfb/gst-omapfb.hash deleted file mode 100644 index 7d1c722de9..0000000000 --- a/package.bak/gstreamer/gst-omapfb/gst-omapfb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 56c719584d7a7ede5fc2053e8d1060f623b226a60672de0faba46fad646658a4 gst-omapfb-v1.0.tar.gz diff --git a/package.bak/gstreamer/gst-omapfb/gst-omapfb.mk b/package.bak/gstreamer/gst-omapfb/gst-omapfb.mk deleted file mode 100644 index c0bf690531..0000000000 --- a/package.bak/gstreamer/gst-omapfb/gst-omapfb.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# gst-omapfb -# -################################################################################ - -GST_OMAPFB_VERSION = v1.0 -GST_OMAPFB_SITE = $(call github,felipec,gst-omapfb,$(GST_OMAPFB_VERSION)) - -define GST_OMAPFB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e -endef - -define GST_OMAPFB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -e DESTDIR=$(TARGET_DIR) install -endef - -GST_OMAPFB_DEPENDENCIES = gstreamer - -$(eval $(generic-package)) diff --git a/package.bak/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch b/package.bak/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch deleted file mode 100644 index 9c32e46cce..0000000000 --- a/package.bak/gstreamer/gst-plugin-x170/0001-correct-CFLAGS.patch +++ /dev/null @@ -1,28 +0,0 @@ -The configure script is correctly getting the CFLAGS needed to compile a plugin -for gstreamer and storing them in GST_BASE_CFLAGS but the Makefiles are never -making use of those. - -We actually have to use AM_CPPFLAGS as AM_CFLAGS is used everywhere but on the -real compiling rule... - -Signed-off-by: Alexandre Belloni ---- - src/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 8cb51d1..6af5d91 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -5,6 +5,8 @@ - ############################################################################## - plugin_LTLIBRARIES = libgstx170.la - -+AM_CPPFLAGS = @GST_BASE_CFLAGS@ -+ - ############################################################################## - # for the next set of variables, rename the prefix if you renamed the .la, # - # e.g. libgstplugin_la_SOURCES => libmysomething_la_SOURCES # --- -1.8.1.2 - diff --git a/package.bak/gstreamer/gst-plugin-x170/Config.in b/package.bak/gstreamer/gst-plugin-x170/Config.in deleted file mode 100644 index 30036705b8..0000000000 --- a/package.bak/gstreamer/gst-plugin-x170/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GST_PLUGIN_X170 - bool "gst-plugin-x170" - depends on BR2_arm926t - # glibc toolchain includes WCHAR and threading for libglib2 - depends on BR2_TOOLCHAIN_USES_GLIBC # on2-8170-libs - depends on BR2_LINUX_KERNEL # on2-8170-libs - select BR2_PACKAGE_ON2_8170_LIBS - help - GStreamer plug-in to use the Hantro X170 video decoder present on - ATMEL AT91SAM9M10 SoC. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "gst-plugin-x170 needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.hash b/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.hash deleted file mode 100644 index 527c461656..0000000000 --- a/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 734ded3618246d946b53c2c8c7ab5a0961287485aaef5fb9bf874f93e3caa342 gst-plugin-x170-1.0.tar.gz diff --git a/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.mk b/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.mk deleted file mode 100644 index 378cd7a817..0000000000 --- a/package.bak/gstreamer/gst-plugin-x170/gst-plugin-x170.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gst-plugin-x170 -# -################################################################################ - -GST_PLUGIN_X170_VERSION = 1.0 -GST_PLUGIN_X170_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec - -GST_PLUGIN_X170_LICENSE = BSD-1c -#A license file is included but it is just a placeholder - -# There is no generated configure script in the tarball. -GST_PLUGIN_X170_AUTORECONF = YES -GST_PLUGIN_X170_AUTORECONF_OPTS = -Im4/ -GST_PLUGIN_X170_DEPENDENCIES = gstreamer libglib2 on2-8170-libs - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch b/package.bak/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch deleted file mode 100644 index 2c98c3e102..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/0001-opus-jpegformat-unbreak-non-debug-build.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1725e702a3622cb45c8142622dd419fa0c410ac9 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 12 Sep 2012 09:10:35 +0200 -Subject: [PATCH] gst-plugins-bad: opus + jpegformat: unbreak non-debug build - -opus + jpegformat plugin builds fail when gstreamer is configured with ---disable-gst-debug as they are checking the GST_DISABLE_DEBUG symbol -instead of GST_DISABLE_GST_DEBUG. - -Submitted upstream as https://bugzilla.gnome.org/show_bug.cgi?id=683850 - -Signed-off-by: Peter Korsgaard ---- - ext/opus/gstopusdec.c | 2 +- - ext/opus/gstopusenc.c | 4 ++-- - gst/jpegformat/gstjpegparse.c | 4 ++-- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/ext/opus/gstopusdec.c b/ext/opus/gstopusdec.c -index 0e2805c..ab7221d 100644 ---- a/ext/opus/gstopusdec.c -+++ b/ext/opus/gstopusdec.c -@@ -357,7 +357,7 @@ opus_dec_chain_parse_data (GstOpusDec * dec, GstBuffer * buffer) - - GST_DEBUG_OBJECT (dec, "Creating decoder with %d channels, %d Hz", - dec->n_channels, dec->sample_rate); --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - gst_opus_common_log_channel_mapping_table (GST_ELEMENT (dec), opusdec_debug, - "Mapping table", dec->n_channels, dec->channel_mapping); - #endif -diff --git a/ext/opus/gstopusenc.c b/ext/opus/gstopusenc.c -index 240a2cb..d991795 100644 ---- a/ext/opus/gstopusenc.c -+++ b/ext/opus/gstopusenc.c -@@ -589,7 +589,7 @@ gst_opus_enc_setup_channel_mappings (GstOpusEnc * enc, - } - } - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_INFO_OBJECT (enc, - "Mapping tables built: %d channels, %d stereo streams", enc->n_channels, - enc->n_stereo_streams); -@@ -654,7 +654,7 @@ gst_opus_enc_setup (GstOpusEnc * enc) - { - int error = OPUS_OK; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - GST_DEBUG_OBJECT (enc, - "setup: %d Hz, %d channels, %d stereo streams, family %d", - enc->sample_rate, enc->n_channels, enc->n_stereo_streams, -diff --git a/gst/jpegformat/gstjpegparse.c b/gst/jpegformat/gstjpegparse.c -index f984a52..b4af9ed 100644 ---- a/gst/jpegformat/gstjpegparse.c -+++ b/gst/jpegformat/gstjpegparse.c -@@ -545,7 +545,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - if (!gst_byte_reader_get_uint16_be (reader, &size)) - return FALSE; - --#ifndef GST_DISABLE_DEBUG -+#ifndef GST_DISABLE_GST_DEBUG - /* We'd pry the id of the skipped application segment */ - if (marker >= APP0 && marker <= APP15) { - const gchar *id_str = NULL; -@@ -561,7 +561,7 @@ gst_jpeg_parse_skip_marker (GstJpegParse * parse, - #else - GST_DEBUG_OBJECT (parse, "unhandled marker %x skiping %u bytes", marker, - size); --#endif // GST_DISABLE_DEBUG -+#endif // GST_DISABLE_GST_DEBUG - - if (!gst_byte_reader_skip (reader, size - 2)) - return FALSE; --- -1.7.10 - diff --git a/package.bak/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch b/package.bak/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch deleted file mode 100644 index b2057484cd..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/0002-fix-dfb-example.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix dfb-example - -Order of inclusion gives a strange effect on the definition of -gst_debug_log. Swapping the include statements solve it. - -Not upstreamed since there will be no more updates to this version -of gst-plugins-bad. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -diff -rup gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c ---- gst-plugins-bad-0.10.23/ext/directfb/dfb-example.c 2011-12-11 19:49:11.000000000 +0100 -+++ gst-plugins-bad-0.10.23.fixed/ext/directfb/dfb-example.c 2013-05-13 00:32:00.507469138 +0200 -@@ -1,7 +1,7 @@ - --#include - #include - #include -+#include - - static IDirectFB *dfb = NULL; - static IDirectFBSurface *primary = NULL; diff --git a/package.bak/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch b/package.bak/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch deleted file mode 100644 index 780b5e38e6..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/0003-drop-buggy-libvpx-legacy-handling.patch +++ /dev/null @@ -1,44 +0,0 @@ -[PATCH] vp8: drop buggy libvpx legacy handling - -Legacy handling for older libvpx versions were added back in 2010, but this -was unfortunately buggy as these symbols are enums and not defines - So they -are never defined and the legacy symbols always used. - -Now that the legacy symbols are completely removed from libvpx from v1.4.0 -onwards this breaks. Fix it by simply dropping the legacy handling, nobody -should be using libvpx versions from before 2010 (or gstreamer 0.10 for that -matter) any more. - -Signed-off-by: Peter Korsgaard ---- - ext/vp8/gstvp8utils.h | 17 ----------------- - 1 file changed, 17 deletions(-) - -Index: gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -=================================================================== ---- gst-plugins-bad-0.10.23.orig/ext/vp8/gstvp8utils.h -+++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h -@@ -25,23 +25,6 @@ - - G_BEGIN_DECLS - --/* Some compatibility defines for older libvpx versions */ --#ifndef VPX_IMG_FMT_I420 --#define VPX_IMG_FMT_I420 IMG_FMT_I420 --#endif -- --#ifndef VPX_PLANE_Y --#define VPX_PLANE_Y PLANE_Y --#endif -- --#ifndef VPX_PLANE_U --#define VPX_PLANE_U PLANE_U --#endif -- --#ifndef VPX_PLANE_V --#define VPX_PLANE_V PLANE_V --#endif -- - const char * gst_vpx_error_name (vpx_codec_err_t status); - - G_END_DECLS diff --git a/package.bak/gstreamer/gst-plugins-bad/Config.in b/package.bak/gstreamer/gst-plugins-bad/Config.in deleted file mode 100644 index d54415a170..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/Config.in +++ /dev/null @@ -1,338 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BAD - bool "gst-plugins-bad" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of plug-ins for GStreamer that may be of poor quality or - lacking some features. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BAD - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC - bool "adpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC - bool "adpcmenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF - bool "aiff" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX - bool "asfmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT - bool "autoconvert" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS - bool "audiovisualizers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER - bool "bayer" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN - bool "camerabin" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2 - bool "camerabin2" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE - bool "cdxaparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS - bool "coloreffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE - bool "colorspace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC - bool "dataurisrc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP - bool "dccp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK - depends on BR2_INSTALL_LIBSTDCPP - bool "decklink" - -comment "decklink needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF - bool "dtmf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU - bool "dvdspu" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY - bool "faceoverlay" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL - bool "festival" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS - bool "fieldanalysis" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB - bool "freeverb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE - bool "freeze" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R - bool "frei0r" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS - bool "gaudieffects" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM - bool "geometrictransform" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS - bool "gsettings" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE - bool "h264parse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE - bool "hdvparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS - bool "hls" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG - bool "id3tag" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER - bool "inter" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE - bool "interlace" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE - bool "ivfparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR - bool "jp2kdecimator" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT - bool "jpegformat" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE - bool "legacyresample" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB - bool "librfb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS - bool "linsys" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER - bool "liveadder" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX - bool "mpegdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX - bool "mpegpsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX - bool "mpegtsdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX - bool "mpegtsmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE - bool "mpegvideoparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE - bool "mve" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF - bool "mxf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF - bool "nsf" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX - bool "nuvdemux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT - bool "patchdetect" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE - bool "pcapparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM - bool "pnm" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE - bool "rawparse" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL - bool "real" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE - bool "removesilence" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX - bool "rtpmux" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8 - bool "rtpvp8" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO - bool "scaletempo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI - bool "sdi" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP - bool "sdp" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP - bool "segmentclip" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN - bool "siren" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH - bool "smooth" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED - bool "speed" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO - bool "stereo" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC - bool "subenc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA - bool "tta" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS - bool "videofilters" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE - bool "videomaxrate" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE - bool "videomeasure" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS - bool "videoparsers" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL - bool "videosignal" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC - bool "vmnc" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M - bool "y4m" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK - bool "apexsink" - select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2 - bool "bz2" - select BR2_PACKAGE_BZIP2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO - bool "cdaudio" - depends on !BR2_nios2 # libcdaudio - select BR2_PACKAGE_LIBCDAUDIO - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - depends on BR2_PACKAGE_DIRECTFB - default y - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB - bool "dvb" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV - bool "fbdev" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD - bool "faad" - select BR2_PACKAGE_FAAD2 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK - bool "musepack" - select BR2_PACKAGE_MUSEPACK - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON - bool "neon" - select BR2_PACKAGE_NEON - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG - bool "rsvg" - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - -comment "rsvg plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL - bool "sdl" - select BR2_PACKAGE_SDL - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE - bool "sndfile" - select BR2_PACKAGE_LIBSNDFILE - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD - bool "vcd" - -config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8 - bool "vp8" - depends on !BR2_bfin # libvpx - select BR2_PACKAGE_LIBVPX - -config BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR - bool "zbar" - depends on BR2_TOOLCHAIN_HAS_THREADS # zbar-> libv4l - depends on BR2_USE_MMU # zbar-> libv4l - depends on !BR2_STATIC_LIBS # zbar-> libv4l - depends on BR2_INSTALL_LIBSTDCPP # zbar-> libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # zbar-> libv4l - select BR2_PACKAGE_ZBAR - -comment "zbar plugin needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -endif diff --git a/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.hash b/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.hash deleted file mode 100644 index 760ed31c9c..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-0.10.23.tar.xz.md5 -md5 e4822fa2cc933768e2998311a1565979 gst-plugins-bad-0.10.23.tar.xz diff --git a/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.mk b/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.mk deleted file mode 100644 index 98e5c1cfb8..0000000000 --- a/package.bak/gstreamer/gst-plugins-bad/gst-plugins-bad.mk +++ /dev/null @@ -1,598 +0,0 @@ -################################################################################ -# -# gst-plugins-bad -# -################################################################################ - -GST_PLUGINS_BAD_VERSION = 0.10.23 -GST_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST_PLUGINS_BAD_VERSION).tar.xz -GST_PLUGINS_BAD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-bad -# COPYING.LIB is in fact v2, but most of the code is v2.1+ -GST_PLUGINS_BAD_LICENSE = LGPLv2.1+, GPLv2+ -GST_PLUGINS_BAD_LICENSE_FILES = COPYING.LIB COPYING - -GST_PLUGINS_BAD_CONF_OPTS = \ - --disable-examples - -GST_PLUGINS_BAD_DEPENDENCIES = gst-plugins-base gstreamer - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BAD_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AIFF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-aiff -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-aiff -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-asfmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-asfmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BAYER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bayer -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bayer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDXAPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_COLORSPACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-colorspace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-colorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DATAURISRC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DCCP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dccp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dccp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-decklink -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-decklink -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dtmf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dtmf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-festival -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-festival -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEZE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeze -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-freeverb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-freeverb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-frei0r -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-frei0r -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_GSETTINGS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-gsettings -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-gsettings -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_H264PARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-h264parse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-h264parse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HDVPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_HLS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-hls -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-hls -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-id3tag -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-id3tag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-inter -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-inter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-interlace -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-interlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LEGACYRESAMPLE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-legacyresample -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-legacyresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-librfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-librfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LINSYS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-linsys -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-linsys -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIVEADDER),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-liveadder -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-liveadder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MPEGVIDEOPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mpegvideoparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mpegvideoparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MVE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mve -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mve -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MXF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-mxf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-mxf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NSF),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nsf -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nsf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NUVDEMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PATCHDETECT),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_PNM),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-pnm -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-pnm -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rawparse -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rawparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-real -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-real -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-removesilence -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-removesilence -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPMUX),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpmux -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpmux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RTPVP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rtpvp8 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rtpvp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SCALETEMPO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-scaletempo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-scaletempo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDI),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdi -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdp -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SIREN),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-siren -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-siren -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-smooth -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-smooth -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SPEED),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-speed -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-speed -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-subenc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-subenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_STEREO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-stereo -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-stereo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TTA),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-tta -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-tta -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videofilters -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videofilters -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMAXRATE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomaxrate -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomaxrate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-videosignal -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-videosignal -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VMNC),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vmnc -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vmnc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_Y4M),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-y4m -endif - -# plugins with deps -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_APEXSINK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-apexsink -GST_PLUGINS_BAD_DEPENDENCIES += openssl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-apexsink -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_BZ2),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_BAD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CDAUDIO),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-cdaudio -GST_PLUGINS_BAD_DEPENDENCIES += libcdaudio -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-cdaudio -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_CURL),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-curl -GST_PLUGINS_BAD_DEPENDENCIES += libcurl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-curl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-directfb -GST_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVB),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-dvb -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-dvb -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FAAD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-faad -GST_PLUGINS_BAD_DEPENDENCIES += faad2 -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-faad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-fbdev -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-fbdev -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-libmms -GST_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-libmms -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-musepack -GST_PLUGINS_BAD_DEPENDENCIES += musepack -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-musepack -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_NEON),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-neon -GST_PLUGINS_BAD_DEPENDENCIES += neon -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-neon -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_OPUS),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-opus -GST_PLUGINS_BAD_DEPENDENCIES += opus -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_RSVG),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-rsvg -GST_PLUGINS_BAD_DEPENDENCIES += librsvg -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-rsvg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL),y) -GST_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config -GST_PLUGINS_BAD_CONF_OPTS += --enable-sdl -GST_PLUGINS_BAD_DEPENDENCIES += sdl -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-sndfile -GST_PLUGINS_BAD_DEPENDENCIES += libsndfile -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vcd -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vcd -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VP8),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-vp8 -GST_PLUGINS_BAD_DEPENDENCIES += libvpx -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-vp8 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_ZBAR),y) -GST_PLUGINS_BAD_CONF_OPTS += --enable-zbar -GST_PLUGINS_BAD_DEPENDENCIES += zbar -else -GST_PLUGINS_BAD_CONF_OPTS += --disable-zbar -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-plugins-base/0001-tremor.patch b/package.bak/gstreamer/gst-plugins-base/0001-tremor.patch deleted file mode 100644 index fa8785bed4..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/0001-tremor.patch +++ /dev/null @@ -1,139 +0,0 @@ -From 0088753651350de3060ece22c1be4153b6009515 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 25 Jan 2012 23:53:04 +0100 -Subject: [PATCH] base: vorbisdeclib: support modern Tremor versions - -Reported upstream as https://bugzilla.gnome.org/show_bug.cgi?id=668726 - -Tremor changed to use standard libogg rather than its own incompatible -copy back in Aug 2010 (r17375), causing gst-plugin-base build to fail. - -Tremolo so far unfortunately hasn't been updated. Restructure -vorbisdeclib.h so the legacy _ogg_packet_wrapper code is only used for -Tremolo. - -Signed-off-by: Peter Korsgaard ---- - ext/vorbis/gstvorbisdeclib.h | 77 ++++++++++++++++++++++------------------- - 1 files changed, 41 insertions(+), 36 deletions(-) - -diff --git a/ext/vorbis/gstvorbisdeclib.h b/ext/vorbis/gstvorbisdeclib.h -index ca00af9..e147591 100644 ---- a/ext/vorbis/gstvorbisdeclib.h -+++ b/ext/vorbis/gstvorbisdeclib.h -@@ -29,11 +29,6 @@ - - #ifndef TREMOR - --#include -- --typedef float vorbis_sample_t; --typedef ogg_packet ogg_packet_wrapper; -- - #define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to float audio" - - #define GST_VORBIS_DEC_SRC_CAPS \ -@@ -47,6 +42,42 @@ typedef ogg_packet ogg_packet_wrapper; - - #define GST_VORBIS_DEC_GLIB_TYPE_NAME GstVorbisDec - -+#else /* TREMOR */ -+ -+#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -+ -+#define GST_VORBIS_DEC_SRC_CAPS \ -+ GST_STATIC_CAPS ("audio/x-raw-int, " \ -+ "rate = (int) [ 1, MAX ], " \ -+ "channels = (int) [ 1, 6 ], " \ -+ "endianness = (int) BYTE_ORDER, " \ -+ "width = (int) { 16, 32 }, " \ -+ "depth = (int) 16, " \ -+ "signed = (boolean) true") -+ -+#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -+ -+/* we need a different type name here */ -+#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -+ -+/* and still have it compile */ -+typedef struct _GstVorbisDec GstIVorbisDec; -+typedef struct _GstVorbisDecClass GstIVorbisDecClass; -+ -+#endif /* TREMOR */ -+ -+#ifndef USE_TREMOLO -+ -+#ifdef TREMOR -+ #include -+ typedef ogg_int32_t vorbis_sample_t; -+#else -+ #include -+ typedef float vorbis_sample_t; -+#endif -+ -+typedef ogg_packet ogg_packet_wrapper; -+ - static inline guint8 * - gst_ogg_packet_data (ogg_packet * p) - { -@@ -72,17 +103,11 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return packet; - } - --#else -- --#ifdef USE_TREMOLO -- #include -- #include -- typedef ogg_int16_t vorbis_sample_t; --#else -- #include -- typedef ogg_int32_t vorbis_sample_t; --#endif -+#else /* USE_TREMOLO */ - -+#include -+#include -+typedef ogg_int16_t vorbis_sample_t; - typedef struct _ogg_packet_wrapper ogg_packet_wrapper; - - struct _ogg_packet_wrapper { -@@ -91,26 +116,6 @@ struct _ogg_packet_wrapper { - ogg_buffer buf; - }; - --#define GST_VORBIS_DEC_DESCRIPTION "decode raw vorbis streams to integer audio" -- --#define GST_VORBIS_DEC_SRC_CAPS \ -- GST_STATIC_CAPS ("audio/x-raw-int, " \ -- "rate = (int) [ 1, MAX ], " \ -- "channels = (int) [ 1, 6 ], " \ -- "endianness = (int) BYTE_ORDER, " \ -- "width = (int) { 16, 32 }, " \ -- "depth = (int) 16, " \ -- "signed = (boolean) true") -- --#define GST_VORBIS_DEC_DEFAULT_SAMPLE_WIDTH (16) -- --/* we need a different type name here */ --#define GST_VORBIS_DEC_GLIB_TYPE_NAME GstIVorbisDec -- --/* and still have it compile */ --typedef struct _GstVorbisDec GstIVorbisDec; --typedef struct _GstVorbisDecClass GstIVorbisDecClass; -- - /* compensate minor variation */ - #define vorbis_synthesis(a, b) vorbis_synthesis (a, b, 1) - -@@ -154,7 +159,7 @@ gst_ogg_packet_from_wrapper (ogg_packet_wrapper * packet) - return &(packet->packet); - } - --#endif -+#endif /* USE_TREMOLO */ - - typedef void (*CopySampleFunc)(vorbis_sample_t *out, vorbis_sample_t **in, - guint samples, gint channels, gint width); --- -1.7.8.3 - diff --git a/package.bak/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch b/package.bak/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch deleted file mode 100644 index eabea4f8ca..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/0002-audioresample-Fix-build-on-x86-if-emmintrin.h-is-ava.patch +++ /dev/null @@ -1,38 +0,0 @@ -From daa194b71ea6f9e8ee522ab02e8c56150b7e62b3 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot -Date: Mon, 20 Jan 2014 15:44:09 +0100 -Subject: [PATCH] audioresample: Fix build on x86 if emmintrin.h is available - but can't be used - -On i386, EMMINTRIN is defined but not usable without SSE so check for -__SSE__ and __SSE2__ as well. - -https://bugzilla.gnome.org/show_bug.cgi?id=670690 -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 98d006c..481fa01 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -77,13 +77,13 @@ - #define EXPORT G_GNUC_INTERNAL - - #ifdef _USE_SSE --#ifndef HAVE_XMMINTRIN_H -+#if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE - #endif - #endif - - #ifdef _USE_SSE2 --#ifndef HAVE_EMMINTRIN_H -+#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/package.bak/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch b/package.bak/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch deleted file mode 100644 index e67531d2f7..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/0003-audioresample-It-s-HAVE_EMMINTRIN_H-not-HAVE_XMMINTR.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 4e3d101aa854cfee633a9689efeb75e5001baa5e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= -Date: Mon, 20 Jan 2014 16:11:04 +0100 -Subject: [PATCH] audioresample: It's HAVE_EMMINTRIN_H, not HAVE_XMMINTRIN_H - for SSE2 - -Signed-off-by: Peter Korsgaard ---- - gst/audioresample/resample.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/audioresample/resample.c b/gst/audioresample/resample.c -index 481fa01..4410bdd 100644 ---- a/gst/audioresample/resample.c -+++ b/gst/audioresample/resample.c -@@ -83,7 +83,7 @@ - #endif - - #ifdef _USE_SSE2 --#if !defined(__SSE2__) || !defined(HAVE_XMMINTRIN_H) -+#if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) - #undef _USE_SSE2 - #endif - #endif --- -2.1.4 - diff --git a/package.bak/gstreamer/gst-plugins-base/Config.in b/package.bak/gstreamer/gst-plugins-base/Config.in deleted file mode 100644 index e9c8239f79..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/Config.in +++ /dev/null @@ -1,108 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_BASE - bool "gst-plugins-base" - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 - help - A basic set of well-supported plug-ins for GStreamer. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_BASE - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER - bool "adder" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - bool "app" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - bool "audioconvert (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE - bool "audiorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - bool "audioresample (mandatory for audio playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC - bool "audiotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING - bool "encoding" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE - bool "ffmpegcolorspace (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP - bool "gdp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK - bool "playback (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP - bool "tcp" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND - bool "typefind (mandatory)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC - bool "videotestsrc" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE - bool "videorate" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME - bool "volume (mandatory for audio playback)" - default y - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA - bool "alsa (mandatory for audio playback)" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_ALSA_LIB_PCM - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG - bool "ogg (*.ogg audio/video)" - select BR2_PACKAGE_LIBOGG - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO - bool "pango font renderer" - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - select BR2_PACKAGE_PANGO - -comment "pango plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE - bool "subparse" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA - bool "theora (*.ogg video)" - select BR2_PACKAGE_LIBTHEORA - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR - bool "tremor" - select BR2_PACKAGE_TREMOR - -config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS - bool "vorbis (*.ogg audio)" - select BR2_PACKAGE_LIBVORBIS - -endif diff --git a/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.hash b/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.hash deleted file mode 100644 index 77eba71bb5..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.36.tar.xz.md5 -md5 3d2337841b132fe996e5eb2396ac9438 gst-plugins-base-0.10.36.tar.xz diff --git a/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.mk b/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.mk deleted file mode 100644 index 51c22a90bb..0000000000 --- a/package.bak/gstreamer/gst-plugins-base/gst-plugins-base.mk +++ /dev/null @@ -1,196 +0,0 @@ -################################################################################ -# -# gst-plugins-base -# -################################################################################ - -GST_PLUGINS_BASE_VERSION = 0.10.36 -GST_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST_PLUGINS_BASE_VERSION).tar.xz -GST_PLUGINS_BASE_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-base -GST_PLUGINS_BASE_INSTALL_STAGING = YES -GST_PLUGINS_BASE_LICENSE = GPLv2+, LGPLv2+ -GST_PLUGINS_BASE_LICENSE_FILES = COPYING COPYING.LIB - -# freetype is only used by examples, but if it is not found -# and the host has a freetype-config script, then the host -# include dirs are added to the search path causing trouble -GST_PLUGINS_BASE_CONF_ENV = - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" - -GST_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-freetypetest - -GST_PLUGINS_BASE_DEPENDENCIES = gstreamer - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -GST_PLUGINS_BASE_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ALSA),y) -GST_PLUGINS_BASE_DEPENDENCIES += alsa-lib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-adder -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-adder -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-app -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-app -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audioresample -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audioresample -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-encoding -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-encoding -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_FFMPEGCOLORSPACE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ffmpegcolorspace -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ffmpegcolorspace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_GDP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-gdp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-gdp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-playback -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-playback -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-subparse -GST_PLUGINS_BASE_DEPENDENCIES += libxml2 -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-subparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TCP),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-tcp -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-tcp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-typefind -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-typefind -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videorate -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videorate -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-videoscale -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-videoscale -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-volume -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-volume -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_OGG),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ogg -GST_PLUGINS_BASE_DEPENDENCIES += libogg -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_PANGO),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-pango -GST_PLUGINS_BASE_DEPENDENCIES += pango -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-theora -GST_PLUGINS_BASE_DEPENDENCIES += libtheora -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis -GST_PLUGINS_BASE_DEPENDENCIES += tremor -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST_PLUGINS_BASE_CONF_OPTS += --enable-vorbis -GST_PLUGINS_BASE_DEPENDENCIES += libvorbis -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-vorbis -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST_PLUGINS_BASE_CONF_OPTS += --disable-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-plugins-good/0001-linux36.patch b/package.bak/gstreamer/gst-plugins-good/0001-linux36.patch deleted file mode 100644 index 5d7cd932ed..0000000000 --- a/package.bak/gstreamer/gst-plugins-good/0001-linux36.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix building with Linux headers 3.6 - -Signed-off-by: Markos Chandras - -From bfb1ac952b4c3caaba0297bbe7dc73ea92f9b292 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Thu, 09 Aug 2012 07:35:23 +0000 -Subject: v4l2: fix build with recent kernels, the v4l2_buffer input field was removed - -This was unused apparently and removed in the kernel in commit: - - From 2b719d7baf490e24ce7d817c6337b7c87fda84c1 Mon Sep 17 00:00:00 2001 - From: Sakari Ailus - Date: Wed, 2 May 2012 09:40:03 -0300 - Subject: [PATCH] [media] v4l: drop v4l2_buffer.input and V4L2_BUF_FLAG_INPUT - - Remove input field in struct v4l2_buffer and flag V4L2_BUF_FLAG_INPUT which - tells the former is valid. The flag is used by no driver currently. - -https://bugzilla.gnome.org/show_bug.cgi?id=681491 ---- -(limited to 'sys/v4l2/gstv4l2bufferpool.c') - -diff --git a/sys/v4l2/gstv4l2bufferpool.c b/sys/v4l2/gstv4l2bufferpool.c -index 2e3a563..5aaed5a 100644 ---- a/sys/v4l2/gstv4l2bufferpool.c -+++ b/sys/v4l2/gstv4l2bufferpool.c -@@ -182,7 +182,6 @@ gst_v4l2_buffer_new (GstV4l2BufferPool * pool, guint index, GstCaps * caps) - GST_LOG_OBJECT (pool->v4l2elem, " MMAP offset: %u", - ret->vbuffer.m.offset); - GST_LOG_OBJECT (pool->v4l2elem, " length: %u", ret->vbuffer.length); -- GST_LOG_OBJECT (pool->v4l2elem, " input: %u", ret->vbuffer.input); - - ret->mmap_length = ret->vbuffer.length; - data = (guint8 *) v4l2_mmap (0, ret->vbuffer.length, --- -cgit v0.9.0.2-2-gbebe diff --git a/package.bak/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch b/package.bak/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch deleted file mode 100644 index 62c3bb24e6..0000000000 --- a/package.bak/gstreamer/gst-plugins-good/0002-v4l2-fix-compilation-against-newer-kernel-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8e633d2059cb835448021cf79becb487aff10975 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Mon, 18 Mar 2013 14:59:35 +0000 -Subject: [PATCH] v4l2: fix compilation against newer kernel headers as on - FC19 - ---- - sys/v4l2/v4l2_calls.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sys/v4l2/v4l2_calls.c b/sys/v4l2/v4l2_calls.c -index 07d390a..4c10f4f 100644 ---- a/sys/v4l2/v4l2_calls.c -+++ b/sys/v4l2/v4l2_calls.c -@@ -291,8 +291,12 @@ gst_v4l2_fill_lists (GstV4l2Object * v4l2object) - break; - case V4L2_CID_HFLIP: - case V4L2_CID_VFLIP: -+#ifndef V4L2_CID_PAN_RESET - case V4L2_CID_HCENTER: -+#endif -+#ifndef V4L2_CID_TILT_RESET - case V4L2_CID_VCENTER: -+#endif - #ifdef V4L2_CID_PAN_RESET - case V4L2_CID_PAN_RESET: - #endif --- -1.7.10.4 - diff --git a/package.bak/gstreamer/gst-plugins-good/Config.in b/package.bak/gstreamer/gst-plugins-good/Config.in deleted file mode 100644 index 65f74e819d..0000000000 --- a/package.bak/gstreamer/gst-plugins-good/Config.in +++ /dev/null @@ -1,233 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_GOOD - bool "gst-plugins-good" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer under the preferred - license. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_GOOD - -config BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG - bool "jpeg (JPEG support)" - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PNG - bool "png (PNG support)" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2 - bool "bz2 support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_BZIP2 - help - Enable bz2 support for the following plugins: - matroska - -config BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB - bool "zlib support" - depends on BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_ZLIB - help - Enable zlib support for the following plugins: - id3demux, isomp4, matroska - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA - bool "alpha" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG - bool "apetag" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX - bool "audiofx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS - bool "audioparsers" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE - bool "auparse" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT - bool "autodetect" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI - bool "avi (*.avi video)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER - bool "cutter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS - bool "debugutils" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE - bool "deinterlace" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV - bool "effectv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER - bool "equalizer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV - bool "flv" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX - bool "flx" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM - bool "goom" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1 - bool "goom2k1" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX - bool "id3demux (*.mp3 audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX - bool "icydemux" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE - bool "imagefreeze" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE - bool "interleave" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4 - bool "isomp4" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW - bool "law" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL - bool "level" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA - bool "matroska" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE - bool "monoscope" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE - bool "multifile" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART - bool "multipart" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN - bool "replaygain" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP - bool "rtp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER - bool "rtpmanager" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP - bool "rtsp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE - bool "shapewipe" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE - bool "smpte" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM - bool "spectrum" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP - bool "udp" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX - bool "videobox" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP - bool "videocrop" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER - bool "videofilter" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER - bool "videomixer" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC - bool "wavenc" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE - bool "wavparse (*.wav audio)" - default y - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M - bool "y4m" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2 - bool "v4l2" - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX - bool "annodex (XML Library)" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO - bool "cairo" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC - bool "flac (libFLAC)" - depends on BR2_USE_WCHAR # flac - select BR2_PACKAGE_FLAC - -comment "flac needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF - bool "gdkpixbuf" - depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2 - select BR2_PACKAGE_GDK_PIXBUF - -comment "gdkpixbuf needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS - bool "ossaudio (OSS audio)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4 - bool "oss4 (Open Sound System 4)" - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE - depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio - depends on BR2_USE_MMU # pulseaudio - depends on !BR2_STATIC_LIBS # pulseaudio - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c - select BR2_PACKAGE_PULSEAUDIO - bool "pulseaudio" - -comment "pulseaudio support needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC - bool "souphttpsrc (http client)" - depends on BR2_USE_WCHAR # libsoup -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2 - select BR2_PACKAGE_LIBSOUP - -comment "souphttpsrc needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX - bool "speex" - select BR2_PACKAGE_SPEEX - -config BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK - bool "wavpack (*.wv audio)" - select BR2_PACKAGE_WAVPACK - -endif diff --git a/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.hash b/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.hash deleted file mode 100644 index 094dc87978..0000000000 --- a/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.31.tar.xz.md5 -md5 555845ceab722e517040bab57f9ace95 gst-plugins-good-0.10.31.tar.xz diff --git a/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.mk b/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.mk deleted file mode 100644 index a686caf604..0000000000 --- a/package.bak/gstreamer/gst-plugins-good/gst-plugins-good.mk +++ /dev/null @@ -1,394 +0,0 @@ -################################################################################ -# -# gst-plugins-good -# -################################################################################ - -GST_PLUGINS_GOOD_VERSION = 0.10.31 -GST_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST_PLUGINS_GOOD_VERSION).tar.xz -GST_PLUGINS_GOOD_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-good -GST_PLUGINS_GOOD_LICENSE = LGPLv2.1+ -GST_PLUGINS_GOOD_LICENSE_FILES = COPYING - -GST_PLUGINS_GOOD_CONF_OPTS = \ - --disable-examples \ - --disable-directsound \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-esd \ - --disable-esdtest \ - --disable-shout2 - -GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg -GST_PLUGINS_GOOD_DEPENDENCIES += jpeg -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PNG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-libpng -GST_PLUGINS_GOOD_DEPENDENCIES += libpng -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-libpng -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_BZ2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 -GST_PLUGINS_GOOD_DEPENDENCIES += bzip2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_ZLIB),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-zlib -GST_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-alpha -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-alpha -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-apetag -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-apetag -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-auparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-auparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_AVI),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-avi -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-avi -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cutter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cutter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-effectv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-effectv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLV),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flv -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flv -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flx -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flx -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-interleave -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-interleave -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LAW),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-law -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-law -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-level -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-level -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-matroska -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-matroska -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multifile -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multifile -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-multipart -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-multipart -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-smpte -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-smpte -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_UDP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-udp -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-udp -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videobox -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videobox -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-y4m -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-y4m -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_ANNODEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-annodex -GST_PLUGINS_GOOD_DEPENDENCIES += libxml2 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-annodex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-cairo -GST_PLUGINS_GOOD_DEPENDENCIES += cairo -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-cairo -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-flac -GST_PLUGINS_GOOD_DEPENDENCIES += flac -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf -GST_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-pulse -GST_PLUGINS_GOOD_DEPENDENCIES += pulseaudio -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-pulse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-soup -GST_PLUGINS_GOOD_DEPENDENCIES += libsoup -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-soup -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-speex -GST_PLUGINS_GOOD_DEPENDENCIES += speex -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack -GST_PLUGINS_GOOD_DEPENDENCIES += wavpack -else -GST_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gst-plugins-ugly/Config.in b/package.bak/gstreamer/gst-plugins-ugly/Config.in deleted file mode 100644 index 3d133cf3f1..0000000000 --- a/package.bak/gstreamer/gst-plugins-ugly/Config.in +++ /dev/null @@ -1,53 +0,0 @@ -menuconfig BR2_PACKAGE_GST_PLUGINS_UGLY - bool "gst-plugins-ugly" - select BR2_PACKAGE_GST_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer, but might pose - problems for distributors. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST_PLUGINS_UGLY - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX - bool "asfdemux" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC - bool "dvdlpcmdec" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB - bool "dvdsub" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958 - bool "iec958" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE - bool "mpegaudioparse" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM - bool "mpegstream" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA - bool "realmedia" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA - bool "synaesthesia" - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME - bool "lame (*.mp3 audio encoder)" - select BR2_PACKAGE_LAME - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD - bool "mad (*.mp3 audio)" - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_LIBMAD - -config BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC - bool "mpeg2dec" - select BR2_PACKAGE_LIBMPEG2 - -endif diff --git a/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash b/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash deleted file mode 100644 index 56f2a8c4bd..0000000000 --- a/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.19.tar.xz.md5 -md5 ba26045c8c8c91f0d48d327ccf53ac0c gst-plugins-ugly-0.10.19.tar.xz -# Locally computed -sha256 4934f65ff892637e7efaf1cfe635779189dde429d0706f40c86a3aac476ea873 gst-plugins-ugly-0.10.19.tar.xz -sha256 2a8aa4cd019fab333f1f8377bf7afa426d3038a033361d90fab70c335e9a53e7 cdio-cd-text-api.patch diff --git a/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk b/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk deleted file mode 100644 index 0f56164d46..0000000000 --- a/package.bak/gstreamer/gst-plugins-ugly/gst-plugins-ugly.mk +++ /dev/null @@ -1,90 +0,0 @@ -################################################################################ -# -# gst-plugins-ugly -# -################################################################################ - -GST_PLUGINS_UGLY_VERSION = 0.10.19 -GST_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST_PLUGINS_UGLY_VERSION).tar.xz -GST_PLUGINS_UGLY_SITE = http://gstreamer.freedesktop.org/src/gst-plugins-ugly -GST_PLUGINS_UGLY_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/gst-plugins-ugly0.10/cdio-cd-text-api.patch -# COPYING is in fact LGPLv2.1, but all of the code is v2+ -# (except for one test, xingmux) -GST_PLUGINS_UGLY_LICENSE = LGPLv2+, GPLv2+ (synaesthesia) -GST_PLUGINS_UGLY_LICENSE_FILES = COPYING - -GST_PLUGINS_UGLY_CONF_OPTS = \ - --disable-examples - -GST_PLUGINS_UGLY_DEPENDENCIES = gstreamer gst-plugins-base - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_IEC958),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-iec958 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-iec958 -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGAUDIOPARSE),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegaudioparse -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegaudioparse -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEGSTREAM),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpegstream -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpegstream -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_SYNAESTHESIA),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-synaesthesia -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-synaesthesia -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_LAME),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-lame -GST_PLUGINS_UGLY_DEPENDENCIES += lame -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-lame -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MAD),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mad -GST_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec -GST_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 -else -GST_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer/gstreamer.mk b/package.bak/gstreamer/gstreamer.mk deleted file mode 100644 index bc886c78a2..0000000000 --- a/package.bak/gstreamer/gstreamer.mk +++ /dev/null @@ -1 +0,0 @@ -include package/gstreamer/*/*.mk diff --git a/package.bak/gstreamer/gstreamer/0001-bison3.patch b/package.bak/gstreamer/gstreamer/0001-bison3.patch deleted file mode 100644 index f9ec52d95a..0000000000 --- a/package.bak/gstreamer/gstreamer/0001-bison3.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix deprecation from bison 3.0+ -From http://comments.gmane.org/gmane.linux.lfs.beyond.devel/24620 - -Signed-off-by: Gustavo Zacarias - -diff -Nura gstreamer-0.10.36.orig/gst/parse/grammar.y gstreamer-0.10.36/gst/parse/grammar.y ---- gstreamer-0.10.36.orig/gst/parse/grammar.y 2013-10-04 09:52:21.685282055 -0300 -+++ gstreamer-0.10.36/gst/parse/grammar.y 2013-10-04 10:21:54.800211238 -0300 -@@ -26,7 +26,6 @@ - */ - - #define YYERROR_VERBOSE 1 --#define YYLEX_PARAM scanner - - #define YYENABLE_NLS 0 - -@@ -648,6 +647,7 @@ - %right '.' - %left '!' '=' - -+%lex-param { void *scanner } - %parse-param { void *scanner } - %parse-param { graph_t *graph } - %pure-parser diff --git a/package.bak/gstreamer/gstreamer/Config.in b/package.bak/gstreamer/gstreamer/Config.in deleted file mode 100644 index eb1249ac5f..0000000000 --- a/package.bak/gstreamer/gstreamer/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -comment "gstreamer 0.10 needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GSTREAMER - bool "gstreamer 0.10" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - GStreamer is an open source multimedia framework. - - This 0.10.x version of GStreamer is incompatible with - GStreamer 1.X. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GSTREAMER - -config BR2_PACKAGE_GSTREAMER_GST_DEBUG - bool "enable gst-debug trace support" - default y - help - Enable support for the gst-debug tracing functionality in gstreamer. - This has limited CPU overhead, but does increase the rootfs size - somewhat. - -config BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY - bool "enable plugin registry" - default y - help - Enable support for the GStreamer plugin registry. This may increase - the launch-time for a GStreamer application. - -endif diff --git a/package.bak/gstreamer/gstreamer/gstreamer.hash b/package.bak/gstreamer/gstreamer/gstreamer.hash deleted file mode 100644 index 4fcf34ac32..0000000000 --- a/package.bak/gstreamer/gstreamer/gstreamer.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.36.tar.xz.md5 -md5 15389c73e091b1dda915279c388b9cb2 gstreamer-0.10.36.tar.xz -# locally computed -sha256 9151aa108c177054387885763fa0e433e76780f7c5655c70a5390f2a6c6871da gstreamer-0.10.36.tar.xz diff --git a/package.bak/gstreamer/gstreamer/gstreamer.mk b/package.bak/gstreamer/gstreamer/gstreamer.mk deleted file mode 100644 index cde7f8f62c..0000000000 --- a/package.bak/gstreamer/gstreamer/gstreamer.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# gstreamer -# -################################################################################ - -GSTREAMER_VERSION = 0.10.36 -GSTREAMER_SOURCE = gstreamer-$(GSTREAMER_VERSION).tar.xz -GSTREAMER_SITE = http://gstreamer.freedesktop.org/src/gstreamer -GSTREAMER_INSTALL_STAGING = YES -# COPYING is in fact v2, but most of the code is v2.1+ -GSTREAMER_LICENSE = LGPLv2.1+ -GSTREAMER_LICENSE_FILES = COPYING - -# Checking if unaligned memory access works correctly cannot be done when cross -# compiling. For the following architectures there is no information available -# in the configure script. -ifeq ($(BR2_arc)$(BR2_xtensa)$(BR2_microblaze)$(BR2_nios2)$(BR2_or1k),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=no -endif -ifeq ($(BR2_aarch64),y) -GSTREAMER_CONF_ENV = as_cv_unaligned_access=yes -endif - -GSTREAMER_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-loadsave \ - $(if $(BR2_PACKAGE_GSTREAMER_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER_PLUGIN_REGISTRY),,--disable-registry) - -GSTREAMER_DEPENDENCIES = libglib2 host-pkgconf host-bison host-flex \ - $(if $(BR2_PACKAGE_LIBXML2),libxml2) - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/Config.in b/package.bak/gstreamer1/Config.in deleted file mode 100644 index 23862bd8cb..0000000000 --- a/package.bak/gstreamer1/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -# Gstreamer 1.x & Plugins -source "package/gstreamer1/gstreamer1/Config.in" - -if BR2_PACKAGE_GSTREAMER1 -source "package/gstreamer1/gst1-plugins-base/Config.in" -source "package/gstreamer1/gst1-plugins-good/Config.in" -source "package/gstreamer1/gst1-plugins-bad/Config.in" -source "package/gstreamer1/gst1-plugins-ugly/Config.in" -source "package/gstreamer1/gst1-imx/Config.in" -source "package/gstreamer1/gst1-libav/Config.in" -source "package/gstreamer1/gst1-rtsp-server/Config.in" -source "package/gstreamer1/gst1-validate/Config.in" -source "package/gstreamer1/gst-omx/Config.in" -endif diff --git a/package.bak/gstreamer1/gst-omx/Config.in b/package.bak/gstreamer1/gst-omx/Config.in deleted file mode 100644 index d2e477648b..0000000000 --- a/package.bak/gstreamer1/gst-omx/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_GST_OMX - bool "gst-omx" - depends on BR2_PACKAGE_HAS_LIBOPENMAX - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - GStreamer plug-in to use OpenMAX API. - - http://cgit.freedesktop.org/gstreamer/gst-omx - -comment "gst-omx requires a OpenMAX implementation" - depends on !BR2_PACKAGE_HAS_LIBOPENMAX diff --git a/package.bak/gstreamer1/gst-omx/gst-omx.hash b/package.bak/gstreamer1/gst-omx/gst-omx.hash deleted file mode 100644 index dff9840455..0000000000 --- a/package.bak/gstreamer1/gst-omx/gst-omx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://gstreamer.freedesktop.org/src/gst-omx/gst-omx-1.10.4.tar.xz.sha256sum -sha256 45072925cf262f0fd528fab78f0de52734e46a5a88aa802fae51c67c09c81aa2 gst-omx-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst-omx/gst-omx.mk b/package.bak/gstreamer1/gst-omx/gst-omx.mk deleted file mode 100644 index 6ce7baad2f..0000000000 --- a/package.bak/gstreamer1/gst-omx/gst-omx.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# gst-omx -# -################################################################################ - -GST_OMX_VERSION = 1.10.4 -GST_OMX_SOURCE = gst-omx-$(GST_OMX_VERSION).tar.xz -GST_OMX_SITE = https://gstreamer.freedesktop.org/src/gst-omx - -GST_OMX_LICENSE = LGPLv2.1 -GST_OMX_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -GST_OMX_CONF_OPTS = \ - --with-omx-target=rpi -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -endif - -ifeq ($(BR2_PACKAGE_BELLAGIO),y) -GST_OMX_CONF_OPTS = \ - --with-omx-target=bellagio -GST_OMX_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) \ - -DOMX_VERSION_MAJOR=1 \ - -DOMX_VERSION_MINOR=1 \ - -DOMX_VERSION_REVISION=2 \ - -DOMX_VERSION_STEP=0" -endif - -GST_OMX_DEPENDENCIES = gstreamer1 gst1-plugins-base libopenmax - -# adjust library paths to where buildroot installs them -define GST_OMX_FIXUP_CONFIG_PATHS - find $(@D)/config -name gstomx.conf | \ - xargs $(SED) 's|/usr/local|/usr|g' -e 's|/opt/vc|/usr|g' -endef - -GST_OMX_POST_PATCH_HOOKS += GST_OMX_FIXUP_CONFIG_PATHS - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-imx/Config.in b/package.bak/gstreamer1/gst1-imx/Config.in deleted file mode 100644 index 9f792d1c82..0000000000 --- a/package.bak/gstreamer1/gst1-imx/Config.in +++ /dev/null @@ -1,87 +0,0 @@ -comment "gst1-imx needs a toolchain w/ dynamic library" - depends on BR2_arm - depends on BR2_STATIC_LIBS - -menuconfig BR2_PACKAGE_GST1_IMX - bool "gst1-imx" - depends on BR2_arm # Only relevant for i.MX - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - This is a set of GStreamer 1.0 plugins for plugins for Freescale's - i.MX platforms, which make use of the i.MX multimedia capabilities. - - https://github.com/Freescale/gstreamer-imx - -if BR2_PACKAGE_GST1_IMX - -config BR2_PACKAGE_GST1_IMX_EGLVISINK - bool "imxeglvivsink" - depends on BR2_PACKAGE_IMX_GPU_VIV - help - Elements leveraging the 3D GPU - -comment "imxeglvivsink needs the Vivante 3D libraries" - depends on !BR2_PACKAGE_IMX_GPU_VIV - -config BR2_PACKAGE_GST1_IMX_G2D - bool "imxg2d" - depends on BR2_PACKAGE_IMX_GPU_VIV_G2D - help - Elements leveraging the 2D GPU - -comment "imxg2d needs the Vivante 2D libraries" - depends on !BR2_PACKAGE_IMX_GPU_VIV_G2D - -config BR2_PACKAGE_GST1_IMX_IPU - bool "imxipu" - depends on BR2_LINUX_KERNEL - help - Elements leveraging the IPU - -comment "imxipu needs an imx-specific Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_GST1_IMX_MP3ENCODER - bool "mp3encoder" - depends on BR2_PACKAGE_IMX_CODEC - help - Elements for MP3 encoding - -comment "mp3encoder needs the i.MX codec binaries" - depends on !BR2_PACKAGE_IMX_CODEC - -config BR2_PACKAGE_GST1_IMX_PXP - bool "imxpxp" - depends on BR2_LINUX_KERNEL - help - Elements leveraging the PXP - -comment "imxpxp needs an imx-specific Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_GST1_IMX_UNIAUDIODEC - bool "uniaudiodec" - depends on BR2_PACKAGE_IMX_CODEC - help - Elements for audio decoding - -comment "uniaudiodec needs the i.MX codec binaries" - depends on !BR2_PACKAGE_IMX_CODEC - -config BR2_PACKAGE_GST1_IMX_VPU - bool "imxvpu" - depends on BR2_PACKAGE_LIBIMXVPUAPI - help - Elements leveraging the VPU - -comment "imxvpu needs the VPU imxvpuapi library" - depends on !BR2_PACKAGE_LIBIMXVPUAPI - -config BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC - bool "imxv4l2videosrc" - select BR2_PACKAGE_GST1_PLUGINS_BAD - help - Elements for V4L2 capture - -endif diff --git a/package.bak/gstreamer1/gst1-imx/gst1-imx.hash b/package.bak/gstreamer1/gst1-imx/gst1-imx.hash deleted file mode 100644 index e2e3971a2a..0000000000 --- a/package.bak/gstreamer1/gst1-imx/gst1-imx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 999c093e38768e51d14abbe7836c09b666bcb89f03f34dd3697a6e5b5e4a4086 gst1-imx-0.12.3.tar.gz diff --git a/package.bak/gstreamer1/gst1-imx/gst1-imx.mk b/package.bak/gstreamer1/gst1-imx/gst1-imx.mk deleted file mode 100644 index 88429aea2e..0000000000 --- a/package.bak/gstreamer1/gst1-imx/gst1-imx.mk +++ /dev/null @@ -1,92 +0,0 @@ -################################################################################ -# -# gst1-imx -# -################################################################################ - -GST1_IMX_VERSION = 0.12.3 -GST1_IMX_SITE = $(call github,Freescale,gstreamer-imx,$(GST1_IMX_VERSION)) - -GST1_IMX_LICENSE = LGPLv2+ -GST1_IMX_LICENSE_FILES = LICENSE - -GST1_IMX_INSTALL_STAGING = YES - -GST1_IMX_DEPENDENCIES += \ - host-pkgconf \ - gstreamer1 \ - gst1-plugins-base - -GST1_IMX_CONF_OPTS = --prefix="/usr" - -ifeq ($(BR2_LINUX_KERNEL),y) -# IPU and PXP need access to imx-specific kernel headers -GST1_IMX_DEPENDENCIES += linux -GST1_IMX_CONF_OPTS += --kernel-headers="$(LINUX_DIR)/include" -endif - -ifeq ($(BR2_PACKAGE_IMX_CODEC),y) -GST1_IMX_DEPENDENCIES += imx-codec -endif - -ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) -GST1_IMX_DEPENDENCIES += imx-gpu-viv -endif - -ifeq ($(BR2_PACKAGE_GST1_IMX_EGLVISINK),y) -# There's no --enable-eglvivsink option -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -GST1_IMX_DEPENDENCIES += xlib_libX11 -GST1_IMX_CONF_OPTS += --egl-platform=x11 -else -ifeq ($(BR2_PACKAGE_WAYLAND),y) -GST1_IMX_DEPENDENCIES += wayland -GST1_IMX_CONF_OPTS += --egl-platform=wayland -else -GST1_IMX_CONF_OPTS += --egl-platform=fb -endif -endif -else -GST1_IMX_CONF_OPTS += --disable-eglvivsink -endif - -# There's no --enable-g2d option -ifeq ($(BR2_PACKAGE_GST1_IMX_G2D),) -GST1_IMX_CONF_OPTS += --disable-g2d -endif - -# There's no --enable-ipu option -ifeq ($(BR2_PACKAGE_GST1_IMX_IPU),) -GST1_IMX_CONF_OPTS += --disable-ipu -endif - -# There's no --enable-mp3encoder option -ifeq ($(BR2_PACKAGE_GST1_IMX_MP3ENCODER),) -GST1_IMX_CONF_OPTS += --disable-mp3encoder -endif - -# There's no --enable-pxp option -ifeq ($(BR2_PACKAGE_GST1_IMX_PXP),) -GST1_IMX_CONF_OPTS += --disable-pxp -endif - -# There's no --enable-uniaudiodec option -ifeq ($(BR2_PACKAGE_GST1_IMX_UNIAUDIODEC),) -GST1_IMX_CONF_OPTS += --disable-uniaudiodec -endif - -ifeq ($(BR2_PACKAGE_GST1_IMX_VPU),y) -# There's no --enable-vpu option -GST1_IMX_DEPENDENCIES += libimxvpuapi -else -GST1_IMX_CONF_OPTS += --disable-vpu -endif - -ifeq ($(BR2_PACKAGE_GST1_IMX_V4L2VIDEOSRC),y) -# There's no --enable-v4l2src option -GST1_IMX_DEPENDENCIES += gst1-plugins-bad -else -GST1_IMX_CONF_OPTS += --disable-v4l2src -endif - -$(eval $(waf-package)) diff --git a/package.bak/gstreamer1/gst1-libav/Config.in b/package.bak/gstreamer1/gst1-libav/Config.in deleted file mode 100644 index 23d78b6ad1..0000000000 --- a/package.bak/gstreamer1/gst1-libav/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_GST1_LIBAV - bool "gst1-libav" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - GStreamer plugin (formerly gst-ffmpeg). - - This package contains GStreamer plugins based on - the libav project. - - The codecs, muxers, bitstreams and filters to build can be - selected in the ffmpeg package. - - http://gstreamer.freedesktop.org/ diff --git a/package.bak/gstreamer1/gst1-libav/gst1-libav.hash b/package.bak/gstreamer1/gst1-libav/gst1-libav.hash deleted file mode 100644 index cc83429f6a..0000000000 --- a/package.bak/gstreamer1/gst1-libav/gst1-libav.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-1.10.4.tar.xz.sha256sum -sha256 6ca0feca75e3d48315e07f20ec37cf6260ed1e9dde58df355febd5016246268b gst-libav-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-libav/gst1-libav.mk b/package.bak/gstreamer1/gst1-libav/gst1-libav.mk deleted file mode 100644 index 5726bb5d61..0000000000 --- a/package.bak/gstreamer1/gst1-libav/gst1-libav.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# gst1-libav -# -################################################################################ - -GST1_LIBAV_VERSION = 1.10.4 -GST1_LIBAV_SOURCE = gst-libav-$(GST1_LIBAV_VERSION).tar.xz -GST1_LIBAV_SITE = https://gstreamer.freedesktop.org/src/gst-libav -GST1_LIBAV_CONF_OPTS = --with-system-libav -GST1_LIBAV_DEPENDENCIES = \ - host-pkgconf ffmpeg gstreamer1 gst1-plugins-base \ - $(if $(BR2_PACKAGE_BZIP2),bzip2) \ - $(if $(BR2_PACKAGE_XZ),xz) -GST1_LIBAV_LICENSE = GPLv2+ -GST1_LIBAV_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-plugins-bad/Config.in b/package.bak/gstreamer1/gst1-plugins-bad/Config.in deleted file mode 100644 index 6bec362db0..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-bad/Config.in +++ /dev/null @@ -1,728 +0,0 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD - bool "gst1-plugins-bad" - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - A set of plug-ins for GStreamer that may be of poor quality or - lacking some features. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST1_PLUGINS_BAD - -comment "libraries with external dependencies" - -menuconfig BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL - bool "opengl" - depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES - -if BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - def_bool BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "The opengl library needs an API, a platform and a window system" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - -comment "APIs" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL - bool "opengl" - default y - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - -comment "opengl needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2 - bool "gles2" - default y - depends on BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - -comment "gles2 needs an OpenGL ES backend" - depends on !BR2_PACKAGE_HAS_LIBGLES - -comment "Platforms" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX - bool "glx" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X - depends on !BR2_PACKAGE_RPI_USERLAND # x11 - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - help - OpenGL Extension to the X Window System - -comment "glx not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - -comment "glx needs the opengl API and modular X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL || \ - !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - bool "egl" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API - depends on BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - -comment "egl needs an API and an EGL backend" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_API || \ - !BR2_PACKAGE_HAS_LIBEGL - -comment "Window systems" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - bool - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11 - bool "x11" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM - depends on !BR2_PACKAGE_RPI_USERLAND - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "x11 not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - -comment "x11 needs a platform and X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_PLATFORM || \ - !BR2_PACKAGE_XORG7) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND - bool "wayland" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - depends on BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - -comment "wayland needs the egl platform and the wayland package" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \ - !BR2_PACKAGE_WAYLAND - -config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX - bool "dispmanx" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL - depends on BR2_PACKAGE_RPI_USERLAND - select BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_HAS_WINDOW - help - Raspberry Pi's Dispmanx windowing system - -comment "dispmanx needs the egl platform and rpi-userland" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL || \ - !BR2_PACKAGE_RPI_USERLAND - -endif - -comment "opengl needs an OpenGL or OpenGL ES backend" - depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBGLES - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP - bool "accurip" - help - Accurip plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC - bool "adpcmdec" - help - ADPCM decoder - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC - bool "adpcmenc" - help - ADPCM encoder - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF - bool "aiff" - help - Create and parse Audio interchange File Format (AIFF) files - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX - bool "asfmux" - help - ASF Muxer Plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD - bool "audiofxbad" - help - Audio filters plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER - bool "audiomixer" - help - Audio mixer plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR - bool "compositor" - help - Video compositor plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS - bool "audiovisualizers" - help - Creates video visualizations of audio input - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT - bool "autoconvert" - help - Selects convertor element based on caps - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER - bool "bayer" - help - Elements to convert Bayer images - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2 - bool "camerabin2" - help - Take image snapshots and record movies from camera - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE - bool "cdxaparse" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS - bool "coloreffects" - help - Color Look-up Table filters - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC - bool "dataurisrc" - help - data: URI source - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP - bool "dccp" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS - bool "debugutils" - help - Collection of elements that may or may not be useful for debugging - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS - bool "dtls" - select BR2_PACKAGE_OPENSSL - help - DTLS plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY - bool "dvdsuboverlay" - help - DVB subtitle renderer plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU - bool "dvdspu" - help - DVD Sub-picture Overlay element - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY - bool "faceoverlay" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL - bool "festival" - help - Synthesizes plain text into audio - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS - bool "fieldanalysis" - help - Video field analysis - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB - bool "freeverb" - help - Reverberation/room effect - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R - bool "frei0r" - help - frei0r plugin library - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS - bool "gaudieffects" - help - Gaudi video effects - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM - bool "geometrictransform" - help - Various geometric image transform elements - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP - bool "gdp" - help - Payload/depayload GDP packets - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE - bool "hdvparse" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG - bool "id3tag" - help - ID3 v1 and v2 muxing plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER - bool "inter" - help - plugin for inter-pipeline communication - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE - bool "interlace" - help - Create an interlaced video stream - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE - bool "ivfparse" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC - bool "ivtc" - help - Inverse Telecine plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR - bool "jp2kdecimator" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT - bool "jpegformat" - help - JPEG interchange format plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB - bool "librfb" - help - Connects to a VNC server and decodes RFB stream - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI - bool "midi" - help - MIDI plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX - bool "mpegdemux" - help - MPEG-PS demuxer - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX - bool "mpegtsdemux" - help - MPEG TS demuxer - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX - bool "mpegtsmux" - help - MPEG-TS muxer - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX - bool "mpegpsmux" - help - MPEG-PS muxer - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE - bool "mve" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF - bool "mxf" - help - MXF plugin library - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NETSIM - bool "netsim" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX - bool "nuvdemux" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF - bool "onvif" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT - bool "patchdetect" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE - bool "pcapparse" - help - Element parsing raw pcap streams - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM - bool "pnm" - help - PNM plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE - bool "rawparse" - help - Parses byte streams into raw frames - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE - bool "removesilence" - help - Removes silence from an audio stream - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP - bool "rtmp" - select BR2_PACKAGE_RTMPDUMP - help - RTMP plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI - bool "sdi" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP - bool "sdp" - help - configure streaming sessions using SDP - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP - bool "segmentclip" - help - Segment clip elements - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN - bool "siren" - help - Siren encoder/decoder/payloader/depayloader plugins - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH - bool "smooth" - help - Apply a smooth filter to an image - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED - bool "speed" - help - Set speed/pitch on audio/raw streams (resampler) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC - bool "subenc" - help - subtitle encoders - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO - bool "stereo" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE - bool "timecode" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA - bool "tta" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS - bool "videofilters" - help - Video filters in gst-plugins-bad - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL - bool "videoframe_audiolevel" - help - videoframe_audiolevel - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE - bool "videomeasure" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS - bool "videoparsers" - help - videoparsers - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL - bool "videosignal" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC - bool "vmnc" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M - bool "y4m" - help - Demuxes/decodes YUV4MPEG streams - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF - bool "yadif" - help - YADIF deinterlacing filter - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK - bool "apexsink" - select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER - bool "assrender" - select BR2_PACKAGE_LIBASS - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2 - bool "bz2" - select BR2_PACKAGE_BZIP2 - help - Compress or decompress streams - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - help - libcurl-based elements - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH - bool "dash" - select BR2_PACKAGE_LIBXML2 - help - DASH demuxer plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK - depends on BR2_INSTALL_LIBSTDCPP - bool "decklink" - help - Blackmagic Decklink plugin - -comment "decklink needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB - bool "directfb" - depends on BR2_PACKAGE_DIRECTFB - default y - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB - bool "dvb" - select BR2_PACKAGE_DTV_SCAN_TABLES - # FEC_2_5 / QAM_4_NR definitions - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - help - DVB elements - -comment "dvb needs a toolchain w/ headers >= 3.7" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD - bool "faad" - select BR2_PACKAGE_FAAD2 - help - Free AAC Decoder (FAAD) - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV - bool "fbdev" - help - Linux framebuffer video sink - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC - bool "fdk-aac" - select BR2_PACKAGE_FDK_AAC - depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - help - MPEG AAC encoder/decoder - -comment "fdk-aac needs a toolchain w/ C++" - depends on BR2_PACKAGE_FDK_AAC_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL - bool "gl" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - -comment "gl needs the gst1-plugins-bad opengl library" - depends on !BR2_PACKAGE_GST1_PLUGINS_BAD_HAS_LIB_OPENGL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS - bool "hls" - select BR2_PACKAGE_NETTLE if !(BR2_PACKAGE_LIBGCRYPT || BR2_PACKAGE_OPENSSL) - help - Fragmented streaming plugins - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS - bool "kmssink" - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm -> libpthread-stubs - select BR2_PACKAGE_LIBDRM - help - KMS video sink - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # libmms -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libmms -> libglib2 - select BR2_PACKAGE_LIBMMS - help - Microsoft Multi Media Server streaming protocol support - -comment "libmms needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC - bool "mpeg2enc" - select BR2_PACKAGE_LIBMPEG2 - help - High-quality MPEG-1/2 video encoder - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK - bool "musepack" - select BR2_PACKAGE_MUSEPACK - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON - bool "neon" - select BR2_PACKAGE_NEON - help - lib neon http client src - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL - bool "openal" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS - select BR2_PACKAGE_OPENAL - -comment "openal plugin needs a toolchain w/ NPTL, C++" - depends on BR2_PAKCAGE_OPENAL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV - bool "opencv" - depends on BR2_PACKAGE_OPENCV - # Remove the following opencv modules when gstreamer fixes the - # problem of including the old "cv.h" header - # bug: https://bugzilla.gnome.org/show_bug.cgi?id=725163 - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_CONTRIB - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_FLANN - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_LEGACY - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - GStreamer OpenCV Plugins - -comment "opencv plugin needs OpenCV-2.4" - depends on !BR2_PACKAGE_OPENCV - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264 - bool "openh264" - depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP # libopenh264 - depends on !BR2_STATIC_LIBS # libopenh264 - depends on BR2_TOOLCHAIN_HAS_THREADS # libopenh264 - select BR2_PACKAGE_LIBOPENH264 - help - OpenH264 based encoding/decoding plugin - -comment "openh264 plugin needs a toolchain w/ C++, dynamic library, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG - bool "openjpeg" - select BR2_PACKAGE_OPENJPEG - help - GStreamer OpenJPEG plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - help - OPUS plugin library - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG - bool "rsvg" - depends on BR2_INSTALL_LIBSTDCPP # librsvg -> pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # librsvg -> pango -> harfbuzz - select BR2_PACKAGE_LIBRSVG - help - RSVG plugin library - -comment "rsvg plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC - bool "sbc" - select BR2_PACKAGE_SBC - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL - bool "sdl" - select BR2_PACKAGE_SDL - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM - bool "shm" - help - shared memory sink source - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE - bool "sndfile" - select BR2_PACKAGE_LIBSNDFILE - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP - bool "srtp" - select BR2_PACKAGE_LIBSRTP - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD - bool "vcd" - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC - bool "voaacenc" - select BR2_PACKAGE_VO_AACENC - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND - bool "wayland" - depends on BR2_PACKAGE_WAYLAND - default y - help - Wayland Video Sink - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP - bool "webp" - select BR2_PACKAGE_WEBP - help - Webp image format plugin - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC - bool "webrtc" - # All depends from webrtc-audio-processing - depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING - select BR2_PACKAGE_WEBRTC - help - WebRTC echo-cancellation, gain control and noise suppression - -comment "webrtc needs a toolchain w/ C++, NPTL, gcc >= 4.8" - depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265 - bool "x265" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # x265 - select BR2_PACKAGE_X265 - help - x265 encoding plugin - -comment "x265 needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS - -endif diff --git a/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash b/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash deleted file mode 100644 index 441afa2c52..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-1.10.4.tar.xz.sha256sum -sha256 23ddae506b3a223b94869a0d3eea3e9a12e847f94d2d0e0b97102ce13ecd6966 gst-plugins-bad-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk deleted file mode 100644 index 00add02af9..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +++ /dev/null @@ -1,844 +0,0 @@ -################################################################################ -# -# gst1-plugins-bad -# -################################################################################ - -GST1_PLUGINS_BAD_VERSION = 1.10.4 -GST1_PLUGINS_BAD_SOURCE = gst-plugins-bad-$(GST1_PLUGINS_BAD_VERSION).tar.xz -GST1_PLUGINS_BAD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-bad -GST1_PLUGINS_BAD_INSTALL_STAGING = YES -GST1_PLUGINS_BAD_LICENSE_FILES = COPYING COPYING.LIB -# Unknown and GPL licensed plugins will append to GST1_PLUGINS_BAD_LICENSE if -# enabled. -GST1_PLUGINS_BAD_LICENSE = LGPLv2+, LGPLv2.1+ - -GST1_PLUGINS_BAD_CONF_OPTS = \ - --disable-examples \ - --disable-valgrind \ - --disable-directsound \ - --disable-direct3d \ - --disable-winks \ - --disable-android_media \ - --disable-apple_media \ - --disable-sdltest \ - --disable-wininet \ - --disable-acm - -# Options which require currently unpackaged libraries -GST1_PLUGINS_BAD_CONF_OPTS += \ - --disable-avc \ - --disable-opensles \ - --disable-uvch264 \ - --disable-voamrwbenc \ - --disable-bs2b \ - --disable-chromaprint \ - --disable-dc1394 \ - --disable-dts \ - --disable-resindvd \ - --disable-faac \ - --disable-flite \ - --disable-gsm \ - --disable-fluidsynth \ - --disable-kate \ - --disable-ladspa \ - --disable-lv2 \ - --disable-libde265 \ - --disable-linsys \ - --disable-modplug \ - --disable-mimic \ - --disable-mplex \ - --disable-nas \ - --disable-ofa \ - --disable-openexr \ - --disable-openni2 \ - --disable-pvr \ - --disable-libvisual \ - --disable-timidity \ - --disable-teletextdec \ - --disable-wildmidi \ - --disable-smoothstreaming \ - --disable-soundtouch \ - --disable-spc \ - --disable-gme \ - --disable-xvid \ - --disable-vdpau \ - --disable-schro \ - --disable-zbar \ - --disable-spandsp \ - --disable-sndio \ - --disable-gtk3 \ - --disable-qt - -GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1 - -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -# RPI has odd locations for several required headers. -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) \ - -I$(STAGING_DIR)/usr/include/IL \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux" -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opengl -GST1_PLUGINS_BAD_DEPENDENCIES += libgl libglu -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opengl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLES2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gles2 -GST1_PLUGINS_BAD_DEPENDENCIES += libgles -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gles2 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_GLX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-glx -GST1_PLUGINS_BAD_DEPENDENCIES += xproto_glproto xlib_libXrender -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-glx -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_EGL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-egl -GST1_PLUGINS_BAD_DEPENDENCIES += libegl -GST1_PLUGINS_BAD_CONF_ENV += \ - CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags egl`" \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs egl`" -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-egl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_X11),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x11 -GST1_PLUGINS_BAD_DEPENDENCIES += xlib_libX11 xlib_libXext -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x11 -endif - -ifneq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_WAYLAND)$(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-wayland -GST1_PLUGINS_BAD_DEPENDENCIES += wayland -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-wayland -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_DISPMANX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dispmanx -GST1_PLUGINS_BAD_DEPENDENCIES += rpi-userland -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dispmanx -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_BAD_DEPENDENCIES += orc -GST1_PLUGINS_BAD_CONF_OPTS += --enable-orc -endif - -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -GST1_PLUGINS_BAD_DEPENDENCIES += bluez_utils -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bluez -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bluez -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ACCURIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-accurip -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-accurip -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMDEC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmdec -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ADPCMENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-adpcmenc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-adpcmenc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AIFF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-aiff -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-aiff -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASFMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-asfmux -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-asfmux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOFXBAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiofxbad -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiofxbad -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOMIXER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiomixer -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiomixer -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COMPOSITOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-compositor -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-compositor -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUDIOVISUALIZERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-audiovisualizers -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-audiovisualizers -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_AUTOCONVERT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-autoconvert -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-autoconvert -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BAYER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bayer -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bayer -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CAMERABIN2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-camerabin2 -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-camerabin2 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CDXAPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-cdxaparse -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-cdxaparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_COLOREFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-coloreffects -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-coloreffects -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DATAURISRC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dataurisrc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dataurisrc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DCCP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dccp -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dccp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-debugutils -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DTLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dtls -GST1_PLUGINS_BAD_DEPENDENCIES += openssl -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dtls -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVBSUBOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvbsuboverlay -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvbsuboverlay -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVDSPU),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvdspu -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvdspu -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FACEOVERLAY),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faceoverlay -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faceoverlay -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FESTIVAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-festival -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-festival -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FIELDANALYSIS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fieldanalysis -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fieldanalysis -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREEVERB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-freeverb -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-freeverb -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FREI0R),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-frei0r -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-frei0r -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GAUDIEFFECTS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gaudieffects -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gaudieffects -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GEOMETRICTRANSFORM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-geometrictransform -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-geometrictransform -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gdp -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gdp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HDVPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-hdvparse -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-hdvparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ID3TAG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-id3tag -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-id3tag -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-inter -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-inter -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_INTERLACE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-interlace -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-interlace -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVFPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivfparse -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivfparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_IVTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-ivtc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-ivtc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JP2KDECIMATOR),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jp2kdecimator -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jp2kdecimator -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_JPEGFORMAT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-jpegformat -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-jpegformat -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBRFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-librfb -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-librfb -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MIDI),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-midi -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-midi -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegdemux -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsdemux -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGTSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegtsmux -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegtsmux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEGPSMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpegpsmux -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpegpsmux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MVE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mve -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mve -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MXF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mxf -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mxf -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_NETSIM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-netsim -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-netsim -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NUVDEMUX),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-nuvdemux -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-nuvdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ONVIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-onvif -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-onvif -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PATCHDETECT),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-patchdetect -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-patchdetect -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PCAPPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pcapparse -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pcapparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_PNM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-pnm -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-pnm -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RAWPARSE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rawparse -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rawparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REMOVESILENCE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-removesilence -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-removesilence -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RTMP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rtmp -GST1_PLUGINS_BAD_DEPENDENCIES += rtmpdump -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rtmp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDI),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdi -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdi -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdp -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SEGMENTCLIP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-segmentclip -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-segmentclip -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SIREN),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-siren -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-siren -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SMOOTH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-smooth -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-smooth -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SPEED),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-speed -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-speed -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SUBENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-subenc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-subenc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_STEREO),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-stereo -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-stereo -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TIMECODE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-timecode -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-timecode -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_TTA),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-tta -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-tta -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFILTERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videofilters -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videofilters -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOFRAME_AUDIOLEVEL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoframe_audiolevel -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoframe_audiolevel -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOMEASURE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videomeasure -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videomeasure -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOPARSERS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videoparsers -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videoparsers -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VIDEOSIGNAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-videosignal -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-videosignal -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VMNC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vmnc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vmnc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_Y4M),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-y4m -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-y4m -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_YADIF),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-yadif -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-yadif -endif - -# Plugins with dependencies - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_APEXSINK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-apexsink -GST1_PLUGINS_BAD_DEPENDENCIES += openssl -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-apexsink -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_ASSRENDER),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-assrender -GST1_PLUGINS_BAD_DEPENDENCIES += libass -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-assrender -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_BZ2),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-bz2 -GST1_PLUGINS_BAD_DEPENDENCIES += bzip2 -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_CURL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-curl -GST1_PLUGINS_BAD_DEPENDENCIES += libcurl -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-curl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DASH),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dash -GST1_PLUGINS_BAD_DEPENDENCIES += libxml2 -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dash -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DECKLINK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-decklink -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-decklink -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-directfb -GST1_PLUGINS_BAD_DEPENDENCIES += directfb -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DVB),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-dvb -GST1_PLUGINS_BAD_DEPENDENCIES += dtv-scan-tables -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-dvb -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FAAD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-faad -GST1_PLUGINS_BAD_DEPENDENCIES += faad2 -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-faad -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FBDEV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fbdev -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fbdev -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_FDK_AAC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-fdk_aac -GST1_PLUGINS_BAD_DEPENDENCIES += fdk-aac -GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-fdk_aac -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_GL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-gl -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-gl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_HLS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-hls - -ifeq ($(BR2_PACKAGE_NETTLE),y) -GST1_PLUGINS_BAD_DEPENDENCIES += nettle -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=nettle -else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -GST1_PLUGINS_BAD_DEPENDENCIES += libgcrypt -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=libgcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -GST1_PLUGINS_BAD_DEPENDENCIES += openssl -GST1_PLUGINS_BAD_CONF_OPTS += --with-hls-crypto=openssl -endif - -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-hls -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_KMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-kms -GST1_PLUGINS_BAD_DEPENDENCIES += libdrm -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-kms -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_LIBMMS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-libmms -GST1_PLUGINS_BAD_DEPENDENCIES += libmms -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-libmms -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MPEG2ENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-mpeg2enc -GST1_PLUGINS_BAD_DEPENDENCIES += libmpeg2 -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-mpeg2enc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_MUSEPACK),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-musepack -GST1_PLUGINS_BAD_DEPENDENCIES += musepack -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-musepack -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_NEON),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-neon -GST1_PLUGINS_BAD_DEPENDENCIES += neon -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-neon -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENAL),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openal -GST1_PLUGINS_BAD_DEPENDENCIES += openal -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openal -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENCV),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opencv -GST1_PLUGINS_BAD_DEPENDENCIES += opencv -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opencv -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENH264),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openh264 -GST1_PLUGINS_BAD_DEPENDENCIES += libopenh264 -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openh264 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPENJPEG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-openjpeg -GST1_PLUGINS_BAD_DEPENDENCIES += openjpeg -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-openjpeg -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_OPUS),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-opus -GST1_PLUGINS_BAD_DEPENDENCIES += opus -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_RSVG),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-rsvg -GST1_PLUGINS_BAD_DEPENDENCIES += librsvg -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-rsvg -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SBC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sbc -GST1_PLUGINS_BAD_DEPENDENCIES += sbc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sbc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SDL),y) -GST1_PLUGINS_BAD_CONF_ENV += ac_cv_path_SDL_CONFIG=$(STAGING_DIR)/usr/bin/sdl-config -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sdl -GST1_PLUGINS_BAD_DEPENDENCIES += sdl -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SHM),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-shm -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-shm -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SNDFILE),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-sndfile -GST1_PLUGINS_BAD_DEPENDENCIES += libsndfile -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_SRTP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-srtp -GST1_PLUGINS_BAD_DEPENDENCIES += libsrtp -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-srtp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VCD),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-vcd -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-vcd -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_VOAACENC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-voaacenc -GST1_PLUGINS_BAD_DEPENDENCIES += vo-aacenc -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-voaacenc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBP),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webp -GST1_PLUGINS_BAD_DEPENDENCIES += webp -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WEBRTC),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-webrtc -GST1_PLUGINS_BAD_DEPENDENCIES += webrtc-audio-processing -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-webrtc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_X265),y) -GST1_PLUGINS_BAD_CONF_OPTS += --enable-x265 -GST1_PLUGINS_BAD_DEPENDENCIES += x265 -GST1_PLUGINS_BAD_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_BAD_CONF_OPTS += --disable-x265 -endif - -# Add GPL license if GPL licensed plugins enabled. -ifeq ($(GST1_PLUGINS_BAD_HAS_GPL_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += GPL -endif - -# Add Unknown license if Unknown licensed plugins enabled. -ifeq ($(GST1_PLUGINS_BAD_HAS_UNKNOWN_LICENSE),y) -GST1_PLUGINS_BAD_LICENSE += UNKNOWN -endif - -# Use the following command to extract license info for plugins. -# # find . -name 'plugin-*.xml' | xargs grep license - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-plugins-base/Config.in b/package.bak/gstreamer1/gst1-plugins-base/Config.in deleted file mode 100644 index 897c1d13ca..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-base/Config.in +++ /dev/null @@ -1,160 +0,0 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_BASE - bool "gst1-plugins-base" - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 - help - A basic set of well-supported plug-ins for GStreamer. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST1_PLUGINS_BASE - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER - bool "adder" - help - Adds multiple streams - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - bool "app" - help - Elements used to communicate with applications - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - bool "audioconvert (mandatory for audio playback)" - default y - help - Convert audio to different formats - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE - bool "audiorate" - help - Adjusts audio frames - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC - bool "audiotestsrc" - help - Creates audio test signals of given frequency and volume - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING - bool "encoding" - help - various encoding-related elements - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - bool "videoconvert" - help - Colorspace conversion - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO - bool "gio" - help - GIO elements - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND - bool "playback" - default y - help - various playback elements - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - bool "audioresample (mandatory for audio playback)" - default y - help - Resamples audio - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE - bool "subparse" - help - Subtitle parsing - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP - bool "tcp" - help - transfer data over the network via TCP - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND - bool "typefind" - default y - help - default typefind functions - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC - bool "videotestsrc" - help - Creates a test video stream - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE - bool "videorate" - help - Adjusts video frames - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - bool "videoscale (mandatory for video playback)" - default y - help - Resizes video - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME - bool "volume (mandatory for audio playback)" - default y - help - plugin for controlling audio volume - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA - bool "alsa (mandatory for audio playback)" - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_ALSA_LIB_PCM - select BR2_PACKAGE_ALSA_LIB_SEQ - help - ALSA plugin library - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR - bool "tremor" - select BR2_PACKAGE_TREMOR - help - Vorbis Tremor decoder - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG - bool "ogg (*.ogg audio/video)" - select BR2_PACKAGE_LIBOGG - help - ogg stream manipulation (info about ogg: http://xiph.org) - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - help - Opus codec for speech and audio. - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO - bool "pango font renderer" - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - select BR2_PACKAGE_PANGO - help - Pango-based text rendering and overlay - -comment "pango plugin needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA - bool "theora (*.ogg video)" - select BR2_PACKAGE_LIBTHEORA - help - Theora plugin library - -config BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS - bool "vorbis (*.ogg audio)" - select BR2_PACKAGE_LIBVORBIS - help - Vorbis plugin library - -endif diff --git a/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash b/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash deleted file mode 100644 index b526b1454b..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.10.4.tar.xz.sha256sum -sha256 f6d245b6b3d4cb733f81ebb021074c525ece83db0c10e932794b339b8d935eb7 gst-plugins-base-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk deleted file mode 100644 index 6ab63a3512..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ /dev/null @@ -1,214 +0,0 @@ -################################################################################ -# -# gst1-plugins-base -# -################################################################################ - -GST1_PLUGINS_BASE_VERSION = 1.10.4 -GST1_PLUGINS_BASE_SOURCE = gst-plugins-base-$(GST1_PLUGINS_BASE_VERSION).tar.xz -GST1_PLUGINS_BASE_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-base -GST1_PLUGINS_BASE_INSTALL_STAGING = YES -GST1_PLUGINS_BASE_LICENSE_FILES = COPYING.LIB -GST1_PLUGINS_BASE_LICENSE = LGPLv2+, LGPLv2.1+ - -# freetype is only used by examples, but if it is not found -# and the host has a freetype-config script, then the host -# include dirs are added to the search path causing trouble -GST1_PLUGINS_BASE_CONF_ENV = - FT2_CONFIG=/bin/false \ - ac_cv_header_stdint_t="stdint.h" - -# gio_unix_2_0 is only used for tests -GST1_PLUGINS_BASE_CONF_OPTS = \ - --disable-examples \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-gio_unix_2_0 \ - --disable-freetypetest \ - --disable-valgrind - -# Options which require currently unpackaged libraries -GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-cdparanoia \ - --disable-libvisual \ - --disable-iso-codes - -GST1_PLUGINS_BASE_DEPENDENCIES = gstreamer1 - -# These plugins are liste in the order from ./configure --help - -ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_BASE_DEPENDENCIES += orc -GST1_PLUGINS_BASE_CONF_OPTS += --enable-orc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-adder -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-adder -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-app -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-app -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioconvert -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioconvert -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiorate -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiorate -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audiotestsrc -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audiotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ENCODING),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-encoding -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-encoding -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoconvert -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoconvert -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_GIO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-gio -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-gio -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-playback -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-playback -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-audioresample -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-audioresample -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_SUBPARSE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-subparse -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-subparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TCP),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-tcp -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-tcp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TYPEFIND),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-typefind -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-typefind -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOTESTSRC),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videotestsrc -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videotestsrc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEORATE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videorate -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videorate -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-videoscale -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-videoscale -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-volume -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-volume -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -GST1_PLUGINS_BASE_DEPENDENCIES += zlib -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST1_PLUGINS_BASE_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST1_PLUGINS_BASE_CONF_OPTS += \ - --enable-x \ - --enable-xshm \ - --enable-xvideo -else -GST1_PLUGINS_BASE_CONF_OPTS += \ - --disable-x \ - --disable-xshm \ - --disable-xvideo -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA),y) -GST1_PLUGINS_BASE_DEPENDENCIES += alsa-lib -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_TREMOR),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ivorbis -GST1_PLUGINS_BASE_DEPENDENCIES += tremor -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ivorbis -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OPUS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-opus -GST1_PLUGINS_BASE_DEPENDENCIES += opus -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_OGG),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-ogg -GST1_PLUGINS_BASE_DEPENDENCIES += libogg -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PANGO),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-pango -GST1_PLUGINS_BASE_DEPENDENCIES += pango -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_THEORA),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-theora -GST1_PLUGINS_BASE_DEPENDENCIES += libtheora -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VORBIS),y) -GST1_PLUGINS_BASE_CONF_OPTS += --enable-vorbis -GST1_PLUGINS_BASE_DEPENDENCIES += libvorbis -else -GST1_PLUGINS_BASE_CONF_OPTS += --disable-vorbis -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-plugins-good/Config.in b/package.bak/gstreamer1/gst1-plugins-good/Config.in deleted file mode 100644 index 27f24f5e73..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-good/Config.in +++ /dev/null @@ -1,379 +0,0 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_GOOD - bool "gst1-plugins-good" - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7 - help - A set of well-supported plug-ins for GStreamer under the preferred - license. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST1_PLUGINS_GOOD - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG - bool "jpeg (JPEG support)" - select BR2_PACKAGE_JPEG - help - JPeg plugin library - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG - bool "png (PNG support)" - select BR2_PACKAGE_LIBPNG - help - PNG plugin library - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2 - bool "bz2 support" - depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_BZIP2 - help - Enable bz2 support for the following plugins: - matroska - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB - bool "zlib support" - depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX || BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA - select BR2_PACKAGE_ZLIB - help - Enable zlib support for the following plugins: - id3demux, isomp4, matroska - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA - bool "alpha" - help - adds an alpha channel to video - constant or via chroma-keying - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG - bool "apetag" - help - APEv1/2 tag reader - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX - bool "audiofx" - help - Audio effects plugin - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS - bool "audioparsers" - help - Parsers for various audio formats - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE - bool "auparse" - help - parses au streams - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT - bool "autodetect" - help - Plugin contains auto-detection plugins for video/audio in- and outputs - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI - bool "avi (*.avi video)" - default y - help - AVI stream handling - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER - bool "cutter" - help - Audio Cutter to split audio into non-silent bits - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS - bool "debugutils" - help - elements for testing and debugging - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE - bool "deinterlace" - help - Deinterlacer - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF - bool "dtmf" - help - DTMF plugin - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV - bool "effectv" - help - effect plugins from the effectv project - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER - bool "equalizer" - help - GStreamer audio equalizers - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV - bool "flv" - help - FLV muxing and demuxing plugin - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX - bool "flx" - help - FLC/FLI/FLX video decoder - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM - bool "goom" - help - GOOM visualization filter - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1 - bool "goom2k1" - help - GOOM 2k1 visualization filter - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX - bool "icydemux" - help - Demux ICY tags from a stream - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX - bool "id3demux (*.mp3 audio)" - help - Demux ID3v1 and ID3v2 tags from a file - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE - bool "imagefreeze" - help - Still frame stream generator - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE - bool "interleave" - help - Audio interleaver/deinterleaver - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 - bool "isomp4" - default y - help - ISO base media file format support (mp4, 3gpp, qt, mj2) - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW - bool "law" - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL - bool "level" - help - Audio level plugin - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA - bool "matroska" - help - Matroska and WebM stream handling - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE - bool "monoscope" - help - Monoscope visualization - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE - bool "multifile" - help - Reads/Writes buffers from/to sequentially named files - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART - bool "multipart" - help - multipart stream manipulation - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN - bool "replaygain" - help - ReplayGain volume normalization - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP - bool "rtp" - help - Real-time protocol plugins - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER - bool "rtpmanager" - help - RTP session management plugin library - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP - bool "rtsp" - help - transfer data via RTSP - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE - bool "shapewipe" - help - Shape Wipe transition filter - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE - bool "smpte" - help - Apply the standard SMPTE transitions on video images - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM - bool "spectrum" - help - Run an FFT on the audio signal, output spectrum data - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP - bool "udp" - help - transfer data via UDP - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX - bool "videobox" - help - resizes a video by adding borders or cropping - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP - bool "videocrop" - help - Crops video into a user-defined region - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER - bool "videofilter" - help - Video filters plugin - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER - bool "videomixer" - help - Video mixer - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC - bool "wavenc" - help - Encode raw audio into WAV - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE - bool "wavparse (*.wav audio)" - default y - help - Parse a .wav file into raw audio - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M - bool "y4m" - help - Encodes a YUV frame into the yuv4mpeg format (mjpegtools) - -comment "plugins with external dependencies" - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS - bool "ossaudio (OSS audio)" - help - OSS (Open Sound System) support for GStreamer - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4 - bool "oss4 (Open Sound System 4)" - help - Open Sound System (OSS) version 4 support for GStreamer - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 - bool "v4l2" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # multi planar api - help - elements for Video 4 Linux - -comment "v4l2 needs a toolchain w/ headers >= 3.0" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE - bool "v4l2-probe (m2m)" - depends on BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2 - help - Enables the V4L2 probe at plugin load time. This enables - support for v4l2 transform devices, such as m2m - devices. These plugins are registered as v4l2videoNconvert - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO - bool "cairo" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - help - Cairo-based elements - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC - bool "flac (libFLAC)" - depends on BR2_USE_WCHAR # flac - select BR2_PACKAGE_FLAC - help - The FLAC Lossless compressor Codec - -comment "flac needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF - bool "gdkpixbuf" - select BR2_PACKAGE_GDK_PIXBUF - depends on BR2_USE_WCHAR # gdk-pixbuf -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gdk-pixbuf -> libglib2 - help - GdkPixbuf-based image decoder, overlay and sink - -comment "gdkpixbuf needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE - depends on BR2_TOOLCHAIN_HAS_THREADS # pulseaudio - depends on BR2_USE_MMU # pulseaudio - depends on !BR2_STATIC_LIBS # pulseaudio - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c - select BR2_PACKAGE_PULSEAUDIO - bool "pulseaudio" - help - PulseAudio plugin library - -comment "pulseaudio support needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC - bool "souphttpsrc (http client)" - depends on BR2_USE_WCHAR # libsoup -> glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libsoup -> glib2 - select BR2_PACKAGE_LIBSOUP - help - libsoup HTTP client src/sink - -comment "souphttpsrc needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX - bool "speex" - select BR2_PACKAGE_SPEEX - help - Speex plugin library - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB - bool "taglib" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - select BR2_PACKAGE_TAGLIB - help - Taglib tagging plugin library - -comment "taglib needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX - bool "vpx (webm)" - select BR2_PACKAGE_LIBVPX - depends on !BR2_bfin # libvpx - depends on BR2_TOOLCHAIN_HAS_THREADS # libvpx - help - VP8 plugin - -comment "libvpx needs a toolchain w/ threads" - depends on !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK - bool "wavpack (*.wv audio)" - select BR2_PACKAGE_WAVPACK - help - Wavpack lossless/lossy audio format handling - -endif diff --git a/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash b/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash deleted file mode 100644 index 21ee18d15f..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.10.4.tar.xz.sha256sum -sha256 8a86c61434a8c44665365bd0b3557a040937d1f44bf69caee4e9ea816ce74d7e gst-plugins-good-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk b/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk deleted file mode 100644 index e25149a846..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-good/gst1-plugins-good.mk +++ /dev/null @@ -1,433 +0,0 @@ -################################################################################ -# -# gst1-plugins-good -# -################################################################################ - -GST1_PLUGINS_GOOD_VERSION = 1.10.4 -GST1_PLUGINS_GOOD_SOURCE = gst-plugins-good-$(GST1_PLUGINS_GOOD_VERSION).tar.xz -GST1_PLUGINS_GOOD_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-good -GST1_PLUGINS_GOOD_LICENSE_FILES = COPYING -GST1_PLUGINS_GOOD_LICENSE = LGPLv2.1+ - -GST1_PLUGINS_GOOD_CONF_OPTS = \ - --disable-valgrind \ - --disable-examples \ - --disable-directsound \ - --disable-waveform \ - --disable-sunaudio \ - --disable-osx_audio \ - --disable-osx_video \ - --disable-aalib \ - --disable-aalibtest \ - --disable-libcaca \ - --disable-esd \ - --disable-esdtest - - -# Options which require currently unpackaged libraries -GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-jack \ - --disable-libdv \ - --disable-dv1394 \ - --disable-shout2 - -GST1_PLUGINS_GOOD_DEPENDENCIES = gstreamer1 gst1-plugins-base - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --with-libv4l2 -GST1_PLUGINS_GOOD_DEPENDENCIES += libv4l -else -GST1_PLUGINS_GOOD_CONF_OPTS += --without-libv4l2 -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-orc -GST1_PLUGINS_GOOD_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ALPHA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-alpha -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-alpha -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_APETAG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-apetag -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-apetag -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOFX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audiofx -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audiofx -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUDIOPARSERS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-audioparsers -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-audioparsers -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-auparse -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-auparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AUTODETECT),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-autodetect -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-autodetect -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_AVI),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-avi -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-avi -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CUTTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cutter -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cutter -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEBUGUTILS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-debugutils -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-debugutils -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DEINTERLACE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-deinterlace -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-deinterlace -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_DTMF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-dtmf -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-dtmf -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EFFECTV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-effectv -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-effectv -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_EQUALIZER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-equalizer -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-equalizer -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLV),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flv -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flv -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flx -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flx -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GOOM2K1),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-goom2k1 -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-goom2k1 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ICYDEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-icydemux -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-icydemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ID3DEMUX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-id3demux -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-id3demux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_IMAGEFREEZE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-imagefreeze -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-imagefreeze -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_INTERLEAVE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-interleave -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-interleave -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-isomp4 -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-isomp4 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LAW),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-law -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-law -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_LEVEL),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-level -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-level -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MATROSKA),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-matroska -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-matroska -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MONOSCOPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-monoscope -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-monoscope -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIFILE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multifile -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multifile -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_MULTIPART),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-multipart -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-multipart -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_REPLAYGAIN),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-replaygain -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-replaygain -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtp -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtpmanager -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtpmanager -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-rtsp -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-rtsp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SHAPEWIPE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-shapewipe -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-shapewipe -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SMPTE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-smpte -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-smpte -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPECTRUM),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-spectrum -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-spectrum -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-udp -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-udp -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOBOX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videobox -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videobox -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOCROP),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videocrop -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videocrop -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOFILTER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videofilter -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videofilter -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VIDEOMIXER),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-videomixer -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-videomixer -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVENC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavenc -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavenc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPARSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavparse -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavparse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_Y4M),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-y4m -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-y4m -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_OSS4),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-oss4 -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-oss4 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gst_v4l2 -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gst_v4l2 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_V4L2_PROBE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-v4l2-probe -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-v4l2-probe -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -GST1_PLUGINS_GOOD_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXv -GST1_PLUGINS_GOOD_CONF_OPTS += \ - --enable-x \ - $(if $(BR2_PACKAGE_XLIB_LIBXFIXES),xlib_libXfixes) \ - $(if $(BR2_PACKAGE_XLIB_LIBXDAMAGE),xlib_libXdamage) -else -GST1_PLUGINS_GOOD_CONF_OPTS += \ - --disable-x -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_CAIRO),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-cairo -GST1_PLUGINS_GOOD_DEPENDENCIES += cairo -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-cairo -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_FLAC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-flac -GST1_PLUGINS_GOOD_DEPENDENCIES += flac -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_GDKPIXBUF),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-gdk_pixbuf -GST1_PLUGINS_GOOD_DEPENDENCIES += gdk-pixbuf -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-gdk_pixbuf -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_JPEG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-jpeg -GST1_PLUGINS_GOOD_DEPENDENCIES += jpeg -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PNG),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-libpng -GST1_PLUGINS_GOOD_DEPENDENCIES += libpng -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-libpng -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_PULSE),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-pulse -GST1_PLUGINS_GOOD_DEPENDENCIES += pulseaudio -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-pulse -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SOUPHTTPSRC),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-soup -GST1_PLUGINS_GOOD_DEPENDENCIES += libsoup -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-soup -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_SPEEX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-speex -GST1_PLUGINS_GOOD_DEPENDENCIES += speex -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_TAGLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-taglib -GST1_PLUGINS_GOOD_DEPENDENCIES += taglib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-taglib -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_VPX),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-vpx -GST1_PLUGINS_GOOD_DEPENDENCIES += libvpx -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-vpx -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_WAVPACK),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-wavpack -GST1_PLUGINS_GOOD_DEPENDENCIES += wavpack -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-wavpack -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_ZLIB),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-zlib -GST1_PLUGINS_GOOD_DEPENDENCIES += zlib -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_GOOD_BZ2),y) -GST1_PLUGINS_GOOD_CONF_OPTS += --enable-bz2 -GST1_PLUGINS_GOOD_DEPENDENCIES += bzip2 -else -GST1_PLUGINS_GOOD_CONF_OPTS += --disable-bz2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-plugins-ugly/Config.in b/package.bak/gstreamer1/gst1-plugins-ugly/Config.in deleted file mode 100644 index f30163aa0a..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-ugly/Config.in +++ /dev/null @@ -1,80 +0,0 @@ -menuconfig BR2_PACKAGE_GST1_PLUGINS_UGLY - bool "gst1-plugins-ugly" - select BR2_PACKAGE_GST1_PLUGINS_BASE - help - A set of well-supported plug-ins for GStreamer, but might pose - problems for distributors. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GST1_PLUGINS_UGLY - -comment "dependency-less plugins" - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX - bool "asfdemux" - help - Demuxes and muxes audio and video in Microsofts ASF format - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC - bool "dvdlpcmdec" - help - Decode DVD LPCM frames into standard PCM - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB - bool "dvdsub" - help - DVD subtitle parser and decoder - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_XINGMUX - bool "xingmux" - help - Add XING tags to mpeg audio files - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA - bool "realmedia" - help - RealMedia support plugins - -comment "plugins with external dependencies (there may be more available)" - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD - bool "dvdread" - select BR2_PACKAGE_LIBDVDREAD - help - Access a DVD with dvdread - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME - bool "lame (*.mp3 audio encoder)" - select BR2_PACKAGE_LAME - help - Encode MP3s with LAME - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD - bool "mad (*.mp3 audio)" - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_LIBMAD - help - mp3 decoding based on the mad library - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123 - bool "mpg123 (*.mp3 audio)" - select BR2_PACKAGE_MPG123 - help - mp3 decoding based on the mpg123 library - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC - bool "mpeg2dec" - select BR2_PACKAGE_LIBMPEG2 - help - LibMpeg2 decoder - -config BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264 - bool "x264" - select BR2_PACKAGE_X264 - help - x264 encoder - -# Note: to get descriptions use the following. -# # find . -name 'plugin-*.xml' | xargs grep -m 1 description -endif diff --git a/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash b/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash deleted file mode 100644 index 9567d9ca0c..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-1.10.4.tar.xz.sha256sum -sha256 6386c77ca8459cba431ed0b63da780c7062c7cc48055d222024d8eaf198ffa59 gst-plugins-ugly-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk b/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk deleted file mode 100644 index d503555cf4..0000000000 --- a/package.bak/gstreamer1/gst1-plugins-ugly/gst1-plugins-ugly.mk +++ /dev/null @@ -1,119 +0,0 @@ -################################################################################ -# -# gst1-plugins-ugly -# -################################################################################ - -GST1_PLUGINS_UGLY_VERSION = 1.10.4 -GST1_PLUGINS_UGLY_SOURCE = gst-plugins-ugly-$(GST1_PLUGINS_UGLY_VERSION).tar.xz -GST1_PLUGINS_UGLY_SITE = https://gstreamer.freedesktop.org/src/gst-plugins-ugly -GST1_PLUGINS_UGLY_LICENSE_FILES = COPYING -# GPL licensed plugins will append to GST1_PLUGINS_UGLY_LICENSE if enabled. -GST1_PLUGINS_UGLY_LICENSE = LGPLv2.1+ - -GST1_PLUGINS_UGLY_CONF_OPTS = --disable-examples --disable-valgrind - -GST1_PLUGINS_UGLY_CONF_OPTS += \ - --disable-a52dec \ - --disable-amrnb \ - --disable-amrwb \ - --disable-cdio \ - --disable-sidplay \ - --disable-twolame - -GST1_PLUGINS_UGLY_DEPENDENCIES = gstreamer1 gst1-plugins-base - -ifeq ($(BR2_PACKAGE_ORC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-orc -GST1_PLUGINS_UGLY_DEPENDENCIES += orc -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_ASFDEMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-asfdemux -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-asfdemux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDLPCMDEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdlpcmdec -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdlpcmdec -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDSUB),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdsub -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdsub -endif - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_UGL1_PLUGIN_XINGMUX),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-xingmux -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-xingmux -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_REALMEDIA),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-realmedia -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-realmedia -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_DVDREAD),y) -# configure does not use pkg-config to detect libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDCSS)$(BR2_STATIC_LIBS),yy) -GST1_PLUGINS_UGLY_CONF_ENV += LIBS="-ldvdcss" -endif -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-dvdread -GST1_PLUGINS_UGLY_DEPENDENCIES += libdvdread -GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-dvdread -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_LAME),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-lame -GST1_PLUGINS_UGLY_DEPENDENCIES += lame -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-lame -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MAD),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mad -GST1_PLUGINS_UGLY_DEPENDENCIES += libid3tag libmad -GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPG123),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpg123 -GST1_PLUGINS_UGLY_DEPENDENCIES += mpg123 -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpg123 -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_MPEG2DEC),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-mpeg2dec -GST1_PLUGINS_UGLY_DEPENDENCIES += libmpeg2 -GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-mpeg2dec -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_UGLY_PLUGIN_X264),y) -GST1_PLUGINS_UGLY_CONF_OPTS += --enable-x264 -GST1_PLUGINS_UGLY_DEPENDENCIES += x264 -GST1_PLUGINS_UGLY_HAS_GPL_LICENSE = y -else -GST1_PLUGINS_UGLY_CONF_OPTS += --disable-x264 -endif - -# Add GPL license if GPL plugins enabled. -ifeq ($(GST1_PLUGINS_UGLY_HAS_GPL_LICENSE),y) -GST1_PLUGINS_UGLY_LICENSE += GPLv2 -endif - -# Use the following command to extract license info for plugins. -# # find . -name 'plugin-*.xml' | xargs grep license - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-rtsp-server/Config.in b/package.bak/gstreamer1/gst1-rtsp-server/Config.in deleted file mode 100644 index 5869952f58..0000000000 --- a/package.bak/gstreamer1/gst1-rtsp-server/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_GST1_RTSP_SERVER - bool "gst1-rtsp-server" - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP # runtime - select BR2_PACKAGE_GST1_PLUGINS_GOOD - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTP # runtime - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTPMANAGER # runtime - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_UDP # runtime - help - RTSP server library based on GStreamer. - - http://gstreamer.freedesktop.org/ diff --git a/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash b/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash deleted file mode 100644 index d4c540d690..0000000000 --- a/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-1.10.4.tar.xz.sha256sum -sha256 2f6e12fd4e3568ee190dc24e57e4c3a878971c3a3fb6904a9674404fac256de6 gst-rtsp-server-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk b/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk deleted file mode 100644 index bfdd4c433a..0000000000 --- a/package.bak/gstreamer1/gst1-rtsp-server/gst1-rtsp-server.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# gst1-rtsp-server -# -################################################################################ - -GST1_RTSP_SERVER_VERSION = 1.10.4 -GST1_RTSP_SERVER_SOURCE = gst-rtsp-server-$(GST1_RTSP_SERVER_VERSION).tar.xz -GST1_RTSP_SERVER_SITE = http://gstreamer.freedesktop.org/src/gst-rtsp-server -GST1_RTSP_SERVER_LICENSE = LGPLv2+ -GST1_RTSP_SERVER_LICENSE_FILES = COPYING COPYING.LIB -GST1_RTSP_SERVER_INSTALL_STAGING = YES -GST1_RTSP_SERVER_DEPENDENCIES = \ - host-pkgconf \ - gstreamer1 \ - gst1-plugins-base \ - gst1-plugins-good - -ifeq ($(BR2_PACKAGE_LIBCGROUP),y) -GST1_RTSP_SERVER_DEPENDENCIES += libcgroup -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD),y) -GST1_RTSP_SERVER_DEPENDENCIES += gst1-plugins-bad -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gst1-validate/Config.in b/package.bak/gstreamer1/gst1-validate/Config.in deleted file mode 100644 index 2022d38d99..0000000000 --- a/package.bak/gstreamer1/gst1-validate/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_GST1_VALIDATE - bool "gst1-validate" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_JSON_GLIB - select BR2_PACKAGE_PYTHON_PYEXPAT - # cairo is autodetected but needs PNG support - select BR2_PACKAGE_CAIRO_PNG if BR2_PACKAGE_CAIRO - help - GstValidate is a tool that allows GStreamer developers to - check that the GstElements they write behave the way they - are supposed to. - - http://gstreamer.freedesktop.org/ - -comment "gst1-validate depends on python" - depends on !BR2_PACKAGE_PYTHON diff --git a/package.bak/gstreamer1/gst1-validate/gst1-validate.hash b/package.bak/gstreamer1/gst1-validate/gst1-validate.hash deleted file mode 100644 index 10c6667357..0000000000 --- a/package.bak/gstreamer1/gst1-validate/gst1-validate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gst-validate/gst-validate-1.10.4.tar.xz.sha256sum -sha256 e59c00bf64cca9c477cdb44eb8dd0b3aac5499b17d77bf28ee054fd211e8d73c gst-validate-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gst1-validate/gst1-validate.mk b/package.bak/gstreamer1/gst1-validate/gst1-validate.mk deleted file mode 100644 index cf7a8aff5c..0000000000 --- a/package.bak/gstreamer1/gst1-validate/gst1-validate.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# gst1-validate -# -################################################################################ - -GST1_VALIDATE_VERSION = 1.10.4 -GST1_VALIDATE_SOURCE = gst-validate-$(GST1_VALIDATE_VERSION).tar.xz -GST1_VALIDATE_SITE = https://gstreamer.freedesktop.org/src/gst-validate -GST1_VALIDATE_LICENSE = LGPLv2.1+ -GST1_VALIDATE_LICENSE_FILES = COPYING - -GST1_VALIDATE_CONF_OPTS = --disable-sphinx-doc - -GST1_VALIDATE_DEPENDENCIES = \ - gstreamer1 \ - gst1-plugins-base \ - json-glib \ - host-python \ - python \ - $(if $(BR2_PACKAGE_CAIRO),cairo) - -$(eval $(autotools-package)) diff --git a/package.bak/gstreamer1/gstreamer1.mk b/package.bak/gstreamer1/gstreamer1.mk deleted file mode 100644 index 5b748e33fb..0000000000 --- a/package.bak/gstreamer1/gstreamer1.mk +++ /dev/null @@ -1 +0,0 @@ -include package/gstreamer1/*/*.mk diff --git a/package.bak/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch b/package.bak/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch deleted file mode 100644 index 88f337328c..0000000000 --- a/package.bak/gstreamer1/gstreamer1/0001-gstconfig.h.in-Fix-unaligned-access-support-for-the-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 437b3e38d9127ae021ca8510709c2e6be3e6b819 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 18 Feb 2017 10:03:24 +0100 -Subject: [PATCH] gstconfig.h.in: Fix unaligned access support for the openrisc - architecture - -Teach gstconfig.h.in about the openrisc (or1k) architecture. Fixes -buildroot autobuild failure: - -http://autobuild.buildroot.net/results/717/717d78ce0935749f477bdf3133b6f20057a28c01/build-end.log - -Submitted-upstream: https://bugzilla.gnome.org/show_bug.cgi?id=778866 -Signed-off-by: Peter Korsgaard ---- - gst/gstconfig.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gst/gstconfig.h.in b/gst/gstconfig.h.in -index cf95f61ab..1b2ca64ac 100644 ---- a/gst/gstconfig.h.in -+++ b/gst/gstconfig.h.in -@@ -104,7 +104,7 @@ - * http://docs.oracle.com/cd/E19205-01/820-4155/c++_faq.html#Vers6 - * https://software.intel.com/en-us/node/583402 - */ --#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) -+#if defined(__alpha__) || defined(__arc__) || defined(__arm__) || defined(__aarch64__) || defined(__bfin) || defined(__hppa__) || defined(__nios2__) || defined(__MICROBLAZE__) || defined(__mips__) || defined(__or1k__) || defined(__sh__) || defined(__SH4__) || defined(__sparc__) || defined(__sparc) || defined(__ia64__) || defined(_M_ALPHA) || defined(_M_ARM) || defined(_M_IA64) || defined(__xtensa__) - # define GST_HAVE_UNALIGNED_ACCESS 0 - #elif defined(__i386__) || defined(__i386) || defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__ppc__) || defined(__ppc64__) || defined(__powerpc__) || defined(__powerpc64__) || defined(__m68k__) || defined(_M_IX86) || defined(_M_AMD64) || defined(_M_X64) || defined(__s390__) || defined(__s390x__) || defined(__zarch__) - # define GST_HAVE_UNALIGNED_ACCESS 1 --- -2.11.0 - diff --git a/package.bak/gstreamer1/gstreamer1/Config.in b/package.bak/gstreamer1/gstreamer1/Config.in deleted file mode 100644 index 274171b639..0000000000 --- a/package.bak/gstreamer1/gstreamer1/Config.in +++ /dev/null @@ -1,55 +0,0 @@ -comment "gstreamer 1.x needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GSTREAMER1 - bool "gstreamer 1.x" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - GStreamer is an open source multimedia framework. This 1.x version of - Gstreamer is incompatible with Gstreamer 0.10.x. - - http://gstreamer.freedesktop.org/ - -if BR2_PACKAGE_GSTREAMER1 - -config BR2_PACKAGE_GSTREAMER1_PARSE - bool "enable command-line parser" - default y - help - Enable command line parser for gstreamer. This may increase the CPU - overhead by a small amount. - -config BR2_PACKAGE_GSTREAMER1_TRACE - bool "enable tracing subsystem" - default y - help - Enable the tracing subsystem within gstreamer. This may increase CPU - overhead by a small amount. - -config BR2_PACKAGE_GSTREAMER1_GST_DEBUG - bool "enable gst-debug trace support" - default y - help - Enable support for the gst-debug tracing functionality in gstreamer. - This has limited CPU overhead, but does increase the rootfs size - somewhat. - -config BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY - bool "enable plugin registry" - default y - help - Enable support for the GStreamer plugin registry. This may increase - the launch-time for a GStreamer application. - -config BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS - bool "install gst-launch & gst-inspect" - default y - help - Install the gst-launch and gst-inspect tools. This will take up - additional space on the target. - -endif diff --git a/package.bak/gstreamer1/gstreamer1/gstreamer1.hash b/package.bak/gstreamer1/gstreamer1/gstreamer1.hash deleted file mode 100644 index 455e7fb48c..0000000000 --- a/package.bak/gstreamer1/gstreamer1/gstreamer1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.10.4.tar.xz.sha256sum -sha256 50c2f5af50a6cc6c0a3f3ed43bdd8b5e2bff00bacfb766d4be139ec06d8b5218 gstreamer-1.10.4.tar.xz diff --git a/package.bak/gstreamer1/gstreamer1/gstreamer1.mk b/package.bak/gstreamer1/gstreamer1/gstreamer1.mk deleted file mode 100644 index 5a0a369c7e..0000000000 --- a/package.bak/gstreamer1/gstreamer1/gstreamer1.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# gstreamer1 -# -################################################################################ - -GSTREAMER1_VERSION = 1.10.4 -GSTREAMER1_SOURCE = gstreamer-$(GSTREAMER1_VERSION).tar.xz -GSTREAMER1_SITE = https://gstreamer.freedesktop.org/src/gstreamer -GSTREAMER1_INSTALL_STAGING = YES -GSTREAMER1_LICENSE_FILES = COPYING -GSTREAMER1_LICENSE = LGPLv2+, LGPLv2.1+ - -GSTREAMER1_CONF_OPTS = \ - --disable-examples \ - --disable-tests \ - --disable-failing-tests \ - --disable-valgrind \ - --disable-benchmarks \ - --disable-check \ - $(if $(BR2_PACKAGE_GSTREAMER1_TRACE),,--disable-trace) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PARSE),,--disable-parse) \ - $(if $(BR2_PACKAGE_GSTREAMER1_GST_DEBUG),,--disable-gst-debug) \ - $(if $(BR2_PACKAGE_GSTREAMER1_PLUGIN_REGISTRY),,--disable-registry) \ - $(if $(BR2_PACKAGE_GSTREAMER1_INSTALL_TOOLS),,--disable-tools) - -GSTREAMER1_DEPENDENCIES = \ - host-bison \ - host-flex \ - host-pkgconf \ - libglib2 \ - $(if $(BR2_PACKAGE_LIBUNWIND),libunwind) - -$(eval $(autotools-package)) diff --git a/package.bak/gtest/Config.in b/package.bak/gtest/Config.in deleted file mode 100644 index 355b736c60..0000000000 --- a/package.bak/gtest/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_GTEST - bool "gtest" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - help - Google's framework for writing C++ tests on a variety of - platforms (Linux, Mac OS X, Windows, Cygwin, Windows CE, and - Symbian). Based on the xUnit architecture. Supports - automatic test discovery, a rich set of assertions, - user-defined assertions, death tests, fatal and non-fatal - failures, value- and type-parameterized tests, various - options for running the tests, and XML test report - generation. - - Gtest also allows to easily build testsuites for C programs. - - This package allows running testsuites on the target which - might be advantageous in certain cases. - - https://github.com/google/googletest - -comment "gtest needs a toolchain w/ C++, wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/gtest/gtest.hash b/package.bak/gtest/gtest.hash deleted file mode 100644 index 79e31e466d..0000000000 --- a/package.bak/gtest/gtest.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 f73a6546fdf9fce9ff93a5015e0333a8af3062a152a9ad6bcb772c96687016cc gtest-release-1.7.0.tar.gz diff --git a/package.bak/gtest/gtest.mk b/package.bak/gtest/gtest.mk deleted file mode 100644 index eb30905c2a..0000000000 --- a/package.bak/gtest/gtest.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# gtest -# -################################################################################ - -# Make sure this remains the same version as the gmock one -GTEST_VERSION = release-1.7.0 -GTEST_SITE = $(call github,google,googletest,$(GTEST_VERSION)) -GTEST_INSTALL_STAGING = YES -GTEST_INSTALL_TARGET = NO -GTEST_LICENSE = BSD-3c -GTEST_LICENSE_FILES = LICENSE - -# While it is possible to build gtest as shared library, using this gtest shared -# library requires to set some special configure option in the project using -# gtest. -# So, force to build gtest as a static library. -# -# For further details, refer to the explaination given in the README file from -# the gtest sources. -GTEST_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF - -define GTEST_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/libgtest.a $(STAGING_DIR)/usr/lib/libgtest.a - $(INSTALL) -D -m 0755 $(@D)/libgtest_main.a $(STAGING_DIR)/usr/lib/libgtest_main.a - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include/gtest/ - cp -rp $(@D)/include/gtest/* $(STAGING_DIR)/usr/include/gtest/ - $(INSTALL) -D -m 0644 package/gtest/gtest.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/gtest.pc - # Generate the gtest-config script manually, since the CMake - # build system is not doing it. - sed 's%@PACKAGE_TARNAME@%gtest%;\ - s%@PACKAGE_VERSION@%$(GTEST_VERSION)%;\ - s%@prefix@%$(STAGING_DIR)/usr%;\ - s%@exec_prefix@%$(STAGING_DIR)/usr%;\ - s%@libdir@%$(STAGING_DIR)/usr/lib%;\ - s%@includedir@%$(STAGING_DIR)/usr/include%;\ - s%@bindir@%$(STAGING_DIR)/usr/bin%;\ - s%@PTHREAD_CFLAGS@%%;\ - s%@PTHREAD_LIBS@%-lpthread%;' \ - $(@D)/scripts/gtest-config.in \ - > $(STAGING_DIR)/usr/bin/gtest-config - chmod +x $(STAGING_DIR)/usr/bin/gtest-config -endef - -$(eval $(cmake-package)) diff --git a/package.bak/gtest/gtest.pc b/package.bak/gtest/gtest.pc deleted file mode 100644 index b7a8aa4000..0000000000 --- a/package.bak/gtest/gtest.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${prefix}/lib/ -includedir=${prefix}/include - -Name: gtest -Description: Google C++ Testing Framework -Version: 1.7.0 -Libs: -L${libdir} -lgtest -Libs.private: -lpthread -Cflags: -I${includedir} diff --git a/package.bak/gtk2-engines/Config.in b/package.bak/gtk2-engines/Config.in deleted file mode 100644 index 756a7d00f1..0000000000 --- a/package.bak/gtk2-engines/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_GTK2_ENGINES - bool "gtk engines" - depends on BR2_PACKAGE_LIBGTK2 - help - A collection of basic theme engines for GTK+. diff --git a/package.bak/gtk2-engines/gtk2-engines.hash b/package.bak/gtk2-engines/gtk2-engines.hash deleted file mode 100644 index ac56c7d73e..0000000000 --- a/package.bak/gtk2-engines/gtk2-engines.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk-engines/2.20/gtk-engines-2.20.2.sha256sum -sha256 15b680abca6c773ecb85253521fa100dd3b8549befeecc7595b10209d62d66b5 gtk-engines-2.20.2.tar.bz2 diff --git a/package.bak/gtk2-engines/gtk2-engines.mk b/package.bak/gtk2-engines/gtk2-engines.mk deleted file mode 100644 index 9b285f6f31..0000000000 --- a/package.bak/gtk2-engines/gtk2-engines.mk +++ /dev/null @@ -1,88 +0,0 @@ -################################################################################ -# -# gtk2-engines -# -################################################################################ - -GTK2_ENGINES_VERSION_MAJOR = 2.20 -GTK2_ENGINES_VERSION = $(GTK2_ENGINES_VERSION_MAJOR).2 -GTK2_ENGINES_SOURCE = gtk-engines-$(GTK2_ENGINES_VERSION).tar.bz2 -GTK2_ENGINES_SITE = http://ftp.gnome.org/pub/GNOME/sources/gtk-engines/$(GTK2_ENGINES_VERSION_MAJOR) -GTK2_ENGINES_DEPENDENCIES = libgtk2 host-intltool -GTK2_ENGINES_LICENSE = LGPLv2.1+ -GTK2_ENGINES_LICENSE_FILES = COPYING - -GTK2_ENGINES_CONF_ENV = \ - ac_cv_func_posix_getpwuid_r=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - gl_cv_c_restrict=no \ - ac_cv_path_CUPS_CONFIG=no - -GTK2_ENGINES_CONF_OPTS = \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --enable-explicit-deps=no \ - --enable-clearlooks \ - --disable-crux \ - --disable-hc \ - --disable-industrial \ - --disable-mist \ - --disable-redmond \ - --disable-smooth \ - --disable-glide \ - --disable-thinice \ - --enable-animation \ - --disable-development \ - --disable-paranoia \ - --disable-deprecated - -$(eval $(autotools-package)) diff --git a/package.bak/gtkmm3/Config.in b/package.bak/gtkmm3/Config.in deleted file mode 100644 index ef62a1f9eb..0000000000 --- a/package.bak/gtkmm3/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -comment "gtkmm3 needs libgtk3 and a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ - || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_GTKMM3 - bool "gtkmm3" - # Broken on existing external/internal nios2 toolchains, - # revisit when they are upgraded with at least Binutils >= 2.26 - # and GCC >= 5.3. - # https://sourceware.org/bugzilla/show_bug.cgi?id=19405 - depends on !BR2_nios2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pangomm, libgtk3 -> pango -> harfbuzz - depends on BR2_INSTALL_LIBSTDCPP # glibmm, libpangomm -> glibmm/pango - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/libgtk3 -> libglib2 - depends on BR2_USE_MMU # *mm/libgtk3 -> libglib2 - depends on BR2_USE_WCHAR # *mm/libgtk3 -> libglib2 - depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_ATKMM - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_LIBSIGC - select BR2_PACKAGE_PANGOMM - help - The gtkmm3 package is a set of C++ bindings for GTK 3. - - http://www.gtkmm.org/ diff --git a/package.bak/gtkmm3/gtkmm3.hash b/package.bak/gtkmm3/gtkmm3.hash deleted file mode 100644 index 951b481f2c..0000000000 --- a/package.bak/gtkmm3/gtkmm3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.0.sha256sum -sha256 05da4d4b628fb20c8384630ddf478a3b5562952b2d6181fe28d58f6cbc0514f5 gtkmm-3.22.0.tar.xz diff --git a/package.bak/gtkmm3/gtkmm3.mk b/package.bak/gtkmm3/gtkmm3.mk deleted file mode 100644 index 57b9b1fd57..0000000000 --- a/package.bak/gtkmm3/gtkmm3.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gtkmm3 -# -################################################################################ - -GTKMM3_VERSION_MAJOR = 3.22 -GTKMM3_VERSION = $(GTKMM3_VERSION_MAJOR).0 -GTKMM3_SOURCE = gtkmm-$(GTKMM3_VERSION).tar.xz -GTKMM3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtkmm/$(GTKMM3_VERSION_MAJOR) -GTKMM3_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) -GTKMM3_LICENSE_FILES = COPYING COPYING.tools -GTKMM3_INSTALL_STAGING = YES -GTKMM3_DEPENDENCIES = atkmm cairomm glibmm libgtk3 libsigc pangomm host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/gtkperf/Config.in b/package.bak/gtkperf/Config.in deleted file mode 100644 index 1089dbf477..0000000000 --- a/package.bak/gtkperf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_GTKPERF - bool "gtkperf (performance test for GTK2)" - depends on BR2_PACKAGE_LIBGTK2 - help - GtkPerf is an application designed to test GTK+ performance. - The point is to create common testing platform to run - predefined GTK+ widgets - e.g. (opening comboboxes, toggling buttons, scrolling text yms.) - and this way define the speed of device/platform. diff --git a/package.bak/gtkperf/gtkperf.hash b/package.bak/gtkperf/gtkperf.hash deleted file mode 100644 index 819851dd09..0000000000 --- a/package.bak/gtkperf/gtkperf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b gtkperf_0.40.tar.gz diff --git a/package.bak/gtkperf/gtkperf.mk b/package.bak/gtkperf/gtkperf.mk deleted file mode 100644 index 0542a26fa7..0000000000 --- a/package.bak/gtkperf/gtkperf.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# gtkperf -# -################################################################################ - -GTKPERF_VERSION = 0.40 -GTKPERF_SOURCE = gtkperf_$(GTKPERF_VERSION).tar.gz -GTKPERF_SITE = http://downloads.sourceforge.net/project/gtkperf/gtkperf/$(GTKPERF_VERSION) -GTKPERF_DEPENDENCIES = libgtk2 -GTKPERF_LICENSE = GPLv2 -GTKPERF_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/gtksourceview/Config.in b/package.bak/gtksourceview/Config.in deleted file mode 100644 index e87969b15d..0000000000 --- a/package.bak/gtksourceview/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_GTKSOURCEVIEW - bool "gtksourceview" - depends on BR2_PACKAGE_LIBGTK3 - select BR2_PACKAGE_LIBXML2 - help - GtkSourceView is a portable C library that extends the - standard GTK+ framework for multiline text editing with - support for configurable syntax highlighting, unlimited - undo/redo, search and replace, a completion framework, - printing and other features typical of a source code editor. - - https://projects.gnome.org/gtksourceview diff --git a/package.bak/gtksourceview/gtksourceview.hash b/package.bak/gtksourceview/gtksourceview.hash deleted file mode 100644 index f57fadc4e9..0000000000 --- a/package.bak/gtksourceview/gtksourceview.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.22/gtksourceview-3.22.2.sha256sum: -sha256 6ce84231dd0931cc747708434ca2f344c65a092dd6e1a800283fe0748773af5e gtksourceview-3.22.2.tar.xz diff --git a/package.bak/gtksourceview/gtksourceview.mk b/package.bak/gtksourceview/gtksourceview.mk deleted file mode 100644 index 5e4ca0d22f..0000000000 --- a/package.bak/gtksourceview/gtksourceview.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# gtksourceview -# -################################################################################ - -GTKSOURCEVIEW_VERSION_MAJOR = 3.22 -GTKSOURCEVIEW_VERSION = $(GTKSOURCEVIEW_VERSION_MAJOR).2 -GTKSOURCEVIEW_SOURCE = gtksourceview-$(GTKSOURCEVIEW_VERSION).tar.xz -GTKSOURCEVIEW_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gtksourceview/$(GTKSOURCEVIEW_VERSION_MAJOR) -GTKSOURCEVIEW_LICENSE = LGPLv2.1+ -GTKSOURCEVIEW_LICENSE_FILES = COPYING -GTKSOURCEVIEW_INSTALL_STAGING = YES -GTKSOURCEVIEW_DEPENDENCIES = host-pkgconf libglib2 libxml2 libgtk3 - -$(eval $(autotools-package)) diff --git a/package.bak/guile/0001-fix_arm_endianness.patch b/package.bak/guile/0001-fix_arm_endianness.patch deleted file mode 100644 index 67c0b606ee..0000000000 --- a/package.bak/guile/0001-fix_arm_endianness.patch +++ /dev/null @@ -1,25 +0,0 @@ -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.bak/guile/0002-calculate-csqrt_manually.patch b/package.bak/guile/0002-calculate-csqrt_manually.patch deleted file mode 100644 index 98bb0b6850..0000000000 --- a/package.bak/guile/0002-calculate-csqrt_manually.patch +++ /dev/null @@ -1,16 +0,0 @@ -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.bak/guile/0003-workaround-ice-ssa-corruption.patch b/package.bak/guile/0003-workaround-ice-ssa-corruption.patch deleted file mode 100644 index 54f3158a91..0000000000 --- a/package.bak/guile/0003-workaround-ice-ssa-corruption.patch +++ /dev/null @@ -1,64 +0,0 @@ -libguile/vm-i-system.c: workaround ice ssa corruption while compiling with option -g -O - -While compiling with option -g -O, there was a ssa corruption: -.. -Unable to coalesce ssa_names 48 and 3476 which are marked as MUST COALESCE. -sp_48(ab) and sp_3476(ab) -guile-2.0.11/libguile/vm-engine.c: In function 'vm_debug_engine': -guile-2.0.11/libguile/vm.c:673:19: internal compiler error: SSA corruption - #define VM_NAME vm_debug_engine - ^ -guile-2.0.11/libguile/vm-engine.c:39:1: note: in expansion of macro 'VM_NAME' - VM_NAME (SCM vm, SCM program, SCM *argv, int nargs) - ^ -Please submit a full bug report, -with preprocessed source if appropriate. -See for instructions. -... - -Tweak libguile/vm-i-system.c to add boundary value check to workaround it. - -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia - -Fixes Buildroot autobuilder failures on AArch64. - -Signed-off-by: Thomas Petazzoni ---- - libguile/vm-i-system.c | 20 ++++++++++++++++---- - 1 file changed, 16 insertions(+), 4 deletions(-) - -diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c ---- a/libguile/vm-i-system.c -+++ b/libguile/vm-i-system.c -@@ -625,10 +625,22 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6, - /* now shuffle up, from walk to ntotal */ - { - scm_t_ptrdiff nshuf = sp - walk + 1, i; -- sp = (fp - 1) + ntotal + nshuf; -- CHECK_OVERFLOW (); -- for (i = 0; i < nshuf; i++) -- sp[-i] = walk[nshuf-i-1]; -+ /* check the value of nshuf to workaround ice ssa corruption */ -+ /* while compiling with -O -g */ -+ if (nshuf > 0) -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } -+ else -+ { -+ sp = (fp - 1) + ntotal + nshuf; -+ CHECK_OVERFLOW (); -+ for (i = 0; i < nshuf; i++) -+ sp[-i] = walk[nshuf-i-1]; -+ } - } - /* and fill optionals & keyword args with SCM_UNDEFINED */ - while (walk <= (fp - 1) + ntotal) --- -1.9.1 - diff --git a/package.bak/guile/Config.in b/package.bak/guile/Config.in deleted file mode 100644 index e0f6571274..0000000000 --- a/package.bak/guile/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_GUILE - bool "guile" - depends on !BR2_TOOLCHAIN_USES_MUSL # no strtol_l - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # bdwgc - depends on BR2_USE_WCHAR # libunistring - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBUNISTRING - select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_GMP - select BR2_PACKAGE_BDWGC - select BR2_PACKAGE_LIBTOOL - 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 uClibc or glibc toolchain w/ threads, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - diff --git a/package.bak/guile/guile.hash b/package.bak/guile/guile.hash deleted file mode 100644 index 43f0dd7768..0000000000 --- a/package.bak/guile/guile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 3744f2addc282a0de627aaef048f062982b44564d54ac31ff5217972529ed88b guile-2.0.13.tar.xz diff --git a/package.bak/guile/guile.mk b/package.bak/guile/guile.mk deleted file mode 100644 index 88c74143bf..0000000000 --- a/package.bak/guile/guile.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# guile -# -################################################################################ - -GUILE_VERSION = 2.0.13 -GUILE_SOURCE = guile-$(GUILE_VERSION).tar.xz -GUILE_SITE = $(BR2_GNU_MIRROR)/guile -GUILE_INSTALL_STAGING = YES -# For 0002-calculate-csqrt_manually.patch -GUILE_AUTORECONF = YES -GUILE_LICENSE = LGPLv3+ -GUILE_LICENSE_FILES = LICENSE COPYING COPYING.LESSER - -# libtool dependency is needed because guile uses libltdl -GUILE_DEPENDENCIES = host-guile libunistring libffi gmp bdwgc host-pkgconf libtool -HOST_GUILE_DEPENDENCIES = host-libunistring host-libffi host-gmp host-bdwgc host-flex host-pkgconf host-gettext - -# The HAVE_GC* CFLAGS specify that we will use internal callbacks -# instead of the ones provided by -# bdwgc. Eg. HAVE_GC_SET_FINALIZER_NOTIFIER specifies that we won't -# use bdwgc's GC_finalizer_notifier callback. Trying to use these -# specific bdwgc's callbacks breaks guile's building. -GUILE_CFLAGS = \ - -DHAVE_GC_SET_FINALIZER_NOTIFIER \ - -DHAVE_GC_GET_HEAP_USAGE_SAFE \ - -DHAVE_GC_GET_FREE_SPACE_DIVISOR \ - -DHAVE_GC_SET_FINALIZE_ON_DEMAND - -ifeq ($(BR2_STATIC_LIBS),y) -GUILE_CFLAGS += -DGC_NO_DLOPEN -endif - -# Triggers assembler error with -Os -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_ARM)$(BR2_OPTIMIZE_S),yy) -GUILE_CFLAGS += -O2 -endif - -# It can use readline, but on the condition that it was build against -# ncurses. If both aren't present disable readline support since the -# host readline/ncurses support can poison the build. -ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) -GUILE_CONF_OPTS += --with-libreadline-prefix=$(STAGING_DIR)/usr -GUILE_DEPENDENCIES += readline -else -GUILE_CONF_OPTS += --without-libreadline-prefix -endif - -GUILE_CONF_ENV += GUILE_FOR_BUILD=$(HOST_DIR)/usr/bin/guile \ - CFLAGS="$(TARGET_CFLAGS) $(GUILE_CFLAGS)" - -GUILE_CONF_OPTS += \ - --with-libltdl-prefix=$(STAGING_DIR)/usr/lib \ - --with-libgmp-prefix=$(STAGING_DIR)/usr/lib \ - --with-libunistring-prefix=$(STAGING_DIR)/usr/lib - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gupnp-av/Config.in b/package.bak/gupnp-av/Config.in deleted file mode 100644 index 5320b82b5a..0000000000 --- a/package.bak/gupnp-av/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_GUPNP_AV - bool "gupnp-av" - depends on BR2_USE_WCHAR # glib2, gupnp - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, gupnp - depends on BR2_USE_MMU # glib2, gupnp - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GUPNP - select BR2_PACKAGE_LIBXML2 - help - GUPnP-AV is a collection of helpers for building AV (audio/video) - applications using GUPnP. - - http://www.gupnp.org/ - -comment "gupnp-av needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gupnp-av/gupnp-av.hash b/package.bak/gupnp-av/gupnp-av.hash deleted file mode 100644 index 8fe7782249..0000000000 --- a/package.bak/gupnp-av/gupnp-av.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-av/0.12/gupnp-av-0.12.10.sha256sum: -sha256 8038ef84dddbe7ad91c205bf91dddf684f072df8623f39b6555a6bb72837b85a gupnp-av-0.12.10.tar.xz diff --git a/package.bak/gupnp-av/gupnp-av.mk b/package.bak/gupnp-av/gupnp-av.mk deleted file mode 100644 index 40e6c8c836..0000000000 --- a/package.bak/gupnp-av/gupnp-av.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gupnp-av -# -################################################################################ - -GUPNP_AV_VERSION_MAJOR = 0.12 -GUPNP_AV_VERSION = $(GUPNP_AV_VERSION_MAJOR).10 -GUPNP_AV_SOURCE = gupnp-av-$(GUPNP_AV_VERSION).tar.xz -GUPNP_AV_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp-av/$(GUPNP_AV_VERSION_MAJOR) -GUPNP_AV_LICENSE = LGPLv2+ -GUPNP_AV_LICENSE_FILES = COPYING -GUPNP_AV_INSTALL_STAGING = YES -GUPNP_AV_DEPENDENCIES = host-pkgconf libglib2 libxml2 gupnp - -$(eval $(autotools-package)) diff --git a/package.bak/gupnp-dlna/Config.in b/package.bak/gupnp-dlna/Config.in deleted file mode 100644 index a0ecdb3b16..0000000000 --- a/package.bak/gupnp-dlna/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_GUPNP_DLNA - bool "gupnp-dlna" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 - help - GUPnP DLNA is a small utility library that aims to ease the - DLNA-related tasks such as media profile guessing, transcoding - to a given profile, etc. - - http://www.gupnp.org/ - -comment "gupnp-dlna needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gupnp-dlna/gupnp-dlna.hash b/package.bak/gupnp-dlna/gupnp-dlna.hash deleted file mode 100644 index c28a06fc98..0000000000 --- a/package.bak/gupnp-dlna/gupnp-dlna.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/0.10/gupnp-dlna-0.10.5.sha256sum: -sha256 123e368227c11d5c17fc1aa76cbdaffa345355eb51d172cd39fc74a5b468ff6a gupnp-dlna-0.10.5.tar.xz diff --git a/package.bak/gupnp-dlna/gupnp-dlna.mk b/package.bak/gupnp-dlna/gupnp-dlna.mk deleted file mode 100644 index 58b5735409..0000000000 --- a/package.bak/gupnp-dlna/gupnp-dlna.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# gupnp-dlna -# -################################################################################ - -GUPNP_DLNA_VERSION_MAJOR = 0.10 -GUPNP_DLNA_VERSION = $(GUPNP_DLNA_VERSION_MAJOR).5 -GUPNP_DLNA_SOURCE = gupnp-dlna-$(GUPNP_DLNA_VERSION).tar.xz -GUPNP_DLNA_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-dlna/$(GUPNP_DLNA_VERSION_MAJOR) -# COPYING contains LGPLv2.1 but all source files contain LPGLv2+ -GUPNP_DLNA_LICENSE = LGPLv2+ -GUPNP_DLNA_LICENSE_FILES = COPYING -GUPNP_DLNA_INSTALL_STAGING = YES -GUPNP_DLNA_DEPENDENCIES = host-pkgconf libglib2 libxml2 - -ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y) -GUPNP_DLNA_CONF_OPTS += --enable-legacy-gstreamer-metadata-backend -GUPNP_DLNA_DEPENDENCIES += gstreamer gst-plugins-base -else -GUPNP_DLNA_CONF_OPTS += --disable-legacy-gstreamer-metadata-backend -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -GUPNP_DLNA_CONF_OPTS += --enable-gstreamer-metadata-backend -GUPNP_DLNA_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -GUPNP_DLNA_CONF_OPTS += --disable-gstreamer-metadata-backend -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gupnp-tools/Config.in b/package.bak/gupnp-tools/Config.in deleted file mode 100644 index f9e645a093..0000000000 --- a/package.bak/gupnp-tools/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_GUPNP_TOOLS - bool "gupnp-tools" - # gssdp, gupnp, libsoup all select on libglib2, so they have - # the same dependencies as libgtk3, which we depend on. So for - # the same of simplicity, we don't replicate all those - # (complex) dependencies. - select BR2_PACKAGE_GSSDP - select BR2_PACKAGE_GUPNP - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - depends on BR2_PACKAGE_LIBGTK3 - help - GUPnP Tools are free replacements of Intel UPnP tools that - use GUPnP. They provides client and server side tools which - enable one to easily test and debug one's UPnP devices and - control points. - - http://www.gupnp.org/ - -comment "gupnp-tools needs libgtk3" - depends on !BR2_PACKAGE_LIBGTK3 diff --git a/package.bak/gupnp-tools/gupnp-tools.hash b/package.bak/gupnp-tools/gupnp-tools.hash deleted file mode 100644 index f08b4f5e01..0000000000 --- a/package.bak/gupnp-tools/gupnp-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.13.sha256sum: -sha256 aa3decb9d532c0e2e505adc592f431fd81c0231ded2981129e87da13712479ed gupnp-tools-0.8.13.tar.xz diff --git a/package.bak/gupnp-tools/gupnp-tools.mk b/package.bak/gupnp-tools/gupnp-tools.mk deleted file mode 100644 index 07b5d3c1c5..0000000000 --- a/package.bak/gupnp-tools/gupnp-tools.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# gupnp-tools -# -################################################################################ - -GUPNP_TOOLS_VERSION_MAJOR = 0.8 -GUPNP_TOOLS_VERSION = $(GUPNP_TOOLS_VERSION_MAJOR).13 -GUPNP_TOOLS_SOURCE = gupnp-tools-$(GUPNP_TOOLS_VERSION).tar.xz -GUPNP_TOOLS_SITE = \ - http://ftp.gnome.org/pub/gnome/sources/gupnp-tools/$(GUPNP_TOOLS_VERSION_MAJOR) -GUPNP_TOOLS_LICENSE = GPLv2+ -GUPNP_TOOLS_LICENSE_FILES = COPYING -GUPNP_TOOLS_INSTALL_STAGING = YES -GUPNP_TOOLS_DEPENDENCIES = \ - host-pkgconf \ - libglib2 \ - libxml2 \ - gssdp \ - gupnp \ - libsoup \ - libgtk3 - -ifeq ($(BR2_PACKAGE_GUPNP_AV),y) -GUPNP_TOOLS_CONF_OPTS += --with-av -GUPNP_TOOLS_DEPENDENCIES += gupnp-av -else -GUPNP_TOOLS_CONF_OPTS += --without-av -endif - -ifeq ($(BR2_PACKAGE_GTKSOURCEVIEW),y) -GUPNP_TOOLS_DEPENDENCIES += gtksourceview -endif - -$(eval $(autotools-package)) diff --git a/package.bak/gupnp/Config.in b/package.bak/gupnp/Config.in deleted file mode 100644 index 3074a42797..0000000000 --- a/package.bak/gupnp/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_GUPNP - bool "gupnp" - depends on BR2_USE_WCHAR # glib2, gssdp - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2, gssdp - depends on BR2_USE_MMU # glib2, gssdp - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GSSDP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - GUPnP implements the UPnP specification: resource announcement - and discovery, description, control, event notification, and - presentation. - - http://www.gupnp.org/ - -comment "gupnp needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gupnp/gupnp.hash b/package.bak/gupnp/gupnp.hash deleted file mode 100644 index 48aeb499f8..0000000000 --- a/package.bak/gupnp/gupnp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://ftp.gnome.org/pub/gnome/sources/gupnp/1.0/gupnp-1.0.1.sha256sum: -sha256 934584cc1b361bf251a5ac271ffb1995a3c6426ce44cb64f9c6d779f2af9a6d9 gupnp-1.0.1.tar.xz diff --git a/package.bak/gupnp/gupnp.mk b/package.bak/gupnp/gupnp.mk deleted file mode 100644 index 764f527d28..0000000000 --- a/package.bak/gupnp/gupnp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# gupnp -# -################################################################################ - -GUPNP_VERSION_MAJOR = 1.0 -GUPNP_VERSION = $(GUPNP_VERSION_MAJOR).1 -GUPNP_SOURCE = gupnp-$(GUPNP_VERSION).tar.xz -GUPNP_SITE = http://ftp.gnome.org/pub/gnome/sources/gupnp/$(GUPNP_VERSION_MAJOR) -GUPNP_LICENSE = LGPLv2+ -GUPNP_LICENSE_FILES = COPYING -GUPNP_INSTALL_STAGING = YES -GUPNP_DEPENDENCIES = host-pkgconf libglib2 libxml2 gssdp util-linux - -$(eval $(autotools-package)) diff --git a/package.bak/gutenprint/0001-use-pregen-xmli18n-header.patch b/package.bak/gutenprint/0001-use-pregen-xmli18n-header.patch deleted file mode 100644 index 533fe33d82..0000000000 --- a/package.bak/gutenprint/0001-use-pregen-xmli18n-header.patch +++ /dev/null @@ -1,48 +0,0 @@ -src/xml: use preg-gen xmli18n_tmp.h if specified - -Ideally, the programs needed at build-time should be built with -CC_FOR_BUILD, and not with CC_FOR_HOST. - -Unfortunately, this program wants to link against the gutenprint libs, -so we would also need to build them with CC_FOR_HOST, that is build them -twice, once for build, once for host. - -Instead, in the Buildroot context, we first build gutenprint for the build -system, use that to generate the incriminated header, and then re-use that -header to build the gutenprint for the host. - -It is not possible to have such constructs in Makefile.am: - ifeq ($(FOO),) - bar: bla - cat $< >$@ - else - bar: - echo $(FOO) >$@ - endif - -as autoreconf will yell loudly that there is an 'endif' without an 'if'. -Sigh... :-( - -Signed-off-by: "Yann E. MORIN" - -diff -durN gutenprint-5.2.9.orig/src/xml/Makefile.am gutenprint-5.2.9/src/xml/Makefile.am ---- gutenprint-5.2.9.orig/src/xml/Makefile.am 2011-03-30 02:43:24.000000000 +0200 -+++ gutenprint-5.2.9/src/xml/Makefile.am 2013-03-24 17:08:08.435918773 +0100 -@@ -52,10 +52,13 @@ - - - xmli18n-tmp.h: xml-stamp extract-strings -- -rm -f $@ $@.tmp -- ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp -- mv $@.tmp $@ -- -+ if [ -z "$(BR2_USE_PREGEN_XMLI18N_TMP_H)" ]; then \ -+ rm -f $@ $@.tmp; \ -+ ./extract-strings `cat xml-stamp | sed -e 's;^;$(srcdir)/;'` > $@.tmp; \ -+ mv $@.tmp $@; \ -+ else \ -+ cp $(BR2_USE_PREGEN_XMLI18N_TMP_H) $@; \ -+ fi - - dist-hook: xmli18n-tmp.h xml-stamp - # xmli18n-tmp.h is needed by po/POTFILES.in at dist time diff --git a/package.bak/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch b/package.bak/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch deleted file mode 100644 index d8cfb7d9d7..0000000000 --- a/package.bak/gutenprint/0002-cups-support-replaces-static-with-static-libtool-lib.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 08a5d355160eb2ac8346ae1b94591418343217f9 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 17 Aug 2014 23:43:20 +0200 -Subject: [PATCH 1/1] cups support: replaces -static with -static-libtool-libs - -gutenprint rely on the original behaviour of -static, but since commit -in buildroot "support/libtool: make -static behave like -all-static" [1], -the build of genppd is broken. - -genppd need to be build statically otherwise the following warning appears: -***WARNING: Use of --disable-static-genppd or --disable-static - when building CUPS is very dangerous. The build may - fail when building the PPD files, or may *SILENTLY* - build incorrect PPD files or cause other problems. - Please review the README and release notes carefully! - -[1] http://git.buildroot.net/buildroot/commit/?id=97703978ac870ce2b14ad144f8e082de82aa2c64 - -Signed-off-by: Romain Naour ---- - src/cups/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cups/Makefile.am b/src/cups/Makefile.am -index 1e27ae0..d711b70 100644 ---- a/src/cups/Makefile.am -+++ b/src/cups/Makefile.am -@@ -84,7 +84,7 @@ noinst_SCRIPTS=test-rastertogutenprint - endif - - if BUILD_GENPPD_STATIC --STATIC_LDOPTS=-static -export-dynamic -+STATIC_LDOPTS=-static-libtool-libs -export-dynamic - endif - - cups_calibrate_SOURCES = cups-calibrate.c --- -1.9.3 - diff --git a/package.bak/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch b/package.bak/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch deleted file mode 100644 index fc1746ca00..0000000000 --- a/package.bak/gutenprint/0003-print-olympus.c-fix-endianness-detection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e0dad4bb237f1155e920c30c6fd3412e96a3e84d Mon Sep 17 00:00:00 2001 -From: Olivier Schonken -Date: Sun, 24 Jan 2016 17:14:21 +0200 -Subject: [PATCH 1/1] print-olympus.c: fix endianness detection - -The __LITTLE_ENDIAN__ and __BIG_ENDIAN__ macros are not a reliable way to -detect endianness. Instead, rely on __BYTE_ORDER like we do in the rest of -the code. - -Signed-off-by: Olivier Schonken ---- - src/main/print-olympus.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/main/print-olympus.c b/src/main/print-olympus.c -index 42c4897..8b2aa80 100644 ---- a/src/main/print-olympus.c -+++ b/src/main/print-olympus.c -@@ -4901,9 +4901,9 @@ dyesub_do_print(stp_vars_t *v, stp_image_t *image) - } - - if (pv.bytes_per_ink_channel > 1) { --#if defined(__LITTLE_ENDIAN) || defined(__LITTLE_ENDIAN__) -+#if (__BYTE_ORDER == __LITTLE_ENDIAN) - pv.byteswap = dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); --#elif defined (__BIG_ENDIAN) || defined(__BIG_ENDIAN__) -+#elif (__BYTE_ORDER == __BIG_ENDIAN) - pv.byteswap = !dyesub_feature(caps, DYESUB_FEATURE_BIGENDIAN); - #else - #error "Unable to determine endianness, aborting compilation!" --- -1.9.1 - diff --git a/package.bak/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch b/package.bak/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch deleted file mode 100644 index 1ecc89ede8..0000000000 --- a/package.bak/gutenprint/0004-build-Don-t-allow-USB-backends-to-be-built-if-CUPS-i.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5e8dc446572c1198a24eff105a394d0f307951e Mon Sep 17 00:00:00 2001 -From: Solomon Peachy -Date: Fri, 15 Apr 2016 23:05:43 -0400 -Subject: [PATCH] build: Don't allow USB backends to be built if CUPS is not - enabled. - -[Waldemar: backport from upstream commit -fc1713589fed645f2c8002c3f66dfb69af314716.] -Signed-off-by: Waldemar Brodkorb ---- - configure.ac | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 800794b..ba30019 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -442,12 +442,14 @@ dnl if test -z "${[EXTRA_LIBREADLINE_DEPS]}" ; then - dnl [EXTRA_LIBREADLINE_DEPS]="" - dnl fi - --# libusb-1.0 (For CUPS backends) --PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], -- [HAVE_LIBUSB=yes -- BUILD_LIBUSB_BACKENDS=yes], -- [HAVE_LIBUSB=no -- BUILD_LIBUSB_BACKENDS=no]) -+# libusb-1.0 (For CUPS backends, but only bother if CUPS is enabled) -+if test "x$BUILD_CUPS" = "xyes" ; then -+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0], -+ [HAVE_LIBUSB=yes -+ BUILD_LIBUSB_BACKENDS=yes], -+ [HAVE_LIBUSB=no -+ BUILD_LIBUSB_BACKENDS=no]) -+fi - - AC_PATH_PROGS([GIMPTOOL2_CHECK], [gimptool-2.0 gimptool]) - if test -z "${GIMPTOOL2_CHECK}" ; then --- -2.6.4 - diff --git a/package.bak/gutenprint/Config.in b/package.bak/gutenprint/Config.in deleted file mode 100644 index f93717c7f2..0000000000 --- a/package.bak/gutenprint/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_GUTENPRINT - bool "gutenprint" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_CUPS - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Gutenprint, formerly named Gimp-Print, is a suite of printer - drivers that may be used with most common UNIX print spooling - systems, including CUPS, lpr, LPRng, or others - - http://gimp-print.sourceforge.net/ - -comment "gutenprint needs a toolchain w/ C++" - depends on BR2_PACKAGE_CUPS - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/gutenprint/gutenprint.hash b/package.bak/gutenprint/gutenprint.hash deleted file mode 100644 index a52cc7d42d..0000000000 --- a/package.bak/gutenprint/gutenprint.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c1a34cd2e02527de4d2a9bf6c14732cb9aa11b333f771eb6043fdc974de24df9 gutenprint-5.2.11.tar.bz2 diff --git a/package.bak/gutenprint/gutenprint.mk b/package.bak/gutenprint/gutenprint.mk deleted file mode 100644 index 8ee2406abb..0000000000 --- a/package.bak/gutenprint/gutenprint.mk +++ /dev/null @@ -1,92 +0,0 @@ -################################################################################ -# -# gutenprint -# -################################################################################ - -GUTENPRINT_VERSION_MAJOR = 5.2 -GUTENPRINT_VERSION = $(GUTENPRINT_VERSION_MAJOR).11 -GUTENPRINT_SITE = http://downloads.sourceforge.net/project/gimp-print/gutenprint-$(GUTENPRINT_VERSION_MAJOR)/$(GUTENPRINT_VERSION) -GUTENPRINT_SOURCE = gutenprint-$(GUTENPRINT_VERSION).tar.bz2 -GUTENPRINT_LICENSE = GPLv2+ -GUTENPRINT_LICENSE_FILES = COPYING - -# Needed, as we touch Makefile.am and configure.ac -GUTENPRINT_AUTORECONF = YES - -GUTENPRINT_DEPENDENCIES = \ - cups host-pkgconf \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(if $(BR2_PACKAGE_LIBUSB),libusb) - -# host-gutenprint is needed to generate XML as part of compilation -# the program that generates the xml also links against libgutenprint -# so we need to build both a host package and a target package -GUTENPRINT_DEPENDENCIES += host-gutenprint - -GUTENPRINT_CONF_ENV = \ - ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config \ - ac_cv_path_IJS_CONFIG="" - -GUTENPRINT_CONF_OPTS = \ - --disable-libgutenprintui2 \ - --disable-samples \ - --without-doc \ - --without-gimp2 \ - --without-foomatic \ - --without-foomatic3 \ - --disable-escputil \ - --disable-test \ - --disable-testpattern \ - --with-cups="/usr" \ - --with-sysroot="$(STAGING_DIR)" \ - --disable-cups-ppds - -# USE_PREGEN_XMLI18N_TMP_H is added by our patch -GUTENPRINT_MAKE_ENV = BR2_USE_PREGEN_XMLI18N_TMP_H=$(HOST_DIR)/usr/include/xmli18n-tmp.h - -HOST_GUTENPRINT_DEPENDENCIES = host-pkgconf -# The host-gutenprint shall create the required header -HOST_GUTENPRINT_MAKE_ENV = - -# Even with --without-cups, gutenprint will still add the output of -# cups-config --cflags / --ldflags to it's compiler/linker flags if -# available on host. -# Notice: Because of the configure logic, it needs to be set to the -# empty string to to disable this, not just to /bin/false like elsewhere. -HOST_GUTENPRINT_CONF_ENV = ac_cv_path_CUPS_CONFIG='' - -HOST_GUTENPRINT_CONF_OPTS = \ - --disable-libgutenprintui2 \ - --disable-samples \ - --without-gimp2 \ - --without-doc \ - --disable-nls \ - --disable-nls-macos \ - --without-foomatic \ - --without-foomatic3 \ - --disable-escputil \ - --disable-test \ - --disable-testpattern \ - --without-cups - -# Needed by autoreconf -define GUTENPRINT_CREATE_M4_DIR - mkdir -p $(@D)/m4local -endef -GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR -HOST_GUTENPRINT_POST_PATCH_HOOKS += GUTENPRINT_CREATE_M4_DIR - -define HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER - cp $(@D)/src/xml/xmli18n-tmp.h $(HOST_DIR)/usr/include -endef -HOST_GUTENPRINT_POST_BUILD_HOOKS += HOST_GUTENPRINT_POST_BUILD_INSTAL_TMP_HEADER - -define GUTENPRINT_POST_INSTALL_TARGET_FIXUP - mkdir -p $(TARGET_DIR)/usr/share/gutenprint/5.2 - cp -rf $(HOST_DIR)/usr/share/gutenprint/5.2/xml $(TARGET_DIR)/usr/share/gutenprint/5.2 -endef -GUTENPRINT_POST_INSTALL_TARGET_HOOKS += GUTENPRINT_POST_INSTALL_TARGET_FIXUP - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/gvfs/Config.in b/package.bak/gvfs/Config.in deleted file mode 100644 index 44a75210e5..0000000000 --- a/package.bak/gvfs/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_GVFS - bool "gvfs" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_USE_MMU # dbus, glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_SHARED_MIME_INFO - help - gvfs is a userspace virtual filesystem where mount runs as a - separate processes which you talk to via D-Bus. It also - contains a gio module that seamlessly adds gvfs support to - all applications using the gio API. It also supports exposing - the gvfs mounts to non-gio applications using fuse. - - https://wiki.gnome.org/action/show/Projects/gvfs - -comment "gvfs needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/gvfs/gvfs.hash b/package.bak/gvfs/gvfs.hash deleted file mode 100644 index 63ad77de83..0000000000 --- a/package.bak/gvfs/gvfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/gvfs/1.30/gvfs-1.30.3.sha256sum -sha256 b824a29489cae7f39e1a0fc0d154ac7b7bf43d8edd98ba83ffcad2f766d0f175 gvfs-1.30.3.tar.xz diff --git a/package.bak/gvfs/gvfs.mk b/package.bak/gvfs/gvfs.mk deleted file mode 100644 index f3b5fc4218..0000000000 --- a/package.bak/gvfs/gvfs.mk +++ /dev/null @@ -1,139 +0,0 @@ -################################################################################ -# -# gvfs -# -################################################################################ - -GVFS_VERSION_MAJOR = 1.30 -GVFS_VERSION = $(GVFS_VERSION_MAJOR).3 -GVFS_SOURCE = gvfs-$(GVFS_VERSION).tar.xz -GVFS_SITE = http://ftp.gnome.org/pub/GNOME/sources/gvfs/$(GVFS_VERSION_MAJOR) -GVFS_INSTALL_STAGING = YES -GVFS_DEPENDENCIES = host-pkgconf host-libglib2 libglib2 dbus shared-mime-info -GVFS_LICENSE = LGPLv2+ -GVFS_LICENSE_FILES = COPYING - -# Export ac_cv_path_LIBGCRYPT_CONFIG unconditionally to prevent -# build system from searching the host paths. -GVFS_CONF_ENV = ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config - -# Most of these are missing library support -GVFS_CONF_OPTS = \ - --disable-afc \ - --disable-admin \ - --disable-bash-completion \ - --disable-cdda \ - --disable-gconf \ - --disable-gcr \ - --disable-gdu \ - --disable-goa \ - --disable-google \ - --disable-gphoto2 \ - --disable-hal \ - --disable-keyring \ - --disable-libmtp \ - --disable-udisks2 - -ifeq ($(BR2_PACKAGE_AVAHI),y) -GVFS_DEPENDENCIES += avahi -GVFS_CONF_OPTS += --enable-avahi -else -GVFS_CONF_OPTS += --disable-avahi -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -GVFS_DEPENDENCIES += udev -endif - -ifeq ($(BR2_PACKAGE_LIBGUDEV),y) -GVFS_DEPENDENCIES += libgudev -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -GVFS_DEPENDENCIES += libarchive -GVFS_CONF_OPTS += \ - --enable-archive \ - --with-archive-includes=$(STAGING_DIR)/usr \ - --with-archive-libs=$(STAGING_DIR)/usr -else -GVFS_CONF_OPTS += --disable-archive -endif - -ifeq ($(BR2_PACKAGE_LIBBLURAY),y) -GVFS_DEPENDENCIES += libbluray -GVFS_CONF_OPTS += --enable-bluray -else -GVFS_CONF_OPTS += --disable-bluray -endif - -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -GVFS_DEPENDENCIES += libfuse -GVFS_CONF_OPTS += --enable-fuse -else -GVFS_CONF_OPTS += --disable-fuse -endif - -# AFP support is anon-only without libgcrypt which isn't very useful -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -GVFS_CONF_OPTS += --enable-afp -GVFS_DEPENDENCIES += libgcrypt -else -GVFS_CONF_OPTS += --disable-afp -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -GVFS_CONF_OPTS += --enable-gtk -GVFS_DEPENDENCIES += libgtk3 -else -GVFS_CONF_OPTS += --disable-gtk -endif - -ifeq ($(BR2_PACKAGE_LIBNFS),y) -GVFS_CONF_OPTS += --enable-nfs -GVFS_DEPENDENCIES += libnfs -else -GVFS_CONF_OPTS += --disable-nfs -endif - -ifeq ($(BR2_PACKAGE_LIBSOUP),y) -GVFS_DEPENDENCIES += libsoup -GVFS_CONF_OPTS += --enable-http -else -GVFS_CONF_OPTS += --disable-http -endif - -ifeq ($(BR2_PACKAGE_SAMBA4),y) -GVFS_DEPENDENCIES += samba4 -GVFS_CONF_OPTS += \ - --enable-samba \ - --with-samba-includes=$(STAGING_DIR)/usr/include/samba-4.0 \ - --with-samba-libs=$(STAGING_DIR)/usr/lib \ - ac_cv_lib_smbclient_smbc_option_get=yes -else -GVFS_CONF_OPTS += --disable-samba -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -GVFS_DEPENDENCIES += systemd -else -GVFS_CONF_OPTS += --disable-libsystemd-login -endif - -define GVFS_REMOVE_USELESS_BINARY - rm $(TARGET_DIR)/usr/bin/gvfs-less -endef - -define GVFS_REMOVE_TARGET_SCHEMAS - rm $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml -endef - -define GVFS_COMPILE_SCHEMAS - $(HOST_DIR)/usr/bin/glib-compile-schemas --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas $(STAGING_DIR)/usr/share/glib-2.0/schemas -endef - -GVFS_POST_INSTALL_TARGET_HOOKS += \ - GVFS_REMOVE_USELESS_BINARY \ - GVFS_REMOVE_TARGET_SCHEMAS \ - GVFS_COMPILE_SCHEMAS - -$(eval $(autotools-package)) diff --git a/package.bak/gzip/Config.in b/package.bak/gzip/Config.in deleted file mode 100644 index f2eac0376f..0000000000 --- a/package.bak/gzip/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GZIP - bool "gzip" - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Standard GNU compressor. Provides things like gzip, - gunzip, gzcat, etc... - - http://www.gnu.org/software/gzip/gzip.html - -comment "gzip needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/gzip/gzip.hash b/package.bak/gzip/gzip.hash deleted file mode 100644 index 466f846e12..0000000000 --- a/package.bak/gzip/gzip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ff1767ec444f71e5daf8972f6f8bf68cfcca1d2f76c248eb18e8741fc91dbbd3 gzip-1.8.tar.xz diff --git a/package.bak/gzip/gzip.mk b/package.bak/gzip/gzip.mk deleted file mode 100644 index c4e91b07cc..0000000000 --- a/package.bak/gzip/gzip.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# gzip -# -################################################################################ - -GZIP_VERSION = 1.8 -GZIP_SOURCE = gzip-$(GZIP_VERSION).tar.xz -GZIP_SITE = $(BR2_GNU_MIRROR)/gzip -# Some other tools expect it to be in /bin -GZIP_CONF_OPTS = --exec-prefix=/ -# Prefer full gzip over potentially lightweight/slower from busybox -GZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) -GZIP_LICENSE = GPLv3+ -GZIP_LICENSE_FILES = COPYING -GZIP_CONF_ENV += gl_cv_func_fflush_stdin=yes -# configure substitutes $(SHELL) for the shell shebang in scripts like -# gzexe. Unfortunately, the same $(SHELL) variable will also be used by -# make to run its commands. Fortunately, /bin/sh is always a POSIX shell -# on both the target and host systems that we support. Even with this, -# the configure check is slightly broken and prints a bogus warning: -# "using /bin/sh, even though it may have file descriptor bugs" -GZIP_CONF_ENV += ac_cv_path_shell=/bin/sh - -$(eval $(autotools-package)) diff --git a/package.bak/hans/Config.in b/package.bak/hans/Config.in deleted file mode 100644 index 7b60090f62..0000000000 --- a/package.bak/hans/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -comment "hans needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_HANS - bool "hans" - depends on BR2_INSTALL_LIBSTDCPP - help - Hans makes it possible to tunnel IPv4 through ICMP echo packets, - so you could call it a ping tunnel. - This can be useful when you find yourself in the situation - that your Internet access is firewalled, but pings are allowed. - - http://code.gerade.org/hans/ diff --git a/package.bak/hans/hans.hash b/package.bak/hans/hans.hash deleted file mode 100644 index c1a28df129..0000000000 --- a/package.bak/hans/hans.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/hanstunnel/files/source/ -md5 97a93a886bc766212257198fd99d1061 hans-0.4.4.tar.gz -sha1 8a21a9acc6d52cf7d2a5049523469e2609716ab3 hans-0.4.4.tar.gz diff --git a/package.bak/hans/hans.mk b/package.bak/hans/hans.mk deleted file mode 100644 index 5111d46be5..0000000000 --- a/package.bak/hans/hans.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# hans -# -################################################################################ - -HANS_VERSION = 0.4.4 -HANS_SITE = http://downloads.sourceforge.net/project/hanstunnel/source -HANS_LICENSE = GPLv3+ -HANS_LICENSE_FILES = LICENSE - -define HANS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) GCC="$(TARGET_CC)" GPP="$(TARGET_CXX)" -C $(@D) -endef - -define HANS_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/hans $(TARGET_DIR)/usr/sbin/hans -endef - -$(eval $(generic-package)) diff --git a/package.bak/harfbuzz/Config.in b/package.bak/harfbuzz/Config.in deleted file mode 100644 index a6db9840cc..0000000000 --- a/package.bak/harfbuzz/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_HARFBUZZ - bool "harfbuzz" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - help - HarfBuzz is an OpenType text shaping engine - - http://www.freedesktop.org/wiki/Software/HarfBuzz/ - - Harfbuzz can make optional use of cairo, freetype, - glib2 and icu packages if they are selected. - -comment "harfbuzz needs a toolchain w/ C++" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/harfbuzz/harfbuzz.hash b/package.bak/harfbuzz/harfbuzz.hash deleted file mode 100644 index 6bf5bee1ec..0000000000 --- a/package.bak/harfbuzz/harfbuzz.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.4.2.tar.bz2.sha256 -sha256 8f234dcfab000fdec24d43674fffa2fdbdbd654eb176afbde30e8826339cb7b3 harfbuzz-1.4.2.tar.bz2 diff --git a/package.bak/harfbuzz/harfbuzz.mk b/package.bak/harfbuzz/harfbuzz.mk deleted file mode 100644 index 458b072abf..0000000000 --- a/package.bak/harfbuzz/harfbuzz.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# harfbuzz -# -################################################################################ - -HARFBUZZ_VERSION = 1.4.2 -HARFBUZZ_SITE = http://www.freedesktop.org/software/harfbuzz/release -HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 -HARFBUZZ_LICENSE = MIT, ISC (ucdn library) -HARFBUZZ_LICENSE_FILES = COPYING src/hb-ucdn/COPYING -HARFBUZZ_INSTALL_STAGING = YES -HARFBUZZ_CONF_OPTS = --with-coretext=no --with-uniscribe=no - -# freetype & glib2 support required by host-pango -HOST_HARFBUZZ_DEPENDENCIES = \ - host-freetype \ - host-libglib2 -HOST_HARFBUZZ_CONF_OPTS = \ - --with-coretext=no \ - --with-uniscribe=no \ - --with-graphite2=no \ - --with-cairo=no \ - --with-icu=no \ - --with-freetype=yes \ - --with-glib=yes - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -# forgets to link test programs with -pthread breaking static link -HARFBUZZ_CONF_ENV = LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -ifeq ($(BR2_PACKAGE_CAIRO),y) -HARFBUZZ_DEPENDENCIES += cairo -HARFBUZZ_CONF_OPTS += --with-cairo=yes -else -HARFBUZZ_CONF_OPTS += --with-cairo=no -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -HARFBUZZ_DEPENDENCIES += freetype -HARFBUZZ_CONF_OPTS += --with-freetype=yes -else -HARFBUZZ_CONF_OPTS += --with-freetype=no -endif - -ifeq ($(BR2_PACKAGE_GRAPHITE2),y) -HARFBUZZ_DEPENDENCIES += graphite2 -HARFBUZZ_CONF_OPTS += --with-graphite2=yes -else -HARFBUZZ_CONF_OPTS += --with-graphite2=no -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -HARFBUZZ_DEPENDENCIES += libglib2 -HARFBUZZ_CONF_OPTS += --with-glib=yes -else -HARFBUZZ_CONF_OPTS += --with-glib=no -endif - -ifeq ($(BR2_PACKAGE_ICU),y) -HARFBUZZ_DEPENDENCIES += icu -HARFBUZZ_CONF_OPTS += --with-icu=yes -else -HARFBUZZ_CONF_OPTS += --with-icu=no -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/haserl/0001-add-haserl_lualib.inc.patch b/package.bak/haserl/0001-add-haserl_lualib.inc.patch deleted file mode 100644 index f9e2a95e42..0000000000 --- a/package.bak/haserl/0001-add-haserl_lualib.inc.patch +++ /dev/null @@ -1,149 +0,0 @@ -[HACK] add preprocessed lualib file so host-lua isn't needed - -Haserl no longer ships with haserl_lualib.inc, causing lua2c (which needs -host-lua support) to be built to generate it. - -Re-add .inc file from 0.9.33 so we don't need host-lua. - -Signed-off-by: Peter Korsgaard -Signed-off-by: Max Filippov ---- - src/Makefile.in | 3 - - src/haserl_lualib.inc | 97 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 98 insertions(+), 2 deletions(-) - -Index: haserl-0.9.33/src/haserl_lualib.inc -=================================================================== ---- /dev/null -+++ haserl-0.9.33/src/haserl_lualib.inc -@@ -0,0 +1,109 @@ -+/* This file was automatically generated from haserl_lualib.lua. DO NOT EDIT */ -+ -+static const unsigned char haserl_lualib[] = { -+ 27, 76,117, 97, 81, 0, 1, 4, 8, 4, 8, 0, 19, 0, 0, 0, -+ 0, 0, 0, 0, 64,104, 97,115,101,114,108, 95,108,117, 97,108, -+ 105, 98, 46,108,117, 97, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 2, 7, 24, 0, 0, 0, 10, 0, 0, 0, 74, 0, 0, 0,138, -+ 0, 0, 0,202, 0, 0, 0, 10, 1, 0, 0, 74, 1, 0, 0,138, -+ 1, 0, 0,135,129, 1, 0, 71, 65, 1, 0, 7, 1, 1, 0,199, -+ 192, 0, 0,135,128, 0, 0, 71, 64, 0, 0, 7, 0, 0, 0, 5, -+ 0, 0, 0,100, 0, 0, 0, 9, 64,128,131, 5, 0, 0, 0,100, -+ 64, 0, 0, 9, 64, 0,132, 5, 0, 0, 0,100,128, 0, 0, 9, -+ 64,128,132, 30, 0,128, 0, 10, 0, 0, 0, 4, 7, 0, 0, 0, -+ 0, 0, 0, 0,104, 97,115,101,114,108, 0, 4, 5, 0, 0, 0, -+ 0, 0, 0, 0, 70, 79, 82, 77, 0, 4, 4, 0, 0, 0, 0, 0, -+ 0, 0, 69, 78, 86, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 67, -+ 79, 79, 75, 73, 69, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 72, -+ 65, 83, 69, 82, 76, 0, 4, 4, 0, 0, 0, 0, 0, 0, 0, 71, -+ 69, 84, 0, 4, 5, 0, 0, 0, 0, 0, 0, 0, 80, 79, 83, 84, -+ 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,115,101,116,102,105,101, -+ 108,100, 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,103,101,116,102, -+ 105,101,108,100, 0, 4, 9, 0, 0, 0, 0, 0, 0, 0,109,121, -+ 112,117,116,101,110,118, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 25, 0, 0, 0, 39, 0, 0, 0, 0, 2, 0, 10, 29, -+ 0, 0, 0,133, 0, 0, 0,197, 64, 0, 0,198,128,192, 1, 0, -+ 1, 0, 0, 65,193, 0, 0,220, 0,129, 1, 22,128, 4,128, 5, -+ 2, 1, 0, 64, 2, 0, 3, 28,130, 0, 1, 26, 2, 0, 0, 22, -+ 192, 0,128, 5, 2, 1, 0, 64, 2, 0, 3, 28,130, 0, 1,128, -+ 1, 0, 4, 23, 64,193, 3, 22,128, 1,128, 6,130, 1, 1, 26, -+ 66, 0, 0, 22, 0, 0,128, 10, 2, 0, 0,137, 0, 2, 3,134, -+ 128, 1, 1, 22, 0, 0,128,137, 64, 0, 3,225,128, 0, 0, 22, -+ 128,250,127, 30, 0,128, 0, 6, 0, 0, 0, 4, 3, 0, 0, 0, -+ 0, 0, 0, 0, 95, 71, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, -+ 115,116,114,105,110,103, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, -+ 103,109, 97,116, 99,104, 0, 4, 15, 0, 0, 0, 0, 0, 0, 0, -+ 40, 91, 37,119, 95, 37, 45, 93, 43, 41, 40, 46, 63, 41, 0, 4, -+ 9, 0, 0, 0, 0, 0, 0, 0,116,111,110,117,109, 98,101,114, -+ 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 46, 0, 0, 0, 0, 0, -+ 29, 0, 0, 0, 27, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, -+ 28, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, 28, 0, 0, 0, -+ 29, 0, 0, 0, 29, 0, 0, 0, 29, 0, 0, 0, 29, 0, 0, 0, -+ 29, 0, 0, 0, 30, 0, 0, 0, 30, 0, 0, 0, 30, 0, 0, 0, -+ 30, 0, 0, 0, 32, 0, 0, 0, 32, 0, 0, 0, 33, 0, 0, 0, -+ 33, 0, 0, 0, 33, 0, 0, 0, 33, 0, 0, 0, 33, 0, 0, 0, -+ 34, 0, 0, 0, 34, 0, 0, 0, 36, 0, 0, 0, 28, 0, 0, 0, -+ 37, 0, 0, 0, 39, 0, 0, 0, 8, 0, 0, 0, 2, 0, 0, 0, -+ 0, 0, 0, 0,102, 0, 0, 0, 0, 0, 28, 0, 0, 0, 2, 0, -+ 0, 0, 0, 0, 0, 0,118, 0, 0, 0, 0, 0, 28, 0, 0, 0, -+ 2, 0, 0, 0, 0, 0, 0, 0,116, 0, 1, 0, 0, 0, 28, 0, -+ 0, 0, 16, 0, 0, 0, 0, 0, 0, 0, 40,102,111,114, 32,103, -+ 101,110,101,114, 97,116,111,114, 41, 0, 6, 0, 0, 0, 28, 0, -+ 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 40,102,111,114, 32,115, -+ 116, 97,116,101, 41, 0, 6, 0, 0, 0, 28, 0, 0, 0, 14, 0, -+ 0, 0, 0, 0, 0, 0, 40,102,111,114, 32, 99,111,110,116,114, -+ 111,108, 41, 0, 6, 0, 0, 0, 28, 0, 0, 0, 2, 0, 0, 0, -+ 0, 0, 0, 0,119, 0, 7, 0, 0, 0, 26, 0, 0, 0, 2, 0, -+ 0, 0, 0, 0, 0, 0,100, 0, 7, 0, 0, 0, 26, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, -+ 47, 0, 0, 0, 0, 1, 0, 8, 12, 0, 0, 0, 69, 0, 0, 0, -+ 133, 64, 0, 0,134,128, 64, 1,192, 0, 0, 0, 1,193, 0, 0, -+ 156, 0,129, 1, 22, 0, 0,128, 70, 64,129, 0,161, 64, 0, 0, -+ 22, 0,255,127, 94, 0, 0, 1, 30, 0,128, 0, 4, 0, 0, 0, -+ 4, 3, 0, 0, 0, 0, 0, 0, 0, 95, 71, 0, 4, 7, 0, 0, -+ 0, 0, 0, 0, 0,115,116,114,105,110,103, 0, 4, 7, 0, 0, -+ 0, 0, 0, 0, 0,103,109, 97,116, 99,104, 0, 4, 7, 0, 0, -+ 0, 0, 0, 0, 0, 91, 37,119, 95, 93, 43, 0, 0, 0, 0, 0, -+ 12, 0, 0, 0, 42, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, -+ 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, 43, 0, 0, 0, -+ 44, 0, 0, 0, 43, 0, 0, 0, 44, 0, 0, 0, 46, 0, 0, 0, -+ 47, 0, 0, 0, 6, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, -+ 102, 0, 0, 0, 0, 0, 11, 0, 0, 0, 2, 0, 0, 0, 0, 0, -+ 0, 0,118, 0, 1, 0, 0, 0, 11, 0, 0, 0, 16, 0, 0, 0, -+ 0, 0, 0, 0, 40,102,111,114, 32,103,101,110,101,114, 97,116, -+ 111,114, 41, 0, 6, 0, 0, 0, 10, 0, 0, 0, 12, 0, 0, 0, -+ 0, 0, 0, 0, 40,102,111,114, 32,115,116, 97,116,101, 41, 0, -+ 6, 0, 0, 0, 10, 0, 0, 0, 14, 0, 0, 0, 0, 0, 0, 0, -+ 40,102,111,114, 32, 99,111,110,116,114,111,108, 41, 0, 6, 0, -+ 0, 0, 10, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0,119, 0, -+ 7, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -+ 0, 0, 0, 0, 49, 0, 0, 0, 55, 0, 0, 0, 0, 2, 0, 6, -+ 20, 0, 0, 0,133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, -+ 1,129, 0, 0, 65,193, 0, 0,156,128, 0, 2, 0, 0, 0, 1, -+ 133, 0, 0, 0,134, 64, 64, 1,192, 0, 0, 0, 1, 1, 1, 0, -+ 65,193, 0, 0,156,128, 0, 2, 0, 0, 0, 1,133, 64, 1, 0, -+ 134,128, 65, 1,192, 0, 0, 0, 0, 1,128, 0,156, 64,128, 1, -+ 30, 0,128, 0, 7, 0, 0, 0, 4, 7, 0, 0, 0, 0, 0, 0, -+ 0,115,116,114,105,110,103, 0, 4, 5, 0, 0, 0, 0, 0, 0, -+ 0,103,115,117, 98, 0, 4, 7, 0, 0, 0, 0, 0, 0, 0, 91, -+ 92, 93, 92, 91, 93, 0, 4, 2, 0, 0, 0, 0, 0, 0, 0, 46, -+ 0, 4, 6, 0, 0, 0, 0, 0, 0, 0, 91, 92, 46, 93, 43, 0, -+ 4, 7, 0, 0, 0, 0, 0, 0, 0,104, 97,115,101,114,108, 0, -+ 4, 9, 0, 0, 0, 0, 0, 0, 0,115,101,116,102,105,101,108, -+ 100, 0, 0, 0, 0, 0, 20, 0, 0, 0, 51, 0, 0, 0, 51, 0, -+ 0, 0, 51, 0, 0, 0, 51, 0, 0, 0, 51, 0, 0, 0, 51, 0, -+ 0, 0, 51, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, -+ 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, 0, 0, 52, 0, -+ 0, 0, 54, 0, 0, 0, 54, 0, 0, 0, 54, 0, 0, 0, 54, 0, -+ 0, 0, 54, 0, 0, 0, 55, 0, 0, 0, 2, 0, 0, 0, 4, 0, -+ 0, 0, 0, 0, 0, 0,107,101,121, 0, 0, 0, 0, 0, 19, 0, -+ 0, 0, 6, 0, 0, 0, 0, 0, 0, 0,118, 97,108,117,101, 0, -+ 0, 0, 0, 0, 19, 0, 0, 0, 0, 0, 0, 0, 24, 0, 0, 0, -+ 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, -+ 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, -+ 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, 23, 0, 0, 0, -+ 23, 0, 0, 0, 23, 0, 0, 0, 25, 0, 0, 0, 39, 0, 0, 0, -+ 25, 0, 0, 0, 41, 0, 0, 0, 47, 0, 0, 0, 41, 0, 0, 0, -+ 49, 0, 0, 0, 55, 0, 0, 0, 49, 0, 0, 0, 55, 0, 0, 0, -+ 0, 0, 0, 0, 0, 0, 0, 0, -+}; -Index: haserl-0.9.29/src/Makefile.in -=================================================================== ---- haserl-0.9.29.orig/src/Makefile.in -+++ haserl-0.9.29/src/Makefile.in -@@ -32,7 +32,6 @@ - NORMAL_UNINSTALL = : - PRE_UNINSTALL = : - POST_UNINSTALL = : --@USE_LUA_TRUE@noinst_PROGRAMS = lua2c$(EXEEXT) - @INCLUDE_LUASHELL_TRUE@@USE_LUA_TRUE@am__append_1 = h_lua.c h_lua.h - @INCLUDE_LUACSHELL_TRUE@@USE_LUA_TRUE@am__append_2 = h_luac.c h_luac.h - bin_PROGRAMS = haserl$(EXEEXT) -@@ -515,7 +514,7 @@ - @USE_LUA_TRUE@ $(CC_FOR_BUILD) $(CFLAGS) $(LDFLAGS) $(lua2c_LDFLAGS) \ - @USE_LUA_TRUE@ -o $@ $^ $(LIBS) - --@USE_LUA_TRUE@haserl_lualib.inc : haserl_lualib.lua lua2c -+@USE_LUA_TRUE@haserl_lualib.inc : - @USE_LUA_TRUE@ if ! ./lua2c haserl_lualib haserl_lualib.lua >$@; then \ - @USE_LUA_TRUE@ rm $@; \ - @USE_LUA_TRUE@ exit 1 ;\ diff --git a/package.bak/haserl/Config.in b/package.bak/haserl/Config.in deleted file mode 100644 index 9ccc392d35..0000000000 --- a/package.bak/haserl/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_HASERL - bool "haserl" - depends on BR2_USE_MMU # fork() - help - Haserl is a small cgi wrapper that enables shell scripts to be - embedded into html documents. It is intended for environments - where something like PHP is too big. - - http://haserl.sourceforge.net/ - -config BR2_PACKAGE_HASERL_WITH_LUA - bool "Lua support" - depends on BR2_PACKAGE_HASERL - depends on BR2_PACKAGE_LUA - help - Enable Lua support for haserl diff --git a/package.bak/haserl/haserl.hash b/package.bak/haserl/haserl.hash deleted file mode 100644 index 2b23a6c6ee..0000000000 --- a/package.bak/haserl/haserl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/haserl/files/haserl-devel/ -md5 918f0b4f6cec0b438c8b5c78f2989010 haserl-0.9.35.tar.gz -sha1 9a331d41e9d47a81e81e158f9a16bf5443347cd4 haserl-0.9.35.tar.gz diff --git a/package.bak/haserl/haserl.mk b/package.bak/haserl/haserl.mk deleted file mode 100644 index 93d64c8732..0000000000 --- a/package.bak/haserl/haserl.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# haserl -# -################################################################################ - -HASERL_VERSION = 0.9.35 -HASERL_SITE = http://downloads.sourceforge.net/project/haserl/haserl-devel -HASERL_LICENSE = GPLv2 -HASERL_LICENSE_FILES = COPYING -HASERL_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_HASERL_WITH_LUA),y) -HASERL_CONF_OPTS += --with-lua -HASERL_DEPENDENCIES += lua - -# liblua uses dlopen when dynamically linked -ifneq ($(BR2_STATIC_LIBS),y) -HASERL_CONF_ENV += LIBS="-ldl" -endif - -else -HASERL_CONF_OPTS += --without-lua -endif - -define HASERL_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/share/haserl -endef - -HASERL_POST_INSTALL_TARGET_HOOKS += HASERL_REMOVE_EXAMPLES - -$(eval $(autotools-package)) diff --git a/package.bak/haveged/Config.in b/package.bak/haveged/Config.in deleted file mode 100644 index 0e49a2db7c..0000000000 --- a/package.bak/haveged/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HAVEGED - bool "haveged" - depends on BR2_USE_MMU # fork() - help - The haveged project is an attempt to provide an easy-to-use, - unpredictable random number generator based upon an adaptation - of the HAVEGE algorithm. - - http://www.issihosts.com/haveged/ diff --git a/package.bak/haveged/S21haveged b/package.bak/haveged/S21haveged deleted file mode 100755 index 3e6ce8678f..0000000000 --- a/package.bak/haveged/S21haveged +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -[ -x /usr/sbin/haveged ] || exit 0 - -case "$1" in - start) - printf "Starting haveged: " - start-stop-daemon -S -x /usr/sbin/haveged -- -w 1024 -r 0 - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping haveged: " - start-stop-daemon -K -x /usr/sbin/haveged - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit 0 diff --git a/package.bak/haveged/haveged.hash b/package.bak/haveged/haveged.hash deleted file mode 100644 index d1133b6931..0000000000 --- a/package.bak/haveged/haveged.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.issihosts.com/haveged/verify/haveged-1.9.1.sha1 -sha1 ab7234b7f57dbb7d500a5ab3cbf0494715ce6499 haveged-1.9.1.tar.gz diff --git a/package.bak/haveged/haveged.mk b/package.bak/haveged/haveged.mk deleted file mode 100644 index 66d69a6d7a..0000000000 --- a/package.bak/haveged/haveged.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# haveged -# -################################################################################ - -HAVEGED_VERSION = 1.9.1 -HAVEGED_SITE = http://www.issihosts.com/haveged -HAVEGED_LICENSE = GPLv3+ -HAVEGED_LICENSE_FILES = COPYING - -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -HAVEGED_CONF_OPTS += --enable-clock_gettime=yes -endif - -define HAVEGED_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/haveged/S21haveged \ - $(TARGET_DIR)/etc/init.d/S21haveged -endef - -define HAVEGED_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/haveged/haveged.service \ - $(TARGET_DIR)/usr/lib/systemd/system/haveged.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs /usr/lib/systemd/system/haveged.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/haveged.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/haveged/haveged.service b/package.bak/haveged/haveged.service deleted file mode 100644 index 91035c6711..0000000000 --- a/package.bak/haveged/haveged.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Entropy Harvesting Daemon -Documentation=man:haveged(8) - -[Service] -ExecStart=/usr/sbin/haveged -F -w 1024 -v 1 -SuccessExitStatus=143 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/hdparm/Config.in b/package.bak/hdparm/Config.in deleted file mode 100644 index 52385b18ce..0000000000 --- a/package.bak/hdparm/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HDPARM - bool "hdparm" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - hdparm - get/set hard disk parameters for Linux IDE drives. - - http://www.ibiblio.org/pub/Linux/system/hardware/ diff --git a/package.bak/hdparm/hdparm.hash b/package.bak/hdparm/hdparm.hash deleted file mode 100644 index 14021691c8..0000000000 --- a/package.bak/hdparm/hdparm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/hdparm/files/hdparm/ -md5 8fe0a71db02f7ffc602d14a69f766cff hdparm-9.51.tar.gz -sha1 cc9dc4cbaa00f7534988c37111be8e2c6e81cf73 hdparm-9.51.tar.gz diff --git a/package.bak/hdparm/hdparm.mk b/package.bak/hdparm/hdparm.mk deleted file mode 100644 index 4a53e9396f..0000000000 --- a/package.bak/hdparm/hdparm.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# hdparm -# -################################################################################ - -HDPARM_VERSION = 9.51 -HDPARM_SITE = http://downloads.sourceforge.net/project/hdparm/hdparm -HDPARM_LICENSE = BSD-Style -HDPARM_LICENSE_FILES = LICENSE.TXT - -define HDPARM_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - STRIP=/bin/true -endef - -define HDPARM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/hdparm $(TARGET_DIR)/sbin/hdparm -endef - -$(eval $(generic-package)) diff --git a/package.bak/heimdal/heimdal.hash b/package.bak/heimdal/heimdal.hash deleted file mode 100644 index 12770e17ff..0000000000 --- a/package.bak/heimdal/heimdal.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 cee58ab3a4ce79f243a3e73f465dac19fe2b93ef1c5ff244d6f1d689fedbde2d heimdal-7.1.0.tar.gz diff --git a/package.bak/heimdal/heimdal.mk b/package.bak/heimdal/heimdal.mk deleted file mode 100644 index 5376a6c40e..0000000000 --- a/package.bak/heimdal/heimdal.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# heimdal -# -################################################################################ - -HEIMDAL_VERSION = 7.1.0 -HEIMDAL_SITE = http://www.h5l.org/dist/src -HOST_HEIMDAL_DEPENDENCIES = host-e2fsprogs host-ncurses host-pkgconf -HEIMDAL_INSTALL_STAGING = YES -HEIMDAL_MAKE = $(MAKE1) -# static because of -fPIC issues with e2fsprogs on x86_64 host -HOST_HEIMDAL_CONF_OPTS = \ - --disable-shared \ - --enable-static \ - --without-openldap \ - --without-capng \ - --without-sqlite3 \ - --without-libintl \ - --without-openssl \ - --without-berkeley-db \ - --without-readline \ - --without-libedit \ - --without-hesiod \ - --without-x \ - --disable-heimdal-documentation -HOST_HEIMDAL_CONF_ENV = MAKEINFO=true -HEIMDAL_LICENSE = BSD-3c -HEIMDAL_LICENSE_FILES = LICENSE - -# We need asn1_compile in the PATH for samba4 -define HOST_HEIMDAL_MAKE_SYMLINK - ln -sf $(HOST_DIR)/usr/libexec/heimdal/asn1_compile \ - $(HOST_DIR)/usr/bin/asn1_compile - ln -sf $(HOST_DIR)/usr/bin/compile_et \ - $(HOST_DIR)/usr/libexec/heimdal/compile_et -endef - -HOST_HEIMDAL_POST_INSTALL_HOOKS += HOST_HEIMDAL_MAKE_SYMLINK - -$(eval $(host-autotools-package)) diff --git a/package.bak/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch b/package.bak/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch deleted file mode 100644 index db5b19ee52..0000000000 --- a/package.bak/heirloom-mailx/0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch +++ /dev/null @@ -1,42 +0,0 @@ -From: Hilko Bengen -Date: Wed, 27 Apr 2011 00:18:42 +0200 -Subject: Patched out SSL2 support since it is no longer supported by OpenSSL. - -Now that openssl has dropped SSLv2 support we need to patch it out. -Patch picked up from debian patchseries 5. - -Signed-off-by: Gustavo Zacarias - ---- - mailx.1 | 2 +- - openssl.c | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/mailx.1 b/mailx.1 -index 417ea04..a02e430 100644 ---- a/mailx.1 -+++ b/mailx.1 -@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL. - .TP - .B ssl-method - Selects a SSL/TLS protocol version; --valid values are `ssl2', `ssl3', and `tls1'. -+valid values are `ssl3', and `tls1'. - If unset, the method is selected automatically, - if possible. - .TP -diff --git a/openssl.c b/openssl.c -index b4e33fc..44fe4e5 100644 ---- a/openssl.c -+++ b/openssl.c -@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp) - - cp = ssl_method_string(uhp); - if (cp != NULL) { -- if (equal(cp, "ssl2")) -- method = SSLv2_client_method(); -- else if (equal(cp, "ssl3")) -+ if (equal(cp, "ssl3")) - method = SSLv3_client_method(); - else if (equal(cp, "tls1")) - method = TLSv1_client_method(); diff --git a/package.bak/heirloom-mailx/Config.in b/package.bak/heirloom-mailx/Config.in deleted file mode 100644 index 87664b489e..0000000000 --- a/package.bak/heirloom-mailx/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_HEIRLOOM_MAILX - bool "heirloom-mailx" - # uses fork() - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - help - Heirloom mailx (previously known as nail) is a mail user - agent for Unix systems. - - It can be used as a command-line mail reader, but also more - importantly on embedded systems, as a mail composition - program and SMTP client, in order to send e-mail from shell - scripts. It supports SMTP authentication (login, plain, - cram-md5), SMTPS, MIME encoding of attachements, and more. - - http://heirloom.sourceforge.net/mailx.html - -comment "heirloom-mailx needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/heirloom-mailx/heirloom-mailx.hash b/package.bak/heirloom-mailx/heirloom-mailx.hash deleted file mode 100644 index 6fc36c9532..0000000000 --- a/package.bak/heirloom-mailx/heirloom-mailx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-3.dsc -sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz diff --git a/package.bak/heirloom-mailx/heirloom-mailx.mk b/package.bak/heirloom-mailx/heirloom-mailx.mk deleted file mode 100644 index 044cd8cf3a..0000000000 --- a/package.bak/heirloom-mailx/heirloom-mailx.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# heirloom-mailx -# -################################################################################ - -HEIRLOOM_MAILX_VERSION = 12.5 -HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz -HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx -HEIRLOOM_MAILX_LICENSE = BSD-4c, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPLv1.1 (nss) -HEIRLOOM_MAILX_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -HEIRLOOM_MAILX_DEPENDENCIES += openssl -endif - -define HEIRLOOM_MAILX_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(SHELL) ./makeconfig) -endef - -# -fPIC is needed to build with NIOS2 toolchains. -define HEIRLOOM_MAILX_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - CFLAGS="$(TARGET_CFLAGS) -fPIC" \ - -C $(@D) -endef - -define HEIRLOOM_MAILX_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - PREFIX=/usr \ - UCBINSTALL=$(INSTALL) \ - STRIP=/bin/true \ - DESTDIR=$(TARGET_DIR) \ - install -endef - -$(eval $(generic-package)) diff --git a/package.bak/hiawatha/Config.in b/package.bak/hiawatha/Config.in deleted file mode 100644 index 68e47fde87..0000000000 --- a/package.bak/hiawatha/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -comment "hiawatha needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_HIAWATHA - bool "hiawatha" - # needs fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ZLIB - help - Hiawatha is a webserver for Unix and has been built with - security in mind. This resulted in a highly secure - webserver, in both code and features. - - This webserver runs on Linux, BSD, MacOS X and - Windows. Although it can run any kind of CGI / FastCGI - application, it has been optimized for usage with PHP. Most - well known PHP frameworks and CMS applications have been - tested with Hiawatha and ran without a problem. Hiawatha - supports many web and HTTP features such as CGI/FastCGI, - HTTP authentication, virtual host support, request - pipelining, keep alive connections, URL rewriting and many - more. - - http://www.hiawatha-webserver.org/ - -if BR2_PACKAGE_HIAWATHA - -config BR2_PACKAGE_HIAWATHA_SSL - bool "hiawatha TLS support" - select BR2_PACKAGE_MBEDTLS - -endif diff --git a/package.bak/hiawatha/hiawatha.hash b/package.bak/hiawatha/hiawatha.hash deleted file mode 100644 index 636dfd5de0..0000000000 --- a/package.bak/hiawatha/hiawatha.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d76155430dc9100de412088bd68978a2a9052832609c7ac961dccaf2550c618a hiawatha-10.5.tar.gz diff --git a/package.bak/hiawatha/hiawatha.mk b/package.bak/hiawatha/hiawatha.mk deleted file mode 100644 index abe57b7f7b..0000000000 --- a/package.bak/hiawatha/hiawatha.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# hiawatha -# -################################################################################ - -HIAWATHA_VERSION = 10.5 -HIAWATHA_SITE = http://www.hiawatha-webserver.org/files -HIAWATHA_DEPENDENCIES = zlib -HIAWATHA_LICENSE = GPLv2 -HIAWATHA_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_HIAWATHA_SSL),y) -HIAWATHA_CONF_OPTS += -DUSE_SYSTEM_MBEDTLS=ON -HIAWATHA_DEPENDENCIES += mbedtls -else -HIAWATHA_CONF_OPTS += -DENABLE_TLS=OFF -endif - -HIAWATHA_CONF_OPTS += \ - -DENABLE_TOOLKIT=OFF \ - -DENABLE_XSLT=OFF \ - -DCONFIG_DIR=/etc/hiawatha \ - -DLOG_DIR=/var/log \ - -DPID_DIR=/var/run \ - -DWEBROOT_DIR=/var/www/hiawatha \ - -DWORK_DIR=/var/lib/hiawatha - -$(eval $(cmake-package)) diff --git a/package.bak/hicolor-icon-theme/Config.in b/package.bak/hicolor-icon-theme/Config.in deleted file mode 100644 index 6cda097c12..0000000000 --- a/package.bak/hicolor-icon-theme/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_HICOLOR_ICON_THEME - bool "hicolor icon theme" - help - Freedesktop Hicolor icon theme - - This is the fallback icon theme, which only creates the - standard directory structure for storing icons of third-party - applications (i.e. the ones not available in usual icon themes). diff --git a/package.bak/hicolor-icon-theme/hicolor-icon-theme.hash b/package.bak/hicolor-icon-theme/hicolor-icon-theme.hash deleted file mode 100644 index 522dcfcd82..0000000000 --- a/package.bak/hicolor-icon-theme/hicolor-icon-theme.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9cc45ac3318c31212ea2d8cb99e64020732393ee7630fa6c1810af5f987033cc hicolor-icon-theme-0.15.tar.xz diff --git a/package.bak/hicolor-icon-theme/hicolor-icon-theme.mk b/package.bak/hicolor-icon-theme/hicolor-icon-theme.mk deleted file mode 100644 index 5e000749f7..0000000000 --- a/package.bak/hicolor-icon-theme/hicolor-icon-theme.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# hicolor-icon-theme -# -################################################################################ - -HICOLOR_ICON_THEME_VERSION = 0.15 -HICOLOR_ICON_THEME_SITE = http://icon-theme.freedesktop.org/releases -HICOLOR_ICON_THEME_SOURCE = hicolor-icon-theme-$(HICOLOR_ICON_THEME_VERSION).tar.xz -HICOLOR_ICON_THEME_LICENSE = GPLv2 -HICOLOR_ICON_THEME_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch b/package.bak/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch deleted file mode 100644 index 4740cb7b88..0000000000 --- a/package.bak/hidapi/0001-hidtest-dont-use-a-C-source-file-since-it-s-pure-C.patch +++ /dev/null @@ -1,445 +0,0 @@ -From 2fb04c2245167e247b95400112b5dbea12fcb206 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 30 Dec 2015 20:02:29 +0100 -Subject: [PATCH] hidtest: dont' use a C++ source file, since it's pure C - -This allows to build the test program with toolchains that don't have -C++ support. - -Signed-off-by: Thomas Petazzoni ---- - hidtest/Makefile.am | 6 +- - hidtest/hidtest.c | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - hidtest/hidtest.cpp | 194 ---------------------------------------------------- - 3 files changed, 197 insertions(+), 197 deletions(-) - create mode 100644 hidtest/hidtest.c - delete mode 100644 hidtest/hidtest.cpp - -diff --git a/hidtest/Makefile.am b/hidtest/Makefile.am -index d278644..5f52c3f 100644 ---- a/hidtest/Makefile.am -+++ b/hidtest/Makefile.am -@@ -4,17 +4,17 @@ AM_CPPFLAGS = -I$(top_srcdir)/hidapi/ - if OS_LINUX - noinst_PROGRAMS = hidtest-libusb hidtest-hidraw - --hidtest_hidraw_SOURCES = hidtest.cpp -+hidtest_hidraw_SOURCES = hidtest.c - hidtest_hidraw_LDADD = $(top_builddir)/linux/libhidapi-hidraw.la - --hidtest_libusb_SOURCES = hidtest.cpp -+hidtest_libusb_SOURCES = hidtest.c - hidtest_libusb_LDADD = $(top_builddir)/libusb/libhidapi-libusb.la - else - - # Other OS's - noinst_PROGRAMS = hidtest - --hidtest_SOURCES = hidtest.cpp -+hidtest_SOURCES = hidtest.c - hidtest_LDADD = $(top_builddir)/$(backend)/libhidapi.la - - endif -diff --git a/hidtest/hidtest.c b/hidtest/hidtest.c -new file mode 100644 -index 0000000..94f0a5c ---- /dev/null -+++ b/hidtest/hidtest.c -@@ -0,0 +1,194 @@ -+/******************************************************* -+ Windows HID simplification -+ -+ Alan Ott -+ Signal 11 Software -+ -+ 8/22/2009 -+ -+ Copyright 2009 -+ -+ This contents of this file may be used by anyone -+ for any reason without any conditions and may be -+ used as a starting point for your own applications -+ which use HIDAPI. -+********************************************************/ -+ -+#include -+#include -+#include -+#include -+#include "hidapi.h" -+ -+// Headers needed for sleeping. -+#ifdef _WIN32 -+ #include -+#else -+ #include -+#endif -+ -+int main(int argc, char* argv[]) -+{ -+ int res; -+ unsigned char buf[256]; -+ #define MAX_STR 255 -+ wchar_t wstr[MAX_STR]; -+ hid_device *handle; -+ int i; -+ -+#ifdef WIN32 -+ UNREFERENCED_PARAMETER(argc); -+ UNREFERENCED_PARAMETER(argv); -+#endif -+ -+ struct hid_device_info *devs, *cur_dev; -+ -+ if (hid_init()) -+ return -1; -+ -+ devs = hid_enumerate(0x0, 0x0); -+ cur_dev = devs; -+ while (cur_dev) { -+ printf("Device Found\n type: %04hx %04hx\n path: %s\n serial_number: %ls", cur_dev->vendor_id, cur_dev->product_id, cur_dev->path, cur_dev->serial_number); -+ printf("\n"); -+ printf(" Manufacturer: %ls\n", cur_dev->manufacturer_string); -+ printf(" Product: %ls\n", cur_dev->product_string); -+ printf(" Release: %hx\n", cur_dev->release_number); -+ printf(" Interface: %d\n", cur_dev->interface_number); -+ printf("\n"); -+ cur_dev = cur_dev->next; -+ } -+ hid_free_enumeration(devs); -+ -+ // Set up the command buffer. -+ memset(buf,0x00,sizeof(buf)); -+ buf[0] = 0x01; -+ buf[1] = 0x81; -+ -+ -+ // Open the device using the VID, PID, -+ // and optionally the Serial number. -+ ////handle = hid_open(0x4d8, 0x3f, L"12345"); -+ handle = hid_open(0x4d8, 0x3f, NULL); -+ if (!handle) { -+ printf("unable to open device\n"); -+ return 1; -+ } -+ -+ // Read the Manufacturer String -+ wstr[0] = 0x0000; -+ res = hid_get_manufacturer_string(handle, wstr, MAX_STR); -+ if (res < 0) -+ printf("Unable to read manufacturer string\n"); -+ printf("Manufacturer String: %ls\n", wstr); -+ -+ // Read the Product String -+ wstr[0] = 0x0000; -+ res = hid_get_product_string(handle, wstr, MAX_STR); -+ if (res < 0) -+ printf("Unable to read product string\n"); -+ printf("Product String: %ls\n", wstr); -+ -+ // Read the Serial Number String -+ wstr[0] = 0x0000; -+ res = hid_get_serial_number_string(handle, wstr, MAX_STR); -+ if (res < 0) -+ printf("Unable to read serial number string\n"); -+ printf("Serial Number String: (%d) %ls", wstr[0], wstr); -+ printf("\n"); -+ -+ // Read Indexed String 1 -+ wstr[0] = 0x0000; -+ res = hid_get_indexed_string(handle, 1, wstr, MAX_STR); -+ if (res < 0) -+ printf("Unable to read indexed string 1\n"); -+ printf("Indexed String 1: %ls\n", wstr); -+ -+ // Set the hid_read() function to be non-blocking. -+ hid_set_nonblocking(handle, 1); -+ -+ // Try to read from the device. There shoud be no -+ // data here, but execution should not block. -+ res = hid_read(handle, buf, 17); -+ -+ // Send a Feature Report to the device -+ buf[0] = 0x2; -+ buf[1] = 0xa0; -+ buf[2] = 0x0a; -+ buf[3] = 0x00; -+ buf[4] = 0x00; -+ res = hid_send_feature_report(handle, buf, 17); -+ if (res < 0) { -+ printf("Unable to send a feature report.\n"); -+ } -+ -+ memset(buf,0,sizeof(buf)); -+ -+ // Read a Feature Report from the device -+ buf[0] = 0x2; -+ res = hid_get_feature_report(handle, buf, sizeof(buf)); -+ if (res < 0) { -+ printf("Unable to get a feature report.\n"); -+ printf("%ls", hid_error(handle)); -+ } -+ else { -+ // Print out the returned buffer. -+ printf("Feature Report\n "); -+ for (i = 0; i < res; i++) -+ printf("%02hhx ", buf[i]); -+ printf("\n"); -+ } -+ -+ memset(buf,0,sizeof(buf)); -+ -+ // Toggle LED (cmd 0x80). The first byte is the report number (0x1). -+ buf[0] = 0x1; -+ buf[1] = 0x80; -+ res = hid_write(handle, buf, 17); -+ if (res < 0) { -+ printf("Unable to write()\n"); -+ printf("Error: %ls\n", hid_error(handle)); -+ } -+ -+ -+ // Request state (cmd 0x81). The first byte is the report number (0x1). -+ buf[0] = 0x1; -+ buf[1] = 0x81; -+ hid_write(handle, buf, 17); -+ if (res < 0) -+ printf("Unable to write() (2)\n"); -+ -+ // Read requested state. hid_read() has been set to be -+ // non-blocking by the call to hid_set_nonblocking() above. -+ // This loop demonstrates the non-blocking nature of hid_read(). -+ res = 0; -+ while (res == 0) { -+ res = hid_read(handle, buf, sizeof(buf)); -+ if (res == 0) -+ printf("waiting...\n"); -+ if (res < 0) -+ printf("Unable to read()\n"); -+ #ifdef WIN32 -+ Sleep(500); -+ #else -+ usleep(500*1000); -+ #endif -+ } -+ -+ printf("Data read:\n "); -+ // Print out the returned buffer. -+ for (i = 0; i < res; i++) -+ printf("%02hhx ", buf[i]); -+ printf("\n"); -+ -+ hid_close(handle); -+ -+ /* Free static HIDAPI objects. */ -+ hid_exit(); -+ -+#ifdef WIN32 -+ system("pause"); -+#endif -+ -+ return 0; -+} -diff --git a/hidtest/hidtest.cpp b/hidtest/hidtest.cpp -deleted file mode 100644 -index 94f0a5c..0000000 ---- a/hidtest/hidtest.cpp -+++ /dev/null -@@ -1,194 +0,0 @@ --/******************************************************* -- Windows HID simplification -- -- Alan Ott -- Signal 11 Software -- -- 8/22/2009 -- -- Copyright 2009 -- -- This contents of this file may be used by anyone -- for any reason without any conditions and may be -- used as a starting point for your own applications -- which use HIDAPI. --********************************************************/ -- --#include --#include --#include --#include --#include "hidapi.h" -- --// Headers needed for sleeping. --#ifdef _WIN32 -- #include --#else -- #include --#endif -- --int main(int argc, char* argv[]) --{ -- int res; -- unsigned char buf[256]; -- #define MAX_STR 255 -- wchar_t wstr[MAX_STR]; -- hid_device *handle; -- int i; -- --#ifdef WIN32 -- UNREFERENCED_PARAMETER(argc); -- UNREFERENCED_PARAMETER(argv); --#endif -- -- struct hid_device_info *devs, *cur_dev; -- -- if (hid_init()) -- return -1; -- -- devs = hid_enumerate(0x0, 0x0); -- cur_dev = devs; -- while (cur_dev) { -- printf("Device Found\n type: %04hx %04hx\n path: %s\n serial_number: %ls", cur_dev->vendor_id, cur_dev->product_id, cur_dev->path, cur_dev->serial_number); -- printf("\n"); -- printf(" Manufacturer: %ls\n", cur_dev->manufacturer_string); -- printf(" Product: %ls\n", cur_dev->product_string); -- printf(" Release: %hx\n", cur_dev->release_number); -- printf(" Interface: %d\n", cur_dev->interface_number); -- printf("\n"); -- cur_dev = cur_dev->next; -- } -- hid_free_enumeration(devs); -- -- // Set up the command buffer. -- memset(buf,0x00,sizeof(buf)); -- buf[0] = 0x01; -- buf[1] = 0x81; -- -- -- // Open the device using the VID, PID, -- // and optionally the Serial number. -- ////handle = hid_open(0x4d8, 0x3f, L"12345"); -- handle = hid_open(0x4d8, 0x3f, NULL); -- if (!handle) { -- printf("unable to open device\n"); -- return 1; -- } -- -- // Read the Manufacturer String -- wstr[0] = 0x0000; -- res = hid_get_manufacturer_string(handle, wstr, MAX_STR); -- if (res < 0) -- printf("Unable to read manufacturer string\n"); -- printf("Manufacturer String: %ls\n", wstr); -- -- // Read the Product String -- wstr[0] = 0x0000; -- res = hid_get_product_string(handle, wstr, MAX_STR); -- if (res < 0) -- printf("Unable to read product string\n"); -- printf("Product String: %ls\n", wstr); -- -- // Read the Serial Number String -- wstr[0] = 0x0000; -- res = hid_get_serial_number_string(handle, wstr, MAX_STR); -- if (res < 0) -- printf("Unable to read serial number string\n"); -- printf("Serial Number String: (%d) %ls", wstr[0], wstr); -- printf("\n"); -- -- // Read Indexed String 1 -- wstr[0] = 0x0000; -- res = hid_get_indexed_string(handle, 1, wstr, MAX_STR); -- if (res < 0) -- printf("Unable to read indexed string 1\n"); -- printf("Indexed String 1: %ls\n", wstr); -- -- // Set the hid_read() function to be non-blocking. -- hid_set_nonblocking(handle, 1); -- -- // Try to read from the device. There shoud be no -- // data here, but execution should not block. -- res = hid_read(handle, buf, 17); -- -- // Send a Feature Report to the device -- buf[0] = 0x2; -- buf[1] = 0xa0; -- buf[2] = 0x0a; -- buf[3] = 0x00; -- buf[4] = 0x00; -- res = hid_send_feature_report(handle, buf, 17); -- if (res < 0) { -- printf("Unable to send a feature report.\n"); -- } -- -- memset(buf,0,sizeof(buf)); -- -- // Read a Feature Report from the device -- buf[0] = 0x2; -- res = hid_get_feature_report(handle, buf, sizeof(buf)); -- if (res < 0) { -- printf("Unable to get a feature report.\n"); -- printf("%ls", hid_error(handle)); -- } -- else { -- // Print out the returned buffer. -- printf("Feature Report\n "); -- for (i = 0; i < res; i++) -- printf("%02hhx ", buf[i]); -- printf("\n"); -- } -- -- memset(buf,0,sizeof(buf)); -- -- // Toggle LED (cmd 0x80). The first byte is the report number (0x1). -- buf[0] = 0x1; -- buf[1] = 0x80; -- res = hid_write(handle, buf, 17); -- if (res < 0) { -- printf("Unable to write()\n"); -- printf("Error: %ls\n", hid_error(handle)); -- } -- -- -- // Request state (cmd 0x81). The first byte is the report number (0x1). -- buf[0] = 0x1; -- buf[1] = 0x81; -- hid_write(handle, buf, 17); -- if (res < 0) -- printf("Unable to write() (2)\n"); -- -- // Read requested state. hid_read() has been set to be -- // non-blocking by the call to hid_set_nonblocking() above. -- // This loop demonstrates the non-blocking nature of hid_read(). -- res = 0; -- while (res == 0) { -- res = hid_read(handle, buf, sizeof(buf)); -- if (res == 0) -- printf("waiting...\n"); -- if (res < 0) -- printf("Unable to read()\n"); -- #ifdef WIN32 -- Sleep(500); -- #else -- usleep(500*1000); -- #endif -- } -- -- printf("Data read:\n "); -- // Print out the returned buffer. -- for (i = 0; i < res; i++) -- printf("%02hhx ", buf[i]); -- printf("\n"); -- -- hid_close(handle); -- -- /* Free static HIDAPI objects. */ -- hid_exit(); -- --#ifdef WIN32 -- system("pause"); --#endif -- -- return 0; --} --- -2.7.4 - diff --git a/package.bak/hidapi/Config.in b/package.bak/hidapi/Config.in deleted file mode 100644 index f6a31bacd3..0000000000 --- a/package.bak/hidapi/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_HIDAPI - bool "hidapi" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - HIDAPI is a multi-platform library which allows an application - to interface with USB and Bluetooth HID-Class devices on - Windows, Linux, and Mac OS X. - - http://www.signal11.us/oss/hidapi/ - -comment "hidapi needs udev /dev management and a toolchain w/ NPTL threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/hidapi/hidapi.hash b/package.bak/hidapi/hidapi.hash deleted file mode 100644 index ed22c78866..0000000000 --- a/package.bak/hidapi/hidapi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f2ffe5dbba12dfa0a647ae71b1ec5612fed4c20322ef6f6fd46f6f9713ed1a8e hidapi-b5b2e1779b6cd2edda3066bbbf0921a2d6b1c3c0.tar.gz diff --git a/package.bak/hidapi/hidapi.mk b/package.bak/hidapi/hidapi.mk deleted file mode 100644 index 9922efc029..0000000000 --- a/package.bak/hidapi/hidapi.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# hidapi -# -################################################################################ - -# Use master version as the current stable is very old and some bugs -# have been fixed since then. -HIDAPI_VERSION = b5b2e1779b6cd2edda3066bbbf0921a2d6b1c3c0 -HIDAPI_SITE = $(call github,signal11,hidapi,$(HIDAPI_VERSION)) -HIDAPI_INSTALL_STAGING = YES -# No configure provided, so we need to autoreconf. -HIDAPI_AUTORECONF = YES -HIDAPI_LICENSE = GPLv3 or BSD-3c or HIDAPI license -HIDAPI_LICENSE_FILES = LICENSE.txt LICENSE-gpl3.txt LICENSE-bsd.txt LICENSE-orig.txt - -HIDAPI_DEPENDENCIES = libusb libgudev - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -HIDAPI_DEPENDENCIES += libiconv -HIDAPI_CONF_ENV += LIBS="-liconv" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/hiredis/Config.in b/package.bak/hiredis/Config.in deleted file mode 100644 index 1656355395..0000000000 --- a/package.bak/hiredis/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_HIREDIS - bool "hiredis" - help - Minimalistic C client for Redis >= 1.2 - - It is minimalistic because it just adds minimal support for - the protocol, but at the same time it uses a high level - printf-alike API in order to make it much higher level than - otherwise suggested by its minimal code base and the lack of - explicit bindings for every Redis command. - - https://github.com/redis/hiredis diff --git a/package.bak/hiredis/hiredis.hash b/package.bak/hiredis/hiredis.hash deleted file mode 100644 index 2c788a677f..0000000000 --- a/package.bak/hiredis/hiredis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 717e6fc8dc2819bef522deaca516de9e51b9dfa68fe393b7db5c3b6079196f78 hiredis-v0.13.3.tar.gz diff --git a/package.bak/hiredis/hiredis.mk b/package.bak/hiredis/hiredis.mk deleted file mode 100644 index cd406f1439..0000000000 --- a/package.bak/hiredis/hiredis.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# hiredis -# -################################################################################ - -HIREDIS_VERSION = v0.13.3 -HIREDIS_SITE = $(call github,redis,hiredis,$(HIREDIS_VERSION)) -HIREDIS_LICENSE = BSD-3c -HIREDIS_LICENSE_FILES = COPYING -HIREDIS_INSTALL_STAGING = YES - -HIREDIS_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - PREFIX=/usr - -HIREDIS_TARGETS = hiredis.pc -ifeq ($(BR2_STATIC_LIBS),y) -HIREDIS_TARGETS += static -else ifeq ($(BR2_SHARED_LIBS),y) -HIREDIS_TARGETS += dynamic -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -HIREDIS_TARGETS += dynamic static -endif - -define HIREDIS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(HIREDIS_MAKE_OPTS) -C $(@D) \ - $(HIREDIS_TARGETS) -endef - -HIREDIS_INCLUDE_DIR = $(STAGING_DIR)/usr/include/hiredis - -# Do not call make install as this target will build shared and static libraries -define HIREDIS_INSTALL_STAGING_CMDS - mkdir -p $(HIREDIS_INCLUDE_DIR) - cp -dpfr $(@D)/hiredis.h $(@D)/async.h $(@D)/read.h $(@D)/sds.h \ - $(@D)/adapters $(HIREDIS_INCLUDE_DIR) - $(INSTALL) -D -m 0644 $(@D)/hiredis.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/hiredis.pc - $(INSTALL) -m 0644 -t $(STAGING_DIR)/usr/lib $(@D)/libhiredis* -endef - -define HIREDIS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - $(INSTALL) -m 0644 -t $(TARGET_DIR)/usr/lib $(@D)/libhiredis* -endef - -$(eval $(generic-package)) diff --git a/package.bak/hostapd/Config.in b/package.bak/hostapd/Config.in deleted file mode 100644 index 62fbb66d63..0000000000 --- a/package.bak/hostapd/Config.in +++ /dev/null @@ -1,45 +0,0 @@ -config BR2_PACKAGE_HOSTAPD - bool "hostapd" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBNL - help - User space daemon for wireless access points. - - It implements IEEE 802.11 access point management, - IEEE 802.1X/WPA/WPA2/EAP authenticators, RADIUS client, - EAP server and RADIUS authentication server. - - http://hostap.epitest.fi/ - -if BR2_PACKAGE_HOSTAPD - -config BR2_PACKAGE_HOSTAPD_ACS - bool "Enable ACS" - default y - help - Enable support for standard ACS (Automatic Channel Selection). - Some propietary drivers use a custom algorithm which requires - channel to be set to '0' (which enables ACS in the config), - causing hostapd to use the standard one which doesn't work - for those cases. - -config BR2_PACKAGE_HOSTAPD_EAP - bool "Enable EAP" - depends on !BR2_STATIC_LIBS - help - Enable support for EAP and RADIUS. - -comment "hostapd EAP needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_HOSTAPD_WPS - bool "Enable WPS" - help - Enable support for Wi-Fi Protected Setup. - -endif - -comment "hostapd needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/hostapd/hostapd.hash b/package.bak/hostapd/hostapd.hash deleted file mode 100644 index fb891476b3..0000000000 --- a/package.bak/hostapd/hostapd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 01526b90c1d23bec4b0f052039cc4456c2fd19347b4d830d1d58a0a6aea7117d hostapd-2.6.tar.gz diff --git a/package.bak/hostapd/hostapd.mk b/package.bak/hostapd/hostapd.mk deleted file mode 100644 index a499011385..0000000000 --- a/package.bak/hostapd/hostapd.mk +++ /dev/null @@ -1,93 +0,0 @@ -################################################################################ -# -# hostapd -# -################################################################################ - -HOSTAPD_VERSION = 2.6 -HOSTAPD_SITE = http://hostap.epitest.fi/releases -HOSTAPD_SUBDIR = hostapd -HOSTAPD_CONFIG = $(HOSTAPD_DIR)/$(HOSTAPD_SUBDIR)/.config -HOSTAPD_DEPENDENCIES = host-pkgconf libnl -HOSTAPD_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -HOSTAPD_LICENSE = BSD-3c -HOSTAPD_LICENSE_FILES = README -HOSTAPD_CONFIG_SET = - -HOSTAPD_CONFIG_ENABLE = \ - CONFIG_FULL_DYNAMIC_VLAN \ - CONFIG_HS20 \ - CONFIG_IEEE80211AC \ - CONFIG_IEEE80211N \ - CONFIG_IEEE80211R \ - CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_INTERWORKING \ - CONFIG_LIBNL32 \ - CONFIG_VLAN_NETLINK - -HOSTAPD_CONFIG_DISABLE = - -# libnl-3 needs -lm (for rint) and -lpthread if linking statically -# And library order matters hence stick -lnl-3 first since it's appended -# in the hostapd Makefiles as in LIBS+=-lnl-3 ... thus failing -ifeq ($(BR2_STATIC_LIBS),y) -HOSTAPD_LIBS += -lnl-3 -lm -lpthread -endif - -# Try to use openssl if it's already available -ifeq ($(BR2_PACKAGE_OPENSSL),y) -HOSTAPD_DEPENDENCIES += openssl -HOSTAPD_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz) -HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' -else -HOSTAPD_CONFIG_DISABLE += CONFIG_EAP_PWD -HOSTAPD_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' -endif - -ifeq ($(BR2_PACKAGE_HOSTAPD_ACS),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_ACS -endif - -ifeq ($(BR2_PACKAGE_HOSTAPD_EAP),y) -HOSTAPD_CONFIG_ENABLE += \ - CONFIG_EAP \ - CONFIG_RADIUS_SERVER \ - -# Enable both TLS v1.1 (CONFIG_TLSV11) and v1.2 (CONFIG_TLSV12) -HOSTAPD_CONFIG_ENABLE += CONFIG_TLSV1 -else -HOSTAPD_CONFIG_DISABLE += CONFIG_EAP -HOSTAPD_CONFIG_ENABLE += \ - CONFIG_NO_ACCOUNTING \ - CONFIG_NO_RADIUS -endif - -ifeq ($(BR2_PACKAGE_HOSTAPD_WPS),y) -HOSTAPD_CONFIG_ENABLE += CONFIG_WPS -endif - -define HOSTAPD_CONFIGURE_CMDS - cp $(@D)/hostapd/defconfig $(HOSTAPD_CONFIG) - sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(HOSTAPD_CONFIG_ENABLE)) \ - $(patsubst %,-e 's/^\(%\)/#\1/',$(HOSTAPD_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(HOSTAPD_CONFIG_SET)) \ - $(patsubst %,-e %,$(HOSTAPD_CONFIG_EDITS)) \ - $(HOSTAPD_CONFIG) -endef - -define HOSTAPD_BUILD_CMDS - $(TARGET_MAKE_ENV) CFLAGS="$(HOSTAPD_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(HOSTAPD_LIBS)" \ - $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(HOSTAPD_SUBDIR) -endef - -define HOSTAPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd \ - $(TARGET_DIR)/usr/sbin/hostapd - $(INSTALL) -m 0755 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd_cli \ - $(TARGET_DIR)/usr/bin/hostapd_cli - $(INSTALL) -m 0644 -D $(@D)/$(HOSTAPD_SUBDIR)/hostapd.conf \ - $(TARGET_DIR)/etc/hostapd.conf -endef - -$(eval $(generic-package)) diff --git a/package.bak/hplip/0001-build-use-pkg-config-to-discover-libusb.patch b/package.bak/hplip/0001-build-use-pkg-config-to-discover-libusb.patch deleted file mode 100644 index 59b89a4a32..0000000000 --- a/package.bak/hplip/0001-build-use-pkg-config-to-discover-libusb.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 1eed2b65eff4c66b80eab0ec46c6705de19bdb9d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 23:54:03 +0100 -Subject: [PATCH] build: use pkg-config to discover libusb - -This allows to remove hardcoded paths to libusb headers. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 4 ++-- - configure.in | 3 +-- - 2 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 73fed2e..3a4e899 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -92,8 +92,8 @@ libhpmud_la_SOURCES += io/hpmud/musb_libusb01.c - libhpmud_la_LDFLAGS += -lusb - else - libhpmud_la_SOURCES += io/hpmud/musb.c --libhpmud_la_CFLAGS += -I/usr/include/libusb-1.0 --libhpmud_la_LDFLAGS += -lusb-1.0 -+libhpmud_la_CFLAGS += $(LIBUSB_CFLAGS) -+libhpmud_la_LDFLAGS += $(LIBUSB_LIBS) - endif - - if NETWORK_BUILD -diff --git a/configure.in b/configure.in -index 3706645..8b06428 100755 ---- a/configure.in -+++ b/configure.in -@@ -542,8 +542,7 @@ if test "$hpijs_only_build" = "no" && test "$hpcups_only_build" = "no"; then - AC_CHECK_LIB([usb], [usb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb support], 2)]) - AC_CHECK_HEADERS(usb.h, ,[AC_MSG_ERROR([cannot find libusb-devel support], 11)]) - else -- AC_CHECK_LIB([usb-1.0], [libusb_init], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libusb 1.0 support], 2)]) -- AC_CHECK_HEADERS(libusb-1.0/libusb.h, ,[AC_MSG_ERROR([cannot find libusb-1.0-devel support], 11)]) -+ PKG_CHECK_MODULES([LIBUSB], [libusb-1.0]) - fi - fi - --- -2.6.4 - diff --git a/package.bak/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch b/package.bak/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch deleted file mode 100644 index 8147490174..0000000000 --- a/package.bak/hplip/0002-configure.in-fix-AM_INIT_AUTOMAKE-call.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a2de7e834417de68db10dc6f09d5810b06e6cbc8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 23:54:50 +0100 -Subject: [PATCH] configure.in: fix AM_INIT_AUTOMAKE call - -Uncomment the appropriate call to AM_INIT_AUTOMAKE so that the -"foreign" option is passed, which avoids the need for creating various -unneeded files when autoreconfiguring. - -Add the subdir-objects options since the main Makefile.am references -files in subdirectories. This allows to silence a huge amount of -warning when autoreconfiguring. - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 8b06428..680cad5 100755 ---- a/configure.in -+++ b/configure.in -@@ -27,8 +27,7 @@ - - #AC_PREREQ(2.59) - AC_INIT([HP Linux Imaging and Printing], [3.16.11], [3.16.11], [hplip]) --#AM_INIT_AUTOMAKE([1.9 foreign]) --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([1.9 foreign subdir-objects]) - AC_DISABLE_STATIC - - # Checks for programs. --- -2.6.4 - diff --git a/package.bak/hplip/Config.in b/package.bak/hplip/Config.in deleted file mode 100644 index 176dc6a6a7..0000000000 --- a/package.bak/hplip/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_HPLIP - bool "hplip" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_CUPS - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on !BR2_STATIC_LIBS # libdl - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_JPEG - help - HP Linux Imaging and Printing (HPLIP) - HPLIP is an HP-developed solution for printing, scanning, and faxing - with HP inkjet and laser based printers in Linux. The HPLIP project - provides printing support for 2,211 printer models, including - Deskjet, Officejet, Photosmart, PSC (Print Scan Copy), Business - Inkjet, LaserJet, Edgeline MFP, and LaserJet MFP. - - http://hplipopensource.com/ - -comment "hplip needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_PACKAGE_CUPS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/hplip/hplip.hash b/package.bak/hplip/hplip.hash deleted file mode 100644 index 9dfb7a2ad0..0000000000 --- a/package.bak/hplip/hplip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 f6e20cacb4891e4e60fc5de2213a10f8d0c68840f9b511aa38cfca0cb29f9b24 hplip-3.16.11.tar.gz diff --git a/package.bak/hplip/hplip.mk b/package.bak/hplip/hplip.mk deleted file mode 100644 index cd1be042a5..0000000000 --- a/package.bak/hplip/hplip.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# hplip -# -################################################################################ - -HPLIP_VERSION = 3.16.11 -HPLIP_SITE = http://downloads.sourceforge.net/hplip/hplip -HPLIP_AUTORECONF = YES -HPLIP_DEPENDENCIES = cups libusb jpeg host-pkgconf -HPLIP_LICENSE = GPLv2, BSD-3c, MIT -HPLIP_LICENSE_FILES = COPYING - -HPLIP_CONF_OPTS = \ - --disable-qt4 \ - --disable-scan-build \ - --disable-gui-build \ - --disable-doc-build \ - --disable-network-build \ - --enable-hpcups-install \ - --disable-hpijs-install \ - --enable-cups-ppd-install \ - --enable-cups-drv-install \ - --disable-foomatic-ppd-install \ - --disable-foomatic-drv-install \ - --disable-foomatic-rip-hplip-install \ - --enable-new-hpcups \ - --enable-lite-build - -# build system does not support cups-config -HPLIP_CONF_ENV = LIBS=`$(STAGING_DIR)/usr/bin/cups-config --libs` - -ifeq ($(BR2_PACKAGE_DBUS),y) -HPLIP_CONF_OPTS += --enable-dbus-build -HPLIP_DEPENDENCIES += dbus -else -HPLIP_CONF_OPTS += --disable-dbus-build -endif - -define HPLIP_POST_INSTALL_TARGET_FIXUP - mkdir -p $(TARGET_DIR)/usr/share/hplip/data/models - cp $(@D)/data/models/* $(TARGET_DIR)/usr/share/hplip/data/models -endef -HPLIP_POST_INSTALL_TARGET_HOOKS += HPLIP_POST_INSTALL_TARGET_FIXUP - -$(eval $(autotools-package)) diff --git a/package.bak/htop/Config.in b/package.bak/htop/Config.in deleted file mode 100644 index c19ff27b77..0000000000 --- a/package.bak/htop/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HTOP - bool "htop" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - htop is an interactive text-mode process viewer for Linux. - It aims to be a better top. - - http://hisham.hm/htop/ diff --git a/package.bak/htop/htop.hash b/package.bak/htop/htop.hash deleted file mode 100644 index cfea23f99b..0000000000 --- a/package.bak/htop/htop.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Hashes from: http://www.freelists.org/post/htop/ANN-htop-202 -md5 7d354d904bad591a931ad57e99fea84a htop-2.0.2.tar.gz -sha1 201f793f13dce2448e36047079875b9bd5bba75a htop-2.0.2.tar.gz diff --git a/package.bak/htop/htop.mk b/package.bak/htop/htop.mk deleted file mode 100644 index 9451d159fa..0000000000 --- a/package.bak/htop/htop.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# htop -# -################################################################################ - -HTOP_VERSION = 2.0.2 -HTOP_SITE = http://hisham.hm/htop/releases/$(HTOP_VERSION) -HTOP_DEPENDENCIES = ncurses -# Prevent htop build system from searching the host paths -HTOP_CONF_ENV = HTOP_NCURSES_CONFIG_SCRIPT=$(STAGING_DIR)/usr/bin/ncurses5-config -HTOP_LICENSE = GPLv2 -HTOP_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -HTOP_CONF_OPTS += --enable-unicode -else -HTOP_CONF_OPTS += --disable-unicode -endif - -# ARC uses an old uClibc that needs dladdr() for backtrace support, -# which doesn't work for static only scenario, so as a workaround, we -# pretend that execinfo.h is not available. -ifeq ($(BR2_arc)$(BR2_STATIC_LIBS),yy) -HTOP_CONF_ENV += ac_cv_header_execinfo_h=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/httping/0001-fix-math-library-linking.patch b/package.bak/httping/0001-fix-math-library-linking.patch deleted file mode 100644 index 0078f41c61..0000000000 --- a/package.bak/httping/0001-fix-math-library-linking.patch +++ /dev/null @@ -1,25 +0,0 @@ -Move LDFLAGS+=-lm option to the end. -The order of the math library directive '-lm' matters. - -Signed-off-by: Yuvaraj Patil ---- -diff -Nurp httping-2.3.4_orig/Makefile httping-2.3.4/Makefile ---- httping-2.3.4_orig/Makefile 2014-07-23 16:16:36.495546288 +0530 -+++ httping-2.3.4/Makefile 2014-07-23 16:18:42.547541002 +0530 -@@ -37,7 +37,6 @@ DEBUG=yes - WFLAGS=-Wall -W - OFLAGS= - CFLAGS+=$(WFLAGS) $(OFLAGS) -DVERSION=\"$(VERSION)\" -DLOCALEDIR=\"$(LOCALEDIR)\" --LDFLAGS+=-lm - - PACKAGE=$(TARGET)-$(VERSION) - PREFIX?=/usr -@@ -97,6 +96,8 @@ ifeq ($(ARM),yes) - CC=arm-linux-gcc - endif - -+LDFLAGS+=-lm -+ - all: $(TARGET) $(TRANSLATIONS) - - $(TARGET): $(OBJS) diff --git a/package.bak/httping/Config.in b/package.bak/httping/Config.in deleted file mode 100644 index 6564415997..0000000000 --- a/package.bak/httping/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -comment "httping needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_HTTPING - bool "httping" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - Httping is like 'ping' but for http-requests. - Give it an url, and it'll show you how long it takes to connect, - send a request and retrieve the reply (only the headers). - Be aware that the transmission across the network also takes time! - So it measures the latency of the webserver + network. - - http://www.vanheusden.com/httping/ - -if BR2_PACKAGE_HTTPING - -config BR2_PACKAGE_HTTPING_TFO - bool "TCP Fast Open (TFO) support" - -endif diff --git a/package.bak/httping/httping.hash b/package.bak/httping/httping.hash deleted file mode 100644 index a50eedb744..0000000000 --- a/package.bak/httping/httping.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8 httping-2.5.tgz diff --git a/package.bak/httping/httping.mk b/package.bak/httping/httping.mk deleted file mode 100644 index 3418ffa110..0000000000 --- a/package.bak/httping/httping.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# httping -# -################################################################################ - -HTTPING_VERSION = 2.5 -HTTPING_SOURCE = httping-$(HTTPING_VERSION).tgz -HTTPING_SITE = http://www.vanheusden.com/httping -HTTPING_LICENSE = GPLv2 -HTTPING_LICENSE_FILES = license.txt -HTTPING_LDFLAGS = $(TARGET_LDFLAGS) \ - $(if $(BR2_NEEDS_GETTEXT),-lintl) \ - $(if $(BR2_PACKAGE_LIBICONV),-liconv) -HTTPING_DEPENDENCIES = host-gettext \ - $(if $(BR2_NEEDS_GETTEXT),gettext) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(if $(BR2_PACKAGE_NCURSES_WCHAR),ncurses) \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW),fftw) -HTTPING_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) \ - FW=$(if $(BR2_PACKAGE_FFTW),yes,no) \ - NC=$(if $(BR2_PACKAGE_NCURSES_WCHAR),yes,no) \ - SSL=$(if $(BR2_PACKAGE_OPENSSL),yes,no) \ - TFO=$(if $(BR2_PACKAGE_HTTPING_TFO),yes,no) - -define HTTPING_BUILD_CMDS - $(HTTPING_MAKE_OPTS) LDFLAGS="$(HTTPING_LDFLAGS)" \ - $(MAKE) DEBUG=no -C $(@D) -endef - -define HTTPING_INSTALL_TARGET_CMDS - $(HTTPING_MAKE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/hwdata/Config.in b/package.bak/hwdata/Config.in deleted file mode 100644 index 33e0738af8..0000000000 --- a/package.bak/hwdata/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_HWDATA - bool "hwdata" - help - Various hardware identification and configuration data, such as - the pci.ids database, or the XFree86/xorg Cards database. diff --git a/package.bak/hwdata/hwdata.hash b/package.bak/hwdata/hwdata.hash deleted file mode 100644 index b3c83ebb74..0000000000 --- a/package.bak/hwdata/hwdata.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata/hwdata_0.267-1.dsc -sha256 d77f2b3f3d6e278be669141ffa5dac01b64cab02f7b2c744bbabc500a45263f4 hwdata_0.267.orig.tar.gz -sha256 055d2f168de9333562a04f6a230c43dc19c4975882935d8b2f0ab17f64f57275 hwdata_0.267-1.diff.gz diff --git a/package.bak/hwdata/hwdata.mk b/package.bak/hwdata/hwdata.mk deleted file mode 100644 index f8cffcdb80..0000000000 --- a/package.bak/hwdata/hwdata.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# hwdata -# -################################################################################ - -HWDATA_VERSION = 0.267 -HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz -HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz -HWDATA_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata -HWDATA_LICENSE = GPLv2+ or XFree86 1.0 license -HWDATA_LICENSE_FILES = COPYING LICENSE - -define HWDATA_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids - $(INSTALL) -D -m 644 $(@D)/usb.ids $(TARGET_DIR)/usr/share/hwdata/usb.ids -endef - -$(eval $(generic-package)) diff --git a/package.bak/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch b/package.bak/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch deleted file mode 100644 index c27bdd4dc3..0000000000 --- a/package.bak/hwloc/0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d5e802c9c2ed8dbe5c937e84bc3ab440218aa8de Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Tue, 12 May 2015 16:03:14 +0200 -Subject: [PATCH] utils/hwloc/Makefile.am: fix install-man race condition - -Make install contains a race condition in utils/hwloc, as both -install-exec-hook (through intall-exec) and install-data trigger -install-man: - -http://autobuild.buildroot.net/results/414/41403f8ce4751a27dd1bb9c43f5a97895dea3980/build-end.log - -The install-exec-hook target doesn't do anything with the manual pages, so -fix the race condition by dropping the dependency. - -Signed-off-by: Peter Korsgaard ---- - utils/hwloc/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/utils/hwloc/Makefile.am b/utils/hwloc/Makefile.am -index 7ca8027..8bbee86 100644 ---- a/utils/hwloc/Makefile.am -+++ b/utils/hwloc/Makefile.am -@@ -108,7 +108,7 @@ endif HWLOC_HAVE_LINUX - -e 's/#HWLOC_DATE#/@HWLOC_RELEASE_DATE@/g' \ - > $@ < $< - --install-exec-hook: install-man -+install-exec-hook: - $(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-assembler-remote > $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-assembler-remote.tmp $(DESTDIR)$(bindir)/hwloc-assembler-remote - $(SED) -e 's/HWLOC_top_builddir\/utils\/hwloc/bindir/' -e 's/HWLOC_top_builddir\/utils\/lstopo/bindir/' -e '/HWLOC_top_builddir/d' $(DESTDIR)$(bindir)/hwloc-compress-dir > $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp && mv -f $(DESTDIR)$(bindir)/hwloc-compress-dir.tmp $(DESTDIR)$(bindir)/hwloc-compress-dir - chmod +x $(DESTDIR)$(bindir)/hwloc-assembler-remote $(DESTDIR)$(bindir)/hwloc-compress-dir --- -2.1.4 - diff --git a/package.bak/hwloc/Config.in b/package.bak/hwloc/Config.in deleted file mode 100644 index 1fb23027bb..0000000000 --- a/package.bak/hwloc/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_HWLOC - bool "hwloc" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Portable Hardware Locality - - Provides a portable abstraction (across OS, versions, - architectures, ...) of the hierarchical topology of modern - architectures, including NUMA memory nodes, sockets, shared - caches, cores and simultaneous multithreading. - - http://www.open-mpi.org/projects/hwloc/ - -comment "hwloc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/hwloc/hwloc.hash b/package.bak/hwloc/hwloc.hash deleted file mode 100644 index 53563dd8a4..0000000000 --- a/package.bak/hwloc/hwloc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.open-mpi.org/software/hwloc/v1.10/ -sha1 76291124e4638b2fbd4deb4cc3cd680e153077b5 hwloc-1.10.1.tar.bz2 diff --git a/package.bak/hwloc/hwloc.mk b/package.bak/hwloc/hwloc.mk deleted file mode 100644 index 9b5eae8e1a..0000000000 --- a/package.bak/hwloc/hwloc.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# hwloc -# -################################################################################ - -HWLOC_VERSION_MAJOR = 1.10 -HWLOC_VERSION = $(HWLOC_VERSION_MAJOR).1 -HWLOC_SOURCE = hwloc-$(HWLOC_VERSION).tar.bz2 -HWLOC_SITE = http://www.open-mpi.org/software/hwloc/v$(HWLOC_VERSION_MAJOR)/downloads -HWLOC_LICENSE = BSD-3c -HWLOC_LICENSE_FILES = COPYING -HWLOC_DEPENDENCIES = host-pkgconf -# 0001-utils-hwloc-Makefile.am-fix-install-man-race-conditi.patch touches Makefile.am -HWLOC_AUTORECONF = YES - -HWLOC_CONF_OPTS = \ - --disable-opencl \ - --disable-cuda \ - --disable-nvml \ - --disable-gl \ - --disable-cairo \ - --disable-libxml2 \ - --disable-doxygen - -ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y) -HWLOC_CONF_OPTS += --enable-pci -HWLOC_DEPENDENCIES += libpciaccess -else -HWLOC_CONF_OPTS += --disable-pci -endif - -ifeq ($(BR2_PACKAGE_NUMACTL),y) -HWLOC_CONF_OPTS += --enable-libnuma -HWLOC_DEPENDENCIES += numactl -else -HWLOC_CONF_OPTS += --disable-libnuma -endif - -$(eval $(autotools-package)) diff --git a/package.bak/i2c-tools/Config.in b/package.bak/i2c-tools/Config.in deleted file mode 100644 index b82c7dcdb0..0000000000 --- a/package.bak/i2c-tools/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_I2C_TOOLS - bool "i2c-tools" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Heterogeneous set of I2C tools for Linux - - This package contains a heterogeneous set of I2C tools for Linux: - a bus probing tool, a chip dumper, register-level access helpers, - EEPROM decoding scripts, and more. - - http://www.lm-sensors.org/wiki/I2CTools diff --git a/package.bak/i2c-tools/i2c-tools.mk b/package.bak/i2c-tools/i2c-tools.mk deleted file mode 100644 index e16b940cae..0000000000 --- a/package.bak/i2c-tools/i2c-tools.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# i2c-tools -# -################################################################################ - -I2C_TOOLS_VERSION = v3.1.2 -I2C_TOOLS_SITE = git://git.kernel.org/pub/scm/utils/i2c-tools/i2c-tools.git -I2C_TOOLS_LICENSE = GPLv2+, GPLv2 (py-smbus) -I2C_TOOLS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PYTHON),y) -I2C_TOOLS_DEPENDENCIES += python -endif - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -I2C_TOOLS_DEPENDENCIES += python3 -endif - -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -I2C_TOOLS_DEPENDENCIES += busybox -endif - -# Build/install steps mirror the distutil python package type in the python package -# infrastructure -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -# BASE_ENV taken from PKG_PYTHON_DISTUTILS_ENV in package/pkg-python.mk -I2C_TOOLS_PYTHON_BASE_ENV = \ - $(PKG_PYTHON_DISTUTILS_ENV) \ - CFLAGS="$(TARGET_CFLAGS) -I../include" - -define I2C_TOOLS_BUILD_PYSMBUS - (cd $(@D)/py-smbus; \ - $(I2C_TOOLS_PYTHON_BASE_ENV) \ - $(HOST_DIR)/usr/bin/python setup.py build \ - $(PKG_PYTHON_DISTUTILS_BUILD_OPTS)) -endef - -define I2C_TOOLS_INSTALL_PYSMBUS - (cd $(@D)/py-smbus; \ - $(I2C_TOOLS_PYTHON_BASE_ENV) \ - $(HOST_DIR)/usr/bin/python setup.py install \ - $(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS)) -endef - -endif # BR2_PACKAGE_PYTHON - -define I2C_TOOLS_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) - $(I2C_TOOLS_BUILD_PYSMBUS) -endef - -define I2C_TOOLS_INSTALL_TARGET_CMDS - for i in i2cdump i2cget i2cset i2cdetect; \ - do \ - $(INSTALL) -m 755 -D $(@D)/tools/$$i $(TARGET_DIR)/usr/sbin/$$i; \ - done - $(I2C_TOOLS_INSTALL_PYSMBUS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/i7z/Config.in b/package.bak/i7z/Config.in deleted file mode 100644 index eea74f2fcf..0000000000 --- a/package.bak/i7z/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_I7Z - bool "i7z" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_NCURSES - help - "A better i7 (and now i3, i5) reporting tool for Linux." - - i7z can print out the C-states and temperature for i3, i5 - and i7 based Core processors from Intel (including Nehalems, - Sandy Bridge and Ivy Bridge). - - https://github.com/ajaiantilal/i7z - -comment "i7z needs a toolchain w/ threads" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/i7z/i7z.hash b/package.bak/i7z/i7z.hash deleted file mode 100644 index 1bcf2c6357..0000000000 --- a/package.bak/i7z/i7z.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e127bddf850e7febd39cef2d2b13dca5fe19cc2a1bb1099d72b683be5d8bd1c0 i7z-5023138d7c35c4667c938b853e5ea89737334e92.tar.gz diff --git a/package.bak/i7z/i7z.mk b/package.bak/i7z/i7z.mk deleted file mode 100644 index e21fd9fba1..0000000000 --- a/package.bak/i7z/i7z.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# i7z -# -################################################################################ - -I7Z_VERSION = 5023138d7c35c4667c938b853e5ea89737334e92 -I7Z_SITE = $(call github,ajaiantilal,i7z,$(I7Z_VERSION)) -I7Z_LICENSE = GPLv2 -I7Z_LICENSE_FILES = COPYING -I7Z_DEPENDENCIES = ncurses - -define I7Z_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define I7Z_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install \ - DESTDIR="$(TARGET_DIR)" -endef - -$(eval $(generic-package)) diff --git a/package.bak/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch b/package.bak/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch deleted file mode 100644 index b7c1839f75..0000000000 --- a/package.bak/ibrcommon/0001-ibrcommon-data-File.cpp-support-POSIX-basename-call.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d667b13a87cf3207599a19eb981a893a1d7a67ee Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Mon, 14 Sep 2015 23:25:52 +0100 -Subject: [PATCH 1/1] ibrcommon/data/File.cpp: support POSIX basename call - -Firstly, and somewhat strangely, musl chooses not to provide a basename(3) -prototype within whenever __cplusplus is defined. This can be -solved by including the header defined by POSIX 1003.1 whenever -__GLIBC__ is not defined. - -However, this leads to a second problem. POSIX defines the function as -char* basename(char*) and this is the only version supported by musl. -However, the std::string.cstr() method returns a const char*. - -POSIX says that the string parameter can be modified. However the GNU -implementation never modifies it. glibc therefore supports an extension -when compiling under C++ by also supplying -const char* basename(const char*). This extension is not present on musl -which is the cause of the failure. - -The solution is reasonably straightforward; test if __GLIBC__ is defined -before calling basename. If not, use the fallback already provided for -other platforms whereby basename() is called on a temporary copy. - -Signed-off-by: Brendan Heading -Upstream-status: pending ---- - ibrcommon/data/File.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/ibrcommon/data/File.cpp b/ibrcommon/data/File.cpp -index 31af4ae..68e9b4f 100644 ---- a/ibrcommon/data/File.cpp -+++ b/ibrcommon/data/File.cpp -@@ -35,7 +35,7 @@ - #include - #include - --#if !defined(HAVE_FEATURES_H) || defined(ANDROID) -+#if !defined(HAVE_FEATURES_H) || !defined(__GLIBC__) || defined(ANDROID) - #include - #endif - -@@ -225,7 +225,7 @@ namespace ibrcommon - - std::string File::getBasename() const - { --#if !defined(ANDROID) && defined(HAVE_FEATURES_H) -+#if !defined(ANDROID) && defined(HAVE_FEATURES_H) && defined(__GLIBC__) - return std::string(basename(_path.c_str())); - #else - char path[_path.length()+1]; --- -2.4.3 - diff --git a/package.bak/ibrcommon/Config.in b/package.bak/ibrcommon/Config.in deleted file mode 100644 index 36ccfbc383..0000000000 --- a/package.bak/ibrcommon/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_IBRCOMMON - bool "ibrcommon" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - IBR-DTN is a small dtn application that supports: - Bundle Protocol RFC 5050 - Bundle Security Protocol RFC 6257 - - http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn - -comment "ibrcommon needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ibrcommon/ibrcommon.hash b/package.bak/ibrcommon/ibrcommon.hash deleted file mode 100644 index 21a0ec6f19..0000000000 --- a/package.bak/ibrcommon/ibrcommon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9c457c1ebc01e6216524636628c647bef34ab11bd96f0e0788be8749374fdc20 ibrcommon-1.0.1.tar.gz diff --git a/package.bak/ibrcommon/ibrcommon.mk b/package.bak/ibrcommon/ibrcommon.mk deleted file mode 100644 index 4d2d351c88..0000000000 --- a/package.bak/ibrcommon/ibrcommon.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# ibrcommon -# -################################################################################ - -IBRCOMMON_VERSION = 1.0.1 -IBRCOMMON_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases -IBRCOMMON_INSTALL_STAGING = YES -IBRCOMMON_LICENSE = Apache-2.0 -IBRCOMMON_LICENSE_FILES = COPYING README -IBRCOMMON_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IBRCOMMON_DEPENDENCIES += openssl -IBRCOMMON_CONF_OPTS += --with-openssl -else -IBRCOMMON_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_LIBNL),y) -IBRCOMMON_DEPENDENCIES += libnl -IBRCOMMON_CONF_OPTS += --with-lowpan -else -IBRCOMMON_CONF_OPTS += --without-lowpan -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -IBRCOMMON_DEPENDENCIES += libxml2 -IBRCOMMON_CONF_OPTS += --with-xml -else -IBRCOMMON_CONF_OPTS += --without-xml -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ibrdtn-tools/Config.in b/package.bak/ibrdtn-tools/Config.in deleted file mode 100644 index 91419d6769..0000000000 --- a/package.bak/ibrdtn-tools/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_IBRDTN_TOOLS - bool "ibrdtn-tools" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_IBRCOMMON - select BR2_PACKAGE_IBRDTN - help - IBR-DTN is a small dtn application that supports: - Bundle Protocol RFC 5050 - Bundle Security Protocol RFC 6257 - - http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn - -comment "ibrdtn-tools needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ibrdtn-tools/ibrdtn-tools.hash b/package.bak/ibrdtn-tools/ibrdtn-tools.hash deleted file mode 100644 index fb77207526..0000000000 --- a/package.bak/ibrdtn-tools/ibrdtn-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 eab066cf15f9c322d769c6c9c58adfb474cba7d446fd12e8de5ff6344376795b ibrdtn-tools-1.0.1.tar.gz diff --git a/package.bak/ibrdtn-tools/ibrdtn-tools.mk b/package.bak/ibrdtn-tools/ibrdtn-tools.mk deleted file mode 100644 index 97ec3c9e17..0000000000 --- a/package.bak/ibrdtn-tools/ibrdtn-tools.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# ibrdtn-tools -# -################################################################################ - -IBRDTN_TOOLS_VERSION = 1.0.1 -IBRDTN_TOOLS_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases -IBRDTN_TOOLS_LICENSE = Apache-2.0 -IBRDTN_TOOLS_LICENSE_FILES = COPYING -IBRDTN_TOOLS_DEPENDENCIES = ibrcommon ibrdtn host-pkgconf - -ifeq ($(BR2_STATIC_LIBS),y) -IBRDTN_TOOLS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -ifeq ($(BR2_PACKAGE_LIBDAEMON),y) -IBRDTN_TOOLS_CONF_OPTS += --with-libdaemon -IBRDTN_TOOLS_DEPENDENCIES += libdaemon -else -IBRDTN_TOOLS_CONF_OPTS += --without-libdaemon -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -IBRDTN_TOOLS_CONF_OPTS += --with-libarchive -IBRDTN_TOOLS_DEPENDENCIES += libarchive -else -IBRDTN_TOOLS_CONF_OPTS += --without-libarchive -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ibrdtn/Config.in b/package.bak/ibrdtn/Config.in deleted file mode 100644 index 569831596d..0000000000 --- a/package.bak/ibrdtn/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_IBRDTN - bool "ibrdtn" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_IBRCOMMON - help - IBR-DTN is a small dtn application that supports: - Bundle Protocol RFC 5050 - Bundle Security Protocol RFC 6257 - - This package contains the ibrdtn library. - - http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn - -comment "ibrdtn needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ibrdtn/ibrdtn.hash b/package.bak/ibrdtn/ibrdtn.hash deleted file mode 100644 index 5f233277c1..0000000000 --- a/package.bak/ibrdtn/ibrdtn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 288b14ccbaefb5e3234065c2778c247797ccb3c7afbb6746bb37dc12c620d360 ibrdtn-1.0.1.tar.gz diff --git a/package.bak/ibrdtn/ibrdtn.mk b/package.bak/ibrdtn/ibrdtn.mk deleted file mode 100644 index 3f805c4024..0000000000 --- a/package.bak/ibrdtn/ibrdtn.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# ibrdtn -# -################################################################################ - -IBRDTN_VERSION = 1.0.1 -IBRDTN_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases -IBRDTN_INSTALL_STAGING = YES -IBRDTN_LICENSE = Apache-2.0 -IBRDTN_LICENSE_FILES = COPYING -IBRDTN_DEPENDENCIES = ibrcommon host-pkgconf - -ifeq ($(BR2_PACKAGE_ZLIB),y) -IBRDTN_CONF_OPTS += --with-compression -IBRDTN_DEPENDENCIES += zlib -else -IBRDTN_CONF_OPTS += --without-compression -endif - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -IBRDTN_CONF_OPTS += --with-glib -IBRDTN_DEPENDENCIES += libglib2 -else -IBRDTN_CONF_OPTS += --without-glib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ibrdtnd/Config.in b/package.bak/ibrdtnd/Config.in deleted file mode 100644 index f7f371edfd..0000000000 --- a/package.bak/ibrdtnd/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_IBRDTND - bool "ibrdtnd" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_IBRDTN - select BR2_PACKAGE_IBRCOMMON - help - IBR-DTN is a small dtn application that supports: - Bundle Protocol RFC 5050 - Bundle Security Protocol RFC 6257 - - http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn - -comment "ibrdtnd needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ibrdtnd/ibrdtnd.hash b/package.bak/ibrdtnd/ibrdtnd.hash deleted file mode 100644 index 4b7dd7c3d8..0000000000 --- a/package.bak/ibrdtnd/ibrdtnd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed ibrdtnd-1.0.1.tar.gz diff --git a/package.bak/ibrdtnd/ibrdtnd.mk b/package.bak/ibrdtnd/ibrdtnd.mk deleted file mode 100644 index 0632ed36b7..0000000000 --- a/package.bak/ibrdtnd/ibrdtnd.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# ibrdtnd -# -################################################################################ - -IBRDTND_VERSION = 1.0.1 -IBRDTND_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases -IBRDTND_LICENSE = Apache-2.0 -IBRDTND_LICENSE_FILES = COPYING -IBRDTND_DEPENDENCIES = ibrdtn ibrcommon host-pkgconf - -# Disable features that don't have the necessary dependencies in -# Buildroot -IBRDTND_CONF_OPTS = \ - --disable-dtndht \ - --without-wifip2p \ - --without-vmime - -# don't build documentation -IBRDTND_CONF_ENV = PDFLATEX='no' - -ifeq ($(BR2_PACKAGE_LIBDAEMON),y) -IBRDTND_CONF_OPTS += --enable-libdaemon -IBRDTND_DEPENDENCIES += libdaemon -else -IBRDTND_CONF_OPTS += --disable-libdaemon -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -IBRDTND_CONF_OPTS += --with-curl -IBRDTND_DEPENDENCIES += libcurl -else -IBRDTND_CONF_OPTS += --without-curl -endif - -ifeq ($(BR2_PACKAGE_SQLITE),y) -IBRDTND_CONF_OPTS += --with-sqlite -IBRDTND_DEPENDENCIES += sqlite -else -IBRDTND_CONF_OPTS += --without-sqlite -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IBRDTND_CONF_OPTS += --with-tls -IBRDTND_DEPENDENCIES += openssl -else -IBRDTND_CONF_OPTS += --without-tls -endif - -$(eval $(autotools-package)) diff --git a/package.bak/icu/0001-dont-build-static-dynamic-twice.patch b/package.bak/icu/0001-dont-build-static-dynamic-twice.patch deleted file mode 100644 index ccbe534aa2..0000000000 --- a/package.bak/icu/0001-dont-build-static-dynamic-twice.patch +++ /dev/null @@ -1,37 +0,0 @@ -Don't build object files twice - -When passed --enable-static and --enable-shared, icu will generate -both a shared and a static version of its libraries. - -However, in order to do so, it builds each and every object file -twice: once with -fPIC (for the shared library), and once without --fPIC (for the static library). While admittedly building -fPIC for a -static library generates a slightly suboptimal code, this is what all -the autotools-based project are doing. They build each object file -once, and they use it for both the static and shared libraries. - -icu builds the object files for the shared library as .o files, and -the object files for static library as .ao files. By simply changing -the suffix of object files used for static libraries to ".o", we tell -icu to use the ones built for the shared library (i.e, with -fPIC), -and avoid the double build of icu. - -On a fast build server, this brings the target icu build from -3m41.302s down to 1m43.926s (approximate numbers: some other builds -are running on the system at the same time). - -Signed-off-by: Thomas Petazzoni - -Index: b/source/config/mh-linux -=================================================================== ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -35,7 +35,7 @@ - ## Shared object suffix - SO = so - ## Non-shared intermediate object suffix --STATIC_O = ao -+STATIC_O = o - - ## Compilation rules - %.$(STATIC_O): $(srcdir)/%.c diff --git a/package.bak/icu/0002-workaround-toolchain-bugs.patch b/package.bak/icu/0002-workaround-toolchain-bugs.patch deleted file mode 100644 index b5f25d0a13..0000000000 --- a/package.bak/icu/0002-workaround-toolchain-bugs.patch +++ /dev/null @@ -1,37 +0,0 @@ -Workaround toolchain bugs - -Many of ARM Sourcery CodeBench toolchain have a bug when compiling -icu's translit.cpp source file. The bug is trigerred when there is a -combination of "-W -Wall" and "-Os", and causes an internal compiler -error. The bug has been reported to Mentor Graphics. - -Even though it is clearly a toolchain bug, having a workaround for it -is trivial in this case. So it will avoid our users falling into this -internal compiler error, and allow our autobuilders to test more -packages using this Sourcery CodeBench toolchain.qq - -[Gustavo: update for ICU4C 54.1] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -diff -Nura icu.orig/source/configure icu/source/configure ---- icu.orig/source/configure 2014-12-18 15:49:43.038628644 -0300 -+++ icu/source/configure 2014-12-18 15:51:23.183083232 -0300 -@@ -4323,7 +4323,7 @@ - ;; - esac - -- CFLAGS="$CFLAGS -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" -+ CFLAGS="$CFLAGS -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings" - else - case "${host}" in - *-*-cygwin) -@@ -4337,7 +4337,7 @@ - fi - if test "$GXX" = yes - then -- CXXFLAGS="$CXXFLAGS -W -Wall -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" -+ CXXFLAGS="$CXXFLAGS -pedantic -Wpointer-arith -Wwrite-strings -Wno-long-long" - else - case "${host}" in - *-*-cygwin) diff --git a/package.bak/icu/0003-detect-compiler-symbol-prefix.patch b/package.bak/icu/0003-detect-compiler-symbol-prefix.patch deleted file mode 100644 index 1e9537503b..0000000000 --- a/package.bak/icu/0003-detect-compiler-symbol-prefix.patch +++ /dev/null @@ -1,116 +0,0 @@ -detect and add compiler symbol prefix to the assembly code - -Some compiler, such as Blackfin GNU compiler, prefix a charater to any -C symbol in generated assembly code. If any assembly symbol is invoked -from C code, it needs to be prefixed as well. - -Note: since autoreconf doesn't work with this package because automake -isn't support - -[Ryan: add information about why patching configure is ok] -[Gustavo: update for ICU4C 54.1] - -Signed-off-by: Sonic Zhang -Signed-off-by: Ryan Barnett -Signed-off-by: Gustavo Zacarias - -diff -Nura icu.orig/source/configure icu/source/configure ---- icu.orig/source/configure 2014-12-18 15:49:43.038628644 -0300 -+++ icu/source/configure 2014-12-18 15:56:05.793832186 -0300 -@@ -637,6 +637,7 @@ - ICUDATA_CHAR - SAMPLES_TRUE - TESTS_TRUE -+SYMBOL_PREFIX - ICULIBSUFFIXCNAME - U_HAVE_LIB_SUFFIX - ICULIBSUFFIX -@@ -7414,6 +7415,17 @@ - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CHECK_UTF16_STRING_RESULT" >&5 - $as_echo "$CHECK_UTF16_STRING_RESULT" >&6; } - -+# Check compiler generated symbol profix -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for symbol prefix" >&5 -+$as_echo "checking for symbol prefix... " >&6; } -+ SYMBOL_PREFIX=`echo "PREFIX=__USER_LABEL_PREFIX__" \ -+ | ${CPP-${CC-gcc} -E} - 2>&1 \ -+ | ${EGREP-grep} "^PREFIX=" \ -+ | sed -e "s:^PREFIX=::" -e "s:__USER_LABEL_PREFIX__::"` -+ -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYMBOL_PREFIX" >&5 -+$as_echo "$SYMBOL_PREFIX" >&6; } -+ - # Enable/disable extras - # Check whether --enable-extras was given. - if test "${enable_extras+set}" = set; then : -diff -Nura icu.orig/source/data/Makefile.in icu/source/data/Makefile.in ---- icu.orig/source/data/Makefile.in 2014-12-18 15:49:42.908624160 -0300 -+++ icu/source/data/Makefile.in 2014-12-18 16:01:32.751110913 -0300 -@@ -182,11 +182,11 @@ - packagedata: icupkg.inc $(PKGDATA_LIST) build-local - ifneq ($(ENABLE_STATIC),) - ifeq ($(PKGDATA_MODE),dll) -- $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST) -+ $(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) -m static $(PKGDATA_VERSIONING) $(PKGDATA_LIST) - endif - endif - ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) -- $(PKGDATA_INVOKE) $(PKGDATA) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -+ $(PKGDATA_INVOKE) $(PKGDATA) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) - else - $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(OUTDIR) - endif -@@ -209,11 +209,11 @@ - endif - ifneq ($(ENABLE_STATIC),) - ifeq ($(PKGDATA_MODE),dll) -- $(PKGDATA_INVOKE) $(PKGDATA) -m static -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR) -+ $(PKGDATA_INVOKE) $(PKGDATA) -m static -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBSTATICNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_LIBDIR) - endif - endif - ifneq ($(ICUDATA_SOURCE_IS_NATIVE_TARGET),YES) -- $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e $(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR) -+ $(PKGDATA_INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) $(PKGDATA_VERSIONING) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) -T $(OUTTMPDIR) -s $(BUILDDIR) -p $(ICUDATA_NAME) $(PKGDATA_LIBNAME) $(PKGDATA_LIST) -I $(ICUPKGDATA_INSTALL_DIR) - else - $(INSTALL_DATA) $(ICUDATA_SOURCE_ARCHIVE) $(DESTDIR)$(ICUPKGDATA_DIR) - endif -@@ -224,7 +224,7 @@ - #### 390 support - install390: package390 - $(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir) -- $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR) -+ $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -I $(DESTDIR)$(ICUPKGDATA_DIR) - ifeq ($(PKGDATA_MODE),dll) - $(INSTALL-L) $(ICUPKGDATA_OUTDIR)/$(FINAL_IMPORT_LIB) $(DESTDIR)$(ICUPKGDATA_DIR)/$(FINAL_IMPORT_LIB) - endif -@@ -232,7 +232,7 @@ - #### $(LIB_ICUDATA_NAME)$(STUB_SUFFIX) is the subset data for batch mode - package390: $(OUTTMPDIR)/icudata390.lst $(PKGDATA_LIST) ./icupkg.inc packagedata - ln -s $(ICUDATA_NAME) $(OUTDIR)/build/$(ICUDATA_NAME)$(STUB_SUFFIX) -- $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e $(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) -+ $(INVOKE) $(PKGDATA) -s $(BUILDDIR)$(STUB_SUFFIX) -T $(OUTTMPDIR_390STUB) -p $(ICUDATA_NAME)$(STUB_SUFFIX) $(PKGDATA_LIBNAME)$(STUB_SUFFIX) -e @SYMBOL_PREFIX@$(ICUDATA_ENTRY_POINT) $(OS390LIST) -m dll $(PKGDATA_VERSIONING) - cp $(ICUPKGDATA_OUTDIR)/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) $(top_builddir)/stubdata/$(LIB_ICUDATA_NAME)$(STUB_SUFFIX).$(SO) - - -diff -Nura icu.orig/source/extra/uconv/Makefile.in icu/source/extra/uconv/Makefile.in ---- icu.orig/source/extra/uconv/Makefile.in 2014-12-18 15:49:42.986626850 -0300 -+++ icu/source/extra/uconv/Makefile.in 2014-12-18 15:57:40.558101179 -0300 -@@ -58,7 +58,8 @@ - ## Static mode - ifeq ($(UCONVMSG_MODE),static) - DEFS += -DUCONVMSG_LINK=$(MSGNAME) --UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(MSGNAME).$(A) -+UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)@SYMBOL_PREFIX@$(MSGNAME).$(A) -+ - LIBS += $(UCONVMSG_LIB) - PKGMODE=static - INSTALLTO=$(libdir) -@@ -152,7 +153,7 @@ - endif - - $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc -- $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst -+ $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p @SYMBOL_PREFIX@$(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst - - $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk - @-$(RMV) $@ diff --git a/package.bak/icu/0004-link-icudata-as-data-only.patch b/package.bak/icu/0004-link-icudata-as-data-only.patch deleted file mode 100644 index d970e8d30d..0000000000 --- a/package.bak/icu/0004-link-icudata-as-data-only.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d5d0c4bb7cc9aa4a132ec0bea13255aee50c1cf9 Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Fri, 6 Jun 2014 14:55:58 +0200 -Subject: [PATCH] Don't link icudata as a data only library - -This patch cames straight from Debian. It fixes an issue when -libicudata would not have some flags indicating it's EABIhf, causing -applications linked against libicudata to not start on EABIhf -systems. Getting rid of the -nodefaultlibs -nostdlib flags solves the -problem, and is the solution that is used by Debian, see -https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653457. - -Signed-off-by: Maxime Hadjinlian ---- - source/config/mh-linux | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/source/config/mh-linux b/source/config/mh-linux -index 531a3b2..5a2a7c4 100644 ---- a/source/config/mh-linux -+++ b/source/config/mh-linux -@@ -21,7 +21,9 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+#LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# Debian change: linking icudata as data only causes too many problems. -+LDFLAGSICUDT= - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -2.0.0.rc2 - diff --git a/package.bak/icu/0005-fix-static-linking-with-icu-uc.patch b/package.bak/icu/0005-fix-static-linking-with-icu-uc.patch deleted file mode 100644 index 965906b9b9..0000000000 --- a/package.bak/icu/0005-fix-static-linking-with-icu-uc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From ffff12fd321c7a056e796e74cc508726b0626ae0 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 22 Jul 2015 22:43:25 +0200 -Subject: [PATCH] fix static linking with icu-uc - -During static linking with a C application and libicuuc.a, --lstdc++ is required. - -Add -lstdc++ in Libs.private of icu-uc.pc. - -Fixes: -http://autobuild.buildroot.net/results/210/2107f9dfb39eeb6559fb4271c7af8b39aef521ca/ - -Signed-off-by: Romain Naour ---- - source/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/Makefile.in b/source/Makefile.in -index 9db6c52..ca48e16 100644 ---- a/source/Makefile.in -+++ b/source/Makefile.in -@@ -264,7 +264,7 @@ config/icu-uc.pc: config/icu.pc Makefile icudefs.mk - @echo "Description: $(PACKAGE_ICU_DESCRIPTION): Common and Data libraries" >> $@ - @echo "Name: $(PACKAGE)-uc" >> $@ - @echo "Libs:" '-L$${libdir}' "${ICULIBS_UC}" "${ICULIBS_DT}" >> $@ -- @echo "Libs.private:" '$${baselibs}' >> $@ -+ @echo "Libs.private:" '$${baselibs}' -lstdc++ >> $@ - @echo $@ updated. - - config/icu-i18n.pc: config/icu.pc Makefile icudefs.mk --- -2.4.3 - diff --git a/package.bak/icu/Config.in b/package.bak/icu/Config.in deleted file mode 100644 index d31c1fa3dc..0000000000 --- a/package.bak/icu/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_ICU - bool "icu" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - # icu does some funky things by generating by itself an ELF - # file, and it cannot easily be changed to generate FLAT - # format. - depends on !BR2_BINFMT_FLAT - help - International Components for Unicode. - - http://site.icu-project.org/ - -if BR2_PACKAGE_ICU - -config BR2_PACKAGE_ICU_CUSTOM_DATA_PATH - string "Path to custom data library file" - help - This option allows to define the path to a custom data - library generated with http://apps.icu-project.org/datacustom/ - Make sure you select the appropiate version to match the one - provided by buildroot. - Leave empty to not use this functionality. - -endif - -comment "icu needs a toolchain w/ C++, wchar, threads" - depends on !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/icu/icu.hash b/package.bak/icu/icu.hash deleted file mode 100644 index d578bfbf54..0000000000 --- a/package.bak/icu/icu.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://ssl.icu-project.org/files/icu4c/57.1/icu4c-src-58_2.md5 -md5 fac212b32b7ec7ab007a12dff1f3aea1 icu4c-58_2-src.tgz -# Calculated based on the hash above -sha256 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c icu4c-58_2-src.tgz diff --git a/package.bak/icu/icu.mk b/package.bak/icu/icu.mk deleted file mode 100644 index b9e42de94b..0000000000 --- a/package.bak/icu/icu.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# icu -# -################################################################################ - -ICU_VERSION = 58.2 -ICU_SOURCE = icu4c-$(subst .,_,$(ICU_VERSION))-src.tgz -ICU_SITE = http://download.icu-project.org/files/icu4c/$(ICU_VERSION) -ICU_LICENSE = ICU License -ICU_LICENSE_FILES = license.html - -ICU_DEPENDENCIES = host-icu -ICU_INSTALL_STAGING = YES -ICU_CONFIG_SCRIPTS = icu-config -ICU_CONF_OPTS = \ - --with-cross-build=$(HOST_ICU_DIR)/source \ - --disable-samples \ - --disable-tests - -# When available, icu prefers to use C++11 atomics, which rely on the -# __atomic builtins. On certain architectures, this requires linking -# with libatomic starting from gcc 4.8. -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -ICU_CONF_ENV += LIBS="-latomic" -endif - -# strtod_l() is not supported by musl; also xlocale.h is missing -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -ICU_CONF_ENV += ac_cv_func_strtod_l=no -endif - -HOST_ICU_CONF_OPTS = \ - --disable-samples \ - --disable-tests \ - --disable-extras \ - --disable-icuio \ - --disable-layout \ - --disable-renaming -ICU_SUBDIR = source -HOST_ICU_SUBDIR = source - -ICU_CUSTOM_DATA_PATH = $(call qstrip,$(BR2_PACKAGE_ICU_CUSTOM_DATA_PATH)) - -ifneq ($(ICU_CUSTOM_DATA_PATH),) -define ICU_COPY_CUSTOM_DATA - cp $(ICU_CUSTOM_DATA_PATH) $(@D)/source/data/in/ -endef -ICU_POST_PATCH_HOOKS += ICU_COPY_CUSTOM_DATA -endif - -define ICU_REMOVE_DEV_FILES - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,derb genbrk gencfu gencnval gendict genrb icuinfo makeconv uconv) - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/,genccode gencmn gennorm2 gensprep icupkg) - rm -rf $(TARGET_DIR)/usr/share/icu -endef -ICU_POST_INSTALL_TARGET_HOOKS += ICU_REMOVE_DEV_FILES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/ifenslave/Config.in b/package.bak/ifenslave/Config.in deleted file mode 100644 index 2203284db0..0000000000 --- a/package.bak/ifenslave/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_IFENSLAVE - bool "ifenslave" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Configure network interfaces for parallel routing (bonding) - - http://anonscm.debian.org/cgit/collab-maint/ifenslave.git diff --git a/package.bak/ifenslave/ifenslave.hash b/package.bak/ifenslave/ifenslave.hash deleted file mode 100644 index dcf31d0904..0000000000 --- a/package.bak/ifenslave/ifenslave.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave/ifenslave_2.9.dsc -sha1 a17e88fa298ef337e872c8aa5d7a390921239d1a ifenslave_2.9.tar.xz -sha256 e5666c0b61347bd06f2394c16eca6895fcb5e5cc83d0a1c596a975274de5a3c9 ifenslave_2.9.tar.xz diff --git a/package.bak/ifenslave/ifenslave.mk b/package.bak/ifenslave/ifenslave.mk deleted file mode 100644 index 1b823123ab..0000000000 --- a/package.bak/ifenslave/ifenslave.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# ifenslave -# -################################################################################ - -IFENSLAVE_VERSION = 2.9 -IFENSLAVE_SOURCE = ifenslave_$(IFENSLAVE_VERSION).tar.xz -IFENSLAVE_SITE = http://snapshot.debian.org/archive/debian/20170102T091407Z/pool/main/i/ifenslave -IFENSLAVE_LICENSE = GPLv3+ -IFENSLAVE_LICENSE_FILES = debian/copyright -IFENSLAVE_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) - -# shell script, so nothing to build - -define IFENSLAVE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/ifenslave $(TARGET_DIR)/sbin/ifenslave -endef - -$(eval $(generic-package)) diff --git a/package.bak/ifplugd/0001-cross.patch b/package.bak/ifplugd/0001-cross.patch deleted file mode 100644 index 6217238149..0000000000 --- a/package.bak/ifplugd/0001-cross.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ifplugd-0.28/configure -=================================================================== ---- ifplugd-0.28.orig/configure -+++ ifplugd-0.28/configure -@@ -5430,7 +5430,7 @@ - echo $ECHO_N "(cached) $ECHO_C" >&6 - else - if test "$cross_compiling" = yes; then -- ac_cv_func_malloc_0_nonnull=no -+ ac_cv_func_malloc_0_nonnull=yes - else - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ diff --git a/package.bak/ifplugd/0002-fix-headers.patch b/package.bak/ifplugd/0002-fix-headers.patch deleted file mode 100644 index 06372a26a0..0000000000 --- a/package.bak/ifplugd/0002-fix-headers.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- - src/interface.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ifplugd-0.28/src/interface.c -=================================================================== ---- ifplugd-0.28.orig/src/interface.c -+++ ifplugd-0.28/src/interface.c -@@ -23,7 +23,6 @@ - #endif - - #include --#include - #include - #include - #include -@@ -32,6 +31,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/package.bak/ifplugd/0003-no-cxx.patch b/package.bak/ifplugd/0003-no-cxx.patch deleted file mode 100644 index 50ec0545a3..0000000000 --- a/package.bak/ifplugd/0003-no-cxx.patch +++ /dev/null @@ -1,17 +0,0 @@ -[PATCH] ifplugd: configure: don't check for C++ compiler - -The configure script was checking for a C++ compiler (and erroring out -if not found), even though it isn't used for anything. - -Signed-off-by: Peter Korsgaard -diff -urpN ifplugd-0.28/configure.ac ifplugd-0.28.new/configure.ac ---- ifplugd-0.28/configure.ac 2005-06-04 21:21:51.000000000 +0200 -+++ ifplugd-0.28.new/configure.ac 2008-12-13 20:31:13.000000000 +0100 -@@ -33,7 +33,6 @@ if type -p stow > /dev/null && test -d / - fi - - # Checks for programs. --AC_PROG_CXX - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL diff --git a/package.bak/ifplugd/0004-musl-fix-types.patch b/package.bak/ifplugd/0004-musl-fix-types.patch deleted file mode 100644 index 174f9c8a37..0000000000 --- a/package.bak/ifplugd/0004-musl-fix-types.patch +++ /dev/null @@ -1,24 +0,0 @@ -The musl C library does not define type names such as `__uint32_t`. Instead we -use the integer types declared in the ISO C standard header file . - -Signed-off-by: Jörg Krause - -diff -purN ifplugd-0.28.orig/src/ethtool-local.h ifplugd-0.28/src/ethtool-local.h ---- ifplugd-0.28.orig/src/ethtool-local.h 2015-08-01 18:43:47.360916834 +0200 -+++ ifplugd-0.28/src/ethtool-local.h 2015-08-01 18:44:24.256037746 +0200 -@@ -21,10 +21,12 @@ - * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - */ - -+#include -+ - typedef unsigned long long u64; --typedef __uint32_t u32; --typedef __uint16_t u16; --typedef __uint8_t u8; -+typedef uint32_t u32; -+typedef uint16_t u16; -+typedef uint8_t u8; - - #include "ethtool-kernel.h" - diff --git a/package.bak/ifplugd/Config.in b/package.bak/ifplugd/Config.in deleted file mode 100644 index c4b5b5b9d1..0000000000 --- a/package.bak/ifplugd/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_IFPLUGD - bool "ifplugd" - # libdaemon uses fork() - depends on BR2_USE_MMU - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_LIBDAEMON - help - Ifplugd is a daemon which will automatically configure your - ethernet device when a cable is plugged in and automatically - de-configure it if the cable is pulled out. This is useful - on laptops with onboard network adapters, since it will only - configure the interface when a cable is really connected. - - http://0pointer.de/lennart/projects/ifplugd/ diff --git a/package.bak/ifplugd/ifplugd.hash b/package.bak/ifplugd/ifplugd.hash deleted file mode 100644 index 2977c69aa8..0000000000 --- a/package.bak/ifplugd/ifplugd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 474754ac4ab32d738cbf2a4a3e87ee0a2c71b9048a38bdcd7df1e4f9fd6541f0 ifplugd-0.28.tar.gz diff --git a/package.bak/ifplugd/ifplugd.mk b/package.bak/ifplugd/ifplugd.mk deleted file mode 100644 index 9f0feba3f5..0000000000 --- a/package.bak/ifplugd/ifplugd.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# ifplugd -# -################################################################################ - -IFPLUGD_VERSION = 0.28 -IFPLUGD_SITE = http://0pointer.de/lennart/projects/ifplugd -IFPLUGD_LICENSE = GPLv2 -IFPLUGD_LICENSE_FILES = LICENSE -IFPLUGD_AUTORECONF = YES - -# install-strip unconditionally overwrites $(TARGET_DIR)/etc/ifplugd/ifplugd.* -IFPLUGD_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec -IFPLUGD_CONF_OPTS = --disable-lynx --with-initdir=/etc/init.d/ -IFPLUGD_DEPENDENCIES = libdaemon - -# Prefer big ifplugd -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IFPLUGD_DEPENDENCIES += busybox -endif - -define IFPLUGD_INSTALL_FIXUP - $(INSTALL) -D -m 0644 $(@D)/conf/ifplugd.conf $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ - $(SED) 's^\(ARGS=.*\)w^\1^' $(TARGET_DIR)/etc/ifplugd/ifplugd.conf; \ - $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.action \ - $(TARGET_DIR)/etc/ifplugd/ifplugd.action -endef - -IFPLUGD_POST_INSTALL_TARGET_HOOKS += IFPLUGD_INSTALL_FIXUP - -define IFPLUGD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(@D)/conf/ifplugd.init \ - $(TARGET_DIR)/etc/init.d/S45ifplugd - # don't use bash for init script - $(SED) 's^/bin/bash^/bin/sh^g' $(TARGET_DIR)/etc/init.d/S45ifplugd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/iftop/Config.in b/package.bak/iftop/Config.in deleted file mode 100644 index 8c6ae0caaf..0000000000 --- a/package.bak/iftop/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_IFTOP - bool "iftop" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBPCAP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - iftop does for network usage what top(1) does for CPU usage. - It listens to network traffic on a named interface and displays - a table of current bandwidth usage by pairs of hosts. Handy for - answering the question "why is our ADSL link so slow?". - - http://www.ex-parrot.com/pdw/iftop/ - -comment "iftop needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/iftop/iftop.hash b/package.bak/iftop/iftop.hash deleted file mode 100644 index 19ce66b0a4..0000000000 --- a/package.bak/iftop/iftop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f733eeea371a7577f8fe353d86dd88d16f5b2a2e702bd96f5ffb2c197d9b4f97 iftop-1.0pre4.tar.gz diff --git a/package.bak/iftop/iftop.mk b/package.bak/iftop/iftop.mk deleted file mode 100644 index 042f2b28eb..0000000000 --- a/package.bak/iftop/iftop.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# iftop -# -################################################################################ - -IFTOP_VERSION = 1.0pre4 -IFTOP_SITE = http://www.ex-parrot.com/pdw/iftop/download -IFTOP_DEPENDENCIES = ncurses libpcap -IFTOP_LICENSE = GPLv2+ -IFTOP_LICENSE_FILES = COPYING - -IFTOP_LIBS = -lpcap -ifeq ($(BR2_STATIC_LIBS),y) -IFTOP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -endif -IFTOP_CONF_ENV += LIBS+="$(IFTOP_LIBS)" - -$(eval $(autotools-package)) diff --git a/package.bak/ifupdown/0001-dont-use-dpkg-architecture.patch b/package.bak/ifupdown/0001-dont-use-dpkg-architecture.patch deleted file mode 100644 index bb5c58f840..0000000000 --- a/package.bak/ifupdown/0001-dont-use-dpkg-architecture.patch +++ /dev/null @@ -1,17 +0,0 @@ -Drop the need for dpkg-architecture, we only build for linux. -Thanks to Károly Kasza for catching this one. - -Signed-off-by: Gustavo Zacarias - -diff -Nura ifupdown.orig/defn2c.pl ifupdown/defn2c.pl ---- ifupdown.orig/defn2c.pl 2014-11-18 16:39:28.878772655 -0300 -+++ ifupdown/defn2c.pl 2014-11-18 16:43:41.120456676 -0300 -@@ -2,7 +2,7 @@ - - use strict; - --my $DEB_HOST_ARCH_OS = `dpkg-architecture -qDEB_HOST_ARCH_OS`; -+my $DEB_HOST_ARCH_OS = "linux"; - - $DEB_HOST_ARCH_OS =~ s/\n//; - diff --git a/package.bak/ifupdown/Config.in b/package.bak/ifupdown/Config.in deleted file mode 100644 index e683201736..0000000000 --- a/package.bak/ifupdown/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_IFUPDOWN - bool "ifupdown" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # iproute2 - # Default/our uclibc lacks wordexp() - depends on !BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - # runtime for ip binary - select BR2_PACKAGE_IPROUTE2 if !BR2_PACKAGE_BUSYBOX - # runtime for run-parts - select BR2_PACKAGE_DEBIANUTILS if !BR2_PACKAGE_BUSYBOX - help - High level tools to configure network interfaces. - - https://tracker.debian.org/pkg/ifupdown - -comment "ifupdown needs a glibc or musl toolchain w/ headers >= 3.0" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_UCLIBC || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/ifupdown/ifupdown.hash b/package.bak/ifupdown/ifupdown.hash deleted file mode 100644 index 01353c639b..0000000000 --- a/package.bak/ifupdown/ifupdown.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.de.debian.org/debian/pool/main/i/ifupdown/ifupdown_0.8.16.dsc -sha256 601416c12e39ac29022951a2867aed5c607f732ac57fd51517bfba92a4cc4fb0 ifupdown_0.8.16.tar.xz diff --git a/package.bak/ifupdown/ifupdown.mk b/package.bak/ifupdown/ifupdown.mk deleted file mode 100644 index ad0e513f93..0000000000 --- a/package.bak/ifupdown/ifupdown.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# ifupdown -# -################################################################################ - -IFUPDOWN_VERSION = 0.8.16 -IFUPDOWN_SOURCE = ifupdown_$(IFUPDOWN_VERSION).tar.xz -IFUPDOWN_SITE = http://snapshot.debian.org/archive/debian/20160922T165503Z/pool/main/i/ifupdown -IFUPDOWN_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) -IFUPDOWN_LICENSE = GPLv2+ -IFUPDOWN_LICENSE_FILES = COPYING - -define IFUPDOWN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -D'IFUPDOWN_VERSION=\"$(IFUPDOWN_VERSION)\"'" \ - -C $(@D) -endef - -# install doesn't overwrite -define IFUPDOWN_INSTALL_TARGET_CMDS - $(RM) $(TARGET_DIR)/sbin/{ifdown,ifquery} - $(TARGET_MAKE_ENV) $(MAKE) BASEDIR=$(TARGET_DIR) -C $(@D) install -endef - -# We need to switch from /bin/ip to /sbin/ip -IFUPDOWN_DEFN_FILES = can inet inet6 ipx link meta -define IFUPDOWN_MAKE_IP_IN_SBIN - for f in $(IFUPDOWN_DEFN_FILES) ; do \ - $(SED) 's,/bin/ip,/sbin/ip,' $(@D)/$$f.defn ; \ - done -endef -IFUPDOWN_POST_PATCH_HOOKS += IFUPDOWN_MAKE_IP_IN_SBIN - -$(eval $(generic-package)) diff --git a/package.bak/igd2-for-linux/Config.in b/package.bak/igd2-for-linux/Config.in deleted file mode 100644 index 157cc6f30b..0000000000 --- a/package.bak/igd2-for-linux/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_IGD2_FOR_LINUX - bool "igd2-for-linux" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - select BR2_PACKAGE_IPTABLES # runtime - select BR2_PACKAGE_LIBUPNP - help - This is The Linux UPnP Internet Gateway Device 2. It is - modified from the original Linux UPnP Internet Gateway Device - [http://linux-igd.sourceforge.net/] according to UPnP - InternetGatewayDevice:2 specifications. - - It implements the UPnP Internet Gateway Device version 2 - specification (IGDv2) and allows UPnP aware clients, such as - MSN Messenger, Azureus or Miranda to work properly from behind - a NAT firewall. - - Please edit /etc/upnpd.conf before using upnpd! - - https://github.com/ffontaine/igd2-for-linux - -comment "igd2-for-linux needs a toolchain w/ threads, wchar" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/igd2-for-linux/S99upnpd b/package.bak/igd2-for-linux/S99upnpd deleted file mode 100644 index c023fa4746..0000000000 --- a/package.bak/igd2-for-linux/S99upnpd +++ /dev/null @@ -1,67 +0,0 @@ -#!/bin/sh - -NAME=upnpd -PIDFILE=/var/run/$NAME.pid -DAEMON=/usr/sbin/$NAME -CFGFILE=/etc/default/$NAME - -LAN=eth0 -WAN=eth0 - -# For the UPnP library to function correctly, networking must be configured -# properly for multicasting as described in -# https://sourceforge.net/p/pupnp/code/ci/master/tree/README. -# Without this addition, device advertisements and control point searches will -# not function. -# However, the route has to be configured once for all UPnP applications -# (igd2-for-linux, ushare, ...) so do not manage UPnP route by default -MANAGE_UPNP_MULTICAST_ROUTE_ON_LAN=0 - -# Read configuration variable file if it is present -if [ -f $CFGFILE ]; then - . $CFGFILE -fi - -DAEMON_ARGS="-f $WAN $LAN" - -start() { - if [ $MANAGE_UPNP_MULTICAST_ROUTE_ON_LAN != 0 ]; then - printf "Add UPnP multicast route on $LAN\n" - route add -net 239.0.0.0 netmask 255.0.0.0 $LAN - fi - printf "Starting $NAME: " - start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" - if [ $MANAGE_UPNP_MULTICAST_ROUTE_ON_LAN != 0 ]; then - printf "Remove UPnP multicast route on $LAN\n" - route del -net 239.0.0.0 netmask 255.0.0.0 $LAN - fi -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - -exit $? diff --git a/package.bak/igd2-for-linux/igd2-for-linux.hash b/package.bak/igd2-for-linux/igd2-for-linux.hash deleted file mode 100644 index f1c9a7bd3e..0000000000 --- a/package.bak/igd2-for-linux/igd2-for-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 523545a26b0d662e9f6913bec2518df6e70f4d497935d88983d994336a1b0ea9 igd2-for-linux-v1.2.tar.gz diff --git a/package.bak/igd2-for-linux/igd2-for-linux.mk b/package.bak/igd2-for-linux/igd2-for-linux.mk deleted file mode 100644 index 8944c0521e..0000000000 --- a/package.bak/igd2-for-linux/igd2-for-linux.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# igd2-for-linux -# -################################################################################ - -IGD2_FOR_LINUX_VERSION = v1.2 -IGD2_FOR_LINUX_SITE = $(call github,ffontaine,igd2-for-linux,$(IGD2_FOR_LINUX_VERSION)) - -IGD2_FOR_LINUX_LICENSE = GPLv2 -IGD2_FOR_LINUX_LICENSE_FILES = linuxigd2/doc/LICENSE - -IGD2_FOR_LINUX_DEPENDENCIES = libupnp - -IGD2_FOR_LINUX_BUILD_DIR = $(@D)/linuxigd2 -IGD2_FOR_LINUX_CONF_DIR = $(IGD2_FOR_LINUX_BUILD_DIR)/configs - -define IGD2_FOR_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(IGD2_FOR_LINUX_BUILD_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - LIBUPNP_PREFIX="$(STAGING_DIR)/usr" \ - all -endef - -define IGD2_FOR_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(IGD2_FOR_LINUX_BUILD_DIR)/bin/upnpd \ - $(TARGET_DIR)/usr/sbin/upnpd - $(INSTALL) -D -m 0644 $(IGD2_FOR_LINUX_CONF_DIR)/upnpd.conf \ - $(TARGET_DIR)/etc/upnpd.conf - mkdir -p $(TARGET_DIR)/etc/linuxigd/ - cp -dpfr $(IGD2_FOR_LINUX_CONF_DIR)/*.{xml,png} \ - $(TARGET_DIR)/etc/linuxigd/ -endef - -define IGD2_FOR_LINUX_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/igd2-for-linux/S99upnpd \ - $(TARGET_DIR)/etc/init.d/S99upnpd -endef - -define IGD2_FOR_LINUX_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/igd2-for-linux/upnpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/upnpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upnpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upnpd.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/igd2-for-linux/upnpd.service b/package.bak/igd2-for-linux/upnpd.service deleted file mode 100644 index 91a5b4ca28..0000000000 --- a/package.bak/igd2-for-linux/upnpd.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=UPnP Internet Gateway Device version 2 daemon -After=network.target - -[Service] -Environment="LAN=eth0" -Environment="WAN=eth0" -EnvironmentFile=/etc/default/upnpd -# For the UPnP library to function correctly, networking must be configured -# properly for multicasting as described in -# https://sourceforge.net/p/pupnp/code/ci/master/tree/README. -# Without this addition, device advertisements and control point searches will -# not function. -# However, the route has to be configured once for all UPnP applications -# (igd2-for-linux, ushare, ...) so do not manage UPnP route by default -#ExecStartPre=/sbin/route add -net 239.0.0.0 netmask 255.0.0.0 $LAN -#ExecStopPost=/sbin/route del -net 239.0.0.0 netmask 255.0.0.0 $LAN -ExecStart=/usr/sbin/upnpd -f $WAN $LAN -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/igh-ethercat/Config.in b/package.bak/igh-ethercat/Config.in deleted file mode 100644 index e600ef5fcd..0000000000 --- a/package.bak/igh-ethercat/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -comment "igh-ethercat needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_IGH_ETHERCAT - bool "igh-ethercat" - depends on BR2_LINUX_KERNEL - help - IgH EtherCAT Master for Linux. - - http://www.etherlab.org/en/ethercat/index.php - -if BR2_PACKAGE_IGH_ETHERCAT - -config BR2_PACKAGE_IGH_ETHERCAT_8139TOO - bool "8139too driver" - -config BR2_PACKAGE_IGH_ETHERCAT_E100 - bool "e100 driver" - -config BR2_PACKAGE_IGH_ETHERCAT_E1000 - bool "e1000 driver" - -config BR2_PACKAGE_IGH_ETHERCAT_E1000E - bool "e1000e driver" - -config BR2_PACKAGE_IGH_ETHERCAT_R8169 - bool "r8169 driver" - -endif diff --git a/package.bak/igh-ethercat/igh-ethercat.hash b/package.bak/igh-ethercat/igh-ethercat.hash deleted file mode 100644 index b5ee124aa4..0000000000 --- a/package.bak/igh-ethercat/igh-ethercat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://etherlab.org/download/ethercat/ethercat-1.5.2.tar.bz2.md5 -md5 6b4001f8d975865d74a0b108b3bdda3d ethercat-1.5.2.tar.bz2 diff --git a/package.bak/igh-ethercat/igh-ethercat.mk b/package.bak/igh-ethercat/igh-ethercat.mk deleted file mode 100644 index 32c49a3cf8..0000000000 --- a/package.bak/igh-ethercat/igh-ethercat.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# igh-ethercat -# -################################################################################ - -IGH_ETHERCAT_VERSION = 1.5.2 -IGH_ETHERCAT_SITE = http://etherlab.org/download/ethercat -IGH_ETHERCAT_SOURCE = ethercat-$(IGH_ETHERCAT_VERSION).tar.bz2 -IGH_ETHERCAT_LICENSE = GPLv2 (IgH EtherCAT master), LGPLv2.1 (libraries) -IGH_ETHERCAT_LICENSE_FILES = COPYING COPYING.LESSER - -IGH_ETHERCAT_INSTALL_STAGING = YES - -IGH_ETHERCAT_CONF_OPTS = \ - --with-linux-dir=$(LINUX_DIR) - -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_8139TOO),--enable-8139too,--disable-8139too) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E100),--enable-e100,--disable-e100) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000),--enable-e1000,--disable-e1000) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_E1000E),--enable-e1000e,--disable-e1000e) -IGH_ETHERCAT_CONF_OPTS += $(if $(BR2_PACKAGE_IGH_ETHERCAT_R8169),--enable-r8169,--disable-r8169) - -$(eval $(kernel-module)) -$(eval $(autotools-package)) diff --git a/package.bak/igmpproxy/Config.in b/package.bak/igmpproxy/Config.in deleted file mode 100644 index 37f39b289c..0000000000 --- a/package.bak/igmpproxy/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_IGMPPROXY - bool "igmpproxy" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR - help - A simple dynamic Multicast Routing Daemon - using only IGMP signalling. It's intended - for simple forwarding of Multicast traffic - between networks. - - http://sourceforge.net/projects/igmpproxy/ - -comment "igmpproxy needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/igmpproxy/igmpproxy.hash b/package.bak/igmpproxy/igmpproxy.hash deleted file mode 100644 index 98dc242fb2..0000000000 --- a/package.bak/igmpproxy/igmpproxy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 2be2171cf273678810283937f7752dc9b8402456d0a03ee55f06ca52fadf075f igmpproxy-a731683d1a65956fa05024b0597b105fe6a3a122.tar.gz diff --git a/package.bak/igmpproxy/igmpproxy.mk b/package.bak/igmpproxy/igmpproxy.mk deleted file mode 100644 index 98168721f8..0000000000 --- a/package.bak/igmpproxy/igmpproxy.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# igmpproxy -# -################################################################################ - -IGMPPROXY_VERSION = a731683d1a65956fa05024b0597b105fe6a3a122 -IGMPPROXY_SITE = $(call github,pali,igmpproxy,$(IGMPPROXY_VERSION)) -IGMPPROXY_AUTORECONF = YES -IGMPPROXY_LICENSE = GPLv2+ -IGMPPROXY_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/ijs/Config.in b/package.bak/ijs/Config.in deleted file mode 100644 index 50e8161bf0..0000000000 --- a/package.bak/ijs/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_IJS - bool "ijs" - depends on BR2_USE_MMU # fork() - help - The IJS package contains a library which implements a - protocol for transmission of raster page images. - - http://www.openprinting.org/ diff --git a/package.bak/ijs/ijs.hash b/package.bak/ijs/ijs.hash deleted file mode 100644 index 1a8f564efd..0000000000 --- a/package.bak/ijs/ijs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 11a5f5084488c480f3ff5a24d64d7147bb64272bf60a0ba51330a56c5b50cab9 ijs-0.35.tar.bz2 diff --git a/package.bak/ijs/ijs.mk b/package.bak/ijs/ijs.mk deleted file mode 100644 index dfd3ff9f90..0000000000 --- a/package.bak/ijs/ijs.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# ijs -# -################################################################################ - -IJS_VERSION = 0.35 -IJS_SOURCE = ijs-$(IJS_VERSION).tar.bz2 -IJS_SITE = http://www.openprinting.org/download/ijs/download -IJS_LICENSE = MIT -IJS_LICENSE_FILES = README -# Buildroot libtool patch does not apply, so we autoreconf the -# package. -IJS_AUTORECONF = YES -IJS_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch b/package.bak/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch deleted file mode 100644 index 00a1045bb7..0000000000 --- a/package.bak/imagemagick/0001-png.c-unbreak-build-without-JPEG-support.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 5d0e9c53f49022df5154eb3c04900f48b1c6448e Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 6 Feb 2017 17:39:31 +0100 -Subject: [PATCH] png.c: unbreak build without JPEG support - -Since commit a9e228f8ac26 (Implemented a private PNG caNv (canvas) chunk), -PNGsLong gets called unconditionally, but it is only defined if JPEG -support is enabled (which defines JNG_SUPPORTED), breaking the build: - -MagickCore/.libs/libMagickCore-7.Q16HDRI.a(MagickCore_libMagickCore_7_Q16HDRI_la-png.o): In function `WriteOnePNGImage': -png.c:(.text+0x748d): undefined reference to `PNGsLong' -png.c:(.text+0x74b7): undefined reference to `PNGsLong' - -For build log, see: -http://autobuild.buildroot.net/results/d20/d20eecec8e7b947759185f77a6c8e610dd7393f3/build-end.log - -Fix it by unconditionally defining the helper function. - -Submitted-upstream: https://github.com/ImageMagick/ImageMagick/pull/373 -Signed-off-by: Peter Korsgaard ---- - coders/png.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coders/png.c b/coders/png.c -index aebe59281..1328b1aab 100644 ---- a/coders/png.c -+++ b/coders/png.c -@@ -1229,7 +1229,6 @@ static void PNGLong(png_bytep p,png_uint_32 value) - *p++=(png_byte) (value & 0xff); - } - --#if defined(JNG_SUPPORTED) - static void PNGsLong(png_bytep p,png_int_32 value) - { - *p++=(png_byte) ((value >> 24) & 0xff); -@@ -1237,7 +1236,6 @@ static void PNGsLong(png_bytep p,png_int_32 value) - *p++=(png_byte) ((value >> 8) & 0xff); - *p++=(png_byte) (value & 0xff); - } --#endif - - static void PNGShort(png_bytep p,png_uint_16 value) - { --- -2.11.0 - diff --git a/package.bak/imagemagick/Config.in b/package.bak/imagemagick/Config.in deleted file mode 100644 index 0bd4df2ab7..0000000000 --- a/package.bak/imagemagick/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_IMAGEMAGICK - bool "imagemagick" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - ImageMagick(R) is a software suite to create, edit, and compose - bitmap images. It can read, convert and write images in a variety of - formats (about 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, - PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to - translate, flip, mirror, rotate, scale, shear and transform images, - adjust image colors, apply various special effects, or draw text, - lines, polygons, ellipses and Bézier curves. - - http://www.imagemagick.org/ - -comment "imagemagick needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/imagemagick/imagemagick.hash b/package.bak/imagemagick/imagemagick.hash deleted file mode 100644 index 90e1db5389..0000000000 --- a/package.bak/imagemagick/imagemagick.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.imagemagick.org/download/releases/digest.rdf -sha256 1ee004740b7ab47fff3c92ae4a89dcbd0181c4d5f31fcb7e3697412ea384a0da ImageMagick-7.0.4-6.tar.xz diff --git a/package.bak/imagemagick/imagemagick.mk b/package.bak/imagemagick/imagemagick.mk deleted file mode 100644 index a91729736b..0000000000 --- a/package.bak/imagemagick/imagemagick.mk +++ /dev/null @@ -1,146 +0,0 @@ -################################################################################ -# -# imagemagick -# -################################################################################ - -IMAGEMAGICK_VERSION = 7.0.4-6 -IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz -IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases -IMAGEMAGICK_LICENSE = Apache-2.0 -IMAGEMAGICK_LICENSE_FILES = LICENSE - -IMAGEMAGICK_INSTALL_STAGING = YES -IMAGEMAGICK_CONFIG_SCRIPTS = \ - $(addsuffix -config,MagickCore MagickWand) - -ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) -IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config -endif - -IMAGEMAGICK_CONF_ENV = ac_cv_sys_file_offset_bits=64 - -IMAGEMAGICK_CONF_OPTS = \ - --program-transform-name='s,,,' \ - --disable-openmp \ - --without-djvu \ - --without-dps \ - --without-flif \ - --without-fpx \ - --without-gslib \ - --without-gvc \ - --without-jbig \ - --without-lqr \ - --without-openexr \ - --without-perl \ - --without-raqm \ - --without-wmf \ - --without-x \ - --with-gs-font-dir=/usr/share/fonts/gs - -IMAGEMAGICK_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -IMAGEMAGICK_CONF_OPTS += --with-fontconfig -IMAGEMAGICK_DEPENDENCIES += fontconfig -else -IMAGEMAGICK_CONF_OPTS += --without-fontconfig -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -IMAGEMAGICK_CONF_OPTS += --with-freetype -IMAGEMAGICK_CONF_ENV += \ - ac_cv_path_freetype_config=$(STAGING_DIR)/usr/bin/freetype-config -IMAGEMAGICK_DEPENDENCIES += freetype -else -IMAGEMAGICK_CONF_OPTS += --without-freetype -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -IMAGEMAGICK_CONF_OPTS += --with-jpeg -IMAGEMAGICK_DEPENDENCIES += jpeg -else -IMAGEMAGICK_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -IMAGEMAGICK_CONF_OPTS += --with-lcms -IMAGEMAGICK_DEPENDENCIES += lcms2 -else -IMAGEMAGICK_CONF_OPTS += --without-lcms -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -IMAGEMAGICK_CONF_OPTS += --with-png -IMAGEMAGICK_DEPENDENCIES += libpng -else -IMAGEMAGICK_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_LIBRSVG),y) -IMAGEMAGICK_CONF_OPTS += --with-rsvg -IMAGEMAGICK_DEPENDENCIES += librsvg -else -IMAGEMAGICK_CONF_OPTS += --without-rsvg -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -IMAGEMAGICK_CONF_OPTS += --with-xml -IMAGEMAGICK_CONF_ENV += ac_cv_path_xml2_config=$(STAGING_DIR)/usr/bin/xml2-config -IMAGEMAGICK_DEPENDENCIES += libxml2 -else -IMAGEMAGICK_CONF_OPTS += --without-xml -endif - -ifeq ($(BR2_PACKAGE_PANGO),y) -IMAGEMAGICK_CONF_OPTS += --with-pango -IMAGEMAGICK_DEPENDENCIES += pango -else -IMAGEMAGICK_CONF_OPTS += --without-pango -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -IMAGEMAGICK_CONF_OPTS += --with-tiff -IMAGEMAGICK_DEPENDENCIES += tiff -else -IMAGEMAGICK_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -IMAGEMAGICK_CONF_OPTS += --with-lzma -IMAGEMAGICK_DEPENDENCIES += xz -else -IMAGEMAGICK_CONF_OPTS += --without-lzma -endif - -ifeq ($(BR2_PACKAGE_FFTW),y) -# configure script misdetects these leading to build errors -IMAGEMAGICK_CONF_ENV += ac_cv_func_creal=yes ac_cv_func_cimag=yes -IMAGEMAGICK_CONF_OPTS += --with-fftw -IMAGEMAGICK_DEPENDENCIES += fftw -else -IMAGEMAGICK_CONF_OPTS += --without-fftw -endif - -ifeq ($(BR2_PACKAGE_WEBP),y) -IMAGEMAGICK_CONF_OPTS += --with-webp -IMAGEMAGICK_DEPENDENCIES += webp -else -IMAGEMAGICK_CONF_OPTS += --without-webp -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -IMAGEMAGICK_CONF_OPTS += --with-zlib -IMAGEMAGICK_DEPENDENCIES += zlib -else -IMAGEMAGICK_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -IMAGEMAGICK_CONF_OPTS += --with-bzlib -IMAGEMAGICK_DEPENDENCIES += bzip2 -else -IMAGEMAGICK_CONF_OPTS += --without-bzlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/imlib2/Config.in b/package.bak/imlib2/Config.in deleted file mode 100644 index 7aac07439c..0000000000 --- a/package.bak/imlib2/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -comment "imlib2 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_IMLIB2 - bool "imlib2" - select BR2_PACKAGE_FREETYPE - depends on !BR2_STATIC_LIBS # dlopen() - help - Imlib 2 is the successor to Imlib. This library provides - routines to load, save and render images in various formats. - - http://freshmeat.net/projects/imlib2/ - -if BR2_PACKAGE_IMLIB2 - -config BR2_PACKAGE_IMLIB2_JPEG - bool "JPEG support" - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_IMLIB2_PNG - bool "PNG support" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_IMLIB2_GIF - bool "GIF support" - select BR2_PACKAGE_GIFLIB - -config BR2_PACKAGE_IMLIB2_TIFF - bool "TIFF support" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_IMLIB2_ID3 - bool "ID3 support" - select BR2_PACKAGE_LIBID3TAG - -config BR2_PACKAGE_IMLIB2_X - bool "X support" - default y - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBX11 -endif diff --git a/package.bak/imlib2/imlib2.hash b/package.bak/imlib2/imlib2.hash deleted file mode 100644 index 6e1faafc9b..0000000000 --- a/package.bak/imlib2/imlib2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/enlightenment/files/imlib2-src/1.4.9/ -md5 23ef8b49f2793bc63b16839a2062298b imlib2-1.4.9.tar.bz2 -sha1 f389d67c337b604a365e620b0083b2d342dd724e imlib2-1.4.9.tar.bz2 diff --git a/package.bak/imlib2/imlib2.mk b/package.bak/imlib2/imlib2.mk deleted file mode 100644 index 7da032f9ad..0000000000 --- a/package.bak/imlib2/imlib2.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# imlib2 -# -################################################################################ - -IMLIB2_VERSION = 1.4.9 -IMLIB2_SOURCE = imlib2-$(IMLIB2_VERSION).tar.bz2 -IMLIB2_SITE = http://downloads.sourceforge.net/project/enlightenment/imlib2-src/$(IMLIB2_VERSION) -IMLIB2_LICENSE = imlib2 license -IMLIB2_LICENSE_FILES = COPYING - -IMLIB2_INSTALL_STAGING = YES -IMLIB2_DEPENDENCIES = host-pkgconf freetype -IMLIB2_CONF_OPTS = --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config -IMLIB2_CONFIG_SCRIPTS = imlib2-config - -ifeq ($(BR2_PACKAGE_IMLIB2_X),y) -IMLIB2_CONF_OPTS += --with-x -IMLIB2_DEPENDENCIES += xlib_libX11 xlib_libXext -else -IMLIB2_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_JPEG),y) -IMLIB2_CONF_OPTS += --with-jpeg -IMLIB2_DEPENDENCIES += jpeg -else -IMLIB2_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_PNG),y) -IMLIB2_CONF_OPTS += --with-png -IMLIB2_DEPENDENCIES += libpng -else -IMLIB2_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_GIF),y) -IMLIB2_CONF_OPTS += --with-gif -IMLIB2_DEPENDENCIES += giflib -else -IMLIB2_CONF_OPTS += --without-gif -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_TIFF),y) -IMLIB2_CONF_OPTS += --with-tiff -IMLIB2_DEPENDENCIES += tiff -else -IMLIB2_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_IMLIB2_ID3),y) -IMLIB2_CONF_OPTS += --with-id3 -IMLIB2_DEPENDENCIES += libid3tag -else -IMLIB2_CONF_OPTS += --without-id3 -endif - -# drop -L from linker flags -define IMLIB2_FIXUP_IMLIB2_CONFIG - $(SED) 's/-L[^ ]*//g' $(STAGING_DIR)/usr/bin/imlib2-config -endef - -IMLIB2_POST_INSTALL_STAGING_HOOKS += IMLIB2_FIXUP_IMLIB2_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/imx-usb-loader/Config.in.host b/package.bak/imx-usb-loader/Config.in.host deleted file mode 100644 index a4a0f88531..0000000000 --- a/package.bak/imx-usb-loader/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_IMX_USB_LOADER - bool "host imx-usb-loader" - depends on BR2_arm - help - This package contains tools to download and execute code - on Freescale i.MX5/i.MX6 and Vybrid SoCs through the - Serial Download Protocol. - - https://github.com/boundarydevices/imx_usb_loader diff --git a/package.bak/imx-usb-loader/imx-usb-loader.hash b/package.bak/imx-usb-loader/imx-usb-loader.hash deleted file mode 100644 index 3e02038997..0000000000 --- a/package.bak/imx-usb-loader/imx-usb-loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 40e1e36791e91366b13f57b16b32e75cf05e7177b2813f1bf2446419d0ed44eb imx-usb-loader-9b0e81cf9511c3a27cf635407714caa2793b570c.tar.gz diff --git a/package.bak/imx-usb-loader/imx-usb-loader.mk b/package.bak/imx-usb-loader/imx-usb-loader.mk deleted file mode 100644 index 0cd9637c50..0000000000 --- a/package.bak/imx-usb-loader/imx-usb-loader.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# imx-usb-loader -# -################################################################################ - -IMX_USB_LOADER_VERSION = 9b0e81cf9511c3a27cf635407714caa2793b570c -IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) -IMX_USB_LOADER_LICENSE = LGPLv2.1+ -IMX_USB_LOADER_LICENSE_FILES = COPYING -HOST_IMX_USB_LOADER_DEPENDENCIES = host-libusb host-pkgconf - -define HOST_IMX_USB_LOADER_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define HOST_IMX_USB_LOADER_INSTALL_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - DESTDIR=$(HOST_DIR) sysconfdir=/etc install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/inadyn/Config.in b/package.bak/inadyn/Config.in deleted file mode 100644 index d03db83e3a..0000000000 --- a/package.bak/inadyn/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_INADYN - bool "inadyn" - depends on BR2_USE_MMU # Uses fork() - depends on !BR2_STATIC_LIBS # dlopen() - select BR2_PACKAGE_LIBCONFUSE - select BR2_PACKAGE_LIBITE - help - INADYN is a free DynDNS client. It gives the possibility - to have your own fixed hostname registered on the internet, - although your IP might be changing. - - https://github.com/troglobit/inadyn - -comment "inadyn needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/inadyn/S70inadyn b/package.bak/inadyn/S70inadyn deleted file mode 100644 index ca7b414678..0000000000 --- a/package.bak/inadyn/S70inadyn +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# Start & stop the inadyn client -# - -CONFIG=/etc/inadyn.conf - -# check if CONFIG exists, print message & exit if it doesn't -[ ! -f $CONFIG ] && ( echo "The config file "$CONFIG" is missing...exiting now." && exit 2 ) - -# Allow a few customizations from a config file. Especially inadyn -# must be explicitly enabled by adding ENABLED="yes" in this file. -test -r /etc/default/inadyn && . /etc/default/inadyn - -case "$1" in - start) - printf "Starting inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -b -q -S -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping inadyn: " - if test "${ENABLED}" != "yes" ; then - echo "SKIPPED" - exit 0 - fi - start-stop-daemon -q -K -p /var/run/inadyn.pid -x /usr/sbin/inadyn - [ $? = 0 ] && echo "OK" || echo "FAIL" - rm -f /var/run/inadyn.pid - ;; - restart) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/inadyn/inadyn.conf b/package.bak/inadyn/inadyn.conf deleted file mode 100644 index 1b29027606..0000000000 --- a/package.bak/inadyn/inadyn.conf +++ /dev/null @@ -1,11 +0,0 @@ -# Basic configuration file for inadyn -# -# /etc/inadyn.conf -iface = eth0 -period = 300 - -provider default@dyndns.org { - username = test - password = test - hostname = test -} diff --git a/package.bak/inadyn/inadyn.hash b/package.bak/inadyn/inadyn.hash deleted file mode 100644 index a4e60c96c7..0000000000 --- a/package.bak/inadyn/inadyn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 763c53eb3856decfe8b921cab8a54b428b079a62264fbcf6c89690713d63529a inadyn-v2.0.tar.gz diff --git a/package.bak/inadyn/inadyn.mk b/package.bak/inadyn/inadyn.mk deleted file mode 100644 index f23955bbaf..0000000000 --- a/package.bak/inadyn/inadyn.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# inadyn -# -################################################################################ - -INADYN_VERSION = v2.0 -INADYN_SITE = $(call github,troglobit,inadyn,$(INADYN_VERSION)) -INADYN_LICENSE = GPLv2+ -INADYN_LICENSE_FILES = COPYING -INADYN_AUTORECONF = YES -INADYN_DEPENDENCIES = host-pkgconf libconfuse libite - -# Needed for autoreconf to work properly, see ./autogen.sh -define INADYN_FIXUP_M4_DIR - mkdir $(@D)/m4 -endef -INADYN_POST_EXTRACT_HOOKS += INADYN_FIXUP_M4_DIR - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -INADYN_CONF_OPTS += --enable-openssl -INADYN_DEPENDENCIES += openssl -else ifeq ($(BR2_PACKAGE_GNUTLS),y) -INADYN_DEPENDENCIES += gnutls -else -INADYN_CONF_OPTS += --disable-ssl -endif - -define INADYN_INSTALL_SAMPLE_CONFIG - $(INSTALL) -D -m 0600 package/inadyn/inadyn.conf \ - $(TARGET_DIR)/etc/inadyn.conf -endef -INADYN_POST_INSTALL_TARGET_HOOKS += INADYN_INSTALL_SAMPLE_CONFIG - -define INADYN_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/inadyn/S70inadyn \ - $(TARGET_DIR)/etc/init.d/S70inadyn -endef - -define INADYN_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/inadyn/inadyn.service \ - $(TARGET_DIR)/usr/lib/systemd/system/inadyn.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/inadyn.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/inadyn.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/inadyn/inadyn.service b/package.bak/inadyn/inadyn.service deleted file mode 100644 index abc0a1e401..0000000000 --- a/package.bak/inadyn/inadyn.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=DDNS client -After=syslog.target network.target - -[Service] -ExecStart=/usr/bin/inadyn -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/inconsolata/Config.in b/package.bak/inconsolata/Config.in deleted file mode 100644 index de6b388574..0000000000 --- a/package.bak/inconsolata/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_INCONSOLATA - bool "inconsolata" - help - Inconsolata is a monospace font, designed for code listings - and the like. - - http://www.google.com/fonts/specimen/Inconsolata diff --git a/package.bak/inconsolata/inconsolata.hash b/package.bak/inconsolata/inconsolata.hash deleted file mode 100644 index 49ea958472..0000000000 --- a/package.bak/inconsolata/inconsolata.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20091207T044352Z/pool/main/t/ttf-inconsolata/ttf-inconsolata_001.010-2.dsc -sha256 ecf8ba44911fcb3c9683aef1ca2b3cfbafa119a3e93c682f448850e1ae08ce93 ttf-inconsolata_001.010.orig.tar.gz diff --git a/package.bak/inconsolata/inconsolata.mk b/package.bak/inconsolata/inconsolata.mk deleted file mode 100644 index 2f53b98a22..0000000000 --- a/package.bak/inconsolata/inconsolata.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# inconsolata -# -################################################################################ - -INCONSOLATA_VERSION = 001.010 -INCONSOLATA_SITE = http://snapshot.debian.org/archive/debian/20090524T155154Z/pool/main/t/ttf-inconsolata -INCONSOLATA_SOURCE = ttf-inconsolata_$(INCONSOLATA_VERSION).orig.tar.gz -INCONSOLATA_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/inconsolata -INCONSOLATA_LICENSE = OFLv1.0 -INCONSOLATA_LICENSE_FILES = OFL.txt - -define INCONSOLATA_INSTALL_TARGET_CMDS - mkdir -p $(INCONSOLATA_TARGET_DIR) - $(INSTALL) -m 644 $(@D)/*.otf $(INCONSOLATA_TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/initscripts/Config.in b/package.bak/initscripts/Config.in deleted file mode 100644 index 82cbd5c678..0000000000 --- a/package.bak/initscripts/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_INITSCRIPTS - bool - help - The basics startup scripts for both SysV and Busybox diff --git a/package.bak/initscripts/init.d/S20urandom b/package.bak/initscripts/init.d/S20urandom deleted file mode 100755 index 2f5b4e4c86..0000000000 --- a/package.bak/initscripts/init.d/S20urandom +++ /dev/null @@ -1,51 +0,0 @@ -#! /bin/sh -# -# urandom This script saves the random seed between reboots. -# It is called from the boot, halt and reboot scripts. -# -# Version: @(#)urandom 1.33 22-Jun-1998 miquels@cistron.nl -# - -[ -c /dev/urandom ] || exit 0 -#. /etc/default/rcS - -case "$1" in - start|"") - # check for read only file system - if ! touch /etc/random-seed 2>/dev/null - then - echo "read-only file system detected...done" - exit - fi - if [ "$VERBOSE" != no ] - then - printf "Initializing random number generator... " - fi - # Load and then save 512 bytes, - # which is the size of the entropy pool - cat /etc/random-seed >/dev/urandom - rm -f /etc/random-seed - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom start: failed." - umask 022 - [ "$VERBOSE" != no ] && echo "done." - ;; - stop) - if ! touch /etc/random-seed 2>/dev/null - then - exit - fi - # Carry a random seed from shut-down to start-up; - # see documentation in linux/drivers/char/random.c - [ "$VERBOSE" != no ] && printf "Saving random seed... " - umask 077 - dd if=/dev/urandom of=/etc/random-seed count=1 \ - >/dev/null 2>&1 || echo "urandom stop: failed." - [ "$VERBOSE" != no ] && echo "done." - ;; - *) - echo "Usage: urandom {start|stop}" >&2 - exit 1 - ;; -esac diff --git a/package.bak/initscripts/init.d/S40network b/package.bak/initscripts/init.d/S40network deleted file mode 100755 index 642c5013ac..0000000000 --- a/package.bak/initscripts/init.d/S40network +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh -# -# Start the network.... -# - -# Debian ifupdown needs the /run/network lock directory -mkdir -p /run/network - -case "$1" in - start) - printf "Starting network: " - /sbin/ifup -a - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping network: " - /sbin/ifdown -a - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/initscripts/init.d/rcK b/package.bak/initscripts/init.d/rcK deleted file mode 100755 index 59e9c54ff9..0000000000 --- a/package.bak/initscripts/init.d/rcK +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - - -# Stop all init scripts in /etc/init.d -# executing them in reversed numerical order. -# -for i in $(ls -r /etc/init.d/S??*) ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set stop - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i stop - ;; - esac -done - diff --git a/package.bak/initscripts/init.d/rcS b/package.bak/initscripts/init.d/rcS deleted file mode 100755 index de411534da..0000000000 --- a/package.bak/initscripts/init.d/rcS +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh - - -# Start all init scripts in /etc/init.d -# executing them in numerical order. -# -for i in /etc/init.d/S??* ;do - - # Ignore dangling symlinks (if any). - [ ! -f "$i" ] && continue - - case "$i" in - *.sh) - # Source shell script for speed. - ( - trap - INT QUIT TSTP - set start - . $i - ) - ;; - *) - # No sh extension, so fork subprocess. - $i start - ;; - esac -done - diff --git a/package.bak/initscripts/initscripts.mk b/package.bak/initscripts/initscripts.mk deleted file mode 100644 index cfee155570..0000000000 --- a/package.bak/initscripts/initscripts.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# initscripts -# -################################################################################ - -define INITSCRIPTS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/etc/init.d - $(INSTALL) -D -m 0755 package/initscripts/init.d/* $(TARGET_DIR)/etc/init.d/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/inotify-tools/0001-gcc6.patch b/package.bak/inotify-tools/0001-gcc6.patch deleted file mode 100644 index aae622ebf5..0000000000 --- a/package.bak/inotify-tools/0001-gcc6.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 5fe3ba82134d8b85adc69cf1d6c5742b4bde20b4 Mon Sep 17 00:00:00 2001 -From: James Knight -Date: Thu, 16 Jun 2016 00:00:57 -0400 -Subject: [PATCH] correct code alignment -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The following replaces the indented section of code from spaces to tabs. -No functional changes. Aside from consistency, this resolves a GCC 6 -build issue with the flag `-Werror=misleading-indentation` enabled: - - inotifywait.c: In function ‘output_event_csv’: - inotifywait.c:126:5: error: this ‘if’ clause does not guard... - [-Werror=misleading-indentation] - if (filename != NULL) - ^~ - inotifywait.c:129:2: note: ...this statement, but the latter is - misleadingly indented as if it is guarded - by the ‘if’ - printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) - ) ); - ^~~~~~ - -Signed-off-by: James Knight -Signed-off-by: Bernd Kuhls -(downloaded from upstream pull request - https://github.com/rvoicilas/inotify-tools/pull/65) ---- - src/inotifywait.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/inotifywait.c b/src/inotifywait.c -index c5ce5e3..404a85b 100644 ---- a/src/inotifywait.c -+++ b/src/inotifywait.c -@@ -122,9 +122,9 @@ void validate_format( char * fmt ) { - - - void output_event_csv( struct inotify_event * event ) { -- char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -- if (filename != NULL) -- printf("%s,", filename); -+ char *filename = csv_escape(inotifytools_filename_from_wd(event->wd)); -+ if (filename != NULL) -+ printf("%s,", filename); - - printf("%s,", csv_escape( inotifytools_event_to_str( event->mask ) ) ); - if ( event->len > 0 ) diff --git a/package.bak/inotify-tools/Config.in b/package.bak/inotify-tools/Config.in deleted file mode 100644 index df440d5926..0000000000 --- a/package.bak/inotify-tools/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_INOTIFY_TOOLS - bool "inotify-tools" - depends on BR2_USE_MMU # fork() - help - inotify-tools is a C library and a set of command-line - programs for Linux providing a simple interface to inotify. - These programs can be used to monitor and act upon - filesystem events. Provides the 'inotifywait' and 'inotifywatch' - binaries. - - https://github.com/rvoicilas/inotify-tools diff --git a/package.bak/inotify-tools/inotify-tools.hash b/package.bak/inotify-tools/inotify-tools.hash deleted file mode 100644 index 0993dc44c4..0000000000 --- a/package.bak/inotify-tools/inotify-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 628b8efabb65a739dd747fe43b73b29a609b5cfa9628caa127764ed77766a6e1 inotify-tools-1df9af4d6cd0f4af4b1b19254bcf056aed4ae395.tar.gz diff --git a/package.bak/inotify-tools/inotify-tools.mk b/package.bak/inotify-tools/inotify-tools.mk deleted file mode 100644 index e8b1498e6f..0000000000 --- a/package.bak/inotify-tools/inotify-tools.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# inotify-tools -# -################################################################################ - -INOTIFY_TOOLS_VERSION = 1df9af4d6cd0f4af4b1b19254bcf056aed4ae395 -INOTIFY_TOOLS_SITE = $(call github,rvoicilas,inotify-tools,$(INOTIFY_TOOLS_VERSION)) -INOTIFY_TOOLS_LICENSE = GPL -INOTIFY_TOOLS_LICENSE_FILES = COPYING -INOTIFY_TOOLS_INSTALL_STAGING = YES -INOTIFY_TOOLS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/input-event-daemon/Config.in b/package.bak/input-event-daemon/Config.in deleted file mode 100644 index 84177fd8f2..0000000000 --- a/package.bak/input-event-daemon/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_INPUT_EVENT_DAEMON - bool "input-event-daemon" - # Uses fork() - depends on BR2_USE_MMU - help - input-event-daemon is a daemon which executes - a user-defined command on input events, such as - keys, mouse buttons and switches. - - http://github.com/gandro/input-event-daemon diff --git a/package.bak/input-event-daemon/S99input-event-daemon b/package.bak/input-event-daemon/S99input-event-daemon deleted file mode 100755 index 8d70dd3079..0000000000 --- a/package.bak/input-event-daemon/S99input-event-daemon +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh - -[ -f /usr/bin/input-event-daemon ] || exit 0 - -start() { - printf "Starting input-event-daemon: " - input-event-daemon - echo "done" -} - - -stop() { - printf "Stopping input-event-daemon: " - killall input-event-daemon - echo "done" -} - -restart() { - stop - start -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|reload|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/input-event-daemon/input-event-daemon.hash b/package.bak/input-event-daemon/input-event-daemon.hash deleted file mode 100644 index d5364a95e3..0000000000 --- a/package.bak/input-event-daemon/input-event-daemon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1d9a44160aead88080093f74be9d709fbbc2637f982958e2673d80aedacd0a65 input-event-daemon-v0.1.3.tar.gz diff --git a/package.bak/input-event-daemon/input-event-daemon.mk b/package.bak/input-event-daemon/input-event-daemon.mk deleted file mode 100644 index e61c8cc4b5..0000000000 --- a/package.bak/input-event-daemon/input-event-daemon.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# input-event-daemon -# -################################################################################ - -INPUT_EVENT_DAEMON_VERSION = v0.1.3 -INPUT_EVENT_DAEMON_SITE = $(call github,gandro,input-event-daemon,$(INPUT_EVENT_DAEMON_VERSION)) -INPUT_EVENT_DAEMON_LICENSE = input-event-daemon license -INPUT_EVENT_DAEMON_LICENSE_FILES = README - -define INPUT_EVENT_DAEMON_BUILD_CMDS - touch $(@D)/input-event-table.h - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) -endef - -define INPUT_EVENT_DAEMON_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/input-event-daemon \ - $(TARGET_DIR)/usr/bin/input-event-daemon - $(INSTALL) -m 644 -D $(@D)/docs/sample.conf \ - $(TARGET_DIR)/etc/input-event-daemon.conf -endef - -define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/input-event-daemon/S99input-event-daemon \ - $(TARGET_DIR)/etc/init.d/S99input-event-daemon -endef - -define INPUT_EVENT_DAEMON_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/input-event-daemon/input-event-daemon.service \ - $(TARGET_DIR)/usr/lib/systemd/system/input-event-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf /usr/lib/systemd/system/input-event-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/input-event-daemon.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/input-event-daemon/input-event-daemon.service b/package.bak/input-event-daemon/input-event-daemon.service deleted file mode 100644 index d91e655ff9..0000000000 --- a/package.bak/input-event-daemon/input-event-daemon.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Input Event Daemon - -[Service] -ExecStart=/usr/bin/input-event-daemon --no-daemon -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/input-tools/0001-rint.patch b/package.bak/input-tools/0001-rint.patch deleted file mode 100644 index b2aa13f760..0000000000 --- a/package.bak/input-tools/0001-rint.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN joystick-20051019.orig/utils/jscal.c joystick-20051019/utils/jscal.c ---- joystick-20051019.orig/utils/jscal.c 2004-10-19 09:51:52.000000000 +0200 -+++ joystick-20051019/utils/jscal.c 2009-01-18 10:48:50.000000000 +0100 -@@ -141,10 +141,10 @@ - c = 32767.0 / (inputs.cmin[1] - inputs.cmax[0]); - d = 32767.0 / (inputs.cmin[2] - inputs.cmax[1]); - -- results[0] = rint(a); -- results[1] = rint(b); -- results[2] = rint(c*16384.0); -- results[3] = rint(d*16384.0); -+ results[0] = (int) (a + 0.5); -+ results[1] = (int) (b + 0.5); -+ results[2] = (int) (c*16384.0 + 0.5); -+ results[3] = (int) (d*16384.0 + 0.5); - - return 1; - } diff --git a/package.bak/input-tools/Config.in b/package.bak/input-tools/Config.in deleted file mode 100644 index 85b4fd006e..0000000000 --- a/package.bak/input-tools/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_INPUT_TOOLS - bool "input-tools" - help - Tools for the Linux kernel input layer. - http://linuxconsole.sourceforge.net/ - -if BR2_PACKAGE_INPUT_TOOLS - -config BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH - bool "inputattach" - default y - help - Inputattach is used for attaching a serial line to the input layer. - -config BR2_PACKAGE_INPUT_TOOLS_JSCAL - bool "jscal" - default y - help - Joystick calibration program. - -config BR2_PACKAGE_INPUT_TOOLS_JSTEST - bool "jstest" - default y - help - Joystick test program. - -endif diff --git a/package.bak/input-tools/input-tools.hash b/package.bak/input-tools/input-tools.hash deleted file mode 100644 index 53b0f92ea2..0000000000 --- a/package.bak/input-tools/input-tools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/joystick/joystick_20051019-12.dsc -sha256 cb60cb62093f1889a91fcef1cc36546aba406f451941e8d057f095639e6afb89 joystick_20051019.orig.tar.gz -# From http://snapshot.debian.org/archive/debian/20090630T220234Z/pool/main/j/joystick/joystick_20051019-5.dsc -sha256 01e9d14a656d594a3e261751233200f740a09c2a538ac71447c104ffe89ec10c joystick_20051019-5.diff.gz diff --git a/package.bak/input-tools/input-tools.mk b/package.bak/input-tools/input-tools.mk deleted file mode 100644 index 81e913d8f2..0000000000 --- a/package.bak/input-tools/input-tools.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# input-tools -# -################################################################################ - -INPUT_TOOLS_VERSION = 20051019 -INPUT_TOOLS_SOURCE = joystick_$(INPUT_TOOLS_VERSION).orig.tar.gz -INPUT_TOOLS_PATCH = joystick_$(INPUT_TOOLS_VERSION)-5.diff.gz -INPUT_TOOLS_SITE = http://snapshot.debian.org/archive/debian/20101023T043132Z/pool/main/j/joystick -INPUT_TOOLS_LICENSE = GPLv2+ -INPUT_TOOLS_LICENSE_FILES = utils/Makefile - -INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_INPUTATTACH) += inputattach -INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSCAL) += jscal -INPUT_TOOLS_TARGETS_$(BR2_PACKAGE_INPUT_TOOLS_JSTEST) += jstest - -define INPUT_TOOLS_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ - fi -endef - -INPUT_TOOLS_POST_PATCH_HOOKS = INPUT_TOOLS_DEBIAN_PATCHES - -# jscal needs -lm -define INPUT_TOOLS_BUILD_CMDS - for i in $(filter-out jscal,$(INPUT_TOOLS_TARGETS_y)); do \ - $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \ - $(TARGET_LDFLAGS); \ - done - for i in $(filter jscal,$(INPUT_TOOLS_TARGETS_y)); do \ - $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/$$i $(@D)/utils/$$i.c \ - $(TARGET_LDFLAGS) -lm; \ - done -endef - -define INPUT_TOOLS_INSTALL_TARGET_CMDS - for i in $(INPUT_TOOLS_TARGETS_y); do \ - $(INSTALL) -m 755 -D $(@D)/$$i $(TARGET_DIR)/usr/bin/$$i; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/intel-microcode/Config.in b/package.bak/intel-microcode/Config.in deleted file mode 100644 index 495ebd727f..0000000000 --- a/package.bak/intel-microcode/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_INTEL_MICROCODE - bool "intel-microcode" - depends on BR2_x86_64 || BR2_i386 - help - This package provides an Intel microcode data file that can be - used to correct processor errors. The iucode-tool package and - proper kernel support are required to upload the microcode. diff --git a/package.bak/intel-microcode/intel-microcode.hash b/package.bak/intel-microcode/intel-microcode.hash deleted file mode 100644 index 7925209b22..0000000000 --- a/package.bak/intel-microcode/intel-microcode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 096e39489eef67666be652e81fa372a06b74f39ea3d565dc0287242c668717e7 microcode-20151106.tgz diff --git a/package.bak/intel-microcode/intel-microcode.mk b/package.bak/intel-microcode/intel-microcode.mk deleted file mode 100644 index aefa99a1c9..0000000000 --- a/package.bak/intel-microcode/intel-microcode.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# intel-microcode -# -################################################################################ - -INTEL_MICROCODE_VERSION = 20151106 -INTEL_MICROCODE_SOURCE = microcode-$(INTEL_MICROCODE_VERSION).tgz -INTEL_MICROCODE_SITE = http://downloadmirror.intel.com/25512/eng -INTEL_MICROCODE_STRIP_COMPONENTS = 0 -INTEL_MICROCODE_LICENSE = PROPRIETARY -INTEL_MICROCODE_LICENSE_FILES = license.txt -INTEL_MICROCODE_REDISTRIBUTE = NO - -define INTEL_MICROCODE_EXTRACT_LICENSE - head -n 33 $(@D)/microcode.dat > $(@D)/license.txt -endef - -INTEL_MICROCODE_POST_EXTRACT_HOOKS += INTEL_MICROCODE_EXTRACT_LICENSE - -define INTEL_MICROCODE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/microcode.dat \ - $(TARGET_DIR)/usr/share/misc/intel-microcode.dat -endef - -$(eval $(generic-package)) diff --git a/package.bak/intltool/intltool.hash b/package.bak/intltool/intltool.hash deleted file mode 100644 index f6f41dc709..0000000000 --- a/package.bak/intltool/intltool.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz/+md5 -md5 12e517cac2b57a0121cda351570f1e63 intltool-0.51.0.tar.gz - -# Locally calculated -sha256 67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd intltool-0.51.0.tar.gz diff --git a/package.bak/intltool/intltool.mk b/package.bak/intltool/intltool.mk deleted file mode 100644 index dbef80f985..0000000000 --- a/package.bak/intltool/intltool.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# intltool -# -################################################################################ - -INTLTOOL_VERSION = 0.51.0 -INTLTOOL_SITE = https://launchpad.net/intltool/trunk/$(INTLTOOL_VERSION)/+download -INTLTOOL_LICENSE = GPLv2+ -INTLTOOL_LICENSE_FILES = COPYING - -HOST_INTLTOOL_DEPENDENCIES = host-gettext host-libxml-parser-perl - -$(eval $(host-autotools-package)) diff --git a/package.bak/iodine/0001-disable-systemd-and-selinux.patch b/package.bak/iodine/0001-disable-systemd-and-selinux.patch deleted file mode 100644 index 965abb7cff..0000000000 --- a/package.bak/iodine/0001-disable-systemd-and-selinux.patch +++ /dev/null @@ -1,29 +0,0 @@ -Disable selinux and systemd support since they check for host headers. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iodine-0.7.0.orig/src/osflags iodine-0.7.0/src/osflags ---- iodine-0.7.0.orig/src/osflags 2015-02-20 14:59:00.799958145 -0300 -+++ iodine-0.7.0/src/osflags 2015-02-20 15:05:54.791135141 -0300 -@@ -18,8 +18,8 @@ - ;; - Linux) - FLAGS=""; -- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; -- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; -+ #[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -lselinux"; -+ #[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -lsystemd-daemon"; - echo $FLAGS; - ;; - esac -@@ -34,8 +34,8 @@ - ;; - Linux) - FLAGS="-D_GNU_SOURCE" -- [ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; -- [ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; -+ #[ -e /usr/include/selinux/selinux.h ] && FLAGS="$FLAGS -DHAVE_SETCON"; -+ #[ -e /usr/include/systemd/sd-daemon.h ] && FLAGS="$FLAGS -DHAVE_SYSTEMD"; - echo $FLAGS; - ;; - esac diff --git a/package.bak/iodine/Config.in b/package.bak/iodine/Config.in deleted file mode 100644 index 6962cb8a39..0000000000 --- a/package.bak/iodine/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_IODINE - bool "iodine" - select BR2_PACKAGE_ZLIB - help - iodine lets you tunnel IPv4 data through a DNS server. - This can be usable in different situations where - internet access is firewalled, but DNS queries are allowed. - - http://code.kryo.se/iodine/ diff --git a/package.bak/iodine/iodine.hash b/package.bak/iodine/iodine.hash deleted file mode 100644 index 94eb5aa9cc..0000000000 --- a/package.bak/iodine/iodine.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://code.kryo.se/iodine/ -md5 fdbf3b81cd69caf5230d76a8b039fd99 iodine-0.7.0.tar.gz diff --git a/package.bak/iodine/iodine.mk b/package.bak/iodine/iodine.mk deleted file mode 100644 index 711d709c1d..0000000000 --- a/package.bak/iodine/iodine.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# iodine -# -################################################################################ - -IODINE_VERSION = 0.7.0 -IODINE_SITE = http://code.kryo.se/iodine -IODINE_DEPENDENCIES = zlib -IODINE_LICENSE = MIT -IODINE_LICENSE_FILES = README - -IODINE_CFLAGS = $(TARGET_CFLAGS) - -# iodine contains a local implementation of daemon(3) for older -# systems, unless __GLIBC__ is defined. Musl does provide it, but -# unlike uClibc it doesn't define __GLIBC__. Work around it by -# pretending to be glibc as we otherwise end up with symbol conflicts. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -IODINE_CFLAGS += -D__GLIBC__ -endif - -define IODINE_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) CFLAGS="$(IODINE_CFLAGS)" \ - $(MAKE) ARCH=$(BR2_ARCH) -C $(@D) -endef - -define IODINE_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install DESTDIR="$(TARGET_DIR)" prefix=/usr -endef - -$(eval $(generic-package)) diff --git a/package.bak/iostat/0001-cpunum.patch b/package.bak/iostat/0001-cpunum.patch deleted file mode 100644 index 0e75dbf71a..0000000000 --- a/package.bak/iostat/0001-cpunum.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bf646965f75cdad77a45fa3b0046e093b202b2ce Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 22 Jul 2010 12:42:10 -0300 -Subject: [PATCH] Make cpu number counter more reliable - - -Signed-off-by: Gustavo Zacarias ---- - iostat.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/iostat.c b/iostat.c -index 13e2af7..5d74085 100644 ---- a/iostat.c -+++ b/iostat.c -@@ -140,7 +140,7 @@ void get_number_of_cpus() - - handle_error("Can't open /proc/cpuinfo", !ncpufp); - while (fgets(buffer, sizeof(buffer), ncpufp)) { -- if (!strncmp(buffer, "processor\t:", 11)) -+ if (!strncasecmp(buffer, "processor\t", 10)) - ncpu++; - } - fclose(ncpufp); --- -1.7.1 - diff --git a/package.bak/iostat/Config.in b/package.bak/iostat/Config.in deleted file mode 100644 index 1aa1464581..0000000000 --- a/package.bak/iostat/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_IOSTAT - bool "iostat" - help - An I/O performance monitoring utility. - - http://www.linuxinsight.com/iostat_utility.html diff --git a/package.bak/iostat/iostat.hash b/package.bak/iostat/iostat.hash deleted file mode 100644 index 2ba10a369f..0000000000 --- a/package.bak/iostat/iostat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 edc5aa73f43bd6c7d49f2c1d5906a0a68c0b28bc4dfdaf1f2aa5ae4a2449c58e iostat-2.2.tar.gz diff --git a/package.bak/iostat/iostat.mk b/package.bak/iostat/iostat.mk deleted file mode 100644 index d591c67dcb..0000000000 --- a/package.bak/iostat/iostat.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# iostat -# -################################################################################ - -IOSTAT_VERSION = 2.2 -IOSTAT_SITE = http://www.linuxinsight.com/files -IOSTAT_LICENSE = GPL -IOSTAT_LICENSE_FILES = LICENSE - -define IOSTAT_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -DHZ=100" -endef - -define IOSTAT_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(IOSTAT_DIR)/iostat $(TARGET_DIR)/usr/bin/iostat -endef - -$(eval $(generic-package)) diff --git a/package.bak/iotop/0001-Fix-build-error-with-Python-3.patch b/package.bak/iotop/0001-Fix-build-error-with-Python-3.patch deleted file mode 100644 index bf656f889d..0000000000 --- a/package.bak/iotop/0001-Fix-build-error-with-Python-3.patch +++ /dev/null @@ -1,37 +0,0 @@ -Status: upstream -http://repo.or.cz/w/iotop.git/commit/99c8d7cedce81f17b851954d94bfa73787300599 - -Signed-off-by: Christophe Vu-Brugier - -From 99c8d7cedce81f17b851954d94bfa73787300599 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Fri, 17 Oct 2014 13:49:31 +0200 -Subject: [PATCH] Fix build error with Python 3 caused by itervalues() in - setup.py - -The itervalues() method is not available in Python 3. As a -consequence, this patch replaces the call to itervalues() in setup.py -with a call to values() which works on both Python 2 and Python 3. - -Signed-off-by: Christophe Vu-Brugier -Signed-off-by: Paul Wise ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 7150102..9de6068 100755 ---- a/setup.py -+++ b/setup.py -@@ -7,7 +7,7 @@ from iotop.version import VERSION - # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/ - # while still honoring the choice of installing into local/ or not. - if hasattr(distutils_install, 'INSTALL_SCHEMES'): -- for d in distutils_install.INSTALL_SCHEMES.itervalues(): -+ for d in distutils_install.INSTALL_SCHEMES.values(): - if d.get('scripts', '').endswith('/bin'): - d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin' - --- -2.1.4 - diff --git a/package.bak/iotop/Config.in b/package.bak/iotop/Config.in deleted file mode 100644 index ada6131606..0000000000 --- a/package.bak/iotop/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -comment "iotop depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 - -config BR2_PACKAGE_IOTOP - bool "iotop" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 - help - iotop does for I/O usage what top does for CPU usage. - - http://guichaz.free.fr/iotop/ diff --git a/package.bak/iotop/iotop.hash b/package.bak/iotop/iotop.hash deleted file mode 100644 index b2c497c774..0000000000 --- a/package.bak/iotop/iotop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1a7c02fd3758bb048d8af861c5f8735eb3ee9abadeaa787f27b8af2b1eaee8ce iotop-0.6.tar.gz diff --git a/package.bak/iotop/iotop.mk b/package.bak/iotop/iotop.mk deleted file mode 100644 index 31787c51a8..0000000000 --- a/package.bak/iotop/iotop.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# iotop -# -################################################################################ - -IOTOP_VERSION = 0.6 -IOTOP_SITE = http://guichaz.free.fr/iotop/files -IOTOP_LICENSE = GPLv2+ -IOTOP_LICENSE_FILES = COPYING -IOTOP_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/iozone/0001-targets.patch b/package.bak/iozone/0001-targets.patch deleted file mode 100644 index 258b960928..0000000000 --- a/package.bak/iozone/0001-targets.patch +++ /dev/null @@ -1,92 +0,0 @@ -Add new targets for iozone: - -linux-noaio is for linux targets without AIO (use case: uClibc) -linux-noth is for linux target without threads or AIO - -And make largefile support optional via CFLAGS. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iozone3_414.orig/src/current/makefile iozone3_414/src/current/makefile ---- iozone3_414.orig/src/current/makefile 2013-06-11 09:48:18.257837091 -0300 -+++ iozone3_414/src/current/makefile 2013-06-11 13:05:56.338162144 -0300 -@@ -166,10 +166,28 @@ - # GNU 'C' compiler Linux build with threads, largefiles, async I/O - # - linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o -- $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ -+ $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux.o libasync.o libbif.o \ -+ -lpthread -lrt -o iozone -+ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop -+ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server -+ -+# -+# GNU 'C' compiler Linux build with threads, largefiles -+# -+linux-noaio: iozone_linux-noaio.o libbif.o fileop_linux.o pit_server.o -+ $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noaio.o libbif.o \ -+ -lpthread -lrt -o iozone -+ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop -+ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server -+ -+# -+# GNU 'C' compiler Linux build with largefiles -+# -+linux-noth: iozone_linux-noth.o libbif.o fileop_linux.o pit_server.o -+ $(CC) $(CFLAGS) $(LDFLAGS) iozone_linux-noth.o libbif.o \ - -lrt -o iozone -- $(CC) -O3 -Dlinux fileop_linux.o -o fileop -- $(CC) -O3 -Dlinux pit_server.o -o pit_server -+ $(CC) $(CFLAGS) -Dlinux fileop_linux.o -o fileop -+ $(CC) $(CFLAGS) -Dlinux pit_server.o -o pit_server - - # - # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O -@@ -795,13 +813,33 @@ - @echo "" - @echo "Building iozone for Linux" - @echo "" -- $(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ -- -DSHARED_MEM -Dlinux -D_LARGEFILE64_SOURCE $(CFLAGS) iozone.c \ -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ - -DNAME='"linux"' -o iozone_linux.o -- $(CC) -Wall -c -O3 -Dunix -DHAVE_ANSIC_C -DASYNC_IO -D_LARGEFILE64_SOURCE \ -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DASYNC_IO \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -+ $(CC) -Wall -c -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ -+ $(CFLAGS) libasync.c -o libasync.o -+ -+iozone_linux-noaio.o: iozone.c libbif.c -+ @echo "" -+ @echo "Building iozone for Linux no AIO" -+ @echo "" -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ -+ -DNAME='"linux"' -o iozone_linux-noaio.o -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -+ -+iozone_linux-noth.o: iozone.c libbif.c -+ @echo "" -+ @echo "Building iozone for Linux with no threads" -+ @echo "" -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS -DHAVE_PREAD \ -+ -DSHARED_MEM -Dlinux $(CFLAGS) iozone.c \ -+ -DNAME='"linux"' -o iozone_linux-noth.o -+ $(CC) -Wall -c -Dunix -DHAVE_ANSIC_C -DNO_THREADS \ - -DSHARED_MEM -Dlinux $(CFLAGS) libbif.c -o libbif.o -- $(CC) -Wall -c -O3 -Dunix -Dlinux -DHAVE_ANSIC_C -DASYNC_IO \ -- -D_LARGEFILE64_SOURCE $(CFLAGS) libasync.c -o libasync.o - - fileop_AIX.o: fileop.c - @echo "" -@@ -893,7 +931,7 @@ - @echo "" - @echo "Building fileop for Linux" - @echo "" -- $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux.o -+ $(CC) -Wall -c $(CFLAGS) fileop.c -o fileop_linux.o - - fileop_openbsd.o: fileop.c - @echo "" diff --git a/package.bak/iozone/Config.in b/package.bak/iozone/Config.in deleted file mode 100644 index 33c938ee7f..0000000000 --- a/package.bak/iozone/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_IOZONE - bool "iozone" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - help - IOzone is a filesystem benchmark tool. - The benchmark generates and measures a variety of file operations - - http://www.iozone.org/ - -comment "iozone needs a toolchain w/ NPTL" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/iozone/iozone.hash b/package.bak/iozone/iozone.hash deleted file mode 100644 index b387588fd6..0000000000 --- a/package.bak/iozone/iozone.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bbbda98d7c052d8654ea23fb2187d831107ab4ac89842fa21509276d9a6915f0 iozone3_446.tar diff --git a/package.bak/iozone/iozone.mk b/package.bak/iozone/iozone.mk deleted file mode 100644 index 477a60a3bb..0000000000 --- a/package.bak/iozone/iozone.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# iozone -# -################################################################################ - -IOZONE_VERSION = 3_446 -IOZONE_SOURCE = iozone$(IOZONE_VERSION).tar -IOZONE_SITE = http://www.iozone.org/src/current -IOZONE_LICENSE = IOzone license (NO DERIVED WORKS ALLOWED) -# IOzone license details can be found at: -# http://www.iozone.org/docs/Iozone_License.txt - -# AIO support not available on uClibc, use the linux (non-aio) target. -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -IOZONE_TARGET = linux-noaio -else -IOZONE_TARGET = linux -endif - -define IOZONE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) $(IOZONE_TARGET) -C $(@D)/src/current -endef - -define IOZONE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/src/current/iozone \ - $(TARGET_DIR)/usr/bin/iozone -endef - -$(eval $(generic-package)) diff --git a/package.bak/iperf/0001-util.h-add-missing-stdbool-header.patch b/package.bak/iperf/0001-util.h-add-missing-stdbool-header.patch deleted file mode 100644 index 6eeed72a6c..0000000000 --- a/package.bak/iperf/0001-util.h-add-missing-stdbool-header.patch +++ /dev/null @@ -1,54 +0,0 @@ -From babf9a5c2bbce4725963b21e47f413962e33ea88 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sat, 30 Jul 2016 14:24:33 +0200 -Subject: [PATCH] util.h: add missing stdbool header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -C requires the stdbool.h header for the 'bool' type. - -Fixes the following build failure under uClibc-ng C library: - -.../arm-linux-gcc -DHAVE_CONFIG_H -I. -I.. -I../include -I../include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c delay.c -In file included from delay.c:55:0: -../include/util.h:73:1: error: unknown type name ‘bool’ - bool setsock_blocking(int fd, bool blocking); - ^ - -Signed-off-by: Baruch Siach -[Thomas: add AC_PROG_CC_C99, since C99 is needed for the bool type.] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 1 + - include/util.h | 2 ++ - 2 files changed, 3 insertions(+) - -diff --git a/configure.ac b/configure.ac -index d59107a..ba30cb7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -46,6 +46,7 @@ dnl =================================================================== - AC_PROG_CXX - CXXFLAGS=`echo " $CXXFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly - AC_PROG_CC -+AC_PROG_CC_C99 - CFLAGS=`echo " $CFLAGS " | sed -e "s/ -g / /"` # do not want it implicitly - AC_ISC_POSIX - AC_PROG_INSTALL -diff --git a/include/util.h b/include/util.h -index f4ae3d8..91540a9 100644 ---- a/include/util.h -+++ b/include/util.h -@@ -57,6 +57,8 @@ - #include "config.h" - #endif - -+#include -+ - #ifdef __cplusplus - extern "C" { - #endif --- -2.7.4 - diff --git a/package.bak/iperf/0002-fix-speed-display-in-csv-report.patch b/package.bak/iperf/0002-fix-speed-display-in-csv-report.patch deleted file mode 100644 index b06c7099e9..0000000000 --- a/package.bak/iperf/0002-fix-speed-display-in-csv-report.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f035e70b72d4285dcdbd393e680777a927cb9da4 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Thu, 28 Jul 2016 19:04:01 -0500 -Subject: [PATCH] perf: fix "speed" display in csv report - -Some parameters displayed in the CSV reports are declared -as uint64_t, but the printf format doesn't reflect this. - -Submitted bug: https://sourceforge.net/p/iperf/bugs/66/ - -Signed-off-by: Matt Poduska -Signed-off-by: Atul Singh -Signed-off-by: Matthew Weber ---- - src/Locale.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/src/Locale.c b/src/Locale.c -index b5d42b1..7b924fa 100644 ---- a/src/Locale.c -+++ b/src/Locale.c -@@ -260,11 +260,12 @@ const char reportCSV_bw_format[] = - const char reportCSV_bw_jitter_loss_format[] = - "%s,%s,%d,%.1f-%.1f,%I64d,%I64d,%.3f,%d,%d,%.3f,%d\n"; - #else -+#include "inttypes.h" - const char reportCSV_bw_format[] = --"%s,%s,%d,%.1f-%.1f,%d,%d\n"; -+"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 "\n"; - - const char reportCSV_bw_jitter_loss_format[] = --"%s,%s,%d,%.1f-%.1f,%d,%d,%.3f,%d,%d,%.3f,%d\n"; -+"%s,%s,%d,%.1f-%.1f,%" PRId64 ",%" PRId64 ",%.3f,%d,%d,%.3f,%d\n"; - #endif //WIN32 - #endif //HAVE_QUAD_SUPPORT - /* ------------------------------------------------------------------- --- -1.9.1 - diff --git a/package.bak/iperf/Config.in b/package.bak/iperf/Config.in deleted file mode 100644 index 21a2df8ace..0000000000 --- a/package.bak/iperf/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_IPERF - bool "iperf" - depends on BR2_INSTALL_LIBSTDCPP - # uses fork() - depends on BR2_USE_MMU - help - Internet Protocol bandwidth measuring tool for measuring - TCP/UDP performance. - - https://sourceforge.net/projects/iperf2/ - -comment "iperf needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/iperf/iperf.hash b/package.bak/iperf/iperf.hash deleted file mode 100644 index 3dd491a2c0..0000000000 --- a/package.bak/iperf/iperf.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/iperf2/files/ -sha1 9e215f6af8edd97f947f2b0207ff5487845d83d4 iperf-2.0.9.tar.gz -# Locally computed: -sha256 a5350777b191e910334d3a107b5e5219b72ffa393da4186da1e0a4552aeeded6 iperf-2.0.9.tar.gz diff --git a/package.bak/iperf/iperf.mk b/package.bak/iperf/iperf.mk deleted file mode 100644 index d2071bd274..0000000000 --- a/package.bak/iperf/iperf.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# iperf -# -################################################################################ - -IPERF_VERSION = 2.0.9 -IPERF_SITE = http://downloads.sourceforge.net/project/iperf2 -IPERF_LICENSE = MIT-like -IPERF_LICENSE_FILES = COPYING -# patching configure.ac -IPERF_AUTORECONF = YES - -IPERF_CONF_ENV = \ - ac_cv_func_malloc_0_nonnull=yes - -IPERF_CONF_OPTS = \ - --disable-web100 - -$(eval $(autotools-package)) diff --git a/package.bak/iperf3/0001-disable-profiling.patch b/package.bak/iperf3/0001-disable-profiling.patch deleted file mode 100644 index 09da98e974..0000000000 --- a/package.bak/iperf3/0001-disable-profiling.patch +++ /dev/null @@ -1,20 +0,0 @@ -This should be an option, but it's not. -Don't force profiled builds, it breaks on many toolchains. -Patch Makefile.in to avoid AUTORECONFing since it needs dummy files -that are missing to succeed (ChangeLog, COPYING, NEWS, README) and it's -simple enough so avoid pulling in dependencies and delays. - -Signed-off-by: Gustavo Zacarias - -diff -Nura iperf-3.0.10.orig/src/Makefile.in iperf-3.0.10/src/Makefile.in ---- iperf-3.0.10.orig/src/Makefile.in 2014-12-17 07:30:46.878310789 -0300 -+++ iperf-3.0.10/src/Makefile.in 2014-12-17 07:33:41.879356643 -0300 -@@ -82,7 +82,7 @@ - host_triplet = @host@ - bin_PROGRAMS = iperf3$(EXEEXT) - noinst_PROGRAMS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) \ -- iperf3_profile$(EXEEXT) -+ iperf3$(EXEEXT) - TESTS = t_timer$(EXEEXT) t_units$(EXEEXT) t_uuid$(EXEEXT) - subdir = src - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ diff --git a/package.bak/iperf3/0002-Fix-build-using-musl-libc.patch b/package.bak/iperf3/0002-Fix-build-using-musl-libc.patch deleted file mode 100644 index f2203605f0..0000000000 --- a/package.bak/iperf3/0002-Fix-build-using-musl-libc.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 1fe02385b60c9dcd8a04b8bd3ff5cff120ec35a6 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 19:23:20 +0100 -Subject: [PATCH 1/1] Fix build using musl libc - -Fixes https://github.com/esnet/iperf/issues/331 - -Signed-off-by: Bernd Kuhls ---- -Patch sent upstream: https://github.com/esnet/iperf/pull/344 - - src/cjson.h | 2 ++ - src/timer.h | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/src/cjson.h b/src/cjson.h -index d4449e6..7af19a9 100644 ---- a/src/cjson.h -+++ b/src/cjson.h -@@ -23,6 +23,8 @@ - #ifndef cJSON__h - #define cJSON__h - -+#include -+ - #ifdef __cplusplus - extern "C" - { -diff --git a/src/timer.h b/src/timer.h -index 0f9c5eb..9b22b7f 100644 ---- a/src/timer.h -+++ b/src/timer.h -@@ -30,6 +30,7 @@ - #ifndef __TIMER_H - #define __TIMER_H - -+#include - #include - - /* TimerClientData is an opaque value that tags along with a timer. The --- -2.7.0.rc3 - diff --git a/package.bak/iperf3/Config.in b/package.bak/iperf3/Config.in deleted file mode 100644 index 074c1d36c0..0000000000 --- a/package.bak/iperf3/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_IPERF3 - bool "iperf3" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - iperf is a tool for active measurements of the maximum - achievable bandwidth on IP networks. - It supports tuning of various parameters related to timing, - protocols, and buffers. For each test it reports the bandwidth, - loss, and other parameters. - It's a redesign of the NLANR/DAST iperf(2) and is not - backward compatible. - - http://software.es.net/iperf/index.html - -comment "iperf3 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/iperf3/iperf3.hash b/package.bak/iperf3/iperf3.hash deleted file mode 100644 index e43210b71a..0000000000 --- a/package.bak/iperf3/iperf3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://software.es.net/iperf/news.html -sha256 6e1a6200cd38baeab58ef0d7b8769e7aa6410c3a3168e65ea8277a4de79e5500 iperf-3.1.5.tar.gz diff --git a/package.bak/iperf3/iperf3.mk b/package.bak/iperf3/iperf3.mk deleted file mode 100644 index 909c104d19..0000000000 --- a/package.bak/iperf3/iperf3.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# iperf3 -# -################################################################################ - -IPERF3_VERSION = 3.1.5 -IPERF3_SITE = http://downloads.es.net/pub/iperf -IPERF3_SOURCE = iperf-$(IPERF3_VERSION).tar.gz -IPERF3_LICENSE = BSD-3c, BSD-2c, MIT -IPERF3_LICENSE_FILES = LICENSE - -IPERF3_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -$(eval $(autotools-package)) diff --git a/package.bak/ipmitool/0001-Fix-missing-stddef.h-include.patch b/package.bak/ipmitool/0001-Fix-missing-stddef.h-include.patch deleted file mode 100644 index dc3f92e482..0000000000 --- a/package.bak/ipmitool/0001-Fix-missing-stddef.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 04d489936191e685123978a1ca370f9cc30e6a06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 18 Apr 2016 21:17:26 +0200 -Subject: [PATCH] Fix missing stddef.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Needed for wchar_t. Fixes build error: - -imbapi.h:140:9: error: unknown type name 'wchar_t' - typedef wchar_t WCHAR; - -Upstream status: Pending -https://sourceforge.net/p/ipmitool/mailman/message/35022779/ - -Signed-off-by: Jörg Krause ---- - src/plugins/imb/imbapi.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/plugins/imb/imbapi.h b/src/plugins/imb/imbapi.h -index 6ba4121..6b39b47 100644 ---- a/src/plugins/imb/imbapi.h -+++ b/src/plugins/imb/imbapi.h -@@ -33,6 +33,9 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - *----------------------------------------------------------------------*/ -+ -+#include -+ - #ifndef _WINDEFS_H - #define _WINDEFS_H - #ifndef FALSE --- -2.10.2 - diff --git a/package.bak/ipmitool/Config.in b/package.bak/ipmitool/Config.in deleted file mode 100644 index 1da0ace16f..0000000000 --- a/package.bak/ipmitool/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_IPMITOOL - bool "ipmitool" - depends on BR2_USE_MMU # fork() - help - IPMItool provides a simple command-line interface to IPMI-enabled devices. - - http://sourceforge.net/projects/ipmitool/ - -if BR2_PACKAGE_IPMITOOL - -config BR2_PACKAGE_IPMITOOL_LANPLUS - bool "enable lanplus interface" - select BR2_PACKAGE_OPENSSL - help - Enables the IPMI v2.0 RMCP+ LAN interface typically used to send IPMI - commands to the BMC of a remote server. - Not needed if you only want to communicate with the local BMC of your - device using the OpenIPMI ipmi_si kernel module, or if using the - legacy IPMI v1.5 RMCP LAN interface. - -config BR2_PACKAGE_IPMITOOL_IPMIEVD - bool "ipmievd" - help - IPMI event daemon for sending events to syslog - -config BR2_PACKAGE_IPMITOOL_IPMISHELL - bool "ipmishell" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - IPMI shell interface - -endif diff --git a/package.bak/ipmitool/ipmitool.hash b/package.bak/ipmitool/ipmitool.hash deleted file mode 100644 index 9b16414801..0000000000 --- a/package.bak/ipmitool/ipmitool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0c1ba3b1555edefb7c32ae8cd6a3e04322056bc087918f07189eeedfc8b81e01 ipmitool-1.8.18.tar.bz2 diff --git a/package.bak/ipmitool/ipmitool.mk b/package.bak/ipmitool/ipmitool.mk deleted file mode 100644 index f4dca736cb..0000000000 --- a/package.bak/ipmitool/ipmitool.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# ipmitool -# -################################################################################ - -IPMITOOL_VERSION = 1.8.18 -IPMITOOL_SOURCE = ipmitool-$(IPMITOOL_VERSION).tar.bz2 -IPMITOOL_SITE = http://downloads.sourceforge.net/project/ipmitool/ipmitool/$(IPMITOOL_VERSION) -IPMITOOL_LICENSE = BSD-3c -IPMITOOL_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_IPMITOOL_LANPLUS),y) -IPMITOOL_DEPENDENCIES += openssl -IPMITOOL_CONF_OPTS += --enable-intf-lanplus -else -IPMITOOL_CONF_OPTS += --disable-intf-lanplus -endif - -ifeq ($(BR2_PACKAGE_IPMITOOL_IPMISHELL),y) -IPMITOOL_DEPENDENCIES += ncurses readline -IPMITOOL_CONF_OPTS += --enable-ipmishell -else -IPMITOOL_CONF_OPTS += --disable-ipmishell -endif - -ifeq ($(BR2_PACKAGE_IPMITOOL_IPMIEVD),) -define IPMITOOL_REMOVE_IPMIEVD - $(RM) -f $(TARGET_DIR)/usr/sbin/ipmievd -endef -IPMITOOL_POST_INSTALL_TARGET_HOOKS += IPMITOOL_REMOVE_IPMIEVD -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ipmiutil/0001-no-build-doc.patch b/package.bak/ipmiutil/0001-no-build-doc.patch deleted file mode 100644 index ea7da97249..0000000000 --- a/package.bak/ipmiutil/0001-no-build-doc.patch +++ /dev/null @@ -1,31 +0,0 @@ -configure: do not build doc - -Fixes: - http://autobuild.buildroot.org/results/2ec/2ecfb1143ba89ffa5cdc8096bb175b2c396c4670/ - http://autobuild.buildroot.org/results/c49/c497fc446140694084922d51fe6be308ce5c1c1a/ - http://autobuild.buildroot.org/results/434/434b156b5c9b5c7b65ffe6174cf4e029e7e3ffd8/ - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.ac b/configure.ac -index 344b27a71a35..41b6ea89167a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -56,7 +56,7 @@ LIB_DIR="/usr/lib" - isredhat=0 - init_scripts="scripts/ipmi_port.sh scripts/ipmiutil_evt scripts/ipmiutil_asy scripts/ipmiutil_wdt" - projdir=`pwd` --SUBDIR_S="doc scripts lib util" -+SUBDIR_S="scripts lib util" - os=Linux - - # ltmain.sh, config.sub, et al should have been created, but check to be sure. -@@ -162,7 +162,7 @@ AC_ARG_ENABLE([standalone], - LANPLUS_SAM="no" - LD_SAMX="" - CFLAGS="-O2" -- SUBDIR_S="doc scripts util" -+ SUBDIR_S="scripts util" - if test "x$cross_compiling" = "xyes"; then - # cross-compiling, so link with -static (e.g. Android ARM) - CROSS_LFLAGS="-static" diff --git a/package.bak/ipmiutil/Config.in b/package.bak/ipmiutil/Config.in deleted file mode 100644 index 9eb5452b6c..0000000000 --- a/package.bak/ipmiutil/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_IPMIUTIL - bool "ipmiutil" - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_x86_64 || BR2_i386 - help - The ipmiutil package provides easy-to-use utilities to view - the SEL, perform an IPMI chassis reset, set up the IPMI LAN - and Platform Event Filter entries to allow SNMP alerts, - Serial-Over-LAN console, event daemon, and other IPMI tasks. - - http://ipmiutil.sourceforge.net/ - -comment "ipmiutil needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on BR2_x86_64 || BR2_i386 diff --git a/package.bak/ipmiutil/ipmiutil.hash b/package.bak/ipmiutil/ipmiutil.hash deleted file mode 100644 index f9d086b67a..0000000000 --- a/package.bak/ipmiutil/ipmiutil.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://sourceforge.net/projects/ipmiutil/files/?source=navbar -sha1 f423a77a374b6a37a16496844f1e6e363e7d63fe ipmiutil-2.9.9.tar.gz -# Locally computed -sha256 beace08386a002c6a4bbbf894bda9899ea34fae4c2181c89f29fb1fa136925f6 ipmiutil-2.9.9.tar.gz diff --git a/package.bak/ipmiutil/ipmiutil.mk b/package.bak/ipmiutil/ipmiutil.mk deleted file mode 100644 index 392856cc9c..0000000000 --- a/package.bak/ipmiutil/ipmiutil.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# ipmiutil -# -################################################################################ - -IPMIUTIL_VERSION = 2.9.9 -IPMIUTIL_SITE = http://sourceforge.net/projects/ipmiutil/files -IPMIUTIL_LICENSE = BSD-3c -IPMIUTIL_LICENSE_FILES = COPYING -# We're patching configure.ac -IPMIUTIL_AUTORECONF = YES - -IPMIUTIL_MAKE = $(MAKE1) - -# forgets to link against libcrypto dependencies breaking static link -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) -# tests against distro libcrypto so it might get a false positive when -# the openssl version is old, so force it off -# SKIP_MD2 can be used only if ALLOW_GNU is defined. -IPMIUTIL_CONF_OPTS += CPPFLAGS="$(TARGET_CPPFLAGS) -DALLOW_GNU -DSKIP_MD2" -IPMIUTIL_DEPENDENCIES += openssl -else -IPMIUTIL_CONF_OPTS += --disable-lanplus -endif - -$(eval $(autotools-package)) diff --git a/package.bak/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch b/package.bak/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch deleted file mode 100644 index c7c6e15596..0000000000 --- a/package.bak/iproute2/0001-Add-the-musl-workaround-to-the-libc-compat.h-copy.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b4edb4eebbfd35934b8bc6d7ee0e00e76a01596c Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 22 Dec 2016 15:26:30 +0200 -Subject: [PATCH] Add the musl workaround to the libc-compat.h copy - -The libc-compat.h kernel header uses glibc specific macros (__GLIBC__ and -__USE_MISC) to solve conflicts with libc provided headers. This patch makes -libc-compat.h work also for musl libc. - -Signed-off-by: Baruch Siach ---- -Upstream status: libc-compat.h is a local copy of a kernel headers. A proper -musl fix must go to the kernel first. ---- - include/linux/libc-compat.h | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/include/linux/libc-compat.h b/include/linux/libc-compat.h -index f38571dabd8d..30f0b67c7a12 100644 ---- a/include/linux/libc-compat.h -+++ b/include/linux/libc-compat.h -@@ -49,10 +49,12 @@ - #define _LIBC_COMPAT_H - - /* We have included glibc headers... */ --#if defined(__GLIBC__) -+#if 1 -+#define __USE_MISC - - /* Coordinate with glibc net/if.h header. */ - #if defined(_NET_IF_H) && defined(__USE_MISC) -+#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0 - - /* GLIBC headers included first so don't define anything - * that would already be defined. */ --- -2.11.0 - diff --git a/package.bak/iproute2/0002-Add-missing-sys-types.h-include.patch b/package.bak/iproute2/0002-Add-missing-sys-types.h-include.patch deleted file mode 100644 index ef918140da..0000000000 --- a/package.bak/iproute2/0002-Add-missing-sys-types.h-include.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 560dee4b4be54699c0c9679771c9e0d61e4db80a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 19 Nov 2015 17:48:55 +0100 -Subject: [PATCH] Add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The u_intXX_t types are defined in , so it should be -included before using those types. Otherwise, with certain C -libraries, the build fails with: - -In file included from ../include/iptables.h:4:0, - from m_ipt.c:18: -../include/iptables_common.h:47:16: error: unknown type name ‘u_int32_t’ - #define __le32 u_int32_t - -Signed-off-by: Thomas Petazzoni ---- - include/iptables_common.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/iptables_common.h b/include/iptables_common.h -index 9099667..2c27a4b 100644 ---- a/include/iptables_common.h -+++ b/include/iptables_common.h -@@ -43,6 +43,8 @@ extern char *lib_dir; - extern void init_extensions(void); - #endif - -+#include -+ - #define __be32 u_int32_t - #define __le32 u_int32_t - #define __be16 u_int16_t --- -2.6.3 - diff --git a/package.bak/iproute2/0003-tc-add-missing-limits.h-header.patch b/package.bak/iproute2/0003-tc-add-missing-limits.h-header.patch deleted file mode 100644 index b9b27f31a7..0000000000 --- a/package.bak/iproute2/0003-tc-add-missing-limits.h-header.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1f4547b0a81db617f4b0d02711d9e39278eb8283 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 22 Dec 2016 20:45:11 +0200 -Subject: [PATCH] tc: add missing limits.h header - -This fixes under musl build issues like: - -f_matchall.c: In function ‘matchall_parse_opt’: -f_matchall.c:48:12: error: ‘LONG_MIN’ undeclared (first use in this function) - if (h == LONG_MIN || h == LONG_MAX) { - ^ -f_matchall.c:48:12: note: each undeclared identifier is reported only once for each function it appears in -f_matchall.c:48:29: error: ‘LONG_MAX’ undeclared (first use in this function) - if (h == LONG_MIN || h == LONG_MAX) { - ^ - -Signed-off-by: Baruch Siach ---- -Upstream status: posted http://marc.info/?l=linux-netdev&m=148243283002957&w=2 ---- - tc/tc_util.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tc/tc_util.h b/tc/tc_util.h -index f198a4ad5554..4db26c6d5e25 100644 ---- a/tc/tc_util.h -+++ b/tc/tc_util.h -@@ -2,6 +2,7 @@ - #define _TC_UTIL_H_ 1 - - #define MAX_MSG 16384 -+#include - #include - #include - #include --- -2.11.0 - diff --git a/package.bak/iproute2/Config.in b/package.bak/iproute2/Config.in deleted file mode 100644 index fd373a8123..0000000000 --- a/package.bak/iproute2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_IPROUTE2 - bool "iproute2" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # bpf, namespaces - help - Kernel routing and traffic control utilities. Provides things - like ip and tc. - - http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 - -comment "iproute2 needs a toolchain w/ headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/iproute2/iproute2.hash b/package.bak/iproute2/iproute2.hash deleted file mode 100644 index 5cacc7f99c..0000000000 --- a/package.bak/iproute2/iproute2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://kernel.org/pub/linux/utils/net/iproute2/sha256sums.asc -sha256 c0f30f043f7767cc1b2cd2197b08d4e9b2392c95823fabe30bbce308c30116c4 iproute2-4.9.0.tar.xz diff --git a/package.bak/iproute2/iproute2.mk b/package.bak/iproute2/iproute2.mk deleted file mode 100644 index 5ea5299bd3..0000000000 --- a/package.bak/iproute2/iproute2.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# iproute2 -# -################################################################################ - -IPROUTE2_VERSION = 4.9.0 -IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz -IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 -IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf \ - $(if $(BR2_PACKAGE_LIBMNL),libmnl) -IPROUTE2_LICENSE = GPLv2 -IPROUTE2_LICENSE_FILES = COPYING - -# If both iproute2 and busybox are selected, make certain we win -# the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IPROUTE2_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -IPROUTE2_DEPENDENCIES += elfutils -endif - -# If we've got iptables enable xtables support for tc -ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx) -IPROUTE2_DEPENDENCIES += iptables -define IPROUTE2_WITH_IPTABLES - # Makefile is busted so it never passes IPT_LIB_DIR properly - $(SED) "s/-DIPT/-DXT/" $(@D)/tc/Makefile -endef -else -define IPROUTE2_WITH_IPTABLES - # em_ipset needs xtables, but configure misdetects it - echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config - echo "TC_CONFIG_XT:=n" >>$(@D)/Config -endef -endif - -# arpd needs BerkeleyDB and links against pthread -ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -IPROUTE2_DEPENDENCIES += berkeleydb -else -define IPROUTE2_DISABLE_ARPD - echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config -endef -endif - -# ifcfg needs bash -ifeq ($(BR2_PACKAGE_BASH),) -define IPROUTE2_REMOVE_IFCFG - rm -f $(TARGET_DIR)/sbin/ifcfg -endef -endif - -define IPROUTE2_CONFIGURE_CMDS - $(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure - cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure - $(IPROUTE2_DISABLE_ARPD) - $(IPROUTE2_WITH_IPTABLES) -endef - -define IPROUTE2_BUILD_CMDS - $(SED) 's/$$(CCOPTS)//' $(@D)/netem/Makefile - $(TARGET_MAKE_ENV) LDFLAGS="$(TARGET_LDFLAGS)" $(MAKE) \ - DBM_INCLUDE="$(STAGING_DIR)/usr/include" \ - CCOPTS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - SHARED_LIBS="$(if $(BR2_STATIC_LIBS),n,y)" -C $(@D) -endef - -define IPROUTE2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" \ - SBINDIR=/sbin \ - DOCDIR=/usr/share/doc/iproute2-$(IPROUTE2_VERSION) \ - MANDIR=/usr/share/man install - $(IPROUTE2_REMOVE_IFCFG) -endef - -$(eval $(generic-package)) diff --git a/package.bak/iprutils/0001-iprutils-Don-t-use-gettext.patch b/package.bak/iprutils/0001-iprutils-Don-t-use-gettext.patch deleted file mode 100644 index 680bb07f5d..0000000000 --- a/package.bak/iprutils/0001-iprutils-Don-t-use-gettext.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 4ce3545b704588c5889b8dd7b100fcdb88ae2e1a Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 17 Sep 2014 17:48:54 +0100 -Subject: [PATCH] iprutils: Don't use gettext - -... since we don't have any translation. - -Based on the former patch by Jeremy Kerr. - -Signed-off-by: Vicente Olivert Riera -[Thomas: adapt to the new autotools build system.] -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - iprconfig.h | 4 +--- - 2 files changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ee69bee..c1a4f70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,7 +137,7 @@ AC_SUBST([IPRCONFIG_LIBS]) - LIBS="$save_LIBS" - - # Checks for header files. --AC_CHECK_HEADERS([fcntl.h libintl.h locale.h netinet/in.h nl_types.h \ -+AC_CHECK_HEADERS([fcntl.h locale.h netinet/in.h nl_types.h \ - paths.h stddef.h stdint.h stdlib.h string.h sys/file.h \ - sys/ioctl.h sys/mount.h sys/socket.h syslog.h \ - unistd.h ncurses.h form.h menu.h], [], -diff --git a/iprconfig.h b/iprconfig.h -index 9bce950..751a737 100644 ---- a/iprconfig.h -+++ b/iprconfig.h -@@ -11,9 +11,7 @@ - * - **/ - --#include -- --#define _(string) gettext(string) -+#define _(string) (string) - #define __(string) (string) - #define EXIT_FLAG 0x8000 /* stops at given screen on exit call */ - #define CANCEL_FLAG 0x4000 /* stops at given screen on quit call */ --- -2.6.4 - diff --git a/package.bak/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch b/package.bak/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch deleted file mode 100644 index ea7a683570..0000000000 --- a/package.bak/iprutils/0002-configure.ac-use-pow-instead-of-matherr-for-libm-che.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 62a41abffa028a3a4c4ae0803d48c559a14e97f1 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 7 Feb 2016 13:54:10 +0100 -Subject: [PATCH] configure.ac: use pow() instead of matherr() for libm check - -In certain configurations of uClibc, the matherr() function may not be -provided by the C library, which makes the current configure.ac check -for libm fail. However, iprutils does not use matherr(), so using this -function for the test makes little sense. - -This patch adjusts configure.ac to test for pow() instead, which is -actually used by iprutils, and more commonly available, including in -uClibc. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c1a4f70..e430554 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -129,7 +129,7 @@ save_LIBS="$LIBS" - AC_CHECK_LIB([ncurses], [curses_version], [], - [AC_ERROR("libncurses not found.")]) - AC_CHECK_LIB([form], [free_form], [], [AC_ERROR("libform not found.")]) --AC_CHECK_LIB([m], [matherr], [], [AC_ERROR("libm not found.")]) -+AC_CHECK_LIB([m], [pow], [], [AC_ERROR("libm not found.")]) - AC_CHECK_LIB([menu], [new_menu], [], [AC_ERROR("libmenu not found.")]) - AC_CHECK_LIB([panel], [show_panel], [], [AC_ERROR("libpanel not found.")]) - IPRCONFIG_LIBS="$LIBS" --- -2.6.4 - diff --git a/package.bak/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch b/package.bak/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch deleted file mode 100644 index 0fe882fb8e..0000000000 --- a/package.bak/iprutils/0003-iprlib-fixes-for-compatibility-with-musl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From df3b2b74ed7b49d74f5a5ec5687bcc3188d3b319 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 14:10:44 +0100 -Subject: [PATCH] iprlib: fixes for compatibility with musl - - is an internal C library header, which is not -guaranteed to be available in all C libraries, so it shouldn't be -included, otherwise iprutils cannot be built with musl. - - is needed to get the definition of PATH_MAX. - -Signed-off-by: Thomas Petazzoni ---- - iprlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iprlib.h b/iprlib.h -index 16fe1e1..73aa1ce 100644 ---- a/iprlib.h -+++ b/iprlib.h -@@ -46,9 +46,9 @@ - #include - #include - #include --#include - #include - #include -+#include - - typedef uint8_t u8; - typedef uint16_t u16; --- -2.6.4 - diff --git a/package.bak/iprutils/Config.in b/package.bak/iprutils/Config.in deleted file mode 100644 index b429e71c8b..0000000000 --- a/package.bak/iprutils/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_IPRUTILS - bool "iprutils" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBSYSFS - select BR2_PACKAGE_PCIUTILS - depends on BR2_USE_MMU # fork() - depends on !BR2_bfin # pciutils - help - System utilities for IBM Power RAID devices - - http://sourceforge.net/projects/iprdd/ diff --git a/package.bak/iprutils/iprutils.hash b/package.bak/iprutils/iprutils.hash deleted file mode 100644 index 4b43a6177e..0000000000 --- a/package.bak/iprutils/iprutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 99f28418fec505c4dfd532270569d4902a3792dcb2f08710b896f4e7bc0211e0 iprutils-2.4.10.1.tar.gz diff --git a/package.bak/iprutils/iprutils.mk b/package.bak/iprutils/iprutils.mk deleted file mode 100644 index 2d3d62ed6a..0000000000 --- a/package.bak/iprutils/iprutils.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# iprutils -# -################################################################################ - -IPRUTILS_VERSION_MAJOR = 2.4.10 -IPRUTILS_VERSION = $(IPRUTILS_VERSION_MAJOR).1 -IPRUTILS_SITE = http://downloads.sourceforge.net/project/iprdd/iprutils%20for%202.6%20kernels/$(IPRUTILS_VERSION_MAJOR) -IPRUTILS_DEPENDENCIES = ncurses libsysfs pciutils -IPRUTILS_LICENSE = Common Public License Version 1.0 -IPRUTILS_LICENSE_FILES = LICENSE -# Patches touching configure.ac -IPRUTILS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/ipsec-tools/0001-susv3-legacy.patch b/package.bak/ipsec-tools/0001-susv3-legacy.patch deleted file mode 100644 index ea98505622..0000000000 --- a/package.bak/ipsec-tools/0001-susv3-legacy.patch +++ /dev/null @@ -1,35 +0,0 @@ -Replaces sysv3 legacy functions with modern equivalents. - -Signed-off-by: Julien Boibessot -Index: ipsec-tools-0.7.3/src/racoon/pfkey.c -=================================================================== ---- ipsec-tools-0.7.3.orig/src/racoon/pfkey.c 2010-07-12 14:46:52.000000000 +0200 -+++ ipsec-tools-0.7.3/src/racoon/pfkey.c 2010-07-12 15:01:39.000000000 +0200 -@@ -3008,12 +3008,12 @@ - struct sockaddr *paddr; - - paddr = (struct sockaddr *)(xisr + 1); -- bcopy(paddr, &(*p_isr)->saidx.src, -+ memmove(&(*p_isr)->saidx.src, paddr, - sysdep_sa_len(paddr)); - - paddr = (struct sockaddr *)((caddr_t)paddr - + sysdep_sa_len(paddr)); -- bcopy(paddr, &(*p_isr)->saidx.dst, -+ memmove(&(*p_isr)->saidx.dst, paddr, - sysdep_sa_len(paddr)); - } - -Index: ipsec-tools-0.7.3/src/racoon/racoonctl.c -=================================================================== ---- ipsec-tools-0.7.3.orig/src/racoon/racoonctl.c 2010-07-12 14:49:51.000000000 +0200 -+++ ipsec-tools-0.7.3/src/racoon/racoonctl.c 2010-07-12 15:00:52.000000000 +0200 -@@ -785,7 +785,7 @@ - errx(1, "cannot read source address"); - - /* We get "ip[port]" strip the port */ -- if ((idx = index(srcaddr, '[')) == NULL) -+ if ((idx = strchr(srcaddr, '[')) == NULL) - errx(1, "unexpected source address format"); - *idx = '\0'; - diff --git a/package.bak/ipsec-tools/Config.in b/package.bak/ipsec-tools/Config.in deleted file mode 100644 index 36c5a65a9f..0000000000 --- a/package.bak/ipsec-tools/Config.in +++ /dev/null @@ -1,75 +0,0 @@ -config BR2_PACKAGE_IPSEC_TOOLS - bool "ipsec-tools" - depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_FLEX - help - This package is required to support IPSec for Linux 2.6+ - - http://ipsec-tools.sourceforge.net/ - -if BR2_PACKAGE_IPSEC_TOOLS - -config BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT - default y - bool "Enable racoonctl(8)" - help - Lets racoon to listen to racoon admin port, which is to - be contacted by racoonctl(8). - -config BR2_PACKAGE_IPSEC_TOOLS_NATT - bool "Enable NAT-Traversal" - help - This needs kernel support, which is available on Linux. On - NetBSD, NAT-Traversal kernel support has not been integrated - yet, you can get it from here: - - http://ipsec-tools.sourceforge.net/netbsd_nat-t.diff If you - - live in a country where software patents are legal, using - NAT-Traversal might infringe a patent. - -config BR2_PACKAGE_IPSEC_TOOLS_FRAG - bool "Enable IKE fragmentation" - help - Enable IKE fragmentation, which is a workaround for - broken routers that drop fragmented packets - -config BR2_PACKAGE_IPSEC_TOOLS_DPD - bool "Enable DPD (Dead Peer Detection)" - help - Enable dead peer detection support - -config BR2_PACKAGE_IPSEC_TOOLS_STATS - default y - bool "Enable statistics logging function" - -config BR2_PACKAGE_IPSEC_TOOLS_READLINE - select BR2_PACKAGE_READLINE - bool "Enable readline input support" - -config BR2_PACKAGE_IPSEC_TOOLS_HYBRID - bool "Enable hybrid, both mode-cfg and xauth support" - help - Hybrid mode is required for successful interoperability - (e.g. Cisco VPN Client). - -choice - prompt "Security context" - default BR2_PACKAGE_IPSEC_SECCTX_DISABLE - help - Selects whether or not to enable security context support. - -config BR2_PACKAGE_IPSEC_SECCTX_DISABLE - bool "Disable security context support" - -config BR2_PACKAGE_IPSEC_SECCTX_ENABLE - bool "Enable SELinux security context support" - -config BR2_PACKAGE_IPSEC_SECCTX_KERNEL - bool "Enable kernel security context" - -endchoice - -endif diff --git a/package.bak/ipsec-tools/ipsec-tools.hash b/package.bak/ipsec-tools/ipsec-tools.hash deleted file mode 100644 index b12bea9477..0000000000 --- a/package.bak/ipsec-tools/ipsec-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/0.8.2/ -md5 d53ec14a0a3ece64e09e5e34b3350b41 ipsec-tools-0.8.2.tar.bz2 -sha1 7d92cae9fde59fb4f125636698c43b0a3df3d0f0 ipsec-tools-0.8.2.tar.bz2 diff --git a/package.bak/ipsec-tools/ipsec-tools.mk b/package.bak/ipsec-tools/ipsec-tools.mk deleted file mode 100644 index eb910bc498..0000000000 --- a/package.bak/ipsec-tools/ipsec-tools.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# ipsec-tools -# -################################################################################ - -IPSEC_TOOLS_VERSION = 0.8.2 -IPSEC_TOOLS_SOURCE = ipsec-tools-$(IPSEC_TOOLS_VERSION).tar.bz2 -IPSEC_TOOLS_SITE = http://sourceforge.net/projects/ipsec-tools/files/ipsec-tools/$(IPSEC_TOOLS_VERSION) -IPSEC_TOOLS_INSTALL_STAGING = YES -IPSEC_TOOLS_MAKE = $(MAKE1) -IPSEC_TOOLS_DEPENDENCIES = openssl flex host-flex - -# configure hardcodes -Werror, so override CFLAGS on make invocation -IPSEC_TOOLS_MAKE_OPTS = CFLAGS='$(TARGET_CFLAGS)' - -# openssl uses zlib, so we need to explicitly link with it when static -ifeq ($(BR2_STATIC_LIBS),y) -IPSEC_TOOLS_CONF_ENV += LIBS=-lz -endif - -IPSEC_TOOLS_CONF_OPTS = \ - --without-libpam \ - --disable-gssapi \ - --with-kernel-headers=$(STAGING_DIR)/usr/include - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_ADMINPORT),y) -IPSEC_TOOLS_CONF_OPTS += --enable-adminport -else -IPSEC_TOOLS_CONF_OPTS += --disable-adminport -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_NATT),y) -IPSEC_TOOLS_CONF_OPTS += --enable-natt -else -IPSEC_TOOLS_CONF_OPTS += --disable-natt -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_FRAG),y) -IPSEC_TOOLS_CONF_OPTS += --enable-frag -else -IPSEC_TOOLS_CONF_OPTS += --disable-frag -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_DPD),y) -IPSEC_TOOLS_CONF_OPTS += --enable-dpd -else -IPSEC_TOOLS_CONF_OPTS += --disable-dpd -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_STATS),y) -IPSEC_TOOLS_CONF_OPTS += --enable-stats -else -IPSEC_TOOLS_CONF_OPTS += --disable-stats -endif - -ifneq ($(BR2_PACKAGE_IPSEC_TOOLS_READLINE),y) -IPSEC_TOOLS_CONF_OPTS += --without-readline -else -IPSEC_TOOLS_DEPENDENCIES += readline -endif - -ifeq ($(BR2_PACKAGE_IPSEC_TOOLS_HYBRID),y) -IPSEC_TOOLS_CONF_OPTS += --enable-hybrid -else -IPSEC_TOOLS_CONF_OPTS += --disable-hybrid -endif - -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_DISABLE),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=no -endif -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_ENABLE),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=yes -endif -ifeq ($(BR2_PACKAGE_IPSEC_SECCTX_KERNEL),y) -IPSEC_TOOLS_CONF_OPTS += --enable-security-context=kernel -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch b/package.bak/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch deleted file mode 100644 index c115f6337d..0000000000 --- a/package.bak/ipset/0001-Do-not-pass-Werror-when-enable-debug-is-used.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f31bb2561776ad2ce4b77339da6fbfc9e3b2ffbb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 26 Oct 2014 14:18:29 +0100 -Subject: [PATCH] Do not pass -Werror when --enable-debug is used - -Signed-off-by: Thomas Petazzoni ---- - Make_global.am | 2 +- - configure.ac | 1 - - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Make_global.am b/Make_global.am -index 7953451..25c4d64 100644 ---- a/Make_global.am -+++ b/Make_global.am -@@ -77,7 +77,7 @@ AM_CPPFLAGS = $(kinclude_CFLAGS) $(all_includes) -I$(top_srcdir)/include \ - AM_CFLAGS = -std=gnu99 - - if ENABLE_DEBUG --AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall -Werror -+AM_CFLAGS += -g -g3 -ggdb -gdwarf-2 -DIPSET_DEBUG -Wall - else - AM_CFLAGS += -O2 -DNDEBUG - endif -diff --git a/configure.ac b/configure.ac -index 8fdac15..ee3b147 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -345,7 +345,6 @@ AX_CFLAGS_GCC_OPTION(-Waggregate-return) - AX_CFLAGS_GCC_OPTION(-Wbad-function-cast) - AX_CFLAGS_GCC_OPTION(-Wcast-align) - AX_CFLAGS_GCC_OPTION(-Wcast-qual) --AX_CFLAGS_GCC_OPTION(-Werror) - AX_CFLAGS_GCC_OPTION(-Wextra) - AX_CFLAGS_GCC_OPTION(-Wfloat-equal) - AX_CFLAGS_GCC_OPTION(-Wformat=2) --- -2.0.0 - diff --git a/package.bak/ipset/Config.in b/package.bak/ipset/Config.in deleted file mode 100644 index 6951413210..0000000000 --- a/package.bak/ipset/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_IPSET - bool "ipset" - select BR2_PACKAGE_LIBMNL - help - Utility to manage IP sets in the linux kernel. - Requires a patched kernel or version >=2.6.39. - - http://ipset.netfilter.org/ diff --git a/package.bak/ipset/ipset.hash b/package.bak/ipset/ipset.hash deleted file mode 100644 index da860e8d05..0000000000 --- a/package.bak/ipset/ipset.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/ipset/ipset-6.30.tar.bz2.md5sum.txt -md5 41c32e3b884ec714f0aac95e7675f9d1 ipset-6.30.tar.bz2 -# Calculated based on the hash above -sha256 65bfa43fec3d51a6b4012f3d7e4b93a748df9b71b6cd6c53adbec8083e804a31 ipset-6.30.tar.bz2 diff --git a/package.bak/ipset/ipset.mk b/package.bak/ipset/ipset.mk deleted file mode 100644 index db4952b1d5..0000000000 --- a/package.bak/ipset/ipset.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# ipset -# -################################################################################ - -IPSET_VERSION = 6.30 -IPSET_SOURCE = ipset-$(IPSET_VERSION).tar.bz2 -IPSET_SITE = http://ipset.netfilter.org -IPSET_DEPENDENCIES = libmnl host-pkgconf -IPSET_CONF_OPTS = --with-kmod=no -# For 0001-Do-not-pass-Werror-when-enable-debug-is-used.patch -IPSET_AUTORECONF = YES -IPSET_LICENSE = GPLv2 -IPSET_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/iptables/Config.in b/package.bak/iptables/Config.in deleted file mode 100644 index cdcd1c2893..0000000000 --- a/package.bak/iptables/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_IPTABLES - bool "iptables" - help - Linux kernel firewall, NAT, and packet mangling tools. - - http://www.netfilter.org/projects/iptables/index.html - -if BR2_PACKAGE_IPTABLES - -config BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY - bool "bpfc and nfsynproxy" - # this dependency can be removed when using a musl version - # containing this commit: - # http://git.musl-libc.org/cgit/musl/commit/?id=53f41fb568ae43034c9876cc9bd3961fd6d13671 - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_LIBPCAP - help - Build bpf compiler and nfsynproxy configuration tool. - -config BR2_PACKAGE_IPTABLES_NFTABLES - bool "nftables compat" - # uses dlfcn - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_PACKAGE_LIBMNL - select BR2_PACKAGE_LIBNFTNL - help - Build nftables compat utilities. - -comment "nftables compat needs a toolchain w/ wchar, dynamic library, headers >= 3.12" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 || \ - !BR2_USE_WCHAR || BR2_STATIC_LIBS - -endif diff --git a/package.bak/iptables/iptables.hash b/package.bak/iptables/iptables.hash deleted file mode 100644 index b673c8abdb..0000000000 --- a/package.bak/iptables/iptables.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/iptables/iptables-1.6.1.tar.bz2.{md5sum,sha1sum} -md5 ab38a33806b6182c6f53d6afb4619add iptables-1.6.1.tar.bz2 -sha1 b2592490ca7a6c2cd0f069e167a4337c86acdf91 iptables-1.6.1.tar.bz2 diff --git a/package.bak/iptables/iptables.mk b/package.bak/iptables/iptables.mk deleted file mode 100644 index 90fab345be..0000000000 --- a/package.bak/iptables/iptables.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# iptables -# -################################################################################ - -IPTABLES_VERSION = 1.6.1 -IPTABLES_SOURCE = iptables-$(IPTABLES_VERSION).tar.bz2 -IPTABLES_SITE = http://ftp.netfilter.org/pub/iptables -IPTABLES_INSTALL_STAGING = YES -IPTABLES_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) -IPTABLES_LICENSE = GPLv2 -IPTABLES_LICENSE_FILES = COPYING -# Building static causes ugly warnings on some plugins -IPTABLES_CONF_OPTS = --libexecdir=/usr/lib --with-kernel=$(STAGING_DIR)/usr \ - $(if $(BR2_STATIC_LIBS),,--disable-static) - -# For connlabel match -ifeq ($(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),y) -IPTABLES_DEPENDENCIES += libnetfilter_conntrack -endif - -# For nfnl_osf -ifeq ($(BR2_PACKAGE_LIBNFNETLINK),y) -IPTABLES_DEPENDENCIES += libnfnetlink -endif - -# For iptables-compat tools -ifeq ($(BR2_PACKAGE_IPTABLES_NFTABLES),y) -IPTABLES_CONF_OPTS += --enable-nftables -IPTABLES_DEPENDENCIES += host-bison host-flex libmnl libnftnl -else -IPTABLES_CONF_OPTS += --disable-nftables -endif - -# bpf compiler support and nfsynproxy tool -ifeq ($(BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY),y) -# libpcap is tricky for static-only builds and needs help -ifeq ($(BR2_STATIC_LIBS),y) -IPTABLES_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -IPTABLES_CONF_OPTS += LIBS="$(IPTABLES_LIBS_FOR_STATIC_LINK)" -endif -IPTABLES_CONF_OPTS += --enable-bpf-compiler --enable-nfsynproxy -IPTABLES_DEPENDENCIES += libpcap -else -IPTABLES_CONF_OPTS += --disable-bpf-compiler --disable-nfsynproxy -endif - -$(eval $(autotools-package)) diff --git a/package.bak/iptraf-ng/Config.in b/package.bak/iptraf-ng/Config.in deleted file mode 100644 index 5afb81dacf..0000000000 --- a/package.bak/iptraf-ng/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_IPTRAF_NG - bool "iptraf-ng" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - IPTraf-ng is a ncurses-based network monitoring utility. It gathers - data like TCP connection packet and byte counts, interface statistics - and activity indicators. - - https://fedorahosted.org/iptraf-ng/ - - IPTraf-ng is a fork of original IPTraf v3.0.0 (http://iptraf.seul.org). diff --git a/package.bak/iptraf-ng/iptraf-ng.hash b/package.bak/iptraf-ng/iptraf-ng.hash deleted file mode 100644 index 7cb4d1b137..0000000000 --- a/package.bak/iptraf-ng/iptraf-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.1.4.tar.gz.sum -sha1 a2e51b0dd6b8c80583fc25d055850c96b3d2f544 iptraf-ng-1.1.4.tar.gz diff --git a/package.bak/iptraf-ng/iptraf-ng.mk b/package.bak/iptraf-ng/iptraf-ng.mk deleted file mode 100644 index a36c7089fb..0000000000 --- a/package.bak/iptraf-ng/iptraf-ng.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# iptraf-ng -# -################################################################################ - -IPTRAF_NG_VERSION = 1.1.4 -IPTRAF_NG_SITE = https://fedorahosted.org/releases/i/p/iptraf-ng -IPTRAF_NG_LICENSE = GPLv2+ -IPTRAF_NG_LICENSE_FILES = LICENSE -IPTRAF_NG_DEPENDENCIES = ncurses - -IPTRAF_NG_MAKE_ENV = \ - NCURSES_LDFLAGS="-lpanel -lncurses" - -IPTRAF_NG_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -$(eval $(autotools-package)) diff --git a/package.bak/iputils/Config.in b/package.bak/iputils/Config.in deleted file mode 100644 index c83e414cce..0000000000 --- a/package.bak/iputils/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_IPUTILS - bool "iputils" - depends on BR2_USE_MMU # fork() - help - This package is set of small useful utilities for Linux networking. - It includes complete versions of ping, traceroute, etc. - - https://github.com/iputils/iputils diff --git a/package.bak/iputils/iputils.hash b/package.bak/iputils/iputils.hash deleted file mode 100644 index d7d3f5cbd1..0000000000 --- a/package.bak/iputils/iputils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 79e22e940b6f52c37810657c8f12e7ba85692b517d6cd6e90cbceac2d94fc5e8 iputils-55828d1fef3fed7f07abcbf7be9282a9662e78c7.tar.gz diff --git a/package.bak/iputils/iputils.mk b/package.bak/iputils/iputils.mk deleted file mode 100644 index 21f5dcbe06..0000000000 --- a/package.bak/iputils/iputils.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# iputils -# -################################################################################ - -# The original upstream was forked to the github repository in 2014 to -# pull fixes from other distribution and centralize the changes after -# the upstream seemed to have gone dormant. The fork contains the -# latest changes including msul support, removing a libsysfs dependency -# and IPv6 updates. -# http://www.spinics.net/lists/netdev/msg279881.html - -IPUTILS_VERSION = 55828d1fef3fed7f07abcbf7be9282a9662e78c7 -IPUTILS_SITE = $(call github,iputils,iputils,$(IPUTILS_VERSION)) -IPUTILS_LICENSE = GPLv2+, BSD-3c, BSD-4c -# Only includes a license file for BSD -IPUTILS_LICENSE_FILES = ninfod/COPYING - -# Build after busybox so target ends up with this package's full -# versions of the applications instead of busybox applets. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -IPUTILS_DEPENDENCIES += busybox -endif - -IPUTILS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) USE_SYSFS=no USE_IDN=no\ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -IPUTILS_MAKE_OPTS += USE_CAP=yes -IPUTILS_DEPENDENCIES += libcap -else -IPUTILS_MAKE_OPTS += USE_CAP=no -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -IPUTILS_MAKE_OPTS += USE_GCRYPT=yes -IPUTILS_DEPENDENCIES += libgcrypt -# When gettext is enabled (BR2_PACKAGE_GETTEXT=y), and provides libintl -# (BR2_NEEDS_GETTEXT=y), libgpg-error will link with libintl, and libgpg-error -# is pulled in by libgcrypt. Since iputils doesn't use libtool, we have to link -# with libintl explicitly for static linking. -ifeq ($(BR2_STATIC_LIBS)$(BR2_NEEDS_GETTEXT)$(BR2_PACKAGE_GETTEXT),yyy) -IPUTILS_MAKE_OPTS += ADDLIB='-lintl' -endif -else -IPUTILS_MAKE_OPTS += USE_GCRYPT=no -endif - -ifeq ($(BR2_PACKAGE_NETTLE),y) -IPUTILS_MAKE_OPTS += USE_NETTLE=yes -IPUTILS_DEPENDENCIES += nettle -else -IPUTILS_MAKE_OPTS += USE_NETTLE=no -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IPUTILS_MAKE_OPTS += USE_CRYPTO=yes -IPUTILS_DEPENDENCIES += openssl -else -IPUTILS_MAKE_OPTS += USE_CRYPTO=no -endif - -define IPUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(IPUTILS_MAKE_OPTS) -endef - -define IPUTILS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/arping $(TARGET_DIR)/sbin/arping - $(INSTALL) -D -m 755 $(@D)/clockdiff $(TARGET_DIR)/bin/clockdiff - $(INSTALL) -D -m 755 $(@D)/ping $(TARGET_DIR)/bin/ping - $(INSTALL) -D -m 755 $(@D)/rarpd $(TARGET_DIR)/sbin/rarpd - $(INSTALL) -D -m 755 $(@D)/rdisc $(TARGET_DIR)/sbin/rdisc - $(INSTALL) -D -m 755 $(@D)/tftpd $(TARGET_DIR)/usr/sbin/in.tftpd - $(INSTALL) -D -m 755 $(@D)/tracepath $(TARGET_DIR)/bin/tracepath - $(INSTALL) -D -m 755 $(@D)/traceroute6 $(TARGET_DIR)/bin/traceroute6 -endef - -$(eval $(generic-package)) diff --git a/package.bak/iqvlinux/Config.in b/package.bak/iqvlinux/Config.in deleted file mode 100644 index 8959955745..0000000000 --- a/package.bak/iqvlinux/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_IQVLINUX - bool "iqvlinux" - depends on BR2_LINUX_KERNEL - help - Intel Ethernet Adapter Debug Driver for Linux (iqvlinux), - which supports kernel versions 2.6.x up through 4.0.x. - - This debug driver supports all Intel's networking Tools based - on the SDK version 2.19.36.0 or higher which support Intel - Ethernet chip including e1000, e1000e, i210... - - Note: This driver requires PCI support to be enabled - (i.e. CONFIG_PCI). - - http://sourceforge.net/projects/e1000/files/iqvlinux/ - -comment "iqvlinux needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/iqvlinux/iqvlinux.hash b/package.bak/iqvlinux/iqvlinux.hash deleted file mode 100644 index ddf57b712c..0000000000 --- a/package.bak/iqvlinux/iqvlinux.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/e1000/files/iqvlinux/1.1.5.3/ -sha1 bd94416e4364015dbbd78a22e51080bf7ea81fac iqvlinux.tar.gz -md5 fb6a2a4dc122d39070fcb06985c97a05 iqvlinux.tar.gz -# locally computed -sha256 8cb19f3bfe040100a13bb2d05cb2b54f2b259e55cef23f8cc5aa6f2f31e98bec iqvlinux.tar.gz diff --git a/package.bak/iqvlinux/iqvlinux.mk b/package.bak/iqvlinux/iqvlinux.mk deleted file mode 100644 index b3981fa770..0000000000 --- a/package.bak/iqvlinux/iqvlinux.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# iqvlinux -# -################################################################################ - -IQVLINUX_VERSION = 1.1.5.3 -IQVLINUX_SITE = http://sourceforge.net/projects/e1000/files/iqvlinux/$(IQVLINUX_VERSION) -IQVLINUX_SOURCE = iqvlinux.tar.gz - -IQVLINUX_LICENSE = GPLv2, BSD-3c -IQVLINUX_LICENSE_FILES = \ - COPYING src/linux/driver/files.txt \ - inc/linux/files.txt inc/files.txt - -IQVLINUX_MODULE_MAKE_OPTS = NALDIR=$(@D) KSRC=$(LINUX_DIR) CC=$(TARGET_CC) - -IQVLINUX_MODULE_SUBDIRS = src/linux/driver - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/irda-utils/0001-daemon.patch b/package.bak/irda-utils/0001-daemon.patch deleted file mode 100644 index f6034a75b4..0000000000 --- a/package.bak/irda-utils/0001-daemon.patch +++ /dev/null @@ -1,34 +0,0 @@ -written by Mike Frysinger - -https://sourceforge.net/tracker/?func=detail&aid=3132053&group_id=5616&atid=305616 - -Rather than using the fork function (which doesnt work on nommu -systems), simply use the daemon() function instead (which does -work). this should work the same before and after for all systems. - ---- a/irattach/util.c -+++ b/irattach/util.c -@@ -156,21 +156,10 @@ - - void fork_now(int ttyfd) - { -- int ret; - int i; - -- if ((ret = fork()) > 0) -- exit(0); -- -- if (ret == -1) -- syslog(LOG_INFO, "forking: %m"); -- if (setsid() < 0) -- syslog(LOG_INFO, "detaching from tty: %m"); -- -- if ((ret = fork()) > 0) { -- /* cleanup_files = 0; */ -- exit(0); -- } -+ if (daemon(1, 1)) -+ syslog(LOG_INFO, "daemon: %m"); - - /* Close all open inherited files! Except for ttyfd! */ - for (i = 0; i < 64; i++) diff --git a/package.bak/irda-utils/0002-nommu.patch b/package.bak/irda-utils/0002-nommu.patch deleted file mode 100644 index bc76bd3957..0000000000 --- a/package.bak/irda-utils/0002-nommu.patch +++ /dev/null @@ -1,24 +0,0 @@ -written by Mike Frysinger - -https://sourceforge.net/tracker/?func=detail&aid=3132056&group_id=5616&atid=305616 - -nommu systems cannot fork() as the hardware cannot support -it. irattach uses it as a minor optimization, but it isnt -necessary for correct functioning of the utility. so add a -NO_FORK define so we nommu peeps can do CFLAGS="... -DNO_FORK=1 -..." and use it in our embedded systems. - ---- a/irattach/irattach.c -+++ b/irattach/irattach.c -@@ -397,7 +397,11 @@ - after_names[i]); - /* Create a new instance for this other - * interface */ -+#ifdef NO_FORK -+ pid = -1; -+#else - pid = fork(); -+#endif - /* If in the child */ - if(!pid) { - /* Get the interface name */ diff --git a/package.bak/irda-utils/0003-subdir.patch b/package.bak/irda-utils/0003-subdir.patch deleted file mode 100644 index e9b5458a0b..0000000000 --- a/package.bak/irda-utils/0003-subdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -written by Mike Frysinger - -https://sourceforge.net/tracker/?func=detail&aid=3132051&group_id=5616&atid=305616 - -The top level makefile ignores build/install errors in subdirs which makes -packaging a pain to verify. - ---- a/Makefile -+++ b/Makefile -@@ -31,11 +31,11 @@ - CFLAGS= -O2 -W -Wall - - all: -- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) -+ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) - - - install: -- @-(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) -+ @(set -e ; for d in $(DIRS) ; do $(MAKE) $(MAKE_OUTPUT) -C $$d $@ ; done) - - - clean: diff --git a/package.bak/irda-utils/0004-musl.patch b/package.bak/irda-utils/0004-musl.patch deleted file mode 100644 index 6cf975b8c1..0000000000 --- a/package.bak/irda-utils/0004-musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -Replace use of with . - -kernel headers already provides the -needed definitions, moreover not all libc implementations -provide if_packet.h e.g. musl - -Signed-off-by: Khem Raj -Upstream-Status: Pending -[From http://cgit.openembedded.org/openembedded-core/plain/meta/recipes-connectivity/irda-utils/irda-utils-0.9.18/musl.patch.] -Signed-off-by: Bernd Kuhls - -Index: irda-utils-0.9.18/irdaping/irdaping.c -=================================================================== ---- irda-utils-0.9.18.orig/irdaping/irdaping.c -+++ irda-utils-0.9.18/irdaping/irdaping.c -@@ -33,7 +33,6 @@ - #include - #include - #include /* For struct ifreq */ --#include /* For struct sockaddr_pkt */ - #include /* For ARPHRD_IRDA */ - #include /* For ETH_P_ALL */ - #include /* For htons */ -@@ -46,6 +45,7 @@ - #include /* __cpu_to_le32 and co. */ - - #include /* For __u8 and co. */ -+#include /* For struct sockaddr_pkt */ - #include - - #ifndef AF_IRDA diff --git a/package.bak/irda-utils/Config.in b/package.bak/irda-utils/Config.in deleted file mode 100644 index 418ab618c8..0000000000 --- a/package.bak/irda-utils/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_IRDA_UTILS - bool "irda-utils" - help - user space utilities which control the IrDA stack - - http://irda.sourceforge.net/ - -if BR2_PACKAGE_IRDA_UTILS - -config BR2_PACKAGE_IRDA_UTILS_IRATTACH - bool "irattach" - -config BR2_PACKAGE_IRDA_UTILS_IRDAPING - bool "irdaping" - -config BR2_PACKAGE_IRDA_UTILS_IRNETD - bool "irnetd" - -endif diff --git a/package.bak/irda-utils/irda-utils.hash b/package.bak/irda-utils/irda-utils.hash deleted file mode 100644 index 6a71c47f03..0000000000 --- a/package.bak/irda-utils/irda-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 61980551e46b2eaa9e17ad31cbc1a638074611fc33bff34163d10c7a67a9fdc6 irda-utils-0.9.18.tar.gz diff --git a/package.bak/irda-utils/irda-utils.mk b/package.bak/irda-utils/irda-utils.mk deleted file mode 100644 index 4b1700798f..0000000000 --- a/package.bak/irda-utils/irda-utils.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# irda-utils -# -################################################################################ - -IRDA_UTILS_VERSION = 0.9.18 -IRDA_UTILS_SITE = http://downloads.sourceforge.net/project/irda/irda-utils/$(IRDA_UTILS_VERSION) -IRDA_UTILS_LICENSE = GPLv2+ -IRDA_UTILS_LICENSE_FILES = man/COPYING - -IRDA_UTILS_CFLAGS = $(TARGET_CFLAGS) -I. -ifeq ($(BR2_USE_MMU),) -IRDA_UTILS_CFLAGS += -DNO_FORK=1 -endif - -define IRDA_UTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(IRDA_UTILS_CFLAGS)" \ - SYS_INCLUDES= \ - DIRS="irattach irdaping irnetd" \ - V=1 -C $(@D) -endef - -IRDA_UTILS_SBINS- = -IRDA_UTILS_SBINS-y = -IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRATTACH) += irattach -IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRDAPING) += irdaping -IRDA_UTILS_SBINS-$(BR2_PACKAGE_IRDA_UTILS_IRNETD) += irnetd -IRDA_UTILS_SBINS- += $(IRDA_UTILS_SBINS-y) - -define IRDA_UTILS_INSTALL_TARGET_CMDS - for i in $(IRDA_UTILS_SBINS-y); do \ - $(INSTALL) -m 0755 -D $(@D)/$$i/$$i $(TARGET_DIR)/usr/sbin/$$i || exit 1; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/irqbalance/Config.in b/package.bak/irqbalance/Config.in deleted file mode 100644 index 6c21497834..0000000000 --- a/package.bak/irqbalance/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_IRQBALANCE - bool "irqbalance" - help - Irqbalance is a daemon to help balance the cpu load generated - by interrupts across all of a systems cpus. - Irqbalance identifies the highest volume interrupt sources, - and isolates them to a single unique cpu, so that load is - spread as much as possible over an entire processor set, while - minimizing cache hit rates for irq handlers. - - https://github.com/Irqbalance/irqbalance diff --git a/package.bak/irqbalance/S13irqbalance b/package.bak/irqbalance/S13irqbalance deleted file mode 100644 index b06a3372e9..0000000000 --- a/package.bak/irqbalance/S13irqbalance +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh -# -# Starts irqbalance -# - -EXEC="/usr/sbin/irqbalance" -ARGS="" -PID="/var/run/irqbalance.pid" - -case "$1" in - start) - printf "Starting irqbalance: " - start-stop-daemon -S -q -x $EXEC -- $ARGS - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "OK" - fi - pidof irqbalance > $PID - ;; - stop) - printf "Stopping irqbalance: " - start-stop-daemon -K -q -p $PID - echo "OK" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/irqbalance/irqbalance.hash b/package.bak/irqbalance/irqbalance.hash deleted file mode 100644 index 032c49152f..0000000000 --- a/package.bak/irqbalance/irqbalance.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f1b8115948bb9f0bc36b9d7143ee8be751a294bc189d311408e753acc37169c3 irqbalance-v1.0.9.tar.gz diff --git a/package.bak/irqbalance/irqbalance.mk b/package.bak/irqbalance/irqbalance.mk deleted file mode 100644 index 1872c889c8..0000000000 --- a/package.bak/irqbalance/irqbalance.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# irqbalance -# -################################################################################ - -IRQBALANCE_VERSION = v1.0.9 -IRQBALANCE_SITE = $(call github,irqbalance,irqbalance,$(IRQBALANCE_VERSION)) -IRQBALANCE_LICENSE = GPLv2 -IRQBALANCE_LICENSE_FILES = COPYING -IRQBALANCE_DEPENDENCIES = host-pkgconf -# Autoreconf needed because package is distributed without a configure script -IRQBALANCE_AUTORECONF = YES - -# This would be done by the package's autogen.sh script -define IRQBALANCE_PRECONFIGURE - mkdir -p $(@D)/m4 -endef - -IRQBALANCE_PRE_CONFIGURE_HOOKS += IRQBALANCE_PRECONFIGURE - -define IRQBALANCE_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/irqbalance/S13irqbalance \ - $(TARGET_DIR)/etc/init.d/S13irqbalance -endef - -define IRQBALANCE_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/irqbalance/irqbalance.service \ - $(TARGET_DIR)/usr/lib/systemd/system/irqbalance.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/irqbalance.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/irqbalance.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/irqbalance/irqbalance.service b/package.bak/irqbalance/irqbalance.service deleted file mode 100644 index 9ba3be43bb..0000000000 --- a/package.bak/irqbalance/irqbalance.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=irqbalance daemon -After=syslog.target - -[Service] -ExecStart=/usr/sbin/irqbalance --foreground - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/irssi/Config.in b/package.bak/irssi/Config.in deleted file mode 100644 index 7d29201789..0000000000 --- a/package.bak/irssi/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_IRSSI - bool "irssi" - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_NCURSES - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # fork() - help - Irssi is a terminal based IRC client for UNIX systems. - - http://irssi.org/ - -if BR2_PACKAGE_IRSSI - -config BR2_PACKAGE_IRSSI_PROXY - bool "proxy module" - help - Build the irssi proxy module, which allows an IRC connection - to be shared among multiple clients. - -config BR2_PACKAGE_IRSSI_TRUE_COLOR - bool "true color support" - help - Build with true color support in terminal. - -endif - -comment "irssi needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/irssi/irssi.hash b/package.bak/irssi/irssi.hash deleted file mode 100644 index b1048bf8f5..0000000000 --- a/package.bak/irssi/irssi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 e433063b8714dcf17438126902c9a9d5c97944b3185ecd0fc5ae25c4959bf35a irssi-0.8.21.tar.xz diff --git a/package.bak/irssi/irssi.mk b/package.bak/irssi/irssi.mk deleted file mode 100644 index e467f89890..0000000000 --- a/package.bak/irssi/irssi.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# irssi -# -################################################################################ - -IRSSI_VERSION = 0.8.21 -IRSSI_SOURCE = irssi-$(IRSSI_VERSION).tar.xz -# Do not use the github helper here. The generated tarball is *NOT* the -# same as the one uploaded by upstream for the release. -IRSSI_SITE = https://github.com/irssi/irssi/releases/download/$(IRSSI_VERSION) -IRSSI_LICENSE = GPLv2+ -IRSSI_LICENSE_FILES = COPYING -IRSSI_DEPENDENCIES = host-pkgconf libglib2 ncurses - -IRSSI_CONF_OPTS = \ - --disable-glibtest \ - --with-ncurses=$(STAGING_DIR)/usr \ - --without-perl - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -IRSSI_CONF_OPTS += --enable-ssl -IRSSI_DEPENDENCIES += openssl -else -IRSSI_CONF_OPTS += --disable-ssl -endif - -ifeq ($(BR2_PACKAGE_IRSSI_PROXY),y) -IRSSI_CONF_OPTS += --with-proxy -# If shared libs are disabled, 'proxy' has to go in the list of built-in -# modules. -ifeq ($(BR2_STATIC_LIBS),y) -IRSSI_CONF_OPTS += --with-modules=proxy -endif -else -IRSSI_CONF_OPTS += --without-proxy -endif # proxy - -ifeq ($(BR2_PACKAGE_IRSSI_TRUE_COLOR),y) -IRSSI_CONF_OPTS += --enable-true-color -else -IRSSI_CONF_OPTS += --disable-true-color -endif - -# Cross-compiling irssi with the perl interpreter enabled doesn't work -# yet. So, remove scripts as they are useless in that case. -define IRSSI_REMOVE_SCRIPTS - rm -rf $(TARGET_DIR)/usr/share/irssi/scripts/ -endef - -IRSSI_POST_INSTALL_TARGET_HOOKS += IRSSI_REMOVE_SCRIPTS - -$(eval $(autotools-package)) diff --git a/package.bak/isl/isl.hash b/package.bak/isl/isl.hash deleted file mode 100644 index e2c14ad149..0000000000 --- a/package.bak/isl/isl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 8882c9e36549fc757efa267706a9af733bb8d7fe3905cbfde43e17a89eea4675 isl-0.14.1.tar.xz diff --git a/package.bak/isl/isl.mk b/package.bak/isl/isl.mk deleted file mode 100644 index 74de125b60..0000000000 --- a/package.bak/isl/isl.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# isl -# -################################################################################ - -# The latest 0.15 version is not yet compatible with cloog 0.18.3, so -# bumping isl is not possible until a new version of cloog is -# published. -ISL_VERSION = 0.14.1 -ISL_SOURCE = isl-$(ISL_VERSION).tar.xz -ISL_SITE = http://isl.gforge.inria.fr -ISL_LICENSE = MIT -ISL_LICENSE_FILES = LICENSE -HOST_ISL_DEPENDENCIES = host-gmp - -# Our libtool patch doesn't apply, and since this package is only -# built for the host, we don't really care about it. -ISL_LIBTOOL_PATCH = NO - -$(eval $(host-autotools-package)) diff --git a/package.bak/iucode-tool/Config.in b/package.bak/iucode-tool/Config.in deleted file mode 100644 index d81dabb196..0000000000 --- a/package.bak/iucode-tool/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_IUCODE_TOOL - bool "iucode-tool" - depends on BR2_x86_64 || BR2_i386 - select BR2_PACKAGE_INTEL_MICROCODE - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - help - Intel processor microcode tool - - https://gitlab.com/iucode-tool diff --git a/package.bak/iucode-tool/S00iucode-tool b/package.bak/iucode-tool/S00iucode-tool deleted file mode 100644 index 0c1e409de2..0000000000 --- a/package.bak/iucode-tool/S00iucode-tool +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# Upload microcode into the processor. -# - -microcode_file="/usr/share/misc/intel-microcode.dat" - -case "$1" in - start) - echo "Starting iucode-tool:" - /usr/sbin/iucode_tool -k $microcode_file - echo "done" - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/iucode-tool/iucode-tool.hash b/package.bak/iucode-tool/iucode-tool.hash deleted file mode 100644 index c1f3bef045..0000000000 --- a/package.bak/iucode-tool/iucode-tool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 33271652032f20f866a212bc98ea01a8db65c4ac839fa820aa23da974fd6ff62 iucode-tool_1.5.tar.xz diff --git a/package.bak/iucode-tool/iucode-tool.mk b/package.bak/iucode-tool/iucode-tool.mk deleted file mode 100644 index cee0572649..0000000000 --- a/package.bak/iucode-tool/iucode-tool.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# iucode-tool -# -################################################################################ - -IUCODE_TOOL_VERSION = 1.5 -IUCODE_TOOL_SOURCE = iucode-tool_$(IUCODE_TOOL_VERSION).tar.xz -IUCODE_TOOL_SITE = https://gitlab.com/iucode-tool/releases/raw/latest -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -IUCODE_TOOL_CONF_ENV = LIBS="-largp" -IUCODE_TOOL_DEPENDENCIES = argp-standalone -endif -IUCODE_TOOL_LICENSE = GPLv2+ -IUCODE_TOOL_LICENSE_FILES = COPYING - -define IUCODE_TOOL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/iucode-tool/S00iucode-tool \ - $(TARGET_DIR)/etc/init.d/S00iucode-tool -endef - -$(eval $(autotools-package)) diff --git a/package.bak/iw/Config.in b/package.bak/iw/Config.in deleted file mode 100644 index fd73b20992..0000000000 --- a/package.bak/iw/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_IW - bool "iw" - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_LIBNL - help - Utility for wireless devices using the mac80211 kernel stack - - http://wireless.kernel.org/en/users/Documentation/iw - -comment "iw needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/iw/iw.hash b/package.bak/iw/iw.hash deleted file mode 100644 index 414f34225f..0000000000 --- a/package.bak/iw/iw.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/network/iw/sha256sums.asc -sha256 324cc805fad52cba2c16b9ab569906889fb645cc962aac4cfda1db85d2de97ce iw-4.9.tar.xz diff --git a/package.bak/iw/iw.mk b/package.bak/iw/iw.mk deleted file mode 100644 index faff5fc717..0000000000 --- a/package.bak/iw/iw.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# iw -# -################################################################################ - -IW_VERSION = 4.9 -IW_SOURCE = iw-$(IW_VERSION).tar.xz -IW_SITE = $(BR2_KERNEL_MIRROR)/software/network/iw -IW_LICENSE = ISC -IW_LICENSE_FILES = COPYING -IW_DEPENDENCIES = host-pkgconf libnl -IW_MAKE_OPTS = CC="$(TARGET_CC)" LD="$(TARGET_LD)" LDFLAGS="$(TARGET_LDFLAGS)" -IW_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - PKG_CONFIG="$(HOST_DIR)/usr/bin/pkg-config" \ - GIT_DIR=$(IW_DIR) - -define IW_BUILD_CMDS - $(IW_MAKE_ENV) $(MAKE) $(IW_MAKE_OPTS) -C $(@D) -endef - -define IW_INSTALL_TARGET_CMDS - $(IW_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/jack2/0001-Improve-check-for-ucontext.patch b/package.bak/jack2/0001-Improve-check-for-ucontext.patch deleted file mode 100644 index b8aa1da721..0000000000 --- a/package.bak/jack2/0001-Improve-check-for-ucontext.patch +++ /dev/null @@ -1,84 +0,0 @@ -From ad79670d6d1e7ef2aad6935715921e5317cbe618 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 23 May 2016 22:28:12 +0200 -Subject: [PATCH] Improve check for ucontext - -The ucontext functionality is not available on all CPUs with all C -libraries. Instead of making just assumptions based on the CPU -architecture, this commit adds the necessary checks in wscript to verify -the availability of the ucontext functionality, before using it in -dbus/sigsegv.c. - -This avoids the long list of architecture exclusions, and make it more -robust when building jack2 for new CPU architectures. - -Signed-off-by: Thomas Petazzoni ---- - dbus/sigsegv.c | 12 ++++++------ - wscript | 16 +++++++++++++++- - 2 files changed, 21 insertions(+), 7 deletions(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index df2c42c..00a62b5 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -106,20 +106,20 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - jack_error("info.si_errno = %d", info->si_errno); - jack_error("info.si_code = %d (%s)", info->si_code, si_code_str); - jack_error("info.si_addr = %p", info->si_addr); --#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__) -+#if defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) - for(i = 0; i < NGREG; i++) - jack_error("reg[%02d] = 0x" REGFORMAT, i, --#if defined(__powerpc64__) -+#if defined(HAVE_UCONTEXT_GP_REGS) - ucontext->uc_mcontext.gp_regs[i] --#elif defined(__powerpc__) -+#elif defined(HAVE_UCONTEXT_UC_REGS) - ucontext->uc_mcontext.uc_regs[i] --#elif defined(__sparc__) && defined(__arch64__) -+#elif defined(HAVE_UCONTEXT_MC_GREGS) - ucontext->uc_mcontext.mc_gregs[i] --#else -+#elif defined(HAVE_UCONTEXT_GREGS) - ucontext->uc_mcontext.gregs[i] - #endif - ); --#endif /* alpha, ia64, kFreeBSD, arm, hppa */ -+#endif /* defined(HAVE_UCONTEXT) && defined(HAVE_NGREG) */ - - #if defined(SIGSEGV_STACK_X86) || defined(SIGSEGV_STACK_IA64) - # if defined(SIGSEGV_STACK_IA64) -diff --git a/wscript b/wscript -index 63ba3aa..34a56fc 100644 ---- a/wscript -+++ b/wscript -@@ -168,10 +168,24 @@ def configure(conf): - - conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") -- - if conf.is_defined('HAVE_SAMPLERATE'): - conf.env['LIB_SAMPLERATE'] = ['samplerate'] - -+ # test for the availability of ucontext, and how it should be used -+ for t in ("gp_regs", "uc_regs", "mc_gregs", "gregs"): -+ fragment = "#include \n" -+ fragment += "int main() { ucontext_t *ucontext; return (int) ucontext->uc_mcontext.%s[0]; }" % t -+ confvar = "HAVE_UCONTEXT_%s" % t.upper() -+ conf.check_cc(fragment=fragment, define_name=confvar, mandatory=False, -+ msg="Checking for ucontext->uc_mcontext.%s" % t) -+ if conf.is_defined(confvar): -+ conf.define('HAVE_UCONTEXT', 1) -+ -+ fragment = "#include \n" -+ fragment += "int main() { return NGREG; }" -+ conf.check_cc(fragment=fragment, define_name="HAVE_NGREG", mandatory=False, -+ msg="Checking for NGREG") -+ - conf.sub_config('example-clients') - - if conf.check_cfg(package='celt', atleast_version='0.11.0', args='--cflags --libs', mandatory=False): --- -2.7.4 - diff --git a/package.bak/jack2/0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch b/package.bak/jack2/0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch deleted file mode 100644 index 719c6a83ba..0000000000 --- a/package.bak/jack2/0002-Make-backtrace-support-depends-on-execinfo.h-existen.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 4b2c73ad056aa327dc3b505410da68cf384317ba Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Mon, 16 May 2016 22:26:05 +0200 -Subject: [PATCH] Make backtrace support depends on execinfo.h existence - -In some C-libraries (like uclibc), backtrace support is optional, so the -execinfo.h file may not exist. - -This change adds the check for execinfo.h header and conditionnaly enable -backtrace support. - -This issue has been triggered by Buildroot farms: - http://autobuild.buildroot.org/results/391/391e71a988250ea66ec4dbee6f60fdce9eaf2766/build-end.log - -Signed-off-by: Samuel Martin ---- - dbus/sigsegv.c | 8 +++++++- - wscript | 1 + - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/dbus/sigsegv.c b/dbus/sigsegv.c -index ee12f91..0b31d89 100644 ---- a/dbus/sigsegv.c -+++ b/dbus/sigsegv.c -@@ -27,7 +27,9 @@ - #include - #include - #include --#include -+#if defined(HAVE_EXECINFO_H) -+# include -+#endif /* defined(HAVE_EXECINFO_H) */ - #include - #ifndef NO_CPP_DEMANGLE - char * __cxa_demangle(const char * __mangled_name, char * __output_buffer, size_t * __length, int * __status); -@@ -161,12 +163,16 @@ static void signal_segv(int signum, siginfo_t* info, void*ptr) { - bp = (void**)bp[0]; - } - #else -+# if defined(HAVE_EXECINFO_H) - jack_error("Stack trace (non-dedicated):"); - sz = backtrace(bt, 20); - strings = backtrace_symbols(bt, sz); - - for(i = 0; i < sz; ++i) - jack_error("%s", strings[i]); -+# else /* defined(HAVE_EXECINFO_H) */ -+ jack_error("Stack trace not available"); -+# endif /* defined(HAVE_EXECINFO_H) */ - #endif - jack_error("End of stack trace"); - exit (-1); -diff --git a/wscript b/wscript -index aef4bd8..63ba3aa 100644 ---- a/wscript -+++ b/wscript -@@ -166,6 +166,7 @@ def configure(conf): - if conf.env['BUILD_JACKDBUS'] != True: - conf.fatal('jackdbus was explicitly requested but cannot be built') - -+ conf.check_cc(header_name='execinfo.h', define_name="HAVE_EXECINFO_H", mandatory=False) - conf.check_cc(header_name='samplerate.h', define_name="HAVE_SAMPLERATE") - - if conf.is_defined('HAVE_SAMPLERATE'): --- -2.8.2 - diff --git a/package.bak/jack2/0003-tests-define-__STDC_LIMIT_MACROS.patch b/package.bak/jack2/0003-tests-define-__STDC_LIMIT_MACROS.patch deleted file mode 100644 index e4990b5c34..0000000000 --- a/package.bak/jack2/0003-tests-define-__STDC_LIMIT_MACROS.patch +++ /dev/null @@ -1,41 +0,0 @@ -From c971aaab74ca6e7d4ac3a06bd26e7309dfc5da45 Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Mon, 22 Aug 2016 19:04:47 +0530 -Subject: [PATCH] tests: define __STDC_LIMIT_MACROS - -With glibc 2.16, we get following build error when building jack2: - - [193/247] cxx: tests/iodelay.cpp -> build/tests/iodelay.cpp.4.o - ../tests/iodelay.cpp:171:43: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:171:55: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:44: error: 'UINT32_MAX' was not declared in this scope - ../tests/iodelay.cpp:172:56: error: 'UINT32_MAX' was not declared in this scope - -In glibc 2.17 or older version, Header defines these macros -for C++ only if explicitly requested by defining __STDC_LIMIT_MACROS. - -We can't use since it requires C++11 standard. - -This build issue found by Buildroot autobuilder. -http://autobuild.buildroot.net/results/369/369ce208ffea43dad75ba0a13469159b341e3bf5/ - -Signed-off-by: Rahul Bedarkar ---- - tests/iodelay.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/iodelay.cpp b/tests/iodelay.cpp -index 1ef470f..f5c5836 100644 ---- a/tests/iodelay.cpp -+++ b/tests/iodelay.cpp -@@ -20,6 +20,7 @@ - - #include - #include -+#define __STDC_LIMIT_MACROS - #include - #include - #include --- -2.6.2 - diff --git a/package.bak/jack2/Config.in b/package.bak/jack2/Config.in deleted file mode 100644 index f9de7be041..0000000000 --- a/package.bak/jack2/Config.in +++ /dev/null @@ -1,54 +0,0 @@ -config BR2_PACKAGE_JACK2 - bool "jack2" - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_LIBSAMPLERATE - select BR2_PACKAGE_LIBSNDFILE - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_HWDEP - select BR2_PACKAGE_ALSA_LIB_SEQ - select BR2_PACKAGE_ALSA_LIB_RAWMIDI - # Ensure we get at least one: - select BR2_PACKAGE_JACK2_LEGACY if !BR2_PACKAGE_JACK2_DBUS - help - JACK Audio Connection Kit (server and example clients). - - JACK is a low-latency sound server, allowing multiple - applications to connect to one audio device, and to share - audio between themselves. This package contains the daemon - jackd as well as some example clients. - - http://jackaudio.org/ - -if BR2_PACKAGE_JACK2 - -config BR2_PACKAGE_JACK2_LEGACY - bool "classic jack2" - help - Build and use jackd. - - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging - -config BR2_PACKAGE_JACK2_DBUS - bool "dbus jack2" - depends on BR2_USE_WCHAR # dbus-python, python - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_PYTHON - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - help - Build and use jackdbus. - - https://github.com/jackaudio/jackaudio.github.com/wiki/JackDbusPackaging - -endif - -comment "jack2 needs a toolchain w/ threads, C++, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - BR2_STATIC_LIBS diff --git a/package.bak/jack2/jack2.hash b/package.bak/jack2/jack2.hash deleted file mode 100644 index 1b981a4b83..0000000000 --- a/package.bak/jack2/jack2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 88f1b6601b7c8950e6a2d5940b423a33ee628ae5583da40bdce3d9317d8c600d jack2-v1.9.10.tar.gz -sha256 f372c4300e3fb2c1ce053e47829df44f3f8b933feb820759392187723ae8e640 ff1ed2c4524095055140370c1008a2d9cccc5645.patch diff --git a/package.bak/jack2/jack2.mk b/package.bak/jack2/jack2.mk deleted file mode 100644 index 23c9723421..0000000000 --- a/package.bak/jack2/jack2.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# jack2 -# -################################################################################ - -JACK2_VERSION = v1.9.10 -JACK2_SITE = $(call github,jackaudio,jack2,$(JACK2_VERSION)) -JACK2_LICENSE = GPLv2+ (jack server), LGPLv2.1+ (jack library) -JACK2_DEPENDENCIES = libsamplerate libsndfile alsa-lib host-python -JACK2_INSTALL_STAGING = YES -JACK2_PATCH = https://github.com/jackaudio/jack2/commit/ff1ed2c4524095055140370c1008a2d9cccc5645.patch - -JACK2_CONF_OPTS = --alsa - -ifeq ($(BR2_PACKAGE_OPUS),y) -JACK2_DEPENDENCIES += opus -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -JACK2_DEPENDENCIES += readline -endif - -ifeq ($(BR2_PACKAGE_JACK2_LEGACY),y) -JACK2_CONF_OPTS += --classic -else -define JACK2_REMOVE_JACK_CONTROL - $(RM) -f $(TARGET_DIR)/usr/bin/jack_control -endef -JACK2_POST_INSTALL_TARGET_HOOKS += JACK2_REMOVE_JACK_CONTROL -endif - -ifeq ($(BR2_PACKAGE_JACK2_DBUS),y) -JACK2_DEPENDENCIES += dbus -JACK2_CONF_OPTS += --dbus -endif - -# Even though it advertises support for celt-0.5.x, jack2 really -# requires celt >= 0.5.2 but we only have 0.5.1.3 and we cannot -# upgrade, so we do not add a dependency to celt051, which it can't -# find anyway as it looks for celt.pc but we only have celt-51.pc. - -# The dependency against eigen is only useful in conjunction with -# gtkiostream, which we do not have, so we don't need to depend on -# eigen. - -$(eval $(waf-package)) diff --git a/package.bak/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch b/package.bak/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch deleted file mode 100644 index 78ee9b7e18..0000000000 --- a/package.bak/jamvm/0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch +++ /dev/null @@ -1,108 +0,0 @@ -From ecd4eceae98cfb1c83133bdeaa9095546ca8b7c6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 May 2016 15:05:48 +0200 -Subject: [PATCH] Use when available instead of - -musl libc (http://musl-libc.org lack the non-standard -header, which is used in src/os/linux/{i386,x86_64}/init.c files to -setup the floating point precision. This patch makes it use the -standard C header instead when available. - -Original patch at Felix Janda at -https://sourceforge.net/p/jamvm/patches/6/, adapted to still use - if is not provided. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - src/os/linux/i386/init.c | 15 +++++++++++++++ - src/os/linux/x86_64/init.c | 15 +++++++++++++-- - 3 files changed, 29 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 19f77e6..ce59a3e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -279,7 +279,7 @@ fi - - dnl Checks for header files. - AC_HEADER_STDC --AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h) -+AC_CHECK_HEADERS(sys/time.h unistd.h endian.h sys/param.h locale.h alloca.h fenv.h) - - if test "$enable_zip" != no; then - AC_CHECK_HEADER(zlib.h,,AC_MSG_ERROR(zlib.h is missing)) -diff --git a/src/os/linux/i386/init.c b/src/os/linux/i386/init.c -index d9c6648..8fefe7d 100644 ---- a/src/os/linux/i386/init.c -+++ b/src/os/linux/i386/init.c -@@ -19,18 +19,33 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -+#include "config.h" -+ -+#if defined(HAVE_FENV_H) -+#include -+#else - #include -+#endif - - /* Change floating point precision to double (64-bit) from - * the extended (80-bit) Linux default. */ - - void setDoublePrecision() { -+#if defined(HAVE_FENV_H) -+ fenv_t fenv; -+ -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ -+ fesetenv(&fenv); -+#else - fpu_control_t cw; - - _FPU_GETCW(cw); - cw &= ~_FPU_EXTENDED; - cw |= _FPU_DOUBLE; - _FPU_SETCW(cw); -+#endif - } - - void initialisePlatform() { -diff --git a/src/os/linux/x86_64/init.c b/src/os/linux/x86_64/init.c -index 9d55229..b42b14e 100644 ---- a/src/os/linux/x86_64/init.c -+++ b/src/os/linux/x86_64/init.c -@@ -19,7 +19,11 @@ - * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - --#ifdef __linux__ -+#include "config.h" -+ -+#if defined(HAVE_FENV_H) -+#include -+#else - #include - #endif - -@@ -30,7 +34,14 @@ - */ - - void setDoublePrecision() { --#ifdef __linux__ -+#if defined(HAVE_FENV_H) -+ fenv_t fenv; -+ -+ fegetenv(&fenv); -+ fenv.__control_word &= ~0x300; /*_FPU_EXTENDED */ -+ fenv.__control_word |= 0x200; /*_FPU_DOUBLE */ -+ fesetenv(&fenv); -+#else - fpu_control_t cw; - - _FPU_GETCW(cw); --- -2.7.4 - diff --git a/package.bak/jamvm/Config.in b/package.bak/jamvm/Config.in deleted file mode 100644 index 57e1a8e6f4..0000000000 --- a/package.bak/jamvm/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_JAMVM - bool "jamvm" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ - || BR2_mips || BR2_mipsel || BR2_powerpc - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_CLASSPATH - help - JamVM is a new Java Virtual Machine which conforms to the - JVM specification version 2 (blue book). - - http://jamvm.sf.net - -comment "jamvm needs a toolchain w/ threads, dynamic library" - depends on BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64 \ - || BR2_mips || BR2_mipsel || BR2_powerpc - depends on BR2_PACKAGE_CLASSPATH_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/jamvm/jamvm.hash b/package.bak/jamvm/jamvm.hash deleted file mode 100644 index f8ef76cb92..0000000000 --- a/package.bak/jamvm/jamvm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 76428e96df0ae9dd964c7a7c74c1e9a837e2f312c39e9a357fa8178f7eff80da jamvm-2.0.0.tar.gz diff --git a/package.bak/jamvm/jamvm.mk b/package.bak/jamvm/jamvm.mk deleted file mode 100644 index ee80c80b2f..0000000000 --- a/package.bak/jamvm/jamvm.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# jamvm -# -################################################################################ - -JAMVM_VERSION = 2.0.0 -JAMVM_SITE = http://downloads.sourceforge.net/project/jamvm/jamvm/JamVM%20$(JAMVM_VERSION) -JAMVM_LICENSE = GPLv2+ -JAMVM_LICENSE_FILES = COPYING -JAMVM_DEPENDENCIES = zlib classpath -# For 0001-Use-fenv.h-when-available-instead-of-fpu_control.h.patch -JAMVM_AUTORECONF = YES -# int inlining seems to crash jamvm, don't build shared version of internal lib -JAMVM_CONF_OPTS = \ - --with-classpath-install-dir=/usr \ - --disable-int-inlining \ - --disable-shared \ - --without-pic - -# jamvm has ARM assembly code that cannot be compiled in Thumb2 mode, -# so we must force traditional ARM mode. -ifeq ($(BR2_arm),y) -JAMVM_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" -endif - -# Needed for autoreconf -define JAMVM_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -JAMVM_POST_PATCH_HOOKS += JAMVM_CREATE_M4_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/jansson/Config.in b/package.bak/jansson/Config.in deleted file mode 100644 index 960a7c4c38..0000000000 --- a/package.bak/jansson/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_JANSSON - bool "jansson" - help - Jansson is a C library for encoding, decoding and manipulating JSON - data. - - http://www.digip.org/jansson/ diff --git a/package.bak/jansson/jansson.hash b/package.bak/jansson/jansson.hash deleted file mode 100644 index adb345d2f0..0000000000 --- a/package.bak/jansson/jansson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0ad0d074ca049a36637e7abef755d40849ad73e926b93914ce294927b97bd2a5 jansson-2.9.tar.gz diff --git a/package.bak/jansson/jansson.mk b/package.bak/jansson/jansson.mk deleted file mode 100644 index 5e131188fa..0000000000 --- a/package.bak/jansson/jansson.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# jansson -# -################################################################################ - -JANSSON_VERSION = 2.9 -JANSSON_SITE = http://www.digip.org/jansson/releases -JANSSON_LICENSE = MIT -JANSSON_LICENSE_FILES = LICENSE -JANSSON_INSTALL_STAGING = YES -JANSSON_CONF_ENV = LIBS="-lm" - -$(eval $(autotools-package)) diff --git a/package.bak/janus-gateway/0001-disable-ssp.patch b/package.bak/janus-gateway/0001-disable-ssp.patch deleted file mode 100644 index f03b58589b..0000000000 --- a/package.bak/janus-gateway/0001-disable-ssp.patch +++ /dev/null @@ -1,22 +0,0 @@ -Do not force SSP usage - -The toolchain may not support SSP, so do not enforce its usage, let -the package user pass the appropriate CFLAGS to enable SSP if needed. - -Signed-off-by: Gregory Dymarek -Signed-off-by: Thomas Petazzoni -(rebased against v0.1.0) -Signed-off-by: Bernd Kuhls - -diff -rupN janus-gateway-master.orig/Makefile.am janus-gateway-master/Makefile.am ---- janus-gateway-master.orig/Makefile.am 2014-11-27 14:36:31.000000000 +0000 -+++ janus-gateway-master/Makefile.am 2014-12-01 16:39:50.551935028 +0000 -@@ -14,7 +14,7 @@ AM_CFLAGS += -Wredundant-decls # sophia - # some fairly big refactoring though, which can wait. - # AM_CFLAGS += -Wshadow -Wstrict-aliasing=2 - --AM_CFLAGS += -fstack-protector-all -g -ggdb -fPIC -rdynamic -pthread -+AM_CFLAGS += -g -ggdb -fPIC -rdynamic -pthread - - # FIXME: make docs work with distcheck - DISTCHECK_CONFIGURE_FLAGS = --disable-docs --enable-post-processing diff --git a/package.bak/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch b/package.bak/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch deleted file mode 100644 index 13bc21ea42..0000000000 --- a/package.bak/janus-gateway/0002-Add-test-for-Wunused-but-set-variable.patch +++ /dev/null @@ -1,135 +0,0 @@ -From c0f075bdee5edabf8f19b68e0880fbd249a89653 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 3 Jan 2015 15:09:59 +0100 -Subject: [PATCH] Add test for -Wunused-but-set-variable - -The -Wunused-but-set-variable option does not exist in some old gcc -versions (gcc 4.5.x), so using it unconditionally breaks the build -with such compilers. - -This commit introduces the AX_CHECK_COMPILE_FLAG m4 macro taken from -the autoconf-archive -(http://git.savannah.gnu.org/gitweb/?p=autoconf-archive.git;a=blob_plain;f=m4/ax_check_compile_flag.m4), -and uses it to detect if the -Wunused-but-set-variable option is -supported, and only uses it in this case. - -Signed-off-by: Thomas Petazzoni -(rebased against v0.1.0) -Signed-off-by: Bernd Kuhls ---- - Makefile.am | 2 +- - configure.ac | 3 ++ - m4/ax_check_compile_flag.m4 | 74 +++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 78 insertions(+), 1 deletion(-) - create mode 100644 m4/ax_check_compile_flag.m4 - -diff --git a/Makefile.am b/Makefile.am -index 5d23e0b..0f51f6a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -6,7 +6,7 @@ AM_CFLAGS = \ - -Wnested-externs -Wstrict-prototypes -Wunsafe-loop-optimizations \ - -Wwrite-strings -Wno-missing-field-initializers -Wno-unused-parameter \ - -Wcast-align -Wformat-nonliteral -Wformat-security -Wswitch-default \ -- -Wmissing-include-dirs -Wno-aggregate-return -Wunused-but-set-variable \ -+ -Wmissing-include-dirs -Wno-aggregate-return @GCC_WARN_UNUSED_BUT_SET@ \ - -Warray-bounds -Wold-style-definition -Wsign-compare -Wlarger-than=65537 - AM_CFLAGS += -Wno-undef # sophiasip is not -Wundef--safe - AM_CFLAGS += -Wno-redundant-decls # sophiasip also contains redundant declarations -diff --git a/configure.ac b/configure.ac -index 17870a7..f9bb1e4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,9 @@ AM_SILENT_RULES([yes]) - AC_GNU_SOURCE - - AC_PROG_CC -+AX_CHECK_COMPILE_FLAG([-Wunused-but-set-variable], -+ [GCC_WARN_UNUSED_BUT_SET=-Wunused-but-set-variable]) -+AC_SUBST(GCC_WARN_UNUSED_BUT_SET) - - LT_PREREQ([2.2]) - LT_INIT -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..51df0c0 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,74 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS], [INPUT]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# INPUT gives an alternative input source to AC_COMPILE_IFELSE. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 3 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([m4_default([$5],[AC_LANG_PROGRAM()])], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS --- -2.1.0 - diff --git a/package.bak/janus-gateway/Config.in b/package.bak/janus-gateway/Config.in deleted file mode 100644 index 5c7b63374b..0000000000 --- a/package.bak/janus-gateway/Config.in +++ /dev/null @@ -1,61 +0,0 @@ -menuconfig BR2_PACKAGE_JANUS_GATEWAY - bool "janus-gateway" - select BR2_PACKAGE_JANSSON - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBNICE - select BR2_PACKAGE_LIBSRTP - select BR2_PACKAGE_OPENSSL - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_WCHAR # libnice -> libglib2 - depends on BR2_USE_MMU # libnice - depends on !BR2_STATIC_LIBS # dlopen - help - Janus is an open source, general purpose, WebRTC gateway - designed and developed by Meetecho. - - https://github.com/meetecho/janus-gateway - -if BR2_PACKAGE_JANUS_GATEWAY - -comment "plugins" - -config BR2_PACKAGE_JANUS_AUDIO_BRIDGE - bool "audio bridge" - select BR2_PACKAGE_OPUS - -config BR2_PACKAGE_JANUS_ECHO_TEST - bool "echo test" - -config BR2_PACKAGE_JANUS_RECORDPLAY - bool "record and play" - -config BR2_PACKAGE_JANUS_SIP_GATEWAY - bool "sip gateway" - select BR2_PACKAGE_SOFIA_SIP - -config BR2_PACKAGE_JANUS_STREAMING - bool "streaming" - # SO_REUSEPORT - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - -comment "streaming plugin needs a toolchain w/ headers >= 3.9" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_9 - -config BR2_PACKAGE_JANUS_TEXT_ROOM - bool "text room" - -config BR2_PACKAGE_JANUS_VIDEO_CALL - bool "video call" - -config BR2_PACKAGE_JANUS_VIDEO_ROOM - bool "video room" - -config BR2_PACKAGE_JANUS_VOICE_MAIL - bool "voice mail" - select BR2_PACKAGE_LIBOGG - -endif - -comment "janus-gateway needs a toolchain w/ dynamic library, threads, wchar" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/janus-gateway/janus-gateway.hash b/package.bak/janus-gateway/janus-gateway.hash deleted file mode 100644 index 68b9c3117b..0000000000 --- a/package.bak/janus-gateway/janus-gateway.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 5d071592faca2a1574b996b4ca07b6c9e02cd42a719b0dbb4bfb5dfde8d55ff3 janus-gateway-v0.2.1.tar.gz diff --git a/package.bak/janus-gateway/janus-gateway.mk b/package.bak/janus-gateway/janus-gateway.mk deleted file mode 100644 index 212fa4739e..0000000000 --- a/package.bak/janus-gateway/janus-gateway.mk +++ /dev/null @@ -1,96 +0,0 @@ -################################################################################ -# -# janus-gateway -# -################################################################################ - -JANUS_GATEWAY_VERSION = v0.2.1 -JANUS_GATEWAY_SITE = $(call github,meetecho,janus-gateway,$(JANUS_GATEWAY_VERSION)) -JANUS_GATEWAY_LICENSE = GPLv3 -JANUS_GATEWAY_LICENSE_FILES = COPYING - -# ding-libs provides the ini_config library -JANUS_GATEWAY_DEPENDENCIES = host-pkgconf jansson libnice \ - libsrtp host-gengetopt libglib2 openssl - -# Straight out of the repository, no ./configure, and we also patch -# configure.ac. -JANUS_GATEWAY_AUTORECONF = YES - -define JANUS_GATEWAY_M4 - mkdir -p $(@D)/m4 -endef -JANUS_GATEWAY_POST_PATCH_HOOKS += JANUS_GATEWAY_M4 - -JANUS_GATEWAY_CONF_OPTS = \ - --disable-data-channels \ - --disable-rabbitmq - -ifeq ($(BR2_PACKAGE_JANUS_AUDIO_BRIDGE),y) -JANUS_GATEWAY_DEPENDENCIES += opus -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-audiobridge -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-audiobridge -endif - -ifeq ($(BR2_PACKAGE_JANUS_ECHO_TEST),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-echotest -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-echotest -endif - -ifeq ($(BR2_PACKAGE_JANUS_RECORDPLAY),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-recordplay -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-recordplay -endif - -ifeq ($(BR2_PACKAGE_JANUS_SIP_GATEWAY),y) -JANUS_GATEWAY_DEPENDENCIES += sofia-sip -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-sip -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-sip -endif - -ifeq ($(BR2_PACKAGE_JANUS_STREAMING),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-streaming -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-streaming -endif - -ifeq ($(BR2_PACKAGE_JANUS_TEXT_ROOM),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-textroom -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-textroom -endif - -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_CALL),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videocall -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videocall -endif - -ifeq ($(BR2_PACKAGE_JANUS_VIDEO_ROOM),y) -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-videoroom -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-videoroom -endif - -ifeq ($(BR2_PACKAGE_JANUS_VOICE_MAIL),y) -JANUS_GATEWAY_DEPENDENCIES += libogg -JANUS_GATEWAY_CONF_OPTS += --enable-plugin-voicemail -else -JANUS_GATEWAY_CONF_OPTS += --disable-plugin-voicemail -endif - -ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) -JANUS_GATEWAY_DEPENDENCIES += libwebsockets -JANUS_GATEWAY_CONF_OPTS += --enable-websockets -else -JANUS_GATEWAY_CONF_OPTS += --disable-websockets -endif - -# Parallel build broken -JANUS_GATEWAY_MAKE = $(MAKE1) - -$(eval $(autotools-package)) diff --git a/package.bak/jasper/0001-Disable-C-compiler-check.patch b/package.bak/jasper/0001-Disable-C-compiler-check.patch deleted file mode 100644 index c1f727109c..0000000000 --- a/package.bak/jasper/0001-Disable-C-compiler-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e4ed3e2c3fd5a859567f510deeb49a915d96700f Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sat, 14 Jan 2017 21:06:25 +0200 -Subject: [PATCH] Disable C++ compiler check - -jasper does not use C++ code. Allow use of toolchains without C++ support. - -Signed-off-by: Baruch Siach ---- -Upstream status: https://github.com/mdadams/jasper/pull/110 - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6c99b3e7df31..3ac166b060ad 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required (VERSION 2.8.11) - --project(JasPer) -+project(JasPer C) - - set(CMAKE_MODULE_PATH - ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/build/cmake/modules/") --- -2.11.0 - diff --git a/package.bak/jasper/Config.in b/package.bak/jasper/Config.in deleted file mode 100644 index 7296936570..0000000000 --- a/package.bak/jasper/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_JASPER - bool "jasper" - help - JPEG-2000 decoder - - http://www.ece.uvic.ca/~mdadams/jasper/ diff --git a/package.bak/jasper/jasper.hash b/package.bak/jasper/jasper.hash deleted file mode 100644 index 6c3ab473cf..0000000000 --- a/package.bak/jasper/jasper.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 54d85428e35263642358a11c312d61cbc054170546fae780e11271df5d1502e8 jasper-2.0.10.tar.gz diff --git a/package.bak/jasper/jasper.mk b/package.bak/jasper/jasper.mk deleted file mode 100644 index a243b9a1a7..0000000000 --- a/package.bak/jasper/jasper.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# jasper -# -################################################################################ - -JASPER_VERSION = 2.0.10 -JASPER_SITE = http://www.ece.uvic.ca/~frodo/jasper/software -JASPER_INSTALL_STAGING = YES -JASPER_LICENSE = JasPer License Version 2.0 -JASPER_LICENSE_FILES = LICENSE -JASPER_SUPPORTS_IN_SOURCE_BUILD = NO -JASPER_CONF_OPTS = \ - -DCMAKE_DISABLE_FIND_PACKAGE_DOXYGEN=TRUE \ - -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=TRUE - -ifeq ($(BR2_STATIC_LIBS),y) -JASPER_CONF_OPTS += -DJAS_ENABLE_SHARED=OFF -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=ON -JASPER_DEPENDENCIES += jpeg -else -JASPER_CONF_OPTS += -DJAS_ENABLE_LIBJPEG=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch b/package.bak/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch deleted file mode 100644 index ef5b857d41..0000000000 --- a/package.bak/jemalloc/0001-Fix-LG_QUANTUM-definition-for-sparc64.patch +++ /dev/null @@ -1,30 +0,0 @@ -From b3211bd6363ee6884c8db64008dc325a9c711bfb Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Thu, 14 Jul 2016 22:44:01 +0200 -Subject: [PATCH] Fix LG_QUANTUM definition for sparc64 - -GCC 4.9.3 cross-compiled for sparc64 defines __sparc_v9__, not -__sparc64__ nor __sparcv9. This prevents LG_QUANTUM from being defined -properly. Adding this new value to the check solves the issue. - -Signed-off-by: Eric Le Bihan ---- - include/jemalloc/internal/jemalloc_internal.h.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/jemalloc/internal/jemalloc_internal.h.in b/include/jemalloc/internal/jemalloc_internal.h.in -index 51bf897..ece15b2 100644 ---- a/include/jemalloc/internal/jemalloc_internal.h.in -+++ b/include/jemalloc/internal/jemalloc_internal.h.in -@@ -234,7 +234,7 @@ typedef unsigned szind_t; - # ifdef __alpha__ - # define LG_QUANTUM 4 - # endif --# if (defined(__sparc64__) || defined(__sparcv9)) -+# if (defined(__sparc64__) || defined(__sparcv9) || defined(__sparc_v9__)) - # define LG_QUANTUM 4 - # endif - # if (defined(__amd64__) || defined(__x86_64__) || defined(_M_X64)) --- -2.4.11 - diff --git a/package.bak/jemalloc/Config.in b/package.bak/jemalloc/Config.in deleted file mode 100644 index b1b92bb7c5..0000000000 --- a/package.bak/jemalloc/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb - default y if BR2_aarch64 || BR2_aarch64_be - default y if BR2_i386 || BR2_x86_64 - default y if BR2_mips || BR2_mipsel - default y if BR2_sparc64 - default y if BR2_powerpc - default y if BR2_sh4 || BR2sh4eb || BR2_sh4a || BR2_sh4aeb - -config BR2_PACKAGE_JEMALLOC - bool "jemalloc" - depends on BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - This library providing a malloc(3) implementation that emphasizes - fragmentation avoidance and scalable concurrency support. - - http://www.canonware.com/jemalloc/ - -comment "jemalloc needs a toolchain w/ dynamic library, threads" - depends on BR2_PACKAGE_JEMALLOC_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/jemalloc/jemalloc.hash b/package.bak/jemalloc/jemalloc.hash deleted file mode 100644 index b6c860baa6..0000000000 --- a/package.bak/jemalloc/jemalloc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5630650d5c1caab95d2f0898de4fe5ab8519dc680b04963b38bb425ef6a42d57 jemalloc-4.2.1.tar.bz2 diff --git a/package.bak/jemalloc/jemalloc.mk b/package.bak/jemalloc/jemalloc.mk deleted file mode 100644 index f1c9ffe622..0000000000 --- a/package.bak/jemalloc/jemalloc.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# jemalloc -# -################################################################################ - -JEMALLOC_VERSION = 4.2.1 -JEMALLOC_SOURCE = jemalloc-$(JEMALLOC_VERSION).tar.bz2 -JEMALLOC_SITE = http://www.canonware.com/download/jemalloc -JEMALLOC_LICENSE = BSD-2c -JEMALLOC_LICENSE_FILES = COPYING -JEMALLOC_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -JEMALLOC_DEPENDENCIES += valgrind -JEMALLOC_CONF_OPTS += --enable-valgrind -else -JEMALLOC_CONF_OPTS += --disable-valgrind -endif - -HOST_JEMALLOC_CONF_OPTS += --disable-valgrind - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/jhead/0001-use-ldflags.patch b/package.bak/jhead/0001-use-ldflags.patch deleted file mode 100644 index a1d8185a26..0000000000 --- a/package.bak/jhead/0001-use-ldflags.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make jhead use LDFLAGS for the final link. - -Signed-off-by: Gustavo Zacarias - -diff -Nura jhead-2.97.orig/makefile jhead-2.97/makefile ---- jhead-2.97.orig/makefile 2013-03-27 09:22:38.759966389 -0300 -+++ jhead-2.97/makefile 2013-03-27 09:25:06.290691745 -0300 -@@ -14,7 +14,7 @@ - ${CC} $(CFLAGS) -c $< -o $@ - - jhead: $(objs) jhead.h -- ${CC} -o jhead $(objs) -lm -+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm - - clean: - rm -f $(objs) jhead diff --git a/package.bak/jhead/Config.in b/package.bak/jhead/Config.in deleted file mode 100644 index 58498cd6e9..0000000000 --- a/package.bak/jhead/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_JHEAD - bool "jhead" - depends on BR2_USE_WCHAR - help - Jhead is a program for manipulating settings and thumbnails - in Exif jpeg headers used by most Digital Cameras. - - http://www.sentex.net/~mwandel/jhead/ - -comment "jhead needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/jhead/jhead.hash b/package.bak/jhead/jhead.hash deleted file mode 100644 index 55af7a7244..0000000000 --- a/package.bak/jhead/jhead.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated from download (no sig, hash) -sha256 88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e jhead-3.00.tar.gz diff --git a/package.bak/jhead/jhead.mk b/package.bak/jhead/jhead.mk deleted file mode 100644 index 8a99915bac..0000000000 --- a/package.bak/jhead/jhead.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# jhead -# -################################################################################ - -JHEAD_VERSION = 3.00 -JHEAD_SITE = http://www.sentex.net/~mwandel/jhead -JHEAD_LICENSE = Public Domain -JHEAD_LICENSE_FILES = readme.txt - -define JHEAD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define JHEAD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/jhead $(TARGET_DIR)/usr/bin/jhead -endef - -$(eval $(generic-package)) diff --git a/package.bak/jimtcl/Config.in b/package.bak/jimtcl/Config.in deleted file mode 100644 index 635fef14ec..0000000000 --- a/package.bak/jimtcl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_JIMTCL - bool "jimtcl" - help - Jim Tcl is a small footprint reimplementation of the Tcl - scripting language. The core language engine is compatible - with Tcl 8.5+, while implementing a significant subset of - the Tcl 8.6 command set, plus additional features available - only in Jim Tcl. - - http://jim.tcl.tk diff --git a/package.bak/jimtcl/jimtcl.hash b/package.bak/jimtcl/jimtcl.hash deleted file mode 100644 index 223dbcf57e..0000000000 --- a/package.bak/jimtcl/jimtcl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl/jimtcl_0.75-1.dsc -sha256 432ad29b98f33efd018d9e1d49a5d07a5efc523c5660983733f7e30d9b2b76cb jimtcl_0.75.orig.tar.xz diff --git a/package.bak/jimtcl/jimtcl.mk b/package.bak/jimtcl/jimtcl.mk deleted file mode 100644 index 1c1a6b82a3..0000000000 --- a/package.bak/jimtcl/jimtcl.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# jimtcl -# -################################################################################ - -JIMTCL_VERSION = 0.75 -JIMTCL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/j/jimtcl -JIMTCL_SOURCE = jimtcl_$(JIMTCL_VERSION).orig.tar.xz -JIMTCL_INSTALL_STAGING = YES -JIMTCL_LICENSE = BSD-2c -JIMTCL_LICENSE_FILES = LICENSE - -JIMTCL_HEADERS_TO_INSTALL = \ - jim.h \ - jim-eventloop.h \ - jim-signal.h \ - jim-subcmd.h \ - jim-win32compat.h \ - jim-config.h \ - -ifeq ($(BR2_PACKAGE_TCL),) -define JIMTCL_LINK_TCLSH - ln -sf jimsh $(TARGET_DIR)/usr/bin/tclsh -endef -endif - -ifeq ($(BR2_STATIC_LIBS),y) -define JIMTCL_INSTALL_LIB - $(INSTALL) -m 0644 -D $(@D)/libjim.a $(1)/usr/lib/libjim.a -endef -else -JIMTCL_SHARED = --shared -define JIMTCL_INSTALL_LIB - $(INSTALL) -m 0755 -D $(@D)/libjim.so.$(JIMTCL_VERSION) \ - $(1)/usr/lib/libjim.so.$(JIMTCL_VERSION) - ln -sf libjim.so.$(JIMTCL_VERSION) $(1)/usr/lib/libjim.so -endef -endif - -define JIMTCL_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) CCACHE=none \ - ./configure --prefix=/usr \ - $(JIMTCL_SHARED) \ - ) -endef - -# -fPIC is mandatory to build shared libraries on certain architectures -# (e.g. SPARC) and causes no harm or drawbacks on other architectures -define JIMTCL_BUILD_CMDS - SH_CFLAGS="-fPIC" \ - SHOBJ_CFLAGS="-fPIC" \ - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define JIMTCL_INSTALL_STAGING_CMDS - for i in $(JIMTCL_HEADERS_TO_INSTALL); do \ - cp -a $(@D)/$$i $(STAGING_DIR)/usr/include/ || exit 1 ; \ - done; \ - $(call JIMTCL_INSTALL_LIB,$(STAGING_DIR)) -endef - -define JIMTCL_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/jimsh $(TARGET_DIR)/usr/bin/jimsh - $(call JIMTCL_INSTALL_LIB,$(TARGET_DIR)) - $(JIMTCL_LINK_TCLSH) -endef - -$(eval $(generic-package)) diff --git a/package.bak/joe/0001-disable-bessel-functions-on-uclibc.patch b/package.bak/joe/0001-disable-bessel-functions-on-uclibc.patch deleted file mode 100644 index 9f7b72c170..0000000000 --- a/package.bak/joe/0001-disable-bessel-functions-on-uclibc.patch +++ /dev/null @@ -1,50 +0,0 @@ -[PATCH] uClibc can be (and by default is) configured without bessel functions - -Signed-off-by: Peter Korsgaard ---- - umath.c | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -Index: joe-3.7/umath.c -=================================================================== ---- joe-3.7.orig/umath.c -+++ joe-3.7/umath.c -@@ -7,6 +7,12 @@ - */ - #include "types.h" - -+/* uClibc can be configured without bessel functions */ -+#include -+#if defined (__UCLIBC__) && !defined(__DO_XSI_MATH__) -+#define NO_BESSEL -+#endif -+ - unsigned char *merr; - - int mode_hex; -@@ -396,10 +402,12 @@ - double m_fabs(double n) { return fabs(n); } - double m_erf(double n) { return erf(n); } - double m_erfc(double n) { return erfc(n); } -+#ifndef NO_BESSEL - double m_j0(double n) { return j0(n); } - double m_j1(double n) { return j1(n); } - double m_y0(double n) { return y0(n); } - double m_y1(double n) { return y1(n); } -+#endif - - double calc(BW *bw, unsigned char *s) - { -@@ -434,10 +442,12 @@ - v = get(USTR "abs"); v->func = m_fabs; - v = get(USTR "erf"); v->func = m_erf; - v = get(USTR "erfc"); v->func = m_erfc; -+#ifndef NO_BESSEL - v = get(USTR "j0"); v->func = m_j0; - v = get(USTR "j1"); v->func = m_j1; - v = get(USTR "y0"); v->func = m_y0; - v = get(USTR "y1"); v->func = m_y1; -+#endif - } - - v = get(USTR "top"); diff --git a/package.bak/joe/Config.in b/package.bak/joe/Config.in deleted file mode 100644 index eabfae78dc..0000000000 --- a/package.bak/joe/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_JOE - bool "joe" - depends on BR2_USE_MMU # fork() - help - Joe's Own Editor - - JOE is an easy-to-use, full featured terminal-based screen editor. - Its behavior is a blending of WordStar and GNU-EMACS (but it does - not use code from either program). It is a great editor for new - users or as an alternative to vi. - - http://joe-editor.sf.net - -config BR2_PACKAGE_JOE_FULL - bool "full install of rc and syntax highlighting files" - depends on BR2_PACKAGE_JOE - default y - help - Install all rc and syntax highlighting files. Without this option - only the joe binary is installed, which contains a default - configuration. diff --git a/package.bak/joe/joe.hash b/package.bak/joe/joe.hash deleted file mode 100644 index 664410d19f..0000000000 --- a/package.bak/joe/joe.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 cae456e1ad5a8c1d3c94920a3416c2347277739b260e3494d3bc0f2b9b73106f joe-3.7.tar.gz diff --git a/package.bak/joe/joe.mk b/package.bak/joe/joe.mk deleted file mode 100644 index e86007e0f7..0000000000 --- a/package.bak/joe/joe.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# joe -# -################################################################################ - -JOE_VERSION = 3.7 -JOE_SITE = http://downloads.sourceforge.net/project/joe-editor/JOE%20sources/joe-$(JOE_VERSION) -JOE_LICENSE = GPLv1+ -JOE_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_NCURSES),y) -JOE_DEPENDENCIES += ncurses -JOE_CONF_OPTS += --enable-curses -else -JOE_CONF_OPTS += --disable-curses -endif - -ifneq ($(BR2_PACKAGE_JOE_FULL),y) -define JOE_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/joe $(TARGET_DIR)/usr/bin/joe -endef -endif - -$(eval $(autotools-package)) diff --git a/package.bak/jpeg-turbo/jpeg-turbo.hash b/package.bak/jpeg-turbo/jpeg-turbo.hash deleted file mode 100644 index 93b245ebdb..0000000000 --- a/package.bak/jpeg-turbo/jpeg-turbo.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/libjpeg-turbo/files/1.5.1/ -sha1 ebb3f9e94044c77831a3e8c809c7ea7506944622 libjpeg-turbo-1.5.1.tar.gz -md5 55deb139b0cac3c8200b75d485fc13f3 libjpeg-turbo-1.5.1.tar.gz -# Locally computed -sha256 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c libjpeg-turbo-1.5.1.tar.gz diff --git a/package.bak/jpeg-turbo/jpeg-turbo.mk b/package.bak/jpeg-turbo/jpeg-turbo.mk deleted file mode 100644 index e2b7e63b9a..0000000000 --- a/package.bak/jpeg-turbo/jpeg-turbo.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# jpeg-turbo -# -################################################################################ - -JPEG_TURBO_VERSION = 1.5.1 -JPEG_TURBO_SOURCE = libjpeg-turbo-$(JPEG_TURBO_VERSION).tar.gz -JPEG_TURBO_SITE = http://downloads.sourceforge.net/project/libjpeg-turbo/$(JPEG_TURBO_VERSION) -JPEG_TURBO_LICENSE = jpeg-license (BSD-3c-like) -JPEG_TURBO_LICENSE_FILES = LICENSE.md -JPEG_TURBO_INSTALL_STAGING = YES -JPEG_TURBO_PROVIDES = jpeg -JPEG_TURBO_DEPENDENCIES = host-pkgconf - -JPEG_TURBO_CONF_OPTS = --with-jpeg8 - -ifeq ($(BR2_PACKAGE_JPEG_SIMD_SUPPORT),y) -JPEG_TURBO_CONF_OPTS += --with-simd -# x86 simd support needs nasm -JPEG_TURBO_DEPENDENCIES += $(if $(BR2_X86_CPU_HAS_MMX),host-nasm) -else -JPEG_TURBO_CONF_OPTS += --without-simd -endif - -define JPEG_TURBO_REMOVE_USELESS_TOOLS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom tjbench wrjpgcom) -endef - -JPEG_TURBO_POST_INSTALL_TARGET_HOOKS += JPEG_TURBO_REMOVE_USELESS_TOOLS - -$(eval $(autotools-package)) diff --git a/package.bak/jpeg/Config.in b/package.bak/jpeg/Config.in deleted file mode 100644 index a4a63cc7dc..0000000000 --- a/package.bak/jpeg/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_JPEG - bool "jpeg support" - help - Select the desired JPEG library provider. - -# jpeg-turbo has simd support for some architectures -config BR2_PACKAGE_JPEG_SIMD_SUPPORT - bool - default y if BR2_X86_CPU_HAS_MMX - default y if BR2_ARM_CPU_HAS_NEON - default y if BR2_POWERPC_CPU_HAS_ALTIVEC - default y if BR2_aarch64 || BR2_aarch64_be - -if BR2_PACKAGE_JPEG - -choice - prompt "jpeg variant" - default BR2_PACKAGE_JPEG_TURBO if BR2_PACKAGE_JPEG_SIMD_SUPPORT - help - Select the normal libjpeg or libjpeg-turbo. - -config BR2_PACKAGE_LIBJPEG - bool "jpeg" - select BR2_PACKAGE_HAS_JPEG - help - The ubiquitous C library for manipulating JPEG images. - - http://www.ijg.org/ - -config BR2_PACKAGE_JPEG_TURBO - bool "jpeg-turbo" - select BR2_PACKAGE_HAS_JPEG - help - Libjpeg-turbo is a derivative of libjpeg that uses SIMD - instructions (MMX, SSE2, NEON) to accelerate baseline JPEG - compression and decompression on x86, x86-64, and ARM - systems. - - http://www.libjpeg-turbo.org - -endchoice - -config BR2_PACKAGE_HAS_JPEG - bool - -config BR2_PACKAGE_PROVIDES_JPEG - string - default "libjpeg" if BR2_PACKAGE_LIBJPEG - default "jpeg-turbo" if BR2_PACKAGE_JPEG_TURBO - -endif diff --git a/package.bak/jpeg/jpeg.mk b/package.bak/jpeg/jpeg.mk deleted file mode 100644 index 2d56be6a7c..0000000000 --- a/package.bak/jpeg/jpeg.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# jpeg -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/jq/Config.in b/package.bak/jq/Config.in deleted file mode 100644 index 9329b2fb35..0000000000 --- a/package.bak/jq/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_JQ - bool "jq" - help - jq is like sed for JSON data - you can use it to slice and filter - and map and transform structured data with the same ease that sed, - awk, grep and friends let you play with text. - - http://stedolan.github.io/jq/ diff --git a/package.bak/jq/Config.in.host b/package.bak/jq/Config.in.host deleted file mode 100644 index a0aabc0b30..0000000000 --- a/package.bak/jq/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_JQ - bool "host jq" - help - jq is like sed for JSON data - you can use it to slice and filter - and map and transform structured data with the same ease that sed, - awk, grep and friends let you play with text. - - As a host tool, jq can be useful to create/edit/merge/check JSON - files from a post-build script. - - http://stedolan.github.io/jq/ diff --git a/package.bak/jq/jq.hash b/package.bak/jq/jq.hash deleted file mode 100644 index 2cd640563a..0000000000 --- a/package.bak/jq/jq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c4d2bfec6436341113419debf479d833692cc5cdab7eb0326b5a4d4fbe9f493c jq-1.5.tar.gz diff --git a/package.bak/jq/jq.mk b/package.bak/jq/jq.mk deleted file mode 100644 index 9a094ba9a0..0000000000 --- a/package.bak/jq/jq.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# jq -# -################################################################################ - -JQ_VERSION = 1.5 -JQ_SITE = https://github.com/stedolan/jq/releases/download/jq-$(JQ_VERSION) -JQ_LICENSE = MIT (code), CC-BY-3.0 (documentation) -JQ_LICENSE_FILES = COPYING - -# uses c99 specific features -JQ_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -std=c99" -HOST_JQ_CONF_ENV += CFLAGS="$(HOST_CFLAGS) -std=c99" - -# jq explicitly enables maintainer mode, which we don't need/want -JQ_CONF_OPTS += --disable-maintainer-mode -HOST_JQ_CONF_OPTS += --disable-maintainer-mode - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/jquery-datetimepicker/Config.in b/package.bak/jquery-datetimepicker/Config.in deleted file mode 100644 index 9da37188ae..0000000000 --- a/package.bak/jquery-datetimepicker/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_JQUERY_DATETIMEPICKER - bool "jquery-datetimepicker" - help - Use this plugin to unobtrusively add a datetimepicker, - datepicker or timepicker dropdown to your forms. - - http://xdsoft.net/jqplugins/datetimepicker diff --git a/package.bak/jquery-datetimepicker/jquery-datetimepicker.hash b/package.bak/jquery-datetimepicker/jquery-datetimepicker.hash deleted file mode 100644 index b6aba87920..0000000000 --- a/package.bak/jquery-datetimepicker/jquery-datetimepicker.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2f362a8acd149d1487a9460942f135d1037f01ee0cbfecba8c352fa2f79c34c9 jquery-datetimepicker-2.4.5.tar.gz diff --git a/package.bak/jquery-datetimepicker/jquery-datetimepicker.mk b/package.bak/jquery-datetimepicker/jquery-datetimepicker.mk deleted file mode 100644 index e4d47997f1..0000000000 --- a/package.bak/jquery-datetimepicker/jquery-datetimepicker.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# jquery-datetimepicker -# -################################################################################ - -JQUERY_DATETIMEPICKER_VERSION = 2.4.5 -JQUERY_DATETIMEPICKER_SITE = $(call github,xdan,datetimepicker,$(JQUERY_DATETIMEPICKER_VERSION)) -JQUERY_DATETIMEPICKER_LICENSE = MIT -JQUERY_DATETIMEPICKER_LICENSE_FILES = MIT-LICENSE.txt - -define JQUERY_DATETIMEPICKER_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/jquery.datetimepicker.css \ - $(TARGET_DIR)/var/www/jquery-plugins/datetimepicker/jquery.datetimepicker.css - $(INSTALL) -m 0644 -D $(@D)/jquery.datetimepicker.js \ - $(TARGET_DIR)/var/www/jquery-plugins/datetimepicker/jquery.datetimepicker.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-keyboard/Config.in b/package.bak/jquery-keyboard/Config.in deleted file mode 100644 index 117c4a5665..0000000000 --- a/package.bak/jquery-keyboard/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_JQUERY_KEYBOARD - bool "jquery-keyboard" - select BR2_PACKAGE_JQUERY_UI - help - Virtual Keyboard using jQuery UI - - https://github.com/Mottie/Keyboard diff --git a/package.bak/jquery-keyboard/jquery-keyboard.hash b/package.bak/jquery-keyboard/jquery-keyboard.hash deleted file mode 100644 index 7502867c86..0000000000 --- a/package.bak/jquery-keyboard/jquery-keyboard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6a20a1cdc9367c218048125eeb6f78d775175a964b3b9b781a931b63c0f98c66 jquery-keyboard-v1.18.12.tar.gz diff --git a/package.bak/jquery-keyboard/jquery-keyboard.mk b/package.bak/jquery-keyboard/jquery-keyboard.mk deleted file mode 100644 index a1320dc97a..0000000000 --- a/package.bak/jquery-keyboard/jquery-keyboard.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# jquery-keyboard -# -################################################################################ - -JQUERY_KEYBOARD_VERSION = v1.18.12 -JQUERY_KEYBOARD_SITE = $(call github,Mottie,Keyboard,$(JQUERY_KEYBOARD_VERSION)) -JQUERY_KEYBOARD_LICENSE = MIT WTFPL -JQUERY_KEYBOARD_LICENSE_FILES = README.markdown - -define JQUERY_KEYBOARD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/css/keyboard.css \ - $(TARGET_DIR)/var/www/css/keyboard.css - $(INSTALL) -m 0644 $(@D)/js/jquery.keyboard*.js \ - $(TARGET_DIR)/var/www - $(INSTALL) -m 0644 -D $(@D)/js/jquery.mousewheel.js \ - $(TARGET_DIR)/var/www/jquery.mousewheel.js - $(INSTALL) -m 0755 -d $(TARGET_DIR)/var/www/layouts - $(INSTALL) -m 0644 $(@D)/layouts/*.js \ - $(TARGET_DIR)/var/www/layouts -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-mobile/Config.in b/package.bak/jquery-mobile/Config.in deleted file mode 100644 index fa31a3630c..0000000000 --- a/package.bak/jquery-mobile/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_JQUERY_MOBILE - bool "jquery-mobile" - help - jQuery-Mobile is a unified, HTML5-based user interface - system for all popular mobile device platforms, built on the - rock-solid jQuery and jQuery UI foundation. Its lightweight - code is built with progressive enhancement, and has a - flexible, easily themeable design. - - http://jquerymobile.com - -if BR2_PACKAGE_JQUERY_MOBILE - -config BR2_PACKAGE_JQUERY_MOBILE_FULL - bool "jquery-mobile development files" - help - Installs the development versions. - -config BR2_PACKAGE_JQUERY_MOBILE_DEMOS - bool "jquery-mobile demo files" - help - Installs the demo files. - The main demo page is http://hostname/demos/index.html - -endif diff --git a/package.bak/jquery-mobile/jquery-mobile.hash b/package.bak/jquery-mobile/jquery-mobile.hash deleted file mode 100644 index 3dfaa07a06..0000000000 --- a/package.bak/jquery-mobile/jquery-mobile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 7ed156b191dc3e262e3f450aede43adfb738ff0085afed87eb18fe4f43dfc681 jquery.mobile-1.4.3.zip diff --git a/package.bak/jquery-mobile/jquery-mobile.mk b/package.bak/jquery-mobile/jquery-mobile.mk deleted file mode 100644 index 1067952904..0000000000 --- a/package.bak/jquery-mobile/jquery-mobile.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# jquery-mobile -# -################################################################################ - -JQUERY_MOBILE_VERSION = 1.4.3 -JQUERY_MOBILE_SITE = http://jquerymobile.com/resources/download -JQUERY_MOBILE_SOURCE = jquery.mobile-$(JQUERY_MOBILE_VERSION).zip -JQUERY_MOBILE_LICENSE = MIT - -define JQUERY_MOBILE_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_MOBILE_SOURCE) -endef - -JQUERY_MOBILE_INSTALLED_FILES = \ - jquery.mobile.structure-$(JQUERY_MOBILE_VERSION).min.css \ - jquery.mobile.theme-$(JQUERY_MOBILE_VERSION).min.css \ - jquery.mobile-$(JQUERY_MOBILE_VERSION).min.css \ - jquery.mobile-$(JQUERY_MOBILE_VERSION).min.map \ - jquery.mobile-$(JQUERY_MOBILE_VERSION).min.js - -ifeq ($(BR2_PACKAGE_JQUERY_MOBILE_FULL),y) -JQUERY_MOBILE_INSTALLED_FILES += \ - jquery.mobile.structure-$(JQUERY_MOBILE_VERSION).css \ - jquery.mobile.theme-$(JQUERY_MOBILE_VERSION).css \ - jquery.mobile-$(JQUERY_MOBILE_VERSION).css \ - jquery.mobile-$(JQUERY_MOBILE_VERSION).js -endif - -ifeq ($(BR2_PACKAGE_JQUERY_MOBILE_DEMOS),y) -define JQUERY_MOBILE_INSTALL_DEMOS - mkdir -p $(TARGET_DIR)/var/www/demos - cp -r $(@D)/demos/* $(TARGET_DIR)/var/www/demos -endef -endif - -define JQUERY_MOBILE_INSTALL_TARGET_CMDS - for f in $(JQUERY_MOBILE_INSTALLED_FILES) ; do \ - $(INSTALL) -m 0644 -D $(@D)/$$f $(TARGET_DIR)/var/www/$$f || break ; \ - done - mkdir -p $(TARGET_DIR)/var/www/images - cp -r $(@D)/images/* $(TARGET_DIR)/var/www/images - $(JQUERY_MOBILE_INSTALL_DEMOS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-sidebar/Config.in b/package.bak/jquery-sidebar/Config.in deleted file mode 100644 index 324a20c200..0000000000 --- a/package.bak/jquery-sidebar/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_JQUERY_SIDEBAR - bool "jquery-sidebar" - help - A stupid simple sidebar jQuery plugin. - - http://jillix.github.io/jQuery-sidebar/ diff --git a/package.bak/jquery-sidebar/jquery-sidebar.hash b/package.bak/jquery-sidebar/jquery-sidebar.hash deleted file mode 100644 index 60e44d4187..0000000000 --- a/package.bak/jquery-sidebar/jquery-sidebar.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c96e46439a87555f2200442f597cce64f21f81f94d7601ddfc3b837913ddb42f jquery-sidebar-3.3.2.tar.gz diff --git a/package.bak/jquery-sidebar/jquery-sidebar.mk b/package.bak/jquery-sidebar/jquery-sidebar.mk deleted file mode 100644 index 7af3667b62..0000000000 --- a/package.bak/jquery-sidebar/jquery-sidebar.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# jquery-sidebar -# -################################################################################ - -JQUERY_SIDEBAR_VERSION = 3.3.2 -JQUERY_SIDEBAR_SITE = $(call github,jillix,jQuery-sidebar,$(JQUERY_SIDEBAR_VERSION)) -JQUERY_SIDEBAR_LICENSE = MIT -JQUERY_SIDEBAR_LICENSE_FILES = LICENSE - -define JQUERY_SIDEBAR_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/src/jquery.sidebar.min.js \ - $(TARGET_DIR)/var/www/jquery-plugins/sidebar/jquery.sidebar.min.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-sparkline/Config.in b/package.bak/jquery-sparkline/Config.in deleted file mode 100644 index 1741a2941a..0000000000 --- a/package.bak/jquery-sparkline/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_JQUERY_SPARKLINE - bool "jquery-sparkline" - help - This jQuery plugin generates sparklines (small inline - charts) directly in the browser using data supplied either - inline in the HTML, or via javascript. - - The plugin is compatible with most modern browsers and has - been tested with Firefox 2+, Safari 3+, Opera 9, Google - Chrome and Internet Explorer 6, 7 & 8. - - http://www.omnipotent.net/jquery.sparkline/ diff --git a/package.bak/jquery-sparkline/jquery-sparkline.hash b/package.bak/jquery-sparkline/jquery-sparkline.hash deleted file mode 100644 index d8088bce00..0000000000 --- a/package.bak/jquery-sparkline/jquery-sparkline.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 06e0242da172ab85985db3774c54ac1b53391a5b447857a100c5118b8281a543 jquery.sparkline.min.js diff --git a/package.bak/jquery-sparkline/jquery-sparkline.mk b/package.bak/jquery-sparkline/jquery-sparkline.mk deleted file mode 100644 index 4a7b94ea35..0000000000 --- a/package.bak/jquery-sparkline/jquery-sparkline.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# jquery-sparkline -# -################################################################################ - -JQUERY_SPARKLINE_VERSION = 2.1.2 -JQUERY_SPARKLINE_SITE = http://www.omnipotent.net/jquery.sparkline/$(JQUERY_SPARKLINE_VERSION) -JQUERY_SPARKLINE_SOURCE = jquery.sparkline.min.js -JQUERY_SPARKLINE_LICENSE = BSD-3c - -define JQUERY_SPARKLINE_EXTRACT_CMDS - cp $(DL_DIR)/$(JQUERY_SPARKLINE_SOURCE) $(@D) -endef - -define JQUERY_SPARKLINE_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SPARKLINE_SOURCE) \ - $(TARGET_DIR)/var/www/jquery.sparkline.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-ui-themes/Config.in b/package.bak/jquery-ui-themes/Config.in deleted file mode 100644 index a7ae11eca6..0000000000 --- a/package.bak/jquery-ui-themes/Config.in +++ /dev/null @@ -1,117 +0,0 @@ -config BR2_PACKAGE_JQUERY_UI_THEMES - bool "jquery-ui-themes" - depends on BR2_PACKAGE_JQUERY_UI - help - Themes for jQuery UI. - - http://jqueryui.com/ - -if BR2_PACKAGE_JQUERY_UI_THEMES - -choice - prompt "theme to install" - help - Specify the jQuery UI theme to install. - - config BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE - bool "black-tie" - - config BR2_PACKAGE_JQUERY_UI_THEME_BLITZER - bool "blitzer" - - config BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO - bool "cupertino" - - config BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE - bool "dark-hive" - - config BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV - bool "dot-luv" - - config BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT - bool "eggplant" - - config BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE - bool "excite-bike" - - config BR2_PACKAGE_JQUERY_UI_THEME_FLICK - bool "flick" - - config BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS - bool "hot-sneaks" - - config BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY - bool "humanity" - - config BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG - bool "le-frog" - - config BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC - bool "mint-choc" - - config BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST - bool "overcast" - - config BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER - bool "pepper-grinder" - - config BR2_PACKAGE_JQUERY_UI_THEME_REDMOND - bool "redmond" - - config BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS - bool "smoothness" - - config BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET - bool "south-street" - - config BR2_PACKAGE_JQUERY_UI_THEME_START - bool "start" - - config BR2_PACKAGE_JQUERY_UI_THEME_SUNNY - bool "sunny" - - config BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE - bool "swanky-purse" - - config BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC - bool "trontastic" - - config BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS - bool "ui-darkness" - - config BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS - bool "ui-lightness" - - config BR2_PACKAGE_JQUERY_UI_THEME_VADER - bool "vader" - -endchoice - -config BR2_PACKAGE_JQUERY_UI_THEMES_THEME - string - default "black-tie" if BR2_PACKAGE_JQUERY_UI_THEME_BLACK_TIE - default "blitzer" if BR2_PACKAGE_JQUERY_UI_THEME_BLITZER - default "cupertino" if BR2_PACKAGE_JQUERY_UI_THEME_CUPERTINO - default "dark-hive" if BR2_PACKAGE_JQUERY_UI_THEME_DARK_HIVE - default "dot-luv" if BR2_PACKAGE_JQUERY_UI_THEME_DOT_LUV - default "eggplant" if BR2_PACKAGE_JQUERY_UI_THEME_EGGPLANT - default "excite-bike" if BR2_PACKAGE_JQUERY_UI_THEME_EXCITE_BIKE - default "flick" if BR2_PACKAGE_JQUERY_UI_THEME_FLICK - default "hot-sneaks" if BR2_PACKAGE_JQUERY_UI_THEME_HOT_SNEAKS - default "humanity" if BR2_PACKAGE_JQUERY_UI_THEME_HUMANITY - default "le-frog" if BR2_PACKAGE_JQUERY_UI_THEME_LE_FROG - default "mint-choc" if BR2_PACKAGE_JQUERY_UI_THEME_MINT_CHOC - default "overcast" if BR2_PACKAGE_JQUERY_UI_THEME_OVERCAST - default "pepper-grinder" if BR2_PACKAGE_JQUERY_UI_THEME_PEPPER_GRINDER - default "redmond" if BR2_PACKAGE_JQUERY_UI_THEME_REDMOND - default "smoothness" if BR2_PACKAGE_JQUERY_UI_THEME_SMOOTHNESS - default "south-street" if BR2_PACKAGE_JQUERY_UI_THEME_SOUTH_STREET - default "start" if BR2_PACKAGE_JQUERY_UI_THEME_START - default "sunny" if BR2_PACKAGE_JQUERY_UI_THEME_SUNNY - default "swanky-purse" if BR2_PACKAGE_JQUERY_UI_THEME_SWANKY_PURSE - default "trontastic" if BR2_PACKAGE_JQUERY_UI_THEME_TRONTASTIC - default "ui-darkness" if BR2_PACKAGE_JQUERY_UI_THEME_UI_DARKNESS - default "ui-lightness" if BR2_PACKAGE_JQUERY_UI_THEME_UI_LIGHTNESS - default "vader" if BR2_PACKAGE_JQUERY_UI_THEME_UI_VADER - -endif diff --git a/package.bak/jquery-ui-themes/jquery-ui-themes.hash b/package.bak/jquery-ui-themes/jquery-ui-themes.hash deleted file mode 100644 index 5441789b99..0000000000 --- a/package.bak/jquery-ui-themes/jquery-ui-themes.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 90467a83abcb8d2471b0d53d21b4c09e2cf686d5350e10a6e84fa3f3616a840f jquery-ui-themes-1.10.4.zip diff --git a/package.bak/jquery-ui-themes/jquery-ui-themes.mk b/package.bak/jquery-ui-themes/jquery-ui-themes.mk deleted file mode 100644 index cd3dab6d87..0000000000 --- a/package.bak/jquery-ui-themes/jquery-ui-themes.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# jquery-ui-themes -# -################################################################################ - -JQUERY_UI_THEMES_VERSION = 1.10.4 -JQUERY_UI_THEMES_SITE = http://jqueryui.com/resources/download -JQUERY_UI_THEMES_SOURCE = jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION).zip -JQUERY_UI_THEMES_LICENSE = MIT -JQUERY_UI_THEMES_LICENSE_FILES = MIT-LICENSE.txt -JQUERY_UI_THEMES_DEPENDENCIES = jquery-ui - -define JQUERY_UI_THEMES_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_THEMES_SOURCE) - mv $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION)/* $(@D) - $(RM) -r $(@D)/jquery-ui-themes-$(JQUERY_UI_THEMES_VERSION) -endef - -define JQUERY_UI_THEMES_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D \ - $(@D)/themes/$(call qstrip,$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME))/jquery-ui.css \ - $(TARGET_DIR)/var/www/jquery-ui.css - $(INSTALL) -d $(TARGET_DIR)/var/www/images - cp -a $(@D)/themes/$(call qstrip,$(BR2_PACKAGE_JQUERY_UI_THEMES_THEME))/images/*.png \ - $(TARGET_DIR)/var/www/images - chmod 0644 $(TARGET_DIR)/var/www/images/*.png -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-ui/Config.in b/package.bak/jquery-ui/Config.in deleted file mode 100644 index a7c0a6df5a..0000000000 --- a/package.bak/jquery-ui/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_JQUERY_UI - bool "jquery-ui" - help - jQuery UI provides abstractions for low-level interaction and - animation, advanced effects and high-level, themeable widgets, - built on top of the jQuery JavaScript Library, that you can use - to build highly interactive web applications. - - http://jqueryui.com/ diff --git a/package.bak/jquery-ui/jquery-ui.hash b/package.bak/jquery-ui/jquery-ui.hash deleted file mode 100644 index daf89d095c..0000000000 --- a/package.bak/jquery-ui/jquery-ui.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 c76f349930245360f4d1dea672b9a587f8938b536a378e20eeff919f7263f99f jquery-ui-1.10.4.zip diff --git a/package.bak/jquery-ui/jquery-ui.mk b/package.bak/jquery-ui/jquery-ui.mk deleted file mode 100644 index d829d6241b..0000000000 --- a/package.bak/jquery-ui/jquery-ui.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# jquery-ui -# -################################################################################ - -JQUERY_UI_VERSION = 1.10.4 -# Use buildroot mirror since upstream switched the zipfile and directory -# structure without bumping/renaming. -# Remember to switch back to jqueryui.com when bumping! -JQUERY_UI_SITE = http://sources.buildroot.net -JQUERY_UI_SOURCE = jquery-ui-$(JQUERY_UI_VERSION).zip -JQUERY_UI_LICENSE = MIT -JQUERY_UI_LICENSE_FILES = MIT-LICENSE.txt - -define JQUERY_UI_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_UI_SOURCE) - mv $(@D)/jquery-ui-$(JQUERY_UI_VERSION)/* $(@D) - $(RM) -r $(@D)/jquery-ui-$(JQUERY_UI_VERSION) -endef - -define JQUERY_UI_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/ui/minified/jquery-ui.min.js \ - $(TARGET_DIR)/var/www/jquery-ui.js - $(INSTALL) -m 0644 -D $(@D)/ui/minified/i18n/jquery-ui-i18n.min.js \ - $(TARGET_DIR)/var/www/jquery-ui-i18n.js - $(INSTALL) -m 0644 -D $(@D)/themes/base/minified/jquery-ui.min.css \ - $(TARGET_DIR)/var/www/jquery-ui.css - $(INSTALL) -d $(TARGET_DIR)/var/www/images - $(INSTALL) -m 0644 -t $(TARGET_DIR)/var/www/images \ - $(@D)/themes/base/minified/images/*.png -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery-validation/Config.in b/package.bak/jquery-validation/Config.in deleted file mode 100644 index 39e898e853..0000000000 --- a/package.bak/jquery-validation/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_JQUERY_VALIDATION - bool "jquery-validation" - help - The jQuery Validation Plugin provides drop-in validation for - your existing forms, while making all kinds of - customizations to fit your application really easy. - - http://jqueryvalidation.org/ diff --git a/package.bak/jquery-validation/jquery-validation.hash b/package.bak/jquery-validation/jquery-validation.hash deleted file mode 100644 index 61c16cf093..0000000000 --- a/package.bak/jquery-validation/jquery-validation.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 14efe6f1784ef6e97116b15c77b04b7e8f47ec07b1479bcd6fa0b081faa19440 jquery-validation-1.14.0.zip diff --git a/package.bak/jquery-validation/jquery-validation.mk b/package.bak/jquery-validation/jquery-validation.mk deleted file mode 100644 index 10d2a92afc..0000000000 --- a/package.bak/jquery-validation/jquery-validation.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# jquery-validation -# -################################################################################ - -JQUERY_VALIDATION_VERSION = 1.14.0 -JQUERY_VALIDATION_SITE = http://jqueryvalidation.org/files -JQUERY_VALIDATION_SOURCE = jquery-validation-$(JQUERY_VALIDATION_VERSION).zip -JQUERY_VALIDATION_LICENSE = MIT -JQUERY_VALIDATION_LICENSE_FILES = README.md - -define JQUERY_VALIDATION_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(JQUERY_VALIDATION_SOURCE) -endef - -define JQUERY_VALIDATION_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/dist/jquery.validate.min.js \ - $(TARGET_DIR)/var/www/jquery.validate.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jquery/Config.in b/package.bak/jquery/Config.in deleted file mode 100644 index 92f5604270..0000000000 --- a/package.bak/jquery/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_JQUERY - bool "jQuery" - help - jQuery is a fast and concise JavaScript Library that - simplifies HTML document traversing, event handling, - animating, and Ajax interactions for rapid web development. - - http://jquery.com diff --git a/package.bak/jquery/jquery.hash b/package.bak/jquery/jquery.hash deleted file mode 100644 index ec43e7cd7a..0000000000 --- a/package.bak/jquery/jquery.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hashes, not provided by upstream -sha256 2ecd295d295bec062cedebe177e54b9d6b19fc0a841dc5c178c654c9ccff09c0 jquery-1.11.2.min.js diff --git a/package.bak/jquery/jquery.mk b/package.bak/jquery/jquery.mk deleted file mode 100644 index 363ee09633..0000000000 --- a/package.bak/jquery/jquery.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# jquery -# -################################################################################ - -JQUERY_VERSION = 1.11.2 -JQUERY_SITE = http://code.jquery.com -JQUERY_SOURCE = jquery-$(JQUERY_VERSION).min.js -JQUERY_LICENSE = MIT - -define JQUERY_EXTRACT_CMDS - cp $(DL_DIR)/$(JQUERY_SOURCE) $(@D) -endef - -define JQUERY_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/$(JQUERY_SOURCE) \ - $(TARGET_DIR)/var/www/jquery.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jsmin/Config.in b/package.bak/jsmin/Config.in deleted file mode 100644 index d0948b8914..0000000000 --- a/package.bak/jsmin/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_JSMIN - bool "jsmin" - help - JSMin is a filter which removes comments and unnecessary - whitespace from JavaScript files. It typically reduces - filesize by half, resulting in faster downloads. It also - encourages a more expressive programming style because it - eliminates the download cost of clean, literate - self-documentation. - - http://www.crockford.com/javascript/jsmin.html diff --git a/package.bak/jsmin/Config.in.host b/package.bak/jsmin/Config.in.host deleted file mode 100644 index 25ec9bb859..0000000000 --- a/package.bak/jsmin/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_JSMIN - bool "host jsmin" - help - JSMin is a filter which removes comments and unnecessary - whitespace from JavaScript files. It typically reduces - filesize by half, resulting in faster downloads. It also - encourages a more expressive programming style because it - eliminates the download cost of clean, literate - self-documentation. - - http://www.crockford.com/javascript/jsmin.html diff --git a/package.bak/jsmin/jsmin.hash b/package.bak/jsmin/jsmin.hash deleted file mode 100644 index 6080f109dc..0000000000 --- a/package.bak/jsmin/jsmin.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 aae127bf7291a7b2592f36599e5ed6c6423eac7abe0cd5992f82d6d46fe9ed2d jsmin-1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b.tar.gz diff --git a/package.bak/jsmin/jsmin.mk b/package.bak/jsmin/jsmin.mk deleted file mode 100644 index a66ba71582..0000000000 --- a/package.bak/jsmin/jsmin.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# jsmin -# -################################################################################ - -JSMIN_VERSION = 1bf6ce5f74a9f8752ac7f5d115b8d7ccb31cfe1b -JSMIN_SITE = $(call github,douglascrockford,JSMin,$(JSMIN_VERSION)) -JSMIN_LICENSE = MIT -JSMIN_LICENSE_FILES = jsmin.c - -define JSMIN_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin -endef - -define JSMIN_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/jsmin $(TARGET_DIR)/usr/bin/jsmin -endef - -define HOST_JSMIN_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) jsmin -endef - -define HOST_JSMIN_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/jsmin $(HOST_DIR)/usr/bin/jsmin -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/jsmn/Config.in b/package.bak/jsmn/Config.in deleted file mode 100644 index ab14273221..0000000000 --- a/package.bak/jsmn/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_JSMN - bool "jsmn" - help - jsmn (pronounced like 'jasmine') is a minimalistic JSON - parser in C. It can be easily integrated into - resource-limited or embedded projects. - - https://github.com/zserge/jsmn/ diff --git a/package.bak/jsmn/jsmn.hash b/package.bak/jsmn/jsmn.hash deleted file mode 100644 index 91f64201e7..0000000000 --- a/package.bak/jsmn/jsmn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e08993848b2abab62aa9572a560bb6e5ed4762f8537cd67c4de6cb17e17090a0 jsmn-6021415cc75e7922d45b12935f56348b064d8a7f.tar.gz diff --git a/package.bak/jsmn/jsmn.mk b/package.bak/jsmn/jsmn.mk deleted file mode 100644 index c98f2798ee..0000000000 --- a/package.bak/jsmn/jsmn.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# jsmn -# -################################################################################ - -JSMN_VERSION = 6021415cc75e7922d45b12935f56348b064d8a7f -JSMN_SITE = $(call github,zserge,jsmn,$(JSMN_VERSION)) -JSMN_LICENSE = MIT -JSMN_LICENSE_FILES = LICENSE -# static library only -JSMN_INSTALL_STAGING = YES -JSMN_INSTALL_TARGET = NO - -define JSMN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define JSMN_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/libjsmn.a $(STAGING_DIR)/usr/lib/libjsmn.a - $(INSTALL) -D -m 0644 $(@D)/jsmn.h $(STAGING_DIR)/usr/include/jsmn.h -endef - -$(eval $(generic-package)) diff --git a/package.bak/json-c/0001-don-t-threat-warnings-as-errors.patch b/package.bak/json-c/0001-don-t-threat-warnings-as-errors.patch deleted file mode 100644 index 804fb2cd33..0000000000 --- a/package.bak/json-c/0001-don-t-threat-warnings-as-errors.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 2b4a43a94fb988e344f2d7edc74d6a4a5f64571d Mon Sep 17 00:00:00 2001 -From: Sagaert Johan -Date: Wed, 15 Apr 2015 00:40:46 +0200 -Subject: [PATCH] don't threat warnings as errors - -Signed-off-by: Sagaert Johan ---- - Makefile.am.inc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am.inc b/Makefile.am.inc -index fec591b..5eb461e 100644 ---- a/Makefile.am.inc -+++ b/Makefile.am.inc -@@ -1,2 +1,2 @@ --AM_CFLAGS = -Wall -Werror -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -Wno-unused-parameter -std=gnu99 -D_GNU_SOURCE -D_REENTRANT -+AM_CFLAGS = -Wall -Wno-error=deprecated-declarations -Wextra -Wwrite-strings -std=gnu99 -D_GNU_SOURCE -D_REENTRANT - --- -2.1.0 - diff --git a/package.bak/json-c/0002-Link-against-libm-when-needed.patch b/package.bak/json-c/0002-Link-against-libm-when-needed.patch deleted file mode 100644 index 305b782f76..0000000000 --- a/package.bak/json-c/0002-Link-against-libm-when-needed.patch +++ /dev/null @@ -1,53 +0,0 @@ -From ccb15ee3d7e8c925cb3af9ea805feea2863c4f81 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 1 May 2015 12:52:18 +0200 -Subject: [PATCH] Link against libm when needed - -In certain C libraries (e.g uClibc), isnan() and related functions are -implemented in libm, so json-c needs to link against it. This commit -therefore adds an AC_TRY_LINK() test to check whether a program -calling isnan() can be properly linked with no special flags. If not, -we assume linking against libm is needed. - -The json-c.pc.in file is also adjusted so that in the case of static -linking against json-c, -lm is also used. - -Submitted upstream: https://github.com/json-c/json-c/pull/182 - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 4 ++++ - json-c.pc.in | 3 ++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 99660a4..2a14ccf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,6 +50,10 @@ AC_CHECK_DECLS([isinf], [], [], [[#include ]]) - AC_CHECK_DECLS([_isnan], [], [], [[#include ]]) - AC_CHECK_DECLS([_finite], [], [], [[#include ]]) - -+if test "$ac_cv_have_decl_isnan" = "yes" ; then -+ AC_TRY_LINK([#include ], [float f = 0.0; return isnan(f)], [], [LIBS="$LIBS -lm"]) -+fi -+ - #check if .section.gnu.warning accepts long strings (for __warn_references) - AC_LANG_PUSH([C]) - -diff --git a/json-c.pc.in b/json-c.pc.in -index 037739d..05bfbc8 100644 ---- a/json-c.pc.in -+++ b/json-c.pc.in -@@ -6,6 +6,7 @@ includedir=@includedir@ - Name: json-c - Description: JSON implementation in C - Version: @VERSION@ --Requires: -+Requires: -+Libs.private: @LIBS@ - Libs: -L${libdir} -ljson-c - Cflags: -I${includedir}/json-c --- -2.1.0 - diff --git a/package.bak/json-c/Config.in b/package.bak/json-c/Config.in deleted file mode 100644 index 4df44a96ab..0000000000 --- a/package.bak/json-c/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_JSON_C - bool "json-c" - # uses __sync_val_compare_and_swap_4 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - help - JSON-C - A JSON implementation in C - - JSON-C implements a reference counting object model that - allows you to easily construct JSON objects in C, output - them as JSON formatted strings and parse JSON formatted - strings back into the C representation of JSON objects. - - https://github.com/json-c/json-c/ diff --git a/package.bak/json-c/json-c.hash b/package.bak/json-c/json-c.hash deleted file mode 100644 index 6550895560..0000000000 --- a/package.bak/json-c/json-c.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 99304a4a633f1ee281d6a521155a182824dd995139d5ed6ee5c93093c281092b json-c-json-c-0.12-20140410.tar.gz diff --git a/package.bak/json-c/json-c.mk b/package.bak/json-c/json-c.mk deleted file mode 100644 index 35243f13a1..0000000000 --- a/package.bak/json-c/json-c.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# json-c -# -################################################################################ - -JSON_C_VERSION = json-c-0.12-20140410 -JSON_C_SITE = $(call github,json-c,json-c,$(JSON_C_VERSION)) -JSON_C_INSTALL_STAGING = YES -JSON_C_MAKE = $(MAKE1) -JSON_C_CONF_OPTS = --disable-oldname-compat -# AUTORECONF is needed because of Makefile.am.inc patch. -JSON_C_AUTORECONF = YES -JSON_C_LICENSE = MIT -JSON_C_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/json-glib/Config.in b/package.bak/json-glib/Config.in deleted file mode 100644 index ea15295b38..0000000000 --- a/package.bak/json-glib/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_JSON_GLIB - bool "json-glib" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - JSON-GLib is a library providing serialization and - deserialization support for the JavaScript Object Notation - (JSON) format described by RFC 4627. - - https://live.gnome.org/JsonGlib/ - -comment "json-glib needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/json-glib/json-glib.hash b/package.bak/json-glib/json-glib.hash deleted file mode 100644 index 2a5693934b..0000000000 --- a/package.bak/json-glib/json-glib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/json-glib/1.2/json-glib-1.2.2.sha256sum -sha256 ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621 json-glib-1.2.2.tar.xz diff --git a/package.bak/json-glib/json-glib.mk b/package.bak/json-glib/json-glib.mk deleted file mode 100644 index 305c9acc79..0000000000 --- a/package.bak/json-glib/json-glib.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# json-glib -# -################################################################################ - -JSON_GLIB_VERSION_MAJOR = 1.2 -JSON_GLIB_VERSION = $(JSON_GLIB_VERSION_MAJOR).2 -JSON_GLIB_SITE = http://ftp.gnome.org/pub/GNOME/sources/json-glib/$(JSON_GLIB_VERSION_MAJOR) -JSON_GLIB_SOURCE = json-glib-$(JSON_GLIB_VERSION).tar.xz -JSON_GLIB_LICENSE = LGPLv2.1+ -JSON_GLIB_LICENSE_FILES = COPYING -JSON_GLIB_INSTALL_STAGING = YES - -JSON_GLIB_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - host-pkgconf \ - libglib2 - -$(eval $(autotools-package)) diff --git a/package.bak/json-javascript/Config.in b/package.bak/json-javascript/Config.in deleted file mode 100644 index 501c54f3d1..0000000000 --- a/package.bak/json-javascript/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_JSON_JAVASCRIPT - bool "json-javascript" - help - JSON in JavaScript - - https://github.com/douglascrockford/JSON-js/ diff --git a/package.bak/json-javascript/json-javascript.hash b/package.bak/json-javascript/json-javascript.hash deleted file mode 100644 index 6216445ce0..0000000000 --- a/package.bak/json-javascript/json-javascript.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1a9dd4429e4bb4929dcb438f9591a3625bc8cc161f840b5f843d8b1d2c8dcfe5 json-javascript-3d7767b6b1f3da363c625ff54e63bbf20e9e83ac.tar.gz diff --git a/package.bak/json-javascript/json-javascript.mk b/package.bak/json-javascript/json-javascript.mk deleted file mode 100644 index c15b5319b3..0000000000 --- a/package.bak/json-javascript/json-javascript.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# json-javascript -# -################################################################################ - -JSON_JAVASCRIPT_VERSION = 3d7767b6b1f3da363c625ff54e63bbf20e9e83ac -JSON_JAVASCRIPT_SITE = $(call github,douglascrockford,JSON-js,$(JSON_JAVASCRIPT_VERSION)) -JSON_JAVASCRIPT_LICENSE = Public Domain -JSON_JAVASCRIPT_LICENSE_FILES = json2.js - -define JSON_JAVASCRIPT_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/json2.js $(TARGET_DIR)/var/www/json2.js -endef - -$(eval $(generic-package)) diff --git a/package.bak/jsoncpp/Config.in b/package.bak/jsoncpp/Config.in deleted file mode 100644 index 83118c400c..0000000000 --- a/package.bak/jsoncpp/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_JSONCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - depends on BR2_INSTALL_LIBSTDCPP - bool "jsoncpp" - help - JsonCpp is a C++ library that allows manipulating JSON - values, including serialization and deserialization to and - from strings. It can also preserve existing comment in - unserialization/serialization steps, making it a convenient - format to store user input files. - - https://github.com/open-source-parsers/jsoncpp - -comment "jsoncpp needs a toolchain w/ C++, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/jsoncpp/jsoncpp.hash b/package.bak/jsoncpp/jsoncpp.hash deleted file mode 100644 index 504357f163..0000000000 --- a/package.bak/jsoncpp/jsoncpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 087640ebcf7fbcfe8e2717a0b9528fff89c52fcf69fa2a18cc2b538008098f97 jsoncpp-1.7.7.tar.gz diff --git a/package.bak/jsoncpp/jsoncpp.mk b/package.bak/jsoncpp/jsoncpp.mk deleted file mode 100644 index a9694411c9..0000000000 --- a/package.bak/jsoncpp/jsoncpp.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# jsoncpp -# -################################################################################ - -JSONCPP_VERSION = 1.7.7 -JSONCPP_SITE = $(call github,open-source-parsers,jsoncpp,$(JSONCPP_VERSION)) -JSONCPP_LICENSE = Public Domain or MIT -JSONCPP_LICENSE_FILES = LICENSE -JSONCPP_INSTALL_STAGING = YES - -JSONCPP_CONF_OPTS += \ - -DJSONCPP_WITH_POST_BUILD_UNITTEST=OFF \ - -DJSONCPP_WITH_TESTS=OFF \ - -DJSONCPP_WITH_STRICT_ISO=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/kbd/0001-add-configure-flag-to-disable-tests.patch b/package.bak/kbd/0001-add-configure-flag-to-disable-tests.patch deleted file mode 100644 index 28983e97a0..0000000000 --- a/package.bak/kbd/0001-add-configure-flag-to-disable-tests.patch +++ /dev/null @@ -1,64 +0,0 @@ -From baeb5aa827d956bd06492775dc5bd9f89d394149 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Mon, 13 Jul 2015 23:38:41 -0400 -Subject: [PATCH] add configure flag to disable tests - -The tests require the check package to be installed. There is a configure -test for this package (which is good), but it's unconditional (which is -bad) as it means you can't even build & install kbd w/out the check -package being installed. - -URL: https://bugs.gentoo.org/485116 -Reported-by: Arfrever Frehtes Taifersar Arahesis ---- - Makefile.am | 5 ++++- - configure.ac | 17 +++++++++++++++-- - 2 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89c7e83..f855110 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -8,7 +8,10 @@ EXTRA_DIST = \ - CREDITS \ - contrib docs rc - --SUBDIRS = src data po tests docs -+SUBDIRS = src data po docs -+if BUILD_TESTS -+SUBDIRS += tests -+endif - - kbd-$(VERSION).tar.xz: - make distcheck -diff --git a/configure.ac b/configure.ac -index d0b462b..f659758 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,8 +10,21 @@ AC_CONFIG_MACRO_DIR([m4]) - AM_INIT_AUTOMAKE([1.9 -Wall color-tests dist-xz]) - AC_CONFIG_SRCDIR([src/loadkeys.c]) - AC_CONFIG_HEADERS(config.h) -- --PKG_CHECK_MODULES([CHECK], [check >= 0.9.4]) -+PKG_PROG_PKG_CONFIG -+ -+AC_ARG_ENABLE(tests, -+ [AS_HELP_STRING([--disable-tests], [do not build tests])], -+ [build_tests=$enableval], [build_tests=auto]) -+if test "$build_tests" != "no"; then -+ PKG_CHECK_MODULES([CHECK], [check >= 0.9.4], -+ [build_tests="yes"], [ -+ if test "$build_tests" = "yes"; then -+ AC_MSG_ERROR([tests requested, but check package is missing]) -+ fi -+ build_tests="no" -+ ]) -+fi -+AM_CONDITIONAL(BUILD_TESTS, test "$build_tests" != "no") - - m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) - AM_SILENT_RULES([yes]) --- -2.6.4 - diff --git a/package.bak/kbd/0002-Link-against-libintl-when-needed.patch b/package.bak/kbd/0002-Link-against-libintl-when-needed.patch deleted file mode 100644 index d28f0c809c..0000000000 --- a/package.bak/kbd/0002-Link-against-libintl-when-needed.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 008e7dc0ae46281360be62b7d69cd13e0a7f7e14 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 18:24:35 +0100 -Subject: [PATCH] Link against libintl when needed - -Since the kbd code uses gettext functionality, it should link with the -libintl library using the @INTLLIBS@ symbol provided by the gettext m4 -macro. This is necessary on C libraries that don't provide a built-in -gettext functionality, and rely on the libintl library provided by -gettext, as is the case with the uClibc C library. - -@INTLLIBS@ is empty when linking a separate library is not needed, as -is the case with the glibc C library. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 40e8083..d4e0583 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -80,7 +80,7 @@ mapscrn_CFLAGS = -DMAIN - loadunimap_CFLAGS = -DMAIN - - noinst_LIBRARIES = libcommon.a libfont.a --LDADD = libcommon.a libfont.a libkeymap/libkeymap.la -+LDADD = libcommon.a libfont.a libkeymap/libkeymap.la @INTLLIBS@ - - install-exec-hook: - for i in psfaddtable psfgettable psfstriptable; do \ -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 1976333..848fd31 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -4,7 +4,7 @@ AM_CPPFLAGS = \ - -DDATADIR=\"$(srcdir)\" -DBUILDDIR=\"$(builddir)\" - - AM_CFLAGS = $(CHECK_CFLAGS) --LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) -+LDADD = $(top_builddir)/src/libkeymap/libkeymap.la $(CHECK_LIBS) @INTLLIBS@ - - EXTRA_DIST = \ - alt-is-meta.in \ --- -2.6.4 - diff --git a/package.bak/kbd/Config.in b/package.bak/kbd/Config.in deleted file mode 100644 index 44c3163388..0000000000 --- a/package.bak/kbd/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_KBD - bool "kbd" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - # Uses fork() - depends on BR2_USE_MMU - help - Keytable files and keyboard utilities. - - http://kernel.org/pub/linux/utils/kbd/ diff --git a/package.bak/kbd/kbd.hash b/package.bak/kbd/kbd.hash deleted file mode 100644 index 39a4cddb6e..0000000000 --- a/package.bak/kbd/kbd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/kbd/sha256sums.asc -sha256 7a899de1c0eb75f3aea737095a736f2375e1cbfbe693fc14a3fe0bfb4649fb5e kbd-2.0.3.tar.xz diff --git a/package.bak/kbd/kbd.mk b/package.bak/kbd/kbd.mk deleted file mode 100644 index 0243c53265..0000000000 --- a/package.bak/kbd/kbd.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# kbd -# -################################################################################ - -KBD_VERSION = 2.0.3 -KBD_SOURCE = kbd-$(KBD_VERSION).tar.xz -KBD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kbd -KBD_CONF_OPTS = \ - --disable-vlock \ - --disable-tests -KBD_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - host-pkgconf -KBD_LICENSE = GPLv2+ -KBD_LICENSE_FILES = COPYING -KBD_AUTORECONF = YES - -KBD_INSTALL_TARGET_OPTS = MKINSTALLDIRS=$(@D)/config/mkinstalldirs DESTDIR=$(TARGET_DIR) install - -$(eval $(autotools-package)) diff --git a/package.bak/kexec-lite/0001-clean-restart.patch b/package.bak/kexec-lite/0001-clean-restart.patch deleted file mode 100644 index faaa93a046..0000000000 --- a/package.bak/kexec-lite/0001-clean-restart.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 0a654c20e1b9324c57ba4116b52fb6ab33847e1d Mon Sep 17 00:00:00 2001 -From: Jeremy Kerr -Date: Thu, 8 Aug 2013 17:16:31 +0800 -Subject: [PATCH] kexec: Implement clean restart for busybox init - -Signed-off-by: Jeremy Kerr ---- - kexec.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/kexec.c b/kexec.c -index 2edb7df..b2a0c42 100644 ---- a/kexec.c -+++ b/kexec.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -818,7 +819,7 @@ int main(int argc, char *argv[]) - sync(); - exec_kexec(); - } else { -- execlp("shutdown", "shutdown", "-r", "now", NULL); -+ kill(1, SIGQUIT); - } - - return -1; --- -1.7.10.4 - diff --git a/package.bak/kexec-lite/Config.in b/package.bak/kexec-lite/Config.in deleted file mode 100644 index 97748dcce5..0000000000 --- a/package.bak/kexec-lite/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_KEXEC_LITE - bool "kexec-lite" - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on !BR2_STATIC_LIBS # dtc, elfutils - depends on BR2_USE_WCHAR # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - select BR2_PACKAGE_ELFUTILS - select BR2_PACKAGE_DTC - select BR2_PACKAGE_DTC_PROGRAMS - help - Kexec is a user space utiltity for loading another kernel - and asking the currently running kernel to do something with it. - - This package is a tiny implementation of the kexec userspace - components, for devicetree-based platforms. - -comment "kexec-lite needs a uClibc or glibc toolchain w/ wchar, dynamic library" - depends on BR2_powerpc || BR2_powerpc64 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package.bak/kexec-lite/kexec-lite.hash b/package.bak/kexec-lite/kexec-lite.hash deleted file mode 100644 index 0f212241da..0000000000 --- a/package.bak/kexec-lite/kexec-lite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5786ddc0c94ead4fd4a1fded44bb1da0c9bc91af08049fed373ea161603e1e1f kexec-lite-86e45a47e8cc1f598ccfa9b873a23067f4ecc36f.tar.gz diff --git a/package.bak/kexec-lite/kexec-lite.mk b/package.bak/kexec-lite/kexec-lite.mk deleted file mode 100644 index b1b66fd84c..0000000000 --- a/package.bak/kexec-lite/kexec-lite.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# kexec-lite -# -################################################################################ - -KEXEC_LITE_VERSION = 86e45a47e8cc1f598ccfa9b873a23067f4ecc36f -KEXEC_LITE_SITE = $(call github,antonblanchard,kexec-lite,$(KEXEC_LITE_VERSION)) -KEXEC_LITE_LICENSE = GPLv2+ -KEXEC_LITE_LICENSE_FILES = COPYING -KEXEC_LITE_DEPENDENCIES = elfutils dtc - -define KEXEC_LITE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define KEXEC_LITE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/kexec $(TARGET_DIR)/usr/sbin/kexec -endef - -$(eval $(generic-package)) diff --git a/package.bak/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch b/package.bak/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch deleted file mode 100644 index adaac2f6ec..0000000000 --- a/package.bak/kexec/0001-vmcore-dmesg-Define-_GNU_SOURCE.patch +++ /dev/null @@ -1,38 +0,0 @@ -Fix musl build - -Downloaded from http://patchwork.openembedded.org/patch/112685/ - -Signed-off-by: Bernd Kuhls - - -From d811875a41b4628040abaada3da29b7b9592e757 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 9 Jan 2016 17:16:16 -0800 -Subject: [PATCH] vmcore-dmesg: Define _GNU_SOURCE - -loff_t is guarded with _GNU_SOURCE on some C library implementations -e.g. musl since this type is not defined by POSIX. Define _GNU_SOURCE to -include this define, it should help compiling on musl while nothing -changes for glibc based systems since there _GNU_SOURCE is already -defined - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - - vmcore-dmesg/vmcore-dmesg.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/vmcore-dmesg/vmcore-dmesg.c b/vmcore-dmesg/vmcore-dmesg.c -index 0364636..a8f56df 100644 ---- a/vmcore-dmesg/vmcore-dmesg.c -+++ b/vmcore-dmesg/vmcore-dmesg.c -@@ -1,4 +1,5 @@ - #define _XOPEN_SOURCE 600 -+#define _GNU_SOURCE - #define _LARGEFILE_SOURCE 1 - #define _FILE_OFFSET_BITS 64 - #include --- -2.7.0 - diff --git a/package.bak/kexec/Config.in b/package.bak/kexec/Config.in deleted file mode 100644 index d92e6b9573..0000000000 --- a/package.bak/kexec/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_KEXEC - bool "kexec" - depends on BR2_i386 || BR2_x86_64 || BR2_arm || BR2_armeb || \ - BR2_mips || BR2_mips64 || BR2_mipsel || BR2_mips64el || \ - BR2_powerpc || BR2_sh4 || BR2_sh4a - help - Kexec is a user space utility for loading another kernel - and asking the currently running kernel to do something with it. - - https://www.kernel.org/pub/linux/utils/kernel/kexec/ - -if BR2_PACKAGE_KEXEC - -config BR2_PACKAGE_KEXEC_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Support for compressed kernel images - -endif diff --git a/package.bak/kexec/kexec.hash b/package.bak/kexec/kexec.hash deleted file mode 100644 index 9039dad489..0000000000 --- a/package.bak/kexec/kexec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/kernel/kexec/sha256sums.asc -sha256 ffb2e7e99d9d08754c6bc1922aed3c000094f318665d82a72ecc76c4ff1c0dc6 kexec-tools-2.0.14.tar.xz diff --git a/package.bak/kexec/kexec.mk b/package.bak/kexec/kexec.mk deleted file mode 100644 index 0a8e9f03a1..0000000000 --- a/package.bak/kexec/kexec.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# kexec -# -################################################################################ - -KEXEC_VERSION = 2.0.14 -KEXEC_SOURCE = kexec-tools-$(KEXEC_VERSION).tar.xz -KEXEC_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kexec -KEXEC_LICENSE = GPLv2 -KEXEC_LICENSE_FILES = COPYING - -# Makefile expects $STRIP -o to work, so needed for BR2_STRIP_none -KEXEC_MAKE_OPTS = STRIP="$(TARGET_CROSS)strip" - -ifeq ($(BR2_PACKAGE_KEXEC_ZLIB),y) -KEXEC_CONF_OPTS += --with-zlib -KEXEC_DEPENDENCIES = zlib -else -KEXEC_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -KEXEC_CONF_OPTS += --with-lzma -KEXEC_DEPENDENCIES += xz -else -KEXEC_CONF_OPTS += --without-lzma -endif - -define KEXEC_REMOVE_LIB_TOOLS - rm -rf $(TARGET_DIR)/usr/lib/kexec-tools -endef - -KEXEC_POST_INSTALL_TARGET_HOOKS += KEXEC_REMOVE_LIB_TOOLS - -$(eval $(autotools-package)) diff --git a/package.bak/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch b/package.bak/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch deleted file mode 100644 index 88d32b0cf0..0000000000 --- a/package.bak/keyutils/0001-allow-building-of-the-shared-library-to-be-suppressed.patch +++ /dev/null @@ -1,104 +0,0 @@ -keyutils: Allow building of the shared library to be suppressed - -Upstream patch: - https://kernel.googlesource.com/pub/scm/linux/kernel/git/dhowells/keyutils/+/a4deb71ddc05e951c8be8d46615beed9d408a5c8 - -Signed-off-by: Vicente Olivert Riera - -LIB: Allow building of the shared library to be suppressed - -Allow building of the shared library to be suppressed by passing NO_SOLIB=1 to -the Makefile. - -Reported-and-tested-by: Vicente Olivert Riera -Signed-off-by: David Howells -diff --git a/Makefile b/Makefile -index c904eaf..5dd2113 100644 ---- a/Makefile -+++ b/Makefile -@@ -5,6 +5,7 @@ - SPECFILE := keyutils.spec - NO_GLIBC_KEYERR := 0 - NO_ARLIB := 0 -+NO_SOLIB := 0 - ETCDIR := /etc - BINDIR := /bin - SBINDIR := /sbin -@@ -95,7 +96,7 @@ - # Normal build rule - # - ############################################################################### --all: $(DEVELLIB) keyctl request-key key.dns_resolver -+all: keyctl request-key key.dns_resolver - - ############################################################################### - # -@@ -104,20 +105,23 @@ - ############################################################################### - #RPATH = -Wl,-rpath,$(LIBDIR) - --ifeq ($(NO_ARLIB),0) --all: $(ARLIB) --$(ARLIB): keyutils.o -- $(AR) rcs $@ $< --endif -- - VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\"" - VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\"" - VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\"" - -+ifeq ($(NO_ARLIB),0) -+all: $(ARLIB) -+$(ARLIB): keyutils.o -+ $(AR) rcs $@ $< -+ - keyutils.o: keyutils.c keyutils.h Makefile - $(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -UNO_GLIBC_KEYERR -o $@ -c $< -+LIB_DEPENDENCY := libkeyutils.a -+endif - - -+ifeq ($(NO_SOLIB),0) -+all: $(DEVELLIB) - $(DEVELLIB): $(SONAME) - ln -sf $< $@ - -@@ -131,6 +135,8 @@ - - keyutils.os: keyutils.c keyutils.h Makefile - $(CC) $(CPPFLAGS) $(VCPPFLAGS) $(CFLAGS) -fPIC -o $@ -c $< -+LIB_DEPENDENCY := $(DEVELLIB) -+endif - - ############################################################################### - # -@@ -140,13 +146,13 @@ - %.o: %.c keyutils.h Makefile - $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< - --keyctl: keyctl.o $(DEVELLIB) -+keyctl: keyctl.o $(LIB_DEPENDENCY) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --request-key: request-key.o $(DEVELLIB) -+request-key: request-key.o $(LIB_DEPENDENCY) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils - --key.dns_resolver: key.dns_resolver.o $(DEVELLIB) -+key.dns_resolver: key.dns_resolver.o $(LIB_DEPENDENCY) - $(CC) -L. $(CFLAGS) $(LDFLAGS) $(RPATH) -o $@ $< -lkeyutils -lresolv - - ############################################################################### -@@ -158,10 +164,12 @@ - ifeq ($(NO_ARLIB),0) - $(INSTALL) -D -m 0644 $(ARLIB) $(DESTDIR)$(USRLIBDIR)/$(ARLIB) - endif -+ifeq ($(NO_SOLIB),0) - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) - $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+endif - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key - $(INSTALL) -D request-key-debug.sh $(DESTDIR)$(SHAREDIR)/request-key-debug.sh diff --git a/package.bak/keyutils/0002-fix-install-rule.patch b/package.bak/keyutils/0002-fix-install-rule.patch deleted file mode 100644 index 3670d28e66..0000000000 --- a/package.bak/keyutils/0002-fix-install-rule.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile: fix install rule - -Do not link the .so with an absolute path, otherwise it may point to -the host library. - -Based on the former patch by Yann E. MORIN. - -Signed-off-by: Vicente Olivert Riera - ---- keyutils-1.5.9/Makefile.orig 2014-09-22 16:13:41.593562765 +0100 -+++ keyutils-1.5.9/Makefile 2014-09-22 16:14:05.377963952 +0100 -@@ -168,7 +168,7 @@ ifeq ($(NO_SOLIB),0) - $(INSTALL) -D $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME) - $(LNS) $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(SONAME) - mkdir -p $(DESTDIR)$(USRLIBDIR) -- $(LNS) $(LIBDIR)/$(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) -+ $(LNS) $(SONAME) $(DESTDIR)$(USRLIBDIR)/$(DEVELLIB) - endif - $(INSTALL) -D keyctl $(DESTDIR)$(BINDIR)/keyctl - $(INSTALL) -D request-key $(DESTDIR)$(SBINDIR)/request-key diff --git a/package.bak/keyutils/0003-cifs.patch b/package.bak/keyutils/0003-cifs.patch deleted file mode 100644 index b2903f971f..0000000000 --- a/package.bak/keyutils/0003-cifs.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch vampirised from Debian's packaging of keyutils-1.4 - -Author: Marcus Meissner -Description: Added 2 cifs helpers to request-key.conf (for CIFS DFS support) - -diff -Naurp keyutils.orig/request-key.conf keyutils/request-key.conf ---- keyutils.orig/request-key.conf 2008-09-07 23:53:10.000000000 +0000 -+++ keyutils/request-key.conf 2009-02-05 00:53:00.000000000 +0000 -@@ -34,4 +34,6 @@ - create user debug:* negate /bin/keyctl negate %k 30 %S - create user debug:loop:* * |/bin/cat - create user debug:* * /usr/share/keyutils/request-key-debug.sh %k %d %c %S -+create cifs.spnego * * /usr/sbin/cifs.upcall -c %k -+create dns_resolver * * /usr/sbin/cifs.upcall %k - negate * * * /bin/keyctl negate %k 30 %S diff --git a/package.bak/keyutils/0004-Makefile-for-buildroot.patch b/package.bak/keyutils/0004-Makefile-for-buildroot.patch deleted file mode 100644 index 1e19f77dcb..0000000000 --- a/package.bak/keyutils/0004-Makefile-for-buildroot.patch +++ /dev/null @@ -1,19 +0,0 @@ -Makefile: Don't call "ln" directly - -Signed-off-by: Vicente Olivert Riera - ---- keyutils-1.5.9/Makefile.orig 2014-09-22 16:05:14.117007430 +0100 -+++ keyutils-1.5.9/Makefile 2014-09-22 16:06:26.053219336 +0100 -@@ -123,10 +123,10 @@ endif - ifeq ($(NO_SOLIB),0) - all: $(DEVELLIB) - $(DEVELLIB): $(SONAME) -- ln -sf $< $@ -+ $(LNS) $< $@ - - $(SONAME): $(LIBNAME) -- ln -sf $< $@ -+ $(LNS) $< $@ - - LIBVERS := -shared -Wl,-soname,$(SONAME) -Wl,--version-script,version.lds - diff --git a/package.bak/keyutils/0005-Add-missing-limits.h-include.patch b/package.bak/keyutils/0005-Add-missing-limits.h-include.patch deleted file mode 100644 index 45c84398f9..0000000000 --- a/package.bak/keyutils/0005-Add-missing-limits.h-include.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b2c6d3744dca029560d0d5e780f16561f8eeed53 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 12 Jul 2015 16:22:14 +0200 -Subject: [PATCH] Add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -key.dns_resolver.c uses ‘UINT_MAX’ and ‘ULONG_MAX’, but forgets to -include , which causes build failure with certain C -libraries (notably the musl C library). - -Signed-off-by: Thomas Petazzoni ---- - key.dns_resolver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/key.dns_resolver.c b/key.dns_resolver.c -index c2a9fe5..d41e219 100644 ---- a/key.dns_resolver.c -+++ b/key.dns_resolver.c -@@ -56,6 +56,7 @@ - #include - #include - #include -+#include - - static const char *DNS_PARSE_VERSION = "1.0"; - static const char prog[] = "key.dns_resolver"; --- -2.4.5 - diff --git a/package.bak/keyutils/Config.in b/package.bak/keyutils/Config.in deleted file mode 100644 index 6f0758f473..0000000000 --- a/package.bak/keyutils/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_KEYUTILS - bool "keyutils" - depends on !BR2_microblaze - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen - help - These tools are used to control the key management system - built into the Linux kernel. - - http://people.redhat.com/~dhowells/keyutils/ - -comment "keyutils needs a toolchain w/ dynamic library" - depends on !BR2_microblaze - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/keyutils/keyutils.hash b/package.bak/keyutils/keyutils.hash deleted file mode 100644 index 21ecae5159..0000000000 --- a/package.bak/keyutils/keyutils.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://people.redhat.com/~dhowells/keyutils/ -md5 7f8ac985c45086b5fbcd12cecd23cf07 keyutils-1.5.9.tar.bz2 -sha1 cf040adebe25eb466760f34752f4100fd5acb5e7 keyutils-1.5.9.tar.bz2 diff --git a/package.bak/keyutils/keyutils.mk b/package.bak/keyutils/keyutils.mk deleted file mode 100644 index 4a8dbace04..0000000000 --- a/package.bak/keyutils/keyutils.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# keyutils -# -################################################################################ - -KEYUTILS_VERSION = 1.5.9 -KEYUTILS_SOURCE = keyutils-$(KEYUTILS_VERSION).tar.bz2 -KEYUTILS_SITE = http://people.redhat.com/~dhowells/keyutils -KEYUTILS_LICENSE = GPLv2+, LGPLv2.1+ -KEYUTILS_LICENSE_FILES = LICENCE.GPL LICENCE.LGPL -KEYUTILS_INSTALL_STAGING = YES - -KEYUTILS_MAKE_PARAMS = \ - INSTALL=$(INSTALL) \ - LIBDIR=/usr/lib \ - USRLIBDIR=/usr/lib \ - CFLAGS="$(TARGET_CFLAGS)" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -I." \ - LNS="$(HOSTLN) -sf" - -ifeq ($(BR2_SHARED_LIBS),y) -KEYUTILS_MAKE_PARAMS += NO_ARLIB=1 -endif - -define KEYUTILS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) -endef - -define KEYUTILS_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define KEYUTILS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(KEYUTILS_MAKE_PARAMS) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/kismet/0001-ncurses.patch b/package.bak/kismet/0001-ncurses.patch deleted file mode 100644 index af8fba52b7..0000000000 --- a/package.bak/kismet/0001-ncurses.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kismet-2009-06-R1/configure 2009-06-12 04:26:32.000000000 +0100 -+++ kismet-2009-06-R1.mod/configure 2009-08-05 11:27:43.000000000 +0100 -@@ -6981,7 +6981,7 @@ - - - # Add additional cflags since some distros bury panel.h --CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" -+#CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" - - termcontrol="none"; - diff --git a/package.bak/kismet/0002-nobsd.patch b/package.bak/kismet/0002-nobsd.patch deleted file mode 100644 index 451d9ce4a1..0000000000 --- a/package.bak/kismet/0002-nobsd.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Nura kismet-2009-06-R1/ifcontrol.cc kismet-2009-06-R1-nobsd/ifcontrol.cc ---- kismet-2009-06-R1/ifcontrol.cc 2009-04-08 16:57:44.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/ifcontrol.cc 2009-09-01 12:54:44.000000000 -0300 -@@ -148,7 +148,7 @@ - devlinklen = readlink(devlink.c_str(), devlinktarget, 511); - if (devlinklen > 0) { - devlinktarget[devlinklen] = '\0'; -- rind = rindex(devlinktarget, '/'); -+ rind = strrchr(devlinktarget, '/'); - // If we found it and not at the end of the line - if (rind != NULL && (rind - devlinktarget) + 1 < devlinklen) - return string(rind + 1); -diff -Nura kismet-2009-06-R1/iwcontrol.cc kismet-2009-06-R1-nobsd/iwcontrol.cc ---- kismet-2009-06-R1/iwcontrol.cc 2009-04-20 00:22:55.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/iwcontrol.cc 2009-09-01 12:54:44.000000000 -0300 -@@ -697,7 +697,7 @@ - return -1; - } - -- bzero(buffer, sizeof(buffer)); -+ memset(buffer, 0, sizeof(buffer)); - - memset(&wrq, 0, sizeof(struct iwreq)); - -@@ -732,7 +732,7 @@ - memcpy((char *) &range, buffer, sizeof(iw_range)); - } else { - /* Zero unknown fields */ -- bzero((char *) &range, sizeof(struct iw_range)); -+ memset((char *) &range, 0, sizeof(struct iw_range)); - - /* Initial part unmoved */ - memcpy((char *) &range, buffer, iwr15_off(num_channels)); -diff -Nura kismet-2009-06-R1/madwifing_control.cc kismet-2009-06-R1-nobsd/madwifing_control.cc ---- kismet-2009-06-R1/madwifing_control.cc 2009-03-22 23:19:19.000000000 -0300 -+++ kismet-2009-06-R1-nobsd/madwifing_control.cc 2009-09-01 12:54:42.000000000 -0300 -@@ -34,7 +34,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/package.bak/kismet/0003-fix-curses-libs-ordering.patch b/package.bak/kismet/0003-fix-curses-libs-ordering.patch deleted file mode 100644 index b579c96d46..0000000000 --- a/package.bak/kismet/0003-fix-curses-libs-ordering.patch +++ /dev/null @@ -1,42 +0,0 @@ -configure: fix ordering of ncurses libraries - -Says Vicente: - [T]he order is very important when doing static builds. - Otherwise we will see errors like this one: - - [...]/sysroot/usr/lib/libpanel.a(p_delete.o): - In function `del_panel': - p_delete.c:(.text+0x68): undefined reference to `_nc_panelhook' - -Fix the order configure adds libraries: new libraries should be added -at the *front* of the list, not at the end. - -Reported-by: Vicente Olivert Riera -Signed-off-by: "Yann E. MORIN" -Cc: Vicente Olivert Riera - -diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in ---- kismet-Kismet-2014-02-R1.orig/configure.in 2014-02-19 05:37:43.000000000 +0100 -+++ kismet-Kismet-2014-02-R1/configure.in 2014-12-26 16:46:55.770692349 +0100 -@@ -437,10 +434,10 @@ - AC_MSG_ERROR(Failed to find curses.h or ncurses.h. You probably need to install the curses-devel package from your distribution) - fi - -- LIBS="$LIBS $curseaux" -+ LIBS="$curseaux $LIBS" - AC_CHECK_LIB([panel], [new_panel], - AC_DEFINE(HAVE_LIBPANEL, 1, Panel terminal lib) -- curseaux="$curseaux -lpanel", -+ curseaux="-lpanel $curseaux", - AC_MSG_ERROR(Failed to find libpanel extension to curses/ncurses. Install it, or disable building the Kismet client with --disable-client. Disabling the client is probably not something you want to do normally.)) - - AC_CHECK_HEADER([panel.h], [foundhpanel=yes]) -@@ -450,7 +447,7 @@ - - LIBS="$OLIBS" - -- CLIENTCLIBS="$CLIENTCLIBS $curseaux" -+ CLIENTCLIBS="$curseaux $CLIENTCLIBS" - fi - - AC_SUBST(CLIBS) diff --git a/package.bak/kismet/0004-no-include-host-paths.patch b/package.bak/kismet/0004-no-include-host-paths.patch deleted file mode 100644 index 1dcf1200f9..0000000000 --- a/package.bak/kismet/0004-no-include-host-paths.patch +++ /dev/null @@ -1,23 +0,0 @@ -configure: do not hard-code host paths - -configure hard-codes include dirs to contain /usr/include/ncurses. -Needless to say this does not work well for cross-compilation. - -Remove that directory from the include search dirs. - -Signed-off-by: "Yann E. MORIN" -Cc: Vicente Olivert Riera - -diff -durN kismet-Kismet-2014-02-R1.orig/configure.in kismet-Kismet-2014-02-R1/configure.in ---- kismet-Kismet-2014-02-R1.orig/configure.in 2014-02-19 05:37:43.000000000 +0100 -+++ kismet-Kismet-2014-02-R1/configure.in 2014-12-26 16:46:55.770692349 +0100 -@@ -406,9 +406,6 @@ - ) - AC_SUBST(wantclient) - --# Add additional cflags since some distros bury panel.h --CPPFLAGS="$CPPFLAGS -I/usr/include/ncurses" -- - termcontrol="none"; - - if test "$wantclient" = "yes"; then diff --git a/package.bak/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch b/package.bak/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch deleted file mode 100644 index be694345d2..0000000000 --- a/package.bak/kismet/0005-dumpfile_tuntap-don-t-include-linux-if_tun.h-kernel-.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1466cbbdef835634366b2eb3a284fdff5833338c Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 19 Aug 2016 23:30:06 +0200 -Subject: [PATCH] dumpfile_tuntap: don't include linux/if_tun.h kernel header - -dumpfile_tuntap.h mixes userspace and kernel headers. - -As suggested in the musl wiki [1], remove the linux/include directives -and copy the required definitions. - -[1] http://wiki.musl-libc.org/wiki/FAQ - -Signed-off-by: Romain Naour ---- - dumpfile_tuntap.h | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -diff --git a/dumpfile_tuntap.h b/dumpfile_tuntap.h -index 37f50b6..8b23a2a 100644 ---- a/dumpfile_tuntap.h -+++ b/dumpfile_tuntap.h -@@ -64,17 +64,18 @@ - #include "packetchain.h" - #include "dumpfile.h" - --#ifdef SYS_LINUX --#include -+#ifdef SYS_LINUX -+/* TUNSETIFF ifr flags */ -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 - - // Linux IEEE80211 link typ to set - #define LNX_LINKTYPE_80211 801 --// If the system headers don't have the TUNSETLINK ioctl, define it here, --// and we'll figure it out at runtime --#ifndef TUNSETLINK --#define TUNSETLINK _IOW('T', 205, int) --#endif -- -+/* Ioctl defines */ -+#define TUNSETNOCSUM _IOW('T', 200, int) -+#define TUNSETIFF _IOW('T', 202, int) -+#define TUNSETLINK _IOW('T', 205, int) - #endif - - struct ipc_dft_open { --- -2.5.5 - diff --git a/package.bak/kismet/Config.in b/package.bak/kismet/Config.in deleted file mode 100644 index ab91c0e6fb..0000000000 --- a/package.bak/kismet/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -comment "kismet needs a toolchain w/ threads, C++, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -config BR2_PACKAGE_KISMET - bool "kismet" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBNL - help - Kismet - 802.11 layer2 wireless network detector, sniffer, - and intrusion detection system. - - Kismet will work with any wireless card which supports raw - monitoring (rfmon) mode, and can sniff 802.11b, 802.11a, and - 802.11g traffic. - - Kismet identifies networks by passively collecting packets - and detecting standard named networks, detecting (and given - time, decloaking) hidden networks, and infering the presence - of nonbeaconing networks via data traffic. - - http://www.kismetwireless.net - -if BR2_PACKAGE_KISMET - -config BR2_PACKAGE_KISMET_CLIENT - bool "Install client" - -config BR2_PACKAGE_KISMET_DRONE - bool "Install drone" - -config BR2_PACKAGE_KISMET_SERVER - bool "Install server" - default y - -endif diff --git a/package.bak/kismet/kismet.hash b/package.bak/kismet/kismet.hash deleted file mode 100644 index e4dc5a4815..0000000000 --- a/package.bak/kismet/kismet.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 23b693baa29549b051e95e9d597b115bd94f7267c4677307ebd87f2a00e5a52b kismet-Kismet-2014-02-R1.tar.gz diff --git a/package.bak/kismet/kismet.mk b/package.bak/kismet/kismet.mk deleted file mode 100644 index f4a28b86dc..0000000000 --- a/package.bak/kismet/kismet.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# kismet -# -################################################################################ - -KISMET_VERSION = Kismet-2014-02-R1 -KISMET_SITE = http://www.kismetwireless.net/kismet.git -KISMET_SITE_METHOD = git -KISMET_DEPENDENCIES = host-pkgconf libpcap ncurses libnl -KISMET_CONF_OPTS += --with-netlink-version=3 -KISMET_LICENSE = GPLv2+ -KISMET_LICENSE_FILES = debian/copyright - -# We touch configure.in: -KISMET_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -KISMET_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -KISMET_DEPENDENCIES += pcre -endif - -ifeq ($(BR2_PACKAGE_KISMET_CLIENT),y) -KISMET_TARGET_BINARIES += kismet_client -endif - -ifeq ($(BR2_PACKAGE_KISMET_SERVER),y) -KISMET_TARGET_BINARIES += kismet_server -KISMET_TARGET_CONFIGS += kismet.conf -endif - -ifeq ($(BR2_PACKAGE_KISMET_DRONE),y) -KISMET_TARGET_BINARIES += kismet_drone -KISMET_TARGET_CONFIGS += kismet_drone.conf -endif - -ifdef KISMET_TARGET_BINARIES -define KISMET_INSTALL_TARGET_BINARIES - $(INSTALL) -m 755 $(addprefix $(KISMET_DIR)/, $(KISMET_TARGET_BINARIES)) $(TARGET_DIR)/usr/bin -endef -endif - -ifdef KISMET_TARGET_CONFIGS -define KISMET_INSTALL_TARGET_CONFIGS - $(INSTALL) -m 644 $(addprefix $(KISMET_DIR)/conf/, $(KISMET_TARGET_CONFIGS)) $(TARGET_DIR)/etc -endef -endif - -define KISMET_INSTALL_TARGET_CMDS - $(KISMET_INSTALL_TARGET_BINARIES) - $(KISMET_INSTALL_TARGET_CONFIGS) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/kmod/0001-fix-O_CLOEXEC.patch b/package.bak/kmod/0001-fix-O_CLOEXEC.patch deleted file mode 100644 index 145ac34207..0000000000 --- a/package.bak/kmod/0001-fix-O_CLOEXEC.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b39a62f6682463bcd47480348fac3dcd209a19a5 Mon Sep 17 00:00:00 2001 -From: Robert Yang -Date: Wed, 22 Jan 2014 01:06:40 -0500 -Subject: [PATCH] Add dummy definition of O_CLOEXEC - -O_CLOEXEC is introduced from Linux 2.6.23, so old kernel doesn't have -it, we need check before use. - -This patch is much more like a workaround, since it may need fcntl() use -FD_CLOEXEC to replace. - -This problem was reported by "Ting Liu " - -[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 - ---- - shared/missing.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/shared/missing.h b/shared/missing.h -index 4c0d136..e123e98 100644 ---- a/shared/missing.h -+++ b/shared/missing.h -@@ -19,6 +19,10 @@ - # define __NR_finit_module -1 - #endif - -+#ifndef O_CLOEXEC -+#define O_CLOEXEC 0 -+#endif -+ - #ifndef HAVE_FINIT_MODULE - #include - --- -1.7.1 - diff --git a/package.bak/kmod/Config.in b/package.bak/kmod/Config.in deleted file mode 100644 index e59b281cf9..0000000000 --- a/package.bak/kmod/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_KMOD - bool "kmod" - depends on !BR2_STATIC_LIBS - help - handle kernel modules - - http://git.kernel.org/?p=utils/kernel/kmod/kmod.git - -if BR2_PACKAGE_KMOD - -config BR2_PACKAGE_KMOD_TOOLS - bool "kmod utilities" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Install kmod module utilities (depmod, insmod, lsmod, - modinfo, modprobe, rmmod). - -endif - -comment "kmod needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/kmod/kmod.hash b/package.bak/kmod/kmod.hash deleted file mode 100644 index 8220fd493b..0000000000 --- a/package.bak/kmod/kmod.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/kernel/kmod/sha256sums.asc -sha256 d303d5519faec9d69e1132f6b37db2579db17a7fb5c1517da0115d03ba168155 kmod-23.tar.xz diff --git a/package.bak/kmod/kmod.mk b/package.bak/kmod/kmod.mk deleted file mode 100644 index 407d90d817..0000000000 --- a/package.bak/kmod/kmod.mk +++ /dev/null @@ -1,83 +0,0 @@ -################################################################################ -# -# kmod -# -################################################################################ - -KMOD_VERSION = 23 -KMOD_SOURCE = kmod-$(KMOD_VERSION).tar.xz -KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod -KMOD_INSTALL_STAGING = YES -KMOD_DEPENDENCIES = host-pkgconf -HOST_KMOD_DEPENDENCIES = host-pkgconf - -# license info for libkmod only, conditionally add more below -KMOD_LICENSE = LGPLv2.1+ (library) -KMOD_LICENSE_FILES = libkmod/COPYING - -# --gc-sections triggers binutils ld segfault -# https://sourceware.org/bugzilla/show_bug.cgi?id=21180 -ifeq ($(BR2_microblaze),y) -KMOD_CONF_ENV += cc_cv_LDFLAGS__Wl___gc_sections=false -endif - -# static linking not supported, see -# https://git.kernel.org/cgit/utils/kernel/kmod/kmod.git/commit/?id=b7016153ec8 -KMOD_CONF_OPTS = --disable-static --enable-shared - -KMOD_CONF_OPTS += --disable-manpages -HOST_KMOD_CONF_OPTS = --disable-manpages - -ifeq ($(BR2_PACKAGE_ZLIB),y) -KMOD_DEPENDENCIES += zlib -KMOD_CONF_OPTS += --with-zlib -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -KMOD_DEPENDENCIES += xz -KMOD_CONF_OPTS += --with-xz -endif - -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) -KMOD_CONF_OPTS += --enable-python -endif - -ifeq ($(BR2_PACKAGE_KMOD_TOOLS),y) - -# add license info for kmod tools -KMOD_LICENSE := $(KMOD_LICENSE), GPLv2+ (tools) -KMOD_LICENSE_FILES += COPYING - -# take precedence over busybox implementation -KMOD_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) - -# /sbin is really /usr/sbin with merged /usr, so adjust relative symlink -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -KMOD_BIN_PATH = ../bin/kmod -else -KMOD_BIN_PATH = ../usr/bin/kmod -endif - -define KMOD_INSTALL_TOOLS - for i in depmod insmod lsmod modinfo modprobe rmmod; do \ - ln -sf $(KMOD_BIN_PATH) $(TARGET_DIR)/sbin/$$i; \ - done -endef - -KMOD_POST_INSTALL_TARGET_HOOKS += KMOD_INSTALL_TOOLS -else -KMOD_CONF_OPTS += --disable-tools -endif - -# We only install depmod, since that's the only tool used for the -# host. -define HOST_KMOD_INSTALL_TOOLS - mkdir -p $(HOST_DIR)/sbin/ - ln -sf ../usr/bin/kmod $(HOST_DIR)/sbin/depmod -endef - -HOST_KMOD_POST_INSTALL_HOOKS += HOST_KMOD_INSTALL_TOOLS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch b/package.bak/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch deleted file mode 100644 index 280583af14..0000000000 --- a/package.bak/kmsxx/0001-Fix-LTO-support-for-cross-compilation.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5da1f631bc753655ac94b08a6233eecd0d451327 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Fri, 26 Aug 2016 21:55:06 +0200 -Subject: [PATCH] Fix LTO support for cross-compilation. - -When cross-compiling, the ar and ranlib to be used for LTO are prefixed -by the cross-tuple. gcc-ar and gcc-ranlib may not exist. Cfr. -http://autobuild.buildroot.net/results/f3c/f3c48da3a9706cd366c0e0a96c3cd0ff959f2a78/ - -Therefore, search for an appropriate lto-ar and lto-ranlib before -enabling LTO. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -Submitted upstream: https://github.com/tomba/kmsxx/pull/14 ---- - CMakeLists.txt | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5b5ea5..c61c81d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,9 +39,15 @@ if (NOT ${U_CMAKE_BUILD_TYPE} MATCHES DEBUG) - CHECK_CXX_COMPILER_FLAG("-flto" HAS_LTO_FLAG) - - if (HAS_LTO_FLAG) -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") -- set(CMAKE_AR gcc-ar) -- set(CMAKE_RANLIB gcc-ranlib) -+ find_program(LTO_AR NAMES "${CMAKE_C_COMPILER}-ar" gcc-ar) -+ find_program(LTO_RANLIB NAMES "${CMAKE_C_COMPILER}-ranlib" gcc-ranlib) -+ if (LTO_AR AND LTO_RANLIB) -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -flto") -+ set(CMAKE_AR "${LTO_AR}") -+ set(CMAKE_RANLIB "${LTO_RANLIB}") -+ else() -+ message(STATUS "gcc-ar or gcc-ranlib not found, disabling LTO") -+ endif() - endif() - endif() - --- -2.9.3 - diff --git a/package.bak/kmsxx/Config.in b/package.bak/kmsxx/Config.in deleted file mode 100644 index 1d174c18b1..0000000000 --- a/package.bak/kmsxx/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_KMSXX - bool "kms++" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm - select BR2_PACKAGE_LIBDRM - help - libkms++ is a C++11 library for kernel mode setting. - - Also included are simple test tools for KMS. - - https://github.com/tomba/kmsxx - -if BR2_PACKAGE_KMSXX - -config BR2_PACKAGE_KMSXX_INSTALL_TESTS - bool "Install test programs" - help - This option allows to install the kmsxx test programs. - -endif - -comment "kms++ needs a toolchain w/ threads, C++, gcc >= 4.8, headers >= 3.8" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8 diff --git a/package.bak/kmsxx/kmsxx.hash b/package.bak/kmsxx/kmsxx.hash deleted file mode 100644 index 9e75bb9e01..0000000000 --- a/package.bak/kmsxx/kmsxx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ff8bdb84a738477a8740c835e23c5bb59aac750e9e72a4afcad4ec8820ec7da2 kmsxx-bd5f6471e619a6ba2987bc7f66ef78a531f94d6c.tar.gz diff --git a/package.bak/kmsxx/kmsxx.mk b/package.bak/kmsxx/kmsxx.mk deleted file mode 100644 index c06d20be61..0000000000 --- a/package.bak/kmsxx/kmsxx.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# kmsxx -# -################################################################################ - -KMSXX_VERSION = bd5f6471e619a6ba2987bc7f66ef78a531f94d6c -KMSXX_SITE = $(call github,tomba,kmsxx,$(KMSXX_VERSION)) -KMSXX_LICENSE = MPLv2.0 -KMSXX_LICENSE_FILES = LICENSE -KMSXX_INSTALL_STAGING = YES -KMSXX_DEPENDENCIES = libdrm host-pkgconf -KMSXX_CONF_OPTS = -DKMSXX_ENABLE_PYTHON=OFF - -# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 -ifeq ($(BR2_m68k_cf),y) -KMSXX_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" -endif - -ifeq ($(BR2_PACKAGE_KMSXX_INSTALL_TESTS),y) -KMSXX_TESTS = \ - fbtestpat kmsblank kmscapture \ - kmsprint kmsview testpat wbcap \ - wbm2m - -define KMSXX_INSTALL_TARGET_TESTS - $(foreach t,$(KMSXX_TESTS),\ - $(INSTALL) -D -m 0755 $(@D)/bin/$(t) \ - $(TARGET_DIR)/usr/bin/$(t) - ) -endef -endif - -KMSXX_LIBS = kms++ kms++util - -define KMSXX_INSTALL_TARGET_CMDS - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(foreach l,$(KMSXX_LIBS),\ - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(TARGET_DIR)/usr/lib/lib$(l).so - ) - ) - $(KMSXX_INSTALL_TARGET_TESTS) -endef - -define KMSXX_INSTALL_STAGING_CMDS - $(foreach l,$(KMSXX_LIBS),\ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).so \ - $(STAGING_DIR)/usr/lib/lib$(l).so) - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS), - $(INSTALL) -D -m 0755 $(@D)/lib/lib$(l).a \ - $(STAGING_DIR)/usr/lib/lib$(l).a) - mkdir -p $(STAGING_DIR)/usr/include/$(l) - cp -dpfr $(@D)/$(l)/inc/$(l)/* $(STAGING_DIR)/usr/include/$(l)/ - ) -endef - -$(eval $(cmake-package)) diff --git a/package.bak/knock/Config.in b/package.bak/knock/Config.in deleted file mode 100644 index 8778a7e3fd..0000000000 --- a/package.bak/knock/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_KNOCK - bool "knock" - select BR2_PACKAGE_LIBPCAP - depends on BR2_USE_MMU # fork() - help - A port knocking implementation. - Provides a daemon and a user application. Port knocking can be - used to run an arbitrary application, once the daemon detects - a predefined sequence of incoming TCP/UDP packets on a network - interface. This can be used, e.g. to open up ports in a - firewall. - - http://www.zeroflux.org/projects/knock diff --git a/package.bak/knock/knock.hash b/package.bak/knock/knock.hash deleted file mode 100644 index 3599e43da2..0000000000 --- a/package.bak/knock/knock.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 940a8de61b4b3530560805c3b9310a077c28c99173c2ccb07ff96720b0e93c58 knock-258a27e5a47809f97c2b9f2751a88c2f94aae891.tar.gz diff --git a/package.bak/knock/knock.mk b/package.bak/knock/knock.mk deleted file mode 100644 index 2ab8d1b680..0000000000 --- a/package.bak/knock/knock.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# knock -# -################################################################################ - -KNOCK_VERSION = 258a27e5a47809f97c2b9f2751a88c2f94aae891 -KNOCK_SITE = $(call github,jvinet,knock,$(KNOCK_VERSION)) -KNOCK_AUTORECONF = YES -KNOCK_LICENSE = GPLv2+ -KNOCK_LICENSE_FILES = COPYING -KNOCK_DEPENDENCIES = libpcap - -ifeq ($(BR2_STATIC_LIBS),y) -KNOCK_CONF_OPTS = LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/kodi-adsp-basic/Config.in b/package.bak/kodi-adsp-basic/Config.in deleted file mode 100644 index 87bdd1973c..0000000000 --- a/package.bak/kodi-adsp-basic/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_KODI_ADSP_BASIC - bool "kodi-adsp-basic" - select BR2_PACKAGE_LIBPLATFORM - select BR2_PACKAGE_KODI_PLATFORM - help - This add-on contains basic dsp related parts to handle - speaker delays, channel related volume amplification. As - mode it supports a Dolby Pro Logic II compatible - multichannel downmix to stereo, which becomes available if - only 2 channel output on Kodi is selected. - - https://github.com/kodi-adsp/adsp.basic diff --git a/package.bak/kodi-adsp-basic/kodi-adsp-basic.hash b/package.bak/kodi-adsp-basic/kodi-adsp-basic.hash deleted file mode 100644 index e668ff2aa4..0000000000 --- a/package.bak/kodi-adsp-basic/kodi-adsp-basic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 0ae320af73085c322671d4b361248ff4341a6a04bd81c8b699847d5b04da828f kodi-adsp-basic-cb56e0eb6530fd50a286d47ef0be529001e9d556.tar.gz diff --git a/package.bak/kodi-adsp-basic/kodi-adsp-basic.mk b/package.bak/kodi-adsp-basic/kodi-adsp-basic.mk deleted file mode 100644 index 0b1ba95948..0000000000 --- a/package.bak/kodi-adsp-basic/kodi-adsp-basic.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-adsp-basic -# -################################################################################ - -KODI_ADSP_BASIC_VERSION = cb56e0eb6530fd50a286d47ef0be529001e9d556 -KODI_ADSP_BASIC_SITE = $(call github,kodi-adsp,adsp.basic,$(KODI_ADSP_BASIC_VERSION)) -KODI_ADSP_BASIC_LICENSE = GPLv3+ -KODI_ADSP_BASIC_LICENSE_FILES = LICENSE.md -KODI_ADSP_BASIC_DEPENDENCIES = libplatform kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-adsp-freesurround/Config.in b/package.bak/kodi-adsp-freesurround/Config.in deleted file mode 100644 index 80aadf1d40..0000000000 --- a/package.bak/kodi-adsp-freesurround/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_ADSP_FREESURROUND - bool "kodi-adsp-freesurround" - select BR2_PACKAGE_LIBPLATFORM - select BR2_PACKAGE_KODI_PLATFORM - help - FreeSurround is meant to be the KODI equivalent of your - hi-fi receiver's Dolby ProLogic II button. It's purpose is - to decode surround information from your stereo music and to - produce multichannel output from it. - - https://github.com/kodi-adsp/adsp.freesurround diff --git a/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.hash b/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.hash deleted file mode 100644 index f23717f79b..0000000000 --- a/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 652c32d0c4b61343cbed13b6edd1ab4ad35280240a0ddb386f04adaa46986e7f kodi-adsp-freesurround-08b691d3d9a0382d2f6f789a31614fb02512036c.tar.gz diff --git a/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.mk b/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.mk deleted file mode 100644 index 49cf673276..0000000000 --- a/package.bak/kodi-adsp-freesurround/kodi-adsp-freesurround.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-adsp-freesurround -# -################################################################################ - -KODI_ADSP_FREESURROUND_VERSION = 08b691d3d9a0382d2f6f789a31614fb02512036c -KODI_ADSP_FREESURROUND_SITE = $(call github,kodi-adsp,adsp.freesurround,$(KODI_ADSP_FREESURROUND_VERSION)) -KODI_ADSP_FREESURROUND_LICENSE = GPLv3+ -KODI_ADSP_FREESURROUND_LICENSE_FILES = LICENSE.md -KODI_ADSP_FREESURROUND_DEPENDENCIES = libplatform kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-modplug/Config.in b/package.bak/kodi-audiodecoder-modplug/Config.in deleted file mode 100644 index 026997319e..0000000000 --- a/package.bak/kodi-audiodecoder-modplug/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_MODPLUG - bool "kodi-audiodecoder-modplug" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBMODPLUG - help - Modplug decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.modplug diff --git a/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash b/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash deleted file mode 100644 index 2760b11b53..0000000000 --- a/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 dd4610ba5fdf3f46dcd0deff785d373d3996c6585cbeb39cb4449baafe5ea3df kodi-audiodecoder-modplug-03b772da7ea44ff3c34b322989254cd1e4732443.tar.gz diff --git a/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk b/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk deleted file mode 100644 index 581223c0b9..0000000000 --- a/package.bak/kodi-audiodecoder-modplug/kodi-audiodecoder-modplug.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-modplug -# -################################################################################ - -KODI_AUDIODECODER_MODPLUG_VERSION = 03b772da7ea44ff3c34b322989254cd1e4732443 -KODI_AUDIODECODER_MODPLUG_SITE = $(call github,notspiff,audiodecoder.modplug,$(KODI_AUDIODECODER_MODPLUG_VERSION)) -KODI_AUDIODECODER_MODPLUG_LICENSE = GPLv2+ -KODI_AUDIODECODER_MODPLUG_LICENSE_FILES = src/ModplugCodec.cpp -KODI_AUDIODECODER_MODPLUG_DEPENDENCIES = kodi-platform libmodplug - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-nosefart/Config.in b/package.bak/kodi-audiodecoder-nosefart/Config.in deleted file mode 100644 index 96591aae5c..0000000000 --- a/package.bak/kodi-audiodecoder-nosefart/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_NOSEFART - bool "kodi-audiodecoder-nosefart" - select BR2_PACKAGE_KODI_PLATFORM - help - Nosefart decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.nosefart diff --git a/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash b/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash deleted file mode 100644 index b4cd28fea5..0000000000 --- a/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 da65b21ed6218d65b7d382d7fdd9c848a87f6dc766864925979ea8244320db94 kodi-audiodecoder-nosefart-bfab543bae0d9855538cf03e78ea9cd5e3b9750e.tar.gz diff --git a/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk b/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk deleted file mode 100644 index 49688a4d9e..0000000000 --- a/package.bak/kodi-audiodecoder-nosefart/kodi-audiodecoder-nosefart.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-nosefart -# -################################################################################ - -KODI_AUDIODECODER_NOSEFART_VERSION = bfab543bae0d9855538cf03e78ea9cd5e3b9750e -KODI_AUDIODECODER_NOSEFART_SITE = $(call github,notspiff,audiodecoder.nosefart,$(KODI_AUDIODECODER_NOSEFART_VERSION)) -KODI_AUDIODECODER_NOSEFART_LICENSE = GPLv2+ -KODI_AUDIODECODER_NOSEFART_LICENSE_FILES = src/NSFCodec.cpp -KODI_AUDIODECODER_NOSEFART_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-opus/Config.in b/package.bak/kodi-audiodecoder-opus/Config.in deleted file mode 100644 index 12d7247d58..0000000000 --- a/package.bak/kodi-audiodecoder-opus/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_OPUS - bool "kodi-audiodecoder-opus" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_OPUS - select BR2_PACKAGE_OPUSFILE - help - Opus audio decoder for Kodi - - https://github.com/notspiff/audiodecoder.opus diff --git a/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash b/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash deleted file mode 100644 index fa60ce5769..0000000000 --- a/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 74b5736aa21d9cfb8fa835c1dc9cca47817cdb3867f99f5c6aee655f0df476ad kodi-audiodecoder-opus-0bd11e35e6ed8b6480e4100ac8927113cb085eda.tar.gz diff --git a/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk b/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk deleted file mode 100644 index efe17f38a9..0000000000 --- a/package.bak/kodi-audiodecoder-opus/kodi-audiodecoder-opus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-opus -# -################################################################################ - -KODI_AUDIODECODER_OPUS_VERSION = 0bd11e35e6ed8b6480e4100ac8927113cb085eda -KODI_AUDIODECODER_OPUS_SITE = $(call github,notspiff,audiodecoder.opus,$(KODI_AUDIODECODER_OPUS_VERSION)) -KODI_AUDIODECODER_OPUS_LICENSE = GPLv2+ -KODI_AUDIODECODER_OPUS_LICENSE_FILES = src/OpusCodec.cpp -KODI_AUDIODECODER_OPUS_DEPENDENCIES = kodi-platform libogg opus opusfile - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-sidplay/Config.in b/package.bak/kodi-audiodecoder-sidplay/Config.in deleted file mode 100644 index ae99afa9e0..0000000000 --- a/package.bak/kodi-audiodecoder-sidplay/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_SIDPLAY - bool "kodi-audiodecoder-sidplay" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBSIDPLAY2 - help - Sidplay decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.sidplay diff --git a/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash b/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash deleted file mode 100644 index f339654f74..0000000000 --- a/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 11855e7b0311516602eda34c5fa4917d51220a27c3053ea831da149ae4c93757 kodi-audiodecoder-sidplay-d832f050211b4e5f085a8b09bc7d26ce32098169.tar.gz diff --git a/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk b/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk deleted file mode 100644 index d8cf438b17..0000000000 --- a/package.bak/kodi-audiodecoder-sidplay/kodi-audiodecoder-sidplay.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-sidplay -# -################################################################################ - -KODI_AUDIODECODER_SIDPLAY_VERSION = d832f050211b4e5f085a8b09bc7d26ce32098169 -KODI_AUDIODECODER_SIDPLAY_SITE = $(call github,notspiff,audiodecoder.sidplay,$(KODI_AUDIODECODER_SIDPLAY_VERSION)) -KODI_AUDIODECODER_SIDPLAY_LICENSE = GPLv2+ -KODI_AUDIODECODER_SIDPLAY_LICENSE_FILES = src/SIDCodec.cpp -KODI_AUDIODECODER_SIDPLAY_DEPENDENCIES = host-pkgconf kodi-platform libsidplay2 - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-snesapu/Config.in b/package.bak/kodi-audiodecoder-snesapu/Config.in deleted file mode 100644 index 0cb572fec3..0000000000 --- a/package.bak/kodi-audiodecoder-snesapu/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_SNESAPU - bool "kodi-audiodecoder-snesapu" - select BR2_PACKAGE_KODI_PLATFORM - help - SPC decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.snesapu diff --git a/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash b/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash deleted file mode 100644 index e3da57221a..0000000000 --- a/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6fd6e5dda0fbcdac280952e0efc0bb255ef99628c892164c26e60ee3f2ab8e4e kodi-audiodecoder-snesapu-db62e88e568994a0496d7026a10e044d70b3aa2b.tar.gz diff --git a/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk b/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk deleted file mode 100644 index f9f398ca76..0000000000 --- a/package.bak/kodi-audiodecoder-snesapu/kodi-audiodecoder-snesapu.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-snesapu -# -################################################################################ - -KODI_AUDIODECODER_SNESAPU_VERSION = db62e88e568994a0496d7026a10e044d70b3aa2b -KODI_AUDIODECODER_SNESAPU_SITE = $(call github,notspiff,audiodecoder.snesapu,$(KODI_AUDIODECODER_SNESAPU_VERSION)) -KODI_AUDIODECODER_SNESAPU_LICENSE = GPLv2+ -KODI_AUDIODECODER_SNESAPU_LICENSE_FILES = src/SPCCodec.cpp -KODI_AUDIODECODER_SNESAPU_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-stsound/Config.in b/package.bak/kodi-audiodecoder-stsound/Config.in deleted file mode 100644 index 6be216a2c7..0000000000 --- a/package.bak/kodi-audiodecoder-stsound/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_STSOUND - bool "kodi-audiodecoder-stsound" - select BR2_PACKAGE_KODI_PLATFORM - help - YM decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.stsound diff --git a/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash b/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash deleted file mode 100644 index 164e967634..0000000000 --- a/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2bd89d66c493ba354df5c154f313a4bd801ff019ad5c102aa54741b99dd9c608 kodi-audiodecoder-stsound-759ae7eadb94adfde8533a2a42d949c321718625.tar.gz diff --git a/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk b/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk deleted file mode 100644 index 76010899b0..0000000000 --- a/package.bak/kodi-audiodecoder-stsound/kodi-audiodecoder-stsound.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-stsound -# -################################################################################ - -KODI_AUDIODECODER_STSOUND_VERSION = 759ae7eadb94adfde8533a2a42d949c321718625 -KODI_AUDIODECODER_STSOUND_SITE = $(call github,notspiff,audiodecoder.stsound,$(KODI_AUDIODECODER_STSOUND_VERSION)) -KODI_AUDIODECODER_STSOUND_LICENSE = GPLv2+ -KODI_AUDIODECODER_STSOUND_LICENSE_FILES = src/YMCodec.cpp -KODI_AUDIODECODER_STSOUND_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-timidity/Config.in b/package.bak/kodi-audiodecoder-timidity/Config.in deleted file mode 100644 index 8f604adf00..0000000000 --- a/package.bak/kodi-audiodecoder-timidity/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_TIMIDITY - bool "kodi-audiodecoder-timidity" - select BR2_PACKAGE_KODI_PLATFORM - help - Timidity decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.timidity diff --git a/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash b/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash deleted file mode 100644 index d4af0197b3..0000000000 --- a/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2e220b7d279fce73ff289536cd9e94b159ae648514fb8b423977dddb99c50e85 kodi-audiodecoder-timidity-a84559da92aa67744069fc9e9dc885732588c8ce.tar.gz diff --git a/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk b/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk deleted file mode 100644 index fb680d142f..0000000000 --- a/package.bak/kodi-audiodecoder-timidity/kodi-audiodecoder-timidity.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-timidity -# -################################################################################ - -KODI_AUDIODECODER_TIMIDITY_VERSION = a84559da92aa67744069fc9e9dc885732588c8ce -KODI_AUDIODECODER_TIMIDITY_SITE = $(call github,notspiff,audiodecoder.timidity,$(KODI_AUDIODECODER_TIMIDITY_VERSION)) -KODI_AUDIODECODER_TIMIDITY_LICENSE = GPLv2+ -KODI_AUDIODECODER_TIMIDITY_LICENSE_FILES = src/TimidityCodec.cpp -KODI_AUDIODECODER_TIMIDITY_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audiodecoder-vgmstream/Config.in b/package.bak/kodi-audiodecoder-vgmstream/Config.in deleted file mode 100644 index ebf83df23b..0000000000 --- a/package.bak/kodi-audiodecoder-vgmstream/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIODECODER_VGMSTREAM - bool "kodi-audiodecoder-vgmstream" - select BR2_PACKAGE_KODI_PLATFORM - help - VGM decoder addon for Kodi - - https://github.com/notspiff/audiodecoder.vgmstream diff --git a/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash b/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash deleted file mode 100644 index 5e6dfab3a3..0000000000 --- a/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7a376447e8390f01c18f22b57ea553441493625545537a023d5d896272e56369 kodi-audiodecoder-vgmstream-cb2892ac0465b0563ee45f532323198a6f722b62.tar.gz diff --git a/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk b/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk deleted file mode 100644 index 447d837c47..0000000000 --- a/package.bak/kodi-audiodecoder-vgmstream/kodi-audiodecoder-vgmstream.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audiodecoder-vgmstream -# -################################################################################ - -KODI_AUDIODECODER_VGMSTREAM_VERSION = cb2892ac0465b0563ee45f532323198a6f722b62 -KODI_AUDIODECODER_VGMSTREAM_SITE = $(call github,notspiff,audiodecoder.vgmstream,$(KODI_AUDIODECODER_VGMSTREAM_VERSION)) -KODI_AUDIODECODER_VGMSTREAM_LICENSE = GPLv2+ -KODI_AUDIODECODER_VGMSTREAM_LICENSE_FILES = src/VGMCodec.cpp -KODI_AUDIODECODER_VGMSTREAM_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audioencoder-flac/Config.in b/package.bak/kodi-audioencoder-flac/Config.in deleted file mode 100644 index 95acbbadb9..0000000000 --- a/package.bak/kodi-audioencoder-flac/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIOENCODER_FLAC - bool "kodi-audioencoder-flac" - select BR2_PACKAGE_FLAC - select BR2_PACKAGE_KODI_OPTICALDRIVE - select BR2_PACKAGE_LIBOGG - help - An audioencoder addon for Kodi - - https://github.com/xbmc/audioencoder.flac diff --git a/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.hash b/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.hash deleted file mode 100644 index f563f56b21..0000000000 --- a/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4317a01414577885ef4a0ac4f8d95714b021ad15fc668cbf36eae2fdf400bb33 kodi-audioencoder-flac-v1.0.0.tar.gz diff --git a/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.mk b/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.mk deleted file mode 100644 index ca4882629b..0000000000 --- a/package.bak/kodi-audioencoder-flac/kodi-audioencoder-flac.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audioencoder-flac -# -################################################################################ - -KODI_AUDIOENCODER_FLAC_VERSION = v1.0.0 -KODI_AUDIOENCODER_FLAC_SITE = $(call github,xbmc,audioencoder.flac,$(KODI_AUDIOENCODER_FLAC_VERSION)) -KODI_AUDIOENCODER_FLAC_LICENSE = GPLv2+ -KODI_AUDIOENCODER_FLAC_LICENSE_FILES = src/EncoderFlac.cpp -KODI_AUDIOENCODER_FLAC_DEPENDENCIES = flac kodi libogg host-pkgconf - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audioencoder-lame/Config.in b/package.bak/kodi-audioencoder-lame/Config.in deleted file mode 100644 index dc6a0cd7e5..0000000000 --- a/package.bak/kodi-audioencoder-lame/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIOENCODER_LAME - bool "kodi-audioencoder-lame" - select BR2_PACKAGE_KODI_OPTICALDRIVE - select BR2_PACKAGE_LAME - help - An audioencoder addon for Kodi - - https://github.com/xbmc/audioencoder.lame diff --git a/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.hash b/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.hash deleted file mode 100644 index ffd38ba803..0000000000 --- a/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7fbdc6c9111431f49498157204d19dfa94bbf9e5f807b631e84129c6c491225e kodi-audioencoder-lame-v1.0.0.tar.gz diff --git a/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.mk b/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.mk deleted file mode 100644 index 3e1836fc63..0000000000 --- a/package.bak/kodi-audioencoder-lame/kodi-audioencoder-lame.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-audioencoder-lame -# -################################################################################ - -KODI_AUDIOENCODER_LAME_VERSION = v1.0.0 -KODI_AUDIOENCODER_LAME_SITE = $(call github,xbmc,audioencoder.lame,$(KODI_AUDIOENCODER_LAME_VERSION)) -KODI_AUDIOENCODER_LAME_LICENSE = GPLv2+ -KODI_AUDIOENCODER_LAME_LICENSE_FILES = src/EncoderLame.cpp -KODI_AUDIOENCODER_LAME_DEPENDENCIES = kodi lame -KODI_AUDIOENCODER_LAME_CONF_OPTS += \ - -DLAME_INCLUDE_DIRS=$(STAGING_DIR)/usr/include - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audioencoder-vorbis/Config.in b/package.bak/kodi-audioencoder-vorbis/Config.in deleted file mode 100644 index 8b84626f08..0000000000 --- a/package.bak/kodi-audioencoder-vorbis/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIOENCODER_VORBIS - bool "kodi-audioencoder-vorbis" - select BR2_PACKAGE_KODI_OPTICALDRIVE - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - help - An audioencoder addon for Kodi - - https://github.com/xbmc/audioencoder.vorbis diff --git a/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash b/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash deleted file mode 100644 index 47f428c783..0000000000 --- a/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 65169e785d82f9081088df2693721f4a7e4b2d24f7e8b1e86b5f443206935303 kodi-audioencoder-vorbis-v1.0.0.tar.gz diff --git a/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk b/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk deleted file mode 100644 index 749ea8e179..0000000000 --- a/package.bak/kodi-audioencoder-vorbis/kodi-audioencoder-vorbis.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audioencoder-vorbis -# -################################################################################ - -KODI_AUDIOENCODER_VORBIS_VERSION = v1.0.0 -KODI_AUDIOENCODER_VORBIS_SITE = $(call github,xbmc,audioencoder.vorbis,$(KODI_AUDIOENCODER_VORBIS_VERSION)) -KODI_AUDIOENCODER_VORBIS_LICENSE = GPLv2+ -KODI_AUDIOENCODER_VORBIS_LICENSE_FILES = src/EncoderVorbis.cpp -KODI_AUDIOENCODER_VORBIS_DEPENDENCIES = kodi libogg libvorbis host-pkgconf - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-audioencoder-wav/Config.in b/package.bak/kodi-audioencoder-wav/Config.in deleted file mode 100644 index 6bdbb9aa37..0000000000 --- a/package.bak/kodi-audioencoder-wav/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_AUDIOENCODER_WAV - bool "kodi-audioencoder-wav" - select BR2_PACKAGE_KODI_OPTICALDRIVE - help - An audioencoder addon for Kodi - - https://github.com/xbmc/audioencoder.wav diff --git a/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.hash b/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.hash deleted file mode 100644 index 86eb13cc55..0000000000 --- a/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d4e6de5786b9e2bd3fa5e09314c9a60a8daac32cf96e8aa84ab42cacf60f7094 kodi-audioencoder-wav-v1.0.0.tar.gz diff --git a/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.mk b/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.mk deleted file mode 100644 index 661ab44bd8..0000000000 --- a/package.bak/kodi-audioencoder-wav/kodi-audioencoder-wav.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-audioencoder-wav -# -################################################################################ - -KODI_AUDIOENCODER_WAV_VERSION = v1.0.0 -KODI_AUDIOENCODER_WAV_SITE = $(call github,xbmc,audioencoder.wav,$(KODI_AUDIOENCODER_WAV_VERSION)) -KODI_AUDIOENCODER_WAV_LICENSE = GPLv2+ -KODI_AUDIOENCODER_WAV_LICENSE_FILES = src/EncoderWav.cpp -KODI_AUDIOENCODER_WAV_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch b/package.bak/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch deleted file mode 100644 index 18a74e7b54..0000000000 --- a/package.bak/kodi-platform/0001-kodiplatform-config.cmake-fix-for-cross-compilation.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a6e25dba4b5c1d911a4644a0ca116abc642cd72a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 09:28:24 +0200 -Subject: [PATCH] kodiplatform-config.cmake: fix for cross-compilation - -Use CMAKE_FIND_ROOT_PATH in kodiplatform-config.cmake in order to make -it cross-compilation friendly. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - kodiplatform-config.cmake.in | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 25d8004..db23dc9 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,7 +22,7 @@ if(NOT WIN32) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") - endif() - --set(kodiplatform_INCLUDE_DIRS ${TINYXML_INCLUDE_DIR} "${CMAKE_INSTALL_PREFIX}/include/kodi") -+set(kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi") - IF(WIN32) - LIST(APPEND kodiplatform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/kodi/windows") - ENDIF(WIN32) -diff --git a/kodiplatform-config.cmake.in b/kodiplatform-config.cmake.in -index 3fc5273..1bc437a 100644 ---- a/kodiplatform-config.cmake.in -+++ b/kodiplatform-config.cmake.in -@@ -10,16 +10,16 @@ - # - # propagate these properties from one build system to the other - set (kodiplatform_VERSION "@kodiplatform_VERSION_MAJOR@.@kodiplatform_VERSION_MINOR@") --set (kodiplatform_INCLUDE_DIRS @kodiplatform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+set (kodiplatform_INCLUDE_DIRS @TINYXML_INCLUDE_DIR@ ${CMAKE_FIND_ROOT_PATH}@kodiplatform_INCLUDE_DIRS@ ${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/include) - set (kodiplatform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (kodiplatform_LINKER_FLAGS "@kodiplatform_LINKER_FLAGS@") - set (kodiplatform_CONFIG_VARS "@kodiplatform_CONFIG_VARS@") - - # libraries come from the build tree where this file was generated - if(WIN32) -- set (kodiplatform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") -+ set (kodiplatform_LIBRARY "${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/kodiplatform.lib") - else(WIN32) -- set (kodiplatform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") -+ set (kodiplatform_LIBRARY "-L${CMAKE_FIND_ROOT_PATH}@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lkodiplatform") - endif(WIN32) - set (kodiplatform_LIBRARIES ${kodiplatform_LIBRARY} "@kodiplatform_LIBRARIES@") - mark_as_advanced (kodiplatform_LIBRARY) --- -2.5.0 - diff --git a/package.bak/kodi-platform/Config.in b/package.bak/kodi-platform/Config.in deleted file mode 100644 index cde1925c07..0000000000 --- a/package.bak/kodi-platform/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PLATFORM - bool - select BR2_PACKAGE_LIBPLATFORM - help - Kodi add-on platform support library - - https://github.com/xbmc/kodi-platform diff --git a/package.bak/kodi-platform/kodi-platform.hash b/package.bak/kodi-platform/kodi-platform.hash deleted file mode 100644 index a2484484e3..0000000000 --- a/package.bak/kodi-platform/kodi-platform.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 88741358d5d54a0031553ac28aa63bc56c44d994a76f8651bac94a1e244a6595 kodi-platform-45d6ad1984fdb1dc855076ff18484dbec33939d1.tar.gz diff --git a/package.bak/kodi-platform/kodi-platform.mk b/package.bak/kodi-platform/kodi-platform.mk deleted file mode 100644 index 4b642f9cfe..0000000000 --- a/package.bak/kodi-platform/kodi-platform.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-platform -# -################################################################################ - -KODI_PLATFORM_VERSION = 45d6ad1984fdb1dc855076ff18484dbec33939d1 -KODI_PLATFORM_SITE = $(call github,xbmc,kodi-platform,$(KODI_PLATFORM_VERSION)) -KODI_PLATFORM_LICENSE = GPLv2+ -KODI_PLATFORM_LICENSE_FILES = src/util/XMLUtils.h -KODI_PLATFORM_INSTALL_STAGING = YES -KODI_PLATFORM_DEPENDENCIES = libplatform kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-argustv/Config.in b/package.bak/kodi-pvr-argustv/Config.in deleted file mode 100644 index 216000aefd..0000000000 --- a/package.bak/kodi-pvr-argustv/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_ARGUSTV - bool "kodi-pvr-argustv" - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi's ARGUS TV client addon - - https://github.com/kodi-pvr/pvr.argustv diff --git a/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.hash b/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.hash deleted file mode 100644 index ef6438797e..0000000000 --- a/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 68fab94cabbeb0fbf6fac0fcb66e8362505ee736ae3b72c4e29867cfc44b595b kodi-pvr-argustv-2aca01c6db28fe3145b57eb5bf5841895c618507.tar.gz diff --git a/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.mk b/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.mk deleted file mode 100644 index 3c0f40a29e..0000000000 --- a/package.bak/kodi-pvr-argustv/kodi-pvr-argustv.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-argustv -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_ARGUSTV_VERSION = 2aca01c6db28fe3145b57eb5bf5841895c618507 -KODI_PVR_ARGUSTV_SITE = $(call github,kodi-pvr,pvr.argustv,$(KODI_PVR_ARGUSTV_VERSION)) -KODI_PVR_ARGUSTV_LICENSE = GPLv2+ -KODI_PVR_ARGUSTV_LICENSE_FILES = src/client.h -KODI_PVR_ARGUSTV_DEPENDENCIES = jsoncpp kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-dvblink/Config.in b/package.bak/kodi-pvr-dvblink/Config.in deleted file mode 100644 index 57f11271ec..0000000000 --- a/package.bak/kodi-pvr-dvblink/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_DVBLINK - bool "kodi-pvr-dvblink" - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_TINYXML2 - help - Kodi's DVBLink client addon - - https://github.com/kodi-pvr/pvr.dvblink diff --git a/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.hash b/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.hash deleted file mode 100644 index 713aae0ec6..0000000000 --- a/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 1c359c1a59c50f98910ec1d4bc332cd9360447e05d63f0d90b07a7ba22bc7ab6 kodi-pvr-dvblink-06c4e5603e4db0bda3f35e80344a308f486ae0f9.tar.gz diff --git a/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.mk b/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.mk deleted file mode 100644 index 75ce6217b4..0000000000 --- a/package.bak/kodi-pvr-dvblink/kodi-pvr-dvblink.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-dvblink -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBLINK_VERSION = 06c4e5603e4db0bda3f35e80344a308f486ae0f9 -KODI_PVR_DVBLINK_SITE = $(call github,kodi-pvr,pvr.dvblink,$(KODI_PVR_DVBLINK_VERSION)) -KODI_PVR_DVBLINK_LICENSE = GPLv2+ -KODI_PVR_DVBLINK_LICENSE_FILES = src/client.h -KODI_PVR_DVBLINK_DEPENDENCIES = kodi-platform tinyxml2 - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-dvbviewer/Config.in b/package.bak/kodi-pvr-dvbviewer/Config.in deleted file mode 100644 index e7dd7b3eb6..0000000000 --- a/package.bak/kodi-pvr-dvbviewer/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_DVBVIEWER - bool "kodi-pvr-dvbviewer" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi's DVBViewer client addon - - https://github.com/kodi-pvr/pvr.dvbviewer diff --git a/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash b/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash deleted file mode 100644 index 785fd6c2a7..0000000000 --- a/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 a6a6d63e4b88df0d8b5166efdc09f6410cae736e610b328aaea49c8688bfce82 kodi-pvr-dvbviewer-26286604635a170eeea68df9b7eb52fea0056cfe.tar.gz diff --git a/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk b/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk deleted file mode 100644 index b2fae52212..0000000000 --- a/package.bak/kodi-pvr-dvbviewer/kodi-pvr-dvbviewer.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-dvbviewer -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_DVBVIEWER_VERSION = 26286604635a170eeea68df9b7eb52fea0056cfe -KODI_PVR_DVBVIEWER_SITE = $(call github,kodi-pvr,pvr.dvbviewer,$(KODI_PVR_DVBVIEWER_VERSION)) -KODI_PVR_DVBVIEWER_LICENSE = GPLv2+ -KODI_PVR_DVBVIEWER_LICENSE_FILES = src/client.h -KODI_PVR_DVBVIEWER_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-filmon/Config.in b/package.bak/kodi-pvr-filmon/Config.in deleted file mode 100644 index 0b662df176..0000000000 --- a/package.bak/kodi-pvr-filmon/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_FILMON - bool "kodi-pvr-filmon" - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM - help - Filmon PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.filmon diff --git a/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.hash b/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.hash deleted file mode 100644 index b60df98235..0000000000 --- a/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4a51ba62239c96c16c569ca47bc7aac4a2e9e9ef4ae09dfc23d10be15afdee34 kodi-pvr-filmon-4b34b41999b86e675f794ec8e5a63c85b78c001e.tar.gz diff --git a/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.mk b/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.mk deleted file mode 100644 index 0174aa4547..0000000000 --- a/package.bak/kodi-pvr-filmon/kodi-pvr-filmon.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-filmon -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_FILMON_VERSION = 4b34b41999b86e675f794ec8e5a63c85b78c001e -KODI_PVR_FILMON_SITE = $(call github,kodi-pvr,pvr.filmon,$(KODI_PVR_FILMON_VERSION)) -KODI_PVR_FILMON_LICENSE = GPLv2+ -KODI_PVR_FILMON_LICENSE_FILES = src/client.h -KODI_PVR_FILMON_DEPENDENCIES = jsoncpp kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-hdhomerun/Config.in b/package.bak/kodi-pvr-hdhomerun/Config.in deleted file mode 100644 index ed5b914cb3..0000000000 --- a/package.bak/kodi-pvr-hdhomerun/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_HDHOMERUN - bool "kodi-pvr-hdhomerun" - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM - select BR2_PACKAGE_LIBHDHOMERUN - help - Kodi's HDHomeRun client addon - - https://github.com/kodi-pvr/pvr.hdhomerun diff --git a/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash b/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash deleted file mode 100644 index fcf0468885..0000000000 --- a/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 84c7dd60db6e0d0c40cc83a70ad860127d0e5c8e77c6091014055372cad5fe1f kodi-pvr-hdhomerun-aa4324eaa5f738394f21d3f54667e346eb65038e.tar.gz diff --git a/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk b/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk deleted file mode 100644 index 67980fba93..0000000000 --- a/package.bak/kodi-pvr-hdhomerun/kodi-pvr-hdhomerun.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-hdhomerun -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HDHOMERUN_VERSION = aa4324eaa5f738394f21d3f54667e346eb65038e -KODI_PVR_HDHOMERUN_SITE = $(call github,kodi-pvr,pvr.hdhomerun,$(KODI_PVR_HDHOMERUN_VERSION)) -KODI_PVR_HDHOMERUN_LICENSE = GPLv2+ -KODI_PVR_HDHOMERUN_LICENSE_FILES = src/client.h -KODI_PVR_HDHOMERUN_DEPENDENCIES = jsoncpp kodi-platform libhdhomerun - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-hts/Config.in b/package.bak/kodi-pvr-hts/Config.in deleted file mode 100644 index c4c4497bd3..0000000000 --- a/package.bak/kodi-pvr-hts/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_HTS - bool "kodi-pvr-hts" - select BR2_PACKAGE_KODI_PLATFORM - help - Tvheadend HTSP PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.hts diff --git a/package.bak/kodi-pvr-hts/kodi-pvr-hts.hash b/package.bak/kodi-pvr-hts/kodi-pvr-hts.hash deleted file mode 100644 index 369e6c0232..0000000000 --- a/package.bak/kodi-pvr-hts/kodi-pvr-hts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 004dee4455d5d539b5e42d663659d4886d9a8650847ad614fa2179bbaace3783 kodi-pvr-hts-3c673b5b29fc26c203c79f7df58680af50a1afa7.tar.gz diff --git a/package.bak/kodi-pvr-hts/kodi-pvr-hts.mk b/package.bak/kodi-pvr-hts/kodi-pvr-hts.mk deleted file mode 100644 index 4ca5a318fd..0000000000 --- a/package.bak/kodi-pvr-hts/kodi-pvr-hts.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-hts -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_HTS_VERSION = 3c673b5b29fc26c203c79f7df58680af50a1afa7 -KODI_PVR_HTS_SITE = $(call github,kodi-pvr,pvr.hts,$(KODI_PVR_HTS_VERSION)) -KODI_PVR_HTS_LICENSE = GPLv2+ -KODI_PVR_HTS_LICENSE_FILES = src/client.h -KODI_PVR_HTS_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-iptvsimple/Config.in b/package.bak/kodi-pvr-iptvsimple/Config.in deleted file mode 100644 index b59674979f..0000000000 --- a/package.bak/kodi-pvr-iptvsimple/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_IPTVSIMPLE - bool "kodi-pvr-iptvsimple" - select BR2_PACKAGE_KODI_PLATFORM - help - IPTV Live TV and Radio PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.iptvsimple diff --git a/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash b/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash deleted file mode 100644 index cdf94fdb9f..0000000000 --- a/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 5b5c67f70f47c52ccda673c3a98b5a81827835fb74289754bebf840133a84d56 kodi-pvr-iptvsimple-ae9bc1d94e97c5381b2fa59adac70a57146016cd.tar.gz diff --git a/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk b/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk deleted file mode 100644 index 85039dd969..0000000000 --- a/package.bak/kodi-pvr-iptvsimple/kodi-pvr-iptvsimple.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-iptvsimple -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_IPTVSIMPLE_VERSION = ae9bc1d94e97c5381b2fa59adac70a57146016cd -KODI_PVR_IPTVSIMPLE_SITE = $(call github,kodi-pvr,pvr.iptvsimple,$(KODI_PVR_IPTVSIMPLE_VERSION)) -KODI_PVR_IPTVSIMPLE_LICENSE = GPLv2+ -KODI_PVR_IPTVSIMPLE_LICENSE_FILES = src/client.h -KODI_PVR_IPTVSIMPLE_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-mediaportal-tvserver/Config.in b/package.bak/kodi-pvr-mediaportal-tvserver/Config.in deleted file mode 100644 index 733ca8859e..0000000000 --- a/package.bak/kodi-pvr-mediaportal-tvserver/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_MEDIAPORTAL_TVSERVER - bool "kodi-pvr-mediaportal-tvserver" - select BR2_PACKAGE_KODI_PLATFORM - help - MediaPortal TVServer PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.mediaportal.tvserver diff --git a/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash b/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash deleted file mode 100644 index 74770fd3d9..0000000000 --- a/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 45590c1b8dc57f2b5921641c864e68671c32db33f55db82ca62411557e9278b9 kodi-pvr-mediaportal-tvserver-a3dd464379a56131bae61b94275c14a3abcf2869.tar.gz diff --git a/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk b/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk deleted file mode 100644 index e3a4df4390..0000000000 --- a/package.bak/kodi-pvr-mediaportal-tvserver/kodi-pvr-mediaportal-tvserver.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-mediaportal-tvserver -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION = a3dd464379a56131bae61b94275c14a3abcf2869 -KODI_PVR_MEDIAPORTAL_TVSERVER_SITE = $(call github,kodi-pvr,pvr.mediaportal.tvserver,$(KODI_PVR_MEDIAPORTAL_TVSERVER_VERSION)) -KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE = GPLv2+ -KODI_PVR_MEDIAPORTAL_TVSERVER_LICENSE_FILES = src/client.h -KODI_PVR_MEDIAPORTAL_TVSERVER_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-mythtv/Config.in b/package.bak/kodi-pvr-mythtv/Config.in deleted file mode 100644 index 798ff3e911..0000000000 --- a/package.bak/kodi-pvr-mythtv/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_MYTHTV - bool "kodi-pvr-mythtv" - select BR2_PACKAGE_KODI_PLATFORM - help - MythTV PVR for Kodi - - https://github.com/kodi-pvr/pvr.mythtv diff --git a/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.hash b/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.hash deleted file mode 100644 index 0e9eba87e2..0000000000 --- a/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 f6d61b134a96a25820b616e60e43ac1ed33bd3f8b9f7612a6f6324356b78582d kodi-pvr-mythtv-84b0b6b122ca779588de5c895ef77b6bc454e859.tar.gz diff --git a/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.mk b/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.mk deleted file mode 100644 index a8a1a6daee..0000000000 --- a/package.bak/kodi-pvr-mythtv/kodi-pvr-mythtv.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-mythtv -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_MYTHTV_VERSION = 84b0b6b122ca779588de5c895ef77b6bc454e859 -KODI_PVR_MYTHTV_SITE = $(call github,kodi-pvr,pvr.mythtv,$(KODI_PVR_MYTHTV_VERSION)) -KODI_PVR_MYTHTV_LICENSE = GPLv2+ -KODI_PVR_MYTHTV_LICENSE_FILES = src/client.h -KODI_PVR_MYTHTV_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch b/package.bak/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch deleted file mode 100644 index 18e59951c6..0000000000 --- a/package.bak/kodi-pvr-nextpvr/0001-Sync-enum-representation-of-char_class_e-in-struct-t.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2698ac4eeca3a82967ff83386460c070ce387ead Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 28 Feb 2016 01:07:52 +0100 -Subject: [PATCH] Sync enum representation of char_class_e in struct traits - with definition - -Copied from -https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/28 -https://github.com/kodi-pvr/pvr.mediaportal.tvserver/pull/35 - -Signed-off-by: Bernd Kuhls -[Patch sent upstream: https://github.com/kodi-pvr/pvr.nextpvr/pull/42] ---- - src/uri.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/uri.h b/src/uri.h -index 2757cf0..3dbca88 100644 ---- a/src/uri.h -+++ b/src/uri.h -@@ -21,13 +21,13 @@ - namespace uri - { - /// Char class. -- enum char_class_e -+ typedef enum char_class_e : signed char - { - CINV = -2, ///< invalid - CEND = -1, ///< end delimitor - CVAL = 0, ///< valid any position - CVA2 = 1, ///< valid anywhere but 1st position -- }; -+ } char_class_e_type; - - /// Traits used for parsing and encoding components. - struct traits -@@ -35,7 +35,7 @@ namespace uri - const char* begin_cstring; ///< begin cstring (or 0 if none) - const char begin_char; ///< begin char (or 0 if none) - const char end_char; ///< end char (or 0 if none) -- char char_class[256]; ///< map of char to class -+ const char_class_e_type char_class[256]; ///< map of char to class - }; - - /** --- -2.7.0 - diff --git a/package.bak/kodi-pvr-nextpvr/Config.in b/package.bak/kodi-pvr-nextpvr/Config.in deleted file mode 100644 index e520426796..0000000000 --- a/package.bak/kodi-pvr-nextpvr/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_NEXTPVR - bool "kodi-pvr-nextpvr" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi's NextPVR client addon - - https://github.com/kodi-pvr/pvr.nextpvr diff --git a/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash b/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash deleted file mode 100644 index 64c09cfe65..0000000000 --- a/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 8c4a36c21dc65cc358b34e5c2db849997f0add2501c3f787f99df3ae0ea850c5 kodi-pvr-nextpvr-2055105c93e18e04e73c87578bece3edf7525e14.tar.gz diff --git a/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk b/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk deleted file mode 100644 index a8b823543e..0000000000 --- a/package.bak/kodi-pvr-nextpvr/kodi-pvr-nextpvr.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-nextpvr -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NEXTPVR_VERSION = 2055105c93e18e04e73c87578bece3edf7525e14 -KODI_PVR_NEXTPVR_SITE = $(call github,kodi-pvr,pvr.nextpvr,$(KODI_PVR_NEXTPVR_VERSION)) -KODI_PVR_NEXTPVR_LICENSE = GPLv2+ -KODI_PVR_NEXTPVR_LICENSE_FILES = src/client.h -KODI_PVR_NEXTPVR_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-njoy/Config.in b/package.bak/kodi-pvr-njoy/Config.in deleted file mode 100644 index 33c493cb8b..0000000000 --- a/package.bak/kodi-pvr-njoy/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_NJOY - bool "kodi-pvr-njoy" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi's Njoy N7 client addon - - https://github.com/kodi-pvr/pvr.njoy diff --git a/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.hash b/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.hash deleted file mode 100644 index c6006d2a33..0000000000 --- a/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 aa5e8b471993326be3622056a26ebf7387ac4758348e8f64632c1fc6979d993e kodi-pvr-njoy-480c1591d486c6166746fb8b5efc68a7aca3d0f0.tar.gz diff --git a/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.mk b/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.mk deleted file mode 100644 index 0f2eecd3a6..0000000000 --- a/package.bak/kodi-pvr-njoy/kodi-pvr-njoy.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-njoy -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_NJOY_VERSION = 480c1591d486c6166746fb8b5efc68a7aca3d0f0 -KODI_PVR_NJOY_SITE = $(call github,kodi-pvr,pvr.njoy,$(KODI_PVR_NJOY_VERSION)) -KODI_PVR_NJOY_LICENSE = GPLv2+ -KODI_PVR_NJOY_LICENSE_FILES = src/client.h -KODI_PVR_NJOY_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-pctv/Config.in b/package.bak/kodi-pvr-pctv/Config.in deleted file mode 100644 index 255cd4a5f0..0000000000 --- a/package.bak/kodi-pvr-pctv/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_PCTV - bool "kodi-pvr-pctv" - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM - help - PCTV PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.vdr.vnsi diff --git a/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.hash b/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.hash deleted file mode 100644 index 0ff481a3e5..0000000000 --- a/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4c045722c326dfe152ffadb8d966e8db4caa6128a7c53b2a852fce85f803bcbc kodi-pvr-pctv-0096770e96f84c46f444e159b9b737ac8b4238dc.tar.gz diff --git a/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.mk b/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.mk deleted file mode 100644 index a9824d5c0d..0000000000 --- a/package.bak/kodi-pvr-pctv/kodi-pvr-pctv.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-pctv -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_PCTV_VERSION = 0096770e96f84c46f444e159b9b737ac8b4238dc -KODI_PVR_PCTV_SITE = $(call github,kodi-pvr,pvr.pctv,$(KODI_PVR_PCTV_VERSION)) -KODI_PVR_PCTV_LICENSE = GPLv2+ -KODI_PVR_PCTV_LICENSE_FILES = src/client.h -KODI_PVR_PCTV_DEPENDENCIES = jsoncpp kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-stalker/Config.in b/package.bak/kodi-pvr-stalker/Config.in deleted file mode 100644 index 3ec530cd39..0000000000 --- a/package.bak/kodi-pvr-stalker/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_STALKER - bool "kodi-pvr-stalker" - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_KODI_PLATFORM - help - A PVR Client that connects Kodi to Stalker Middleware - - https://github.com/kodi-pvr/pvr.stalker diff --git a/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.hash b/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.hash deleted file mode 100644 index 7af1bcb28a..0000000000 --- a/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e16cb12bd7a78b8849f370bedb8093d3cb1deb3a766a66efe4b838fc569ab50c kodi-pvr-stalker-5e588330c453141ae0a2f4fd9c02d909ac9d199e.tar.gz diff --git a/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.mk b/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.mk deleted file mode 100644 index d1fa8a0f06..0000000000 --- a/package.bak/kodi-pvr-stalker/kodi-pvr-stalker.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-stalker -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_STALKER_VERSION = 5e588330c453141ae0a2f4fd9c02d909ac9d199e -KODI_PVR_STALKER_SITE = $(call github,kodi-pvr,pvr.stalker,$(KODI_PVR_STALKER_VERSION)) -KODI_PVR_STALKER_LICENSE = GPLv2+ -KODI_PVR_STALKER_LICENSE_FILES = src/client.h -KODI_PVR_STALKER_DEPENDENCIES = jsoncpp kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-vbox/Config.in b/package.bak/kodi-pvr-vbox/Config.in deleted file mode 100644 index 3a5f8c4649..0000000000 --- a/package.bak/kodi-pvr-vbox/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_VBOX - bool "kodi-pvr-vbox" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi PVR addon for interfacing with VBox Communications XTi TV Gateway - - https://github.com/kodi-pvr/pvr.vbox diff --git a/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.hash b/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.hash deleted file mode 100644 index 705c0cb3e1..0000000000 --- a/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 8eb43fb6e2a3132324bf24787bc0545c610832648aa17c12e93676502f7fc565 kodi-pvr-vbox-15e864d160da5a051e18aef06f3a53e49808be02.tar.gz diff --git a/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.mk b/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.mk deleted file mode 100644 index 593c1e7cc5..0000000000 --- a/package.bak/kodi-pvr-vbox/kodi-pvr-vbox.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-vbox -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VBOX_VERSION = 15e864d160da5a051e18aef06f3a53e49808be02 -KODI_PVR_VBOX_SITE = $(call github,kodi-pvr,pvr.vbox,$(KODI_PVR_VBOX_VERSION)) -KODI_PVR_VBOX_LICENSE = GPLv2+ -KODI_PVR_VBOX_LICENSE_FILES = src/client.h -KODI_PVR_VBOX_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-vdr-vnsi/Config.in b/package.bak/kodi-pvr-vdr-vnsi/Config.in deleted file mode 100644 index 768dec88fd..0000000000 --- a/package.bak/kodi-pvr-vdr-vnsi/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_VDR_VNSI - bool "kodi-pvr-vdr-vnsi" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi PVR addon VNSI - - https://github.com/kodi-pvr/pvr.vdr.vnsi diff --git a/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash b/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash deleted file mode 100644 index ecce639d71..0000000000 --- a/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 1d9e70030b73f44786d54e42e46c6bfa7810af3e4c71ba0dca95c2aa1751ef9b kodi-pvr-vdr-vnsi-7e11b853637ec436e30e4ac826de6ee87c303482.tar.gz diff --git a/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk b/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk deleted file mode 100644 index f8e1e92730..0000000000 --- a/package.bak/kodi-pvr-vdr-vnsi/kodi-pvr-vdr-vnsi.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-vdr-vnsi -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VDR_VNSI_VERSION = 7e11b853637ec436e30e4ac826de6ee87c303482 -KODI_PVR_VDR_VNSI_SITE = $(call github,kodi-pvr,pvr.vdr.vnsi,$(KODI_PVR_VDR_VNSI_VERSION)) -KODI_PVR_VDR_VNSI_LICENSE = GPLv2+ -KODI_PVR_VDR_VNSI_LICENSE_FILES = src/client.h -KODI_PVR_VDR_VNSI_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-vuplus/Config.in b/package.bak/kodi-pvr-vuplus/Config.in deleted file mode 100644 index a56c4ede93..0000000000 --- a/package.bak/kodi-pvr-vuplus/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_VUPLUS - bool "kodi-pvr-vuplus" - select BR2_PACKAGE_KODI_PLATFORM - help - VuPlus PVR client addon for Kodi - - https://github.com/kodi-pvr/pvr.vuplus diff --git a/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.hash b/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.hash deleted file mode 100644 index efdb12539d..0000000000 --- a/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 9684775c296dfd9b925d73ed1c21bee45afba4785d1bfb226f98b09ed235a8ee kodi-pvr-vuplus-815ea2f303dbe7dd19f87c53965dfdf2358fcdc8.tar.gz diff --git a/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.mk b/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.mk deleted file mode 100644 index e839bcce8a..0000000000 --- a/package.bak/kodi-pvr-vuplus/kodi-pvr-vuplus.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-vuplus -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_VUPLUS_VERSION = 815ea2f303dbe7dd19f87c53965dfdf2358fcdc8 -KODI_PVR_VUPLUS_SITE = $(call github,kodi-pvr,pvr.vuplus,$(KODI_PVR_VUPLUS_VERSION)) -KODI_PVR_VUPLUS_LICENSE = GPLv2+ -KODI_PVR_VUPLUS_LICENSE_FILES = src/client.h -KODI_PVR_VUPLUS_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-pvr-wmc/Config.in b/package.bak/kodi-pvr-wmc/Config.in deleted file mode 100644 index 2672c83434..0000000000 --- a/package.bak/kodi-pvr-wmc/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_KODI_PVR_WMC - bool "kodi-pvr-wmc" - select BR2_PACKAGE_KODI_PLATFORM - help - Kodi's Windows Media Center client addon - - https://github.com/kodi-pvr/pvr.wmc diff --git a/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.hash b/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.hash deleted file mode 100644 index 6cbdede3fa..0000000000 --- a/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 25963d8acbce397b6ec940d5ee1d7a69481d295ae31876daf57d3d3537b14543 kodi-pvr-wmc-949fcd162206b569af15942180e6c133ad61e336.tar.gz diff --git a/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.mk b/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.mk deleted file mode 100644 index 194bd1f2be..0000000000 --- a/package.bak/kodi-pvr-wmc/kodi-pvr-wmc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# kodi-pvr-wmc -# -################################################################################ - -# This cset is on the branch 'Jarvis' -# When Kodi is updated, then this should be updated to the corresponding branch -KODI_PVR_WMC_VERSION = 949fcd162206b569af15942180e6c133ad61e336 -KODI_PVR_WMC_SITE = $(call github,kodi-pvr,pvr.wmc,$(KODI_PVR_WMC_VERSION)) -KODI_PVR_WMC_LICENSE = GPLv2+ -KODI_PVR_WMC_LICENSE_FILES = src/client.h -KODI_PVR_WMC_DEPENDENCIES = kodi-platform - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-asteroids/Config.in b/package.bak/kodi-screensaver-asteroids/Config.in deleted file mode 100644 index ccc2aba6aa..0000000000 --- a/package.bak/kodi-screensaver-asteroids/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_ASTEROIDS - bool "kodi-screensaver-asteroids" - depends on BR2_PACKAGE_HAS_LIBGL - help - Asteroids screensaver for Kodi - - https://github.com/notspiff/screensaver.asteroids - -comment "kodi-screensaver-asteroids needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash b/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash deleted file mode 100644 index a70f1b0a5d..0000000000 --- a/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b76b9ba122cebddc7c201b088d93e86fde8fc76e7e9f167ff3e43c3390088f3f kodi-screensaver-asteroids-c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa.tar.gz diff --git a/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk b/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk deleted file mode 100644 index 1af1f2ed6b..0000000000 --- a/package.bak/kodi-screensaver-asteroids/kodi-screensaver-asteroids.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-asteroids -# -################################################################################ - -KODI_SCREENSAVER_ASTEROIDS_VERSION = c7ae05f1881b9abda6a1ac6beaca8d64a164c4fa -KODI_SCREENSAVER_ASTEROIDS_SITE = $(call github,notspiff,screensaver.asteroids,$(KODI_SCREENSAVER_ASTEROIDS_VERSION)) -KODI_SCREENSAVER_ASTEROIDS_LICENSE = GPLv2+ -KODI_SCREENSAVER_ASTEROIDS_LICENSE_FILES = src/main.cpp -KODI_SCREENSAVER_ASTEROIDS_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-asterwave/Config.in b/package.bak/kodi-screensaver-asterwave/Config.in deleted file mode 100644 index bd5db738ca..0000000000 --- a/package.bak/kodi-screensaver-asterwave/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_ASTERWAVE - bool "kodi-screensaver-asterwave" - depends on BR2_PACKAGE_HAS_LIBGL # libglu, libsoil - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBSOIL - help - AsterWave screensaver for Kodi - - https://github.com/notspiff/screensaver.asterwave - -comment "kodi-screensaver-asterwave needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash b/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash deleted file mode 100644 index 5f04031af0..0000000000 --- a/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6bf9367889c4ddece7e0c3720762d41bb0b22fc9ab28d1c8759edb1f77487ecd kodi-screensaver-asterwave-0dc2c48dadb100954eef823e7e3a5f502ce65b1e.tar.gz diff --git a/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk b/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk deleted file mode 100644 index 7c718ccd84..0000000000 --- a/package.bak/kodi-screensaver-asterwave/kodi-screensaver-asterwave.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# kodi-screensaver-asterwave -# -################################################################################ - -KODI_SCREENSAVER_ASTERWAVE_VERSION = 0dc2c48dadb100954eef823e7e3a5f502ce65b1e -KODI_SCREENSAVER_ASTERWAVE_SITE = $(call github,notspiff,screensaver.asterwave,$(KODI_SCREENSAVER_ASTERWAVE_VERSION)) -KODI_SCREENSAVER_ASTERWAVE_DEPENDENCIES = kodi libglu libsoil - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-biogenesis/Config.in b/package.bak/kodi-screensaver-biogenesis/Config.in deleted file mode 100644 index cdc2d91951..0000000000 --- a/package.bak/kodi-screensaver-biogenesis/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_BIOGENESIS - bool "kodi-screensaver-biogenesis" - depends on BR2_PACKAGE_HAS_LIBGL - help - BioGenesis screensaver for Kodi - - https://github.com/notspiff/screensaver.biogenesis - -comment "kodi-screensaver-biogenesis needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash b/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash deleted file mode 100644 index 6fc273d184..0000000000 --- a/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 25e497c6843a7d933d1e4736e8dcb671bc9881328d5e27349dd0b25cb9be07eb kodi-screensaver-biogenesis-39928eef56ed639085d401dd97bf18f44b1f3e8b.tar.gz diff --git a/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk b/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk deleted file mode 100644 index dce6968d28..0000000000 --- a/package.bak/kodi-screensaver-biogenesis/kodi-screensaver-biogenesis.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-biogenesis -# -################################################################################ - -KODI_SCREENSAVER_BIOGENESIS_VERSION = 39928eef56ed639085d401dd97bf18f44b1f3e8b -KODI_SCREENSAVER_BIOGENESIS_SITE = $(call github,notspiff,screensaver.biogenesis,$(KODI_SCREENSAVER_BIOGENESIS_VERSION)) -KODI_SCREENSAVER_BIOGENESIS_LICENSE = GPLv2+ -KODI_SCREENSAVER_BIOGENESIS_LICENSE_FILES = src/Life.cpp -KODI_SCREENSAVER_BIOGENESIS_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-cpblobs/Config.in b/package.bak/kodi-screensaver-cpblobs/Config.in deleted file mode 100644 index e80ea0ebb3..0000000000 --- a/package.bak/kodi-screensaver-cpblobs/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_CPBLOBS - bool "kodi-screensaver-cpblobs" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL - help - CpBlobs screensaver for Kodi - - https://github.com/notspiff/screensaver.cpblobs - -comment "kodi-screensaver-cpblobs needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash b/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash deleted file mode 100644 index ebf19d9dee..0000000000 --- a/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c2d19c33aff73b99cbf51f943b62e58b2b6233dcf1d789ae8f73e92fa96f07bc kodi-screensaver-cpblobs-87a3abfbe6e4fd1089548eab77a84902d0e1af60.tar.gz diff --git a/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk b/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk deleted file mode 100644 index bf67ea089a..0000000000 --- a/package.bak/kodi-screensaver-cpblobs/kodi-screensaver-cpblobs.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-cpblobs -# -################################################################################ - -KODI_SCREENSAVER_CPBLOBS_VERSION = 87a3abfbe6e4fd1089548eab77a84902d0e1af60 -KODI_SCREENSAVER_CPBLOBS_SITE = $(call github,notspiff,screensaver.cpblobs,$(KODI_SCREENSAVER_CPBLOBS_VERSION)) -KODI_SCREENSAVER_CPBLOBS_LICENSE = GPLv2 -KODI_SCREENSAVER_CPBLOBS_LICENSE_FILES = LICENSE -KODI_SCREENSAVER_CPBLOBS_DEPENDENCIES = kodi libsoil - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-crystalmorph/Config.in b/package.bak/kodi-screensaver-crystalmorph/Config.in deleted file mode 100644 index 1303d229fd..0000000000 --- a/package.bak/kodi-screensaver-crystalmorph/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_CRYSTALMORPH - bool "kodi-screensaver-crystalmorph" - depends on BR2_PACKAGE_HAS_LIBGL # libglu - help - CrystalMorph screensaver for Kodi - - https://github.com/notspiff/screensaver.crystalmorph - -comment "kodi-screensaver-crystalmorph needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash b/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash deleted file mode 100644 index 01183d74f0..0000000000 --- a/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 680e9354adcb7048b5c2b55b3c49cf37cea0e12e6564018cd694feeb253c90dd kodi-screensaver-crystalmorph-2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68.tar.gz diff --git a/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk b/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk deleted file mode 100644 index 49ddb43c3a..0000000000 --- a/package.bak/kodi-screensaver-crystalmorph/kodi-screensaver-crystalmorph.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-crystalmorph -# -################################################################################ - -KODI_SCREENSAVER_CRYSTALMORPH_VERSION = 2e7c10e3543f5aaab6fd2f5aa9d05b976a43ba68 -KODI_SCREENSAVER_CRYSTALMORPH_SITE = $(call github,notspiff,screensaver.crystalmorph,$(KODI_SCREENSAVER_CRYSTALMORPH_VERSION)) -KODI_SCREENSAVER_CRYSTALMORPH_LICENSE = GPLv2+ -KODI_SCREENSAVER_CRYSTALMORPH_LICENSE_FILES = src/Fractal.cpp -KODI_SCREENSAVER_CRYSTALMORPH_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-greynetic/Config.in b/package.bak/kodi-screensaver-greynetic/Config.in deleted file mode 100644 index ce636b8271..0000000000 --- a/package.bak/kodi-screensaver-greynetic/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_GREYNETIC - bool "kodi-screensaver-greynetic" - depends on BR2_PACKAGE_HAS_LIBGL - help - Greynetic screensaver for Kodi - - https://github.com/notspiff/screensaver.greynetic - -comment "kodi-screensaver-greynetic needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash b/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash deleted file mode 100644 index 93394532e6..0000000000 --- a/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 fc114434db18a885fda30ac6b82fe82ec1d5ed97e2ff6414b4927487da684871 kodi-screensaver-greynetic-80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb.tar.gz diff --git a/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk b/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk deleted file mode 100644 index 9773bac1c3..0000000000 --- a/package.bak/kodi-screensaver-greynetic/kodi-screensaver-greynetic.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-greynetic -# -################################################################################ - -KODI_SCREENSAVER_GREYNETIC_VERSION = 80e850eb3cbc7ee2c937fcab666dc45d2b2ee0bb -KODI_SCREENSAVER_GREYNETIC_SITE = $(call github,notspiff,screensaver.greynetic,$(KODI_SCREENSAVER_GREYNETIC_VERSION)) -KODI_SCREENSAVER_GREYNETIC_LICENSE = GPLv2+ -KODI_SCREENSAVER_GREYNETIC_LICENSE_FILES = src/GreyNetic.cpp -KODI_SCREENSAVER_GREYNETIC_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-matrixtrails/Config.in b/package.bak/kodi-screensaver-matrixtrails/Config.in deleted file mode 100644 index e2d3f71acf..0000000000 --- a/package.bak/kodi-screensaver-matrixtrails/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_MATRIXTRAILS - bool "kodi-screensaver-matrixtrails" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL - help - Matrix trails screensaver for Kodi - - https://github.com/notspiff/screensaver.matrixtrails - -comment "kodi-screensaver-matrixtrails needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash b/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash deleted file mode 100644 index 5ae2459cff..0000000000 --- a/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 91990a29072cf85f4b9253a16a362d83fdfcc7595de796d982a189aa8618555c kodi-screensaver-matrixtrails-16057e7195f930109f0a4aea999296ca315700e5.tar.gz diff --git a/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk b/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk deleted file mode 100644 index 5ecacdf56f..0000000000 --- a/package.bak/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-screensaver-matrixtrails -# -################################################################################ - -KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 16057e7195f930109f0a4aea999296ca315700e5 -KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,notspiff,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION)) -KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPLv2+ -KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = src/matrixtrails.cpp - -KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi libsoil - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-pingpong/Config.in b/package.bak/kodi-screensaver-pingpong/Config.in deleted file mode 100644 index 3971052b94..0000000000 --- a/package.bak/kodi-screensaver-pingpong/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_PINGPONG - bool "kodi-screensaver-pingpong" - depends on BR2_PACKAGE_HAS_LIBGL - help - Ping-pong screensaver for Kodi - - https://github.com/notspiff/screensaver.pingpong - -comment "kodi-screensaver-pingpong needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash b/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash deleted file mode 100644 index 79d4dd40a7..0000000000 --- a/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 59a5cdfa6387760205efabcd91bc64fdc92f103c8f213b650018160f6c1a691c kodi-screensaver-pingpong-5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17.tar.gz diff --git a/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk b/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk deleted file mode 100644 index 2adf9601f4..0000000000 --- a/package.bak/kodi-screensaver-pingpong/kodi-screensaver-pingpong.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-pingpong -# -################################################################################ - -KODI_SCREENSAVER_PINGPONG_VERSION = 5c7cf6fd9f9ff1468f620bb891e66bebd3a5fe17 -KODI_SCREENSAVER_PINGPONG_SITE = $(call github,notspiff,screensaver.pingpong,$(KODI_SCREENSAVER_PINGPONG_VERSION)) -KODI_SCREENSAVER_PINGPONG_LICENSE = GPLv2+ -KODI_SCREENSAVER_PINGPONG_LICENSE_FILES = src/readme.txt -KODI_SCREENSAVER_PINGPONG_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-planestate/Config.in b/package.bak/kodi-screensaver-planestate/Config.in deleted file mode 100644 index b63d70e641..0000000000 --- a/package.bak/kodi-screensaver-planestate/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_PLANESTATE - bool "kodi-screensaver-planestate" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL - help - PlaneState screensaver for Kodi - - https://github.com/notspiff/screensaver.planestate - -comment "kodi-screensaver-planestate needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.hash b/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.hash deleted file mode 100644 index 9aea929257..0000000000 --- a/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 13ce2881f8eaf9936691cf66b9f3471a718ae87249d62ade55174201873fb496 kodi-screensaver-planestate-95b6d1ec72f37bcd16cf8e5d49806193dba883f0.tar.gz diff --git a/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.mk b/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.mk deleted file mode 100644 index 38885c5cbc..0000000000 --- a/package.bak/kodi-screensaver-planestate/kodi-screensaver-planestate.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# kodi-screensaver-planestate -# -################################################################################ - -KODI_SCREENSAVER_PLANESTATE_VERSION = 95b6d1ec72f37bcd16cf8e5d49806193dba883f0 -KODI_SCREENSAVER_PLANESTATE_SITE = $(call github,notspiff,screensaver.planestate,$(KODI_SCREENSAVER_PLANESTATE_VERSION)) -KODI_SCREENSAVER_PLANESTATE_DEPENDENCIES = kodi libsoil - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-pyro/Config.in b/package.bak/kodi-screensaver-pyro/Config.in deleted file mode 100644 index 982542d5a3..0000000000 --- a/package.bak/kodi-screensaver-pyro/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_PYRO - bool "kodi-screensaver-pyro" - depends on BR2_PACKAGE_HAS_LIBGL - help - Pyro screensaver for Kodi - - https://github.com/notspiff/screensaver.pyro - -comment "kodi-screensaver-pyro needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.hash b/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.hash deleted file mode 100644 index c79e3f5f1f..0000000000 --- a/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 951bc3259407b7f21183c34556b1efc4c40bfafec61008cd543f382f67466184 kodi-screensaver-pyro-2476b77d9954980a27e07eb8eb0727e2af226351.tar.gz diff --git a/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.mk b/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.mk deleted file mode 100644 index f90405275e..0000000000 --- a/package.bak/kodi-screensaver-pyro/kodi-screensaver-pyro.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-pyro -# -################################################################################ - -KODI_SCREENSAVER_PYRO_VERSION = 2476b77d9954980a27e07eb8eb0727e2af226351 -KODI_SCREENSAVER_PYRO_SITE = $(call github,notspiff,screensaver.pyro,$(KODI_SCREENSAVER_PYRO_VERSION)) -KODI_SCREENSAVER_PYRO_LICENSE = GPLv2+ -KODI_SCREENSAVER_PYRO_LICENSE_FILES = src/Pyro.cpp -KODI_SCREENSAVER_PYRO_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-rsxs/0001-cross-compile.patch b/package.bak/kodi-screensaver-rsxs/0001-cross-compile.patch deleted file mode 100644 index 56c2f4e4ba..0000000000 --- a/package.bak/kodi-screensaver-rsxs/0001-cross-compile.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix cross-compilation - -Use the cross-compiler and not the host version. - -Patch sent upstream: -https://github.com/notspiff/screensavers.rsxs/pull/5 - -Signed-off-by: Bernd Kuhls - -diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt ---- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt 2015-03-19 12:20:23.000000000 +0100 -+++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt 2015-07-19 20:26:16.660481032 +0200 -@@ -33,6 +33,11 @@ - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket - ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds) - -+ -+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) -+string( REGEX REPLACE "-[^-]+$" "" -+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) -+ - include(ExternalProject) - set(update_command "") - if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) -@@ -46,8 +51,11 @@ - endif() - endif() - externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir} -- CONFIGURE_COMMAND ${configure_start} -+ CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no -+ ac_cv_func_malloc_0_nonnull=yes -+ ${configure_start} - --prefix= -+ --host=${TOOLCHAIN_NAME} - --without-xscreensaver - --disable-cyclone - --disable-euphoria diff --git a/package.bak/kodi-screensaver-rsxs/Config.in b/package.bak/kodi-screensaver-rsxs/Config.in deleted file mode 100644 index 11546ad1f8..0000000000 --- a/package.bak/kodi-screensaver-rsxs/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_RSXS - bool "kodi-screensaver-rsxs" - depends on BR2_PACKAGE_HAS_LIBGL # libglu - depends on BR2_PACKAGE_XORG7 # xlib_libXmu - select BR2_PACKAGE_XLIB_LIBXMU - help - RSXS screensaver add-ons for Kodi - - https://github.com/notspiff/screensavers.rsxs - -comment "kodi-screensaver-rsxs depends on X.org and needs OpenGL" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash deleted file mode 100644 index 568b44b37c..0000000000 --- a/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz diff --git a/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk deleted file mode 100644 index 7df6c22cef..0000000000 --- a/package.bak/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-screensaver-rsxs -# -################################################################################ - -KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259 -KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) -KODI_SCREENSAVER_RSXS_LICENSE = GPLv3 -KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING - -KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-screensaver-stars/Config.in b/package.bak/kodi-screensaver-stars/Config.in deleted file mode 100644 index bcfb47b2cc..0000000000 --- a/package.bak/kodi-screensaver-stars/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_SCREENSAVER_STARS - bool "kodi-screensaver-stars" - depends on BR2_PACKAGE_HAS_LIBGL - help - Starfield screensaver for Kodi - - https://github.com/notspiff/screensaver.stars - -comment "kodi-screensaver-stars needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.hash b/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.hash deleted file mode 100644 index 107ada4701..0000000000 --- a/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 79633afcdccf5df31c98d2144bd23086d691e7749255b4295b183b535d9b7abf kodi-screensaver-stars-28bf79d4dce040e9fbdc25f51007e13950cab937.tar.gz diff --git a/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.mk b/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.mk deleted file mode 100644 index b5b5206d1f..0000000000 --- a/package.bak/kodi-screensaver-stars/kodi-screensaver-stars.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-screensaver-stars -# -################################################################################ - -KODI_SCREENSAVER_STARS_VERSION = 28bf79d4dce040e9fbdc25f51007e13950cab937 -KODI_SCREENSAVER_STARS_SITE = $(call github,notspiff,screensaver.stars,$(KODI_SCREENSAVER_STARS_VERSION)) -KODI_SCREENSAVER_STARS_LICENSE = GPLv2+ -KODI_SCREENSAVER_STARS_LICENSE_FILES = src/StarField.cpp -KODI_SCREENSAVER_STARS_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-fishbmc/Config.in b/package.bak/kodi-visualisation-fishbmc/Config.in deleted file mode 100644 index 9e2eabbdbc..0000000000 --- a/package.bak/kodi-visualisation-fishbmc/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_FISHBMC - bool "kodi-visualisation-fishbmc" - depends on BR2_PACKAGE_HAS_LIBGL - help - Fische visualiser for Kodi - - https://github.com/notspiff/visualization.fishbmc - -comment "kodi-visualisation-fishbmc needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash b/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash deleted file mode 100644 index 6a65a58fea..0000000000 --- a/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7047d501942bcd5095e0f1424f003caec8eb792b59d16d16ad25f14829844e50 kodi-visualisation-fishbmc-50c38c296a62e096a2216e43b86d864ee265c506.tar.gz diff --git a/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk b/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk deleted file mode 100644 index 1e07774f14..0000000000 --- a/package.bak/kodi-visualisation-fishbmc/kodi-visualisation-fishbmc.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-visualisation-fishbmc -# -################################################################################ - -KODI_VISUALISATION_FISHBMC_VERSION = 50c38c296a62e096a2216e43b86d864ee265c506 -KODI_VISUALISATION_FISHBMC_SITE = $(call github,notspiff,visualization.fishbmc,$(KODI_VISUALISATION_FISHBMC_VERSION)) -KODI_VISUALISATION_FISHBMC_LICENSE = GPLv2+ -KODI_VISUALISATION_FISHBMC_LICENSE_FILES = visualization.fishbmc/LICENSE -KODI_VISUALISATION_FISHBMC_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-fountain/Config.in b/package.bak/kodi-visualisation-fountain/Config.in deleted file mode 100644 index 570d169338..0000000000 --- a/package.bak/kodi-visualisation-fountain/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_FOUNTAIN - bool "kodi-visualisation-fountain" - depends on BR2_PACKAGE_HAS_LIBGL # libsoil - select BR2_PACKAGE_LIBSOIL - help - Fountain visualization for Kodi - - https://github.com/notspiff/visualization.fountain - -comment "kodi-visualisation-fountain needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.hash b/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.hash deleted file mode 100644 index 8dc933effa..0000000000 --- a/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7b2867f415f22e4bc4ba834034f00117fcf76774aea0afc7bf30b5f2d1991dd7 kodi-visualisation-fountain-f22deacd2396a204694d346f85369ea9ea70e16f.tar.gz diff --git a/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.mk b/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.mk deleted file mode 100644 index 5684402a2a..0000000000 --- a/package.bak/kodi-visualisation-fountain/kodi-visualisation-fountain.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# kodi-visualisation-fountain -# -################################################################################ - -KODI_VISUALISATION_FOUNTAIN_VERSION = f22deacd2396a204694d346f85369ea9ea70e16f -KODI_VISUALISATION_FOUNTAIN_SITE = $(call github,notspiff,visualization.fountain,$(KODI_VISUALISATION_FOUNTAIN_VERSION)) -KODI_VISUALISATION_FOUNTAIN_DEPENDENCIES = kodi libsoil - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-goom/0001-cross-compile.patch b/package.bak/kodi-visualisation-goom/0001-cross-compile.patch deleted file mode 100644 index 8dd0fe9109..0000000000 --- a/package.bak/kodi-visualisation-goom/0001-cross-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -Fix cross-compilation - -Use the cross-compiler and not the host version. - -Patch sent upstream: -https://github.com/notspiff/visualization.goom/pull/4 - -Signed-off-by: Bernd Kuhls - -diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt ---- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt 2014-10-31 11:34:21.000000000 +0100 -+++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt 2015-07-19 19:49:43.340054342 +0200 -@@ -13,6 +13,10 @@ - ${KODI_INCLUDE_DIR} - ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src) - -+get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) -+string( REGEX REPLACE "-[^-]+$" "" -+ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) -+ - include(ExternalProject) - set(update_command "") - if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) -@@ -20,7 +24,7 @@ - endif() - externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0 - "${update_command}" -- CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= -+ CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix= --host=${TOOLCHAIN_NAME} - BUILD_COMMAND ${MAKE} - INSTALL_COMMAND "") - diff --git a/package.bak/kodi-visualisation-goom/Config.in b/package.bak/kodi-visualisation-goom/Config.in deleted file mode 100644 index de4d2ef2ff..0000000000 --- a/package.bak/kodi-visualisation-goom/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_GOOM - bool "kodi-visualisation-goom" - depends on BR2_PACKAGE_HAS_LIBGL - help - GOOM visualiser for Kodi - - https://github.com/notspiff/visualization.goom - -comment "kodi-visualization-goom needs OpenGL" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.hash b/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.hash deleted file mode 100644 index 8507c652a5..0000000000 --- a/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 66a71a5c5a1c0016d7020fcc9941634ee465dab14644cdc96023ce0a28408338 kodi-visualisation-goom-16747b7dba9cbdcfdc8df44e849eaf09450fc86f.tar.gz diff --git a/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.mk b/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.mk deleted file mode 100644 index 89f2bab1d6..0000000000 --- a/package.bak/kodi-visualisation-goom/kodi-visualisation-goom.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kodi-visualisation-goom -# -################################################################################ - -KODI_VISUALISATION_GOOM_VERSION = 16747b7dba9cbdcfdc8df44e849eaf09450fc86f -KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) -KODI_VISUALISATION_GOOM_LICENSE = GPLv2+ -KODI_VISUALISATION_GOOM_LICENSE_FILES = src/Main.cpp - -KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/package.bak/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch deleted file mode 100644 index 6737296fe7..0000000000 --- a/package.bak/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 9c428c3c9f120a11468f98546bcc754d2c3302af Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 30 Jul 2015 10:02:15 +0200 -Subject: [PATCH] FindOpenGLES2: also search for egl with pkg-config - -The non-pkg-config path looks for both EGL *and* OpenGL ES, but not -the pkg-config path, which might lead to missing libraries/headers if -egl.pc has more header paths or libraries than glesv2.pc. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - FindOpenGLES2.cmake | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b084cf..81bbe27 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -35,7 +35,7 @@ - endif() - endif() - -- include_directories(${OpenGL_INCLUDE_DIR} -+ include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS} - ${GLEW_INCLUDE_DIR} - ${KODI_INCLUDE_DIR} - ${platform_INCLUDE_DIRS} -diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake -index e1b7d21..2a9ce0d 100644 ---- a/FindOpenGLES2.cmake -+++ b/FindOpenGLES2.cmake -@@ -7,7 +7,7 @@ - - find_package(PkgConfig) - if(PKG_CONFIG_FOUND) -- pkg_check_modules(OpenGLES2 glesv2) -+ pkg_check_modules(OpenGLES2 glesv2 egl) - endif(PKG_CONFIG_FOUND) - - if(NOT OPENGLES2_FOUND) --- -2.5.0 - diff --git a/package.bak/kodi-visualisation-shadertoy/Config.in b/package.bak/kodi-visualisation-shadertoy/Config.in deleted file mode 100644 index ac17702709..0000000000 --- a/package.bak/kodi-visualisation-shadertoy/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY - bool "kodi-visualisation-shadertoy" - select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_LIBPLATFORM - help - Shadertoy visualiser for Kodi - - https://github.com/notspiff/visualization.shadertoy diff --git a/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash deleted file mode 100644 index fdd81fd590..0000000000 --- a/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 88732c399bb7e1237e8fc375583bb3789c96a28695a3805fb374361a7e5636c5 kodi-visualisation-shadertoy-f9988007681bf37e6c03d6992bae30133b020608.tar.gz diff --git a/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk deleted file mode 100644 index e5f2d911db..0000000000 --- a/package.bak/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# kodi-visualisation-shadertoy -# -################################################################################ - -KODI_VISUALISATION_SHADERTOY_VERSION = f9988007681bf37e6c03d6992bae30133b020608 -KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION)) -KODI_VISUALISATION_SHADERTOY_LICENSE = GPLv2+ -KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp -KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform - -ifeq ($(BR2_PACKAGE_LIBGLEW),y) -KODI_VISUALISATION_SHADERTOY_DEPENDENCIES += libglew -endif - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-spectrum/Config.in b/package.bak/kodi-visualisation-spectrum/Config.in deleted file mode 100644 index 3b2b0a25e2..0000000000 --- a/package.bak/kodi-visualisation-spectrum/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_SPECTRUM - bool "kodi-visualisation-spectrum" - help - Spectrum visualiser for Kodi - - https://github.com/notspiff/visualization.spectrum diff --git a/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash b/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash deleted file mode 100644 index 18e38f577f..0000000000 --- a/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 aa417d6ad3d3770029e7d8d9f7f0ca8d56a8a4f47821267b5a8604fc26993334 kodi-visualisation-spectrum-9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e.tar.gz diff --git a/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk b/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk deleted file mode 100644 index de197eb7ff..0000000000 --- a/package.bak/kodi-visualisation-spectrum/kodi-visualisation-spectrum.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-visualisation-spectrum -# -################################################################################ - -KODI_VISUALISATION_SPECTRUM_VERSION = 9dbe53a0db73f00ee22e9ca235c98f8137b7bb9e -KODI_VISUALISATION_SPECTRUM_SITE = $(call github,notspiff,visualization.spectrum,$(KODI_VISUALISATION_SPECTRUM_VERSION)) -KODI_VISUALISATION_SPECTRUM_LICENSE = GPLv2+ -KODI_VISUALISATION_SPECTRUM_LICENSE_FILES = COPYING -KODI_VISUALISATION_SPECTRUM_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-waveforhue/Config.in b/package.bak/kodi-visualisation-waveforhue/Config.in deleted file mode 100644 index 9694027d2a..0000000000 --- a/package.bak/kodi-visualisation-waveforhue/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORHUE - bool "kodi-visualisation-waveforhue" - help - WaveForHue visualiser for Kodi - - https://github.com/notspiff/visualization.waveforhue diff --git a/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash b/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash deleted file mode 100644 index 5f49daae94..0000000000 --- a/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2590ce4ee1816ffdf59fe33580a36fba49fbd1f60f4c9022b3315e04debc9c73 kodi-visualisation-waveforhue-e87d5c7d7e7504036b80af8bc89f4cf6489085fe.tar.gz diff --git a/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk b/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk deleted file mode 100644 index 28eeb4d881..0000000000 --- a/package.bak/kodi-visualisation-waveforhue/kodi-visualisation-waveforhue.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-visualisation-waveforhue -# -################################################################################ - -KODI_VISUALISATION_WAVEFORHUE_VERSION = e87d5c7d7e7504036b80af8bc89f4cf6489085fe -KODI_VISUALISATION_WAVEFORHUE_SITE = $(call github,notspiff,visualization.waveforhue,$(KODI_VISUALISATION_WAVEFORHUE_VERSION)) -KODI_VISUALISATION_WAVEFORHUE_LICENSE = GPLv2+ -KODI_VISUALISATION_WAVEFORHUE_LICENSE_FILES = COPYING -KODI_VISUALISATION_WAVEFORHUE_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi-visualisation-waveform/Config.in b/package.bak/kodi-visualisation-waveform/Config.in deleted file mode 100644 index 56f25096f5..0000000000 --- a/package.bak/kodi-visualisation-waveform/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_KODI_VISUALISATION_WAVEFORM - bool "kodi-visualisation-waveform" - help - Waveform visualiser for Kodi - - https://github.com/notspiff/visualization.waveform diff --git a/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.hash b/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.hash deleted file mode 100644 index 728b857ecc..0000000000 --- a/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 439bd50fcb1c0912532d0d113f7eeadf28f72bd2cb0c234581ee1acc2a70e45b kodi-visualisation-waveform-89aec48e2975f820004df5a1a53801339a5b3064.tar.gz diff --git a/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.mk b/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.mk deleted file mode 100644 index 81e880b080..0000000000 --- a/package.bak/kodi-visualisation-waveform/kodi-visualisation-waveform.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# kodi-visualisation-waveform -# -################################################################################ - -KODI_VISUALISATION_WAVEFORM_VERSION = 89aec48e2975f820004df5a1a53801339a5b3064 -KODI_VISUALISATION_WAVEFORM_SITE = $(call github,notspiff,visualization.waveform,$(KODI_VISUALISATION_WAVEFORM_VERSION)) -KODI_VISUALISATION_WAVEFORM_LICENSE = GPLv2+ -KODI_VISUALISATION_WAVEFORM_LICENSE_FILES = COPYING -KODI_VISUALISATION_WAVEFORM_DEPENDENCIES = kodi - -$(eval $(cmake-package)) diff --git a/package.bak/kodi/0001-Fixup-include-path.patch b/package.bak/kodi/0001-Fixup-include-path.patch deleted file mode 100644 index 9298981c4f..0000000000 --- a/package.bak/kodi/0001-Fixup-include-path.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 63c255f1f5d68363f49193aceed343e602dc8bdf Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Thu, 26 Dec 2013 21:17:10 +0100 -Subject: [PATCH] Fixup include path - -Patch originally taken from : -http://repository.timesys.com/buildsources/x/xbmc/xbmc-11.0/xbmc-11.0-fixups.patch - -Signed-off-by: Maxime Hadjinlian ---- - lib/enca/configure | 3 --- - lib/enca/configure.ac | 3 --- - lib/libdvd/libdvdread/misc/dvdread-config.sh | 6 +++--- - lib/timidity/configure.in | 6 +++--- - 4 files changed, 6 insertions(+), 12 deletions(-) - -diff --git a/lib/libdvd/libdvdread/misc/dvdread-config.sh b/lib/libdvd/libdvdread/misc/dvdread-config.sh -index e170c7e..25ee893 100644 ---- a/lib/libdvd/libdvdread/misc/dvdread-config.sh -+++ b/lib/libdvd/libdvdread/misc/dvdread-config.sh -@@ -48,9 +48,9 @@ if test "$echo_prefix" = "yes"; then - fi - - if test "$echo_cflags" = "yes"; then -- echo -I$prefix/include $extracflags -+ echo $extracflags - fi - - if test "$echo_libs" = "yes"; then -- echo -L$libdir $dvdreadlib --fi -+ echo $dvdreadlib -+fi diff --git a/package.bak/kodi/0002-texturepacker.patch b/package.bak/kodi/0002-texturepacker.patch deleted file mode 100644 index 8830b4c646..0000000000 --- a/package.bak/kodi/0002-texturepacker.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix host compile - -Signed-off-by: Bernd Kuhls - -diff -uNr xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile ---- xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd.org/tools/depends/native/TexturePacker/Makefile 2015-01-25 09:00:48.000000000 +0100 -+++ xbmc-656cba5d5c7c5edb166196b48560825b9b1f03fd/tools/depends/native/TexturePacker/Makefile 2015-01-25 13:03:23.606140953 +0100 -@@ -36,7 +36,7 @@ - -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); cp -a $(SOURCE)/* . - cd $(PLATFORM); ./autogen.sh -- cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)" -+ cd $(PLATFORM); ./configure --prefix=$(PREFIX) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)" - - - $(APP): $(PLATFORM) diff --git a/package.bak/kodi/0003-ALSA-fix-device-change-event-support.patch b/package.bak/kodi/0003-ALSA-fix-device-change-event-support.patch deleted file mode 100644 index b5f37b94da..0000000000 --- a/package.bak/kodi/0003-ALSA-fix-device-change-event-support.patch +++ /dev/null @@ -1,67 +0,0 @@ -Patch sent upstream: - -https://github.com/xbmc/xbmc/pull/7551 - - -From a6d6a1a36ff2dff2586fbad2a068e7df14b55fdc Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 19 Jul 2015 14:12:03 +0200 -Subject: [PATCH 1/1] ALSA: fix device change event support - -Current uClibc version 0.9.33.2 does not support eventfd_read/write. - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 5 ++++- - xbmc/linux/FDEventMonitor.cpp | 12 ++++++++++++ - 2 files changed, 16 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d321f7d..4c6c750 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -911,7 +911,7 @@ AC_FUNC_STRFTIME - AC_FUNC_STRTOD - AC_FUNC_UTIME_NULL - AC_FUNC_VPRINTF --AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r]) -+AC_CHECK_FUNCS([atexit dup2 fdatasync floor fs_stat_dev ftime ftruncate getcwd gethostbyaddr gethostbyname gethostname getpagesize getpass gettimeofday inet_ntoa lchown localeconv memchr memmove memset mkdir modf munmap pow rmdir select setenv setlocale socket sqrt strcasecmp strchr strcspn strdup strerror strncasecmp strpbrk strrchr strspn strstr strtol strtoul sysinfo tzset utime posix_fadvise localtime_r eventfd_read eventfd_write]) - - # Check for various sizes - AC_CHECK_SIZEOF([int]) -@@ -2064,6 +2064,9 @@ fi - if test "$use_alsa" = "yes"; then - USE_ALSA=1 - AC_DEFINE([USE_ALSA],[1],["Define to 1 if alsa is installed"]) -+ if test "$ac_cv_func_eventfd_read" = "yes" -a "$ac_cv_func_eventfd_write" = "yes"; then -+ AC_DEFINE([HAVE_EVENTFD],[1],["Define to 1 if eventfd is installed"]) -+ fi - final_message="$final_message\n ALSA:\t\tYes" - else - USE_ALSA=0 -diff --git a/xbmc/linux/FDEventMonitor.cpp b/xbmc/linux/FDEventMonitor.cpp -index 4a41477..84efeb9 100644 ---- a/xbmc/linux/FDEventMonitor.cpp -+++ b/xbmc/linux/FDEventMonitor.cpp -@@ -28,6 +28,18 @@ - - #include "FDEventMonitor.h" - -+#ifndef HAVE_EVENTFD -+static int eventfd_read(int __fd, eventfd_t *__value) -+{ -+ return read(__fd, __value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1; -+} -+ -+static int eventfd_write(int __fd, eventfd_t __value) -+{ -+ return write(__fd, &__value, sizeof(eventfd_t)) == sizeof(eventfd_t) ? 0 : -1; -+} -+#endif -+ - CFDEventMonitor::CFDEventMonitor() : - CThread("FDEventMonitor"), - m_nextID(0), --- -1.7.10.4 - diff --git a/package.bak/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch b/package.bak/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch deleted file mode 100644 index 2678a7839e..0000000000 --- a/package.bak/kodi/0004-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6604cce38fed748e98d3bd2bf9d0f368d67eeb3c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 29 Jul 2015 23:13:33 +0200 -Subject: [PATCH] kodi-config.cmake: use CMAKE_FIND_ROOT_PATH to fix - cross-compilation - -When cross-compiling, the location at build time of the libraries is -not the same as the one at run-time. The CMAKE_FIND_ROOT_PATH variable -is here to handle this difference, so use it in kodi-config.cmake. - -Signed-off-by: Thomas Petazzoni ---- - project/cmake/kodi-config.cmake.in | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/project/cmake/kodi-config.cmake.in b/project/cmake/kodi-config.cmake.in -index 76626ec..ffb8e1d 100644 ---- a/project/cmake/kodi-config.cmake.in -+++ b/project/cmake/kodi-config.cmake.in -@@ -7,15 +7,15 @@ - SET(@APP_NAME_UC@_PREFIX @APP_PREFIX@) - ENDIF() - IF(NOT @APP_NAME_UC@_INCLUDE_DIR) -- SET(@APP_NAME_UC@_INCLUDE_DIR @APP_INCLUDE_DIR@) -+ SET(@APP_NAME_UC@_INCLUDE_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_INCLUDE_DIR@) - ENDIF() - IF(NOT @APP_NAME_UC@_LIB_DIR) -- SET(@APP_NAME_UC@_LIB_DIR @APP_LIB_DIR@) -+ SET(@APP_NAME_UC@_LIB_DIR ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) - ENDIF() - IF(NOT WIN32) - SET(CMAKE_CXX_FLAGS "$ENV{CXXFLAGS} @CXX11_SWITCH@") - ENDIF() --LIST(APPEND CMAKE_MODULE_PATH @APP_LIB_DIR@) -+LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_FIND_ROOT_PATH}/@APP_LIB_DIR@) - ADD_DEFINITIONS(@ARCH_DEFINES@ -DBUILD_KODI_ADDON) - - if(NOT CORE_SYSTEM_NAME) --- -2.5.0 - diff --git a/package.bak/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch b/package.bak/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch deleted file mode 100644 index 3d9370ff0e..0000000000 --- a/package.bak/kodi/0005-native-TexturePacker-fix-compilation-with-gcc-4.6.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 2b395fb3f07551ae1ce2e484c14ac59f36e192b0 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 17 Mar 2016 21:47:53 +0100 -Subject: [PATCH] native/TexturePacker: fix compilation with gcc 4.6 - -Kodi itself depends on gcc >= 4.7 due to its use of the C++11 standard. -When cross-compiling the host gcc currently also needs to be >= 4.7 due -to the texturepacker tool being needed as native binary to compile -Textures.xbt for the target system. - -Cross-compiling on a system where host gcc is at version 4.6 fails atm -with this error: - -cc1plus: error: unrecognized command line option '-std=c++11' -make[4]: *** [md5.o] Error 1 -make[4]: *** Waiting for unfinished jobs.... -cc1plus: error: unrecognized command line option '-std=c++11' -cc1plus: error: unrecognized command line option '-std=c++11' - -make[4]: *** [DecoderManager.o] Error 1 -make[4]: *** [XBTFWriter.o] Error 1 -cc1plus: error: unrecognized command line option '-std=c++11' -make[4]: *** [TexturePacker.o] Error 1 -cc1plus: error: unrecognized command line option '-std=c++11' -make[4]: *** [decoder/PNGDecoder.o] Error 1 -make[3]: *** [all] Error 2 -make[2]: *** [native/TexturePacker] Error 2 - -Using this patch the problem is fixed and a working TexturePacker host -binary is created. - -Signed-off-by: Bernd Kuhls -Patch sent upstream: https://github.com/xbmc/xbmc/pull/9378 ---- - tools/depends/native/TexturePacker/src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/depends/native/TexturePacker/src/Makefile.am b/tools/depends/native/TexturePacker/src/Makefile.am -index c1fc8be..d075290 100644 ---- a/tools/depends/native/TexturePacker/src/Makefile.am -+++ b/tools/depends/native/TexturePacker/src/Makefile.am -@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = subdir-objects - - AM_CFLAGS = -DTARGET_POSIX -DUSE_LZO_PACKING - AM_CFLAGS += @EXTRA_DEFINES@ --AM_CXXFLAGS = $(AM_CFLAGS) -std=c++11 -+AM_CXXFLAGS = $(AM_CFLAGS) -std=c++0x - - AM_CPPFLAGS = \ - -I. \ --- -2.7.0 - diff --git a/package.bak/kodi/0006-ffmpeg30.patch b/package.bak/kodi/0006-ffmpeg30.patch deleted file mode 100644 index 9164d48ad7..0000000000 --- a/package.bak/kodi/0006-ffmpeg30.patch +++ /dev/null @@ -1,646 +0,0 @@ -Add support for ffmpeg 3.0 - -Changes from original commit are only in file paths & quilt refresh. - -commit c31b7d374062f87c7512d9872cbceac920465913 -Author: Philip Langdale -Date: Mon Sep 21 19:49:36 2015 -0700 - - ffmpeg: Update AVPixelFormat and AV_PIX_FMT_* to compile with master - - The deprecated PixelFormat and PIX_FMT_* names have been removed in - ffmpeg master. - -Signed-off-by: Bernd Kuhls -[Downloaded from -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-tv/kodi/files/kodi-16-ffmpeg3.patch] - -Index: xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/FFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/FFmpeg.h -@@ -24,7 +24,6 @@ - #include "utils/CPUInfo.h" - - extern "C" { --#include "libswscale/swscale.h" - #include "libavcodec/avcodec.h" - #include "libavformat/avformat.h" - #include "libavutil/avutil.h" -@@ -33,23 +32,6 @@ extern "C" { - #include "libpostproc/postprocess.h" - } - --inline int SwScaleCPUFlags() --{ -- unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -- int flags = 0; -- -- if (cpuFeatures & CPU_FEATURE_MMX) -- flags |= SWS_CPU_CAPS_MMX; -- if (cpuFeatures & CPU_FEATURE_MMX2) -- flags |= SWS_CPU_CAPS_MMX2; -- if (cpuFeatures & CPU_FEATURE_3DNOW) -- flags |= SWS_CPU_CAPS_3DNOW; -- if (cpuFeatures & CPU_FEATURE_ALTIVEC) -- flags |= SWS_CPU_CAPS_ALTIVEC; -- -- return flags; --} -- - inline int PPCPUFlags() - { - unsigned int cpuFeatures = g_cpuInfo.GetCPUFeatures(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/DVDCodecUtils.cpp -@@ -39,7 +39,7 @@ extern "C" { - #include "libswscale/swscale.h" - } - --// allocate a new picture (PIX_FMT_YUV420P) -+// allocate a new picture (AV_PIX_FMT_YUV420P) - DVDVideoPicture* CDVDCodecUtils::AllocatePicture(int iWidth, int iHeight) - { - DVDVideoPicture* pPicture = new DVDVideoPicture; -@@ -264,13 +264,13 @@ DVDVideoPicture* CDVDCodecUtils::Convert - - int dstformat; - if (format == RENDER_FMT_UYVY422) -- dstformat = PIX_FMT_UYVY422; -+ dstformat = AV_PIX_FMT_UYVY422; - else -- dstformat = PIX_FMT_YUYV422; -+ dstformat = AV_PIX_FMT_YUYV422; - -- struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, PIX_FMT_YUV420P, -+ struct SwsContext *ctx = sws_getContext(pSrc->iWidth, pSrc->iHeight, AV_PIX_FMT_YUV420P, - pPicture->iWidth, pPicture->iHeight, (AVPixelFormat)dstformat, -- SWS_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ SWS_BILINEAR, NULL, NULL, NULL); - sws_scale(ctx, src, srcStride, 0, pSrc->iHeight, dst, dstStride); - sws_freeContext(ctx); - } -@@ -403,25 +403,25 @@ double CDVDCodecUtils::NormalizeFramedur - } - - struct EFormatMap { -- PixelFormat pix_fmt; -+ AVPixelFormat pix_fmt; - ERenderFormat format; - }; - - static const EFormatMap g_format_map[] = { -- { PIX_FMT_YUV420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } --, { PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } --, { PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } --, { PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } --, { PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } --, { PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } --, { PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } --, { PIX_FMT_NONE , RENDER_FMT_NONE } -+ { AV_PIX_FMT_YUV420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUVJ420P, RENDER_FMT_YUV420P } -+, { AV_PIX_FMT_YUV420P10, RENDER_FMT_YUV420P10 } -+, { AV_PIX_FMT_YUV420P16, RENDER_FMT_YUV420P16 } -+, { AV_PIX_FMT_UYVY422, RENDER_FMT_UYVY422 } -+, { AV_PIX_FMT_YUYV422, RENDER_FMT_YUYV422 } -+, { AV_PIX_FMT_VAAPI_VLD, RENDER_FMT_VAAPI } -+, { AV_PIX_FMT_DXVA2_VLD, RENDER_FMT_DXVA } -+, { AV_PIX_FMT_NONE , RENDER_FMT_NONE } - }; - - ERenderFormat CDVDCodecUtils::EFormatFromPixfmt(int fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->pix_fmt == fmt) - return p->format; -@@ -431,10 +431,10 @@ ERenderFormat CDVDCodecUtils::EFormatFro - - int CDVDCodecUtils::PixfmtFromEFormat(ERenderFormat fmt) - { -- for(const EFormatMap *p = g_format_map; p->pix_fmt != PIX_FMT_NONE; ++p) -+ for(const EFormatMap *p = g_format_map; p->pix_fmt != AV_PIX_FMT_NONE; ++p) - { - if(p->format == fmt) - return p->pix_fmt; - } -- return PIX_FMT_NONE; -+ return AV_PIX_FMT_NONE; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.cpp -@@ -77,8 +77,8 @@ enum DecoderState - STATE_SW_MULTI - }; - --enum PixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -- , const PixelFormat * fmt ) -+enum AVPixelFormat CDVDVideoCodecFFmpeg::GetFormat( struct AVCodecContext * avctx -+ , const AVPixelFormat * fmt ) - { - CDVDVideoCodecFFmpeg* ctx = (CDVDVideoCodecFFmpeg*)avctx->opaque; - -@@ -104,8 +104,8 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - avctx->hwaccel_context = 0; - } - -- const PixelFormat * cur = fmt; -- while(*cur != PIX_FMT_NONE) -+ const AVPixelFormat * cur = fmt; -+ while(*cur != AV_PIX_FMT_NONE) - { - #ifdef HAVE_LIBVDPAU - if(VDPAU::CDecoder::IsVDPAUFormat(*cur) && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVDPAU)) -@@ -137,7 +137,7 @@ enum PixelFormat CDVDVideoCodecFFmpeg::G - #endif - #ifdef HAVE_LIBVA - // mpeg4 vaapi decoding is disabled -- if(*cur == PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) -+ if(*cur == AV_PIX_FMT_VAAPI_VLD && CSettings::GetInstance().GetBool(CSettings::SETTING_VIDEOPLAYER_USEVAAPI)) - { - VAAPI::CDecoder* dec = new VAAPI::CDecoder(); - if(dec->Open(avctx, ctx->m_pCodecContext, *cur, ctx->m_uSurfacesCount) == true) -@@ -214,11 +214,11 @@ bool CDVDVideoCodecFFmpeg::Open(CDVDStre - - for(std::vector::iterator it = options.m_formats.begin(); it != options.m_formats.end(); ++it) - { -- m_formats.push_back((PixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); -+ m_formats.push_back((AVPixelFormat)CDVDCodecUtils::PixfmtFromEFormat(*it)); - if(*it == RENDER_FMT_YUV420P) -- m_formats.push_back(PIX_FMT_YUVJ420P); -+ m_formats.push_back(AV_PIX_FMT_YUVJ420P); - } -- m_formats.push_back(PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ -+ m_formats.push_back(AV_PIX_FMT_NONE); /* always add none to get a terminated list in ffmpeg world */ - - pCodec = avcodec_find_decoder(hints.codec); - -@@ -655,7 +655,7 @@ bool CDVDVideoCodecFFmpeg::GetPictureCom - pDvdVideoPicture->color_transfer = m_pCodecContext->color_trc; - pDvdVideoPicture->color_matrix = m_pCodecContext->colorspace; - if(m_pCodecContext->color_range == AVCOL_RANGE_JPEG -- || m_pCodecContext->pix_fmt == PIX_FMT_YUVJ420P) -+ || m_pCodecContext->pix_fmt == AV_PIX_FMT_YUVJ420P) - pDvdVideoPicture->color_range = 1; - else - pDvdVideoPicture->color_range = 0; -@@ -738,8 +738,8 @@ bool CDVDVideoCodecFFmpeg::GetPicture(DV - pDvdVideoPicture->iFlags |= pDvdVideoPicture->data[0] ? 0 : DVP_FLAG_DROPPED; - pDvdVideoPicture->extended_format = 0; - -- PixelFormat pix_fmt; -- pix_fmt = (PixelFormat)m_pFrame->format; -+ AVPixelFormat pix_fmt; -+ pix_fmt = (AVPixelFormat)m_pFrame->format; - - pDvdVideoPicture->format = CDVDCodecUtils::EFormatFromPixfmt(pix_fmt); - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecFFmpeg.h -@@ -46,7 +46,7 @@ public: - public: - IHardwareDecoder() {} - virtual ~IHardwareDecoder() {}; -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces) = 0; -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces) = 0; - virtual int Decode (AVCodecContext* avctx, AVFrame* frame) = 0; - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture) = 0; - virtual int Check (AVCodecContext* avctx) = 0; -@@ -77,7 +77,7 @@ public: - void SetHardware(IHardwareDecoder* hardware); - - protected: -- static enum PixelFormat GetFormat(struct AVCodecContext * avctx, const PixelFormat * fmt); -+ static enum AVPixelFormat GetFormat(struct AVCodecContext * avctx, const AVPixelFormat * fmt); - - int FilterOpen(const std::string& filters, bool scale); - void FilterClose(); -@@ -119,7 +119,7 @@ protected: - int m_iLastKeyframe; - double m_dts; - bool m_started; -- std::vector m_formats; -+ std::vector m_formats; - double m_decoderPts; - int m_skippedDeint; - bool m_requestSkipDeint; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DVDVideoCodecVDA.cpp -@@ -554,11 +554,11 @@ void CDVDVideoCodecVDA::DisplayQueuePop( - - void CDVDVideoCodecVDA::UYVY422_to_YUV420P(uint8_t *yuv422_ptr, int yuv422_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_UYVY422 to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_UYVY422 to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_UYVY422, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_UYVY422, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { yuv422_ptr, 0, 0, 0 }; -@@ -574,11 +574,11 @@ void CDVDVideoCodecVDA::UYVY422_to_YUV42 - - void CDVDVideoCodecVDA::BGRA_to_YUV420P(uint8_t *bgra_ptr, int bgra_stride, DVDVideoPicture *picture) - { -- // convert PIX_FMT_BGRA to PIX_FMT_YUV420P. -+ // convert AV_PIX_FMT_BGRA to AV_PIX_FMT_YUV420P. - struct SwsContext *swcontext = sws_getContext( -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_BGRA, -- m_videobuffer.iWidth, m_videobuffer.iHeight, PIX_FMT_YUV420P, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_BGRA, -+ m_videobuffer.iWidth, m_videobuffer.iHeight, AV_PIX_FMT_YUV420P, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - if (swcontext) - { - uint8_t *src[] = { bgra_ptr, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.cpp -@@ -886,7 +886,7 @@ static bool CheckCompatibility(AVCodecCo - return true; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - if (!CheckCompatibility(avctx)) - return false; -@@ -1135,9 +1135,9 @@ bool CDecoder::OpenDecoder() - return true; - } - --bool CDecoder::Supports(enum PixelFormat fmt) -+bool CDecoder::Supports(enum AVPixelFormat fmt) - { -- if(fmt == PIX_FMT_DXVA2_VLD) -+ if(fmt == AV_PIX_FMT_DXVA2_VLD) - return true; - return false; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/DXVA.h -@@ -141,7 +141,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check (AVCodecContext* avctx); -@@ -154,7 +154,7 @@ public: - int GetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); - void RelBuffer(uint8_t *data); - -- static bool Supports(enum PixelFormat fmt); -+ static bool Supports(enum AVPixelFormat fmt); - - void CloseDXVADecoder(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.cpp -@@ -479,7 +479,7 @@ CDecoder::~CDecoder() - Close(); - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // don't support broken wrappers by default - // nvidia cards with a vaapi to vdpau wrapper -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VAAPI.h -@@ -406,7 +406,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.cpp -@@ -186,7 +186,7 @@ void CDecoder::Close() - m_bitstream = NULL; - } - --bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext *avctx, AVCodecContext* mainctx, enum AVPixelFormat fmt, unsigned int surfaces) - { - Close(); - -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDA.h -@@ -35,7 +35,7 @@ class CDecoder - public: - CDecoder(); - ~CDecoder(); -- virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode(AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual int Check(AVCodecContext* avctx); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.cpp -@@ -486,7 +486,7 @@ CDecoder::CDecoder() : m_vdpauOutput(&m_ - m_vdpauConfig.context = 0; - } - --bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat fmt, unsigned int surfaces) -+bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat fmt, unsigned int surfaces) - { - // check if user wants to decode this format with VDPAU - std::string gpuvendor = g_Windowing.GetRenderVendor(); -@@ -760,7 +760,7 @@ int CDecoder::Check(AVCodecContext* avct - return 0; - } - --bool CDecoder::IsVDPAUFormat(PixelFormat format) -+bool CDecoder::IsVDPAUFormat(AVPixelFormat format) - { - if (format == AV_PIX_FMT_VDPAU) - return true; -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDCodecs/Video/VDPAU.h -@@ -556,7 +556,7 @@ public: - CDecoder(); - virtual ~CDecoder(); - -- virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum PixelFormat, unsigned int surfaces = 0); -+ virtual bool Open (AVCodecContext* avctx, AVCodecContext* mainctx, const enum AVPixelFormat, unsigned int surfaces = 0); - virtual int Decode (AVCodecContext* avctx, AVFrame* frame); - virtual bool GetPicture(AVCodecContext* avctx, AVFrame* frame, DVDVideoPicture* picture); - virtual void Reset(); -@@ -571,7 +571,7 @@ public: - bool Supports(VdpVideoMixerFeature feature); - bool Supports(EINTERLACEMETHOD method); - EINTERLACEMETHOD AutoInterlaceMethod(); -- static bool IsVDPAUFormat(PixelFormat fmt); -+ static bool IsVDPAUFormat(AVPixelFormat fmt); - - static void FFReleaseBuffer(void *opaque, uint8_t *data); - static int FFGetBuffer(AVCodecContext *avctx, AVFrame *pic, int flags); -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -1638,7 +1638,7 @@ void CDVDDemuxFFmpeg::ParsePacket(AVPack - - // for video we need a decoder to get desired information into codec context - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO && st->codec->extradata && -- (!st->codec->width || st->codec->pix_fmt == PIX_FMT_NONE)) -+ (!st->codec->width || st->codec->pix_fmt == AV_PIX_FMT_NONE)) - { - // open a decoder, it will be cleared down by ffmpeg on closing the stream - if (!st->codec->codec) -@@ -1695,7 +1695,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[idx]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -@@ -1708,7 +1708,7 @@ bool CDVDDemuxFFmpeg::IsVideoReady() - st = m_pFormatContext->streams[i]; - if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) - { -- if (st->codec->width && st->codec->pix_fmt != PIX_FMT_NONE) -+ if (st->codec->width && st->codec->pix_fmt != AV_PIX_FMT_NONE) - return true; - hasVideo = true; - } -Index: xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/dvdplayer/DVDFileInfo.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/dvdplayer/DVDFileInfo.cpp -@@ -275,7 +275,7 @@ bool CDVDFileInfo::ExtractThumb(const st - - uint8_t *pOutBuf = new uint8_t[nWidth * nHeight * 4]; - struct SwsContext *context = sws_getContext(picture.iWidth, picture.iHeight, -- PIX_FMT_YUV420P, nWidth, nHeight, PIX_FMT_BGRA, SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ AV_PIX_FMT_YUV420P, nWidth, nHeight, AV_PIX_FMT_BGRA, SWS_FAST_BILINEAR, NULL, NULL, NULL); - - if (context) - { -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGL.cpp -@@ -2932,7 +2932,7 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - src[i] = im->plane[i]; -@@ -2941,13 +2941,13 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - src[0] = im->plane[0]; - srcStride[0] = im->stride[0]; - } -@@ -2965,8 +2965,8 @@ void CLinuxRendererGL::ToRGBFrame(YV12Im - - m_context = sws_getCachedContext(m_context, - im->width, im->height, (AVPixelFormat)srcFormat, -- im->width, im->height, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *dst[] = { m_rgbBuffer, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -@@ -2995,7 +2995,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - if (m_format == RENDER_FMT_YUV420P) - { -- srcFormat = PIX_FMT_YUV420P; -+ srcFormat = AV_PIX_FMT_YUV420P; - for (int i = 0; i < 3; i++) - { - srcTop[i] = im->plane[i]; -@@ -3006,7 +3006,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_NV12) - { -- srcFormat = PIX_FMT_NV12; -+ srcFormat = AV_PIX_FMT_NV12; - for (int i = 0; i < 2; i++) - { - srcTop[i] = im->plane[i]; -@@ -3017,7 +3017,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_YUYV422) - { -- srcFormat = PIX_FMT_YUYV422; -+ srcFormat = AV_PIX_FMT_YUYV422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3025,7 +3025,7 @@ void CLinuxRendererGL::ToRGBFields(YV12I - } - else if (m_format == RENDER_FMT_UYVY422) - { -- srcFormat = PIX_FMT_UYVY422; -+ srcFormat = AV_PIX_FMT_UYVY422; - srcTop[0] = im->plane[0]; - srcStrideTop[0] = im->stride[0] * 2; - srcBot[0] = im->plane[0] + im->stride[0]; -@@ -3045,8 +3045,8 @@ void CLinuxRendererGL::ToRGBFields(YV12I - - m_context = sws_getCachedContext(m_context, - im->width, im->height >> 1, (AVPixelFormat)srcFormat, -- im->width, im->height >> 1, (AVPixelFormat)PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ im->width, im->height >> 1, (AVPixelFormat)AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - uint8_t *dstTop[] = { m_rgbBuffer, 0, 0, 0 }; - uint8_t *dstBot[] = { m_rgbBuffer + m_sourceWidth * m_sourceHeight * 2, 0, 0, 0 }; - int dstStride[] = { (int)m_sourceWidth * 4, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/LinuxRendererGLES.cpp -@@ -2006,8 +2006,8 @@ void CLinuxRendererGLES::UploadYV12Textu - #endif - { - m_sw_context = sws_getCachedContext(m_sw_context, -- im->width, im->height, PIX_FMT_YUV420P, -- im->width, im->height, PIX_FMT_RGBA, -+ im->width, im->height, AV_PIX_FMT_YUV420P, -+ im->width, im->height, AV_PIX_FMT_RGBA, - SWS_FAST_BILINEAR, NULL, NULL, NULL); - - uint8_t *src[] = { im->plane[0], im->plane[1], im->plane[2], 0 }; -Index: xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/cores/VideoRenderers/WinRenderer.cpp -+++ xbmc-16.0-Jarvis/xbmc/cores/VideoRenderers/WinRenderer.cpp -@@ -94,16 +94,16 @@ CWinRenderer::~CWinRenderer() - UnInit(); - } - --static enum PixelFormat PixelFormatFromFormat(ERenderFormat format) -+static enum AVPixelFormat PixelFormatFromFormat(ERenderFormat format) - { -- if (format == RENDER_FMT_DXVA) return PIX_FMT_NV12; -- if (format == RENDER_FMT_YUV420P) return PIX_FMT_YUV420P; -- if (format == RENDER_FMT_YUV420P10) return PIX_FMT_YUV420P10; -- if (format == RENDER_FMT_YUV420P16) return PIX_FMT_YUV420P16; -- if (format == RENDER_FMT_NV12) return PIX_FMT_NV12; -- if (format == RENDER_FMT_UYVY422) return PIX_FMT_UYVY422; -- if (format == RENDER_FMT_YUYV422) return PIX_FMT_YUYV422; -- return PIX_FMT_NONE; -+ if (format == RENDER_FMT_DXVA) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_YUV420P) return AV_PIX_FMT_YUV420P; -+ if (format == RENDER_FMT_YUV420P10) return AV_PIX_FMT_YUV420P10; -+ if (format == RENDER_FMT_YUV420P16) return AV_PIX_FMT_YUV420P16; -+ if (format == RENDER_FMT_NV12) return AV_PIX_FMT_NV12; -+ if (format == RENDER_FMT_UYVY422) return AV_PIX_FMT_UYVY422; -+ if (format == RENDER_FMT_YUYV422) return AV_PIX_FMT_YUYV422; -+ return AV_PIX_FMT_NONE; - } - - void CWinRenderer::ManageTextures() -@@ -719,13 +719,13 @@ void CWinRenderer::Render(DWORD flags) - - void CWinRenderer::RenderSW() - { -- enum PixelFormat format = PixelFormatFromFormat(m_format); -+ enum AVPixelFormat format = PixelFormatFromFormat(m_format); - - // 1. convert yuv to rgb - m_sw_scale_ctx = sws_getCachedContext(m_sw_scale_ctx, - m_sourceWidth, m_sourceHeight, format, -- m_sourceWidth, m_sourceHeight, PIX_FMT_BGRA, -- SWS_FAST_BILINEAR | SwScaleCPUFlags(), NULL, NULL, NULL); -+ m_sourceWidth, m_sourceHeight, AV_PIX_FMT_BGRA, -+ SWS_FAST_BILINEAR, NULL, NULL, NULL); - - YUVBuffer* buf = (YUVBuffer*)m_VideoBuffers[m_iYV12RenderBuffer]; - -Index: xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/pictures/Picture.cpp -+++ xbmc-16.0-Jarvis/xbmc/pictures/Picture.cpp -@@ -342,9 +342,9 @@ bool CPicture::ScaleImage(uint8_t *in_pi - uint8_t *out_pixels, unsigned int out_width, unsigned int out_height, unsigned int out_pitch, - CPictureScalingAlgorithm::Algorithm scalingAlgorithm /* = CPictureScalingAlgorithm::NoAlgorithm */) - { -- struct SwsContext *context = sws_getContext(in_width, in_height, PIX_FMT_BGRA, -- out_width, out_height, PIX_FMT_BGRA, -- CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm) | SwScaleCPUFlags(), NULL, NULL, NULL); -+ struct SwsContext *context = sws_getContext(in_width, in_height, AV_PIX_FMT_BGRA, -+ out_width, out_height, AV_PIX_FMT_BGRA, -+ CPictureScalingAlgorithm::ToSwscale(scalingAlgorithm), NULL, NULL, NULL); - - uint8_t *src[] = { in_pixels, 0, 0, 0 }; - int srcStride[] = { (int)in_pitch, 0, 0, 0 }; -Index: xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -=================================================================== ---- xbmc-16.0-Jarvis.orig/xbmc/video/FFmpegVideoDecoder.cpp -+++ xbmc-16.0-Jarvis/xbmc/video/FFmpegVideoDecoder.cpp -@@ -252,7 +252,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - return false; - - // Due to a bug in swsscale we need to allocate one extra line of data -- if ( avpicture_alloc( m_pFrameRGB, PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) -+ if ( avpicture_alloc( m_pFrameRGB, AV_PIX_FMT_RGB32, m_frameRGBwidth, m_frameRGBheight + 1 ) < 0 ) - return false; - } - -@@ -287,7 +287,7 @@ bool FFmpegVideoDecoder::nextFrame( CBas - - // We got the video frame, render it into the picture buffer - struct SwsContext * context = sws_getContext( m_pCodecCtx->width, m_pCodecCtx->height, m_pCodecCtx->pix_fmt, -- m_frameRGBwidth, m_frameRGBheight, PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); -+ m_frameRGBwidth, m_frameRGBheight, AV_PIX_FMT_RGB32, SWS_FAST_BILINEAR, NULL, NULL, NULL ); - - sws_scale( context, m_pFrame->data, m_pFrame->linesize, 0, m_pCodecCtx->height, - m_pFrameRGB->data, m_pFrameRGB->linesize ); diff --git a/package.bak/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch b/package.bak/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch deleted file mode 100644 index 9b0e47d074..0000000000 --- a/package.bak/kodi/0007-exif-Fix-for-out-of-memory-errors-with-large-numbers.patch +++ /dev/null @@ -1,45 +0,0 @@ -From f63563615e357b7d794a38e1d37276c325d1466f Mon Sep 17 00:00:00 2001 -From: popcornmix -Date: Sat, 7 May 2016 13:47:42 +0100 -Subject: [PATCH] [exif] Fix for out-of-memory errors with large numbers - of jpegs - -This reverts part of https://github.com/xbmc/xbmc/pull/7472 - -Basically the commit made the 4 comments in the exif block increase -from 2K to 64K each, so you now need 256K per photo. - -When opening a folder exif information for all photos is extracted. -So, for a folder of 5000 jpegs, 1.2GB of RAM is needed just for -the comments. - -As a 64K comment string is of no use to kodi, just truncate them to 2K -like we used to. - -See: -http://trac.kodi.tv/ticket/16193 -http://forum.kodi.tv/showthread.php?tid=251908 - -Signed-off-by: Bernd Kuhls -(backported from upstream commit in master branch: - https://github.com/xbmc/xbmc/commit/f63563615e357b7d794a38e1d37276c325d1466f) ---- - lib/libexif/libexif.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/libexif/libexif.h b/lib/libexif/libexif.h -index aa8da07..519ac30 100644 ---- a/lib/libexif/libexif.h -+++ b/lib/libexif/libexif.h -@@ -81,7 +81,7 @@ typedef struct { - #define EXIF_COMMENT_CHARSET_UNICODE 3 // Exif: Unicode (UTF-16) - #define EXIF_COMMENT_CHARSET_JIS 4 // Exif: JIS X208-1990 - --#define MAX_COMMENT 65533 // 2 bytes - 2 for the length param -+#define MAX_COMMENT 2000 - #define MAX_DATE_COPIES 10 - - typedef struct { --- -2.8.1 - diff --git a/package.bak/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch b/package.bak/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch deleted file mode 100644 index dc428d6ced..0000000000 --- a/package.bak/kodi/0008-Fix-nullpadding-issue-when-reading-certain-id3v1-tag.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 78571ed421e3fd3d5244cd76670e4e1bab69132f Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 27 May 2016 17:30:28 +0200 -Subject: [PATCH 1/1] Fix nullpadding issue when reading certain id3v1 tags - -backported from upstream commit to master branch: - -https://github.com/xbmc/xbmc/commit/cdabf9dd9e82f4b2d639fb769db08227a7c52046 - -to fix problems with taglib-1.11: - -http://trac.kodi.tv/ticket/16454 -https://github.com/taglib/taglib/issues/741#issuecomment-218059031 - -Signed-off-by: Bernd Kuhls ---- - xbmc/music/tags/TagLoaderTagLib.cpp | 21 --------------------- - xbmc/music/tags/TagLoaderTagLib.h | 3 +++ - 2 files changed, 3 insertions(+), 21 deletions(-) - -diff --git a/xbmc/music/tags/TagLoaderTagLib.cpp b/xbmc/music/tags/TagLoaderTagLib.cpp -index b78a591..0fc346a 100644 ---- a/xbmc/music/tags/TagLoaderTagLib.cpp -+++ b/xbmc/music/tags/TagLoaderTagLib.cpp -@@ -46,31 +46,12 @@ - #include "utils/URIUtils.h" - #include "utils/log.h" - #include "utils/StringUtils.h" --#include "utils/CharsetConverter.h" - #include "utils/Base64.h" - #include "settings/AdvancedSettings.h" - - using namespace TagLib; - using namespace MUSIC_INFO; - --template --class TagStringHandler : public T --{ --public: -- TagStringHandler() {} -- virtual ~TagStringHandler() {} -- virtual String parse(const ByteVector &data) const -- { -- std::string strSource(data.data(), data.size()); -- std::string strUTF8; -- g_charsetConverter.unknownToUTF8(strSource, strUTF8); -- return String(strUTF8, String::UTF8); -- } --}; -- --static const TagStringHandler ID3v1StringHandler; --static const TagStringHandler ID3v2StringHandler; -- - CTagLoaderTagLib::CTagLoaderTagLib() - { - } -@@ -824,8 +805,6 @@ bool CTagLoaderTagLib::Load(const std::string& strFileName, CMusicInfoTag& tag, - return false; - } - -- ID3v1::Tag::setStringHandler(&ID3v1StringHandler); -- ID3v2::Tag::setLatin1StringHandler(&ID3v2StringHandler); - TagLib::File* file = NULL; - TagLib::APE::File* apeFile = NULL; - TagLib::ASF::File* asfFile = NULL; -diff --git a/xbmc/music/tags/TagLoaderTagLib.h b/xbmc/music/tags/TagLoaderTagLib.h -index f83ea4f..0edb84f 100644 ---- a/xbmc/music/tags/TagLoaderTagLib.h -+++ b/xbmc/music/tags/TagLoaderTagLib.h -@@ -44,6 +44,9 @@ - #include - #include "ImusicInfoTagLoader.h" - -+#include -+#include -+ - namespace MUSIC_INFO - { - class CMusicInfoTag; --- -2.8.1 - diff --git a/package.bak/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch b/package.bak/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch deleted file mode 100644 index a8de36c78b..0000000000 --- a/package.bak/kodi/0009-lib-cximage-6.0-fix-compilation-with-gcc6.patch +++ /dev/null @@ -1,1438 +0,0 @@ -From 8f82e51563f0e1bc9b7a8adf669ad2b66e7ce3e5 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Thu, 28 Apr 2016 17:17:40 +0200 -Subject: [PATCH] lib/cximage-6.0: fix compilation with gcc6 - -For a quick fix I renamed min() to cxmin() and max() to cxmax() to -prevent the conflict with the gcc definition. - -Forum thread for reference: -http://forum.kodi.tv/showthread.php?tid=263884 - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: https://github.com/xbmc/xbmc/pull/9703) ---- - lib/cximage-6.0/CxImage/ximabmp.cpp | 6 +- - lib/cximage-6.0/CxImage/ximadef.h | 8 +- - lib/cximage-6.0/CxImage/ximadsp.cpp | 182 +++++++++++++++++------------------ - lib/cximage-6.0/CxImage/ximage.cpp | 4 +- - lib/cximage-6.0/CxImage/ximagif.cpp | 6 +- - lib/cximage-6.0/CxImage/ximahist.cpp | 12 +-- - lib/cximage-6.0/CxImage/ximaint.cpp | 8 +- - lib/cximage-6.0/CxImage/ximaiter.h | 4 +- - lib/cximage-6.0/CxImage/ximajbg.cpp | 2 +- - lib/cximage-6.0/CxImage/ximapal.cpp | 14 +-- - lib/cximage-6.0/CxImage/ximapng.cpp | 12 +-- - lib/cximage-6.0/CxImage/ximaraw.cpp | 4 +- - lib/cximage-6.0/CxImage/ximasel.cpp | 50 +++++----- - lib/cximage-6.0/CxImage/ximath.cpp | 8 +- - lib/cximage-6.0/CxImage/ximatif.cpp | 6 +- - lib/cximage-6.0/CxImage/ximatran.cpp | 138 +++++++++++++------------- - lib/cximage-6.0/CxImage/ximawnd.cpp | 16 +-- - 17 files changed, 236 insertions(+), 244 deletions(-) - -diff --git a/lib/cximage-6.0/CxImage/ximabmp.cpp b/lib/cximage-6.0/CxImage/ximabmp.cpp -index 726ff91..55842b1 100644 ---- a/lib/cximage-6.0/CxImage/ximabmp.cpp -+++ b/lib/cximage-6.0/CxImage/ximabmp.cpp -@@ -46,7 +46,7 @@ bool CxImageBMP::Encode(CxFile * hFile) - bihtoh(&infohdr); - - // Write the file header -- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); -+ hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1); - hFile->Write(&infohdr,sizeof(BITMAPINFOHEADER),1); - //and DIB+ALPHA interlaced - BYTE *srcalpha = AlphaGetPointer(); -@@ -64,7 +64,7 @@ bool CxImageBMP::Encode(CxFile * hFile) - #endif //CXIMAGE_SUPPORT_ALPHA - { - // Write the file header -- hFile->Write(&hdr,min(14,sizeof(BITMAPFILEHEADER)),1); -+ hFile->Write(&hdr,cxmin(14,sizeof(BITMAPFILEHEADER)),1); - //copy attributes - memcpy(pDib,&head,sizeof(BITMAPINFOHEADER)); - bihtoh((BITMAPINFOHEADER*)pDib); -@@ -86,7 +86,7 @@ bool CxImageBMP::Decode(CxFile * hFile) - BITMAPFILEHEADER bf; - DWORD off = hFile->Tell(); // - cx_try { -- if (hFile->Read(&bf,min(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); -+ if (hFile->Read(&bf,cxmin(14,sizeof(bf)),1)==0) cx_throw("Not a BMP"); - - bf.bfSize = my_ntohl(bf.bfSize); - bf.bfOffBits = my_ntohl(bf.bfOffBits); -diff --git a/lib/cximage-6.0/CxImage/ximadef.h b/lib/cximage-6.0/CxImage/ximadef.h -index fe383bf..53ea452 100644 ---- a/lib/cximage-6.0/CxImage/ximadef.h -+++ b/lib/cximage-6.0/CxImage/ximadef.h -@@ -53,12 +53,8 @@ - #define CXIMAGE_SUPPORT_WINDOWS 0 - #endif - --#ifndef min --#define min(a,b) (((a)<(b))?(a):(b)) --#endif --#ifndef max --#define max(a,b) (((a)>(b))?(a):(b)) --#endif -+#define cxmin(a,b) (((a)<(b))?(a):(b)) -+#define cxmax(a,b) (((a)>(b))?(a):(b)) - - #ifndef PI - #define PI 3.141592653589793f -diff --git a/lib/cximage-6.0/CxImage/ximadsp.cpp b/lib/cximage-6.0/CxImage/ximadsp.cpp -index 8425bb2..813253b 100644 ---- a/lib/cximage-6.0/CxImage/ximadsp.cpp -+++ b/lib/cximage-6.0/CxImage/ximadsp.cpp -@@ -389,8 +389,8 @@ RGBQUAD CxImage::RGBtoHSL(RGBQUAD lRGBColor) - G = lRGBColor.rgbGreen; - B = lRGBColor.rgbBlue; - -- cMax = max( max(R,G), B); /* calculate lightness */ -- cMin = min( min(R,G), B); -+ cMax = cxmax( cxmax(R,G), B); /* calculate lightness */ -+ cMin = cxmin( cxmin(R,G), B); - L = (BYTE)((((cMax+cMin)*HSLMAX)+RGBMAX)/(2*RGBMAX)); - - if (cMax==cMin){ /* r=g=b --> achromatic case */ -@@ -489,9 +489,9 @@ RGBQUAD CxImage::YUVtoRGB(RGBQUAD lYUVColor) - G = (int)( Y - 0.344f * U - 0.714f * V); - B = (int)( Y + 1.770f * U); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -510,9 +510,9 @@ RGBQUAD CxImage::RGBtoYUV(RGBQUAD lRGBColor) - U = (int)((B-Y) * 0.565f + 128); - V = (int)((R-Y) * 0.713f + 128); - -- Y= min(255,max(0,Y)); -- U= min(255,max(0,U)); -- V= min(255,max(0,V)); -+ Y= cxmin(255,cxmax(0,Y)); -+ U= cxmin(255,cxmax(0,U)); -+ V= cxmin(255,cxmax(0,V)); - RGBQUAD yuv={(BYTE)V,(BYTE)U,(BYTE)Y,0}; - return yuv; - } -@@ -528,9 +528,9 @@ RGBQUAD CxImage::YIQtoRGB(RGBQUAD lYIQColor) - G = (int)( Y - 0.273f * I - 0.647f * Q); - B = (int)( Y - 1.104f * I + 1.701f * Q); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -546,9 +546,9 @@ RGBQUAD CxImage::RGBtoYIQ(RGBQUAD lRGBColor) - I = (int)( 0.5960f * R - 0.2742f * G - 0.3219f * B + 128); - Q = (int)( 0.2109f * R - 0.5229f * G + 0.3120f * B + 128); - -- Y= min(255,max(0,Y)); -- I= min(255,max(0,I)); -- Q= min(255,max(0,Q)); -+ Y= cxmin(255,cxmax(0,Y)); -+ I= cxmin(255,cxmax(0,I)); -+ Q= cxmin(255,cxmax(0,Q)); - RGBQUAD yiq={(BYTE)Q,(BYTE)I,(BYTE)Y,0}; - return yiq; - } -@@ -565,9 +565,9 @@ RGBQUAD CxImage::XYZtoRGB(RGBQUAD lXYZColor) - G = (int)( -0.969256f * X + 1.875992f * Y + 0.041556f * Z * k); - B = (int)( 0.055648f * X - 0.204043f * Y + 1.057311f * Z * k); - -- R= min(255,max(0,R)); -- G= min(255,max(0,G)); -- B= min(255,max(0,B)); -+ R= cxmin(255,cxmax(0,R)); -+ G= cxmin(255,cxmax(0,G)); -+ B= cxmin(255,cxmax(0,B)); - RGBQUAD rgb={(BYTE)B,(BYTE)G,(BYTE)R,0}; - return rgb; - } -@@ -583,9 +583,9 @@ RGBQUAD CxImage::RGBtoXYZ(RGBQUAD lRGBColor) - Y = (int)( 0.212671f * R + 0.715160f * G + 0.072169f * B); - Z = (int)((0.019334f * R + 0.119193f * G + 0.950227f * B)*0.918483657f); - -- //X= min(255,max(0,X)); -- //Y= min(255,max(0,Y)); -- //Z= min(255,max(0,Z)); -+ //X= cxmin(255,cxmax(0,X)); -+ //Y= cxmin(255,cxmax(0,Y)); -+ //Z= cxmin(255,cxmax(0,Z)); - RGBQUAD xyz={(BYTE)Z,(BYTE)Y,(BYTE)X,0}; - return xyz; - } -@@ -707,7 +707,7 @@ bool CxImage::Light(long brightness, long contrast) - - BYTE cTable[256]; // - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)((i-128)*c + brightness + 0.5f))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)((i-128)*c + brightness + 0.5f))); - } - - return Lut(cTable); -@@ -830,11 +830,11 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset) - } - } - if (Kfactor==0 || ksumcur==0){ -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset))); - } else if (ksumtot == ksumcur) { -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset))); - } else { -- cPtr2[iY1] = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ cPtr2[iY1] = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); - } - } - } -@@ -863,17 +863,17 @@ bool CxImage::Filter(long* kernel, long Ksize, long Kfactor, long Koffset) - } - } - if (Kfactor==0 || ksumcur==0){ -- c.rgbRed = (BYTE)min(255, max(0,(int)(r + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)(g + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)(b + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(r + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(b + Koffset))); - } else if (ksumtot == ksumcur) { -- c.rgbRed = (BYTE)min(255, max(0,(int)(r/Kfactor + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)(g/Kfactor + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)(b/Kfactor + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(r/Kfactor + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(g/Kfactor + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(b/Kfactor + Koffset))); - } else { -- c.rgbRed = (BYTE)min(255, max(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset))); -- c.rgbGreen = (BYTE)min(255, max(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset))); -- c.rgbBlue = (BYTE)min(255, max(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)((r*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)((g*ksumtot)/(ksumcur*Kfactor) + Koffset))); -+ c.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)((b*ksumtot)/(ksumcur*Kfactor) + Koffset))); - } - tmp.BlindSetPixelColor(x,y,c); - } -@@ -1078,8 +1078,8 @@ bool CxImage::Edge(long Ksize) - // - void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffset, bool bMixAlpha) - { -- long lWide = min(GetWidth(),imgsrc2.GetWidth()-lXOffset); -- long lHeight = min(GetHeight(),imgsrc2.GetHeight()-lYOffset); -+ long lWide = cxmin(GetWidth(),imgsrc2.GetWidth()-lXOffset); -+ long lHeight = cxmin(GetHeight(),imgsrc2.GetHeight()-lYOffset); - - bool bEditAlpha = imgsrc2.AlphaIsValid() & bMixAlpha; - -@@ -1112,16 +1112,16 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse - if (bEditAlpha) rgbDest.rgbReserved = (BYTE)((rgb1.rgbReserved+rgb2.rgbReserved)/2); - break; - case OpAdd: -- rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue+rgb2.rgbBlue)); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen+rgb2.rgbGreen)); -- rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed+rgb2.rgbRed)); -- if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved+rgb2.rgbReserved)); -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue+rgb2.rgbBlue)); -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen+rgb2.rgbGreen)); -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed+rgb2.rgbRed)); -+ if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved+rgb2.rgbReserved)); - break; - case OpSub: -- rgbDest.rgbBlue = (BYTE)max(0,min(255,rgb1.rgbBlue-rgb2.rgbBlue)); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,rgb1.rgbGreen-rgb2.rgbGreen)); -- rgbDest.rgbRed = (BYTE)max(0,min(255,rgb1.rgbRed-rgb2.rgbRed)); -- if (bEditAlpha) rgbDest.rgbReserved = (BYTE)max(0,min(255,rgb1.rgbReserved-rgb2.rgbReserved)); -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,rgb1.rgbBlue-rgb2.rgbBlue)); -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,rgb1.rgbGreen-rgb2.rgbGreen)); -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,rgb1.rgbRed-rgb2.rgbRed)); -+ if (bEditAlpha) rgbDest.rgbReserved = (BYTE)cxmax(0,cxmin(255,rgb1.rgbReserved-rgb2.rgbReserved)); - break; - case OpAnd: - rgbDest.rgbBlue = (BYTE)(rgb1.rgbBlue&rgb2.rgbBlue); -@@ -1202,11 +1202,11 @@ void CxImage::Mix(CxImage & imgsrc2, ImageOpType op, long lXOffset, long lYOffse - double dSmallAmt = dSmall*((double)rgb2.rgbBlue); - - if( lAverage < lThresh+1){ -- rgbDest.rgbBlue = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbBlue) + -+ rgbDest.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbBlue) + - dSmallAmt))); -- rgbDest.rgbGreen = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbGreen) + -+ rgbDest.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbGreen) + - dSmallAmt))); -- rgbDest.rgbRed = (BYTE)max(0,min(255,(int)(dLarge*((double)rgb1.rgbRed) + -+ rgbDest.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(dLarge*((double)rgb1.rgbRed) + - dSmallAmt))); - } - else -@@ -1274,9 +1274,9 @@ bool CxImage::ShiftRGB(long r, long g, long b) - #endif //CXIMAGE_SUPPORT_SELECTION - { - color = BlindGetPixelColor(x,y); -- color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + r))); -- color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + g))); -- color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + b))); -+ color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + r))); -+ color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + g))); -+ color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + b))); - BlindSetPixelColor(x,y,color); - } - } -@@ -1284,9 +1284,9 @@ bool CxImage::ShiftRGB(long r, long g, long b) - } else { - for(DWORD j=0; j - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - return Lut(cTable); -@@ -1337,21 +1337,21 @@ bool CxImage::GammaRGB(float gammaR, float gammaG, float gammaB) - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableR[256]; - for (i=0;i<256;i++) { -- cTableR[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableR[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - dinvgamma = 1/gammaG; - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableG[256]; - for (i=0;i<256;i++) { -- cTableG[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableG[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - dinvgamma = 1/gammaB; - dMax = pow(255.0, dinvgamma) / 255.0; - BYTE cTableB[256]; - for (i=0;i<256;i++) { -- cTableB[i] = (BYTE)max(0,min(255,(int)( pow((double)i, dinvgamma) / dMax))); -+ cTableB[i] = (BYTE)cxmax(0,cxmin(255,(int)( pow((double)i, dinvgamma) / dMax))); - } - - return Lut(cTableR, cTableG, cTableB); -@@ -1442,11 +1442,11 @@ bool CxImage::Noise(long level) - { - color = BlindGetPixelColor(x,y); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbRed = (BYTE)max(0,min(255,(int)(color.rgbRed + n))); -+ color.rgbRed = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbRed + n))); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbGreen = (BYTE)max(0,min(255,(int)(color.rgbGreen + n))); -+ color.rgbGreen = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbGreen + n))); - n=(long)((rand()/(float)RAND_MAX - 0.5)*level); -- color.rgbBlue = (BYTE)max(0,min(255,(int)(color.rgbBlue + n))); -+ color.rgbBlue = (BYTE)cxmax(0,cxmin(255,(int)(color.rgbBlue + n))); - BlindSetPixelColor(x,y,color); - } - } -@@ -1561,8 +1561,8 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - - //DFT buffers - double *real2,*imag2; -- real2 = (double*)malloc(max(w,h) * sizeof(double)); -- imag2 = (double*)malloc(max(w,h) * sizeof(double)); -+ real2 = (double*)malloc(cxmax(w,h) * sizeof(double)); -+ imag2 = (double*)malloc(cxmax(w,h) * sizeof(double)); - - /* Transform the rows */ - real = (double *)malloc(w * sizeof(double)); -@@ -1617,7 +1617,7 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - - /* converting from double to byte, there is a HUGE loss in the dynamics - "nn" tries to keep an acceptable SNR, but 8bit=48dB: don't ask more */ -- double nn=pow((double)2,(double)log((double)max(w,h))/(double)log((double)2)-4); -+ double nn=pow((double)2,(double)log((double)cxmax(w,h))/(double)log((double)2)-4); - //reversed gain for reversed transform - if (direction==-1) nn=1/nn; - //bMagnitude : just to see it on the screen -@@ -1626,15 +1626,15 @@ bool CxImage::FFT2(CxImage* srcReal, CxImage* srcImag, CxImage* dstReal, CxImage - for (j=0;jSetPixelIndex(k,j,(BYTE)max(0,min(255,(nn*(3+log(_cabs(grid[k][j]))))))); -+ tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(nn*(3+log(_cabs(grid[k][j]))))))); - if (grid[k][j].x==0){ -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/0.0000000001)*nn))))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/0.0000000001)*nn))))); - } else { -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn))))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128+(atan(grid[k][j].y/grid[k][j].x)*nn))))); - } - } else { -- tmpReal->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].x*nn)))); -- tmpImag->SetPixelIndex(k,j,(BYTE)max(0,min(255,(128 + grid[k][j].y*nn)))); -+ tmpReal->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].x*nn)))); -+ tmpImag->SetPixelIndex(k,j,(BYTE)cxmax(0,cxmin(255,(128 + grid[k][j].y*nn)))); - } - } - } -@@ -1922,7 +1922,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - -@@ -1943,7 +1943,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - for (x=0;x<=w;x+=w){ -@@ -1963,7 +1963,7 @@ bool CxImage::RepairChannel(CxImage *ch, float radius) - - correction = ((1.0+iy*iy)*ixx - ix*iy*ixy + (1.0+ix*ix)*iyy)/(1.0+ix*ix+iy*iy); - -- tmp.BlindSetPixelIndex(x,y,(BYTE)min(255,max(0,(xy0 + radius * correction + 0.5)))); -+ tmp.BlindSetPixelIndex(x,y,(BYTE)cxmin(255,cxmax(0,(xy0 + radius * correction + 0.5)))); - } - } - -@@ -2621,8 +2621,8 @@ bool CxImage::SelectiveBlur(float radius, BYTE threshold, CxImage* iDst) - } - - //build the difference mask -- BYTE thresh_dw = (BYTE)max( 0 ,(int)(128 - threshold)); -- BYTE thresh_up = (BYTE)min(255,(int)(128 + threshold)); -+ BYTE thresh_dw = (BYTE)cxmax( 0 ,(int)(128 - threshold)); -+ BYTE thresh_up = (BYTE)cxmin(255,(int)(128 + threshold)); - long kernel[]={-100,-100,-100,-100,801,-100,-100,-100,-100}; - if (!Tmp.Filter(kernel,3,800,128)){ - delete [] pPalette; -@@ -2755,7 +2755,7 @@ bool CxImage::UnsharpMask(float radius /*= 5.0*/, float amount /*= 0.5*/, int th - if (abs(diff) < threshold){ - dest_row[z] = cur_row[z]; - } else { -- dest_row[z] = (BYTE)min(255, max(0,(int)(cur_row[z] + amount * diff))); -+ dest_row[z] = (BYTE)cxmin(255, cxmax(0,(int)(cur_row[z] + amount * diff))); - } - } - } -@@ -2952,7 +2952,7 @@ bool CxImage::RedEyeRemove(float strength) - float a = 1.0f-5.0f*((float)((x-0.5f*(xmax+xmin))*(x-0.5f*(xmax+xmin))+(y-0.5f*(ymax+ymin))*(y-0.5f*(ymax+ymin))))/((float)((xmax-xmin)*(ymax-ymin))); - if (a<0) a=0; - color = BlindGetPixelColor(x,y); -- color.rgbRed = (BYTE)(a*min(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed); -+ color.rgbRed = (BYTE)(a*cxmin(color.rgbGreen,color.rgbBlue)+(1.0f-a)*color.rgbRed); - BlindSetPixelColor(x,y,color); - } - } -@@ -2990,7 +2990,7 @@ bool CxImage::Saturate(const long saturation, const long colorspace) - case 1: - { - for (int i=0;i<256;i++) { -- cTable[i] = (BYTE)max(0,min(255,(int)(i + saturation))); -+ cTable[i] = (BYTE)cxmax(0,cxmin(255,(int)(i + saturation))); - } - for(long y=ymin; yleft,0); -- xmax = min(pBox->right,head.biWidth); -- ymin = max(pBox->bottom,0); -- ymax = min(pBox->top,head.biHeight); -+ xmin = cxmax(pBox->left,0); -+ xmax = cxmin(pBox->right,head.biWidth); -+ ymin = cxmax(pBox->bottom,0); -+ ymax = cxmin(pBox->top,head.biHeight); - } else { - xmin = ymin = 0; - xmax = head.biWidth; ymax=head.biHeight; -@@ -3463,7 +3463,7 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa - r.top = r.bottom + nBoxSize; - int threshold = OptimalThreshold(method, &r, pContrastMask); - if (threshold <0) return false; -- mask.SetPixelIndex(x,y,(BYTE)max(0,min(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold)))); -+ mask.SetPixelIndex(x,y,(BYTE)cxmax(0,cxmin(255,nBias+((1.0f-fGlobalLocalBalance)*threshold + fGlobalLocalBalance*globalthreshold)))); - } - } - -@@ -3490,10 +3490,6 @@ bool CxImage::AdaptiveThreshold(long method, long nBoxSize, CxImage* pContrastMa - * Note: nOpacity=0 && bSelectFilledArea=true act as a "magic wand" - * \return true if everything is ok - */ --#if defined(XBMC) && !defined(_WIN32) --int max(int a, int b) { return a > b ? a : b; } --int min(int a, int b) { return a < b ? a : b; } --#endif - - bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFillColor, const BYTE nTolerance, - BYTE nOpacity, const bool bSelectFilledArea, const BYTE nSelectionLevel) -@@ -3538,8 +3534,8 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil - if (IsIndexed()){ //--- Generic indexed image, no tolerance OR Grayscale image with tolerance - BYTE idxRef = GetPixelIndex(xStart,yStart); - BYTE idxFill = GetNearestIndex(cFillColor); -- BYTE idxMin = (BYTE)min(255, max(0,(int)(idxRef - nTolerance))); -- BYTE idxMax = (BYTE)min(255, max(0,(int)(idxRef + nTolerance))); -+ BYTE idxMin = (BYTE)cxmin(255, cxmax(0,(int)(idxRef - nTolerance))); -+ BYTE idxMax = (BYTE)cxmin(255, cxmax(0,(int)(idxRef + nTolerance))); - - while(!q.empty()) - { -@@ -3575,12 +3571,12 @@ bool CxImage::FloodFill(const long xStart, const long yStart, const RGBQUAD cFil - } else { //--- RGB image - RGBQUAD cRef = GetPixelColor(xStart,yStart); - RGBQUAD cRefMin, cRefMax; -- cRefMin.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed - nTolerance))); -- cRefMin.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen - nTolerance))); -- cRefMin.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue - nTolerance))); -- cRefMax.rgbRed = (BYTE)min(255, max(0,(int)(cRef.rgbRed + nTolerance))); -- cRefMax.rgbGreen = (BYTE)min(255, max(0,(int)(cRef.rgbGreen + nTolerance))); -- cRefMax.rgbBlue = (BYTE)min(255, max(0,(int)(cRef.rgbBlue + nTolerance))); -+ cRefMin.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed - nTolerance))); -+ cRefMin.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen - nTolerance))); -+ cRefMin.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue - nTolerance))); -+ cRefMax.rgbRed = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbRed + nTolerance))); -+ cRefMax.rgbGreen = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbGreen + nTolerance))); -+ cRefMax.rgbBlue = (BYTE)cxmin(255, cxmax(0,(int)(cRef.rgbBlue + nTolerance))); - - while(!q.empty()) - { -diff --git a/lib/cximage-6.0/CxImage/ximage.cpp b/lib/cximage-6.0/CxImage/ximage.cpp -index e81d3c6..26c6993 100644 ---- a/lib/cximage-6.0/CxImage/ximage.cpp -+++ b/lib/cximage-6.0/CxImage/ximage.cpp -@@ -460,7 +460,7 @@ bool CxImage::CreateFromArray(BYTE* pArray,DWORD dwWidth,DWORD dwHeight,DWORD dw - src+=4; - } - } else { -- memcpy(dst,src,min(info.dwEffWidth,dwBytesperline)); -+ memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline)); - } - } - return true; -@@ -500,7 +500,7 @@ bool CxImage::CreateFromMatrix(BYTE** ppMatrix,DWORD dwWidth,DWORD dwHeight,DWOR - src+=4; - } - } else { -- memcpy(dst,src,min(info.dwEffWidth,dwBytesperline)); -+ memcpy(dst,src,cxmin(info.dwEffWidth,dwBytesperline)); - } - } - } -diff --git a/lib/cximage-6.0/CxImage/ximagif.cpp b/lib/cximage-6.0/CxImage/ximagif.cpp -index b89e061..64b1ccc 100644 ---- a/lib/cximage-6.0/CxImage/ximagif.cpp -+++ b/lib/cximage-6.0/CxImage/ximagif.cpp -@@ -478,7 +478,7 @@ bool CxImageGIF::Encode(CxFile * fp, CxImage ** pImages, int pagecount, bool bLo - ghost.EncodeHeader(fp); - - if (m_loops!=1){ -- ghost.SetLoops(max(0,m_loops-1)); -+ ghost.SetLoops(cxmax(0,m_loops-1)); - ghost.EncodeLoopExtension(fp); - } - -@@ -1340,10 +1340,10 @@ void CxImageGIF::GetComment(char* sz_comment_out) - //////////////////////////////////////////////////////////////////////////////// - void CxImageGIF::GifMix(CxImage & imgsrc2, struct_image & imgdesc) - { -- long ymin = max(0,(long)(GetHeight()-imgdesc.t - imgdesc.h)); -+ long ymin = cxmax(0,(long)(GetHeight()-imgdesc.t - imgdesc.h)); - long ymax = GetHeight()-imgdesc.t; - long xmin = imgdesc.l; -- long xmax = min(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w)); -+ long xmax = cxmin(GetWidth(), (DWORD)(imgdesc.l + imgdesc.w)); - - long ibg2= imgsrc2.GetTransIndex(); - BYTE i2; -diff --git a/lib/cximage-6.0/CxImage/ximahist.cpp b/lib/cximage-6.0/CxImage/ximahist.cpp -index a2aed03..5391107 100644 ---- a/lib/cximage-6.0/CxImage/ximahist.cpp -+++ b/lib/cximage-6.0/CxImage/ximahist.cpp -@@ -110,7 +110,7 @@ bool CxImage::HistogramStretch(long method, double threshold) - // calculate LUT - BYTE lut[256]; - for (x = 0; x <256; x++){ -- lut[x] = (BYTE)max(0,min(255,(255 * (x - minc) / (maxc - minc)))); -+ lut[x] = (BYTE)cxmax(0,cxmin(255,(255 * (x - minc) / (maxc - minc)))); - } - - for (y=0; yGetEffWidth(); -- else n = min(n,(int)ima->GetEffWidth()); -+ else n = cxmin(n,(int)ima->GetEffWidth()); - - if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) memcpy(IterImage,buf,n); - } -@@ -148,7 +148,7 @@ inline void CImageIterator::SetRow(BYTE *buf, int n) - inline void CImageIterator::GetRow(BYTE *buf, int n) - { - if ((IterImage!=NULL)&&(buf!=NULL)&&(n>0)) -- memcpy(buf,IterImage,min(n,(int)ima->GetEffWidth())); -+ memcpy(buf,IterImage,cxmin(n,(int)ima->GetEffWidth())); - } - ///////////////////////////////////////////////////////////////////// - inline BYTE* CImageIterator::GetRow() -diff --git a/lib/cximage-6.0/CxImage/ximajbg.cpp b/lib/cximage-6.0/CxImage/ximajbg.cpp -index 06fb9bf..8a01e28 100644 ---- a/lib/cximage-6.0/CxImage/ximajbg.cpp -+++ b/lib/cximage-6.0/CxImage/ximajbg.cpp -@@ -145,7 +145,7 @@ bool CxImageJBG::Encode(CxFile * hFile) - jbg_enc_init(&jbig_state, w, h, planes, &buffer, jbig_data_out, hFile); - - //jbg_enc_layers(&jbig_state, 2); -- //jbg_enc_lrlmax(&jbig_state, 800, 600); -+ //jbg_enc_lrlcxmax(&jbig_state, 800, 600); - - // Specify a few other options (each is ignored if negative) - int dl = -1, dh = -1, d = -1, l0 = -1, mx = -1; -diff --git a/lib/cximage-6.0/CxImage/ximapal.cpp b/lib/cximage-6.0/CxImage/ximapal.cpp -index b3bd3da..3788c98 100644 ---- a/lib/cximage-6.0/CxImage/ximapal.cpp -+++ b/lib/cximage-6.0/CxImage/ximapal.cpp -@@ -398,8 +398,8 @@ void CxImage::RGBtoBGR(BYTE *buffer, int length) - { - if (buffer && (head.biClrUsed==0)){ - BYTE temp; -- length = min(length,(int)info.dwEffWidth); -- length = min(length,(int)(3*head.biWidth)); -+ length = cxmin(length,(int)info.dwEffWidth); -+ length = cxmin(length,(int)(3*head.biWidth)); - for (int i=0;i needed for grayscale PNGs - - #ifdef USE_NEW_LIBPNG_API -- int nshift = max(0,(_bit_depth>>3)-1)<<3; -+ int nshift = cxmax(0,(_bit_depth>>3)-1)<<3; - #else -- int nshift = max(0,(info_ptr->bit_depth>>3)-1)<<3; -+ int nshift = cxmax(0,(info_ptr->bit_depth>>3)-1)<<3; - #endif - - #ifdef USE_NEW_LIBPNG_API -@@ -255,10 +255,10 @@ bool CxImagePNG::Decode(CxFile *hFile) - if (pal){ - DWORD ip; - #ifdef USE_NEW_LIBPNG_API -- for (ip=0;ipnum_trans);ip++) -+ for (ip=0;ipnum_trans);ip++) - #if PNG_LIBPNG_VER > 10399 - pal[ip].rgbReserved=info_ptr->trans_alpha[ip]; - #else -@@ -737,9 +737,9 @@ bool CxImagePNG::Encode(CxFile *hFile) - #endif // CXIMAGE_SUPPORT_ALPHA // - - #ifdef USE_NEW_LIBPNG_API -- int row_size = max(info.dwEffWidth, (_width * _channels * _bit_depth / 8)); -+ int row_size = cxmax(info.dwEffWidth, (_width * _channels * _bit_depth / 8)); - #else -- int row_size = max(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); -+ int row_size = cxmax(info.dwEffWidth, info_ptr->width*info_ptr->channels*(info_ptr->bit_depth/8)); - info_ptr->rowbytes = row_size; - #endif - BYTE *row_pointers = new BYTE[row_size]; -diff --git a/lib/cximage-6.0/CxImage/ximaraw.cpp b/lib/cximage-6.0/CxImage/ximaraw.cpp -index fd86f96..52d964d 100644 ---- a/lib/cximage-6.0/CxImage/ximaraw.cpp -+++ b/lib/cximage-6.0/CxImage/ximaraw.cpp -@@ -216,7 +216,7 @@ bool CxImageRAW::Decode(CxFile *hFile) - - DWORD size = dcr.width * (dcr.colors*dcr.opt.output_bps/8); - RGBtoBGR(ppm,size); -- memcpy(GetBits(dcr.height - 1 - row), ppm, min(size,GetEffWidth())); -+ memcpy(GetBits(dcr.height - 1 - row), ppm, cxmin(size,GetEffWidth())); - } - free (ppm); - -@@ -298,7 +298,7 @@ bool CxImageRAW::GetExifThumbnail(const char *filename, const char *outname, int - // Resizing. - if (image.GetWidth() > 256 || image.GetHeight() > 256) - { -- float amount = 256.0f / max(image.GetWidth(), image.GetHeight()); -+ float amount = 256.0f / cxmax(image.GetWidth(), image.GetHeight()); - image.Resample((long)(image.GetWidth() * amount), (long)(image.GetHeight() * amount), 0); - } - -diff --git a/lib/cximage-6.0/CxImage/ximasel.cpp b/lib/cximage-6.0/CxImage/ximasel.cpp -index 3a7c9a1..37cd10f 100644 ---- a/lib/cximage-6.0/CxImage/ximasel.cpp -+++ b/lib/cximage-6.0/CxImage/ximasel.cpp -@@ -113,15 +113,15 @@ bool CxImage::SelectionAddRect(RECT r, BYTE level) - if (r.left r2.left) info.rSelectionBox.left = max(0L,min(head.biWidth,r2.left)); -- if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = max(0L,min(head.biWidth,r2.right+1)); -- if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = max(0L,min(head.biHeight,r2.bottom)); -+ if (info.rSelectionBox.top <= r2.top) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,r2.top+1)); -+ if (info.rSelectionBox.left > r2.left) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,r2.left)); -+ if (info.rSelectionBox.right <= r2.right) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,r2.right+1)); -+ if (info.rSelectionBox.bottom > r2.bottom) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,r2.bottom)); - -- long ymin = max(0L,min(head.biHeight,r2.bottom)); -- long ymax = max(0L,min(head.biHeight,r2.top+1)); -- long xmin = max(0L,min(head.biWidth,r2.left)); -- long xmax = max(0L,min(head.biWidth,r2.right+1)); -+ long ymin = cxmax(0L,cxmin(head.biHeight,r2.bottom)); -+ long ymax = cxmax(0L,cxmin(head.biHeight,r2.top+1)); -+ long xmin = cxmax(0L,cxmin(head.biWidth,r2.left)); -+ long xmax = cxmax(0L,cxmin(head.biWidth,r2.right+1)); - - for (long y=ymin; y (xcenter - xradius)) info.rSelectionBox.left = max(0L,min(head.biWidth,(xcenter - xradius))); -- if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = max(0L,min(head.biWidth,(xcenter + xradius + 1))); -- if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = max(0L,min(head.biHeight,(ycenter - yradius))); -- if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = max(0L,min(head.biHeight,(ycenter + yradius + 1))); -+ if (info.rSelectionBox.left > (xcenter - xradius)) info.rSelectionBox.left = cxmax(0L,cxmin(head.biWidth,(xcenter - xradius))); -+ if (info.rSelectionBox.right <= (xcenter + xradius)) info.rSelectionBox.right = cxmax(0L,cxmin(head.biWidth,(xcenter + xradius + 1))); -+ if (info.rSelectionBox.bottom > (ycenter - yradius)) info.rSelectionBox.bottom = cxmax(0L,cxmin(head.biHeight,(ycenter - yradius))); -+ if (info.rSelectionBox.top <= (ycenter + yradius)) info.rSelectionBox.top = cxmax(0L,cxmin(head.biHeight,(ycenter + yradius + 1))); - -- long xmin = max(0L,min(head.biWidth,xcenter - xradius)); -- long xmax = max(0L,min(head.biWidth,xcenter + xradius + 1)); -- long ymin = max(0L,min(head.biHeight,ycenter - yradius)); -- long ymax = max(0L,min(head.biHeight,ycenter + yradius + 1)); -+ long xmin = cxmax(0L,cxmin(head.biWidth,xcenter - xradius)); -+ long xmax = cxmax(0L,cxmin(head.biWidth,xcenter + xradius + 1)); -+ long ymin = cxmax(0L,cxmin(head.biHeight,ycenter - yradius)); -+ long ymax = cxmax(0L,cxmin(head.biHeight,ycenter + yradius + 1)); - - long y,yo; -- for (y=ymin; yx < next->x) {r2.left=current->x; r2.right=next->x; } else {r2.left=next->x ; r2.right=current->x; } - if (current->y < next->y) {r2.bottom=current->y; r2.top=next->y; } else {r2.bottom=next->y ; r2.top=current->y; } -- if (localbox.top < r2.top) localbox.top = max(0L,min(head.biHeight-1,r2.top+1)); -- if (localbox.left > r2.left) localbox.left = max(0L,min(head.biWidth-1,r2.left-1)); -- if (localbox.right < r2.right) localbox.right = max(0L,min(head.biWidth-1,r2.right+1)); -- if (localbox.bottom > r2.bottom) localbox.bottom = max(0L,min(head.biHeight-1,r2.bottom-1)); -+ if (localbox.top < r2.top) localbox.top = cxmax(0L,cxmin(head.biHeight-1,r2.top+1)); -+ if (localbox.left > r2.left) localbox.left = cxmax(0L,cxmin(head.biWidth-1,r2.left-1)); -+ if (localbox.right < r2.right) localbox.right = cxmax(0L,cxmin(head.biWidth-1,r2.right+1)); -+ if (localbox.bottom > r2.bottom) localbox.bottom = cxmax(0L,cxmin(head.biHeight-1,r2.bottom-1)); - - i++; - } -@@ -385,10 +385,10 @@ bool CxImage::SelectionAddPolygon(POINT *points, long npoints, BYTE level) - for (x=localbox.left; x<=localbox.right; x++) - if (plocal[x + yoffset]!=1) pSelection[x + yoffset]=level; - } -- if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = min(head.biHeight,localbox.top + 1); -- if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = min(head.biWidth,localbox.left); -- if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = min(head.biWidth,localbox.right + 1); -- if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = min(head.biHeight,localbox.bottom); -+ if (info.rSelectionBox.top <= localbox.top) info.rSelectionBox.top = cxmin(head.biHeight,localbox.top + 1); -+ if (info.rSelectionBox.left > localbox.left) info.rSelectionBox.left = cxmin(head.biWidth,localbox.left); -+ if (info.rSelectionBox.right <= localbox.right) info.rSelectionBox.right = cxmin(head.biWidth,localbox.right + 1); -+ if (info.rSelectionBox.bottom > localbox.bottom) info.rSelectionBox.bottom = cxmin(head.biHeight,localbox.bottom); - - free(plocal); - free(pix); -diff --git a/lib/cximage-6.0/CxImage/ximath.cpp b/lib/cximage-6.0/CxImage/ximath.cpp -index 37533e2..f84eb72 100644 ---- a/lib/cximage-6.0/CxImage/ximath.cpp -+++ b/lib/cximage-6.0/CxImage/ximath.cpp -@@ -64,10 +64,10 @@ CxRect2 CxRect2::CrossSection(CxRect2 const &r2) const - */ - { - CxRect2 cs; -- cs.botLeft.x=max(botLeft.x, r2.botLeft.x); -- cs.botLeft.y=max(botLeft.y, r2.botLeft.y); -- cs.topRight.x=min(topRight.x, r2.topRight.x); -- cs.topRight.y=min(topRight.y, r2.topRight.y); -+ cs.botLeft.x=cxmax(botLeft.x, r2.botLeft.x); -+ cs.botLeft.y=cxmax(botLeft.y, r2.botLeft.y); -+ cs.topRight.x=cxmin(topRight.x, r2.topRight.x); -+ cs.topRight.y=cxmin(topRight.y, r2.topRight.y); - if (cs.botLeft.x<=cs.topRight.x && cs.botLeft.y<=cs.topRight.y) { - return cs; - } else { -diff --git a/lib/cximage-6.0/CxImage/ximatif.cpp b/lib/cximage-6.0/CxImage/ximatif.cpp -index 658392a..002766c 100644 ---- a/lib/cximage-6.0/CxImage/ximatif.cpp -+++ b/lib/cximage-6.0/CxImage/ximatif.cpp -@@ -470,9 +470,9 @@ bool CxImageTIF::Decode(CxFile * hFile) - if ( cb > 0.00304 ) cb = 1.055 * pow(cb,0.41667) - 0.055; - else cb = 12.92 * cb; - -- c.rgbRed =(BYTE)max(0,min(255,(int)(cr*255))); -- c.rgbGreen=(BYTE)max(0,min(255,(int)(cg*255))); -- c.rgbBlue =(BYTE)max(0,min(255,(int)(cb*255))); -+ c.rgbRed =(BYTE)cxmax(0,cxmin(255,(int)(cr*255))); -+ c.rgbGreen=(BYTE)cxmax(0,cxmin(255,(int)(cg*255))); -+ c.rgbBlue =(BYTE)cxmax(0,cxmin(255,(int)(cb*255))); - - SetPixelColor(xi,yi,c); - #if CXIMAGE_SUPPORT_ALPHA -diff --git a/lib/cximage-6.0/CxImage/ximatran.cpp b/lib/cximage-6.0/CxImage/ximatran.cpp -index 64a71e7..84d5e03 100644 ---- a/lib/cximage-6.0/CxImage/ximatran.cpp -+++ b/lib/cximage-6.0/CxImage/ximatran.cpp -@@ -302,12 +302,12 @@ bool CxImage::RotateLeft(CxImage* iDst) - for (ys = 0; ys < newHeight; ys+=RBLOCK) { - if (head.biBitCount==24) { - //RGB24 optimized pixel access: -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ //do rotation -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ //do rotation - info.nProgress = (long)(100*x/newWidth); - x2=newWidth-x-1; - dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(x,ys); - srcPtr = (BYTE*) BlindGetPixelPointer(ys, x2); -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - //imgDest.SetPixelColor(x, y, GetPixelColor(y, x2)); - *(dstPtr) = *(srcPtr); - *(dstPtr+1) = *(srcPtr+1); -@@ -318,19 +318,19 @@ bool CxImage::RotateLeft(CxImage* iDst) - }//for x - } else { - //anything else than 24bpp (and 1bpp): palette -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - info.nProgress = (long)(100*x/newWidth); // - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y, x2)); - }//for y - }//for x - }//if (version selection) - #if CXIMAGE_SUPPORT_ALPHA - if (AlphaIsValid()) { -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.AlphaSet(x,y,BlindAlphaGet(y, x2)); - }//for y - }//for x -@@ -343,9 +343,9 @@ bool CxImage::RotateLeft(CxImage* iDst) - imgDest.info.rSelectionBox.right = newWidth-info.rSelectionBox.bottom; - imgDest.info.rSelectionBox.bottom = info.rSelectionBox.left; - imgDest.info.rSelectionBox.top = info.rSelectionBox.right; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - x2=newWidth-x-1; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - imgDest.SelectionSet(x,y,BlindSelectionGet(y, x2)); - }//for y - }//for x -@@ -447,12 +447,12 @@ bool CxImage::RotateRight(CxImage* iDst) - for (ys = 0; ys < newHeight; ys+=RBLOCK) { - if (head.biBitCount==24) { - //RGB24 optimized pixel access: -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - info.nProgress = (long)(100*y/newHeight); // - y2=newHeight-y-1; - dstPtr = (BYTE*) imgDest.BlindGetPixelPointer(xs,y); - srcPtr = (BYTE*) BlindGetPixelPointer(y2, xs); -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - //imgDest.SetPixelColor(x, y, GetPixelColor(y2, x)); - *(dstPtr) = *(srcPtr); - *(dstPtr+1) = *(srcPtr+1); -@@ -463,19 +463,19 @@ bool CxImage::RotateRight(CxImage* iDst) - }//for y - } else { - //anything else than BW & RGB24: palette -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - info.nProgress = (long)(100*y/newHeight); // - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.SetPixelIndex(x, y, BlindGetPixelIndex(y2, x)); - }//for x - }//for y - }//if - #if CXIMAGE_SUPPORT_ALPHA - if (AlphaIsValid()){ -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.AlphaSet(x,y,BlindAlphaGet(y2, x)); - }//for x - }//for y -@@ -488,9 +488,9 @@ bool CxImage::RotateRight(CxImage* iDst) - imgDest.info.rSelectionBox.right = info.rSelectionBox.top; - imgDest.info.rSelectionBox.bottom = newHeight-info.rSelectionBox.right; - imgDest.info.rSelectionBox.top = newHeight-info.rSelectionBox.left; -- for (y = ys; y < min(newHeight, ys+RBLOCK); y++){ -+ for (y = ys; y < cxmin(newHeight, ys+RBLOCK); y++){ - y2=newHeight-y-1; -- for (x = xs; x < min(newWidth, xs+RBLOCK); x++){ -+ for (x = xs; x < cxmin(newWidth, xs+RBLOCK); x++){ - imgDest.SelectionSet(x,y,BlindSelectionGet(y2, x)); - }//for x - }//for y -@@ -608,10 +608,10 @@ bool CxImage::Rotate(float angle, CxImage* iDst) - newP4.x = (float)(p4.x*cos_angle - p4.y*sin_angle); - newP4.y = (float)(p4.x*sin_angle + p4.y*cos_angle); - -- leftTop.x = min(min(newP1.x,newP2.x),min(newP3.x,newP4.x)); -- leftTop.y = min(min(newP1.y,newP2.y),min(newP3.y,newP4.y)); -- rightBottom.x = max(max(newP1.x,newP2.x),max(newP3.x,newP4.x)); -- rightBottom.y = max(max(newP1.y,newP2.y),max(newP3.y,newP4.y)); -+ leftTop.x = cxmin(cxmin(newP1.x,newP2.x),cxmin(newP3.x,newP4.x)); -+ leftTop.y = cxmin(cxmin(newP1.y,newP2.y),cxmin(newP3.y,newP4.y)); -+ rightBottom.x = cxmax(cxmax(newP1.x,newP2.x),cxmax(newP3.x,newP4.x)); -+ rightBottom.y = cxmax(cxmax(newP1.y,newP2.y),cxmax(newP3.y,newP4.y)); - leftBottom.x = leftTop.x; - leftBottom.y = rightBottom.y; - rightTop.x = rightBottom.x; -@@ -740,10 +740,10 @@ bool CxImage::Rotate2(float angle, - }//if - - //(read new dimensions from location of corners) -- float minx = (float) min(min(newp[0].x,newp[1].x),min(newp[2].x,newp[3].x)); -- float miny = (float) min(min(newp[0].y,newp[1].y),min(newp[2].y,newp[3].y)); -- float maxx = (float) max(max(newp[0].x,newp[1].x),max(newp[2].x,newp[3].x)); -- float maxy = (float) max(max(newp[0].y,newp[1].y),max(newp[2].y,newp[3].y)); -+ float minx = (float) cxmin(cxmin(newp[0].x,newp[1].x),cxmin(newp[2].x,newp[3].x)); -+ float miny = (float) cxmin(cxmin(newp[0].y,newp[1].y),cxmin(newp[2].y,newp[3].y)); -+ float maxx = (float) cxmax(cxmax(newp[0].x,newp[1].x),cxmax(newp[2].x,newp[3].x)); -+ float maxy = (float) cxmax(cxmax(newp[0].y,newp[1].y),cxmax(newp[2].y,newp[3].y)); - int newWidth = (int) floor(maxx-minx+0.5f); - int newHeight= (int) floor(maxy-miny+0.5f); - float ssx=((maxx+minx)- ((float) newWidth-1))/2.0f; //start for x -@@ -1003,12 +1003,12 @@ bool CxImage::Resample(long newx, long newy, int mode, CxImage* iDst) - if (info.nEscape) break; - fY = y * yScale; - ifY = (int)fY; -- ifY1 = min(ymax, ifY+1); -+ ifY1 = cxmin(ymax, ifY+1); - dy = fY - ifY; - for(long x=0; x 1 && fy > 1) { -@@ -813,7 +813,7 @@ long CxImage::Draw(HDC hdc, long x, long y, long cx, long cy, RECT* pClipRect, b - - for(yy=0;yy>8); --- -2.8.0.rc3 - diff --git a/package.bak/kodi/0010-curl-support-version-7.5.0-and-upwards.patch b/package.bak/kodi/0010-curl-support-version-7.5.0-and-upwards.patch deleted file mode 100644 index b6743ae532..0000000000 --- a/package.bak/kodi/0010-curl-support-version-7.5.0-and-upwards.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 7d3c70b163bc67aeb1fdef8fd2347b39f311c584 Mon Sep 17 00:00:00 2001 -From: fritsch -Date: Sun, 24 Jul 2016 20:24:07 +0200 -Subject: [PATCH] Curl: Adjust multi_cleanup method which returns CURLMcode - -Signed-off-by: Bernd Kuhls -(backported from upstream commit: - https://github.com/xbmc/xbmc/commit/2a8d3e7f6cffea52740b8392a3be8ec251d5ff70) ---- - xbmc/filesystem/DllLibCurl.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xbmc/filesystem/DllLibCurl.h b/xbmc/filesystem/DllLibCurl.h -index db97f92..9e78a91 100644 ---- a/xbmc/filesystem/DllLibCurl.h -+++ b/xbmc/filesystem/DllLibCurl.h -@@ -52,7 +52,7 @@ namespace XCURL - virtual CURLMcode multi_fdset(CURLM *multi_handle, fd_set *read_fd_set, fd_set *write_fd_set, fd_set *exc_fd_set, int *max_fd)=0; - virtual CURLMcode multi_timeout(CURLM *multi_handle, long *timeout)=0; - virtual CURLMsg* multi_info_read(CURLM *multi_handle, int *msgs_in_queue)=0; -- virtual void multi_cleanup(CURL_HANDLE * handle )=0; -+ virtual CURLMcode multi_cleanup(CURLM * handle )=0; - virtual struct curl_slist* slist_append(struct curl_slist *, const char *)=0; - virtual void slist_free_all(struct curl_slist *)=0; - }; -@@ -77,7 +77,7 @@ namespace XCURL - DEFINE_METHOD5(CURLMcode, multi_fdset, (CURLM *p1, fd_set *p2, fd_set *p3, fd_set *p4, int *p5)) - DEFINE_METHOD2(CURLMcode, multi_timeout, (CURLM *p1, long *p2)) - DEFINE_METHOD2(CURLMsg*, multi_info_read, (CURLM *p1, int *p2)) -- DEFINE_METHOD1(void, multi_cleanup, (CURLM *p1)) -+ DEFINE_METHOD1(CURLMcode, multi_cleanup, (CURLM *p1)) - DEFINE_METHOD2(struct curl_slist*, slist_append, (struct curl_slist * p1, const char * p2)) - DEFINE_METHOD1(void, slist_free_all, (struct curl_slist * p1)) - DEFINE_METHOD1(const char *, easy_strerror, (CURLcode p1)) diff --git a/package.bak/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch b/package.bak/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch deleted file mode 100644 index a3a9d50ed1..0000000000 --- a/package.bak/kodi/0011-xbmc_pvr_types.h-Fix-compilation-with-gcc6.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a17e8d39cf01e26955574acd236b4ef5b54b8c3b Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Mon, 5 Sep 2016 12:34:20 +0200 -Subject: [PATCH 2/2] xbmc_pvr_types.h: Fix compilation with gcc6 - -Backport of upstream commit from master branch: -https://github.com/xbmc/xbmc/commit/c8a346109926fa03bf6882c0b6e3885af0e0f8ed - -This patch can be removed when Kodi is bumped to 17.0-Krypton. - -Signed-off-by: Bernd Kuhls ---- - xbmc/addons/include/xbmc_pvr_types.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xbmc/addons/include/xbmc_pvr_types.h b/xbmc/addons/include/xbmc_pvr_types.h -index c5ab20b..e518de1 100644 ---- a/xbmc/addons/include/xbmc_pvr_types.h -+++ b/xbmc/addons/include/xbmc_pvr_types.h -@@ -34,6 +34,7 @@ - #endif - #include - #include -+#include - - #include "xbmc_addon_types.h" - #include "xbmc_epg_types.h" --- -2.9.3 - diff --git a/package.bak/kodi/0012-Fix_includes_in_amcodec.patch b/package.bak/kodi/0012-Fix_includes_in_amcodec.patch deleted file mode 100644 index 4a6d44f686..0000000000 --- a/package.bak/kodi/0012-Fix_includes_in_amcodec.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit 4bbb21aa5cee6b2f40759aa8b1bd65246a237f79 -Author: Alex Deryskyba -Date: Wed May 4 01:38:27 2016 +0200 - - [aml] Fix includes in amcodec/codec.h to make them relative - -[Taken from upstream commit -https://github.com/xbmc/xbmc/commit/4bbb21aa5cee6b2f40759aa8b1bd65246a237f79.] -Signed-off-by: Dagg Stompler - -diff --git a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h -index 187d4d5..632c24e 100644 ---- a/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h -+++ b/tools/depends/target/libamplayer/libamplayer/include/amcodec/codec.h -@@ -12,8 +12,8 @@ - #ifndef CODEC_CTRL_H_ - #define CODEC_CTRL_H_ - --#include --#include -+#include "codec_type.h" -+#include "codec_error.h" - - - int codec_init(codec_para_t *); -diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in -index a1a3447..1bf5a89 100644 ---- a/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in -+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/Makefile.in -@@ -24,8 +24,6 @@ endif - ifeq (@USE_LIBAMCODEC@,1) - SRCS += AMLCodec.cpp - SRCS += DVDVideoCodecAmlogic.cpp --INCLUDES += -I$(prefix)/include/amcodec --INCLUDES += -I$(prefix)/include/amplayer - endif - - ifeq (@USE_ANDROID@,1) diff --git a/package.bak/kodi/Config.in b/package.bak/kodi/Config.in deleted file mode 100644 index f2a3e2e032..0000000000 --- a/package.bak/kodi/Config.in +++ /dev/null @@ -1,326 +0,0 @@ -config BR2_PACKAGE_KODI_ARCH_SUPPORTS - bool - depends on BR2_USE_MMU # libcdio, and others - default y if (BR2_arm || (BR2_mipsel && BR2_TOOLCHAIN_USES_GLIBC) || BR2_i386 || BR2_x86_64) \ - && BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS \ - && BR2_TOOLCHAIN_HAS_SYNC_8 - -comment "kodi needs python w/ .py modules, a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library, gcc >= 4.7, host gcc >= 4.6" - depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !BR2_HOST_GCC_AT_LEAST_4_6 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 \ - || BR2_TOOLCHAIN_USES_MUSL \ - || !BR2_PACKAGE_PYTHON \ - || BR2_PACKAGE_PYTHON_PYC_ONLY - -config BR2_PACKAGE_KODI_EGL_GLES - bool - default y - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_HAS_LIBGLES - depends on !BR2_PACKAGE_KODI_GL # prefer GL if available - -config BR2_PACKAGE_KODI_GL - bool - default y - depends on BR2_PACKAGE_HAS_LIBGL - depends on !BR2_arm # kodi needs egl/gles on arm - -comment "kodi needs an OpenGL or an openGL ES and EGL backend" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_KODI_GL && !BR2_PACKAGE_KODI_EGL_GLES - -comment "kodi requires an OpenGL ES and EGL backend" - depends on BR2_arm - depends on !BR2_PACKAGE_KODI_EGL_GLES - -menuconfig BR2_PACKAGE_KODI - bool "kodi" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_HOST_GCC_AT_LEAST_4_6 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_KODI_EGL_GLES || BR2_PACKAGE_KODI_GL - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # libsquish, and others - depends on BR2_PACKAGE_KODI_ARCH_SUPPORTS - depends on BR2_PACKAGE_PYTHON - depends on !BR2_PACKAGE_PYTHON_PYC_ONLY - select BR2_NEEDS_HOST_JAVA - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_THREAD - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_GPL - select BR2_PACKAGE_FFMPEG_POSTPROC # postproc depends on GPL - select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_GIFLIB - select BR2_PACKAGE_JASPER - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBASS - select BR2_PACKAGE_LIBCDIO - select BR2_PACKAGE_LIBCROSSGUID - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBDCADEC - select BR2_PACKAGE_LIBFRIBIDI - select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBMPEG2 - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBPLIST - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBSAMPLERATE - select BR2_PACKAGE_LIBSQUISH - select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_LZO - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_PYTHON_BSDDB - select BR2_PACKAGE_PYTHON_BZIP2 - select BR2_PACKAGE_PYTHON_CURSES - select BR2_PACKAGE_PYTHON_PYEXPAT - select BR2_PACKAGE_PYTHON_READLINE - select BR2_PACKAGE_PYTHON_SQLITE - select BR2_PACKAGE_PYTHON_SSL - select BR2_PACKAGE_PYTHON_UNICODEDATA - select BR2_PACKAGE_PYTHON_ZLIB - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_TAGLIB - select BR2_PACKAGE_TIFF - select BR2_PACKAGE_TINYXML - select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_YAJL - select BR2_PACKAGE_ZLIB - select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support - help - Kodi is an award-winning free and open source (GPL) software - media player and entertainment hub for digital media. - - http://kodi.tv - -if BR2_PACKAGE_KODI - -source "package/kodi-platform/Config.in" - -config BR2_PACKAGE_KODI_ALSA_LIB - bool "alsa" - select BR2_PACKAGE_ALSA_LIB - help - Enable alsa support. - -config BR2_PACKAGE_KODI_AVAHI - bool "avahi" - select BR2_PACKAGE_AVAHI - select BR2_PACKAGE_AVAHI_DAEMON - help - Enable Avahi support. - Select this if you want Kodi to support Bonjour protocol. - -config BR2_PACKAGE_KODI_DBUS - bool "dbus" - select BR2_PACKAGE_DBUS - help - Enable D-Bus support - -config BR2_PACKAGE_KODI_LIBBLURAY - bool "blu-ray" - select BR2_PACKAGE_LIBBLURAY - help - Enable Blu-ray input support. - Select this if you want to play back Blu-ray content. - -config BR2_PACKAGE_KODI_LIBCEC - bool "hdmi cec" - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBCEC - help - Enable CEC (Consumer Electronics Control) support. - Select this if you want Kodi to support HDMI CEC. - -comment "hdmi cec support needs udev /dev management" - depends on !BR2_PACKAGE_HAS_UDEV - -config BR2_PACKAGE_KODI_LIRC - bool "lirc" - help - Enable lirc support - -config BR2_PACKAGE_KODI_LIBMICROHTTPD - bool "web server" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd - select BR2_PACKAGE_LIBMICROHTTPD - help - Enable webserver feature - -config BR2_PACKAGE_KODI_LIBNFS - bool "nfs" - # libnfs -> libtirpc - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBNFS - help - Enable NFS server support. - -comment "nfs support needs a toolchain w/ threads support" - depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) - -config BR2_PACKAGE_KODI_MYSQL - bool "mysql" - select BR2_PACKAGE_MYSQL - help - Enable MySQL support - -config BR2_PACKAGE_KODI_NONFREE - bool "nonfree components" - help - Enable components with non-free licenses. This option - currently only controls support for RAR archives. - -config BR2_PACKAGE_KODI_RTMPDUMP - bool "rtmp" - select BR2_PACKAGE_RTMPDUMP - help - Enable RTMP input support. - Select this if you want to play back rtmp stream. - -config BR2_PACKAGE_KODI_LIBSHAIRPLAY - bool "shairport" - select BR2_PACKAGE_LIBSHAIRPLAY - help - Enable Shairport support. - Select this if you want to stream content from an Apple device. - -config BR2_PACKAGE_KODI_LIBSMBCLIENT - bool "samba" - depends on BR2_PACKAGE_SAMBA4 - help - Enable Samba support - -config BR2_PACKAGE_KODI_LIBSSH - bool "ssh" - select BR2_PACKAGE_LIBSSH - help - Enable sftp virtual filesystem using libssh. - -config BR2_PACKAGE_KODI_LIBTHEORA - bool "theora" - select BR2_PACKAGE_LIBTHEORA - help - Enable Theora input support. - Select this if you want to play back OGG/OGV files (Video). - -config BR2_PACKAGE_KODI_LIBUSB - bool "usb" - # https://github.com/xbmc/xbmc/blob/Jarvis/configure.ac#L1554 - # "if libudev is available, we don't need libusb" - depends on !BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Enable libusb support. - -config BR2_PACKAGE_KODI_LIBVA - bool "va" - select BR2_PACKAGE_LIBVA - help - Enable libva support. - -config BR2_PACKAGE_KODI_LIBVDPAU - bool "vdpau" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBVDPAU - help - Enable libvdpau support. - -comment "libvdpau support needs X.org" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_KODI_UPNP - bool "upnp" - help - Enable UPnP support - -config BR2_PACKAGE_KODI_OPTICALDRIVE - bool - -menu "Audio decoder addons" - source "package/kodi-audiodecoder-modplug/Config.in" - source "package/kodi-audiodecoder-nosefart/Config.in" - source "package/kodi-audiodecoder-opus/Config.in" - source "package/kodi-audiodecoder-sidplay/Config.in" - source "package/kodi-audiodecoder-snesapu/Config.in" - source "package/kodi-audiodecoder-stsound/Config.in" - source "package/kodi-audiodecoder-timidity/Config.in" - source "package/kodi-audiodecoder-vgmstream/Config.in" -endmenu - -menu "Audio DSP addons" - source "package/kodi-adsp-basic/Config.in" - source "package/kodi-adsp-freesurround/Config.in" -endmenu - -menu "Audio encoder addons" - source "package/kodi-audioencoder-flac/Config.in" - source "package/kodi-audioencoder-lame/Config.in" - source "package/kodi-audioencoder-vorbis/Config.in" - source "package/kodi-audioencoder-wav/Config.in" -endmenu - -menu "PVR addons" - source "package/kodi-pvr-argustv/Config.in" - source "package/kodi-pvr-dvblink/Config.in" - source "package/kodi-pvr-dvbviewer/Config.in" - source "package/kodi-pvr-filmon/Config.in" - source "package/kodi-pvr-hdhomerun/Config.in" - source "package/kodi-pvr-hts/Config.in" - source "package/kodi-pvr-iptvsimple/Config.in" - source "package/kodi-pvr-mediaportal-tvserver/Config.in" - source "package/kodi-pvr-mythtv/Config.in" - source "package/kodi-pvr-nextpvr/Config.in" - source "package/kodi-pvr-njoy/Config.in" - source "package/kodi-pvr-pctv/Config.in" - source "package/kodi-pvr-stalker/Config.in" - source "package/kodi-pvr-vbox/Config.in" - source "package/kodi-pvr-vdr-vnsi/Config.in" - source "package/kodi-pvr-vuplus/Config.in" - source "package/kodi-pvr-wmc/Config.in" -endmenu - -menu "Screensavers" - source "package/kodi-screensaver-asteroids/Config.in" - source "package/kodi-screensaver-asterwave/Config.in" - source "package/kodi-screensaver-biogenesis/Config.in" - source "package/kodi-screensaver-cpblobs/Config.in" - source "package/kodi-screensaver-crystalmorph/Config.in" - source "package/kodi-screensaver-greynetic/Config.in" - source "package/kodi-screensaver-matrixtrails/Config.in" - source "package/kodi-screensaver-pingpong/Config.in" - source "package/kodi-screensaver-planestate/Config.in" - source "package/kodi-screensaver-pyro/Config.in" - source "package/kodi-screensaver-rsxs/Config.in" - source "package/kodi-screensaver-stars/Config.in" -endmenu - -menu "Visualisations" - source "package/kodi-visualisation-fishbmc/Config.in" - source "package/kodi-visualisation-fountain/Config.in" - source "package/kodi-visualisation-goom/Config.in" - source "package/kodi-visualisation-shadertoy/Config.in" - source "package/kodi-visualisation-spectrum/Config.in" - source "package/kodi-visualisation-waveforhue/Config.in" - source "package/kodi-visualisation-waveform/Config.in" -endmenu - -endif # BR2_PACKAGE_KODI diff --git a/package.bak/kodi/S50kodi b/package.bak/kodi/S50kodi deleted file mode 100755 index f00c59c5d9..0000000000 --- a/package.bak/kodi/S50kodi +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Starts Kodi -# - -BIN=/usr/bin/br-kodi -KODI=/usr/lib/xbmc/kodi.bin -KODI_ARGS="--standalone -fs -n" -PIDFILE=/var/run/kodi.pid - -start() { - printf "Starting Kodi: " - start-stop-daemon -S -q -b -m -p $PIDFILE --exec $BIN -- $KODI $KODI_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping Kodi: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/kodi/br-kodi b/package.bak/kodi/br-kodi deleted file mode 100755 index 83d4d4e5ac..0000000000 --- a/package.bak/kodi/br-kodi +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -# We're called with the real Kodi executable as -# first argument, followed by any Kodi extra args -KODI="${1}" -shift - -# In case someone asked we terminate, just kill -# the Kodi process -trap_kill() { - LOOP=0 - killall "${KODI##*/}" -} -trap trap_kill INT QUIT TERM - -LOOP=1 -while [ ${LOOP} -eq 1 ]; do - # Hack: BusyBox ash does not catch signals while a non-builtin - # is running, and only catches the signal when the non-builtin - # command ends. So, we just background the Kodi binary, and wait - # for it. But BusyBox' ash's wait builtin does not return the - # exit code even if there was only one job (which is correct - # for POSIX). So we explicitly wait for the Kodi job - "${KODI}" "${@}" & - wait %1 - ret=$? - case "${ret}" in - 0) ;; - 64) poweroff; LOOP=0;; - 66) reboot; LOOP=0;; - *) # Crash - sleep 1 - ;; - esac -done -exit ${ret} diff --git a/package.bak/kodi/kodi.hash b/package.bak/kodi/kodi.hash deleted file mode 100644 index 5aa580ec7a..0000000000 --- a/package.bak/kodi/kodi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 kodi-16.1-Jarvis.tar.gz diff --git a/package.bak/kodi/kodi.mk b/package.bak/kodi/kodi.mk deleted file mode 100644 index de4d308f6b..0000000000 --- a/package.bak/kodi/kodi.mk +++ /dev/null @@ -1,330 +0,0 @@ -################################################################################ -# -# kodi -# -################################################################################ - -KODI_VERSION = 16.1-Jarvis -KODI_SITE = $(call github,xbmc,xbmc,$(KODI_VERSION)) -KODI_LICENSE = GPLv2 -KODI_LICENSE_FILES = LICENSE.GPL -# needed for binary addons -KODI_INSTALL_STAGING = YES -KODI_DEPENDENCIES = \ - boost \ - bzip2 \ - expat \ - ffmpeg \ - fontconfig \ - freetype \ - giflib \ - host-gawk \ - host-gettext \ - host-giflib \ - host-gperf \ - host-libjpeg \ - host-libpng \ - host-lzo \ - host-nasm \ - host-swig \ - host-zip \ - jasper \ - jpeg \ - libass \ - libcdio \ - libcrossguid \ - libcurl \ - libdcadec \ - libfribidi \ - libgcrypt \ - libmpeg2 \ - libogg \ - libplist \ - libpng \ - libsamplerate \ - libsquish \ - libvorbis \ - libxml2 \ - libxslt \ - lzo \ - ncurses \ - openssl \ - pcre \ - python \ - readline \ - sqlite \ - taglib \ - tiff \ - tinyxml \ - yajl \ - zlib - -KODI_CONF_ENV = \ - PYTHON_VERSION="$(PYTHON_VERSION_MAJOR)" \ - PYTHON_LDFLAGS="-lpython$(PYTHON_VERSION_MAJOR) -lpthread -ldl -lutil -lm" \ - PYTHON_CPPFLAGS="-I$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)" \ - PYTHON_SITE_PKG="$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ - PYTHON_NOVERSIONCHECK="no-check" \ - use_texturepacker_native=yes \ - USE_TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" \ - TEXTUREPACKER_NATIVE_ROOT="$(HOST_DIR)/usr" - -KODI_CONF_OPTS += \ - --with-ffmpeg=shared \ - --disable-joystick \ - --disable-openmax \ - --disable-pulse \ - --disable-vtbdecoder \ - --enable-optimizations - -ifeq ($(BR2_PACKAGE_KODI_MYSQL),y) -KODI_CONF_OPTS += --enable-mysql -KODI_CONF_ENV += ac_cv_path_MYSQL_CONFIG="$(STAGING_DIR)/usr/bin/mysql_config" -KODI_DEPENDENCIES += mysql -else -KODI_CONF_OPTS += --disable-mysql -endif - -ifeq ($(BR2_PACKAGE_KODI_NONFREE),y) -KODI_CONF_OPTS += --enable-non-free -KODI_LICENSE := $(KODI_LICENSE), unrar -KODI_LICENSE_FILES += lib/UnrarXLib/license.txt -else -KODI_CONF_OPTS += --disable-non-free -endif - -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -KODI_DEPENDENCIES += rpi-userland -KODI_CONF_OPTS += --with-platform=raspberry-pi --enable-player=omxplayer -KODI_INCLUDES += \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux -KODI_LIBS = -lvcos -lvchostif -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -KODI_DEPENDENCIES += udev -KODI_CONF_OPTS += --enable-udev -else -KODI_CONF_OPTS += --disable-udev -endif - -ifeq ($(BR2_PACKAGE_IMX_VPUWRAP),y) -KODI_DEPENDENCIES += imx-vpuwrap -KODI_CONF_OPTS += --enable-codec=imxvpu -endif - -ifeq ($(BR2_PACKAGE_LIBAMCODEC),y) -KODI_DEPENDENCIES += libamcodec -KODI_CONF_OPTS += --enable-codec=amcodec -KODI_INCLUDES += -I$(STAGING_DIR)/usr/include/amcodec -endif - -KODI_CONF_ENV += \ - INCLUDES="$(KODI_INCLUDES)" \ - LIBS="$(KODI_LIBS)" - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -KODI_CONF_OPTS += --enable-libcap -KODI_DEPENDENCIES += libcap -else -KODI_CONF_OPTS += --disable-libcap -endif - -ifeq ($(BR2_PACKAGE_KODI_DBUS),y) -KODI_DEPENDENCIES += dbus -KODI_CONF_OPTS += --enable-dbus -else -KODI_CONF_OPTS += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_KODI_ALSA_LIB),y) -KODI_DEPENDENCIES += alsa-lib -KODI_CONF_OPTS += --enable-alsa -else -KODI_CONF_OPTS += --disable-alsa -endif - -# quote from kodi/configure.in: "GLES overwrites GL if both set to yes." -# we choose the opposite because opengl offers more features, like libva support -# GL means X11, and under X11, Kodi needs libdrm; libdrm is forcefully selected -# by a modular Xorg server, which Kodi already depends on. -ifeq ($(BR2_PACKAGE_KODI_GL),y) -KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \ - xlib_libXmu xlib_libXrandr xlib_libXt libdrm -KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles -else -KODI_CONF_OPTS += --disable-gl --disable-x11 -ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) -KODI_DEPENDENCIES += libegl libgles -KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`" -KODI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`" -KODI_CONF_OPTS += --enable-gles -else -KODI_CONF_OPTS += --disable-gles -endif -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y) -KODI_DEPENDENCIES += libusb-compat -KODI_CONF_OPTS += --enable-libusb -else -KODI_CONF_OPTS += --disable-libusb -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBMICROHTTPD),y) -KODI_DEPENDENCIES += libmicrohttpd -KODI_CONF_OPTS += --enable-webserver -else -KODI_CONF_OPTS += --disable-webserver -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBSMBCLIENT),y) -KODI_DEPENDENCIES += samba4 -KODI_CONF_OPTS += --enable-samba -else -KODI_CONF_OPTS += --disable-samba -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBNFS),y) -KODI_DEPENDENCIES += libnfs -KODI_CONF_OPTS += --enable-nfs -else -KODI_CONF_OPTS += --disable-nfs -endif - -ifeq ($(BR2_PACKAGE_KODI_RTMPDUMP),y) -KODI_DEPENDENCIES += rtmpdump -KODI_CONF_OPTS += --enable-rtmp -else -KODI_CONF_OPTS += --disable-rtmp -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBBLURAY),y) -KODI_DEPENDENCIES += libbluray -KODI_CONF_OPTS += --enable-libbluray -else -KODI_CONF_OPTS += --disable-libbluray -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBSHAIRPLAY),y) -KODI_DEPENDENCIES += libshairplay -KODI_CONF_OPTS += --enable-airplay -else -KODI_CONF_OPTS += --disable-airplay -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBSSH),y) -KODI_DEPENDENCIES += libssh -KODI_CONF_OPTS += --enable-ssh -else -KODI_CONF_OPTS += --disable-ssh -endif - -ifeq ($(BR2_PACKAGE_KODI_AVAHI),y) -KODI_DEPENDENCIES += avahi -KODI_CONF_OPTS += --enable-avahi -else -KODI_CONF_OPTS += --disable-avahi -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBCEC),y) -KODI_DEPENDENCIES += libcec -KODI_CONF_OPTS += --enable-libcec -else -KODI_CONF_OPTS += --disable-libcec -endif - -ifeq ($(BR2_PACKAGE_KODI_LIRC),y) -KODI_CONF_OPTS += --enable-lirc -else -KODI_CONF_OPTS += --disable-lirc -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBTHEORA),y) -KODI_DEPENDENCIES += libtheora -endif - -# kodi needs libva & libva-glx -ifeq ($(BR2_PACKAGE_KODI_LIBVA)$(BR2_PACKAGE_MESA3D_DRI_DRIVER),yy) -KODI_DEPENDENCIES += mesa3d libva -KODI_CONF_OPTS += --enable-vaapi -else -KODI_CONF_OPTS += --disable-vaapi -endif - -ifeq ($(BR2_PACKAGE_KODI_LIBVDPAU),y) -KODI_DEPENDENCIES += libvdpau -KODI_CONF_OPTS += --enable-vdpau -else -KODI_CONF_OPTS += --disable-vdpau -endif - -ifeq ($(BR2_PACKAGE_KODI_UPNP),y) -KODI_CONF_OPTS += --enable-upnp -else -KODI_CONF_OPTS += --disable-upnp -endif - -ifeq ($(BR2_PACKAGE_KODI_OPTICALDRIVE),y) -KODI_CONF_OPTS += --enable-optical-drive --enable-dvdcss -else -KODI_CONF_OPTS += --disable-optical-drive --disable-dvdcss -endif - -# Add HOST_DIR to PATH for codegenerator.mk to find swig -define KODI_BOOTSTRAP - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/JsonSchemaBuilder - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)/tools/depends/native/TexturePacker - cd $(@D) && PATH=$(BR_PATH) ./bootstrap -endef -KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP - -define KODI_CLEAN_UNUSED_ADDONS - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes -endef -KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_UNUSED_ADDONS - -define KODI_CLEAN_CONFLUENCE_SKIN - find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.png -delete - find $(TARGET_DIR)/usr/share/kodi/addons/skin.confluence/media -name *.jpg -delete -endef -KODI_POST_INSTALL_TARGET_HOOKS += KODI_CLEAN_CONFLUENCE_SKIN - -define KODI_INSTALL_BR_WRAPPER - $(INSTALL) -D -m 0755 package/kodi/br-kodi \ - $(TARGET_DIR)/usr/bin/br-kodi -endef -KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_BR_WRAPPER - -# When run from a startup script, Kodi has no $HOME where to store its -# configuration, so ends up storing it in /.kodi (yes, at the root of -# the rootfs). This is a problem for read-only filesystems. But we can't -# easily change that, so create /.kodi as a symlink where we want the -# config to eventually be. Add synlinks for the legacy XBMC name as well -define KODI_INSTALL_CONFIG_DIR - $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/kodi - ln -sf /var/kodi $(TARGET_DIR)/.kodi - ln -sf /var/kodi $(TARGET_DIR)/var/xbmc - ln -sf /var/kodi $(TARGET_DIR)/.xbmc -endef -KODI_POST_INSTALL_TARGET_HOOKS += KODI_INSTALL_CONFIG_DIR - -define KODI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/kodi/S50kodi \ - $(TARGET_DIR)/etc/init.d/S50kodi -endef - -define KODI_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/kodi/kodi.service \ - $(TARGET_DIR)/usr/lib/systemd/system/kodi.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/kodi.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/kodi.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/kodi/kodi.service b/package.bak/kodi/kodi.service deleted file mode 100644 index f30741c10a..0000000000 --- a/package.bak/kodi/kodi.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description = Kodi Entertainment Center -After = network.target - -[Service] -Type = simple -ExecStart = /usr/lib/kodi/kodi.bin --standalone -fs -n -Restart = on-failure - -[Install] -WantedBy = multi-user.target - diff --git a/package.bak/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch b/package.bak/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch deleted file mode 100644 index 408c100d71..0000000000 --- a/package.bak/kompexsqlite/0001-Makefile-use-autoconf-CXX-for-proper-builds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 769693d9ddf63b04dd4aad6cad080f3cee3f997e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 11 Jun 2015 14:08:38 -0300 -Subject: [PATCH] Makefile: use autoconf CXX for proper builds - -Status: applied upstream. - -Signed-off-by: Gustavo Zacarias ---- - Makefile.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Makefile.in b/Makefile.in -index 91fb8b2..fe862cd 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -23,6 +23,7 @@ mandir = $(prefix)/share/man/man3 - headerdir = $(prefix)/include/kompex - - CC = @CC@ -+CXX = @CXX@ - CFLAGS = @CFLAGS@ - CPPFLAGS = $(CFLAGS) @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ --- -2.3.6 - diff --git a/package.bak/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch b/package.bak/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch deleted file mode 100644 index abd0dc0fdd..0000000000 --- a/package.bak/kompexsqlite/0002-append-to-cflags-and-cxxflags.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3eb064ffa9b43fb5f245b8abda48a1c152a6f2d7 Mon Sep 17 00:00:00 2001 -From: me -Date: Thu, 20 Nov 2014 14:37:34 -0700 -Subject: [PATCH] Append to CFLAGS and CXXFLAGS as setup by ./configure. This - can allow users to Customize the SQLite build process with compile time - #defines rather than altering the sources. - -Signed-off-by: Max Filippov ---- -Backported from: 3eb064ffa9b43fb5f245b8abda48a1c152a6f2d7 - - Makefile-shared.mk | 4 ++-- - Makefile-static.mk | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile-shared.mk b/Makefile-shared.mk -index b2a4920..d15ce3c 100644 ---- a/Makefile-shared.mk -+++ b/Makefile-shared.mk -@@ -12,10 +12,10 @@ OBJS= \ - ${objsdir}/sqlite3.o - - # C Compiler Flags --CFLAGS= -fPIC -MMD -MP -+CFLAGS+= -fPIC -MMD -MP - - # CC Compiler Flags --CPPFLAGS= -DKOMPEX_SQLITEWRAPPER_EXPORT -DKOMPEX_SQLITEWRAPPER_DYN -fPIC -MMD -MP -I${includedir} -+CPPFLAGS+= -DKOMPEX_SQLITEWRAPPER_EXPORT -DKOMPEX_SQLITEWRAPPER_DYN -fPIC -MMD -MP -I${includedir} - - # Link Libraries and Options - LDLIBSOPTIONS= -shared -fPIC -diff --git a/Makefile-static.mk b/Makefile-static.mk -index 429a4ff..0678681 100644 ---- a/Makefile-static.mk -+++ b/Makefile-static.mk -@@ -12,10 +12,10 @@ OBJS= \ - ${objsdir}/sqlite3.o - - # C Compiler Flags --CFLAGS= -MMD -MP -+CFLAGS+= -MMD -MP - - # CC Compiler Flags --CPPFLAGS= -I${includedir} -MMD -MP -+CPPFLAGS+= -I${includedir} -MMD -MP - - # Link Libraries and Options - LDLIBSOPTIONS= diff --git a/package.bak/kompexsqlite/Config.in b/package.bak/kompexsqlite/Config.in deleted file mode 100644 index 5b71842577..0000000000 --- a/package.bak/kompexsqlite/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_KOMPEXSQLITE - bool "kompexsqlite" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - The Kompex SQLite Wrapper is an open source C++ wrapper - library for SQLite. - - http://sqlitewrapper.kompex-online.com/index.php - -comment "kompexsqlite needs a toolchain w/ C++, wchar, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/kompexsqlite/kompexsqlite.hash b/package.bak/kompexsqlite/kompexsqlite.hash deleted file mode 100644 index 3c94adf091..0000000000 --- a/package.bak/kompexsqlite/kompexsqlite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 73bec94fe5dd3a24bd8668b3a131a84dbe39a992579eebab1236aa0e73b2c9cc v1.10.12-1.tar.gz diff --git a/package.bak/kompexsqlite/kompexsqlite.mk b/package.bak/kompexsqlite/kompexsqlite.mk deleted file mode 100644 index 7f57680af5..0000000000 --- a/package.bak/kompexsqlite/kompexsqlite.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# kompexsqlite -# -################################################################################ - -KOMPEXSQLITE_VERSION = v1.10.12-1 -KOMPEXSQLITE_SOURCE = $(KOMPEXSQLITE_VERSION).tar.gz -KOMPEXSQLITE_SITE = https://github.com/Aethelflaed/kompex-sqlite-wrapper/archive -KOMPEXSQLITE_INSTALL_STAGING = YES -KOMPEXSQLITE_LICENSE = LGPLv3+ (wrapper), Public Domain (bundled sqlite) -KOMPEXSQLITE_LICENSE_FILES = LICENSE.txt - -$(eval $(autotools-package)) diff --git a/package.bak/ktap/Config.in b/package.bak/ktap/Config.in deleted file mode 100644 index c85522846a..0000000000 --- a/package.bak/ktap/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_KTAP - bool "ktap" - depends on BR2_LINUX_KERNEL - depends on BR2_TOOLCHAIN_HAS_THREADS - help - ktap is a script-based dynamic tracing tool for Linux - - It uses a scripting language and lets users trace the Linux kernel - dynamically. ktap is designed to give operational insights with - interoperability that allows users to tune, troubleshoot and extend - kernel and application. It's similar to Linux Systemtap and - Solaris Dtrace. - - ktap doesn't support kernels older than 3.1. - - To be able to resolve symbols in DSO and for sdt, you need to enable - elfutils. - - Your kernel must have CONFIG_EVENT_TRACING, - CONFIG_PERF_EVENTS, and CONFIG_DEBUG_FS enabled to compile. - - Buildroot automatically enables these in the kernel configuration. - - http://www.ktap.org - -comment "ktap needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -comment "ktap needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ktap/ktap.hash b/package.bak/ktap/ktap.hash deleted file mode 100644 index d58bd85b43..0000000000 --- a/package.bak/ktap/ktap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bc8b03a53c430ae4fcf594ffdf31e2b2ed47a8fee25dd8fea60aa34f75441707 ktap-eb66d40310c93dc82bc8eac889744c1ed1f01f7b.tar.gz diff --git a/package.bak/ktap/ktap.mk b/package.bak/ktap/ktap.mk deleted file mode 100644 index 966b51c9a1..0000000000 --- a/package.bak/ktap/ktap.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# ktap -# -################################################################################ - -KTAP_VERSION = eb66d40310c93dc82bc8eac889744c1ed1f01f7b -KTAP_SITE = $(call github,ktap,ktap,$(KTAP_VERSION)) -KTAP_LICENSE = GPLv2 -KTAP_LICENSE_FILES = LICENSE-GPL - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -KTAP_DEPENDENCIES += elfutils -else -KTAP_FLAGS += NO_LIBELF=1 -endif - -define KTAP_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) $(KTAP_FLAGS) ktap -endef - -define KTAP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m755 $(@D)/ktap $(TARGET_DIR)/usr/bin/ktap -endef - -KTAP_MODULE_MAKE_OPTS = KVERSION=$(LINUX_VERSION_PROBED) - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/kvm-unit-tests/0001-remove-werror.patch b/package.bak/kvm-unit-tests/0001-remove-werror.patch deleted file mode 100644 index 058a640d76..0000000000 --- a/package.bak/kvm-unit-tests/0001-remove-werror.patch +++ /dev/null @@ -1,17 +0,0 @@ -Remove -Werror to avoid build failures - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -45,7 +45,7 @@ - > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) - - CFLAGS += -g --CFLAGS += $(autodepend-flags) -Wall -Werror -Wno-frame-address -+CFLAGS += $(autodepend-flags) -Wall -Wno-frame-address - frame-pointer-flag=-f$(if $(KEEP_FRAME_POINTER),no-,)omit-frame-pointer - fomit_frame_pointer := $(call cc-option, $(frame-pointer-flag), "") - fnostack_protector := $(call cc-option, -fno-stack-protector, "") diff --git a/package.bak/kvm-unit-tests/Config.in b/package.bak/kvm-unit-tests/Config.in deleted file mode 100644 index 72656462e1..0000000000 --- a/package.bak/kvm-unit-tests/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_KVM_UNIT_TESTS - bool "kvm-unit-tests" - select BR2_HOSTARCH_NEEDS_IA32_COMPILER if BR2_x86_64=y - # on i386 and x86-64, __builtin_reachable is used, so we need - # gcc 4.5 at least. on i386, we use the target gcc, while on - # x86-64 we use the host gcc (see .mk file for details) - # On ARM, it uses virtualization extensions - depends on BR2_cortex_a7 || BR2_cortex_a12 || \ - BR2_cortex_a15 || BR2_cortex_a17 || \ - (BR2_i386 && BR2_TOOLCHAIN_GCC_AT_LEAST_4_5) || \ - BR2_powerpc64 || \ - BR2_powerpc64le || \ - (BR2_x86_64 && BR2_HOST_GCC_AT_LEAST_4_5) - help - kvm-unit-tests is a project as old as KVM. As its name - suggests, it's purpose is to provide unit tests for KVM. The - unit tests are tiny guest operating systems that generally - execute only tens of lines of C and assembler test code in - order to obtain its PASS/FAIL result. Unit tests provide KVM - and virt hardware functional testing by targeting the - features through minimal implementations of their use per - the hardware specification. The simplicity of unit tests - make them easy to verify they are correct, easy to maintain, - and easy to use in timing measurements. Unit tests are also - often used for quick and dirty bug reproducers. The - reproducers may then be kept as regression tests. It's - strongly encouraged that patches implementing new KVM - features are submitted with accompanying unit tests. - - http://www.linux-kvm.org/page/KVM-unit-tests diff --git a/package.bak/kvm-unit-tests/kvm-unit-tests.mk b/package.bak/kvm-unit-tests/kvm-unit-tests.mk deleted file mode 100644 index 0ddb017802..0000000000 --- a/package.bak/kvm-unit-tests/kvm-unit-tests.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# kvm-unit-tests -# -################################################################################ - -KVM_UNIT_TESTS_VERSION = 5731572b2ac23eb410732110b93425b5bb7f27dd -KVM_UNIT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/scm/virt/kvm/kvm-unit-tests.git -KVM_UNIT_TESTS_SITE_METHOD = git -KVM_UNIT_TESTS_LICENSE = LGPLv2 -KVM_UNIT_TESTS_LICENSE_FILES = COPYRIGHT - -ifeq ($(BR2_arm),y) -KVM_UNIT_TESTS_ARCH = arm -else ifeq ($(BR2_i386),y) -KVM_UNIT_TESTS_ARCH = i386 -else ifeq ($(BR2_powerpc64)$(BR2_powerpc64le),y) -KVM_UNIT_TESTS_ARCH = ppc64 -else ifeq ($(BR2_x86_64),y) -KVM_UNIT_TESTS_ARCH = x86_64 -endif - -ifeq ($(BR2_ENDIAN),"LITTLE") -KVM_UNIT_TESTS_ENDIAN = little -else -KVM_UNIT_TESTS_ENDIAN = big -endif - -KVM_UNIT_TESTS_CONF_OPTS =\ - --arch="$(KVM_UNIT_TESTS_ARCH)" \ - --processor="$(call qstrip,$(BR2_GCC_TARGET_CPU))" \ - --endian="$(KVM_UNIT_TESTS_ENDIAN)" - -# For all architectures but x86-64, we use the target -# compiler. However, for x86-64, we use the host compiler, as -# kvm-unit-tests builds 32 bit code, which Buildroot toolchains for -# x86-64 cannot do. -ifneq ($(BR2_x86_64),y) -KVM_UNIT_TESTS_CONF_OPTS += --cross-prefix="$(TARGET_CROSS)" -endif - -define KVM_UNIT_TESTS_CONFIGURE_CMDS - cd $(@D) && ./configure $(KVM_UNIT_TESTS_CONF_OPTS) -endef - -define KVM_UNIT_TESTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) standalone -endef - -define KVM_UNIT_TESTS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR)/usr/share/kvm-unit-tests/ \ - install -endef - -# Does use configure script but not an autotools one -$(eval $(generic-package)) diff --git a/package.bak/kvmtool/Config.in b/package.bak/kvmtool/Config.in deleted file mode 100644 index d2290c5d8c..0000000000 --- a/package.bak/kvmtool/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_KVMTOOL - bool "kvmtool" - depends on BR2_USE_MMU # guest simple init fork() - # No MADV_HUGEPAGE define in uClibc(-ng) - depends on (BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) - # Only mips big-endian seems to be supported (build breaks) - # Should work on powerpc64 but the build breaks with missing types - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_mips || BR2_x86_64 - # libfdt is only required for DT architectures... - # ...but it's not able to build for static targets - depends on !(BR2_STATIC_LIBS && (BR2_aarch64 || BR2_arm || BR2_armeb)) - select BR2_PACKAGE_DTC if BR2_aarch64 || BR2_arm || BR2_armeb - help - kvmtool is a lightweight tool for hosting KVM guests. - As a pure virtualization tool it only supports guests using - the same architecture, though it supports running 32-bit guests - on those 64-bit architectures that allow this. - - https://git.kernel.org/cgit/linux/kernel/git/will/kvmtool.git/tree/README - -comment "kvmtool needs a glibc or musl toolchain" - depends on BR2_USE_MMU - depends on BR2_i386 || BR2_mips || BR2_x86_64 - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) - -comment "kvmtool needs a glibc or musl toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_aarch64 || BR2_arm || BR2_armeb - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || \ - BR2_STATIC_LIBS diff --git a/package.bak/kvmtool/kvmtool.mk b/package.bak/kvmtool/kvmtool.mk deleted file mode 100644 index 12454e1bfd..0000000000 --- a/package.bak/kvmtool/kvmtool.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# kvmtool -# -################################################################################ - -KVMTOOL_VERSION = bed2bd9e1fbef5819090feeada7b86eed97ca5e2 -KVMTOOL_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/will/kvmtool.git -KVMTOOL_SITE_METHOD = git -KVMTOOL_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_BINUTILS),binutils) \ - $(if $(BR2_PACKAGE_DTC),dtc) \ - $(if $(BR2_PACKAGE_LIBAIO),libaio) \ - $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) \ - $(if $(BR2_PACKAGE_LIBVNCSERVER),libvncserver) \ - $(if $(BR2_PACKAGE_SDL),sdl) \ - $(if $(BR2_PACKAGE_ZLIB),zlib) -KVMTOOL_LICENSE = GPLv2 -KVMTOOL_LICENSE_FILES = COPYING - -# This is required to convert a static binary (init helper) back into -# object-file format, and in multilib toolchains like CS 2012.09 for x86 -# the default is i386, hence when building for x86_64 things break since -# LD doesn't autodetect the input file format. -# GCC-as-linker can't accomplish this feat easily either since it's mixing -# static content (guest_init.o) with dynamic one (lkvm) making -# a relocatable output file. -# The purpose of this trick is to embed the init helper into the main -# binary to help users in guest system startup, which would otherwise -# require more complex guest images. -# This needs revisiting if/when X32 ABI support is added. -# -# If more packages need this (unlikely) an ld wrapper might be a better -# solution, using gcc -dumpspecs information. -KVMTOOL_EXTRA_LDFLAGS = \ - $(if $(BR2_x86_64),-m elf_x86_64) - -# Disable -Werror, otherwise musl is not happy -KVMTOOL_MAKE_OPTS = \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - LDFLAGS="$(TARGET_LDFLAGS) $(KVMTOOL_EXTRA_LDFLAGS)" \ - WERROR=0 - -define KVMTOOL_BUILD_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) $(KVMTOOL_MAKE_OPTS) -endef - -define KVMTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) ARCH=$(KERNEL_ARCH) $(MAKE) -C $(@D) \ - $(KVMTOOL_MAKE_OPTS) install DESTDIR=$(TARGET_DIR) prefix=/usr -endef - -$(eval $(generic-package)) diff --git a/package.bak/kyua/Config.in b/package.bak/kyua/Config.in deleted file mode 100644 index 4f887b0e0a..0000000000 --- a/package.bak/kyua/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_KYUA - bool "kyua" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_HAS_LUAINTERPRETER # lutok - depends on !BR2_PACKAGE_LUAJIT # lutok - depends on BR2_USE_MMU # atf - select BR2_PACKAGE_ATF - select BR2_PACKAGE_LUTOK - select BR2_PACKAGE_SQLITE - help - Kyua is a testing framework for infrastructure software, - originally designed to equip BSD-based operating systems - with a test suite. This means that Kyua is lightweight - and simple, and that Kyua integrates well with various build - systems and continuous integration frameworks. - - https://github.com/jmmv/kyua - -comment "kyua needs a toolchain w/ C++ and full Lua" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on BR2_USE_MMU diff --git a/package.bak/kyua/kyua.hash b/package.bak/kyua/kyua.hash deleted file mode 100644 index 298d0d85c6..0000000000 --- a/package.bak/kyua/kyua.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2b8b64a458b642df75086eeb73e8073d105b8d9cff04c9b1a905b68bc8502560 kyua-0.11.tar.gz diff --git a/package.bak/kyua/kyua.mk b/package.bak/kyua/kyua.mk deleted file mode 100644 index c75a09fbc8..0000000000 --- a/package.bak/kyua/kyua.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# kyua -# -################################################################################ - -KYUA_VERSION = 0.11 -KYUA_SITE = https://github.com/jmmv/kyua/releases/download/kyua-$(KYUA_VERSION) -KYUA_DEPENDENCIES = host-pkgconf atf lutok sqlite -KYUA_CONF_OPTS = --without-doxygen --without-atf -KYUA_LICENSE = BSD-3c -KYUA_LICENSE_FILES = COPYING -KYUA_CONF_ENV = \ - kyua_cv_attribute_noreturn=yes \ - kyua_cv_getcwd_dyn=yes \ - kyua_cv_lchmod_works=no \ - kyua_cv_getopt_gnu=yes \ - kyua_cv_getopt_optind_reset_value=0 \ - kyua_cv_signals_lastno=15 - -define KYUA_INSTALL_CONFIG - $(INSTALL) -D -m 644 $(@D)/examples/kyua.conf $(TARGET_DIR)/etc/kyua/kyua.conf -endef - -KYUA_POST_INSTALL_HOOKS += KYUA_INSTALL_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/lame/0001-configure.patch b/package.bak/lame/0001-configure.patch deleted file mode 100644 index 7e407f28c0..0000000000 --- a/package.bak/lame/0001-configure.patch +++ /dev/null @@ -1,69 +0,0 @@ -Various patches to fix autoreconf errors. - -All patches besides -- AM_ICONV in configure.in -are already applied upstream: -http://lame.cvs.sourceforge.net/viewvc/lame/lame/configure.in?r1=1.145&r2=1.146 -http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/html/Makefile.am?r1=1.8&r2=1.9 -http://lame.cvs.sourceforge.net/viewvc/lame/lame/doc/man/Makefile.am?r1=1.1&r2=1.2 - -libmp3lame/i386/Makefile.am patch ported from Debian -http://anonscm.debian.org/cgit/pkg-multimedia/lame.git/tree/debian/patches/ansi2knr2devnull.patch - -Signed-off-by: Bernd Kuhls - -diff -uNr lame-3.99.5.org/configure.in lame-3.99.5/configure.in ---- lame-3.99.5.org/configure.in 2012-02-28 19:50:27.000000000 +0100 -+++ lame-3.99.5/configure.in 2015-04-11 11:36:15.464835008 +0200 -@@ -77,9 +77,6 @@ - AC_MSG_RESULT(${GCC_version}) - fi - --dnl more automake stuff --AM_C_PROTOTYPES -- - AC_CHECK_HEADER(dmalloc.h) - if test "${ac_cv_header_dmalloc_h}" = "yes"; then - AM_WITH_DMALLOC -@@ -376,8 +373,6 @@ - AC_CHECK_LIB(curses, initscr, HAVE_TERMCAP="curses") - AC_CHECK_LIB(ncurses, initscr, HAVE_TERMCAP="ncurses") - --AM_ICONV -- - dnl math lib - AC_CHECK_LIB(m, cos, USE_LIBM="-lm") - dnl free fast math library -diff -uNr lame-3.99.5.org/doc/html/Makefile.am lame-3.99.5/doc/html/Makefile.am ---- lame-3.99.5.org/doc/html/Makefile.am 2010-09-30 22:58:40.000000000 +0200 -+++ lame-3.99.5/doc/html/Makefile.am 2015-04-11 11:37:02.880239754 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.7 2010/09/30 20:58:40 jaz001 Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - docdir = $(datadir)/doc - pkgdocdir = $(docdir)/$(PACKAGE) -diff -uNr lame-3.99.5.org/doc/man/Makefile.am lame-3.99.5/doc/man/Makefile.am ---- lame-3.99.5.org/doc/man/Makefile.am 2000-10-22 13:39:44.000000000 +0200 -+++ lame-3.99.5/doc/man/Makefile.am 2015-04-11 11:37:08.704167318 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.1 2000/10/22 11:39:44 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign ansi2knr -+AUTOMAKE_OPTIONS = foreign - - man_MANS = lame.1 - EXTRA_DIST = ${man_MANS} -diff -uNr lame-3.99.5.org/libmp3lame/i386/Makefile.am lame-3.99.5/libmp3lame/i386/Makefile.am ---- lame-3.99.5.org/libmp3lame/i386/Makefile.am 2011-04-04 11:42:34.000000000 +0200 -+++ lame-3.99.5/libmp3lame/i386/Makefile.am 2015-04-11 11:37:35.191833351 +0200 -@@ -1,6 +1,6 @@ - ## $Id: Makefile.am,v 1.26 2011/04/04 09:42:34 aleidinger Exp $ - --AUTOMAKE_OPTIONS = foreign $(top_srcdir)/ansi2knr -+AUTOMAKE_OPTIONS = foreign - - DEFS = @DEFS@ @CONFIG_DEFS@ - diff --git a/package.bak/lame/0002-gtk1-ac-directives.patch b/package.bak/lame/0002-gtk1-ac-directives.patch deleted file mode 100644 index 858ee0baf8..0000000000 --- a/package.bak/lame/0002-gtk1-ac-directives.patch +++ /dev/null @@ -1,210 +0,0 @@ -Include GTK-1 autoconf directives in build system. -Applied-Upstream: http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?r1=1.5&r2=1.6 - -Downloaded from -http://lame.cvs.sf.net/viewvc/lame/lame/acinclude.m4?r1=1.5&r2=1.6&view=patch - -to fix autoreconf. - -Signed-off-by: Bernd Kuhls - ---- a/acinclude.m4 2006/12/21 09:03:03 1.5 -+++ b/acinclude.m4 2012/06/18 20:51:05 1.6 -@@ -85,4 +85,197 @@ - [AC_MSG_WARN(can't check for IEEE854 compliant 80 bit floats)] - )])]) # alex_IEEE854_FLOAT80 - -+# Configure paths for GTK+ -+# Owen Taylor 97-11-3 - -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN([AM_PATH_GTK], -+[dnl -+dnl Get the cflags and libraries from the gtk-config script -+dnl -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -+ , enable_gtktest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gthread) -+ gtk_config_args="$gtk_config_args gthread" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${GTK_CONFIG+set} != xset ; then -+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ fi -+ fi -+ -+ AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -+ min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$GTK_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -+ GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -+ gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of gtk-config to some extent -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -+ printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -+ printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$GTK_CONFIG" = "no" ; then -+ echo "*** The gtk-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the GTK_CONFIG environment variable to the" -+ echo "*** full path to gtk-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" -+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -+ echo "*** came with the system with the command" -+ echo "***" -+ echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) diff --git a/package.bak/lame/0003-msse.patch b/package.bak/lame/0003-msse.patch deleted file mode 100644 index ca4f65f40b..0000000000 --- a/package.bak/lame/0003-msse.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix compile on 32bit Intel - -Downloaded from -http://anonscm.debian.org/cgit/pkg-multimedia/lame.git/tree/debian/patches/msse.patch - -Signed-off-by: Bernd Kuhls - -Description: Build xmm_quantize_sub.c with -msse -Author: Sebastian Ramacher -Bug: http://sourceforge.net/p/lame/bugs/443/ -Bug-Debian: https://bugs.debian.org/760047 -Forwarded: http://sourceforge.net/p/lame/bugs/443/ -Last-Update: 2014-08-31 - ---- lame-3.99.5+repack1.orig/libmp3lame/vector/Makefile.am -+++ lame-3.99.5+repack1/libmp3lame/vector/Makefile.am -@@ -20,6 +20,7 @@ xmm_sources = xmm_quantize_sub.c - - if WITH_XMM - liblamevectorroutines_la_SOURCES = $(xmm_sources) -+liblamevectorroutines_la_CFLAGS = -msse - endif - - noinst_HEADERS = lame_intrin.h diff --git a/package.bak/lame/Config.in b/package.bak/lame/Config.in deleted file mode 100644 index 2b144a0537..0000000000 --- a/package.bak/lame/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LAME - bool "lame" - help - LAME is a high quality MPEG Audio Layer III (MP3) encoder. - - http://lame.sourceforge.net/ diff --git a/package.bak/lame/lame.hash b/package.bak/lame/lame.hash deleted file mode 100644 index 875b49c2fc..0000000000 --- a/package.bak/lame/lame.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 24346b4158e4af3bd9f2e194bb23eb473c75fb7377011523353196b19b9a23ff lame-3.99.5.tar.gz diff --git a/package.bak/lame/lame.mk b/package.bak/lame/lame.mk deleted file mode 100644 index 934579953b..0000000000 --- a/package.bak/lame/lame.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# lame -# -################################################################################ - -LAME_VERSION_MAJOR = 3.99 -LAME_VERSION = $(LAME_VERSION_MAJOR).5 -LAME_SITE = http://downloads.sourceforge.net/project/lame/lame/$(LAME_VERSION_MAJOR) -LAME_DEPENDENCIES = host-pkgconf -LAME_AUTORECONF = YES -LAME_INSTALL_STAGING = YES -LAME_CONF_ENV = GTK_CONFIG=/bin/false -LAME_CONF_OPTS = --enable-dynamic-frontends -LAME_LICENSE = LGPLv2+ -LAME_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -LAME_DEPENDENCIES += libsndfile -LAME_CONF_OPTS += --with-fileio=sndfile -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -LAME_DEPENDENCIES += ncurses -endif - -ifeq ($(BR2_ENDIAN),"BIG") -define LAME_BIGENDIAN_ARCH - echo "#define WORDS_BIGENDIAN 1" >>$(@D)/config.h -endef -endif - -LAME_POST_CONFIGURE_HOOKS += LAME_BIGENDIAN_ARCH - -$(eval $(autotools-package)) diff --git a/package.bak/lapack/Config.in b/package.bak/lapack/Config.in deleted file mode 100644 index b5eca492e8..0000000000 --- a/package.bak/lapack/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -comment "lapack/blas needs a toolchain w/ fortran" - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) - depends on !BR2_TOOLCHAIN_HAS_FORTRAN - -config BR2_PACKAGE_LAPACK - bool "lapack/blas" - depends on BR2_TOOLCHAIN_HAS_FORTRAN - # _fpu_control is used on PowerPC, but not available with uClibc - depends on !(BR2_powerpc && BR2_TOOLCHAIN_USES_UCLIBC) - help - LAPACK and BLAS FORTRAN implementation. This package - installs two libraries: libblas and liblapack. - - http://www.netlib.org/lapack/ - -config BR2_PACKAGE_LAPACK_COMPLEX - bool "Complex/Complex16 support" - depends on BR2_PACKAGE_LAPACK - default y - help - Builds support for COMPLEX and COMPLEX16 data types. diff --git a/package.bak/lapack/lapack.hash b/package.bak/lapack/lapack.hash deleted file mode 100644 index e57cebcba0..0000000000 --- a/package.bak/lapack/lapack.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 888a50d787a9d828074db581c80b2d22bdb91435a673b1bf6cd6eb51aa50d1de lapack-3.6.1.tgz diff --git a/package.bak/lapack/lapack.mk b/package.bak/lapack/lapack.mk deleted file mode 100644 index 56008e1410..0000000000 --- a/package.bak/lapack/lapack.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# lapack -# -################################################################################ - -LAPACK_VERSION = 3.6.1 -LAPACK_SOURCE = lapack-$(LAPACK_VERSION).tgz -LAPACK_LICENSE = BSD-3c -LAPACK_LICENSE_FILES = LICENSE -LAPACK_SITE = http://www.netlib.org/lapack -LAPACK_INSTALL_STAGING = YES -LAPACK_CONF_OPTS = -DLAPACKE=ON -DCBLAS=ON - -ifeq ($(BR2_PACKAGE_LAPACK_COMPLEX),y) -LAPACK_CONF_OPTS += -DBUILD_COMPLEX=ON -DBUILD_COMPLEX16=ON -else -LAPACK_CONF_OPTS += -DBUILD_COMPLEX=OFF -DBUILD_COMPLEX16=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/latencytop/0001-makefile.patch b/package.bak/latencytop/0001-makefile.patch deleted file mode 100644 index fa8c51cfd0..0000000000 --- a/package.bak/latencytop/0001-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -Usee $(CC) to enable cross compiling and link to the right ncurses library. - -Signed-off-by: Qais Yousef - ---- latencytop-0.5/Makefile.old 2012-04-18 11:59:39.748084334 +0100 -+++ latencytop-0.5/Makefile 2012-04-18 12:00:08.659112340 +0100 -@@ -4,7 +4,7 @@ - DESTDIR = - SBINDIR = /usr/sbin - XCFLAGS = -W -g `pkg-config --cflags glib-2.0` -D_FORTIFY_SOURCE=2 -Wno-sign-compare --LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncursesw -+LDF = -Wl,--as-needed `pkg-config --libs glib-2.0` -lncurses - - OBJS= latencytop.o text_display.o translate.o fsync.o - -@@ -26,10 +26,10 @@ - - # We write explicity this "implicit rule" - %.o : %.c -- gcc -c $(CFLAGS) $(XCFLAGS) $< -o $@ -+ $(CC) -c $(CFLAGS) $(XCFLAGS) $< -o $@ - - latencytop: $(OBJS) latencytop.h Makefile -- gcc $(CFLAGS) $(OBJS) $(LDF) -o latencytop -+ $(CC) $(CFLAGS) $(OBJS) $(LDF) -o latencytop - - clean: - rm -f *~ latencytop DEADJOE *.o diff --git a/package.bak/latencytop/Config.in b/package.bak/latencytop/Config.in deleted file mode 100644 index b54ef052b4..0000000000 --- a/package.bak/latencytop/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_LATENCYTOP - bool "latencytop" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBGLIB2 - help - There are many types and causes of latency. LatencyTOP - focuses on the type of latency that causes skips in audio, - stutters in your desktop experience or that overloads your - server (while you have plenty of CPU power left). - - LatencyTOP focuses on the cases where the applications want - to run and execute useful code, but there's some resource - that's not currently available (and the kernel then blocks - the process). This is done both on a system level and on a - per process level, so that you can see what's happening to - the system, and which process is suffering and/or causing - the delays. - - http://www.latencytop.org - -comment "latencytop needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/latencytop/latencytop.hash b/package.bak/latencytop/latencytop.hash deleted file mode 100644 index 4be004cafc..0000000000 --- a/package.bak/latencytop/latencytop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9e7f72fbea7bd918e71212a1eabaad8488d2c602205d2e3c95d62cd57e9203ef latencytop-0.5.tar.gz diff --git a/package.bak/latencytop/latencytop.mk b/package.bak/latencytop/latencytop.mk deleted file mode 100644 index 644a84f162..0000000000 --- a/package.bak/latencytop/latencytop.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# latencytop -# -################################################################################ - -LATENCYTOP_VERSION = 0.5 -LATENCYTOP_SITE = http://www.latencytop.org/download -LATENCYTOP_DEPENDENCIES = libglib2 ncurses -LATENCYTOP_LICENSE = GPLv2 -LATENCYTOP_LICENSE_FILES = latencytop.c - -# NOTE: GTK is heavy weight, we intentionally build the text (ncurses) -# version only -define LATENCYTOP_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) HAS_GTK_GUI= -endef - -define LATENCYTOP_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) DESTDIR=$(TARGET_DIR) HAS_GTK_GUI= -endef - -$(eval $(generic-package)) diff --git a/package.bak/lbase64/Config.in b/package.bak/lbase64/Config.in deleted file mode 100644 index 5ef91bf301..0000000000 --- a/package.bak/lbase64/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LBASE64 - bool "lbase64" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT - help - A base64 library for Lua - - http://luaforge.net/projects/lbase64/ - -comment "lbase64 needs a Lua 5.1 interpreter" - depends on !BR2_PACKAGE_LUA_5_1 - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/lbase64/lbase64.hash b/package.bak/lbase64/lbase64.hash deleted file mode 100644 index 080609037e..0000000000 --- a/package.bak/lbase64/lbase64.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7326658d48a70382b496eb88220b0c398c19ed712e39863939330fec0533362a lbase64-20120820-1.src.rock diff --git a/package.bak/lbase64/lbase64.mk b/package.bak/lbase64/lbase64.mk deleted file mode 100644 index 80e880079e..0000000000 --- a/package.bak/lbase64/lbase64.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# lbase64 -# -################################################################################ - -LBASE64_VERSION = 20120820-1 -LBASE64_SUBDIR = base64 -LBASE64_LICENSE = Public domain -LBASE64_LICENSE_FILES = $(LBASE64_SUBDIR)/README - -$(eval $(luarocks-package)) diff --git a/package.bak/lbreakout2/Config.in b/package.bak/lbreakout2/Config.in deleted file mode 100644 index 221c9e2c5b..0000000000 --- a/package.bak/lbreakout2/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_LBREAKOUT2 - bool "LBreakout2" - select BR2_PACKAGE_SDL - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - LBreakout2 is the successor to LBreakout, a breakout-style arcade - game in the manner of Arkanoid. Requires SDL, libpng, and - optionnally SDL_mixer/SDL_net. - A display with minimum 640x480 resolution, a keyboard and a mouse - are recommanded. - - http://lgames.sourceforge.net/index.php?project=LBreakout2 - -if BR2_PACKAGE_LBREAKOUT2 - -config BR2_PACKAGE_LBREAKOUT2_AUDIO - bool "audio support" - default y - select BR2_PACKAGE_SDL_MIXER - help - Activates audio support in LBreakout2. Will add SDL_mixer. - -config BR2_PACKAGE_LBREAKOUT2_NET - bool "network support" - default y - select BR2_PACKAGE_SDL_NET - help - Activates network support LBreakout2. Will add SDL_net. - -endif diff --git a/package.bak/lbreakout2/lbreakout2.hash b/package.bak/lbreakout2/lbreakout2.hash deleted file mode 100644 index d9638b47b3..0000000000 --- a/package.bak/lbreakout2/lbreakout2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0b90716d52e67c27ff41ab7aa5c09dad4f5f19a78076cc57dd4b4d7ed2c1dbd9 lbreakout2-2.6.4.tar.gz diff --git a/package.bak/lbreakout2/lbreakout2.mk b/package.bak/lbreakout2/lbreakout2.mk deleted file mode 100644 index 5dc4c71753..0000000000 --- a/package.bak/lbreakout2/lbreakout2.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# lbreakout2 -# -################################################################################ - -LBREAKOUT2_VERSION_MAJOR = 2.6 -LBREAKOUT2_VERSION = $(LBREAKOUT2_VERSION_MAJOR).4 -LBREAKOUT2_SITE = http://downloads.sourceforge.net/lgames/lbreakout2/$(LBREAKOUT2_VERSION_MAJOR) -LBREAKOUT2_LICENSE = GPLv2+ -LBREAKOUT2_LICENSE_FILES = COPYING - -LBREAKOUT2_DEPENDENCIES = sdl libpng - -LBREAKOUT2_CONF_ENV = \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LBREAKOUT2_DEPENDENCIES += gettext -LBREAKOUT2_CONF_ENV += LIBS=-lintl -endif - -ifeq ($(BR2_PACKAGE_LBREAKOUT2_AUDIO),y) -LBREAKOUT2_DEPENDENCIES += sdl_mixer -LBREAKOUT2_CONF_OPTS += --enable-audio=yes -else -LBREAKOUT2_CONF_OPTS += --disable-audio -endif - -ifeq ($(BR2_PACKAGE_LBREAKOUT2_NET),y) -LBREAKOUT2_DEPENDENCIES += sdl_net -LBREAKOUT2_CONF_OPTS += --enable-network=yes -else -LBREAKOUT2_CONF_OPTS += --disable-network -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lcdapi/Config.in b/package.bak/lcdapi/Config.in deleted file mode 100644 index 34ce0fa1a1..0000000000 --- a/package.bak/lcdapi/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LCDAPI - bool "lcdapi" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - C++ client API for lcdproc, containing a set of widget classes. - - https://github.com/spdawson/lcdapi - -comment "lcdapi needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/lcdapi/lcdapi.hash b/package.bak/lcdapi/lcdapi.hash deleted file mode 100644 index 98c42f8f54..0000000000 --- a/package.bak/lcdapi/lcdapi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 fa26b53fd543ebab825d55cafb4c88af6a71ac3dcf86d4e8bcd3592be4212b55 lcdapi-v0.10.tar.gz diff --git a/package.bak/lcdapi/lcdapi.mk b/package.bak/lcdapi/lcdapi.mk deleted file mode 100644 index 75390421d6..0000000000 --- a/package.bak/lcdapi/lcdapi.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# lcdapi -# -################################################################################ - -LCDAPI_VERSION = v0.10 -LCDAPI_SITE = $(call github,spdawson,lcdapi,$(LCDAPI_VERSION)) -LCDAPI_LICENSE = LGPLv2.1+ -LCDAPI_LICENSE_FILES = COPYING -LCDAPI_AUTORECONF = YES -LCDAPI_INSTALL_STAGING = YES - -# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 -ifeq ($(BR2_m68k_cf),y) -LCDAPI_CONF_OPTS += CXXFLAGS="$(TARGET_CXXFLAGS) -fno-dwarf2-cfi-asm" -endif - -define LCDAPI_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -LCDAPI_POST_PATCH_HOOKS += LCDAPI_CREATE_M4_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/lcdproc/0001-LCDd.conf.patch b/package.bak/lcdproc/0001-LCDd.conf.patch deleted file mode 100644 index 283ac8867b..0000000000 --- a/package.bak/lcdproc/0001-LCDd.conf.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix the default LCDd configuration file, so that the DriverPath -is set to the correct lcdproc library install path, rather than -the dummy/default path. - -Signed-off-by: Simon Dawson ---- - ---- lcdproc-0.5.3/LCDd.conf.orig 2009-06-20 14:48:34.000000000 +0100 -+++ lcdproc-0.5.3/LCDd.conf 2010-05-11 10:02:21.000000000 +0100 -@@ -34,7 +34,7 @@ - # the driver modules and will thus not be able to - # function properly. - # NOTE: Always place a slash as last character ! --DriverPath=server/drivers/ -+DriverPath=/usr/lib/lcdproc/ - - # Tells the server to load the given drivers. Multiple lines can be given. - # The name of the driver is case sensitive and determines the section diff --git a/package.bak/lcdproc/0002-musl.patch b/package.bak/lcdproc/0002-musl.patch deleted file mode 100644 index d0425fd5b2..0000000000 --- a/package.bak/lcdproc/0002-musl.patch +++ /dev/null @@ -1,102 +0,0 @@ -Fix musl build - -Partly downloaded from -http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014291.html -http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014281.html - -Signed-off-by: Bernd Kuhls - -diff -uNr lcdproc-0.5.7.org/clients/lcdproc/machine.h lcdproc-0.5.7/clients/lcdproc/machine.h ---- lcdproc-0.5.7.org/clients/lcdproc/machine.h 2012-08-19 16:29:07.000000000 +0200 -+++ lcdproc-0.5.7/clients/lcdproc/machine.h 2016-01-30 14:07:33.641802847 +0100 -@@ -12,6 +12,7 @@ - #ifndef _lcdproc_machine_h_ - #define _lcdproc_machine_h_ - -+#include - #include "shared/LL.h" - - #ifndef LOADAVG_NSTATS -diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c ---- lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c 2014-03-23 11:22:09.000000000 +0100 -+++ lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c 2016-01-30 14:12:03.521279729 +0100 -@@ -54,6 +54,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c lcdproc-0.5.7/server/drivers/hd44780-rpi.c ---- lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c 2014-03-23 11:22:09.000000000 +0100 -+++ lcdproc-0.5.7/server/drivers/hd44780-rpi.c 2016-01-30 14:04:10.288112853 +0100 -@@ -285,7 +285,7 @@ - - /* Unmap and free memory */ - if (gpio_map != NULL) -- munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE); -+ munmap((void *) gpio_map, GPIO_BLOCK_SIZE); - if (p->rpi_gpio != NULL) - free(p->rpi_gpio); - p->rpi_gpio = NULL; -diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-spi.c lcdproc-0.5.7/server/drivers/hd44780-spi.c ---- lcdproc-0.5.7.org/server/drivers/hd44780-spi.c 2014-03-23 11:22:09.000000000 +0100 -+++ lcdproc-0.5.7/server/drivers/hd44780-spi.c 2016-01-30 14:11:11.604763500 +0100 -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - -diff -uNr lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c lcdproc-0.5.7/server/drivers/mtc_s16209x.c ---- lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c 2011-08-14 14:29:16.000000000 +0200 -+++ lcdproc-0.5.7/server/drivers/mtc_s16209x.c 2016-01-30 14:13:10.691122839 +0100 -@@ -49,6 +49,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_CONFIG_H - # include "config.h" -diff -uNr lcdproc-0.5.7.org/server/drivers/rawserial.c lcdproc-0.5.7/server/drivers/rawserial.c ---- lcdproc-0.5.7.org/server/drivers/rawserial.c 2014-03-23 11:22:10.000000000 +0100 -+++ lcdproc-0.5.7/server/drivers/rawserial.c 2016-01-30 14:03:43.465779507 +0100 -@@ -60,13 +60,13 @@ - /** \name Event loop timing. refresh_time and refresh_delta form the - * event loop timing mechanism for configurable update rates. - *@{*/ -- uint refresh_time; /**< time at the last screen update */ -- uint refresh_delta; /**< time step to next screen update */ -+ unsigned int refresh_time; /**< time at the last screen update */ -+ unsigned int refresh_delta; /**< time step to next screen update */ - /**@}*/ - } PrivateData; - - /* Local prototypes */ --static uint get_millisecond_time(void); -+static unsigned int get_millisecond_time(void); - - - /* Vars for the server core */ -@@ -303,7 +303,7 @@ - PrivateData *p = drvthis->private_data; - char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT]; - -- uint currentTime = get_millisecond_time(); -+ unsigned int currentTime = get_millisecond_time(); - int t_delta = currentTime - p->refresh_time; - - /* -@@ -415,7 +415,7 @@ - * - * \return int with current millisecond time. - */ --static uint -+static unsigned int - get_millisecond_time(void) - { - struct timeval ts; diff --git a/package.bak/lcdproc/Config.in b/package.bak/lcdproc/Config.in deleted file mode 100644 index 042abd69df..0000000000 --- a/package.bak/lcdproc/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -comment "lcdproc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_LCDPROC - bool "lcdproc" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_ZLIB - help - LCD display driver daemon and clients - - http://lcdproc.org/ - -if BR2_PACKAGE_LCDPROC - -config BR2_PACKAGE_LCDPROC_DRIVERS - string "List of drivers to build" - default "all" - help - Specify a comma-separated list of lcdproc drivers to be built - -config BR2_PACKAGE_LCDPROC_MENUS - bool "Menu support" - help - Enable support for lcdproc menus - -endif diff --git a/package.bak/lcdproc/lcdproc.hash b/package.bak/lcdproc/lcdproc.hash deleted file mode 100644 index ea39a9b492..0000000000 --- a/package.bak/lcdproc/lcdproc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804 lcdproc-0.5.7.tar.gz diff --git a/package.bak/lcdproc/lcdproc.mk b/package.bak/lcdproc/lcdproc.mk deleted file mode 100644 index 4fbeca14ca..0000000000 --- a/package.bak/lcdproc/lcdproc.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# lcdproc -# -################################################################################ - -LCDPROC_VERSION = 0.5.7 -LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION) -LCDPROC_LICENSE = GPLv2+ -LCDPROC_LICENSE_FILES = COPYING -LCDPROC_MAKE = $(MAKE1) - -LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \ - --with-ft-prefix="$(STAGING_DIR)/usr" \ - --with-ft-exec-prefix="$(STAGING_DIR)/usr" - -ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y) -LCDPROC_CONF_OPTS += --enable-lcdproc-menus -endif - -LCDPROC_DEPENDENCIES = freetype ncurses zlib - -$(eval $(autotools-package)) diff --git a/package.bak/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch b/package.bak/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch deleted file mode 100644 index f8c0d00d30..0000000000 --- a/package.bak/lcms2/0001-Fix-lcms2.pc.in-thread-library-dependency.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0b55fd4e0935a0231ca258fde631a95215df2f72 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 11 Nov 2016 23:29:56 +0100 -Subject: [PATCH] Fix lcms2.pc.in thread library dependency. - -Needed (sometimes) for static linking. - -Signed-off-by: Peter Seiderer ---- - lcms2.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lcms2.pc.in b/lcms2.pc.in -index b715f59..5b4213c 100644 ---- a/lcms2.pc.in -+++ b/lcms2.pc.in -@@ -7,5 +7,5 @@ Name: @PACKAGE@ - Description: LCMS Color Management Library - Version: @VERSION@ - Libs: -L${libdir} -llcms2 --Libs.private: @LIB_MATH@ -+Libs.private: @LIB_MATH@ @LIB_THREAD@ - Cflags: -I${includedir} --- -2.8.1 - diff --git a/package.bak/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch b/package.bak/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch deleted file mode 100644 index 9a5d9dd4e9..0000000000 --- a/package.bak/lcms2/0002-Added-an-extra-check-to-MLU-bounds.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5ca71a7bc18b6897ab21d815d15e218e204581e2 Mon Sep 17 00:00:00 2001 -From: Marti -Date: Mon, 15 Aug 2016 23:31:39 +0200 -Subject: [PATCH] Added an extra check to MLU bounds - -Thanks to Ibrahim el-sayed for spotting the bug - -Signed-off-by: Peter Korsgaard ---- - src/cmstypes.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/cmstypes.c b/src/cmstypes.c -index cb61860..c7328b9 100644 ---- a/src/cmstypes.c -+++ b/src/cmstypes.c -@@ -1460,6 +1460,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU - - // Check for overflow - if (Offset < (SizeOfHeader + 8)) goto Error; -+ if ((Offset + Len) > SizeOfTag + 8) goto Error; - - // True begin of the string - BeginOfThisString = Offset - SizeOfHeader - 8; --- -2.11.0 - diff --git a/package.bak/lcms2/Config.in b/package.bak/lcms2/Config.in deleted file mode 100644 index d94c075e1e..0000000000 --- a/package.bak/lcms2/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LCMS2 - bool "lcms2" - help - Little Color Management Software (CMS) intends to be an OPEN - SOURCE small-footprint color management engine, with special - focus on accuracy and performance. - It uses the International Color Consortium standard (ICC), which is - the modern standard when regarding to color management. - - http://www.littlecms.com/ diff --git a/package.bak/lcms2/lcms2.hash b/package.bak/lcms2/lcms2.hash deleted file mode 100644 index 1cf1017c54..0000000000 --- a/package.bak/lcms2/lcms2.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/lcms/files/lcms/2.8 -sha1 e9535ec4a572b8fc7a1c405c35e6f4dc97714197 lcms2-2.8.tar.gz -# Locally computed: -sha256 66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22 lcms2-2.8.tar.gz diff --git a/package.bak/lcms2/lcms2.mk b/package.bak/lcms2/lcms2.mk deleted file mode 100644 index 9a4cf5ed24..0000000000 --- a/package.bak/lcms2/lcms2.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# lcms2 -# -################################################################################ - -LCMS2_VERSION = 2.8 -LCMS2_SITE = http://downloads.sourceforge.net/project/lcms/lcms/$(LCMS2_VERSION) -LCMS2_LICENSE = MIT -LCMS2_LICENSE_FILES = COPYING -LCMS2_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_JPEG),y) -LCMS2_CONF_OPTS += --with-jpeg -LCMS2_DEPENDENCIES += jpeg -else -LCMS2_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -LCMS2_CONF_OPTS += --with-tiff -LCMS2_DEPENDENCIES += tiff -else -LCMS2_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LCMS2_CONF_OPTS += --with-zlib -LCMS2_DEPENDENCIES += zlib -else -LCMS2_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/leafnode2/0001-cross_makefile.patch b/package.bak/leafnode2/0001-cross_makefile.patch deleted file mode 100644 index b61a8ef3c6..0000000000 --- a/package.bak/leafnode2/0001-cross_makefile.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix cross-compilation issues - - - During target package compilation the host version of b_sortnl is - needed. - - - Do not call a 'amiroot' program built for the target when - cross-compiling. We're anyway not root, so simply remove the - chown/chgrp dance. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -1853,7 +1853,7 @@ - - configparam_data.c: $(srcdir)/config.table b_sortnl$(EXEEXT) genconfigparam_data.awk - rm -f config.table.sorted -- ./b_sortnl$(EXEEXT) <$(srcdir)/config.table >config.table.sorted -+ ./b_sortnl_host$(EXEEXT) <$(srcdir)/config.table >config.table.sorted - $(AWK) -f $(srcdir)/genconfigparam_data.awk $@ \ - || { rm -f $@ ; false ; } - -@@ -1868,13 +1868,7 @@ - install-data-hook: - $(INSTALL) -d -m 02770 $(DESTDIR)$(SPOOLDIR) - $(INSTALL) -d -m 02770 $(DESTDIR)$(SPOOLDIR)/leaf.node -- -./amiroot && chown $(RUNAS_USER) $(DESTDIR)$(SPOOLDIR) -- -./amiroot && chown $(RUNAS_USER) $(DESTDIR)$(SPOOLDIR)/leaf.node -- -./amiroot && chgrp $(RUNAS_GROUP) $(DESTDIR)$(SPOOLDIR) -- -./amiroot && chgrp $(RUNAS_GROUP) $(DESTDIR)$(SPOOLDIR)/leaf.node - rm -f $(DESTDIR)$(sbindir)/leafnode-version # now in $(bindir) -- ./amiroot && p=$(DESTDIR)$(bindir)/newsq && chown 0 $$p \ -- && chgrp $(RUNAS_GROUP) $$p && chmod 2111 $$p ; true - @echo - @echo "### If upgrading from leafnode before 1.6," - @echo "### run: make update" diff --git a/package.bak/leafnode2/Config.in b/package.bak/leafnode2/Config.in deleted file mode 100644 index 348e6daacf..0000000000 --- a/package.bak/leafnode2/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LEAFNODE2 - bool "leafnode2" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_PCRE - help - Leafnode-2 is a store-and-forward NNTP (or Usenet) proxy - server designed for small sites with just a few active - newsgroups. - - Leafnode-2 needs inetd, check chapter 14 of the documentation at - http://www.dt.e-technik.uni-dortmund.de/~ma/leafnode/beta/leafnode-readme.txt - - For example, you can add this line to inetd.conf: - nntp stream tcp nowait news /usr/sbin/leafnode - - http://www.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta diff --git a/package.bak/leafnode2/leafnode2.hash b/package.bak/leafnode2/leafnode2.hash deleted file mode 100644 index 9c94fb9ec4..0000000000 --- a/package.bak/leafnode2/leafnode2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 34eba2cbbb871b724c8d5dd402d1c358aeb21ba426beb5658e155ed0d7461075 leafnode-2.0.0.alpha20140727b.tar.bz2 diff --git a/package.bak/leafnode2/leafnode2.mk b/package.bak/leafnode2/leafnode2.mk deleted file mode 100644 index 0c20fd03cf..0000000000 --- a/package.bak/leafnode2/leafnode2.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# leafnode2 -# -################################################################################ - -LEAFNODE2_VERSION = 2.0.0.alpha20140727b -LEAFNODE2_SOURCE = leafnode-$(LEAFNODE2_VERSION).tar.bz2 -LEAFNODE2_SITE = http://krusty.dt.e-technik.tu-dortmund.de/~ma/leafnode/beta -LEAFNODE2_LICENSE = LGPLv2.1 -LEAFNODE2_LICENSE_FILES = COPYING COPYING.LGPL -LEAFNODE2_DEPENDENCIES = host-pcre pcre - -LEAFNODE2_CONF_ENV = \ - PCRECONFIG="$(STAGING_DIR)/usr/bin/pcre-config" - -# --enable-runas-user use 'news' as default but the configure stop -# if news doesn't exist on the build host. -# Use 'root' while cross-compiling -LEAFNODE2_CONF_OPTS = \ - --sysconfdir=/etc/leafnode2 \ - --enable-spooldir=/var/spool/news \ - --enable-runas-user=root - -# Leafnode2 needs the host version of b_sortnl during -# compilation. Instead of creating a seperate host package and -# installing b_sortnl to $(HOST_DIR) this binary is compiled -# on-the-fly, host-pcre is needed for this -define LEAFNODE2_BUILD_SORTNL_TOOL - cd $(@D); \ - $(HOSTCC) $(HOST_CFLAGS) -o b_sortnl_host \ - arc4random.c mergesort.c b_sortnl.c critmem_malloc.c \ - critmem_realloc.c -DHAVE_CONFIG_H -I$(HOST_DIR)/usr/include \ - -L $(HOST_DIR)/usr/lib -Wl,-rpath,$(HOST_DIR)/usr/lib -lpcre -endef - -LEAFNODE2_PRE_BUILD_HOOKS += LEAFNODE2_BUILD_SORTNL_TOOL - -define LEAFNODE2_USERS - news -1 news -1 * - - - Leafnode2 daemon -endef - -$(eval $(autotools-package)) diff --git a/package.bak/leafpad/Config.in b/package.bak/leafpad/Config.in deleted file mode 100644 index a4408547cd..0000000000 --- a/package.bak/leafpad/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LEAFPAD - bool "leafpad" - depends on BR2_PACKAGE_LIBGTK2 - help - GTK+ based simple text editor - - http://savannah.nongnu.org/download/leafpad diff --git a/package.bak/leafpad/leafpad.hash b/package.bak/leafpad/leafpad.hash deleted file mode 100644 index be56d41454..0000000000 --- a/package.bak/leafpad/leafpad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 959d22ae07f22803bc66ff40d373a854532a6e4732680bf8a96a3fbcb9f80a2c leafpad-0.8.18.1.tar.gz diff --git a/package.bak/leafpad/leafpad.mk b/package.bak/leafpad/leafpad.mk deleted file mode 100644 index 9551a75835..0000000000 --- a/package.bak/leafpad/leafpad.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# leafpad -# -################################################################################ - -LEAFPAD_VERSION = 0.8.18.1 -LEAFPAD_SITE = http://savannah.nongnu.org/download/leafpad -LEAFPAD_DEPENDENCIES = libgtk2 host-intltool -LEAFPAD_LICENSE = GPLv2+ -LEAFPAD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/less/Config.in b/package.bak/less/Config.in deleted file mode 100644 index caf688aea0..0000000000 --- a/package.bak/less/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LESS - bool "less" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_NCURSES - help - Excellent text file viewer. - - http://www.greenwoodsoftware.com/ diff --git a/package.bak/less/less.hash b/package.bak/less/less.hash deleted file mode 100644 index eea201da1e..0000000000 --- a/package.bak/less/less.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 3fa38f2cf5e9e040bb44fffaa6c76a84506e379e47f5a04686ab78102090dda5 less-481.tar.gz diff --git a/package.bak/less/less.mk b/package.bak/less/less.mk deleted file mode 100644 index c2175438fb..0000000000 --- a/package.bak/less/less.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# less -# -################################################################################ - -LESS_VERSION = 481 -LESS_SITE = $(BR2_GNU_MIRROR)/less -LESS_LICENSE = GPLv3+ -LESS_LICENSE_FILES = COPYING -# Build after busybox, full-blown is better -LESS_DEPENDENCIES = ncurses $(if $(BR2_PACKAGE_BUSYBOX),busybox) - -define LESS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less -endef - -$(eval $(autotools-package)) diff --git a/package.bak/lesstif/Config.in b/package.bak/lesstif/Config.in deleted file mode 100644 index a6a88ec466..0000000000 --- a/package.bak/lesstif/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LESSTIF - bool "lesstif" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_FREETYPE - depends on BR2_USE_MMU # fork() - help - lesstif is the Hungry Programmers' version of OSF/Motif - - http://lesstif.sourceforge.net/ diff --git a/package.bak/lesstif/lesstif.hash b/package.bak/lesstif/lesstif.hash deleted file mode 100644 index c2ede8b6a8..0000000000 --- a/package.bak/lesstif/lesstif.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 eb4aa38858c29a4a3bcf605cfe7d91ca41f4522d78d770f69721e6e3a4ecf7e3 lesstif-0.95.2.tar.bz2 diff --git a/package.bak/lesstif/lesstif.mk b/package.bak/lesstif/lesstif.mk deleted file mode 100644 index 6ce2339b38..0000000000 --- a/package.bak/lesstif/lesstif.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# lesstif -# -################################################################################ -LESSTIF_VERSION = 0.95.2 -LESSTIF_SOURCE = lesstif-$(LESSTIF_VERSION).tar.bz2 -LESSTIF_SITE = http://downloads.sourceforge.net/project/lesstif/lesstif/$(LESSTIF_VERSION) -LESSTIF_INSTALL_STAGING = YES -LESSTIF_DEPENDENCIES = \ - xlib_libXt \ - xlib_libXext \ - freetype -LESSTIF_LICENSE = LGPLv2+ -LESSTIF_LICENSE_FILES = COPYING.LIB -LESSTIF_CONF_OPTS = \ - --with-gnu-ld \ - --with-freetype-config=$(STAGING_DIR)/usr/bin/freetype-config \ - --enable-production=yes \ - --enable-build-tests=no \ - --no-recursion - -# Reduces the buggy makefile to the smallest possible (and working) thing -define LESSTIF_NOMAN2HTML - echo "all:" > $(@D)/doc/Makefile - echo "" >> $(@D)/doc/Makefile - echo "install:" >> $(@D)/doc/Makefile - echo "" >> $(@D)/doc/Makefile - echo "clean:" >> $(@D)/doc/Makefile -endef - -# Prevents to copy ac_find_motif.m4 on target, it would else -# be created at $(TARGET_DIR)/$(TOPDIR)/output/host/usr/share/aclocal/ac_find_motif.m4 -define LESSTIF_FIXACLOCAL - sed -i -e "/install-data-am: install-aclocalDATA/d" $(@D)/scripts/autoconf/Makefile -endef - -LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_NOMAN2HTML -LESSTIF_POST_CONFIGURE_HOOKS += LESSTIF_FIXACLOCAL - -$(eval $(autotools-package)) diff --git a/package.bak/leveldb/0001-Fix-compilation-with-g-4.8.2.patch b/package.bak/leveldb/0001-Fix-compilation-with-g-4.8.2.patch deleted file mode 100644 index f39216067c..0000000000 --- a/package.bak/leveldb/0001-Fix-compilation-with-g-4.8.2.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8a8016f6d2af335ab205aa40d5274fc9b0c7a566 Mon Sep 17 00:00:00 2001 -From: Steve James -Date: Sun, 5 Apr 2015 16:29:51 +0200 -Subject: [PATCH 1/2] Fix compilation with g++ 4.8.2 - -Where db_iter.cc fails to get a typedef for ssize_t when compiled by -GCC. - -Upstream-Status: Submitted [https://github.com/google/leveldb/issues/233] - -Signed-off-by: Steve James -Signed-off-by: Thomas Petazzoni ---- - db/db_iter.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/db/db_iter.cc b/db/db_iter.cc -index 3b2035e..c2e5f35 100644 ---- a/db/db_iter.cc -+++ b/db/db_iter.cc -@@ -13,6 +13,7 @@ - #include "util/logging.h" - #include "util/mutexlock.h" - #include "util/random.h" -+#include // for ssize_t - - namespace leveldb { - --- -2.1.0 - diff --git a/package.bak/leveldb/0002-Add-install-recipe.patch b/package.bak/leveldb/0002-Add-install-recipe.patch deleted file mode 100644 index f65916f1eb..0000000000 --- a/package.bak/leveldb/0002-Add-install-recipe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bf646b73391d3d2d0b9780a399dd24880c66b9ab Mon Sep 17 00:00:00 2001 -From: Steve James -Date: Sun, 5 Apr 2015 16:30:46 +0200 -Subject: [PATCH 2/2] Add install recipe - -Upstream-Status: Rejected [https://github.com/google/leveldb/pull/276] - -Signed-off-by: Steve James -Signed-off-by: Thomas Petazzoni -[baruch: update for v1.19] -Signed-off-by: Baruch Siach ---- - Makefile | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/Makefile b/Makefile -index 07a5a1ead6fd..c87023db527a 100644 ---- a/Makefile -+++ b/Makefile -@@ -412,3 +412,17 @@ $(SHARED_OUTDIR)/%.o: %.cc - - $(SHARED_OUTDIR)/%.o: %.c - $(CC) $(CFLAGS) $(PLATFORM_SHARED_CFLAGS) -c $< -o $@ -+ -+INSTALL_ROOT = / -+INSTALL_PREFIX= usr/local -+ -+install: all -+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb -+ install -D -m 0644 include/leveldb/*.h $(INSTALL_ROOT)$(INSTALL_PREFIX)/include/leveldb -+ install -d -m 0755 $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ install -m 0644 $(STATIC_OUTDIR)/libleveldb.a $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ifneq (,$(SHARED_LIBS)) -+ install -m 0755 $(SHARED_OUTDIR)/$(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib -+ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB1) -+ ln -sf $(SHARED_LIB3) $(INSTALL_ROOT)$(INSTALL_PREFIX)/lib/$(SHARED_LIB2) -+endif --- -2.1.0 - diff --git a/package.bak/leveldb/Config.in b/package.bak/leveldb/Config.in deleted file mode 100644 index b583c3b9fe..0000000000 --- a/package.bak/leveldb/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LEVELDB - bool "leveldb" - # Missing/broken atomic pointer support - depends on !BR2_bfin - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_SNAPPY - help - LevelDB is a fast key-value storage library written at Google that - provides an ordered mapping from string keys to string values. - - https://github.com/google/leveldb - -comment "leveldb needs a toolchain w/ C++, threads" - depends on !BR2_bfin - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/leveldb/leveldb.hash b/package.bak/leveldb/leveldb.hash deleted file mode 100644 index 4af30fbe6f..0000000000 --- a/package.bak/leveldb/leveldb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7d7a14ae825e66aabeb156c1c3fae9f9a76d640ef6b40ede74cc73da937e5202 leveldb-v1.19.tar.gz diff --git a/package.bak/leveldb/leveldb.mk b/package.bak/leveldb/leveldb.mk deleted file mode 100644 index ca2ed703a0..0000000000 --- a/package.bak/leveldb/leveldb.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# leveldb -# -################################################################################ - -LEVELDB_VERSION = v1.19 -LEVELDB_SITE = $(call github,google,leveldb,$(LEVELDB_VERSION)) -LEVELDB_LICENSE = BSD-3c -LEVELDB_LICENSE_FILES = LICENSE -LEVELDB_INSTALL_STAGING = YES -LEVELDB_DEPENDENCIES = snappy - -# Disable the shared library for static only build -ifeq ($(BR2_STATIC_LIBS),y) -LEVELDB_MAKE_ARGS += SHARED_LIBS= SHARED_PROGRAMS= -endif - -define LEVELDB_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - $(LEVELDB_MAKE_ARGS) -C $(@D) -endef - -define LEVELDB_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - INSTALL_ROOT=$(STAGING_DIR) INSTALL_PREFIX=/usr \ - $(LEVELDB_MAKE_ARGS) -C $(@D) install -endef - -define LEVELDB_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - INSTALL_ROOT=$(TARGET_DIR) INSTALL_PREFIX=/usr \ - $(LEVELDB_MAKE_ARGS) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/lft/Config.in b/package.bak/lft/Config.in deleted file mode 100644 index 9ed7b8bd69..0000000000 --- a/package.bak/lft/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LFT - bool "lft" - select BR2_PACKAGE_LIBPCAP - help - LFT, short for Layer Four Traceroute, is a sort of - 'traceroute' that often works much faster (than the - commonly-used Van Jacobson method) and goes through many - configurations of packet-filters (firewalls). - - http://pwhois.org/lft/ diff --git a/package.bak/lft/lft.hash b/package.bak/lft/lft.hash deleted file mode 100644 index b045e7c96a..0000000000 --- a/package.bak/lft/lft.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated, matches download from fossies.org and pwhois.org -sha256 d182d6774e64dcdeb19ed1a598fa588e57ddb6cbb6847d9277c405d3a4597d89 lft-3.77.tar.gz diff --git a/package.bak/lft/lft.mk b/package.bak/lft/lft.mk deleted file mode 100644 index 72f43fa209..0000000000 --- a/package.bak/lft/lft.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# lft -# -################################################################################ - -LFT_VERSION = 3.77 -LFT_SITE = http://pwhois.org/get -LFT_DEPENDENCIES = libpcap -LFT_LICENSE = VOSTROM Public License for Open Source -LFT_LICENSE_FILES = COPYING -LFT_CONF_OPTS = --with-pcap=$(STAGING_DIR)/usr -LFT_MAKE_ENV = STRIP=true - -ifeq ($(BR2_STATIC_LIBS),y) -LFT_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lftp/0001-fix-static-link-with-readline.patch b/package.bak/lftp/0001-fix-static-link-with-readline.patch deleted file mode 100644 index 339239668e..0000000000 --- a/package.bak/lftp/0001-fix-static-link-with-readline.patch +++ /dev/null @@ -1,40 +0,0 @@ -fix static link with readline - -When readline is static library, we need to link against ncurses -because readline needs ncurses. It is because, dependent library's -symbols are not resolved when static library is built. Those symbols -are resolved program tries to link with static library. - -We can't pass linker flags for ncurses by setting LIBS environment -variable via _CONF_ENV because it looks like build system is not -taking that into account and even though it would have been, order of -linking is important. - -We can't also pass linker flags for ncurses via --with-readline-libs -conf options because it causes lftp_LIB_READLINE macro to take readline -headers from host machine if available. To use --with-readline-libs -we need to set --with-readline=yes and --with-readline-inc to include -dir. But when --with-readline=yes, readline_prefix is computed based -on if headers can be found in /usr/local or /usr. If readline is -installed on host machine, then configure fails since we are using -headers for host machine. If headers are not found in /usr/local or /usr -then only path specified --with-readline-inc is taken into account. -So specifying linker flags for ncurses via --with-readline-libs will -not work in all cases. - -So it looks like, updating linker flags directly is only option to fix -static link issue against readline. - -Signed-off-by: Rahul Bedarkar - ---- lftp-4.7.3/m4/lftp_lib_readline.m4.old 2016-08-08 19:49:12.217596470 +0530 -+++ lftp-4.7.3/m4/lftp_lib_readline.m4 2016-08-08 19:49:46.265596398 +0530 -@@ -108,7 +108,7 @@ AC_DEFUN([lftp_LIB_READLINE], - readline_include_dir="$readline_include_dir/readline" - fi - readline_ld_flags="-L$readline_prefix/lib" -- readline_lib_flags="-lreadline" -+ readline_lib_flags="-lreadline -lncurses" - run_readline_test="yes" - elif test "$readline_requested" = "yes"; then - if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then diff --git a/package.bak/lftp/0002-fix-gcc-6-conflicts-signbit.patch b/package.bak/lftp/0002-fix-gcc-6-conflicts-signbit.patch deleted file mode 100644 index e906c7ac80..0000000000 --- a/package.bak/lftp/0002-fix-gcc-6-conflicts-signbit.patch +++ /dev/null @@ -1,57 +0,0 @@ -Use instead of to fix gcc 6.x build - -This patch fixes the following build issue: - -../lib/math.h:2577:1: error: ‘int signbit(float)’ conflicts with a previous declaration - -that occurs with gcc 6.x. - -Patch taken from -https://raw.githubusercontent.com/openembedded/meta-openembedded/master/meta-networking/recipes-connectivity/lftp/files/fix-gcc-6-conflicts-signbit.patch - -Signed-off-by: Thomas Petazzoni - ---- lftp-4.6.3a/src/NetAccess.cc.orig 2016-06-18 10:25:51.063358981 -0400 -+++ lftp-4.6.3a/src/NetAccess.cc 2016-06-18 10:26:04.143359209 -0400 -@@ -21,7 +21,7 @@ - - #include - #include --#include -+#include - #include - - #include "NetAccess.h" ---- lftp-4.6.3a/src/Speedometer.cc.orig 2016-06-18 10:24:58.895358073 -0400 -+++ lftp-4.6.3a/src/Speedometer.cc 2016-06-18 10:25:10.879358281 -0400 -@@ -18,7 +18,7 @@ - */ - - #include --#include -+#include - #include - #include "Speedometer.h" - #include "misc.h" ---- lftp-4.6.3a/src/FileCopy.cc.orig 2016-06-18 10:24:15.939357325 -0400 -+++ lftp-4.6.3a/src/FileCopy.cc 2016-06-18 10:24:24.583357475 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include "FileCopy.h" - #include "url.h" ---- lftp-4.6.3a/src/ResMgr.cc.orig 2016-06-18 10:23:31.387356549 -0400 -+++ lftp-4.6.3a/src/ResMgr.cc 2016-06-18 10:23:41.771356729 -0400 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include diff --git a/package.bak/lftp/Config.in b/package.bak/lftp/Config.in deleted file mode 100644 index fb4ac13611..0000000000 --- a/package.bak/lftp/Config.in +++ /dev/null @@ -1,66 +0,0 @@ -config BR2_PACKAGE_LFTP - bool "lftp" - depends on BR2_USE_WCHAR - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS - help - LFTP is a sophisticated ftp/http client, and a file transfer program - supporting a number of network protocols. Like BASH, it has job - control and uses the readline library for input. It has bookmarks, - a built-in mirror command, and can transfer several files in parallel. - It was designed with reliability in mind. - - http://lftp.yar.ru/ - -if BR2_PACKAGE_LFTP - -comment "Commands" - -config BR2_PACKAGE_LFTP_CMD_MIRROR - bool "Mirror command" - default y - help - Enable mirror command - -config BR2_PACKAGE_LFTP_CMD_SLEEP - bool "Sleep command" - default y - help - Enable sleep command - -config BR2_PACKAGE_LFTP_CMD_TORRENT - bool "Torrent command" - help - Enable torrent command - -comment "Protocols" - -config BR2_PACKAGE_LFTP_PROTO_FISH - bool "FISH protocol" - help - Enable FISH protocol - -config BR2_PACKAGE_LFTP_PROTO_FTP - bool "FTP protocol" - default y - help - Enable FTP protocol - -config BR2_PACKAGE_LFTP_PROTO_HTTP - bool "HTTP protocol" - help - Enable HTTP protocol - -config BR2_PACKAGE_LFTP_PROTO_SFTP - bool "SFTP protocol" - help - Enable SFTP protocol - -endif # BR2_PACKAGE_LFTP - -comment "lftp requires a toolchain w/ C++, wchar" - depends on BR2_USE_MMU - depends on !(BR2_USE_WCHAR && BR2_INSTALL_LIBSTDCPP) diff --git a/package.bak/lftp/lftp.hash b/package.bak/lftp/lftp.hash deleted file mode 100644 index 0e0f927a56..0000000000 --- a/package.bak/lftp/lftp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking gpg signature -sha256 bf67c4d128b6f769a4082947376a9679c5ee3463a24ab761a0757f75d70bd92c lftp-4.7.4.tar.xz diff --git a/package.bak/lftp/lftp.mk b/package.bak/lftp/lftp.mk deleted file mode 100644 index a7e1f92619..0000000000 --- a/package.bak/lftp/lftp.mk +++ /dev/null @@ -1,68 +0,0 @@ -################################################################################ -# -# lftp -# -################################################################################ - -LFTP_VERSION = 4.7.4 -LFTP_SOURCE = lftp-$(LFTP_VERSION).tar.xz -LFTP_SITE = http://lftp.yar.ru/ftp -LFTP_LICENSE = GPLv3+ -LFTP_LICENSE_FILES = COPYING -# Needed so that our libtool patch applies properly, and for patch -# 0001-fix-static-link-with-readline.patch. -LFTP_AUTORECONF = YES -LFTP_DEPENDENCIES = readline zlib host-pkgconf - -# Help lftp finding readline and zlib -LFTP_CONF_OPTS = \ - --with-readline=$(STAGING_DIR)/usr \ - --with-zlib=$(STAGING_DIR)/usr - -ifneq ($(BR2_STATIC_LIBS),y) -LFTP_CONF_OPTS += --with-modules -endif - -ifeq ($(BR2_PACKAGE_EXPAT)$(BR2_PACKAGE_LFTP_PROTO_HTTP),yy) -LFTP_DEPENDENCIES += expat -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -LFTP_DEPENDENCIES += gnutls -LFTP_CONF_OPTS += --with-gnutls -else -LFTP_CONF_OPTS += --without-gnutls -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LFTP_DEPENDENCIES += openssl -LFTP_CONF_OPTS += --with-openssl -else -LFTP_CONF_OPTS += --without-openssl -endif - -# Remove /usr/share/lftp -define LFTP_REMOVE_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/lftp -endef - -LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_DATA - -# Optional commands and protocols -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_MIRROR) += cmd-mirror.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_SLEEP) += cmd-sleep.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_CMD_TORRENT) += cmd-torrent.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_FISH) += proto-fish.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_FTP) += proto-ftp.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_HTTP) += proto-http.so -LFTP_MODULES_TO_REMOVE-$(BR2_PACKAGE_LFTP_PROTO_SFTP) += proto-sftp.so - -define LFTP_REMOVE_MODULES - for f in $(LFTP_MODULES_TO_REMOVE-) ; do \ - $(RM) -f $(TARGET_DIR)/usr/lib/lftp/$(LFTP_VERSION)/$$f ; \ - done -endef - -LFTP_POST_INSTALL_TARGET_HOOKS += LFTP_REMOVE_MODULES - -$(eval $(autotools-package)) diff --git a/package.bak/libaacs/Config.in b/package.bak/libaacs/Config.in deleted file mode 100644 index d59b6da64b..0000000000 --- a/package.bak/libaacs/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBAACS - bool "libaacs" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBGCRYPT - help - libaacs is a research project to implement the Advanced Access - Content System specification. - NB: this project doesn't offer any key or certificate that - could be used to decode encrypted copyrighted material. - - http://www.videolan.org/developers/libaacs.html - -comment "libaacs needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libaacs/libaacs.hash b/package.bak/libaacs/libaacs.hash deleted file mode 100644 index 7160c6a907..0000000000 --- a/package.bak/libaacs/libaacs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libaacs/0.8.1/libaacs-0.8.1.tar.bz2.sha512 -sha512 dd677627f073460b719b9f836b026acc3e23b166c7b16bd205cf2ca97c376095980532fb15087c0d77b30c712cd5a5dd90b2cc2ae3128da717621ebd825afcc4 libaacs-0.8.1.tar.bz2 diff --git a/package.bak/libaacs/libaacs.mk b/package.bak/libaacs/libaacs.mk deleted file mode 100644 index df611543ec..0000000000 --- a/package.bak/libaacs/libaacs.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# libaacs -# -################################################################################ - -LIBAACS_VERSION = 0.8.1 -LIBAACS_SITE = http://download.videolan.org/pub/videolan/libaacs/$(LIBAACS_VERSION) -LIBAACS_SOURCE = libaacs-$(LIBAACS_VERSION).tar.bz2 -LIBAACS_LICENSE = LGPLv2.1+ -LIBAACS_LICENSE_FILES = COPYING -LIBAACS_INSTALL_STAGING = YES -LIBAACS_DEPENDENCIES = host-bison host-flex libgcrypt -LIBAACS_CONF_OPTS = \ - --disable-werror \ - --disable-extra-warnings \ - --disable-optimizations \ - --disable-examples \ - --disable-debug \ - --with-gnu-ld \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ - --with-gpg-error-prefix=$(STAGING_DIR)/usr - -$(eval $(autotools-package)) diff --git a/package.bak/libaio/0001-arches.patch b/package.bak/libaio/0001-arches.patch deleted file mode 100644 index 4b77f57768..0000000000 --- a/package.bak/libaio/0001-arches.patch +++ /dev/null @@ -1,249 +0,0 @@ -Patch borrowed from OpenEmbedded, available at -/meta/recipes-extended/libaio/libaio/00_arches.patch in their source -tree. This patch has been modified to only add the MIPS definitions. - -The patch adds MIPS specific definitions (syscall number and macros). - -Signed-off-by: Alistair Francis - -Index: libaio-0.3.110/src/syscall.h -=================================================================== ---- libaio-0.3.110.orig/src/syscall.h -+++ libaio-0.3.110/src/syscall.h -@@ -28,6 +28,8 @@ - #include "syscall-sparc.h" - #elif defined(__aarch64__) - #include "syscall-arm64.h" -+#elif defined(__mips__) -+#include "syscall-mips.h" - #else - #warning "using generic syscall method" - #include "syscall-generic.h" -Index: libaio-0.3.110/src/syscall-mips.h -=================================================================== ---- /dev/null -+++ libaio-0.3.110/src/syscall-mips.h -@@ -0,0 +1,223 @@ -+/* -+ * This file is subject to the terms and conditions of the GNU General Public -+ * License. See the file "COPYING" in the main directory of this archive -+ * for more details. -+ * -+ * Copyright (C) 1995, 96, 97, 98, 99, 2000 by Ralf Baechle -+ * Copyright (C) 1999, 2000 Silicon Graphics, Inc. -+ * -+ * Changed system calls macros _syscall5 - _syscall7 to push args 5 to 7 onto -+ * the stack. Robin Farine for ACN S.A, Copyright (C) 1996 by ACN S.A -+ */ -+ -+#ifndef _MIPS_SIM_ABI32 -+#define _MIPS_SIM_ABI32 1 -+#define _MIPS_SIM_NABI32 2 -+#define _MIPS_SIM_ABI64 3 -+#endif -+ -+#if _MIPS_SIM == _MIPS_SIM_ABI32 -+ -+/* -+ * Linux o32 style syscalls are in the range from 4000 to 4999. -+ */ -+#define __NR_Linux 4000 -+#define __NR_io_setup (__NR_Linux + 241) -+#define __NR_io_destroy (__NR_Linux + 242) -+#define __NR_io_getevents (__NR_Linux + 243) -+#define __NR_io_submit (__NR_Linux + 244) -+#define __NR_io_cancel (__NR_Linux + 245) -+ -+#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */ -+ -+#if _MIPS_SIM == _MIPS_SIM_ABI64 -+ -+/* -+ * Linux 64-bit syscalls are in the range from 5000 to 5999. -+ */ -+#define __NR_Linux 5000 -+#define __NR_io_setup (__NR_Linux + 200) -+#define __NR_io_destroy (__NR_Linux + 201) -+#define __NR_io_getevents (__NR_Linux + 202) -+#define __NR_io_submit (__NR_Linux + 203) -+#define __NR_io_cancel (__NR_Linux + 204) -+#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */ -+ -+#if _MIPS_SIM == _MIPS_SIM_NABI32 -+ -+/* -+ * Linux N32 syscalls are in the range from 6000 to 6999. -+ */ -+#define __NR_Linux 6000 -+#define __NR_io_setup (__NR_Linux + 200) -+#define __NR_io_destroy (__NR_Linux + 201) -+#define __NR_io_getevents (__NR_Linux + 202) -+#define __NR_io_submit (__NR_Linux + 203) -+#define __NR_io_cancel (__NR_Linux + 204) -+#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */ -+ -+#define io_syscall1(type,fname,sname,atype,a) \ -+type fname(atype a) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a3 asm("$7"); \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "li\t$2, %3\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "=r" (__a3) \ -+ : "r" (__a0), "i" (__NR_##sname) \ -+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#define io_syscall2(type,fname,sname,atype,a,btype,b) \ -+type fname(atype a, btype b) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a1 asm("$5") = (unsigned long) b; \ -+ register unsigned long __a3 asm("$7"); \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "li\t$2, %4\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "=r" (__a3) \ -+ : "r" (__a0), "r" (__a1), "i" (__NR_##sname) \ -+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#define io_syscall3(type,fname,sname,atype,a,btype,b,ctype,c) \ -+type fname(atype a, btype b, ctype c) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a1 asm("$5") = (unsigned long) b; \ -+ register unsigned long __a2 asm("$6") = (unsigned long) c; \ -+ register unsigned long __a3 asm("$7"); \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "li\t$2, %5\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "=r" (__a3) \ -+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \ -+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#define io_syscall4(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d) \ -+type fname(atype a, btype b, ctype c, dtype d) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a1 asm("$5") = (unsigned long) b; \ -+ register unsigned long __a2 asm("$6") = (unsigned long) c; \ -+ register unsigned long __a3 asm("$7") = (unsigned long) d; \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "li\t$2, %5\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "+r" (__a3) \ -+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname) \ -+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#if (_MIPS_SIM == _MIPS_SIM_ABI32) -+ -+/* -+ * Using those means your brain needs more than an oil change ;-) -+ */ -+ -+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ -+type fname(atype a, btype b, ctype c, dtype d, etype e) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a1 asm("$5") = (unsigned long) b; \ -+ register unsigned long __a2 asm("$6") = (unsigned long) c; \ -+ register unsigned long __a3 asm("$7") = (unsigned long) d; \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "lw\t$2, %6\n\t" \ -+ "subu\t$29, 32\n\t" \ -+ "sw\t$2, 16($29)\n\t" \ -+ "li\t$2, %5\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ "addiu\t$29, 32\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "+r" (__a3) \ -+ : "r" (__a0), "r" (__a1), "r" (__a2), "i" (__NR_##sname), \ -+ "m" ((unsigned long)e) \ -+ : "$2", "$8", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#endif /* (_MIPS_SIM == _MIPS_SIM_ABI32) */ -+ -+#if (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) -+ -+#define io_syscall5(type,fname,sname,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ -+type fname (atype a,btype b,ctype c,dtype d,etype e) \ -+{ \ -+ register unsigned long __a0 asm("$4") = (unsigned long) a; \ -+ register unsigned long __a1 asm("$5") = (unsigned long) b; \ -+ register unsigned long __a2 asm("$6") = (unsigned long) c; \ -+ register unsigned long __a3 asm("$7") = (unsigned long) d; \ -+ register unsigned long __a4 asm("$8") = (unsigned long) e; \ -+ unsigned long __v0; \ -+ \ -+ __asm__ volatile ( \ -+ ".set\tnoreorder\n\t" \ -+ "li\t$2, %6\t\t\t# " #fname "\n\t" \ -+ "syscall\n\t" \ -+ "move\t%0, $2\n\t" \ -+ ".set\treorder" \ -+ : "=&r" (__v0), "+r" (__a3) \ -+ : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a4), "i" (__NR_##sname) \ -+ : "$2", "$9", "$10", "$11", "$12", "$13", "$14", "$15", "$24", \ -+ "memory"); \ -+ \ -+ if (__a3 == 0) \ -+ return (type) __v0; \ -+ return (type) -1; \ -+} -+ -+#endif /* (_MIPS_SIM == _MIPS_SIM_NABI32) || (_MIPS_SIM == _MIPS_SIM_ABI64) */ -+ diff --git a/package.bak/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch b/package.bak/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch deleted file mode 100644 index 50703c3f53..0000000000 --- a/package.bak/libaio/0002-src-Makefile-add-ENABLE_SHARED-boolean-to-allow-stat.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 14dee5707716629b1bc8d06b93cdfe9ea1a3b813 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Aug 2016 22:14:26 +0200 -Subject: [PATCH] src/Makefile: add ENABLE_SHARED boolean to allow static-only - build - -Currently, the libaio builds sytem builds a shared library -unconditionally. In some environments, this is not possible or -desirable. This commit adds a new Makefile variable, ENABLE_SHARED, -which defaults to "1" (i.e shared library enabled) and that allows to -override this behavior, and therefore to disable the build and -installation of the shared library. - -Signed-off-by: Thomas Petazzoni ---- - src/Makefile | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index eadb336..cfab240 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -8,12 +8,17 @@ SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= - LINK_FLAGS+=$(LDFLAGS) -+ENABLE_SHARED ?= 1 - - soname=libaio.so.1 - minor=0 - micro=1 - libname=$(soname).$(minor).$(micro) --all_targets += libaio.a $(libname) -+all_targets += libaio.a -+ -+ifeq ($(ENABLE_SHARED),1) -+all_targets += $(libname) -+endif - - all: $(all_targets) - -@@ -55,9 +60,11 @@ $(libname): $(libaio_sobjs) libaio.map - install: $(all_targets) - install -D -m 644 libaio.h $(includedir)/libaio.h - install -D -m 644 libaio.a $(libdir)/libaio.a -+ifeq ($(ENABLE_SHARED),1) - install -D -m 755 $(libname) $(libdir)/$(libname) - ln -sf $(libname) $(libdir)/$(soname) - ln -sf $(libname) $(libdir)/libaio.so -+endif - - $(libaio_objs): libaio.h - --- -2.7.4 - diff --git a/package.bak/libaio/0003-destdir.patch b/package.bak/libaio/0003-destdir.patch deleted file mode 100644 index 583a2afa86..0000000000 --- a/package.bak/libaio/0003-destdir.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch borrowed from OpenEmbedded, available at -recipes/libaio/libaio-0.3.106/destdir.patch in their source tree. - -It just adds support for the traditional DESTDIR variable to install -the library in a different sysroot than the normal /. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libaio-0.3.109/Makefile -=================================================================== ---- libaio-0.3.109.orig/Makefile -+++ libaio-0.3.109/Makefile -@@ -23,7 +23,7 @@ - @$(MAKE) -C src - - install: -- @$(MAKE) -C src install prefix=$(prefix) includedir=$(includedir) libdir=$(libdir) -+ @$(MAKE) -C src install prefix=$(DESTDIR)$(prefix) includedir=$(DESTDIR)$(includedir) libdir=$(DESTDIR)$(libdir) - - check: - @$(MAKE) -C harness check diff --git a/package.bak/libaio/Config.in b/package.bak/libaio/Config.in deleted file mode 100644 index 3031c894b7..0000000000 --- a/package.bak/libaio/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - bool - default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_m68k || BR2_mips || BR2_mipsel || BR2_powerpc || \ - BR2_sparc || BR2_x86_64 - -config BR2_PACKAGE_LIBAIO - bool "libaio" - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - help - Library for doing asynchronous I/O diff --git a/package.bak/libaio/libaio.hash b/package.bak/libaio/libaio.hash deleted file mode 100644 index 7aa8961fbf..0000000000 --- a/package.bak/libaio/libaio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio/libaio_0.3.110-1.dsc -sha256 e019028e631725729376250e32b473012f7cb68e1f7275bfc1bbcdd0f8745f7e libaio_0.3.110.orig.tar.gz diff --git a/package.bak/libaio/libaio.mk b/package.bak/libaio/libaio.mk deleted file mode 100644 index 5ebe1b7eea..0000000000 --- a/package.bak/libaio/libaio.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# libaio -# -################################################################################ - -LIBAIO_VERSION = 0.3.110 -LIBAIO_SOURCE = libaio_$(LIBAIO_VERSION).orig.tar.gz -LIBAIO_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/liba/libaio -LIBAIO_INSTALL_STAGING = YES -LIBAIO_LICENSE = LGPLv2.1+ -LIBAIO_LICENSE_FILES = COPYING - -LIBAIO_CONFIGURE_OPTS = $(TARGET_CONFIGURE_OPTS) - -ifeq ($(BR2_STATIC_LIBS),y) -LIBAIO_CONFIGURE_OPTS += ENABLE_SHARED=0 -endif - -# On PowerPC, a weird toolchain issue causes -Os builds to produce -# references to hidden symbols, so we're forcing -O2 -ifeq ($(BR2_powerpc),y) -LIBAIO_CONFIGURE_OPTS += CFLAGS="$(subst -Os,-O2,$(TARGET_CFLAGS))" -endif - -define LIBAIO_BUILD_CMDS - $(LIBAIO_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define LIBAIO_INSTALL_STAGING_CMDS - $(LIBAIO_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define LIBAIO_INSTALL_TARGET_CMDS - $(LIBAIO_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libamcodec/Config.in b/package.bak/libamcodec/Config.in deleted file mode 100644 index 45846e6d29..0000000000 --- a/package.bak/libamcodec/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "libamcodec needs a toolchain w/ threads, dynamic library" - depends on BR2_arm || BR2_aarch64 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_LIBAMCODEC - bool "libamcodec" - depends on BR2_arm || BR2_aarch64 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_ALSA_LIB - help - Interface library for Amlogic media codecs - - https://github.com/mdrjr/c2_aml_libs.git diff --git a/package.bak/libamcodec/libamcodec.hash b/package.bak/libamcodec/libamcodec.hash deleted file mode 100644 index a76d20a953..0000000000 --- a/package.bak/libamcodec/libamcodec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 2c9812154b6dfd6a6c9c43aa334d0d03f299379fdf83c20121ad3f3d3f97c666 libamcodec-296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca.tar.gz diff --git a/package.bak/libamcodec/libamcodec.mk b/package.bak/libamcodec/libamcodec.mk deleted file mode 100644 index 3fab228fd4..0000000000 --- a/package.bak/libamcodec/libamcodec.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libamcodec -# -################################################################################ - -LIBAMCODEC_VERSION = 296f39bc6fc47ddf5d88b9fd3cfb82a5b39048ca -LIBAMCODEC_SITE = $(call github,mdrjr,c2_aml_libs,$(LIBAMCODEC_VERSION)) -LIBAMCODEC_DEPENDENCIES = alsa-lib -LIBAMCODEC_LICENSE = Unclear -LIBAMCODEC_INSTALL_STAGING = YES - -# This package uses the AML_LIBS_STAGING_DIR variable to construct the -# header and library paths used when compiling -define LIBAMCODEC_BUILD_CMDS - $(foreach d,amavutils amadec amcodec,\ - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - -C $(@D)/$(d) AML_LIBS_STAGING_DIR=$(STAGING_DIR) - ) -endef - -define LIBAMCODEC_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(STAGING_DIR)/usr/lib/libamavutils.so - $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(STAGING_DIR)/usr/lib/libamadec.so - $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(STAGING_DIR)/usr/lib/libamcodec.so - mkdir -p $(STAGING_DIR)/usr/include/amcodec - cp -rf $(@D)/amcodec/include/* $(STAGING_DIR)/usr/include/amcodec -endef - -define LIBAMCODEC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/amavutils/libamavutils.so $(TARGET_DIR)/usr/lib/libamavutils.so - $(INSTALL) -D -m 0555 $(@D)/amadec/libamadec.so $(TARGET_DIR)/usr/lib/libamadec.so - $(INSTALL) -D -m 0555 $(@D)/amcodec/libamcodec.so $(TARGET_DIR)/usr/lib/libamcodec.so -endef - -$(eval $(generic-package)) diff --git a/package.bak/libao/Config.in b/package.bak/libao/Config.in deleted file mode 100644 index 3c99ab968d..0000000000 --- a/package.bak/libao/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBAO - bool "libao" - help - Libao is a cross-platform audio library that allows programs - to output audio using a simple API on a wide variety of platforms. - - http://www.xiph.org/ao/ diff --git a/package.bak/libao/libao.hash b/package.bak/libao/libao.hash deleted file mode 100644 index 64174dad8f..0000000000 --- a/package.bak/libao/libao.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/ao/SHA256SUMS.txt -sha256 03ad231ad1f9d64b52474392d63c31197b0bc7bd416e58b1c10a329a5ed89caf libao-1.2.0.tar.gz diff --git a/package.bak/libao/libao.mk b/package.bak/libao/libao.mk deleted file mode 100644 index a314c08d17..0000000000 --- a/package.bak/libao/libao.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# libao -# -################################################################################ - -LIBAO_VERSION = 1.2.0 -LIBAO_SITE = http://downloads.xiph.org/releases/ao -LIBAO_DEPENDENCIES = host-pkgconf -LIBAO_INSTALL_STAGING = YES -LIBAO_LICENSE = GPLv2+ -LIBAO_LICENSE_FILES = COPYING -LIBAO_CONF_OPTS = \ - --disable-esd \ - --disable-wmm \ - --disable-arts \ - --disable-nas \ - --disable-pulse \ - --disable-broken-oss - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -LIBAO_DEPENDENCIES += alsa-lib -LIBAO_CONF_OPTS += --enable-alsa --enable-alsa-mmap - -# Remove the OSS plugin if ALSA is enabled, as libao will prefer ALSA anyway -define LIBAO_REMOVE_OSS_PLUGIN - rm -f $(TARGET_DIR)/usr/lib/ao/plugins-4/liboss.so -endef -LIBAO_POST_INSTALL_TARGET_HOOKS += LIBAO_REMOVE_OSS_PLUGIN -else -LIBAO_CONF_OPTS += --disable-alsa -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libarchive/Config.in b/package.bak/libarchive/Config.in deleted file mode 100644 index fd429acb60..0000000000 --- a/package.bak/libarchive/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -comment "libarchive needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_LIBARCHIVE - bool "libarchive" - depends on BR2_USE_WCHAR - help - Libarchive is a reusable C library for reading and writing a - variety of streaming archive formats. - - http://www.libarchive.org/ - -if BR2_PACKAGE_LIBARCHIVE - -config BR2_PACKAGE_LIBARCHIVE_BSDTAR - bool "bsdtar" - help - The 'bsdtar' program is a full-featured 'tar' - replacement built on libarchive. - -config BR2_PACKAGE_LIBARCHIVE_BSDCPIO - bool "bsdcpio" - help - The 'bsdcpio' program is a different interface to - essentially the same functionality as 'bsdtar'. - -config BR2_PACKAGE_LIBARCHIVE_BSDCAT - bool "bsdcat" - help - The 'bsdcat' program is a simple replacement tool - for zcat, bzcat, xzcat, and such. - -endif diff --git a/package.bak/libarchive/libarchive.hash b/package.bak/libarchive/libarchive.hash deleted file mode 100644 index 2c39bd3e07..0000000000 --- a/package.bak/libarchive/libarchive.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 72ee1a4e3fd534525f13a0ba1aa7b05b203d186e0c6072a8a4738649d0b3cfd2 libarchive-3.2.1.tar.gz diff --git a/package.bak/libarchive/libarchive.mk b/package.bak/libarchive/libarchive.mk deleted file mode 100644 index bcf92f907a..0000000000 --- a/package.bak/libarchive/libarchive.mk +++ /dev/null @@ -1,131 +0,0 @@ -################################################################################ -# -# libarchive -# -################################################################################ - -LIBARCHIVE_VERSION = 3.2.1 -LIBARCHIVE_SITE = http://www.libarchive.org/downloads -LIBARCHIVE_INSTALL_STAGING = YES -LIBARCHIVE_LICENSE = BSD-2c, BSD-3c -LIBARCHIVE_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDTAR),y) -ifeq ($(BR2_STATIC_LIBS),y) -LIBARCHIVE_CONF_OPTS += --enable-bsdtar=static -else -LIBARCHIVE_CONF_OPTS += --enable-bsdtar=shared -endif -else -LIBARCHIVE_CONF_OPTS += --disable-bsdtar -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCPIO),y) -ifeq ($(BR2_STATIC_LIBS),y) -LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=static -else -LIBARCHIVE_CONF_OPTS += --enable-bsdcpio=shared -endif -else -LIBARCHIVE_CONF_OPTS += --disable-bsdcpio -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE_BSDCAT),y) -ifeq ($(BR2_STATIC_LIBS),y) -LIBARCHIVE_CONF_OPTS += --enable-bsdcat=static -else -LIBARCHIVE_CONF_OPTS += --enable-bsdcat=shared -endif -else -LIBARCHIVE_CONF_OPTS += --disable-bsdcat -endif - -ifeq ($(BR2_PACKAGE_ACL),y) -LIBARCHIVE_DEPENDENCIES += acl -else -LIBARCHIVE_CONF_OPTS += --disable-acl -endif - -ifeq ($(BR2_PACKAGE_ATTR),y) -LIBARCHIVE_DEPENDENCIES += attr -else -LIBARCHIVE_CONF_OPTS += --disable-xattr -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -LIBARCHIVE_CONF_OPTS += --with-bz2lib -LIBARCHIVE_DEPENDENCIES += bzip2 -else -LIBARCHIVE_CONF_OPTS += --without-bz2lib -endif - -ifeq ($(BR2_PACKAGE_EXPAT),y) -LIBARCHIVE_DEPENDENCIES += expat -else -LIBARCHIVE_CONF_OPTS += --without-expat -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBARCHIVE_DEPENDENCIES += libiconv -else -LIBARCHIVE_CONF_OPTS += --without-libiconv-prefix -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -LIBARCHIVE_DEPENDENCIES += libxml2 -LIBARCHIVE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config -else -LIBARCHIVE_CONF_OPTS += --without-xml2 -endif - -ifeq ($(BR2_PACKAGE_LZO),y) -LIBARCHIVE_DEPENDENCIES += lzo -else -LIBARCHIVE_CONF_OPTS += --without-lzo2 -endif - -ifeq ($(BR2_PACKAGE_NETTLE),y) -LIBARCHIVE_DEPENDENCIES += nettle -else -LIBARCHIVE_CONF_OPTS += --without-nettle -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBARCHIVE_DEPENDENCIES += openssl -else -LIBARCHIVE_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBARCHIVE_DEPENDENCIES += zlib -else -LIBARCHIVE_CONF_OPTS += --without-zlib -endif - -# libarchive requires LZMA with thread support in the toolchain -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_PACKAGE_XZ),yy) -LIBARCHIVE_DEPENDENCIES += xz -LIBARCHIVE_CONF_OPTS += --with-lzma -else -LIBARCHIVE_CONF_OPTS += --without-lzma -endif - -# The only user of host-libarchive needs zlib support -HOST_LIBARCHIVE_DEPENDENCIES = host-zlib -HOST_LIBARCHIVE_CONF_OPTS = \ - --disable-bsdtar \ - --disable-bsdcpio \ - --disable-bsdcat \ - --disable-acl \ - --disable-xattr \ - --without-bz2lib \ - --without-expat \ - --without-libiconv-prefix \ - --without-xml2 \ - --without-lzo2 \ - --without-nettle \ - --without-openssl \ - --without-lzma - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libargtable2/Config.in b/package.bak/libargtable2/Config.in deleted file mode 100644 index 42d067becd..0000000000 --- a/package.bak/libargtable2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBARGTABLE2 - bool "libargtable2" - help - A greatly simplified and yet quite robust argument parsing - set of library calls. - - http://argtable.sourceforge.net/ diff --git a/package.bak/libargtable2/libargtable2.hash b/package.bak/libargtable2/libargtable2.hash deleted file mode 100644 index 9addbc54b9..0000000000 --- a/package.bak/libargtable2/libargtable2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 8f77e8a7ced5301af6e22f47302fdbc3b1ff41f2b83c43c77ae5ca041771ddbf argtable2-13.tar.gz diff --git a/package.bak/libargtable2/libargtable2.mk b/package.bak/libargtable2/libargtable2.mk deleted file mode 100644 index 6b42cc0899..0000000000 --- a/package.bak/libargtable2/libargtable2.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libargtable2 -# -################################################################################ - -LIBARGTABLE2_VERSION = 13 -LIBARGTABLE2_SOURCE = argtable2-$(LIBARGTABLE2_VERSION).tar.gz -LIBARGTABLE2_SITE = http://downloads.sourceforge.net/project/argtable/argtable/argtable-2.13 -LIBARGTABLE2_INSTALL_STAGING = YES -LIBARGTABLE2_CONF_OPTS = \ - --disable-example \ - --disable-kernel-module \ - --enable-lib \ - --enable-util -LIBARGTABLE2_LICENSE = LGPLv2+ -LIBARGTABLE2_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libart/0001-art-config-cross.patch b/package.bak/libart/0001-art-config-cross.patch deleted file mode 100644 index a54f26a235..0000000000 --- a/package.bak/libart/0001-art-config-cross.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff -Nura libart_lgpl-2.3.21.orig/Makefile.am libart_lgpl-2.3.21/Makefile.am ---- libart_lgpl-2.3.21.orig/Makefile.am 2011-02-01 10:07:39.687545397 -0300 -+++ libart_lgpl-2.3.21/Makefile.am 2011-02-01 10:08:48.320545396 -0300 -@@ -5,11 +5,6 @@ - - noinst_SCRIPTS = gen_art_config.sh - --BUILT_SOURCES = art_config.h -- --art_config.h: -- ./gen_art_config.sh > art_config.h -- - EXTRA_DIST = \ - libart.def \ - libart-config.in \ -diff -Nura libart_lgpl-2.3.21.orig/art_config.h libart_lgpl-2.3.21/art_config.h ---- libart_lgpl-2.3.21.orig/art_config.h 2011-02-01 10:07:39.688545397 -0300 -+++ libart_lgpl-2.3.21/art_config.h 2011-02-01 10:08:27.315545395 -0300 -@@ -1,9 +1,15 @@ - /* Automatically generated by gen_art_config */ - -+#include -+ - #define ART_SIZEOF_CHAR 1 - #define ART_SIZEOF_SHORT 2 - #define ART_SIZEOF_INT 4 -+#if LONG_MAX == 2147483647L - #define ART_SIZEOF_LONG 4 -+#else -+#define ART_SIZEOF_LONG 8 -+#endif - - typedef unsigned char art_u8; - typedef unsigned short art_u16; diff --git a/package.bak/libart/Config.in b/package.bak/libart/Config.in deleted file mode 100644 index 926233587b..0000000000 --- a/package.bak/libart/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBART - bool "libart" - help - Libart is a library for high-performance 2D graphics. It - supports a very powerful imaging model, basically the same - as SVG and the Java 2D API. It includes all PostScript - imaging operations, and adds antialiasing and - alpha-transparency. It is also highly tuned for incremental - rendering. It contains data structures and algorithms suited - to rapid, precise computation of Region of Interest, and a - two-phase rendering pipeline optimized for interactive - display. - - http://www.levien.com/libart/ diff --git a/package.bak/libart/libart.hash b/package.bak/libart/libart.hash deleted file mode 100644 index 769c3bfeab..0000000000 --- a/package.bak/libart/libart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.sha256sum -sha256 2a10b1c884bb37c7bd5c5eba59dbd0d28bf68e64a42d7f2083c836f60f8e98fa libart_lgpl-2.3.21.tar.gz diff --git a/package.bak/libart/libart.mk b/package.bak/libart/libart.mk deleted file mode 100644 index 85ee37c156..0000000000 --- a/package.bak/libart/libart.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# libart -# -################################################################################ - -LIBART_VERSION_MAJOR = 2.3 -LIBART_VERSION = $(LIBART_VERSION_MAJOR).21 -LIBART_SOURCE = libart_lgpl-$(LIBART_VERSION).tar.gz -LIBART_SITE = http://ftp.gnome.org/pub/gnome/sources/libart_lgpl/$(LIBART_VERSION_MAJOR) -LIBART_AUTORECONF = YES -LIBART_INSTALL_STAGING = YES -LIBART_CONFIG_SCRIPTS = libart2-config -LIBART_LICENSE = LGPLv2+ -LIBART_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch b/package.bak/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch deleted file mode 100644 index c91ddbfab3..0000000000 --- a/package.bak/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 7291289ba0c052e45e2a0330642318798d6a4caf Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 27 Jan 2017 16:02:27 +0100 -Subject: [PATCH 1/1] asplib_CPUTimer.h: Fix time.h include - -According to https://linux.die.net/man/3/clock_gettime time.h needs to -be included instead of sys/time.h. - -This patch fixes a build error found by buildroot autobuilders: - -http://autobuild.buildroot.net/results/cc0/cc0b928ee24a526b7c82fd3f391e2be024a14578// - -/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp: In member function 'void asplib::CCPUTimer::start_Timer()': -/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp:69:19: error: 'CLOCK_REALTIME' was not declared in this scope - clock_gettime(CLOCK_REALTIME, &m_startTime); - -Patch sent upstream: https://github.com/AchimTuran/asplib/pull/34 - -Signed-off-by: Bernd Kuhls ---- - asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -index a61ff49..a9676e0 100644 ---- a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -+++ b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h -@@ -29,7 +29,7 @@ - #include - #include - #elif defined(TARGET_LINUX) -- #include -+ #include - #endif - - namespace asplib --- -2.11.0 - diff --git a/package.bak/libasplib/Config.in b/package.bak/libasplib/Config.in deleted file mode 100644 index 89d5448473..0000000000 --- a/package.bak/libasplib/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBASPLIB - bool "libasplib" - depends on BR2_INSTALL_LIBSTDCPP - help - asplib (Achim's Signal Processing LIBrary), is a small and - lightweight C++ library for digital signal processing. - - https://github.com/AchimTuran/asplib - -comment "asplib needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libasplib/libasplib.hash b/package.bak/libasplib/libasplib.hash deleted file mode 100644 index 76534e528d..0000000000 --- a/package.bak/libasplib/libasplib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 68e117348fa17592dde7672477e927119a0e477103ced1d3a57d92e30880a147 libasplib-be7fac89218a84b75f7598e3d76625ece99296f2.tar.gz diff --git a/package.bak/libasplib/libasplib.mk b/package.bak/libasplib/libasplib.mk deleted file mode 100644 index 558d173496..0000000000 --- a/package.bak/libasplib/libasplib.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# libasplib -# -################################################################################ - -LIBASPLIB_VERSION = be7fac89218a84b75f7598e3d76625ece99296f2 -LIBASPLIB_SITE = $(call github,AchimTuran,asplib,$(LIBASPLIB_VERSION)) -LIBASPLIB_LICENSE = GPLv3+ -LIBASPLIB_LICENSE_FILES = LICENSE -LIBASPLIB_INSTALL_STAGING = YES - -LIBASPLIB_CONF_OPTS = \ - -DASPLIB_MODULES_TO_BUILD=some \ - -DBUILD_BIQUAD=ON \ - -DBUILD_IIR=ON \ - -DBUILD_LOGGER=ON \ - -DBUILD_SIGNALS=ON \ - -DBUILD_TIMER=ON - -# Internal error, aborting at dw2gencfi.c:214 in emit_expr_encoded -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79509 -ifeq ($(BR2_m68k_cf),y) -LIBASPLIB_CXXFLAGS += -fno-dwarf2-cfi-asm -endif - -LIBASPLIB_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) $(LIBASPLIB_CXXFLAGS)" - -$(eval $(cmake-package)) diff --git a/package.bak/libass/Config.in b/package.bak/libass/Config.in deleted file mode 100644 index 7690685187..0000000000 --- a/package.bak/libass/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBASS - bool "libass" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_LIBFRIBIDI - help - libass is a portable subtitle renderer for the ASS/SSA - (Advanced Substation Alpha/Substation Alpha) subtitle format - - http://code.google.com/p/libass/ diff --git a/package.bak/libass/libass.hash b/package.bak/libass/libass.hash deleted file mode 100644 index d1e9022c82..0000000000 --- a/package.bak/libass/libass.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d84a2fc89011b99d87fc47af91906622707c165d1860e9f774825ebbbc9c9fb6 libass-0.13.4.tar.xz diff --git a/package.bak/libass/libass.mk b/package.bak/libass/libass.mk deleted file mode 100644 index 9fe967fdc0..0000000000 --- a/package.bak/libass/libass.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# libass -# -################################################################################ - -LIBASS_VERSION = 0.13.4 -LIBASS_SOURCE = libass-$(LIBASS_VERSION).tar.xz -# Do not use the github helper here, the generated tarball is *NOT* -# the same as the one uploaded by upstream for the release. -LIBASS_SITE = https://github.com/libass/libass/releases/download/$(LIBASS_VERSION) -LIBASS_INSTALL_STAGING = YES -LIBASS_LICENSE = ISC -LIBASS_LICENSE_FILES = COPYING -LIBASS_DEPENDENCIES = \ - host-pkgconf \ - freetype \ - libfribidi \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -# configure: WARNING: Install yasm for a significantly faster libass build. -# only for Intel archs -ifeq ($(BR2_i386)$(BR2_x86_64),y) -LIBASS_DEPENDENCIES += host-yasm -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -LIBASS_DEPENDENCIES += fontconfig -LIBASS_CONF_OPTS += --enable-fontconfig -else -LIBASS_CONF_OPTS += --disable-fontconfig --disable-require-system-font-provider -endif - -ifeq ($(BR2_PACKAGE_HARFBUZZ),y) -LIBASS_DEPENDENCIES += harfbuzz -LIBASS_CONF_OPTS += --enable-harfbuzz -else -LIBASS_CONF_OPTS += --disable-harfbuzz -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libassuan/Config.in b/package.bak/libassuan/Config.in deleted file mode 100644 index 012e65c4b6..0000000000 --- a/package.bak/libassuan/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBASSUAN - bool "libassuan" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBGPG_ERROR - help - Libassuan is a small library implementing the so-called - Assuan protocol. - - This protocol is used for IPC between most newer GnuPG - components. Both, server and client side functions are - provided. - - http://www.gnupg.org/related_software/libassuan/ diff --git a/package.bak/libassuan/libassuan.hash b/package.bak/libassuan/libassuan.hash deleted file mode 100644 index 01ade11f26..0000000000 --- a/package.bak/libassuan/libassuan.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 27391cf4a820b5350ea789c30661830c9a271518 libassuan-2.4.3.tar.bz2 diff --git a/package.bak/libassuan/libassuan.mk b/package.bak/libassuan/libassuan.mk deleted file mode 100644 index c4d2e4f4f3..0000000000 --- a/package.bak/libassuan/libassuan.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# libassuan -# -################################################################################ - -LIBASSUAN_VERSION = 2.4.3 -LIBASSUAN_SITE = ftp://ftp.gnupg.org/gcrypt/libassuan -LIBASSUAN_SOURCE = libassuan-$(LIBASSUAN_VERSION).tar.bz2 -LIBASSUAN_LICENSE = LGPLv2.1+ (library), GPLv3 (tests, doc) -LIBASSUAN_LICENSE_FILES = COPYING.LIB COPYING -LIBASSUAN_INSTALL_STAGING = YES -LIBASSUAN_DEPENDENCIES = libgpg-error -LIBASSUAN_CONF_OPTS = \ - --with-gpg-error-prefix=$(STAGING_DIR)/usr - -$(eval $(autotools-package)) diff --git a/package.bak/libatasmart/0001-strpool-cross-flags.patch b/package.bak/libatasmart/0001-strpool-cross-flags.patch deleted file mode 100644 index 89b91cca41..0000000000 --- a/package.bak/libatasmart/0001-strpool-cross-flags.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 730158700ea7a554c37f24bfbf5f4985f7280f3e Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 6 Feb 2013 14:07:02 +0100 -Subject: [PATCH] strpool: don't mix up host/build flags when cross compiling - -Submitted upstream as https://bugs.freedesktop.org/show_bug.cgi?id=60364 - -Commit b71035ce89 (build-sys: modernize build system) changed the strpool -(which needs to be built for the build machine) compilation to use -AM_CFLAGS / AM_LDFLAGS rather than CFLAGS / LDFLAGS. This is wrong, as -The AM_ version is used TOGETHER with (the user supplied) CFLAGS/LDFLAGS, -causing strpool to use both CFLAGS (for host) and CCFLAGS_FOR_BUILD (for -build) flags, breaking cross compilation with errors like: - -cc1: error: unrecognized command line option "-mabi=spe" - -Instead overwrite the (user supplied) CFLAGS with the (user supplied) -CFLAGS_FOR_BUILD (and similar for LDFLAGS) like we used to do. - -Signed-off-by: Peter Korsgaard ---- - strpool/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/strpool/Makefile.am b/strpool/Makefile.am -index b041cea..5b335a5 100644 ---- a/strpool/Makefile.am -+++ b/strpool/Makefile.am -@@ -17,8 +17,8 @@ - # . - - CC = @CC_FOR_BUILD@ --AM_CFLAGS = @BUILD_CFLAGS@ --AM_LDFLAGS = @BUILD_LDFLAGS@ -+CFLAGS = @BUILD_CFLAGS@ -+LDFLAGS = @BUILD_LDFLAGS@ - - noinst_PROGRAMS = \ - strpool --- -1.7.10.4 - diff --git a/package.bak/libatasmart/Config.in b/package.bak/libatasmart/Config.in deleted file mode 100644 index 9db3b093bf..0000000000 --- a/package.bak/libatasmart/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBATASMART - bool "libatasmart" - depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency - help - The libatasmart package is a disk reporting library. - It only supports a subset of the ATA S.M.A.R.T. functionality. - - http://0pointer.de/blog/projects/being-smart.html - -comment "libatasmart requires udev to be enabled" - depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/libatasmart/libatasmart.hash b/package.bak/libatasmart/libatasmart.hash deleted file mode 100644 index 8733d07964..0000000000 --- a/package.bak/libatasmart/libatasmart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 61f0ea345f63d28ab2ff0dc352c22271661b66bf09642db3a4049ac9dbdb0f8d libatasmart-0.19.tar.xz diff --git a/package.bak/libatasmart/libatasmart.mk b/package.bak/libatasmart/libatasmart.mk deleted file mode 100644 index 9e5de97d00..0000000000 --- a/package.bak/libatasmart/libatasmart.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libatasmart -# -################################################################################ - -LIBATASMART_VERSION = 0.19 -LIBATASMART_SOURCE = libatasmart-$(LIBATASMART_VERSION).tar.xz -LIBATASMART_SITE = http://0pointer.de/public -LIBATASMART_LICENSE = LGPLv2.1 -LIBATASMART_LICENSE_FILES = LGPL -LIBATASMART_INSTALL_STAGING = YES - -# package doesn't include configure script -LIBATASMART_AUTORECONF = YES - -LIBATASMART_DEPENDENCIES = udev - -$(eval $(autotools-package)) diff --git a/package.bak/libatomic_ops/Config.in b/package.bak/libatomic_ops/Config.in deleted file mode 100644 index e9206f3395..0000000000 --- a/package.bak/libatomic_ops/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_sparc || BR2_sparc64 || BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - # Unsupported for MIPS R6 - depends on !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6 - -config BR2_PACKAGE_LIBATOMIC_OPS - bool "libatomic_ops" - depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS - help - Atomic operations library - - https://github.com/ivmai/libatomic_ops diff --git a/package.bak/libatomic_ops/libatomic_ops.hash b/package.bak/libatomic_ops/libatomic_ops.hash deleted file mode 100644 index 47a281ddf2..0000000000 --- a/package.bak/libatomic_ops/libatomic_ops.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ef8335676f18a111f885d48810ab090fb6bfad94e5a5dd76cdccd2a536828662 libatomic_ops-libatomic_ops-7_4_4.tar.gz diff --git a/package.bak/libatomic_ops/libatomic_ops.mk b/package.bak/libatomic_ops/libatomic_ops.mk deleted file mode 100644 index b5e217237c..0000000000 --- a/package.bak/libatomic_ops/libatomic_ops.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libatomic_ops -# -################################################################################ - -LIBATOMIC_OPS_VERSION = libatomic_ops-7_4_4 -LIBATOMIC_OPS_SITE = $(call github,ivmai,libatomic_ops,$(LIBATOMIC_OPS_VERSION)) -LIBATOMIC_OPS_AUTORECONF = YES - -# From doc/LICENSING.txt: "Our intent is to make it easy to use -# libatomic_ops, in both free and proprietary software. Hence most -# code that we expect to be linked into a client application is -# covered by an MIT-style license. A few library routines are covered -# by the GNU General Public License. These are put into a separate -# library, libatomic_ops_gpl.a." -LIBATOMIC_OPS_LICENSE = MIT (main library) / GPLv2+ (gpl extension) -LIBATOMIC_OPS_LICENSE_FILES = doc/LICENSING.txt COPYING - -LIBATOMIC_OPS_INSTALL_STAGING = YES - -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -LIBATOMIC_OPS_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libbdplus/Config.in b/package.bak/libbdplus/Config.in deleted file mode 100644 index 2d314d13e4..0000000000 --- a/package.bak/libbdplus/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBBDPLUS - bool "libbdplus" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBGCRYPT - help - libbdplus is a research project to implement the BD+ System - Specifications. - This research project provides, through an open-source - library, a way to understand how the BD+ works. - NB: this project doesn't offer any key, configuration file or - certificate that could be used to decode encrypted copyrighted - material. - - http://www.videolan.org/developers/libbdplus.html - -comment "libbdplus needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libbdplus/libbdplus.hash b/package.bak/libbdplus/libbdplus.hash deleted file mode 100644 index 552cd71c89..0000000000 --- a/package.bak/libbdplus/libbdplus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libbdplus/0.1.2/libbdplus-0.1.2.tar.bz2.sha512 -sha512 e00e7bc9f52b9275646593b753ba646b052255be94a7241965f4dbe4734f8f6a072973ed4b9997957f939236b0633897c295749f79e232188430795be5b5087b libbdplus-0.1.2.tar.bz2 diff --git a/package.bak/libbdplus/libbdplus.mk b/package.bak/libbdplus/libbdplus.mk deleted file mode 100644 index 45913edda6..0000000000 --- a/package.bak/libbdplus/libbdplus.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# libbdplus -# -################################################################################ - -LIBBDPLUS_VERSION = 0.1.2 -LIBBDPLUS_SITE = http://download.videolan.org/pub/videolan/libbdplus/$(LIBBDPLUS_VERSION) -LIBBDPLUS_SOURCE = libbdplus-$(LIBBDPLUS_VERSION).tar.bz2 -LIBBDPLUS_LICENSE = LGPLv2.1+ -LIBBDPLUS_LICENSE_FILES = COPYING -LIBBDPLUS_INSTALL_STAGING = YES -LIBBDPLUS_DEPENDENCIES = libgcrypt -LIBBDPLUS_CONF_OPTS = \ - --disable-werror \ - --disable-extra-warnings \ - --disable-optimizations \ - --disable-examples \ - --disable-debug \ - --with-gnu-ld \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ - --with-gpg-error-prefix=$(STAGING_DIR)/usr - -ifeq ($(BR2_PACKAGE_LIBAACS),y) -LIBBDPLUS_DEPENDENCIES += libaacs -LIBBDPLUS_CONF_OPTS += --with-libaacs -else -LIBBDPLUS_CONF_OPTS += --without-libaacs -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libbluray/Config.in b/package.bak/libbluray/Config.in deleted file mode 100644 index b95893560b..0000000000 --- a/package.bak/libbluray/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBBLURAY - bool "libbluray" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - libbluray is a client library for accessing bluray disks. - - http://www.videolan.org/developers/libbluray.html - -comment "libbluray needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libbluray/libbluray.hash b/package.bak/libbluray/libbluray.hash deleted file mode 100644 index ea0df505dd..0000000000 --- a/package.bak/libbluray/libbluray.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://get.videolan.org/libbluray/0.9.3/libbluray-0.9.3.tar.bz2.sha512 -sha512 1e308b85c51d43b23b186fdd2631f963d4c25de8aff29f335e131b32a175434ee21460a7aa470c508ad13662cf9052649bb4eb974dbd709eb9e6797fb84e0823 libbluray-0.9.3.tar.bz2 diff --git a/package.bak/libbluray/libbluray.mk b/package.bak/libbluray/libbluray.mk deleted file mode 100644 index dfe58f4e1c..0000000000 --- a/package.bak/libbluray/libbluray.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# libbluray -# -################################################################################ - -LIBBLURAY_VERSION = 0.9.3 -LIBBLURAY_SITE = http://get.videolan.org/libbluray/$(LIBBLURAY_VERSION) -LIBBLURAY_SOURCE = libbluray-$(LIBBLURAY_VERSION).tar.bz2 -LIBBLURAY_INSTALL_STAGING = YES -LIBBLURAY_LICENSE = LGPLv2.1+ -LIBBLURAY_LICENSE_FILES = COPYING -LIBBLURAY_DEPENDENCIES = host-pkgconf - -LIBBLURAY_CONF_OPTS = --enable-udf --disable-bdjava - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBBLURAY_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -LIBBLURAY_DEPENDENCIES += freetype -LIBBLURAY_CONF_OPTS += --with-freetype -else -LIBBLURAY_CONF_OPTS += --without-freetype -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -LIBBLURAY_DEPENDENCIES += fontconfig -LIBBLURAY_CONF_OPTS += --with-fontconfig -else -LIBBLURAY_CONF_OPTS += --without-fontconfig -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -LIBBLURAY_DEPENDENCIES += libxml2 -LIBBLURAY_CONF_OPTS += --with-libxml2 -else -LIBBLURAY_CONF_OPTS += --without-libxml2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libbroadvoice/Config.in b/package.bak/libbroadvoice/Config.in deleted file mode 100644 index 3301ba8ff8..0000000000 --- a/package.bak/libbroadvoice/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBBROADVOICE - bool "libbroadvoice" - # broken with gcc <= 4.8 on arc - # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59049 - depends on !BR2_arc || BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - broadvoice - a library for the BroadVoice 16 and 32 speech - codecs - - https://www.broadcom.com/support/broadvoice diff --git a/package.bak/libbroadvoice/libbroadvoice.mk b/package.bak/libbroadvoice/libbroadvoice.mk deleted file mode 100644 index c18d3d292b..0000000000 --- a/package.bak/libbroadvoice/libbroadvoice.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libbroadvoice -# -################################################################################ - -LIBBROADVOICE_VERSION = f65b0f50c8c767229fbf1758370880abc0d78564 -# we use the FreeSwitch fork because (quoting README): -# "This library is based on the Broadcom reference code, but has been -# heavily modified so that it builds into a proper library, with a clean -# usable interface, on a range of platforms." -LIBBROADVOICE_SITE = https://freeswitch.org/stash/scm/sd/libbroadvoice.git -LIBBROADVOICE_SITE_METHOD = git -LIBBROADVOICE_LICENSE = LGPLv2.1 -LIBBROADVOICE_LICENSE_FILES = COPYING -LIBBROADVOICE_AUTORECONF = YES -LIBBROADVOICE_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libbsd/Config.in b/package.bak/libbsd/Config.in deleted file mode 100644 index 9b5b89812f..0000000000 --- a/package.bak/libbsd/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - bool - # libbsd does not support the MicroBlaze ELF machine type (see local-elf.h) - default y if !BR2_microblaze - -config BR2_PACKAGE_LIBBSD - bool "libbsd" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_USES_GLIBC - help - This library provides useful functions commonly found on BSD - systems, and lacking on others like GNU systems, thus making - it easier to port projects with strong BSD origins, without - needing to embed the same code over and over again on each - project. - - http://libbsd.freedesktop.org/ - -comment "libbsd needs a glibc toolchain w/ threads" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/libbsd/libbsd.hash b/package.bak/libbsd/libbsd.hash deleted file mode 100644 index bc6c7cfb82..0000000000 --- a/package.bak/libbsd/libbsd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 934b634f4dfd865b6482650b8f522c70ae65c463529de8be907b53c89c3a34a8 libbsd-0.8.3.tar.xz diff --git a/package.bak/libbsd/libbsd.mk b/package.bak/libbsd/libbsd.mk deleted file mode 100644 index a932f2b483..0000000000 --- a/package.bak/libbsd/libbsd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libbsd -# -################################################################################ - -LIBBSD_VERSION = 0.8.3 -LIBBSD_SOURCE = libbsd-$(LIBBSD_VERSION).tar.xz -LIBBSD_SITE = http://libbsd.freedesktop.org/releases -LIBBSD_LICENSE = BSD-3c, MIT -LIBBSD_LICENSE_FILES = COPYING -LIBBSD_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libcap-ng/Config.in b/package.bak/libcap-ng/Config.in deleted file mode 100644 index d1663cdefc..0000000000 --- a/package.bak/libcap-ng/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBCAP_NG - bool "libcap-ng" - help - The libcap-ng library is intended to make programming with - posix capabilities much easier than the traditional libcap - library. It includes utilities that can analyse all currently - running applications and print out any capabilities and whether - or not it has an open ended bounding set. - - http://people.redhat.com/sgrubb/libcap-ng/ diff --git a/package.bak/libcap-ng/libcap-ng.hash b/package.bak/libcap-ng/libcap-ng.hash deleted file mode 100644 index b433b75063..0000000000 --- a/package.bak/libcap-ng/libcap-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c21af997445cd4107a55d386f955c5ea6f6e96ead693e9151277c0ab5f97d05f libcap-ng-0.7.8.tar.gz diff --git a/package.bak/libcap-ng/libcap-ng.mk b/package.bak/libcap-ng/libcap-ng.mk deleted file mode 100644 index 19cc27d56f..0000000000 --- a/package.bak/libcap-ng/libcap-ng.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libcap-ng -# -################################################################################ - -LIBCAP_NG_VERSION = 0.7.8 -LIBCAP_NG_SITE = http://people.redhat.com/sgrubb/libcap-ng -LIBCAP_NG_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library) -LIBCAP_NG_LICENSE_FILES = COPYING COPYING.LIB -LIBCAP_NG_INSTALL_STAGING = YES - -LIBCAP_NG_CONF_ENV = ac_cv_prog_swig_found=no -LIBCAP_NG_CONF_OPTS = --without-python - -$(eval $(autotools-package)) diff --git a/package.bak/libcap/0001-build-system-fixes-for-cross-compilation.patch b/package.bak/libcap/0001-build-system-fixes-for-cross-compilation.patch deleted file mode 100644 index de2409085e..0000000000 --- a/package.bak/libcap/0001-build-system-fixes-for-cross-compilation.patch +++ /dev/null @@ -1,53 +0,0 @@ -From d8d70559a279706c206761dfaf665d2197934123 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 6 Mar 2016 22:52:02 +0100 -Subject: [PATCH] build-system: fixes for cross-compilation - -Avoid the libcap buildsys forcing CC/CFLAGS/LDFLAGS/AR/RANLIB - -Signed-off-by: Gustavo Zacarias -[yann.morin.1998@free.fr: dont chmod +x the shared lib] -Signed-off-by: "Yann E. MORIN" - -diff --git a/Make.Rules b/Make.Rules -index 8347b26..8a07a3f 100644 ---- a/Make.Rules -+++ b/Make.Rules -@@ -48,26 +48,26 @@ MINOR=25 - KERNEL_HEADERS := $(topdir)/libcap/include/uapi - IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include - --CC := gcc --CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 --BUILD_CC := $(CC) --BUILD_CFLAGS := $(CFLAGS) $(IPATH) --AR := ar --RANLIB := ranlib -+CC ?= gcc -+CFLAGS ?= -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -+BUILD_CC ?= $(CC) -+BUILD_CFLAGS ?= $(CFLAGS) $(IPATH) -+AR ?= ar -+RANLIB ?= ranlib - DEBUG = -g #-DDEBUG - WARNINGS=-Wall -Wwrite-strings \ - -Wpointer-arith -Wcast-qual -Wcast-align \ - -Wstrict-prototypes -Wmissing-prototypes \ - -Wnested-externs -Winline -Wshadow - LD=$(CC) -Wl,-x -shared --LDFLAGS := #-g -+LDFLAGS ?= #-g - BUILD_GPERF := $(shell which gperf >/dev/null 2>/dev/null && echo yes) - - SYSTEM_HEADERS = /usr/include - INCS=$(topdir)/libcap/include/sys/capability.h - LDFLAGS += -L$(topdir)/libcap - CFLAGS += -Dlinux $(WARNINGS) $(DEBUG) --PAM_CAP := $(shell if [ -f /usr/include/security/pam_modules.h ]; then echo yes ; else echo no ; fi) -+PAM_CAP = no - INDENT := $(shell if [ -n "$$(which indent 2>/dev/null)" ]; then echo "| indent -kr" ; fi) - DYNAMIC := $(shell if [ ! -d "$(topdir)/.git" ]; then echo yes; fi) - --- -1.9.1 - diff --git a/package.bak/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch b/package.bak/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch deleted file mode 100644 index a8579b7660..0000000000 --- a/package.bak/libcap/0002-libcap-split-install-into-install-shared-install-sta.patch +++ /dev/null @@ -1,48 +0,0 @@ -From af21635665ab568f3333ff9fe8b474f4950e5acb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 6 Mar 2016 22:53:24 +0100 -Subject: [PATCH] libcap: split install into install-shared/install-static - -In order to support static only builds, split the install target into -install-shared and install-static targets. - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: install the .pc file in the common rule] -Signed-off-by: "Yann E. MORIN" - -diff --git a/libcap/Makefile b/libcap/Makefile -index d189777..44ddb27 100644 ---- a/libcap/Makefile -+++ b/libcap/Makefile -@@ -62,19 +62,25 @@ $(MINLIBNAME): $(OBJS) - cap_text.o: cap_text.c $(USE_GPERF_OUTPUT) $(INCLS) - $(CC) $(CFLAGS) $(IPATH) $(INCLUDE_GPERF_OUTPUT) -c $< -o $@ - --install: all -+install: install-shared install-static -+ -+install-common: - mkdir -p -m 0755 $(FAKEROOT)$(INCDIR)/sys - install -m 0644 include/sys/capability.h $(FAKEROOT)$(INCDIR)/sys -+ mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) -+ install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc -+ -+install-static: $(STALIBNAME) install-common - mkdir -p -m 0755 $(FAKEROOT)$(LIBDIR) - install -m 0644 $(STALIBNAME) $(FAKEROOT)$(LIBDIR)/$(STALIBNAME) -+ -+install-shared: $(MINLIBNAME) install-common - install -m 0644 $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MINLIBNAME) - ln -sf $(MINLIBNAME) $(FAKEROOT)$(LIBDIR)/$(MAJLIBNAME) - ln -sf $(MAJLIBNAME) $(FAKEROOT)$(LIBDIR)/$(LIBNAME) - ifeq ($(FAKEROOT),) - -/sbin/ldconfig - endif -- mkdir -p -m 0755 $(FAKEROOT)$(PKGCONFIGDIR) -- install -m 0644 libcap.pc $(FAKEROOT)$(PKGCONFIGDIR)/libcap.pc - - clean: - $(LOCALCLEAN) --- -1.9.1 - diff --git a/package.bak/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch b/package.bak/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch deleted file mode 100644 index 02cc228b1d..0000000000 --- a/package.bak/libcap/0003-libcap-cap_file.c-fix-build-with-old-kernel-headers.patch +++ /dev/null @@ -1,51 +0,0 @@ -From ace694e9574eb38e07cfe0db235434eb40003f47 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 14 Mar 2016 22:39:15 +0100 -Subject: [PATCH] libcap/cap_file.c: fix build with old kernel headers - -Signed-off-by: Thomas Petazzoni ---- - libcap/cap_file.c | 27 +++++++++++++++++++++++++++ - 1 file changed, 27 insertions(+) - -diff --git a/libcap/cap_file.c b/libcap/cap_file.c -index 40756ea..e3d54dd 100644 ---- a/libcap/cap_file.c -+++ b/libcap/cap_file.c -@@ -23,6 +23,33 @@ extern int fsetxattr(int, const char *, const void *, size_t, int); - extern int removexattr(const char *, const char *); - extern int fremovexattr(int, const char *); - -+ -+/* -+ * Old kernels (before 2.6.36) were defining XATTR_NAME_CAPS in -+ * , but using XATTR_SECURITY_PREFIX and -+ * XATTR_CAPS_SUFFIX which were defined in the kernel-only part of -+ * . -+ * -+ * In kernel 2.6.36 (commit af4f136056c984b0aa67feed7d3170b958370b2f), -+ * the XATTR_NAME_CAPS definition was moved to the kernel-only part of -+ * . It's only in kernel 3.0 (commit -+ * 1dbe39424a43e56a6c9aed12661192af51dcdb9f) that was -+ * fixed to expose XATTR_NAME_CAPS and the related definitions to -+ * userspace. -+ * -+ * In order to cope with kernels < 3.0, we define here the appropriate -+ * values, which we assume haven't changed over history. -+ */ -+#ifndef XATTR_CAPS_SUFFIX -+#define XATTR_CAPS_SUFFIX "capability" -+#endif -+#ifndef XATTR_SECURITY_PREFIX -+#define XATTR_SECURITY_PREFIX "security." -+#endif -+#ifndef XATTR_NAME_CAPS -+#define XATTR_NAME_CAPS XATTR_SECURITY_PREFIX XATTR_CAPS_SUFFIX -+#endif -+ - #include "libcap.h" - - #ifdef VFS_CAP_U32 --- -2.6.4 - diff --git a/package.bak/libcap/Config.in b/package.bak/libcap/Config.in deleted file mode 100644 index 5b0c827191..0000000000 --- a/package.bak/libcap/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_LIBCAP - bool "libcap" - help - This library implements the user-space interfaces to the - POSIX 1003.1e capabilities available in Linux kernels. These - capabilities are a partitioning of the all powerful root - privilege into a set of distinct privileges. - - http://sites.google.com/site/fullycapable/ - -if BR2_PACKAGE_LIBCAP - -config BR2_PACKAGE_LIBCAP_TOOLS - bool "install tools" - depends on BR2_USE_MMU - help - Install setcap, getcap, getpcaps and capsh tools. - - For these tools to run properly, you should enable, in your - kernel configuration, extended file attributes/security labels - support for the file system type used on target system (e.g. - CONFIG_EXT2_FS_XATTR and CONFIG_EXT2_FS_SECURITY for ext2). - -endif diff --git a/package.bak/libcap/libcap.hash b/package.bak/libcap/libcap.hash deleted file mode 100644 index a1dcd62b3c..0000000000 --- a/package.bak/libcap/libcap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/sha256sums.asc -sha256 693c8ac51e983ee678205571ef272439d83afe62dd8e424ea14ad9790bc35162 libcap-2.25.tar.xz diff --git a/package.bak/libcap/libcap.mk b/package.bak/libcap/libcap.mk deleted file mode 100644 index bcb5d8cedb..0000000000 --- a/package.bak/libcap/libcap.mk +++ /dev/null @@ -1,71 +0,0 @@ -################################################################################ -# -# libcap -# -################################################################################ - -LIBCAP_VERSION = 2.25 -LIBCAP_SITE = https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2 -LIBCAP_SOURCE = libcap-$(LIBCAP_VERSION).tar.xz -LIBCAP_LICENSE = GPLv2 or BSD-3c -LIBCAP_LICENSE_FILES = License - -LIBCAP_DEPENDENCIES = host-libcap host-gperf -LIBCAP_INSTALL_STAGING = YES - -HOST_LIBCAP_DEPENDENCIES = host-gperf - -ifeq ($(BR2_STATIC_LIBS),y) -LIBCAP_MAKE_TARGET = libcap.a libcap.pc -LIBCAP_MAKE_INSTALL_TARGET = install-static -else -LIBCAP_MAKE_TARGET = all -LIBCAP_MAKE_INSTALL_TARGET = install -endif - -LIBCAP_MAKE_FLAGS = \ - BUILD_CC="$(HOSTCC)" \ - BUILD_CFLAGS="$(HOST_CFLAGS)" - -ifeq ($(BR2_PACKAGE_LIBCAP_TOOLS),y) -define LIBCAP_BUILD_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - $(LIBCAP_MAKE_FLAGS) -endef - -define LIBCAP_INSTALL_TOOLS_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/progs \ - RAISE_SETFCAP=no prefix=/usr \ - DESTDIR=$(TARGET_DIR) $(LIBCAP_MAKE_FLAGS) install -endef -endif - -define LIBCAP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/libcap \ - $(LIBCAP_MAKE_FLAGS) $(LIBCAP_MAKE_TARGET) - $(LIBCAP_BUILD_TOOLS_CMDS) -endef - -define LIBCAP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(STAGING_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) -endef - -define LIBCAP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/libcap $(LIBCAP_MAKE_FLAGS) \ - DESTDIR=$(TARGET_DIR) prefix=/usr lib=lib $(LIBCAP_MAKE_INSTALL_TARGET) - $(LIBCAP_INSTALL_TOOLS_CMDS) -endef - -define HOST_LIBCAP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D)\ - RAISE_SETFCAP=no -endef - -define HOST_LIBCAP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) \ - RAISE_SETFCAP=no prefix=/usr lib=lib install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/libcdaudio/Config.in b/package.bak/libcdaudio/Config.in deleted file mode 100644 index 3eca607fc1..0000000000 --- a/package.bak/libcdaudio/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBCDAUDIO - bool "libcdaudio" - # binutils assertion failure - depends on !BR2_nios2 - help - libcdaudio is a library designed to provide functions to - control operation of a CD-ROM when playing audio CDs. It - also contains functions for CDDB and CD Index lookup. - - http://libcdaudio.sourceforge.net/ diff --git a/package.bak/libcdaudio/libcdaudio.hash b/package.bak/libcdaudio/libcdaudio.hash deleted file mode 100644 index f8e1112c59..0000000000 --- a/package.bak/libcdaudio/libcdaudio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb libcdaudio-0.99.12p2.tar.gz diff --git a/package.bak/libcdaudio/libcdaudio.mk b/package.bak/libcdaudio/libcdaudio.mk deleted file mode 100644 index bee1fe3d23..0000000000 --- a/package.bak/libcdaudio/libcdaudio.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libcdaudio -# -################################################################################ - -LIBCDAUDIO_VERSION = 0.99.12p2 -LIBCDAUDIO_SITE = http://downloads.sourceforge.net/project/libcdaudio/libcdaudio/$(LIBCDAUDIO_VERSION) -LIBCDAUDIO_INSTALL_STAGING = YES -LIBCDAUDIO_CONFIG_SCRIPTS = libcdaudio-config -LIBCDAUDIO_LICENSE = GPLv2+ -LIBCDAUDIO_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libcddb/Config.in b/package.bak/libcddb/Config.in deleted file mode 100644 index f2bb827829..0000000000 --- a/package.bak/libcddb/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBCDDB - bool "libcddb" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Libcddb is a C library to access data on a CDDB server - (freedb.org). It allows you to: - * search the database for possible CD matches; - * retrieve detailed information about a specific CD; - * submit new CD entries to the database. - - http://libcddb.sourceforge.net/index.html - -if BR2_PACKAGE_LIBCDDB - -config BR2_PACKAGE_LIBCDDB_INSTALL_CDDB_QUERY - bool "install cddb_query" - help - cddb_query is an optionnal libcddb test program. - -endif diff --git a/package.bak/libcddb/libcddb.hash b/package.bak/libcddb/libcddb.hash deleted file mode 100644 index 9e60683ea3..0000000000 --- a/package.bak/libcddb/libcddb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 35ce0ee1741ea38def304ddfe84a958901413aa829698357f0bee5bb8f0a223b libcddb-1.3.2.tar.bz2 diff --git a/package.bak/libcddb/libcddb.mk b/package.bak/libcddb/libcddb.mk deleted file mode 100644 index 96b265a4dd..0000000000 --- a/package.bak/libcddb/libcddb.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libcddb -# -################################################################################ - -LIBCDDB_VERSION = 1.3.2 -LIBCDDB_SOURCE = libcddb-$(LIBCDDB_VERSION).tar.bz2 -LIBCDDB_SITE = http://downloads.sourceforge.net/libcddb -LIBCDDB_LICENSE = LGPLv2+ -LIBCDDB_LICENSE_FILES = COPYING -LIBCDDB_INSTALL_STAGING = YES - -ifeq ($(BR2_ENABLE_LOCALE),) -LIBCDDB_DEPENDENCIES += libiconv -endif - -define LIBCDDB_REMOVE_CDDB_QUERY - rm -f $(TARGET_DIR)/usr/bin/cddb_query -endef - -ifeq ($(BR2_PACKAGE_LIBCDDB_INSTALL_CDDB_QUERY),) -LIBCDDB_POST_INSTALL_TARGET_HOOKS += LIBCDDB_REMOVE_CDDB_QUERY -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libcdio/Config.in b/package.bak/libcdio/Config.in deleted file mode 100644 index fdc001ec40..0000000000 --- a/package.bak/libcdio/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBCDIO - bool "libcdio" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - The GNU Compact Disc Input and Control library. - - http://www.gnu.org/software/libcdio/ diff --git a/package.bak/libcdio/libcdio.hash b/package.bak/libcdio/libcdio.hash deleted file mode 100644 index 35c632a906..0000000000 --- a/package.bak/libcdio/libcdio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking signature -sha256 96e2c903f866ae96f9f5b9048fa32db0921464a2286f5b586c0f02699710025a libcdio-0.94.tar.gz diff --git a/package.bak/libcdio/libcdio.mk b/package.bak/libcdio/libcdio.mk deleted file mode 100644 index 4a7c6745cc..0000000000 --- a/package.bak/libcdio/libcdio.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libcdio -# -################################################################################ - -LIBCDIO_VERSION = 0.94 -LIBCDIO_SITE = $(BR2_GNU_MIRROR)/libcdio -LIBCDIO_INSTALL_STAGING = YES -LIBCDIO_LICENSE = GPLv3+ -LIBCDIO_LICENSE_FILES = COPYING -LIBCDIO_CONF_OPTS = --disable-example-progs --disable-cddb - -ifeq ($(BR2_ENABLE_LOCALE),) -LIBCDIO_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_INSTALL_LIBSTDCPP),) -LIBCDIO_CONF_OPTS += --disable-cxx -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -LIBCDIO_DEPENDENCIES += ncurses -else -LIBCDIO_CONF_OPTS += --without-cdda-player -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libcec/Config.in b/package.bak/libcec/Config.in deleted file mode 100644 index 2dddc53635..0000000000 --- a/package.bak/libcec/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBCEC - bool "libcec" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - select BR2_PACKAGE_LIBPLATFORM - help - libcec allows you in combination with the right hardware to - control your home theater devices with your TV remote - control utilizing existing HDMI cabling. - - http://libcec.pulse-eight.com - -comment "libcec needs a toolchain w/ C++, wchar, threads, dynamic library, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ - BR2_STATIC_LIBS diff --git a/package.bak/libcec/libcec.hash b/package.bak/libcec/libcec.hash deleted file mode 100644 index 5416c20fec..0000000000 --- a/package.bak/libcec/libcec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 b8b8dd31f3ebdd5472f03ab7d401600ea0d959b1288b9ca24bf457ef60e2ba27 libcec-4.0.2.tar.gz diff --git a/package.bak/libcec/libcec.mk b/package.bak/libcec/libcec.mk deleted file mode 100644 index f00e10f5d2..0000000000 --- a/package.bak/libcec/libcec.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# libcec -# -################################################################################ - -LIBCEC_VERSION = 4.0.2 -LIBCEC_SITE = $(call github,Pulse-Eight,libcec,libcec-$(LIBCEC_VERSION)) -LIBCEC_LICENSE = GPLv2+ -LIBCEC_LICENSE_FILES = COPYING - -LIBCEC_INSTALL_STAGING = YES -LIBCEC_DEPENDENCIES = host-pkgconf libplatform - -ifeq ($(BR2_PACKAGE_LOCKDEV),y) -LIBCEC_DEPENDENCIES += lockdev -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBCEC_DEPENDENCIES += udev -endif - -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -LIBCEC_DEPENDENCIES += host-swig $(if $(BR2_PACKAGE_PYTHON3),python3,python) -endif - -ifeq ($(BR2_PACKAGE_RPI_USERLAND),y) -LIBCEC_DEPENDENCIES += rpi-userland -LIBCEC_CONF_OPTS += \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) -lvcos -lvchiq_arm" \ - -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) \ - -I$(STAGING_DIR)/usr/include/interface/vmcs_host/linux \ - -I$(STAGING_DIR)/usr/include/interface/vcos/pthreads" -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBCEC_DEPENDENCIES += xlib_libXrandr -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libcgi/0001-misc-fixes.patch b/package.bak/libcgi/0001-misc-fixes.patch deleted file mode 100644 index b576178546..0000000000 --- a/package.bak/libcgi/0001-misc-fixes.patch +++ /dev/null @@ -1,122 +0,0 @@ -Index: b/src/cgi.c -=================================================================== ---- a/src/cgi.c -+++ b/src/cgi.c -@@ -336,7 +336,7 @@ - hextable['b'] = 11; - hextable['c'] = 12; - hextable['d'] = 13; -- hextable['e'] = 13; -+ hextable['e'] = 14; - hextable['f'] = 15; - hextable['A'] = 10; - hextable['B'] = 11; -Index: b/src/string.c -=================================================================== ---- a/src/string.c -+++ b/src/string.c -@@ -584,7 +584,7 @@ - - va_start(ptr, s); - -- va_copy(bkp, str); -+ va_copy(bkp, ptr); - len = strlen(s); - - while (*str) { -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -5,22 +5,32 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - --SHAREDOPT = -shared -+SHAREDOPT = -shared -fPIC -Wl,-soname,libcgi.so.0 - LIBDIR = $(prefix)/lib --INCDIR = $(prefix)/include -+INCDIR = $(prefix)/include/libcgi/ - MANDIR = $(prefix)/man/man3 - SHELL = /bin/sh - EXTRA_LIBS = - - INCS = -Isrc --FLAGS = -Wall -fpic -+FLAGS = -Wall -D_REENTRANT - - OBJS = src/error.o src/cgi.o src/session.o src/base64.o src/md5.o \ - src/string.o src/general.o src/list.o src/cookie.o -+SHOBJS=$(OBJS:.o=.sh.o) - --.c.o: $(CC) $(FLAGS) -c $< -+ALL_TARGETS = src/libcgi.a -+ifeq ($(STATIC),) -+ALL_TARGETS += src/libcgi.so -+endif - --all: $(OBJS) src/libcgi.so -+%.o: %.c -+ $(CC) $(FLAGS) -c $*.c -o $@ -+ -+%.sh.o: %.c -+ $(CC) $(FLAGS) -fPIC -c $*.c -o $@ -+ -+all: $(ALL_TARGETS) - - @echo "" - @echo "" -@@ -48,14 +58,17 @@ - src/libcgi.a: $(OBJS) - $(AR) rc src/libcgi.a $(OBJS) - --src/libcgi.so: src/libcgi.a -- $(CC) $(SHAREDOPT) -o src/libcgi.so $(OBJS) $(EXTRA_LIBS) -+src/libcgi.so: $(SHOBJS) -+ $(CC) $(SHAREDOPT) -o src/libcgi.so $(SHOBJS) $(EXTRA_LIBS) - - install: -- cp src/libcgi.a $(LIBDIR) -- cp src/libcgi.so $(LIBDIR) -- cp src/cgi.h $(INCDIR) -- cp src/session.h $(INCDIR) -+ cp src/libcgi.a $(DESTDIR)/$(LIBDIR) -+ifeq ($(STATIC),) -+ cp src/libcgi.so $(DESTDIR)/$(LIBDIR) -+endif -+ [ -d $(DESTDIR)/$(INCDIR) ] || mkdir -p $(DESTDIR)/$(INCDIR) -+ cp src/cgi.h $(DESTDIR)/$(INCDIR) -+ cp src/session.h $(DESTDIR)/$(INCDIR) - - - src/error.o: src/error.c src/error.h -@@ -69,8 +82,9 @@ - src/list.o: src/list.c - - clean: -- find src/ -name *.*o -exec rm -f {} \; -+ find src/ -name *.o -exec rm -f {} \; - find src/ -name *.a -exec rm -f {} \; -+ find src/ -name *.so -exec rm -f {} \; - - uninstall: clean - rm -f $(LIBDIR)/libcgi.* -@@ -78,11 +92,11 @@ - rm -f $(INCDIR)/session.h - rm -f $(MANDIR)/libcgi* - --install_man: -- cp doc/man/man3/libcgi_base64.3 $(MANDIR) -- cp doc/man/man3/libcgi_cgi.3 $(MANDIR) -- cp doc/man/man3/libcgi_general.3 $(MANDIR) -- cp doc/man/man3/libcgi_string.3 $(MANDIR) -- cp doc/man/man3/libcgi_session.3 $(MANDIR) -- cp doc/man/man3/libcgi_cookie.3 $(MANDIR) -+#install_man: -+# cp doc/man/man3/libcgi_base64.3 $(MANDIR) -+# cp doc/man/man3/libcgi_cgi.3 $(MANDIR) -+# cp doc/man/man3/libcgi_general.3 $(MANDIR) -+# cp doc/man/man3/libcgi_string.3 $(MANDIR) -+# cp doc/man/man3/libcgi_session.3 $(MANDIR) -+# cp doc/man/man3/libcgi_cookie.3 $(MANDIR) - diff --git a/package.bak/libcgi/Config.in b/package.bak/libcgi/Config.in deleted file mode 100644 index 430039e559..0000000000 --- a/package.bak/libcgi/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBCGI - bool "libcgi" - help - LibCGI is a library written from scratch to easily make - CGI applications in C. - - There are a lot of functions like string manipulation, - session and cookie support, GET and POST methods manipulation - etc..., to help you to quickly write powerful CGI programs. - - http://libcgi.sourceforge.net/ diff --git a/package.bak/libcgi/libcgi.hash b/package.bak/libcgi/libcgi.hash deleted file mode 100644 index 6bd7c0c3d6..0000000000 --- a/package.bak/libcgi/libcgi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 861df39cc0195d43419c4c3de8dff4f42478db66c9ba0b0c1e994c99400e130c libcgi-1.0.tar.gz diff --git a/package.bak/libcgi/libcgi.mk b/package.bak/libcgi/libcgi.mk deleted file mode 100644 index 7cb3417382..0000000000 --- a/package.bak/libcgi/libcgi.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libcgi -# -################################################################################ - -LIBCGI_VERSION = 1.0 -LIBCGI_SITE = http://downloads.sourceforge.net/project/libcgi/libcgi/$(LIBCGI_VERSION) -LIBCGI_INSTALL_STAGING = YES -# use cross CC/AR rather than host -LIBCGI_MAKE_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS)" AR="$(TARGET_AR)" \ - $(if $(BR2_STATIC_LIBS),STATIC=1) -LIBCGI_LICENSE = LGPLv2.1+ - -$(eval $(autotools-package)) diff --git a/package.bak/libcgicc/0001-disable-documentation-option.patch b/package.bak/libcgicc/0001-disable-documentation-option.patch deleted file mode 100644 index a7b04a83a7..0000000000 --- a/package.bak/libcgicc/0001-disable-documentation-option.patch +++ /dev/null @@ -1,50 +0,0 @@ -Index: cgicc-3.2.9/Makefile.am -=================================================================== ---- cgicc-3.2.9.orig/Makefile.am 2010-02-25 16:34:06.000000000 +0100 -+++ cgicc-3.2.9/Makefile.am 2010-02-25 16:34:14.000000000 +0100 -@@ -8,9 +8,15 @@ - DEMO = - endif - -+if DOC -+DOCDIR = doc -+else -+DOC = -+endif -+ - ACLOCAL_AMFLAGS= - --SUBDIRS = cgicc doc support $(DEMO) -+SUBDIRS = cgicc $(DOCDIR) support $(DEMO) - - CLEANFILES = *~ - -Index: cgicc-3.2.9/configure.ac -=================================================================== ---- cgicc-3.2.9.orig/configure.ac 2010-02-25 16:34:06.000000000 +0100 -+++ cgicc-3.2.9/configure.ac 2010-02-25 16:45:46.000000000 +0100 -@@ -17,9 +17,23 @@ - AC_PROG_CXX - AC_PROG_INSTALL - AC_PROG_LIBTOOL --AC_CHECK_PROG(DOXYGEN, doxygen, doxygen, /bin/echo) - - -+AC_ARG_ENABLE(doc, -+ [ --enable-doc build doc [[default=yes]]], -+ [case "${enableval}" in -+ yes) cgicc_doc=yes ;; -+ no) cgicc_doc=no ;; -+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-doc) ;; -+ esac], cgicc_doc=yes) -+ -+if test "$cgicc_doc" = yes; then -+ AC_CHECK_PROG(DOXYGEN, doxygen, doxygen) -+ if test -z "$DOXYGEN" ; then -+ AC_MSG_ERROR([Doxygen is required to build the documentation]) -+ fi -+fi -+AM_CONDITIONAL(DOC, test "$cgicc_doc" = yes) - - dnl Determine host system type - diff --git a/package.bak/libcgicc/Config.in b/package.bak/libcgicc/Config.in deleted file mode 100644 index e1f6904b29..0000000000 --- a/package.bak/libcgicc/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBCGICC - bool "libcgicc" - depends on BR2_INSTALL_LIBSTDCPP - help - GNU cgicc is a C++ class library that greatly simplifies - the creation of CGI applications for the World Wide Web. - - http://www.cgicc.com - -comment "libcgicc needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libcgicc/libcgicc.hash b/package.bak/libcgicc/libcgicc.hash deleted file mode 100644 index 313478d468..0000000000 --- a/package.bak/libcgicc/libcgicc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d94a2b5dec6d5eb6f05f114e2c7a64aeb7da71708ebe7b5f32bd6ebde1dfbc96 cgicc-3.2.16.tar.bz2 diff --git a/package.bak/libcgicc/libcgicc.mk b/package.bak/libcgicc/libcgicc.mk deleted file mode 100644 index 1c36d42aa7..0000000000 --- a/package.bak/libcgicc/libcgicc.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libcgicc -# -################################################################################ - -LIBCGICC_VERSION = 3.2.16 -LIBCGICC_SITE = $(BR2_GNU_MIRROR)/cgicc -LIBCGICC_SOURCE = cgicc-$(LIBCGICC_VERSION).tar.bz2 -LIBCGICC_LICENSE = LGPLv3+ (library), GFDL1.2+ (docs) -LIBCGICC_LICENSE_FILES = COPYING.LIB COPYING.DOC -LIBCGICC_INSTALL_STAGING = YES -LIBCGICC_AUTORECONF = YES -LIBCGICC_CONFIG_SCRIPTS = cgicc-config -LIBCGICC_CONF_OPTS = \ - --disable-demos \ - --disable-doc - -$(eval $(autotools-package)) diff --git a/package.bak/libcgroup/Config.in b/package.bak/libcgroup/Config.in deleted file mode 100644 index 03efa71e6b..0000000000 --- a/package.bak/libcgroup/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBCGROUP - bool "libcgroup" - depends on BR2_INSTALL_LIBSTDCPP - # libcgroup uses which is not included by default in uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC - help - libcgroup is a library that abstracts the control - group file system in Linux. - - http://libcg.sourceforge.net/ - -if BR2_PACKAGE_LIBCGROUP - -config BR2_PACKAGE_LIBCGROUP_TOOLS - bool "install tools" - help - Include a set of command-line tools for managing cgroups. - -endif - -comment "libcgroup needs a glibc toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/libcgroup/libcgroup.hash b/package.bak/libcgroup/libcgroup.hash deleted file mode 100644 index c671791771..0000000000 --- a/package.bak/libcgroup/libcgroup.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 libcgroup-0.41.tar.bz2 diff --git a/package.bak/libcgroup/libcgroup.mk b/package.bak/libcgroup/libcgroup.mk deleted file mode 100644 index a4c3084c6c..0000000000 --- a/package.bak/libcgroup/libcgroup.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# libcgroup -# -################################################################################ - -LIBCGROUP_VERSION = 0.41 -LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2 -LIBCGROUP_SITE = http://downloads.sourceforge.net/project/libcg/libcgroup/v$(LIBCGROUP_VERSION) -LIBCGROUP_LICENSE = LGPLv2.1 -LIBCGROUP_LICENSE_FILES = COPYING -LIBCGROUP_DEPENDENCIES = host-bison host-flex -LIBCGROUP_INSTALL_STAGING = YES - -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 -# for more information. -LIBCGROUP_CONF_ENV = \ - CXXFLAGS="$(TARGET_CXXFLAGS) -U_FILE_OFFSET_BITS" \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" - -LIBCGROUP_CONF_OPTS = \ - --disable-daemon \ - --disable-initscript-install - -ifeq ($(BR2_PACKAGE_LIBCGROUP_TOOLS),y) -LIBCGROUP_CONF_OPTS += --enable-tools -else -LIBCGROUP_CONF_OPTS += --disable-tools -endif - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -LIBCGROUP_DEPENDENCIES += linux-pam -LIBCGROUP_CONF_OPTS += --enable-pam -else -LIBCGROUP_CONF_OPTS += --disable-pam -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libcli/Config.in b/package.bak/libcli/Config.in deleted file mode 100644 index e20afb0e02..0000000000 --- a/package.bak/libcli/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBCLI - bool "libcli" - help - Libcli provides a shared library for including a Cisco-like - command- line interface into other software. It's a telnet - interface which supports command-line editing, history, - authentication and callbacks for a user-definable function - tree. - - http://sites.dparrish.com/libcli - diff --git a/package.bak/libcli/libcli.hash b/package.bak/libcli/libcli.hash deleted file mode 100644 index f6ea12ad37..0000000000 --- a/package.bak/libcli/libcli.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3c801cb0112b6b5e07bdc3b98c034b36df6f33a8ed95ce74520b704bdbc0f36d libcli-c63c9d35144939c8b4fa3c5394aed2e29ff517b0.tar.gz diff --git a/package.bak/libcli/libcli.mk b/package.bak/libcli/libcli.mk deleted file mode 100644 index 17eed79884..0000000000 --- a/package.bak/libcli/libcli.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# libcli -# -################################################################################ - -LIBCLI_VERSION = c63c9d35144939c8b4fa3c5394aed2e29ff517b0 -LIBCLI_SITE = $(call github,dparrish,libcli,$(LIBCLI_VERSION)) -LIBCLI_LICENSE = LGPLv2.1 -LIBCLI_LICENSE_FILES = COPYING -LIBCLI_INSTALL_STAGING = YES - -# We will pass optimisation level via CFLAGS so remove libcli default -LIBCLI_MAKE_ARGS += OPTIM= - -# We can't run the test harness -LIBCLI_MAKE_ARGS += TESTS= - -# Disable the static library for shared only build -ifeq ($(BR2_SHARED_LIBS),y) -LIBCLI_MAKE_ARGS += STATIC_LIB= -endif - -# Disable the shared library for static only build -ifeq ($(BR2_STATIC_LIBS),y) -LIBCLI_MAKE_ARGS += DYNAMIC_LIB= -endif - -define LIBCLI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBCLI_MAKE_ARGS) -endef - -define LIBCLI_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBCLI_MAKE_ARGS) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBCLI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBCLI_MAKE_ARGS) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch b/package.bak/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch deleted file mode 100644 index bc93890450..0000000000 --- a/package.bak/libcoap/0001-configure-only-add-Wunused-result-if-supported-by-th.patch +++ /dev/null @@ -1,38 +0,0 @@ -From d5914ecbb0285aea1eb2b9432d6e91155877fd95 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 9 Jun 2016 21:53:59 +0200 -Subject: [PATCH] configure: only add -Wunused-result if supported by the - compiler - -Old gcc versions such as 4.3.x do not support -Wunused-result, so -instead of unconditionally using this warning, only use it if supported -by the compiler. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream: https://github.com/obgm/libcoap/pull/32 - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f4452ac..6354fcf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,12 +110,12 @@ WARNING_CFLAGS="\ - -Wswitch-default \ - -Wswitch-enum \ - -Wunused \ ---Wunused-result \ - " - - # check whether or not the compiler supports -Wlogical-op (clang does not...) - AX_CHECK_COMPILE_FLAG([-Wlogical-op], [WARNING_CFLAGS="$WARNING_CFLAGS -Wlogical-op"],,[-Werror]) - AX_CHECK_COMPILE_FLAG([-fdiagnostics-color], [CFLAGS="$CFLAGS -fdiagnostics-color"],,[-Werror]) -+AX_CHECK_COMPILE_FLAG([-Wunused-result], [WARNING_CFLAGS="$WARNING_CFLAGS -Wunused-result"]) - - AC_SUBST([WARNING_CFLAGS]) - --- -2.7.4 - diff --git a/package.bak/libcoap/Config.in b/package.bak/libcoap/Config.in deleted file mode 100644 index c089b550ab..0000000000 --- a/package.bak/libcoap/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBCOAP - bool "libcoap" - help - libcoap is a C implementation of a lightweight application-protocol - for devices that are constrained their resources such as computing - power, RF range, memory, bandwith, or network packet sizes. This - protocol, CoAP, is standardized by the IETF as RFC 7252. For further - information related to CoAP, see . - - https://github.com/obgm/libcoap diff --git a/package.bak/libcoap/libcoap.hash b/package.bak/libcoap/libcoap.hash deleted file mode 100644 index dce491b5bc..0000000000 --- a/package.bak/libcoap/libcoap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f66e91742c2b027fcd7c575d8e7b53d79d3624aad1b3baba481dd88f6e2bc44d libcoap-c909bf802034b7762a2182848304b2530e58444f.tar.gz diff --git a/package.bak/libcoap/libcoap.mk b/package.bak/libcoap/libcoap.mk deleted file mode 100644 index ef9b731b86..0000000000 --- a/package.bak/libcoap/libcoap.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libcoap -# -################################################################################ - -LIBCOAP_VERSION = c909bf802034b7762a2182848304b2530e58444f -LIBCOAP_SITE = $(call github,obgm,libcoap,$(LIBCOAP_VERSION)) -LIBCOAP_INSTALL_STAGING = YES -LIBCOAP_LICENSE = GPLv2+ or BSD-2c -LIBCOAP_LICENSE_FILES = COPYING LICENSE.GPL LICENSE.BSD -LIBCOAP_CONF_OPTS = --disable-examples -LIBCOAP_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch b/package.bak/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch deleted file mode 100644 index ede31dbc2a..0000000000 --- a/package.bak/libcodec2/0001-Use-the-native-compiler-to-build-generate_cookbook.patch +++ /dev/null @@ -1,153 +0,0 @@ -From c7c769990bca3049bc389dcbd9985adaec134946 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 29 Aug 2015 11:59:18 +0200 -Subject: [PATCH] Use the native compiler to build generate_cookbook - -The generate_cookbook binary needs to be executed at build time. When -cross-compiling, this means that it should be built with the native -compiler rather than the cross-compiler. - -To achieve this, this commit imports the AX_CC_FOR_BUILD autoconf -macro from the GNU Autoconf Archive project, and adjusts -src/Makefile.am to use CC_FOR_BUILD to build generate_cookbook. - -Based on initial work by Bernd Kuhls. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 1 + - configure.ac | 2 ++ - m4/ax_cc_for_build.m4 | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ - src/Makefile.am | 3 ++ - 4 files changed, 83 insertions(+) - create mode 100644 m4/ax_cc_for_build.m4 - -diff --git a/Makefile.am b/Makefile.am -index 4468bca..bd3ce01 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,7 @@ AM_CFLAGS = -Isrc -fPIC -Wall -O3 -lm - AUTOMAKE_OPTIONS = gnu - NAME = codec2 - AM_CPPFLAGS = $(AM_CFLAGS) -+ACLOCAL_AMFLAGS = -I m4 - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = codec2.pc -diff --git a/configure.ac b/configure.ac -index 493c517..7520af6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,10 +4,12 @@ - AC_PREREQ([2.59]) - AC_INIT(codec2, 0.2, david@rowetel.com) - AM_INIT_AUTOMAKE -+AC_CONFIG_MACRO_DIR([m4]) - - # Checks for programs. - AC_PROG_CC - AC_PROG_LIBTOOL -+AX_CC_FOR_BUILD - - # Checks for libraries. - # FIXME: Replace `main' with a function in `-lm': -diff --git a/m4/ax_cc_for_build.m4 b/m4/ax_cc_for_build.m4 -new file mode 100644 -index 0000000..c880fd0 ---- /dev/null -+++ b/m4/ax_cc_for_build.m4 -@@ -0,0 +1,77 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_cc_for_build.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CC_FOR_BUILD -+# -+# DESCRIPTION -+# -+# Find a build-time compiler. Sets CC_FOR_BUILD and EXEEXT_FOR_BUILD. -+# -+# LICENSE -+# -+# Copyright (c) 2010 Reuben Thomas -+# Copyright (c) 1999 Richard Henderson -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 2 -+ -+dnl Get a default for CC_FOR_BUILD to put into Makefile. -+AC_DEFUN([AX_CC_FOR_BUILD], -+[# Put a plausible default for CC_FOR_BUILD in Makefile. -+if test -z "$CC_FOR_BUILD"; then -+ if test "x$cross_compiling" = "xno"; then -+ CC_FOR_BUILD='$(CC)' -+ else -+ CC_FOR_BUILD=gcc -+ fi -+fi -+AC_SUBST(CC_FOR_BUILD) -+# Also set EXEEXT_FOR_BUILD. -+if test "x$cross_compiling" = "xno"; then -+ EXEEXT_FOR_BUILD='$(EXEEXT)' -+else -+ AC_CACHE_CHECK([for build system executable suffix], bfd_cv_build_exeext, -+ [rm -f conftest* -+ echo 'int main () { return 0; }' > conftest.c -+ bfd_cv_build_exeext= -+ ${CC_FOR_BUILD} -o conftest conftest.c 1>&5 2>&5 -+ for file in conftest.*; do -+ case $file in -+ *.c | *.o | *.obj | *.ilk | *.pdb) ;; -+ *) bfd_cv_build_exeext=`echo $file | sed -e s/conftest//` ;; -+ esac -+ done -+ rm -f conftest* -+ test x"${bfd_cv_build_exeext}" = x && bfd_cv_build_exeext=no]) -+ EXEEXT_FOR_BUILD="" -+ test x"${bfd_cv_build_exeext}" != xno && EXEEXT_FOR_BUILD=${bfd_cv_build_exeext} -+fi -+AC_SUBST(EXEEXT_FOR_BUILD)])dnl -diff --git a/src/Makefile.am b/src/Makefile.am -index 1153b3c..719088d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -77,6 +77,9 @@ CODEBOOKSGE= \ - - noinst_PROGRAMS = generate_codebook genlspdtcb - -+generate_codebook$(EXEEXT_FOR_BUILD): generate_codebook.c -+ $(CC_FOR_BUILD) -o $@ generate_codebook.c -lm -+ - codebook.$(OBJEXT): codebook.c - codebookd.$(OBJEXT): codebookd.c - codebookdt.$(OBJEXT): codebookdt.c --- -2.5.0 - diff --git a/package.bak/libcodec2/0002-Add-option-to-disable-unit-tests.patch b/package.bak/libcodec2/0002-Add-option-to-disable-unit-tests.patch deleted file mode 100644 index 7822702092..0000000000 --- a/package.bak/libcodec2/0002-Add-option-to-disable-unit-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 19db6244200b870317382294f14b7d561d55a64e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 29 Aug 2015 12:05:53 +0200 -Subject: [PATCH] Add option to disable unit tests - -The unittests require C++, while the rest of the library does not, so -this commit implements a --{enable,disable}-unittests option to -selectively enable the build of the unit tests. When not provided, the -option defaults to yes so that the existing behavior is preserved. - -Based on initial work by Bernd Kuhls. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 6 +++++- - configure.ac | 5 +++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index bd3ce01..1da250b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -95,4 +95,8 @@ src/codebook/lsp8.txt \ - src/codebook/lsp9.txt \ - src/codebook/lsp10.txt - --SUBDIRS = src unittest -+SUBDIRS = src -+ -+if UNITTESTS -+SUBDIRS += unittest -+endif -diff --git a/configure.ac b/configure.ac -index 7520af6..55b7215 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,5 +24,10 @@ AC_CHECK_HEADERS([stdlib.h string.h]) - AC_FUNC_MALLOC - AC_CHECK_FUNCS([floor pow sqrt]) - -+AC_ARG_ENABLE([unittests], -+ AS_HELP_STRING([--disable-unittests], [Disable unittests]), -+ [], [enable_unittests=yes]) -+AM_CONDITIONAL([UNITTESTS], [test "${enable_unittests}" = "yes"]) -+ - AC_CONFIG_FILES([Makefile src/Makefile unittest/Makefile codec2.pc]) - AC_OUTPUT --- -2.5.0 - diff --git a/package.bak/libcodec2/Config.in b/package.bak/libcodec2/Config.in deleted file mode 100644 index b27aab1c70..0000000000 --- a/package.bak/libcodec2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBCODEC2 - bool "libcodec2" - help - Codec2 is an open source low bit rate speech codec designed - for communications quality speech between 1200 and 3200 bit/s. - - http://rowetel.com/codec2.html diff --git a/package.bak/libcodec2/libcodec2.mk b/package.bak/libcodec2/libcodec2.mk deleted file mode 100644 index 73f98ca2fe..0000000000 --- a/package.bak/libcodec2/libcodec2.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libcodec2 -# -################################################################################ - -LIBCODEC2_VERSION = 392a55b4f3f8ad30d845ac6ae35e8b27343bb944 -LIBCODEC2_SITE = https://freeswitch.org/stash/scm/sd/libcodec2.git -LIBCODEC2_SITE_METHOD = git -LIBCODEC2_LICENSE = LGPLv2.1 -LIBCODEC2_LICENSE_FILES = COPYING -LIBCODEC2_AUTORECONF = YES -LIBCODEC2_INSTALL_STAGING = YES -LIBCODEC2_CONF_OPTS = --disable-unittests - -$(eval $(autotools-package)) diff --git a/package.bak/libcofi/Config.in b/package.bak/libcofi/Config.in deleted file mode 100644 index df9ab71b93..0000000000 --- a/package.bak/libcofi/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBCOFI - bool "libcofi" - depends on BR2_arm - # builds a shared library - depends on !BR2_STATIC_LIBS - help - A replacement for memcpy and memset functionality for the - Raspberry Pi with the intention of gaining greater performance. - - https://github.com/simonjhall/copies-and-fills - -comment "libcofi needs a toolchain w/ dynamic library" - depends on BR2_arm - depends on BR2_STATIC_LIBS diff --git a/package.bak/libcofi/libcofi.hash b/package.bak/libcofi/libcofi.hash deleted file mode 100644 index 1baaece4cb..0000000000 --- a/package.bak/libcofi/libcofi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 72ec89c19267612b316ec9c5835c07212b8f0a377c5b4c20b6e46e69a6e4a5e5 libcofi-7313fbe12b0593034d0a1b606bf33c7cf4ababce.tar.gz diff --git a/package.bak/libcofi/libcofi.mk b/package.bak/libcofi/libcofi.mk deleted file mode 100644 index 90daff2ae8..0000000000 --- a/package.bak/libcofi/libcofi.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libcofi -# -################################################################################ - -LIBCOFI_VERSION = 7313fbe12b0593034d0a1b606bf33c7cf4ababce -LIBCOFI_SITE = $(call github,simonjhall,copies-and-fills,$(LIBCOFI_VERSION)) -LIBCOFI_LICENSE = LGPLv2.1 -LIBCOFI_LICENSE_FILES = README.md - -define LIBCOFI_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define LIBCOFI_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libcofi_rpi.so $(TARGET_DIR)/usr/lib/libcofi_rpi.so -endef - -$(eval $(generic-package)) diff --git a/package.bak/libconfig/Config.in b/package.bak/libconfig/Config.in deleted file mode 100644 index 75dacab36d..0000000000 --- a/package.bak/libconfig/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBCONFIG - bool "libconfig" - help - Libconfig is a simple library for manipulating structured - configuration files. The file format is more compact and more - readable than XML. And unlike XML, it is type-aware, so it is - not necessary to do string parsing in application code. - - http://www.hyperrealm.com/libconfig/ diff --git a/package.bak/libconfig/libconfig.hash b/package.bak/libconfig/libconfig.hash deleted file mode 100644 index 30110cbbd0..0000000000 --- a/package.bak/libconfig/libconfig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6 libconfig-1.5.tar.gz diff --git a/package.bak/libconfig/libconfig.mk b/package.bak/libconfig/libconfig.mk deleted file mode 100644 index f11937c4e2..0000000000 --- a/package.bak/libconfig/libconfig.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libconfig -# -################################################################################ - -LIBCONFIG_VERSION = 1.5 -LIBCONFIG_SITE = http://www.hyperrealm.com/libconfig -LIBCONFIG_LICENSE = LGPLv2.1+ -LIBCONFIG_LICENSE_FILES = COPYING.LIB -LIBCONFIG_INSTALL_STAGING = YES -LIBCONFIG_CONF_OPTS = --disable-examples - -ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -LIBCONFIG_CONF_OPTS += --disable-cxx -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libconfuse/Config.in b/package.bak/libconfuse/Config.in deleted file mode 100644 index be18cbb073..0000000000 --- a/package.bak/libconfuse/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBCONFUSE - bool "libconfuse" - help - LibConfuse is a configuration file parser library written in - C. It supports sections and (lists of) values (strings, - integers, floats, booleans or other sections), as well as some - other features (such as single/double-quoted strings, - environment variable expansion, functions and nested include - statements. - - http://savannah.nongnu.org/download/confuse/ diff --git a/package.bak/libconfuse/libconfuse.hash b/package.bak/libconfuse/libconfuse.hash deleted file mode 100644 index ec485a1908..0000000000 --- a/package.bak/libconfuse/libconfuse.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://github.com/martinh/libconfuse/releases/download/v3.0/confuse-3.0.tar.xz.md5, sha256 locally computed. -md5 c534b51a2118ed57031dc548032304a3 confuse-3.0.tar.xz -sha256 bb75174e02aa8b44fa1a872a47beeea1f5fe715ab669694c97803eb6127cc861 confuse-3.0.tar.xz diff --git a/package.bak/libconfuse/libconfuse.mk b/package.bak/libconfuse/libconfuse.mk deleted file mode 100644 index 2908af3292..0000000000 --- a/package.bak/libconfuse/libconfuse.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libconfuse -# -################################################################################ - -LIBCONFUSE_VERSION = 3.0 -LIBCONFUSE_SOURCE = confuse-$(LIBCONFUSE_VERSION).tar.xz -LIBCONFUSE_SITE = https://github.com/martinh/libconfuse/releases/download/v$(LIBCONFUSE_VERSION) -LIBCONFUSE_INSTALL_STAGING = YES -LIBCONFUSE_CONF_OPTS = --disable-rpath -LIBCONFUSE_DEPENDENCIES = host-flex -HOST_LIBCONFUSE_DEPENDENCIES = host-flex -LIBCONFUSE_LICENSE = ISC -LIBCONFUSE_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -LIBCONFUSE_DEPENDENCIES += gettext -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libcroco/Config.in b/package.bak/libcroco/Config.in deleted file mode 100644 index 5baf83dfb9..0000000000 --- a/package.bak/libcroco/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBCROCO - bool "libcroco" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - help - Libcroco is a standalone css2 parsing and manipulation - library. The parser provides a low level event driven SAC - like api and a css object model like api. - - Libcroco provides a CSS2 selection engine and an - experimental xml/css rendering engine. - - https://github.com/GNOME/libcroco - -comment "libcroco needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libcroco/libcroco.hash b/package.bak/libcroco/libcroco.hash deleted file mode 100644 index edf0b1f388..0000000000 --- a/package.bak/libcroco/libcroco.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libcroco/0.6/libcroco-0.6.11.sha256sum -sha256 132b528a948586b0dfa05d7e9e059901bca5a3be675b6071a90a90b81ae5a056 libcroco-0.6.11.tar.xz diff --git a/package.bak/libcroco/libcroco.mk b/package.bak/libcroco/libcroco.mk deleted file mode 100644 index 39dd52795e..0000000000 --- a/package.bak/libcroco/libcroco.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libcroco -# -################################################################################ - -LIBCROCO_VERSION_MAJOR = 0.6 -LIBCROCO_VERSION = $(LIBCROCO_VERSION_MAJOR).11 -LIBCROCO_SITE = http://ftp.gnome.org/pub/gnome/sources/libcroco/$(LIBCROCO_VERSION_MAJOR) -LIBCROCO_SOURCE = libcroco-$(LIBCROCO_VERSION).tar.xz -LIBCROCO_INSTALL_STAGING = YES -LIBCROCO_DEPENDENCIES = host-pkgconf libglib2 libxml2 -HOST_LIBCROCO_DEPENDENCIES = host-pkgconf host-libglib2 host-libxml2 -LIBCROCO_CONFIG_SCRIPTS = croco-$(LIBCROCO_VERSION_MAJOR)-config -# NEWS states that it's only LGPL -# Source code says v2.1+ even though COPYING.LIB is v2 -LIBCROCO_LICENSE = LGPLv2.1+ -LIBCROCO_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libcrossguid/Config.in b/package.bak/libcrossguid/Config.in deleted file mode 100644 index 49060bc837..0000000000 --- a/package.bak/libcrossguid/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBCROSSGUID - bool "libcrossguid" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Lightweight cross platform C++ GUID/UUID library - - https://github.com/graeme-hill/crossguid - -comment "libcrossguid needs a toolchain w/ C++, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/libcrossguid/libcrossguid.hash b/package.bak/libcrossguid/libcrossguid.hash deleted file mode 100644 index a991da56a0..0000000000 --- a/package.bak/libcrossguid/libcrossguid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz diff --git a/package.bak/libcrossguid/libcrossguid.mk b/package.bak/libcrossguid/libcrossguid.mk deleted file mode 100644 index 46d9a9dcc6..0000000000 --- a/package.bak/libcrossguid/libcrossguid.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libcrossguid -# -################################################################################ - -LIBCROSSGUID_VERSION = 8f399e8bd4252be9952f3dfa8199924cc8487ca4 -LIBCROSSGUID_SITE = $(call github,graeme-hill,crossguid,$(LIBCROSSGUID_VERSION)) -LIBCROSSGUID_LICENSE = MIT -LIBCROSSGUID_LICENSE_FILES = LICENSE -LIBCROSSGUID_INSTALL_STAGING = YES -# only a static library -LIBCROSSGUID_INSTALL_TARGET = NO -LIBCROSSGUID_DEPENDENCIES = util-linux - -define LIBCROSSGUID_BUILD_CMDS - (cd $(@D); $(TARGET_CXX) $(TARGET_CXXFLAGS) -std=c++11 -DGUID_LIBUUID \ - -c guid.cpp -o guid.o) - (cd $(@D); $(TARGET_AR) rvs libcrossguid.a guid.o) -endef - -define LIBCROSSGUID_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/libcrossguid.a \ - $(STAGING_DIR)/usr/lib/libcrossguid.a - $(INSTALL) -D -m 644 $(@D)/guid.h $(STAGING_DIR)/usr/include/guid.h -endef - -$(eval $(generic-package)) diff --git a/package.bak/libcue/Config.in b/package.bak/libcue/Config.in deleted file mode 100644 index 69e6495594..0000000000 --- a/package.bak/libcue/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBCUE - bool "libcue" - select BR2_PACKAGE_FLEX - help - CUE Sheet Parser Library - - https://github.com/lipnitsk/libcue diff --git a/package.bak/libcue/libcue.hash b/package.bak/libcue/libcue.hash deleted file mode 100644 index 779cda0d66..0000000000 --- a/package.bak/libcue/libcue.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c3c46d58cebf15b3fe07e6f649014694d338ddd880e941bfb1fd3cedae66c62f libcue-v1.4.0.tar.gz diff --git a/package.bak/libcue/libcue.mk b/package.bak/libcue/libcue.mk deleted file mode 100644 index 70124538f2..0000000000 --- a/package.bak/libcue/libcue.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libcue -# -################################################################################ - -LIBCUE_VERSION = v1.4.0 -LIBCUE_SITE = $(call github,lipnitsk,libcue,$(LIBCUE_VERSION)) -LIBCUE_LICENSE = GPLv2, BSD-2c (rem.c) -LIBCUE_LICENSE_FILES = COPYING -LIBCUE_DEPENDENCIES = host-bison host-flex flex -LIBCUE_INSTALL_STAGING = YES -LIBCUE_AUTORECONF = YES - -# Needed for autoreconf -define LIBCUE_MAKE_CONFIG_DIR - mkdir $(@D)/config -endef -LIBCUE_POST_EXTRACT_HOOKS += LIBCUE_MAKE_CONFIG_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/libcuefile/0001-fix-static-link.patch b/package.bak/libcuefile/0001-fix-static-link.patch deleted file mode 100644 index 6eb58909fd..0000000000 --- a/package.bak/libcuefile/0001-fix-static-link.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix static only build - -Make sure to build the shared library only if BUILD_SHARED_LIBS is -ON. Normally, CMake takes care of this automatically, but libcuefile -wants to build both the shared and static variants, so the normal -logic of CMake doesn't apply. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/CMakeLists.txt -=================================================================== ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -4,7 +4,11 @@ - add_library(cuefile-static STATIC cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) - set_target_properties(cuefile-static PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1) - -+if (BUILD_SHARED_LIBS) - add_library(cuefile-shared SHARED cd cdtext cue_parse cue_print cue_scan cuefile time toc toc_parse toc_print toc_scan) - set_target_properties(cuefile-shared PROPERTIES OUTPUT_NAME cuefile CLEAN_DIRECT_OUTPUT 1 VERSION 0.0.0 SOVERSION 0) - - install(TARGETS cuefile-static cuefile-shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") -+else (BUILD_SHARED_LIBS) -+install(TARGETS cuefile-static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") -+endif (BUILD_SHARED_LIBS) diff --git a/package.bak/libcuefile/Config.in b/package.bak/libcuefile/Config.in deleted file mode 100644 index 416b3e1495..0000000000 --- a/package.bak/libcuefile/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBCUEFILE - bool "libcuefile" - help - Cue File library from Musepack - - http://www.musepack.net/ diff --git a/package.bak/libcuefile/libcuefile.hash b/package.bak/libcuefile/libcuefile.hash deleted file mode 100644 index 57db91f322..0000000000 --- a/package.bak/libcuefile/libcuefile.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.musepack.net/index.php?pg=src -md5 1a6ac52e1080fd54f0f59372345f1e4e libcuefile_r475.tar.gz -# Calculated based on the hash above -sha256 b681ca6772b3f64010d24de57361faecf426ee6182f5969fcf29b3f649133fe7 libcuefile_r475.tar.gz diff --git a/package.bak/libcuefile/libcuefile.mk b/package.bak/libcuefile/libcuefile.mk deleted file mode 100644 index d1f2448832..0000000000 --- a/package.bak/libcuefile/libcuefile.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# libcuefile -# -################################################################################ - -LIBCUEFILE_VERSION = r475 -LIBCUEFILE_SITE = http://files.musepack.net/source -LIBCUEFILE_SOURCE = libcuefile_$(LIBCUEFILE_VERSION).tar.gz -LIBCUEFILE_INSTALL_STAGING = YES -LIBCUEFILE_LICENSE = GPLv2+ -LIBCUEFILE_LICENSE_FILES = COPYING - -define LIBCUEFILE_INSTALL_STAGING_INCLUDES - cp -r $(@D)/include $(STAGING_DIR)/usr -endef - -define LIBCUEFILE_INSTALL_TARGET_INCLUDES - cp -r $(@D)/include $(TARGET_DIR)/usr -endef - -LIBCUEFILE_POST_INSTALL_STAGING_HOOKS += LIBCUEFILE_INSTALL_STAGING_INCLUDES -LIBCUEFILE_POST_INSTALL_TARGET_HOOKS += LIBCUEFILE_INSTALL_TARGET_INCLUDES - -$(eval $(cmake-package)) diff --git a/package.bak/libcurl/Config.in b/package.bak/libcurl/Config.in deleted file mode 100644 index fc1527f0d9..0000000000 --- a/package.bak/libcurl/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_LIBCURL - bool "libcurl" - help - cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, - and Dict servers, using any of the supported protocols. - - http://curl.haxx.se/ - -if BR2_PACKAGE_LIBCURL - -config BR2_PACKAGE_CURL - bool "curl binary" - help - Install curl binary as well - -config BR2_PACKAGE_LIBCURL_VERBOSE - bool "enable verbose strings" - help - Enable verbose text strings - -endif diff --git a/package.bak/libcurl/libcurl.hash b/package.bak/libcurl/libcurl.hash deleted file mode 100644 index 72cae81c0e..0000000000 --- a/package.bak/libcurl/libcurl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 b2345a8bef87b4c229dedf637cb203b5e21db05e20277c8e1094f0d4da180801 curl-7.53.0.tar.bz2 diff --git a/package.bak/libcurl/libcurl.mk b/package.bak/libcurl/libcurl.mk deleted file mode 100644 index b5dcb377b5..0000000000 --- a/package.bak/libcurl/libcurl.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# libcurl -# -################################################################################ - -LIBCURL_VERSION = 7.53.0 -LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 -LIBCURL_SITE = https://curl.haxx.se/download -LIBCURL_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBIDN),libidn) \ - $(if $(BR2_PACKAGE_RTMPDUMP),rtmpdump) -LIBCURL_LICENSE = ISC -LIBCURL_LICENSE_FILES = COPYING -LIBCURL_INSTALL_STAGING = YES - -# We disable NTLM support because it uses fork(), which doesn't work -# on non-MMU platforms. Moreover, this authentication method is -# probably almost never used. See -# http://curl.haxx.se/docs/manpage.html#--ntlm. -LIBCURL_CONF_OPTS = --disable-manual --disable-ntlm-wb \ - --enable-hidden-symbols --with-random=/dev/urandom --disable-curldebug - -ifeq ($(BR2_PACKAGE_LIBCURL_VERBOSE),y) -LIBCURL_CONF_OPTS += --enable-verbose -else -LIBCURL_CONF_OPTS += --disable-verbose -endif - -LIBCURL_CONFIG_SCRIPTS = curl-config - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBCURL_DEPENDENCIES += openssl -LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes -# configure adds the cross openssl dir to LD_LIBRARY_PATH which screws up -# native stuff during the rest of configure when target == host. -# Fix it by setting LD_LIBRARY_PATH to something sensible so those libs -# are found first. -LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)/lib:/usr/lib -LIBCURL_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr \ - --with-ca-path=/etc/ssl/certs -else ifeq ($(BR2_PACKAGE_GNUTLS),y) -LIBCURL_CONF_OPTS += --with-gnutls=$(STAGING_DIR)/usr -LIBCURL_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_LIBNSS),y) -LIBCURL_CONF_OPTS += --with-nss=$(STAGING_DIR)/usr -LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" -LIBCURL_DEPENDENCIES += libnss -else ifeq ($(BR2_PACKAGE_MBEDTLS),y) -LIBCURL_CONF_OPTS += --with-mbedtls=$(STAGING_DIR)/usr -LIBCURL_DEPENDENCIES += mbedtls -else -LIBCURL_CONF_OPTS += --without-ssl --without-gnutls \ - --without-polarssl --without-nss --without-mbedtls -endif - -ifeq ($(BR2_PACKAGE_C_ARES),y) -LIBCURL_DEPENDENCIES += c-ares -LIBCURL_CONF_OPTS += --enable-ares -else -LIBCURL_CONF_OPTS += --disable-ares -endif - -# Configure curl to support libssh2 -ifeq ($(BR2_PACKAGE_LIBSSH2),y) -LIBCURL_DEPENDENCIES += libssh2 -LIBCURL_CONF_OPTS += --with-libssh2 -else -LIBCURL_CONF_OPTS += --without-libssh2 -endif - -define LIBCURL_FIX_DOT_PC - printf 'Requires: openssl\n' >>$(@D)/libcurl.pc.in -endef -LIBCURL_POST_PATCH_HOOKS += $(if $(BR2_PACKAGE_OPENSSL),LIBCURL_FIX_DOT_PC) - -ifeq ($(BR2_PACKAGE_CURL),) -define LIBCURL_TARGET_CLEANUP - rm -rf $(TARGET_DIR)/usr/bin/curl -endef -LIBCURL_POST_INSTALL_TARGET_HOOKS += LIBCURL_TARGET_CLEANUP -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch b/package.bak/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch deleted file mode 100644 index c8f4270d6a..0000000000 --- a/package.bak/libdaemon/0001-testd-use-unistd-h-instead-of-sys-unistd-h.patch +++ /dev/null @@ -1,16 +0,0 @@ -examples/testd.c: As the C POSIX library recommends include the -instead of . This removes an error when building libdaemon -against the musl C library. - -Signed-off-by: Jörg Krause ---- libdaemon-0.14.orig/examples/testd.c 2014-08-30 00:27:08.359832977 +0200 -+++ libdaemon-0.14/examples/testd.c 2014-08-30 00:27:25.439832670 +0200 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - - #include diff --git a/package.bak/libdaemon/Config.in b/package.bak/libdaemon/Config.in deleted file mode 100644 index bfcedc1968..0000000000 --- a/package.bak/libdaemon/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBDAEMON - bool "libdaemon" - # needs fork() - depends on BR2_USE_MMU - help - libdaemon is a lightweight C library that eases the - writing of UNIX daemons. - - http://0pointer.de/lennart/projects/libdaemon/ diff --git a/package.bak/libdaemon/libdaemon.hash b/package.bak/libdaemon/libdaemon.hash deleted file mode 100644 index 8dbbb5a358..0000000000 --- a/package.bak/libdaemon/libdaemon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fd23eb5f6f986dcc7e708307355ba3289abe03cc381fc47a80bca4a50aa6b834 libdaemon-0.14.tar.gz diff --git a/package.bak/libdaemon/libdaemon.mk b/package.bak/libdaemon/libdaemon.mk deleted file mode 100644 index 69dc0b76ba..0000000000 --- a/package.bak/libdaemon/libdaemon.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libdaemon -# -################################################################################ - -LIBDAEMON_VERSION = 0.14 -LIBDAEMON_SITE = http://0pointer.de/lennart/projects/libdaemon -LIBDAEMON_LICENSE = LGPLv2.1+ -LIBDAEMON_LICENSE_FILES = LICENSE -LIBDAEMON_INSTALL_STAGING = YES -LIBDAEMON_CONF_ENV = ac_cv_func_setpgrp_void=no -LIBDAEMON_CONF_OPTS = --disable-lynx -LIBDAEMON_DEPENDENCIES = host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libdcadec/Config.in b/package.bak/libdcadec/Config.in deleted file mode 100644 index 2687a18187..0000000000 --- a/package.bak/libdcadec/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDCADEC - bool "libdcadec" - help - dcadec is a free DTS Coherent Acoustics decoder with support - for HD extensions. - - https://github.com/foo86/dcadec diff --git a/package.bak/libdcadec/libdcadec.hash b/package.bak/libdcadec/libdcadec.hash deleted file mode 100644 index dda58d1065..0000000000 --- a/package.bak/libdcadec/libdcadec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ed9d207fde3e8d576f3af8b0d1235b3371e315175757173689104efcaebf0d44 libdcadec-v0.2.0.tar.gz diff --git a/package.bak/libdcadec/libdcadec.mk b/package.bak/libdcadec/libdcadec.mk deleted file mode 100644 index 48e4a12f65..0000000000 --- a/package.bak/libdcadec/libdcadec.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libdcadec -# -################################################################################ - -LIBDCADEC_VERSION = v0.2.0 -LIBDCADEC_SITE = $(call github,foo86,dcadec,$(LIBDCADEC_VERSION)) -LIBDCADEC_LICENSE = LGPLv2.1+ -LIBDCADEC_LICENSE_FILES = COPYING.LGPLv2.1 -LIBDCADEC_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),) -LIBDCADEC_SHARED = CONFIG_SHARED=1 -endif - -define LIBDCADEC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99" \ - $(LIBDCADEC_SHARED) -C $(@D) -endef - -define LIBDCADEC_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBDCADEC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(LIBDCADEC_SHARED) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libdmtx/Config.in b/package.bak/libdmtx/Config.in deleted file mode 100644 index db4187fdae..0000000000 --- a/package.bak/libdmtx/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDMTX - bool "libdmtx" - help - libdmtx is a software library that enables programs to read and write - Data Matrix barcodes of the modern ECC200 variety. - - http://www.libdmtx.org/ diff --git a/package.bak/libdmtx/libdmtx.hash b/package.bak/libdmtx/libdmtx.hash deleted file mode 100644 index 505baf4ee4..0000000000 --- a/package.bak/libdmtx/libdmtx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 686bcfb44e50b96345aa53f41e285f2118a2cf87a333b69b74165a2e7ddca492 libdmtx-0.7.4.tar.gz diff --git a/package.bak/libdmtx/libdmtx.mk b/package.bak/libdmtx/libdmtx.mk deleted file mode 100644 index 146534e856..0000000000 --- a/package.bak/libdmtx/libdmtx.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libdmtx -# -################################################################################ - -LIBDMTX_VERSION = 0.7.4 -LIBDMTX_SITE = http://downloads.sourceforge.net/project/libdmtx/libdmtx/$(LIBDMTX_VERSION) -LIBDMTX_LICENSE = BSD-2c or Special Permission -LIBDMTX_LICENSE_FILES = LICENSE -LIBDMTX_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libdnet/0001-python-gcc.patch b/package.bak/libdnet/0001-python-gcc.patch deleted file mode 100644 index ea732e4358..0000000000 --- a/package.bak/libdnet/0001-python-gcc.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/python/dnet.c 2006-01-19 18:08:23.000000000 +1100 -+++ b/python/dnet.c 2008-09-03 16:30:47.000000000 +1000 -@@ -2726,7 +2726,7 @@ - PyObject *__pyx_3 = 0; - unsigned short __pyx_4; - Py_INCREF(__pyx_v_self); -- ((PyObject*)__pyx_v_next) = Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)Py_None; Py_INCREF(((PyObject*)__pyx_v_next)); - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":634 */ - __pyx_1 = (((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->cur <= ((struct __pyx_obj_4dnet___addr_ip4_iter *)__pyx_v_self)->max); -@@ -2738,7 +2739,7 @@ - Py_DECREF(__pyx_2); __pyx_2 = 0; - if (!__Pyx_TypeTest(__pyx_3, __pyx_ptype_4dnet_addr)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 635; goto __pyx_L1;} - Py_DECREF(((PyObject *)__pyx_v_next)); -- ((PyObject *)__pyx_v_next) = __pyx_3; -+ __pyx_v_next = (struct __pyx_obj_4dnet_addr*)__pyx_3; - __pyx_3 = 0; - - /* "/Users/dugsong/projects/libdnet/python/./dnet.pyx":636 */ diff --git a/package.bak/libdnet/0002-python-makefile.patch b/package.bak/libdnet/0002-python-makefile.patch deleted file mode 100644 index fb41e43e35..0000000000 --- a/package.bak/libdnet/0002-python-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- - python/Makefile.am | 1 + - 1 file changed, 1 insertion(+) - -Index: libdnet-1.11/python/Makefile.am -=================================================================== ---- libdnet-1.11.orig/python/Makefile.am -+++ libdnet-1.11/python/Makefile.am -@@ -11,6 +11,7 @@ - pyrexc $(srcdir)/dnet.pyx - - python-build: $(srcdir)/dnet.c -+ CC="$(CC)" LDSHARED="$(CC) -shared" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext -I$(PYINCDIR) -L$(PYLIBDIR) - $(PYTHON) setup.py build - touch python-build - diff --git a/package.bak/libdnet/Config.in b/package.bak/libdnet/Config.in deleted file mode 100644 index e78bdedaba..0000000000 --- a/package.bak/libdnet/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBDNET - bool "libdnet" - help - libdnet - simplified interface to low-level networking routines. - - http://libdnet.sourceforge.net/ - -if BR2_PACKAGE_LIBDNET - -config BR2_PACKAGE_LIBDNET_PYTHON - bool "libdnet python module" - depends on BR2_PACKAGE_PYTHON - help - dnet module for python - -comment "dnet module for python requires python package" - depends on !BR2_PACKAGE_PYTHON - -endif diff --git a/package.bak/libdnet/libdnet.hash b/package.bak/libdnet/libdnet.hash deleted file mode 100644 index ee418723d9..0000000000 --- a/package.bak/libdnet/libdnet.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0eb78415c8f2564c2f1e8ad36e98473348d9c94852f796a226360c716cc7ca53 libdnet-1.11.tar.gz diff --git a/package.bak/libdnet/libdnet.mk b/package.bak/libdnet/libdnet.mk deleted file mode 100644 index f4e7a74ce0..0000000000 --- a/package.bak/libdnet/libdnet.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# libdnet -# -################################################################################ - -LIBDNET_VERSION = 1.11 -LIBDNET_SITE = http://downloads.sourceforge.net/project/libdnet/libdnet/libdnet-$(LIBDNET_VERSION) -LIBDNET_LICENSE = BSD-3c -LIBDNET_LICENSE_FILES = LICENSE -LIBDNET_INSTALL_STAGING = YES -LIBDNET_AUTORECONF = YES -LIBDNET_CONF_OPTS = \ - --with-gnu-ld \ - --with-check=no - -ifneq ($(BR2_PACKAGE_LIBDNET_PYTHON),) -LIBDNET_DEPENDENCIES = python -LIBDNET_CONF_OPTS += --with-python -LIBDNET_MAKE_OPTS = PYINCDIR=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) PYLIBDIR=$(STAGING_DIR)/usr/lib -LIBDNET_INSTALL_TARGET_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(TARGET_DIR) INSTALL_STRIP_FLAG=-s install-exec -LIBDNET_INSTALL_STAGING_OPTS = $(LIBDNET_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endif - -# Needed for autoreconf to work properly -define LIBDNET_FIXUP_ACINCLUDE_M4 - ln -sf config/acinclude.m4 $(@D) -endef - -LIBDNET_POST_EXTRACT_HOOKS += LIBDNET_FIXUP_ACINCLUDE_M4 - -define LIBDNET_REMOVE_CONFIG_SCRIPT - $(RM) -f $(TARGET_DIR)/usr/bin/dnet-config -endef - -LIBDNET_POST_INSTALL_TARGET_HOOKS += LIBDNET_REMOVE_CONFIG_SCRIPT - -$(eval $(autotools-package)) diff --git a/package.bak/libdri2/Config.in b/package.bak/libdri2/Config.in deleted file mode 100644 index fff979e3ab..0000000000 --- a/package.bak/libdri2/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBDRI2 - bool "libdri2" - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_DRI2PROTO - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm - depends on BR2_PACKAGE_XORG7 - help - Library for the DRI2 extension to the X Window System. - - https://github.com/robclark/libdri2 - -comment "libdri2 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libdri2/libdri2.hash b/package.bak/libdri2/libdri2.hash deleted file mode 100644 index 03a37ad44f..0000000000 --- a/package.bak/libdri2/libdri2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7c427f5c3fbda3d1df1dc77129e87605f4af1f3ad2adf2653c560d1703aa4395 libdri2-4f1eef3183df2b270c3d5cbef07343ee5127a6a4.tar.gz diff --git a/package.bak/libdri2/libdri2.mk b/package.bak/libdri2/libdri2.mk deleted file mode 100644 index 22854b5060..0000000000 --- a/package.bak/libdri2/libdri2.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# libdri2 -# -################################################################################ - -LIBDRI2_VERSION = 4f1eef3183df2b270c3d5cbef07343ee5127a6a4 -LIBDRI2_SITE = $(call github,robclark,libdri2,$(LIBDRI2_VERSION)) -LIBDRI2_DEPENDENCIES = xlib_libXext xproto_dri2proto xlib_libXdamage libdrm -LIBDRI2_LICENSE = MIT -LIBDRI2_LICENSE_FILES = COPYING - -LIBDRI2_INSTALL_STAGING = YES -LIBDRI2_AUTORECONF = YES -LIBDRI2_CONF_ENV = xorg_cv_malloc0_returns_null=true - -$(eval $(autotools-package)) diff --git a/package.bak/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch b/package.bak/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch deleted file mode 100644 index 3c00e9c73a..0000000000 --- a/package.bak/libdrm/0001-Add-ARM-support-into-xf86drm.h.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 2e3dd0040e676530f7e735fab335ff449b9b3f4d Mon Sep 17 00:00:00 2001 -From: Lauren Post -Date: Tue, 22 Mar 2016 22:08:25 +0100 -Subject: [PATCH] Add ARM support into xf86drm.h - -This provides support for Xorg interface. Without this the vivante -samples will hang during close requiring a reboot - -[Adapted from yocto project] -Upstream-Status: Pending -Signed-off-by: Lauren Post -Signed-off-by: Evan Kotara -[Thomas: change CAS code to only be used on ARMv6/ARMv7, and not -ARMv4/ARMv5, which don't support ldrex/strex. If no CAS implementation -is provided libdrm falls back to a system call for locking/unlocking.] -Signed-off-by: Thomas Petazzoni ---- - xf86drm.h | 22 ++++++++++++++++++++++ - 1 file changed, 22 insertions(+) - -diff --git a/xf86drm.h b/xf86drm.h -index 481d882..72341f6 100644 ---- a/xf86drm.h -+++ b/xf86drm.h -@@ -469,6 +469,28 @@ do { register unsigned int __old __asm("o0"); \ - : "cr0", "memory"); \ - } while (0) - -+# elif defined (__ARM_ARCH_6__) || defined(__ARM_ARCH_6J__) \ -+ || defined (__ARM_ARCH_6Z__) || defined(__ARM_ARCH_6ZK__) \ -+ || defined (__ARM_ARCH_6K__) || defined(__ARM_ARCH_6T2__) \ -+ || defined (__ARM_ARCH_7__) || defined(__ARM_ARCH_7A__) \ -+ || defined(__ARM_ARCH_7R__) || defined(__ARM_ARCH_7M__) \ -+ || defined(__ARM_ARCH_7EM__) -+ #undef DRM_DEV_MODE -+ #define DRM_DEV_MODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH) -+ -+ #define DRM_CAS(lock,old,new,__ret) \ -+ do { \ -+ __asm__ __volatile__ ( \ -+ "1: ldrex %0, [%1]\n" \ -+ " teq %0, %2\n" \ -+ " ite eq\n" \ -+ " strexeq %0, %3, [%1]\n" \ -+ " movne %0, #1\n" \ -+ : "=&r" (__ret) \ -+ : "r" (lock), "r" (old), "r" (new) \ -+ : "cc","memory"); \ -+ } while (0) -+ - #endif /* architecture */ - #endif /* __GNUC__ >= 2 */ - --- -2.6.4 - diff --git a/package.bak/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch b/package.bak/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch deleted file mode 100644 index ff920fb5a7..0000000000 --- a/package.bak/libdrm/0002-xf86atomic-require-CAS-support-in-libatomic_ops.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 7384f79f69fdb7b691cc5b0c28c301b3fe8b633e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 May 2016 10:46:57 +0200 -Subject: [PATCH] xf86atomic: require CAS support in libatomic_ops - -Since AO_compare_and_swap_full() is used by libdrm, AO_REQUIRE_CAS -must be defined before including so that we are sure -that CAS support will be provided. This is necessary to make sure that -the AO_compare_and_swap_full() function will be provided on all -architectures, including the ones that don't have built-in CAS support -such as SPARCv8. - -Signed-off-by: Thomas Petazzoni ---- - xf86atomic.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/xf86atomic.h b/xf86atomic.h -index 922b37d..d7017a5 100644 ---- a/xf86atomic.h -+++ b/xf86atomic.h -@@ -58,6 +58,7 @@ typedef struct { - #endif - - #if HAVE_LIB_ATOMIC_OPS -+#define AO_REQUIRE_CAS - #include - - #define HAS_ATOMIC_OPS 1 --- -2.7.4 - diff --git a/package.bak/libdrm/Config.in b/package.bak/libdrm/Config.in deleted file mode 100644 index 81fc5ccf9f..0000000000 --- a/package.bak/libdrm/Config.in +++ /dev/null @@ -1,109 +0,0 @@ -menuconfig BR2_PACKAGE_LIBDRM - bool "libdrm" - select BR2_PACKAGE_LIBPTHREAD_STUBS - depends on BR2_TOOLCHAIN_HAS_THREADS # libpthread-stubs - help - Direct Rendering Manager - - http://dri.freedesktop.org/libdrm/ - -if BR2_PACKAGE_LIBDRM - -config BR2_PACKAGE_LIBDRM_HAS_ATOMIC - bool - default y if BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS || \ - BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - bool - select BR2_PACKAGE_LIBATOMIC_OPS if !BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_LIBDRM_INTEL - bool "intel" - select BR2_PACKAGE_LIBPCIACCESS - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install intel graphics driver. - -config BR2_PACKAGE_LIBDRM_RADEON - bool "radeon" - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install AMD/ATI graphics driver. - -config BR2_PACKAGE_LIBDRM_AMDGPU - bool "amdgpu" - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install AMD GPU driver. - -config BR2_PACKAGE_LIBDRM_NOUVEAU - bool "nouveau" - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install NVIDIA graphics driver. - -config BR2_PACKAGE_LIBDRM_VMWGFX - bool "vmwgfx" - depends on BR2_i386 || BR2_x86_64 - help - Installs Vmware graphics driver. - -config BR2_PACKAGE_LIBDRM_OMAP - bool "omap (experimental)" - depends on BR2_arm - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install the TI OMAP driver using an experimental API. - -config BR2_PACKAGE_LIBDRM_ETNAVIV - bool "etnaviv (experimental)" - depends on BR2_arm - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install the Etnaviv/Vivante driver using an experimental API. - -config BR2_PACKAGE_LIBDRM_EXYNOS - bool "exynos (experimental)" - depends on BR2_arm - help - Install Samsung Exynos driver using an experimental API. - -config BR2_PACKAGE_LIBDRM_FREEDRENO - bool "freedreno" - depends on BR2_arm || BR2_aarch64 || BR2_aarch64_be - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install Qualcomm Snapdragon driver. - -config BR2_PACKAGE_LIBDRM_TEGRA - bool "tegra (experimental)" - depends on BR2_arm - depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC - select BR2_PACKAGE_LIBDRM_ENABLE_ATOMIC - help - Install NVIDIA Tegra driver using an experimental API. - -config BR2_PACKAGE_LIBDRM_VC4 - bool "vc4" - depends on BR2_arm - help - Install vc4 (Raspberry Pi) driver. - -config BR2_PACKAGE_LIBDRM_INSTALL_TESTS - bool "Install test programs" - help - This option allows to install the libdrm test programs. - -endif - -comment "libdrm needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libdrm/libdrm.hash b/package.bak/libdrm/libdrm.hash deleted file mode 100644 index dc10b295f2..0000000000 --- a/package.bak/libdrm/libdrm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/dri-devel/2017-January/131209.html -sha256 2d5a500eef412cc287d12268eed79d571e262d4957a2ec9258073f305985054f libdrm-2.4.75.tar.bz2 diff --git a/package.bak/libdrm/libdrm.mk b/package.bak/libdrm/libdrm.mk deleted file mode 100644 index ae7b75bad9..0000000000 --- a/package.bak/libdrm/libdrm.mk +++ /dev/null @@ -1,116 +0,0 @@ -################################################################################ -# -# libdrm -# -################################################################################ - -LIBDRM_VERSION = 2.4.75 -LIBDRM_SOURCE = libdrm-$(LIBDRM_VERSION).tar.bz2 -LIBDRM_SITE = http://dri.freedesktop.org/libdrm -LIBDRM_LICENSE = MIT - -LIBDRM_INSTALL_STAGING = YES - -LIBDRM_DEPENDENCIES = \ - libpthread-stubs \ - host-pkgconf - -LIBDRM_CONF_OPTS = \ - --disable-cairo-tests \ - --disable-manpages - -LIBDRM_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - -ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -LIBDRM_DEPENDENCIES += libatomic_ops -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -LIBDRM_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DAO_NO_SPARC_V9" -endif -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_INTEL),y) -LIBDRM_CONF_OPTS += --enable-intel -LIBDRM_DEPENDENCIES += libpciaccess -else -LIBDRM_CONF_OPTS += --disable-intel -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_RADEON),y) -LIBDRM_CONF_OPTS += --enable-radeon -else -LIBDRM_CONF_OPTS += --disable-radeon -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_AMDGPU),y) -LIBDRM_CONF_OPTS += --enable-amdgpu -else -LIBDRM_CONF_OPTS += --disable-amdgpu -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_NOUVEAU),y) -LIBDRM_CONF_OPTS += --enable-nouveau -else -LIBDRM_CONF_OPTS += --disable-nouveau -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_VMWGFX),y) -LIBDRM_CONF_OPTS += --enable-vmwgfx -else -LIBDRM_CONF_OPTS += --disable-vmwgfx -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_OMAP),y) -LIBDRM_CONF_OPTS += --enable-omap-experimental-api -else -LIBDRM_CONF_OPTS += --disable-omap-experimental-api -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_ETNAVIV),y) -LIBDRM_CONF_OPTS += --enable-etnaviv-experimental-api -else -LIBDRM_CONF_OPTS += --disable-etnaviv-experimental-api -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_EXYNOS),y) -LIBDRM_CONF_OPTS += --enable-exynos-experimental-api -else -LIBDRM_CONF_OPTS += --disable-exynos-experimental-api -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_FREEDRENO),y) -LIBDRM_CONF_OPTS += --enable-freedreno -else -LIBDRM_CONF_OPTS += --disable-freedreno -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_TEGRA),y) -LIBDRM_CONF_OPTS += --enable-tegra-experimental-api -else -LIBDRM_CONF_OPTS += --disable-tegra-experimental-api -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_VC4),y) -LIBDRM_CONF_OPTS += --enable-vc4 -else -LIBDRM_CONF_OPTS += --disable-vc4 -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBDRM_CONF_OPTS += --enable-udev -LIBDRM_DEPENDENCIES += udev -else -LIBDRM_CONF_OPTS += --disable-udev -endif - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -LIBDRM_CONF_OPTS += --enable-valgrind -LIBDRM_DEPENDENCIES += valgrind -else -LIBDRM_CONF_OPTS += --disable-valgrind -endif - -ifeq ($(BR2_PACKAGE_LIBDRM_INSTALL_TESTS),y) -LIBDRM_CONF_OPTS += --enable-install-test-programs -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libdvbcsa/0001-altivec-powerpc64.patch b/package.bak/libdvbcsa/0001-altivec-powerpc64.patch deleted file mode 100644 index 3605c146a7..0000000000 --- a/package.bak/libdvbcsa/0001-altivec-powerpc64.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix compile on powerpc64/powerpc64le w/ altivec - -Correct the type of some vectors passed to vec_slo() or vec_sro(), which only -takes a char vector. - -Signed-off-by: Sam Bobroff - ---- a/src/dvbcsa_bs_altivec.h 2016-11-28 14:33:34.410021500 +1100 -+++ b/src/dvbcsa_bs_altivec.h 2016-11-28 14:34:25.442238715 +1100 -@@ -64,7 +64,7 @@ - } - case 0x29: { - dvbcsa_bs_word_t x = vec_splat_u8(10); -- return (dvbcsa_bs_word_t)vec_add(vec_splat_u8(0x1),vec_rl(x,x)); -+ return (dvbcsa_bs_word_t)vec_add((dvbcsa_bs_word_t)vec_splat_u8(0x1),vec_rl(x,x)); - } - case 0x40: { - dvbcsa_bs_word_t x = vec_splat_u8(4); -@@ -99,10 +99,10 @@ - #define SHVAL_14 BS_VAL8(0e) - #define SHVAL_7 BS_VAL8(07) - --#define BS_SHL(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) --#define BS_SHR(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) --#define BS_SHL8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) --#define BS_SHR8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) -+#define BS_SHL(a, n) ({ vector unsigned char x = SHVAL_##n; vec_sll(vec_slo((a), x), x); }) -+#define BS_SHR(a, n) ({ vector unsigned char x = SHVAL_##n; vec_srl(vec_sro((a), x), x); }) -+#define BS_SHL8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); }) -+#define BS_SHR8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); }) - - #define BS_EXTRACT8(a, n) ((uint8_t*)&(a))[15 - (n)] - diff --git a/package.bak/libdvbcsa/Config.in b/package.bak/libdvbcsa/Config.in deleted file mode 100644 index dd7dc15120..0000000000 --- a/package.bak/libdvbcsa/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBDVBCSA - bool "libdvbcsa" - help - libdvbcsa is a free implementation of the DVB Common Scrambling - Algorithm - DVB/CSA - with encryption and decryption capabilities - - As libdvbcsa implements a standard, it is completely legal to use it. - - http://www.videolan.org/developers/libdvbcsa.html diff --git a/package.bak/libdvbcsa/libdvbcsa.hash b/package.bak/libdvbcsa/libdvbcsa.hash deleted file mode 100644 index d8360e60bc..0000000000 --- a/package.bak/libdvbcsa/libdvbcsa.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha256 -sha256 4db78af5cdb2641dfb1136fe3531960a477c9e3e3b6ba19a2754d046af3f456d libdvbcsa-1.1.0.tar.gz -# From http://download.videolan.org/pub/videolan/libdvbcsa/1.1.0/libdvbcsa-1.1.0.tar.gz.sha1 -sha1 5f4640a7e93ae6494f24a881414e5c343f803365 libdvbcsa-1.1.0.tar.gz diff --git a/package.bak/libdvbcsa/libdvbcsa.mk b/package.bak/libdvbcsa/libdvbcsa.mk deleted file mode 100644 index dfbb4c2257..0000000000 --- a/package.bak/libdvbcsa/libdvbcsa.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# libdvbcsa -# -################################################################################ - -LIBDVBCSA_VERSION = 1.1.0 -LIBDVBCSA_SITE = http://get.videolan.org/libdvbcsa/$(LIBDVBCSA_VERSION) -LIBDVBCSA_LICENSE = GPLv2+ -LIBDVBCSA_LICENSE_FILES = COPYING -LIBDVBCSA_INSTALL_STAGING = YES - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -LIBDVBCSA_CONF_OPTS += --enable-mmx -else -LIBDVBCSA_CONF_OPTS += --disable-mmx -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE2),y) -LIBDVBCSA_CONF_OPTS += --enable-sse2 -else -LIBDVBCSA_CONF_OPTS += --disable-sse2 -endif - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -LIBDVBCSA_CONF_OPTS += --enable-altivec -LIBDVBCSA_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -flax-vector-conversions" -else -LIBDVBCSA_CONF_OPTS += --disable-altivec -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libdvbpsi/Config.in b/package.bak/libdvbpsi/Config.in deleted file mode 100644 index 4d543bc91c..0000000000 --- a/package.bak/libdvbpsi/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBDVBPSI - bool "libdvbpsi" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libdvbpsi is a simple library designed for decoding and - generation of MPEG TS and DVB PSI tables according to standards - ISO/IEC 13818 and ITU-T H.222.0. - - http://www.videolan.org/developers/libdvbpsi.html - -comment "libdvbpsi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libdvbpsi/libdvbpsi.hash b/package.bak/libdvbpsi/libdvbpsi.hash deleted file mode 100644 index cf76616ff4..0000000000 --- a/package.bak/libdvbpsi/libdvbpsi.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://download.videolan.org/pub/libdvbpsi/1.3.0/libdvbpsi-1.3.0.tar.bz2.md5 -md5 2b217039a1299000c39423441f77e76a libdvbpsi-1.3.0.tar.bz2 -# From http://download.videolan.org/pub/libdvbpsi/1.3.0/libdvbpsi-1.3.0.tar.bz2.sha256 -sha256 a2fed1d11980662f919bbd1f29e2462719e0f6227e1a531310bd5a706db0a1fe libdvbpsi-1.3.0.tar.bz2 diff --git a/package.bak/libdvbpsi/libdvbpsi.mk b/package.bak/libdvbpsi/libdvbpsi.mk deleted file mode 100644 index 218c19e1f0..0000000000 --- a/package.bak/libdvbpsi/libdvbpsi.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libdvbpsi -# -################################################################################ - -LIBDVBPSI_VERSION = 1.3.0 -LIBDVBPSI_SITE = http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION) -LIBDVBPSI_SOURCE = libdvbpsi-$(LIBDVBPSI_VERSION).tar.bz2 -LIBDVBPSI_LICENSE = LGPLv2.1+ -LIBDVBPSI_LICENSE_FILES = COPYING -LIBDVBPSI_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libdvbsi/Config.in b/package.bak/libdvbsi/Config.in deleted file mode 100644 index f67342d650..0000000000 --- a/package.bak/libdvbsi/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBDVBSI - bool "libdvbsi" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - help - C++ parsing library for Service Information (SI) in DVB systems. - With libdvbsi++ you can convert raw DVB service information to - a set of C++ objects, removing the need to parse data manually. - - http://www.saftware.de/ - -comment "libdvbsi++ needs a toolchain w/ C++, wchar, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libdvbsi/libdvbsi.hash b/package.bak/libdvbsi/libdvbsi.hash deleted file mode 100644 index 7454625afe..0000000000 --- a/package.bak/libdvbsi/libdvbsi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.saftware.de/libdvbsi++/libdvbsi++-0.3.7.tar.bz2.md5 -md5 7eb50352c06b17c499a6d51e18e99ec5 libdvbsi++-0.3.7.tar.bz2 diff --git a/package.bak/libdvbsi/libdvbsi.mk b/package.bak/libdvbsi/libdvbsi.mk deleted file mode 100644 index f6469f9b92..0000000000 --- a/package.bak/libdvbsi/libdvbsi.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libdvbsi -# -################################################################################ - -LIBDVBSI_VERSION = 0.3.7 -LIBDVBSI_SOURCE = libdvbsi++-$(LIBDVBSI_VERSION).tar.bz2 -LIBDVBSI_SITE = http://www.saftware.de/libdvbsi++ -LIBDVBSI_INSTALL_STAGING = YES -LIBDVBSI_LICENSE = LGPLv2.1 -LIBDVBSI_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libdvdcss/Config.in b/package.bak/libdvdcss/Config.in deleted file mode 100644 index a8c3b84cf5..0000000000 --- a/package.bak/libdvdcss/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBDVDCSS - bool "libdvdcss" - help - libdvdcss is a simple library designed for accessing DVDs like - a block device without having to bother about the decryption. - - http://www.videolan.org/developers/libdvdcss.html diff --git a/package.bak/libdvdcss/libdvdcss.hash b/package.bak/libdvdcss/libdvdcss.hash deleted file mode 100644 index 57abd77a29..0000000000 --- a/package.bak/libdvdcss/libdvdcss.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libdvdcss/1.4.0/libdvdcss-1.4.0.tar.bz2.sha256 -sha256 2089375984800df29a4817b37f3123c1706723342d6dab4d0a8b75c25c2c845a libdvdcss-1.4.0.tar.bz2 diff --git a/package.bak/libdvdcss/libdvdcss.mk b/package.bak/libdvdcss/libdvdcss.mk deleted file mode 100644 index 8e1c92995d..0000000000 --- a/package.bak/libdvdcss/libdvdcss.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libdvdcss -# -################################################################################ - -LIBDVDCSS_VERSION = 1.4.0 -LIBDVDCSS_SOURCE = libdvdcss-$(LIBDVDCSS_VERSION).tar.bz2 -LIBDVDCSS_SITE = http://www.videolan.org/pub/videolan/libdvdcss/$(LIBDVDCSS_VERSION) -LIBDVDCSS_INSTALL_STAGING = YES -LIBDVDCSS_LICENSE = GPLv2+ -LIBDVDCSS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libdvdnav/0001-do-not-match-nios2-as-os2.patch b/package.bak/libdvdnav/0001-do-not-match-nios2-as-os2.patch deleted file mode 100644 index 27030bb239..0000000000 --- a/package.bak/libdvdnav/0001-do-not-match-nios2-as-os2.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix misdetection while nios2 cross-compile - -Signed-off-bye: Waldemar Brodkorb - -diff -Nur libdvdnav-5.0.3.orig/configure.ac libdvdnav-5.0.3/configure.ac ---- libdvdnav-5.0.3.orig/configure.ac 2015-01-27 16:57:43.000000000 +0100 -+++ libdvdnav-5.0.3/configure.ac 2016-07-31 11:48:09.312947473 +0200 -@@ -73,7 +73,7 @@ - [*mingw32* | *cygwin*], [AC_CHECK_FUNCS(gettimeofday)]) - - AS_CASE([$host], -- [*os2*], [LDFLAGS="$LDFLAGS -no-undefined"]) -+ [*-os2*], [LDFLAGS="$LDFLAGS -no-undefined"]) - - dnl --------------------------------------------- - dnl threads diff --git a/package.bak/libdvdnav/Config.in b/package.bak/libdvdnav/Config.in deleted file mode 100644 index 8cfcb4a6de..0000000000 --- a/package.bak/libdvdnav/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBDVDNAV - bool "libdvdnav" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBDVDREAD - help - libdvdnav is a library that allows easy use of sophisticated - DVD navigation features such as DVD menus, multiangle - playback and even interactive DVD games. - - http://www.mplayerhq.hu - -comment "libdvdnav needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libdvdnav/libdvdnav.hash b/package.bak/libdvdnav/libdvdnav.hash deleted file mode 100644 index d3b6fdb810..0000000000 --- a/package.bak/libdvdnav/libdvdnav.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libdvdnav/5.0.3/libdvdnav-5.0.3.tar.bz2.sha256 -sha256 5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d libdvdnav-5.0.3.tar.bz2 diff --git a/package.bak/libdvdnav/libdvdnav.mk b/package.bak/libdvdnav/libdvdnav.mk deleted file mode 100644 index b53f0c821b..0000000000 --- a/package.bak/libdvdnav/libdvdnav.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# libdvdnav -# -################################################################################ - -LIBDVDNAV_VERSION = 5.0.3 -LIBDVDNAV_SOURCE = libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2 -LIBDVDNAV_SITE = http://www.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION) -LIBDVDNAV_INSTALL_STAGING = YES -LIBDVDNAV_DEPENDENCIES = libdvdread host-pkgconf -LIBDVDNAV_LICENSE = GPLv2+ -LIBDVDNAV_LICENSE_FILES = COPYING -# 0001-do-not-match-nios2-as-os2.patch -LIBDVDNAV_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libdvdread/Config.in b/package.bak/libdvdread/Config.in deleted file mode 100644 index 91bec83a40..0000000000 --- a/package.bak/libdvdread/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBDVDREAD - bool "libdvdread" - select BR2_PACKAGE_LIBDVDCSS - help - libdvdread provides a simple foundation for reading - DVD-Video images. - - http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ diff --git a/package.bak/libdvdread/libdvdread.hash b/package.bak/libdvdread/libdvdread.hash deleted file mode 100644 index bef93fc015..0000000000 --- a/package.bak/libdvdread/libdvdread.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/libdvdread/5.0.0/libdvdread-5.0.3.tar.bz2.sha256 -sha256 321cdf2dbdc83c96572bc583cd27d8c660ddb540ff16672ecb28607d018ed82b libdvdread-5.0.3.tar.bz2 diff --git a/package.bak/libdvdread/libdvdread.mk b/package.bak/libdvdread/libdvdread.mk deleted file mode 100644 index adf79d852e..0000000000 --- a/package.bak/libdvdread/libdvdread.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libdvdread -# -################################################################################ - -LIBDVDREAD_VERSION = 5.0.3 -LIBDVDREAD_SOURCE = libdvdread-$(LIBDVDREAD_VERSION).tar.bz2 -LIBDVDREAD_SITE = http://www.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION) -LIBDVDREAD_INSTALL_STAGING = YES -LIBDVDREAD_LICENSE = GPLv2+ -LIBDVDREAD_LICENSE_FILES = COPYING -LIBDVDREAD_CONF_OPTS = --with-libdvdcss -LIBDVDREAD_DEPENDENCIES = libdvdcss host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch b/package.bak/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch deleted file mode 100644 index 69e349f205..0000000000 --- a/package.bak/libeXosip2/0001-use-pkg-config-to-detect-openssl.patch +++ /dev/null @@ -1,62 +0,0 @@ -configure: use pkg-config to find openssl - -The current check is broken for static linking, since the openssl -libs need to be linked against libz, which is missing in the link -command when doing a static build: - http://autobuild.buildroot.net/results/787/787cd9992b00d8008641af208f5fb7c4afb40b06/build-end.log - -Instead of trying convoluted tests to decide what additional libs -are required, just delegate this job to pkg-config. - -At the same time, fix a few legacy, deprecated constructs in favour -of their new counterparts. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: submitted, but no public mailing list (sent to the -mail documented in: http://www.antisip.com/doc/exosip2/index.html ) - -diff -durN libeXosip2-3.6.0.orig/configure.in libeXosip2-3.6.0/configure.in ---- libeXosip2-3.6.0.orig/configure.in 2014-06-22 23:58:26.549487427 +0200 -+++ libeXosip2-3.6.0/configure.in 2014-06-22 23:59:12.822008499 +0200 -@@ -44,7 +44,7 @@ - AC_CONFIG_AUX_DIR(scripts) - AC_CONFIG_HEADERS(config.h) - AM_INIT_AUTOMAKE($PACKAGE, $VERSION) --AM_ACLOCAL_INCLUDE(scripts) -+AC_CONFIG_MACRO_DIR([scripts]) - - AC_CANONICAL_HOST - -@@ -371,13 +371,15 @@ - - AC_ARG_ENABLE(openssl, - [ --enable-openssl enable support for openssl], -- enable_openssl=$enableval,enable_openssl="yes") -+ enable_openssl=$enableval,enable_openssl="auto") - --if test "$enable_openssl" = "yes" ; then -- AC_CHECK_HEADERS(openssl/ssl.h) -- AC_CHECK_LIB(ssl,SSL_CTX_new,[EXOSIP_LIB="$EXOSIP_LIB -lssl"]) -- AC_CHECK_LIB(crypto,X509_get_issuer_name,[EXOSIP_LIB="$EXOSIP_LIB -lcrypto"]) --fi -+AS_IF([test "$enable_openssl" = "yes" -o "$enable_openssl" = "auto"], -+ [PKG_CHECK_MODULES([SSL], [openssl], -+ [EXOSIP_LIB="$EXOSIP_LIB $SSL_LIBS"], -+ [AS_IF([test "$enable_openssl" = "yes"], -+ [AC_MSG_ERROR([can not find openssl])]) -+ ]) -+ ]) - - AC_ARG_ENABLE(srvrec, - [ --enable-srvrec enable support for SRV records DNS queries (yes) ], -diff -durN build/libeXosip2-3.6.0.orig/Makefile.am build/libeXosip2-3.6.0/Makefile.am ---- libeXosip2-3.6.0.orig/Makefile.am 2014-06-23 00:14:25.328226745 +0200 -+++ libeXosip2-3.6.0/Makefile.am 2014-06-23 00:14:38.296371236 +0200 -@@ -1,4 +1,4 @@ -- -+ACLOCAL_AMFLAGS = -I scripts - EXTRA_DIST = README autogen.sh - - SUBDIRS = scripts platform src include tools help diff --git a/package.bak/libeXosip2/Config.in b/package.bak/libeXosip2/Config.in deleted file mode 100644 index 4cb8218f20..0000000000 --- a/package.bak/libeXosip2/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBEXOSIP2 - bool "libeXosip2" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBOSIP2 - help - eXosip is a library that hides the complexity of using the - SIP protocol for mutlimedia session establishement. - This protocol is mainly to be used by VoIP telephony - applications (endpoints or conference server) but might be - also usefull for any application that wish to establish - sessions like multiplayer games. - eXosip is based in libosip. - - http://savannah.nongnu.org/projects/exosip/ diff --git a/package.bak/libeXosip2/libeXosip2.hash b/package.bak/libeXosip2/libeXosip2.hash deleted file mode 100644 index 1f16994b0f..0000000000 --- a/package.bak/libeXosip2/libeXosip2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 91da1a084c9ab663afe04b493342e075ad59ac54a1af011c7f2ba4543a923564 libeXosip2-3.6.0.tar.gz diff --git a/package.bak/libeXosip2/libeXosip2.mk b/package.bak/libeXosip2/libeXosip2.mk deleted file mode 100644 index d101f95478..0000000000 --- a/package.bak/libeXosip2/libeXosip2.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# libexosip2 -# -################################################################################ - -LIBEXOSIP2_VERSION = 3.6.0 -LIBEXOSIP2_SITE = http://download.savannah.gnu.org/releases/exosip -LIBEXOSIP2_INSTALL_STAGING = YES -LIBEXOSIP2_LICENSE = GPLv2+ -LIBEXOSIP2_LICENSE_FILES = COPYING - -LIBEXOSIP2_DEPENDENCIES = host-pkgconf libosip2 - -# We are touching configure.in and Makefile.am with one of our patches -LIBEXOSIP2_AUTORECONF = YES - -ifeq ($(BR2_arc),y) -# toolchain __arc__ define conflicts with libeXosip2 source -LIBEXOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" -endif - -ifeq ($(BR2_PACKAGE_C_ARES),y) -LIBEXOSIP2_DEPENDENCIES += c-ares -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBEXOSIP2_DEPENDENCIES += openssl -LIBEXOSIP2_CONF_OPTS += --enable-openssl -else -LIBEXOSIP2_CONF_OPTS += --disable-openssl -endif - -LIBEXOSIP2_CONF_OPTS += \ - --enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no) - -$(eval $(autotools-package)) diff --git a/package.bak/libebml/Config.in b/package.bak/libebml/Config.in deleted file mode 100644 index a00b894358..0000000000 --- a/package.bak/libebml/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBEBML - bool "libebml" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - help - Access library for the EBML (Extensible Binary Meta - Language, a binary derivative of XML) format. - - http://matroska.org - -comment "libebml needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package.bak/libebml/libebml.hash b/package.bak/libebml/libebml.hash deleted file mode 100644 index 5abc1ebfb0..0000000000 --- a/package.bak/libebml/libebml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 35fb44daa41961f94a0ac1b8f06801e88cc9bf2ad6f562ced8ab7c1f1a875499 libebml-1.3.3.tar.bz2 diff --git a/package.bak/libebml/libebml.mk b/package.bak/libebml/libebml.mk deleted file mode 100644 index 36c8a5c7c2..0000000000 --- a/package.bak/libebml/libebml.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libebml -# -################################################################################ - -LIBEBML_VERSION = 1.3.3 -LIBEBML_SOURCE = libebml-$(LIBEBML_VERSION).tar.bz2 -LIBEBML_SITE = http://dl.matroska.org/downloads/libebml -LIBEBML_INSTALL_STAGING = YES -LIBEBML_LICENSE = LGPLv2.1+ -LIBEBML_LICENSE_FILES = LICENSE.LGPL - -$(eval $(autotools-package)) diff --git a/package.bak/libebur128/Config.in b/package.bak/libebur128/Config.in deleted file mode 100644 index 1a6a74363f..0000000000 --- a/package.bak/libebur128/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBEBUR128 - bool "libebur128" - # build system has no support to disable shared linking - # leading to a build error with a static-only toolchain - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_SPEEX - help - libebur128 is a library that implements the EBU R 128 standard - for loudness normalization. - - https://github.com/jiixyj/libebur128 - -comment "libebur128 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libebur128/libebur128.mk b/package.bak/libebur128/libebur128.mk deleted file mode 100644 index f5ada311f7..0000000000 --- a/package.bak/libebur128/libebur128.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libebur128 -# -################################################################################ - -LIBEBUR128_VERSION = v1.1.0 -LIBEBUR128_SITE = $(call github,jiixyj,libebur128,$(LIBEBUR128_VERSION)) -LIBEBUR128_LICENSE = MIT -LIBEBUR128_LICENSE_FILES = COPYING -LIBEBUR128_INSTALL_STAGING = YES -LIBEBUR128_DEPENDENCIES = speex - -$(eval $(cmake-package)) diff --git a/package.bak/libedit/0001-check-bsd-functions-in-libbsd.patch b/package.bak/libedit/0001-check-bsd-functions-in-libbsd.patch deleted file mode 100644 index de452a5c24..0000000000 --- a/package.bak/libedit/0001-check-bsd-functions-in-libbsd.patch +++ /dev/null @@ -1,20 +0,0 @@ -configure: on Linux, the BSD functions require linking against libbsd - -Signed-off-by: "Yann E. MORIN" -(Rebased against 20150325-3.1) -Signed-off-by: Bernd Kuhls - -diff -durN libedit-20130712-3.1.orig/configure.ac libedit-20130712-3.1/configure.ac ---- libedit-20130712-3.1.orig/configure.ac 2013-07-12 20:39:22.000000000 +0200 -+++ libedit-20130712-3.1/configure.ac 2013-07-28 23:35:35.012676469 +0200 -@@ -117,6 +117,10 @@ - #AC_FUNC_REALLOC - AC_TYPE_SIGNAL - AC_FUNC_STAT -+ -+# Search for libbsd for *vis functions -+AC_CHECK_LIB([bsd], [vis]) -+ - AC_CHECK_FUNCS([endpwent isascii memchr memset re_comp regcomp strcasecmp strchr strcspn strdup strerror strrchr strstr strtol issetugid wcsdup strlcpy strlcat fgetln vis strvis strunvis __secure_getenv secure_getenv]) - - # strlcpy diff --git a/package.bak/libedit/Config.in b/package.bak/libedit/Config.in deleted file mode 100644 index 7c850145e7..0000000000 --- a/package.bak/libedit/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_LIBEDIT - bool "libedit" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - The editline library (from BSD) provides generic line editing - and history functions. It slightly resembles GNU readline. - - The official homepage is at: - http://ftp.netbsd.org/pub/NetBSD/NetBSD-release-5-0/src/lib/libedit/ - - Jess Thrysoee maintains an autotoolified package, which we use - in Buildroot as it makes it much simpler than using the upstream - sources which require pmake. - - http://www.thrysoee.dk/editline - -comment "libedit needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/libedit/libedit.hash b/package.bak/libedit/libedit.hash deleted file mode 100644 index 4bfb8afce8..0000000000 --- a/package.bak/libedit/libedit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c88a5e4af83c5f40dda8455886ac98923a9c33125699742603a88a0253fcc8c5 libedit-20150325-3.1.tar.gz diff --git a/package.bak/libedit/libedit.mk b/package.bak/libedit/libedit.mk deleted file mode 100644 index e7ddd1fcb5..0000000000 --- a/package.bak/libedit/libedit.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# libedit -# -################################################################################ - -LIBEDIT_VERSION = 20150325-3.1 -LIBEDIT_SITE = http://www.thrysoee.dk/editline -LIBEDIT_INSTALL_STAGING = YES -LIBEDIT_DEPENDENCIES = ncurses -LIBEDIT_LICENSE = BSD-3c -LIBEDIT_LICENSE_FILES = COPYING - -# We're patching configure.ac -LIBEDIT_AUTORECONF = YES - -# Needed for autoreconf to work properly -define LIBEDIT_FIXUP_M4_DIR - mkdir $(@D)/m4 -endef -LIBEDIT_POST_EXTRACT_HOOKS += LIBEDIT_FIXUP_M4_DIR - -# Doesn't really support !wchar, but support is disabled otherwise -LIBEDIT_CONF_OPTS += --enable-widec - -# musl is ISO 10646 compliant but doesn't define __STDC_ISO_10646__, -# so let's define it manually -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LIBEDIT_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -D__STDC_ISO_10646__=201103L" -endif - -# Note: libbsd required for *vis functions, but works only with a toolchain -# with __progname; otherwise, some features are disabled, as if libbsd was -# missing entirely. -ifeq ($(BR2_PACKAGE_LIBBSD),y) -LIBEDIT_DEPENDENCIES += libbsd -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libee/Config.in b/package.bak/libee/Config.in deleted file mode 100644 index 9a3411ef29..0000000000 --- a/package.bak/libee/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBEE - bool "libee" - select BR2_PACKAGE_LIBESTR - help - An Event Expression Library inspired by CEE. - - CEE is an upcoming standard used to describe network - events in a number of normalized formats. It's goal is - to unify they currently many different representations - that exist in the industry. - - The core idea of libee is to provide a small but hopefully - convenient API layer above the CEE standard. However, CEE - is not finished. At the time of this writing, CEE is under - heavy development and even some of its core data structures - (like the data dictionary and taxonmy) have not been fully - specified. - - http://www.libee.org diff --git a/package.bak/libee/libee.hash b/package.bak/libee/libee.hash deleted file mode 100644 index b70242aa29..0000000000 --- a/package.bak/libee/libee.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.libee.org/download/libee-0-4-1/ -md5 7bbf4160876c12db6193c06e2badedb2 libee-0.4.1.tar.gz diff --git a/package.bak/libee/libee.mk b/package.bak/libee/libee.mk deleted file mode 100644 index 23441bc11c..0000000000 --- a/package.bak/libee/libee.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libee -# -################################################################################ - -LIBEE_VERSION = 0.4.1 -LIBEE_SITE = http://www.libee.org/download/files/download -LIBEE_LICENSE = LGPLv2.1+ -LIBEE_LICENSE_FILES = COPYING -LIBEE_DEPENDENCIES = libestr host-pkgconf -LIBEE_INSTALL_STAGING = YES - -LIBEE_MAKE = $(MAKE1) - -$(eval $(autotools-package)) diff --git a/package.bak/libenca/Config.in b/package.bak/libenca/Config.in deleted file mode 100644 index 5e951ed835..0000000000 --- a/package.bak/libenca/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBENCA - bool "libenca" - help - Extremely Naive Charset Analyser - - http://cihar.com/software/enca/ diff --git a/package.bak/libenca/libenca.hash b/package.bak/libenca/libenca.hash deleted file mode 100644 index 1a03c8fa46..0000000000 --- a/package.bak/libenca/libenca.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3a487eca40b41021e2e4b7a6440b97d822e6532db5464471f572ecf77295e8b8 enca-1.19.tar.xz diff --git a/package.bak/libenca/libenca.mk b/package.bak/libenca/libenca.mk deleted file mode 100644 index b87427a35c..0000000000 --- a/package.bak/libenca/libenca.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libenca -# -################################################################################ - -LIBENCA_VERSION = 1.19 -LIBENCA_SITE = http://dl.cihar.com/enca -LIBENCA_SOURCE = enca-$(LIBENCA_VERSION).tar.xz -LIBENCA_INSTALL_STAGING = YES -LIBENCA_LICENSE = GPLv2 -LIBENCA_LICENSE_FILES = COPYING -LIBENCA_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -LIBENCA_CONF_ENV += \ - ac_cv_file__dev_random=yes \ - ac_cv_file__dev_urandom=yes \ - ac_cv_file__dev_arandom=no \ - ac_cv_file__dev_srandom=no - -define LIBENCA_MAKE_HOST_TOOL - $(MAKE) -C $(@D)/tools $(HOST_CONFIGURE_OPTS) make_hash -endef - -LIBENCA_PRE_BUILD_HOOKS += LIBENCA_MAKE_HOST_TOOL - -$(eval $(autotools-package)) diff --git a/package.bak/libepoxy/0001-select-platforms-based-on-configuration-results.patch b/package.bak/libepoxy/0001-select-platforms-based-on-configuration-results.patch deleted file mode 100644 index e3a7b4995c..0000000000 --- a/package.bak/libepoxy/0001-select-platforms-based-on-configuration-results.patch +++ /dev/null @@ -1,125 +0,0 @@ -From 7eff2bf8e27599c1c94217b2bb1b73d4b7d18e59 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 6 May 2015 10:45:22 +0200 -Subject: [PATCH 1/4] select platforms based on configuration results -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas Müller -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 13 +++++-------- - src/dispatch_common.c | 9 ++++++--- - src/dispatch_common.h | 9 +++++---- - 3 files changed, 16 insertions(+), 15 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2d67726..225ab73 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,10 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -+PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+ -+AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -+ - has_znow=yes - - case $host_os in -@@ -86,7 +90,7 @@ case $host_os in - ;; - *) - build_egl=yes -- build_glx=yes -+ build_glx=$x11 - build_wgl=no - # On platforms with dlopen, we load everything dynamically and - # don't link against a specific window system or GL implementation. -@@ -144,13 +148,6 @@ esac - - AC_SUBST([VISIBILITY_CFLAGS]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) --if test x$x11 = xno -a x$build_glx = xyes; then -- AC_MSG_ERROR([libX11 headers (libx11-dev) required to build with GLX support]) --fi -- --AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -- - PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) - - AC_CONFIG_FILES([ -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index 013027f..163d348 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -656,10 +656,13 @@ epoxy_get_proc_address(const char *name) - #elif defined(__APPLE__) - return epoxy_gl_dlsym(name); - #else -+#if PLATFORM_HAS_GLX - if (epoxy_current_context_is_glx()) { - return glXGetProcAddressARB((const GLubyte *)name); -- } else { -+ } else -+#endif /* PLATFORM_HAS_GLX */ - #if PLATFORM_HAS_EGL -+ { - GLenum egl_api = epoxy_egl_get_current_gl_context_api(); - - switch (egl_api) { -@@ -669,10 +672,10 @@ epoxy_get_proc_address(const char *name) - case EGL_NONE: - break; - } --#endif - } -+#endif /* PLATFORM_HAS_EGL */ - errx(1, "Couldn't find current GLX or EGL context.\n"); --#endif -+#endif /* _WIN32 | __APPLE__*/ - } - - WRAPPER_VISIBILITY (void) -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 676a4d5..2728b45 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -21,12 +21,13 @@ - * IN THE SOFTWARE. - */ - -+#include - #include - - #ifdef _WIN32 - #define PLATFORM_HAS_EGL 0 - #define PLATFORM_HAS_GLX 0 --#define PLATFORM_HAS_WGL 1 -+#define PLATFORM_HAS_WGL BUILD_WGL - #define EPOXY_IMPORTEXPORT __declspec(dllexport) - #elif defined(__APPLE__) - #define PLATFORM_HAS_EGL 0 -@@ -34,13 +35,13 @@ - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #elif defined(ANDROID) --#define PLATFORM_HAS_EGL 1 -+#define PLATFORM_HAS_EGL BUILD_EGL - #define PLATFORM_HAS_GLX 0 - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #else --#define PLATFORM_HAS_EGL 1 --#define PLATFORM_HAS_GLX 1 -+#define PLATFORM_HAS_EGL BUILD_EGL -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #endif - diff --git a/package.bak/libepoxy/0002-add-an-option-to-disable-glx-support.patch b/package.bak/libepoxy/0002-add-an-option-to-disable-glx-support.patch deleted file mode 100644 index a81547de1c..0000000000 --- a/package.bak/libepoxy/0002-add-an-option-to-disable-glx-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a9efde0fb2678cd26bdf26d256732d97ded0c595 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Wed, 6 May 2015 11:05:48 +0200 -Subject: [PATCH 2/4] add an option to disable glx support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -this option would help us in yocto to get deterministic build results - -Signed-off-by: Andreas Müller -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 225ab73..d3d947c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,7 +58,14 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - --PKG_CHECK_MODULES(X11, [x11], [x11=yes], [x11=no]) -+AC_ARG_ENABLE([glx], -+ [AS_HELP_STRING([--disable-glx], -+ [disable if you don't want x11/glx support])], -+ [], -+ [enable_glx=yes] -+ ) -+ -+PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no]) - - AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) - - diff --git a/package.bak/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch b/package.bak/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch deleted file mode 100644 index 5b0d4fece2..0000000000 --- a/package.bak/libepoxy/0003-make-enable-glx-actually-work-on-osx-and-windows.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 902ea1eb073187603ec2eda4d2a146bef96592d4 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Mon, 18 Jan 2016 10:08:44 -0800 -Subject: [PATCH 3/4] Make --enable-glx actually work on OSX and Windows - -Followup for anholt/libepoxy#52 - -Signed-off-by: Jeremy Huddleston Sequoia -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 6 +++--- - src/dispatch_common.h | 4 ++-- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d3d947c..b4c7ede 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -61,7 +61,7 @@ XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - AC_ARG_ENABLE([glx], - [AS_HELP_STRING([--disable-glx], - [disable if you don't want x11/glx support])], -- [], -+ [enable_glx=$enableval], - [enable_glx=yes] - ) - -@@ -74,7 +74,7 @@ has_znow=yes - case $host_os in - mingw*) - build_egl=no -- build_glx=no -+ build_glx=$x11 - build_wgl=yes - # On windows, the DLL has to have all of its functions - # resolved at link time, so we have to link directly aginst -@@ -89,7 +89,7 @@ case $host_os in - ;; - darwin*) - build_egl=no -- build_glx=no -+ build_glx=$x11 - build_wgl=no - build_apple=yes - has_znow=no -diff --git a/src/dispatch_common.h b/src/dispatch_common.h -index 2728b45..c30ce44 100644 ---- a/src/dispatch_common.h -+++ b/src/dispatch_common.h -@@ -26,12 +26,12 @@ - - #ifdef _WIN32 - #define PLATFORM_HAS_EGL 0 --#define PLATFORM_HAS_GLX 0 -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL BUILD_WGL - #define EPOXY_IMPORTEXPORT __declspec(dllexport) - #elif defined(__APPLE__) - #define PLATFORM_HAS_EGL 0 --#define PLATFORM_HAS_GLX 0 -+#define PLATFORM_HAS_GLX BUILD_GLX - #define PLATFORM_HAS_WGL 0 - #define EPOXY_IMPORTEXPORT - #elif defined(ANDROID) - diff --git a/package.bak/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch b/package.bak/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch deleted file mode 100644 index be9b009f5c..0000000000 --- a/package.bak/libepoxy/0004-darwin-use-glx-instead-of-opengl-framework.patch +++ /dev/null @@ -1,95 +0,0 @@ -From d010922282580a32dfebcda12ee1c307b3ef6005 Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia -Date: Mon, 18 Jan 2016 09:49:55 -0800 -Subject: [PATCH 4/4] darwin: Use GLX instead of OpenGL.framework if it is the - current context - -Also makes a stab at similar support for Win32 - -anholt/libepoxy#63 - -Signed-off-by: Jeremy Huddleston Sequoia -Fetched from pull #81 on github for libepoxy: -https://github.com/anholt/libepoxy/pull/81/commits -Signed-off-by: Gustavo Zacarias ---- - src/dispatch_common.c | 29 ++++++++++++++++------------- - 1 file changed, 16 insertions(+), 13 deletions(-) - -diff --git a/src/dispatch_common.c b/src/dispatch_common.c -index 163d348..cb9f76a 100644 ---- a/src/dispatch_common.c -+++ b/src/dispatch_common.c -@@ -482,16 +482,20 @@ epoxy_glx_dlsym(const char *name) - void * - epoxy_gl_dlsym(const char *name) - { --#ifdef _WIN32 -+#if defined(_WIN32) || defined(__APPLE__) -+if (!epoxy_current_context_is_glx()) { -+# if defined(_WIN32) - return do_dlsym(&api.gl_handle, "OPENGL32", name, true); --#elif defined(__APPLE__) -+# elif defined(__APPLE__) - return do_dlsym(&api.gl_handle, - "/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", - name, true); --#else -+# endif -+} -+#endif -+ - /* There's no library for desktop GL support independent of GLX. */ - return epoxy_glx_dlsym(name); --#endif - } - - void * -@@ -615,7 +619,7 @@ epoxy_get_bootstrap_proc_address(const char *name) - */ - #if PLATFORM_HAS_GLX - if (api.glx_handle && glXGetCurrentContext()) -- return epoxy_gl_dlsym(name); -+ return epoxy_glx_dlsym(name); - #endif - - /* If epoxy hasn't loaded any API-specific library yet, try to -@@ -644,22 +648,17 @@ epoxy_get_bootstrap_proc_address(const char *name) - } - #endif /* PLATFORM_HAS_EGL */ - -- /* Fall back to GLX */ -+ /* Fall back to the platform default */ - return epoxy_gl_dlsym(name); - } - - void * - epoxy_get_proc_address(const char *name) - { --#ifdef _WIN32 -- return wglGetProcAddress(name); --#elif defined(__APPLE__) -- return epoxy_gl_dlsym(name); --#else - #if PLATFORM_HAS_GLX - if (epoxy_current_context_is_glx()) { - return glXGetProcAddressARB((const GLubyte *)name); -- } else -+ } - #endif /* PLATFORM_HAS_GLX */ - #if PLATFORM_HAS_EGL - { -@@ -674,8 +673,12 @@ epoxy_get_proc_address(const char *name) - } - } - #endif /* PLATFORM_HAS_EGL */ -+#if defined(_WIN32) -+ return wglGetProcAddress(name); -+#elif defined(__APPLE__) -+ return epoxy_gl_dlsym(name); -+#endif - errx(1, "Couldn't find current GLX or EGL context.\n"); --#endif /* _WIN32 | __APPLE__*/ - } - - WRAPPER_VISIBILITY (void) diff --git a/package.bak/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch b/package.bak/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch deleted file mode 100644 index d13f01def5..0000000000 --- a/package.bak/libepoxy/0005-Forward-egl-cflags-into-epoxy.pc.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 68e5f1574758240aedfe8653d7aaae62cdb08bf5 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 20 Dec 2015 10:07:06 -0300 -Subject: [PATCH] Forward egl cflags into epoxy.pc - -When building mesa egl without x11 and gles2 the headers need a -MESA_EGL_NO_X11_HEADERS define, so put them in epoxy.pc as well since -otherwise builds will fail. - -Signed-off-by: Gustavo Zacarias ---- -Status: pull request https://github.com/anholt/libepoxy/pull/80 - - configure.ac | 2 ++ - epoxy.pc.in | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c7cffb2..7b599de 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -102,6 +102,8 @@ if test x$build_egl = xyes; then - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - fi - -+AC_SUBST(EGL_CFLAGS) -+ - PKG_CHECK_MODULES(GL, [gl], [gl=yes], [gl=no]) - if test x$gl = xno; then - build_glx=no -diff --git a/epoxy.pc.in b/epoxy.pc.in -index 8c85a33..f377da5 100644 ---- a/epoxy.pc.in -+++ b/epoxy.pc.in -@@ -6,6 +6,6 @@ includedir=@includedir@ - Name: epoxy - Description: epoxy GL dispatch Library - Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} -+Cflags: -I${includedir} @EGL_CFLAGS@ - Libs: -L${libdir} -lepoxy - Libs.private: @DLOPEN_LIBS@ --- -2.4.10 - diff --git a/package.bak/libepoxy/0006-Make-egl-conditional.patch b/package.bak/libepoxy/0006-Make-egl-conditional.patch deleted file mode 100644 index 752e8e4fb9..0000000000 --- a/package.bak/libepoxy/0006-Make-egl-conditional.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 5492e81f317e48141b0687ad77252c52c2dfcd6d Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 5 Feb 2016 19:03:39 -0300 -Subject: [PATCH] Make egl conditional - -Mesa can be built with GLX and without EGL support, so make this -possible in epoxy as well. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6e56599..21e3a25 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,13 @@ AC_CHECK_HEADER([KHR/khrplatform.h], - # uintptr_t to a void *") by default. Kill that. - XORG_TESTSET_CFLAG(CWARNFLAGS, [-Wno-int-conversion]) - -+AC_ARG_ENABLE([egl], -+ [AS_HELP_STRING([--disable-egl], -+ [disable if you don't want egl support])], -+ [enable_egl=$enableval], -+ [enable_egl=yes] -+ ) -+ - AC_ARG_ENABLE([glx], - [AS_HELP_STRING([--disable-glx], - [disable if you don't want x11/glx support])], -@@ -65,6 +72,7 @@ AC_ARG_ENABLE([glx], - [enable_glx=yes] - ) - -+PKG_CHECK_MODULES(EGL, [egl], [egl=$enable_egl], [egl=no]) - PKG_CHECK_MODULES(X11, [x11], [x11=$enable_glx], [x11=no]) - - AM_CONDITIONAL(HAVE_X11, test x$x11 = xyes) -@@ -96,7 +104,7 @@ case $host_os in - EPOXY_LINK_LIBS="" - ;; - *) -- build_egl=yes -+ build_egl=$egl - build_glx=$x11 - build_wgl=no - # On platforms with dlopen, we load everything dynamically and -@@ -109,7 +117,6 @@ AC_SUBST(EPOXY_LINK_LIBS) - - AM_CONDITIONAL(BUILD_EGL, test x$build_egl = xyes) - if test x$build_egl = xyes; then -- PKG_CHECK_MODULES(EGL, [egl]) - AC_DEFINE([BUILD_EGL], [1], [build EGL tests]) - fi - --- -2.4.10 - diff --git a/package.bak/libepoxy/Config.in b/package.bak/libepoxy/Config.in deleted file mode 100644 index c87366afd0..0000000000 --- a/package.bak/libepoxy/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBEPOXY - bool "libepoxy" - select BR2_PACKAGE_XUTIL_UTIL_MACROS - depends on BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBGL - help - Epoxy is a library for handling OpenGL function pointer - management for you. - - https://github.com/anholt/libepoxy - -comment "libepoxy needs an OpenGL and/or OpenGL EGL backend" - depends on !BR2_PACKAGE_HAS_LIBEGL && !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/libepoxy/libepoxy.hash b/package.bak/libepoxy/libepoxy.hash deleted file mode 100644 index cb35cd4020..0000000000 --- a/package.bak/libepoxy/libepoxy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6700ddedffb827b42c72cce1e0be6fba67b678b19bf256e1b5efd3ea38cc2bb4 libepoxy-v1.3.1.tar.gz diff --git a/package.bak/libepoxy/libepoxy.mk b/package.bak/libepoxy/libepoxy.mk deleted file mode 100644 index 1dd583e3ed..0000000000 --- a/package.bak/libepoxy/libepoxy.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libepoxy -# -################################################################################ - -LIBEPOXY_VERSION = v1.3.1 -LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION)) -LIBEPOXY_INSTALL_STAGING = YES -# For patches 0001-0006: -LIBEPOXY_AUTORECONF = YES -LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros -LIBEPOXY_LICENSE = MIT -LIBEPOXY_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -LIBEPOXY_CONF_OPTS += --enable-egl -LIBEPOXY_DEPENDENCIES += libegl -else -LIBEPOXY_CONF_OPTS += --disable-egl -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_XLIB_LIBX11),yy) -LIBEPOXY_CONF_OPTS += --enable-glx -LIBEPOXY_DEPENDENCIES += libgl xlib_libX11 -else -LIBEPOXY_CONF_OPTS += --disable-glx -endif - -$(eval $(autotools-package)) diff --git a/package.bak/liberation/Config.in b/package.bak/liberation/Config.in deleted file mode 100644 index b68166f638..0000000000 --- a/package.bak/liberation/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBERATION - bool "Liberation (Free fonts)" - help - The Liberation Fonts are intended to be replacements for the - three most commonly used fonts on Microsoft systems: - Times New Roman, Arial, and Courier New. - -if BR2_PACKAGE_LIBERATION - -config BR2_PACKAGE_LIBERATION_MONO - bool "mono fonts" - default y - -config BR2_PACKAGE_LIBERATION_SANS - bool "sans fonts" - default y - -config BR2_PACKAGE_LIBERATION_SERIF - bool "serif fonts" - default y - -endif diff --git a/package.bak/liberation/liberation.hash b/package.bak/liberation/liberation.hash deleted file mode 100644 index 34328803b6..0000000000 --- a/package.bak/liberation/liberation.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504 liberation-fonts-ttf-2.00.1.tar.gz diff --git a/package.bak/liberation/liberation.mk b/package.bak/liberation/liberation.mk deleted file mode 100644 index dfed086f6a..0000000000 --- a/package.bak/liberation/liberation.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# liberation -# -################################################################################ - -LIBERATION_VERSION = 2.00.1 -LIBERATION_SITE = http://www.fedorahosted.org/releases/l/i/liberation-fonts -LIBERATION_SOURCE = liberation-fonts-ttf-$(LIBERATION_VERSION).tar.gz -LIBERATION_TARGET_DIR = $(TARGET_DIR)/usr/share/fonts/liberation -LIBERATION_LICENSE = OFLv1.1 -LIBERATION_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_LIBERATION_MONO),y) -define LIBERATION_INSTALL_MONO - $(INSTALL) -m 644 $(@D)/LiberationMono*.ttf $(LIBERATION_TARGET_DIR) -endef -endif - -ifeq ($(BR2_PACKAGE_LIBERATION_SANS),y) -define LIBERATION_INSTALL_SANS - $(INSTALL) -m 644 $(@D)/LiberationSans*.ttf $(LIBERATION_TARGET_DIR) -endef -endif - -ifeq ($(BR2_PACKAGE_LIBERATION_SERIF),y) -define LIBERATION_INSTALL_SERIF - $(INSTALL) -m 644 $(@D)/LiberationSerif*.ttf $(LIBERATION_TARGET_DIR) -endef -endif - -define LIBERATION_INSTALL_TARGET_CMDS - mkdir -p $(LIBERATION_TARGET_DIR) - $(LIBERATION_INSTALL_MONO) - $(LIBERATION_INSTALL_SANS) - $(LIBERATION_INSTALL_SERIF) -endef - -$(eval $(generic-package)) diff --git a/package.bak/libesmtp/Config.in b/package.bak/libesmtp/Config.in deleted file mode 100644 index ba9d52751c..0000000000 --- a/package.bak/libesmtp/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBESMTP - bool "libesmtp" - depends on !BR2_STATIC_LIBS - help - Library for sending emails through SMTP. - - http://www.stafford.uklinux.net/libesmtp - -comment "libesmtp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libesmtp/libesmtp.hash b/package.bak/libesmtp/libesmtp.hash deleted file mode 100644 index c9c0fa303e..0000000000 --- a/package.bak/libesmtp/libesmtp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d0a61a5c52d99fa7ce7d00ed0a07e341dbda67101dbed1ab0cdae3f37db4eb0b libesmtp-1.0.6.tar.bz2 diff --git a/package.bak/libesmtp/libesmtp.mk b/package.bak/libesmtp/libesmtp.mk deleted file mode 100644 index cad2e27da6..0000000000 --- a/package.bak/libesmtp/libesmtp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libesmtp -# -################################################################################ - -LIBESMTP_VERSION = 1.0.6 -LIBESMTP_SOURCE = libesmtp-$(LIBESMTP_VERSION).tar.bz2 -LIBESMTP_SITE = http://www.stafford.uklinux.net/libesmtp -LIBESMTP_INSTALL_STAGING = YES -LIBESMTP_CONFIG_SCRIPTS = libesmtp-config -LIBESMTP_DEPENDENCIES = $(if $(BR2_PACKAGE_OPENSSL),openssl) -LIBESMTP_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library) -LIBESMTP_LICENSE_FILES = COPYING COPYING.LIB - -$(eval $(autotools-package)) diff --git a/package.bak/libestr/Config.in b/package.bak/libestr/Config.in deleted file mode 100644 index b1ca2a5473..0000000000 --- a/package.bak/libestr/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBESTR - bool "libestr" - help - Some essentials for string handling (and a bit more) - - http://libestr.adiscon.com/ diff --git a/package.bak/libestr/libestr.hash b/package.bak/libestr/libestr.hash deleted file mode 100644 index e37cbb13c2..0000000000 --- a/package.bak/libestr/libestr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://libestr.adiscon.com/download/libestr-0-1-10/ -sha256 bd655e126e750edd18544b88eb1568d200a424a0c23f665eb14bbece07ac703c libestr-0.1.10.tar.gz diff --git a/package.bak/libestr/libestr.mk b/package.bak/libestr/libestr.mk deleted file mode 100644 index e9783d335f..0000000000 --- a/package.bak/libestr/libestr.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libestr -# -################################################################################ - -LIBESTR_VERSION = 0.1.10 -LIBESTR_SITE = http://libestr.adiscon.com/files/download -LIBESTR_LICENSE = LGPLv2.1+ -LIBESTR_LICENSE_FILES = COPYING -LIBESTR_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libev/Config.in b/package.bak/libev/Config.in deleted file mode 100644 index db8d263df0..0000000000 --- a/package.bak/libev/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBEV - bool "libev" - # needs memory fences - depends on !BR2_bfin - help - Userspace library for handling asynchronous notifications - - http://software.schmorp.de/pkg/libev.html diff --git a/package.bak/libev/libev.hash b/package.bak/libev/libev.hash deleted file mode 100644 index 7f029df7fa..0000000000 --- a/package.bak/libev/libev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 736079e8ac543c74d59af73f9c52737b3bfec9601f020bf25a87a4f4d0f01bd6 libev-4.22.tar.gz diff --git a/package.bak/libev/libev.mk b/package.bak/libev/libev.mk deleted file mode 100644 index 02bc72cba2..0000000000 --- a/package.bak/libev/libev.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libev -# -################################################################################ - -LIBEV_VERSION = 4.22 -LIBEV_SITE = http://dist.schmorp.de/libev -LIBEV_INSTALL_STAGING = YES -LIBEV_LICENSE = BSD-2c or GPLv2+ -LIBEV_LICENSE_FILES = LICENSE - -# The 'compatibility' event.h header conflicts with libevent -# It's completely unnecessary for BR packages so remove it -define LIBEV_DISABLE_EVENT_H_INSTALL - $(SED) 's/ event.h//' $(@D)/Makefile.in -endef -LIBEV_POST_PATCH_HOOKS += LIBEV_DISABLE_EVENT_H_INSTALL - -$(eval $(autotools-package)) diff --git a/package.bak/libevdev/0001-configure-add-disable-runtime-tests-option.patch b/package.bak/libevdev/0001-configure-add-disable-runtime-tests-option.patch deleted file mode 100644 index 6a829175c3..0000000000 --- a/package.bak/libevdev/0001-configure-add-disable-runtime-tests-option.patch +++ /dev/null @@ -1,51 +0,0 @@ -From fe965061b4306e3ca811ff86dc1ca29f7db9af18 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sun, 11 Oct 2015 13:33:19 +0200 -Subject: [PATCH] configure: add '--disable-runtime-tests' option - -Signed-off-by: Peter Seiderer ---- - configure.ac | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c1a9111..8fe7b8b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,13 +76,20 @@ else - AC_MSG_WARN([check not found - skipping building unit tests]) - fi - AM_CONDITIONAL(HAVE_VALGRIND, [test "x$VALGRIND" != "x"]) --AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x$HAVE_CHECK" = "xyes"]) -+ -+AC_ARG_ENABLE([runtime-tests], -+ AS_HELP_STRING([--disable-runtime-tests], [Disable runtime tests])) -+AS_IF([test "x$enable_runtime_tests" != "xno"], -+ [enable_runtime_tests=yes], -+ [enable_runtime_tests=no]) -+ -+AM_CONDITIONAL(ENABLE_RUNTIME_TESTS, [test "x${enable_runtime_tests}x$HAVE_CHECK" = "xyesxyes"]) - AM_CONDITIONAL(ENABLE_STATIC_LINK_TEST, [test "x$enable_static" = "xyes"]) - - AC_ARG_ENABLE([test-run], - AS_HELP_STRING([--enable-test-run], [For internal use only]), - [run_tests="$enableval"], [run_tests="yes"]) --AM_CONDITIONAL(RUN_TESTS, [test "x$run_tests" = "xyes"]) -+AM_CONDITIONAL(RUN_TESTS, [test "x${enable_runtime_tests}x$run_tests" = "xyesxyes"]) - - with_cflags="" - if test "x$GCC" = "xyes"; then -@@ -167,8 +174,8 @@ AC_MSG_RESULT([ - Libdir ${libdir} - - Build documentation ${have_doxygen} -- Enable unit-tests ${HAVE_CHECK} -- Run unit-tests ${run_tests} -+ Enable unit-tests ${HAVE_CHECK} (runtime-tests: ${enable_runtime_tests}) -+ Run unit-tests ${run_tests} (runtime-tests: ${enable_runtime_tests}) - Enable profiling ${enable_gcov} - Static library symbol check ${static_symbol_leaks_test} - ]) --- -2.11.0 - diff --git a/package.bak/libevdev/Config.in b/package.bak/libevdev/Config.in deleted file mode 100644 index 91dd9db6f7..0000000000 --- a/package.bak/libevdev/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBEVDEV - bool "libevdev" - help - libevdev is a wrapper library for evdev devices - - http://freedesktop.org/wiki/Software/libevdev/ diff --git a/package.bak/libevdev/libevdev.hash b/package.bak/libevdev/libevdev.hash deleted file mode 100644 index 613866cfb6..0000000000 --- a/package.bak/libevdev/libevdev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from https://lists.freedesktop.org/archives/input-tools/2017-January/001380.html -sha256 ecec7e9d66b1d3692f10b3b20aa97fb25e874a784c5552a7b1698091fef5a688 libevdev-1.5.6.tar.xz diff --git a/package.bak/libevdev/libevdev.mk b/package.bak/libevdev/libevdev.mk deleted file mode 100644 index 01ee7fbaae..0000000000 --- a/package.bak/libevdev/libevdev.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libevdev -# -################################################################################ - -LIBEVDEV_VERSION = 1.5.6 -LIBEVDEV_SITE = http://www.freedesktop.org/software/libevdev -LIBEVDEV_SOURCE = libevdev-$(LIBEVDEV_VERSION).tar.xz -LIBEVDEV_LICENSE = X11 -LIBEVDEV_LICENSE_FILES = COPYING - -# patch touches configure.ac -LIBEVDEV_AUTORECONF = YES - -# Uses PKG_CHECK_MODULES() in configure.ac -LIBEVDEV_DEPENDENCIES = host-pkgconf - -LIBEVDEV_INSTALL_STAGING = YES - -LIBEVDEV_CONF_OPTS += --disable-runtime-tests - -$(eval $(autotools-package)) diff --git a/package.bak/libevent/0001-Disable-building-test-programs.patch b/package.bak/libevent/0001-Disable-building-test-programs.patch deleted file mode 100644 index a1ce774640..0000000000 --- a/package.bak/libevent/0001-Disable-building-test-programs.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4b5a135fa681e85eb6988a379f59f3c7a41cc48c Mon Sep 17 00:00:00 2001 -From: Gilles Talis -Date: Fri, 21 Jun 2013 15:25:11 -0700 -Subject: [PATCH 1/2] Disable building test programs - -We are not really interested in building test programs. -Moreover, these programs use fork() function that is -not available on MMU-less architectures. - -Signed-off-by: Gilles Talis -[aduskett@gmail.com: Updated for 2.1.8] -Signed-off-by: Adam Duskett ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 42879a3..dc90359 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -144,7 +144,6 @@ - BUILT_SOURCES = - include include/include.am - include sample/include.am --include test/include.am - - if BUILD_WIN32 - --- -2.1.1 - diff --git a/package.bak/libevent/Config.in b/package.bak/libevent/Config.in deleted file mode 100644 index c32f29e5b0..0000000000 --- a/package.bak/libevent/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBEVENT - bool "libevent" - help - Userspace library for handling asynchronous notifications - - http://libevent.org diff --git a/package.bak/libevent/libevent.hash b/package.bak/libevent/libevent.hash deleted file mode 100644 index 21381c87b3..0000000000 --- a/package.bak/libevent/libevent.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed -md5 f3eeaed018542963b7d2416ef1135ecc libevent-2.1.8-stable.tar.gz -sha1 2a1b8bb7a262d3fd0ed6a080a20991a6eed675ec libevent-2.1.8-stable.tar.gz diff --git a/package.bak/libevent/libevent.mk b/package.bak/libevent/libevent.mk deleted file mode 100644 index 5458ce316a..0000000000 --- a/package.bak/libevent/libevent.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# libevent -# -################################################################################ - -LIBEVENT_VERSION = 2.1.8-stable -LIBEVENT_SITE = https://github.com/libevent/libevent/releases/download/release-$(LIBEVENT_VERSION) -LIBEVENT_INSTALL_STAGING = YES -LIBEVENT_LICENSE = BSD-3c, OpenBSD -LIBEVENT_LICENSE_FILES = LICENSE -# For 0001-Disable-building-test-programs.patch -LIBEVENT_AUTORECONF = YES -LIBEVENT_CONF_OPTS = --disable-samples - -define LIBEVENT_REMOVE_PYSCRIPT - rm $(TARGET_DIR)/usr/bin/event_rpcgen.py -endef - -# libevent installs a python script to target - get rid of it if we -# don't have python support enabled -ifneq ($(BR2_PACKAGE_PYTHON),y) -LIBEVENT_POST_INSTALL_TARGET_HOOKS += LIBEVENT_REMOVE_PYSCRIPT -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBEVENT_DEPENDENCIES += host-pkgconf openssl -LIBEVENT_CONF_OPTS += --enable-openssl -else -LIBEVENT_CONF_OPTS += --disable-openssl -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libexif/Config.in b/package.bak/libexif/Config.in deleted file mode 100644 index 8a38b477b8..0000000000 --- a/package.bak/libexif/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBEXIF - bool "libexif" - help - Most digital cameras produce EXIF files, which are JPEG - files with extra tags that contain information about the - image. The EXIF library allows you to parse an EXIF file - and read the data from those tags. - - http://libexif.sf.net diff --git a/package.bak/libexif/libexif.hash b/package.bak/libexif/libexif.hash deleted file mode 100644 index cf1b4d7c45..0000000000 --- a/package.bak/libexif/libexif.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a libexif-0.6.21.tar.bz2 diff --git a/package.bak/libexif/libexif.mk b/package.bak/libexif/libexif.mk deleted file mode 100644 index a71c117334..0000000000 --- a/package.bak/libexif/libexif.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libexif -# -################################################################################ - -LIBEXIF_VERSION = 0.6.21 -LIBEXIF_SOURCE = libexif-$(LIBEXIF_VERSION).tar.bz2 -LIBEXIF_SITE = http://downloads.sourceforge.net/project/libexif/libexif/$(LIBEXIF_VERSION) -LIBEXIF_INSTALL_STAGING = YES -LIBEXIF_DEPENDENCIES = host-pkgconf -LIBEXIF_LICENSE = LGPLv2.1+ -LIBEXIF_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libfastjson/0001-m4-fix-detection-of-atomics.patch b/package.bak/libfastjson/0001-m4-fix-detection-of-atomics.patch deleted file mode 100644 index 1fdbf1923f..0000000000 --- a/package.bak/libfastjson/0001-m4-fix-detection-of-atomics.patch +++ /dev/null @@ -1,86 +0,0 @@ -From df087711cf7be55268a55e7820f4d928cb34c078 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 9 Jul 2016 20:44:36 +0200 -Subject: [PATCH] m4: fix detection of atomics - -In cross-compilation, it is impossible to run code at configure time to -detect the target specifics. - -As such, AC_TRY_RUN fails miserably to detect reliably that atomic -intrisics are present in a toolchain, and decides they are not just -because this is cross-compilation. - -Instead of AC_TRY_RUN, use AC_LINK_IFELSE that does not need to actually -run code, since all we're interested in is whether the intrisics are -present (or not). Fix both the 32- and 64-bit variants, even if the -latter is not used currently. - -Fixes build failures detected by the Buildroot autobuilders, like: - http://autobuild.buildroot.org/results/23a/23ac0e742ed3a70ae4d038f8c9eadc23e708f671/build-end.log - http://autobuild.buildroot.org/results/192/1923d0b570adba494f83747a9610ea6ec35f5223/build-end.log - -and many other cases, espcially on architectures where such intrisics are -present, but where the toolchain does not have threads (and anyway, it -is much more efficient to use the intrisics rather than use mutexes). - -Signed-off-by: "Yann E. MORIN" ---- -Patch sent upstream: - https://github.com/rsyslog/libfastjson/pull/109 - ---- - m4/atomic_operations.m4 | 6 ++---- - m4/atomic_operations_64bit.m4 | 6 ++---- - 2 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/m4/atomic_operations.m4 b/m4/atomic_operations.m4 -index ad0ee60..7d2bca6 100644 ---- a/m4/atomic_operations.m4 -+++ b/m4/atomic_operations.m4 -@@ -9,9 +9,7 @@ - # - AC_DEFUN([RS_ATOMIC_OPERATIONS], - [AC_CACHE_CHECK([whether the compiler provides atomic builtins], [ap_cv_atomic_builtins], --[AC_TRY_RUN([ --int main() --{ -+[AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ - unsigned long val = 1010, tmp, *mem = &val; - - if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020) -@@ -44,7 +42,7 @@ int main() - return 1; - - return 0; --}], [ap_cv_atomic_builtins=yes], [ap_cv_atomic_builtins=no], [ap_cv_atomic_builtins=no])]) -+]])], [ap_cv_atomic_builtins=yes], [ap_cv_atomic_builtins=no])]) - - if test "$ap_cv_atomic_builtins" = "yes"; then - AC_DEFINE(HAVE_ATOMIC_BUILTINS, 1, [Define if compiler provides atomic builtins]) -diff --git a/m4/atomic_operations_64bit.m4 b/m4/atomic_operations_64bit.m4 -index 9fbef0a..d01a977 100644 ---- a/m4/atomic_operations_64bit.m4 -+++ b/m4/atomic_operations_64bit.m4 -@@ -9,9 +9,7 @@ - # - AC_DEFUN([RS_ATOMIC_OPERATIONS_64BIT], - [AC_CACHE_CHECK([whether the compiler provides atomic builtins for 64 bit data types], [ap_cv_atomic_builtins_64], --[AC_TRY_RUN([ --int main() --{ -+[AC_LINK_IFELSE([AC_LANG_PROGRAM([], [[ - unsigned long long val = 1010, tmp, *mem = &val; - - if (__sync_fetch_and_add(&val, 1010) != 1010 || val != 2020) -@@ -44,7 +42,7 @@ int main() - return 1; - - return 0; --}], [ap_cv_atomic_builtins_64=yes], [ap_cv_atomic_builtins_64=no], [ap_cv_atomic_builtins_64=no])]) -+]])], [ap_cv_atomic_builtins_64=yes], [ap_cv_atomic_builtins_64=no])]) - - if test "$ap_cv_atomic_builtins_64" = "yes"; then - AC_DEFINE(HAVE_ATOMIC_BUILTINS64, 1, [Define if compiler provides 64 bit atomic builtins]) --- -2.7.4 - diff --git a/package.bak/libfastjson/Config.in b/package.bak/libfastjson/Config.in deleted file mode 100644 index fbc9b1d68a..0000000000 --- a/package.bak/libfastjson/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBFASTJSON - bool "libfastjson" - # uses the __sync_*_4 intrisics, or pthreads to emulate atomicity - depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS - help - Libfastjson - A fast json library for C - - Libfastjson is a fork from json-c. The aim of this project - is not to provide a slightly modified clone of json-c. - Its aim is to provide: - - - a small library with essential json handling functions - - sufficiently good json support (not 100% standards compliant) - - be very fast in processing - - https://github.com/rsyslog/libfastjson/ diff --git a/package.bak/libfastjson/libfastjson.hash b/package.bak/libfastjson/libfastjson.hash deleted file mode 100644 index 427db9c702..0000000000 --- a/package.bak/libfastjson/libfastjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 03ef63dcc88417e71c19ce4436804159e3397e3a20d3529efef6a43c3bef5c8d libfastjson-v0.99.4.tar.gz diff --git a/package.bak/libfastjson/libfastjson.mk b/package.bak/libfastjson/libfastjson.mk deleted file mode 100644 index b1cdd6a158..0000000000 --- a/package.bak/libfastjson/libfastjson.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libfastjson -# -################################################################################ - -LIBFASTJSON_VERSION = v0.99.4 -LIBFASTJSON_SITE = $(call github,rsyslog,libfastjson,$(LIBFASTJSON_VERSION)) -LIBFASTJSON_INSTALL_STAGING = YES -# From git -LIBFASTJSON_AUTORECONF = YES -LIBFASTJSON_LICENSE = MIT -LIBFASTJSON_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libfcgi/0001-eof.patch b/package.bak/libfcgi/0001-eof.patch deleted file mode 100644 index e7314265a2..0000000000 --- a/package.bak/libfcgi/0001-eof.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] fix build with C++ support and gcc >= 4.4 - -EOF is defined in stdio, so ensure it is included. - -Based on similar patch by Markus Rothe: -http://comments.gmane.org/gmane.comp.web.fastcgi.devel/3205 - -Signed-off-by: Peter Korsgaard ---- - libfcgi/fcgio.cpp | 1 + - 1 file changed, 1 insertion(+) - -Index: fcgi-2.4.0/libfcgi/fcgio.cpp -=================================================================== ---- fcgi-2.4.0.orig/libfcgi/fcgio.cpp -+++ fcgi-2.4.0/libfcgi/fcgio.cpp -@@ -22,6 +22,7 @@ - #define DLLAPI __declspec(dllexport) - #endif - -+#include - #include - #include "fcgio.h" - diff --git a/package.bak/libfcgi/0002-link-against-libfcgi-la.patch b/package.bak/libfcgi/0002-link-against-libfcgi-la.patch deleted file mode 100644 index 8a5973ac5b..0000000000 --- a/package.bak/libfcgi/0002-link-against-libfcgi-la.patch +++ /dev/null @@ -1,20 +0,0 @@ -Properly link libfcgi++ against libfcgi - -We cannot directly use -lfcgi to link libfcgi++ against libfcgi, -because libfcgi is not installed at this time. Instead, we should rely -on libtool doing the right thing, by specifying libfcgi.la in -libfcgi++ LIBADD variable. - -Signed-off-by: Thomas Petazzoni - -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -23,5 +23,6 @@ - $(INCLUDEDIR)/fcgio.h \ - fcgio.cpp - libfcgi___la_CFLAGS = @PTHREAD_CFLAGS@ --libfcgi___la_LDFLAGS = -lfcgi -rpath @libdir@ -+libfcgi___la_LIBADD = libfcgi.la -+libfcgi___la_LDFLAGS = -rpath @libdir@ diff --git a/package.bak/libfcgi/0003-link-against-math.patch b/package.bak/libfcgi/0003-link-against-math.patch deleted file mode 100644 index c60c6d50ce..0000000000 --- a/package.bak/libfcgi/0003-link-against-math.patch +++ /dev/null @@ -1,16 +0,0 @@ -Link libfcgi against the math library. - -Signed-off-by: Thomas Claveirole - -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -18,6 +18,7 @@ - os_@SYSTEM@.c - libfcgi_la_CC = @PTHREAD_CC@ - libfcgi_la_CFLAGS = @PTHREAD_CFLAGS@ -+libfcgi_la_LIBADD = -lm - - libfcgi___la_SOURCES = $(INCLUDE_FILES) \ - $(INCLUDEDIR)/fcgio.h \ diff --git a/package.bak/libfcgi/0004-make-autoreconfable.patch b/package.bak/libfcgi/0004-make-autoreconfable.patch deleted file mode 100644 index e255fc6d3b..0000000000 --- a/package.bak/libfcgi/0004-make-autoreconfable.patch +++ /dev/null @@ -1,67 +0,0 @@ -Make the package autoreconfigurable - -Adjust minor details in Makefile.am and configure.in in order to make -the package compatible with the autoconf/automake versions we are -using in Buildroot. - -Signed-off-by: Thomas Petazzoni - -Index: b/cgi-fcgi/Makefile.am -=================================================================== ---- a/cgi-fcgi/Makefile.am -+++ b/cgi-fcgi/Makefile.am -@@ -2,7 +2,7 @@ - bin_PROGRAMS = cgi-fcgi - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -4,12 +4,13 @@ - dnl generate the file "configure", which is run during the build - dnl to configure the system for the local environment. - --AC_INIT --AM_INIT_AUTOMAKE(fcgi, 2.4.0) -+AC_INIT([fcgi], [2.4.0]) -+AM_INIT_AUTOMAKE([foreign]) - - AM_CONFIG_HEADER(fcgi_config.h) - - AC_PROG_CC -+AC_PROG_CC_C_O - AC_PROG_CPP - AC_PROG_INSTALL - AC_PROG_LIBTOOL -Index: b/examples/Makefile.am -=================================================================== ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -11,7 +11,7 @@ - EXTRA_PROGRAMS = threaded echo-cpp - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ -Index: b/libfcgi/Makefile.am -=================================================================== ---- a/libfcgi/Makefile.am -+++ b/libfcgi/Makefile.am -@@ -1,7 +1,7 @@ - # $Id: Makefile.am,v 1.9 2001/12/22 03:16:20 robs Exp $ - - INCLUDEDIR = ../include --CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include -+AM_CPPFLAGS = @CPPFLAGS@ -I$(top_srcdir)/include - - INCLUDE_FILES = $(INCLUDEDIR)/fastcgi.h \ - $(INCLUDEDIR)/fcgiapp.h \ diff --git a/package.bak/libfcgi/0005-disable-examples.patch b/package.bak/libfcgi/0005-disable-examples.patch deleted file mode 100644 index 4a9916f02a..0000000000 --- a/package.bak/libfcgi/0005-disable-examples.patch +++ /dev/null @@ -1,21 +0,0 @@ -Common subdirectories: libfcgi-2.4.0.orig/cgi-fcgi and libfcgi-2.4.0/cgi-fcgi -Common subdirectories: libfcgi-2.4.0.orig/doc and libfcgi-2.4.0/doc -Common subdirectories: libfcgi-2.4.0.orig/examples and libfcgi-2.4.0/examples -Common subdirectories: libfcgi-2.4.0.orig/images and libfcgi-2.4.0/images -Common subdirectories: libfcgi-2.4.0.orig/include and libfcgi-2.4.0/include -Common subdirectories: libfcgi-2.4.0.orig/java and libfcgi-2.4.0/java -Common subdirectories: libfcgi-2.4.0.orig/libfcgi and libfcgi-2.4.0/libfcgi -diff -du libfcgi-2.4.0.orig/Makefile.am libfcgi-2.4.0/Makefile.am ---- libfcgi-2.4.0.orig/Makefile.am 2001-12-22 14:05:39.000000000 +0100 -+++ libfcgi-2.4.0/Makefile.am 2014-07-19 16:56:21.935216540 +0200 -@@ -4,7 +4,7 @@ - # $Id: Makefile.am,v 1.7 2001/12/22 13:05:39 robs Exp $ - # - --SUBDIRS = libfcgi cgi-fcgi examples include -+SUBDIRS = libfcgi cgi-fcgi include - - include_HEADERS = fcgi_config.h - -Common subdirectories: libfcgi-2.4.0.orig/perl and libfcgi-2.4.0/perl -Common subdirectories: libfcgi-2.4.0.orig/Win32 and libfcgi-2.4.0/Win32 diff --git a/package.bak/libfcgi/0006-fix-CVE-2012-6687.patch b/package.bak/libfcgi/0006-fix-CVE-2012-6687.patch deleted file mode 100644 index 10d33ed58d..0000000000 --- a/package.bak/libfcgi/0006-fix-CVE-2012-6687.patch +++ /dev/null @@ -1,104 +0,0 @@ -libfcgi:add security patch for CVE-2012-6687 -CVE-2012-6687 - remote attackers cause a denial of service (crash) via a large number -of connections (http://www.cvedetails.com/cve/CVE-2012-6687/). -Fix:use poll in os_unix.c instead of select to avoid problem with > 1024 connections. -This patch libfcgi_2.4.0-8.3.debian.tar.xz is pulled from the below link: -(https://launchpad.net/ubuntu/+source/libfcgi/2.4.0-8.3) -The next release of libfcgi is 2.4.1 which may have this fix is yet to be released -officially. - -Signed-off-by: Anton Kortunov -Signed-off-by: Niranjan Reddy - -Index: b/libfcgi/os_unix.c -=================================================================== ---- a/libfcgi/os_unix.c -+++ b/libfcgi/os_unix.c -@@ -42,6 +42,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_NETDB_H - #include -@@ -103,6 +104,9 @@ - static int shutdownPending = FALSE; - static int shutdownNow = FALSE; - -+static int libfcgiOsClosePollTimeout = 2000; -+static int libfcgiIsAfUnixKeeperPollTimeout = 2000; -+ - void OS_ShutdownPending() - { - shutdownPending = TRUE; -@@ -168,6 +172,16 @@ - if(libInitialized) - return 0; - -+ char *libfcgiOsClosePollTimeoutStr = getenv( "LIBFCGI_OS_CLOSE_POLL_TIMEOUT" ); -+ if(libfcgiOsClosePollTimeoutStr) { -+ libfcgiOsClosePollTimeout = atoi(libfcgiOsClosePollTimeoutStr); -+ } -+ -+ char *libfcgiIsAfUnixKeeperPollTimeoutStr = getenv( "LIBFCGI_IS_AF_UNIX_KEEPER_POLL_TIMEOUT" ); -+ if(libfcgiIsAfUnixKeeperPollTimeoutStr) { -+ libfcgiIsAfUnixKeeperPollTimeout = atoi(libfcgiIsAfUnixKeeperPollTimeoutStr); -+ } -+ - asyncIoTable = (AioInfo *)malloc(asyncIoTableSize * sizeof(AioInfo)); - if(asyncIoTable == NULL) { - errno = ENOMEM; -@@ -755,19 +769,16 @@ - - if (shutdown(fd, 1) == 0) - { -- struct timeval tv; -- fd_set rfds; -+ struct pollfd pfd; - int rv; - char trash[1024]; - -- FD_ZERO(&rfds); -+ pfd.fd = fd; -+ pfd.events = POLLIN; - - do - { -- FD_SET(fd, &rfds); -- tv.tv_sec = 2; -- tv.tv_usec = 0; -- rv = select(fd + 1, &rfds, NULL, NULL, &tv); -+ rv = poll(&pfd, 1, libfcgiOsClosePollTimeout); - } - while (rv > 0 && read(fd, trash, sizeof(trash)) > 0); - } -@@ -1116,13 +1127,11 @@ - */ - static int is_af_unix_keeper(const int fd) - { -- struct timeval tval = { READABLE_UNIX_FD_DROP_DEAD_TIMEVAL }; -- fd_set read_fds; -- -- FD_ZERO(&read_fds); -- FD_SET(fd, &read_fds); -+ struct pollfd pfd; -+ pfd.fd = fd; -+ pfd.events = POLLIN; - -- return select(fd + 1, &read_fds, NULL, NULL, &tval) >= 0 && FD_ISSET(fd, &read_fds); -+ return poll(&pfd, 1, libfcgiIsAfUnixKeeperPollTimeout) >= 0 && (pfd.revents & POLLIN); - } - - /* - -Index: b/examples/Makefile.am -=================================================================== ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -34,5 +34,5 @@ threaded_CFLAGS = @PTHREAD_CFLAGS@ - threaded_LDFLAGS = @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ - - echo_cpp_SOURCES = $(INCLUDE_FILES) $(INCLUDEDIR)/fcgio.h echo-cpp.cpp --echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la -+echo_cpp_LDADD = $(LIBDIR)/libfcgi++.la $(LIBDIR)/libfcgi.la diff --git a/package.bak/libfcgi/Config.in b/package.bak/libfcgi/Config.in deleted file mode 100644 index 47ff8a2d13..0000000000 --- a/package.bak/libfcgi/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBFCGI - bool "libfcgi" - depends on BR2_USE_MMU # fork() - help - FCGI, a fastcgi developer library for C/C++ - - http://www.fastcgi.com/ diff --git a/package.bak/libfcgi/libfcgi.hash b/package.bak/libfcgi/libfcgi.hash deleted file mode 100644 index 586ff1e7ad..0000000000 --- a/package.bak/libfcgi/libfcgi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 66fc45c6b36a21bf2fbbb68e90f780cc21a9da1fffbae75e76d2b4402d3f05b9 fcgi-2.4.0.tar.gz diff --git a/package.bak/libfcgi/libfcgi.mk b/package.bak/libfcgi/libfcgi.mk deleted file mode 100644 index ced850c153..0000000000 --- a/package.bak/libfcgi/libfcgi.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libfcgi -# -################################################################################ - -LIBFCGI_VERSION = 2.4.0 -LIBFCGI_SOURCE = fcgi-$(LIBFCGI_VERSION).tar.gz -LIBFCGI_SITE = http://www.fastcgi.com/dist -LIBFCGI_LICENSE = fcgi license -LIBFCGI_LICENSE_FILES = LICENSE.TERMS -LIBFCGI_INSTALL_STAGING = YES -LIBFCGI_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libffi/0001-Fix-installation-location-of-libffi.patch b/package.bak/libffi/0001-Fix-installation-location-of-libffi.patch deleted file mode 100644 index 6ac9123730..0000000000 --- a/package.bak/libffi/0001-Fix-installation-location-of-libffi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 580f46a7bc6e9fea3a2227b5268cc3aed1d60e3b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 7 Feb 2013 22:26:56 +0100 -Subject: [PATCH] Fix installation location of libffi -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The libffi is currently declared as toolexeclib_LTLIBRARIES. In many -cases, toolexeclib libraries will be installed in /usr/lib, so it -doesn't make any difference. - -However, with multilib toolchains, they get installed in a -subdirectory of /usr/lib/. For example, with a Sourcery CodeBench -PowerPC toolchain, if the e500mc multilib variant is used, the libffi -library gets installed in /usr/lib/te500mc/. This is due to the -following code in the configure script: - - multi_os_directory=`$CC -print-multi-os-directory` - case $multi_os_directory in - .) ;; # Avoid trailing /. - *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;; - esac - -Once the library is installed in /usr/lib/te500mc/, nothing works -because this installation location is inconsistent with the -installation location declared in libffi.pc. - -So, instead of using this bizarre toolexeclib_LTLIBRARIES, simply use -the more standard lib_LTLIBRARIES, which ensures that the libffi -library is always installed in /usr/lib. - -Signed-off-by: Thomas Petazzoni -[unfuzz for 3.2.1] -Signed-off-by: Jörg Krause ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 0e40451..309474c 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -104,7 +104,7 @@ FLAGS_TO_PASS = $(AM_MAKEFLAGS) - - MAKEOVERRIDES= - --toolexeclib_LTLIBRARIES = libffi.la -+lib_LTLIBRARIES = libffi.la - noinst_LTLIBRARIES = libffi_convenience.la - - libffi_la_SOURCES = src/prep_cif.c src/types.c \ --- -2.5.3 - diff --git a/package.bak/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package.bak/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch deleted file mode 100644 index c19e395f90..0000000000 --- a/package.bak/libffi/0002-Fix-use-of-compact-eh-frames-on-MIPS.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 31b6b6bc14197cd4183bdbd311fddeb36b5ae100 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 19 Sep 2015 22:53:29 +0200 -Subject: [PATCH] Fix use of compact eh frames on MIPS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Newer MIPS toolchains use a different (compact) eh_frame format. -libffi don't like them, so we have to switch to the older format. - -This patch add -mno-compact-eh to CFLAGS when compiling for -Mips and compiler support it. - -Signed-off-by: Jérôme Pouiller -[unfuzz for 3.2.1] -Signed-off-by: Jörg Krause ---- - configure.ac | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/configure.ac b/configure.ac -index a7bf5ee..36cd0d4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -469,6 +469,16 @@ esac - AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1) - AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE) - -+if test x$TARGET = xMIPS; then -+ save_CFLAGS="$CFLAGS" -+ CFLAGS=-mno-compact-eh -+ AC_MSG_CHECKING([whether the C compiler needs -mno-compact-eh]) -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], -+ [AC_MSG_RESULT([yes])]; [save_CFLAGS="$save_CFLAGS -mno-compact-eh"], -+ [AC_MSG_RESULT([no])]) -+ CFLAGS="$save_CFLAGS" -+fi -+ - if test x$TARGET = xX86_64; then - AC_CACHE_CHECK([toolchain supports unwind section type], - libffi_cv_as_x86_64_unwind_section_type, [ --- -2.5.3 - diff --git a/package.bak/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch b/package.bak/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch deleted file mode 100644 index 776990df65..0000000000 --- a/package.bak/libffi/0003-libffi-enable-hardfloat-in-the-MIPS-assembly-code.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 48bc37fabbc685b1e3293055bd33ca66c619305e Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 13 Jan 2016 14:49:59 +0000 -Subject: [PATCH] libffi: enable hardfloat in the MIPS assembly code - -This way it will be possible to build it for soft-float. This is only a -temporary fix. The package needs to be fixed properly. - -Signed-off-by: Vicente Olivert Riera ---- - src/mips/n32.S | 1 + - src/mips/o32.S | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/mips/n32.S b/src/mips/n32.S -index c6985d3..dc842d5 100644 ---- a/src/mips/n32.S -+++ b/src/mips/n32.S -@@ -44,6 +44,7 @@ - .abicalls - #endif - .set mips4 -+ .set hardfloat - .text - .align 2 - .globl ffi_call_N32 -diff --git a/src/mips/o32.S b/src/mips/o32.S -index eb27981..b653daf 100644 ---- a/src/mips/o32.S -+++ b/src/mips/o32.S -@@ -42,6 +42,7 @@ - #define RA_OFF (SIZEOF_FRAME - 1 * FFI_SIZEOF_ARG) - - .abicalls -+ .set hardfloat - .text - .align 2 - .globl ffi_call_O32 --- -2.4.10 - diff --git a/package.bak/libffi/0004-m68k-support-ISA-A-Coldfire-CPUs.patch b/package.bak/libffi/0004-m68k-support-ISA-A-Coldfire-CPUs.patch deleted file mode 100644 index 9308c8951a..0000000000 --- a/package.bak/libffi/0004-m68k-support-ISA-A-Coldfire-CPUs.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 733bb188b898385cfb5ad28cc0e3ecaf38237350 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Sat, 20 Aug 2016 00:52:19 +0200 -Subject: [PATCH] m68k: support ISA-A Coldfire CPUs - -Fix compilation for m68k/coldfire CPUs like mcf5208. - -Signed-off-by: Waldemar Brodkorb -Signed-off-by: Thorsten Glaser ---- - src/m68k/sysv.S | 29 ++++++++++++++++++++++++++++- - 1 file changed, 28 insertions(+), 1 deletion(-) - -diff --git a/src/m68k/sysv.S b/src/m68k/sysv.S -index ec2b14f..ea40f11 100644 ---- a/src/m68k/sysv.S -+++ b/src/m68k/sysv.S -@@ -3,7 +3,7 @@ - sysv.S - Copyright (c) 2012 Alan Hourihane - Copyright (c) 1998, 2012 Andreas Schwab - Copyright (c) 2008 Red Hat, Inc. -- Copyright (c) 2012 Thorsten Glaser -+ Copyright (c) 2012, 2016 Thorsten Glaser - - m68k Foreign Function Interface - -@@ -72,6 +72,15 @@ CALLFUNC(ffi_call_SYSV): - pea 4(%sp) - #if !defined __PIC__ - jsr CALLFUNC(ffi_prep_args) -+#elif defined(__uClinux__) && defined(__ID_SHARED_LIBRARY__) -+ move.l _current_shared_library_a5_offset_(%a5),%a0 -+ move.l CALLFUNC(ffi_prep_args@GOT)(%a0),%a0 -+ jsr (%a0) -+#elif defined(__mcoldfire__) && !defined(__mcfisab__) && !defined(__mcfisac__) -+ move.l #_GLOBAL_OFFSET_TABLE_@GOTPC,%a0 -+ lea (-6,%pc,%a0),%a0 -+ move.l CALLFUNC(ffi_prep_args@GOT)(%a0),%a0 -+ jsr (%a0) - #else - bsr.l CALLFUNC(ffi_prep_args@PLTPC) - #endif -@@ -215,6 +224,15 @@ CALLFUNC(ffi_closure_SYSV): - move.l %a0,-(%sp) - #if !defined __PIC__ - jsr CALLFUNC(ffi_closure_SYSV_inner) -+#elif defined(__uClinux__) && defined(__ID_SHARED_LIBRARY__) -+ move.l _current_shared_library_a5_offset_(%a5),%a0 -+ move.l CALLFUNC(ffi_closure_SYSV_inner@GOT)(%a0),%a0 -+ jsr (%a0) -+#elif defined(__mcoldfire__) && !defined(__mcfisab__) && !defined(__mcfisac__) -+ move.l #_GLOBAL_OFFSET_TABLE_@GOTPC,%a0 -+ lea (-6,%pc,%a0),%a0 -+ move.l CALLFUNC(ffi_closure_SYSV_inner@GOT)(%a0),%a0 -+ jsr (%a0) - #else - bsr.l CALLFUNC(ffi_closure_SYSV_inner@PLTPC) - #endif -@@ -317,6 +335,15 @@ CALLFUNC(ffi_closure_struct_SYSV): - move.l %a0,-(%sp) - #if !defined __PIC__ - jsr CALLFUNC(ffi_closure_SYSV_inner) -+#elif defined(__uClinux__) && defined(__ID_SHARED_LIBRARY__) -+ move.l _current_shared_library_a5_offset_(%a5),%a0 -+ move.l CALLFUNC(ffi_closure_SYSV_inner@GOT)(%a0),%a0 -+ jsr (%a0) -+#elif defined(__mcoldfire__) && !defined(__mcfisab__) && !defined(__mcfisac__) -+ move.l #_GLOBAL_OFFSET_TABLE_@GOTPC,%a0 -+ lea (-6,%pc,%a0),%a0 -+ move.l CALLFUNC(ffi_closure_SYSV_inner@GOT)(%a0),%a0 -+ jsr (%a0) - #else - bsr.l CALLFUNC(ffi_closure_SYSV_inner@PLTPC) - #endif --- -1.7.10.4 - diff --git a/package.bak/libffi/Config.in b/package.bak/libffi/Config.in deleted file mode 100644 index 6edf570baf..0000000000 --- a/package.bak/libffi/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBFFI - bool "libffi" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The libffi library provides a portable, high level - programming interface to various calling conventions. This - allows a programmer to call any function specified by a call - interface description at run-time. - - http://sourceware.org/libffi/ - -comment "libffi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libffi/libffi.hash b/package.bak/libffi/libffi.hash deleted file mode 100644 index 63a9203f9b..0000000000 --- a/package.bak/libffi/libffi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From ftp://sourceware.org/pub/libffi/sha512.sum -sha512 980ca30a8d76f963fca722432b1fe5af77d7a4e4d2eac5144fbc5374d4c596609a293440573f4294207e1bdd9fda80ad1e1cafb2ffb543df5a275bc3bd546483 libffi-3.2.1.tar.gz diff --git a/package.bak/libffi/libffi.mk b/package.bak/libffi/libffi.mk deleted file mode 100644 index 38ef2d60d0..0000000000 --- a/package.bak/libffi/libffi.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# libffi -# -################################################################################ - -LIBFFI_VERSION = 3.2.1 -LIBFFI_SITE = ftp://sourceware.org/pub/libffi -LIBFFI_LICENSE = MIT -LIBFFI_LICENSE_FILES = LICENSE -LIBFFI_INSTALL_STAGING = YES -LIBFFI_AUTORECONF = YES - -# Move the headers to the usual location, and adjust the .pc file -# accordingly. -define LIBFFI_MOVE_HEADERS - mv $(1)/usr/lib/libffi-$(LIBFFI_VERSION)/include/*.h $(1)/usr/include/ - $(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \ - $(1)/usr/lib/pkgconfig/libffi.pc - rm -rf $(1)/usr/lib/libffi-* -endef - -LIBFFI_MOVE_STAGING_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(STAGING_DIR)) -LIBFFI_POST_INSTALL_STAGING_HOOKS += LIBFFI_MOVE_STAGING_HEADERS - -HOST_LIBFFI_MOVE_HOST_HEADERS = $(call LIBFFI_MOVE_HEADERS,$(HOST_DIR)) -HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_MOVE_HOST_HEADERS - -# Remove headers that are not at the usual location from the target -define LIBFFI_REMOVE_TARGET_HEADERS - $(RM) -rf $(TARGET_DIR)/usr/lib/libffi-$(LIBFFI_VERSION) -endef - -LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_REMOVE_TARGET_HEADERS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libfm-extra/Config.in b/package.bak/libfm-extra/Config.in deleted file mode 100644 index 79465f9750..0000000000 --- a/package.bak/libfm-extra/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBFM_EXTRA - bool "libfm-extra" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - The libfm-extra package contains a library and other files - required by menu-cache-gen libexec of menu-cache - - http://wiki.lxde.org/en/Libfm - -comment "libfm-extra needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libfm-extra/libfm-extra.hash b/package.bak/libfm-extra/libfm-extra.hash deleted file mode 100644 index 8a78adebb4..0000000000 --- a/package.bak/libfm-extra/libfm-extra.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 74997d75e7e87dc73398746fd373bf52 libfm-1.2.4.tar.xz -sha1 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d libfm-1.2.4.tar.xz diff --git a/package.bak/libfm-extra/libfm-extra.mk b/package.bak/libfm-extra/libfm-extra.mk deleted file mode 100644 index 0e7a7dc0a6..0000000000 --- a/package.bak/libfm-extra/libfm-extra.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libfm-extra -# -################################################################################ - -LIBFM_EXTRA_VERSION = 1.2.4 -LIBFM_EXTRA_SOURCE = libfm-$(LIBFM_EXTRA_VERSION).tar.xz -LIBFM_EXTRA_SITE = http://sourceforge.net/projects/pcmanfm/files -LIBFM_EXTRA_DEPENDENCIES = libglib2 host-intltool -LIBFM_EXTRA_LICENSE = GPLv2+, LGPLv2.1+ -LIBFM_EXTRA_LICENSE_FILES = COPYING src/extra/fm-xml-file.c -LIBFM_EXTRA_INSTALL_STAGING = YES -LIBFM_EXTRA_CONF_OPTS = --with-extra-only --with-gtk=no - -$(eval $(autotools-package)) diff --git a/package.bak/libfm/Config.in b/package.bak/libfm/Config.in deleted file mode 100644 index 0463d1c5d7..0000000000 --- a/package.bak/libfm/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_LIBFM - bool "libfm" - select BR2_PACKAGE_MENU_CACHE - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_CAIRO - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - help - A glib/gio-based library providing some file management - utilities and related-widgets missing in gtk+/glib. This is - the core of PCManFM. The library is desktop independent - (not LXDE specific) and has clean API. It can be used to - develop other applications requiring file management - functionality. For example, you can create your own file - manager with facilities provided by libfm. - - http://wiki.lxde.org/en/Libfm - -comment "libfm needs X.org and a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_XORG7 diff --git a/package.bak/libfm/libfm.hash b/package.bak/libfm/libfm.hash deleted file mode 100644 index 8a78adebb4..0000000000 --- a/package.bak/libfm/libfm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ -md5 74997d75e7e87dc73398746fd373bf52 libfm-1.2.4.tar.xz -sha1 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d libfm-1.2.4.tar.xz diff --git a/package.bak/libfm/libfm.mk b/package.bak/libfm/libfm.mk deleted file mode 100644 index 633a844d8d..0000000000 --- a/package.bak/libfm/libfm.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libfm -# -################################################################################ - -LIBFM_VERSION = 1.2.4 -LIBFM_SOURCE = libfm-$(LIBFM_VERSION).tar.xz -LIBFM_SITE = http://sourceforge.net/projects/pcmanfm/files -LIBFM_DEPENDENCIES = menu-cache libglib2 cairo -LIBFM_LICENSE = GPLv2+, LGPLv2.1+ -LIBFM_LICENSE_FILES = COPYING src/extra/fm-xml-file.c -LIBFM_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_LIBEXIF),y) -LIBFM_CONF_OPTS += --enable-exif -LIBFM_DEPENDENCIES += libexif -else -LIBFM_CONF_OPTS += --disable-exif -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBFM_CONF_OPTS += --with-gtk=3 -LIBFM_DEPENDENCIES += libgtk3 -else -LIBFM_CONF_OPTS += --with-gtk=2 -LIBFM_DEPENDENCIES += libgtk2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libfreefare/Config.in b/package.bak/libfreefare/Config.in deleted file mode 100644 index 2bb0c93ddf..0000000000 --- a/package.bak/libfreefare/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBFREEFARE - bool "libfreefare" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBNFC - help - Library for high level manipulation of MIFARE cards. - - http://nfc-tools.org/index.php?title=Libfreefare - -comment "libfreefare needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libfreefare/libfreefare.hash b/package.bak/libfreefare/libfreefare.hash deleted file mode 100644 index 4d231368b4..0000000000 --- a/package.bak/libfreefare/libfreefare.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-0.4.0/libfreefare-0.4.0.tar.bz2 -sha256 bfa31d14a99a1247f5ed49195d6373de512e3eb75bf1627658b40cf7f876bc64 libfreefare-0.4.0.tar.bz2 diff --git a/package.bak/libfreefare/libfreefare.mk b/package.bak/libfreefare/libfreefare.mk deleted file mode 100644 index e2d7bf1245..0000000000 --- a/package.bak/libfreefare/libfreefare.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libfreefare -# -################################################################################ - -LIBFREEFARE_VERSION = 0.4.0 -LIBFREEFARE_SOURCE = libfreefare-$(LIBFREEFARE_VERSION).tar.bz2 -# Do not use the github helper here, the generated tarball is *NOT* -# the same as the one uploaded by upstream for the release. -LIBFREEFARE_SITE = https://github.com/nfc-tools/libfreefare/releases/download/libfreefare-$(LIBFREEFARE_VERSION) -LIBFREEFARE_DEPENDENCIES = libnfc openssl -LIBFREEFARE_LICENSE = LGPLv3+ with exception -LIBFREEFARE_LICENSE_FILES = COPYING - -ifeq ($(BR2_STATIC_LIBS),y) -# openssl needs zlib even if the libfreefare example itself doesn't -LIBFREEFARE_CONF_ENV += LIBS='-lz' -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libfreeglut/Config.in b/package.bak/libfreeglut/Config.in deleted file mode 100644 index e09e7efe89..0000000000 --- a/package.bak/libfreeglut/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBFREEGLUT - bool "libfreeglut" - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXXF86VM - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_XORG7 - help - FreeGLUT is a free-software/open-source alternative to the - OpenGL Utility Toolkit (GLUT) library. GLUT (and hence - FreeGLUT) takes care of all the system-specific chores required - for creating windows, initializing OpenGL contexts, and - handling input events, to allow for trully portable OpenGL - programs. - - http://freeglut.sourceforge.net - -comment "libfreeglut depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/libfreeglut/libfreeglut.hash b/package.bak/libfreeglut/libfreeglut.hash deleted file mode 100644 index a69a0b41d1..0000000000 --- a/package.bak/libfreeglut/libfreeglut.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/freeglut/files/freeglut/3.0.0/ -sha1 fca52242f9344627a30f11487ee42002e6b0dacd freeglut-3.0.0.tar.gz diff --git a/package.bak/libfreeglut/libfreeglut.mk b/package.bak/libfreeglut/libfreeglut.mk deleted file mode 100644 index 507cb523ab..0000000000 --- a/package.bak/libfreeglut/libfreeglut.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libfreeglut -# -################################################################################ - -LIBFREEGLUT_VERSION = 3.0.0 -LIBFREEGLUT_SOURCE = freeglut-$(LIBFREEGLUT_VERSION).tar.gz -LIBFREEGLUT_SITE = http://downloads.sourceforge.net/freeglut -LIBFREEGLUT_LICENSE = MIT -LIBFREEGLUT_LICENSE_FILES = COPYING -LIBFREEGLUT_INSTALL_STAGING = YES -LIBFREEGLUT_DEPENDENCIES = \ - libgl \ - libglu \ - xlib_libXi \ - xlib_libXrandr \ - xlib_libXxf86vm - -LIBFREEGLUT_CONF_OPTS = -DFREEGLUT_BUILD_DEMOS=OFF - -# package depends on X.org which depends on !BR2_STATIC_LIBS -ifeq ($(BR2_SHARED_LIBS),y) -LIBFREEGLUT_CONF_OPTS += \ - -DFREEGLUT_BUILD_SHARED_LIBS=ON \ - -DFREEGLUT_BUILD_STATIC_LIBS=OFF -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LIBFREEGLUT_CONF_OPTS += \ - -DFREEGLUT_BUILD_SHARED_LIBS=ON \ - -DFREEGLUT_BUILD_STATIC_LIBS=ON -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libfreeimage/0001-no-root-install.patch b/package.bak/libfreeimage/0001-no-root-install.patch deleted file mode 100644 index 54756d8e9e..0000000000 --- a/package.bak/libfreeimage/0001-no-root-install.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile.gnu: allow non-root install by not enforcing root ownserhip - -Signed-off-by: Rémi Rérolle - -diff -ruN a/Makefile.gnu b/Makefile.gnu ---- a/Makefile.gnu 2015-04-09 16:34:02.315316841 +0200 -+++ b/Makefile.gnu 2015-04-09 16:34:28.875483201 +0200 -@@ -71,9 +71,9 @@ - - install: - install -d $(INCDIR) $(INSTALLDIR) -- install -m 644 -o root -g root $(HEADER) $(INCDIR) -- install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR) -- install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR) -+ install -m 644 $(HEADER) $(INCDIR) -+ install -m 644 $(STATICLIB) $(INSTALLDIR) -+ install -m 755 $(SHAREDLIB) $(INSTALLDIR) - ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME) - ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME) - # ldconfig diff --git a/package.bak/libfreeimage/0002-fix-cpuid-x86.patch b/package.bak/libfreeimage/0002-fix-cpuid-x86.patch deleted file mode 100644 index 98b0e9c6e3..0000000000 --- a/package.bak/libfreeimage/0002-fix-cpuid-x86.patch +++ /dev/null @@ -1,67 +0,0 @@ -Fix build issue caused by invalid register usage on x86 - -Patch taken from https://github.com/openexr/openexr/issues/128. - -Signed-off-by: Thomas Petazzoni - -Index: b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp -=================================================================== ---- a/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp -+++ b/Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp -@@ -40,21 +40,19 @@ - - namespace { - #if defined(IMF_HAVE_SSE2) && defined(__GNUC__) -- -+#include - // Helper functions for gcc + SSE enabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { -- __asm__ __volatile__ ( -- "cpuid" -- : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) -- : /* Input */ "a"(n) -- : /* Clobber */); -+ __get_cpuid(n, &eax, &ebx, &ecx, &edx); - } - - #else // IMF_HAVE_SSE2 && __GNUC__ - - // Helper functions for generic compiler - all disabled -- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx) -+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx, -+ unsigned int &ecx, unsigned int &edx) - { - eax = ebx = ecx = edx = 0; - } -@@ -64,7 +62,7 @@ - - #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - __asm__ __volatile__ ( - "xgetbv" -@@ -75,7 +73,7 @@ - - #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX - -- void xgetbv(int n, int &eax, int &edx) -+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx) - { - eax = edx = 0; - } -@@ -94,8 +92,8 @@ - f16c(false) - { - bool osxsave = false; -- int max = 0; -- int eax, ebx, ecx, edx; -+ unsigned int max = 0; -+ unsigned int eax, ebx, ecx, edx; - - cpuid(0, max, ebx, ecx, edx); - if (max > 0) diff --git a/package.bak/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch b/package.bak/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch deleted file mode 100644 index 6964827cca..0000000000 --- a/package.bak/libfreeimage/0003-LibWebP-fix-compilation-issue-with-GCC-5.x-C-11.patch +++ /dev/null @@ -1,1172 +0,0 @@ -From 44bce1b66c1cdd5308ac3ac773ea0a53d83790fd Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Tue, 24 Nov 2015 21:16:39 +0100 -Subject: [PATCH] LibWebP: fix compilation issue with GCC 5.x / C++11 - -GCC 5.1 / C++11 gets confused about the "#" in the inline assembly -code, and dies with errors like: - -Source/LibWebP/./src/dsp/dsp.upsampling_mips_dsp_r2.c:37:34: error: invalid -character ' ' in raw string delimiter - -Fix it by introducting white space around the string literals like it has -been done in upstream webp: - -https://chromium.googlesource.com/webm/libwebp/+/eebaf97f5a1cb713d81d311308d8a48c124e5aef - -Discussed upstream: -http://sourceforge.net/p/freeimage/discussion/36110/thread/605ef8e4/ - -[Scripted by sed -i 's/"\(#[A-Z0-9]*\)"/" \1 "/g' *.c] -Signed-off-by: Peter Korsgaard ---- - Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c | 28 +- - Source/LibWebP/src/dsp/dsp.enc_mips32.c | 314 ++++++++++----------- - Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c | 288 +++++++++---------- - Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c | 10 +- - Source/LibWebP/src/dsp/dsp.lossless_mips32.c | 34 +-- - Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c | 8 +- - .../LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c | 18 +- - Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c | 10 +- - 8 files changed, 355 insertions(+), 355 deletions(-) - -diff --git a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -index dac2c93..aaa8111 100644 ---- a/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.dec_mips_dsp_r2.c -@@ -548,10 +548,10 @@ static void SimpleVFilter16(uint8_t* p, int stride, int thresh) { - // TEMP3 = SRC[D + D1 * BPS] - #define LOAD_4_BYTES(TEMP0, TEMP1, TEMP2, TEMP3, \ - A, A1, B, B1, C, C1, D, D1, SRC) \ -- "lbu %["#TEMP0"], "#A"+"#A1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP1"], "#B"+"#B1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP2"], "#C"+"#C1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "lbu %["#TEMP3"], "#D"+"#D1"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -+ "lbu %[" #TEMP0 "], " #A "+" #A1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP1 "], " #B "+" #B1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP2 "], " #C "+" #C1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "lbu %[" #TEMP3 "], " #D "+" #D1 "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ - - static void SimpleHFilter16(uint8_t* p, int stride, int thresh) { - int i; -@@ -623,8 +623,8 @@ static void SimpleHFilter16i(uint8_t* p, int stride, int thresh) { - // DST[A * BPS] = TEMP0 - // DST[B + C * BPS] = TEMP1 - #define STORE_8_BYTES(TEMP0, TEMP1, A, B, C, DST) \ -- "usw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#DST"]) \n\t" \ -- "usw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#DST"]) \n\t" -+ "usw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #DST "]) \n\t" \ -+ "usw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #DST "]) \n\t" - - static void VE4(uint8_t* dst) { // vertical - const uint8_t* top = dst - BPS; -@@ -725,8 +725,8 @@ static void RD4(uint8_t* dst) { // Down-right - // TEMP0 = SRC[A * BPS] - // TEMP1 = SRC[B + C * BPS] - #define LOAD_8_BYTES(TEMP0, TEMP1, A, B, C, SRC) \ -- "ulw %["#TEMP0"], "#A"*"XSTR(BPS)"(%["#SRC"]) \n\t" \ -- "ulw %["#TEMP1"], "#B"+"#C"*"XSTR(BPS)"(%["#SRC"]) \n\t" -+ "ulw %[" #TEMP0 "], " #A "*"XSTR(BPS)"(%[" #SRC "]) \n\t" \ -+ "ulw %[" #TEMP1 "], " #B "+" #C "*"XSTR(BPS)"(%[" #SRC "]) \n\t" - - static void LD4(uint8_t* dst) { // Down-Left - int temp0, temp1, temp2, temp3, temp4; -@@ -873,24 +873,24 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - #define CLIPPING(SIZE) \ - "preceu.ph.qbl %[temp2], %[temp0] \n\t" \ - "preceu.ph.qbr %[temp0], %[temp0] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "preceu.ph.qbl %[temp3], %[temp1] \n\t" \ - "preceu.ph.qbr %[temp1], %[temp1] \n\t" \ - ".endif \n\t" \ - "addu.ph %[temp2], %[temp2], %[dst_1] \n\t" \ - "addu.ph %[temp0], %[temp0], %[dst_1] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "addu.ph %[temp3], %[temp3], %[dst_1] \n\t" \ - "addu.ph %[temp1], %[temp1], %[dst_1] \n\t" \ - ".endif \n\t" \ - "shll_s.ph %[temp2], %[temp2], 7 \n\t" \ - "shll_s.ph %[temp0], %[temp0], 7 \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "shll_s.ph %[temp3], %[temp3], 7 \n\t" \ - "shll_s.ph %[temp1], %[temp1], 7 \n\t" \ - ".endif \n\t" \ - "precrqu_s.qb.ph %[temp0], %[temp2], %[temp0] \n\t" \ --".if "#SIZE" == 8 \n\t" \ -+".if " #SIZE " == 8 \n\t" \ - "precrqu_s.qb.ph %[temp1], %[temp3], %[temp1] \n\t" \ - ".endif \n\t" - -@@ -899,7 +899,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - int dst_1 = ((int)(DST)[-1] << 16) + (DST)[-1]; \ - int temp0, temp1, temp2, temp3; \ - __asm__ volatile ( \ -- ".if "#SIZE" < 8 \n\t" \ -+ ".if " #SIZE " < 8 \n\t" \ - "ulw %[temp0], 0(%[top]) \n\t" \ - "subu.ph %[dst_1], %[dst_1], %[top_1] \n\t" \ - CLIPPING(4) \ -@@ -911,7 +911,7 @@ static void DC8uvNoTop(uint8_t* dst) { // DC with no top samples - CLIPPING(8) \ - "usw %[temp0], 0(%[dst]) \n\t" \ - "usw %[temp1], 4(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - "ulw %[temp0], 8(%[top]) \n\t" \ - "ulw %[temp1], 12(%[top]) \n\t" \ - CLIPPING(8) \ -diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips32.c b/Source/LibWebP/src/dsp/dsp.enc_mips32.c -index 545aa3a..bf1c16d 100644 ---- a/Source/LibWebP/src/dsp/dsp.enc_mips32.c -+++ b/Source/LibWebP/src/dsp/dsp.enc_mips32.c -@@ -31,26 +31,26 @@ static const int kC2 = 35468; - // TEMP0..TEMP3 - registers for corresponding tmp elements - // TEMP4..TEMP5 - temporary registers - #define VERTICAL_PASS(A, B, C, D, TEMP4, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lh %[temp16], "#A"(%[temp20]) \n\t" \ -- "lh %[temp18], "#B"(%[temp20]) \n\t" \ -- "lh %[temp17], "#C"(%[temp20]) \n\t" \ -- "lh %[temp19], "#D"(%[temp20]) \n\t" \ -- "addu %["#TEMP4"], %[temp16], %[temp18] \n\t" \ -+ "lh %[temp16], " #A "(%[temp20]) \n\t" \ -+ "lh %[temp18], " #B "(%[temp20]) \n\t" \ -+ "lh %[temp17], " #C "(%[temp20]) \n\t" \ -+ "lh %[temp19], " #D "(%[temp20]) \n\t" \ -+ "addu %[" #TEMP4 "], %[temp16], %[temp18] \n\t" \ - "subu %[temp16], %[temp16], %[temp18] \n\t" \ -- "mul %["#TEMP0"], %[temp17], %[kC2] \n\t" \ -+ "mul %[" #TEMP0 "], %[temp17], %[kC2] \n\t" \ - "mul %[temp18], %[temp19], %[kC1] \n\t" \ - "mul %[temp17], %[temp17], %[kC1] \n\t" \ - "mul %[temp19], %[temp19], %[kC2] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\n" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\n" \ - "sra %[temp18], %[temp18], 16 \n\n" \ - "sra %[temp17], %[temp17], 16 \n\n" \ - "sra %[temp19], %[temp19], 16 \n\n" \ -- "subu %["#TEMP2"], %["#TEMP0"], %[temp18] \n\t" \ -- "addu %["#TEMP3"], %[temp17], %[temp19] \n\t" \ -- "addu %["#TEMP0"], %["#TEMP4"], %["#TEMP3"] \n\t" \ -- "addu %["#TEMP1"], %[temp16], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP2"], %[temp16], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP3"], %["#TEMP4"], %["#TEMP3"] \n\t" -+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp18] \n\t" \ -+ "addu %[" #TEMP3 "], %[temp17], %[temp19] \n\t" \ -+ "addu %[" #TEMP0 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t" \ -+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp16], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP3 "], %[" #TEMP4 "], %[" #TEMP3 "] \n\t" - - // macro for one horizontal pass in ITransformOne - // MUL and STORE macros inlined -@@ -59,58 +59,58 @@ static const int kC2 = 35468; - // A - offset in bytes to load from ref and store to dst buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addiu %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "subu %[temp17], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP0"], %["#TEMP4"], %[kC2] \n\t" \ -- "mul %["#TEMP8"], %["#TEMP12"], %[kC1] \n\t" \ -- "mul %["#TEMP4"], %["#TEMP4"], %[kC1] \n\t" \ -- "mul %["#TEMP12"], %["#TEMP12"], %[kC2] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 16 \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "subu %[temp18], %["#TEMP0"], %["#TEMP8"] \n\t" \ -- "addu %[temp19], %["#TEMP4"], %["#TEMP12"] \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp19] \n\t" \ -- "addu %["#TEMP4"], %[temp17], %[temp18] \n\t" \ -- "subu %["#TEMP8"], %[temp17], %[temp18] \n\t" \ -- "subu %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -+ "addiu %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp17], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP0 "], %[" #TEMP4 "], %[kC2] \n\t" \ -+ "mul %[" #TEMP8 "], %[" #TEMP12 "], %[kC1] \n\t" \ -+ "mul %[" #TEMP4 "], %[" #TEMP4 "], %[kC1] \n\t" \ -+ "mul %[" #TEMP12 "], %[" #TEMP12 "], %[kC2] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 16 \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "subu %[temp18], %[" #TEMP0 "], %[" #TEMP8 "] \n\t" \ -+ "addu %[temp19], %[" #TEMP4 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[" #TEMP0 "], %[temp16], %[temp19] \n\t" \ -+ "addu %[" #TEMP4 "], %[temp17], %[temp18] \n\t" \ -+ "subu %[" #TEMP8 "], %[temp17], %[temp18] \n\t" \ -+ "subu %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ - "lw %[temp20], 0(%[args]) \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 3 \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 3 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 3 \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 3 \n\t" \ -- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp17], 1+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp18], 2+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%[temp20]) \n\t" \ -- "addu %["#TEMP0"], %[temp16], %["#TEMP0"] \n\t" \ -- "addu %["#TEMP4"], %[temp17], %["#TEMP4"] \n\t" \ -- "addu %["#TEMP8"], %[temp18], %["#TEMP8"] \n\t" \ -- "addu %["#TEMP12"], %[temp19], %["#TEMP12"] \n\t" \ -- "slt %[temp16], %["#TEMP0"], $zero \n\t" \ -- "slt %[temp17], %["#TEMP4"], $zero \n\t" \ -- "slt %[temp18], %["#TEMP8"], $zero \n\t" \ -- "slt %[temp19], %["#TEMP12"], $zero \n\t" \ -- "movn %["#TEMP0"], $zero, %[temp16] \n\t" \ -- "movn %["#TEMP4"], $zero, %[temp17] \n\t" \ -- "movn %["#TEMP8"], $zero, %[temp18] \n\t" \ -- "movn %["#TEMP12"], $zero, %[temp19] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 3 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 3 \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 3 \n\t" \ -+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp17], 1+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp18], 2+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[temp20]) \n\t" \ -+ "addu %[" #TEMP0 "], %[temp16], %[" #TEMP0 "] \n\t" \ -+ "addu %[" #TEMP4 "], %[temp17], %[" #TEMP4 "] \n\t" \ -+ "addu %[" #TEMP8 "], %[temp18], %[" #TEMP8 "] \n\t" \ -+ "addu %[" #TEMP12 "], %[temp19], %[" #TEMP12 "] \n\t" \ -+ "slt %[temp16], %[" #TEMP0 "], $zero \n\t" \ -+ "slt %[temp17], %[" #TEMP4 "], $zero \n\t" \ -+ "slt %[temp18], %[" #TEMP8 "], $zero \n\t" \ -+ "slt %[temp19], %[" #TEMP12 "], $zero \n\t" \ -+ "movn %[" #TEMP0 "], $zero, %[temp16] \n\t" \ -+ "movn %[" #TEMP4 "], $zero, %[temp17] \n\t" \ -+ "movn %[" #TEMP8 "], $zero, %[temp18] \n\t" \ -+ "movn %[" #TEMP12 "], $zero, %[temp19] \n\t" \ - "addiu %[temp20], $zero, 255 \n\t" \ -- "slt %[temp16], %["#TEMP0"], %[temp20] \n\t" \ -- "slt %[temp17], %["#TEMP4"], %[temp20] \n\t" \ -- "slt %[temp18], %["#TEMP8"], %[temp20] \n\t" \ -- "slt %[temp19], %["#TEMP12"], %[temp20] \n\t" \ -- "movz %["#TEMP0"], %[temp20], %[temp16] \n\t" \ -- "movz %["#TEMP4"], %[temp20], %[temp17] \n\t" \ -+ "slt %[temp16], %[" #TEMP0 "], %[temp20] \n\t" \ -+ "slt %[temp17], %[" #TEMP4 "], %[temp20] \n\t" \ -+ "slt %[temp18], %[" #TEMP8 "], %[temp20] \n\t" \ -+ "slt %[temp19], %[" #TEMP12 "], %[temp20] \n\t" \ -+ "movz %[" #TEMP0 "], %[temp20], %[temp16] \n\t" \ -+ "movz %[" #TEMP4 "], %[temp20], %[temp17] \n\t" \ - "lw %[temp16], 8(%[args]) \n\t" \ -- "movz %["#TEMP8"], %[temp20], %[temp18] \n\t" \ -- "movz %["#TEMP12"], %[temp20], %[temp19] \n\t" \ -- "sb %["#TEMP0"], 0+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP4"], 1+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP8"], 2+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" \ -- "sb %["#TEMP12"], 3+"XSTR(BPS)"*"#A"(%[temp16]) \n\t" -+ "movz %[" #TEMP8 "], %[temp20], %[temp18] \n\t" \ -+ "movz %[" #TEMP12 "], %[temp20], %[temp19] \n\t" \ -+ "sb %[" #TEMP0 "], 0+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP4 "], 1+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP8 "], 2+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" \ -+ "sb %[" #TEMP12 "], 3+"XSTR(BPS)"*" #A "(%[temp16]) \n\t" - - // Does one or two inverse transforms. - static WEBP_INLINE void ITransformOne(const uint8_t* ref, const int16_t* in, -@@ -161,9 +161,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - // K - offset in bytes (kZigzag[n] * 4) - // N - offset in bytes (n * 2) - #define QUANTIZE_ONE(J, K, N) \ -- "lh %[temp0], "#J"(%[ppin]) \n\t" \ -- "lhu %[temp1], "#J"(%[ppsharpen]) \n\t" \ -- "lw %[temp2], "#K"(%[ppzthresh]) \n\t" \ -+ "lh %[temp0], " #J "(%[ppin]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppsharpen]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppzthresh]) \n\t" \ - "sra %[sign], %[temp0], 15 \n\t" \ - "xor %[coeff], %[temp0], %[sign] \n\t" \ - "subu %[coeff], %[coeff], %[sign] \n\t" \ -@@ -172,9 +172,9 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - "addiu %[temp5], $zero, 0 \n\t" \ - "addiu %[level], $zero, 0 \n\t" \ - "beqz %[temp4], 2f \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -- "lhu %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ -+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \ - "mul %[level], %[coeff], %[temp1] \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ -@@ -184,8 +184,8 @@ static void ITransform(const uint8_t* ref, const int16_t* in, - "subu %[level], %[level], %[sign] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ - "2: \n\t" \ -- "sh %[temp5], "#J"(%[ppin]) \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" -+ "sh %[temp5], " #J "(%[ppin]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" - - static int QuantizeBlock(int16_t in[16], int16_t out[16], - const VP8Matrix* const mtx) { -@@ -254,14 +254,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // E..H - offsets in bytes to store first results to tmp buffer - // E1..H1 - offsets in bytes to store second results to tmp buffer - #define HORIZONTAL_PASS(A, E, F, G, H, E1, F1, G1, H1) \ -- "lbu %[temp0], 0+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp1], 1+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp2], 2+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp3], 3+"XSTR(BPS)"*"#A"(%[a]) \n\t" \ -- "lbu %[temp4], 0+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp5], 1+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp6], 2+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -- "lbu %[temp7], 3+"XSTR(BPS)"*"#A"(%[b]) \n\t" \ -+ "lbu %[temp0], 0+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp1], 1+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp2], 2+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp3], 3+"XSTR(BPS)"*" #A "(%[a]) \n\t" \ -+ "lbu %[temp4], 0+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp5], 1+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp6], 2+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ -+ "lbu %[temp7], 3+"XSTR(BPS)"*" #A "(%[b]) \n\t" \ - "addu %[temp8], %[temp0], %[temp2] \n\t" \ - "subu %[temp0], %[temp0], %[temp2] \n\t" \ - "addu %[temp2], %[temp1], %[temp3] \n\t" \ -@@ -278,14 +278,14 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - "subu %[temp3], %[temp3], %[temp6] \n\t" \ - "addu %[temp6], %[temp4], %[temp5] \n\t" \ - "subu %[temp4], %[temp4], %[temp5] \n\t" \ -- "sw %[temp7], "#E"(%[tmp]) \n\t" \ -- "sw %[temp2], "#H"(%[tmp]) \n\t" \ -- "sw %[temp8], "#F"(%[tmp]) \n\t" \ -- "sw %[temp0], "#G"(%[tmp]) \n\t" \ -- "sw %[temp1], "#E1"(%[tmp]) \n\t" \ -- "sw %[temp3], "#H1"(%[tmp]) \n\t" \ -- "sw %[temp6], "#F1"(%[tmp]) \n\t" \ -- "sw %[temp4], "#G1"(%[tmp]) \n\t" -+ "sw %[temp7], " #E "(%[tmp]) \n\t" \ -+ "sw %[temp2], " #H "(%[tmp]) \n\t" \ -+ "sw %[temp8], " #F "(%[tmp]) \n\t" \ -+ "sw %[temp0], " #G "(%[tmp]) \n\t" \ -+ "sw %[temp1], " #E1 "(%[tmp]) \n\t" \ -+ "sw %[temp3], " #H1 "(%[tmp]) \n\t" \ -+ "sw %[temp6], " #F1 "(%[tmp]) \n\t" \ -+ "sw %[temp4], " #G1 "(%[tmp]) \n\t" - - // macro for one vertical pass in Disto4x4 (TTransform) - // two calls of function TTransform are merged into single one -@@ -300,10 +300,10 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // A1..D1 - offsets in bytes to load second results from tmp buffer - // E..H - offsets in bytes to load from w buffer - #define VERTICAL_PASS(A, B, C, D, A1, B1, C1, D1, E, F, G, H) \ -- "lw %[temp0], "#A1"(%[tmp]) \n\t" \ -- "lw %[temp1], "#C1"(%[tmp]) \n\t" \ -- "lw %[temp2], "#B1"(%[tmp]) \n\t" \ -- "lw %[temp3], "#D1"(%[tmp]) \n\t" \ -+ "lw %[temp0], " #A1 "(%[tmp]) \n\t" \ -+ "lw %[temp1], " #C1 "(%[tmp]) \n\t" \ -+ "lw %[temp2], " #B1 "(%[tmp]) \n\t" \ -+ "lw %[temp3], " #D1 "(%[tmp]) \n\t" \ - "addu %[temp8], %[temp0], %[temp1] \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "addu %[temp1], %[temp2], %[temp3] \n\t" \ -@@ -324,18 +324,18 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - "subu %[temp1], %[temp1], %[temp5] \n\t" \ - "subu %[temp0], %[temp0], %[temp6] \n\t" \ - "subu %[temp8], %[temp8], %[temp7] \n\t" \ -- "lhu %[temp4], "#E"(%[w]) \n\t" \ -- "lhu %[temp5], "#F"(%[w]) \n\t" \ -- "lhu %[temp6], "#G"(%[w]) \n\t" \ -- "lhu %[temp7], "#H"(%[w]) \n\t" \ -+ "lhu %[temp4], " #E "(%[w]) \n\t" \ -+ "lhu %[temp5], " #F "(%[w]) \n\t" \ -+ "lhu %[temp6], " #G "(%[w]) \n\t" \ -+ "lhu %[temp7], " #H "(%[w]) \n\t" \ - "madd %[temp4], %[temp3] \n\t" \ - "madd %[temp5], %[temp1] \n\t" \ - "madd %[temp6], %[temp0] \n\t" \ - "madd %[temp7], %[temp8] \n\t" \ -- "lw %[temp0], "#A"(%[tmp]) \n\t" \ -- "lw %[temp1], "#C"(%[tmp]) \n\t" \ -- "lw %[temp2], "#B"(%[tmp]) \n\t" \ -- "lw %[temp3], "#D"(%[tmp]) \n\t" \ -+ "lw %[temp0], " #A "(%[tmp]) \n\t" \ -+ "lw %[temp1], " #C "(%[tmp]) \n\t" \ -+ "lw %[temp2], " #B "(%[tmp]) \n\t" \ -+ "lw %[temp3], " #D "(%[tmp]) \n\t" \ - "addu %[temp8], %[temp0], %[temp1] \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "addu %[temp1], %[temp2], %[temp3] \n\t" \ -@@ -413,70 +413,70 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - // A - offset in bytes to load from src and ref buffers - // TEMP0..TEMP3 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lw %["#TEMP1"], 0(%[args]) \n\t" \ -- "lw %["#TEMP2"], 4(%[args]) \n\t" \ -- "lbu %[temp16], 0+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp17], 0+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "lbu %[temp18], 1+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp19], 1+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -+ "lw %[" #TEMP1 "], 0(%[args]) \n\t" \ -+ "lw %[" #TEMP2 "], 4(%[args]) \n\t" \ -+ "lbu %[temp16], 0+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp17], 0+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "lbu %[temp18], 1+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp19], 1+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ - "subu %[temp20], %[temp16], %[temp17] \n\t" \ -- "lbu %[temp16], 2+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp17], 2+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "subu %["#TEMP0"], %[temp18], %[temp19] \n\t" \ -- "lbu %[temp18], 3+"XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "lbu %[temp19], 3+"XSTR(BPS)"*"#A"(%["#TEMP2"]) \n\t" \ -- "subu %["#TEMP1"], %[temp16], %[temp17] \n\t" \ -- "subu %["#TEMP2"], %[temp18], %[temp19] \n\t" \ -- "addu %["#TEMP3"], %[temp20], %["#TEMP2"] \n\t" \ -- "subu %["#TEMP2"], %[temp20], %["#TEMP2"] \n\t" \ -- "addu %[temp20], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "subu %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "mul %[temp16], %["#TEMP2"], %[c5352] \n\t" \ -- "mul %[temp17], %["#TEMP2"], %[c2217] \n\t" \ -- "mul %[temp18], %["#TEMP0"], %[c5352] \n\t" \ -- "mul %[temp19], %["#TEMP0"], %[c2217] \n\t" \ -- "addu %["#TEMP1"], %["#TEMP3"], %[temp20] \n\t" \ -- "subu %[temp20], %["#TEMP3"], %[temp20] \n\t" \ -- "sll %["#TEMP0"], %["#TEMP1"], 3 \n\t" \ -- "sll %["#TEMP2"], %[temp20], 3 \n\t" \ -+ "lbu %[temp16], 2+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp17], 2+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "subu %[" #TEMP0 "], %[temp18], %[temp19] \n\t" \ -+ "lbu %[temp18], 3+"XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "lbu %[temp19], 3+"XSTR(BPS)"*" #A "(%[" #TEMP2 "]) \n\t" \ -+ "subu %[" #TEMP1 "], %[temp16], %[temp17] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp18], %[temp19] \n\t" \ -+ "addu %[" #TEMP3 "], %[temp20], %[" #TEMP2 "] \n\t" \ -+ "subu %[" #TEMP2 "], %[temp20], %[" #TEMP2 "] \n\t" \ -+ "addu %[temp20], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "subu %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "mul %[temp16], %[" #TEMP2 "], %[c5352] \n\t" \ -+ "mul %[temp17], %[" #TEMP2 "], %[c2217] \n\t" \ -+ "mul %[temp18], %[" #TEMP0 "], %[c5352] \n\t" \ -+ "mul %[temp19], %[" #TEMP0 "], %[c2217] \n\t" \ -+ "addu %[" #TEMP1 "], %[" #TEMP3 "], %[temp20] \n\t" \ -+ "subu %[temp20], %[" #TEMP3 "], %[temp20] \n\t" \ -+ "sll %[" #TEMP0 "], %[" #TEMP1 "], 3 \n\t" \ -+ "sll %[" #TEMP2 "], %[temp20], 3 \n\t" \ - "addiu %[temp16], %[temp16], 1812 \n\t" \ - "addiu %[temp17], %[temp17], 937 \n\t" \ - "addu %[temp16], %[temp16], %[temp19] \n\t" \ - "subu %[temp17], %[temp17], %[temp18] \n\t" \ -- "sra %["#TEMP1"], %[temp16], 9 \n\t" \ -- "sra %["#TEMP3"], %[temp17], 9 \n\t" -+ "sra %[" #TEMP1 "], %[temp16], 9 \n\t" \ -+ "sra %[" #TEMP3 "], %[temp17], 9 \n\t" - - // macro for one vertical pass in FTransform - // temp0..temp15 holds tmp[0]..tmp[15] - // A..D - offsets in bytes to store to out buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \ -- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \ -- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \ -+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \ -+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \ - "mul %[temp18], %[temp18], %[c5352] \n\t" \ - "addiu %[temp16], %[temp16], 7 \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \ -- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \ -- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \ -- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \ -- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \ -- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \ -- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \ -- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t" -+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \ -+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \ -+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \ -+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \ -+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ -+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t" - - static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - int temp0, temp1, temp2, temp3, temp4, temp5, temp6, temp7, temp8; -@@ -516,14 +516,14 @@ static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - #if !defined(WORK_AROUND_GCC) - - #define GET_SSE_INNER(A, B, C, D) \ -- "lbu %[temp0], "#A"(%[a]) \n\t" \ -- "lbu %[temp1], "#A"(%[b]) \n\t" \ -- "lbu %[temp2], "#B"(%[a]) \n\t" \ -- "lbu %[temp3], "#B"(%[b]) \n\t" \ -- "lbu %[temp4], "#C"(%[a]) \n\t" \ -- "lbu %[temp5], "#C"(%[b]) \n\t" \ -- "lbu %[temp6], "#D"(%[a]) \n\t" \ -- "lbu %[temp7], "#D"(%[b]) \n\t" \ -+ "lbu %[temp0], " #A "(%[a]) \n\t" \ -+ "lbu %[temp1], " #A "(%[b]) \n\t" \ -+ "lbu %[temp2], " #B "(%[a]) \n\t" \ -+ "lbu %[temp3], " #B "(%[b]) \n\t" \ -+ "lbu %[temp4], " #C "(%[a]) \n\t" \ -+ "lbu %[temp5], " #C "(%[b]) \n\t" \ -+ "lbu %[temp6], " #D "(%[a]) \n\t" \ -+ "lbu %[temp7], " #D "(%[b]) \n\t" \ - "subu %[temp0], %[temp0], %[temp1] \n\t" \ - "subu %[temp2], %[temp2], %[temp3] \n\t" \ - "subu %[temp4], %[temp4], %[temp5] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -index ec58efe..1a3f968 100644 ---- a/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.enc_mips_dsp_r2.c -@@ -27,25 +27,25 @@ static const int kC2 = 35468; - // I - input (macro doesn't change it) - #define ADD_SUB_HALVES_X4(O0, O1, O2, O3, O4, O5, O6, O7, \ - I0, I1, I2, I3, I4, I5, I6, I7) \ -- "addq.ph %["#O0"], %["#I0"], %["#I1"] \n\t" \ -- "subq.ph %["#O1"], %["#I0"], %["#I1"] \n\t" \ -- "addq.ph %["#O2"], %["#I2"], %["#I3"] \n\t" \ -- "subq.ph %["#O3"], %["#I2"], %["#I3"] \n\t" \ -- "addq.ph %["#O4"], %["#I4"], %["#I5"] \n\t" \ -- "subq.ph %["#O5"], %["#I4"], %["#I5"] \n\t" \ -- "addq.ph %["#O6"], %["#I6"], %["#I7"] \n\t" \ -- "subq.ph %["#O7"], %["#I6"], %["#I7"] \n\t" -+ "addq.ph %[" #O0 "], %[" #I0 "], %[" #I1 "] \n\t" \ -+ "subq.ph %[" #O1 "], %[" #I0 "], %[" #I1 "] \n\t" \ -+ "addq.ph %[" #O2 "], %[" #I2 "], %[" #I3 "] \n\t" \ -+ "subq.ph %[" #O3 "], %[" #I2 "], %[" #I3 "] \n\t" \ -+ "addq.ph %[" #O4 "], %[" #I4 "], %[" #I5 "] \n\t" \ -+ "subq.ph %[" #O5 "], %[" #I4 "], %[" #I5 "] \n\t" \ -+ "addq.ph %[" #O6 "], %[" #I6 "], %[" #I7 "] \n\t" \ -+ "subq.ph %[" #O7 "], %[" #I6 "], %[" #I7 "] \n\t" - - // IO - input/output - #define ABS_X8(IO0, IO1, IO2, IO3, IO4, IO5, IO6, IO7) \ -- "absq_s.ph %["#IO0"], %["#IO0"] \n\t" \ -- "absq_s.ph %["#IO1"], %["#IO1"] \n\t" \ -- "absq_s.ph %["#IO2"], %["#IO2"] \n\t" \ -- "absq_s.ph %["#IO3"], %["#IO3"] \n\t" \ -- "absq_s.ph %["#IO4"], %["#IO4"] \n\t" \ -- "absq_s.ph %["#IO5"], %["#IO5"] \n\t" \ -- "absq_s.ph %["#IO6"], %["#IO6"] \n\t" \ -- "absq_s.ph %["#IO7"], %["#IO7"] \n\t" -+ "absq_s.ph %[" #IO0 "], %[" #IO0 "] \n\t" \ -+ "absq_s.ph %[" #IO1 "], %[" #IO1 "] \n\t" \ -+ "absq_s.ph %[" #IO2 "], %[" #IO2 "] \n\t" \ -+ "absq_s.ph %[" #IO3 "], %[" #IO3 "] \n\t" \ -+ "absq_s.ph %[" #IO4 "], %[" #IO4 "] \n\t" \ -+ "absq_s.ph %[" #IO5 "], %[" #IO5 "] \n\t" \ -+ "absq_s.ph %[" #IO6 "], %[" #IO6 "] \n\t" \ -+ "absq_s.ph %[" #IO7 "], %[" #IO7 "] \n\t" - - // dpa.w.ph $ac0 temp0 ,temp1 - // $ac += temp0[31..16] * temp1[31..16] + temp0[15..0] * temp1[15..0] -@@ -56,15 +56,15 @@ static const int kC2 = 35468; - #define MUL_HALF(O0, I0, I1, I2, I3, I4, I5, I6, I7, \ - I8, I9, I10, I11, I12, I13, I14, I15) \ - "mult $ac0, $zero, $zero \n\t" \ -- "dpa.w.ph $ac0, %["#I2"], %["#I0"] \n\t" \ -- "dpax.w.ph $ac0, %["#I5"], %["#I6"] \n\t" \ -- "dpa.w.ph $ac0, %["#I8"], %["#I9"] \n\t" \ -- "dpax.w.ph $ac0, %["#I11"], %["#I4"] \n\t" \ -- "dpa.w.ph $ac0, %["#I12"], %["#I7"] \n\t" \ -- "dpax.w.ph $ac0, %["#I13"], %["#I1"] \n\t" \ -- "dpa.w.ph $ac0, %["#I14"], %["#I3"] \n\t" \ -- "dpax.w.ph $ac0, %["#I15"], %["#I10"] \n\t" \ -- "mflo %["#O0"], $ac0 \n\t" -+ "dpa.w.ph $ac0, %[" #I2 "], %[" #I0 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I5 "], %[" #I6 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I8 "], %[" #I9 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I11 "], %[" #I4 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I12 "], %[" #I7 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I13 "], %[" #I1 "] \n\t" \ -+ "dpa.w.ph $ac0, %[" #I14 "], %[" #I3 "] \n\t" \ -+ "dpax.w.ph $ac0, %[" #I15 "], %[" #I10 "] \n\t" \ -+ "mflo %[" #O0 "], $ac0 \n\t" - - #define OUTPUT_EARLY_CLOBBER_REGS_17() \ - OUTPUT_EARLY_CLOBBER_REGS_10(), \ -@@ -77,69 +77,69 @@ static const int kC2 = 35468; - // A - offset in bytes to load from src and ref buffers - // TEMP0..TEMP3 - registers for corresponding tmp elements - #define HORIZONTAL_PASS(A, TEMP0, TEMP1, TEMP2, TEMP3) \ -- "lw %["#TEMP0"], 0(%[args]) \n\t" \ -- "lw %["#TEMP1"], 4(%[args]) \n\t" \ -- "lw %["#TEMP2"], "XSTR(BPS)"*"#A"(%["#TEMP0"]) \n\t" \ -- "lw %["#TEMP3"], "XSTR(BPS)"*"#A"(%["#TEMP1"]) \n\t" \ -- "preceu.ph.qbl %["#TEMP0"], %["#TEMP2"] \n\t" \ -- "preceu.ph.qbl %["#TEMP1"], %["#TEMP3"] \n\t" \ -- "preceu.ph.qbr %["#TEMP2"], %["#TEMP2"] \n\t" \ -- "preceu.ph.qbr %["#TEMP3"], %["#TEMP3"] \n\t" \ -- "subq.ph %["#TEMP0"], %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP3"] \n\t" \ -- "rotr %["#TEMP0"], %["#TEMP0"], 16 \n\t" \ -- "addq.ph %["#TEMP1"], %["#TEMP2"], %["#TEMP0"] \n\t" \ -- "subq.ph %["#TEMP3"], %["#TEMP2"], %["#TEMP0"] \n\t" \ -- "seh %["#TEMP0"], %["#TEMP1"] \n\t" \ -- "sra %[temp16], %["#TEMP1"], 16 \n\t" \ -- "seh %[temp19], %["#TEMP3"] \n\t" \ -- "sra %["#TEMP3"], %["#TEMP3"], 16 \n\t" \ -- "subu %["#TEMP2"], %["#TEMP0"], %[temp16] \n\t" \ -- "addu %["#TEMP0"], %["#TEMP0"], %[temp16] \n\t" \ -+ "lw %[" #TEMP0 "], 0(%[args]) \n\t" \ -+ "lw %[" #TEMP1 "], 4(%[args]) \n\t" \ -+ "lw %[" #TEMP2 "], "XSTR(BPS)"*" #A "(%[" #TEMP0 "]) \n\t" \ -+ "lw %[" #TEMP3 "], "XSTR(BPS)"*" #A "(%[" #TEMP1 "]) \n\t" \ -+ "preceu.ph.qbl %[" #TEMP0 "], %[" #TEMP2 "] \n\t" \ -+ "preceu.ph.qbl %[" #TEMP1 "], %[" #TEMP3 "] \n\t" \ -+ "preceu.ph.qbr %[" #TEMP2 "], %[" #TEMP2 "] \n\t" \ -+ "preceu.ph.qbr %[" #TEMP3 "], %[" #TEMP3 "] \n\t" \ -+ "subq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP3 "] \n\t" \ -+ "rotr %[" #TEMP0 "], %[" #TEMP0 "], 16 \n\t" \ -+ "addq.ph %[" #TEMP1 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \ -+ "subq.ph %[" #TEMP3 "], %[" #TEMP2 "], %[" #TEMP0 "] \n\t" \ -+ "seh %[" #TEMP0 "], %[" #TEMP1 "] \n\t" \ -+ "sra %[temp16], %[" #TEMP1 "], 16 \n\t" \ -+ "seh %[temp19], %[" #TEMP3 "] \n\t" \ -+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 16 \n\t" \ -+ "subu %[" #TEMP2 "], %[" #TEMP0 "], %[temp16] \n\t" \ -+ "addu %[" #TEMP0 "], %[" #TEMP0 "], %[temp16] \n\t" \ - "mul %[temp17], %[temp19], %[c2217] \n\t" \ -- "mul %[temp18], %["#TEMP3"], %[c5352] \n\t" \ -- "mul %["#TEMP1"], %[temp19], %[c5352] \n\t" \ -- "mul %[temp16], %["#TEMP3"], %[c2217] \n\t" \ -- "sll %["#TEMP2"], %["#TEMP2"], 3 \n\t" \ -- "sll %["#TEMP0"], %["#TEMP0"], 3 \n\t" \ -- "subu %["#TEMP3"], %[temp17], %[temp18] \n\t" \ -- "addu %["#TEMP1"], %[temp16], %["#TEMP1"] \n\t" \ -- "addiu %["#TEMP3"], %["#TEMP3"], 937 \n\t" \ -- "addiu %["#TEMP1"], %["#TEMP1"], 1812 \n\t" \ -- "sra %["#TEMP3"], %["#TEMP3"], 9 \n\t" \ -- "sra %["#TEMP1"], %["#TEMP1"], 9 \n\t" -+ "mul %[temp18], %[" #TEMP3 "], %[c5352] \n\t" \ -+ "mul %[" #TEMP1 "], %[temp19], %[c5352] \n\t" \ -+ "mul %[temp16], %[" #TEMP3 "], %[c2217] \n\t" \ -+ "sll %[" #TEMP2 "], %[" #TEMP2 "], 3 \n\t" \ -+ "sll %[" #TEMP0 "], %[" #TEMP0 "], 3 \n\t" \ -+ "subu %[" #TEMP3 "], %[temp17], %[temp18] \n\t" \ -+ "addu %[" #TEMP1 "], %[temp16], %[" #TEMP1 "] \n\t" \ -+ "addiu %[" #TEMP3 "], %[" #TEMP3 "], 937 \n\t" \ -+ "addiu %[" #TEMP1 "], %[" #TEMP1 "], 1812 \n\t" \ -+ "sra %[" #TEMP3 "], %[" #TEMP3 "], 9 \n\t" \ -+ "sra %[" #TEMP1 "], %[" #TEMP1 "], 9 \n\t" - - // macro for one vertical pass in FTransform - // temp0..temp15 holds tmp[0]..tmp[15] - // A..D - offsets in bytes to store to out buffer - // TEMP0, TEMP4, TEMP8 and TEMP12 - registers for corresponding tmp elements - #define VERTICAL_PASS(A, B, C, D, TEMP0, TEMP4, TEMP8, TEMP12) \ -- "addu %[temp16], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "subu %[temp19], %["#TEMP0"], %["#TEMP12"] \n\t" \ -- "addu %[temp17], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "subu %[temp18], %["#TEMP4"], %["#TEMP8"] \n\t" \ -- "mul %["#TEMP8"], %[temp19], %[c2217] \n\t" \ -- "mul %["#TEMP12"], %[temp18], %[c2217] \n\t" \ -- "mul %["#TEMP4"], %[temp19], %[c5352] \n\t" \ -+ "addu %[temp16], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "subu %[temp19], %[" #TEMP0 "], %[" #TEMP12 "] \n\t" \ -+ "addu %[temp17], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "subu %[temp18], %[" #TEMP4 "], %[" #TEMP8 "] \n\t" \ -+ "mul %[" #TEMP8 "], %[temp19], %[c2217] \n\t" \ -+ "mul %[" #TEMP12 "], %[temp18], %[c2217] \n\t" \ -+ "mul %[" #TEMP4 "], %[temp19], %[c5352] \n\t" \ - "mul %[temp18], %[temp18], %[c5352] \n\t" \ - "addiu %[temp16], %[temp16], 7 \n\t" \ -- "addu %["#TEMP0"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP0"], %["#TEMP0"], 4 \n\t" \ -- "addu %["#TEMP12"], %["#TEMP12"], %["#TEMP4"] \n\t" \ -- "subu %["#TEMP4"], %[temp16], %[temp17] \n\t" \ -- "sra %["#TEMP4"], %["#TEMP4"], 4 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 30000 \n\t" \ -- "addiu %["#TEMP12"], %["#TEMP12"], 12000 \n\t" \ -- "addiu %["#TEMP8"], %["#TEMP8"], 21000 \n\t" \ -- "subu %["#TEMP8"], %["#TEMP8"], %[temp18] \n\t" \ -- "sra %["#TEMP12"], %["#TEMP12"], 16 \n\t" \ -- "sra %["#TEMP8"], %["#TEMP8"], 16 \n\t" \ -- "addiu %[temp16], %["#TEMP12"], 1 \n\t" \ -- "movn %["#TEMP12"], %[temp16], %[temp19] \n\t" \ -- "sh %["#TEMP0"], "#A"(%[temp20]) \n\t" \ -- "sh %["#TEMP4"], "#C"(%[temp20]) \n\t" \ -- "sh %["#TEMP8"], "#D"(%[temp20]) \n\t" \ -- "sh %["#TEMP12"], "#B"(%[temp20]) \n\t" -+ "addu %[" #TEMP0 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP0 "], %[" #TEMP0 "], 4 \n\t" \ -+ "addu %[" #TEMP12 "], %[" #TEMP12 "], %[" #TEMP4 "] \n\t" \ -+ "subu %[" #TEMP4 "], %[temp16], %[temp17] \n\t" \ -+ "sra %[" #TEMP4 "], %[" #TEMP4 "], 4 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 30000 \n\t" \ -+ "addiu %[" #TEMP12 "], %[" #TEMP12 "], 12000 \n\t" \ -+ "addiu %[" #TEMP8 "], %[" #TEMP8 "], 21000 \n\t" \ -+ "subu %[" #TEMP8 "], %[" #TEMP8 "], %[temp18] \n\t" \ -+ "sra %[" #TEMP12 "], %[" #TEMP12 "], 16 \n\t" \ -+ "sra %[" #TEMP8 "], %[" #TEMP8 "], 16 \n\t" \ -+ "addiu %[temp16], %[" #TEMP12 "], 1 \n\t" \ -+ "movn %[" #TEMP12 "], %[temp16], %[temp19] \n\t" \ -+ "sh %[" #TEMP0 "], " #A "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP4 "], " #C "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP8 "], " #D "(%[temp20]) \n\t" \ -+ "sh %[" #TEMP12 "], " #B "(%[temp20]) \n\t" - - static void FTransform(const uint8_t* src, const uint8_t* ref, int16_t* out) { - const int c2217 = 2217; -@@ -329,11 +329,11 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - // Intra predictions - - #define FILL_PART(J, SIZE) \ -- "usw %[value], 0+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- "usw %[value], 4+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -- "usw %[value], 8+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -- "usw %[value], 12+"#J"*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 0+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 4+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ -+ "usw %[value], 8+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ -+ "usw %[value], 12+" #J "*"XSTR(BPS)"(%[dst]) \n\t" \ - ".endif \n\t" - - #define FILL_8_OR_16(DST, VALUE, SIZE) do { \ -@@ -348,7 +348,7 @@ static int Disto16x16(const uint8_t* const a, const uint8_t* const b, - FILL_PART( 5, SIZE) \ - FILL_PART( 6, SIZE) \ - FILL_PART( 7, SIZE) \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - FILL_PART( 8, 16) \ - FILL_PART( 9, 16) \ - FILL_PART(10, 16) \ -@@ -425,7 +425,7 @@ HORIZONTAL_PRED(dst, left, 16) - CLIPPING() \ - "usw %[temp0], 0(%[dst]) \n\t" \ - "usw %[temp1], 4(%[dst]) \n\t" \ -- ".if "#SIZE" == 16 \n\t" \ -+ ".if " #SIZE " == 16 \n\t" \ - "ulw %[temp0], 8(%[top]) \n\t" \ - "ulw %[temp1], 12(%[top]) \n\t" \ - CLIPPING() \ -@@ -1060,8 +1060,8 @@ static void Intra4Preds(uint8_t* dst, const uint8_t* top) { - #if !defined(WORK_AROUND_GCC) - - #define GET_SSE_INNER(A) \ -- "lw %[temp0], "#A"(%[a]) \n\t" \ -- "lw %[temp1], "#A"(%[b]) \n\t" \ -+ "lw %[temp0], " #A "(%[a]) \n\t" \ -+ "lw %[temp1], " #A "(%[b]) \n\t" \ - "preceu.ph.qbr %[temp2], %[temp0] \n\t" \ - "preceu.ph.qbl %[temp0], %[temp0] \n\t" \ - "preceu.ph.qbr %[temp3], %[temp1] \n\t" \ -@@ -1185,28 +1185,28 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - // N - offset in bytes (n * 2) - // N1 - offset in bytes ((n + 1) * 2) - #define QUANTIZE_ONE(J, K, N, N1) \ -- "ulw %[temp1], "#J"(%[ppin]) \n\t" \ -- "ulw %[temp2], "#J"(%[ppsharpen]) \n\t" \ -- "lhu %[temp3], "#K"(%[ppzthresh]) \n\t" \ -- "lhu %[temp6], "#K"+4(%[ppzthresh]) \n\t" \ -+ "ulw %[temp1], " #J "(%[ppin]) \n\t" \ -+ "ulw %[temp2], " #J "(%[ppsharpen]) \n\t" \ -+ "lhu %[temp3], " #K "(%[ppzthresh]) \n\t" \ -+ "lhu %[temp6], " #K "+4(%[ppzthresh]) \n\t" \ - "absq_s.ph %[temp4], %[temp1] \n\t" \ - "ins %[temp3], %[temp6], 16, 16 \n\t" \ - "addu.ph %[coeff], %[temp4], %[temp2] \n\t" \ - "shra.ph %[sign], %[temp1], 15 \n\t" \ - "li %[level], 0x10001 \n\t" \ - "cmp.lt.ph %[temp3], %[coeff] \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ - "pick.ph %[temp5], %[level], $0 \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ - "beqz %[temp5], 0f \n\t" \ -- "lhu %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp3], " #J "(%[ppq]) \n\t" \ - "beq %[temp5], %[level], 1f \n\t" \ - "andi %[temp5], %[temp5], 0x1 \n\t" \ - "andi %[temp4], %[coeff], 0xffff \n\t" \ - "beqz %[temp5], 2f \n\t" \ - "mul %[level], %[temp4], %[temp1] \n\t" \ -- "sh $0, "#J"+2(%[ppin]) \n\t" \ -- "sh $0, "#N1"(%[pout]) \n\t" \ -+ "sh $0, " #J "+2(%[ppin]) \n\t" \ -+ "sh $0, " #N1 "(%[pout]) \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ - "slt %[temp4], %[max_level], %[level] \n\t" \ -@@ -1216,15 +1216,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "subu %[level], %[level], %[temp6] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" \ -- "sh %[temp5], "#J"(%[ppin]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" \ -+ "sh %[temp5], " #J "(%[ppin]) \n\t" \ - "j 3f \n\t" \ - "2: \n\t" \ -- "lhu %[temp1], "#J"+2(%[ppiq]) \n\t" \ -+ "lhu %[temp1], " #J "+2(%[ppiq]) \n\t" \ - "srl %[temp5], %[coeff], 16 \n\t" \ - "mul %[level], %[temp5], %[temp1] \n\t" \ -- "lw %[temp2], "#K"+4(%[ppbias]) \n\t" \ -- "lhu %[temp3], "#J"+2(%[ppq]) \n\t" \ -+ "lw %[temp2], " #K "+4(%[ppbias]) \n\t" \ -+ "lhu %[temp3], " #J "+2(%[ppq]) \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ - "sra %[level], %[level], 17 \n\t" \ - "srl %[temp6], %[sign], 16 \n\t" \ -@@ -1233,20 +1233,20 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "xor %[level], %[level], %[temp6] \n\t" \ - "subu %[level], %[level], %[temp6] \n\t" \ - "mul %[temp5], %[level], %[temp3] \n\t" \ -- "sh $0, "#J"(%[ppin]) \n\t" \ -- "sh $0, "#N"(%[pout]) \n\t" \ -+ "sh $0, " #J "(%[ppin]) \n\t" \ -+ "sh $0, " #N "(%[pout]) \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[temp5], "#J"+2(%[ppin]) \n\t" \ -- "sh %[level], "#N1"(%[pout]) \n\t" \ -+ "sh %[temp5], " #J "+2(%[ppin]) \n\t" \ -+ "sh %[level], " #N1 "(%[pout]) \n\t" \ - "j 3f \n\t" \ - "1: \n\t" \ -- "lhu %[temp1], "#J"(%[ppiq]) \n\t" \ -- "lw %[temp2], "#K"(%[ppbias]) \n\t" \ -- "ulw %[temp3], "#J"(%[ppq]) \n\t" \ -+ "lhu %[temp1], " #J "(%[ppiq]) \n\t" \ -+ "lw %[temp2], " #K "(%[ppbias]) \n\t" \ -+ "ulw %[temp3], " #J "(%[ppq]) \n\t" \ - "andi %[temp5], %[coeff], 0xffff \n\t" \ - "srl %[temp0], %[coeff], 16 \n\t" \ -- "lhu %[temp6], "#J"+2(%[ppiq]) \n\t" \ -- "lw %[coeff], "#K"+4(%[ppbias]) \n\t" \ -+ "lhu %[temp6], " #J "+2(%[ppiq]) \n\t" \ -+ "lw %[coeff], " #K "+4(%[ppbias]) \n\t" \ - "mul %[level], %[temp5], %[temp1] \n\t" \ - "mul %[temp4], %[temp0], %[temp6] \n\t" \ - "addu %[level], %[level], %[temp2] \n\t" \ -@@ -1259,15 +1259,15 @@ static int SSE4x4(const uint8_t* a, const uint8_t* b) { - "subu.ph %[level], %[level], %[sign] \n\t" \ - "mul.ph %[temp3], %[level], %[temp3] \n\t" \ - "or %[ret], %[ret], %[level] \n\t" \ -- "sh %[level], "#N"(%[pout]) \n\t" \ -+ "sh %[level], " #N "(%[pout]) \n\t" \ - "srl %[level], %[level], 16 \n\t" \ -- "sh %[level], "#N1"(%[pout]) \n\t" \ -- "usw %[temp3], "#J"(%[ppin]) \n\t" \ -+ "sh %[level], " #N1 "(%[pout]) \n\t" \ -+ "usw %[temp3], " #J "(%[ppin]) \n\t" \ - "j 3f \n\t" \ - "0: \n\t" \ -- "sh $0, "#N"(%[pout]) \n\t" \ -- "sh $0, "#N1"(%[pout]) \n\t" \ -- "usw $0, "#J"(%[ppin]) \n\t" \ -+ "sh $0, " #N "(%[pout]) \n\t" \ -+ "sh $0, " #N1 "(%[pout]) \n\t" \ -+ "usw $0, " #J "(%[ppin]) \n\t" \ - "3: \n\t" - - static int QuantizeBlock(int16_t in[16], int16_t out[16], -@@ -1326,37 +1326,37 @@ static int Quantize2Blocks(int16_t in[32], int16_t out[32], - // A, B, C, D - offset in bytes to load from in buffer - // TEMP0, TEMP1 - registers for corresponding tmp elements - #define HORIZONTAL_PASS_WHT(A, B, C, D, TEMP0, TEMP1) \ -- "lh %["#TEMP0"], "#A"(%[in]) \n\t" \ -- "lh %["#TEMP1"], "#B"(%[in]) \n\t" \ -- "lh %[temp8], "#C"(%[in]) \n\t" \ -- "lh %[temp9], "#D"(%[in]) \n\t" \ -- "ins %["#TEMP1"], %["#TEMP0"], 16, 16 \n\t" \ -+ "lh %[" #TEMP0 "], " #A "(%[in]) \n\t" \ -+ "lh %[" #TEMP1 "], " #B "(%[in]) \n\t" \ -+ "lh %[temp8], " #C "(%[in]) \n\t" \ -+ "lh %[temp9], " #D "(%[in]) \n\t" \ -+ "ins %[" #TEMP1 "], %[" #TEMP0 "], 16, 16 \n\t" \ - "ins %[temp9], %[temp8], 16, 16 \n\t" \ -- "subq.ph %[temp8], %["#TEMP1"], %[temp9] \n\t" \ -- "addq.ph %[temp9], %["#TEMP1"], %[temp9] \n\t" \ -- "precrq.ph.w %["#TEMP0"], %[temp8], %[temp9] \n\t" \ -+ "subq.ph %[temp8], %[" #TEMP1 "], %[temp9] \n\t" \ -+ "addq.ph %[temp9], %[" #TEMP1 "], %[temp9] \n\t" \ -+ "precrq.ph.w %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \ - "append %[temp8], %[temp9], 16 \n\t" \ -- "subq.ph %["#TEMP1"], %["#TEMP0"], %[temp8] \n\t" \ -- "addq.ph %["#TEMP0"], %["#TEMP0"], %[temp8] \n\t" \ -- "rotr %["#TEMP1"], %["#TEMP1"], 16 \n\t" -+ "subq.ph %[" #TEMP1 "], %[" #TEMP0 "], %[temp8] \n\t" \ -+ "addq.ph %[" #TEMP0 "], %[" #TEMP0 "], %[temp8] \n\t" \ -+ "rotr %[" #TEMP1 "], %[" #TEMP1 "], 16 \n\t" - - // macro for one vertical pass in FTransformWHT - // temp0..temp7 holds tmp[0]..tmp[15] - // A, B, C, D - offsets in bytes to store to out buffer - // TEMP0, TEMP2, TEMP4 and TEMP6 - registers for corresponding tmp elements - #define VERTICAL_PASS_WHT(A, B, C, D, TEMP0, TEMP2, TEMP4, TEMP6) \ -- "addq.ph %[temp8], %["#TEMP0"], %["#TEMP4"] \n\t" \ -- "addq.ph %[temp9], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subq.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subq.ph %["#TEMP6"], %["#TEMP0"], %["#TEMP4"] \n\t" \ -- "addqh.ph %["#TEMP0"], %[temp8], %[temp9] \n\t" \ -- "subqh.ph %["#TEMP4"], %["#TEMP6"], %["#TEMP2"] \n\t" \ -- "addqh.ph %["#TEMP2"], %["#TEMP2"], %["#TEMP6"] \n\t" \ -- "subqh.ph %["#TEMP6"], %[temp8], %[temp9] \n\t" \ -- "usw %["#TEMP0"], "#A"(%[out]) \n\t" \ -- "usw %["#TEMP2"], "#B"(%[out]) \n\t" \ -- "usw %["#TEMP4"], "#C"(%[out]) \n\t" \ -- "usw %["#TEMP6"], "#D"(%[out]) \n\t" -+ "addq.ph %[temp8], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \ -+ "addq.ph %[temp9], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subq.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subq.ph %[" #TEMP6 "], %[" #TEMP0 "], %[" #TEMP4 "] \n\t" \ -+ "addqh.ph %[" #TEMP0 "], %[temp8], %[temp9] \n\t" \ -+ "subqh.ph %[" #TEMP4 "], %[" #TEMP6 "], %[" #TEMP2 "] \n\t" \ -+ "addqh.ph %[" #TEMP2 "], %[" #TEMP2 "], %[" #TEMP6 "] \n\t" \ -+ "subqh.ph %[" #TEMP6 "], %[temp8], %[temp9] \n\t" \ -+ "usw %[" #TEMP0 "], " #A "(%[out]) \n\t" \ -+ "usw %[" #TEMP2 "], " #B "(%[out]) \n\t" \ -+ "usw %[" #TEMP4 "], " #C "(%[out]) \n\t" \ -+ "usw %[" #TEMP6 "], " #D "(%[out]) \n\t" - - static void FTransformWHT(const int16_t* in, int16_t* out) { - int temp0, temp1, temp2, temp3, temp4; -@@ -1385,10 +1385,10 @@ static void FTransformWHT(const int16_t* in, int16_t* out) { - // convert 8 coeffs at time - // A, B, C, D - offsets in bytes to load from out buffer - #define CONVERT_COEFFS_TO_BIN(A, B, C, D) \ -- "ulw %[temp0], "#A"(%[out]) \n\t" \ -- "ulw %[temp1], "#B"(%[out]) \n\t" \ -- "ulw %[temp2], "#C"(%[out]) \n\t" \ -- "ulw %[temp3], "#D"(%[out]) \n\t" \ -+ "ulw %[temp0], " #A "(%[out]) \n\t" \ -+ "ulw %[temp1], " #B "(%[out]) \n\t" \ -+ "ulw %[temp2], " #C "(%[out]) \n\t" \ -+ "ulw %[temp3], " #D "(%[out]) \n\t" \ - "absq_s.ph %[temp0], %[temp0] \n\t" \ - "absq_s.ph %[temp1], %[temp1] \n\t" \ - "absq_s.ph %[temp2], %[temp2] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -index 6c34efb..6a1f8f4 100644 ---- a/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.filters_mips_dsp_r2.c -@@ -48,7 +48,7 @@ - "srl %[temp0], %[length], 0x2 \n\t" \ - "beqz %[temp0], 4f \n\t" \ - " andi %[temp6], %[length], 0x3 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "lbu %[temp1], -1(%[src]) \n\t" \ - "1: \n\t" \ - "lbu %[temp2], 0(%[src]) \n\t" \ -@@ -84,7 +84,7 @@ - "lbu %[temp1], -1(%[src]) \n\t" \ - "lbu %[temp2], 0(%[src]) \n\t" \ - "addiu %[src], %[src], 1 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - "sb %[temp3], -1(%[src]) \n\t" \ - ".else \n\t" \ -@@ -131,7 +131,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - "ulw %[temp3], 4(%[src]) \n\t" \ - "ulw %[temp4], 4(%[pred]) \n\t" \ - "addiu %[src], %[src], 8 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu.qb %[temp5], %[temp1], %[temp2] \n\t" \ - "addu.qb %[temp6], %[temp3], %[temp4] \n\t" \ - ".else \n\t" \ -@@ -152,7 +152,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - "lbu %[temp2], 0(%[pred]) \n\t" \ - "addiu %[src], %[src], 1 \n\t" \ - "addiu %[pred], %[pred], 1 \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - ".else \n\t" \ - "subu %[temp3], %[temp1], %[temp2] \n\t" \ -@@ -177,7 +177,7 @@ static WEBP_INLINE void PredictLine(const uint8_t* src, uint8_t* dst, - __asm__ volatile ( \ - "lbu %[temp1], 0(%[src]) \n\t" \ - "lbu %[temp2], 0(%[pred]) \n\t" \ -- ".if "#INVERSE" \n\t" \ -+ ".if " #INVERSE " \n\t" \ - "addu %[temp3], %[temp1], %[temp2] \n\t" \ - ".else \n\t" \ - "subu %[temp3], %[temp1], %[temp2] \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -index 68fbe85..abe97c1 100644 ---- a/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips32.c -@@ -285,28 +285,28 @@ static VP8LStreaks HuffmanCostCombinedCount(const uint32_t* X, - // literal_ and successive histograms could be unaligned - // so we must use ulw and usw - #define ADD_TO_OUT(A, B, C, D, E, P0, P1, P2) \ -- "ulw %[temp0], "#A"(%["#P0"]) \n\t" \ -- "ulw %[temp1], "#B"(%["#P0"]) \n\t" \ -- "ulw %[temp2], "#C"(%["#P0"]) \n\t" \ -- "ulw %[temp3], "#D"(%["#P0"]) \n\t" \ -- "ulw %[temp4], "#A"(%["#P1"]) \n\t" \ -- "ulw %[temp5], "#B"(%["#P1"]) \n\t" \ -- "ulw %[temp6], "#C"(%["#P1"]) \n\t" \ -- "ulw %[temp7], "#D"(%["#P1"]) \n\t" \ -+ "ulw %[temp0], " #A "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp1], " #B "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp2], " #C "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp3], " #D "(%[" #P0 "]) \n\t" \ -+ "ulw %[temp4], " #A "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp5], " #B "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp6], " #C "(%[" #P1 "]) \n\t" \ -+ "ulw %[temp7], " #D "(%[" #P1 "]) \n\t" \ - "addu %[temp4], %[temp4], %[temp0] \n\t" \ - "addu %[temp5], %[temp5], %[temp1] \n\t" \ - "addu %[temp6], %[temp6], %[temp2] \n\t" \ - "addu %[temp7], %[temp7], %[temp3] \n\t" \ -- "addiu %["#P0"], %["#P0"], 16 \n\t" \ -- ".if "#E" == 1 \n\t" \ -- "addiu %["#P1"], %["#P1"], 16 \n\t" \ -+ "addiu %[" #P0 "], %[" #P0 "], 16 \n\t" \ -+ ".if " #E " == 1 \n\t" \ -+ "addiu %[" #P1 "], %[" #P1 "], 16 \n\t" \ - ".endif \n\t" \ -- "usw %[temp4], "#A"(%["#P2"]) \n\t" \ -- "usw %[temp5], "#B"(%["#P2"]) \n\t" \ -- "usw %[temp6], "#C"(%["#P2"]) \n\t" \ -- "usw %[temp7], "#D"(%["#P2"]) \n\t" \ -- "addiu %["#P2"], %["#P2"], 16 \n\t" \ -- "bne %["#P0"], %[LoopEnd], 1b \n\t" \ -+ "usw %[temp4], " #A "(%[" #P2 "]) \n\t" \ -+ "usw %[temp5], " #B "(%[" #P2 "]) \n\t" \ -+ "usw %[temp6], " #C "(%[" #P2 "]) \n\t" \ -+ "usw %[temp7], " #D "(%[" #P2 "]) \n\t" \ -+ "addiu %[" #P2 "], %[" #P2 "], 16 \n\t" \ -+ "bne %[" #P0 "], %[LoopEnd], 1b \n\t" \ - ".set pop \n\t" \ - - #define ASM_END_COMMON_0 \ -diff --git a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -index 821cda9..31ac181 100644 ---- a/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.lossless_mips_dsp_r2.c -@@ -29,14 +29,14 @@ static void FUNC_NAME(const TYPE* src, \ - for (x = 0; x < (width >> 2); ++x) { \ - int tmp1, tmp2, tmp3, tmp4; \ - __asm__ volatile ( \ -- ".ifc "#TYPE", uint8_t \n\t" \ -+ ".ifc " #TYPE ", uint8_t \n\t" \ - "lbu %[tmp1], 0(%[src]) \n\t" \ - "lbu %[tmp2], 1(%[src]) \n\t" \ - "lbu %[tmp3], 2(%[src]) \n\t" \ - "lbu %[tmp4], 3(%[src]) \n\t" \ - "addiu %[src], %[src], 4 \n\t" \ - ".endif \n\t" \ -- ".ifc "#TYPE", uint32_t \n\t" \ -+ ".ifc " #TYPE ", uint32_t \n\t" \ - "lw %[tmp1], 0(%[src]) \n\t" \ - "lw %[tmp2], 4(%[src]) \n\t" \ - "lw %[tmp3], 8(%[src]) \n\t" \ -@@ -55,7 +55,7 @@ static void FUNC_NAME(const TYPE* src, \ - "lwx %[tmp2], %[tmp2](%[color_map]) \n\t" \ - "lwx %[tmp3], %[tmp3](%[color_map]) \n\t" \ - "lwx %[tmp4], %[tmp4](%[color_map]) \n\t" \ -- ".ifc "#TYPE", uint8_t \n\t" \ -+ ".ifc " #TYPE ", uint8_t \n\t" \ - "ext %[tmp1], %[tmp1], 8, 8 \n\t" \ - "ext %[tmp2], %[tmp2], 8, 8 \n\t" \ - "ext %[tmp3], %[tmp3], 8, 8 \n\t" \ -@@ -66,7 +66,7 @@ static void FUNC_NAME(const TYPE* src, \ - "sb %[tmp4], 3(%[dst]) \n\t" \ - "addiu %[dst], %[dst], 4 \n\t" \ - ".endif \n\t" \ -- ".ifc "#TYPE", uint32_t \n\t" \ -+ ".ifc " #TYPE ", uint32_t \n\t" \ - "sw %[tmp1], 0(%[dst]) \n\t" \ - "sw %[tmp2], 4(%[dst]) \n\t" \ - "sw %[tmp3], 8(%[dst]) \n\t" \ -diff --git a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -index a7864a0..cb3adfe 100644 ---- a/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.upsampling_mips_dsp_r2.c -@@ -34,15 +34,15 @@ - G = G - t2 + kGCst; \ - B = B + kBCst; \ - __asm__ volatile ( \ -- "shll_s.w %["#R"], %["#R"], 9 \n\t" \ -- "shll_s.w %["#G"], %["#G"], 9 \n\t" \ -- "shll_s.w %["#B"], %["#B"], 9 \n\t" \ -- "precrqu_s.qb.ph %["#R"], %["#R"], $zero \n\t" \ -- "precrqu_s.qb.ph %["#G"], %["#G"], $zero \n\t" \ -- "precrqu_s.qb.ph %["#B"], %["#B"], $zero \n\t" \ -- "srl %["#R"], %["#R"], 24 \n\t" \ -- "srl %["#G"], %["#G"], 24 \n\t" \ -- "srl %["#B"], %["#B"], 24 \n\t" \ -+ "shll_s.w %[" #R "], %[" #R "], 9 \n\t" \ -+ "shll_s.w %[" #G "], %[" #G "], 9 \n\t" \ -+ "shll_s.w %[" #B "], %[" #B "], 9 \n\t" \ -+ "precrqu_s.qb.ph %[" #R "], %[" #R "], $zero \n\t" \ -+ "precrqu_s.qb.ph %[" #G "], %[" #G "], $zero \n\t" \ -+ "precrqu_s.qb.ph %[" #B "], %[" #B "], $zero \n\t" \ -+ "srl %[" #R "], %[" #R "], 24 \n\t" \ -+ "srl %[" #G "], %[" #G "], 24 \n\t" \ -+ "srl %[" #B "], %[" #B "], 24 \n\t" \ - : [R]"+r"(R), [G]"+r"(G), [B]"+r"(B) \ - : \ - ); \ -diff --git a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -index 66adde5..51cbe9e 100644 ---- a/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -+++ b/Source/LibWebP/src/dsp/dsp.yuv_mips_dsp_r2.c -@@ -39,12 +39,12 @@ - "addu %[temp5], %[temp0], %[temp1] \n\t" \ - "subu %[temp6], %[temp0], %[temp2] \n\t" \ - "addu %[temp7], %[temp0], %[temp4] \n\t" \ --".if "#K" \n\t" \ -+".if " #K " \n\t" \ - "lbu %[temp0], 1(%[y]) \n\t" \ - ".endif \n\t" \ - "shll_s.w %[temp5], %[temp5], 9 \n\t" \ - "shll_s.w %[temp6], %[temp6], 9 \n\t" \ --".if "#K" \n\t" \ -+".if " #K " \n\t" \ - "mul %[temp0], %[t_con_5], %[temp0] \n\t" \ - ".endif \n\t" \ - "shll_s.w %[temp7], %[temp7], 9 \n\t" \ -@@ -54,9 +54,9 @@ - "srl %[temp5], %[temp5], 24 \n\t" \ - "srl %[temp6], %[temp6], 24 \n\t" \ - "srl %[temp7], %[temp7], 24 \n\t" \ -- "sb %[temp5], "#R"(%[dst]) \n\t" \ -- "sb %[temp6], "#G"(%[dst]) \n\t" \ -- "sb %[temp7], "#B"(%[dst]) \n\t" \ -+ "sb %[temp5], " #R "(%[dst]) \n\t" \ -+ "sb %[temp6], " #G "(%[dst]) \n\t" \ -+ "sb %[temp7], " #B "(%[dst]) \n\t" \ - - #define ASM_CLOBBER_LIST() \ - : [temp0]"=&r"(temp0), [temp1]"=&r"(temp1), [temp2]"=&r"(temp2), \ --- -2.1.4 - diff --git a/package.bak/libfreeimage/0004-fix-gcc-6.patch b/package.bak/libfreeimage/0004-fix-gcc-6.patch deleted file mode 100644 index 0f10dec715..0000000000 --- a/package.bak/libfreeimage/0004-fix-gcc-6.patch +++ /dev/null @@ -1,31 +0,0 @@ -libraw/dc_raw: fix gcc-6 failures - -With gcc-6, it is no longer allowed to narrow the type of constants in -a constant array declaration. - -Fixes: - http://autobuild.buildroot.org/results/081/0811531872f69f9febbdc482dfbdd7fb5c35d1c8/build-end.log - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/Source/LibRawLite/internal/dcraw_common.cpp b/Source/LibRawLite/internal/dcraw_common.cpp ---- a/Source/LibRawLite/internal/dcraw_common.cpp -+++ b/Source/LibRawLite/internal/dcraw_common.cpp -@@ -2479,7 +2479,7 @@ - - void CLASS kodak_radc_load_raw() - { -- static const char src[] = { -+ static const signed char src[] = { - 1,1, 2,3, 3,4, 4,2, 5,7, 6,5, 7,6, 7,8, - 1,0, 2,1, 3,3, 4,4, 5,2, 6,7, 7,6, 8,5, 8,8, - 2,1, 2,3, 3,0, 3,2, 3,4, 4,6, 5,5, 6,7, 6,8, -@@ -4519,7 +4519,7 @@ - */ - void CLASS vng_interpolate() - { -- static const signed char *cp, terms[] = { -+ static const int *cp, terms[] = { - -2,-2,+0,-1,0,0x01, -2,-2,+0,+0,1,0x01, -2,-1,-1,+0,0,0x01, - -2,-1,+0,-1,0,0x02, -2,-1,+0,+0,0,0x03, -2,-1,+0,+1,1,0x01, - -2,+0,+0,-1,0,0x06, -2,+0,+0,+0,1,0x02, -2,+0,+0,+1,0,0x03, diff --git a/package.bak/libfreeimage/Config.in b/package.bak/libfreeimage/Config.in deleted file mode 100644 index 4b462cb633..0000000000 --- a/package.bak/libfreeimage/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_LIBFREEIMAGE - bool "libfreeimage" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - # compiler issue: "Error: invalid register number `63'" - depends on !BR2_arc - # Numerous build issues - depends on !BR2_bfin - help - FreeImage is an Open Source library project for developers who - would like to support popular graphics image formats like PNG, - BMP, JPEG, TIFF and others as needed by today's multimedia - applications. - - http://freeimage.sourceforge.net - -comment "libfreeimage needs a toolchain w/ C++, dynamic library, wchar" - depends on !BR2_arc - depends on !BR2_bfin - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package.bak/libfreeimage/libfreeimage.hash b/package.bak/libfreeimage/libfreeimage.hash deleted file mode 100644 index 4e69508be9..0000000000 --- a/package.bak/libfreeimage/libfreeimage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 fbfc65e39b3d4e2cb108c4ffa8c41fd02c07d4d436c594fff8dab1a6d5297f89 FreeImage3170.zip diff --git a/package.bak/libfreeimage/libfreeimage.mk b/package.bak/libfreeimage/libfreeimage.mk deleted file mode 100644 index fe79689fdd..0000000000 --- a/package.bak/libfreeimage/libfreeimage.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# libfreeimage -# -################################################################################ - -LIBFREEIMAGE_VERSION = 3.17.0 -LIBFREEIMAGE_SITE = http://downloads.sourceforge.net/freeimage -LIBFREEIMAGE_SOURCE = FreeImage$(subst .,,$(LIBFREEIMAGE_VERSION)).zip -LIBFREEIMAGE_LICENSE = GPLv2 or GPLv3 or FreeImage Public License -LIBFREEIMAGE_LICENSE_FILES = license-gplv2.txt license-gplv3.txt license-fi.txt -LIBFREEIMAGE_INSTALL_STAGING = YES - -define LIBFREEIMAGE_EXTRACT_CMDS - $(UNZIP) $(DL_DIR)/$(LIBFREEIMAGE_SOURCE) -d $(@D) - mv $(@D)/FreeImage/* $(@D) - rmdir $(@D)/FreeImage -endef - -define LIBFREEIMAGE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define LIBFREEIMAGE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define LIBFREEIMAGE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) - diff --git a/package.bak/libfribidi/Config.in b/package.bak/libfribidi/Config.in deleted file mode 100644 index 74d9c5b431..0000000000 --- a/package.bak/libfribidi/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBFRIBIDI - bool "libfribidi" - help - GNU FriBidi is an implementation of the Unicode - Bidirectional Algorithm (bidi). - - http://www.fribidi.org/ diff --git a/package.bak/libfribidi/libfribidi.hash b/package.bak/libfribidi/libfribidi.hash deleted file mode 100644 index 79b5dd3185..0000000000 --- a/package.bak/libfribidi/libfribidi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.fribidi.org/download/fribidi-0.19.7.tar.bz2.sha256 -sha256 08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e fribidi-0.19.7.tar.bz2 diff --git a/package.bak/libfribidi/libfribidi.mk b/package.bak/libfribidi/libfribidi.mk deleted file mode 100644 index 751a1b6066..0000000000 --- a/package.bak/libfribidi/libfribidi.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libfribidi -# -################################################################################ - -LIBFRIBIDI_VERSION = 0.19.7 -LIBFRIBIDI_SOURCE = fribidi-$(LIBFRIBIDI_VERSION).tar.bz2 -LIBFRIBIDI_SITE = http://www.fribidi.org/download -LIBFRIBIDI_LICENSE = LGPLv2.1+ -LIBFRIBIDI_LICENSE_FILES = COPYING -LIBFRIBIDI_INSTALL_STAGING = YES -# Ships a beta libtool version hence our patch doesn't apply. -# Run autoreconf to regenerate ltmain.sh. -LIBFRIBIDI_AUTORECONF = YES -LIBFRIBIDI_DEPENDENCIES = host-pkgconf -# libglib2 dependency causes a build failure, and this optional -# dependency is going to be removed upstream, see -# https://github.com/behdad/fribidi/pull/14 -LIBFRIBIDI_CONF_OPTS = --with-glib=no - -$(eval $(autotools-package)) diff --git a/package.bak/libftdi/0001_pkgconfig_libusb.patch b/package.bak/libftdi/0001_pkgconfig_libusb.patch deleted file mode 100644 index 389291de00..0000000000 --- a/package.bak/libftdi/0001_pkgconfig_libusb.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- - configure.in | 35 +++++++++++------------------------ - 1 file changed, 11 insertions(+), 24 deletions(-) - ---- a/configure.in -+++ b/configure.in -@@ -8,30 +8,17 @@ - AM_PROG_LIBTOOL - AC_PROG_CXX - --dnl check for libusb-config --AC_CHECK_TOOL(HAVELIBUSB, libusb-config) -- --if test ! -z "$HAVELIBUSB"; then -- LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -- -- CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -- LIBS="$LIBS $LIBUSB_LIBS" --else -- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation.]) --fi -- --dnl check for version of libusb --AC_MSG_CHECKING([if libusb version is >= 0.1.7]) --libusb_version_needed="1007" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` -+dnl check for libusb -+PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11) -+CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -+LIBS="$LIBS $LIBUSB_LIBS" - --if test $libusb_version -lt $libusb_version_needed; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.7.]) --else -- AC_MSG_RESULT(yes) --fi -+dnl Check for recent pkg-config which supports Requires.private -+case `$PKG_CONFIG --version` in -+0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;; -+*) PKGCONFIG_REQUIRES="Requires.private"; ;; -+esac -+AC_SUBST(PKGCONFIG_REQUIRES) - - ENABLE_ASYNC_MODE=0 - AC_ARG_WITH(async-mode, diff --git a/package.bak/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch b/package.bak/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch deleted file mode 100644 index ee47af6058..0000000000 --- a/package.bak/libftdi/0002-libftdi.pc-requires-libusb-fix-static-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From d3d6ca63cb86727533d7d83c98e70002bb04f343 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Wed, 21 Jan 2015 11:18:59 +0100 -Subject: [PATCH] libftdi.pc: requires libusb (fix static build) - ---- - libftdi.pc.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libftdi.pc.in b/libftdi.pc.in -index 2061b91..57f0a09 100644 ---- a/libftdi.pc.in -+++ b/libftdi.pc.in -@@ -5,8 +5,8 @@ includedir=@includedir@ - - Name: libftdi - Description: Library to program and control the FTDI USB controller --Requires: -+Requires: libusb - Version: @VERSION@ --Libs: -L${libdir} -lftdi -lusb -+Libs: -L${libdir} -lftdi - Cflags: -I${includedir} - --- -2.1.0 - diff --git a/package.bak/libftdi/Config.in b/package.bak/libftdi/Config.in deleted file mode 100644 index beb42d34c5..0000000000 --- a/package.bak/libftdi/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_LIBFTDI - bool "libftdi" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Userspace access to FTDI USB interface chips - - http://www.intra2net.com/en/developer/libftdi/index.php - -if BR2_PACKAGE_LIBFTDI - -config BR2_PACKAGE_LIBTFDI_CPP - bool "C++ bindings" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - select BR2_PACKAGE_BOOST - help - C++ bindings for libftdi - -comment "libftdi C++ bindings need a toolchain w/ wchar, C++" - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP - -endif # BR2_PACKAGE_LIBFTDI - -comment "libftdi needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libftdi/libftdi.hash b/package.bak/libftdi/libftdi.hash deleted file mode 100644 index 5d9f8765db..0000000000 --- a/package.bak/libftdi/libftdi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed (after checking the signature from http://www.intra2net.com/en/developer/libftdi/download.php) -sha256 3176d5b5986438f33f5208e690a8bfe90941be501cc0a72118ce3d338d4b838e libftdi-0.20.tar.gz diff --git a/package.bak/libftdi/libftdi.mk b/package.bak/libftdi/libftdi.mk deleted file mode 100644 index c1952ac68b..0000000000 --- a/package.bak/libftdi/libftdi.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libftdi -# -################################################################################ - -LIBFTDI_VERSION = 0.20 -LIBFTDI_SITE = http://www.intra2net.com/en/developer/libftdi/download -LIBFTDI_DEPENDENCIES = libusb-compat libusb -HOST_LIBFTDI_DEPENDENCIES = host-libusb-compat host-libusb -LIBFTDI_INSTALL_STAGING = YES -LIBFTDI_CONFIG_SCRIPTS = libftdi-config -LIBFTDI_AUTORECONF = YES - -LIBFTDI_CONF_OPTS = --without-examples - -# configure detect it automaticaly so we need to force it -ifeq ($(BR2_PACKAGE_LIBTFDI_CPP),y) -LIBFTDI_DEPENDENCIES += boost -LIBFTDI_CONF_OPTS += --enable-libftdipp -else -LIBFTDI_CONF_OPTS += --disable-libftdipp -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/package.bak/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch deleted file mode 100644 index 487fc28215..0000000000 --- a/package.bak/libftdi1/0001-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 7e57ff280b55b45e74329b9988279e8831d32eab Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 25 Jan 2015 09:45:04 +0100 -Subject: [PATCH 1/2] cmake: use the standard CMake flag to drive the shared - object build - -Remove the STATICLIBS CMake option (and the code handling it) and let -the standard CMake flags drive the shared object build. - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 2 -- - ftdipp/CMakeLists.txt | 15 +-------------- - src/CMakeLists.txt | 13 +------------ - 3 files changed, 2 insertions(+), 28 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 74f80f4..0ba0b08 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -46,8 +46,6 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development") - set(CPACK_COMPONENT_STATICLIBS_GROUP "Development") - set(CPACK_COMPONENT_HEADERS_GROUP "Development") - --option ( STATICLIBS "Build static libraries" ON ) -- - # guess LIB_SUFFIX, don't take debian multiarch into account - if ( NOT DEFINED LIB_SUFFIX ) - if( CMAKE_SYSTEM_NAME MATCHES "Linux" -diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 7500211..27e7884 100644 ---- a/ftdipp/CMakeLists.txt -+++ b/ftdipp/CMakeLists.txt -@@ -23,8 +23,7 @@ if (FTDIPP) - set(FTDI_BUILD_CPP True PARENT_SCOPE) - message(STATUS "Building libftdi1++") - -- # Shared library -- add_library(ftdipp1 SHARED ${cpp_sources}) -+ add_library(ftdipp1 ${cpp_sources}) - - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases - set_target_properties(ftdipp1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) -@@ -41,18 +40,6 @@ if (FTDIPP) - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) -- -- # Static library -- if ( STATICLIBS ) -- add_library(ftdipp1-static STATIC ${cpp_sources}) -- set_target_properties(ftdipp1-static PROPERTIES OUTPUT_NAME "ftdipp1") -- set_target_properties(ftdipp1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) -- -- install ( TARGETS ftdipp1-static -- ARCHIVE DESTINATION lib${LIB_SUFFIX} -- COMPONENT staticlibs -- ) -- endif () - - install ( FILES ${cpp_headers} - DESTINATION include/${PROJECT_NAME} -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9fd86a6..501d4a8 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -21,7 +21,7 @@ configure_file(ftdi_version_i.h.in "${CMAKE_CURRENT_BINARY_DIR}/ftdi_version_i.h - set(c_sources ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.c ${CMAKE_CURRENT_SOURCE_DIR}/ftdi_stream.c CACHE INTERNAL "List of c sources" ) - set(c_headers ${CMAKE_CURRENT_SOURCE_DIR}/ftdi.h CACHE INTERNAL "List of c headers" ) - --add_library(ftdi1 SHARED ${c_sources}) -+add_library(ftdi1 ${c_sources}) - - math(EXPR VERSION_FIXUP "${MAJOR_VERSION} + 1") # Compatiblity with previous releases - set_target_properties(ftdi1 PROPERTIES VERSION ${VERSION_FIXUP}.${MINOR_VERSION}.0 SOVERSION 2) -@@ -38,17 +38,6 @@ install ( TARGETS ftdi1 - ARCHIVE DESTINATION lib${LIB_SUFFIX} - ) - --if ( STATICLIBS ) -- add_library(ftdi1-static STATIC ${c_sources}) -- target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES}) -- set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") -- set_target_properties(ftdi1-static PROPERTIES CLEAN_DIRECT_OUTPUT 1) -- install ( TARGETS ftdi1-static -- ARCHIVE DESTINATION lib${LIB_SUFFIX} -- COMPONENT staticlibs -- ) --endif () -- - install ( FILES ${c_headers} - DESTINATION include/${PROJECT_NAME} - COMPONENT headers --- -2.2.2 - diff --git a/package.bak/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch b/package.bak/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch deleted file mode 100644 index 5619a0ceec..0000000000 --- a/package.bak/libftdi1/0002-cmake-fix-FindUSB1.cmake.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 81275d75ae88fe8ab1915d3ba260ea935e63c362 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 25 Jan 2015 10:01:17 +0100 -Subject: [PATCH 2/2] cmake: fix FindUSB1.cmake - -Make sure all ldflags are correctly set, especially for static build. - -Signed-off-by: Samuel Martin ---- - cmake/FindUSB1.cmake | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake -index b90e297..e7f1b3c 100644 ---- a/cmake/FindUSB1.cmake -+++ b/cmake/FindUSB1.cmake -@@ -26,8 +26,12 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) - PATH_SUFFIXES libusb-1.0 - PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - -- FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 -- PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ set(LIBUSB_LIBRARIES ${PC_LIBUSB_STATIC_LDFLAGS} ${PC_LIBUSB_STATIC_LDFLAGS_OTHER}) -+ foreach(libname ${PC_LIBUSB_STATIC_LIBRARIES}) -+ FIND_LIBRARY(lib NAMES ${libname} -+ PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) -+ list(APPEND LIBUSB_LIBRARIES ${lib}) -+ endforeach() - - include(FindPackageHandleStandardArgs) - FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR) --- -2.2.2 - diff --git a/package.bak/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch b/package.bak/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch deleted file mode 100644 index be0913de4a..0000000000 --- a/package.bak/libftdi1/0003-cmake-do-not-check-for-g-when-FTDIPP-is-disabled.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c215d5ecd985b57700e817920d0e99112b4a571b Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 25 Jan 2015 13:35:24 +0100 -Subject: [PATCH] cmake: do not check for g++ when FTDIPP is disabled - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 6 ++++-- - ftdipp/CMakeLists.txt | 1 + - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0ba0b08..e880211 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,5 +1,5 @@ - # Project --project(libftdi1) -+project(libftdi1 C) - set(MAJOR_VERSION 1) - set(MINOR_VERSION 2) - set(PACKAGE libftdi1) -@@ -145,7 +145,9 @@ else(DOCUMENTATION AND DOXYGEN_FOUND) - endif(DOCUMENTATION AND DOXYGEN_FOUND) - - add_subdirectory(src) --add_subdirectory(ftdipp) -+if(FTDIPP) -+ add_subdirectory(ftdipp) -+endif() - add_subdirectory(python) - add_subdirectory(ftdi_eeprom) - add_subdirectory(examples) -diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt -index 27e7884..2d080f4 100644 ---- a/ftdipp/CMakeLists.txt -+++ b/ftdipp/CMakeLists.txt -@@ -1,4 +1,5 @@ - # Check -+project(libftdipp1 C CXX) - set(FTDI_BUILD_CPP False PARENT_SCOPE) - - option ( FTDIPP "Build C++ binding library libftdi1++" ON ) --- -2.2.2 - diff --git a/package.bak/libftdi1/Config.in b/package.bak/libftdi1/Config.in deleted file mode 100644 index aca797b62a..0000000000 --- a/package.bak/libftdi1/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_LIBFTDI1 - bool "libftdi1" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Userspace access to FTDI USB interface chips (version 1.x) - - http://www.intra2net.com/en/developer/libftdi/index.php - -if BR2_PACKAGE_LIBFTDI1 - -config BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1 - bool "libftdipp1" - select BR2_PACKAGE_BOOST - depends on BR2_INSTALL_LIBSTDCPP # boost - depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_USE_WCHAR # boost - help - C++ bindings for libftdi - -comment "libftdipp1 needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -config BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS - bool "python bindings" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - help - Python bindings for libftdi - -config BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM - select BR2_PACKAGE_LIBCONFUSE - bool "ftdi_eeprom tool" - -endif # BR2_PACKAGE_LIBFTDI1 - -comment "libftdi1 needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libftdi1/libftdi1.hash b/package.bak/libftdi1/libftdi1.hash deleted file mode 100644 index 0a89182449..0000000000 --- a/package.bak/libftdi1/libftdi1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed (after checking the signature from http://www.intra2net.com/en/developer/libftdi/download.php) -sha256 9a8c95c94bfbcf36584a0a58a6e2003d9b133213d9202b76aec76302ffaa81f4 libftdi1-1.3.tar.bz2 diff --git a/package.bak/libftdi1/libftdi1.mk b/package.bak/libftdi1/libftdi1.mk deleted file mode 100644 index 26aa293b33..0000000000 --- a/package.bak/libftdi1/libftdi1.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# libftdi1 -# -################################################################################ - -LIBFTDI1_VERSION = 1.3 -LIBFTDI1_SOURCE = libftdi1-$(LIBFTDI1_VERSION).tar.bz2 -LIBFTDI1_SITE = http://www.intra2net.com/en/developer/libftdi/download -LIBFTDI1_INSTALL_STAGING = YES -LIBFTDI1_DEPENDENCIES = libusb -LIBFTDI1_LICENSE = LGPLv2 (libftdi1), GPLv2 with exception (ftdipp1) -LIBFTDI1_LICENSE_FILES = LICENSE COPYING.GPL COPYING.LIB -LIBFTDI1_CONF_OPTS = -DDOCUMENTATION=OFF -DEXAMPLES=OFF - -ifeq ($(BR2_PACKAGE_LIBFTDI1_LIBFTDIPP1),y) -LIBFTDI1_DEPENDENCIES += boost -LIBFTDI1_CONF_OPTS += -DFTDIPP=ON -else -LIBFTDI1_CONF_OPTS += -DFTDIPP=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBFTDI1_PYTHON_BINDINGS),y) -LIBFTDI1_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) host-swig -LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=ON -else -LIBFTDI1_CONF_OPTS += -DPYTHON_BINDINGS=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBFTDI1_FDTI_EEPROM),y) -# ftdi_eeprom optionally depends on libintl, so make sure gettext is built -# _before_ libfitdi1 when gettext is enbaled. -LIBFTDI1_DEPENDENCIES += libconfuse $(if $(BR2_PACKAGE_GETTEXT),gettext) -LIBFTDI1_CONF_OPTS += -DFTDI_EEPROM=ON -else -LIBFTDI1_CONF_OPTS += -DFTDI_EEPROM=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libfuse/0001-fix-aarch64-build.patch b/package.bak/libfuse/0001-fix-aarch64-build.patch deleted file mode 100644 index 3b88687f6c..0000000000 --- a/package.bak/libfuse/0001-fix-aarch64-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build on the AArch64 platform - -Upstream-Status: Submitted - -Signed-off-by: Riku Voipio - ---- a/include/fuse_kernel.h -+++ b/include/fuse_kernel.h -@@ -88,12 +88,7 @@ - #ifndef _LINUX_FUSE_H - #define _LINUX_FUSE_H - --#include --#define __u64 uint64_t --#define __s64 int64_t --#define __u32 uint32_t --#define __s32 int32_t --#define __u16 uint16_t -+#include - - /* - * Version negotiation: diff --git a/package.bak/libfuse/Config.in b/package.bak/libfuse/Config.in deleted file mode 100644 index 2b0e31a991..0000000000 --- a/package.bak/libfuse/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBFUSE - bool "libfuse" - # Really doesn't like static, see fuse/lib/fuse.c - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - FUSE (Filesystem in UserSpacE) - - https://github.com/libfuse/libfuse - -comment "libfuse needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libfuse/libfuse.hash b/package.bak/libfuse/libfuse.hash deleted file mode 100644 index 60bdf63990..0000000000 --- a/package.bak/libfuse/libfuse.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 832432d1ad4f833c20e13b57cf40ce5277a9d33e483205fc63c78111b3358874 fuse-2.9.7.tar.gz diff --git a/package.bak/libfuse/libfuse.mk b/package.bak/libfuse/libfuse.mk deleted file mode 100644 index 57aabcd97a..0000000000 --- a/package.bak/libfuse/libfuse.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# libfuse -# -################################################################################ - -LIBFUSE_VERSION = 2.9.7 -LIBFUSE_SOURCE = fuse-$(LIBFUSE_VERSION).tar.gz -LIBFUSE_SITE = https://github.com/libfuse/libfuse/releases/download/fuse-$(LIBFUSE_VERSION) -LIBFUSE_LICENSE = GPLv2, LGPLv2.1 -LIBFUSE_LICENSE_FILES = COPYING COPYING.LIB -LIBFUSE_INSTALL_STAGING = YES -LIBFUSE_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) -LIBFUSE_CONF_OPTS = \ - --disable-example \ - --enable-lib \ - --enable-util - -define LIBFUSE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/fusermount $(TARGET_DIR)/usr/bin/ - cp -dpf $(STAGING_DIR)/usr/lib/libfuse.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(autotools-package)) diff --git a/package.bak/libg7221/Config.in b/package.bak/libg7221/Config.in deleted file mode 100644 index e057d289fb..0000000000 --- a/package.bak/libg7221/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBG7221 - bool "libg7221" - help - libg722_1 is a library for the ITU G.722.1 and Annex C - wideband speech codecs. - - http://www.soft-switch.org diff --git a/package.bak/libg7221/libg7221.mk b/package.bak/libg7221/libg7221.mk deleted file mode 100644 index 813af11cee..0000000000 --- a/package.bak/libg7221/libg7221.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libg7221 -# -################################################################################ - -LIBG7221_VERSION = dbfc29d4806ecdace50379a2f4d68a992a6fec34 -# we use the FreeSwitch fork because it contains pkgconf support -LIBG7221_SITE = https://freeswitch.org/stash/scm/sd/libg7221.git -LIBG7221_SITE_METHOD = git -LIBG7221_LICENSE = Polycom -LIBG7221_LICENSE_FILES = COPYING -LIBG7221_AUTORECONF = YES -LIBG7221_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libgcrypt/0001-ac_cv_sys_symbol_underscore.patch b/package.bak/libgcrypt/0001-ac_cv_sys_symbol_underscore.patch deleted file mode 100644 index 95db0fbba8..0000000000 --- a/package.bak/libgcrypt/0001-ac_cv_sys_symbol_underscore.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/acinclude.m4 b/acinclude.m4 -index a7bc0fa..1a5bffc 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -76,13 +76,14 @@ case "${host}" in - i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes - ;; -- *) -- if test "$cross_compiling" = yes; then -- if test "x$ac_cv_sys_symbol_underscore" = x ; then -- ac_cv_sys_symbol_underscore=yes -- fi -- else -- tmp_do_check="yes" -+ *) if test -z "$ac_cv_sys_symbol_underscore"; then -+ if test "$cross_compiling" = yes; then -+ if test "x$ac_cv_sys_symbol_underscore" = x ; then -+ ac_cv_sys_symbol_underscore=yes -+ fi -+ else -+ tmp_do_check="yes" -+ fi - fi - ;; - esac - diff --git a/package.bak/libgcrypt/0002-reconfigure.patch b/package.bak/libgcrypt/0002-reconfigure.patch deleted file mode 100644 index 87d29a298b..0000000000 --- a/package.bak/libgcrypt/0002-reconfigure.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/configure b/configure -index 70a6d50..8f55d95 100755 ---- a/configure -+++ b/configure -@@ -22306,14 +22306,15 @@ case "${host}" in - i386-emx-os2 | i345686-pc-os2*emx | i386-pc-msdosdjgpp) - ac_cv_sys_symbol_underscore=yes - ;; -- *) -- if test "$cross_compiling" = yes; then -- if test "x$ac_cv_sys_symbol_underscore" = x ; then -- ac_cv_sys_symbol_underscore=yes -+ *)if test -z "$ac_cv_sys_symbol_underscore";then -+ if test "$cross_compiling" = yes; then -+ if test "x$ac_cv_sys_symbol_underscore" = x ; then -+ ac_cv_sys_symbol_underscore=yes -+ fi -+ else -+ tmp_do_check="yes" -+ fi - fi -- else -- tmp_do_check="yes" -- fi - ;; - esac - if test "$tmp_do_check" = "yes"; then diff --git a/package.bak/libgcrypt/Config.in b/package.bak/libgcrypt/Config.in deleted file mode 100644 index d3e5d4f7a2..0000000000 --- a/package.bak/libgcrypt/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBGCRYPT - bool "libgcrypt" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - select BR2_PACKAGE_LIBGPG_ERROR - help - LibGCrypt is GNU's basic cryptographic library. - - http://www.gnu.org/software/libgcrypt/ diff --git a/package.bak/libgcrypt/libgcrypt.hash b/package.bak/libgcrypt/libgcrypt.hash deleted file mode 100644 index 48bbd6af54..0000000000 --- a/package.bak/libgcrypt/libgcrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 626aafee84af9d2ce253d2c143dc1c0902dda045780cc241f39970fc60be05bc libgcrypt-1.7.6.tar.bz2 diff --git a/package.bak/libgcrypt/libgcrypt.mk b/package.bak/libgcrypt/libgcrypt.mk deleted file mode 100644 index a034358b3d..0000000000 --- a/package.bak/libgcrypt/libgcrypt.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# libgcrypt -# -################################################################################ - -LIBGCRYPT_VERSION = 1.7.6 -LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 -LIBGCRYPT_LICENSE = LGPLv2.1+ -LIBGCRYPT_LICENSE_FILES = COPYING.LIB -LIBGCRYPT_SITE = ftp://ftp.gnupg.org/gcrypt/libgcrypt -LIBGCRYPT_INSTALL_STAGING = YES -LIBGCRYPT_DEPENDENCIES = libgpg-error -LIBGCRYPT_CONFIG_SCRIPTS = libgcrypt-config - -LIBGCRYPT_CONF_ENV = \ - ac_cv_sys_symbol_underscore=no -LIBGCRYPT_CONF_OPTS = \ - --with-gpg-error-prefix=$(STAGING_DIR)/usr - -# Libgcrypt doesn't support assembly for coldfire -ifeq ($(BR2_m68k_cf),y) -LIBGCRYPT_CONF_OPTS += --disable-asm -endif - -# Code doesn't build in thumb mode -ifeq ($(BR2_arm),y) -LIBGCRYPT_CONF_ENV += CFLAGS="$(patsubst -mthumb,,$(TARGET_CFLAGS))" -endif - -# Tests use fork() -define LIBGCRYPT_DISABLE_TESTS - $(SED) 's/ tests//' $(@D)/Makefile.in -endef - -LIBGCRYPT_POST_PATCH_HOOKS += LIBGCRYPT_DISABLE_TESTS - -$(eval $(autotools-package)) diff --git a/package.bak/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch b/package.bak/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch deleted file mode 100644 index db67d467df..0000000000 --- a/package.bak/libgdiplus/0001-Fix-compile-error-when-cross-compiling.patch +++ /dev/null @@ -1,35 +0,0 @@ -From daf96b07c02734dceaf3c3b78c10e4e758b74d9e Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Fri, 18 Dec 2015 15:08:58 -0200 -Subject: [PATCH 1/1] Fix compile error when cross-compiling. - -When cross-compiling with libjpeg enabled, we can get errors like the -following when linking: - -sh-linux-gnu-gcc: ERROR: unsafe header/library path used in -cross-compilation: '/lib' - -That's because there is an error in the configure script that are not -generating ldflags correctly, and are trying to link with -L/lib. - -Signed-off-by: Sergio Prado ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 772d5fc9d87a..58d55ade48e3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -223,7 +223,7 @@ AC_ARG_WITH([libjpeg], - jpeg_ok=no) - AC_MSG_RESULT($jpeg_ok) - if test "$jpeg_ok" = yes; then -- JPEG='jpeg'; LIBJPEG='-L${libjpeg_prefix}/lib -ljpeg' -+ JPEG='jpeg'; LIBJPEG="-L${libjpeg_prefix}/lib -ljpeg" - else - AC_MSG_WARN(*** JPEG loader will not be built (JPEG header file not found) ***) - fi --- -1.9.1 - diff --git a/package.bak/libgdiplus/Config.in b/package.bak/libgdiplus/Config.in deleted file mode 100644 index 68625031e2..0000000000 --- a/package.bak/libgdiplus/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBGDIPLUS - bool "libgdiplus" - select BR2_PACKAGE_XLIB_LIBXFT - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_LIBPNG - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 -> gettext - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - An Open Source implementation of the GDI+ API. - - https://github.com/mono/libgdiplus - -comment "libgdiplus needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libgdiplus/libgdiplus.hash b/package.bak/libgdiplus/libgdiplus.hash deleted file mode 100644 index f7fdcb58a4..0000000000 --- a/package.bak/libgdiplus/libgdiplus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 98f8a8e58ed22e136c4ac6eaafbc860757f5a97901ecc0ea357e2b6e4cfa2be5 libgdiplus-4.2.tar.gz diff --git a/package.bak/libgdiplus/libgdiplus.mk b/package.bak/libgdiplus/libgdiplus.mk deleted file mode 100644 index aac859f865..0000000000 --- a/package.bak/libgdiplus/libgdiplus.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# libgdiplus -# -################################################################################ - -LIBGDIPLUS_VERSION = 4.2 -LIBGDIPLUS_SITE = $(call github,mono,libgdiplus,$(LIBGDIPLUS_VERSION)) - -# Although there is a LICENSE file thas specifies LGPL or MPLv1.1, -# looks like it is incorrect. The actual source files specify that -# they're licensed under MIT, and so does the COPYING file (and they -# all predate the addition of the LICENSE file). -LIBGDIPLUS_LICENSE = MIT -LIBGDIPLUS_LICENSE_FILES = COPYING src/carbon-private.h - -LIBGDIPLUS_INSTALL_STAGING = YES - -# github tarball doesn't have configure -LIBGDIPLUS_AUTORECONF = YES - -LIBGDIPLUS_DEPENDENCIES = xlib_libXft libglib2 cairo libpng host-pkgconf - -# API changes in recent versions of libgif makes it incompatible with -# this version of libgdiplus, so we are disabling it for now. -LIBGDIPLUS_CONF_OPTS = --without-libgif - -# there is a bug in the configure script that enables pango support -# when passing --without-pango, so let's just not use it -ifeq ($(BR2_PACKAGE_PANGO),y) -LIBGDIPLUS_CONF_OPTS += --with-pango -LIBGDIPLUS_DEPENDENCIES += pango -endif - -ifeq ($(BR2_PACKAGE_LIBEXIF),y) -LIBGDIPLUS_CONF_OPTS += --with-libexif -LIBGDIPLUS_DEPENDENCIES += libexif -else -LIBGDIPLUS_CONF_OPTS += --without-libexif -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBGDIPLUS_CONF_OPTS += --with-libjpeg=$(STAGING_DIR)/usr -LIBGDIPLUS_DEPENDENCIES += jpeg -else -LIBGDIPLUS_CONF_OPTS += --without-libjpeg -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -LIBGDIPLUS_CONF_OPTS += --with-libtiff=$(STAGING_DIR)/usr -LIBGDIPLUS_DEPENDENCIES += tiff -else -LIBGDIPLUS_CONF_OPTS += --without-libtiff -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libgee/Config.in b/package.bak/libgee/Config.in deleted file mode 100644 index 07c387c985..0000000000 --- a/package.bak/libgee/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBGEE - bool "libgee" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBGLIB2 - help - Libgee is an utility library providing GObject-based - interfaces and classes for commonly used data structures. - - https://wiki.gnome.org/Projects/Libgee - -comment "libgee needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libgee/libgee.hash b/package.bak/libgee/libgee.hash deleted file mode 100644 index 83ac810156..0000000000 --- a/package.bak/libgee/libgee.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/libgee/0.18/libgee-0.18.1.sha256sum -sha256 99686bbe5a9c89ba9502c25f61314ee8efa0dd2a1159c9a639afc1458c2839a2 libgee-0.18.1.tar.xz diff --git a/package.bak/libgee/libgee.mk b/package.bak/libgee/libgee.mk deleted file mode 100644 index 1df54d2b34..0000000000 --- a/package.bak/libgee/libgee.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libgee -# -################################################################################ - -LIBGEE_VERSION_MAJOR = 0.18 -LIBGEE_VERSION = $(LIBGEE_VERSION_MAJOR).1 -LIBGEE_SITE = http://ftp.gnome.org/pub/gnome/sources/libgee/$(LIBGEE_VERSION_MAJOR) -LIBGEE_SOURCE = libgee-$(LIBGEE_VERSION).tar.xz -LIBGEE_DEPENDENCIES = host-pkgconf host-vala libglib2 -LIBGEE_INSTALL_STAGING = YES -LIBGEE_LICENSE = LGPLv2.1+ -LIBGEE_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libgeotiff/0001-use-pkg-config.patch b/package.bak/libgeotiff/0001-use-pkg-config.patch deleted file mode 100644 index a4b11f1523..0000000000 --- a/package.bak/libgeotiff/0001-use-pkg-config.patch +++ /dev/null @@ -1,79 +0,0 @@ -Use pkg-config for libtiff detection - -Using pkg-config allows proper behavior in static-only contexts: the -libtiff library might depend on libz and libjpeg. - -This patch also fixes a few other issues in the configure.ac script -that prevents autoreconf to work, or proper detection of the proj -library. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -196,39 +196,12 @@ - - TIFF_CONFIG="no" - --AC_ARG_WITH(libtiff, [ --with-libtiff=dir Use libtiff in directory dir],,) -- --if test "$with_libtiff" != "" ; then -- if test -f $with_libtiff/include/tiffio.h -a -d $with_libtiff/lib ; then -- LIBS="-L$with_libtiff/lib -ltiff $LIBS" -- TIFF_INC=-I$with_libtiff/include -- else -- LIBS="-L$with_libtiff -ltiff $LIBS" -- TIFF_INC=-I$with_libtiff -- fi -- LIBS_SAVED="$LIBS" -- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([failed to link with -ltiff to find TIFFOpen]),-lm) -- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade or use an older version of libgeotiff.]),-lm) -- LIBS="$LIBS_SAVED" --else -- AC_CHECK_LIB(tiff,TIFFOpen,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([You will need to substantially rewrite libxtiff to --build libgeotiff without libtiff]),-lm) -- LIBS_SAVED="$LIBS" -- AC_CHECK_LIB(tiff,TIFFMergeFieldInfo,[TIFF_CONFIG=yes], -- AC_MSG_ERROR([Libtiff 3.6.0 Beta or later required for this version of --libgeotiff. Please upgrade libtiff or use an older version of libgeotiff.]),-lm) -- LIBS="$LIBS -ltiff" -- TIFF_INC= -- TIFF_CONFIG="yes" --fi -- -+PKG_CHECK_MODULES(LIBTIFF, libtiff-4) -+TIFF_INC="$LIBTIFF_CFLAGS" -+LIBS="$LIBS $LIBTIFF_LIBS" -+TIFF_CONFIG="yes" - - AC_SUBST([TIFF_INC]) --AC_SUBST([TIFF_PREFIX]) - AM_CONDITIONAL([TIFF_IS_CONFIG], [test ! x$TIFF_CONFIG = xno]) - - dnl -@@ -280,15 +253,16 @@ - PROJ_INC=-I$PROJ_INC - - AC_SUBST(PROJ_INC,$PROJ_INC) -- AC_DEFINE(HAVE_PROJECTS_H) -+ AC_DEFINE([HAVE_PROJECTS_H], [], [Whether proj library header is available]) - AC_DEFINE(HAVE_LIBPROJ) - AC_SUBST([HAVE_LIBPROJ]) - PROJ_CONFIG="yes" -- - else - AC_CHECK_LIB(proj,pj_init,,,-lm) - AC_CHECK_HEADERS(proj_api.h,,) -- PROJ_CONFIG="yes" -+ if "$ac_cv_lib_proj_pj_init" = "yes" -a "$ac_cv_header_proj_api_h" = "yes"; then -+ PROJ_CONFIG="yes" -+ fi - fi - - AM_CONDITIONAL([PROJ_IS_CONFIG], [test ! x$PROJ_CONFIG = xno]) diff --git a/package.bak/libgeotiff/Config.in b/package.bak/libgeotiff/Config.in deleted file mode 100644 index 530cd450b4..0000000000 --- a/package.bak/libgeotiff/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBGEOTIFF - bool "libgeotiff" - select BR2_PACKAGE_TIFF - help - Libgeotiff is an open source library normally hosted on top of - libtiff for reading, and writing GeoTIFF information tags. - - http://geotiff.osgeo.org diff --git a/package.bak/libgeotiff/libgeotiff.hash b/package.bak/libgeotiff/libgeotiff.hash deleted file mode 100644 index 66b8cb74b2..0000000000 --- a/package.bak/libgeotiff/libgeotiff.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha1 4c6f405869826bb7d9f35f1d69167e3b44a57ef0 libgeotiff-1.4.0.tar.gz diff --git a/package.bak/libgeotiff/libgeotiff.mk b/package.bak/libgeotiff/libgeotiff.mk deleted file mode 100644 index 96f04c2e09..0000000000 --- a/package.bak/libgeotiff/libgeotiff.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# libgeotiff -# -################################################################################ - -LIBGEOTIFF_VERSION = 1.4.0 -LIBGEOTIFF_SITE = http://download.osgeo.org/geotiff/libgeotiff -LIBGEOTIFF_LICENSE = X11-style, public domain -LIBGEOTIFF_LICENSE_FILES = LICENSE -LIBGEOTIFF_DEPENDENCIES = tiff host-pkgconf -LIBGEOTIFF_INSTALL_STAGING = YES -LIBGEOTIFF_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBGEOTIFF_DEPENDENCIES += zlib -LIBGEOTIFF_CONF_OPTS += --with-zlib -else -LIBGEOTIFF_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBGEOTIFF_DEPENDENCIES += jpeg -LIBGEOTIFF_CONF_OPTS += --with-jpeg -else -LIBGEOTIFF_CONF_OPTS += --without-jpeg -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libglade/Config.in b/package.bak/libglade/Config.in deleted file mode 100644 index e269a07548..0000000000 --- a/package.bak/libglade/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBGLADE - bool "libglade" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_ATK - select BR2_PACKAGE_LIBXML2 - help - Libglade allows you to load glade interface files in a program - at runtime. It doesn't require GLADE to be used, but GLADE is - by far the easiest way to create the interface files. - - http://ftp.gnome.org/pub/GNOME/sources/libglade/ - -comment "libglade needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_LIBGTK2 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libglade/libglade.hash b/package.bak/libglade/libglade.hash deleted file mode 100644 index fdcc837efc..0000000000 --- a/package.bak/libglade/libglade.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libglade/2.6/libglade-2.6.4.sha256sum -sha256 64361e7647839d36ed8336d992fd210d3e8139882269bed47dc4674980165dec libglade-2.6.4.tar.bz2 diff --git a/package.bak/libglade/libglade.mk b/package.bak/libglade/libglade.mk deleted file mode 100644 index a6eea09c34..0000000000 --- a/package.bak/libglade/libglade.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libglade -# -################################################################################ - -LIBGLADE_VERSION_MAJOR = 2.6 -LIBGLADE_VERSION = $(LIBGLADE_VERSION_MAJOR).4 -LIBGLADE_SOURCE = libglade-$(LIBGLADE_VERSION).tar.bz2 -LIBGLADE_SITE = http://ftp.gnome.org/pub/GNOME/sources/libglade/$(LIBGLADE_VERSION_MAJOR) -LIBGLADE_INSTALL_STAGING = YES -LIBGLADE_DEPENDENCIES = host-pkgconf libglib2 libgtk2 atk libxml2 -LIBGLADE_LICENSE = LGPLv2+ -LIBGLADE_LICENSE_FILES = COPYING - -define LIBGLADE_INSTALL_FIX - rm -rf $(TARGET_DIR)/usr/share/xml/libglade \ - $(TARGET_DIR)/usr/bin/libglade-convert -endef - -LIBGLADE_POST_INSTALL_TARGET_HOOKS += LIBGLADE_INSTALL_FIX - -$(eval $(autotools-package)) diff --git a/package.bak/libglew/Config.in b/package.bak/libglew/Config.in deleted file mode 100644 index 67c49d4162..0000000000 --- a/package.bak/libglew/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBGLEW - bool "libglew" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXMU - help - The OpenGL Extension Wrangler Library (GLEW) is a cross-platform C/C++ - extension loading library. GLEW provides efficient run-time mechanisms - for determining which OpenGL extensions are supported on the target - platform. OpenGL core and extension functionality is exposed in a - single header file. - - http://glew.sourceforge.net - -comment "libglew depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/libglew/libglew.hash b/package.bak/libglew/libglew.hash deleted file mode 100644 index 44684ffc83..0000000000 --- a/package.bak/libglew/libglew.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://sourceforge.net/projects/glew/files/glew/2.0.0/ -sha1 6e15c84f7e1fad34cd3679f784a233744ddf048f glew-2.0.0.tgz -md5 2a2cd7c98f13854d2fcddae0d2b20411 glew-2.0.0.tgz -# Locally computed: -sha256 c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764 glew-2.0.0.tgz diff --git a/package.bak/libglew/libglew.mk b/package.bak/libglew/libglew.mk deleted file mode 100644 index 7af3affb91..0000000000 --- a/package.bak/libglew/libglew.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libglew -# -################################################################################ - -LIBGLEW_VERSION = 2.0.0 -LIBGLEW_SOURCE = glew-$(LIBGLEW_VERSION).tgz -LIBGLEW_SITE = http://sourceforge.net/projects/glew/files/glew/$(LIBGLEW_VERSION) -LIBGLEW_LICENSE = BSD-3c, MIT -LIBGLEW_LICENSE_FILES = LICENSE.txt -LIBGLEW_INSTALL_STAGING = YES -LIBGLEW_DEPENDENCIES = libgl xlib_libX11 xlib_libXext xlib_libXi xlib_libXmu - -# using $TARGET_CONFIGURE_OPTS breaks compilation -define LIBGLEW_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - GLEW_DEST="/usr" LIBDIR="/usr/lib" \ - AR="$(TARGET_AR)" CC="$(TARGET_CC)" \ - LD="$(TARGET_CC)" STRIP="$(TARGET_STRIP)" \ - POPT="$(TARGET_CFLAGS)" LDFLAGS.EXTRA="$(TARGET_LDFLAGS)" -endef - -define LIBGLEW_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - GLEW_DEST="$(STAGING_DIR)/usr" LIBDIR="$(STAGING_DIR)/usr/lib" \ - $(TARGET_CONFIGURE_OPTS) install -endef - -define LIBGLEW_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - GLEW_DEST="$(TARGET_DIR)/usr" LIBDIR="$(TARGET_DIR)/usr/lib" \ - $(TARGET_CONFIGURE_OPTS) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libglfw/Config.in b/package.bak/libglfw/Config.in deleted file mode 100644 index 045bd269e4..0000000000 --- a/package.bak/libglfw/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBGLFW - bool "libglfw" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR - help - GLFW is an Open Source, multi-platform library for creating - windows with OpenGL contexts and receiving input and events. - - http://www.glfw.org - -comment "libglfw depends on X.org and needs an OpenGL backend" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/libglfw/libglfw.hash b/package.bak/libglfw/libglfw.hash deleted file mode 100644 index 3226aad22d..0000000000 --- a/package.bak/libglfw/libglfw.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6ac642087682aaf7f8397761a41a99042b2c656498217a1c63ba9706d1eef122 libglfw-3.1.2.tar.gz diff --git a/package.bak/libglfw/libglfw.mk b/package.bak/libglfw/libglfw.mk deleted file mode 100644 index 0b1730d523..0000000000 --- a/package.bak/libglfw/libglfw.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libglfw -# -################################################################################ - -LIBGLFW_VERSION = 3.1.2 -LIBGLFW_SITE = $(call github,glfw,glfw,$(LIBGLFW_VERSION)) -LIBGLFW_INSTALL_STAGING = YES -LIBGLFW_DEPENDENCIES = libgl xlib_libXcursor xlib_libXext \ - xlib_libXinerama xlib_libXrandr -LIBGLFW_LICENSE = zlib -LIBGLFW_LICENSE_FILES = COPYING.txt - -LIBGLFW_CONF_OPTS += \ - -DGLFW_BUILD_EXAMPLES=OFF \ - -DGLFW_BUILD_TESTS=OFF \ - -DGLFW_BUILD_DOCS=OFF - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -LIBGLFW_DEPENDENCIES += xlib_libXi -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -LIBGLFW_DEPENDENCIES += xlib_libXxf86vm -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libglib2/0001-fix-compile-time-atomic-detection.patch b/package.bak/libglib2/0001-fix-compile-time-atomic-detection.patch deleted file mode 100644 index f6d0c5d6a5..0000000000 --- a/package.bak/libglib2/0001-fix-compile-time-atomic-detection.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] Fix compilation issues on architectures with limited atomic support - -Improved compile-time detection of atomic support in the compiler. - -Upstream-Status: submitted -See : https://bugzilla.gnome.org/show_bug.cgi?id=752731 - -Signed-off-by: Brendan Heading ---- - glib/gthread-posix.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c -index ae5d805..8db8557 100644 ---- a/glib/gthread-posix.c -+++ b/glib/gthread-posix.c -@@ -67,7 +67,7 @@ - #endif - - /* clang defines __ATOMIC_SEQ_CST but doesn't support the GCC extension */ --#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && !defined(__clang__) -+#if defined(HAVE_FUTEX) && defined(__ATOMIC_SEQ_CST) && defined(__GCC_HAVE_SYNC_COMPARE_AND_SWAP_4) && !defined(__clang__) - #define USE_NATIVE_MUTEX - #endif - --- -2.4.3 - diff --git a/package.bak/libglib2/0002-disable-tests.patch b/package.bak/libglib2/0002-disable-tests.patch deleted file mode 100644 index 1b0c535571..0000000000 --- a/package.bak/libglib2/0002-disable-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -Disable tests, some of them need python and sometimes host-python -gets mixed with distro python leading to build failures. - -Signed-off-by: Gustavo Zacarias - -diff -Nura glib-2.46.1.orig/gio/Makefile.am glib-2.46.1/gio/Makefile.am ---- glib-2.46.1.orig/gio/Makefile.am 2015-10-20 16:59:03.042212468 -0300 -+++ glib-2.46.1/gio/Makefile.am 2015-10-20 17:32:26.763146133 -0300 -@@ -233,7 +233,7 @@ - platform_deps += win32/libgiowin32.la - endif - --SUBDIRS += . tests -+SUBDIRS += . - - if HAVE_FAM - SUBDIRS += fam -diff -Nura glib-2.46.1.orig/glib/Makefile.am glib-2.46.1/glib/Makefile.am ---- glib-2.46.1.orig/glib/Makefile.am 2015-10-20 16:59:03.066213318 -0300 -+++ glib-2.46.1/glib/Makefile.am 2015-10-20 17:33:23.537155988 -0300 -@@ -33,8 +33,8 @@ - MAYBE_PCRE = pcre - endif - --SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests --DIST_SUBDIRS = libcharset gnulib pcre update-pcre tests -+SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . -+DIST_SUBDIRS = libcharset gnulib pcre update-pcre - - AM_CPPFLAGS = \ - $(glib_INCLUDES) \ -diff -Nura glib-2.46.1.orig/Makefile.am glib-2.46.1/Makefile.am ---- glib-2.46.1.orig/Makefile.am 2015-10-20 16:59:03.003211087 -0300 -+++ glib-2.46.1/Makefile.am 2015-10-20 17:32:20.923939420 -0300 -@@ -6,7 +6,7 @@ - - ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS} - --SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs tests -+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs - DIST_SUBDIRS = $(SUBDIRS) build - - bin_SCRIPTS = glib-gettextize diff --git a/package.bak/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch b/package.bak/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch deleted file mode 100644 index 364e179345..0000000000 --- a/package.bak/libglib2/0003-gio-2.0.pc-include-libmount-in-Libs.private.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ee32416dec8462ee27c3c254100cf980b0889ce0 Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Tue, 18 Oct 2016 23:04:50 +0530 -Subject: [PATCH] gio-2.0.pc: include libmount in Libs.private - -This helps with static linking. When application statically links with -libgio, it needs to link against libmount explicitly. When it is -mentioned in Libs.private, build system can figure out with which extra -libs to link against with help of pkg-config. - -This build failure is detected by Buildroot autobuilder: -http://autobuild.buildroot.net/results/fdf/fdf26abbed0014606a7788ce5d60828a0e871186 - -Signed-off-by: Rahul Bedarkar ---- - gio-2.0.pc.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio-2.0.pc.in b/gio-2.0.pc.in -index 899af0c..7574eb7 100644 ---- a/gio-2.0.pc.in -+++ b/gio-2.0.pc.in -@@ -14,5 +14,5 @@ Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 - Requires.private: gmodule-no-export-2.0 - Libs: -L${libdir} -lgio-2.0 --Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ -+Libs.private: @ZLIB_LIBS@ @NETWORK_LIBS@ @SELINUX_LIBS@ @COCOA_LIBS@ @CARBON_LIBS@ @LIBMOUNT_LIBS@ - Cflags: --- -2.6.2 - diff --git a/package.bak/libglib2/Config.in b/package.bak/libglib2/Config.in deleted file mode 100644 index 80c7d6749b..0000000000 --- a/package.bak/libglib2/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_LIBGLIB2 - bool "libglib2" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_UCP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_ZLIB - depends on BR2_USE_WCHAR # gettext - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Low-level core library that forms the basis of GTK+ and GNOME. - - http://www.gtk.org/ - -comment "libglib2 needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libglib2/libglib2.hash b/package.bak/libglib2/libglib2.hash deleted file mode 100644 index 94bf8700b3..0000000000 --- a/package.bak/libglib2/libglib2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://download.gnome.org/sources/glib/2.50/glib-2.50.2.sha256sum -sha256 be68737c1f268c05493e503b3b654d2b7f43d7d0b8c5556f7e4651b870acfbf5 glib-2.50.2.tar.xz diff --git a/package.bak/libglib2/libglib2.mk b/package.bak/libglib2/libglib2.mk deleted file mode 100644 index ddd1f39652..0000000000 --- a/package.bak/libglib2/libglib2.mk +++ /dev/null @@ -1,174 +0,0 @@ -################################################################################ -# -# libglib2 -# -################################################################################ - -LIBGLIB2_VERSION_MAJOR = 2.50 -LIBGLIB2_VERSION = $(LIBGLIB2_VERSION_MAJOR).2 -LIBGLIB2_SOURCE = glib-$(LIBGLIB2_VERSION).tar.xz -LIBGLIB2_SITE = http://ftp.gnome.org/pub/gnome/sources/glib/$(LIBGLIB2_VERSION_MAJOR) -LIBGLIB2_LICENSE = LGPLv2+ -LIBGLIB2_LICENSE_FILES = COPYING - -LIBGLIB2_INSTALL_STAGING = YES -LIBGLIB2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install - -LIBGLIB2_CONF_ENV = \ - ac_cv_func_posix_getpwuid_r=yes \ - glib_cv_stack_grows=no \ - glib_cv_uscore=no \ - ac_cv_func_strtod=yes \ - ac_fsusage_space=yes \ - fu_cv_sys_stat_statfs2_bsize=yes \ - ac_cv_func_closedir_void=no \ - ac_cv_func_getloadavg=no \ - ac_cv_lib_util_getloadavg=no \ - ac_cv_lib_getloadavg_getloadavg=no \ - ac_cv_func_getgroups=yes \ - ac_cv_func_getgroups_works=yes \ - ac_cv_func_chown_works=yes \ - ac_cv_have_decl_euidaccess=no \ - ac_cv_func_euidaccess=no \ - ac_cv_have_decl_strnlen=yes \ - ac_cv_func_strnlen_working=yes \ - ac_cv_func_lstat_dereferences_slashed_symlink=yes \ - ac_cv_func_lstat_empty_string_bug=no \ - ac_cv_func_stat_empty_string_bug=no \ - vb_cv_func_rename_trailing_slash_bug=no \ - ac_cv_have_decl_nanosleep=yes \ - jm_cv_func_nanosleep_works=yes \ - gl_cv_func_working_utimes=yes \ - ac_cv_func_utime_null=yes \ - ac_cv_have_decl_strerror_r=yes \ - ac_cv_func_strerror_r_char_p=no \ - jm_cv_func_svid_putenv=yes \ - ac_cv_func_getcwd_null=yes \ - ac_cv_func_getdelim=yes \ - ac_cv_func_mkstemp=yes \ - utils_cv_func_mkstemp_limitations=no \ - utils_cv_func_mkdir_trailing_slash_bug=no \ - jm_cv_func_gettimeofday_clobber=no \ - gl_cv_func_working_readdir=yes \ - jm_ac_cv_func_link_follows_symlink=no \ - utils_cv_localtime_cache=no \ - ac_cv_struct_st_mtim_nsec=no \ - gl_cv_func_tzset_clobber=no \ - gl_cv_func_getcwd_null=yes \ - gl_cv_func_getcwd_path_max=yes \ - ac_cv_func_fnmatch_gnu=yes \ - am_getline_needs_run_time_check=no \ - am_cv_func_working_getline=yes \ - gl_cv_func_mkdir_trailing_slash_bug=no \ - gl_cv_func_mkstemp_limitations=no \ - ac_cv_func_working_mktime=yes \ - jm_cv_func_working_re_compile_pattern=yes \ - ac_use_included_regex=no \ - gl_cv_c_restrict=no \ - ac_cv_path_GLIB_GENMARSHAL=$(HOST_DIR)/usr/bin/glib-genmarshal \ - ac_cv_prog_F77=no \ - ac_cv_func_posix_getgrgid_r=no \ - glib_cv_long_long_format=ll \ - ac_cv_func_printf_unix98=yes \ - ac_cv_func_vsnprintf_c99=yes \ - ac_cv_func_newlocale=no \ - ac_cv_func_uselocale=no \ - ac_cv_func_strtod_l=no \ - ac_cv_func_strtoll_l=no \ - ac_cv_func_strtoull_l=no \ - gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) - -# old uClibc versions don't provide qsort_r -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) -LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no -else -LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes -endif - -# glib/valgrind.h contains inline asm not compatible with thumb1 -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -LIBGLIB2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -marm" -endif - -HOST_LIBGLIB2_CONF_OPTS = \ - --disable-coverage \ - --disable-dtrace \ - --disable-fam \ - --disable-libelf \ - --disable-selinux \ - --disable-systemtap \ - --disable-xattr \ - --with-pcre=system - -LIBGLIB2_DEPENDENCIES = \ - host-pkgconf host-libglib2 host-gettext \ - libffi pcre util-linux zlib $(if $(BR2_NEEDS_GETTEXT),gettext) - -HOST_LIBGLIB2_DEPENDENCIES = \ - host-gettext \ - host-libffi \ - host-pcre \ - host-pkgconf \ - host-util-linux \ - host-zlib - -LIBGLIB2_CONF_OPTS = \ - --with-pcre=system - -ifneq ($(BR2_ENABLE_LOCALE),y) -LIBGLIB2_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -LIBGLIB2_CONF_OPTS += --enable-libelf -LIBGLIB2_DEPENDENCIES += elfutils -else -LIBGLIB2_CONF_OPTS += --disable-libelf -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -LIBGLIB2_CONF_OPTS += --with-libiconv=gnu -LIBGLIB2_DEPENDENCIES += libiconv -endif - -# Purge gdb-related files -ifneq ($(BR2_PACKAGE_GDB),y) -define LIBGLIB2_REMOVE_GDB_FILES - rm -rf $(TARGET_DIR)/usr/share/glib-2.0/gdb -endef -endif - -# Purge useless binaries from target -define LIBGLIB2_REMOVE_DEV_FILES - rm -rf $(TARGET_DIR)/usr/lib/glib-2.0 - rm -rf $(addprefix $(TARGET_DIR)/usr/share/glib-2.0/,codegen gettext) - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,gdbus-codegen glib-compile-schemas glib-compile-resources glib-genmarshal glib-gettextize glib-mkenums gobject-query gtester gtester-report) - $(LIBGLIB2_REMOVE_GDB_FILES) -endef - -LIBGLIB2_POST_INSTALL_TARGET_HOOKS += LIBGLIB2_REMOVE_DEV_FILES - -# Remove schema sources/DTDs, we use staging ones to compile them. -# Do so at target finalization since other packages install additional -# ones and we want to deal with it in a single place. -define LIBGLIB2_REMOVE_TARGET_SCHEMAS - rm -f $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.xml \ - $(TARGET_DIR)/usr/share/glib-2.0/schemas/*.dtd -endef - -# Compile schemas at target finalization since other packages install -# them as well, and better do it in a central place. -# It's used at run time so it doesn't matter defering it. -define LIBGLIB2_COMPILE_SCHEMAS - $(HOST_DIR)/usr/bin/glib-compile-schemas \ - $(STAGING_DIR)/usr/share/glib-2.0/schemas \ - --targetdir=$(TARGET_DIR)/usr/share/glib-2.0/schemas -endef - -LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_REMOVE_TARGET_SCHEMAS -LIBGLIB2_TARGET_FINALIZE_HOOKS += LIBGLIB2_COMPILE_SCHEMAS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -LIBGLIB2_HOST_BINARY = $(HOST_DIR)/usr/bin/glib-genmarshal diff --git a/package.bak/libglob/Config.in b/package.bak/libglob/Config.in deleted file mode 100644 index 029ed6a1d3..0000000000 --- a/package.bak/libglob/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_LIBGLOB - bool "libglob" - help - OpenBSD implementation of glob(3). diff --git a/package.bak/libglob/libglob.hash b/package.bak/libglob/libglob.hash deleted file mode 100644 index 0b394075f4..0000000000 --- a/package.bak/libglob/libglob.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated: -sha256 4f1b204dad065689941c64828a92441fb316c9c7539b39525fa728125da65e22 libglob-1.0.tar.gz diff --git a/package.bak/libglob/libglob.mk b/package.bak/libglob/libglob.mk deleted file mode 100644 index cd6922e0e7..0000000000 --- a/package.bak/libglob/libglob.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# libglob -# -################################################################################ - -LIBGLOB_VERSION = 1.0 -LIBGLOB_SITE = $(call github,voidlinux,libglob,$(LIBGLOB_VERSION)) -LIBGLOB_LICENSE = BSD-3c -LIBGLOB_LICENSE_FILES = LICENSE -LIBGLOB_INSTALL_STAGING = YES - -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBGLOB_MAKE_TARGETS += libglob.so -# $1: destination directory -define LIBGLOB_INSTALL_SHARED - $(INSTALL) -m 0755 -D $(@D)/libglob.so.0.0.0 \ - $(1)/usr/lib/libglob.so.0.0.0 - ln -sf libglob.so.0.0.0 $(1)/usr/lib/libglob.so.0 - ln -sf libglob.so.0.0.0 $(1)/usr/lib/libglob.so -endef -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBGLOB_MAKE_TARGETS += libglob.a -# $1: destination directory -define LIBGLOB_INSTALL_STATIC - $(INSTALL) -m 0644 -D $(@D)/libglob.a $(1)/usr/lib/libglob.a -endef -endif - -define LIBGLOB_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(LIBGLOB_MAKE_TARGETS) -endef - -define LIBGLOB_INSTALL_STAGING_CMDS - $(INSTALL) -m 0644 -D $(@D)/glob.h \ - $(STAGING_DIR)/usr/include/libglob/glob.h - $(call LIBGLOB_INSTALL_SHARED,$(STAGING_DIR)) - $(call LIBGLOB_INSTALL_STATIC,$(STAGING_DIR)) -endef - -define LIBGLOB_INSTALL_TARGET_CMDS - $(call LIBGLOB_INSTALL_SHARED,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/libglu/Config.in b/package.bak/libglu/Config.in deleted file mode 100644 index de8e1efba2..0000000000 --- a/package.bak/libglu/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBGLU - bool "libglu" - depends on BR2_PACKAGE_HAS_LIBGL - help - Mesa OpenGL Utility library - - http://cgit.freedesktop.org/mesa/glu/ - -comment "libglu needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/libglu/libglu.hash b/package.bak/libglu/libglu.hash deleted file mode 100644 index 784386e0ca..0000000000 --- a/package.bak/libglu/libglu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 3d19cca9b26ec4048dd22e3d294acd43e080a3205a29ff47765bd514571ea8f9 glu-9.0.0.tar.gz diff --git a/package.bak/libglu/libglu.mk b/package.bak/libglu/libglu.mk deleted file mode 100644 index 038d281c59..0000000000 --- a/package.bak/libglu/libglu.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# libglu -# -################################################################################ - -LIBGLU_VERSION = 9.0.0 -LIBGLU_SITE = http://cgit.freedesktop.org/mesa/glu/snapshot -LIBGLU_SOURCE = glu-$(LIBGLU_VERSION).tar.gz -LIBGLU_LICENSE = SGI-B-2.0 -LIBGLU_LICENSE_FILES = include/GL/glu.h -LIBGLU_INSTALL_STAGING = YES -# upstream does not distribute a autoconf´ed configure script -LIBGLU_AUTORECONF = YES -LIBGLU_DEPENDENCIES = libgl - -$(eval $(autotools-package)) diff --git a/package.bak/libgpg-error/Config.in b/package.bak/libgpg-error/Config.in deleted file mode 100644 index 40424e41cf..0000000000 --- a/package.bak/libgpg-error/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -config BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - bool - # see src/syscfg/ - default y if \ - BR2_aarch64 || BR2_aarch64_eb || BR2_arm || \ - BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_m68k || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || \ - BR2_sh4eb || BR2_sh4a || BR2_sh4aeb || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 - -config BR2_PACKAGE_LIBGPG_ERROR - bool "libgpg-error" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS - help - Libgpg-error is a small library with error codes and - descriptions shared by most GnuPG related software. - - https://www.gnupg.org/related_software/libgpg-error - -config BR2_PACKAGE_LIBGPG_ERROR_SYSCFG - string - default "aarch64-unknown-linux-gnu" \ - if BR2_aarch64 || BR2_aarch64_eb - default "arm-unknown-linux-gnueabi" \ - if BR2_arm || BR2_armeb - default "i686-pc-linux-gnu" \ - if BR2_i386 - default "mips-unknown-linux-gnu" \ - if BR2_mips || BR2_mipsel - default "mips64el-unknown-linux-gnuabi64" \ - if BR2_mips64 || BR2_mips64el - default "m68k-unknown-linux-gnu" \ - if BR2_m68k - default "nios2-unknown-linux-gnu" \ - if BR2_nios2 - default "powerpc-unknown-linux-gnu" \ - if BR2_powerpc - default "powerpc64-unknown-linux-gnu" \ - if BR2_powerpc64 || BR2_powerpc64le - default "sh4-unknown-linux-gnu" \ - if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb - default "sparc-unknown-linux-gnu" \ - if BR2_sparc - default "sparc64-unknown-linux-gnu" \ - if BR2_sparc64 - default "x86_64-pc-linux-gnu" \ - if BR2_x86_64 diff --git a/package.bak/libgpg-error/libgpg-error.hash b/package.bak/libgpg-error/libgpg-error.hash deleted file mode 100644 index dac36db09f..0000000000 --- a/package.bak/libgpg-error/libgpg-error.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 3df7432dc17ef66c764c3fc4a1d309a9b4a0485c914ecfdb61b71e9bf45fd930 libgpg-error-1.26.tar.gz diff --git a/package.bak/libgpg-error/libgpg-error.mk b/package.bak/libgpg-error/libgpg-error.mk deleted file mode 100644 index 5126c0a81a..0000000000 --- a/package.bak/libgpg-error/libgpg-error.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libgpg-error -# -################################################################################ - -LIBGPG_ERROR_VERSION = 1.26 -LIBGPG_ERROR_SITE = ftp://ftp.gnupg.org/gcrypt/libgpg-error -LIBGPG_ERROR_LICENSE = GPLv2+, LGPLv2.1+ -LIBGPG_ERROR_LICENSE_FILES = COPYING COPYING.LIB -LIBGPG_ERROR_INSTALL_STAGING = YES -LIBGPG_ERROR_CONFIG_SCRIPTS = gpg-error-config - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -LIBGPG_ERROR_DEPENDENCIES += gettext -endif - -define LIBGPG_ERROR_FIX_CROSS_COMPILATION - cd $(@D)/src/syscfg && \ - ln -s lock-obj-pub.$(call qstrip, $(BR2_PACKAGE_LIBGPG_ERROR_SYSCFG)).h \ - lock-obj-pub.$(GNU_TARGET_NAME).h -endef -LIBGPG_ERROR_PRE_CONFIGURE_HOOKS += LIBGPG_ERROR_FIX_CROSS_COMPILATION - -LIBGPG_ERROR_CONF_OPTS = --disable-tests - -$(eval $(autotools-package)) diff --git a/package.bak/libgpgme/Config.in b/package.bak/libgpgme/Config.in deleted file mode 100644 index 4aabd06367..0000000000 --- a/package.bak/libgpgme/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBGPGME - bool "libgpgme" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - depends on BR2_USE_MMU # libassuan - #gnupg is not needed to build, but at runtime. - select BR2_PACKAGE_GNUPG if !BR2_PACKAGE_GNUPG2 - select BR2_PACKAGE_LIBGPG_ERROR - select BR2_PACKAGE_LIBASSUAN - help - GnuPG Made Easy (GPGME) is a library designed to make access - to GnuPG easier for applications. - - http://www.gnupg.org/related_software/gpgme/ diff --git a/package.bak/libgpgme/libgpgme.hash b/package.bak/libgpgme/libgpgme.hash deleted file mode 100644 index 5ef7b0e5ce..0000000000 --- a/package.bak/libgpgme/libgpgme.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d0abe1449395315eac37e4e45076bbb82732cedf94210937b37776e10cdc2bb6 gpgme-1.7.1.tar.bz2 diff --git a/package.bak/libgpgme/libgpgme.mk b/package.bak/libgpgme/libgpgme.mk deleted file mode 100644 index 84f4d22977..0000000000 --- a/package.bak/libgpgme/libgpgme.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# libgpgme -# -################################################################################ - -LIBGPGME_VERSION = 1.7.1 -LIBGPGME_SITE = ftp://ftp.gnupg.org/gcrypt/gpgme -LIBGPGME_SOURCE = gpgme-$(LIBGPGME_VERSION).tar.bz2 -LIBGPGME_LICENSE = LGPLv2.1+ -LIBGPGME_LICENSE_FILES = COPYING.LESSER -LIBGPGME_INSTALL_STAGING = YES -LIBGPGME_DEPENDENCIES = libassuan libgpg-error -LIBGPGME_LANGUAGE_BINDINGS = cl - -# libgpgme, needs to know the gpg binary path on the target. -LIBGPGME_CONF_OPTS = --with-gpg=/usr/bin/gpg \ - --with-gpg-error-prefix=$(STAGING_DIR)/usr \ - --with-libassuan-prefix=$(STAGING_DIR)/usr \ - --disable-gpgsm-test \ - --disable-gpgconf-test \ - --disable-g13-test \ - --disable-gpg-test \ - --enable-languages=$(LIBGPGME_LANGUAGE_BINDINGS) - -# C++ bindings require a C++11 capable gcc -ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),yy) -LIBGPGME_LANGUAGE_BINDINGS := $(LIBGPGME_LANGUAGE_BINDINGS),cpp -endif - -# Handle argp-standalone or it errors out during build -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -# musl libc does not define error_t in errno.h, but argp.h does. -# Assume we have error_t to avoid collision with the argp.h error_t. -LIBGPGME_CONF_ENV += LIBS="-largp" ac_cv_type_error_t=yes -LIBGPGME_DEPENDENCIES += argp-standalone -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libgpiod/Config.in b/package.bak/libgpiod/Config.in deleted file mode 100644 index 63a7cb6e78..0000000000 --- a/package.bak/libgpiod/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBGPIOD - bool "libgpiod" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 - help - This is a C library that abstracts the GPIO character - device operations on linux. - - https://github.com/brgl/libgpiod - -if BR2_PACKAGE_LIBGPIOD - -config BR2_PACKAGE_LIBGPIOD_TOOLS - bool "install tools" - help - Include a set of command-line tools for managing GPIOs. - -endif - -comment "libgpiod needs kernel headers >= 4.8" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_8 diff --git a/package.bak/libgpiod/libgpiod.hash b/package.bak/libgpiod/libgpiod.hash deleted file mode 100644 index eee2a66280..0000000000 --- a/package.bak/libgpiod/libgpiod.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 670a13518fabf2a99f9e349c33d5421c2146eec15b73c5edef3f1981a7adaeda libgpiod-v0.1.3.tar.gz diff --git a/package.bak/libgpiod/libgpiod.mk b/package.bak/libgpiod/libgpiod.mk deleted file mode 100644 index bc9c6eca39..0000000000 --- a/package.bak/libgpiod/libgpiod.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libgpiod -# -################################################################################ - -LIBGPIOD_VERSION = v0.1.3 -LIBGPIOD_SITE = $(call github,brgl,libgpiod,$(LIBGPIOD_VERSION)) -LIBGPIOD_LICENSE = GPLv3+ -LIBGPIOD_LICENSE_FILES = COPYING -# fetched from github, no configure script provided -LIBGPIOD_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBGPIOD_TOOLS),y) -LIBGPIOD_CONF_OPTS += --enable-tools -else -LIBGPIOD_CONF_OPTS += --disable-tools -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libgsasl/Config.in b/package.bak/libgsasl/Config.in deleted file mode 100644 index 5181386272..0000000000 --- a/package.bak/libgsasl/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBGSASL - bool "libgsasl" - help - Simple Authentication and Security Layer framework Library. - GNU SASL is an implementation of the Simple Authentication and - Security Layer framework and a few common SASL mechanisms. - SASL is used by network servers (e.g., IMAP, SMTP) to request - authentication from clients, and in clients to authenticate - against servers. - - http://www.gnu.org/software/gsasl diff --git a/package.bak/libgsasl/libgsasl.hash b/package.bak/libgsasl/libgsasl.hash deleted file mode 100644 index 4205927168..0000000000 --- a/package.bak/libgsasl/libgsasl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 3adfb49f9c92a719dea855fd1840d698cde55d4648d332a69032ba8bea207720 libgsasl-1.8.0.tar.gz diff --git a/package.bak/libgsasl/libgsasl.mk b/package.bak/libgsasl/libgsasl.mk deleted file mode 100644 index 00ce8e0375..0000000000 --- a/package.bak/libgsasl/libgsasl.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libgsasl -# -################################################################################ - -LIBGSASL_VERSION = 1.8.0 -LIBGSASL_SITE = $(BR2_GNU_MIRROR)/gsasl -LIBGSASL_LICENSE = LGPLv2.1+ (library), GPLv3+ (programs) -LIBGSASL_LICENSE_FILES = README COPYING.LIB COPYING -LIBGSASL_INSTALL_STAGING = YES -# It doesn't seem to build with our libgcrypt so better be safe -LIBGSASL_CONF_OPTS = --without-libgcrypt - -ifeq ($(BR2_PACKAGE_LIBIDN),y) -LIBGSASL_CONF_OPTS += --with-libidn-prefix=$(STAGING_DIR)/usr -LIBGSASL_DEPENDENCIES += libidn -else -LIBGSASL_CONF_OPTS += --without-stringprep -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libgsm/0001-misc.patch b/package.bak/libgsm/0001-misc.patch deleted file mode 100644 index 735d74449e..0000000000 --- a/package.bak/libgsm/0001-misc.patch +++ /dev/null @@ -1,205 +0,0 @@ -Misc fixes from Archlinux - -Patch from: - https://git.archlinux.org/svntogit/packages.git/plain/gsm/trunk/gsm.patch - -Signed-off-by: "Yann E. MORIN" - ---- a/Makefile 2006-04-26 15:14:26.000000000 -0400 -+++ b/Makefile 2010-06-19 16:53:25.000000000 -0400 -@@ -44,7 +44,7 @@ - # CCFLAGS = -c -O - - CC = gcc -ansi -pedantic --CCFLAGS = -c -O2 -DNeedFunctionPrototypes=1 -+CCFLAGS = -c -O2 -fPIC -DNeedFunctionPrototypes=1 - - LD = $(CC) - -@@ -96,11 +96,11 @@ - # Other tools - - SHELL = /bin/sh --LN = ln -+LN = ln -s -f - BASENAME = basename - AR = ar - ARFLAGS = cr --RMFLAGS = -+RMFLAGS = -f - FIND = find - COMPRESS = compress - COMPRESSFLAGS = -@@ -139,7 +139,7 @@ - - # Targets - --LIBGSM = $(LIB)/libgsm.a -+LIBGSMSO = $(LIB)/libgsm.so - - TOAST = $(BIN)/toast - UNTOAST = $(BIN)/untoast -@@ -257,7 +257,7 @@ - # Install targets - - GSM_INSTALL_TARGETS = \ -- $(GSM_INSTALL_LIB)/libgsm.a \ -+ $(GSM_INSTALL_LIB)/libgsm.so \ - $(GSM_INSTALL_INC)/gsm.h \ - $(GSM_INSTALL_MAN)/gsm.3 \ - $(GSM_INSTALL_MAN)/gsm_explode.3 \ -@@ -279,7 +279,7 @@ - - # Target rules - --all: $(LIBGSM) $(TOAST) $(TCAT) $(UNTOAST) -+all: $(LIBGSMSO) $(TOAST) $(TCAT) $(UNTOAST) - @-echo $(ROOT): Done. - - tst: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/test-result -@@ -299,24 +299,23 @@ - - # The basic API: libgsm - --$(LIBGSM): $(LIB) $(GSM_OBJECTS) -- -rm $(RMFLAGS) $(LIBGSM) -- $(AR) $(ARFLAGS) $(LIBGSM) $(GSM_OBJECTS) -- $(RANLIB) $(LIBGSM) -- -+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS) -+ $(LD) -shared -Wl,-soname,libgsm.so.1 -o $@.1.0.13 $(GSM_OBJECTS) -+ $(LN) libgsm.so.1.0.13 $(LIBGSMSO).1 -+ $(LN) libgsm.so.1.0.13 $(LIBGSMSO) - - # Toast, Untoast and Tcat -- the compress-like frontends to gsm. - --$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSM) -- $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSM) $(LDLIB) -+$(TOAST): $(BIN) $(TOAST_OBJECTS) $(LIBGSMSO) -+ $(LD) $(LFLAGS) -o $(TOAST) $(TOAST_OBJECTS) $(LIBGSMSO) $(LDLIB) - - $(UNTOAST): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(UNTOAST) -- $(LN) $(TOAST) $(UNTOAST) -+ $(LN) toast $(UNTOAST) - - $(TCAT): $(BIN) $(TOAST) - -rm $(RMFLAGS) $(TCAT) -- $(LN) $(TOAST) $(TCAT) -+ $(LN) toast $(TCAT) - - - # The local bin and lib directories -@@ -351,53 +350,54 @@ - fi - - $(TOAST_INSTALL_BIN)/toast: $(TOAST) -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $(TOAST) $@ - chmod 755 $@ - - $(TOAST_INSTALL_BIN)/untoast: $(TOAST_INSTALL_BIN)/toast -- -rm $@ -- ln $? $@ -+ -rm $(RMFLAGS) $@ -+ $(LN) toast $@ - - $(TOAST_INSTALL_BIN)/tcat: $(TOAST_INSTALL_BIN)/toast -- -rm $@ -- ln $? $@ -+ -rm $(RMFLAGS) $@ -+ $(LN) toast $@ - - $(TOAST_INSTALL_MAN)/toast.1: $(MAN)/toast.1 -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - - $(GSM_INSTALL_MAN)/gsm.3: $(MAN)/gsm.3 -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - - $(GSM_INSTALL_MAN)/gsm_option.3: $(MAN)/gsm_option.3 -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - - $(GSM_INSTALL_MAN)/gsm_explode.3: $(MAN)/gsm_explode.3 -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - - $(GSM_INSTALL_MAN)/gsm_print.3: $(MAN)/gsm_print.3 -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - - $(GSM_INSTALL_INC)/gsm.h: $(INC)/gsm.h -- -rm $@ -- cp $? $@ -- chmod 444 $@ -- --$(GSM_INSTALL_LIB)/libgsm.a: $(LIBGSM) -- -rm $@ -+ -rm $(RMFLAGS) $@ - cp $? $@ - chmod 444 $@ - -+$(GSM_INSTALL_LIB)/libgsm.so: $(LIBGSMSO) -+ -rm $(RMFLAGS) $@ $@.1 $@.1.0.13 -+ cp $?.1.0.13 $@.1.0.13 -+ chmod 755 $@.1.0.13 -+ $(LN) libgsm.so.1.0.13 $@ -+ $(LN) libgsm.so.1.0.13 $@.1 - - # Distribution - -@@ -425,7 +425,7 @@ - -print | xargs rm $(RMFLAGS) - - clean: semi-clean -- -rm $(RMFLAGS) $(LIBGSM) $(ADDTST)/add \ -+ -rm $(RMFLAGS) $(LIBGSMSO)* $(ADDTST)/add \ - $(TOAST) $(TCAT) $(UNTOAST) \ - $(ROOT)/gsm-1.0.tar.Z - -@@ -473,22 +473,22 @@ - $(TST)/test-result: $(TST)/lin2cod $(TST)/cod2lin $(TOAST) $(TST)/run - ( cd $(TST); ./run ) - --$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSM) -+$(TST)/lin2txt: $(TST)/lin2txt.o $(LIBGSMSO) - $(LD) $(LFLAGS) -o $(TST)/lin2txt \ -- $(TST)/lin2txt.o $(LIBGSM) $(LDLIB) -+ $(TST)/lin2txt.o $(LIBGSMSO) $(LDLIB) - --$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSM) -+$(TST)/lin2cod: $(TST)/lin2cod.o $(LIBGSMSO) - $(LD) $(LFLAGS) -o $(TST)/lin2cod \ -- $(TST)/lin2cod.o $(LIBGSM) $(LDLIB) -+ $(TST)/lin2cod.o $(LIBGSMSO) $(LDLIB) - --$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSM) -+$(TST)/gsm2cod: $(TST)/gsm2cod.o $(LIBGSMSO) - $(LD) $(LFLAGS) -o $(TST)/gsm2cod \ -- $(TST)/gsm2cod.o $(LIBGSM) $(LDLIB) -+ $(TST)/gsm2cod.o $(LIBGSMSO) $(LDLIB) - --$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSM) -+$(TST)/cod2txt: $(TST)/cod2txt.o $(LIBGSMSO) - $(LD) $(LFLAGS) -o $(TST)/cod2txt \ -- $(TST)/cod2txt.o $(LIBGSM) $(LDLIB) -+ $(TST)/cod2txt.o $(LIBGSMSO) $(LDLIB) - --$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSM) -+$(TST)/cod2lin: $(TST)/cod2lin.o $(LIBGSMSO) - $(LD) $(LFLAGS) -o $(TST)/cod2lin \ -- $(TST)/cod2lin.o $(LIBGSM) $(LDLIB) -+ $(TST)/cod2lin.o $(LIBGSMSO) $(LDLIB) diff --git a/package.bak/libgsm/Config.in b/package.bak/libgsm/Config.in deleted file mode 100644 index c6edefe67f..0000000000 --- a/package.bak/libgsm/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBGSM - bool "libgsm" - depends on !BR2_STATIC_LIBS - help - Shared libraries for GSM 06.10 lossy speech compression. - - http://www.quut.com/gsm - -comment "libgsm needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libgsm/libgsm.hash b/package.bak/libgsm/libgsm.hash deleted file mode 100644 index bcfb6505ce..0000000000 --- a/package.bak/libgsm/libgsm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 725a3768a1e23ab8648b4df9d470aed38eb1635af3cbc8d0b64fef077236f4ce gsm-1.0.16.tar.gz diff --git a/package.bak/libgsm/libgsm.mk b/package.bak/libgsm/libgsm.mk deleted file mode 100644 index 8e8335a03c..0000000000 --- a/package.bak/libgsm/libgsm.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# libgsm -# -################################################################################ - -LIBGSM_VERSION = 1.0.16 -LIBGSM_SOURCE = gsm-$(LIBGSM_VERSION).tar.gz -LIBGSM_SITE = http://www.quut.com/gsm -LIBGSM_LICENSE = gsm -LIBGSM_LICENSE_FILES = COPYRIGHT -LIBGSM_INSTALL_STAGING = YES - -define LIBGSM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC=$(TARGET_CC) -C $(@D) -endef - -# Install targets are not safe for parallel jobs. However, since there's -# just only a bunch of files to install, just do it manually. Note that, -# even though the package version is '1.0.16', the solib is generated as -# '1.0.13' and its SONAME is just '1'. -# -# For staging, we install all the .so symlinks, and the header. -define LIBGSM_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/inc/gsm.h $(STAGING_DIR)/usr/include/gsm.h - $(INSTALL) -D -m 0644 $(@D)/lib/libgsm.so.1.0.13 $(STAGING_DIR)/usr/lib/libgsm.so.1.0.13 - ln -sf libgsm.so.1.0.13 $(STAGING_DIR)/usr/lib/libgsm.so.1 - ln -sf libgsm.so.1.0.13 $(STAGING_DIR)/usr/lib/libgsm.so -endef - -# Install targets are not safe for parallel jobs. However, since there's -# just only a bunch of files to install, just do it manually. Note that, -# even though the package version is '1.0.16', the solib is versioned as -# '1.0.13' and its SONAME is just versioned with '1'. -# -# For target, we just need the library to be installed as its SONAME, and -# the programs. -define LIBGSM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/lib/libgsm.so.1.0.13 $(TARGET_DIR)/usr/lib/libgsm.so.1 - $(INSTALL) -D -m 0755 $(@D)/bin/toast $(TARGET_DIR)/usr/bin/toast - $(INSTALL) -D -m 0755 $(@D)/bin/tcat $(TARGET_DIR)/usr/bin/tcat - $(INSTALL) -D -m 0755 $(@D)/bin/untoast $(TARGET_DIR)/usr/bin/untoast -endef - -$(eval $(generic-package)) diff --git a/package.bak/libgtk2/0001-reduce-dependencies.patch b/package.bak/libgtk2/0001-reduce-dependencies.patch deleted file mode 100644 index 3250cae4b0..0000000000 --- a/package.bak/libgtk2/0001-reduce-dependencies.patch +++ /dev/null @@ -1,117 +0,0 @@ -Hack the configure.in file to add a "none" gdktarget which removes -dependencies on graphic backends such as X.org or DirectFB. Gtk does -not fully build in this mode, but it builds sufficiently to build the -host tools that are needed to build the target Gtk. - -Changes: - Ported to 2.24.18 - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Spenser Gilliland ---- -Index: libgtk2-2.24.18/configure.ac -=================================================================== ---- libgtk2-2.24.18.orig/configure.ac 2013-05-13 07:02:44.000000000 -0500 -+++ libgtk2-2.24.18/configure.ac 2013-05-27 02:12:09.947030335 -0500 -@@ -258,12 +258,12 @@ - gdktarget=x11 - fi - --AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb]] select non-default GDK target], -+AC_ARG_WITH(gdktarget, [ --with-gdktarget=[[x11/win32/quartz/directfb/none]] select non-default GDK target], - gdktarget=$with_gdktarget) - - AC_SUBST(gdktarget) - case $gdktarget in -- x11|win32|quartz|directfb) ;; -+ x11|win32|quartz|directfb|none) ;; - *) AC_MSG_ERROR([Invalid target for GDK: use x11, quartz, directfb or win32.]);; - esac - -@@ -372,11 +373,15 @@ - ## annoying to construct - PKG_CHECK_MODULES(BASE_DEPENDENCIES, - [glib-2.0 >= glib_required_version dnl -- atk >= atk_required_version dnl -- pango >= pango_required_version dnl -- cairo >= cairo_required_version dnl - gdk-pixbuf-2.0 >= gdk_pixbuf_required_version]) - -+if test "x$gdktarget" != "xnone"; then -+ PKG_CHECK_MODULES(BASE_DEPENDENCIES, -+ [atk >= atk_required_version dnl -+ pango >= pango_required_version dnl -+ cairo >= cairo_required_version]) -+fi -+ - ## In addition to checking that cairo is present, we also need to - ## check that the correct cairo backend is there. E.g. if the GDK - ## target is win32 we need the cairo-win32 backend and so on. -@@ -387,8 +392,11 @@ - if test "x$cairo_backend" = "xx11"; then - cairo_backend=xlib - fi --PKG_CHECK_MODULES(CAIRO_BACKEND, -- [cairo-$cairo_backend >= cairo_required_version]) -+ -+if test "x$gdktarget" != "xnone"; then -+ PKG_CHECK_MODULES(CAIRO_BACKEND, -+ [cairo-$cairo_backend >= cairo_required_version]) -+fi - - PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) - -@@ -1279,6 +1287,7 @@ - AM_CONDITIONAL(USE_DIRECTFB, false) - fi - -+if test "x$gdktarget" != "xnone"; then - - # Check for Pango flags - -@@ -1324,6 +1333,8 @@ - GDK_PACKAGES="$PANGO_PACKAGES gio-2.0 gdk-pixbuf-2.0 cairo-$cairo_backend" - fi - -+fi # gdktarget != none -+ - GDK_DEP_LIBS="$GDK_EXTRA_LIBS `$PKG_CONFIG --libs $GDK_PACKAGES` $MATH_LIB" - GDK_DEP_CFLAGS="`$PKG_CONFIG --cflags gthread-2.0 $GDK_PACKAGES` $GDK_EXTRA_CFLAGS" - # -@@ -1341,6 +1352,7 @@ - AC_SUBST(GDK_DEP_LIBS) - AC_SUBST(GDK_DEP_CFLAGS) - -+if test "x$gdktarget" != "xnone"; then - - ######################################## - # Check for Accessibility Toolkit flags -@@ -1372,6 +1384,10 @@ - fi - - GTK_PACKAGES="atk cairo gdk-pixbuf-2.0 gio-2.0" -+else # gdktarget != none -+GTK_PACKAGES="gdk-pixbuf-2.0" -+fi # gdktarget != none -+ - if test "x$gdktarget" = "xx11"; then - GTK_PACKAGES="$GTK_PACKAGES pangoft2" - fi -@@ -1533,6 +1549,8 @@ - gtk_save_cppflags="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS $GDK_DEP_CFLAGS" - -+if test "x$gdktarget" != "xnone"; then -+ - AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([ - *** Can't find cairo-pdf.h. You must build Cairo with the pdf - *** backend enabled.])) -@@ -1547,6 +1565,8 @@ - *** svg backend enabled.])) - fi - -+fi # gdktarget != none -+ - CPPFLAGS="$gtk_save_cppflags" - - diff --git a/package.bak/libgtk2/Config.in b/package.bak/libgtk2/Config.in deleted file mode 100644 index b6cf37e191..0000000000 --- a/package.bak/libgtk2/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_LIBGTK2 - bool "libgtk2" - select BR2_PACKAGE_ATK - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - help - The GTK+ version 2 graphical user interface library - - http://www.gtk.org/ - -if BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_LIBGTK2_DEMO - bool "Install libgtk2 demo program" - help - The GTK+ source base contains a gtk-demo program. This - option allows to install this program to the target. - -endif - -comment "libgtk2 needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libgtk2/libgtk2.hash b/package.bak/libgtk2/libgtk2.hash deleted file mode 100644 index 3388c5cda2..0000000000 --- a/package.bak/libgtk2/libgtk2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-2.24.31.sha256sum -sha256 68c1922732c7efc08df4656a5366dcc3afdc8791513400dac276009b40954658 gtk+-2.24.31.tar.xz diff --git a/package.bak/libgtk2/libgtk2.mk b/package.bak/libgtk2/libgtk2.mk deleted file mode 100644 index cf8b2f4eee..0000000000 --- a/package.bak/libgtk2/libgtk2.mk +++ /dev/null @@ -1,127 +0,0 @@ -################################################################################ -# -# libgtk2 -# -################################################################################ - -LIBGTK2_VERSION_MAJOR = 2.24 -LIBGTK2_VERSION = $(LIBGTK2_VERSION_MAJOR).31 -LIBGTK2_SOURCE = gtk+-$(LIBGTK2_VERSION).tar.xz -LIBGTK2_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK2_VERSION_MAJOR) -LIBGTK2_INSTALL_STAGING = YES -LIBGTK2_LICENSE = LGPLv2+ -LIBGTK2_LICENSE_FILES = COPYING -# For 0001-reduce-dependencies.patch -LIBGTK2_AUTORECONF = YES - -LIBGTK2_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \ - DB2HTML=false - -LIBGTK2_CONF_OPTS = --disable-glibtest --enable-explicit-deps=no - -LIBGTK2_DEPENDENCIES = host-pkgconf host-libgtk2 libglib2 cairo pango atk gdk-pixbuf - -# Xorg dependencies -LIBGTK2_CONF_OPTS += \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --with-gdktarget=x11 -LIBGTK2_DEPENDENCIES += \ - fontconfig xlib_libX11 xlib_libXext xlib_libXrender - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK2_CONF_OPTS += --enable-xinerama -LIBGTK2_DEPENDENCIES += xlib_libXinerama -else -LIBGTK2_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -LIBGTK2_CONF_OPTS += --with-xinput=yes -LIBGTK2_DEPENDENCIES += xlib_libXi -else -LIBGTK2_CONF_OPTS += --with-xinput=no -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK2_DEPENDENCIES += xlib_libXrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -LIBGTK2_DEPENDENCIES += xlib_libXcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK2_DEPENDENCIES += xlib_libXfixes -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK2_DEPENDENCIES += xlib_libXcomposite -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK2_DEPENDENCIES += xlib_libXdamage -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -LIBGTK2_DEPENDENCIES += libpng -else -LIBGTK2_CONF_OPTS += --without-libpng -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBGTK2_DEPENDENCIES += jpeg -else -LIBGTK2_CONF_OPTS += --without-libjpeg -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -LIBGTK2_DEPENDENCIES += tiff -else -LIBGTK2_CONF_OPTS += --without-libtiff -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK2_CONF_OPTS += CUPS_CONFIG="$(STAGING_DIR)/usr/bin/cups-config" -LIBGTK2_DEPENDENCIES += cups -else -LIBGTK2_CONF_OPTS += --disable-cups -endif - -ifeq ($(BR2_PACKAGE_LIBGTK2_DEMO),) -define LIBGTK2_POST_INSTALL_TWEAKS - rm -rf $(TARGET_DIR)/usr/share/gtk-2.0/demo $(TARGET_DIR)/usr/bin/gtk-demo -endef - -LIBGTK2_POST_INSTALL_TARGET_HOOKS += LIBGTK2_POST_INSTALL_TWEAKS -endif - -# We do not build a full version of libgtk2 for the host, because that -# requires compiling Cairo, Pango, ATK and X.org for the -# host. Therefore, we patch it to remove dependencies, and we hack the -# build to only build gdk-pixbuf-from-source and -# gtk-update-icon-cache, which are the host tools needed to build Gtk -# for the target. - -HOST_LIBGTK2_DEPENDENCIES = host-libglib2 host-libpng host-gdk-pixbuf -HOST_LIBGTK2_CONF_OPTS = \ - --disable-static \ - --disable-glibtest \ - --without-libtiff \ - --without-libjpeg \ - --with-gdktarget=none \ - --disable-cups - -define HOST_LIBGTK2_BUILD_CMDS - $(HOST_MAKE_ENV) make -C $(@D)/gtk gtk-update-icon-cache -endef - -define HOST_LIBGTK2_INSTALL_CMDS - cp $(@D)/gtk/gtk-update-icon-cache $(HOST_DIR)/usr/bin -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libgtk3/0001-no-gtk-doc.patch b/package.bak/libgtk3/0001-no-gtk-doc.patch deleted file mode 100644 index 6dede7348a..0000000000 --- a/package.bak/libgtk3/0001-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -267,7 +267,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package.bak/libgtk3/0002-fix-introspection-check.patch b/package.bak/libgtk3/0002-fix-introspection-check.patch deleted file mode 100644 index 4c2806d819..0000000000 --- a/package.bak/libgtk3/0002-fix-introspection-check.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -During autoreconf GOBJECT_INTROSPECTION_CHECK could not be resolved because we -don't have introspection which provides its custom m4 macro. Reconfigure fails -with: - -gdk/Makefile.am:196: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL -gtk/Makefile.am:1347: error: HAVE_INTROSPECTION does not appear in AM_CONDITIONAL - -We avoid to add a copy of introspection.m4 in the m4 directory of libgtk3 by -adding a check, as performed in Systemd. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1621,7 +1621,10 @@ - # GObject introspection - ################################################## - --GOBJECT_INTROSPECTION_CHECK(introspection_required_version) -+m4_ifdef([GOBJECT_INTROSPECTION_CHECK], -+ [GOBJECT_INTROSPECTION_CHECK(introspection_required_version)], -+ [AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) -+ enable_introspection=no]) - - ################################################## - # colord module diff --git a/package.bak/libgtk3/0003-disable-atk-bridge.patch b/package.bak/libgtk3/0003-disable-atk-bridge.patch deleted file mode 100644 index c92174f400..0000000000 --- a/package.bak/libgtk3/0003-disable-atk-bridge.patch +++ /dev/null @@ -1,45 +0,0 @@ -Remove atk-bridge support. - -atk-bridge doesn't seem useful for now in Buildroot and requires to -add two new packages just for it: at-spi2-core and at-spi2-atk. - -Signed-off-by: Hadrien Boutteville - ---- a/configure.ac -+++ b/configure.ac -@@ -1349,11 +1349,7 @@ - # Check for Accessibility Toolkit flags - ######################################## - --if test x$enable_x11_backend = xyes; then -- ATK_PACKAGES="atk atk-bridge-2.0" --else -- ATK_PACKAGES="atk" --fi -+ATK_PACKAGES="atk" - - PKG_CHECK_MODULES(ATK, $ATK_PACKAGES) - ---- a/gtk/a11y/gtkaccessibility.c -+++ b/gtk/a11y/gtkaccessibility.c -@@ -37,10 +37,6 @@ - #include - #include - --#ifdef GDK_WINDOWING_X11 --#include --#endif -- - static gboolean gail_focus_watcher (GSignalInvocationHint *ihint, - guint n_param_values, - const GValue *param_values, -@@ -987,9 +983,5 @@ - _gtk_accessibility_override_atk_util (); - do_window_event_initialization (); - --#ifdef GDK_WINDOWING_X11 -- atk_bridge_adaptor_init (NULL, NULL); --#endif -- - atk_misc_instance = g_object_new (GTK_TYPE_MISC_IMPL, NULL); - } diff --git a/package.bak/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch b/package.bak/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch deleted file mode 100644 index cea4259b9a..0000000000 --- a/package.bak/libgtk3/0004-Remove-Gdk-dependency-from-gtk-encode-symbolic-svg.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 4d09ff324419fe4e671233044e424378da53969b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 9 Jun 2015 14:20:30 +0300 -Subject: [PATCH] Remove Gdk-dependency from gtk-encode-symbolic-svg - -Building gtk-encode-symbolic-svg without building Gdk is useful -as only the icon tools are needed on the native build: this makes -native build much faster and requires much less dependencies. - -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen -Signed-off-by: Gustavo Zacarias ---- -Patch status: taken from yocto, upstream pending - - gtk/encodesymbolic.c | 36 ++++++++++-------------------------- - 1 file changed, 10 insertions(+), 26 deletions(-) - -diff --git a/gtk/encodesymbolic.c b/gtk/encodesymbolic.c -index 9f7d015..1f07563 100644 ---- a/gtk/encodesymbolic.c -+++ b/gtk/encodesymbolic.c -@@ -19,7 +19,6 @@ - - #include - #include --#include - #include - - #ifdef HAVE_UNISTD_H -@@ -43,30 +42,18 @@ static GdkPixbuf * - load_symbolic_svg (char *file_data, gsize file_len, - int width, - int height, -- const GdkRGBA *fg, -- const GdkRGBA *success_color, -- const GdkRGBA *warning_color, -- const GdkRGBA *error_color, -+ const char *css_fg, -+ const char *css_success, -+ const char *css_warning, -+ const char *css_error, - GError **error) - { - GInputStream *stream; - GdkPixbuf *pixbuf; -- gchar *css_fg; -- gchar *css_success; -- gchar *css_warning; -- gchar *css_error; - gchar *data; - gchar *svg_width, *svg_height; - gchar *escaped_file_data; - -- css_fg = gdk_rgba_to_string (fg); -- -- css_success = css_warning = css_error = NULL; -- -- css_warning = gdk_rgba_to_string (warning_color); -- css_error = gdk_rgba_to_string (error_color); -- css_success = gdk_rgba_to_string (success_color); -- - /* Fetch size from the original icon */ - stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL); - pixbuf = gdk_pixbuf_new_from_stream (stream, NULL, error); -@@ -105,10 +92,6 @@ load_symbolic_svg (char *file_data, gsize file_len, - "", - NULL); - g_free (escaped_file_data); -- g_free (css_fg); -- g_free (css_warning); -- g_free (css_error); -- g_free (css_success); - g_free (svg_width); - g_free (svg_height); - -@@ -167,7 +150,8 @@ make_symbolic_pixbuf (char *file, - GError **error) - - { -- GdkRGBA r = { 1,0,0,1}, g = {0,1,0,1}; -+ const char r[] = "rgba(255,0,0,1)"; -+ const char g[] = "rgba(0,255,0,1)"; - GdkPixbuf *loaded; - GdkPixbuf *pixbuf; - int plane; -@@ -196,10 +180,10 @@ make_symbolic_pixbuf (char *file, - * the "rest", as all color fractions should add up to 1. - */ - loaded = load_symbolic_svg (file_data, file_len, width, height, -- &g, -- plane == 0 ? &r : &g, -- plane == 1 ? &r : &g, -- plane == 2 ? &r : &g, -+ g, -+ plane == 0 ? r : g, -+ plane == 1 ? r : g, -+ plane == 2 ? r : g, - error); - if (loaded == NULL) - return NULL; --- -2.1.4 - diff --git a/package.bak/libgtk3/Config.in b/package.bak/libgtk3/Config.in deleted file mode 100644 index 738f865099..0000000000 --- a/package.bak/libgtk3/Config.in +++ /dev/null @@ -1,106 +0,0 @@ -comment "libgtk3 needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS - -comment "libgtk3 needs an OpenGL or an OpenGL-EGL/wayland backend" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_HAS_LIBEGL_WAYLAND && \ - !BR2_PACKAGE_HAS_LIBGL - -config BR2_PACKAGE_LIBGTK3 - bool "libgtk3" - select BR2_PACKAGE_ATK - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_SVG - select BR2_PACKAGE_LIBEPOXY - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_GDK_PIXBUF - # At least one backend is required - select BR2_PACKAGE_LIBGTK3_BROADWAY if \ - !(BR2_PACKAGE_LIBGTK3_X11 || BR2_PACKAGE_LIBGTK3_WAYLAND) - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND || \ - BR2_PACKAGE_HAS_LIBGL - help - The GTK+ version 3 graphical user interface library - - http://www.gtk.org/ - -if BR2_PACKAGE_LIBGTK3 - -config BR2_PACKAGE_LIBGTK3_BROADWAY - bool "Broadway GDK backend" - default y - help - This enables the Broadway backend for GDK, which provides support - for displaying GTK+ applications in a web browser, using HTML5 and - web sockets. - - For example, to run gtk3-demo on a target which IP address is - 192.168.0.1 and use it from a web browser, execute the following - commands: - - $ broadwayd -a 192.168.0.1 -p 8080 :2 & - $ export GDK_BACKEND=broadway - $ export BROADWAY_DISPLAY=:2 - $ gtk3-demo - - Then open a web browser at address http://192.168.0.1:8080. - Javascript and web sockets should be enabled. - -comment "Wayland GDK backend needs an OpenGL EGL backend provided by mesa3d w/ headers >= 3.17" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -config BR2_PACKAGE_LIBGTK3_WAYLAND - bool "Wayland GDK backend" - default y - depends on BR2_PACKAGE_HAS_LIBEGL_WAYLAND - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS - select BR2_PACKAGE_LIBXKBCOMMON - help - This enables the Wayland backend for GDK. - -comment "X11 GDK backend needs an OpenGL provider" - depends on !BR2_PACKAGE_HAS_LIBGL - -config BR2_PACKAGE_LIBGTK3_X11 - bool "X11 GDK backend" - default y - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXI - help - This enables the X11 backend for GDK. - -config BR2_PACKAGE_LIBGTK3_DEMO - bool "Install libgtk3 demo program" - select BR2_PACKAGE_SHARED_MIME_INFO - select BR2_PACKAGE_HICOLOR_ICON_THEME - help - The GTK+ source base contains a demo program. This - option allows to install this program to the target. - -config BR2_PACKAGE_LIBGTK3_TESTS - bool "Install libgtk3 tests" - help - The GTK+ source base contains tests. This option - allows to install them to the target. - -endif diff --git a/package.bak/libgtk3/libgtk3.hash b/package.bak/libgtk3/libgtk3.hash deleted file mode 100644 index 12a25c9cfc..0000000000 --- a/package.bak/libgtk3/libgtk3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/gtk+/3.22/gtk+-3.22.7.sha256sum -sha256 a3a27564bfb1679ebbc75c37cd2bcd6e727c8bdfbcd3984d29305bf9ee60d432 gtk+-3.22.7.tar.xz diff --git a/package.bak/libgtk3/libgtk3.mk b/package.bak/libgtk3/libgtk3.mk deleted file mode 100644 index a1b8fc60a2..0000000000 --- a/package.bak/libgtk3/libgtk3.mk +++ /dev/null @@ -1,192 +0,0 @@ -################################################################################ -# -# libgtk3 -# -################################################################################ - -LIBGTK3_VERSION_MAJOR = 3.22 -LIBGTK3_VERSION = $(LIBGTK3_VERSION_MAJOR).7 -LIBGTK3_SOURCE = gtk+-$(LIBGTK3_VERSION).tar.xz -LIBGTK3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk+/$(LIBGTK3_VERSION_MAJOR) -LIBGTK3_LICENSE = LGPLv2+ -LIBGTK3_LICENSE_FILES = COPYING -LIBGTK3_INSTALL_STAGING = YES -LIBGTK3_AUTORECONF = YES - -LIBGTK3_CONF_ENV = \ - ac_cv_path_GTK_UPDATE_ICON_CACHE=$(HOST_DIR)/usr/bin/gtk-update-icon-cache \ - ac_cv_path_GDK_PIXBUF_CSOURCE=$(HOST_DIR)/usr/bin/gdk-pixbuf-csource \ - PKG_CONFIG_FOR_BUILD=$(HOST_DIR)/usr/bin/pkgconf - -LIBGTK3_CONF_OPTS = \ - --disable-glibtest \ - --enable-explicit-deps=no \ - --enable-gtk2-dependency \ - --disable-introspection - -# Override pkg-config pkgdatadir variable, it needs the prefix -LIBGTK3_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols - -LIBGTK3_DEPENDENCIES = host-pkgconf host-libgtk3 atk libglib2 cairo pango gdk-pixbuf libepoxy - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -LIBGTK3_DEPENDENCIES += fontconfig xlib_libX11 xlib_libXext xlib_libXrender xlib_libXi - -LIBGTK3_CONF_OPTS += \ - --enable-x11-backend \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib -else -LIBGTK3_CONF_OPTS += --disable-x11-backend -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -LIBGTK3_DEPENDENCIES += wayland wayland-protocols libxkbcommon -LIBGTK3_CONF_OPTS += --enable-wayland-backend -else -LIBGTK3_CONF_OPTS += --disable-wayland-backend -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3_BROADWAY),y) -LIBGTK3_CONF_OPTS += --enable-broadway-backend -else -LIBGTK3_CONF_OPTS += --disable-broadway-backend -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -LIBGTK3_CONF_OPTS += --enable-xinerama -LIBGTK3_DEPENDENCIES += xlib_libXinerama -else -LIBGTK3_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -LIBGTK3_CONF_OPTS += --enable-xrandr -LIBGTK3_DEPENDENCIES += xlib_libXrandr -else -LIBGTK3_CONF_OPTS += --disable-xrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -LIBGTK3_DEPENDENCIES += xlib_libXcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -LIBGTK3_CONF_OPTS += --enable-xfixes -LIBGTK3_DEPENDENCIES += xlib_libXfixes -else -LIBGTK3_CONF_OPTS += --disable-xfixes -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -LIBGTK3_CONF_OPTS += --enable-xcomposite -LIBGTK3_DEPENDENCIES += xlib_libXcomposite -else -LIBGTK3_CONF_OPTS += --disable-xcomposite -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -LIBGTK3_CONF_OPTS += --enable-xdamage -LIBGTK3_DEPENDENCIES += xlib_libXdamage -else -LIBGTK3_CONF_OPTS += --disable-xdamage -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -LIBGTK3_CONF_OPTS += --enable-xkb -LIBGTK3_DEPENDENCIES += xlib_libxkbfile -else -LIBGTK3_CONF_OPTS += --disable-xkb -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -LIBGTK3_CONF_OPTS += --enable-cups -LIBGTK3_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config -LIBGTK3_DEPENDENCIES += cups -else -LIBGTK3_CONF_OPTS += --disable-cups -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3_DEMO),y) -LIBGTK3_DEPENDENCIES += hicolor-icon-theme shared-mime-info -else -define LIBGTK3_REMOVE_DEMOS - $(RM) $(TARGET_DIR)/usr/bin/gtk3-demo \ - $(TARGET_DIR)/usr/bin/gtk3-demo-application -endef -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_REMOVE_DEMOS -endif - -ifeq ($(BR2_PACKAGE_LIBGTK3_TESTS),y) -LIBGTK3_CONF_OPTS += --enable-installed-tests -else -LIBGTK3_CONF_OPTS += --disable-installed-tests -endif - -define LIBGTK3_COMPILE_GLIB_SCHEMAS - $(HOST_DIR)/usr/bin/glib-compile-schemas \ - $(TARGET_DIR)/usr/share/glib-2.0/schemas -endef - -LIBGTK3_POST_INSTALL_TARGET_HOOKS += LIBGTK3_COMPILE_GLIB_SCHEMAS - -# gtk+ >= 3.10 can build a native version of gtk-update-icon-cache if -# --enable-gtk2-dependency=no is set when invoking './configure'. -# -# Unfortunately, if the target toolchain is based on uClibc, the macro -# AM_GLIB_GNU_GETTEXT will detect the libintl built for the target and -# will add '-lintl' to the default list of libraries for the linker (used -# for both native and target builds). -# -# But no native version of libintl is available (the functions are -# provided by glibc). So gtk-update-icon-cache will not build. -# -# As a workaround, we build gtk-update-icon-cache on our own, set -# --enable-gtk2-dependency=yes and force './configure' to use our version. - -HOST_LIBGTK3_DEPENDENCIES = \ - host-libglib2 \ - host-libpng \ - host-gdk-pixbuf \ - host-pkgconf \ - host-librsvg - -HOST_LIBGTK3_CFLAGS = \ - `$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gdk-pixbuf-2.0` \ - `$(HOST_DIR)/usr/bin/pkgconf --cflags --libs gio-2.0` - -define HOST_LIBGTK3_CONFIGURE_CMDS - echo "#define GETTEXT_PACKAGE \"gtk30\"" >> $(@D)/gtk/config.h - echo "#define HAVE_UNISTD_H 1" >> $(@D)/gtk/config.h - echo "#define HAVE_FTW_H 1" >> $(@D)/gtk/config.h -endef - -define HOST_LIBGTK3_BUILD_CMDS - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - $(@D)/gtk/updateiconcache.c \ - $(HOST_LIBGTK3_CFLAGS) \ - -o $(@D)/gtk/gtk-update-icon-cache - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - $(@D)/gtk/encodesymbolic.c \ - $(HOST_LIBGTK3_CFLAGS) \ - -o $(@D)/gtk/gtk-encode-symbolic-svg -endef - -define HOST_LIBGTK3_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/gtk/gtk-update-icon-cache \ - $(HOST_DIR)/usr/bin/gtk-update-icon-cache - $(INSTALL) -D -m 0755 $(@D)/gtk/gtk-encode-symbolic-svg \ - $(HOST_DIR)/usr/bin/gtk-encode-symbolic-svg -endef - -# Create icon-theme.cache for each of the icon directories/themes -# It's not strictly necessary but speeds up lookups -define LIBGTK3_UPDATE_ICON_CACHE - find $(TARGET_DIR)/usr/share/icons -maxdepth 1 -mindepth 1 -type d \ - -exec $(HOST_DIR)/usr/bin/gtk-update-icon-cache {} \; -endef -LIBGTK3_TARGET_FINALIZE_HOOKS += LIBGTK3_UPDATE_ICON_CACHE - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libgudev/Config.in b/package.bak/libgudev/Config.in deleted file mode 100644 index 21606ac4cc..0000000000 --- a/package.bak/libgudev/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBGUDEV - bool "libgudev" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # gettext - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBGLIB2 - help - This library provides GObject bindings for libudev. It was - originally part of udev-extras, then udev, then systemd. - It's now a project on its own. Required for building some - programs that use udev, when using systemd. - - https://wiki.gnome.org/Projects/libgudev - -comment "libgudev needs udev /dev handling and a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/libgudev/libgudev.hash b/package.bak/libgudev/libgudev.hash deleted file mode 100644 index a6c1d6b535..0000000000 --- a/package.bak/libgudev/libgudev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: http://ftp.gnome.org/pub/GNOME/sources/libgudev/230/libgudev-230.sha256sum -sha256 a2e77faced0c66d7498403adefcc0707105e03db71a2b2abd620025b86347c18 libgudev-230.tar.xz diff --git a/package.bak/libgudev/libgudev.mk b/package.bak/libgudev/libgudev.mk deleted file mode 100644 index dce9cd8e71..0000000000 --- a/package.bak/libgudev/libgudev.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libgudev -# -################################################################################ - -LIBGUDEV_VERSION = 230 -LIBGUDEV_SOURCE = libgudev-$(LIBGUDEV_VERSION).tar.xz -LIBGUDEV_SITE = http://ftp.gnome.org/pub/GNOME/sources/libgudev/$(LIBGUDEV_VERSION) -LIBGUDEV_INSTALL_STAGING = YES -LIBGUDEV_DEPENDENCIES = host-pkgconf udev libglib2 -LIBGUDEV_LICENSE = LGPLv2.1+ -LIBGUDEV_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libhdhomerun/0001-dont-strip.patch b/package.bak/libhdhomerun/0001-dont-strip.patch deleted file mode 100644 index 17a9ff49a9..0000000000 --- a/package.bak/libhdhomerun/0001-dont-strip.patch +++ /dev/null @@ -1,18 +0,0 @@ -Disable strip in Makefile. - -Patch downloaded from Gentoo: -https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libhdhomerun/files/dont-strip.patch - -Signed-off-by: Bernd Kuhls - -diff -Nur libhdhomerun/Makefile libhdhomerun.fix/Makefile ---- libhdhomerun/Makefile 2012-08-30 15:46:27.000000000 -0500 -+++ libhdhomerun.fix/Makefile 2013-03-24 14:47:08.740937164 -0500 -@@ -42,7 +42,6 @@ - - hdhomerun_config$(BINEXT) : hdhomerun_config.c $(LIBSRCS) - $(CC) $(CFLAGS) $+ $(LDFLAGS) -o $@ -- $(STRIP) $@ - - libhdhomerun$(LIBEXT) : $(LIBSRCS) - $(CC) $(CFLAGS) -fPIC -DDLL_EXPORT $(SHARED) $+ $(LDFLAGS) -o $@ diff --git a/package.bak/libhdhomerun/Config.in b/package.bak/libhdhomerun/Config.in deleted file mode 100644 index 9425c1b159..0000000000 --- a/package.bak/libhdhomerun/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBHDHOMERUN - bool "libhdhomerun" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - HDHomeRun is a network-attached digital television tuner - box, produced by the company SiliconDust USA, Inc. - - http://www.silicondust.com - -comment "libhdhomerun needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libhdhomerun/libhdhomerun.hash b/package.bak/libhdhomerun/libhdhomerun.hash deleted file mode 100644 index 7897764164..0000000000 --- a/package.bak/libhdhomerun/libhdhomerun.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 907dfbd1eb82aebd8b09e7c00c21a02433e6baaacf4a4f99aa2511b1d5244baf libhdhomerun_20150826.tgz diff --git a/package.bak/libhdhomerun/libhdhomerun.mk b/package.bak/libhdhomerun/libhdhomerun.mk deleted file mode 100644 index 16e34c2383..0000000000 --- a/package.bak/libhdhomerun/libhdhomerun.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# libhdhomerun -# -################################################################################ - -LIBHDHOMERUN_VERSION = 20150826 -LIBHDHOMERUN_SOURCE = libhdhomerun_$(LIBHDHOMERUN_VERSION).tgz -LIBHDHOMERUN_SITE = http://download.silicondust.com/hdhomerun -LIBHDHOMERUN_LICENSE = LGPLv2.1+ -LIBHDHOMERUN_LICENSE_FILES = lgpl.txt -LIBHDHOMERUN_INSTALL_STAGING = YES - -define LIBHDHOMERUN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define LIBHDHOMERUN_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/libhdhomerun.so \ - $(STAGING_DIR)/usr/lib/libhdhomerun.so - mkdir -p $(STAGING_DIR)/usr/include/libhdhomerun/ - $(INSTALL) -m 0644 $(@D)/*.h \ - $(STAGING_DIR)/usr/include/libhdhomerun/ -endef - -define LIBHDHOMERUN_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libhdhomerun.so \ - $(TARGET_DIR)/usr/lib/libhdhomerun.so -endef - -$(eval $(generic-package)) diff --git a/package.bak/libhid/0001-dont-fiddle-with-debug-flags.patch b/package.bak/libhid/0001-dont-fiddle-with-debug-flags.patch deleted file mode 100644 index 44a172877a..0000000000 --- a/package.bak/libhid/0001-dont-fiddle-with-debug-flags.patch +++ /dev/null @@ -1,19 +0,0 @@ -MD_CONF_DEBUGGING changes CFLAGS and CXXFLAGS with a horrible magic so disable -it to prevent compilation errors. - -downloaded from -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libhid/files/libhid-0.2.16-gentoo.patch?revision=1.1&view=markup - -Signed-off-by: Bernd Kuhls - -diff -uNr libhid-0.2.16.org/configure.ac libhid-0.2.16/configure.ac ---- libhid-0.2.16.org/configure.ac 2007-04-01 22:32:10.000000000 +0200 -+++ libhid-0.2.16/configure.ac 2014-10-19 21:31:00.550091947 +0200 -@@ -78,7 +78,6 @@ - AC_C_BIGENDIAN - AC_C_STRINGIZE - --MD_CONF_DEBUGGING - MD_CONF_COMPILER - AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") - AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") diff --git a/package.bak/libhid/0002-no-newline-in-ldflags.patch b/package.bak/libhid/0002-no-newline-in-ldflags.patch deleted file mode 100644 index df845ee1f5..0000000000 --- a/package.bak/libhid/0002-no-newline-in-ldflags.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix improper usage of macro that introduces a wrong newline - -The MD_CONF_FLAGS() macro was used with a final newline that -introduces an invalid newline in the middle of the macro expansion -when defining LDFLAGS. - -Signed-off-by: Thomas Petazzoni - -Index: libhid-0.2.16/configure.ac -=================================================================== ---- libhid-0.2.16.orig/configure.ac 2007-04-01 22:32:10.000000000 +0200 -+++ libhid-0.2.16/configure.ac 2012-12-12 20:24:03.000000000 +0100 -@@ -102,8 +102,7 @@ - [], - [$OS_CFLAGS $LIBUSB_CFLAGS], - [], -- [$OS_LDFLAGS $LIBUSB_LIBS] --) -+ [$OS_LDFLAGS $LIBUSB_LIBS]) - - MD_CONF_DB2MAN - diff --git a/package.bak/libhid/0003-uclinux.patch b/package.bak/libhid/0003-uclinux.patch deleted file mode 100644 index cb3c45216a..0000000000 --- a/package.bak/libhid/0003-uclinux.patch +++ /dev/null @@ -1,27 +0,0 @@ -Good old 'uclinux is also linux' - -Signed-off-by: Gustavo Zacarias - -diff -Nura libhid-0.2.16.orig/configure.ac libhid-0.2.16/configure.ac ---- libhid-0.2.16.orig/configure.ac 2014-06-22 09:35:50.277261742 -0300 -+++ libhid-0.2.16/configure.ac 2014-06-22 09:36:10.688951947 -0300 -@@ -80,6 +80,7 @@ - - MD_CONF_DEBUGGING - MD_CONF_COMPILER -+AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "uclinux") - AM_CONDITIONAL(OS_LINUX, test "$MD_OS" = "linux") - AM_CONDITIONAL(OS_BSD, test "$MD_OS" = "bsd") - AM_CONDITIONAL(OS_SOLARIS, test "$MD_OS" = "solaris") -diff -Nura libhid-0.2.16.orig/m4/md_check_os.m4 libhid-0.2.16/m4/md_check_os.m4 ---- libhid-0.2.16.orig/m4/md_check_os.m4 2014-06-22 09:35:50.275261675 -0300 -+++ libhid-0.2.16/m4/md_check_os.m4 2014-06-22 09:46:17.651475891 -0300 -@@ -3,7 +3,7 @@ - AC_CANONICAL_HOST - AC_MSG_CHECKING(for target OS) - case $host in -- *-linux*) -+ *-linux*|*-uclinux*) - AC_DEFINE(OS_LINUX, [], [define to 1 if building for Linux]) - AC_SUBST(OS_LINUX) - MD_OS=linux diff --git a/package.bak/libhid/Config.in b/package.bak/libhid/Config.in deleted file mode 100644 index e6f2012860..0000000000 --- a/package.bak/libhid/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBHID - bool "libhid" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Userspace library for accessing USB HID devices - - http://libhid.alioth.debian.org - -comment "libhid needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libhid/libhid.hash b/package.bak/libhid/libhid.hash deleted file mode 100644 index 7a843b60f4..0000000000 --- a/package.bak/libhid/libhid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 f6809ab3b9c907cbb05ceba9ee6ca23a705f85fd71588518e14b3a7d9f2550e5 libhid-0.2.16.tar.gz diff --git a/package.bak/libhid/libhid.mk b/package.bak/libhid/libhid.mk deleted file mode 100644 index 8b3cb2aff8..0000000000 --- a/package.bak/libhid/libhid.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libhid -# -################################################################################ - -LIBHID_VERSION = 0.2.16 -LIBHID_SITE = http://sources.buildroot.net -LIBHID_DEPENDENCIES = libusb-compat libusb -LIBHID_INSTALL_STAGING = YES -LIBHID_AUTORECONF = YES -LIBHID_LICENSE = GPLv2 -LIBHID_LICENSE_FILES = COPYING -# configure runs libusb-config for cflags/ldflags. Ensure it picks up -# the target version -LIBHID_CONF_ENV = PATH=$(STAGING_DIR)/usr/bin:$(BR_PATH) -LIBHID_CONF_OPTS = \ - --disable-swig \ - --disable-werror \ - --without-doxygen \ - --disable-package-config - -$(eval $(autotools-package)) diff --git a/package.bak/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch b/package.bak/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch deleted file mode 100644 index df166565f9..0000000000 --- a/package.bak/libhttpparser/0001-Use-f-option-when-calling-ln-at-install-time.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 384917321c45e492b0ca7aaa94d4b15324aef95d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 28 Aug 2015 19:02:11 +0200 -Subject: [PATCH] Use -f option when calling ln at install time - -This allows "make install; make install" to work properly. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Renaud AUBIN ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 33c8ba0..b36d95a 100644 ---- a/Makefile -+++ b/Makefile -@@ -125,12 +125,12 @@ tags: http_parser.c http_parser.h test.c - install: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) - - install-strip: library - $(INSTALL) -D http_parser.h $(INCLUDEDIR)/http_parser.h - $(INSTALL) -D -s $(SONAME) $(LIBDIR)/$(SONAME) -- ln -s $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) -+ ln -sf $(LIBDIR)/$(SONAME) $(LIBDIR)/libhttp_parser.$(SOEXT) - - uninstall: - rm $(INCLUDEDIR)/http_parser.h --- -2.6.2 - diff --git a/package.bak/libhttpparser/Config.in b/package.bak/libhttpparser/Config.in deleted file mode 100644 index 43563049e4..0000000000 --- a/package.bak/libhttpparser/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBHTTPPARSER - bool "libhttpparser" - depends on !BR2_STATIC_LIBS - help - This is a parser for HTTP messages written in C. It - parses both requests and responses. The parser is - designed to be used in performance HTTP applications. - It does not make any syscalls nor allocations, it does - not buffer data, it can be interrupted at anytime. - Depending on your architecture, it only requires about - 40 bytes of data per message stream (in a web server - that is per connection). - - https://github.com/nodejs/http-parser - -comment "libhttpparser needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libhttpparser/libhttpparser.hash b/package.bak/libhttpparser/libhttpparser.hash deleted file mode 100644 index e11006e8a5..0000000000 --- a/package.bak/libhttpparser/libhttpparser.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a11c5ccb9808496f3de66d54ea1f89271919923307e31c75de2a3a77a6754c97 libhttpparser-v2.6.0.tar.gz diff --git a/package.bak/libhttpparser/libhttpparser.mk b/package.bak/libhttpparser/libhttpparser.mk deleted file mode 100644 index 015efc0a1d..0000000000 --- a/package.bak/libhttpparser/libhttpparser.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libhttpparser -# -################################################################################ - -LIBHTTPPARSER_VERSION = v2.6.0 -LIBHTTPPARSER_SITE = $(call github,nodejs,http-parser,$(LIBHTTPPARSER_VERSION)) -LIBHTTPPARSER_INSTALL_STAGING = YES -LIBHTTPPARSER_LICENSE = MIT -LIBHTTPPARSER_LICENSE_FILES = LICENSE-MIT - -define LIBHTTPPARSER_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) library package -endef - -define LIBHTTPPARSER_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(STAGING_DIR)/usr install - $(INSTALL) -D -m 0644 $(@D)/libhttp_parser.a $(STAGING_DIR)/usr/lib/libhttp_parser.a -endef - -define LIBHTTPPARSER_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) PREFIX=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libical/0001-no-tests.patch b/package.bak/libical/0001-no-tests.patch deleted file mode 100644 index 324c04f643..0000000000 --- a/package.bak/libical/0001-no-tests.patch +++ /dev/null @@ -1,19 +0,0 @@ -Disable tests to avoid MMU dependency due to fork. - -Fixes -CMakeFiles/regression.dir/regression.c.o: In function `_test_file_locks': -/home/br/br4/output/build/libical-v1.0.1/src/test/regression.c:(.text+0x96d8): undefined reference to `_fork' - -Signed-off-by: Bernd Kuhls - -diff -uNr libical-1.0.1.org/src/CMakeLists.txt libical-1.0.1/src/CMakeLists.txt ---- libical-1.0.1.org/src/CMakeLists.txt 2014-10-09 17:07:05.000000000 +0200 -+++ libical-1.0.1/src/CMakeLists.txt 2015-04-25 17:41:22.657345548 +0200 -@@ -1,7 +1,6 @@ - add_subdirectory(libical) - add_subdirectory(libicalss) - add_subdirectory(libicalvcal) --add_subdirectory(test) - - if(MSVC) - install(FILES diff --git a/package.bak/libical/Config.in b/package.bak/libical/Config.in deleted file mode 100644 index 3220d5bee1..0000000000 --- a/package.bak/libical/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBICAL - bool "libical" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - select BR2_TARGET_TZ_INFO - help - libical is an Open Source (MPL/LGPL) implementation of the IETF's - iCalendar Calendaring and Scheduling protocols. - - http://libical.github.io/libical - -comment "libical needs a toolchain w/ C++, dynamic library, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS diff --git a/package.bak/libical/libical.hash b/package.bak/libical/libical.hash deleted file mode 100644 index 5c42cdcc61..0000000000 --- a/package.bak/libical/libical.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 089ce3c42d97fbd7a5d4b3c70adbdd82115dd306349c1f5c46a8fb3f8c949592 libical-1.0.1.tar.gz diff --git a/package.bak/libical/libical.mk b/package.bak/libical/libical.mk deleted file mode 100644 index a511039569..0000000000 --- a/package.bak/libical/libical.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libical -# -################################################################################ - -LIBICAL_VERSION = 1.0.1 -LIBICAL_SITE = https://github.com/libical/libical/releases/download/v$(LIBICAL_VERSION) -LIBICAL_INSTALL_STAGING = YES -LIBICAL_LICENSE = MPLv1.0 or LGPLv2.1 -LIBICAL_LICENSE_FILES = LICENSE - -# building without this option is broken, it is used by -# Gentoo/alpinelinux as well -LIBICAL_CONF_OPTS = -DSHARED_ONLY=true -# never build time zone info, always use system's tzinfo -LIBICAL_CONF_OPTS += -DUSE_BUILTIN_TZDATA=false - -$(eval $(cmake-package)) diff --git a/package.bak/libiconv/Config.in b/package.bak/libiconv/Config.in deleted file mode 100644 index ee4fd62011..0000000000 --- a/package.bak/libiconv/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBICONV - bool "libiconv" - depends on !BR2_ENABLE_LOCALE - help - unicode conversion library - - http://ftp.gnu.org/pub/gnu/libiconv diff --git a/package.bak/libiconv/libiconv.hash b/package.bak/libiconv/libiconv.hash deleted file mode 100644 index 83de76f4d7..0000000000 --- a/package.bak/libiconv/libiconv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 72b24ded17d687193c3366d0ebe7cde1e6b18f0df8c55438ac95be39e8a30613 libiconv-1.14.tar.gz diff --git a/package.bak/libiconv/libiconv.mk b/package.bak/libiconv/libiconv.mk deleted file mode 100644 index f014da0f13..0000000000 --- a/package.bak/libiconv/libiconv.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libiconv -# -################################################################################ - -LIBICONV_VERSION = 1.14 -LIBICONV_SITE = $(BR2_GNU_MIRROR)/libiconv -LIBICONV_INSTALL_STAGING = YES -LIBICONV_LICENSE = GPLv3+ (iconv program), LGPLv2+ (library) -LIBICONV_LICENSE_FILES = COPYING COPYING.LIB - -# Don't build the preloadable library, as we don't need it (it's only -# for LD_PRELOAD to replace glibc's iconv, but we never build libiconv -# when glibc is used). And it causes problems for static only builds. -define LIBICONV_DISABLE_PRELOAD - $(SED) '/preload/d' $(@D)/Makefile.in -endef -LIBICONV_PRE_CONFIGURE_HOOKS += LIBICONV_DISABLE_PRELOAD - -$(eval $(autotools-package)) - -# Configurations where the toolchain supports locales and the libiconv -# package is enabled are incorrect, because the toolchain already -# provides libiconv functionality, and having both confuses packages. -ifeq ($(BR2_PACKAGE_LIBICONV)$(BR2_ENABLE_LOCALE),yy) -$(error Libiconv should never be enabled when the toolchain supports locales. Report this failure to Buildroot developers) -endif diff --git a/package.bak/libid3tag/Config.in b/package.bak/libid3tag/Config.in deleted file mode 100644 index 869b9f7f6c..0000000000 --- a/package.bak/libid3tag/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBID3TAG - bool "libid3tag" - select BR2_PACKAGE_ZLIB - help - ID3 tag reading library from the MAD project. - - http://www.underbit.com/products/mad/ diff --git a/package.bak/libid3tag/libid3tag.hash b/package.bak/libid3tag/libid3tag.hash deleted file mode 100644 index fb02882db7..0000000000 --- a/package.bak/libid3tag/libid3tag.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 libid3tag-0.15.1b.tar.gz diff --git a/package.bak/libid3tag/libid3tag.mk b/package.bak/libid3tag/libid3tag.mk deleted file mode 100644 index 2cd7820d1f..0000000000 --- a/package.bak/libid3tag/libid3tag.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libid3tag -# -################################################################################ - -LIBID3TAG_VERSION = 0.15.1b -LIBID3TAG_SITE = http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VERSION) -LIBID3TAG_LICENSE = GPLv2+ -LIBID3TAG_LICENSE_FILES = COPYING COPYRIGHT -LIBID3TAG_INSTALL_STAGING = YES -LIBID3TAG_DEPENDENCIES = zlib -LIBID3TAG_LIBTOOL_PATCH = NO - -$(eval $(autotools-package)) diff --git a/package.bak/libidn/Config.in b/package.bak/libidn/Config.in deleted file mode 100644 index 7b558c7175..0000000000 --- a/package.bak/libidn/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBIDN - bool "libidn" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Libidn's purpose is to encode and decode internationalized - domain names. - - http://www.gnu.org/software/libidn/ - -if BR2_PACKAGE_LIBIDN - -config BR2_PACKAGE_LIBIDN_BINARY - bool "idn binary" - help - Install idn command line tool - -endif diff --git a/package.bak/libidn/libidn.hash b/package.bak/libidn/libidn.hash deleted file mode 100644 index 4658a3e857..0000000000 --- a/package.bak/libidn/libidn.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.nongnu.org/archive/html/help-libidn/2016-07/msg00009.html -sha1 57872fdc665dcc585e16f4ac0bb35374b1103f7e libidn-1.33.tar.gz -# Calculated based on the hash above -sha256 44a7aab635bb721ceef6beecc4d49dfd19478325e1b47f3196f7d2acc4930e19 libidn-1.33.tar.gz diff --git a/package.bak/libidn/libidn.mk b/package.bak/libidn/libidn.mk deleted file mode 100644 index 99c9e2cb80..0000000000 --- a/package.bak/libidn/libidn.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libidn -# -################################################################################ - -LIBIDN_VERSION = 1.33 -LIBIDN_SITE = $(BR2_GNU_MIRROR)/libidn -LIBIDN_INSTALL_STAGING = YES -LIBIDN_CONF_ENV = EMACS="no" -LIBIDN_CONF_OPTS = --disable-java --enable-csharp=no -LIBIDN_DEPENDENCIES = host-pkgconf $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) -LIBIDN_LICENSE = GPLv2+, GPLv3+, LGPLv3+ -LIBIDN_LICENSE_FILES = COPYINGv2 COPYINGv3 COPYING.LESSERv3 - -define LIBIDN_REMOVE_BINARY - rm -f $(TARGET_DIR)/usr/bin/idn -endef - -ifneq ($(BR2_PACKAGE_LIBIDN_BINARY),y) -LIBIDN_POST_INSTALL_TARGET_HOOKS += LIBIDN_REMOVE_BINARY -endif - -define LIBIDN_REMOVE_EMACS_STUFF - rm -rf $(TARGET_DIR)/usr/share/emacs -endef - -LIBIDN_POST_INSTALL_TARGET_HOOKS += LIBIDN_REMOVE_EMACS_STUFF - -$(eval $(autotools-package)) diff --git a/package.bak/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch b/package.bak/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch deleted file mode 100644 index cea22cbcac..0000000000 --- a/package.bak/libiio/0001-utilities.c-Add-a-check-for-newlocale-function.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 913c2cc740d60450e91e066cf38f5654936a6015 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Mon, 6 Feb 2017 14:04:47 +0100 -Subject: [PATCH] utilities.c: Add a check for newlocale() function - -uClibc might define __UCLIBC_HAS_LOCALE__, without actually providing -the locale_t type or the setlocale() function. - -Signed-off-by: Paul Cercueil ---- - CMakeLists.txt | 1 + - iio-config.h.cmakein | 1 + - utilities.c | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb3a48f..b24eff3 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -66,6 +66,7 @@ endif() - include(CheckSymbolExists) - check_symbol_exists(strdup "string.h" HAS_STRDUP) - check_symbol_exists(strerror_r "string.h" HAS_STRERROR_R) -+check_symbol_exists(newlocale "locale.h" HAS_NEWLOCALE) - - IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - option(WITH_IIOD "Build the IIO Daemon" ON) -diff --git a/iio-config.h.cmakein b/iio-config.h.cmakein -index 1b8608e..6700326 100644 ---- a/iio-config.h.cmakein -+++ b/iio-config.h.cmakein -@@ -21,6 +21,7 @@ - #cmakedefine HAS_PIPE2 - #cmakedefine HAS_STRDUP - #cmakedefine HAS_STRERROR_R -+#cmakedefine HAS_NEWLOCALE - #cmakedefine HAS_PTHREAD_SETNAME_NP - #cmakedefine HAVE_IPV6 - #cmakedefine HAVE_AVAHI -diff --git a/utilities.c b/utilities.c -index 88b8257..21dbd10 100644 ---- a/utilities.c -+++ b/utilities.c -@@ -34,7 +34,7 @@ - #endif - - #ifdef LOCALE_SUPPORT --#if defined(__MINGW32__) -+#if defined(__MINGW32__) || (!defined(_WIN32) && !defined(HAS_NEWLOCALE)) - static int read_double_locale(const char *str, double *val) - { - char *end, *old_locale; --- -2.11.0 - diff --git a/package.bak/libiio/Config.in b/package.bak/libiio/Config.in deleted file mode 100644 index 6f6af16852..0000000000 --- a/package.bak/libiio/Config.in +++ /dev/null @@ -1,106 +0,0 @@ -config BR2_PACKAGE_LIBIIO - bool "libiio" - select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND if !BR2_PACKAGE_LIBIIO_XML_BACKEND - help - Libiio is a library to ease the development of software - interfacing Linux Industrial I/O (IIO) devices. - - http://wiki.analog.com/resources/tools-software/linux-software/libiio - -if BR2_PACKAGE_LIBIIO - -config BR2_PACKAGE_LIBIIO_LOCAL_BACKEND - bool "Local backend" - default y - help - Enable the local backend of the library. - -config BR2_PACKAGE_LIBIIO_XML_BACKEND - bool "XML backend" - select BR2_PACKAGE_LIBXML2 - default y - help - Enable the XML backend of the library. - -config BR2_PACKAGE_LIBIIO_NETWORK_BACKEND - bool "Network backend" - select BR2_PACKAGE_LIBIIO_XML_BACKEND - default y - help - Enable the network backend of the library. - -config BR2_PACKAGE_LIBIIO_USB_BACKEND - bool "USB backend" - depends on BR2_TOOLCHAIN_HAS_THREADS # from libusb - select BR2_PACKAGE_LIBIIO_XML_BACKEND - select BR2_PACKAGE_LIBUSB - default y - help - Enable the USB backend of the library. - -comment "The USB backend needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_LIBIIO_SERIAL_BACKEND - bool "Serial backend" - select BR2_PACKAGE_LIBIIO_XML_BACKEND - select BR2_PACKAGE_LIBSERIALPORT - default y - help - Enable the serial backend of the library. - -config BR2_PACKAGE_LIBIIO_IIOD - bool "IIO Daemon" - select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_bfin - default y - help - Install the IIO Daemon. - -config BR2_PACKAGE_LIBIIO_IIOD_USBD - bool "USB support in the IIO Daemon (FunctionFS)" - depends on BR2_PACKAGE_LIBIIO_IIOD - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # usb_functionfs_descs_head_v2 - select BR2_PACKAGE_LIBAIO - help - Add support for USB through FunctionFS with IIOD. - -comment "USB support in the IIO Daemon requires libaio, headers >= 3.18" - depends on BR2_PACKAGE_LIBIIO_IIOD - depends on !BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 - -comment "IIO Daemon needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_bfin - -comment "IIO Daemon is not yet available on Blackfin" - depends on BR2_bfin - -config BR2_PACKAGE_LIBIIO_TESTS - bool "Install test programs" - select BR2_PACKAGE_LIBIIO_LOCAL_BACKEND - select BR2_PACKAGE_LIBIIO_XML_BACKEND - select BR2_PACKAGE_LIBIIO_NETWORK_BACKEND - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Install the test programs (iio_info, iio_genxml, iio_readdev). - -comment "IIO test programs need a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP - bool "Install C# bindings" - depends on BR2_PACKAGE_MONO - help - Install the C# bindings. - -config BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON - bool "Install Python bindings" - depends on BR2_PACKAGE_PYTHON - help - Install the Python bindings. - -endif diff --git a/package.bak/libiio/S99iiod b/package.bak/libiio/S99iiod deleted file mode 100644 index df2f763461..0000000000 --- a/package.bak/libiio/S99iiod +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh - -# Server-side demuxing by default -IIOD_OPTS=-D - -[ -r /etc/default/iiod ] && . /etc/default/iiod - -case "$1" in - start) - echo "Starting IIO Server Daemon" - start-stop-daemon -S -b -q -m -p /var/run/iiod.pid -x /usr/sbin/iiod -- $IIOD_OPTS - exit $? - ;; - - stop) - echo "Stopping IIO Server Daemon" - start-stop-daemon -K -q -p /var/run/iiod.pid 2>/dev/null - exit $? - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/libiio/libiio.hash b/package.bak/libiio/libiio.hash deleted file mode 100644 index e5387861aa..0000000000 --- a/package.bak/libiio/libiio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://github.com/analogdevicesinc/libiio/archive/v0.9/ -sha256 b6184876d192fbfd51e3a0a29736fa1be2dbaf07370cf861797076f40a85f823 libiio-0.9.tar.gz diff --git a/package.bak/libiio/libiio.mk b/package.bak/libiio/libiio.mk deleted file mode 100644 index 8977610999..0000000000 --- a/package.bak/libiio/libiio.mk +++ /dev/null @@ -1,93 +0,0 @@ -################################################################################ -# -# libiio -# -################################################################################ - -LIBIIO_VERSION = 0.9 -LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) -LIBIIO_INSTALL_STAGING = YES -LIBIIO_LICENSE = LGPLv2.1+ -LIBIIO_LICENSE_FILES = COPYING.txt - -LIBIIO_CONF_OPTS = -DENABLE_IPV6=ON \ - -DWITH_LOCAL_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_LOCAL_BACKEND),ON,OFF) \ - -DWITH_NETWORK_BACKEND=$(if $(BR2_PACKAGE_LIBIIO_NETWORK_BACKEND),ON,OFF) \ - -DWITH_MATLAB_BINDINGS_API=OFF \ - -DINSTALL_UDEV_RULE=$(if $(BR2_PACKAGE_HAS_UDEV),ON,OFF) \ - -DWITH_TESTS=$(if $(BR2_PACKAGE_LIBIIO_TESTS),ON,OFF) \ - -DWITH_DOC=OFF - -ifeq ($(BR2_PACKAGE_LIBIIO_XML_BACKEND),y) -LIBIIO_DEPENDENCIES += libxml2 -LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=ON -else -LIBIIO_CONF_OPTS += -DWITH_XML_BACKEND=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_USB_BACKEND),y) -LIBIIO_DEPENDENCIES += libusb -LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=ON -else -LIBIIO_CONF_OPTS += -DWITH_USB_BACKEND=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_SERIAL_BACKEND),y) -LIBIIO_DEPENDENCIES += libserialport -LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=ON -else -LIBIIO_CONF_OPTS += -DWITH_SERIAL_BACKEND=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y) -LIBIIO_DEPENDENCIES += host-flex host-bison -LIBIIO_CONF_OPTS += -DWITH_IIOD=ON -else -LIBIIO_CONF_OPTS += -DWITH_IIOD=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_IIOD_USBD),y) -LIBIIO_DEPENDENCIES += libaio -LIBIIO_CONF_OPTS += -DWITH_IIOD_USBD=ON -else -LIBIIO_CONF_OPTS += -DWITH_IIOD_USBD=OFF -endif - -# Avahi support in libiio requires avahi-client, which needs avahi-daemon -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON),yy) -LIBIIO_DEPENDENCIES += avahi -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_PYTHON),y) -LIBIIO_DEPENDENCIES += python -LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=ON -else -LIBIIO_CONF_OPTS += -DPYTHON_BINDINGS=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_BINDINGS_CSHARP),y) -define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET - rm $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll.mdb - $(HOST_DIR)/usr/bin/gacutil -root $(TARGET_DIR)/usr/lib -i \ - $(TARGET_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll -endef -define LIBIIO_INSTALL_CSHARP_BINDINGS_TO_STAGING - $(HOST_DIR)/usr/bin/gacutil -root $(STAGING_DIR)/usr/lib -i \ - $(STAGING_DIR)/usr/lib/cli/libiio-sharp-$(LIBIIO_VERSION)/libiio-sharp.dll -endef -LIBIIO_POST_INSTALL_TARGET_HOOKS += LIBIIO_INSTALL_CSHARP_BINDINGS_TO_TARGET -LIBIIO_POST_INSTALL_STAGING_HOOKS += LIBIIO_INSTALL_CSHARP_BINDINGS_TO_STAGING -LIBIIO_DEPENDENCIES += mono -LIBIIO_CONF_OPTS += -DCSHARP_BINDINGS=ON -else -LIBIIO_CONF_OPTS += -DCSHARP_BINDINGS=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBIIO_IIOD),y) -define LIBIIO_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/libiio/S99iiod \ - $(TARGET_DIR)/etc/init.d/S99iiod -endef -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libilbc/Config.in b/package.bak/libilbc/Config.in deleted file mode 100644 index 89d5db2fd6..0000000000 --- a/package.bak/libilbc/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBILBC - bool "libilbc" - help - iLBC (internet Low Bitrate Codec) is a FREE speech codec - suitable for robust voice communication over IP. - - http://www.webrtc.org/license-rights/ilbc-freeware diff --git a/package.bak/libilbc/libilbc.mk b/package.bak/libilbc/libilbc.mk deleted file mode 100644 index 06d94eb36d..0000000000 --- a/package.bak/libilbc/libilbc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libilbc -# -################################################################################ - -LIBILBC_VERSION = 829b08c7902ceb87a261279fabb36b6d523c6e07 -LIBILBC_SITE = https://freeswitch.org/stash/scm/sd/libilbc.git -LIBILBC_SITE_METHOD = git -LIBILBC_LICENSE = Global IP Sound iLBC Public License v2.0 -LIBILBC_LICENSE_FILES = gips_iLBClicense.pdf -LIBILBC_AUTORECONF = YES -LIBILBC_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libimxvpuapi/Config.in b/package.bak/libimxvpuapi/Config.in deleted file mode 100644 index 8b8b839ce8..0000000000 --- a/package.bak/libimxvpuapi/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "libimxvpuapi needs an i.MX platform with VPU support" - depends on BR2_arm - depends on !BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - -config BR2_PACKAGE_LIBIMXVPUAPI - bool "libimxvpuapi" - depends on BR2_arm # Only relevant for i.MX - depends on BR2_PACKAGE_FREESCALE_IMX_HAS_VPU - select BR2_PACKAGE_IMX_VPU - help - This library provides an API for using the iMX6 VPU video - engine. It is an alternative to Freescale's VPU - wrapper. Both the wrapper and this library are layered on - top of imx-vpu, the low-level iMX6 VPU interface. - - https://github.com/Freescale/libimxvpuapi diff --git a/package.bak/libimxvpuapi/libimxvpuapi.hash b/package.bak/libimxvpuapi/libimxvpuapi.hash deleted file mode 100644 index cd0c8f1f5f..0000000000 --- a/package.bak/libimxvpuapi/libimxvpuapi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 7151e10a24929935bada1d3d87626f17e411575b3a4ac0d86440999ad0100a55 libimxvpuapi-0.10.3.tar.gz diff --git a/package.bak/libimxvpuapi/libimxvpuapi.mk b/package.bak/libimxvpuapi/libimxvpuapi.mk deleted file mode 100644 index d368d3d064..0000000000 --- a/package.bak/libimxvpuapi/libimxvpuapi.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libimxvpuapi -# -################################################################################ - -LIBIMXVPUAPI_VERSION = 0.10.3 -LIBIMXVPUAPI_SITE = $(call github,Freescale,libimxvpuapi,$(LIBIMXVPUAPI_VERSION)) -LIBIMXVPUAPI_LICENSE = LGPLv2.1+ -LIBIMXVPUAPI_LICENSE_FILES = LICENSE -LIBIMXVPUAPI_DEPENDENCIES = host-pkgconf host-python imx-vpu -LIBIMXVPUAPI_INSTALL_STAGING = YES - -$(eval $(waf-package)) diff --git a/package.bak/libinput/Config.in b/package.bak/libinput/Config.in deleted file mode 100644 index f7793df84f..0000000000 --- a/package.bak/libinput/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBINPUT - bool "libinput" - depends on BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBEVDEV - select BR2_PACKAGE_MTDEV - help - libinput is a library to handle input devices in Wayland - compositors and to provide a generic X.Org input driver. - It provides device detection, device handling, input device - event processing and abstraction so minimize the amount of - custom input code compositors need to provide the common - set of functionality that users expect. - - http://freedesktop.org/wiki/Software/libinput/ - -comment "libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE diff --git a/package.bak/libinput/libinput.hash b/package.bak/libinput/libinput.hash deleted file mode 100644 index dd3573f2e1..0000000000 --- a/package.bak/libinput/libinput.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032746.html -sha256 b7534f518d735c643aedca2fb4694683dfddc8d0600cfb628c87a18e65255832 libinput-1.6.0.tar.xz diff --git a/package.bak/libinput/libinput.mk b/package.bak/libinput/libinput.mk deleted file mode 100644 index 52aca9acfd..0000000000 --- a/package.bak/libinput/libinput.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# libinput -# -################################################################################ - -LIBINPUT_VERSION = 1.6.0 -LIBINPUT_SOURCE = libinput-$(LIBINPUT_VERSION).tar.xz -LIBINPUT_SITE = http://www.freedesktop.org/software/libinput -LIBINPUT_DEPENDENCIES = host-pkgconf libevdev mtdev udev -LIBINPUT_INSTALL_STAGING = YES -LIBINPUT_LICENSE = MIT -LIBINPUT_LICENSE_FILES = COPYING -# Tests need fork, so just disable them everywhere. -LIBINPUT_CONF_OPTS = --disable-tests --disable-libwacom - -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -LIBINPUT_CONF_OPTS += --enable-event-gui -LIBINPUT_DEPENDENCIES += libgtk3 -else -LIBINPUT_CONF_OPTS += --disable-event-gui -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch b/package.bak/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch deleted file mode 100644 index cfd7d54523..0000000000 --- a/package.bak/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 46660112b76664473cc98b8ae6c863fd27c27d2d Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Fri, 29 Aug 2014 23:40:59 +0200 -Subject: [PATCH 1/1] cmake: handle static library and find required thread - module - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 2 ++ - src/CMakeLists.txt | 4 +++- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 79f644c..7779a2a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,7 +6,9 @@ enable_testing() - # use local module (for Findlibusb-1.0.cmake) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") - -+find_package(Threads REQUIRED) - find_package(libusb-1.0 REQUIRED) -+ - if (NOT LIBUSB_1_FOUND) - message(FATAL_ERROR "libusb-1.0 not installed. (try apt-get install libusb-1.0-0-dev)") - endif (NOT LIBUSB_1_FOUND) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 149d198..0597ccd 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -18,8 +18,10 @@ set (iqrf_sources - - include_directories ("${LIBUSB_1_INCLUDE_DIRS}") - --add_library(iqrf SHARED ${iqrf_sources} ${iqrf_headers}) -+add_library(iqrf ${iqrf_sources} ${iqrf_headers}) -+ - target_link_libraries(iqrf ${LIBUSB_1_LIBRARIES}) -+target_link_libraries(iqrf ${CMAKE_THREAD_LIBS_INIT}) - - set_target_properties(iqrf PROPERTIES - VERSION "${iqrf_version_major}.${iqrf_version_minor}" --- -2.1.0 - diff --git a/package.bak/libiqrf/0002-use-only-c-language.patch b/package.bak/libiqrf/0002-use-only-c-language.patch deleted file mode 100644 index 2f1c23c28b..0000000000 --- a/package.bak/libiqrf/0002-use-only-c-language.patch +++ /dev/null @@ -1,29 +0,0 @@ -Use only the C language - -libirqf is written completely in C, but by default, CMake assumes that -both C and C++ are used, and therefore verifies that a C++ compiler is -installed. This may not necessarily be the case for a C-only package -in Buildroot. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/CMakeLists.txt -=================================================================== ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,5 +1,3 @@ --project(iqrf) -- - set (iqrf_version_major 0) - set (iqrf_version_minor 1) - set (iqrf_version_patch 2) -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,3 +1,5 @@ -+project(iqrf C) -+ - cmake_minimum_required(VERSION 2.8.1) - enable_testing() - diff --git a/package.bak/libiqrf/Config.in b/package.bak/libiqrf/Config.in deleted file mode 100644 index 03555e063a..0000000000 --- a/package.bak/libiqrf/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBIQRF - bool "libiqrf" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - This library implement specific protocol - which is used for communicating with iqrf devices - (http://iqrf.org) over usb. For usb access is used - libusb library. - - https://github.com/nandra/libiqrf - -comment "libiqrf needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libiqrf/libiqrf.hash b/package.bak/libiqrf/libiqrf.hash deleted file mode 100644 index 12d526c83c..0000000000 --- a/package.bak/libiqrf/libiqrf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8111031dd9dd6093a1927eb32dd7476fe22cfee9190043aa8e4c88003c104b16 libiqrf-v0.1.2.tar.gz diff --git a/package.bak/libiqrf/libiqrf.mk b/package.bak/libiqrf/libiqrf.mk deleted file mode 100644 index 05316029dd..0000000000 --- a/package.bak/libiqrf/libiqrf.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libiqrf -# -################################################################################ - -LIBIQRF_VERSION = v0.1.2 -LIBIQRF_SITE = $(call github,nandra,libiqrf,$(LIBIQRF_VERSION)) -LIBIQRF_INSTALL_STAGING = YES -LIBIQRF_DEPENDENCIES = libusb -LIBIQRF_LICENSE = LGPLv2.1+ - -$(eval $(cmake-package)) diff --git a/package.bak/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch b/package.bak/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch deleted file mode 100644 index dc047ef49c..0000000000 --- a/package.bak/libiscsi/0001-Do-not-use-I-usr-include.-This-is-unsafe-when-cross-compiling.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f27bdf64f0c375352ca42928071a9178a5a04c46 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Sun, 16 Oct 2016 10:53:13 +0100 -Subject: [PATCH] Do not use -I/usr/include. This is unsafe when cross-compiling. - -Upstream status: PR sent (https://github.com/sahlberg/libiscsi/pull/219) - -Signed-off-by: Vicente Olivert Riera ---- - examples/Makefile.am | 2 +- - lib/Makefile.am | 2 +- - tests/Makefile.am | 2 +- - utils/Makefile.am | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 0de0b1f..42ad818 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS=-I. -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS=$(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - noinst_PROGRAMS = iscsiclient iscsi-dd -diff --git a/lib/Makefile.am b/lib/Makefile.am -index d612fb7..47ffc33 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -29,7 +29,7 @@ libiscsi_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \ - "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" - --AM_CFLAGS=$(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS=$(WARN_CFLAGS) - - dist_noinst_DATA = libiscsi.syms libiscsi.def - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 9d699fc..b4cbf21 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS = -I../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS = $(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - noinst_PROGRAMS = prog_reconnect prog_reconnect_timeout prog_noop_reply \ -diff --git a/utils/Makefile.am b/utils/Makefile.am -index 657ca9d..bde1c81 100644 ---- a/utils/Makefile.am -+++ b/utils/Makefile.am -@@ -1,6 +1,6 @@ - AM_CPPFLAGS = -I${srcdir}/../include "-D_U_=__attribute__((unused))" \ - "-D_R_(A,B)=__attribute__((format(printf,A,B)))" --AM_CFLAGS = $(WARN_CFLAGS) -I/usr/include -+AM_CFLAGS = $(WARN_CFLAGS) - LDADD = ../lib/libiscsi.la - - bin_PROGRAMS = iscsi-inq iscsi-ls iscsi-perf iscsi-readcapacity16 \ --- -2.10.0 - diff --git a/package.bak/libiscsi/Config.in b/package.bak/libiscsi/Config.in deleted file mode 100644 index 88933f3942..0000000000 --- a/package.bak/libiscsi/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBISCSI - bool "libiscsi" - help - Libiscsi is a client-side library to implement the iSCSI protocol - that can be used to access resource of an iSCSI Target. - - The library is fully async with regards to iscsi commands and scsi - tasks, but a sync layer is also provided for ease of use for simpler - applications. - - https://github.com/sahlberg/libiscsi (no proper homepage) diff --git a/package.bak/libiscsi/libiscsi.hash b/package.bak/libiscsi/libiscsi.hash deleted file mode 100644 index 4f7d1af50e..0000000000 --- a/package.bak/libiscsi/libiscsi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 464d104e12533dc11f0dd7662cbc2f01c132f94aa4f5bd519e3413ef485830e8 libiscsi-1.18.0.tar.gz diff --git a/package.bak/libiscsi/libiscsi.mk b/package.bak/libiscsi/libiscsi.mk deleted file mode 100644 index 4c8a229265..0000000000 --- a/package.bak/libiscsi/libiscsi.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libiscsi -# -################################################################################ - -LIBISCSI_VERSION = 1.18.0 -LIBISCSI_SITE = $(call github,sahlberg,libiscsi,$(LIBISCSI_VERSION)) -LIBISCSI_LICENSE = GPLv2+, LGPLv2.1+ -LIBISCSI_LICENSE_FILES = COPYING LICENCE-GPL-2.txt LICENCE-LGPL-2.1.txt -LIBISCSI_INSTALL_STAGING = YES -LIBISCSI_AUTORECONF = YES - -# We need to create the m4 directory to make autoreconf work properly. -define LIBISCSI_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef -LIBISCSI_POST_PATCH_HOOKS += LIBISCSI_CREATE_M4_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/libite/Config.in b/package.bak/libite/Config.in deleted file mode 100644 index 80d29791db..0000000000 --- a/package.bak/libite/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBITE - bool "libite" - help - Libite is a lightweight library of frog DNA. It can be used - to fill the gaps in any dinosaur project. It holds useful - functions and macros developed by both Finit and the OpenBSD - project. Most notably the string functions: strlcpy(3), - strlcat(3) and the highly useful *BSD sys/queue.h and - sys/tree.h API's. - - Libite is the frog DNA missing in GNU libc. However, -lite - does not aim to become another GLIB! One noticeable gap in - GLIBC is the missing _SAFE macros in the BSD sys/queue.h API - - highly recommended when traversing lists to delete/free - nodes. - - https://github.com/troglobit/libite diff --git a/package.bak/libite/libite.hash b/package.bak/libite/libite.hash deleted file mode 100644 index 67ad009bf5..0000000000 --- a/package.bak/libite/libite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b27e4af69e9e5b4d00924538d3a41b53752082cc439b9246edec5501aff2f22f libite-v1.8.2.tar.gz diff --git a/package.bak/libite/libite.mk b/package.bak/libite/libite.mk deleted file mode 100644 index b56c430b06..0000000000 --- a/package.bak/libite/libite.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libite -# -################################################################################ - -LIBITE_VERSION = v1.8.2 -LIBITE_SITE = $(call github,troglobit,libite,$(LIBITE_VERSION)) -LIBITE_LICENSE = MIT, X11, ISC, BSD-2c -LIBITE_LICENSE_FILES = LICENSE chomp.c pidfile.c -LIBITE_INSTALL_STAGING = YES -LIBITE_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libjpeg/libjpeg.hash b/package.bak/libjpeg/libjpeg.hash deleted file mode 100644 index 2ad7dda6cf..0000000000 --- a/package.bak/libjpeg/libjpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 240fd398da741669bf3c90366f58452ea59041cacc741a489b99f2f6a0bad052 jpegsrc.v9b.tar.gz diff --git a/package.bak/libjpeg/libjpeg.mk b/package.bak/libjpeg/libjpeg.mk deleted file mode 100644 index b8f4bac56e..0000000000 --- a/package.bak/libjpeg/libjpeg.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libjpeg -# -################################################################################ - -LIBJPEG_VERSION = 9b -LIBJPEG_SITE = http://www.ijg.org/files -LIBJPEG_SOURCE = jpegsrc.v$(LIBJPEG_VERSION).tar.gz -LIBJPEG_LICENSE = jpeg-license (BSD-3c-like) -LIBJPEG_LICENSE_FILES = README -LIBJPEG_INSTALL_STAGING = YES -LIBJPEG_PROVIDES = jpeg - -define LIBJPEG_REMOVE_USELESS_TOOLS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,cjpeg djpeg jpegtran rdjpgcom wrjpgcom) -endef - -LIBJPEG_POST_INSTALL_TARGET_HOOKS += LIBJPEG_REMOVE_USELESS_TOOLS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libjson/0001-fix-broken-makefile.patch b/package.bak/libjson/0001-fix-broken-makefile.patch deleted file mode 100644 index 8ceb0cac3a..0000000000 --- a/package.bak/libjson/0001-fix-broken-makefile.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix the broken libjson makefile. - -Signed-off-by: Simon Dawson - -diff -Nurp a/makefile b/makefile ---- a/makefile 2012-05-30 10:15:42.000000000 +0100 -+++ b/makefile 2013-03-27 18:45:34.814670534 +0000 -@@ -170,7 +170,7 @@ include_path = $(prefix)/$(includedi - # Usage check - ifdef CXXFLAGS - ifdef BUILD_TYPE -- $(error CXXFLAGS and BUILD_TYPE are mutually exclusive) -+$(error CXXFLAGS and BUILD_TYPE are mutually exclusive) - endif - endif - diff --git a/package.bak/libjson/Config.in b/package.bak/libjson/Config.in deleted file mode 100644 index 50a99311d2..0000000000 --- a/package.bak/libjson/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBJSON - bool "libjson" - depends on BR2_INSTALL_LIBSTDCPP - help - A JSON reader and writer which is super-efficient and usually - runs circles around other JSON libraries. - - http://sourceforge.net/projects/libjson/ - -comment "libjson needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libjson/libjson.hash b/package.bak/libjson/libjson.hash deleted file mode 100644 index f3447ee73d..0000000000 --- a/package.bak/libjson/libjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 07267a3951038ee2e02d26cc41bf8e275668c38f751240d3e78dc979182e7376 libjson_7.6.1.zip diff --git a/package.bak/libjson/libjson.mk b/package.bak/libjson/libjson.mk deleted file mode 100644 index c73a69f10e..0000000000 --- a/package.bak/libjson/libjson.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# libjson -# -################################################################################ - -LIBJSON_VERSION = 7.6.1 -LIBJSON_SITE = http://downloads.sourceforge.net/project/libjson -LIBJSON_SOURCE = libjson_$(LIBJSON_VERSION).zip -LIBJSON_INSTALL_STAGING = YES -LIBJSON_LICENSE = BSD-2c -LIBJSON_LICENSE_FILES = License.txt - -LIBJSON_CXXFLAGS = $(TARGET_CFLAGS) -DNDEBUG - -ifeq ($(BR2_STATIC_LIBS),y) -LIBJSON_MAKE_OPTS += SHARED=0 -else -LIBJSON_MAKE_OPTS += SHARED=1 -LIBJSON_CXXFLAGS += -fPIC -endif - -LIBJSON_MAKE_OPTS += BUILD_TYPE= CXXFLAGS="$(LIBJSON_CXXFLAGS)" - -define LIBJSON_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBJSON_SOURCE) - mv $(@D)/libjson/* $(@D) - $(RM) -r $(@D)/libjson - $(SED) '/ldconfig/d' $(@D)/makefile -endef - -define LIBJSON_BUILD_CMDS - mkdir -p $(@D)/Objects_$(if $(BR2_STATIC_LIBS),static,shared) \ - $(@D)/_internal/Source/Dependencies - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(LIBJSON_MAKE_OPTS) -C $(@D) -endef - -define LIBJSON_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(LIBJSON_MAKE_OPTS) prefix=$(TARGET_DIR)/usr install -C $(@D) -endef - -define LIBJSON_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(LIBJSON_MAKE_OPTS) prefix=$(STAGING_DIR)/usr install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/libksba/Config.in b/package.bak/libksba/Config.in deleted file mode 100644 index 1f25d6dbe2..0000000000 --- a/package.bak/libksba/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBKSBA - bool "libksba" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - select BR2_PACKAGE_LIBGPG_ERROR - help - CMS and X.509 library - - https://www.gnupg.org/related_software/libksba/ diff --git a/package.bak/libksba/libksba.hash b/package.bak/libksba/libksba.hash deleted file mode 100644 index f0a38f3de3..0000000000 --- a/package.bak/libksba/libksba.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340 libksba-1.3.5.tar.bz2 diff --git a/package.bak/libksba/libksba.mk b/package.bak/libksba/libksba.mk deleted file mode 100644 index e29b6ae1dd..0000000000 --- a/package.bak/libksba/libksba.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libksba -# -################################################################################ - -LIBKSBA_VERSION = 1.3.5 -LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2 -LIBKSBA_SITE = ftp://ftp.gnupg.org/gcrypt/libksba -LIBKSBA_LICENSE = LGPLv3+ or GPLv2+ (library, headers), GPLv3+ (manual, tests, build system) -LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3 -LIBKSBA_INSTALL_STAGING = YES -LIBKSBA_DEPENDENCIES = libgpg-error -LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr - -$(eval $(autotools-package)) diff --git a/package.bak/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch b/package.bak/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch deleted file mode 100644 index 4097cfedd9..0000000000 --- a/package.bak/libldns/0001-bugfix-548-Double-free-for-answers-4096.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 128aeb54593d4dd8ff2403eb2dd7d6cd596717d2 Mon Sep 17 00:00:00 2001 -From: Willem Toorop -Date: Tue, 28 Jan 2014 11:06:38 +0100 -Subject: [PATCH] bugfix #548: Double free for answers > 4096 - -in ldns_resolver_send_pkt. Thank you sunthought@gmail.com - -[Backport from upstream commit 2853eb352b4461e98f2926ace4ea3810cedf4167] -Signed-off-by: Bernd Kuhls ---- - resolver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/resolver.c b/resolver.c -index 16efc90..1474dc8 100644 ---- a/resolver.c -+++ b/resolver.c -@@ -1117,6 +1117,7 @@ ldns_resolver_send_pkt(ldns_pkt **answer, ldns_resolver *r, - ldns_pkt_set_edns_udp_size(query_pkt - , 4096); - ldns_pkt_free(answer_pkt); -+ answer_pkt = NULL; - /* Nameservers should not become - * unreachable because fragments are - * dropped (network error). We might --- -2.6.4 - diff --git a/package.bak/libldns/0002-whitespace-bug-in-ldns-read-zone.patch b/package.bak/libldns/0002-whitespace-bug-in-ldns-read-zone.patch deleted file mode 100644 index ec87b18e09..0000000000 --- a/package.bak/libldns/0002-whitespace-bug-in-ldns-read-zone.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 055ea6aef77058f651b5571d98d2d9458821a977 Mon Sep 17 00:00:00 2001 -From: Matthijs Mekking -Date: Wed, 18 Jun 2014 09:55:17 +0200 -Subject: [PATCH] whitespace bug in ldns-read-zone - -[Backport from upstream commit d6037a22fbedb8ef3a22de4107e4eaa36840865b] -Signed-off-by: Bernd Kuhls ---- - rr.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/rr.c b/rr.c -index cfee170..e530702 100644 ---- a/rr.c -+++ b/rr.c -@@ -670,6 +670,18 @@ ldns_rr_new_question_frm_str(ldns_rr **newrr, const char *str, - true); - } - -+static int -+ldns_rr_is_whitespace_line(char* line, int line_len) -+{ -+ int i; -+ for (i = 0; i < line_len; i++) { -+ if (!isspace((int)line[i])) { -+ return 0; -+ } -+ } -+ return 1; -+} -+ - ldns_status - ldns_rr_new_frm_fp(ldns_rr **newrr, FILE *fp, uint32_t *ttl, ldns_rdf **origin, ldns_rdf **prev) - { -@@ -745,6 +757,9 @@ ldns_rr_new_frm_fp_l(ldns_rr **newrr, FILE *fp, uint32_t *default_ttl, ldns_rdf - s = LDNS_STATUS_SYNTAX_TTL; - } else if (strncmp(line, "$INCLUDE", 8) == 0) { - s = LDNS_STATUS_SYNTAX_INCLUDE; -+ } else if (ldns_rr_is_whitespace_line(line, size)) { -+ LDNS_FREE(line); -+ return LDNS_STATUS_SYNTAX_EMPTY; - } else { - if (origin && *origin) { - s = ldns_rr_new_frm_str(&rr, (const char*) line, ttl, *origin, prev); --- -2.6.4 - diff --git a/package.bak/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch b/package.bak/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch deleted file mode 100644 index 223ebe98b3..0000000000 --- a/package.bak/libldns/0003-let-doxyparse-output-manpage-generation-issues.patch +++ /dev/null @@ -1,116 +0,0 @@ -From d8a3da12be085fbc92e3d4d4d084c328fc37485a Mon Sep 17 00:00:00 2001 -From: Willem Toorop -Date: Thu, 27 Nov 2014 16:21:54 +0100 -Subject: [PATCH] let doxyparse output manpage generation issues - -[Backport from upstream commit -168ee09a4bf184947798c3ee3ac99b6651470d64, fixes the build with Perl -5.22.] -Signed-off-by: Bernd Kuhls ---- - doc/doxyparse.pl | 45 ++++++++++++++++++++++++++++++++++++++------- - 1 file changed, 38 insertions(+), 7 deletions(-) - -diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl -index 96a1732..a09b2e8 100755 ---- a/doc/doxyparse.pl -+++ b/doc/doxyparse.pl -@@ -57,10 +57,15 @@ This manpage was automaticly generated from the ldns source code by - use of Doxygen and some perl. - "; - --getopts("m:",\%options); -+getopts("em:",\%options); - # if -m manpage file is given process that file - # parse the file which tells us what manpages go together - my $functions, $see_also; -+my $i = -1; -+my $report_errors = defined $options{'e'}; -+my $errors = 0; -+my %unique; -+ - if (defined $options{'m'}) { - # process - open(MAN, "<$options{'m'}") or die "Cannot open $options{'m'}"; -@@ -68,18 +73,35 @@ if (defined $options{'m'}) { - # func1, func2, .. | see_also1, see_also2, ... - while() { - chomp; -+ $i += 1; - if (/^#/) { next; } - if (/^$/) { next; } -- ($functions, $see_also) = split /[\t ]*\|[\t ]*/, $_; -- #print "{$functions}\n"; -- #print "{$see_also}\n"; -+ my @parts = split /[\t ]*\|[\t ]*/, $_; -+ $functions = shift @parts; -+ $see_also = join ', ', @parts; -+ print "{$functions}\n"; -+ print "{$see_also}\n"; - my @funcs = split /[\t ]*,[\t ]*/, $functions; - my @also = split /[\t ]*,[\t ]*/, $see_also; - $manpages{$funcs[0]} = \@funcs; - $see_also{$funcs[0]} = \@also; -+ foreach (@funcs) { -+ if ($unique{$_}) { -+ push $unique{$_}, ($i,); -+ } else { -+ $unique{$_} = [$i]; -+ } -+ } - #print "[", $funcs[0], "]\n"; - } - close(MAN); -+ while (($func, $lines) = each %unique ) { -+ if (scalar @$lines > 1) { -+ print STDERR "$func in function_manpages on lines: " -+ . join(", ",@$lines) . "\n" if $report_errors; -+ $errors += 1; -+ } -+ } - } else { - print "Need -m file to process the .h files\n"; - exit 1; -@@ -95,7 +117,7 @@ mkdir "doc/man"; - mkdir "doc/man/man$MAN_SECTION"; - - $state = 0; --my $i; -+$i = 0; - my @lines = ; - my $max = @lines; - -@@ -273,7 +295,7 @@ foreach (keys %manpages) { - - print MAN $MAN_MIDDLE; - -- if (defined(@$also)) { -+ if (@$also) { - print MAN "\n.SH SEE ALSO\n\\fI"; - print MAN join "\\fR, \\fI", @$also; - print MAN "\\fR.\nAnd "; -@@ -290,7 +312,7 @@ foreach (keys %manpages) { - # create symlinks - chdir("$BASE/man$MAN_SECTION"); - foreach (@$name) { -- print STDERR $_,"\n"; -+ print STDOUT $_,"\n"; - my $new_file = $_ . "." . $MAN_SECTION; - if ($new_file eq $symlink_file) { - next; -@@ -301,3 +323,12 @@ foreach (keys %manpages) { - chdir("../../.."); # and back, tricky and fragile... - close(MAN); - } -+foreach (keys %api) { -+ next if (/ / || /^$/); -+ if (not $unique{$_}) { -+ print STDERR "no man page for $_\n" if $report_errors; -+ $errors += 1; -+ } -+} -+ -+exit ($report_errors and $errors != 0); --- -2.6.4 - diff --git a/package.bak/libldns/0004-Comment-out-debugging-remnants.patch b/package.bak/libldns/0004-Comment-out-debugging-remnants.patch deleted file mode 100644 index 659253876b..0000000000 --- a/package.bak/libldns/0004-Comment-out-debugging-remnants.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 9720f6f7fdae210aa6d87d97324abd32e103dd16 Mon Sep 17 00:00:00 2001 -From: Willem Toorop -Date: Thu, 27 Nov 2014 16:50:33 +0100 -Subject: [PATCH] Comment out debugging remnants - -[Backport from upstream commit -a0a943d504debb05ce4d62ea81c2d218a6cc8727, needed for a following patch -fixing the build with Perl 5.10.] -Signed-off-by: Bernd Kuhls ---- - doc/doxyparse.pl | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl -index a09b2e8..3f7897f 100755 ---- a/doc/doxyparse.pl -+++ b/doc/doxyparse.pl -@@ -79,8 +79,8 @@ if (defined $options{'m'}) { - my @parts = split /[\t ]*\|[\t ]*/, $_; - $functions = shift @parts; - $see_also = join ', ', @parts; -- print "{$functions}\n"; -- print "{$see_also}\n"; -+ #print "{$functions}\n"; -+ #print "{$see_also}\n"; - my @funcs = split /[\t ]*,[\t ]*/, $functions; - my @also = split /[\t ]*,[\t ]*/, $see_also; - $manpages{$funcs[0]} = \@funcs; --- -2.6.4 - diff --git a/package.bak/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch b/package.bak/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch deleted file mode 100644 index c282634082..0000000000 --- a/package.bak/libldns/0005-Remove-manpage-content-nondeterminicity-warnings.patch +++ /dev/null @@ -1,429 +0,0 @@ -From adcef14bb9257ab38238eacabaa48cb7e8ef471f Mon Sep 17 00:00:00 2001 -From: Willem Toorop -Date: Wed, 14 Jan 2015 10:14:32 +0100 -Subject: [PATCH] Remove manpage content nondeterminicity & warnings - -TODO: Missing manpages - -[Backport upstream commit a56e48856d519d12f1ef600848f335615467f147, -which fixes the build with Perl 5.10.] -Signed-off-by: Bernd Kuhls ---- - doc/doxyparse.pl | 20 +++-- - doc/function_manpages | 244 ++++++++++++++++++++++++-------------------------- - 2 files changed, 133 insertions(+), 131 deletions(-) - -diff --git a/doc/doxyparse.pl b/doc/doxyparse.pl -index 3f7897f..b9f015d 100755 ---- a/doc/doxyparse.pl -+++ b/doc/doxyparse.pl -@@ -35,7 +35,7 @@ my %see_also; - - my $BASE="doc/man"; - my $MAN_SECTION = "3"; --my $MAN_HEADER = ".TH ldns $MAN_SECTION \"30 May 2006\"\n"; -+my $MAN_HEADER = ".ad l\n.TH ldns $MAN_SECTION \"30 May 2006\"\n"; - my $MAN_MIDDLE = ".SH AUTHOR - The ldns team at NLnet Labs. Which consists out of - Jelte Jansen and Miek Gieben. -@@ -60,8 +60,8 @@ use of Doxygen and some perl. - getopts("em:",\%options); - # if -m manpage file is given process that file - # parse the file which tells us what manpages go together --my $functions, $see_also; --my $i = -1; -+my $functions, $see_also, $shorts; -+my $i = 0; - my $report_errors = defined $options{'e'}; - my $errors = 0; - my %unique; -@@ -78,16 +78,22 @@ if (defined $options{'m'}) { - if (/^$/) { next; } - my @parts = split /[\t ]*\|[\t ]*/, $_; - $functions = shift @parts; -- $see_also = join ', ', @parts; -+ @parts = split /[\t ]*-[\t ]*/, join ', ', @parts; -+ $see_also = shift @parts; -+ if (! $see_also) { -+ @parts = split /[\t ]*-[\t ]*/, $_; -+ $functions = shift @parts; -+ } - #print "{$functions}\n"; - #print "{$see_also}\n"; - my @funcs = split /[\t ]*,[\t ]*/, $functions; - my @also = split /[\t ]*,[\t ]*/, $see_also; - $manpages{$funcs[0]} = \@funcs; - $see_also{$funcs[0]} = \@also; -+ $shorts{$funcs[0]} = join '', @parts; - foreach (@funcs) { - if ($unique{$_}) { -- push $unique{$_}, ($i,); -+ push @{$unique{$_}}, ($i,); - } else { - $unique{$_} = [$i]; - } -@@ -249,6 +255,7 @@ while($i < $max) { - foreach (keys %manpages) { - $name = $manpages{$_}; - $also = $see_also{$_}; -+ my $shrt = $shorts{$_}; - - $filename = @$name[0]; - $filename = "$BASE/man$MAN_SECTION/$filename.$MAN_SECTION"; -@@ -261,6 +268,9 @@ foreach (keys %manpages) { - print MAN $MAN_HEADER; - print MAN ".SH NAME\n"; - print MAN join ", ", @$name; -+ if ($shrt) { -+ print MAN " \\- $shrt"; -+ } - print MAN "\n\n"; - print MAN ".SH SYNOPSIS\n"; - -diff --git a/doc/function_manpages b/doc/function_manpages -index ce05899..db53ee5 100644 ---- a/doc/function_manpages -+++ b/doc/function_manpages -@@ -8,221 +8,213 @@ - - ### host2wire.h - # conversion functions --ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire | ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf -+ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire | ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf - conversion functions - # lower level conversions, some are from host2str.h --ldns_pkt2buffer_str, ldns_pktheader2buffer_str, ldns_rr2buffer_str, ldns_rr_list2buffer_str, ldns_rdf2buffer_str, ldns_key2buffer_str, ldns_pkt2buffer_wire, ldns_rr2buffer_wire, ldns_rdf2buffer_wire, ldns_rrsig2buffer_wire, ldns_rr_rdata2buffer_wire | ldns_pkt2str, ldns_rr2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str -+ldns_pkt2buffer_str, ldns_pktheader2buffer_str, ldns_rr2buffer_str, ldns_rr_list2buffer_str, ldns_rdf2buffer_str, ldns_key2buffer_str, ldns_pkt2buffer_wire, ldns_rr2buffer_wire, ldns_rdf2buffer_wire, ldns_rrsig2buffer_wire, ldns_rr_rdata2buffer_wire | ldns_pkt2str, ldns_rr2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str - lower level conversions - ### /host2wire.h - - ### host2str.h --ldns_rr2str, ldns_pkt2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str | ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print --ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print | ldns_rr2str, ldns_rdf2str, ldns_pkt2str, ldns_rr_list2str, ldns_key2str -+ldns_rr2str, ldns_pkt2str, ldns_rdf2str, ldns_rr_list2str, ldns_key2str | ldns_rr_print, ldns_rdf_print, ldns_pkt_print, ldns_rr_list_print, ldns_resolver_print, ldns_zone_print - functions for conversions to string - ### /host2str.h - - ### host2str.h - # and even lower --ldns_rdf2buffer_str_a, ldns_rdf2buffer_str_aaaa, ldns_rdf2buffer_str_str, ldns_rdf2buffer_str_b64, ldns_rdf2buffer_str_hex, ldns_rdf2buffer_str_type, ldns_rdf2buffer_str_class, ldns_rdf2buffer_str_alg, ldns_rdf2buffer_str_loc, ldns_rdf2buffer_str_unknown, ldns_rdf2buffer_str_nsap, ldns_rdf2buffer_str_wks, ldns_rdf2buffer_str_nsec, ldns_rdf2buffer_str_period, ldns_rdf2buffer_str_tsigtime, ldns_rdf2buffer_str_apl, ldns_rdf2buffer_str_int16_data, ldns_rdf2buffer_str_int16, ldns_rdf2buffer_str_ipseckey -+ldns_rdf2buffer_str_a, ldns_rdf2buffer_str_aaaa, ldns_rdf2buffer_str_str, ldns_rdf2buffer_str_b64, ldns_rdf2buffer_str_hex, ldns_rdf2buffer_str_type, ldns_rdf2buffer_str_class, ldns_rdf2buffer_str_alg, ldns_rdf2buffer_str_loc, ldns_rdf2buffer_str_unknown, ldns_rdf2buffer_str_nsap, ldns_rdf2buffer_str_wks, ldns_rdf2buffer_str_nsec, ldns_rdf2buffer_str_period, ldns_rdf2buffer_str_tsigtime, ldns_rdf2buffer_str_apl, ldns_rdf2buffer_str_int16_data, ldns_rdf2buffer_str_int16, ldns_rdf2buffer_str_ipseckey - lower level to string conversion functions - ### /host2str.h - - ### wire2host.h - # wirefunctions --ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf, ldns_wire2dname | ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire, ldns_dname2wire --ldns_buffer2pkt_wire -+ldns_wire2rr, ldns_wire2pkt, ldns_wire2rdf, ldns_wire2dname | ldns_rr2wire, ldns_pkt2wire, ldns_rdf2wire, ldns_dname2wire - convert from wire format to host type -+ldns_buffer2pkt_wire - convert buffer/wire format to ldns_pkt - ### /wire2host.h - - ### dname.h --ldns_dname_left_chop, ldns_dname_label_count | ldns_dname --ldns_dname2canonical | ldns_dname --ldns_dname_cat_clone, ldns_dname_cat | ldns_dname --ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data | ldns_dname, ldns_pkt_query_new_frm_str, ldns_rdf_new_frm_str, ldns_rr_new_frm_str --ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label | ldns_dname --ldns_dname_compare, ldns_dname_interval | ldns_dname_is_subdomain | ldns_dname --ldns_dname | ldns_dname_left_chop, ldns_dname_label_count, ldns_dname2canonical, ldns_dname_cat, ldns_dname_cat_clone, ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data, ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label, ldns_dname_compare, ldns_dname_interval -+ldns_dname_left_chop, ldns_dname_label_count - dname label functions -+ldns_dname2canonical - canonicalize dname -+ldns_dname_cat_clone, ldns_dname_cat - concatenate two dnames -+ldns_dname_new, ldns_dname_new_frm_str, ldns_dname_new_frm_data | ldns_pkt_query_new_frm_str, ldns_rdf_new_frm_str, ldns_rr_new_frm_str - create a dname -+ldns_dname_is_subdomain, ldns_dname_str_absolute, ldns_dname_label - check properties of dnames -+ldns_dname_compare, ldns_dname_interval | ldns_dname_is_subdomain - compare two dnames - ### /dname.h - - ### dane.h --ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr | ldns_dane_verify, ldns_dane_verify_rr --ldns_dane_verify, ldns_dane_verify_rr | ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr -+ldns_dane_create_tlsa_rr, ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate | ldns_dane_verify, ldns_dane_verify_rr - TLSA RR creation functions -+ldns_dane_verify, ldns_dane_verify_rr | ldns_dane_create_tlsa_owner, ldns_dane_cert2rdf, ldns_dane_select_certificate, ldns_dane_create_tlsa_rr - TLSA RR verification functions - ### /dane.h - - ### rdata.h --ldns_rdf, ldns_rdf_type | ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data, ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare, ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t --ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data | ldns_rdf --ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare | ldns_rdf --ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print | ldns_rdf --ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t | ldns_rdf --ldns_rdf_address_reverse | ldns_rdf --ldns_octet | ldns_rdf -+ldns_rdf, ldns_rdf_type | ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data, ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare, ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t, ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t - rdata field type -+ldns_rdf_set_size, ldns_rdf_set_type, ldns_rdf_set_data | ldns_rdf - set rdf attributes -+ldns_rdf_size, ldns_rdf_get_type, ldns_rdf_data, ldns_rdf_compare | ldns_rdf - get rdf attributes -+ldns_rdf_new, ldns_rdf_clone, ldns_rdf_new_frm_data, ldns_rdf_new_frm_str, ldns_rdf_new_frm_fp, ldns_rdf_free, ldns_rdf_deep_free, ldns_rdf_print | ldns_rdf - ldns_rdf creation, destruction and printing -+ldns_native2rdf_int8, ldns_native2rdf_int16, ldns_native2rdf_int32, ldns_native2rdf_int16_data, ldns_rdf2native_int8, ldns_rdf2native_int16, ldns_rdf2native_int32, ldns_rdf2native_sockaddr_storage, ldns_rdf2native_time_t | ldns_rdf - rdf numeric converion functions -+ldns_rdf_address_reverse | ldns_rdf - reverse an address rdf -+ldns_octet | ldns_rdf - removes escaped from the input - # why is this in rdata.h? --ldns_str2period -+ldns_str2period - converts a ttl value (like 5d2h) to a long - ### /rdata.h - - ### higher.h --ldns_get_rr_list_addr_by_name, ldns_get_rr_list_name_by_addr | ldns_rr_list, ldns_rr --ldns_get_rr_list_hosts_frm_fp, ldns_get_rr_list_hosts_frm_file | ldns_rr_list, ldns_rr, ldns_get_rr_list_hosts_frm_fp_l --ldns_get_rr_list_hosts_frm_fp_l | ldns_rr_list --ldns_getaddrinfo -+ldns_get_rr_list_addr_by_name, ldns_get_rr_list_name_by_addr | ldns_rr_list, ldns_rr - get addresses by name or names by address -+ldns_get_rr_list_hosts_frm_file, ldns_get_rr_list_hosts_frm_fp, ldns_get_rr_list_hosts_frm_fp_l | ldns_rr_list, ldns_rr - parse /etc/hosts file -+ldns_getaddrinfo - mimic libc getaddrinfo - ### /higher.h - - # - ### dnssec.h - # --ldns_calc_keytag, ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_key_rr2ds, ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig -- - # algs --ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5 | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig -+ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5 | ldns_key, ldns_sign_public, ldns_zone_sign, ldns_verify, ldns_verify_rrsig - verify signature data buffers - - # tsig --ldns_pkt_tsig_verify, ldns_pkt_tsig_sign | ldns_key -+ldns_pkt_tsig_verify, ldns_pkt_tsig_sign | ldns_key - tsig signing and verification - - # verify --ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_keylist, ldns_verify_rrsig_keylist_notime, ldns_verify_notime | ldns_verify_rrsig_evp | ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_sign_public, ldns_zone_sign, ldns_key -+ldns_verify, ldns_verify_rrsig, ldns_verify_rrsig_keylist, ldns_verify_rrsig_keylist_notime, ldns_verify_notime | ldns_verify_rrsig_evp | ldns_verify_rrsig_dsa, ldns_verify_rrsig_rsasha1, ldns_verify_rrsig_rsamd5, ldns_sign_public, ldns_zone_sign, ldns_key - verify rrsigs - - # convert --ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key_rr2ds --ldns_key_rr2ds | ldns_key --ldns_create_nsec | ldns_sign_public -+ldns_key_buf2dsa, ldns_key_buf2rsa | ldns_key_rr2ds - convert buffer to openssl key -+ldns_key_rr2ds | ldns_key - create DS rr from DNSKEY rr -+ldns_create_nsec | ldns_sign_public - Create a NSEC record - - # signing --ldns_sign_public | ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1, ldns_verify, ldns_verify_rrsig, ldns_key --ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1 | ldns_sign_public --ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3 | ldns_zone_sign, ldns_zone_sign_nsec3 | ldns_sign_public, ldns_key, ldns_init_random --ldns_init_random | ldns_sign_public, ldns_key --ldns_pkt_verify | ldns_verify, ldns_sign_public, ldns_zone_sign -+ldns_sign_public | ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1, ldns_verify, ldns_verify_rrsig, ldns_key - sign an rrset -+ldns_sign_public_dsa, ldns_sign_public_rsamd5, ldns_sign_public_rsasha1 | ldns_sign_public - sign buffer -+ldns_init_random | ldns_sign_public, ldns_key - seed the random function -+ldns_pkt_verify | ldns_verify, ldns_sign_public, ldns_zone_sign - verify a packet -+ldns_zone_sign, ldns_zone_sign_nsec3 - dnssec sign a zone - - # new family of dnssec functions --ldns_dnssec_zone, ldns_dnssec_name, ldns_dnssec_rrs, ldns_dnssec_rrsets | ldns_dnssec_zone_new, ldns_dnssec_name_new, ldns_dnssec_rrs_new, ldns_dnssec_rrsets_new --ldns_dnssec_zone_find_rrset, ldns_dnssec_zone_new, ldns_dnssec_zone_free, ldns_dnssec_zone_add_rr, ldns_dnssec_zone_names_print, ldns_dnssec_zone_print, ldns_dnssec_zone_add_empty_nonterminals | ldns_dnssec_zone --ldns_dnssec_name_new, ldns_dnssec_name_new_frm_rr, ldns_dnssec_name_free, ldns_dnssec_name_name, ldns_dnssec_name_set_name, ldns_dnssec_name_set_nsec, ldns_dnssec_name_cmp, ldns_dnssec_name_add_rr, ldns_dnssec_name_find_rrset, ldns_dnssec_name_print | ldns_dnssec_zone --ldns_dnssec_rrsets_new, ldns_dnssec_rrsets_free, ldns_dnssec_rrsets_type, ldns_dnssec_rrsets_set_type, ldns_dnssec_rrsets_add_rr, ldns_dnssec_rrsets_print | ldns_dnssec_zone --ldns_dnssec_rrs_new, ldns_dnssec_rrs_free, ldns_dnssec_rrs_add_rr, ldns_dnssec_rrs_print | ldns_dnssec_zone -+ldns_dnssec_zone, ldns_dnssec_name, ldns_dnssec_rrs, ldns_dnssec_rrsets | ldns_dnssec_zone_new, ldns_dnssec_name_new, ldns_dnssec_rrs_new, ldns_dnssec_rrsets_new - data structures -+ldns_dnssec_zone_find_rrset, ldns_dnssec_zone_new, ldns_dnssec_zone_free, ldns_dnssec_zone_add_rr, ldns_dnssec_zone_names_print, ldns_dnssec_zone_print, ldns_dnssec_zone_add_empty_nonterminals | ldns_dnssec_zone - functions for ldns_dnssec_zone -+ldns_dnssec_name_new, ldns_dnssec_name_new_frm_rr, ldns_dnssec_name_free, ldns_dnssec_name_name, ldns_dnssec_name_set_name, ldns_dnssec_name_set_nsec, ldns_dnssec_name_cmp, ldns_dnssec_name_add_rr, ldns_dnssec_name_find_rrset, ldns_dnssec_name_print | ldns_dnssec_zone - functions for ldns_dnssec_name -+ldns_dnssec_rrsets_new, ldns_dnssec_rrsets_free, ldns_dnssec_rrsets_type, ldns_dnssec_rrsets_set_type, ldns_dnssec_rrsets_add_rr, ldns_dnssec_rrsets_print | ldns_dnssec_zone - functions for ldns_dnssec_rrsets -+ldns_dnssec_rrs_new, ldns_dnssec_rrs_free, ldns_dnssec_rrs_add_rr, ldns_dnssec_rrs_print | ldns_dnssec_zone - functions for ldns_dnssec-rrs - - # verification --ldns_dnssec_data_chain, ldns_dnssec_data_chain_struct, ldns_dnssec_trust_tree | ldns_dnssec_data_chain_new, ldns_dnssec_trust_tree_new, ldns_dnssec_verify_denial --ldns_dnssec_data_chain_new, ldns_dnssec_data_chain_free, ldns_dnssec_data_chain_deep_free, ldns_dnssec_build_data_chain, ldns_dnssec_data_chain_print | ldns_dnssec_data_chain --ldns_dnssec_trust_tree_new, ldns_dnssec_trust_tree_free, ldns_dnssec_trust_tree_depth, ldns_dnssec_derive_trust_tree, ldns_dnssec_trust_tree_contains_keys, ldns_dnssec_trust_tree_print, ldns_dnssec_trust_tree_print_sm, ldns_dnssec_trust_tree_add_parent, ldns_dnssec_derive_trust_tree_normal_rrset, ldns_dnssec_derive_trust_tree_dnskey_rrset, ldns_dnssec_derive_trust_tree_ds_rrset, ldns_dnssec_derive_trust_tree_no_sig | ldns_dnssec_data_chain, ldns_dnssec_trust_tree --ldns_dnssec_verify_denial, ldns_dnssec_verify_denial_nsec3 | ldns_dnssec_trust_tree, ldns_dnssec_data_chain -+ldns_dnssec_data_chain, ldns_dnssec_data_chain_struct, ldns_dnssec_trust_tree | ldns_dnssec_data_chain_new, ldns_dnssec_trust_tree_new, ldns_dnssec_verify_denial - data structures for validation chains -+ldns_dnssec_data_chain_new, ldns_dnssec_data_chain_free, ldns_dnssec_data_chain_deep_free, ldns_dnssec_build_data_chain, ldns_dnssec_data_chain_print | ldns_dnssec_data_chain - ldns_chain creation, destruction and printing -+ldns_dnssec_trust_tree_new, ldns_dnssec_trust_tree_free, ldns_dnssec_trust_tree_depth, ldns_dnssec_derive_trust_tree, ldns_dnssec_trust_tree_contains_keys, ldns_dnssec_trust_tree_print, ldns_dnssec_trust_tree_print_sm, ldns_dnssec_trust_tree_add_parent, ldns_dnssec_derive_trust_tree_normal_rrset, ldns_dnssec_derive_trust_tree_dnskey_rrset, ldns_dnssec_derive_trust_tree_ds_rrset, ldns_dnssec_derive_trust_tree_no_sig | ldns_dnssec_data_chain, ldns_dnssec_trust_tree - functions for ldns_dnssec_trust_tree -+ldns_dnssec_verify_denial, ldns_dnssec_verify_denial_nsec3 | ldns_dnssec_trust_tree, ldns_dnssec_data_chain - verify denial of existence - - # new signing functions --ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3, ldns_dnssec_zone_mark_glue, ldns_dnssec_name_node_next_nonglue, ldns_dnssec_zone_create_nsecs, ldns_dnssec_remove_signatures, ldns_dnssec_zone_create_rrsigs | ldns_dnssec_zone -+ldns_dnssec_zone_sign, ldns_dnssec_zone_sign_nsec3, ldns_dnssec_zone_mark_glue, ldns_dnssec_name_node_next_nonglue, ldns_dnssec_zone_create_nsecs, ldns_dnssec_remove_signatures, ldns_dnssec_zone_create_rrsigs | ldns_dnssec_zone - sign ldns_dnssec_zone - - ### /dnssec.h - - ### dnskey.h --ldns_key_new | ldns_key, ldns_key_list_new --ldns_key_new_frm_algorithm, ldns_key_new_frm_fp, ldns_key_new_frm_fp_l | ldns_key --ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l | ldns_key_new_frm_fp, ldns_key --ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l | ldns_key_new_frm_fp, ldns_key --ldns_key_list_new | ldns_key_new, ldns_key -+ldns_key_new, ldns_key_new_frm_algorithm, ldns_key_new_frm_fp, ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l | ldns_key - create a ldns_key -+ldns_key_list_new - create a ldns_key_list - # access, write --ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_algo_supported | ldns_key_push_key, ldns_key --ldns_key_list_push_key | ldns_key_list_pop_key, ldns_key --ldns_key_list_pop_key | ldns_key_list_push_key, ldns_key -+ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_algo_supported | ldns_key_push_key, ldns_key - set ldns_key attributes -+ldns_key_list_push_key, ldns_key_list_pop_key | ldns_key - manipulate ldns_key_list - # access, read --ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key -+ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key - read ldns_keys - # convert --ldns_key2rr | ldns_key --ldns_key_free, ldns_key_deep_free, ldns_key_list_free | ldns_key -+ldns_key2rr | ldns_key - convert ldns_key to rr -+ldns_key_free, ldns_key_deep_free, ldns_key_list_free | ldns_key - free a ldns_key - # --ldns_key_print | ldns_key_new, ldns_key --ldns_key | ldns_key_new, ldns_key_new_frm_algorithm,ldns_key_new_frm_fp,ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l, ldns_key_list_new, ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags, ldns_key2rr, ldns_key_free, ldns_key_deep_free, ldns_key_list_free, ldns_key_print -+ldns_key_print | ldns_key_new, ldns_key - print a ldns_key -+ldns_calc_keytag, ldns_calc_keytag_raw | ldns_key - calculate ldns keytag -+ldns_key | ldns_key_new, ldns_key_new_frm_algorithm,ldns_key_new_frm_fp,ldns_key_new_frm_fp_l, ldns_key_new_frm_fp_rsa, ldns_key_new_frm_fp_rsa_l, ldns_key_new_frm_fp_dsa, ldns_key_new_frm_fp_dsa_l, ldns_key_list_new, ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key, ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key, ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags, ldns_key2rr, ldns_key_free, ldns_key_deep_free, ldns_key_list_free, ldns_key_print - ldns_key data structure - ### /dnskey.h - - ### MIEK TOT HIER TOT HIER - --# lists --ldns_key_list_new, ldns_key_list_push_key, ldns_key_list_pop_key, ldns_key_list_key_count, ldns_key_list_key | ldns_key_list, ldns_key --ldns_key_rsa_key, ldns_key_dsa_key, ldns_key_algorithm, ldns_key_hmac_key | ldns_key_list, ldns_key -- --# gets/sets --ldns_key_origttl, ldns_key_inception, ldns_key_expiration, ldns_key_keytag, ldns_key_pubkey_owner, ldns_key_flags | ldns_key --ldns_key_set_algorithm, ldns_key_set_rsa_key, ldns_key_set_dsa_key, ldns_key_set_hmac_key, ldns_key_set_origttl, ldns_key_set_inception, ldns_key_set_expiration, ldns_key_set_pubkey_owner, ldns_key_set_keytag, ldns_key_set_flags, ldns_key_list_set_key_count | ldns_key -- - # errr.h --ldns_get_errorstr_by_id | ldns_status --ldns_status | ldns_get_errorstr_by_id -+ldns_get_errorstr_by_id, ldns_status - errors - - ### net.h --ldns_send | ldns_pkt, ldns_resolver --ldns_tcp_send_query, ldns_tcp_read_wire, ldns_tcp_connect | ldns_send, ldns_pkt, ldns_resolver -+ldns_send | ldns_pkt, ldns_resolver - send a packet -+ldns_tcp_send_query, ldns_tcp_read_wire, ldns_tcp_connect | ldns_send, ldns_pkt, ldns_resolver - tcp queries - ### /net.h - - ### buffer.h - # general --ldns_buffer | ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_export, ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip, ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current, ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok, ldns_buffer_write_at, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32 --ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_export | ldns_buffer -+ldns_buffer, ldns_buffer_new, ldns_buffer_new_frm_data, ldns_buffer_clear, ldns_buffer_printf, ldns_buffer_free, ldns_buffer_copy, ldns_buffer_export, ldns_buffer_export2str, ldns_buffer2str | ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip, ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current, ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32, ldns_buffer_write_u32, ldns_buffer_write_u32_at - buffers - # position --ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip | ldns_buffer -+ldns_buffer_flip, ldns_buffer_rewind, ldns_buffer_position, ldns_buffer_set_position, ldns_buffer_skip | ldns_buffer - buffer positioning - # values and pointers --ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current | ldns_buffer -+ldns_buffer_limit, ldns_buffer_set_limit, ldns_buffer_capacity, ldns_buffer_set_capacity, ldns_buffer_reserve, ldns_buffer_at, ldns_buffer_begin, ldns_buffer_end, ldns_buffer_current | ldns_buffer - buffer limits and pointers - # info --ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok | ldns_buffer -+ldns_buffer_remaining_at, ldns_buffer_remaining, ldns_buffer_available_at, ldns_buffer_available, ldns_buffer_status, ldns_buffer_status_ok | ldns_buffer - check buffer status - # read and write --ldns_buffer_write_at, ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32 | ldns_buffer -+ldns_buffer_write_at, ldns_buffer_write, ldns_buffer_write_string_at, ldns_buffer_write_string, ldns_buffer_write_u8_at, ldns_buffer_write_u8, ldns_buffer_write_u16_at, ldns_buffer_write_u16, ldns_buffer_read_at, ldns_buffer_read, ldns_buffer_read_u8_at, ldns_buffer_read_u8, ldns_buffer_read_u16_at, ldns_buffer_read_u16, ldns_buffer_read_u32_at, ldns_buffer_read_u32, ldns_buffer_write_u32, ldns_buffer_write_u32_at | ldns_buffer - reading and writing buffers - ### /buffer.h - - # parse.h --ldns_bget_token, ldns_bgetc, ldns_bskipcs | ldns_buffer --ldns_fget_token, ldns_fskipcs | ldns_buffer --ldns_str_remove_comment -- -+ldns_bget_token, ldns_bgetc, ldns_bskipcs | ldns_buffer - get tokens from buffers -+ldns_fget_token, ldns_fskipcs | ldns_buffer - get tokens from files - - # rr.h and other general rr funcs --ldns_rr, ldns_rr_class, ldns_rr_type, ldns_rr_compress, ldns_rr_list | ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print, ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf, ldns_rr_push_rdf, ldns_rr_pop_rdf, ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class, ldns_rr_list_rr_count, ldns_rr_list_set_rr_count, ldns_rr_list_new, ldns_rr_list_free, ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr, ldns_is_rrset, ldns_rr_set_push_rr, ldns_rr_set_pop_rr, ldns_get_rr_class_by_name, ldns_get_rr_type_by_name, ldns_rr_list_clone, ldns_rr_list_sort, ldns_rr_compare, ldns_rr_compare_ds, ldns_rr_uncompressed_size, ldns_rr2canonical, ldns_rr_label_count, ldns_is_rrset, ldns_rr_descriptor, ldns_rr_descript --ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print | ldns_rr, ldns_rr_list --ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf | ldns_rr, ldns_rr_list --ldns_rr_push_rdf, ldns_rr_pop_rdf | ldns_rr, ldns_rr_list --ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class | ldns_rr, ldns_rr_list --ldns_rr_list_rr_count, ldns_rr_list_set_rr_count | ldns_rr, ldns_rr_list --ldns_rr_list_new, ldns_rr_list_free | ldns_rr, ldns_rr_list --ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr | ldns_rr, ldns_rr_list --ldns_is_rrset | ldns_rr, ldns_rr_list --ldns_rr_set_push_rr, ldns_rr_set_pop_rr | ldns_rr, ldns_rr_list --ldns_get_rr_class_by_name, ldns_get_rr_type_by_name | ldns_rr, ldns_rr_list --ldns_rr_list_clone | ldns_rr, ldns_rr_list --ldns_rr_list_sort | ldns_rr, ldns_rr_list --ldns_rr_compare, ldns_rr_compare_ds | ldns_rr, ldns_rr_list --ldns_rr_uncompressed_size | ldns_rr, ldns_rr_list --ldns_rr2canonical | ldns_rr, ldns_rr_list --ldns_rr_label_count | ldns_rr, ldns_rr_list --ldns_is_rrset | ldns_rr -+ldns_rr, ldns_rr_class, ldns_rr_type, ldns_rr_compress, ldns_rr_list | ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print, ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf, ldns_rr_push_rdf, ldns_rr_pop_rdf, ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class, ldns_rr_list_rr_count, ldns_rr_list_set_rr_count, ldns_rr_list_new, ldns_rr_list_free, ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr, ldns_is_rrset, ldns_rr_set_push_rr, ldns_rr_set_pop_rr, ldns_get_rr_class_by_name, ldns_get_rr_type_by_name, ldns_rr_list_clone, ldns_rr_list_sort, ldns_rr_compare, ldns_rr_compare_ds, ldns_rr_uncompressed_size, ldns_rr2canonical, ldns_rr_label_count, ldns_is_rrset, ldns_rr_descriptor, ldns_rr_descript - types representing dns resource records -+ldns_rr_new, ldns_rr_new_frm_type, ldns_rr_new_frm_str, ldns_rr_new_frm_fp, ldns_rr_free, ldns_rr_print | ldns_rr, ldns_rr_list - ldns_rr creation, destruction and printing -+ldns_rr_set_owner, ldns_rr_set_ttl, ldns_rr_set_type, ldns_rr_set_rd_count, ldns_rr_set_class, ldns_rr_set_rdf | ldns_rr, ldns_rr_list - set ldns_rr attributes -+ldns_rr_push_rdf, ldns_rr_pop_rdf | ldns_rr, ldns_rr_list - push and pop rdata fields -+ldns_rr_rdf, ldns_rr_owner, ldns_rr_rd_count, ldns_rr_ttl, ldns_rr_get_class | ldns_rr, ldns_rr_list - access rdata fields on ldns_rr -+ldns_rr_list_rr_count, ldns_rr_list_set_rr_count | ldns_rr, ldns_rr_list - get and set ldns_rr_list length -+ldns_rr_list_new, ldns_rr_list_free | ldns_rr, ldns_rr_list - ldns_rr_list creation and destruction -+ldns_rr_list_cat, ldns_rr_list_push_rr, ldns_rr_list_pop_rr | ldns_rr, ldns_rr_list - ldns_rr_list manipulation -+ldns_is_rrset | ldns_rr, ldns_rr_list - is rr_list a rrset -+ldns_rr_set_push_rr, ldns_rr_set_pop_rr | ldns_rr, ldns_rr_list - push and pop rr on a rrset -+ldns_get_rr_class_by_name, ldns_get_rr_type_by_name | ldns_rr, ldns_rr_list - lookup class or type by name -+ldns_rr_list_clone | ldns_rr, ldns_rr_list - clone a ldns_rr_list -+ldns_rr_list_sort | ldns_rr, ldns_rr_list - sort a ldns_rr_list -+ldns_rr_compare, ldns_rr_compare_ds | ldns_rr, ldns_rr_list - compare a ldns_rr -+ldns_rr_uncompressed_size | ldns_rr, ldns_rr_list - calculates the uncompressed size of an RR -+ldns_rr2canonical | ldns_rr, ldns_rr_list - canonicalize a RR -+ldns_rr_label_count | ldns_rr, ldns_rr_list - return ownername label count - - # rr descriptors --ldns_rr_descriptor, ldns_rr_descript, ldns_rr_descriptor_minimum, ldns_rr_descriptor_maximum, ldns_rr_descriptor_field_type | ldns_rr, ldns_rdf -+ldns_rr_descriptor, ldns_rr_descript, ldns_rr_descriptor_minimum, ldns_rr_descriptor_maximum, ldns_rr_descriptor_field_type | ldns_rr, ldns_rdf - rdata field descriptors - - # packet.h --ldns_pkt, ldns_pkt_section, ldns_pkt_type | ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type, ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type, ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig, ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data -+ldns_pkt, ldns_pkt_section, ldns_pkt_type | ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type, ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type, ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig, ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data - request or anser packets types - --ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type | ldns_pkt -+ldns_pkt_new, ldns_pkt_free, ldns_pkt_print, ldns_pkt_query_new, ldns_pkt_query_new_frm_str, ldns_pkt_reply_type | ldns_pkt - ldns_pkt creation, destruction and printing - # gets --ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type | ldns_pkt -+ldns_pkt_id, ldns_pkt_qr, ldns_pkt_aa, ldns_pkt_tc, ldns_pkt_rd, ldns_pkt_cd, ldns_pkt_ra, ldns_pkt_ad, ldns_pkt_get_opcode, ldns_pkt_get_rcode, ldns_pkt_qdcount, ldns_pkt_ancount, ldns_pkt_nscount, ldns_pkt_arcount, ldns_pkt_answerfrom, ldns_pkt_querytime, ldns_pkt_size, ldns_pkt_tsig, ldns_pkt_question, ldns_pkt_answer, ldns_pkt_authority, ldns_pkt_additional, ldns_pkt_get_section_clone, ldns_pkt_rr_list_by_name, ldns_pkt_rr_list_by_type, ldns_pkt_rr_list_by_name_and_type | ldns_pkt - get ldns_pkt attributes - # sets --ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig | ldns_pkt -+ldns_pkt_set_flags, ldns_pkt_set_id, ldns_pkt_set_qr, ldns_pkt_set_aa, ldns_pkt_set_tc, ldns_pkt_set_rd, ldns_pkt_set_cd, ldns_pkt_set_ra, ldns_pkt_set_ad, ldns_pkt_set_opcode, ldns_pkt_set_rcode, ldns_pkt_set_qdcount, ldns_pkt_set_ancount, ldns_pkt_set_nscount, ldns_pkt_set_arcount, ldns_pkt_set_answerfrom, ldns_pkt_set_querytime, ldns_pkt_set_size, ldns_pkt_set_section_count, ldns_pkt_set_tsig | ldns_pkt - set ldns_pkt attributes - # EDNS0 --ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data | ldns_pkt -+ldns_pkt_edns, ldns_pkt_edns_udp_size, ldns_pkt_edns_extended_rcode, ldns_pkt_edns_version, ldns_pkt_edns_z, ldns_pkt_edns_data, ldns_pkt_set_edns_udp_size, ldns_pkt_set_edns_extended_rcode, ldns_pkt_set_edns_version, ldns_pkt_set_edns_z, ldns_pkt_set_edns_data | ldns_pkt - ldns_pkt ends0 related functions - - # rr_functions.h --ldns_rr_ns_nsdname -+ldns_rr_ns_nsdname - get dname rdata field from NS RR - # --ldns_rr_mx_preference, ldns_rr_mx_exchange -+ldns_rr_mx_preference, ldns_rr_mx_exchange - get MX RR rdata fields - # --ldns_rr_rrsig_typecovered, ldns_rr_rrsig_set_typecovered, ldns_rr_rrsig_algorithm, ldns_rr_rrsig_set_algorithm, ldns_rr_rrsig_labels, ldns_rr_rrsig_set_labels, ldns_rr_rrsig_origttl, ldns_rr_rrsig_set_origttl, ldns_rr_rrsig_expiration, ldns_rr_rrsig_set_expiration, ldns_rr_rrsig_inception, ldns_rr_rrsig_set_inception, ldns_rr_rrsig_keytag, ldns_rr_rrsig_set_keytag, ldns_rr_rrsig_signame, ldns_rr_rrsig_set_signame, ldns_rr_rrsig_sig, ldns_rr_rrsig_set_sig -+ldns_rr_rrsig_typecovered, ldns_rr_rrsig_set_typecovered, ldns_rr_rrsig_algorithm, ldns_rr_rrsig_set_algorithm, ldns_rr_rrsig_labels, ldns_rr_rrsig_set_labels, ldns_rr_rrsig_origttl, ldns_rr_rrsig_set_origttl, ldns_rr_rrsig_expiration, ldns_rr_rrsig_set_expiration, ldns_rr_rrsig_inception, ldns_rr_rrsig_set_inception, ldns_rr_rrsig_keytag, ldns_rr_rrsig_set_keytag, ldns_rr_rrsig_signame, ldns_rr_rrsig_set_signame, ldns_rr_rrsig_sig, ldns_rr_rrsig_set_sig - get and set RRSIG RR rdata fields - # --ldns_rr_dnskey_flags, ldns_rr_dnskey_set_flags, ldns_rr_dnskey_protocol, ldns_rr_dnskey_set_protocol, ldns_rr_dnskey_algorithm, ldns_rr_dnskey_set_algorithm, ldns_rr_dnskey_key, ldns_rr_dnskey_set_key | ldns_rr -+ldns_rr_dnskey_flags, ldns_rr_dnskey_set_flags, ldns_rr_dnskey_protocol, ldns_rr_dnskey_set_protocol, ldns_rr_dnskey_algorithm, ldns_rr_dnskey_set_algorithm, ldns_rr_dnskey_key, ldns_rr_dnskey_set_key | ldns_rr - get and set DNSKEY RR rdata fields - - ### zone.h --ldns_zone | ldns_zone_new, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l, ldns_zone_sort, ldns_zone_glue_rr_list, ldns_zone_push_rr, ldns_zone_push_rr_list, ldns_zone_set_rrs, ldns_zone_set_soa, ldns_zone_rrs, ldns_zone_soa, ldns_zone_rr_count, -+ldns_zone, ldns_zone_new, ldns_zone_free, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l, ldns_zone_print, ldns_zone_print_fmt - ldns_zone creation, destruction and printing -+ldns_zone_sort, ldns_zone_glue_rr_list | ldns_zone - sort a zone and get the glue records -+ldns_zone_push_rr, ldns_zone_push_rr_list | ldns_zone - add rr's to a ldns_zone -+ldns_zone_set_rrs, ldns_zone_set_soa | ldns_zone, ldns_zone_rrs, ldns_zone_soa - ldns_zone set content -+ldns_zone_rrs, ldns_zone_soa | ldns_zone ldns_zone_set_rrs - ldns_zone get content -+ldns_zone_rr_count | ldns_zone - get ldns_zone size - -+### update.h -+ldns_update_pkt_new | ldns_update_pkt_tsig_add, ldns_update_pkt_tsig_add, ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount, ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount - create an update packet - --ldns_zone_new, ldns_zone_deep_free, ldns_zone_new_frm_fp, ldns_zone_new_frm_fp_l | ldns_zone --ldns_zone_sort, ldns_zone_glue_rr_list | ldns_zone --ldns_zone_push_rr, ldns_zone_push_rr_list | ldns_zone --ldns_zone_set_rrs, ldns_zone_set_soa | ldns_zone, ldns_zone_rrs, ldns_zone_soa --ldns_zone_rrs, ldns_zone_soa | ldns_zone ldns_zone_set_rrs --ldns_zone_rr_count | ldns_zone -+ldns_update_pkt_tsig_add | ldns_update_pkt_new - add resolver's tsig credentials to an ldns_pkt -+ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount | ldns_update_pkt_new - return update packet counters -+ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount | ldns_update_pkt_new - set the update packet counters -+ -+### keys.h -+ldns_algorithm - numbers assigned to algorithms used in dns -+ -+ -+ldns_axfr_start, ldns_axfr_next, ldns_axfr_abort, ldns_axfr_complete, ldns_axfr_last_pkt - functions for full zone transfer -+ -+ldns_b32_ntop_calculate_size, ldns_b32_pton_calculate_size, ldns_b64_ntop_calculate_size, ldns_b64_pton_calculate_size - return size needed for b32 or b64 encoded or decoded data -+ -+ldns_duration_type, ldns_duration_create, ldns_duration_create_from_string, ldns_duration_cleanup, ldns_duration_compare, ldns_duration2string, ldns_duration2time - duration type and related functions -+ -+ldns_bubblebabble - encode data as BubbleBabble -+ -+ldns_version - return library version - --### update.h --ldns_update_pkt_new | ldns_update_pkt_tsig_add, ldns_update_pkt_tsig_add, ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount, ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount, - --ldns_update_pkt_tsig_add | ldns_update_pkt_new --ldns_update_zocount, ldns_update_prcount, ldns_update_upcount, ldns_update_adcount | ldns_update_pkt_new --ldns_update_set_zocount, ldns_update_set_prcount, ldns_update_set_upcount, ldns_update_set_adcount | ldns_update_pkt_new --- -2.6.4 - diff --git a/package.bak/libldns/Config.in b/package.bak/libldns/Config.in deleted file mode 100644 index 12065ae2f1..0000000000 --- a/package.bak/libldns/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBLDNS - bool "libldns" - help - The goal of ldns is to simplify DNS programming, it supports - recent RFCs like the DNSSEC documents, and allows developers - to easily create software conforming to current RFCs, and - experimental software for current Internet Drafts. - - http://www.nlnetlabs.nl/projects/ldns diff --git a/package.bak/libldns/libldns.hash b/package.bak/libldns/libldns.hash deleted file mode 100644 index 3565c5830a..0000000000 --- a/package.bak/libldns/libldns.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.17.tar.gz.sha1 -sha1 4218897b3c002aadfc7280b3f40cda829e05c9a4 ldns-1.6.17.tar.gz -# Locally calculated -sha256 8b88e059452118e8949a2752a55ce59bc71fa5bc414103e17f5b6b06f9bcc8cd ldns-1.6.17.tar.gz diff --git a/package.bak/libldns/libldns.mk b/package.bak/libldns/libldns.mk deleted file mode 100644 index 3d4d35688c..0000000000 --- a/package.bak/libldns/libldns.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# libldns -# -################################################################################ - -LIBLDNS_VERSION = 1.6.17 -LIBLDNS_SOURCE = ldns-$(LIBLDNS_VERSION).tar.gz -LIBLDNS_SITE = http://www.nlnetlabs.nl/downloads/ldns -LIBLDNS_LICENSE = BSD-3c -LIBLDNS_LICENSE_FILES = LICENSE -LIBLDNS_INSTALL_STAGING = YES -LIBLDNS_CONF_OPTS = \ - --without-examples \ - --without-p5-dns-ldns \ - --without-pyldns \ - --without-pyldnsx - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBLDNS_DEPENDENCIES += openssl -LIBLDNS_CONF_OPTS += \ - --with-ssl=$(STAGING_DIR)/usr \ - --enable-dane \ - --enable-ecdsa \ - --enable-gost \ - --enable-sha2 - -ifeq ($(BR2_STATIC_LIBS),y) -LIBLDNS_DEPENDENCIES += host-pkgconf -# missing -lz breaks configure, add it using pkgconf -LIBLDNS_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" -endif - -else -LIBLDNS_CONF_OPTS += \ - --without-ssl \ - --disable-dane \ - --disable-ecdsa \ - --disable-gost \ - --disable-sha2 -endif - -# the linktest make target fails with static linking, and we are only -# interested in the lib target anyway -LIBLDNS_MAKE_OPTS = lib - -$(eval $(autotools-package)) diff --git a/package.bak/liblinear/0001-blas-don-t-overwrite-ar-options.patch b/package.bak/liblinear/0001-blas-don-t-overwrite-ar-options.patch deleted file mode 100644 index 5d1ef3f52a..0000000000 --- a/package.bak/liblinear/0001-blas-don-t-overwrite-ar-options.patch +++ /dev/null @@ -1,35 +0,0 @@ -From cae4c3b80fee0f3637d70f6d33946888c8105637 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 13 Dec 2014 17:16:58 +0100 -Subject: [PATCH 1/1] blas: don't overwrite ar options - -ar's rcv options get lost when AR is passed on -the command line. - -Signed-off-by: Romain Naour ---- - blas/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/blas/Makefile b/blas/Makefile -index 895fd24..78cec9a 100644 ---- a/blas/Makefile -+++ b/blas/Makefile -@@ -1,4 +1,4 @@ --AR = ar rcv -+AR = ar - RANLIB = ranlib - - HEADERS = blas.h blasp.h -@@ -8,7 +8,7 @@ CFLAGS = $(OPTFLAGS) - FFLAGS = $(OPTFLAGS) - - blas: $(FILES) $(HEADERS) -- $(AR) blas.a $(FILES) -+ $(AR) rcv blas.a $(FILES) - $(RANLIB) blas.a - - clean: --- -1.9.3 - diff --git a/package.bak/liblinear/0002-build-static-lib.patch b/package.bak/liblinear/0002-build-static-lib.patch deleted file mode 100644 index 98657d3c82..0000000000 --- a/package.bak/liblinear/0002-build-static-lib.patch +++ /dev/null @@ -1,18 +0,0 @@ -Makefile: add a rule to build a static library - -Signed-off-by: "Yann E. MORIN" -diff -durN liblinear-1.96.orig/Makefile liblinear-1.96/Makefile ---- liblinear-1.96.orig/Makefile 2014-11-15 07:50:23.000000000 +0100 -+++ liblinear-1.96/Makefile 2014-12-14 00:23:00.135893956 +0100 -@@ -16,6 +16,11 @@ - fi; \ - $(CXX) $${SHARED_LIB_FLAG} linear.o tron.o blas/blas.a -o liblinear.so.$(SHVER) - -+# Keeping blas/blas.a as a pre-requisite, to ensure all .o files are built -+static-lib: linear.o tron.o blas/blas.a -+ $(AR) rcv liblinear.a linear.o tron.o blas/*.o -+ $(RANLIB) liblinear.a -+ - train: tron.o linear.o train.c blas/blas.a - $(CXX) $(CFLAGS) -o train train.c tron.o linear.o $(LIBS) - diff --git a/package.bak/liblinear/Config.in b/package.bak/liblinear/Config.in deleted file mode 100644 index f25c1196fc..0000000000 --- a/package.bak/liblinear/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBLINEAR - bool "liblinear" - depends on BR2_INSTALL_LIBSTDCPP - help - liblinear is a linear classifier for data with millions of instances - and features. - - http://www.csie.ntu.edu.tw/~cjlin/liblinear/ - -comment "liblinear needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/liblinear/liblinear.hash b/package.bak/liblinear/liblinear.hash deleted file mode 100644 index 4f03fa4a84..0000000000 --- a/package.bak/liblinear/liblinear.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fa5c12dedc76ffca12f1681de7073b03af68163c4e4be65194217c99e55a7d68 liblinear-2.1.tar.gz diff --git a/package.bak/liblinear/liblinear.mk b/package.bak/liblinear/liblinear.mk deleted file mode 100644 index a9524e35df..0000000000 --- a/package.bak/liblinear/liblinear.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# liblinear -# -################################################################################ - -LIBLINEAR_VERSION = 2.1 -LIBLINEAR_SITE = http://www.csie.ntu.edu.tw/~cjlin/liblinear -LIBLINEAR_LICENSE = BSD-3c -LIBLINEAR_LICENSE_FILES = COPYRIGHT -LIBLINEAR_INSTALL_STAGING = YES -LIBLINEAR_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -# $1: destination directory -define LIBLINEAR_INSTALL_SHARED - $(INSTALL) -m 0644 -D $(@D)/liblinear.so.3 $(1)/usr/lib/liblinear.so.3 - ln -sf liblinear.so.3 $(1)/usr/lib/liblinear.so -endef -LIBLINEAR_CFLAGS += -fPIC -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -# $1: destination directory -define LIBLINEAR_INSTALL_STATIC - $(INSTALL) -m 0644 -D $(@D)/liblinear.a $(1)/usr/lib/liblinear.a -endef -endif - -define LIBLINEAR_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBLINEAR_CFLAGS)" -C $(@D) \ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),lib) \ - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),static-lib) -endef - -define LIBLINEAR_INSTALL_STAGING_CMDS - $(INSTALL) -m 0644 -D $(@D)/linear.h $(STAGING_DIR)/usr/include/linear.h - $(call LIBLINEAR_INSTALL_SHARED,$(STAGING_DIR)) - $(call LIBLINEAR_INSTALL_STATIC,$(STAGING_DIR)) -endef - -define LIBLINEAR_INSTALL_TARGET_CMDS - $(call LIBLINEAR_INSTALL_SHARED,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/libllcp/Config.in b/package.bak/libllcp/Config.in deleted file mode 100644 index e5b21082e5..0000000000 --- a/package.bak/libllcp/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBLLCP - bool "libllcp" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBNFC - help - Library extending libnfc with support for Logical Link Control - Protocol. - - https://code.google.com/p/libllcp/ diff --git a/package.bak/libllcp/libllcp.hash b/package.bak/libllcp/libllcp.hash deleted file mode 100644 index 47c909f1e6..0000000000 --- a/package.bak/libllcp/libllcp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4336533304a11ecb3041d211ccecd7759b7c7aad4f44037721803e2da1094d22 libllcp-05dfa8003433a7070bfd8ae02efdb0203bbf34aa.tar.gz diff --git a/package.bak/libllcp/libllcp.mk b/package.bak/libllcp/libllcp.mk deleted file mode 100644 index 2c2014a168..0000000000 --- a/package.bak/libllcp/libllcp.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libllcp -# -################################################################################ - -LIBLLCP_VERSION = 05dfa8003433a7070bfd8ae02efdb0203bbf34aa -LIBLLCP_SITE = $(call github,nfc-tools,libllcp,$(LIBLLCP_VERSION)) -LIBLLCP_DEPENDENCIES = host-pkgconf libnfc -# There's no ./configure in the repository, so we need to autoreconf -LIBLLCP_AUTORECONF = YES -LIBLLCP_INSTALL_STAGING = YES -LIBLLCP_LICENSE = GPLv3+ -LIBLLCP_LICENSE_FILES = COPYING -# ensure graphviz isn't used -LIBLLCP_CONF_ENV = ac_cv_path_DOT= - -$(eval $(autotools-package)) diff --git a/package.bak/liblo/Config.in b/package.bak/liblo/Config.in deleted file mode 100644 index 705ac84514..0000000000 --- a/package.bak/liblo/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBLO - bool "liblo" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - liblo is an implementation of the Open Sound Control - protocol for POSIX systems - - http://liblo.sourceforge.net/ - -comment "liblo needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/liblo/liblo.hash b/package.bak/liblo/liblo.hash deleted file mode 100644 index a4e01a6d73..0000000000 --- a/package.bak/liblo/liblo.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/liblo/files/liblo/0.26/ -sha1 21942c8f19e9829b5842cb85352f98c49dfbc823 liblo-0.26.tar.gz -md5 5351de14262560e15e7f23865293b16f liblo-0.26.tar.gz diff --git a/package.bak/liblo/liblo.mk b/package.bak/liblo/liblo.mk deleted file mode 100644 index a6b907509c..0000000000 --- a/package.bak/liblo/liblo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# liblo -# -################################################################################ - -LIBLO_VERSION = 0.26 -LIBLO_SITE = http://downloads.sourceforge.net/project/liblo/liblo/$(LIBLO_VERSION) - -LIBLO_LICENSE = LGPLv2.1+ -LIBLO_LICENSE_FILES = COPYING -LIBLO_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/liblockfile/0001-install.patch b/package.bak/liblockfile/0001-install.patch deleted file mode 100644 index bfa197c64f..0000000000 --- a/package.bak/liblockfile/0001-install.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur liblockfile-1.06.1/Makefile.in liblockfile-1.06.1-patched/Makefile.in ---- liblockfile-1.06.1/Makefile.in 2001-03-16 22:08:33.000000000 -0600 -+++ liblockfile-1.06.1-patched/Makefile.in 2007-04-11 07:18:38.000000000 -0500 -@@ -60,11 +60,7 @@ - - install_common: - install -m 644 lockfile.h maillock.h $(ROOT)$(includedir) -- if [ "$(MAILGROUP)" != "" ]; then\ -- install -g $(MAILGROUP) -m 2755 dotlockfile $(ROOT)$(bindir);\ -- else \ -- install -g root -m 755 dotlockfile $(ROOT)$(bindir); \ -- fi -+ install -m 2755 dotlockfile $(ROOT)$(bindir);\ - install -m 644 *.1 $(ROOT)$(mandir)/man1 - install -m 644 *.3 $(ROOT)$(mandir)/man3 - diff --git a/package.bak/liblockfile/Config.in b/package.bak/liblockfile/Config.in deleted file mode 100644 index 88a9c338bb..0000000000 --- a/package.bak/liblockfile/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_LIBLOCKFILE - bool "liblockfile" - help - NFS-safe locking library. diff --git a/package.bak/liblockfile/liblockfile.hash b/package.bak/liblockfile/liblockfile.hash deleted file mode 100644 index 4421673b91..0000000000 --- a/package.bak/liblockfile/liblockfile.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile/liblockfile_1.09-6.dsc -sha256 16979eba05396365e1d6af7100431ae9d32f9bc063930d1de66298a0695f1b7f liblockfile_1.09.orig.tar.gz -sha256 d45eacb7c637c16d03c777c55989d98da494ae9584a0783fe6dbf0db60fa290f liblockfile_1.09-6.debian.tar.bz2 diff --git a/package.bak/liblockfile/liblockfile.mk b/package.bak/liblockfile/liblockfile.mk deleted file mode 100644 index 59fced6851..0000000000 --- a/package.bak/liblockfile/liblockfile.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# liblockfile -# -################################################################################ - -LIBLOCKFILE_VERSION = 1.09 -LIBLOCKFILE_SOURCE = liblockfile_$(LIBLOCKFILE_VERSION).orig.tar.gz -LIBLOCKFILE_SITE = http://snapshot.debian.org/archive/debian/20151026T153523Z/pool/main/libl/liblockfile -LIBLOCKFILE_PATCH = liblockfile_$(LIBLOCKFILE_VERSION)-6.debian.tar.bz2 - -LIBLOCKFILE_LICENSE = LGPLv2+, GPLv2+ (dotlockfile) -LIBLOCKFILE_LICENSE_FILES = COPYRIGHT - -LIBLOCKFILE_INSTALL_STAGING = YES -LIBLOCKFILE_CONF_OPTS = --mandir=/usr/share/man - -define LIBLOCKFILE_INSTALL_STAGING_CMDS - mkdir -p $(addprefix $(STAGING_DIR)/usr/share/man/man,1 3) - rm -f $(STAGING_DIR)/usr/lib/liblockfile.so - $(TARGET_MAKE_ENV) $(MAKE) -C $(LIBLOCKFILE_DIR) ROOT=$(STAGING_DIR) install - ln -sf liblockfile.so $(STAGING_DIR)/usr/lib/liblockfile.so.1 -endef - -define LIBLOCKFILE_INSTALL_TARGET_CMDS - cp -a $(STAGING_DIR)/usr/lib/liblockfile.so* $(TARGET_DIR)/usr/lib -endef - -$(eval $(autotools-package)) diff --git a/package.bak/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch b/package.bak/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch deleted file mode 100644 index 1fe0798a3b..0000000000 --- a/package.bak/liblog4c-localtime/0001-log4c.m4-fix-underquoted-definition-of-AM_PATH_LOG4C.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b7290560082e91673431de79e1fa318c9fd90261 Mon Sep 17 00:00:00 2001 -From: Danomi Manchego -Date: Sat, 25 Oct 2014 19:42:38 +0200 -Subject: [PATCH 1/5] log4c.m4: fix "underquoted definition of AM_PATH_LOG4C" - warning - -When autoreconfiguring liblog4c-localtime, there is a warning from -autoconf caused by an underquoted definition of AM_PATH_LOG4C. This -patch fixes this warning. - -Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 - -Signed-off-by: Danomi Manchego -Signed-off-by: Thomas Petazzoni ---- - log4c.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/log4c.m4 b/log4c.m4 -index 551a90d..96424c0 100644 ---- a/log4c.m4 -+++ b/log4c.m4 -@@ -4,7 +4,7 @@ - dnl AM_PATH_LOG4C([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) - dnl Test for LOG4C, and define LOG4C_CFLAGS and LOG4C_LIBS - dnl --AC_DEFUN(AM_PATH_LOG4C, -+AC_DEFUN([AM_PATH_LOG4C], - [dnl - dnl Get the cflags and libraries from the log4c-config script - dnl --- -2.0.0 - diff --git a/package.bak/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch b/package.bak/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch deleted file mode 100644 index 5b679e38ba..0000000000 --- a/package.bak/liblog4c-localtime/0002-Fix-linking-error-without-pthread.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 435b28cd90973cc03a533e75e90a46cd9f197dff Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 25 Oct 2014 19:44:01 +0200 -Subject: [PATCH 2/5] Fix linking error without pthread - -The rollingfile functionality only gets built if pthread support is -available, but a call to these functions from log4c_fini() was outside -the #if WITH_ROLLINGFILE conditional, causing linker errors when the -library is used. - -Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 - -Signed-off-by: Peter Korsgaard -Signed-off-by: Thomas Petazzoni ---- - src/log4c/init.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/log4c/init.c b/src/log4c/init.c -index 99883ea..7dd9eb4 100644 ---- a/src/log4c/init.c -+++ b/src/log4c/init.c -@@ -267,10 +267,12 @@ extern int log4c_fini(void) - log4c_layout_factory = NULL; - } - -+#ifdef WITH_ROLLINGFILE - if (log4c_rollingpolicy_factory) { - sd_factory_delete(log4c_rollingpolicy_factory); - log4c_rollingpolicy_factory = NULL; - } -+#endif - - #ifdef __SD_DEBUG__ - if( getenv("SD_DEBUG")){ --- -2.0.0 - diff --git a/package.bak/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch b/package.bak/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch deleted file mode 100644 index 4b9a45db68..0000000000 --- a/package.bak/liblog4c-localtime/0003-Fix-debug-mode-build-with-uClibc.patch +++ /dev/null @@ -1,69 +0,0 @@ -From acbaee34bcb1881db97969dd2c411446f32ca4cc Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 25 Oct 2014 19:45:33 +0200 -Subject: [PATCH 3/5] Fix debug mode build with uClibc - -When --enable-debug is passed, liblog4c-localtime wants to use -. It takes the precaution of testing if __GLIBC__ is -defined. But unfortunately, the uClibc C library pretends to be -compatible with glibc by defining __GLIBC__, but it doesn't provide -mcheck.h. - -To better support this situation, we add an AC_CHECK_HEADERS() check -on mcheck.h, and then use HAVE_MCHECK_H were appropriate. - -Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 2 +- - src/log4c/init.c | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.in b/configure.in -index 612ccbe..dbf11e9 100644 ---- a/configure.in -+++ b/configure.in -@@ -115,7 +115,7 @@ AM_CONDITIONAL(TEST, test x$enable_test = xyes) - AC_HEADER_STDC - AC_CHECK_HEADERS([fcntl.h inttypes.h langinfo.h limits.h stddef.h stdint.h \ - stdlib.h string.h sys/time.h syslog.h unistd.h stdarg.h varargs.h getopt.h \ --pthread.h]) -+pthread.h mcheck.h]) - - # Checks for typedefs, structures, and compiler characteristics. - AC_C_CONST -diff --git a/src/log4c/init.c b/src/log4c/init.c -index 7dd9eb4..4b88210 100644 ---- a/src/log4c/init.c -+++ b/src/log4c/init.c -@@ -35,7 +35,7 @@ static const char version[] = "$Id$"; - #include - #include - --#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) -+#if defined(__LOG4C_DEBUG__) && defined(HAVE_MCHECK_H) - #include - #endif - -@@ -100,7 +100,7 @@ extern int log4c_init(void) - sd_debug("log4c_init["); - - /* activate GLIBC allocation debugging */ --#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) -+#if defined(__LOG4C_DEBUG__) && defined(HAVE_MCHECK_H) - mtrace(); - #endif - -@@ -280,7 +280,7 @@ extern int log4c_fini(void) - log4c_dump_all_instances(stderr); - } - #endif --#if defined(__LOG4C_DEBUG__) && defined(__GLIBC__) -+#if defined(__LOG4C_DEBUG__) && defined(HAVE_MCHECK_H) - muntrace(); - #endif - --- -2.0.0 - diff --git a/package.bak/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch b/package.bak/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch deleted file mode 100644 index 479eb3987f..0000000000 --- a/package.bak/liblog4c-localtime/0004-Add-AC_CONFIG_MACRO_DIR-to-configure.in.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a2553c203d8b8257dea1d2e2139b220935587144 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 25 Oct 2014 20:03:25 +0200 -Subject: [PATCH 4/5] Add AC_CONFIG_MACRO_DIR to configure.in - -Without AC_CONFIG_MACRO_DIR, when autoreconfiguring the package, it -cannot find AM_PATH_EXPAT which is defined in config/expat.m4. - -Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.in b/configure.in -index dbf11e9..769b204 100644 ---- a/configure.in -+++ b/configure.in -@@ -5,6 +5,7 @@ AC_PREREQ(2.57) - AC_INIT - AC_CONFIG_SRCDIR([configure.in]) - AC_CONFIG_AUX_DIR(config) -+AC_CONFIG_MACRO_DIR([config]) - AM_CONFIG_HEADER(src/config.h) - - LOG4C_MAJOR_VERSION=1 --- -2.0.0 - diff --git a/package.bak/liblog4c-localtime/0005-Fix-C-support.patch b/package.bak/liblog4c-localtime/0005-Fix-C-support.patch deleted file mode 100644 index 6ba25c36ff..0000000000 --- a/package.bak/liblog4c-localtime/0005-Fix-C-support.patch +++ /dev/null @@ -1,61 +0,0 @@ -From bdccec4c374a93480a7fd303d15e20810a5d5b7e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 25 Oct 2014 21:22:40 +0200 -Subject: [PATCH 5/5] Fix C++ support - -Autoreconf fails with the following message: - -tests/log4c/Makefile.am: error: C++ source seen but 'CXX' is undefined - -So this commit adds the AC_PROG_CXX macro to configure.in, and ensures -that the C++ test is only built if a C++ compiler is available. - -Submitted upstream: https://github.com/rcmadruga/log4c-localtime/pull/1 - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 3 +++ - tests/log4c/Makefile.am | 6 +++++- - 2 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 769b204..ce75800 100644 ---- a/configure.in -+++ b/configure.in -@@ -38,6 +38,7 @@ AC_DEFINE(_GNU_SOURCE,1,"POSIXandGNU extensions") - #. - AC_PROG_YACC - AC_PROG_CC -+AC_PROG_CXX - AC_PROG_CPP - AM_PROG_LEX - AC_PROG_AWK -@@ -47,6 +48,8 @@ AC_PROG_MAKE_SET - AC_PROG_RANLIB - AC_PROG_LIBTOOL - -+AM_CONDITIONAL([USE_CXX], [test "$ac_cv_prog_CXX" != "no"]) -+ - # platform idioms - case "$host" in - *-hp-hpux*) -diff --git a/tests/log4c/Makefile.am b/tests/log4c/Makefile.am -index f647f27..b1b4ed6 100644 ---- a/tests/log4c/Makefile.am -+++ b/tests/log4c/Makefile.am -@@ -3,7 +3,11 @@ INCLUDES = \ - -DSRCDIR="\"$(srcdir)\"" - - noinst_PROGRAMS = test_category test_rc bench bench_fwrite \ -- test_stream2 test_layout_r cpp_compile_test -+ test_stream2 test_layout_r -+ -+if USE_CXX -+noinst_PROGRAMS += cpp_compile_test -+endif - - if WITH_ROLLINGFILE - noinst_PROGRAMS += test_rollingfile_appender test_rollingfile_appender_mt --- -2.0.0 - diff --git a/package.bak/liblog4c-localtime/Config.in b/package.bak/liblog4c-localtime/Config.in deleted file mode 100644 index a2b7a843f1..0000000000 --- a/package.bak/liblog4c-localtime/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBLOG4C_LOCALTIME - bool "liblog4c-localtime" - select BR2_PACKAGE_EXPAT - help - Log4c is a library of C for flexible logging to files, syslog - and other destinations. - This version is with localtime patch, to make lib show times in - local timezone. - - https://github.com/rcmadruga/log4c-localtime - http://log4c.sourceforge.net/ diff --git a/package.bak/liblog4c-localtime/liblog4c-localtime.hash b/package.bak/liblog4c-localtime/liblog4c-localtime.hash deleted file mode 100644 index 2e4e6417ce..0000000000 --- a/package.bak/liblog4c-localtime/liblog4c-localtime.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a1f68d8251509c0171f8bfea42f9e2a5255a4185f7dcbe67f584aa09709b2496 liblog4c-localtime-v1.0.tar.gz diff --git a/package.bak/liblog4c-localtime/liblog4c-localtime.mk b/package.bak/liblog4c-localtime/liblog4c-localtime.mk deleted file mode 100644 index bc6d1ab506..0000000000 --- a/package.bak/liblog4c-localtime/liblog4c-localtime.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# liblog4c-localtime -# -################################################################################ - -LIBLOG4C_LOCALTIME_VERSION = v1.0 -LIBLOG4C_LOCALTIME_SITE = $(call github,rcmadruga,log4c-localtime,$(LIBLOG4C_LOCALTIME_VERSION)) -LIBLOG4C_LOCALTIME_INSTALL_STAGING = YES -LIBLOG4C_LOCALTIME_CONF_OPTS = --disable-expattest -LIBLOG4C_LOCALTIME_DEPENDENCIES = expat -LIBLOG4C_LOCALTIME_CONFIG_SCRIPTS = log4c-config -LIBLOG4C_LOCALTIME_LICENSE = LGPLv2.1 -LIBLOG4C_LOCALTIME_LICENSE_FILES = COPYING -LIBLOG4C_LOCALTIME_AUTORECONF = YES - -define LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS - chmod +x $(@D)/configure -endef - -LIBLOG4C_LOCALTIME_PRE_CONFIGURE_HOOKS += LIBLOG4C_LOCALTIME_FIX_CONFIGURE_PERMS - -$(eval $(autotools-package)) diff --git a/package.bak/liblogging/Config.in b/package.bak/liblogging/Config.in deleted file mode 100644 index 23c3c1ad2d..0000000000 --- a/package.bak/liblogging/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBLOGGING - bool "liblogging" - help - Liblogging is an easy to use library for - logging. It offers an enhanced replacement - for the syslog() call, but retains its ease of use. - - http://www.liblogging.org/ diff --git a/package.bak/liblogging/liblogging.hash b/package.bak/liblogging/liblogging.hash deleted file mode 100644 index f5674a1c6d..0000000000 --- a/package.bak/liblogging/liblogging.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.liblogging.org/ -sha256 310dc1691279b7a669d383581fe4b0babdc7bf75c9b54a24e51e60428624890b liblogging-1.0.5.tar.gz diff --git a/package.bak/liblogging/liblogging.mk b/package.bak/liblogging/liblogging.mk deleted file mode 100644 index 9ef2e28b7e..0000000000 --- a/package.bak/liblogging/liblogging.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# liblogging -# -################################################################################ - -LIBLOGGING_VERSION = 1.0.5 -LIBLOGGING_SITE = http://download.rsyslog.com/liblogging -LIBLOGGING_LICENSE = BSD-2c -LIBLOGGING_LICENSE_FILES = COPYING -LIBLOGGING_INSTALL_STAGING = YES -LIBLOGGING_CONF_OPTS = --enable-cached-man-pages - -ifeq ($(BR2_INIT_SYSTEMD),y) -LIBLOGGING_CONF_OPTS += --enable-journal -LIBLOGGING_DEPENDENCIES += systemd -else -LIBLOGGING_CONF_OPTS += --disable-journal -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libmad/0001-mips-h-constraint-removal.patch b/package.bak/libmad/0001-mips-h-constraint-removal.patch deleted file mode 100644 index 095858717e..0000000000 --- a/package.bak/libmad/0001-mips-h-constraint-removal.patch +++ /dev/null @@ -1,72 +0,0 @@ -http://patchwork.openembedded.org/patch/921/ - -diff -ur libmad-0.15.1b-orig/fixed.h libmad-0.15.1b/fixed.h ---- libmad-0.15.1b-orig/fixed.h 2004-02-17 12:32:03.000000000 +1030 -+++ libmad-0.15.1b/fixed.h 2009-08-05 10:46:30.000000000 +0930 -@@ -299,6 +299,23 @@ - - # elif defined(FPM_MIPS) - -+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ -+#if defined (__GNUC__) && defined (__GNUC_MINOR__) -+#define __GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#else -+#define __GNUC_PREREQ(maj, min) 0 -+#endif -+ -+#if __GNUC_PREREQ(4,4) -+ typedef unsigned int u64_di_t __attribute__ ((mode (DI))); -+# define MAD_F_MLX(hi, lo, x, y) \ -+ do { \ -+ u64_di_t __ll = (u64_di_t) (x) * (y); \ -+ hi = __ll >> 32; \ -+ lo = __ll; \ -+ } while (0) -+#else - /* - * This MIPS version is fast and accurate; the disposition of the least - * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -328,6 +345,7 @@ - : "%r" ((x) >> 12), "r" ((y) >> 16)) - # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) - # endif -+#endif /* __GNU_PREREQ(4,4) */ - - # if defined(OPT_SPEED) - # define mad_f_scale64(hi, lo) \ -diff -ur libmad-0.15.1b-orig/mad.h libmad-0.15.1b/mad.h ---- libmad-0.15.1b-orig/mad.h 2004-02-17 13:25:44.000000000 +1030 -+++ libmad-0.15.1b/mad.h 2009-08-05 10:42:40.000000000 +0930 -@@ -344,6 +344,23 @@ - - # elif defined(FPM_MIPS) - -+/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ -+#if defined (__GNUC__) && defined (__GNUC_MINOR__) -+#define __GNUC_PREREQ(maj, min) \ -+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -+#else -+#define __GNUC_PREREQ(maj, min) 0 -+#endif -+ -+#if __GNUC_PREREQ(4,4) -+ typedef unsigned int u64_di_t __attribute__ ((mode (DI))); -+# define MAD_F_MLX(hi, lo, x, y) \ -+ do { \ -+ u64_di_t __ll = (u64_di_t) (x) * (y); \ -+ hi = __ll >> 32; \ -+ lo = __ll; \ -+ } while (0) -+#else - /* - * This MIPS version is fast and accurate; the disposition of the least - * significant bit depends on OPT_ACCURACY via mad_f_scale64(). -@@ -373,6 +390,7 @@ - : "%r" ((x) >> 12), "r" ((y) >> 16)) - # define MAD_F_MLZ(hi, lo) ((mad_fixed_t) (lo)) - # endif -+#endif /* __GNU_PREREQ(4,4) */ - - # if defined(OPT_SPEED) - # define mad_f_scale64(hi, lo) \ diff --git a/package.bak/libmad/0003-remove-deprecated-cflags.patch b/package.bak/libmad/0003-remove-deprecated-cflags.patch deleted file mode 100644 index e5040830f9..0000000000 --- a/package.bak/libmad/0003-remove-deprecated-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -libmad: remove deprecated cflags (-fforce-mem) - -fforce-mem has long been deprecated, and is completely removed from -gcc 4.3.x on. ---- - configure | 1 - - configure.ac | 1 - - 2 files changed, 2 deletions(-) - -Index: libmad-0.15.1b/configure.ac -=================================================================== ---- libmad-0.15.1b.orig/configure.ac -+++ libmad-0.15.1b/configure.ac -@@ -140,7 +140,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" -Index: libmad-0.15.1b/configure -=================================================================== ---- libmad-0.15.1b.orig/configure -+++ libmad-0.15.1b/configure -@@ -19099,7 +19099,6 @@ - case "$optimize" in - -O|"-O "*) - optimize="-O" -- optimize="$optimize -fforce-mem" - optimize="$optimize -fforce-addr" - : #x optimize="$optimize -finline-functions" - : #- optimize="$optimize -fstrength-reduce" diff --git a/package.bak/libmad/0004-thumb2-fixed-arm.patch b/package.bak/libmad/0004-thumb2-fixed-arm.patch deleted file mode 100644 index befda48d7e..0000000000 --- a/package.bak/libmad/0004-thumb2-fixed-arm.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fixes Thumb2-related build failure - -Patch below comes from the Debian libmad package. - -Signed-off-by: Thomas Petazzoni - -From: Dave Martin -Subject: "rsc" doesnt exist anymore in thumb2 - -diff --git a/fixed.h b/fixed.h -index 4b58abf..ba4bc26 100644 ---- a/fixed.h -+++ b/fixed.h -@@ -275,12 +275,25 @@ mad_fixed_t mad_f_mul_inline(mad_fixed_t x, mad_fixed_t y) - : "+r" (lo), "+r" (hi) \ - : "%r" (x), "r" (y)) - -+#ifdef __thumb__ -+/* In Thumb-2, the RSB-immediate instruction is only allowed with a zero -+ operand. If needed this code can also support Thumb-1 -+ (simply append "s" to the end of the second two instructions). */ -+# define MAD_F_MLN(hi, lo) \ -+ asm ("rsbs %0, %0, #0\n\t" \ -+ "sbc %1, %1, %1\n\t" \ -+ "sub %1, %1, %2" \ -+ : "+&r" (lo), "=&r" (hi) \ -+ : "r" (hi) \ -+ : "cc") -+#else /* ! __thumb__ */ - # define MAD_F_MLN(hi, lo) \ - asm ("rsbs %0, %2, #0\n\t" \ - "rsc %1, %3, #0" \ -- : "=r" (lo), "=r" (hi) \ -+ : "=&r" (lo), "=r" (hi) \ - : "0" (lo), "1" (hi) \ - : "cc") -+#endif /* __thumb__ */ - - # define mad_f_scale64(hi, lo) \ - ({ mad_fixed_t __result; \ diff --git a/package.bak/libmad/0005-thumb2-imdct-arm.patch b/package.bak/libmad/0005-thumb2-imdct-arm.patch deleted file mode 100644 index 414b9c8fcf..0000000000 --- a/package.bak/libmad/0005-thumb2-imdct-arm.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fixes Thumb2 related build failure - -Patch below comes from the Debian libmad package. - -Signed-off-by: Thomas Petazzoni - -From: Konstantinos Margaritis -Subject: use "adr" instead of "add" to make code ready for thumb2 - ---- ./imdct_l_arm.S.orig 2010-02-25 13:25:23.000000000 +0100 -+++ ./imdct_l_arm.S 2010-02-25 13:27:26.000000000 +0100 -@@ -468,7 +468,7 @@ - - @---- - -- add r2, pc, #(imdct36_long_karray-.-8) @ r2 = base address of Knn array (PIC safe ?) -+ adr r2, imdct36_long_karray - - - loop: diff --git a/package.bak/libmad/Config.in b/package.bak/libmad/Config.in deleted file mode 100644 index f93f54ab12..0000000000 --- a/package.bak/libmad/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_LIBMAD - bool "libmad" - help - High-quality MPEG audio decoder. All computations are performed - with fixed-point integer arithmetic, making it ideal for systems - without a floating-point unit. - - http://www.underbit.com/products/mad/ - -if BR2_PACKAGE_LIBMAD - -choice - prompt "Speed vs. accuracy" - default BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT - -config BR2_PACKAGE_LIBMAD_OPTIMIZATION_DEFAULT - bool "Default" - help - Keep optimizations balanced between speed and accuracy. - -config BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED - bool "Optimize for speed over accuracy" - help - Compromise accuracy for speed. - -config BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY - bool "Optimize for accuracy over speed" - help - Compromise speed for accuracy. - -endchoice - -config BR2_PACKAGE_LIBMAD_SSO - bool "Subband synthesis optimization" - help - Use the subband synthesis optimization, with reduced accuracy. - -config BR2_PACKAGE_LIBMAD_ASO - bool "Architecture-specific optimizations" - # arm optimization needs classic arm instructions support - depends on !(BR2_arm && !BR2_ARM_CPU_HAS_ARM) - default y - help - Use certain architecture-specific optimizations. - -config BR2_PACKAGE_LIBMAD_STRICT_ISO - bool "Strict ISO/IEC interpretations" - help - Use strict ISO/IEC interpretations. - -endif diff --git a/package.bak/libmad/libmad.hash b/package.bak/libmad/libmad.hash deleted file mode 100644 index 1e555568fe..0000000000 --- a/package.bak/libmad/libmad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690 libmad-0.15.1b.tar.gz diff --git a/package.bak/libmad/libmad.mk b/package.bak/libmad/libmad.mk deleted file mode 100644 index 9c152f9721..0000000000 --- a/package.bak/libmad/libmad.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# libmad -# -################################################################################ - -LIBMAD_VERSION = 0.15.1b -LIBMAD_SITE = http://downloads.sourceforge.net/project/mad/libmad/$(LIBMAD_VERSION) -LIBMAD_INSTALL_STAGING = YES -LIBMAD_LIBTOOL_PATCH = NO -LIBMAD_LICENSE = GPLv2+ -LIBMAD_LICENSE_FILES = COPYING - -define LIBMAD_PREVENT_AUTOMAKE - # Prevent automake from running. - (cd $(@D); touch -c config* aclocal.m4 Makefile*); -endef - -define LIBMAD_INSTALL_STAGING_PC - $(INSTALL) -D package/libmad/mad.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/mad.pc -endef - -define LIBMAD_INSTALL_TARGET_PC - $(INSTALL) -D package/libmad/mad.pc \ - $(TARGET_DIR)/usr/lib/pkgconfig/mad.pc -endef - -LIBMAD_POST_PATCH_HOOKS += LIBMAD_PREVENT_AUTOMAKE -LIBMAD_POST_INSTALL_STAGING_HOOKS += LIBMAD_INSTALL_STAGING_PC -LIBMAD_POST_INSTALL_TARGET_HOOKS += LIBMAD_INSTALL_TARGET_PC - -LIBMAD_CONF_OPTS = \ - --disable-debugging \ - $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_SPEED),--enable-speed) \ - $(if $(BR2_PACKAGE_LIBMAD_OPTIMIZATION_ACCURACY),--enable-accuracy) \ - --$(if $(BR2_PACKAGE_LIBMAD_SSO),enable,disable)-sso \ - --$(if $(BR2_PACKAGE_LIBMAD_ASO),enable,disable)-aso \ - --$(if $(BR2_PACKAGE_LIBMAD_STRICT_ISO),enable,disable)-strict-iso - -$(eval $(autotools-package)) diff --git a/package.bak/libmad/mad.pc b/package.bak/libmad/mad.pc deleted file mode 100644 index 14af388661..0000000000 --- a/package.bak/libmad/mad.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: mad -Description: MPEG Audio Decoder -Requires: -Version: 0.15.1b -Libs: -L${libdir} -lmad -Cflags: -I${includedir} diff --git a/package.bak/libmatroska/Config.in b/package.bak/libmatroska/Config.in deleted file mode 100644 index 5815a46c59..0000000000 --- a/package.bak/libmatroska/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBMATROSKA - bool "libmatroska" - select BR2_PACKAGE_LIBEBML - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - help - Extensible open standard audio/video container format access - library. - - http://matroska.org - -comment "libmatroska needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package.bak/libmatroska/libmatroska.hash b/package.bak/libmatroska/libmatroska.hash deleted file mode 100644 index 275af63995..0000000000 --- a/package.bak/libmatroska/libmatroska.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d3efaa9f6d3964351a05bea0f848a8d5dc570e4791f179816ce9a93730296bd7 libmatroska-1.4.4.tar.bz2 diff --git a/package.bak/libmatroska/libmatroska.mk b/package.bak/libmatroska/libmatroska.mk deleted file mode 100644 index 083cced9ef..0000000000 --- a/package.bak/libmatroska/libmatroska.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmatroska -# -################################################################################ - -LIBMATROSKA_VERSION = 1.4.4 -LIBMATROSKA_SOURCE = libmatroska-$(LIBMATROSKA_VERSION).tar.bz2 -LIBMATROSKA_SITE = http://dl.matroska.org/downloads/libmatroska -LIBMATROSKA_INSTALL_STAGING = YES -LIBMATROSKA_LICENSE = LGPLv2.1+ -LIBMATROSKA_LICENSE_FILES = LICENSE.LGPL -LIBMATROSKA_DEPENDENCIES = libebml host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libmbim/Config.in b/package.bak/libmbim/Config.in deleted file mode 100644 index 0ef28db125..0000000000 --- a/package.bak/libmbim/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBMBIM - bool "libmbim" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_LIBGLIB2 - help - libmbim is a glib-based library for talking to WWAN modems and - devices which speak the Mobile Interface Broadband Model (MBIM) - protocol. - - http://www.freedesktop.org/wiki/Software/libmbim/ - -comment "libmbim needs udev /dev management and a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/libmbim/libmbim.hash b/package.bak/libmbim/libmbim.hash deleted file mode 100644 index 21921c9df4..0000000000 --- a/package.bak/libmbim/libmbim.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 ca8d52a95a18cbabae8f15f83f1572316e888b6504f946e6645d24405127ab5b libmbim-1.14.0.tar.xz diff --git a/package.bak/libmbim/libmbim.mk b/package.bak/libmbim/libmbim.mk deleted file mode 100644 index 0f757c0284..0000000000 --- a/package.bak/libmbim/libmbim.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libmbim -# -################################################################################ - -LIBMBIM_VERSION = 1.14.0 -LIBMBIM_SITE = http://www.freedesktop.org/software/libmbim -LIBMBIM_SOURCE = libmbim-$(LIBMBIM_VERSION).tar.xz -LIBMBIM_LICENSE = LGPLv2+ (library), GPLv2+ (programs) -LIBMBIM_LICENSE_FILES = COPYING -LIBMBIM_INSTALL_STAGING = YES - -LIBMBIM_DEPENDENCIES = libglib2 udev libgudev - -# we don't want -Werror -LIBMBIM_CONF_OPTS = --enable-more-warnings=no - -$(eval $(autotools-package)) diff --git a/package.bak/libmbus/Config.in b/package.bak/libmbus/Config.in deleted file mode 100644 index 861406901f..0000000000 --- a/package.bak/libmbus/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBMBUS - bool "libmbus" - help - libmbus is a library for communicating with energy metering devices. - It supports TCP and RS232 M-bus gateways. - (M-bus standard: http://www.m-bus.com/) - - http://www.rscada.se/libmbus/ diff --git a/package.bak/libmbus/libmbus.hash b/package.bak/libmbus/libmbus.hash deleted file mode 100644 index faf6a27ab7..0000000000 --- a/package.bak/libmbus/libmbus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9fca42592da0ba75df66c6f885a4dbfa916d23e65e3d1ce6e38d940d2a2719a4 libmbus-0.8.0.tar.gz diff --git a/package.bak/libmbus/libmbus.mk b/package.bak/libmbus/libmbus.mk deleted file mode 100644 index 75aaa8dcfb..0000000000 --- a/package.bak/libmbus/libmbus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libmbus -# -################################################################################ - -LIBMBUS_VERSION = 0.8.0 -LIBMBUS_SITE = http://www.rscada.se/public-dist -LIBMBUS_INSTALL_STAGING = YES -LIBMBUS_LICENSE = BSD-3c -LIBMBUS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmcrypt/0001-nocxx.patch b/package.bak/libmcrypt/0001-nocxx.patch deleted file mode 100644 index b1c28713a1..0000000000 --- a/package.bak/libmcrypt/0001-nocxx.patch +++ /dev/null @@ -1,15 +0,0 @@ -libmcrypt doesn't use C++ so remove the check. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmcrypt-2.5.8.orig/configure.in libmcrypt-2.5.8/configure.in ---- libmcrypt-2.5.8.orig/configure.in 2013-01-07 12:20:44.332200669 -0300 -+++ libmcrypt-2.5.8/configure.in 2013-01-07 12:20:50.405390565 -0300 -@@ -19,7 +19,6 @@ - - AC_PROG_MAKE_SET - --AC_PROG_CXX - AC_PROG_CC - AC_PROG_CPP - AC_PROG_INSTALL diff --git a/package.bak/libmcrypt/Config.in b/package.bak/libmcrypt/Config.in deleted file mode 100644 index e5dc5e23a9..0000000000 --- a/package.bak/libmcrypt/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBMCRYPT - bool "libmcrypt" - help - libmcrypt is a library that provides uniform interface to access - several encryption algorithms. - - http://mcrypt.sourceforge.net/ diff --git a/package.bak/libmcrypt/libmcrypt.hash b/package.bak/libmcrypt/libmcrypt.hash deleted file mode 100644 index d0d3a9c977..0000000000 --- a/package.bak/libmcrypt/libmcrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e4eb6c074bbab168ac47b947c195ff8cef9d51a211cdd18ca9c9ef34d27a373e libmcrypt-2.5.8.tar.gz diff --git a/package.bak/libmcrypt/libmcrypt.mk b/package.bak/libmcrypt/libmcrypt.mk deleted file mode 100644 index 1a2645bc14..0000000000 --- a/package.bak/libmcrypt/libmcrypt.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmcrypt -# -################################################################################ - -LIBMCRYPT_VERSION = 2.5.8 -LIBMCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/Libmcrypt/$(LIBMCRYPT_VERSION) -LIBMCRYPT_AUTORECONF = YES -LIBMCRYPT_INSTALL_STAGING = YES -LIBMCRYPT_LICENSE = LGPLv2.1 -LIBMCRYPT_LICENSE_FILES = COPYING.LIB -LIBMCRYPT_CONFIG_SCRIPTS = libmcrypt-config - -$(eval $(autotools-package)) diff --git a/package.bak/libmemcached/0001-disable-tests.patch b/package.bak/libmemcached/0001-disable-tests.patch deleted file mode 100644 index 6128306787..0000000000 --- a/package.bak/libmemcached/0001-disable-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -Disable the tests, cuts build time by half and avoids build issues -with extra dependencies. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmemcached-1.0.18.orig/Makefile.am libmemcached-1.0.18/Makefile.am ---- libmemcached-1.0.18.orig/Makefile.am 2014-07-19 09:24:45.246418899 -0300 -+++ libmemcached-1.0.18/Makefile.am 2014-07-19 09:25:12.701349345 -0300 -@@ -1,6 +1,6 @@ - # vim:ft=automake - --ACLOCAL_AMFLAGS= -I m4 -I libtest/m4 -+ACLOCAL_AMFLAGS= -I m4 - AM_YFLAGS= -d - - # includes append to these: -@@ -45,8 +45,6 @@ - include libmemcached-1.0/include.am - else - --include libtest/include.am -- - include libhashkit-1.0/include.am - include libmemcached-1.0/include.am - -@@ -76,7 +74,6 @@ - include libmemcachedinternal/util/include.am - include rpm/include.mk - include support/include.am --include tests/include.am - include util/include.am - include win32/include.am - -@@ -103,7 +100,7 @@ - @echo "Files that need to be either removed or checked in:" - @bzr unknowns - --clean-local: clean-libtest-check clean-docs-check clean-rpm -+clean-local: clean-docs-check clean-rpm - - - lcov: lcov-clean check diff --git a/package.bak/libmemcached/0002-disable-sanitizer.patch b/package.bak/libmemcached/0002-disable-sanitizer.patch deleted file mode 100644 index 108da22550..0000000000 --- a/package.bak/libmemcached/0002-disable-sanitizer.patch +++ /dev/null @@ -1,25 +0,0 @@ -Disable sanitizer checks, they're busted. - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmemcached-1.0.18.orig/m4/ax_harden_compiler_flags.m4 libmemcached-1.0.18/m4/ax_harden_compiler_flags.m4 ---- libmemcached-1.0.18.orig/m4/ax_harden_compiler_flags.m4 2014-11-13 08:07:09.011614311 -0300 -+++ libmemcached-1.0.18/m4/ax_harden_compiler_flags.m4 2014-11-13 08:07:52.406092440 -0300 -@@ -222,8 +222,6 @@ - # GCC 4.5 removed this. - # _APPEND_COMPILE_FLAGS_ERROR([-Wunreachable-code]) - -- _SET_SANITIZE_FLAGS -- - AS_IF([test "x$ax_enable_debug" = xno], - [AS_IF([test "x$ac_cv_vcs_checkout" = xyes], - [AS_IF([test "x${host_os}" != "xmingw"], -@@ -337,8 +335,6 @@ - _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all]) - ])])])]) - -- _SET_SANITIZE_FLAGS -- - AS_IF([test "x$ac_cv_warnings_as_errors" = xyes], - [AX_APPEND_FLAG([-Werror])]) - AC_LANG_POP([C++]) diff --git a/package.bak/libmemcached/0003-move-ac_config_aux_dir.patch b/package.bak/libmemcached/0003-move-ac_config_aux_dir.patch deleted file mode 100644 index 790aa93d29..0000000000 --- a/package.bak/libmemcached/0003-move-ac_config_aux_dir.patch +++ /dev/null @@ -1,25 +0,0 @@ -Move AC_CONFIG_AUX_DIR up a few lines so the autotools can find it - -This patch is based on the same solution adopted by Debian: - - https://lists.debian.org/debian-release/2014/11/msg01231.html - -Signed-off-by: Vicente Olivert Riera - -diff -rup a/configure.ac b/configure.ac ---- a/configure.ac 2014-02-09 11:52:42.000000000 +0000 -+++ b/configure.ac 2015-01-06 15:07:10.003074775 +0000 -@@ -13,11 +13,12 @@ m4_include([version.m4]) - AC_PREREQ([2.61]) - AC_INIT([libmemcached],VERSION_NUMBER,[http://libmemcached.org/]) - -+AC_CONFIG_AUX_DIR([build-aux]) -+ - # Setup the compilers early on - AC_PROG_CC([cc gcc clang]) - AC_PROG_CXX([c++ g++ clang++]) - --AC_CONFIG_AUX_DIR([build-aux]) - AC_CONFIG_MACRO_DIR([m4]) - - AC_CANONICAL_HOST diff --git a/package.bak/libmemcached/0004-disable-doc-and-man.patch b/package.bak/libmemcached/0004-disable-doc-and-man.patch deleted file mode 100644 index 9605095899..0000000000 --- a/package.bak/libmemcached/0004-disable-doc-and-man.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6c01bd3562cc18fbafdf950bbeb73a399c1adcdd Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 12 May 2015 00:00:02 +0200 -Subject: [PATCH] disable doc and man - -WARNING: master file /home/naourr/git/buildroot/test/libmemcached-bfin/build/libmemcached-1.0.18/docs/index.rst not found - -Exception occurred: - File "/usr/lib/python2.7/site-packages/sphinx/environment.py", line 1213, in get_doctree - f = open(doctree_filename, 'rb') -IOError: [Errno 2] No such file or directory: '/home/naourr/buildroot-test/test/libmemcached-bfin/build/libmemcached-1.0.18/man/.doctrees/hashkit_create.doctree' -The full traceback has been saved in /tmp/sphinx-err-JCIsnB.log, if you want to report the issue to the developers. -Please also report this if it was a user error, so that a better error message can be provided next time. -Either send bugs to the mailing list at , -or report them in the tracker at . Thanks! - -Signed-off-by: Romain Naour ---- - Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7f44102..cb7d058 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -55,8 +55,6 @@ endif - include libmemcachedutil-1.0/include.am - - include clients/include.am --include docs/include.am --include man/include.am - - if BUILD_LIBMEMCACHED_PROTOCOL - include example/include.am --- -1.9.3 - diff --git a/package.bak/libmemcached/Config.in b/package.bak/libmemcached/Config.in deleted file mode 100644 index 4af2b3b0e7..0000000000 --- a/package.bak/libmemcached/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBMEMCACHED - bool "libmemcached" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libMemcached is an open source C/C++ client library and tools - for the memcached server. - It has been designed to be light on memory usage, thread safe, - and provide full access to server side methods. - - http://libmemcached.org/libMemcached.html - -comment "libmemcached needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libmemcached/libmemcached.hash b/package.bak/libmemcached/libmemcached.hash deleted file mode 100644 index 85df58f01e..0000000000 --- a/package.bak/libmemcached/libmemcached.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://launchpad.net/libmemcached/1.0/1.0.18/+download/libmemcached-1.0.18.tar.gz/+md5 -md5 b3958716b4e53ddc5992e6c49d97e819 libmemcached-1.0.18.tar.gz diff --git a/package.bak/libmemcached/libmemcached.mk b/package.bak/libmemcached/libmemcached.mk deleted file mode 100644 index 36d0913962..0000000000 --- a/package.bak/libmemcached/libmemcached.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# libmemcached -# -################################################################################ - -LIBMEMCACHED_VERSION_MAJOR = 1.0 -LIBMEMCACHED_VERSION = $(LIBMEMCACHED_VERSION_MAJOR).18 -LIBMEMCACHED_SITE = http://launchpad.net/libmemcached/$(LIBMEMCACHED_VERSION_MAJOR)/$(LIBMEMCACHED_VERSION)/+download -LIBMEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' \ - ax_cv_check_cflags__Werror__fmudflapth=no \ - ax_cv_check_cxxflags__Werror__fmudflapth=no -LIBMEMCACHED_CONF_OPTS = --disable-dtrace -LIBMEMCACHED_INSTALL_STAGING = YES -LIBMEMCACHED_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBEVENT),libevent) -# For 0001-disable-tests.patch and 0002-disable-sanitizer.patch -LIBMEMCACHED_AUTORECONF = YES -LIBMEMCACHED_LICENSE = BSD-3c -LIBMEMCACHED_LICENSE_FILES = COPYING - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -LIBMEMCACHED_CONF_ENV += \ - ax_cv_check_cflags__Werror__fPIE=no \ - ax_cv_check_cflags__Werror__pie=no \ - ax_cv_check_cxxflags__Werror__fPIE=no \ - ax_cv_check_cxxflags__Werror__pie=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libmhash/Config.in b/package.bak/libmhash/Config.in deleted file mode 100644 index a9bd51a2c9..0000000000 --- a/package.bak/libmhash/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBMHASH - bool "libmhash" - help - Mhash is a free (under GNU Lesser GPL) library which provides - a uniform interface to a large number of hash algorithms. - These algorithms can be used to compute checksums, message digests, - and other signatures. - - http://mhash.sourceforge.net/ diff --git a/package.bak/libmhash/libmhash.hash b/package.bak/libmhash/libmhash.hash deleted file mode 100644 index 5ae5686652..0000000000 --- a/package.bak/libmhash/libmhash.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 56521c52a9033779154432d0ae47ad7198914785265e1f570cee21ab248dfef0 mhash-0.9.9.9.tar.bz2 diff --git a/package.bak/libmhash/libmhash.mk b/package.bak/libmhash/libmhash.mk deleted file mode 100644 index f7b8e72997..0000000000 --- a/package.bak/libmhash/libmhash.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libmhash -# -################################################################################ - -LIBMHASH_VERSION = 0.9.9.9 -LIBMHASH_SITE = http://downloads.sourceforge.net/project/mhash/mhash/$(LIBMHASH_VERSION) -LIBMHASH_SOURCE = mhash-$(LIBMHASH_VERSION).tar.bz2 -LIBMHASH_INSTALL_STAGING = YES -LIBMHASH_LICENSE = LGPLv2 -LIBMHASH_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmicrohttpd/Config.in b/package.bak/libmicrohttpd/Config.in deleted file mode 100644 index 302dbb7ac8..0000000000 --- a/package.bak/libmicrohttpd/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_LIBMICROHTTPD - bool "libmicrohttpd" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - GNU libmicrohttpd is a small C library that makes it easy to - run an HTTP server as part of another application. - - http://www.gnu.org/software/libmicrohttpd/ - -if BR2_PACKAGE_LIBMICROHTTPD - -config BR2_PACKAGE_LIBMICROHTTPD_SSL - bool "https support" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT - help - Enable HTTPS (SSL) support. - -comment "libmicrohttpd https support needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -endif - -comment "libmicrohttpd needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libmicrohttpd/libmicrohttpd.hash b/package.bak/libmicrohttpd/libmicrohttpd.hash deleted file mode 100644 index 5c15b9dfde..0000000000 --- a/package.bak/libmicrohttpd/libmicrohttpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 54797f6e763d417627f89f60e4ae0a431dab0523f92f83def23ea02d0defafea libmicrohttpd-0.9.52.tar.gz diff --git a/package.bak/libmicrohttpd/libmicrohttpd.mk b/package.bak/libmicrohttpd/libmicrohttpd.mk deleted file mode 100644 index 83791b34f7..0000000000 --- a/package.bak/libmicrohttpd/libmicrohttpd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# libmicrohttpd -# -################################################################################ - -LIBMICROHTTPD_VERSION = 0.9.52 -LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd -LIBMICROHTTPD_LICENSE_FILES = COPYING -LIBMICROHTTPD_INSTALL_STAGING = YES -LIBMICROHTTPD_CONF_OPTS = --disable-curl --disable-examples -LIBMICROHTTPD_CFLAGS = $(TARGET_CFLAGS) -std=c99 - -# gcc on arc and bfin doesn't define _REENTRANT when -pthread is -# passed while it should. Compensate this defiency here otherwise -# libmicrohttpd configure script doesn't find that thread support is -# enabled. -ifeq ($(BR2_arc)$(BR2_bfin),y) -LIBMICROHTTPD_CFLAGS += -D_REENTRANT -endif - -LIBMICROHTTPD_CONF_ENV += CFLAGS="$(LIBMICROHTTPD_CFLAGS)" - -ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -LIBMICROHTTPD_LICENSE = LGPLv2.1+ -LIBMICROHTTPD_DEPENDENCIES += host-pkgconf gnutls libgcrypt -LIBMICROHTTPD_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs gnutls`" -LIBMICROHTTPD_CONF_OPTS += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos -LIBMICROHTTPD_CONF_OPTS += --disable-https -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libminiupnpc/Config.in b/package.bak/libminiupnpc/Config.in deleted file mode 100644 index c241707392..0000000000 --- a/package.bak/libminiupnpc/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBMINIUPNPC - bool "libminiupnpc" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS - help - The UPnP protocol is supported by most home adsl/cable routers - and Microsoft Windows 2K/XP. The aim of the MiniUPnP project is - to bring a free software solution to support the "Internet - Gateway Device" part of the protocol. - - Miniupnpc aims at the simplest library possible, with the - smallest footprint and no dependencies to other libraries such - as XML parsers or HTTP implementations. All the code is pure - ANSI C. - - http://miniupnp.free.fr - -comment "libminiupnpc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package.bak/libminiupnpc/libminiupnpc.hash b/package.bak/libminiupnpc/libminiupnpc.hash deleted file mode 100644 index 985d69d45f..0000000000 --- a/package.bak/libminiupnpc/libminiupnpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d434ceb8986efbe199c5ca53f90ed53eab290b1e6d0530b717eb6fa49d61f93b miniupnpc-2.0.tar.gz diff --git a/package.bak/libminiupnpc/libminiupnpc.mk b/package.bak/libminiupnpc/libminiupnpc.mk deleted file mode 100644 index 0eb7cf6397..0000000000 --- a/package.bak/libminiupnpc/libminiupnpc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libminiupnpc -# -################################################################################ - -LIBMINIUPNPC_VERSION = 2.0 -LIBMINIUPNPC_SOURCE = miniupnpc-$(LIBMINIUPNPC_VERSION).tar.gz -LIBMINIUPNPC_SITE = http://miniupnp.free.fr/files -LIBMINIUPNPC_INSTALL_STAGING = YES -LIBMINIUPNPC_LICENSE = BSD-3c -LIBMINIUPNPC_LICENSE_FILES = LICENSE - -$(eval $(cmake-package)) diff --git a/package.bak/libmms/Config.in b/package.bak/libmms/Config.in deleted file mode 100644 index 11df6e5142..0000000000 --- a/package.bak/libmms/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBMMS - bool "libmms" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - LibMMS is a common library for parsing mms:// and mmsh:// - type network streams. These are commonly used to stream - Windows Media Video content over the web. LibMMS itself is - only for receiving MMS stream, it doesn't handle sending at - all. - - http://launchpad.net/libmms - -comment "libmms needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libmms/libmms.hash b/package.bak/libmms/libmms.hash deleted file mode 100644 index 69865f7c3e..0000000000 --- a/package.bak/libmms/libmms.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 01931b62172d7d7050fc9ef9b1b64162f3b6e9f6cc4415170192a32a0b7ea432 libmms-0.6.2.tar.gz diff --git a/package.bak/libmms/libmms.mk b/package.bak/libmms/libmms.mk deleted file mode 100644 index 01c8d67224..0000000000 --- a/package.bak/libmms/libmms.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libmms -# -################################################################################ - -LIBMMS_VERSION = 0.6.2 -LIBMMS_SITE = http://downloads.sourceforge.net/project/libmms/libmms/$(LIBMMS_VERSION) -LIBMMS_INSTALL_STAGING = YES -LIBMMS_DEPENDENCIES = host-pkgconf libglib2 -LIBMMS_LICENSE = LGPLv2.1+ -LIBMMS_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) diff --git a/package.bak/libmng/0001-jpeg-9a.patch b/package.bak/libmng/0001-jpeg-9a.patch deleted file mode 100644 index 5d651335c1..0000000000 --- a/package.bak/libmng/0001-jpeg-9a.patch +++ /dev/null @@ -1,22 +0,0 @@ -Adaptation from gentoo patch for libmng 2.0.3 -See https://bugs.gentoo.org/show_bug.cgi?id=520906 - -Signed-off-by: Gustavo Zacarias - -diff -Nura libmng-2.0.3.orig/libmng_types.h libmng-2.0.3/libmng_types.h ---- libmng-2.0.3.orig/libmng_types.h 2015-09-24 10:32:05.500984924 -0300 -+++ libmng-2.0.3/libmng_types.h 2015-09-24 10:33:11.145254771 -0300 -@@ -200,13 +200,6 @@ - #undef FAR /* possibly defined by zlib or lcms */ - #endif - #define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */ --/* There has been a change in jpeg-9 : */ --#if !defined(HAVE_BOOLEAN) && !defined(_WIN32) --#define HAVE_BOOLEAN --#endif --#ifndef _WIN32 --typedef int boolean; --#endif - /* For jpegsrc.v09a: */ - #include - #include diff --git a/package.bak/libmng/Config.in b/package.bak/libmng/Config.in deleted file mode 100644 index a0bd59c839..0000000000 --- a/package.bak/libmng/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBMNG - bool "libmng" - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_ZLIB - help - The reference library for reading, displaying, writing and - examining Multiple-Image Network Graphics. - - http://sourceforge.net/projects/libmng/ diff --git a/package.bak/libmng/libmng.hash b/package.bak/libmng/libmng.hash deleted file mode 100644 index a695cc3706..0000000000 --- a/package.bak/libmng/libmng.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/libmng/files/libmng-devel/2.0.3/ -md5 e9e899adb1b681b17f14d91e261878c5 libmng-2.0.3.tar.xz -sha1 0f141482ffcef6f8cd4413f945a59310ac2e49af libmng-2.0.3.tar.xz diff --git a/package.bak/libmng/libmng.mk b/package.bak/libmng/libmng.mk deleted file mode 100644 index 090fe18380..0000000000 --- a/package.bak/libmng/libmng.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libmng -# -################################################################################ - -LIBMNG_VERSION = 2.0.3 -LIBMNG_SITE = http://downloads.sourceforge.net/project/libmng/libmng-devel/$(LIBMNG_VERSION) -LIBMNG_SOURCE = libmng-$(LIBMNG_VERSION).tar.xz -LIBMNG_DEPENDENCIES = jpeg zlib -LIBMNG_CONF_OPTS = --without-lcms -LIBMNG_INSTALL_STAGING = YES -LIBMNG_LICENSE = libmng license -LIBMNG_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBMNG_DEPDENDENCIES += lcms2 -else -LIBMNG_CONF_OPTS += --without-lcms2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libmnl/Config.in b/package.bak/libmnl/Config.in deleted file mode 100644 index 5acfb2447e..0000000000 --- a/package.bak/libmnl/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBMNL - bool "libmnl" - help - libmnl is a minimalistic user-space library oriented - to Netlink developers. - - http://netfilter.org/projects/libmnl/ diff --git a/package.bak/libmnl/libmnl.hash b/package.bak/libmnl/libmnl.hash deleted file mode 100644 index 98385b857c..0000000000 --- a/package.bak/libmnl/libmnl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libmnl/libmnl-1.0.4.tar.bz2.{md5sum,sha1sum} -md5 be9b4b5328c6da1bda565ac5dffadb2d libmnl-1.0.4.tar.bz2 -sha1 2db40dea612e88c62fd321906be40ab5f8f1685a libmnl-1.0.4.tar.bz2 diff --git a/package.bak/libmnl/libmnl.mk b/package.bak/libmnl/libmnl.mk deleted file mode 100644 index 407c4f19ba..0000000000 --- a/package.bak/libmnl/libmnl.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libmnl -# -################################################################################ - -LIBMNL_VERSION = 1.0.4 -LIBMNL_SOURCE = libmnl-$(LIBMNL_VERSION).tar.bz2 -LIBMNL_SITE = http://netfilter.org/projects/libmnl/files -LIBMNL_INSTALL_STAGING = YES -LIBMNL_LICENSE = LGPLv2.1+ -LIBMNL_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmodbus/Config.in b/package.bak/libmodbus/Config.in deleted file mode 100644 index ccf11906fc..0000000000 --- a/package.bak/libmodbus/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBMODBUS - bool "libmodbus" - help - libmodbus is a free software library to send/receive data according - to the Modbus protocol. This library is written in C and supports - RTU (serial) and TCP (Ethernet) communications. - - http://libmodbus.org diff --git a/package.bak/libmodbus/libmodbus.hash b/package.bak/libmodbus/libmodbus.hash deleted file mode 100644 index 095164d613..0000000000 --- a/package.bak/libmodbus/libmodbus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 046d63f10f755e2160dc56ef681e5f5ad3862a57c1955fd82e0ce036b69471b6 libmodbus-3.0.6.tar.gz diff --git a/package.bak/libmodbus/libmodbus.mk b/package.bak/libmodbus/libmodbus.mk deleted file mode 100644 index 1f8c730362..0000000000 --- a/package.bak/libmodbus/libmodbus.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libmodbus -# -################################################################################ - -LIBMODBUS_VERSION = 3.0.6 -LIBMODBUS_SITE = http://libmodbus.org/releases -LIBMODBUS_LICENSE = LGPLv2.1+ -LIBMODBUS_LICENSE_FILES = COPYING.LESSER -LIBMODBUS_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libmodplug/Config.in b/package.bak/libmodplug/Config.in deleted file mode 100644 index cfc774a5de..0000000000 --- a/package.bak/libmodplug/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBMODPLUG - bool "libmodplug" - depends on BR2_INSTALL_LIBSTDCPP - help - MOD music file decoder - - http://modplug-xmms.sourceforge.net/ - -comment "libmodplug needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libmodplug/libmodplug.hash b/package.bak/libmodplug/libmodplug.hash deleted file mode 100644 index 0077e26ccd..0000000000 --- a/package.bak/libmodplug/libmodplug.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 77462d12ee99476c8645cb5511363e3906b88b33a6b54362b4dbc0f39aa2daad libmodplug-0.8.8.5.tar.gz diff --git a/package.bak/libmodplug/libmodplug.mk b/package.bak/libmodplug/libmodplug.mk deleted file mode 100644 index d9d74df50c..0000000000 --- a/package.bak/libmodplug/libmodplug.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libmodplug -# -################################################################################ - -LIBMODPLUG_VERSION = 0.8.8.5 -LIBMODPLUG_SITE = http://downloads.sourceforge.net/project/modplug-xmms/libmodplug/$(LIBMODPLUG_VERSION) -LIBMODPLUG_INSTALL_STAGING = YES -LIBMODPLUG_LICENSE = Public Domain -LIBMODPLUG_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmpd/Config.in b/package.bak/libmpd/Config.in deleted file mode 100644 index 1e3b860063..0000000000 --- a/package.bak/libmpd/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBMPD - bool "libmpd" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - High-level client library for accessing Music Player Daemon. - LibMpd is a library that provides high-level, callback-based - access to Music Player Daemon (mpd). - - http://gmpcwiki.sarine.nl/index.php?title=Libmpd - -comment "libmpd needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libmpd/libmpd.hash b/package.bak/libmpd/libmpd.hash deleted file mode 100644 index ca06c754fb..0000000000 --- a/package.bak/libmpd/libmpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fe20326b0d10641f71c4673fae637bf9222a96e1712f71f170fca2fc34bf7a83 libmpd-11.8.17.tar.gz diff --git a/package.bak/libmpd/libmpd.mk b/package.bak/libmpd/libmpd.mk deleted file mode 100644 index 882210cc27..0000000000 --- a/package.bak/libmpd/libmpd.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libmpd -# -################################################################################ - -LIBMPD_VERSION_MAJOR = 11.8 -LIBMPD_VERSION = $(LIBMPD_VERSION_MAJOR).17 -LIBMPD_SITE = http://download.sarine.nl/Programs/gmpc/$(LIBMPD_VERSION_MAJOR) -LIBMPD_INSTALL_STAGING = YES -LIBMPD_DEPENDENCIES = libglib2 -LIBMPD_LICENSE = GPLv2+ -LIBMPD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmpdclient/Config.in b/package.bak/libmpdclient/Config.in deleted file mode 100644 index a58c6c3457..0000000000 --- a/package.bak/libmpdclient/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBMPDCLIENT - bool "libmpdclient" - help - A stable, documented, asynchronous API library for interfacing MPD - in the C, C++ & Objective C languages. - - http://www.musicpd.org/libs/libmpdclient/ diff --git a/package.bak/libmpdclient/libmpdclient.hash b/package.bak/libmpdclient/libmpdclient.hash deleted file mode 100644 index 2fd20a41fb..0000000000 --- a/package.bak/libmpdclient/libmpdclient.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Verified against http://www.musicpd.org/download/libmpdclient/2/libmpdclient-2.10.tar.xz.sig, sha256 locally computed -sha256 4f08cde82dae70895f8e4532a6e9b54b201efd5591c6b5d6834895807ed2ff82 libmpdclient-2.10.tar.xz diff --git a/package.bak/libmpdclient/libmpdclient.mk b/package.bak/libmpdclient/libmpdclient.mk deleted file mode 100644 index db3ae0596e..0000000000 --- a/package.bak/libmpdclient/libmpdclient.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libmpdclient -# -################################################################################ - -LIBMPDCLIENT_VERSION_MAJOR = 2 -LIBMPDCLIENT_VERSION = $(LIBMPDCLIENT_VERSION_MAJOR).10 -LIBMPDCLIENT_SOURCE = libmpdclient-$(LIBMPDCLIENT_VERSION).tar.xz -LIBMPDCLIENT_SITE = http://www.musicpd.org/download/libmpdclient/$(LIBMPDCLIENT_VERSION_MAJOR) -LIBMPDCLIENT_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -LIBMPDCLIENT_INSTALL_STAGING = YES -LIBMPDCLIENT_LICENSE = BSD-3c -LIBMPDCLIENT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libmpeg2/0001-altivec.patch b/package.bak/libmpeg2/0001-altivec.patch deleted file mode 100644 index 4928a62e6d..0000000000 --- a/package.bak/libmpeg2/0001-altivec.patch +++ /dev/null @@ -1,23 +0,0 @@ -[PATCH] fix altivec.h detection - -Patch from Gentoo: - -http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/libmpeg2/files/libmpeg2-0.5.1-altivec.patch?revision=1.1&view=markup - -Signed-off-by: Peter Korsgaard ---- a/configure.ac.bak 2010-05-25 17:12:14.756245990 +0000 -+++ b/configure.ac 2010-05-25 17:11:51.629581723 +0000 -@@ -79,11 +79,10 @@ - CFLAGS="$OPT_CFLAGS $TRY_CFLAGS $CFLAGS" - AC_MSG_CHECKING([if is needed]) - AC_TRY_COMPILE([], -- [typedef vector int t; -- vec_ld(0, (unsigned char *)0);], -+ [vector int t; t = vec_add(t,t);], - [have_altivec=yes; AC_MSG_RESULT(no)], - [AC_TRY_COMPILE([#include ], -- [typedef vector int t; vec_ld(0, (unsigned char *)0);], -+ [vector int t; t = vec_add(t,t);], - [AC_DEFINE([HAVE_ALTIVEC_H],, - [Define to 1 if you have the header.]) - have_altivec=yes; AC_MSG_RESULT(yes)], diff --git a/package.bak/libmpeg2/0002-armv4l.patch b/package.bak/libmpeg2/0002-armv4l.patch deleted file mode 100644 index 70d45ef916..0000000000 --- a/package.bak/libmpeg2/0002-armv4l.patch +++ /dev/null @@ -1,24 +0,0 @@ -Patch taken from gentoo. - -Signed-off-by: Gustavo Zacarias - -diff -urNp libmpeg2.orig/libmpeg2/motion_comp_arm_s.S libmpeg2/libmpeg2/motion_comp_arm_s.S ---- libmpeg2.orig/libmpeg2/motion_comp_arm_s.S 2008-07-09 21:16:05.000000000 +0200 -+++ libmpeg2/libmpeg2/motion_comp_arm_s.S 2009-11-20 19:55:22.000000000 +0100 -@@ -19,6 +19,16 @@ - @ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -+@ Data preload is supported only by ARM V5TE and above -+ -+#if (defined (__ARM_ARCH_2__) || defined (__ARM_ARCH_3__) \ -+ || defined (__ARM_ARCH_3M__) || defined (__ARM_ARCH_4__) \ -+ || defined (__ARM_ARCH_4T__) || defined (__ARM_ARCH_5__) \ -+ || defined (__ARM_ARCH_5T__)) -+.macro pld reg -+.endm -+#endif -+ - .text - - @ ---------------------------------------------------------------- diff --git a/package.bak/libmpeg2/0003-fix-arm-detection.patch b/package.bak/libmpeg2/0003-fix-arm-detection.patch deleted file mode 100644 index 69ec4547de..0000000000 --- a/package.bak/libmpeg2/0003-fix-arm-detection.patch +++ /dev/null @@ -1,39 +0,0 @@ -Improve the ARM detection to work on Thumb-only architecture - -The ARM-specific assembly code doesn't build on Thumb-only -architectures such as ARMv7-M, but the configure script assumes that -if the host tuple is arm*, then it can build and use the ARM optimized -code. - -This patch improves the configure.ac detection logic, by building one -of the instruction of the optimized assembly code, and using this to -decide whether or not the optimizations should be enabled. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -101,8 +101,10 @@ - alpha*) - AC_DEFINE([ARCH_ALPHA],,[alpha architecture]);; - arm*) -- arm_conditional=: -- AC_DEFINE([ARCH_ARM],,[ARM architecture]);; -+ AC_TRY_LINK([], [asm(".syntax divided\nstmfd sp!,{r4-r11,lr}")], -+ [AC_DEFINE([ARCH_ARM],,[ARM architecture]) -+ use_arm_optimization=yes], -+ [use_arm_optimization=no]) - esac - elif test x"$CC" = x"tendracc"; then - dnl TenDRA portability checking compiler -@@ -122,7 +124,7 @@ - esac - fi - --AM_CONDITIONAL(ARCH_ARM, ${arm_conditional}) -+AM_CONDITIONAL(ARCH_ARM, test "${use_arm_optimization}" = "yes") - - dnl Checks for libtool - this must be done after we set cflags - AC_LIBTOOL_WIN32_DLL diff --git a/package.bak/libmpeg2/Config.in b/package.bak/libmpeg2/Config.in deleted file mode 100644 index 6d7ff67865..0000000000 --- a/package.bak/libmpeg2/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBMPEG2 - bool "libmpeg2" - help - MPEG1/MPEG2 video decoder library - - http://libmpeg2.sourceforge.net/ - -if BR2_PACKAGE_LIBMPEG2 - -config BR2_PACKAGE_LIBMPEG2_BINS - bool "mpeg2 binaries" - help - Install mpeg2dec, corrupt_mpeg2 and extract_mpeg2 programs as - well. - -endif diff --git a/package.bak/libmpeg2/libmpeg2.hash b/package.bak/libmpeg2/libmpeg2.hash deleted file mode 100644 index c2adb67de0..0000000000 --- a/package.bak/libmpeg2/libmpeg2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 dee22e893cb5fc2b2b6ebd60b88478ab8556cb3b93f9a0d7ce8f3b61851871d4 libmpeg2-0.5.1.tar.gz diff --git a/package.bak/libmpeg2/libmpeg2.mk b/package.bak/libmpeg2/libmpeg2.mk deleted file mode 100644 index 124c7499db..0000000000 --- a/package.bak/libmpeg2/libmpeg2.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# libmpeg2 -# -################################################################################ - -LIBMPEG2_VERSION = 0.5.1 -LIBMPEG2_SITE = http://libmpeg2.sourceforge.net/files -LIBMPEG2_LICENSE = GPLv2+ -LIBMPEG2_LICENSE_FILES = COPYING -LIBMPEG2_INSTALL_STAGING = YES -LIBMPEG2_AUTORECONF = YES -LIBMPEG2_CONF_OPTS = --without-x --disable-directx - -ifeq ($(BR2_PACKAGE_SDL),y) -LIBMPEG2_CONF_ENV += ac_cv_prog_SDLCONFIG=$(STAGING_DIR)/usr/bin/sdl-config -LIBMPEG2_CONF_OPTS += --enable-sdl -LIBMPEG2_DEPENDENCIES += sdl -else -LIBMPEG2_CONF_OPTS += --disable-sdl -endif - -ifneq ($(BR2_PACKAGE_LIBMPEG2_BINS),y) -define LIBMPEG2_REMOVE_BINS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/,\ - mpeg2dec corrupt_mpeg2 extract_mpeg2) -endef - -LIBMPEG2_POST_INSTALL_TARGET_HOOKS += LIBMPEG2_REMOVE_BINS -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnatpmp/Config.in b/package.bak/libnatpmp/Config.in deleted file mode 100644 index 879e5ee1ac..0000000000 --- a/package.bak/libnatpmp/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBNATPMP - bool "libnatpmp" - depends on !BR2_BINFMT_FLAT - depends on !BR2_STATIC_LIBS - help - libnatpmp is an attempt to make a portable and fully compliant - implementation of the NAT-PMP protocol for the client side. It - is based on non blocking sockets and all calls of the API are - asynchronous. It is therefore very easy to integrate the - NAT-PMP code to any event driven code. - - http://miniupnp.free.fr/libnatpmp.html - -comment "libnatpmp needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_BINFMT_FLAT diff --git a/package.bak/libnatpmp/libnatpmp.hash b/package.bak/libnatpmp/libnatpmp.hash deleted file mode 100644 index a5cab3ce26..0000000000 --- a/package.bak/libnatpmp/libnatpmp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e1aa9c4c4219bc06943d6b2130f664daee213fb262fcb94dd355815b8f4536b0 libnatpmp-20150609.tar.gz diff --git a/package.bak/libnatpmp/libnatpmp.mk b/package.bak/libnatpmp/libnatpmp.mk deleted file mode 100644 index cdd65e96cd..0000000000 --- a/package.bak/libnatpmp/libnatpmp.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# libnatpmp -# -################################################################################ - -LIBNATPMP_VERSION = 20150609 -LIBNATPMP_SITE = http://miniupnp.free.fr/files -LIBNATPMP_INSTALL_STAGING = YES -LIBNATPMP_LICENSE = BSD-3c -LIBNATPMP_LICENSE_FILES = LICENSE - -define LIBNATPMP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" -endef - -define LIBNATPMP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - PREFIX=$(STAGING_DIR) \ - HEADERS='declspec.h natpmp.h' \ - $(TARGET_CONFIGURE_OPTS) install -endef - -define LIBNATPMP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - PREFIX=$(TARGET_DIR) \ - $(TARGET_CONFIGURE_OPTS) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libndp/0001-ndptool.c-Fix-musl-build.patch b/package.bak/libndp/0001-ndptool.c-Fix-musl-build.patch deleted file mode 100644 index 547598c6ee..0000000000 --- a/package.bak/libndp/0001-ndptool.c-Fix-musl-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 561f80b9a848be923f37bf1afedbecf92da3b2e7 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 16:36:39 +0100 -Subject: [PATCH 1/1] ndptool.c: Fix musl build - -Fixes a build issue with the musl C library -http://autobuild.buildroot.net/results/d42/d42bebe51bbec38f131840b6bbefdc162f0ad194/build-end.log - -Patch sent upstream: https://github.com/jpirko/libndp/pull/7 - -Signed-off-by: Bernd Kuhls ---- - utils/ndptool.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/utils/ndptool.c b/utils/ndptool.c -index 04ec4e1..c6ef48c 100644 ---- a/utils/ndptool.c -+++ b/utils/ndptool.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - - enum verbosity_level { --- -2.7.0.rc3 - diff --git a/package.bak/libndp/Config.in b/package.bak/libndp/Config.in deleted file mode 100644 index 6639bb5e06..0000000000 --- a/package.bak/libndp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBNDP - bool "libndp" - help - This package contains a library which provides a wrapper - for IPv6 Neighbor Discovery Protocol. It also provides a tool - named ndptool for sending and receiving NDP messages. - - https://github.com/jpirko/libndp diff --git a/package.bak/libndp/libndp.hash b/package.bak/libndp/libndp.hash deleted file mode 100644 index 51e312dd79..0000000000 --- a/package.bak/libndp/libndp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 42c0a8938d4302c72a42e2d954deef7e4903bb3974da6804a929a3cd0b5b6aa7 libndp-v1.5.tar.gz diff --git a/package.bak/libndp/libndp.mk b/package.bak/libndp/libndp.mk deleted file mode 100644 index c880b7e664..0000000000 --- a/package.bak/libndp/libndp.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libndp -# -################################################################################ - -LIBNDP_VERSION = v1.5 -LIBNDP_SITE = $(call github,jpirko,libndp,$(LIBNDP_VERSION)) -LIBNDP_LICENSE = LGPLv2.1+ -LIBNDP_LICENSE_FILES = COPYING -LIBNDP_AUTORECONF = YES -LIBNDP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libnet/0001-support-musl-libc.patch b/package.bak/libnet/0001-support-musl-libc.patch deleted file mode 100644 index 0704157bb5..0000000000 --- a/package.bak/libnet/0001-support-musl-libc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ffd7fab744a9ad2893169a8fb6244074604d5d0d Mon Sep 17 00:00:00 2001 -From: rofl0r -Date: Tue, 12 Aug 2014 21:51:39 +0200 -Subject: [PATCH] Support musl libc, remove support for glibc < 2.1 - -The workarounds for glibc < 2.1 (was released february 1999) break the -build with musl libc. - -It is very unlikely that 2.0 or earlier is still in use, and if so, -1) that's a big security hole -2) code wouldnt compile anyway since noone tested build in the last decade -3) user of it wouldn't expect anyway to get bleeding edge sw built on it, - so he would just use the latest version that works for him. - -Closes #52 ---- - libnet/src/libnet_link_linux.c | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/libnet/src/libnet_link_linux.c b/libnet/src/libnet_link_linux.c -index 054458d..3c6df3c 100644 ---- a/src/libnet_link_linux.c -+++ b/src/libnet_link_linux.c -@@ -30,26 +30,15 @@ - #include - - #include --#if (__GLIBC__) - #include - #include --#else --#include --#include --#endif - - #if (HAVE_PACKET_SOCKET) - #ifndef SOL_PACKET - #define SOL_PACKET 263 - #endif /* SOL_PACKET */ --#if __GLIBC__ >= 2 && __GLIBC_MINOR >= 1 - #include - #include /* the L2 protocols */ --#else --#include --#include --#include /* The L2 protocols */ --#endif - #endif /* HAVE_PACKET_SOCKET */ - - #include "../include/libnet.h" diff --git a/package.bak/libnet/Config.in b/package.bak/libnet/Config.in deleted file mode 100644 index 7186972b7e..0000000000 --- a/package.bak/libnet/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBNET - bool "libnet" - help - libnet provides a portable framework for low-level network - packet construction. - - http://sourceforge.net/projects/libnet-dev diff --git a/package.bak/libnet/libnet.hash b/package.bak/libnet/libnet.hash deleted file mode 100644 index dd3349082d..0000000000 --- a/package.bak/libnet/libnet.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/libnet-dev/files/ -sha1 dffff71c325584fdcf99b80567b60f8ad985e34c libnet-1.1.6.tar.gz -md5 710296fe424a49344e5fcc0d09e53317 libnet-1.1.6.tar.gz diff --git a/package.bak/libnet/libnet.mk b/package.bak/libnet/libnet.mk deleted file mode 100644 index d13c4533b2..0000000000 --- a/package.bak/libnet/libnet.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libnet -# -################################################################################ - -LIBNET_VERSION = 1.1.6 -LIBNET_SITE = http://sourceforge.net/projects/libnet-dev/files -LIBNET_INSTALL_STAGING = YES -# PF_PACKET is always available on Linux -LIBNET_CONF_OPTS = libnet_cv_have_packet_socket=yes -LIBNET_LICENSE = BSD-2c, BSD-3c -LIBNET_LICENSE_FILES = doc/COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_acct/Config.in b/package.bak/libnetfilter_acct/Config.in deleted file mode 100644 index ecfef6dc64..0000000000 --- a/package.bak/libnetfilter_acct/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_ACCT - bool "libnetfilter_acct" - select BR2_PACKAGE_LIBMNL - help - libnetfilter_acct is the userspace library providing interface - to extended accounting infrastructure. - - http://www.netfilter.org/projects/libnetfilter_acct/ diff --git a/package.bak/libnetfilter_acct/libnetfilter_acct.hash b/package.bak/libnetfilter_acct/libnetfilter_acct.hash deleted file mode 100644 index 7c38664612..0000000000 --- a/package.bak/libnetfilter_acct/libnetfilter_acct.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_acct/libnetfilter_acct-1.0.3.tar.bz2.{md5sum,sha1sum} -md5 814b2972b2f5c740ff87510bc109168b libnetfilter_acct-1.0.3.tar.bz2 -sha1 4b9073e4aa989b0f000c8da1ab01b22fceed52b2 libnetfilter_acct-1.0.3.tar.bz2 diff --git a/package.bak/libnetfilter_acct/libnetfilter_acct.mk b/package.bak/libnetfilter_acct/libnetfilter_acct.mk deleted file mode 100644 index c2fa234778..0000000000 --- a/package.bak/libnetfilter_acct/libnetfilter_acct.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libnetfilter_acct -# -################################################################################ - -LIBNETFILTER_ACCT_VERSION = 1.0.3 -LIBNETFILTER_ACCT_SOURCE = libnetfilter_acct-$(LIBNETFILTER_ACCT_VERSION).tar.bz2 -LIBNETFILTER_ACCT_SITE = http://www.netfilter.org/projects/libnetfilter_acct/files -LIBNETFILTER_ACCT_INSTALL_STAGING = YES -LIBNETFILTER_ACCT_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_ACCT_LICENSE = LGPLv2.1+ -LIBNETFILTER_ACCT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_conntrack/Config.in b/package.bak/libnetfilter_conntrack/Config.in deleted file mode 100644 index f9a407ff15..0000000000 --- a/package.bak/libnetfilter_conntrack/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_CONNTRACK - bool "libnetfilter_conntrack" - select BR2_PACKAGE_LIBMNL - select BR2_PACKAGE_LIBNFNETLINK - help - libnetfilter_conntrack is a userspace library providing - a programming interface (API) to the in-kernel - connection tracking state table. - - http://www.netfilter.org/projects/libnetfilter_conntrack/ diff --git a/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.hash b/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.hash deleted file mode 100644 index de9d1d3fcf..0000000000 --- a/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_conntrack/libnetfilter_conntrack-1.0.6.tar.bz2.{md5sum,sha1sum} -md5 7139c5f408dd9606ffecfd5dcda8175b libnetfilter_conntrack-1.0.6.tar.bz2 -sha1 015f985a8e171889a67769ba02d070eca53bac07 libnetfilter_conntrack-1.0.6.tar.bz2 diff --git a/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.mk b/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.mk deleted file mode 100644 index ec05f6dc32..0000000000 --- a/package.bak/libnetfilter_conntrack/libnetfilter_conntrack.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libnetfilter_conntrack -# -################################################################################ - -LIBNETFILTER_CONNTRACK_VERSION = 1.0.6 -LIBNETFILTER_CONNTRACK_SOURCE = libnetfilter_conntrack-$(LIBNETFILTER_CONNTRACK_VERSION).tar.bz2 -LIBNETFILTER_CONNTRACK_SITE = http://www.netfilter.org/projects/libnetfilter_conntrack/files -LIBNETFILTER_CONNTRACK_INSTALL_STAGING = YES -LIBNETFILTER_CONNTRACK_DEPENDENCIES = host-pkgconf libnfnetlink libmnl -LIBNETFILTER_CONNTRACK_LICENSE = GPLv2+ -LIBNETFILTER_CONNTRACK_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_cthelper/0001-uclinux.patch b/package.bak/libnetfilter_cthelper/0001-uclinux.patch deleted file mode 100644 index 7a6ca70b53..0000000000 --- a/package.bak/libnetfilter_cthelper/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d028334281b218209412ec6e1dba56ca96320bd9 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:08:29 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d52b1ce..9389b70 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package.bak/libnetfilter_cthelper/Config.in b/package.bak/libnetfilter_cthelper/Config.in deleted file mode 100644 index 571883df6a..0000000000 --- a/package.bak/libnetfilter_cthelper/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_CTHELPER - bool "libnetfilter_cthelper" - select BR2_PACKAGE_LIBMNL - help - libnetfilter_cthelper is the userspace library that provides - the programming interface to the user-space helper infrastructure - available since Linux kernel 3.6. - - http://www.netfilter.org/projects/libnetfilter_cthelper/ diff --git a/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.hash b/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.hash deleted file mode 100644 index 5108652638..0000000000 --- a/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_cthelper/libnetfilter_cthelper-1.0.0.tar.bz2.{md5sum,sha1sum} -md5 b2efab1a3a198a5add448960ba011acd libnetfilter_cthelper-1.0.0.tar.bz2 -sha1 5d0a82794bd46aafde20c16800edca23d563de66 libnetfilter_cthelper-1.0.0.tar.bz2 diff --git a/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.mk b/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.mk deleted file mode 100644 index 00388a5c99..0000000000 --- a/package.bak/libnetfilter_cthelper/libnetfilter_cthelper.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libnetfilter_cthelper -# -################################################################################ - -LIBNETFILTER_CTHELPER_VERSION = 1.0.0 -LIBNETFILTER_CTHELPER_SOURCE = libnetfilter_cthelper-$(LIBNETFILTER_CTHELPER_VERSION).tar.bz2 -LIBNETFILTER_CTHELPER_SITE = http://www.netfilter.org/projects/libnetfilter_cthelper/files -LIBNETFILTER_CTHELPER_INSTALL_STAGING = YES -LIBNETFILTER_CTHELPER_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_CTHELPER_AUTORECONF = YES -LIBNETFILTER_CTHELPER_LICENSE = GPLv2+ -LIBNETFILTER_CTHELPER_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_cttimeout/0001-uclinux.patch b/package.bak/libnetfilter_cttimeout/0001-uclinux.patch deleted file mode 100644 index 5d462d8fec..0000000000 --- a/package.bak/libnetfilter_cttimeout/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d8d2ec14bc192f998afae2b71c69248e73518ddf Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:09:14 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index d79e941..aeb6ad0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -22,7 +22,7 @@ AC_DISABLE_STATIC - LT_INIT - CHECK_GCC_FVISIBILITY - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package.bak/libnetfilter_cttimeout/Config.in b/package.bak/libnetfilter_cttimeout/Config.in deleted file mode 100644 index 333919be13..0000000000 --- a/package.bak/libnetfilter_cttimeout/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT - bool "libnetfilter_cttimeout" - select BR2_PACKAGE_LIBMNL - help - libnetfilter_cttimeout is the userspace library that provides - the programming interface to the fine-grain - connection tracking timeout infrastructure. - - http://www.netfilter.org/projects/libnetfilter_cttimeout/ diff --git a/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.hash b/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.hash deleted file mode 100644 index 7749f96ec8..0000000000 --- a/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_cttimeout/libnetfilter_cttimeout-1.0.0.tar.bz2.{md5sum,sha1sum} -md5 7697437fc9ebb6f6b83df56a633db7f9 libnetfilter_cttimeout-1.0.0.tar.bz2 -sha1 24cba24b0371e80007be4ea0fa9d872df63b8a7a libnetfilter_cttimeout-1.0.0.tar.bz2 diff --git a/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.mk b/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.mk deleted file mode 100644 index d85a8d2bd7..0000000000 --- a/package.bak/libnetfilter_cttimeout/libnetfilter_cttimeout.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libnetfilter_cttimeout -# -################################################################################ - -LIBNETFILTER_CTTIMEOUT_VERSION = 1.0.0 -LIBNETFILTER_CTTIMEOUT_SOURCE = libnetfilter_cttimeout-$(LIBNETFILTER_CTTIMEOUT_VERSION).tar.bz2 -LIBNETFILTER_CTTIMEOUT_SITE = http://www.netfilter.org/projects/libnetfilter_cttimeout/files -LIBNETFILTER_CTTIMEOUT_INSTALL_STAGING = YES -LIBNETFILTER_CTTIMEOUT_DEPENDENCIES = host-pkgconf libmnl -LIBNETFILTER_CTTIMEOUT_AUTORECONF = YES -LIBNETFILTER_CTTIMEOUT_LICENSE = GPLv2+ -LIBNETFILTER_CTTIMEOUT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_log/0001-uclinux.patch b/package.bak/libnetfilter_log/0001-uclinux.patch deleted file mode 100644 index 75d4a1e9d1..0000000000 --- a/package.bak/libnetfilter_log/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e36a2377e7ec50f6f675eb41f79edcda6ddebe5c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:48:50 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e6e1317..189a753 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -20,7 +20,7 @@ AC_PROG_INSTALL - AC_PROG_LN_S - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package.bak/libnetfilter_log/Config.in b/package.bak/libnetfilter_log/Config.in deleted file mode 100644 index 927cd0aae1..0000000000 --- a/package.bak/libnetfilter_log/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_LOG - bool "libnetfilter_log" - select BR2_PACKAGE_LIBNFNETLINK - help - libnetfilter_log is a userspace library providing interface - to packets that have been logged by the kernel packet filter. - - http://www.netfilter.org/projects/libnetfilter_log/ diff --git a/package.bak/libnetfilter_log/libnetfilter_log.hash b/package.bak/libnetfilter_log/libnetfilter_log.hash deleted file mode 100644 index 4fe6a9b8b6..0000000000 --- a/package.bak/libnetfilter_log/libnetfilter_log.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_log/libnetfilter_log-1.0.1.tar.bz2.{md5sum,sha1sum} -md5 2a4bb0654ae675a52d2e8d1c06090b94 libnetfilter_log-1.0.1.tar.bz2 -sha1 0b95bcb1ad15eea906fa3607cd6c2290bd48d5bd libnetfilter_log-1.0.1.tar.bz2 diff --git a/package.bak/libnetfilter_log/libnetfilter_log.mk b/package.bak/libnetfilter_log/libnetfilter_log.mk deleted file mode 100644 index a448c547c4..0000000000 --- a/package.bak/libnetfilter_log/libnetfilter_log.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libnetfilter_log -# -################################################################################ - -LIBNETFILTER_LOG_VERSION = 1.0.1 -LIBNETFILTER_LOG_SOURCE = libnetfilter_log-$(LIBNETFILTER_LOG_VERSION).tar.bz2 -LIBNETFILTER_LOG_SITE = http://www.netfilter.org/projects/libnetfilter_log/files -LIBNETFILTER_LOG_INSTALL_STAGING = YES -LIBNETFILTER_LOG_DEPENDENCIES = host-pkgconf libnfnetlink -LIBNETFILTER_LOG_AUTORECONF = YES -LIBNETFILTER_LOG_LICENSE = GPLv2+ -LIBNETFILTER_LOG_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnetfilter_queue/0001-uclinux.patch b/package.bak/libnetfilter_queue/0001-uclinux.patch deleted file mode 100644 index 21895d9b0e..0000000000 --- a/package.bak/libnetfilter_queue/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 311b60655761f6f3c4fe44cf6eff63427283f25e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 16:13:58 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 07747a6..289868f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,7 @@ AC_PROG_INSTALL - CHECK_GCC_FVISIBILITY - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package.bak/libnetfilter_queue/0002-musl.patch b/package.bak/libnetfilter_queue/0002-musl.patch deleted file mode 100644 index 3765d58af3..0000000000 --- a/package.bak/libnetfilter_queue/0002-musl.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 5348da83403383a60831f4c297841afb98692887 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 14:45:46 +0200 -Subject: [PATCH] extra: Define _GNU_SOURCE to get members of tcphdr&ucphdr - -The source uses linux names for members of tcphdr. For example -"source" instead of "th_sport", ... musl libc's headers need -_GNU_SOURCE defined in order to expose these. - -Signed-off-by: Felix Janda -Signed-off-by: Pablo Neira Ayuso -[yann.morin.1998@free.fr: backported from upstream] -Signed-off-by: "Yann E. MORIN" ---- - src/extra/tcp.c | 1 + - src/extra/udp.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/src/extra/tcp.c b/src/extra/tcp.c -index bf161aa..d1cd79d 100644 ---- a/src/extra/tcp.c -+++ b/src/extra/tcp.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - - #include -diff --git a/src/extra/udp.c b/src/extra/udp.c -index 6e6baed..8c44a66 100644 ---- a/src/extra/udp.c -+++ b/src/extra/udp.c -@@ -14,6 +14,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - - #include --- -1.9.1 - diff --git a/package.bak/libnetfilter_queue/Config.in b/package.bak/libnetfilter_queue/Config.in deleted file mode 100644 index e93e8ea374..0000000000 --- a/package.bak/libnetfilter_queue/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBNETFILTER_QUEUE - bool "libnetfilter_queue" - select BR2_PACKAGE_LIBNFNETLINK - select BR2_PACKAGE_LIBMNL - help - libnetfilter_queue is the userspace library that provides - the programming interface to the fine-grain - connection tracking timeout infrastructure. - - http://www.netfilter.org/projects/libnetfilter_queue/ diff --git a/package.bak/libnetfilter_queue/libnetfilter_queue.hash b/package.bak/libnetfilter_queue/libnetfilter_queue.hash deleted file mode 100644 index 4ea37216c7..0000000000 --- a/package.bak/libnetfilter_queue/libnetfilter_queue.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnetfilter_queue/libnetfilter_queue-1.0.2.tar.bz2.{md5sum,sha1sum} -md5 df09befac35cb215865b39a36c96a3fa libnetfilter_queue-1.0.2.tar.bz2 -sha1 8cc0b8ed33162281bc9fa8bcfa8c9dcb08848ff9 libnetfilter_queue-1.0.2.tar.bz2 diff --git a/package.bak/libnetfilter_queue/libnetfilter_queue.mk b/package.bak/libnetfilter_queue/libnetfilter_queue.mk deleted file mode 100644 index d788fd1575..0000000000 --- a/package.bak/libnetfilter_queue/libnetfilter_queue.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libnetfilter_queue -# -################################################################################ - -LIBNETFILTER_QUEUE_VERSION = 1.0.2 -LIBNETFILTER_QUEUE_SOURCE = libnetfilter_queue-$(LIBNETFILTER_QUEUE_VERSION).tar.bz2 -LIBNETFILTER_QUEUE_SITE = http://www.netfilter.org/projects/libnetfilter_queue/files -LIBNETFILTER_QUEUE_INSTALL_STAGING = YES -LIBNETFILTER_QUEUE_DEPENDENCIES = host-pkgconf libnfnetlink libmnl -LIBNETFILTER_QUEUE_AUTORECONF = YES -LIBNETFILTER_QUEUE_LICENSE = GPLv2+ -LIBNETFILTER_QUEUE_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnfc/0001-build-systems-make-example-build-optional.patch b/package.bak/libnfc/0001-build-systems-make-example-build-optional.patch deleted file mode 100644 index 06577c58ec..0000000000 --- a/package.bak/libnfc/0001-build-systems-make-example-build-optional.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 40a4871b171293d98acb40cf54be9ee9b78a3244 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Wed, 6 Jun 2012 00:49:25 +0200 -Subject: [PATCH 1/1] build systems: make example build optional - -This patch makes example build optional for both cmake and autotools build -systems. - -In order to keep the former behavior, example build is enabled by default. - -Signed-off-by: Samuel Martin - -diff -Nurp a/CMakeLists.txt b/CMakeLists.txt ---- a/CMakeLists.txt 2013-12-08 18:51:01.000000000 +0000 -+++ b/CMakeLists.txt 2014-01-08 12:51:42.435096403 +0000 -@@ -39,6 +39,7 @@ IF(LIBNFC_ENVVARS) - ADD_DEFINITIONS(-DENVVARS) - ENDIF(LIBNFC_ENVVARS) - -+SET(BUILD_EXAMPLES ON CACHE BOOL "Build examples") - SET(LIBNFC_DEBUG_MODE OFF CACHE BOOL "Debug mode") - IF(LIBNFC_DEBUG_MODE) - ADD_DEFINITIONS(-DDEBUG) -@@ -155,7 +156,10 @@ ENDIF(WIN32) - ADD_SUBDIRECTORY(libnfc) - ADD_SUBDIRECTORY(include) - ADD_SUBDIRECTORY(utils) --ADD_SUBDIRECTORY(examples) -+ -+IF(BUILD_EXAMPLES) -+ ADD_SUBDIRECTORY(examples) -+ENDIF(BUILD_EXAMPLES) - - # Binary Package - IF(WIN32) -diff -Nurp a/Makefile.am b/Makefile.am ---- a/Makefile.am 2013-12-08 18:51:01.000000000 +0000 -+++ b/Makefile.am 2014-01-08 12:52:12.807018593 +0000 -@@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4 - - AM_CFLAGS = $(LIBNFC_CFLAGS) - --SUBDIRS = libnfc utils examples include contrib cmake test -+SUBDIRS = libnfc utils -+ -+if EXAMPLE_ENABLED -+SUBDIRS += examples -+endif -+ -+SUBDIRS += include contrib cmake test - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = libnfc.pc -diff -Nurp a/configure.ac b/configure.ac ---- a/configure.ac 2013-12-08 18:51:01.000000000 +0000 -+++ b/configure.ac 2014-01-08 12:53:02.054872564 +0000 -@@ -142,6 +142,14 @@ then - fi - AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes]) - -+# Example build (default: yes) -+AC_ARG_ENABLE([example],AS_HELP_STRING([--enable-example],[Enable example build.]),[enable_example=$enableval],[enable_example="yes"]) -+ -+AC_MSG_CHECKING(for example build) -+AC_MSG_RESULT($enable_example) -+ -+AM_CONDITIONAL(EXAMPLE_ENABLED, [test x"$enable_example" = xyes]) -+ - # Dependencies - PKG_CONFIG_REQUIRES="" - -@@ -160,7 +168,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ - fi - AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"]) - -+if test x"$enable_example" = "xyes" -+then - AC_CHECK_READLINE -+fi - - # Help us to write great code ;-) - CFLAGS="$CFLAGS -Wall -pedantic -Wextra" diff --git a/package.bak/libnfc/Config.in b/package.bak/libnfc/Config.in deleted file mode 100644 index 1707f21c32..0000000000 --- a/package.bak/libnfc/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBNFC - bool "libnfc" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Public platform independent Near Field Communication (NFC) library. - - http://www.libnfc.org/ - -if BR2_PACKAGE_LIBNFC - -config BR2_PACKAGE_LIBNFC_EXAMPLES - bool "build libnfc examples" - select BR2_PACKAGE_READLINE - -endif - -comment "libnfc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libnfc/libnfc.hash b/package.bak/libnfc/libnfc.hash deleted file mode 100644 index 307e04929a..0000000000 --- a/package.bak/libnfc/libnfc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 945e74d8e27683f9b8a6f6e529557b305d120df347a960a6a7ead6cb388f4072 libnfc-1.7.1.tar.bz2 diff --git a/package.bak/libnfc/libnfc.mk b/package.bak/libnfc/libnfc.mk deleted file mode 100644 index aceedb09ae..0000000000 --- a/package.bak/libnfc/libnfc.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libnfc -# -################################################################################ - -LIBNFC_VERSION = 1.7.1 -LIBNFC_SOURCE = libnfc-$(LIBNFC_VERSION).tar.bz2 -LIBNFC_SITE = https://github.com/nfc-tools/libnfc/releases/download/libnfc-$(LIBNFC_VERSION) -LIBNFC_LICENSE = LGPLv3+ -LIBNFC_LICENSE_FILES = COPYING -LIBNFC_AUTORECONF = YES -LIBNFC_INSTALL_STAGING = YES - -LIBNFC_DEPENDENCIES = host-pkgconf libusb libusb-compat - -# N.B. The acr122 driver requires pcsc-lite. -LIBNFC_CONF_OPTS = --with-drivers=arygon,pn53x_usb - -ifeq ($(BR2_PACKAGE_LIBNFC_EXAMPLES),y) -LIBNFC_CONF_OPTS += --enable-example -LIBNFC_DEPENDENCIES += readline -else -LIBNFC_CONF_OPTS += --disable-example -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnfnetlink/0001-uclinux.patch b/package.bak/libnfnetlink/0001-uclinux.patch deleted file mode 100644 index b15201283a..0000000000 --- a/package.bak/libnfnetlink/0001-uclinux.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8e5a9d8f32c9646d01d8c84e979892dfd28a7f7c Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 10 Sep 2013 15:35:22 -0300 -Subject: [PATCH] configure: uclinux is also linux - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 0926a1c..b979772 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -18,7 +18,7 @@ AC_DISABLE_STATIC - AM_PROG_LIBTOOL - - case "$host" in --*-*-linux*) ;; -+*-*-linux* | *-*-uclinux*) ;; - *) AC_MSG_ERROR([Linux only, dude!]);; - esac - --- -1.8.1.5 - diff --git a/package.bak/libnfnetlink/0002-musl.patch b/package.bak/libnfnetlink/0002-musl.patch deleted file mode 100644 index bee7898aae..0000000000 --- a/package.bak/libnfnetlink/0002-musl.patch +++ /dev/null @@ -1,32 +0,0 @@ -Include to get the u_int* definitions - -This is needed to fix the build with the musl C library, and this -patch comes from -http://git.alpinelinux.org/cgit/aports/plain/main/libnfnetlink/musl-fix-includes.patch. - -It will no longer be needed with upcoming upstream releases of -libnfnetlink, since they have switched to use the types -instead. However this change was too invasive to backport. - -Signed-off-by: Thomas Petazzoni - ---- libnfnetlink-1.0.1.orig/include/libnfnetlink/linux_nfnetlink.h -+++ libnfnetlink-1.0.1/include/libnfnetlink/linux_nfnetlink.h -@@ -1,6 +1,6 @@ - #ifndef _NFNETLINK_H - #define _NFNETLINK_H --#include -+#include - #include - - enum nfnetlink_groups { ---- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h -+++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h -@@ -15,6 +15,7 @@ - #define aligned_u64 unsigned long long __attribute__((aligned(8))) - #endif - -+#include - #include /* for sa_family_t */ - #include - #include diff --git a/package.bak/libnfnetlink/Config.in b/package.bak/libnfnetlink/Config.in deleted file mode 100644 index fa247c5957..0000000000 --- a/package.bak/libnfnetlink/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBNFNETLINK - bool "libnfnetlink" - help - libnfnetlink is the low-level library for netfilter related - kernel/userspace communication. - It provides a generic messaging infrastructure for in-kernel - netfilter subsystems (such as nfnetlink_log, nfnetlink_queue, - nfnetlink_conntrack) and their respective users - and/or management tools in userspace. - - http://www.netfilter.org/projects/libnfnetlink/ diff --git a/package.bak/libnfnetlink/libnfnetlink.hash b/package.bak/libnfnetlink/libnfnetlink.hash deleted file mode 100644 index 93844f22ee..0000000000 --- a/package.bak/libnfnetlink/libnfnetlink.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/libnfnetlink/libnfnetlink-1.0.1.tar.bz2.{md5sum,sha1sum} -md5 98927583d2016a9fb1936fed992e2c5e libnfnetlink-1.0.1.tar.bz2 -sha1 27ae2dfbd976e28cb7a417f9e946c901f512dd9a libnfnetlink-1.0.1.tar.bz2 diff --git a/package.bak/libnfnetlink/libnfnetlink.mk b/package.bak/libnfnetlink/libnfnetlink.mk deleted file mode 100644 index 6f69a81a98..0000000000 --- a/package.bak/libnfnetlink/libnfnetlink.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libnfnetlink -# -################################################################################ - -LIBNFNETLINK_VERSION = 1.0.1 -LIBNFNETLINK_SOURCE = libnfnetlink-$(LIBNFNETLINK_VERSION).tar.bz2 -LIBNFNETLINK_SITE = http://www.netfilter.org/projects/libnfnetlink/files -LIBNFNETLINK_AUTORECONF = YES -LIBNFNETLINK_INSTALL_STAGING = YES -LIBNFNETLINK_LICENSE = GPLv2 -LIBNFNETLINK_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libnfs/Config.in b/package.bak/libnfs/Config.in deleted file mode 100644 index 2a1ef03cd7..0000000000 --- a/package.bak/libnfs/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBNFS - bool "libnfs" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - nfs userspace implementation. - - http://github.com/sahlberg/libnfs - -comment "libnfs needs a toolchain w/ threads" - depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) diff --git a/package.bak/libnfs/libnfs.hash b/package.bak/libnfs/libnfs.hash deleted file mode 100644 index 27a9e5d349..0000000000 --- a/package.bak/libnfs/libnfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7f6c62a05c7e0f0749f2b13f178a4ed7aaf17bd09e65a10bb147bfe9807da272 libnfs-libnfs-1.10.0.tar.gz diff --git a/package.bak/libnfs/libnfs.mk b/package.bak/libnfs/libnfs.mk deleted file mode 100644 index e49656b7bf..0000000000 --- a/package.bak/libnfs/libnfs.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libnfs -# -################################################################################ - -LIBNFS_VERSION = libnfs-1.10.0 -LIBNFS_SITE = $(call github,sahlberg,libnfs,$(LIBNFS_VERSION)) -LIBNFS_INSTALL_STAGING = YES -LIBNFS_AUTORECONF = YES -LIBNFS_MAKE = $(MAKE1) -LIBNFS_LICENSE = LGPLv2.1+ -LIBNFS_LICENSE_FILES = LICENCE-LGPL-2.1.txt -LIBNFS_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LIBNFS_DEPENDENCIES += libtirpc -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch b/package.bak/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch deleted file mode 100644 index 6f5be4e7ef..0000000000 --- a/package.bak/libnftnl/0001-Rename-xfree-to-libnftnl_xfree-to-avoid-symbol-namin.patch +++ /dev/null @@ -1,910 +0,0 @@ -From 610d015143e88629eab07067a4ae0c1d7548cfaf Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 2 Jun 2016 23:03:27 -0300 -Subject: [PATCH] Rename xfree() to libnftnl_xfree() to avoid symbol naming - conflict - -When ELF binaries and shared libraries are used, the internal -functions of libnftnl such as xfree() are not visible to the outside -world (their visibility is 'hidden'). Therefore, the fact that other -programs (especially nftables) may have symbols with the same name -does not cause any problem. - -However, when doing static linking on a non-ELF platform (such as -Blackfin, which uses the FLAT binary format), there is no way of -encoding this visibility. Therefore, the xfree() symbols of libnftnl -becomes visible to the outside world, causing a conflict with the -xfree() symbol defined by nftables. - -To solve this, this patch renames the libnftnl xfree() function to -libnftnl_xfree(). - -Signed-off-by: Thomas Petazzoni -[Gustavo: update for version 1.0.7] -Signed-off-by: Gustavo Zacarias ---- - include/utils.h | 2 +- - src/chain.c | 36 ++++++++++++++++++------------------ - src/common.c | 2 +- - src/expr.c | 4 ++-- - src/expr/data_reg.c | 2 +- - src/expr/dynset.c | 2 +- - src/expr/immediate.c | 2 +- - src/expr/log.c | 6 +++--- - src/expr/lookup.c | 2 +- - src/expr/match.c | 6 +++--- - src/expr/target.c | 6 +++--- - src/gen.c | 2 +- - src/object.c | 14 +++++++------- - src/rule.c | 32 ++++++++++++++++---------------- - src/ruleset.c | 2 +- - src/set.c | 26 +++++++++++++------------- - src/set_elem.c | 28 ++++++++++++++-------------- - src/table.c | 14 +++++++------- - src/trace.c | 14 +++++++------- - src/udata.c | 2 +- - src/utils.c | 2 +- - 21 files changed, 103 insertions(+), 103 deletions(-) - -diff --git a/include/utils.h b/include/utils.h -index 924df32..f02fce7 100644 ---- a/include/utils.h -+++ b/include/utils.h -@@ -19,7 +19,7 @@ - - #define __noreturn __attribute__((__noreturn__)) - --#define xfree(ptr) free((void *)ptr); -+#define nftnl_xfree(ptr) free((void *)ptr); - - #define div_round_up(n, d) (((n) + (d) - 1) / (d)) - -diff --git a/src/chain.c b/src/chain.c -index 49cd094..444cb79 100644 ---- a/src/chain.c -+++ b/src/chain.c -@@ -96,14 +96,14 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_alloc, nft_chain_alloc); - void nftnl_chain_free(const struct nftnl_chain *c) - { - if (c->flags & (1 << NFTNL_CHAIN_NAME)) -- xfree(c->name); -+ nftnl_xfree(c->name); - if (c->flags & (1 << NFTNL_CHAIN_TABLE)) -- xfree(c->table); -+ nftnl_xfree(c->table); - if (c->flags & (1 << NFTNL_CHAIN_TYPE)) -- xfree(c->type); -+ nftnl_xfree(c->type); - if (c->flags & (1 << NFTNL_CHAIN_DEV)) -- xfree(c->dev); -- xfree(c); -+ nftnl_xfree(c->dev); -+ nftnl_xfree(c); - } - EXPORT_SYMBOL_ALIAS(nftnl_chain_free, nft_chain_free); - -@@ -120,15 +120,15 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) - - switch (attr) { - case NFTNL_CHAIN_NAME: -- xfree(c->name); -+ nftnl_xfree(c->name); - break; - case NFTNL_CHAIN_TABLE: -- xfree(c->table); -+ nftnl_xfree(c->table); - break; - case NFTNL_CHAIN_USE: - break; - case NFTNL_CHAIN_TYPE: -- xfree(c->type); -+ nftnl_xfree(c->type); - break; - case NFTNL_CHAIN_HOOKNUM: - case NFTNL_CHAIN_PRIO: -@@ -139,7 +139,7 @@ void nftnl_chain_unset(struct nftnl_chain *c, uint16_t attr) - case NFTNL_CHAIN_FAMILY: - break; - case NFTNL_CHAIN_DEV: -- xfree(c->dev); -+ nftnl_xfree(c->dev); - break; - default: - return; -@@ -168,7 +168,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - switch(attr) { - case NFTNL_CHAIN_NAME: - if (c->flags & (1 << NFTNL_CHAIN_NAME)) -- xfree(c->name); -+ nftnl_xfree(c->name); - - c->name = strdup(data); - if (!c->name) -@@ -176,7 +176,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - break; - case NFTNL_CHAIN_TABLE: - if (c->flags & (1 << NFTNL_CHAIN_TABLE)) -- xfree(c->table); -+ nftnl_xfree(c->table); - - c->table = strdup(data); - if (!c->table) -@@ -208,7 +208,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - break; - case NFTNL_CHAIN_TYPE: - if (c->flags & (1 << NFTNL_CHAIN_TYPE)) -- xfree(c->type); -+ nftnl_xfree(c->type); - - c->type = strdup(data); - if (!c->type) -@@ -216,7 +216,7 @@ int nftnl_chain_set_data(struct nftnl_chain *c, uint16_t attr, - break; - case NFTNL_CHAIN_DEV: - if (c->flags & (1 << NFTNL_CHAIN_DEV)) -- xfree(c->dev); -+ nftnl_xfree(c->dev); - - c->dev = strdup(data); - if (!c->dev) -@@ -540,7 +540,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - - if (tb[NFTA_CHAIN_NAME]) { - if (c->flags & (1 << NFTNL_CHAIN_NAME)) -- xfree(c->name); -+ nftnl_xfree(c->name); - c->name = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_NAME])); - if (!c->name) - return -1; -@@ -548,7 +548,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - } - if (tb[NFTA_CHAIN_TABLE]) { - if (c->flags & (1 << NFTNL_CHAIN_TABLE)) -- xfree(c->table); -+ nftnl_xfree(c->table); - c->table = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TABLE])); - if (!c->table) - return -1; -@@ -578,7 +578,7 @@ int nftnl_chain_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_chain *c) - } - if (tb[NFTA_CHAIN_TYPE]) { - if (c->flags & (1 << NFTNL_CHAIN_TYPE)) -- xfree(c->type); -+ nftnl_xfree(c->type); - c->type = strdup(mnl_attr_get_str(tb[NFTA_CHAIN_TYPE])); - if (!c->type) - return -1; -@@ -889,7 +889,7 @@ void nftnl_chain_list_free(struct nftnl_chain_list *list) - list_del(&r->head); - nftnl_chain_free(r); - } -- xfree(list); -+ nftnl_xfree(list); - } - EXPORT_SYMBOL_ALIAS(nftnl_chain_list_free, nft_chain_list_free); - -@@ -975,6 +975,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_next, nft_chain_list_iter_next); - - void nftnl_chain_list_iter_destroy(struct nftnl_chain_list_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_chain_list_iter_destroy, nft_chain_list_iter_destroy); -diff --git a/src/common.c b/src/common.c -index bf4176c..98f8012 100644 ---- a/src/common.c -+++ b/src/common.c -@@ -58,7 +58,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_parse_err_alloc, nft_parse_err_alloc); - - void nftnl_parse_err_free(struct nftnl_parse_err *err) - { -- xfree(err); -+ nftnl_xfree(err); - } - EXPORT_SYMBOL_ALIAS(nftnl_parse_err_free, nft_parse_err_free); - -diff --git a/src/expr.c b/src/expr.c -index 8d5c562..47ecd3d 100644 ---- a/src/expr.c -+++ b/src/expr.c -@@ -50,7 +50,7 @@ void nftnl_expr_free(const struct nftnl_expr *expr) - if (expr->ops->free) - expr->ops->free(expr); - -- xfree(expr); -+ nftnl_xfree(expr); - } - EXPORT_SYMBOL_ALIAS(nftnl_expr_free, nft_rule_expr_free); - -@@ -270,7 +270,7 @@ struct nftnl_expr *nftnl_expr_parse(struct nlattr *attr) - return expr; - - err2: -- xfree(expr); -+ nftnl_xfree(expr); - err1: - return NULL; - } -diff --git a/src/expr/data_reg.c b/src/expr/data_reg.c -index 0249258..994b388 100644 ---- a/src/expr/data_reg.c -+++ b/src/expr/data_reg.c -@@ -376,7 +376,7 @@ void nftnl_free_verdict(const union nftnl_data_reg *data) - switch(data->verdict) { - case NFT_JUMP: - case NFT_GOTO: -- xfree(data->chain); -+ nftnl_xfree(data->chain); - break; - default: - break; -diff --git a/src/expr/dynset.c b/src/expr/dynset.c -index 20a5004..f3d46a7 100644 ---- a/src/expr/dynset.c -+++ b/src/expr/dynset.c -@@ -330,7 +330,7 @@ static void nftnl_expr_dynset_free(const struct nftnl_expr *e) - { - struct nftnl_expr_dynset *dynset = nftnl_expr_data(e); - -- xfree(dynset->set_name); -+ nftnl_xfree(dynset->set_name); - } - - static bool nftnl_expr_dynset_cmp(const struct nftnl_expr *e1, -diff --git a/src/expr/immediate.c b/src/expr/immediate.c -index 0b188cc..6c17f68 100644 ---- a/src/expr/immediate.c -+++ b/src/expr/immediate.c -@@ -44,7 +44,7 @@ nftnl_expr_immediate_set(struct nftnl_expr *e, uint16_t type, - break; - case NFTNL_EXPR_IMM_CHAIN: - if (e->flags & (1 << NFTNL_EXPR_IMM_CHAIN)) -- xfree(imm->data.chain); -+ nftnl_xfree(imm->data.chain); - - imm->data.chain = strdup(data); - if (!imm->data.chain) -diff --git a/src/expr/log.c b/src/expr/log.c -index b642255..2b24b6d 100644 ---- a/src/expr/log.c -+++ b/src/expr/log.c -@@ -39,7 +39,7 @@ static int nftnl_expr_log_set(struct nftnl_expr *e, uint16_t type, - switch(type) { - case NFTNL_EXPR_LOG_PREFIX: - if (log->flags & (1 << NFTNL_EXPR_LOG_PREFIX)) -- xfree(log->prefix); -+ nftnl_xfree(log->prefix); - - log->prefix = strdup(data); - if (!log->prefix) -@@ -155,7 +155,7 @@ nftnl_expr_log_parse(struct nftnl_expr *e, struct nlattr *attr) - - if (tb[NFTA_LOG_PREFIX]) { - if (log->prefix) -- xfree(log->prefix); -+ nftnl_xfree(log->prefix); - - log->prefix = strdup(mnl_attr_get_str(tb[NFTA_LOG_PREFIX])); - if (!log->prefix) -@@ -316,7 +316,7 @@ static void nftnl_expr_log_free(const struct nftnl_expr *e) - { - struct nftnl_expr_log *log = nftnl_expr_data(e); - -- xfree(log->prefix); -+ nftnl_xfree(log->prefix); - } - - static bool nftnl_expr_log_cmp(const struct nftnl_expr *e1, -diff --git a/src/expr/lookup.c b/src/expr/lookup.c -index 861815f..1955ed3 100644 ---- a/src/expr/lookup.c -+++ b/src/expr/lookup.c -@@ -259,7 +259,7 @@ static void nftnl_expr_lookup_free(const struct nftnl_expr *e) - { - struct nftnl_expr_lookup *lookup = nftnl_expr_data(e); - -- xfree(lookup->set_name); -+ nftnl_xfree(lookup->set_name); - } - - static bool nftnl_expr_lookup_cmp(const struct nftnl_expr *e1, -diff --git a/src/expr/match.c b/src/expr/match.c -index dd09e1e..09e35c5 100644 ---- a/src/expr/match.c -+++ b/src/expr/match.c -@@ -50,7 +50,7 @@ nftnl_expr_match_set(struct nftnl_expr *e, uint16_t type, - break; - case NFTNL_EXPR_MT_INFO: - if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) -- xfree(mt->data); -+ nftnl_xfree(mt->data); - - mt->data = data; - mt->data_len = data_len; -@@ -147,7 +147,7 @@ static int nftnl_expr_match_parse(struct nftnl_expr *e, struct nlattr *attr) - void *match_data; - - if (e->flags & (1 << NFTNL_EXPR_MT_INFO)) -- xfree(match->data); -+ nftnl_xfree(match->data); - - match_data = calloc(1, len); - if (match_data == NULL) -@@ -217,7 +217,7 @@ static void nftnl_expr_match_free(const struct nftnl_expr *e) - { - struct nftnl_expr_match *match = nftnl_expr_data(e); - -- xfree(match->data); -+ nftnl_xfree(match->data); - } - - static bool nftnl_expr_match_cmp(const struct nftnl_expr *e1, -diff --git a/src/expr/target.c b/src/expr/target.c -index ed4bf7d..5e28925 100644 ---- a/src/expr/target.c -+++ b/src/expr/target.c -@@ -50,7 +50,7 @@ nftnl_expr_target_set(struct nftnl_expr *e, uint16_t type, - break; - case NFTNL_EXPR_TG_INFO: - if (e->flags & (1 << NFTNL_EXPR_TG_INFO)) -- xfree(tg->data); -+ nftnl_xfree(tg->data); - - tg->data = data; - tg->data_len = data_len; -@@ -147,7 +147,7 @@ static int nftnl_expr_target_parse(struct nftnl_expr *e, struct nlattr *attr) - void *target_data; - - if (target->data) -- xfree(target->data); -+ nftnl_xfree(target->data); - - target_data = calloc(1, len); - if (target_data == NULL) -@@ -217,7 +217,7 @@ static void nftnl_expr_target_free(const struct nftnl_expr *e) - { - struct nftnl_expr_target *target = nftnl_expr_data(e); - -- xfree(target->data); -+ nftnl_xfree(target->data); - } - - static bool nftnl_expr_target_cmp(const struct nftnl_expr *e1, -diff --git a/src/gen.c b/src/gen.c -index c69d2f8..0143ea0 100644 ---- a/src/gen.c -+++ b/src/gen.c -@@ -37,7 +37,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_gen_alloc, nft_gen_alloc); - - void nftnl_gen_free(const struct nftnl_gen *gen) - { -- xfree(gen); -+ nftnl_xfree(gen); - } - EXPORT_SYMBOL_ALIAS(nftnl_gen_free, nft_gen_free); - -diff --git a/src/object.c b/src/object.c -index 0d3dc2b..542211c 100644 ---- a/src/object.c -+++ b/src/object.c -@@ -47,11 +47,11 @@ EXPORT_SYMBOL(nftnl_obj_alloc); - void nftnl_obj_free(const struct nftnl_obj *obj) - { - if (obj->flags & (1 << NFTNL_OBJ_TABLE)) -- xfree(obj->table); -+ nftnl_xfree(obj->table); - if (obj->flags & (1 << NFTNL_OBJ_NAME)) -- xfree(obj->name); -+ nftnl_xfree(obj->name); - -- xfree(obj); -+ nftnl_xfree(obj); - } - EXPORT_SYMBOL(nftnl_obj_free); - -@@ -74,11 +74,11 @@ void nftnl_obj_set_data(struct nftnl_obj *obj, uint16_t attr, - - switch (attr) { - case NFTNL_OBJ_TABLE: -- xfree(obj->table); -+ nftnl_xfree(obj->table); - obj->table = strdup(data); - break; - case NFTNL_OBJ_NAME: -- xfree(obj->name); -+ nftnl_xfree(obj->name); - obj->name = strdup(data); - break; - case NFTNL_OBJ_TYPE: -@@ -486,7 +486,7 @@ void nftnl_obj_list_free(struct nftnl_obj_list *list) - list_del(&r->head); - nftnl_obj_free(r); - } -- xfree(list); -+ nftnl_xfree(list); - } - EXPORT_SYMBOL(nftnl_obj_list_free); - -@@ -573,6 +573,6 @@ EXPORT_SYMBOL(nftnl_obj_list_iter_next); - - void nftnl_obj_list_iter_destroy(struct nftnl_obj_list_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL(nftnl_obj_list_iter_destroy); -diff --git a/src/rule.c b/src/rule.c -index 22026a4..256b699 100644 ---- a/src/rule.c -+++ b/src/rule.c -@@ -72,13 +72,13 @@ void nftnl_rule_free(const struct nftnl_rule *r) - nftnl_expr_free(e); - - if (r->flags & (1 << (NFTNL_RULE_TABLE))) -- xfree(r->table); -+ nftnl_xfree(r->table); - if (r->flags & (1 << (NFTNL_RULE_CHAIN))) -- xfree(r->chain); -+ nftnl_xfree(r->chain); - if (r->flags & (1 << (NFTNL_RULE_USERDATA))) -- xfree(r->user.data); -+ nftnl_xfree(r->user.data); - -- xfree(r); -+ nftnl_xfree(r); - } - EXPORT_SYMBOL_ALIAS(nftnl_rule_free, nft_rule_free); - -@@ -95,10 +95,10 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) - - switch (attr) { - case NFTNL_RULE_TABLE: -- xfree(r->table); -+ nftnl_xfree(r->table); - break; - case NFTNL_RULE_CHAIN: -- xfree(r->chain); -+ nftnl_xfree(r->chain); - break; - case NFTNL_RULE_HANDLE: - case NFTNL_RULE_COMPAT_PROTO: -@@ -107,7 +107,7 @@ void nftnl_rule_unset(struct nftnl_rule *r, uint16_t attr) - case NFTNL_RULE_FAMILY: - break; - case NFTNL_RULE_USERDATA: -- xfree(r->user.data); -+ nftnl_xfree(r->user.data); - break; - } - -@@ -132,7 +132,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, - switch(attr) { - case NFTNL_RULE_TABLE: - if (r->flags & (1 << NFTNL_RULE_TABLE)) -- xfree(r->table); -+ nftnl_xfree(r->table); - - r->table = strdup(data); - if (!r->table) -@@ -140,7 +140,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, - break; - case NFTNL_RULE_CHAIN: - if (r->flags & (1 << NFTNL_RULE_CHAIN)) -- xfree(r->chain); -+ nftnl_xfree(r->chain); - - r->chain = strdup(data); - if (!r->chain) -@@ -163,7 +163,7 @@ int nftnl_rule_set_data(struct nftnl_rule *r, uint16_t attr, - break; - case NFTNL_RULE_USERDATA: - if (r->flags & (1 << NFTNL_RULE_USERDATA)) -- xfree(r->user.data); -+ nftnl_xfree(r->user.data); - - r->user.data = malloc(data_len); - if (!r->user.data) -@@ -436,7 +436,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - - if (tb[NFTA_RULE_TABLE]) { - if (r->flags & (1 << NFTNL_RULE_TABLE)) -- xfree(r->table); -+ nftnl_xfree(r->table); - r->table = strdup(mnl_attr_get_str(tb[NFTA_RULE_TABLE])); - if (!r->table) - return -1; -@@ -444,7 +444,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - } - if (tb[NFTA_RULE_CHAIN]) { - if (r->flags & (1 << NFTNL_RULE_CHAIN)) -- xfree(r->chain); -+ nftnl_xfree(r->chain); - r->chain = strdup(mnl_attr_get_str(tb[NFTA_RULE_CHAIN])); - if (!r->chain) - return -1; -@@ -473,7 +473,7 @@ int nftnl_rule_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_rule *r) - mnl_attr_get_payload(tb[NFTA_RULE_USERDATA]); - - if (r->flags & (1 << NFTNL_RULE_USERDATA)) -- xfree(r->user.data); -+ nftnl_xfree(r->user.data); - - r->user.len = mnl_attr_get_payload_len(tb[NFTA_RULE_USERDATA]); - -@@ -915,7 +915,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_next, nft_rule_expr_iter_next); - - void nftnl_expr_iter_destroy(struct nftnl_expr_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_expr_iter_destroy, nft_rule_expr_iter_destroy); - -@@ -976,7 +976,7 @@ void nftnl_rule_list_free(struct nftnl_rule_list *list) - list_del(&r->head); - nftnl_rule_free(r); - } -- xfree(list); -+ nftnl_xfree(list); - } - EXPORT_SYMBOL_ALIAS(nftnl_rule_list_free, nft_rule_list_free); - -@@ -1068,6 +1068,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_next, nft_rule_list_iter_next); - - void nftnl_rule_list_iter_destroy(const struct nftnl_rule_list_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_rule_list_iter_destroy, nft_rule_list_iter_destroy); -diff --git a/src/ruleset.c b/src/ruleset.c -index b6ca565..0867e2a 100644 ---- a/src/ruleset.c -+++ b/src/ruleset.c -@@ -71,7 +71,7 @@ void nftnl_ruleset_free(const struct nftnl_ruleset *r) - nftnl_set_list_free(r->set_list); - if (r->flags & (1 << NFTNL_RULESET_RULELIST)) - nftnl_rule_list_free(r->rule_list); -- xfree(r); -+ nftnl_xfree(r); - } - EXPORT_SYMBOL_ALIAS(nftnl_ruleset_free, nft_ruleset_free); - -diff --git a/src/set.c b/src/set.c -index 14d28b5..0e93503 100644 ---- a/src/set.c -+++ b/src/set.c -@@ -45,15 +45,15 @@ void nftnl_set_free(const struct nftnl_set *s) - struct nftnl_set_elem *elem, *tmp; - - if (s->flags & (1 << NFTNL_SET_TABLE)) -- xfree(s->table); -+ nftnl_xfree(s->table); - if (s->flags & (1 << NFTNL_SET_NAME)) -- xfree(s->name); -+ nftnl_xfree(s->name); - - list_for_each_entry_safe(elem, tmp, &s->element_list, head) { - list_del(&elem->head); - nftnl_set_elem_free(elem); - } -- xfree(s); -+ nftnl_xfree(s); - } - EXPORT_SYMBOL_ALIAS(nftnl_set_free, nft_set_free); - -@@ -70,10 +70,10 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) - - switch (attr) { - case NFTNL_SET_TABLE: -- xfree(s->table); -+ nftnl_xfree(s->table); - break; - case NFTNL_SET_NAME: -- xfree(s->name); -+ nftnl_xfree(s->name); - break; - case NFTNL_SET_FLAGS: - case NFTNL_SET_KEY_TYPE: -@@ -89,7 +89,7 @@ void nftnl_set_unset(struct nftnl_set *s, uint16_t attr) - case NFTNL_SET_GC_INTERVAL: - break; - case NFTNL_SET_USERDATA: -- xfree(s->user.data); -+ nftnl_xfree(s->user.data); - break; - default: - return; -@@ -122,7 +122,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, - switch(attr) { - case NFTNL_SET_TABLE: - if (s->flags & (1 << NFTNL_SET_TABLE)) -- xfree(s->table); -+ nftnl_xfree(s->table); - - s->table = strdup(data); - if (!s->table) -@@ -130,7 +130,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, - break; - case NFTNL_SET_NAME: - if (s->flags & (1 << NFTNL_SET_NAME)) -- xfree(s->name); -+ nftnl_xfree(s->name); - - s->name = strdup(data); - if (!s->name) -@@ -174,7 +174,7 @@ int nftnl_set_set_data(struct nftnl_set *s, uint16_t attr, const void *data, - break; - case NFTNL_SET_USERDATA: - if (s->flags & (1 << NFTNL_SET_USERDATA)) -- xfree(s->user.data); -+ nftnl_xfree(s->user.data); - - s->user.data = malloc(data_len); - if (!s->user.data) -@@ -474,7 +474,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - - if (tb[NFTA_SET_TABLE]) { - if (s->flags & (1 << NFTNL_SET_TABLE)) -- xfree(s->table); -+ nftnl_xfree(s->table); - s->table = strdup(mnl_attr_get_str(tb[NFTA_SET_TABLE])); - if (!s->table) - return -1; -@@ -482,7 +482,7 @@ int nftnl_set_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - } - if (tb[NFTA_SET_NAME]) { - if (s->flags & (1 << NFTNL_SET_NAME)) -- xfree(s->name); -+ nftnl_xfree(s->name); - s->name = strdup(mnl_attr_get_str(tb[NFTA_SET_NAME])); - if (!s->name) - return -1; -@@ -972,7 +972,7 @@ void nftnl_set_list_free(struct nftnl_set_list *list) - list_del(&s->head); - nftnl_set_free(s); - } -- xfree(list); -+ nftnl_xfree(list); - } - EXPORT_SYMBOL_ALIAS(nftnl_set_list_free, nft_set_list_free); - -@@ -1064,7 +1064,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_next, nft_set_list_iter_next); - - void nftnl_set_list_iter_destroy(const struct nftnl_set_list_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_set_list_iter_destroy, nft_set_list_iter_destroy); - -diff --git a/src/set_elem.c b/src/set_elem.c -index fa87476..6d404bd 100644 ---- a/src/set_elem.c -+++ b/src/set_elem.c -@@ -42,18 +42,18 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elem_alloc, nft_set_elem_alloc); - void nftnl_set_elem_free(struct nftnl_set_elem *s) - { - if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) -- xfree(s->data.chain); -+ nftnl_xfree(s->data.chain); - - if (s->flags & (1 << NFTNL_SET_ELEM_EXPR)) - nftnl_expr_free(s->expr); - - if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA)) -- xfree(s->user.data); -+ nftnl_xfree(s->user.data); - - if (s->flags & (1 << NFTNL_SET_ELEM_OBJREF)) -- xfree(s->objref); -+ nftnl_xfree(s->objref); - -- xfree(s); -+ nftnl_xfree(s); - } - EXPORT_SYMBOL_ALIAS(nftnl_set_elem_free, nft_set_elem_free); - -@@ -70,7 +70,7 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) - - switch (attr) { - case NFTNL_SET_ELEM_CHAIN: -- xfree(s->data.chain); -+ nftnl_xfree(s->data.chain); - break; - case NFTNL_SET_ELEM_FLAGS: - case NFTNL_SET_ELEM_KEY: /* NFTA_SET_ELEM_KEY */ -@@ -80,13 +80,13 @@ void nftnl_set_elem_unset(struct nftnl_set_elem *s, uint16_t attr) - case NFTNL_SET_ELEM_EXPIRATION: /* NFTA_SET_ELEM_EXPIRATION */ - break; - case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ -- xfree(s->user.data); -+ nftnl_xfree(s->user.data); - break; - case NFTNL_SET_ELEM_EXPR: - nftnl_expr_free(s->expr); - break; - case NFTNL_SET_ELEM_OBJREF: -- xfree(s->objref); -+ nftnl_xfree(s->objref); - break; - default: - return; -@@ -112,7 +112,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, - break; - case NFTNL_SET_ELEM_CHAIN: /* NFTA_SET_ELEM_DATA */ - if (s->flags & (1 << NFTNL_SET_ELEM_CHAIN)) -- xfree(s->data.chain); -+ nftnl_xfree(s->data.chain); - - s->data.chain = strdup(data); - if (!s->data.chain) -@@ -127,7 +127,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, - break; - case NFTNL_SET_ELEM_USERDATA: /* NFTA_SET_ELEM_USERDATA */ - if (s->flags & (1 << NFTNL_SET_ELEM_USERDATA)) -- xfree(s->user.data); -+ nftnl_xfree(s->user.data); - - s->user.data = malloc(data_len); - if (!s->user.data) -@@ -137,7 +137,7 @@ int nftnl_set_elem_set(struct nftnl_set_elem *s, uint16_t attr, - break; - case NFTNL_SET_ELEM_OBJREF: - if (s->flags & (1 << NFTNL_SET_ELEM_OBJREF)) -- xfree(s->objref); -+ nftnl_xfree(s->objref); - - s->objref = strdup(data); - if (!s->objref) -@@ -431,7 +431,7 @@ static int nftnl_set_elems_parse2(struct nftnl_set *s, const struct nlattr *nest - mnl_attr_get_payload(tb[NFTA_SET_ELEM_USERDATA]); - - if (e->flags & (1 << NFTNL_RULE_USERDATA)) -- xfree(e->user.data); -+ nftnl_xfree(e->user.data); - - e->user.len = mnl_attr_get_payload_len(tb[NFTA_SET_ELEM_USERDATA]); - e->user.data = malloc(e->user.len); -@@ -515,7 +515,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - - if (tb[NFTA_SET_ELEM_LIST_TABLE]) { - if (s->flags & (1 << NFTNL_SET_TABLE)) -- xfree(s->table); -+ nftnl_xfree(s->table); - s->table = - strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_TABLE])); - if (!s->table) -@@ -524,7 +524,7 @@ int nftnl_set_elems_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_set *s) - } - if (tb[NFTA_SET_ELEM_LIST_SET]) { - if (s->flags & (1 << NFTNL_SET_NAME)) -- xfree(s->name); -+ nftnl_xfree(s->name); - s->name = - strdup(mnl_attr_get_str(tb[NFTA_SET_ELEM_LIST_SET])); - if (!s->name) -@@ -810,7 +810,7 @@ EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_next, nft_set_elems_iter_next); - - void nftnl_set_elems_iter_destroy(struct nftnl_set_elems_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_set_elems_iter_destroy, nft_set_elems_iter_destroy); - -diff --git a/src/table.c b/src/table.c -index 4286d51..1e15ea7 100644 ---- a/src/table.c -+++ b/src/table.c -@@ -45,9 +45,9 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_alloc, nft_table_alloc); - void nftnl_table_free(const struct nftnl_table *t) - { - if (t->flags & (1 << NFTNL_TABLE_NAME)) -- xfree(t->name); -+ nftnl_xfree(t->name); - -- xfree(t); -+ nftnl_xfree(t); - } - EXPORT_SYMBOL_ALIAS(nftnl_table_free, nft_table_free); - -@@ -64,7 +64,7 @@ void nftnl_table_unset(struct nftnl_table *t, uint16_t attr) - - switch (attr) { - case NFTNL_TABLE_NAME: -- xfree(t->name); -+ nftnl_xfree(t->name); - break; - case NFTNL_TABLE_FLAGS: - case NFTNL_TABLE_FAMILY: -@@ -90,7 +90,7 @@ int nftnl_table_set_data(struct nftnl_table *t, uint16_t attr, - switch (attr) { - case NFTNL_TABLE_NAME: - if (t->flags & (1 << NFTNL_TABLE_NAME)) -- xfree(t->name); -+ nftnl_xfree(t->name); - - t->name = strdup(data); - if (!t->name) -@@ -229,7 +229,7 @@ int nftnl_table_nlmsg_parse(const struct nlmsghdr *nlh, struct nftnl_table *t) - - if (tb[NFTA_TABLE_NAME]) { - if (t->flags & (1 << NFTNL_TABLE_NAME)) -- xfree(t->name); -+ nftnl_xfree(t->name); - t->name = strdup(mnl_attr_get_str(tb[NFTA_TABLE_NAME])); - if (!t->name) - return -1; -@@ -448,7 +448,7 @@ void nftnl_table_list_free(struct nftnl_table_list *list) - list_del(&r->head); - nftnl_table_free(r); - } -- xfree(list); -+ nftnl_xfree(list); - } - EXPORT_SYMBOL_ALIAS(nftnl_table_list_free, nft_table_list_free); - -@@ -534,6 +534,6 @@ EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_next, nft_table_list_iter_next); - - void nftnl_table_list_iter_destroy(const struct nftnl_table_list_iter *iter) - { -- xfree(iter); -+ nftnl_xfree(iter); - } - EXPORT_SYMBOL_ALIAS(nftnl_table_list_iter_destroy, nft_table_list_iter_destroy); -diff --git a/src/trace.c b/src/trace.c -index bd05d3c..abfc533 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -61,13 +61,13 @@ struct nftnl_trace *nftnl_trace_alloc(void) - EXPORT_SYMBOL(nftnl_trace_free); - void nftnl_trace_free(const struct nftnl_trace *t) - { -- xfree(t->chain); -- xfree(t->table); -- xfree(t->jump_target); -- xfree(t->ll.data); -- xfree(t->nh.data); -- xfree(t->th.data); -- xfree(t); -+ nftnl_xfree(t->chain); -+ nftnl_xfree(t->table); -+ nftnl_xfree(t->jump_target); -+ nftnl_xfree(t->ll.data); -+ nftnl_xfree(t->nh.data); -+ nftnl_xfree(t->th.data); -+ nftnl_xfree(t); - } - - EXPORT_SYMBOL(nftnl_trace_is_set); -diff --git a/src/udata.c b/src/udata.c -index 60c2f34..ec1f7dc 100644 ---- a/src/udata.c -+++ b/src/udata.c -@@ -32,7 +32,7 @@ EXPORT_SYMBOL(nftnl_udata_buf_alloc); - - void nftnl_udata_buf_free(const struct nftnl_udata_buf *buf) - { -- xfree(buf); -+ nftnl_xfree(buf); - } - EXPORT_SYMBOL(nftnl_udata_buf_free); - -diff --git a/src/utils.c b/src/utils.c -index 3e44960..08f668f 100644 ---- a/src/utils.c -+++ b/src/utils.c -@@ -264,7 +264,7 @@ int nftnl_fprintf(FILE *fp, const void *obj, uint32_t cmd, uint32_t type, - - out: - if (buf != _buf) -- xfree(buf); -+ nftnl_xfree(buf); - - return ret; - } --- -2.10.2 - diff --git a/package.bak/libnftnl/0002-Add-Libs.private-field-to-libnftnl.pc.patch b/package.bak/libnftnl/0002-Add-Libs.private-field-to-libnftnl.pc.patch deleted file mode 100644 index ce3e9500ee..0000000000 --- a/package.bak/libnftnl/0002-Add-Libs.private-field-to-libnftnl.pc.patch +++ /dev/null @@ -1,49 +0,0 @@ -From d89fca062ba966332b573673fdd5c4cf01c3e2f5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 15:32:08 +0100 -Subject: [PATCH 2/2] Add Libs.private field to libnftnl.pc - -Static linking userspace programs such as nftables against libnftnl -currently doesn't work out of the box, because libnftnl is linked -against libmnl, but this isn't expressed in libnftnl pkg-config -file: - - CCLD nft -[...]/bfin-buildroot-uclinux-uclibc/sysroot/usr/lib/libnftnl.a(table.o): In function `_nft_table_nlmsg_parse': -table.c:(.text+0x480): undefined reference to `_mnl_attr_parse' -table.c:(.text+0x492): undefined reference to `_mnl_attr_get_str' -table.c:(.text+0x4a8): undefined reference to `_mnl_attr_get_u32' -table.c:(.text+0x4ca): undefined reference to `_mnl_attr_get_u32' -[...] - -The Libs.private field is specifically designed for such usage: - -From pkg-config documentation: - - Libs.private: - - This line should list any private libraries in use. Private - libraries are libraries which are not exposed through your - library, but are needed in the case of static linking. - -Therefore, this patch adds a reference to libmnl in the Libs.private -field of libnftnl pkg-config file. - -Signed-off-by: Thomas Petazzoni ---- - libnftnl.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libnftnl.pc.in b/libnftnl.pc.in -index fd5cc6a..7fef921 100644 ---- a/libnftnl.pc.in -+++ b/libnftnl.pc.in -@@ -12,4 +12,5 @@ Version: @VERSION@ - Requires: - Conflicts: - Libs: -L${libdir} -lnftnl -+Libs.private: @LIBMNL_LIBS@ - Cflags: -I${includedir} --- -2.1.0 - diff --git a/package.bak/libnftnl/Config.in b/package.bak/libnftnl/Config.in deleted file mode 100644 index d4c9a1bb54..0000000000 --- a/package.bak/libnftnl/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -comment "libnftnl needs a toolchain w/ headers >= 3.12" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - -config BR2_PACKAGE_LIBNFTNL - bool "libnftnl" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_PACKAGE_LIBMNL - help - libnftnl is a userspace library providing a low-level - netlink programming interface (API) to the in-kernel - nf_tables subsystem. The library libnftnl has been - previously known as libnftables. This library is - currently used by nftables. - - http://netfilter.org/projects/libnftnl/index.html - -if BR2_PACKAGE_LIBNFTNL - -config BR2_PACKAGE_LIBNFTNL_JSON - bool "enable JSON support" - select BR2_PACKAGE_JANSSON - help - Enable JSON parsing support - -config BR2_PACKAGE_LIBNFTNL_XML - bool "enable XML support" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_MXML - help - Enable XML parsing support - -comment "libnftnl XML parsing support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -endif diff --git a/package.bak/libnftnl/libnftnl.hash b/package.bak/libnftnl/libnftnl.hash deleted file mode 100644 index 63271e0f75..0000000000 --- a/package.bak/libnftnl/libnftnl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.netfilter.org/projects/libnftnl/downloads.html#libnftnl-1.0.7 -sha1 381b2b3cbb3fad186cb3f57bbf32d70f0b3c3c8e libnftnl-1.0.7.tar.bz2 diff --git a/package.bak/libnftnl/libnftnl.mk b/package.bak/libnftnl/libnftnl.mk deleted file mode 100644 index 0e1ddf8bc6..0000000000 --- a/package.bak/libnftnl/libnftnl.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# libnftnl -# -################################################################################ - -LIBNFTNL_VERSION = 1.0.7 -LIBNFTNL_SITE = http://netfilter.org/projects/libnftnl/files -LIBNFTNL_SOURCE = libnftnl-$(LIBNFTNL_VERSION).tar.bz2 -LIBNFTNL_LICENSE = GPLv2+ -LIBNFTNL_LICENSE_FILES = COPYING -LIBNFTNL_INSTALL_STAGING = YES -LIBNFTNL_DEPENDENCIES = host-pkgconf libmnl - -ifeq ($(BR2_PACKAGE_LIBNFTNL_JSON),y) -LIBNFTNL_CONF_OPTS += --with-json-parsing -LIBNFTNL_DEPENDENCIES += jansson -else -LIBNFTNL_CONF_OPTS += --without-json-parsing -endif - -ifeq ($(BR2_PACKAGE_LIBNFTNL_XML),y) -LIBNFTNL_CONF_OPTS += --with-xml-parsing -LIBNFTNL_DEPENDENCIES += mxml -else -LIBNFTNL_CONF_OPTS += --without-xml-parsing -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnice/0001-configure-Fix-configure-failure-when-building-without-.patch b/package.bak/libnice/0001-configure-Fix-configure-failure-when-building-without-.patch deleted file mode 100644 index f6b2eb4cb9..0000000000 --- a/package.bak/libnice/0001-configure-Fix-configure-failure-when-building-without-.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 81a929ac141aae66b6450e8ce93cb357ed404cda Mon Sep 17 00:00:00 2001 -From: Timo Gurr -Date: Mon, 1 Jun 2015 16:10:16 +0200 -Subject: [PATCH] configure: Fix configure failure when building without - gstreamer support - -Error introduced in 20ea22e0a11a9bdfe4d8125b68083249b694338a, resulting in a -configure/build error when building without gstreamer: - -configure: error: conditional "HAVE_GST_CHECK" was never defined. -Usually this means the macro was only invoked conditionally. - -https://bugs.freedesktop.org/show_bug.cgi?id=90801 -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - configure.ac | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6031cec..64a571f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -231,9 +231,6 @@ AS_IF([test "$with_gstreamer" != no], [ - [ - have_gst_check=no - ]) -- -- AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes) -- - ]) - - AS_IF([test "$with_gstreamer010" != no], [ -@@ -260,6 +257,7 @@ AC_SUBST(gstplugindir) - AC_SUBST(gstplugin010dir) - - AM_CONDITIONAL(WITH_GSTREAMER, test "$with_gstreamer" = yes) -+AM_CONDITIONAL(HAVE_GST_CHECK, test "$have_gst_check" = yes) - AM_CONDITIONAL(WITH_GSTREAMER010, test "$with_gstreamer010" = yes) - - GUPNP_IGD_REQUIRED=0.2.4 --- -2.10.2 - diff --git a/package.bak/libnice/Config.in b/package.bak/libnice/Config.in deleted file mode 100644 index 1d7c3410e0..0000000000 --- a/package.bak/libnice/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBNICE - bool "libnice" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # fork() - help - Libnice is an implementation of the IETF's Interactive - Connectivity Establishment (ICE) standard (RFC 5245) and the - Session Traversal Utilities for NAT (STUN) standard (RFC - 5389). - - It provides a GLib-based library, libnice and a Glib-free - library, libstun as well as GStreamer elements. - - http://nice.freedesktop.org/wiki/ - -comment "libnice needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libnice/libnice.hash b/package.bak/libnice/libnice.hash deleted file mode 100644 index d08c2d7839..0000000000 --- a/package.bak/libnice/libnice.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed after checking pgp signature -sha256 61112d9f3be933a827c8365f20551563953af6718057928f51f487bfe88419e1 libnice-0.1.13.tar.gz diff --git a/package.bak/libnice/libnice.mk b/package.bak/libnice/libnice.mk deleted file mode 100644 index 3df596a867..0000000000 --- a/package.bak/libnice/libnice.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libnice -# -################################################################################ - -LIBNICE_VERSION = 0.1.13 -LIBNICE_SITE = http://nice.freedesktop.org/releases -LIBNICE_LICENSE = MPLv1.1 or LGPLv2.1 -LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL -LIBNICE_DEPENDENCIES = libglib2 host-pkgconf -LIBNICE_INSTALL_STAGING = YES -# For 0001-configure-Fix-configure-failure-when-building-without-.patch -LIBNICE_AUTORECONF = YES -LIBNICE_CONF_OPTS = \ - --without-gstreamer \ - --without-gstreamer-0.10 \ - -$(eval $(autotools-package)) diff --git a/package.bak/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch b/package.bak/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch deleted file mode 100644 index 845a593761..0000000000 --- a/package.bak/libnl/0002-build-add-Libs.private-field-in-libnl-pkg-config-fil.patch +++ /dev/null @@ -1,30 +0,0 @@ -From db0d59cd06f3ffd350379847c0885e1bfb85af0f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 7 Mar 2015 11:34:42 +0100 -Subject: [PATCH 2/2] build: add Libs.private field in libnl pkg-config file - -In order to support static linking, the libnl pkg-config file should -indicate in its Libs.private field the libraries that libnl-3.0.a -requires. The LIBS variable contains the appropriate list of -libraries: -lm in all cases, and -lpthread when pthread support is -enabled. This allows to statically link applications against libnl -properly. - -Signed-off-by: Thomas Petazzoni ---- - libnl-3.0.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libnl-3.0.pc.in b/libnl-3.0.pc.in -index b87e3dc..ddbc999 100644 ---- a/libnl-3.0.pc.in -+++ b/libnl-3.0.pc.in -@@ -7,4 +7,5 @@ Name: libnl - Description: Convenience library for netlink sockets - Version: @PACKAGE_VERSION@ - Libs: -L${libdir} -lnl-@MAJ_VERSION@ -+Libs.private: @LIBS@ - Cflags: -I${includedir}/libnl@MAJ_VERSION@ --- -2.1.0 - diff --git a/package.bak/libnl/Config.in b/package.bak/libnl/Config.in deleted file mode 100644 index 46877c37a2..0000000000 --- a/package.bak/libnl/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_LIBNL - bool "libnl" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - A library for applications dealing with netlink socket. - - http://people.suug.ch/~tgr/libnl/ - -if BR2_PACKAGE_LIBNL - -config BR2_PACKAGE_LIBNL_TOOLS - bool "install tools" - # uses - depends on !BR2_STATIC_LIBS - help - Install binary tools. - -comment "libnl tools needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS -endif - -comment "libnl needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libnl/libnl.hash b/package.bak/libnl/libnl.hash deleted file mode 100644 index 2f1a3cb1b3..0000000000 --- a/package.bak/libnl/libnl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://github.com/thom311/libnl/releases/download/libnl3_2_27/libnl-3.2.27.tar.gz.sha256sum -sha256 4bbbf92b3c78a90f423cf96260bf419a28b75db8cced47051217a56795f58ec6 libnl-3.2.27.tar.gz diff --git a/package.bak/libnl/libnl.mk b/package.bak/libnl/libnl.mk deleted file mode 100644 index 85c0db86f6..0000000000 --- a/package.bak/libnl/libnl.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libnl -# -################################################################################ - -LIBNL_VERSION = 3.2.27 -LIBNL_SITE = https://github.com/thom311/libnl/releases/download/libnl$(subst .,_,$(LIBNL_VERSION)) -LIBNL_LICENSE = LGPLv2.1+ -LIBNL_LICENSE_FILES = COPYING -LIBNL_INSTALL_STAGING = YES -LIBNL_DEPENDENCIES = host-bison host-flex - -ifeq ($(BR2_PACKAGE_LIBNL_TOOLS),y) -LIBNL_CONF_OPTS += --enable-cli -else -LIBNL_CONF_OPTS += --disable-cli -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnspr/0001-nios2.patch b/package.bak/libnspr/0001-nios2.patch deleted file mode 100644 index 22cacd72a1..0000000000 --- a/package.bak/libnspr/0001-nios2.patch +++ /dev/null @@ -1,72 +0,0 @@ -Add Nios-II support - -[Gustavo: update for nspr 4.10.9] -Signed-off-by: Ezequiel Garcia - -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/include/md/_linux.cfg ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg 2015-10-03 08:11:43.229387215 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.cfg 2015-10-03 08:11:55.277798841 -0300 -@@ -1017,6 +1017,51 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(nios2) -+ -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.h nspr-4.10.9/nspr/pr/include/md/_linux.h ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.h 2015-10-03 08:11:43.229387215 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.h 2015-10-03 08:12:22.474728003 -0300 -@@ -57,6 +57,8 @@ - #define _PR_SI_ARCHITECTURE "m32r" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" -+#elif defined(nios2) -+#define _PR_SI_ARCHITECTURE "nios2" - #else - #error "Unknown CPU architecture" - #endif diff --git a/package.bak/libnspr/0002-microblaze.patch b/package.bak/libnspr/0002-microblaze.patch deleted file mode 100644 index f1416e7e97..0000000000 --- a/package.bak/libnspr/0002-microblaze.patch +++ /dev/null @@ -1,80 +0,0 @@ -Add Microblaze support - -[Gustavo: update for nspr 4.10.9] -Signed-off-by: Spenser Gilliland - -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg nspr-4.10.9/nspr/pr/include/md/_linux.cfg ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.cfg 2015-10-03 08:13:11.845414714 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.cfg 2015-10-03 08:13:20.435708195 -0300 -@@ -1062,6 +1062,56 @@ - #define PR_BYTES_PER_WORD_LOG2 2 - #define PR_BYTES_PER_DWORD_LOG2 3 - -+#elif defined(__microblaze__) -+ -+#if defined(__BIG_ENDIAN__) -+#define IS_BIG_ENDIAN 1 -+#undef IS_LITTLE_ENDIAN -+#else -+#define IS_LITTLE_ENDIAN 1 -+#undef IS_BIG_ENDIAN -+#endif -+ -+#define PR_BYTES_PER_BYTE 1 -+#define PR_BYTES_PER_SHORT 2 -+#define PR_BYTES_PER_INT 4 -+#define PR_BYTES_PER_INT64 8 -+#define PR_BYTES_PER_LONG 4 -+#define PR_BYTES_PER_FLOAT 4 -+#define PR_BYTES_PER_DOUBLE 8 -+#define PR_BYTES_PER_WORD 4 -+#define PR_BYTES_PER_DWORD 8 -+ -+#define PR_BITS_PER_BYTE 8 -+#define PR_BITS_PER_SHORT 16 -+#define PR_BITS_PER_INT 32 -+#define PR_BITS_PER_INT64 64 -+#define PR_BITS_PER_LONG 32 -+#define PR_BITS_PER_FLOAT 32 -+#define PR_BITS_PER_DOUBLE 64 -+#define PR_BITS_PER_WORD 32 -+ -+#define PR_BITS_PER_BYTE_LOG2 3 -+#define PR_BITS_PER_SHORT_LOG2 4 -+#define PR_BITS_PER_INT_LOG2 5 -+#define PR_BITS_PER_INT64_LOG2 6 -+#define PR_BITS_PER_LONG_LOG2 5 -+#define PR_BITS_PER_FLOAT_LOG2 5 -+#define PR_BITS_PER_DOUBLE_LOG2 6 -+#define PR_BITS_PER_WORD_LOG2 5 -+ -+#define PR_ALIGN_OF_SHORT 2 -+#define PR_ALIGN_OF_INT 4 -+#define PR_ALIGN_OF_LONG 4 -+#define PR_ALIGN_OF_INT64 4 -+#define PR_ALIGN_OF_FLOAT 4 -+#define PR_ALIGN_OF_DOUBLE 4 -+#define PR_ALIGN_OF_POINTER 4 -+#define PR_ALIGN_OF_WORD 4 -+ -+#define PR_BYTES_PER_WORD_LOG2 2 -+#define PR_BYTES_PER_DWORD_LOG2 3 -+ - #else - - #error "Unknown CPU architecture" -diff -Nura nspr-4.10.9.orig/nspr/pr/include/md/_linux.h nspr-4.10.9/nspr/pr/include/md/_linux.h ---- nspr-4.10.9.orig/nspr/pr/include/md/_linux.h 2015-10-03 08:13:11.845414714 -0300 -+++ nspr-4.10.9/nspr/pr/include/md/_linux.h 2015-10-03 08:14:53.351882603 -0300 -@@ -57,8 +57,11 @@ - #define _PR_SI_ARCHITECTURE "m32r" - #elif defined(__or1k__) - #define _PR_SI_ARCHITECTURE "or1k" -+#elif defined(__microblaze__) -+#define _PR_SI_ARCHITECTURE "microblaze" - #elif defined(nios2) - #define _PR_SI_ARCHITECTURE "nios2" -+#elif defined(nios2) - #else - #error "Unknown CPU architecture" - #endif diff --git a/package.bak/libnspr/Config.in b/package.bak/libnspr/Config.in deleted file mode 100644 index ba1ea55933..0000000000 --- a/package.bak/libnspr/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT - def_bool y - depends on !BR2_arc && !BR2_xtensa && !BR2_bfin - -if BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT - -config BR2_PACKAGE_LIBNSPR - bool "libnspr" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - NSPR is the Netscape Portable Runtime library which provides - a platform-neutral API for system level and libc like - functions. The library is used by the Mozilla project as well - as others. - - http://www.mozilla.org/projects/nspr/ - -comment "libnspr needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -endif diff --git a/package.bak/libnspr/libnspr.hash b/package.bak/libnspr/libnspr.hash deleted file mode 100644 index a4b19b7f9c..0000000000 --- a/package.bak/libnspr/libnspr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.13.1/src/SHA256SUMS -sha256 5e4c1751339a76e7c772c0c04747488d7f8c98980b434dc846977e43117833ab nspr-4.13.1.tar.gz diff --git a/package.bak/libnspr/libnspr.mk b/package.bak/libnspr/libnspr.mk deleted file mode 100644 index d95f970988..0000000000 --- a/package.bak/libnspr/libnspr.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# libnspr -# -################################################################################ - -LIBNSPR_VERSION = 4.13.1 -LIBNSPR_SOURCE = nspr-$(LIBNSPR_VERSION).tar.gz -LIBNSPR_SITE = https://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v$(LIBNSPR_VERSION)/src -LIBNSPR_SUBDIR = nspr -LIBNSPR_INSTALL_STAGING = YES -LIBNSPR_CONFIG_SCRIPTS = nspr-config -LIBNSPR_LICENSE = MPLv2.0 -LIBNSPR_LICENSE_FILES = nspr/LICENSE - -# Set the host CFLAGS and LDFLAGS so NSPR does not guess wrongly -LIBNSPR_CONF_ENV = \ - HOST_CFLAGS="-g -O2" \ - HOST_LDFLAGS="-lc" -# NSPR mixes up --build and --host -LIBNSPR_CONF_OPTS = --host=$(GNU_HOST_NAME) -LIBNSPR_CONF_OPTS += --$(if $(BR2_ARCH_IS_64),en,dis)able-64bit - -# ./nspr/pr/include/md/_linux.h tests only __GLIBC__ version to detect -# c-library features, list musl features here for now (taken from -# Alpine Linux). -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LIBNSPR_CFLAGS += \ - -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T \ - -D_PR_INET6 \ - -D_PR_HAVE_INET_NTOP \ - -D_PR_HAVE_GETHOSTBYNAME2 \ - -D_PR_HAVE_GETADDRINFO \ - -D_PR_INET6_PROBE -endif - -LIBNSPR_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) $(LIBNSPR_CFLAGS)" - -ifeq ($(BR2_STATIC_LIBS),y) -LIBNSPR_MAKE_OPTS = SHARED_LIBRARY= -LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SHARED_LIBRARY= install -LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) SHARED_LIBRARY= install -endif - -ifeq ($(BR2_SHARED_LIBS),y) -LIBNSPR_MAKE_OPTS = LIBRARY= -LIBNSPR_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIBRARY= install -LIBNSPR_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIBRARY= install -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libnss/0001-cross-compile.patch b/package.bak/libnss/0001-cross-compile.patch deleted file mode 100644 index 31de71bc5a..0000000000 --- a/package.bak/libnss/0001-cross-compile.patch +++ /dev/null @@ -1,48 +0,0 @@ -This patch allows us to set a value for the cross compiler via TARGETCC without -setting CC on the command line. CC is used for host tools as well as cross -compiled code so we cannot define it on the command line without breaking -the host tools build. - -[Gustavo: update for nss 3.16.1] -[baruch: add OPTIMIZER handling] -Signed-off-by: Will Newton - -diff -Nuar nss-3.16.1-orig/nss/coreconf/Linux.mk nss-3.16.1/nss/coreconf/Linux.mk ---- nss-3.16.1-orig/nss/coreconf/Linux.mk 2014-05-02 06:27:18.000000000 +0300 -+++ nss-3.16.1/nss/coreconf/Linux.mk 2014-07-01 02:38:18.701480512 +0300 -@@ -16,9 +16,13 @@ - IMPL_STRATEGY = _PTH - endif - --CC = gcc --CCC = g++ --RANLIB = ranlib -+TARGETCC = gcc -+TARGETCCC = g++ -+TARGETRANLIB = ranlib -+ -+CC = $(TARGETCC) -+CCC = $(TARGETCCC) -+RANLIB = $(TARGETRANLIB) - - DEFAULT_COMPILER = gcc - -@@ -125,6 +129,7 @@ - endif - endif - -+OPTIMIZER = $(TARGET_OPTIMIZER) - - ifeq ($(USE_PTHREADS),1) - OS_PTHREAD = -lpthread -diff -Nuar nss-3.16.1-orig/nss/coreconf/nsinstall/Makefile nss-3.16.1/nss/coreconf/nsinstall/Makefile ---- nss-3.16.1-orig/nss/coreconf/nsinstall/Makefile 2014-05-02 06:27:18.000000000 +0300 -+++ nss-3.16.1/nss/coreconf/nsinstall/Makefile 2014-07-01 02:38:48.102185011 +0300 -@@ -31,6 +31,7 @@ - - ifdef NATIVE_FLAGS - OS_CFLAGS=$(NATIVE_FLAGS) -+OPTIMIZER= - endif - - include $(DEPTH)/coreconf/rules.mk diff --git a/package.bak/libnss/0002-uclibc.patch b/package.bak/libnss/0002-uclibc.patch deleted file mode 100644 index b81db930be..0000000000 --- a/package.bak/libnss/0002-uclibc.patch +++ /dev/null @@ -1,20 +0,0 @@ -uCLibc does not define RTLD_NOLOAD. - -[Gustavo: update for nss 3.16.1] -Signed-off-by: Will Newton - -diff -Nura nss-3.16.1.orig/nss/lib/freebl/stubs.c nss-3.16.1/nss/lib/freebl/stubs.c ---- nss-3.16.1.orig/nss/lib/freebl/stubs.c 2014-06-18 10:34:30.529997002 -0300 -+++ nss-3.16.1/nss/lib/freebl/stubs.c 2014-06-18 10:36:25.508882650 -0300 -@@ -594,6 +594,11 @@ - return SECSuccess; - } - -+/* uClibc does not define RTLD_NOLOAD. */ -+#ifndef RTLD_NOLOAD -+#define RTLD_NOLOAD 0 -+#endif -+ - /* - * fetch the library if it's loaded. For NSS it should already be loaded - */ diff --git a/package.bak/libnss/0003-it-uninitialized-fix.patch b/package.bak/libnss/0003-it-uninitialized-fix.patch deleted file mode 100644 index 7736c6a939..0000000000 --- a/package.bak/libnss/0003-it-uninitialized-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -# HG changeset patch -# User catdesk -# Date 1477710600 -7200 -# Sat Oct 29 05:10:00 2016 +0200 -# Node ID b9ef971b94ab110302d49255339077bc1b4aed7f -# Parent eb8c96563cd70aa69d48b01516085f7d2fb46178 -Bug 1313846 - Declare 'it = NULL' earlier. r=franziskus - -[Thomas: patch taken from upstream mercurial repository, revision -12791.] -Signed-off-by: Thomas Petazzoni - -diff -r eb8c96563cd7 -r b9ef971b94ab lib/jar/jarfile.c ---- a/nss/lib/jar/jarfile.c Mon Oct 31 17:31:20 2016 +0100 -+++ b/nss/lib/jar/jarfile.c Sat Oct 29 05:10:00 2016 +0200 -@@ -657,7 +657,7 @@ - jar_listzip(JAR *jar, JAR_FILE fp) - { - ZZLink *ent; -- JAR_Item *it; -+ JAR_Item *it = NULL; - JAR_Physical *phy = NULL; - struct ZipLocal *Local = PORT_ZNew(struct ZipLocal); - struct ZipCentral *Central = PORT_ZNew(struct ZipCentral); diff --git a/package.bak/libnss/Config.in b/package.bak/libnss/Config.in deleted file mode 100644 index f07bb043a6..0000000000 --- a/package.bak/libnss/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBNSS - bool "libnss" - select BR2_PACKAGE_LIBNSPR - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_HAS_THREADS # libnspr - depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT # libnspr - depends on !BR2_STATIC_LIBS - help - Network Security Services (NSS) is a set of libraries designed - to support development of security-enabled client and server - applications. Applications built with NSS can support SSL v2 - and v3, TLS, PKCS #5, PKCS #7, PKCS #11, PKCS #12, S/MIME, - and X.509 v3 certificates. - - http://www.mozilla.org/projects/security/pki/nss/ - -comment "libnss needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_LIBNSPR_ARCH_SUPPORT - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libnss/libnss.hash b/package.bak/libnss/libnss.hash deleted file mode 100644 index 975e52d238..0000000000 --- a/package.bak/libnss/libnss.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_27_2_RTM/src/SHA256SUMS -sha256 dc8ac8524469d0230274fd13a53fdcd74efe4aa67205dde1a4a92be87dc28524 nss-3.27.2.tar.gz diff --git a/package.bak/libnss/libnss.mk b/package.bak/libnss/libnss.mk deleted file mode 100644 index 76532e8117..0000000000 --- a/package.bak/libnss/libnss.mk +++ /dev/null @@ -1,99 +0,0 @@ -################################################################################ -# -# libnss -# -################################################################################ - -LIBNSS_VERSION = 3.27.2 -LIBNSS_SOURCE = nss-$(LIBNSS_VERSION).tar.gz -LIBNSS_SITE = https://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_$(subst .,_,$(LIBNSS_VERSION))_RTM/src -LIBNSS_DISTDIR = dist -LIBNSS_INSTALL_STAGING = YES -LIBNSS_DEPENDENCIES = libnspr sqlite zlib -LIBNSS_LICENSE = MPLv2.0 -LIBNSS_LICENSE_FILES = nss/COPYING - -# --gc-sections triggers binutils ld segfault -# https://sourceware.org/bugzilla/show_bug.cgi?id=21180 -ifeq ($(BR2_microblaze),y) -define LIBNSS_DROP_GC_SECTIONS - sed -i 's:-Wl,--gc-sections::g' $(@D)/nss/coreconf/Linux.mk -endef - -LIBNSS_PRE_CONFIGURE_HOOKS += LIBNSS_DROP_GC_SECTIONS -endif - -LIBNSS_BUILD_VARS = \ - MOZILLA_CLIENT=1 \ - NSPR_INCLUDE_DIR=$(STAGING_DIR)/usr/include/nspr \ - NSPR_LIB_DIR=$(STAGING_DIR)/usr/lib \ - BUILD_OPT=1 \ - NS_USE_GCC=1 \ - NSS_DISABLE_GTESTS=1 \ - NSS_USE_SYSTEM_SQLITE=1 \ - NSS_ENABLE_ECC=1 \ - NATIVE_CC="$(HOSTCC)" \ - TARGETCC="$(TARGET_CC)" \ - TARGETCCC="$(TARGET_CXX)" \ - TARGETRANLIB="$(TARGET_RANLIB)" \ - OS_ARCH="Linux" \ - OS_RELEASE="2.6" \ - OS_TEST="$(ARCH)" - -# #pragma usage needs gcc >= 4.8 -# See https://bugzilla.mozilla.org/show_bug.cgi?id=1226179 -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),) -LIBNSS_BUILD_VARS += NSS_ENABLE_WERROR=0 -endif - -ifeq ($(BR2_ARCH_IS_64),y) -# MIPS64 n32 is treated as a 32-bit architecture by libnss. -# See: https://bugzilla.mozilla.org/show_bug.cgi?id=1010730 -ifeq ($(BR2_MIPS_NABI32),) -LIBNSS_BUILD_VARS += USE_64=1 -endif -endif - -define LIBNSS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss coreconf \ - SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ - DIST=$(@D)/$(LIBNSS_DISTDIR) \ - CHECKLOC= \ - $(LIBNSS_BUILD_VARS) - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D)/nss lib/dbm all \ - SOURCE_MD_DIR=$(@D)/$(LIBNSS_DISTDIR) \ - DIST=$(@D)/$(LIBNSS_DISTDIR) \ - CHECKLOC= \ - $(LIBNSS_BUILD_VARS) TARGET_OPTIMIZER="$(TARGET_CFLAGS)" \ - NATIVE_FLAGS="$(HOST_CFLAGS)" -endef - -define LIBNSS_INSTALL_STAGING_CMDS - $(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \ - $(@D)/$(LIBNSS_DISTDIR)/lib/*.so - $(INSTALL) -m 755 -d $(STAGING_DIR)/usr/include/nss - $(INSTALL) -m 644 -t $(STAGING_DIR)/usr/include/nss \ - $(@D)/$(LIBNSS_DISTDIR)/public/nss/* - $(INSTALL) -m 755 -t $(STAGING_DIR)/usr/lib/ \ - $(@D)/$(LIBNSS_DISTDIR)/lib/*.a - $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ - $(STAGING_DIR)/usr/lib/pkgconfig/nss.pc - $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ - $(STAGING_DIR)/usr/lib/pkgconfig/nss.pc -endef - -define LIBNSS_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \ - $(@D)/$(LIBNSS_DISTDIR)/lib/*.so - $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/include/nss - $(INSTALL) -m 644 -t $(TARGET_DIR)/usr/include/nss \ - $(@D)/$(LIBNSS_DISTDIR)/public/nss/* - $(INSTALL) -m 755 -t $(TARGET_DIR)/usr/lib/ \ - $(@D)/$(LIBNSS_DISTDIR)/lib/*.a - $(INSTALL) -D -m 0644 $(TOPDIR)/package/libnss/nss.pc.in \ - $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc - $(SED) 's/@VERSION@/$(LIBNSS_VERSION)/g;' \ - $(TARGET_DIR)/usr/lib/pkgconfig/nss.pc -endef - -$(eval $(generic-package)) diff --git a/package.bak/libnss/nss.pc.in b/package.bak/libnss/nss.pc.in deleted file mode 100644 index e27783f64d..0000000000 --- a/package.bak/libnss/nss.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include/nss - -Name: NSS -Description: Mozilla Network Security Services -Version: @VERSION@ -Requires: nspr -Libs: -L${libdir} -lnss3 -lnssutil3 -lsmime3 -lssl3 -Cflags: -I${includedir} diff --git a/package.bak/liboauth/Config.in b/package.bak/liboauth/Config.in deleted file mode 100644 index 77a78f115a..0000000000 --- a/package.bak/liboauth/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBOAUTH - bool "liboauth" - select BR2_PACKAGE_OPENSSL - help - liboauth is a collection of c functions implementing the oAuth - Core 1.0 Rev A standard API. liboauth provides basic functions to - escape and encode parameters according to oAuth specs and offers - high-level functions to sign requests or verify signatures. - - http://liboauth.sourceforge.net/ diff --git a/package.bak/liboauth/liboauth.hash b/package.bak/liboauth/liboauth.hash deleted file mode 100644 index 6806a08f9f..0000000000 --- a/package.bak/liboauth/liboauth.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0df60157b052f0e774ade8a8bac59d6e8d4b464058cc55f9208d72e41156811f liboauth-1.0.3.tar.gz diff --git a/package.bak/liboauth/liboauth.mk b/package.bak/liboauth/liboauth.mk deleted file mode 100644 index bd54330ddf..0000000000 --- a/package.bak/liboauth/liboauth.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# liboauth -# -################################################################################ - -LIBOAUTH_VERSION = 1.0.3 -LIBOAUTH_SITE = http://downloads.sourceforge.net/project/liboauth -LIBOAUTH_INSTALL_STAGING = YES -LIBOAUTH_DEPENDENCIES += host-pkgconf openssl -LIBOAUTH_LICENSE = MIT -LIBOAUTH_LICENSE_FILES = COPYING.MIT - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -LIBOAUTH_DEPENDENCIES += libcurl -else -LIBOAUTH_CONF_OPTS += --disable-libcurl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libogg/Config.in b/package.bak/libogg/Config.in deleted file mode 100644 index bf719ff4d7..0000000000 --- a/package.bak/libogg/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBOGG - bool "libogg" - help - Ogg is a multimedia container format, and the native file - and stream format for the Xiph.org multimedia codecs. As - with all Xiph.org technology is it an open format free for - anyone to use. - - http://xiph.org/ogg/ diff --git a/package.bak/libogg/libogg.hash b/package.bak/libogg/libogg.hash deleted file mode 100644 index 393ebee2a3..0000000000 --- a/package.bak/libogg/libogg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: http://www.xiph.org/downloads/ -sha256 3f687ccdd5ac8b52d76328fbbfebc70c459a40ea891dbf3dccb74a210826e79b libogg-1.3.2.tar.xz diff --git a/package.bak/libogg/libogg.mk b/package.bak/libogg/libogg.mk deleted file mode 100644 index 8fff52970b..0000000000 --- a/package.bak/libogg/libogg.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libogg -# -################################################################################ - -LIBOGG_VERSION = 1.3.2 -LIBOGG_SOURCE = libogg-$(LIBOGG_VERSION).tar.xz -LIBOGG_SITE = http://downloads.xiph.org/releases/ogg -LIBOGG_LICENSE = BSD-3c -LIBOGG_LICENSE_FILES = COPYING - -LIBOGG_INSTALL_STAGING = YES -LIBOGG_DEPENDENCIES = host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libopenh264/Config.in b/package.bak/libopenh264/Config.in deleted file mode 100644 index 2b77578a83..0000000000 --- a/package.bak/libopenh264/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_x86_64 - -config BR2_PACKAGE_LIBOPENH264 - bool "libopenh264" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS - help - OpenH264 is a codec library which supports H.264 encoding and - decoding. - - http://www.openh264.org - -comment "libopenh264 needs a toolchain w/ C++, dynamic library, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - depends on BR2_PACKAGE_LIBOPENH264_ARCH_SUPPORTS diff --git a/package.bak/libopenh264/libopenh264.hash b/package.bak/libopenh264/libopenh264.hash deleted file mode 100644 index 2fc76ecc1a..0000000000 --- a/package.bak/libopenh264/libopenh264.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 65d307bf312543ad6e98ec02abb7c27d8fd2c9740fd069d7249844612674a2c7 libopenh264-v1.6.0.tar.gz diff --git a/package.bak/libopenh264/libopenh264.mk b/package.bak/libopenh264/libopenh264.mk deleted file mode 100644 index 40bbf80e25..0000000000 --- a/package.bak/libopenh264/libopenh264.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# libopenh264 -# -################################################################################ - -LIBOPENH264_VERSION = v1.6.0 -LIBOPENH264_SITE = $(call github,cisco,openh264,$(LIBOPENH264_VERSION)) -LIBOPENH264_LICENSE = BSD-2c -LIBOPENH264_LICENSE_FILES = LICENSE -LIBOPENH264_INSTALL_STAGING = YES - -ifeq ($(BR2_aarch64),y) -LIBOPENH264_ARCH = aarch64 -else ifeq ($(BR2_arm)$(BR2_armeb),y) -LIBOPENH264_ARCH = arm -else ifeq ($(BR2_i386),y) -LIBOPENH264_ARCH = x86 -LIBOPENH264_DEPENDENCIES += host-nasm -else ifeq ($(BR2_mips)$(BR2_mipsel),y) -LIBOPENH264_ARCH = mips -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) -LIBOPENH264_ARCH = mips64 -else ifeq ($(BR2_x86_64),y) -LIBOPENH264_ARCH = x86_64 -LIBOPENH264_DEPENDENCIES += host-nasm -endif - -# ENABLE64BIT is really only used for x86-64, other 64 bits -# architecture don't need it. -LIBOPENH264_MAKE_OPTS = \ - ARCH=$(LIBOPENH264_ARCH) \ - ENABLE64BIT=$(if $(BR2_x86_64),Yes,No) - -define LIBOPENH264_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(LIBOPENH264_MAKE_OPTS) -endef - -define LIBOPENH264_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(LIBOPENH264_MAKE_OPTS) \ - DESTDIR=$(STAGING_DIR) PREFIX=/usr install -endef - -define LIBOPENH264_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - $(LIBOPENH264_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/liboping/0001-configure-also-check-for-clockgettime.patch b/package.bak/liboping/0001-configure-also-check-for-clockgettime.patch deleted file mode 100644 index b2c585559a..0000000000 --- a/package.bak/liboping/0001-configure-also-check-for-clockgettime.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a45f3610beba1f7e6e1a038e3a1fe4150057c262 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 5 Jul 2016 15:31:28 +0200 -Subject: [PATCH] configure: also check for clockgettime() - -clock_gettime() is also in -lrt so we also need to check for it. - -Signed-off-by: "Yann E. MORIN" ---- - configure.ac | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f83f5ab..3b6ae09 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -199,12 +199,16 @@ fi - - AC_SUBST(LIBOPING_PC_LIBS_PRIVATE) - --nanosleep_needs_rt="no" -+needs_rt="no" - AC_CHECK_FUNCS(nanosleep, [], - AC_CHECK_LIB(rt, nanosleep, -- [nanosleep_needs_rt="yes"], -+ [needs_rt="yes"], - AC_MSG_ERROR(cannot find nanosleep))) --AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$nanosleep_needs_rt" = "xyes") -+AC_CHECK_FUNCS(clock_gettime, [], -+ AC_CHECK_LIB(rt, clock_gettime, -+ [needs_rt="yes"], -+ AC_MSG_ERROR(cannot find clock_gettime))) -+AM_CONDITIONAL(BUILD_WITH_LIBRT, test "x$needs_rt" = "xyes") - - with_ncurses="no" - AC_CHECK_HEADERS(ncursesw/ncurses.h ncurses.h, [with_ncurses="yes"], []) --- -2.7.4 - diff --git a/package.bak/liboping/Config.in b/package.bak/liboping/Config.in deleted file mode 100644 index 1d2de31874..0000000000 --- a/package.bak/liboping/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBOPING - bool "liboping" - help - liboping is a C library to generate ICMP echo requests, - better known as "ping packets". - - http://noping.cc/ diff --git a/package.bak/liboping/liboping.hash b/package.bak/liboping/liboping.hash deleted file mode 100644 index 3e796cca62..0000000000 --- a/package.bak/liboping/liboping.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://noping.cc/#download -sha256 44bb1d88b56b88fda5533edb3aa005c69b3cd396f20453a157d7e31e536f3530 liboping-1.9.0.tar.bz2 diff --git a/package.bak/liboping/liboping.mk b/package.bak/liboping/liboping.mk deleted file mode 100644 index dd70387199..0000000000 --- a/package.bak/liboping/liboping.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# liboping -# -################################################################################ - -LIBOPING_VERSION = 1.9.0 -LIBOPING_SITE = http://noping.cc/files -LIBOPING_SOURCE = liboping-$(LIBOPING_VERSION).tar.bz2 -LIBOPING_INSTALL_STAGING = YES -LIBOPING_DEPENDENCIES = $(if $(BR2_PACKAGE_NCURSES),ncurses) -LIBOPING_CONF_OPTS = --without-perl-bindings -LIBOPING_LICENSE = LGPLv2.1+, GPLv2 -LIBOPING_LICENSE_FILES = COPYING - -LIBOPING_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libosip2/Config.in b/package.bak/libosip2/Config.in deleted file mode 100644 index 5b1d3d2661..0000000000 --- a/package.bak/libosip2/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBOSIP2 - bool "libosip2" - help - GNU SIP (Session Initiation Protocol) - This library aims to provide multimedia and telecom software - developers an easy and powerful interface to initiate and - control SIP based sessions in their applications. - SIP is a open standard replacement from IETF for H323. - - http://www.gnu.org/software/osip/ diff --git a/package.bak/libosip2/libosip2.hash b/package.bak/libosip2/libosip2.hash deleted file mode 100644 index 9ff2d9a98a..0000000000 --- a/package.bak/libosip2/libosip2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 c9a18b0c760506d150017cdb1fa5c1cefe12b8dcbbf9a7e784eb75af376e96cd libosip2-3.6.0.tar.gz diff --git a/package.bak/libosip2/libosip2.mk b/package.bak/libosip2/libosip2.mk deleted file mode 100644 index f22dcc3117..0000000000 --- a/package.bak/libosip2/libosip2.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libosip2 -# -################################################################################ - -LIBOSIP2_VERSION = 3.6.0 -LIBOSIP2_SITE = $(BR2_GNU_MIRROR)/osip -LIBOSIP2_INSTALL_STAGING = YES -LIBOSIP2_LICENSE = LGPLv2.1+ -LIBOSIP2_LICENSE_FILES = COPYING - -ifeq ($(BR2_arc),y) -# toolchain __arc__ define conflicts with libosip2 source -LIBOSIP2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" -endif - -LIBOSIP2_CONF_OPTS = \ - --enable-mt=$(if $(BR2_TOOLCHAIN_HAS_THREADS),yes,no) - -$(eval $(autotools-package)) diff --git a/package.bak/libpam-radius-auth/Config.in b/package.bak/libpam-radius-auth/Config.in deleted file mode 100644 index a0dec148d7..0000000000 --- a/package.bak/libpam-radius-auth/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBPAM_RADIUS_AUTH - bool "libpam-radius-auth" - help - This is the PAM to RADIUS authentication module. It allows - any PAM-capable machine to become a RADIUS client for - authentication and accounting requests. You will need a - RADIUS server to perform the actual authentication. - - http://freeradius.org/pam_radius_auth/ diff --git a/package.bak/libpam-radius-auth/libpam-radius-auth.hash b/package.bak/libpam-radius-auth/libpam-radius-auth.hash deleted file mode 100644 index ffd7404df3..0000000000 --- a/package.bak/libpam-radius-auth/libpam-radius-auth.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking PGP signature -sha256 742d79fc39824726c098e746bd3dc3484f983f5ee082c621c1e848b2c3725305 pam_radius-1.4.0.tar.gz diff --git a/package.bak/libpam-radius-auth/libpam-radius-auth.mk b/package.bak/libpam-radius-auth/libpam-radius-auth.mk deleted file mode 100644 index 5ed5953c5b..0000000000 --- a/package.bak/libpam-radius-auth/libpam-radius-auth.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libpam-radius-auth -# -################################################################################ - -LIBPAM_RADIUS_AUTH_VERSION = 1.4.0 -LIBPAM_RADIUS_AUTH_SITE = ftp://ftp.freeradius.org/pub/radius -LIBPAM_RADIUS_AUTH_SOURCE = pam_radius-$(LIBPAM_RADIUS_AUTH_VERSION).tar.gz -LIBPAM_RADIUS_AUTH_DEPENDENCIES = linux-pam -LIBPAM_RADIUS_AUTH_INSTALL_STAGING = YES -LIBPAM_RADIUS_AUTH_LICENSE = GPLv2+ -LIBPAM_RADIUS_AUTH_LICENSE_FILES = LICENSE -# While autoconf is used for configuration, the Makefile is -# hand-written, so we need to pass CC, LD, CFLAGS at build time. -LIBPAM_RADIUS_AUTH_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) - -define LIBPAM_RADIUS_AUTH_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/lib/security/ - cp -dpfr $(@D)/pam_radius_auth.so* $(STAGING_DIR)/lib/security/ -endef - -define LIBPAM_RADIUS_AUTH_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/security/ - cp -dpfr $(@D)/pam_radius_auth.so* $(TARGET_DIR)/lib/security/ -endef - -$(eval $(autotools-package)) diff --git a/package.bak/libpam-tacplus/Config.in b/package.bak/libpam-tacplus/Config.in deleted file mode 100644 index 2d80809d3b..0000000000 --- a/package.bak/libpam-tacplus/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBPAM_TACPLUS - bool "libpam-tacplus" - help - TACACS+ protocol client library and PAM module in C. This - PAM module support authentication, authorization (account - management) and accounting (session management)performed - using TACACS+ protocol designed by Cisco. - - https://github.com/jeroennijhof/pam_tacplus diff --git a/package.bak/libpam-tacplus/libpam-tacplus.hash b/package.bak/libpam-tacplus/libpam-tacplus.hash deleted file mode 100644 index c8a772322e..0000000000 --- a/package.bak/libpam-tacplus/libpam-tacplus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 747f7ad980a3726ed3abc5fec92e867efa8af8c53caac547cab7eb6af5ce0edf libpam-tacplus-1.3.9.tar.gz diff --git a/package.bak/libpam-tacplus/libpam-tacplus.mk b/package.bak/libpam-tacplus/libpam-tacplus.mk deleted file mode 100644 index 6696d89887..0000000000 --- a/package.bak/libpam-tacplus/libpam-tacplus.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libpam-tacplus -# -################################################################################ - -LIBPAM_TACPLUS_VERSION = 1.3.9 -LIBPAM_TACPLUS_SITE = $(call github,jeroennijhof,pam_tacplus,$(LIBPAM_TACPLUS_VERSION)) -LIBPAM_TACPLUS_LICENSE = GPLv2+ -LIBPAM_TACPLUS_LICENSE_FILES = COPYING -LIBPAM_TACPLUS_DEPENDENCIES = linux-pam -# Fetching from github, we need to generate the configure script -LIBPAM_TACPLUS_AUTORECONF = YES -LIBPAM_TACPLUS_AUTORECONF_OPTS = -I m4 -LIBPAM_TACPLUS_INSTALL_STAGING = YES -LIBPAM_TACPLUS_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) -LIBPAM_TACPLUS_CONF_OPTS = \ - --enable-pamdir=/lib/security - -$(eval $(autotools-package)) diff --git a/package.bak/libpcap/Config.in b/package.bak/libpcap/Config.in deleted file mode 100644 index 7f9517a7bc..0000000000 --- a/package.bak/libpcap/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBPCAP - bool "libpcap" - select BR2_PACKAGE_ZLIB - help - A system-independent library for user-level network packet capture. - - http://www.tcpdump.org/ diff --git a/package.bak/libpcap/libpcap.hash b/package.bak/libpcap/libpcap.hash deleted file mode 100644 index 6894046aff..0000000000 --- a/package.bak/libpcap/libpcap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 673dbc69fdc3f5a86fb5759ab19899039a8e5e6c631749e48dcd9c6f0c83541e libpcap-1.8.1.tar.gz diff --git a/package.bak/libpcap/libpcap.mk b/package.bak/libpcap/libpcap.mk deleted file mode 100644 index 505e2abe3d..0000000000 --- a/package.bak/libpcap/libpcap.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# libpcap -# -################################################################################ - -LIBPCAP_VERSION = 1.8.1 -LIBPCAP_SITE = http://www.tcpdump.org/release -LIBPCAP_LICENSE = BSD-3c -LIBPCAP_LICENSE_FILES = LICENSE -LIBPCAP_INSTALL_STAGING = YES -LIBPCAP_DEPENDENCIES = zlib host-flex host-bison - -LIBPCAP_CONF_ENV = \ - ac_cv_header_linux_wireless_h=yes \ - CFLAGS="$(LIBPCAP_CFLAGS)" -LIBPCAP_CFLAGS = $(TARGET_CFLAGS) -LIBPCAP_CONF_OPTS = --disable-yydebug --with-pcap=linux -LIBPCAP_CONFIG_SCRIPTS = pcap-config - -# Omit -rpath from pcap-config output -define LIBPCAP_CONFIG_REMOVE_RPATH - $(SED) 's/^V_RPATH_OPT=.*/V_RPATH_OPT=""/g' $(@D)/pcap-config -endef -LIBPCAP_POST_BUILD_HOOKS = LIBPCAP_CONFIG_REMOVE_RPATH - -# On purpose, not compatible with bluez5 -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -LIBPCAP_DEPENDENCIES += bluez_utils -else -LIBPCAP_CONF_OPTS += --disable-bluetooth -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -LIBPCAP_CONF_OPTS += --enable-dbus -LIBPCAP_DEPENDENCIES += dbus -else -LIBPCAP_CONF_OPTS += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -LIBPCAP_CONF_OPTS += --enable-canusb -LIBPCAP_DEPENDENCIES += libusb -else -LIBPCAP_CONF_OPTS += --disable-canusb -endif - -ifeq ($(BR2_PACKAGE_LIBNL),y) -LIBPCAP_DEPENDENCIES += libnl -LIBPCAP_CFLAGS += "-I$(STAGING_DIR)/usr/include/libnl3" -LIBPCAP_CONF_OPTS += --with-libnl=$(STAGING_DIR)/usr -else -LIBPCAP_CONF_OPTS += --without-libnl -endif - -# microblaze/sparc/sparc64 need -fPIC instead of -fpic -ifeq ($(BR2_microblaze)$(BR2_sparc)$(BR2_sparc64),y) -LIBPCAP_CFLAGS += -fPIC -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libpciaccess/0001-limits_h.patch b/package.bak/libpciaccess/0001-limits_h.patch deleted file mode 100644 index c5c8444a59..0000000000 --- a/package.bak/libpciaccess/0001-limits_h.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix compilation error with musl-based toolchain - -linux_sysfs.c:751:15: error: 'PATH_MAX' undeclared (first use in this function) - char name[PATH_MAX]; - -Patch applied upstream: -http://cgit.freedesktop.org/xorg/lib/libpciaccess/commit/?id=8ea3af620a2d4ad5648917b4a0ef2b23ff566774 - -Signed-off-by: Felix Janda -Signed-off-by: Bernd Kuhls - -diff -uNr libpciaccess-0.13.3.org/src/linux_sysfs.c libpciaccess-0.13.3/src/linux_sysfs.c ---- libpciaccess-0.13.3.org/src/linux_sysfs.c 2015-02-04 00:59:14.000000000 +0100 -+++ libpciaccess-0.13.3/src/linux_sysfs.c 2015-04-10 21:57:35.000000000 +0200 -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) - #include diff --git a/package.bak/libpciaccess/0002-musl-arm.patch b/package.bak/libpciaccess/0002-musl-arm.patch deleted file mode 100644 index 0077f451bf..0000000000 --- a/package.bak/libpciaccess/0002-musl-arm.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix musl build - -Inspired by http://patchwork.openembedded.org/patch/111661/ -"inb/outb are implemented for ARM on glibc but not on linux in general -therefore the conditional has to reflect that" - -Signed-off-by: Bernd Kuhls - -diff -uNr libpciaccess-0.13.4.org/src/linux_sysfs.c libpciaccess-0.13.4/src/linux_sysfs.c ---- libpciaccess-0.13.4.org/src/linux_sysfs.c 2015-05-01 06:44:47.000000000 +0200 -+++ libpciaccess-0.13.4/src/linux_sysfs.c 2016-01-24 15:27:57.141562678 +0100 -@@ -49,7 +49,7 @@ - #include - #include - --#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) -+#if defined(__i386__) || defined(__x86_64__) - #include - #else - #define inb(x) -1 diff --git a/package.bak/libpciaccess/Config.in b/package.bak/libpciaccess/Config.in deleted file mode 100644 index 6cc983f577..0000000000 --- a/package.bak/libpciaccess/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_LIBPCIACCESS - bool "libpciaccess" - help - X.Org libpciaccess diff --git a/package.bak/libpciaccess/libpciaccess.hash b/package.bak/libpciaccess/libpciaccess.hash deleted file mode 100644 index 0483c4c814..0000000000 --- a/package.bak/libpciaccess/libpciaccess.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002590.html -sha256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf libpciaccess-0.13.4.tar.bz2 diff --git a/package.bak/libpciaccess/libpciaccess.mk b/package.bak/libpciaccess/libpciaccess.mk deleted file mode 100644 index ced0786a18..0000000000 --- a/package.bak/libpciaccess/libpciaccess.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libpciaccess -# -################################################################################ - -LIBPCIACCESS_VERSION = 0.13.4 -LIBPCIACCESS_SOURCE = libpciaccess-$(LIBPCIACCESS_VERSION).tar.bz2 -LIBPCIACCESS_SITE = http://xorg.freedesktop.org/releases/individual/lib -LIBPCIACCESS_LICENSE = MIT -LIBPCIACCESS_LICENSE_FILES = COPYING -LIBPCIACCESS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBPCIACCESS_CONF_OPTS += --with-zlib -LIBPCIACCESS_DEPENDENCIES += zlib -else -LIBPCIACCESS_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libpfm4/Config.in b/package.bak/libpfm4/Config.in deleted file mode 100644 index 441c6dee09..0000000000 --- a/package.bak/libpfm4/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBPFM4 - bool "libpfm4" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - help - A helper library to help encode Performance Events to use with - Operating system kernels performance monitoring interfaces. - - http://perfmon2.sourceforge.net/ - -comment "libpfm4 needs a toolchain w/ NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/libpfm4/libpfm4.hash b/package.bak/libpfm4/libpfm4.hash deleted file mode 100644 index 8bebc493fd..0000000000 --- a/package.bak/libpfm4/libpfm4.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/perfmon2/files/libpfm4/: -sha1 2ed06d6e746f7b1cd4b70e9736e621052f60d625 libpfm-4.6.0.tar.gz -md5 5077b9022440e4951d96f2d0e73bd487 libpfm-4.6.0.tar.gz -# Locally calculated -sha256 5ab1e5b0472550f9037a8800834f6bc3b927690070f69fac0b67284b4b05fd5f libpfm-4.6.0.tar.gz diff --git a/package.bak/libpfm4/libpfm4.mk b/package.bak/libpfm4/libpfm4.mk deleted file mode 100644 index 913fc35831..0000000000 --- a/package.bak/libpfm4/libpfm4.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# libpfm4 -# -################################################################################ - -LIBPFM4_VERSION = 4.6.0 -LIBPFM4_SOURCE = libpfm-$(LIBPFM4_VERSION).tar.gz -LIBPFM4_SITE = http://downloads.sourceforge.net/project/perfmon2/libpfm4 -LIBPFM4_LICENSE = libpfm4 license -LIBPFM4_LICENSE_FILES = COPYING -LIBPFM4_INSTALL_STAGING = YES - -LIBPFM4_FLAGS = SYS=Linux ARCH=$(BR2_ARCH) \ - CC="$(TARGET_CC)" LDCONFIG=true \ - CONFIG_PFMLIB_SHARED=$(if $(BR2_STATIC_LIBS),n,y) \ - DBG= - -define LIBPFM4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) -endef - -define LIBPFM4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(STAGING_DIR)/usr install -endef - -define LIBPFM4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBPFM4_FLAGS) PREFIX=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libphidget/Config.in b/package.bak/libphidget/Config.in deleted file mode 100644 index 7466fb5056..0000000000 --- a/package.bak/libphidget/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_LIBPHIDGET - bool "libphidget" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBUSB - help - The libphidget library provides an API for controlling Phidgets - USB devices. The library translates API function calls to libusb - function calls to control attached Phidgets devices that provide - GPIO's, DAC's, accelerometers, servo motors, and other capabilities - either singly or on combo devices. - - To use libphidget for controlling locally attached devices you - need to set up the userspace USB device tree /dev/bus/usb. See - file udev/99-phidgets.rules. - - The libphidget library also contains an API for sending commands - to a local or remote phidgetwebservice using HTTP. The - phidgetwebservice then translates HTTP requests to libphidget API - function calls to control locally attached Phidgets devices. - - http://phidgets.com/ - -comment "libphidget needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS diff --git a/package.bak/libphidget/libphidget.hash b/package.bak/libphidget/libphidget.hash deleted file mode 100644 index a89ba367ed..0000000000 --- a/package.bak/libphidget/libphidget.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2d496828a085ada8ff139da9306bd2b8cb987798fee93caf0089dc399195e238 libphidget_2.1.8.20140319.tar.gz diff --git a/package.bak/libphidget/libphidget.mk b/package.bak/libphidget/libphidget.mk deleted file mode 100644 index 1b2557d726..0000000000 --- a/package.bak/libphidget/libphidget.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libphidget -# -################################################################################ - -LIBPHIDGET_VERSION = 2.1.8.20140319 -LIBPHIDGET_SOURCE = libphidget_$(LIBPHIDGET_VERSION).tar.gz -LIBPHIDGET_SITE = http://www.phidgets.com/downloads/libraries -LIBPHIDGET_DEPENDENCIES = libusb -LIBPHIDGET_CONF_OPTS = --disable-ldconfig -LIBPHIDGET_INSTALL_STAGING = YES -LIBPHIDGET_LICENSE = LGPLv3 -LIBPHIDGET_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libpjsip/Config.in b/package.bak/libpjsip/Config.in deleted file mode 100644 index 727d2ec3d0..0000000000 --- a/package.bak/libpjsip/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBPJSIP - bool "libpjsip" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBSRTP - help - PJSIP is a free and open source multimedia communication - library written in C language implementing standard based - protocols such as: SIP, SDP, RTP, STUN, TURN, and ICE. - - http://www.pjsip.org - -comment "libpjsip needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libpjsip/libpjsip.hash b/package.bak/libpjsip/libpjsip.hash deleted file mode 100644 index ec636a8562..0000000000 --- a/package.bak/libpjsip/libpjsip.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://www.pjsip.org/release/2.6/MD5SUM.TXT -md5 c347a672679e7875ce572e18517884b2 pjproject-2.6.tar.bz2 - -# Locally computed -sha256 2f5a1da1c174d845871c758bd80fbb580fca7799d3cfaa0d3c4e082b5161c7b4 pjproject-2.6.tar.bz2 diff --git a/package.bak/libpjsip/libpjsip.mk b/package.bak/libpjsip/libpjsip.mk deleted file mode 100644 index b0d06099bb..0000000000 --- a/package.bak/libpjsip/libpjsip.mk +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# -# libpjsip -# -################################################################################ - -LIBPJSIP_VERSION = 2.6 -LIBPJSIP_SOURCE = pjproject-$(LIBPJSIP_VERSION).tar.bz2 -LIBPJSIP_SITE = http://www.pjsip.org/release/$(LIBPJSIP_VERSION) -LIBPJSIP_DEPENDENCIES = libsrtp -LIBPJSIP_LICENSE = GPLv2+ -LIBPJSIP_LICENSE_FILES = COPYING -LIBPJSIP_INSTALL_STAGING = YES -LIBPJSIP_MAKE = $(MAKE1) - -LIBPJSIP_CFLAGS = $(TARGET_CFLAGS) -DPJ_HAS_IPV6=1 - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -LIBPJSIP_CFLAGS += -mxgot -endif - -LIBPJSIP_CONF_ENV = \ - LD="$(TARGET_CC)" \ - CFLAGS="$(LIBPJSIP_CFLAGS)" - -LIBPJSIP_CONF_OPTS = \ - --disable-sound \ - --disable-gsm-codec \ - --disable-speex-codec \ - --disable-speex-aec \ - --disable-resample \ - --disable-video \ - --disable-opencore-amr \ - --disable-g7221-codec \ - --disable-ilbc-codec \ - --disable-libwebrtc \ - --disable-opus \ - --disable-oss \ - --disable-ext-sound \ - --disable-small-filter \ - --disable-large-filter \ - --disable-g711-codec \ - --disable-l16-codec \ - --disable-g722-codec \ - --disable-libsamplerate \ - --disable-sdl \ - --disable-ffmpeg \ - --disable-v4l2 \ - --disable-openh264 \ - --disable-libyuv \ - --disable-ipp \ - --disable-ssl \ - --disable-silk \ - --with-external-srtp - -# Note: aconfigure.ac is broken: --enable-epoll or --disable-epoll will -# both enable it. But that's OK, epoll is better than the alternative, -# so we want to use it. -LIBPJSIP_CONF_OPTS += --enable-epoll - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBPJSIP_DEPENDENCIES += openssl -LIBPJSIP_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr -else -LIBPJSIP_CONF_OPTS += --disable-ssl -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIBPJSIP_DEPENDENCIES += util-linux -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libplatform/0001-p8-platform-config-fix-lookup-paths.patch b/package.bak/libplatform/0001-p8-platform-config-fix-lookup-paths.patch deleted file mode 100644 index d487fd942e..0000000000 --- a/package.bak/libplatform/0001-p8-platform-config-fix-lookup-paths.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 01b5478638c705af29f09ad4ed70289f70a21dcf Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 6 Feb 2017 14:04:47 +0100 -Subject: [PATCH] p8-platform-config: fix lookup paths - -Use the proper methods to find the headers and the library. - -Signed-off-by: Samuel Martin -Signed-off-by: "Yann E. MORIN" ---- - p8-platform-config.cmake.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/p8-platform-config.cmake.in b/p8-platform-config.cmake.in -index 47f30f1..f59418d 100644 ---- a/p8-platform-config.cmake.in -+++ b/p8-platform-config.cmake.in -@@ -10,7 +10,7 @@ - # - # propagate these properties from one build system to the other - set (p8-platform_VERSION "@p8-platform_VERSION_MAJOR@.@p8-platform_VERSION_MINOR@") --set (p8-platform_INCLUDE_DIRS @p8-platform_INCLUDE_DIRS@ @CMAKE_INSTALL_PREFIX@/include) -+find_path (p8-platform_INCLUDE_DIRS p8-platform/os.h) - set (p8-platform_LIBRARY_DIRS "@CMAKE_LIBRARY_OUTPUT_DIRECTORY@") - set (p8-platform_LINKER_FLAGS "@p8-platform_LINKER_FLAGS@") - set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") -@@ -19,7 +19,7 @@ set (p8-platform_CONFIG_VARS "@p8-platform_CONFIG_VARS@") - if(WIN32) - set (p8-platform_LIBRARY "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/p8-platform.lib") - else(WIN32) -- set (p8-platform_LIBRARY "-L@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@ -lp8-platform") -+ find_library (p8-platform_LIBRARY p8-platform) - endif(WIN32) - set (p8-platform_LIBRARIES ${p8-platform_LIBRARY} "@p8-platform_LIBRARIES@") - mark_as_advanced (p8-platform_LIBRARY) --- -2.7.4 - diff --git a/package.bak/libplatform/Config.in b/package.bak/libplatform/Config.in deleted file mode 100644 index 7d275b1fc9..0000000000 --- a/package.bak/libplatform/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBPLATFORM - bool - help - Platform support library used by libCEC and binary add-ons for Kodi - - https://github.com/Pulse-Eight/platform diff --git a/package.bak/libplatform/libplatform.hash b/package.bak/libplatform/libplatform.hash deleted file mode 100644 index e3d5ed5a91..0000000000 --- a/package.bak/libplatform/libplatform.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 88711f1b949285867538a0b2e4189532778e1515325dfa1851eae9d18b6affd9 libplatform-2.1.0.tar.gz diff --git a/package.bak/libplatform/libplatform.mk b/package.bak/libplatform/libplatform.mk deleted file mode 100644 index d9cd582f71..0000000000 --- a/package.bak/libplatform/libplatform.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libplatform -# -################################################################################ - -LIBPLATFORM_VERSION = 2.1.0 -LIBPLATFORM_SITE = $(call github,Pulse-Eight,platform,p8-platform-$(LIBPLATFORM_VERSION)) -LIBPLATFORM_LICENSE = GPLv2+ -LIBPLATFORM_LICENSE_FILES = src/os.h -LIBPLATFORM_INSTALL_STAGING = YES - -$(eval $(cmake-package)) diff --git a/package.bak/libplayer/0001-add-fpic.patch b/package.bak/libplayer/0001-add-fpic.patch deleted file mode 100644 index e4b227f911..0000000000 --- a/package.bak/libplayer/0001-add-fpic.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add -fPIC to CFLAGS - --fPIC is needed to build shared library code. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,6 +9,7 @@ - SHARED_LIBNAME_VERSION = $(SHARED_LIBNAME).$(VERSION) - SHARED_LIBNAME_MAJOR = $(SHARED_LIBNAME).$(shell echo $(VERSION) | cut -f1 -d.) - SHARED_LIBNAME_FLAGS = -shared -Wl,-soname,$(SHARED_LIBNAME_MAJOR) -+CFLAGS = -fPIC - - ifeq ($(BUILD_STATIC),yes) - BUILD_RULES += lib_static diff --git a/package.bak/libplayer/0002-fix-configure-cflags.patch b/package.bak/libplayer/0002-fix-configure-cflags.patch deleted file mode 100644 index 186afd562e..0000000000 --- a/package.bak/libplayer/0002-fix-configure-cflags.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Arnout Vandecappelle (Essensium/Mind) -Subject: [PATCH] libplayer: Fix handling of cflags in configure. - -The cflags returned by pkg-config or another config script may consist -of several arguments for the compiler. These should not be quoted together -into a single argument. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- -Sent upstream to devel@geexbox.org on July 11, 2012. ---- -diff -rup libplayer-2.0.1.orig/configure libplayer-2.0.1/configure ---- libplayer-2.0.1.orig/configure 2010-10-03 19:26:11.000000000 +0200 -+++ libplayer-2.0.1/configure 2012-07-10 23:33:02.783701852 +0200 -@@ -342,7 +342,7 @@ check_libconfig(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -364,7 +364,7 @@ check_libconfig_exists(){ - err=1 - if `which "$config" 1>/dev/null 2>&1`; then - cflags=`$config $ccflags` -- [ -n "$cflags" ] && temp_cflags "$cflags" -+ [ -n "$cflags" ] && temp_cflags $cflags - libs=`$config $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" -@@ -386,7 +386,7 @@ check_pkgconfig(){ - err=1 - if `which pkg-config 1>/dev/null 2>&1`; then - cflags=`pkg-config $pkg $ccflags` -- [ -n "$cflags" ] && check_cflags "$cflags" -+ [ -n "$cflags" ] && check_cflags $cflags - libs=`pkg-config $pkg $clibs` - if [ -n "$libs" ]; then - temp_extralibs "$libs" diff --git a/package.bak/libplayer/Config.in b/package.bak/libplayer/Config.in deleted file mode 100644 index 37fbb26c5b..0000000000 --- a/package.bak/libplayer/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_LIBPLAYER - depends on BR2_TOOLCHAIN_HAS_THREADS - bool "libplayer" - help - libplayer provides a generic A/V API that relies on various multimedia - player for Linux systems. It currently supports MPlayer, xine VLC and - GStreamer only - - http://libplayer.geexbox.org/ - -if BR2_PACKAGE_LIBPLAYER -config BR2_PACKAGE_LIBPLAYER_MPLAYER - bool "mplayer backend" - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer - select BR2_PACKAGE_MPLAYER - -config BR2_PACKAGE_LIBPLAYER_GSTREAMER - bool "gstreamer backend" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_GSTREAMER - -comment "gstreamer backend needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_LIBPLAYER_PYTHON - depends on BR2_PACKAGE_PYTHON - depends on BROKEN # player_init params, builds for host - bool "Libplayer python bindings" -endif - -comment "libplayer needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libplayer/libplayer.hash b/package.bak/libplayer/libplayer.hash deleted file mode 100644 index 6f131433b4..0000000000 --- a/package.bak/libplayer/libplayer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 aa5eeb54f773bc9cad2733e4a0b5870208fc7f75024515ea87e55f64653e9d65 libplayer-2.0.1.tar.bz2 diff --git a/package.bak/libplayer/libplayer.mk b/package.bak/libplayer/libplayer.mk deleted file mode 100644 index ee5362dc46..0000000000 --- a/package.bak/libplayer/libplayer.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# libplayer -# -################################################################################ - -LIBPLAYER_VERSION = 2.0.1 -LIBPLAYER_SITE = http://libplayer.geexbox.org/releases -LIBPLAYER_SOURCE = libplayer-$(LIBPLAYER_VERSION).tar.bz2 -LIBPLAYER_LICENSE = LGPLv2.1+ -LIBPLAYER_LICENSE_FILES = COPYING - -# When passing the standard buildroot configure arguments, the configure script -# breaks on --target and --host options. Thus we need to define a configure cmd -# ourselves. -define LIBPLAYER_CONFIGURE_CMDS - (cd $(@D) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --prefix=/usr \ - --cross-compile \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(LIBPLAYER_CONF_OPTS) \ - ) -endef - -ifeq ($(BR2_PACKAGE_LIBPLAYER_MPLAYER),y) -LIBPLAYER_DEPENDENCIES += mplayer -LIBPLAYER_CONF_OPTS += --enable-mplayer -else -LIBPLAYER_CONF_OPTS += --disable-mplayer -endif - -ifeq ($(BR2_PACKAGE_LIBPLAYER_GSTREAMER),y) -LIBPLAYER_DEPENDENCIES += gstreamer -LIBPLAYER_CONF_OPTS += --enable-gstreamer -else -LIBPLAYER_CONF_OPTS += --disable-gstreamer -endif - -ifeq ($(BR2_PACKAGE_LIBPLAYER_PYTHON),y) -LIBPLAYER_DEPENDENCIES += python -LIBPLAYER_CONF_OPTS += --enable-binding-python -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libplist/Config.in b/package.bak/libplist/Config.in deleted file mode 100644 index 5f96746ea9..0000000000 --- a/package.bak/libplist/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBPLIST - bool "libplist" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBXML2 - help - libplist is a client for manipulating Apple Property List - (.plist) files - - http://www.libimobiledevice.org/ - -comment "libplist needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libplist/libplist.hash b/package.bak/libplist/libplist.hash deleted file mode 100644 index 06d1b16426..0000000000 --- a/package.bak/libplist/libplist.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0effdedcb3de128c4930d8c03a3854c74c426c16728b8ab5f0a5b6bdc0b644be libplist-1.12.tar.bz2 diff --git a/package.bak/libplist/libplist.mk b/package.bak/libplist/libplist.mk deleted file mode 100644 index 7f60b5ee03..0000000000 --- a/package.bak/libplist/libplist.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libplist -# -################################################################################ - -LIBPLIST_VERSION = 1.12 -LIBPLIST_SOURCE = libplist-$(LIBPLIST_VERSION).tar.bz2 -LIBPLIST_SITE = http://www.libimobiledevice.org/downloads -LIBPLIST_DEPENDENCIES = libxml2 host-pkgconf -LIBPLIST_INSTALL_STAGING = YES -LIBPLIST_LICENSE = LGPLv2.1+ -LIBPLIST_LICENSE_FILES = COPYING - -# Straight out of the git tree: -LIBPLIST_AUTORECONF = YES - -# Disable building Python bindings, because it requires host-cython, which -# is not packaged in Buildroot at all. -LIBPLIST_CONF_OPTS = --without-cython - -$(eval $(autotools-package)) diff --git a/package.bak/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch b/package.bak/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch deleted file mode 100644 index d232e4d62f..0000000000 --- a/package.bak/libpng/0001-Disable-pngfix-and-png-fix-itxt.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 60c3ee917c8e7a4760b1ef7c3dc2b44a615150d3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:26:18 -0300 -Subject: [PATCH] Disable pngfix and png-fix-itxt - -Disable the new pngfix and png-fix-itxt tools: they take up space, fail -to build on some oddball toolchain configurations and aren't -expected/needed in a non-interactive embedded system. - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7212951..3430dca 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,7 @@ check_PROGRAMS += timepng - endif - - # Utilities - installed --bin_PROGRAMS= pngfix png-fix-itxt -+bin_PROGRAMS= - - # This ensures that pnglibconf.h gets built at the start of 'make all' or - # 'make check', but it does not add dependencies to the individual programs, -diff --git a/Makefile.in b/Makefile.in -index a66f6aa..4e67782 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -104,7 +104,7 @@ check_PROGRAMS = pngtest$(EXEEXT) pngunknown$(EXEEXT) \ - pngstest$(EXEEXT) pngvalid$(EXEEXT) pngimage$(EXEEXT) \ - pngcp$(EXEEXT) $(am__EXEEXT_1) - @HAVE_CLOCK_GETTIME_TRUE@am__append_1 = timepng --bin_PROGRAMS = pngfix$(EXEEXT) png-fix-itxt$(EXEEXT) -+bin_PROGRAMS = - @PNG_ARM_NEON_TRUE@am__append_2 = arm/arm_init.c\ - @PNG_ARM_NEON_TRUE@ arm/filter_neon.S arm/filter_neon_intrinsics.c - --- -2.7.3 - diff --git a/package.bak/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch b/package.bak/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch deleted file mode 100644 index 2a9bfd1e1d..0000000000 --- a/package.bak/libpng/0002-Don-t-append-prefix-to-symbol-names-in-version-script.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 473fdecd9a580b45251480b8ccbbb1927c598310 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 26 May 2016 16:27:13 -0300 -Subject: [PATCH] Don't append prefix to symbol names in version script - -Even if Blackfin GNU toolchain add prefix '_' to all symbols, -symbol prefix is not accepted in the link flag --version-script. -Don't append prefix in the symbols in the version script file. - -Original patch by: Sonic Zhang - -[Gustavo: update for 1.6.22] -Signed-off-by: Gustavo Zacarias - -[Julien: update for 1.6.25] -Signed-off-by: Julien Boibessot - -Signed-off-by: Gustavo Zacarias ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3430dca..db6a7a2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -245,7 +245,7 @@ contrib/tools/pngfix.o: pnglibconf.h - # interfering with the symbol file format. - SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0'\ - -DPNGLIB_VERSION='@PNGLIB_VERSION@'\ -- -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)'\ -+ -DSYMBOL_PREFIX=''\ - -DPNG_NO_USE_READ_MACROS -DPNG_BUILDING_SYMBOL_TABLE - - if DO_PNG_PREFIX -diff --git a/Makefile.in b/Makefile.in -index 4e67782..5f468d9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -766,7 +766,7 @@ SUFFIXES = .chk .out - # interfering with the symbol file format. - SYMBOL_CFLAGS = -DPNGLIB_LIBNAME='PNG@PNGLIB_MAJOR@@PNGLIB_MINOR@_0' \ - -DPNGLIB_VERSION='@PNGLIB_VERSION@' \ -- -DSYMBOL_PREFIX='$(SYMBOL_PREFIX)' -DPNG_NO_USE_READ_MACROS \ -+ -DSYMBOL_PREFIX='' -DPNG_NO_USE_READ_MACROS \ - -DPNG_BUILDING_SYMBOL_TABLE $(am__append_7) - - # EXT_LIST is a list of the possibly library directory extensions, this exists --- -2.7.3 - diff --git a/package.bak/libpng/Config.in b/package.bak/libpng/Config.in deleted file mode 100644 index b0a3646078..0000000000 --- a/package.bak/libpng/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBPNG - bool "libpng" - select BR2_PACKAGE_ZLIB - help - Library for handling PNG (Portable Network Graphics) - images. - - http://www.libpng.org/ diff --git a/package.bak/libpng/libpng.hash b/package.bak/libpng/libpng.hash deleted file mode 100644 index e5bd6ba03f..0000000000 --- a/package.bak/libpng/libpng.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://sourceforge.net/projects/libpng/files/libpng16/1.6.28/ -sha1 ff4dceadb15e2c929ad26283118d56f66f4a6cff libpng-1.6.28.tar.xz -# Locally computed: -sha256 d8d3ec9de6b5db740fefac702c37ffcf96ae46cb17c18c1544635a3852f78f7a libpng-1.6.28.tar.xz diff --git a/package.bak/libpng/libpng.mk b/package.bak/libpng/libpng.mk deleted file mode 100644 index c562965ab2..0000000000 --- a/package.bak/libpng/libpng.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libpng -# -################################################################################ - -LIBPNG_VERSION = 1.6.28 -LIBPNG_SERIES = 16 -LIBPNG_SOURCE = libpng-$(LIBPNG_VERSION).tar.xz -LIBPNG_SITE = http://downloads.sourceforge.net/project/libpng/libpng${LIBPNG_SERIES}/$(LIBPNG_VERSION) -LIBPNG_LICENSE = libpng license -LIBPNG_LICENSE_FILES = LICENSE -LIBPNG_INSTALL_STAGING = YES -LIBPNG_DEPENDENCIES = host-pkgconf zlib -HOST_LIBPNG_DEPENDENCIES = host-pkgconf host-zlib -LIBPNG_CONFIG_SCRIPTS = libpng$(LIBPNG_SERIES)-config libpng-config -LIBPNG_CONF_OPTS = $(if $(BR2_ARM_CPU_HAS_NEON),--enable-arm-neon=yes,--enable-arm-neon=no) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libpqxx/Config.in b/package.bak/libpqxx/Config.in deleted file mode 100644 index ddf14fd6ce..0000000000 --- a/package.bak/libpqxx/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBPQXX - bool "libpqxx" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_POSTGRESQL - help - libpqxx is the official C++ client API for PostgreSQL, the - enterprise-strength open-source relational database. - - http://pqxx.org/development/libpqxx/ - -comment "libpqxx needs toolchain w/ C++ support" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_POSTGRESQL diff --git a/package.bak/libpqxx/libpqxx.hash b/package.bak/libpqxx/libpqxx.hash deleted file mode 100644 index 65c50c6752..0000000000 --- a/package.bak/libpqxx/libpqxx.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From: http://pqxx.org/download/software/libpqxx/libpqxx-4.0.1.tar.gz.md5sum -md5 6ea888b9ba85dd7cef1b182dc5f223a2 libpqxx-4.0.1.tar.gz -# Locally computed after verifying md5sum: -sha256 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38 libpqxx-4.0.1.tar.gz diff --git a/package.bak/libpqxx/libpqxx.mk b/package.bak/libpqxx/libpqxx.mk deleted file mode 100644 index 058719038e..0000000000 --- a/package.bak/libpqxx/libpqxx.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libpqxx -# -################################################################################ - -LIBPQXX_VERSION = 4.0.1 -LIBPQXX_SITE = http://pqxx.org/download/software/libpqxx -LIBPQXX_INSTALL_STAGING = YES -LIBPQXX_DEPENDENCIES = postgresql -LIBPQXX_LICENSE = BSD-3c -LIBPQXX_LICENSE_FILES = COPYING - -LIBPQXX_CONF_ENV += ac_cv_path_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config - -$(eval $(autotools-package)) diff --git a/package.bak/libpthread-stubs/Config.in b/package.bak/libpthread-stubs/Config.in deleted file mode 100644 index a4ce1cb0ac..0000000000 --- a/package.bak/libpthread-stubs/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBPTHREAD_STUBS - bool "libpthread-stubs" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - This library provides weak aliases for pthread functions not - provided in libc or otherwise available by default. - - http://xcb.freedesktop.org/ - -comment "libpthread-stubs needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libpthread-stubs/libpthread-stubs.hash b/package.bak/libpthread-stubs/libpthread-stubs.hash deleted file mode 100644 index 8211455d25..0000000000 --- a/package.bak/libpthread-stubs/libpthread-stubs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299 libpthread-stubs-0.3.tar.bz2 diff --git a/package.bak/libpthread-stubs/libpthread-stubs.mk b/package.bak/libpthread-stubs/libpthread-stubs.mk deleted file mode 100644 index 856793c4e0..0000000000 --- a/package.bak/libpthread-stubs/libpthread-stubs.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libpthread-stubs -# -################################################################################ - -LIBPTHREAD_STUBS_VERSION = 0.3 -LIBPTHREAD_STUBS_SOURCE = libpthread-stubs-$(LIBPTHREAD_STUBS_VERSION).tar.bz2 -LIBPTHREAD_STUBS_SITE = http://xcb.freedesktop.org/dist -LIBPTHREAD_STUBS_LICENSE = MIT -LIBPTHREAD_STUBS_LICENSE_FILES = COPYING - -LIBPTHREAD_STUBS_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),y) -LIBPTHREAD_STUBS_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -pthread" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libpthsem/0001-fix-build-on-linux-3.x-host.patch b/package.bak/libpthsem/0001-fix-build-on-linux-3.x-host.patch deleted file mode 100644 index 21fff4e7cc..0000000000 --- a/package.bak/libpthsem/0001-fix-build-on-linux-3.x-host.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2d0450bfa3fb7003098da1a7fe24c3ae140912dc Mon Sep 17 00:00:00 2001 -From: Gregory Hermant -Date: Mon, 22 Oct 2012 15:11:53 +0200 -Subject: [PATCH] pthsem build on Linux 3.x host - - -Signed-off-by: Michael Markstaller -Signed-off-by: Gregory Hermant ---- - acinclude.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 03b42de..fea9bc8 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -892,6 +892,8 @@ case $PLATFORM in - case "x`uname -r`" in - changequote(, )dnl - x2.[23456789]* ) ;; -+changequote(, )dnl -+ x3.* ) ;; - changequote([, ]) - * ) braindead=yes ;; - esac --- -1.7.9.5 - diff --git a/package.bak/libpthsem/Config.in b/package.bak/libpthsem/Config.in deleted file mode 100644 index 3219de137d..0000000000 --- a/package.bak/libpthsem/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBPTHSEM - bool "libpthsem" - depends on BR2_USE_MMU # fork() - help - GNU pth is a user mode multi threading library. pthsem is an extend - version, with support for semaphores added. - - http://www.auto.tuwien.ac.at/~mkoegler/pth/ - -if BR2_PACKAGE_LIBPTHSEM - -config BR2_PACKAGE_LIBPTHSEM_COMPAT - bool "libpth compatibility" - help - This option enables the compatibility with the original - libpth library. - -endif diff --git a/package.bak/libpthsem/libpthsem.hash b/package.bak/libpthsem/libpthsem.hash deleted file mode 100644 index b6aa2b87c5..0000000000 --- a/package.bak/libpthsem/libpthsem.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4024cafdd5d4bce2b1778a6be5491222c3f6e7ef1e43971264c451c0012c5c01 pthsem_2.0.8.tar.gz diff --git a/package.bak/libpthsem/libpthsem.mk b/package.bak/libpthsem/libpthsem.mk deleted file mode 100644 index b8a3d7d561..0000000000 --- a/package.bak/libpthsem/libpthsem.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# libpthsem -# -################################################################################ - -LIBPTHSEM_VERSION = 2.0.8 -LIBPTHSEM_SOURCE = pthsem_$(LIBPTHSEM_VERSION).tar.gz -LIBPTHSEM_SITE = http://www.auto.tuwien.ac.at/~mkoegler/pth -LIBPTHSEM_LICENSE = LGPLv2.1+ -LIBPTHSEM_LICENSE_FILES = COPYING -LIBPTHSEM_AUTORECONF = YES -LIBPTHSEM_INSTALL_STAGING = YES -LIBPTHSEM_CONFIG_SCRIPTS = pthsem-config - -# Force the setjmp/longjmp detection, because the test being done in -# the AC_CHECK_SJLJ macro is not cross-compilation safe: it checks the -# running kernel with 'uname -r', and checks the C library version by -# looking at /usr/include/features.h. In terms of kernel version, it -# assumes any version later than 2.2.x is fine, except that it doesn't -# recognize 4.x as a valid kernel version, recognizing such systems as -# "braindead" and therefore falling back to the 'sjljlx' value for -# ac_cv_check_sjlj. In terms of C library version, it wants -# __GLIBC_MINOR to be at least 1. Since both conditions are true for -# all Buildroot systems, we can simply force the setjmp/longjmp -# detection to ssjlj. -LIBPTHSEM_CONF_ENV += \ - ac_cv_check_sjlj=ssjlj - -ifeq ($(BR2_PACKAGE_LIBPTHSEM_COMPAT),y) -LIBPTHSEM_CONF_OPTS += --enable-compat -LIBPTHSEM_CONFIG_SCRIPTS += pth-config -else -LIBPTHSEM_CONF_OPTS += --disable-compat -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libqmi/Config.in b/package.bak/libqmi/Config.in deleted file mode 100644 index a0e896cce8..0000000000 --- a/package.bak/libqmi/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBQMI - bool "libqmi" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - libqmi is a glib-based library for talking to WWAN modems and devices - which speak the Qualcomm MSM Interface (QMI) protocol. - - http://www.freedesktop.org/wiki/Software/libqmi/ - -comment "libqmi needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libqmi/libqmi.hash b/package.bak/libqmi/libqmi.hash deleted file mode 100644 index 08da1ae219..0000000000 --- a/package.bak/libqmi/libqmi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 7ab6bb47fd23bf4d3fa17424e40ea5552d08b19e5ee4f125f21f316c8086ba2a libqmi-1.16.0.tar.xz diff --git a/package.bak/libqmi/libqmi.mk b/package.bak/libqmi/libqmi.mk deleted file mode 100644 index 825493eea6..0000000000 --- a/package.bak/libqmi/libqmi.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libqmi -# -################################################################################ - -LIBQMI_VERSION = 1.16.0 -LIBQMI_SITE = http://www.freedesktop.org/software/libqmi -LIBQMI_SOURCE = libqmi-$(LIBQMI_VERSION).tar.xz -LIBQMI_LICENSE = LGPLv2+ (library), GPLv2+ (programs) -LIBQMI_LICENSE_FILES = COPYING -LIBQMI_INSTALL_STAGING = YES - -LIBQMI_DEPENDENCIES = libglib2 - -# we don't want -Werror -LIBQMI_CONF_OPTS = --enable-more-warnings=no - -$(eval $(autotools-package)) diff --git a/package.bak/libqrencode/Config.in b/package.bak/libqrencode/Config.in deleted file mode 100644 index b86662621e..0000000000 --- a/package.bak/libqrencode/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBQRENCODE - bool "libqrencode" - help - libqrencode is a C library for encoding data in a QR Code - symbol, a kind of 2D symbology that can be scanned by handy - terminals such as a mobile phone with CCD. The capacity of - QR Code is up to 7000 digits or 4000 characters, and is - highly robust. - - http://fukuchi.org/works/qrencode/index.html - -if BR2_PACKAGE_LIBQRENCODE - -config BR2_PACKAGE_LIBQRENCODE_TOOLS - bool "libqrencode tools" - select BR2_PACKAGE_LIBPNG - help - Build command-line tools - -endif #BR2_PACKAGE_LIBQRENCODE diff --git a/package.bak/libqrencode/libqrencode.hash b/package.bak/libqrencode/libqrencode.hash deleted file mode 100644 index 8c94ccd35d..0000000000 --- a/package.bak/libqrencode/libqrencode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://fukuchi.org/works/qrencode/qrencode-3.4.2.tar.gz.sha1 -sha1 7daaad61f333ff6cdabfb0d925c3ab668d16dee2 qrencode-3.4.2.tar.gz diff --git a/package.bak/libqrencode/libqrencode.mk b/package.bak/libqrencode/libqrencode.mk deleted file mode 100644 index 5f30e77ba6..0000000000 --- a/package.bak/libqrencode/libqrencode.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libqrencode -# -################################################################################ - -LIBQRENCODE_VERSION = 3.4.2 -LIBQRENCODE_SOURCE = qrencode-$(LIBQRENCODE_VERSION).tar.gz -LIBQRENCODE_SITE = http://fukuchi.org/works/qrencode -LIBQRENCODE_DEPENDENCIES = host-pkgconf -LIBQRENCODE_INSTALL_STAGING = YES -LIBQRENCODE_LICENSE = LGPLv2.1+ -LIBQRENCODE_LICENSE_FILES = COPYING - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBQRENCODE_CONF_ENV += LIBS='-pthread' -else -LIBQRENCODE_CONF_OPTS += --disable-thread-safety -endif - -ifeq ($(BR2_PACKAGE_LIBQRENCODE_TOOLS),y) -LIBQRENCODE_CONF_OPTS += --with-tools=yes -LIBQRENCODE_DEPENDENCIES += libpng -else -LIBQRENCODE_CONF_OPTS += --with-tools=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libraw/0001-Remove-paths-which-break-cross-compilation.patch b/package.bak/libraw/0001-Remove-paths-which-break-cross-compilation.patch deleted file mode 100644 index 0f0eee1a64..0000000000 --- a/package.bak/libraw/0001-Remove-paths-which-break-cross-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1f9c2ebc9c65e8ce7fdbece55d578cf00c6c4b46 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 30 Jan 2016 17:06:04 +0100 -Subject: [PATCH 1/1] Remove paths which break cross-compilation - -Patch sent upstream: https://github.com/LibRaw/LibRaw/pull/57 - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9bb07b2..78064d9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -16,9 +16,6 @@ AC_SUBST(LIBTOOL_DEPS) - - # Config files to generate - --CPPFLAGS="$CPPFLAGS -I/usr/local/include" --LDFLAGS="$LDFLAGS -L/usr/local/lib" -- - AC_CONFIG_FILES([ - Makefile - libraw.pc --- -2.7.0.rc3 - diff --git a/package.bak/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch b/package.bak/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch deleted file mode 100644 index 24f0eb1897..0000000000 --- a/package.bak/libraw/0002-libraw_x3f.cpp-remove-Byte-order-mark.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0f2507bfe30f2df10dfc38b94cdfde5594902b8e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 12 Feb 2016 10:00:12 +0100 -Subject: [PATCH] libraw_x3f.cpp: remove Byte order mark - -The U+FEFF character, which is a Byte order mark, at the beginning of -libraw_x3f.cpp, prevents gcc 4.3.x from building this file: - -src/../internal/libraw_x3f.cpp:1: error: stray '\357' in program -src/../internal/libraw_x3f.cpp:1: error: stray '\273' in program -src/../internal/libraw_x3f.cpp:1: error: stray '\277' in program - -Support in gcc for the Byte order mark has been added in gcc -4.4.x. Since anyway this Byte order mark is not useful, we simply -remove it. - -See https://en.wikipedia.org/wiki/Byte_order_mark for more details. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream at: -https://github.com/LibRaw/LibRaw/pull/61 - - internal/libraw_x3f.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/libraw_x3f.cpp b/internal/libraw_x3f.cpp -index dbf28c1..67047ab 100644 ---- a/internal/libraw_x3f.cpp -+++ b/internal/libraw_x3f.cpp -@@ -1,4 +1,4 @@ --/* Library for accessing X3F Files -+/* Library for accessing X3F Files - ---------------------------------------------------------------- - BSD-style License - ---------------------------------------------------------------- --- -2.6.4 - diff --git a/package.bak/libraw/Config.in b/package.bak/libraw/Config.in deleted file mode 100644 index de763cd36a..0000000000 --- a/package.bak/libraw/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBRAW - bool "libraw" - depends on BR2_INSTALL_LIBSTDCPP - help - libraw is a raw image manipulation library - - http://www.libraw.org/ - -comment "libraw needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libraw/libraw.hash b/package.bak/libraw/libraw.hash deleted file mode 100644 index 29794252f1..0000000000 --- a/package.bak/libraw/libraw.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 e599651a4cc37e00cfc2d2b56be87c3a4e4dae2c360b680fe9ab3f93d07cdea1 LibRaw-0.17.1.tar.gz -sha256 3c09bc4d70268e78798696c5ea3a8cc65fe4e161811d5321fc3ef2ca012d8fd1 0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823 diff --git a/package.bak/libraw/libraw.mk b/package.bak/libraw/libraw.mk deleted file mode 100644 index f78ce1e0cb..0000000000 --- a/package.bak/libraw/libraw.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# libraw -# -################################################################################ - -LIBRAW_VERSION = 0.17.1 -LIBRAW_SOURCE = LibRaw-$(LIBRAW_VERSION).tar.gz -LIBRAW_SITE = http://www.libraw.org/data -LIBRAW_PATCH = \ - https://anonscm.debian.org/cgit/pkg-phototools/libraw.git/plain/debian/patches/0001-Fix_gcc6_narrowing_conversion.patch?id=d890937aaca6359df45a66b35e547c94ca564823 - -LIBRAW_INSTALL_STAGING = YES -# we patch configure.ac -LIBRAW_AUTORECONF = YES -LIBRAW_CONF_OPTS += \ - --disable-examples \ - --disable-openmp \ - --disable-demosaic-pack-gpl2 \ - --disable-demosaic-pack-gpl3 -LIBRAW_LICENSE = LGPLv2.1 or CDDL 1.0 or LibRaw Software License 27032010 -LIBRAW_LICENSE_FILES = LICENSE.LGPL LICENSE.CDDL LICENSE.LibRaw.pdf README -LIBRAW_DEPENDENCIES = host-pkgconf -LIBRAW_CXXFLAGS = $(TARGET_CXXFLAGS) -LIBRAW_CONF_ENV = CXXFLAGS="$(LIBRAW_CXXFLAGS)" - -ifeq ($(BR2_PACKAGE_JASPER),y) -LIBRAW_CONF_OPTS += --enable-jasper -LIBRAW_DEPENDENCIES += jasper -# glibc prior to 2.18 only defines constants such as SIZE_MAX or -# INT_FAST32_MAX for C++ code if __STDC_LIMIT_MACROS is defined -LIBRAW_CXXFLAGS += -D__STDC_LIMIT_MACROS -else -LIBRAW_CONF_OPTS += --disable-jasper -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBRAW_CONF_OPTS += --enable-jpeg -LIBRAW_DEPENDENCIES += jpeg -else -LIBRAW_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -LIBRAW_CONF_OPTS += --enable-lcms -LIBRAW_DEPENDENCIES += lcms2 host-pkgconf -else -LIBRAW_CONF_OPTS += --disable-lcms -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch b/package.bak/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch deleted file mode 100644 index b87ef715de..0000000000 --- a/package.bak/libraw1394/0001-testlibraw-build-the-CLOCK_MONOTONIC_RAW-test-condit.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 94c66ade15d7fc468b52c72dfe76a8c10b1910a7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 12 Feb 2016 10:13:45 +0100 -Subject: [PATCH] testlibraw: build the CLOCK_MONOTONIC_RAW test conditionally - -CLOCK_MONOTONIC_RAW is a somewhat recent addition, and some older -toolchains/kernels may not have the support for it. Therefore, we -build the part of the test that uses CLOCK_MONOTONIC_RAW only when -this definition is available. - -Signed-off-by: Thomas Petazzoni ---- - tools/testlibraw.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/testlibraw.c b/tools/testlibraw.c -index d8a0702..ae37157 100644 ---- a/tools/testlibraw.c -+++ b/tools/testlibraw.c -@@ -211,6 +211,7 @@ read_cycle_timer(raw1394handle_t handle) - printf(" local time from CLOCK_MONOTONIC: %lld us\n", - (unsigned long long)local_time); - -+#if defined(CLOCK_MONOTONIC_RAW) - retval = raw1394_read_cycle_timer_and_clock(handle, &ct, &local_time, - CLOCK_MONOTONIC_RAW); - if (retval < 0) { -@@ -221,6 +222,7 @@ read_cycle_timer(raw1394handle_t handle) - ct >> 25, (ct >> 12) & 0x1fff, ct & 0xfff); - printf(" local time from CLOCK_MONOTONIC_RAW: %lld us\n", - (unsigned long long)local_time); -+#endif - } - - int test_card(int card) --- -2.6.4 - diff --git a/package.bak/libraw1394/Config.in b/package.bak/libraw1394/Config.in deleted file mode 100644 index 7a64959a52..0000000000 --- a/package.bak/libraw1394/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBRAW1394 - bool "libraw1394" - help - libraw1394 provides direct access to the IEEE 1394 bus through - the Linux 1394 subsystem's raw1394 user space interface. - - http://sourceforge.net/projects/libraw1394/ diff --git a/package.bak/libraw1394/libraw1394.hash b/package.bak/libraw1394/libraw1394.hash deleted file mode 100644 index b785995db1..0000000000 --- a/package.bak/libraw1394/libraw1394.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.kernel.org/pub/linux/libs/ieee1394/sha256sums.asc -sha256 1bab9780189f9d1eb4e973df12679c04f979c21e024240fc98e536ff5b680ee9 libraw1394-2.1.1.tar.xz -# Locally computed -sha256 39369c65fbed7fccc2e6d8e645f258f101c414107d67238f10996e6c2009f20d fix-types.patch diff --git a/package.bak/libraw1394/libraw1394.mk b/package.bak/libraw1394/libraw1394.mk deleted file mode 100644 index 7123ac74c8..0000000000 --- a/package.bak/libraw1394/libraw1394.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libraw1394 -# -################################################################################ - -LIBRAW1394_VERSION = 2.1.1 -LIBRAW1394_SOURCE = libraw1394-$(LIBRAW1394_VERSION).tar.xz -LIBRAW1394_SITE = $(BR2_KERNEL_MIRROR)/linux/libs/ieee1394 -LIBRAW1394_PATCH = http://git.alpinelinux.org/cgit/aports/plain/main/libraw1394/fix-types.patch -LIBRAW1394_INSTALL_STAGING = YES -LIBRAW1394_LICENSE = LGPLv2.1+ -LIBRAW1394_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) diff --git a/package.bak/libreplaygain/Config.in b/package.bak/libreplaygain/Config.in deleted file mode 100644 index d0045b2f22..0000000000 --- a/package.bak/libreplaygain/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBREPLAYGAIN - bool "libreplaygain" - help - Replay Gain library from Musepack - - http://www.musepack.net/ diff --git a/package.bak/libreplaygain/libreplaygain.hash b/package.bak/libreplaygain/libreplaygain.hash deleted file mode 100644 index 7a6109805a..0000000000 --- a/package.bak/libreplaygain/libreplaygain.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.musepack.net/index.php?pg=src -md5 e27b3b1249b7fbae92d656d9e3d26633 libreplaygain_r475.tar.gz -# Calculated based on the hash above -sha256 8258bf785547ac2cda43bb195e07522f0a3682f55abe97753c974609ec232482 libreplaygain_r475.tar.gz diff --git a/package.bak/libreplaygain/libreplaygain.mk b/package.bak/libreplaygain/libreplaygain.mk deleted file mode 100644 index 4775999819..0000000000 --- a/package.bak/libreplaygain/libreplaygain.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libreplaygain -# -################################################################################ - -LIBREPLAYGAIN_VERSION = r475 -LIBREPLAYGAIN_SITE = http://files.musepack.net/source -LIBREPLAYGAIN_SOURCE = libreplaygain_$(LIBREPLAYGAIN_VERSION).tar.gz -# upstream doesn't ship configure -LIBREPLAYGAIN_AUTORECONF = YES -LIBREPLAYGAIN_INSTALL_STAGING = YES -LIBREPLAYGAIN_LICENSE = LGPLv2.1+ -LIBREPLAYGAIN_LICENSE_FILES = src/gain_analysis.c - -$(eval $(autotools-package)) diff --git a/package.bak/libroxml/Config.in b/package.bak/libroxml/Config.in deleted file mode 100644 index 2fcf2f2a70..0000000000 --- a/package.bak/libroxml/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBROXML - bool "roxml" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libroxml is a light and powerful xml parsing library with - xpath handling. Roxml is a binary using libroxml to explore - xml file from shell scripts. - - http://www.libroxml.net - -comment "libroxml needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libroxml/libroxml.hash b/package.bak/libroxml/libroxml.hash deleted file mode 100644 index 32482e65de..0000000000 --- a/package.bak/libroxml/libroxml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1da8f20b530eba4409f2b217587d2f1281ff5d9ba45b24aeac71b94c6c621b78 libroxml-2.3.0.tar.gz diff --git a/package.bak/libroxml/libroxml.mk b/package.bak/libroxml/libroxml.mk deleted file mode 100644 index 43d1d916af..0000000000 --- a/package.bak/libroxml/libroxml.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libroxml -# -################################################################################ - -LIBROXML_VERSION = 2.3.0 -LIBROXML_SITE = http://download.libroxml.net/pool/v2.x -LIBROXML_INSTALL_STAGING = YES -LIBROXML_LICENSE = LGPLv2.1+ with static link exception -LIBROXML_LICENSE_FILES = License.txt - -LIBROXML_CONF_OPTS = --disable-silent-rules - -# libroxml forgets to compile/link with -pthread, even though it uses -# thread functions breaking static linking -LIBROXML_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -pthread" LIBS="-pthread" - -$(eval $(autotools-package)) diff --git a/package.bak/librsvg/Config.in b/package.bak/librsvg/Config.in deleted file mode 100644 index 7ce9d063a8..0000000000 --- a/package.bak/librsvg/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_LIBRSVG - bool "librsvg" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_GDK_PIXBUF - select BR2_PACKAGE_LIBCROCO - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PANGO - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_INSTALL_LIBSTDCPP # pango - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - help - The rsvg library is an efficient renderer for Scalable - Vector Graphics (SVG) pictures. - - http://librsvg.sourceforge.net/ - -comment "librsvg needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/librsvg/librsvg.hash b/package.bak/librsvg/librsvg.hash deleted file mode 100644 index f9844b2362..0000000000 --- a/package.bak/librsvg/librsvg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.acc.umu.se/pub/gnome/sources/librsvg/2.40/librsvg-2.40.16.sha256sum -sha256 d48bcf6b03fa98f07df10332fb49d8c010786ddca6ab34cbba217684f533ff2e librsvg-2.40.16.tar.xz diff --git a/package.bak/librsvg/librsvg.mk b/package.bak/librsvg/librsvg.mk deleted file mode 100644 index b711de47cd..0000000000 --- a/package.bak/librsvg/librsvg.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# librsvg -# -################################################################################ - -LIBRSVG_VERSION_MAJOR = 2.40 -LIBRSVG_VERSION = $(LIBRSVG_VERSION_MAJOR).16 -LIBRSVG_SITE = http://ftp.gnome.org/pub/gnome/sources/librsvg/$(LIBRSVG_VERSION_MAJOR) -LIBRSVG_SOURCE = librsvg-$(LIBRSVG_VERSION).tar.xz -LIBRSVG_INSTALL_STAGING = YES -LIBRSVG_CONF_OPTS = --disable-tools --enable-introspection=no -HOST_LIBRSVG_CONF_OPTS = --enable-introspection=no -LIBRSVG_DEPENDENCIES = cairo host-gdk-pixbuf gdk-pixbuf libcroco libglib2 libxml2 pango \ - $(if $(BR2_PACKAGE_LIBGTK3),libgtk3) -HOST_LIBRSVG_DEPENDENCIES = host-cairo host-gdk-pixbuf host-libcroco host-libglib2 host-libxml2 host-pango -LIBRSVG_LICENSE = LGPLv2+ -LIBRSVG_LICENSE_FILES = COPYING.LIB - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/librsync/Config.in b/package.bak/librsync/Config.in deleted file mode 100644 index 5dcdfc8f2e..0000000000 --- a/package.bak/librsync/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBRSYNC - bool "librsync" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_POPT - help - librsync implements the rolling-checksum algorithm of - remote file synchronization that was popularized by the - rsync utility and is used in rproxy. - - http://sourceforge.net/projects/librsync/ diff --git a/package.bak/librsync/librsync.hash b/package.bak/librsync/librsync.hash deleted file mode 100644 index 55ace76394..0000000000 --- a/package.bak/librsync/librsync.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 6633e4605662763a03bb6388529cbdfd3b11a9ec55b8845351c1bd9a92bc41d6 librsync-0.9.7.tar.gz diff --git a/package.bak/librsync/librsync.mk b/package.bak/librsync/librsync.mk deleted file mode 100644 index d475c7333d..0000000000 --- a/package.bak/librsync/librsync.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# librsync -# -################################################################################ - -LIBRSYNC_VERSION = 0.9.7 -LIBRSYNC_SITE = http://downloads.sourceforge.net/project/librsync/librsync/$(LIBRSYNC_VERSION) -LIBRSYNC_LICENSE = LGPLv2.1+ -LIBRSYNC_LICENSE_FILES = COPYING -LIBRSYNC_INSTALL_STAGING = YES -LIBRSYNC_DEPENDENCIES = zlib bzip2 popt - -$(eval $(autotools-package)) diff --git a/package.bak/librtas/0001-librtas-install-librtas.so.1-symlink.patch b/package.bak/librtas/0001-librtas-install-librtas.so.1-symlink.patch deleted file mode 100644 index 2150c3f508..0000000000 --- a/package.bak/librtas/0001-librtas-install-librtas.so.1-symlink.patch +++ /dev/null @@ -1,31 +0,0 @@ -Add a line to the librtas Makefile to create librtas.so.1 when -performing "make install". - -Without this patch programs linked with librtas will fail at run time: - -error while loading shared libraries: librtas.so.1: cannot open shared -object file: No such file or directory - -A patch has been submitted upstream so it is likely that this patch -can be dropped after the next release of librtas. - -Signed-off-by: Sam Bobroff ---- - librtas_src/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/librtas_src/Makefile b/librtas_src/Makefile -index 3a10222..deba29d 100644 ---- a/librtas_src/Makefile -+++ b/librtas_src/Makefile -@@ -33,6 +33,7 @@ install: - @$(call install_lib,$(LIBRTAS),$(DESTDIR)) - @$(call install_inc,$(HEADERS),$(DESTDIR)) - @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME) -+ @ln -sf $(LIBRTAS) $(DESTDIR)/$(LIB_DIR)$(call is_lib64,$(LIBRTAS))/$(LIBRTAS_SONAME).1 - - uninstall: - @$(call uninstall_lib,$(LIBRTAS),$(DESTDIR)) --- -1.7.10.4 - diff --git a/package.bak/librtas/Config.in b/package.bak/librtas/Config.in deleted file mode 100644 index fb0ac766bf..0000000000 --- a/package.bak/librtas/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBRTAS - bool "librtas" - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on BR2_TOOLCHAIN_USES_GLIBC - help - The librtas package provides an interface for Run-Time Abstraction - Services (RTAS) calls on PAPR platforms. The libraries allow users to - examine and manipulate hardware, and parse RTAS events. - - http://librtas.sourceforge.net/ - -comment "librtas needs a glibc toolchain" - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/librtas/librtas.hash b/package.bak/librtas/librtas.hash deleted file mode 100644 index c81b583147..0000000000 --- a/package.bak/librtas/librtas.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d5f2951b0934ffbd82bebf26acfa103cc21d89f4c90c7c41472acf7b4ec6d907 librtas-1.3.13.tar.gz diff --git a/package.bak/librtas/librtas.mk b/package.bak/librtas/librtas.mk deleted file mode 100644 index 46c4cb4bb7..0000000000 --- a/package.bak/librtas/librtas.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# librtas -# -################################################################################ - -LIBRTAS_VERSION = 1.3.13 -LIBRTAS_SITE = http://downloads.sourceforge.net/project/librtas -LIBRTAS_LICENSE = Common Public License Version 1.0 -LIBRTAS_LICENSE_FILES = COPYRIGHT -LIBRTAS_INSTALL_STAGING = YES - -define LIBRTAS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define LIBRTAS_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define LIBRTAS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/librtlsdr/0001-disable_shared_library_target_in_build.patch b/package.bak/librtlsdr/0001-disable_shared_library_target_in_build.patch deleted file mode 100644 index b763c48b2e..0000000000 --- a/package.bak/librtlsdr/0001-disable_shared_library_target_in_build.patch +++ /dev/null @@ -1,80 +0,0 @@ -librtlsdr: disable shared library target in build - -Disable shared library target if BUILD_SHARED_LIBS if OFF. - -Signed-off-by: Yuvaraj Patil ---- -diff -Nurp librtlsdr-v0.5.3_orig/src/CMakeLists.txt librtlsdr-v0.5.3/src/CMakeLists.txt ---- librtlsdr-v0.5.3_orig/src/CMakeLists.txt 2014-09-24 17:31:40.610337074 +0530 -+++ librtlsdr-v0.5.3/src/CMakeLists.txt 2014-09-24 17:32:38.838334632 +0530 -@@ -20,6 +20,7 @@ - ######################################################################## - # Setup library - ######################################################################## -+if(BUILD_SHARED_LIBS) - add_library(rtlsdr_shared SHARED - librtlsdr.c - tuner_e4k.c -@@ -37,6 +38,7 @@ set_target_properties(rtlsdr_shared PROP - set_target_properties(rtlsdr_shared PROPERTIES OUTPUT_NAME rtlsdr) - set_target_properties(rtlsdr_shared PROPERTIES SOVERSION ${MAJOR_VERSION}) - set_target_properties(rtlsdr_shared PROPERTIES VERSION ${LIBVER}) -+endif() - - add_library(rtlsdr_static STATIC - librtlsdr.c -@@ -71,6 +73,12 @@ if(NOT WIN32) - set_target_properties(rtlsdr_static PROPERTIES OUTPUT_NAME rtlsdr) - endif() - -+if(BUILD_SHARED_LIBS) -+set(rtlsdr_lib rtlsdr_shared) -+else() -+set(rtlsdr_lib rtlsdr_static) -+endif() -+ - ######################################################################## - # Build utility - ######################################################################## -@@ -81,33 +89,33 @@ add_executable(rtl_fm rtl_fm.c) - add_executable(rtl_eeprom rtl_eeprom.c) - add_executable(rtl_adsb rtl_adsb.c) - add_executable(rtl_power rtl_power.c) --set(INSTALL_TARGETS rtlsdr_shared rtlsdr_static rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) -+set(INSTALL_TARGETS ${rtlsdr_lib} rtl_sdr rtl_tcp rtl_test rtl_fm rtl_eeprom rtl_adsb rtl_power) - --target_link_libraries(rtl_sdr rtlsdr_shared convenience_static -+target_link_libraries(rtl_sdr ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_tcp rtlsdr_shared convenience_static -+target_link_libraries(rtl_tcp ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_test rtlsdr_shared convenience_static -+target_link_libraries(rtl_test ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_fm rtlsdr_shared convenience_static -+target_link_libraries(rtl_fm ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_eeprom rtlsdr_shared convenience_static -+target_link_libraries(rtl_eeprom ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_adsb rtlsdr_shared convenience_static -+target_link_libraries(rtl_adsb ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) --target_link_libraries(rtl_power rtlsdr_shared convenience_static -+target_link_libraries(rtl_power ${rtlsdr_lib} convenience_static - ${LIBUSB_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} - ) diff --git a/package.bak/librtlsdr/Config.in b/package.bak/librtlsdr/Config.in deleted file mode 100644 index 1e217bcf10..0000000000 --- a/package.bak/librtlsdr/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_LIBRTLSDR - bool "librtlsdr" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Library and command line programs for accessing - RTL2832U SDR dongles. - - http://sdr.osmocom.org/trac/wiki/rtl-sdr/ - -if BR2_PACKAGE_LIBRTLSDR - -config BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER - bool "Detach kernel driver" - default y - help - Enable this option if you would like librtlsdr to - automatically detach any kernel driver associated to the - RTL2832U USB device on startup if one is loaded. - -endif - -comment "librtlsdr needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/librtlsdr/librtlsdr.hash b/package.bak/librtlsdr/librtlsdr.hash deleted file mode 100644 index 24bca467b1..0000000000 --- a/package.bak/librtlsdr/librtlsdr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 98fb5c34ac94d6f2235a0bb41a08f8bed7949e1d1b91ea57a7c1110191ea58de librtlsdr-v0.5.3.tar.gz diff --git a/package.bak/librtlsdr/librtlsdr.mk b/package.bak/librtlsdr/librtlsdr.mk deleted file mode 100644 index 51ecabe14a..0000000000 --- a/package.bak/librtlsdr/librtlsdr.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# librtlsdr -# -################################################################################ - -LIBRTLSDR_VERSION = v0.5.3 -LIBRTLSDR_SITE = $(call github,steve-m,librtlsdr,$(LIBRTLSDR_VERSION)) -LIBRTLSDR_LICENSE = GPLv2+ -LIBRTLSDR_LICENSE_FILES = COPYING -LIBRTLSDR_INSTALL_STAGING = YES -LIBRTLSDR_DEPENDENCIES = libusb - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBRTLSDR_CONF_OPTS += -DINSTALL_UDEV_RULES=ON -endif - -ifeq ($(BR2_PACKAGE_LIBRTLSDR_DETACH_DRIVER),y) -LIBRTLSDR_CONF_OPTS += -DDETACH_KERNEL_DRIVER=1 -endif - -# In case of static-lib-only builds, CMake's FindThreads.cmake code tries to -# get the right flags, checking first for -lpthreads, then -lpthread, and lastly -# for -pthread. -# The 2 first link checks fail because of undefined symbols: __libc_setup_tls. -# In the later check, CMake successfully compiles and links the test program, -# but it also tries to run it, which is wrong when cross-compiling. -# -# The following CMake variable only disables the TRY_RUN call in the -pthread -# test. -LIBRTLSDR_CONF_OPTS += -DTHREADS_PTHREAD_ARG=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/libsamplerate/Config.in b/package.bak/libsamplerate/Config.in deleted file mode 100644 index b394fdb0ac..0000000000 --- a/package.bak/libsamplerate/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBSAMPLERATE - bool "libsamplerate" - help - Secret Rabbit Code (aka libsamplerate) is a Sample Rate - Converter for audio. One example of where such a thing would - be useful is converting audio from the CD sample rate of - 44.1kHz to the 48kHz sample rate used by DAT players. - - http://www.mega-nerd.com/SRC/ diff --git a/package.bak/libsamplerate/libsamplerate.hash b/package.bak/libsamplerate/libsamplerate.hash deleted file mode 100644 index a495108d3a..0000000000 --- a/package.bak/libsamplerate/libsamplerate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 93b54bdf46d5e6d2354b7034395fe329c222a966790de34520702bb9642f1c06 libsamplerate-0.1.8.tar.gz diff --git a/package.bak/libsamplerate/libsamplerate.mk b/package.bak/libsamplerate/libsamplerate.mk deleted file mode 100644 index 28fd644fa3..0000000000 --- a/package.bak/libsamplerate/libsamplerate.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libsamplerate -# -################################################################################ - -LIBSAMPLERATE_VERSION = 0.1.8 -LIBSAMPLERATE_SITE = http://www.mega-nerd.com/SRC -LIBSAMPLERATE_INSTALL_STAGING = YES -LIBSAMPLERATE_DEPENDENCIES = host-pkgconf -LIBSAMPLERATE_CONF_OPTS = --disable-fftw --program-transform-name='' -LIBSAMPLERATE_LICENSE = Dual GPLv2+ / libsamplerate commercial use license -LIBSAMPLERATE_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -LIBSAMPLERATE_DEPENDENCIES += libsndfile -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libseccomp/0001-remove-static.patch b/package.bak/libseccomp/0001-remove-static.patch deleted file mode 100644 index 6fd81f96d5..0000000000 --- a/package.bak/libseccomp/0001-remove-static.patch +++ /dev/null @@ -1,29 +0,0 @@ -Do not force static link, it breaks build with -# BR2_STATIC_LIBS is not set -BR2_SHARED_LIBS=y - -Signed-off-by: Bernd Kuhls - -diff -uNr libseccomp-2.2.0.org/tests/Makefile.am libseccomp-2.2.0/tests/Makefile.am ---- libseccomp-2.2.0.org/tests/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tests/Makefile.am 2015-03-29 16:03:49.668946652 +0200 -@@ -16,7 +16,6 @@ - # along with this library; if not, see . - # - --AM_LDFLAGS = -static - LDADD = util.la ../src/libseccomp.la - - check_LTLIBRARIES = util.la -diff -uNr libseccomp-2.2.0.org/tools/Makefile.am libseccomp-2.2.0/tools/Makefile.am ---- libseccomp-2.2.0.org/tools/Makefile.am 2015-02-11 21:57:11.000000000 +0100 -+++ libseccomp-2.2.0/tools/Makefile.am 2015-03-29 16:03:46.164992302 +0200 -@@ -33,8 +33,6 @@ - scmp_bpf_sim_SOURCES = scmp_bpf_sim.c bpf.h util.h - - scmp_sys_resolver_LDADD = ../src/libseccomp.la --scmp_sys_resolver_LDFLAGS = -static - scmp_arch_detect_LDADD = ../src/libseccomp.la --scmp_arch_detect_LDFLAGS = -static - scmp_bpf_disasm_LDADD = util.la - scmp_bpf_sim_LDADD = util.la diff --git a/package.bak/libseccomp/Config.in b/package.bak/libseccomp/Config.in deleted file mode 100644 index ddfe9f07c0..0000000000 --- a/package.bak/libseccomp/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBSECCOMP - bool "libseccomp" - depends on BR2_aarch64 || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_i386 || BR2_x86_64 || BR2_powerpc64 || \ - BR2_powerpc - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - help - High level interface to the Linux Kernel's seccomp filter - - The libseccomp library provides an easy to use, platform independent, - interface to the Linux Kernel's syscall filtering mechanism: seccomp. - The libseccomp API is designed to abstract away the underlying BPF - based syscall filter language and present a more conventional - function-call based filtering interface that should be familiar to, - and easily adopted by application developers. - - https://github.com/seccomp/libseccomp - -comment "libseccomp needs a toolchain w/ headers >= 3.12" - depends on BR2_aarch64 || BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package.bak/libseccomp/libseccomp.hash b/package.bak/libseccomp/libseccomp.hash deleted file mode 100644 index ef390ff562..0000000000 --- a/package.bak/libseccomp/libseccomp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 09864282ae579c34bd5ef75ef3487200adfecaa51f5cffc7c7ad1ed2f89f5d6c libseccomp-v2.3.1.tar.gz diff --git a/package.bak/libseccomp/libseccomp.mk b/package.bak/libseccomp/libseccomp.mk deleted file mode 100644 index 03fc6cf800..0000000000 --- a/package.bak/libseccomp/libseccomp.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libseccomp -# -################################################################################ - -LIBSECCOMP_VERSION = v2.3.1 -LIBSECCOMP_SITE = $(call github,seccomp,libseccomp,$(LIBSECCOMP_VERSION)) -LIBSECCOMP_LICENSE = LGPLv2.1 -LIBSECCOMP_LICENSE_FILES = LICENSE -LIBSECCOMP_INSTALL_STAGING = YES -LIBSECCOMP_AUTORECONF = YES - -# Needed for autoreconf to work properly, see ./autogen.sh -define LIBSECCOMP_FIXUP_M4_DIR - mkdir $(@D)/m4 -endef -LIBSECCOMP_POST_EXTRACT_HOOKS += LIBSECCOMP_FIXUP_M4_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch b/package.bak/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch deleted file mode 100644 index 62bc84c87e..0000000000 --- a/package.bak/libsecret/0001-libsecret.pc-add-Libs.private-field-for-libgcrypt.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 754897490d9478025d174c2b1c1849305f728324 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Dec 2015 12:13:07 +0100 -Subject: [PATCH] libsecret.pc: add Libs.private field for libgcrypt - -When libgcrypt is available, libsecret links with it. When dynamic -linking is used, there is no problem: libsecret.so has a NEEDED -pointing to libgcrypt, so linking an application with -lsecret works -fine. However, when doing static linking, you must specify the entire -chain of libraries, otherwise you get unresolved symbols errors, such -as: - -host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libsecret-1.a(libsecret_1_la-secret-session.o): In function `request_open_session_aes': -build/libsecret-0.18.3/libsecret/secret-session.c:99: undefined reference to `gcry_mpi_release' -build/libsecret-0.18.3/libsecret/secret-session.c:101: undefined reference to `gcry_mpi_aprint' -build/libsecret-0.18.3/libsecret/secret-session.c:107: undefined reference to `gcry_free' - -In order to solve this, we simply need to indicate in the Libs.private -field of the .pc file that we depend on libgcrypt. - -Signed-off-by: Thomas Petazzoni ---- - libsecret/libsecret.pc.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsecret/libsecret.pc.in b/libsecret/libsecret.pc.in -index 0c342ef..d99cf44 100644 ---- a/libsecret/libsecret.pc.in -+++ b/libsecret/libsecret.pc.in -@@ -11,4 +11,5 @@ Description: GObject bindings for Secret Service API - Version: @VERSION@ - Requires: glib-2.0 gobject-2.0 gio-2.0 - Libs: -L${libdir} -lsecret-@SECRET_MAJOR@ -+Libs.private: @LIBGCRYPT_LIBS@ - Cflags: -I${includedir}/libsecret-@SECRET_MAJOR@ --- -2.6.4 - diff --git a/package.bak/libsecret/Config.in b/package.bak/libsecret/Config.in deleted file mode 100644 index 70f1fe7eb9..0000000000 --- a/package.bak/libsecret/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBSECRET - bool "libsecret" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # gettext dep in libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - libsecret is a library for storing and retrieving passwords and other - secrets. It communicates with the "Secret Service" using DBus. - gnome-keyring and ksecretservice are both implementations of a Secret - Service. - - https://wiki.gnome.org/Libsecret - -comment "libsecret needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libsecret/libsecret.hash b/package.bak/libsecret/libsecret.hash deleted file mode 100644 index a637cbecf4..0000000000 --- a/package.bak/libsecret/libsecret.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libsecret/0.18/libsecret-0.18.5.sha256sum -sha256 9ce7bd8dd5831f2786c935d82638ac428fa085057cc6780aba0e39375887ccb3 libsecret-0.18.5.tar.xz diff --git a/package.bak/libsecret/libsecret.mk b/package.bak/libsecret/libsecret.mk deleted file mode 100644 index 20a217f197..0000000000 --- a/package.bak/libsecret/libsecret.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libsecret -# -################################################################################ - -LIBSECRET_VERSION_MAJOR = 0.18 -LIBSECRET_VERSION = $(LIBSECRET_VERSION_MAJOR).5 -LIBSECRET_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsecret/$(LIBSECRET_VERSION_MAJOR) -LIBSECRET_SOURCE = libsecret-$(LIBSECRET_VERSION).tar.xz -LIBSECRET_INSTALL_STAGING = YES -LIBSECRET_DEPENDENCIES = libglib2 host-intltool -LIBSECRET_CONF_OPTS = \ - --disable-manpages \ - --disable-strict \ - --disable-coverage \ - --enable-introspection=no \ - --enable-vala=no -LIBSECRET_LICENSE = LGPLv2.1+ -LIBSECRET_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBSECRET_DEPENDENCIES += libgcrypt -LIBSECRET_CONF_OPTS += --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr -else -LIBSECRET_CONF_OPTS += --disable-gcrypt -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch b/package.bak/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch deleted file mode 100644 index 3bda607512..0000000000 --- a/package.bak/libselinux/0001-libselinux-src-regex.c-support-old-compilers-for-the.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e0803c0bdbb1abf06b6b5bb1b52fdb733505b8f7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 25 Jan 2017 22:41:02 +1300 -Subject: [PATCH] src/regex.c: support old compilers for the endian - check - -libselinux 2.6 has added some code in regex.c that uses __BYTE_ORDER__ -to determine the system endianness. Unfortunately, this definition -provided directly by the compiler doesn't exist in older gcc versions -such as gcc 4.4. - -In order to address this, this commit extends the logic to use - definitions if __BYTE_ORDER__ is not provided by the -compiler. This allows libselinux to build properly with gcc 4.4. - -Signed-off-by: Thomas Petazzoni ---- - src/regex.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/regex.c b/src/regex.c -index a3b427b..0c5ad27 100644 ---- a/src/regex.c -+++ b/src/regex.c -@@ -13,7 +13,18 @@ - #endif - - #ifndef __BYTE_ORDER__ --#error __BYTE_ORDER__ not defined. Unable to determine endianness. -+ -+/* If the compiler doesn't define __BYTE_ORDER__, try to use the C -+ * library header definitions. */ -+#include -+#ifndef __BYTE_ORDER -+#error Neither __BYTE_ORDER__ nor __BYTE_ORDER defined. Unable to determine endianness. -+#endif -+ -+#define __ORDER_LITTLE_ENDIAN __LITTLE_ENDIAN -+#define __ORDER_BIG_ENDIAN __BIG_ENDIAN -+#define __BYTE_ORDER__ __BYTE_ORDER -+ - #endif - - #ifdef USE_PCRE2 --- -2.7.4 - diff --git a/package.bak/libselinux/0001-workaround-blackfin-issue.patch b/package.bak/libselinux/0001-workaround-blackfin-issue.patch deleted file mode 100644 index 5d00c6983b..0000000000 --- a/package.bak/libselinux/0001-workaround-blackfin-issue.patch +++ /dev/null @@ -1,24 +0,0 @@ -Do not make symbols hidden on Blackfin - -The libselinux logic to hide internal symbols from the DSO doesn't -work properly on Blackfin due to the USER_LABEL_PREFIX not being -handled properly. A real fix is not that simple, so this patch simply -disables the internal symbol hiding mechanism. This means that those -symbols are visible in the final DSO, which is not a problem for -proper execution, it just isn't as clean. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/dso.h -=================================================================== ---- a/src/dso.h -+++ b/src/dso.h -@@ -1,7 +1,7 @@ - #ifndef _SELINUX_DSO_H - #define _SELINUX_DSO_H 1 - --#ifdef SHARED -+#if defined(SHARED) && !defined(__bfin__) - # define hidden __attribute__ ((visibility ("hidden"))) - # define hidden_proto(fct) __hidden_proto (fct, fct##_internal) - # define __hidden_proto(fct, internal) \ diff --git a/package.bak/libselinux/0002-fix-musl-build.patch b/package.bak/libselinux/0002-fix-musl-build.patch deleted file mode 100644 index 7af3a3c36f..0000000000 --- a/package.bak/libselinux/0002-fix-musl-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -fix undefined macros in musl - -musl does not define glibc-specific macros, so use a simple version of -the macro when it is not defined. - -This is very inefficient, however, but copying the code from glibc is -not really possible because it is LGPL while libselinux in Public -Domain, and we want to avoid license propagation, so this macro is -completely written from scratch, and non-optimal. - -Signed-off-by: "Yann E. MORIN" - -diff -durN libselinux-2.1.13.orig/src/booleans.c libselinux-2.1.13/src/booleans.c ---- libselinux-2.1.13.orig/src/booleans.c 2013-02-06 02:43:22.000000000 +0100 -+++ libselinux-2.1.13/src/booleans.c 2015-07-26 20:40:41.311801914 +0200 -@@ -62,6 +62,14 @@ - goto bad; - } - -+/* Simple (but inefficient) version of _D_ALLOC_NAMLEN when -+ * building with a C library that misses it (e.g. musl). -+ * Note: glibc does a strlen on (d)->d_name, so assume it is safe. -+ */ -+#ifndef _D_ALLOC_NAMLEN -+#define _D_ALLOC_NAMLEN(d) (strlen((d)->d_name)+1) -+#endif -+ - for (i = 0; i < *len; i++) { - n[i] = (char *)malloc(_D_ALLOC_NAMLEN(namelist[i])); - if (!n[i]) { diff --git a/package.bak/libselinux/0003-revert-ln-relative.patch b/package.bak/libselinux/0003-revert-ln-relative.patch deleted file mode 100644 index b8ad07000a..0000000000 --- a/package.bak/libselinux/0003-revert-ln-relative.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile: revert libselinux: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/src/Makefile b/src/Makefile ---- a/src/Makefile -+++ b/src/Makefile -@@ -151,7 +151,7 @@ - install -m 755 $(LIBSO) $(SHLIBDIR) - test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig -- ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) -+ cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) - - install-pywrap: pywrap - test -d $(PYLIBDIR)/site-packages/selinux || install -m 755 -d $(PYLIBDIR)/site-packages/selinux diff --git a/package.bak/libselinux/Config.in b/package.bak/libselinux/Config.in deleted file mode 100644 index c88669b439..0000000000 --- a/package.bak/libselinux/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_LIBSELINUX - bool "libselinux" - select BR2_PACKAGE_LIBSEPOL - select BR2_PACKAGE_PCRE - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - # Uses , not available in musl or uClibc - depends on BR2_TOOLCHAIN_USES_GLIBC - # Toolchain issue: "fixup not contained within frag" - depends on !BR2_arc - help - libselinux is the runtime SELinux library that provides - interfaces (e.g. library functions for the SELinux kernel - APIs like getcon(), other support functions like - getseuserbyname()) to SELinux-aware applications. libselinux - may use the shared libsepol to manipulate the binary policy - if necessary (e.g. to downgrade the policy format to an - older version supported by the kernel) when loading policy. - - http://selinuxproject.org/page/Main_Page - -comment "libselinux needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/libselinux/libselinux.hash b/package.bak/libselinux/libselinux.hash deleted file mode 100644 index 76130b2dc0..0000000000 --- a/package.bak/libselinux/libselinux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4ea2dde50665c202253ba5caac7738370ea0337c47b251ba981c60d24e1a118a libselinux-2.6.tar.gz diff --git a/package.bak/libselinux/libselinux.mk b/package.bak/libselinux/libselinux.mk deleted file mode 100644 index 44120c4d3b..0000000000 --- a/package.bak/libselinux/libselinux.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# libselinux -# -################################################################################ - -LIBSELINUX_VERSION = 2.6 -LIBSELINUX_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -LIBSELINUX_LICENSE = Public Domain -LIBSELINUX_LICENSE_FILES = LICENSE - -LIBSELINUX_DEPENDENCIES = libsepol pcre - -LIBSELINUX_INSTALL_STAGING = YES - -# Filter out D_FILE_OFFSET_BITS=64. This fixes errors caused by glibc 2.22. -LIBSELINUX_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS))" \ - LDFLAGS="$(TARGET_LDFLAGS) -lpcre -lpthread" \ - ARCH=$(KERNEL_ARCH) - -define LIBSELINUX_BUILD_CMDS - # DESTDIR is needed during the compile to compute library and - # header paths. - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all -endef - -define LIBSELINUX_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endef - -define LIBSELINUX_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(LIBSELINUX_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - # Create the selinuxfs mount point - if [ ! -d "$(TARGET_DIR)/selinux" ]; then mkdir $(TARGET_DIR)/selinux; fi - if ! grep -q "selinuxfs" $(TARGET_DIR)/etc/fstab; then \ - echo "none /selinux selinuxfs noauto 0 0" >> $(TARGET_DIR)/etc/fstab ; fi -endef - -HOST_LIBSELINUX_DEPENDENCIES = \ - host-libsepol host-pcre host-swig - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSELINUX_DEPENDENCIES += host-python3 -HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/ -HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/ -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON3_VERSION_MAJOR) -else -HOST_LIBSELINUX_DEPENDENCIES += host-python -HOST_LIBSELINUX_PYTHONLIBDIR = -L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/ -HOST_LIBSELINUX_PYINC = -I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/ -HOST_LIBSELINUX_PYLIBVER = python$(PYTHON_VERSION_MAJOR) -endif - -HOST_LIBSELINUX_MAKE_OPTS = \ - $(HOST_CONFIGURE_OPTS) \ - LDFLAGS="$(HOST_LDFLAGS) -lpcre -lpthread" \ - PYINC="$(HOST_LIBSELINUX_PYINC)" \ - PYTHONLIBDIR="$(HOST_LIBSELINUX_PYTHONLIBDIR)" \ - PYLIBVER="$(HOST_LIBSELINUX_PYLIBVER)" \ - SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" - -define HOST_LIBSELINUX_BUILD_CMDS - # DESTDIR is needed during the compile to compute library and - # header paths. - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ - SHLIBDIR=$(HOST_DIR)/usr/lib all - # Generate python interface wrapper - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap -endef - -define HOST_LIBSELINUX_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) \ - SHLIBDIR=$(HOST_DIR)/usr/lib SBINDIR=$(HOST_DIR)/usr/sbin install - (cd $(HOST_DIR)/usr/lib; $(HOSTLN) -sf libselinux.so.1 libselinux.so) - # Install python interface wrapper - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - $(HOST_LIBSELINUX_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/libsemanage/0001-workaround-blackfin-issue.patch b/package.bak/libsemanage/0001-workaround-blackfin-issue.patch deleted file mode 100644 index 7ce960665c..0000000000 --- a/package.bak/libsemanage/0001-workaround-blackfin-issue.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not make symbols hidden on Blackfin - -The libselinux logic to hide internal symbols from the DSO doesn't -work properly on Blackfin due to the USER_LABEL_PREFIX not being -handled properly. A real fix is not that simple, so this patch simply -disables the internal symbol hiding mechanism. This means that those -symbols are visible in the final DSO, which is not a problem for -proper execution, it just isn't as clean. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett - -Index: b/src/dso.h -=================================================================== ---- a/src/dso.h -+++ b/src/dso.h -@@ -1,7 +1,7 @@ - #ifndef _SEPOL_DSO_H - #define _SEPOL_DSO_H 1 - --#ifdef SHARED -+#if defined(SHARED) && !defined(__bfin__) - # define hidden __attribute__ ((visibility ("hidden"))) - # define hidden_proto(fct) __hidden_proto (fct, fct##_internal) - # define __hidden_proto(fct, internal) \ diff --git a/package.bak/libsemanage/Config.in b/package.bak/libsemanage/Config.in deleted file mode 100644 index 4318dbfc5f..0000000000 --- a/package.bak/libsemanage/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_LIBSEMANAGE - bool "libsemanage" - select BR2_PACKAGE_AUDIT - select BR2_PACKAGE_LIBSELINUX - select BR2_PACKAGE_USTR - select BR2_PACKAGE_BZIP2 - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - # - libselinux needs fts.h (not available in uClibc/musl) - # - libsemanage itself needs getpwent_r() not available in musl - # - audit is not available on musl - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_arc - help - libsemanage is the policy management library. It uses - libsepol for binary policy manipulation and libselinux for - interacting with the SELinux system. It also exec's helper - programs for loading policy and for checking whether the - file_contexts configuration is valid (load_policy and - setfiles from policycoreutils) presently, although this may - change at least for the bootstrapping case (for rpm). - - http://selinuxproject.org/page/Main_Page - -comment "libsemanage needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/libsemanage/libsemanage.hash b/package.bak/libsemanage/libsemanage.hash deleted file mode 100644 index 62f4d833a5..0000000000 --- a/package.bak/libsemanage/libsemanage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4f81541047290b751f2ffb926fcd381c186f22db18d9fe671b0b4a6a54e8cfce libsemanage-2.6.tar.gz diff --git a/package.bak/libsemanage/libsemanage.mk b/package.bak/libsemanage/libsemanage.mk deleted file mode 100644 index 754559445d..0000000000 --- a/package.bak/libsemanage/libsemanage.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# libsemanage -# -################################################################################ - -LIBSEMANAGE_VERSION = 2.6 -LIBSEMANAGE_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -LIBSEMANAGE_LICENSE = LGPLv2.1+ -LIBSEMANAGE_LICENSE_FILES = COPYING -LIBSEMANAGE_DEPENDENCIES = host-bison host-flex audit libselinux ustr bzip2 -LIBSEMANAGE_INSTALL_STAGING = YES - -LIBSEMANAGE_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) - -define LIBSEMANAGE_BUILD_CMDS - # DESTDIR is needed during the compile to compute library and - # header paths. - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) all -endef - -define LIBSEMANAGE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endef - -define LIBSEMANAGE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -endef - -HOST_LIBSEMANAGE_DEPENDENCIES = host-bison host-audit host-libsepol host-libselinux \ - host-ustr host-bzip2 host-swig -HOST_LIBSEMANAGE_MAKE_OPTS += $(HOST_CONFIGURE_OPTS) \ - SWIG_LIB="$(HOST_DIR)/usr/share/swig/$(SWIG_VERSION)/" - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_LIBSEMANAGE_DEPENDENCIES += host-python3 -HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m/" \ - PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/" \ - PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_LIBSEMANAGE_DEPENDENCIES += host-python -HOST_LIBSEMANAGE_MAKE_OPTS += \ - PYINC="-I$(HOST_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR)/" \ - PYTHONLIBDIR="-L$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/" \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif - -define HOST_LIBSEMANAGE_BUILD_CMDS - # DESTDIR is needed during the compile to compute library and - # header paths. - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) all - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) swigify pywrap -endef - -define HOST_LIBSEMANAGE_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) install - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_LIBSEMANAGE_MAKE_OPTS) DESTDIR=$(HOST_DIR) install-pywrap -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/libsepol/0001-support-static-only.patch b/package.bak/libsepol/0001-support-static-only.patch deleted file mode 100644 index 3e6d555e96..0000000000 --- a/package.bak/libsepol/0001-support-static-only.patch +++ /dev/null @@ -1,48 +0,0 @@ -Add support for static-only build - -Instead of unconditionally building shared libraries, this patch -improves the libsepol build system with a "STATIC" variable, which -when defined to some non-empty value, will disable the build of shared -libraries. It allows to support cases where the target architecture -does not have support for shared libraries. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett - -Index: b/src/Makefile -=================================================================== - -diff --git a/src/Makefile b/src/Makefile -index db6c2ba..0006285 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -30,8 +30,12 @@ LOBJS += $(sort $(patsubst %.c,%.lo,$(wildcard $(CILDIR)/src/*.c) $(CIL_GENERATE - override CFLAGS += -I$(CILDIR)/include - endif - -+ALL_TARGETS = $(LIBA) $(LIBPC) -+ifeq ($(STATIC),) -+ALL_TARGETS += $(LIBSO) -+endif - --all: $(LIBA) $(LIBSO) $(LIBPC) -+all: $(ALL_TARGETS) - - - $(LIBA): $(OBJS) -@@ -66,11 +70,13 @@ - install: all - test -d $(LIBDIR) || install -m 755 -d $(LIBDIR) - install -m 644 $(LIBA) $(LIBDIR) -- test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) -- install -m 755 $(LIBSO) $(SHLIBDIR) - test -d $(LIBDIR)/pkgconfig || install -m 755 -d $(LIBDIR)/pkgconfig - install -m 644 $(LIBPC) $(LIBDIR)/pkgconfig -+ifeq ($(STATIC),) -+ test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) -+ install -m 755 $(LIBSO) $(SHLIBDIR) - ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) -+endif - - relabel: - /sbin/restorecon $(SHLIBDIR)/$(LIBSO) diff --git a/package.bak/libsepol/0002-workaround-blackfin-issue.patch b/package.bak/libsepol/0002-workaround-blackfin-issue.patch deleted file mode 100644 index 3c3bd4827f..0000000000 --- a/package.bak/libsepol/0002-workaround-blackfin-issue.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not make symbols hidden on Blackfin - -The libselinux logic to hide internal symbols from the DSO doesn't -work properly on Blackfin due to the USER_LABEL_PREFIX not being -handled properly. A real fix is not that simple, so this patch simply -disables the internal symbol hiding mechanism. This means that those -symbols are visible in the final DSO, which is not a problem for -proper execution, it just isn't as clean. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Adam Duskett - -Index: b/src/dso.h -=================================================================== ---- a/src/dso.h -+++ b/src/dso.h -@@ -5,7 +5,7 @@ - #define DISABLE_SYMVER 1 - #endif - --#ifdef SHARED -+#if defined(SHARED) && !defined(__bfin__) - # define hidden __attribute__ ((visibility ("hidden"))) - # define hidden_proto(fct) __hidden_proto (fct, fct##_internal) - # define __hidden_proto(fct, internal) \ - diff --git a/package.bak/libsepol/0003-revert-ln-relative.patch b/package.bak/libsepol/0003-revert-ln-relative.patch deleted file mode 100644 index 0902d8d40e..0000000000 --- a/package.bak/libsepol/0003-revert-ln-relative.patch +++ /dev/null @@ -1,24 +0,0 @@ -Makefile: revert libsepol: use ln --relative to create .so symlinks - -This reverts 71393a181d63c9baae5fe8dcaeb9411d1f253998 - -ln --relative is too recent to be available in all distributions, -especially enterprise-grade distros that can stick around as long as -they are maintained (up to 10 years in some cases?). - -For the sake of Buildroot, revert the upstream patch. - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/src/Makefile b/src/Makefile ---- a/src/Makefile -+++ b/src/Makefile -@@ -77,7 +77,7 @@ - ifeq ($(STATIC),) - test -d $(SHLIBDIR) || install -m 755 -d $(SHLIBDIR) - install -m 755 $(LIBSO) $(SHLIBDIR) -- ln -sf --relative $(SHLIBDIR)/$(LIBSO) $(LIBDIR)/$(TARGET) -+ cd $(LIBDIR) && ln -sf ../../`basename $(SHLIBDIR)`/$(LIBSO) $(TARGET) - endif - - relabel: diff --git a/package.bak/libsepol/Config.in b/package.bak/libsepol/Config.in deleted file mode 100644 index f92af52072..0000000000 --- a/package.bak/libsepol/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBSEPOL - bool "libsepol" - help - Libsepol is the binary policy manipulation library. It doesn't - depend upon or use any of the other SELinux components. - - http://selinuxproject.org/page/Main_Page diff --git a/package.bak/libsepol/libsepol.hash b/package.bak/libsepol/libsepol.hash deleted file mode 100644 index 6c705067a2..0000000000 --- a/package.bak/libsepol/libsepol.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 d856d6506054f52abeaa3543ea2f2344595a3dc05d0d873ed7f724f7a16b1874 libsepol-2.6.tar.gz diff --git a/package.bak/libsepol/libsepol.mk b/package.bak/libsepol/libsepol.mk deleted file mode 100644 index 61d1e611de..0000000000 --- a/package.bak/libsepol/libsepol.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# libsepol -# -################################################################################ - -LIBSEPOL_VERSION = 2.6 -LIBSEPOL_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -LIBSEPOL_LICENSE = LGPLv2.1+ -LIBSEPOL_LICENSE_FILES = COPYING - -LIBSEPOL_INSTALL_STAGING = YES -LIBSEPOL_DEPENDENCIES = host-flex -HOST_LIBSEPOL_DEPENDENCIES = host-flex - -LIBSEPOL_MAKE_FLAGS = $(TARGET_CONFIGURE_OPTS) - -ifeq ($(BR2_STATIC_LIBS),y) -LIBSEPOL_MAKE_FLAGS += STATIC=1 -endif - -define LIBSEPOL_BUILD_CMDS - # DESTDIR is needed during the compile to compute library and - # header paths. - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) -endef - -define LIBSEPOL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(STAGING_DIR) -endef - -define LIBSEPOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(LIBSEPOL_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) -endef - -define HOST_LIBSEPOL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) -endef - -define HOST_LIBSEPOL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install $(HOST_CONFIGURE_OPTS) DESTDIR=$(HOST_DIR) - mv $(HOST_DIR)/lib/libsepol.so.1 $(HOST_DIR)/usr/lib - (cd $(HOST_DIR)/usr/lib; rm -f libsepol.so; ln -s libsepol.so.1 libsepol.so) - -rmdir $(HOST_DIR)/lib -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/libserial/0001-disable-python-bindings.patch b/package.bak/libserial/0001-disable-python-bindings.patch deleted file mode 100644 index 1f2f5ed7df..0000000000 --- a/package.bak/libserial/0001-disable-python-bindings.patch +++ /dev/null @@ -1,26 +0,0 @@ -Disable build of Python bindings, which requires the sipconfig module. - -Signed-off-by: Simon Dawson -Signed-off-by: Jörg Krause - -diff -purN libserial-0.6.0rc2.orig/Makefile.am libserial-0.6.0rc2/Makefile.am ---- libserial-0.6.0rc2.orig/Makefile.am 2014-06-05 18:37:25.000000000 +0200 -+++ libserial-0.6.0rc2/Makefile.am 2015-07-30 20:59:28.828429011 +0200 -@@ -1,4 +1,4 @@ --SUBDIRS=src doc examples sip -+SUBDIRS=src doc examples - ACLOCAL_AMFLAGS=-I m4 - - EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc -diff -purN libserial-0.6.0rc2.orig/Makefile.in libserial-0.6.0rc2/Makefile.in ---- libserial-0.6.0rc2.orig/Makefile.in 2014-06-05 18:40:09.000000000 +0200 -+++ libserial-0.6.0rc2/Makefile.in 2015-07-30 21:00:09.215188376 +0200 -@@ -348,7 +348,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = src doc examples sip -+SUBDIRS = src doc examples - ACLOCAL_AMFLAGS = -I m4 - EXTRA_DIST = doxygen.conf.in Makefile.dist libserial.spec libserial.pc - pkgconfigdir = $(libdir)/pkgconfig diff --git a/package.bak/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch b/package.bak/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch deleted file mode 100644 index f2ad61ae7d..0000000000 --- a/package.bak/libserial/0002-Don-t-use-high-baudrates-when-not-available.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 47ca0621ccd2100e4ba0d7f4e2a861d14f05f63c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 17 Nov 2015 23:50:14 +0100 -Subject: [PATCH] Don't use high baudrates when not available - -On certain architectures (namely Sparc), the maximum baud rate exposed -by the kernel headers is B2000000. Therefore, the current libserial -code doesn't build for the Sparc and Sparc64 architectures due to -this. - -In order to address this problem, this patch tests the value of -__MAX_BAUD. If it's higher than B2000000 then we assume we're on an -architecture that supports all baud rates up to B4000000. Otherwise, -we simply don't support the baud rates above B2000000. - -Fixes build failures such as: - -./SerialPort.h:88:24: error: 'B2500000' was not declared in this scope - BAUD_2500000 = B2500000, - -Signed-off-by: Thomas Petazzoni ---- - src/SerialPort.h | 2 ++ - src/SerialStreamBuf.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/src/SerialPort.h b/src/SerialPort.h -index 6c0baaa..0b1af4c 100644 ---- a/src/SerialPort.h -+++ b/src/SerialPort.h -@@ -85,11 +85,13 @@ public: - BAUD_1152000 = B1152000, - BAUD_1500000 = B1500000, - BAUD_2000000 = B2000000, -+#if __MAX_BAUD > B2000000 - BAUD_2500000 = B2500000, - BAUD_3000000 = B3000000, - BAUD_3500000 = B3500000, - BAUD_4000000 = B4000000, - #endif -+#endif /* __linux__ */ - BAUD_DEFAULT = BAUD_57600 - } ; - -diff --git a/src/SerialStreamBuf.h b/src/SerialStreamBuf.h -index ccbb996..174f31c 100644 ---- a/src/SerialStreamBuf.h -+++ b/src/SerialStreamBuf.h -@@ -85,11 +85,13 @@ extern "C++" - BAUD_1152000 = SerialPort::BAUD_1152000, - BAUD_1500000 = SerialPort::BAUD_1500000, - BAUD_2000000 = SerialPort::BAUD_2000000, -+#if __MAX_BAUD > B2000000 - BAUD_2500000 = SerialPort::BAUD_2500000, - BAUD_3000000 = SerialPort::BAUD_3000000, - BAUD_3500000 = SerialPort::BAUD_3500000, - BAUD_4000000 = SerialPort::BAUD_4000000, - #endif -+#endif /* __linux__ */ - BAUD_DEFAULT = SerialPort::BAUD_DEFAULT, - BAUD_INVALID = -1 - } ; --- -2.6.3 - diff --git a/package.bak/libserial/Config.in b/package.bak/libserial/Config.in deleted file mode 100644 index bd936b93b8..0000000000 --- a/package.bak/libserial/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBSERIAL - bool "libserial" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_USE_WCHAR # boost - select BR2_PACKAGE_BOOST - help - Simplified serial port programming in C++ under POSIX operating - systems. - - http://libserial.sourceforge.net/ - -comment "libserial needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/libserial/libserial.hash b/package.bak/libserial/libserial.hash deleted file mode 100644 index bca647ae3f..0000000000 --- a/package.bak/libserial/libserial.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/libserial/files/libserial/0.6.0rc2/ -sha1 e09113be3ba595135e95e853003ff96feea0da63 libserial-0.6.0rc2.tar.gz -md5 7787679b22901e4810bc53ecccdf8266 libserial-0.6.0rc2.tar.gz -# Locally calculated -sha256 35ee29eb1369d52ffb8658237577692f991eb508320d0abbb71c53e6494a1c23 libserial-0.6.0rc2.tar.gz diff --git a/package.bak/libserial/libserial.mk b/package.bak/libserial/libserial.mk deleted file mode 100644 index 11f187484e..0000000000 --- a/package.bak/libserial/libserial.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libserial -# -################################################################################ - -LIBSERIAL_VERSION = 0.6.0rc2 -LIBSERIAL_SITE = http://downloads.sourceforge.net/libserial -LIBSERIAL_INSTALL_STAGING = YES -LIBSERIAL_LICENSE = GPLv2+ -LIBSERIAL_LICENSE_FILES = COPYING -LIBSERIAL_DEPENDENCIES = boost - -LIBSERIAL_CONF_ENV = ac_cv_prog_DOCBOOK2PDF=no - -$(eval $(autotools-package)) diff --git a/package.bak/libserialport/0001-uclinux-detection.patch b/package.bak/libserialport/0001-uclinux-detection.patch deleted file mode 100644 index 7d7199c1f0..0000000000 --- a/package.bak/libserialport/0001-uclinux-detection.patch +++ /dev/null @@ -1,26 +0,0 @@ -From faab9aa5879fab93556b7a3a6f24070eeb3cbf15 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Mon, 29 Aug 2016 11:11:01 +0200 -Subject: [PATCH] Fix Linux files not compiled in with a toolchain for ucLinux - -Signed-off-by: Paul Cercueil ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index f6b66e8..de6f5b9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -74,7 +74,7 @@ AC_DEFINE_UNQUOTED([SP_LIB_VERSION_REVISION], [$SP_LIB_VERSION_REVISION], [.]) - AC_DEFINE_UNQUOTED([SP_LIB_VERSION_AGE], [$SP_LIB_VERSION_AGE], [.]) - AC_DEFINE_UNQUOTED([SP_LIB_VERSION_STRING], ["$SP_LIB_VERSION"], [.]) - --AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}"]) -+AM_CONDITIONAL([LINUX], [test -z "${host_os##linux*}" || test -z "${host_os##uclinux*}"]) - AM_CONDITIONAL([WIN32], [test -z "${host_os##mingw*}" || test -z "${host_os##cygwin*}"]) - AM_CONDITIONAL([MACOSX], [test -z "${host_os##darwin*}"]) - AM_CONDITIONAL([FREEBSD], [test -z "${host_os##freebsd*}"]) --- -2.8.1 - diff --git a/package.bak/libserialport/Config.in b/package.bak/libserialport/Config.in deleted file mode 100644 index d8218309e9..0000000000 --- a/package.bak/libserialport/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBSERIALPORT - bool "libserialport" - help - Libserialport is a minimal, cross-platform shared - library written in C that is intended to take care - of the OS-specific details when writing software - that uses serial ports. - - http://sigrok.org/wiki/Libserialport diff --git a/package.bak/libserialport/libserialport.hash b/package.bak/libserialport/libserialport.hash deleted file mode 100644 index f2619029a2..0000000000 --- a/package.bak/libserialport/libserialport.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 4a2af9d9c3ff488e92fb75b4ba38b35bcf9b8a66df04773eba2a7bbf1fa7529d libserialport-0.1.1.tar.gz diff --git a/package.bak/libserialport/libserialport.mk b/package.bak/libserialport/libserialport.mk deleted file mode 100644 index 86ae17f549..0000000000 --- a/package.bak/libserialport/libserialport.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libserialport -# -################################################################################ - -LIBSERIALPORT_VERSION = 0.1.1 -LIBSERIALPORT_SITE = http://sigrok.org/download/source/libserialport -LIBSERIALPORT_LICENSE = LGPLv3+ -LIBSERIALPORT_LICENSE_FILES = COPYING -LIBSERIALPORT_INSTALL_STAGING = YES -LIBSERIALPORT_DEPENDENCIES = host-pkgconf -LIBSERIALPORT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libsexy/Config.in b/package.bak/libsexy/Config.in deleted file mode 100644 index 5d1e710c44..0000000000 --- a/package.bak/libsexy/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBSEXY - bool "libsexy" - depends on BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBXML2 - help - libsexy is a collection of GTK+ widgets that extend the - functionality of such standard widgets as GtkEntry and - GtkLabel by subclassing them and working around the - limitations of the widgets. - - http://www.chipx86.com/wiki/Libsexy diff --git a/package.bak/libsexy/libsexy.hash b/package.bak/libsexy/libsexy.hash deleted file mode 100644 index 78b1a82657..0000000000 --- a/package.bak/libsexy/libsexy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8c4101a8cda5fccbba85ba1a15f46f2cf75deaa8b3c525ce5b135b9e1a8fe49e libsexy-0.1.11.tar.gz diff --git a/package.bak/libsexy/libsexy.mk b/package.bak/libsexy/libsexy.mk deleted file mode 100644 index c291d7dc9f..0000000000 --- a/package.bak/libsexy/libsexy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libsexy -# -################################################################################ - -LIBSEXY_VERSION = 0.1.11 -LIBSEXY_SITE = http://releases.chipx86.com/libsexy/libsexy -LIBSEXY_DEPENDENCIES = libgtk2 libxml2 -LIBSEXY_INSTALL_STAGING = YES -LIBSEXY_LICENSE = LGPLv2.1+ -LIBSEXY_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libsha1/Config.in b/package.bak/libsha1/Config.in deleted file mode 100644 index 5467a6c4cd..0000000000 --- a/package.bak/libsha1/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBSHA1 - bool "libsha1" - help - libsha1 is a tiny library providing SHA1 implementation, - created for facilitating X server compilation on devices - when larger libraries containing SHA1 implementations - (OpenSSL, Mozilla NSS) are not needed. - - https://github.com/dottedmag/libsha1 diff --git a/package.bak/libsha1/libsha1.hash b/package.bak/libsha1/libsha1.hash deleted file mode 100644 index 6d597abffb..0000000000 --- a/package.bak/libsha1/libsha1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ef4c75007ac41c3dc09e0225943c789ba2b9c632a6cd7b548e0519477ac2f768 libsha1-0.3.tar.gz diff --git a/package.bak/libsha1/libsha1.mk b/package.bak/libsha1/libsha1.mk deleted file mode 100644 index 647f986d4f..0000000000 --- a/package.bak/libsha1/libsha1.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libsha1 -# -################################################################################ - -LIBSHA1_VERSION = 0.3 -LIBSHA1_SITE = $(call github,dottedmag,libsha1,$(LIBSHA1_VERSION)) -LIBSHA1_LICENSE = BSD-3c or GPL -LIBSHA1_LICENSE_FILES = COPYING - -LIBSHA1_INSTALL_STAGING = YES - -# We're getting the source code from GitHub, so there is no generated -# configure script in the tarball. -LIBSHA1_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libshairplay/Config.in b/package.bak/libshairplay/Config.in deleted file mode 100644 index 1cfbdfe488..0000000000 --- a/package.bak/libshairplay/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBSHAIRPLAY - bool "libshairplay" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # avahi - depends on !BR2_STATIC_LIBS # avahi - select BR2_PACKAGE_AVAHI - select BR2_PACKAGE_AVAHI_DAEMON - select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY # runtime - help - libshairplay is a client library that emulates an airplay - server. - - https://github.com/juhovh/shairplay - -comment "libshairplay needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libshairplay/libshairplay.hash b/package.bak/libshairplay/libshairplay.hash deleted file mode 100644 index 19261f98bf..0000000000 --- a/package.bak/libshairplay/libshairplay.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 49ac0e0470ec6367f720c7b79a09165138f57b60f5949a2d9c38be5823d13294 libshairplay-ce80e005908f41d0e6fde1c4a21e9cb8ee54007b.tar.gz diff --git a/package.bak/libshairplay/libshairplay.mk b/package.bak/libshairplay/libshairplay.mk deleted file mode 100644 index 4bdd1a04e0..0000000000 --- a/package.bak/libshairplay/libshairplay.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libshairplay -# -################################################################################ - -LIBSHAIRPLAY_VERSION = ce80e005908f41d0e6fde1c4a21e9cb8ee54007b -LIBSHAIRPLAY_SITE = $(call github,juhovh,shairplay,$(LIBSHAIRPLAY_VERSION)) -LIBSHAIRPLAY_INSTALL_STAGING = YES -LIBSHAIRPLAY_AUTORECONF = YES -LIBSHAIRPLAY_LICENSE = MIT, BSD-3c, LGPLv2.1+ -LIBSHAIRPLAY_LICENSE_FILES = LICENSE -LIBSHAIRPLAY_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_LIBAO),libao) - -$(eval $(autotools-package)) diff --git a/package.bak/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch b/package.bak/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch deleted file mode 100644 index 4d173c51e9..0000000000 --- a/package.bak/libshout/0001-Fix-THEORA-SPEEX-_LDFLAGS-typo.patch +++ /dev/null @@ -1,45 +0,0 @@ -From d96a3cafeebeb80b4796bacbe0e6da0bbd3ee48e Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 28 Aug 2016 00:39:55 +0200 -Subject: [PATCH 1/2] Fix {THEORA,SPEEX}_LDFLAGS typo -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Needed to properly link against libshout, otherwise the build fails with: - - error: LDFLAGS: No such file or directory - -Upstream status: pending -https://github.com/xiph/Icecast-libshout/pull/4 - -Signed-off-by: Jörg Krause ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 87a7f55..85f18ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -134,7 +134,7 @@ PKG_CHECK_MODULES(THEORA, theora, [ - ]) - fi - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$THEORA_CFLAGS]) --XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA LDFLAGS $THEORA_LIBS]) -+XIPH_VAR_PREPEND([XIPH_LIBS],[$THEORA_LDFLAGS $THEORA_LIBS]) - AM_CONDITIONAL([HAVE_THEORA], [test -n "$THEORA_LIBS"]) - if test -n "$THEORA_LIBS" - then -@@ -153,7 +153,7 @@ PKG_CHECK_MODULES(SPEEX, speex, [ - ]) - fi - XIPH_VAR_APPEND([XIPH_CPPFLAGS],[$SPEEX_CFLAGS]) --XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX LDFLAGS $SPEEX_LIBS]) -+XIPH_VAR_PREPEND([XIPH_LIBS],[$SPEEX_LDFLAGS $SPEEX_LIBS]) - AM_CONDITIONAL([HAVE_SPEEX], [test -n "$SPEEX_LIBS"]) - if test -n "$SPEEX_LIBS" - then --- -2.9.3 - diff --git a/package.bak/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch b/package.bak/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch deleted file mode 100644 index 08d7fa9176..0000000000 --- a/package.bak/libshout/0002-Make-sure-SHOUT_REQUIRES-contains-OpenSSL.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 69774132422af1d017008eb5daed8e2099d2fa0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 31 Aug 2016 21:55:51 +0200 -Subject: [PATCH 2/2] Make sure @SHOUT_REQUIRES@ contains OpenSSL -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Static linking userspace programs such as mpd against libshout -currently doesn't work out of the box, because libshout is linked -against libssl, but this isn't expressed in libshouts pkg-config -file: - -``` -/usr/lib/libshout.a(tls.o): In function `tls_check_cert': -tls.c:(.text+0x10): undefined reference to `SSL_get_peer_certificate' -tls.c:(.text+0x24): undefined reference to `SSL_get_verify_result' -tls.c:(.text+0x4c): undefined reference to `X509_get_subject_name' -tls.c:(.text+0x60): undefined reference to `X509_NAME_get_text_by_NID' -tls.c:(.text+0x118): undefined reference to `X509_NAME_get_entry' -tls.c:(.text+0x11c): undefined reference to `X509_NAME_ENTRY_get_data' -tls.c:(.text+0x120): undefined reference to `ASN1_STRING_length' -tls.c:(.text+0x148): undefined reference to `X509_free' -tls.c:(.text+0x178): undefined reference to `X509_NAME_get_index_by_NID' -``` - -Since OpenSSL installs its own .pc files, make sure that @SHOUT_REQUIRES@ -contains `ssl`. - -Upstream status: pending -https://github.com/xiph/Icecast-libshout/pull/5 - -Signed-off-by: Jörg Krause ---- - configure.ac | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 85f18ad..2b9c505 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,6 +197,10 @@ XIPH_PATH_OPENSSL([ - ]) - AC_SUBST([SHOUT_TLS]) - AM_CONDITIONAL([HAVE_TLS], [test -n "$OPENSSL_LIBS"]) -+if test "$SHOUT_TLS" = "1" -+then -+ SHOUT_REQUIRES="$SHOUT_REQUIRES, libssl" -+fi - - SHOUT_VERSION="$VERSION" - SHOUT_CPPFLAGS="-I$shout_includedir $VORBIS_CFLAGS $PTHREAD_CPPFLAGS" --- -2.9.3 - diff --git a/package.bak/libshout/Config.in b/package.bak/libshout/Config.in deleted file mode 100644 index 02248c7f8e..0000000000 --- a/package.bak/libshout/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBSHOUT - bool "libshout" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - help - Libshout is a library for communicating with and sending data to an - icecast server. It handles the socket connection, the timing of the - data, and prevents bad data from getting to the icecast server. - - http://icecast.org/download/ diff --git a/package.bak/libshout/libshout.hash b/package.bak/libshout/libshout.hash deleted file mode 100644 index 5b3ae2d446..0000000000 --- a/package.bak/libshout/libshout.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://gitweb.gentoo.org/repo/gentoo.git/tree/media-libs/libshout/Manifest -# hash from http://downloads.xiph.org/releases/libshout/SHA256SUMS is wrong! -sha256 f3acb8dec26f2dbf6df778888e0e429a4ce9378a9d461b02a7ccbf2991bbf24d libshout-2.4.1.tar.gz diff --git a/package.bak/libshout/libshout.mk b/package.bak/libshout/libshout.mk deleted file mode 100644 index bf85595204..0000000000 --- a/package.bak/libshout/libshout.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# libshout -# -################################################################################ - -LIBSHOUT_VERSION = 2.4.1 -LIBSHOUT_SITE = http://downloads.xiph.org/releases/libshout -LIBSHOUT_LICENSE = LGPLv2+ -LIBSHOUT_LICENSE_FILES = COPYING -LIBSHOUT_INSTALL_STAGING = YES -LIBSHOUT_DEPENDENCIES = host-pkgconf libogg libvorbis - -# patching configure.ac -LIBSHOUT_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -LIBSHOUT_CONF_OPTS += --enable-theora -LIBSHOUT_DEPENDENCIES += libtheora -else -LIBSHOUT_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -LIBSHOUT_CONF_OPTS += --enable-speex -LIBSHOUT_DEPENDENCIES += speex -else -LIBSHOUT_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBSHOUT_CONF_OPTS += --with-openssl -LIBSHOUT_DEPENDENCIES += openssl -else -LIBSHOUT_CONF_OPTS += --without-openssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsidplay2/0001-sidplay2-libs-2.1.1.patch b/package.bak/libsidplay2/0001-sidplay2-libs-2.1.1.patch deleted file mode 100644 index 3f7664407a..0000000000 --- a/package.bak/libsidplay2/0001-sidplay2-libs-2.1.1.patch +++ /dev/null @@ -1,331 +0,0 @@ -Various fixes to compile libsidplay2 with newer gcc compilers - -Downloaded from -http://tsubasa.googlecode.com/svn/trunk/tsubasa/sidplay2-libs/sidplay2-libs-2.1.1.diff - -Signed-off-by: Bernd Kuhls - ---- sidplay-libs-2.1.1.orig/Makefile.in -+++ sidplay-libs-2.1.1/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.4 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -253,7 +253,7 @@ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -264,7 +264,7 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -z "$$unique" && unique=$$empty_fix; \ -+ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ---- sidplay-libs-2.1.1.orig/aclocal.m4 -+++ sidplay-libs-2.1.1/aclocal.m4 -@@ -1,4 +1,4 @@ --# generated automatically by aclocal 1.8.4 -*- Autoconf -*- -+# generated automatically by aclocal 1.8.5 -*- Autoconf -*- - - # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - # Free Software Foundation, Inc. -@@ -40,7 +40,7 @@ - # Call AM_AUTOMAKE_VERSION so it can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.8.4])]) -+ [AM_AUTOMAKE_VERSION([1.8.5])]) - - # AM_AUX_DIR_EXPAND - ---- sidplay-libs-2.1.1.orig/builders/Makefile.in -+++ sidplay-libs-2.1.1/builders/Makefile.in -@@ -1,4 +1,4 @@ --# Makefile.in generated by automake 1.8.4 from Makefile.am. -+# Makefile.in generated by automake 1.8.5 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -@@ -130,9 +130,9 @@ - exit 1;; \ - esac; \ - done; \ -- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu builders/Makefile'; \ -+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign builders/Makefile'; \ - cd $(top_srcdir) && \ -- $(AUTOMAKE) --gnu builders/Makefile -+ $(AUTOMAKE) --foreign builders/Makefile - .PRECIOUS: Makefile - Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ -@@ -234,7 +234,7 @@ - fi; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ -- test -f $$subdir/TAGS && \ -+ test ! -f $$subdir/TAGS || \ - tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ - fi; \ - done; \ -@@ -245,7 +245,7 @@ - $(AWK) ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ -- test -z "$$unique" && unique=$$empty_fix; \ -+ test -n "$$unique" || unique=$$empty_fix; \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$tags $$unique; \ - fi ---- sidplay-libs-2.1.1.orig/builders/hardsid-builder/src/hardsid-builder.cpp -+++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp -@@ -47,6 +47,7 @@ - ***************************************************************************/ - - #include -+#include - #include "config.h" - - #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid-builder.cpp -+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp -@@ -37,6 +37,7 @@ - ***************************************************************************/ - - #include -+#include - - #include "config.h" - #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid.cpp -+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp -@@ -16,6 +16,7 @@ - * * - ***************************************************************************/ - -+#include - #include "config.h" - - #ifdef HAVE_EXCEPTIONS ---- sidplay-libs-2.1.1.orig/configure.ac -+++ sidplay-libs-2.1.1/configure.ac -@@ -2,7 +2,7 @@ - - #Variables - pwd=`pwd` --builders='${libdir}'/sidplay/builders -+builders='${libdir}'/ - ac_configure_args="$ac_configure_args --disable-library-checks" - - AC_CONFIG_AUX_DIR(unix) -@@ -11,7 +11,7 @@ - - hardsid=false - case "$host" in -- *linux*) hardsid=true -+ *linux*|*-k*bsd*-gnu) hardsid=true - ;; - esac - AM_CONDITIONAL(HARDSID, test x$hardsid = xtrue) ---- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/SmartPtr.h -+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h -@@ -17,16 +17,16 @@ - doFree = bufOwner; - if ( bufferLen >= 1 ) - { -- pBufCurrent = ( bufBegin = buffer ); -- bufEnd = bufBegin + bufferLen; -- bufLen = bufferLen; -- status = true; -+ this->pBufCurrent = ( this->bufBegin = buffer ); -+ this->bufEnd = this->bufBegin + bufferLen; -+ this->bufLen = bufferLen; -+ this->status = true; - } - else - { -- pBufCurrent = ( bufBegin = ( bufEnd = 0 )); -- bufLen = 0; -- status = false; -+ this->pBufCurrent = ( this->bufBegin = ( this->bufEnd = 0 )); -+ this->bufLen = 0; -+ this->status = false; - } - } - -@@ -211,16 +211,16 @@ - { - if ( bufferLen >= 1 ) - { -- pBufCurrent = ( bufBegin = buffer ); -- bufEnd = bufBegin + bufferLen; -- bufLen = bufferLen; -- status = true; -+ this->pBufCurrent = ( this->bufBegin = buffer ); -+ this->bufEnd = this->bufBegin + bufferLen; -+ this->bufLen = bufferLen; -+ this->status = true; - } - else - { -- pBufCurrent = bufBegin = bufEnd = 0; -- bufLen = 0; -- status = false; -+ this->pBufCurrent = this->bufBegin = this->bufEnd = 0; -+ this->bufLen = 0; -+ this->status = false; - } - } - }; ---- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/sidendian.h -+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/sidendian.h -@@ -16,6 +16,10 @@ - ***************************************************************************/ - /*************************************************************************** - * $Log: sidendian.h,v $ -+ * Revision 1.6 2005/11/20 11:02:06 s_a_white -+ * Work around for bug in gcc 4 (optimiser breaks if variable never has a -+ * direct assignment). -+ * - * Revision 1.5 2001/07/03 22:44:13 s_a_white - * Added endian_16 to convert a 16 bit value to an array of 8s. - * -@@ -141,7 +145,7 @@ - // Convert high-byte and low-byte to 16-bit word. - inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo) - { -- uint_least16_t word; -+ uint_least16_t word = 0; - endian_16lo8 (word, lo); - endian_16hi8 (word, hi); - return word; -@@ -165,7 +169,7 @@ - - inline void endian_16 (char ptr[2], uint_least16_t word) - { -- endian_16 ((uint8_t *) ptr, word); -+ endian_16 ((uint8_t *) ptr, word); - } - - // Convert high-byte and low-byte to 16-bit little endian word. -@@ -334,7 +338,7 @@ - // Swap word endian. - inline void endian_32swap8 (uint_least32_t &dword) - { -- uint_least16_t lo, hi; -+ uint_least16_t lo = 0, hi = 0; - lo = endian_32lo16 (dword); - hi = endian_32hi16 (dword); - endian_16swap8 (lo); -@@ -346,8 +350,8 @@ - // Convert high-byte and low-byte to 32-bit word. - inline uint_least32_t endian_32 (uint8_t hihi, uint8_t hilo, uint8_t hi, uint8_t lo) - { -- uint_least32_t dword; -- uint_least16_t word; -+ uint_least32_t dword = 0; -+ uint_least16_t word = 0; - endian_32lo8 (dword, lo); - endian_32hi8 (dword, hi); - endian_16lo8 (word, hilo); -@@ -374,7 +378,7 @@ - defined(SID_WORDS_LITTLEENDIAN) - *((uint_least32_t *) ptr) = dword; - #else -- uint_least16_t word; -+ uint_least16_t word = 0; - ptr[0] = endian_32lo8 (dword); - ptr[1] = endian_32hi8 (dword); - word = endian_32hi16 (dword); -@@ -401,7 +405,7 @@ - defined(SID_WORDS_BIGENDIAN) - *((uint_least32_t *) ptr) = dword; - #else -- uint_least16_t word; -+ uint_least16_t word = 0; - word = endian_32hi16 (dword); - ptr[1] = endian_16lo8 (word); - ptr[0] = endian_16hi8 (word); ---- sidplay-libs-2.1.1.orig/libsidplay/unix/config.h.in -+++ sidplay-libs-2.1.1/libsidplay/unix/config.h.in -@@ -72,22 +72,22 @@ - /* Define to the version of this package. */ - #undef PACKAGE_VERSION - --/* The size of a `char', as computed by sizeof. */ -+/* The size of `char', as computed by sizeof. */ - #undef SIZEOF_CHAR - --/* The size of a `int', as computed by sizeof. */ -+/* The size of `int', as computed by sizeof. */ - #undef SIZEOF_INT - - /* The number of bytes in type long */ - #undef SIZEOF_LONG - --/* The size of a `long int', as computed by sizeof. */ -+/* The size of `long int', as computed by sizeof. */ - #undef SIZEOF_LONG_INT - - /* The number of bytes in type short */ - #undef SIZEOF_SHORT - --/* The size of a `short int', as computed by sizeof. */ -+/* The size of `short int', as computed by sizeof. */ - #undef SIZEOF_SHORT_INT - - /* The number of bytes in type void* */ ---- sidplay-libs-2.1.1.orig/libsidplay/unix/my_macros.m4 -+++ sidplay-libs-2.1.1/libsidplay/unix/my_macros.m4 -@@ -105,8 +105,9 @@ - AC_CACHE_VAL(test_cv_have_ios_openmode, - [ - AC_TRY_COMPILE( -- [#include -- #include ], -+ [#include -+ #include -+ using namespace std;], - [ios::openmode myTest = ios::in;], - [test_cv_have_ios_openmode=yes], - [test_cv_have_ios_openmode=no] ---- sidplay-libs-2.1.1.orig/libsidplay/unix/sidint.h -+++ sidplay-libs-2.1.1/libsidplay/unix/sidint.h -@@ -0,0 +1,17 @@ -+#ifndef _UNIX_SIDINT_H -+#define _UNIX_SIDINT_H 1 -+#ifndef _GENERATED_STDINT_H -+#define _GENERATED_STDINT_H "libsidplay 2.1.1" -+/* generated using a gnu compiler version gcc (Debian 4.3-20080219-1) 4.3.0 20080219 (prerelease) [gcc-4_3-branch revision 132456] Copyright (C) 2007 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. */ -+ -+#include -+ -+ -+/* system headers have good uint64_t */ -+#ifndef _HAVE_UINT64_T -+#define _HAVE_UINT64_T -+#endif -+ -+ /* once */ -+#endif -+#endif ---- sidplay-libs-2.1.1.orig/libsidutils/include/sidplay/utils/SidUsage.h -+++ sidplay-libs-2.1.1/libsidutils/include/sidplay/utils/SidUsage.h -@@ -33,7 +33,7 @@ - uint_least16_t length; // usage scan length - - // Copy common parts of basic usage to extended usage. -- sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage) -+ sid2_usage_t &operator= (const sid_usage_t &usage) - { - *((sid_usage_t *) this) = usage; - return *this; diff --git a/package.bak/libsidplay2/0002-pkg-config.patch b/package.bak/libsidplay2/0002-pkg-config.patch deleted file mode 100644 index ce37e94209..0000000000 --- a/package.bak/libsidplay2/0002-pkg-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -Include correct libdir in pkgconfig files - -Downloaded from -https://sources.debian.net/src/sidplay-libs/2.1.1-14/debian/patches/pkg-config.patch/ - -Signed-off-by: Bernd Kuhls - ---- sidplay-libs-2.1.1.orig/libsidplay/unix/libsidplay2.pc.in -+++ sidplay-libs-2.1.1/libsidplay/unix/libsidplay2.pc.in -@@ -7,5 +7,5 @@ builders=@builders@ - Name: @PACKAGE@ - Description: C64 cycle exact stereo sidplayer library. - Version: @VERSION@ --Libs: ${libdir}/libsidplay2.la -+Libs: -L${libdir} -lsidplay2 - Cflags: -DHAVE_UNIX -I${includedir} ---- sidplay-libs-2.1.1.orig/libsidutils/unix/libsidutils.pc.in -+++ sidplay-libs-2.1.1/libsidutils/unix/libsidutils.pc.in -@@ -6,5 +6,5 @@ includedir=@includedir@ - Name: @PACKAGE@ - Description: Utils for supporting the libsidplay2 library. - Version: @VERSION@ --Libs: ${libdir}/libsidutils.la -+Libs: -L${libdir} -lsidutils - Cflags: -DHAVE_UNIX -I${includedir} diff --git a/package.bak/libsidplay2/0003-gcc6.patch b/package.bak/libsidplay2/0003-gcc6.patch deleted file mode 100644 index 53601f6d4f..0000000000 --- a/package.bak/libsidplay2/0003-gcc6.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix build with gcc6 - -gcc6 triggers an error during build: - -xsid.cpp:101:1: error: narrowing conversion of ''\200'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] - }; - ^ -xsid.cpp:101:1: error: narrowing conversion of ''\224'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] -xsid.cpp:101:1: error: narrowing conversion of ''\251'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] -xsid.cpp:101:1: error: narrowing conversion of ''\274'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] -xsid.cpp:101:1: error: narrowing conversion of ''\316'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] -xsid.cpp:101:1: error: narrowing conversion of ''\341'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] -xsid.cpp:101:1: error: narrowing conversion of ''\362'' from 'char' to 'int8_t {aka signed char}' inside { } [-Wnarrowing] - -To fix the problem change the array type from int8_t to char as proposed -by Khem Raj: -http://lists.busybox.net/pipermail/buildroot/2016-August/169540.html - -Signed-off-by: Bernd Kuhls - -diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp ---- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.cpp 2004-06-14 22:08:02.000000000 +0200 -+++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.cpp 2016-08-12 18:10:20.000000000 +0200 -@@ -94,7 +94,7 @@ - '\x08', '\x19', '\x2a', '\x3b', '\x4c', '\x5d', '\x6e', '\x7f' - }; - */ --const int8_t XSID::sampleConvertTable[16] = -+const char XSID::sampleConvertTable[16] = - { - '\x80', '\x94', '\xa9', '\xbc', '\xce', '\xe1', '\xf2', '\x03', - '\x1b', '\x2a', '\x3b', '\x49', '\x58', '\x66', '\x73', '\x7f' -diff -uNr sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h ---- sidplay-libs-2.1.1.org/libsidplay/src/xsid/xsid.h 2004-06-14 22:08:02.000000000 +0200 -+++ sidplay-libs-2.1.1/libsidplay/src/xsid/xsid.h 2016-08-12 18:11:01.000000000 +0200 -@@ -238,7 +238,7 @@ - uint8_t sidData0x18; - bool _sidSamples; - int8_t sampleOffset; -- static const int8_t sampleConvertTable[16]; -+ static const char sampleConvertTable[16]; - bool wasRunning; - - private: diff --git a/package.bak/libsidplay2/Config.in b/package.bak/libsidplay2/Config.in deleted file mode 100644 index 5698367058..0000000000 --- a/package.bak/libsidplay2/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBSIDPLAY2 - bool "libsidplay2" - depends on BR2_INSTALL_LIBSTDCPP - help - Sidplay 2 is the second in the Sidplay series originally developed by - Michael Schwendt. This version is written by Simon White and is cycle - accurate for improved sound reproduction. Sidplay 2 is capable of - playing all C64 mono and stereo file formats. - - http://sourceforge.net/projects/sidplay2 - -comment "libsidplay2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libsidplay2/libsidplay2.hash b/package.bak/libsidplay2/libsidplay2.hash deleted file mode 100644 index 1b45cb8781..0000000000 --- a/package.bak/libsidplay2/libsidplay2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/sidplay2/files/sidplay2/sidplay-libs-2.1.1/ -sha1 8af6350866edc30b0d331e075fa97292f6f645a5 sidplay-libs-2.1.1.tar.gz diff --git a/package.bak/libsidplay2/libsidplay2.mk b/package.bak/libsidplay2/libsidplay2.mk deleted file mode 100644 index b294964397..0000000000 --- a/package.bak/libsidplay2/libsidplay2.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libsidplay2 -# -################################################################################ - -LIBSIDPLAY2_VERSION = 2.1.1 -LIBSIDPLAY2_SOURCE = sidplay-libs-$(LIBSIDPLAY2_VERSION).tar.gz -LIBSIDPLAY2_SITE = http://downloads.sourceforge.net/project/sidplay2/sidplay2/sidplay-libs-$(LIBSIDPLAY2_VERSION) -LIBSIDPLAY2_LICENSE = GPLv2+ -LIBSIDPLAY2_LICENSE_FILES = libsidplay/COPYING -LIBSIDPLAY2_AUTORECONF = YES -LIBSIDPLAY2_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libsigc/Config.in b/package.bak/libsigc/Config.in deleted file mode 100644 index f38749b4d9..0000000000 --- a/package.bak/libsigc/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBSIGC - bool "libsigc++" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_INSTALL_LIBSTDCPP - help - libsigc++ implements a typesafe callback system for standard C++. - It allows you to define signals and to connect those signals to - any callback function, either global or a member function, - regardless of whether it is static or virtual. - - http://libsigc.sourceforge.net/ - -comment "libsigc++ needs a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package.bak/libsigc/libsigc.hash b/package.bak/libsigc/libsigc.hash deleted file mode 100644 index a630534e84..0000000000 --- a/package.bak/libsigc/libsigc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsigc++/2.10/libsigc++-2.10.0.sha256sum -sha256 f843d6346260bfcb4426259e314512b99e296e8ca241d771d21ac64f28298d81 libsigc++-2.10.0.tar.xz diff --git a/package.bak/libsigc/libsigc.mk b/package.bak/libsigc/libsigc.mk deleted file mode 100644 index 590cbaa583..0000000000 --- a/package.bak/libsigc/libsigc.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libsigc -# -################################################################################ - -LIBSIGC_VERSION_MAJOR = 2.10 -LIBSIGC_VERSION = $(LIBSIGC_VERSION_MAJOR).0 -LIBSIGC_SOURCE = libsigc++-$(LIBSIGC_VERSION).tar.xz -LIBSIGC_SITE = http://ftp.gnome.org/pub/GNOME/sources/libsigc++/$(LIBSIGC_VERSION_MAJOR) -LIBSIGC_DEPENDENCIES = host-m4 -LIBSIGC_INSTALL_STAGING = YES -LIBSIGC_LICENSE = LGPLv2.1+ -LIBSIGC_LICENSE_FILES = COPYING - -define LIBSIGC_INSTALL_TARGET_FIXUP - rm -rf $(TARGET_DIR)/usr/share/devhelp/books/libsigc++* -endef - -LIBSIGC_POST_INSTALL_TARGET_HOOKS += LIBSIGC_INSTALL_TARGET_FIXUP - -$(eval $(autotools-package)) diff --git a/package.bak/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch b/package.bak/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch deleted file mode 100644 index 2b20680511..0000000000 --- a/package.bak/libsigrok/0001-beaglelogic.h-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 Mon Sep 17 00:00:00 2001 -From: Aurelien Jacobs -Date: Mon, 1 Feb 2016 22:37:36 +0100 -Subject: [PATCH] beaglelogic: use standard # operator instead of ugly __STRING - macro - -Also note that the __ namespace is reserved by POSIX for its private -usage, so user land software should never rely on any kind of API -with a __ prefix. - -Signed-off-by: Aurelien Jacobs -Signed-off-by: Bernd Kuhls ---- -Patch downloaded from upstream git: -http://sigrok.org/gitweb/?p=libsigrok.git;a=commit;h=83bf4762e42a4d4a5c077f48d8f5715c9147d9b8 - - src/hardware/beaglelogic/beaglelogic.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/hardware/beaglelogic/beaglelogic.h b/src/hardware/beaglelogic/beaglelogic.h -index 9015c61..96713ba 100644 ---- a/src/hardware/beaglelogic/beaglelogic.h -+++ b/src/hardware/beaglelogic/beaglelogic.h -@@ -30,8 +30,7 @@ - - /* BeagleLogic device node name */ - #define BEAGLELOGIC_DEV_NODE "/dev/beaglelogic" --#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/"\ -- __STRING(a) -+#define BEAGLELOGIC_SYSFS_ATTR(a) "/sys/devices/virtual/misc/beaglelogic/" #a - - /* Reproduced verbatim from beaglelogic.h in the kernel tree until the kernel - * module hits the mainline. Contains the ABI, so DO NOT TOUCH this section */ --- -2.6.2 - diff --git a/package.bak/libsigrok/Config.in b/package.bak/libsigrok/Config.in deleted file mode 100644 index ff2d249827..0000000000 --- a/package.bak/libsigrok/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -config BR2_PACKAGE_LIBSIGROK - bool "libsigrok" - select BR2_PACKAGE_LIBZIP - select BR2_PACKAGE_LIBGLIB2 - # libglib2 - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - # std=c11 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Libsigrok is a shared library written in C, which provides - the basic hardware access drivers for logic analyzers and - other supported devices, as well as input/output file format - support. - - This library is a part of the sigrok software suite. - - http://sigrok.org/wiki/Libsigrok - -if BR2_PACKAGE_LIBSIGROK - -config BR2_PACKAGE_LIBSIGROKCXX - bool "build C++ bindings" - select BR2_PACKAGE_GLIBMM - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # glibmm - help - Build libsigrok C++ bindings as well. - -comment "C++ bindings need a toolchain w/ C++, gcc >= 4.8" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - -endif - -comment "libsigrok needs a toolchain w/ wchar, threads, gcc >= 4.7" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/libsigrok/libsigrok.hash b/package.bak/libsigrok/libsigrok.hash deleted file mode 100644 index 999cef54ed..0000000000 --- a/package.bak/libsigrok/libsigrok.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 5f291f3fee36e6dab1336f1c78596e50588831bc5ebd7cddc2a95fe8c71d669e libsigrok-0.4.0.tar.gz diff --git a/package.bak/libsigrok/libsigrok.mk b/package.bak/libsigrok/libsigrok.mk deleted file mode 100644 index e4e079d3c8..0000000000 --- a/package.bak/libsigrok/libsigrok.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# libsigrok -# -################################################################################ - -LIBSIGROK_VERSION = 0.4.0 -LIBSIGROK_SITE = http://sigrok.org/download/source/libsigrok -LIBSIGROK_LICENSE = GPLv3+ -LIBSIGROK_LICENSE_FILES = COPYING -LIBSIGROK_INSTALL_STAGING = YES -LIBSIGROK_DEPENDENCIES = libglib2 libzip host-pkgconf -LIBSIGROK_CONF_OPTS = --disable-glibtest --disable-java --disable-python - -ifeq ($(BR2_PACKAGE_LIBSERIALPORT),y) -LIBSIGROK_CONF_OPTS += --enable-libserialport -LIBSIGROK_DEPENDENCIES += libserialport -else -LIBSIGROK_CONF_OPTS += --disable-libserialport -endif - -ifeq ($(BR2_PACKAGE_LIBFTDI),y) -LIBSIGROK_CONF_OPTS += --enable-libftdi -LIBSIGROK_DEPENDENCIES += libftdi -else -LIBSIGROK_CONF_OPTS += --disable-libftdi -endif - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -LIBSIGROK_CONF_OPTS += --enable-libusb -LIBSIGROK_DEPENDENCIES += libusb -else -LIBSIGROK_CONF_OPTS += --disable-libusb -endif - -ifeq ($(BR2_PACKAGE_GLIBMM),y) -LIBSIGROK_DEPENDENCIES += glibmm -endif - -ifeq ($(BR2_PACKAGE_LIBSIGROKCXX),y) -LIBSIGROK_CONF_OPTS += --enable-cxx -LIBSIGROK_AUTORECONF_OPTS += -I $(HOST_DIR)/usr/share/autoconf-archive -LIBSIGROK_DEPENDENCIES += \ - host-autoconf-archive \ - glibmm \ - host-doxygen \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) -else -LIBSIGROK_CONF_OPTS += --disable-cxx -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsigrokdecode/Config.in b/package.bak/libsigrokdecode/Config.in deleted file mode 100644 index 70f86ceb76..0000000000 --- a/package.bak/libsigrokdecode/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_LIBSIGROKDECODE - bool "libsigrokdecode" - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PYTHON3 - depends on !BR2_PACKAGE_PYTHON # python3 - depends on BR2_USE_WCHAR # libglib2/python3 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2/python3 - depends on BR2_USE_MMU # libglib2/python3 - depends on !BR2_STATIC_LIBS # python3 - help - Libsigrokdecode is a shared library written in C, which - provides (streaming) protocol decoding functionality. Say - yes here if you want to add this functionality to your - buildroot-generated sigrok suite. - - This library is a part of the sigrok software suite. - - http://sigrok.org/wiki/Libsigrokdecode - -comment "libsigrokdecode needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_PYTHON - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -comment "libsigrokdecode is not compatible with python" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PYTHON diff --git a/package.bak/libsigrokdecode/libsigrokdecode.hash b/package.bak/libsigrokdecode/libsigrokdecode.hash deleted file mode 100644 index ccb2016837..0000000000 --- a/package.bak/libsigrokdecode/libsigrokdecode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 065f70c10971173d86e03a8cf5534e600c7a622775113997d8061572135d4a95 libsigrokdecode-0.4.1.tar.gz diff --git a/package.bak/libsigrokdecode/libsigrokdecode.mk b/package.bak/libsigrokdecode/libsigrokdecode.mk deleted file mode 100644 index 7006b0c6e8..0000000000 --- a/package.bak/libsigrokdecode/libsigrokdecode.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libsigrokdecode -# -################################################################################ - -LIBSIGROKDECODE_VERSION = 0.4.1 -LIBSIGROKDECODE_SITE = http://sigrok.org/download/source/libsigrokdecode -LIBSIGROKDECODE_LICENSE = GPLv3+ -LIBSIGROKDECODE_LICENSE_FILES = COPYING -LIBSIGROKDECODE_INSTALL_STAGING = YES -LIBSIGROKDECODE_DEPENDENCIES = host-pkgconf libglib2 python3 - -$(eval $(autotools-package)) diff --git a/package.bak/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch b/package.bak/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch deleted file mode 100644 index a3b03a0024..0000000000 --- a/package.bak/libsigsegv/0001-Add-stack-direction-for-the-AArch64-architecture.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 790e8f620f06834f3fd03c310cbecd1416536987 Mon Sep 17 00:00:00 2001 -From: Will Newton -Date: Tue, 28 May 2013 18:31:46 +0100 -Subject: [PATCH 2/5] Add stack direction for the AArch64 architecture - -On this architecture, the stack grows downward. - -Signed-off-by: Will Newton -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 39c1a28..3f70530 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -13,6 +13,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - case "$host_cpu" in - dnl See the #define STACK_GROWS_DOWNWARD in gcc-3.1/gcc/config/*/*.h. - a29k | \ -+ aarch64* | \ - alpha* | \ - arc | \ - arm* | strongarm* | xscale* | \ --- -2.1.0 - diff --git a/package.bak/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch b/package.bak/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch deleted file mode 100644 index d3795d3fe7..0000000000 --- a/package.bak/libsigsegv/0002-Add-stack-direction-for-the-Microblaze-architecture.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f4395ff932758884416753f88f5d98f33ec67479 Mon Sep 17 00:00:00 2001 -From: Spenser Gilliland -Date: Mon, 29 Dec 2014 13:54:54 +0100 -Subject: [PATCH 3/5] Add stack direction for the Microblaze architecture - -Signed-off-by: Spenser Gilliland -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 3f70530..53f4216 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -32,6 +32,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - m68* | \ - m88k | \ - mcore | \ -+ microblaze | \ - mips* | \ - mmix | \ - mn10200 | \ --- -2.1.0 - diff --git a/package.bak/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch b/package.bak/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch deleted file mode 100644 index 5d8232a1b6..0000000000 --- a/package.bak/libsigsegv/0003-Add-stack-direction-for-the-Blackfin-architecture.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 55a707283dbb3b2fdcaaa4e177d050e122cfc2a0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 13:55:16 +0100 -Subject: [PATCH 4/5] Add stack direction for the Blackfin architecture - -The stack grows downward on Blackfin, see -https://sourceware.org/binutils/docs/as/Blackfin-Syntax.html: "The -stack grows by decrementing the stack pointer.". - -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 53f4216..1a97d5a 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -18,6 +18,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - arc | \ - arm* | strongarm* | xscale* | \ - avr | \ -+ bfin | \ - c1 | c2 | c32 | c34 | c38 | \ - clipper | \ - cris | \ --- -2.1.0 - diff --git a/package.bak/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch b/package.bak/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch deleted file mode 100644 index ee4778ea0c..0000000000 --- a/package.bak/libsigsegv/0004-Add-stack-direction-for-the-Nios-II-architecture.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 24bac122bf4ffe437bb4f6ca633ad08f31a23d73 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 29 Dec 2014 13:56:54 +0100 -Subject: [PATCH 5/5] Add stack direction for the Nios II architecture - -According to Altera Application Binary Interface document for the Nios -II architecture -(http://www.altera.com/literature/hb/nios2/n2cpu_nii51016.pdf): - - "The stack grows downward (i.e. towards lower addresses). ". - -Signed-off-by: Thomas Petazzoni ---- - m4/stack-direction.m4 | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/m4/stack-direction.m4 b/m4/stack-direction.m4 -index 1a97d5a..d9c5157 100644 ---- a/m4/stack-direction.m4 -+++ b/m4/stack-direction.m4 -@@ -38,6 +38,7 @@ AC_DEFUN([SV_STACK_DIRECTION], - mmix | \ - mn10200 | \ - mn10300 | \ -+ nios2 | \ - ns32k | \ - pdp11 | \ - pj* | \ --- -2.1.0 - diff --git a/package.bak/libsigsegv/0005-fix-sparc64-stackpointer.patch b/package.bak/libsigsegv/0005-fix-sparc64-stackpointer.patch deleted file mode 100644 index 62de35f6e0..0000000000 --- a/package.bak/libsigsegv/0005-fix-sparc64-stackpointer.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix sparc64 build. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur libsigsegv-2.10.orig/src/fault-linux-sparc.h libsigsegv-2.10/src/fault-linux-sparc.h ---- libsigsegv-2.10.orig/src/fault-linux-sparc.h 2009-08-01 17:06:49.000000000 +0200 -+++ libsigsegv-2.10/src/fault-linux-sparc.h 2015-11-29 11:55:29.000000000 +0100 -@@ -27,4 +27,8 @@ - (see also ) - are quite different types. */ - -+#if __WORDSIZE == 64 -+#define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.mc_gregs[REG_O6] -+#else - #define SIGSEGV_FAULT_STACKPOINTER ((ucontext_t *) ucp)->uc_mcontext.gregs[REG_O6] -+#endif diff --git a/package.bak/libsigsegv/Config.in b/package.bak/libsigsegv/Config.in deleted file mode 100644 index f258dc9e8a..0000000000 --- a/package.bak/libsigsegv/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS - bool - # with glibc/musl, ucontext is available for all supported - # architectures - default y if BR2_TOOLCHAIN_USES_GLIBC - default y if BR2_TOOLCHAIN_USES_MUSL - # with uclibc, ucontext is only available for a subset of the - # supported architectures - default y if BR2_TOOLCHAIN_USES_UCLIBC && \ - (BR2_ARM_CPU_HAS_ARM || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_sparc || BR2_x86_64) - -config BR2_PACKAGE_LIBSIGSEGV - bool "libsigsegv" - depends on BR2_PACKAGE_LIBSIGSEGV_ARCH_SUPPORTS - help - Library for handling page faults in user mode. - - http://www.gnu.org/software/libsigsegv/ diff --git a/package.bak/libsigsegv/libsigsegv.hash b/package.bak/libsigsegv/libsigsegv.hash deleted file mode 100644 index 0151105f84..0000000000 --- a/package.bak/libsigsegv/libsigsegv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a libsigsegv-2.10.tar.gz diff --git a/package.bak/libsigsegv/libsigsegv.mk b/package.bak/libsigsegv/libsigsegv.mk deleted file mode 100644 index a5bb31c9cf..0000000000 --- a/package.bak/libsigsegv/libsigsegv.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libsigsegv -# -################################################################################ - -LIBSIGSEGV_VERSION = 2.10 -LIBSIGSEGV_SITE = $(BR2_GNU_MIRROR)/libsigsegv -LIBSIGSEGV_INSTALL_STAGING = YES -LIBSIGSEGV_CONF_ENV = sv_cv_fault_posix=yes -LIBSIGSEGV_LICENSE = GPLv2+ -LIBSIGSEGV_LICENSE_FILES = COPYING - -LIBSIGSEGV_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libsilk/Config.in b/package.bak/libsilk/Config.in deleted file mode 100644 index 10fe03ad32..0000000000 --- a/package.bak/libsilk/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBSILK - bool "libsilk" - help - SILK is an audio compression format and audio codec. - - http://tools.ietf.org/html/draft-vos-silk-01 diff --git a/package.bak/libsilk/libsilk.mk b/package.bak/libsilk/libsilk.mk deleted file mode 100644 index eefdf8fd07..0000000000 --- a/package.bak/libsilk/libsilk.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libsilk -# -################################################################################ - -LIBSILK_VERSION = 4268a02240c35c6055b0f237c46b09b2dcf79e45 -# we use the FreeSwitch fork because it contains pkgconf support -LIBSILK_SITE = https://freeswitch.org/stash/scm/sd/libsilk.git -LIBSILK_SITE_METHOD = git -LIBSILK_LICENSE = BSD-3c -LIBSILK_LICENSE_FILES = COPYING -LIBSILK_AUTORECONF = YES -LIBSILK_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libsndfile/0001-srconly.patch b/package.bak/libsndfile/0001-srconly.patch deleted file mode 100644 index 417e34072a..0000000000 --- a/package.bak/libsndfile/0001-srconly.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: libsndfile-1.0.18/Makefile.in -=================================================================== ---- libsndfile-1.0.18.orig/Makefile.in -+++ libsndfile-1.0.18/Makefile.in -@@ -260,7 +260,7 @@ - top_srcdir = @top_srcdir@ - DISTCHECK_CONFIGURE_FLAGS = --enable-gcc-werror - @BUILD_OCTAVE_MOD_TRUE@octave_dir = Octave --SUBDIRS = M4 man doc Win32 src $(octave_dir) examples regtest tests programs -+SUBDIRS = src - DIST_SUBDIRS = M4 man doc Win32 src Octave examples regtest tests programs - EXTRA_DIST = libsndfile.spec.in sndfile.pc.in Mingw-make-dist.sh - pkgconfigdir = $(libdir)/pkgconfig diff --git a/package.bak/libsndfile/Config.in b/package.bak/libsndfile/Config.in deleted file mode 100644 index 9afe4966c0..0000000000 --- a/package.bak/libsndfile/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBSNDFILE - bool "libsndfile" - help - Libsndfile is a C library for reading and writing files containing - sampled sound (such as MS Windows WAV and the Apple/SGI AIFF format) - through one standard library interface. - - http://www.mega-nerd.com/libsndfile/ diff --git a/package.bak/libsndfile/libsndfile.hash b/package.bak/libsndfile/libsndfile.hash deleted file mode 100644 index a87b7c3085..0000000000 --- a/package.bak/libsndfile/libsndfile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a391952f27f4a92ceb2b4c06493ac107896ed6c76be9a613a4731f076d30fac0 libsndfile-1.0.27.tar.gz diff --git a/package.bak/libsndfile/libsndfile.mk b/package.bak/libsndfile/libsndfile.mk deleted file mode 100644 index c5cd1de10f..0000000000 --- a/package.bak/libsndfile/libsndfile.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libsndfile -# -################################################################################ - -LIBSNDFILE_VERSION = 1.0.27 -LIBSNDFILE_SITE = http://www.mega-nerd.com/libsndfile/files -LIBSNDFILE_INSTALL_STAGING = YES -LIBSNDFILE_LICENSE = LGPLv2.1+ -LIBSNDFILE_LICENSE_FILES = COPYING - -LIBSNDFILE_CONF_OPTS = \ - --disable-sqlite \ - --disable-alsa \ - --disable-external-libs - -$(eval $(autotools-package)) diff --git a/package.bak/libsoc/Config.in b/package.bak/libsoc/Config.in deleted file mode 100644 index 2aaeb1fe9a..0000000000 --- a/package.bak/libsoc/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBSOC - bool "libsoc" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libsoc is a C library for interfacing with common SoC - peripherals through generic kernel interfaces - - https://github.com/jackmitch/libsoc - -comment "libsoc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libsoc/libsoc.hash b/package.bak/libsoc/libsoc.hash deleted file mode 100644 index 77f2fad79c..0000000000 --- a/package.bak/libsoc/libsoc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 8df626bde365b94a805e1c323104c63a7429ec64c9df815cd1d9b9c4b317e066 libsoc-0.8.2.tar.gz diff --git a/package.bak/libsoc/libsoc.mk b/package.bak/libsoc/libsoc.mk deleted file mode 100644 index 03bef043d9..0000000000 --- a/package.bak/libsoc/libsoc.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# libsoc -# -################################################################################ - -LIBSOC_VERSION = 0.8.2 -LIBSOC_SITE = $(call github,jackmitch,libsoc,$(LIBSOC_VERSION)) -LIBSOC_LICENSE = LGPLv2.1 -LIBSOC_LICENSE_FILES = LICENCE -LIBSOC_AUTORECONF = YES -LIBSOC_INSTALL_STAGING = YES - -# Install Python 2 bindings -ifeq ($(BR2_PACKAGE_PYTHON),y) -LIBSOC_DEPENDENCIES += python -LIBSOC_CONF_OPTS += --enable-python=2 -# Install Python 3 bindings -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -LIBSOC_DEPENDENCIES += python3 -LIBSOC_CONF_OPTS += --enable-python=3 -else -LIBSOC_CONF_OPTS += --disable-python -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsocketcan/Config.in b/package.bak/libsocketcan/Config.in deleted file mode 100644 index 97903db78b..0000000000 --- a/package.bak/libsocketcan/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBSOCKETCAN - bool "libsocketcan" - help - SocketCAN library to control CAN devices from C code. - - http://git.pengutronix.de/?p=tools/libsocketcan.git;a=summary diff --git a/package.bak/libsocketcan/libsocketcan.hash b/package.bak/libsocketcan/libsocketcan.hash deleted file mode 100644 index 2546c66cf2..0000000000 --- a/package.bak/libsocketcan/libsocketcan.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3c83e386c3fa7673141658472ae0b0e2a9f5849bf52fd9f7b22b04fd98ec7b6e libsocketcan-0.0.10.tar.bz2 diff --git a/package.bak/libsocketcan/libsocketcan.mk b/package.bak/libsocketcan/libsocketcan.mk deleted file mode 100644 index 65f3cb55ed..0000000000 --- a/package.bak/libsocketcan/libsocketcan.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libsocketcan -# -################################################################################ - -LIBSOCKETCAN_VERSION = 0.0.10 -LIBSOCKETCAN_SITE = http://www.pengutronix.de/software/libsocketcan/download -LIBSOCKETCAN_SOURCE = libsocketcan-$(LIBSOCKETCAN_VERSION).tar.bz2 -LIBSOCKETCAN_INSTALL_STAGING = YES -LIBSOCKETCAN_LICENSE = LGPLv2.1+ - -$(eval $(autotools-package)) diff --git a/package.bak/libsodium/Config.in b/package.bak/libsodium/Config.in deleted file mode 100644 index 47b9bb350c..0000000000 --- a/package.bak/libsodium/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBSODIUM - bool "libsodium" - help - A modern and easy-to-use crypto library. - - http://libsodium.org/ diff --git a/package.bak/libsodium/libsodium.hash b/package.bak/libsodium/libsodium.hash deleted file mode 100644 index 3b129a0ca7..0000000000 --- a/package.bak/libsodium/libsodium.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a14549db3c49f6ae2170cbbf4664bd48ace50681045e8dbea7c8d9fb96f9c765 libsodium-1.0.11.tar.gz diff --git a/package.bak/libsodium/libsodium.mk b/package.bak/libsodium/libsodium.mk deleted file mode 100644 index 1d21bb3d86..0000000000 --- a/package.bak/libsodium/libsodium.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libsodium -# -################################################################################ - -LIBSODIUM_VERSION = 1.0.11 -LIBSODIUM_SITE = https://download.libsodium.org/libsodium/releases -LIBSODIUM_LICENSE = ISC -LIBSODIUM_LICENSE_FILES = LICENSE -LIBSODIUM_INSTALL_STAGING = YES - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -LIBSODIUM_CONF_OPTS += --disable-pie -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libsoil/0001-fix-makefile.patch b/package.bak/libsoil/0001-fix-makefile.patch deleted file mode 100644 index 310d26448b..0000000000 --- a/package.bak/libsoil/0001-fix-makefile.patch +++ /dev/null @@ -1,40 +0,0 @@ -Various makefile fixes to allow cross compilation - -Partly ported from -http://anonscm.debian.org/cgit/pkg-games/libsoil.git/tree/debian/patches/linking_correctly.patch - -Signed-off-by: Bernd Kuhls - -diff -uNr soil.org/projects/makefile/alternate_Makefile.txt soil/projects/makefile/alternate_Makefile.txt ---- soil.org/projects/makefile/alternate_Makefile.txt 2008-07-07 18:13:28.000000000 +0200 -+++ soil/projects/makefile/alternate_Makefile.txt 2015-11-07 11:15:04.140106336 +0100 -@@ -1,8 +1,8 @@ - MAKE = make --CC = gcc --INSTALL_FILE = install -p -o root -g root -m 644 --INSTALL_DIR = install -p -o root -g root -d --LN = ln -s -+CC = $(GCC) -+INSTALL_FILE = $(INSTALL) -m 644 -+INSTALL_DIR = $(INSTALL) -d -+LN = ln -sf - RM = rm -fv - CFLAGS += -c -O2 -Wall - LDFLAGS += -@@ -23,13 +23,13 @@ - all: $(OFILES) lib - - %.o: %.c -- $(CC) $(CFLAGS) $< -o $@ -+ $(CC) $(CFLAGS) -c -fPIC $< -o $@ - - lib: $(OFILES) - # create static library -- ar -cvq $(LIBNAME).a $(OFILES) -+ $(AR) -cvq $(LIBNAME).a $(OFILES) - # create shared library -- gcc -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -+ $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(MAJOR) -o $(LIBNAME).so.$(VERSION) $(OFILES) -lGL -lm - - install: - $(INSTALL_DIR) $(DESTDIR)/$(INCLUDEDIR) diff --git a/package.bak/libsoil/Config.in b/package.bak/libsoil/Config.in deleted file mode 100644 index aea0cc3548..0000000000 --- a/package.bak/libsoil/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBSOIL - bool "libsoil" - depends on BR2_PACKAGE_HAS_LIBGL - depends on !BR2_STATIC_LIBS - help - SOIL is a tiny C library used primarily for uploading - textures into OpenGL. - - http://www.lonesock.net/soil.html - -comment "libsoil needs an OpenGL backend and a toolchain w/ dynamic library" - depends on !BR2_PACKAGE_HAS_LIBGL || BR2_STATIC_LIBS diff --git a/package.bak/libsoil/libsoil.hash b/package.bak/libsoil/libsoil.hash deleted file mode 100644 index 175569b9f6..0000000000 --- a/package.bak/libsoil/libsoil.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a2305b8d64f6d636e36d669bbdb0ca5445d1345c754b3d61d3f037dad2e5f701 soil.zip diff --git a/package.bak/libsoil/libsoil.mk b/package.bak/libsoil/libsoil.mk deleted file mode 100644 index efa67d9eee..0000000000 --- a/package.bak/libsoil/libsoil.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# libsoil -# -################################################################################ - -LIBSOIL_VERSION = 20080707 -LIBSOIL_SOURCE = soil.zip -LIBSOIL_SITE = http://www.lonesock.net/files -LIBSOIL_INSTALL_STAGING = YES -LIBSOIL_DEPENDENCIES = libgl -LIBSOIL_LICENSE = Public Domain, MIT -LIBSOIL_LICENSE_FILES = src/stb_image_aug.c src/image_helper.c -LIBSOIL_MAKEFILE = ../projects/makefile/alternate_Makefile.txt - -define LIBSOIL_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(LIBSOIL_SOURCE) - mv $(@D)/Simple\ OpenGL\ Image\ Library/* $(@D) -endef - -# gnu patch < v2.5.9 doesn't correctly handle spaces in file names, -# and we want to patch the 'alternate Makefile.txt' file, so rename -# the file (and patch the renamed file) for compatibility with older -# distributions -define REMOVE_SPACE_FROM_FILENAME - cd $(@D)/projects/makefile/ && \ - mv "alternate Makefile.txt" alternate_Makefile.txt -endef -LIBSOIL_POST_EXTRACT_HOOKS += REMOVE_SPACE_FROM_FILENAME - -define LIBSOIL_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ - -C $(@D)/src -endef - -define LIBSOIL_INSTALL_STAGING_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ - DESTDIR=$(STAGING_DIR) install \ - INSTALL=$(INSTALL) \ - -C $(@D)/src -endef - -define LIBSOIL_INSTALL_TARGET_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -f $(LIBSOIL_MAKEFILE) \ - DESTDIR=$(TARGET_DIR) install \ - INSTALL=$(INSTALL) \ - -C $(@D)/src -endef - -$(eval $(generic-package)) diff --git a/package.bak/libsoundtouch/Config.in b/package.bak/libsoundtouch/Config.in deleted file mode 100644 index fdbc0757be..0000000000 --- a/package.bak/libsoundtouch/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBSOUNDTOUCH - bool "libsoundtouch" - depends on BR2_INSTALL_LIBSTDCPP - help - SoundTouch is an open-source audio processing library for - changing the Tempo, Pitch and Playback Rates of audio streams - or audio files. - - http://www.surina.net/soundtouch - -comment "libsoundtouch needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libsoundtouch/libsoundtouch.mk b/package.bak/libsoundtouch/libsoundtouch.mk deleted file mode 100644 index cdfec20d2b..0000000000 --- a/package.bak/libsoundtouch/libsoundtouch.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libsoundtouch -# -################################################################################ - -LIBSOUNDTOUCH_VERSION = 010a91a59071c7fefd316fca62c0d980ec85b4b1 -LIBSOUNDTOUCH_SITE = https://freeswitch.org/stash/scm/sd/libsoundtouch.git -LIBSOUNDTOUCH_SITE_METHOD = git -LIBSOUNDTOUCH_LICENSE = LGPLv2.1+ -LIBSOUNDTOUCH_LICENSE_FILES = COPYING.TXT -LIBSOUNDTOUCH_AUTORECONF = YES -LIBSOUNDTOUCH_INSTALL_STAGING = YES - -define LIBSOUNDTOUCH_CREATE_CONFIG_M4 - mkdir -p $(@D)/config/m4 -endef -LIBSOUNDTOUCH_POST_PATCH_HOOKS += LIBSOUNDTOUCH_CREATE_CONFIG_M4 - -$(eval $(autotools-package)) diff --git a/package.bak/libsoup/Config.in b/package.bak/libsoup/Config.in deleted file mode 100644 index bc0ba950aa..0000000000 --- a/package.bak/libsoup/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_LIBSOUP - bool "libsoup" - depends on BR2_USE_WCHAR # glib2 and gnutls - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_SQLITE - help - libsoup is an HTTP client/server library. It uses GObject - and the GLib main loop, to integrate well with GNOME - applications. - - http://live.gnome.org/LibSoup - -if BR2_PACKAGE_LIBSOUP - -config BR2_PACKAGE_LIBSOUP_GNOME - bool "libsoup-gnome" - help - Build libsoup-gnome library. - -config BR2_PACKAGE_LIBSOUP_SSL - bool "https support" - select BR2_PACKAGE_GLIB_NETWORKING - select BR2_PACKAGE_GNUTLS - help - Enable HTTPS (SSL) support. - -endif - -comment "libsoup needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libsoup/libsoup.hash b/package.bak/libsoup/libsoup.hash deleted file mode 100644 index b42cf2f711..0000000000 --- a/package.bak/libsoup/libsoup.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/libsoup/2.56/libsoup-2.56.0.sha256sum -sha256 d8216b71de8247bc6f274ec054c08547b2e04369c1f8add713e9350c8ef81fe5 libsoup-2.56.0.tar.xz diff --git a/package.bak/libsoup/libsoup.mk b/package.bak/libsoup/libsoup.mk deleted file mode 100644 index f6e92f8a3b..0000000000 --- a/package.bak/libsoup/libsoup.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# libsoup -# -################################################################################ - -LIBSOUP_VERSION_MAJOR = 2.56 -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+ -LIBSOUP_LICENSE_FILES = COPYING -LIBSOUP_INSTALL_STAGING = YES -LIBSOUP_CONF_ENV = ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) -LIBSOUP_CONF_OPTS = --disable-glibtest --enable-vala=no --with-gssapi=no -LIBSOUP_DEPENDENCIES = host-pkgconf host-libglib2 \ - libglib2 libxml2 sqlite host-intltool - -ifeq ($(BR2_PACKAGE_LIBSOUP_GNOME),y) -LIBSOUP_CONF_OPTS += --with-gnome -else -LIBSOUP_CONF_OPTS += --without-gnome -endif - -ifeq ($(BR2_PACKAGE_LIBSOUP_SSL),y) -LIBSOUP_DEPENDENCIES += glib-networking -else -LIBSOUP_CONF_OPTS += --disable-tls-check -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsoxr/Config.in b/package.bak/libsoxr/Config.in deleted file mode 100644 index a218ae99c8..0000000000 --- a/package.bak/libsoxr/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBSOXR - bool "libsoxr" - help - The SoX Resampler library `libsoxr' performs one-dimensional - sample-rate conversion—it may be used, for example, to - resample PCM-encoded audio. - - It aims to give fast and high quality results for any constant - (rational or irrational) resampling ratio. Phase-response, - preserved bandwidth, aliasing, and rejection level parameters - are all configurable; alternatively, simple `preset' - configurations may be selected. An experimental, variable-rate - resampling mode of operation is also included. - - http://sourceforge.net/projects/soxr/ diff --git a/package.bak/libsoxr/libsoxr.hash b/package.bak/libsoxr/libsoxr.hash deleted file mode 100644 index 066b546e62..0000000000 --- a/package.bak/libsoxr/libsoxr.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/soxr/files/ -sha1 3b990f91dc8dc08e70626cd5fb90deda0239c211 soxr-0.1.2-Source.tar.xz -md5 0866fc4320e26f47152798ac000de1c0 soxr-0.1.2-Source.tar.xz -# Locally calculated -sha256 54e6f434f1c491388cd92f0e3c47f1ade082cc24327bdc43762f7d1eefe0c275 soxr-0.1.2-Source.tar.xz diff --git a/package.bak/libsoxr/libsoxr.mk b/package.bak/libsoxr/libsoxr.mk deleted file mode 100644 index 0fdc57078f..0000000000 --- a/package.bak/libsoxr/libsoxr.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libsoxr -# -################################################################################ - -LIBSOXR_VERSION = 0.1.2 -LIBSOXR_SOURCE = soxr-$(LIBSOXR_VERSION)-Source.tar.xz -LIBSOXR_SITE = http://downloads.sourceforge.net/project/soxr -LIBSOXR_LICENSE = LGPLv2.1+ -LIBSOXR_LICENSE_FILES = LICENCE COPYING.LGPL -LIBSOXR_INSTALL_STAGING = YES -LIBSOXR_CONF_OPTS = -DWITH_OPENMP=OFF - -ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) -LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=1 -else -LIBSOXR_CONF_OPTS += -DHAVE_WORDS_BIGENDIAN=0 -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libsquish/0001-kodi.patch b/package.bak/libsquish/0001-kodi.patch deleted file mode 100644 index a9bca66904..0000000000 --- a/package.bak/libsquish/0001-kodi.patch +++ /dev/null @@ -1,327 +0,0 @@ -Add Kodi-specific patch - -Kodi 15.0 contains an updated version of libsquish: -https://github.com/xbmc/xbmc/tree/master/tools/depends/native/libsquish-native - -The OpenElec project provides a separate tarball including the Kodi- -specific patches: -http://sources.openelec.tv/devel/libsquish-1.10-openelec.tar.gz - -This patch contains the relevant diff between upstream libsquish 1.13 -and the OpenElec tarball. - -Signed-off-by: Bernd Kuhls - -diff -uwNr 1.13/squish.cpp libsquish-1.10-openelec/squish.cpp ---- 1.13/squish.cpp 2015-04-30 12:48:49.000000000 +0200 -+++ libsquish-1.10-openelec/squish.cpp 2015-01-09 10:58:43.000000000 +0100 -@@ -23,6 +23,7 @@ - - -------------------------------------------------------------------------- */ - -+#include - #include - #include "colourset.h" - #include "maths.h" -@@ -39,7 +40,7 @@ - // grab the flag bits - int method = flags & ( kDxt1 | kDxt3 | kDxt5 ); - int fit = flags & ( kColourIterativeClusterFit | kColourClusterFit | kColourRangeFit ); -- int extra = flags & kWeightColourByAlpha; -+ int extra = flags & ( kWeightColourByAlpha | kSourceBGRA ); - - // set defaults - if( method != kDxt3 && method != kDxt5 ) -@@ -124,8 +125,30 @@ - return blockcount*blocksize; - } - -+void CopyRGBA( u8 const* source, u8* dest, int flags ) -+{ -+ if (flags & kSourceBGRA) -+ { -+ // convert from bgra to rgba -+ dest[0] = source[2]; -+ dest[1] = source[1]; -+ dest[2] = source[0]; -+ dest[3] = source[3]; -+ } -+ else -+ { -+ for( int i = 0; i < 4; ++i ) -+ *dest++ = *source++; -+ } -+} -+ - void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric ) - { -+ CompressImage(rgba, width, height, width*4, blocks, flags, metric); -+} -+ -+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric ) -+{ - // fix any bad flags - flags = FixFlags( flags ); - -@@ -154,20 +177,14 @@ - if( sx < width && sy < height ) - { - // copy the rgba value -- u8 const* sourcePixel = rgba + 4*( width*sy + sx ); -- for( int i = 0; i < 4; ++i ) -- *targetPixel++ = *sourcePixel++; -- -+ u8 const* sourcePixel = rgba + pitch*sy + 4*sx; -+ CopyRGBA(sourcePixel, targetPixel, flags); - // enable this pixel - mask |= ( 1 << ( 4*py + px ) ); - } -- else -- { -- // skip this pixel as its outside the image - targetPixel += 4; - } - } -- } - - // compress it into the output - CompressMasked( sourceRgba, mask, targetBlock, flags, metric ); -@@ -180,6 +197,11 @@ - - void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ) - { -+ DecompressImage( rgba, width, height, width*4, blocks, flags ); -+} -+ -+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ) -+{ - // fix any bad flags - flags = FixFlags( flags ); - -@@ -207,24 +229,132 @@ - int sy = y + py; - if( sx < width && sy < height ) - { -- u8* targetPixel = rgba + 4*( width*sy + sx ); -+ u8* targetPixel = rgba + pitch*sy + 4*sx; - - // copy the rgba value -+ CopyRGBA(sourcePixel, targetPixel, flags); -+ } -+ sourcePixel += 4; -+ } -+ } -+ -+ // advance -+ sourceBlock += bytesPerBlock; -+ } -+ } -+} -+ -+static double ErrorSq(double x, double y) -+{ -+ return (x - y) * (x - y); -+} -+ -+static void ComputeBlockWMSE(u8 const *original, u8 const *compressed, unsigned int w, unsigned int h, double &cmse, double &amse) -+{ -+ // Computes the MSE for the block and weights it by the variance of the original block. -+ // If the variance of the original block is less than 4 (i.e. a standard deviation of 1 per channel) -+ // then the block is close to being a single colour. Quantisation errors in single colour blocks -+ // are easier to see than similar errors in blocks that contain more colours, particularly when there -+ // are many such blocks in a large area (eg a blue sky background) as they cause banding. Given that -+ // banding is easier to see than small errors in "complex" blocks, we weight the errors by a factor -+ // of 5. This implies that images with large, single colour areas will have a higher potential WMSE -+ // than images with lots of detail. -+ -+ cmse = amse = 0; -+ unsigned int sum_p[4]; // per channel sum of pixels -+ unsigned int sum_p2[4]; // per channel sum of pixels squared -+ memset(sum_p, 0, sizeof(sum_p)); -+ memset(sum_p2, 0, sizeof(sum_p2)); -+ for( unsigned int py = 0; py < 4; ++py ) -+ { -+ for( unsigned int px = 0; px < 4; ++px ) -+ { -+ if( px < w && py < h ) -+ { -+ double pixelCMSE = 0; -+ for( int i = 0; i < 3; ++i ) -+ { -+ pixelCMSE += ErrorSq(original[i], compressed[i]); -+ sum_p[i] += original[i]; -+ sum_p2[i] += (unsigned int)original[i]*original[i]; -+ } -+ if( original[3] == 0 && compressed[3] == 0 ) -+ pixelCMSE = 0; // transparent in both, so colour is inconsequential -+ amse += ErrorSq(original[3], compressed[3]); -+ cmse += pixelCMSE; -+ sum_p[3] += original[3]; -+ sum_p2[3] += (unsigned int)original[3]*original[3]; -+ } -+ original += 4; -+ compressed += 4; -+ } -+ } -+ unsigned int variance = 0; - for( int i = 0; i < 4; ++i ) -- *targetPixel++ = *sourcePixel++; -+ variance += w*h*sum_p2[i] - sum_p[i]*sum_p[i]; -+ if( variance < 4 * w * w * h * h ) -+ { -+ amse *= 5; -+ cmse *= 5; - } -- else -+} -+ -+void ComputeMSE( u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE ) - { -- // skip this pixel as its outside the image -- sourcePixel += 4; -+ ComputeMSE(rgba, width, height, width*4, dxt, flags, colourMSE, alphaMSE); -+} -+ -+void ComputeMSE( u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE ) -+{ -+ // fix any bad flags -+ flags = FixFlags( flags ); -+ colourMSE = alphaMSE = 0; -+ -+ // initialise the block input -+ squish::u8 const* sourceBlock = dxt; -+ int bytesPerBlock = ( ( flags & squish::kDxt1 ) != 0 ) ? 8 : 16; -+ -+ // loop over blocks -+ for( int y = 0; y < height; y += 4 ) -+ { -+ for( int x = 0; x < width; x += 4 ) -+ { -+ // decompress the block -+ u8 targetRgba[4*16]; -+ Decompress( targetRgba, sourceBlock, flags ); -+ u8 const* sourcePixel = targetRgba; -+ -+ // copy across to a similar pixel block -+ u8 originalRgba[4*16]; -+ u8* originalPixel = originalRgba; -+ -+ for( int py = 0; py < 4; ++py ) -+ { -+ for( int px = 0; px < 4; ++px ) -+ { -+ int sx = x + px; -+ int sy = y + py; -+ if( sx < width && sy < height ) -+ { -+ u8 const* targetPixel = rgba + pitch*sy + 4*sx; -+ CopyRGBA(targetPixel, originalPixel, flags); - } -+ sourcePixel += 4; -+ originalPixel += 4; - } - } - -+ // compute the weighted MSE of the block -+ double blockCMSE, blockAMSE; -+ ComputeBlockWMSE(originalRgba, targetRgba, std::min(4, width - x), std::min(4, height - y), blockCMSE, blockAMSE); -+ colourMSE += blockCMSE; -+ alphaMSE += blockAMSE; - // advance - sourceBlock += bytesPerBlock; - } - } -+ colourMSE /= (width * height * 3); -+ alphaMSE /= (width * height); - } - - } // namespace squish -diff -uwNr 1.13/squish.h libsquish-1.10-openelec/squish.h ---- 1.13/squish.h 2015-04-30 12:55:27.000000000 +0200 -+++ libsquish-1.10-openelec/squish.h 2015-01-09 10:58:43.000000000 +0100 -@@ -57,7 +57,10 @@ - kColourRangeFit = ( 1 << 4 ), - - //! Weight the colour by alpha during cluster fit (disabled by default). -- kWeightColourByAlpha = ( 1 << 7 ) -+ kWeightColourByAlpha = ( 1 << 7 ), -+ -+ //! Source is BGRA rather than RGBA -+ kSourceBGRA = ( 1 << 9 ), - }; - - // ----------------------------------------------------------------------------- -@@ -194,6 +197,7 @@ - @param rgba The pixels of the source. - @param width The width of the source image. - @param height The height of the source image. -+ @param pitch The pitch of the source image. - @param blocks Storage for the compressed output. - @param flags Compression flags. - @param metric An optional perceptual metric. -@@ -231,6 +235,7 @@ - to allocate for the compressed output. - */ - void CompressImage( u8 const* rgba, int width, int height, void* blocks, int flags, float* metric = 0 ); -+void CompressImage( u8 const* rgba, int width, int height, int pitch, void* blocks, int flags, float* metric = 0 ); - - // ----------------------------------------------------------------------------- - -@@ -239,6 +244,7 @@ - @param rgba Storage for the decompressed pixels. - @param width The width of the source image. - @param height The height of the source image. -+ @param pitch The pitch of the decompressed pixels. - @param blocks The compressed DXT blocks. - @param flags Compression flags. - -@@ -254,6 +260,32 @@ - Internally this function calls squish::Decompress for each block. - */ - void DecompressImage( u8* rgba, int width, int height, void const* blocks, int flags ); -+void DecompressImage( u8* rgba, int width, int height, int pitch, void const* blocks, int flags ); -+ -+// ----------------------------------------------------------------------------- -+ -+/*! @brief Computes MSE of an compressed image in memory. -+ -+ @param rgba The original image pixels. -+ @param width The width of the source image. -+ @param height The height of the source image. -+ @param pitch The pitch of the source image. -+ @param dxt The compressed dxt blocks -+ @param flags Compression flags. -+ @param colourMSE The MSE of the colour values. -+ @param alphaMSE The MSE of the alpha values. -+ -+ The colour MSE and alpha MSE are computed across all pixels. The colour MSE is -+ averaged across all rgb values (i.e. colourMSE = sum sum_k ||dxt.k - rgba.k||/3) -+ -+ The flags parameter should specify either kDxt1, kDxt3 or kDxt5 compression, -+ however, DXT1 will be used by default if none is specified. All other flags -+ are ignored. -+ -+ Internally this function calls squish::Decompress for each block. -+*/ -+void ComputeMSE(u8 const *rgba, int width, int height, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); -+void ComputeMSE(u8 const *rgba, int width, int height, int pitch, u8 const *dxt, int flags, double &colourMSE, double &alphaMSE); - - // ----------------------------------------------------------------------------- - -diff -uwNr 1.13/squish.pc.in libsquish-1.10-openelec/squish.pc.in ---- 1.13/squish.pc 1970-01-01 01:00:00.000000000 +0100 -+++ libsquish-1.10-openelec/squish.pc 2015-01-09 10:58:43.000000000 +0100 -@@ -0,0 +1,13 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${prefix}/lib -+sharedlibdir=${libdir} -+includedir=${prefix}/include -+ -+Name: squish -+Description: squish DXT lib -+Version: 1.1.3-kodi -+ -+Requires: -+Libs: -L${libdir} -L${sharedlibdir} -lsquish -+Cflags: -I${includedir} diff --git a/package.bak/libsquish/Config.in b/package.bak/libsquish/Config.in deleted file mode 100644 index eabe6c54a8..0000000000 --- a/package.bak/libsquish/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBSQUISH - bool "libsquish" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - The libSquish library compresses images with the DXT standard - (also known as S3TC). This standard is mainly used by OpenGL - and DirectX for the lossy compression of RGBA textures. - - http://sourceforge.net/projects/libsquish - -comment "libsquish needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package.bak/libsquish/libsquish.hash b/package.bak/libsquish/libsquish.hash deleted file mode 100644 index caa7198642..0000000000 --- a/package.bak/libsquish/libsquish.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/libsquish/files -sha1 7bcdd7d0f0460a29e25dcdab8dc41a30e58bb366 libsquish-1.13.tgz diff --git a/package.bak/libsquish/libsquish.mk b/package.bak/libsquish/libsquish.mk deleted file mode 100644 index 73f8de9cc1..0000000000 --- a/package.bak/libsquish/libsquish.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# libsquish -# -################################################################################ - -LIBSQUISH_VERSION = 1.13 -LIBSQUISH_SOURCE = libsquish-$(LIBSQUISH_VERSION).tgz -LIBSQUISH_SITE = http://downloads.sourceforge.net/project/libsquish -LIBSQUISH_INSTALL_STAGING = YES -LIBSQUISH_STRIP_COMPONENTS = 0 -LIBSQUISH_LICENSE = MIT -LIBSQUISH_LICENSE_FILES = README - -define LIBSQUISH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define LIBSQUISH_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/include - mkdir -p $(STAGING_DIR)/usr/lib - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - install PREFIX=/usr INSTALL_DIR=$(STAGING_DIR)/usr - $(INSTALL) -D -m 644 $(@D)/squish.pc $(STAGING_DIR)/usr/lib/pkgconfig/squish.pc - ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so - ln -sf libsquish.so.0.0 $(STAGING_DIR)/usr/lib/libsquish.so.0 -endef - -define LIBSQUISH_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/include - mkdir -p $(TARGET_DIR)/usr/lib - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - install PREFIX=/usr INSTALL_DIR=$(TARGET_DIR)/usr - ln -sf libsquish.so.0.0 $(TARGET_DIR)/usr/lib/libsquish.so.0 -endef - -$(eval $(generic-package)) diff --git a/package.bak/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch b/package.bak/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch deleted file mode 100644 index 60a123eccd..0000000000 --- a/package.bak/libsrtp/0001-Rename-SHA1-functions-to-avoid-conflicts-with-downst.patch +++ /dev/null @@ -1,396 +0,0 @@ -From f76eb65d008d0c8e06698e4a63a776e91b80155b Mon Sep 17 00:00:00 2001 -From: jfigus -Date: Tue, 4 Nov 2014 14:54:02 -0500 -Subject: [PATCH] Rename SHA1 functions to avoid conflicts with downstream - packages. - -Backported from upstream commit c270245a94ae9a007202754eb8f7ce9e48f97007 -and tweaked to apply on top of v1.5.4. - -Signed-off-by: Vicente Olivert Riera ---- - crypto/hash/hmac.c | 20 ++++++++++---------- - crypto/hash/hmac_ossl.c | 18 +++++++++--------- - crypto/hash/sha1.c | 32 ++++++++++++++++---------------- - crypto/include/hmac.h | 4 ++-- - crypto/include/sha1.h | 34 +++++++++++++++++----------------- - crypto/test/sha1_driver.c | 8 ++++---- - 6 files changed, 58 insertions(+), 58 deletions(-) - -diff --git a/crypto/hash/hmac.c b/crypto/hash/hmac.c -index ddb75ea..4bed61e 100644 ---- a/crypto/hash/hmac.c -+++ b/crypto/hash/hmac.c -@@ -141,11 +141,11 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) { - debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, 64)); - - /* initialize sha1 context */ -- sha1_init(&state->init_ctx); -+ srtp_sha1_init(&state->init_ctx); - - /* hash ipad ^ key */ -- sha1_update(&state->init_ctx, ipad, 64); -- memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); -+ srtp_sha1_update(&state->init_ctx, ipad, 64); -+ memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t)); - - return err_status_ok; - } -@@ -153,7 +153,7 @@ hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len) { - err_status_t - hmac_start(hmac_ctx_t *state) { - -- memcpy(&state->ctx, &state->init_ctx, sizeof(sha1_ctx_t)); -+ memcpy(&state->ctx, &state->init_ctx, sizeof(srtp_sha1_ctx_t)); - - return err_status_ok; - } -@@ -165,7 +165,7 @@ hmac_update(hmac_ctx_t *state, const uint8_t *message, int msg_octets) { - octet_string_hex_string(message, msg_octets)); - - /* hash message into sha1 context */ -- sha1_update(&state->ctx, message, msg_octets); -+ srtp_sha1_update(&state->ctx, message, msg_octets); - - return err_status_ok; - } -@@ -183,7 +183,7 @@ hmac_compute(hmac_ctx_t *state, const void *message, - - /* hash message, copy output into H */ - hmac_update(state, (const uint8_t*)message, msg_octets); -- sha1_final(&state->ctx, H); -+ srtp_sha1_final(&state->ctx, H); - - /* - * note that we don't need to debug_print() the input, since the -@@ -193,16 +193,16 @@ hmac_compute(hmac_ctx_t *state, const void *message, - octet_string_hex_string((uint8_t *)H, 20)); - - /* re-initialize hash context */ -- sha1_init(&state->ctx); -+ srtp_sha1_init(&state->ctx); - - /* hash opad ^ key */ -- sha1_update(&state->ctx, (uint8_t *)state->opad, 64); -+ srtp_sha1_update(&state->ctx, (uint8_t *)state->opad, 64); - - /* hash the result of the inner hash */ -- sha1_update(&state->ctx, (uint8_t *)H, 20); -+ srtp_sha1_update(&state->ctx, (uint8_t *)H, 20); - - /* the result is returned in the array hash_value[] */ -- sha1_final(&state->ctx, hash_value); -+ srtp_sha1_final(&state->ctx, hash_value); - - /* copy hash_value to *result */ - for (i=0; i < tag_len; i++) -diff --git a/crypto/hash/hmac_ossl.c b/crypto/hash/hmac_ossl.c -index f62ce57..2ec8350 100644 ---- a/crypto/hash/hmac_ossl.c -+++ b/crypto/hash/hmac_ossl.c -@@ -163,11 +163,11 @@ hmac_init (hmac_ctx_t *state, const uint8_t *key, int key_len) - debug_print(mod_hmac, "ipad: %s", octet_string_hex_string(ipad, sizeof(ipad))); - - /* initialize sha1 context */ -- sha1_init(&state->init_ctx); -+ srtp_sha1_init(&state->init_ctx); - state->init_ctx_initialized = 1; - - /* hash ipad ^ key */ -- sha1_update(&state->init_ctx, ipad, sizeof(ipad)); -+ srtp_sha1_update(&state->init_ctx, ipad, sizeof(ipad)); - return (hmac_start(state)); - } - -@@ -192,7 +192,7 @@ hmac_update (hmac_ctx_t *state, const uint8_t *message, int msg_octets) - octet_string_hex_string(message, msg_octets)); - - /* hash message into sha1 context */ -- sha1_update(&state->ctx, message, msg_octets); -+ srtp_sha1_update(&state->ctx, message, msg_octets); - - return err_status_ok; - } -@@ -211,8 +211,8 @@ hmac_compute (hmac_ctx_t *state, const void *message, - } - - /* hash message, copy output into H */ -- sha1_update(&state->ctx, message, msg_octets); -- sha1_final(&state->ctx, H); -+ srtp_sha1_update(&state->ctx, message, msg_octets); -+ srtp_sha1_final(&state->ctx, H); - - /* - * note that we don't need to debug_print() the input, since the -@@ -222,16 +222,16 @@ hmac_compute (hmac_ctx_t *state, const void *message, - octet_string_hex_string((uint8_t*)H, sizeof(H))); - - /* re-initialize hash context */ -- sha1_init(&state->ctx); -+ srtp_sha1_init(&state->ctx); - - /* hash opad ^ key */ -- sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad)); -+ srtp_sha1_update(&state->ctx, (uint8_t*)state->opad, sizeof(state->opad)); - - /* hash the result of the inner hash */ -- sha1_update(&state->ctx, (uint8_t*)H, sizeof(H)); -+ srtp_sha1_update(&state->ctx, (uint8_t*)H, sizeof(H)); - - /* the result is returned in the array hash_value[] */ -- sha1_final(&state->ctx, hash_value); -+ srtp_sha1_final(&state->ctx, hash_value); - - /* copy hash_value to *result */ - for (i = 0; i < tag_len; i++) { -diff --git a/crypto/hash/sha1.c b/crypto/hash/sha1.c -index c200437..29c2e62 100644 ---- a/crypto/hash/sha1.c -+++ b/crypto/hash/sha1.c -@@ -77,17 +77,17 @@ uint32_t SHA_K2 = 0x8F1BBCDC; /* Kt for 40 <= t <= 59 */ - uint32_t SHA_K3 = 0xCA62C1D6; /* Kt for 60 <= t <= 79 */ - - void --sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { -- sha1_ctx_t ctx; -+srtp_sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { -+ srtp_sha1_ctx_t ctx; - -- sha1_init(&ctx); -- sha1_update(&ctx, msg, octets_in_msg); -- sha1_final(&ctx, hash_value); -+ srtp_sha1_init(&ctx); -+ srtp_sha1_update(&ctx, msg, octets_in_msg); -+ srtp_sha1_final(&ctx, hash_value); - - } - - /* -- * sha1_core(M, H) computes the core compression function, where M is -+ * srtp_sha1_core(M, H) computes the core compression function, where M is - * the next part of the message (in network byte order) and H is the - * intermediate state { H0, H1, ...} (in host byte order) - * -@@ -99,7 +99,7 @@ sha1(const uint8_t *msg, int octets_in_msg, uint32_t hash_value[5]) { - */ - - void --sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { -+srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { - uint32_t H0; - uint32_t H1; - uint32_t H2; -@@ -186,7 +186,7 @@ sha1_core(const uint32_t M[16], uint32_t hash_value[5]) { - } - - void --sha1_init(sha1_ctx_t *ctx) { -+srtp_sha1_init(srtp_sha1_ctx_t *ctx) { - - /* initialize state vector */ - ctx->H[0] = 0x67452301; -@@ -204,7 +204,7 @@ sha1_init(sha1_ctx_t *ctx) { - } - - void --sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { -+srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { - int i; - uint8_t *buf = (uint8_t *)ctx->M; - -@@ -227,13 +227,13 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { - - /* process a whole block */ - -- debug_print(mod_sha1, "(update) running sha1_core()", NULL); -+ debug_print(mod_sha1, "(update) running srtp_sha1_core()", NULL); - -- sha1_core(ctx->M, ctx->H); -+ srtp_sha1_core(ctx->M, ctx->H); - - } else { - -- debug_print(mod_sha1, "(update) not running sha1_core()", NULL); -+ debug_print(mod_sha1, "(update) not running srtp_sha1_core()", NULL); - - for (i=ctx->octets_in_buffer; - i < (ctx->octets_in_buffer + octets_in_msg); i++) -@@ -247,12 +247,12 @@ sha1_update(sha1_ctx_t *ctx, const uint8_t *msg, int octets_in_msg) { - } - - /* -- * sha1_final(ctx, output) computes the result for ctx and copies it -+ * srtp_sha1_final(ctx, output) computes the result for ctx and copies it - * into the twenty octets located at *output - */ - - void --sha1_final(sha1_ctx_t *ctx, uint32_t *output) { -+srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t *output) { - uint32_t A, B, C, D, E, TEMP; - uint32_t W[80]; - int i, t; -@@ -339,11 +339,11 @@ sha1_final(sha1_ctx_t *ctx, uint32_t *output) { - - } - -- debug_print(mod_sha1, "(final) running sha1_core()", NULL); -+ debug_print(mod_sha1, "(final) running srtp_sha1_core()", NULL); - - if (ctx->octets_in_buffer >= 56) { - -- debug_print(mod_sha1, "(final) running sha1_core() again", NULL); -+ debug_print(mod_sha1, "(final) running srtp_sha1_core() again", NULL); - - /* we need to do one final run of the compression algo */ - -diff --git a/crypto/include/hmac.h b/crypto/include/hmac.h -index 875f45c..9fc664e 100644 ---- a/crypto/include/hmac.h -+++ b/crypto/include/hmac.h -@@ -51,8 +51,8 @@ - - typedef struct { - uint8_t opad[64]; -- sha1_ctx_t ctx; -- sha1_ctx_t init_ctx; -+ srtp_sha1_ctx_t ctx; -+ srtp_sha1_ctx_t init_ctx; - #ifdef OPENSSL - int ctx_initialized; - int init_ctx_initialized; -diff --git a/crypto/include/sha1.h b/crypto/include/sha1.h -index f1744ce..e177af6 100644 ---- a/crypto/include/sha1.h -+++ b/crypto/include/sha1.h -@@ -56,15 +56,15 @@ - #include - #include - --typedef EVP_MD_CTX sha1_ctx_t; -+typedef EVP_MD_CTX srtp_sha1_ctx_t; - - /* -- * sha1_init(&ctx) initializes the SHA1 context ctx -+ * srtp_sha1_init(&ctx) initializes the SHA1 context ctx - * -- * sha1_update(&ctx, msg, len) hashes the len octets starting at msg -+ * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg - * into the SHA1 context - * -- * sha1_final(&ctx, output) performs the final processing of the SHA1 -+ * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1 - * context and writes the result to the 20 octets at output - * - * Return values are ignored on the EVP functions since all three -@@ -72,18 +72,18 @@ typedef EVP_MD_CTX sha1_ctx_t; - * - */ - --static inline void sha1_init (sha1_ctx_t *ctx) -+static inline void srtp_sha1_init (srtp_sha1_ctx_t *ctx) - { - EVP_MD_CTX_init(ctx); - EVP_DigestInit(ctx, EVP_sha1()); - } - --static inline void sha1_update (sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) -+static inline void srtp_sha1_update (srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg) - { - EVP_DigestUpdate(ctx, M, octets_in_msg); - } - --static inline void sha1_final (sha1_ctx_t *ctx, uint32_t *output) -+static inline void srtp_sha1_final (srtp_sha1_ctx_t *ctx, uint32_t *output) - { - unsigned int len = 0; - -@@ -97,7 +97,7 @@ typedef struct { - uint32_t M[16]; /* message buffer */ - int octets_in_buffer; /* octets of message in buffer */ - uint32_t num_bits_in_msg; /* total number of bits in message */ --} sha1_ctx_t; -+} srtp_sha1_ctx_t; - - /* - * sha1(&ctx, msg, len, output) hashes the len octets starting at msg -@@ -110,33 +110,33 @@ void - sha1(const uint8_t *message, int octets_in_msg, uint32_t output[5]); - - /* -- * sha1_init(&ctx) initializes the SHA1 context ctx -+ * srtp_sha1_init(&ctx) initializes the SHA1 context ctx - * -- * sha1_update(&ctx, msg, len) hashes the len octets starting at msg -+ * srtp_sha1_update(&ctx, msg, len) hashes the len octets starting at msg - * into the SHA1 context - * -- * sha1_final(&ctx, output) performs the final processing of the SHA1 -+ * srtp_sha1_final(&ctx, output) performs the final processing of the SHA1 - * context and writes the result to the 20 octets at output - * - */ - - void --sha1_init(sha1_ctx_t *ctx); -+srtp_sha1_init(srtp_sha1_ctx_t *ctx); - - void --sha1_update(sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); -+srtp_sha1_update(srtp_sha1_ctx_t *ctx, const uint8_t *M, int octets_in_msg); - - void --sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); -+srtp_sha1_final(srtp_sha1_ctx_t *ctx, uint32_t output[5]); - - /* -- * The sha1_core function is INTERNAL to SHA-1, but it is declared -+ * The srtp_sha1_core function is INTERNAL to SHA-1, but it is declared - * here because it is also used by the cipher SEAL 3.0 in its key - * setup algorithm. - */ - - /* -- * sha1_core(M, H) computes the core sha1 compression function, where M is -+ * srtp_sha1_core(M, H) computes the core sha1 compression function, where M is - * the next part of the message and H is the intermediate state {H0, - * H1, ...} - * -@@ -145,7 +145,7 @@ sha1_final(sha1_ctx_t *ctx, uint32_t output[5]); - */ - - void --sha1_core(const uint32_t M[16], uint32_t hash_value[5]); -+srtp_sha1_core(const uint32_t M[16], uint32_t hash_value[5]); - - #endif /* else OPENSSL */ - -diff --git a/crypto/test/sha1_driver.c b/crypto/test/sha1_driver.c -index 6adfad1..2e19479 100644 ---- a/crypto/test/sha1_driver.c -+++ b/crypto/test/sha1_driver.c -@@ -102,7 +102,7 @@ hash_test_case_add(hash_test_case_t **list_ptr, - - err_status_t - sha1_test_case_validate(const hash_test_case_t *test_case) { -- sha1_ctx_t ctx; -+ srtp_sha1_ctx_t ctx; - uint32_t hash_value[5]; - - if (test_case == NULL) -@@ -113,9 +113,9 @@ sha1_test_case_validate(const hash_test_case_t *test_case) { - if (test_case->data_len > MAX_HASH_DATA_LEN) - return err_status_bad_param; - -- sha1_init(&ctx); -- sha1_update(&ctx, test_case->data, test_case->data_len); -- sha1_final(&ctx, hash_value); -+ srtp_sha1_init(&ctx); -+ srtp_sha1_update(&ctx, test_case->data, test_case->data_len); -+ srtp_sha1_final(&ctx, hash_value); - if (0 == memcmp(test_case->hash, hash_value, 20)) { - #if VERBOSE - printf("PASSED: reference value: %s\n", --- -2.7.3 - diff --git a/package.bak/libsrtp/Config.in b/package.bak/libsrtp/Config.in deleted file mode 100644 index ce37712f7d..0000000000 --- a/package.bak/libsrtp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBSRTP - bool "libsrtp" - help - This package provides an implementation of the Secure - Real-time Transport Protocol (SRTP), the Universal Security - Transform (UST), and a supporting cryptographic kernel. - - https://github.com/cisco/libsrtp diff --git a/package.bak/libsrtp/libsrtp.hash b/package.bak/libsrtp/libsrtp.hash deleted file mode 100644 index cb060d27b9..0000000000 --- a/package.bak/libsrtp/libsrtp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 56a7b521c25134f48faff26b0b1e3d4378a14986a2d3d7bc6fefb48987304ff0 libsrtp-v1.5.4.tar.gz diff --git a/package.bak/libsrtp/libsrtp.mk b/package.bak/libsrtp/libsrtp.mk deleted file mode 100644 index 40b85e69f3..0000000000 --- a/package.bak/libsrtp/libsrtp.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# libsrtp -# -################################################################################ - -LIBSRTP_VERSION = v1.5.4 -LIBSRTP_SITE = $(call github,cisco,libsrtp,$(LIBSRTP_VERSION)) -LIBSRTP_INSTALL_STAGING = YES -LIBSRTP_LICENSE = BSD-3c -LIBSRTP_LICENSE_FILES = LICENSE - -ifeq ($(BR2_STATIC_LIBS),y) -LIBSRTP_MAKE_OPTS = libsrtp.a -else ifeq ($(BR2_SHARED_LIBS),y) -LIBSRTP_MAKE_OPTS = shared_library -else -LIBSRTP_MAKE_OPTS = libsrtp.a shared_library -endif - -# While libsrtp is not using pkg-config itself, it checks if -# pkg-config is available to determine whether it should install -# libsrtp.pc. Since installing it seems useful, let's depend on -# host-pkgconf to make sure pkg-config is installed. -LIBSRTP_DEPENDENCIES = host-pkgconf - -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) -LIBSRTP_DEPENDENCIES += openssl -LIBSRTP_CONF_OPTS += --enable-openssl -else -LIBSRTP_CONF_OPTS += --disable-openssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libssh/Config.in b/package.bak/libssh/Config.in deleted file mode 100644 index 3dbfa7d561..0000000000 --- a/package.bak/libssh/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBSSH - bool "libssh" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - # Either OpenSSL or libgcrypt are mandatory - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT - help - libssh is a multiplatform C library implementing the SSHv2 - and SSHv1 protocol on client and server side. With libssh, - you can remotely execute programs, transfer files, use a - secure and transparent tunnel for your remote applications. - - http://www.libssh.org/ - -comment "libssh needs a toolchain w/ dynamic library, threads" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libssh/libssh.hash b/package.bak/libssh/libssh.hash deleted file mode 100644 index 1eef804e5c..0000000000 --- a/package.bak/libssh/libssh.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://red.libssh.org/projects/libssh/files/ -md5 05465da8004f3258db946346213209de libssh-0.7.3.tar.xz -# Locally calculated after checking signature on uncompressed libssh-0.7.3.tar -sha256 26ef46be555da21112c01e4b9f5e3abba9194485c8822ab55ba3d6496222af98 libssh-0.7.3.tar.xz diff --git a/package.bak/libssh/libssh.mk b/package.bak/libssh/libssh.mk deleted file mode 100644 index 429e3c17c8..0000000000 --- a/package.bak/libssh/libssh.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libssh -# -################################################################################ - -LIBSSH_VERSION = 0.7.3 -LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz -LIBSSH_SITE = https://red.libssh.org/attachments/download/195 -LIBSSH_LICENSE = LGPLv2.1 -LIBSSH_LICENSE_FILES = COPYING -LIBSSH_INSTALL_STAGING = YES -LIBSSH_SUPPORTS_IN_SOURCE_BUILD = NO -LIBSSH_CONF_OPTS = \ - -DWITH_STACK_PROTECTOR=OFF \ - -DWITH_SERVER=OFF \ - -DWITH_EXAMPLES=OFF - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBSSH_CONF_OPTS += -DWITH_ZLIB=ON -LIBSSH_DEPENDENCIES += zlib -else -LIBSSH_CONF_OPTS += -DWITH_ZLIB=OFF -endif - -# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. -# Favour libgcrypt. -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBSSH_CONF_OPTS += -DWITH_GCRYPT=ON -LIBSSH_DEPENDENCIES += libgcrypt -else -LIBSSH_CONF_OPTS += -DWITH_GCRYPT=OFF -LIBSSH_DEPENDENCIES += openssl -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libssh2/Config.in b/package.bak/libssh2/Config.in deleted file mode 100644 index 2944624e0a..0000000000 --- a/package.bak/libssh2/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBSSH2 - bool "libssh2" - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_LIBGCRYPT - help - libssh2 is a client-side C library implementing the SSH2 - protocol as defined by Internet Drafts: SECSH-TRANS(22), - SECSH-USERAUTH(25), SECSH-CONNECTION(23), SECSH-ARCH(20), - SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10) - - http://www.libssh2.org/ diff --git a/package.bak/libssh2/libssh2.hash b/package.bak/libssh2/libssh2.hash deleted file mode 100644 index 8f6268f3d3..0000000000 --- a/package.bak/libssh2/libssh2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 e4561fd43a50539a8c2ceb37841691baf03ecb7daf043766da1b112e4280d584 libssh2-1.7.0.tar.gz diff --git a/package.bak/libssh2/libssh2.mk b/package.bak/libssh2/libssh2.mk deleted file mode 100644 index 847c2f1b8e..0000000000 --- a/package.bak/libssh2/libssh2.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# libssh2 -# -################################################################################ - -LIBSSH2_VERSION = 1.7.0 -LIBSSH2_SITE = http://www.libssh2.org/download -LIBSSH2_LICENSE = BSD -LIBSSH2_LICENSE_FILES = COPYING -LIBSSH2_INSTALL_STAGING = YES -LIBSSH2_CONF_OPTS = --disable-examples-build - -# Dependency is either on libgcrypt or openssl, guaranteed in Config.in. -# Favour libgcrypt. -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBSSH2_DEPENDENCIES += libgcrypt -LIBSSH2_CONF_OPTS += --with-libgcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ - --without-openssl -# configure.ac forgets to link to dependent libraries of gcrypt breaking static -# linking -LIBSSH2_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/libgcrypt-config --libs`" -else -LIBSSH2_DEPENDENCIES += openssl -LIBSSH2_CONF_OPTS += --with-openssl \ - --with-libssl-prefix=$(STAGING_DIR)/usr \ - --without-libgcrypt -endif - -# Add zlib support if enabled -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBSSH2_DEPENDENCIES += zlib -LIBSSH2_CONF_OPTS += --with-libz \ - --with-libz-prefix=$(STAGING_DIR)/usr -else -LIBSSH2_CONF_OPTS += --without-libz -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libstrophe/0001-make-autoreconfable.patch b/package.bak/libstrophe/0001-make-autoreconfable.patch deleted file mode 100644 index 76ca6f25e8..0000000000 --- a/package.bak/libstrophe/0001-make-autoreconfable.patch +++ /dev/null @@ -1,20 +0,0 @@ -Make the package autoreconfigurable - -Signed-off-by: Denis Bodor -[Gustavo: update for 0.8.8] - -diff -Nura libstrophe-0.8.8.orig/m4/.empty libstrophe-0.8.8/m4/.empty ---- libstrophe-0.8.8.orig/m4/.empty 1969-12-31 21:00:00.000000000 -0300 -+++ libstrophe-0.8.8/m4/.empty 2015-09-23 19:29:37.893688227 -0300 -@@ -0,0 +1,2 @@ -+ -+ -diff -Nura libstrophe-0.8.8.orig/Makefile.am libstrophe-0.8.8/Makefile.am ---- libstrophe-0.8.8.orig/Makefile.am 2015-09-23 19:26:10.960492781 -0300 -+++ libstrophe-0.8.8/Makefile.am 2015-09-23 19:29:17.265970964 -0300 -@@ -1,4 +1,4 @@ --AUTOMAKE_OPTIONS = subdir-objects -+AUTOMAKE_OPTIONS = subdir-objects foreign - - ACLOCAL_AMFLAGS = -I m4 - AM_CFLAGS = -g -Wall diff --git a/package.bak/libstrophe/Config.in b/package.bak/libstrophe/Config.in deleted file mode 100644 index 55dc162b02..0000000000 --- a/package.bak/libstrophe/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBSTROPHE - bool "libstrophe" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT - depends on BR2_TOOLCHAIN_HAS_THREADS - help - libstrophe is a lightweight XMPP client library written in C. - It has minimal dependencies and is configurable for various - environments. It runs well on both Linux, Unix, and Windows - based platforms. - - https://github.com/strophe/libstrophe - -comment "libstrophe needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libstrophe/libstrophe.hash b/package.bak/libstrophe/libstrophe.hash deleted file mode 100644 index d840303940..0000000000 --- a/package.bak/libstrophe/libstrophe.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 08f4a85ef419a8bdf08b6afa8f7b2a0e5e180fdc9c16cede81af672ec10e21e7 libstrophe-0.8.8.tar.gz -sha256 00936397cbb75ef168992868ae559b141b505d3a06f08163012b240390efa553 b08766c8e46956daba010044b00c97f78b598780.patch diff --git a/package.bak/libstrophe/libstrophe.mk b/package.bak/libstrophe/libstrophe.mk deleted file mode 100644 index 60e29d38c3..0000000000 --- a/package.bak/libstrophe/libstrophe.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libstrophe -# -################################################################################ - -LIBSTROPHE_VERSION = 0.8.8 -LIBSTROPHE_SITE = $(call github,strophe,libstrophe,$(LIBSTROPHE_VERSION)) -LIBSTROPHE_DEPENDENCIES = openssl host-pkgconf -# Doesn't ship configure -LIBSTROPHE_AUTORECONF = YES -LIBSTROPHE_LICENSE = MIT or GPLv3 -LIBSTROPHE_LICENSE_FILES = MIT-LICENSE.txt GPL-LICENSE.txt -LIBSTROPHE_INSTALL_STAGING = YES -LIBSTROPHE_PATCH = https://github.com/msantos/libstrophe/commit/b08766c8e46956daba010044b00c97f78b598780.patch - -ifeq ($(BR2_PACKAGE_EXPAT),y) -# Passing --without-libxml2 doesn't work, due to how AC_ARG_WITH is -# used in configure.ac. As long as --with-libxml2 is *not* passed, the -# configure script assumes expat should be used. -LIBSTROPHE_DEPENDENCIES += expat -else -LIBSTROPHE_CONF_OPTS += --with-libxml2 -LIBSTROPHE_DEPENDENCIES += libxml2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsvg-cairo/Config.in b/package.bak/libsvg-cairo/Config.in deleted file mode 100644 index 9577c69bf0..0000000000 --- a/package.bak/libsvg-cairo/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBSVG_CAIRO - bool "libsvg-cairo" - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_SVG - select BR2_PACKAGE_LIBSVG - help - Libsvg-cairo provides the ability to render SVG content from - files or buffers. All rendering is performed using the cairo - rendering library. - - http://cairographics.org diff --git a/package.bak/libsvg-cairo/libsvg-cairo.hash b/package.bak/libsvg-cairo/libsvg-cairo.hash deleted file mode 100644 index fba96def72..0000000000 --- a/package.bak/libsvg-cairo/libsvg-cairo.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://cairographics.org/snapshots/libsvg-cairo-0.1.6.tar.gz.md5 -md5 d79da7b3a60ad8c8e4b902c9b3563047 libsvg-cairo-0.1.6.tar.gz - -# Locally calculated -sha256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c libsvg-cairo-0.1.6.tar.gz diff --git a/package.bak/libsvg-cairo/libsvg-cairo.mk b/package.bak/libsvg-cairo/libsvg-cairo.mk deleted file mode 100644 index 28c914165f..0000000000 --- a/package.bak/libsvg-cairo/libsvg-cairo.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libsvg-cairo -# -################################################################################ - -LIBSVG_CAIRO_VERSION = 0.1.6 -LIBSVG_CAIRO_SITE = http://cairographics.org/snapshots -LIBSVG_CAIRO_DEPENDENCIES = cairo libsvg -LIBSVG_CAIRO_INSTALL_STAGING = YES -LIBSVG_CAIRO_LICENSE = LGPLv2.1+ -LIBSVG_CAIRO_LICENSE_FILES = COPYING - -LIBSVG_CAIRO_CONF_OPTS = --without-x - -$(eval $(autotools-package)) diff --git a/package.bak/libsvg/0001-fix-expat-static-declaration.patch b/package.bak/libsvg/0001-fix-expat-static-declaration.patch deleted file mode 100644 index 58ef286729..0000000000 --- a/package.bak/libsvg/0001-fix-expat-static-declaration.patch +++ /dev/null @@ -1,33 +0,0 @@ -Newer expat versions use different declarations of the following functions: - -static void _svg_parser_sax_start_element (); -static void _svg_parser_sax_end_element (); -static void _svg_parser_sax_characters (); - -We need to patch the libsvg source to not follow into a build error like - "static declaration of 'foo' follows non-static declaration" -and use the functions from the expat library instead from the libsvg source. - -Patch based on -http://oe-lite.org/redmine/projects/xorg/repository/revisions/c4df7951e846e1be718f37f2455696a1d0861f3d/entry/recipes/cairo/libsvg-0.1.4/gcc4_and_expat.patch - -Signed-off-by: Carsten Schoenert - -diff -bur libsvg-0.1.4~orig/src/svg_parser_expat.c libsvg-0.1.4/src/svg_parser_expat.c ---- libsvg-0.1.4~orig/src/svg_parser_expat.c 2005-02-14 11:26:26.000000000 -0600 -+++ libsvg-0.1.4/src/svg_parser_expat.c 2006-02-10 21:58:20.000000000 -0600 -@@ -30,6 +30,7 @@ - #include "svgint.h" - #include "svg_hash.h" - -+#ifndef LIBSVG_EXPAT - static void - _svg_parser_sax_start_element (void *closure, - const XML_Char *name, -@@ -43,6 +44,7 @@ - _svg_parser_sax_characters (void *closure, - const XML_Char *ch, - int len); -+#endif - - static void diff --git a/package.bak/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch b/package.bak/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch deleted file mode 100644 index d0bbeab074..0000000000 --- a/package.bak/libsvg/0002-Fix-undefined-symbol-png_set_gray_1_2_4_to_8.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 213e5749947fad08d985eda8d06839efedda78ef Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 5 Mar 2015 21:42:52 +0100 -Subject: [PATCH] Fix undefined symbol png_set_gray_1_2_4_to_8 - -Since libpng-1.4.0 the function png_set_gray_1_2_4_to_8() was -removed, the replacement function is called -png_set_expand_gray_1_2_4_to_8() (see [1]). - -[1] http://libpng.sourceforge.net/ANNOUNCE-1.4.0.txt - -Signed-off-by: Peter Seiderer ---- - src/svg_image.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/svg_image.c b/src/svg_image.c -index cd8a95a..f256943 100755 ---- a/src/svg_image.c -+++ b/src/svg_image.c -@@ -271,7 +271,7 @@ _svg_image_read_png (const char *filename, - - /* expand gray bit depth if needed */ - if (color_type == PNG_COLOR_TYPE_GRAY && depth < 8) -- png_set_gray_1_2_4_to_8 (png); -+ png_set_expand_gray_1_2_4_to_8 (png); - - /* transform transparency to alpha */ - if (png_get_valid(png, info, PNG_INFO_tRNS)) --- -2.1.4 - diff --git a/package.bak/libsvg/Config.in b/package.bak/libsvg/Config.in deleted file mode 100644 index 741ef10c7a..0000000000 --- a/package.bak/libsvg/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBSVG - bool "libsvg" - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBXML2 if !BR2_PACKAGE_EXPAT - help - Libsvg provides a parser for SVG content in files or buffers. - Libsvg does not do any rendering, but instead provides a - function-based interface that can be used by various rendering - engines. - - http://cairographics.org/snapshots/ diff --git a/package.bak/libsvg/libsvg.hash b/package.bak/libsvg/libsvg.hash deleted file mode 100644 index c5008491f1..0000000000 --- a/package.bak/libsvg/libsvg.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://cairographics.org/snapshots/libsvg-0.1.4.tar.gz.md5 -md5 ce0715e3013f78506795fba16e8455d3 libsvg-0.1.4.tar.gz - -# Locally calculated -sha256 4c3bf9292e676a72b12338691be64d0f38cd7f2ea5e8b67fbbf45f1ed404bc8f libsvg-0.1.4.tar.gz diff --git a/package.bak/libsvg/libsvg.mk b/package.bak/libsvg/libsvg.mk deleted file mode 100644 index 8b85d5a3d6..0000000000 --- a/package.bak/libsvg/libsvg.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libsvg -# -################################################################################ - -LIBSVG_VERSION = 0.1.4 -LIBSVG_SITE = http://cairographics.org/snapshots -LIBSVG_DEPENDENCIES = host-pkgconf libpng jpeg -LIBSVG_INSTALL_STAGING = YES -LIBSVG_LICENSE = LGPLv2+ -LIBSVG_LICENSE_FILES = COPYING - -# libsvg needs at last a XML parser -ifeq ($(BR2_PACKAGE_EXPAT),y) -LIBSVG_CONF_OPTS += --with-expat -LIBSVG_DEPENDENCIES += expat -else -LIBSVG_CONF_OPTS += --with-libxml2 -LIBSVG_DEPENDENCIES += libxml2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libsvgtiny/0001-disable-debug-printfs.patch b/package.bak/libsvgtiny/0001-disable-debug-printfs.patch deleted file mode 100644 index 72ed21ccfa..0000000000 --- a/package.bak/libsvgtiny/0001-disable-debug-printfs.patch +++ /dev/null @@ -1,125 +0,0 @@ -svntiny: svntiny_gradient.c: only print debugging if GRADIENT_DEBUG is enabled - -Signed-off-by: Peter Korsgaard ---- - src/svgtiny_gradient.c | 23 ++++++++++++++++++++++- - 1 file changed, 22 insertions(+), 1 deletion(-) - -Index: libsvgtiny/src/svgtiny_gradient.c -=================================================================== ---- libsvgtiny.orig/src/svgtiny_gradient.c -+++ libsvgtiny/src/svgtiny_gradient.c -@@ -30,8 +30,9 @@ void svgtiny_find_gradient(const char *i - { - xmlNode *gradient; - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "svgtiny_find_gradient: id \"%s\"\n", id); -- -+#endif - state->linear_gradient_stop_count = 0; - state->gradient_x1 = "0%"; - state->gradient_y1 = "0%"; -@@ -47,13 +48,17 @@ void svgtiny_find_gradient(const char *i - - gradient = svgtiny_find_element_by_id( - (xmlNode *) state->document, id); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient %p\n", (void *) gradient); -+#endif - if (!gradient) { - fprintf(stderr, "gradient \"%s\" not found\n", id); - return; - } - -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "gradient name \"%s\"\n", gradient->name); -+#endif - if (strcmp((const char *) gradient->name, "linearGradient") == 0) { - svgtiny_parse_linear_gradient(gradient, state); - } -@@ -98,8 +103,10 @@ svgtiny_code svgtiny_parse_linear_gradie - return svgtiny_OUT_OF_MEMORY; - svgtiny_parse_transform(s, &a, &b, &c, &d, &e, &f); - free(s); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "transform %g %g %g %g %g %g\n", - a, b, c, d, e, f); -+#endif - state->gradient_transform.a = a; - state->gradient_transform.b = b; - state->gradient_transform.c = c; -@@ -143,7 +150,9 @@ svgtiny_code svgtiny_parse_linear_gradie - } - - if (offset != -1 && color != svgtiny_TRANSPARENT) { -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "stop %g %x\n", offset, color); -+#endif - state->gradient_stop[i].offset = offset; - state->gradient_stop[i].color = color; - i++; -@@ -220,9 +229,11 @@ svgtiny_code svgtiny_add_path_linear_gra - #endif - - /* compute gradient vector */ -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "x1 %s, y1 %s, x2 %s, y2 %s\n", - state->gradient_x1, state->gradient_y1, - state->gradient_x2, state->gradient_y2); -+#endif - if (!state->gradient_user_space_on_use) { - gradient_x0 = object_x0 + - svgtiny_parse_length(state->gradient_x1, -@@ -297,9 +308,11 @@ svgtiny_code svgtiny_add_path_linear_gra - - /* invert gradient transform for applying to vertices */ - svgtiny_invert_matrix(&state->gradient_transform.a, trans); -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "inverse transform %g %g %g %g %g %g\n", - trans[0], trans[1], trans[2], trans[3], - trans[4], trans[5]); -+#endif - - /* compute points on the path for triangle vertices */ - /* r, r0, r1 are distance along gradient vector */ -@@ -372,8 +385,10 @@ svgtiny_code svgtiny_add_path_linear_gra - steps = ceilf(fabsf(r1 - r0) / 0.05); - if (steps == 0) - steps = 1; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "r0 %g, r1 %g, steps %i\n", - r0, r1, steps); -+#endif - - /* loop through intermediate points */ - for (z = 1; z != steps; z++) { -@@ -398,7 +413,9 @@ svgtiny_code svgtiny_add_path_linear_gra - r = ((x_trans - gradient_x0) * gradient_dx + - (y_trans - gradient_y0) * gradient_dy) / - gradient_norm_squared; -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "(%g %g [%g]) ", x, y, r); -+#endif - point = svgtiny_list_push(pts); - if (!point) { - svgtiny_list_free(pts); -@@ -412,14 +429,18 @@ svgtiny_code svgtiny_add_path_linear_gra - min_pt = svgtiny_list_size(pts) - 1; - } - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "\n"); -+#endif - - /* next segment start point is this segment end point */ - x0 = x1; - y0 = y1; - } -+#ifdef GRADIENT_DEBUG - fprintf(stderr, "pts size %i, min_pt %i, min_r %.3f\n", - svgtiny_list_size(pts), min_pt, min_r); -+#endif - - /* render triangles */ - stop_count = state->linear_gradient_stop_count; diff --git a/package.bak/libsvgtiny/0002-create-builddir.patch b/package.bak/libsvgtiny/0002-create-builddir.patch deleted file mode 100644 index a404d86bca..0000000000 --- a/package.bak/libsvgtiny/0002-create-builddir.patch +++ /dev/null @@ -1,15 +0,0 @@ -svgtiny: create BUILDDIR before $(BUILDDIR)/src_colors.c - -Signed-off-by: Max Filippov ---- ---- libsvgtiny-12121/src/Makefile.orig 2014-06-17 15:30:21.765311434 +0400 -+++ libsvgtiny-12121/src/Makefile 2014-06-17 15:29:56.569909931 +0400 -@@ -3,7 +3,7 @@ - - SOURCES := $(SOURCES) $(BUILDDIR)/src_colors.c - --$(BUILDDIR)/src_colors.c: src/colors.gperf -+$(BUILDDIR)/src_colors.c: src/colors.gperf $(BUILDDIR)/stamp - $(VQ)$(ECHO) " GPERF: $<" - $(Q)gperf --output-file=$@.tmp $< - # Hack for GCC 4.2 compatibility (gperf 3.0.4 solves this properly) diff --git a/package.bak/libsvgtiny/0003-Remove-Werror.patch b/package.bak/libsvgtiny/0003-Remove-Werror.patch deleted file mode 100644 index c8b0c0b9ef..0000000000 --- a/package.bak/libsvgtiny/0003-Remove-Werror.patch +++ /dev/null @@ -1,44 +0,0 @@ -Remove -Werror from Makefile - -glibc-2.20 includes some changes to the include/features.h file -introduced by this commit: - - https://sourceware.org/git/?p=glibc.git;a=commit;h=ade40b10ff5fa59a318cf55b9d8414b758e8df78 - -Those changes make libsvgtiny fail because some warnings are thrown and -the build system is using the -Werror option. We disable this to be able -to build it, or otherwise we will see errors like this one: - -GPERF: src/colors.gperf -COMPILE: build-Linux-Linux-release-lib-static/src_colors.c -In file included from -/br/output/host/usr/mipsel-buildroot-linux-gnu/sysroot/usr/include/string.h:25:0, - from src/colors.gperf:16: -/br/output/host/usr/mipsel-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: -error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use -_DEFAULT_SOURCE" [-Werror=cpp] - -and this one: - -In file included from src/colors.gperf:18:0: -/home/ldap/vriera/work/mips-buildroots/mips32/output/build/libsvgtiny-12121/src/svgtiny_internal.h:71:0: -error: "strndup" redefined [-Werror] - -Signed-off-by: Vicente Olivert Riera - -diff -rup a/Makefile b/Makefile ---- a/Makefile 2010-01-03 23:37:39.000000000 +0000 -+++ b/Makefile 2014-12-11 11:35:37.241903884 +0000 -@@ -13,12 +13,6 @@ TESTRUNNER := $(ECHO) - WARNFLAGS := -Wall -W -Wundef -Wpointer-arith -Wcast-align \ - -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes \ - -Wmissing-declarations -Wnested-externs -pedantic --# BeOS/Haiku/AmigaOS4 standard library headers create warnings --ifneq ($(TARGET),beos) -- ifneq ($(TARGET),AmigaOS) -- WARNFLAGS := $(WARNFLAGS) -Werror -- endif --endif - CFLAGS := -D_BSD_SOURCE -I$(CURDIR)/include/ \ - -I$(CURDIR)/src $(WARNFLAGS) $(CFLAGS) - ifneq ($(GCCVER),2) diff --git a/package.bak/libsvgtiny/Config.in b/package.bak/libsvgtiny/Config.in deleted file mode 100644 index 836dec210e..0000000000 --- a/package.bak/libsvgtiny/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBSVGTINY - bool "libsvgtiny" - select BR2_PACKAGE_LIBXML2 - help - Libsvgtiny is an implementation of SVG Tiny, written in C. - It is currently in development for use with NetSurf and is - intended to be suitable for use in other projects too. - - http://www.netsurf-browser.org/projects/libsvgtiny/ diff --git a/package.bak/libsvgtiny/libsvgtiny.mk b/package.bak/libsvgtiny/libsvgtiny.mk deleted file mode 100644 index acd08d72d5..0000000000 --- a/package.bak/libsvgtiny/libsvgtiny.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# libsvgtiny -# -################################################################################ - -LIBSVGTINY_SITE = http://git.netsurf-browser.org/libsvgtiny.git -LIBSVGTINY_SITE_METHOD = git -LIBSVGTINY_VERSION = ea9d99fc8b231c22d06168135e181d61f4eb2f06 -LIBSVGTINY_INSTALL_STAGING = YES -LIBSVGTINY_DEPENDENCIES = \ - libxml2 host-gperf host-pkgconf host-netsurf-buildsystem -LIBSVGTINY_LICENSE = MIT -LIBSVGTINY_LICENSE_FILES = README - -# The libsvgtiny build system cannot build both the shared and static -# libraries. So when the Buildroot configuration requests to build -# both the shared and static variants, we build only the shared one. -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -LIBSVGTINY_COMPONENT_TYPE = lib-shared -else -LIBSVGTINY_COMPONENT_TYPE = lib-static -endif - -define LIBSVGTINY_CONFIGURE_CMDS - ln -sf $(HOST_DIR)/usr/share/netsurf-buildsystem $(@D)/build -endef - -define LIBSVGTINY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=/usr \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) -endef - -define LIBSVGTINY_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(STAGING_DIR) \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install -endef - -define LIBSVGTINY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) \ - $(MAKE) -C $(@D) PREFIX=/usr DESTDIR=$(TARGET_DIR) \ - COMPONENT_TYPE=$(LIBSVGTINY_COMPONENT_TYPE) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libsysfs/Config.in b/package.bak/libsysfs/Config.in deleted file mode 100644 index e4e6f28ea1..0000000000 --- a/package.bak/libsysfs/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBSYSFS - bool "libsysfs" - help - These are a set of utilities built upon sysfs, a filesystem in - Linux 2.6 kernels that exposes a system's device tree. - - http://linux-diag.sourceforge.net/Sysfsutils.html diff --git a/package.bak/libsysfs/libsysfs.hash b/package.bak/libsysfs/libsysfs.hash deleted file mode 100644 index c419ed95d8..0000000000 --- a/package.bak/libsysfs/libsysfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a sysfsutils-2.1.0.tar.gz diff --git a/package.bak/libsysfs/libsysfs.mk b/package.bak/libsysfs/libsysfs.mk deleted file mode 100644 index fb0310fcb5..0000000000 --- a/package.bak/libsysfs/libsysfs.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libsysfs -# -################################################################################ - -LIBSYSFS_VERSION = 2.1.0 -LIBSYSFS_SITE = http://downloads.sourceforge.net/project/linux-diag/sysfsutils/$(LIBSYSFS_VERSION) -LIBSYSFS_SOURCE = sysfsutils-$(LIBSYSFS_VERSION).tar.gz -LIBSYSFS_INSTALL_STAGING = YES -LIBSYSFS_LICENSE = GPLv2 (utilities), LGPLv2.1+ (library) -LIBSYSFS_LICENSE_FILES = cmd/GPL lib/LGPL - -$(eval $(autotools-package)) diff --git a/package.bak/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch b/package.bak/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch deleted file mode 100644 index 387ba7aa3b..0000000000 --- a/package.bak/libtasn1/0001-configure-don-t-add-Werror-to-build-flags.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd091c8af163213e12aa92f61bc4916e0f102633 Mon Sep 17 00:00:00 2001 -From: Nikos Mavrogiannopoulos -Date: Tue, 26 Jul 2016 08:45:33 +0200 -Subject: [PATCH] configure: don't add -Werror to build flags - -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - configure.ac | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 7a14e04..066f5fe 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,8 +70,6 @@ AC_ARG_ENABLE([gcc-warnings], - ) - - if test "$gl_gcc_warnings" = yes; then -- gl_WARN_ADD([-Werror], [WERROR_CFLAGS]) -- - nw="$nw -Wsystem-headers" # Don't let system headers trigger warnings - nw="$nw -Wc++-compat" # We don't care strongly about C++ compilers - nw="$nw -Wtraditional" # Warns on #elif which we use often --- -2.7.3 - diff --git a/package.bak/libtasn1/Config.in b/package.bak/libtasn1/Config.in deleted file mode 100644 index 181fc69895..0000000000 --- a/package.bak/libtasn1/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBTASN1 - bool "libtasn1" - help - ASN.1 library - - http://www.gnu.org/software/libtasn1 diff --git a/package.bak/libtasn1/libtasn1.hash b/package.bak/libtasn1/libtasn1.hash deleted file mode 100644 index 5b2100e87d..0000000000 --- a/package.bak/libtasn1/libtasn1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 4f6f7a8fd691ac2b8307c8ca365bad711db607d4ad5966f6938a9d2ecd65c920 libtasn1-4.9.tar.gz diff --git a/package.bak/libtasn1/libtasn1.mk b/package.bak/libtasn1/libtasn1.mk deleted file mode 100644 index ac99868a21..0000000000 --- a/package.bak/libtasn1/libtasn1.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libtasn1 -# -################################################################################ - -LIBTASN1_VERSION = 4.9 -LIBTASN1_SITE = $(BR2_GNU_MIRROR)/libtasn1 -LIBTASN1_DEPENDENCIES = host-bison -LIBTASN1_LICENSE = GPLv3+ (tests, tools), LGPLv2.1+ (library) -LIBTASN1_LICENSE_FILES = COPYING COPYING.LIB -LIBTASN1_INSTALL_STAGING = YES -# 'missing' fallback logic botched so disable it completely -LIBTASN1_CONF_ENV = MAKEINFO="true" -# For 0001-configure-don-t-add-Werror-to-build-flags.patch -LIBTASN1_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libtheora/0001-link-libtheoradec.patch b/package.bak/libtheora/0001-link-libtheoradec.patch deleted file mode 100644 index c38d32bbbc..0000000000 --- a/package.bak/libtheora/0001-link-libtheoradec.patch +++ /dev/null @@ -1,21 +0,0 @@ -libtheoraenc.so needs to be linked to libtheoradec.so in order to avoid - -symbol 'th_comment_query_count': can't resolve symbol in lib '/usr/lib/libtheoraenc.so.1' - -when starting Freeswitch. - -Patch downloaded from -http://www.sisyphus.ru/en/srpm/Sisyphus/libtheora/patches/0 - -Signed-off-by: Bernd Kuhls - ---- libtheora/lib/Makefile.am -+++ libtheora/lib/Makefile.am -@@ -153,6 +153,7 @@ libtheoraenc_la_SOURCES = \ - libtheoraenc_la_LDFLAGS = \ - -version-info @THENC_LIB_CURRENT@:@THENC_LIB_REVISION@:@THENC_LIB_AGE@ \ - @THEORAENC_LDFLAGS@ $(OGG_LIBS) -+libtheoraenc_la_LIBADD = libtheoradec.la - - libtheora_la_SOURCES = \ - $(decoder_sources) \ diff --git a/package.bak/libtheora/0002-fix-autoreconf.patch b/package.bak/libtheora/0002-fix-autoreconf.patch deleted file mode 100644 index dd3f473222..0000000000 --- a/package.bak/libtheora/0002-fix-autoreconf.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix broken autoreconf - -Downloaded from upstream git -https://git.xiph.org/?p=theora.git;a=commitdiff;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 - -Signed-off-by: Bernd Kuhls - - -From: Tim Terriberry -Date: Fri, 20 May 2011 20:41:50 +0000 (+0000) -Subject: Make autoreconf -i -f work. -X-Git-Url: https://git.xiph.org/?p=theora.git;a=commitdiff_plain;h=28cc6dbd9b2a141df94f60993256a5fca368fa54 - -Make autoreconf -i -f work. - -Patch from David Schleef. - -svn path=/trunk/theora/; revision=17990 ---- - -diff --git a/Makefile.am b/Makefile.am -index 89fd753..1783857 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -4,6 +4,8 @@ - #AUTOMAKE_OPTIONS = foreign 1.7 dist-zip dist-bzip2 - AUTOMAKE_OPTIONS = foreign 1.11 dist-zip dist-xz - -+ACLOCAL_AMFLAGS=-I m4 -+ - if THEORA_ENABLE_EXAMPLES - EXAMPLES_DIR = examples - else -diff --git a/configure.ac b/configure.ac -index 1cbec1a..456b603 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -68,7 +68,7 @@ AC_LIBTOOL_WIN32_DLL - AM_PROG_LIBTOOL - - dnl Add parameters for aclocal --AC_SUBST(ACLOCAL_AMFLAGS, "-I m4") -+AC_CONFIG_MACRO_DIR([m4]) - - dnl Check for doxygen - AC_ARG_ENABLE([doc], diff --git a/package.bak/libtheora/Config.in b/package.bak/libtheora/Config.in deleted file mode 100644 index bf20a50372..0000000000 --- a/package.bak/libtheora/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBTHEORA - bool "libtheora" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - help - A library for the free and open video compression format "Theora" - from the Xiph.org Foundation. - - http://www.theora.org/ diff --git a/package.bak/libtheora/libtheora.hash b/package.bak/libtheora/libtheora.hash deleted file mode 100644 index daf245570a..0000000000 --- a/package.bak/libtheora/libtheora.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/theora/SHA256SUMS -sha256 f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61 libtheora-1.1.1.tar.xz diff --git a/package.bak/libtheora/libtheora.mk b/package.bak/libtheora/libtheora.mk deleted file mode 100644 index 11f9852eaf..0000000000 --- a/package.bak/libtheora/libtheora.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# libtheora -# -################################################################################ - -LIBTHEORA_VERSION = 1.1.1 -LIBTHEORA_SOURCE = libtheora-$(LIBTHEORA_VERSION).tar.xz -LIBTHEORA_SITE = http://downloads.xiph.org/releases/theora -LIBTHEORA_INSTALL_STAGING = YES -# We're patching Makefile.am -LIBTHEORA_AUTORECONF = YES -LIBTHEORA_LICENSE = BSD-3c -LIBTHEORA_LICENSE_FILES = COPYING LICENSE - -LIBTHEORA_CONF_OPTS = \ - --disable-oggtest \ - --disable-vorbistest \ - --disable-sdltest \ - --disable-examples \ - --disable-spec - -LIBTHEORA_DEPENDENCIES = libogg libvorbis host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch b/package.bak/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch deleted file mode 100644 index e51c5a44b2..0000000000 --- a/package.bak/libtirpc/0001-Disable-parts-of-TIRPC-requiring-NIS-support.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 15adb318818f5d0ac609ef2b87643dd760487cb6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 20 Jul 2015 20:30:11 +0200 -Subject: [PATCH 1/1] Disable parts of TIRPC requiring NIS support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" -[joerg.krause@embedded.rocks: update for 0.3.2] -Signed-off-by: Jörg Krause -[peda@axentia.se: update for 1.0.1] -Signed-off-by: Peter Rosin ---- - src/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 6cc567a..9834f9a 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -24,7 +24,7 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ - svc_auth_des.c \ - svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_time.c auth_des.c authdes_prot.c debug.c -+ auth_des.c authdes_prot.c debug.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -@@ -41,8 +41,8 @@ if GSS - libtirpc_la_CFLAGS = -DHAVE_RPCSEC_GSS $(GSSAPI_CFLAGS) - endif - --libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c --libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c -+#libtirpc_la_SOURCES += key_call.c key_prot_xdr.c getpublickey.c -+#libtirpc_la_SOURCES += netname.c netnamer.c rpcdname.c rtime.c - - CLEANFILES = cscope.* *~ - DISTCLEANFILES = Makefile.in --- -2.4.6 - diff --git a/package.bak/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch b/package.bak/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch deleted file mode 100644 index 643a57ed5a..0000000000 --- a/package.bak/libtirpc/0002-uClibc-without-RPC-support-and-musl-does-not-install-rpcent.h.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 7aa1fe6a0f9280571117c30c03c2cc521cd86ec3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 23 Jun 2012 21:58:07 +0200 -Subject: [PATCH] uClibc without RPC support and musl does not install rpcent.h - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" -[joerg.krause@embedded.rocks: musl fix] -Signed-off-by: Jörg Krause ---- - tirpc/rpc/rpcent.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tirpc/rpc/rpcent.h b/tirpc/rpc/rpcent.h -index 147f909..4a58180 100644 ---- a/tirpc/rpc/rpcent.h -+++ b/tirpc/rpc/rpcent.h -@@ -48,8 +48,9 @@ - extern "C" { - #endif - --/* These are defined in /usr/include/rpc/netdb.h */ --#if !defined(__GLIBC__) -+/* These are defined in /usr/include/rpc/netdb.h, unless we are using -+ the C library without RPC support. */ -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_RPC__) || !defined(__GLIBC__) - struct rpcent { - char *r_name; /* name of server for this rpc program */ - char **r_aliases; /* alias list */ --- -1.9.1 - diff --git a/package.bak/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch b/package.bak/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch deleted file mode 100644 index 1cf861417c..0000000000 --- a/package.bak/libtirpc/0003-Add-rpcgen-program-from-nfs-utils-sources.patch +++ /dev/null @@ -1,6508 +0,0 @@ -From 866b651bcb9f93f47582e5e2e4f1eb3155025298 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 16:21:01 +0100 -Subject: [PATCH] Add rpcgen program from nfs-utils sources - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 2 +- - configure.ac | 14 +- - rpcgen/Makefile.am | 22 ++ - rpcgen/rpc_clntout.c | 217 ++++++++++ - rpcgen/rpc_cout.c | 706 +++++++++++++++++++++++++++++++++ - rpcgen/rpc_hout.c | 490 +++++++++++++++++++++++ - rpcgen/rpc_main.c | 1067 ++++++++++++++++++++++++++++++++++++++++++++++++++ - rpcgen/rpc_output.h | 16 + - rpcgen/rpc_parse.c | 609 ++++++++++++++++++++++++++++ - rpcgen/rpc_parse.h | 166 ++++++++ - rpcgen/rpc_sample.c | 247 ++++++++++++ - rpcgen/rpc_scan.c | 474 ++++++++++++++++++++++ - rpcgen/rpc_scan.h | 103 +++++ - rpcgen/rpc_svcout.c | 882 +++++++++++++++++++++++++++++++++++++++++ - rpcgen/rpc_tblout.c | 165 ++++++++ - rpcgen/rpc_util.c | 479 ++++++++++++++++++++++ - rpcgen/rpc_util.h | 166 ++++++++ - rpcgen/rpcgen.1 | 521 ++++++++++++++++++++++++ - 18 files changed, 6344 insertions(+), 2 deletions(-) - create mode 100644 rpcgen/Makefile.am - create mode 100644 rpcgen/rpc_clntout.c - create mode 100644 rpcgen/rpc_cout.c - create mode 100644 rpcgen/rpc_hout.c - create mode 100644 rpcgen/rpc_main.c - create mode 100644 rpcgen/rpc_output.h - create mode 100644 rpcgen/rpc_parse.c - create mode 100644 rpcgen/rpc_parse.h - create mode 100644 rpcgen/rpc_sample.c - create mode 100644 rpcgen/rpc_scan.c - create mode 100644 rpcgen/rpc_scan.h - create mode 100644 rpcgen/rpc_svcout.c - create mode 100644 rpcgen/rpc_tblout.c - create mode 100644 rpcgen/rpc_util.c - create mode 100644 rpcgen/rpc_util.h - create mode 100644 rpcgen/rpcgen.1 - -diff --git a/Makefile.am b/Makefile.am -index 466b6dd..8558289 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src man doc -+SUBDIRS = src man doc rpcgen - ACLOCAL_AMFLAGS = -I m4 - - noinst_HEADERS = tirpc/reentrant.h \ -diff --git a/configure.ac b/configure.ac -index e3cb8af..0ea2e6e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,6 +58,18 @@ AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h limits.h locale.h netdb.h netine - AC_CHECK_LIB([pthread], [pthread_create]) - AC_CHECK_FUNCS([getrpcbyname getrpcbynumber setrpcent endrpcent getrpcent]) - --AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile]) -+AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes) -+ -+AC_MSG_CHECKING([for a C compiler for build tools]) -+if test $cross_compiling = yes; then -+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc) -+else -+ CC_FOR_BUILD=$CC -+fi -+AC_MSG_RESULT([$CC_FOR_BUILD]) -+AC_SUBST(CC_FOR_BUILD) -+ -+AC_CONFIG_FILES([Makefile src/Makefile man/Makefile doc/Makefile rpcgen/Makefile]) -+ - AC_OUTPUT(libtirpc.pc) - -diff --git a/rpcgen/Makefile.am b/rpcgen/Makefile.am -new file mode 100644 -index 0000000..2277b6f ---- /dev/null -+++ b/rpcgen/Makefile.am -@@ -0,0 +1,22 @@ -+COMPILE = $(CC_FOR_BUILD) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) -+LINK = $(CC_FOR_BUILD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS_FOR_BUILD) -o $@ -+ -+noinst_PROGRAMS = rpcgen -+ -+rpcgen_SOURCES = \ -+ rpc_clntout.c \ -+ rpc_cout.c \ -+ rpc_hout.c \ -+ rpc_main.c \ -+ rpc_parse.c \ -+ rpc_sample.c \ -+ rpc_scan.c \ -+ rpc_svcout.c \ -+ rpc_tblout.c \ -+ rpc_util.c \ -+ rpc_parse.h \ -+ rpc_scan.h \ -+ rpc_util.h -+ -+dist_man1_MANS = rpcgen.1 -diff --git a/rpcgen/rpc_clntout.c b/rpcgen/rpc_clntout.c -new file mode 100644 -index 0000000..e2f4382 ---- /dev/null -+++ b/rpcgen/rpc_clntout.c -@@ -0,0 +1,217 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_clntout.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_clntout.c, Client-stub outputter for the RPC protocol compiler -+ * Copyright (C) 1987, Sun Microsytsems, Inc. -+ */ -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+/* extern pdeclaration(); */ -+/* void printarglist(); */ -+ -+#define DEFAULT_TIMEOUT 25 /* in seconds */ -+static char RESULT[] = "clnt_res"; -+ -+static void write_program(definition *def); -+static void printbody(proc_list *proc); -+ -+ -+void -+write_stubs(void) -+{ -+ list *l; -+ definition *def; -+ -+ f_print(fout, -+ "\n/* Default timeout can be changed using clnt_control() */\n"); -+ f_print(fout, "static struct timeval TIMEOUT = { %d, 0 };\n", -+ DEFAULT_TIMEOUT); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_program(def); -+ } -+ } -+} -+ -+static void -+write_program(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, "*\n"); -+ pvname(proc->proc_name, vp->vers_num); -+ printarglist(proc, "clnt", "CLIENT *"); -+ f_print(fout, "{\n"); -+ printbody(proc); -+ f_print(fout, "}\n"); -+ } -+ } -+} -+ -+/* -+ * Writes out declarations of procedure's argument list. -+ * In either ANSI C style, in one of old rpcgen style (pass by reference), -+ * or new rpcgen style (multiple arguments, pass by value); -+ */ -+ -+/* sample addargname = "clnt"; sample addargtype = "CLIENT * " */ -+ -+void -+printarglist(proc_list *proc, char *addargname, char *addargtype) -+{ -+ -+ decl_list *l; -+ -+ if (!newstyle) { /* old style: always pass arg by reference */ -+ if (Cflag) { /* C++ style heading */ -+ f_print(fout, "("); -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ f_print(fout, "*argp, %s%s)\n", addargtype, addargname); -+ } else { -+ f_print(fout, "(argp, %s)\n", addargname); -+ f_print(fout, "\t"); -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ f_print(fout, "*argp;\n"); -+ } -+ } else if (streq(proc->args.decls->decl.type, "void")) { -+ /* newstyle, 0 argument */ -+ if (Cflag) -+ f_print(fout, "(%s%s)\n", addargtype, addargname); -+ else -+ f_print(fout, "(%s)\n", addargname); -+ } else { -+ /* new style, 1 or multiple arguments */ -+ if (!Cflag) { -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) -+ f_print(fout, "%s, ", l->decl.name); -+ f_print(fout, "%s)\n", addargname); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pdeclaration(proc->args.argname, &l->decl, 1, ";\n"); -+ } -+ } else { /* C++ style header */ -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pdeclaration(proc->args.argname, &l->decl, 0, ", "); -+ } -+ f_print(fout, " %s%s)\n", addargtype, addargname); -+ } -+ } -+ -+ if (!Cflag) -+ f_print(fout, "\t%s%s;\n", addargtype, addargname); -+} -+ -+ -+ -+static char * -+ampr(char *type) -+{ -+ if (isvectordef(type, REL_ALIAS)) { -+ return (""); -+ } else { -+ return ("&"); -+ } -+} -+ -+static void -+printbody(proc_list *proc) -+{ -+ decl_list *l; -+ bool_t args2 = (proc->arg_num > 1); -+ -+ /* For new style with multiple arguments, need a structure in which -+ * to stuff the arguments. */ -+ if (newstyle && args2) { -+ f_print(fout, "\t%s", proc->args.argname); -+ f_print(fout, " arg;\n"); -+ } -+ f_print(fout, "\tstatic "); -+ if (streq(proc->res_type, "void")) { -+ f_print(fout, "char "); -+ } else { -+ ptype(proc->res_prefix, proc->res_type, 0); -+ } -+ f_print(fout, "%s;\n", RESULT); -+ f_print(fout, "\n"); -+ f_print(fout, "\tmemset((char *)%s%s, 0, sizeof(%s));\n", -+ ampr(proc->res_type), RESULT, RESULT); -+ if (newstyle && !args2 && (streq(proc->args.decls->decl.type, "void"))) { -+ /* newstyle, 0 arguments */ -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_void, (caddr_t) NULL, " -+ "(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ -+ } else if (newstyle && args2) { -+ /* newstyle, multiple arguments: stuff arguments into structure */ -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ f_print(fout, "\targ.%s = %s;\n", -+ l->decl.name, l->decl.name); -+ } -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, (caddr_t) &arg, " -+ "(xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, proc->args.argname, -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ } else { /* single argument, new or old style */ -+ f_print(fout, -+ "\tif (clnt_call(clnt, %s, (xdrproc_t) xdr_%s, " -+ "(caddr_t) %s%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s, TIMEOUT) != RPC_SUCCESS) {\n", -+ proc->proc_name, -+ stringfix(proc->args.decls->decl.type), -+ (newstyle ? "&" : ""), -+ (newstyle ? proc->args.decls->decl.name : "argp"), -+ stringfix(proc->res_type), ampr(proc->res_type), RESULT); -+ } -+ f_print(fout, "\t\treturn (NULL);\n"); -+ f_print(fout, "\t}\n"); -+ if (streq(proc->res_type, "void")) { -+ f_print(fout, "\treturn ((void *)%s%s);\n", -+ ampr(proc->res_type), RESULT); -+ } else { -+ f_print(fout, "\treturn (%s%s);\n", ampr(proc->res_type), RESULT); -+ } -+} -diff --git a/rpcgen/rpc_cout.c b/rpcgen/rpc_cout.c -new file mode 100644 -index 0000000..a61214f ---- /dev/null -+++ b/rpcgen/rpc_cout.c -@@ -0,0 +1,706 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_cout.c 1.13 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_cout.c, XDR routine outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static int findtype(definition *def, char *type); -+static int undefined(char *type); -+static void print_generic_header(char *procname, int pointerp); -+static void print_header(definition *def); -+static void print_prog_header(proc_list *plist); -+static void print_trailer(void); -+static void print_ifopen(int indent, char *name); -+static void print_ifarg(char *arg); -+static void print_ifsizeof(char *prefix, char *type); -+static void print_ifclose(int indent); -+static void print_ifstat(int indent, char *prefix, char *type, relation rel, -+ char *amax, char *objname, char *name); -+static void emit_enum(definition *def); -+static void emit_program(definition *def); -+static void emit_union(definition *def); -+static void emit_struct(definition *def); -+static void emit_typedef(definition *def); -+static void print_stat(int indent, declaration *dec); -+static void emit_inline(declaration *decl, int flag); -+static void emit_single_in_line(declaration *decl, int flag, relation rel); -+static char * upcase(char *str); -+ -+/* -+ * Emit the C-routine for the given definition -+ */ -+void -+emit(definition *def) -+{ -+ if (def->def_kind == DEF_CONST) { -+ return; -+ } -+ if (def->def_kind == DEF_PROGRAM) { -+ emit_program(def); -+ return; -+ } -+ if (def->def_kind == DEF_TYPEDEF) { -+ /* now we need to handle declarations like -+ * struct typedef foo foo; -+ * since we dont want this to be expanded into 2 calls -+ * to xdr_foo */ -+ -+ if (strcmp(def->def.ty.old_type, def->def_name) == 0) -+ return; -+ }; -+ -+ print_header(def); -+ switch (def->def_kind) { -+ case DEF_UNION: -+ emit_union(def); -+ break; -+ case DEF_ENUM: -+ emit_enum(def); -+ break; -+ case DEF_STRUCT: -+ emit_struct(def); -+ break; -+ case DEF_TYPEDEF: -+ emit_typedef(def); -+ break; -+ default: -+ break; -+ } -+ print_trailer(); -+} -+ -+static int -+findtype(definition *def, char *type) -+{ -+ -+ if (def->def_kind == DEF_PROGRAM || def->def_kind == DEF_CONST) { -+ return (0); -+ } else { -+ return (streq(def->def_name, type)); -+ } -+} -+ -+static int -+undefined(char *type) -+{ -+ definition *def; -+ -+ def = (definition *) FINDVAL(defined, type, findtype); -+ -+ return (def == NULL); -+} -+ -+ -+static void -+print_generic_header(char *procname, int pointerp) -+{ -+ f_print(fout, "\n"); -+ f_print(fout, "bool_t\n"); -+ if (Cflag) { -+ f_print(fout, "xdr_%s(", procname); -+ f_print(fout, "XDR *xdrs, "); -+ f_print(fout, "%s ", procname); -+ if (pointerp) -+ f_print(fout, "*"); -+ f_print(fout, "objp)\n{\n\n"); -+ } else { -+ f_print(fout, "xdr_%s(xdrs, objp)\n", procname); -+ f_print(fout, "\tXDR *xdrs;\n"); -+ f_print(fout, "\t%s ", procname); -+ if (pointerp) -+ f_print(fout, "*"); -+ f_print(fout, "objp;\n{\n\n"); -+ } -+} -+ -+static void -+print_header(definition *def) -+{ -+ print_generic_header(def->def_name, -+ def->def_kind != DEF_TYPEDEF || -+ !isvectordef(def->def.ty.old_type, def->def.ty.rel)); -+ -+ /* Now add Inline support */ -+ -+ -+ if (Inline == 0) -+ return; -+} -+ -+static void -+print_prog_header(proc_list *plist) -+{ -+ print_generic_header(plist->args.argname, 1); -+} -+ -+static void -+print_trailer(void) -+{ -+ f_print(fout, "\treturn (TRUE);\n"); -+ f_print(fout, "}\n"); -+} -+ -+ -+static void -+print_ifopen(int indent, char *name) -+{ -+ tabify(fout, indent); -+ f_print(fout, " if (!xdr_%s(xdrs", name); -+} -+ -+static void -+print_ifarg(char *arg) -+{ -+ f_print(fout, ", %s", arg); -+} -+ -+static void -+print_ifsizeof(char *prefix, char *type) -+{ -+ if (streq(type, "bool")) { -+ f_print(fout, ", sizeof(bool_t), (xdrproc_t)xdr_bool"); -+ } else { -+ f_print(fout, ", sizeof("); -+ if (undefined(type) && prefix) { -+ f_print(fout, "%s ", prefix); -+ } -+ f_print(fout, "%s), (xdrproc_t)xdr_%s", type, type); -+ } -+} -+ -+static void -+print_ifclose(int indent) -+{ -+ f_print(fout, ")) {\n"); -+ tabify(fout, indent); -+ f_print(fout, "\t return (FALSE);\n"); -+ tabify(fout, indent); -+ f_print(fout, " }\n"); -+} -+ -+static void -+print_ifstat(int indent, char *prefix, char *type, relation rel, -+ char *amax, char *objname, char *name) -+{ -+ char *alt = NULL; -+ -+ switch (rel) { -+ case REL_POINTER: -+ print_ifopen(indent, "pointer"); -+ print_ifarg("(char **)"); -+ f_print(fout, "%s", objname); -+ print_ifsizeof(prefix, type); -+ break; -+ case REL_VECTOR: -+ if (streq(type, "string")) { -+ alt = "string"; -+ } else if (streq(type, "opaque")) { -+ alt = "opaque"; -+ } -+ if (alt) { -+ print_ifopen(indent, alt); -+ print_ifarg(objname); -+ } else { -+ print_ifopen(indent, "vector"); -+ print_ifarg("(char *)"); -+ f_print(fout, "%s", objname); -+ } -+ print_ifarg(amax); -+ if (!alt) { -+ print_ifsizeof(prefix, type); -+ } -+ break; -+ case REL_ARRAY: -+ if (streq(type, "string")) { -+ alt = "string"; -+ } else if (streq(type, "opaque")) { -+ alt = "bytes"; -+ } -+ if (streq(type, "string")) { -+ print_ifopen(indent, alt); -+ print_ifarg(objname); -+ } else { -+ if (alt) { -+ print_ifopen(indent, alt); -+ } else { -+ print_ifopen(indent, "array"); -+ } -+ /* The (void*) avoids a gcc-4.1 warning */ -+ print_ifarg("(char **)(void*)"); -+ if (*objname == '&') { -+ f_print(fout, "%s.%s_val, (u_int *)%s.%s_len", -+ objname, name, objname, name); -+ } else { -+ f_print(fout, "&%s->%s_val, (u_int *)&%s->%s_len", -+ objname, name, objname, name); -+ } -+ } -+ print_ifarg(amax); -+ if (!alt) { -+ print_ifsizeof(prefix, type); -+ } -+ break; -+ case REL_ALIAS: -+ print_ifopen(indent, type); -+ print_ifarg(objname); -+ break; -+ } -+ print_ifclose(indent); -+} -+ -+static void -+emit_enum(definition *def) -+{ -+ print_ifopen(1, "enum"); -+ print_ifarg("(enum_t *)objp"); -+ print_ifclose(1); -+} -+ -+static void -+emit_program(definition *def) -+{ -+ decl_list *dl; -+ version_list *vlist; -+ proc_list *plist; -+ -+ for (vlist = def->def.pr.versions; vlist != NULL; vlist = vlist->next) -+ for (plist = vlist->procs; plist != NULL; plist = plist->next) { -+ if (!newstyle || plist->arg_num < 2) -+ continue;/* old style, or single argument */ -+ print_prog_header(plist); -+ for (dl = plist->args.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ print_trailer(); -+ } -+} -+ -+ -+static void -+emit_union(definition *def) -+{ -+ declaration *dflt; -+ case_list *cl; -+ declaration *cs; -+ char *object; -+ char *vecformat = "objp->%s_u.%s"; -+ char *format = "&objp->%s_u.%s"; -+ -+ print_stat(1,&def->def.un.enum_decl); -+ f_print(fout, "\tswitch (objp->%s) {\n", def->def.un.enum_decl.name); -+ for (cl = def->def.un.cases; cl != NULL; cl = cl->next) { -+ -+ f_print(fout, "\tcase %s:\n", cl->case_name); -+ if(cl->contflag == 1) /* a continued case statement */ -+ continue; -+ cs = &cl->case_decl; -+ if (!streq(cs->type, "void")) { -+ object = alloc(strlen(def->def_name) + strlen(format) + -+ strlen(cs->name) + 1); -+ if (isvectordef (cs->type, cs->rel)) { -+ s_print(object, vecformat, def->def_name, -+ cs->name); -+ } else { -+ s_print(object, format, def->def_name, -+ cs->name); -+ } -+ print_ifstat(2, cs->prefix, cs->type, cs->rel, cs->array_max, -+ object, cs->name); -+ free(object); -+ } -+ f_print(fout, "\t\tbreak;\n"); -+ } -+ dflt = def->def.un.default_decl; -+ if (dflt != NULL) { -+ if (!streq(dflt->type, "void")) { -+ f_print(fout, "\tdefault:\n"); -+ object = alloc(strlen(def->def_name) + strlen(format) + -+ strlen(dflt->name) + 1); -+ if (isvectordef (dflt->type, dflt->rel)) { -+ s_print(object, vecformat, def->def_name, -+ dflt->name); -+ } else { -+ s_print(object, format, def->def_name, -+ dflt->name); -+ } -+ -+ print_ifstat(2, dflt->prefix, dflt->type, dflt->rel, -+ dflt->array_max, object, dflt->name); -+ free(object); -+ f_print(fout, "\t\tbreak;\n"); -+ } else { -+ /* Avoid gcc warnings about `value not handled in switch' */ -+ f_print(fout, "\tdefault:\n"); -+ f_print(fout, "\t\tbreak;\n"); -+ } -+ } else { -+ f_print(fout, "\tdefault:\n"); -+ f_print(fout, "\t\treturn (FALSE);\n"); -+ } -+ -+ f_print(fout, "\t}\n"); -+} -+ -+static void -+emit_struct(definition *def) -+{ -+ decl_list *dl; -+ int i, j, size, flag; -+ decl_list *cur = NULL, *psav; -+ bas_type *ptr; -+ char *sizestr, *plus; -+ char ptemp[256]; -+ int can_inline; -+ const char *buf_declaration; -+ -+ -+ if (Inline == 0) { -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ } else { -+ size = 0; -+ can_inline = 0; -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) { -+ -+ if (dl->decl.rel == REL_ALIAS) -+ size += ptr->length; -+ else { -+ can_inline = 1; -+ break; /* can be inlined */ -+ }; -+ } else { -+ if (size >= Inline) { -+ can_inline = 1; -+ break; /* can be inlined */ -+ } -+ size = 0; -+ } -+ if (size > Inline) -+ can_inline = 1; -+ -+ if (can_inline == 0) { /* can not inline, drop back to old mode */ -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ return; -+ }; -+ -+ -+ -+ -+ flag = PUT; -+ for (j = 0; j < 2; j++) { -+ -+ if (flag == PUT) -+ f_print(fout, "\n\t if (xdrs->x_op == XDR_ENCODE) {\n"); -+ else -+ f_print(fout, "\n \t return (TRUE);\n\t} else if (xdrs->x_op == XDR_DECODE) {\n"); -+ -+ -+ i = 0; -+ size = 0; -+ sizestr = NULL; -+ buf_declaration = "int32_t *"; -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) { /* xxx */ -+ -+ /* now walk down the list and check for basic types */ -+ if ((dl->decl.prefix == NULL) && ((ptr = find_type(dl->decl.type)) != NULL) && ((dl->decl.rel == REL_ALIAS) || (dl->decl.rel == REL_VECTOR))) { -+ if (i == 0) -+ cur = dl; -+ i++; -+ -+ if (dl->decl.rel == REL_ALIAS) -+ size += ptr->length; -+ else { -+ /* this is required to handle arrays */ -+ -+ if (sizestr == NULL) -+ plus = " "; -+ else -+ plus = "+"; -+ -+ if (ptr->length != 1) -+ s_print(ptemp, " %s %s * %d", plus, dl->decl.array_max, ptr->length); -+ else -+ s_print(ptemp, " %s %s ", plus, dl->decl.array_max); -+ -+ /*now concatenate to sizestr !!!! */ -+ if (sizestr == NULL) -+ sizestr = strdup(ptemp); -+ else { -+ sizestr = realloc(sizestr, strlen(sizestr) + strlen(ptemp) + 1); -+ if (sizestr == NULL) { -+ -+ f_print(stderr, "Fatal error : no memory \n"); -+ crash(); -+ }; -+ sizestr = strcat(sizestr, ptemp); /*build up length of array */ -+ -+ } -+ } -+ -+ } else { -+ if (i > 0) -+ { -+ if (sizestr == NULL && size < Inline) { -+ /* don't expand into inline code if size < inline */ -+ while (cur != dl) { -+ print_stat(1, &cur->decl); -+ cur = cur->next; -+ } -+ } else { -+ -+ -+ -+ /* were already looking at a xdr_inlineable structure */ -+ if (sizestr == NULL) -+ f_print(fout, "\t %sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);", -+ buf_declaration, size); -+ else if (size == 0) -+ f_print(fout, -+ "\t %sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);", -+ buf_declaration, sizestr); -+ else -+ f_print(fout, -+ "\t %sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);", -+ buf_declaration, size, sizestr); -+ buf_declaration = ""; -+ -+ f_print(fout, "\n\t if (buf == NULL) {\n"); -+ -+ psav = cur; -+ while (cur != dl) { -+ print_stat(2, &cur->decl); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\n\t }\n\t else {\n"); -+ -+ cur = psav; -+ while (cur != dl) { -+ emit_inline(&cur->decl, flag); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\t }\n"); -+ } -+ } -+ size = 0; -+ i = 0; -+ sizestr = NULL; -+ print_stat(1, &dl->decl); -+ } -+ -+ } -+ if (i > 0) -+ { -+ if (sizestr == NULL && size < Inline) { -+ /* don't expand into inline code if size < inline */ -+ while (cur != dl) { -+ print_stat(1, &cur->decl); -+ cur = cur->next; -+ } -+ } else { -+ -+ /* were already looking at a xdr_inlineable structure */ -+ if (sizestr == NULL) -+ f_print(fout, "\t\t%sbuf = XDR_INLINE(xdrs,%d * BYTES_PER_XDR_UNIT);", -+ buf_declaration, size); -+ else if (size == 0) -+ f_print(fout, -+ "\t\t%sbuf = XDR_INLINE(xdrs,%s * BYTES_PER_XDR_UNIT);", -+ buf_declaration, sizestr); -+ else -+ f_print(fout, -+ "\t\t%sbuf = XDR_INLINE(xdrs,(%d + %s)* BYTES_PER_XDR_UNIT);", -+ buf_declaration, size, sizestr); -+ buf_declaration = ""; -+ -+ f_print(fout, "\n\t\tif (buf == NULL) {\n"); -+ -+ psav = cur; -+ while (cur != NULL) { -+ print_stat(2, &cur->decl); -+ cur = cur->next; -+ } -+ f_print(fout, "\n\t }\n\t else {\n"); -+ -+ cur = psav; -+ while (cur != dl) { -+ emit_inline(&cur->decl, flag); -+ cur = cur->next; -+ } -+ -+ f_print(fout, "\t }\n"); -+ -+ } -+ } -+ flag = GET; -+ } -+ f_print(fout, "\t return(TRUE);\n\t}\n\n"); -+ -+ /* now take care of XDR_FREE case */ -+ -+ for (dl = def->def.st.decls; dl != NULL; dl = dl->next) -+ print_stat(1, &dl->decl); -+ } -+} -+ -+ -+ -+ -+static void -+emit_typedef(definition *def) -+{ -+ char *prefix = def->def.ty.old_prefix; -+ char *type = def->def.ty.old_type; -+ char *amax = def->def.ty.array_max; -+ relation rel = def->def.ty.rel; -+ -+ -+ print_ifstat(1, prefix, type, rel, amax, "objp", def->def_name); -+} -+ -+static void -+print_stat(int indent, declaration *dec) -+{ -+ char *prefix = dec->prefix; -+ char *type = dec->type; -+ char *amax = dec->array_max; -+ relation rel = dec->rel; -+ char name[256]; -+ -+ if (isvectordef(type, rel)) { -+ s_print(name, "objp->%s", dec->name); -+ } else { -+ s_print(name, "&objp->%s", dec->name); -+ } -+ print_ifstat(indent, prefix, type, rel, amax, name, dec->name); -+} -+ -+ -+static void -+emit_inline(declaration *decl, int flag) -+{ -+ -+ /*check whether an array or not */ -+ -+ switch (decl->rel) { -+ case REL_ALIAS: -+ emit_single_in_line(decl, flag, REL_ALIAS); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "\t\t{ register %s *genp; \n", decl->type); -+ f_print(fout, "\t\t int i;\n"); -+ f_print(fout, "\t\t for ( i = 0,genp=objp->%s;\n \t\t\ti < %s; i++){\n\t\t", -+ decl->name, decl->array_max); -+ emit_single_in_line(decl, flag, REL_VECTOR); -+ f_print(fout, "\t\t }\n\t\t };\n"); -+ break; -+ default: -+ break; -+ } -+} -+ -+static void -+emit_single_in_line(declaration *decl, int flag, relation rel) -+{ -+ char *upp_case; -+ int freed=0; -+ -+ if(flag == PUT) -+ f_print(fout,"\t\t (void) IXDR_PUT_"); -+ else -+ if(rel== REL_ALIAS) -+ f_print(fout,"\t\t objp->%s = IXDR_GET_",decl->name); -+ else -+ f_print(fout,"\t\t *genp++ = IXDR_GET_"); -+ -+ upp_case=upcase(decl->type); -+ -+ /* hack - XX */ -+ if(strcmp(upp_case,"INT") == 0) -+ { -+ free(upp_case); -+ freed=1; -+ upp_case="INT32"; -+ } -+ -+ if(strcmp(upp_case,"U_INT") == 0) -+ { -+ free(upp_case); -+ freed=1; -+ upp_case="U_INT32"; -+ } -+ -+ -+ if(flag == PUT) -+ if(rel== REL_ALIAS) -+ f_print(fout,"%s(buf,objp->%s);\n",upp_case,decl->name); -+ else -+ f_print(fout,"%s(buf,*genp++);\n",upp_case); -+ -+ else -+ f_print(fout,"%s(buf);\n",upp_case); -+ if(!freed) -+ free(upp_case); -+ -+} -+ -+ -+static char * -+upcase(char *str) -+{ -+ char *ptr, *hptr; -+ -+ -+ ptr = (char *) malloc(strlen(str)+1); -+ if (ptr == (char *) NULL) { -+ f_print(stderr, "malloc failed \n"); -+ exit(1); -+ }; -+ -+ hptr = ptr; -+ while (*str != '\0') -+ *ptr++ = toupper(*str++); -+ -+ *ptr = '\0'; -+ return (hptr); -+ -+} -diff --git a/rpcgen/rpc_hout.c b/rpcgen/rpc_hout.c -new file mode 100644 -index 0000000..ea1cb24 ---- /dev/null -+++ b/rpcgen/rpc_hout.c -@@ -0,0 +1,490 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_hout.c 1.12 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_hout.c, Header file outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+ -+static int undefined2(char *type, char *stop); -+static void pxdrfuncdecl(char *name, int pointerp); -+static void pconstdef(definition *def); -+static void pargdef(definition *def); -+static void pstructdef(definition *def); -+static void puniondef(definition *def); -+static void pdefine(char *name, char *num); -+static void puldefine(char *name, char *num); -+static int define_printed(proc_list *stop, version_list *start); -+static void pprogramdef(definition *def); -+static void pprocdef(proc_list *proc, version_list *vp, -+ char *addargtype, int server_p, int mode); -+static void parglist(proc_list *proc, char *addargtype); -+static void penumdef(definition *def); -+static void ptypedef(definition *def); -+ -+/* -+ * Print the C-version of an xdr definition -+ */ -+void -+print_datadef(definition *def) -+{ -+ -+ if (def->def_kind == DEF_PROGRAM ) /* handle data only */ -+ return; -+ -+ if (def->def_kind != DEF_CONST) { -+ f_print(fout, "\n"); -+ } -+ switch (def->def_kind) { -+ case DEF_STRUCT: -+ pstructdef(def); -+ break; -+ case DEF_UNION: -+ puniondef(def); -+ break; -+ case DEF_ENUM: -+ penumdef(def); -+ break; -+ case DEF_TYPEDEF: -+ ptypedef(def); -+ break; -+ case DEF_PROGRAM: -+ pprogramdef(def); -+ break; -+ case DEF_CONST: -+ pconstdef(def); -+ break; -+ } -+ if (def->def_kind != DEF_PROGRAM && def->def_kind != DEF_CONST) { -+ pxdrfuncdecl( def->def_name, -+ def->def_kind != DEF_TYPEDEF || -+ !isvectordef(def->def.ty.old_type, def->def.ty.rel)); -+ -+ } -+} -+ -+ -+void -+print_funcdef(definition *def) -+{ -+ switch (def->def_kind) { -+ case DEF_PROGRAM: -+ f_print(fout, "\n"); -+ pprogramdef(def); -+ break; -+ default: -+ break; -+ } -+} -+ -+static void -+pxdrfuncdecl(char *name, int pointerp) -+{ -+ f_print(fout, -+ "#ifdef __cplusplus \n" -+ "extern \"C\" bool_t xdr_%s(XDR *, %s%s);\n" -+ "#elif __STDC__ \n" -+ "extern bool_t xdr_%s(XDR *, %s%s);\n" -+ "#else /* Old Style C */ \n" -+ "bool_t xdr_%s();\n" -+ "#endif /* Old Style C */ \n\n", -+ name, name, pointerp ? "*" : "", -+ name, name, pointerp ? "*" : "", -+ name); -+} -+ -+ -+static void -+pconstdef(definition *def) -+{ -+ pdefine(def->def_name, def->def.co); -+} -+ -+/* print out the definitions for the arguments of functions in the -+ header file -+*/ -+static void -+pargdef(definition *def) -+{ -+ decl_list *l; -+ version_list *vers; -+ char *name; -+ proc_list *plist; -+ -+ -+ for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) { -+ for(plist = vers->procs; plist != NULL; -+ plist = plist->next) { -+ -+ if (!newstyle || plist->arg_num < 2) { -+ continue; /* old style or single args */ -+ } -+ name = plist->args.argname; -+ f_print(fout, "struct %s {\n", name); -+ for (l = plist->args.decls; -+ l != NULL; l = l->next) { -+ pdeclaration(name, &l->decl, 1, ";\n" ); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+ pxdrfuncdecl(name, 0); -+ f_print( fout, "\n" ); -+ } -+ } -+ -+} -+ -+ -+static void -+pstructdef(definition *def) -+{ -+ decl_list *l; -+ char *name = def->def_name; -+ -+ f_print(fout, "struct %s {\n", name); -+ for (l = def->def.st.decls; l != NULL; l = l->next) { -+ pdeclaration(name, &l->decl, 1, ";\n"); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+} -+ -+static void -+puniondef(definition *def) -+{ -+ case_list *l; -+ char *name = def->def_name; -+ declaration *decl; -+ -+ f_print(fout, "struct %s {\n", name); -+ decl = &def->def.un.enum_decl; -+ if (streq(decl->type, "bool")) { -+ f_print(fout, "\tbool_t %s;\n", decl->name); -+ } else { -+ f_print(fout, "\t%s %s;\n", decl->type, decl->name); -+ } -+ f_print(fout, "\tunion {\n"); -+ for (l = def->def.un.cases; l != NULL; l = l->next) { -+ if (l->contflag == 0) -+ pdeclaration(name, &l->case_decl, 2, ";\n"); -+ } -+ decl = def->def.un.default_decl; -+ if (decl && !streq(decl->type, "void")) { -+ pdeclaration(name, decl, 2, ";\n"); -+ } -+ f_print(fout, "\t} %s_u;\n", name); -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef struct %s %s;\n", name, name); -+} -+ -+static void -+pdefine(char *name, char *num) -+{ -+ f_print(fout, "#define %s %s\n", name, num); -+} -+ -+static void -+puldefine(char *name, char *num) -+{ -+ f_print(fout, "#define %s ((u_int32_t)%s)\n", name, num); -+} -+ -+static int -+define_printed(proc_list *stop, version_list *start) -+{ -+ version_list *vers; -+ proc_list *proc; -+ -+ for (vers = start; vers != NULL; vers = vers->next) { -+ for (proc = vers->procs; proc != NULL; proc = proc->next) { -+ if (proc == stop) { -+ return (0); -+ } else if (streq(proc->proc_name, stop->proc_name)) { -+ return (1); -+ } -+ } -+ } -+ abort(); -+ /* NOTREACHED */ -+} -+ -+static void -+pprogramdef(definition *def) -+{ -+ version_list *vers; -+ proc_list *proc; -+ int i; -+ char *ext; -+ -+ pargdef(def); -+ -+ puldefine(def->def_name, def->def.pr.prog_num); -+ for (vers = def->def.pr.versions; vers != NULL; vers = vers->next) { -+ if (tblflag) { -+ f_print(fout, "extern struct rpcgen_table %s_%s_table[];\n", -+ locase(def->def_name), vers->vers_num); -+ f_print(fout, "extern %s_%s_nproc;\n", -+ locase(def->def_name), vers->vers_num); -+ } -+ puldefine(vers->vers_name, vers->vers_num); -+ -+ /* -+ * Print out 3 definitions, one for ANSI-C, another for C++, -+ * a third for old style C -+ */ -+ -+ for (i = 0; i < 3; i++) { -+ if (i == 0) { -+ f_print(fout, "\n#ifdef __cplusplus\n"); -+ ext = "extern \"C\" "; -+ } else if (i == 1) { -+ f_print(fout, "\n#elif __STDC__\n"); -+ ext = "extern "; -+ } else { -+ f_print(fout, "\n#else /* Old Style C */ \n"); -+ ext = "extern "; -+ } -+ -+ -+ for (proc = vers->procs; proc != NULL; proc = proc->next) { -+ if (!define_printed(proc, def->def.pr.versions)) { -+ puldefine(proc->proc_name, proc->proc_num); -+ } -+ f_print(fout, "%s", ext); -+ pprocdef(proc, vers, "CLIENT *", 0, i); -+ f_print(fout, "%s", ext); -+ pprocdef(proc, vers, "struct svc_req *", 1, i); -+ -+ } -+ -+ } -+ f_print(fout, "#endif /* Old Style C */ \n"); -+ } -+} -+ -+static void -+pprocdef(proc_list *proc, version_list *vp, char *addargtype, -+ int server_p, int mode) -+{ -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, "* "); -+ if (server_p) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ -+ /* -+ * mode 0 == cplusplus, mode 1 = ANSI-C, mode 2 = old style C -+ */ -+ if (mode == 0 || mode == 1) -+ parglist(proc, addargtype); -+ else -+ f_print(fout, "();\n"); -+} -+ -+ -+ -+/* print out argument list of procedure */ -+static void -+parglist(proc_list *proc, char *addargtype) -+{ -+ decl_list *dl; -+ -+ f_print(fout, "("); -+ -+ if (proc->arg_num < 2 && newstyle && -+ streq(proc->args.decls->decl.type, "void")) { -+ /* 0 argument in new style: do nothing */ -+ } else { -+ for (dl = proc->args.decls; dl != NULL; dl = dl->next) { -+ ptype(dl->decl.prefix, dl->decl.type, 1); -+ if (!newstyle) -+ f_print(fout, "*"); /* old style passes by reference */ -+ -+ f_print(fout, ", "); -+ } -+ } -+ -+ f_print(fout, "%s);\n", addargtype); -+} -+ -+static void -+penumdef(definition *def) -+{ -+ char *name = def->def_name; -+ enumval_list *l; -+ char *last = NULL; -+ int count = 0; -+ -+ f_print(fout, "enum %s {\n", name); -+ for (l = def->def.en.vals; l != NULL; l = l->next) { -+ f_print(fout, "\t%s", l->name); -+ if (l->assignment) { -+ f_print(fout, " = %s", l->assignment); -+ last = l->assignment; -+ count = 1; -+ } else { -+ if (last == NULL) { -+ f_print(fout, " = %d", count++); -+ } else { -+ f_print(fout, " = %s + %d", last, count++); -+ } -+ } -+ f_print(fout, ",\n"); -+ } -+ f_print(fout, "};\n"); -+ f_print(fout, "typedef enum %s %s;\n", name, name); -+} -+ -+static void -+ptypedef(definition *def) -+{ -+ char *name = def->def_name; -+ char *old = def->def.ty.old_type; -+ char prefix[8]; /* enough to contain "struct ", including NUL */ -+ relation rel = def->def.ty.rel; -+ -+ -+ if (!streq(name, old)) { -+ if (streq(old, "string")) { -+ old = "char"; -+ rel = REL_POINTER; -+ } else if (streq(old, "opaque")) { -+ old = "char"; -+ } else if (streq(old, "bool")) { -+ old = "bool_t"; -+ } -+ if (undefined2(old, name) && def->def.ty.old_prefix) { -+ s_print(prefix, "%s ", def->def.ty.old_prefix); -+ } else { -+ prefix[0] = 0; -+ } -+ f_print(fout, "typedef "); -+ switch (rel) { -+ case REL_ARRAY: -+ f_print(fout, "struct {\n"); -+ f_print(fout, "\tu_int %s_len;\n", name); -+ f_print(fout, "\t%s%s *%s_val;\n", prefix, old, name); -+ f_print(fout, "} %s", name); -+ break; -+ case REL_POINTER: -+ f_print(fout, "%s%s *%s", prefix, old, name); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "%s%s %s[%s]", prefix, old, name, -+ def->def.ty.array_max); -+ break; -+ case REL_ALIAS: -+ f_print(fout, "%s%s %s", prefix, old, name); -+ break; -+ } -+ f_print(fout, ";\n"); -+ } -+} -+ -+void -+pdeclaration(char *name, declaration *dec, int tab, char *separator) -+{ -+ char buf[8]; /* enough to hold "struct ", include NUL */ -+ char *prefix; -+ char *type; -+ -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ tabify(fout, tab); -+ if (streq(dec->type, name) && !dec->prefix) { -+ f_print(fout, "struct "); -+ } -+ if (streq(dec->type, "string")) { -+ f_print(fout, "char *%s", dec->name); -+ } else { -+ prefix = ""; -+ if (streq(dec->type, "bool")) { -+ type = "bool_t"; -+ } else if (streq(dec->type, "opaque")) { -+ type = "char"; -+ } else { -+ if (dec->prefix) { -+ s_print(buf, "%s ", dec->prefix); -+ prefix = buf; -+ } -+ type = dec->type; -+ } -+ switch (dec->rel) { -+ case REL_ALIAS: -+ f_print(fout, "%s%s %s", prefix, type, dec->name); -+ break; -+ case REL_VECTOR: -+ f_print(fout, "%s%s %s[%s]", prefix, type, dec->name, -+ dec->array_max); -+ break; -+ case REL_POINTER: -+ f_print(fout, "%s%s *%s", prefix, type, dec->name); -+ break; -+ case REL_ARRAY: -+ f_print(fout, "struct {\n"); -+ tabify(fout, tab); -+ f_print(fout, "\tu_int %s_len;\n", dec->name); -+ tabify(fout, tab); -+ f_print(fout, "\t%s%s *%s_val;\n", prefix, type, dec->name); -+ tabify(fout, tab); -+ f_print(fout, "} %s", dec->name); -+ break; -+ } -+ } -+ f_print(fout, separator ); -+} -+ -+static int -+undefined2(char *type, char *stop) -+{ -+ list *l; -+ definition *def; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ if (streq(def->def_name, stop)) { -+ return (1); -+ } else if (streq(def->def_name, type)) { -+ return (0); -+ } -+ } -+ } -+ return (1); -+} -diff --git a/rpcgen/rpc_main.c b/rpcgen/rpc_main.c -new file mode 100644 -index 0000000..28aa60c ---- /dev/null -+++ b/rpcgen/rpc_main.c -@@ -0,0 +1,1067 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_main.c 1.30 89/03/30 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_main.c, Top level of the RPC protocol compiler. -+ */ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_scan.h" -+ -+struct commandline { -+ int cflag; /* xdr C routines */ -+ int hflag; /* header file */ -+ int lflag; /* client side stubs */ -+ int mflag; /* server side stubs */ -+ int nflag; /* netid flag */ -+ int sflag; /* server stubs for the given transport */ -+ int tflag; /* dispatch Table file */ -+ int Ssflag; /* produce server sample code */ -+ int Scflag; /* produce client sample code */ -+ char *infile; /* input module name */ -+ char *outfile; /* output module name */ -+}; -+ -+static char * extendfile(char *file, char *ext); -+static void open_output(char *infile, char *outfile); -+static void add_warning(void); -+static void clear_args(void); -+static void open_input(char *infile, char *define); -+static int check_nettype(char *name, char **list_to_check); -+static void c_output(char *infile, char *define, int extend, char *outfile); -+static void c_initialize(void); -+static char * generate_guard(char *pathname); -+static void h_output(char *infile, char *define, int extend, char *outfile); -+static void s_output(int argc, char **argv, char *infile, -+ char *define, int extend, char *outfile, -+ int nomain, int netflag); -+static void l_output(char *infile, char *define, int extend, char *outfile); -+static void t_output(char *infile, char *define, int extend, char *outfile); -+static void svc_output(char *, char *, int, char *); -+static void clnt_output(char *, char *, int, char *); -+static int do_registers(int argc, char **argv); -+static void addarg(char *cp); -+static void putarg(int where, char *cp); -+static void checkfiles(char *infile, char *outfile); -+static int parseargs(int argc, char **argv, struct commandline *cmd); -+static void usage(void); -+static void options_usage(void); -+ -+/* -+extern void write_sample_svc(); -+int write_sample_clnt(); -+void write_sample_clnt_main(); -+ -+static svc_output(); -+ */ -+ -+#define EXTEND 1 /* alias for TRUE */ -+#define DONT_EXTEND 0 /* alias for FALSE */ -+ -+#define SVR4_CPP "/usr/ccs/lib/cpp" -+#define SUNOS_CPP "/lib/cpp" -+static int cppDefined = 0; /* explicit path for C preprocessor */ -+ -+ -+static char *cmdname; -+ -+static char *svcclosetime = "120"; -+static char *CPP = SVR4_CPP; -+static char CPPFLAGS[] = "-C"; -+static char pathbuf[MAXPATHLEN + 1]; -+static char *allv[] = { -+ "rpcgen", "-s", "udp", "-s", "tcp", -+}; -+static int allc = sizeof(allv)/sizeof(allv[0]); -+static char *allnv[] = { -+ "rpcgen", "-s", "netpath", -+}; -+static int allnc = sizeof(allnv)/sizeof(allnv[0]); -+ -+/* -+ * machinations for handling expanding argument list -+ */ -+#if 0 -+static void addarg(); /* add another argument to the list */ -+static void putarg(); /* put argument at specified location */ -+static void clear_args(); /* clear argument list */ -+static void checkfiles(); /* check if out file already exists */ -+#endif -+ -+ -+ -+#define ARGLISTLEN 20 -+#define FIXEDARGS 2 -+ -+static char *arglist[ARGLISTLEN]; -+static int argcount = FIXEDARGS; -+ -+ -+int nonfatalerrors; /* errors */ -+int inetdflag/* = 1*/; /* Support for inetd */ /* is now the default */ -+int pmflag; /* Support for port monitors */ -+int logflag; /* Use syslog instead of fprintf for errors */ -+int tblflag; /* Support for dispatch table file */ -+ -+/* length at which to start doing an inline */ -+#define INLINE 3 -+ -+int Inline = INLINE; /* length at which to start doing an inline. 3 = default -+ * if 0, no xdr_inline code */ -+ -+int indefinitewait; /* If started by port monitors, hang till it wants */ -+int exitnow; /* If started by port monitors, exit after the call */ -+int timerflag; /* TRUE if !indefinite && !exitnow */ -+int newstyle; /* newstyle of passing arguments (by value) */ -+int Cflag = 0 ; /* ANSI C syntax */ -+static int allfiles; /* generate all files */ -+#ifdef linux -+int tirpcflag = 0; /* no tirpc by default */ -+#else -+int tirpcflag = 1; /* generating code for tirpc, by default */ -+#endif -+ -+int -+main(int argc, char **argv) -+{ -+ struct commandline cmd; -+ -+ (void) memset((char *) &cmd, 0, sizeof(struct commandline)); -+ clear_args(); -+ if (!parseargs(argc, argv, &cmd)) -+ usage(); -+ -+ if (cmd.cflag || cmd.hflag || cmd.lflag || cmd.tflag || cmd.sflag || -+ cmd.mflag || cmd.nflag || cmd.Ssflag || cmd.Scflag) { -+ checkfiles(cmd.infile, cmd.outfile); -+ } else -+ checkfiles(cmd.infile, NULL); -+ -+ if (cmd.cflag) { -+ c_output(cmd.infile, "-DRPC_XDR", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.hflag) { -+ h_output(cmd.infile, "-DRPC_HDR", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.lflag) { -+ l_output(cmd.infile, "-DRPC_CLNT", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.sflag || cmd.mflag || (cmd.nflag)) { -+ s_output(argc, argv, cmd.infile, "-DRPC_SVC", DONT_EXTEND, -+ cmd.outfile, cmd.mflag, cmd.nflag); -+ } else if (cmd.tflag) { -+ t_output(cmd.infile, "-DRPC_TBL", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.Ssflag) { -+ svc_output(cmd.infile, "-DRPC_SERVER", DONT_EXTEND, cmd.outfile); -+ } else if (cmd.Scflag) { -+ clnt_output(cmd.infile, "-DRPC_CLIENT", DONT_EXTEND, cmd.outfile); -+ } else { -+ /* the rescans are required, since cpp may effect input */ -+ c_output(cmd.infile, "-DRPC_XDR", EXTEND, "_xdr.c"); -+ reinitialize(); -+ h_output(cmd.infile, "-DRPC_HDR", EXTEND, ".h"); -+ reinitialize(); -+ l_output(cmd.infile, "-DRPC_CLNT", EXTEND, "_clnt.c"); -+ reinitialize(); -+ if (inetdflag || !tirpcflag) -+ s_output(allc, allv, cmd.infile, "-DRPC_SVC", EXTEND, -+ "_svc.c", cmd.mflag, cmd.nflag); -+ else -+ s_output(allnc, allnv, cmd.infile, "-DRPC_SVC", -+ EXTEND, "_svc.c", cmd.mflag, cmd.nflag); -+ if (tblflag) { -+ reinitialize(); -+ t_output(cmd.infile, "-DRPC_TBL", EXTEND, "_tbl.i"); -+ } -+ if (allfiles) { -+ reinitialize(); -+ svc_output(cmd.infile, "-DRPC_SERVER", EXTEND, "_server.c"); -+ } -+ if (allfiles) { -+ reinitialize(); -+ clnt_output(cmd.infile, "-DRPC_CLIENT", EXTEND, "_client.c"); -+ } -+ } -+ exit(nonfatalerrors); -+ /* NOTREACHED */ -+} -+ -+/* -+ * add extension to filename -+ */ -+static char * -+extendfile(char *file, char *ext) -+{ -+ char *res; -+ char *p; -+ -+ res = alloc(strlen(file) + strlen(ext) + 1); -+ if (res == NULL) { -+ abort(); -+ } -+ p = strrchr(file, '.'); -+ if (p == NULL) { -+ p = file + strlen(file); -+ } -+ (void) strcpy(res, file); -+ (void) strcpy(res + (p - file), ext); -+ return (res); -+} -+ -+/* -+ * Open output file with given extension -+ */ -+static void -+open_output(char *infile, char *outfile) -+{ -+ -+ if (outfile == NULL) { -+ fout = stdout; -+ return; -+ } -+ -+ if (infile != NULL && streq(outfile, infile)) { -+ f_print(stderr, "%s: output would overwrite %s\n", cmdname, -+ infile); -+ crash(); -+ } -+ fout = fopen(outfile, "w"); -+ if (fout == NULL) { -+ f_print(stderr, "%s: unable to open ", cmdname); -+ perror(outfile); -+ crash(); -+ } -+ record_open(outfile); -+ -+} -+ -+static void -+add_warning(void) -+{ -+ f_print(fout, "/*\n"); -+ f_print(fout, " * Please do not edit this file.\n"); -+ f_print(fout, " * It was generated using rpcgen.\n"); -+ f_print(fout, " */\n\n"); -+} -+ -+/* clear list of arguments */ -+static void -+clear_args(void) -+{ -+ int i; -+ for( i=FIXEDARGS; i" : infile; -+ (void) pipe(pd); -+ switch (fork()) { -+ case 0: -+ putarg(0, "cpp"); -+ putarg(1, CPPFLAGS); -+ addarg(define); -+ addarg(infile); -+ addarg((char *)NULL); -+ (void) close(1); -+ (void) dup2(pd[1], 1); -+ (void) close(pd[0]); -+ if (cppDefined) -+ execv(CPP, arglist); -+ else { -+ execvp("cpp", arglist); -+ if (errno == ENOENT) -+ execvp(SVR4_CPP, arglist); -+ if (errno == ENOENT) -+ execvp(SUNOS_CPP, arglist); -+ } -+ perror("execv"); -+ exit(1); -+ case -1: -+ perror("fork"); -+ exit(1); -+ } -+ (void) close(pd[1]); -+ fin = fdopen(pd[0], "r"); -+ if (fin == NULL) { -+ f_print(stderr, "%s: ", cmdname); -+ perror(infilename); -+ crash(); -+ } -+} -+ -+/* valid tirpc nettypes */ -+static char* valid_ti_nettypes[] = -+{ -+ "netpath", -+ "visible", -+ "circuit_v", -+ "datagram_v", -+ "circuit_n", -+ "datagram_n", -+ "udp", -+ "tcp", -+ "raw", -+ NULL -+}; -+ -+/* valid inetd nettypes */ -+static char* valid_i_nettypes[] = -+{ -+ "udp", -+ "tcp", -+ NULL -+}; -+ -+static int -+check_nettype(char *name, char **list_to_check) -+{ -+ int i; -+ for( i = 0; list_to_check[i] != NULL; i++ ) { -+ if( strcmp( name, list_to_check[i] ) == 0 ) { -+ return 1; -+ } -+ } -+ f_print( stderr, "illegal nettype :\'%s\'\n", name ); -+ return 0; -+} -+ -+/* -+ * Compile into an XDR routine output file -+ */ -+ -+static void -+c_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ -+ c_initialize(); -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ /* .h file already contains rpc/rpc.h */ -+ } else -+ f_print(fout, "#include \n"); -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ emit(def); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+ -+static void -+c_initialize(void) -+{ -+ -+ /* add all the starting basic types */ -+ -+ add_type(1,"int"); -+ add_type(1,"int32_t"); -+ add_type(1,"short"); -+ add_type(1,"bool"); -+ -+ add_type(1,"u_int"); -+ add_type(1,"u_int32_t"); -+ add_type(1,"u_short"); -+ -+} -+ -+char rpcgen_table_dcl[] = "struct rpcgen_table {\n\ -+ char *(*proc)();\n\ -+ xdrproc_t xdr_arg;\n\ -+ unsigned len_arg;\n\ -+ xdrproc_t xdr_res;\n\ -+ unsigned len_res;\n\ -+};\n"; -+ -+ -+static char * -+generate_guard(char *pathname) -+{ -+ char* filename, *guard, *tmp; -+ -+ filename = strrchr(pathname, '/' ); /* find last component */ -+ filename = ((filename == 0) ? pathname : filename+1); -+ guard = strdup(filename); -+ /* convert to upper case */ -+ tmp = guard; -+ while (*tmp) { -+ if (islower(*tmp)) -+ *tmp = toupper(*tmp); -+ tmp++; -+ } -+ -+ guard = extendfile(guard, "_H_RPCGEN"); -+ return( guard ); -+} -+ -+/* -+ * Compile into an XDR header file -+ */ -+static void -+h_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *outfilename; -+ long tell; -+ char *guard; -+ list *l; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ guard = generate_guard( outfilename ? outfilename: infile ); -+ -+ f_print(fout,"#ifndef _%s\n#define _%s\n\n", guard, -+ guard); -+ -+ f_print(fout, "#include \n\n"); -+ -+ f_print(fout, "#ifndef IXDR_GET_INT32\n"); -+ f_print(fout, "#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_PUT_INT32\n"); -+ f_print(fout, "#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_GET_U_INT32\n"); -+ f_print(fout, "#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf))\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "#ifndef IXDR_PUT_U_INT32\n"); -+ f_print(fout, "#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v))\n"); -+ f_print(fout, "#endif\n"); -+ -+ tell = ftell(fout); -+ /* print data definitions */ -+ while ((def = get_definition()) != NULL) { -+ print_datadef(def); -+ } -+ -+ /* print function declarations. -+ Do this after data definitions because they might be used as -+ arguments for functions */ -+ for (l = defined; l != NULL; l = l->next) { -+ print_funcdef(l->val); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } else if (tblflag) { -+ f_print(fout, rpcgen_table_dcl); -+ } -+ f_print(fout, "\n#endif /* !_%s */\n", guard); -+} -+ -+/* -+ * Compile into an RPC service -+ */ -+static void -+s_output(int argc, char **argv, char *infile, char *define, int extend, -+ char *outfile, int nomain, int netflag) -+{ -+ char *include; -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ -+ f_print(fout, "#include \n"); -+ f_print(fout, "#include /* getenv, exit */\n"); -+ if (Cflag) { -+ f_print (fout, "#include /* for pmap_unset */\n"); -+ f_print (fout, "#include /* strcmp */ \n"); -+ } -+ if (strcmp(svcclosetime, "-1") == 0) -+ indefinitewait = 1; -+ else if (strcmp(svcclosetime, "0") == 0) -+ exitnow = 1; -+ else if (inetdflag || pmflag) { -+ f_print(fout, "#include \n"); -+ timerflag = 1; -+ } -+ -+#ifndef linux -+ if( !tirpcflag && inetdflag ) -+ f_print(fout, "#include /* TIOCNOTTY */\n"); -+#else -+ if( !tirpcflag ) -+ f_print(fout, "#include /* TIOCNOTTY */\n"); -+#endif -+ if( Cflag && (inetdflag || pmflag ) ) { -+ f_print(fout, "#ifdef __cplusplus\n"); -+ f_print(fout, "#include /* getdtablesize, open */\n"); -+ f_print(fout, "#endif /* __cplusplus */\n"); -+ -+ if( tirpcflag ) -+ f_print(fout, "#include /* setsid */\n"); -+ } -+ if( tirpcflag ) -+ f_print(fout, "#include \n"); -+ -+ f_print(fout, "#include \n"); -+#ifndef linux -+ f_print(fout, "#include \n"); -+#endif -+ if (inetdflag || !tirpcflag ) { -+ f_print(fout, "#include \n"); -+ f_print(fout, "#include \n"); -+ } -+ -+ if ( (netflag || pmflag) && tirpcflag ) { -+ f_print(fout, "#include \n"); -+ } -+ if (/*timerflag &&*/ tirpcflag) -+ f_print(fout, "#include /* rlimit */\n"); -+ if (logflag || inetdflag || pmflag) { -+#ifdef linux -+ f_print(fout, "#include \n"); -+#else -+ f_print(fout, "#ifdef SYSLOG\n"); -+ f_print(fout, "#include \n"); -+ f_print(fout, "#else\n"); -+ f_print(fout, "#define LOG_ERR 1\n"); -+ f_print(fout, "#define openlog(a, b, c)\n"); -+ f_print(fout, "#endif\n"); -+#endif -+ } -+ -+ /* for ANSI-C */ -+ f_print(fout, "\n#ifdef __STDC__\n#define SIG_PF void(*)(int)\n#endif\n"); -+ -+ f_print(fout, "\n#ifdef DEBUG\n#define RPC_SVC_FG\n#endif\n"); -+ if (timerflag) -+ f_print(fout, "\n#define _RPCSVC_CLOSEDOWN %s\n", svcclosetime); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_most(infile, netflag, nomain); -+ if (!nomain) { -+ if( !do_registers(argc, argv) ) { -+ if (outfilename) -+ (void) unlink(outfilename); -+ usage(); -+ } -+ write_rest(); -+ } -+} -+ -+/* -+ * generate client side stubs -+ */ -+static void -+l_output(char *infile, char *define, int extend, char *outfile) -+{ -+ char *include; -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ if (Cflag) -+ f_print (fout, "#include /* for memset */\n"); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_stubs(); -+} -+ -+/* -+ * generate the dispatch table -+ */ -+static void -+t_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ int foundprogram = 0; -+ char *outfilename; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ open_output(infile, outfilename); -+ add_warning(); -+ while ((def = get_definition()) != NULL) { -+ foundprogram |= (def->def_kind == DEF_PROGRAM); -+ } -+ if (extend && !foundprogram) { -+ (void) unlink(outfilename); -+ return; -+ } -+ write_tables(); -+} -+ -+/* sample routine for the server template */ -+static void -+svc_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ checkfiles(infile,outfilename); /*check if outfile already exists. -+ if so, print an error message and exit*/ -+ open_output(infile, outfilename); -+ add_sample_msg(); -+ -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ write_sample_svc(def); -+ } -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+ -+/* sample main routine for client */ -+static void -+clnt_output(char *infile, char *define, int extend, char *outfile) -+{ -+ definition *def; -+ char *include; -+ char *outfilename; -+ long tell; -+ int has_program = 0; -+ -+ open_input(infile, define); -+ outfilename = extend ? extendfile(infile, outfile) : outfile; -+ checkfiles(infile, outfilename); /*check if outfile already exists. -+ if so, print an error message and exit*/ -+ -+ open_output(infile, outfilename); -+ add_sample_msg(); -+ if (infile && (include = extendfile(infile, ".h"))) { -+ f_print(fout, "#include \"%s\"\n", include); -+ free(include); -+ } else -+ f_print(fout, "#include \n"); -+ tell = ftell(fout); -+ while ((def = get_definition()) != NULL) { -+ has_program += write_sample_clnt(def); -+ } -+ -+ if (has_program) -+ write_sample_clnt_main(); -+ -+ if (extend && tell == ftell(fout)) { -+ (void) unlink(outfilename); -+ } -+} -+ -+/* -+ * Perform registrations for service output -+ * Return 0 if failed; 1 otherwise. -+ */ -+static int -+do_registers(int argc, char **argv) -+{ -+ int i; -+ -+ if (inetdflag || !tirpcflag) { -+ for (i = 1; i < argc; i++) { -+ if (streq(argv[i], "-s")) { -+ if (!check_nettype(argv[i + 1], valid_i_nettypes)) -+ return 0; -+ write_inetd_register(argv[i + 1]); -+ i++; -+ } -+ } -+ } else { -+ for (i = 1; i < argc; i++) -+ if (streq(argv[i], "-s")) { -+ if (!check_nettype(argv[i + 1], valid_ti_nettypes)) -+ return 0; -+ write_nettype_register(argv[i + 1]); -+ i++; -+ } else if (streq(argv[i], "-n")) { -+ write_netid_register(argv[i + 1]); -+ i++; -+ } -+ } -+ return 1; -+} -+ -+/* -+ * Add another argument to the arg list -+ */ -+static void -+addarg(char *cp) -+{ -+ if (argcount >= ARGLISTLEN) { -+ f_print(stderr, "rpcgen: too many defines\n"); -+ crash(); -+ /*NOTREACHED*/ -+ } -+ arglist[argcount++] = cp; -+ -+} -+ -+static void -+putarg(int where, char *cp) -+{ -+ if (where >= ARGLISTLEN) { -+ f_print(stderr, "rpcgen: arglist coding error\n"); -+ crash(); -+ /*NOTREACHED*/ -+ } -+ arglist[where] = cp; -+ -+} -+ -+/* -+ * if input file is stdin and an output file is specified then complain -+ * if the file already exists. Otherwise the file may get overwritten -+ * If input file does not exist, exit with an error -+ */ -+ -+static void -+checkfiles(char *infile, char *outfile) -+{ -+ -+ struct stat buf; -+ -+ if(infile) /* infile ! = NULL */ -+ if(stat(infile,&buf) < 0) -+ { -+ perror(infile); -+ crash(); -+ }; -+ if (outfile) { -+ if (stat(outfile, &buf) < 0) -+ return; /* file does not exist */ -+ else { -+ f_print(stderr, -+ "file '%s' already exists and may be overwritten\n", outfile); -+ crash(); -+ } -+ } -+} -+ -+/* -+ * Parse command line arguments -+ */ -+static int -+parseargs(int argc, char **argv, struct commandline *cmd) -+{ -+ int i; -+ int j; -+ char c; -+ char flag[(1 << 8 * sizeof(char))]; -+ int nflags; -+ -+ cmdname = argv[0]; -+ cmd->infile = cmd->outfile = NULL; -+ if (argc < 2) { -+ return (0); -+ } -+ allfiles = 0; -+ flag['c'] = 0; -+ flag['h'] = 0; -+ flag['l'] = 0; -+ flag['m'] = 0; -+ flag['o'] = 0; -+ flag['s'] = 0; -+ flag['n'] = 0; -+ flag['t'] = 0; -+ flag['S'] = 0; -+ flag['C'] = 0; -+ for (i = 1; i < argc; i++) { -+ if (argv[i][0] != '-') { -+ if (cmd->infile) { -+ f_print( stderr, "Cannot specify more than one input file!\n"); -+ -+ return (0); -+ } -+ cmd->infile = argv[i]; -+ } else { -+ for (j = 1; argv[i][j] != 0; j++) { -+ c = argv[i][j]; -+ switch (c) { -+ case 'a': -+ allfiles = 1; -+ break; -+ case 'c': -+ case 'h': -+ case 'l': -+ case 'm': -+ case 't': -+ if (flag[(int) c]) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ break; -+ case 'S': -+ /* sample flag: Ss or Sc. -+ Ss means set flag['S']; -+ Sc means set flag['C']; */ -+ c = argv[i][++j]; /* get next char */ -+ if( c == 's' ) -+ c = 'S'; -+ else if( c == 'c' ) -+ c = 'C'; -+ else -+ return( 0 ); -+ -+ if (flag[(int) c]) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ break; -+ case 'C': /* ANSI C syntax */ -+ Cflag = 1; -+ break; -+ -+ case 'b': /* turn TIRPC flag off for -+ generating backward compatible -+ */ -+ tirpcflag = 0; -+ break; -+ -+ case 'I': -+ inetdflag = 1; -+ break; -+ case 'N': -+ newstyle = 1; -+ break; -+ case 'L': -+ logflag = 1; -+ break; -+ case 'K': -+ if (++i == argc) { -+ return (0); -+ } -+ svcclosetime = argv[i]; -+ goto nextarg; -+ case 'T': -+ tblflag = 1; -+ break; -+ case 'i' : -+ if (++i == argc) { -+ return (0); -+ } -+ Inline = atoi(argv[i]); -+ goto nextarg; -+ case 'n': -+ case 'o': -+ case 's': -+ if (argv[i][j - 1] != '-' || -+ argv[i][j + 1] != 0) { -+ return (0); -+ } -+ flag[(int) c] = 1; -+ if (++i == argc) { -+ return (0); -+ } -+ if (c == 's') { -+ if (!streq(argv[i], "udp") && -+ !streq(argv[i], "tcp")) { -+ return (0); -+ } -+ } else if (c == 'o') { -+ if (cmd->outfile) { -+ return (0); -+ } -+ cmd->outfile = argv[i]; -+ } -+ goto nextarg; -+ case 'D': -+ if (argv[i][j - 1] != '-') { -+ return (0); -+ } -+ (void) addarg(argv[i]); -+ goto nextarg; -+ case 'Y': -+ if (++i == argc) { -+ return (0); -+ } -+ (void) strcpy(pathbuf, argv[i]); -+ (void) strcat(pathbuf, "/cpp"); -+ CPP = pathbuf; -+ cppDefined = 1; -+ goto nextarg; -+ -+ -+ -+ default: -+ return (0); -+ } -+ } -+ nextarg: -+ ; -+ } -+ } -+ -+ cmd->cflag = flag['c']; -+ cmd->hflag = flag['h']; -+ cmd->lflag = flag['l']; -+ cmd->mflag = flag['m']; -+ cmd->nflag = flag['n']; -+ cmd->sflag = flag['s']; -+ cmd->tflag = flag['t']; -+ cmd->Ssflag = flag['S']; -+ cmd->Scflag = flag['C']; -+ -+ if( tirpcflag ) { -+ pmflag = inetdflag ? 0 : 1; /* pmflag or inetdflag is always TRUE */ -+ if( (inetdflag && cmd->nflag)) { /* netid not allowed with inetdflag */ -+ f_print(stderr, "Cannot use netid flag with inetd flag!\n"); -+ return (0); -+ } -+ } else { /* 4.1 mode */ -+ pmflag = 0; /* set pmflag only in tirpcmode */ -+ inetdflag = 1; /* inetdflag is TRUE by default */ -+ if( cmd->nflag ) { /* netid needs TIRPC */ -+ f_print( stderr, "Cannot use netid flag without TIRPC!\n"); -+ return( 0 ); -+ } -+ } -+ -+ if( newstyle && ( tblflag || cmd->tflag) ) { -+ f_print( stderr, "Cannot use table flags with newstyle!\n"); -+ return( 0 ); -+ } -+ -+ /* check no conflicts with file generation flags */ -+ nflags = cmd->cflag + cmd->hflag + cmd->lflag + cmd->mflag + -+ cmd->sflag + cmd->nflag + cmd->tflag + cmd->Ssflag + cmd->Scflag; -+ -+ if (nflags == 0) { -+ if (cmd->outfile != NULL || cmd->infile == NULL) { -+ return (0); -+ } -+ } else if (nflags > 1) { -+ f_print( stderr, "Cannot have more than one file generation flag!\n"); -+ return (0); -+ } -+ return (1); -+} -+ -+static void -+usage(void) -+{ -+ f_print(stderr, "usage: %s infile\n", cmdname); -+ f_print(stderr, "\t%s [-a][-b][-C][-Dname[=value]] -i size [-I [-K seconds]] [-L][-N][-T] infile\n", -+ cmdname); -+ f_print(stderr, "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss] [-o outfile] [infile]\n", -+ cmdname); -+ f_print(stderr, "\t%s [-s nettype]* [-o outfile] [infile]\n", cmdname); -+ f_print(stderr, "\t%s [-n netid]* [-o outfile] [infile]\n", cmdname); -+ options_usage(); -+ exit(1); -+} -+ -+static void -+options_usage(void) -+{ -+ f_print(stderr, "options:\n"); -+ f_print(stderr, "-a\t\tgenerate all files, including samples\n"); -+ f_print(stderr, "-b\t\tbackward compatibility mode (generates code for SunOS 4.1)\n"); -+ f_print(stderr, "-c\t\tgenerate XDR routines\n"); -+ f_print(stderr, "-C\t\tANSI C mode\n"); -+ f_print(stderr, "-Dname[=value]\tdefine a symbol (same as #define)\n"); -+ f_print(stderr, "-h\t\tgenerate header file\n"); -+ f_print(stderr, "-i size\t\tsize at which to start generating inline code\n"); -+ f_print(stderr, "-I\t\tgenerate code for inetd support in server (for SunOS 4.1)\n"); -+ f_print(stderr, "-K seconds\tserver exits after K seconds of inactivity\n"); -+ f_print(stderr, "-l\t\tgenerate client side stubs\n"); -+ f_print(stderr, "-L\t\tserver errors will be printed to syslog\n"); -+ f_print(stderr, "-m\t\tgenerate server side stubs\n"); -+ f_print(stderr, "-n netid\tgenerate server code that supports named netid\n"); -+ f_print(stderr, "-N\t\tsupports multiple arguments and call-by-value\n"); -+ f_print(stderr, "-o outfile\tname of the output file\n"); -+ f_print(stderr, "-s nettype\tgenerate server code that supports named nettype\n"); -+ f_print(stderr, "-Sc\t\tgenerate sample client code that uses remote procedures\n"); -+ f_print(stderr, "-Ss\t\tgenerate sample server code that defines remote procedures\n"); -+ f_print(stderr, "-t\t\tgenerate RPC dispatch table\n"); -+ f_print(stderr, "-T\t\tgenerate code to support RPC dispatch tables\n"); -+ f_print(stderr, "-Y path\t\tdirectory name to find C preprocessor (cpp)\n"); -+ -+ exit(1); -+} -diff --git a/rpcgen/rpc_output.h b/rpcgen/rpc_output.h -new file mode 100644 -index 0000000..eb25a60 ---- /dev/null -+++ b/rpcgen/rpc_output.h -@@ -0,0 +1,16 @@ -+/* -+ * rpc_output.h -+ * -+ * Declarations for output functions -+ * -+ */ -+ -+#ifndef RPCGEN_NEW_OUTPUT_H -+#define RPCGEN_NEW_OUTPUT_H -+ -+void write_msg_out(void); -+int nullproc(proc_list *); -+void printarglist(proc_list *, char *, char *); -+void pdeclaration(char *, declaration *, int, char *); -+ -+#endif /* RPCGEN_NEW_OUTPUT_H */ -diff --git a/rpcgen/rpc_parse.c b/rpcgen/rpc_parse.c -new file mode 100644 -index 0000000..b53a553 ---- /dev/null -+++ b/rpcgen/rpc_parse.c -@@ -0,0 +1,609 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_parse.c 1.8 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_parse.c, Parser for the RPC protocol compiler -+ * Copyright (C) 1987 Sun Microsystems, Inc. -+ */ -+#include -+#include -+#include "rpc/types.h" -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+#define ARGNAME "arg" -+ -+/* -+extern char *make_argname(); -+extern char *strdup(); -+ */ -+ -+static void isdefined(definition *defp); -+static void def_struct(definition *defp); -+static void def_program(definition *defp); -+static void def_enum(definition *defp); -+static void def_const(definition *defp); -+static void def_union(definition *defp); -+static void check_type_name(char *name, int new_type); -+static void def_typedef(definition *defp); -+static void get_declaration(declaration *dec, defkind dkind); -+static void get_prog_declaration(declaration *dec, defkind dkind, int num); -+static void get_type(char **prefixp, char **typep, defkind dkind); -+static void unsigned_dec(char **typep); -+ -+/* -+ * return the next definition you see -+ */ -+definition * -+get_definition(void) -+{ -+ definition *defp; -+ token tok; -+ -+ defp = ALLOC(definition); -+ get_token(&tok); -+ switch (tok.kind) { -+ case TOK_STRUCT: -+ def_struct(defp); -+ break; -+ case TOK_UNION: -+ def_union(defp); -+ break; -+ case TOK_TYPEDEF: -+ def_typedef(defp); -+ break; -+ case TOK_ENUM: -+ def_enum(defp); -+ break; -+ case TOK_PROGRAM: -+ def_program(defp); -+ break; -+ case TOK_CONST: -+ def_const(defp); -+ break; -+ case TOK_EOF: -+ free(defp); -+ return (NULL); -+ default: -+ error("definition keyword expected"); -+ } -+ scan(TOK_SEMICOLON, &tok); -+ isdefined(defp); -+ return (defp); -+} -+ -+static void -+isdefined(definition *defp) -+{ -+ STOREVAL(&defined, defp); -+} -+ -+static void -+def_struct(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ decl_list *decls; -+ decl_list **tailp; -+ -+ defp->def_kind = DEF_STRUCT; -+ -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ tailp = &defp->def.st.decls; -+ do { -+ get_declaration(&dec, DEF_STRUCT); -+ decls = ALLOC(decl_list); -+ decls->decl = dec; -+ *tailp = decls; -+ tailp = &decls->next; -+ scan(TOK_SEMICOLON, &tok); -+ peek(&tok); -+ } while (tok.kind != TOK_RBRACE); -+ get_token(&tok); -+ *tailp = NULL; -+} -+ -+static void -+def_program(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ decl_list *decls; -+ decl_list **tailp; -+ version_list *vlist; -+ version_list **vtailp; -+ proc_list *plist; -+ proc_list **ptailp; -+ int num_args; -+ bool_t isvoid = FALSE; /* whether first argument is void */ -+ defp->def_kind = DEF_PROGRAM; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ vtailp = &defp->def.pr.versions; -+ tailp = &defp->def.st.decls; -+ scan(TOK_VERSION, &tok); -+ do { -+ scan(TOK_IDENT, &tok); -+ vlist = ALLOC(version_list); -+ vlist->vers_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ ptailp = &vlist->procs; -+ do { -+ /* get result type */ -+ plist = ALLOC(proc_list); -+ get_type(&plist->res_prefix, &plist->res_type, -+ DEF_PROGRAM); -+ if (streq(plist->res_type, "opaque")) { -+ error("illegal result type"); -+ } -+ scan(TOK_IDENT, &tok); -+ plist->proc_name = tok.str; -+ scan(TOK_LPAREN, &tok); -+ /* get args - first one*/ -+ num_args = 1; -+ isvoid = FALSE; -+ /* type of DEF_PROGRAM in the first -+ * get_prog_declaration and DEF_STURCT in the next -+ * allows void as argument if it is the only argument -+ */ -+ get_prog_declaration(&dec, DEF_PROGRAM, num_args); -+ if (streq(dec.type, "void")) -+ isvoid = TRUE; -+ decls = ALLOC(decl_list); -+ plist->args.decls = decls; -+ decls->decl = dec; -+ tailp = &decls->next; -+ /* get args */ -+ while(peekscan(TOK_COMMA, &tok)) { -+ num_args++; -+ get_prog_declaration(&dec, DEF_STRUCT, -+ num_args); -+ decls = ALLOC(decl_list); -+ decls->decl = dec; -+ *tailp = decls; -+ if (streq(dec.type, "void")) -+ isvoid = TRUE; -+ tailp = &decls->next; -+ } -+ /* multiple arguments are only allowed in newstyle */ -+ if( !newstyle && num_args > 1 ) { -+ error("only one argument is allowed" ); -+ } -+ if (isvoid && num_args > 1) { -+ error("illegal use of void in program definition"); -+ } -+ *tailp = NULL; -+ scan(TOK_RPAREN, &tok); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ scan(TOK_SEMICOLON, &tok); -+ plist->proc_num = tok.str; -+ plist->arg_num = num_args; -+ *ptailp = plist; -+ ptailp = &plist->next; -+ peek(&tok); -+ } while (tok.kind != TOK_RBRACE); -+ *ptailp = NULL; -+ *vtailp = vlist; -+ vtailp = &vlist->next; -+ scan(TOK_RBRACE, &tok); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ vlist->vers_num = tok.str; -+ /* make the argument structure name for each arg*/ -+ for(plist = vlist->procs; plist != NULL; -+ plist = plist->next) { -+ plist->args.argname = make_argname(plist->proc_name, -+ vlist->vers_num); -+ /* free the memory ??*/ -+ } -+ scan(TOK_SEMICOLON, &tok); -+ scan2(TOK_VERSION, TOK_RBRACE, &tok); -+ } while (tok.kind == TOK_VERSION); -+ scan(TOK_EQUAL, &tok); -+ scan_num(&tok); -+ defp->def.pr.prog_num = tok.str; -+ *vtailp = NULL; -+} -+ -+ -+static void -+def_enum(definition *defp) -+{ -+ token tok; -+ enumval_list *elist; -+ enumval_list **tailp; -+ -+ defp->def_kind = DEF_ENUM; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_LBRACE, &tok); -+ tailp = &defp->def.en.vals; -+ do { -+ scan(TOK_IDENT, &tok); -+ elist = ALLOC(enumval_list); -+ elist->name = tok.str; -+ elist->assignment = NULL; -+ scan3(TOK_COMMA, TOK_RBRACE, TOK_EQUAL, &tok); -+ if (tok.kind == TOK_EQUAL) { -+ scan_num(&tok); -+ elist->assignment = tok.str; -+ scan2(TOK_COMMA, TOK_RBRACE, &tok); -+ } -+ *tailp = elist; -+ tailp = &elist->next; -+ } while (tok.kind != TOK_RBRACE); -+ *tailp = NULL; -+} -+ -+static void -+def_const(definition *defp) -+{ -+ token tok; -+ -+ defp->def_kind = DEF_CONST; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_EQUAL, &tok); -+ scan2(TOK_IDENT, TOK_STRCONST, &tok); -+ defp->def.co = tok.str; -+} -+ -+static void -+def_union(definition *defp) -+{ -+ token tok; -+ declaration dec; -+ case_list *cases; -+ case_list **tailp; -+ -+ defp->def_kind = DEF_UNION; -+ scan(TOK_IDENT, &tok); -+ defp->def_name = tok.str; -+ scan(TOK_SWITCH, &tok); -+ scan(TOK_LPAREN, &tok); -+ get_declaration(&dec, DEF_UNION); -+ defp->def.un.enum_decl = dec; -+ tailp = &defp->def.un.cases; -+ scan(TOK_RPAREN, &tok); -+ scan(TOK_LBRACE, &tok); -+ scan(TOK_CASE, &tok); -+ while (tok.kind == TOK_CASE) { -+ scan2(TOK_IDENT, TOK_CHARCONST, &tok); -+ cases = ALLOC(case_list); -+ cases->case_name = tok.str; -+ scan(TOK_COLON, &tok); -+ /* now peek at next token */ -+ if(peekscan(TOK_CASE,&tok)) -+ { -+ -+ do -+ { -+ scan2(TOK_IDENT, TOK_CHARCONST, &tok); -+ cases->contflag=1; /* continued case statement */ -+ *tailp = cases; -+ tailp = &cases->next; -+ cases = ALLOC(case_list); -+ cases->case_name = tok.str; -+ scan(TOK_COLON, &tok); -+ -+ }while(peekscan(TOK_CASE,&tok)); -+ } -+ -+ get_declaration(&dec, DEF_UNION); -+ cases->case_decl = dec; -+ cases->contflag=0; /* no continued case statement */ -+ *tailp = cases; -+ tailp = &cases->next; -+ scan(TOK_SEMICOLON, &tok); -+ -+ scan3(TOK_CASE, TOK_DEFAULT, TOK_RBRACE, &tok); -+ } -+ *tailp = NULL; -+ if (tok.kind == TOK_DEFAULT) { -+ scan(TOK_COLON, &tok); -+ get_declaration(&dec, DEF_UNION); -+ defp->def.un.default_decl = ALLOC(declaration); -+ *defp->def.un.default_decl = dec; -+ scan(TOK_SEMICOLON, &tok); -+ scan(TOK_RBRACE, &tok); -+ } else { -+ defp->def.un.default_decl = NULL; -+ } -+} -+ -+static char* reserved_words[] = -+{ -+ "array", -+ "bytes", -+ "destroy", -+ "free", -+ "getpos", -+ "inline", -+ "pointer", -+ "reference", -+ "setpos", -+ "sizeof", -+ "union", -+ "vector", -+ NULL -+ }; -+ -+static char* reserved_types[] = -+{ -+ "opaque", -+ "string", -+ NULL -+ }; -+ -+/* check that the given name is not one that would eventually result in -+ xdr routines that would conflict with internal XDR routines. */ -+static void -+check_type_name(char *name, int new_type) -+{ -+ int i; -+ char tmp[100]; -+ -+ for( i = 0; reserved_words[i] != NULL; i++ ) { -+ if( strcmp( name, reserved_words[i] ) == 0 ) { -+ sprintf(tmp, -+ "illegal (reserved) name :\'%s\' in type definition", name ); -+ error(tmp); -+ } -+ } -+ if( new_type ) { -+ for( i = 0; reserved_types[i] != NULL; i++ ) { -+ if( strcmp( name, reserved_types[i] ) == 0 ) { -+ sprintf(tmp, -+ "illegal (reserved) name :\'%s\' in type definition", name ); -+ error(tmp); -+ } -+ } -+ } -+} -+ -+static void -+def_typedef(definition *defp) -+{ -+ declaration dec; -+ -+ defp->def_kind = DEF_TYPEDEF; -+ get_declaration(&dec, DEF_TYPEDEF); -+ defp->def_name = dec.name; -+ check_type_name( dec.name, 1 ); -+ defp->def.ty.old_prefix = dec.prefix; -+ defp->def.ty.old_type = dec.type; -+ defp->def.ty.rel = dec.rel; -+ defp->def.ty.array_max = dec.array_max; -+} -+ -+static void -+get_declaration(declaration *dec, defkind dkind) -+{ -+ token tok; -+ -+ get_type(&dec->prefix, &dec->type, dkind); -+ dec->rel = REL_ALIAS; -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ -+ check_type_name( dec->type, 0 ); -+ -+ scan2(TOK_STAR, TOK_IDENT, &tok); -+ if (tok.kind == TOK_STAR) { -+ dec->rel = REL_POINTER; -+ scan(TOK_IDENT, &tok); -+ } -+ dec->name = tok.str; -+ if (peekscan(TOK_LBRACKET, &tok)) { -+ if (dec->rel == REL_POINTER) { -+ error("no array-of-pointer declarations -- use typedef"); -+ } -+ dec->rel = REL_VECTOR; -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RBRACKET, &tok); -+ } else if (peekscan(TOK_LANGLE, &tok)) { -+ if (dec->rel == REL_POINTER) { -+ error("no array-of-pointer declarations -- use typedef"); -+ } -+ dec->rel = REL_ARRAY; -+ if (peekscan(TOK_RANGLE, &tok)) { -+ dec->array_max = "~0"; /* unspecified size, use max */ -+ } else { -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RANGLE, &tok); -+ } -+ } -+ if (streq(dec->type, "opaque")) { -+ if (dec->rel != REL_ARRAY && dec->rel != REL_VECTOR) { -+ error("array declaration expected"); -+ } -+ } else if (streq(dec->type, "string")) { -+ if (dec->rel != REL_ARRAY) { -+ error("variable-length array declaration expected"); -+ } -+ } -+} -+ -+ -+static void -+get_prog_declaration(declaration *dec, defkind dkind, int num) -+{ -+ token tok; -+ char name[10]; /* argument name */ -+ -+ if (dkind == DEF_PROGRAM) { -+ peek(&tok); -+ if (tok.kind == TOK_RPAREN) { /* no arguments */ -+ dec->rel = REL_ALIAS; -+ dec->type = "void"; -+ dec->prefix = NULL; -+ dec->name = NULL; -+ return; -+ } -+ } -+ get_type(&dec->prefix, &dec->type, dkind); -+ dec->rel = REL_ALIAS; -+ if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */ -+ strcpy(name, tok.str); -+ else -+ sprintf(name, "%s%d", ARGNAME, num); /* default name of argument */ -+ -+ dec->name = (char *) strdup(name); -+ -+ if (streq(dec->type, "void")) { -+ return; -+ } -+ -+ if (streq(dec->type, "opaque")) { -+ error("opaque -- illegal argument type"); -+ } -+ if (peekscan(TOK_STAR, &tok)) { -+ if (streq(dec->type, "string")) { -+ error("pointer to string not allowed in program arguments\n"); -+ } -+ dec->rel = REL_POINTER; -+ if (peekscan(TOK_IDENT, &tok)) /* optional name of argument */ -+ dec->name = strdup(tok.str); -+ } -+ if (peekscan(TOK_LANGLE, &tok)) { -+ if (!streq(dec->type, "string")) { -+ error("arrays cannot be declared as arguments to procedures -- use typedef"); -+ } -+ dec->rel = REL_ARRAY; -+ if (peekscan(TOK_RANGLE, &tok)) { -+ dec->array_max = "~0";/* unspecified size, use max */ -+ } else { -+ scan_num(&tok); -+ dec->array_max = tok.str; -+ scan(TOK_RANGLE, &tok); -+ } -+ } -+ if (streq(dec->type, "string")) { -+ if (dec->rel != REL_ARRAY) { /* .x specifies just string as -+ * type of argument -+ * - make it string<> -+ */ -+ dec->rel = REL_ARRAY; -+ dec->array_max = "~0";/* unspecified size, use max */ -+ } -+ } -+} -+ -+ -+ -+static void -+get_type(char **prefixp, char **typep, defkind dkind) -+{ -+ token tok; -+ -+ *prefixp = NULL; -+ get_token(&tok); -+ switch (tok.kind) { -+ case TOK_IDENT: -+ *typep = tok.str; -+ break; -+ case TOK_STRUCT: -+ case TOK_ENUM: -+ case TOK_UNION: -+ *prefixp = tok.str; -+ scan(TOK_IDENT, &tok); -+ *typep = tok.str; -+ break; -+ case TOK_UNSIGNED: -+ unsigned_dec(typep); -+ break; -+ case TOK_SHORT: -+ *typep = "short"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT32: -+ *typep = "int32_t"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_VOID: -+ if (dkind != DEF_UNION && dkind != DEF_PROGRAM) { -+ error("voids allowed only inside union and program definitions with one argument"); -+ } -+ *typep = tok.str; -+ break; -+ case TOK_STRING: -+ case TOK_OPAQUE: -+ case TOK_CHAR: -+ case TOK_INT: -+ case TOK_FLOAT: -+ case TOK_DOUBLE: -+ case TOK_BOOL: -+ *typep = tok.str; -+ break; -+ default: -+ error("expected type specifier"); -+ } -+} -+ -+static void -+unsigned_dec(char **typep) -+{ -+ token tok; -+ -+ peek(&tok); -+ switch (tok.kind) { -+ case TOK_CHAR: -+ get_token(&tok); -+ *typep = "u_char"; -+ break; -+ case TOK_SHORT: -+ get_token(&tok); -+ *typep = "u_short"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT32: -+ get_token(&tok); -+ *typep = "u_int32_"; -+ (void) peekscan(TOK_INT, &tok); -+ break; -+ case TOK_INT: -+ get_token(&tok); -+ *typep = "u_int"; -+ break; -+ default: -+ *typep = "u_int"; -+ break; -+ } -+} -diff --git a/rpcgen/rpc_parse.h b/rpcgen/rpc_parse.h -new file mode 100644 -index 0000000..2afae10 ---- /dev/null -+++ b/rpcgen/rpc_parse.h -@@ -0,0 +1,166 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_parse.h 1.3 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_parse.h, Definitions for the RPCL parser -+ */ -+ -+enum defkind { -+ DEF_CONST, -+ DEF_STRUCT, -+ DEF_UNION, -+ DEF_ENUM, -+ DEF_TYPEDEF, -+ DEF_PROGRAM -+}; -+typedef enum defkind defkind; -+ -+typedef char *const_def; -+ -+enum relation { -+ REL_VECTOR, /* fixed length array */ -+ REL_ARRAY, /* variable length array */ -+ REL_POINTER, /* pointer */ -+ REL_ALIAS, /* simple */ -+}; -+typedef enum relation relation; -+ -+struct typedef_def { -+ char *old_prefix; -+ char *old_type; -+ relation rel; -+ char *array_max; -+}; -+typedef struct typedef_def typedef_def; -+ -+struct enumval_list { -+ char *name; -+ char *assignment; -+ struct enumval_list *next; -+}; -+typedef struct enumval_list enumval_list; -+ -+struct enum_def { -+ enumval_list *vals; -+}; -+typedef struct enum_def enum_def; -+ -+struct declaration { -+ char *prefix; -+ char *type; -+ char *name; -+ relation rel; -+ char *array_max; -+}; -+typedef struct declaration declaration; -+ -+struct decl_list { -+ declaration decl; -+ struct decl_list *next; -+}; -+typedef struct decl_list decl_list; -+ -+struct struct_def { -+ decl_list *decls; -+}; -+typedef struct struct_def struct_def; -+ -+struct case_list { -+ char *case_name; -+ int contflag; -+ declaration case_decl; -+ struct case_list *next; -+}; -+typedef struct case_list case_list; -+ -+struct union_def { -+ declaration enum_decl; -+ case_list *cases; -+ declaration *default_decl; -+}; -+typedef struct union_def union_def; -+ -+struct arg_list { -+ char *argname; /* name of struct for arg*/ -+ decl_list *decls; -+}; -+ -+typedef struct arg_list arg_list; -+ -+struct proc_list { -+ char *proc_name; -+ char *proc_num; -+ arg_list args; -+ int arg_num; -+ char *res_type; -+ char *res_prefix; -+ struct proc_list *next; -+}; -+typedef struct proc_list proc_list; -+ -+struct version_list { -+ char *vers_name; -+ char *vers_num; -+ proc_list *procs; -+ struct version_list *next; -+}; -+typedef struct version_list version_list; -+ -+struct program_def { -+ char *prog_num; -+ version_list *versions; -+}; -+typedef struct program_def program_def; -+ -+struct definition { -+ char *def_name; -+ defkind def_kind; -+ union { -+ const_def co; -+ struct_def st; -+ union_def un; -+ enum_def en; -+ typedef_def ty; -+ program_def pr; -+ } def; -+}; -+typedef struct definition definition; -+ -+definition *get_definition(); -+ -+ -+struct bas_type -+{ -+ char *name; -+ int length; -+ struct bas_type *next; -+}; -+ -+typedef struct bas_type bas_type; -diff --git a/rpcgen/rpc_sample.c b/rpcgen/rpc_sample.c -new file mode 100644 -index 0000000..2b5c81b ---- /dev/null -+++ b/rpcgen/rpc_sample.c -@@ -0,0 +1,247 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_sample.c 1.1 90/08/30 (C) 1987 SMI"; -+ -+#endif -+ -+/* -+ * rpc_sample.c, Sample client-server code outputter for the RPC protocol compiler -+ */ -+ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+ -+static char RQSTP[] = "rqstp"; -+ -+static void write_sample_client(char *program_name, version_list *vp); -+static void write_sample_server(definition * def); -+static void return_type(proc_list *plist); -+ -+void -+write_sample_svc(definition *def) -+{ -+ if (def->def_kind != DEF_PROGRAM) -+ return; -+ write_sample_server(def); -+} -+ -+ -+int -+write_sample_clnt(definition *def) -+{ -+ version_list *vp; -+ int count = 0; -+ -+ if (def->def_kind != DEF_PROGRAM) -+ return (0); -+ /* generate sample code for each version */ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ write_sample_client(def->def_name, vp); -+ ++count; -+ } -+ return (count); -+} -+ -+ -+static void -+write_sample_client(char *program_name, version_list *vp) -+{ -+ proc_list *proc; -+ int i; -+ decl_list *l; -+ -+ f_print(fout, "\n\nvoid\n"); -+ pvname(program_name, vp->vers_num); -+ if (Cflag) -+ f_print(fout, "( char* host )\n{\n"); -+ else -+ f_print(fout, "(host)\nchar *host;\n{\n"); -+ f_print(fout, "\tCLIENT *clnt;\n"); -+ -+ i = 0; -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\t"); -+ ptype(proc->res_prefix, proc->res_type, 1); -+ f_print(fout, " *result_%d;\n", ++i); -+ /* print out declarations for arguments */ -+ if (proc->arg_num < 2 && !newstyle) { -+ f_print(fout, "\t"); -+ if (!streq(proc->args.decls->decl.type, "void")) -+ ptype(proc->args.decls->decl.prefix, proc->args.decls->decl.type, 1); -+ else -+ f_print(fout, "char* "); /* cannot have "void" type */ -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ } else if (!streq(proc->args.decls->decl.type, "void")) { -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ f_print(fout, "\t"); -+ ptype(l->decl.prefix, l->decl.type, 1); -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_%s;\n", l->decl.name); -+ /* pdeclaration(proc->args.argname, &l->decl, 1, ";\n" );*/ -+ } -+ } -+ } -+ -+ /* generate creation of client handle */ -+ f_print(fout, "\tclnt = clnt_create(host, %s, %s, \"%s\");\n", -+ program_name, vp->vers_name, tirpcflag ? "netpath" : "udp"); -+ f_print(fout, "\tif (clnt == NULL) {\n"); -+ f_print(fout, "\t\tclnt_pcreateerror(host);\n"); -+ f_print(fout, "\t\texit(1);\n\t}\n"); -+ -+ /* generate calls to procedures */ -+ i = 0; -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\tresult_%d = ", ++i); -+ pvname(proc->proc_name, vp->vers_num); -+ if (proc->arg_num < 2 && !newstyle) { -+ f_print(fout, "("); -+ if (streq(proc->args.decls->decl.type, "void")) /* cast to void* */ -+ f_print(fout, "(void*)"); -+ f_print(fout, "&"); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg, clnt);\n"); -+ } else if (streq(proc->args.decls->decl.type, "void")) { -+ f_print(fout, "(clnt);\n"); -+ } else { -+ f_print(fout, "("); -+ for (l = proc->args.decls; l != NULL; l = l->next) { -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_%s, ", l->decl.name); -+ } -+ f_print(fout, "clnt);\n"); -+ } -+ f_print(fout, "\tif (result_%d == NULL) {\n", i); -+ f_print(fout, "\t\tclnt_perror(clnt, \"call failed:\");\n"); -+ f_print(fout, "\t}\n"); -+ } -+ -+ f_print(fout, "\tclnt_destroy( clnt );\n"); -+ f_print(fout, "}\n"); -+} -+ -+static void -+write_sample_server(definition * def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ /* if( Cflag ) -+ f_print( fout, "extern \"C\"{\n"); -+*/ -+ return_type(proc); -+ f_print(fout, "* \n"); -+ if (Cflag) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ printarglist(proc, RQSTP, "struct svc_req *"); -+ -+ f_print(fout, "{\n"); -+ f_print(fout, "\n\tstatic "); -+ if (!streq(proc->res_type, "void")) -+ return_type(proc); -+ else -+ f_print(fout, "char*"); /* cannot have void type */ -+ /* f_print(fout, " result;\n", proc->res_type); */ -+ f_print(fout, " result;\n"); -+ f_print(fout, -+ "\n\t/*\n\t * insert server code here\n\t */\n\n"); -+ if (!streq(proc->res_type, "void")) -+ f_print(fout, "\treturn(&result);\n}\n"); -+ else /* cast back to void * */ -+ f_print(fout, "\treturn((void*) &result);\n}\n"); -+ /* if( Cflag) -+ f_print( fout, "};\n"); -+*/ -+ -+ } -+ } -+} -+ -+ -+ -+static void -+return_type(proc_list *plist) -+{ -+ ptype( plist->res_prefix, plist->res_type, 1 ); -+} -+ -+void -+add_sample_msg(void) -+{ -+ f_print(fout, "/*\n"); -+ f_print(fout, " * This is sample code generated by rpcgen.\n"); -+ f_print(fout, " * These are only templates and you can use them\n"); -+ f_print(fout, " * as a guideline for developing your own functions.\n"); -+ f_print(fout, " */\n\n"); -+} -+ -+void -+write_sample_clnt_main(void) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ f_print(fout, "\n\n" ); -+ if( Cflag ) -+ f_print(fout,"main( int argc, char* argv[] )\n{\n" ); -+ else -+ f_print(fout, "main(argc, argv)\nint argc;\nchar *argv[];\n{\n" ); -+ -+ f_print(fout, "\tchar *host;"); -+ f_print(fout, "\n\n\tif(argc < 2) {"); -+ f_print(fout, "\n\t\tprintf(\"usage: %%s server_host\\n\", argv[0]);\n" ); -+ f_print(fout, "\t\texit(1);\n\t}"); -+ f_print(fout, "\n\thost = argv[1];\n"); -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print( fout, "\t" ); -+ pvname(def->def_name, vp->vers_num); -+ f_print( fout, "( host );\n" ); -+ } -+ } -+ f_print(fout, "}\n"); -+} -diff --git a/rpcgen/rpc_scan.c b/rpcgen/rpc_scan.c -new file mode 100644 -index 0000000..f58fa9f ---- /dev/null -+++ b/rpcgen/rpc_scan.c -@@ -0,0 +1,474 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_scan.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_scan.c, Scanner for the RPC protocol compiler -+ * Copyright (C) 1987, Sun Microsystems, Inc. -+ */ -+#include -+#include -+#include -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static void unget_token(token *tokp); -+static void findstrconst(char **str, char **val); -+static void findchrconst(char **str, char **val); -+static void findconst(char **str, char **val); -+static void findkind(char **mark, token *tokp); -+static int cppline(char *line); -+static int directive(char *line); -+static void printdirective(char *line); -+static void docppline(char *line, int *lineno, char **fname); -+ -+#define startcomment(where) (where[0] == '/' && where[1] == '*') -+#define endcomment(where) (where[-1] == '*' && where[0] == '/') -+ -+static int pushed = 0; /* is a token pushed */ -+static token lasttok; /* last token, if pushed */ -+ -+/* -+ * scan expecting 1 given token -+ */ -+void -+scan(tok_kind expect, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect) { -+ expected1(expect); -+ } -+} -+ -+/* -+ * scan expecting any of the 2 given tokens -+ */ -+void -+scan2(tok_kind expect1, tok_kind expect2, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect1 && tokp->kind != expect2) { -+ expected2(expect1, expect2); -+ } -+} -+ -+/* -+ * scan expecting any of the 3 given token -+ */ -+void -+scan3(tok_kind expect1, tok_kind expect2, tok_kind expect3, token *tokp) -+{ -+ get_token(tokp); -+ if (tokp->kind != expect1 && tokp->kind != expect2 -+ && tokp->kind != expect3) { -+ expected3(expect1, expect2, expect3); -+ } -+} -+ -+/* -+ * scan expecting a constant, possibly symbolic -+ */ -+void -+scan_num(token *tokp) -+{ -+ get_token(tokp); -+ switch (tokp->kind) { -+ case TOK_IDENT: -+ break; -+ default: -+ error("constant or identifier expected"); -+ } -+} -+ -+/* -+ * Peek at the next token -+ */ -+void -+peek(token *tokp) -+{ -+ get_token(tokp); -+ unget_token(tokp); -+} -+ -+/* -+ * Peek at the next token and scan it if it matches what you expect -+ */ -+int -+peekscan(tok_kind expect, token *tokp) -+{ -+ peek(tokp); -+ if (tokp->kind == expect) { -+ get_token(tokp); -+ return (1); -+ } -+ return (0); -+} -+ -+/* -+ * Get the next token, printing out any directive that are encountered. -+ */ -+void -+get_token(token *tokp) -+{ -+ int commenting; -+ -+ if (pushed) { -+ pushed = 0; -+ *tokp = lasttok; -+ return; -+ } -+ commenting = 0; -+ for (;;) { -+ if (*where == 0) { -+ for (;;) { -+ if (!fgets(curline, MAXLINESIZE, fin)) { -+ tokp->kind = TOK_EOF; -+ *where = 0; -+ return; -+ } -+ linenum++; -+ if (commenting) { -+ break; -+ } else if (cppline(curline)) { -+ docppline(curline, &linenum, -+ &infilename); -+ } else if (directive(curline)) { -+ printdirective(curline); -+ } else { -+ break; -+ } -+ } -+ where = curline; -+ } else if (isspace(*where)) { -+ while (isspace(*where)) { -+ where++; /* eat */ -+ } -+ } else if (commenting) { -+ for (where++; *where; where++) { -+ if (endcomment(where)) { -+ where++; -+ commenting--; -+ break; -+ } -+ } -+ } else if (startcomment(where)) { -+ where += 2; -+ commenting++; -+ } else { -+ break; -+ } -+ } -+ -+ /* -+ * 'where' is not whitespace, comment or directive Must be a token! -+ */ -+ switch (*where) { -+ case ':': -+ tokp->kind = TOK_COLON; -+ where++; -+ break; -+ case ';': -+ tokp->kind = TOK_SEMICOLON; -+ where++; -+ break; -+ case ',': -+ tokp->kind = TOK_COMMA; -+ where++; -+ break; -+ case '=': -+ tokp->kind = TOK_EQUAL; -+ where++; -+ break; -+ case '*': -+ tokp->kind = TOK_STAR; -+ where++; -+ break; -+ case '[': -+ tokp->kind = TOK_LBRACKET; -+ where++; -+ break; -+ case ']': -+ tokp->kind = TOK_RBRACKET; -+ where++; -+ break; -+ case '{': -+ tokp->kind = TOK_LBRACE; -+ where++; -+ break; -+ case '}': -+ tokp->kind = TOK_RBRACE; -+ where++; -+ break; -+ case '(': -+ tokp->kind = TOK_LPAREN; -+ where++; -+ break; -+ case ')': -+ tokp->kind = TOK_RPAREN; -+ where++; -+ break; -+ case '<': -+ tokp->kind = TOK_LANGLE; -+ where++; -+ break; -+ case '>': -+ tokp->kind = TOK_RANGLE; -+ where++; -+ break; -+ -+ case '"': -+ tokp->kind = TOK_STRCONST; -+ findstrconst(&where, &tokp->str); -+ break; -+ case '\'': -+ tokp->kind = TOK_CHARCONST; -+ findchrconst(&where, &tokp->str); -+ break; -+ -+ case '-': -+ case '0': -+ case '1': -+ case '2': -+ case '3': -+ case '4': -+ case '5': -+ case '6': -+ case '7': -+ case '8': -+ case '9': -+ tokp->kind = TOK_IDENT; -+ findconst(&where, &tokp->str); -+ break; -+ -+ default: -+ if (!(isalpha(*where) || *where == '_')) { -+ char buf[100]; -+ char *p; -+ -+ s_print(buf, "illegal character in file: "); -+ p = buf + strlen(buf); -+ if (isprint(*where)) { -+ s_print(p, "%c", *where); -+ } else { -+ s_print(p, "%d", *where); -+ } -+ error(buf); -+ } -+ findkind(&where, tokp); -+ break; -+ } -+} -+ -+static void -+unget_token(token *tokp) -+{ -+ lasttok = *tokp; -+ pushed = 1; -+} -+ -+static void -+findstrconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ do { -+ *p++; -+ } while (*p && *p != '"'); -+ if (*p == 0) { -+ error("unterminated string constant"); -+ } -+ p++; -+ size = p - *str; -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static void -+findchrconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ do { -+ *p++; -+ } while (*p && *p != '\''); -+ if (*p == 0) { -+ error("unterminated string constant"); -+ } -+ p++; -+ size = p - *str; -+ if (size != 3) { -+ error("empty char string"); -+ } -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static void -+findconst(char **str, char **val) -+{ -+ char *p; -+ int size; -+ -+ p = *str; -+ if (*p == '0' && *(p + 1) == 'x') { -+ p++; -+ do { -+ p++; -+ } while (isxdigit(*p)); -+ } else { -+ do { -+ p++; -+ } while (isdigit(*p)); -+ } -+ size = p - *str; -+ *val = alloc(size + 1); -+ (void) strncpy(*val, *str, size); -+ (*val)[size] = 0; -+ *str = p; -+} -+ -+static token symbols[] = { -+ {TOK_CONST, "const"}, -+ {TOK_UNION, "union"}, -+ {TOK_SWITCH, "switch"}, -+ {TOK_CASE, "case"}, -+ {TOK_DEFAULT, "default"}, -+ {TOK_STRUCT, "struct"}, -+ {TOK_TYPEDEF, "typedef"}, -+ {TOK_ENUM, "enum"}, -+ {TOK_OPAQUE, "opaque"}, -+ {TOK_BOOL, "bool"}, -+ {TOK_VOID, "void"}, -+ {TOK_CHAR, "char"}, -+ {TOK_INT, "int"}, -+ {TOK_UNSIGNED, "unsigned"}, -+ {TOK_SHORT, "short"}, -+ {TOK_INT32, "int32"}, -+ {TOK_FLOAT, "float"}, -+ {TOK_DOUBLE, "double"}, -+ {TOK_STRING, "string"}, -+ {TOK_PROGRAM, "program"}, -+ {TOK_VERSION, "version"}, -+ {TOK_EOF, "??????"}, -+}; -+ -+static void -+findkind(char **mark, token *tokp) -+{ -+ int len; -+ token *s; -+ char *str; -+ -+ str = *mark; -+ for (s = symbols; s->kind != TOK_EOF; s++) { -+ len = strlen(s->str); -+ if (strncmp(str, s->str, len) == 0) { -+ if (!isalnum(str[len]) && str[len] != '_') { -+ tokp->kind = s->kind; -+ tokp->str = s->str; -+ *mark = str + len; -+ return; -+ } -+ } -+ } -+ tokp->kind = TOK_IDENT; -+ for (len = 0; isalnum(str[len]) || str[len] == '_'; len++); -+ tokp->str = alloc(len + 1); -+ (void) strncpy(tokp->str, str, len); -+ tokp->str[len] = 0; -+ *mark = str + len; -+} -+ -+static int -+cppline(char *line) -+{ -+ return (line == curline && *line == '#'); -+} -+ -+static int -+directive(char *line) -+{ -+ return (line == curline && *line == '%'); -+} -+ -+static void -+printdirective(char *line) -+{ -+ f_print(fout, "%s", line + 1); -+} -+ -+static void -+docppline(char *line, int *lineno, char **fname) -+{ -+ char *file; -+ int num; -+ char *p; -+ -+ line++; -+ while (isspace(*line)) { -+ line++; -+ } -+ num = atoi(line); -+ while (isdigit(*line)) { -+ line++; -+ } -+ while (isspace(*line)) { -+ line++; -+ } -+ if (*line != '"') { -+ error("preprocessor error"); -+ } -+ line++; -+ p = file = alloc(strlen(line) + 1); -+ while (*line && *line != '"') { -+ *p++ = *line++; -+ } -+ if (*line == 0) { -+ error("preprocessor error"); -+ } -+ *p = 0; -+ if (*file == 0) { -+ *fname = NULL; -+ free(file); -+ } else { -+ *fname = file; -+ } -+ *lineno = num - 1; -+} -diff --git a/rpcgen/rpc_scan.h b/rpcgen/rpc_scan.h -new file mode 100644 -index 0000000..16f688c ---- /dev/null -+++ b/rpcgen/rpc_scan.h -@@ -0,0 +1,103 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_scan.h 1.3 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_scan.h, Definitions for the RPCL scanner -+ */ -+ -+/* -+ * kinds of tokens -+ */ -+enum tok_kind { -+ TOK_IDENT, -+ TOK_CHARCONST, -+ TOK_STRCONST, -+ TOK_LPAREN, -+ TOK_RPAREN, -+ TOK_LBRACE, -+ TOK_RBRACE, -+ TOK_LBRACKET, -+ TOK_RBRACKET, -+ TOK_LANGLE, -+ TOK_RANGLE, -+ TOK_STAR, -+ TOK_COMMA, -+ TOK_EQUAL, -+ TOK_COLON, -+ TOK_SEMICOLON, -+ TOK_CONST, -+ TOK_STRUCT, -+ TOK_UNION, -+ TOK_SWITCH, -+ TOK_CASE, -+ TOK_DEFAULT, -+ TOK_ENUM, -+ TOK_TYPEDEF, -+ TOK_INT, -+ TOK_SHORT, -+ TOK_INT32, -+ TOK_UNSIGNED, -+ TOK_FLOAT, -+ TOK_DOUBLE, -+ TOK_OPAQUE, -+ TOK_CHAR, -+ TOK_STRING, -+ TOK_BOOL, -+ TOK_VOID, -+ TOK_PROGRAM, -+ TOK_VERSION, -+ TOK_EOF -+}; -+typedef enum tok_kind tok_kind; -+ -+/* -+ * a token -+ */ -+struct token { -+ tok_kind kind; -+ char *str; -+}; -+typedef struct token token; -+ -+ -+/* -+ * routine interface -+ */ -+void scan(); -+void scan2(); -+void scan3(); -+void scan_num(); -+void peek(); -+int peekscan(); -+void get_token(); -+void expected1(tok_kind); -+void expected2(tok_kind, tok_kind); -+void expected3(tok_kind, tok_kind, tok_kind); -+ -diff --git a/rpcgen/rpc_svcout.c b/rpcgen/rpc_svcout.c -new file mode 100644 -index 0000000..284a529 ---- /dev/null -+++ b/rpcgen/rpc_svcout.c -@@ -0,0 +1,882 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+ static char sccsid[] = "@(#)rpc_svcout.c 1.29 89/03/30 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_svcout.c, Server-skeleton outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+static void write_real_program(definition *def); -+static void write_program(definition *def, char *storage); -+static void printerr(char *err, char *transp); -+static void printif(char *proc, char *transp, char *prefix, char *arg); -+static void write_inetmost(char *infile); -+static void print_return(char *space); -+static void print_pmapunset(char *space); -+static void print_err_message(char *space); -+static void write_timeout_func(void); -+static void write_pm_most(char *infile, int netflag); -+static void write_rpc_svc_fg(char *infile, char *sp); -+static void open_log_file(char *infile, char *sp); -+ -+static char RQSTP[] = "rqstp"; -+static char TRANSP[] = "transp"; -+static char ARG[] = "argument"; -+static char RESULT[] = "result"; -+static char ROUTINE[] = "local"; -+ -+char _errbuf[256]; /* For all messages */ -+ -+static void -+p_xdrfunc(char *rname, char *typename) -+{ -+ if (Cflag) -+ f_print(fout, "\t\txdr_%s = (xdrproc_t) xdr_%s;\n", rname, -+ stringfix(typename)); -+ else -+ f_print(fout, "\t\txdr_%s = xdr_%s;\n", rname, stringfix(typename)); -+} -+ -+void -+internal_proctype(proc_list *plist) -+{ -+ f_print(fout, "static "); -+ ptype( plist->res_prefix, plist->res_type, 1 ); -+ f_print( fout, "*" ); -+} -+ -+ -+/* -+ * write most of the service, that is, everything but the registrations. -+ */ -+void -+write_most(char *infile, int netflag, int nomain) -+{ -+ if (inetdflag || pmflag) { -+ char* var_type; -+ var_type = (nomain? "extern" : "static"); -+ f_print(fout, "%s int _rpcpmstart;", var_type ); -+ f_print(fout, "\t\t/* Started by a port monitor ? */\n"); -+ f_print(fout, "%s int _rpcfdtype;", var_type ); -+ f_print(fout, "\t\t/* Whether Stream or Datagram ? */\n"); -+ if (timerflag) { -+ f_print(fout, "%s int _rpcsvcdirty;", var_type ); -+ f_print(fout, "\t/* Still serving ? */\n"); -+ } -+ write_svc_aux( nomain ); -+ } -+ /* write out dispatcher and stubs */ -+ write_programs( nomain? (char *)NULL : "static" ); -+ -+ if( nomain ) -+ return; -+ -+ f_print(fout, "\nmain()\n"); -+ f_print(fout, "{\n"); -+ if (inetdflag) { -+ write_inetmost(infile); /* Includes call to write_rpc_svc_fg() */ -+ } else { -+ if( tirpcflag ) { -+ if (netflag) { -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\tstruct netconfig *nconf = NULL;\n"); -+ } -+ f_print(fout, "\tpid_t pid;\n"); -+ f_print(fout, "\tint i;\n"); -+ f_print(fout, "\tchar mname[FMNAMESZ + 1];\n\n"); -+ write_pm_most(infile, netflag); -+ f_print(fout, "\telse {\n"); -+ write_rpc_svc_fg(infile, "\t\t"); -+ f_print(fout, "\t}\n"); -+ } else { -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\n"); -+ print_pmapunset("\t"); -+ } -+ } -+ -+ if (logflag && !inetdflag) { -+ open_log_file(infile, "\t"); -+ } -+} -+ -+/* -+ * write a registration for the given transport -+ */ -+void -+write_netid_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ char *sp; -+ char tmpbuf[32]; -+ -+ sp = ""; -+ f_print(fout, "\n"); -+ f_print(fout, "%s\tnconf = getnetconfigent(\"%s\");\n", sp, transp); -+ f_print(fout, "%s\tif (nconf == NULL) {\n", sp); -+ (void) sprintf(_errbuf, "cannot find %s netid.", transp); -+ sprintf(tmpbuf, "%s\t\t", sp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ f_print(fout, "%s\t%s = svc_tli_create(RPC_ANYFD, nconf, 0, 0, 0);\n", -+ sp, TRANSP); -+ f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP); -+ (void) sprintf(_errbuf, "cannot create %s service.", transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, -+ "%s\t(void) rpcb_unset(%s, %s, nconf);\n", -+ sp, def->def_name, vp->vers_name); -+ f_print(fout, -+ "%s\tif (!svc_reg(%s, %s, %s, ", -+ sp, TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", nconf)) {\n"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s, %s).", -+ def->def_name, vp->vers_name, transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ } -+ } -+ f_print(fout, "%s\tfreenetconfigent(nconf);\n", sp); -+} -+ -+/* -+ * write a registration for the given transport for TLI -+ */ -+void -+write_nettype_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "\tif (!svc_create("); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", %s, %s, \"%s\")) {\n ", -+ def->def_name, vp->vers_name, transp); -+ (void) sprintf(_errbuf, -+ "unable to create (%s, %s) for %s.", -+ def->def_name, vp->vers_name, transp); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ } -+ } -+} -+ -+/* -+ * write the rest of the service -+ */ -+void -+write_rest(void) -+{ -+ f_print(fout, "\n"); -+ if (inetdflag) { -+ f_print(fout, "\tif (%s == (SVCXPRT *)NULL) {\n", TRANSP); -+ (void) sprintf(_errbuf, "could not create a handle"); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ if (timerflag) { -+ f_print(fout, "\tif (_rpcpmstart) {\n"); -+ f_print(fout, -+ "\t\t(void) signal(SIGALRM, %s closedown);\n", -+ Cflag? "(SIG_PF)" : "(void(*)())" ); -+ f_print(fout, "\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "\t}\n"); -+ } -+ } -+ f_print(fout, "\tsvc_run();\n"); -+ (void) sprintf(_errbuf, "svc_run returned"); -+ print_err_message("\t"); -+ f_print(fout, "\texit(1);\n"); -+ f_print(fout, "\t/* NOTREACHED */\n"); -+ f_print(fout, "}\n"); -+} -+ -+void -+write_programs(char *storage) -+{ -+ list *l; -+ definition *def; -+ -+ /* write out stubs for procedure definitions */ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_real_program(def); -+ } -+ } -+ -+ /* write out dispatcher for each program */ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_program(def, storage); -+ } -+ } -+ -+ -+} -+ -+/* write out definition of internal function (e.g. _printmsg_1(...)) -+ which calls server's defintion of actual function (e.g. printmsg_1(...)). -+ Unpacks single user argument of printmsg_1 to call-by-value format -+ expected by printmsg_1. */ -+static void -+write_real_program(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ decl_list *l; -+ -+ if( !newstyle ) return; /* not needed for old style */ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\n"); -+ internal_proctype(proc); -+ f_print(fout, "\n_"); -+ pvname(proc->proc_name, vp->vers_num); -+ if( Cflag ) { -+ f_print(fout, "(" ); -+ /* arg name */ -+ if (proc->arg_num > 1) -+ f_print(fout, proc->args.argname); -+ else -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ f_print(fout, " *argp, struct svc_req *%s)\n", -+ RQSTP); -+ } else { -+ f_print(fout, "(argp, %s)\n", RQSTP ); -+ /* arg name */ -+ if (proc->arg_num > 1) -+ f_print(fout, "\t%s *argp;\n", proc->args.argname); -+ else { -+ f_print(fout, "\t"); -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ f_print(fout, " *argp;\n"); -+ } -+ f_print(fout, " struct svc_req *%s;\n", RQSTP); -+ } -+ -+ f_print(fout, "{\n"); -+ f_print(fout, "\treturn("); -+ if( Cflag ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "("); -+ if (proc->arg_num < 2) { /* single argument */ -+ if (!streq( proc->args.decls->decl.type, "void")) -+ f_print(fout, "*argp, "); /* non-void */ -+ } else { -+ for (l = proc->args.decls; l != NULL; l = l->next) -+ f_print(fout, "argp->%s, ", l->decl.name); -+ } -+ f_print(fout, "%s));\n}\n", RQSTP); -+ } -+ } -+} -+ -+static void -+write_program(definition *def, char *storage) -+{ -+ version_list *vp; -+ proc_list *proc; -+ int filled; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "\n"); -+ if (storage != NULL) { -+ f_print(fout, "%s ", storage); -+ } -+ f_print(fout, "void\n"); -+ pvname(def->def_name, vp->vers_num); -+ -+ if (Cflag) { -+ f_print(fout, "(struct svc_req *%s, ", RQSTP); -+ f_print(fout, "register SVCXPRT *%s)\n", TRANSP); -+ } else { -+ f_print(fout, "(%s, %s)\n", RQSTP, TRANSP); -+ f_print(fout, " struct svc_req *%s;\n", RQSTP); -+ f_print(fout, " register SVCXPRT *%s;\n", TRANSP); -+ } -+ -+ f_print(fout, "{\n"); -+ -+ filled = 0; -+ f_print(fout, "\tunion {\n"); -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ if (proc->arg_num < 2) { /* single argument */ -+ if (streq(proc->args.decls->decl.type, -+ "void")) { -+ continue; -+ } -+ filled = 1; -+ f_print(fout, "\t\t"); -+ ptype(proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type, 0); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ -+ } -+ else { -+ filled = 1; -+ f_print(fout, "\t\t%s", proc->args.argname); -+ f_print(fout, " "); -+ pvname(proc->proc_name, vp->vers_num); -+ f_print(fout, "_arg;\n"); -+ } -+ } -+ if (!filled) { -+ f_print(fout, "\t\tint fill;\n"); -+ } -+ f_print(fout, "\t} %s;\n", ARG); -+ f_print(fout, "\tchar *%s;\n", RESULT); -+ -+ if (Cflag) { -+ f_print(fout, "\txdrproc_t xdr_%s, xdr_%s;\n", ARG, RESULT); -+ f_print(fout, -+ "\tchar *(*%s)(char *, struct svc_req *);\n", -+ ROUTINE); -+ } else { -+ f_print(fout, "\tbool_t (*xdr_%s)(), (*xdr_%s)();\n", ARG, RESULT); -+ f_print(fout, "\tchar *(*%s)();\n", ROUTINE); -+ } -+ -+ f_print(fout, "\n"); -+ -+ if (timerflag) -+ f_print(fout, "\t_rpcsvcdirty = 1;\n"); -+ f_print(fout, "\tswitch (%s->rq_proc) {\n", RQSTP); -+ if (!nullproc(vp->procs)) { -+ f_print(fout, "\tcase NULLPROC:\n"); -+ f_print(fout, -+ "\t\t(void) svc_sendreply(%s, (xdrproc_t) xdr_void, (char *)NULL);\n", -+ TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\n"); -+ } -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ f_print(fout, "\tcase %s:\n", proc->proc_name); -+ if (proc->arg_num < 2) { /* single argument */ -+ p_xdrfunc( ARG, proc->args.decls->decl.type); -+ } else { -+ p_xdrfunc( ARG, proc->args.argname); -+ } -+ p_xdrfunc( RESULT, proc->res_type); -+ if( Cflag ) -+ f_print(fout, -+ "\t\t%s = (char *(*)(char *, struct svc_req *)) ", -+ ROUTINE); -+ else -+ f_print(fout, "\t\t%s = (char *(*)()) ", ROUTINE); -+ -+ if (newstyle) { /* new style: calls internal routine */ -+ f_print(fout,"_"); -+ } -+ /* Not sure about the following... -+ * rpc_hout always generates foobar_1_svc for -+ * the service procedure, so why should we use -+ * foobar_1 here?! --okir */ -+#if 0 -+ if( Cflag && !newstyle ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else -+ pvname(proc->proc_name, vp->vers_num); -+#else -+ pvname_svc(proc->proc_name, vp->vers_num); -+#endif -+ f_print(fout, ";\n"); -+ f_print(fout, "\t\tbreak;\n\n"); -+ } -+ f_print(fout, "\tdefault:\n"); -+ printerr("noproc", TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\t}\n"); -+ -+ f_print(fout, "\t(void) memset((char *)&%s, 0, sizeof (%s));\n", ARG, ARG); -+ if (Cflag) -+ printif("getargs", TRANSP, "(caddr_t) &", ARG); -+ else -+ printif("getargs", TRANSP, "&", ARG); -+ printerr("decode", TRANSP); -+ print_return("\t\t"); -+ f_print(fout, "\t}\n"); -+ -+ if (Cflag) -+ f_print(fout, "\t%s = (*%s)((char *)&%s, %s);\n", -+ RESULT, ROUTINE, ARG, RQSTP); -+ else -+ f_print(fout, "\t%s = (*%s)(&%s, %s);\n", -+ RESULT, ROUTINE, ARG, RQSTP); -+ f_print(fout, -+ "\tif (%s != NULL && !svc_sendreply(%s, " -+ "(xdrproc_t) xdr_%s, %s)) {\n", -+ RESULT, TRANSP, RESULT, RESULT); -+ printerr("systemerr", TRANSP); -+ f_print(fout, "\t}\n"); -+ -+ if (Cflag) -+ printif("freeargs", TRANSP, "(caddr_t) &", ARG); -+ else -+ printif("freeargs", TRANSP, "&", ARG); -+ (void) sprintf(_errbuf, "unable to free arguments"); -+ print_err_message("\t\t"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t}\n"); -+ print_return("\t"); -+ f_print(fout, "}\n"); -+ } -+} -+ -+static void -+printerr(char *err, char *transp) -+{ -+ f_print(fout, "\t\tsvcerr_%s(%s);\n", err, transp); -+} -+ -+static void -+printif(char *proc, char *transp, char *prefix, char *arg) -+{ -+ f_print(fout, "\tif (!svc_%s(%s, (xdrproc_t) xdr_%s, (caddr_t) %s%s)) {\n", -+ proc, transp, arg, prefix, arg); -+} -+ -+int -+nullproc(proc_list *proc) -+{ -+ for (; proc != NULL; proc = proc->next) { -+ if (streq(proc->proc_num, "0")) { -+ return (1); -+ } -+ } -+ return (0); -+} -+ -+static void -+write_inetmost(char *infile) -+{ -+ f_print(fout, "\tregister SVCXPRT *%s;\n", TRANSP); -+ f_print(fout, "\tint sock;\n"); -+ f_print(fout, "\tint proto;\n"); -+ f_print(fout, "\tstruct sockaddr_in saddr;\n"); -+ f_print(fout, "\tint asize = sizeof (saddr);\n"); -+ f_print(fout, "\n"); -+ f_print(fout, -+ "\tif (getsockname(0, (struct sockaddr *)&saddr, &asize) == 0) {\n"); -+ f_print(fout, "\t\tint ssize = sizeof (int);\n\n"); -+ f_print(fout, "\t\tif (saddr.sin_family != AF_INET)\n"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\tif (getsockopt(0, SOL_SOCKET, SO_TYPE,\n"); -+ f_print(fout, "\t\t\t\t(char *)&_rpcfdtype, &ssize) == -1)\n"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\tsock = 0;\n"); -+ f_print(fout, "\t\t_rpcpmstart = 1;\n"); -+ f_print(fout, "\t\tproto = 0;\n"); -+ open_log_file(infile, "\t\t"); -+ f_print(fout, "\t} else {\n"); -+ write_rpc_svc_fg(infile, "\t\t"); -+ f_print(fout, "\t\tsock = RPC_ANYSOCK;\n"); -+ print_pmapunset("\t\t"); -+ f_print(fout, "\t}\n"); -+} -+ -+static void -+print_return(char *space) -+{ -+ if (exitnow) -+ f_print(fout, "%sexit(0);\n", space); -+ else { -+ if (timerflag) -+ f_print(fout, "%s_rpcsvcdirty = 0;\n", space); -+ f_print(fout, "%sreturn;\n", space); -+ } -+} -+ -+static void -+print_pmapunset(char *space) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ for (vp = def->def.pr.versions; vp != NULL; -+ vp = vp->next) { -+ f_print(fout, "%s(void) pmap_unset(%s, %s);\n", -+ space, def->def_name, vp->vers_name); -+ } -+ } -+ } -+} -+ -+static void -+print_err_message(char *space) -+{ -+ if (logflag) -+ f_print(fout, "%ssyslog(LOG_ERR, \"%s\");\n", space, _errbuf); -+ else if (inetdflag || pmflag) -+ f_print(fout, "%s_msgout(\"%s\");\n", space, _errbuf); -+ else -+ f_print(fout, "%sfprintf(stderr, \"%s\");\n", space, _errbuf); -+} -+ -+/* -+ * Write the server auxiliary function ( _msgout, timeout) -+ */ -+void -+write_svc_aux(int nomain) -+{ -+ if (!logflag) -+ write_msg_out(); -+ if( !nomain ) -+ write_timeout_func(); -+} -+ -+/* -+ * Write the _msgout function -+ */ -+void -+write_msg_out(void) -+{ -+ f_print(fout, "\n"); -+ f_print(fout, "static\n"); -+ if( !Cflag ) { -+ f_print(fout, "void _msgout(msg)\n"); -+ f_print(fout, "\tchar *msg;\n"); -+ } else { -+ f_print(fout, "void _msgout(char* msg)\n"); -+ } -+ f_print(fout, "{\n"); -+ f_print(fout, "#ifdef RPC_SVC_FG\n"); -+ if (inetdflag || pmflag) -+ f_print(fout, "\tif (_rpcpmstart)\n"); -+ f_print(fout, "\t\tsyslog(LOG_ERR, \"%%s\", msg);\n"); -+ f_print(fout, "\telse\n"); -+ f_print(fout, "\t\t(void) fprintf(stderr, \"%%s\\n\", msg);\n"); -+ f_print(fout, "#else\n"); -+ f_print(fout, "\tsyslog(LOG_ERR, \"%%s\", msg);\n"); -+ f_print(fout, "#endif\n"); -+ f_print(fout, "}\n"); -+} -+ -+/* -+ * Write the timeout function -+ */ -+static void -+write_timeout_func(void) -+{ -+ if (!timerflag) -+ return; -+ f_print(fout, "\n"); -+ f_print(fout, "static void\n"); -+ f_print(fout, "closedown()\n"); -+ f_print(fout, "{\n"); -+ f_print(fout, "\tif (_rpcsvcdirty == 0) {\n"); -+ f_print(fout, "\t\tstatic int size;\n"); -+ f_print(fout, "\t\tint i, openfd;\n"); -+ if (tirpcflag && pmflag) { -+ f_print(fout, "\t\tstruct t_info tinfo;\n\n"); -+ f_print(fout, "\t\tif (!t_getinfo(0, &tinfo) && (tinfo.servtype == T_CLTS))\n"); -+ } else { -+ f_print(fout, "\n\t\tif (_rpcfdtype == SOCK_DGRAM)\n"); -+ } -+ f_print(fout, "\t\t\texit(0);\n"); -+ f_print(fout, "\t\tif (size == 0) {\n"); -+ if( tirpcflag ) { -+ f_print(fout, "\t\t\tstruct rlimit rl;\n\n"); -+ f_print(fout, "\t\t\trl.rlim_max = 0;\n"); -+ f_print(fout, "\t\t\tgetrlimit(RLIMIT_NOFILE, &rl);\n"); -+ f_print(fout, "\t\t\tif ((size = rl.rlim_max) == 0)\n"); -+ f_print(fout, "\t\t\t\treturn;\n"); -+ } else { -+ f_print(fout, "\t\t\tsize = getdtablesize();\n"); -+ } -+ f_print(fout, "\t\t}\n"); -+ f_print(fout, "\t\tfor (i = 0, openfd = 0; i < size && openfd < 2; i++)\n"); -+ f_print(fout, "\t\t\tif (FD_ISSET(i, &svc_fdset))\n"); -+ f_print(fout, "\t\t\t\topenfd++;\n"); -+ f_print(fout, "\t\tif (openfd <= 1)\n"); -+ f_print(fout, "\t\t\texit(0);\n"); -+ f_print(fout, "\t}\n"); -+ f_print(fout, "\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "}\n"); -+} -+ -+/* -+ * Write the most of port monitor support -+ */ -+static void -+write_pm_most(char *infile, int netflag) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ -+ f_print(fout, "\tif (!ioctl(0, I_LOOK, mname) &&\n"); -+ f_print(fout, "\t\t(!strcmp(mname, \"sockmod\") ||"); -+ f_print(fout, " !strcmp(mname, \"timod\"))) {\n"); -+ f_print(fout, "\t\tchar *netid;\n"); -+ if (!netflag) { /* Not included by -n option */ -+ f_print(fout, "\t\tstruct netconfig *nconf = NULL;\n"); -+ f_print(fout, "\t\tSVCXPRT *%s;\n", TRANSP); -+ } -+ if( timerflag ) -+ f_print(fout, "\t\tint pmclose;\n"); -+/* not necessary, defined in /usr/include/stdlib */ -+/* f_print(fout, "\t\textern char *getenv();\n");*/ -+ f_print(fout, "\n"); -+ f_print(fout, "\t\t_rpcpmstart = 1;\n"); -+ if (logflag) -+ open_log_file(infile, "\t\t"); -+ f_print(fout, "\t\tif ((netid = getenv(\"NLSPROVIDER\")) == NULL) {\n"); -+ sprintf(_errbuf, "cannot get transport name"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t} else if ((nconf = getnetconfigent(netid)) == NULL) {\n"); -+ sprintf(_errbuf, "cannot get transport info"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t}\n"); -+ /* -+ * A kludgy support for inetd services. Inetd only works with -+ * sockmod, and RPC works only with timod, hence all this jugglery -+ */ -+ f_print(fout, "\t\tif (strcmp(mname, \"sockmod\") == 0) {\n"); -+ f_print(fout, "\t\t\tif (ioctl(0, I_POP, 0) || ioctl(0, I_PUSH, \"timod\")) {\n"); -+ sprintf(_errbuf, "could not get the right module"); -+ print_err_message("\t\t\t\t"); -+ f_print(fout, "\t\t\t\texit(1);\n"); -+ f_print(fout, "\t\t\t}\n"); -+ f_print(fout, "\t\t}\n"); -+ if( timerflag ) -+ f_print(fout, "\t\tpmclose = (t_getstate(0) != T_DATAXFER);\n"); -+ f_print(fout, "\t\tif ((%s = svc_tli_create(0, nconf, NULL, 0, 0)) == NULL) {\n", -+ TRANSP); -+ sprintf(_errbuf, "cannot create server handle"); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\t}\n"); -+ f_print(fout, "\t\tif (nconf)\n"); -+ f_print(fout, "\t\t\tfreenetconfigent(nconf);\n"); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, -+ "\t\tif (!svc_reg(%s, %s, %s, ", -+ TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ f_print(fout, ", 0)) {\n"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s).", -+ def->def_name, vp->vers_name); -+ print_err_message("\t\t\t"); -+ f_print(fout, "\t\t\texit(1);\n"); -+ f_print(fout, "\t\t}\n"); -+ } -+ } -+ if (timerflag) { -+ f_print(fout, "\t\tif (pmclose) {\n"); -+ f_print(fout, "\t\t\t(void) signal(SIGALRM, %s closedown);\n", -+ Cflag? "(SIG_PF)" : "(void(*)())" ); -+ f_print(fout, "\t\t\t(void) alarm(_RPCSVC_CLOSEDOWN);\n"); -+ f_print(fout, "\t\t}\n"); -+ } -+ f_print(fout, "\t\tsvc_run();\n"); -+ f_print(fout, "\t\texit(1);\n"); -+ f_print(fout, "\t\t/* NOTREACHED */\n"); -+ f_print(fout, "\t}\n"); -+} -+ -+/* -+ * Support for backgrounding the server if self started. -+ */ -+static void -+write_rpc_svc_fg(char *infile, char *sp) -+{ -+ f_print(fout, "#ifndef RPC_SVC_FG\n"); -+ f_print(fout, "%sint size;\n", sp); -+ if( tirpcflag ) -+ f_print(fout, "%sstruct rlimit rl;\n", sp); -+ if (inetdflag) -+ f_print(fout, "%sint pid, i;\n\n", sp); -+ f_print(fout, "%spid = fork();\n", sp); -+ f_print(fout, "%sif (pid < 0) {\n", sp); -+ f_print(fout, "%s\tperror(\"cannot fork\");\n", sp); -+ f_print(fout, "%s\texit(1);\n", sp); -+ f_print(fout, "%s}\n", sp); -+ f_print(fout, "%sif (pid)\n", sp); -+ f_print(fout, "%s\texit(0);\n", sp); -+ /* get number of file descriptors */ -+ if( tirpcflag ) { -+ f_print(fout, "%srl.rlim_max = 0;\n", sp); -+ f_print(fout, "%sgetrlimit(RLIMIT_NOFILE, &rl);\n", sp); -+ f_print(fout, "%sif ((size = rl.rlim_max) == 0)\n", sp); -+ f_print(fout, "%s\texit(1);\n", sp); -+ } else { -+ f_print(fout, "%ssize = getdtablesize();\n", sp); -+ } -+ -+ f_print(fout, "%sfor (i = 0; i < size; i++)\n", sp); -+ f_print(fout, "%s\t(void) close(i);\n", sp); -+ /* Redirect stderr and stdout to console */ -+ f_print(fout, "%si = open(\"/dev/console\", 2);\n", sp); -+ f_print(fout, "%s(void) dup2(i, 1);\n", sp); -+ f_print(fout, "%s(void) dup2(i, 2);\n", sp); -+ /* This removes control of the controlling terminal */ -+ if( tirpcflag ) -+ f_print(fout, "%ssetsid();\n", sp); -+ else { -+ f_print(fout, "%si = open(\"/dev/tty\", 2);\n", sp); -+ f_print(fout, "%sif (i >= 0) {\n", sp); -+ f_print(fout, "%s\t(void) ioctl(i, TIOCNOTTY, (char *)NULL);\n", sp);; -+ f_print(fout, "%s\t(void) close(i);\n", sp); -+ f_print(fout, "%s}\n", sp); -+ } -+ if (!logflag) -+ open_log_file(infile, sp); -+ f_print(fout, "#endif\n"); -+ if (logflag) -+ open_log_file(infile, sp); -+} -+ -+static void -+open_log_file(char *infile, char *sp) -+{ -+ char *s; -+ -+ s = strrchr(infile, '.'); -+ if (s) -+ *s = '\0'; -+ f_print(fout,"%sopenlog(\"%s\", LOG_PID, LOG_DAEMON);\n", sp, infile); -+ if (s) -+ *s = '.'; -+} -+ -+ -+ -+ -+/* -+ * write a registration for the given transport for Inetd -+ */ -+void -+write_inetd_register(char *transp) -+{ -+ list *l; -+ definition *def; -+ version_list *vp; -+ char *sp; -+ int isudp; -+ char tmpbuf[32]; -+ -+ if (inetdflag) -+ sp = "\t"; -+ else -+ sp = ""; -+ if (streq(transp, "udp")) -+ isudp = 1; -+ else -+ isudp = 0; -+ f_print(fout, "\n"); -+ if (inetdflag) { -+ f_print(fout, "\tif ((_rpcfdtype == 0) || (_rpcfdtype == %s)) {\n", -+ isudp ? "SOCK_DGRAM" : "SOCK_STREAM"); -+ } -+ f_print(fout, "%s\t%s = svc%s_create(%s", -+ sp, TRANSP, transp, inetdflag? "sock": "RPC_ANYSOCK"); -+ if (!isudp) -+ f_print(fout, ", 0, 0"); -+ f_print(fout, ");\n"); -+ f_print(fout, "%s\tif (%s == NULL) {\n", sp, TRANSP); -+ (void) sprintf(_errbuf, "cannot create %s service.", transp); -+ (void) sprintf(tmpbuf, "%s\t\t", sp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ -+ if (inetdflag) { -+ f_print(fout, "%s\tif (!_rpcpmstart)\n\t", sp); -+ f_print(fout, "%s\tproto = IPPROTO_%s;\n", -+ sp, isudp ? "UDP": "TCP"); -+ } -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind != DEF_PROGRAM) { -+ continue; -+ } -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ f_print(fout, "%s\tif (!svc_register(%s, %s, %s, ", -+ sp, TRANSP, def->def_name, vp->vers_name); -+ pvname(def->def_name, vp->vers_num); -+ if (inetdflag) -+ f_print(fout, ", proto)) {\n"); -+ else -+ f_print(fout, ", IPPROTO_%s)) {\n", -+ isudp ? "UDP": "TCP"); -+ (void) sprintf(_errbuf, "unable to register (%s, %s, %s).", -+ def->def_name, vp->vers_name, transp); -+ print_err_message(tmpbuf); -+ f_print(fout, "%s\t\texit(1);\n", sp); -+ f_print(fout, "%s\t}\n", sp); -+ } -+ } -+ if (inetdflag) -+ f_print(fout, "\t}\n"); -+} -diff --git a/rpcgen/rpc_tblout.c b/rpcgen/rpc_tblout.c -new file mode 100644 -index 0000000..ae002f7 ---- /dev/null -+++ b/rpcgen/rpc_tblout.c -@@ -0,0 +1,165 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_tblout.c 1.4 89/02/22 (C) 1988 SMI"; -+#endif -+ -+/* -+ * rpc_tblout.c, Dispatch table outputter for the RPC protocol compiler -+ */ -+#include -+#include -+#include "rpc_parse.h" -+#include "rpc_util.h" -+#include "rpc_output.h" -+ -+static void write_table(definition *def); -+static void printit(char *prefix, char *type); -+ -+#define TABSIZE 8 -+#define TABCOUNT 5 -+#define TABSTOP (TABSIZE*TABCOUNT) -+ -+static char tabstr[TABCOUNT+1] = "\t\t\t\t\t"; -+ -+static char tbl_hdr[] = "struct rpcgen_table %s_table[] = {\n"; -+static char tbl_end[] = "};\n"; -+ -+static char null_entry[] = "\n\t(char *(*)())0,\n\ -+ \t(xdrproc_t) xdr_void,\t\t\t0,\n\ -+ \t(xdrproc_t) xdr_void,\t\t\t0,\n"; -+ -+ -+static char tbl_nproc[] = "int %s_nproc =\n\tsizeof(%s_table)/sizeof(%s_table[0]);\n\n"; -+ -+void -+write_tables(void) -+{ -+ list *l; -+ definition *def; -+ -+ f_print(fout, "\n"); -+ for (l = defined; l != NULL; l = l->next) { -+ def = (definition *) l->val; -+ if (def->def_kind == DEF_PROGRAM) { -+ write_table(def); -+ } -+ } -+} -+ -+static void -+write_table(definition *def) -+{ -+ version_list *vp; -+ proc_list *proc; -+ int current; -+ int expected; -+ char progvers[100]; -+ int warning; -+ -+ for (vp = def->def.pr.versions; vp != NULL; vp = vp->next) { -+ warning = 0; -+ s_print(progvers, "%s_%s", -+ locase(def->def_name), vp->vers_num); -+ /* print the table header */ -+ f_print(fout, tbl_hdr, progvers); -+ -+ if (nullproc(vp->procs)) { -+ expected = 0; -+ } else { -+ expected = 1; -+ f_print(fout, null_entry); -+ } -+ for (proc = vp->procs; proc != NULL; proc = proc->next) { -+ current = atoi(proc->proc_num); -+ if (current != expected++) { -+ f_print(fout, -+ "\n/*\n * WARNING: table out of order\n */\n"); -+ if (warning == 0) { -+ f_print(stderr, -+ "WARNING %s table is out of order\n", -+ progvers); -+ warning = 1; -+ nonfatalerrors = 1; -+ } -+ expected = current + 1; -+ } -+ f_print(fout, "\n\t(char *(*)())RPCGEN_ACTION("); -+ -+ /* routine to invoke */ -+ if( Cflag && !newstyle ) -+ pvname_svc(proc->proc_name, vp->vers_num); -+ else { -+ if( newstyle ) -+ f_print( fout, "_"); /* calls internal func */ -+ pvname(proc->proc_name, vp->vers_num); -+ } -+ f_print(fout, "),\n"); -+ -+ /* argument info */ -+ if( proc->arg_num > 1 ) -+ printit((char*) NULL, proc->args.argname ); -+ else -+ /* do we have to do something special for newstyle */ -+ printit( proc->args.decls->decl.prefix, -+ proc->args.decls->decl.type ); -+ /* result info */ -+ printit(proc->res_prefix, proc->res_type); -+ } -+ -+ /* print the table trailer */ -+ f_print(fout, tbl_end); -+ f_print(fout, tbl_nproc, progvers, progvers, progvers); -+ } -+} -+ -+static void -+printit(char *prefix, char *type) -+{ -+ int len; -+ int tabs; -+ -+ -+ len = fprintf(fout, "\txdr_%s,", stringfix(type)); -+ /* account for leading tab expansion */ -+ len += TABSIZE - 1; -+ /* round up to tabs required */ -+ tabs = (TABSTOP - len + TABSIZE - 1)/TABSIZE; -+ f_print(fout, "%s", &tabstr[TABCOUNT-tabs]); -+ -+ if (streq(type, "void")) { -+ f_print(fout, "0"); -+ } else { -+ f_print(fout, "sizeof ( "); -+ /* XXX: should "follow" be 1 ??? */ -+ ptype(prefix, type, 0); -+ f_print(fout, ")"); -+ } -+ f_print(fout, ",\n"); -+} -diff --git a/rpcgen/rpc_util.c b/rpcgen/rpc_util.c -new file mode 100644 -index 0000000..b67be57 ---- /dev/null -+++ b/rpcgen/rpc_util.c -@@ -0,0 +1,479 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+#if 0 -+static char sccsid[] = "@(#)rpc_util.c 1.11 89/02/22 (C) 1987 SMI"; -+#endif -+ -+/* -+ * rpc_util.c, Utility routines for the RPC protocol compiler -+ */ -+#include -+#include -+#include -+#include -+#include "rpc_scan.h" -+#include "rpc_parse.h" -+#include "rpc_util.h" -+ -+static void printwhere(void); -+ -+ -+#define ARGEXT "argument" -+ -+char curline[MAXLINESIZE]; /* current read line */ -+char *where = curline; /* current point in line */ -+int linenum = 0; /* current line number */ -+ -+char *infilename; /* input filename */ -+ -+#define NFILES 7 -+char *outfiles[NFILES]; /* output file names */ -+int nfiles; -+ -+FILE *fout; /* file pointer of current output */ -+FILE *fin; /* file pointer of current input */ -+ -+list *defined; /* list of defined things */ -+ -+/* -+ * Reinitialize the world -+ */ -+void -+reinitialize(void) -+{ -+ memset(curline, 0, MAXLINESIZE); -+ where = curline; -+ linenum = 0; -+ defined = NULL; -+} -+ -+/* -+ * string equality -+ */ -+int -+streq(char *a, char *b) -+{ -+ return (strcmp(a, b) == 0); -+} -+ -+/* -+ * find a value in a list -+ */ -+definition * -+findval(list *lst, char *val, int (*cmp)(definition *, char *)) -+{ -+ -+ for (; lst != NULL; lst = lst->next) { -+ if ((*cmp) (lst->val, val)) { -+ return (lst->val); -+ } -+ } -+ return (NULL); -+} -+ -+/* -+ * store a value in a list -+ */ -+void -+storeval(lstp, val) -+ list **lstp; -+ definition *val; -+{ -+ list **l; -+ list *lst; -+ -+ -+ for (l = lstp; *l != NULL; l = (list **) & (*l)->next); -+ lst = ALLOC(list); -+ lst->val = val; -+ lst->next = NULL; -+ *l = lst; -+} -+ -+static int -+findit(definition *def, char *type) -+{ -+ return (streq(def->def_name, type)); -+} -+ -+static char * -+fixit(char *type, char *orig) -+{ -+ definition *def; -+ -+ def = (definition *) FINDVAL(defined, type, findit); -+ if (def == NULL || def->def_kind != DEF_TYPEDEF) { -+ return (orig); -+ } -+ switch (def->def.ty.rel) { -+ case REL_VECTOR: -+ return (def->def.ty.old_type); -+ case REL_ALIAS: -+ return (fixit(def->def.ty.old_type, orig)); -+ default: -+ return (orig); -+ } -+} -+ -+char * -+fixtype(char *type) -+{ -+ return (fixit(type, type)); -+} -+ -+char * -+stringfix(char *type) -+{ -+ if (streq(type, "string")) { -+ return ("wrapstring"); -+ } else { -+ return (type); -+ } -+} -+ -+void -+ptype(char *prefix, char *type, int follow) -+{ -+ if (prefix != NULL) { -+ if (streq(prefix, "enum")) { -+ f_print(fout, "enum "); -+ } else { -+ f_print(fout, "struct "); -+ } -+ } -+ if (streq(type, "bool")) { -+ f_print(fout, "bool_t "); -+ } else if (streq(type, "string")) { -+ f_print(fout, "char *"); -+ } else { -+ f_print(fout, "%s ", follow ? fixtype(type) : type); -+ } -+} -+ -+static int -+typedefed(definition *def, char *type) -+{ -+ if (def->def_kind != DEF_TYPEDEF || def->def.ty.old_prefix != NULL) { -+ return (0); -+ } else { -+ return (streq(def->def_name, type)); -+ } -+} -+ -+int -+isvectordef(char *type, relation rel) -+{ -+ definition *def; -+ -+ for (;;) { -+ switch (rel) { -+ case REL_VECTOR: -+ return (!streq(type, "string")); -+ case REL_ARRAY: -+ return (0); -+ case REL_POINTER: -+ return (0); -+ case REL_ALIAS: -+ def = (definition *) FINDVAL(defined, type, typedefed); -+ if (def == NULL) { -+ return (0); -+ } -+ type = def->def.ty.old_type; -+ rel = def->def.ty.rel; -+ } -+ } -+} -+ -+char * -+locase(char *str) -+{ -+ char c; -+ static char buf[100]; -+ char *p = buf; -+ -+ while ((c = *str++) != '\0') { -+ *p++ = (c >= 'A' && c <= 'Z') ? (c - 'A' + 'a') : c; -+ } -+ *p = 0; -+ return (buf); -+} -+ -+void -+pvname_svc(char *pname, char *vnum) -+{ -+ f_print(fout, "%s_%s_svc", locase(pname), vnum); -+} -+ -+void -+pvname(char *pname, char *vnum) -+{ -+ f_print(fout, "%s_%s", locase(pname), vnum); -+} -+ -+/* -+ * print a useful (?) error message, and then die -+ */ -+void -+error(char *msg) -+{ -+ printwhere(); -+ f_print(stderr, "%s, line %d: ", infilename, linenum); -+ f_print(stderr, "%s\n", msg); -+ crash(); -+} -+ -+/* -+ * Something went wrong, unlink any files that we may have created and then -+ * die. -+ */ -+void -+crash(void) -+{ -+ int i; -+ -+ for (i = 0; i < nfiles; i++) { -+ (void) unlink(outfiles[i]); -+ } -+ exit(1); -+} -+ -+void -+record_open(char *file) -+{ -+ if (nfiles < NFILES) { -+ outfiles[nfiles++] = file; -+ } else { -+ f_print(stderr, "too many files!\n"); -+ crash(); -+ } -+} -+ -+static char expectbuf[100]; -+static char *toktostr(); -+ -+/* -+ * error, token encountered was not the expected one -+ */ -+void -+expected1(exp1) -+ tok_kind exp1; -+{ -+ s_print(expectbuf, "expected '%s'", -+ toktostr(exp1)); -+ error(expectbuf); -+} -+ -+/* -+ * error, token encountered was not one of two expected ones -+ */ -+void -+expected2(exp1, exp2) -+ tok_kind exp1, exp2; -+{ -+ s_print(expectbuf, "expected '%s' or '%s'", -+ toktostr(exp1), -+ toktostr(exp2)); -+ error(expectbuf); -+} -+ -+/* -+ * error, token encountered was not one of 3 expected ones -+ */ -+void -+expected3(exp1, exp2, exp3) -+ tok_kind exp1, exp2, exp3; -+{ -+ s_print(expectbuf, "expected '%s', '%s' or '%s'", -+ toktostr(exp1), -+ toktostr(exp2), -+ toktostr(exp3)); -+ error(expectbuf); -+} -+ -+void -+tabify(f, tab) -+ FILE *f; -+ int tab; -+{ -+ while (tab--) { -+ (void) fputc('\t', f); -+ } -+} -+ -+ -+static token tokstrings[] = { -+ {TOK_IDENT, "identifier"}, -+ {TOK_CONST, "const"}, -+ {TOK_RPAREN, ")"}, -+ {TOK_LPAREN, "("}, -+ {TOK_RBRACE, "}"}, -+ {TOK_LBRACE, "{"}, -+ {TOK_LBRACKET, "["}, -+ {TOK_RBRACKET, "]"}, -+ {TOK_STAR, "*"}, -+ {TOK_COMMA, ","}, -+ {TOK_EQUAL, "="}, -+ {TOK_COLON, ":"}, -+ {TOK_SEMICOLON, ";"}, -+ {TOK_UNION, "union"}, -+ {TOK_STRUCT, "struct"}, -+ {TOK_SWITCH, "switch"}, -+ {TOK_CASE, "case"}, -+ {TOK_DEFAULT, "default"}, -+ {TOK_ENUM, "enum"}, -+ {TOK_TYPEDEF, "typedef"}, -+ {TOK_INT, "int"}, -+ {TOK_SHORT, "short"}, -+ {TOK_INT32, "int32"}, -+ {TOK_UNSIGNED, "unsigned"}, -+ {TOK_DOUBLE, "double"}, -+ {TOK_FLOAT, "float"}, -+ {TOK_CHAR, "char"}, -+ {TOK_STRING, "string"}, -+ {TOK_OPAQUE, "opaque"}, -+ {TOK_BOOL, "bool"}, -+ {TOK_VOID, "void"}, -+ {TOK_PROGRAM, "program"}, -+ {TOK_VERSION, "version"}, -+ {TOK_EOF, "??????"} -+}; -+ -+static char * -+toktostr(kind) -+ tok_kind kind; -+{ -+ token *sp; -+ -+ for (sp = tokstrings; sp->kind != TOK_EOF && sp->kind != kind; sp++); -+ return (sp->str); -+} -+ -+static void -+printbuf(void) -+{ -+ char c; -+ int i; -+ int cnt; -+ -+# define TABSIZE 4 -+ -+ for (i = 0; (c = curline[i]) != '\0'; i++) { -+ if (c == '\t') { -+ cnt = 8 - (i % TABSIZE); -+ c = ' '; -+ } else { -+ cnt = 1; -+ } -+ while (cnt--) { -+ (void) fputc(c, stderr); -+ } -+ } -+} -+ -+static void -+printwhere(void) -+{ -+ int i; -+ char c; -+ int cnt; -+ -+ printbuf(); -+ for (i = 0; i < where - curline; i++) { -+ c = curline[i]; -+ if (c == '\t') { -+ cnt = 8 - (i % TABSIZE); -+ } else { -+ cnt = 1; -+ } -+ while (cnt--) { -+ (void) fputc('^', stderr); -+ } -+ } -+ (void) fputc('\n', stderr); -+} -+ -+char * -+make_argname(char *pname, char *vname) -+{ -+ char *name; -+ -+ name = malloc(strlen(pname) + strlen(vname) + strlen(ARGEXT) + 3); -+ if (!name) { -+ fprintf(stderr, "failed in malloc"); -+ exit(1); -+ } -+ sprintf(name, "%s_%s_%s", locase(pname), vname, ARGEXT); -+ return(name); -+} -+ -+bas_type *typ_list_h; -+bas_type *typ_list_t; -+ -+void -+add_type(int len, char *type) -+{ -+ bas_type *ptr; -+ -+ -+ if ((ptr = (bas_type *) malloc(sizeof(bas_type))) == (bas_type *) NULL) { -+ fprintf(stderr, "failed in malloc"); -+ exit(1); -+ } -+ ptr->name = type; -+ ptr->length = len; -+ ptr->next = NULL; -+ if (typ_list_t == NULL) { -+ -+ typ_list_t = ptr; -+ typ_list_h = ptr; -+ } else { -+ -+ typ_list_t->next = ptr; -+ typ_list_t = ptr; -+ } -+} -+ -+ -+bas_type * -+find_type(char *type) -+{ -+ bas_type *ptr; -+ -+ ptr = typ_list_h; -+ -+ -+ while (ptr != NULL) { -+ if (strcmp(ptr->name, type) == 0) -+ return (ptr); -+ else -+ ptr = ptr->next; -+ }; -+ return (NULL); -+} -+ -diff --git a/rpcgen/rpc_util.h b/rpcgen/rpc_util.h -new file mode 100644 -index 0000000..fa115be ---- /dev/null -+++ b/rpcgen/rpc_util.h -@@ -0,0 +1,166 @@ -+/* -+ * Copyright (c) 2009, Sun Microsystems, Inc. -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions are met: -+ * - Redistributions of source code must retain the above copyright notice, -+ * this list of conditions and the following disclaimer. -+ * - Redistributions in binary form must reproduce the above copyright notice, -+ * this list of conditions and the following disclaimer in the documentation -+ * and/or other materials provided with the distribution. -+ * - Neither the name of Sun Microsystems, Inc. nor the names of its -+ * contributors may be used to endorse or promote products derived -+ * from this software without specific prior written permission. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -+ * POSSIBILITY OF SUCH DAMAGE. -+ */ -+ -+/* @(#)rpc_util.h 1.5 90/08/29 (C) 1987 SMI */ -+ -+/* -+ * rpc_util.h, Useful definitions for the RPC protocol compiler -+ */ -+ -+#include -+ -+#define alloc(size) malloc((unsigned)(size)) -+#define ALLOC(object) (object *) malloc(sizeof(object)) -+ -+#define s_print (void) sprintf -+#define f_print (void) fprintf -+ -+struct list { -+ definition *val; -+ struct list *next; -+}; -+typedef struct list list; -+ -+#define PUT 1 -+#define GET 2 -+ -+/* -+ * Global variables -+ */ -+#define MAXLINESIZE 1024 -+extern char curline[MAXLINESIZE]; -+extern char *where; -+extern int linenum; -+ -+extern char *infilename; -+extern FILE *fout; -+extern FILE *fin; -+ -+extern list *defined; -+ -+ -+extern bas_type *typ_list_h; -+extern bas_type *typ_list_t; -+ -+/* -+ * All the option flags -+ */ -+extern int inetdflag; -+extern int pmflag; -+extern int tblflag; -+extern int logflag; -+extern int newstyle; -+extern int Cflag; /* C++ flag */ -+extern int tirpcflag; /* flag for generating tirpc code */ -+extern int Inline; /* if this is 0, then do not generate inline code */ -+ -+/* -+ * Other flags related with inetd jumpstart. -+ */ -+extern int indefinitewait; -+extern int exitnow; -+extern int timerflag; -+ -+extern int nonfatalerrors; -+ -+/* -+ * rpc_util routines -+ */ -+void storeval(); -+ -+#define STOREVAL(list,item) \ -+ storeval(list,item) -+ -+definition *findval(); -+ -+#define FINDVAL(list,item,finder) \ -+ findval(list, item, finder) -+ -+ -+/* -+ * rpc_cout routines -+ */ -+void cprint(void); -+void emit(definition *); -+ -+/* -+ * rpc_hout routines -+ */ -+void print_datadef(definition *); -+void print_funcdef(definition *); -+ -+/* -+ * rpc_svcout routines -+ */ -+void write_most(char *, int, int); -+void write_register(void); -+void write_netid_register(char *); -+void write_nettype_register(char *); -+void write_inetd_register(char *); -+void write_rest(void); -+void write_programs(char *); -+void write_svc_aux(int); -+ -+/* -+ * rpc_clntout routines -+ */ -+void write_stubs(void); -+void printarglist(proc_list *, char *, char *); -+ -+/* -+ * rpc_tblout routines -+ */ -+void write_tables(void); -+ -+/* -+ * rpc_util -+ */ -+void pvname_svc(char *, char *); -+void pvname(char *, char *); -+void ptype(char *, char *, int); -+char * make_argname(char *, char *); -+void add_type(int, char *); -+void reinitialize(void); -+void crash(void); -+void error(char *); -+char *fixtype(char *); -+char *stringfix(char *); -+char *locase(char *); -+int isvectordef(char *, relation); -+int streq(char *, char *); -+void tabify(FILE *, int); -+void record_open(char *); -+bas_type *find_type(char *type); -+ -+/* -+ * rpc_sample -+ */ -+void write_sample_svc(definition *); -+int write_sample_clnt(definition *); -+void write_sample_clnt_main(void); -+void add_sample_msg(void); -diff --git a/rpcgen/rpcgen.1 b/rpcgen/rpcgen.1 -new file mode 100644 -index 0000000..89df7ed ---- /dev/null -+++ b/rpcgen/rpcgen.1 -@@ -0,0 +1,521 @@ -+.\" @(#)rpcgen.1 1.35 93/06/02 SMI -+.\" $FreeBSD: src/usr.bin/rpcgen/rpcgen.1,v 1.12.2.4 2002/06/21 15:28:50 charnier Exp $ -+.\" Copyright 1985-1993 Sun Microsystems, Inc. -+.Dd March 28, 1993 -+.Dt RPCGEN 1 -+.Os -+.Sh NAME -+.Nm rpcgen -+.Nd an RPC protocol compiler -+.Sh SYNOPSIS -+.Nm -+.Ar infile -+.Nm -+.Op Fl a -+.Op Fl b -+.Op Fl C -+.Oo -+.Fl D Ns Ar name Ns Op Ar =value -+.Oc -+.Op Fl i Ar size -+.Op Fl I Op Fl K Ar seconds -+.Op Fl L -+.Op Fl M -+.Op Fl N -+.Op Fl T -+.Op Fl Y Ar pathname -+.Ar infile -+.Nm -+.Oo -+.Fl c | -+.Fl h | -+.Fl l | -+.Fl m | -+.Fl t | -+.Fl \&Sc | -+.Fl \&Ss | -+.Fl \&Sm -+.Oc -+.Op Fl o Ar outfile -+.Op Ar infile -+.Nm -+.Op Fl s Ar nettype -+.Op Fl o Ar outfile -+.Op Ar infile -+.Nm -+.Op Fl n Ar netid -+.Op Fl o Ar outfile -+.Op Ar infile -+.\" .SH AVAILABILITY -+.\" .LP -+.\" SUNWcsu -+.Sh DESCRIPTION -+The -+.Nm -+utility is a tool that generates C code to implement an -+.Tn RPC -+protocol. -+The input to -+.Nm -+is a language similar to C known as -+.Tn RPC -+Language (Remote Procedure Call Language). -+.Pp -+The -+.Nm -+utility is normally used as in the first synopsis where -+it takes an input file and generates three output files. -+If the -+.Ar infile -+is named -+.Pa proto.x , -+then -+.Nm -+generates a header in -+.Pa proto.h , -+XDR routines in -+.Pa proto_xdr.c , -+server-side stubs in -+.Pa proto_svc.c , -+and client-side stubs in -+.Pa proto_clnt.c . -+With the -+.Fl T -+option, -+it also generates the -+.Tn RPC -+dispatch table in -+.Pa proto_tbl.i . -+.Pp -+The -+.Nm -+utility can also generate sample client and server files -+that can be customized to suit a particular application. -+The -+.Fl \&Sc , -+.Fl \&Ss -+and -+.Fl \&Sm -+options generate sample client, server and makefile, respectively. -+The -+.Fl a -+option generates all files, including sample files. -+If the -+.Ar infile -+is -+.Pa proto.x , -+then the client side sample file is written to -+.Pa proto_client.c , -+the server side sample file to -+.Pa proto_server.c -+and the sample makefile to -+.Pa makefile.proto . -+.Pp -+The server created can be started both by the port monitors -+(for example, -+.Xr inetd 8 ) -+or by itself. -+When it is started by a port monitor, -+it creates servers only for the transport for which -+the file descriptor -+.Em 0 -+was passed. -+The name of the transport must be specified -+by setting up the environment variable -+.Ev PM_TRANSPORT . -+When the server generated by -+.Nm -+is executed, -+it creates server handles for all the transports -+specified in -+.Ev NETPATH -+environment variable, -+or if it is unset, -+it creates server handles for all the visible transports from -+.Pa /etc/netconfig -+file. -+Note: -+the transports are chosen at run time and not at compile time. -+When the server is self-started, -+it backgrounds itself by default. -+A special define symbol -+.Em RPC_SVC_FG -+can be used to run the server process in foreground. -+.Pp -+The second synopsis provides special features which allow -+for the creation of more sophisticated -+.Tn RPC -+servers. -+These features include support for user provided -+.Em #defines -+and -+.Tn RPC -+dispatch tables. -+The entries in the -+.Tn RPC -+dispatch table contain: -+.Bl -bullet -offset indent -compact -+.It -+pointers to the service routine corresponding to that procedure, -+.It -+a pointer to the input and output arguments, -+.It -+the size of these routines. -+.El -+A server can use the dispatch table to check authorization -+and then to execute the service routine; -+a client library may use it to deal with the details of storage -+management and XDR data conversion. -+.Pp -+The other three synopses shown above are used when -+one does not want to generate all the output files, -+but only a particular one. -+See the -+.Sx EXAMPLES -+section below for examples of -+.Nm -+usage. -+When -+.Nm -+is executed with the -+.Fl s -+option, -+it creates servers for that particular class of transports. -+When -+executed with the -+.Fl n -+option, -+it creates a server for the transport specified by -+.Ar netid . -+If -+.Ar infile -+is not specified, -+.Nm -+accepts the standard input. -+.Pp -+The C preprocessor, -+.Em cc -E -+is run on the input file before it is actually interpreted by -+.Nm . -+For each type of output file, -+.Nm -+defines a special preprocessor symbol for use by the -+.Nm -+programmer: -+.Bl -tag -width indent -+.It RPC_HDR -+defined when compiling into headers -+.It RPC_XDR -+defined when compiling into XDR routines -+.It RPC_SVC -+defined when compiling into server-side stubs -+.It RPC_CLNT -+defined when compiling into client-side stubs -+.It RPC_TBL -+defined when compiling into RPC dispatch tables -+.El -+.Pp -+Any line beginning with -+.Dq % -+is passed directly into the output file, -+uninterpreted by -+.Nm . -+To specify the path name of the C preprocessor use -+.Fl Y -+flag. -+.Pp -+For every data type referred to in -+.Ar infile , -+.Nm -+assumes that there exists a -+routine with the string -+.Em xdr_ -+prepended to the name of the data type. -+If this routine does not exist in the -+.Tn RPC/XDR -+library, it must be provided. -+Providing an undefined data type -+allows customization of -+.Xr xdr 3 -+routines. -+.Sh OPTIONS -+The following options are available: -+.Bl -tag -width indent -+.It Fl a -+Generate all files, including sample files. -+.It Fl b -+Backward compatibility mode. -+Generate transport specific -+.Tn RPC -+code for older versions -+of the operating system. -+.Pp -+Note: in -+.Fx , -+this compatibility flag is turned on by -+default since -+.Fx -+supports only the older -+.Tn ONC RPC -+library. -+.It Fl c -+Compile into -+.Tn XDR -+routines. -+.It Fl C -+Generate header and stub files which can be used with -+.Tn ANSI -+C compilers. Headers generated with this flag can also be -+used with C++ programs. -+.It Fl D Ns Ar name -+.It Fl D Ns Ar name=value -+.\".It Fl D Ns Ar name Ns Op Ar =value -+Define a symbol -+.Ar name . -+Equivalent to the -+.Em #define -+directive in the source. -+If no -+.Ar value -+is given, -+.Ar value -+is defined as -+.Em 1 . -+This option may be specified more than once. -+.It Fl h -+Compile into C data-definitions (a header). -+.Fl T -+option can be used in conjunction to produce a -+header which supports -+.Tn RPC -+dispatch tables. -+.It Fl i Ar size -+Size at which to start generating inline code. -+This option is useful for optimization. -+The default size is 5. -+.Pp -+Note: in order to provide backwards compatibility with the older -+.Nm -+on the -+.Fx -+platform, the default is actually 0 (which means -+that inline code generation is disabled by default). You must specify -+a non-zero value explicitly to override this default. -+.It Fl I -+Compile support for -+.Xr inetd 8 -+in the server side stubs. -+Such servers can be self-started or can be started by -+.Nm inetd . -+When the server is self-started, it backgrounds itself by default. -+A special define symbol -+.Em RPC_SVC_FG -+can be used to run the -+server process in foreground, or the user may simply compile without -+the -+.Fl I -+option. -+.Pp -+If there are no pending client requests, the -+.Nm inetd -+servers exit after 120 seconds (default). -+The default can be changed with the -+.Fl K -+option. -+All the error messages for -+.Nm inetd -+servers -+are always logged with -+.Xr syslog 3 . -+.\" .IP -+.\" Note: -+.\" this option is supported for backward compatibility only. -+.\" By default, -+.\" .B rpcgen -+.\" generates servers that can be invoked through portmonitors. -+.Pp -+.It Fl K Ar seconds -+By default, services created using -+.Nm -+and invoked through -+port monitors wait 120 seconds -+after servicing a request before exiting. -+That interval can be changed using the -+.Fl K -+flag. -+To create a server that exits immediately upon servicing a request, -+use -+.Fl K Ar 0 . -+To create a server that never exits, the appropriate argument is -+.Fl k Ar -1 . -+.Pp -+When monitoring for a server, -+some portmonitors -+.Em always -+spawn a new process in response to a service request. -+If it is known that a server will be used with such a monitor, the -+server should exit immediately on completion. -+For such servers, -+.Nm -+should be used with -+.Fl K Ar 0 . -+.It Fl l -+Compile into client-side stubs. -+.It Fl L -+When the servers are started in foreground, use -+.Xr syslog 3 -+to log the server errors instead of printing them on the standard -+error. -+.It Fl m -+Compile into server-side stubs, -+but do not generate a -+.Qq main -+routine. -+This option is useful for doing callback-routines -+and for users who need to write their own -+.Qq main -+routine to do initialization. -+.It Fl M -+Generate multithread-safe stubs for passing arguments and results between -+rpcgen generated code and user written code. -+This option is useful -+for users who want to use threads in their code. -+However, the -+.Xr rpc_svc_calls 3 -+functions are not yet MT-safe, which means that rpcgen generated server-side -+code will not be MT-safe. -+.It Fl N -+This option allows procedures to have multiple arguments. -+It also uses the style of parameter passing that closely resembles C. -+So, when passing an argument to a remote procedure, you do not have to -+pass a pointer to the argument, but can pass the argument itself. -+This behavior is different from the old style of -+.Nm -+generated code. -+To maintain backward compatibility, -+this option is not the default. -+.It Fl n Ar netid -+Compile into server-side stubs for the transport -+specified by -+.Ar netid . -+There should be an entry for -+.Ar netid -+in the -+netconfig database. -+This option may be specified more than once, -+so as to compile a server that serves multiple transports. -+.It Fl o Ar outfile -+Specify the name of the output file. -+If none is specified, -+standard output is used -+( -+.Fl c , -+.Fl h , -+.Fl l , -+.Fl m , -+.Fl n , -+.Fl s , -+.Fl \&Sc , -+.Fl \&Sm , -+.Fl \&Ss , -+and -+.Fl t -+modes only). -+.It Fl s Ar nettype -+Compile into server-side stubs for all the -+transports belonging to the class -+.Ar nettype . -+The supported classes are -+.Em netpath , -+.Em visible , -+.Em circuit_n , -+.Em circuit_v , -+.Em datagram_n , -+.Em datagram_v , -+.Em tcp , -+and -+.Em udp -+(see -+.Xr rpc 3 -+for the meanings associated with these classes). -+This option may be specified more than once. -+Note: -+the transports are chosen at run time and not at compile time. -+.It Fl \&Sc -+Generate sample client code that uses remote procedure calls. -+.It Fl \&Sm -+Generate a sample -+.Pa Makefile -+which can be used for compiling the application. -+.It Fl \&Ss -+Generate sample server code that uses remote procedure calls. -+.It Fl t -+Compile into -+.Tn RPC -+dispatch table. -+.It Fl T -+Generate the code to support -+.Tn RPC -+dispatch tables. -+.Pp -+The options -+.Fl c , -+.Fl h , -+.Fl l , -+.Fl m , -+.Fl s , -+.Fl \&Sc , -+.Fl \&Sm , -+.Fl \&Ss , -+and -+.Fl t -+are used exclusively to generate a particular type of file, -+while the options -+.Fl D -+and -+.Fl T -+are global and can be used with the other options. -+.It Fl Y Ar pathname -+Give the name of the directory where -+.Nm -+will start looking for the C-preprocessor. -+.El -+.Sh EXAMPLES -+The following example: -+.Dl example% rpcgen -T prot.x -+.Pp -+generates all the five files: -+.Pa prot.h , -+.Pa prot_clnt.c , -+.Pa prot_svc.c , -+.Pa prot_xdr.c -+and -+.Pa prot_tbl.i . -+.Pp -+The following example sends the C data-definitions (header) -+to the standard output. -+.Dl example% rpcgen -h prot.x -+.Pp -+To send the test version of the -+.Fl D Ns Ar TEST , -+server side stubs for -+all the transport belonging to the class -+.Ar datagram_n -+to standard output, use: -+.Dl example% rpcgen -s datagram_n -DTEST prot.x -+.Pp -+To create the server side stubs for the transport indicated -+by -+.Ar netid -+tcp, -+use: -+.Dl example% rpcgen -n tcp -o prot_svc.c prot.x -+.Sh SEE ALSO -+.Xr cc 1 , -+.Xr rpc 3 , -+.Xr syslog 3 , -+.Xr inetd 8 -+.\" .BR rpc_svc_calls (3) -+.Rs -+.%T The rpcgen chapter in the NETP manual -+.Re --- -1.9.1 - diff --git a/package.bak/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch b/package.bak/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch deleted file mode 100644 index e302c5d1ce..0000000000 --- a/package.bak/libtirpc/0004-Automatically-generate-XDR-header-files-from-.x-sour.patch +++ /dev/null @@ -1,1002 +0,0 @@ -From eba198c27f2b8d3f0b27ea4a42f3dc79d397440c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 17:29:53 +0100 -Subject: [PATCH] Automatically generate XDR header files from .x sources using - rpcgen - -[Gustavo: update after dropping non-IPv6 support] -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 19 +- - src/Makefile.am | 2 +- - tirpc/rpc/rpcb_prot.h | 797 -------------------------------------------------- - tirpc/rpcsvc/crypt.h | 109 ------- - 4 files changed, 17 insertions(+), 910 deletions(-) - delete mode 100644 tirpc/rpc/rpcb_prot.h - delete mode 100644 tirpc/rpcsvc/crypt.h - -diff --git a/Makefile.am b/Makefile.am -index 8558289..aa5908e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,9 @@ - SUBDIRS = src man doc rpcgen - ACLOCAL_AMFLAGS = -I m4 - -+GENFILES = tirpc/rpcsvc/crypt.h \ -+ tirpc/rpc/rpcb_prot.h -+ - noinst_HEADERS = tirpc/reentrant.h \ - tirpc/getpeereid.h \ - tirpc/libc_private.h \ -@@ -8,7 +11,6 @@ noinst_HEADERS = tirpc/reentrant.h \ - - nobase_include_HEADERS = tirpc/netconfig.h \ - tirpc/rpcsvc/crypt.x \ -- tirpc/rpcsvc/crypt.h \ - tirpc/rpc/xdr.h \ - tirpc/rpc/types.h \ - tirpc/rpc/svc_soc.h \ -@@ -20,7 +22,6 @@ nobase_include_HEADERS = tirpc/netconfig.h \ - tirpc/rpc/rpcent.h \ - tirpc/rpc/rpc_com.h \ - tirpc/rpc/rpcb_prot.x \ -- tirpc/rpc/rpcb_prot.h \ - tirpc/rpc/rpcb_clnt.h \ - tirpc/rpc/raw.h \ - tirpc/rpc/pmap_rmt.h \ -@@ -51,5 +52,17 @@ endif - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA = libtirpc.pc - --CLEANFILES = cscope.* *~ -+nobase_nodist_include_HEADERS = $(GENFILES) -+BUILT_SOURCES = $(GENFILES) -+ -+$(GENFILES): %.h: %.x $(top_builddir)/rpcgen/rpcgen -+ mkdir -p $(dir $@) -+ $(top_builddir)/rpcgen/rpcgen -h -o $@ $< -+ -+$(top_builddir)/rpcgen/rpcgen: force -+ cd rpcgen && $(MAKE) -+ -+force: -+ -+CLEANFILES = cscope.* *~ $(GENFILES) - DISTCLEANFILES = Makefile.in libtirpc*.tar.gz -diff --git a/src/Makefile.am b/src/Makefile.am -index 7428e92..0356171 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -8,7 +8,7 @@ - noinst_HEADERS = rpc_com.h debug.h - - AM_CPPFLAGS = -I$(top_srcdir)/tirpc -include config.h -DPORTMAP -DINET6 \ -- -D_GNU_SOURCE -Wall -pipe -+ -D_GNU_SOURCE -Wall -pipe -I$(top_builddir)/tirpc - - lib_LTLIBRARIES = libtirpc.la - -diff --git a/tirpc/rpc/rpcb_prot.h b/tirpc/rpc/rpcb_prot.h -deleted file mode 100644 -index 7ae48b8..0000000 ---- a/tirpc/rpc/rpcb_prot.h -+++ /dev/null -@@ -1,797 +0,0 @@ --/* -- * Please do not edit this file. -- * It was generated using rpcgen. -- */ -- --#ifndef _RPCB_PROT_H_RPCGEN --#define _RPCB_PROT_H_RPCGEN -- --#include -- --#ifndef IXDR_GET_INT32 --#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf)) --#endif --#ifndef IXDR_PUT_INT32 --#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v)) --#endif --#ifndef IXDR_GET_U_INT32 --#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf)) --#endif --#ifndef IXDR_PUT_U_INT32 --#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v)) --#endif --/* -- * $FreeBSD: src/include/rpc/rpcb_prot.x,v 1.3 2002/03/13 10:29:06 obrien Exp $ -- * -- * Copyright (c) 2009, Sun Microsystems, Inc. -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions are met: -- * - Redistributions of source code must retain the above copyright notice, -- * this list of conditions and the following disclaimer. -- * - Redistributions in binary form must reproduce the above copyright notice, -- * this list of conditions and the following disclaimer in the documentation -- * and/or other materials provided with the distribution. -- * - Neither the name of Sun Microsystems, Inc. nor the names of its -- * contributors may be used to endorse or promote products derived -- * from this software without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -- * POSSIBILITY OF SUCH DAMAGE. -- */ --/* -- * Copyright (c) 1988 by Sun Microsystems, Inc. -- */ --/* from rpcb_prot.x */ -- --/* #pragma ident "@(#)rpcb_prot.x 1.5 94/04/29 SMI" */ -- --#ifndef _KERNEL -- -- --/* -- * The following procedures are supported by the protocol in version 3: -- * -- * RPCBPROC_NULL() returns () -- * takes nothing, returns nothing -- * -- * RPCBPROC_SET(rpcb) returns (bool_t) -- * TRUE is success, FALSE is failure. Registers the tuple -- * [prog, vers, address, owner, netid]. -- * Finds out owner and netid information on its own. -- * -- * RPCBPROC_UNSET(rpcb) returns (bool_t) -- * TRUE is success, FALSE is failure. Un-registers tuple -- * [prog, vers, netid]. addresses is ignored. -- * If netid is NULL, unregister all. -- * -- * RPCBPROC_GETADDR(rpcb) returns (string). -- * 0 is failure. Otherwise returns the universal address where the -- * triple [prog, vers, netid] is registered. Ignore address and owner. -- * -- * RPCBPROC_DUMP() RETURNS (rpcblist_ptr) -- * used to dump the entire rpcbind maps -- * -- * RPCBPROC_CALLIT(rpcb_rmtcallargs) -- * RETURNS (rpcb_rmtcallres); -- * Calls the procedure on the remote machine. If it is not registered, -- * this procedure is quiet; i.e. it does not return error information!!! -- * This routine only passes null authentication parameters. -- * It has no interface to xdr routines for RPCBPROC_CALLIT. -- * -- * RPCBPROC_GETTIME() returns (int). -- * Gets the remote machines time -- * -- * RPCBPROC_UADDR2TADDR(strint) RETURNS (struct netbuf) -- * Returns the netbuf address from universal address. -- * -- * RPCBPROC_TADDR2UADDR(struct netbuf) RETURNS (string) -- * Returns the universal address from netbuf address. -- * -- * END OF RPCBIND VERSION 3 PROCEDURES -- */ --/* -- * Except for RPCBPROC_CALLIT, the procedures above are carried over to -- * rpcbind version 4. Those below are added or modified for version 4. -- * NOTE: RPCBPROC_BCAST HAS THE SAME FUNCTIONALITY AND PROCEDURE NUMBER -- * AS RPCBPROC_CALLIT. -- * -- * RPCBPROC_BCAST(rpcb_rmtcallargs) -- * RETURNS (rpcb_rmtcallres); -- * Calls the procedure on the remote machine. If it is not registered, -- * this procedure IS quiet; i.e. it DOES NOT return error information!!! -- * This routine should be used for broadcasting and nothing else. -- * -- * RPCBPROC_GETVERSADDR(rpcb) returns (string). -- * 0 is failure. Otherwise returns the universal address where the -- * triple [prog, vers, netid] is registered. Ignore address and owner. -- * Same as RPCBPROC_GETADDR except that if the given version number -- * is not available, the address is not returned. -- * -- * RPCBPROC_INDIRECT(rpcb_rmtcallargs) -- * RETURNS (rpcb_rmtcallres); -- * Calls the procedure on the remote machine. If it is not registered, -- * this procedure is NOT quiet; i.e. it DOES return error information!!! -- * as any normal application would expect. -- * -- * RPCBPROC_GETADDRLIST(rpcb) returns (rpcb_entry_list_ptr). -- * Same as RPCBPROC_GETADDR except that it returns a list of all the -- * addresses registered for the combination (prog, vers) (for all -- * transports). -- * -- * RPCBPROC_GETSTAT(void) returns (rpcb_stat_byvers) -- * Returns the statistics about the kind of requests received by rpcbind. -- */ -- --/* -- * A mapping of (program, version, network ID) to address -- */ -- --struct rpcb { -- rpcprog_t r_prog; -- rpcvers_t r_vers; -- char *r_netid; -- char *r_addr; -- char *r_owner; --}; --typedef struct rpcb rpcb; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb(XDR *, rpcb*); --#elif __STDC__ --extern bool_t xdr_rpcb(XDR *, rpcb*); --#else /* Old Style C */ --bool_t xdr_rpcb(); --#endif /* Old Style C */ -- -- --typedef rpcb RPCB; -- -- --/* -- * A list of mappings -- * -- * Below are two definitions for the rpcblist structure. This is done because -- * xdr_rpcblist() is specified to take a struct rpcblist **, rather than a -- * struct rpcblist * that rpcgen would produce. One version of the rpcblist -- * structure (actually called rp__list) is used with rpcgen, and the other is -- * defined only in the header file for compatibility with the specified -- * interface. -- */ -- --struct rp__list { -- rpcb rpcb_map; -- struct rp__list *rpcb_next; --}; --typedef struct rp__list rp__list; --#ifdef __cplusplus --extern "C" bool_t xdr_rp__list(XDR *, rp__list*); --#elif __STDC__ --extern bool_t xdr_rp__list(XDR *, rp__list*); --#else /* Old Style C */ --bool_t xdr_rp__list(); --#endif /* Old Style C */ -- -- --typedef rp__list *rpcblist_ptr; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*); --#elif __STDC__ --extern bool_t xdr_rpcblist_ptr(XDR *, rpcblist_ptr*); --#else /* Old Style C */ --bool_t xdr_rpcblist_ptr(); --#endif /* Old Style C */ -- -- --typedef struct rp__list rpcblist; --typedef struct rp__list RPCBLIST; -- --#ifndef __cplusplus --struct rpcblist { -- RPCB rpcb_map; -- struct rpcblist *rpcb_next; --}; --#endif -- --#ifdef __cplusplus --extern "C" { --#endif --extern bool_t xdr_rpcblist(XDR *, rpcblist**); --#ifdef __cplusplus --} --#endif -- -- --/* -- * Arguments of remote calls -- */ -- --struct rpcb_rmtcallargs { -- rpcprog_t prog; -- rpcvers_t vers; -- rpcproc_t proc; -- struct { -- u_int args_len; -- char *args_val; -- } args; --}; --typedef struct rpcb_rmtcallargs rpcb_rmtcallargs; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*); --#elif __STDC__ --extern bool_t xdr_rpcb_rmtcallargs(XDR *, rpcb_rmtcallargs*); --#else /* Old Style C */ --bool_t xdr_rpcb_rmtcallargs(); --#endif /* Old Style C */ -- -- --/* -- * Client-side only representation of rpcb_rmtcallargs structure. -- * -- * The routine that XDRs the rpcb_rmtcallargs structure must deal with the -- * opaque arguments in the "args" structure. xdr_rpcb_rmtcallargs() needs to -- * be passed the XDR routine that knows the args' structure. This routine -- * doesn't need to go over-the-wire (and it wouldn't make sense anyway) since -- * the application being called already knows the args structure. So we use a -- * different "XDR" structure on the client side, r_rpcb_rmtcallargs, which -- * includes the args' XDR routine. -- */ --struct r_rpcb_rmtcallargs { -- rpcprog_t prog; -- rpcvers_t vers; -- rpcproc_t proc; -- struct { -- u_int args_len; -- char *args_val; -- } args; -- xdrproc_t xdr_args; /* encodes args */ --}; -- -- --/* -- * Results of the remote call -- */ -- --struct rpcb_rmtcallres { -- char *addr; -- struct { -- u_int results_len; -- char *results_val; -- } results; --}; --typedef struct rpcb_rmtcallres rpcb_rmtcallres; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*); --#elif __STDC__ --extern bool_t xdr_rpcb_rmtcallres(XDR *, rpcb_rmtcallres*); --#else /* Old Style C */ --bool_t xdr_rpcb_rmtcallres(); --#endif /* Old Style C */ -- -- --/* -- * Client-side only representation of rpcb_rmtcallres structure. -- */ --struct r_rpcb_rmtcallres { -- char *addr; -- struct { -- u_int32_t results_len; -- char *results_val; -- } results; -- xdrproc_t xdr_res; /* decodes results */ --}; -- --/* -- * rpcb_entry contains a merged address of a service on a particular -- * transport, plus associated netconfig information. A list of rpcb_entrys -- * is returned by RPCBPROC_GETADDRLIST. See netconfig.h for values used -- * in r_nc_* fields. -- */ -- --struct rpcb_entry { -- char *r_maddr; -- char *r_nc_netid; -- u_int r_nc_semantics; -- char *r_nc_protofmly; -- char *r_nc_proto; --}; --typedef struct rpcb_entry rpcb_entry; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_entry(XDR *, rpcb_entry*); --#elif __STDC__ --extern bool_t xdr_rpcb_entry(XDR *, rpcb_entry*); --#else /* Old Style C */ --bool_t xdr_rpcb_entry(); --#endif /* Old Style C */ -- -- --/* -- * A list of addresses supported by a service. -- */ -- --struct rpcb_entry_list { -- rpcb_entry rpcb_entry_map; -- struct rpcb_entry_list *rpcb_entry_next; --}; --typedef struct rpcb_entry_list rpcb_entry_list; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*); --#elif __STDC__ --extern bool_t xdr_rpcb_entry_list(XDR *, rpcb_entry_list*); --#else /* Old Style C */ --bool_t xdr_rpcb_entry_list(); --#endif /* Old Style C */ -- -- --typedef rpcb_entry_list *rpcb_entry_list_ptr; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*); --#elif __STDC__ --extern bool_t xdr_rpcb_entry_list_ptr(XDR *, rpcb_entry_list_ptr*); --#else /* Old Style C */ --bool_t xdr_rpcb_entry_list_ptr(); --#endif /* Old Style C */ -- -- --/* -- * rpcbind statistics -- */ -- --#define rpcb_highproc_2 RPCBPROC_CALLIT --#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR --#define rpcb_highproc_4 RPCBPROC_GETSTAT --#define RPCBSTAT_HIGHPROC 13 --#define RPCBVERS_STAT 3 --#define RPCBVERS_4_STAT 2 --#define RPCBVERS_3_STAT 1 --#define RPCBVERS_2_STAT 0 -- --/* Link list of all the stats about getport and getaddr */ -- --struct rpcbs_addrlist { -- rpcprog_t prog; -- rpcvers_t vers; -- int success; -- int failure; -- char *netid; -- struct rpcbs_addrlist *next; --}; --typedef struct rpcbs_addrlist rpcbs_addrlist; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*); --#elif __STDC__ --extern bool_t xdr_rpcbs_addrlist(XDR *, rpcbs_addrlist*); --#else /* Old Style C */ --bool_t xdr_rpcbs_addrlist(); --#endif /* Old Style C */ -- -- --/* Link list of all the stats about rmtcall */ -- --struct rpcbs_rmtcalllist { -- rpcprog_t prog; -- rpcvers_t vers; -- rpcproc_t proc; -- int success; -- int failure; -- int indirect; -- char *netid; -- struct rpcbs_rmtcalllist *next; --}; --typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*); --#elif __STDC__ --extern bool_t xdr_rpcbs_rmtcalllist(XDR *, rpcbs_rmtcalllist*); --#else /* Old Style C */ --bool_t xdr_rpcbs_rmtcalllist(); --#endif /* Old Style C */ -- -- --typedef int rpcbs_proc[RPCBSTAT_HIGHPROC]; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc); --#elif __STDC__ --extern bool_t xdr_rpcbs_proc(XDR *, rpcbs_proc); --#else /* Old Style C */ --bool_t xdr_rpcbs_proc(); --#endif /* Old Style C */ -- -- --typedef rpcbs_addrlist *rpcbs_addrlist_ptr; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*); --#elif __STDC__ --extern bool_t xdr_rpcbs_addrlist_ptr(XDR *, rpcbs_addrlist_ptr*); --#else /* Old Style C */ --bool_t xdr_rpcbs_addrlist_ptr(); --#endif /* Old Style C */ -- -- --typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*); --#elif __STDC__ --extern bool_t xdr_rpcbs_rmtcalllist_ptr(XDR *, rpcbs_rmtcalllist_ptr*); --#else /* Old Style C */ --bool_t xdr_rpcbs_rmtcalllist_ptr(); --#endif /* Old Style C */ -- -- --struct rpcb_stat { -- rpcbs_proc info; -- int setinfo; -- int unsetinfo; -- rpcbs_addrlist_ptr addrinfo; -- rpcbs_rmtcalllist_ptr rmtinfo; --}; --typedef struct rpcb_stat rpcb_stat; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_stat(XDR *, rpcb_stat*); --#elif __STDC__ --extern bool_t xdr_rpcb_stat(XDR *, rpcb_stat*); --#else /* Old Style C */ --bool_t xdr_rpcb_stat(); --#endif /* Old Style C */ -- -- --/* -- * One rpcb_stat structure is returned for each version of rpcbind -- * being monitored. -- */ -- --typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT]; --#ifdef __cplusplus --extern "C" bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers); --#elif __STDC__ --extern bool_t xdr_rpcb_stat_byvers(XDR *, rpcb_stat_byvers); --#else /* Old Style C */ --bool_t xdr_rpcb_stat_byvers(); --#endif /* Old Style C */ -- -- --/* -- * We don't define netbuf in RPCL, since it would contain structure member -- * names that would conflict with the definition of struct netbuf in -- * . Instead we merely declare the XDR routine xdr_netbuf() here, -- * and implement it ourselves in rpc/rpcb_prot.c. -- */ --#ifdef __cplusplus --extern "C" bool_t xdr_netbuf(XDR *, struct netbuf *); -- --#else /* __STDC__ */ --extern bool_t xdr_netbuf(XDR *, struct netbuf *); -- --#endif -- --#define RPCBVERS_3 RPCBVERS --#define RPCBVERS_4 RPCBVERS4 -- --#define _PATH_RPCBINDSOCK "/var/run/rpcbind.sock" -- --#else /* ndef _KERNEL */ --#ifdef __cplusplus --extern "C" { --#endif -- --/* -- * A mapping of (program, version, network ID) to address -- */ --struct rpcb { -- rpcprog_t r_prog; /* program number */ -- rpcvers_t r_vers; /* version number */ -- char *r_netid; /* network id */ -- char *r_addr; /* universal address */ -- char *r_owner; /* owner of the mapping */ --}; --typedef struct rpcb RPCB; -- --/* -- * A list of mappings -- */ --struct rpcblist { -- RPCB rpcb_map; -- struct rpcblist *rpcb_next; --}; --typedef struct rpcblist RPCBLIST; --typedef struct rpcblist *rpcblist_ptr; -- --/* -- * Remote calls arguments -- */ --struct rpcb_rmtcallargs { -- rpcprog_t prog; /* program number */ -- rpcvers_t vers; /* version number */ -- rpcproc_t proc; /* procedure number */ -- u_int32_t arglen; /* arg len */ -- caddr_t args_ptr; /* argument */ -- xdrproc_t xdr_args; /* XDR routine for argument */ --}; --typedef struct rpcb_rmtcallargs rpcb_rmtcallargs; -- --/* -- * Remote calls results -- */ --struct rpcb_rmtcallres { -- char *addr_ptr; /* remote universal address */ -- u_int32_t resultslen; /* results length */ -- caddr_t results_ptr; /* results */ -- xdrproc_t xdr_results; /* XDR routine for result */ --}; --typedef struct rpcb_rmtcallres rpcb_rmtcallres; -- --struct rpcb_entry { -- char *r_maddr; -- char *r_nc_netid; -- unsigned int r_nc_semantics; -- char *r_nc_protofmly; -- char *r_nc_proto; --}; --typedef struct rpcb_entry rpcb_entry; -- --/* -- * A list of addresses supported by a service. -- */ -- --struct rpcb_entry_list { -- rpcb_entry rpcb_entry_map; -- struct rpcb_entry_list *rpcb_entry_next; --}; --typedef struct rpcb_entry_list rpcb_entry_list; -- --typedef rpcb_entry_list *rpcb_entry_list_ptr; -- --/* -- * rpcbind statistics -- */ -- --#define rpcb_highproc_2 RPCBPROC_CALLIT --#define rpcb_highproc_3 RPCBPROC_TADDR2UADDR --#define rpcb_highproc_4 RPCBPROC_GETSTAT --#define RPCBSTAT_HIGHPROC 13 --#define RPCBVERS_STAT 3 --#define RPCBVERS_4_STAT 2 --#define RPCBVERS_3_STAT 1 --#define RPCBVERS_2_STAT 0 -- --/* Link list of all the stats about getport and getaddr */ -- --struct rpcbs_addrlist { -- rpcprog_t prog; -- rpcvers_t vers; -- int success; -- int failure; -- char *netid; -- struct rpcbs_addrlist *next; --}; --typedef struct rpcbs_addrlist rpcbs_addrlist; -- --/* Link list of all the stats about rmtcall */ -- --struct rpcbs_rmtcalllist { -- rpcprog_t prog; -- rpcvers_t vers; -- rpcproc_t proc; -- int success; -- int failure; -- int indirect; -- char *netid; -- struct rpcbs_rmtcalllist *next; --}; --typedef struct rpcbs_rmtcalllist rpcbs_rmtcalllist; -- --typedef int rpcbs_proc[RPCBSTAT_HIGHPROC]; -- --typedef rpcbs_addrlist *rpcbs_addrlist_ptr; -- --typedef rpcbs_rmtcalllist *rpcbs_rmtcalllist_ptr; -- --struct rpcb_stat { -- rpcbs_proc info; -- int setinfo; -- int unsetinfo; -- rpcbs_addrlist_ptr addrinfo; -- rpcbs_rmtcalllist_ptr rmtinfo; --}; --typedef struct rpcb_stat rpcb_stat; -- --/* -- * One rpcb_stat structure is returned for each version of rpcbind -- * being monitored. -- */ -- --typedef rpcb_stat rpcb_stat_byvers[RPCBVERS_STAT]; -- --#ifdef __cplusplus --} --#endif -- --#endif /* ndef _KERNEL */ -- --#define RPCBPROG ((u_int32_t)100000) --#define RPCBVERS ((u_int32_t)3) -- --#ifdef __cplusplus --#define RPCBPROC_SET ((u_int32_t)1) --extern "C" bool_t * rpcbproc_set_3(rpcb *, CLIENT *); --extern "C" bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_UNSET ((u_int32_t)2) --extern "C" bool_t * rpcbproc_unset_3(rpcb *, CLIENT *); --extern "C" bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_GETADDR ((u_int32_t)3) --extern "C" char ** rpcbproc_getaddr_3(rpcb *, CLIENT *); --extern "C" char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_DUMP ((u_int32_t)4) --extern "C" rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *); --extern "C" rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *); --#define RPCBPROC_CALLIT ((u_int32_t)5) --extern "C" rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *); --extern "C" rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *); --#define RPCBPROC_GETTIME ((u_int32_t)6) --extern "C" u_int * rpcbproc_gettime_3(void *, CLIENT *); --extern "C" u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *); --#define RPCBPROC_UADDR2TADDR ((u_int32_t)7) --extern "C" struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *); --extern "C" struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *); --#define RPCBPROC_TADDR2UADDR ((u_int32_t)8) --extern "C" char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *); --extern "C" char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *); -- --#elif __STDC__ --#define RPCBPROC_SET ((u_int32_t)1) --extern bool_t * rpcbproc_set_3(rpcb *, CLIENT *); --extern bool_t * rpcbproc_set_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_UNSET ((u_int32_t)2) --extern bool_t * rpcbproc_unset_3(rpcb *, CLIENT *); --extern bool_t * rpcbproc_unset_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_GETADDR ((u_int32_t)3) --extern char ** rpcbproc_getaddr_3(rpcb *, CLIENT *); --extern char ** rpcbproc_getaddr_3_svc(rpcb *, struct svc_req *); --#define RPCBPROC_DUMP ((u_int32_t)4) --extern rpcblist_ptr * rpcbproc_dump_3(void *, CLIENT *); --extern rpcblist_ptr * rpcbproc_dump_3_svc(void *, struct svc_req *); --#define RPCBPROC_CALLIT ((u_int32_t)5) --extern rpcb_rmtcallres * rpcbproc_callit_3(rpcb_rmtcallargs *, CLIENT *); --extern rpcb_rmtcallres * rpcbproc_callit_3_svc(rpcb_rmtcallargs *, struct svc_req *); --#define RPCBPROC_GETTIME ((u_int32_t)6) --extern u_int * rpcbproc_gettime_3(void *, CLIENT *); --extern u_int * rpcbproc_gettime_3_svc(void *, struct svc_req *); --#define RPCBPROC_UADDR2TADDR ((u_int32_t)7) --extern struct netbuf * rpcbproc_uaddr2taddr_3(char **, CLIENT *); --extern struct netbuf * rpcbproc_uaddr2taddr_3_svc(char **, struct svc_req *); --#define RPCBPROC_TADDR2UADDR ((u_int32_t)8) --extern char ** rpcbproc_taddr2uaddr_3(struct netbuf *, CLIENT *); --extern char ** rpcbproc_taddr2uaddr_3_svc(struct netbuf *, struct svc_req *); -- --#else /* Old Style C */ --#define RPCBPROC_SET ((u_int32_t)1) --extern bool_t * rpcbproc_set_3(); --extern bool_t * rpcbproc_set_3_svc(); --#define RPCBPROC_UNSET ((u_int32_t)2) --extern bool_t * rpcbproc_unset_3(); --extern bool_t * rpcbproc_unset_3_svc(); --#define RPCBPROC_GETADDR ((u_int32_t)3) --extern char ** rpcbproc_getaddr_3(); --extern char ** rpcbproc_getaddr_3_svc(); --#define RPCBPROC_DUMP ((u_int32_t)4) --extern rpcblist_ptr * rpcbproc_dump_3(); --extern rpcblist_ptr * rpcbproc_dump_3_svc(); --#define RPCBPROC_CALLIT ((u_int32_t)5) --extern rpcb_rmtcallres * rpcbproc_callit_3(); --extern rpcb_rmtcallres * rpcbproc_callit_3_svc(); --#define RPCBPROC_GETTIME ((u_int32_t)6) --extern u_int * rpcbproc_gettime_3(); --extern u_int * rpcbproc_gettime_3_svc(); --#define RPCBPROC_UADDR2TADDR ((u_int32_t)7) --extern struct netbuf * rpcbproc_uaddr2taddr_3(); --extern struct netbuf * rpcbproc_uaddr2taddr_3_svc(); --#define RPCBPROC_TADDR2UADDR ((u_int32_t)8) --extern char ** rpcbproc_taddr2uaddr_3(); --extern char ** rpcbproc_taddr2uaddr_3_svc(); --#endif /* Old Style C */ --#define RPCBVERS4 ((u_int32_t)4) -- --#ifdef __cplusplus --extern "C" bool_t * rpcbproc_set_4(rpcb *, CLIENT *); --extern "C" bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *); --extern "C" bool_t * rpcbproc_unset_4(rpcb *, CLIENT *); --extern "C" bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *); --extern "C" char ** rpcbproc_getaddr_4(rpcb *, CLIENT *); --extern "C" char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *); --extern "C" rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *); --extern "C" rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *); --#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT) --extern "C" rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *); --extern "C" rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *); --extern "C" u_int * rpcbproc_gettime_4(void *, CLIENT *); --extern "C" u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *); --extern "C" struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *); --extern "C" struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *); --extern "C" char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *); --extern "C" char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *); --#define RPCBPROC_GETVERSADDR ((u_int32_t)9) --extern "C" char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *); --extern "C" char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *); --#define RPCBPROC_INDIRECT ((u_int32_t)10) --extern "C" rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *); --extern "C" rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *); --#define RPCBPROC_GETADDRLIST ((u_int32_t)11) --extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *); --extern "C" rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *); --#define RPCBPROC_GETSTAT ((u_int32_t)12) --extern "C" rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *); --extern "C" rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *); -- --#elif __STDC__ --extern bool_t * rpcbproc_set_4(rpcb *, CLIENT *); --extern bool_t * rpcbproc_set_4_svc(rpcb *, struct svc_req *); --extern bool_t * rpcbproc_unset_4(rpcb *, CLIENT *); --extern bool_t * rpcbproc_unset_4_svc(rpcb *, struct svc_req *); --extern char ** rpcbproc_getaddr_4(rpcb *, CLIENT *); --extern char ** rpcbproc_getaddr_4_svc(rpcb *, struct svc_req *); --extern rpcblist_ptr * rpcbproc_dump_4(void *, CLIENT *); --extern rpcblist_ptr * rpcbproc_dump_4_svc(void *, struct svc_req *); --#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT) --extern rpcb_rmtcallres * rpcbproc_bcast_4(rpcb_rmtcallargs *, CLIENT *); --extern rpcb_rmtcallres * rpcbproc_bcast_4_svc(rpcb_rmtcallargs *, struct svc_req *); --extern u_int * rpcbproc_gettime_4(void *, CLIENT *); --extern u_int * rpcbproc_gettime_4_svc(void *, struct svc_req *); --extern struct netbuf * rpcbproc_uaddr2taddr_4(char **, CLIENT *); --extern struct netbuf * rpcbproc_uaddr2taddr_4_svc(char **, struct svc_req *); --extern char ** rpcbproc_taddr2uaddr_4(struct netbuf *, CLIENT *); --extern char ** rpcbproc_taddr2uaddr_4_svc(struct netbuf *, struct svc_req *); --#define RPCBPROC_GETVERSADDR ((u_int32_t)9) --extern char ** rpcbproc_getversaddr_4(rpcb *, CLIENT *); --extern char ** rpcbproc_getversaddr_4_svc(rpcb *, struct svc_req *); --#define RPCBPROC_INDIRECT ((u_int32_t)10) --extern rpcb_rmtcallres * rpcbproc_indirect_4(rpcb_rmtcallargs *, CLIENT *); --extern rpcb_rmtcallres * rpcbproc_indirect_4_svc(rpcb_rmtcallargs *, struct svc_req *); --#define RPCBPROC_GETADDRLIST ((u_int32_t)11) --extern rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(rpcb *, CLIENT *); --extern rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(rpcb *, struct svc_req *); --#define RPCBPROC_GETSTAT ((u_int32_t)12) --extern rpcb_stat * rpcbproc_getstat_4(void *, CLIENT *); --extern rpcb_stat * rpcbproc_getstat_4_svc(void *, struct svc_req *); -- --#else /* Old Style C */ --extern bool_t * rpcbproc_set_4(); --extern bool_t * rpcbproc_set_4_svc(); --extern bool_t * rpcbproc_unset_4(); --extern bool_t * rpcbproc_unset_4_svc(); --extern char ** rpcbproc_getaddr_4(); --extern char ** rpcbproc_getaddr_4_svc(); --extern rpcblist_ptr * rpcbproc_dump_4(); --extern rpcblist_ptr * rpcbproc_dump_4_svc(); --#define RPCBPROC_BCAST ((u_int32_t)RPCBPROC_CALLIT) --extern rpcb_rmtcallres * rpcbproc_bcast_4(); --extern rpcb_rmtcallres * rpcbproc_bcast_4_svc(); --extern u_int * rpcbproc_gettime_4(); --extern u_int * rpcbproc_gettime_4_svc(); --extern struct netbuf * rpcbproc_uaddr2taddr_4(); --extern struct netbuf * rpcbproc_uaddr2taddr_4_svc(); --extern char ** rpcbproc_taddr2uaddr_4(); --extern char ** rpcbproc_taddr2uaddr_4_svc(); --#define RPCBPROC_GETVERSADDR ((u_int32_t)9) --extern char ** rpcbproc_getversaddr_4(); --extern char ** rpcbproc_getversaddr_4_svc(); --#define RPCBPROC_INDIRECT ((u_int32_t)10) --extern rpcb_rmtcallres * rpcbproc_indirect_4(); --extern rpcb_rmtcallres * rpcbproc_indirect_4_svc(); --#define RPCBPROC_GETADDRLIST ((u_int32_t)11) --extern rpcb_entry_list_ptr * rpcbproc_getaddrlist_4(); --extern rpcb_entry_list_ptr * rpcbproc_getaddrlist_4_svc(); --#define RPCBPROC_GETSTAT ((u_int32_t)12) --extern rpcb_stat * rpcbproc_getstat_4(); --extern rpcb_stat * rpcbproc_getstat_4_svc(); --#endif /* Old Style C */ -- --#endif /* !_RPCB_PROT_H_RPCGEN */ -diff --git a/tirpc/rpcsvc/crypt.h b/tirpc/rpcsvc/crypt.h -deleted file mode 100644 -index da1f9cc..0000000 ---- a/tirpc/rpcsvc/crypt.h -+++ /dev/null -@@ -1,109 +0,0 @@ --/* -- * Please do not edit this file. -- * It was generated using rpcgen. -- */ -- --#ifndef _CRYPT_H_RPCGEN --#define _CRYPT_H_RPCGEN -- --#include -- --#ifndef IXDR_GET_INT32 --#define IXDR_GET_INT32(buf) IXDR_GET_LONG((buf)) --#endif --#ifndef IXDR_PUT_INT32 --#define IXDR_PUT_INT32(buf, v) IXDR_PUT_LONG((buf), (v)) --#endif --#ifndef IXDR_GET_U_INT32 --#define IXDR_GET_U_INT32(buf) IXDR_GET_U_LONG((buf)) --#endif --#ifndef IXDR_PUT_U_INT32 --#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_U_LONG((buf), (v)) --#endif -- --enum des_dir { -- ENCRYPT_DES = 0, -- DECRYPT_DES = 1, --}; --typedef enum des_dir des_dir; --#ifdef __cplusplus --extern "C" bool_t xdr_des_dir(XDR *, des_dir*); --#elif __STDC__ --extern bool_t xdr_des_dir(XDR *, des_dir*); --#else /* Old Style C */ --bool_t xdr_des_dir(); --#endif /* Old Style C */ -- -- --enum des_mode { -- CBC_DES = 0, -- ECB_DES = 1, --}; --typedef enum des_mode des_mode; --#ifdef __cplusplus --extern "C" bool_t xdr_des_mode(XDR *, des_mode*); --#elif __STDC__ --extern bool_t xdr_des_mode(XDR *, des_mode*); --#else /* Old Style C */ --bool_t xdr_des_mode(); --#endif /* Old Style C */ -- -- --struct desargs { -- u_char des_key[8]; -- des_dir des_dir; -- des_mode des_mode; -- u_char des_ivec[8]; -- struct { -- u_int desbuf_len; -- char *desbuf_val; -- } desbuf; --}; --typedef struct desargs desargs; --#ifdef __cplusplus --extern "C" bool_t xdr_desargs(XDR *, desargs*); --#elif __STDC__ --extern bool_t xdr_desargs(XDR *, desargs*); --#else /* Old Style C */ --bool_t xdr_desargs(); --#endif /* Old Style C */ -- -- --struct desresp { -- struct { -- u_int desbuf_len; -- char *desbuf_val; -- } desbuf; -- u_char des_ivec[8]; -- int stat; --}; --typedef struct desresp desresp; --#ifdef __cplusplus --extern "C" bool_t xdr_desresp(XDR *, desresp*); --#elif __STDC__ --extern bool_t xdr_desresp(XDR *, desresp*); --#else /* Old Style C */ --bool_t xdr_desresp(); --#endif /* Old Style C */ -- -- --#define CRYPT_PROG ((u_int32_t)600100029) --#define CRYPT_VERS ((u_int32_t)1) -- --#ifdef __cplusplus --#define DES_CRYPT ((u_int32_t)1) --extern "C" desresp * des_crypt_1(desargs *, CLIENT *); --extern "C" desresp * des_crypt_1_svc(desargs *, struct svc_req *); -- --#elif __STDC__ --#define DES_CRYPT ((u_int32_t)1) --extern desresp * des_crypt_1(desargs *, CLIENT *); --extern desresp * des_crypt_1_svc(desargs *, struct svc_req *); -- --#else /* Old Style C */ --#define DES_CRYPT ((u_int32_t)1) --extern desresp * des_crypt_1(); --extern desresp * des_crypt_1_svc(); --#endif /* Old Style C */ -- --#endif /* !_CRYPT_H_RPCGEN */ --- -1.9.1 - diff --git a/package.bak/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch b/package.bak/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch deleted file mode 100644 index 7f53ffca16..0000000000 --- a/package.bak/libtirpc/0005-Add-more-XDR-files-needed-to-build-rpcbind-on-top-of.patch +++ /dev/null @@ -1,1653 +0,0 @@ -From baeca7ea594fe9faa1d40d35e76066c6002ca638 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 17:45:03 +0100 -Subject: [PATCH] Add more XDR files needed to build rpcbind on top of libtirpc - -Signed-off-by: Thomas Petazzoni -[yann.morin.1998@free.fr: update for 0.3.1] -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 6 + - tirpc/rpcsvc/mount.x | 257 ++++++++++ - tirpc/rpcsvc/nfs_prot.x | 1266 +++++++++++++++++++++++++++++++++++++++++++++++ - tirpc/rpcsvc/rquota.x | 67 +++ - 4 files changed, 1596 insertions(+) - create mode 100644 tirpc/rpcsvc/mount.x - create mode 100644 tirpc/rpcsvc/nfs_prot.x - create mode 100644 tirpc/rpcsvc/rquota.x - -diff --git a/Makefile.am b/Makefile.am -index aa5908e..4999066 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,6 +2,9 @@ SUBDIRS = src man doc rpcgen - ACLOCAL_AMFLAGS = -I m4 - - GENFILES = tirpc/rpcsvc/crypt.h \ -+ tirpc/rpcsvc/mount.h \ -+ tirpc/rpcsvc/nfs_prot.h \ -+ tirpc/rpcsvc/rquota.h \ - tirpc/rpc/rpcb_prot.h - - noinst_HEADERS = tirpc/reentrant.h \ -@@ -11,6 +14,9 @@ noinst_HEADERS = tirpc/reentrant.h \ - - nobase_include_HEADERS = tirpc/netconfig.h \ - tirpc/rpcsvc/crypt.x \ -+ tirpc/rpcsvc/mount.x \ -+ tirpc/rpcsvc/nfs_prot.x \ -+ tirpc/rpcsvc/rquota.x \ - tirpc/rpc/xdr.h \ - tirpc/rpc/types.h \ - tirpc/rpc/svc_soc.h \ -diff --git a/tirpc/rpcsvc/mount.x b/tirpc/rpcsvc/mount.x -new file mode 100644 -index 0000000..f68a06f ---- /dev/null -+++ b/tirpc/rpcsvc/mount.x -@@ -0,0 +1,257 @@ -+/* -+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for -+ * unrestricted use provided that this legend is included on all tape -+ * media and as a part of the software program in whole or part. Users -+ * may copy or modify Sun RPC without charge, but are not authorized -+ * to license or distribute it to anyone else except as part of a product or -+ * program developed by the user. -+ * -+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE -+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -+ * -+ * Sun RPC is provided with no support and without any obligation on the -+ * part of Sun Microsystems, Inc. to assist in its use, correction, -+ * modification or enhancement. -+ * -+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE -+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC -+ * OR ANY PART THEREOF. -+ * -+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue -+ * or profits or other special, indirect and consequential damages, even if -+ * Sun has been advised of the possibility of such damages. -+ * -+ * Sun Microsystems, Inc. -+ * 2550 Garcia Avenue -+ * Mountain View, California 94043 -+ */ -+ -+/* -+ * Protocol description for the mount program -+ */ -+ -+#ifndef RPC_HDR -+%#ifndef lint -+%/*static char sccsid[] = "from: @(#)mount.x 1.2 87/09/18 Copyr 1987 Sun Micro";*/ -+%/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ -+%static const char rcsid[] = -+% "$FreeBSD: src/include/rpcsvc/mount.x,v 1.6 1999/08/27 23:45:08 peter Exp $"; -+%#endif /* not lint */ -+#endif -+ -+const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ -+const MNTNAMLEN = 255; /* maximum bytes in a name argument */ -+const FHSIZE = 32; /* size in bytes of a file handle */ -+#ifdef WANT_NFS3 -+const FHSIZE3 = 64; /* size in bytes of a file handle (v3) */ -+#endif -+ -+/* -+ * The fhandle is the file handle that the server passes to the client. -+ * All file operations are done using the file handles to refer to a file -+ * or a directory. The file handle can contain whatever information the -+ * server needs to distinguish an individual file. -+ */ -+typedef opaque fhandle[FHSIZE]; -+#ifdef WANT_NFS3 -+typedef opaque fhandle3; -+#endif -+ -+/* -+ * If a status of zero is returned, the call completed successfully, and -+ * a file handle for the directory follows. A non-zero status indicates -+ * some sort of error. The status corresponds with UNIX error numbers. -+ */ -+union fhstatus switch (unsigned fhs_status) { -+case 0: -+ fhandle fhs_fhandle; -+default: -+ void; -+}; -+ -+#ifdef WANT_NFS3 -+/* -+ * Status codes returned by the version 3 mount call. -+ */ -+enum mountstat3 { -+ MNT3_OK = 0, /* no error */ -+ MNT3ERR_PERM = 1, /* Not owner */ -+ MNT3ERR_NOENT = 2, /* No such file or directory */ -+ MNT3ERR_IO = 5, /* I/O error */ -+ MNT3ERR_ACCES = 13, /* Permission denied */ -+ MNT3ERR_NOTDIR = 20, /* Not a directory */ -+ MNT3ERR_INVAL = 22, /* Invalid argument */ -+ MNT3ERR_NAMETOOLONG = 63, /* Filename too long */ -+ MNT3ERR_NOTSUPP = 10004, /* Operation not supported */ -+ MNT3ERR_SERVERFAULT = 10006 /* A failure on the server */ -+}; -+ -+struct mountres3_ok { -+ fhandle3 fhandle; -+ int auth_flavors<>; -+}; -+ -+union mountres3 switch (mountstat3 fhs_status) { -+case 0: -+ mountres3_ok mountinfo; -+default: -+ void; -+}; -+#endif -+ -+/* -+ * The type dirpath is the pathname of a directory -+ */ -+typedef string dirpath; -+ -+/* -+ * The type name is used for arbitrary names (hostnames, groupnames) -+ */ -+typedef string name; -+ -+/* -+ * A list of who has what mounted -+ */ -+typedef struct mountbody *mountlist; -+struct mountbody { -+ name ml_hostname; -+ dirpath ml_directory; -+ mountlist ml_next; -+}; -+ -+/* -+ * A list of netgroups -+ */ -+typedef struct groupnode *groups; -+struct groupnode { -+ name gr_name; -+ groups gr_next; -+}; -+ -+/* -+ * A list of what is exported and to whom -+ */ -+typedef struct exportnode *exports; -+struct exportnode { -+ dirpath ex_dir; -+ groups ex_groups; -+ exports ex_next; -+}; -+ -+program MOUNTPROG { -+ /* -+ * Version one of the mount protocol communicates with version two -+ * of the NFS protocol. Version three communicates with -+ * version three of the NFS protocol. The only connecting -+ * point is the fhandle structure, which is the same for both -+ * protocols. -+ */ -+ version MOUNTVERS { -+ /* -+ * Does no work. It is made available in all RPC services -+ * to allow server reponse testing and timing -+ */ -+ void -+ MOUNTPROC_NULL(void) = 0; -+ -+ /* -+ * If fhs_status is 0, then fhs_fhandle contains the -+ * file handle for the directory. This file handle may -+ * be used in the NFS protocol. This procedure also adds -+ * a new entry to the mount list for this client mounting -+ * the directory. -+ * Unix authentication required. -+ */ -+ fhstatus -+ MOUNTPROC_MNT(dirpath) = 1; -+ -+ /* -+ * Returns the list of remotely mounted filesystems. The -+ * mountlist contains one entry for each hostname and -+ * directory pair. -+ */ -+ mountlist -+ MOUNTPROC_DUMP(void) = 2; -+ -+ /* -+ * Removes the mount list entry for the directory -+ * Unix authentication required. -+ */ -+ void -+ MOUNTPROC_UMNT(dirpath) = 3; -+ -+ /* -+ * Removes all of the mount list entries for this client -+ * Unix authentication required. -+ */ -+ void -+ MOUNTPROC_UMNTALL(void) = 4; -+ -+ /* -+ * Returns a list of all the exported filesystems, and which -+ * machines are allowed to import it. -+ */ -+ exports -+ MOUNTPROC_EXPORT(void) = 5; -+ -+ /* -+ * Identical to MOUNTPROC_EXPORT above -+ */ -+ exports -+ MOUNTPROC_EXPORTALL(void) = 6; -+ } = 1; -+#ifdef WANT_NFS3 -+ version MOUNTVERS3 { -+ /* -+ * Does no work. It is made available in all RPC services -+ * to allow server reponse testing and timing -+ */ -+ void -+ MOUNTPROC_NULL(void) = 0; -+ -+ /* -+ * If mountres3.fhs_status is MNT3_OK, then -+ * mountres3.mountinfo contains the file handle for -+ * the directory and a list of acceptable -+ * authentication flavors. This file handle may only -+ * be used in the NFS version 3 protocol. This -+ * procedure also results in the server adding a new -+ * entry to its mount list recording that this client -+ * has mounted the directory. AUTH_UNIX authentication -+ * or better is required. -+ */ -+ mountres3 -+ MOUNTPROC_MNT(dirpath) = 1; -+ -+ /* -+ * Returns the list of remotely mounted filesystems. The -+ * mountlist contains one entry for each hostname and -+ * directory pair. -+ */ -+ mountlist -+ MOUNTPROC_DUMP(void) = 2; -+ -+ /* -+ * Removes the mount list entry for the directory -+ * Unix authentication required. -+ */ -+ void -+ MOUNTPROC_UMNT(dirpath) = 3; -+ -+ /* -+ * Removes all of the mount list entries for this client -+ * Unix authentication required. -+ */ -+ void -+ MOUNTPROC_UMNTALL(void) = 4; -+ -+ /* -+ * Returns a list of all the exported filesystems, and which -+ * machines are allowed to import it. -+ */ -+ exports -+ MOUNTPROC_EXPORT(void) = 5; -+ } = 3; -+#endif -+} = 100005; -diff --git a/tirpc/rpcsvc/nfs_prot.x b/tirpc/rpcsvc/nfs_prot.x -new file mode 100644 -index 0000000..01564f8 ---- /dev/null -+++ b/tirpc/rpcsvc/nfs_prot.x -@@ -0,0 +1,1266 @@ -+/* -+ * Sun RPC is a product of Sun Microsystems, Inc. and is provided for -+ * unrestricted use provided that this legend is included on all tape -+ * media and as a part of the software program in whole or part. Users -+ * may copy or modify Sun RPC without charge, but are not authorized -+ * to license or distribute it to anyone else except as part of a product or -+ * program developed by the user. -+ * -+ * SUN RPC IS PROVIDED AS IS WITH NO WARRANTIES OF ANY KIND INCLUDING THE -+ * WARRANTIES OF DESIGN, MERCHANTIBILITY AND FITNESS FOR A PARTICULAR -+ * PURPOSE, OR ARISING FROM A COURSE OF DEALING, USAGE OR TRADE PRACTICE. -+ * -+ * Sun RPC is provided with no support and without any obligation on the -+ * part of Sun Microsystems, Inc. to assist in its use, correction, -+ * modification or enhancement. -+ * -+ * SUN MICROSYSTEMS, INC. SHALL HAVE NO LIABILITY WITH RESPECT TO THE -+ * INFRINGEMENT OF COPYRIGHTS, TRADE SECRETS OR ANY PATENTS BY SUN RPC -+ * OR ANY PART THEREOF. -+ * -+ * In no event will Sun Microsystems, Inc. be liable for any lost revenue -+ * or profits or other special, indirect and consequential damages, even if -+ * Sun has been advised of the possibility of such damages. -+ * -+ * Sun Microsystems, Inc. -+ * 2550 Garcia Avenue -+ * Mountain View, California 94043 -+ */ -+ -+#ifndef RPC_HDR -+%#ifndef lint -+%/*static char sccsid[] = "from: @(#)nfs_prot.x 1.2 87/10/12 Copyr 1987 Sun Micro";*/ -+%/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ -+%static const char rcsid[] = -+% "$FreeBSD: src/include/rpcsvc/nfs_prot.x,v 1.7 1999/08/27 23:45:08 peter Exp $"; -+%#endif /* not lint */ -+#endif -+ -+const NFS_PORT = 2049; -+const NFS_MAXDATA = 8192; -+const NFS_MAXPATHLEN = 1024; -+const NFS_MAXNAMLEN = 255; -+const NFS_FHSIZE = 32; -+const NFS_COOKIESIZE = 4; -+const NFS_FIFO_DEV = -1; /* size kludge for named pipes */ -+ -+/* -+ * File types -+ */ -+const NFSMODE_FMT = 0170000; /* type of file */ -+const NFSMODE_DIR = 0040000; /* directory */ -+const NFSMODE_CHR = 0020000; /* character special */ -+const NFSMODE_BLK = 0060000; /* block special */ -+const NFSMODE_REG = 0100000; /* regular */ -+const NFSMODE_LNK = 0120000; /* symbolic link */ -+const NFSMODE_SOCK = 0140000; /* socket */ -+const NFSMODE_FIFO = 0010000; /* fifo */ -+ -+/* -+ * Error status -+ */ -+enum nfsstat { -+ NFS_OK= 0, /* no error */ -+ NFSERR_PERM=1, /* Not owner */ -+ NFSERR_NOENT=2, /* No such file or directory */ -+ NFSERR_IO=5, /* I/O error */ -+ NFSERR_NXIO=6, /* No such device or address */ -+ NFSERR_ACCES=13, /* Permission denied */ -+ NFSERR_EXIST=17, /* File exists */ -+ NFSERR_NODEV=19, /* No such device */ -+ NFSERR_NOTDIR=20, /* Not a directory*/ -+ NFSERR_ISDIR=21, /* Is a directory */ -+ NFSERR_FBIG=27, /* File too large */ -+ NFSERR_NOSPC=28, /* No space left on device */ -+ NFSERR_ROFS=30, /* Read-only file system */ -+ NFSERR_NAMETOOLONG=63, /* File name too long */ -+ NFSERR_NOTEMPTY=66, /* Directory not empty */ -+ NFSERR_DQUOT=69, /* Disc quota exceeded */ -+ NFSERR_STALE=70, /* Stale NFS file handle */ -+ NFSERR_WFLUSH=99 /* write cache flushed */ -+}; -+ -+/* -+ * File types -+ */ -+enum ftype { -+ NFNON = 0, /* non-file */ -+ NFREG = 1, /* regular file */ -+ NFDIR = 2, /* directory */ -+ NFBLK = 3, /* block special */ -+ NFCHR = 4, /* character special */ -+ NFLNK = 5, /* symbolic link */ -+ NFSOCK = 6, /* unix domain sockets */ -+ NFBAD = 7, /* unused */ -+ NFFIFO = 8 /* named pipe */ -+}; -+ -+/* -+ * File access handle -+ */ -+struct nfs_fh { -+ opaque data[NFS_FHSIZE]; -+}; -+ -+/* -+ * Timeval -+ */ -+struct nfstime { -+ unsigned seconds; -+ unsigned useconds; -+}; -+ -+ -+/* -+ * File attributes -+ */ -+struct fattr { -+ ftype type; /* file type */ -+ unsigned mode; /* protection mode bits */ -+ unsigned nlink; /* # hard links */ -+ unsigned uid; /* owner user id */ -+ unsigned gid; /* owner group id */ -+ unsigned size; /* file size in bytes */ -+ unsigned blocksize; /* prefered block size */ -+ unsigned rdev; /* special device # */ -+ unsigned blocks; /* Kb of disk used by file */ -+ unsigned fsid; /* device # */ -+ unsigned fileid; /* inode # */ -+ nfstime atime; /* time of last access */ -+ nfstime mtime; /* time of last modification */ -+ nfstime ctime; /* time of last change */ -+}; -+ -+/* -+ * File attributes which can be set -+ */ -+struct sattr { -+ unsigned mode; /* protection mode bits */ -+ unsigned uid; /* owner user id */ -+ unsigned gid; /* owner group id */ -+ unsigned size; /* file size in bytes */ -+ nfstime atime; /* time of last access */ -+ nfstime mtime; /* time of last modification */ -+}; -+ -+ -+typedef string filename; -+typedef string nfspath; -+ -+/* -+ * Reply status with file attributes -+ */ -+union attrstat switch (nfsstat status) { -+case NFS_OK: -+ fattr attributes; -+default: -+ void; -+}; -+ -+struct sattrargs { -+ nfs_fh file; -+ sattr attributes; -+}; -+ -+/* -+ * Arguments for directory operations -+ */ -+struct diropargs { -+ nfs_fh dir; /* directory file handle */ -+ filename name; /* name (up to NFS_MAXNAMLEN bytes) */ -+}; -+ -+struct diropokres { -+ nfs_fh file; -+ fattr attributes; -+}; -+ -+/* -+ * Results from directory operation -+ */ -+union diropres switch (nfsstat status) { -+case NFS_OK: -+ diropokres diropres; -+default: -+ void; -+}; -+ -+union readlinkres switch (nfsstat status) { -+case NFS_OK: -+ nfspath data; -+default: -+ void; -+}; -+ -+/* -+ * Arguments to remote read -+ */ -+struct readargs { -+ nfs_fh file; /* handle for file */ -+ unsigned offset; /* byte offset in file */ -+ unsigned count; /* immediate read count */ -+ unsigned totalcount; /* total read count (from this offset)*/ -+}; -+ -+/* -+ * Status OK portion of remote read reply -+ */ -+struct readokres { -+ fattr attributes; /* attributes, need for pagin*/ -+ opaque data; -+}; -+ -+union readres switch (nfsstat status) { -+case NFS_OK: -+ readokres reply; -+default: -+ void; -+}; -+ -+/* -+ * Arguments to remote write -+ */ -+struct writeargs { -+ nfs_fh file; /* handle for file */ -+ unsigned beginoffset; /* beginning byte offset in file */ -+ unsigned offset; /* current byte offset in file */ -+ unsigned totalcount; /* total write count (to this offset)*/ -+ opaque data; -+}; -+ -+struct createargs { -+ diropargs where; -+ sattr attributes; -+}; -+ -+struct renameargs { -+ diropargs from; -+ diropargs to; -+}; -+ -+struct linkargs { -+ nfs_fh from; -+ diropargs to; -+}; -+ -+struct symlinkargs { -+ diropargs from; -+ nfspath to; -+ sattr attributes; -+}; -+ -+ -+typedef opaque nfscookie[NFS_COOKIESIZE]; -+ -+/* -+ * Arguments to readdir -+ */ -+struct readdirargs { -+ nfs_fh dir; /* directory handle */ -+ nfscookie cookie; -+ unsigned count; /* number of directory bytes to read */ -+}; -+ -+struct entry { -+ unsigned fileid; -+ filename name; -+ nfscookie cookie; -+ entry *nextentry; -+}; -+ -+struct dirlist { -+ entry *entries; -+ bool eof; -+}; -+ -+union readdirres switch (nfsstat status) { -+case NFS_OK: -+ dirlist reply; -+default: -+ void; -+}; -+ -+struct statfsokres { -+ unsigned tsize; /* preferred transfer size in bytes */ -+ unsigned bsize; /* fundamental file system block size */ -+ unsigned blocks; /* total blocks in file system */ -+ unsigned bfree; /* free blocks in fs */ -+ unsigned bavail; /* free blocks avail to non-superuser */ -+}; -+ -+union statfsres switch (nfsstat status) { -+case NFS_OK: -+ statfsokres reply; -+default: -+ void; -+}; -+ -+#ifdef WANT_NFS3 -+ -+/* -+ * NFSv3 constants and types -+ */ -+const NFS3_FHSIZE = 64; /* maximum size in bytes of a file handle */ -+const NFS3_COOKIEVERFSIZE = 8; /* size of a cookie verifier for READDIR */ -+const NFS3_CREATEVERFSIZE = 8; /* size of the verifier used for CREATE */ -+const NFS3_WRITEVERFSIZE = 8; /* size of the verifier used for WRITE */ -+ -+typedef unsigned hyper uint64; -+typedef hyper int64; -+typedef unsigned long uint32; -+typedef long int32; -+typedef string filename3<>; -+typedef string nfspath3<>; -+typedef uint64 fileid3; -+typedef uint64 cookie3; -+typedef opaque cookieverf3[NFS3_COOKIEVERFSIZE]; -+typedef opaque createverf3[NFS3_CREATEVERFSIZE]; -+typedef opaque writeverf3[NFS3_WRITEVERFSIZE]; -+typedef uint32 uid3; -+typedef uint32 gid3; -+typedef uint64 size3; -+typedef uint64 offset3; -+typedef uint32 mode3; -+typedef uint32 count3; -+ -+/* -+ * Error status (v3) -+ */ -+enum nfsstat3 { -+ NFS3_OK = 0, -+ NFS3ERR_PERM = 1, -+ NFS3ERR_NOENT = 2, -+ NFS3ERR_IO = 5, -+ NFS3ERR_NXIO = 6, -+ NFS3ERR_ACCES = 13, -+ NFS3ERR_EXIST = 17, -+ NFS3ERR_XDEV = 18, -+ NFS3ERR_NODEV = 19, -+ NFS3ERR_NOTDIR = 20, -+ NFS3ERR_ISDIR = 21, -+ NFS3ERR_INVAL = 22, -+ NFS3ERR_FBIG = 27, -+ NFS3ERR_NOSPC = 28, -+ NFS3ERR_ROFS = 30, -+ NFS3ERR_MLINK = 31, -+ NFS3ERR_NAMETOOLONG = 63, -+ NFS3ERR_NOTEMPTY = 66, -+ NFS3ERR_DQUOT = 69, -+ NFS3ERR_STALE = 70, -+ NFS3ERR_REMOTE = 71, -+ NFS3ERR_BADHANDLE = 10001, -+ NFS3ERR_NOT_SYNC = 10002, -+ NFS3ERR_BAD_COOKIE = 10003, -+ NFS3ERR_NOTSUPP = 10004, -+ NFS3ERR_TOOSMALL = 10005, -+ NFS3ERR_SERVERFAULT = 10006, -+ NFS3ERR_BADTYPE = 10007, -+ NFS3ERR_JUKEBOX = 10008 -+}; -+ -+/* -+ * File types (v3) -+ */ -+enum ftype3 { -+ NF3REG = 1, /* regular file */ -+ NF3DIR = 2, /* directory */ -+ NF3BLK = 3, /* block special */ -+ NF3CHR = 4, /* character special */ -+ NF3LNK = 5, /* symbolic link */ -+ NF3SOCK = 6, /* unix domain sockets */ -+ NF3FIFO = 7 /* named pipe */ -+}; -+ -+struct specdata3 { -+ uint32 specdata1; -+ uint32 specdata2; -+}; -+ -+/* -+ * File access handle (v3) -+ */ -+struct nfs_fh3 { -+ opaque data; -+}; -+ -+/* -+ * Timeval (v3) -+ */ -+struct nfstime3 { -+ uint32 seconds; -+ uint32 nseconds; -+}; -+ -+ -+/* -+ * File attributes (v3) -+ */ -+struct fattr3 { -+ ftype3 type; /* file type */ -+ mode3 mode; /* protection mode bits */ -+ uint32 nlink; /* # hard links */ -+ uid3 uid; /* owner user id */ -+ gid3 gid; /* owner group id */ -+ size3 size; /* file size in bytes */ -+ size3 used; /* prefered block size */ -+ specdata3 rdev; /* special device # */ -+ uint64 fsid; /* device # */ -+ fileid3 fileid; /* inode # */ -+ nfstime3 atime; /* time of last access */ -+ nfstime3 mtime; /* time of last modification */ -+ nfstime3 ctime; /* time of last change */ -+}; -+ -+union post_op_attr switch (bool attributes_follow) { -+case TRUE: -+ fattr3 attributes; -+case FALSE: -+ void; -+}; -+ -+struct wcc_attr { -+ size3 size; -+ nfstime3 mtime; -+ nfstime3 ctime; -+}; -+ -+union pre_op_attr switch (bool attributes_follow) { -+case TRUE: -+ wcc_attr attributes; -+case FALSE: -+ void; -+}; -+ -+struct wcc_data { -+ pre_op_attr before; -+ post_op_attr after; -+}; -+ -+union post_op_fh3 switch (bool handle_follows) { -+case TRUE: -+ nfs_fh3 handle; -+case FALSE: -+ void; -+}; -+ -+/* -+ * File attributes which can be set (v3) -+ */ -+enum time_how { -+ DONT_CHANGE = 0, -+ SET_TO_SERVER_TIME = 1, -+ SET_TO_CLIENT_TIME = 2 -+}; -+ -+union set_mode3 switch (bool set_it) { -+case TRUE: -+ mode3 mode; -+default: -+ void; -+}; -+ -+union set_uid3 switch (bool set_it) { -+case TRUE: -+ uid3 uid; -+default: -+ void; -+}; -+ -+union set_gid3 switch (bool set_it) { -+case TRUE: -+ gid3 gid; -+default: -+ void; -+}; -+ -+union set_size3 switch (bool set_it) { -+case TRUE: -+ size3 size; -+default: -+ void; -+}; -+ -+union set_atime switch (time_how set_it) { -+case SET_TO_CLIENT_TIME: -+ nfstime3 atime; -+default: -+ void; -+}; -+ -+union set_mtime switch (time_how set_it) { -+case SET_TO_CLIENT_TIME: -+ nfstime3 mtime; -+default: -+ void; -+}; -+ -+struct sattr3 { -+ set_mode3 mode; -+ set_uid3 uid; -+ set_gid3 gid; -+ set_size3 size; -+ set_atime atime; -+ set_mtime mtime; -+}; -+ -+/* -+ * Arguments for directory operations (v3) -+ */ -+struct diropargs3 { -+ nfs_fh3 dir; /* directory file handle */ -+ filename3 name; /* name (up to NFS_MAXNAMLEN bytes) */ -+}; -+ -+/* -+ * Arguments to getattr (v3). -+ */ -+struct GETATTR3args { -+ nfs_fh3 object; -+}; -+ -+struct GETATTR3resok { -+ fattr3 obj_attributes; -+}; -+ -+union GETATTR3res switch (nfsstat3 status) { -+case NFS3_OK: -+ GETATTR3resok resok; -+default: -+ void; -+}; -+ -+/* -+ * Arguments to setattr (v3). -+ */ -+union sattrguard3 switch (bool check) { -+case TRUE: -+ nfstime3 obj_ctime; -+case FALSE: -+ void; -+}; -+ -+struct SETATTR3args { -+ nfs_fh3 object; -+ sattr3 new_attributes; -+ sattrguard3 guard; -+}; -+ -+struct SETATTR3resok { -+ wcc_data obj_wcc; -+}; -+ -+struct SETATTR3resfail { -+ wcc_data obj_wcc; -+}; -+ -+union SETATTR3res switch (nfsstat3 status) { -+case NFS3_OK: -+ SETATTR3resok resok; -+default: -+ SETATTR3resfail resfail; -+}; -+ -+/* -+ * Arguments to lookup (v3). -+ */ -+struct LOOKUP3args { -+ diropargs3 what; -+}; -+ -+struct LOOKUP3resok { -+ nfs_fh3 object; -+ post_op_attr obj_attributes; -+ post_op_attr dir_attributes; -+}; -+ -+struct LOOKUP3resfail { -+ post_op_attr dir_attributes; -+}; -+ -+union LOOKUP3res switch (nfsstat3 status) { -+case NFS3_OK: -+ LOOKUP3resok resok; -+default: -+ LOOKUP3resfail resfail; -+}; -+ -+/* -+ * Arguments to access (v3). -+ */ -+const ACCESS3_READ = 0x0001; -+const ACCESS3_LOOKUP = 0x0002; -+const ACCESS3_MODIFY = 0x0004; -+const ACCESS3_EXTEND = 0x0008; -+const ACCESS3_DELETE = 0x0010; -+const ACCESS3_EXECUTE = 0x0020; -+ -+struct ACCESS3args { -+ nfs_fh3 object; -+ uint32 access; -+}; -+ -+struct ACCESS3resok { -+ post_op_attr obj_attributes; -+ uint32 access; -+}; -+ -+struct ACCESS3resfail { -+ post_op_attr obj_attributes; -+}; -+ -+union ACCESS3res switch (nfsstat3 status) { -+case NFS3_OK: -+ ACCESS3resok resok; -+default: -+ ACCESS3resfail resfail; -+}; -+ -+/* -+ * Arguments to readlink (v3). -+ */ -+struct READLINK3args { -+ nfs_fh3 symlink; -+}; -+ -+struct READLINK3resok { -+ post_op_attr symlink_attributes; -+ nfspath3 data; -+}; -+ -+struct READLINK3resfail { -+ post_op_attr symlink_attributes; -+}; -+ -+union READLINK3res switch (nfsstat3 status) { -+case NFS3_OK: -+ READLINK3resok resok; -+default: -+ READLINK3resfail resfail; -+}; -+ -+/* -+ * Arguments to read (v3). -+ */ -+struct READ3args { -+ nfs_fh3 file; -+ offset3 offset; -+ count3 count; -+}; -+ -+struct READ3resok { -+ post_op_attr file_attributes; -+ count3 count; -+ bool eof; -+ opaque data<>; -+}; -+ -+struct READ3resfail { -+ post_op_attr file_attributes; -+}; -+ -+/* XXX: solaris 2.6 uses ``nfsstat'' here */ -+union READ3res switch (nfsstat3 status) { -+case NFS3_OK: -+ READ3resok resok; -+default: -+ READ3resfail resfail; -+}; -+ -+/* -+ * Arguments to write (v3). -+ */ -+enum stable_how { -+ UNSTABLE = 0, -+ DATA_SYNC = 1, -+ FILE_SYNC = 2 -+}; -+ -+struct WRITE3args { -+ nfs_fh3 file; -+ offset3 offset; -+ count3 count; -+ stable_how stable; -+ opaque data<>; -+}; -+ -+struct WRITE3resok { -+ wcc_data file_wcc; -+ count3 count; -+ stable_how committed; -+ writeverf3 verf; -+}; -+ -+struct WRITE3resfail { -+ wcc_data file_wcc; -+}; -+ -+union WRITE3res switch (nfsstat3 status) { -+case NFS3_OK: -+ WRITE3resok resok; -+default: -+ WRITE3resfail resfail; -+}; -+ -+/* -+ * Arguments to create (v3). -+ */ -+enum createmode3 { -+ UNCHECKED = 0, -+ GUARDED = 1, -+ EXCLUSIVE = 2 -+}; -+ -+union createhow3 switch (createmode3 mode) { -+case UNCHECKED: -+case GUARDED: -+ sattr3 obj_attributes; -+case EXCLUSIVE: -+ createverf3 verf; -+}; -+ -+struct CREATE3args { -+ diropargs3 where; -+ createhow3 how; -+}; -+ -+struct CREATE3resok { -+ post_op_fh3 obj; -+ post_op_attr obj_attributes; -+ wcc_data dir_wcc; -+}; -+ -+struct CREATE3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union CREATE3res switch (nfsstat3 status) { -+case NFS3_OK: -+ CREATE3resok resok; -+default: -+ CREATE3resfail resfail; -+}; -+ -+/* -+ * Arguments to mkdir (v3). -+ */ -+struct MKDIR3args { -+ diropargs3 where; -+ sattr3 attributes; -+}; -+ -+struct MKDIR3resok { -+ post_op_fh3 obj; -+ post_op_attr obj_attributes; -+ wcc_data dir_wcc; -+}; -+ -+struct MKDIR3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union MKDIR3res switch (nfsstat3 status) { -+case NFS3_OK: -+ MKDIR3resok resok; -+default: -+ MKDIR3resfail resfail; -+}; -+ -+/* -+ * Arguments to symlink (v3). -+ */ -+struct symlinkdata3 { -+ sattr3 symlink_attributes; -+ nfspath3 symlink_data; -+}; -+ -+struct SYMLINK3args { -+ diropargs3 where; -+ symlinkdata3 symlink; -+}; -+ -+struct SYMLINK3resok { -+ post_op_fh3 obj; -+ post_op_attr obj_attributes; -+ wcc_data dir_wcc; -+}; -+ -+struct SYMLINK3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union SYMLINK3res switch (nfsstat3 status) { -+case NFS3_OK: -+ SYMLINK3resok resok; -+default: -+ SYMLINK3resfail resfail; -+}; -+ -+/* -+ * Arguments to mknod (v3). -+ */ -+struct devicedata3 { -+ sattr3 dev_attributes; -+ specdata3 spec; -+}; -+ -+union mknoddata3 switch (ftype3 type) { -+case NF3CHR: -+case NF3BLK: -+ devicedata3 device; -+case NF3SOCK: -+case NF3FIFO: -+ sattr3 pipe_attributes; -+default: -+ void; -+}; -+ -+struct MKNOD3args { -+ diropargs3 where; -+ mknoddata3 what; -+}; -+ -+struct MKNOD3resok { -+ post_op_fh3 obj; -+ post_op_attr obj_attributes; -+ wcc_data dir_wcc; -+}; -+ -+struct MKNOD3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union MKNOD3res switch (nfsstat3 status) { -+case NFS3_OK: -+ MKNOD3resok resok; -+default: -+ MKNOD3resfail resfail; -+}; -+ -+/* -+ * Arguments to remove (v3). -+ */ -+struct REMOVE3args { -+ diropargs3 object; -+}; -+ -+struct REMOVE3resok { -+ wcc_data dir_wcc; -+}; -+ -+struct REMOVE3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union REMOVE3res switch (nfsstat3 status) { -+case NFS3_OK: -+ REMOVE3resok resok; -+default: -+ REMOVE3resfail resfail; -+}; -+ -+/* -+ * Arguments to rmdir (v3). -+ */ -+struct RMDIR3args { -+ diropargs3 object; -+}; -+ -+struct RMDIR3resok { -+ wcc_data dir_wcc; -+}; -+ -+struct RMDIR3resfail { -+ wcc_data dir_wcc; -+}; -+ -+union RMDIR3res switch (nfsstat3 status) { -+case NFS3_OK: -+ RMDIR3resok resok; -+default: -+ RMDIR3resfail resfail; -+}; -+ -+/* -+ * Arguments to rename (v3). -+ */ -+struct RENAME3args { -+ diropargs3 from; -+ diropargs3 to; -+}; -+ -+struct RENAME3resok { -+ wcc_data fromdir_wcc; -+ wcc_data todir_wcc; -+}; -+ -+struct RENAME3resfail { -+ wcc_data fromdir_wcc; -+ wcc_data todir_wcc; -+}; -+ -+union RENAME3res switch (nfsstat3 status) { -+case NFS3_OK: -+ RENAME3resok resok; -+default: -+ RENAME3resfail resfail; -+}; -+ -+/* -+ * Arguments to link (v3). -+ */ -+struct LINK3args { -+ nfs_fh3 file; -+ diropargs3 link; -+}; -+ -+struct LINK3resok { -+ post_op_attr file_attributes; -+ wcc_data linkdir_wcc; -+}; -+ -+struct LINK3resfail { -+ post_op_attr file_attributes; -+ wcc_data linkdir_wcc; -+}; -+ -+union LINK3res switch (nfsstat3 status) { -+case NFS3_OK: -+ LINK3resok resok; -+default: -+ LINK3resfail resfail; -+}; -+ -+/* -+ * Arguments to readdir (v3). -+ */ -+struct READDIR3args { -+ nfs_fh3 dir; -+ cookie3 cookie; -+ cookieverf3 cookieverf; -+ count3 count; -+}; -+ -+struct entry3 { -+ fileid3 fileid; -+ filename3 name; -+ cookie3 cookie; -+ entry3 *nextentry; -+}; -+ -+struct dirlist3 { -+ entry3 *entries; -+ bool eof; -+}; -+ -+struct READDIR3resok { -+ post_op_attr dir_attributes; -+ cookieverf3 cookieverf; -+ dirlist3 reply; -+}; -+ -+struct READDIR3resfail { -+ post_op_attr dir_attributes; -+}; -+ -+union READDIR3res switch (nfsstat3 status) { -+case NFS3_OK: -+ READDIR3resok resok; -+default: -+ READDIR3resfail resfail; -+}; -+ -+/* -+ * Arguments to readdirplus (v3). -+ */ -+struct READDIRPLUS3args { -+ nfs_fh3 dir; -+ cookie3 cookie; -+ cookieverf3 cookieverf; -+ count3 dircount; -+ count3 maxcount; -+}; -+ -+struct entryplus3 { -+ fileid3 fileid; -+ filename3 name; -+ cookie3 cookie; -+ post_op_attr name_attributes; -+ post_op_fh3 name_handle; -+ entryplus3 *nextentry; -+}; -+ -+struct dirlistplus3 { -+ entryplus3 *entries; -+ bool eof; -+}; -+ -+struct READDIRPLUS3resok { -+ post_op_attr dir_attributes; -+ cookieverf3 cookieverf; -+ dirlistplus3 reply; -+}; -+ -+struct READDIRPLUS3resfail { -+ post_op_attr dir_attributes; -+}; -+ -+union READDIRPLUS3res switch (nfsstat3 status) { -+case NFS3_OK: -+ READDIRPLUS3resok resok; -+default: -+ READDIRPLUS3resfail resfail; -+}; -+ -+/* -+ * Arguments to fsstat (v3). -+ */ -+struct FSSTAT3args { -+ nfs_fh3 fsroot; -+}; -+ -+struct FSSTAT3resok { -+ post_op_attr obj_attributes; -+ size3 tbytes; -+ size3 fbytes; -+ size3 abytes; -+ size3 tfiles; -+ size3 ffiles; -+ size3 afiles; -+ uint32 invarsec; -+}; -+ -+struct FSSTAT3resfail { -+ post_op_attr obj_attributes; -+}; -+ -+union FSSTAT3res switch (nfsstat3 status) { -+case NFS3_OK: -+ FSSTAT3resok resok; -+default: -+ FSSTAT3resfail resfail; -+}; -+ -+/* -+ * Arguments to fsinfo (v3). -+ */ -+const FSF3_LINK = 0x0001; -+const FSF3_SYMLINK = 0x0002; -+const FSF3_HOMOGENEOUS = 0x0008; -+const FSF3_CANSETTIME = 0x0010; -+ -+struct FSINFO3args { -+ nfs_fh3 fsroot; -+}; -+ -+struct FSINFO3resok { -+ post_op_attr obj_attributes; -+ uint32 rtmax; -+ uint32 rtpref; -+ uint32 rtmult; -+ uint32 wtmax; -+ uint32 wtpref; -+ uint32 wtmult; -+ uint32 dtpref; -+ size3 maxfilesize; -+ nfstime3 time_delta; -+ uint32 properties; -+}; -+ -+struct FSINFO3resfail { -+ post_op_attr obj_attributes; -+}; -+ -+union FSINFO3res switch (nfsstat3 status) { -+case NFS3_OK: -+ FSINFO3resok resok; -+default: -+ FSINFO3resfail resfail; -+}; -+ -+/* -+ * Arguments to pathconf (v3). -+ */ -+struct PATHCONF3args { -+ nfs_fh3 object; -+}; -+ -+struct PATHCONF3resok { -+ post_op_attr obj_attributes; -+ uint32 linkmax; -+ uint32 name_max; -+ bool no_trunc; -+ bool chown_restricted; -+ bool case_insensitive; -+ bool case_preserving; -+}; -+ -+struct PATHCONF3resfail { -+ post_op_attr obj_attributes; -+}; -+ -+union PATHCONF3res switch (nfsstat3 status) { -+case NFS3_OK: -+ PATHCONF3resok resok; -+default: -+ PATHCONF3resfail resfail; -+}; -+ -+/* -+ * Arguments to commit (v3). -+ */ -+struct COMMIT3args { -+ nfs_fh3 file; -+ offset3 offset; -+ count3 count; -+}; -+ -+struct COMMIT3resok { -+ wcc_data file_wcc; -+ writeverf3 verf; -+}; -+ -+struct COMMIT3resfail { -+ wcc_data file_wcc; -+}; -+ -+union COMMIT3res switch (nfsstat3 status) { -+case NFS3_OK: -+ COMMIT3resok resok; -+default: -+ COMMIT3resfail resfail; -+}; -+ -+#endif /* WANT_NFS3 */ -+ -+/* -+ * Remote file service routines -+ */ -+program NFS_PROGRAM { -+ version NFS_VERSION { -+ void -+ NFSPROC_NULL(void) = 0; -+ -+ attrstat -+ NFSPROC_GETATTR(nfs_fh) = 1; -+ -+ attrstat -+ NFSPROC_SETATTR(sattrargs) = 2; -+ -+ void -+ NFSPROC_ROOT(void) = 3; -+ -+ diropres -+ NFSPROC_LOOKUP(diropargs) = 4; -+ -+ readlinkres -+ NFSPROC_READLINK(nfs_fh) = 5; -+ -+ readres -+ NFSPROC_READ(readargs) = 6; -+ -+ void -+ NFSPROC_WRITECACHE(void) = 7; -+ -+ attrstat -+ NFSPROC_WRITE(writeargs) = 8; -+ -+ diropres -+ NFSPROC_CREATE(createargs) = 9; -+ -+ nfsstat -+ NFSPROC_REMOVE(diropargs) = 10; -+ -+ nfsstat -+ NFSPROC_RENAME(renameargs) = 11; -+ -+ nfsstat -+ NFSPROC_LINK(linkargs) = 12; -+ -+ nfsstat -+ NFSPROC_SYMLINK(symlinkargs) = 13; -+ -+ diropres -+ NFSPROC_MKDIR(createargs) = 14; -+ -+ nfsstat -+ NFSPROC_RMDIR(diropargs) = 15; -+ -+ readdirres -+ NFSPROC_READDIR(readdirargs) = 16; -+ -+ statfsres -+ NFSPROC_STATFS(nfs_fh) = 17; -+ } = 2; -+} = 100003; -+#ifdef WANT_NFS3 -+program NFS3_PROGRAM { -+ version NFS_V3 { -+ void -+ NFSPROC3_NULL(void) = 0; -+ -+ GETATTR3res -+ NFSPROC3_GETATTR(GETATTR3args) = 1; -+ -+ SETATTR3res -+ NFSPROC3_SETATTR(SETATTR3args) = 2; -+ -+ LOOKUP3res -+ NFSPROC3_LOOKUP(LOOKUP3args) = 3; -+ -+ ACCESS3res -+ NFSPROC3_ACCESS(ACCESS3args) = 4; -+ -+ READLINK3res -+ NFSPROC3_READLINK(READLINK3args) = 5; -+ -+ READ3res -+ NFSPROC3_READ(READ3args) = 6; -+ -+ WRITE3res -+ NFSPROC3_WRITE(WRITE3args) = 7; -+ -+ CREATE3res -+ NFSPROC3_CREATE(CREATE3args) = 8; -+ -+ MKDIR3res -+ NFSPROC3_MKDIR(MKDIR3args) = 9; -+ -+ SYMLINK3res -+ NFSPROC3_SYMLINK(SYMLINK3args) = 10; -+ -+ MKNOD3res -+ NFSPROC3_MKNOD(MKNOD3args) = 11; -+ -+ REMOVE3res -+ NFSPROC3_REMOVE(REMOVE3args) = 12; -+ -+ RMDIR3res -+ NFSPROC3_RMDIR(RMDIR3args) = 13; -+ -+ RENAME3res -+ NFSPROC3_RENAME(RENAME3args) = 14; -+ -+ LINK3res -+ NFSPROC3_LINK(LINK3args) = 15; -+ -+ READDIR3res -+ NFSPROC3_READDIR(READDIR3args) = 16; -+ -+ READDIRPLUS3res -+ NFSPROC3_READDIRPLUS(READDIRPLUS3args) = 17; -+ -+ FSSTAT3res -+ NFSPROC3_FSSTAT(FSSTAT3args) = 18; -+ -+ FSINFO3res -+ NFSPROC3_FSINFO(FSINFO3args) = 19; -+ -+ PATHCONF3res -+ NFSPROC3_PATHCONF(PATHCONF3args) = 20; -+ -+ COMMIT3res -+ NFSPROC3_COMMIT(COMMIT3args) = 21; -+ } = 3; -+} = 100003; -+#endif -+ -diff --git a/tirpc/rpcsvc/rquota.x b/tirpc/rpcsvc/rquota.x -new file mode 100644 -index 0000000..72864d1 ---- /dev/null -+++ b/tirpc/rpcsvc/rquota.x -@@ -0,0 +1,67 @@ -+/* -+ * Remote quota protocol -+ * Requires unix authentication -+ */ -+ -+#ifndef RPC_HDR -+%#ifndef lint -+%/*static char sccsid[] = "from: @(#)rquota.x 1.2 87/09/20 Copyr 1987 Sun Micro";*/ -+%/*static char sccsid[] = "from: @(#)rquota.x 2.1 88/08/01 4.0 RPCSRC";*/ -+%static const char rcsid[] = -+% "$FreeBSD: src/include/rpcsvc/rquota.x,v 1.6 1999/08/27 23:45:10 peter Exp $"; -+%#endif /* not lint */ -+#endif -+ -+const RQ_PATHLEN = 1024; -+ -+struct getquota_args { -+ string gqa_pathp; /* path to filesystem of interest */ -+ int gqa_uid; /* inquire about quota for uid */ -+}; -+ -+/* -+ * remote quota structure -+ */ -+struct rquota { -+ int rq_bsize; /* block size for block counts */ -+ bool rq_active; /* indicates whether quota is active */ -+ unsigned int rq_bhardlimit; /* absolute limit on disk blks alloc */ -+ unsigned int rq_bsoftlimit; /* preferred limit on disk blks */ -+ unsigned int rq_curblocks; /* current block count */ -+ unsigned int rq_fhardlimit; /* absolute limit on allocated files */ -+ unsigned int rq_fsoftlimit; /* preferred file limit */ -+ unsigned int rq_curfiles; /* current # allocated files */ -+ unsigned int rq_btimeleft; /* time left for excessive disk use */ -+ unsigned int rq_ftimeleft; /* time left for excessive files */ -+}; -+ -+enum gqr_status { -+ Q_OK = 1, /* quota returned */ -+ Q_NOQUOTA = 2, /* noquota for uid */ -+ Q_EPERM = 3 /* no permission to access quota */ -+}; -+ -+union getquota_rslt switch (gqr_status status) { -+case Q_OK: -+ rquota gqr_rquota; /* valid if status == Q_OK */ -+case Q_NOQUOTA: -+ void; -+case Q_EPERM: -+ void; -+}; -+ -+program RQUOTAPROG { -+ version RQUOTAVERS { -+ /* -+ * Get all quotas -+ */ -+ getquota_rslt -+ RQUOTAPROC_GETQUOTA(getquota_args) = 1; -+ -+ /* -+ * Get active quotas only -+ */ -+ getquota_rslt -+ RQUOTAPROC_GETACTIVEQUOTA(getquota_args) = 2; -+ } = 1; -+} = 100011; --- -1.9.1 - diff --git a/package.bak/libtirpc/0006-Disable-DES-authentification-support.patch b/package.bak/libtirpc/0006-Disable-DES-authentification-support.patch deleted file mode 100644 index 59a77ffc1d..0000000000 --- a/package.bak/libtirpc/0006-Disable-DES-authentification-support.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 79975eb4104667be85abd06874c258438826b674 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 24 Jul 2015 14:45:52 +0200 -Subject: [PATCH] Disable DES authentification support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -uClibc and musl does not provide DES authentication. - -Signed-off-by: Jörg Krause -[peda@axentia.se: update for 1.0.1] -Signed-off-by: Peter Rosin ---- - src/Makefile.am | 2 +- - src/rpc_soc.c | 32 -------------------------------- - 2 files changed, 1 insertion(+), 33 deletions(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 960a522..3a88e31 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,9 +22,8 @@ libtirpc_la_SOURCES = auth_none.c auth_unix.c authunix_prot.c bindresvport.c cln - pmap_prot.c pmap_prot2.c pmap_rmt.c rpc_prot.c rpc_commondata.c \ - rpc_callmsg.c rpc_generic.c rpc_soc.c rpcb_clnt.c rpcb_prot.c \ - rpcb_st_xdr.c svc.c svc_auth.c svc_dg.c svc_auth_unix.c svc_auth_none.c \ -- svc_auth_des.c \ - svc_generic.c svc_raw.c svc_run.c svc_simple.c svc_vc.c getpeereid.c \ -- auth_des.c authdes_prot.c debug.c -+ debug.c - - ## XDR - libtirpc_la_SOURCES += xdr.c xdr_rec.c xdr_array.c xdr_float.c xdr_mem.c xdr_reference.c xdr_stdio.c xdr_sizeof.c -diff --git a/src/svc_auth.c b/src/svc_auth.c ---- a/src/svc_auth.c -+++ b/src/svc_auth.c -@@ -114,9 +114,6 @@ _gss_authenticate(rqst, msg, no_dispatch) - case AUTH_SHORT: - dummy = _svcauth_short(rqst, msg); - return (dummy); -- case AUTH_DES: -- dummy = _svcauth_des(rqst, msg); -- return (dummy); - #ifdef HAVE_RPCSEC_GSS - case RPCSEC_GSS: - dummy = _svcauth_gss(rqst, msg, no_dispatch); -diff --git a/src/rpc_soc.c b/src/rpc_soc.c -index e146ed4..161a1ec 100644 ---- a/src/rpc_soc.c -+++ b/src/rpc_soc.c -@@ -61,7 +61,6 @@ #ifdef PORTMAP - #include - #include - #include --#include - - #include "rpc_com.h" - -@@ -522,86 +521,6 @@ clnt_broadcast(prog, vers, proc, xargs, argsp, xresults, resultsp, eachresult) - } - - /* -- * Create the client des authentication object. Obsoleted by -- * authdes_seccreate(). -- */ --AUTH * --authdes_create(servername, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- case AF_INET6: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in6), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_seccreate(servername, window, hostname, ckey); -- return (nauth); -- } --fallback: -- return authdes_seccreate(servername, window, NULL, ckey); --} -- --/* -- * Create the client des authentication object. Obsoleted by -- * authdes_pk_seccreate(). -- */ --extern AUTH *authdes_pk_seccreate(const char *, netobj *, u_int, const char *, -- const des_block *, nis_server *); -- --AUTH * --authdes_pk_create(servername, pkey, window, syncaddr, ckey) -- char *servername; /* network name of server */ -- netobj *pkey; /* public key */ -- u_int window; /* time to live */ -- struct sockaddr *syncaddr; /* optional hostaddr to sync with */ -- des_block *ckey; /* optional conversation key to use */ --{ -- AUTH *nauth; -- char hostname[NI_MAXHOST]; -- -- if (syncaddr) { -- /* -- * Change addr to hostname, because that is the way -- * new interface takes it. -- */ -- switch (syncaddr->sa_family) { -- case AF_INET: -- if (getnameinfo(syncaddr, sizeof(struct sockaddr_in), hostname, -- sizeof hostname, NULL, 0, 0) != 0) -- goto fallback; -- break; -- default: -- goto fallback; -- } -- nauth = authdes_pk_seccreate(servername, pkey, window, hostname, ckey, NULL); -- return (nauth); -- } --fallback: -- return authdes_pk_seccreate(servername, pkey, window, NULL, ckey, NULL); --} -- -- --/* - * Create a client handle for a unix connection. Obsoleted by clnt_vc_create() - */ - CLIENT * --- -2.4.6 - diff --git a/package.bak/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch b/package.bak/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch deleted file mode 100644 index 56b5bf8392..0000000000 --- a/package.bak/libtirpc/0007-Add-missing-rwlock_unlocks-in-xprt_register.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 4f1503e84b2f7bd229a097335e52fb8203f5bb0b Mon Sep 17 00:00:00 2001 -From: Michael Forney -Date: Wed, 4 Nov 2015 13:58:06 -0500 -Subject: [PATCH] Add missing rwlock_unlocks in xprt_register - -It looks like in b2c9430f46c4ac848957fb8adaac176a3f6ac03f when svc_run -switched to poll, an early return was added, but the rwlock was not -unlocked. - -I observed that rpcbind built against libtirpc-1.0.1 would handle only -one request before hanging, and tracked it down to a missing -rwlock_unlock here. - -Fixes: b2c9430f46c4 ('Use poll() instead of select() in svc_run()') -Signed-off-by: Michael Forney -Signed-off-by: Steve Dickson -[peda@axentia.se: backport from upstream] -Signed-off-by: Peter Rosin ---- - src/svc.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/svc.c b/src/svc.c -index 9c41445..b59467b 100644 ---- a/src/svc.c -+++ b/src/svc.c -@@ -99,7 +99,7 @@ xprt_register (xprt) - { - __svc_xports = (SVCXPRT **) calloc (_rpc_dtablesize(), sizeof (SVCXPRT *)); - if (__svc_xports == NULL) -- return; -+ goto unlock; - } - if (sock < _rpc_dtablesize()) - { -@@ -120,14 +120,14 @@ xprt_register (xprt) - svc_pollfd[i].fd = sock; - svc_pollfd[i].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); -- return; -+ goto unlock; - } - - new_svc_pollfd = (struct pollfd *) realloc (svc_pollfd, - sizeof (struct pollfd) - * (svc_max_pollfd + 1)); - if (new_svc_pollfd == NULL) /* Out of memory */ -- return; -+ goto unlock; - svc_pollfd = new_svc_pollfd; - ++svc_max_pollfd; - -@@ -135,6 +135,7 @@ xprt_register (xprt) - svc_pollfd[svc_max_pollfd - 1].events = (POLLIN | POLLPRI | - POLLRDNORM | POLLRDBAND); - } -+unlock: - rwlock_unlock (&svc_fd_lock); - } - --- -2.5.3 - diff --git a/package.bak/libtirpc/Config.in b/package.bak/libtirpc/Config.in deleted file mode 100644 index 2e9c939fa8..0000000000 --- a/package.bak/libtirpc/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBTIRPC - bool "libtirpc" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Libtirpc is a port of Sun's Transport-Independent RPC - library to Linux. - - http://sourceforge.net/projects/libtirpc/ - -comment "libtirpc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libtirpc/libtirpc.hash b/package.bak/libtirpc/libtirpc.hash deleted file mode 100644 index cd65164cb2..0000000000 --- a/package.bak/libtirpc/libtirpc.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From sourceforge's info on download page: -sha1 8da1636f98b5909c0d587e7534bc1e91f5c1a970 libtirpc-1.0.1.tar.bz2 -# Locally computed -sha256 5156974f31be7ccbc8ab1de37c4739af6d9d42c87b1d5caf4835dda75fcbb89e libtirpc-1.0.1.tar.bz2 diff --git a/package.bak/libtirpc/libtirpc.mk b/package.bak/libtirpc/libtirpc.mk deleted file mode 100644 index 70a31ac59f..0000000000 --- a/package.bak/libtirpc/libtirpc.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libtirpc -# -################################################################################ - -LIBTIRPC_VERSION = 1.0.1 -LIBTIRPC_SOURCE = libtirpc-$(LIBTIRPC_VERSION).tar.bz2 -LIBTIRPC_SITE = http://downloads.sourceforge.net/project/libtirpc/libtirpc/$(LIBTIRPC_VERSION) -LIBTIRPC_LICENSE = BSD-3c -LIBTIRPC_LICENSE_FILES = COPYING - -LIBTIRPC_INSTALL_STAGING = YES -LIBTIRPC_AUTORECONF = YES - -# getrpcby{number,name} are only provided if 'GQ' is defined -LIBTIRPC_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -DGQ" - -LIBTIRPC_CONF_OPTS = --disable-gssapi - -$(eval $(autotools-package)) diff --git a/package.bak/libtomcrypt/Config.in b/package.bak/libtomcrypt/Config.in deleted file mode 100644 index 6678b303df..0000000000 --- a/package.bak/libtomcrypt/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIBTOMCRYPT - bool "libtomcrypt" - select BR2_PACKAGE_LIBTOMMATH - help - LibTomCrypt is a fairly comprehensive, modular and portable - cryptographic toolkit that provides developers with a vast array - of well known published block ciphers, one-way hash functions, - chaining modes, pseudo-random number generators, public key - cryptography and a plethora of other routines. - - http://www.libtom.net diff --git a/package.bak/libtomcrypt/libtomcrypt.hash b/package.bak/libtomcrypt/libtomcrypt.hash deleted file mode 100644 index 562016d52f..0000000000 --- a/package.bak/libtomcrypt/libtomcrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e33b47d77a495091c8703175a25c8228aff043140b2554c08a3c3cd71f79d116 crypt-1.17.tar.bz2 diff --git a/package.bak/libtomcrypt/libtomcrypt.mk b/package.bak/libtomcrypt/libtomcrypt.mk deleted file mode 100644 index 8cc02b28d3..0000000000 --- a/package.bak/libtomcrypt/libtomcrypt.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libtomcrypt -# -################################################################################ - -LIBTOMCRYPT_VERSION = 1.17 -LIBTOMCRYPT_SITE = https://github.com/libtom/libtomcrypt/releases/download/$(LIBTOMCRYPT_VERSION) -LIBTOMCRYPT_SOURCE = crypt-$(LIBTOMCRYPT_VERSION).tar.bz2 -LIBTOMCRYPT_LICENSE = WTFPL -LIBTOMCRYPT_LICENSE_FILES = LICENSE -LIBTOMCRYPT_INSTALL_STAGING = YES -LIBTOMCRYPT_INSTALL_TARGET = NO # only static library -LIBTOMCRYPT_DEPENDENCIES = libtommath - -LIBTOMCRYPT_CFLAGS = -I./src/headers $(TARGET_CFLAGS) -DLTC_SOURCE -DLTM_DESC \ - $(if $(BR2_USE_WCHAR),,-DLTC_NO_WCHAR) - -define LIBTOMCRYPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="$(LIBTOMCRYPT_CFLAGS)" -endef - -define LIBTOMCRYPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" NODOCS=1 INSTALL_USER=$(shell id -u) INSTALL_GROUP=$(shell id -g) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libtommath/Config.in b/package.bak/libtommath/Config.in deleted file mode 100644 index b2ffc722ac..0000000000 --- a/package.bak/libtommath/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBTOMMATH - bool "libtommath" - help - LibTomMath is a free open source portable number theoretic - multiple-precision integer library written entirely in C. - - http://www.libtom.net diff --git a/package.bak/libtommath/libtommath.hash b/package.bak/libtommath/libtommath.hash deleted file mode 100644 index fcf2ddc9e4..0000000000 --- a/package.bak/libtommath/libtommath.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 993a7df9ee091fca430cdde3263df57d88ef62af8103903214da49fc51bbb56c ltm-1.0.tar.xz diff --git a/package.bak/libtommath/libtommath.mk b/package.bak/libtommath/libtommath.mk deleted file mode 100644 index 2fc8c39c6e..0000000000 --- a/package.bak/libtommath/libtommath.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libtommath -# -################################################################################ - -LIBTOMMATH_VERSION = 1.0 -LIBTOMMATH_SITE = https://github.com/libtom/libtommath/releases/download/v$(LIBTOMMATH_VERSION) -LIBTOMMATH_SOURCE = ltm-$(LIBTOMMATH_VERSION).tar.xz -LIBTOMMATH_LICENSE = WTFPL -LIBTOMMATH_LICENSE_FILES = LICENSE -LIBTOMMATH_INSTALL_STAGING = YES -LIBTOMMATH_INSTALL_TARGET = NO # only static library - -define LIBTOMMATH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) CFLAGS="-I./ -fPIC $(TARGET_CFLAGS)" -endef - -define LIBTOMMATH_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(STAGING_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libtool/Config.in b/package.bak/libtool/Config.in deleted file mode 100644 index d3cf2d7843..0000000000 --- a/package.bak/libtool/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBTOOL - bool "libtool" - help - Library that hides the complexity of using shared/static libraries - on different platforms behind a consistent, portable interface. - - http://www.gnu.org/software/libtool/ diff --git a/package.bak/libtool/libtool.hash b/package.bak/libtool/libtool.hash deleted file mode 100644 index baaac61232..0000000000 --- a/package.bak/libtool/libtool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f libtool-2.4.6.tar.xz diff --git a/package.bak/libtool/libtool.mk b/package.bak/libtool/libtool.mk deleted file mode 100644 index 1d066bd1ec..0000000000 --- a/package.bak/libtool/libtool.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# libtool -# -################################################################################ - -LIBTOOL_VERSION = 2.4.6 -LIBTOOL_SOURCE = libtool-$(LIBTOOL_VERSION).tar.xz -LIBTOOL_SITE = $(BR2_GNU_MIRROR)/libtool -LIBTOOL_INSTALL_STAGING = YES -LIBTOOL_CONF_ENV = HELP2MAN=true -LIBTOOL_DEPENDENCIES = host-m4 -HOST_LIBTOOL_DEPENDENCIES = host-m4 -LIBTOOL_LICENSE = GPLv2+ -LIBTOOL_LICENSE_FILES = COPYING - -HOST_LIBTOOL_CONF_ENV = MAKEINFO=true -HOST_LIBTOOL_LIBTOOL_PATCH = NO - -# We have a patch that affects libtool.m4, which triggers an autoreconf -# in the build step. Normally we would set AUTORECONF = YES, but this -# doesn't work for host-libtool because that creates a circular -# dependency. Instead, touch the generated files so autoreconf is not -# triggered in the build step. Note that aclocal.m4 has to be touched -# first since the rest depends on it. Note that we don't need the changes -# in libtool.m4 in our configure script, because we're not actually -# running it on the target. -# For the target, we would normally be able to use AUTORECONF, but it -# fails on libltdl/Makefile.inc. Rather than trying to fix that failure, -# just use the same hack as on the host. -define LIBTOOL_AVOID_AUTORECONF_HOOK - find $(@D) -name aclocal.m4 -exec touch '{}' \; - find $(@D) -name config-h.in -exec touch '{}' \; - find $(@D) -name configure -exec touch '{}' \; - find $(@D) -name Makefile.in -exec touch '{}' \; -endef -LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK -HOST_LIBTOOL_PRE_CONFIGURE_HOOKS += LIBTOOL_AVOID_AUTORECONF_HOOK - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# variables used by other packages -LIBTOOL = $(HOST_DIR)/usr/bin/libtool -LIBTOOLIZE = $(HOST_DIR)/usr/bin/libtoolize diff --git a/package.bak/libtorrent/0001-cross_compile.patch b/package.bak/libtorrent/0001-cross_compile.patch deleted file mode 100644 index abb243820c..0000000000 --- a/package.bak/libtorrent/0001-cross_compile.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c4cc0ba76c81e1967c648be423f5f0312ac9d87f Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 5 Oct 2015 00:40:25 +0100 -Subject: [PATCH] Fix cross compilation, based on OpenWRT patch. - -[Vincent: tweak the patch for version 0.13.6] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera ---- - configure.ac | 1 - - scripts/checks.m4 | 2 +- - scripts/common.m4 | 4 ++-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ba994ee..7696466 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -19,7 +19,6 @@ AC_SUBST(LIBTORRENT_INTERFACE_VERSION_NO) - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 598f39b..0e5abe0 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include -diff --git a/scripts/common.m4 b/scripts/common.m4 -index 5127624..cc68269 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; --- -1.7.1 - diff --git a/package.bak/libtorrent/Config.in b/package.bak/libtorrent/Config.in deleted file mode 100644 index 4787f9c60d..0000000000 --- a/package.bak/libtorrent/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBTORRENT - bool "libtorrent" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_ZLIB - help - BitTorrent library written in C++ for *nix - - https://github.com/rakshasa/libtorrent - -comment "libtorrent needs a toolchain w/ C++, threads" - depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libtorrent/libtorrent.hash b/package.bak/libtorrent/libtorrent.hash deleted file mode 100644 index 73753e94ce..0000000000 --- a/package.bak/libtorrent/libtorrent.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2838a08c96edfd936aff8fbf99ecbb930c2bfca3337dd1482eb5fccdb80d5a04 libtorrent-0.13.6.tar.gz diff --git a/package.bak/libtorrent/libtorrent.mk b/package.bak/libtorrent/libtorrent.mk deleted file mode 100644 index ef1c75f039..0000000000 --- a/package.bak/libtorrent/libtorrent.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libtorrent -# -################################################################################ - -LIBTORRENT_VERSION = 0.13.6 -LIBTORRENT_SITE = http://rtorrent.net/downloads -LIBTORRENT_DEPENDENCIES = host-pkgconf zlib \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) -LIBTORRENT_CONF_OPTS = --enable-aligned \ - --disable-instrumentation \ - --with-zlib=$(STAGING_DIR)/usr \ - $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) -LIBTORRENT_INSTALL_STAGING = YES -LIBTORRENT_AUTORECONF = YES -LIBTORRENT_LICENSE = GPLv2 -LIBTORRENT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libtpl/Config.in b/package.bak/libtpl/Config.in deleted file mode 100644 index 0286e033d6..0000000000 --- a/package.bak/libtpl/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBTPL - bool "libtpl" - help - Easily store and retrieve binary data in C - - http://troydhanson.github.io/tpl/ diff --git a/package.bak/libtpl/libtpl.hash b/package.bak/libtpl/libtpl.hash deleted file mode 100644 index 7df62f204c..0000000000 --- a/package.bak/libtpl/libtpl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0b3750bf62f56be4c42f83c89d8449b24f1c5f1605a104801d70f2f3c06fb2ff libtpl-v1.6.1.tar.gz diff --git a/package.bak/libtpl/libtpl.mk b/package.bak/libtpl/libtpl.mk deleted file mode 100644 index ed3bfb57bb..0000000000 --- a/package.bak/libtpl/libtpl.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# libtpl -# -################################################################################ - -LIBTPL_VERSION = v1.6.1 -LIBTPL_SITE = $(call github,troydhanson,tpl,$(LIBTPL_VERSION)) -LIBTPL_INSTALL_STAGING = YES -LIBTPL_LICENSE = BSD-like -LIBTPL_LICENSE_FILES = LICENSE - -LIBTPL_AUTORECONF = YES - -define LIBTPL_CREATE_MISSING_FILES - touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/ChangeLog $(@D)/COPYING -endef -LIBTPL_POST_EXTRACT_HOOKS += LIBTPL_CREATE_MISSING_FILES - -$(eval $(autotools-package)) diff --git a/package.bak/libubox/Config.in b/package.bak/libubox/Config.in deleted file mode 100644 index 25ef4bb89a..0000000000 --- a/package.bak/libubox/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUBOX - bool "libubox" - depends on !BR2_STATIC_LIBS - help - This library originates from the OpenWrt project to - handle the configuration file infrastructure, but can - also be used for the same purposes in projects other - than OpenWrt. - - http://nbd.name/gitweb.cgi?p=luci2/libubox.git;a=summary - -comment "libubox needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libubox/libubox.mk b/package.bak/libubox/libubox.mk deleted file mode 100644 index 00392c3112..0000000000 --- a/package.bak/libubox/libubox.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libubox -# -################################################################################ - -LIBUBOX_VERSION = 290c64ef5b5c3e75be851594f269d6a9568e64e5 -LIBUBOX_SITE = git://git.openwrt.org/project/libubox.git -LIBUBOX_LICENSE = ISC, BSD-3c -LIBUBOX_INSTALL_STAGING = YES -LIBUBOX_DEPENDENCIES = $(if $(BR2_PACKAGE_JSON_C),json-c) - -ifeq ($(BR2_USE_MMU)$(BR2_PACKAGE_LUA_5_1),yy) -LIBUBOX_DEPENDENCIES += lua -LIBUBOX_CONF_OPTS += -DBUILD_LUA=ON \ - -DLUAPATH=$(STAGING_DIR)/usr/lib/lua/5.1 \ - -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include -else -LIBUBOX_CONF_OPTS += -DBUILD_LUA=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libuci/Config.in b/package.bak/libuci/Config.in deleted file mode 100644 index 2f4ad40487..0000000000 --- a/package.bak/libuci/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBUCI - bool "libuci" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBUBOX - help - This library originates from the OpenWrt project to - handle the configuration file infrastructure, but can - also be used for the same purposes in projects other - than OpenWrt. - - This package will also install CLI tool uci. - - http://wiki.openwrt.org/doc/techref/uci - -comment "libuci needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libuci/libuci.mk b/package.bak/libuci/libuci.mk deleted file mode 100644 index 664704571c..0000000000 --- a/package.bak/libuci/libuci.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# libuci -# -################################################################################ - -LIBUCI_VERSION = e339407372ffc70b1451e4eda218c01aa95a6a7f -LIBUCI_SITE = git://nbd.name/uci.git -LIBUCI_LICENSE = LGPLv2.1, GPLv2 (tools) -LIBUCI_INSTALL_STAGING = YES -LIBUCI_DEPENDENCIES = libubox - -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -LIBUCI_DEPENDENCIES += lua -LIBUCI_CONF_OPTS += -DBUILD_LUA=ON \ - -DLUAPATH=/usr/lib/lua/5.1 \ - -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include -LIBUCI_LICENSE := $(LIBUCI_LICENSE), GPLv2 (lua bindings) -else -LIBUCI_CONF_OPTS += -DBUILD_LUA=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libucl/Config.in b/package.bak/libucl/Config.in deleted file mode 100644 index a94701e1d0..0000000000 --- a/package.bak/libucl/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LIBUCL - bool "libucl" - help - Universal configuration library parser - - Libucl is a parser and C API to parse and generate ucl - objects. Libucl consist of several groups of functions: - parser, emitting, conversion, generation, iteration, - validation, and utility. These functions can be used to work - with several formats: JSON, compact JSON, configuration - (nginx like), and YAML. Libucl has clear design that should - be very convenient for reading and writing and makes for an - ideal parser with high performance. - - https://github.com/vstakhov/libucl diff --git a/package.bak/libucl/libucl.hash b/package.bak/libucl/libucl.hash deleted file mode 100644 index bd2ca13bf3..0000000000 --- a/package.bak/libucl/libucl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2f69995c7f8320350f56c1183c395cc4a2a958331f22d60b7839a117c9c601e1 libucl-0.7.3.tar.gz diff --git a/package.bak/libucl/libucl.mk b/package.bak/libucl/libucl.mk deleted file mode 100644 index 3530bbe5ea..0000000000 --- a/package.bak/libucl/libucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libucl -# -################################################################################ - -LIBUCL_VERSION = 0.7.3 -LIBUCL_SITE = $(call github,vstakhov,libucl,$(LIBUCL_VERSION)) -LIBUCL_INSTALL_STAGING = YES -LIBUCL_AUTORECONF = YES -LIBUCL_LICENSE = BSD-2c -LIBUCL_LICENSE_FILES = COPYING -LIBUCL_DEPENDENCIES = host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libuecc/Config.in b/package.bak/libuecc/Config.in deleted file mode 100644 index b7cd0450fe..0000000000 --- a/package.bak/libuecc/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBUECC - bool "libuecc" - depends on !BR2_STATIC_LIBS - help - Very small Elliptic Curve Cryptography library - - http://git.universe-factory.net/libuecc - -comment "libuecc needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/libuecc/libuecc.hash b/package.bak/libuecc/libuecc.hash deleted file mode 100644 index 67eb5eb572..0000000000 --- a/package.bak/libuecc/libuecc.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://projects.universe-factory.net/projects/fastd/files -md5 5cd543cb8e7bce83a22c07a0579c95a1 libuecc-7.tar.xz -# computed locally -sha256 b94aef08eab5359d0facaa7ead2ce81b193eef0c61379d9835213ebc0a46257a libuecc-7.tar.xz diff --git a/package.bak/libuecc/libuecc.mk b/package.bak/libuecc/libuecc.mk deleted file mode 100644 index 87ca2e42d9..0000000000 --- a/package.bak/libuecc/libuecc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libuecc -# -################################################################################ - -LIBUECC_VERSION = 7 -LIBUECC_SITE = https://projects.universe-factory.net/attachments/download/85 -LIBUECC_SOURCE = libuecc-$(LIBUECC_VERSION).tar.xz -LIBUECC_LICENSE = BSD-2c -LIBUECC_LICENSE_FILES = COPYRIGHT -LIBUECC_INSTALL_STAGING = YES - -$(eval $(cmake-package)) diff --git a/package.bak/libuio/0001-configure-remove-po-Makefile.in.patch b/package.bak/libuio/0001-configure-remove-po-Makefile.in.patch deleted file mode 100644 index 067465cc31..0000000000 --- a/package.bak/libuio/0001-configure-remove-po-Makefile.in.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c5fa0b778e1c2a7d03ff6e661bdfa2faef878f68 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 1 Jul 2016 17:56:30 +0200 -Subject: [PATCH] configure: remove po/Makefile.in - -The file po/Makefile.in is automatically added to AC_OUTPUT while using gettexize - -Signed-off-by: Romain Naour ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7fb40f..a25e463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,5 +55,4 @@ dnl last but not least - AC_OUTPUT([Makefile - libuio.dox - libuio-uninstalled.pc -- libuio.pc -- po/Makefile.in]) -+ libuio.pc]) --- -2.5.5 - diff --git a/package.bak/libuio/0002-fix-build-with-musl.patch b/package.bak/libuio/0002-fix-build-with-musl.patch deleted file mode 100644 index 6e5b168c14..0000000000 --- a/package.bak/libuio/0002-fix-build-with-musl.patch +++ /dev/null @@ -1,57 +0,0 @@ -From c378ee112857128002754c616acb6841ee32aaf6 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 2 Jul 2016 10:52:28 +0200 -Subject: [PATCH] fix build with musl - -limits.h header is missing in attr.c, base.c and helper.c to provide -PATH_MAX. - -Fixes: -http://autobuild.buildroot.net/results/702/7023104e6018ea46c54073ddbe5119d0f66ae5a3 - -Signed-off-by: Romain Naour ---- - attr.c | 1 + - base.c | 1 + - helper.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/attr.c b/attr.c -index 4245140..7512f4e 100644 ---- a/attr.c -+++ b/attr.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/base.c b/base.c -index 14ebcee..4ce7301 100644 ---- a/base.c -+++ b/base.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/helper.c b/helper.c -index 170f084..1fb0b4c 100644 ---- a/helper.c -+++ b/helper.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.5.5 - diff --git a/package.bak/libuio/Config.in b/package.bak/libuio/Config.in deleted file mode 100644 index a96df54b12..0000000000 --- a/package.bak/libuio/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBUIO - bool "libuio" - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - libuio is a light-weight C programming library to handle UIO - (Userspace I/O) device discovery and binding task. - - http://github.com/Linutronix/libuio diff --git a/package.bak/libuio/libuio.hash b/package.bak/libuio/libuio.hash deleted file mode 100644 index 6afe7dea8b..0000000000 --- a/package.bak/libuio/libuio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 57f9617f75d20f7912b270568cffdf098fe9d0c1ca690c002e949be8424aa4e6 libuio-940861de278cb794bf9d775b76a4d1d4f9108607.tar.gz diff --git a/package.bak/libuio/libuio.mk b/package.bak/libuio/libuio.mk deleted file mode 100644 index 6d07f1fa86..0000000000 --- a/package.bak/libuio/libuio.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# libuio -# -################################################################################ - -# v0.2.7 -LIBUIO_VERSION = 940861de278cb794bf9d775b76a4d1d4f9108607 -LIBUIO_SITE = $(call github,Linutronix,libuio,$(LIBUIO_VERSION)) -LIBUIO_LICENSE = LGPLv2.1 (library), GPLv2 (programs) -LIBUIO_LICENSE_FILES = COPYING -LIBUIO_CONF_OPTS = --with-glib=no --without-werror -LIBUIO_INSTALL_STAGING = YES - -# Fetched from github, no pre-generated configure script provided -LIBUIO_GETTEXTIZE = YES -LIBUIO_AUTORECONF = YES - -# Avoid build issue when makeinfo is missing -LIBUIO_CONF_ENV += MAKEINFO=true - -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -LIBUIO_DEPENDENCIES += argp-standalone -LIBUIO_LIBS += -largp -endif - -# libuio pulls in libintl if needed, so ensure we also -# link against it, otherwise static linking fails -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LIBUIO_DEPENDENCIES += gettext -LIBUIO_LIBS += -lintl -endif - -LIBUIO_CONF_ENV += LIBS="$(LIBUIO_LIBS)" - -$(eval $(autotools-package)) diff --git a/package.bak/libump/Config.in b/package.bak/libump/Config.in deleted file mode 100644 index 696ccf3b11..0000000000 --- a/package.bak/libump/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUMP - bool "libump" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_arm - help - The ARMs Universal Memory Provider userspace library. - This library is a requirement for ARMs binary Mali driver. - - http://github.com/linux-sunxi/libump - -comment "libump needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/libump/libump.hash b/package.bak/libump/libump.hash deleted file mode 100644 index 5d2ad2eb3e..0000000000 --- a/package.bak/libump/libump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 745bbb3e6a6b2b1d8caec75d2f2e884691ceefa5c2be0480baed31dba66cf450 libump-ec0680628744f30b8fac35e41a7bd8e23e59c39f.tar.gz diff --git a/package.bak/libump/libump.mk b/package.bak/libump/libump.mk deleted file mode 100644 index 65012ffd13..0000000000 --- a/package.bak/libump/libump.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# libump -# -################################################################################ - -LIBUMP_VERSION = ec0680628744f30b8fac35e41a7bd8e23e59c39f -LIBUMP_SITE = $(call github,linux-sunxi,libump,$(LIBUMP_VERSION)) -LIBUMP_LICENSE = Apache-2.0 -LIBUMP_AUTORECONF = YES -LIBUMP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libunistring/Config.in b/package.bak/libunistring/Config.in deleted file mode 100644 index 88fc658035..0000000000 --- a/package.bak/libunistring/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -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.bak/libunistring/libunistring.hash b/package.bak/libunistring/libunistring.hash deleted file mode 100644 index 15e35cb81c..0000000000 --- a/package.bak/libunistring/libunistring.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 2e3764512aaf2ce598af5a38818c0ea23dedf1ff5460070d1b6cee5c3336e797 libunistring-0.9.7.tar.xz diff --git a/package.bak/libunistring/libunistring.mk b/package.bak/libunistring/libunistring.mk deleted file mode 100644 index ce58b471f6..0000000000 --- a/package.bak/libunistring/libunistring.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# libunistring -# -################################################################################ - -LIBUNISTRING_VERSION = 0.9.7 -LIBUNISTRING_SITE = $(BR2_GNU_MIRROR)/libunistring -LIBUNISTRING_SOURCE = libunistring-$(LIBUNISTRING_VERSION).tar.xz -LIBUNISTRING_INSTALL_STAGING = YES -LIBUNISTRING_LICENSE = LGPLv3+ or GPLv2 -LIBUNISTRING_LICENSE_FILES = COPYING.LIB - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBUNISTRING_CONF_OPTS += --enable-threads=posix -else -LIBUNISTRING_CONF_OPTS += --disable-threads -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libunwind/0001-disable-tests.patch b/package.bak/libunwind/0001-disable-tests.patch deleted file mode 100644 index 05475a5d6c..0000000000 --- a/package.bak/libunwind/0001-disable-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -Disable building of tests - -libunwind tests do not build with uClibc, so we disable them. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -36,7 +36,7 @@ - - nodist_include_HEADERS = include/libunwind-common.h - --SUBDIRS = src tests doc -+SUBDIRS = src doc - - noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ - include/compiler.h include/libunwind_i.h include/mempool.h \ -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -313,7 +313,7 @@ - $(am__append_7) $(am__append_8) $(am__append_9) \ - $(am__append_10) - nodist_include_HEADERS = include/libunwind-common.h --SUBDIRS = src tests doc -+SUBDIRS = src doc - noinst_HEADERS = include/dwarf.h include/dwarf_i.h include/dwarf-eh.h \ - include/compiler.h include/libunwind_i.h include/mempool.h \ - include/remote.h \ diff --git a/package.bak/libunwind/0002-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch b/package.bak/libunwind/0002-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch deleted file mode 100644 index 2a37ed7784..0000000000 --- a/package.bak/libunwind/0002-Add-AO_REQUIRE_CAS-to-fix-build-on-ARM-v6.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 24484e80b3e329c9edee1995e102f8612eedb79c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 13 May 2014 23:32:27 +0200 -Subject: [PATCH] Add AO_REQUIRE_CAS to fix build on ARM < v6 - -ARM earlier than ARMv6, such as ARMv4 and ARMv5 do not provide -optimize atomic operations in libatomic_ops. Since libunwind is using -such operations, it should define AO_REQUIRE_CAS before including - so that libatomic_ops knows it should use emulated -atomic operations instead (even though they are obviously a lot more -expensive). - -Also, while real atomic operations are all inline functions and -therefore linking against libatomic_ops was not required, the emulated -atomic operations actually require linking against libatomic_ops, so -the commented AC_CHECK_LIB test in acinclude.m4 is uncommented to make -sure we link against libatomic_ops. - -Signed-off-by: Thomas Petazzoni ---- - acinclude.m4 | 8 +------- - include/libunwind_i.h | 1 + - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 497f7c2..9c15af1 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -22,11 +22,5 @@ fi]) - AC_DEFUN([CHECK_ATOMIC_OPS], - [dnl Check whether the system has the atomic_ops package installed. - AC_CHECK_HEADERS(atomic_ops.h) --# --# Don't link against libatomic_ops for now. We don't want libunwind --# to depend on libatomic_ops.so. Fortunately, none of the platforms --# we care about so far need libatomic_ops.a (everything is done via --# inline macros). --# --# AC_CHECK_LIB(atomic_ops, main) -+ AC_CHECK_LIB(atomic_ops, main) - ]) -diff --git a/include/libunwind_i.h b/include/libunwind_i.h -index 23f615e..deabdfd 100644 ---- a/include/libunwind_i.h -+++ b/include/libunwind_i.h -@@ -95,6 +95,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ - (pthread_mutex_unlock != NULL ? pthread_mutex_unlock (l) : 0) - - #ifdef HAVE_ATOMIC_OPS_H -+# define AO_REQUIRE_CAS - # include - static inline int - cmpxchg_ptr (void *addr, void *old, void *new) --- -1.9.2 - diff --git a/package.bak/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch b/package.bak/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch deleted file mode 100644 index 7ea25129f1..0000000000 --- a/package.bak/libunwind/0003-Link-libunwind-to-libgcc_s-rather-than-libgcc.patch +++ /dev/null @@ -1,41 +0,0 @@ -From f1684379dfaf8018d5d4c1945e292a56d0fab245 Mon Sep 17 00:00:00 2001 -From: Thierry Reding -Date: Fri, 27 Jun 2014 08:40:33 +0200 -Subject: [PATCH] Link libunwind to libgcc_s rather than libgcc - -For some architectures, -lgcc and -lgcc_s are not equivalent. On ARM for -example, libgcc_s.so.1 contains some symbols needed by libunwind which -are not present in libgcc. - -This causes the following link error when building the X.Org X server -with libunwind support: - - CCLD Xorg - /usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr0' - /usr/lib/libunwind.so: undefined reference to `__aeabi_unwind_cpp_pr1' - -Linking against libgcc_s explicitly solves this problem. - -Signed-off-by: Thierry Reding -[yann.morin.1998@free.fr: backport to libunwind 1.1] -Signed-off-by: "Yann E. MORIN" ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4e2fd23..a77cf01 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -258,7 +258,7 @@ else - - if test x$GCC = xyes -a x$intel_compiler != xyes; then - CFLAGS="${CFLAGS} -fexceptions -Wall -Wsign-compare" -- LIBCRTS="-lgcc" -+ LIBCRTS="-lgcc_s" - fi - AC_MSG_RESULT([$intel_compiler]) - --- -1.9.1 - diff --git a/package.bak/libunwind/Config.in b/package.bak/libunwind/Config.in deleted file mode 100644 index 5527a2bc21..0000000000 --- a/package.bak/libunwind/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -# libunwind is only available for a certain subset of the -# architectures (as visible in the list of architectures supported -# with the glibc C library below). -# -# In addition to this, on some architectures libunwind requires the -# *context() function from the C library, which are only available on -# certain architectures in uClibc, and not available at all on -# musl. But on some other architectures, libunwind works without using -# the *context() functions, which allows it to be built with musl. -config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - bool - default y if BR2_TOOLCHAIN_USES_GLIBC && \ - (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_mips || BR2_mipsel || BR2_mips64 || \ - BR2_mips64el || BR2_powerpc || BR2_sh || BR2_i386 || BR2_x86_64) - default y if BR2_TOOLCHAIN_USES_UCLIBC && \ - (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_x86_64) - default y if BR2_TOOLCHAIN_USES_MUSL && \ - (((BR2_arm || BR2_armeb) && BR2_ARM_CPU_HAS_ARM) || \ - BR2_i386 || BR2_x86_64) - -config BR2_PACKAGE_LIBUNWIND - bool "libunwind" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - help - C API to determine the call-chain of a program. - - http://www.nongnu.org/libunwind/index.html - -comment "libunwind needs a toolchain w/ threads" - depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libunwind/libunwind.hash b/package.bak/libunwind/libunwind.hash deleted file mode 100644 index 7ec47fab5a..0000000000 --- a/package.bak/libunwind/libunwind.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9dfe0fcae2a866de9d3942c66995e4b460230446887dbdab302d41a8aee8d09a libunwind-1.1.tar.gz diff --git a/package.bak/libunwind/libunwind.mk b/package.bak/libunwind/libunwind.mk deleted file mode 100644 index a75a88848b..0000000000 --- a/package.bak/libunwind/libunwind.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libunwind -# -################################################################################ - -LIBUNWIND_VERSION = 1.1 -LIBUNWIND_SITE = http://download.savannah.gnu.org/releases/libunwind -LIBUNWIND_INSTALL_STAGING = YES -LIBUNWIND_LICENSE_FILES = COPYING -LIBUNWIND_LICENSE = MIT -LIBUNWIND_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -LIBUNWIND_DEPENDENCIES = libatomic_ops -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libupnp/Config.in b/package.bak/libupnp/Config.in deleted file mode 100644 index 6a07b42d8a..0000000000 --- a/package.bak/libupnp/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBUPNP - bool "libupnp" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The portable SDK for UPnP(tm) Devices (libupnp) provides developers - with an API and open source code for building control points, - devices, and bridges that are compliant with Version 1.0 of the - Universal Plug and Play Device Architecture Specification - - http://pupnp.sourceforge.net/ - -comment "libupnp needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libupnp/libupnp.hash b/package.bak/libupnp/libupnp.hash deleted file mode 100644 index df39f327b6..0000000000 --- a/package.bak/libupnp/libupnp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 af3f3c0846a1d75baeadae4aa5a2bda427567e2a1fb4559bf73ccff0a4f9a39b libupnp-1.6.21.tar.bz2 diff --git a/package.bak/libupnp/libupnp.mk b/package.bak/libupnp/libupnp.mk deleted file mode 100644 index 8236cee1fe..0000000000 --- a/package.bak/libupnp/libupnp.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libupnp -# -################################################################################ - -LIBUPNP_VERSION = 1.6.21 -LIBUPNP_SOURCE = libupnp-$(LIBUPNP_VERSION).tar.bz2 -LIBUPNP_SITE = http://downloads.sourceforge.net/project/pupnp/pupnp/libUPnP%20$(LIBUPNP_VERSION) -LIBUPNP_CONF_ENV = ac_cv_lib_compat_ftime=no -LIBUPNP_INSTALL_STAGING = YES -LIBUPNP_LICENSE = BSD-3c -LIBUPNP_LICENSE_FILES = LICENSE - -$(eval $(autotools-package)) diff --git a/package.bak/libupnpp/Config.in b/package.bak/libupnpp/Config.in deleted file mode 100644 index 2d99586788..0000000000 --- a/package.bak/libupnpp/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBUPNPP - bool "libupnpp" - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBUPNP - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 - help - The libupnpp C++ library wraps libupnp for easier use by upmpdcli and - upplay. - - http://www.lesbonscomptes.com/upmpdcli/ - -comment "libupnpp needs a toolchain w/ C++, threads, gcc >= 4.6" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_6 diff --git a/package.bak/libupnpp/libupnpp.hash b/package.bak/libupnpp/libupnpp.hash deleted file mode 100644 index dde4c4f67c..0000000000 --- a/package.bak/libupnpp/libupnpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hashes from: http://www.lesbonscomptes.com/upmpdcli/downloads/libupnpp-0.15.1.tar.gz.sha256 -sha256 c558e6285d61485e656bc973511396665b68b1d5cfa34db5fa4e64e0f2026c3a libupnpp-0.15.1.tar.gz diff --git a/package.bak/libupnpp/libupnpp.mk b/package.bak/libupnpp/libupnpp.mk deleted file mode 100644 index 0cb3eae2ca..0000000000 --- a/package.bak/libupnpp/libupnpp.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libupnpp -# -################################################################################ - -LIBUPNPP_VERSION = 0.15.1 -LIBUPNPP_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads -LIBUPNPP_LICENSE = GPLv2+ -LIBUPNPP_LICENSE_FILES = COPYING -LIBUPNPP_INSTALL_STAGING = YES -LIBUPNPP_DEPENDENCIES = expat libcurl libupnp - -# configure script fails to link against the dependencies of libupnp -# and libcurl causing detection to fail when statically linking -ifeq ($(BR2_STATIC_LIBS),y) -LIBUPNPP_DEPENDENCIES += host-pkgconf -LIBUPNPP_CONF_ENV += \ - LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libupnp libcurl`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch b/package.bak/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch deleted file mode 100644 index 585abc0322..0000000000 --- a/package.bak/liburcu/0001-Only-blacklist-ARM-gcc-4.8.0-and-4.8.1.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 54d8fe7ae40902d6d38e670f4024092f53c14e1f Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 8 Mar 2014 13:19:14 +0100 -Subject: [PATCH] Only blacklist ARM gcc 4.8.0 and 4.8.1 - -Since many ARM toolchain providers include the bug fix for PR58854 in -their latest releases based on gcc-4.8.2, then only blacklist gcc 4.8.0 -and 4.8.1. - -Signed-off-by: Samuel Martin ---- - urcu/compiler.h | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/urcu/compiler.h b/urcu/compiler.h -index 1e30903..56115f1 100644 ---- a/urcu/compiler.h -+++ b/urcu/compiler.h -@@ -118,10 +118,17 @@ - + __GNUC_PATCHLEVEL__) - - /* -+ * Official gcc releases from 4.8.0 to 4.8.2 have the following bug, -+ * however, many arm toolchain providers have the included the fix for -+ * their latest 4.8.2 releases. -+ * So, we only blacklist gcc 4.8.0 and 4.8.1. -+ * Unfortunately, this bug is not easy to test, so we rely on the -+ * knowledge of the user on its compiler. -+ * - * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 - */ - # ifdef __ARMEL__ --# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40802 -+# if URCU_GCC_VERSION >= 40800 && URCU_GCC_VERSION <= 40801 - # error Your gcc version produces clobbered frame accesses - # endif - # endif --- -1.9.0 - diff --git a/package.bak/liburcu/Config.in b/package.bak/liburcu/Config.in deleted file mode 100644 index b5b6326878..0000000000 --- a/package.bak/liburcu/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - bool - depends on BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || BR2_powerpc || BR2_x86_64 - depends on BR2_USE_MMU # fork() in test - default y - -config BR2_PACKAGE_LIBURCU - bool "liburcu" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Userspace implementation of the Read-Copy-Update (RCU) - synchronization mechanism. This library is mainly used by - the LTTng tracing infrastructure, but can be used for other - purposes as well. - - On ARM, because of bug: - http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58854 - liburcu cannot be built using gcc 4.8.0, 4.8.1 or 4.8.2 without the - following bug fix: - http://gcc.gnu.org/viewcvs/gcc?view=revision&revision=204665 - - http://lttng.org/urcu - -comment "liburcu needs a toolchain w/ threads" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/liburcu/liburcu.hash b/package.bak/liburcu/liburcu.hash deleted file mode 100644 index 5866d805ca..0000000000 --- a/package.bak/liburcu/liburcu.hash +++ /dev/null @@ -1,4 +0,0 @@ -# http://www.lttng.org/files/urcu/userspace-rcu-0.9.2.tar.bz2.sha1 -sha1 61d1d0d1b955c7a67a7253317647304d04b400a0 userspace-rcu-0.9.2.tar.bz2 -# Locally generated -sha256 8f7fa313b1e0a3f742cea24ce63a39c0efe63e615a769e2961e55bd2663ecaa3 userspace-rcu-0.9.2.tar.bz2 diff --git a/package.bak/liburcu/liburcu.mk b/package.bak/liburcu/liburcu.mk deleted file mode 100644 index c21c210a07..0000000000 --- a/package.bak/liburcu/liburcu.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# liburcu -# -################################################################################ - -LIBURCU_VERSION = 0.9.2 -LIBURCU_SITE = http://lttng.org/files/urcu -LIBURCU_SOURCE = userspace-rcu-$(LIBURCU_VERSION).tar.bz2 -LIBURCU_LICENSE = LGPLv2.1+ (library), MIT-like (few source files listed in LICENSE), GPLv2+ (test), GPLv3 (few *.m4 files) -LIBURCU_LICENSE_FILES = lgpl-2.1.txt lgpl-relicensing.txt gpl-2.0.txt LICENSE - -LIBURCU_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/liburiparser/Config.in b/package.bak/liburiparser/Config.in deleted file mode 100644 index 95a6fe83ae..0000000000 --- a/package.bak/liburiparser/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -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.bak/liburiparser/liburiparser.hash b/package.bak/liburiparser/liburiparser.hash deleted file mode 100644 index 84340f8b9c..0000000000 --- a/package.bak/liburiparser/liburiparser.hash +++ /dev/null @@ -1,3 +0,0 @@ -# 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.bak/liburiparser/liburiparser.mk b/package.bak/liburiparser/liburiparser.mk deleted file mode 100644 index 661fa960f4..0000000000 --- a/package.bak/liburiparser/liburiparser.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# 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.bak/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch b/package.bak/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch deleted file mode 100644 index ad71199c4c..0000000000 --- a/package.bak/libusb-compat/0001-Use-C99-standard-fixed-width-integer-types-in-usb.h.patch +++ /dev/null @@ -1,236 +0,0 @@ -From 2e9b6bbebb7cf1ef0095516ec6d5203deb3822e8 Mon Sep 17 00:00:00 2001 -From: Nathan Hjelm -Date: Fri, 9 Oct 2015 15:03:10 -0600 -Subject: [PATCH 1/1] Use C99 standard fixed width integer types in usb.h - -This patch modifies the integer types in usb.h of the form u_int* to the -C99 standard uint* types. - -Based on patch from Gwenhael Goavec-Merou. - -Backported from upstream commit -https://github.com/libusb/libusb-compat-0.1/commit/2e9b6bbebb7cf1ef0095516ec6d5203deb3822e8. - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Nathan Hjelm ---- - libusb/usb.h | 130 ++++++++++++++++++++++++++++++++--------------------------- - 1 file changed, 70 insertions(+), 60 deletions(-) - -diff --git a/libusb/usb.h b/libusb/usb.h -index 84e730f..d2c30aa 100644 ---- a/libusb/usb.h -+++ b/libusb/usb.h -@@ -2,6 +2,7 @@ - * Prototypes, structure definitions and macros. - * - * Copyright (c) 2000-2003 Johannes Erdfelt -+ * Copyright (c) 2015 Nathan Hjelm - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public -@@ -22,8 +23,8 @@ - * distribution for details. - */ - --#ifndef __USB_H__ --#define __USB_H__ -+#ifndef USB_H -+#define USB_H - - #include - #include -@@ -31,6 +32,15 @@ - - #include - -+/* stdint.h is not available on older MSVC */ -+#if defined(_MSC_VER) && (_MSC_VER < 1600) && (!defined(_STDINT)) && (!defined(_STDINT_H)) -+typedef unsigned __int8 uint8_t; -+typedef unsigned __int16 uint16_t; -+typedef unsigned __int32 uint32_t; -+#else -+#include -+#endif -+ - /* - * USB spec information - * -@@ -78,40 +88,40 @@ - - /* All standard descriptors have these 2 fields in common */ - struct usb_descriptor_header { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -+ uint8_t bLength; -+ uint8_t bDescriptorType; - }; - - /* String descriptor */ - struct usb_string_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wData[1]; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wData[1]; - }; - - /* HID descriptor */ - struct usb_hid_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdHID; -- u_int8_t bCountryCode; -- u_int8_t bNumDescriptors; -- /* u_int8_t bReportDescriptorType; */ -- /* u_int16_t wDescriptorLength; */ -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdHID; -+ uint8_t bCountryCode; -+ uint8_t bNumDescriptors; -+ /* uint8_t bReportDescriptorType; */ -+ /* uint16_t wDescriptorLength; */ - /* ... */ - }; - - /* Endpoint descriptor */ - #define USB_MAXENDPOINTS 32 - struct usb_endpoint_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bEndpointAddress; -- u_int8_t bmAttributes; -- u_int16_t wMaxPacketSize; -- u_int8_t bInterval; -- u_int8_t bRefresh; -- u_int8_t bSynchAddress; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bEndpointAddress; -+ uint8_t bmAttributes; -+ uint16_t wMaxPacketSize; -+ uint8_t bInterval; -+ uint8_t bRefresh; -+ uint8_t bSynchAddress; - - unsigned char *extra; /* Extra descriptors */ - int extralen; -@@ -129,15 +139,15 @@ struct usb_endpoint_descriptor { - /* Interface descriptor */ - #define USB_MAXINTERFACES 32 - struct usb_interface_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int8_t bInterfaceNumber; -- u_int8_t bAlternateSetting; -- u_int8_t bNumEndpoints; -- u_int8_t bInterfaceClass; -- u_int8_t bInterfaceSubClass; -- u_int8_t bInterfaceProtocol; -- u_int8_t iInterface; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint8_t bInterfaceNumber; -+ uint8_t bAlternateSetting; -+ uint8_t bNumEndpoints; -+ uint8_t bInterfaceClass; -+ uint8_t bInterfaceSubClass; -+ uint8_t bInterfaceProtocol; -+ uint8_t iInterface; - - struct usb_endpoint_descriptor *endpoint; - -@@ -155,14 +165,14 @@ struct usb_interface { - /* Configuration descriptor information.. */ - #define USB_MAXCONFIG 8 - struct usb_config_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t wTotalLength; -- u_int8_t bNumInterfaces; -- u_int8_t bConfigurationValue; -- u_int8_t iConfiguration; -- u_int8_t bmAttributes; -- u_int8_t MaxPower; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t wTotalLength; -+ uint8_t bNumInterfaces; -+ uint8_t bConfigurationValue; -+ uint8_t iConfiguration; -+ uint8_t bmAttributes; -+ uint8_t MaxPower; - - struct usb_interface *interface; - -@@ -172,28 +182,28 @@ struct usb_config_descriptor { - - /* Device descriptor */ - struct usb_device_descriptor { -- u_int8_t bLength; -- u_int8_t bDescriptorType; -- u_int16_t bcdUSB; -- u_int8_t bDeviceClass; -- u_int8_t bDeviceSubClass; -- u_int8_t bDeviceProtocol; -- u_int8_t bMaxPacketSize0; -- u_int16_t idVendor; -- u_int16_t idProduct; -- u_int16_t bcdDevice; -- u_int8_t iManufacturer; -- u_int8_t iProduct; -- u_int8_t iSerialNumber; -- u_int8_t bNumConfigurations; -+ uint8_t bLength; -+ uint8_t bDescriptorType; -+ uint16_t bcdUSB; -+ uint8_t bDeviceClass; -+ uint8_t bDeviceSubClass; -+ uint8_t bDeviceProtocol; -+ uint8_t bMaxPacketSize0; -+ uint16_t idVendor; -+ uint16_t idProduct; -+ uint16_t bcdDevice; -+ uint8_t iManufacturer; -+ uint8_t iProduct; -+ uint8_t iSerialNumber; -+ uint8_t bNumConfigurations; - }; - - struct usb_ctrl_setup { -- u_int8_t bRequestType; -- u_int8_t bRequest; -- u_int16_t wValue; -- u_int16_t wIndex; -- u_int16_t wLength; -+ uint8_t bRequestType; -+ uint8_t bRequest; -+ uint16_t wValue; -+ uint16_t wIndex; -+ uint16_t wLength; - }; - - /* -@@ -254,7 +264,7 @@ struct usb_device { - - void *dev; /* Darwin support */ - -- u_int8_t devnum; -+ uint8_t devnum; - - unsigned char num_children; - struct usb_device **children; -@@ -266,7 +276,7 @@ struct usb_bus { - char dirname[PATH_MAX + 1]; - - struct usb_device *devices; -- u_int32_t location; -+ uint32_t location; - - struct usb_device *root_dev; - }; --- -2.4.9 - diff --git a/package.bak/libusb-compat/Config.in b/package.bak/libusb-compat/Config.in deleted file mode 100644 index 076d7b8d77..0000000000 --- a/package.bak/libusb-compat/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LIBUSB_COMPAT - bool "libusb-compat" - depends on BR2_PACKAGE_LIBUSB - help - libusb-0.1 compatibility layer for libusb-1.0. - - http://libusb.info/ diff --git a/package.bak/libusb-compat/libusb-compat.hash b/package.bak/libusb-compat/libusb-compat.hash deleted file mode 100644 index c01eee532b..0000000000 --- a/package.bak/libusb-compat/libusb-compat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 404ef4b6b324be79ac1bfb3d839eac860fbc929e6acb1ef88793a6ea328bc55a libusb-compat-0.1.5.tar.bz2 diff --git a/package.bak/libusb-compat/libusb-compat.mk b/package.bak/libusb-compat/libusb-compat.mk deleted file mode 100644 index 26107be861..0000000000 --- a/package.bak/libusb-compat/libusb-compat.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# libusb-compat -# -################################################################################ - -LIBUSB_COMPAT_VERSION_MAJOR = 0.1 -LIBUSB_COMPAT_VERSION = $(LIBUSB_COMPAT_VERSION_MAJOR).5 -LIBUSB_COMPAT_SOURCE = libusb-compat-$(LIBUSB_COMPAT_VERSION).tar.bz2 -LIBUSB_COMPAT_SITE = http://downloads.sourceforge.net/project/libusb/libusb-compat-$(LIBUSB_COMPAT_VERSION_MAJOR)/libusb-compat-$(LIBUSB_COMPAT_VERSION) -LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf libusb -HOST_LIBUSB_COMPAT_DEPENDENCIES = host-pkgconf host-libusb -LIBUSB_COMPAT_INSTALL_STAGING = YES -LIBUSB_COMPAT_CONFIG_SCRIPTS = libusb-config -LIBUSB_COMPAT_LICENSE = LGPLv2.1+ -LIBUSB_COMPAT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libusb/0001-parallel-make.patch b/package.bak/libusb/0001-parallel-make.patch deleted file mode 100644 index a326e99516..0000000000 --- a/package.bak/libusb/0001-parallel-make.patch +++ /dev/null @@ -1,162 +0,0 @@ -Fix parallel build - -This patch is a partial backport of -https://github.com/libusb/libusb/commit/3dc781ce3ecd0315cfc0b4fdcef9e062990f289b - -Signed-off-by: Jeroen Roovers - ---- a/configure.ac -+++ b/configure.ac -@@ -36,6 +36,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RU - - AC_PREREQ([2.50]) - AC_PROG_CC -+AC_PROG_CXX - LT_INIT - LT_LANG([Windows Resource]) - AC_C_INLINE -@@ -91,7 +92,6 @@ case $host in - ;; - *-haiku*) - AC_MSG_RESULT([Haiku]) -- AC_CONFIG_SUBDIRS([libusb/os/haiku]) - backend="haiku" - threads="posix" - ;; -@@ -193,6 +193,7 @@ AM_CONDITIONAL(OS_HAIKU, test "x$backend - AM_CONDITIONAL(THREADS_POSIX, test "x$threads" = xposix) - AM_CONDITIONAL(CREATE_IMPORT_LIB, test "x$create_import_lib" = "xyes") - AM_CONDITIONAL(USE_UDEV, test "x$enable_udev" = xyes) -+AM_CONDITIONAL(USE_USBDK, test "x$enable_usbdk" = xyes) - if test "$threads" = posix; then - AC_DEFINE(THREADS_POSIX, 1, [Use POSIX Threads]) - fi ---- a/libusb/Makefile.am -+++ b/libusb/Makefile.am -@@ -4,58 +4,66 @@ AUTOMAKE_OPTIONS = subdir-objects - - lib_LTLIBRARIES = libusb-1.0.la - --POSIX_POLL_SRC = os/poll_posix.c --LINUX_USBFS_SRC = os/linux_usbfs.c --DARWIN_USB_SRC = os/darwin_usb.c -+POSIX_POLL_SRC = os/poll_posix.h os/poll_posix.c -+POSIX_THREADS_SRC = os/threads_posix.h os/threads_posix.c -+WINDOWS_POLL_SRC = os/poll_windows.h os/poll_windows.c -+WINDOWS_THREADS_SRC = os/threads_windows.h os/threads_windows.c -+LINUX_USBFS_SRC = os/linux_usbfs.h os/linux_usbfs.c -+DARWIN_USB_SRC = os/darwin_usb.h os/darwin_usb.c - OPENBSD_USB_SRC = os/openbsd_usb.c - NETBSD_USB_SRC = os/netbsd_usb.c --WINDOWS_USB_SRC = os/poll_windows.c os/windows_usb.c libusb-1.0.rc libusb-1.0.def --WINCE_USB_SRC = os/wince_usb.c os/wince_usb.h -- --DIST_SUBDIRS = -- --EXTRA_DIST = $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) $(OPENBSD_USB_SRC) \ -- $(NETBSD_USB_SRC) $(WINDOWS_USB_SRC) $(WINCE_USB_SRC) \ -- $(POSIX_POLL_SRC) \ -- os/threads_posix.c os/threads_windows.c \ -+WINDOWS_COMMON_SRC = os/windows_nt_common.h os/windows_nt_common.c \ -+ os/windows_common.h libusb-1.0.rc libusb-1.0.def -+WINDOWS_USB_SRC = os/windows_winusb.h os/windows_winusb.c -+WINDOWS_USBDK_SRC = os/windows_usbdk.h os/windows_usbdk.c -+WINCE_USB_SRC = os/wince_usb.h os/wince_usb.c -+HAIKU_USB_SRC = os/haiku_usb.h os/haiku_usb_backend.cpp \ -+ os/haiku_usb_raw.h os/haiku_usb_raw.cpp os/haiku_pollfs.cpp -+ -+EXTRA_DIST = $(POSIX_POLL_SRC) $(POSIX_THREADS_SRC) \ -+ $(WINDOWS_POLL_SRC) $(WINDOWS_THREADS_SRC) \ -+ $(LINUX_USBFS_SRC) $(DARWIN_USB_SRC) \ -+ $(OPENBSD_USB_SRC) $(NETBSD_USB_SRC) \ -+ $(WINDOWS_COMMON_SRC) $(WINDOWS_USB_SRC) $(WINDOWS_USBDK_SRC) \ -+ $(WINCE_USB_SRC) $(HAIKU_USB_SRC) \ - os/linux_udev.c os/linux_netlink.c - --dist-hook: -- cp -r os/haiku $(distdir)/os/haiku -- rm -rf $(distdir)/os/haiku/autom4te.cache -- - if OS_LINUX - - if USE_UDEV --OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \ -- os/linux_udev.c -+OS_SRC = $(LINUX_USBFS_SRC) os/linux_udev.c - else --OS_SRC = $(LINUX_USBFS_SRC) $(POSIX_POLL_SRC) \ -- os/linux_netlink.c -+OS_SRC = $(LINUX_USBFS_SRC) os/linux_netlink.c - endif - - endif - - if OS_DARWIN --OS_SRC = $(DARWIN_USB_SRC) $(POSIX_POLL_SRC) -+OS_SRC = $(DARWIN_USB_SRC) - AM_CFLAGS_EXT = -no-cpp-precomp - endif - - if OS_OPENBSD --OS_SRC = $(OPENBSD_USB_SRC) $(POSIX_POLL_SRC) -+OS_SRC = $(OPENBSD_USB_SRC) - endif - - if OS_NETBSD --OS_SRC = $(NETBSD_USB_SRC) $(POSIX_POLL_SRC) -+OS_SRC = $(NETBSD_USB_SRC) - endif - - if OS_HAIKU --OS_SRC = $(POSIX_POLL_SRC) --SUBDIRS = os/haiku -+noinst_LTLIBRARIES = libusb_haiku.la -+libusb_haiku_la_SOURCES = $(HAIKU_USB_SRC) -+libusb_1_0_la_LIBADD = libusb_haiku.la - endif - - if OS_WINDOWS --OS_SRC = $(WINDOWS_USB_SRC) -+ -+if USE_USBDK -+OS_SRC = $(WINDOWS_USBDK_SRC) $(WINDOWS_COMMON_SRC) -+else -+OS_SRC = $(WINDOWS_USB_SRC) $(WINDOWS_COMMON_SRC) -+endif - - .rc.lo: - $(AM_V_GEN)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --tag=RC --mode=compile $(RC) $(RCFLAGS) -i $< -o $@ -@@ -69,22 +77,23 @@ if CREATE_IMPORT_LIB - $(AM_V_GEN)$(DLLTOOL) $(DLLTOOLFLAGS) --kill-at --input-def $(srcdir)/libusb-1.0.def --dllname $@ --output-lib .libs/$@.a - endif - -+if OS_WINDOWS -+POLL_SRC = $(WINDOWS_POLL_SRC) -+else -+POLL_SRC = $(POSIX_POLL_SRC) -+endif -+ - if THREADS_POSIX --THREADS_SRC = os/threads_posix.h os/threads_posix.c -+THREADS_SRC = $(POSIX_THREADS_SRC) - else --THREADS_SRC = os/threads_windows.h os/threads_windows.c -+THREADS_SRC = $(WINDOWS_THREADS_SRC) - endif - - libusb_1_0_la_CFLAGS = $(AM_CFLAGS) - libusb_1_0_la_LDFLAGS = $(LTLDFLAGS) --libusb_1_0_la_SOURCES = libusbi.h core.c descriptor.c io.c strerror.c sync.c \ -- os/linux_usbfs.h os/darwin_usb.h os/windows_usb.h os/windows_common.h \ -- hotplug.h hotplug.c $(THREADS_SRC) $(OS_SRC) \ -- os/poll_posix.h os/poll_windows.h -- --if OS_HAIKU --libusb_1_0_la_LIBADD = os/haiku/libhaikuusb.la --endif -+libusb_1_0_la_SOURCES = libusbi.h libusb.h version.h version_nano.h \ -+ core.c descriptor.c hotplug.h hotplug.c io.c strerror.c sync.c \ -+ $(POLL_SRC) $(THREADS_SRC) $(OS_SRC) - - hdrdir = $(includedir)/libusb-1.0 - hdr_HEADERS = libusb.h diff --git a/package.bak/libusb/Config.in b/package.bak/libusb/Config.in deleted file mode 100644 index 5238588aa8..0000000000 --- a/package.bak/libusb/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBUSB - bool "libusb" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Userspace library for accessing USB devices - - http://libusb.info/ - -comment "libusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libusb/libusb.hash b/package.bak/libusb/libusb.hash deleted file mode 100644 index c809896f7a..0000000000 --- a/package.bak/libusb/libusb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 cb057190ba0a961768224e4dc6883104c6f945b2bf2ef90d7da39e7c1834f7ff libusb-1.0.20.tar.bz2 diff --git a/package.bak/libusb/libusb.mk b/package.bak/libusb/libusb.mk deleted file mode 100644 index 4d05feb801..0000000000 --- a/package.bak/libusb/libusb.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# libusb -# -################################################################################ - -LIBUSB_VERSION_MAJOR = 1.0 -LIBUSB_VERSION = $(LIBUSB_VERSION_MAJOR).20 -LIBUSB_SOURCE = libusb-$(LIBUSB_VERSION).tar.bz2 -LIBUSB_SITE = https://github.com/libusb/libusb/releases/download/v$(LIBUSB_VERSION) -LIBUSB_LICENSE = LGPLv2.1+ -LIBUSB_LICENSE_FILES = COPYING -LIBUSB_DEPENDENCIES = host-pkgconf -LIBUSB_INSTALL_STAGING = YES -# 0001-parallel-make.patch -LIBUSB_AUTORECONF = YES - -# Avoid the discovery of udev for the host variant -HOST_LIBUSB_CONF_OPTS = --disable-udev -HOST_LIBUSB_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBUSB_DEPENDENCIES += udev -else -LIBUSB_CONF_OPTS += --disable-udev -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libusbgx/Config.in b/package.bak/libusbgx/Config.in deleted file mode 100644 index fcebf3cfaa..0000000000 --- a/package.bak/libusbgx/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBUSBGX - bool "libusbgx" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBCONFIG - help - libusbgx is a C library encapsulating the kernel USB - gadget-configfs userspace API functionality. - - https://github.com/libusbgx/libusbgx - -comment "libusbgx needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libusbgx/libusbgx.hash b/package.bak/libusbgx/libusbgx.hash deleted file mode 100644 index c185c5803c..0000000000 --- a/package.bak/libusbgx/libusbgx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 1e258205dcde99d0eeb52404ee7ff1bc9a39eb3878e8455fb72bad7cf90c7357 libusbgx-2e3d43ee098ed928d1baa61ce791ce9ff4788c5a.tar.gz diff --git a/package.bak/libusbgx/libusbgx.mk b/package.bak/libusbgx/libusbgx.mk deleted file mode 100644 index 1340d2d17a..0000000000 --- a/package.bak/libusbgx/libusbgx.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libusbgx -# -################################################################################ - -LIBUSBGX_VERSION = 2e3d43ee098ed928d1baa61ce791ce9ff4788c5a -LIBUSBGX_SITE = $(call github,libusbgx,libusbgx,$(LIBUSBGX_VERSION)) -LIBUSBGX_LICENSE = GPLv2+ (examples), LGPLv2.1+ (library) -LIBUSBGX_LICENSE_FILES = COPYING COPYING.LGPL -LIBUSBGX_DEPENDENCIES = host-pkgconf libconfig -LIBUSBGX_AUTORECONF = YES -LIBUSBGX_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/libuv/Config.in b/package.bak/libuv/Config.in deleted file mode 100644 index cdd73a672f..0000000000 --- a/package.bak/libuv/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBUV - bool "libuv" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # pthread_barrier_* - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - help - libuv is a multi-platform support library with a focus - on asynchronous I/O. - - https://github.com/libuv/libuv - -comment "libuv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/libuv/libuv.hash b/package.bak/libuv/libuv.hash deleted file mode 100644 index 9ad1c8a771..0000000000 --- a/package.bak/libuv/libuv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6ec7eec6ecc24b1a8ffedebedb2fe9313fffb5410de89aaf784dd01080411c7a libuv-v1.11.0.tar.gz diff --git a/package.bak/libuv/libuv.mk b/package.bak/libuv/libuv.mk deleted file mode 100644 index 6f6a1cc9fa..0000000000 --- a/package.bak/libuv/libuv.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# libuv -# -################################################################################ - -LIBUV_VERSION = v1.11.0 -LIBUV_SITE = $(call github,libuv,libuv,$(LIBUV_VERSION)) -LIBUV_DEPENDENCIES = host-pkgconf -LIBUV_INSTALL_STAGING = YES -LIBUV_AUTORECONF = YES -LIBUV_LICENSE = BSD-2c, BSD-3c, ISC, MIT -LIBUV_LICENSE_FILES = LICENSE - -# Upstream needs tests to be run sequentially. This is the default in -# automake 1.11 and before, but not starting in 1.12. To maintain -# sequentiality in 1.12 and later, the automake option 'serial-tests' -# must be used, Unfortunately, it is not recognised by 1.11 and -# before. So upstream only adds it conditionally. We use automake -# 1.14, so we need it. -define LIBUV_FIXUP_AUTOGEN - echo "m4_define([UV_EXTRA_AUTOMAKE_FLAGS], [serial-tests])" \ - >$(@D)/m4/libuv-extra-automake-flags.m4 -endef -LIBUV_POST_PATCH_HOOKS += LIBUV_FIXUP_AUTOGEN - -$(eval $(autotools-package)) diff --git a/package.bak/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch b/package.bak/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch deleted file mode 100644 index f23eb7a350..0000000000 --- a/package.bak/libv4l/0001-fixup-lfs-mismatch-in-preload-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e5952b043a71fe83fbc392e498e8f77774fca0d8 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 28 Jun 2014 09:32:53 -0300 -Subject: [PATCH] fixup lfs mismatch in preload libraries - -Ensure that the lfs variants are not transparently used instead of the !lfs -ones so both can be wrapped, independently of any custom CFLAGS/CPPFLAGS. - -Signed-off-by: Peter Korsgaard ---- - lib/libv4l1/v4l1compat.c | 3 +++ - lib/libv4l2/v4l2convert.c | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/lib/libv4l1/v4l1compat.c b/lib/libv4l1/v4l1compat.c -index e328288..70eb74f 100644 ---- a/lib/libv4l1/v4l1compat.c -+++ b/lib/libv4l1/v4l1compat.c -@@ -19,6 +19,9 @@ - # Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA - */ - -+/* ensure we see *64 variants and they aren't transparently used */ -+#undef _LARGEFILE_SOURCE -+#undef _FILE_OFFSET_BITS - #define _LARGEFILE64_SOURCE 1 - - #include -diff --git a/lib/libv4l2/v4l2convert.c b/lib/libv4l2/v4l2convert.c -index 9b46ab8..bc41056 100644 ---- a/lib/libv4l2/v4l2convert.c -+++ b/lib/libv4l2/v4l2convert.c -@@ -23,6 +23,9 @@ - /* prevent GCC 4.7 inlining error */ - #undef _FORTIFY_SOURCE - -+/* ensure we see *64 variants and they aren't transparently used */ -+#undef _LARGEFILE_SOURCE -+#undef _FILE_OFFSET_BITS - #define _LARGEFILE64_SOURCE 1 - - #include --- -1.9.1 diff --git a/package.bak/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch b/package.bak/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch deleted file mode 100644 index 5bce2d916a..0000000000 --- a/package.bak/libv4l/0002-ir-ctl-fixes-for-musl-compile.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 9908872aaa614a6c4bba80d7a5f1adea7ca7117e Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Tue, 14 Feb 2017 21:27:59 +0100 -Subject: [PATCH] ir-ctl: fixes for musl compile - -- add copy of TEMP_FAILURE_RETRY macro -- use strdup instead of strdupa - -Fixes [1]: - - ir-ctl.c:(.text+0xb06): undefined reference to `strndupa' - ir-ctl.c:(.text+0xe01): undefined reference to `TEMP_FAILURE_RETRY' - -[1] http://autobuild.buildroot.net/results/b8b96c7bbf2147dacac62485cbfdbcfd758271a5 - -Signed-off-by: Peter Seiderer ---- - utils/ir-ctl/ir-ctl.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/utils/ir-ctl/ir-ctl.c b/utils/ir-ctl/ir-ctl.c -index bc58cee..e9da777 100644 ---- a/utils/ir-ctl/ir-ctl.c -+++ b/utils/ir-ctl/ir-ctl.c -@@ -44,6 +44,15 @@ - - # define N_(string) string - -+/* taken from glibc unistd.h */ -+#ifndef TEMP_FAILURE_RETRY -+#define TEMP_FAILURE_RETRY(expression) \ -+ (__extension__ \ -+ ({ long int __result; \ -+ do __result = (long int) (expression); \ -+ while (__result == -1L && errno == EINTR); \ -+ __result; })) -+#endif - - /* See drivers/media/rc/ir-lirc-codec.c line 23 */ - #define LIRCBUF_SIZE 512 -@@ -344,12 +353,14 @@ static struct file *read_scancode(const char *name) - return NULL; - } - -- pstr = strndupa(name, p - name); -+ pstr = strndup(name, p - name); - - if (!protocol_match(pstr, &proto)) { - fprintf(stderr, _("error: protocol '%s' not found\n"), pstr); -+ free(pstr); - return NULL; - } -+ free(pstr); - - if (!strtoscancode(p + 1, &scancode)) { - fprintf(stderr, _("error: invalid scancode '%s'\n"), p + 1); --- -2.11.0 - diff --git a/package.bak/libv4l/Config.in b/package.bak/libv4l/Config.in deleted file mode 100644 index 4da00342a2..0000000000 --- a/package.bak/libv4l/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -config BR2_PACKAGE_LIBV4L - bool "libv4l" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - libv4l is a collection of libraries which adds a thin abstraction - layer on top of video4linux2 devices. libv4l consists of 3 different - libraries: libv4lconvert, libv4l1 and libv4l2. - - http://linuxtv.org/wiki/index.php/V4l-utils - -if BR2_PACKAGE_LIBV4L - -comment "libv4l JPEG support not enabled" - depends on !BR2_PACKAGE_JPEG - -config BR2_PACKAGE_LIBV4L_UTILS - bool "v4l-utils tools" - depends on BR2_ENABLE_LOCALE - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - v4l-utils is a collection of various video4linux and DVB utilities. - Enable this if you want to build the following tools: - - cx18-ctl - - dvb-fe-tool, dvbv5-zap, dvbv5-scan, dvb-format-convert - - decode_tm6000 - - ir-keytable - - media-ctl - - v4l2-compliance - - v4l2-ctl, cx18-ctl, ivtv-ctl - - v4l2-sysfs-path - - rds-ctl - - qv4l2 (if Qt is enabled) - -comment "libv4l-utils tools need a toolchain w/ locale" - depends on !BR2_ENABLE_LOCALE - -endif - -comment "libv4l needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/libv4l/libv4l.hash b/package.bak/libv4l/libv4l.hash deleted file mode 100644 index c02fa0aedc..0000000000 --- a/package.bak/libv4l/libv4l.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ac9f8c88bfffa3a7e85c0edd04f7d3d54e6a30c214e79f2c6ecc6fbf57cb229d v4l-utils-1.12.2.tar.bz2 diff --git a/package.bak/libv4l/libv4l.mk b/package.bak/libv4l/libv4l.mk deleted file mode 100644 index 4fec14f384..0000000000 --- a/package.bak/libv4l/libv4l.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# libv4l -# -################################################################################ - -LIBV4L_VERSION = 1.12.2 -LIBV4L_SOURCE = v4l-utils-$(LIBV4L_VERSION).tar.bz2 -LIBV4L_SITE = http://linuxtv.org/downloads/v4l-utils -LIBV4L_INSTALL_STAGING = YES -LIBV4L_DEPENDENCIES = host-pkgconf -LIBV4L_CONF_OPTS = --disable-doxygen-doc - -# fix uclibc-ng configure/compile -LIBV4L_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - -# v4l-utils components have different licences, see v4l-utils.spec for details -LIBV4L_LICENSE = GPLv2+ (utilities), LGPLv2.1+ (libraries) -LIBV4L_LICENSE_FILES = COPYING COPYING.libv4l lib/libv4l1/libv4l1-kernelcode-license.txt - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -LIBV4L_DEPENDENCIES += alsa-lib -endif - -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -LIBV4L_DEPENDENCIES += argp-standalone -LIBV4L_LIBS += -largp -endif - -LIBV4L_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBV4L_DEPENDENCIES += jpeg -LIBV4L_CONF_OPTS += --with-jpeg -else -LIBV4L_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -LIBV4L_DEPENDENCIES += libgl -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIBV4L_CONF_OPTS += --with-libudev -LIBV4L_DEPENDENCIES += udev -else -LIBV4L_CONF_OPTS += --without-libudev -endif - -ifeq ($(BR2_PACKAGE_LIBGLU),y) -LIBV4L_DEPENDENCIES += libglu -endif - -ifeq ($(BR2_PACKAGE_LIBV4L_UTILS),y) -LIBV4L_CONF_OPTS += --enable-v4l-utils -# clock_gettime is used, which is provided by librt for glibc < 2.17 -LIBV4L_LIBS += -lrt -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LIBV4L_DEPENDENCIES += gettext -endif -ifeq ($(BR2_PACKAGE_QT5BASE)$(BR2_PACKAGE_QT5BASE_GUI)$(BR2_PACKAGE_QT5BASE_WIDGETS),yyy) -LIBV4L_CONF_OPTS += --enable-qv4l2 -LIBV4L_DEPENDENCIES += qt5base -# protect against host version detection of moc-qt5/rcc-qt5/uic-qt5 -LIBV4L_CONF_ENV += \ - ac_cv_prog_MOC=$(HOST_DIR)/usr/bin/moc \ - ac_cv_prog_RCC=$(HOST_DIR)/usr/bin/rcc \ - ac_cv_prog_UIC=$(HOST_DIR)/usr/bin/uic -# qt5 needs c++11 (since qt-5.7) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -LIBV4L_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif -else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y) -LIBV4L_CONF_OPTS += --enable-qv4l2 -LIBV4L_DEPENDENCIES += qt -else -LIBV4L_CONF_OPTS += --disable-qv4l2 -endif -else -LIBV4L_CONF_OPTS += --disable-v4l-utils -endif - -LIBV4L_CONF_ENV += LIBS="$(LIBV4L_LIBS)" - -$(eval $(autotools-package)) diff --git a/package.bak/libva-intel-driver/Config.in b/package.bak/libva-intel-driver/Config.in deleted file mode 100644 index 0f5b656b12..0000000000 --- a/package.bak/libva-intel-driver/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LIBVA_INTEL_DRIVER - bool "libva-intel-driver" - select BR2_PACKAGE_LIBVA - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBDRM_INTEL - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs - depends on !BR2_STATIC_LIBS # libva - help - VA-API back-end driver for Intel graphics chips - - https://01.org/linuxgraphics/community/vaapi - -comment "libva intel driver needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on BR2_i386 || BR2_x86_64 diff --git a/package.bak/libva-intel-driver/libva-intel-driver.hash b/package.bak/libva-intel-driver/libva-intel-driver.hash deleted file mode 100644 index 10664d051b..0000000000 --- a/package.bak/libva-intel-driver/libva-intel-driver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/libva/2016-November/004731.html -sha1 5100f187afc4e39fce5664b96fe11a38faa9afaa libva-intel-driver-1.7.3.tar.bz2 diff --git a/package.bak/libva-intel-driver/libva-intel-driver.mk b/package.bak/libva-intel-driver/libva-intel-driver.mk deleted file mode 100644 index 86f6eaa60e..0000000000 --- a/package.bak/libva-intel-driver/libva-intel-driver.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libva-intel-driver -# -################################################################################ - -LIBVA_INTEL_DRIVER_VERSION = 1.7.3 -LIBVA_INTEL_DRIVER_SOURCE = libva-intel-driver-$(LIBVA_INTEL_DRIVER_VERSION).tar.bz2 -LIBVA_INTEL_DRIVER_SITE = http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver -LIBVA_INTEL_DRIVER_LICENSE = MIT -LIBVA_INTEL_DRIVER_LICENSE_FILES = COPYING -# needed to work around https://bugs.freedesktop.org/show_bug.cgi?id=79478 -LIBVA_INTEL_DRIVER_AUTORECONF = YES -LIBVA_INTEL_DRIVER_DEPENDENCIES = host-pkgconf libdrm libva - -ifeq ($(BR2_PACKAGE_XORG7),y) -LIBVA_INTEL_DRIVER_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_INTEL_DRIVER_CONF_OPTS += --enable-x11 -else -LIBVA_INTEL_DRIVER_CONF_OPTS += --disable-x11 -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBVA_INTEL_DRIVER_DEPENDENCIES += wayland -LIBVA_INTEL_DRIVER_CONF_OPTS += --enable-wayland -else -LIBVA_INTEL_DRIVER_CONF_OPTS += --disable-wayland -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libva/0001-no_test_decode.patch b/package.bak/libva/0001-no_test_decode.patch deleted file mode 100644 index 0f0d786679..0000000000 --- a/package.bak/libva/0001-no_test_decode.patch +++ /dev/null @@ -1,17 +0,0 @@ -mpeg2vldemo is the only file requiring cxx support. It is not needed for -buildroot, so disable its compilation to avoid depending on cxx. - -Signed-off-by: Bernd Kuhls - -diff -uNr libva-1.3.0.org/test/Makefile.am libva-1.3.0/test/Makefile.am ---- libva-1.3.0.org/test/Makefile.am 2014-03-24 05:49:46.000000000 +0100 -+++ libva-1.3.0/test/Makefile.am 2014-04-26 18:12:25.644390292 +0200 -@@ -20,7 +20,7 @@ - # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --SUBDIRS = common decode encode vainfo -+SUBDIRS = common encode vainfo - - if USE_X11 - SUBDIRS += basic putsurface diff --git a/package.bak/libva/Config.in b/package.bak/libva/Config.in deleted file mode 100644 index 467b9d2fa4..0000000000 --- a/package.bak/libva/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBVA - bool "libva" - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 - depends on BR2_TOOLCHAIN_HAS_THREADS # libdrm/libpthread-stubs - depends on !BR2_STATIC_LIBS - help - The main motivation for VA-API (Video Acceleration API) is to enable - hardware accelerated video decode/encode at various entry-points (VLD, - IDCT, Motion Compensation etc.) for the prevailing coding standards - today (MPEG-2, MPEG-4 ASP/H.263, MPEG-4 AVC/H.264, and VC-1/VMW3). - - http://www.freedesktop.org/wiki/Software/vaapi/ - -comment "libva needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/libva/libva.hash b/package.bak/libva/libva.hash deleted file mode 100644 index e63f4dbd83..0000000000 --- a/package.bak/libva/libva.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/libva/2016-November/004730.html -sha1 18e46f3d5a0e971eb0ec9fe14bc021e69eb13fb8 libva-1.7.3.tar.bz2 diff --git a/package.bak/libva/libva.mk b/package.bak/libva/libva.mk deleted file mode 100644 index cf42b70e84..0000000000 --- a/package.bak/libva/libva.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# libva -# -################################################################################ - -LIBVA_VERSION = 1.7.3 -LIBVA_SOURCE = libva-$(LIBVA_VERSION).tar.bz2 -LIBVA_SITE = http://www.freedesktop.org/software/vaapi/releases/libva -LIBVA_LICENSE = MIT -LIBVA_LICENSE_FILES = COPYING -LIBVA_AUTORECONF = YES -LIBVA_INSTALL_STAGING = YES -LIBVA_DEPENDENCIES = host-pkgconf libdrm - -# libdrm is a hard-dependency -LIBVA_CONF_OPTS = \ - --enable-drm \ - --disable-dummy-driver \ - --with-drivers-path="/usr/lib/va" - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -LIBVA_DEPENDENCIES += mesa3d -LIBVA_CONF_OPTS += --enable-glx -else -LIBVA_CONF_OPTS += --disable-glx -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -LIBVA_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXfixes -LIBVA_CONF_OPTS += --enable-x11 -else -LIBVA_CONF_OPTS += --disable-x11 -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -LIBVA_DEPENDENCIES += wayland -LIBVA_CONF_OPTS += --enable-wayland -else -LIBVA_CONF_OPTS += --disable-wayland -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -LIBVA_DEPENDENCIES += libegl -LIBVA_CONF_OPTS += --enable-egl -else -LIBVA_CONF_OPTS += --disable-egl -endif - -# Autoreconf requires an m4 directory to exist -define LIBVA_PATCH_M4 - mkdir -p $(@D)/m4 -endef -LIBVA_POST_PATCH_HOOKS += LIBVA_PATCH_M4 - -$(eval $(autotools-package)) diff --git a/package.bak/libvdpau/0001-missing-configh-include.patch b/package.bak/libvdpau/0001-missing-configh-include.patch deleted file mode 100755 index f96c6fa7bc..0000000000 --- a/package.bak/libvdpau/0001-missing-configh-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Rico Tzschichholz -Date: Tue, 1 Sep 2015 10:45:11 +0200 -Subject: mesa_dri2: Add missing include of config.h to define _GNU_SOURCE - -Fix build with -Wimplicit-function-declaration while secure_getenv() is -guarded by __USE_GNU. - -Reviewed-by: Aaron Plattner -Tested-by: Stefan Dirsch -(cherry picked from commit 1cda354bdfd0c9ca107293b84b52f4464fdbedcc) -Signed-off-by: Damien Lanson ---- - src/mesa_dri2.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/mesa_dri2.c b/src/mesa_dri2.c -index 51e8794..420ccee 100644 ---- a/src/mesa_dri2.c -+++ b/src/mesa_dri2.c -@@ -33,6 +33,9 @@ - * and José Hiram Soltren (jsoltren@nvidia.com) - */ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #define NEED_REPLIES - #include diff --git a/package.bak/libvdpau/0002-link-with-libx11.patch b/package.bak/libvdpau/0002-link-with-libx11.patch deleted file mode 100755 index cfb39731c7..0000000000 --- a/package.bak/libvdpau/0002-link-with-libx11.patch +++ /dev/null @@ -1,33 +0,0 @@ -Subject: Link libvdpao with libX11 since it uses symbols from it -Author: Russ Allbery -Forwarded: no - -libvdpau uses the symbols: - - _XEatData - _XReply - _XFlush - _XReadPad - XFree - -which are provided by libX11, but wasn't linking with it directly, resulting -in warnings during the package build (and possibly errors later with better -linkers). - -[Patch taken from -https://anonscm.debian.org/cgit/pkg-nvidia/libvdpau.git/tree/debian/patches/link-with-libx11.patch.] - -Signed-off-by: Damien Lanson - ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -22,7 +22,8 @@ endif - libvdpau_la_LIBADD = \ - $(DLOPEN_LIBS) \ - $(PTHREAD_LIBS) \ -- $(XEXT_LIBS) -+ $(XEXT_LIBS) \ -+ $(X11_LIBS) - - libvdpau_la_LDFLAGS = -version-info 1:0:0 -no-undefined - diff --git a/package.bak/libvdpau/0003-vdpau-module-searchpath.patch b/package.bak/libvdpau/0003-vdpau-module-searchpath.patch deleted file mode 100755 index bd835153d0..0000000000 --- a/package.bak/libvdpau/0003-vdpau-module-searchpath.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Andreas Beckmann -Subject: search the vdpau module in multiple directories - start searching the vdpau module in ${ORIGIN}/vdpau, then the MODULEDIR and - finally fall back to /usr/lib/vdpau - -[Patch taken from -https://anonscm.debian.org/cgit/pkg-nvidia/libvdpau.git/tree/debian/patches/vdpau-module-searchpath.patch.] - -Signed-off-by: Damien Lanson - ---- a/src/vdpau_wrapper.c -+++ b/src/vdpau_wrapper.c -@@ -103,6 +103,13 @@ static char * _vdp_get_driver_name_from_ - return driver_name; - } - -+static char const * _vdpau_module_search_paths[] = { -+ "${ORIGIN}/vdpau", -+ VDPAU_MODULEDIR, -+ "/usr/lib/vdpau", -+ NULL -+}; -+ - static VdpStatus _vdp_open_driver( - Display * display, - int screen) -@@ -117,6 +127,7 @@ static VdpStatus _vdp_open_driver( - char vdpau_driver_lib[PATH_MAX]; - char const * vdpau_trace; - char const * func_name; -+ char const ** module_path; - - vdpau_driver = secure_getenv("VDPAU_DRIVER"); - if (vdpau_driver) { -@@ -138,9 +146,11 @@ static VdpStatus _vdp_open_driver( - - /* Fallback to VDPAU_MODULEDIR when VDPAU_DRIVER_PATH is not set, - * or if we fail to create the driver path/dlopen the library. */ -- if (!_vdp_driver_dll) { -+ for (module_path = _vdpau_module_search_paths; -+ !_vdp_driver_dll && *module_path; -+ ++module_path) { - if (snprintf(vdpau_driver_lib, sizeof(vdpau_driver_lib), -- DRIVER_LIB_FORMAT, VDPAU_MODULEDIR, vdpau_driver) >= -+ DRIVER_LIB_FORMAT, *module_path, vdpau_driver) >= - sizeof(vdpau_driver_lib)) { - fprintf(stderr, "Failed to construct driver path: path too long\n"); - } diff --git a/package.bak/libvdpau/Config.in b/package.bak/libvdpau/Config.in deleted file mode 100755 index b5430abb5a..0000000000 --- a/package.bak/libvdpau/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LIBVDPAU - bool "libvdpau" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - help - VDPAU is the Video Decode and Presentation API for UNIX. - It provides an interface to video decode acceleration and - presentation hardware present in modern GPUs. - - http://freedesktop.org/wiki/Software/VDPAU - -comment "libvdpau needs a toolchain w/ threads, C++" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libvdpau/libvdpau.hash b/package.bak/libvdpau/libvdpau.hash deleted file mode 100755 index 55dc6a7e84..0000000000 --- a/package.bak/libvdpau/libvdpau.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2015-August/002630.html -md5 2fa0b05a4f4d06791eec83bc9c854d14 libvdpau-1.1.1.tar.bz2 -sha1 86516e2a962fd34f65d49115d6ddf15fd912f579 libvdpau-1.1.1.tar.bz2 -sha256 857a01932609225b9a3a5bf222b85e39b55c08787d0ad427dbd9ec033d58d736 libvdpau-1.1.1.tar.bz2 diff --git a/package.bak/libvdpau/libvdpau.mk b/package.bak/libvdpau/libvdpau.mk deleted file mode 100755 index f29da1e406..0000000000 --- a/package.bak/libvdpau/libvdpau.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# libvdpau -# -################################################################################ - -LIBVDPAU_VERSION = 1.1.1 -LIBVDPAU_SOURCE = libvdpau-$(LIBVDPAU_VERSION).tar.bz2 -LIBVDPAU_SITE = http://people.freedesktop.org/~aplattner/vdpau -LIBVDPAU_LICENSE = MIT -LIBVDPAU_LICENSE_FILES = COPYING -LIBVDPAU_INSTALL_STAGING = YES - -# autoreconf for patch 0002-link-with-libx11.patch -LIBVDPAU_AUTORECONF = YES - -LIBVDPAU_DEPENDENCIES = host-pkgconf xlib_libX11 xlib_libXext - -LIBVDPAU_CONF_OPTS = --with-module-dir=/usr/lib/vdpau - -ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) -LIBVDPAU_DEPENDENCIES += xproto_dri2proto -LIBVDPAU_CONF_OPTS += --enable-dri2 -else -LIBVDPAU_CONF_OPTS += --disable-dri2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libvips/0001-fix-no-gtk-doc.patch b/package.bak/libvips/0001-fix-no-gtk-doc.patch deleted file mode 100644 index bfaf7c345b..0000000000 --- a/package.bak/libvips/0001-fix-no-gtk-doc.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a3d47be3b6bed845af5e1aa87ca2da2b1e840cbb Mon Sep 17 00:00:00 2001 -From: Pieter De Gendt -Date: Thu, 29 Jan 2015 12:25:35 +0100 -Subject: [PATCH] Same patch as for systemd in commit - http://git.buildroot.net/buildroot/commit/?id=7144f2f04b70553 - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Pieter De Gendt ---- - doc/reference/gtk-doc.make | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/doc/reference/gtk-doc.make b/doc/reference/gtk-doc.make -index e791656..786803e 100644 ---- a/doc/reference/gtk-doc.make -+++ b/doc/reference/gtk-doc.make -@@ -267,7 +267,7 @@ uninstall-local: - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: --- -2.2.2 - diff --git a/package.bak/libvips/Config.in b/package.bak/libvips/Config.in deleted file mode 100644 index 87ada513d6..0000000000 --- a/package.bak/libvips/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LIBVIPS - bool "libvips" - depends on BR2_USE_WCHAR # gettext, libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # fork() - # C++ support is required to build libvips - # https://github.com/jcupitt/libvips/issues/231 - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - libvips is a 2D image processing library. Compared to - similar libraries, libvips runs quickly and uses little - memory. - - http://www.vips.ecs.soton.ac.uk/ - -comment "libvips needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/libvips/libvips.hash b/package.bak/libvips/libvips.hash deleted file mode 100644 index 18c1ae80f9..0000000000 --- a/package.bak/libvips/libvips.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 45961855e21c8d5f0983d05bb79a6f3c2427dc6eed8e3ac68c0f62759b8612c6 vips-7.42.2.tar.gz diff --git a/package.bak/libvips/libvips.mk b/package.bak/libvips/libvips.mk deleted file mode 100644 index 5f80b2d64c..0000000000 --- a/package.bak/libvips/libvips.mk +++ /dev/null @@ -1,85 +0,0 @@ -################################################################################ -# -# libvips -# -################################################################################ - -LIBVIPS_VERSION_MAJOR = 7.42 -LIBVIPS_VERSION = $(LIBVIPS_VERSION_MAJOR).2 -LIBVIPS_SOURCE = vips-$(LIBVIPS_VERSION).tar.gz -LIBVIPS_SITE = http://www.vips.ecs.soton.ac.uk/supported/$(LIBVIPS_VERSION_MAJOR) -LIBVIPS_LICENSE = LGPLv2.1+ -LIBVIPS_LICENSE_FILES = COPYING -# We're patching gtk-doc.make, so need to autoreconf -LIBVIPS_AUTORECONF = YES - -# Sparc64 compile fails, for all optimization levels except -O0. To -# fix the problem, use -O0 with no optimization instead. Bug reported -# upstream at https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69038. -ifeq ($(BR2_sparc64),y) -LIBVIPS_CXXFLAGS += -O0 -endif - -LIBVIPS_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) $(LIBVIPS_CXXFLAGS)" - -LIBVIPS_CONF_OPTS = \ - --disable-introspection \ - --without-dmalloc \ - --without-gsf \ - --without-magick \ - --without-orc \ - --without-lcms \ - --without-OpenEXR \ - --without-openslide \ - --without-matio \ - --without-cfitsio \ - --without-libwebp \ - --without-pangoft2 \ - --without-x \ - --without-zip \ - --without-python -LIBVIPS_INSTALL_STAGING = YES -LIBVIPS_DEPENDENCIES = \ - host-pkgconf libglib2 \ - libxml2 $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -# --disable-cxx is broken upstream -# https://github.com/jcupitt/libvips/issues/231 -LIBVIPS_CONF_OPTS += --enable-cxx - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBVIPS_CONF_OPTS += --with-jpeg -LIBVIPS_DEPENDENCIES += jpeg -else -LIBVIPS_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -LIBVIPS_CONF_OPTS += --with-png -LIBVIPS_DEPENDENCIES += libpng -else -LIBVIPS_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -LIBVIPS_CONF_OPTS += --with-tiff -LIBVIPS_DEPENDENCIES += tiff -else -LIBVIPS_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_FFTW),y) -LIBVIPS_CONF_OPTS += --with-fftw -LIBVIPS_DEPENDENCIES += fftw -else -LIBVIPS_CONF_OPTS += --without-fftw -endif - -ifeq ($(BR2_PACKAGE_LIBEXIF),y) -LIBVIPS_CONF_OPTS += --with-libexif -LIBVIPS_DEPENDENCIES += libexif -else -LIBVIPS_CONF_OPTS += --without-libexif -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libvncserver/Config.in b/package.bak/libvncserver/Config.in deleted file mode 100644 index 460aa784e9..0000000000 --- a/package.bak/libvncserver/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_LIBVNCSERVER - bool "libvncserver" - depends on BR2_USE_MMU # VNCommand.c uses fork() - # binutils issue (bad expression) - depends on !BR2_nios2 - help - libvncserver is a VNC server/client library. - - http://libvncserver.sourceforge.net/ - -if BR2_PACKAGE_LIBVNCSERVER - -config BR2_PACKAGE_LIBVNCSERVER_TIGHTPNG - bool "TightPNG encoding support" - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - help - TightPNG encoding speeds up HTML5 based VNC clients like - noVNC. - - http://wiki.qemu.org/VNC_Tight_PNG - -endif diff --git a/package.bak/libvncserver/libvncserver.hash b/package.bak/libvncserver/libvncserver.hash deleted file mode 100644 index 8d994e4b6a..0000000000 --- a/package.bak/libvncserver/libvncserver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 193d630372722a532136fd25c5326b2ca1a636cbb8bf9bb115ef869c804d2894 LibVNCServer-0.9.11.tar.gz diff --git a/package.bak/libvncserver/libvncserver.mk b/package.bak/libvncserver/libvncserver.mk deleted file mode 100644 index d3f0657a5d..0000000000 --- a/package.bak/libvncserver/libvncserver.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# libvncserver -# -################################################################################ - -LIBVNCSERVER_VERSION = 0.9.11 -LIBVNCSERVER_SOURCE = LibVNCServer-$(LIBVNCSERVER_VERSION).tar.gz -LIBVNCSERVER_SITE = https://github.com/LibVNC/libvncserver/archive -LIBVNCSERVER_LICENSE = GPLv2+ -LIBVNCSERVER_LICENSE_FILES = COPYING -LIBVNCSERVER_INSTALL_STAGING = YES -LIBVNCSERVER_CONFIG_SCRIPTS = libvncserver-config -LIBVNCSERVER_DEPENDENCIES = host-pkgconf - -# Upstream decided to remove generated autotools files from the -# tarball, so we need to generate them. -LIBVNCSERVER_AUTORECONF = YES - -# libvncserver does not get along with newer libva versions -# https://github.com/LibVNC/libvncserver/issues/11 -LIBVNCSERVER_CONF_OPTS += --without-libva - -# only used for examples -LIBVNCSERVER_CONF_OPTS += --with-sdl-config=/bin/false - -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -LIBVNCSERVER_CONF_OPTS += --without-pthread -endif - -# openssl supports needs NPTL thread support -ifeq ($(BR2_PACKAGE_OPENSSL)$(BR2_TOOLCHAIN_HAS_THREADS_NPTL),yy) -LIBVNCSERVER_DEPENDENCIES += openssl -else -LIBVNCSERVER_CONF_OPTS += --without-crypto --without-ssl -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBVNCSERVER_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -LIBVNCSERVER_DEPENDENCIES += libgcrypt -else -LIBVNCSERVER_CONF_OPTS += --without-gcrypt -endif - -ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -LIBVNCSERVER_DEPENDENCIES += gnutls host-pkgconf -else -LIBVNCSERVER_CONF_OPTS += --without-gnutls -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -LIBVNCSERVER_DEPENDENCIES += jpeg -else -LIBVNCSERVER_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -LIBVNCSERVER_DEPENDENCIES += libpng -else -LIBVNCSERVER_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBVNCSERVER_DEPENDENCIES += zlib -else -LIBVNCSERVER_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libvorbis/Config.in b/package.bak/libvorbis/Config.in deleted file mode 100644 index e322dd256d..0000000000 --- a/package.bak/libvorbis/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBVORBIS - bool "libvorbis" - select BR2_PACKAGE_LIBOGG - help - Library for the Vorbis open source audio decoder - Ogg Vorbis is a fully open, non-proprietary, patent-and-royalty-free, - general-purpose compressed audio format for mid to high quality - (8kHz-48.0kHz, 16+ bit, polyphonic) audio and music at fixed and - variable bitrates from 16 to 128 kbps/channel. - - This places Vorbis in the same competitive class as audio - representations such as MPEG-4 (AAC), and similar to, but higher - performance than MPEG-1/2 audio layer 3, MPEG-4 audio (TwinVQ), - WMA and PAC. diff --git a/package.bak/libvorbis/libvorbis.hash b/package.bak/libvorbis/libvorbis.hash deleted file mode 100644 index e990f4d74f..0000000000 --- a/package.bak/libvorbis/libvorbis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.xiph.org/downloads/ -sha256 54f94a9527ff0a88477be0a71c0bab09a4c3febe0ed878b24824906cd4b0e1d1 libvorbis-1.3.5.tar.xz diff --git a/package.bak/libvorbis/libvorbis.mk b/package.bak/libvorbis/libvorbis.mk deleted file mode 100644 index f1b710c8c8..0000000000 --- a/package.bak/libvorbis/libvorbis.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libvorbis -# -################################################################################ - -LIBVORBIS_VERSION = 1.3.5 -LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.xz -LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis -LIBVORBIS_INSTALL_STAGING = YES -LIBVORBIS_CONF_OPTS = --disable-oggtest -LIBVORBIS_DEPENDENCIES = host-pkgconf libogg -LIBVORBIS_LICENSE = BSD-3c -LIBVORBIS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch b/package.bak/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch deleted file mode 100644 index 20f08c905a..0000000000 --- a/package.bak/libvpx/0001-vpx_mem-vpx_mem.h-Fix-compilation-with-uClibc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 90845a3a263e0f37b9c756c0b01377b9d1a225c9 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 31 Jul 2016 10:37:05 +0200 -Subject: [PATCH] vpx_mem/vpx_mem.h: do not include - -The header does not exist in most C libraries, and including -it causes build failures. - -Signed-off-by: Bernd Kuhls ---- - vpx_mem/vpx_mem.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/vpx_mem/vpx_mem.h b/vpx_mem/vpx_mem.h -index c14f288..82df745 100644 ---- a/vpx_mem/vpx_mem.h -+++ b/vpx_mem/vpx_mem.h -@@ -12,9 +12,6 @@ - #define VPX_MEM_VPX_MEM_H_ - - #include "vpx_config.h" --#if defined(__uClinux__) --# include --#endif - - #include - #include --- -2.8.1 - diff --git a/package.bak/libvpx/Config.in b/package.bak/libvpx/Config.in deleted file mode 100644 index 67a4c578f4..0000000000 --- a/package.bak/libvpx/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LIBVPX - bool "libvpx" - depends on !BR2_bfin - depends on BR2_TOOLCHAIN_HAS_THREADS - help - A high-quality, open video format that's freely available to - everyone. Supports the VP8 and VP9 formats. - - http://webmproject.org - -comment "libvpx needs a toolchain w/ threads" - depends on !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libvpx/libvpx.hash b/package.bak/libvpx/libvpx.hash deleted file mode 100644 index f0240d69ec..0000000000 --- a/package.bak/libvpx/libvpx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 d0afbb5eb1ecae68f8d578abace160a97e2e8a230e3028cf4db115d59a695aad libvpx-1.6.0.tar.bz2 diff --git a/package.bak/libvpx/libvpx.mk b/package.bak/libvpx/libvpx.mk deleted file mode 100644 index 4ad5522498..0000000000 --- a/package.bak/libvpx/libvpx.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# libvpx -# -################################################################################ - -LIBVPX_VERSION = 1.6.0 -LIBVPX_SOURCE = libvpx-$(LIBVPX_VERSION).tar.bz2 -LIBVPX_SITE = http://storage.googleapis.com/downloads.webmproject.org/releases/webm -LIBVPX_LICENSE = BSD-3c -LIBVPX_LICENSE_FILES = LICENSE PATENTS -LIBVPX_INSTALL_STAGING = YES - -# ld is being used with cc options. therefore, pretend ld is cc. -LIBVPX_CONF_ENV = \ - LD="$(TARGET_CC)" \ - CROSS=$(GNU_TARGET_NAME) - -LIBVPX_CONF_OPTS = \ - --disable-examples \ - --disable-docs \ - --disable-unit-tests - -# This is not a true autotools package. It is based on the ffmpeg build system -define LIBVPX_CONFIGURE_CMDS - (cd $(LIBVPX_SRCDIR) && rm -rf config.cache && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - $(LIBVPX_CONF_ENV) \ - ./configure \ - --target=generic-gnu \ - --enable-pic \ - --prefix=/usr \ - $(SHARED_STATIC_LIBS_OPTS) \ - $(LIBVPX_CONF_OPTS) \ - ) -endef - -define LIBVPX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) -C $(@D) all -endef - -define LIBVPX_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install -endef - -define LIBVPX_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(LIBVPX_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/libwebcam/Config.in b/package.bak/libwebcam/Config.in deleted file mode 100644 index be202b0c41..0000000000 --- a/package.bak/libwebcam/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_PACKAGE_LIBWEBCAM - bool "libwebcam" - diff --git a/package.bak/libwebcam/libwebcam.mk b/package.bak/libwebcam/libwebcam.mk deleted file mode 100644 index defdc8638c..0000000000 --- a/package.bak/libwebcam/libwebcam.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libwebcam -# -################################################################################ - -LIBWEBCAM_VERSION = 0.2.5 -LIBWEBCAM_SOURCE = libwebcam-src-$(LIBWEBCAM_VERSION).tar.gz -LIBWEBCAM_SITE = http://freefr.dl.sourceforge.net/project/libwebcam/source -LIBWEBCAM_DEPENDENCIES = libxml2 - -define LIBWEBCAM_INSTALL_TARGET_CMDS - rm $(@D)/uvcdynctrl/uvcdynctrl-*.gz - cp $(@D)/uvcdynctrl/uvcdynctrl $(TARGET_DIR)/usr/bin/uvcdynctrl - cp -d $(@D)/libwebcam/libwebcam.so* $(TARGET_DIR)/usr/lib -endef - -$(eval $(cmake-package)) diff --git a/package.bak/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch b/package.bak/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch deleted file mode 100644 index ea3fd0074b..0000000000 --- a/package.bak/libwebsock/0001-Switch-to-use-pkg-config-to-detect-libevent-and-open.patch +++ /dev/null @@ -1,81 +0,0 @@ -From a6c35dbab5a2a75c176e031122ee64152e50e5d3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 1 Jan 2015 12:23:43 +0100 -Subject: [PATCH] Switch to use pkg-config to detect libevent and openssl - -Switching to pkg-config fixes a number of problems when detecting the -libraries. For example the detection of libpthread was failing, -because libevent_threads was added to LIBS before libevent itself, -causing the libpthread test to fail due to missing symbols. pkg-config -is anyway nowadays the preferred way for detecting libraries. It also -has the benefit of working properly in static library situations. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 36 ++++++++++++------------------------ - 1 file changed, 12 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index d4109ce..fc1cadc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -27,35 +27,20 @@ AC_FUNC_MALLOC - AC_FUNC_REALLOC - AC_CHECK_FUNCS([memset socket strstr]) - --AC_CHECK_HEADERS([event2/thread.h], [ -- LIBS="-levent_pthreads ${LIBS}" -- ], [ -- echo "libevent_pthreads required, failing" -- exit -1 -- ]) --AC_CHECK_LIB(pthread, pthread_create, [LIBS="-lpthread ${LIBS}"], [ -+AC_CHECK_LIB(pthread, pthread_create, [PTHREAD_LIBS="-lpthread"], [ - echo "pthreads required, failing" - exit -1 - ]) --AC_CHECK_LIB(event, event_base_dispatch, [], [ -- echo "libevent required, failing" -- exit -1 -- ]) -+ -+PKG_CHECK_MODULES([EVENT], [libevent]) -+PKG_CHECK_MODULES([EVENT_PTHREAD], [libevent_pthreads]) - - AS_IF([test "x$with_ssl" != "xno"], - [ -- AC_CHECK_LIB([ssl], [SSL_CTX_new], -- [ -- LIBS="-lssl ${LIBS}" -- AC_CHECK_LIB([event_openssl], [bufferevent_openssl_socket_new], [ -- LIBS="-levent_openssl ${LIBS}" -- have_ssl=yes -- ], [have_ssl=no]) -- ], -- [have_ssl=no]) -- ], -- [have_ssl=no]) -- -+ PKG_CHECK_MODULES([SSL], [openssl], [have_ssl=yes], [have_ssl=no]) -+ AS_IF([test "x${have_ssl}" = "xyes"], -+ [PKG_CHECK_MODULES([EVENT_OPENSSL], [libevent_openssl], [have_ssl=yes], [have_ssl=no])])]) -+ - AS_IF([test "x$have_ssl" = "xyes"], - [ - AC_DEFINE([WEBSOCK_HAVE_SSL], [1], [Define if building SSL support]) -@@ -63,8 +48,11 @@ AS_IF([test "x$have_ssl" = "xyes"], - [AS_IF([test "x$with_ssl" = "xyes"], - [AC_MSG_ERROR([SSL support requested but not found]) - ])]) -- -+ - AM_CONDITIONAL([HAVE_SSL], [test "x$have_ssl" = "xyes"]) -+ -+LIBS="${EVENT_LIBS} ${EVENT_PTHREAD_LIBS} ${PTHREAD_LIBS} ${SSL_LIBS} ${EVENT_OPENSSL_LIBS}" -+ - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_VERSION], ["$PACKAGE_VERSION"], [libwebsock version]) - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_STRING], ["$PACKAGE_STRING"], [libwebsock package string]) - AC_DEFINE_UNQUOTED([WEBSOCK_PACKAGE_NAME], ["$PACKAGE_NAME"], [libwebsock package name]) --- -2.1.0 - diff --git a/package.bak/libwebsock/0002-fix-ssl.patch b/package.bak/libwebsock/0002-fix-ssl.patch deleted file mode 100644 index 51b9b36825..0000000000 --- a/package.bak/libwebsock/0002-fix-ssl.patch +++ /dev/null @@ -1,26 +0,0 @@ -config: fix SSL detection - -The @WEBSOCK_HAVE_SSL@ is not replaced at configure time, and even if -it was, it would be replaced by an empty string if openssl is disabled, -thus still defining WEBSOCK_HAVE_SSL when we would not want it. - -Instead, rely on config.h, which is properly generated by ./configure, -to provide the information about whether openssl is enabled or not. - -Signed-off-by: "Yann E. MORIN" - -diff -durN a/src/websock_config.h.in b/src/websock_config.h.in ---- a/src/websock_config.h.in -+++ b/src/websock_config.h.in -@@ -1,9 +1,10 @@ - #ifndef WEBSOCK_CONFIG_H - #define WEBSOCK_CONFIG_H 1 - -+#include "config.h" -+ - #define WEBSOCK_PACKAGE_STRING @WEBSOCK_PACKAGE_STRING@ - #define WEBSOCK_PACKAGE_VERSION @WEBSOCK_PACKAGE_VERSION@ - #define WEBSOCK_PACKAGE_NAME @WEBSOCK_PACKAGE_NAME@ --#define WEBSOCK_HAVE_SSL @WEBSOCK_HAVE_SSL@ - - #endif diff --git a/package.bak/libwebsock/0003-fix-incorrect-inline.patch b/package.bak/libwebsock/0003-fix-incorrect-inline.patch deleted file mode 100644 index 043df45bd3..0000000000 --- a/package.bak/libwebsock/0003-fix-incorrect-inline.patch +++ /dev/null @@ -1,66 +0,0 @@ -utf: do not define decode() to be inline - -Currently, decode() is prototyped in utf.h, its body is in utf.c and it -is called from util.c. - -However, decode() is defined to be inline, which can not work since, -when compiling util.c, the body of decode() is out-of-scope for that -compilation unit. - -Furthermore, decode() uses a utf8d, which is a static defined in utf.c . -So utf8d is not visible when compiling util.c either. - -This means that the definition of decode() along with utf8d is basically -wrong, and is now failing with gcc-5.x, with warnings like so: - - libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c utf.c -fPIC -DPIC -o .libs/libwebsock_la-utf.o - utf.c:36:12: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static - *state = utf8d[256 + *state*16 + type]; - ^ - utf.c:30:19: warning: ‘utf8d’ is static but used in inline function ‘decode’ which is not static - uint32_t type = utf8d[byte]; - ^ - libtool: compile: /home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gcc -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wmissing-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -c util.c -fPIC -DPIC -o .libs/libwebsock_la-util.o - In file included from websock.h:73:0, - from util.c:20: - utf.h:25:17: warning: inline function ‘decode’ declared but never defined - uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte); - ^ - -This results in decode() to be omitted from libwebsock.so, and thus link -failures when another program wants to link with -lwebsock. - -The simplest solution is to not inline decode() at all. - -Signed-off-by: "Yann E. MORIN" - ---- -Note: an alternative would be to move both decode() and utf8d into -decode.h nad ditch decode.c if decode really must be inline. This is -left as an execise for an interested party. But since upstream hasn't -seen a single commit in more than a year now... :-( - -diff -durN a/src/utf.c b/src/utf.c ---- a/src/utf.c 2014-07-15 01:43:20.000000000 +0200 -+++ b/src/utf.c 2015-08-22 22:29:38.667393786 +0200 -@@ -24,7 +24,7 @@ - 1,3,1,1,1,1,1,3,1,3,1,1,1,1,1,1,1,3,1,1,1,1,1,1,1,1,1,1,1,1,1,1, // s7..s8 - }; - --uint32_t inline -+uint32_t - decode(uint32_t* state, uint32_t* codep, uint32_t byte) - { - uint32_t type = utf8d[byte]; -diff -durN a/src/utf.h b/src/utf.h ---- a/src/utf.h 2014-07-15 01:43:20.000000000 +0200 -+++ b/src/utf.h 2015-08-22 22:29:10.439227396 +0200 -@@ -22,7 +22,7 @@ - - #include - --uint32_t inline decode(uint32_t *state, uint32_t *codep, uint32_t byte); -+uint32_t decode(uint32_t *state, uint32_t *codep, uint32_t byte); - - - #endif /* UTF_H_ */ diff --git a/package.bak/libwebsock/Config.in b/package.bak/libwebsock/Config.in deleted file mode 100644 index 9ef21362a1..0000000000 --- a/package.bak/libwebsock/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBWEBSOCK - bool "libwebsock" - select BR2_PACKAGE_LIBEVENT - depends on BR2_TOOLCHAIN_HAS_THREADS - help - C library for easy WebSockets servers. - - This library allows a developer to quickly develop WebSocket - servers by focusing on the actual logic of your WebSocket - implementation instead of the details of the WebSocket - protocol or even specifics of C sockets. - - https://github.com/payden/libwebsock - -comment "libwebsock needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libwebsock/libwebsock.hash b/package.bak/libwebsock/libwebsock.hash deleted file mode 100644 index b94b738101..0000000000 --- a/package.bak/libwebsock/libwebsock.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 34cf8376446e2371c9af47394043a30dc16af7ed5437d56bc6135c5dfda9ed22 libwebsock-3c1615eeadb0b582b63851073bfe3e5132f31ebc.tar.gz diff --git a/package.bak/libwebsock/libwebsock.mk b/package.bak/libwebsock/libwebsock.mk deleted file mode 100644 index b52293b21e..0000000000 --- a/package.bak/libwebsock/libwebsock.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# libwebsock -# -################################################################################ - -LIBWEBSOCK_VERSION = 3c1615eeadb0b582b63851073bfe3e5132f31ebc -LIBWEBSOCK_SITE = $(call github,payden,libwebsock,$(LIBWEBSOCK_VERSION)) -LIBWEBSOCK_DEPENDENCIES = libevent host-pkgconf -LIBWEBSOCK_AUTORECONF = YES -LIBWEBSOCK_INSTALL_STAGING = YES -LIBWEBSOCK_LICENSE = LGPLv3 -LIBWEBSOCK_LICENSE_FILES = COPYING.lesser - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBWEBSOCK_DEPENDENCIES += openssl -LIBWEBSOCK_CONF_OPTS += --with-ssl -else -LIBWEBSOCK_CONF_OPTS += --without-ssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libwebsockets/Config.in b/package.bak/libwebsockets/Config.in deleted file mode 100644 index 2b350bf389..0000000000 --- a/package.bak/libwebsockets/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LIBWEBSOCKETS - bool "libwebsockets" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_ZLIB - help - Libwebsockets is a lightweight pure C library built to use - minimal CPU and memory resources, and provide fast throughput - in both directions. - - http://libwebsockets.org/ diff --git a/package.bak/libwebsockets/libwebsockets.hash b/package.bak/libwebsockets/libwebsockets.hash deleted file mode 100644 index cbd1101d75..0000000000 --- a/package.bak/libwebsockets/libwebsockets.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 bcc96aaa609daae4d3f7ab1ee480126709ef4f6a8bf9c85de40aae48e38cce66 libwebsockets-v2.1.0.tar.gz diff --git a/package.bak/libwebsockets/libwebsockets.mk b/package.bak/libwebsockets/libwebsockets.mk deleted file mode 100644 index bf46291ad4..0000000000 --- a/package.bak/libwebsockets/libwebsockets.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# libwebsockets -# -################################################################################ - -LIBWEBSOCKETS_VERSION = v2.1.0 -LIBWEBSOCKETS_SITE = $(call github,warmcat,libwebsockets,$(LIBWEBSOCKETS_VERSION)) -LIBWEBSOCKETS_LICENSE = LGPLv2.1 with exceptions -LIBWEBSOCKETS_LICENSE_FILES = LICENSE -LIBWEBSOCKETS_DEPENDENCIES = zlib -LIBWEBSOCKETS_INSTALL_STAGING = YES -LIBWEBSOCKETS_CONF_OPTS = -DLWS_WITHOUT_TESTAPPS=ON -DLWS_IPV6=ON - -# If LWS_MAX_SMP=1, then there is no code related to pthreads compiled -# in the library. If unset, LWS_MAX_SMP defaults to 32 and a small -# amount of pthread mutex code is built into the library. -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP=1 -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_MAX_SMP= -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LIBWEBSOCKETS_DEPENDENCIES += openssl host-openssl -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SSL=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBEV),y) -LIBWEBSOCKETS_DEPENDENCIES += libev -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBEV=OFF -endif - -ifeq ($(BR2_PACKAGE_LIBUV),y) -LIBWEBSOCKETS_DEPENDENCIES += libuv -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=ON -else -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_LIBUV=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_SHARED=OFF -endif - -ifeq ($(BR2_SHARED_LIBS),y) -LIBWEBSOCKETS_CONF_OPTS += -DLWS_WITH_STATIC=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/libxkbcommon/Config.in b/package.bak/libxkbcommon/Config.in deleted file mode 100644 index 4da12897f2..0000000000 --- a/package.bak/libxkbcommon/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LIBXKBCOMMON - bool "libxkbcommon" - select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 - help - xkbcommon is a keymap compiler and support library which - processes a reduced subset of keymaps as defined by the XKB - specification. - - http://xkbcommon.org/ diff --git a/package.bak/libxkbcommon/libxkbcommon.hash b/package.bak/libxkbcommon/libxkbcommon.hash deleted file mode 100644 index 525f9ffd20..0000000000 --- a/package.bak/libxkbcommon/libxkbcommon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2017-January/032725.html -sha256 ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b libxkbcommon-0.7.1.tar.xz diff --git a/package.bak/libxkbcommon/libxkbcommon.mk b/package.bak/libxkbcommon/libxkbcommon.mk deleted file mode 100644 index c39a7c0c55..0000000000 --- a/package.bak/libxkbcommon/libxkbcommon.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# libxkbcommon -# -################################################################################ - -LIBXKBCOMMON_VERSION = 0.7.1 -LIBXKBCOMMON_SITE = http://xkbcommon.org/download -LIBXKBCOMMON_SOURCE = libxkbcommon-$(LIBXKBCOMMON_VERSION).tar.xz -LIBXKBCOMMON_LICENSE = MIT/X11 -LIBXKBCOMMON_LICENSE_FILES = LICENSE -LIBXKBCOMMON_INSTALL_STAGING = YES -LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex -# uses C99 features -LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" - -ifeq ($(BR2_PACKAGE_XORG7),y) -LIBXKBCOMMON_CONF_OPTS += --enable-x11 -LIBXKBCOMMON_DEPENDENCIES += libxcb -else -LIBXKBCOMMON_CONF_OPTS += --disable-x11 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/libxml-parser-perl/libxml-parser-perl.hash b/package.bak/libxml-parser-perl/libxml-parser-perl.hash deleted file mode 100644 index d8e0df5a27..0000000000 --- a/package.bak/libxml-parser-perl/libxml-parser-perl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216 XML-Parser-2.44.tar.gz diff --git a/package.bak/libxml-parser-perl/libxml-parser-perl.mk b/package.bak/libxml-parser-perl/libxml-parser-perl.mk deleted file mode 100644 index e512815e3f..0000000000 --- a/package.bak/libxml-parser-perl/libxml-parser-perl.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# libxml-parser-perl -# -################################################################################ - -LIBXML_PARSER_PERL_VERSION = 2.44 -LIBXML_PARSER_PERL_SOURCE = XML-Parser-$(LIBXML_PARSER_PERL_VERSION).tar.gz -LIBXML_PARSER_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TODDR -HOST_LIBXML_PARSER_PERL_DEPENDENCIES = host-expat -LIBXML_PARSER_PERL_LICENSE = Artistic or GPLv1+ -LIBXML_PARSER_PERL_RUN_PERL = `which perl` - -define HOST_LIBXML_PARSER_PERL_CONFIGURE_CMDS - (cd $(@D) ; \ - $(HOST_CONFIGURE_OPTS) $(LIBXML_PARSER_PERL_RUN_PERL) Makefile.PL \ - PREFIX=$(HOST_DIR)/usr \ - EXPATLIBPATH=$(HOST_DIR)/usr/lib \ - EXPATINCPATH=$(HOST_DIR)/usr/include \ - INSTALLDIRS=site \ - INSTALLSITELIB=$(HOST_DIR)/usr/lib/perl \ - INSTALLSITEARCH=$(HOST_DIR)/usr/lib/perl \ - ) -endef - -define HOST_LIBXML_PARSER_PERL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_LIBXML_PARSER_PERL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch b/package.bak/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch deleted file mode 100644 index 42570c6350..0000000000 --- a/package.bak/libxml2/0001-Fix-XPointer-paths-beginning-with-range-to.patch +++ /dev/null @@ -1,178 +0,0 @@ -From 9ab01a277d71f54d3143c2cf333c5c2e9aaedd9e Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 14:22:23 +0200 -Subject: [PATCH] Fix XPointer paths beginning with range-to - -The old code would invoke the broken xmlXPtrRangeToFunction. range-to -isn't really a function but a special kind of location step. Remove -this function and always handle range-to in the XPath code. - -The old xmlXPtrRangeToFunction could also be abused to trigger a -use-after-free error with the potential for remote code execution. - -Found with afl-fuzz. - -Fixes CVE-2016-5131. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 9ab01a277d7 - - result/XPath/xptr/vidbase | 13 ++++++++ - test/XPath/xptr/vidbase | 1 + - xpath.c | 7 ++++- - xpointer.c | 76 ++++------------------------------------------- - 4 files changed, 26 insertions(+), 71 deletions(-) - -diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase -index 8b9e92d66d97..f19193e70edb 100644 ---- a/result/XPath/xptr/vidbase -+++ b/result/XPath/xptr/vidbase -@@ -17,3 +17,16 @@ Object is a Location Set: - To node - ELEMENT p - -+ -+======================== -+Expression: xpointer(range-to(id('chapter2'))) -+Object is a Location Set: -+1 : Object is a range : -+ From node -+ / -+ To node -+ ELEMENT chapter -+ ATTRIBUTE id -+ TEXT -+ content=chapter2 -+ -diff --git a/test/XPath/xptr/vidbase b/test/XPath/xptr/vidbase -index b1463830570a..884b1065d7fd 100644 ---- a/test/XPath/xptr/vidbase -+++ b/test/XPath/xptr/vidbase -@@ -1,2 +1,3 @@ - xpointer(id('chapter1')/p) - xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2])) -+xpointer(range-to(id('chapter2'))) -diff --git a/xpath.c b/xpath.c -index d992841ef0c2..5a01b1b399a2 100644 ---- a/xpath.c -+++ b/xpath.c -@@ -10691,13 +10691,18 @@ xmlXPathCompPathExpr(xmlXPathParserContextPtr ctxt) { - lc = 1; - break; - } else if ((NXT(len) == '(')) { -- /* Note Type or Function */ -+ /* Node Type or Function */ - if (xmlXPathIsNodeType(name)) { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, - "PathExpr: Type search\n"); - #endif - lc = 1; -+#ifdef LIBXML_XPTR_ENABLED -+ } else if (ctxt->xptr && -+ xmlStrEqual(name, BAD_CAST "range-to")) { -+ lc = 1; -+#endif - } else { - #ifdef DEBUG_STEP - xmlGenericError(xmlGenericErrorContext, -diff --git a/xpointer.c b/xpointer.c -index 676c5105837a..d74174a318f1 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -1332,8 +1332,6 @@ xmlXPtrNewContext(xmlDocPtr doc, xmlNodePtr here, xmlNodePtr origin) { - ret->here = here; - ret->origin = origin; - -- xmlXPathRegisterFunc(ret, (xmlChar *)"range-to", -- xmlXPtrRangeToFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range", - xmlXPtrRangeFunction); - xmlXPathRegisterFunc(ret, (xmlChar *)"range-inside", -@@ -2243,76 +2241,14 @@ xmlXPtrRangeInsideFunction(xmlXPathParserContextPtr ctxt, int nargs) { - * @nargs: the number of args - * - * Implement the range-to() XPointer function -+ * -+ * Obsolete. range-to is not a real function but a special type of location -+ * step which is handled in xpath.c. - */ - void --xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, int nargs) { -- xmlXPathObjectPtr range; -- const xmlChar *cur; -- xmlXPathObjectPtr res, obj; -- xmlXPathObjectPtr tmp; -- xmlLocationSetPtr newset = NULL; -- xmlNodeSetPtr oldset; -- int i; -- -- if (ctxt == NULL) return; -- CHECK_ARITY(1); -- /* -- * Save the expression pointer since we will have to evaluate -- * it multiple times. Initialize the new set. -- */ -- CHECK_TYPE(XPATH_NODESET); -- obj = valuePop(ctxt); -- oldset = obj->nodesetval; -- ctxt->context->node = NULL; -- -- cur = ctxt->cur; -- newset = xmlXPtrLocationSetCreate(NULL); -- -- for (i = 0; i < oldset->nodeNr; i++) { -- ctxt->cur = cur; -- -- /* -- * Run the evaluation with a node list made of a single item -- * in the nodeset. -- */ -- ctxt->context->node = oldset->nodeTab[i]; -- tmp = xmlXPathNewNodeSet(ctxt->context->node); -- valuePush(ctxt, tmp); -- -- xmlXPathEvalExpr(ctxt); -- CHECK_ERROR; -- -- /* -- * The result of the evaluation need to be tested to -- * decided whether the filter succeeded or not -- */ -- res = valuePop(ctxt); -- range = xmlXPtrNewRangeNodeObject(oldset->nodeTab[i], res); -- if (range != NULL) { -- xmlXPtrLocationSetAdd(newset, range); -- } -- -- /* -- * Cleanup -- */ -- if (res != NULL) -- xmlXPathFreeObject(res); -- if (ctxt->value == tmp) { -- res = valuePop(ctxt); -- xmlXPathFreeObject(res); -- } -- -- ctxt->context->node = NULL; -- } -- -- /* -- * The result is used as the new evaluation set. -- */ -- xmlXPathFreeObject(obj); -- ctxt->context->node = NULL; -- ctxt->context->contextSize = -1; -- ctxt->context->proximityPosition = -1; -- valuePush(ctxt, xmlXPtrWrapLocationSet(newset)); -+xmlXPtrRangeToFunction(xmlXPathParserContextPtr ctxt, -+ int nargs ATTRIBUTE_UNUSED) { -+ XP_ERROR(XPATH_EXPR_ERROR); - } - - /** --- -2.10.2 - diff --git a/package.bak/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch b/package.bak/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch deleted file mode 100644 index 45c1a07ca4..0000000000 --- a/package.bak/libxml2/0002-Disallow-namespace-nodes-in-XPointer-ranges.patch +++ /dev/null @@ -1,253 +0,0 @@ -From c1d1f7121194036608bf555f08d3062a36fd344b Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Tue, 28 Jun 2016 18:34:52 +0200 -Subject: [PATCH] Disallow namespace nodes in XPointer ranges - -Namespace nodes must be copied to avoid use-after-free errors. -But they don't necessarily have a physical representation in a -document, so simply disallow them in XPointer ranges. - -Found with afl-fuzz. - -Fixes CVE-2016-4658. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit c1d1f712119403 - - xpointer.c | 149 +++++++++++++++++++++++-------------------------------------- - 1 file changed, 56 insertions(+), 93 deletions(-) - -diff --git a/xpointer.c b/xpointer.c -index a7b03fbdae16..694d120e2e0b 100644 ---- a/xpointer.c -+++ b/xpointer.c -@@ -320,6 +320,45 @@ xmlXPtrRangesEqual(xmlXPathObjectPtr range1, xmlXPathObjectPtr range2) { - } - - /** -+ * xmlXPtrNewRangeInternal: -+ * @start: the starting node -+ * @startindex: the start index -+ * @end: the ending point -+ * @endindex: the ending index -+ * -+ * Internal function to create a new xmlXPathObjectPtr of type range -+ * -+ * Returns the newly created object. -+ */ -+static xmlXPathObjectPtr -+xmlXPtrNewRangeInternal(xmlNodePtr start, int startindex, -+ xmlNodePtr end, int endindex) { -+ xmlXPathObjectPtr ret; -+ -+ /* -+ * Namespace nodes must be copied (see xmlXPathNodeSetDupNs). -+ * Disallow them for now. -+ */ -+ if ((start != NULL) && (start->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ if ((end != NULL) && (end->type == XML_NAMESPACE_DECL)) -+ return(NULL); -+ -+ ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -+ if (ret == NULL) { -+ xmlXPtrErrMemory("allocating range"); -+ return(NULL); -+ } -+ memset(ret, 0, sizeof(xmlXPathObject)); -+ ret->type = XPATH_RANGE; -+ ret->user = start; -+ ret->index = startindex; -+ ret->user2 = end; -+ ret->index2 = endindex; -+ return(ret); -+} -+ -+/** - * xmlXPtrNewRange: - * @start: the starting node - * @startindex: the start index -@@ -344,17 +383,7 @@ xmlXPtrNewRange(xmlNodePtr start, int startindex, - if (endindex < 0) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = startindex; -- ret->user2 = end; -- ret->index2 = endindex; -+ ret = xmlXPtrNewRangeInternal(start, startindex, end, endindex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -381,17 +410,8 @@ xmlXPtrNewRangePoints(xmlXPathObjectPtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end->user, -+ end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -416,17 +436,7 @@ xmlXPtrNewRangePointNode(xmlXPathObjectPtr start, xmlNodePtr end) { - if (start->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start->user; -- ret->index = start->index; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start->user, start->index, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -453,17 +463,7 @@ xmlXPtrNewRangeNodePoint(xmlNodePtr start, xmlXPathObjectPtr end) { - if (end->type != XPATH_POINT) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end->user; -- ret->index2 = end->index; -+ ret = xmlXPtrNewRangeInternal(start, -1, end->user, end->index); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -486,17 +486,7 @@ xmlXPtrNewRangeNodes(xmlNodePtr start, xmlNodePtr end) { - if (end == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = end; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, end, -1); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } -@@ -516,17 +506,7 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - if (start == NULL) - return(NULL); - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- ret->user2 = NULL; -- ret->index2 = -1; -+ ret = xmlXPtrNewRangeInternal(start, -1, NULL, -1); - return(ret); - } - -@@ -541,6 +521,8 @@ xmlXPtrNewCollapsedRange(xmlNodePtr start) { - */ - xmlXPathObjectPtr - xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { -+ xmlNodePtr endNode; -+ int endIndex; - xmlXPathObjectPtr ret; - - if (start == NULL) -@@ -549,7 +531,12 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - return(NULL); - switch (end->type) { - case XPATH_POINT: -+ endNode = end->user; -+ endIndex = end->index; -+ break; - case XPATH_RANGE: -+ endNode = end->user2; -+ endIndex = end->index2; - break; - case XPATH_NODESET: - /* -@@ -557,39 +544,15 @@ xmlXPtrNewRangeNodeObject(xmlNodePtr start, xmlXPathObjectPtr end) { - */ - if (end->nodesetval->nodeNr <= 0) - return(NULL); -+ endNode = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -+ endIndex = -1; - break; - default: - /* TODO */ - return(NULL); - } - -- ret = (xmlXPathObjectPtr) xmlMalloc(sizeof(xmlXPathObject)); -- if (ret == NULL) { -- xmlXPtrErrMemory("allocating range"); -- return(NULL); -- } -- memset(ret, 0 , (size_t) sizeof(xmlXPathObject)); -- ret->type = XPATH_RANGE; -- ret->user = start; -- ret->index = -1; -- switch (end->type) { -- case XPATH_POINT: -- ret->user2 = end->user; -- ret->index2 = end->index; -- break; -- case XPATH_RANGE: -- ret->user2 = end->user2; -- ret->index2 = end->index2; -- break; -- case XPATH_NODESET: { -- ret->user2 = end->nodesetval->nodeTab[end->nodesetval->nodeNr - 1]; -- ret->index2 = -1; -- break; -- } -- default: -- STRANGE -- return(NULL); -- } -+ ret = xmlXPtrNewRangeInternal(start, -1, endNode, endIndex); - xmlXPtrRangeCheckOrder(ret); - return(ret); - } --- -2.10.2 - diff --git a/package.bak/libxml2/Config.in b/package.bak/libxml2/Config.in deleted file mode 100644 index ebd63fe54c..0000000000 --- a/package.bak/libxml2/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBXML2 - bool "libxml2" - help - XML C Parser - - http://xmlsoft.org/ diff --git a/package.bak/libxml2/libxml2.hash b/package.bak/libxml2/libxml2.hash deleted file mode 100644 index 098121e117..0000000000 --- a/package.bak/libxml2/libxml2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c libxml2-2.9.4.tar.gz diff --git a/package.bak/libxml2/libxml2.mk b/package.bak/libxml2/libxml2.mk deleted file mode 100644 index 2a7153ad17..0000000000 --- a/package.bak/libxml2/libxml2.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# libxml2 -# -################################################################################ - -LIBXML2_VERSION = 2.9.4 -LIBXML2_SITE = ftp://xmlsoft.org/libxml2 -LIBXML2_INSTALL_STAGING = YES -LIBXML2_LICENSE = MIT -LIBXML2_LICENSE_FILES = COPYING -LIBXML2_CONFIG_SCRIPTS = xml2-config - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -LIBXML2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot" -endif - -LIBXML2_CONF_OPTS = --with-gnu-ld --without-python --without-debug - -HOST_LIBXML2_DEPENDENCIES = host-pkgconf -LIBXML2_DEPENDENCIES = host-pkgconf - -HOST_LIBXML2_CONF_OPTS = --without-zlib --without-lzma --without-python - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LIBXML2_DEPENDENCIES += zlib -LIBXML2_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr -else -LIBXML2_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -LIBXML2_DEPENDENCIES += xz -LIBXML2_CONF_OPTS += --with-lzma -else -LIBXML2_CONF_OPTS += --without-lzma -endif - -LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) -LIBXML2_CONF_OPTS += --with-iconv -else -LIBXML2_CONF_OPTS += --without-iconv -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# libxml2 for the host -LIBXML2_HOST_BINARY = $(HOST_DIR)/usr/bin/xmllint diff --git a/package.bak/libxmlpp/Config.in b/package.bak/libxmlpp/Config.in deleted file mode 100644 index 0f2da98f24..0000000000 --- a/package.bak/libxmlpp/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LIBXMLPP - bool "libxml++" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_GLIBMM - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # glibmm -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glibmm -> libglib2 - depends on BR2_USE_MMU # glibmm -> libglib2 - help - libxml++ is a C++ wrapper for the libxml XML parser library. - - http://libxmlplusplus.sourceforge.net/ - -comment "libxml++ needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - ||!BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU diff --git a/package.bak/libxmlpp/libxmlpp.hash b/package.bak/libxmlpp/libxmlpp.hash deleted file mode 100644 index 5fc7f5beb4..0000000000 --- a/package.bak/libxmlpp/libxmlpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-2.40.1.sha256sum -sha256 4ad4abdd3258874f61c2e2a41d08e9930677976d303653cd1670d3e9f35463e9 libxml++-2.40.1.tar.xz diff --git a/package.bak/libxmlpp/libxmlpp.mk b/package.bak/libxmlpp/libxmlpp.mk deleted file mode 100644 index d42819928a..0000000000 --- a/package.bak/libxmlpp/libxmlpp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# libxmlpp -# -################################################################################ - -LIBXMLPP_VERSION_MAJOR = 2.40 -LIBXMLPP_VERSION = $(LIBXMLPP_VERSION_MAJOR).1 -LIBXMLPP_LICENSE = LGPLv2.1 (library), LGPLv2+ (examples) -LIBXMLPP_LICENSE_FILES = COPYING -LIBXMLPP_SOURCE = libxml++-$(LIBXMLPP_VERSION).tar.xz -LIBXMLPP_SITE = http://ftp.gnome.org/pub/GNOME/sources/libxml++/$(LIBXMLPP_VERSION_MAJOR) -LIBXMLPP_INSTALL_STAGING = YES -LIBXMLPP_DEPENDENCIES = libxml2 glibmm host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/libxmlrpc/0001-fix-gennmtab-build.patch b/package.bak/libxmlrpc/0001-fix-gennmtab-build.patch deleted file mode 100644 index e98e5cbf58..0000000000 --- a/package.bak/libxmlrpc/0001-fix-gennmtab-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build of host tool - -genmtab is a tool that needs to be built for the host as it is used -during the compilation process of libxmlrpc. Its Makefile needs a bit -of tuning to use the conventional CC_FOR_BUILD, CFLAGS_FOR_BUILD and -LDFLAGS_FOR_BUILD variables. - -Signed-off-by: Thomas Petazzoni - -Index: b/lib/expat/gennmtab/Makefile -=================================================================== ---- a/lib/expat/gennmtab/Makefile -+++ b/lib/expat/gennmtab/Makefile -@@ -40,9 +40,9 @@ - dep: dep-common - - gennmtab.o:%.o:%.c -- $(BUILDTOOL_CC) -c $< -o $@ $(CFLAGS_ALL) $(INCLUDES) -+ $(CC_FOR_BUILD) -c $< -o $@ $(CFLAGS_FOR_BUILD) $(INCLUDES) - - gennmtab:%:%.o -- $(BUILDTOOL_CCLD) -o $@ $(LDFLAGS_ALL) $^ -+ $(CC_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $^ - - include depend.mk diff --git a/package.bak/libxmlrpc/0002-config.mk.in-fix-shared-libraries-build-for-uClibc.patch b/package.bak/libxmlrpc/0002-config.mk.in-fix-shared-libraries-build-for-uClibc.patch deleted file mode 100644 index 5970df51a9..0000000000 --- a/package.bak/libxmlrpc/0002-config.mk.in-fix-shared-libraries-build-for-uClibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5d68179a54b0a34d989722dcbe3b6eb962feb27d Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 23 Dec 2014 16:04:18 +0100 -Subject: [PATCH] config.mk.in: fix shared libraries build for uClibc - -Signed-off-by: Romain Naour ---- - config.mk.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/config.mk.in b/config.mk.in -index c5d4160..45461cf 100644 ---- a/config.mk.in -+++ b/config.mk.in -@@ -166,7 +166,8 @@ shliblefn = $(1:%=%.shlibledummy) - # HOST_OS is usually has a version number suffix, e.g. "aix5.3.0.0", so - # we compare based on prefix. - --ifeq ($(patsubst linux-gnu%,linux-gnu,$(HOST_OS)),linux-gnu) -+# linux-uclibc is also a linux -+ifeq ($(patsubst linux-%,linux-,$(HOST_OS)),linux-) - # Assume linker is GNU Compiler (gcc) - SHARED_LIB_TYPE = unix - MUST_BUILD_SHLIB = Y --- -1.9.3 - diff --git a/package.bak/libxmlrpc/0003-fix-ar-ranlib-handling.patch b/package.bak/libxmlrpc/0003-fix-ar-ranlib-handling.patch deleted file mode 100644 index 1e58d24780..0000000000 --- a/package.bak/libxmlrpc/0003-fix-ar-ranlib-handling.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix detection of AR and RANLIB - -The configure.in script assumes that ranlib and ar are necessarily -prefixed by ${ac_tool_prefix}, which is the value of --host. However, -it's not necessarily the case. - -So instead, use AC_CHECK_TOOL to check for AR, and AC_PROG_RANLIB to -check for RANLIB. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -621,10 +621,8 @@ - BUILDDIR=$(pwd) - AC_SUBST(BUILDDIR) - --AR=${ac_tool_prefix}ar --AC_SUBST([AR]) --RANLIB=${ac_tool_prefix}ranlib --AC_SUBST([RANLIB]) -+AC_CHECK_TOOL([AR], [ar]) -+AC_PROG_RANLIB - - dnl ======================================================================= - dnl Output our results. diff --git a/package.bak/libxmlrpc/0004-use-correct-curl-config.patch b/package.bak/libxmlrpc/0004-use-correct-curl-config.patch deleted file mode 100644 index f2f1c557ba..0000000000 --- a/package.bak/libxmlrpc/0004-use-correct-curl-config.patch +++ /dev/null @@ -1,70 +0,0 @@ -Use correct curl-config program - -Instead of calling directly curl-config in src/Makefile (which ends up -calling the wrong curl-config: the one in the PATH instead of the one -pointed at by the environment variables at configure time), let's -define a CURL_CONFIG variable that contains the path to the proper -curl-config program, and use it where appropriate. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -57,7 +57,7 @@ - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/xmlrpc_curl_transport - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curltransaction - TRANSPORT_MODS += $(BLDDIR)/lib/curl_transport/curlmulti -- TRANSPORT_LIBDEP += $(shell curl-config --libs) -+ TRANSPORT_LIBDEP += $(shell $CURL_CONFIG --libs) - TRANSPORT_INCLUDES += -Isrcdir/lib/curl_transport - endif - ifeq ($(MUST_BUILD_LIBWWW_CLIENT),yes) -Index: b/config.mk.in -=================================================================== ---- a/config.mk.in -+++ b/config.mk.in -@@ -32,6 +32,7 @@ - LSOCKET = @LSOCKET@ - WININET_LDADD = @WININET_LDADD@ - WININET_LIBDIR = @WININET_LIBDIR@ -+CURL_CONFIG = @CURL_CONFIG@ - CURL_LDADD = @CURL_LDADD@ - CURL_LIBDIR = @CURL_LIBDIR@ - LIBWWW_LDADD = @LIBWWW_LDADD@ -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -550,6 +550,8 @@ - dnl So we don't do any check now. If we find out there's a problem with - dnl older Curls, we will revisit that. - -+ AC_SUBST(CURL_CONFIG) -+ - CURL_LDADD=$($CURL_CONFIG --libs) - AC_SUBST(CURL_LDADD) - -Index: b/lib/curl_transport/Makefile -=================================================================== ---- a/lib/curl_transport/Makefile -+++ b/lib/curl_transport/Makefile -@@ -29,7 +29,7 @@ - - $(SRCDIR)/common.mk: srcdir blddir - --CURL_VERSION := $(shell curl-config --vernum) -+CURL_VERSION := $(shell $(CURL_CONFIG) --vernum) - - # Some time at or before Curl 7.12, became an empty file - # (no-op). Some time after Curl 7.18, ceased to exist. -@@ -43,7 +43,7 @@ - CFLAGS_LOCAL += -DNEED_CURL_TYPES_H - endif - --CURL_INCLUDES := $(shell curl-config --cflags) -+CURL_INCLUDES := $(shell $(CURL_CONFIG) --cflags) - # We expect that curl-config --cflags just gives us -I options, because - # we need just the -I options for 'make dep'. Plus, it's scary to think - # of what any other compiler flag would do to our compile. diff --git a/package.bak/libxmlrpc/Config.in b/package.bak/libxmlrpc/Config.in deleted file mode 100644 index d24a79163d..0000000000 --- a/package.bak/libxmlrpc/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LIBXMLRPC - bool "libxmlrpc" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBCURL - help - XML-RPC is a quick-and-easy way to make procedure calls over - the Internet. It converts the procedure call into an XML - document, sends it to a remote server using HTTP, and gets - back the response as XML. - - http://xmlrpc-c.sourceforge.net/ - -comment "libxmlrpc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/libxmlrpc/libxmlrpc.hash b/package.bak/libxmlrpc/libxmlrpc.hash deleted file mode 100644 index 3003622ac8..0000000000 --- a/package.bak/libxmlrpc/libxmlrpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d830f3264a832dfe09f629cc64036acfd08121692526d0fabe090f7ff881ce08 xmlrpc-c-1.39.12.tgz diff --git a/package.bak/libxmlrpc/libxmlrpc.mk b/package.bak/libxmlrpc/libxmlrpc.mk deleted file mode 100644 index 738ae9a811..0000000000 --- a/package.bak/libxmlrpc/libxmlrpc.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# libxmlrpc -# -################################################################################ - -LIBXMLRPC_VERSION = 1.39.12 -LIBXMLRPC_SOURCE = xmlrpc-c-$(LIBXMLRPC_VERSION).tgz -LIBXMLRPC_SITE = http://downloads.sourceforge.net/project/xmlrpc-c/Xmlrpc-c%20Super%20Stable/$(LIBXMLRPC_VERSION) -LIBXMLRPC_LICENSE = BSD-3c (xml-rpc main code and abyss web server), BSD like (lib/expat), Python 1.5.2 license (parts of xmlrpc_base64.c) -LIBXMLRPC_LICENSE_FILES = doc/COPYING -LIBXMLRPC_INSTALL_STAGING = YES -LIBXMLRPC_DEPENDENCIES = libcurl host-autoconf -LIBXMLRPC_CONFIG_SCRIPTS = xmlrpc-c-config -LIBXMLRPC_MAKE = $(MAKE1) - -# Using autoconf, not automake, so we cannot use AUTORECONF = YES. -define LIBXMLRPC_RUN_AUTOCONF - cd $(@D); $(HOST_DIR)/usr/bin/autoconf -endef - -LIBXMLRPC_PRE_CONFIGURE_HOOKS += LIBXMLRPC_RUN_AUTOCONF - -LIBXMLRPC_CONF_OPTS = \ - $(if $(BR2_USE_WCHAR),,ac_cv_header_wchar_h=no) \ - $(if $(BR2_INSTALL_LIBSTDCPP),,--disable-cplusplus) \ - have_curl_config=$(STAGING_DIR)/usr/bin/curl-config \ - CURL_CONFIG=$(STAGING_DIR)/usr/bin/curl-config - -# Our package uses autoconf, but not automake, so we need to pass -# those variables at compile time as well. -LIBXMLRPC_MAKE_ENV = \ - CC_FOR_BUILD="$(HOSTCC)" \ - LD_FOR_BUILD="$(HOSTLD)" \ - CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ - LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" - -ifeq ($(BR2_STATIC_LIBS),y) -LIBXMLRPC_STATIC_OPTS = SHARED_LIB_TYPE=NONE MUST_BUILD_SHLIB=N -endif - -LIBXMLRPC_MAKE_OPTS = $(LIBXMLRPC_STATIC_OPTS) -LIBXMLRPC_INSTALL_STAGING_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ - DESTDIR=$(STAGING_DIR) install -LIBXMLRPC_INSTALL_TARGET_OPTS = $(LIBXMLRPC_STATIC_OPTS) \ - DESTDIR=$(TARGET_DIR) install - -$(eval $(autotools-package)) diff --git a/package.bak/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch b/package.bak/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch deleted file mode 100644 index 1ad494a6c0..0000000000 --- a/package.bak/libxslt/0001-Fix-heap-overread-in-xsltFormatNumberConversion.patch +++ /dev/null @@ -1,35 +0,0 @@ -From eb1030de31165b68487f288308f9d1810fed6880 Mon Sep 17 00:00:00 2001 -From: Nick Wellnhofer -Date: Fri, 10 Jun 2016 14:23:58 +0200 -Subject: [PATCH] Fix heap overread in xsltFormatNumberConversion - -An empty decimal-separator could cause a heap overread. This can be -exploited to leak a couple of bytes after the buffer that holds the -pattern string. - -Found with afl-fuzz and ASan. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit eb1030de311 - - libxslt/numbers.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libxslt/numbers.c b/libxslt/numbers.c -index d1549b46ca26..e78c46b6357b 100644 ---- a/libxslt/numbers.c -+++ b/libxslt/numbers.c -@@ -1090,7 +1090,8 @@ xsltFormatNumberConversion(xsltDecimalFormatPtr self, - } - - /* We have finished the integer part, now work on fraction */ -- if (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) { -+ if ( (*the_format != 0) && -+ (xsltUTF8Charcmp(the_format, self->decimalPoint) == 0) ) { - format_info.add_decimal = TRUE; - the_format += xsltUTF8Size(the_format); /* Skip over the decimal */ - } --- -2.10.2 - diff --git a/package.bak/libxslt/Config.in b/package.bak/libxslt/Config.in deleted file mode 100644 index dfe5b99f04..0000000000 --- a/package.bak/libxslt/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LIBXSLT - bool "libxslt" - select BR2_PACKAGE_LIBXML2 - help - Install the xslt library which is used - to transform XML files to other XML files. - - XSLT is designed for use as part of XSL, - which is a stylesheet language for XML. - In addition to XSLT, XSL includes an XML vocabulary - for specifying formatting. - XSL specifies the styling of an XML document by using XSLT - to describe how the document is transformed into another - XML document that uses the formatting vocabulary. - - http://xmlsoft.org/xslt/ diff --git a/package.bak/libxslt/libxslt.hash b/package.bak/libxslt/libxslt.hash deleted file mode 100644 index 8222bc590d..0000000000 --- a/package.bak/libxslt/libxslt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce libxslt-1.1.29.tar.gz diff --git a/package.bak/libxslt/libxslt.mk b/package.bak/libxslt/libxslt.mk deleted file mode 100644 index d89dde8d00..0000000000 --- a/package.bak/libxslt/libxslt.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# libxslt -# -################################################################################ - -LIBXSLT_VERSION = 1.1.29 -LIBXSLT_SITE = ftp://xmlsoft.org/libxslt -LIBXSLT_INSTALL_STAGING = YES -LIBXSLT_LICENSE = MIT -LIBXSLT_LICENSE_FILES = COPYING - -LIBXSLT_CONF_OPTS = \ - --with-gnu-ld \ - --without-debug \ - --without-python \ - --with-libxml-prefix=$(STAGING_DIR)/usr/ \ - --with-libxml-libs-prefix=$(STAGING_DIR)/usr/lib -LIBXSLT_CONFIG_SCRIPTS = xslt-config -LIBXSLT_DEPENDENCIES = libxml2 - -# GCC bug with Os/O2/O3, PR77311 -# error: unable to find a register to spill in class 'CCREGS' -ifeq ($(BR2_bfin),y) -LIBXSLT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O1" -endif - -# If we have enabled libgcrypt then use it, else disable crypto support. -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -LIBXSLT_DEPENDENCIES += libgcrypt -LIBXSLT_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -else -LIBXSLT_CONF_OPTS += --without-crypto -endif - -HOST_LIBXSLT_CONF_OPTS = --without-debug --without-python --without-crypto - -HOST_LIBXSLT_DEPENDENCIES = host-libxml2 - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/libyaml/0001-fix-CVE-2014-9130.patch b/package.bak/libyaml/0001-fix-CVE-2014-9130.patch deleted file mode 100644 index a267e4084c..0000000000 --- a/package.bak/libyaml/0001-fix-CVE-2014-9130.patch +++ /dev/null @@ -1,33 +0,0 @@ -From e6aa721cc0e5a48f408c52355559fd36780ba32a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ingy=20d=C3=B6t=20Net?= -Date: Fri, 28 Nov 2014 09:21:49 -0800 -Subject: [PATCH] Fix for https://bitbucket.org/xi/libyaml/issue/10/ - -https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure - -Commenting out the assert makes the scanner do the right thing and -results in just a simple parse failure. - -Signed-off-by: Gustavo Zacarias ---- - src/scanner.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/scanner.c b/src/scanner.c -index 88d4fa5..c5f3d2f 100644 ---- a/src/scanner.c -+++ b/src/scanner.c -@@ -1110,7 +1110,9 @@ yaml_parser_save_simple_key(yaml_parser_t *parser) - * line. Therefore it is always allowed. But we add a check anyway. - */ - -- assert(parser->simple_key_allowed || !required); /* Impossible. */ -+ /* XXX This caused: -+ * https://bitbucket.org/xi/libyaml/issue/10/wrapped-strings-cause-assert-failure -+ assert(parser->simple_key_allowed || !required); */ /* Impossible. */ - - /* - * If the current position may start a simple key, save it. --- -2.0.4 - diff --git a/package.bak/libyaml/Config.in b/package.bak/libyaml/Config.in deleted file mode 100644 index 00a48b2016..0000000000 --- a/package.bak/libyaml/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LIBYAML - bool "libyaml" - help - LibYAML is a YAML 1.1 parser and emitter written in C. - - http://pyyaml.org/wiki/LibYAML diff --git a/package.bak/libyaml/libyaml.hash b/package.bak/libyaml/libyaml.hash deleted file mode 100644 index fd039fa6e4..0000000000 --- a/package.bak/libyaml/libyaml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7da6971b4bd08a986dd2a61353bc422362bd0edcc67d7ebaac68c95f74182749 yaml-0.1.6.tar.gz diff --git a/package.bak/libyaml/libyaml.mk b/package.bak/libyaml/libyaml.mk deleted file mode 100644 index 52d475066e..0000000000 --- a/package.bak/libyaml/libyaml.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# libyaml -# -################################################################################ - -LIBYAML_VERSION = 0.1.6 -LIBYAML_SOURCE = yaml-$(LIBYAML_VERSION).tar.gz -LIBYAML_SITE = http://pyyaml.org/download/libyaml -LIBYAML_INSTALL_STAGING = YES -LIBYAML_LICENSE = MIT -LIBYAML_LICENSE_FILES = LICENSE - -$(eval $(autotools-package)) diff --git a/package.bak/libyuv/0001-i386-sse2.patch b/package.bak/libyuv/0001-i386-sse2.patch deleted file mode 100644 index b8ecb34d0f..0000000000 --- a/package.bak/libyuv/0001-i386-sse2.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix compilation on non-sse2 platforms - -Signed-off-by: Bernd Kuhls - -diff -uNr libyuv-1411.org/include/libyuv/scale_row.h libyuv-1411/include/libyuv/scale_row.h ---- libyuv-1411.org/include/libyuv/scale_row.h 2015-05-22 23:39:21.000000000 +0200 -+++ libyuv-1411/include/libyuv/scale_row.h 2015-05-25 12:35:17.000000000 +0200 -@@ -33,7 +33,7 @@ - - // The following are available on all x86 platforms: - #if !defined(LIBYUV_DISABLE_X86) && \ -- (defined(_M_IX86) || defined(__x86_64__) || defined(__i386__)) -+ (defined(_M_IX86) || defined(__x86_64__) || (defined(__i386__) && defined(__SSE2__))) - #define HAS_FIXEDDIV1_X86 - #define HAS_FIXEDDIV_X86 - #define HAS_SCALEADDROWS_SSE2 diff --git a/package.bak/libyuv/0002-aarch64.patch b/package.bak/libyuv/0002-aarch64.patch deleted file mode 100644 index c783cffe88..0000000000 --- a/package.bak/libyuv/0002-aarch64.patch +++ /dev/null @@ -1,36 +0,0 @@ -Add missing source files for aarch64. - -Signed-off-by: Bernd Kuhls - -diff -uNr libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.org/CMakeLists.txt libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea/CMakeLists.txt ---- libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea.org/CMakeLists.txt 2015-06-20 00:04:06.000000000 +0200 -+++ libyuv-1ebf86795cb213a37f06eb1ef3713cff080568ea/CMakeLists.txt 2015-09-07 19:29:42.898034988 +0200 -@@ -14,6 +14,7 @@ - ${ly_src_dir}/compare.cc - ${ly_src_dir}/compare_common.cc - ${ly_src_dir}/compare_neon.cc -+ ${ly_src_dir}/compare_neon64.cc - ${ly_src_dir}/compare_gcc.cc - ${ly_src_dir}/compare_win.cc - ${ly_src_dir}/convert.cc -@@ -31,10 +32,12 @@ - ${ly_src_dir}/rotate_argb.cc - ${ly_src_dir}/rotate_mips.cc - ${ly_src_dir}/rotate_neon.cc -+ ${ly_src_dir}/rotate_neon64.cc - ${ly_src_dir}/row_any.cc - ${ly_src_dir}/row_common.cc - ${ly_src_dir}/row_mips.cc - ${ly_src_dir}/row_neon.cc -+ ${ly_src_dir}/row_neon64.cc - ${ly_src_dir}/row_gcc.cc - ${ly_src_dir}/row_win.cc - ${ly_src_dir}/scale.cc -@@ -43,6 +46,7 @@ - ${ly_src_dir}/scale_common.cc - ${ly_src_dir}/scale_mips.cc - ${ly_src_dir}/scale_neon.cc -+ ${ly_src_dir}/scale_neon64.cc - ${ly_src_dir}/scale_gcc.cc - ${ly_src_dir}/scale_win.cc - ${ly_src_dir}/video_common.cc diff --git a/package.bak/libyuv/Config.in b/package.bak/libyuv/Config.in deleted file mode 100644 index 29dcaa44ed..0000000000 --- a/package.bak/libyuv/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBYUV - bool "libyuv" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - libyuv is an open source project that includes YUV scaling - and conversion functionality. - - https://code.google.com/p/libyuv - -comment "libyuv needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS diff --git a/package.bak/libyuv/libyuv.mk b/package.bak/libyuv/libyuv.mk deleted file mode 100644 index c00bc05c0a..0000000000 --- a/package.bak/libyuv/libyuv.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# libyuv -# -################################################################################ - -LIBYUV_VERSION = 1ebf86795cb213a37f06eb1ef3713cff080568ea -# we use the FreeSwitch fork because there is currently no alternative -# for https://chromium.googlesource.com/libyuv/libyuv which will be -# deactivated in 2015. -LIBYUV_SITE = https://freeswitch.org/stash/scm/sd/libyuv.git -LIBYUV_SITE_METHOD = git -LIBYUV_LICENSE = BSD-3c -LIBYUV_LICENSE_FILES = LICENSE -LIBYUV_INSTALL_STAGING = YES -LIBYUV_DEPENDENCIES = $(if $(BR2_PACKAGE_JPEG),jpeg) - -$(eval $(cmake-package)) diff --git a/package.bak/libzip/Config.in b/package.bak/libzip/Config.in deleted file mode 100644 index 54de9e5af2..0000000000 --- a/package.bak/libzip/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LIBZIP - bool "libzip" - select BR2_PACKAGE_ZLIB - help - C library for reading, creating, and modifying zip archives. This - package also contains zipcmp, ziptorrent and zipmerge utilities. - - http://www.nih.at/libzip/ diff --git a/package.bak/libzip/libzip.hash b/package.bak/libzip/libzip.hash deleted file mode 100644 index ccd0e6adf9..0000000000 --- a/package.bak/libzip/libzip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7cfbbc2c540e154b933b6e9ec781e2671086bd8114eb744ae1a1ade34d2bb6bb libzip-0.11.2.tar.xz diff --git a/package.bak/libzip/libzip.mk b/package.bak/libzip/libzip.mk deleted file mode 100644 index a419db7ec5..0000000000 --- a/package.bak/libzip/libzip.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# libzip -# -################################################################################ - -LIBZIP_VERSION = 0.11.2 -LIBZIP_SITE = http://www.nih.at/libzip -LIBZIP_SOURCE = libzip-$(LIBZIP_VERSION).tar.xz -LIBZIP_LICENSE = BSD-3c -LIBZIP_LICENSE_FILES = LICENSE -LIBZIP_INSTALL_STAGING = YES -LIBZIP_DEPENDENCIES = zlib - -$(eval $(autotools-package)) diff --git a/package.bak/lightning/Config.in b/package.bak/lightning/Config.in deleted file mode 100644 index d85c964e18..0000000000 --- a/package.bak/lightning/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -comment "lightning needs a toolchain w/ dynamic library" - depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_LIGHTNING - bool "lightning" - depends on BR2_sparc || BR2_i386 || BR2_x86_64 || BR2_mips || \ - BR2_mipsel || BR2_arm || BR2_powerpc - depends on !BR2_STATIC_LIBS - help - GNU lightning is a library that generates - assembly language code at run-time. - - https://www.gnu.org/software/lightning/ - -if BR2_PACKAGE_LIGHTNING - -config BR2_PACKAGE_LIGHTNING_DISASSEMBLER - bool "enable disassembler" - select BR2_PACKAGE_BINUTILS - select BR2_PACKAGE_ZLIB - depends on !BR2_nios2 # binutils - depends on BR2_USE_WCHAR # binutils - help - Enable the GNU lightning disassembler. - -comment "lightning disassembler needs a toolchain w/ wchar" - depends on !BR2_nios2 - depends on !BR2_USE_WCHAR - -endif diff --git a/package.bak/lightning/lightning.hash b/package.bak/lightning/lightning.hash deleted file mode 100644 index 4805686e98..0000000000 --- a/package.bak/lightning/lightning.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 1fa3a2421852598b3162d6765645bb3cd0fccb5f0c105d0800c64c8428b749a6 lightning-2.1.0.tar.gz diff --git a/package.bak/lightning/lightning.mk b/package.bak/lightning/lightning.mk deleted file mode 100644 index 052e593be3..0000000000 --- a/package.bak/lightning/lightning.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# lightning -# -################################################################################ - -LIGHTNING_VERSION = 2.1.0 -LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning -LIGHTNING_LICENSE = LGPLv3+ -LIGHTNING_LICENSE_FILES = COPYING.LESSER -LIGHTNING_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_LIGHTNING_DISASSEMBLER),y) -LIGHTNING_DEPENDENCIES += binutils zlib -LIGHTNING_CONF_OPTS += --enable-disassembler -# binutils libraries are not explicitly linked against gettext -LIGHTNING_CONF_ENV += $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),LIBS=-lintl) -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lighttpd/0001-Fix-default-config-file.patch b/package.bak/lighttpd/0001-Fix-default-config-file.patch deleted file mode 100644 index ada1589760..0000000000 --- a/package.bak/lighttpd/0001-Fix-default-config-file.patch +++ /dev/null @@ -1,100 +0,0 @@ -Modify the default lighttpd configuration file to have one a starting conf - - * Changed the log path to /var/log and logs filenames - * Disable IPv6 - * Do not setuid to a user that doesn't exist on the system - * Disable pdf ranges fix for Adobe Reader since it uses regex and we - don't always have pcre support - * Change the network backend to writev since linux-sendfile fails on buildroot - -Signed-off-by: Maxime Ripard -Signed-off-by: Simon Dawson -[Gustavo: update for 1.4.37] -Signed-off-by: Gustavo Zacarias - -diff -Nura lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf lighttpd-1.4.37/doc/config/conf.d/access_log.conf ---- lighttpd-1.4.37.orig/doc/config/conf.d/access_log.conf 2015-09-01 14:38:48.684673663 -0300 -+++ lighttpd-1.4.37/doc/config/conf.d/access_log.conf 2015-09-01 14:38:53.975855142 -0300 -@@ -9,7 +9,7 @@ - ## - ## Default access log. - ## --accesslog.filename = log_root + "/access.log" -+accesslog.filename = log_root + "/lighttpd-access.log" - - ## - ## The default format produces CLF compatible output. -diff -Nura lighttpd-1.4.37.orig/doc/config/lighttpd.conf lighttpd-1.4.37/doc/config/lighttpd.conf ---- lighttpd-1.4.37.orig/doc/config/lighttpd.conf 2015-09-01 14:38:48.684673663 -0300 -+++ lighttpd-1.4.37/doc/config/lighttpd.conf 2015-09-01 14:39:40.256442492 -0300 -@@ -13,8 +13,8 @@ - ## if you add a variable here. Add the corresponding variable in the - ## chroot example aswell. - ## --var.log_root = "/var/log/lighttpd" --var.server_root = "/srv/www" -+var.log_root = "/var/log" -+var.server_root = "/var/www" - var.state_dir = "/var/run" - var.home_dir = "/var/lib/lighttpd" - var.conf_dir = "/etc/lighttpd" -@@ -90,7 +90,7 @@ - ## - ## Use IPv6? - ## --server.use-ipv6 = "enable" -+# server.use-ipv6 = "enable" - - ## - ## bind to a specific IP -@@ -101,8 +101,8 @@ - ## Run as a different username/groupname. - ## This requires root permissions during startup. - ## --server.username = "lighttpd" --server.groupname = "lighttpd" -+server.username = "www-data" -+server.groupname = "www-data" - - ## - ## enable core files. -@@ -112,7 +112,7 @@ - ## - ## Document root - ## --server.document-root = server_root + "/htdocs" -+server.document-root = server_root - - ## - ## The value for the "Server:" response field. -@@ -138,7 +138,7 @@ - ## - ## Path to the error log file - ## --server.errorlog = log_root + "/error.log" -+server.errorlog = log_root + "/lighttpd-error.log" - - ## - ## If you want to log to syslog you have to unset the -@@ -188,7 +188,7 @@ - ## sendfile - is recommended for small files. - ## writev - is recommended for sending many large files - ## --server.network-backend = "sendfile" -+server.network-backend = "writev" - - ## - ## As lighttpd is a single-threaded server, its main resource limit is -@@ -311,9 +311,9 @@ - ## disable range requests for pdf files - ## workaround for a bug in the Acrobat Reader plugin. - ## --$HTTP["url"] =~ "\.pdf$" { -- server.range-requests = "disable" --} -+# $HTTP["url"] =~ "\.pdf$" { -+# server.range-requests = "disable" -+# } - - ## - ## url handling modules (rewrite, redirect) diff --git a/package.bak/lighttpd/Config.in b/package.bak/lighttpd/Config.in deleted file mode 100644 index f62ccb9c05..0000000000 --- a/package.bak/lighttpd/Config.in +++ /dev/null @@ -1,59 +0,0 @@ -comment "lighttpd needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_LIGHTTPD - bool "lighttpd" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - help - lighttpd a secure, fast, compliant and very flexible web-server - which has been optimized for high-performance environments. It - has a very low memory footprint compared to other webservers and - takes care of cpu-load. Its advanced feature-set (FastCGI, CGI, - Auth, Output-Compression, URL-Rewriting and many more) make - lighttpd the perfect webserver-software for every server that - is suffering load problems. - - http://www.lighttpd.net/ - -if BR2_PACKAGE_LIGHTTPD - -config BR2_PACKAGE_LIGHTTPD_OPENSSL - bool "openssl support" - select BR2_PACKAGE_OPENSSL - help - Enable OpenSSL support for lighttpd. - -config BR2_PACKAGE_LIGHTTPD_ZLIB - bool "zlib support" - select BR2_PACKAGE_ZLIB - help - Enable zlib support for lighttpd mod_compress. - -config BR2_PACKAGE_LIGHTTPD_BZIP2 - bool "bzip2 support" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 support for lighttpd mod_compress. - -config BR2_PACKAGE_LIGHTTPD_PCRE - bool "pcre support" - select BR2_PACKAGE_PCRE - help - Enable PCRE support. Needed to support mod_rewrite - -config BR2_PACKAGE_LIGHTTPD_WEBDAV - bool "webdav support" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_SQLITE - help - Enable webdav support. Needed to support mod_webdav - -config BR2_PACKAGE_LIGHTTPD_LUA - bool "lua support" - depends on BR2_PACKAGE_LUA - help - Enable Lua support. Needed to support mod_magnet - -endif diff --git a/package.bak/lighttpd/S50lighttpd b/package.bak/lighttpd/S50lighttpd deleted file mode 100644 index 44ac257c18..0000000000 --- a/package.bak/lighttpd/S50lighttpd +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh -# -# Starts lighttpd. -# - -start() { - printf "Starting lighttpd: " - start-stop-daemon -S -q -p /var/run/lighttpd.pid --exec /usr/sbin/lighttpd -- -f /etc/lighttpd/lighttpd.conf - echo "OK" -} -stop() { - printf "Stopping lighttpd: " - start-stop-daemon -K -q -p /var/run/lighttpd.pid - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/lighttpd/lighttpd.hash b/package.bak/lighttpd/lighttpd.hash deleted file mode 100644 index 36783ff18b..0000000000 --- a/package.bak/lighttpd/lighttpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.lighttpd.net/ -sha256 1c97225deea33eefba6d4158c2cef27913d47553263516bbe9d2e2760fc43a3f lighttpd-1.4.45.tar.xz diff --git a/package.bak/lighttpd/lighttpd.mk b/package.bak/lighttpd/lighttpd.mk deleted file mode 100644 index b3127ef268..0000000000 --- a/package.bak/lighttpd/lighttpd.mk +++ /dev/null @@ -1,101 +0,0 @@ -################################################################################ -# -# lighttpd -# -################################################################################ - -LIGHTTPD_VERSION_MAJOR = 1.4 -LIGHTTPD_VERSION = $(LIGHTTPD_VERSION_MAJOR).45 -LIGHTTPD_SOURCE = lighttpd-$(LIGHTTPD_VERSION).tar.xz -LIGHTTPD_SITE = http://download.lighttpd.net/lighttpd/releases-$(LIGHTTPD_VERSION_MAJOR).x -LIGHTTPD_LICENSE = BSD-3c -LIGHTTPD_LICENSE_FILES = COPYING -LIGHTTPD_DEPENDENCIES = host-pkgconf -LIGHTTPD_CONF_OPTS = \ - --libdir=/usr/lib/lighttpd \ - --libexecdir=/usr/lib - -ifeq ($(BR2_PACKAGE_LIGHTTPD_OPENSSL),y) -LIGHTTPD_DEPENDENCIES += openssl -LIGHTTPD_CONF_OPTS += --with-openssl -else -LIGHTTPD_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_ZLIB),y) -LIGHTTPD_DEPENDENCIES += zlib -LIGHTTPD_CONF_OPTS += --with-zlib -else -LIGHTTPD_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_BZIP2),y) -LIGHTTPD_DEPENDENCIES += bzip2 -LIGHTTPD_CONF_OPTS += --with-bzip2 -else -LIGHTTPD_CONF_OPTS += --without-bzip2 -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_PCRE),y) -LIGHTTPD_CONF_ENV = PCRECONFIG=$(STAGING_DIR)/usr/bin/pcre-config -LIGHTTPD_DEPENDENCIES += pcre -LIGHTTPD_CONF_OPTS += --with-pcre -else -LIGHTTPD_CONF_OPTS += --without-pcre -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_WEBDAV),y) -LIGHTTPD_DEPENDENCIES += libxml2 sqlite -LIGHTTPD_CONF_OPTS += --with-webdav-props -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -LIGHTTPD_CONF_OPTS += --with-webdav-locks -LIGHTTPD_DEPENDENCIES += util-linux -else -LIGHTTPD_CONF_OPTS += --without-webdav-locks -endif -else -LIGHTTPD_CONF_OPTS += --without-webdav-props --without-webdav-locks -endif - -ifeq ($(BR2_PACKAGE_LIGHTTPD_LUA),y) -LIGHTTPD_DEPENDENCIES += lua -LIGHTTPD_CONF_OPTS += --with-lua -else -LIGHTTPD_CONF_OPTS += --without-lua -endif - -define LIGHTTPD_INSTALL_CONFIG - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/lighttpd/conf.d - $(INSTALL) -d -m 0755 $(TARGET_DIR)/var/www - $(INSTALL) -D -m 0644 $(@D)/doc/config/lighttpd.conf \ - $(TARGET_DIR)/etc/lighttpd/lighttpd.conf - $(INSTALL) -D -m 0644 $(@D)/doc/config/modules.conf \ - $(TARGET_DIR)/etc/lighttpd/modules.conf - $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/access_log.conf \ - $(TARGET_DIR)/etc/lighttpd/conf.d/access_log.conf - $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/debug.conf \ - $(TARGET_DIR)/etc/lighttpd/conf.d/debug.conf - $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/dirlisting.conf \ - $(TARGET_DIR)/etc/lighttpd/conf.d/dirlisting.conf - $(INSTALL) -D -m 0644 $(@D)/doc/config/conf.d/mime.conf \ - $(TARGET_DIR)/etc/lighttpd/conf.d/mime.conf -endef - -LIGHTTPD_POST_INSTALL_TARGET_HOOKS += LIGHTTPD_INSTALL_CONFIG - -define LIGHTTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/lighttpd/S50lighttpd \ - $(TARGET_DIR)/etc/init.d/S50lighttpd -endef - -define LIGHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/doc/systemd/lighttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/lighttpd.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/lighttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/lighttpd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/linenoise/Config.in b/package.bak/linenoise/Config.in deleted file mode 100644 index 8e4ab91da5..0000000000 --- a/package.bak/linenoise/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LINENOISE - bool "linenoise" - help - A small self-contained alternative to readline and libedit - - https://github.com/antirez/linenoise diff --git a/package.bak/linenoise/linenoise.hash b/package.bak/linenoise/linenoise.hash deleted file mode 100644 index 7837bc68f4..0000000000 --- a/package.bak/linenoise/linenoise.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f5054a4fe120d43d85427cf58af93e56b9bb80389d507a9bec9b75531a340014 linenoise-1.0.tar.gz diff --git a/package.bak/linenoise/linenoise.mk b/package.bak/linenoise/linenoise.mk deleted file mode 100644 index 64a7b7c8dc..0000000000 --- a/package.bak/linenoise/linenoise.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# linenoise -# -################################################################################ - -LINENOISE_VERSION = 1.0 -LINENOISE_SITE = $(call github,antirez,linenoise,$(LINENOISE_VERSION)) -LINENOISE_LICENSE = BSD-2c -LINENOISE_LICENSE_FILES = LICENSE -LINENOISE_INSTALL_STAGING = YES -# Static library only, nothing to install on target -LINENOISE_INSTALL_TARGET = NO - -define LINENOISE_BUILD_CMDS - cd $(@D); $(TARGET_CC) $(TARGET_CFLAGS) -c linenoise.c - cd $(@D); $(TARGET_AR) rcu liblinenoise.a linenoise.o - cd $(@D); $(TARGET_CC) $(TARGET_LDFLAGS) -o linenoise_example example.c -L. -llinenoise -endef - -define LINENOISE_INSTALL_STAGING_CMDS - $(INSTALL) -m 644 -D $(@D)/linenoise.h $(STAGING_DIR)/usr/include/linenoise.h - $(INSTALL) -m 644 -D $(@D)/liblinenoise.a $(STAGING_DIR)/usr/lib/liblinenoise.a - $(INSTALL) -m 755 -D $(@D)/linenoise_example $(STAGING_DIR)/usr/bin/linenoise_example -endef - -$(eval $(generic-package)) diff --git a/package.bak/linknx/0001-fix-static-build-with-mysql.patch b/package.bak/linknx/0001-fix-static-build-with-mysql.patch deleted file mode 100644 index c26bef77be..0000000000 --- a/package.bak/linknx/0001-fix-static-build-with-mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix static build with mysql - -When building static binaries, the order of libraries in the link command line -is significant. Use $LIBS for mysql libraries, so that mysql appear after the -object files that depends on it. This fixes build failures like the following. - -/home/buildroot/build/instance-1/output/host/usr/bin/arm-linux-g++ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -static -I/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/mysql -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -static -DUNIV_LINUX -DUNIV_LINUX -static -static -rdynamic -L/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lmysqlclient_r -lz -lpthread -lcrypt -lnsl -lm -lpthread -o linknx linknx.o logger.o ruleserver.o objectcontroller.o eibclient.o threads.o timermanager.o persistentstorage.o xmlserver.o smsgateway.o emailgateway.o knxconnection.o services.o suncalc.o luacondition.o ioport.o ../ticpp/libticpp.a -L/home/buildroot/build/instance-1/output/host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lpthsem -lm -largp -persistentstorage.o: In function `MysqlPersistentStorage::~MysqlPersistentStorage()': -persistentstorage.cpp:(.text+0x2c): undefined reference to `mysql_close' -persistentstorage.o: In function `MysqlPersistentStorage::MysqlPersistentStorage(ticpp::Element*)': -persistentstorage.cpp:(.text+0x518): undefined reference to `mysql_init' -persistentstorage.cpp:(.text+0x570): undefined reference to `mysql_options' -persistentstorage.cpp:(.text+0x5a8): undefined reference to `mysql_real_connect' -persistentstorage.cpp:(.text+0x5c0): undefined reference to `mysql_options' -persistentstorage.cpp:(.text+0x618): undefined reference to `mysql_error' -persistentstorage.cpp:(.text+0x6c0): undefined reference to `mysql_options' -persistentstorage.o: In function `MysqlPersistentStorage::write(std::string const&, std::string const&)': -persistentstorage.cpp:(.text+0xb70): undefined reference to `mysql_real_query' -persistentstorage.cpp:(.text+0xbcc): undefined reference to `mysql_error' -persistentstorage.o: In function `MysqlPersistentStorage::read(std::string const&, std::string const&)': -persistentstorage.cpp:(.text+0xd14): undefined reference to `mysql_real_query' -persistentstorage.cpp:(.text+0xd38): undefined reference to `mysql_store_result' -persistentstorage.cpp:(.text+0xd40): undefined reference to `mysql_num_rows' -persistentstorage.cpp:(.text+0xd50): undefined reference to `mysql_fetch_row' -persistentstorage.cpp:(.text+0xd68): undefined reference to `mysql_free_result' -persistentstorage.cpp:(.text+0xdc8): undefined reference to `mysql_error' -persistentstorage.o: In function `MysqlPersistentStorage::writelog(std::string const&, std::string const&)': -persistentstorage.cpp:(.text+0xf74): undefined reference to `mysql_real_query' -persistentstorage.cpp:(.text+0xfd0): undefined reference to `mysql_error' -collect2: error: ld returned 1 exit status - -Signed-off-by: Baruch Siach ---- -Patch status: sent to jef2000@users.sourceforge.net - -diff -Nuar linknx-0.0.1.32-orig/acinclude.m4 linknx-0.0.1.32/acinclude.m4 ---- linknx-0.0.1.32-orig/acinclude.m4 2011-01-09 16:47:32.000000000 +0200 -+++ linknx-0.0.1.32/acinclude.m4 2016-03-15 12:41:19.983861719 +0200 -@@ -36,7 +36,7 @@ - CFLAGS="$CFLAGS $ADDFLAGS" - CXXFLAGS="$CXXFLAGS $ADDFLAGS" - -- LDFLAGS="$LDFLAGS "`$MYSQL_CONFIG --libs_r` -+ LIBS="$LIBS "`$MYSQL_CONFIG --libs_r` - - AC_MSG_RESULT($MYSQL_CONFIG) - AC_DEFINE([HAVE_MYSQL], [1], [Build with MySQL support.]) diff --git a/package.bak/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch b/package.bak/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch deleted file mode 100644 index d204a02269..0000000000 --- a/package.bak/linknx/0002-src-suncalc.cpp-fix-build-with-gcc-6.x.patch +++ /dev/null @@ -1,42 +0,0 @@ -From ff52cf04c6fa8b3352544447abf429bfa6000dc8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 20 Aug 2016 12:13:04 +0200 -Subject: [PATCH] src/suncalc.cpp: fix build with gcc 6.x - -src/suncalc.cpp currently includes , but this causes a build -failure with gcc 6.x, and should be used instead. The build -failure is: - -/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/include/c++/6.1.1/cmath:101:37: error: '__is_integer' was not declared in this scope - typename __gnu_cxx::__enable_if<__is_integer<_Tp>::__value, - ^~~~~~~~~~~~ - -Signed-off-by: Thomas Petazzoni ---- - src/suncalc.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/suncalc.cpp b/src/suncalc.cpp -index ea2366a..b553f96 100644 ---- a/src/suncalc.cpp -+++ b/src/suncalc.cpp -@@ -22,6 +22,8 @@ - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -+#include -+ - #include "suncalc.h" - #include "services.h" - -@@ -44,7 +46,6 @@ Released to the public domain by Paul Schlyter, December 1992 - - - #include --#include - #include - #include - #include --- -2.7.4 - diff --git a/package.bak/linknx/Config.in b/package.bak/linknx/Config.in deleted file mode 100644 index e85838990e..0000000000 --- a/package.bak/linknx/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_LINKNX - bool "linknx" - select BR2_PACKAGE_LIBPTHSEM - select BR2_PACKAGE_LIBCURL # for autoreconf - select BR2_PACKAGE_ARGP_STANDALONE \ - if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # libpthsem - help - Linknx is an automation platform providing high level functionalities - to EIB/KNX installation. - - http://linknx.sourceforge.net/ - https://github.com/linknx/linknx - -comment "linknx needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/linknx/linknx.hash b/package.bak/linknx/linknx.hash deleted file mode 100644 index d1be6d204a..0000000000 --- a/package.bak/linknx/linknx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 f161d3c8da3b8c6969e9c02d84d3cd26eb5e7fb4f3a3efbaaede8acdaaf11700 linknx-0.0.1.32.tar.gz diff --git a/package.bak/linknx/linknx.mk b/package.bak/linknx/linknx.mk deleted file mode 100644 index 5dc8bb2d08..0000000000 --- a/package.bak/linknx/linknx.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# linknx -# -################################################################################ - -LINKNX_VERSION = 0.0.1.32 -LINKNX_SITE = http://downloads.sourceforge.net/project/linknx/linknx/linknx-$(LINKNX_VERSION) -LINKNX_LICENSE = GPLv2+ -LINKNX_INSTALL_STAGING = YES -# Patching acinclude.m4 -LINKNX_AUTORECONF = YES -LINKNX_CONF_OPTS = \ - --without-lua \ - --without-log4cpp \ - --without-pth-test \ - --with-pth=$(STAGING_DIR)/usr \ - --disable-smtp \ - --with-libcurl=$(STAGING_DIR)/usr/bin/curl-config - -LINKNX_DEPENDENCIES = libpthsem libcurl \ - $(if $(BR2_PACKAGE_ARGP_STANDALONE),argp-standalone) - -# This is needed to make autoreconf happy -define LINKNX_CREATE_MISSING_FILES - touch $(@D)/NEWS $(@D)/AUTHORS $(@D)/README -endef -LINKNX_POST_EXTRACT_HOOKS += LINKNX_CREATE_MISSING_FILES - -ifeq ($(BR2_PACKAGE_MYSQL),y) -LINKNX_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr/bin/mysql_config -LINKNX_DEPENDENCIES += mysql -else -LINKNX_CONF_OPTS += --without-mysql -endif - -$(eval $(autotools-package)) diff --git a/package.bak/links/Config.in b/package.bak/links/Config.in deleted file mode 100644 index 713f53da4e..0000000000 --- a/package.bak/links/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LINKS - bool "links" - depends on BR2_USE_MMU # fork() - help - Graphics and text mode WWW browser (kind of like lynx). - - http://links.twibright.com/ - -if BR2_PACKAGE_LINKS - -config BR2_PACKAGE_LINKS_GRAPHICS - bool "use graphics" - depends on BR2_PACKAGE_DIRECTFB || BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBPNG - help - Enable graphics output for DirectFB or X11. - Otherwise links will be text-mode only. - -endif diff --git a/package.bak/links/links.hash b/package.bak/links/links.hash deleted file mode 100644 index a63af4c808..0000000000 --- a/package.bak/links/links.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f70d0678ef1c5550953bdc27b12e72d5de86e53b05dd59b0fc7f07c507f244b8 links-2.14.tar.bz2 diff --git a/package.bak/links/links.mk b/package.bak/links/links.mk deleted file mode 100644 index ce0e638f95..0000000000 --- a/package.bak/links/links.mk +++ /dev/null @@ -1,97 +0,0 @@ -################################################################################ -# -# links -# -################################################################################ - -LINKS_VERSION = 2.14 -LINKS_SOURCE = links-$(LINKS_VERSION).tar.bz2 -LINKS_SITE = http://links.twibright.com/download -LINKS_DEPENDENCIES = host-pkgconf -LINKS_LICENSE = GPLv2+ -LINKS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LINKS_GRAPHICS),y) -LINKS_CONF_OPTS += --enable-graphics -LINKS_DEPENDENCIES += libpng -ifeq ($(BR2_PACKAGE_XLIB_LIBXT),y) -LINKS_CONF_OPTS += --with-x -LINKS_DEPENDENCIES += xlib_libXt -else -LINKS_CONF_OPTS += --without-x -endif -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -LINKS_CONF_ENV = ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config -ifeq ($(BR2_STATIC_LIBS),y) -LINKS_CONF_ENV += LIBS=-lstdc++ -endif -LINKS_CONF_OPTS += --with-directfb -LINKS_DEPENDENCIES += directfb -else -LINKS_CONF_OPTS += --without-directfb -endif -ifeq ($(BR2_PACKAGE_JPEG),y) -LINKS_CONF_OPTS += --with-libjpeg -LINKS_DEPENDENCIES += jpeg -else -LINKS_CONF_OPTS += --without-libjpeg -endif -ifeq ($(BR2_PACKAGE_LIBRSVG),y) -LINKS_CONF_OPTS += --with-librsvg -LINKS_DEPENDENCIES += librsvg -else -LINKS_CONF_OPTS += --without-librsvg -endif -ifeq ($(BR2_PACKAGE_TIFF),y) -LINKS_CONF_OPTS += --with-libtiff -LINKS_DEPENDENCIES += tiff -else -LINKS_CONF_OPTS += --without-libtiff -endif -else -LINKS_CONF_OPTS += --disable-graphics -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -LINKS_CONF_OPTS += --with-bzip2 -LINKS_DEPENDENCIES += bzip2 -else -LINKS_CONF_OPTS += --without-bzip2 -endif - -ifeq ($(BR2_PACKAGE_GPM),y) -LINKS_CONF_OPTS += --with-gpm -LINKS_DEPENDENCIES += gpm -else -LINKS_CONF_OPTS += --without-gpm -endif - -ifeq ($(BR2_PACKAGE_LIBEVENT),y) -LINKS_CONF_OPTS += --with-libevent -LINKS_DEPENDENCIES += libevent -else -LINKS_CONF_OPTS += --without-libevent -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LINKS_CONF_OPTS += --with-ssl --enable-ssl-pkgconfig -LINKS_DEPENDENCIES += openssl -else -LINKS_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -LINKS_CONF_OPTS += --with-lzma -LINKS_DEPENDENCIES += xz -else -LINKS_CONF_OPTS += --without-lzma -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -LINKS_CONF_OPTS += --with-zlib -LINKS_DEPENDENCIES += zlib -else -LINKS_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/linphone/Config.in b/package.bak/linphone/Config.in deleted file mode 100644 index 2622aa4f4c..0000000000 --- a/package.bak/linphone/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_LINPHONE - bool "linphone" - select BR2_PACKAGE_LIBEXOSIP2 - select BR2_PACKAGE_SPEEX - depends on BR2_INSTALL_LIBSTDCPP # mediastreamer (bundled) - depends on BR2_TOOLCHAIN_HAS_THREADS # ortp (bundled) - depends on BR2_USE_MMU # libeXosip2 - help - Linphone is an internet phone or Voice Over IP phone (VoIP). - - With linphone you can communicate freely with people over - the internet, with voice, video, and text instant messaging. - Linphone makes use of the SIP protocol, an open standard - for internet telephony. You can use Linphone with any SIP - VoIP operator, including our free SIP audio/video service. - linphone is free-software (or open-source), you can download - and redistribute it freely. - Linphone is available for desktop computers: Linux, Windows, - MacOSX, and for mobile phones: Android, iPhone, Blackberry. - - Linphone support in Buildroot is limited to the commandline - client, linphonec, and video support is not enabled. - - http://www.linphone.org/ - -comment "linphone needs a toolchain w/ threads, C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/linphone/linphone.hash b/package.bak/linphone/linphone.hash deleted file mode 100644 index 2e202cf10e..0000000000 --- a/package.bak/linphone/linphone.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 05ba81223e9378c3bce8d33080213b9925af49bd9623cd9004eb3dd22ca9d2a0 linphone-3.6.1.tar.gz -sha256 bc4ef670c0ecc1bb60bcb79374309b555c11d154bacfa363d809a26a58780933 libav9.patch -sha256 a50a8ac2caedb389c224f81393901a029fec055ec2ec83aa18d677e1bfe7fc73 libav10.patch -sha256 e384775c12ea93d3bc35dccfe4ea875c38b74be8af63fcb82e6b7f06e93d1593 libav11.patch -sha256 3367a26f65f49f4101787b1821402127d29cde9b02d3873112a5001a549cc7d9 ffmpeg_2.9.patch diff --git a/package.bak/linphone/linphone.mk b/package.bak/linphone/linphone.mk deleted file mode 100644 index df804907e8..0000000000 --- a/package.bak/linphone/linphone.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# linphone -# -################################################################################ - -LINPHONE_VERSION_MAJOR = 3.6 -LINPHONE_VERSION = $(LINPHONE_VERSION_MAJOR).1 -LINPHONE_SITE = http://download-mirror.savannah.gnu.org/releases/linphone/$(LINPHONE_VERSION_MAJOR).x/sources -LINPHONE_CONF_OPTS = \ - --disable-strict --disable-video -# configure is out of sync causing deplibs linking issues -LINPHONE_AUTORECONF = YES -LINPHONE_INSTALL_STAGING = YES -LINPHONE_DEPENDENCIES = host-pkgconf libeXosip2 speex -LINPHONE_LICENSE = GPLv2+ -LINPHONE_LICENSE_FILES = COPYING -LINPHONE_PATCH = \ - https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav9.patch \ - https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav10.patch \ - https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/libav11.patch \ - https://sources.debian.net/data/main/l/linphone/3.6.1-2.5/debian/patches/ffmpeg_2.9.patch - -ifeq ($(BR2_arc),y) -# toolchain __arc__ define conflicts with libosip2 source -LINPHONE_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -U__arc__" -endif - -ifeq ($(BR2_PACKAGE_LIBGTK2)$(BR2_PACKAGE_XORG7),yy) -LINPHONE_CONF_OPTS += --enable-gtk_ui -LINPHONE_DEPENDENCIES += libgtk2 -else -LINPHONE_CONF_OPTS += --disable-gtk_ui -endif - -# needed for bundled mediastreamer2 -LINPHONE_DEPENDENCIES += host-intltool host-gettext - -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) -LINPHONE_CONF_OPTS += --enable-alsa -LINPHONE_DEPENDENCIES += alsa-lib -else -LINPHONE_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -LINPHONE_CONF_OPTS += --enable-libv4l1 --enable-libv4l2 -LINPHONE_DEPENDENCIES += libv4l -else -LINPHONE_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/linux-backports/Config.in b/package.bak/linux-backports/Config.in deleted file mode 100644 index e858a45abc..0000000000 --- a/package.bak/linux-backports/Config.in +++ /dev/null @@ -1,52 +0,0 @@ -comment "linux-backports needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_LINUX_BACKPORTS - bool "linux-backports" - depends on BR2_LINUX_KERNEL - help - The linux-backports package includes many Linux drivers from - recent kernels, backported to older ones. - - This version of linux-backports supports kernels starting from 3.0. - - https://backports.wiki.kernel.org - -if BR2_PACKAGE_LINUX_BACKPORTS - -choice - prompt "Linux kernel driver backports configuration" - default BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG - -config BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG - bool "Using an in-tree defconfig file" - -config BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG - bool "Using a custom (def)config file" - -endchoice - -config BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG - string "Defconfig name" - depends on BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG - help - Name of the backports defconfig file to use, without the - leading defconfig-. The defconfig is located in defconfigs/ - directory in the backports tree. - -config BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE - string "Configuration file path" - depends on BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG - help - Path to the backports configuration file - - Note: this can be a defconfig file or a complete .config file, - which can later be saved back with make linux-update-(def)config. - -config BR2_PACKAGE_LINUX_BACKPORTS_CONFIG_FRAGMENT_FILES - string "Additional configuration fragment files" - help - A space-separated list of configuration fragment files, that - will be merged to the main linux-backports configuration file. - -endif # BR2_PACKAGE_LINUX_BACKPORTS diff --git a/package.bak/linux-backports/linux-backports.hash b/package.bak/linux-backports/linux-backports.hash deleted file mode 100644 index 38f39b98d5..0000000000 --- a/package.bak/linux-backports/linux-backports.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: https://www.kernel.org/pub/linux/kernel/projects/backports/stable/v4.4.2/sha256sums.asc -sha256 a979e194c2ed9fdfca092a448e626d85c5af0e4de5ad993c0967afd15af01285 backports-4.4.2-1.tar.xz diff --git a/package.bak/linux-backports/linux-backports.mk b/package.bak/linux-backports/linux-backports.mk deleted file mode 100644 index 6f599a8a85..0000000000 --- a/package.bak/linux-backports/linux-backports.mk +++ /dev/null @@ -1,99 +0,0 @@ -################################################################################ -# -# linux-backports -# -################################################################################ - -LINUX_BACKPORTS_VERSION_MAJOR = 4.4.2 -LINUX_BACKPORTS_VERSION = $(LINUX_BACKPORTS_VERSION_MAJOR)-1 -LINUX_BACKPORTS_SOURCE = backports-$(LINUX_BACKPORTS_VERSION).tar.xz -LINUX_BACKPORTS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/projects/backports/stable/v$(LINUX_BACKPORTS_VERSION_MAJOR) -LINUX_BACKPORTS_LICENSE = GPLv2 -LINUX_BACKPORTS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y) -LINUX_BACKPORTS_KCONFIG_FILE = $(LINUX_BACKPORTS_DIR)/defconfigs/$(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG)) -else ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG),y) -LINUX_BACKPORTS_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE)) -endif - -LINUX_BACKPORTS_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_CONFIG_FRAGMENT_FILES)) -LINUX_BACKPORTS_KCONFIG_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS) - -# linux-backports' build system expects the config options to be present -# in the environment, and it is so when using their custom buildsystem, -# because they are set in the main Makefile, which then calls a second -# Makefile. -# -# In our case, we do not use that first Makefile. So, we parse the -# .config file, filter-out comment lines and put the rest as command -# line variables. -# -# LINUX_BACKPORTS_MAKE_OPTS is used by the kconfig-package infra, while -# LINUX_BACKPORTS_MODULE_MAKE_OPTS is used by the kernel-module infra. -# -LINUX_BACKPORTS_MAKE_OPTS = \ - BACKPORT_DIR=$(@D) \ - KLIB_BUILD=$(LINUX_DIR) \ - KLIB=$(TARGET_DIR)/lib/modules/$(LINUX_VERSION_PROBED) \ - INSTALL_MOD_DIR=backports \ - `sed -r -e '/^\#/d;' $(@D)/.config` - -LINUX_BACKPORTS_MODULE_MAKE_OPTS = $(LINUX_BACKPORTS_MAKE_OPTS) - -# This file is not automatically generated by 'oldconfig' that we use in -# the kconfig-package infrastructure. In the linux buildsystem, it is -# generated by running silentoldconfig, but that's not the case for -# linux-backports: it uses a hand-crafted rule to generate that file. -define LINUX_BACKPORTS_KCONFIG_FIXUP_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_BACKPORTS_MAKE_OPTS) backport-include/backport/autoconf.h -endef - -# Checks to give errors that the user can understand -ifeq ($(BR_BUILDING),y) - -ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_DEFCONFIG),y) -ifeq ($(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG)),) -$(error No linux-backports defconfig name specified, check your BR2_PACKAGE_LINUX_BACKPORTS_DEFCONFIG setting) -endif -endif - -ifeq ($(BR2_PACKAGE_LINUX_BACKPORTS_USE_CUSTOM_CONFIG),y) -ifeq ($(call qstrip,$(BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE)),) -$(error No linux-backports configuration file specified, check your BR2_PACKAGE_LINUX_BACKPORTS_CUSTOM_CONFIG_FILE setting) -endif -endif - -endif # BR_BUILDING - -$(eval $(kernel-module)) -$(eval $(kconfig-package)) - -# linux-backports' own .config file needs options from the kernel's own -# .config file. The dependencies handling in the infrastructure does not -# allow to express this kind of dependencies. Besides, linux.mk might -# not have been parsed yet, so the Linux build dir LINUX_DIR is not yet -# known. Thus, we use a "secondary expansion" so the rule is re-evaluated -# after all Makefiles are parsed, and thus at that time we will have the -# LINUX_DIR variable set to the proper value. -# -# Furthermore, we want to check the kernel version, since linux-backports -# only supports kernels >= 3.0. To avoid overriding linux-backports' -# .config rule defined in the kconfig-package infra, we use an -# intermediate stamp-file. -# -# Finally, it must also come after the call to kconfig-package, so we get -# LINUX_BACKPORTS_DIR properly defined (because the target part of the -# rule is not re-evaluated). -# -$(LINUX_BACKPORTS_DIR)/.config: $(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version - -.SECONDEXPANSION: -$(LINUX_BACKPORTS_DIR)/.stamp_check_kernel_version: $$(LINUX_DIR)/.config - $(Q)LINUX_VERSION_PROBED=$(LINUX_VERSION_PROBED); \ - if [ $${LINUX_VERSION_PROBED%%.*} -lt 3 ]; then \ - printf "Linux version '%s' is too old for linux-backports (needs 3.0 or later)\n" \ - "$${LINUX_VERSION_PROBED}"; \ - exit 1; \ - fi - $(Q)touch $(@) diff --git a/package.bak/linux-firmware/Config.in b/package.bak/linux-firmware/Config.in deleted file mode 100644 index e9a4dfbf84..0000000000 --- a/package.bak/linux-firmware/Config.in +++ /dev/null @@ -1,309 +0,0 @@ -config BR2_PACKAGE_LINUX_FIRMWARE - bool "linux-firmware" - help - This package provides various binary firmware files (closed - binary blobs) for such devices like LAN, WLAN cards etc. - - https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git - -if BR2_PACKAGE_LINUX_FIRMWARE - -menu "Audio firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP - bool "Intel SST DSP" - help - Firmware files for Intel Baytrail SST DSP audio. - -endmenu # Audio - -menu "Video firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_I915 - bool "Intel i915 video card firmware" - help - Firmware files for the Intel i915 video cards. - -config BR2_PACKAGE_LINUX_FIRMWARE_RADEON - bool "AMD Radeon video card firmware" - help - Firmware files for AMD Radeon video cards. - -endmenu # Video - -menu "Bluetooth firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_IBT - bool "Intel Wireless Bluetooth" - help - Firmware files for Intel 3160/7260/7265/8260/8265 Wireless - bluetooth support. - -endmenu # Bluetooth - -menu "WiFi firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002 - bool "Atheros 6002" - help - Firmware files for the Atheros AR6002 chip - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003 - bool "Atheros 6003" - help - Firmware files for the Atheros AR6003 chip - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004 - bool "Atheros 6004" - help - Firmware files for the Atheros AR6004 chip - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010 - bool "Atheros 7010" - help - Firmware files for the Atheros 7010 module - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170 - bool "Atheros 9170" - help - Firmware files for the Atheros 9170 module - -config BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271 - bool "Atheros 9271" - help - Firmware files for the Atheros 9271 module - -config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX - bool "Broadcom BRCM bcm43xx" - help - Firmware files for the Broadcom bcm43xx SoftMAC and FullMAC. - -config BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX - bool "Broadcom BRCM bcm43xxx" - help - Firmware files for the Broadcom bcm43xxx, SoftMAC and FullMAC. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160 - bool "Intel iwlwifi 3160" - help - Firmware files for the Intel Wifi 3160 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168 - bool "Intel iwlwifi 3168" - help - Firmware files for the Intel Wifi 3168 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000 - bool "Intel iwlwifi 5000" - help - Firmware files for the Intel Wifi 5000 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A - bool "Intel iwlwifi 6000G2A" - help - Firmware files for the Intel Wifi 6000G2A devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B - bool "Intel iwlwifi 6000G2B" - help - Firmware files for the Intel Wifi 6000G2B devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260 - bool "Intel iwlwifi 7260" - help - Firmware files for the Intel Wifi 7260 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265 - bool "Intel iwlwifi 7265" - help - Firmware files for the Intel Wifi 7265 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D - bool "Intel iwlwifi 7265D" - # needed for old kernel versions, where the non-D and D - # firmwares were the same - select BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265 - help - Firmware files for the Intel Wifi 7265D devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C - bool "Intel iwlwifi 8000C" - help - Firmware files for the Intel Wifi 8000C devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265 - bool "Intel iwlwifi 8265" - help - Firmware files for the Intel Wifi 8265 devices supported by - the iwlwifi kernel driver. - -config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8 - bool "Libertas SD 8686 v8" - help - Firmware files (version 8) for the Marvell SD8686 module - -config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9 - bool "Libertas SD 8686 v9" - help - Firmware files (version 9) for the Marvell SD8686 module - -config BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688 - bool "Libertas SD 8688" - help - Firmware files for the Marvell SD8688 module - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787 - bool "Marvell Wifi-Ex 8787 SDIO" - help - Firmware files for the Marvell Wifi-Ex 8787 module on SDIO. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797 - bool "Marvell Wifi-Ex 8797 SDIO" - help - Firmware files for the Marvell Wifi-Ex 8797 module on SDIO. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797 - bool "Marvell Wifi-Ex 8797 USB" - help - Firmware files for the Marvell Wifi-Ex 8797 module on USB. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801 - bool "Marvell Wifi-Ex 8801 USB" - help - Firmware files for the Marvell Wifi-Ex 8801 module on USB. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887 - bool "Marvell Wifi-Ex 8887 SDIO" - help - Firmware files for the Marvell Wifi-Ex 8887 module on SDIO. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897 - bool "Marvell Wifi-Ex 8897 SDIO" - help - Firmware files for the Marvell Wifi-Ex 8897 module on SDIO. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897 - bool "Marvell Wifi-Ex 8897 USB" - help - Firmware files for the Marvell Wifi-Ex 8897 module on USB. - -config BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897 - bool "Marvell Wifi-Ex 8897 PCI-E" - help - Firmware files for the Marvell Wifi-Ex 8897 module on PCI-E. - -config BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U - bool "MediaTek MT7601U" - help - MediaTek MT7601U - -config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61 - bool "Ralink rt2501/rt61" - help - Ralink rt2501/rt61 - -config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73 - bool "Ralink rt73" - help - Ralink rt73 - -config BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX - bool "Ralink rt27xx/rt28xx/rt30xx" - help - Ralink rt27xx/rt28xx/rt30xx - -config BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX - bool "Realtek 81xx" - help - Realtek 8188/8192 - -config BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX - bool "Realtek 87xx" - help - Realtek 8712/8723/8723be - -config BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX - bool "Realtek 88xx" - help - Realtek rtl8821ae - -config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X - bool "TI wl127x" - help - Firmware files for WLAN and Bluetooth modules wl1271 and wl1273 - -config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X - bool "TI wl128x" - help - Firmware files for WLAN and Bluetooth modules wl128x - -config BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX - bool "TI wl18xx" - help - Firmware files for WLAN and Bluetooth modules wl18xx - -endmenu - -menu "Ethernet firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_BNX2X - bool "Broadcom NetXtremeII" - help - Firmware files for Broadcom NetXtreme 10Gb ethernet cards (bnx2x) - -config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4 - bool "Chelsio T4" - help - Firmware files for Chelsio T4 1Gb and 10Gb ethernet cards (cxgb4) - -config BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5 - bool "Chelsio T5" - help - Firmware files for Chelsio T5 1Gb and 10Gb ethernet cards (cxgb4) - -config BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169 - bool "Realtek 8169" - help - Firmware files for Realtek 8169 gigabit ethernet cards - -endmenu - -menu "DVB firmware" - -config BR2_PACKAGE_LINUX_FIRMWARE_AS102 - bool "Abilis Systems as102" - help - Firmware file for Abilis Systems single DVB-T receiver as102 - -config BR2_PACKAGE_LINUX_FIRMWARE_DIB0700 - bool "DiBcom dib0700" - help - Firmware file for dib0700-based USB DVB tuner driver - -config BR2_PACKAGE_LINUX_FIRMWARE_ITETECH_IT9135 - bool "ITEtech it9135" - help - Firmware files for ITEtech it9135 (Ax and Bx) DVB-T USB tuner - -config BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK - bool "Terratec H5 DRX-K" - help - Firmware file for Terratec H5 DRX-K based DVB tuner driver - -config BR2_PACKAGE_LINUX_FIRMWARE_XCx000 - bool "Xceive/Cresta xc4000/xc5000/xc500c" - help - Firmware file for xc4000/xc5000/xc5000c based DVB tuner driver - -endmenu - -endif diff --git a/package.bak/linux-firmware/linux-firmware.hash b/package.bak/linux-firmware/linux-firmware.hash deleted file mode 100644 index e8ee2b72a1..0000000000 --- a/package.bak/linux-firmware/linux-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 256378564e36b8f222adb8fbe746529e73413c6cbe2b0e5574f41dfd62d92577 linux-firmware-6d3bc8886517d171068fd1263176b8b5c51df204.tar.gz diff --git a/package.bak/linux-firmware/linux-firmware.mk b/package.bak/linux-firmware/linux-firmware.mk deleted file mode 100644 index 7706bd5c50..0000000000 --- a/package.bak/linux-firmware/linux-firmware.mk +++ /dev/null @@ -1,441 +0,0 @@ -################################################################################ -# -# linux-firmware -# -################################################################################ - -LINUX_FIRMWARE_VERSION = 6d3bc8886517d171068fd1263176b8b5c51df204 -LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git -LINUX_FIRMWARE_SITE_METHOD = git - -# Intel SST DSP -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_INTEL_SST_DSP),y) -LINUX_FIRMWARE_FILES += intel/fw_sst_0f28.bin-48kHz_i2s_master -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.fw_sst_0f28 -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_I915),y) -LINUX_FIRMWARE_DIRS += i915 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.i915 -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RADEON),y) -LINUX_FIRMWARE_DIRS += radeon -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.radeon -endif - -# Intel Wireless Bluetooth -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IBT),y) -LINUX_FIRMWARE_FILES += intel/ibt-* -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ibt_firmware -endif - -# rt2501/rt61 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT61),y) -LINUX_FIRMWARE_FILES += rt2561.bin rt2561s.bin rt2661.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt -endif - -# rt73 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT73),y) -LINUX_FIRMWARE_FILES += rt73.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt -endif - -# rt2xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX),y) -# rt3090.bin is a symlink to rt2860.bin -# rt3070.bin is a symlink to rt2870.bin -LINUX_FIRMWARE_FILES += rt2860.bin rt2870.bin rt3070.bin rt3071.bin rt3090.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink-firmware.txt -endif - -# rtl81xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX),y) -LINUX_FIRMWARE_FILES += \ - rtlwifi/rtl8192cfw.bin rtlwifi/rtl8192cfwU.bin \ - rtlwifi/rtl8192cfwU_B.bin rtlwifi/rtl8192cufw.bin \ - rtlwifi/rtl8192defw.bin rtlwifi/rtl8192sefw.bin \ - rtlwifi/rtl8188efw.bin rtlwifi/rtl8188eufw.bin \ - rtlwifi/rtl8192cufw_A.bin \ - rtlwifi/rtl8192cufw_B.bin rtlwifi/rtl8192cufw_TMSC.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt -endif - -# rtl87xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX),y) -LINUX_FIRMWARE_FILES += \ - rtlwifi/rtl8712u.bin rtlwifi/rtl8723fw.bin \ - rtlwifi/rtl8723fw_B.bin rtlwifi/rtl8723befw.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt -endif - -# rtl88xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX),y) -LINUX_FIRMWARE_FILES += \ - rtlwifi/rtl8821aefw.bin \ - rtlwifi/rtl8821aefw_wowlan.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.rtlwifi_firmware.txt -endif - -# ar6002 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6002),y) -LINUX_FIRMWARE_FILES += ath6k/AR6002 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# ar6003 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6003),y) -LINUX_FIRMWARE_FILES += ath6k/AR6003 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# ar6004 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_6004),y) -LINUX_FIRMWARE_FILES += ath6k/AR6004 -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# ar7010 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_7010),y) -LINUX_FIRMWARE_FILES += ar7010.fw ar7010_1_1.fw htc_7010.fw ath9k_htc/htc_7010-1.4.0.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# ar9170 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9170),y) -LINUX_FIRMWARE_FILES += ar9170-1.fw ar9170-2.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# ar9271 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ATHEROS_9271),y) -LINUX_FIRMWARE_FILES += ar9271.fw htc_9271.fw ath9k_htc/htc_9271-1.4.0.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.atheros_firmware -endif - -# sd8686 v8 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V8),y) -LINUX_FIRMWARE_FILES += libertas/sd8686_v8.bin libertas/sd8686_v8_helper.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8686 v9 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8686_V9),y) -LINUX_FIRMWARE_FILES += libertas/sd8686_v9.bin libertas/sd8686_v9_helper.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8688 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_LIBERTAS_SD8688),y) -LINUX_FIRMWARE_FILES += libertas/sd8688.bin libertas/sd8688_helper.bin -# The two files above are but symlinks to those two ones: -LINUX_FIRMWARE_FILES += mrvl/sd8688.bin mrvl/sd8688_helper.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8787 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8787),y) -LINUX_FIRMWARE_FILES += mrvl/sd8787_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8797 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8797),y) -LINUX_FIRMWARE_FILES += mrvl/sd8797_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# usb8797 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8797),y) -LINUX_FIRMWARE_FILES += mrvl/usb8797_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# usb8801 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8801),y) -LINUX_FIRMWARE_FILES += mrvl/usb8801_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8887 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8887),y) -LINUX_FIRMWARE_FILES += mrvl/sd8887_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# sd8897 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_SD8897),y) -LINUX_FIRMWARE_FILES += mrvl/sd8897_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# usb8897 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_USB8897),y) -LINUX_FIRMWARE_FILES += mrvl/usb8897_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# pcie8897 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MWIFIEX_PCIE8897),y) -LINUX_FIRMWARE_FILES += mrvl/pcie8897_uapsta.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Marvell -endif - -# MT7601 -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_MEDIATEK_MT7601U),y) -LINUX_FIRMWARE_FILES += mt7601u.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ralink_a_mediatek_company_firmware -endif - -# wl127x -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL127X),y) -# wl1271-nvs.bin is a symlink to wl127x-nvs.bin -LINUX_FIRMWARE_FILES += \ - ti-connectivity/wl1271-fw-2.bin \ - ti-connectivity/wl1271-fw-ap.bin \ - ti-connectivity/wl1271-fw.bin \ - ti-connectivity/wl1271-nvs.bin \ - ti-connectivity/wl127x-fw-3.bin \ - ti-connectivity/wl127x-fw-plt-3.bin \ - ti-connectivity/wl127x-nvs.bin \ - ti-connectivity/wl127x-fw-4-mr.bin \ - ti-connectivity/wl127x-fw-4-plt.bin \ - ti-connectivity/wl127x-fw-4-sr.bin \ - ti-connectivity/wl127x-fw-5-mr.bin \ - ti-connectivity/wl127x-fw-5-plt.bin \ - ti-connectivity/wl127x-fw-5-sr.bin \ - ti-connectivity/TIInit_7.2.31.bts -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity -endif - -# wl128x -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL128X),y) -# wl1271-nvs.bin and wl12xx-nvs.bin are symlinks to wl127x-nvs.bin -LINUX_FIRMWARE_FILES += \ - ti-connectivity/wl128x-fw-3.bin \ - ti-connectivity/wl128x-fw-ap.bin \ - ti-connectivity/wl128x-fw-plt-3.bin \ - ti-connectivity/wl128x-fw.bin \ - ti-connectivity/wl1271-nvs.bin \ - ti-connectivity/wl128x-nvs.bin \ - ti-connectivity/wl12xx-nvs.bin \ - ti-connectivity/wl127x-nvs.bin \ - ti-connectivity/wl128x-fw-4-mr.bin \ - ti-connectivity/wl128x-fw-4-plt.bin \ - ti-connectivity/wl128x-fw-4-sr.bin \ - ti-connectivity/wl128x-fw-5-mr.bin \ - ti-connectivity/wl128x-fw-5-plt.bin \ - ti-connectivity/wl128x-fw-5-sr.bin \ - ti-connectivity/TIInit_7.2.31.bts -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity -endif - -# wl18xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_TI_WL18XX),y) -# wl1271-nvs.bin is a symlink to wl127x-nvs.bin -LINUX_FIRMWARE_FILES += \ - ti-connectivity/wl18xx-fw.bin \ - ti-connectivity/wl18xx-fw-2.bin \ - ti-connectivity/wl18xx-fw-3.bin \ - ti-connectivity/wl18xx-fw-4.bin \ - ti-connectivity/wl1271-nvs.bin \ - ti-connectivity/wl127x-nvs.bin \ - ti-connectivity/TIInit_7.2.31.bts -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.ti-connectivity -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3160),y) -LINUX_FIRMWARE_FILES += iwlwifi-3160-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_3168),y) -LINUX_FIRMWARE_FILES += iwlwifi-3168-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -# iwlwifi 5000. Multiple files are available (iwlwifi-5000-1.ucode, -# iwlwifi-5000-2.ucode, iwlwifi-5000-5.ucode), corresponding to -# different versions of the firmware API. For now, we only install the -# most recent one. -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_5000),y) -LINUX_FIRMWARE_FILES += iwlwifi-5000-5.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2A),y) -LINUX_FIRMWARE_FILES += iwlwifi-6000g2a-6.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_6000G2B),y) -LINUX_FIRMWARE_FILES += iwlwifi-6000g2b-6.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7260),y) -LINUX_FIRMWARE_FILES += iwlwifi-7260-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265),y) -LINUX_FIRMWARE_FILES += iwlwifi-7265-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_7265D),y) -LINUX_FIRMWARE_FILES += iwlwifi-7265D-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8000C),y) -LINUX_FIRMWARE_FILES += iwlwifi-8000C-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_IWLWIFI_8265),y) -LINUX_FIRMWARE_FILES += iwlwifi-8265-*.ucode -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.iwlwifi_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BNX2X),y) -LINUX_FIRMWARE_FILES += bnx2x/* -# No license file; the license is in the file WHENCE -# which is installed unconditionally -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T4),y) -# cxgb4/t4fw.bin is a symlink to cxgb4/t4fw-1.14.4.0.bin -LINUX_FIRMWARE_FILES += cxgb4/t4fw-1.14.4.0.bin cxgb4/t4fw.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_CXGB4_T5),y) -# cxgb4/t5fw.bin is a symlink to cxgb4/t5fw-1.14.4.0.bin -LINUX_FIRMWARE_FILES += cxgb4/t5fw-1.14.4.0.bin cxgb4/t5fw.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.chelsio_firmware -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_RTL_8169),y) -LINUX_FIRMWARE_FILES += \ - rtl_nic/rtl8105e-1.fw \ - rtl_nic/rtl8106e-1.fw \ - rtl_nic/rtl8106e-2.fw \ - rtl_nic/rtl8168d-1.fw \ - rtl_nic/rtl8168d-2.fw \ - rtl_nic/rtl8168e-1.fw \ - rtl_nic/rtl8168e-2.fw \ - rtl_nic/rtl8168e-3.fw \ - rtl_nic/rtl8168f-1.fw \ - rtl_nic/rtl8168f-2.fw \ - rtl_nic/rtl8168g-2.fw \ - rtl_nic/rtl8168g-3.fw \ - rtl_nic/rtl8168h-1.fw \ - rtl_nic/rtl8168h-2.fw \ - rtl_nic/rtl8402-1.fw \ - rtl_nic/rtl8411-1.fw \ - rtl_nic/rtl8411-2.fw -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_XCx000),y) -LINUX_FIRMWARE_FILES += \ - dvb-fe-xc4000-1.4.1.fw \ - dvb-fe-xc5000-1.6.114.fw \ - dvb-fe-xc5000c-4.1.30.7.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += \ - LICENCE.xc4000 \ - LICENCE.xc5000 \ - LICENCE.xc5000c -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_AS102),y) -LINUX_FIRMWARE_FILES += as102_data1_st.hex as102_data2_st.hex -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.Abilis -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_DIB0700),y) -LINUX_FIRMWARE_FILES += dvb-usb-dib0700-1.20.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENSE.dib0700 -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_ITETECH_IT9135),y) -LINUX_FIRMWARE_FILES += dvb-usb-it9135-01.fw dvb-usb-it9135-02.fw -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.it913x -endif - -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_H5_DRXK),y) -LINUX_FIRMWARE_FILES += dvb-usb-terratec-h5-drxk.fw -# No license file; the license is in the file WHENCE -# which is installed unconditionally -endif - -# brcm43xx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XX),y) -LINUX_FIRMWARE_FILES += \ - brcm/bcm43xx-0.fw brcm/bcm43xx_hdr-0.fw \ - brcm/bcm4329-fullmac-4.bin brcm/brcmfmac4329-sdio.bin \ - brcm/brcmfmac4330-sdio.bin brcm/brcmfmac4334-sdio.bin \ - brcm/brcmfmac4335-sdio.bin brcm/brcmfmac4339-sdio.bin \ - brcm/brcmfmac4350-pcie.bin brcm/brcmfmac4354-sdio.bin \ - brcm/brcmfmac4356-pcie.bin brcm/brcmfmac4371-pcie.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx -endif - -# brcm43xxx -ifeq ($(BR2_PACKAGE_LINUX_FIRMWARE_BRCM_BCM43XXX),y) -LINUX_FIRMWARE_FILES += \ - brcm/brcmfmac43143.bin brcm/brcmfmac43143-sdio.bin \ - brcm/brcmfmac43236b.bin brcm/brcmfmac43241b0-sdio.bin \ - brcm/brcmfmac43241b4-sdio.bin brcm/brcmfmac43241b5-sdio.bin \ - brcm/brcmfmac43242a.bin brcm/brcmfmac43340-sdio.bin \ - brcm/brcmfmac43362-sdio.bin brcm/brcmfmac43455-sdio.bin \ - brcm/brcmfmac43569.bin brcm/brcmfmac43570-pcie.bin \ - brcm/brcmfmac43602-pcie.ap.bin brcm/brcmfmac43602-pcie.bin \ - brcm/brcmfmac43430-sdio.bin -LINUX_FIRMWARE_ALL_LICENSE_FILES += LICENCE.broadcom_bcm43xx -endif - -ifneq ($(LINUX_FIRMWARE_FILES),) -define LINUX_FIRMWARE_INSTALL_FILES - cd $(@D) ; \ - $(TAR) c $(sort $(LINUX_FIRMWARE_FILES)) | \ - $(TAR) x -C $(TARGET_DIR)/lib/firmware -endef -endif - -ifneq ($(LINUX_FIRMWARE_DIRS),) -# We need to rm-rf the destination directory to avoid copying -# into it in itself, should we re-install the package. -define LINUX_FIRMWARE_INSTALL_DIRS - $(foreach d,$(LINUX_FIRMWARE_DIRS), \ - rm -rf $(TARGET_DIR)/lib/firmware/$(d); \ - cp -a $(@D)/$(d) $(TARGET_DIR)/lib/firmware/$(d)$(sep)) -endef -endif - -ifneq ($(LINUX_FIRMWARE_FILES)$(LINUX_FIRMWARE_DIRS),) - -# Most firmware files are under a proprietary license, so no need to -# repeat it for every selections above. Those firmwares that have more -# lax licensing terms may still add them on a per-case basis. -LINUX_FIRMWARE_LICENSE += Proprietary - -# This file contains some licensing information about all the firmware -# files found in the linux-firmware package, so we always add it, even -# for firmwares that have their own licensing terms. -LINUX_FIRMWARE_ALL_LICENSE_FILES += WHENCE - -# Some license files may be listed more than once, so we have to remove -# duplicates -LINUX_FIRMWARE_LICENSE_FILES = $(sort $(LINUX_FIRMWARE_ALL_LICENSE_FILES)) - -endif - -define LINUX_FIRMWARE_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware - $(LINUX_FIRMWARE_INSTALL_FILES) - $(LINUX_FIRMWARE_INSTALL_DIRS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/linux-fusion/0001-fix-for-linux-4-and-above.patch b/package.bak/linux-fusion/0001-fix-for-linux-4-and-above.patch deleted file mode 100644 index 689d9bf107..0000000000 --- a/package.bak/linux-fusion/0001-fix-for-linux-4-and-above.patch +++ /dev/null @@ -1,25 +0,0 @@ -Fix build for linux >= 4.x - -Instead of relying on testing for '3' as the linux kernel major verison, -check that it is 2.x to include the proper Makefile, otherwise forcibly -include the .26 Makefile, that is good for 3.x and 4.x too. - -Signed-off-by: "Yann E. MORIN" - -diff -durN linux-fusion-9.0.2.orig/Makefile linux-fusion-9.0.2/Makefile ---- linux-fusion-9.0.2.orig/Makefile 2013-07-15 11:58:03.000000000 +0200 -+++ linux-fusion-9.0.2/Makefile 2015-06-06 19:03:04.059842652 +0200 -@@ -62,10 +62,10 @@ - CPPFLAGS += -DHAVE_LINUX_CONFIG_H - endif - --ifeq ($(K_VERSION),3) -- KMAKEFILE = Makefile-2.6 --else -+ifeq ($(K_VERSION),2) - KMAKEFILE = Makefile-2.$(K_PATCHLEVEL) -+else -+ KMAKEFILE = Makefile-2.6 - endif - - check-version = $(shell expr \( $(K_VERSION) \* 65536 + $(K_PATCHLEVEL) \* 256 + $(K_SUBLEVEL) \) \>= \( $(1) \* 65536 + $(2) \* 256 + $(3) \)) diff --git a/package.bak/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch b/package.bak/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch deleted file mode 100644 index a3f8bb7812..0000000000 --- a/package.bak/linux-fusion/0002-Fix-mismatched-conversion-spec-and-value-in-printk.patch +++ /dev/null @@ -1,29 +0,0 @@ -From debb9cafe9b7cc2b286399ecc8e3210480061c70 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 15:42:16 +0100 -Subject: [PATCH] Fix mismatched conversion spec and value in printk - -linux/drivers/char/fusion/fusiondev.c:775:38: warning: -format '%ld' expects argument of type 'long int', but argument 7 has type 'int' - -Subtracting two pointers yields a ptrdiff_t value, and ptrdiff_t is not -necessarily an alias for long int. Cast the value to long int. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusiondev.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/linux/drivers/char/fusion/fusiondev.c b/linux/drivers/char/fusion/fusiondev.c -index 7003407f7e1e..dfb5f8ecb81a 100644 ---- a/linux/drivers/char/fusion/fusiondev.c -+++ b/linux/drivers/char/fusion/fusiondev.c -@@ -775,7 +775,7 @@ call_ioctl(FusionDev * dev, Fusionee * fusionee, - printk( KERN_ERR "fusion: FUSION_CALL_EXECUTE3 with errorneous call (failed on previous ioctl call), " - "call id %d, flags 0x%08x, arg %d, length %u, serial %u, %ld\n", - execute3.call_id, execute3.flags, execute3.call_arg, execute3.length, execute3.ret_length, -- (execute3_bin - (FusionCallExecute3 *) arg) ); -+ (long int)(execute3_bin - (FusionCallExecute3 *) arg) ); - return -EIO; - } - diff --git a/package.bak/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch b/package.bak/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch deleted file mode 100644 index b14ec9d90a..0000000000 --- a/package.bak/linux-fusion/0003-Fix-fusion-Unknown-symbol-tasklist_lock-err-0.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9fcd5003c0363af140a06aba94e62c9e1ea0381e Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Mon, 11 Jan 2016 16:45:30 +0100 -Subject: [PATCH] Fix fusion: Unknown symbol tasklist_lock (err 0) - -Commit 28f6569ab7d0 renamed TREE_PREEMPT_RCU to PREEMPT_RCU in 3.19 -As a result, the code incorrectly falls back to using tasklist_lock -(which was made private in 2.6.18) - -Always use rcu_read_lock on modern kernels. - -Signed-off-by: Marc Gonzalez ---- - linux/drivers/char/fusion/fusionee.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/linux/drivers/char/fusion/fusionee.c b/linux/drivers/char/fusion/fusionee.c -index ef067f5bc831..70cd0a665f98 100644 ---- a/linux/drivers/char/fusion/fusionee.c -+++ b/linux/drivers/char/fusion/fusionee.c -@@ -925,7 +925,7 @@ fusionee_kill(FusionDev * dev, - if (f != fusionee && (!target || target == f->id)) { - struct task_struct *p; - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_lock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_lock(); - #else - read_lock(&tasklist_lock); -@@ -946,7 +946,7 @@ fusionee_kill(FusionDev * dev, - } - } - --#if defined(CONFIG_TREE_RCU) || defined(CONFIG_TREE_PREEMPT_RCU) || defined(CONFIG_TINY_RCU) || defined(rcu_read_unlock) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) - rcu_read_unlock(); - #else - read_unlock(&tasklist_lock); diff --git a/package.bak/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch b/package.bak/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch deleted file mode 100644 index e1bff64f3b..0000000000 --- a/package.bak/linux-fusion/0004-Port-one-one_udp.c-to-Linux-4.1.patch +++ /dev/null @@ -1,99 +0,0 @@ -From be288b60278c78eccfd347aacf4d3dd8771215a9 Mon Sep 17 00:00:00 2001 -From: Marc Gonzalez -Date: Tue, 12 Jan 2016 14:01:42 +0100 -Subject: [PATCH] Port one/one_udp.c to Linux 4.1 - -Kernel commit c0371da6047a replaced msg_iov and msg_iovlen with msg_iter -in struct msghdr since 3.19 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:186:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:187:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -one/one_udp.c: In function 'ksocket_receive': -one/one_udp.c:221:9: error: 'struct msghdr' has no member named 'msg_iov' -one/one_udp.c:222:9: error: 'struct msghdr' has no member named 'msg_iovlen' - -The iov_iter interface -https://lwn.net/Articles/625077/ - -Kernel commit d8725c86aeba dropped the len parameter in sock_sendmsg -since 4.1 - -one/one_udp.c: In function 'ksocket_send_iov': -one/one_udp.c:192:13: error: too many arguments to function 'sock_sendmsg' - -Signed-off-by: Marc Gonzalez ---- - one/one_udp.c | 30 +++++++++++++++--------------- - 1 file changed, 15 insertions(+), 15 deletions(-) - -diff --git a/one/one_udp.c b/one/one_udp.c -index 26b9e6a1f729..b1daae164cdf 100644 ---- a/one/one_udp.c -+++ b/one/one_udp.c -@@ -161,7 +161,7 @@ ksocket_send_iov( struct socket *sock, - const struct iovec *iov, - size_t iov_count ) - { -- struct msghdr msg; -+ struct msghdr msg = { addr, sizeof *addr }; - mm_segment_t oldfs; - int size = 0; - size_t len = 0; -@@ -178,18 +178,20 @@ ksocket_send_iov( struct socket *sock, - for (i=0; i -Signed-off-by: Brendan Heading - -Upstream-status: inappropriate - -diff -urN a/doc/Makefile.am b/doc/Makefile.am ---- a/doc/Makefile.am 2012-08-15 06:08:43.000000000 -0500 -+++ b/doc/Makefile.am 2013-07-17 09:54:53.000000000 -0500 -@@ -2,8 +2,6 @@ - # Copyright (c) 2005, 2006 Thorsten Kukuk - # - --SUBDIRS = man specs sag adg mwg -- - CLEANFILES = *~ - - dist_html_DATA = index.html -@@ -11,11 +9,4 @@ - ####################################################### - - releasedocs: all -- $(mkinstalldirs) $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs -- cp -av specs/draft-morgan-pam-current.txt \ -- $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ -- cp -av $(srcdir)/specs/rfc86.0.txt \ -- $(top_builddir)/Linux-PAM-$(VERSION)/doc/specs/ -- make -C sag releasedocs -- make -C adg releasedocs -- make -C mwg releasedocs -+ /bin/true diff --git a/package.bak/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch b/package.bak/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch deleted file mode 100644 index cec642d845..0000000000 --- a/package.bak/linux-pam/0002-Conditionally-compile-per-ruserok-availability.patch +++ /dev/null @@ -1,49 +0,0 @@ -ruserok is not available/functional in uclibc, provide conditions -for compilation where needed. - -Patch originally by Dmitry Golubovsky - -porting to linux-pam 1.2.1. - -Signed-off-by: Brendan Heading - -Upstream-status: pending - ---- - configure.ac | 2 +- - modules/pam_rhosts/pam_rhosts.c | 6 +++++- - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 08e4530..fd2fd23 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -542,7 +542,7 @@ AC_CHECK_FUNCS(fseeko getdomainname gethostname gettimeofday lckpwdf mkdir selec - AC_CHECK_FUNCS(strcspn strdup strspn strstr strtol uname) - AC_CHECK_FUNCS(getutent_r getpwnam_r getpwuid_r getgrnam_r getgrgid_r getspnam_r) - AC_CHECK_FUNCS(getgrouplist getline getdelim) --AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af) -+AC_CHECK_FUNCS(inet_ntop inet_pton innetgr ruserok_af ruserok) - - AC_CHECK_FUNCS(unshare, [UNSHARE=yes], [UNSHARE=no]) - AM_CONDITIONAL([HAVE_UNSHARE], [test "$UNSHARE" = yes]) -diff --git a/modules/pam_rhosts/pam_rhosts.c b/modules/pam_rhosts/pam_rhosts.c -index bc9e76f..909db29 100644 ---- a/modules/pam_rhosts/pam_rhosts.c -+++ b/modules/pam_rhosts/pam_rhosts.c -@@ -114,8 +114,12 @@ int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, - #ifdef HAVE_RUSEROK_AF - retval = ruserok_af (rhost, as_root, ruser, luser, PF_UNSPEC); - #else -+ #ifdef HAVE_RUSEROK - retval = ruserok (rhost, as_root, ruser, luser); --#endif -+ #else -+ retval = -1; -+ #endif /* HAVE_RUSEROK */ -+#endif /*HAVE_RUSEROK_AF */ - if (retval != 0) { - if (!opt_silent || opt_debug) - pam_syslog(pamh, LOG_WARNING, "denied access to %s@%s as %s", --- -2.4.3 - diff --git a/package.bak/linux-pam/Config.in b/package.bak/linux-pam/Config.in deleted file mode 100644 index 3d9835e8cc..0000000000 --- a/package.bak/linux-pam/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LINUX_PAM - bool "linux-pam" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_FLEX - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU # fork() - help - A Security Framework that Provides Authentication for Applications - - http://linux-pam.org - -comment "linux-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/linux-pam/linux-pam.hash b/package.bak/linux-pam/linux-pam.hash deleted file mode 100644 index b9c91ef0f6..0000000000 --- a/package.bak/linux-pam/linux-pam.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hashes, not provided by upstream -sha256 241aed1ef522f66ed672719ecf2205ec513fd0075ed80cda8e086a5b1a01d1bb Linux-PAM-1.3.0.tar.bz2 diff --git a/package.bak/linux-pam/linux-pam.mk b/package.bak/linux-pam/linux-pam.mk deleted file mode 100644 index c8ba30f74d..0000000000 --- a/package.bak/linux-pam/linux-pam.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# linux-pam -# -################################################################################ - -LINUX_PAM_VERSION = 1.3.0 -LINUX_PAM_SOURCE = Linux-PAM-$(LINUX_PAM_VERSION).tar.bz2 -LINUX_PAM_SITE = http://linux-pam.org/library -LINUX_PAM_INSTALL_STAGING = YES -LINUX_PAM_CONF_OPTS = \ - --disable-prelude \ - --disable-isadir \ - --disable-nis \ - --disable-db \ - --disable-regenerate-docu \ - --enable-securedir=/lib/security \ - --libdir=/lib -LINUX_PAM_DEPENDENCIES = flex host-flex host-pkgconf -LINUX_PAM_AUTORECONF = YES -LINUX_PAM_LICENSE = BSD-3c -LINUX_PAM_LICENSE_FILES = Copyright - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LINUX_PAM_DEPENDENCIES += gettext -LINUX_PAM_MAKE_OPTS += LIBS=-lintl -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LINUX_PAM_CONF_OPTS += --enable-selinux -LINUX_PAM_DEPENDENCIES += libselinux -define LINUX_PAM_SELINUX_PAMFILE_TWEAK - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ - $(TARGET_DIR)/etc/pam.d/login -endef -else -LINUX_PAM_CONF_OPTS += --disable-selinux -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -LINUX_PAM_CONF_OPTS += --enable-audit -LINUX_PAM_DEPENDENCIES += audit -else -LINUX_PAM_CONF_OPTS += --disable-audit -endif - -# Install default pam config (deny everything except login) -define LINUX_PAM_INSTALL_CONFIG - $(INSTALL) -m 0644 -D package/linux-pam/login.pam \ - $(TARGET_DIR)/etc/pam.d/login - $(INSTALL) -m 0644 -D package/linux-pam/other.pam \ - $(TARGET_DIR)/etc/pam.d/other - $(LINUX_PAM_SELINUX_PAMFILE_TWEAK) -endef - -LINUX_PAM_POST_INSTALL_TARGET_HOOKS += LINUX_PAM_INSTALL_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/linux-pam/login.pam b/package.bak/linux-pam/login.pam deleted file mode 100644 index 5df7db628c..0000000000 --- a/package.bak/linux-pam/login.pam +++ /dev/null @@ -1,12 +0,0 @@ -auth required pam_unix.so nullok - -account required pam_unix.so - -password required pam_unix.so nullok - -# session required pam_selinux.so close -session required pam_limits.so -session required pam_env.so -session required pam_unix.so -session optional pam_lastlog.so -# session required pam_selinux.so open diff --git a/package.bak/linux-pam/other.pam b/package.bak/linux-pam/other.pam deleted file mode 100644 index a198aa2acb..0000000000 --- a/package.bak/linux-pam/other.pam +++ /dev/null @@ -1,7 +0,0 @@ -auth required pam_deny.so - -account required pam_deny.so - -password required pam_deny.so - -session required pam_deny.so diff --git a/package.bak/linux-syscall-support/Config.in b/package.bak/linux-syscall-support/Config.in deleted file mode 100644 index 323dfbd35d..0000000000 --- a/package.bak/linux-syscall-support/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LINUX_SYSCALL_SUPPORT - bool "linux-syscall-support (lss)" - help - This project provides a header file that can be included into - your application whenever you need to make direct system - calls. - - https://chromium.googlesource.com/linux-syscall-support/ diff --git a/package.bak/linux-syscall-support/linux-syscall-support.hash b/package.bak/linux-syscall-support/linux-syscall-support.hash deleted file mode 100644 index 30925522ff..0000000000 --- a/package.bak/linux-syscall-support/linux-syscall-support.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e5088b81011e30b567b6bde6bb7c22ad529c4ee8890cc5e93d58b21f2c4df56a linux-syscall-support-3f6478ac95edf86cd3da300c2c0d34a438f5dbeb.tar.gz diff --git a/package.bak/linux-syscall-support/linux-syscall-support.mk b/package.bak/linux-syscall-support/linux-syscall-support.mk deleted file mode 100644 index 6833a62f13..0000000000 --- a/package.bak/linux-syscall-support/linux-syscall-support.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# linux-syscall-support -# -################################################################################ - -# Use the same version that the one used by Google-breakpad (see DEPS file) -LINUX_SYSCALL_SUPPORT_VERSION = 3f6478ac95edf86cd3da300c2c0d34a438f5dbeb -LINUX_SYSCALL_SUPPORT_SITE = https://chromium.googlesource.com/linux-syscall-support -LINUX_SYSCALL_SUPPORT_SITE_METHOD = git -LINUX_SYSCALL_SUPPORT_LICENSE = BSD-3c -LINUX_SYSCALL_SUPPORT_LICENSE_FILES = linux_syscall_support.h - -# Provide only one header file. -LINUX_SYSCALL_SUPPORT_INSTALL_TARGET = NO -LINUX_SYSCALL_SUPPORT_INSTALL_STAGING = YES - -define LINUX_SYSCALL_SUPPORT_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \ - $(STAGING_DIR)/usr/include/linux_syscall_support.h -endef - -define HOST_LINUX_SYSCALL_SUPPORT_INSTALL_CMDS - $(INSTALL) -D -m 0644 $(@D)/linux_syscall_support.h \ - $(HOST_DIR)/usr/include/linux_syscall_support.h -endef - -$(eval $(host-generic-package)) -$(eval $(generic-package)) diff --git a/package.bak/linux-tools/Config.in b/package.bak/linux-tools/Config.in deleted file mode 100644 index db9ed9f19b..0000000000 --- a/package.bak/linux-tools/Config.in +++ /dev/null @@ -1,86 +0,0 @@ -menu "Linux Kernel Tools" - -# No prompt, this is sourced by linux/Config.in as this -# is no real package and really belongs to the kernel. -config BR2_PACKAGE_LINUX_TOOLS - bool - -config BR2_PACKAGE_LINUX_TOOLS_CPUPOWER - bool "cpupower" - depends on !BR2_bfin # pciutils - depends on BR2_USE_WCHAR || !BR2_NEEDS_GETTEXT # gettext - select BR2_PACKAGE_LINUX_TOOLS - select BR2_PACKAGE_PCIUTILS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - cpupower is a collection of tools to examine and tune power - saving related features of your processor. - -comment "cpupower needs a toolchain w/ wchar" - depends on !BR2_bfin - depends on !BR2_USE_WCHAR && BR2_NEEDS_GETTEXT - -config BR2_PACKAGE_LINUX_TOOLS_GPIO - bool "gpio" - select BR2_PACKAGE_LINUX_TOOLS - help - gpio is a collection of tools to get information about, - control and monitor gpios present on system. - - These tools use new gpio ABI which will deprecate sysfs gpio - interface in the future. - - These tools are available only from kernel version 4.8. - -config BR2_PACKAGE_LINUX_TOOLS_IIO - bool "iio" - select BR2_PACKAGE_LINUX_TOOLS - help - iio is a collection of tools to get information about, - control and monitor iio devices present on system. - - These tools are available only from kernel version 4.7. - -config BR2_PACKAGE_LINUX_TOOLS_PERF - bool "perf" - select BR2_PACKAGE_LINUX_TOOLS - help - perf (sometimes "Perf Events" or perf tools, originally - "Performance Counters for Linux") - is a performance - analyzing tool in Linux, available from kernel version - 2.6.31. User-space controlling utility, called 'perf' has - git-like interface with subcommands. It is capable of - statistical profiling of entire system (both kernel and user - code), single CPU or severals threads. - - This will build and install the userspace 'perf' - command. It is up to the user to ensure that the kernel - configuration has all the suitable options enabled to allow a - proper operation of 'perf'. - - https://perf.wiki.kernel.org/ - -config BR2_PACKAGE_LINUX_TOOLS_SELFTESTS - bool"selftests" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # bash - depends on BR2_USE_MMU # bash - select BR2_PACKAGE_LINUX_TOOLS - select BR2_PACKAGE_BASH # runtime - select BR2_PACKAGE_POPT - select BR2_PACKAGE_LIBCAP_NG - help - Build and install (to /usr/lib/kselftests) kernel selftests. - - Use of this option implies you know the process of using and - compiling the kernel selftests. The Makefile to build and - install these is very noisy and may appear to cause your - build to fail for strange reasons. - - This is very much a use at your risk option and may not work - for every setup or every architecture. - -comment "selftests needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - -endmenu diff --git a/package.bak/linux-tools/linux-tool-cpupower.mk b/package.bak/linux-tools/linux-tool-cpupower.mk deleted file mode 100644 index 9958cff805..0000000000 --- a/package.bak/linux-tools/linux-tool-cpupower.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# cpupower -# -################################################################################ - -LINUX_TOOLS += cpupower - -CPUPOWER_DEPENDENCIES = pciutils $(if $(BR2_NEEDS_GETTEXT),gettext) - -CPUPOWER_MAKE_OPTS = CROSS=$(TARGET_CROSS) \ - CPUFREQ_BENCH=false \ - NLS=false \ - $(if $(BR2_NEEDS_GETTEXT),LDFLAGS=-lintl) \ - DEBUG=false - -define CPUPOWER_BUILD_CMDS - $(Q)if test ! -f $(LINUX_DIR)/tools/power/cpupower/Makefile ; then \ - echo "Your kernel version is too old and does not have the cpupower tool." ; \ - echo "At least kernel 3.4 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ - $(CPUPOWER_MAKE_OPTS) \ - cpupower -endef - -define CPUPOWER_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ - $(CPUPOWER_MAKE_OPTS) \ - DESTDIR=$(STAGING_DIR) \ - cpupower_install -endef - -define CPUPOWER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ - $(CPUPOWER_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - cpupower_install -endef diff --git a/package.bak/linux-tools/linux-tool-gpio.mk b/package.bak/linux-tools/linux-tool-gpio.mk deleted file mode 100644 index ba75ab4c3f..0000000000 --- a/package.bak/linux-tools/linux-tool-gpio.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# gpio -# -################################################################################ - -LINUX_TOOLS += gpio - -GPIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define GPIO_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/gpio/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have the gpio tools." ; \ - echo "At least kernel 4.8 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ - $(GPIO_MAKE_OPTS) \ - gpio -endef - -define GPIO_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools \ - $(GPIO_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - gpio_install -endef diff --git a/package.bak/linux-tools/linux-tool-iio.mk b/package.bak/linux-tools/linux-tool-iio.mk deleted file mode 100644 index 60d6249d2f..0000000000 --- a/package.bak/linux-tools/linux-tool-iio.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# iio -# -################################################################################ - -LINUX_TOOLS += iio - -IIO_MAKE_OPTS = $(LINUX_MAKE_FLAGS) - -define IIO_BUILD_CMDS - $(Q)if ! grep install $(LINUX_DIR)/tools/iio/Makefile >/dev/null 2>&1 ; then \ - echo "Your kernel version is too old and does not have install section in the iio tools." ; \ - echo "At least kernel 4.7 must be used." ; \ - exit 1 ; \ - fi - - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \ - $(IIO_MAKE_OPTS) -endef - -define IIO_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(LINUX_DIR)/tools/iio \ - $(IIO_MAKE_OPTS) \ - INSTALL_ROOT=$(TARGET_DIR) \ - install -endef diff --git a/package.bak/linux-tools/linux-tool-perf.mk b/package.bak/linux-tools/linux-tool-perf.mk deleted file mode 100644 index 16f3a58cc4..0000000000 --- a/package.bak/linux-tools/linux-tool-perf.mk +++ /dev/null @@ -1,134 +0,0 @@ -################################################################################ -# -# perf -# -################################################################################ - -LINUX_TOOLS += perf - -PERF_DEPENDENCIES = host-flex host-bison - -ifeq ($(KERNEL_ARCH),x86_64) -PERF_ARCH=x86 -else -PERF_ARCH=$(KERNEL_ARCH) -endif - -PERF_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ - JOBS=$(PARALLEL_JOBS) \ - ARCH=$(PERF_ARCH) \ - DESTDIR=$(TARGET_DIR) \ - prefix=/usr \ - WERROR=0 \ - NO_LIBAUDIT=1 \ - NO_NEWT=1 \ - NO_GTK2=1 \ - NO_LIBPERL=1 \ - NO_LIBPYTHON=1 \ - NO_LIBBIONIC=1 - -# We need to pass an argument to ld for setting the endianness when -# building it for MIPS architecture, otherwise the default one will -# always be used (which is big endian) and the compilation for little -# endian will always fail showing an error like this one: -# LD foo.o -# mips-linux-gnu-ld: foo.o: compiled for a little endian system and -# target is big endian -ifeq ($(BR2_mips)$(BR2_mips64),y) -PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EB" -else ifeq ($(BR2_mipsel)$(BR2_mips64el),y) -PERF_MAKE_FLAGS += LD="$(TARGET_LD) -EL" -endif - -# The call to backtrace() function fails for ARC, because for some -# reason the unwinder from libgcc returns early. Thus the usage of -# backtrace() should be disabled in perf explicitly: at build time -# backtrace() appears to be available, but it fails at runtime: the -# backtrace will contain only several functions from the top of stack, -# instead of the complete backtrace. -ifeq ($(BR2_arc),y) -PERF_MAKE_FLAGS += NO_BACKTRACE=1 -endif - -ifeq ($(BR2_PACKAGE_SLANG),y) -PERF_DEPENDENCIES += slang -else -PERF_MAKE_FLAGS += NO_SLANG=1 -endif - -ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -PERF_DEPENDENCIES += libunwind -else -PERF_MAKE_FLAGS += NO_LIBUNWIND=1 -endif - -ifeq ($(BR2_PACKAGE_NUMACTL),y) -PERF_DEPENDENCIES += numactl -else -PERF_MAKE_FLAGS += NO_LIBNUMA=1 -endif - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -PERF_DEPENDENCIES += elfutils -else -PERF_MAKE_FLAGS += NO_LIBELF=1 NO_DWARF=1 -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -PERF_DEPENDENCIES += zlib -else -PERF_MAKE_FLAGS += NO_ZLIB=1 -endif - -# lzma is provided by xz -ifeq ($(BR2_PACKAGE_XZ),y) -PERF_DEPENDENCIES += xz -else -PERF_MAKE_FLAGS += NO_LZMA=1 -endif - -# We really do not want to build the perf documentation, because it -# has stringent requirement on the documentation generation tools, -# like xmlto and asciidoc), which may be lagging behind on some -# distributions. -# We name it 'GNUmakefile' so that GNU make will use it instead of -# the existing 'Makefile'. -define PERF_DISABLE_DOCUMENTATION - if [ -f $(LINUX_DIR)/tools/perf/Documentation/Makefile ]; then \ - printf "%%:\n\t@:\n" >$(LINUX_DIR)/tools/perf/Documentation/GNUmakefile; \ - fi -endef -LINUX_POST_PATCH_HOOKS += PERF_DISABLE_DOCUMENTATION - -# O must be redefined here to overwrite the one used by Buildroot for -# out of tree build. We build perf in $(LINUX_DIR)/tools/perf/ and not just -# $(LINUX_DIR) so that it isn't built in the root directory of the kernel -# sources. -define PERF_BUILD_CMDS - $(Q)if test ! -f $(LINUX_DIR)/tools/perf/Makefile ; then \ - echo "Your kernel version is too old and does not have the perf tool." ; \ - echo "At least kernel 2.6.31 must be used." ; \ - exit 1 ; \ - fi - $(Q)if test "$(BR2_PACKAGE_ELFUTILS)" = "" ; then \ - if ! grep -q NO_LIBELF $(LINUX_DIR)/tools/perf/Makefile* ; then \ - if ! test -r $(LINUX_DIR)/tools/perf/config/Makefile ; then \ - echo "The perf tool in your kernel cannot be built without libelf." ; \ - echo "Either upgrade your kernel to >= 3.7, or enable the elfutils package." ; \ - exit 1 ; \ - fi \ - fi \ - fi - $(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \ - -C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/ -endef - -# After installation, we remove the Perl and Python scripts from the -# target. -define PERF_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(PERF_MAKE_FLAGS) \ - -C $(LINUX_DIR)/tools/perf O=$(LINUX_DIR)/tools/perf/ install - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/scripts/ - $(RM) -rf $(TARGET_DIR)/usr/libexec/perf-core/tests/ -endef diff --git a/package.bak/linux-tools/linux-tool-selftests.mk b/package.bak/linux-tools/linux-tool-selftests.mk deleted file mode 100644 index c4e5bf0fea..0000000000 --- a/package.bak/linux-tools/linux-tool-selftests.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# selftests -# -################################################################################ - -LINUX_TOOLS += selftests - -ifeq ($(KERNEL_ARCH),x86_64) -SELFTESTS_ARCH=x86 -else -ifeq ($(KERNEL_ARCH),i386) -SELFTESTS_ARCH=x86 -else -SELFTESTS_ARCH=$(KERNEL_ARCH) -endif -endif - -SELFTESTS_DEPENDENCIES = libcap-ng popt - -SELFTESTS_MAKE_FLAGS = \ - $(LINUX_MAKE_FLAGS) \ - ARCH=$(SELFTESTS_ARCH) - -# O must be redefined here to overwrite the one used by Buildroot for -# out of tree build. We build the selftests in $(LINUX_DIR)/tools/selftests and -# not just $(LINUX_DIR) so that it isn't built in the root directory of the kernel -# sources. -# -# The headers_install step here is important as some kernel selftests use a -# hardcoded CFLAGS to find kernel headers e.g: -# CFLAGS += -I../../../../usr/include/ -# The headers_install target will install the kernel headers locally inside -# the Linux build dir -define SELFTESTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR) $(SELFTESTS_MAKE_FLAGS) \ - headers_install - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/testing/selftests \ - $(SELFTESTS_MAKE_FLAGS) O=$(LINUX_DIR)/tools/testing/selftests -endef - -define SELFTESTS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(LINUX_DIR)/tools/testing/selftests \ - $(SELFTESTS_MAKE_FLAGS) O=$(LINUX_DIR)/tools/testing/selftests \ - INSTALL_PATH=$(TARGET_DIR)/usr/lib/kselftests install -endef diff --git a/package.bak/linux-tools/linux-tools.mk b/package.bak/linux-tools/linux-tools.mk deleted file mode 100644 index 7fa8d194c6..0000000000 --- a/package.bak/linux-tools/linux-tools.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# linux-tools -# -################################################################################ - -# Vampirising sources from the kernel tree, so no source nor site specified. -# Instead, we directly build in the sources of the linux package. We can do -# that, because we're not building in the same location and the same files. -# -# So, all tools refer to $(LINUX_DIR) instead of $(@D). - -# Note: we need individual tools .mk files to be included *before* this one -# to guarantee that each tool has a chance to register itself before we build -# the list of build and install hooks, below. -# -# This is currently guaranteed by the naming of each file: -# - they get included by the top-level Makefile, with $(sort $(wildcard ...)) -# - make's $(sort) function will aways sort in the C locale -# - the files names correctly sort out in the C locale so that each tool's -# .mk file is included before this one. - -# We only need the kernel to be extracted, not actually built -LINUX_TOOLS_PATCH_DEPENDENCIES = linux - -# Install Linux kernel tools in the staging directory since some tools -# may install shared libraries and headers (e.g. cpupower). -LINUX_TOOLS_INSTALL_STAGING = YES - -LINUX_TOOLS_DEPENDENCIES += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $($(call UPPERCASE,$(tool))_DEPENDENCIES))) - -LINUX_TOOLS_POST_BUILD_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_BUILD_CMDS)) - -LINUX_TOOLS_POST_INSTALL_STAGING_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_INSTALL_STAGING_CMDS)) - -LINUX_TOOLS_POST_INSTALL_TARGET_HOOKS += $(foreach tool,$(LINUX_TOOLS),\ - $(if $(BR2_PACKAGE_LINUX_TOOLS_$(call UPPERCASE,$(tool))),\ - $(call UPPERCASE,$(tool))_INSTALL_TARGET_CMDS)) - -$(eval $(generic-package)) diff --git a/package.bak/linux-zigbee/0001-test-serial-Remove-test-serial.patch b/package.bak/linux-zigbee/0001-test-serial-Remove-test-serial.patch deleted file mode 100644 index 8cd9d754c0..0000000000 --- a/package.bak/linux-zigbee/0001-test-serial-Remove-test-serial.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 98187a5238939edc889fdaad93b00628b55d1e08 Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Sat, 3 May 2014 19:43:20 +0200 -Subject: [PATCH] test-serial: Remove test-serial - -This folders only contains python tests scripts which would force us to -enable a dependency to host-python which seems kind of silly since -theses are only tests scripts. - -Signed-off-by: Maxime Hadjinlian ---- - Makefile.am | 2 +- - configure.ac | 6 ------ - 2 files changed, 1 insertion(+), 7 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 265f0d7..e7bb1a1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -2,7 +2,7 @@ include $(top_srcdir)/Makefile.common - - ACLOCAL_AMFLAGS = -I m4 - --SUBDIRS = lib addrdb src tests test-serial -+SUBDIRS = lib addrdb src tests - - include_HEADERS = include/ieee802154.h include/nl802154.h - noinst_HEADERS = include/libcommon.h include/addrdb.h include/logging.h -diff --git a/configure.ac b/configure.ac -index 17658af..506b289 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -77,11 +77,6 @@ AC_PROG_LIBTOOL - AM_PROG_LEX - AC_PROG_YACC - AC_SUBST(LIBTOOL_DEPS) --# Currently the scripts works with python2.x only --# Check for this at first --AC_PATH_PROG(PYTHON, python2 python2.7 python2.6 python2.5 python) --AM_PATH_PYTHON(,, [:]) --py_CHECK_MAJOR_VERSION([PYTHON_VERSION], [2]) - AM_MISSING_PROG(HELP2MAN, help2man, $missing_dir) - - # Checks for libraries. -@@ -135,6 +130,5 @@ AC_CONFIG_FILES([ - addrdb/Makefile - src/Makefile - tests/Makefile -- test-serial/Makefile - ]) - AC_OUTPUT --- -1.9.2 - diff --git a/package.bak/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch b/package.bak/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch deleted file mode 100644 index 0ce4381c18..0000000000 --- a/package.bak/linux-zigbee/0002-addrdb-coord-config-parse.y-add-missing-time.h-inclu.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 8cc60d618f81f2eeaa926cd60ed9b55ee6cda6ea Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 8 Aug 2016 15:42:46 +0200 -Subject: [PATCH] addrdb/coord-config-parse.y: add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The %union definition uses the time_t structure. In order to use this -structure, the header has to be included. Otherwise, the build -breaks with some C libraries, such as musl: - -In file included from coord-config-lex.l:23:0: -coord-config-parse.y:107:2: error: unknown type name ‘time_t’ - time_t timestamp; - ^ - -This patch includes using the '%code requires' directive of -Yacc. - -Signed-off-by: Thomas Petazzoni ---- - addrdb/coord-config-parse.y | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/addrdb/coord-config-parse.y b/addrdb/coord-config-parse.y -index 2e10a88..85ee058 100644 ---- a/addrdb/coord-config-parse.y -+++ b/addrdb/coord-config-parse.y -@@ -102,6 +102,10 @@ - - %} - -+%code requires { -+#include -+} -+ - %union { - unsigned long number; - time_t timestamp; --- -2.7.4 - diff --git a/package.bak/linux-zigbee/Config.in b/package.bak/linux-zigbee/Config.in deleted file mode 100644 index fc21faa441..0000000000 --- a/package.bak/linux-zigbee/Config.in +++ /dev/null @@ -1,56 +0,0 @@ -comment "linux-zigbee needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - -config BR2_PACKAGE_LINUX_ZIGBEE - bool "linux-zigbee" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_LIBNL - help - IEEE 802.15.4 is a standard for communication in small - low-rate wireless personal area networks (WPAN). While - 802.15.4 is a MAC- and PHY- layer standard only, several - common protocols commonly sit on top of it such as ZigBee, - MiWi, and 6LoWPAN. The goal of this project is to create an - implementation of 802.15.4 and several of the protocols - which run on top of it (primarily 6LoWPAN) for Linux. - - It's worth noting that the name linux-zigbee is somewhat of - a misnomer. While this project was originally started to - create a ZigBee implementation for Linux, licensing - restrictions put in place by the ZigBee Alliance make it - impossible for an implementation of ZigBee to ever become - part of the Linux kernel. Once this licensing issue was - discovered, this project's primary focus shifted to IEEE - 802.15.4 and 6LoWPAN. Other higher-layer standards may be - added at a future time. - - The 802.15.4 stack contains kernel components, which are - part of the mainline Linux kernel, and userspace components, - available in this package. - - http://sourceforge.net/apps/trac/linux-zigbee/ - -if BR2_PACKAGE_LINUX_ZIGBEE - -config BR2_PACKAGE_LINUX_ZIGBEE_TESTS - bool "tests programs" - help - Enable this option to install the Linux-ZigBee test programs - to the target. - - -config BR2_PACKAGE_LINUX_ZIGBEE_OLD_KERNEL_COMPAT - bool "compatibility with older kernels" - help - Enable this option to get compatibility of the Linux-ZigBee - userspace tools with old kernels. Recent kernels know the - 802.15.4 line discipline as N_IEEE802154 with the value 25, - but some older kernels had it with the values 22 or 19. - -config BR2_PACKAGE_LINUX_ZIGBEE_LEASEFILE - string "path for persistent lease storage" - default "/var/run/izcoordinator.leases" - -endif diff --git a/package.bak/linux-zigbee/linux-zigbee.mk b/package.bak/linux-zigbee/linux-zigbee.mk deleted file mode 100644 index 1f4197f063..0000000000 --- a/package.bak/linux-zigbee/linux-zigbee.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# linux-zigbee -# -################################################################################ - -LINUX_ZIGBEE_VERSION = v0.3.1 -LINUX_ZIGBEE_SITE = git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee -LINUX_ZIGBEE_LICENSE = GPLv2 -LINUX_ZIGBEE_LICENSE_FILES = COPYING -LINUX_ZIGBEE_DEPENDENCIES = libnl host-pkgconf host-flex host-bison - -# We patch configure.ac/Makefile.am -LINUX_ZIGBEE_AUTORECONF = YES - -LINUX_ZIGBEE_CONF_OPTS = \ - --disable-manpages \ - --with-leasefile="$(call qstrip,$(BR2_PACKAGE_LINUX_ZIGBEE_LEASEFILE))" - -ifeq ($(BR2_PACKAGE_LINUX_ZIGBEE_TESTS),y) -LINUX_ZIGBEE_CONF_OPTS += --with-zbtestdir='/usr/sbin/' -else -LINUX_ZIGBEE_CONF_OPTS += --with-zbtestdir='' -endif - -ifeq ($(BR2_PACKAGE_LINUX_ZIGBEE_OLD_KERNEL_COMPAT),y) -LINUX_ZIGBEE_CONF_OPTS += --enable-kernel-compat -endif - -$(eval $(autotools-package)) diff --git a/package.bak/liquid-dsp/Config.in b/package.bak/liquid-dsp/Config.in deleted file mode 100644 index dca39153bb..0000000000 --- a/package.bak/liquid-dsp/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -comment "liquid-dsp requires a glibc or musl toolchain w/ dynamic library" - depends on !(BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL) || BR2_STATIC_LIBS - -config BR2_PACKAGE_LIQUID_DSP - bool "liquid-dsp" - depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_MUSL - depends on !BR2_STATIC_LIBS - help - Liquid-DSP is a free and open-source signal processing - library for software-defined radios written in C. Its - purpose is to provide a set of extensible DSP modules that - do no rely on external dependencies or cumbersome - frameworks. - - http://liquidsdr.org/ - -if BR2_PACKAGE_LIQUID_DSP - -config BR2_PACKAGE_LIQUID_DSP_FAST - bool "optimize for speed over accuracy" - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - help - Optimize for speed over accuracy. - -endif diff --git a/package.bak/liquid-dsp/liquid-dsp.hash b/package.bak/liquid-dsp/liquid-dsp.hash deleted file mode 100644 index e32d8290ca..0000000000 --- a/package.bak/liquid-dsp/liquid-dsp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d0f050b9d5137c43ba45a35b6c82bc8222eba86f772f4e2e46c91427647bb847 liquid-dsp-1191179b786703b3af20abf7e1404d91099b335d.tar.gz diff --git a/package.bak/liquid-dsp/liquid-dsp.mk b/package.bak/liquid-dsp/liquid-dsp.mk deleted file mode 100644 index 35994137e9..0000000000 --- a/package.bak/liquid-dsp/liquid-dsp.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# liquid-dsp -# -################################################################################ - -LIQUID_DSP_VERSION = 1191179b786703b3af20abf7e1404d91099b335d -LIQUID_DSP_SITE = $(call github,jgaeddert,liquid-dsp,$(LIQUID_DSP_VERSION)) -LIQUID_DSP_LICENSE = MIT -LIQUID_DSP_LICENSE_FILES = LICENSE -LIQUID_DSP_INSTALL_STAGING = YES -LIQUID_DSP_AUTORECONF = YES - -LIQUID_DSP_CONF_ENV = \ - ax_cv_have_mmx_ext=$(if $(BR2_X86_CPU_HAS_MMX),yes,no) \ - ax_cv_have_sse_ext=$(if $(BR2_X86_CPU_HAS_SSE),yes,no) \ - ax_cv_have_sse2_ext=$(if $(BR2_X86_CPU_HAS_SSE2),yes,no) \ - ax_cv_have_sse3_ext=$(if $(BR2_X86_CPU_HAS_SSE3),yes,no) \ - ax_cv_have_ssse3_ext=$(if $(BR2_X86_CPU_HAS_SSSE3),yes,no) \ - ax_cv_have_sse41_ext=$(if $(BR2_X86_CPU_HAS_SSE4),yes,no) \ - ax_cv_have_sse42_ext=$(if $(BR2_X86_CPU_HAS_SSE42),yes,no) \ - ax_cv_have_avx_ext=$(if $(BR2_X86_CPU_HAS_AVX),yes,no) - -LIQUID_DSP_CFLAGS = $(TARGET_CFLAGS) -LIQUID_DSP_LDFLAGS = $(TARGET_LDFLAGS) - -# Speed over accuracy trade off -ifeq ($(BR2_PACKAGE_LIQUID_DSP_FAST),y) -LIQUID_DSP_CFLAGS += -ffast-math -endif - -# use FFTW instead of built-in FFT -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_SINGLE),y) -LIQUID_DSP_LDFLAGS += -lfftw3f -endif - -# disable altivec, it has build issues -ifeq ($(BR2_powerpc)$(BR2_powerpc64)$(BR2_powerpc64le),y) -LIQUID_DSP_CONF_OPTS += --enable-simdoverride -endif - -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_DOUBLE),y) -LIQUID_DSP_LDFLAGS += -lfftw3 -endif - -ifeq ($(BR2_PACKAGE_FFTW_PRECISION_LONG_DOUBLE),y) -LIQUID_DSP_LDFLAGS += -lfftw3l -endif - -LIQUID_DSP_CONF_OPTS += \ - CFLAGS="$(LIQUID_DSP_CFLAGS)" \ - LDFLAGS="$(LIQUID_DSP_LDFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch b/package.bak/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch deleted file mode 100644 index 070aab941c..0000000000 --- a/package.bak/lirc-tools/0001-tools-make_rel_symlink.py-can-also-use-python2.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c861eae83bae3116d330efb3c6061e2de4fdcbce Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 5 Apr 2015 22:26:12 +0300 -Subject: [PATCH] tools: make_rel_symlink.py can also use python2 - -The make_rel_symlink.py script is compatible with both python2 and python3. -Don't hard code a requirement for python3. - -Patch status: sent upstream - -Signed-off-by: Baruch Siach ---- - tools/make_rel_symlink.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py -index 896637ff93e0..ff0403a0397a 100755 ---- a/tools/make_rel_symlink.py -+++ b/tools/make_rel_symlink.py -@@ -1,4 +1,4 @@ --#!/usr/bin/env python3 -+#!/usr/bin/env python - - import os - import os.path --- -2.1.4 - diff --git a/package.bak/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch b/package.bak/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch deleted file mode 100644 index 710dfd3b05..0000000000 --- a/package.bak/lirc-tools/0002-configure-check-for-clock_gettime-in-librt.patch +++ /dev/null @@ -1,54 +0,0 @@ -From e654ae139cec42a6f1b5684261787d0c241cfd3b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 19 Aug 2016 15:25:48 +0200 -Subject: [PATCH] configure: check for clock_gettime in librt - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 3 +++ - daemons/Makefile.am | 2 +- - plugins/Makefile.am | 1 + - 3 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 73340c7..466e638 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,6 +67,9 @@ AC_CHECK_FUNCS(gethostname gettimeofday mkfifo select socket strdup \ - AC_SEARCH_LIBS([dlopen], [dl dld], [], [ - AC_MSG_ERROR([unable to find the dlopen() function]) - ]) -+# glibc < 2.17 needs librt for clock_gettime() -+AC_CHECK_LIB(rt, clock_gettime, LIBCLOCK_GETTIME="-lrt") -+AC_SUBST(LIBCLOCK_GETTIME) - AC_CHECK_FUNCS(daemon) - if test "$ac_cv_func_daemon" != yes; then - daemon="" -diff --git a/daemons/Makefile.am b/daemons/Makefile.am -index 5625627..85a28f3 100644 ---- a/daemons/Makefile.am -+++ b/daemons/Makefile.am -@@ -21,7 +21,7 @@ sbin_PROGRAMS += lircd-uinput - endif - - lircd_SOURCES = lircd.cpp --lircd_LDADD = ../lib/liblirc.la -+lircd_LDADD = ../lib/liblirc.la @LIBCLOCK_GETTIME@ - - lircd_uinput_SOURCES = lircd-uinput.cpp - lircd_uinput_LDADD = ../lib/liblirc.la -diff --git a/plugins/Makefile.am b/plugins/Makefile.am -index ddff01d..45c012a 100644 ---- a/plugins/Makefile.am -+++ b/plugins/Makefile.am -@@ -127,6 +127,7 @@ zotac_la_SOURCES = zotac.c - - plugin_LTLIBRARIES += mplay.la - mplay_la_SOURCES = mplay.c -+mplay_la_LIBADD = @LIBCLOCK_GETTIME@ - endif - - $(srcdir)/pluginlist.am: --- -2.7.4 - diff --git a/package.bak/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/package.bak/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch deleted file mode 100644 index 9fe5256ceb..0000000000 --- a/package.bak/lirc-tools/0003-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 45c590f64dd79e8e1704d5c94ce3456a5cdbfa5f Mon Sep 17 00:00:00 2001 -From: Alec Leamas -Date: Fri, 19 Aug 2016 04:48:02 +0200 -Subject: [PATCH] lircd: Remove use of functions killed in kernel 4.8.0 - -From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE, -LIRC_SETUP_START/LIRC_SETUP_END and several constants related -to initiating filters. Remove corresponding calls from lircd. - -[baruch: move DRVCTL_NOTIFY_DECODE into lircd.cpp] -Signed-off-by: Baruch Siach ---- -Patch status: backported from upstream 31fcc8aa39f62c5c ---- - daemons/lircd.cpp | 53 ++++------------------------------------------------- - 1 file changed, 4 insertions(+), 49 deletions(-) - -diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp -index 782b6d3f8342..d778aa19308b 100644 ---- a/daemons/lircd.cpp -+++ b/daemons/lircd.cpp -@@ -78,6 +78,8 @@ - #define lirc_gid gid_t - #endif - -+#define DRVCTL_NOTIFY_DECODE 7 -+ - #ifdef DARWIN - #include - #define CLOCK_REALTIME 0 -@@ -462,50 +464,6 @@ static int setup_timeout(void) - } - - --static int setup_filter(void) --{ -- int ret1, ret2; -- lirc_t min_pulse_supported = 0, max_pulse_supported = 0; -- lirc_t min_space_supported = 0, max_space_supported = 0; -- -- if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER)) -- return 1; -- if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE, -- &min_pulse_supported) == -1 || -- curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1 -- || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1 -- || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) { -- log_error("could not get filter range"); -- log_perror_err(__func__); -- } -- -- if (setup_min_pulse > max_pulse_supported) -- setup_min_pulse = max_pulse_supported; -- else if (setup_min_pulse < min_pulse_supported) -- setup_min_pulse = 0; /* disable filtering */ -- -- if (setup_min_space > max_space_supported) -- setup_min_space = max_space_supported; -- else if (setup_min_space < min_space_supported) -- setup_min_space = 0; /* disable filtering */ -- -- ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse); -- ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space); -- if (ret1 == -1 || ret2 == -1) { -- if (curr_driver-> -- drvctl_func(LIRC_SET_REC_FILTER, -- setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) { -- log_error("could not set filter"); -- log_perror_err(__func__); -- return 0; -- } -- } -- return 1; --} -- -- -- -- - static int setup_hardware(void) - { - int ret = 1; -@@ -514,10 +472,7 @@ static int setup_hardware(void) - if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER) - || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT) - || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) { -- (void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL); -- ret = setup_frequency() && setup_timeout() -- && setup_filter(); -- (void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL); -+ ret = setup_frequency() && setup_timeout(); - } - } - return ret; -@@ -2162,7 +2117,7 @@ void loop(void) - int reps; - - if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE)) -- curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL); -+ curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL); - - get_release_data(&remote_name, &button_name, &reps); - --- -2.9.3 - diff --git a/package.bak/lirc-tools/Config.in b/package.bak/lirc-tools/Config.in deleted file mode 100644 index 6eaf828817..0000000000 --- a/package.bak/lirc-tools/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_LIRC_TOOLS - bool "lirc-tools" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - # dlopen() - depends on !BR2_STATIC_LIBS - help - LIRC is a package that supports receiving and sending IR - signals of the most common IR remote controls. It contains a - daemon that decodes and sends IR signals, a mouse daemon - that translates IR signals to mouse movements and a couple - of user programs that allow to control your computer with a - remote control. - - It requires the kernel LIRC interface driver, make sure to - enable the kernel drivers to support your hardware. - - http://www.lirc.org/ - -comment "lirc-tools needs a toolchain w/ threads, dynamic library, C++" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/lirc-tools/S25lircd b/package.bak/lirc-tools/S25lircd deleted file mode 100755 index 7a0ec2f627..0000000000 --- a/package.bak/lirc-tools/S25lircd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Start lirc -# -# Support for remotes - Add remotes to /etc/lirc/lircd.conf.d/ -# - -start() { - printf "Starting lirc: " - mkdir -p /var/run/lirc - ln -sf /var/run/lirc/lircd /dev/lircd - start-stop-daemon -b -S -q -m -p /var/run/lirc.pid --exec /usr/sbin/lircd -- -n -O /etc/lirc/lirc_options.conf - echo "OK" -} - -stop() { - printf "Stopping lirc: " - start-stop-daemon -K -q -p /var/run/lirc.pid - echo "OK" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/lirc-tools/lirc-tools.hash b/package.bak/lirc-tools/lirc-tools.hash deleted file mode 100644 index 239c7664d3..0000000000 --- a/package.bak/lirc-tools/lirc-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# hash from http://sourceforge.net/projects/lirc/files/LIRC/0.9.4b/ -sha1 7cb2867de1b486708781413aa33568e0612fb912 lirc-0.9.4b.tar.bz2 -md5 9e3f2869a47bbd7c973dd63f30c13fc2 lirc-0.9.4b.tar.bz2 diff --git a/package.bak/lirc-tools/lirc-tools.mk b/package.bak/lirc-tools/lirc-tools.mk deleted file mode 100644 index bd0f96f337..0000000000 --- a/package.bak/lirc-tools/lirc-tools.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# lirc-tools -# -################################################################################ - -LIRC_TOOLS_VERSION = 0.9.4b -LIRC_TOOLS_SOURCE = lirc-$(LIRC_TOOLS_VERSION).tar.bz2 -LIRC_TOOLS_SITE = http://downloads.sourceforge.net/project/lirc/LIRC/$(LIRC_TOOLS_VERSION) -LIRC_TOOLS_LICENSE = GPLv2+ -LIRC_TOOLS_LICENSE_FILES = COPYING -LIRC_TOOLS_DEPENDENCIES = host-libxslt host-pkgconf host-python3 -LIRC_TOOLS_INSTALL_STAGING = YES -# 0002-configure-check-for-clock_gettime-in-librt.patch -LIRC_TOOLS_AUTORECONF = YES - -LIRC_TOOLS_CONF_ENV = XSLTPROC=yes -LIRC_TOOLS_CONF_OPTS = --without-x - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -LIRC_TOOLS_DEPENDENCIES += udev -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -LIRC_TOOLS_DEPENDENCIES += alsa-lib -endif - -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) -LIRC_TOOLS_DEPENDENCIES += libusb-compat -endif - -ifeq ($(BR2_PACKAGE_PORTAUDIO),y) -LIRC_TOOLS_DEPENDENCIES += portaudio -endif - -define LIRC_TOOLS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/lirc-tools/S25lircd \ - $(TARGET_DIR)/etc/init.d/S25lircd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/lite/0001-dfbspy-stat.patch b/package.bak/lite/0001-dfbspy-stat.patch deleted file mode 100644 index 5ca73691ed..0000000000 --- a/package.bak/lite/0001-dfbspy-stat.patch +++ /dev/null @@ -1,53 +0,0 @@ -From upstream git (git://git.directfb.org/git/directfb/libs/LiTE.git) - -From ffe0ce78327a63ddb1265328ea9b5b03acdca019 Mon Sep 17 00:00:00 2001 -From: Denis Oliver Kropp -Date: Fri, 1 Apr 2011 20:20:26 +0200 -Subject: [PATCH] dfbspy: Build fix for dfbspy example. - ---- - examples/dfbspy.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/examples/dfbspy.c b/examples/dfbspy.c -index 5f36f0b..c7f9725 100644 ---- a/examples/dfbspy.c -+++ b/examples/dfbspy.c -@@ -89,9 +89,9 @@ read_stat( FusionStat *stat, int world ) - - /**************************************************************************************************/ - --#define CALC(x) stat.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) -+#define CALC(x) stats.x = (int)(((s.x - last_stat.x) * 1000 / (float) diff) + 0.5f) - --static FusionStat last_stat, stat; -+static FusionStat last_stat, stats; - static long long last_millis; - - static int -@@ -145,14 +145,14 @@ static const struct { - void (*update)( LiteLabel *label, void *ctx ); - void *ctx; - } list[] = { -- { "lease/purchase", update_number, &stat.lease_purchase }, -- { "cede", update_number, &stat.cede }, -- { "attach", update_number, &stat.attach }, -- { "detach", update_number, &stat.detach }, -- { "ref up", update_number, &stat.ref_up }, -- { "ref down", update_number, &stat.ref_down }, -- { "prevail/swoop", update_number, &stat.prevail_swoop }, -- { "dismiss", update_number, &stat.dismiss } -+ { "lease/purchase", update_number, &stats.lease_purchase }, -+ { "cede", update_number, &stats.cede }, -+ { "attach", update_number, &stats.attach }, -+ { "detach", update_number, &stats.detach }, -+ { "ref up", update_number, &stats.ref_up }, -+ { "ref down", update_number, &stats.ref_down }, -+ { "prevail/swoop", update_number, &stats.prevail_swoop }, -+ { "dismiss", update_number, &stats.dismiss } - }; - - #define NUM_LIST (sizeof(list)/sizeof(list[0])) --- -1.7.6.3 - diff --git a/package.bak/lite/0002-no-tests.patch b/package.bak/lite/0002-no-tests.patch deleted file mode 100644 index 3a47186512..0000000000 --- a/package.bak/lite/0002-no-tests.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/Makefile.in.orig 2008-07-07 13:07:12.000000000 +0200 -+++ b/Makefile.in 2008-07-07 13:07:05.000000000 +0200 -@@ -202,7 +202,7 @@ - target_vendor = @target_vendor@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = data fonts lite leck examples tests -+SUBDIRS = data fonts lite leck examples - EXTRA_DIST = TODO lite.pc.in leck.pc.in - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = lite.pc leck.pc diff --git a/package.bak/lite/0003-pkg-config.patch b/package.bak/lite/0003-pkg-config.patch deleted file mode 100644 index cdd24162c7..0000000000 --- a/package.bak/lite/0003-pkg-config.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 7982cccbb6ad58f3802bb266467290200d130a48 Mon Sep 17 00:00:00 2001 -From: Ville Syrjala -Date: Sat, 27 Nov 2010 01:14:25 +0200 -Subject: [PATCH] Too many '\' characters in the .pc file - ---- - lite.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/lite.pc.in b/lite.pc.in -index 48eb969..3a21eaa 100644 ---- a/lite.pc.in -+++ b/lite.pc.in -@@ -9,4 +9,4 @@ Description: "LiTE" is a Toolkit Engine - Requires: directfb >= @DFB_REQUIRED_VERSION@ - Version: @VERSION@ - Libs: -L${libdir} -llite --Cflags: -I${includedir} -DLITEFONTDIR=\\\"@LITEFONTDIR@\\\" -+Cflags: -I${includedir} -DLITEFONTDIR=\"@LITEFONTDIR@\" --- -1.7.1 - diff --git a/package.bak/lite/Config.in b/package.bak/lite/Config.in deleted file mode 100644 index 62cd21e53d..0000000000 --- a/package.bak/lite/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LITE - bool "LiTE (toolbox engine)" - depends on BR2_PACKAGE_DIRECTFB - help - LiTE stands for LiTE is a Toolbox Engine. - Its role is to facilitate the functions of DirectFB so that a - toolbox could be written on top of DirectFB with less effort. - As such LiTE has abstractions for the underlying graphics and - event systems. - - See http://www.directfb.org/wiki/index.php/LiTE:Architecture diff --git a/package.bak/lite/lite.hash b/package.bak/lite/lite.hash deleted file mode 100644 index 9da6b4b6e6..0000000000 --- a/package.bak/lite/lite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1b784cf595c3d5313e3705db210119f77d48826dbc7fcf6328af83a1270c2264 LiTE-0.8.10.tar.gz diff --git a/package.bak/lite/lite.mk b/package.bak/lite/lite.mk deleted file mode 100644 index 9a1c917425..0000000000 --- a/package.bak/lite/lite.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# lite -# -################################################################################ - -LITE_VERSION = 0.8.10 -LITE_SOURCE = LiTE-$(LITE_VERSION).tar.gz -LITE_SITE = http://www.directfb.org/downloads/Libs -LITE_INSTALL_STAGING = YES -LITE_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install -LITE_CONF_ENV = DFB_CFLAGS=-I$(STAGING_DIR)/usr/include/directfb -LITE_DEPENDENCIES = directfb -LITE_LICENSE = LGPLv2.1+ -LITE_LICENSE_FILES = COPYING - -define LITE_FINALIZE_INSTALL - $(INSTALL) -d $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -d $(TARGET_DIR)/usr/share/fonts/truetype/ - $(INSTALL) -m0644 $(@D)/data/*.png $(TARGET_DIR)/usr/share/LiTE/ - $(INSTALL) -m0644 $(@D)/examples/*.png $(TARGET_DIR)/usr/share/LiTE/examples/ - $(INSTALL) -m0644 $(@D)/fonts/*.ttf $(TARGET_DIR)/usr/share/fonts/truetype/ -endef - -LITE_POST_INSTALL_TARGET_HOOKS += LITE_FINALIZE_INSTALL - -$(eval $(autotools-package)) diff --git a/package.bak/live555/Config.in b/package.bak/live555/Config.in deleted file mode 100644 index 5018296c2e..0000000000 --- a/package.bak/live555/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LIVE555 - bool "live555" - depends on BR2_INSTALL_LIBSTDCPP - help - LIVE555 Streaming Media forms a set of C++ libraries for multimedia - streaming, using open standard protocols (RTP/RTCP, RTSP, SIP). - - http://www.live555.com/liveMedia/ - -comment "live555 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/live555/live555.hash b/package.bak/live555/live555.hash deleted file mode 100644 index 16f7077440..0000000000 --- a/package.bak/live555/live555.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://live555.com/liveMedia/public/live555-latest-md5.txt -md5 df4ad1d60c2f5ae8155fb077bb011ab3 live.2016.03.16.tar.gz -# Locally generated -sha256 6f98a96d4cf6e986c7711f0a2431c02cb807a8107d6715eb491a6ed9d0446cf6 live.2016.03.16.tar.gz diff --git a/package.bak/live555/live555.mk b/package.bak/live555/live555.mk deleted file mode 100644 index f36cce34c1..0000000000 --- a/package.bak/live555/live555.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# live555 -# -################################################################################ - -LIVE555_VERSION = 2016.03.16 -LIVE555_SOURCE = live.$(LIVE555_VERSION).tar.gz -LIVE555_SITE = http://www.live555.com/liveMedia/public -LIVE555_LICENSE = LGPLv2.1+ -LIVE555_LICENSE_FILES = COPYING -LIVE555_INSTALL_STAGING = YES - -LIVE555_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_STATIC_LIBS),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 -LIVE555_CFLAGS += -fPIC -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.$(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 - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) all -endef - -define LIVE555_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) -C $(@D) install -endef - -define LIVE555_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/ljlinenoise/Config.in b/package.bak/ljlinenoise/Config.in deleted file mode 100644 index be83bdba50..0000000000 --- a/package.bak/ljlinenoise/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LJLINENOISE - bool "ljlinenoise" - # run-time dependency only - select BR2_PACKAGE_LJSYSCALL - # ljsyscall is specifically for LuaJIT, not Lua. - depends on BR2_PACKAGE_LUAJIT - help - ljlinenoise is a pure LuaJIT port of linenoise, - a small alternative to readline and libedit. - - http://fperrad.github.io/ljlinenoise/ - -comment "ljlinenoise needs LuaJIT" - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/ljlinenoise/ljlinenoise.hash b/package.bak/ljlinenoise/ljlinenoise.hash deleted file mode 100644 index 7b4a948c52..0000000000 --- a/package.bak/ljlinenoise/ljlinenoise.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a5fa2a88d8232bd0f97d3af9aafe780cd855830b42a9ab87c9ae2a5697b044a1 ljlinenoise-0.1.2-1.src.rock diff --git a/package.bak/ljlinenoise/ljlinenoise.mk b/package.bak/ljlinenoise/ljlinenoise.mk deleted file mode 100644 index aca635885a..0000000000 --- a/package.bak/ljlinenoise/ljlinenoise.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# ljlinenoise -# -################################################################################ - -LJLINENOISE_VERSION_UPSTREAM = 0.1.2 -LJLINENOISE_VERSION = $(LJLINENOISE_VERSION_UPSTREAM)-1 -LJLINENOISE_SUBDIR = ljlinenoise-$(LJLINENOISE_VERSION_UPSTREAM) -LJLINENOISE_LICENSE = MIT -LJLINENOISE_LICENSE_FILES = $(LJLINENOISE_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/ljsyscall/Config.in b/package.bak/ljsyscall/Config.in deleted file mode 100644 index 149e71d3fd..0000000000 --- a/package.bak/ljsyscall/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LJSYSCALL - bool "ljsyscall" - # ljsyscall is specifically for LuaJIT, not Lua. - depends on BR2_PACKAGE_LUAJIT - help - An FFI implementation of the Linux and NetBSD kernel ABIs for LuaJIT. - - http://github.com/justincormack/ljsyscall - -comment "ljsyscall needs LuaJIT" - depends on !BR2_PACKAGE_LUAJIT - diff --git a/package.bak/ljsyscall/ljsyscall.hash b/package.bak/ljsyscall/ljsyscall.hash deleted file mode 100644 index 2d67907ab8..0000000000 --- a/package.bak/ljsyscall/ljsyscall.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9b5ba2b5798c5bc33aa2158f3b44f730de12497c195764aa1bc3d3f1244df198 ljsyscall-v0.10.tar.gz diff --git a/package.bak/ljsyscall/ljsyscall.mk b/package.bak/ljsyscall/ljsyscall.mk deleted file mode 100644 index 1c6c2c111f..0000000000 --- a/package.bak/ljsyscall/ljsyscall.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# ljsyscall -# -################################################################################ - -LJSYSCALL_VERSION = v0.10 -LJSYSCALL_SITE = $(call github,justincormack,ljsyscall,$(LJSYSCALL_VERSION)) -LJSYSCALL_LICENSE = MIT -LJSYSCALL_LICENSE_FILES = COPYRIGHT - -# dispatch all architectures of LuaJIT -ifeq ($(BR2_i386),y) -LJSYSCALL_ARCH = x86 -else ifeq ($(BR2_x86_64),y) -LJSYSCALL_ARCH = x64 -else ifeq ($(BR2_powerpc),y) -LJSYSCALL_ARCH = ppc -else ifeq ($(BR2_arm)$(BR2_armeb),y) -LJSYSCALL_ARCH = arm -else ifeq ($(BR2_mips)$(BR2_mipsel),y) -LJSYSCALL_ARCH = mips -else -LJSYSCALL_ARCH = $(BR2_ARCH) -endif - -LJSYSCALL_TARGET_DIR = $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER) - -define LJSYSCALL_INSTALL_TARGET_CMDS - $(INSTALL) -d $(LJSYSCALL_TARGET_DIR)/syscall - $(INSTALL) -m 0644 -t $(LJSYSCALL_TARGET_DIR)/ $(@D)/syscall.lua - $(INSTALL) -m 0644 -t $(LJSYSCALL_TARGET_DIR)/syscall $(@D)/syscall/*.lua - - $(INSTALL) -d $(LJSYSCALL_TARGET_DIR)/syscall/linux/$(LJSYSCALL_ARCH) - $(INSTALL) -m 0644 -t $(LJSYSCALL_TARGET_DIR)/syscall/linux/ $(@D)/syscall/linux/*.lua - $(INSTALL) -m 0644 -t $(LJSYSCALL_TARGET_DIR)/syscall/linux/$(LJSYSCALL_ARCH) $(@D)/syscall/linux/$(LJSYSCALL_ARCH)/*.lua - - $(INSTALL) -d $(LJSYSCALL_TARGET_DIR)/syscall/shared - $(INSTALL) -m 0644 -t $(LJSYSCALL_TARGET_DIR)/syscall/shared/ $(@D)/syscall/shared/*.lua -endef - -$(eval $(generic-package)) diff --git a/package.bak/lksctp-tools/Config.in b/package.bak/lksctp-tools/Config.in deleted file mode 100644 index 9c95ef5e1c..0000000000 --- a/package.bak/lksctp-tools/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_LKSCTP_TOOLS - bool "lksctp-tools" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # dlopen() - help - The lksctp-tools project provides a Linux user space library - for SCTP (libsctp) including C language header files - (netinet/sctp.h) for accessing SCTP specific application - programming interfaces not provided by the standard sockets, - and also some helper utilities around SCTP. - - http://lksctp.sourceforge.net/ - -comment "lksctp-tools needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/lksctp-tools/lksctp-tools.hash b/package.bak/lksctp-tools/lksctp-tools.hash deleted file mode 100644 index 0ecc8ff0e2..0000000000 --- a/package.bak/lksctp-tools/lksctp-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/lksctp/files/lksctp-tools/ -md5 68e9b8fa4d4e331029b247b72d46d7a5 lksctp-tools-1.0.17.tar.gz -sha1 941b0b5c39e364a971f514bba66120435660e518 lksctp-tools-1.0.17.tar.gz diff --git a/package.bak/lksctp-tools/lksctp-tools.mk b/package.bak/lksctp-tools/lksctp-tools.mk deleted file mode 100644 index a36d6ca96e..0000000000 --- a/package.bak/lksctp-tools/lksctp-tools.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# lksctp-tools -# -################################################################################ - -LKSCTP_TOOLS_VERSION = 1.0.17 -LKSCTP_TOOLS_SITE = http://downloads.sourceforge.net/project/lksctp/lksctp-tools -LKSCTP_TOOLS_INSTALL_STAGING = YES -# configure not shipped -LKSCTP_TOOLS_AUTORECONF = YES -LKSCTP_TOOLS_LICENSE = LGPLv2.1 (library), GPLv2+ (programs) -LKSCTP_TOOLS_LICENSE_FILES = COPYING.lib COPYING -LKSCTP_TOOLS_CONF_OPTS = --disable-tests - -# Cleanup installed target source code -define LKSCTP_TOOLS_CLEANUP_TARGET - rm -rf $(TARGET_DIR)/usr/share/lksctp-tools -endef -LKSCTP_TOOLS_POST_INSTALL_TARGET_HOOKS += LKSCTP_TOOLS_CLEANUP_TARGET - -$(eval $(autotools-package)) diff --git a/package.bak/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch b/package.bak/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch deleted file mode 100644 index d5675d39af..0000000000 --- a/package.bak/lldpd/0001-build-make-generation-of-atom-glue-compatible-with-o.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 106aa50d4e5b336f7dd2d5cf4d882e692d205e91 Mon Sep 17 00:00:00 2001 -From: Vincent Bernat -Date: Sat, 18 Jun 2016 22:18:41 +0200 -Subject: [PATCH] build: make generation of atom-glue compatible with older gcc - versions - -With old versions, cpp doesn't accept several files as input. See #186. - -Signed-off-by: Vivien Didelot ---- - src/lib/Makefile.am | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am -index 250e32a..2a5cdb3 100644 ---- a/src/lib/Makefile.am -+++ b/src/lib/Makefile.am -@@ -20,8 +20,9 @@ nodist_liblldpctl_la_SOURCES = atom-glue.c - liblldpctl_la_LIBADD = $(top_builddir)/src/libcommon-daemon-lib.la libfixedpoint.la - - atom-glue.c: $(ATOM_FILES) Makefile -- $(AM_V_GEN)($(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \ -+ $(AM_V_GEN)(for f in $(ATOM_FILES:%=$(srcdir)/%); do \ -+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \ - $(SED) -n 's+^void init_atom_builder_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \ - sort | \ - $(AWK) '{ atoms[$$2] = 1 } \ -@@ -30,8 +31,9 @@ atom-glue.c: $(ATOM_FILES) Makefile - print " static int init = 0; if (init) return; init++;"; \ - for (atom in atoms) { print " init_atom_builder_"atom"();" } \ - print "}"; }' && \ -+ for f in $(ATOM_FILES:%=$(srcdir)/%); do \ - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $(ATOM_FILES:%=$(srcdir)/%) | \ -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) $$f; done | \ - $(SED) -n 's+^void init_atom_map_\([^(]*\)().*, \([0-9]*\)).*+\2 \1+p' | \ - sort -n | \ - $(AWK) '{ atoms[$$2] = 1 } \ --- -2.9.0 - diff --git a/package.bak/lldpd/0002-configure-do-not-check-for-libbsd.patch b/package.bak/lldpd/0002-configure-do-not-check-for-libbsd.patch deleted file mode 100644 index 4d63274526..0000000000 --- a/package.bak/lldpd/0002-configure-do-not-check-for-libbsd.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 0801a066cd4a24a858ddfa7c62c7802e0f5533a8 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 14 Aug 2016 12:15:17 +0200 -Subject: [PATCH] configure: do not check for libbsd - -libbsd causes build issues because its libbsd-overlay.pc file is borked: -it contains -isystem in CFLAGS, which is not munged by pkgconf, so we -end up using the headers of the build machine, causing all sorts of -hard-to-debug trouble at build time. - -lldpd uses libbsd-overlay for a few helper functions, but has fallbacks -in case it is not available. The only feature that is lost when not using -it is that the neighbour name is no longer displayed in /proc/self/cmdline. -As the author of lldpd said on IRC: "people should survive! ;-)" - -So we just remove the detection of libbsd altogether. - -Fixes: - http://autobuild.buildroot.org/results/6b7/6b70fa379e834ec71cc260ba6af771b531ca3511/ - http://autobuild.buildroot.org/results/769/769074c4bb67336ae6679f2c1cd2a8220d2bec24/ - http://autobuild.buildroot.org/results/c8a/c8a6001f437701ecc75f6c9252935645bda8a8c8/ - [...] - -Signed-off-by: "Yann E. MORIN" ---- - configure.ac | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/configure.ac b/configure.ac -index dd723b0..45498ce 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -165,25 +165,6 @@ AC_FUNC_MALLOC - AC_FUNC_REALLOC - AC_FUNC_FORK - --# Some functions can be in libbsd --PKG_CHECK_MODULES([libbsd], [libbsd-overlay], [ -- _save_CFLAGS="$CFLAGS" -- _save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $libbsd_CFLAGS" -- LIBS="$LIBS $libbsd_LIBS" -- AC_MSG_CHECKING([if libbsd can be linked correctly]) -- AC_LINK_IFELSE([AC_LANG_SOURCE([[int main() { return 0; }]])], -- [ -- AC_MSG_RESULT(yes) -- LLDP_CFLAGS="$LLDP_CFLAGS $libbsd_CFLAGS" -- LLDP_LDFLAGS="$LLDP_LDFLAGS $libbsd_LIBS" -- ],[ -- AC_MSG_RESULT(no) -- CFLAGS="$_save_CFLAGS" -- LIBS="$_save_LIBS" -- ]) --], [:]) -- - # setproctitle may have an _init function - AC_REPLACE_FUNCS([setproctitle]) - AC_CHECK_FUNCS([setproctitle_init]) --- -2.7.4 - diff --git a/package.bak/lldpd/Config.in b/package.bak/lldpd/Config.in deleted file mode 100644 index 9a9517b5b0..0000000000 --- a/package.bak/lldpd/Config.in +++ /dev/null @@ -1,73 +0,0 @@ -config BR2_PACKAGE_LLDPD - bool "lldpd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBEVENT - help - lldpd is a 802.1ab implementation (LLDP) to help you locate - neighbors of all your equipments. - - LLDP allows you to know exactly on which port is a server - (and reciprocally). - - LLDP is an industry standard protocol designed to supplant - proprietary Link-Layer protocols such as EDP or CDP. The - goal of LLDP is to provide an inter-vendor compatible - mechanism to deliver Link-Layer notifications to adjacent - network devices. - - lldpd is an ISC-licensed implementation of LLDP for various - Unixes. It also supports some proprietary protocols. - - https://vincentbernat.github.io/lldpd/ - -if BR2_PACKAGE_LLDPD - -config BR2_PACKAGE_LLDPD_CDP - bool "CDP" - default y - help - Enable Cisco Discovery Protocol - -config BR2_PACKAGE_LLDPD_FDP - bool "FDP" - default y - help - Enable Foundry Discovery Protocol - -config BR2_PACKAGE_LLDPD_EDP - bool "EDP" - default y - help - Enable Extreme Discovery Protocol - -config BR2_PACKAGE_LLDPD_SONMP - bool "SONMP" - default y - help - Enable SynOptics Network Management - -config BR2_PACKAGE_LLDPD_LLDPMED - bool "LLDP-MED" - default y - help - Enable LLDP-MED extension - -config BR2_PACKAGE_LLDPD_DOT1 - bool "DOT1" - default y - help - Enable Dot1 extension (VLAN stuff) - -config BR2_PACKAGE_LLDPD_DOT3 - bool "DOT3" - default y - help - Enable Dot3 extension (PHY stuff) - -config BR2_PACKAGE_LLDPD_CUSTOM_TLV - bool "Custom TLV" - default y - help - Enable Custom TLV support - -endif diff --git a/package.bak/lldpd/S60lldpd b/package.bak/lldpd/S60lldpd deleted file mode 100644 index 3dfa6c1aa1..0000000000 --- a/package.bak/lldpd/S60lldpd +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Controls lldpd. -# - -case $1 in - start) - printf "Starting lldpd: " - start-stop-daemon -S -q -p /var/run/lldpd.pid --exec /usr/sbin/lldpd - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping lldpd: " - start-stop-daemon -K -q -p /var/run/lldpd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac diff --git a/package.bak/lldpd/lldpd.hash b/package.bak/lldpd/lldpd.hash deleted file mode 100644 index fc3d21f487..0000000000 --- a/package.bak/lldpd/lldpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 eb1f5beff2ff5c13c5e0342b5b9da815ed4a63866262445e1168a79ee65c9079 lldpd-0.9.4.tar.gz diff --git a/package.bak/lldpd/lldpd.mk b/package.bak/lldpd/lldpd.mk deleted file mode 100644 index 349c556c14..0000000000 --- a/package.bak/lldpd/lldpd.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# lldpd -# -################################################################################ - -LLDPD_VERSION = 0.9.4 -LLDPD_SITE = http://media.luffy.cx/files/lldpd -LLDPD_DEPENDENCIES = host-pkgconf libevent -LLDPD_LICENSE = ISC -LLDPD_LICENSE_FILES = README.md -# 0002-configure-do-not-check-for-libbsd.patch -LLDPD_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_CHECK),y) -LLDPD_DEPENDENCIES += check -endif - -ifeq ($(BR2_PACKAGE_VALGRIND),y) -LLDPD_DEPENDENCIES += valgrind -endif - -# Detection of c99 support in configure fails without WCHAR. To enable -# automatic detection of c99 support by configure, we need to enable -# WCHAR in toolchain. But actually we do not need WCHAR at lldpd -# runtime. So requesting WCHAR in toolchain just for automatic detection -# will be overkill. To solve this, explicitly -specify c99 here. -LLDPD_CONF_ENV = ac_cv_prog_cc_c99=-std=gnu99 - -LLDPD_CONF_OPTS = \ - --without-readline \ - --without-embedded-libevent \ - --without-snmp \ - --without-xml \ - --without-json \ - --without-seccomp \ - --disable-hardening \ - --disable-privsep \ - $(if $(BR2_PACKAGE_LLDPD_CDP),--enable-cdp,--disable-cdp) \ - $(if $(BR2_PACKAGE_LLDPD_FDP),--enable-fdp,--disable-fdp) \ - $(if $(BR2_PACKAGE_LLDPD_EDP),--enable-edp,--disable-edp) \ - $(if $(BR2_PACKAGE_LLDPD_SONMP),--enable-sonmp,--disable-sonmp) \ - $(if $(BR2_PACKAGE_LLDPD_LLDPMED),--enable-lldpmed,--disable-lldpmed) \ - $(if $(BR2_PACKAGE_LLDPD_DOT1),--enable-dot1,--disable-dot1) \ - $(if $(BR2_PACKAGE_LLDPD_DOT3),--enable-dot3,--disable-dot3) \ - $(if $(BR2_PACKAGE_LLDPD_CUSTOM_TLV),--enable-custom,--disable-custom) - -define LLDPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/lldpd/S60lldpd \ - $(TARGET_DIR)/etc/init.d/S60lldpd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/lm-sensors/0001-static-build.patch b/package.bak/lm-sensors/0001-static-build.patch deleted file mode 100644 index 63edd44f84..0000000000 --- a/package.bak/lm-sensors/0001-static-build.patch +++ /dev/null @@ -1,81 +0,0 @@ -Add support for static only build - -This patch adds support for a BUILD_SHARED_LIB variable that allows to -enable/disable the build of the shared library, in order to support -static-only builds. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -85,6 +85,9 @@ - # Build and install static library - BUILD_STATIC_LIB := 1 - -+# Build and install shared library -+BUILD_SHARED_LIB := 1 -+ - # Set these to add preprocessor or compiler flags, or use - # environment variables - # CFLAGS := -Index: b/lib/Module.mk -=================================================================== ---- a/lib/Module.mk -+++ b/lib/Module.mk -@@ -43,8 +43,14 @@ - LIBSTLIBNAME := libsensors.a - LIBSHSONAME := libsensors.so.$(LIBMAINVER) - -+ifeq ($(BUILD_SHARED_LIB),1) - LIBTARGETS := $(MODULE_DIR)/$(LIBSHLIBNAME) \ - $(MODULE_DIR)/$(LIBSHSONAME) $(MODULE_DIR)/$(LIBSHBASENAME) -+LIBDEP_FOR_PROGS := $(LIBSHBASENAME) -+else -+LIBDEP_FOR_PROGS := $(LIBSTLIBNAME) -+endif -+ - ifeq ($(BUILD_STATIC_LIB),1) - LIBTARGETS += $(MODULE_DIR)/$(LIBSTLIBNAME) - endif -@@ -131,9 +137,11 @@ - ifeq ($(BUILD_STATIC_LIB),1) - $(INSTALL) -m 644 $(LIB_DIR)/$(LIBSTLIBNAME) $(DESTDIR)$(LIBDIR) - endif -+ifeq ($(BUILD_SHARED_LIB),1) - $(INSTALL) -m 755 $(LIB_DIR)/$(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR) - $(LN) $(LIBSHLIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBSHSONAME) - $(LN) $(LIBSHSONAME) $(DESTDIR)$(LIBDIR)/$(LIBSHBASENAME) -+endif - @if [ -z "$(DESTDIR)" -a "$(LIBDIR)" != "/usr/lib" -a "$(LIBDIR)" != "/lib" ] ; then \ - if [ -e "/usr/lib/$(LIBSHSONAME)" -o -e "/usr/lib/$(LIBSHBASENAME)" ] ; then \ - echo '******************************************************************************' ; \ -Index: b/prog/sensord/Module.mk -=================================================================== ---- a/prog/sensord/Module.mk -+++ b/prog/sensord/Module.mk -@@ -41,7 +41,7 @@ - REMOVESENSORDBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(SBINDIR)/%,$(PROGSENSORDTARGETS)) - REMOVESENSORDMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORDMAN8DIR)/%,$(PROGSENSORDMAN8FILES)) - --$(PROGSENSORDTARGETS): $(PROGSENSORDSOURCES:.c=.ro) lib/$(LIBSHBASENAME) -+$(PROGSENSORDTARGETS): $(PROGSENSORDSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS) - $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORDSOURCES:.c=.ro) -Llib -lsensors -lrrd - - all-prog-sensord: $(PROGSENSORDTARGETS) -Index: b/prog/sensors/Module.mk -=================================================================== ---- a/prog/sensors/Module.mk -+++ b/prog/sensors/Module.mk -@@ -39,8 +39,8 @@ - - LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi) - --$(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBSHBASENAME) -- $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -+$(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS) -+ $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -lm - - all-prog-sensors: $(PROGSENSORSTARGETS) - user :: all-prog-sensors diff --git a/package.bak/lm-sensors/0002-no-host-ldconfig.patch b/package.bak/lm-sensors/0002-no-host-ldconfig.patch deleted file mode 100644 index 51f7f6af01..0000000000 --- a/package.bak/lm-sensors/0002-no-host-ldconfig.patch +++ /dev/null @@ -1,29 +0,0 @@ -Remove usage of host ldconfig - -To know whether the libiconv library is available, lm-sensors is using -the host ldconfig, which is obviously wrong in cross-compilation. - -Moreover, the lm-sensors program making use of the iconv_*() API -already does it when __UCLIBC__ is *not* defined. In this case, the -iconv_*() functions are already part of the C library, so there is no -need to link against a separate library. Therefore, this patch simply -removes the libiconv handling. - -Signed-off-by: Thomas Petazzoni - -Index: b/prog/sensors/Module.mk -=================================================================== ---- a/prog/sensors/Module.mk -+++ b/prog/sensors/Module.mk -@@ -37,10 +37,8 @@ - REMOVESENSORSBIN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(BINDIR)/%,$(PROGSENSORSTARGETS)) - REMOVESENSORSMAN := $(patsubst $(MODULE_DIR)/%,$(DESTDIR)$(PROGSENSORSMAN1DIR)/%,$(PROGSENSORSMAN1FILES)) - --LIBICONV := $(shell if /sbin/ldconfig -p | grep -q '/libiconv\.so$$' ; then echo \-liconv; else echo; fi) -- - $(PROGSENSORSTARGETS): $(PROGSENSORSSOURCES:.c=.ro) lib/$(LIBDEP_FOR_PROGS) -- $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) $(LIBICONV) -Llib -lsensors -lm -+ $(CC) $(EXLDFLAGS) -o $@ $(PROGSENSORSSOURCES:.c=.ro) -Llib -lsensors -lm - - all-prog-sensors: $(PROGSENSORSTARGETS) - user :: all-prog-sensors diff --git a/package.bak/lm-sensors/0003-musl-fix-includes.patch b/package.bak/lm-sensors/0003-musl-fix-includes.patch deleted file mode 100644 index 69325abce0..0000000000 --- a/package.bak/lm-sensors/0003-musl-fix-includes.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 6d85773537c9f277ed342f57500f784ccb2c4a3e Mon Sep 17 00:00:00 2001 -From: Brendan Heading -Date: Sun, 30 Aug 2015 22:26:39 +0100 -Subject: [PATCH 1/1] fix compilation under musl - -This patch removes conditional compilation elements that are designed to -support glibc versions earlier than 2.0, which were causing the build -to fail under musl. - -Based on the patch found here : - -http://git.alpinelinux.org/cgit/aports/plain/main/lm_sensors/musl-fix-includes.patch?id=fece1d19448dbd3a56fd8ac70443116187141848 - -This patch has been accepted for integration upstream and should be -present in the next release. See : - -http://www.lm-sensors.org/changeset/6314 - -Signed-off-by: Brendan Heading -Upstream-Status: pending ---- - prog/dump/isadump.c | 6 ------ - prog/dump/isaset.c | 6 ------ - prog/dump/superio.c | 5 ----- - prog/dump/util.c | 5 ----- - 4 files changed, 22 deletions(-) - -diff --git a/prog/dump/isadump.c b/prog/dump/isadump.c -index e031e47..88e4c3b 100644 ---- a/prog/dump/isadump.c -+++ b/prog/dump/isadump.c -@@ -36,13 +36,7 @@ - #include "util.h" - #include "superio.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include --#else --#include --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/isaset.c b/prog/dump/isaset.c -index 1d1bdad..a084c8a 100644 ---- a/prog/dump/isaset.c -+++ b/prog/dump/isaset.c -@@ -32,13 +32,7 @@ - #include - #include "util.h" - -- --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include --#else --#include --#endif - - #ifdef __powerpc__ - unsigned long isa_io_base = 0; /* XXX for now */ -diff --git a/prog/dump/superio.c b/prog/dump/superio.c -index 1af7358..31e0d78 100644 ---- a/prog/dump/superio.c -+++ b/prog/dump/superio.c -@@ -20,12 +20,7 @@ - */ - - #include -- --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include --#else --#include --#endif - - #include "superio.h" - -diff --git a/prog/dump/util.c b/prog/dump/util.c -index 676c339..d8b0927 100644 ---- a/prog/dump/util.c -+++ b/prog/dump/util.c -@@ -11,12 +11,7 @@ - #include - #include "util.h" - --/* To keep glibc2 happy */ --#if defined(__GLIBC__) && __GLIBC__ == 2 && __GLIBC_MINOR__ >= 0 - #include --#else --#include --#endif - - /* Return 1 if we should continue, 0 if we should abort */ - int user_ack(int def) --- -2.4.3 - diff --git a/package.bak/lm-sensors/Config.in b/package.bak/lm-sensors/Config.in deleted file mode 100644 index b035f5d0d5..0000000000 --- a/package.bak/lm-sensors/Config.in +++ /dev/null @@ -1,55 +0,0 @@ -config BR2_PACKAGE_LM_SENSORS - bool "lm-sensors" - help - Lm-sensors is a hardware health monitoring package for - Linux. It allows you to access information from - temperature, voltage, and fan speed sensors. It - works with most newer systems. - - https://hwmon.wiki.kernel.org - -if BR2_PACKAGE_LM_SENSORS -comment "lm-sensors tools" - -config BR2_PACKAGE_LM_SENSORS_SENSORS - bool "sensors" - default y - help - Sensors is used to show the current readings of all sensor - chips. - -config BR2_PACKAGE_LM_SENSORS_FANCONTROL - bool "fancontrol" - help - Script for temperature driven fan control - -config BR2_PACKAGE_LM_SENSORS_ISADUMP - bool "isadump" - help - Isadump is a small helper program to examine registers - visible through the ISA bus. - -config BR2_PACKAGE_LM_SENSORS_ISASET - bool "isaset" - help - Isaset is a small helper program to set register visible - through the ISA bus. - -config BR2_PACKAGE_LM_SENSORS_PWMCONFIG - bool "pwmconfig" - help - Pwmconfig searches your sensors for pulse width modulation (PWM) - controls, and tests each one to see if it controls a fan on - your motherboard. - -config BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT - bool "sensors-detect" - depends on BR2_PACKAGE_PERL - help - Sensors-detect is an interactive program for detecting - available hardware monitoring chips. - -comment "sensors-detect needs perl" - depends on !BR2_PACKAGE_PERL - -endif diff --git a/package.bak/lm-sensors/lm-sensors.hash b/package.bak/lm-sensors/lm-sensors.hash deleted file mode 100644 index eeaa633f46..0000000000 --- a/package.bak/lm-sensors/lm-sensors.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e0579016081a262dd23eafe1d22b41ebde78921e73a1dcef71e05e424340061f lm-sensors_3.4.0.orig.tar.bz2 diff --git a/package.bak/lm-sensors/lm-sensors.mk b/package.bak/lm-sensors/lm-sensors.mk deleted file mode 100644 index c198817881..0000000000 --- a/package.bak/lm-sensors/lm-sensors.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# lm-sensors -# -################################################################################ - -LM_SENSORS_VERSION = 3.4.0 -LM_SENSORS_SOURCE = lm-sensors_$(LM_SENSORS_VERSION).orig.tar.bz2 -LM_SENSORS_SITE = http://snapshot.debian.org/archive/debian/20170208T211941Z/pool/main/l/lm-sensors -LM_SENSORS_INSTALL_STAGING = YES -LM_SENSORS_DEPENDENCIES = host-bison host-flex -LM_SENSORS_LICENSE = LGPLv2.1+ (libsensors), GPLv2+ (programs) -LM_SENSORS_LICENSE_FILES = COPYING.LGPL COPYING - -LM_SENSORS_BINS_ = bin/sensors-conf-convert -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS) += bin/sensors -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_FANCONTROL) += sbin/fancontrol -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISADUMP) += sbin/isadump -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_ISASET) += sbin/isaset -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_PWMCONFIG) += sbin/pwmconfig -LM_SENSORS_BINS_$(BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT) += sbin/sensors-detect - -LM_SENSORS_MAKE_OPTS = \ - BUILD_STATIC_LIB=1 \ - MACHINE=$(KERNEL_ARCH) \ - PREFIX=/usr - -ifeq ($(BR2_STATIC_LIBS),y) -LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=0 -else -LM_SENSORS_MAKE_OPTS += BUILD_SHARED_LIB=1 -endif - -ifeq ($(BR2_SHARED_LIBS),y) -LM_SENSORS_MAKE_OPTS += BUILD_STATIC_LIB=0 -else -LM_SENSORS_MAKE_OPTS += BUILD_STATIC_LIB=1 -endif - -define LM_SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) $(LM_SENSORS_MAKE_OPTS) -C $(@D) -endef - -define LM_SENSORS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - rm -f $(addprefix $(STAGING_DIR)/usr/,$(LM_SENSORS_BINS_) $(LM_SENSORS_BINS_y)) -endef - -define LM_SENSORS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LM_SENSORS_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - rm -f $(addprefix $(TARGET_DIR)/usr/,$(LM_SENSORS_BINS_)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/lmbench/Config.in b/package.bak/lmbench/Config.in deleted file mode 100644 index c4ea5223af..0000000000 --- a/package.bak/lmbench/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LMBENCH - bool "lmbench" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_USE_MMU # fork() - help - LMbench is a suite of simple, portable, - ANSI/C microbenchmarks for UNIX/POSIX. - - http://sourceforge.net/projects/lmbench/ - -comment "lmbench needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) diff --git a/package.bak/lmbench/lmbench.hash b/package.bak/lmbench/lmbench.hash deleted file mode 100644 index b7aaa6ae56..0000000000 --- a/package.bak/lmbench/lmbench.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 cbd5777d15f44eab7666dcac418054c3c09df99826961a397d9acf43d8a2a551 lmbench-3.0-a9.tgz diff --git a/package.bak/lmbench/lmbench.mk b/package.bak/lmbench/lmbench.mk deleted file mode 100644 index b62096d9f8..0000000000 --- a/package.bak/lmbench/lmbench.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# lmbench -# -################################################################################ - -LMBENCH_VERSION = 3.0-a9 -LMBENCH_SOURCE = lmbench-$(LMBENCH_VERSION).tgz -LMBENCH_SITE = http://downloads.sourceforge.net/project/lmbench/development/lmbench-$(LMBENCH_VERSION) -LMBENCH_LICENSE = lmbench license (based on GPLv2) -LMBENCH_LICENSE_FILES = COPYING COPYING-2 - -LMBENCH_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LMBENCH_DEPENDENCIES += host-pkgconf libtirpc -LMBENCH_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -LMBENCH_LDLIBS = `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` -endif - -define LMBENCH_CONFIGURE_CMDS - $(call CONFIG_UPDATE,$(@D)) - sed -i 's/CFLAGS=/CFLAGS+=/g' $(@D)/src/Makefile - sed -i 's/LDLIBS=/LDLIBS+=/g' $(@D)/scripts/build - sed -i '/cd .*doc/d' $(@D)/src/Makefile - sed -i '/include/d' $(@D)/src/Makefile - touch $@ -endef - -# Note: there is a second stage 'make' invocation from the 'scripts/build' -# script. So the variables override below don't take direct effect in -# src/Makefile. -define LMBENCH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(LMBENCH_CFLAGS)" LDLIBS="$(LMBENCH_LDLIBS)" OS=$(ARCH) CC="$(TARGET_CC)" -C $(@D)/src -endef - -define LMBENCH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CFLAGS="$(TARGET_CFLAGS)" OS=$(ARCH) CC="$(TARGET_CC)" BASE=$(TARGET_DIR)/usr -C $(@D)/src install -endef - -$(eval $(generic-package)) diff --git a/package.bak/localedef/localedef.hash b/package.bak/localedef/localedef.hash deleted file mode 100644 index ee14fb16b8..0000000000 --- a/package.bak/localedef/localedef.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9a60f7cdab6fb39adf23a12102f2d950d5f07f0cd7e51e85ec327e07440a79c6 localedef-eglibc-2.14.1-r17443-ptx1.tar.bz2 diff --git a/package.bak/localedef/localedef.mk b/package.bak/localedef/localedef.mk deleted file mode 100644 index 1fe431aac0..0000000000 --- a/package.bak/localedef/localedef.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# localedef -# -################################################################################ - -LOCALEDEF_VERSION = 2.14.1-r17443-ptx1 -LOCALEDEF_SOURCE = localedef-eglibc-$(LOCALEDEF_VERSION).tar.bz2 -LOCALEDEF_SITE = http://www.pengutronix.de/software/ptxdist/temporary-src - -HOST_LOCALEDEF_CONF_OPTS += \ - --prefix=/usr \ - --with-glibc=./eglibc - -HOST_LOCALEDEF_CONF_ENV = CFLAGS="$(HOST_CFLAGS) -fgnu89-inline" - -# The makefile does not implement an install target -define HOST_LOCALEDEF_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/localedef $(HOST_DIR)/usr/bin/localedef -endef - -$(eval $(host-autotools-package)) diff --git a/package.bak/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch b/package.bak/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch deleted file mode 100644 index d5a498a19e..0000000000 --- a/package.bak/lockdev/0001-Makefile-install-static-library-and-headers-separate.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0dcd2368c3e23a5cc1cc4a979d9c241ed9302236 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 4 Jan 2015 16:06:07 +0100 -Subject: [PATCH] Makefile: install static library and headers separately - -Signed-off-by: Romain Naour ---- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index e27dcbd..ecf52d1 100644 ---- a/Makefile -+++ b/Makefile -@@ -45,12 +45,10 @@ perl-lib: static - cd LockDev && make OPTIMIZE="-O2 -g -Wall" - cd LockDev && make test - --.PHONY: install install_dev install_dbg install_doc install_run --install: install_dev install_dbg install_doc install_run -+.PHONY: install install_dev install_dbg install_doc install_run install_static -+install: install_dev install_dbg install_doc install_run install_static - --install_dev: ${static} src/lockdev.h -- install -m755 -d ${libdir} -- install -m644 ${static} ${libdir} -+install_dev: src/lockdev.h - install -m755 -d ${incdir} - install -m644 src/lockdev.h ${incdir} - install -m644 src/ttylock.h ${incdir} -@@ -69,6 +67,10 @@ install_doc: docs/lockdev.3 - install -m755 -d ${mandir}/man3 - install -m644 docs/lockdev.3 ${mandir}/man3 - -+install_static: ${static} -+ install -m755 -d ${libdir} -+ install -m644 ${static} ${libdir} -+ - install_run: ${shared} - install -m755 -d ${libdir} - install -m644 ${shared} ${libdir} --- -1.9.3 - diff --git a/package.bak/lockdev/Config.in b/package.bak/lockdev/Config.in deleted file mode 100644 index 4b386f4ab0..0000000000 --- a/package.bak/lockdev/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LOCKDEV - bool "lockdev" - help - Library for locking devices. - - No upstream site, primary site is Debian. diff --git a/package.bak/lockdev/lockdev.hash b/package.bak/lockdev/lockdev.hash deleted file mode 100644 index bb055e4ade..0000000000 --- a/package.bak/lockdev/lockdev.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev/lockdev_1.0.3-1.6.dsc -sha256 ccae635d7ac3fdd50897eceb250872b3d9a191d298f213e7f0c836910d869f82 lockdev_1.0.3.orig.tar.gz -sha256 a5405c6ee5e97e45eeb1c81330a7e9f444a58bda5e6771fa30007516c115007e lockdev_1.0.3-1.6.diff.gz diff --git a/package.bak/lockdev/lockdev.mk b/package.bak/lockdev/lockdev.mk deleted file mode 100644 index a45e22e733..0000000000 --- a/package.bak/lockdev/lockdev.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# lockdev -# -################################################################################ - -LOCKDEV_VERSION_MAJOR = 1 -LOCKDEV_VERSION = $(LOCKDEV_VERSION_MAJOR).0.3 -LOCKDEV_SOURCE = lockdev_$(LOCKDEV_VERSION).orig.tar.gz -LOCKDEV_PATCH = lockdev_$(LOCKDEV_VERSION)-1.6.diff.gz -LOCKDEV_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockdev -LOCKDEV_LICENSE = LGPLv2.1 -LOCKDEV_LICENSE_FILES = LICENSE -LOCKDEV_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),y) -LOCKDEV_BUILD_ARGS = static -LOCKDEV_INSTALL_ARGS = install_static -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -LOCKDEV_BUILD_ARGS = static shared -LOCKDEV_INSTALL_ARGS = install_run install_static -else # BR2_SHARED_LIBS -LOCKDEV_BUILD_ARGS = shared -LOCKDEV_INSTALL_ARGS = install_run -endif - -# Make the code believe we are using a C library compatible with -# glibc, which for the purpose of lockdev is actually true. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -LOCKDEV_BUILD_ARGS += CFLAGS="$(TARGET_CFLAGS) -D__GNU_LIBRARY__" -endif - -ifeq ($(BR2_SHARED_STATIC_LIBS)$(BR2_SHARED_LIBS),y) -define LOCKDEV_CREATE_LINKS_STAGING - ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so - ln -sf liblockdev.$(LOCKDEV_VERSION).so $(STAGING_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR) -endef - -define LOCKDEV_CREATE_LINKS_TARGET - ln -sf liblockdev.$(LOCKDEV_VERSION).so $(TARGET_DIR)/usr/lib/liblockdev.so.$(LOCKDEV_VERSION_MAJOR) -endef -endif - -define LOCKDEV_BUILD_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(LOCKDEV_BUILD_ARGS) -endef - -define LOCKDEV_INSTALL_STAGING_CMDS - $(MAKE1) basedir=$(STAGING_DIR)/usr -C $(@D) $(LOCKDEV_INSTALL_ARGS) install_dev - $(LOCKDEV_CREATE_LINKS_STAGING) -endef - -define LOCKDEV_INSTALL_TARGET_CMDS - $(MAKE1) basedir=$(TARGET_DIR)/usr -C $(@D) $(LOCKDEV_INSTALL_ARGS) - $(LOCKDEV_CREATE_LINKS_TARGET) -endef - -$(eval $(generic-package)) diff --git a/package.bak/lockfile-progs/0001-sus3v-legacy.patch b/package.bak/lockfile-progs/0001-sus3v-legacy.patch deleted file mode 100644 index 8cf552ef5c..0000000000 --- a/package.bak/lockfile-progs/0001-sus3v-legacy.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /lockfile-progs.orig.c 2007-10-11 10:32:09.000000000 -0300 -+++ /lockfile-progs.c 2007-10-11 10:32:28.000000000 -0300 -@@ -93,7 +93,7 @@ - { NULL, 0, NULL, 0 } - }; - -- char *cmd_name = rindex(argv[0], '/'); -+ char *cmd_name = strrchr(argv[0], '/'); - int mail_cmd_p = 0; - - if(cmd_name != NULL) { diff --git a/package.bak/lockfile-progs/Config.in b/package.bak/lockfile-progs/Config.in deleted file mode 100644 index de101a9a15..0000000000 --- a/package.bak/lockfile-progs/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_LOCKFILE_PROGS - bool "lockfile programs" - select BR2_PACKAGE_LIBLOCKFILE - help - Build lockfile utility programs. diff --git a/package.bak/lockfile-progs/lockfile-progs.hash b/package.bak/lockfile-progs/lockfile-progs.hash deleted file mode 100644 index e628f0cc1e..0000000000 --- a/package.bak/lockfile-progs/lockfile-progs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs/lockfile-progs_0.1.17.dsc -sha256 03fb05d25499532f497775b1747b61fa6beebf12d3bcc951e125349ae166c511 lockfile-progs_0.1.17.tar.gz diff --git a/package.bak/lockfile-progs/lockfile-progs.mk b/package.bak/lockfile-progs/lockfile-progs.mk deleted file mode 100644 index deb9f90812..0000000000 --- a/package.bak/lockfile-progs/lockfile-progs.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# lockfile-progs -# -################################################################################ - -LOCKFILE_PROGS_VERSION = 0.1.17 -LOCKFILE_PROGS_SOURCE = lockfile-progs_$(LOCKFILE_PROGS_VERSION).tar.gz -LOCKFILE_PROGS_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/l/lockfile-progs -LOCKFILE_PROGS_DEPENDENCIES = liblockfile -LOCKFILE_PROGS_LICENSE = GPLv2 -LOCKFILE_PROGS_LICENSE_FILES = COPYING - -LOCKFILE_BINS = \ - $(addprefix lockfile-,check create remove touch) \ - $(addprefix mail-,lock touchlock unlock) - -define LOCKFILE_PROGS_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define LOCKFILE_PROGS_INSTALL_TARGET_CMDS - for i in $(LOCKFILE_BINS); do \ - $(INSTALL) -D -m 755 $(@D)/bin/$$i $(TARGET_DIR)/usr/bin/$$i || exit 1; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/log4cplus/Config.in b/package.bak/log4cplus/Config.in deleted file mode 100644 index 8a112a4e8f..0000000000 --- a/package.bak/log4cplus/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_LOG4CPLUS - bool "log4cplus" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - help - log4cplus is a simple to use C++ logging API providing - thread-safe, flexible, and arbitrarily granular control - over log management and configuration. It is modelled - after the Java log4j API. - - http://sourceforge.net/projects/log4cplus - -comment "log4cplus needs a toolchain w/ C++, wchar, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/log4cplus/log4cplus.hash b/package.bak/log4cplus/log4cplus.hash deleted file mode 100644 index 395e9fe535..0000000000 --- a/package.bak/log4cplus/log4cplus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 999427580cded403b4edc8a85088621f27493c489f08b9f564fb5fe76c16a883 log4cplus-1.1.2.tar.xz diff --git a/package.bak/log4cplus/log4cplus.mk b/package.bak/log4cplus/log4cplus.mk deleted file mode 100644 index 292fa66d49..0000000000 --- a/package.bak/log4cplus/log4cplus.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# log4cplus -# -################################################################################ - -LOG4CPLUS_VERSION = 1.1.2 -LOG4CPLUS_SOURCE = log4cplus-$(LOG4CPLUS_VERSION).tar.xz -LOG4CPLUS_SITE = http://downloads.sourceforge.net/project/log4cplus/log4cplus-stable/$(LOG4CPLUS_VERSION) -LOG4CPLUS_LICENSE = Apache-2.0 -LOG4CPLUS_LICENSE_FILES = LICENSE -LOG4CPLUS_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/log4cpp/0001-Fix-musl-compile.patch b/package.bak/log4cpp/0001-Fix-musl-compile.patch deleted file mode 100644 index f1a13a072c..0000000000 --- a/package.bak/log4cpp/0001-Fix-musl-compile.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 17562259fb6684f351a70b98b4f3b438927ba1aa Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 11 Jul 2016 22:58:31 +0200 -Subject: [PATCH] Fix musl compile. - -Include proper config.h (via log4cpp/Portability.hh) to fix the -evaluate of LOG4CPP_HAVE_STDINT_H in the file tests/Clock.hh - -Fixes: - - Clock.hh:17:13: error: 'int64_t' does not name a type - typedef int64_t usec_t; - -Signed-off-by: Peter Seiderer ---- - log4cpp/tests/Clock.hh | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/log4cpp/tests/Clock.hh b/log4cpp/tests/Clock.hh -index 4bf0ca4..45c6467 100644 ---- a/log4cpp/tests/Clock.hh -+++ b/log4cpp/tests/Clock.hh -@@ -6,6 +6,8 @@ - #ifndef __CLOCK_H - #define __CLOCK_H - -+#include -+ - #ifdef LOG4CPP_HAVE_STDINT_H - #include - #endif // LOG4CPP_HAVE_STDINT_H --- -2.8.1 - diff --git a/package.bak/log4cpp/Config.in b/package.bak/log4cpp/Config.in deleted file mode 100755 index 090bf565f4..0000000000 --- a/package.bak/log4cpp/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LOG4CPP - bool "log4cpp" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Log4cpp is library of C++ classes for flexible logging to - files, syslog, IDSA and other destinations. It is modeled - after the Log4j Java library, staying as close to their API - as is reasonable. - - http://log4cpp.sourceforge.net/ - -comment "log4cpp needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/log4cpp/log4cpp.hash b/package.bak/log4cpp/log4cpp.hash deleted file mode 100755 index 6467aabfd9..0000000000 --- a/package.bak/log4cpp/log4cpp.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/log4cpp/files/log4cpp-1.1.x%20%28new%29/log4cpp-1.1/ -md5 1e173df8ee97205f412ff84aa93b8fbe log4cpp-1.1.1.tar.gz -sha1 23aa5bd7d6f79992c92bad3e1c6d64a34f8fcf68 log4cpp-1.1.1.tar.gz diff --git a/package.bak/log4cpp/log4cpp.mk b/package.bak/log4cpp/log4cpp.mk deleted file mode 100755 index df7109b227..0000000000 --- a/package.bak/log4cpp/log4cpp.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# log4cpp -# -################################################################################ - -LOG4CPP_VERSION_MAJOR = 1.1 -LOG4CPP_VERSION = $(LOG4CPP_VERSION_MAJOR).1 -LOG4CPP_SITE = http://downloads.sourceforge.net/project/log4cpp/log4cpp-1.1.x%20%28new%29/log4cpp-$(LOG4CPP_VERSION_MAJOR) -LOG4CPP_SUBDIR = log4cpp -# The "or later" is indicated in the HTML documentation -LOG4CPP_LICENSE = LGPLv2.1+ -LOG4CPP_LICENSE_FILES = log4cpp/COPYING -LOG4CPP_INSTALL_STAGING = YES -LOG4CPP_CONF_OPTS = --enable-doxygen=no --enable-dot=no - -# The default _CONFIG_SCRIPTS handling does not apply -define LOG4CPP_STAGING_CONFIG_SCRIPT_FIXUP - $(SED) 's,prefix="/usr",prefix="$(STAGING_DIR)/usr",' \ - -e 's,exec_prefix="/usr",prefix="$(STAGING_DIR)/usr",' \ - $(STAGING_DIR)/usr/bin/log4cpp-config -endef - -LOG4CPP_POST_INSTALL_STAGING_HOOKS += LOG4CPP_STAGING_CONFIG_SCRIPT_FIXUP - -define LOG4CPP_TARGET_CONFIG_SCRIPT_REMOVE - $(RM) $(TARGET_DIR)/usr/bin/log4cpp-config -endef - -LOG4CPP_POST_INSTALL_TARGET_HOOKS += LOG4CPP_TARGET_CONFIG_SCRIPT_REMOVE - -$(eval $(autotools-package)) diff --git a/package.bak/log4cxx/0001-charset-fixes.patch b/package.bak/log4cxx/0001-charset-fixes.patch deleted file mode 100644 index 75567fdad1..0000000000 --- a/package.bak/log4cxx/0001-charset-fixes.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix build when iconv support is not available - -When iconv support is not available, the apr-util library does not -provide character set conversion features, and therefore APR_HAS_XLATE -is false. - -However, on Linux !defined(_WIN32) is always true, but the part of the -code that defines the APRCharsetDecoder and APRCharsetEncoder are only -enclosed in a #if APR_HAS_XLATE, without the "|| defined(_WIN32)" -which leads to build failures: the APRCharsetEncoder and -APRCharsetDecoder classes are used without being defined. - -This patch removes the || !defined(_WIN32) so that when iconv support -is not here, we fall back to raising an exception at runtime. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/main/cpp/charsetdecoder.cpp -=================================================================== ---- a/src/main/cpp/charsetdecoder.cpp -+++ b/src/main/cpp/charsetdecoder.cpp -@@ -476,7 +476,7 @@ - StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("ISO-LATIN-1"), LOG4CXX_STR("iso-latin-1"))) { - return new ISOLatinCharsetDecoder(); - } --#if APR_HAS_XLATE || !defined(_WIN32) -+#if APR_HAS_XLATE - return new APRCharsetDecoder(charset); - #else - throw IllegalArgumentException(charset); -Index: b/src/main/cpp/charsetencoder.cpp -=================================================================== ---- a/src/main/cpp/charsetencoder.cpp -+++ b/src/main/cpp/charsetencoder.cpp -@@ -484,7 +484,7 @@ - } else if (StringHelper::equalsIgnoreCase(charset, LOG4CXX_STR("UTF-16LE"), LOG4CXX_STR("utf-16le"))) { - return new UTF16LECharsetEncoder(); - } --#if APR_HAS_XLATE || !defined(_WIN32) -+#if APR_HAS_XLATE - return new APRCharsetEncoder(charset); - #else - throw IllegalArgumentException(charset); diff --git a/package.bak/log4cxx/0002-missing-includes.patch b/package.bak/log4cxx/0002-missing-includes.patch deleted file mode 100644 index dd4da11619..0000000000 --- a/package.bak/log4cxx/0002-missing-includes.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit bcaf1f8a682d641cee325142099c371464fd5946 -Author: Curtis William Arnold -Date: Tue May 20 16:05:37 2008 +0000 - - LOGCXX-286: gcc 4.3 requires #include - - git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@658304 13f79535-47bb-0310-9956-ffa450edef68 - -diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp -index 6a01d8a..a673a10 100755 ---- a/src/examples/cpp/console.cpp -+++ b/src/examples/cpp/console.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; -diff --git a/src/main/cpp/inputstreamreader.cpp b/src/main/cpp/inputstreamreader.cpp -index 52b1c0a..cb45181 100644 ---- a/src/main/cpp/inputstreamreader.cpp -+++ b/src/main/cpp/inputstreamreader.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; -diff --git a/src/main/cpp/socketoutputstream.cpp b/src/main/cpp/socketoutputstream.cpp -index 185f835..c61eb11 100644 ---- a/src/main/cpp/socketoutputstream.cpp -+++ b/src/main/cpp/socketoutputstream.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; diff --git a/package.bak/log4cxx/0003-missing-includes.patch b/package.bak/log4cxx/0003-missing-includes.patch deleted file mode 100644 index cd21bbab3e..0000000000 --- a/package.bak/log4cxx/0003-missing-includes.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit ce62c00ea5f9bf2f0740ecde5b245c9b7edc80ff -Author: Curtis William Arnold -Date: Mon Apr 27 03:53:50 2009 +0000 - - LOGCXX-332: fails to build with gcc 4.4 - - git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@768863 13f79535-47bb-0310-9956-ffa450edef68 - -diff --git a/src/examples/cpp/console.cpp b/src/examples/cpp/console.cpp -index a673a10..f44c944 100755 ---- a/src/examples/cpp/console.cpp -+++ b/src/examples/cpp/console.cpp -@@ -23,6 +23,8 @@ - #include - #include - #include -+#include -+#include - - using namespace log4cxx; - using namespace log4cxx::helpers; diff --git a/package.bak/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch b/package.bak/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch deleted file mode 100644 index a0c9b3f5bd..0000000000 --- a/package.bak/log4cxx/0004-Applied-patch-for-LOGCXX-400-LOGCXX-404-LOGCXX-402-L.patch +++ /dev/null @@ -1,180 +0,0 @@ -From 5b75dfa78b2c5e95296cee0201bc045ef7264ed0 Mon Sep 17 00:00:00 2001 -From: Christian Grobmeier -Date: Tue, 27 Nov 2012 09:39:18 +0000 -Subject: [PATCH] Applied patch for LOGCXX-400 LOGCXX-404 LOGCXX-402 LOGCXX-403 - LOGCXX-401 thanks to Andrew Lazarus - -git-svn-id: https://svn.apache.org/repos/asf/logging/log4cxx/trunk@1414037 13f79535-47bb-0310-9956-ffa450edef68 -Signed-off-by: Peter Korsgaard ---- - pom.xml | 2 ++ - src/main/cpp/locationinfo.cpp | 4 ++-- - src/main/cpp/loggingevent.cpp | 2 +- - src/main/cpp/ndc.cpp | 4 ++-- - src/main/cpp/objectoutputstream.cpp | 4 ++-- - src/main/cpp/transcoder.cpp | 2 +- - src/main/include/log4cxx/helpers/object.h | 6 +++--- - src/main/include/log4cxx/helpers/simpledateformat.h | 4 +++- - src/main/include/log4cxx/logstring.h | 2 +- - 9 files changed, 17 insertions(+), 13 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 3504c8a3..255907bd 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -55,6 +55,7 @@ - - - -+ - - maven-assembly-plugin - -diff --git a/src/main/cpp/locationinfo.cpp b/src/main/cpp/locationinfo.cpp -index e76ea29c..1daa3a5f 100644 ---- a/src/main/cpp/locationinfo.cpp -+++ b/src/main/cpp/locationinfo.cpp -@@ -153,8 +153,8 @@ void LocationInfo::write(ObjectOutputStream& os, Pool& p) const { - 0x61, 0x70, 0x61, 0x63, 0x68, 0x65, 0x2E, 0x6C, - 0x6F, 0x67, 0x34, 0x6A, 0x2E, 0x73, 0x70, 0x69, - 0x2E, 0x4C, 0x6F, 0x63, 0x61, 0x74, 0x69, 0x6F, -- 0x6E, 0x49, 0x6E, 0x66, 0x6F, 0xED, 0x99, 0xBB, -- 0xE1, 0x4A, 0x91, 0xA5, 0x7C, 0x02, 0x00, 0x01, -+ 0x6E, 0x49, 0x6E, 0x66, 0x6F, static_cast(0xED), static_cast(0x99), static_cast(0xBB), -+ static_cast(0xE1), 0x4A, static_cast(0x91), static_cast(0xA5), 0x7C, 0x02, 0x00, 0x01, - 0x4C, 0x00, 0x08, 0x66, 0x75, 0x6C, 0x6C, 0x49, - 0x6E, 0x66, 0x6F, - 0x74, 0x00, 0x12, 0x4C, 0x6A, -diff --git a/src/main/cpp/loggingevent.cpp b/src/main/cpp/loggingevent.cpp -index 1c0d4be7..edbf40b6 100644 ---- a/src/main/cpp/loggingevent.cpp -+++ b/src/main/cpp/loggingevent.cpp -@@ -242,7 +242,7 @@ void LoggingEvent::writeProlog(ObjectOutputStream& os, Pool& p) { - 0x68, 0x65, 0x2E, 0x6C, 0x6F, 0x67, 0x34, 0x6A, - 0x2E, 0x73, 0x70, 0x69, 0x2E, 0x4C, 0x6F, 0x67, - 0x67, 0x69, 0x6E, 0x67, 0x45, 0x76, 0x65, 0x6E, -- 0x74, 0xF3, 0xF2, 0xB9, 0x23, 0x74, 0x0B, 0xB5, -+ 0x74, static_cast(0xF3), static_cast(0xF2), static_cast(0xB9), 0x23, 0x74, 0x0B, static_cast(0xB5), - 0x3F, 0x03, 0x00, 0x0A, 0x5A, 0x00, 0x15, 0x6D, - 0x64, 0x63, 0x43, 0x6F, 0x70, 0x79, 0x4C, 0x6F, - 0x6F, 0x6B, 0x75, 0x70, 0x52, 0x65, 0x71, 0x75, -diff --git a/src/main/cpp/ndc.cpp b/src/main/cpp/ndc.cpp -index 4ab612dd..89788c16 100644 ---- a/src/main/cpp/ndc.cpp -+++ b/src/main/cpp/ndc.cpp -@@ -309,7 +309,7 @@ bool NDC::pop(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - stack.pop(); - data->recycle(); - return true; -@@ -326,7 +326,7 @@ bool NDC::peek(CFStringRef& dst) - Stack& stack = data->getStack(); - if(!stack.empty()) - { -- dst = Transcoder::encode(stack.top().message); -+ dst = Transcoder::encode(getMessage(stack.top())); - return true; - } - data->recycle(); -diff --git a/src/main/cpp/objectoutputstream.cpp b/src/main/cpp/objectoutputstream.cpp -index 7cd696b8..9567a856 100644 ---- a/src/main/cpp/objectoutputstream.cpp -+++ b/src/main/cpp/objectoutputstream.cpp -@@ -36,7 +36,7 @@ ObjectOutputStream::ObjectOutputStream(OutputStreamPtr outputStream, Pool& p) - objectHandle(0x7E0000), - classDescriptions(new ClassDescriptionMap()) - { -- char start[] = { 0xAC, 0xED, 0x00, 0x05 }; -+ char start[] = { static_cast(0xAC), static_cast(0xED), 0x00, 0x05 }; - ByteBuffer buf(start, sizeof(start)); - os->write(buf, p); - } -@@ -85,7 +85,7 @@ void ObjectOutputStream::writeObject(const MDC::Map& val, Pool& p) { - 0x72, 0x00, 0x13, 0x6A, 0x61, 0x76, 0x61, - 0x2E, 0x75, 0x74, 0x69, 0x6C, 0x2E, 0x48, 0x61, - 0x73, 0x68, 0x74, 0x61, 0x62, 0x6C, 0x65, 0x13, -- 0xBB, 0x0F, 0x25, 0x21, 0x4A, 0xE4, 0xB8, 0x03, -+ static_cast(0xBB), 0x0F, 0x25, 0x21, 0x4A, static_cast(0xE4), static_cast(0xB8), 0x03, - 0x00, 0x02, 0x46, 0x00, 0x0A, 0x6C, 0x6F, 0x61, - 0x64, 0x46, 0x61, 0x63, 0x74, 0x6F, 0x72, 0x49, - 0x00, 0x09, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, -diff --git a/src/main/cpp/transcoder.cpp b/src/main/cpp/transcoder.cpp -index d572ffce..32bed844 100644 ---- a/src/main/cpp/transcoder.cpp -+++ b/src/main/cpp/transcoder.cpp -@@ -356,7 +356,7 @@ static void encodeUTF16(unsigned int sv, String& dst) { - unsigned char u = (unsigned char) (sv >> 16); - unsigned char w = (unsigned char) (u - 1); - unsigned short hs = (0xD800 + ((w & 0xF) << 6) + ((sv & 0xFFFF) >> 10)); -- unsigned short ls = (0xDC00 + (sv && 0x3FF)); -+ unsigned short ls = (0xDC00 + (sv & 0x3FF)); - dst.append(1, hs); - dst.append(1, ls); - } -diff --git a/src/main/include/log4cxx/helpers/object.h b/src/main/include/log4cxx/helpers/object.h -index 92d44c55..b9386c47 100644 ---- a/src/main/include/log4cxx/helpers/object.h -+++ b/src/main/include/log4cxx/helpers/object.h -@@ -61,8 +61,8 @@ static const helpers::Class& getStaticClass();\ - static const log4cxx::helpers::ClassRegistration& registerClass(); - - #define IMPLEMENT_LOG4CXX_OBJECT(object)\ --const log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ --const log4cxx::helpers::Class& object::getStaticClass() { \ -+const ::log4cxx::helpers::Class& object::getClass() const { return getStaticClass(); }\ -+const ::log4cxx::helpers::Class& object::getStaticClass() { \ - static Clazz##object theClass; \ - return theClass; \ - } \ -@@ -71,7 +71,7 @@ const log4cxx::helpers::ClassRegistration& object::registerClass() { \ - return classReg; \ - }\ - namespace log4cxx { namespace classes { \ --const log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ -+const ::log4cxx::helpers::ClassRegistration& object##Registration = object::registerClass(); \ - } } - - -diff --git a/src/main/include/log4cxx/helpers/simpledateformat.h b/src/main/include/log4cxx/helpers/simpledateformat.h -index 9c27f685..76fb784c 100644 ---- a/src/main/include/log4cxx/helpers/simpledateformat.h -+++ b/src/main/include/log4cxx/helpers/simpledateformat.h -@@ -29,7 +29,9 @@ - #include - #include - --namespace std { class locale; } -+#include -+ -+using std::locale; - - namespace log4cxx - { -diff --git a/src/main/include/log4cxx/logstring.h b/src/main/include/log4cxx/logstring.h -index 3bbcdf2d..19e8aec7 100644 ---- a/src/main/include/log4cxx/logstring.h -+++ b/src/main/include/log4cxx/logstring.h -@@ -27,7 +27,7 @@ - #include - #include - --#if LOG4CXX_LOGCHAR_IS_WCHAR && LOG4CXX_LOGCHAR_IS_UTF8 && LOG4CXX_LOGCHAR_IS_UNICHAR -+#if (LOG4CXX_LOGCHAR_IS_WCHAR + LOG4CXX_LOGCHAR_IS_UTF8 + LOG4CXX_LOGCHAR_IS_UNICHAR)>1 - #error only one of LOG4CXX_LOGCHAR_IS_WCHAR, LOG4CXX_LOGCHAR_IS_UTF8 or LOG4CXX_LOGCHAR_IS_UNICHAR may be true - #endif - --- -2.11.0 - diff --git a/package.bak/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch b/package.bak/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch deleted file mode 100644 index b3f43bfd7c..0000000000 --- a/package.bak/log4cxx/0005-domtestcase.cpp-fix-narrowing-conversion-compile-err.patch +++ /dev/null @@ -1,36 +0,0 @@ -From afc191aec355619d6ebabb2cad660a5a8ad4569b Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 30 Jan 2017 23:13:43 +0100 -Subject: [PATCH] domtestcase.cpp: fix narrowing conversion compile error with - gcc 6+ / signed char - -Signed-off-by: Peter Korsgaard ---- - src/test/cpp/xml/domtestcase.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/test/cpp/xml/domtestcase.cpp b/src/test/cpp/xml/domtestcase.cpp -index ad276d1a..2a1e6e2e 100644 ---- a/src/test/cpp/xml/domtestcase.cpp -+++ b/src/test/cpp/xml/domtestcase.cpp -@@ -190,7 +190,7 @@ public: - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase3.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with a superscript 3") - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xC2, 0xB3, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xC2), static_cast(0xB3), 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xB3, 0 }; - #endif -@@ -209,7 +209,7 @@ public: - DOMConfigurator::configure(LOG4CXX_TEST_STR("input/xml/DOMTestCase4.xml")); - LOG4CXX_INFO(logger, "File name is expected to end with an ideographic 4") - #if LOG4CXX_LOGCHAR_IS_UTF8 -- const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0xE3, 0x86, 0x95, 0 }; -+ const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, static_cast(0xE3), static_cast(0x86), static_cast(0x95), 0 }; - #else - const logchar fname[] = { 0x6F, 0x75, 0x74, 0x70, 0x75, 0x74, 0x2F, 0x64, 0x6F, 0x6D, 0x3195, 0 }; - #endif --- -2.11.0 - diff --git a/package.bak/log4cxx/Config.in b/package.bak/log4cxx/Config.in deleted file mode 100644 index 6ec67b62ef..0000000000 --- a/package.bak/log4cxx/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_LOG4CXX - bool "log4cxx" - select BR2_PACKAGE_APR - select BR2_PACKAGE_APR_UTIL - # apr really needs shared library support - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # apr - help - Apache log4cxx is a logging framework for C++ patterned - after Apache log4j. - - https://logging.apache.org/log4cxx/ - -comment "log4cxx needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/log4cxx/log4cxx.hash b/package.bak/log4cxx/log4cxx.hash deleted file mode 100644 index 469d99af02..0000000000 --- a/package.bak/log4cxx/log4cxx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0de0396220a9566a580166e66b39674cb40efd2176f52ad2c65486c99c920c8c apache-log4cxx-0.10.0.tar.gz diff --git a/package.bak/log4cxx/log4cxx.mk b/package.bak/log4cxx/log4cxx.mk deleted file mode 100644 index 7d7e2e9bb2..0000000000 --- a/package.bak/log4cxx/log4cxx.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# log4cxx -# -################################################################################ - -LOG4CXX_VERSION = 0.10.0 -LOG4CXX_SITE = http://archive.apache.org/dist/logging/log4cxx/$(LOG4CXX_VERSION) -LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz -LOG4CXX_INSTALL_STAGING = YES -LOG4CXX_LICENSE = Apache-2.0 -LOG4CXX_LICENSE_FILES = LICENSE - -LOG4CXX_CONF_OPTS = \ - --with-apr=$(STAGING_DIR)/usr/bin/apr-1-config \ - --with-apr-util=$(STAGING_DIR)/usr/bin/apu-1-config \ - --disable-dot \ - --disable-doxygen \ - --disable-html-docs - -LOG4CXX_DEPENDENCIES = apr apr-util - -$(eval $(autotools-package)) diff --git a/package.bak/logrotate/Config.in b/package.bak/logrotate/Config.in deleted file mode 100644 index 8528361b12..0000000000 --- a/package.bak/logrotate/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LOGROTATE - bool "logrotate" - select BR2_PACKAGE_POPT - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - help - A simple program to rotate logs. - - https://fedorahosted.org/logrotate/ - -comment "logrotate needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/logrotate/logrotate.conf b/package.bak/logrotate/logrotate.conf deleted file mode 100644 index 6d829dc9d2..0000000000 --- a/package.bak/logrotate/logrotate.conf +++ /dev/null @@ -1,14 +0,0 @@ -compress - -include /etc/logrotate.d - -/var/log/messages /var/log/auth.log /var/log/user.log { - rotate 7 - daily - delaycompress - missingok - sharedscripts - postrotate - /usr/bin/killall -HUP syslogd - endscript -} diff --git a/package.bak/logrotate/logrotate.hash b/package.bak/logrotate/logrotate.hash deleted file mode 100644 index 4985a17a87..0000000000 --- a/package.bak/logrotate/logrotate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 62aa0229cfd34c7b6ea6a6736d569983bf4a3dd1f3c9e9c2efe2ffe2a0a55cf2 logrotate-3.11.0.tar.gz diff --git a/package.bak/logrotate/logrotate.mk b/package.bak/logrotate/logrotate.mk deleted file mode 100644 index 5fd779e644..0000000000 --- a/package.bak/logrotate/logrotate.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# logrotate -# -################################################################################ - -LOGROTATE_VERSION = 3.11.0 -LOGROTATE_SITE = $(call github,logrotate,logrotate,$(LOGROTATE_VERSION)) -LOGROTATE_LICENSE = GPLv2+ -LOGROTATE_LICENSE_FILES = COPYING -LOGROTATE_DEPENDENCIES = popt host-pkgconf -# tarball does not have a generated configure script -LOGROTATE_AUTORECONF = YES -LOGROTATE_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -LOGROTATE_CONF_OPTS += --with-selinux -LOGROTATE_DEPENDENCIES += libselinux -else -LOGROTATE_CONF_OPTS += --without-selinux -endif - -ifeq ($(BR2_PACKAGE_ACL),y) -LOGROTATE_DEPENDENCIES += acl -LOGROTATE_CONF_OPTS += --with-acl -else -LOGROTATE_CONF_OPTS += --without-acl -endif - -define LOGROTATE_INSTALL_TARGET_CONF - $(INSTALL) -m 0644 package/logrotate/logrotate.conf $(TARGET_DIR)/etc/logrotate.conf - $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/logrotate.d -endef -LOGROTATE_POST_INSTALL_TARGET_HOOKS += LOGROTATE_INSTALL_TARGET_CONF - -$(eval $(autotools-package)) diff --git a/package.bak/logsurfer/Config.in b/package.bak/logsurfer/Config.in deleted file mode 100644 index d4218bce7e..0000000000 --- a/package.bak/logsurfer/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LOGSURFER - bool "logsurfer" - depends on BR2_USE_MMU # fork() - help - Logsurfer is a program for monitoring system logs in real-time, - and reporting on the occurrence of events. - - http://www.crypt.gen.nz/logsurfer/ diff --git a/package.bak/logsurfer/logsurfer.hash b/package.bak/logsurfer/logsurfer.hash deleted file mode 100644 index 2c14078f76..0000000000 --- a/package.bak/logsurfer/logsurfer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 74a36e8530a884031b4ae2344a46b9aaa07a1ee36d143802f6b64f817c5bd1af logsurfer-1.8.tar.gz diff --git a/package.bak/logsurfer/logsurfer.mk b/package.bak/logsurfer/logsurfer.mk deleted file mode 100644 index 8eb9dc8f8a..0000000000 --- a/package.bak/logsurfer/logsurfer.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# logsurfer -# -################################################################################ - -LOGSURFER_VERSION = 1.8 -LOGSURFER_SITE = http://downloads.sourceforge.net/project/logsurfer/logsurfer/logsurfer-$(LOGSURFER_VERSION) - -define LOGSURFER_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/logsurfer \ - $(TARGET_DIR)/usr/bin/logsurfer -endef - -$(eval $(autotools-package)) diff --git a/package.bak/lpc3250loader/Config.in.host b/package.bak/lpc3250loader/Config.in.host deleted file mode 100644 index 9371f13430..0000000000 --- a/package.bak/lpc3250loader/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_LPC3250LOADER - bool "host lpc3250loader" - help - lpc3250loader is a tool to load/burn programs (in particular kickstart - and S1L) on an LPC3250 platform. - - https://github.com/alexandrebelloni/lpc3250loader diff --git a/package.bak/lpc3250loader/lpc3250loader.hash b/package.bak/lpc3250loader/lpc3250loader.hash deleted file mode 100644 index 4f9dbc4e04..0000000000 --- a/package.bak/lpc3250loader/lpc3250loader.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 267de7541c92e5b007b93c660a41188976d531a3757f4ffd9b7142d3994da7d1 lpc3250loader-1.0.tar.gz diff --git a/package.bak/lpc3250loader/lpc3250loader.mk b/package.bak/lpc3250loader/lpc3250loader.mk deleted file mode 100644 index 042e364f12..0000000000 --- a/package.bak/lpc3250loader/lpc3250loader.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# lpc3250loader -# -################################################################################ - -HOST_LPC3250LOADER_VERSION = 1.0 -HOST_LPC3250LOADER_SITE = $(call github,alexandrebelloni,lpc3250loader,$(HOST_LPC3250LOADER_VERSION)) -LPC3250LOADER_LICENSE = GPLv2+ -LPC3250LOADER_LICENSE_FILES = LPC3250loader.py - -define HOST_LPC3250LOADER_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/LPC3250loader.py \ - $(HOST_DIR)/usr/bin/LPC3250loader.py -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/lpeg/Config.in b/package.bak/lpeg/Config.in deleted file mode 100644 index 957991d416..0000000000 --- a/package.bak/lpeg/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LPEG - bool "lpeg" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - LPeg is a new pattern-matching library for Lua, - based on Parsing Expression Grammars (PEGs). - - http://www.inf.puc-rio.br/~roberto/lpeg/lpeg.html diff --git a/package.bak/lpeg/lpeg.hash b/package.bak/lpeg/lpeg.hash deleted file mode 100644 index 50e66d1204..0000000000 --- a/package.bak/lpeg/lpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e70c7cf8d7b8feddd8a41235d0ebb27bb60fbe7f31c8364ad23ee30a7f0cc26e lpeg-1.0.0-1.src.rock diff --git a/package.bak/lpeg/lpeg.mk b/package.bak/lpeg/lpeg.mk deleted file mode 100644 index 0754f00d60..0000000000 --- a/package.bak/lpeg/lpeg.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# lpeg -# -################################################################################ - -LPEG_VERSION = 1.0.0-1 -LPEG_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/lpty/Config.in b/package.bak/lpty/Config.in deleted file mode 100644 index 50cbd2548a..0000000000 --- a/package.bak/lpty/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LPTY - bool "lpty" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - A simple facility for lua to control other programs via - PTYs. - - http://www.tset.de/lpty/ diff --git a/package.bak/lpty/lpty.hash b/package.bak/lpty/lpty.hash deleted file mode 100644 index a451fd8580..0000000000 --- a/package.bak/lpty/lpty.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cf263ece9b50a78a7fb2277e3546fbbf0bf6858f41821932d92f2e3d8a065091 lpty-1.0.1-1.src.rock diff --git a/package.bak/lpty/lpty.mk b/package.bak/lpty/lpty.mk deleted file mode 100644 index 963ab61103..0000000000 --- a/package.bak/lpty/lpty.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lpty -# -################################################################################ - -LPTY_VERSION_UPSTREAM = 1.0.1 -LPTY_VERSION = $(LPTY_VERSION_UPSTREAM)-1 -LPTY_SUBDIR = lpty-$(LPTY_VERSION) -LPTY_LICENSE = MIT -LPTY_LICENSE_FILES = $(LPTY_SUBDIR)/doc/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/lrandom/Config.in b/package.bak/lrandom/Config.in deleted file mode 100644 index 64bcf0ce01..0000000000 --- a/package.bak/lrandom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LRANDOM - bool "lrandom" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - A library for generating random numbers - based on the Mersenne Twister - - http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lrandom diff --git a/package.bak/lrandom/lrandom.hash b/package.bak/lrandom/lrandom.hash deleted file mode 100644 index 3f601330c6..0000000000 --- a/package.bak/lrandom/lrandom.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 96fbc56beb0efca20253301915e14ba25150e2b09541ea7a3570e0def624b196 lrandom-20120430.51-1.src.rock -sha256 480a6cf11caaba99290ff30cd6e854ac9dce61e38b9d9caf5498165f7fb93454 lrandom-20120430.52-1.src.rock diff --git a/package.bak/lrandom/lrandom.mk b/package.bak/lrandom/lrandom.mk deleted file mode 100644 index 09b62c94a5..0000000000 --- a/package.bak/lrandom/lrandom.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# lrandom -# -################################################################################ - -ifeq ($(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUA_5_3),y) -LRANDOM_VERSION = 20120430.52-1 -else -LRANDOM_VERSION = 20120430.51-1 -endif -LRANDOM_SUBDIR = random -LRANDOM_LICENSE = Public domain - -$(eval $(luarocks-package)) diff --git a/package.bak/lrzsz/Config.in b/package.bak/lrzsz/Config.in deleted file mode 100644 index 1b5da14871..0000000000 --- a/package.bak/lrzsz/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LRZSZ - bool "lrzsz" - # It could technically build in a static-only environment, but - # it unconditionally redefines the error() and error_at_line() - # functions, which clashes with the definition from - # uClibc. Since the autotools packaging dates back from 1998, - # lots of work is needed to fix it, and do some proper tests - # on the availability of such functions. - depends on !BR2_STATIC_LIBS - help - Portable and fast implementation of the X/Y/Zmodem protocols. - - http://www.ohse.de/uwe/software/lrzsz.html - -comment "lrzsz needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/lrzsz/lrzsz.hash b/package.bak/lrzsz/lrzsz.hash deleted file mode 100644 index 932832d58b..0000000000 --- a/package.bak/lrzsz/lrzsz.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c28b36b14bddb014d9e9c97c52459852f97bd405f89113f30bee45ed92728ff1 lrzsz-0.12.20.tar.gz diff --git a/package.bak/lrzsz/lrzsz.mk b/package.bak/lrzsz/lrzsz.mk deleted file mode 100644 index a283dd1a30..0000000000 --- a/package.bak/lrzsz/lrzsz.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# lrzsz -# -################################################################################ - -LRZSZ_VERSION = 0.12.20 -LRZSZ_SITE = http://www.ohse.de/uwe/releases -LRZSZ_CONF_OPTS = --disable-timesync -LRZSZ_LICENSE = GPLv2+ -LRZSZ_LICENSE_FILES = COPYING - -define LRZSZ_POST_CONFIGURE_HOOKS - $(SED) "s/-lnsl//;" $(@D)/src/Makefile - $(SED) "s~\(#define ENABLE_SYSLOG.*\)~/* \1 */~;" $(@D)/config.h -endef - -define LRZSZ_BUILD_HOOKS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" prefix="$(TARGET_DIR)" -C $(@D) -endef - -define LRZSZ_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/lrz $(TARGET_DIR)/usr/bin/rz - $(INSTALL) -m 0755 -D $(@D)/src/lsz $(TARGET_DIR)/usr/bin/sz - ln -sf rz $(TARGET_DIR)/usr/bin/lrz - ln -sf sz $(TARGET_DIR)/usr/bin/lsz -endef - -$(eval $(autotools-package)) diff --git a/package.bak/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch b/package.bak/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch deleted file mode 100644 index 7720124369..0000000000 --- a/package.bak/lshw/0001-Makefile-allow-to-pass-additional-LIBS.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5af98ca8135ac411364b16720d795224a9b4a178 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 30 Jul 2016 15:15:14 +0200 -Subject: [PATCH] Makefile: allow to pass additional LIBS - -We need to be able to pass extra LIBS when our toolchain lacks NLS -support, this way we can build libintl and link to it. A good example -is uClibc with locale support disabled. - -Signed-off-by: Gustavo Zacarias ---- - src/Makefile | 2 +- - src/gui/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index b50586b..acbdbfa 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -30,7 +30,7 @@ ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed - endif - LDSTATIC=-static --LIBS=-llshw -lresolv -+LIBS+=-llshw -lresolv - ifeq ($(SQLITE), 1) - LIBS+= $(shell pkg-config --libs sqlite3) - endif -diff --git a/src/gui/Makefile b/src/gui/Makefile -index 332ce57..7f72e3f 100644 ---- a/src/gui/Makefile -+++ b/src/gui/Makefile -@@ -11,7 +11,7 @@ INCLUDES=-I../core $(GTKINCLUDES) - CXXFLAGS=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS) - CFLAGS=$(CXXFLAGS) $(DEFINES) - GTKLIBS=$(shell pkg-config gtk+-2.0 gmodule-2.0 --libs) --LIBS=-L../core -llshw -lresolv $(GTKLIBS) -+LIBS+=-L../core -llshw -lresolv $(GTKLIBS) - LDFLAGS= - ifneq ($(shell $(LD) --help 2| grep -- --as-needed), ) - LDFLAGS+= -Wl,--as-needed --- -2.7.4 - diff --git a/package.bak/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch b/package.bak/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch deleted file mode 100644 index d80c62a120..0000000000 --- a/package.bak/lshw/0002-Fix-musl-build-basename-is-in-libgen.h.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 016bdb133a44bdf42c268ff72ee7aa04af19cfd3 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sat, 27 Aug 2016 01:11:56 +0200 -Subject: [PATCH] Fix musl build: basename() is in libgen.h. - -Also, its argument is not const, so add const_cast. This is risky -because in fact basename() will modify the argument if it ends with / -but that's not the case here. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - src/core/dasd.cc | 1 + - src/core/sysfs.cc | 9 +++++---- - 2 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/src/core/dasd.cc b/src/core/dasd.cc -index 626b8a8..6276101 100644 ---- a/src/core/dasd.cc -+++ b/src/core/dasd.cc -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - using namespace std; - -diff --git a/src/core/sysfs.cc b/src/core/sysfs.cc -index acc9d00..bdd69e3 100644 ---- a/src/core/sysfs.cc -+++ b/src/core/sysfs.cc -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - __ID("@(#) $Id$"); - -@@ -99,7 +100,7 @@ static string sysfs_getbustype(const string & path) - { - devname = - string(fs.path + "/bus/") + string(namelist[i]->d_name) + -- "/devices/" + basename(path.c_str()); -+ "/devices/" + basename(const_cast(path.c_str())); - - if (samefile(devname, path)) - return string(namelist[i]->d_name); -@@ -139,7 +140,7 @@ static string sysfstobusinfo(const string & path) - - if (bustype == "virtio") - { -- string name = basename(path.c_str()); -+ string name = basename(const_cast(path.c_str())); - if (name.compare(0, 6, "virtio") == 0) - return "virtio@" + name.substr(6); - else -@@ -207,7 +208,7 @@ string entry::driver() const - string driverlink = This->devpath + "/driver"; - if (!exists(driverlink)) - return ""; -- return basename(readlink(driverlink).c_str()); -+ return basename(const_cast(readlink(driverlink).c_str())); - } - - -@@ -288,7 +289,7 @@ string entry::name_in_class(const string & classname) const - - string entry::name() const - { -- return basename(This->devpath.c_str()); -+ return basename(const_cast(This->devpath.c_str())); - } - - --- -2.9.3 - diff --git a/package.bak/lshw/0003-Fix-use-of-LONG_BIT.patch b/package.bak/lshw/0003-Fix-use-of-LONG_BIT.patch deleted file mode 100644 index 7d8d739452..0000000000 --- a/package.bak/lshw/0003-Fix-use-of-LONG_BIT.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 50284ac4400ac3d7562f4765726492caee8ff547 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sat, 27 Aug 2016 01:15:13 +0200 -Subject: [PATCH] Fix use of LONG_BIT - -LONG_BIT is not a sysconf value, it is either 32 or 64. Using it as -a sysconf value will give weird results. - -Originally it was sysconf(_SC_LONG_BIT) (before it was "fixed" by the -gentoo guys). But this is useless: it will always return a value -equal to LONG_BIT: it's either compiled 32-bit or 64-bit so a runtime -lookup doesn't make sense. For this reason, musl has removed the -definition of _SC_LONG_BIT. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - src/core/abi.cc | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/core/abi.cc b/src/core/abi.cc -index 76e5082..a13daaa 100644 ---- a/src/core/abi.cc -+++ b/src/core/abi.cc -@@ -19,8 +19,7 @@ __ID("@(#) $Id: mem.cc 1352 2006-05-27 23:54:13Z ezix $"); - - bool scan_abi(hwNode & system) - { -- // are we compiled as 32- or 64-bit process ? -- system.setWidth(sysconf(LONG_BIT)); -+ system.setWidth(LONG_BIT); - - pushd(PROC_SYS); - --- -2.9.3 - diff --git a/package.bak/lshw/Config.in b/package.bak/lshw/Config.in deleted file mode 100644 index 8cc935ab4d..0000000000 --- a/package.bak/lshw/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LSHW - bool "lshw" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - lshw (Hardware Lister) is a small tool to provide - detailed information on the hardware configuration of the machine. - - http://ezix.org/project/wiki/HardwareLiSter - -comment "lshw needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package.bak/lshw/lshw.hash b/package.bak/lshw/lshw.hash deleted file mode 100644 index 0694229cf5..0000000000 --- a/package.bak/lshw/lshw.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ae22ef11c934364be4fd2a0a1a7aadf4495a0251ec6979da280d342a89ca3c2f lshw-B.02.18.tar.gz diff --git a/package.bak/lshw/lshw.mk b/package.bak/lshw/lshw.mk deleted file mode 100644 index 32c0bc0d69..0000000000 --- a/package.bak/lshw/lshw.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# lshw -# -################################################################################ - -LSHW_VERSION = B.02.18 -LSHW_SITE = http://ezix.org/software/files -LSHW_LICENSE = GPLv2 -LSHW_LICENSE_FILES = COPYING - -LSHW_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_ENABLE_LOCALE),) -LSHW_CFLAGS += -DNONLS -endif - -LSHW_MAKE_OPTS = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" AR="$(TARGET_AR)" \ - RPM_OPT_FLAGS="$(LSHW_CFLAGS)" all -LSHW_MAKE_ENV = \ - $(TARGET_MAKE_ENV) \ - LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" -LSHW_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -define LSHW_BUILD_CMDS - $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src $(LSHW_MAKE_OPTS) -endef - -define LSHW_INSTALL_TARGET_CMDS - $(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \ - $(LSHW_MAKE_OPTS) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/lsof/0001-makefile.patch b/package.bak/lsof/0001-makefile.patch deleted file mode 100644 index 65b1b2e2a7..0000000000 --- a/package.bak/lsof/0001-makefile.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -ru lsof_4.81.orig/lsof_4.81_src/lib/Makefile.skel lsof_4.81/lsof_4.81_src/lib/Makefile.skel ---- a/lib/Makefile.skel 2001-02-13 03:12:22.000000000 +0100 -+++ b/lib/Makefile.skel 2006-11-29 13:51:44.000000000 +0100 -@@ -21,8 +21,8 @@ - all: ${LIB} - - ${LIB}: ${OBJ} -- ${AR} -- ${RANLIB} -+ ${AR} cr ${LIB} ${OBJ} -+ ${RANLIB} ${LIB} - - clean: FRC - rm -f ${LIB} ${OBJ} errs Makefile.bak a.out core diff --git a/package.bak/lsof/0002-noportmap.patch b/package.bak/lsof/0002-noportmap.patch deleted file mode 100644 index 984e0d8eac..0000000000 --- a/package.bak/lsof/0002-noportmap.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/print.c 2006-08-23 13:37:43.000000000 -0600 -+++ b/print.c 2006-08-23 13:38:29.000000000 -0600 -@@ -148,6 +148,7 @@ - static void - fill_portmap() - { -+#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_RPC__) - char buf[128], *cp, *nm; - CLIENT *c; - int h, port, pr; -@@ -266,6 +267,7 @@ - Pth[pr][h] = pt; - } - clnt_destroy(c); -+#endif - } - - diff --git a/package.bak/lsof/0003-override-cflags.patch b/package.bak/lsof/0003-override-cflags.patch deleted file mode 100644 index 135e599ac9..0000000000 --- a/package.bak/lsof/0003-override-cflags.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- lsof_4.84/Configure 2008-10-21 18:21:45.000000000 +0200 -+++ lsof_4.84/Configure 2010-11-03 14:00:00.000000000 +0100 -@@ -5206,6 +5206,10 @@ - cp $LSOF_MKFC ${LSOF_LIB}/$LSOF_LIBMKF - fi # } - cat ./dialects/$LSOF_DIALECT_DIR/$LSOF_REST >> $LSOF_MKFC -+if test "X$LSOF_CFLAGS_OVERRIDE" != "X" # { -+then -+ sed -i -e 's/^CFLAGS=/override CFLAGS=/' $LSOF_MKFC -+fi # } - if test "X$LSOF_LIB_NO" = "X" # { - then - diff --git a/package.bak/lsof/0004-remove-susvlegacy-funcs.patch b/package.bak/lsof/0004-remove-susvlegacy-funcs.patch deleted file mode 100644 index fca66aee57..0000000000 --- a/package.bak/lsof/0004-remove-susvlegacy-funcs.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rdup lsof_4.81.orig/lsof_4.81_src/dialects/linux/machine.h lsof_4.81/lsof_4.81_src/dialects/linux/machine.h ---- a/dialects/linux/machine.h 2007-04-24 18:20:58.000000000 +0200 -+++ b/dialects/linux/machine.h 2007-05-15 12:17:03.000000000 +0200 -@@ -616,6 +616,6 @@ - * zeromem is a macro that uses bzero or memset. - */ - --#define zeromem(a, l) bzero(a, l) -+#define zeromem(a, l) memset(a, 0, l) - - #endif /* !defined(LSOF_MACHINE_H) */ - diff --git a/package.bak/lsof/Config.in b/package.bak/lsof/Config.in deleted file mode 100644 index c27cc8160a..0000000000 --- a/package.bak/lsof/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LSOF - bool "lsof" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - lsof (LiSt Open Files) - The lsof tool lists information about files opened by - processes. - - http://people.freebsd.org/~abe/ diff --git a/package.bak/lsof/lsof.hash b/package.bak/lsof/lsof.hash deleted file mode 100644 index 4a1249f1af..0000000000 --- a/package.bak/lsof/lsof.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 81ac2fc5fdc944793baf41a14002b6deb5a29096b387744e28f8c30a360a3718 lsof_4.89.tar.bz2 diff --git a/package.bak/lsof/lsof.mk b/package.bak/lsof/lsof.mk deleted file mode 100644 index e5cd4bce6e..0000000000 --- a/package.bak/lsof/lsof.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# lsof -# -################################################################################ - -LSOF_VERSION = 4.89 -LSOF_SOURCE = lsof_$(LSOF_VERSION).tar.bz2 -# Use http mirror since master ftp site access is very draconian -LSOF_SITE = http://www.mirrorservice.org/sites/lsof.itap.purdue.edu/pub/tools/unix/lsof -LSOF_LICENSE = lsof license -# License is repeated in each file, this is a relatively small one. -# It is also defined in 00README, but that contains a lot of other cruft. -LSOF_LICENSE_FILES = dialects/linux/dproto.h - -# Make certain full-blown lsof gets built after the busybox version (1.20+) -LSOF_DEPENDENCIES += $(if $(BR2_PACKAGE_BUSYBOX),busybox) - -ifeq ($(BR2_USE_WCHAR),) -define LSOF_CONFIGURE_WCHAR_FIXUPS - $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \ - $(@D)/machine.h -endef -endif - -ifeq ($(BR2_ENABLE_LOCALE),) -define LSOF_CONFIGURE_LOCALE_FIXUPS - $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \ - $(@D)/machine.h -endef -endif - -# The .tar.bz2 contains another .tar, which contains the source code. -define LSOF_EXTRACT_CMDS - $(call suitable-extractor,$(LSOF_SOURCE)) $(DL_DIR)/$(LSOF_SOURCE) | \ - $(TAR) -O $(TAR_OPTIONS) - lsof_$(LSOF_VERSION)/lsof_$(LSOF_VERSION)_src.tar | \ - $(TAR) --strip-components=1 -C $(LSOF_DIR) $(TAR_OPTIONS) - -endef - -define LSOF_CONFIGURE_CMDS - (cd $(@D) ; \ - echo n | $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" \ - LSOF_INCLUDE="$(STAGING_DIR)/usr/include" LSOF_CFLAGS_OVERRIDE=1 \ - LINUX_CLIB=-DGLIBCV=2 ./Configure linux) - $(LSOF_CONFIGURE_WCHAR_FIXUPS) - $(LSOF_CONFIGURE_LOCALE_FIXUPS) -endef - -define LSOF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DEBUG="$(TARGET_CFLAGS)" -C $(@D) -endef - -define LSOF_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/lsof $(TARGET_DIR)/usr/bin/lsof -endef - -$(eval $(generic-package)) diff --git a/package.bak/lsqlite3/Config.in b/package.bak/lsqlite3/Config.in deleted file mode 100644 index cc431ae08d..0000000000 --- a/package.bak/lsqlite3/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LSQLITE3 - bool "lsqlite3" - select BR2_PACKAGE_SQLITE - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - a thin Lua wrapper for the SQLite3 library. - - http://lua.sqlite.org/ diff --git a/package.bak/lsqlite3/lsqlite3.hash b/package.bak/lsqlite3/lsqlite3.hash deleted file mode 100644 index 7cf0358d11..0000000000 --- a/package.bak/lsqlite3/lsqlite3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e6eb64a7ca3727c3093f3c37341d8ecadf9eac913e468eae413828476b19c225 lsqlite3-0.9.4-2.src.rock diff --git a/package.bak/lsqlite3/lsqlite3.mk b/package.bak/lsqlite3/lsqlite3.mk deleted file mode 100644 index 6f6445d934..0000000000 --- a/package.bak/lsqlite3/lsqlite3.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# lsqlite3 -# -################################################################################ - -LSQLITE3_VERSION = 0.9.4-2 -LSQLITE3_SUBDIR = lsqlite3_fsl09x -LSQLITE3_DEPENDENCIES = sqlite -LSQLITE3_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/lsuio/Config.in b/package.bak/lsuio/Config.in deleted file mode 100644 index 675a318c93..0000000000 --- a/package.bak/lsuio/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LSUIO - bool "lsuio" - help - list available userspace I/O (UIO) devices - - http://www.osadl.org/UIO.uio.0.html diff --git a/package.bak/lsuio/lsuio.hash b/package.bak/lsuio/lsuio.hash deleted file mode 100644 index d6077af2d4..0000000000 --- a/package.bak/lsuio/lsuio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c88b3850248b2d3419e025abd7b9b0991c8bd33a2d4983f9608408a29900bfb5 lsuio-0.2.0.tar.gz diff --git a/package.bak/lsuio/lsuio.mk b/package.bak/lsuio/lsuio.mk deleted file mode 100644 index 5f8a9658f3..0000000000 --- a/package.bak/lsuio/lsuio.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# lsuio -# -################################################################################ - -LSUIO_VERSION = 0.2.0 -LSUIO_SITE = http://www.osadl.org/projects/downloads/UIO/user -LSUIO_LICENSE = GPLv2 -LSUIO_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch b/package.bak/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch deleted file mode 100644 index 344ba4ae94..0000000000 --- a/package.bak/ltp-testsuite/0001-rpc-tirpc-disable-tirpc_auth_authdes_-create-tests.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9bbadb7ece1b068465279e7248b3439d443054a6 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:43:08 +0200 -Subject: [PATCH] rpc-tirpc: disable tirpc_auth_authdes_*create tests - -Due to Buildroot patch 0007-Disable-DES-authentification-support.patch on -libtirpc, this library is built without method authdes_create. Any code -that uses this library, like the rpc-tirpc testsuite, thus fails to link. - -In the context of Buildroot, instead of disabling ltp-testsuite entirely, -just disable the problematic tests. - -Upstream-status: not applicable -Signed-off-by: Thomas De Schampheleire -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -index 45bc8a6..c04a088 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/tirpc/Makefile -@@ -19,4 +19,8 @@ - top_srcdir ?= ../../../../../../.. - - include $(top_srcdir)/include/mk/env_pre.mk -+ -+FILTER_OUT_DIRS += tirpc_auth_authdes_seccreate \ -+ tirpc_auth_authdes_create -+ - include $(top_srcdir)/include/mk/generic_trunk_target.mk --- -2.7.4 - diff --git a/package.bak/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch b/package.bak/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch deleted file mode 100644 index c1496037c1..0000000000 --- a/package.bak/ltp-testsuite/0002-uClibc-ng-has-no-profil-support.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 4ab7dc5fd201318e2a62dbd3ba1680b97034ec65 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:45:03 +0200 -Subject: [PATCH] uClibc-ng has no profil() support - -Signed-off-by: Waldemar Brodkorb -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - testcases/kernel/syscalls/profil/profil01.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -diff --git a/testcases/kernel/syscalls/profil/profil01.c b/testcases/kernel/syscalls/profil/profil01.c -index 2fc47aa..f8afd57 100644 ---- a/testcases/kernel/syscalls/profil/profil01.c -+++ b/testcases/kernel/syscalls/profil/profil01.c -@@ -37,6 +37,9 @@ - #define PROFIL_BUFLEN (32*1024) - - char *TCID = "profil01"; -+ -+#if !defined(__UCLIBC__) -+ - int TST_TOTAL = 1; - - static volatile sig_atomic_t profil_done; -@@ -124,3 +127,9 @@ int main(int ac, char *av[]) - - tst_exit(); - } -+#else /* systems that dont support profil */ -+int main(void) -+{ -+ tst_brkm(TCONF, NULL, "system doesn't have profil support"); -+} -+#endif --- -2.7.4 - diff --git a/package.bak/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch b/package.bak/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch deleted file mode 100644 index 14f5888ded..0000000000 --- a/package.bak/ltp-testsuite/0003-uClibc-ng-need-__UCLIBC_SV4_DEPRECATED__-enabled-for.patch +++ /dev/null @@ -1,84 +0,0 @@ -From bb966fd9efc3b9bec3ca72b0e72dd760434e0f10 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:45:16 +0200 -Subject: [PATCH] uClibc-ng need __UCLIBC_SV4_DEPRECATED__ enabled for ustat - -Signed-off-by: Waldemar Brodkorb -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - testcases/kernel/syscalls/ustat/ustat01.c | 12 ++++++++++++ - testcases/kernel/syscalls/ustat/ustat02.c | 10 ++++++++++ - 2 files changed, 22 insertions(+) - -diff --git a/testcases/kernel/syscalls/ustat/ustat01.c b/testcases/kernel/syscalls/ustat/ustat01.c -index 494647b..35e0bb1 100644 ---- a/testcases/kernel/syscalls/ustat/ustat01.c -+++ b/testcases/kernel/syscalls/ustat/ustat01.c -@@ -21,7 +21,9 @@ - - #include - #include -+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__) - #include -+#endif - #include - #include - #include "test.h" -@@ -30,6 +32,9 @@ - static void setup(void); - - char *TCID = "ustat01"; -+ -+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__) -+ - int TST_TOTAL = 1; - - static dev_t dev_num; -@@ -79,3 +84,10 @@ static void setup(void) - - dev_num = buf.st_dev; - } -+#else /* systems that dont support ustat */ -+int main(void) -+{ -+ tst_brkm(TCONF, NULL, "system doesn't have ustat support"); -+} -+#endif -+ -diff --git a/testcases/kernel/syscalls/ustat/ustat02.c b/testcases/kernel/syscalls/ustat/ustat02.c -index edada31..795c605 100644 ---- a/testcases/kernel/syscalls/ustat/ustat02.c -+++ b/testcases/kernel/syscalls/ustat/ustat02.c -@@ -22,7 +22,9 @@ - - #include - #include -+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__) - #include -+#endif - #include - #include - #include "test.h" -@@ -32,6 +34,8 @@ static void setup(void); - - char *TCID = "ustat02"; - -+#if !defined(__UCLIBC__) || defined(__UCLIBC_SV4_DEPRECATED__) -+ - static dev_t invalid_dev = -1; - static dev_t root_dev; - struct ustat ubuf; -@@ -101,3 +105,9 @@ static void setup(void) - - root_dev = buf.st_dev; - } -+#else /* systems that dont support ustat */ -+int main(void) -+{ -+ tst_brkm(TCONF, NULL, "system doesn't have ustat support"); -+} -+#endif --- -2.7.4 - diff --git a/package.bak/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch b/package.bak/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch deleted file mode 100644 index fc3dce97e0..0000000000 --- a/package.bak/ltp-testsuite/0004-rusers.h-is-unused-and-not-available-for-uClibc-ng-l.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 780bec6c2742231ca73d4dee51c727815cf857b3 Mon Sep 17 00:00:00 2001 -From: Erico Nunes -Date: Fri, 30 Sep 2016 17:45:31 +0200 -Subject: [PATCH] rusers.h is unused and not available for uClibc-ng / libtirpc - -Signed-off-by: Waldemar Brodkorb -[Erico: Rebase for ltp 20160920] -Signed-off-by: Erico Nunes ---- - .../tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c | 1 - - .../rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c | 1 - - .../rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c | 1 - - .../rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c | 1 - - .../rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c | 1 - - .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c | 1 - - .../rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c | 1 - - .../rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c | 1 - - .../rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c | 1 - - .../rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c | 1 - - .../rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c | 1 - - 11 files changed, 11 deletions(-) - -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -index 7f157e1..728c023 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_auth_destroy/rpc_auth_destroy.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -index d9a3111..8d80a5e 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authnone_create/rpc_authnone_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -index cabffc7..a4d1d6f 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create/rpc_authunix_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -index 4f10466..863aec7 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_auth_authunix_create_default/rpc_authunix_create_default.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -index 290f357..e849468 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -index 55bac16..8c1800b 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_limits.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -index 09d1bf9..384a00d 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clnttcp_create/rpc_clnttcp_create_stress.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -index 3e15306..285eb21 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -index a7030a2..1f2690a 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_bufcreate/rpc_clntudp_bufcreate_limits.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -index 06f4740..faa8ef6 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include -diff --git a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -index ca38aa0..974f5fb 100644 ---- a/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -+++ b/testcases/network/rpc/rpc-tirpc/tests_pack/rpc_suite/rpc/rpc_createdestroy_clntudp_create/rpc_clntudp_create_stress.c -@@ -30,7 +30,6 @@ - #include - #include - #include --#include - #include - #include - #include --- -2.7.4 - diff --git a/package.bak/ltp-testsuite/Config.in b/package.bak/ltp-testsuite/Config.in deleted file mode 100644 index 274b03e423..0000000000 --- a/package.bak/ltp-testsuite/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -comment "ltp-testsuite needs specific uClibc options, see help" - depends on BR2_PACKAGE_LTP_TESTSUITE - depends on BR2_TOOLCHAIN_USES_UCLIBC - -config BR2_PACKAGE_LTP_TESTSUITE - bool "ltp-testsuite" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - # does not build, cachectl.h issue - depends on !BR2_nios2 - help - The Linux Test Project provides a huge testsuite for Linux. - - The LTP testsuite uses several functions that are considered - obsolete, such as sigset() and others. Therefore, the LTP - testsuite does not build with Buildroot's default uClibc - configuration, and options such as DO_XSI_MATH, - UCLIBC_HAS_OBSOLETE_BSD_SIGNAL and UCLIBC_SV4_DEPRECATED - are needed. - - http://linux-test-project.github.io - -comment "ltp-testsuite needs a glibc or uClibc toolchain w/ threads" - depends on !BR2_nios2 - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/ltp-testsuite/ltp-testsuite.hash b/package.bak/ltp-testsuite/ltp-testsuite.hash deleted file mode 100644 index b8311e094e..0000000000 --- a/package.bak/ltp-testsuite/ltp-testsuite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: https://github.com/linux-test-project/ltp/releases/download/20170116/ltp-full-20170116.tar.xz.sha1 -sha1 b42047fe0d30db9b2c760bd1ab901ecb133835fc ltp-full-20170116.tar.xz diff --git a/package.bak/ltp-testsuite/ltp-testsuite.mk b/package.bak/ltp-testsuite/ltp-testsuite.mk deleted file mode 100644 index 9d82087f7f..0000000000 --- a/package.bak/ltp-testsuite/ltp-testsuite.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# ltp-testsuite -# -################################################################################ - -LTP_TESTSUITE_VERSION = 20170116 -LTP_TESTSUITE_SOURCE = ltp-full-$(LTP_TESTSUITE_VERSION).tar.xz -LTP_TESTSUITE_SITE = https://github.com/linux-test-project/ltp/releases/download/$(LTP_TESTSUITE_VERSION) -LTP_TESTSUITE_LICENSE = GPLv2, GPLv2+ -LTP_TESTSUITE_LICENSE_FILES = COPYING -LTP_TESTSUITE_CONF_OPTS += \ - --with-open-posix-testsuite \ - --with-realtime-testsuite - -ifeq ($(BR2_LINUX_KERNEL),y) -LTP_TESTSUITE_DEPENDENCIES += linux -LTP_TESTSUITE_MAKE_ENV += $(LINUX_MAKE_FLAGS) -LTP_TESTSUITE_CONF_OPTS += --with-linux-dir=$(LINUX_DIR) -else -LTP_TESTSUITE_CONF_OPTS += --without-modules -endif - -# We change the prefix to a custom one, otherwise we get scripts and -# directories directly in /usr, such as /usr/runalltests.sh -LTP_TESTSUITE_CONF_OPTS += --prefix=/usr/lib/ltp-testsuite - -# Needs libcap with file attrs which needs attr, so both required -ifeq ($(BR2_PACKAGE_LIBCAP)$(BR2_PACKAGE_ATTR),yy) -LTP_TESTSUITE_DEPENDENCIES += libcap -else -LTP_TESTSUITE_CONF_ENV += ac_cv_lib_cap_cap_compare=no -endif - -# ltp-testsuite uses , which isn't compatible with largefile -# support. -LTP_TESTSUITE_CFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) -LTP_TESTSUITE_CPPFLAGS = $(filter-out -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS)) -LTP_TESTSUITE_LIBS = - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -LTP_TESTSUITE_DEPENDENCIES += libtirpc host-pkgconf -LTP_TESTSUITE_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" -LTP_TESTSUITE_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" -endif - -LTP_TESTSUITE_CONF_ENV += \ - CFLAGS="$(LTP_TESTSUITE_CFLAGS)" \ - CPPFLAGS="$(LTP_TESTSUITE_CPPFLAGS)" \ - LIBS="$(LTP_TESTSUITE_LIBS)" \ - SYSROOT="$(STAGING_DIR)" - -# Requires uClibc fts and bessel support, normally not enabled -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -define LTP_TESTSUITE_REMOVE_UNSUPPORTED - rm -rf $(@D)/testcases/kernel/controllers/cpuset/ - rm -rf $(@D)/testcases/misc/math/float/bessel/ - rm -f $(@D)/testcases/misc/math/float/float_bessel.c -endef -LTP_TESTSUITE_POST_PATCH_HOOKS += LTP_TESTSUITE_REMOVE_UNSUPPORTED -endif - - -$(eval $(autotools-package)) diff --git a/package.bak/ltrace/0001-arm-plt.patch b/package.bak/ltrace/0001-arm-plt.patch deleted file mode 100644 index f130ce8426..0000000000 --- a/package.bak/ltrace/0001-arm-plt.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 04377d28135e351c8d096c4392a493e937416815 Mon Sep 17 00:00:00 2001 -From: Alexandre Belloni -Date: Thu, 24 Jul 2014 23:15:20 +0200 -Subject: [PATCH] Allow building with uclibc toolchains - -Unfortunately, uclicbc doesn't define SHT_ARM_ATTRIBUTES in elf.h - -Signed-off-by: Alexandre Belloni ---- - sysdeps/linux-gnu/arm/plt.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/sysdeps/linux-gnu/arm/plt.c b/sysdeps/linux-gnu/arm/plt.c -index 9e9e37f0c5b0..a0a5795eb9cb 100644 ---- a/sysdeps/linux-gnu/arm/plt.c -+++ b/sysdeps/linux-gnu/arm/plt.c -@@ -28,6 +28,10 @@ - #include "library.h" - #include "ltrace-elf.h" - -+#ifndef SHT_ARM_ATTRIBUTES -+#define SHT_ARM_ATTRIBUTES 0x70000003 -+#endif -+ - static int - get_hardfp(uint64_t abi_vfp_args) - { --- -1.9.1 - diff --git a/package.bak/ltrace/0002-sparc-add-missing-library.h-include.patch b/package.bak/ltrace/0002-sparc-add-missing-library.h-include.patch deleted file mode 100644 index 01f1f2edb3..0000000000 --- a/package.bak/ltrace/0002-sparc-add-missing-library.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4e58f53b7886420d002e5919f279acd6d7c4afd1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 22 Dec 2015 21:47:45 +0100 -Subject: [PATCH] sparc: add missing library.h include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes the following build failure on sparc: - -plt.c: In function ‘sym2addr’: -plt.c:33:12: error: dereferencing pointer to incomplete type - return sym->enter_addr; - ^ -plt.c:34:1: warning: control reaches end of non-void function [-Wreturn-type] - -Signed-off-by: Thomas Petazzoni ---- - sysdeps/linux-gnu/sparc/plt.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/sysdeps/linux-gnu/sparc/plt.c b/sysdeps/linux-gnu/sparc/plt.c -index 3d2e589..959eed1 100644 ---- a/sysdeps/linux-gnu/sparc/plt.c -+++ b/sysdeps/linux-gnu/sparc/plt.c -@@ -21,6 +21,7 @@ - #include - #include "proc.h" - #include "common.h" -+#include "library.h" - - GElf_Addr - arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) { --- -2.6.4 - diff --git a/package.bak/ltrace/Config.in b/package.bak/ltrace/Config.in deleted file mode 100644 index 7af6be2144..0000000000 --- a/package.bak/ltrace/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_LTRACE - bool "ltrace" - # ltrace normally has mips/mipsel support, but it's currently - # broken (error: 'struct ltelf' has no member named - # 'relplt_count'). Issue reported upstream at - # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=756764. - depends on (BR2_i386 || BR2_arm || BR2_mips || BR2_mipsel \ - || BR2_powerpc || BR2_sparc || BR2_x86_64 || BR2_xtensa) - select BR2_PACKAGE_ELFUTILS - depends on BR2_USE_WCHAR # elfutils - depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - help - Debugging program which runs a specified command until it exits. - While the command is executing, ltrace intercepts and records - the dynamic library calls which are called by the executed - process and the signals received by that process. - - http://ltrace.org - -comment "ltrace needs a uClibc or glibc toolchain w/ wchar, dynamic library" - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package.bak/ltrace/ltrace.mk b/package.bak/ltrace/ltrace.mk deleted file mode 100644 index eac42be328..0000000000 --- a/package.bak/ltrace/ltrace.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# ltrace -# -################################################################################ - -LTRACE_VERSION = c22d359433b333937ee3d803450dc41998115685 -LTRACE_SITE = git://anonscm.debian.org/collab-maint/ltrace.git -LTRACE_DEPENDENCIES = elfutils -LTRACE_CONF_OPTS = --disable-werror -LTRACE_LICENSE = GPLv2 -LTRACE_LICENSE_FILES = COPYING -LTRACE_AUTORECONF = YES - -define LTRACE_CREATE_CONFIG_M4 - mkdir -p $(@D)/config/m4 -endef -LTRACE_POST_PATCH_HOOKS += LTRACE_CREATE_CONFIG_M4 - -# ltrace can use libunwind only if libc has backtrace() support -# We don't normally do so for uClibc and we can't know if it's external -# Also ltrace with libunwind support is broken for MIPS so we disable it -ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC)$(BR2_mips)$(BR2_mipsel),) -# --with-elfutils only selects unwinding support backend. elfutils is a -# mandatory dependency regardless. -LTRACE_CONF_OPTS += --with-libunwind=yes --with-elfutils=no -LTRACE_DEPENDENCIES += libunwind -else -LTRACE_CONF_OPTS += --with-libunwind=no -endif -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ltris/0001-fix-gcc5-build.patch b/package.bak/ltris/0001-fix-gcc5-build.patch deleted file mode 100644 index 66d0fa3df7..0000000000 --- a/package.bak/ltris/0001-fix-gcc5-build.patch +++ /dev/null @@ -1,308 +0,0 @@ -Upstream patch to fix build with GCC 5 - -Obtained from the LGames Subversion repository with the following command: -svn diff -c164 svn://svn.code.sf.net/p/lgames/code/trunk/ltris - -Signed-off-by: Rodrigo Rebello - -Revision log message: ------------------------------------------------------------------------- -r164 | kulkanie | 2015-05-16 05:48:02 -0300 (Sat, 16 May 2015) | 1 line - -removed all inline keywords ------------------------------------------------------------------------- - -Line added to LTris ChangeLog concerning the change: -- removed all inline keywords to work with GCC 5 (2015/05/16 MS) - -Author: Michael Speck - -Index: src/sdl.c -=================================================================== ---- a/src/sdl.c (revision 163) -+++ b/src/sdl.c (revision 164) -@@ -244,7 +244,7 @@ - #endif - - /* return full path of bitmap */ --inline void get_full_bmp_path( char *full_path, char *file_name ) -+void get_full_bmp_path( char *full_path, char *file_name ) - { - sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); - } -@@ -330,7 +330,7 @@ - /* - lock surface - */ --inline void lock_surf(SDL_Surface *sur) -+void lock_surf(SDL_Surface *sur) - { - if (SDL_MUSTLOCK(sur)) - SDL_LockSurface(sur); -@@ -339,7 +339,7 @@ - /* - unlock surface - */ --inline void unlock_surf(SDL_Surface *sur) -+void unlock_surf(SDL_Surface *sur) - { - if (SDL_MUSTLOCK(sur)) - SDL_UnlockSurface(sur); -@@ -666,7 +666,7 @@ - /* - lock font surface - */ --inline void lock_font(Font *fnt) -+void lock_font(Font *fnt) - { - if (SDL_MUSTLOCK(fnt->pic)) - SDL_LockSurface(fnt->pic); -@@ -675,7 +675,7 @@ - /* - unlock font surface - */ --inline void unlock_font(Font *fnt) -+void unlock_font(Font *fnt) - { - if (SDL_MUSTLOCK(fnt->pic)) - SDL_UnlockSurface(fnt->pic); -@@ -905,7 +905,7 @@ - /* - update rectangle (0,0,0,0)->fullscreen - */ --inline void refresh_screen(int x, int y, int w, int h) -+void refresh_screen(int x, int y, int w, int h) - { - SDL_UpdateRect(sdl.screen, x, y, w, h); - } -@@ -1055,7 +1055,7 @@ - /* - lock surface - */ --inline void lock_screen() -+void lock_screen() - { - if (SDL_MUSTLOCK(sdl.screen)) - SDL_LockSurface(sdl.screen); -@@ -1064,7 +1064,7 @@ - /* - unlock surface - */ --inline void unlock_screen() -+void unlock_screen() - { - if (SDL_MUSTLOCK(sdl.screen)) - SDL_UnlockSurface(sdl.screen); -@@ -1073,7 +1073,7 @@ - /* - flip hardware screens (double buffer) - */ --inline void flip_screen() -+void flip_screen() - { - SDL_Flip(sdl.screen); - } -@@ -1132,7 +1132,7 @@ - /* - get milliseconds since last call - */ --inline int get_time() -+int get_time() - { - int ms; - cur_time = SDL_GetTicks(); -@@ -1148,7 +1148,7 @@ - /* - reset timer - */ --inline void reset_timer() -+void reset_timer() - { - last_time = SDL_GetTicks(); - } -Index: src/sdl.h -=================================================================== ---- a/src/sdl.h (revision 163) -+++ b/src/sdl.h (revision 164) -@@ -41,8 +41,8 @@ - SDL_Surface* load_surf(char *fname, int f); - SDL_Surface* create_surf(int w, int h, int f); - void free_surf( SDL_Surface **surf ); --inline void lock_surf(SDL_Surface *sur); --inline void unlock_surf(SDL_Surface *sur); -+void lock_surf(SDL_Surface *sur); -+void unlock_surf(SDL_Surface *sur); - void blit_surf(void); - void alpha_blit_surf(int alpha); - void fill_surf(int c); -@@ -86,8 +86,8 @@ - Font* load_fixed_font(char *fname, int off, int len, int w); - void free_font(Font **sfnt); - int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); --inline void lock_font(Font *sfnt); --inline void unlock_font(Font *sfnt); -+void lock_font(Font *sfnt); -+void unlock_font(Font *sfnt); - SDL_Rect last_write_rect(Font *fnt); - int text_width(Font *fnt, char *str); - -@@ -132,14 +132,14 @@ - char** get_mode_names( int *count ); - int set_video_mode( Video_Mode mode ); - void hardware_cap(); --inline void refresh_screen( int x, int y, int w, int h ); -+void refresh_screen( int x, int y, int w, int h ); - void refresh_rects(); - void add_refresh_rect(int x, int y, int w, int h); - int wait_for_key(); - void wait_for_click(); --inline void lock_screen(); --inline void unlock_screen(); --inline void flip_screen(); -+void lock_screen(); -+void unlock_screen(); -+void flip_screen(); - void fade_screen( int type, int ms ); - void take_screenshot( int i ); - -@@ -148,8 +148,8 @@ - SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source ); - - /* timer */ --inline int get_time(); --inline void reset_timer(); -+int get_time(); -+void reset_timer(); - - #ifdef __cplusplus - }; -Index: src/tools.c -=================================================================== ---- a/src/tools.c (revision 163) -+++ b/src/tools.c (revision 164) -@@ -23,7 +23,7 @@ - #include "ltris.h" - - /* compares to strings and returns true if their first strlen(str1) chars are equal */ --inline int strequal( char *str1, char *str2 ) -+int strequal( char *str1, char *str2 ) - { - if ( strlen( str1 ) != strlen( str2 ) ) return 0; - return ( !strncmp( str1, str2, strlen( str1 ) ) ); -@@ -30,7 +30,7 @@ - } - - /* set delay to ms milliseconds */ --inline void delay_set( Delay *delay, int ms ) -+void delay_set( Delay *delay, int ms ) - { - delay->limit = ms; - delay->cur = 0; -@@ -37,13 +37,13 @@ - } - - /* reset delay ( cur = 0 )*/ --inline void delay_reset( Delay *delay ) -+void delay_reset( Delay *delay ) - { - delay->cur = 0; - } - - /* check if times out and reset */ --inline int delay_timed_out( Delay *delay, int ms ) -+int delay_timed_out( Delay *delay, int ms ) - { - delay->cur += ms; - if ( delay->cur >= delay->limit ) { -@@ -56,12 +56,12 @@ - } - - /* set timer so that we have a time out next call of delay_timed_out() */ --inline void delay_force_time_out( Delay *delay ) -+void delay_force_time_out( Delay *delay ) - { - delay->cur = delay->limit; - } - --inline void goto_tile( int *x, int *y, int d ) -+void goto_tile( int *x, int *y, int d ) - { - /* 0 -up, clockwise, 5 - left up */ - switch ( d ) { -@@ -326,24 +326,24 @@ - the target value until reached when counter_update() is called. - ==================================================================== - */ --inline void counter_set( Counter *counter, double value ) -+void counter_set( Counter *counter, double value ) - { - counter->value = value; - counter->approach = value; - } --inline void counter_add( Counter *counter, double add ) -+void counter_add( Counter *counter, double add ) - { - counter->value += add; - } --inline double counter_get_approach( Counter counter ) -+double counter_get_approach( Counter counter ) - { - return counter.approach; - } --inline double counter_get( Counter counter ) -+double counter_get( Counter counter ) - { - return counter.value; - } --inline void counter_update( Counter *counter, int ms ) -+void counter_update( Counter *counter, int ms ) - { - double change; - if ( counter->approach == counter->value ) return; -Index: src/bowl.c -=================================================================== ---- a/src/bowl.c (revision 163) -+++ b/src/bowl.c (revision 164) -@@ -333,7 +333,7 @@ - Set a tile contents and pixel contents. - ==================================================================== - */ --inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) -+void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) - { - int i, j = y * bowl->block_size; - bowl->contents[x][y] = tile_id; -Index: src/tools.h -=================================================================== ---- a/src/tools.h (revision 163) -+++ b/src/tools.h (revision 164) -@@ -33,7 +33,7 @@ - #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) ) - - /* compares to strings and returns true if their first strlen(str1) chars are equal */ --inline int strequal( char *str1, char *str2 ); -+int strequal( char *str1, char *str2 ); - - /* delete lines */ - void delete_lines( char **lines, int line_number ); -@@ -45,16 +45,16 @@ - } Delay; - - /* set delay to ms milliseconds */ --inline void delay_set( Delay *delay, int ms ); -+void delay_set( Delay *delay, int ms ); - - /* reset delay ( cur = 0 )*/ --inline void delay_reset( Delay *delay ); -+void delay_reset( Delay *delay ); - - /* check if time's out ( add ms milliseconds )and reset */ --inline int delay_timed_out( Delay *delay, int ms ); -+int delay_timed_out( Delay *delay, int ms ); - - /* set timer so that we have a time out next call of delay_timed_out() */ --inline void delay_force_time_out( Delay *delay ); -+void delay_force_time_out( Delay *delay ); - - /* return distance betwteen to map positions */ - int get_dist( int x1, int y1, int x2, int y2 ); diff --git a/package.bak/ltris/Config.in b/package.bak/ltris/Config.in deleted file mode 100644 index bf73489da4..0000000000 --- a/package.bak/ltris/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_LTRIS - bool "LTris" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_SDL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - LTris is a tetris clone, using SDL. It optionally requires - SDL_mixer for audio support. A display with minimum 640x480 - resolution and a keyboard are recommended. - - http://lgames.sourceforge.net/index.php?project=LTris - -if BR2_PACKAGE_LTRIS - -config BR2_PACKAGE_LTRIS_AUDIO - bool "audio support" - default y - select BR2_PACKAGE_SDL_MIXER - help - Activates audio support in LTris. Will add SDL_mixer. - -endif diff --git a/package.bak/ltris/ltris.hash b/package.bak/ltris/ltris.hash deleted file mode 100644 index 5c0fcde7a0..0000000000 --- a/package.bak/ltris/ltris.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 8f6a9e7719d22004aee153db29ffd9ca41c7a6cd87fc791591994eecc2e625a1 ltris-1.0.19.tar.gz diff --git a/package.bak/ltris/ltris.mk b/package.bak/ltris/ltris.mk deleted file mode 100644 index bbd270ea13..0000000000 --- a/package.bak/ltris/ltris.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# ltris -# -################################################################################ - -LTRIS_SITE = http://downloads.sourceforge.net/lgames/ltris -LTRIS_VERSION = 1.0.19 -LTRIS_LICENSE = GPLv2+ -LTRIS_LICENSE_FILES = COPYING - -LTRIS_DEPENDENCIES = sdl - -LTRIS_CONF_ENV = \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ - LIBS="$(LTRIS_LIBS)" - -ifeq ($(BR2_PACKAGE_LTRIS_AUDIO),y) -LTRIS_DEPENDENCIES += sdl_mixer host-pkgconf -LTRIS_CONF_OPTS += --enable-sound -# configure script does NOT use pkg-config to figure out how to link -# with sdl_mixer, breaking static linking as sdl_mixer can use libmad -LTRIS_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs SDL_mixer` -else -LTRIS_CONF_OPTS += --disable-sound -endif - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -LTRIS_DEPENDENCIES += gettext -LTRIS_LIBS += -lintl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch b/package.bak/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch deleted file mode 100644 index b903d87223..0000000000 --- a/package.bak/lttng-babeltrace/0001-tests-lib-Makefile.am-remove-unneeded-static-flag.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 27e37d2621317d25e08ba0683bf8540b05b9347d Mon Sep 17 00:00:00 2001 -From: Philippe Proulx -Date: Fri, 28 Oct 2016 02:09:20 -0400 -Subject: [PATCH] tests/lib/Makefile.am: remove unneeded -static flag - -Having those -static flags breaks the build in shared-only builds. - -Signed-off-by: Philippe Proulx -[Philippe: grabbed from this pull request: - https://github.com/efficios/babeltrace/pull/49 -] ---- - tests/lib/Makefile.am | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am -index 33ada16..c685e77 100644 ---- a/tests/lib/Makefile.am -+++ b/tests/lib/Makefile.am -@@ -31,13 +31,11 @@ check_SCRIPTS = test_seek_big_trace \ - test_ctf_writer_complete - - if ENABLE_DEBUG_INFO --test_dwarf_LDFLAGS = -static - test_dwarf_LDADD = $(LIBTAP) \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/lib/libdebug-info.la - test_dwarf_SOURCES = test_dwarf.c - --test_bin_info_LDFLAGS = -static - test_bin_info_LDADD = $(LIBTAP) \ - $(top_builddir)/lib/libbabeltrace.la \ - $(top_builddir)/lib/libdebug-info.la --- -2.9.3 - diff --git a/package.bak/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch b/package.bak/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch deleted file mode 100644 index b16781419a..0000000000 --- a/package.bak/lttng-babeltrace/0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 697ab0905c59561562dc52cd3b925781e07814f3 Mon Sep 17 00:00:00 2001 -From: Philippe Proulx -Date: Wed, 2 Nov 2016 01:40:12 -0400 -Subject: [PATCH] m4/ax_lib_elfutils.m4: add cache variable - -This patch adds an autoconf cache variable to override the -AC_RUN_IFELSE() test result when cross-compiling. - -Signed-off-by: Philippe Proulx -[Philippe: grabbed from this pull request: - https://github.com/efficios/babeltrace/pull/52 -] ---- - m4/ax_lib_elfutils.m4 | 32 +++++++++++++++++--------------- - 1 file changed, 17 insertions(+), 15 deletions(-) - -diff --git a/m4/ax_lib_elfutils.m4 b/m4/ax_lib_elfutils.m4 -index fcfe06b..f4fcb0d 100644 ---- a/m4/ax_lib_elfutils.m4 -+++ b/m4/ax_lib_elfutils.m4 -@@ -21,7 +21,9 @@ - # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - # - # Check the currently installed version of elfutils by using the --# _ELFUTILS_PREREQ macro defined in elfutils/version.h. -+# `_ELFUTILS_PREREQ` macro defined in . -+# -+# The cache variable for this test is `bt_cv_lib_elfutils`. - # - # AX_LIB_ELFUTILS(MAJOR_VERSION, MINOR_VERSION, [ACTION-IF-TRUE], [ACTION-IF-FALSE]) - # --------------------------------------------------------------------------- -@@ -29,7 +31,6 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ - m4_pushdef([major_version], [$1]) - m4_pushdef([minor_version], [$2]) - -- AC_MSG_CHECKING([for elfutils version >= major_version.minor_version]) - m4_if([$#], 3, [ - m4_pushdef([true_action], [$3]) - ], [ -@@ -43,20 +44,21 @@ AC_DEFUN([AX_LIB_ELFUTILS], [ - AC_MSG_ERROR(elfutils >= major_version.minor_version is required)]) - ]) - -- AC_RUN_IFELSE([ -- AC_LANG_SOURCE([ -- #include -- #include -+ AC_CACHE_CHECK( -+ [for elfutils version >= major_version.minor_version], -+ [bt_cv_lib_elfutils], [ -+ AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ #include -+ #include -+ -+ int main(void) { -+ return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; -+ } -+ ])], [bt_cv_lib_elfutils=yes], [bt_cv_lib_elfutils=no]) -+ ] -+ ) - -- int main(void) { -- return _ELFUTILS_PREREQ(major_version, minor_version) ? EXIT_SUCCESS : EXIT_FAILURE; -- } -- ]) -- ], -- echo yes -- true_action, -- echo no -- false_action) -+ AS_IF([test "x$bt_cv_lib_elfutils" = "xyes"], [true_action], [false_action]) - - m4_popdef([false_action]) - m4_popdef([true_action]) --- -2.9.3 - diff --git a/package.bak/lttng-babeltrace/Config.in b/package.bak/lttng-babeltrace/Config.in deleted file mode 100644 index 09fab4492b..0000000000 --- a/package.bak/lttng-babeltrace/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_LTTNG_BABELTRACE - bool "lttng-babeltrace" - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_POPT - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - The Babeltrace project provides trace read and write - libraries, as well as a trace converter application. Plugins - can be created for any trace format to allow its conversion - to/from another trace format. - - Babeltrace is the reference implementation of the Common - Trace Format (see ). Babeltrace - can decode and display LTTng traces, since the latter are - written using the CTF format. - - To get support for debugging information, enable the - elfutils package. - - Having this tool on the target is not mandatory. You can - transfer the binary trace output from the target to your - development workstation, and use babeltrace here. - - See the lttng-babeltrace host utility to install Babeltrace - on the host. - - http://diamon.org/babeltrace - -comment "lttng-babeltrace needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/lttng-babeltrace/Config.in.host b/package.bak/lttng-babeltrace/Config.in.host deleted file mode 100644 index 71b9c7d9ff..0000000000 --- a/package.bak/lttng-babeltrace/Config.in.host +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_HOST_LTTNG_BABELTRACE - bool "host lttng-babeltrace" - help - The Babeltrace project provides trace read and write - libraries, as well as a trace converter application. Plugins - can be created for any trace format to allow its conversion - to/from another trace format. - - Babeltrace is the reference implementation of the Common - Trace Format (see ). Babeltrace - can decode and display LTTng traces, since the latter are - written using the CTF format. - - http://diamon.org/babeltrace diff --git a/package.bak/lttng-babeltrace/lttng-babeltrace.hash b/package.bak/lttng-babeltrace/lttng-babeltrace.hash deleted file mode 100644 index 8f296927a0..0000000000 --- a/package.bak/lttng-babeltrace/lttng-babeltrace.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://www.efficios.com/files/babeltrace/babeltrace-1.5.1.tar.bz2.{md5,sha1} -md5 3f7d29ba2821a966d24759a928a15cdf babeltrace-1.5.1.tar.bz2 -sha1 07bffefed8ef68317f26e043ae5f71be58fdb783 babeltrace-1.5.1.tar.bz2 diff --git a/package.bak/lttng-babeltrace/lttng-babeltrace.mk b/package.bak/lttng-babeltrace/lttng-babeltrace.mk deleted file mode 100644 index abb3bba3da..0000000000 --- a/package.bak/lttng-babeltrace/lttng-babeltrace.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# lttng-babeltrace -# -################################################################################ - -LTTNG_BABELTRACE_SITE = http://www.efficios.com/files/babeltrace -LTTNG_BABELTRACE_VERSION = 1.5.1 -LTTNG_BABELTRACE_SOURCE = babeltrace-$(LTTNG_BABELTRACE_VERSION).tar.bz2 -LTTNG_BABELTRACE_LICENSE = MIT, LGPLv2.1 (include/babeltrace/list.h), GPLv2 (test code) -LTTNG_BABELTRACE_LICENSE_FILES = mit-license.txt gpl-2.0.txt LICENSE -LTTNG_BABELTRACE_DEPENDENCIES = popt util-linux libglib2 host-pkgconf -# The host-elfutils dependency is optional, but since we don't have -# options for host packages, just build support for it -# unconditionally. -HOST_LTTNG_BABELTRACE_DEPENDENCIES = \ - host-popt host-util-linux host-libglib2 host-pkgconf host-elfutils -HOST_LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info - -# For: 0002-m4-ax_lib_elfutils.m4-add-cache-variable.patch -LTTNG_BABELTRACE_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -LTTNG_BABELTRACE_DEPENDENCIES += elfutils -LTTNG_BABELTRACE_CONF_OPTS += --enable-debug-info -LTTNG_BABELTRACE_CONF_ENV += bt_cv_lib_elfutils=yes -else -LTTNG_BABELTRACE_CONF_OPTS += --disable-debug-info -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch b/package.bak/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch deleted file mode 100644 index 2e0c8b1da0..0000000000 --- a/package.bak/lttng-libust/0001-lttng-ust-elf.c-define-NT_GNU_BUILD_ID-if-not-define.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d400314757a8d5d52bd5722d263bfd5886bb6595 Mon Sep 17 00:00:00 2001 -From: Philippe Proulx -Date: Sat, 29 Oct 2016 13:32:57 -0400 -Subject: [PATCH] lttng-ust-elf.c: define NT_GNU_BUILD_ID if not defined - -On uClibc, NT_GNU_BUILD_ID is not defined, so we define it -manually in this case. - -Signed-off-by: Philippe Proulx -[Philippe: grabbed from this pull request: - https://github.com/lttng/lttng-ust/pull/39 -] ---- - liblttng-ust/lttng-ust-elf.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/liblttng-ust/lttng-ust-elf.c b/liblttng-ust/lttng-ust-elf.c -index 5f27920..beaa7f3 100644 ---- a/liblttng-ust/lttng-ust-elf.c -+++ b/liblttng-ust/lttng-ust-elf.c -@@ -29,6 +29,10 @@ - - #define BUF_LEN 4096 - -+#ifndef NT_GNU_BUILD_ID -+# define NT_GNU_BUILD_ID 3 -+#endif -+ - /* - * Retrieve the nth (where n is the `index` argument) phdr (program - * header) from the given elf instance. --- -2.9.3 - diff --git a/package.bak/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch b/package.bak/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch deleted file mode 100644 index 5172dbbf20..0000000000 --- a/package.bak/lttng-libust/0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f54894580da85e33f934c5c9bf5ab32d3fcce18b Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 30 Nov 2016 16:52:51 +0000 -Subject: [PATCH] doc/examples/Makefile.am: define C and C++ compilers for - CMake - -This prevents build failures when cross-compiling. - -If we don't define the compiler, it will use the one from the host -machine. For instance "/usr/bin/c++", which is incorrect. - -The failure looks like this: - -............................................................. -[ 10%] Building CXX object CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -/usr/bin/c++ -Dtracepoint_provider_EXPORTS -I/br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/. -isystem /br/output/build/lttng-libust-2.9.0/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -fPIC -o CMakeFiles/tracepoint-provider.dir/tracepoint-provider.cpp.o -c /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp -In file included from /br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint.h:29:0, - from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.h:32, - from /br/output/build/lttng-libust-2.9.0/doc/examples/cmake-multiple-shared-libraries/tracepoint-provider.cpp:26: -/br/output/build/lttng-libust-2.9.0/include/lttng/tracepoint-rcu.h:26:27: fatal error: urcu/compiler.h: No such file or directory - #include - ^ -compilation terminated. -............................................................. - -Pull request URL: https://github.com/lttng/lttng-ust/pull/41 - -Signed-off-by: Vicente Olivert Riera ---- - doc/examples/Makefile.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am -index 424b844..5bc1f4c 100644 ---- a/doc/examples/Makefile.am -+++ b/doc/examples/Makefile.am -@@ -152,7 +152,9 @@ all-local: - cmake \ - -DCMAKE_INCLUDE_PATH="$(abs_top_srcdir)/include;$(abs_top_builddir)/include" \ - -DCMAKE_LIBRARY_PATH="$(abs_top_builddir)/liblttng-ust/.libs" \ -+ -DCMAKE_C_COMPILER="$(CC)" \ - -DCMAKE_C_FLAGS="$(CFLAGS) $(CPPFLAGS)" \ -+ -DCMAKE_CXX_COMPILER="$(CXX)" \ - -DCMAKE_CXX_FLAGS="$(CXXFLAGS) $(CPPFLAGS)" \ - -DCMAKE_EXE_LINKER_FLAGS="$(LDFLAGS)" \ - .. && \ --- -2.10.1 - diff --git a/package.bak/lttng-libust/Config.in b/package.bak/lttng-libust/Config.in deleted file mode 100644 index 4aba18886e..0000000000 --- a/package.bak/lttng-libust/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_LTTNG_LIBUST - bool "lttng-libust" - select BR2_PACKAGE_LIBURCU - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - depends on BR2_USE_WCHAR # uses wchar_t - # liburcu only works on some architectures and requires threads support" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - Userspace tracing library for the LTTng 2.x tracing - infrastructure. It allows userspace programs to create - custom trace events that are integrated with all other - events gathered by LTTng. - - http://lttng.org - -comment "lttng-libust needs a toolchain w/ dynamic library, wchar, threads" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/lttng-libust/lttng-libust.hash b/package.bak/lttng-libust/lttng-libust.hash deleted file mode 100644 index e080361a57..0000000000 --- a/package.bak/lttng-libust/lttng-libust.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lttng.org/files/lttng-ust/lttng-ust-2.9.0.tar.bz2.{md5,sha1} -md5 77f3378ba37a36801420bce87b702e9c lttng-ust-2.9.0.tar.bz2 -sha1 9937eae64540821b8597cce081e92be76e6b5568 lttng-ust-2.9.0.tar.bz2 diff --git a/package.bak/lttng-libust/lttng-libust.mk b/package.bak/lttng-libust/lttng-libust.mk deleted file mode 100644 index 5667abb82d..0000000000 --- a/package.bak/lttng-libust/lttng-libust.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# lttng-libust -# -################################################################################ - -LTTNG_LIBUST_SITE = http://lttng.org/files/lttng-ust -LTTNG_LIBUST_VERSION = 2.9.0 -LTTNG_LIBUST_SOURCE = lttng-ust-$(LTTNG_LIBUST_VERSION).tar.bz2 -LTTNG_LIBUST_LICENSE = LGPLv2.1, MIT (system headers), GPLv2 (liblttng-ust-ctl/ustctl.c used by lttng-sessiond) -LTTNG_LIBUST_LICENSE_FILES = COPYING -LTTNG_LIBUST_INSTALL_STAGING = YES -LTTNG_LIBUST_DEPENDENCIES = liburcu util-linux -LTTNG_LIBUST_CONF_OPTS += --disable-man-pages -# 0002-doc-examples-Makefile.am-define-C-and-C-compilers-fo.patch -LTTNG_LIBUST_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_PYTHON),y) -LTTNG_LIBUST_DEPENDENCIES += python -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -LTTNG_LIBUST_DEPENDENCIES += python3 -LTTNG_LIBUST_CONF_OPTS += --enable-python-agent -else -LTTNG_LIBUST_CONF_ENV = am_cv_pathless_PYTHON="none" -LTTNG_LIBUST_CONF_OPTS += --disable-python-agent -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lttng-modules/Config.in b/package.bak/lttng-modules/Config.in deleted file mode 100644 index e8ba9bad8c..0000000000 --- a/package.bak/lttng-modules/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_LTTNG_MODULES - bool "lttng-modules" - depends on BR2_LINUX_KERNEL - help - Linux kernel modules for the LTTng 2.x kernel tracing - infrastructure. - - Make sure your target kernel has the following config - options enabled: - - * CONFIG_MODULES: loadable module support - * CONFIG_KALLSYMS: this is necessary until the few - required missing symbols are exported to GPL - modules from mainline - * CONFIG_HIGH_RES_TIMERS: needed for LTTng 2.x - clock source - * CONFIG_TRACEPOINTS: kernel tracepoint instrumentation - (enabled as a side-effect of any of the - perf/ftrace/blktrace instrumentation features) - - The following kernel configuration options will - affect the features available from LTTng: - - * CONFIG_HAVE_SYSCALL_TRACEPOINTS: system call tracing - * CONFIG_PERF_EVENTS: performance counters - * CONFIG_EVENT_TRACING: needed to allow block layer tracing - * CONFIG_KPROBES: dynamic probes - * CONFIG_KRETPROBES: dynamic function entry/return probes - * CONFIG_KALLSYMS_ALL: state dump of mapping between block - device number and name - - The packaged version is compatible with Linux 2.6.38 to 3.16. - - http://lttng.org - -comment "lttng-modules needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/lttng-modules/lttng-modules.hash b/package.bak/lttng-modules/lttng-modules.hash deleted file mode 100644 index d8314f6e79..0000000000 --- a/package.bak/lttng-modules/lttng-modules.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lttng.org/files/lttng-modules/lttng-modules-2.9.0.tar.bz2.{md5,sha1} -md5 717df375ccb6f32bb297cc2f2e692bbf lttng-modules-2.9.0.tar.bz2 -sha1 819ee1c2a5a821b7fdc1c2fc102ef3079c32aad7 lttng-modules-2.9.0.tar.bz2 diff --git a/package.bak/lttng-modules/lttng-modules.mk b/package.bak/lttng-modules/lttng-modules.mk deleted file mode 100644 index aa0ac30b24..0000000000 --- a/package.bak/lttng-modules/lttng-modules.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# lttng-modules -# -################################################################################ - -LTTNG_MODULES_VERSION = 2.9.0 -LTTNG_MODULES_SITE = http://lttng.org/files/lttng-modules -LTTNG_MODULES_SOURCE = lttng-modules-$(LTTNG_MODULES_VERSION).tar.bz2 -LTTNG_MODULES_LICENSE = LGPLv2.1/GPLv2 (kernel modules), MIT (lib/bitfield.h, lib/prio_heap/*) -LTTNG_MODULES_LICENSE_FILES = lgpl-2.1.txt gpl-2.0.txt mit-license.txt LICENSE -LTTNG_MODULES_MODULE_MAKE_OPTS = CONFIG_LTTNG=m CONFIG_LTTNG_CLOCK_PLUGIN_TEST=m - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/lttng-tools/Config.in b/package.bak/lttng-tools/Config.in deleted file mode 100644 index 187e424b0b..0000000000 --- a/package.bak/lttng-tools/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_LTTNG_TOOLS - bool "lttng-tools" - # liburcu only works on some architectures and requires thread support - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # uses dlfcn - select BR2_PACKAGE_LIBURCU - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_POPT - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Userspace utilities for the LTTng 2.x tracing - infrastructure. - - Those utilities are required on the target system to start - and stop tracing sessions. Analysis of the trace can be done - on the host machine using the babeltrace utility. This - utility is automatically built by Buildroot in - $(O)/host/usr/bin/babeltrace, as a dependency of - lttng-tools. However, there is also a lttng-babeltrace - package for the target, if babeltrace on the target is - interesting. - - If userspace tracing is desired, you need to enable - lttng-libust. - - http://lttng.org - -comment "lttng-tools needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/lttng-tools/lttng-tools.hash b/package.bak/lttng-tools/lttng-tools.hash deleted file mode 100644 index 4f3d2837cb..0000000000 --- a/package.bak/lttng-tools/lttng-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lttng.org/files/lttng-tools/lttng-tools-2.9.3.tar.bz2.{md5,sha1} -md5 19fdcc5e9c307ef66581a2743a08a541 lttng-tools-2.9.3.tar.bz2 -sha1 78fdc9b7fd15f33ac60ea08320d679ce66e18bf7 lttng-tools-2.9.3.tar.bz2 diff --git a/package.bak/lttng-tools/lttng-tools.mk b/package.bak/lttng-tools/lttng-tools.mk deleted file mode 100644 index 2df2dffa17..0000000000 --- a/package.bak/lttng-tools/lttng-tools.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# lttng-tools -# -################################################################################ - -LTTNG_TOOLS_VERSION = 2.9.3 -LTTNG_TOOLS_SITE = http://lttng.org/files/lttng-tools -LTTNG_TOOLS_SOURCE = lttng-tools-$(LTTNG_TOOLS_VERSION).tar.bz2 -LTTNG_TOOLS_LICENSE = GPLv2+, LGPLv2.1+ (include/lttng/*, src/lib/lttng-ctl/*) -LTTNG_TOOLS_LICENSE_FILES = gpl-2.0.txt lgpl-2.1.txt LICENSE -LTTNG_TOOLS_CONF_OPTS += --disable-man-pages - -LTTNG_TOOLS_DEPENDENCIES = liburcu libxml2 popt util-linux - -ifeq ($(BR2_PACKAGE_LTTNG_LIBUST),y) -LTTNG_TOOLS_CONF_OPTS += --with-lttng-ust -LTTNG_TOOLS_DEPENDENCIES += lttng-libust -else -LTTNG_TOOLS_CONF_OPTS += --without-lttng-ust -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lua-cjson/Config.in b/package.bak/lua-cjson/Config.in deleted file mode 100644 index 1f4c7c7982..0000000000 --- a/package.bak/lua-cjson/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_LUA_CJSON - bool "lua-cjson" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - The Lua CJSON module provides JSON support for Lua. It features: - - Fast, standards compliant encoding/parsing routines - - Full support for JSON with UTF-8, including decoding surrogate pairs - - Optional run-time support for common exceptions to the JSON - specification (infinity, NaN, ...) - - No dependencies on other libraries - - (C-module) - - http://www.kyne.com.au/~mark/software/lua-cjson.php diff --git a/package.bak/lua-cjson/lua-cjson.hash b/package.bak/lua-cjson/lua-cjson.hash deleted file mode 100644 index 852dc67814..0000000000 --- a/package.bak/lua-cjson/lua-cjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 db7af849c555d1a474f729fe4a56b5530e9be7b24749eb7a7c474a7c7207b972 lua-cjson-2.1.0-1.src.rock diff --git a/package.bak/lua-cjson/lua-cjson.mk b/package.bak/lua-cjson/lua-cjson.mk deleted file mode 100644 index 16cb97412a..0000000000 --- a/package.bak/lua-cjson/lua-cjson.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# lua-cjson -# -################################################################################ - -LUA_CJSON_VERSION_UPSTREAM = 2.1.0 -LUA_CJSON_VERSION = $(LUA_CJSON_VERSION_UPSTREAM)-1 -LUA_CJSON_LICENSE = MIT -LUA_CJSON_LICENSE_FILES = lua-cjson-$(LUA_CJSON_VERSION_UPSTREAM)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-coat/Config.in b/package.bak/lua-coat/Config.in deleted file mode 100644 index f6ba6cf684..0000000000 --- a/package.bak/lua-coat/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LUA_COAT - bool "lua-coat" - help - Yet Another Lua Object-Oriented Model - - http://fperrad.github.io/lua-Coat/ diff --git a/package.bak/lua-coat/lua-coat.hash b/package.bak/lua-coat/lua-coat.hash deleted file mode 100644 index ad15a38b9f..0000000000 --- a/package.bak/lua-coat/lua-coat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 38a8342f6b3883a81931feaa9ef90a6343445289f3d65a296f0924818587c7d4 lua-coat-0.9.1-1.src.rock diff --git a/package.bak/lua-coat/lua-coat.mk b/package.bak/lua-coat/lua-coat.mk deleted file mode 100644 index 205995ed63..0000000000 --- a/package.bak/lua-coat/lua-coat.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lua-coat -# -################################################################################ - -LUA_COAT_VERSION_UPSTREAM = 0.9.1 -LUA_COAT_VERSION = $(LUA_COAT_VERSION_UPSTREAM)-1 -LUA_COAT_SUBDIR = lua-Coat-$(LUA_COAT_VERSION_UPSTREAM) -LUA_COAT_LICENSE = MIT -LUA_COAT_LICENSE_FILES = $(LUA_COAT_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-coatpersistent/Config.in b/package.bak/lua-coatpersistent/Config.in deleted file mode 100644 index a0f5bdc0d0..0000000000 --- a/package.bak/lua-coatpersistent/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LUA_COATPERSISTENT - bool "lua-coatpersistent" - # run-time dependencies - select BR2_PACKAGE_DADO - select BR2_PACKAGE_LUA_COAT - depends on BR2_PACKAGE_LSQLITE3 || BR2_PACKAGE_LUASQL_SQLITE3 - help - An ORM for lua-Coat. - - http://fperrad.github.io/lua-CoatPersistent/ - -comment "lua-coatpersistent needs lsqlite3 or luasql-sqlite3" - depends on !BR2_PACKAGE_LSQLITE3 && !BR2_PACKAGE_LUASQL_SQLITE3 diff --git a/package.bak/lua-coatpersistent/lua-coatpersistent.hash b/package.bak/lua-coatpersistent/lua-coatpersistent.hash deleted file mode 100644 index ddd3c9bb6a..0000000000 --- a/package.bak/lua-coatpersistent/lua-coatpersistent.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 46f5a1988a47b988d729df2937589756d989df7c26dac6aaf2a331a7b15bf7cf lua-coatpersistent-lsqlite3-0.2.1-1.src.rock -sha256 8053428fa7a6229d70ae161ec55a24b28c210078ac494161d48b6bf74ed000ca lua-coatpersistent-luasql-0.2.1-1.src.rock diff --git a/package.bak/lua-coatpersistent/lua-coatpersistent.mk b/package.bak/lua-coatpersistent/lua-coatpersistent.mk deleted file mode 100644 index be8a4da468..0000000000 --- a/package.bak/lua-coatpersistent/lua-coatpersistent.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# lua-coatpersistent -# -################################################################################ - -LUA_COATPERSISTENT_VERSION_UPSTREAM = 0.2.1 -ifeq ($(BR2_PACKAGE_LSQLITE3),y) -LUA_COATPERSISTENT_VERSION = lsqlite3-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1 -else -LUA_COATPERSISTENT_VERSION = luasql-$(LUA_COATPERSISTENT_VERSION_UPSTREAM)-1 -endif -LUA_COATPERSISTENT_SUBDIR = lua-CoatPersistent-$(LUA_COATPERSISTENT_VERSION_UPSTREAM) -LUA_COATPERSISTENT_LICENSE = MIT -LUA_COATPERSISTENT_LICENSE_FILES = $(LUA_COATPERSISTENT_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-csnappy/Config.in b/package.bak/lua-csnappy/Config.in deleted file mode 100644 index 0562277a0f..0000000000 --- a/package.bak/lua-csnappy/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LUA_CSNAPPY - bool "lua-csnappy" - help - lua-csnappy is a binding of the csnappy library - which implements the Google's Snappy (de)compressor. - - http://fperrad.github.io/lua-csnappy/ - diff --git a/package.bak/lua-csnappy/lua-csnappy.hash b/package.bak/lua-csnappy/lua-csnappy.hash deleted file mode 100644 index 136363497f..0000000000 --- a/package.bak/lua-csnappy/lua-csnappy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 855331feb8e09a32eea8366ab9bcd4386db6392de82383f08ae5e59adbb7d8a6 lua-csnappy-0.1.4-1.src.rock diff --git a/package.bak/lua-csnappy/lua-csnappy.mk b/package.bak/lua-csnappy/lua-csnappy.mk deleted file mode 100644 index 073925917d..0000000000 --- a/package.bak/lua-csnappy/lua-csnappy.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lua-csnappy -# -################################################################################ - -LUA_CSNAPPY_VERSION_UPSTREAM = 0.1.4 -LUA_CSNAPPY_VERSION = $(LUA_CSNAPPY_VERSION_UPSTREAM)-1 -LUA_CSNAPPY_SUBDIR = lua-csnappy-$(LUA_CSNAPPY_VERSION_UPSTREAM) -LUA_CSNAPPY_LICENSE = BSD-3c -LUA_CSNAPPY_LICENSE_FILES = $(LUA_CSNAPPY_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-ev/Config.in b/package.bak/lua-ev/Config.in deleted file mode 100644 index 4b3f8ed185..0000000000 --- a/package.bak/lua-ev/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LUA_EV - bool "lua-ev" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - select BR2_PACKAGE_LIBEV - depends on !BR2_bfin # libev - help - Get access to the libev library from Lua. - - https://github.com/brimworks/lua-ev diff --git a/package.bak/lua-ev/lua-ev.hash b/package.bak/lua-ev/lua-ev.hash deleted file mode 100644 index 522e7e7e88..0000000000 --- a/package.bak/lua-ev/lua-ev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f7f5df5ecfe4bd54797261d1b1bd3f770d39128b7aba72deef6d1d8d8e2b53fe lua-ev-v1.4.tar.gz diff --git a/package.bak/lua-ev/lua-ev.mk b/package.bak/lua-ev/lua-ev.mk deleted file mode 100644 index 68f7fc75b0..0000000000 --- a/package.bak/lua-ev/lua-ev.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# lua-ev -# -################################################################################ - -LUA_EV_VERSION = v1.4 -LUA_EV_SITE = $(call github,brimworks,lua-ev,$(LUA_EV_VERSION)) -LUA_EV_DEPENDENCIES = luainterpreter libev -LUA_EV_LICENSE = MIT -LUA_EV_LICENSE_FILES = README -LUA_EV_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(cmake-package)) diff --git a/package.bak/lua-iconv/Config.in b/package.bak/lua-iconv/Config.in deleted file mode 100644 index e76019d676..0000000000 --- a/package.bak/lua-iconv/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LUA_ICONV - bool "lua-iconv" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Lua binding to the POSIX 'iconv' library - - http://ittner.github.io/lua-iconv/ diff --git a/package.bak/lua-iconv/lua-iconv.hash b/package.bak/lua-iconv/lua-iconv.hash deleted file mode 100644 index 46291026cf..0000000000 --- a/package.bak/lua-iconv/lua-iconv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fb66e785e15376c2d2817f1f1b27d10272b877eacc998c727a10f081a7d768fa lua-iconv-7-1.src.rock diff --git a/package.bak/lua-iconv/lua-iconv.mk b/package.bak/lua-iconv/lua-iconv.mk deleted file mode 100644 index f0afa2b85e..0000000000 --- a/package.bak/lua-iconv/lua-iconv.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# lua-iconv -# -################################################################################ - -LUA_ICONV_VERSION_UPSTREAM = 7 -LUA_ICONV_VERSION = $(LUA_ICONV_VERSION_UPSTREAM)-1 -LUA_ICONV_SUBDIR = lua-iconv-$(LUA_ICONV_VERSION_UPSTREAM) -LUA_ICONV_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) -LUA_ICONV_LICENSE = MIT -LUA_ICONV_LICENSE_FILES = $(LUA_ICONV_SUBDIR)/COPYING - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-messagepack/Config.in b/package.bak/lua-messagepack/Config.in deleted file mode 100644 index 2dab316a8d..0000000000 --- a/package.bak/lua-messagepack/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_LUA_MESSAGEPACK - bool "lua-messagepack" - help - A pure Lua implementation of the MessagePack serialization - format. - - http://fperrad.github.io/lua-MessagePack/ diff --git a/package.bak/lua-messagepack/lua-messagepack.hash b/package.bak/lua-messagepack/lua-messagepack.hash deleted file mode 100644 index 7da34e13df..0000000000 --- a/package.bak/lua-messagepack/lua-messagepack.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 a8aac195dc835101a025385b4c5b596de6602c4ced85e0df35b7f52e6aa6ee5d lua-messagepack-0.4.0-1.src.rock -sha256 85a3eef21e10eb6c3ebf584ce950610fc10457746a4b8dbcbcab4b626f7d3265 lua-messagepack-lua53-0.4.0-1.src.rock diff --git a/package.bak/lua-messagepack/lua-messagepack.mk b/package.bak/lua-messagepack/lua-messagepack.mk deleted file mode 100644 index 15fc182564..0000000000 --- a/package.bak/lua-messagepack/lua-messagepack.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# lua-messagepack -# -################################################################################ - -LUA_MESSAGEPACK_VERSION_UPSTREAM = 0.4.0 -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_MESSAGEPACK_VERSION = lua53-$(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -else -LUA_MESSAGEPACK_VERSION = $(LUA_MESSAGEPACK_VERSION_UPSTREAM)-1 -endif -LUA_MESSAGEPACK_SUBDIR = lua-MessagePack-$(LUA_MESSAGEPACK_VERSION_UPSTREAM) -LUA_MESSAGEPACK_LICENSE = MIT -LUA_MESSAGEPACK_LICENSE_FILES = $(LUA_MESSAGEPACK_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-msgpack-native/Config.in b/package.bak/lua-msgpack-native/Config.in deleted file mode 100644 index 3837228fa0..0000000000 --- a/package.bak/lua-msgpack-native/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LUA_MSGPACK_NATIVE - bool "lua-msgpack-native" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT - help - This is a native, C language implementation of msgpack - (http://msgpack.org) library/protocol for Lua language - - https://github.com/kengonakajima/lua-msgpack-native - -comment "lua-msgpack-native needs a Lua 5.1 interpreter" - depends on !BR2_PACKAGE_LUA_5_1 - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/lua-msgpack-native/lua-msgpack-native.hash b/package.bak/lua-msgpack-native/lua-msgpack-native.hash deleted file mode 100644 index cfc598319d..0000000000 --- a/package.bak/lua-msgpack-native/lua-msgpack-native.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 025cf91d509fa3985869d18ef9b8eaeb875ff3c9fcf6467beeed6eab3bb35c93 lua-msgpack-native-41a91b994c70389dc9daa1a15678741d8ec41749.tar.gz diff --git a/package.bak/lua-msgpack-native/lua-msgpack-native.mk b/package.bak/lua-msgpack-native/lua-msgpack-native.mk deleted file mode 100644 index acd3a0e1c9..0000000000 --- a/package.bak/lua-msgpack-native/lua-msgpack-native.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# lua-msgpack-native -# -################################################################################ - -LUA_MSGPACK_NATIVE_VERSION = 41a91b994c70389dc9daa1a15678741d8ec41749 -LUA_MSGPACK_NATIVE_SITE = $(call github,kengonakajima,lua-msgpack-native,$(LUA_MSGPACK_NATIVE_VERSION)) -LUA_MSGPACK_NATIVE_DEPENDENCIES = luainterpreter -LUA_MSGPACK_NATIVE_LICENSE = Apache-2.0 -LUA_MSGPACK_NATIVE_LICENSE_FILES = LICENSE.txt - -define LUA_MSGPACK_NATIVE_BUILD_CMDS - $(TARGET_CC) $(TARGET_CFLAGS) -fPIC -shared -o $(@D)/msgpack.so $(@D)/mp.c -endef - -define LUA_MSGPACK_NATIVE_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/msgpack.so \ - $(TARGET_DIR)/usr/lib/lua/$(LUAINTERPRETER_ABIVER)/msgpack.so -endef - -$(eval $(generic-package)) diff --git a/package.bak/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch b/package.bak/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch deleted file mode 100644 index 22c748ccb3..0000000000 --- a/package.bak/lua-periphery/0001-Add-missing-header-for-musl-compatibility.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1d8cb0ad54099c3d7261aaa19a2c0786f16736d0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 8 Aug 2015 22:42:39 +0200 -Subject: [PATCH] Add missing header for musl compatibility - - is needed to get the definition of _IOC_SIZEBITS and -solve the following build failure: - -src/spi.c: In function 'spi_transfer': -src/spi.c:100:24: error: '_IOC_SIZEBITS' undeclared (first use in this function) - if (ioctl(spi->fd, SPI_IOC_MESSAGE(1), &spi_xfer) < 1) - -Signed-off-by: Thomas Petazzoni -[Port from c-periphery] -Signed-off-by: Jörg Krause ---- - src/spi.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/lua-periphery/c-periphery/src/spi.c b/lua-periphery/c-periphery/src/spi.c -index 52a8d3d..1a6b17c 100644 ---- a/lua-periphery/c-periphery/src/spi.c -+++ b/lua-periphery/c-periphery/src/spi.c -@@ -16,6 +16,7 @@ - #include - - #include -+#include - #include - - #include "spi.h" --- -2.5.0 - diff --git a/package.bak/lua-periphery/0002-Fix-build-on-SPARC.patch b/package.bak/lua-periphery/0002-Fix-build-on-SPARC.patch deleted file mode 100644 index ce461ddca2..0000000000 --- a/package.bak/lua-periphery/0002-Fix-build-on-SPARC.patch +++ /dev/null @@ -1,60 +0,0 @@ -[PATCH] Fix build on SPARC - -On SPARC, the definitions of B2500000, B3000000, B3500000 and B4000000 -are not necessarily available, so use those values only if defined in -the kernel headers. - -It fixes SPARC build failures such as: - -src/serial.c: In function '_serial_baudrate_to_bits': -src/serial.c:73:30: error: 'B2500000' undeclared (first use in this function) - case 2500000: return B2500000; - ^ -src/serial.c:73:30: note: each undeclared identifier is reported only once for each function it appears in -src/serial.c:74:30: error: 'B3000000' undeclared (first use in this function) - case 3000000: return B3000000; - ^ -Signed-off-by: Thomas Petazzoni - -Index: b/lua-periphery/c-periphery/src/serial.c -=================================================================== ---- a/lua-periphery/c-periphery/src/serial.c -+++ b/lua-periphery/c-periphery/src/serial.c -@@ -70,10 +70,18 @@ - case 1152000: return B1152000; - case 1500000: return B1500000; - case 2000000: return B2000000; -+#ifdef B2500000 - case 2500000: return B2500000; -+#endif -+#ifdef B3000000 - case 3000000: return B3000000; -+#endif -+#ifdef B3500000 - case 3500000: return B3500000; -+#endif -+#ifdef B4000000 - case 4000000: return B4000000; -+#endif - default: return -1; - } - } -@@ -107,10 +115,18 @@ - case B1152000: return 1152000; - case B1500000: return 1500000; - case B2000000: return 2000000; -+#ifdef B2500000 - case B2500000: return 2500000; -+#endif -+#ifdef B3000000 - case B3000000: return 3000000; -+#endif -+#ifdef B3500000 - case B3500000: return 3500000; -+#endif -+#ifdef B4000000 - case B4000000: return 4000000; -+#endif - default: return -1; - } - } diff --git a/package.bak/lua-periphery/Config.in b/package.bak/lua-periphery/Config.in deleted file mode 100644 index de5a71633c..0000000000 --- a/package.bak/lua-periphery/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LUA_PERIPHERY - bool "lua-periphery" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - A library for GPIO, SPI, I2C, MMIO, and Serial peripheral I/O - interface access in userspace Linux with Lua. - - https://github.com/vsergeev/lua-periphery diff --git a/package.bak/lua-periphery/lua-periphery.hash b/package.bak/lua-periphery/lua-periphery.hash deleted file mode 100644 index 7f6e63f3bb..0000000000 --- a/package.bak/lua-periphery/lua-periphery.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 53762ed9b8a2edfcc5b4c535ef73e6a425f2577e036bb15994ca16a39b16ebab lua-periphery-1.0.6-1.src.rock diff --git a/package.bak/lua-periphery/lua-periphery.mk b/package.bak/lua-periphery/lua-periphery.mk deleted file mode 100644 index 48eba39289..0000000000 --- a/package.bak/lua-periphery/lua-periphery.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lua-periphery -# -################################################################################ - -LUA_PERIPHERY_VERSION_UPSTREAM = 1.0.6 -LUA_PERIPHERY_VERSION = $(LUA_PERIPHERY_VERSION_UPSTREAM)-1 -LUA_PERIPHERY_SUBDIR = lua-periphery -LUA_PERIPHERY_LICENSE = MIT -LUA_PERIPHERY_LICENSE_FILES = $(LUA_PERIPHERY_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/lua-testmore/Config.in b/package.bak/lua-testmore/Config.in deleted file mode 100644 index 61dea3a6ee..0000000000 --- a/package.bak/lua-testmore/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LUA_TESTMORE - bool "lua-testmore" - help - an Unit Testing Framework. - - http://fperrad.github.io/lua-TestMore/ diff --git a/package.bak/lua-testmore/lua-testmore.hash b/package.bak/lua-testmore/lua-testmore.hash deleted file mode 100644 index 439097b933..0000000000 --- a/package.bak/lua-testmore/lua-testmore.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a76a9b707487bf3e8b6a5362640bc2e010d184c4f66e423de7b28bd480a0db90 lua-testmore-0.3.2-1.src.rock diff --git a/package.bak/lua-testmore/lua-testmore.mk b/package.bak/lua-testmore/lua-testmore.mk deleted file mode 100644 index 771b97f000..0000000000 --- a/package.bak/lua-testmore/lua-testmore.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lua-testmore -# -################################################################################ - -LUA_TESTMORE_VERSION_UPSTREAM = 0.3.2 -LUA_TESTMORE_VERSION = $(LUA_TESTMORE_VERSION_UPSTREAM)-1 -LUA_TESTMORE_SUBDIR = lua-TestMore-$(LUA_TESTMORE_VERSION_UPSTREAM) -LUA_TESTMORE_LICENSE = MIT -LUA_TESTMORE_LICENSE_FILES = $(LUA_TESTMORE_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/lua/5.1.5/0001-root-path.patch b/package.bak/lua/5.1.5/0001-root-path.patch deleted file mode 100644 index fd0da6eb57..0000000000 --- a/package.bak/lua/5.1.5/0001-root-path.patch +++ /dev/null @@ -1,30 +0,0 @@ -Adjust installation location to /usr. - -Signed-off-by: Francois Perrad - -Index: b/etc/lua.pc -=================================================================== ---- a/etc/lua.pc -+++ b/etc/lua.pc -@@ -8,7 +8,7 @@ - R= 5.1.5 - - # grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' --prefix= /usr/local -+prefix= /usr - INSTALL_BIN= ${prefix}/bin - INSTALL_INC= ${prefix}/include - INSTALL_LIB= ${prefix}/lib -Index: b/src/luaconf.h -=================================================================== ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -94,7 +94,7 @@ - ".\\?.dll;" LUA_CDIR"?.dll;" LUA_CDIR"loadall.dll" - - #else --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/5.1/" - #define LUA_CDIR LUA_ROOT "lib/lua/5.1/" - #define LUA_PATH_DEFAULT \ diff --git a/package.bak/lua/5.1.5/0002-shared-libs-for-lua.patch b/package.bak/lua/5.1.5/0002-shared-libs-for-lua.patch deleted file mode 100644 index 3f863a530c..0000000000 --- a/package.bak/lua/5.1.5/0002-shared-libs-for-lua.patch +++ /dev/null @@ -1,78 +0,0 @@ -Add the compilation of a shared library. -Compile the lua binary with the shared library. -And install the shared library. -The variable BUILDMODE allows to switch between static and dynamic mode. - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -44,6 +44,7 @@ - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h ../etc/lua.hpp - TO_LIB= liblua.a -+TO_SOLIB = liblua.so.$(R) - TO_MAN= lua.1 luac.1 - - # Lua version and release. -@@ -61,6 +62,8 @@ - install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) -+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || : -+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || : - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -23,6 +23,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o lmem.o \ - lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o ltm.o \ - lundump.o lvm.o lzio.o -@@ -36,8 +37,13 @@ - LUAC_O= luac.o print.o - - ALL_O= $(CORE_O) $(LIB_O) $(LUA_O) $(LUAC_O) -+ifneq (dynamic,$(BUILDMODE)) - ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+else -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) -+endif - ALL_A= $(LUA_A) -+ALL_SO= $(LUA_SO) - - default: $(PLAT) - -@@ -47,12 +53,23 @@ - - a: $(ALL_A) - -+so: $(ALL_SO) -+ - $(LUA_A): $(CORE_O) $(LIB_O) - $(AR) $@ $(CORE_O) $(LIB_O) # DLL needs all object files - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -+ ln -fs $@.$(PKG_VERSION) $@ -+ -+ifneq (dynamic,$(BUILDMODE)) - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+else -+$(LUA_T): $(LUA_O) $(LUA_SO) -+ $(CC) -o $@ -L. $(MYLDFLAGS) $(LUA_O) -llua $(LIBS) -+endif - - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(MYLDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/package.bak/lua/5.1.5/0011-linenoise.patch b/package.bak/lua/5.1.5/0011-linenoise.patch deleted file mode 100644 index 488c080a1e..0000000000 --- a/package.bak/lua/5.1.5/0011-linenoise.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add support of linenoise (replace readline) - -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - -Signed-off-by: Francois Perrad - -Index: b/src/luaconf.h -=================================================================== ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -279,6 +279,13 @@ - if (lua_strlen(L,idx) > 0) /* non-empty line? */ \ - add_history(lua_tostring(L, idx)); /* add it to history */ - #define lua_freeline(L,b) ((void)L, free(b)) -+#elif defined(LUA_USE_LINENOISE) -+#include -+#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) -+#define lua_saveline(L,idx) \ -+ if (lua_strlen(L,idx) > 0) /* non-empty line? */ \ -+ linenoiseHistoryAdd(lua_tostring(L, idx)); /* add it to history */ -+#define lua_freeline(L,b) ((void)L, free(b)) - #else - #define lua_readline(L,b,p) \ - ((void)L, fputs(p, stdout), fflush(stdout), /* show prompt */ \ diff --git a/package.bak/lua/5.1.5/0012-fix-reader-at-eoz.patch b/package.bak/lua/5.1.5/0012-fix-reader-at-eoz.patch deleted file mode 100644 index 17a28ba4c3..0000000000 --- a/package.bak/lua/5.1.5/0012-fix-reader-at-eoz.patch +++ /dev/null @@ -1,46 +0,0 @@ -When loading a file, Lua may call the reader function again after it returned end of input. - -Fetch from: http://www.lua.org/bugs.html#5.1.5-2 - -Signed-off-by: Francois Perrad - -Index: b/src/lzio.c -=================================================================== ---- a/src/lzio.c -+++ b/src/lzio.c -@@ -22,10 +22,14 @@ - size_t size; - lua_State *L = z->L; - const char *buff; -+ if (z->eoz) return EOZ; - lua_unlock(L); - buff = z->reader(L, z->data, &size); - lua_lock(L); -- if (buff == NULL || size == 0) return EOZ; -+ if (buff == NULL || size == 0) { -+ z->eoz = 1; /* avoid calling reader function next time */ -+ return EOZ; -+ } - z->n = size - 1; - z->p = buff; - return char2int(*(z->p++)); -@@ -51,6 +55,7 @@ - z->data = data; - z->n = 0; - z->p = NULL; -+ z->eoz = 0; - } - - -Index: b/src/lzio.h -=================================================================== ---- a/src/lzio.h -+++ b/src/lzio.h -@@ -59,6 +59,7 @@ - lua_Reader reader; - void* data; /* additional data */ - lua_State *L; /* Lua state (for reader) */ -+ int eoz; /* true if reader has no more data */ - }; - - diff --git a/package.bak/lua/5.2.4/0001-root-path.patch b/package.bak/lua/5.2.4/0001-root-path.patch deleted file mode 100644 index c6f242c20e..0000000000 --- a/package.bak/lua/5.2.4/0001-root-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Adjust installation location to /usr. - -Signed-off-by: Francois Perrad - -Index: b/src/luaconf.h -=================================================================== ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -100,7 +100,7 @@ - #else /* }{ */ - - #define LUA_VDIR LUA_VERSION_MAJOR "." LUA_VERSION_MINOR "/" --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR - #define LUA_PATH_DEFAULT \ diff --git a/package.bak/lua/5.2.4/0002-shared-libs-for-lua.patch b/package.bak/lua/5.2.4/0002-shared-libs-for-lua.patch deleted file mode 100644 index 3cf3b24848..0000000000 --- a/package.bak/lua/5.2.4/0002-shared-libs-for-lua.patch +++ /dev/null @@ -1,78 +0,0 @@ -Add the compilation of a shared library. -Compile the lua binary with the shared library. -And install the shared library. -The variable BUILDMODE allows to switch between static and dynamic mode. - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -42,6 +42,7 @@ - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp - TO_LIB= liblua.a -+TO_SOLIB = liblua.so.$(R) - TO_MAN= lua.1 luac.1 - - # Lua version and release. -@@ -60,6 +61,8 @@ - install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) -+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || : -+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || : - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,6 +29,7 @@ - PLATS= aix ansi bsd freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,8 +44,13 @@ - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -+ifneq (dynamic,$(BUILDMODE)) - ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+else -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) -+endif - ALL_A= $(LUA_A) -+ALL_SO= $(LUA_SO) - - # Targets start here. - default: $(PLAT) -@@ -55,12 +61,23 @@ - - a: $(ALL_A) - -+so: $(ALL_SO) -+ - $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -+ ln -fs $@.$(PKG_VERSION) $@ -+ -+ifneq (dynamic,$(BUILDMODE)) - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+else -+$(LUA_T): $(LUA_O) $(LUA_SO) -+ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS) -+endif - - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/package.bak/lua/5.2.4/0004-lua-pc.patch b/package.bak/lua/5.2.4/0004-lua-pc.patch deleted file mode 100644 index 62acb201f2..0000000000 --- a/package.bak/lua/5.2.4/0004-lua-pc.patch +++ /dev/null @@ -1,40 +0,0 @@ -add lua.pc - -Signed-off-by: Francois Perrad - -Index: b/etc/lua.pc -=================================================================== ---- /dev/null -+++ b/etc/lua.pc -@@ -0,0 +1,31 @@ -+# lua.pc -- pkg-config data for Lua -+ -+# vars from install Makefile -+ -+# grep '^V=' ../Makefile -+V= 5.2 -+# grep '^R=' ../Makefile -+R= 5.2.3 -+ -+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -+prefix= /usr -+INSTALL_BIN= ${prefix}/bin -+INSTALL_INC= ${prefix}/include -+INSTALL_LIB= ${prefix}/lib -+INSTALL_MAN= ${prefix}/man/man1 -+INSTALL_LMOD= ${prefix}/share/lua/${V} -+INSTALL_CMOD= ${prefix}/lib/lua/${V} -+ -+# canonical vars -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: Lua -+Description: An Extensible Extension Language -+Version: ${R} -+Requires: -+Libs: -L${libdir} -llua -lm -+Cflags: -I${includedir} -+ -+# (end of lua.pc) diff --git a/package.bak/lua/5.2.4/0011-linenoise.patch b/package.bak/lua/5.2.4/0011-linenoise.patch deleted file mode 100644 index b1f228cd49..0000000000 --- a/package.bak/lua/5.2.4/0011-linenoise.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add support of linenoise (replace readline) - -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - -Signed-off-by: Francois Perrad - -Index: b/src/lua.c -=================================================================== ---- a/src/lua.c -+++ b/src/lua.c -@@ -72,6 +72,15 @@ - add_history(lua_tostring(L, idx)); /* add it to history */ - #define lua_freeline(L,b) ((void)L, free(b)) - -+#elif defined(LUA_USE_LINENOISE) -+ -+#include -+#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) -+#define lua_saveline(L,idx) \ -+ if (lua_rawlen(L,idx) > 0) /* non-empty line? */ \ -+ linenoiseHistoryAdd(lua_tostring(L, idx)); /* add it to history */ -+#define lua_freeline(L,b) ((void)L, free(b)) -+ - #elif !defined(lua_readline) - - #define lua_readline(L,b,p) \ diff --git a/package.bak/lua/5.3.4/0001-root-path.patch b/package.bak/lua/5.3.4/0001-root-path.patch deleted file mode 100644 index a44c55c955..0000000000 --- a/package.bak/lua/5.3.4/0001-root-path.patch +++ /dev/null @@ -1,17 +0,0 @@ -Adjust installation location to /usr. - -Signed-off-by: Francois Perrad - -Index: b/src/luaconf.h -=================================================================== ---- a/src/luaconf.h -+++ b/src/luaconf.h -@@ -200,7 +200,7 @@ - - #else /* }{ */ - --#define LUA_ROOT "/usr/local/" -+#define LUA_ROOT "/usr/" - #define LUA_LDIR LUA_ROOT "share/lua/" LUA_VDIR "/" - #define LUA_CDIR LUA_ROOT "lib/lua/" LUA_VDIR "/" - #define LUA_PATH_DEFAULT \ diff --git a/package.bak/lua/5.3.4/0002-shared-libs-for-lua.patch b/package.bak/lua/5.3.4/0002-shared-libs-for-lua.patch deleted file mode 100644 index 493828c9da..0000000000 --- a/package.bak/lua/5.3.4/0002-shared-libs-for-lua.patch +++ /dev/null @@ -1,78 +0,0 @@ -Add the compilation of a shared library. -Compile the lua binary with the shared library. -And install the shared library. -The variable BUILDMODE allows to switch between static and dynamic mode. - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -42,6 +42,7 @@ - TO_BIN= lua luac - TO_INC= lua.h luaconf.h lualib.h lauxlib.h lua.hpp - TO_LIB= liblua.a -+TO_SOLIB = liblua.so.$(R) - TO_MAN= lua.1 luac.1 - - # Lua version and release. -@@ -60,6 +61,8 @@ - install: dummy - cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD) - cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN) -+ test -f src/$(TO_SOLIB) && cd src && $(INSTALL_EXEC) $(TO_SOLIB) $(INSTALL_LIB) || : -+ test -f src/$(TO_SOLIB) && ln -sf $(TO_SOLIB) $(INSTALL_LIB)/liblua.so || : - cd src && $(INSTALL_DATA) $(TO_INC) $(INSTALL_INC) - cd src && $(INSTALL_DATA) $(TO_LIB) $(INSTALL_LIB) - cd doc && $(INSTALL_DATA) $(TO_MAN) $(INSTALL_MAN) -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,6 +29,7 @@ - PLATS= aix bsd c89 freebsd generic linux macosx mingw posix solaris - - LUA_A= liblua.a -+LUA_SO= liblua.so - CORE_O= lapi.o lcode.o lctype.o ldebug.o ldo.o ldump.o lfunc.o lgc.o llex.o \ - lmem.o lobject.o lopcodes.o lparser.o lstate.o lstring.o ltable.o \ - ltm.o lundump.o lvm.o lzio.o -@@ -43,8 +44,13 @@ - LUAC_O= luac.o - - ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O) -+ifneq (dynamic,$(BUILDMODE)) - ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T) -+else -+ALL_T= $(LUA_A) $(LUA_SO) $(LUA_T) $(LUAC_T) -+endif - ALL_A= $(LUA_A) -+ALL_SO= $(LUA_SO) - - # Targets start here. - default: $(PLAT) -@@ -55,12 +61,23 @@ - - a: $(ALL_A) - -+so: $(ALL_SO) -+ - $(LUA_A): $(BASE_O) - $(AR) $@ $(BASE_O) - $(RANLIB) $@ - -+$(LUA_SO): $(CORE_O) $(LIB_O) -+ $(CC) -o $@.$(PKG_VERSION) -shared -Wl,-soname="$@.$(PKG_VERSION)" $? -+ ln -fs $@.$(PKG_VERSION) $@ -+ -+ifneq (dynamic,$(BUILDMODE)) - $(LUA_T): $(LUA_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS) -+else -+$(LUA_T): $(LUA_O) $(LUA_SO) -+ $(CC) -o $@ -L. $(LDFLAGS) $(LUA_O) -llua $(LIBS) -+endif - - $(LUAC_T): $(LUAC_O) $(LUA_A) - $(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS) diff --git a/package.bak/lua/5.3.4/0004-lua-pc.patch b/package.bak/lua/5.3.4/0004-lua-pc.patch deleted file mode 100644 index 615a7db8fc..0000000000 --- a/package.bak/lua/5.3.4/0004-lua-pc.patch +++ /dev/null @@ -1,40 +0,0 @@ -add lua.pc - -Signed-off-by: Francois Perrad - -Index: b/etc/lua.pc -=================================================================== ---- /dev/null -+++ b/etc/lua.pc -@@ -0,0 +1,31 @@ -+# lua.pc -- pkg-config data for Lua -+ -+# vars from install Makefile -+ -+# grep '^V=' ../Makefile -+V= 5.3 -+# grep '^R=' ../Makefile -+R= 5.3.4 -+ -+# grep '^INSTALL_.*=' ../Makefile | sed 's/INSTALL_TOP/prefix/' -+prefix= /usr -+INSTALL_BIN= ${prefix}/bin -+INSTALL_INC= ${prefix}/include -+INSTALL_LIB= ${prefix}/lib -+INSTALL_MAN= ${prefix}/man/man1 -+INSTALL_LMOD= ${prefix}/share/lua/${V} -+INSTALL_CMOD= ${prefix}/lib/lua/${V} -+ -+# canonical vars -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: Lua -+Description: An Extensible Extension Language -+Version: ${R} -+Requires: -+Libs: -L${libdir} -llua -lm -+Cflags: -I${includedir} -+ -+# (end of lua.pc) diff --git a/package.bak/lua/5.3.4/0011-linenoise.patch b/package.bak/lua/5.3.4/0011-linenoise.patch deleted file mode 100644 index 574e6c8f0b..0000000000 --- a/package.bak/lua/5.3.4/0011-linenoise.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add support of linenoise (replace readline) - -see discussion, http://lua-users.org/lists/lua-l/2010-03/msg00879.html - -Signed-off-by: Francois Perrad - -Index: b/src/lua.c -=================================================================== ---- a/src/lua.c -+++ b/src/lua.c -@@ -85,6 +85,13 @@ - #define lua_saveline(L,line) ((void)L, add_history(line)) - #define lua_freeline(L,b) ((void)L, free(b)) - -+#elif defined(LUA_USE_LINENOISE) -+ -+#include -+#define lua_readline(L,b,p) ((void)L, ((b)=linenoise(p)) != NULL) -+#define lua_saveline(L,line) ((void)L, linenoiseHistoryAdd(line)) -+#define lua_freeline(L,b) ((void)L, free(b)) -+ - #else /* }{ */ - - #define lua_readline(L,b,p) \ diff --git a/package.bak/lua/Config.in b/package.bak/lua/Config.in deleted file mode 100644 index 711fa89163..0000000000 --- a/package.bak/lua/Config.in +++ /dev/null @@ -1,71 +0,0 @@ -config BR2_PACKAGE_LUA - bool "lua" - select BR2_PACKAGE_HAS_LUAINTERPRETER - help - Lua is a powerful, fast, light-weight, embeddable scripting language. - - http://www.lua.org/ - -if BR2_PACKAGE_LUA - -config BR2_PACKAGE_PROVIDES_LUAINTERPRETER - default "lua" - -choice - prompt "Lua Version" - default BR2_PACKAGE_LUA_5_3 - help - Select the version of Lua API/ABI you wish to use. - - config BR2_PACKAGE_LUA_5_1 - bool "Lua 5.1.x" - - config BR2_PACKAGE_LUA_5_2 - bool "Lua 5.2.x" - - config BR2_PACKAGE_LUA_5_3 - bool "Lua 5.3.x" - -endchoice - -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" if BR2_PACKAGE_LUA_5_1 - default "5.2" if BR2_PACKAGE_LUA_5_2 - default "5.3" if BR2_PACKAGE_LUA_5_3 - -if BR2_PACKAGE_LUA_5_3 -config BR2_PACKAGE_LUA_32BITS - bool "Use 32 bit numbers" - default y if !BR2_ARCH_IS_64 - help - Use a 32 bit data type for numbers / integers instead of the - default 64 bit type. This option is particularly attractive - for small machines and embedded systems. - -endif - -choice - prompt "Lua command-line editing" - default BR2_PACKAGE_LUA_EDITING_NONE - -config BR2_PACKAGE_LUA_EDITING_NONE - bool "none" - help - None. - -config BR2_PACKAGE_LUA_READLINE - bool "readline support" - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_NCURSES - help - Enables command-line editing in the Lua interpreter. - -config BR2_PACKAGE_LUA_LINENOISE - bool "linenoise support" - select BR2_PACKAGE_LINENOISE - help - Enables command-line editing in the Lua interpreter. - -endchoice - -endif diff --git a/package.bak/lua/lua.hash b/package.bak/lua/lua.hash deleted file mode 100644 index 32e7472c38..0000000000 --- a/package.bak/lua/lua.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Hashes from: http://www.lua.org/ftp/ -md5 53a9c68bcc0eda58bdc2095ad5cdfc63 lua-5.3.4.tar.gz -sha1 79790cfd40e09ba796b01a571d4d63b52b1cd950 lua-5.3.4.tar.gz - -md5 913fdb32207046b273fdb17aad70be13 lua-5.2.4.tar.gz -sha1 ef15259421197e3d85b7d6e4871b8c26fd82c1cf lua-5.2.4.tar.gz - -md5 2e115fe26e435e33b0d5c022e4490567 lua-5.1.5.tar.gz -sha1 b3882111ad02ecc6b972f8c1241647905cb2e3fc lua-5.1.5.tar.gz diff --git a/package.bak/lua/lua.mk b/package.bak/lua/lua.mk deleted file mode 100644 index 5ef61e039e..0000000000 --- a/package.bak/lua/lua.mk +++ /dev/null @@ -1,103 +0,0 @@ -################################################################################ -# -# lua -# -################################################################################ - -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_VERSION = 5.3.4 -else -ifeq ($(BR2_PACKAGE_LUA_5_2),y) -LUA_VERSION = 5.2.4 -else -LUA_VERSION = 5.1.5 -endif -endif -LUA_SITE = http://www.lua.org/ftp -LUA_INSTALL_STAGING = YES -LUA_LICENSE = MIT -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -LUA_LICENSE_FILES = COPYRIGHT -else -LUA_LICENSE_FILES = doc/readme.html -endif - -LUA_PROVIDES = luainterpreter - -LUA_CFLAGS = -Wall -fPIC -DLUA_USE_POSIX - -ifeq ($(BR2_PACKAGE_LUA_5_2),y) -LUA_CFLAGS += -DLUA_COMPAT_ALL -endif - -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUA_CFLAGS += -DLUA_COMPAT_5_2 -endif - -ifeq ($(BR2_STATIC_LIBS),y) -LUA_BUILDMODE = static -else -LUA_BUILDMODE = dynamic -LUA_CFLAGS += -DLUA_USE_DLOPEN -LUA_MYLIBS += -ldl -endif - -ifeq ($(BR2_PACKAGE_LUA_READLINE),y) -LUA_DEPENDENCIES = readline ncurses -LUA_MYLIBS += -lreadline -lhistory -lncurses -LUA_CFLAGS += -DLUA_USE_READLINE -else -ifeq ($(BR2_PACKAGE_LUA_LINENOISE),y) -LUA_DEPENDENCIES = linenoise -LUA_MYLIBS += -llinenoise -LUA_CFLAGS += -DLUA_USE_LINENOISE -endif -endif - -ifeq ($(BR2_PACKAGE_LUA_32BITS),y) -define LUA_32BITS_LUACONF - $(SED) 's/\/\* #define LUA_32BITS \*\//#define LUA_32BITS/' $(@D)/src/luaconf.h -endef - -LUA_POST_PATCH_HOOKS += LUA_32BITS_LUACONF -endif - -HOST_LUA_CFLAGS = -Wall -fPIC -DLUA_USE_DLOPEN -DLUA_USE_POSIX -HOST_LUA_MYLIBS = -ldl - -define LUA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - CC="$(TARGET_CC)" RANLIB="$(TARGET_RANLIB)" \ - CFLAGS="$(TARGET_CFLAGS) $(LUA_CFLAGS)" \ - MYLIBS="$(LUA_MYLIBS)" AR="$(TARGET_CROSS)ar rcu" \ - BUILDMODE=$(LUA_BUILDMODE) \ - PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all -endef - -define HOST_LUA_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) \ - CFLAGS="$(HOST_LUA_CFLAGS)" \ - MYLDFLAGS="$(HOST_LDFLAGS)" \ - MYLIBS="$(HOST_LUA_MYLIBS)" \ - BUILDMODE=static \ - PKG_VERSION=$(LUA_VERSION) -C $(@D)/src all -endef - -define LUA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(STAGING_DIR)/usr" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/lua.pc -endef - -define LUA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) INSTALL_TOP="$(TARGET_DIR)/usr" -C $(@D) install -endef - -define HOST_LUA_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) INSTALL_TOP="$(HOST_DIR)/usr" -C $(@D) install - $(INSTALL) -m 0644 -D $(@D)/etc/lua.pc \ - $(HOST_DIR)/usr/lib/pkgconfig/lua.pc -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/luabitop/Config.in b/package.bak/luabitop/Config.in deleted file mode 100644 index 26442fc910..0000000000 --- a/package.bak/luabitop/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LUABITOP - bool "luabitop" - depends on !BR2_PACKAGE_LUA_5_3 - help - Lua BitOp is a C extension module for Lua 5.1/5.2 which adds bitwise - operations on numbers. - - http://bitop.luajit.org - -comment "luabitop needs a Lua 5.1/5.2 interpreter" - depends on BR2_PACKAGE_LUA_5_3 diff --git a/package.bak/luabitop/luabitop.hash b/package.bak/luabitop/luabitop.hash deleted file mode 100644 index 78110205a2..0000000000 --- a/package.bak/luabitop/luabitop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 fc7a8065a57462ee13bed7f95b0ab13f94ecd1bf846108c61ccf2c75548af26e luabitop-1.0.2-1.src.rock diff --git a/package.bak/luabitop/luabitop.mk b/package.bak/luabitop/luabitop.mk deleted file mode 100644 index 5ced99b327..0000000000 --- a/package.bak/luabitop/luabitop.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# luabitop -# -################################################################################ - -LUABITOP_VERSION_UPSTREAM = 1.0.2 -LUABITOP_VERSION = $(LUABITOP_VERSION_UPSTREAM)-1 -LUABITOP_SUBDIR = LuaBitOp-$(LUABITOP_VERSION_UPSTREAM) -LUABITOP_LICENSE = MIT -LUABITOP_LICENSE_FILES = $(LUABITOP_SUBDIR)/README - -$(eval $(luarocks-package)) diff --git a/package.bak/luacrypto/Config.in b/package.bak/luacrypto/Config.in deleted file mode 100644 index 8d13eec6b5..0000000000 --- a/package.bak/luacrypto/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LUACRYPTO - bool "luacrypto" - select BR2_PACKAGE_OPENSSL - help - LuaCrypto provides a Lua frontend to the OpenSSL cryptographic - library. - The OpenSSL features that are currently exposed are digests (MD5, - SHA-1, HMAC, and more) and crypto-grade random number generators - communication. - - http://luacrypto.luaforge.net diff --git a/package.bak/luacrypto/luacrypto.hash b/package.bak/luacrypto/luacrypto.hash deleted file mode 100644 index 5c577672e2..0000000000 --- a/package.bak/luacrypto/luacrypto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 dc935c923b8851208d5d504b343448a9d5bd3e537bb8657875f12d72155600b8 luacrypto-0.3.2-1.src.rock diff --git a/package.bak/luacrypto/luacrypto.mk b/package.bak/luacrypto/luacrypto.mk deleted file mode 100644 index b0e972c629..0000000000 --- a/package.bak/luacrypto/luacrypto.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# luacrypto -# -################################################################################ - -LUACRYPTO_VERSION_UPSTREAM = 0.3.2 -LUACRYPTO_VERSION = $(LUACRYPTO_VERSION_UPSTREAM)-1 -LUACRYPTO_SUBDIR = luacrypto-$(LUACRYPTO_VERSION_UPSTREAM) -LUACRYPTO_LICENSE = MIT -LUACRYPTO_LICENSE_FILES = $(LUACRYPTO_SUBDIR)/COPYING -LUACRYPTO_DEPENDENCIES = openssl - -$(eval $(luarocks-package)) diff --git a/package.bak/luaexpat/Config.in b/package.bak/luaexpat/Config.in deleted file mode 100644 index 6976e40c67..0000000000 --- a/package.bak/luaexpat/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LUAEXPAT - bool "luaexpat" - select BR2_PACKAGE_EXPAT - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - LuaExpat is a SAX XML parser based on the Expat library. - - http://matthewwild.co.uk/projects/luaexpat/ diff --git a/package.bak/luaexpat/luaexpat.hash b/package.bak/luaexpat/luaexpat.hash deleted file mode 100644 index 27f6ed0342..0000000000 --- a/package.bak/luaexpat/luaexpat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 aa7883a0d44f500e32ef306c04632546f97f33159fffa7bcdc3f451170f95896 luaexpat-1.3.0-1.src.rock diff --git a/package.bak/luaexpat/luaexpat.mk b/package.bak/luaexpat/luaexpat.mk deleted file mode 100644 index c6768dcc18..0000000000 --- a/package.bak/luaexpat/luaexpat.mk +++ /dev/null @@ -1,11 +0,0 @@ -################################################################################ -# -# luaexpat -# -################################################################################ - -LUAEXPAT_VERSION = 1.3.0-1 -LUAEXPAT_DEPENDENCIES = expat -LUAEXPAT_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/luaexpatutils/Config.in b/package.bak/luaexpatutils/Config.in deleted file mode 100644 index cb2887acaa..0000000000 --- a/package.bak/luaexpatutils/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LUAEXPATUTILS - bool "luaexpatutils" - select BR2_PACKAGE_LUAEXPAT - help - lxp.doc is a module that provides useful features for working with - XML formats in LOM format as used by the LuaExpat project from Kepler. - - https://github.com/stevedonovan/LuaExpatUtils diff --git a/package.bak/luaexpatutils/luaexpatutils.hash b/package.bak/luaexpatutils/luaexpatutils.hash deleted file mode 100644 index fe32eea128..0000000000 --- a/package.bak/luaexpatutils/luaexpatutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9b50bef94a6ddb6e6d4fffd5392f5c53d15e1a048966b559c4f8eda5e84d4517 luaexpatutils-88c228365b084224c911d34aff06002634b38b50.tar.gz diff --git a/package.bak/luaexpatutils/luaexpatutils.mk b/package.bak/luaexpatutils/luaexpatutils.mk deleted file mode 100644 index 9bfc654716..0000000000 --- a/package.bak/luaexpatutils/luaexpatutils.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# luaexpatutils -# -################################################################################ - -LUAEXPATUTILS_VERSION = 88c228365b084224c911d34aff06002634b38b50 -LUAEXPATUTILS_SITE = $(call github,stevedonovan,LuaExpatUtils,$(LUAEXPATUTILS_VERSION)) -LUAEXPATUTILS_LICENSE = Public Domain -LUAEXPATUTILS_DEPENDENCIES = luaexpat - -define LUAEXPATUTILS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/lua/doc.lua \ - $(TARGET_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/lxp/doc.lua -endef - -$(eval $(generic-package)) diff --git a/package.bak/luafilesystem/Config.in b/package.bak/luafilesystem/Config.in deleted file mode 100644 index 50e7975b92..0000000000 --- a/package.bak/luafilesystem/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LUAFILESYSTEM - bool "luafilesystem" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - LuaFileSystem offers a portable way to access - the underlying directory structure and file attributes. - - http://keplerproject.github.com/luafilesystem/ diff --git a/package.bak/luafilesystem/luafilesystem.hash b/package.bak/luafilesystem/luafilesystem.hash deleted file mode 100644 index e91f9d6688..0000000000 --- a/package.bak/luafilesystem/luafilesystem.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 70121e78b8ef9365265b85027729d0520c1163f5609abfa9554b215a672f4e7a luafilesystem-1.6.3-1.src.rock diff --git a/package.bak/luafilesystem/luafilesystem.mk b/package.bak/luafilesystem/luafilesystem.mk deleted file mode 100644 index a54ae236df..0000000000 --- a/package.bak/luafilesystem/luafilesystem.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# luafilesystem -# -################################################################################ - -LUAFILESYSTEM_VERSION = 1.6.3-1 -LUAFILESYSTEM_LICENSE = MIT -LUAFILESYSTEM_LICENSE_FILES = luafilesystem/LICENSE -LUAFILESYSTEM_SUBDIR = luafilesystem - -$(eval $(luarocks-package)) diff --git a/package.bak/luainterpreter/Config.in b/package.bak/luainterpreter/Config.in deleted file mode 100644 index e89a9b84d2..0000000000 --- a/package.bak/luainterpreter/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HAS_LUAINTERPRETER - bool - -config BR2_PACKAGE_PROVIDES_LUAINTERPRETER - string - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - string diff --git a/package.bak/luainterpreter/luainterpreter.mk b/package.bak/luainterpreter/luainterpreter.mk deleted file mode 100644 index a6c98ab992..0000000000 --- a/package.bak/luainterpreter/luainterpreter.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# luainterpreter -# -################################################################################ - -LUAINTERPRETER_ABIVER = $(call qstrip,$(BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION)) - -$(eval $(virtual-package)) -$(eval $(host-virtual-package)) - -LUA_RUN = $(HOST_DIR)/usr/bin/$(call qstrip,$(BR2_PACKAGE_PROVIDES_LUAINTERPRETER)) diff --git a/package.bak/luajit/0001-no-bin-symlink.patch b/package.bak/luajit/0001-no-bin-symlink.patch deleted file mode 100644 index 37298dd7c7..0000000000 --- a/package.bak/luajit/0001-no-bin-symlink.patch +++ /dev/null @@ -1,26 +0,0 @@ -Do not use a symlink for the binary, simply name it luajit - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -43,8 +43,7 @@ - INSTALL_MAN= $(INSTALL_SHARE)/man/man1 - INSTALL_PKGCONFIG= $(INSTALL_LIB)/pkgconfig - --INSTALL_TNAME= luajit-$(VERSION) --INSTALL_TSYMNAME= luajit -+INSTALL_TNAME= luajit - INSTALL_ANAME= libluajit-$(ABIVER).a - INSTALL_SONAME= libluajit-$(ABIVER).so.$(MAJVER).$(MINVER).$(RELVER) - INSTALL_SOSHORT= libluajit-$(ABIVER).so -@@ -58,7 +57,6 @@ - INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) - INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) - INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) --INSTALL_TSYM= $(INSTALL_BIN)/$(INSTALL_TSYMNAME) - INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) - - INSTALL_DIRS= $(INSTALL_BIN) $(INSTALL_LIB) $(INSTALL_INC) $(INSTALL_MAN) \ diff --git a/package.bak/luajit/0002-install-inc.patch b/package.bak/luajit/0002-install-inc.patch deleted file mode 100644 index 86b766dfc4..0000000000 --- a/package.bak/luajit/0002-install-inc.patch +++ /dev/null @@ -1,17 +0,0 @@ -Install includes like lua's ones - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -32,7 +32,7 @@ - INSTALL_BIN= $(DPREFIX)/bin - INSTALL_LIB= $(DPREFIX)/$(MULTILIB) - INSTALL_SHARE= $(DPREFIX)/share --INSTALL_INC= $(DPREFIX)/include/luajit-$(MAJVER).$(MINVER) -+INSTALL_INC= $(DPREFIX)/include - - INSTALL_LJLIBD= $(INSTALL_SHARE)/luajit-$(VERSION) - INSTALL_JITLIB= $(INSTALL_LJLIBD)/jit diff --git a/package.bak/luajit/0003-install-so.patch b/package.bak/luajit/0003-install-so.patch deleted file mode 100644 index 5929595abe..0000000000 --- a/package.bak/luajit/0003-install-so.patch +++ /dev/null @@ -1,22 +0,0 @@ -fix the following runtime error : - luajit: error while loading shared libraries: libluajit-5.1.so.2: cannot open shared object file: No such file or directory - -by creating two symbolic links: - libluajit-5.1.so -> libluajit-5.1.so.2.0.3 - libluajit-5.1.so.2 -> libluajit-5.1.so.2.0.3 - -Signed-off-by: Francois Perrad - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -55,7 +55,7 @@ - INSTALL_STATIC= $(INSTALL_LIB)/$(INSTALL_ANAME) - INSTALL_DYN= $(INSTALL_LIB)/$(INSTALL_SONAME) - INSTALL_SHORT1= $(INSTALL_LIB)/$(INSTALL_SOSHORT) --INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT) -+INSTALL_SHORT2= $(INSTALL_LIB)/$(INSTALL_SOSHORT).$(MAJVER) - INSTALL_T= $(INSTALL_BIN)/$(INSTALL_TNAME) - INSTALL_PC= $(INSTALL_PKGCONFIG)/$(INSTALL_PCNAME) - diff --git a/package.bak/luajit/Config.in b/package.bak/luajit/Config.in deleted file mode 100644 index 380f2472ea..0000000000 --- a/package.bak/luajit/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -config BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS - bool - default y if BR2_i386 || \ - (BR2_x86_64 && BR2_HOSTARCH='x86_64') || \ - BR2_powerpc || BR2_arm || BR2_armeb || \ - ((BR2_mips || BR2_mipsel) && !BR2_MIPS_SOFT_FLOAT && \ - !BR2_MIPS_CPU_MIPS32R6 && !BR2_MIPS_CPU_MIPS64R6) - -config BR2_PACKAGE_LUAJIT - bool "luajit" - select BR2_PACKAGE_HAS_LUAINTERPRETER - depends on !BR2_STATIC_LIBS # dlopen - # Luajit is only available for some target architectures, and - # has some complexity wrt 32/64. See luajit.mk for details. - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS - # luajit.mk uses the "-m32" compiler option to build 32bit - # binaries, so check if that option is supported. See - # luajit.mk for details. - select BR2_HOSTARCH_NEEDS_IA32_COMPILER if !BR2_ARCH_IS_64 - help - LuaJIT implements the full set of language features defined - by Lua 5.1. The virtual machine (VM) is API- and - ABI-compatible to the standard Lua interpreter and can be - deployed as a drop-in replacement. - - http://luajit.org/ - -if BR2_PACKAGE_LUAJIT - -config BR2_PACKAGE_PROVIDES_LUAINTERPRETER - default "luajit" - -config BR2_PACKAGE_LUAINTERPRETER_ABI_VERSION - default "5.1" - -endif - -comment "luajit needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/luajit/luajit.hash b/package.bak/luajit/luajit.hash deleted file mode 100644 index 086bef0199..0000000000 --- a/package.bak/luajit/luajit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hashes from: http://luajit.org/download.html -md5 dd9c38307f2223a504cbfb96e477eca0 LuaJIT-2.0.4.tar.gz diff --git a/package.bak/luajit/luajit.mk b/package.bak/luajit/luajit.mk deleted file mode 100644 index d3ef3b7599..0000000000 --- a/package.bak/luajit/luajit.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# luajit -# -################################################################################ - -LUAJIT_VERSION = 2.0.4 -LUAJIT_SOURCE = LuaJIT-$(LUAJIT_VERSION).tar.gz -LUAJIT_SITE = http://luajit.org/download -LUAJIT_LICENSE = MIT -LUAJIT_LICENSE_FILES = COPYRIGHT - -LUAJIT_INSTALL_STAGING = YES - -LUAJIT_PROVIDES = luainterpreter - -ifeq ($(BR2_STATIC_LIBS),y) -LUAJIT_BUILDMODE = static -else -LUAJIT_BUILDMODE = dynamic -endif - -# The luajit build procedure requires the host compiler to have the -# same bitness as the target compiler. Therefore, on a x86 build -# machine, we can't build luajit for x86_64, which is checked in -# Config.in. When the target is a 32 bits target, we pass -m32 to -# ensure that even on 64 bits build machines, a compiler of the same -# bitness is used. Of course, this assumes that the 32 bits multilib -# libraries are installed. -ifeq ($(BR2_ARCH_IS_64),y) -LUAJIT_HOST_CC = $(HOSTCC) -else -LUAJIT_HOST_CC = $(HOSTCC) -m32 -endif - -# We unfortunately can't use TARGET_CONFIGURE_OPTS, because the luajit -# build system uses non conventional variable names. -define LUAJIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" \ - STATIC_CC="$(TARGET_CC)" \ - DYNAMIC_CC="$(TARGET_CC) -fPIC" \ - TARGET_LD="$(TARGET_CC)" \ - TARGET_AR="$(TARGET_AR) rcus" \ - TARGET_STRIP=true \ - TARGET_CFLAGS="$(TARGET_CFLAGS)" \ - TARGET_LDFLAGS="$(TARGET_LDFLAGS)" \ - HOST_CC="$(LUAJIT_HOST_CC)" \ - HOST_CFLAGS="$(HOST_CFLAGS)" \ - HOST_LDFLAGS="$(HOST_LDFLAGS)" \ - BUILDMODE=$(LUAJIT_BUILDMODE) \ - -C $(@D) amalg -endef - -define LUAJIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" DESTDIR="$(STAGING_DIR)" LDCONFIG=true -C $(@D) install -endef - -define LUAJIT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX="/usr" DESTDIR="$(TARGET_DIR)" LDCONFIG=true -C $(@D) install -endef - -define LUAJIT_INSTALL_SYMLINK - ln -fs luajit $(TARGET_DIR)/usr/bin/lua -endef -LUAJIT_POST_INSTALL_TARGET_HOOKS += LUAJIT_INSTALL_SYMLINK - -# host-efl package needs host-luajit to be linked dynamically. -define HOST_LUAJIT_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" BUILDMODE=dynamic \ - TARGET_LDFLAGS="$(HOST_LDFLAGS)" \ - -C $(@D) amalg -endef - -define HOST_LUAJIT_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) PREFIX="$(HOST_DIR)/usr" LDCONFIG=true -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/luajson/Config.in b/package.bak/luajson/Config.in deleted file mode 100644 index c04aa7f008..0000000000 --- a/package.bak/luajson/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LUAJSON - bool "luajson" - # run-time dependency - select BR2_PACKAGE_LPEG - help - LuaJSON is a customizable JSON decoder/encoder - using LPEG for parsing. - - http://github.com/harningt/luajson diff --git a/package.bak/luajson/luajson.hash b/package.bak/luajson/luajson.hash deleted file mode 100644 index deda5efd6f..0000000000 --- a/package.bak/luajson/luajson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4898e5575713b37a1eb9badbd3968e15ec1856115daaed9819acf39113616619 luajson-1.3.3-1.src.rock diff --git a/package.bak/luajson/luajson.mk b/package.bak/luajson/luajson.mk deleted file mode 100644 index 67bc266444..0000000000 --- a/package.bak/luajson/luajson.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# luajson -# -################################################################################ - -LUAJSON_VERSION = 1.3.3-1 -LUAJSON_SUBDIR = luajson -LUAJSON_LICENSE = MIT -LUAJSON_LICENSE_FILES = $(LUAJSON_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/lualogging/Config.in b/package.bak/lualogging/Config.in deleted file mode 100644 index 37d701522f..0000000000 --- a/package.bak/lualogging/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LUALOGGING - bool "lualogging" - help - LuaLogging provides a simple API to use logging features in Lua. - Its design was based on log4j. LuaLogging currently supports, - through the use of appenders, console, file, rolling file, email, - socket and SQL outputs. - - http://www.keplerproject.org/lualogging/ diff --git a/package.bak/lualogging/lualogging.hash b/package.bak/lualogging/lualogging.hash deleted file mode 100644 index 8a6211ec37..0000000000 --- a/package.bak/lualogging/lualogging.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6ca3827c4903814626b96011e17ad99b42ecfa983b605aa75bf58f17e90ed58d lualogging-1.3.0-1.src.rock diff --git a/package.bak/lualogging/lualogging.mk b/package.bak/lualogging/lualogging.mk deleted file mode 100644 index 3444a29886..0000000000 --- a/package.bak/lualogging/lualogging.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# lualogging -# -################################################################################ - -LUALOGGING_VERSION = 1.3.0-1 -LUALOGGING_SUBDIR = lualogging -LUALOGGING_LICENSE = MIT -LUALOGGING_LICENSE_FILES = $(LUALOGGING_SUBDIR)/COPYRIGHT - -$(eval $(luarocks-package)) diff --git a/package.bak/luaposix/Config.in b/package.bak/luaposix/Config.in deleted file mode 100644 index 9707cdeeff..0000000000 --- a/package.bak/luaposix/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LUAPOSIX - bool "luaposix" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - select BR2_PACKAGE_LUABITOP if BR2_PACKAGE_LUA_5_1 - # LuaBitOp is already included in LuaJIT - help - This is a POSIX binding for LuaJIT, Lua 5.1, 5.2 and 5.3; - like most libraries it simply binds to C APIs on the - underlying system, so it won't work on non-POSIX systems. - However, it does try to detect the level of POSIX conformance - of the underlying system and bind only available APIs. - - https://github.com/luaposix/luaposix diff --git a/package.bak/luaposix/luaposix.hash b/package.bak/luaposix/luaposix.hash deleted file mode 100644 index e2216be733..0000000000 --- a/package.bak/luaposix/luaposix.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e66262f5b7fe1c32c65f17a5ef5ffb31c4d1877019b4870a5d373e2ab6526a21 luaposix-33.4.0.tar.gz diff --git a/package.bak/luaposix/luaposix.mk b/package.bak/luaposix/luaposix.mk deleted file mode 100644 index ea3af16fb3..0000000000 --- a/package.bak/luaposix/luaposix.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# luaposix -# -################################################################################ - -LUAPOSIX_VERSION = 33.4.0 -LUAPOSIX_SITE = $(call github,luaposix,luaposix,release-v$(LUAPOSIX_VERSION)) -LUAPOSIX_LICENSE = MIT -LUAPOSIX_LICENSE_FILES = COPYING -LUAPOSIX_DEPENDENCIES = luainterpreter host-lua -LUAPOSIX_CONF_OPTS = --libdir="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" --datarootdir="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(autotools-package)) diff --git a/package.bak/luarocks/luarocks.hash b/package.bak/luarocks/luarocks.hash deleted file mode 100644 index fb01993f09..0000000000 --- a/package.bak/luarocks/luarocks.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0e1ec34583e1b265e0fbafb64c8bd348705ad403fe85967fd05d3a659f74d2e5 luarocks-2.4.2.tar.gz diff --git a/package.bak/luarocks/luarocks.mk b/package.bak/luarocks/luarocks.mk deleted file mode 100644 index d18056a527..0000000000 --- a/package.bak/luarocks/luarocks.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# luarocks -# -################################################################################ - -LUAROCKS_VERSION = 2.4.2 -LUAROCKS_SITE = http://luarocks.org/releases -LUAROCKS_LICENSE = MIT -LUAROCKS_LICENSE_FILES = COPYING - -HOST_LUAROCKS_DEPENDENCIES = host-luainterpreter - -LUAROCKS_CONFIG_DIR = $(HOST_DIR)/usr/etc/luarocks -LUAROCKS_CONFIG_FILE = $(LUAROCKS_CONFIG_DIR)/config-$(LUAINTERPRETER_ABIVER).lua -LUAROCKS_CFLAGS = $(TARGET_CFLAGS) -fPIC -ifeq ($(BR2_PACKAGE_LUA_5_3),y) -LUAROCKS_CFLAGS += -DLUA_COMPAT_5_2 -endif - -HOST_LUAROCKS_CONF_OPTS = \ - --prefix=$(HOST_DIR)/usr \ - --sysconfdir=$(LUAROCKS_CONFIG_DIR) \ - --with-lua=$(HOST_DIR)/usr - -ifeq ($(BR2_PACKAGE_LUAJIT),y) -HOST_LUAROCKS_CONF_OPTS += --lua-suffix=jit -endif - -define HOST_LUAROCKS_CONFIGURE_CMDS - cd $(@D) && ./configure $(HOST_LUAROCKS_CONF_OPTS) -endef - -define HOST_LUAROCKS_INSTALL_CMDS - rm -f $(LUAROCKS_CONFIG_FILE) - $(MAKE1) -C $(@D) install \ - PREFIX=$(HOST_DIR)/usr - echo "-- BR cross-compilation" >> $(LUAROCKS_CONFIG_FILE) - echo "variables = {" >> $(LUAROCKS_CONFIG_FILE) - echo " LUA_INCDIR = [[$(STAGING_DIR)/usr/include]]," >> $(LUAROCKS_CONFIG_FILE) - echo " LUA_LIBDIR = [[$(STAGING_DIR)/usr/lib]]," >> $(LUAROCKS_CONFIG_FILE) - echo " CC = [[$(TARGET_CC)]]," >> $(LUAROCKS_CONFIG_FILE) - echo " LD = [[$(TARGET_CC)]]," >> $(LUAROCKS_CONFIG_FILE) - echo " CFLAGS = [[$(LUAROCKS_CFLAGS)]]," >> $(LUAROCKS_CONFIG_FILE) - echo " LIBFLAG = [[-shared $(TARGET_LDFLAGS)]]," >> $(LUAROCKS_CONFIG_FILE) - echo "}" >> $(LUAROCKS_CONFIG_FILE) - echo "external_deps_dirs = { [[$(STAGING_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE) - echo "gcc_rpath = false" >> $(LUAROCKS_CONFIG_FILE) - echo "rocks_trees = { [[$(TARGET_DIR)/usr]] }" >> $(LUAROCKS_CONFIG_FILE) - echo "wrap_bin_scripts = false" >> $(LUAROCKS_CONFIG_FILE) - echo "deps_mode = [[none]]" >> $(LUAROCKS_CONFIG_FILE) -endef - -$(eval $(host-generic-package)) - -LUAROCKS_RUN_ENV = LUA_PATH="$(HOST_DIR)/usr/share/lua/$(LUAINTERPRETER_ABIVER)/?.lua" -LUAROCKS_RUN_CMD = $(LUA_RUN) $(HOST_DIR)/usr/bin/luarocks - -define LUAROCKS_FINALIZE_TARGET - rm -rf $(TARGET_DIR)/usr/lib/luarocks -endef - -# Apply to global variable directly, as pkg-generic does not -ifneq ($(BR2_PACKAGE_LUAJIT)$(BR2_PACKAGE_LUA),) -TARGET_FINALIZE_HOOKS += LUAROCKS_FINALIZE_TARGET -endif diff --git a/package.bak/luasec/Config.in b/package.bak/luasec/Config.in deleted file mode 100644 index a8cc9c977e..0000000000 --- a/package.bak/luasec/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LUASEC - bool "luasec" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LUASOCKET - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - LuaSec is a binding for OpenSSL library to provide TLS/SSL - communication. - - http://www.inf.puc-rio.br/~brunoos/luasec/ diff --git a/package.bak/luasec/luasec.hash b/package.bak/luasec/luasec.hash deleted file mode 100644 index 1e9f70ad6f..0000000000 --- a/package.bak/luasec/luasec.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d2198cc39b3fa55bd5020046742b34093b6efcb619cf4032948b8c8556202a32 luasec-0.5-2.src.rock diff --git a/package.bak/luasec/luasec.mk b/package.bak/luasec/luasec.mk deleted file mode 100644 index fd1f1cdbb7..0000000000 --- a/package.bak/luasec/luasec.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# luasec -# -################################################################################ - -LUASEC_VERSION_UPSTREAM = 0.5 -LUASEC_VERSION = $(LUASEC_VERSION_UPSTREAM)-2 -LUASEC_SUBDIR = luasec -LUASEC_LICENSE = MIT -LUASEC_LICENSE_FILES = $(LUASEC_SUBDIR)/LICENSE -LUASEC_DEPENDENCIES = openssl - -$(eval $(luarocks-package)) diff --git a/package.bak/luasocket/Config.in b/package.bak/luasocket/Config.in deleted file mode 100644 index 45f959e8d0..0000000000 --- a/package.bak/luasocket/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LUASOCKET - bool "luasocket" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - LuaSocket is the most comprehensive networking support library - for the Lua language. - It provides easy access to TCP, UDP, DNS, SMTP, - FTP, HTTP, MIME and much more. - - http://luaforge.net/projects/luasocket/ diff --git a/package.bak/luasocket/luasocket.hash b/package.bak/luasocket/luasocket.hash deleted file mode 100644 index ad91f44205..0000000000 --- a/package.bak/luasocket/luasocket.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 453fc1d0e9b6a44bbada4290d565f840a5e96ba2d1b47562ba38bd9c7e82195a luasocket-3.0rc1-1.src.rock diff --git a/package.bak/luasocket/luasocket.mk b/package.bak/luasocket/luasocket.mk deleted file mode 100644 index 20927fc1d6..0000000000 --- a/package.bak/luasocket/luasocket.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# luasocket -# -################################################################################ - -LUASOCKET_VERSION = 3.0rc1-1 -LUASOCKET_SUBDIR = luasocket-3.0-rc1 -LUASOCKET_LICENSE = MIT -LUASOCKET_LICENSE_FILES = $(LUASOCKET_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/luasql-sqlite3/Config.in b/package.bak/luasql-sqlite3/Config.in deleted file mode 100644 index 3bd73f3ba5..0000000000 --- a/package.bak/luasql-sqlite3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_LUASQL_SQLITE3 - bool "luasql-sqlite3" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - select BR2_PACKAGE_SQLITE - help - LuaSQL is a simple interface from Lua to a DBMS. - - http://www.keplerproject.org/luasql - diff --git a/package.bak/luasql-sqlite3/luasql-sqlite3.hash b/package.bak/luasql-sqlite3/luasql-sqlite3.hash deleted file mode 100644 index 5728c8db04..0000000000 --- a/package.bak/luasql-sqlite3/luasql-sqlite3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e98d4e997682097f5bc2859596b9615f4cb87438db23ceb4af5e36b4424524ab luasql-sqlite3-2.3.0-1.src.rock diff --git a/package.bak/luasql-sqlite3/luasql-sqlite3.mk b/package.bak/luasql-sqlite3/luasql-sqlite3.mk deleted file mode 100644 index 23983a84fc..0000000000 --- a/package.bak/luasql-sqlite3/luasql-sqlite3.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# luasql-sqlite3 -# -################################################################################ - -LUASQL_SQLITE3_VERSION = 2.3.0-1 -LUASQL_SQLITE3_SUBDIR = luasql -LUASQL_SQLITE3_LICENSE = MIT -LUASQL_SQLITE3_LICENSE_FILES = $(LUASQL_SQLITE3_SUBDIR)/README -LUASQL_SQLITE3_DEPENDENCIES = sqlite - -$(eval $(luarocks-package)) diff --git a/package.bak/lunit/Config.in b/package.bak/lunit/Config.in deleted file mode 100644 index d6c2c6b157..0000000000 --- a/package.bak/lunit/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_LUNIT - bool "lunit" - depends on BR2_PACKAGE_LUA_5_1 || BR2_PACKAGE_LUAJIT - help - A unit testing framework for Lua. - - http://www.mroth.net/lunit/ - -comment "lunit needs a Lua 5.1 interpreter" - depends on !BR2_PACKAGE_LUA_5_1 - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/lunit/lunit.hash b/package.bak/lunit/lunit.hash deleted file mode 100644 index 9c8d53c5ed..0000000000 --- a/package.bak/lunit/lunit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b19854c685337ddcec2fe9c22113d2cd14715d52ccd2676abe2fa49b61a2ec4d lunit-0.5-2.src.rock diff --git a/package.bak/lunit/lunit.mk b/package.bak/lunit/lunit.mk deleted file mode 100644 index 3c557f8748..0000000000 --- a/package.bak/lunit/lunit.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lunit -# -################################################################################ - -LUNIT_VERSION_UPSTREAM = 0.5 -LUNIT_VERSION = $(LUNIT_VERSION_UPSTREAM)-2 -LUNIT_SUBDIR = lunit-$(LUNIT_VERSION_UPSTREAM) -LUNIT_LICENSE = MIT -LUNIT_LICENSE_FILES = $(LUNIT_SUBDIR)/LICENSE - -$(eval $(luarocks-package)) diff --git a/package.bak/lutok/Config.in b/package.bak/lutok/Config.in deleted file mode 100644 index d6c87cf586..0000000000 --- a/package.bak/lutok/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_LUTOK - bool "lutok" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on !BR2_PACKAGE_LUAJIT - help - Lutok is a lightweight C++ API library for Lua. - - https://github.com/jmmv/lutok - -comment "lutok needs a toolchain w/ C++ and full Lua" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_PACKAGE_LUAJIT - depends on BR2_PACKAGE_HAS_LUAINTERPRETER diff --git a/package.bak/lutok/lutok.hash b/package.bak/lutok/lutok.hash deleted file mode 100644 index 0ec8988073..0000000000 --- a/package.bak/lutok/lutok.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2cec51efa0c8d65ace8b21eaa08384b77abc5087b46e785f78de1c21fb754cd5 lutok-0.4.tar.gz diff --git a/package.bak/lutok/lutok.mk b/package.bak/lutok/lutok.mk deleted file mode 100644 index 6ee198b402..0000000000 --- a/package.bak/lutok/lutok.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# lutok -# -################################################################################ - -LUTOK_VERSION = 0.4 -LUTOK_SITE = https://github.com/jmmv/lutok/releases/download/lutok-$(LUTOK_VERSION) -LUTOK_INSTALL_STAGING = YES -LUTOK_DEPENDENCIES = host-pkgconf lua -# --without-atf disables the atf-based lutok tests -LUTOK_CONF_OPTS = --without-doxygen --without-atf -LUTOK_LICENSE = BSD-3c -LUTOK_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/luv/Config.in b/package.bak/luv/Config.in deleted file mode 100644 index e9d01099f2..0000000000 --- a/package.bak/luv/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_LUV - bool "luv" - select BR2_PACKAGE_LIBUV - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv - depends on BR2_USE_MMU # libuv - depends on !BR2_STATIC_LIBS # libuv - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv - help - libuv bindings for LuaJIT and Lua. - - https://github.com/luvit/luv - -comment "luv needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/luv/luv.hash b/package.bak/luv/luv.hash deleted file mode 100644 index 140fe96386..0000000000 --- a/package.bak/luv/luv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2eab80360f8ab6793612bb59d067a56664ac9a5a14988e0a09a53d0bff20c131 luv-1.9.1-0.tar.gz diff --git a/package.bak/luv/luv.mk b/package.bak/luv/luv.mk deleted file mode 100644 index 43cecf57fc..0000000000 --- a/package.bak/luv/luv.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# luv -# -################################################################################ - -LUV_VERSION = 1.9.1-0 -LUV_SITE = https://github.com/luvit/luv/releases/download/$(LUV_VERSION) -LUV_LICENSE = Apache-2.0 -LUV_LICENSE_FILES = LICENSE.txt -LUV_DEPENDENCIES = libuv -LUV_INSTALL_STAGING = YES - -LUV_CONF_OPTS += \ - -DBUILD_MODULE=OFF \ - -DWITH_SHARED_LIBUV=ON \ - -DLUA_BUILD_TYPE=System - -ifeq ($(BR2_PACKAGE_LUAJIT),y) -LUV_DEPENDENCIES += luajit -LUV_CONF_OPTS += \ - -DWITH_LUA_ENGINE=LuaJIT -else -LUV_DEPENDENCIES += lua -LUV_CONF_OPTS += \ - -DWITH_LUA_ENGINE=Lua -endif - -$(eval $(cmake-package)) diff --git a/package.bak/luvi/Config.in b/package.bak/luvi/Config.in deleted file mode 100644 index a9dd2ef740..0000000000 --- a/package.bak/luvi/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_LUVI - bool "luvi" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv - depends on BR2_USE_MMU # libuv - depends on !BR2_STATIC_LIBS # libuv - depends on BR2_PACKAGE_LUAJIT - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv - select BR2_PACKAGE_LIBUV - select BR2_PACKAGE_LUV - help - A project in-between luv and luvit. The goal of this is to make - building luvit and derivatives much easier. - - luvi extends LuaJIT with asynchronous I/O and several optional - modules to run Lua applications and build self-contained binaries - on systems that don't have a compiler. - - The luvi core can be extended with several Lua modules by adding its - bundled Lua binding libraries. To get the Lua module... - * 'rex' select PCRE (BR2_PACKAGE_PCRE) - * 'ssl' select OpenSSL (BR2_PACKAGE_OPENSSL) - * 'zlib' select zlib (BR2_PACKAGE_ZLIB) - - https://github.com/luvit/luvi - -comment "luvi needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -comment "luvi needs LuaJIT" - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/luvi/luvi.hash b/package.bak/luvi/luvi.hash deleted file mode 100644 index 99fd69e798..0000000000 --- a/package.bak/luvi/luvi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b36a3b96ec5852398338bc38567c5bb589783487c65130e1d702ff98fac3a6b7 luvi-src-v2.7.5.tar.gz diff --git a/package.bak/luvi/luvi.mk b/package.bak/luvi/luvi.mk deleted file mode 100644 index ade63f5fba..0000000000 --- a/package.bak/luvi/luvi.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# luvi -# -################################################################################ - -LUVI_VERSION = v2.7.5 -LUVI_SOURCE = luvi-src-$(LUVI_VERSION).tar.gz -LUVI_SITE = https://github.com/luvit/luvi/releases/download/$(LUVI_VERSION) -LUVI_LICENSE = Apache-2.0 -LUVI_LICENSE_FILES = LICENSE.txt -LUVI_DEPENDENCIES = libuv luajit luv host-luajit - -# Dispatch all architectures of LuaJIT -ifeq ($(BR2_i386),y) -LUVI_TARGET_ARCH = x86 -else ifeq ($(BR2_x86_64),y) -LUVI_TARGET_ARCH = x64 -else ifeq ($(BR2_powerpc),y) -LUVI_TARGET_ARCH = ppc -else ifeq ($(BR2_arm)$(BR2_armeb),y) -LUVI_TARGET_ARCH = arm -else ifeq ($(BR2_mips),y) -LUVI_TARGET_ARCH = mips -else ifeq ($(BR2_mipsel),y) -LUVI_TARGET_ARCH = mipsel -else -LUVI_TARGET_ARCH = $(BR2_ARCH) -endif - -# Bundled lua bindings have to be linked statically into the luvi executable -LUVI_CONF_OPTS = \ - -DBUILD_SHARED_LIBS=OFF \ - -DWithSharedLibluv=ON \ - -DTARGET_ARCH=$(LUVI_TARGET_ARCH) \ - -DLUA_PATH=$(HOST_DIR)/usr/share/luajit-2.0.4/?.lua - -# Add "rex" module (PCRE via bundled lrexlib) -ifeq ($(BR2_PACKAGE_PCRE),y) -LUVI_DEPENDENCIES += pcre -LUVI_CONF_OPTS += -DWithPCRE=ON -DWithSharedPCRE=ON -else -LUVI_CONF_OPTS += -DWithPCRE=OFF -DWithSharedPCRE=OFF -endif - -# Add "ssl" module (via bundled lua-openssl) -ifeq ($(BR2_PACKAGE_OPENSSL),y) -LUVI_DEPENDENCIES += openssl -LUVI_CONF_OPTS += -DWithOpenSSL=ON -DWithOpenSSLASM=ON -DWithSharedOpenSSL=ON -else -LUVI_CONF_OPTS += -DWithOpenSSL=OFF -DWithOpenSSLASM=OFF -DWithSharedOpenSSL=OFF -endif - -# Add "zlib" module (via bundled lua-zlib) -ifeq ($(BR2_PACKAGE_ZLIB),y) -LUVI_DEPENDENCIES += zlib -LUVI_CONF_OPTS += -DWithZLIB=ON -DWithSharedZLIB=ON -else -LUVI_CONF_OPTS += -DWithZLIB=OFF -DWithSharedZLIB=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/lvm2/Config.in b/package.bak/lvm2/Config.in deleted file mode 100644 index 23dff707cc..0000000000 --- a/package.bak/lvm2/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_LVM2 - bool "lvm2 & device mapper" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # needs fork() - depends on !BR2_STATIC_LIBS # It fails to build statically - # http://lists.busybox.net/pipermail/buildroot/2016-August/170592.html - depends on !BR2_TOOLCHAIN_USES_MUSL - help - This is LVM2, the rewrite of The Linux Logical Volume Manager. - LVM supports enterprise level volume management of disk and disk - subsystems by grouping arbitrary disks into volume groups. The total - capacity of volume groups can be allocated to logical volumes, which - are accessed as regular block devices. - - The Linux Kernel Device Mapper is the LVM - (Linux Logical Volume Management) Team's implementation of a - minimalistic kernel-space driver that handles volume management, - while keeping knowledge of the underlying device layout in - user-space. This makes it useful for not only LVM, but EVMS, - software raid, and other drivers that create "virtual" block devices. - -if BR2_PACKAGE_LVM2 - -config BR2_PACKAGE_LVM2_STANDARD_INSTALL - bool "standard install instead of only dmsetup" - default y if !BR2_PACKAGE_LVM2_DMSETUP_ONLY # legacy 2013.11 - help - Install the standard suite of lvm2 programs. When this option is not - set, only dmsetup is installed. - -config BR2_PACKAGE_LVM2_APP_LIBRARY - bool "install application library" - select BR2_PACKAGE_LVM2_STANDARD_INSTALL - help - Install application library (liblvm2app). - -endif - -comment "lvm2 needs a glibc or uClibc toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/lvm2/lvm2.hash b/package.bak/lvm2/lvm2.hash deleted file mode 100644 index 3619af8741..0000000000 --- a/package.bak/lvm2/lvm2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From ftp://sources.redhat.com/pub/lvm2/releases/sha512.sum -sha512 ebff909e1c81919967373c55c7a95ba13ef4e0536b8ef1c28ed7e1c1eb9b9fd406a649d93b141822b24675ebece5a722247737c4e869fb7fb5eeb881a7f9102d LVM2.2.02.168.tgz diff --git a/package.bak/lvm2/lvm2.mk b/package.bak/lvm2/lvm2.mk deleted file mode 100644 index a2d484bc25..0000000000 --- a/package.bak/lvm2/lvm2.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# lvm2 -# -################################################################################ - -LVM2_VERSION = 2.02.168 -LVM2_SOURCE = LVM2.$(LVM2_VERSION).tgz -LVM2_SITE = ftp://sources.redhat.com/pub/lvm2/releases -LVM2_INSTALL_STAGING = YES -LVM2_LICENSE = GPLv2, LGPLv2.1 -LVM2_LICENSE_FILES = COPYING COPYING.LIB - -# Make sure that binaries and libraries are installed with write -# permissions for the owner. -LVM2_CONF_OPTS += \ - --enable-write_install \ - --enable-pkgconfig \ - --enable-cmdlib \ - --enable-dmeventd - -# LVM2 uses autoconf, but not automake, and the build system does not -# take into account the toolchain passed at configure time. -LVM2_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) - -ifeq ($(BR2_PACKAGE_READLINE),y) -LVM2_DEPENDENCIES += readline -else -# v2.02.44: disable readline usage, or binaries are linked against provider -# of "tgetent" (=> ncurses) even if it's not used.. -LVM2_CONF_OPTS += --disable-readline -endif - -ifeq ($(BR2_PACKAGE_LVM2_STANDARD_INSTALL),) -LVM2_MAKE_OPTS = device-mapper -LVM2_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install_device-mapper -LVM2_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install_device-mapper -endif - -ifeq ($(BR2_PACKAGE_LVM2_APP_LIBRARY),y) -LVM2_CONF_OPTS += --enable-applib -else -LVM2_CONF_OPTS += --disable-applib -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -LVM2_CONF_ENV += ac_cv_flag_HAVE_PIE=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lxc/Config.in b/package.bak/lxc/Config.in deleted file mode 100644 index 6a39d2eb7f..0000000000 --- a/package.bak/lxc/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_LXC - bool "lxc" - select BR2_PACKAGE_LIBCAP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - # build system forcefully builds a shared library - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # setns() system call - help - Linux Containers (LXC), provides the ability to group and isolate - of a set of processes in a jail by virtualizing and accounting the - kernel resources. It is similar to Linux-Vserver or Openvz. - - https://linuxcontainers.org/ - -comment "lxc needs a toolchain w/ threads, headers >= 3.0, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \ - || BR2_STATIC_LIBS diff --git a/package.bak/lxc/lxc.hash b/package.bak/lxc/lxc.hash deleted file mode 100644 index f80c88d6e6..0000000000 --- a/package.bak/lxc/lxc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1c09c075f06ec029f86fa6370c7d379494ff4c66a129eda17af7b7b41e055f5d lxc-2.0.7.tar.gz diff --git a/package.bak/lxc/lxc.mk b/package.bak/lxc/lxc.mk deleted file mode 100644 index 455814b9c9..0000000000 --- a/package.bak/lxc/lxc.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# lxc -# -################################################################################ - -LXC_VERSION = 2.0.7 -LXC_SITE = https://linuxcontainers.org/downloads/lxc -LXC_LICENSE = LGPLv2.1+ -LXC_LICENSE_FILES = COPYING -LXC_DEPENDENCIES = libcap host-pkgconf -LXC_INSTALL_STAGING = YES - -LXC_CONF_OPTS = --disable-apparmor --with-distro=buildroot \ - --disable-python --disable-werror \ - $(if $(BR2_PACKAGE_BASH),,--disable-bash) - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -LXC_CONF_OPTS += --enable-gnutls -LXC_DEPENDENCIES += gnutls -else -LXC_CONF_OPTS += --disable-gnutls -endif - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -LXC_CONF_OPTS += --enable-seccomp -LXC_DEPENDENCIES += libseccomp -else -LXC_CONF_OPTS += --disable-seccomp -endif - -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) -LXC_CONF_OPTS += --enable-lua -LXC_DEPENDENCIES += luainterpreter -ifeq ($(BR2_PACKAGE_LUAJIT),y) -# By default, lxc will only search for lua.pc -LXC_CONF_OPTS += --with-lua-pc=luajit -endif -else -LXC_CONF_OPTS += --disable-lua -endif - -$(eval $(autotools-package)) diff --git a/package.bak/lz4/Config.in b/package.bak/lz4/Config.in deleted file mode 100644 index 4a00a70365..0000000000 --- a/package.bak/lz4/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LZ4 - bool "lz4" - help - LZ4 is a very fast lossless compression algorithm, providing - compression speed at 400 MB/s per core, scalable with multi-cores - CPU. It also features an extremely fast decoder, with speed - in multiple GB/s per core, typically reaching RAM speed limits - on multi-core systems. - - http://www.lz4.org/ diff --git a/package.bak/lz4/lz4.hash b/package.bak/lz4/lz4.hash deleted file mode 100644 index 1281284697..0000000000 --- a/package.bak/lz4/lz4.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 9d4d00614d6b9dec3114b33d1224b6262b99ace24434c53487a0c8fd0b18cfed lz4-r131.tar.gz diff --git a/package.bak/lz4/lz4.mk b/package.bak/lz4/lz4.mk deleted file mode 100644 index 9d7f56bbf6..0000000000 --- a/package.bak/lz4/lz4.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# lz4 -# -################################################################################ - -LZ4_VERSION = r131 -LZ4_SITE = $(call github,Cyan4973,lz4,$(LZ4_VERSION)) -LZ4_INSTALL_STAGING = YES -LZ4_LICENSE = BSD-2c (library), GPLv2+ (programs) -LZ4_LICENSE_FILES = lib/LICENSE programs/COPYING - -ifeq ($(BR2_STATIC_LIBS),y) -define LZ4_DISABLE_SHARED - $(SED) '/SHARED/d' $(@D)/lib/Makefile -endef -LZ4_POST_PATCH_HOOKS += LZ4_DISABLE_SHARED -endif - -define HOST_LZ4_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -endef - -define HOST_LZ4_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) PREFIX=$(HOST_DIR)/usr \ - install -C $(@D) -endef - -define LZ4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)/lib -endef - -define LZ4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(STAGING_DIR) \ - PREFIX=/usr install -C $(@D) -endef - -define LZ4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install -C $(@D)/lib -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/lzip/Config.in b/package.bak/lzip/Config.in deleted file mode 100644 index 821cd26292..0000000000 --- a/package.bak/lzip/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "lzip needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_LZIP - bool "lzip" - depends on BR2_INSTALL_LIBSTDCPP - help - Lzip is a lossless data compressor with a user interface similar - to the one of gzip or bzip2. - Lzip is about as fast as gzip, compresses most files more than - bzip2, and is better than both from a data recovery perspective. - Lzip is a clean implementation of the LZMA algorithm. - - http://www.nongnu.org/lzip/lzip.html diff --git a/package.bak/lzip/lzip.hash b/package.bak/lzip/lzip.hash deleted file mode 100644 index 8855231fb3..0000000000 --- a/package.bak/lzip/lzip.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.nongnu.org/archive/html/lzip-bug/2016-06/msg00002.html -sha1 ef42f3209d02c3b3c217a61c8f127bcb8747b128 lzip-1.18.tar.gz -# Locally calculated after checking pgp signature -sha256 47f9882a104ab05532f467a7b8f4ddbb898fa2f1e8d9d468556d6c2d04db14dd lzip-1.18.tar.gz diff --git a/package.bak/lzip/lzip.mk b/package.bak/lzip/lzip.mk deleted file mode 100644 index db04862c53..0000000000 --- a/package.bak/lzip/lzip.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# lzip -# -################################################################################ - -LZIP_VERSION = 1.18 -LZIP_SITE = http://download.savannah.gnu.org/releases/lzip -LZIP_LICENSE = GPLv2+ -LZIP_LICENSE_FILES = COPYING - -define LZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr \ - $(TARGET_CONFIGURE_OPTS) ) -endef - -define HOST_LZIP_CONFIGURE_CMDS - (cd $(@D); $(HOST_MAKE_ENV) ./configure --prefix=/usr \ - $(HOST_CONFIGURE_OPTS) ) -endef - -define LZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_LZIP_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define LZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -define HOST_LZIP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) install -endef - -# It's not autotools-based -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/lzlib/Config.in b/package.bak/lzlib/Config.in deleted file mode 100644 index 32328c5ec7..0000000000 --- a/package.bak/lzlib/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_LZLIB - bool "lzlib" - select BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_LUA - help - This package provides a library to access zlib library - functions and also to read/write gzip files using an - interface similar to the base io package. - - https://github.com/LuaDist/lzlib diff --git a/package.bak/lzlib/lzlib.hash b/package.bak/lzlib/lzlib.hash deleted file mode 100644 index f983862e41..0000000000 --- a/package.bak/lzlib/lzlib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cbb0cac5825e940b4ea2f31a336d2aaf6db39847d456920afd8e443804420dbb lzlib-0.4.3.tar.gz diff --git a/package.bak/lzlib/lzlib.mk b/package.bak/lzlib/lzlib.mk deleted file mode 100644 index f468a1c839..0000000000 --- a/package.bak/lzlib/lzlib.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# lzlib -# -################################################################################ - -LZLIB_VERSION = 0.4.3 -LZLIB_SITE = $(call github,LuaDist,lzlib,$(LZLIB_VERSION)) -LZLIB_DEPENDENCIES = lua zlib -LZLIB_LICENSE = MIT -LZLIB_CONF_OPTS = -DINSTALL_CMOD="/usr/lib/lua/$(LUAINTERPRETER_ABIVER)" \ - -DINSTALL_LMOD="/usr/share/lua/$(LUAINTERPRETER_ABIVER)" - -$(eval $(cmake-package)) diff --git a/package.bak/lzma/0001-Remove-static-from-LDFLAGS.patch b/package.bak/lzma/0001-Remove-static-from-LDFLAGS.patch deleted file mode 100644 index 9a33e44b8d..0000000000 --- a/package.bak/lzma/0001-Remove-static-from-LDFLAGS.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 1b33f6d13e5c25a2500ee312068c08a3d3811a5f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Vincent=20Stehl=C3=A9?= -Date: Wed, 3 Dec 2014 21:32:02 +0100 -Subject: [PATCH] Remove -static from LDFLAGS -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Buildroot does not enable static libraries by default for host builds. Having --static hardcoded in the LDFLAGS breaks the build, so remove it. - -Signed-off-by: Vincent Stehlé ---- - src/lzmadec/Makefile.am | 1 - - src/lzmadec/Makefile.in | 1 - - src/lzmainfo/Makefile.am | 1 - - src/lzmainfo/Makefile.in | 1 - - 4 files changed, 4 deletions(-) - -diff --git a/src/lzmadec/Makefile.am b/src/lzmadec/Makefile.am -index 7322b2a..13edec8 100644 ---- a/src/lzmadec/Makefile.am -+++ b/src/lzmadec/Makefile.am -@@ -2,6 +2,5 @@ bin_PROGRAMS = lzmadec - lzmadec_SOURCES = lzmadec.c - lzmadec_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la - AM_CPPFLAGS = -I@top_srcdir@/src/liblzmadec --AM_LDFLAGS = -static - - dist_man_MANS = lzmadec.1 -diff --git a/src/lzmadec/Makefile.in b/src/lzmadec/Makefile.in -index 5af9240..4ed1de1 100644 ---- a/src/lzmadec/Makefile.in -+++ b/src/lzmadec/Makefile.in -@@ -185,7 +185,6 @@ top_srcdir = @top_srcdir@ - lzmadec_SOURCES = lzmadec.c - lzmadec_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la - AM_CPPFLAGS = -I@top_srcdir@/src/liblzmadec --AM_LDFLAGS = -static - dist_man_MANS = lzmadec.1 - all: all-am - -diff --git a/src/lzmainfo/Makefile.am b/src/lzmainfo/Makefile.am -index b5b01ec..e280bff 100644 ---- a/src/lzmainfo/Makefile.am -+++ b/src/lzmainfo/Makefile.am -@@ -2,6 +2,5 @@ bin_PROGRAMS = lzmainfo - lzmainfo_SOURCES = lzmainfo.c - lzmainfo_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la - AM_CPPFLAGS = -I@top_srcdir@/src/liblzmadec --AM_LDFLAGS = -static - - dist_man_MANS = lzmainfo.1 -diff --git a/src/lzmainfo/Makefile.in b/src/lzmainfo/Makefile.in -index 6a2127a..f1f3441 100644 ---- a/src/lzmainfo/Makefile.in -+++ b/src/lzmainfo/Makefile.in -@@ -185,7 +185,6 @@ top_srcdir = @top_srcdir@ - lzmainfo_SOURCES = lzmainfo.c - lzmainfo_LDADD = @top_builddir@/src/liblzmadec/liblzmadec.la - AM_CPPFLAGS = -I@top_srcdir@/src/liblzmadec --AM_LDFLAGS = -static - dist_man_MANS = lzmainfo.1 - all: all-am - --- -2.1.3 - diff --git a/package.bak/lzma/lzma.hash b/package.bak/lzma/lzma.hash deleted file mode 100644 index e73517ca57..0000000000 --- a/package.bak/lzma/lzma.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 02aa57f995d15b7acb7c2496d88a39fb0124ea00bf027cc61dd24eddb5942dff lzma-4.32.7.tar.xz diff --git a/package.bak/lzma/lzma.mk b/package.bak/lzma/lzma.mk deleted file mode 100644 index 90f0771780..0000000000 --- a/package.bak/lzma/lzma.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# lzma -# -################################################################################ - -LZMA_VERSION = 4.32.7 -LZMA_SOURCE = lzma-$(LZMA_VERSION).tar.xz -LZMA_SITE = http://tukaani.org/lzma - -$(eval $(host-autotools-package)) - -LZMA = $(HOST_DIR)/usr/bin/lzma diff --git a/package.bak/lzo/Config.in b/package.bak/lzo/Config.in deleted file mode 100644 index 1b6f80bd86..0000000000 --- a/package.bak/lzo/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_LZO - bool "lzo" - help - Portable lossless data compression library written in ANSI C. - - http://www.oberhumer.com/opensource/lzo/ diff --git a/package.bak/lzo/lzo.hash b/package.bak/lzo/lzo.hash deleted file mode 100644 index 415ed99dad..0000000000 --- a/package.bak/lzo/lzo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.oberhumer.com/opensource/lzo/ -sha1 e2a60aca818836181e7e6f8c4f2c323aca6ac057 lzo-2.09.tar.gz diff --git a/package.bak/lzo/lzo.mk b/package.bak/lzo/lzo.mk deleted file mode 100644 index ec7c749f8d..0000000000 --- a/package.bak/lzo/lzo.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# lzo -# -################################################################################ - -LZO_VERSION = 2.09 -LZO_SITE = http://www.oberhumer.com/opensource/lzo/download -LZO_LICENSE = GPLv2+ -LZO_LICENSE_FILES = COPYING -LZO_INSTALL_STAGING = YES -# Ships a beta libtool version hence our patch doesn't apply. -# Run autoreconf to regenerate ltmain.sh. -LZO_AUTORECONF = YES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/lzop/0001-build-with-gcc6.patch b/package.bak/lzop/0001-build-with-gcc6.patch deleted file mode 100644 index 774ee54a65..0000000000 --- a/package.bak/lzop/0001-build-with-gcc6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Jaap Crezee -Date: Sat, 25 june 2016 13:13:00 +0200 -Subject: [PATCH 1/1] fix compilation host-lzop with gcc-6 - -This patch allows host-lzop to be compiled with host systems containing gcc-6 - -Upstream patch found here: -https://build.opensuse.org/package/view_file/Archiving/lzop/lzop-1.03-gcc6.patch?expand=1 - -Signed-off-by: Jaap Crezee - ---- a/src/miniacc.h.orig 2016-02-10 16:09:23.247315866 +0100 -+++ b/src/miniacc.h 2016-02-10 16:12:14.973297054 +0100 -@@ -4469,12 +4469,12 @@ - #if defined(__MSDOS__) && defined(__TURBOC__) && (__TURBOC__ < 0x0150) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1 << (8*SIZEOF_INT-1)) < 0) -+ ACCCHK_ASSERT((int)(1u << (8*SIZEOF_INT-1)) < 0) - #endif - ACCCHK_ASSERT((1u << (8*SIZEOF_INT-1)) > 0) - #if 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #else -- ACCCHK_ASSERT((1l << (8*SIZEOF_LONG-1)) < 0) -+ ACCCHK_ASSERT((long)(1ul << (8*SIZEOF_LONG-1)) < 0) - #endif - ACCCHK_ASSERT((1ul << (8*SIZEOF_LONG-1)) > 0) - #if defined(acc_int16e_t) -@@ -4703,7 +4703,7 @@ - #elif 1 && (ACC_CC_LCC || ACC_CC_LCCWIN32) && !defined(ACCCHK_CFG_PEDANTIC) - #elif 1 && (ACC_CC_SUNPROC) && !defined(ACCCHK_CFG_PEDANTIC) - #elif !(ACC_BROKEN_INTEGRAL_PROMOTION) && (SIZEOF_INT > 1) -- ACCCHK_ASSERT( (((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) -+ ACCCHK_ASSERT( (int)((unsigned int)((unsigned char)128) << (int)(8*sizeof(int)-8)) < 0) - #endif - #if (ACC_CC_BORLANDC && (__BORLANDC__ >= 0x0530) && (__BORLANDC__ < 0x0560)) - # pragma option pop diff --git a/package.bak/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch b/package.bak/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch deleted file mode 100644 index f6d076a9f7..0000000000 --- a/package.bak/lzop/0002-use-static-inlines-as-the-external-inline-definition.patch +++ /dev/null @@ -1,102 +0,0 @@ -From ecccbcf66da53779d88e38e2af7f82eff8dde7f8 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 16 Aug 2015 10:35:47 -0700 -Subject: [PATCH] use static inlines as the external inline definition has - changed with gcc5 - -[Patch from https://raw.githubusercontent.com/openembedded/openembedded-core/master/meta/recipes-support/lzop/lzop/0001-use-static-inlines-as-the-external-inline-definition.patch] -Signed-off-by: Khem Raj -Signed-off-by: Peter Korsgaard ---- -Upstream-Status: Pending - - src/miniacc.h | 24 ++++++++---------------- - 1 file changed, 8 insertions(+), 16 deletions(-) - -diff --git a/src/miniacc.h b/src/miniacc.h -index 09e6f0c..cae98d1 100644 ---- a/src/miniacc.h -+++ b/src/miniacc.h -@@ -2880,8 +2880,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2890,8 +2889,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -2916,8 +2914,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -2926,8 +2923,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3307,8 +3303,7 @@ typedef void (__acc_cdecl_sighandler *acc_sighandler_t)(acc_signo_t); - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE16) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint16e_t* p = (__acc_ua_volatile const acc_uint16e_t*) pp; - unsigned long v; - __asm__ __volatile__("lhbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3317,8 +3312,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE16(__acc_ua_volatile const - #define ACC_UA_GET_LE16(p) __ACC_UA_GET_LE16(p) - #endif - #if !defined(ACC_UA_SET_LE16) --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint16e_t* p = (__acc_ua_volatile acc_uint16e_t*) pp; - __asm__ __volatile__("sthbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } -@@ -3343,8 +3337,7 @@ extern __acc_forceinline void __ACC_UA_SET_LE16(__acc_ua_volatile void* pp, unsi - #if !(ACC_CFG_NO_INLINE_ASM) && (__acc_HAVE_forceinline) - #if (ACC_ARCH_POWERPC && ACC_ABI_BIG_ENDIAN) && (ACC_CC_GNUC) - #if !defined(ACC_UA_GET_LE32) --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp); --extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { -+static __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const void* pp) { - __acc_ua_volatile const acc_uint32e_t* p = (__acc_ua_volatile const acc_uint32e_t*) pp; - unsigned long v; - __asm__ __volatile__("lwbrx %0,0,%1" : "=r" (v) : "r" (p), "m" (*p)); -@@ -3353,8 +3346,7 @@ extern __acc_forceinline unsigned long __ACC_UA_GET_LE32(__acc_ua_volatile const - #define ACC_UA_GET_LE32(p) __ACC_UA_GET_LE32(p) - #endif - #if !defined(ACC_UA_SET_LE32) --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v); --extern __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { -+static __acc_forceinline void __ACC_UA_SET_LE32(__acc_ua_volatile void* pp, unsigned long v) { - __acc_ua_volatile acc_uint32e_t* p = (__acc_ua_volatile acc_uint32e_t*) pp; - __asm__ __volatile__("stwbrx %2,0,%1" : "=m" (*p) : "r" (p), "r" (v)); - } --- -2.5.0 - diff --git a/package.bak/lzop/Config.in b/package.bak/lzop/Config.in deleted file mode 100644 index c91182373b..0000000000 --- a/package.bak/lzop/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_LZOP - bool "lzop" - select BR2_PACKAGE_LZO - help - lzop is a file compressor which is very similar to gzip. - lzop uses the LZO data compression library for compression services. - - http://www.lzop.org/ diff --git a/package.bak/lzop/lzop.hash b/package.bak/lzop/lzop.hash deleted file mode 100644 index a484e7f262..0000000000 --- a/package.bak/lzop/lzop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c1425b8c77d49f5a679d5a126c90ea6ad99585a55e335a613cae59e909dbb2c9 lzop-1.03.tar.gz diff --git a/package.bak/lzop/lzop.mk b/package.bak/lzop/lzop.mk deleted file mode 100644 index 43c1628401..0000000000 --- a/package.bak/lzop/lzop.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# lzop -# -################################################################################ - -LZOP_VERSION = 1.03 -LZOP_SITE = http://www.lzop.org/download -LZOP_LICENSE = GPLv2+ -LZOP_LICENSE_FILES = COPYING -LZOP_DEPENDENCIES = lzo -HOST_LZOP_DEPENDENCIES = host-lzo - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -LZOP = $(HOST_DIR)/usr/bin/lzop diff --git a/package.bak/m4/m4.hash b/package.bak/m4/m4.hash deleted file mode 100644 index 79c36c8706..0000000000 --- a/package.bak/m4/m4.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07 m4-1.4.18.tar.xz diff --git a/package.bak/m4/m4.mk b/package.bak/m4/m4.mk deleted file mode 100644 index d53f7cbd0d..0000000000 --- a/package.bak/m4/m4.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# m4 -# -################################################################################ - -M4_VERSION = 1.4.18 -M4_SOURCE = m4-$(M4_VERSION).tar.xz -M4_SITE = $(BR2_GNU_MIRROR)/m4 -M4_LICENSE = GPLv3+ -M4_LICENSE_FILES = COPYING -HOST_M4_CONF_OPTS = --disable-static - -$(eval $(host-autotools-package)) diff --git a/package.bak/macchanger/0001-Fix-missing-include-for-caddr_t.patch b/package.bak/macchanger/0001-Fix-missing-include-for-caddr_t.patch deleted file mode 100644 index cf5ade8c2c..0000000000 --- a/package.bak/macchanger/0001-Fix-missing-include-for-caddr_t.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 4eeb901b7aadb167e44f476fd665f7fedf491e51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 6 May 2016 09:28:36 +0200 -Subject: [PATCH] Fix missing include for caddr_t -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -caddr_t is defined in . This header file must be included to fix -build with the musl C library: - -netinfo.c: In function 'mc_net_info_get_permanent_mac': -netinfo.c:116:28: error: 'caddr_t' undeclared (first use in this function) - req.ifr_data = (caddr_t)epa; - -Signed-off-by: Jörg Krause ---- - src/netinfo.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/netinfo.c b/src/netinfo.c -index 3525123..1aa3293 100644 ---- a/src/netinfo.c -+++ b/src/netinfo.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - #include - #include --- -2.8.2 - diff --git a/package.bak/macchanger/Config.in b/package.bak/macchanger/Config.in deleted file mode 100644 index a9ebc8ee24..0000000000 --- a/package.bak/macchanger/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MACCHANGER - bool "macchanger" - help - A GNU/Linux utility for viewing/manipulating the MAC address of - network interfaces - - http://www.gnu.org/software/macchanger diff --git a/package.bak/macchanger/macchanger.hash b/package.bak/macchanger/macchanger.hash deleted file mode 100644 index ce3a7f569d..0000000000 --- a/package.bak/macchanger/macchanger.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 dae2717c270fd5f62d790dbf80c19793c651b1b26b62c101b82d5fdf25a845bf macchanger-1.7.0.tar.gz diff --git a/package.bak/macchanger/macchanger.mk b/package.bak/macchanger/macchanger.mk deleted file mode 100644 index 2e716d982f..0000000000 --- a/package.bak/macchanger/macchanger.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# macchanger -# -################################################################################ - -MACCHANGER_VERSION = 1.7.0 -MACCHANGER_SITE = https://github.com/alobbs/macchanger/releases/download/$(MACCHANGER_VERSION) -MACCHANGER_LICENSE = GPLv2+ -MACCHANGER_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/madplay/0001-switch-to-new-alsa-api.patch b/package.bak/madplay/0001-switch-to-new-alsa-api.patch deleted file mode 100644 index 60d7bd3799..0000000000 --- a/package.bak/madplay/0001-switch-to-new-alsa-api.patch +++ /dev/null @@ -1,173 +0,0 @@ -Switch madplay to the new API. This is done thanks to a patch written -by Micha Nelissen and available at -http://article.gmane.org/gmane.comp.audio.mad.devel/729. - ---- madplay-0.15.2b/audio_alsa.c 2008-10-18 15:10:16.000000000 +0200 -+++ madplay-0.15.2b/audio_alsa.c.new 2008-10-18 15:03:27.000000000 +0200 -@@ -28,31 +28,30 @@ - - #include - --#define ALSA_PCM_OLD_HW_PARAMS_API --#define ALSA_PCM_OLD_SW_PARAMS_API - #include - - #include - - #include "audio.h" - --char *buf = NULL; --int paused = 0; -+#define BUFFER_TIME_MAX 500000 - --int rate = -1; --int channels = -1; --int bitdepth = -1; --int sample_size = -1; -- --int buffer_time = 500000; --int period_time = 100000; --char *defaultdev = "plughw:0,0"; -+unsigned char *buf = NULL; -+int paused = 0; -+ -+unsigned int rate = 0; -+unsigned int channels = -1; -+unsigned int bitdepth = -1; -+unsigned int sample_size = -1; -+ -+unsigned int buffer_time; -+unsigned int period_time; -+char *defaultdev = "plughw:0,0"; - - snd_pcm_hw_params_t *alsa_hwparams; - snd_pcm_sw_params_t *alsa_swparams; - --snd_pcm_sframes_t buffer_size; --snd_pcm_sframes_t period_size; -+snd_pcm_uframes_t buffer_size; - - snd_pcm_format_t alsa_format = -1; - snd_pcm_access_t alsa_access = SND_PCM_ACCESS_MMAP_INTERLEAVED; -@@ -66,14 +65,20 @@ - snd_pcm_hw_params_t *params, - snd_pcm_access_t access) - { -- int err, dir; -- -+ int err; -+ - /* choose all parameters */ - err = snd_pcm_hw_params_any(handle,params); - if (err < 0) { - printf("Access type not available for playback: %s\n", snd_strerror(err)); - return err; - } -+ /* set the access type */ -+ err = snd_pcm_hw_params_set_access(handle, params, alsa_access); -+ if (err < 0) { -+ printf("Sample format not available for playback: %s\n", snd_strerror(err)); -+ return err; -+ } - /* set the sample format */ - err = snd_pcm_hw_params_set_format(handle, params, alsa_format); - if (err < 0) { -@@ -87,29 +92,38 @@ - return err; - } - /* set the stream rate */ -- err = snd_pcm_hw_params_set_rate_near(handle, params, rate, 0); -+ err = snd_pcm_hw_params_set_rate(handle, params, rate, 0); - if (err < 0) { - printf("Rate %iHz not available for playback: %s\n", rate, snd_strerror(err)); - return err; - } -- if (err != rate) { -- printf("Rate doesn't match (requested %iHz, get %iHz)\n", rate, err); -- return -EINVAL; -- } -+ err = snd_pcm_hw_params_get_buffer_time_max(params, &buffer_time, NULL); -+ if (err < 0) { -+ printf("Unable to retrieve buffer time: %s\n", snd_strerror(err)); -+ return err; -+ } -+ if (buffer_time > BUFFER_TIME_MAX) -+ buffer_time = BUFFER_TIME_MAX; - /* set buffer time */ -- err = snd_pcm_hw_params_set_buffer_time_near(handle, params, buffer_time, &dir); -+ err = snd_pcm_hw_params_set_buffer_time_near(handle, params, &buffer_time, 0); - if (err < 0) { - printf("Unable to set buffer time %i for playback: %s\n", buffer_time, snd_strerror(err)); - return err; - } -- buffer_size = snd_pcm_hw_params_get_buffer_size(params); -+ if (period_time * 4 > buffer_time) -+ period_time = buffer_time / 4; - /* set period time */ -- err = snd_pcm_hw_params_set_period_time_near(handle, params, period_time, &dir); -+ err = snd_pcm_hw_params_set_period_time_near(handle, params, &period_time, NULL); - if (err < 0) { - printf("Unable to set period time %i for playback: %s\n", period_time, snd_strerror(err)); - return err; - } -- period_size = snd_pcm_hw_params_get_period_size(params, &dir); -+ /* retrieve buffer size */ -+ err = snd_pcm_hw_params_get_buffer_size(params, &buffer_size); -+ if (err < 0) { -+ printf("Unable to retrieve buffer size: %s\n", snd_strerror(err)); -+ return err; -+ } - /* write the parameters to device */ - err = snd_pcm_hw_params(handle, params); - if (err < 0) { -@@ -123,6 +137,7 @@ - int set_swparams(snd_pcm_t *handle, - snd_pcm_sw_params_t *params) - { -+ unsigned int start_threshold; - int err; - - /* get current swparams */ -@@ -136,13 +151,7 @@ - if (err < 0) { - printf("Unable to set start threshold mode for playback: %s\n", snd_strerror(err)); - return err; -- } -- /* allow transfer when at least period_size samples can be processed */ -- err = snd_pcm_sw_params_set_avail_min(handle, params, period_size); -- if (err < 0) { -- printf("Unable to set avail min for playback: %s\n", snd_strerror(err)); -- return err; -- } -+ } - /* align all transfers to 1 samples */ - err = snd_pcm_sw_params_set_xfer_align(handle, params, 1); - if (err < 0) { -@@ -190,7 +199,7 @@ - rate = config->speed; - - if ( bitdepth == 0 ) -- config->precision = bitdepth = 32; -+ config->precision = bitdepth = 16; - - switch (bitdepth) - { -@@ -241,7 +250,7 @@ - return -1; - } - -- buf = malloc(buffer_size); -+ buf = malloc(buffer_size * sample_size); - if (buf == NULL) { - audio_error="unable to allocate output buffer table"; - return -1; -@@ -279,7 +288,7 @@ - int play(struct audio_play *play) - { - int err, len; -- char *ptr; -+ unsigned char *ptr; - - ptr = buf; - len = play->nsamples; - diff --git a/package.bak/madplay/Config.in b/package.bak/madplay/Config.in deleted file mode 100644 index d83fac6d1f..0000000000 --- a/package.bak/madplay/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_MADPLAY - bool "madplay" - select BR2_PACKAGE_LIBMAD - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Command-line front-end to libmad, a high-quality MPEG audio decoder. - It currently supports MPEG-1 and the MPEG-2 extension to lower - sampling frequencies, as well as the de facto MPEG 2.5 format. All - three audio layers — Layer I, Layer II, and Layer III (i.e. MP3) — - are fully implemented. - - http://www.underbit.com/products/mad/ - -if BR2_PACKAGE_MADPLAY - -config BR2_PACKAGE_MADPLAY_ALSA - bool - default y - depends on BR2_PACKAGE_ALSA_LIB - -endif diff --git a/package.bak/madplay/madplay.hash b/package.bak/madplay/madplay.hash deleted file mode 100644 index 99487b5ecd..0000000000 --- a/package.bak/madplay/madplay.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5a79c7516ff7560dffc6a14399a389432bc619c905b13d3b73da22fa65acede0 madplay-0.15.2b.tar.gz diff --git a/package.bak/madplay/madplay.mk b/package.bak/madplay/madplay.mk deleted file mode 100644 index 6b13819754..0000000000 --- a/package.bak/madplay/madplay.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# madplay -# -################################################################################ - -MADPLAY_VERSION = 0.15.2b -MADPLAY_SITE = http://downloads.sourceforge.net/project/mad/madplay/$(MADPLAY_VERSION) -MADPLAY_LICENSE = GPLv2+ -MADPLAY_LICENSE_FILES = COPYING COPYRIGHT -MADPLAY_LIBTOOL_PATCH = NO -MADPLAY_DEPENDENCIES = libmad libid3tag $(if $(BR2_PACKAGE_GETTEXT),gettext) - -# Workaround a bug in uClibc-ng, which exposes madvise() but doesn't -# provide the corresponding MADV_* definitions. Bug reported at -# http://mailman.uclibc-ng.org/pipermail/devel/2016-December/001306.html. madvise() -# is anyway useless on noMMU. -ifeq ($(BR2_USE_MMU),) -MADPLAY_CONF_ENV += ac_cv_func_madvise=no -endif - -# Check if ALSA is built, then we should configure after alsa-lib so -# ./configure can find alsa-lib. -ifeq ($(BR2_PACKAGE_MADPLAY_ALSA),y) -MADPLAY_CONF_OPTS += --with-alsa -MADPLAY_DEPENDENCIES += host-pkgconf alsa-lib -MADPLAY_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/make/Config.in b/package.bak/make/Config.in deleted file mode 100644 index f576b7b5a3..0000000000 --- a/package.bak/make/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MAKE - bool "make" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - A tool which controls the generation of executables and other - non-source files of a program from the program's source files. - - While Buildroot no longer supports building a toolchain for - the target, we keep a make package that is for example - useful to run the uClibc test suite on the target. - - http://www.gnu.org/software/make/ diff --git a/package.bak/make/make.hash b/package.bak/make/make.hash deleted file mode 100644 index ea2e860512..0000000000 --- a/package.bak/make/make.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://lists.gnu.org/archive/html/info-gnu/2016-06/msg00005.html -md5 15b012617e7c44c0ed482721629577ac make-4.2.1.tar.bz2 -# Locally calculated after checking signature -sha256 d6e262bf3601b42d2b1e4ef8310029e1dcf20083c5446b4b7aa67081fdffc589 make-4.2.1.tar.bz2 diff --git a/package.bak/make/make.mk b/package.bak/make/make.mk deleted file mode 100644 index c51ce3b72f..0000000000 --- a/package.bak/make/make.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# make -# -################################################################################ - -MAKE_VERSION = 4.2.1 -MAKE_SOURCE = make-$(MAKE_VERSION).tar.bz2 -MAKE_SITE = $(BR2_GNU_MIRROR)/make -MAKE_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -MAKE_LICENSE = GPLv3+ -MAKE_LICENSE_FILES = COPYING - -MAKE_CONF_OPTS = --without-guile - -# Disable the 'load' operation for static builds since it needs dlopen -ifeq ($(BR2_STATIC_LIBS),y) -MAKE_CONF_OPTS += --disable-load -endif - -$(eval $(autotools-package)) diff --git a/package.bak/makedevs/README b/package.bak/makedevs/README deleted file mode 100644 index 70844bf802..0000000000 --- a/package.bak/makedevs/README +++ /dev/null @@ -1,35 +0,0 @@ -When building a target filesystem, it is desirable to not have to -become root and then run 'mknod' a thousand times. Using a device -table you can create device nodes and directories "on the fly". - -You can do all sorts of interesting things with a device table file. -For example, if you want to adjust the permissions on a particular -file you can just add an entry like: - - /sbin/foobar f 2755 0 0 - - - - - - -and (assuming the file /sbin/foobar exists) it will be made setuid -root (regardless of what its permissions are on the host filesystem. - -Furthermore, you can use a single table entry to create a many device -minors. For example, if I wanted to create /dev/hda and -/dev/hda[0-15] I could just use the following two table entries: - - /dev/hda b 640 0 0 3 0 0 0 - - /dev/hda b 640 0 0 3 1 1 1 15 - -Device table entries take the form of: - - - -where name is the file name, type can be one of: - - f: A regular file - d: Directory - c: Character special device file - b: Block special device file - p: Fifo (named pipe) - -uid is the user id for the target file, gid is the group id for the -target file. The rest of the entries (major, minor, etc) apply only -to device special files. diff --git a/package.bak/makedevs/makedevs.c b/package.bak/makedevs/makedevs.c deleted file mode 100644 index 7092b1475e..0000000000 --- a/package.bak/makedevs/makedevs.c +++ /dev/null @@ -1,644 +0,0 @@ -/* vi: set sw=4 ts=4: */ -/* - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Library General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - */ - -#define _GNU_SOURCE -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#ifndef __APPLE__ -#include /* major() and minor() */ -#endif -#include -#ifdef EXTENDED_ATTRIBUTES -#include -#endif /* EXTENDED_ATTRIBUTES */ - -const char *bb_applet_name; -uid_t recursive_uid; -gid_t recursive_gid; -unsigned int recursive_mode; -#define PASSWD_PATH "etc/passwd" /* MUST be relative */ -#define GROUP_PATH "etc/group" /* MUST be relative */ - -void bb_verror_msg(const char *s, va_list p) -{ - fflush(stdout); - fprintf(stderr, "%s: ", bb_applet_name); - vfprintf(stderr, s, p); -} - -void bb_error_msg(const char *s, ...) -{ - va_list p; - - va_start(p, s); - bb_verror_msg(s, p); - va_end(p); - putc('\n', stderr); -} - -void bb_error_msg_and_die(const char *s, ...) -{ - va_list p; - - va_start(p, s); - bb_verror_msg(s, p); - va_end(p); - putc('\n', stderr); - exit(1); -} - -void bb_vperror_msg(const char *s, va_list p) -{ - int err=errno; - if(s == 0) s = ""; - bb_verror_msg(s, p); - if (*s) s = ": "; - fprintf(stderr, "%s%s\n", s, strerror(err)); -} - -void bb_perror_msg(const char *s, ...) -{ - va_list p; - - va_start(p, s); - bb_vperror_msg(s, p); - va_end(p); -} - -void bb_perror_msg_and_die(const char *s, ...) -{ - va_list p; - - va_start(p, s); - bb_vperror_msg(s, p); - va_end(p); - exit(1); -} - -FILE *bb_xfopen(const char *path, const char *mode) -{ - FILE *fp; - if ((fp = fopen(path, mode)) == NULL) - bb_perror_msg_and_die("%s", path); - return fp; -} - -enum { - FILEUTILS_PRESERVE_STATUS = 1, - FILEUTILS_DEREFERENCE = 2, - FILEUTILS_RECUR = 4, - FILEUTILS_FORCE = 8, - FILEUTILS_INTERACTIVE = 16 -}; -int bb_make_directory (char *path, long mode, int flags) -{ - mode_t mask; - const char *fail_msg; - char *s = path; - char c; - struct stat st; - - mask = umask(0); - if (mode == -1) { - umask(mask); - mode = (S_IXUSR | S_IXGRP | S_IXOTH | - S_IWUSR | S_IWGRP | S_IWOTH | - S_IRUSR | S_IRGRP | S_IROTH) & ~mask; - } else { - umask(mask & ~0300); - } - - do { - c = 0; - - if (flags & FILEUTILS_RECUR) { /* Get the parent. */ - /* Bypass leading non-'/'s and then subsequent '/'s. */ - while (*s) { - if (*s == '/') { - do { - ++s; - } while (*s == '/'); - c = *s; /* Save the current char */ - *s = 0; /* and replace it with nul. */ - break; - } - ++s; - } - } - - if (mkdir(path, 0777) < 0) { - /* If we failed for any other reason than the directory - * already exists, output a diagnostic and return -1.*/ - if ((errno != EEXIST && errno != EISDIR) - || !(flags & FILEUTILS_RECUR) - || (stat(path, &st) < 0 || !S_ISDIR(st.st_mode))) { - fail_msg = "create"; - umask(mask); - break; - } - /* Since the directory exists, don't attempt to change - * permissions if it was the full target. Note that - * this is not an error conditon. */ - if (!c) { - umask(mask); - return 0; - } - } - - if (!c) { - /* Done. If necessary, updated perms on the newly - * created directory. Failure to update here _is_ - * an error.*/ - umask(mask); - if ((mode != -1) && (chmod(path, mode) < 0)){ - fail_msg = "set permissions of"; - break; - } - return 0; - } - - /* Remove any inserted nul from the path (recursive mode). */ - *s = c; - - } while (1); - - bb_perror_msg ("Cannot %s directory `%s'", fail_msg, path); - return -1; -} - -const char * const bb_msg_memory_exhausted = "memory exhausted"; - -void *xmalloc(size_t size) -{ - void *ptr = malloc(size); - if (ptr == NULL && size != 0) - bb_error_msg_and_die(bb_msg_memory_exhausted); - return ptr; -} - -void *xcalloc(size_t nmemb, size_t size) -{ - void *ptr = calloc(nmemb, size); - if (ptr == NULL && nmemb != 0 && size != 0) - bb_error_msg_and_die(bb_msg_memory_exhausted); - return ptr; -} - -void *xrealloc(void *ptr, size_t size) -{ - ptr = realloc(ptr, size); - if (ptr == NULL && size != 0) - bb_error_msg_and_die(bb_msg_memory_exhausted); - return ptr; -} - -char *private_get_line_from_file(FILE *file, int c) -{ -#define GROWBY (80) /* how large we will grow strings by */ - - int ch; - int idx = 0; - char *linebuf = NULL; - int linebufsz = 0; - - while ((ch = getc(file)) != EOF) { - /* grow the line buffer as necessary */ - if (idx > linebufsz - 2) { - linebuf = xrealloc(linebuf, linebufsz += GROWBY); - } - linebuf[idx++] = (char)ch; - if (!ch) return linebuf; - if (c<2 && ch == '\n') { - if (c) { - --idx; - } - break; - } - } - if (linebuf) { - if (ferror(file)) { - free(linebuf); - return NULL; - } - linebuf[idx] = 0; - } - return linebuf; -} - -char *bb_get_chomped_line_from_file(FILE *file) -{ - return private_get_line_from_file(file, 1); -} - -long my_getpwnam(const char *name) -{ - struct passwd *myuser; - FILE *stream; - - stream = bb_xfopen(PASSWD_PATH, "r"); - while(1) { - errno = 0; - myuser = fgetpwent(stream); - if (myuser == NULL) - bb_error_msg_and_die("unknown user name: %s", name); - if (errno) - bb_perror_msg_and_die("fgetpwent"); - if (!strcmp(name, myuser->pw_name)) - break; - } - fclose(stream); - - return myuser->pw_uid; -} - -long my_getgrnam(const char *name) -{ - struct group *mygroup; - FILE *stream; - - stream = bb_xfopen(GROUP_PATH, "r"); - while(1) { - errno = 0; - mygroup = fgetgrent(stream); - if (mygroup == NULL) - bb_error_msg_and_die("unknown group name: %s", name); - if (errno) - bb_perror_msg_and_die("fgetgrent"); - if (!strcmp(name, mygroup->gr_name)) - break; - } - fclose(stream); - - return mygroup->gr_gid; -} - -unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *)) -{ - unsigned long r; - char *p; - - r = strtoul(s, &p, 10); - if (*p || (s == p)) { - r = my_getxxnam(s); - } - - return r; -} - -char * last_char_is(const char *s, int c) -{ - char *sret = (char *)s; - if (sret) { - sret = strrchr(sret, c); - if(sret != NULL && *(sret+1) != 0) - sret = NULL; - } - return sret; -} - -void bb_xasprintf(char **string_ptr, const char *format, ...) -{ - va_list p; - int r; - - va_start(p, format); - r = vasprintf(string_ptr, format, p); - va_end(p); - - if (r < 0) { - bb_perror_msg_and_die("bb_xasprintf"); - } -} - -char *concat_path_file(const char *path, const char *filename) -{ - char *outbuf; - char *lc; - - if (!path) - path = ""; - lc = last_char_is(path, '/'); - while (*filename == '/') - filename++; - bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename); - - return outbuf; -} - -#ifdef EXTENDED_ATTRIBUTES -int bb_set_xattr(const char *fpath, const char *xattr) -{ - cap_t cap, cap_file, cap_new; - char *cap_file_text, *cap_new_text; - ssize_t length; - - cap = cap_from_text(xattr); - if (cap == NULL) - bb_perror_msg_and_die("cap_from_text failed for %s", xattr); - - cap_file = cap_get_file(fpath); - if (cap_file == NULL) { - /* if no capability was set before, we initialize cap_file */ - if (errno != ENODATA) - bb_perror_msg_and_die("cap_get_file failed on %s", fpath); - - cap_file = cap_init(); - if (!cap_file) - bb_perror_msg_and_die("cap_init failed"); - } - - if ((cap_file_text = cap_to_text(cap_file, &length)) == NULL) - bb_perror_msg_and_die("cap_to_name failed on %s", fpath); - - bb_xasprintf(&cap_new_text, "%s %s", cap_file_text, xattr); - - if ((cap_new = cap_from_text(cap_new_text)) == NULL) - bb_perror_msg_and_die("cap_from_text failed on %s", cap_new_text); - - if (cap_set_file(fpath, cap_new) == -1) - bb_perror_msg_and_die("cap_set_file failed for %s (xattr = %s)", fpath, xattr); - - cap_free(cap); - cap_free(cap_file); - cap_free(cap_file_text); - cap_free(cap_new); - cap_free(cap_new_text); - - return 0; -} -#endif /* EXTENDED_ATTRIBUTES */ - -void bb_show_usage(void) -{ - fprintf(stderr, "%s: [-d device_table] rootdir\n\n", bb_applet_name); - fprintf(stderr, "Creates a batch of special files as specified in a device table.\n"); - fprintf(stderr, "Device table entries take the form of:\n"); - fprintf(stderr, "name type mode user group major minor start increment count\n\n"); - fprintf(stderr, "Where name is the file name, type can be one of:\n"); - fprintf(stderr, " f A regular file\n"); - fprintf(stderr, " d Directory\n"); - fprintf(stderr, " r Directory recursively\n"); - fprintf(stderr, " c Character special device file\n"); - fprintf(stderr, " b Block special device file\n"); - fprintf(stderr, " p Fifo (named pipe)\n"); - fprintf(stderr, "uid is the user id for the target file, gid is the group id for the\n"); - fprintf(stderr, "target file. The rest of the entries (major, minor, etc) apply to\n"); - fprintf(stderr, "to device special files. A '-' may be used for blank entries.\n\n"); - fprintf(stderr, "For example:\n"); - fprintf(stderr, " \n"); - fprintf(stderr, "/dev d 755 0 0 - - - - -\n"); - fprintf(stderr, "/dev/console c 666 0 0 5 1 - - -\n"); - fprintf(stderr, "/dev/null c 666 0 0 1 3 0 0 -\n"); - fprintf(stderr, "/dev/zero c 666 0 0 1 5 0 0 -\n"); - fprintf(stderr, "/dev/hda b 640 0 0 3 0 0 0 -\n"); - fprintf(stderr, "/dev/hda b 640 0 0 3 1 1 1 15\n"); - fprintf(stderr, "/dev/rtp b 640 0 0 250 0 0 1 5\n"); - fprintf(stderr, "/dev/gps b 640 0 0 251 0 1 1 5\n"); - fprintf(stderr, "/dev/uio b 640 0 0 252 0 1 2 5\n"); - fprintf(stderr, "/dev/uio b 640 0 0 252 1 6 2 5\n\n"); - fprintf(stderr, "Will Produce:\n"); - fprintf(stderr, "/dev\n"); - fprintf(stderr, "/dev/console\n"); - fprintf(stderr, "/dev/null\n"); - fprintf(stderr, "/dev/zero\n"); - fprintf(stderr, "/dev/hda\n"); - fprintf(stderr, "/dev/hda[1-15] with minor numbers [1-15]\n"); - fprintf(stderr, "/dev/rtp[0-4] with minor numbers [0-4]\n"); - fprintf(stderr, "/dev/gps[1-5] with minor numbers [0-4]\n"); - fprintf(stderr, "/dev/uio[1-5] with minor numbers 0,2,4,6,8\n"); - fprintf(stderr, "/dev/uio[6-10] with minor numbers 1,3,5,7,9\n"); - exit(1); -} - -int bb_recursive(const char *fpath, const struct stat *sb, - int tflag, struct FTW *ftwbuf){ - - if (chown(fpath, recursive_uid, recursive_gid) == -1) { - bb_perror_msg("chown failed for %s", fpath); - return -1; - } - if (recursive_mode != -1) { - if (chmod(fpath, recursive_mode) < 0) { - bb_perror_msg("chmod failed for %s", fpath); - return -1; - } - } - - return 0; -} - -int main(int argc, char **argv) -{ - int opt; - FILE *table = stdin; - char *rootdir = NULL; - char *full_name = NULL; - char *line = NULL; - int linenum = 0; - int ret = EXIT_SUCCESS; - - bb_applet_name = basename(argv[0]); - - while ((opt = getopt(argc, argv, "d:")) != -1) { - switch(opt) { - case 'd': - table = bb_xfopen((line=optarg), "r"); - break; - default: - bb_show_usage(); - } - } - - if (optind >= argc || (rootdir=argv[optind])==NULL) { - bb_error_msg_and_die("root directory not speficied"); - } - - if (chdir(rootdir) != 0) { - bb_perror_msg_and_die("Couldnt chdir to %s", rootdir); - } - - umask(0); - - printf("rootdir=%s\n", rootdir); - if (line) { - printf("table='%s'\n", line); - } else { - printf("table=\n"); - } - - while ((line = bb_get_chomped_line_from_file(table))) { - char type; - unsigned int mode = 0755; - unsigned int major = 0; - unsigned int minor = 0; - unsigned int count = 0; - unsigned int increment = 0; - unsigned int start = 0; - char xattr[255]; - char name[4096]; - char user[41]; - char group[41]; - uid_t uid; - gid_t gid; - - linenum++; - - if (1 == sscanf(line, "|xattr %254s", xattr)) { -#ifdef EXTENDED_ATTRIBUTES - if (!full_name) - bb_error_msg_and_die("line %d should be after a file\n", linenum); - - if (bb_set_xattr(full_name, xattr) < 0) - bb_error_msg_and_die("can't set cap %s on file %s\n", xattr, full_name); -#else - bb_error_msg_and_die("line %d not supported: '%s'\nDid you forget to enable " - "BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES?\n", - linenum, line); -#endif /* EXTENDED_ATTRIBUTES */ - continue; - } - - if ((2 > sscanf(line, "%4095s %c %o %40s %40s %u %u %u %u %u", name, - &type, &mode, user, group, &major, - &minor, &start, &increment, &count)) || - ((major | minor | start | count | increment) > 0xfffff)) - { - if (*line=='\0' || *line=='#' || isspace(*line)) - continue; - bb_error_msg("line %d invalid: '%s'\n", linenum, line); - ret = EXIT_FAILURE; - continue; - } - if (name[0] == '#') { - continue; - } - if (*group) { - gid = get_ug_id(group, my_getgrnam); - } else { - gid = getgid(); - } - if (*user) { - uid = get_ug_id(user, my_getpwnam); - } else { - uid = getuid(); - } - - /* - * free previous full name - * we don't de-allocate full_name at the end of the parsing, - * because we may need it if the next line is an xattr. - */ - free(full_name); - full_name = concat_path_file(rootdir, name); - - if (type == 'd') { - bb_make_directory(full_name, mode | S_IFDIR, FILEUTILS_RECUR); - if (chown(full_name, uid, gid) == -1) { - bb_perror_msg("line %d: chown failed for %s", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ - bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - } else if (type == 'f') { - struct stat st; - if ((stat(full_name, &st) < 0 || !S_ISREG(st.st_mode))) { - bb_perror_msg("line %d: regular file '%s' does not exist", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - if (chown(full_name, uid, gid) == -1) { - bb_perror_msg("line %d: chown failed for %s", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - if ((mode != -1) && (chmod(full_name, mode) < 0)){ - bb_perror_msg("line %d: chmod failed for %s", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - } else if (type == 'r') { - recursive_uid = uid; - recursive_gid = gid; - recursive_mode = mode; - if (nftw(full_name, bb_recursive, 20, FTW_MOUNT | FTW_PHYS) < 0) { - bb_perror_msg("line %d: recursive failed for %s", linenum, full_name); - ret = EXIT_FAILURE; - goto loop; - } - } else - { - dev_t rdev; - unsigned i; - char *full_name_inc; - - if (type == 'p') { - mode |= S_IFIFO; - } - else if (type == 'c') { - mode |= S_IFCHR; - } - else if (type == 'b') { - mode |= S_IFBLK; - } else { - bb_error_msg("line %d: Unsupported file type %c", linenum, type); - ret = EXIT_FAILURE; - goto loop; - } - - full_name_inc = xmalloc(strlen(full_name) + sizeof(int)*3 + 2); - if (count) - count--; - for (i = start; i <= start + count; i++) { - sprintf(full_name_inc, count ? "%s%u" : "%s", full_name, i); - rdev = makedev(major, minor + (i - start) * increment); - if (mknod(full_name_inc, mode, rdev) < 0) { - bb_perror_msg("line %d: can't create node %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } else if (chown(full_name_inc, uid, gid) < 0) { - bb_perror_msg("line %d: can't chown %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } else if (chmod(full_name_inc, mode) < 0) { - bb_perror_msg("line %d: can't chmod %s", linenum, full_name_inc); - ret = EXIT_FAILURE; - } - } - free(full_name_inc); - } -loop: - free(line); - } - fclose(table); - - return ret; -} diff --git a/package.bak/makedevs/makedevs.mk b/package.bak/makedevs/makedevs.mk deleted file mode 100644 index 9bd684f036..0000000000 --- a/package.bak/makedevs/makedevs.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# makedevs -# -################################################################################ - -MAKEDEVS_LICENSE = GPLv2 - -HOST_MAKEDEVS_CFLAGS = $(HOST_CFLAGS) -HOST_MAKEDEVS_LDFLAGS = $(HOST_LDFLAGS) - -ifeq ($(BR2_ROOTFS_DEVICE_TABLE_SUPPORTS_EXTENDED_ATTRIBUTES),y) -HOST_MAKEDEVS_DEPENDENCIES += host-libcap -HOST_MAKEDEVS_CFLAGS += -DEXTENDED_ATTRIBUTES -HOST_MAKEDEVS_LDFLAGS += -lcap -endif - -define HOST_MAKEDEVS_BUILD_CMDS - $(HOSTCC) $(HOST_MAKEDEVS_CFLAGS) package/makedevs/makedevs.c \ - -o $(@D)/makedevs $(HOST_MAKEDEVS_LDFLAGS) -endef - -define HOST_MAKEDEVS_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/makedevs $(HOST_DIR)/usr/bin/makedevs -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/mali-t76x/Config.in b/package.bak/mali-t76x/Config.in deleted file mode 100644 index 26a7f6c00d..0000000000 --- a/package.bak/mali-t76x/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_MALI_T76X - bool "mali-t76x" - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_ARM_EABIHF - depends on BR2_arm - help - Install the binary user-space components for the ARM Mali Midgard - T76X GPU. This package requires a kernel with the ARM Mali Midgard - GPU Kernel Drivers enabled. - - Source: http://malideveloper.arm.com/resources/drivers/ - -if BR2_PACKAGE_MALI_T76X - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "mali-t76x" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "mali-t76x" - -endif - -comment "mali-t76x needs a glibc toolchain with armhf enabled" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_ARM_EABIHF diff --git a/package.bak/mali-t76x/egl.pc b/package.bak/mali-t76x/egl.pc deleted file mode 100644 index 614b700d64..0000000000 --- a/package.bak/mali-t76x/egl.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr/ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: ARM Mali implementation of EGL -Version: 1.5 -Requires: -Libs: -L${libdir} -lEGL -lGLESv2 -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS diff --git a/package.bak/mali-t76x/glesv2.pc b/package.bak/mali-t76x/glesv2.pc deleted file mode 100644 index 5997eac63f..0000000000 --- a/package.bak/mali-t76x/glesv2.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: ARM Mali implementation of OpenGL ESv2 -Version: 2.0 -Requires: -Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS diff --git a/package.bak/mali-t76x/mali-t76x.hash b/package.bak/mali-t76x/mali-t76x.hash deleted file mode 100644 index a754b98074..0000000000 --- a/package.bak/mali-t76x/mali-t76x.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5a0b00438edc8066b374481d3332a43c07ec2bd3bc73265983a968970f754902 mali-t76x_r5p0-06rel0_linux_1+fbdev.tar.gz diff --git a/package.bak/mali-t76x/mali-t76x.mk b/package.bak/mali-t76x/mali-t76x.mk deleted file mode 100644 index 387685c033..0000000000 --- a/package.bak/mali-t76x/mali-t76x.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# mali-t76x -# -################################################################################ - -MALI_T76X_VERSION = r5p0-06rel0 -MALI_T76X_SOURCE = mali-t76x_$(MALI_T76X_VERSION)_linux_1+fbdev.tar.gz -MALI_T76X_SITE = http://malideveloper.arm.com/downloads/drivers/binary/$(MALI_T76X_VERSION) -MALI_T76X_DEPENDENCIES = mesa3d-headers -MALI_T76X_INSTALL_STAGING = YES -MALI_T76X_PROVIDES = libegl libgles - -define MALI_T76X_INSTALL_STAGING_CMDS - $(INSTALL) -m 755 $(@D)/*.so $(STAGING_DIR)/usr/lib/ - - $(INSTALL) -D -m 0644 package/mali-t76x/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/mali-t76x/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define MALI_T76X_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(@D)/*.so $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/mariadb/0001-add-extra-check-for-librt.patch b/package.bak/mariadb/0001-add-extra-check-for-librt.patch deleted file mode 100644 index 26bff7546c..0000000000 --- a/package.bak/mariadb/0001-add-extra-check-for-librt.patch +++ /dev/null @@ -1,27 +0,0 @@ -From e6244400dfd3547531a3a3289fadbbe19873f096 Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Thu, 27 Oct 2016 20:33:21 -0700 -Subject: [PATCH] add extra check for librt - -Signed-off-by: Ryan Coe ---- - configure.cmake | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/configure.cmake b/configure.cmake -index 896226de954f4642a238ca6a72e0930590dc1681..77ca485fb05e6b63bb69f9561b4eabfaa208a419 100644 ---- a/configure.cmake -+++ b/configure.cmake -@@ -126,6 +126,9 @@ IF(UNIX) - IF(NOT LIBRT) - MY_SEARCH_LIBS(clock_gettime rt LIBRT) - ENDIF() -+ IF(NOT LIBRT) -+ MY_SEARCH_LIBS(posix_spawn_file_actions_addclose rt LIBRT) -+ ENDIF() - FIND_PACKAGE(Threads) - - SET(CMAKE_REQUIRED_LIBRARIES --- -2.9.3 - diff --git a/package.bak/mariadb/S97mysqld b/package.bak/mariadb/S97mysqld deleted file mode 100644 index 62357fa8c4..0000000000 --- a/package.bak/mariadb/S97mysqld +++ /dev/null @@ -1,77 +0,0 @@ -#!/bin/sh -# -# mysql -# - -MYSQL_LIB="/var/lib/mysql" -MYSQL_RUN="/run/mysql" -MYSQL_PID="$MYSQL_RUN/mysqld.pid" -MYSQL_BIN="/usr/bin" - -wait_for_ready() { - WAIT_DELAY=5 - while [ $WAIT_DELAY -gt 0 ]; do - if $MYSQL_BIN/mysqladmin ping > /dev/null 2>&1; then - return 0 - fi - sleep 1 - : $((WAIT_DELAY -= 1)) - done - return 1 -} - -start() { - if [ `ls -1 $MYSQL_LIB | wc -l` = 0 ] ; then - printf "Creating mysql system tables ... " - $MYSQL_BIN/mysql_install_db --basedir=/usr --user=mysql \ - --datadir=$MYSQL_LIB > /dev/null 2>&1 - if [ $? != 0 ]; then - echo "FAIL" - exit 1 - fi - echo "OK" - fi - - # mysqld runs as user mysql, but /run is only writable by root - # so create a subdirectory for mysql. - install -d -o mysql -g root -m 0755 $MYSQL_RUN - - # We don't use start-stop-daemon because mysqld has its own - # wrapper script. - printf "Starting mysql ... " - $MYSQL_BIN/mysqld_safe --pid-file=$MYSQL_PID --user=mysql \ - > /dev/null 2>&1 & - wait_for_ready - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping mysql ... " - if [ -f $MYSQL_PID ]; then - kill `cat $MYSQL_PID` > /dev/null 2>&1 - [ $? = 0 ] && echo "OK" || echo "FAIL" - else - echo "FAIL" - fi -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/mariadb/mariadb.hash b/package.bak/mariadb/mariadb.hash deleted file mode 100644 index 3d6520f342..0000000000 --- a/package.bak/mariadb/mariadb.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://downloads.mariadb.org/mariadb/10.1.21/ -sha1 f9ccaa9881b98eeef68f4dbcf5ab9653c903819f mariadb-10.1.21.tar.gz - -# Locally computed -sha256 5a816355781ea22a6c65a436d8162f19bd292ec90e2b7d9499c031ae4a659490 mariadb-10.1.21.tar.gz diff --git a/package.bak/mariadb/mariadb.mk b/package.bak/mariadb/mariadb.mk deleted file mode 100644 index aa4afc5b5c..0000000000 --- a/package.bak/mariadb/mariadb.mk +++ /dev/null @@ -1,116 +0,0 @@ -################################################################################ -# -# mariadb -# -################################################################################ - -MARIADB_VERSION = 10.1.21 -MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source -MARIADB_LICENSE = GPLv2 (server), GPLv2 with FLOSS exception (GPL client library), LGPLv2 (LGPL client library) -MARIADB_LICENSE_FILES = README COPYING COPYING.LESSER -MARIADB_INSTALL_STAGING = YES -MARIADB_PROVIDES = mysql - -MARIADB_DEPENDENCIES = \ - host-mariadb \ - ncurses \ - openssl \ - zlib \ - libaio \ - libxml2 \ - readline - -# We won't need unit tests -MARIADB_CONF_OPTS += -DWITH_UNIT_TESTS=0 - -# Mroonga needs libstemmer. Some work still needs to be done before it can be -# included in buildroot. Disable it for now. -MARIADB_CONF_OPTS += -DWITHOUT_MROONGA=1 - -# This value is determined automatically during straight compile by compiling -# and running a test code. You cannot do that during cross-compile. However the -# stack grows downward in most if not all modern systems. The only exception I -# am aware of is PA-RISC which is not supported by buildroot. Therefore it makes -# sense to hardcode the value. If an arch is added the stack of which grows up -# one should expect unpredictable behavior at run time. -MARIADB_CONF_OPTS += -DSTACK_DIRECTION=-1 - -# Jemalloc was added for TokuDB. Since its configure script seems somewhat broken -# when it comes to cross-compilation we shall disable it and also disable TokuDB. -MARIADB_CONF_OPTS += -DWITH_JEMALLOC=no -DWITHOUT_TOKUDB=1 - -# Make it explicit that we are cross-compiling -MARIADB_CONF_OPTS += -DCMAKE_CROSSCOMPILING=1 - -# Explicitly disable dtrace to avoid detection of a host version -MARIADB_CONF_OPTS += -DENABLE_DTRACE=0 - -ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) -MARIADB_CONF_OPTS += -DWITH_EMBEDDED_SERVER=ON -else -MARIADB_CONF_OPTS += -DWITHOUT_SERVER=ON -endif - -MARIADB_CONF_OPTS += \ - -DINSTALL_DOCDIR=share/doc/mariadb-$(MARIADB_VERSION) \ - -DINSTALL_DOCREADMEDIR=share/doc/mariadb-$(MARIADB_VERSION) \ - -DINSTALL_MANDIR=share/man \ - -DINSTALL_MYSQLSHAREDIR=share/mysql \ - -DINSTALL_MYSQLTESTDIR=share/mysql/test \ - -DINSTALL_PLUGINDIR=lib/mysql/plugin \ - -DINSTALL_SBINDIR=sbin \ - -DINSTALL_SCRIPTDIR=bin \ - -DINSTALL_SQLBENCHDIR=share/mysql/bench \ - -DINSTALL_SUPPORTFILESDIR=share/mysql \ - -DMYSQL_DATADIR=/var/lib/mysql \ - -DMYSQL_UNIX_ADDR=$(MYSQL_SOCKET) - -# Some helpers must be compiled for host in order to crosscompile mariadb for -# the target. They are then included by import_executables.cmake which is -# generated during the build of the host helpers. It is not necessary to build -# the whole host package, only the "import_executables" target. -# -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake -# must then be passed to cmake during target build. -# see also https://mariadb.com/kb/en/mariadb/cross-compiling-mariadb/ -HOST_MARIADB_MAKE_OPTS = import_executables - -MARIADB_CONF_OPTS += \ - -DIMPORT_EXECUTABLES=$(HOST_MARIADB_BUILDDIR)/import_executables.cmake - -# Don't install host-mariadb. We just need to build import_executable -# Therefore only run 'true' and do nothing, not even the default action. -HOST_MARIADB_INSTALL_CMDS = true - -ifeq ($(BR2_PACKAGE_MARIADB_SERVER),y) -define MARIADB_USERS - mysql -1 mysql -1 * /var/lib/mysql - - MySQL Server -endef - -define MARIADB_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/mariadb/S97mysqld \ - $(TARGET_DIR)/etc/init.d/S97mysqld -endef - -define MARIADB_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mariadb/mysqld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service -endef -endif - -define MARIADB_POST_INSTALL - mkdir -p $(TARGET_DIR)/var/lib/mysql - $(INSTALL) -D -m 644 $(TARGET_DIR)/usr/share/mysql/my-small.cnf \ - $(TARGET_DIR)/etc/mysql/my.cnf - # We don't need this on the target as it's only useful in staging - $(RM) $(TARGET_DIR)/usr/bin/mysql_config - # Remove test suite - $(RM) -r $(TARGET_DIR)/usr/share/mysql/test -endef - -MARIADB_POST_INSTALL_TARGET_HOOKS += MARIADB_POST_INSTALL - -$(eval $(cmake-package)) -$(eval $(host-cmake-package)) diff --git a/package.bak/mariadb/mysqld.service b/package.bak/mariadb/mysqld.service deleted file mode 100644 index cd308310c6..0000000000 --- a/package.bak/mariadb/mysqld.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=MySQL database server - -[Service] -ExecStartPre=/bin/sh -c 'test "`ls -1 /var/lib/mysql | wc -l`" != "0" || mysql_install_db --basedir=/usr --datadir=/var/lib/mysql' -ExecStart=/usr/bin/mysqld_safe -Restart=always -User=mysql -RuntimeDirectory=mysql -RuntimeDirectoryMode=0755 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/matchbox-common/Config.in b/package.bak/matchbox-common/Config.in deleted file mode 100644 index 5a038e17da..0000000000 --- a/package.bak/matchbox-common/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_COMMON - bool "matchbox-common" - select BR2_PACKAGE_MATCHBOX_LIB - depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP - help - Common desktop folders and matchbox-session script. - -config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style app folder" - depends on BR2_PACKAGE_MATCHBOX_COMMON diff --git a/package.bak/matchbox-common/matchbox-common.hash b/package.bak/matchbox-common/matchbox-common.hash deleted file mode 100644 index 619d8473c0..0000000000 --- a/package.bak/matchbox-common/matchbox-common.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2.md5 -md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 diff --git a/package.bak/matchbox-common/matchbox-common.mk b/package.bak/matchbox-common/matchbox-common.mk deleted file mode 100644 index 038dd5943d..0000000000 --- a/package.bak/matchbox-common/matchbox-common.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# matchbox-common -# -################################################################################ - -MATCHBOX_COMMON_VERSION_MAJOR = 0.9 -MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1 -MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2 -MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR) -MATCHBOX_COMMON_LICENSE = GPLv2+ -MATCHBOX_COMMON_LICENSE_FILES = COPYING -MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib - -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) -MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders -else -MATCHBOX_COMMON_CONF_OPTS += --disable-pda-folders -endif - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-desktop/Config.in b/package.bak/matchbox-desktop/Config.in deleted file mode 100644 index 22c568bc1a..0000000000 --- a/package.bak/matchbox-desktop/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "matchbox-desktop" - select BR2_PACKAGE_MATCHBOX_LIB - select BR2_PACKAGE_ZLIB - help - A PDA style application launcher or 'item browser'. diff --git a/package.bak/matchbox-desktop/matchbox-desktop.hash b/package.bak/matchbox-desktop/matchbox-desktop.hash deleted file mode 100644 index e48a4a955c..0000000000 --- a/package.bak/matchbox-desktop/matchbox-desktop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2.md5 -md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 diff --git a/package.bak/matchbox-desktop/matchbox-desktop.mk b/package.bak/matchbox-desktop/matchbox-desktop.mk deleted file mode 100644 index a703a18e55..0000000000 --- a/package.bak/matchbox-desktop/matchbox-desktop.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# matchbox-desktop -# -################################################################################ - -MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9 -MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1 -MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 -MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR) -MATCHBOX_DESKTOP_LICENSE = GPLv2+ -MATCHBOX_DESKTOP_LICENSE_FILES = COPYING -MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib -MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat - -# The bundled configure script does not properly replace LIBADD_DL, so -# we force an autoreconf even if we don't have any patches touching -# configure.ac/Makefile.am. -MATCHBOX_DESKTOP_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification -MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification -else -MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification -endif - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-fakekey/Config.in b/package.bak/matchbox-fakekey/Config.in deleted file mode 100644 index 1a1f1341ec..0000000000 --- a/package.bak/matchbox-fakekey/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_FAKEKEY - bool "matchbox-fakekey" - select BR2_PACKAGE_MATCHBOX_LIB - select BR2_PACKAGE_XLIB_LIBXTST - help - Library for simulating key press events under X11. diff --git a/package.bak/matchbox-fakekey/matchbox-fakekey.hash b/package.bak/matchbox-fakekey/matchbox-fakekey.hash deleted file mode 100644 index 3e8778a6e1..0000000000 --- a/package.bak/matchbox-fakekey/matchbox-fakekey.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 diff --git a/package.bak/matchbox-fakekey/matchbox-fakekey.mk b/package.bak/matchbox-fakekey/matchbox-fakekey.mk deleted file mode 100644 index ea8e6dcd61..0000000000 --- a/package.bak/matchbox-fakekey/matchbox-fakekey.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# matchbox-fakekey -# -################################################################################ - -MATCHBOX_FAKEKEY_VERSION = 0.1 -MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) -MATCHBOX_FAKEKEY_LICENSE = GPLv2+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING -MATCHBOX_FAKEKEY_INSTALL_STAGING = YES -MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst -MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat - -define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc - $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile -endef - -MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-keyboard/Config.in b/package.bak/matchbox-keyboard/Config.in deleted file mode 100644 index 8bd2a7972c..0000000000 --- a/package.bak/matchbox-keyboard/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "matchbox-keyboard" - select BR2_PACKAGE_XLIB_LIBXTST - select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO - select BR2_PACKAGE_MATCHBOX_FAKEKEY - select BR2_PACKAGE_MATCHBOX_LIB - help - Virtual Keyboard diff --git a/package.bak/matchbox-keyboard/matchbox-keyboard.hash b/package.bak/matchbox-keyboard/matchbox-keyboard.hash deleted file mode 100644 index 76997b0da3..0000000000 --- a/package.bak/matchbox-keyboard/matchbox-keyboard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5 -md5 50940321d59fee23b38a4941100abf25 matchbox-keyboard-0.1.tar.bz2 diff --git a/package.bak/matchbox-keyboard/matchbox-keyboard.mk b/package.bak/matchbox-keyboard/matchbox-keyboard.mk deleted file mode 100644 index 3ffaca66f9..0000000000 --- a/package.bak/matchbox-keyboard/matchbox-keyboard.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# matchbox-keyboard -# -################################################################################ - -MATCHBOX_KEYBOARD_VERSION = 0.1 -MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2 -MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) -MATCHBOX_KEYBOARD_LICENSE = GPLv2+ -MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING -MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat - -# Workaround bug in configure script -MATCHBOX_KEYBOARD_CONF_ENV = expat=yes - -define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - $(INSTALL) -D -m 0755 package/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 - -ifeq ($(BR2_PACKAGE_CAIRO),y) -MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo -MATCHBOX_KEYBOARD_DEPENDENCIES += cairo -else -MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo -MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft -endif - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-keyboard/mb-applet-kbd-wrapper.sh b/package.bak/matchbox-keyboard/mb-applet-kbd-wrapper.sh deleted file mode 100644 index be202b5d65..0000000000 --- a/package.bak/matchbox-keyboard/mb-applet-kbd-wrapper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# - -killall matchbox-keyboard -if [ ! $? -eq 0 ] -then - matchbox-keyboard & -fi diff --git a/package.bak/matchbox-lib/0001-index-is-legacy.patch b/package.bak/matchbox-lib/0001-index-is-legacy.patch deleted file mode 100644 index b486fb18d4..0000000000 --- a/package.bak/matchbox-lib/0001-index-is-legacy.patch +++ /dev/null @@ -1,35 +0,0 @@ -index() is a legacy function, not implemented in some uClibc -configurations. - -Signed-off-by: Thomas Petazzoni ---- - libmb/mbexp.c | 2 +- - libmb/mbmenu.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: libmatchbox-1.9/libmb/mbexp.c -=================================================================== ---- libmatchbox-1.9.orig/libmb/mbexp.c -+++ libmatchbox-1.9/libmb/mbexp.c -@@ -492,7 +492,7 @@ - - /* get the family */ - -- if (index(spec, ',') != NULL || index(spec, '-') != NULL) -+ if (strchr(spec, ',') != NULL || strchr(spec, '-') != NULL) - has_comma_delim = True; - - while (!got_family) { -Index: libmatchbox-1.9/libmb/mbmenu.c -=================================================================== ---- libmatchbox-1.9.orig/libmb/mbmenu.c -+++ libmatchbox-1.9/libmb/mbmenu.c -@@ -433,7 +433,7 @@ - { - s = p; - found = NULL; -- while(index("/\0", *p) == NULL) p++; -+ while(strchr("/\0", *p) == NULL) p++; - if (*p != '\0') { *p = '\0'; p++; }; - - item = current->items; diff --git a/package.bak/matchbox-lib/0002-libpng15.patch b/package.bak/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package.bak/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package.bak/matchbox-lib/0003-include-setjmp-h.patch b/package.bak/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package.bak/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package.bak/matchbox-lib/Config.in b/package.bak/matchbox-lib/Config.in deleted file mode 100644 index e50a5436c1..0000000000 --- a/package.bak/matchbox-lib/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_LIB - bool "matchbox-lib" - help - Matchbox common functionality library. diff --git a/package.bak/matchbox-lib/matchbox-lib.hash b/package.bak/matchbox-lib/matchbox-lib.hash deleted file mode 100644 index 6f3a6531ee..0000000000 --- a/package.bak/matchbox-lib/matchbox-lib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 diff --git a/package.bak/matchbox-lib/matchbox-lib.mk b/package.bak/matchbox-lib/matchbox-lib.mk deleted file mode 100644 index 451279e6d4..0000000000 --- a/package.bak/matchbox-lib/matchbox-lib.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# matchbox-lib -# -################################################################################ - -MATCHBOX_LIB_VERSION = 1.9 -MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) -MATCHBOX_LIB_LICENSE = LGPLv2.1+ -MATCHBOX_LIB_LICENSE_FILES = COPYING -MATCHBOX_LIB_INSTALL_STAGING = YES -MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext -MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs -MATCHBOX_LIB_CONF_ENV = LIBS="-lX11" - -define MATCHBOX_LIB_POST_INSTALL_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \ - $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc -endef - -MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_XLIB_LIBXPM),y) -MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm -endif -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -MATCHBOX_LIB_CONF_OPTS += --enable-jpeg -MATCHBOX_LIB_DEPENDENCIES += jpeg -else -MATCHBOX_LIB_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -MATCHBOX_LIB_CONF_OPTS += --enable-png -MATCHBOX_LIB_DEPENDENCIES += libpng -else -MATCHBOX_LIB_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy) -MATCHBOX_LIB_CONF_OPTS += --enable-pango -MATCHBOX_LIB_DEPENDENCIES += pango -else -MATCHBOX_LIB_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -MATCHBOX_LIB_CONF_OPTS += --enable-xft -MATCHBOX_LIB_DEPENDENCIES += xlib_libXft -else -MATCHBOX_LIB_CONF_OPTS += --disable-xft -endif - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-panel/0001-index-is-legacy.patch b/package.bak/matchbox-panel/0001-index-is-legacy.patch deleted file mode 100644 index 925c326e71..0000000000 --- a/package.bak/matchbox-panel/0001-index-is-legacy.patch +++ /dev/null @@ -1,20 +0,0 @@ -Replace the legacy index() with strchr() - -Signed-off-by: Thomas Petazzoni ---- - applets/mb-applet-menu-launcher.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c -=================================================================== ---- matchbox-panel-0.9.3.orig/applets/mb-applet-menu-launcher.c -+++ matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c -@@ -280,7 +280,7 @@ - DBG("\tkey %s ", key); - if (*(++p) == '"') { p++; tc = sc; } /* skip "'s */ - val = p; -- while(index(tc,*p) == NULL) -+ while(strchr(tc,*p) == NULL) - { - if (*p == '\\' && *(p+1) == '"') p++; /* skip \" */ - p++; diff --git a/package.bak/matchbox-panel/0002-mb-applet-wireless.patch b/package.bak/matchbox-panel/0002-mb-applet-wireless.patch deleted file mode 100644 index 93633b367e..0000000000 --- a/package.bak/matchbox-panel/0002-mb-applet-wireless.patch +++ /dev/null @@ -1,34 +0,0 @@ -mb-applet-wireless: fix undefined reference to `log' and `lrint' - -mb-applet-wireless.o: In function `update_wireless': -.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `log' -.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `lrint' - -Signed-off-by: Jean-Paul Etienne -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) -[arnout: add description and Signed-off-by] ---- -diff -rup matchbox-panel-0.9.3.orig/applets/Makefile.in matchbox-panel-0.9.3/applets/Makefile.in ---- matchbox-panel-0.9.3.orig/applets/Makefile.in 2015-01-23 00:16:47.594850985 +0100 -+++ matchbox-panel-0.9.3/applets/Makefile.in 2015-01-23 00:15:18.458694947 +0100 -@@ -198,7 +198,7 @@ WANT_SMALL_ICONS_FALSE = @WANT_SMALL_ICO - WANT_SMALL_ICONS_TRUE = @WANT_SMALL_ICONS_TRUE@ - WANT_WIFI_FALSE = @WANT_WIFI_FALSE@ - WANT_WIFI_TRUE = @WANT_WIFI_TRUE@ --WIRELESS_LIBS = @WIRELESS_LIBS@ -+WIRELESS_LIBS = @WIRELESS_LIBS@ -lm - XGETTEXT = @XGETTEXT@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_STRIP = @ac_ct_STRIP@ -diff -rup matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c matchbox-panel-0.9.3/applets/mb-applet-wireless.c ---- matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c 2015-01-23 00:16:31.531822865 +0100 -+++ matchbox-panel-0.9.3/applets/mb-applet-wireless.c 2015-01-23 00:03:43.067563827 +0100 -@@ -50,6 +50,8 @@ - - #endif - -+#include -+ - #ifdef MB_HAVE_PNG - #define IMG_EXT "png" - #else diff --git a/package.bak/matchbox-panel/0003-mb-applet-battery.patch b/package.bak/matchbox-panel/0003-mb-applet-battery.patch deleted file mode 100644 index 585eb39166..0000000000 --- a/package.bak/matchbox-panel/0003-mb-applet-battery.patch +++ /dev/null @@ -1,21 +0,0 @@ -mb-applet-battery: don't declare line_parse as static - -Fix this build failure: - mb-applet-battery.c: In function 'read_apm': - mb-applet-battery.c:181:2: error: invalid storage class for function 'line_parse' - -Reported-by: Arnout Vandecappelle -Signed-off-by: "Yann E. MORIN" - -diff -durN matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c matchbox-panel-0.9.3/applets/mb-applet-battery.c ---- matchbox-panel-0.9.3.orig/applets/mb-applet-battery.c 2006-02-07 23:27:24.000000000 +0100 -+++ matchbox-panel-0.9.3/applets/mb-applet-battery.c 2015-05-02 17:13:00.843578796 +0200 -@@ -177,7 +177,7 @@ - unsigned long present_rate; - }; - -- static int -+ int - line_parse(char *line, struct entry *e) - { - char *ptr; diff --git a/package.bak/matchbox-panel/Config.in b/package.bak/matchbox-panel/Config.in deleted file mode 100644 index 47bd10ad7e..0000000000 --- a/package.bak/matchbox-panel/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_PANEL - bool "matchbox-panel" - select BR2_PACKAGE_MATCHBOX_LIB - help - A flexible always present 'window bar' for holding - application launchers. diff --git a/package.bak/matchbox-panel/matchbox-panel.hash b/package.bak/matchbox-panel/matchbox-panel.hash deleted file mode 100644 index 82802a9982..0000000000 --- a/package.bak/matchbox-panel/matchbox-panel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2.md5 -md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 diff --git a/package.bak/matchbox-panel/matchbox-panel.mk b/package.bak/matchbox-panel/matchbox-panel.mk deleted file mode 100644 index aa2d417922..0000000000 --- a/package.bak/matchbox-panel/matchbox-panel.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# matchbox-panel -# -################################################################################ - -MATCHBOX_PANEL_VERSION_MAJOR = 0.9 -MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3 -MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2 -MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR) -MATCHBOX_PANEL_LICENSE = GPLv2+ -MATCHBOX_PANEL_LICENSE_FILES = COPYING -MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib -MATCHBOX_PANEL_CONF_OPTS = --enable-expat --enable-dnotify - -ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) -MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification -MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor -else -MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification -endif - -# Using ACPI is only possible on x86 (32- or 64-bit) or AArch64 -ifeq ($(BR2_aarch64)$(BR2_i386)$(BR2_x86_64),y) -MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux -else -MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux -endif - -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y) -MATCHBOX_PANEL_DEPENDENCIES += wireless_tools -endif - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox-startup-monitor/0001-true-false.patch b/package.bak/matchbox-startup-monitor/0001-true-false.patch deleted file mode 100644 index c92a0776b0..0000000000 --- a/package.bak/matchbox-startup-monitor/0001-true-false.patch +++ /dev/null @@ -1,21 +0,0 @@ -mbmonitor uses TRUE / FALSE without defining them - -Signed-off-by: Peter Korsgaard ---- - mbmonitor.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: mb-applet-startup-monitor-0.1/mbmonitor.c -=================================================================== ---- mb-applet-startup-monitor-0.1.orig/mbmonitor.c -+++ mb-applet-startup-monitor-0.1/mbmonitor.c -@@ -43,6 +43,9 @@ - #define POLLTIME 10 - #define HOURGLASS_N_FRAMES 8 - -+#define FALSE 0 -+#define TRUE 1 -+ - typedef struct LaunchList LaunchList; - - struct LaunchList diff --git a/package.bak/matchbox-startup-monitor/Config.in b/package.bak/matchbox-startup-monitor/Config.in deleted file mode 100644 index 9dce60ea12..0000000000 --- a/package.bak/matchbox-startup-monitor/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR - bool "matchbox-startup-monitor" - select BR2_PACKAGE_MATCHBOX_LIB - select BR2_PACKAGE_STARTUP_NOTIFICATION - help - Matchbox Panel Startup Monitor Applet. diff --git a/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.hash b/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.hash deleted file mode 100644 index b08e228912..0000000000 --- a/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2.md5 -md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 diff --git a/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.mk deleted file mode 100644 index be572396d8..0000000000 --- a/package.bak/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# matchbox-startup-monitor -# -################################################################################ - -MATCHBOX_STARTUP_MONITOR_VERSION = 0.1 -MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2 -MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION) -MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+ -MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING -MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification - -$(eval $(autotools-package)) diff --git a/package.bak/matchbox/0001-defaulttheme.patch b/package.bak/matchbox/0001-defaulttheme.patch deleted file mode 100644 index b4da66409c..0000000000 --- a/package.bak/matchbox/0001-defaulttheme.patch +++ /dev/null @@ -1,47 +0,0 @@ -[PATCH] fix mbtheme build issue when png support is disabled - -DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading -to compile errors in mbtheme.c: - -mbtheme.c: In function 'show_parse_error': -mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function) -mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in -mbtheme.c: In function 'mbtheme_init': -mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function) -mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function) - -Fix it by unconditionally defining them as the values used are the same -in png / !png cases anyway. - -Signed-off-by: Peter Korsgaard ---- - src/structs.h | 9 --------- - 1 file changed, 9 deletions(-) - -Index: matchbox-window-manager-1.2/src/structs.h -=================================================================== ---- matchbox-window-manager-1.2.orig/src/structs.h -+++ matchbox-window-manager-1.2/src/structs.h -@@ -81,8 +81,6 @@ - - #define GENERIC_ICON PKGDATADIR "/mbnoapp.xpm" - --#ifdef MB_HAVE_PNG -- - #define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" - - #define DEFAULTTHEME DATADIR "/themes/Default/matchbox/theme.xml" -@@ -91,13 +89,6 @@ - - #define DEFAULTTHEMENAME "Default" - --#else -- --#define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" --#define DEFAULT_THEME_NAME "Default" -- --#endif -- - #define CONFDEFAULTS PKGDATADIR "/defaults" - - /* Simple Macros */ diff --git a/package.bak/matchbox/Config.in b/package.bak/matchbox/Config.in deleted file mode 100644 index 3a9f118f4a..0000000000 --- a/package.bak/matchbox/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -menuconfig BR2_PACKAGE_MATCHBOX - bool "matchbox" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_MATCHBOX_LIB - help - Matchbox is an Open Source base environment for the X Window - System running on non-desktop embedded platforms such as - handhelds, set-top boxes, kiosks and anything else for which - screen space, input mechanisms or system resources are limited. - - https://www.yoctoproject.org/tools-resources/projects/matchbox - -if BR2_PACKAGE_MATCHBOX - -config BR2_PACKAGE_MATCHBOX_SM - bool "session manager" - select BR2_PACKAGE_XLIB_LIBSM - help - Enable support for the Session Manager. - -comment "matchbox utilities" - -source "package/matchbox-common/Config.in" -source "package/matchbox-desktop/Config.in" -source "package/matchbox-fakekey/Config.in" -source "package/matchbox-keyboard/Config.in" -source "package/matchbox-lib/Config.in" -source "package/matchbox-panel/Config.in" -source "package/matchbox-startup-monitor/Config.in" - -endif diff --git a/package.bak/matchbox/matchbox.hash b/package.bak/matchbox/matchbox.hash deleted file mode 100644 index f00ed4e4f3..0000000000 --- a/package.bak/matchbox/matchbox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/1.2/matchbox-window-manager-1.2.tar.bz2.md5 -md5 3e158dcf57823b55c926d95b245500fb matchbox-window-manager-1.2.tar.bz2 diff --git a/package.bak/matchbox/matchbox.mk b/package.bak/matchbox/matchbox.mk deleted file mode 100644 index 9094b1ec63..0000000000 --- a/package.bak/matchbox/matchbox.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# matchbox -# -################################################################################ - -MATCHBOX_VERSION = 1.2 -MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2 -MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION) -MATCHBOX_LICENSE = GPLv2+ -MATCHBOX_LICENSE_FILES = COPYING - -MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = \ - --enable-expat \ - --disable-gconf \ - --disable-composite \ - --disable-standalone \ - --disable-standalone-xft - -# Workaround bug in configure script -MATCHBOX_CONF_ENV = expat=yes - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -MATCHBOX_CONF_OPTS += --enable-startup-notification -MATCHBOX_DEPENDENCIES += startup-notification -else -MATCHBOX_CONF_OPTS += --disable-startup-notification -endif - -ifeq ($(BR2_PACKAGE_MATCHBOX_SM),y) -MATCHBOX_CONF_OPTS += --enable-session -MATCHBOX_DEPENDENCIES += xlib_libSM -else -MATCHBOX_CONF_OPTS += --disable-session -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -MATCHBOX_DEPENDENCIES += xlib_libXcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -MATCHBOX_DEPENDENCIES += xlib_libXfixes -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mbedtls/Config.in b/package.bak/mbedtls/Config.in deleted file mode 100644 index ed63f2da58..0000000000 --- a/package.bak/mbedtls/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_MBEDTLS - bool "mbedtls" - help - mbed TLS (formerly known as PolarSSL) makes it trivially easy - for developers to include cryptographic and SSL/TLS - capabilities in their (embedded) products, facilitating this - functionality with a minimal coding footprint. - - https://tls.mbed.org/ - -if BR2_PACKAGE_MBEDTLS - -config BR2_PACKAGE_MBEDTLS_PROGRAMS - bool "mbedtls programs" - depends on BR2_USE_MMU # fork() - help - This option enables the installation and the build of - mbed TLS companion programs. - -config BR2_PACKAGE_MBEDTLS_COMPRESSION - bool "enable compression support" - select BR2_PACKAGE_ZLIB - help - Enable support for compression of the content data before it - enters the secure channel as described in RFC 3749. - - Warning: TLS compression may make you vulnerable to the CRIME - attack. You should not enable it unless you know for sure CRIME - and similar attacks are not applicable to your particular - situation. - -endif diff --git a/package.bak/mbedtls/mbedtls.hash b/package.bak/mbedtls/mbedtls.hash deleted file mode 100644 index 5f9786c292..0000000000 --- a/package.bak/mbedtls/mbedtls.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.3.0-2.1.5-and-1.3.17-released -sha256 c1c3559ed39f7a1b1550c4cf4ccb918bf239301a3311d98dda92bed8a25b7f0d mbedtls-2.4.0-apache.tgz diff --git a/package.bak/mbedtls/mbedtls.mk b/package.bak/mbedtls/mbedtls.mk deleted file mode 100644 index 198879da4d..0000000000 --- a/package.bak/mbedtls/mbedtls.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# mbedtls -# -################################################################################ - -MBEDTLS_SITE = https://tls.mbed.org/code/releases -MBEDTLS_VERSION = 2.4.0 -MBEDTLS_SOURCE = mbedtls-$(MBEDTLS_VERSION)-apache.tgz -MBEDTLS_CONF_OPTS = \ - -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_MBEDTLS_PROGRAMS),ON,OFF) \ - -DENABLE_TESTING=OFF -MBEDTLS_INSTALL_STAGING = YES -MBEDTLS_LICENSE = Apache-2.0 -MBEDTLS_LICENSE_FILES = apache-2.0.txt - -# This is mandatory for hiawatha -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -define MBEDTLS_ENABLE_THREADING - $(SED) "s://#define MBEDTLS_THREADING_C:#define MBEDTLS_THREADING_C:" \ - $(@D)/include/mbedtls/config.h - $(SED) "s://#define MBEDTLS_THREADING_PTHREAD:#define MBEDTLS_THREADING_PTHREAD:" \ - $(@D)/include/mbedtls/config.h -endef -MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_THREADING -ifeq ($(BR2_STATIC_LIBS),y) -MBEDTLS_CONF_OPTS += -DLINK_WITH_PTHREAD=ON -endif -endif - -ifeq ($(BR2_STATIC_LIBS),y) -MBEDTLS_CONF_OPTS += \ - -DUSE_SHARED_MBEDTLS_LIBRARY=OFF -DUSE_STATIC_MBEDTLS_LIBRARY=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -MBEDTLS_CONF_OPTS += \ - -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=ON -else ifeq ($(BR2_SHARED_LIBS),y) -MBEDTLS_CONF_OPTS += \ - -DUSE_SHARED_MBEDTLS_LIBRARY=ON -DUSE_STATIC_MBEDTLS_LIBRARY=OFF -endif - -ifeq ($(BR2_PACKAGE_MBEDTLS_COMPRESSION),y) -MBEDTLS_CONF_OPTS += -DENABLE_ZLIB_SUPPORT=ON -MBEDTLS_DEPENDENCIES += zlib -define MBEDTLS_ENABLE_ZLIB - $(SED) "s://#define MBEDTLS_ZLIB_SUPPORT:#define MBEDTLS_ZLIB_SUPPORT:" \ - $(@D)/include/mbedtls/config.h -endef -MBEDTLS_POST_PATCH_HOOKS += MBEDTLS_ENABLE_ZLIB -else -MBEDTLS_CONF_OPTS += -DENABLE_ZLIB_SUPPORT=OFF -endif - -define MBEDTLS_DISABLE_ASM - $(SED) '/^#define MBEDTLS_AESNI_C/d' \ - $(@D)/include/mbedtls/config.h - $(SED) '/^#define MBEDTLS_HAVE_ASM/d' \ - $(@D)/include/mbedtls/config.h - $(SED) '/^#define MBEDTLS_PADLOCK_C/d' \ - $(@D)/include/mbedtls/config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM -else ifeq ($(BR2_microblaze)$(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -MBEDTLS_POST_CONFIGURE_HOOKS += MBEDTLS_DISABLE_ASM -endif - -$(eval $(cmake-package)) diff --git a/package.bak/mc/Config.in b/package.bak/mc/Config.in deleted file mode 100644 index 7030b5f1a2..0000000000 --- a/package.bak/mc/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_MC - bool "mc" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2, slang - select BR2_PACKAGE_LIBGLIB2 - # mc prefers slang, but can use ncurses too - select BR2_PACKAGE_SLANG if !BR2_PACKAGE_NCURSES - help - GNU Midnight Commander is a visual file manager, licensed under - GNU General Public License. It can use either SLang (preferred) - or ncurses for screen handling; if neither is enabled SLang - will be automatically chosen. - - https://www.midnight-commander.org - -comment "mc needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_USE_MMU diff --git a/package.bak/mc/mc.hash b/package.bak/mc/mc.hash deleted file mode 100644 index a8116d02bf..0000000000 --- a/package.bak/mc/mc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from http://ftp.midnight-commander.org/mc-4.8.18.sha256: -sha256 f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece mc-4.8.18.tar.xz diff --git a/package.bak/mc/mc.mk b/package.bak/mc/mc.mk deleted file mode 100644 index ff4c8ad294..0000000000 --- a/package.bak/mc/mc.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# mc -# -################################################################################ - -MC_VERSION = 4.8.18 -MC_SOURCE = mc-$(MC_VERSION).tar.xz -MC_SITE = http://ftp.midnight-commander.org -MC_LICENSE = GPLv3+ -MC_LICENSE_FILES = COPYING -MC_DEPENDENCIES = libglib2 host-pkgconf - -ifeq ($(BR2_PACKAGE_LIBSSH2),y) -MC_CONF_OPTS += --enable-vfs-sftp -MC_DEPENDENCIES += libssh2 -else -MC_CONF_OPTS += --disable-vfs-sftp -endif - -# mc prefers slang, so use that if enabled, otherwise -# fallback to using ncurses. -# Either or both will be enabled, but we prefer slang. -ifeq ($(BR2_PACKAGE_SLANG),y) -MC_DEPENDENCIES += slang -MC_CONF_OPTS += --with-screen=slang -else -MC_DEPENDENCIES += ncurses -MC_CONF_OPTS += --with-screen=ncurses -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -MC_CONF_OPTS += --with-x -MC_DEPENDENCIES += xlib_libX11 -else -MC_CONF_OPTS += --without-x -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mcelog/Config.in b/package.bak/mcelog/Config.in deleted file mode 100644 index f3ccc71e8a..0000000000 --- a/package.bak/mcelog/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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.bak/mcelog/mcelog.mk b/package.bak/mcelog/mcelog.mk deleted file mode 100644 index 1290e349ad..0000000000 --- a/package.bak/mcelog/mcelog.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# mcelog -# -################################################################################ - -MCELOG_VERSION = v111 -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.bak/mcrypt/0001-CVE-2012-4409.patch b/package.bak/mcrypt/0001-CVE-2012-4409.patch deleted file mode 100644 index 97c658bb2d..0000000000 --- a/package.bak/mcrypt/0001-CVE-2012-4409.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3efb40e17ce4f76717ae17a1ce1e1f747ddf59fd Mon Sep 17 00:00:00 2001 -From: Alon Bar-Lev -Date: Sat, 22 Dec 2012 22:37:06 +0200 -Subject: [PATCH] cleanup: buffer overflow - ---- - src/extra.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/extra.c b/src/extra.c -index 3082f82..c7a1ac0 100644 ---- a/src/extra.c -+++ b/src/extra.c -@@ -241,6 +241,8 @@ int check_file_head(FILE * fstream, char *algorithm, char *mode, - if (m_getbit(6, flags) == 1) { /* if the salt bit is set */ - if (m_getbit(0, sflag) != 0) { /* if the first bit is set */ - *salt_size = m_setbit(0, sflag, 0); -+ if (*salt_size > sizeof(tmp_buf)) -+ err_quit(_("Salt is too long\n")); - if (*salt_size > 0) { - fread(tmp_buf, 1, *salt_size, - fstream); --- -1.7.8.6 - diff --git a/package.bak/mcrypt/0002-CVE-2012-4426.patch b/package.bak/mcrypt/0002-CVE-2012-4426.patch deleted file mode 100644 index 708d4a579e..0000000000 --- a/package.bak/mcrypt/0002-CVE-2012-4426.patch +++ /dev/null @@ -1,35 +0,0 @@ -Patch taken from gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/src/errors.c -+++ b/src/errors.c -@@ -25,24 +25,24 @@ - - void err_quit(char *errmsg) - { -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - exit(-1); - } - - void err_warn(char *errmsg) - { - if (quiet <= 1) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_info(char *errmsg) - { - if (quiet == 0) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } - - void err_crit(char *errmsg) - { - if (quiet <= 2) -- fprintf(stderr, errmsg); -+ fprintf(stderr, "%s", errmsg); - } diff --git a/package.bak/mcrypt/0003-CVE-2012-4527.patch b/package.bak/mcrypt/0003-CVE-2012-4527.patch deleted file mode 100644 index a8cf6f449a..0000000000 --- a/package.bak/mcrypt/0003-CVE-2012-4527.patch +++ /dev/null @@ -1,99 +0,0 @@ -Fix for CVE-2012-4527. -Authored by Attila Bogar and Jean-Michel Vourgère - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/src/mcrypt.c mcrypt-2.6.8/src/mcrypt.c ---- mcrypt-2.6.8.orig/src/mcrypt.c 2013-01-14 19:15:49.465925072 -0300 -+++ mcrypt-2.6.8/src/mcrypt.c 2013-01-14 19:28:13.711478000 -0300 -@@ -44,7 +44,9 @@ - static char rcsid[] = - "$Id: mcrypt.c,v 1.2 2007/11/07 17:10:21 nmav Exp $"; - --char tmperr[128]; -+/* Temporary error message can contain one file name and 1k of text */ -+#define ERRWIDTH ((PATH_MAX)+1024) -+char tmperr[ERRWIDTH]; - unsigned int stream_flag = FALSE; - char *keymode = NULL; - char *mode = NULL; -@@ -482,7 +484,7 @@ - #ifdef HAVE_STAT - if (stream_flag == FALSE) { - if (is_normal_file(file[i]) == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: %s is not a regular file. Skipping...\n"), - program_name, file[i]); -@@ -501,7 +503,7 @@ - dinfile = file[i]; - if ((isatty(fileno((FILE *) (stdin))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be read from a terminal.\n"), - program_name); -@@ -520,7 +522,7 @@ - einfile = file[i]; - if ((isatty(fileno((FILE *) (stdout))) == 1) - && (stream_flag == TRUE) && (force == 0)) { /* not a tty */ -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: Encrypted data will not be written to a terminal.\n"), - program_name); -@@ -544,7 +546,7 @@ - strcpy(outfile, einfile); - /* if file has already the .nc ignore it */ - if (strstr(outfile, ".nc") != NULL) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("%s: file %s has the .nc suffix... skipping...\n"), - program_name, outfile); -@@ -590,10 +592,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was decrypted.\n"), dinfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was decrypted.\n"), dinfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was decrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was decrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -610,7 +612,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT decrypted successfully.\n"), - dinfile); -@@ -636,10 +638,10 @@ - - if (x == 0) { - if (stream_flag == FALSE) { -- sprintf(tmperr, _("File %s was encrypted.\n"), einfile); -+ snprintf(tmperr, ERRWIDTH, _("File %s was encrypted.\n"), einfile); - err_warn(tmperr); - } else { -- sprintf(tmperr, _("Stdin was encrypted.\n")); -+ snprintf(tmperr, ERRWIDTH, _("Stdin was encrypted.\n")); - err_warn(tmperr); - } - #ifdef HAVE_STAT -@@ -655,7 +657,7 @@ - - } else { - if (stream_flag == FALSE) { -- sprintf(tmperr, -+ snprintf(tmperr, ERRWIDTH, - _ - ("File %s was NOT encrypted successfully.\n"), - einfile); diff --git a/package.bak/mcrypt/0004-no-rpath.patch b/package.bak/mcrypt/0004-no-rpath.patch deleted file mode 100644 index a0813bcf00..0000000000 --- a/package.bak/mcrypt/0004-no-rpath.patch +++ /dev/null @@ -1,17 +0,0 @@ -Patch out rpath hardcoding since it completely ignores --disable-rpath -and other configure ways. - -Signed-off-by: Gustavo Zacarias - -diff -Nura mcrypt-2.6.8.orig/config.rpath mcrypt-2.6.8/config.rpath ---- mcrypt-2.6.8.orig/config.rpath 2013-01-07 13:05:22.626883480 -0300 -+++ mcrypt-2.6.8/config.rpath 2013-01-07 13:12:47.196090608 -0300 -@@ -153,7 +153,7 @@ - # here allows them to be overridden if necessary. - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. -- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' -+ hardcode_libdir_flag_spec= - case "$host_os" in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken diff --git a/package.bak/mcrypt/Config.in b/package.bak/mcrypt/Config.in deleted file mode 100644 index 58567cd751..0000000000 --- a/package.bak/mcrypt/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MCRYPT - bool "mcrypt" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBMCRYPT - select BR2_PACKAGE_LIBMHASH - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - MCrypt is a replacement for the old crypt() package and crypt(1) - command, with extensions. - It allows developers to use a wide range of encryption functions, - without making drastic changes to their code. - - http://mcrypt.sourceforge.net/ diff --git a/package.bak/mcrypt/mcrypt.hash b/package.bak/mcrypt/mcrypt.hash deleted file mode 100644 index cf29eaa9f6..0000000000 --- a/package.bak/mcrypt/mcrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5145aa844e54cca89ddab6fb7dd9e5952811d8d787c4f4bf27eb261e6c182098 mcrypt-2.6.8.tar.gz diff --git a/package.bak/mcrypt/mcrypt.mk b/package.bak/mcrypt/mcrypt.mk deleted file mode 100644 index b413ffa37d..0000000000 --- a/package.bak/mcrypt/mcrypt.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# mcrypt -# -################################################################################ - -MCRYPT_VERSION = 2.6.8 -MCRYPT_SITE = http://downloads.sourceforge.net/project/mcrypt/MCrypt/$(MCRYPT_VERSION) -MCRYPT_DEPENDENCIES = libmcrypt libmhash \ - $(if $(BR2_PACKAGE_ZLIB),zlib) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -MCRYPT_CONF_OPTS = --with-libmcrypt-prefix=$(STAGING_DIR)/usr -MCRYPT_LICENSE = GPLv3 -MCRYPT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/mdadm/0010-add-install-targets-for-mdadm-and-mdmon.patch b/package.bak/mdadm/0010-add-install-targets-for-mdadm-and-mdmon.patch deleted file mode 100644 index 15df7557e7..0000000000 --- a/package.bak/mdadm/0010-add-install-targets-for-mdadm-and-mdmon.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 6 Mar 2013 16:03:14 +0100 -Subject: [PATCH] Add install targets for mdadm and mdmon - - -Signed-off-by: Christophe Vu-Brugier ---- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 315455b..27d8eeb 100644 ---- a/Makefile -+++ b/Makefile -@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h - sha1.o : sha1.c sha1.h md5.h - $(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c - --install : mdadm mdmon install-man install-udev -+install : install-mdadm install-mdmon install-man install-udev -+ -+install-mdadm : - $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm -+ -+install-mdmon : - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - install-static : mdadm.static install-man --- -1.7.10.4 - diff --git a/package.bak/mdadm/Config.in b/package.bak/mdadm/Config.in deleted file mode 100644 index e0d606b5ec..0000000000 --- a/package.bak/mdadm/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MDADM - bool "mdadm" - depends on BR2_USE_MMU # fork() - help - Utility for managing Linux Software RAID arrays. - - http://neil.brown.name/blog/mdadm diff --git a/package.bak/mdadm/mdadm.hash b/package.bak/mdadm/mdadm.hash deleted file mode 100644 index 7f228d99dc..0000000000 --- a/package.bak/mdadm/mdadm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/raid/mdadm/sha256sums.asc -sha256 8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68 mdadm-3.3.4.tar.xz diff --git a/package.bak/mdadm/mdadm.mk b/package.bak/mdadm/mdadm.mk deleted file mode 100644 index 7558c18ad8..0000000000 --- a/package.bak/mdadm/mdadm.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# mdadm -# -################################################################################ - -MDADM_VERSION = 3.3.4 -MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.xz -MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm -MDADM_LICENSE = GPLv2+ -MDADM_LICENSE_FILES = COPYING - -MDADM_MAKE_OPTS = \ - CFLAGS="$(TARGET_CFLAGS)" CC="$(TARGET_CC)" CHECK_RUN_DIR=0 -C $(MDADM_DIR) mdadm - -MDADM_INSTALL_TARGET_OPTS = \ - DESTDIR=$(TARGET_DIR)/usr -C $(MDADM_DIR) install-mdadm - -define MDADM_CONFIGURE_CMDS - # Do nothing -endef - -$(eval $(autotools-package)) diff --git a/package.bak/mediastreamer/Config.in b/package.bak/mediastreamer/Config.in deleted file mode 100644 index 7e62bf2e7b..0000000000 --- a/package.bak/mediastreamer/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_MEDIASTREAMER - bool "mediastreamer" - select BR2_PACKAGE_ORTP - depends on BR2_INSTALL_LIBSTDCPP # ortp - depends on BR2_TOOLCHAIN_HAS_THREADS # ortp - help - Mediastreamer is a powerful and lightweighted streaming - engine specialized for voice/video telephony applications. - - It is the library that is responsible for all the receiving - and sending of multimedia streams in linphone, including - voice/video capture, encoding and decoding, and rendering. - - http://www.linphone.org/eng/documentation/dev/mediastreamer2.html - -comment "mediastreamer needs a toolchain w/ threads, C++" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mediastreamer/mediastreamer.hash b/package.bak/mediastreamer/mediastreamer.hash deleted file mode 100644 index 0f1ac77ce1..0000000000 --- a/package.bak/mediastreamer/mediastreamer.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 1144849c0c96abafb1153adf56109f0f195a9e4a53cf28cb611bbca7a9012c1a mediastreamer-2.14.0.tar.gz -sha256 90091ab0aa7a77381ab1ca5d88cdfa4e7f62505fb452a2bea0f70054d9d1aece 26f884bf977977041fe6f98a0af186be1580bf22.patch diff --git a/package.bak/mediastreamer/mediastreamer.mk b/package.bak/mediastreamer/mediastreamer.mk deleted file mode 100644 index b4f0c52c7c..0000000000 --- a/package.bak/mediastreamer/mediastreamer.mk +++ /dev/null @@ -1,116 +0,0 @@ -################################################################################ -# -# mediastreamer -# -################################################################################ - -MEDIASTREAMER_VERSION = 2.14.0 -MEDIASTREAMER_SITE = http://download.savannah.nongnu.org/releases/linphone/mediastreamer -MEDIASTREAMER_INSTALL_STAGING = YES -MEDIASTREAMER_DEPENDENCIES = host-intltool host-pkgconf ortp host-gettext -# tests fail linking on some architectures, so disable them -MEDIASTREAMER_CONF_OPTS = --disable-tests --disable-glx --disable-strict -MEDIASTREAMER_LICENSE = GPLv2+ -MEDIASTREAMER_LICENSE_FILES = COPYING - -# fix compilation issue with latest bctoolbox (touches configure.ac) -MEDIASTREAMER_PATCH = \ - https://github.com/BelledonneCommunications/mediastreamer2/commit/26f884bf977977041fe6f98a0af186be1580bf22.patch - -# patching configure.ac -MEDIASTREAMER_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) -MEDIASTREAMER_CONF_OPTS += --enable-alsa -MEDIASTREAMER_DEPENDENCIES += alsa-lib -else -MEDIASTREAMER_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_LIBUPNP),y) -MEDIASTREAMER_CONF_OPTS += --enable-upnp -MEDIASTREAMER_DEPENDENCIES += libupnp -else -MEDIASTREAMER_CONF_OPTS += --disable-upnp -endif - -ifeq ($(BR2_PACKAGE_LIBVPX),y) -MEDIASTREAMER_CONF_OPTS += --enable-vp8 -MEDIASTREAMER_DEPENDENCIES += libvpx -else -MEDIASTREAMER_CONF_OPTS += --disable-vp8 -endif - -ifeq ($(BR2_PACKAGE_OPUS),y) -MEDIASTREAMER_CONF_OPTS += --enable-opus -MEDIASTREAMER_DEPENDENCIES += opus -else -MEDIASTREAMER_CONF_OPTS += --disable-opus -endif - -# portaudio backend needs speex as well -ifeq ($(BR2_PACKAGE_PORTAUDIO)$(BR2_PACKAGE_SPEEX),yy) -MEDIASTREAMER_CONF_OPTS += --enable-portaudio -MEDIASTREAMER_DEPENDENCIES += portaudio speex -else -MEDIASTREAMER_CONF_OPTS += --disable-portaudio -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -MEDIASTREAMER_CONF_OPTS += --enable-pulseaudio -MEDIASTREAMER_DEPENDENCIES += pulseaudio -else -MEDIASTREAMER_CONF_OPTS += --disable-pulseaudio -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -MEDIASTREAMER_CONF_OPTS += --enable-speex -MEDIASTREAMER_DEPENDENCIES += speex -else -MEDIASTREAMER_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) -MEDIASTREAMER_CONF_OPTS += --enable-ffmpeg -MEDIASTREAMER_DEPENDENCIES += ffmpeg -else -MEDIASTREAMER_CONF_OPTS += --disable-ffmpeg -endif - -ifeq ($(BR2_PACKAGE_SDL),y) -MEDIASTREAMER_CONF_OPTS += --enable-sdl -MEDIASTREAMER_DEPENDENCIES += sdl -else -MEDIASTREAMER_CONF_OPTS += --disable-sdl -endif - -# mediastreamer assumes SDL has X11 support if --enable-x11 (and X11 support -# is only used for SDL output) -ifeq ($(BR2_PACKAGE_SDL_X11),y) -MEDIASTREAMER_CONF_OPTS += --enable-x11 -else -MEDIASTREAMER_CONF_OPTS += --disable-x11 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -MEDIASTREAMER_CONF_OPTS += --enable-xv -MEDIASTREAMER_DEPENDENCIES += xlib_libXv -else -MEDIASTREAMER_CONF_OPTS += --disable-xv -endif - -ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -MEDIASTREAMER_CONF_OPTS += --enable-theora -MEDIASTREAMER_DEPENDENCIES += libtheora -else -MEDIASTREAMER_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MEDIASTREAMER_CONF_OPTS += --enable-libv4l1 --enable-libv4l2 -MEDIASTREAMER_DEPENDENCIES += libv4l -else -MEDIASTREAMER_CONF_OPTS += --disable-libv4l1 --disable-libv4l2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/memcached/Config.in b/package.bak/memcached/Config.in deleted file mode 100644 index e011d0890a..0000000000 --- a/package.bak/memcached/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MEMCACHED - bool "memcached" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBEVENT - help - Memcached is an in-memory key-value store for small chunks - of arbitrary data (strings, objects) from results of database calls, - API calls, or page rendering. - - http://www.memcached.org/ - -comment "memcached needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/memcached/memcached.hash b/package.bak/memcached/memcached.hash deleted file mode 100644 index 11cac3a590..0000000000 --- a/package.bak/memcached/memcached.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.memcached.org/files/memcached-1.4.34.tar.gz.sha1 -sha1 7c7214f5183c6e20c22b243e21ed1ffddb91497e memcached-1.4.34.tar.gz -# Calculated based on the hash above -sha256 5064c87f91a37d822dfeab8768490c55fe686a742f07f67c7121101e48d87c79 memcached-1.4.34.tar.gz diff --git a/package.bak/memcached/memcached.mk b/package.bak/memcached/memcached.mk deleted file mode 100644 index caebe0289f..0000000000 --- a/package.bak/memcached/memcached.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# memcached -# -################################################################################ - -MEMCACHED_VERSION = 1.4.34 -MEMCACHED_SITE = http://www.memcached.org/files -MEMCACHED_DEPENDENCIES = libevent -MEMCACHED_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -MEMCACHED_CONF_OPTS = --disable-coverage -MEMCACHED_LICENSE = BSD-3c -MEMCACHED_LICENSE_FILES = COPYING - -ifeq ($(BR2_ENDIAN),"BIG") -MEMCACHED_CONF_ENV += ac_cv_c_endian=big -else -MEMCACHED_CONF_ENV += ac_cv_c_endian=little -endif - -$(eval $(autotools-package)) diff --git a/package.bak/memstat/0001-PATH_MAX.patch b/package.bak/memstat/0001-PATH_MAX.patch deleted file mode 100644 index 0c3617a61b..0000000000 --- a/package.bak/memstat/0001-PATH_MAX.patch +++ /dev/null @@ -1,14 +0,0 @@ -Add missing #include for PATH_MAX - -Signed-off-by: Maarten ter Huurne - ---- memstat-0.8.org/memstat.c 2009-06-08 14:38:05.000000000 +0200 -+++ memstat-0.8/memstat.c 2014-09-12 03:55:43.096035374 +0200 -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - /* blacklist devices that just map physical memory */ - char *blacklist[] = { "/dev/mem", diff --git a/package.bak/memstat/Config.in b/package.bak/memstat/Config.in deleted file mode 100644 index b790612472..0000000000 --- a/package.bak/memstat/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_MEMSTAT - bool "memstat" - help - Memstat lists all the processes, executables, and shared - libraries that are using up virtual memory. It's helpful to - see how the shared memory is used and which 'old' libs are - loaded. - - http://sourceforge.net/projects/memstattool diff --git a/package.bak/memstat/memstat.hash b/package.bak/memstat/memstat.hash deleted file mode 100644 index f27e7d25f3..0000000000 --- a/package.bak/memstat/memstat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://sourceforge.net/projects/memstattool/files/ -sha1 26071dbc30a2796c0503c7d8060a548ca36f8df9 memstat_1.0.tar.gz diff --git a/package.bak/memstat/memstat.mk b/package.bak/memstat/memstat.mk deleted file mode 100644 index e11b4ae643..0000000000 --- a/package.bak/memstat/memstat.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# memstat -# -################################################################################ - -MEMSTAT_VERSION = 1.0 -MEMSTAT_SITE = http://downloads.sourceforge.net/project/memstattool -MEMSTAT_SOURCE = memstat_$(MEMSTAT_VERSION).tar.gz -MEMSTAT_LICENSE = GPL -MEMSTAT_LICENSE_FILES = debian/copyright - -define MEMSTAT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" CFLAGS="$(TARGET_CFLAGS)" \ - -C $(@D) memstat -endef - -define MEMSTAT_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/memstat.conf -m 0644 \ - $(TARGET_DIR)/etc/memstat.conf - $(INSTALL) -D $(@D)/memstat $(TARGET_DIR)/usr/bin/memstat -endef - -$(eval $(generic-package)) diff --git a/package.bak/memtest86/Config.in b/package.bak/memtest86/Config.in deleted file mode 100644 index 3a684b63c8..0000000000 --- a/package.bak/memtest86/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_MEMTEST86 - bool "memtest86" - depends on BR2_i386 || BR2_x86_64 - help - Memtest86+ is a bootable standalone memory test program. - - Buildroot does not support packages with a '+' sign in their - name, which explains why it is named memtest86 and not - memtest86+. - - Memtest86+ is a utility designed to test whether your memory - is in working order. It repeatedly writes an enormous amount - of different patterns to all memory locations and reads them - back again and verifies whether the result of the read is the - same as what was written to memory. - - Memtest86+ will only work on 32-bit or 64-bit x86 targets. - It boots as an i486 program and autodetects hardware. It can - be added to the grub2 boot menu by adding the following lines - to the bottom of /boot/grub/grub.cfg - note the use of linux16. - - menuentry "Memtest86+" { - linux16 /boot/memtest86+.bin - } - - Other boot loaders will have similar requirements. - - http://www.memtest.org diff --git a/package.bak/memtest86/memtest86.hash b/package.bak/memtest86/memtest86.hash deleted file mode 100644 index 81ad98e72e..0000000000 --- a/package.bak/memtest86/memtest86.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed using sha256sum -sha256 142127b7953fbd829b1057fb64a78d3340c2b771484230a7347e94530a0d9039 memtest86+-5.01.tar.gz diff --git a/package.bak/memtest86/memtest86.mk b/package.bak/memtest86/memtest86.mk deleted file mode 100644 index d2ec1a7992..0000000000 --- a/package.bak/memtest86/memtest86.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# memtest86 -# -################################################################################ - -MEMTEST86_VERSION = 5.01 -MEMTEST86_SOURCE = memtest86+-$(MEMTEST86_VERSION).tar.gz -MEMTEST86_SITE = http://www.memtest.org/download/$(MEMTEST86_VERSION) -MEMTEST86_LICENSE = GPLv2 -MEMTEST86_LICENSE_FILES = README - -# memtest86+ is sensitive to toolchain changes, use the shipped binary version -define MEMTEST86_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/precomp.bin $(TARGET_DIR)/boot/memtest86+.bin -endef - -$(eval $(generic-package)) diff --git a/package.bak/memtester/0001-makefile-fix.patch b/package.bak/memtester/0001-makefile-fix.patch deleted file mode 100644 index 6f1481beca..0000000000 --- a/package.bak/memtester/0001-makefile-fix.patch +++ /dev/null @@ -1,23 +0,0 @@ -The a/{b,c} construct doesn't work within make, so let's split the -creation of the installation directories in two commands. - -Signed-off-by: Thomas Petazzoni ---- - Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -Index: memtester-4.2.1/Makefile -=================================================================== ---- memtester-4.2.1.orig/Makefile -+++ memtester-4.2.1/Makefile -@@ -25,8 +25,9 @@ - all: memtester - - install: all -- mkdir -m 755 -p $(INSTALLPATH)/{bin,man/man8} -+ mkdir -m 755 -p $(INSTALLPATH)/bin - install -m 755 memtester $(INSTALLPATH)/bin/ -+ mkdir -m 755 -p $(INSTALLPATH)/man/man8 - gzip -c memtester.8 >memtester.8.gz ; install -m 644 memtester.8.gz $(INSTALLPATH)/man/man8/ - - auto-ccld.sh: \ diff --git a/package.bak/memtester/Config.in b/package.bak/memtester/Config.in deleted file mode 100644 index 7a504dc1b7..0000000000 --- a/package.bak/memtester/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MEMTESTER - bool "memtester" - help - A userspace utility for testing the memory subsystem for faults. - - http://pyropus.ca/software/memtester/ diff --git a/package.bak/memtester/memtester.hash b/package.bak/memtester/memtester.hash deleted file mode 100644 index 2d9ef3977f..0000000000 --- a/package.bak/memtester/memtester.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 f9dfe2fd737c38fad6535bbab327da9a21f7ce4ea6f18c7b3339adef6bf5fd88 memtester-4.3.0.tar.gz diff --git a/package.bak/memtester/memtester.mk b/package.bak/memtester/memtester.mk deleted file mode 100644 index 802c1e4902..0000000000 --- a/package.bak/memtester/memtester.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# memtester -# -################################################################################ - -MEMTESTER_VERSION = 4.3.0 -MEMTESTER_SITE = http://pyropus.ca/software/memtester/old-versions -MEMTESTER_LICENSE = GPLv2 -MEMTESTER_LICENSE_FILES = COPYING - -MEMTESTER_TARGET_INSTALL_OPTS = INSTALLPATH=$(TARGET_DIR)/usr - -define MEMTESTER_BUILD_CMDS - $(SED) "s,^cc,$(TARGET_CC)," $(@D)/conf-* - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define MEMTESTER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(MEMTESTER_TARGET_INSTALL_OPTS) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/menu-cache/Config.in b/package.bak/menu-cache/Config.in deleted file mode 100644 index b75c8ec054..0000000000 --- a/package.bak/menu-cache/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_MENU_CACHE - bool "menu-cache" - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBFM_EXTRA - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - Small library from LXDE project used for application menu - integration - - http://wiki.lxde.org/ - -comment "menu-cache needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/menu-cache/menu-cache.hash b/package.bak/menu-cache/menu-cache.hash deleted file mode 100644 index 1b30fcc11c..0000000000 --- a/package.bak/menu-cache/menu-cache.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/lxde/files/menu-cache/1.0/ -md5 a856ba860b16fdc8c69ee784bc4ade36 menu-cache-1.0.1.tar.xz -sha1 58862c665f2ae56870a9937cdcd643674b2ac8ba menu-cache-1.0.1.tar.xz diff --git a/package.bak/menu-cache/menu-cache.mk b/package.bak/menu-cache/menu-cache.mk deleted file mode 100644 index 16878258fd..0000000000 --- a/package.bak/menu-cache/menu-cache.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# menu-cache -# -################################################################################ - -MENU_CACHE_VERSION_MAJOR = 1.0 -MENU_CACHE_VERSION = $(MENU_CACHE_VERSION_MAJOR).1 -MENU_CACHE_SOURCE = menu-cache-$(MENU_CACHE_VERSION).tar.xz -MENU_CACHE_SITE = http://sourceforge.net/projects/lxde/files/menu-cache/$(MENU_CACHE_VERSION_MAJOR) -MENU_CACHE_DEPENDENCIES = libfm-extra libglib2 -MENU_CACHE_LICENSE = LGPLv2.1 -MENU_CACHE_LICENSE_FILES = COPYING -MENU_CACHE_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/mesa3d-demos/0001-demos-optional-gl.patch b/package.bak/mesa3d-demos/0001-demos-optional-gl.patch deleted file mode 100644 index 6470e9d8d9..0000000000 --- a/package.bak/mesa3d-demos/0001-demos-optional-gl.patch +++ /dev/null @@ -1,74 +0,0 @@ -This patches makes opengl an optional component. - -Signed-off-by: Spenser Gilliland ---- -Index: mesa3d-demos-8.1.0/configure.ac -=================================================================== ---- mesa3d-demos-8.1.0.orig/configure.ac -+++ mesa3d-demos-8.1.0/configure.ac -@@ -51,6 +51,14 @@ - ACLOCAL="aclocal -I/other/macro/dir" before running autoreconf.])]) - PKG_PROG_PKG_CONFIG() - -+AC_ARG_ENABLE([gl], -+ [AS_HELP_STRING([--enable-gl], -+ [enable GL library @<:@default=no@:>@])], -+ [gl_enabled="$enableval"], -+ [gl_enabled=auto]) -+ -+if test "x$gl_enabled" != "xno"; then -+ - dnl Get the pkg-config definitions for libGL. We include a fallback - dnl path for GL implementation that don't provide a .pc file - PKG_CHECK_MODULES(GL, [gl], [], [ -@@ -113,6 +121,8 @@ - DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" - -+fi -+ - AC_ARG_ENABLE([egl], - [AS_HELP_STRING([--enable-egl], - [enable EGL library @<:@default=auto@:>@])], -@@ -303,7 +313,7 @@ - AC_SUBST([WAYLAND_CFLAGS]) - AC_SUBST([WAYLAND_LIBS]) - -- -+AM_CONDITIONAL(HAVE_GL, test "x$gl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") - AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") -Index: mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/egl/opengl/Makefile.am -+++ mesa3d-demos-8.1.0/src/egl/opengl/Makefile.am -@@ -50,12 +50,14 @@ - endif - - if HAVE_EGL -+if HAVE_GL - noinst_PROGRAMS = \ - eglinfo \ - peglgears \ - $(EGL_DRM_DEMOS) \ - $(EGL_X11_DEMOS) - endif -+endif - - egltri_x11_SOURCES = egltri.c - eglgears_x11_SOURCES = eglgears.c -Index: mesa3d-demos-8.1.0/src/util/Makefile.am -=================================================================== ---- mesa3d-demos-8.1.0.orig/src/util/Makefile.am -+++ mesa3d-demos-8.1.0/src/util/Makefile.am -@@ -27,7 +27,9 @@ AM_CFLAGS = \ - AM_LDFLAGS = \ - $(DEMO_LIBS) - -+if HAVE_GL - noinst_LTLIBRARIES = libutil.la -+endif - - if HAVE_GLUT - AM_CFLAGS += \ diff --git a/package.bak/mesa3d-demos/Config.in b/package.bak/mesa3d-demos/Config.in deleted file mode 100644 index f22c0dee91..0000000000 --- a/package.bak/mesa3d-demos/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_MESA3D_DEMOS - bool "mesa3d-demos" - select BR2_PACKAGE_LIBGLEW if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_LIBGLU if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 && BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES \ - || BR2_PACKAGE_HAS_LIBEGL || BR2_PACKAGE_HAS_LIBOPENVG - help - OpenGL demos from the Mesa 3D project. - - http://mesa3d.org diff --git a/package.bak/mesa3d-demos/mesa3d-demos.hash b/package.bak/mesa3d-demos/mesa3d-demos.hash deleted file mode 100644 index a50a3a1e0c..0000000000 --- a/package.bak/mesa3d-demos/mesa3d-demos.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/mesa-announce/2015-December/000191.html -sha256 c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef mesa-demos-8.3.0.tar.bz2 diff --git a/package.bak/mesa3d-demos/mesa3d-demos.mk b/package.bak/mesa3d-demos/mesa3d-demos.mk deleted file mode 100644 index cbc15c3b69..0000000000 --- a/package.bak/mesa3d-demos/mesa3d-demos.mk +++ /dev/null @@ -1,80 +0,0 @@ -################################################################################ -# -# mesa3d-demos -# -################################################################################ - -MESA3D_DEMOS_VERSION = 8.3.0 -MESA3D_DEMOS_SOURCE = mesa-demos-$(MESA3D_DEMOS_VERSION).tar.bz2 -MESA3D_DEMOS_SITE = ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA3D_DEMOS_VERSION) -MESA3D_DEMOS_AUTORECONF = YES -MESA3D_DEMOS_DEPENDENCIES = host-pkgconf -MESA3D_DEMOS_LICENSE = MIT - -MESA3D_DEMOS_CONF_OPTS += \ - --disable-osmesa \ - --disable-gles1 - -ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) -MESA3D_DEMOS_DEPENDENCIES += libgl libglew libglu xlib_libX11 xlib_libXext -MESA3D_DEMOS_CONF_OPTS += --enable-gl --enable-x11 -else -MESA3D_DEMOS_CONF_OPTS += --disable-gl --disable-x11 -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -MESA3D_DEMOS_DEPENDENCIES += libegl -MESA3D_DEMOS_CONF_OPTS += --enable-egl -else -MESA3D_DEMOS_CONF_OPTS += --disable-egl -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -MESA3D_DEMOS_DEPENDENCIES += libgles -MESA3D_DEMOS_CONF_OPTS += --enable-gles2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-gles2 -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y) -MESA3D_DEMOS_DEPENDENCIES += libopenvg -MESA3D_DEMOS_CONF_OPTS += --enable-vg -else -MESA3D_DEMOS_CONF_OPTS += --disable-vg -endif - -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -MESA3D_DEMOS_DEPENDENCIES += mesa3d -MESA3D_DEMOS_CONF_OPTS += --enable-gbm -else -MESA3D_DEMOS_CONF_OPTS += --disable-gbm -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -MESA3D_DEMOS_DEPENDENCIES += freetype -MESA3D_DEMOS_CONF_OPTS += --enable-freetype2 -else -MESA3D_DEMOS_CONF_OPTS += --disable-freetype2 -endif - -ifeq ($(BR2_PACKAGE_LIBFREEGLUT),y) -MESA3D_DEMOS_DEPENDENCIES += libfreeglut -MESA3D_DEMOS_CONF_OPTS += --with-glut=$(STAGING_DIR)/usr -# osmesa support depends on glut -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) -MESA3D_DEMOS_CONF_OPTS += --enable-osmesa -else -MESA3D_DEMOS_CONF_OPTS += --disable-osmesa -endif -else -MESA3D_DEMOS_CONF_OPTS += --without-glut --disable-osmesa -endif - -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEMOS_DEPENDENCIES += wayland -MESA3D_DEMOS_CONF_OPTS += --enable-wayland -else -MESA3D_DEMOS_CONF_OPTS += --disable-wayland -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mesa3d-headers/Config.in b/package.bak/mesa3d-headers/Config.in deleted file mode 100644 index c4efab673f..0000000000 --- a/package.bak/mesa3d-headers/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_MESA3D_HEADERS - bool - help - Mesa 3D, an open-source implementation of the OpenGL - specification. - - This package only installs headers needed by other packages. - - http://mesa3d.org diff --git a/package.bak/mesa3d-headers/mesa3d-headers.hash b/package.bak/mesa3d-headers/mesa3d-headers.hash deleted file mode 120000 index 137d0bea9c..0000000000 --- a/package.bak/mesa3d-headers/mesa3d-headers.hash +++ /dev/null @@ -1 +0,0 @@ -../mesa3d/mesa3d.hash \ No newline at end of file diff --git a/package.bak/mesa3d-headers/mesa3d-headers.mk b/package.bak/mesa3d-headers/mesa3d-headers.mk deleted file mode 100644 index 35b1a71442..0000000000 --- a/package.bak/mesa3d-headers/mesa3d-headers.mk +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################ -# -# mesa3d-headers -# -################################################################################ - -# mesa3d-headers is inherently incompatible with mesa3d, so error out -# if both are enabled. -ifeq ($(BR2_PACKAGE_MESA3D)$(BR2_PACKAGE_MESA3D_HEADERS),yy) -$(error mesa3d-headers enabled, but mesa3d enabled too) -endif - -# Not possible to directly refer to mesa3d variables, because of -# first/second expansion trickery... -MESA3D_HEADERS_VERSION = 13.0.4 -MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz -MESA3D_HEADERS_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_HEADERS_VERSION) -MESA3D_HEADERS_LICENSE = MIT, SGI, Khronos -MESA3D_HEADERS_LICENSE_FILES = docs/license.html - -# Only installs header files -MESA3D_HEADERS_INSTALL_STAGING = YES -MESA3D_HEADERS_INSTALL_TARGET = NO - -MESA3D_HEADERS_DIRS = KHR - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) - -MESA3D_HEADERS_DIRS += GL - -ifeq ($(BR2_PACKAGE_XORG7),y) - -# Not using $(SED) because we do not want to work in-place, and $(SED) -# contains -i. -define MESA3D_HEADERS_BUILD_DRI_PC - sed -e 's:@\(exec_\)\?prefix@:/usr:' \ - -e 's:@libdir@:${exec_prefix}/lib:' \ - -e 's:@includedir@:${prefix}/include:' \ - -e 's:@DRI_DRIVER_INSTALL_DIR@:${libdir}/dri:' \ - -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - -e 's:@DRI_PC_REQ_PRIV@::' \ - $(@D)/src/mesa/drivers/dri/dri.pc.in \ - >$(@D)/src/mesa/drivers/dri/dri.pc -endef - -define MESA3D_HEADERS_INSTALL_DRI_PC - $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ - $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h - $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc -endef - -endif # Xorg - -endif # OpenGL - -ifeq ($(BR2_PACKAGE_HAS_LIBEGL),y) -MESA3D_HEADERS_DIRS += EGL -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -MESA3D_HEADERS_DIRS += GLES GLES2 -endif - -define MESA3D_HEADERS_BUILD_CMDS - $(MESA3D_HEADERS_BUILD_DRI_PC) -endef - -define MESA3D_HEADERS_INSTALL_STAGING_CMDS - $(foreach d,$(MESA3D_HEADERS_DIRS),\ - cp -dpfr $(@D)/include/$(d) $(STAGING_DIR)/usr/include/ || exit 1$(sep)) - $(MESA3D_HEADERS_INSTALL_DRI_PC) -endef - -$(eval $(generic-package)) diff --git a/package.bak/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch b/package.bak/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch deleted file mode 100644 index ab773f85a4..0000000000 --- a/package.bak/mesa3d/0001-Fix-khrplatform.h-not-installed-if-EGL-is-disabled.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 83a1afd73f2d0aff9aa11c1754d6d407983afa7d Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Wed, 9 Apr 2014 12:48:36 +0200 -Subject: [PATCH] Fix khrplatform.h not installed if EGL is disabled. - -KHR/khrplatform.h is required by the EGL, GLES and VG headers, but is -only installed if Mesa3d is compiled with EGL support. - -This patch installs this header file unconditionally. - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=77240 - -Signed-off-by: Eric Le Bihan -Signed-off-by: Bernd Kuhls (rebased for mesa3d 10.3) - -diff -uNr Mesa-10.3.0-rc2.org/src/egl/main/Makefile.am Mesa-10.3.0-rc2/src/egl/main/Makefile.am ---- Mesa-10.3.0-rc2.org/src/egl/Makefile.am 2014-08-29 00:00:57.000000000 +0200 -+++ Mesa-10.3.0-rc2/src/egl/Makefile.am 2014-09-02 21:35:52.548071820 +0200 -@@ -85,9 +85,6 @@ - - pkgconfig_DATA = egl.pc - --khrdir = $(includedir)/KHR --khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h -- - egldir = $(includedir)/EGL - egl_HEADERS = \ - $(top_srcdir)/include/EGL/eglext.h \ -diff -uNr Mesa-10.3.0-rc2.org/src/mapi/Makefile.am Mesa-10.3.0-rc2/src/mapi/Makefile.am ---- Mesa-10.3.0-rc2.org/src/mapi/Makefile.am 2014-09-01 01:22:12.000000000 +0200 -+++ Mesa-10.3.0-rc2/src/mapi/Makefile.am 2014-09-02 21:36:22.891686861 +0200 -@@ -211,4 +211,7 @@ - SUBDIRS += vgapi - endif - -+khrdir = $(includedir)/KHR -+khr_HEADERS = $(top_srcdir)/include/KHR/khrplatform.h -+ - include $(top_srcdir)/install-lib-links.mk diff --git a/package.bak/mesa3d/0002-Fix-runtime-error-with-uClibc.patch b/package.bak/mesa3d/0002-Fix-runtime-error-with-uClibc.patch deleted file mode 100644 index 59627beff6..0000000000 --- a/package.bak/mesa3d/0002-Fix-runtime-error-with-uClibc.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix runtime error with uClibc - -Patch inspired by -https://www.winehq.org/pipermail/wine-bugs/2011-September/288987.html -http://git.alpinelinux.org/cgit/aports/tree/main/wine/uclibc-fmaxf-fminf.patch?id=c9b491b6099eec02a835ffd05539b5c783c6c43a - -Starting an app using mesa3d 10.5.x, Kodi for example, fails: - -/usr/lib/kodi/kodi.bin: symbol 'fminf': can't resolve symbol in lib '/usr/lib/dri/i965_dri.so'. -libGL error: unable to load driver: i965_dri.so -libGL error: driver pointer missing -libGL error: failed to load driver: i965 -libGL error: unable to load driver: swrast_dri.so -libGL error: failed to load driver: swrast - -This patch was rejected by upstream mesa3d: -http://lists.freedesktop.org/archives/mesa-dev/2015-March/079436.html - -The real fix was committed to uClibc: -http://git.uclibc.org/uClibc/commit/?id=6c4538905e65ceb203f59aaa9a61728e81c6bc0a - -Until the external toolchains do not contain this uClibc patch we keep this -patch: http://lists.busybox.net/pipermail/buildroot/2015-March/123410.html - -Signed-off-by: Bernd Kuhls ---- -diff -uNr mesa-10.5.3.org/src/glsl/nir/nir_constant_expressions.c mesa-10.5.3/src/glsl/nir/nir_constant_expressions.c ---- mesa-10.5.3.org/src/compiler/nir/nir_constant_expressions.c 2015-04-12 23:31:29.000000000 +0200 -+++ mesa-10.5.3/src/compiler/nir/nir_constant_expressions.c 2015-04-13 19:59:37.819786541 +0200 -@@ -48,6 +48,18 @@ - } - #endif - -+#ifdef __UCLIBC__ -+float fmaxf(float a, float b) -+{ -+ return (a > b) ? a : b; -+} -+ -+float fminf(float a, float b) -+{ -+ return (a < b) ? a : b; -+} -+#endif -+ - /** - * Evaluate one component of packSnorm4x8. - */ diff --git a/package.bak/mesa3d/0003-musl.patch b/package.bak/mesa3d/0003-musl.patch deleted file mode 100644 index 8f7ba773aa..0000000000 --- a/package.bak/mesa3d/0003-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix musl build - -Downloaded from -http://git.alpinelinux.org/cgit/aports/plain/main/mesa/musl-fixes.patch - -Signed-off-by: Bernd Kuhls - ---- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig -+++ ./src/gallium/winsys/svga/drm/vmw_screen.h -@@ -34,7 +34,7 @@ - #ifndef VMW_SCREEN_H_ - #define VMW_SCREEN_H_ - -- -+#include - #include "pipe/p_compiler.h" - #include "pipe/p_state.h" - diff --git a/package.bak/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch b/package.bak/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch deleted file mode 100644 index 656705b434..0000000000 --- a/package.bak/mesa3d/0004-Fix-endianess-detection-with-musl-based-toolchains.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 61b076689b6308b1c9d0d84ee8654a47e65e67ae Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Fri, 4 Nov 2016 19:44:37 +0100 -Subject: [PATCH 1/1] Fix endianess detection with musl-based toolchains - -Musl does not define __GLIBC__ and will not provide a __MUSL__ macro: -http://wiki.musl-libc.org/wiki/FAQ#Q:_why_is_there_no_MUSL_macro_.3F - -This patch checks for the presence of endian.h and promotes the result -to src/amd/Makefile.addrlib.am which executes the broken build command. -Fixes compile errors detected by the autobuilder infrastructure of the -buildroot project: - -http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/ -http://autobuild.buildroot.net/results/e27/e27a9a95f72dba3076549beb2a2ccfdbea2fcfee/ - -Patch sent upstream: https://patchwork.freedesktop.org/patch/119961/ - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 1 + - src/amd/Makefile.addrlib.am | 1 + - src/util/u_endian.h | 2 +- - 3 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4761c59..7991b52 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -786,6 +786,7 @@ fi - AC_HEADER_MAJOR - AC_CHECK_HEADER([xlocale.h], [DEFINES="$DEFINES -DHAVE_XLOCALE_H"]) - AC_CHECK_HEADER([sys/sysctl.h], [DEFINES="$DEFINES -DHAVE_SYS_SYSCTL_H"]) -+AC_CHECK_HEADER([endian.h], [DEFINES="$DEFINES -DHAVE_ENDIAN_H"]) - AC_CHECK_FUNC([strtof], [DEFINES="$DEFINES -DHAVE_STRTOF"]) - AC_CHECK_FUNC([mkostemp], [DEFINES="$DEFINES -DHAVE_MKOSTEMP"]) - -diff --git a/src/amd/Makefile.addrlib.am b/src/amd/Makefile.addrlib.am -index 64823fc..4e2fb1d 100644 ---- a/src/amd/Makefile.addrlib.am -+++ b/src/amd/Makefile.addrlib.am -@@ -28,6 +28,7 @@ addrlib_libamdgpu_addrlib_la_CPPFLAGS = \ - -I$(srcdir)/addrlib/core \ - -I$(srcdir)/addrlib/inc/chip/r800 \ - -I$(srcdir)/addrlib/r800/chip \ -+ $(DEFINES) \ - -DBRAHMA_BUILD=1 - - addrlib_libamdgpu_addrlib_la_CXXFLAGS = \ -diff --git a/src/util/u_endian.h b/src/util/u_endian.h -index b9d563d..266fb4a 100644 ---- a/src/util/u_endian.h -+++ b/src/util/u_endian.h -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) -+#if defined(__GLIBC__) || defined(ANDROID) || defined(HAVE_ENDIAN_H) - #include - - #if __BYTE_ORDER == __LITTLE_ENDIAN --- -2.10.1 - diff --git a/package.bak/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch b/package.bak/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch deleted file mode 100644 index e32031eca1..0000000000 --- a/package.bak/mesa3d/0005-configure.ac-invert-order-for-wayland-scanner-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 60ee5191a0c074251862a15b12afdc9db0b2df38 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 17 Nov 2016 15:36:54 -0300 -Subject: [PATCH] configure.ac: invert order for wayland-scanner check - -When cross-compiling the .pc file might point to the wrong -wayland-scanner binary (target rather than host) resulting in a -non-executable and wrong scanner. -Try searching the PATH first, and if that fails fall back into -pkg-config. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5f30ae8..461792e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2025,11 +2025,11 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then - AC_MSG_ERROR([cannot build egl state tracker without EGL library]) - fi - --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') -+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) -+ PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -+ WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -+ WAYLAND_SCANNER='') - fi - - # Do per-EGL platform setups and checks --- -2.7.3 - diff --git a/package.bak/mesa3d/Config.in b/package.bak/mesa3d/Config.in deleted file mode 100644 index bbab95373f..0000000000 --- a/package.bak/mesa3d/Config.in +++ /dev/null @@ -1,204 +0,0 @@ -menuconfig BR2_PACKAGE_MESA3D - bool "mesa3d" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_1 - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 - help - Mesa 3D, an open-source implementation of the OpenGL specification. - - http://mesa3d.org - -if BR2_PACKAGE_MESA3D - -# inform the .mk file of gallium, dri or vulkan driver selection -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_DRIVER - bool - -config BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO - select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO - bool - -config BR2_PACKAGE_MESA3D_VULKAN_DRIVER - bool - select BR2_PACKAGE_MESA3D_DRIVER - -config BR2_PACKAGE_MESA3D_DRIVER - bool - -config BR2_PACKAGE_MESA3D_NEEDS_XA - bool - -comment "Gallium drivers" - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU - bool "Gallium nouveau driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_NOUVEAU - select BR2_PACKAGE_MESA3D_NEEDS_XA - help - Supports all Nvidia GPUs. - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600 - bool "Gallium Radeon R600 driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_NEEDS_XA - help - Driver for ATI/AMD Radeon R600/R700/HD5000/HD6000 GPUs. - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA - bool "Gallium vmware svga driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_VMWGFX - select BR2_PACKAGE_MESA3D_NEEDS_XA - help - This is a virtual GPU driver for VMWare virtual machines. - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST - bool "Gallium swrast driver" - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - help - This is a software opengl implementation using the Gallium3D - infrastructure. - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4 - bool "Gallium vc4 driver" - depends on BR2_arm - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_LIBDRM_VC4 - select BR2_PACKAGE_MESA3D_NEEDS_XA - help - Driver for Broadcom VC4 (rpi2/3) GPUs. - It requires a vanilla 4.5+ kernel with drm vc4 (open) support. - -config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL - bool "Gallium virgl driver" - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER - select BR2_PACKAGE_MESA3D_OPENGL_EGL - help - virgl is the 3D acceleration backend for the virtio-gpu - shipping with qemu. - -comment "DRI drivers" - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST - bool "DRI swrast driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - help - This is a software opengl implementation using the DRI - infrastructure. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - bool "DRI i915 driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i915-based Intel GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 - bool "DRI i965 driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i965-based Intel GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU - bool "DRI nouveau driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_NOUVEAU - help - Support for Nvidia-based GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON - bool "DRI radeon driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_RADEON - help - Legacy Radeon driver for R100 series GPUs. - -comment "Vulkan drivers" - -config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL - bool "Vulkan Intel driver" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h - depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert - depends on BR2_PACKAGE_XORG7 # xproto_dri3proto - # We need a SHA1 implementation. If either openssl or - # libgcrypt are already part of the build, we'll use one of - # them, otherwise, use the small libsha1 library. - select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) - select BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 - select BR2_PACKAGE_MESA3D_VULKAN_DRIVER - select BR2_PACKAGE_XPROTO_DRI3PROTO - help - Vulkan driver for Intel hardware from Ivy Bridge onward. - -comment "intel vulkan depends on X.org and needs a glibc toolchain w/ headers >= 3.18" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 || \ - !BR2_TOOLCHAIN_USES_GLIBC || !BR2_PACKAGE_XORG7 - -comment "Off-screen Rendering" - -config BR2_PACKAGE_MESA3D_OSMESA - bool "OSMesa library" - help - The OSMesa API provides functions for making off-screen renderings. - -if BR2_PACKAGE_MESA3D_DRIVER - -comment "Additional API Support" - -config BR2_PACKAGE_MESA3D_OPENGL_EGL - bool "OpenGL EGL" - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND - help - Use the Khronos EGL APIs. EGL is a window manager for OpenGL applications - similar to GLX, for X, and WGL, for Windows. - -config BR2_PACKAGE_MESA3D_OPENGL_ES - bool "OpenGL ES" - select BR2_PACKAGE_HAS_LIBGLES - help - Use the Khronos OpenGL ES APIs. This is commonly used on embedded - systems and represents a subset of the OpenGL API. - -endif # BR2_PACKAGE_MESA3D_DRIVER - -config BR2_PACKAGE_PROVIDES_LIBGL - default "mesa3d" if BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES - -endif # BR2_PACKAGE_MESA3D - -comment "mesa3d needs a toolchain w/ C++, NPTL, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package.bak/mesa3d/mesa3d.hash b/package.bak/mesa3d/mesa3d.hash deleted file mode 100644 index b3c4b77726..0000000000 --- a/package.bak/mesa3d/mesa3d.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2017-February/000294.html -sha256 a95d7ce8f7bd5f88585e4be3144a341236d8c0fc91f6feaec59bb8ba3120e726 mesa-13.0.4.tar.xz diff --git a/package.bak/mesa3d/mesa3d.mk b/package.bak/mesa3d/mesa3d.mk deleted file mode 100644 index 0c68dedfda..0000000000 --- a/package.bak/mesa3d/mesa3d.mk +++ /dev/null @@ -1,183 +0,0 @@ -################################################################################ -# -# mesa3d -# -################################################################################ - -# When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 13.0.4 -MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz -MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) -MESA3D_LICENSE = MIT, SGI, Khronos -MESA3D_LICENSE_FILES = docs/license.html -MESA3D_AUTORECONF = YES - -MESA3D_INSTALL_STAGING = YES - -MESA3D_PROVIDES = - -MESA3D_DEPENDENCIES = \ - host-bison \ - host-flex \ - expat \ - libdrm - -# The Sourcery MIPS toolchain has a special (non-upstream) feature to -# have "compact exception handling", which unfortunately breaks with -# mesa3d, so we disable it here by passing -mno-compact-eh. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS),y) -MESA3D_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" -MESA3D_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mno-compact-eh" -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MESA3D_DEPENDENCIES += openssl -MESA3D_CONF_OPTS += --with-sha1=libcrypto -else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -MESA3D_DEPENDENCIES += libgcrypt -MESA3D_CONF_OPTS += --with-sha1=libgcrypt -else ifeq ($(BR2_PACKAGE_LIBSHA1),y) -MESA3D_DEPENDENCIES += libsha1 -MESA3D_CONF_OPTS += --with-sha1=libsha1 -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_DEPENDENCIES += \ - xproto_xf86driproto \ - xproto_dri2proto \ - xproto_glproto \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXdamage \ - xlib_libXfixes \ - libxcb -MESA3D_CONF_OPTS += --enable-glx --disable-mangling -# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver." -ifeq ($(BR2_PACKAGE_MESA3D_NEEDS_XA),y) -MESA3D_CONF_OPTS += --enable-xa -else -MESA3D_CONF_OPTS += --disable-xa -endif -else -MESA3D_CONF_OPTS += \ - --disable-glx \ - --disable-xa -endif - -# Drivers - -#Gallium Drivers -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU) += nouveau -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) += r600 -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA) += svga -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST) += swrast -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 -MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl -# DRI Drivers -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon -# Vulkan Drivers -MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel - -ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER),) -MESA3D_CONF_OPTS += \ - --without-gallium-drivers -else -MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --with-gallium-drivers=$(subst $(space),$(comma),$(MESA3D_GALLIUM_DRIVERS-y)) -endif - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -MESA3D_CONF_OPTS += \ - --without-dri-drivers --disable-dri3 -else -ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) -MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto -MESA3D_CONF_OPTS += --enable-dri3 -else -MESA3D_CONF_OPTS += --disable-dri3 -endif -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -MESA3D_DEPENDENCIES += xlib_libXxf86vm -endif -MESA3D_CONF_OPTS += \ - --enable-shared-glapi \ - --enable-driglx-direct \ - --with-dri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) -endif - -ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) -MESA3D_CONF_OPTS += \ - --without-vulkan-drivers -else -MESA3D_CONF_OPTS += \ - --with-vulkan-drivers=$(subst $(space),$(comma),$(MESA3D_VULKAN_DRIVERS-y)) -endif - -# APIs - -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) -MESA3D_CONF_OPTS += --enable-osmesa -else -MESA3D_CONF_OPTS += --disable-osmesa -endif - -# Always enable OpenGL: -# - it is needed for GLES (mesa3d's ./configure is a bit weird) -MESA3D_CONF_OPTS += --enable-opengl --enable-dri - -# libva and mesa3d have a circular dependency -# we do not need libva support in mesa3d, therefore disable this option -MESA3D_CONF_OPTS += --disable-va - -# libGL is only provided for a full xorg stack -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_PROVIDES += libgl -else -define MESA3D_REMOVE_OPENGL_HEADERS - rm -rf $(STAGING_DIR)/usr/include/GL/ -endef - -MESA3D_POST_INSTALL_STAGING_HOOKS += MESA3D_REMOVE_OPENGL_HEADERS -endif - -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -MESA3D_PROVIDES += libegl -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -MESA3D_EGL_PLATFORMS = drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4),y) -MESA3D_EGL_PLATFORMS = drm -else ifeq ($(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL),y) -MESA3D_EGL_PLATFORMS = drm -endif -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MESA3D_DEPENDENCIES += wayland -MESA3D_EGL_PLATFORMS += wayland -endif -ifeq ($(BR2_PACKAGE_XORG7),y) -MESA3D_EGL_PLATFORMS += x11 -endif -MESA3D_CONF_OPTS += \ - --enable-gbm \ - --enable-egl \ - --with-egl-platforms=$(subst $(space),$(comma),$(MESA3D_EGL_PLATFORMS)) -else -MESA3D_CONF_OPTS += \ - --disable-egl -endif - -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_ES),y) -MESA3D_PROVIDES += libgles -MESA3D_CONF_OPTS += --enable-gles1 --enable-gles2 -else -MESA3D_CONF_OPTS += --disable-gles1 --disable-gles2 -endif - -# Avoid automatic search of llvm-config -MESA3D_CONF_OPTS += --with-llvm-prefix=$(STAGING_DIR)/usr/bin - -$(eval $(autotools-package)) diff --git a/package.bak/metacity/0001-add-libm-reference.patch b/package.bak/metacity/0001-add-libm-reference.patch deleted file mode 100644 index 628501726a..0000000000 --- a/package.bak/metacity/0001-add-libm-reference.patch +++ /dev/null @@ -1,51 +0,0 @@ -Upstream fix to link metacity itself against libm - -The upstream fix is modified to also include the changes on the -configure script directly, so that autoreconfiguring is not -needed. Autoreconfiguring cannot be done easily on metacity, due to -missing AM_GCONF_SOURCE_2 and AM_NLS macros. - -http://git.gnome.org/browse/metacity/commit/configure.in?id=9cb0b6ff520ea69bdff6c328a21787202aee1bcc - -Signed-off-by: Thomas Petazzoni - -From 9cb0b6ff520ea69bdff6c328a21787202aee1bcc Mon Sep 17 00:00:00 2001 -From: Götz Waschk -Date: Wed, 22 Oct 2008 12:08:48 +0000 -Subject: add libm reference. Closes #557357. - -2008-10-22 Götz Waschk - - * configure.in: add libm reference. Closes #557357. - - -svn path=/trunk/; revision=3984 ---- -(limited to 'configure.in') - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -413,7 +413,7 @@ - AC_DEFINE(HAVE_XSYNC, , [Have the Xsync extension library]) - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -29509,7 +29509,7 @@ - - fi - --METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" -+METACITY_LIBS="$METACITY_LIBS $XSYNC_LIBS $RANDR_LIBS $SHAPE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS -lm" - METACITY_MESSAGE_LIBS="$METACITY_MESSAGE_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_WINDOW_DEMO_LIBS="$METACITY_WINDOW_DEMO_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" - METACITY_PROPS_LIBS="$METACITY_PROPS_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS" diff --git a/package.bak/metacity/0002-gconf.patch b/package.bak/metacity/0002-gconf.patch deleted file mode 100644 index 939ef7ef98..0000000000 --- a/package.bak/metacity/0002-gconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] fix build with --disable-gconf - -src/core/prefs.c still contain a call to gconf_client_set_bool() when -built with --disable-gconf, breaking the build. - -Signed-off-by: Peter Korsgaard ---- - src/core/prefs.c | 2 ++ - 1 file changed, 2 insertions(+) - -Index: metacity-2.25.1/src/core/prefs.c -=================================================================== ---- metacity-2.25.1.orig/src/core/prefs.c -+++ metacity-2.25.1/src/core/prefs.c -@@ -2949,6 +2949,7 @@ - void - meta_prefs_set_compositing_manager (gboolean whether) - { -+#if HAVE_GCONF - GError *err = NULL; - - gconf_client_set_bool (default_client, -@@ -2962,6 +2963,7 @@ - err->message); - g_error_free (err); - } -+#endif - } - - #ifndef HAVE_GCONF diff --git a/package.bak/metacity/0003-mag-add-libm-reference.patch b/package.bak/metacity/0003-mag-add-libm-reference.patch deleted file mode 100644 index d47d807558..0000000000 --- a/package.bak/metacity/0003-mag-add-libm-reference.patch +++ /dev/null @@ -1,45 +0,0 @@ -Upstream patch to fix link against libm - -The upstream patch is modified to also include the necessary -Makefile.in, which avoids the need for autoreconfiguring the -package. Autoreconfiguring the package unfortunately doesn't work, due -to AM_GCONF_SOURCE_2 and AM_NLS macros being missing. - -http://git.gnome.org/browse/metacity/commit/src/tools/Makefile.am?id=13d0d52eb885598885b6ff4b73c795c8f29c2a6b - -Signed-off-by: Thomas Petazzoni - -From 13d0d52eb885598885b6ff4b73c795c8f29c2a6b Mon Sep 17 00:00:00 2001 -From: Matthias Clasen -Date: Sun, 02 May 2010 14:50:42 +0000 -Subject: fails to link with pedantic linkers - ---- -(limited to 'src/tools/Makefile.am') - -Index: b/src/tools/Makefile.am -=================================================================== ---- a/src/tools/Makefile.am -+++ b/src/tools/Makefile.am -@@ -26,7 +26,7 @@ - - metacity_message_LDADD= @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD= @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD= @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - - EXTRA_DIST=$(icon_DATA) -Index: b/src/tools/Makefile.in -=================================================================== ---- a/src/tools/Makefile.in -+++ b/src/tools/Makefile.in -@@ -281,7 +281,7 @@ - - metacity_message_LDADD = @METACITY_MESSAGE_LIBS@ - metacity_window_demo_LDADD = @METACITY_WINDOW_DEMO_LIBS@ --metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -+metacity_mag_LDADD = @METACITY_WINDOW_DEMO_LIBS@ -lm - metacity_grayscale_LDADD = @METACITY_WINDOW_DEMO_LIBS@ - EXTRA_DIST = $(icon_DATA) - all: all-am diff --git a/package.bak/metacity/Config.in b/package.bak/metacity/Config.in deleted file mode 100644 index 833a091e7f..0000000000 --- a/package.bak/metacity/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_METACITY - bool "metacity" - depends on BR2_PACKAGE_LIBGTK2 - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - # Metacity configure.ac pretends it can be built without - # Composite, but in reality, it doesn't build. - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXDAMAGE - # We do not directly depend on Xft, but they are needed to get - # Xft support in Pango, which we require. - select BR2_PACKAGE_XLIB_LIBXFT - help - Metacity is a window manager for the X Window System. diff --git a/package.bak/metacity/Xsession b/package.bak/metacity/Xsession deleted file mode 100755 index 7225921a07..0000000000 --- a/package.bak/metacity/Xsession +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -export GDK_USE_XFT=1 -export LANG="en_US.UTF-8" -export LC_ALL="en_US.UTF-8" -/usr/bin/X11/rxvt -bg black -fg gray90 & -exec /bin/metacity diff --git a/package.bak/metacity/metacity.hash b/package.bak/metacity/metacity.hash deleted file mode 100644 index 49450160fe..0000000000 --- a/package.bak/metacity/metacity.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/metacity/2.25/metacity-2.25.1.sha256sum -sha256 fb2ede4ac02d7da08d3c3323fb76afaf945c8cccc07cb2d3a4b7f44fb49f1c47 metacity-2.25.1.tar.bz2 diff --git a/package.bak/metacity/metacity.mk b/package.bak/metacity/metacity.mk deleted file mode 100644 index d889779140..0000000000 --- a/package.bak/metacity/metacity.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# metacity -# -################################################################################ - -# newer versions need libcanberra-gtk and gnome-doc-utils -METACITY_VERSION_MAJOR = 2.25 -METACITY_VERSION = $(METACITY_VERSION_MAJOR).1 -METACITY_SOURCE = metacity-$(METACITY_VERSION).tar.bz2 -METACITY_SITE = http://ftp.gnome.org/pub/gnome/sources/metacity/$(METACITY_VERSION_MAJOR) -METACITY_LICENSE = GPLv2+ -METACITY_LICENSE_FILES = COPYING - -METACITY_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --disable-glibtest \ - --disable-gconf \ - --disable-sm \ - --disable-startup-notification - -METACITY_DEPENDENCIES = libgtk2 \ - xlib_libX11 \ - host-libxml-parser-perl \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXrender \ - xlib_libXdamage - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -METACITY_DEPENDENCIES += xlib_libXcursor -endif - -define METACITY_INSTALL_XSESSION - $(INSTALL) -D package/metacity/Xsession $(TARGET_DIR)/etc/X11/Xsession -endef - -METACITY_POST_INSTALL_TARGET_HOOKS += METACITY_INSTALL_XSESSION - -$(eval $(autotools-package)) diff --git a/package.bak/mfgtools/Config.in.host b/package.bak/mfgtools/Config.in.host deleted file mode 100644 index 1cb5a7f095..0000000000 --- a/package.bak/mfgtools/Config.in.host +++ /dev/null @@ -1,14 +0,0 @@ -comment "mfgtools needs host gcc >= 4.8" - depends on !BR2_HOST_GCC_AT_LEAST_4_8 - -config BR2_PACKAGE_HOST_MFGTOOLS - bool "host mfgtools" - depends on BR2_arm - depends on BR2_HOST_GCC_AT_LEAST_4_8 # needs C++11 - help - This package contains the Freescale manufacturing tool. - It is designed to program firmware to i.MX boards during - production. The communication is done over USB using the - Freescale UTP protocol. - - https://github.com/NXPmicro/mfgtools diff --git a/package.bak/mfgtools/mfgtools.hash b/package.bak/mfgtools/mfgtools.hash deleted file mode 100644 index e73a7fa13a..0000000000 --- a/package.bak/mfgtools/mfgtools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 6ce93a33c269282df305cf7e517d2d14fde78203537d8ea75b064966afe48464 mfgtools-b219fc219a35c365010897ed093c40750f8cdac6.tar.gz diff --git a/package.bak/mfgtools/mfgtools.mk b/package.bak/mfgtools/mfgtools.mk deleted file mode 100644 index cc24352462..0000000000 --- a/package.bak/mfgtools/mfgtools.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# mfgtools -# -################################################################################ - -MFGTOOLS_VERSION = b219fc219a35c365010897ed093c40750f8cdac6 -MFGTOOLS_SITE = $(call github,NXPmicro,mfgtools,$(MFGTOOLS_VERSION)) -MFGTOOLS_SUBDIR = MfgToolLib -MFGTOOLS_LICENSE = BSD-3c or CPOL -MFGTOOLS_LICENSE_FILES = LICENSE CPOL.htm -HOST_MFGTOOLS_DEPENDENCIES = host-libusb - -HOST_MFGTOOLS_CFLAGS = \ - $(HOST_CFLAGS) $(HOST_LDFLAGS) -std=c++11 -lpthread \ - -L$(@D)/MfgToolLib -lMfgToolLib -I$(@D)/MfgToolLib \ - -lusb-1.0 -I$(HOST_DIR)/usr/include/libusb-1.0 \ - -fpermissive -Wno-write-strings - -define HOST_MFGTOOLS_CLI_BUILD - $(HOST_CONFIGURE_OPTS) $(MAKE) CC="$(HOSTCXX)" \ - CFLAGS="$(HOST_MFGTOOLS_CFLAGS)" -C $(@D)/TestPrgm -endef - -HOST_MFGTOOLS_POST_BUILD_HOOKS += HOST_MFGTOOLS_CLI_BUILD - -define HOST_MFGTOOLS_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/MfgToolLib/libMfgToolLib.so \ - $(HOST_DIR)/usr/lib/libMfgToolLib.so - $(INSTALL) -D -m 755 $(@D)/TestPrgm/mfgtoolcli \ - $(HOST_DIR)/usr/bin/mfgtoolcli -endef - -$(eval $(host-cmake-package)) diff --git a/package.bak/mfgtools/readme.txt b/package.bak/mfgtools/readme.txt deleted file mode 100644 index d54781f1f9..0000000000 --- a/package.bak/mfgtools/readme.txt +++ /dev/null @@ -1,69 +0,0 @@ -MfgTools Howto -============== - -1. Build your mfgtool image - -Make sure to enable the following Buildroot options: - -BR2_PACKAGE_FREESCALE_IMX=y -BR2_PACKAGE_IMX_UUC=y -BR2_TARGET_ROOTFS_CPIO=y -BR2_TARGET_ROOTFS_CPIO_GZIP=y -BR2_TARGET_ROOTFS_CPIO_UIMAGE=y - -Also modify your kernel configuration to have: - -CONFIG_USB_GADGET=y -CONFIG_USB_MASS_STORAGE=y -CONFIG_FSL_UTP=y -CONFIG_MMC_BLOCK_MINORS=16 - -2. Go into the output and create the necessary folders - -$ cd output -$ mkdir -p "Profiles/Linux/OS Firmware/firmware" - -3. Create your XML update script named ucl2.xml - -You can find a sample XML at: - -$ wget https://storage.googleapis.com/boundarydevices.com/ucl2.xml \ - -O Profiles/Linux/OS\ Firmware/ucl2.xml - -4. Copy the U-Boot, Kernel and initramfs images to the appropriate -folder - -$ cp images/u-boot.imx images/zImage images/imx6q-sabrelite.dtb \ - images/rootfs.cpio.uboot Profiles/Linux/OS\ Firmware/firmware/ - -5. Copy the prebuilt binaries to be flashed - -Depending on your ucl2.xml file, the sample doesn't flash anything. - -6. Run the MfgTools client: - -$ ./host/usr/bin/mfgtoolcli -l mmc -s uboot_defconfig=imx \ - -s dtbname=imx6q-sabrelite.dtb -s initramfs=rootfs.cpio.uboot \ - -s mmc=1 -p 1 - -For more information about the tools options, please read the -"Manufacturing Tool V2 Quick Start Guide.docx" documentation contained -in every mfgtools package from NXP website[1]. - -Note: All the above commands require your Linux host user to have -permissions to access the USB devices. Please make sure to have udev -rules that allow the user to communicate with the BootROM IDs -(Freescale USB recovery) as well as the one used for the UTP Linux -image (0x066F:0x37FF). Using 'sudo' in front of the mfgtoolcli -command would also grant you the necessary permission but it is *not* -recommended. - -Also, if your U-Boot environment doesn't include mfgtools bootargs, -make sure to set the following: - -setenv bootargs "console=${console},${baudrate} g_mass_storage.stall=0 \ - g_mass_storage.removable=1 g_mass_storage.idVendor=0x066F \ - g_mass_storage.idProduct=0x37FF g_mass_storage.iSerialNumber=\"\" \ - g_mass_storage.file=/fat" - -[1] http://www.nxp.com/products/software-and-tools/software-development-tools/i.mx-software-and-tools/i.mx-6-series-software-and-development-tool-resources:IMX6_SW diff --git a/package.bak/micropython-lib/Config.in b/package.bak/micropython-lib/Config.in deleted file mode 100644 index 599af7797b..0000000000 --- a/package.bak/micropython-lib/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MICROPYTHON_LIB - bool "micropython-lib" - select BR2_PACKAGE_PCRE # runtime - depends on BR2_PACKAGE_MICROPYTHON - help - Core Python libraries ported to MicroPython. - - http://micropython.org diff --git a/package.bak/micropython-lib/micropython-lib.hash b/package.bak/micropython-lib/micropython-lib.hash deleted file mode 100644 index bc0c22efc5..0000000000 --- a/package.bak/micropython-lib/micropython-lib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 eb696009ff8c33004211e484649b34edb14f3efb2ff618942bc8888716757a55 micropython-lib-v1.8.6.tar.gz diff --git a/package.bak/micropython-lib/micropython-lib.mk b/package.bak/micropython-lib/micropython-lib.mk deleted file mode 100644 index 066572e5cf..0000000000 --- a/package.bak/micropython-lib/micropython-lib.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# micropython-lib -# -################################################################################ - -MICROPYTHON_LIB_VERSION = v1.8.6 -MICROPYTHON_LIB_SITE = $(call github,micropython,micropython-lib,$(MICROPYTHON_LIB_VERSION)) -MICROPYTHON_LIB_LICENSE = Python software foundation license v2 (some modules), MIT (everything else) -MICROPYTHON_LIB_LICENSE_FILES = LICENSE - -define MICROPYTHON_LIB_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - PREFIX=$(TARGET_DIR)/usr/lib/micropython \ - install -endef - -$(eval $(generic-package)) diff --git a/package.bak/micropython/0001-fix-version.patch b/package.bak/micropython/0001-fix-version.patch deleted file mode 100644 index 1bf2992169..0000000000 --- a/package.bak/micropython/0001-fix-version.patch +++ /dev/null @@ -1,22 +0,0 @@ -Always use the fallback behaviour for determining the version number - -When built from within buildroot the micropython build process detects -that it is inside a git repository and ends up using the buildroot -version number instead of the correct micropython version number. - -Signed-off-by: Chris Packham ---- -diff -Naur micropython-v1.4.5-old/py/makeversionhdr.py micropython-v1.4.5/py/makeversionhdr.py ---- micropython-v1.4.5-old/py/makeversionhdr.py 2015-08-12 00:42:30.000000000 +1200 -+++ micropython-v1.4.5/py/makeversionhdr.py 2015-09-16 10:21:06.698962836 +1200 -@@ -70,9 +70,7 @@ - - def make_version_header(filename): - # Get version info using git, with fallback to docs/conf.py -- info = get_version_info_from_git() -- if info is None: -- info = get_version_info_from_docs_conf() -+ info = get_version_info_from_docs_conf() - - git_tag, git_hash, ver = info - diff --git a/package.bak/micropython/Config.in b/package.bak/micropython/Config.in deleted file mode 100644 index ed65d6ab30..0000000000 --- a/package.bak/micropython/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_MICROPYTHON - bool "micropython" - select BR2_PACKAGE_LIBFFI - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - # libffi doesn't provide the closure implementation on Blackfin - depends on !BR2_bfin - help - Micro Python is a lean and fast implementation of the Python 3 - programming language that is optimised to run on a microcontroller. - - http://micropython.org - -comment "micropython needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !BR2_bfin diff --git a/package.bak/micropython/micropython.hash b/package.bak/micropython/micropython.hash deleted file mode 100644 index 6ab7b10b66..0000000000 --- a/package.bak/micropython/micropython.hash +++ /dev/null @@ -1,2 +0,0 @@ -#locally computed -sha256 55dd751c4c812809841fd06f4729b8341171c4b6c1dc28a9412455282554f8a5 micropython-v1.8.7.tar.gz diff --git a/package.bak/micropython/micropython.mk b/package.bak/micropython/micropython.mk deleted file mode 100644 index 8336fb436f..0000000000 --- a/package.bak/micropython/micropython.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# micropython -# -################################################################################ - -MICROPYTHON_VERSION = v1.8.7 -MICROPYTHON_SITE = $(call github,micropython,micropython,$(MICROPYTHON_VERSION)) -MICROPYTHON_LICENSE = MIT -MICROPYTHON_LICENSE_FILES = LICENSE -MICROPYTHON_DEPENDENCIES = host-pkgconf libffi - -# Use fallback implementation for exception handling on architectures that don't -# have explicit support. -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb),) -MICROPYTHON_CFLAGS = -DMICROPY_GCREGS_SETJMP=1 -endif - -# When building from a tarball we don't have some of the dependencies that are in -# the git repository as submodules -MICROPYTHON_MAKE_OPTS = MICROPY_PY_BTREE=0 -MICROPYTHON_MAKE_OPTS += MICROPY_PY_USSL=0 - -define MICROPYTHON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \ - $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) -endef - -define MICROPYTHON_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/unix \ - $(MICROPYTHON_MAKE_OPTS) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - CFLAGS_EXTRA=$(MICROPYTHON_CFLAGS) \ - DESTDIR=$(TARGET_DIR) \ - PREFIX=$(TARGET_DIR)/usr \ - install -endef - -$(eval $(generic-package)) diff --git a/package.bak/midori/0001-fix-bug-1492932.patch b/package.bak/midori/0001-fix-bug-1492932.patch deleted file mode 100644 index 27ad283a58..0000000000 --- a/package.bak/midori/0001-fix-bug-1492932.patch +++ /dev/null @@ -1,44 +0,0 @@ -Fix for https://bugs.launchpad.net/midori/+bug/1492932 -Patch status: upstream - -Signed-off-by: Gustavo Zacarias - ---- a/midori/midori-browser.c 2015-07-11 16:03:43 +0000 -+++ b/midori/midori-browser.c 2015-09-25 21:30:31 +0000 -@@ -5953,11 +5953,6 @@ - G_CALLBACK (midori_browser_destroy_cb), NULL); - gtk_window_set_role (GTK_WINDOW (browser), "browser"); - gtk_window_set_icon_name (GTK_WINDOW (browser), MIDORI_STOCK_WEB_BROWSER); -- #if GTK_CHECK_VERSION (3, 4, 0) -- #ifndef HAVE_GRANITE -- gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (browser), TRUE); -- #endif -- #endif - vbox = gtk_vbox_new (FALSE, 0); - /* gtk_container_add (GTK_CONTAINER (browser), vbox); - gtk_widget_show (vbox); */ - ---- a/midori/midori-view.c 2015-07-06 21:26:46 +0000 -+++ b/midori/midori-view.c 2015-09-25 21:30:31 +0000 -@@ -3495,9 +3495,6 @@ - } - else - gtk_window_set_icon_name (GTK_WINDOW (window), icon_name); -- #if GTK_CHECK_VERSION (3, 4, 0) -- gtk_window_set_hide_titlebar_when_maximized (GTK_WINDOW (window), TRUE); -- #endif - gtk_widget_set_size_request (GTK_WIDGET (inspector_view), 700, 100); - #if GTK_CHECK_VERSION (3, 0, 0) - scrolled = gtk_scrolled_window_new (NULL, NULL); - ---- a/midori/midori-window.vala 2015-08-16 00:14:26 +0000 -+++ b/midori/midori-window.vala 2015-09-25 21:30:31 +0000 -@@ -28,7 +28,6 @@ - toolbar.show_arrow = true; - #if HAVE_GTK3 - toolbar.get_style_context ().add_class ("primary-toolbar"); -- hide_titlebar_when_maximized = true; - #endif - toolbar.popup_context_menu.connect ((x, y, button) => { - return button == 3 && context_menu (toolbar); }); - diff --git a/package.bak/midori/0002-gcr-for-x11-only.patch b/package.bak/midori/0002-gcr-for-x11-only.patch deleted file mode 100644 index 85e769765f..0000000000 --- a/package.bak/midori/0002-gcr-for-x11-only.patch +++ /dev/null @@ -1,32 +0,0 @@ -GCR support only works/is useful with X11 support. - -Reported upstream: https://bugs.launchpad.net/midori/+bug/1515985 - -Signed-off-by: Gustavo Zacarias - -diff -Nura midori-0.5.11.orig/CMakeLists.txt midori-0.5.11/CMakeLists.txt ---- midori-0.5.11.orig/CMakeLists.txt 2015-11-12 13:41:02.045898814 -0300 -+++ midori-0.5.11/CMakeLists.txt 2015-11-12 14:00:09.765545018 -0300 -@@ -175,18 +175,14 @@ - set(PKGS ${PKGS} zeitgeist-2.0) - endif() - --if (WIN32) -- add_definitions("-DGCR_VERSION=\"No\"") --else () -- if (USE_GTK3) -- pkg_check_modules(GCR REQUIRED gcr-3>=2.32) -- else () -- pkg_check_modules(GCR REQUIRED gcr-base-3>=2.32) -- endif () -+if (USE_GTK3 AND X11) -+ pkg_check_modules(GCR REQUIRED gcr-3>=2.32) - add_definitions("-DGCR_VERSION=\"${GCR_VERSION}\"") - add_definitions("-DHAVE_GCR") - set(OPTS_INCLUDE_DIRS ${OPTS_INCLUDE_DIRS} ${GCR_INCLUDE_DIRS}) - set(OPTS_LIBRARIES ${OPTS_LIBRARIES} ${GCR_LIBRARIES}) -+else () -+ add_definitions("-DGCR_VERSION=\"No\"") - endif () - - if (HALF_BRO_INCOM_WEBKIT2) diff --git a/package.bak/midori/Config.in b/package.bak/midori/Config.in deleted file mode 100644 index 0d7672c134..0000000000 --- a/package.bak/midori/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -comment "midori needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_PACKAGE_LIBGTK3 \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 || !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_MIDORI - bool "midori" - # GCR can only be used with the X11 backend - select BR2_PACKAGE_GCR if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_GRANITE - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBSOUP_GNOME - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_WEBKITGTK - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, gcr, gnupg2 - depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_INSTALL_LIBSTDCPP # webkitgtk - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # webkitgtk - depends on BR2_TOOLCHAIN_USES_GLIBC # webkitgtk - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - help - Midori is a lightweight web browser based on WebKit - - http://www.midori-browser.org/ diff --git a/package.bak/midori/midori.hash b/package.bak/midori/midori.hash deleted file mode 100644 index f548c427fb..0000000000 --- a/package.bak/midori/midori.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From download link @ http://midori-browser.org/download/source/ -sha1 64c86935028feb5f89d799c2acacaad67764da6f midori_0.5.11_all_.tar.bz2 diff --git a/package.bak/midori/midori.mk b/package.bak/midori/midori.mk deleted file mode 100644 index 5aa83c6fcf..0000000000 --- a/package.bak/midori/midori.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# midori -# -################################################################################ - -MIDORI_VERSION = 0.5.11 -MIDORI_SOURCE = midori_$(MIDORI_VERSION)_all_.tar.bz2 -MIDORI_SITE = http://midori-browser.org/downloads -MIDORI_LICENSE = LGPLv2.1+ -MIDORI_LICENSE_FILES = COPYING -MIDORI_DEPENDENCIES = \ - host-intltool \ - host-librsvg \ - host-pkgconf \ - host-vala \ - host-python \ - $(if $(BR2_PACKAGE_LIBGTK3_X11),gcr) \ - granite \ - libgtk3 \ - libsoup \ - libxml2 \ - sqlite \ - webkitgtk \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -MIDORI_CONF_OPTS = \ - -DHALF_BRO_INCOM_WEBKIT2=ON \ - -DUSE_GRANITE=ON \ - -DUSE_GTK3=ON \ - -DUSE_ZEITGEIST=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/mii-diag/0001-strchr.patch b/package.bak/mii-diag/0001-strchr.patch deleted file mode 100644 index fcfeb3c73e..0000000000 --- a/package.bak/mii-diag/0001-strchr.patch +++ /dev/null @@ -1,23 +0,0 @@ -Use the strrchr() function instead of the deprecated rindex() -function. - ---- mii-diag-2.11.orig/mii-diag.c.orig 2008-06-25 11:08:52.000000000 +1000 -+++ mii-diag-2.11.orig/mii-diag.c 2005-03-27 03:56:33.000000000 +1000 -@@ -174,7 +174,7 @@ - { - int c, errflag = 0; - char **spp, *ifname; -- char *progname = rindex(argv[0], '/') ? rindex(argv[0], '/')+1 : argv[0]; -+ char *progname = strrchr(argv[0], '/') ? strrchr(argv[0], '/')+1 : argv[0]; - - while ((c = getopt_long(argc, argv, shortopts, longopts, 0)) != EOF) - switch (c) { -@@ -310,7 +310,7 @@ - str = endstr+1; - else { - fprintf(stderr, "Invalid driver parameter '%s'.\n", str); -- str = index(str, ','); -+ str = strchr(str, ','); - } - } else if (endstr[0] == ',') { - data32[i] = newval; diff --git a/package.bak/mii-diag/Config.in b/package.bak/mii-diag/Config.in deleted file mode 100644 index ca48ba216f..0000000000 --- a/package.bak/mii-diag/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_MII_DIAG - bool "mii-diag" - help - mii-diag allows you to manipulate the MII registers of - network cards. diff --git a/package.bak/mii-diag/mii-diag.hash b/package.bak/mii-diag/mii-diag.hash deleted file mode 100644 index 22c69e3e57..0000000000 --- a/package.bak/mii-diag/mii-diag.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag/mii-diag_2.11-3.dsc -sha256 c690e87e6010607593c1cc2ccd5c481eb3be179387220ad445d8ab83d73ad41c mii-diag_2.11.orig.tar.gz -sha256 b49fd3e7c0c446a949c3ca246cc441824d7ef5a61530f884756a82b0b2997190 mii-diag_2.11-3.diff.gz diff --git a/package.bak/mii-diag/mii-diag.mk b/package.bak/mii-diag/mii-diag.mk deleted file mode 100644 index 6efd5be80d..0000000000 --- a/package.bak/mii-diag/mii-diag.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# mii-diag -# -################################################################################ - -MII_DIAG_VERSION = 2.11 -MII_DIAG_SOURCE = mii-diag_$(MII_DIAG_VERSION).orig.tar.gz -MII_DIAG_PATCH = mii-diag_$(MII_DIAG_VERSION)-3.diff.gz -MII_DIAG_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/m/mii-diag -MII_DIAG_LICENSE = GPL # No version specified -MII_DIAG_LICENSE_FILES = mii-diag.c - -MII_DIAG_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) - -define MII_DIAG_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ - fi -endef - -MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES - -define MII_DIAG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(MII_DIAG_MAKE_OPTS) -C $(@D) mii-diag -endef - -define MII_DIAG_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-mii-diag -endef - -$(eval $(generic-package)) diff --git a/package.bak/mimic/Config.in b/package.bak/mimic/Config.in deleted file mode 100644 index 79641d3790..0000000000 --- a/package.bak/mimic/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -comment "mimic needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_MIMIC - bool "mimic" - depends on BR2_USE_WCHAR - help - Mimic is a fast, lightweight Text-to-speech engine developed - by Mycroft A.I. and VocaliD, based on Carnegie Mellon - University's Flite (Festival-Lite) software. Mimic takes in - text and reads it out loud to create a high quality voice. - - https://github.com/MycroftAI/mimic - -if BR2_PACKAGE_MIMIC - -choice - prompt "audio backend" - default BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE - bool "none" - help - With no backend, mimic will only be able to produce .wav - files. - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA - bool "alsa" - depends on BR2_PACKAGE_ALSA_LIB - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO - bool "alsa via portaudio" - depends on BR2_PACKAGE_PORTAUDIO - -config BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO - bool "pulseaudio" - depends on BR2_PACKAGE_PULSEAUDIO - -endchoice - -endif # BR2_PACKAGE_MIMIC diff --git a/package.bak/mimic/mimic.hash b/package.bak/mimic/mimic.hash deleted file mode 100644 index 39d016548a..0000000000 --- a/package.bak/mimic/mimic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 725003c9972d5b67c49d5ea6a89cb26b63414ff2c7adbbaf9200cf9eb55f80eb mimic-1.1.0.tar.gz diff --git a/package.bak/mimic/mimic.mk b/package.bak/mimic/mimic.mk deleted file mode 100644 index 2d246561c9..0000000000 --- a/package.bak/mimic/mimic.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# mimic -# -################################################################################ - -MIMIC_VERSION = 1.1.0 -MIMIC_SITE = $(call github,MycroftAI,mimic,$(MIMIC_VERSION)) -MIMIC_LICENSE = MIT -MIMIC_LICENSE_FILES = COPYING - -MIMIC_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_ALSA),y) -MIMIC_AUDIO_BACKEND = alsa -MIMIC_DEPENDENCIES += alsa-lib -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PORTAUDIO),y) -MIMIC_AUDIO_BACKEND = portaudio -MIMIC_DEPENDENCIES += portaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_PULSEAUDIO),y) -MIMIC_AUDIO_BACKEND = pulseaudio -MIMIC_DEPENDENCIES += pulseaudio -else ifeq ($(BR2_PACKAGE_MIMIC_AUDIO_BACKEND_NONE),y) -MIMIC_AUDIO_BACKEND = none -endif - -MIMIC_CONF_OPTS += --with-audio=$(MIMIC_AUDIO_BACKEND) - -$(eval $(autotools-package)) diff --git a/package.bak/minicom/0001-musl-libc-compile-fix.patch b/package.bak/minicom/0001-musl-libc-compile-fix.patch deleted file mode 100644 index 94c0da06a5..0000000000 --- a/package.bak/minicom/0001-musl-libc-compile-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -# HG changeset patch -# User Adam Lackorzynski -# Date 1432407431 -7200 -# Sat May 23 20:57:11 2015 +0200 -# Node ID 8bf81e6a8e60e37c2dec9577a1be6357b8d56165 -# Parent 8c784c80c17aa7a346d982db23bca5df67302cda -musl-libc compile fix - -By Felix Janda : -VC_MUSIC is enabled by default on linux and in dial.c the -necessary header are only included for glibc. (The wrong conditional -include has likely been introduced by the 2003-03-30 GNU/Hurd patch.) - -Signed-off-by: Bernd Kuhls -[Taken from upstream Mercurial commit 8bf81e6a8e60] - -diff -r 8c784c80c17a -r 8bf81e6a8e60 src/dial.c ---- a/src/dial.c Sat May 23 20:56:29 2015 +0200 -+++ b/src/dial.c Sat May 23 20:57:11 2015 +0200 -@@ -39,7 +39,7 @@ - #include "intl.h" - - #ifdef VC_MUSIC --# if defined(__GLIBC__) -+# if defined(__linux__) || defined(__GLIBC__) - # include - # include - # include diff --git a/package.bak/minicom/0002-change-maxnamlen-to-posixs-name-max.patch b/package.bak/minicom/0002-change-maxnamlen-to-posixs-name-max.patch deleted file mode 100644 index 83e1530600..0000000000 --- a/package.bak/minicom/0002-change-maxnamlen-to-posixs-name-max.patch +++ /dev/null @@ -1,51 +0,0 @@ -# HG changeset patch -# User Adam Lackorzynski -# Date 1432407475 -7200 -# Sat May 23 20:57:55 2015 +0200 -# Node ID 93e5dd955c8bd944fd64bb04fd117c963c3758bc -# Parent 8bf81e6a8e60e37c2dec9577a1be6357b8d56165 -Change MAXNAMLEN to POSIX's NAME_MAX - -By Felix Janda : -MAXNAMLEN is usually defined in but it is -better to use the equivalent POSIX NAME_MAX. - -Signed-off-by: Bernd Kuhls -[Taken from upstream Mercurial commit 93e5dd955c8b] - -diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.c ---- a/src/getsdir.c Sat May 23 20:57:11 2015 +0200 -+++ b/src/getsdir.c Sat May 23 20:57:55 2015 +0200 -@@ -145,7 +145,7 @@ - * - * The data will be in the form: - * typedef struct dirEntry { -- * char fname[MAXNAMLEN + 1]; -+ * char fname[NAME_MAX + 1]; - * time_t time; - * mode_t mode; - * } GETSDIR_ENTRY; -@@ -232,7 +232,7 @@ - } - - /* copy the filename */ -- strncpy((*datptr)[cnt].fname, dp->d_name, MAXNAMLEN); -+ strncpy((*datptr)[cnt].fname, dp->d_name, NAME_MAX); - - /* get information about the directory entry */ - snprintf(fpath, sizeof(fpath), "%s/%s", dirpath, dp->d_name); -diff -r 8bf81e6a8e60 -r 93e5dd955c8b src/getsdir.h ---- a/src/getsdir.h Sat May 23 20:57:11 2015 +0200 -+++ b/src/getsdir.h Sat May 23 20:57:55 2015 +0200 -@@ -23,9 +23,10 @@ - */ - - #include -+#include - - typedef struct dirEntry { /* structure of data item */ -- char fname[MAXNAMLEN + 1]; /* filename + terminating null */ -+ char fname[NAME_MAX + 1]; /* filename + terminating null */ - time_t time; /* last modification date */ - mode_t mode; /* file mode (dir? etc.) */ - ushort cflags; /* caller field for convenience */ diff --git a/package.bak/minicom/Config.in b/package.bak/minicom/Config.in deleted file mode 100644 index c41c188570..0000000000 --- a/package.bak/minicom/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_MINICOM - bool "minicom" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_NCURSES - help - Minicom is a menu driven communications program. It emulates - ANSI and VT102 terminals. It has a dialing directory and auto - zmodem download. - - http://alioth.debian.org/projects/minicom/ - -comment "minicom needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/minicom/minicom.hash b/package.bak/minicom/minicom.hash deleted file mode 100644 index 33ba4ef10c..0000000000 --- a/package.bak/minicom/minicom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9ac3a663b82f4f5df64114b4792b9926b536c85f59de0f2d2b321c7626a904f4 minicom-2.7.tar.gz diff --git a/package.bak/minicom/minicom.mk b/package.bak/minicom/minicom.mk deleted file mode 100644 index 94a4628659..0000000000 --- a/package.bak/minicom/minicom.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# minicom -# -################################################################################ - -MINICOM_VERSION = 2.7 -MINICOM_SITE = https://alioth.debian.org/frs/download.php/file/3977 -MINICOM_LICENSE = GPLv2+ -MINICOM_LICENSE_FILES = COPYING - -# pkg-config is only used to check for liblockdev, which we don't have -# in BR, so instead of adding host-pkgconf as a dependency, simply make -# sure the host version isn't used so we don't end up with problems if -# people have liblockdev1-dev installed -MINICOM_CONF_ENV = PKG_CONFIG=/bin/false - -MINICOM_DEPENDENCIES = ncurses $(if $(BR2_ENABLE_LOCALE),,libiconv) - -$(eval $(autotools-package)) diff --git a/package.bak/minidlna/Config.in b/package.bak/minidlna/Config.in deleted file mode 100644 index c900143f75..0000000000 --- a/package.bak/minidlna/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_MINIDLNA - bool "minidlna" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR # flac - depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FLAC - select BR2_PACKAGE_LIBVORBIS # selects libogg - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBID3TAG # selects zlib - select BR2_PACKAGE_LIBEXIF - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - MiniDLNA (aka ReadyDLNA) is server software with the aim of being - fully compliant with DLNA/UPnP-AV clients. - - http://minidlna.sourceforge.net/ - -comment "minidlna needs a toolchain w/ dynamic library, threads, wchar" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS diff --git a/package.bak/minidlna/S60minidlnad b/package.bak/minidlna/S60minidlnad deleted file mode 100644 index 9b158afd98..0000000000 --- a/package.bak/minidlna/S60minidlnad +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# minidlnad Starts minidlnad. -# - -start() { - printf "Starting minidlna: " - umask 077 - start-stop-daemon -S -q -p /var/run/minidlna/minidlna.pid \ - --exec /usr/sbin/minidlnad -- "$@" - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping minidlna: " - start-stop-daemon -K -q -p /var/run/minidlna/minidlna.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - # Sleep needed for minidlna to restart properly - sleep 1 - start "$@" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - force-reload) - restart -R - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" - exit 1 -esac - -exit $? diff --git a/package.bak/minidlna/minidlna.hash b/package.bak/minidlna/minidlna.hash deleted file mode 100644 index d1ed4b9184..0000000000 --- a/package.bak/minidlna/minidlna.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/minidlna/files/minidlna/1.1.5/ -md5 1970e553a1eb8a3e7e302e2ce292cbc4 minidlna-1.1.5.tar.gz -sha1 8185337621f5f9111118d8a4bca1e8cfcdd19505 minidlna-1.1.5.tar.gz diff --git a/package.bak/minidlna/minidlna.mk b/package.bak/minidlna/minidlna.mk deleted file mode 100644 index 0e765e80f7..0000000000 --- a/package.bak/minidlna/minidlna.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# minidlna -# -################################################################################ - -MINIDLNA_VERSION = 1.1.5 -MINIDLNA_SITE = http://downloads.sourceforge.net/project/minidlna/minidlna/$(MINIDLNA_VERSION) -MINIDLNA_LICENSE = GPLv2, BSD-3c -MINIDLNA_LICENSE_FILES = COPYING LICENCE.miniupnpd - -MINIDLNA_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) host-gettext \ - ffmpeg flac libvorbis libogg libid3tag libexif jpeg sqlite \ - host-xutil_makedepend - -MINIDLNA_CONF_OPTS = \ - --disable-static - -define MINIDLNA_INSTALL_CONF - $(INSTALL) -D -m 644 $(@D)/minidlna.conf $(TARGET_DIR)/etc/minidlna.conf -endef - -MINIDLNA_POST_INSTALL_TARGET_HOOKS += MINIDLNA_INSTALL_CONF - -define MINIDLNA_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/minidlna/S60minidlnad \ - $(TARGET_DIR)/etc/init.d/S60minidlnad -endef - -define MINIDLNA_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0755 package/minidlna/minidlnad.service \ - $(TARGET_DIR)/usr/lib/systemd/system/minidlnad.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/minidlnad.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minidlnad.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/minidlna/minidlnad.service b/package.bak/minidlna/minidlnad.service deleted file mode 100644 index f69476b303..0000000000 --- a/package.bak/minidlna/minidlnad.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=minidlna server -After=network.target - -[Service] -Type=forking -ExecStart=/usr/sbin/minidlnad -PIDFile=/var/run/minidlna/minidlna.pid - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/minissdpd/Config.in b/package.bak/minissdpd/Config.in deleted file mode 100644 index 226cff0aa4..0000000000 --- a/package.bak/minissdpd/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_MINISSDPD - bool "minissdpd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBNFNETLINK - help - SSDP managing daemon. Designed to work with miniupnpc, - miniupnpd, minidlna, etc. - - http://miniupnp.free.fr/ diff --git a/package.bak/minissdpd/S50minissdpd b/package.bak/minissdpd/S50minissdpd deleted file mode 100644 index 6235e06b8a..0000000000 --- a/package.bak/minissdpd/S50minissdpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -NAME=minissdpd -PIDFILE=/var/run/$NAME.pid -DAEMON=/usr/sbin/$NAME -CFGFILE=/etc/default/$NAME - -IFACE=eth0 - -# Read configuration variable file if it is present -if [ -f $CFGFILE ]; then - . $CFGFILE -fi - -DAEMON_ARGS="-i $IFACE" - -start() { - printf "Starting $NAME: " - start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/minissdpd/minissdpd.hash b/package.bak/minissdpd/minissdpd.hash deleted file mode 100644 index 8d670f3e86..0000000000 --- a/package.bak/minissdpd/minissdpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 dfd637b185731e1acb412a86faa9718eb93c04ca08280541a6d22d14d1fb890f minissdpd-1.5.tar.gz diff --git a/package.bak/minissdpd/minissdpd.mk b/package.bak/minissdpd/minissdpd.mk deleted file mode 100644 index 5c8bd371cb..0000000000 --- a/package.bak/minissdpd/minissdpd.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# minissdpd -# -################################################################################ - -MINISSDPD_VERSION = 1.5 -MINISSDPD_SITE = http://miniupnp.free.fr/files -MINISSDPD_LICENSE = BSD-3c -MINISSDPD_LICENSE_FILES = LICENSE -MINISSDPD_DEPENDENCIES = libnfnetlink - -define MINISSDPD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" \ - -C $(@D) -endef - -define MINISSDPD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - PREFIX=$(TARGET_DIR) install -endef - -# Use dedicated init scripts for systemV and systemd instead of using -# minissdpd.init.d.script as it is not compatible with buildroot init system -define MINISSDPD_INSTALL_INIT_SYSV - $(RM) $(TARGET_DIR)/etc/init.d/minissdpd - $(INSTALL) -D -m 0755 package/minissdpd/S50minissdpd \ - $(TARGET_DIR)/etc/init.d/S50minissdpd -endef - -define MINISSDPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/minissdpd/minissdpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/minissdpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/minissdpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/minissdpd.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/minissdpd/minissdpd.service b/package.bak/minissdpd/minissdpd.service deleted file mode 100644 index 59ed9c8667..0000000000 --- a/package.bak/minissdpd/minissdpd.service +++ /dev/null @@ -1,12 +0,0 @@ -[Unit] -Description=SSDP managing daemon -After=network.target - -[Service] -Environment="IFACE=eth0" -EnvironmentFile=/etc/default/minissdpd -ExecStart=/usr/sbin/minissdpd -i $IFACE -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/minizip/Config.in b/package.bak/minizip/Config.in deleted file mode 100644 index 7205e0007e..0000000000 --- a/package.bak/minizip/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MINIZIP - bool "minizip" - select BR2_PACKAGE_ZLIB - help - Enables to extract files from a .zip archive file. - It is compatible with PKZip 2.04g, WinZip, InfoZip, - MimarSinan Codex Suite 2002 tools, and compatible sofware. - - https://github.com/nmoinvaz/minizip - -config BR2_PACKAGE_MINIZIP_DEMOS - bool "miniunzip/minizip" - depends on BR2_PACKAGE_MINIZIP - help - Enable miniunzip/minizip binary tools. diff --git a/package.bak/minizip/minizip.hash b/package.bak/minizip/minizip.hash deleted file mode 100644 index 994ed60a5b..0000000000 --- a/package.bak/minizip/minizip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ac361f40531d9fb7222d4befd10d160c647d5e85138f6bc9eda080ed8f937fb8 minizip-5f56dd81d94bd7028f7dc05d7d14112697c30241.tar.gz diff --git a/package.bak/minizip/minizip.mk b/package.bak/minizip/minizip.mk deleted file mode 100644 index 3d61288681..0000000000 --- a/package.bak/minizip/minizip.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# minizip -# -################################################################################ - -MINIZIP_VERSION = 5f56dd81d94bd7028f7dc05d7d14112697c30241 -MINIZIP_SITE = $(call github,nmoinvaz,minizip,$(MINIZIP_VERSION)) -MINIZIP_DEPENDENCIES = zlib -MINIZIP_AUTORECONF = YES -MINIZIP_INSTALL_STAGING = YES -MINIZIP_CONF_OPTS = $(if $(BR2_PACKAGE_MINIZIP_DEMOS),--enable-demos) -MINIZIP_LICENSE = zlib license -MINIZIP_LICENSE_FILES = LICENSE - -$(eval $(autotools-package)) diff --git a/package.bak/miraclecast/Config.in b/package.bak/miraclecast/Config.in deleted file mode 100644 index 4c6a8aaa07..0000000000 --- a/package.bak/miraclecast/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_MIRACLECAST - bool "miraclecast" - depends on BR2_PACKAGE_SYSTEMD - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_SYSTEMD_KDBUS - help - The MiracleCast project provides software to connect external - monitors to your system via Wifi. It is compatible to the - Wifi-Display specification also known as Miracast. MiracleCast - implements the Display-Source as well as Display-Sink side. - - https://github.com/albfan/miraclecast - -comment "miraclecast needs systemd and a glibc toolchain w/ threads and wchar" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_SYSTEMD diff --git a/package.bak/miraclecast/miraclecast.hash b/package.bak/miraclecast/miraclecast.hash deleted file mode 100644 index 97c68d019d..0000000000 --- a/package.bak/miraclecast/miraclecast.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e11440f782519663db367285dd54b53eb5feb78682dac42bd90230222de9f0fd miraclecast-c94be167c85c6ec8badd7ac79e3dea2e0b73225c.tar.gz diff --git a/package.bak/miraclecast/miraclecast.mk b/package.bak/miraclecast/miraclecast.mk deleted file mode 100644 index 17e73f1e3e..0000000000 --- a/package.bak/miraclecast/miraclecast.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# miraclecast -# -################################################################################ - -MIRACLECAST_VERSION = c94be167c85c6ec8badd7ac79e3dea2e0b73225c -MIRACLECAST_SITE = $(call github,albfan,miraclecast,$(MIRACLECAST_VERSION)) -MIRACLECAST_LICENSE = LGPLv2.1+, GPLv2 (gdhcp) -MIRACLECAST_LICENSE_FILES = COPYING LICENSE_gdhcp LICENSE_htable LICENSE_lgpl -MIRACLECAST_DEPENDENCIES = host-pkgconf systemd gstreamer1 \ - readline libglib2 -# Straight out the repository, no ./configure -MIRACLECAST_AUTORECONF = YES - -define MIRACLECAST_INSTALL_DBUS_POLICY - $(INSTALL) -m 0644 -D \ - $(@D)/res/org.freedesktop.miracle.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/org.freedesktop.miracle.conf -endef -MIRACLECAST_POST_INSTALL_TARGET_HOOKS += MIRACLECAST_INSTALL_DBUS_POLICY - -$(eval $(autotools-package)) diff --git a/package.bak/mjpegtools/Config.in b/package.bak/mjpegtools/Config.in deleted file mode 100644 index 6a36109da2..0000000000 --- a/package.bak/mjpegtools/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_MJPEGTOOLS - bool "mjpegtools" - select BR2_PACKAGE_JPEG - depends on BR2_USE_MMU # fork - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The mjpegtools programs are a set of tools - that can do recording of videos and playback, - simple cut-and-paste editing and the MPEG - compression of audio and video under Linux. - - http://mjpeg.sourceforge.net - -comment "mjpegtools needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mjpegtools/mjpegtools.hash b/package.bak/mjpegtools/mjpegtools.hash deleted file mode 100644 index db184f784d..0000000000 --- a/package.bak/mjpegtools/mjpegtools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/mjpeg/files/mjpegtools/2.1.0/ -md5 57bf5dd78976ca9bac972a6511b236f3 mjpegtools-2.1.0.tar.gz -sha1 b9effa86280e23d67369e842e5cb645948583097 mjpegtools-2.1.0.tar.gz diff --git a/package.bak/mjpegtools/mjpegtools.mk b/package.bak/mjpegtools/mjpegtools.mk deleted file mode 100644 index 76ae968d99..0000000000 --- a/package.bak/mjpegtools/mjpegtools.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# mjpegtools -# -################################################################################ - -MJPEGTOOLS_VERSION = 2.1.0 -MJPEGTOOLS_SITE = http://sourceforge.net/projects/mjpeg/files/mjpegtools/$(MJPEGTOOLS_VERSION) -MJPEGTOOLS_DEPENDENCIES = host-pkgconf jpeg -MJPEGTOOLS_LICENSE = GPLv2+ -MJPEGTOOLS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -MJPEGTOOLS_CONF_OPTS += --with-libpng -MJPEGTOOLS_DEPENDENCIES += libpng -else -MJPEGTOOLS_CONF_OPTS += --without-libpng -endif - -# expects X11 backend in sdl -ifeq ($(BR2_PACKAGE_SDL_X11),y) -MJPEGTOOLS_CONF_OPTS += --with-libsdl -MJPEGTOOLS_DEPENDENCIES += sdl -else -MJPEGTOOLS_CONF_OPTS += --without-libsdl -endif - -ifeq ($(BR2_PACKAGE_SDL_GFX),y) -MJPEGTOOLS_CONF_OPTS += --with-sdlgfx -MJPEGTOOLS_DEPENDENCIES += sdl_gfx -else -MJPEGTOOLS_CONF_OPTS += --without-sdlgfx -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -MJPEGTOOLS_CONF_OPTS += --with-x -MJPEGTOOLS_DEPENDENCIES += xlib_libX11 -else -MJPEGTOOLS_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86DGA),y) -MJPEGTOOLS_CONF_OPTS += --with-dga -MJPEGTOOLS_DEPENDENCIES += xlib_libXxf86dga -else -MJPEGTOOLS_CONF_OPTS += --without-dga -endif - -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -MJPEGTOOLS_CONF_OPTS += --with-gtk -MJPEGTOOLS_DEPENDENCIES += libgtk2 -else -MJPEGTOOLS_CONF_OPTS += --without-gtk -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mjpg-streamer/0001-musl-pthread.patch b/package.bak/mjpg-streamer/0001-musl-pthread.patch deleted file mode 100644 index 9e76e760d8..0000000000 --- a/package.bak/mjpg-streamer/0001-musl-pthread.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix musl build - -Patch written by Thomas Petazzoni: -http://patchwork.ozlabs.org/patch/572309/ - -Signed-off-by: Bernd Kuhls - -diff -uNr mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h ---- mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.org/plugins/input.h 2015-11-09 15:56:47.000000000 +0100 -+++ mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b/plugins/input.h 2016-01-26 20:19:05.884349502 +0100 -@@ -20,6 +20,7 @@ - # # - *******************************************************************************/ - -+#include - #include - #include "../mjpg_streamer.h" - #define INPUT_PLUGIN_PREFIX " i: " diff --git a/package.bak/mjpg-streamer/Config.in b/package.bak/mjpg-streamer/Config.in deleted file mode 100644 index f42c2a50db..0000000000 --- a/package.bak/mjpg-streamer/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_MJPG_STREAMER - bool "mjpg-streamer" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # linux/uvcvideo.h - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # plugins need dlopen() - select BR2_PACKAGE_JPEG - help - MJPG-streamer takes JPGs from Linux-UVC compatible webcams, - filesystem or other input plugins and streams them as - M-JPEG via HTTP to webbrowsers, VLC and other software. - - http://mjpg-streamer.sourceforge.net - -comment "mjpg-streamer needs a toolchain w/ threads, headers >= 3.0, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS diff --git a/package.bak/mjpg-streamer/mjpg-streamer.hash b/package.bak/mjpg-streamer/mjpg-streamer.hash deleted file mode 100644 index 8bbac29e33..0000000000 --- a/package.bak/mjpg-streamer/mjpg-streamer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 756a60cbc3404ac21109bb66091774ac8e1d64ebf60e2bf2c0d08a06d1abb9be mjpg-streamer-bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b.tar.gz diff --git a/package.bak/mjpg-streamer/mjpg-streamer.mk b/package.bak/mjpg-streamer/mjpg-streamer.mk deleted file mode 100644 index a710af6fc7..0000000000 --- a/package.bak/mjpg-streamer/mjpg-streamer.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# mjpg-streamer -# -################################################################################ - -# Original source is located at -# http://sourceforge.net/p/mjpg-streamer/code/commit_browser -# oliv3r forked the repo to add support for 3.16 and 3.17 kernels: -# http://sourceforge.net/p/mjpg-streamer/patches/14/ -MJPG_STREAMER_VERSION = bbf32fddfd02a9e072e89e83a5b33e6ca0a7bd4b -MJPG_STREAMER_SITE = $(call github,oliv3r,mjpg-streamer,$(MJPG_STREAMER_VERSION)) -MJPG_STREAMER_LICENSE = GPLv2+ -MJPG_STREAMER_LICENSE_FILES = LICENSE -MJPG_STREAMER_DEPENDENCIES = jpeg - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -MJPG_STREAMER_DEPENDENCIES += libv4l -MJPG_STREAMER_USE_LIBV4L += USE_LIBV4L2=true -endif - -define MJPG_STREAMER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" -C $(@D) $(MJPG_STREAMER_USE_LIBV4L) -endef - -define MJPG_STREAMER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/mke2img/Config.in.host b/package.bak/mke2img/Config.in.host deleted file mode 100644 index b5bcb8455f..0000000000 --- a/package.bak/mke2img/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_MKE2IMG - bool "host mke2img" - select BR2_PACKAGE_HOST_E2FSPROGS - select BR2_PACKAGE_HOST_GENEXT2FS - help - Easily create filesystems of the extend familly: ext2/3/4. - - This tool is bundled by, and specific to Buildroot. However, it can - be used from post-images scripts is needed. - - https://code.google.com/p/mke2img/ diff --git a/package.bak/mke2img/mke2img b/package.bak/mke2img/mke2img deleted file mode 100755 index c2e0d02b73..0000000000 --- a/package.bak/mke2img/mke2img +++ /dev/null @@ -1,214 +0,0 @@ -#!/usr/bin/env bash - -# Buildroot wrapper to the collection of ext2/3/4 filesystem tools: -# - genext2fs, to generate ext2 filesystem images -# - tune2fs, to modify an ext2/3/4 filesystem (possibly in an image file) -# - e2fsck, to check and fix an ext2/3/4 filesystem (possibly in an image file) - -set -e - -main() { - local OPT OPTARG - local nb_blocks nb_inodes nb_res_blocks root_dir image gen rev label uuid - local -a genext2fs_opts - local -a tune2fs_opts - local tune2fs_O_opts - - # Default values - gen=2 - rev=1 - nb_extra_blocks=0 - nb_extra_inodes=0 - - while getopts :hb:B:i:I:r:d:o:G:R:l:u: OPT; do - case "${OPT}" in - h) help; exit 0;; - b) nb_blocks=${OPTARG};; - B) nb_extra_blocks=${OPTARG};; - i) nb_inodes=${OPTARG};; - I) nb_extra_inodes=${OPTARG};; - r) nb_res_blocks=${OPTARG};; - d) root_dir="${OPTARG}";; - o) image="${OPTARG}";; - G) gen=${OPTARG};; - R) rev=${OPTARG};; - l) label="${OPTARG}";; - u) uuid="${OPTARG}";; - :) error "option '%s' expects a mandatory argument\n" "${OPTARG}";; - \?) error "unknown option '%s'\n" "${OPTARG}";; - esac - done - - # Sanity checks - if [ -z "${root_dir}" ]; then - error "you must specify a root directory with '-d'\n" - fi - if [ -z "${image}" ]; then - error "you must specify an output image file with '-o'\n" - fi - case "${gen}:${rev}" in - 2:0|2:1|3:1|4:1) - ;; - 3:0|4:0) - error "revision 0 is invalid for ext3 and ext4\n" - ;; - *) error "unknown ext generation '%s' and/or revision '%s'\n" \ - "${gen}" "${rev}" - ;; - esac - - # calculate needed inodes - if [ -z "${nb_inodes}" ]; then - nb_inodes=$(find "${root_dir}" | wc -l) - nb_inodes=$((nb_inodes+400)) - fi - nb_inodes=$((nb_inodes+nb_extra_inodes)) - - # calculate needed blocks - if [ -z "${nb_blocks}" ]; then - # size ~= superblock, block+inode bitmaps, inodes (8 per block), - # blocks; we scale inodes / blocks with 10% to compensate for - # bitmaps size + slack - nb_blocks=$(du -s -k "${root_dir}" |sed -r -e 's/[[:space:]]+.*$//') - nb_blocks=$((500+(nb_blocks+nb_inodes/8)*11/10)) - if [ ${gen} -ge 3 ]; then - # we add 1300 blocks (a bit more than 1 MiB, assuming 1KiB blocks) - # for the journal - # Note: I came to 1300 blocks after trial-and-error checks. YMMV. - nb_blocks=$((nb_blocks+1300)) - fi - fi - nb_blocks=$((nb_blocks+nb_extra_blocks)) - - # Upgrade to rev1 if needed - if [ ${rev} -ge 1 ]; then - tune2fs_O_opts+=",filetype,sparse_super" - fi - - # Add a journal for ext3 and above - if [ ${gen} -ge 3 ]; then - tune2fs_opts+=( -j -J size=1 ) - fi - - # Add ext4 specific features - if [ ${gen} -ge 4 ]; then - tune2fs_O_opts+=",extents,uninit_bg,dir_index" - fi - - # Add our -O options (there will be at most one leading comma, remove it) - if [ -n "${tune2fs_O_opts}" ]; then - tune2fs_opts+=( -O "${tune2fs_O_opts#,}" ) - fi - - # Add the label if specified - if [ -n "${label}" ]; then - tune2fs_opts+=( -L "${label}" ) - fi - - # Generate the filesystem - genext2fs_opts=( -z -b ${nb_blocks} -N ${nb_inodes} -d "${root_dir}" ) - if [ -n "${nb_res_blocks}" ]; then - genext2fs_opts+=( -m ${nb_res_blocks} ) - fi - genext2fs "${genext2fs_opts[@]}" "${image}" - - # genext2fs does not generate a UUID, but fsck will whine if one - # is missing, so we need to add a UUID. - # Of course, this has to happen _before_ we run fsck. - # Also, some ext4 metadata are based on the UUID, so we must - # set it before we can convert the filesystem to ext4. - # If the user did not specify a UUID, we generate a random one. - # Although a random UUID may seem bad for reproducibility, there - # already are so many things that are not reproducible in a - # filesystem: file dates, file ordering, content of the files... - tune2fs -U "${uuid:-random}" "${image}" - - # Upgrade the filesystem - if [ ${#tune2fs_opts[@]} -ne 0 ]; then - tune2fs "${tune2fs_opts[@]}" "${image}" - fi - - # After changing filesystem options, running fsck is required - # (see: man tune2fs). Running e2fsck in other cases will ensure - # coherency of the filesystem, although it is not required. - # 'e2fsck -pDf' means: - # - automatically repair - # - optimise and check for duplicate entries - # - force checking - # Sending output to oblivion, as e2fsck can be *very* verbose, - # especially with filesystems generated by genext2fs. - # Exit codes 1 & 2 are OK, it means fs errors were successfully - # corrected, hence our little trick with $ret. - ret=0 - e2fsck -pDf "${image}" >/dev/null || ret=$? - case ${ret} in - 0|1|2) ;; - *) errorN ${ret} "failed to run e2fsck on '%s' (ext%d)\n" \ - "${image}" ${gen} - esac - printf "\n" - trace "e2fsck was successfully run on '%s' (ext%d)\n" "${image}" ${gen} - printf "\n" - - # Remove count- and time-based checks, they are not welcome - # on embedded devices, where they can cause serious boot-time - # issues by tremendously slowing down the boot. - tune2fs -c 0 -i 0 "${image}" -} - -help() { - cat <<_EOF_ -NAME - ${my_name} - Create an ext2/3/4 filesystem image - -SYNOPSIS - ${my_name} [OPTION]... - -DESCRIPTION - Create ext2/3/4 filesystem image from the content of a directory. - - -b BLOCKS - Create a filesystem of BLOCKS 1024-byte blocs. The default is to - compute the required number of blocks. - - -i INODES - Create a filesystem with INODES inodes. The default is to compute - the required number of inodes. - - -r RES_BLOCKS - Create a filesystem with RES_BLOCKS reserved blocks. The default - is to reserve 0 block. - - -d ROOT_DIR - Create a filesystem, using the content of ROOT_DIR as the content - of the root of the filesystem. Mandatory. - - -o FILE - Create the filesystem in FILE. Madatory. - - -G GEN -R REV - Create a filesystem of generation GEN (2, 3 or 4), and revision - REV (0 or 1). The default is to generate an ext2 revision 1 - filesystem; revision 0 is invalid for ext3 and ext4. - - -l LABEL - Create a filesystem with label LABEL. The default is to not set - a label. - - -u UUID - Create filesystem with uuid UUID. The default is to set a random - UUID. - - Exit status: - 0 if OK - !0 in case of error -_EOF_ -} - -trace() { local msg="${1}"; shift; printf "%s: ${msg}" "${my_name}" "${@}"; } -warn() { trace "${@}" >&2; } -errorN() { local ret="${1}"; shift; warn "${@}"; exit ${ret}; } -error() { errorN 1 "${@}"; } - -my_name="${0##*/}" -main "$@" diff --git a/package.bak/mke2img/mke2img.mk b/package.bak/mke2img/mke2img.mk deleted file mode 100644 index 9de387a3a3..0000000000 --- a/package.bak/mke2img/mke2img.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# mke2img -# -################################################################################ - -HOST_MKE2IMG_DEPENDENCIES = host-genext2fs host-e2fsprogs - -define HOST_MKE2IMG_INSTALL_CMDS - $(INSTALL) -D -m 0755 package/mke2img/mke2img $(HOST_DIR)/usr/bin/mke2img -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/mkpasswd/Config.in.host b/package.bak/mkpasswd/Config.in.host deleted file mode 100644 index 93774bdf60..0000000000 --- a/package.bak/mkpasswd/Config.in.host +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_HOST_MKPASSWD - bool "host mkpasswd" diff --git a/package.bak/mkpasswd/config.h b/package.bak/mkpasswd/config.h deleted file mode 100644 index f345074121..0000000000 --- a/package.bak/mkpasswd/config.h +++ /dev/null @@ -1,95 +0,0 @@ -/* Program version */ -#define VERSION "5.0.26" - -/* Configurable features */ - -/* Always hide legal disclaimers */ -#undef ALWAYS_HIDE_DISCL - -/* Default server */ -#define DEFAULTSERVER "whois.arin.net" - -/* Configuration file */ -/* -#define CONFIG_FILE "/etc/whois.conf" -*/ - - -/* autoconf in cpp macros */ -#ifdef linux -# define ENABLE_NLS -#endif - -#ifdef __FreeBSD__ -/* which versions? */ -# define HAVE_GETOPT_LONG -# define HAVE_GETADDRINFO -# define ENABLE_NLS -# ifndef LOCALEDIR -# define LOCALEDIR "/usr/local/share/locale" -# endif -#endif - -/* needs unistd.h */ -#if defined _POSIX_C_SOURCE && _POSIX_C_SOURCE >= 200112L -# define HAVE_GETADDRINFO -# define HAVE_REGEXEC -#endif - -#if defined __APPLE__ && defined __MACH__ -# define HAVE_GETOPT_LONG -# define HAVE_GETADDRINFO -#endif - -#if defined __GLIBC__ -# define HAVE_GETOPT_LONG -# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 -# define HAVE_GETADDRINFO -# endif -# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 7 -# define HAVE_SHA_CRYPT -# endif -#endif - -/* Unknown versions of Solaris */ -#if defined __SVR4 && defined __sun -# define HAVE_SHA_CRYPT -# define HAVE_SOLARIS_CRYPT_GENSALT -#endif - -/* FIXME: which systems lack this? */ -#define HAVE_GETTIMEOFDAY -/* FIXME: disabled because it does not parse addresses with a netmask length. - * The code using it needs to be either fixed or removed. -#define HAVE_INET_PTON -*/ - -/* - * Please send patches to correctly ignore old releases which lack a RNG - * and add more systems which have one. - */ -#ifdef RANDOM_DEVICE -#elif defined __GLIBC__ \ - || defined __FreeBSD__ || defined __NetBSD__ || defined __OpenBSD__ \ - /* AIX >= 5.2? */ \ - || defined _AIX52 \ - /* HP-UX >= B.11.11.09? */ \ - || defined __hpux \ - /* OS X: */ \ - || (defined __APPLE__ && defined __MACH__) \ - /* Solaris >= 9 (this is >= 7): */ \ - || (defined __SVR4 && defined __sun && defined SUSv2) \ - /* Tru64 UNIX >= 5.1B? */ \ - || defined __osf -# define RANDOM_DEVICE "/dev/urandom" -#endif - -#ifdef ENABLE_NLS -# ifndef NLS_CAT_NAME -# define NLS_CAT_NAME "whois" -# endif -# ifndef LOCALEDIR -# define LOCALEDIR "/usr/share/locale" -# endif -#endif - diff --git a/package.bak/mkpasswd/mkpasswd.c b/package.bak/mkpasswd/mkpasswd.c deleted file mode 100644 index 5820f32501..0000000000 --- a/package.bak/mkpasswd/mkpasswd.c +++ /dev/null @@ -1,456 +0,0 @@ -/* - * Copyright (C) 2001-2008 Marco d'Itri - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -/* for crypt, snprintf and strcasecmp */ -#define _XOPEN_SOURCE -#define _BSD_SOURCE - -/* System library */ -#include -#include -#include -#include "config.h" -#ifdef HAVE_GETOPT_LONG -#include -#endif -#include -#include -#include -#include -#ifdef HAVE_XCRYPT -#include -#include -#endif -#ifdef HAVE_LINUX_CRYPT_GENSALT -#define _OW_SOURCE -#include -#endif -#ifdef HAVE_GETTIMEOFDAY -#include -#endif - -/* Application-specific */ -#include "utils.h" - -/* Global variables */ -#ifdef HAVE_GETOPT_LONG -static const struct option longopts[] = { - {"method", optional_argument, NULL, 'm'}, - /* for backward compatibility with versions < 4.7.25 (< 20080321): */ - {"hash", optional_argument, NULL, 'H'}, - {"help", no_argument, NULL, 'h'}, - {"password-fd", required_argument, NULL, 'P'}, - {"stdin", no_argument, NULL, 's'}, - {"salt", required_argument, NULL, 'S'}, - {"rounds", required_argument, NULL, 'R'}, - {"version", no_argument, NULL, 'V'}, - {NULL, 0, NULL, 0 } -}; -#else -extern char *optarg; -extern int optind; -#endif - -static const char valid_salts[] = "abcdefghijklmnopqrstuvwxyz" -"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; - -struct crypt_method { - const char *method; /* short name used by the command line option */ - const char *prefix; /* salt prefix */ - const unsigned int minlen; /* minimum salt length */ - const unsigned int maxlen; /* maximum salt length */ - const unsigned int rounds; /* supports a variable number of rounds */ - const char *desc; /* long description for the methods list */ -}; - -static const struct crypt_method methods[] = { - /* method prefix minlen, maxlen rounds description */ - { "des", "", 2, 2, 0, - N_("standard 56 bit DES-based crypt(3)") }, - { "md5", "$1$", 8, 8, 0, "MD5" }, -#if defined OpenBSD || defined FreeBSD || (defined __SVR4 && defined __sun) - { "bf", "$2a$", 22, 22, 1, "Blowfish" }, -#endif -#if defined HAVE_LINUX_CRYPT_GENSALT - { "bf", "$2a$", 22, 22, 1, "Blowfish, system-specific on 8-bit chars" }, - /* algorithm 2y fixes CVE-2011-2483 */ - { "bfy", "$2y$", 22, 22, 1, "Blowfish, correct handling of 8-bit chars" }, -#endif -#if defined FreeBSD - { "nt", "$3$", 0, 0, 0, "NT-Hash" }, -#endif -#if defined HAVE_SHA_CRYPT - /* http://people.redhat.com/drepper/SHA-crypt.txt */ - { "sha-256", "$5$", 8, 16, 1, "SHA-256" }, - { "sha-512", "$6$", 8, 16, 1, "SHA-512" }, -#endif - /* http://www.crypticide.com/dropsafe/article/1389 */ - /* - * Actually the maximum salt length is arbitrary, but Solaris by default - * always uses 8 characters: - * http://cvs.opensolaris.org/source/xref/onnv/onnv-gate/ \ - * usr/src/lib/crypt_modules/sunmd5/sunmd5.c#crypt_gensalt_impl - */ -#if defined __SVR4 && defined __sun - { "sunmd5", "$md5$", 8, 8, 1, "SunMD5" }, -#endif - { NULL, NULL, 0, 0, 0, NULL } -}; - -void generate_salt(char *const buf, const unsigned int len); -void *get_random_bytes(const int len); -void display_help(int error); -void display_version(void); -void display_methods(void); - -int main(int argc, char *argv[]) -{ - int ch, i; - int password_fd = -1; - unsigned int salt_minlen = 0; - unsigned int salt_maxlen = 0; - unsigned int rounds_support = 0; - const char *salt_prefix = NULL; - const char *salt_arg = NULL; - unsigned int rounds = 0; - char *salt = NULL; - char rounds_str[30]; - char *password = NULL; - -#ifdef ENABLE_NLS - setlocale(LC_ALL, ""); - bindtextdomain(NLS_CAT_NAME, LOCALEDIR); - textdomain(NLS_CAT_NAME); -#endif - - /* prepend options from environment */ - argv = merge_args(getenv("MKPASSWD_OPTIONS"), argv, &argc); - - while ((ch = GETOPT_LONGISH(argc, argv, "hH:m:5P:R:sS:V", longopts, 0)) - > 0) { - switch (ch) { - case '5': - optarg = (char *) "md5"; - /* fall through */ - case 'm': - case 'H': - if (!optarg || strcaseeq("help", optarg)) { - display_methods(); - exit(0); - } - for (i = 0; methods[i].method != NULL; i++) - if (strcaseeq(methods[i].method, optarg)) { - salt_prefix = methods[i].prefix; - salt_minlen = methods[i].minlen; - salt_maxlen = methods[i].maxlen; - rounds_support = methods[i].rounds; - break; - } - if (!salt_prefix) { - fprintf(stderr, _("Invalid method '%s'.\n"), optarg); - exit(1); - } - break; - case 'P': - { - char *p; - password_fd = strtol(optarg, &p, 10); - if (p == NULL || *p != '\0' || password_fd < 0) { - fprintf(stderr, _("Invalid number '%s'.\n"), optarg); - exit(1); - } - } - break; - case 'R': - { - char *p; - rounds = strtol(optarg, &p, 10); - if (p == NULL || *p != '\0' || rounds < 0) { - fprintf(stderr, _("Invalid number '%s'.\n"), optarg); - exit(1); - } - } - break; - case 's': - password_fd = 0; - break; - case 'S': - salt_arg = optarg; - break; - case 'V': - display_version(); - exit(0); - case 'h': - display_help(EXIT_SUCCESS); - default: - fprintf(stderr, _("Try '%s --help' for more information.\n"), - argv[0]); - exit(1); - } - } - argc -= optind; - argv += optind; - - if (argc == 2 && !salt_arg) { - password = argv[0]; - salt_arg = argv[1]; - } else if (argc == 1) { - password = argv[0]; - } else if (argc == 0) { - } else { - display_help(EXIT_FAILURE); - } - - /* default: DES password */ - if (!salt_prefix) { - salt_minlen = methods[0].minlen; - salt_maxlen = methods[0].maxlen; - salt_prefix = methods[0].prefix; - } - - if (streq(salt_prefix, "$2a$") || streq(salt_prefix, "$2y$")) { - /* OpenBSD Blowfish and derivatives */ - if (rounds <= 5) - rounds = 5; - /* actually for 2a/2y it is the logarithm of the number of rounds */ - snprintf(rounds_str, sizeof(rounds_str), "%02u$", rounds); - } else if (rounds_support && rounds) - snprintf(rounds_str, sizeof(rounds_str), "rounds=%u$", rounds); - else - rounds_str[0] = '\0'; - - if (salt_arg) { - unsigned int c = strlen(salt_arg); - if (c < salt_minlen || c > salt_maxlen) { - if (salt_minlen == salt_maxlen) - fprintf(stderr, ngettext( - "Wrong salt length: %d byte when %d expected.\n", - "Wrong salt length: %d bytes when %d expected.\n", c), - c, salt_maxlen); - else - fprintf(stderr, ngettext( - "Wrong salt length: %d byte when %d <= n <= %d" - " expected.\n", - "Wrong salt length: %d bytes when %d <= n <= %d" - " expected.\n", c), - c, salt_minlen, salt_maxlen); - exit(1); - } - while (c-- > 0) { - if (strchr(valid_salts, salt_arg[c]) == NULL) { - fprintf(stderr, _("Illegal salt character '%c'.\n"), - salt_arg[c]); - exit(1); - } - } - - salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str) - + strlen(salt_arg) + 1)); - *salt = '\0'; - strcat(salt, salt_prefix); - strcat(salt, rounds_str); - strcat(salt, salt_arg); - } else { -#ifdef HAVE_SOLARIS_CRYPT_GENSALT -#error "This code path is untested on Solaris. Please send a patch." - salt = crypt_gensalt(salt_prefix, NULL); - if (!salt) - perror(stderr, "crypt_gensalt"); -#elif defined HAVE_LINUX_CRYPT_GENSALT - void *entropy = get_random_bytes(64); - - salt = crypt_gensalt(salt_prefix, rounds, entropy, 64); - if (!salt) { - fprintf(stderr, "crypt_gensalt failed.\n"); - exit(2); - } - free(entropy); -#else - unsigned int salt_len = salt_maxlen; - - if (salt_minlen != salt_maxlen) { /* salt length can vary */ - srand(time(NULL) + getpid()); - salt_len = rand() % (salt_maxlen - salt_minlen + 1) + salt_minlen; - } - - salt = NOFAIL(malloc(strlen(salt_prefix) + strlen(rounds_str) - + salt_len + 1)); - *salt = '\0'; - strcat(salt, salt_prefix); - strcat(salt, rounds_str); - generate_salt(salt + strlen(salt), salt_len); -#endif - } - - if (password) { - } else if (password_fd != -1) { - FILE *fp; - char *p; - - if (isatty(password_fd)) - fprintf(stderr, _("Password: ")); - password = NOFAIL(malloc(128)); - fp = fdopen(password_fd, "r"); - if (!fp) { - perror("fdopen"); - exit(2); - } - if (!fgets(password, 128, fp)) { - perror("fgets"); - exit(2); - } - - p = strpbrk(password, "\n\r"); - if (p) - *p = '\0'; - } else { - password = getpass(_("Password: ")); - if (!password) { - perror("getpass"); - exit(2); - } - } - - { - const char *result; - result = crypt(password, salt); - /* xcrypt returns "*0" on errors */ - if (!result || result[0] == '*') { - fprintf(stderr, "crypt failed.\n"); - exit(2); - } - /* yes, using strlen(salt_prefix) on salt. It's not - * documented whether crypt_gensalt may change the prefix */ - if (!strneq(result, salt, strlen(salt_prefix))) { - fprintf(stderr, _("Method not supported by crypt(3).\n")); - exit(2); - } - printf("%s\n", result); - } - - exit(0); -} - -#ifdef RANDOM_DEVICE -void* get_random_bytes(const int count) -{ - char *buf; - int fd; - - buf = NOFAIL(malloc(count)); - fd = open(RANDOM_DEVICE, O_RDONLY); - if (fd < 0) { - perror("open(" RANDOM_DEVICE ")"); - exit(2); - } - if (read(fd, buf, count) != count) { - if (count < 0) - perror("read(" RANDOM_DEVICE ")"); - else - fprintf(stderr, "Short read of %s.\n", RANDOM_DEVICE); - exit(2); - } - close(fd); - - return buf; -} -#endif - -#ifdef RANDOM_DEVICE - -void generate_salt(char *const buf, const unsigned int len) -{ - unsigned int i; - - unsigned char *entropy = get_random_bytes(len * sizeof(unsigned char)); - for (i = 0; i < len; i++) - buf[i] = valid_salts[entropy[i] % (sizeof valid_salts - 1)]; - buf[i] = '\0'; -} - -#else /* RANDOM_DEVICE */ - -void generate_salt(char *const buf, const unsigned int len) -{ - unsigned int i; - -# ifdef HAVE_GETTIMEOFDAY - struct timeval tv; - - gettimeofday(&tv, NULL); - srand(tv.tv_sec ^ tv.tv_usec); - -# else /* HAVE_GETTIMEOFDAY */ -# warning "This system lacks a strong enough random numbers generator!" - - /* - * The possible values of time over one year are 31536000, which is - * two orders of magnitude less than the allowed entropy range (2^32). - */ - srand(time(NULL) + getpid()); - -# endif /* HAVE_GETTIMEOFDAY */ - - for (i = 0; i < len; i++) - buf[i] = valid_salts[rand() % (sizeof valid_salts - 1)]; - buf[i] = '\0'; -} - -#endif /* RANDOM_DEVICE */ - -void display_help(int error) -{ - fprintf((EXIT_SUCCESS == error) ? stdout : stderr, - _("Usage: mkpasswd [OPTIONS]... [PASSWORD [SALT]]\n" - "Crypts the PASSWORD using crypt(3).\n\n")); - fprintf(stderr, _( -" -m, --method=TYPE select method TYPE\n" -" -5 like --method=md5\n" -" -S, --salt=SALT use the specified SALT\n" -" -R, --rounds=NUMBER use the specified NUMBER of rounds\n" -" -P, --password-fd=NUM read the password from file descriptor NUM\n" -" instead of /dev/tty\n" -" -s, --stdin like --password-fd=0\n" -" -h, --help display this help and exit\n" -" -V, --version output version information and exit\n" -"\n" -"If PASSWORD is missing then it is asked interactively.\n" -"If no SALT is specified, a random one is generated.\n" -"If TYPE is 'help', available methods are printed.\n" -"\n" -"Report bugs to %s.\n"), ""); - exit(error); -} - -void display_version(void) -{ - printf("mkpasswd %s\n\n", VERSION); - puts("Copyright (C) 2001-2008 Marco d'Itri\n" -"This is free software; see the source for copying conditions. There is NO\n" -"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."); -} - -void display_methods(void) -{ - unsigned int i; - - printf(_("Available methods:\n")); - for (i = 0; methods[i].method != NULL; i++) - printf("%s\t%s\n", methods[i].method, methods[i].desc); -} - diff --git a/package.bak/mkpasswd/mkpasswd.mk b/package.bak/mkpasswd/mkpasswd.mk deleted file mode 100644 index 07935a41bf..0000000000 --- a/package.bak/mkpasswd/mkpasswd.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# mkpasswd -# -################################################################################ - -# source included in buildroot, taken from -# https://github.com/rfc1036/whois/blob/master/ -# at revision 5a0f08500fa51608b6d3b73ee338be38c692eadb -HOST_MKPASSWD_LICENSE = GPLv2+ - -define HOST_MKPASSWD_BUILD_CMDS - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpasswd/mkpasswd.c package/mkpasswd/utils.c \ - -o $(@D)/mkpasswd -lcrypt -endef - -define HOST_MKPASSWD_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/mkpasswd $(HOST_DIR)/usr/bin/mkpasswd -endef - -$(eval $(host-generic-package)) - -MKPASSWD = $(HOST_DIR)/usr/bin/mkpasswd diff --git a/package.bak/mkpasswd/utils.c b/package.bak/mkpasswd/utils.c deleted file mode 100644 index 254bf2ac68..0000000000 --- a/package.bak/mkpasswd/utils.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Copyright 1999-2008 by Marco d'Itri . - * - * do_nofail and merge_args come from the module-init-tools package. - * Copyright 2001 by Rusty Russell. - * Copyright 2002, 2003 by Rusty Russell, IBM Corporation. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -/* for strdup */ -#define _XOPEN_SOURCE 500 - -/* System library */ -#include -#include -#include -#include -#include - -/* Application-specific */ -#include "utils.h" - -void *do_nofail(void *ptr, const char *file, const int line) -{ - if (ptr) - return ptr; - - err_quit("Memory allocation failure at %s:%d.", file, line); -} - -/* Prepend options from a string. */ -char **merge_args(char *args, char *argv[], int *argc) -{ - char *arg, *argstring; - char **newargs = NULL; - unsigned int i, num_env = 0; - - if (!args) - return argv; - - argstring = NOFAIL(strdup(args)); - for (arg = strtok(argstring, " "); arg; arg = strtok(NULL, " ")) { - num_env++; - newargs = NOFAIL(realloc(newargs, - sizeof(newargs[0]) * (num_env + *argc + 1))); - newargs[num_env] = arg; - } - - if (!newargs) - return argv; - - /* Append commandline args */ - newargs[0] = argv[0]; - for (i = 1; i <= *argc; i++) - newargs[num_env + i] = argv[i]; - - *argc += num_env; - return newargs; -} - -/* Error routines */ -void err_sys(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - fprintf(stderr, ": %s\n", strerror(errno)); - va_end(ap); - exit(2); -} - -void err_quit(const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vfprintf(stderr, fmt, ap); - fputs("\n", stderr); - va_end(ap); - exit(2); -} - diff --git a/package.bak/mkpasswd/utils.h b/package.bak/mkpasswd/utils.h deleted file mode 100644 index 0f226aee2f..0000000000 --- a/package.bak/mkpasswd/utils.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef WHOIS_UTILS_H -#define WHOIS_UTILS_H - -/* Convenience macros */ -#define streq(a, b) (strcmp(a, b) == 0) -#define strcaseeq(a, b) (strcasecmp(a, b) == 0) -#define strneq(a, b, n) (strncmp(a, b, n) == 0) -#define strncaseeq(a, b, n) (strncasecmp(a, b, n) == 0) - -#define NOFAIL(ptr) do_nofail((ptr), __FILE__, __LINE__) - -/* Portability macros */ -#ifdef __GNUC__ -# define NORETURN __attribute__((noreturn)) -#else -# define NORETURN -#endif - -#ifndef AI_IDN -# define AI_IDN 0 -#endif - -#ifndef AI_ADDRCONFIG -# define AI_ADDRCONFIG 0 -#endif - -#ifdef HAVE_GETOPT_LONG -# define GETOPT_LONGISH(c, v, o, l, i) getopt_long(c, v, o, l, i) -#else -# define GETOPT_LONGISH(c, v, o, l, i) getopt(c, v, o) -#endif - -#ifdef ENABLE_NLS -# include -# include -# define _(a) (gettext(a)) -# ifdef gettext_noop -# define N_(a) gettext_noop(a) -# else -# define N_(a) (a) -# endif -#else -# define _(a) (a) -# define N_(a) (a) -# define ngettext(a, b, c) ((c==1) ? (a) : (b)) -#endif - - -/* Prototypes */ -void *do_nofail(void *ptr, const char *file, const int line); -char **merge_args(char *args, char *argv[], int *argc); - -void err_quit(const char *fmt, ...) NORETURN; -void err_sys(const char *fmt, ...) NORETURN; - -#endif diff --git a/package.bak/mkpimage/mkpimage.c b/package.bak/mkpimage/mkpimage.c deleted file mode 100644 index d7fe1b1b69..0000000000 --- a/package.bak/mkpimage/mkpimage.c +++ /dev/null @@ -1,376 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define VALIDATION_WORD 0x31305341 - -#define BRANCH_INST 0xea /* ARM opcode for "b" (unconditional branch) */ - -#define MAX_V0IMAGE_SIZE (60 * 1024 - 4) -/* Max size without authentication is 224 KB, due to memory used by - * the ROM boot code as a workspace out of the 256 KB of OCRAM */ -#define MAX_V1IMAGE_SIZE (224 * 1024 - 4) - -static int add_barebox_header; - -struct socfpga_header { - uint8_t validation_word[4]; - uint8_t version; - uint8_t flags; - union { - struct { - uint8_t program_length[2]; - uint8_t spare[2]; - uint8_t checksum[2]; - uint8_t start_vector[4]; - } v0; - struct { - uint8_t header_length[2]; - uint8_t program_length[4]; - uint8_t entry_offset[4]; - uint8_t spare[2]; - uint8_t checksum[2]; - } v1; - }; -}; - -static uint32_t bb_header[] = { - 0xea00007e, /* b 0x200 */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0xeafffffe, /* 1: b 1b */ - 0x65726162, /* 'bare' */ - 0x00786f62, /* 'box\0' */ - 0x00000000, /* padding */ - 0x00000000, /* padding */ - 0x00000000, /* padding */ - 0x00000000, /* padding */ - 0x00000000, /* padding */ - 0x00000000, /* padding */ - 0x00000000, /* socfpga header */ - 0x00000000, /* socfpga header */ - 0x00000000, /* socfpga header */ - 0xea00006b, /* entry. b 0x200 (offset may be adjusted) */ -}; - -static int read_full(int fd, void *buf, size_t size) -{ - size_t insize = size; - int now; - int total = 0; - - while (size) { - now = read(fd, buf, size); - if (now == 0) - return total; - if (now < 0) - return now; - total += now; - size -= now; - buf += now; - } - - return insize; -} - -static int write_full(int fd, void *buf, size_t size) -{ - size_t insize = size; - int now; - - while (size) { - now = write(fd, buf, size); - if (now <= 0) - return now; - size -= now; - buf += now; - } - - return insize; -} - -static const uint32_t crc_table[256] = { - 0x00000000, 0x04c11db7, 0x09823b6e, 0x0d4326d9, 0x130476dc, 0x17c56b6b, - 0x1a864db2, 0x1e475005, 0x2608edb8, 0x22c9f00f, 0x2f8ad6d6, 0x2b4bcb61, - 0x350c9b64, 0x31cd86d3, 0x3c8ea00a, 0x384fbdbd, 0x4c11db70, 0x48d0c6c7, - 0x4593e01e, 0x4152fda9, 0x5f15adac, 0x5bd4b01b, 0x569796c2, 0x52568b75, - 0x6a1936c8, 0x6ed82b7f, 0x639b0da6, 0x675a1011, 0x791d4014, 0x7ddc5da3, - 0x709f7b7a, 0x745e66cd, 0x9823b6e0, 0x9ce2ab57, 0x91a18d8e, 0x95609039, - 0x8b27c03c, 0x8fe6dd8b, 0x82a5fb52, 0x8664e6e5, 0xbe2b5b58, 0xbaea46ef, - 0xb7a96036, 0xb3687d81, 0xad2f2d84, 0xa9ee3033, 0xa4ad16ea, 0xa06c0b5d, - 0xd4326d90, 0xd0f37027, 0xddb056fe, 0xd9714b49, 0xc7361b4c, 0xc3f706fb, - 0xceb42022, 0xca753d95, 0xf23a8028, 0xf6fb9d9f, 0xfbb8bb46, 0xff79a6f1, - 0xe13ef6f4, 0xe5ffeb43, 0xe8bccd9a, 0xec7dd02d, 0x34867077, 0x30476dc0, - 0x3d044b19, 0x39c556ae, 0x278206ab, 0x23431b1c, 0x2e003dc5, 0x2ac12072, - 0x128e9dcf, 0x164f8078, 0x1b0ca6a1, 0x1fcdbb16, 0x018aeb13, 0x054bf6a4, - 0x0808d07d, 0x0cc9cdca, 0x7897ab07, 0x7c56b6b0, 0x71159069, 0x75d48dde, - 0x6b93dddb, 0x6f52c06c, 0x6211e6b5, 0x66d0fb02, 0x5e9f46bf, 0x5a5e5b08, - 0x571d7dd1, 0x53dc6066, 0x4d9b3063, 0x495a2dd4, 0x44190b0d, 0x40d816ba, - 0xaca5c697, 0xa864db20, 0xa527fdf9, 0xa1e6e04e, 0xbfa1b04b, 0xbb60adfc, - 0xb6238b25, 0xb2e29692, 0x8aad2b2f, 0x8e6c3698, 0x832f1041, 0x87ee0df6, - 0x99a95df3, 0x9d684044, 0x902b669d, 0x94ea7b2a, 0xe0b41de7, 0xe4750050, - 0xe9362689, 0xedf73b3e, 0xf3b06b3b, 0xf771768c, 0xfa325055, 0xfef34de2, - 0xc6bcf05f, 0xc27dede8, 0xcf3ecb31, 0xcbffd686, 0xd5b88683, 0xd1799b34, - 0xdc3abded, 0xd8fba05a, 0x690ce0ee, 0x6dcdfd59, 0x608edb80, 0x644fc637, - 0x7a089632, 0x7ec98b85, 0x738aad5c, 0x774bb0eb, 0x4f040d56, 0x4bc510e1, - 0x46863638, 0x42472b8f, 0x5c007b8a, 0x58c1663d, 0x558240e4, 0x51435d53, - 0x251d3b9e, 0x21dc2629, 0x2c9f00f0, 0x285e1d47, 0x36194d42, 0x32d850f5, - 0x3f9b762c, 0x3b5a6b9b, 0x0315d626, 0x07d4cb91, 0x0a97ed48, 0x0e56f0ff, - 0x1011a0fa, 0x14d0bd4d, 0x19939b94, 0x1d528623, 0xf12f560e, 0xf5ee4bb9, - 0xf8ad6d60, 0xfc6c70d7, 0xe22b20d2, 0xe6ea3d65, 0xeba91bbc, 0xef68060b, - 0xd727bbb6, 0xd3e6a601, 0xdea580d8, 0xda649d6f, 0xc423cd6a, 0xc0e2d0dd, - 0xcda1f604, 0xc960ebb3, 0xbd3e8d7e, 0xb9ff90c9, 0xb4bcb610, 0xb07daba7, - 0xae3afba2, 0xaafbe615, 0xa7b8c0cc, 0xa379dd7b, 0x9b3660c6, 0x9ff77d71, - 0x92b45ba8, 0x9675461f, 0x8832161a, 0x8cf30bad, 0x81b02d74, 0x857130c3, - 0x5d8a9099, 0x594b8d2e, 0x5408abf7, 0x50c9b640, 0x4e8ee645, 0x4a4ffbf2, - 0x470cdd2b, 0x43cdc09c, 0x7b827d21, 0x7f436096, 0x7200464f, 0x76c15bf8, - 0x68860bfd, 0x6c47164a, 0x61043093, 0x65c52d24, 0x119b4be9, 0x155a565e, - 0x18197087, 0x1cd86d30, 0x029f3d35, 0x065e2082, 0x0b1d065b, 0x0fdc1bec, - 0x3793a651, 0x3352bbe6, 0x3e119d3f, 0x3ad08088, 0x2497d08d, 0x2056cd3a, - 0x2d15ebe3, 0x29d4f654, 0xc5a92679, 0xc1683bce, 0xcc2b1d17, 0xc8ea00a0, - 0xd6ad50a5, 0xd26c4d12, 0xdf2f6bcb, 0xdbee767c, 0xe3a1cbc1, 0xe760d676, - 0xea23f0af, 0xeee2ed18, 0xf0a5bd1d, 0xf464a0aa, 0xf9278673, 0xfde69bc4, - 0x89b8fd09, 0x8d79e0be, 0x803ac667, 0x84fbdbd0, 0x9abc8bd5, 0x9e7d9662, - 0x933eb0bb, 0x97ffad0c, 0xafb010b1, 0xab710d06, 0xa6322bdf, 0xa2f33668, - 0xbcb4666d, 0xb8757bda, 0xb5365d03, 0xb1f740b4 -}; - -uint32_t crc32(uint32_t crc, void *_buf, int length) -{ - uint8_t *buf = _buf; - - while (length--) - crc = crc << 8 ^ crc_table[(crc >> 24 ^ *(buf++)) & 0xff]; - - return crc; -} - -/* Create an ARM relative branch instuction - * branch is where the instruction will be placed and dest points to where - * it should branch too. */ -static void branch(uint8_t *branch, uint8_t *dest) -{ - int offset = dest - branch - 8; /* PC is offset +8 bytes on ARM */ - - branch[0] = (offset >> 2) & 0xff; /* instruction uses offset/4 */ - branch[1] = (offset >> 10) & 0xff; - branch[2] = (offset >> 18) & 0xff; - branch[3] = BRANCH_INST; -} - -/* start_addr is where the socfpga header's start instruction should branch to. - * It should be relative to the start of buf */ -static int add_socfpga_header(void *buf, size_t size, unsigned start_addr, unsigned version) -{ - struct socfpga_header *header = buf + 0x40; - void *entry; - uint8_t *bufp, *sumendp; - uint32_t *crc; - unsigned checksum; - - if (size & 0x3) { - fprintf(stderr, "%s: size must be multiple of 4\n", __func__); - return -EINVAL; - } - - /* Absolute address of entry point in buf */ - entry = buf + start_addr; - if (version == 0) { - sumendp = &header->v0.checksum[0]; - } else { - sumendp = &header->v1.checksum[0]; - - /* The ROM loader can't handle a negative offset */ - if (entry < (void*)header) { - /* add a trampoline branch inst after end of the header */ - uint8_t *trampoline = (void*)(header + 1); - branch(trampoline, entry); - - /* and then make the trampoline the entry point */ - entry = trampoline; - } - /* Calculate start address as offset relative to start of header */ - start_addr = entry - (void*)header; - } - - header->validation_word[0] = VALIDATION_WORD & 0xff; - header->validation_word[1] = (VALIDATION_WORD >> 8) & 0xff; - header->validation_word[2] = (VALIDATION_WORD >> 16) & 0xff; - header->validation_word[3] = (VALIDATION_WORD >> 24) & 0xff; - header->version = version; - header->flags = 0; - - if (version == 0) { - header->v0.program_length[0] = (size >> 2) & 0xff; /* length in words */ - header->v0.program_length[1] = (size >> 10) & 0xff; - header->v0.spare[0] = 0; - header->v0.spare[1] = 0; - branch(header->v0.start_vector, entry); - } else { - header->v1.header_length[0] = (sizeof(*header) >> 0) & 0xff; - header->v1.header_length[1] = (sizeof(*header) >> 8) & 0xff; - header->v1.program_length[0] = (size >> 0) & 0xff; - header->v1.program_length[1] = (size >> 8) & 0xff; - header->v1.program_length[2] = (size >> 16) & 0xff; - header->v1.program_length[3] = (size >> 24) & 0xff; - header->v1.entry_offset[0] = (start_addr >> 0) & 0xff; - header->v1.entry_offset[1] = (start_addr >> 8) & 0xff; - header->v1.entry_offset[2] = (start_addr >> 16) & 0xff; - header->v1.entry_offset[3] = (start_addr >> 24) & 0xff; - header->v1.spare[0] = 0; - header->v1.spare[1] = 0; - } - - /* Sum from beginning of header to start of checksum field */ - checksum = 0; - for (bufp = (uint8_t*)header; bufp < sumendp; bufp++) - checksum += *bufp; - - if (version == 0) { - header->v0.checksum[0] = checksum & 0xff;; - header->v0.checksum[1] = (checksum >> 8) & 0xff;; - } else { - header->v1.checksum[0] = checksum & 0xff;; - header->v1.checksum[1] = (checksum >> 8) & 0xff;; - } - - crc = buf + size - sizeof(uint32_t); - - *crc = crc32(0xffffffff, buf, size - sizeof(uint32_t)); - *crc ^= 0xffffffff; - - return 0; -} - -static void usage(const char *prgname) -{ - fprintf(stderr, "usage: %s [-hb] [-v version] -o \n", prgname); -} - -int main(int argc, char *argv[]) -{ - int opt, ret; - const char *outfile = NULL, *infile; - struct stat s; - void *buf; - int fd; - int max_image_size, min_image_size = 80; - int addsize = 0, pad; - unsigned int version = 0; - - while ((opt = getopt(argc, argv, "o:hbv:")) != -1) { - switch (opt) { - case 'v': - version = atoi(optarg); - if (version > 1) { - printf("Versions supported: 0 or 1\n"); - usage(argv[0]); - exit(1); - } - break; - case 'b': - add_barebox_header = 1; - min_image_size = 0; - addsize = 512; - break; - case 'h': - usage(argv[0]); - exit(0); - case 'o': - outfile = optarg; - break; - default: - usage(argv[0]); - exit(1); - } - } - if (version == 0) { - max_image_size = MAX_V0IMAGE_SIZE; - } else { - max_image_size = MAX_V1IMAGE_SIZE; - } - max_image_size -= addsize; - - if (optind == argc || !outfile) { - usage(argv[0]); - exit(1); - } - infile = argv[optind]; - - ret = stat(infile, &s); - if (ret) { - perror("stat"); - exit(1); - } - - if (s.st_size < min_image_size) { - fprintf(stderr, "input image too small. Minimum is %d bytes\n", - min_image_size); - exit(1); - } - - if (s.st_size > max_image_size) { - fprintf(stderr, "input image too big. Maximum is %d bytes, got %ld bytes\n", - max_image_size, s.st_size); - exit(1); - } - - fd = open(infile, O_RDONLY); - if (fd == -1) { - perror("open infile"); - exit(1); - } - - pad = s.st_size & 0x3; - if (pad) - pad = 4 - pad; - - buf = calloc(s.st_size + 4 + addsize + pad, 1); - if (!buf) { - perror("malloc"); - exit(1); - } - - ret = read_full(fd, buf + addsize, s.st_size); - if (ret < 0) { - perror("read infile"); - exit(1); - } - - close(fd); - - if (add_barebox_header) { - memcpy(buf, bb_header, sizeof(bb_header)); - } - - ret = add_socfpga_header(buf, s.st_size + 4 + addsize + pad, addsize, - version); - if (ret) - exit(1); - - fd = open(outfile, O_WRONLY | O_CREAT | O_TRUNC, 0644); - if (fd < 0) { - perror("open outfile"); - exit(1); - } - - ret = write_full(fd, buf, s.st_size + 4 + addsize + pad); - if (ret < 0) { - perror("write outfile"); - exit(1); - } - - exit(0); -} diff --git a/package.bak/mkpimage/mkpimage.mk b/package.bak/mkpimage/mkpimage.mk deleted file mode 100644 index 04b2ef080b..0000000000 --- a/package.bak/mkpimage/mkpimage.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# mkpimage -# -################################################################################ - -HOST_MKPIMAGE_LICENSE = GPLv2 - -# source included in the package -# came from barebox's repository: -# https://git.pengutronix.de/cgit/barebox/tree/scripts/socfpga_mkimage.c?id=55d29525146dcd280987dfd565bfd34f08858fb3 -define HOST_MKPIMAGE_BUILD_CMDS - $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) \ - package/mkpimage/mkpimage.c -o $(@D)/mkpimage -endef - -define HOST_MKPIMAGE_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/mkpimage $(HOST_DIR)/usr/bin/mkpimage -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/mksh/Config.in b/package.bak/mksh/Config.in deleted file mode 100644 index 55d1cc15ed..0000000000 --- a/package.bak/mksh/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_MKSH - bool "mksh" - depends on BR2_USE_MMU # fork() - help - The MirBSD Korn Shell, - - mksh is a successor of pdksh but not affiliated with the - pdksh developers or contributors. mksh is not affiliated - with the AT&T Korn Shell, its past or present owners, - other than that both attempt to implement the Korn Shell - programming language. - - mksh targets users who desire a compact, fast, reliable, - secure shell not cut off modern extensions; a shell with - Unicode support; an actively developed, current, and - portable product; one with developers that listen to - their users’ requests and implement them if they - actually make sense. - - mksh aims to replace pdksh in all but very rare use cases - (such as support for checking the Unix mbox) and in all - operating environments - (thus including patches from pdksh on e.g. Debian). - - http://mirbsd.de/mksh diff --git a/package.bak/mksh/mksh.hash b/package.bak/mksh/mksh.hash deleted file mode 100644 index e92acd93e5..0000000000 --- a/package.bak/mksh/mksh.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.mirbsd.org/mksh.htm#build -md5 be0a6fb93b4a5f927bcc1893bb6692f8 mksh-R54.tgz -# Calculated based on the hash above -sha256 8bce3837c386684aa7780f085f1a4dbd5e3e26fb5c528ee0d41ae29af7f39013 mksh-R54.tgz diff --git a/package.bak/mksh/mksh.mk b/package.bak/mksh/mksh.mk deleted file mode 100644 index 4d91bfcf44..0000000000 --- a/package.bak/mksh/mksh.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# mksh -# -################################################################################ - -MKSH_VERSION = R54 -MKSH_SOURCE = mksh-$(MKSH_VERSION).tgz -MKSH_SITE = https://www.mirbsd.org/MirOS/dist/mir/mksh -# For MirOS License see https://www.mirbsd.org/TaC-mksh.txt -MKSH_LICENSE = MirOS, ISC -MKSH_LICENSE_FILES = mksh.1 - -define MKSH_BUILD_CMDS - cd $(@D) && $(TARGET_MAKE_ENV) \ - TARGET_OS=Linux $(TARGET_CONFIGURE_OPTS) \ - sh ./Build.sh -endef - -define MKSH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/mksh $(TARGET_DIR)/bin/mksh -endef - -$(eval $(generic-package)) diff --git a/package.bak/mmc-utils/0001-fix-mmc-h-includes.patch b/package.bak/mmc-utils/0001-fix-mmc-h-includes.patch deleted file mode 100644 index 8d0b2eb233..0000000000 --- a/package.bak/mmc-utils/0001-fix-mmc-h-includes.patch +++ /dev/null @@ -1,41 +0,0 @@ -mmc-utils: fix mmc.h includes - -Some toolchains include asm-generic/int-l64.h from their asm/types.h -file for certain 64-bit architectures. This causes a conflict between -types like this one: - -asm-generic/int-l64.h:28:25: error: conflicting types for '__s64' - typedef __signed__ long __s64; - ^ -In file included from mmc.h:17:0, - from mmc_cmds.c:30: -asm-generic/int-ll64.h:29:44: note: previous declaration of '__s64' was -here - __extension__ typedef __signed__ long long __s64; - -[Ryan: added include of linux/types.h because mmc/ioctl.h does not - include it in kernel version before 3.4] - -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Ryan Barnett ---- - mmc.h | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) -diff --git a/mmc.h b/mmc.h -index 9871d62..2d54ec5 100644 ---- a/mmc.h -+++ b/mmc.h -@@ -14,9 +14,12 @@ - * Boston, MA 021110-1307, USA. - */ - --#include -+#include - #include - #include -+#ifndef _ASM_GENERIC_INT_L64_H -+#include -+#endif - - #define CHECK(expr, msg, err_stmt) { if (expr) { fprintf(stderr, msg); err_stmt; } } - diff --git a/package.bak/mmc-utils/Config.in b/package.bak/mmc-utils/Config.in deleted file mode 100644 index 850aeac445..0000000000 --- a/package.bak/mmc-utils/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MMC_UTILS - bool "mmc-utils" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - help - MMC utils - - https://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git - -comment "mmc-utils needs a toolchain w/ headers >= 3.0" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/mmc-utils/mmc-utils.mk b/package.bak/mmc-utils/mmc-utils.mk deleted file mode 100644 index 7473a1b388..0000000000 --- a/package.bak/mmc-utils/mmc-utils.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# mmc-utils -# -################################################################################ - -MMC_UTILS_VERSION = 2cb6695e8dec00d887bdd5309d1b57d836fcd214 -MMC_UTILS_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git -MMC_UTILS_LICENSE = GPLv2 - -define MMC_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define MMC_UTILS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/mmc $(TARGET_DIR)/usr/bin/mmc -endef - -$(eval $(generic-package)) diff --git a/package.bak/moarvm/Config.in b/package.bak/moarvm/Config.in deleted file mode 100644 index c318ab4b86..0000000000 --- a/package.bak/moarvm/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_MOARVM - bool "moarvm" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # libuv - depends on !BR2_STATIC_LIBS # libuv - depends on BR2_USE_MMU # libuv - depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS # libatomic_ops - # needs AO_fetch_compare_and_swap, not implemented for sparcv8/sparcv9 - depends on !BR2_sparc64 && !BR2_sparc - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libuv - select BR2_PACKAGE_LIBUV - select BR2_PACKAGE_LIBTOMMATH - select BR2_PACKAGE_LIBATOMIC_OPS - # dyncall does not work on MIPS; libffi needs to be used. - # See: https://github.com/MoarVM/MoarVM/issues/222 - select BR2_PACKAGE_LIBFFI if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - help - Short for "Metamodel On A Runtime", MoarVM is a virtual machine - built especially for Rakudo Perl 6 and the NQP Compiler Toolchain. - - http://moarvm.com - -comment "moarvm needs a toolchain w/ NPTL, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - depends on BR2_USE_MMU - depends on BR2_PACKAGE_LIBATOMIC_OPS_ARCH_SUPPORTS - depends on !BR2_sparc64 && !BR2_sparc - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/moarvm/moarvm.hash b/package.bak/moarvm/moarvm.hash deleted file mode 100644 index e6335ab7e7..0000000000 --- a/package.bak/moarvm/moarvm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2074693a42a7f31218bf69b70fd5b73d6fd1a1d0e31eaf3f528e204963e94c53 MoarVM-2017.01.tar.gz diff --git a/package.bak/moarvm/moarvm.mk b/package.bak/moarvm/moarvm.mk deleted file mode 100644 index b459474a79..0000000000 --- a/package.bak/moarvm/moarvm.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# moarvm -# -################################################################################ - -MOARVM_VERSION = 2017.01 -MOARVM_SITE = http://moarvm.com/releases -MOARVM_SOURCE = MoarVM-$(MOARVM_VERSION).tar.gz -MOARVM_LICENSE = Artistic-2.0 -MOARVM_LICENSE_FILES = Artistic2.txt -MOARVM_INSTALL_STAGING = YES -MOARVM_DEPENDENCIES = host-luajit host-pkgconf libuv libtommath libatomic_ops - -MOARVM_CONF_OPTS = \ - --build=$(GNU_HOST_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --ar="$(TARGET_AR)" \ - --cc="$(TARGET_CC)" \ - --ld="$(TARGET_CC)" \ - --prefix="/usr" \ - --pkgconfig=$(PKG_CONFIG_HOST_BINARY) \ - --lua=$(HOST_DIR)/usr/bin/luajit \ - --has-libuv \ - --has-libtommath \ - --has-libatomic - -ifeq ($(BR2_PACKAGE_LIBFFI),y) -MOARVM_CONF_OPTS += --has-libffi -MOARVM_DEPENDENCIES += libffi -endif - -ifeq ($(BR2_ENDIAN),"BIG") -MOARVM_CONF_OPTS += --big-endian -endif - -define MOARVM_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) perl Configure.pl $(MOARVM_CONF_OPTS)) -endef - -define MOARVM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define MOARVM_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define MOARVM_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/mobile-broadband-provider-info/Config.in b/package.bak/mobile-broadband-provider-info/Config.in deleted file mode 100644 index dda71056e1..0000000000 --- a/package.bak/mobile-broadband-provider-info/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO - bool "mobile-broadband-provider-info" - help - Mobile broadband provider database. - - http://live.gnome.org/NetworkManager/MobileBroadband/ServiceProviders diff --git a/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.hash b/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.hash deleted file mode 100644 index 5ab2e318fe..0000000000 --- a/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/20151214/mobile-broadband-provider-info-20151214.sha256sum -sha256 8ae45d6f10fed9750e259935804c4f40a4372bb119f0504187e4221896b205a4 mobile-broadband-provider-info-20151214.tar.xz diff --git a/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.mk b/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.mk deleted file mode 100644 index 1a68708d45..0000000000 --- a/package.bak/mobile-broadband-provider-info/mobile-broadband-provider-info.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# mobile-broadband-provider-info -# -################################################################################ - -MOBILE_BROADBAND_PROVIDER_INFO_VERSION = 20151214 -MOBILE_BROADBAND_PROVIDER_INFO_SITE = http://ftp.gnome.org/pub/GNOME/sources/mobile-broadband-provider-info/$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION) -MOBILE_BROADBAND_PROVIDER_INFO_SOURCE = mobile-broadband-provider-info-$(MOBILE_BROADBAND_PROVIDER_INFO_VERSION).tar.xz -MOBILE_BROADBAND_PROVIDER_INFO_LICENSE = Public domain -MOBILE_BROADBAND_PROVIDER_INFO_LICENSE_FILES = COPYING -MOBILE_BROADBAND_PROVIDER_INFO_INSTALL_STAGING = YES -MOBILE_BROADBAND_PROVIDER_INFO_DEPENDENCIES = host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/modem-manager/Config.in b/package.bak/modem-manager/Config.in deleted file mode 100644 index aa7ed1e2fa..0000000000 --- a/package.bak/modem-manager/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_MODEM_MANAGER - bool "modemmanager" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR # libglib2 and gnutls - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_LIBGUDEV - help - ModemManager is a DBus-activated daemon which controls mobile - broadband (2G/3G/4G) devices and connections. - - http://www.freedesktop.org/wiki/Software/ModemManager/ - -if BR2_PACKAGE_MODEM_MANAGER - -config BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - bool "MBIM support" - select BR2_PACKAGE_LIBMBIM - help - This option enables support for MBIM protocol - -config BR2_PACKAGE_MODEM_MANAGER_LIBQMI - bool "QMI support" - select BR2_PACKAGE_LIBQMI - help - This option enables support for QMI protocol -endif - -comment "modemmanager needs udev /dev management and a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_MMU diff --git a/package.bak/modem-manager/S44modem-manager b/package.bak/modem-manager/S44modem-manager deleted file mode 100755 index cf6d89601d..0000000000 --- a/package.bak/modem-manager/S44modem-manager +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/sh -# -# Starts ModemManager -# - -PIDFILE=/var/run/ModemManager.pid - -[ -x $MODEMMANAGER_BIN ] || exit 0 - -start() { - printf "Starting ModemManager: " - umask 077 - start-stop-daemon -S -q -b -m -p $PIDFILE \ - --exec /usr/sbin/ModemManager - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping ModemManager: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && { echo "OK"; rm -f $PIDFILE; } || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $ret diff --git a/package.bak/modem-manager/modem-manager.hash b/package.bak/modem-manager/modem-manager.hash deleted file mode 100644 index 481f7dd434..0000000000 --- a/package.bak/modem-manager/modem-manager.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e4544398d9c166f8e13fe7c97149f262ad1fb48af980e0d4f9c34013920c6393 ModemManager-1.6.2.tar.xz diff --git a/package.bak/modem-manager/modem-manager.mk b/package.bak/modem-manager/modem-manager.mk deleted file mode 100644 index c74c224387..0000000000 --- a/package.bak/modem-manager/modem-manager.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# modem-manager -# -################################################################################ - -MODEM_MANAGER_VERSION = 1.6.2 -MODEM_MANAGER_SOURCE = ModemManager-$(MODEM_MANAGER_VERSION).tar.xz -MODEM_MANAGER_SITE = http://www.freedesktop.org/software/ModemManager -MODEM_MANAGER_LICENSE = GPLv2+ (programs, plugins), LGPLv2+ (libmm-glib) -MODEM_MANAGER_LICENSE_FILES = COPYING -MODEM_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib host-intltool libgudev -MODEM_MANAGER_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBQMI),y) -MODEM_MANAGER_DEPENDENCIES += libqmi -MODEM_MANAGER_CONF_OPTS += --with-qmi -else -MODEM_MANAGER_CONF_OPTS += --without-qmi -endif - -ifeq ($(BR2_PACKAGE_MODEM_MANAGER_LIBMBIM),y) -MODEM_MANAGER_DEPENDENCIES += libmbim -MODEM_MANAGER_CONF_OPTS += --with-mbim -else -MODEM_MANAGER_CONF_OPTS += --without-mbim -endif - -define MODEM_MANAGER_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/modem-manager/S44modem-manager \ - $(TARGET_DIR)/etc/init.d/S44modem-manager -endef - -$(eval $(autotools-package)) diff --git a/package.bak/modplugtools/Config.in b/package.bak/modplugtools/Config.in deleted file mode 100644 index 89c32206fb..0000000000 --- a/package.bak/modplugtools/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_MODPLUGTOOLS - bool "modplugtools" - depends on BR2_INSTALL_LIBSTDCPP # libmodplug - select BR2_PACKAGE_LIBAO - select BR2_PACKAGE_LIBMODPLUG - help - This installs the 'modplug123' command line tool to play music files - in the tracker formats supported by libmodplug: MOD, S3M, XM etc. - Audio output is handled by libao. - - http://modplug-xmms.sourceforge.net/ - -comment "modplugtools needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/modplugtools/modplugtools.hash b/package.bak/modplugtools/modplugtools.hash deleted file mode 100644 index e29eda90e0..0000000000 --- a/package.bak/modplugtools/modplugtools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0122d44ea0513b928cf9d463acc886d08a2664579aa96ddeeb270d5c81193a4e modplugtools-0.5.3.tar.gz diff --git a/package.bak/modplugtools/modplugtools.mk b/package.bak/modplugtools/modplugtools.mk deleted file mode 100644 index e8d73afeff..0000000000 --- a/package.bak/modplugtools/modplugtools.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# modplugtools -# -################################################################################ - -MODPLUGTOOLS_VERSION = 0.5.3 -MODPLUGTOOLS_SITE = http://downloads.sourceforge.net/project/modplug-xmms/modplug-tools -MODPLUGTOOLS_LICENSE = GPLv3 -MODPLUGTOOLS_LICENSE_FILES = COPYING - -MODPLUGTOOLS_DEPENDENCIES = libao libmodplug - -# Only build the 'mp123' subdir, which contains 'modplug123' that plays through -# various backends via libao. This excludes the 'mpplay' subdir, which contains -# 'modplugplay' that can play only through the deprecated OSS interface. -MODPLUGTOOLS_MAKE_OPTS = SUBDIRS=mp123 -MODPLUGTOOLS_INSTALL_TARGET_OPTS = SUBDIRS=mp123 DESTDIR=$(TARGET_DIR) install - -$(eval $(autotools-package)) diff --git a/package.bak/mongodb/Config.in b/package.bak/mongodb/Config.in deleted file mode 100644 index a78bb27e70..0000000000 --- a/package.bak/mongodb/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -# from src/mongo/platform/bits.h -config BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - bool - # ARM needs LDREX/STREX, so ARMv6+ - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV5 - default y if BR2_aarch64 || BR2_i386 || BR2_powerpc64 || BR2_x86_64 - -config BR2_PACKAGE_MONGODB - bool "mongodb" - depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_GLIBC # needs glibc malloc_usable_size - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - help - MongoDB is a cross-platform document-oriented database (NoSQL). - - It uses JSON-like documents with dynamic schemas (BSON), making - the integration of data in certain types of applications easier - and faster. - - https://www.mongodb.org/ - -comment "mongodb needs a glibc toolchain w/ wchar, threads, C++, gcc >= 4.8" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_PACKAGE_MONGODB_ARCH_SUPPORTS diff --git a/package.bak/mongodb/mongodb.hash b/package.bak/mongodb/mongodb.hash deleted file mode 100644 index b01ad53ab5..0000000000 --- a/package.bak/mongodb/mongodb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4764945631bca4ac5c2b239e04e91db00e39716915204349170c37cb7897c564 mongodb-r3.3.4.tar.gz diff --git a/package.bak/mongodb/mongodb.mk b/package.bak/mongodb/mongodb.mk deleted file mode 100644 index f5b2c01db3..0000000000 --- a/package.bak/mongodb/mongodb.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# mongodb -# -################################################################################ - -MONGODB_VERSION_BASE = 3.3.4 -MONGODB_VERSION = r$(MONGODB_VERSION_BASE) -MONGODB_SITE = $(call github,mongodb,mongo,$(MONGODB_VERSION)) - -MONGODB_LICENSE = AGPLv3, Apache-2.0 -MONGODB_LICENSE_FILES = GNU-AGPL-3.0.txt APACHE-2.0.txt - -MONGODB_DEPENDENCIES = host-scons - -MONGODB_SCONS_TARGETS = mongod mongos - -MONGODB_SCONS_ENV = CC="$(TARGET_CC)" CXX="$(TARGET_CXX)" \ - -j"$(PARALLEL_JOBS)" - -MONGODB_SCONS_OPTS = --disable-warnings-as-errors - -# need to pass mongo version when not building from git repo -MONGODB_SCONS_OPTS += MONGO_VERSION=$(MONGODB_VERSION_BASE)- - -# WiredTiger database storage engine only supported on 64 bits -ifeq ($(BR2_ARCH_IS_64),y) -MONGODB_SCONS_OPTS += --wiredtiger=on -else -MONGODB_SCONS_OPTS += --wiredtiger=off -endif - -# JavaScript scripting engine and tcmalloc supported only on -# x86/x86-64 systems. Mongo target is a shell interface that -# depends on the javascript engine, so it will also only be -# built on x86/x86-64 systems. -ifeq ($(BR2_i386)$(BR2_x86_64),y) -MONGODB_SCONS_OPTS += --js-engine=mozjs --allocator=tcmalloc -MONGODB_SCONS_TARGETS += mongo -else -MONGODB_SCONS_OPTS += --js-engine=none --allocator=system -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MONGODB_DEPENDENCIES += openssl -MONGODB_SCONS_OPTS += --ssl=SSL -endif - -define MONGODB_BUILD_CMDS - (cd $(@D); \ - $(SCONS) \ - $(MONGODB_SCONS_ENV) \ - $(MONGODB_SCONS_OPTS) \ - $(MONGODB_SCONS_TARGETS)) -endef - -define MONGODB_INSTALL_TARGET_CMDS - (cd $(@D); \ - $(SCONS) \ - $(MONGODB_SCONS_ENV) \ - $(MONGODB_SCONS_OPTS) \ - --prefix=$(TARGET_DIR)/usr \ - install) -endef - -$(eval $(generic-package)) diff --git a/package.bak/mongoose/Config.in b/package.bak/mongoose/Config.in deleted file mode 100644 index 22b385d457..0000000000 --- a/package.bak/mongoose/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MONGOOSE - bool "mongoose" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Mongoose is an embedded networking library, which can turn - anything into a web server - - https://github.com/cesanta/mongoose - -comment "mongoose needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mongoose/mongoose.hash b/package.bak/mongoose/mongoose.hash deleted file mode 100644 index c131e48c41..0000000000 --- a/package.bak/mongoose/mongoose.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 94b934da083afe8abb1c0af5abb8f25294050011793f048166b12f000f9433a0 mongoose-6.2.tar.gz diff --git a/package.bak/mongoose/mongoose.mk b/package.bak/mongoose/mongoose.mk deleted file mode 100644 index 7dfa119839..0000000000 --- a/package.bak/mongoose/mongoose.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# mongoose -# -################################################################################ - -MONGOOSE_VERSION = 6.2 -MONGOOSE_SITE = $(call github,cesanta,mongoose,$(MONGOOSE_VERSION)) -MONGOOSE_LICENSE = GPLv2 -MONGOOSE_LICENSE_FILES = LICENSE -MONGOOSE_INSTALL_STAGING = YES - -MONGOOSE_CFLAGS = $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -DMONGOOSE_NO_DL - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MONGOOSE_DEPENDENCIES += openssl -# directly linked -MONGOOSE_CFLAGS += -DNS_ENABLE_SSL -lssl -lcrypto -lz -endif - -define MONGOOSE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CC) -c $(@D)/mongoose.c $(MONGOOSE_CFLAGS) -o $(@D)/mongoose.o - $(TARGET_MAKE_ENV) $(TARGET_AR) rcs $(@D)/libmongoose.a $(@D)/mongoose.o -endef - -define MONGOOSE_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/libmongoose.a \ - $(STAGING_DIR)/usr/lib/libmongoose.a - $(INSTALL) -D -m 644 $(@D)/mongoose.h \ - $(STAGING_DIR)/usr/include/mongoose.h -endef - -$(eval $(generic-package)) diff --git a/package.bak/mongrel2/0002-Do-not-run-tests.patch b/package.bak/mongrel2/0002-Do-not-run-tests.patch deleted file mode 100644 index 557c27edd8..0000000000 --- a/package.bak/mongrel2/0002-Do-not-run-tests.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 3cbef2195533f357c8a80c2840108662461273b7 Mon Sep 17 00:00:00 2001 -From: Lionel Orry -Date: Wed, 27 Mar 2013 14:48:19 +0100 -Subject: [PATCH 4/4] Do not run tests. - -This patch is specific to cross-compiled environments and avoids running -the tests on the host. It is not meant to be applied upstream. - -Signed-off-by: Lionel Orry ---- - Makefile | 2 +- - tools/m2sh/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 7dc4089..ca72630 100644 ---- a/Makefile -+++ b/Makefile -@@ -16,7 +16,7 @@ TEST_SRC=$(wildcard tests/*_tests.c) - TESTS=$(patsubst %.c,%,${TEST_SRC}) - MAKEOPTS=OPTFLAGS="${NOEXTCFLAGS} ${OPTFLAGS}" OPTLIBS="${OPTLIBS}" LIBS="${LIBS}" DESTDIR="${DESTDIR}" PREFIX="${PREFIX}" - --all: bin/mongrel2 tests m2sh procer -+all: bin/mongrel2 m2sh procer filters config_modules - - dev: CFLAGS=-g -Wall -Isrc -Wall -Wextra $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - dev: all -diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index b50d8a0..334e4da 100644 ---- a/tools/m2sh/Makefile -+++ b/tools/m2sh/Makefile -@@ -9,7 +9,7 @@ TESTS=$(patsubst %.c,%,${TEST_SRC}) - LIB_SRC=$(filter-out src/m2sh.c,${SOURCES}) - LIB_OBJ=$(filter-out src/m2sh.o,${OBJECTS}) - --all: ../lemon/lemon tests build/m2sh -+all: ../lemon/lemon build/m2sh - - dev: CFLAGS=-g -Wall -Wextra -Isrc -I../../src $(OPTFLAGS) - dev: all --- -1.8.1.4 - diff --git a/package.bak/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch b/package.bak/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch deleted file mode 100644 index 730d8ebfc0..0000000000 --- a/package.bak/mongrel2/0003-Fix-Makefiles-for-cross-compilation.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 298356c44a7df2b34c4e307c531d2010e2cb4b79 Mon Sep 17 00:00:00 2001 -From: Lionel Orry -Date: Wed, 27 Mar 2013 15:56:56 +0100 -Subject: [PATCH 1/1] Fix Makefiles for cross-compilation - -The CFLAGS handling in mongrel2 is really messy and it is hard to make -it behave correctly with cross-compiling environments. This patch -restricts the Makefiles syntax to GNU Make, but help cross-compiling. - -This is not meant to be applied upstream. - -Signed-off-by: Lionel Orry ---- - Makefile | 2 +- - tools/config_modules/Makefile | 2 +- - tools/filters/Makefile | 2 +- - tools/m2sh/Makefile | 2 +- - tools/procer/Makefile | 2 +- - 5 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 6dce4a6..d48e05e 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 -+override CFLAGS += -g -O2 -Wall -Wextra -Isrc -Isrc/polarssl/include -pthread -rdynamic -DNDEBUG $(OPTFLAGS) -D_FILE_OFFSET_BITS=64 - LIBS=-lzmq -ldl -lsqlite3 $(OPTLIBS) - PREFIX?=/usr/local - -diff --git a/tools/config_modules/Makefile b/tools/config_modules/Makefile -index 398490c..53f2255 100644 ---- a/tools/config_modules/Makefile -+++ b/tools/config_modules/Makefile -@@ -1,5 +1,5 @@ - PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build -+override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -fPIC -shared -nostartfiles -L../../build - LDFLAGS=$(OPTLIBS) - - MONGO_SRC = mongo-c-driver/src/bson.c \ -diff --git a/tools/filters/Makefile b/tools/filters/Makefile -index f9f4556..6077b79 100644 ---- a/tools/filters/Makefile -+++ b/tools/filters/Makefile -@@ -1,5 +1,5 @@ - PREFIX?=/usr/local --CFLAGS=-I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build -+ override CFLAGS += -I../../src -I../../src/polarssl/include $(OPTFLAGS) -g -fPIC -shared -nostartfiles -L../../build - LDFLAGS=$(OPTLIBS) - - all: null.so -diff --git a/tools/m2sh/Makefile b/tools/m2sh/Makefile -index b50d8a0..ba378c5 100644 ---- a/tools/m2sh/Makefile -+++ b/tools/m2sh/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) -+override CFLAGS += -DNDEBUG -DNO_LINENOS -pthread -g -I../../src -Isrc -Wall $(OPTFLAGS) - LIBS=-lzmq -lsqlite3 ../../build/libm2.a $(OPTLIBS) - - PREFIX?=/usr/local -diff --git a/tools/procer/Makefile b/tools/procer/Makefile -index d0d7de0..629b2e9 100644 ---- a/tools/procer/Makefile -+++ b/tools/procer/Makefile -@@ -1,4 +1,4 @@ --CFLAGS=-DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) -+override CFLAGS += -DNDEBUG -pthread -g -I../../src -Wall $(OPTFLAGS) - PREFIX?=/usr/local - LIBS?=-lzmq - SOURCES=$(wildcard *.c) --- -1.8.1.4 - diff --git a/package.bak/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch b/package.bak/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch deleted file mode 100644 index 83698164fd..0000000000 --- a/package.bak/mongrel2/0004-Rename-symbol-to-prevent-conflict.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 8d0bc79f38913b1a55e7d151b32bbc9462c24b47 Mon Sep 17 00:00:00 2001 -From: Jason Miller -Date: Fri, 14 Aug 2015 19:03:09 -0700 -Subject: [PATCH] Rename symbol to prevent conflict - -One of the standard headers defines max_align_t on some versions of linux. - -[Backported from upstream commit -https://github.com/mongrel2/mongrel2/commit/563bac8c59b9b32205164d237cf1ec0cb48d189f.] - -Signed-off-by: Rodrigo Rebello ---- - src/mem/align.h | 2 +- - src/mem/halloc.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/mem/align.h b/src/mem/align.h -index 4c6e183..03a4999 100644 ---- a/src/mem/align.h -+++ b/src/mem/align.h -@@ -30,7 +30,7 @@ union max_align - void (*q)(void); - }; - --typedef union max_align max_align_t; -+typedef union max_align h_max_align_t; - - #endif - -diff --git a/src/mem/halloc.c b/src/mem/halloc.c -index b097d1f..40d0c09 100644 ---- a/src/mem/halloc.c -+++ b/src/mem/halloc.c -@@ -34,7 +34,7 @@ typedef struct hblock - #endif - hlist_item_t siblings; /* 2 pointers */ - hlist_head_t children; /* 1 pointer */ -- max_align_t data[1]; /* not allocated, see below */ -+ h_max_align_t data[1]; /* not allocated, see below */ - - } hblock_t; - --- -2.1.4 - diff --git a/package.bak/mongrel2/Config.in b/package.bak/mongrel2/Config.in deleted file mode 100644 index 796bae6d80..0000000000 --- a/package.bak/mongrel2/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -# mongrel2 uses {get,make,swap}context() functions, which are -# available in glibc for all architectures and in uClibc only for a -# subset of the architectures -config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - bool - default y if BR2_TOOLCHAIN_USES_GLIBC - default y if BR2_TOOLCHAIN_USES_UCLIBC && \ - (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_sparc || BR2_x86_64) - -comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - -config BR2_PACKAGE_MONGREL2 - bool "mongrel2" - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_ZEROMQ - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - depends on !BR2_STATIC_LIBS # uses dlopen() - depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS - help - Mongrel2 is an application, language, and network architecture - agnostic web server that focuses on web applications using - modern browser technologies. - - Mongrel2 supports 17 languages and platforms, HTTP, Flash - sockets, WebSockets, Long Polling, and many ways to deploy - and hack on it. - - http://www.mongrel2.org diff --git a/package.bak/mongrel2/mongrel2.hash b/package.bak/mongrel2/mongrel2.hash deleted file mode 100644 index b8f8de3d76..0000000000 --- a/package.bak/mongrel2/mongrel2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 543553c3082f2b992649a975f6cb7324ae2aea93af05288ea4f2c1262a7f63b2 mongrel2-v1.9.2.tar.bz2 diff --git a/package.bak/mongrel2/mongrel2.mk b/package.bak/mongrel2/mongrel2.mk deleted file mode 100644 index c69c14345f..0000000000 --- a/package.bak/mongrel2/mongrel2.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# mongrel2 -# -################################################################################ - -MONGREL2_VERSION = 1.9.2 -MONGREL2_SOURCE = mongrel2-v$(MONGREL2_VERSION).tar.bz2 -# Do not use the github helper here, the generated tarball is *NOT* the same -# as the one uploaded by upstream for the release. -MONGREL2_SITE = https://github.com/mongrel2/mongrel2/releases/download/$(MONGREL2_VERSION) -MONGREL2_LICENSE = BSD-3c -MONGREL2_LICENSE_FILES = LICENSE -MONGREL2_DEPENDENCIES = sqlite zeromq - -define MONGREL2_POLARSSL_DISABLE_ASM - $(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/src/polarssl/include/polarssl/config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_microblaze),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -MONGREL2_POST_CONFIGURE_HOOKS += MONGREL2_POLARSSL_DISABLE_ASM -endif - -define MONGREL2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - PREFIX=/usr all -endef - -define MONGREL2_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - PREFIX=/usr DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/monit/0001-no-force-static.patch b/package.bak/monit/0001-no-force-static.patch deleted file mode 100644 index edb619b541..0000000000 --- a/package.bak/monit/0001-no-force-static.patch +++ /dev/null @@ -1,20 +0,0 @@ -Do not force building a statically-linked binary - -Statically-linked binary do not work well with glibc, because it -still dlopen()s the NSS libraries. - -Reported-by: Peter Kümmel -Signed-off-by: "Yann E. MORIN" - -diff -durN monit-5.7.orig/Makefile.am monit-5.7/Makefile.am ---- monit-5.7.orig/Makefile.am 2014-02-20 09:00:42.000000000 +0100 -+++ monit-5.7/Makefile.am 2014-09-05 12:49:43.711104001 +0200 -@@ -85,7 +85,7 @@ - src/process/sysdep_@ARCH@.c - - monit_LDADD = libmonit/libmonit.la --monit_LDFLAGS = -static $(EXTLDFLAGS) -+monit_LDFLAGS = $(EXTLDFLAGS) - - man_MANS = monit.1 - diff --git a/package.bak/monit/Config.in b/package.bak/monit/Config.in deleted file mode 100644 index 9f80858f8a..0000000000 --- a/package.bak/monit/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_MONIT - bool "monit" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Monit is a free open source utility for managing and - monitoring, processes, programs, files, directories and - filesystems on a UNIX system. Monit conducts automatic - maintenance and repair and can execute meaningful causal - actions in error situations. - - http://mmonit.com/monit/ - -comment "monit needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/monit/monit.hash b/package.bak/monit/monit.hash deleted file mode 100644 index 8eb02fce66..0000000000 --- a/package.bak/monit/monit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://mmonit.com/monit/dist/monit-5.20.0.tar.gz.sha256: -sha256 ebac395ec50c1ae64d568db1260bc049d0e0e624c00e79d7b1b9a59c2679b98d monit-5.20.0.tar.gz diff --git a/package.bak/monit/monit.mk b/package.bak/monit/monit.mk deleted file mode 100644 index f4899c3c0d..0000000000 --- a/package.bak/monit/monit.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# monit -# -################################################################################ - -MONIT_VERSION = 5.20.0 -MONIT_SITE = http://mmonit.com/monit/dist -MONIT_LICENSE = AGPLv3 with OpenSSL exception -MONIT_LICENSE_FILES = COPYING -# -# Touching Makefile.am: -MONIT_AUTORECONF = YES - -MONIT_CONF_ENV = \ - libmonit_cv_setjmp_available=yes \ - libmonit_cv_vsnprintf_c99_conformant=yes - -MONIT_CONF_OPTS += \ - --without-pam \ - --with-largefiles - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MONIT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr -MONIT_DEPENDENCIES += openssl -else -MONIT_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -MONIT_CONF_OPTS += --with-zlib -MONIT_DEPENDENCIES += zlib -else -MONIT_CONF_OPTS += --without-zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/monkey/Config.in b/package.bak/monkey/Config.in deleted file mode 100644 index 001c415351..0000000000 --- a/package.bak/monkey/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_MONKEY - bool "monkey" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_USE_MMU # fork() - help - Monkey Server is a fast and lightweight web server for Linux platforms. - - http://monkey-project.com/ - -if BR2_PACKAGE_MONKEY - -config BR2_PACKAGE_MONKEY_SHARED - bool "install shared library" - help - Build Monkey as a shared library in addition to stand-alone - server - -endif - -comment "monkey needs an toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/monkey/monkey.hash b/package.bak/monkey/monkey.hash deleted file mode 100644 index 6c7eada8c0..0000000000 --- a/package.bak/monkey/monkey.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from http://monkey-project.com/releases/1.5/monkey-1.5.6.tar.gz.md5, sha256 locally computed: -md5 9699e4c9ea6ce6b989907c252ae80254 monkey-1.5.6.tar.gz -sha256 7c3d845306aa74ee6effd7ab6169d16ac4e6450e564954d0d0baa2d1e9be1a22 monkey-1.5.6.tar.gz diff --git a/package.bak/monkey/monkey.mk b/package.bak/monkey/monkey.mk deleted file mode 100644 index 02c26c99f4..0000000000 --- a/package.bak/monkey/monkey.mk +++ /dev/null @@ -1,68 +0,0 @@ -################################################################################ -# -# monkey -# -################################################################################ - -MONKEY_VERSION_MAJOR = 1.5 -MONKEY_VERSION = $(MONKEY_VERSION_MAJOR).6 -MONKEY_SITE = http://monkey-project.com/releases/$(MONKEY_VERSION_MAJOR) -MONKEY_LICENSE = Apache-2.0 -MONKEY_LICENSE_FILES = LICENSE - -# This package has a configure script, but it's not using -# autoconf/automake, so we're using the generic-package -# infrastructure. - -MONKEY_CONF_OPTS = \ - --prefix=/usr \ - --sysconfdir=/etc/monkey \ - --datadir=/var/www \ - --mandir=/usr/share/man \ - --logdir=/var/log \ - --pidfile=/var/run \ - --plugdir=/usr/lib/monkey \ - --malloc-libc - -# --uclib-mode is not a typo -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -MONKEY_CONF_OPTS += --uclib-mode --no-backtrace -endif - -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -MONKEY_CONF_OPTS += --musl-mode --no-backtrace -endif - -ifeq ($(BR2_PACKAGE_MONKEY_SHARED),y) -MONKEY_CONF_OPTS += --enable-shared -MONKEY_INSTALL_STAGING = YES -else -# Even without --enable-shared, the monkey build system leaves a -# broken libmonkey.so symbolic link. -define MONKEY_REMOVE_DANGLING_SYMLINK - $(RM) -f $(TARGET_DIR)/usr/lib/libmonkey.so -endef -MONKEY_POST_INSTALL_TARGET_HOOKS += MONKEY_REMOVE_DANGLING_SYMLINK -endif - -ifeq ($(BR2_ENABLE_DEBUG),y) -MONKEY_CONF_OPTS += --debug -endif - -define MONKEY_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(MONKEY_CONF_OPTS)) -endef - -define MONKEY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define MONKEY_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define MONKEY_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/mono-gtksharp3/Config.in b/package.bak/mono-gtksharp3/Config.in deleted file mode 100644 index 570b62c3c9..0000000000 --- a/package.bak/mono-gtksharp3/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MONO_GTKSHARP3 - bool "gtk# 3" - depends on BR2_PACKAGE_LIBGTK3 - help - Gtk# is a .NET language binding for the GTK+ toolkit. - This package provides version 3 of the bindings. - - http://www.mono-project.com/docs/gui/gtksharp/ diff --git a/package.bak/mono-gtksharp3/mono-gtksharp3.hash b/package.bak/mono-gtksharp3/mono-gtksharp3.hash deleted file mode 100644 index 4005051b10..0000000000 --- a/package.bak/mono-gtksharp3/mono-gtksharp3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 from https://download.gnome.org/sources/gtk-sharp/2.99/gtk-sharp-2.99.3.sha256sum -sha256 6440f571416267ae0cb5698071d087b31e3084693fa2c829b1db37ca7ea2c3a2 gtk-sharp-2.99.3.tar.xz diff --git a/package.bak/mono-gtksharp3/mono-gtksharp3.mk b/package.bak/mono-gtksharp3/mono-gtksharp3.mk deleted file mode 100644 index cccfcde126..0000000000 --- a/package.bak/mono-gtksharp3/mono-gtksharp3.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# gtksharp3 -# -################################################################################ - -MONO_GTKSHARP3_VERSION_MAJOR = 2.99 -MONO_GTKSHARP3_VERSION = $(MONO_GTKSHARP3_VERSION_MAJOR).3 -MONO_GTKSHARP3_SITE = http://ftp.gnome.org/pub/gnome/sources/gtk-sharp/$(MONO_GTKSHARP3_VERSION_MAJOR) -MONO_GTKSHARP3_SOURCE = gtk-sharp-$(MONO_GTKSHARP3_VERSION).tar.xz -MONO_GTKSHARP3_LICENSE = LGPLv2, MIT (cairo) -MONO_GTKSHARP3_LICENSE_FILES = COPYING -MONO_GTKSHARP3_INSTALL_STAGING = YES -MONO_GTKSHARP3_DEPENDENCIES = mono libgtk3 -MONO_GTKSHARP3_CONF_OPTS += CSC=$(HOST_DIR)/usr/bin/mcs - -$(eval $(autotools-package)) diff --git a/package.bak/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch b/package.bak/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch deleted file mode 100644 index 7bc7384ad0..0000000000 --- a/package.bak/mono/0001-Disable-backtrace-on-not-supported-uclibc.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5232ec11c74eb49fb220a7e2df80e46ac621e941 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Sat, 7 Feb 2015 09:49:37 +0100 -Subject: [PATCH] Disable backtrace on not supported uclibc - -Signed-off-by: Angelo Compagnucci -Signed-off-by: Thomas Petazzoni ---- - libgc/include/gc.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libgc/include/gc.h b/libgc/include/gc.h -index 2265fdb..6485fc0 100644 ---- a/libgc/include/gc.h -+++ b/libgc/include/gc.h -@@ -500,7 +500,7 @@ GC_API GC_PTR GC_malloc_atomic_ignore_off_page GC_PROTO((size_t lb)); - #if defined(__linux__) || defined(__GLIBC__) - # include - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif --- -2.1.0 - diff --git a/package.bak/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch b/package.bak/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch deleted file mode 100644 index 4c1d522429..0000000000 --- a/package.bak/mono/0002-Adjust-libc.so-path-depending-on-C-library-being-use.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6f8346438e0257259867b5dca6bb6db54eb96705 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 7 Feb 2015 09:50:24 +0100 -Subject: [PATCH] Adjust libc.so path depending on C library being used - -By default, on Linux systems, Mono assumes that the C library is -libc.so.6. While this is true for glibc, it is not true for uClibc and -Musl based systems. This patch adds support for such systems. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 5d9961a..f6a7909 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2978,6 +2978,12 @@ case "$host" in - SQLITE="libsqlite.so" - SQLITE3="libsqlite3.so" - ;; -+ *-*-*uclibc*) -+ LIBC="libc.so.0" -+ ;; -+ *-*-*musl*) -+ LIBC="libc.so" -+ ;; - *-*-*linux*) - AC_PATH_X - dlsearch_path=`(libtool --config ; echo eval echo \\$sys_lib_dlsearch_path_spec) | sh` --- -2.1.0 - diff --git a/package.bak/mono/0004-fixing-initialization-of-have-vasprintf.patch b/package.bak/mono/0004-fixing-initialization-of-have-vasprintf.patch deleted file mode 100644 index 55648593a5..0000000000 --- a/package.bak/mono/0004-fixing-initialization-of-have-vasprintf.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1c3d615d93b20d10c2729478d5104977dd9af23f Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Wed, 5 Aug 2015 12:59:45 +0200 -Subject: [PATCH] Fixing initialization of have_vasprintf - -This patch initialize properly have_vasprintf in case vasprint function is found. -Solves multiple definition of `vasprintf' error in case vasprint is not properly detected. - -Patch is upstream: - - https://github.com/mono/mono/commit/40c171799b671718969ee28a02f92884d7fd181e - -Signed-off-by: Angelo Compagnucci ---- - eglib/configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/eglib/configure.ac b/eglib/configure.ac -index 5281419..4bf91e5 100644 ---- a/eglib/configure.ac -+++ b/eglib/configure.ac -@@ -135,6 +135,7 @@ AC_CHECK_SIZEOF(void *) - AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(strlcpy stpcpy strtok_r rewinddir vasprintf) -+AC_CHECK_FUNC(vasprintf, have_vasprintf=yes) - AC_CHECK_FUNCS(getrlimit) - - # diff --git a/package.bak/mono/0006-Remove-unit-tests-from-mono-compilation.patch b/package.bak/mono/0006-Remove-unit-tests-from-mono-compilation.patch deleted file mode 100644 index 3714b65821..0000000000 --- a/package.bak/mono/0006-Remove-unit-tests-from-mono-compilation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 155f96953d1b898f04a4e708c9ebc1e450b2f63e Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Tue, 24 Nov 2015 23:11:10 +0100 -Subject: [PATCH] Remove unit-tests from mono compilation - -This patch fixes compiling errors with unit-tests under linux. - -Signed-off-by: Angelo Compagnucci ---- - mono/Makefile.am | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/mono/Makefile.am b/mono/Makefile.am -index ef41dfe..7129507 100644 ---- a/mono/Makefile.am -+++ b/mono/Makefile.am -@@ -30,7 +30,7 @@ monotouch-do-clean: - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$target); \ - done; - else --SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler - endif - endif --DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests unit-tests benchmark profiler -+DIST_SUBDIRS = arch utils io-layer cil metadata $(sgen_dirs) mini dis tests benchmark profiler --- -1.9.1 - diff --git a/package.bak/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch b/package.bak/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch deleted file mode 100644 index 58fa3238d3..0000000000 --- a/package.bak/mono/0008-monodoc-Fixing-wrong-monodoc-search-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 18bba65adf58d54645398de26eac24081d48f793 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Thu, 25 Feb 2016 22:19:31 +0100 -Subject: [PATCH] mcs/class/monodoc/Makefile: Fixing wrong monodoc search path - -mono_libdir actually leaks host compiler path, fixing -by hardcoding correct path for our usecase. - -Signed-off-by: Angelo Compagnucci ---- - mcs/class/monodoc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mcs/class/monodoc/Makefile b/mcs/class/monodoc/Makefile -index 3ebba80..ddc2098 100644 ---- a/mcs/class/monodoc/Makefile -+++ b/mcs/class/monodoc/Makefile -@@ -135,7 +135,7 @@ test-local: setup-doc-sources - dist-local: Monodoc.Ecma/EcmaUrlParser.cs - - $(the_lib).config: Makefile monodoc.dll.config.in -- sed 's,@monodoc_refdir@,$(mono_libdir)/monodoc,g' monodoc.dll.config.in > $@ -+ sed 's,@monodoc_refdir@,/usr/lib/monodoc,g' monodoc.dll.config.in > $@ - - Monodoc.Ecma/EcmaUrlParser.cs: Monodoc.Ecma/EcmaUrlParser.jay $(topdir)/jay/skeleton.cs jay.sh - $(topdir)/$(thisdir)/jay.sh $(topdir) $< $@ $(JAY_FLAGS) --- -1.9.1 - diff --git a/package.bak/mono/0009-fix-musl-incorrect-sigcontext-include.patch b/package.bak/mono/0009-fix-musl-incorrect-sigcontext-include.patch deleted file mode 100644 index 3d932b6df9..0000000000 --- a/package.bak/mono/0009-fix-musl-incorrect-sigcontext-include.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 63f0b0246b8125ae48b15bd182bb5831be02e6c9 Mon Sep 17 00:00:00 2001 -From: Angelo Compagnucci -Date: Mon, 27 Jun 2016 21:32:11 +0200 -Subject: [PATCH] fix musl incorrect sigcontext include - -On musl __GLIBC__ is not defined, so the conditional logic will -not produce correct result. Add a specific case to handle when -__GLIBC__ is not defined. - -Signed-off-by: Angelo Compagnucci ---- - libgc/os_dep.c | 2 +- - mono/mini/exceptions-arm.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libgc/os_dep.c b/libgc/os_dep.c -index 8c8e098..34859c1 100644 ---- a/libgc/os_dep.c -+++ b/libgc/os_dep.c -@@ -32,7 +32,7 @@ - /* prototypes, so we have to include the top-level sigcontext.h to */ - /* make sure the former gets defined to be the latter if appropriate. */ - # include --# if 2 <= __GLIBC__ -+# if 2 <= __GLIBC__ || !defined(__GLIBC__) - # if 2 == __GLIBC__ && 0 == __GLIBC_MINOR__ - /* glibc 2.1 no longer has sigcontext.h. But signal.h */ - /* has the right declaration for glibc 2.1. */ -diff --git a/mono/mini/exceptions-arm.c b/mono/mini/exceptions-arm.c -index b036aa7..a3e2164 100644 ---- a/mono/mini/exceptions-arm.c -+++ b/mono/mini/exceptions-arm.c -@@ -14,7 +14,7 @@ - #include - - #ifndef MONO_CROSS_COMPILE --#ifdef HAVE_ASM_SIGCONTEXT_H -+#if defined(HAVE_ASM_SIGCONTEXT_H) && defined(__GLIBC__) - #include - #endif /* def HAVE_ASM_SIGCONTEXT_H */ - #endif --- -1.9.1 - diff --git a/package.bak/mono/Config.in b/package.bak/mono/Config.in deleted file mode 100644 index d45ad376fe..0000000000 --- a/package.bak/mono/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_MONO_ARCH_SUPPORTS - bool - default y if (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_powerpc || BR2_x86_64) - -config BR2_PACKAGE_MONO - bool "mono" - depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - An open source, cross-platform, implementation of C# - and the CLR that is binary compatible with Microsoft.NET. - - http://download.mono-project.com/sources/mono/ - -comment "mono needs a toolchain w/ threads, dynamic library" - depends on BR2_PACKAGE_MONO_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/mono/mono.hash b/package.bak/mono/mono.hash deleted file mode 100644 index 6719fec4d4..0000000000 --- a/package.bak/mono/mono.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 8965d107f4ebf4583ba1b50e0dcad39f0dc6adac8df7a083e9c5879ad93c0ea4 mono-4.6.2.16.tar.bz2 diff --git a/package.bak/mono/mono.mk b/package.bak/mono/mono.mk deleted file mode 100644 index 20b9205683..0000000000 --- a/package.bak/mono/mono.mk +++ /dev/null @@ -1,68 +0,0 @@ -################################################################################ -# -# mono -# -################################################################################ - -MONO_VERSION = 4.6.2.16 -MONO_SITE = http://download.mono-project.com/sources/mono -MONO_SOURCE = mono-$(MONO_VERSION).tar.bz2 -MONO_LICENSE = GPLv2 or MIT (compiler, tools), MIT (libs) or commercial -MONO_LICENSE_FILES = LICENSE mcs/COPYING eglib/COPYING \ - external/Newtonsoft.Json/Tools/7-zip/copying.txt -MONO_INSTALL_STAGING = YES - -## Mono native - -# patching configure.ac -MONO_AUTORECONF = YES - -# Disable managed code (mcs folder) from building -MONO_CONF_OPTS = --disable-gtk-doc \ - --with-mcs-docs=no \ - --with-moonlight=no \ - --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ - --disable-mcs-build \ - --enable-static - -# The libraries have been built by the host-mono build. Since they are -# architecture-independent, we simply copy them to the target. -define MONO_INSTALL_LIBS - rsync -av --exclude=*.so --exclude=*.mdb \ - $(HOST_DIR)/usr/lib/mono $(TARGET_DIR)/usr/lib/ - rsync -av $(HOST_DIR)/etc/mono $(TARGET_DIR)/etc -endef - -MONO_POST_INSTALL_TARGET_HOOKS += MONO_INSTALL_LIBS - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -MONO_DEPENDENCIES += libiconv -endif - -MONO_DEPENDENCIES += host-mono - -## Mono managed - -HOST_MONO_CONF_OPTS = --disable-gtk-doc \ - --with-mcs-docs=no \ - --with-moonlight=no \ - --disable-libraries \ - --with-ikvm-native=no \ - --enable-minimal=profiler,debug \ - --enable-static - -# ensure monolite is used -HOST_MONO_MAKE_OPTS += EXTERNAL_MCS=false - -HOST_MONO_DEPENDENCIES = host-monolite host-gettext - -define HOST_MONO_SETUP_MONOLITE - rm -rf $(@D)/mcs/class/lib/monolite - (cd $(@D)/mcs/class/lib; ln -s $(HOST_DIR)/usr/lib/monolite monolite) -endef - -HOST_MONO_POST_CONFIGURE_HOOKS += HOST_MONO_SETUP_MONOLITE - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/monolite/monolite.hash b/package.bak/monolite/monolite.hash deleted file mode 100644 index 621e5e4f5f..0000000000 --- a/package.bak/monolite/monolite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 c01e9ba37d8d8f9ef68e08170b2582cc710a8a77756e2412dff298a39b3c4d2b monolite-149-latest.tar.gz diff --git a/package.bak/monolite/monolite.mk b/package.bak/monolite/monolite.mk deleted file mode 100644 index d50d9f22fb..0000000000 --- a/package.bak/monolite/monolite.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# monolite -# -################################################################################ - -MONOLITE_VERSION = 149 -MONOLITE_SITE = http://download.mono-project.com/monolite/ -MONOLITE_SOURCE = monolite-$(MONOLITE_VERSION)-latest.tar.gz -MONOLITE_LICENSE = LGPLv2 or commercial - -define HOST_MONOLITE_INSTALL_CMDS - mkdir -p $(HOST_DIR)/usr/lib/monolite - cp $(@D)/* $(HOST_DIR)/usr/lib/monolite -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/mosh/Config.in b/package.bak/mosh/Config.in deleted file mode 100644 index d1fbd632eb..0000000000 --- a/package.bak/mosh/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -comment "mosh needs a toolchain w/ C++, threads, dynamic library, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP \ - || BR2_STATIC_LIBS || !BR2_USE_WCHAR - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - -config BR2_PACKAGE_MOSH - bool "mosh" - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP # protobuf - depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf - depends on !BR2_STATIC_LIBS # protobuf - depends on BR2_USE_WCHAR - select BR2_PACKAGE_PROTOBUF - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_NETTLE if !BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - # runtime dependency - select BR2_PACKAGE_OPENSSH if !BR2_PACKAGE_DROPBEAR_CLIENT - help - Remote terminal application that supports intermittent connectivity, - allows roaming, and provides speculative local echo and line editing - of user keystrokes. - - https://mosh.mit.edu diff --git a/package.bak/mosh/mosh.hash b/package.bak/mosh/mosh.hash deleted file mode 100644 index 31f59c7f5e..0000000000 --- a/package.bak/mosh/mosh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://mailman.mit.edu/pipermail/mosh-users/2016-August/000330.html -sha256 7e82b7fbfcc698c70f5843bb960dadb8e7bd7ac1d4d2151c9d979372ea850e85 mosh-1.2.6.tar.gz diff --git a/package.bak/mosh/mosh.mk b/package.bak/mosh/mosh.mk deleted file mode 100644 index 2cd358b397..0000000000 --- a/package.bak/mosh/mosh.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# mosh -# -################################################################################ - -MOSH_VERSION = 1.2.6 -MOSH_SITE = https://mosh.mit.edu -MOSH_DEPENDENCIES = zlib ncurses protobuf host-pkgconf -MOSH_LICENSE = GPLv3+ with exception -MOSH_LICENSE_FILES = COPYING COPYING.iOS - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MOSH_CONF_OPTS += --with-crypto-library=openssl -MOSH_DEPENDENCIES += openssl -else -MOSH_CONF_OPTS += --with-crypto-library=nettle -MOSH_DEPENDENCIES += nettle -endif - -# help the detection of the SSP support: mosh configure.ac doesn't do -# a link test, so it doesn't detect when the toolchain doesn't have -# libssp. -ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) -MOSH_CONF_ENV += \ - ax_cv_check_cflags__Werror___fstack_protector_all=no \ - ax_cv_check_cxxflags__Werror___fstack_protector_all=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mosquitto/Config.in b/package.bak/mosquitto/Config.in deleted file mode 100644 index 1e6418a4de..0000000000 --- a/package.bak/mosquitto/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_MOSQUITTO - bool "mosquitto" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_STATIC_LIBS # builds .so - help - Mosquitto is an open source message broker that implements - the MQ Telemetry Transport protocol versions 3.1 and - 3.1.1. MQTT provides a lightweight method of carrying out - messaging using a publish/subscribe model. This makes it - suitable for "machine to machine" messaging such as with low - power sensors or mobile devices such as phones, embedded - computers or microcontrollers like the Arduino. - - http://mosquitto.org/ - -comment "mosquitto needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS diff --git a/package.bak/mosquitto/S50mosquitto b/package.bak/mosquitto/S50mosquitto deleted file mode 100644 index 5241a071d7..0000000000 --- a/package.bak/mosquitto/S50mosquitto +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -start() { - printf "Starting mosquitto: " - start-stop-daemon -S -q -m -b -p /var/run/mosquitto.pid \ - --exec /usr/sbin/mosquitto \ - -- -c /etc/mosquitto/mosquitto.conf - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping mosquitto: " - start-stop-daemon -K -q -p /var/run/mosquitto.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/mosquitto/mosquitto.hash b/package.bak/mosquitto/mosquitto.hash deleted file mode 100644 index b0b860f98c..0000000000 --- a/package.bak/mosquitto/mosquitto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.eclipse.org/downloads/download.php?file=/mosquitto/source/mosquitto-1.4.10.tar.gz -sha512 fe5d6d7196a137a496ba6881c77d852396baefb4f0b83ccd9a22175fc05b09e48a09ea249e30ec7db966e11de134ebcc4e2e9b1fd40b31dc59fb0fa2f60b75a1 mosquitto-1.4.10.tar.gz diff --git a/package.bak/mosquitto/mosquitto.mk b/package.bak/mosquitto/mosquitto.mk deleted file mode 100644 index 96607f32e3..0000000000 --- a/package.bak/mosquitto/mosquitto.mk +++ /dev/null @@ -1,98 +0,0 @@ -################################################################################ -# -# mosquitto -# -################################################################################ - -MOSQUITTO_VERSION = 1.4.10 -MOSQUITTO_SITE = http://mosquitto.org/files/source -MOSQUITTO_LICENSE = EPLv1.0 or EDLv1.0 -MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v10 edl-v10 -MOSQUITTO_INSTALL_STAGING = YES - -MOSQUITTO_MAKE_OPTS = \ - UNAME=Linux \ - STRIP=true \ - prefix=/usr \ - WITH_WRAP=no \ - WITH_DOCS=no - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -MOSQUITTO_MAKE_OPTS += WITH_THREADING=yes -else -MOSQUITTO_MAKE_OPTS += WITH_THREADING=no -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MOSQUITTO_DEPENDENCIES += openssl -MOSQUITTO_MAKE_OPTS += WITH_TLS=yes -else -MOSQUITTO_MAKE_OPTS += WITH_TLS=no -endif - -ifeq ($(BR2_PACKAGE_C_ARES),y) -MOSQUITTO_DEPENDENCIES += c-ares -MOSQUITTO_MAKE_OPTS += WITH_SRV=yes -else -MOSQUITTO_MAKE_OPTS += WITH_SRV=no -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -MOSQUITTO_DEPENDENCIES += util-linux -MOSQUITTO_MAKE_OPTS += WITH_UUID=yes -else -MOSQUITTO_MAKE_OPTS += WITH_UUID=no -endif - -ifeq ($(BR2_PACKAGE_LIBWEBSOCKETS),y) -MOSQUITTO_DEPENDENCIES += libwebsockets -MOSQUITTO_MAKE_OPTS += WITH_WEBSOCKETS=yes -else -MOSQUITTO_MAKE_OPTS += WITH_WEBSOCKETS=no -endif - -# C++ support is only used to create a wrapper library -ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -define MOSQUITTO_DISABLE_CPP - $(SED) '/-C cpp/d' $(@D)/lib/Makefile -endef - -MOSQUITTO_POST_PATCH_HOOKS += MOSQUITTO_DISABLE_CPP -endif - -define MOSQUITTO_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(MOSQUITTO_MAKE_OPTS) -endef - -define MOSQUITTO_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(MOSQUITTO_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -endef - -define MOSQUITTO_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - $(MOSQUITTO_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - rm -f $(TARGET_DIR)/etc/mosquitto/*.example - $(INSTALL) -D -m 0644 $(@D)/mosquitto.conf \ - $(TARGET_DIR)/etc/mosquitto/mosquitto.conf -endef - -define MOSQUITTO_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/mosquitto/S50mosquitto \ - $(TARGET_DIR)/etc/init.d/S50mosquitto -endef - -define MOSQUITTO_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/mosquitto/mosquitto.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mosquitto.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/mosquitto.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mosquitto.service -endef - -define MOSQUITTO_USERS - mosquitto -1 nogroup -1 * - - - Mosquitto user -endef - -$(eval $(generic-package)) diff --git a/package.bak/mosquitto/mosquitto.service b/package.bak/mosquitto/mosquitto.service deleted file mode 100644 index 2d1939d1c7..0000000000 --- a/package.bak/mosquitto/mosquitto.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Mosquitto MQTT broker - -[Service] -ExecStart=/usr/sbin/mosquitto -c /etc/mosquitto/mosquitto.conf -ExecReload=/bin/kill -HUP $MAINPID -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/motion/0001-version.patch b/package.bak/motion/0001-version.patch deleted file mode 100644 index 610a7c7e2b..0000000000 --- a/package.bak/motion/0001-version.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -uNr motion/version.sh motion.new/version.sh ---- motion/version.sh 2016-11-13 12:45:14.143548855 +0200 -+++ motion.new/version.sh 2016-11-13 12:45:31.683635991 +0200 -@@ -1,8 +1,9 @@ - #!/bin/sh - BASE_VERSION="4.0.1" - if [ -d .git ]; then -- GIT_COMMIT=`git show -s --format=%h` -- printf "$BASE_VERSION+git$GIT_COMMIT" -+ GIT_COMMIT=`git show -s --format=%h` -+ printf "$BASE_VERSION+git$GIT_COMMIT" - else -- printf "$BASE_VERSION+gitUNKNOWN" -+ printf "$BASE_VERSION+git$(basename $(pwd) | cut -d '-' -f 2)" - fi -+ diff --git a/package.bak/motion/Config.in b/package.bak/motion/Config.in deleted file mode 100644 index 6bd458ed34..0000000000 --- a/package.bak/motion/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_PACKAGE_MOTION - bool "motion" - help diff --git a/package.bak/motion/motion.mk b/package.bak/motion/motion.mk deleted file mode 100644 index f3815e37a4..0000000000 --- a/package.bak/motion/motion.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# motion -# -################################################################################ - -MOTION_VERSION = 37b3595 -MOTION_SITE = $(call github,motion-project,motion,$(MOTION_VERSION)) -MOTION_AUTORECONF = YES -MOTION_CONF_OPTS = --without-pgsql --without-sdl --without-sqlite3 --without-mysql --with-ffmpeg=$(STAGING_DIR)/usr/lib \ - --with-ffmpeg-headers=$(STAGING_DIR)/usr/include - -define MOTION_INSTALL_TARGET_CMDS - cp $(@D)/motion $(TARGET_DIR)/usr/bin/motion -endef - -$(eval $(autotools-package)) - diff --git a/package.bak/mp4v2/Config.in b/package.bak/mp4v2/Config.in deleted file mode 100644 index 42315a2272..0000000000 --- a/package.bak/mp4v2/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_MP4V2 - bool "mp4v2" - depends on BR2_INSTALL_LIBSTDCPP - help - The MP4v2 library provides functions to read, create, and - modify mp4 files. - - https://code.google.com/p/mp4v2/ - -if BR2_PACKAGE_MP4V2 - -config BR2_PACKAGE_MP4V2_UTIL - bool "Install mp4 command line tools" - help - Enable to install the mp4 command line tools mp4art, - mp4chaps, mp4extract, mp4info, mp4subtitle, mp4tags, and - mp4trackdump. - -endif - -comment "mp4v2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/mp4v2/mp4v2.hash b/package.bak/mp4v2/mp4v2.hash deleted file mode 100644 index d5a49c44ce..0000000000 --- a/package.bak/mp4v2/mp4v2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://code.google.com/p/mp4v2/downloads/detail?name=mp4v2-2.0.0.tar.bz2 -sha1 193260cfb7201e6ec250137bcca1468d4d20e2f0 mp4v2-2.0.0.tar.bz2 diff --git a/package.bak/mp4v2/mp4v2.mk b/package.bak/mp4v2/mp4v2.mk deleted file mode 100644 index 2acbb4ea74..0000000000 --- a/package.bak/mp4v2/mp4v2.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# mp4v2 -# -################################################################################ - -MP4V2_VERSION = 2.0.0 -MP4V2_SOURCE = mp4v2-$(MP4V2_VERSION).tar.bz2 -MP4V2_SITE = https://mp4v2.googlecode.com/files -MP4V2_INSTALL_STAGING = YES -MP4V2_LICENSE = MPLv1.1 -MP4V2_LICENSE_FILES = COPYING - -# help2man expects to be able to run utilities on the build machine to -# grab --help output which doesn't work when cross compiling, so -# disable it -MP4V2_CONF_ENV = ac_cv_prog_FOUND_HELP2MAN=no - -ifeq ($(BR2_PACKAGE_MP4V2_UTIL),y) -MP4V2_CONF_OPTS += --enable-util -else -MP4V2_CONF_OPTS += --disable-util -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mpc/Config.in b/package.bak/mpc/Config.in deleted file mode 100644 index 83770133e5..0000000000 --- a/package.bak/mpc/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MPC - bool "mpc" - select BR2_PACKAGE_MPFR - select BR2_PACKAGE_GMP - help - Mpc is a C library for the arithmetic of complex numbers with - arbitrarily high precision and correct rounding of the result. - It is built upon and follows the same principles as Mpfr. - - http://www.multiprecision.org/ diff --git a/package.bak/mpc/mpc.hash b/package.bak/mpc/mpc.hash deleted file mode 100644 index 98f1447a0d..0000000000 --- a/package.bak/mpc/mpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.multiprecision.org/index.php?prog=mpc&page=download -sha1 b8be66396c726fdc36ebb0f692ed8a8cca3bcc66 mpc-1.0.3.tar.gz diff --git a/package.bak/mpc/mpc.mk b/package.bak/mpc/mpc.mk deleted file mode 100644 index 579e2ccc10..0000000000 --- a/package.bak/mpc/mpc.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# mpc -# -################################################################################ - -MPC_VERSION = 1.0.3 -MPC_SITE = $(BR2_GNU_MIRROR)/mpc -MPC_LICENSE = LGPLv3+ -MPC_LICENSE_FILES = COPYING.LESSER -MPC_INSTALL_STAGING = YES -MPC_DEPENDENCIES = gmp mpfr -HOST_MPC_DEPENDENCIES = host-gmp host-mpfr - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/mpd-mpc/Config.in b/package.bak/mpd-mpc/Config.in deleted file mode 100644 index 1debc839a2..0000000000 --- a/package.bak/mpd-mpc/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MPD_MPC - bool "mpd-mpc" - select BR2_PACKAGE_LIBMPDCLIENT - help - A minimalist command line interface to MPD. - - http://www.musicpd.org/clients/mpc/ diff --git a/package.bak/mpd-mpc/mpd-mpc.hash b/package.bak/mpd-mpc/mpd-mpc.hash deleted file mode 100644 index 8336893744..0000000000 --- a/package.bak/mpd-mpc/mpd-mpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 a4337d06c85dc81a638821d30fce8a137a58d13d510be34a11c1cce95cabc547 mpc-0.28.tar.xz diff --git a/package.bak/mpd-mpc/mpd-mpc.mk b/package.bak/mpd-mpc/mpd-mpc.mk deleted file mode 100644 index d9aa1f8795..0000000000 --- a/package.bak/mpd-mpc/mpd-mpc.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# mpd-mpc -# -################################################################################ - -MPD_MPC_VERSION_MAJOR = 0 -MPD_MPC_VERSION = $(MPD_MPC_VERSION_MAJOR).28 -MPD_MPC_SITE = http://www.musicpd.org/download/mpc/$(MPD_MPC_VERSION_MAJOR) -MPD_MPC_SOURCE = mpc-$(MPD_MPC_VERSION).tar.xz -MPD_MPC_LICENSE = GPLv2+ -MPD_MPC_LICENSE_FILES = COPYING -MPD_MPC_DEPENDENCIES = host-pkgconf libmpdclient -MPD_MPC_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' - -$(eval $(autotools-package)) diff --git a/package.bak/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch b/package.bak/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch deleted file mode 100644 index a9873a741f..0000000000 --- a/package.bak/mpd/0001-configure.ac-check-if-libatomic-is-needed.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 8eaf14a17244aaf000b4d19e4fde4a637576939f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 21:40:47 +0100 -Subject: [PATCH] configure.ac: check if libatomic is needed - -The mpd source code uses the C++11 functionality, which -internally is implemented using the __atomic_*() gcc built-ins. On -certain architectures, the __atomic_*() built-ins are implemented in -the libatomic library that comes with the rest of the gcc runtime. Due -to this, code using might need to link against libatomic, -otherwise one hits build issues such as: - -GlobalEvents.cxx:(.text._ZN12GlobalEvents4EmitENS_5EventE+0x14): undefined reference to `__atomic_fetch_or_4' - -on an architecture like SPARC. - -To solve this, a configure.ac check is added to know if we need to -link against libatomic or not. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 107b45a..8e6fab7 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -233,6 +233,8 @@ if test x$have_pthread_setname_np = xyes; then - AC_DEFINE(HAVE_PTHREAD_SETNAME_NP, 1, [Is pthread_setname_np() available?]) - fi - -+AC_SEARCH_LIBS([__atomic_load_4], [atomic]) -+ - dnl --------------------------------------------------------------------------- - dnl Event loop selection - dnl --------------------------------------------------------------------------- --- -2.6.4 - diff --git a/package.bak/mpd/Config.in b/package.bak/mpd/Config.in deleted file mode 100644 index 8eabbbc796..0000000000 --- a/package.bak/mpd/Config.in +++ /dev/null @@ -1,341 +0,0 @@ -menuconfig BR2_PACKAGE_MPD - bool "mpd" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # flac - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork - depends on BR2_TOOLCHAIN_HAS_ATOMIC - # 0.19.x could be built with GCC 4.6, but for simplicity we require - # the same toolchain dependencies for all versions. - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # C++14 - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_MPD_TREMOR if !(BR2_PACKAGE_MPD_MAD || BR2_PACKAGE_MPD_MPG123 || BR2_PACKAGE_MPD_VORBIS || BR2_PACKAGE_MPD_WAVPACK || BR2_PACKAGE_MPD_FLAC || BR2_PACKAGE_MPD_MUSEPACK || BR2_PACKAGE_MPD_FFMPEG) - help - MPD is a flexible, powerful, server-side application - for playing music. Through plugins and libraries - it can play a variety of sound files while being - controlled by its network protocol. - - http://www.musicpd.org - -if BR2_PACKAGE_MPD - -# Hidden config symbols to select the branch 0.20 by default and fallback -# to branch 0.19 for toolchains affected by GCC bug PR 64735. This way we -# keep support for mpd on some architectures, like ARMv5, until GCC 7 is -# released, which will fix this issue. -config BR2_PACKAGE_MPD_VERSION_STRING - string - default "0.20" if !BR2_TOOLCHAIN_HAS_GCC_BUG_64735 - default "0.19" - -config BR2_PACKAGE_MPD_VERSION_0_20 - bool - default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.20" - -config BR2_PACKAGE_MPD_VERSION_0_19 - bool - default y if BR2_PACKAGE_MPD_VERSION_STRING = "0.19" - select BR2_PACKAGE_LIBGLIB2 - -comment "Archive plugins" - -config BR2_PACKAGE_MPD_BZIP2 - bool "bzip2" - select BR2_PACKAGE_BZIP2 - help - Enable bzip2 archive support. - -config BR2_PACKAGE_MPD_SQLITE - bool "sqlite" - select BR2_PACKAGE_SQLITE - help - Enable sqlite database support. - If you don't use sqlite it will use an ASCII database. - -comment "Converter plugins" - -config BR2_PACKAGE_MPD_LIBSAMPLERATE - bool "libsamplerate" - select BR2_PACKAGE_LIBSAMPLERATE - help - Enable libsamplerate input support. - Select this for software sample rate conversion. - -config BR2_PACKAGE_MPD_LIBSOXR - bool "libsoxr" - select BR2_PACKAGE_LIBSOXR - help - Enable libsoxr resampler support. - The SoX Resampler library performs software sample-rate - conversion. - -comment "Decoder plugins" - -config BR2_PACKAGE_MPD_AUDIOFILE - bool "audiofile" - select BR2_PACKAGE_AUDIOFILE - help - Enable audiofile input/streaming support. - Select this if you want to play back WAV files. - -config BR2_PACKAGE_MPD_DSD - bool "dsd" - help - Enable Digital Speech Decoder (DSD) support to play audio - files encoded in a digital speech format. - -config BR2_PACKAGE_MPD_FAAD2 - bool "faad2" - select BR2_PACKAGE_FAAD2 - help - Enable faad2 input support. - Select this if you want to play back MP4/AAC files. - -config BR2_PACKAGE_MPD_FFMPEG - bool "ffmpeg" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_FFMPEG - help - Enable ffmpeg input support. - Select this if you want to play back files supported by - ffmpeg. - -config BR2_PACKAGE_MPD_FLAC - bool "flac" - select BR2_PACKAGE_FLAC - help - Enable flac input/streaming support. - Select this if you want to play back FLAC files. - -config BR2_PACKAGE_MPD_LIBSNDFILE - bool "libsndfile" - select BR2_PACKAGE_LIBSNDFILE - help - Enable libsndfile input/streaming support. - Select this if you want to play back WAV files. - -config BR2_PACKAGE_MPD_MAD - bool "mad" - default y - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_LIBMAD - help - Enable mad input support. - Select this if you want to play back MP3 files. - -config BR2_PACKAGE_MPD_MPG123 - bool "mpg123" - select BR2_PACKAGE_LIBID3TAG - select BR2_PACKAGE_MPG123 - help - Enable mpg123 input support. - Select this if you want to play back MP3 files. - -config BR2_PACKAGE_MPD_MUSEPACK - bool "musepack" - select BR2_PACKAGE_LIBCUEFILE - select BR2_PACKAGE_LIBREPLAYGAIN - select BR2_PACKAGE_MUSEPACK - help - Enable musepack input support. - Select this if you want to play back MPC files. - -config BR2_PACKAGE_MPD_OPUS - bool "opus" - select BR2_PACKAGE_OPUS - select BR2_PACKAGE_LIBOGG - help - Enable opus input support. - Select this if you want to play back OPUS encoded files. - -config BR2_PACKAGE_MPD_TREMOR - bool "tremor" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_TREMOR - help - Enable vorbis input support. - Select this if you want to play back OGG files on softfloat - targets. - -config BR2_PACKAGE_MPD_VORBIS - bool "vorbis" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - help - Enable vorbis input/streaming support. - Select this if you want to play back OGG files on hardfloat - targets. - -config BR2_PACKAGE_MPD_WAVPACK - bool "wavpack" - select BR2_PACKAGE_WAVPACK - help - Enable wavpack input support. - Select this if you want to play back WV files. - -comment "Encoder plugins" - -config BR2_PACKAGE_MPD_LAME - bool "lame" - select BR2_PACKAGE_LAME - help - Enable lame (mp3) encoding support. - -config BR2_PACKAGE_MPD_TWOLAME - bool "twolame" - select BR2_PACKAGE_TWOLAME - help - Enable TwoLAME mp2 encoding. - -comment "Input plugins" - -config BR2_PACKAGE_MPD_CURL - bool "curl" - select BR2_PACKAGE_LIBCURL - help - Enable curl streaming (http) support. - -config BR2_PACKAGE_MPD_LIBNFS - bool "nfs" - # libnfs -> libtirpc - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBNFS - help - Enable Network File System (NFS) support. - -comment "nfs support needs a toolchain w/ threads support" - depends on !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) - -comment "samba support needs a glibc toolchain w/ dynamic library, RPC" - depends on !BR2_nios2 - depends on !BR2_TOOLCHAIN_USES_GLIBC || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC - -config BR2_PACKAGE_MPD_LIBSMBCLIENT - bool "samba" - depends on !BR2_nios2 # samba - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_SAMBA4 - help - Enable Samba support. - -config BR2_PACKAGE_MPD_SOUNDCLOUD - bool "soundcloud" - select BR2_PACKAGE_YAJL - help - Enable soundcloud.com playlist support. - -comment "Output plugins" - -config BR2_PACKAGE_MPD_ALSA - bool "alsa" - default y - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_PCM - select BR2_PACKAGE_ALSA_LIB_MIXER - help - Enable alsa output support. - -config BR2_PACKAGE_MPD_AO - bool "ao" - select BR2_PACKAGE_LIBAO - help - Enable libao output support. - -config BR2_PACKAGE_MPD_HTTPD_OUTPUT - bool "httpd output" - help - Enable httpd output support. - -config BR2_PACKAGE_MPD_JACK2 - bool "jack2" - depends on !BR2_STATIC_LIBS # jack2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_JACK2 - help - Enable jack output support. - -comment "jack support needs a toolchain w/ dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_MPD_OSS - bool "oss" - help - Enable OSS (Open Sound System) output support. - -config BR2_PACKAGE_MPD_PULSEAUDIO - bool "pulseaudio" - depends on !BR2_STATIC_LIBS # pulseaudio - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pulseaudio -> json-c - select BR2_PACKAGE_PULSEAUDIO - help - Enable pulseaudio output support. - -comment "pulseaudio support needs a toolchain w/ dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_MPD_SHOUTCAST - bool "shoutcast" - select BR2_PACKAGE_LIBSHOUT - help - Enable shoutcast streaming output support. - -comment "Miscellaneous plugins" - -config BR2_PACKAGE_MPD_AVAHI_SUPPORT - bool "avahi (zeroconf) support" - depends on !BR2_STATIC_LIBS # avahi - select BR2_PACKAGE_AVAHI - select BR2_PACKAGE_AVAHI_DAEMON - select BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY - help - Enable Avahi (zeroconf) support. - Select this for multicast DNS/DNS-SD service discovery - support. This allows MPD to publish service information on a - local network. - -comment "avahi support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT - bool "neighbor discovery support" - depends on BR2_PACKAGE_MPD_LIBSMBCLIENT || BR2_PACKAGE_MPD_UPNP - help - Enable support for neighbor discovery. - This option can be used in conjunction with the smbclient - plugin to provide a list of SMB/CIFS servers or with the - UPnP plugin to provide a list of UPnP servers on the local - network. The neighbor plugin needs configuration in - mpd.conf. For further information take a look at the MPD - documentation. - -config BR2_PACKAGE_MPD_TCP - bool "tcp sockets" - default y - help - Enable MPD to listen on tcp sockets. - - You want this on if MPD and the client(s) work - on different machines (the usual scenario). - -config BR2_PACKAGE_MPD_UPNP - bool "UPnP" - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBUPNP - help - Enable MPD UPnP client support. - -endif - -comment "mpd needs a toolchain w/ C++, threads, wchar, gcc >= 4.9" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 diff --git a/package.bak/mpd/S95mpd b/package.bak/mpd/S95mpd deleted file mode 100644 index 9f68b45837..0000000000 --- a/package.bak/mpd/S95mpd +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# Sanity checks -test -f /usr/bin/mpd || exit 0 -test -f /etc/mpd.conf || exit 0 - -start() { - printf "Starting mpd: " - start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \ - && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping mpd: " - start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \ - && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 1 - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/mpd/mpd.conf b/package.bak/mpd/mpd.conf deleted file mode 100644 index 5956b75e24..0000000000 --- a/package.bak/mpd/mpd.conf +++ /dev/null @@ -1,32 +0,0 @@ -# -# Sample configuration file for mpd -# This is a minimal configuration, see the manpage for more options -# - -# Directory where the music is stored -music_directory "/var/lib/mpd/music" - -# Directory where user-made playlists are stored (RW) -playlist_directory "/var/lib/mpd/playlists" - -# Database file (RW) -db_file "/var/lib/mpd/database" - -# Log file (RW) -log_file "/var/log/mpd.log" - -# Process ID file (RW) -pid_file "/var/run/mpd.pid" - -# State file (RW) -state_file "/var/lib/mpd/state" - -# User id to run the daemon as -#user "nobody" - -# TCP socket binding -bind_to_address "any" -#bind_to_address "localhost" - -# Unix socket to listen on -bind_to_address "/var/lib/mpd/socket" diff --git a/package.bak/mpd/mpd.hash b/package.bak/mpd/mpd.hash deleted file mode 100644 index ecd78e97c1..0000000000 --- a/package.bak/mpd/mpd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 712b25351c12616630c580204e1c3dcba3ae2993a56cff1c346c87e334d69728 mpd-0.20.4.tar.xz -sha256 8305b8bc026f4b6bde28b8dd09bfdddbe5590acf36358eed4d083a396e301730 mpd-0.19.21.tar.xz diff --git a/package.bak/mpd/mpd.mk b/package.bak/mpd/mpd.mk deleted file mode 100644 index 8e71ae2141..0000000000 --- a/package.bak/mpd/mpd.mk +++ /dev/null @@ -1,278 +0,0 @@ -################################################################################ -# -# mpd -# -################################################################################ - -MPD_VERSION_MAJOR = $(call qstrip,$(BR2_PACKAGE_MPD_VERSION_STRING)) -ifeq ($(BR2_PACKAGE_MPD_VERSION_0_20),y) -MPD_VERSION = $(MPD_VERSION_MAJOR).4 -else -MPD_VERSION = $(MPD_VERSION_MAJOR).21 -endif -MPD_SOURCE = mpd-$(MPD_VERSION).tar.xz -MPD_SITE = http://www.musicpd.org/download/mpd/$(MPD_VERSION_MAJOR) -MPD_DEPENDENCIES = host-pkgconf boost -MPD_LICENSE = GPLv2+ -MPD_LICENSE_FILES = COPYING -MPD_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_MPD_VERSION_0_19),y) -MPD_DEPENDENCIES += libglib2 -endif - -# Some options need an explicit --disable or --enable - -# Zeroconf support depends on libdns_sd from avahi. -ifeq ($(BR2_PACKAGE_MPD_AVAHI_SUPPORT),y) -MPD_DEPENDENCIES += avahi -MPD_CONF_OPTS += --with-zeroconf=avahi -else -MPD_CONF_OPTS += --with-zeroconf=no -endif - -# MPD prefers libicu for utf8 collation instead of libglib2. -ifeq ($(BR2_PACKAGE_ICU),y) -MPD_DEPENDENCIES += icu -MPD_CONF_OPTS += --enable-icu -else -MPD_CONF_OPTS += --disable-icu -endif - -ifeq ($(BR2_PACKAGE_MPD_ALSA),y) -MPD_DEPENDENCIES += alsa-lib -MPD_CONF_OPTS += --enable-alsa -else -MPD_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_MPD_AO),y) -MPD_DEPENDENCIES += libao -MPD_CONF_OPTS += --enable-ao -else -MPD_CONF_OPTS += --disable-ao -endif - -ifeq ($(BR2_PACKAGE_MPD_AUDIOFILE),y) -MPD_DEPENDENCIES += audiofile -MPD_CONF_OPTS += --enable-audiofile -else -MPD_CONF_OPTS += --disable-audiofile -endif - -ifeq ($(BR2_PACKAGE_MPD_BZIP2),y) -MPD_DEPENDENCIES += bzip2 -MPD_CONF_OPTS += --enable-bzip2 -else -MPD_CONF_OPTS += --disable-bzip2 -endif - -ifeq ($(BR2_PACKAGE_MPD_CURL),y) -MPD_DEPENDENCIES += libcurl -MPD_CONF_OPTS += --enable-curl -else -MPD_CONF_OPTS += --disable-curl -endif - -ifeq ($(BR2_PACKAGE_MPD_DSD),y) -MPD_CONF_OPTS += --enable-dsd -else -MPD_CONF_OPTS += --disable-dsd -endif - -ifeq ($(BR2_PACKAGE_MPD_FAAD2),y) -MPD_DEPENDENCIES += faad2 -MPD_CONF_OPTS += --enable-aac -else -MPD_CONF_OPTS += --disable-aac -endif - -ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y) -MPD_DEPENDENCIES += ffmpeg -MPD_CONF_OPTS += --enable-ffmpeg -else -MPD_CONF_OPTS += --disable-ffmpeg -endif - -ifeq ($(BR2_PACKAGE_MPD_FLAC),y) -MPD_DEPENDENCIES += flac -MPD_CONF_OPTS += --enable-flac -else -MPD_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_MPD_HTTPD_OUTPUT),y) -MPD_CONF_OPTS += --enable-httpd-output -else -MPD_CONF_OPTS += --disable-httpd-output -endif - -ifeq ($(BR2_PACKAGE_MPD_JACK2),y) -MPD_DEPENDENCIES += jack2 -MPD_CONF_OPTS += --enable-jack -else -MPD_CONF_OPTS += --disable-jack -endif - -ifeq ($(BR2_PACKAGE_MPD_LAME),y) -MPD_DEPENDENCIES += lame -MPD_CONF_OPTS += --enable-lame-encoder -else -MPD_CONF_OPTS += --disable-lame-encoder -endif - -ifeq ($(BR2_PACKAGE_MPD_LIBNFS),y) -MPD_DEPENDENCIES += libnfs -MPD_CONF_OPTS += --enable-nfs -else -MPD_CONF_OPTS += --disable-nfs -endif - -ifeq ($(BR2_PACKAGE_MPD_LIBSMBCLIENT),y) -MPD_DEPENDENCIES += samba4 -MPD_CONF_OPTS += --enable-smbclient -else -MPD_CONF_OPTS += --disable-smbclient -endif - -ifeq ($(BR2_PACKAGE_MPD_LIBSAMPLERATE),y) -MPD_DEPENDENCIES += libsamplerate -MPD_CONF_OPTS += --enable-lsr -else -MPD_CONF_OPTS += --disable-lsr -endif - -ifeq ($(BR2_PACKAGE_MPD_LIBSNDFILE),y) -MPD_DEPENDENCIES += libsndfile -MPD_CONF_OPTS += --enable-sndfile -else -MPD_CONF_OPTS += --disable-sndfile -endif - -ifeq ($(BR2_PACKAGE_MPD_LIBSOXR),y) -MPD_DEPENDENCIES += libsoxr -MPD_CONF_OPTS += --enable-soxr -else -MPD_CONF_OPTS += --disable-soxr -endif - -ifeq ($(BR2_PACKAGE_MPD_MAD),y) -MPD_DEPENDENCIES += libid3tag libmad -MPD_CONF_OPTS += --enable-mad -else -MPD_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_MPD_MPG123),y) -MPD_DEPENDENCIES += libid3tag mpg123 -MPD_CONF_OPTS += --enable-mpg123 -else -MPD_CONF_OPTS += --disable-mpg123 -endif - -ifeq ($(BR2_PACKAGE_MPD_MUSEPACK),y) -MPD_DEPENDENCIES += musepack -MPD_CONF_OPTS += --enable-mpc -else -MPD_CONF_OPTS += --disable-mpc -endif - -ifeq ($(BR2_PACKAGE_MPD_NEIGHBOR_DISCOVERY_SUPPORT),y) -MPD_CONF_OPTS += --enable-neighbor-plugins -else -MPD_CONF_OPTS += --disable-neighbor-plugins -endif - -ifeq ($(BR2_PACKAGE_MPD_OPUS),y) -MPD_DEPENDENCIES += opus libogg -MPD_CONF_OPTS += --enable-opus -else -MPD_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_MPD_OSS),y) -MPD_CONF_OPTS += --enable-oss -else -MPD_CONF_OPTS += --disable-oss -endif - -ifeq ($(BR2_PACKAGE_MPD_PULSEAUDIO),y) -MPD_DEPENDENCIES += pulseaudio -MPD_CONF_OPTS += --enable-pulse -else -MPD_CONF_OPTS += --disable-pulse -endif - -ifeq ($(BR2_PACKAGE_MPD_SHOUTCAST),y) -MPD_DEPENDENCIES += libshout -MPD_CONF_OPTS += --enable-shout -else -MPD_CONF_OPTS += --disable-shout -endif - -ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y) -MPD_DEPENDENCIES += yajl -MPD_CONF_OPTS += --enable-soundcloud -else -MPD_CONF_OPTS += --disable-soundcloud -endif - -ifeq ($(BR2_PACKAGE_MPD_SQLITE),y) -MPD_DEPENDENCIES += sqlite -MPD_CONF_OPTS += --enable-sqlite -else -MPD_CONF_OPTS += --disable-sqlite -endif - -ifneq ($(BR2_PACKAGE_MPD_TCP),y) -MPD_CONF_OPTS += --disable-tcp -endif - -ifeq ($(BR2_PACKAGE_MPD_TREMOR),y) -MPD_DEPENDENCIES += tremor -# Help mpd to find tremor in static linking scenarios -MPD_CONF_ENV += \ - TREMOR_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs vorbisidec`" -MPD_CONF_OPTS += --with-tremor=$(STAGING_DIR)/usr -endif - -ifeq ($(BR2_PACKAGE_MPD_TWOLAME),y) -MPD_DEPENDENCIES += twolame -MPD_CONF_OPTS += --enable-twolame-encoder -else -MPD_CONF_OPTS += --disable-twolame-encoder -endif - -ifeq ($(BR2_PACKAGE_MPD_UPNP),y) -MPD_DEPENDENCIES += expat libupnp -MPD_CONF_OPTS += --enable-upnp -else -MPD_CONF_OPTS += --disable-upnp -endif - -ifeq ($(BR2_PACKAGE_MPD_VORBIS),y) -MPD_DEPENDENCIES += libvorbis -MPD_CONF_OPTS += --enable-vorbis --enable-vorbis-encoder -else -MPD_CONF_OPTS += --disable-vorbis --disable-vorbis-encoder -endif - -ifeq ($(BR2_PACKAGE_MPD_WAVPACK),y) -MPD_DEPENDENCIES += wavpack -MPD_CONF_OPTS += --enable-wavpack -else -MPD_CONF_OPTS += --disable-wavpack -endif - -define MPD_INSTALL_EXTRA_FILES - $(INSTALL) -m 0644 -D package/mpd/mpd.conf $(TARGET_DIR)/etc/mpd.conf -endef - -MPD_POST_INSTALL_TARGET_HOOKS += MPD_INSTALL_EXTRA_FILES - -define MPD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/mpd/S95mpd \ - $(TARGET_DIR)/etc/init.d/S95mpd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch b/package.bak/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch deleted file mode 100644 index 630bbd6642..0000000000 --- a/package.bak/mpdecimal/0001-Add-minimal-support-for-enable-disable-shared-static.patch +++ /dev/null @@ -1,101 +0,0 @@ -From c349964887901848fb4cd5db53a5bcb6dae27aaa Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 23 Nov 2014 10:16:33 +0100 -Subject: [PATCH] Add minimal support for --{enable,disable}-{shared,static} - -mpdecimal uses autoconf, but not automake or libtool, so this commit -adds some basic handling of --{enable,disable}-{shared,static}, so -that building the shared library can be disabled in pure static -library contexts. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 6 ++++++ - configure.ac | 13 +++++++++++++ - libmpdec/Makefile.in | 11 ++++++++++- - 3 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 2c91891..0c44f36 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -9,6 +9,8 @@ LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ - INSTALL = @INSTALL@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -32,9 +34,13 @@ install: FORCE - $(INSTALL) -d -m 755 $(DESTDIR)$(includedir) - $(INSTALL) -m 644 libmpdec/mpdecimal.h $(DESTDIR)$(includedir) - $(INSTALL) -d -m 755 $(DESTDIR)$(libdir) -+ifeq ($(BUILD_STATIC),yes) - $(INSTALL) -m 644 libmpdec/$(LIBSTATIC) $(DESTDIR)$(libdir) -+endif -+ifeq ($(BUILD_SHARED),yes) - $(INSTALL) -m 755 libmpdec/$(LIBSHARED) $(DESTDIR)$(libdir) - cd $(DESTDIR)$(libdir) && ln -sf $(LIBSHARED) $(LIBSONAME) && ln -sf $(LIBSHARED) libmpdec.so -+endif - $(INSTALL) -d -m 755 $(DESTDIR)$(docdir) - cp -R doc/* $(DESTDIR)$(docdir) - -diff --git a/configure.ac b/configure.ac -index 7ee8f86..2b3e505 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,6 +88,19 @@ CFLAGS="$saved_cflags" - AC_PROG_INSTALL - AC_SUBST(INSTALL) - -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared], [build shared library])], -+ [BUILD_SHARED=$enableval], -+ [BUILD_SHARED=yes]) -+ -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static], [build static library])], -+ [BUILD_STATIC=$enableval], -+ [BUILD_STATIC=yes]) -+ -+AC_SUBST(BUILD_SHARED) -+AC_SUBST(BUILD_STATIC) -+ - # _FORTIFY_SOURCE wrappers for memmove and bcopy are incorrect: - # http://sourceware.org/ml/libc-alpha/2010-12/msg00009.html - AC_MSG_CHECKING(for glibc _FORTIFY_SOURCE/memmove bug) -diff --git a/libmpdec/Makefile.in b/libmpdec/Makefile.in -index d9619a3..985c73c 100644 ---- a/libmpdec/Makefile.in -+++ b/libmpdec/Makefile.in -@@ -7,6 +7,8 @@ - LIBSTATIC = @LIBSTATIC@ - LIBSONAME = @LIBSONAME@ - LIBSHARED = @LIBSHARED@ -+BUILD_SHARED = @BUILD_SHARED@ -+BUILD_STATIC = @BUILD_STATIC@ - - CC = @CC@ - LD = @LD@ -@@ -32,8 +34,15 @@ ifeq ($(MAKECMDGOALS), profile_use) - MPD_LDFLAGS += $(MPD_PUSE) - endif - -+ifeq ($(BUILD_SHARED),yes) -+TARGETS += $(LIBSHARED) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+TARGETS += $(LIBSTATIC) -+endif - --default: $(LIBSTATIC) $(LIBSHARED) -+default: $(TARGETS) - - - OBJS := basearith.o context.o constants.o convolute.o crt.o mpdecimal.o \ --- -2.1.0 - diff --git a/package.bak/mpdecimal/Config.in b/package.bak/mpdecimal/Config.in deleted file mode 100644 index 929d415143..0000000000 --- a/package.bak/mpdecimal/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MPDECIMAL - bool "mpdecimal" - help - mpdecimal is a package for correctly-rounded arbitrary - precision decimal floating point arithmetic. Starting from - version 2.4, mpdecimal includes only the libmpdec - library. Further mpdecimal development will focus - exclusively on libmpdec. - - http://www.bytereef.org/mpdecimal/ diff --git a/package.bak/mpdecimal/mpdecimal.hash b/package.bak/mpdecimal/mpdecimal.hash deleted file mode 100644 index bc443d1cd9..0000000000 --- a/package.bak/mpdecimal/mpdecimal.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.bytereef.org/mpdecimal/download.html -sha256 da74d3cfab559971a4fbd4fb506e1b4498636eb77d0fd09e44f8e546d18ac068 mpdecimal-2.4.1.tar.gz diff --git a/package.bak/mpdecimal/mpdecimal.mk b/package.bak/mpdecimal/mpdecimal.mk deleted file mode 100644 index 9b13def523..0000000000 --- a/package.bak/mpdecimal/mpdecimal.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# mpdecimal -# -################################################################################ - -MPDECIMAL_SITE = http://www.bytereef.org/software/mpdecimal/releases -MPDECIMAL_VERSION = 2.4.1 -MPDECIMAL_INSTALL_STAGING = YES -MPDECIMAL_LICENSE = BSD-2c -MPDECIMAL_LICENSE_FILES = LICENSE.txt -MPDECIMAL_CONF_OPTS = LD="$(TARGET_CC)" -MPDECIMAL_AUTORECONF = YES - -# On i386, by default, mpdecimal tries to uses which is not -# available in musl/uclibc. So in this case, we tell mpdecimal to use -# the generic 32 bits code, which is anyway the one used on ARM, -# PowerPC, etc. -ifeq ($(BR2_TOOLCHAIN_USES_GLIBC),) -ifeq ($(BR2_i386),y) -MPDECIMAL_CONF_ENV += MACHINE=ansi32 -endif -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch b/package.bak/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch deleted file mode 100644 index 12590cfd30..0000000000 --- a/package.bak/mpfr/0001-Fix-obsolete-ARC-asm-constraints.patch +++ /dev/null @@ -1,37 +0,0 @@ -mpfr-longlong.h: Fix obsolete ARC asm constraints - -This patch replaces obsolete ARC "J" asm constraint with -up-to-date "Cal" constraint. -The patch should be applied to upstream "mpfr" library and -after that it should be removed from buildroot as soon as -mpfr version with current fix will come up. - -Signed-off-by: Vlad Zakharov -Signed-off-by: Claudiu Zissulescu ---- -Index: /src/mpfr-longlong.h -=================================================================== ---- /src/mpfr-longlong.h (revision 10963) -+++ /src/mpfr-longlong.h (working copy) -@@ -416,17 +416,17 @@ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "%r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #define sub_ddmmss(sh, sl, ah, al, bh, bl) \ - __asm__ ("sub.f\t%1, %4, %5\n\tsbc\t%0, %2, %3" \ - : "=r" (sh), \ - "=&r" (sl) \ - : "r" ((USItype) (ah)), \ -- "rIJ" ((USItype) (bh)), \ -+ "rICal" ((USItype) (bh)), \ - "r" ((USItype) (al)), \ -- "rIJ" ((USItype) (bl))) -+ "rICal" ((USItype) (bl))) - #endif - - #if defined (__arm__) && (defined (__thumb2__) || !defined (__thumb__)) \ diff --git a/package.bak/mpfr/Config.in b/package.bak/mpfr/Config.in deleted file mode 100644 index e02511f8f1..0000000000 --- a/package.bak/mpfr/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MPFR - bool "mpfr" - select BR2_PACKAGE_GMP - help - C library for multiple-precision floating-point computations - with exact rounding. - - http://www.mpfr.org/ diff --git a/package.bak/mpfr/mpfr.hash b/package.bak/mpfr/mpfr.hash deleted file mode 100644 index d2c32f2af5..0000000000 --- a/package.bak/mpfr/mpfr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 015fde82b3979fbe5f83501986d328331ba8ddf008c1ff3da3c238f49ca062bc mpfr-3.1.5.tar.xz diff --git a/package.bak/mpfr/mpfr.mk b/package.bak/mpfr/mpfr.mk deleted file mode 100644 index bb78ccc81a..0000000000 --- a/package.bak/mpfr/mpfr.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# mpfr -# -################################################################################ - -MPFR_VERSION = 3.1.5 -MPFR_SITE = http://www.mpfr.org/mpfr-$(MPFR_VERSION) -MPFR_SOURCE = mpfr-$(MPFR_VERSION).tar.xz -MPFR_LICENSE = LGPLv3+ -MPFR_LICENSE_FILES = COPYING.LESSER -MPFR_INSTALL_STAGING = YES -MPFR_DEPENDENCIES = gmp -HOST_MPFR_DEPENDENCIES = host-gmp -MPFR_MAKE_OPTS = RANLIB=$(TARGET_RANLIB) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/mpg123/Config.in b/package.bak/mpg123/Config.in deleted file mode 100644 index eacefada5d..0000000000 --- a/package.bak/mpg123/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MPG123 - bool "mpg123" - depends on BR2_USE_MMU # fork - in the application - help - Fast, free and portable MPEG audio player for Unix. It supports - MPEG 1.0/2.0 layers 1, 2 and 3. - - http://www.mpg123.de/ diff --git a/package.bak/mpg123/mpg123.hash b/package.bak/mpg123/mpg123.hash deleted file mode 100644 index fa5580948c..0000000000 --- a/package.bak/mpg123/mpg123.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 de2303c8ecb65593e39815c0a2f2f2d91f708c43b85a55fdd1934c82e677cf8e mpg123-1.23.8.tar.bz2 diff --git a/package.bak/mpg123/mpg123.mk b/package.bak/mpg123/mpg123.mk deleted file mode 100644 index 27c46dcbc7..0000000000 --- a/package.bak/mpg123/mpg123.mk +++ /dev/null @@ -1,83 +0,0 @@ -################################################################################ -# -# mpg123 -# -################################################################################ - -MPG123_VERSION = 1.23.8 -MPG123_SOURCE = mpg123-$(MPG123_VERSION).tar.bz2 -MPG123_SITE = http://downloads.sourceforge.net/project/mpg123/mpg123/$(MPG123_VERSION) -MPG123_CONF_OPTS = --disable-lfs-alias -MPG123_INSTALL_STAGING = YES -MPG123_LICENSE = LGPLv2.1 -MPG123_LICENSE_FILES = COPYING -MPG123_DEPENDENCIES = host-pkgconf - -MPG123_CPU = $(if $(BR2_SOFT_FLOAT),generic_nofpu,generic_fpu) - -ifeq ($(BR2_aarch64),y) -MPG123_CPU = aarch64 -endif - -ifeq ($(BR2_arm),y) -ifeq ($(or $(BR2_ARM_CPU_HAS_NEON),$(BR2_ARM_CPU_HAS_VFPV2)),y) -MPG123_CPU = arm_fpu -else -MPG123_CPU = arm_nofpu -endif -endif - -ifeq ($(BR2_i386),y) -MPG123_CPU = x86 -endif - -ifeq ($(BR2_powerpc),y) -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -MPG123_CPU = altivec -endif -ifeq ($(BR2_SOFT_FLOAT),y) -MPG123_CPU = ppc_nofpu -endif -endif # powerpc - -ifeq ($(BR2_x86_64),y) -MPG123_CPU = x86-64 -endif - -MPG123_CONF_OPTS += --with-cpu=$(MPG123_CPU) - -MPG123_AUDIO = dummy oss - -ifeq ($(BR2_PACKAGE_PORTAUDIO),y) -MPG123_AUDIO += portaudio -MPG123_CONF_OPTS += --with-default-audio=portaudio -MPG123_DEPENDENCIES += portaudio -# configure script does NOT use pkg-config to figure out how to link -# with portaudio, breaking static linking as portaudio uses pthreads -MPG123_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs portaudio-2.0`" -endif - -ifeq ($(BR2_PACKAGE_SDL),y) -MPG123_AUDIO += sdl -MPG123_CONF_OPTS += --with-default-audio=sdl -MPG123_DEPENDENCIES += sdl -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -MPG123_AUDIO += alsa -MPG123_CONF_OPTS += --with-default-audio=alsa -MPG123_DEPENDENCIES += alsa-lib -# configure script does NOT use pkg-config to figure out how to link -# with alsa, breaking static linking as alsa uses pthreads -MPG123_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs alsa`" -endif - -MPG123_CONF_OPTS += --with-audio=$(subst $(space),$(comma),$(MPG123_AUDIO)) - -ifeq ($(BR2_PACKAGE_LIBTOOL),y) -MPG123_DEPENDENCIES += libtool -# .la files gets stripped , so directly load .so files rather than .la -MPG123_CONF_OPTS += --with-modules --with-module-suffix=.so -endif - -$(eval $(autotools-package)) diff --git a/package.bak/mplayer/0001-disable-install-strip.patch b/package.bak/mplayer/0001-disable-install-strip.patch deleted file mode 100644 index 1bd1dc00ae..0000000000 --- a/package.bak/mplayer/0001-disable-install-strip.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable stripping on installation - -Using the -s option of install does not work, as it uses the host -strip instead of the cross strip. So, get rid of it, and let Buildroot -handle the stripping. - -[Vincent: tweak patch for version 1.2] - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Vicente Olivert Riera - -diff -Nrua a/configure b/configure ---- a/configure 2015-10-02 21:29:04.000000000 +0100 -+++ b/configure 2015-10-06 13:28:37.245349592 +0100 -@@ -2780,7 +2780,7 @@ - - - # Checking for CFLAGS --_install_strip="-s" -+_install_strip= - if test -z "$CFLAGS" || test "$_profile" != "" || test "$_debug" != ""; then - if test "$cc_vendor" = "intel" ; then - CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer" diff --git a/package.bak/mplayer/0002-mpdemux-live555-async-interface.patch b/package.bak/mplayer/0002-mpdemux-live555-async-interface.patch deleted file mode 100644 index 5a62a18710..0000000000 --- a/package.bak/mplayer/0002-mpdemux-live555-async-interface.patch +++ /dev/null @@ -1,126 +0,0 @@ -From d3195ea13f4a9aae546ff996e53681349a1a3cdb Mon Sep 17 00:00:00 2001 -From: sherpya -Date: Fri, 14 Jun 2013 05:25:38 +0200 -Subject: [PATCH 25/27] mpdemux: live555 async interface - -From: https://raw.github.com/sherpya/mplayer-be/master/patches/mp/0025-mpdemux-live555-async-interface.patch - -Adjust live555 interface code for modern versions of live555. - -Signed-off-by: Peter Korsgaard ---- - libmpdemux/demux_rtp.cpp | 51 ++++++++++++++++++++++++++++++++---------------- - 2 files changed, 35 insertions(+), 22 deletions(-) - -diff --git a/libmpdemux/demux_rtp.cpp b/libmpdemux/demux_rtp.cpp -index ad7a7f1..05d06e0 100644 ---- a/libmpdemux/demux_rtp.cpp -+++ b/libmpdemux/demux_rtp.cpp -@@ -19,8 +19,6 @@ - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - --#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 -- - extern "C" { - // on MinGW, we must include windows.h before the things it conflicts - #ifdef __MINGW32__ // with. they are each protected from -@@ -94,15 +92,6 @@ struct RTPState { - - extern "C" char* network_username; - extern "C" char* network_password; --static char* openURL_rtsp(RTSPClient* client, char const* url) { -- // If we were given a user name (and optional password), then use them: -- if (network_username != NULL) { -- char const* password = network_password == NULL ? "" : network_password; -- return client->describeWithPassword(url, network_username, password); -- } else { -- return client->describeURL(url); -- } --} - - static char* openURL_sip(SIPClient* client, char const* url) { - // If we were given a user name (and optional password), then use them: -@@ -118,6 +107,19 @@ static char* openURL_sip(SIPClient* client, char const* url) { - extern AVCodecContext *avcctx; - #endif - -+static char fWatchVariableForSyncInterface; -+static char* fResultString; -+static int fResultCode; -+ -+static void responseHandlerForSyncInterface(RTSPClient* rtspClient, int responseCode, char* responseString) { -+ // Set result values: -+ fResultCode = responseCode; -+ fResultString = responseString; -+ -+ // Signal a break from the event loop (thereby returning from the blocking command): -+ fWatchVariableForSyncInterface = ~0; -+} -+ - extern "C" int audio_id, video_id, dvdsub_id; - extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - Boolean success = False; -@@ -146,13 +148,19 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port; - rtsp_transport_tcp = 1; - } -- rtspClient = RTSPClient::createNew(*env, verbose, "MPlayer", rtsp_transport_http); -+ rtspClient = RTSPClient::createNew(*env, url, verbose, "MPlayer", rtsp_transport_http); - if (rtspClient == NULL) { - fprintf(stderr, "Failed to create RTSP client: %s\n", - env->getResultMsg()); - break; - } -- sdpDescription = openURL_rtsp(rtspClient, url); -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendDescribeCommand(responseHandlerForSyncInterface); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ if (fResultCode == 0) -+ sdpDescription = fResultString; -+ else -+ delete[] fResultString; - } else { // SIP - unsigned char desiredAudioType = 0; // PCMU (use 3 for GSM) - sipClient = SIPClient::createNew(*env, desiredAudioType, NULL, -@@ -236,8 +244,12 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - - if (rtspClient != NULL) { - // Issue a RTSP "SETUP" command on the chosen subsession: -- if (!rtspClient->setupMediaSubsession(*subsession, False, -- rtsp_transport_tcp)) break; -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendSetupCommand(*subsession, responseHandlerForSyncInterface, False, rtsp_transport_tcp); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ delete[] fResultString; -+ if (fResultCode != 0) break; -+ - if (!strcmp(subsession->mediumName(), "audio")) - audiofound = 1; - if (!strcmp(subsession->mediumName(), "video")) -@@ -248,7 +260,11 @@ extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) { - - if (rtspClient != NULL) { - // Issue a RTSP aggregate "PLAY" command on the whole session: -- if (!rtspClient->playMediaSession(*mediaSession)) break; -+ fWatchVariableForSyncInterface = 0; -+ rtspClient->sendPlayCommand(*mediaSession, responseHandlerForSyncInterface); -+ env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface); -+ delete[] fResultString; -+ if (fResultCode != 0) break; - } else if (sipClient != NULL) { - sipClient->sendACK(); // to start the stream flowing - } -@@ -637,7 +653,8 @@ static void teardownRTSPorSIPSession(RTPState* rtpState) { - MediaSession* mediaSession = rtpState->mediaSession; - if (mediaSession == NULL) return; - if (rtpState->rtspClient != NULL) { -- rtpState->rtspClient->teardownMediaSession(*mediaSession); -+ fWatchVariableForSyncInterface = 0; -+ rtpState->rtspClient->sendTeardownCommand(*mediaSession, NULL); - } else if (rtpState->sipClient != NULL) { - rtpState->sipClient->sendBYE(); - } --- -1.8.5.2 - diff --git a/package.bak/mplayer/0003-configure-armv8.patch b/package.bak/mplayer/0003-configure-armv8.patch deleted file mode 100644 index 98686433fb..0000000000 --- a/package.bak/mplayer/0003-configure-armv8.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix aarch64 compile by adding HAVE_ARMV8 define - -Fixes build errors seen on the buildroot autobuilders: -http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/build-end.log - -libavutil/aarch64/cpu.c: In function 'ff_get_cpu_flags_aarch64': -libavutil/aarch64/cpu.c:25:32: error: 'HAVE_ARMV8' undeclared (first use in this function) - return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 | - -Signed-off-by: Bernd Kuhls -(patch sent upstream: - http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073496.html) - -Index: configure -=================================================================== ---- a/configure (revision 37871) -+++ b/configure (working copy) -@@ -1445,6 +1445,8 @@ - --disable-armv6) _armv6=no ;; - --enable-armv6t2) _armv6t2=yes ;; - --disable-armv6t2) _armv6t2=no ;; -+ --enable-armv8) _armv8=yes ;; -+ --disable-armv8) _armv8=no ;; - --enable-armvfp) _armvfp=yes ;; - --disable-armvfp) _armvfp=no ;; - --enable-vfpv3) vfpv3=yes ;; -@@ -3261,7 +3263,7 @@ - echores "$_iwmmxt" - fi - --cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' -+cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' - test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" - test "$_mmx" = yes && cpuexts="MMX $cpuexts" - test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" -@@ -3285,6 +3287,7 @@ - test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts" - test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts" - test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts" -+test "$_armv8" = yes && cpuexts="ARMV8 $cpuexts" - test "$_armvfp" = yes && cpuexts="VFP $cpuexts" - test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts" - test "$setend" = yes && cpuexts="SETEND $cpuexts" diff --git a/package.bak/mplayer/0004-configure-zlib.patch b/package.bak/mplayer/0004-configure-zlib.patch deleted file mode 100644 index 7c1b2c8ec0..0000000000 --- a/package.bak/mplayer/0004-configure-zlib.patch +++ /dev/null @@ -1,30 +0,0 @@ -configure: Fix compilation when zlib is missing. - -Downloaded from upstream commit: - -$ LC_ALL=C svn log -r 37816 ------------------------------------------------------------------------- -r37816 | reimar | 2016-02-28 14:39:42 +0100 (Sun, 28 Feb 2016) | 3 lines - -configure: Fix compilation when zlib is missing. - -APNG and a few other decoders also cannot be enabled without it. ------------------------------------------------------------------------- - -Signed-off-by: Bernd Kuhls - -Index: configure -=================================================================== ---- a/configure (revision 37795) -+++ b/configure (revision 37816) -@@ -6464,8 +6464,8 @@ - mplayer_encoders="$mplayer_encoders PNG_ENCODER" - else - def_zlib='#define CONFIG_ZLIB 0' -- libavdecoders=$(filter_out_component decoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M TSCC ZEROCODEC') -- libavencoders=$(filter_out_component encoder 'FLASHSV FLASHSV2 PNG ZMBV ZLIB') -+ libavdecoders=$(filter_out_component decoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB DXA EXR G2M RSCC SCREENPRESSO TDSC TSCC ZEROCODEC') -+ libavencoders=$(filter_out_component encoder 'APNG FLASHSV FLASHSV2 PNG ZMBV ZLIB') - fi - echores "$_zlib" - diff --git a/package.bak/mplayer/0005-tremor-ogg.patch b/package.bak/mplayer/0005-tremor-ogg.patch deleted file mode 100644 index b4d65052a3..0000000000 --- a/package.bak/mplayer/0005-tremor-ogg.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix static linking with tremor & libogg - -The order of the libraries needs to be changed to fix a bug during -static linking caught by buildroot autobuilders: - -http://autobuild.buildroot.net/results/bc9/bc98fa585399b53ea181dbaf392b93424145911d/ - -/home/test/autobuild/instance-3/output/host/usr/powerpc-buildroot-linux-uclibc/sysroot/usr/lib/libvorbisidec.a(synthesis.o): In function `_vorbis_synthesis1': -synthesis.c:(.text+0x90): undefined reference to `oggpack_readinit' -synthesis.c:(.text+0x9c): undefined reference to `oggpack_read' -[...] - -Signed-off-by: Bernd Kuhls -(patch sent upstream: - http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-July/073501.html) - -Index: configure -=================================================================== ---- a/configure (revision 37873) -+++ b/configure (working copy) -@@ -6629,7 +6629,7 @@ - def_tremor='#define CONFIG_TREMOR 1' - codecmodules="tremor $codecmodules" - res_comment="integer libvorbis" -- extra_ldflags="$extra_ldflags -logg -lvorbisidec" -+ extra_ldflags="$extra_ldflags -lvorbisidec -logg" - elif test "$_libvorbis" = yes ; then - _vorbis=yes - def_vorbis='#define CONFIG_OGGVORBIS 1' diff --git a/package.bak/mplayer/Config.in b/package.bak/mplayer/Config.in deleted file mode 100644 index a10ad26b29..0000000000 --- a/package.bak/mplayer/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - bool - default y - # Those architectures are not supported by MPlayer - depends on !(BR2_bfin || BR2_sh2a || BR2_sh4a || BR2_sh4aeb \ - || BR2_m68k || BR2_microblaze || BR2_nios2 || BR2_or1k) - # Broken support for -Date: Wed, 20 Apr 2016 09:39:30 -0300 -Subject: [PATCH] wscript: don't check for fork() on POSIX checks - -It's not being used, and in fact prevents mpv from being built in nommu -architectures (cortex M, blackfin, ...) - -Signed-off-by: Gustavo Zacarias ---- -Status: pull request https://github.com/mpv-player/mpv/pull/3068 - - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index a4ffce6..40328e4 100644 ---- a/wscript -+++ b/wscript -@@ -127,7 +127,7 @@ main_dependencies = [ - 'desc': 'POSIX environment', - # This should be good enough. - 'func': check_statement(['poll.h', 'unistd.h', 'sys/mman.h'], -- 'struct pollfd pfd; poll(&pfd, 1, 0); fork(); int f[2]; pipe(f); munmap(f,0)'), -+ 'struct pollfd pfd; poll(&pfd, 1, 0); int f[2]; pipe(f); munmap(f,0)'), - }, { - 'name': 'posix-or-mingw', - 'desc': 'development environment', --- -2.7.3 - diff --git a/package.bak/mpv/0002-fix-powerpc64-altivec.patch b/package.bak/mpv/0002-fix-powerpc64-altivec.patch deleted file mode 100644 index 45983fec8f..0000000000 --- a/package.bak/mpv/0002-fix-powerpc64-altivec.patch +++ /dev/null @@ -1,32 +0,0 @@ -Subject: [PATCH] Work around bool type redefinition by altivec - -On powerpc64le, the SDL header may include altivec.h and this -(combined with -std=c99) will cause a compile failure due to bool -being redefined as a vector type. - -Adjust the compiler flags to add -std=gnu99 (which is compatible with -altivec) when using gcc. The generic flag '-std=c99' is left in place for other -compilers (in the gcc case it is overridden by the (later) gnu flag). - -Signed-off-by: Sam Bobroff ---- - waftools/detections/compiler.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/waftools/detections/compiler.py b/waftools/detections/compiler.py -index 5bbba87..50836a2 100644 ---- a/waftools/detections/compiler.py -+++ b/waftools/detections/compiler.py -@@ -43,7 +43,8 @@ def __add_gcc_flags__(ctx): - "-Wno-switch", "-Wparentheses", "-Wpointer-arith", - "-Wno-pointer-sign", - # GCC bug 66425 -- "-Wno-unused-result"] -+ "-Wno-unused-result", -+ "-std=gnu99"] - - def __add_clang_flags__(ctx): - ctx.env.CFLAGS += ["-Wno-logical-op-parentheses", "-fcolor-diagnostics", --- -2.10.0.297.gf6727b0 - diff --git a/package.bak/mpv/Config.in b/package.bak/mpv/Config.in deleted file mode 100644 index 6e115aedb1..0000000000 --- a/package.bak/mpv/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_MPV - bool "mpv" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 - # ARC toolchain issue - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_ZLIB - # Select xkbcommon for wayland to avoid being mysterious - select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND - help - mpv is a fork of mplayer2 and MPlayer. It shares some features - with the former projects while introducing many more. - - https://mpv.io/ - -comment "mpv needs a toolchain w/ threads, gcc >= 4.5" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_ATOMIC || BR2_TOOLCHAIN_HAS_SYNC_8 - depends on !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_5 - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC diff --git a/package.bak/mpv/mpv.hash b/package.bak/mpv/mpv.hash deleted file mode 100644 index 0e7aab7077..0000000000 --- a/package.bak/mpv/mpv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8aeefe5970587dfc454d2b89726b603f156bd7a9ae427654eef0d60c68d94998 v0.23.0.tar.gz diff --git a/package.bak/mpv/mpv.mk b/package.bak/mpv/mpv.mk deleted file mode 100644 index 5b83b6d942..0000000000 --- a/package.bak/mpv/mpv.mk +++ /dev/null @@ -1,229 +0,0 @@ -################################################################################ -# -# mpv -# -################################################################################ - -MPV_VERSION = 0.23.0 -MPV_SITE = https://github.com/mpv-player/mpv/archive -MPV_SOURCE = v$(MPV_VERSION).tar.gz -MPV_DEPENDENCIES = \ - host-pkgconf ffmpeg zlib \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) -MPV_LICENSE = GPLv2+ -MPV_LICENSE_FILES = LICENSE - -MPV_NEEDS_EXTERNAL_WAF = YES - -# Some of these options need testing and/or tweaks -MPV_CONF_OPTS = \ - --prefix=/usr \ - --disable-android \ - --disable-caca \ - --disable-cdda \ - --disable-cocoa \ - --disable-coreaudio \ - --disable-libv4l2 \ - --disable-opensles \ - --disable-rpi \ - --disable-rsound \ - --disable-rubberband \ - --disable-uchardet \ - --disable-vapoursynth \ - --disable-vapoursynth-lazy \ - --disable-vdpau - -# ALSA support requires pcm+mixer -ifeq ($(BR2_PACKAGE_ALSA_LIB_MIXER)$(BR2_PACKAGE_ALSA_LIB_PCM),yy) -MPV_CONF_OPTS += --enable-alsa -MPV_DEPENDENCIES += alsa-lib -else -MPV_CONF_OPTS += --disable-alsa -endif - -# GBM support is provided by mesa3d when EGL=y -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -MPV_CONF_OPTS += --enable-gbm -MPV_DEPENDENCIES += mesa3d -else -MPV_CONF_OPTS += --disable-gbm -endif - -# jack support -# It also requires 64-bit sync intrinsics -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_JACK2),yy) -MPV_CONF_OPTS += --enable-jack -MPV_DEPENDENCIES += jack2 -else -MPV_CONF_OPTS += --disable-jack -endif - -# jpeg support -ifeq ($(BR2_PACKAGE_JPEG),y) -MPV_CONF_OPTS += --enable-jpeg -MPV_DEPENDENCIES += jpeg -else -MPV_CONF_OPTS += --disable-jpeg -endif - -# lcms2 support -ifeq ($(BR2_PACKAGE_LCMS2),y) -MPV_CONF_OPTS += --enable-lcms2 -MPV_DEPENDENCIES += lcms2 -else -MPV_CONF_OPTS += --disable-lcms2 -endif - -# libarchive support -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -MPV_CONF_OPTS += --enable-libarchive -MPV_DEPENDENCIES += libarchive -else -MPV_CONF_OPTS += --disable-libarchive -endif - -# libass subtitle support -ifeq ($(BR2_PACKAGE_LIBASS),y) -MPV_CONF_OPTS += --enable-libass -MPV_DEPENDENCIES += libass -else -MPV_CONF_OPTS += --disable-libass -endif - -# bluray support -ifeq ($(BR2_PACKAGE_LIBBLURAY),y) -MPV_CONF_OPTS += --enable-libbluray -MPV_DEPENDENCIES += libbluray -else -MPV_CONF_OPTS += --disable-libbluray -endif - -# libdvdnav -ifeq ($(BR2_PACKAGE_LIBDVDNAV),y) -MPV_CONF_OPTS += --enable-dvdnav -MPV_DEPENDENCIES += libdvdnav -else -MPV_CONF_OPTS += --disable-dvdnav -endif - -# libdvdread -ifeq ($(BR2_PACKAGE_LIBDVDREAD),y) -MPV_CONF_OPTS += --enable-dvdread -MPV_DEPENDENCIES += libdvdread -else -MPV_CONF_OPTS += --disable-dvdread -endif - -# libdrm -ifeq ($(BR2_PACKAGE_LIBDRM),y) -MPV_CONF_OPTS += --enable-drm -MPV_DEPENDENCIES += libdrm -else -MPV_CONF_OPTS += --disable-drm -endif - -# LUA support, only for lua51/lua52/luajit -# This enables the controller (OSD) together with libass -ifeq ($(BR2_PACKAGE_LUA_5_1)$(BR2_PACKAGE_LUA_5_2)$(BR2_PACKAGE_LUAJIT),y) -MPV_CONF_OPTS += --enable-lua -MPV_DEPENDENCIES += luainterpreter -else -MPV_CONF_OPTS += --disable-lua -endif - -# OpenGL support -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -MPV_CONF_OPTS += --enable-gl --enable-standard-gl -MPV_DEPENDENCIES += libgl -else -MPV_CONF_OPTS += --disable-gl --disable-standard-gl -endif - -# pulseaudio support -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -MPV_CONF_OPTS += --enable-pulse -MPV_DEPENDENCIES += pulseaudio -else -MPV_CONF_OPTS += --disable-pulse -endif - -# samba support -ifeq ($(BR2_PACKAGE_SAMBA4),y) -MPV_CONF_OPTS += --enable-libsmbclient -MPV_DEPENDENCIES += samba4 -else -MPV_CONF_OPTS += --disable-libsmbclient -endif - -# SDL support -# Both can't be used at the same time, prefer newer API -# It also requires 64-bit sync intrinsics -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL2),yy) -MPV_CONF_OPTS += --enable-sdl2 --disable-sdl1 -MPV_DEPENDENCIES += sdl2 -else ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_8)$(BR2_PACKAGE_SDL),yy) -MPV_CONF_OPTS += --enable-sdl1 --disable-sdl2 -MPV_DEPENDENCIES += sdl -else -MPV_CONF_OPTS += --disable-sdl1 --disable-sdl2 -endif - -# va-api support -# This requires one or more of the egl-drm, wayland, x11 backends -# For now we support wayland and x11 -ifeq ($(BR2_PACKAGE_LIBVA),y) -ifneq ($(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_XLIB_LIBX11),) -MPV_CONF_OPTS += --enable-vaapi -MPV_DEPENDENCIES += libva -else -MPV_CONF_OPTS += --disable-vaapi -endif -else -MPV_CONF_OPTS += --disable-vaapi -endif - -# wayland support -ifeq ($(BR2_PACKAGE_WAYLAND),y) -MPV_CONF_OPTS += --enable-wayland -MPV_DEPENDENCIES += libxkbcommon wayland -else -MPV_CONF_OPTS += --disable-wayland -endif - -# Base X11 support -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -MPV_CONF_OPTS += --enable-x11 --disable-xss -MPV_DEPENDENCIES += xlib_libX11 -# xext -ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y) -MPV_CONF_OPTS += --enable-xext -MPV_DEPENDENCIES += xlib_libXext -else -MPV_CONF_OPTS += --disable-xext -endif -# xinerama -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -MPV_CONF_OPTS += --enable-xinerama -MPV_DEPENDENCIES += xlib_libXinerama -else -MPV_CONF_OPTS += --disable-xinerama -endif -# xrandr -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -MPV_CONF_OPTS += --enable-xrandr -MPV_DEPENDENCIES += xlib_libXrandr -else -MPV_CONF_OPTS += --disable-xrandr -endif -# XVideo -ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y) -MPV_CONF_OPTS += --enable-xv -MPV_DEPENDENCIES += xlib_libXv -else -MPV_CONF_OPTS += --disable-xv -endif -else -MPV_CONF_OPTS += --disable-x11 -endif - -$(eval $(waf-package)) diff --git a/package.bak/mraa/Config.in b/package.bak/mraa/Config.in deleted file mode 100644 index 2e5d3b128c..0000000000 --- a/package.bak/mraa/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_MRAA - bool "mraa" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_arm || BR2_i386 || BR2_x86_64 - help - mraa is a C/C++ library with bindings to javascript & python - to interface with the IO on Galileo, Edison & other platforms, - with a structured and sane API where port names/numbering matches - the board that you are on. - - http://iotdk.intel.com/docs/master/mraa - -comment "mraa needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mraa/mraa.hash b/package.bak/mraa/mraa.hash deleted file mode 100644 index cbd70a4606..0000000000 --- a/package.bak/mraa/mraa.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e4501e6936afb426c75b7d406c1a7a27b514297f640e887de4d88a2d9687f37b mraa-v0.9.1.tar.gz diff --git a/package.bak/mraa/mraa.mk b/package.bak/mraa/mraa.mk deleted file mode 100644 index 42cc2e3356..0000000000 --- a/package.bak/mraa/mraa.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# mraa -# -################################################################################ - -MRAA_VERSION = v0.9.1 -MRAA_SITE = $(call github,intel-iot-devkit,mraa,$(MRAA_VERSION)) -MRAA_LICENSE = MIT -MRAA_LICENSE_FILES = COPYING -MRAA_INSTALL_STAGING = YES - -# USBPLAT only makes sense with FTDI4222, which requires the ftd2xx library, -# which doesn't exist in buildroot - -MRAA_CONF_OPTS += \ - -DBUILDSWIG=OFF \ - -DUSBPLAT=OFF \ - -DFTDI4222=OFF \ - -DIPK=OFF \ - -DRPM=OFF \ - -DENABLEEXAMPLES=OFF \ - -DBUILDTESTS=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/mrouted/0001-DVMRP-report-missing-subnet.patch b/package.bak/mrouted/0001-DVMRP-report-missing-subnet.patch deleted file mode 100644 index 023c8cfd8d..0000000000 --- a/package.bak/mrouted/0001-DVMRP-report-missing-subnet.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 687f41680d51585e9a5a135e39efee330588bea7 Mon Sep 17 00:00:00 2001 -From: Matt Weber -Date: Fri, 11 Sep 2015 12:49:30 -0500 -Subject: [PATCH 1/1] DVMRP report missing subnet - -Accepted upstream and will be included in 3.9.8. -https://github.com/troglobit/mrouted/commit/512af5ffe0f48ffa2ba3b45898c66c2a561a5c2d - -A subnet is missing in the DVMRP report sent to it's neighbor after -the initial probe occurs. The issue was with the traversal of a double -linked list from end to start. Once the traversing pointer reaches -the start of routing table for loop (condition) it would break and -always drop the first subnet. - -Signed-off-by: Matt Weber ---- - route.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/route.c b/route.c -index f74e601..9fe779d 100644 ---- a/route.c -+++ b/route.c -@@ -1193,7 +1193,7 @@ static int report_chunk(int which_routes, struct rtentry *start_rt, vifi_t vifi, - - p = send_buf + MIN_IP_HEADER_LEN + IGMP_MINLEN; - -- for (r = start_rt; r != routing_table; r = r->rt_prev) { -+ for (r = start_rt; r != NULL; r = r->rt_prev) { - if (which_routes == CHANGED_ROUTES && !(r->rt_flags & RTF_CHANGED)) { - nrt++; - continue; --- -1.9.1 - diff --git a/package.bak/mrouted/Config.in b/package.bak/mrouted/Config.in deleted file mode 100644 index bf4614d4af..0000000000 --- a/package.bak/mrouted/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_MROUTED - bool "mrouted" - depends on BR2_USE_MMU # fork() - help - An implementation of the DVMRP multicast routing protocol. - - If built with uClibc, then UCLIBC_SUPPORT_AI_ADDRCONFIG is - needed in uClibc configuration. - - http://github.com/troglobit/mrouted diff --git a/package.bak/mrouted/mrouted.hash b/package.bak/mrouted/mrouted.hash deleted file mode 100644 index d5069e5fd9..0000000000 --- a/package.bak/mrouted/mrouted.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 181908f7025c5a2dee2e50d86888780469eaa9e1bd42d3eca9dfed8274aecd3d mrouted-3.9.7.tar.gz diff --git a/package.bak/mrouted/mrouted.mk b/package.bak/mrouted/mrouted.mk deleted file mode 100644 index 2969e36cdc..0000000000 --- a/package.bak/mrouted/mrouted.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# mrouted -# -################################################################################ - -MROUTED_VERSION = 3.9.7 -MROUTED_SITE = $(call github,troglobit,mrouted,$(MROUTED_VERSION)) -MROUTED_DEPENDENCIES = host-bison -MROUTED_LICENSE = BSD-3c -MROUTED_LICENSE_FILES = LICENSE - -define MROUTED_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) $(@D)/configure --enable-rsrr \ - ) -endef - -define MROUTED_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define MROUTED_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) prefix=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/msgpack/Config.in b/package.bak/msgpack/Config.in deleted file mode 100644 index b8e82138fa..0000000000 --- a/package.bak/msgpack/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MSGPACK - bool "msgpack" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - help - MessagePack is an efficient binary serialization format. - - It lets you exchange data among multiple languages like JSON but - it's faster and smaller. - - http://msgpack.org/ - -comment "msgpack needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/msgpack/msgpack.hash b/package.bak/msgpack/msgpack.hash deleted file mode 100644 index 8cd8cb6599..0000000000 --- a/package.bak/msgpack/msgpack.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 97a371ef950c89f48e8dba6abeccab07f1887e9ba6dab921de0f985c7d5075fe msgpack-0.5.4.tar.gz diff --git a/package.bak/msgpack/msgpack.mk b/package.bak/msgpack/msgpack.mk deleted file mode 100644 index 9e23948608..0000000000 --- a/package.bak/msgpack/msgpack.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# msgpack -# -################################################################################ - -MSGPACK_VERSION = 0.5.4 -MSGPACK_SITE = http://downloads.sourceforge.net/project/msgpack/msgpack/cpp -MSGPACK_LICENSE = Apache-2.0 -MSGPACK_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/msmtp/Config.in b/package.bak/msmtp/Config.in deleted file mode 100644 index 46bb1985e3..0000000000 --- a/package.bak/msmtp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MSMTP - bool "msmtp" - help - msmtp is an SMTP client. In the default mode, it transmits a - mail to an SMTP server (for example at a free mail provider) - which takes care of further delivery. - - http://msmtp.sourceforge.net/ diff --git a/package.bak/msmtp/msmtp.hash b/package.bak/msmtp/msmtp.hash deleted file mode 100644 index d0de8e04fd..0000000000 --- a/package.bak/msmtp/msmtp.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/msmtp/files/msmtp/1.6.5/ -md5 50a8c9bb72f8222779db6b4aae2965e0 msmtp-1.6.5.tar.xz -sha1 27d1fc609cd453a7e4c55c4ec55d455949bc53f1 msmtp-1.6.5.tar.xz diff --git a/package.bak/msmtp/msmtp.mk b/package.bak/msmtp/msmtp.mk deleted file mode 100644 index 7ede66c0db..0000000000 --- a/package.bak/msmtp/msmtp.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# msmtp -# -################################################################################ - -MSMTP_VERSION = 1.6.5 -MSMTP_SITE = http://downloads.sourceforge.net/project/msmtp/msmtp/$(MSMTP_VERSION) -MSMTP_SOURCE = msmtp-$(MSMTP_VERSION).tar.xz -MSMTP_DEPENDENCIES = host-pkgconf -MSMTP_CONF_OPTS = \ - --without-libidn \ - --disable-gai-idn \ - --without-libgsasl -MSMTP_LICENSE = GPLv3+ -MSMTP_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBSECRET),y) -MSMTP_CONF_OPTS += --with-libsecret -MSMTP_DEPENDENCIES += libsecret -else -MSMTP_CONF_OPTS += --without-libsecret -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MSMTP_CONF_OPTS += --with-ssl=openssl -MSMTP_DEPENDENCIES += openssl -ifeq ($(BR2_STATIC_LIBS),y) -# openssl uses zlib, so we need to explicitly link with it when static -MSMTP_CONF_ENV += LIBS=-lz -endif -else ifeq ($(BR2_PACKAGE_GNUTLS),y) -MSMTP_CONF_OPTS += --with-ssl=gnutls -MSMTP_DEPENDENCIES += gnutls -else -MSMTP_CONF_OPTS += --with-ssl=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/msr-tools/Config.in b/package.bak/msr-tools/Config.in deleted file mode 100644 index dde19f7897..0000000000 --- a/package.bak/msr-tools/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_MSR_TOOLS - bool "msr-tools" - depends on BR2_i386 || BR2_x86_64 - help - The MSR Tools project provides utilities to access x86 - processor MSRs and CPU ID directly. - - Those tools access the hardware through the - /dev/cpu//msr and /dev/cpu//cpuid devices. This - necessitates msr and cpuid support in the kernel, which - means you need a kernel compiled with configuration options - CONFIG_X86_CPUID and CONFIG_X86_MSR enabled. - - https://01.org/msr-tools diff --git a/package.bak/msr-tools/msr-tools.hash b/package.bak/msr-tools/msr-tools.hash deleted file mode 100644 index 18146df51e..0000000000 --- a/package.bak/msr-tools/msr-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9b87245ee091a798184e447066e9e0d7709b7c81f5e6ad55f2b958c1aa50c4a3 msr-tools-1.3.tar.gz diff --git a/package.bak/msr-tools/msr-tools.mk b/package.bak/msr-tools/msr-tools.mk deleted file mode 100644 index 4f84a288d2..0000000000 --- a/package.bak/msr-tools/msr-tools.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# msr-tools -# -################################################################################ - -MSR_TOOLS_VERSION = 1.3 -MSR_TOOLS_SITE = $(call github,01org,msr-tools,msr-tools-$(MSR_TOOLS_VERSION)) -MSR_TOOLS_LICENSE = GPLv2 -MSR_TOOLS_LICENSE_FILES = cpuid.c - -define MSR_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define MSR_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) install \ - sbindir="$(TARGET_DIR)/usr/sbin" -endef - -$(eval $(generic-package)) diff --git a/package.bak/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch b/package.bak/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch deleted file mode 100644 index 077ca0c6a9..0000000000 --- a/package.bak/mtd/0001-mtd-utils-ubinize-Always-return-error-code-at-least-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 5f50207231414bfdbac8f0f974a2824f24177d6e Mon Sep 17 00:00:00 2001 -From: Enrico Jorns -Date: Fri, 11 Sep 2015 15:28:13 +0200 -Subject: [PATCH] mtd-utils: ubinize: Always return error code (at least -1) in - case of an error - -ubinize should not fail silenty, this can be very annoying when using -it from other tools that rely on the exit code for determining the -success of their operation. - -Signed-off-by: Enrico Jorns -Signed-off-by: Brian Norris -Signed-off-by: Luca Ceresoli ---- - ubi-utils/ubinize.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/ubi-utils/ubinize.c b/ubi-utils/ubinize.c -index 34f465a..60bbd9a 100644 ---- a/ubi-utils/ubinize.c -+++ b/ubi-utils/ubinize.c -@@ -519,6 +519,7 @@ int main(int argc, char * const argv[]) - */ - seek = ui.peb_size * 2; - if (lseek(args.out_fd, seek, SEEK_SET) != seek) { -+ err = -1; - sys_errmsg("cannot seek file \"%s\"", args.f_out); - goto out_free; - } -@@ -530,6 +531,7 @@ int main(int argc, char * const argv[]) - int fd, j; - - if (!sname) { -+ err = -1; - errmsg("ini-file parsing error (iniparser_getsecname)"); - goto out_free; - } -@@ -550,6 +552,7 @@ int main(int argc, char * const argv[]) - */ - for (j = 0; j < i; j++) { - if (vi[i].id == vi[j].id) { -+ err = -1; - errmsg("volume IDs must be unique, but ID %d " - "in section \"%s\" is not", - vi[i].id, sname); -@@ -557,6 +560,7 @@ int main(int argc, char * const argv[]) - } - - if (!strcmp(vi[i].name, vi[j].name)) { -+ err = -1; - errmsg("volume name must be unique, but name " - "\"%s\" in section \"%s\" is not", - vi[i].name, sname); -@@ -580,6 +584,7 @@ int main(int argc, char * const argv[]) - if (img) { - fd = open(img, O_RDONLY); - if (fd == -1) { -+ err = fd; - sys_errmsg("cannot open \"%s\"", img); - goto out_free; - } --- -1.9.1 - diff --git a/package.bak/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch b/package.bak/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch deleted file mode 100644 index 0f74a7b5b1..0000000000 --- a/package.bak/mtd/0002-integck-only-use-execinfo.h-when-INTEGCK_DEBUG-is-en.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 30f0cd91b21dbc5d593d61ae44875ad0cb53cb4d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 16 Jul 2016 11:27:06 +0200 -Subject: [PATCH] integck: only use execinfo.h when INTEGCK_DEBUG is enabled - -Guard the usage of execinfo.h by INTEGCK_DEBUG so that by defaut, -integck builds properly on systems without (uClibc and -musl based systems). As stated in the code, the backtrace() -functionality of will anyway only work properly when -INTEGCK_DEBUG is defined (it makes all functions non-static, which is -needed for backtrace to provide some useful information). - -Signed-off-by: Thomas Petazzoni ---- - tests/fs-tests/integrity/integck.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c -index 8badd1f..6ef817e 100644 ---- a/tests/fs-tests/integrity/integck.c -+++ b/tests/fs-tests/integrity/integck.c -@@ -31,7 +31,9 @@ - #include - #include - #include -+#ifdef INTEGCK_DEBUG - #include -+#endif - #include - #include - #include -@@ -248,14 +250,18 @@ static char *random_name_buf; - static void check_failed(const char *cond, const char *func, const char *file, - int line) - { -- int error = errno, count; -+ int error = errno; -+#ifdef INTEGCK_DEBUG -+ int count; - void *addresses[128]; -+#endif - - fflush(stdout); - fflush(stderr); - errmsg("condition '%s' failed in %s() at %s:%d", - cond, func, file, line); - normsg("error %d (%s)", error, strerror(error)); -+#ifdef INTEGCK_DEBUG - /* - * Note, to make this work well you need: - * 1. Make all functions non-static - add "#define static' -@@ -264,6 +270,7 @@ static void check_failed(const char *cond, const char *func, const char *file, - */ - count = backtrace(addresses, 128); - backtrace_symbols_fd(addresses, count, fileno(stdout)); -+#endif - exit(EXIT_FAILURE); - } - --- -2.7.4 - diff --git a/package.bak/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch b/package.bak/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch deleted file mode 100644 index 5c0a552ddd..0000000000 --- a/package.bak/mtd/0003-fs-tests-integrity-don-t-include-header-bits-stdio_l.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 600ab10e3b452cdffc6c82770b0bb2ff5c23ad70 Mon Sep 17 00:00:00 2001 -From: Rahul Bedarkar -Date: Fri, 12 Aug 2016 22:59:35 +0530 -Subject: [PATCH 1/1] fs-tests: integrity: don't include header - - -With musl C library, we get following build error - -integck.c:37:28: fatal error: bits/stdio_lim.h: No such file or directory - #include - ^ -compilation terminated. -make[2]: *** [integck] Error 1 - -Header is not available in musl C library. However - has all definition that supposed to be -providing. Moreover shouldn't be included directly -instead we should be using . - -Since we already include and in case of uClibc or glibc - gets included internally, we can safely remove it. - -This build issue is found by Buildroot autobuilder -http://autobuild.buildroot.net/results/175/1754861457af520480cc34d7d2d0edff2868ff66/ - -Signed-off-by: Rahul Bedarkar ---- - tests/fs-tests/integrity/integck.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c -index 6ef817e..0bb9711 100644 ---- a/tests/fs-tests/integrity/integck.c -+++ b/tests/fs-tests/integrity/integck.c -@@ -34,7 +34,6 @@ - #ifdef INTEGCK_DEBUG - #include - #endif --#include - #include - #include - #include --- -2.6.2 - diff --git a/package.bak/mtd/Config.in b/package.bak/mtd/Config.in deleted file mode 100644 index 2e6cdbbeb2..0000000000 --- a/package.bak/mtd/Config.in +++ /dev/null @@ -1,164 +0,0 @@ -config BR2_PACKAGE_MTD - bool "mtd, jffs2 and ubi/ubifs tools" - help - Build mtd, jffs2 and ubi/ubifs tools - - http://www.linux-mtd.infradead.org/ - -if BR2_PACKAGE_MTD -comment "MTD tools selection" - -config BR2_PACKAGE_MTD_DOCFDISK - bool "docfdisk" - -config BR2_PACKAGE_MTD_DOC_LOADBIOS - bool "doc_loadbios" - -config BR2_PACKAGE_MTD_FLASHCP - bool "flashcp" - default y - -config BR2_PACKAGE_MTD_FLASH_ERASE - bool "flash_erase" - default y - -config BR2_PACKAGE_MTD_FLASH_LOCK - bool "flash_lock" - default y - -config BR2_PACKAGE_MTD_FLASH_OTP_DUMP - bool "flash_otp_dump" - -config BR2_PACKAGE_MTD_FLASH_OTP_INFO - bool "flash_otp_info" - -config BR2_PACKAGE_MTD_FLASH_OTP_LOCK - bool "flash_otp_lock" - -config BR2_PACKAGE_MTD_FLASH_OTP_WRITE - bool "flash_otp_write" - -config BR2_PACKAGE_MTD_FLASH_UNLOCK - bool "flash_unlock" - default y - -config BR2_PACKAGE_MTD_FTL_CHECK - bool "ftl_check" - -config BR2_PACKAGE_MTD_FTL_FORMAT - bool "ftl_format" - -config BR2_PACKAGE_MTD_JFFS2DUMP - bool "jffs2dump" - -config BR2_PACKAGE_MTD_MKFSJFFS2 - bool "mkfs.jffs2" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LZO - -config BR2_PACKAGE_MTD_MKFSUBIFS - bool "mkfs.ubifs" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LZO - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - -config BR2_PACKAGE_MTD_MTD_DEBUG - bool "mtd_debug" - default y - -config BR2_PACKAGE_MTD_MTDPART - bool "mtdpart" - -config BR2_PACKAGE_MTD_NANDDUMP - bool "nanddump" - default y - -config BR2_PACKAGE_MTD_NANDTEST - bool "nandtest" - default y - -config BR2_PACKAGE_MTD_NANDWRITE - bool "nandwrite" - default y - -config BR2_PACKAGE_MTD_NFTLDUMP - bool "nftldump" - -config BR2_PACKAGE_MTD_NFTL_FORMAT - bool "nftl_format" - -config BR2_PACKAGE_MTD_RECV_IMAGE - bool "recv_image" - -config BR2_PACKAGE_MTD_RFDDUMP - bool "rfddump" - -config BR2_PACKAGE_MTD_RFDFORMAT - bool "rfdformat" - -config BR2_PACKAGE_MTD_SERVE_IMAGE - bool "serve_image" - -config BR2_PACKAGE_MTD_SUMTOOL - bool "sumtool" - -config BR2_PACKAGE_MTD_MTDINFO - bool "mtdinfo" - default y - -config BR2_PACKAGE_MTD_UBIATTACH - bool "ubiattach" - default y - -config BR2_PACKAGE_MTD_UBICRC32 - bool "ubicrc32" - default y - -config BR2_PACKAGE_MTD_UBIDETACH - bool "ubidetach" - default y - -config BR2_PACKAGE_MTD_UBIFORMAT - bool "ubiformat" - default y - -config BR2_PACKAGE_MTD_UBIMKVOL - bool "ubimkvol" - default y - -config BR2_PACKAGE_MTD_UBINFO - bool "ubinfo" - default y - -config BR2_PACKAGE_MTD_UBINIZE - bool "ubinize" - default y - -config BR2_PACKAGE_MTD_UBIRENAME - bool "ubirename" - default y - -config BR2_PACKAGE_MTD_UBIRMVOL - bool "ubirmvol" - default y - -config BR2_PACKAGE_MTD_UBIRSVOL - bool "ubirsvol" - default y - -config BR2_PACKAGE_MTD_UBIUPDATEVOL - bool "ubiupdatevol" - default y - -config BR2_PACKAGE_MTD_UBIBLOCK - bool "ubiblock" - default y - -config BR2_PACKAGE_MTD_INTEGCK - bool "integck" - depends on BR2_USE_MMU # fork() - help - Install the integck test program. - -endif diff --git a/package.bak/mtd/Config.in.host b/package.bak/mtd/Config.in.host deleted file mode 100644 index 3752266156..0000000000 --- a/package.bak/mtd/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_MTD - bool "host mtd, jffs2 and ubi/ubifs tools" - help - Build mtd, jffs2 and ubi/ubifs tools - - http://www.linux-mtd.infradead.org/ diff --git a/package.bak/mtd/mtd.hash b/package.bak/mtd/mtd.hash deleted file mode 100644 index a99e04e51c..0000000000 --- a/package.bak/mtd/mtd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated after checking pgp signature -# ftp://ftp.infradead.org/pub/mtd-utils/mtd-utils-1.5.2.tar.bz2.asc -sha256 5db57389280a3abaec5dd23af2590988b70f213fa3929c12a2642c8f9a86f400 mtd-utils-1.5.2.tar.bz2 diff --git a/package.bak/mtd/mtd.mk b/package.bak/mtd/mtd.mk deleted file mode 100644 index acf24d5a83..0000000000 --- a/package.bak/mtd/mtd.mk +++ /dev/null @@ -1,134 +0,0 @@ -################################################################################ -# -# mtd -# -################################################################################ - -MTD_VERSION = 1.5.2 -MTD_SOURCE = mtd-utils-$(MTD_VERSION).tar.bz2 -MTD_SITE = ftp://ftp.infradead.org/pub/mtd-utils -MTD_LICENSE = GPLv2 -MTD_LICENSE_FILES = COPYING - -MTD_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_MTD_MKFSJFFS2),y) -MTD_DEPENDENCIES = zlib lzo -endif - -ifeq ($(BR2_PACKAGE_MTD_MKFSUBIFS),y) -MTD_DEPENDENCIES += util-linux zlib lzo host-pkgconf -define MTD_ADD_MISSING_LINTL - $(SED) "/^LDLIBS_mkfs\.ubifs/ s%$$% `$(PKG_CONFIG_HOST_BINARY) --libs uuid`%" \ - $(@D)/Makefile -endef -MTD_POST_PATCH_HOOKS += MTD_ADD_MISSING_LINTL -endif - -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -MTD_DEPENDENCIES += busybox -endif - -# If extended attributes are required, the acl package must -# also be enabled which will also include the attr package. -ifeq ($(BR2_PACKAGE_ACL),y) -MTD_DEPENDENCIES += acl -MTD_MAKE_OPTS += WITHOUT_XATTR=0 -else -MTD_MAKE_OPTS += WITHOUT_XATTR=1 -endif - -HOST_MTD_DEPENDENCIES = host-zlib host-lzo host-e2fsprogs - -define HOST_MTD_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE1) \ - CROSS= BUILDDIR=$(@D) WITHOUT_XATTR=1 -C $(@D) -endef - -define HOST_MTD_INSTALL_CMDS - $(MAKE1) BUILDDIR=$(@D) DESTDIR=$(HOST_DIR) -C $(@D) install -endef - -MKFS_JFFS2 = $(HOST_DIR)/usr/sbin/mkfs.jffs2 -SUMTOOL = $(HOST_DIR)/usr/sbin/sumtool - -MTD_STAGING_y = lib/libmtd.a ubi-utils/libubi.a -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOCFDISK) += docfdisk -MTD_TARGETS_$(BR2_PACKAGE_MTD_DOC_LOADBIOS) += doc_loadbios -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASHCP) += flashcp -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_ERASE) += flash_erase -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_LOCK) += flash_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_DUMP) += flash_otp_dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_INFO) += flash_otp_info -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_LOCK) += flash_otp_lock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_OTP_WRITE) += flash_otp_write -MTD_TARGETS_$(BR2_PACKAGE_MTD_FLASH_UNLOCK) += flash_unlock -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_CHECK) += ftl_check -MTD_TARGETS_$(BR2_PACKAGE_MTD_FTL_FORMAT) += ftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_JFFS2DUMP) += jffs2dump -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSJFFS2) += mkfs.jffs2 -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTD_DEBUG) += mtd_debug -MTD_TARGETS_$(BR2_PACKAGE_MTD_MTDPART) += mtdpart -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDDUMP) += nanddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDTEST) += nandtest -MTD_TARGETS_$(BR2_PACKAGE_MTD_NANDWRITE) += nandwrite -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTLDUMP) += nftldump -MTD_TARGETS_$(BR2_PACKAGE_MTD_NFTL_FORMAT) += nftl_format -MTD_TARGETS_$(BR2_PACKAGE_MTD_RECV_IMAGE) += recv_image -MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDDUMP) += rfddump -MTD_TARGETS_$(BR2_PACKAGE_MTD_RFDFORMAT) += rfdformat -MTD_TARGETS_$(BR2_PACKAGE_MTD_SERVE_IMAGE) += serve_image -MTD_TARGETS_$(BR2_PACKAGE_MTD_SUMTOOL) += sumtool - -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_MTDINFO) += mtdinfo -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIATTACH) += ubiattach -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBICRC32) += ubicrc32 -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIDETACH) += ubidetach -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIFORMAT) += ubiformat -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIMKVOL) += ubimkvol -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINFO) += ubinfo -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBINIZE) += ubinize -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRENAME) += ubirename -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRMVOL) += ubirmvol -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIRSVOL) += ubirsvol -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIUPDATEVOL) += ubiupdatevol -MTD_TARGETS_UBI_$(BR2_PACKAGE_MTD_UBIBLOCK) += ubiblock - -MTD_TARGETS_y += $(addprefix ubi-utils/,$(MTD_TARGETS_UBI_y)) -MTD_TARGETS_$(BR2_PACKAGE_MTD_MKFSUBIFS) += mkfs.ubifs/mkfs.ubifs - -ifeq ($(BR2_PACKAGE_MTD_INTEGCK),y) -define MTD_BUILD_INTEGCK - $(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \ - BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D)/tests/fs-tests all -endef -define MTD_INSTALL_INTEGCK - $(INSTALL) -D -m 755 $(@D)/tests/fs-tests/integrity/integck $(TARGET_DIR)/usr/sbin/integck -endef -endif - -define MTD_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE1) CROSS=$(TARGET_CROSS) \ - BUILDDIR=$(@D) $(MTD_MAKE_OPTS) -C $(@D) \ - $(addprefix $(@D)/,$(MTD_TARGETS_y)) \ - $(addprefix $(@D)/,$(MTD_STAGING_y)) - $(MTD_BUILD_INTEGCK) -endef - -define MTD_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/lib/libmtd.a $(STAGING_DIR)/usr/lib/libmtd.a - $(INSTALL) -D -m 0755 $(@D)/ubi-utils/libubi.a $(STAGING_DIR)/usr/lib/libubi.a - $(INSTALL) -D -m 0644 $(@D)/include/libmtd.h $(STAGING_DIR)/usr/include/mtd/libmtd.h - $(INSTALL) -D -m 0644 $(@D)/ubi-utils/include/libubi.h $(STAGING_DIR)/usr/include/mtd/libubi.h - $(INSTALL) -D -m 0644 $(@D)/include/mtd/ubi-media.h $(STAGING_DIR)/usr/include/mtd/ubi-media.h -endef - -define MTD_INSTALL_TARGET_CMDS - for f in $(MTD_TARGETS_y) ; do \ - $(INSTALL) -D -m 0755 $(@D)/$$f $(TARGET_DIR)/usr/sbin/$${f##*/} ; \ - done - $(MTD_INSTALL_INTEGCK) -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/mtdev/Config.in b/package.bak/mtdev/Config.in deleted file mode 100644 index afdd7dca6b..0000000000 --- a/package.bak/mtdev/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_MTDEV - bool "mtdev" - help - The mtdev is a stand-alone library which transforms all - variants of kernel MT events to the slotted type B protocol. - - http://bitmath.org/code/mtdev/ diff --git a/package.bak/mtdev/mtdev.hash b/package.bak/mtdev/mtdev.hash deleted file mode 100644 index 7ba5ffdf52..0000000000 --- a/package.bak/mtdev/mtdev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6b59b055ff22f2b91d4284187c2515826c338b81f6f33bd90f6bedc7c1fb9a38 mtdev-1.1.4.tar.bz2 diff --git a/package.bak/mtdev/mtdev.mk b/package.bak/mtdev/mtdev.mk deleted file mode 100644 index fc6ee4c46b..0000000000 --- a/package.bak/mtdev/mtdev.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# mtdev -# -################################################################################ - -MTDEV_VERSION = 1.1.4 -MTDEV_SOURCE = mtdev-$(MTDEV_VERSION).tar.bz2 -MTDEV_SITE = http://bitmath.org/code/mtdev - -MTDEV_LICENSE = MIT -MTDEV_LICENSE_FILES = COPYING -MTDEV_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/mtdev2tuio/0001-Fix-build-with-musl-libc.patch b/package.bak/mtdev2tuio/0001-Fix-build-with-musl-libc.patch deleted file mode 100644 index 810b66c61b..0000000000 --- a/package.bak/mtdev2tuio/0001-Fix-build-with-musl-libc.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f974bb1f92603973711bea36a7869dfa8358aae0 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sun, 31 Jan 2016 09:04:46 +0100 -Subject: [PATCH 1/1] Fix build with musl libc - -Include missing header to prevent build error detected by buildroot: -http://autobuild.buildroot.net/results/aee/aee411047265bf205f8990a3d0d2310decb5fd19/build-end.log - -Signed-off-by: Bernd Kuhls ---- -Patch sent upstream: https://github.com/olivopaolo/mtdev2tuio/pull/2 - - mtdev2tuio.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/mtdev2tuio.c b/mtdev2tuio.c -index 3a9174f..f2c98d5 100644 ---- a/mtdev2tuio.c -+++ b/mtdev2tuio.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - - #define NSEC_PER_USEC 1000L - #define NSEC_PER_SEC 1000000000L --- -2.7.0.rc3 - diff --git a/package.bak/mtdev2tuio/Config.in b/package.bak/mtdev2tuio/Config.in deleted file mode 100644 index 4195ecfeeb..0000000000 --- a/package.bak/mtdev2tuio/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_MTDEV2TUIO - bool "mtdev2tuio" - select BR2_PACKAGE_LIBLO - select BR2_PACKAGE_MTDEV - depends on BR2_TOOLCHAIN_HAS_THREADS # liblo - help - mtdev2tuio is a simple application for converting touch - events captured from libmtdev to TUIO 1.1 - - https://github.com/olivopaolo/mtdev2tuio - -comment "mtdev2tuio needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mtdev2tuio/mtdev2tuio.hash b/package.bak/mtdev2tuio/mtdev2tuio.hash deleted file mode 100644 index b0d159cadc..0000000000 --- a/package.bak/mtdev2tuio/mtdev2tuio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4a6aa319c44478dceaf01a24603690767e56c029a1f0380da0f31eac5a02e10f mtdev2tuio-e1e7378d86abe751158e743586133022f32fa4d1.tar.gz diff --git a/package.bak/mtdev2tuio/mtdev2tuio.mk b/package.bak/mtdev2tuio/mtdev2tuio.mk deleted file mode 100644 index d2e70408f1..0000000000 --- a/package.bak/mtdev2tuio/mtdev2tuio.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# mtdev2tuio -# -################################################################################ - -MTDEV2TUIO_VERSION = e1e7378d86abe751158e743586133022f32fa4d1 -MTDEV2TUIO_SITE = $(call github,olivopaolo,mtdev2tuio,$(MTDEV2TUIO_VERSION)) -MTDEV2TUIO_DEPENDENCIES = mtdev liblo -MTDEV2TUIO_LICENSE = GPLv3+ -MTDEV2TUIO_LICENSE_FILES = COPYING - -# mtdev2tuio Makefile misuses $(LD) as gcc, so we need to override LD -# here. Liblo uses log(3), so we need to link with -lm -define MTDEV2TUIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CC)" \ - LIBS="-lmtdev -llo -lm" \ - -C $(@D) -endef - -define MTDEV2TUIO_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/mtdev2tuio $(TARGET_DIR)/usr/bin/mtdev2tuio -endef - -$(eval $(generic-package)) diff --git a/package.bak/mtools/Config.in b/package.bak/mtools/Config.in deleted file mode 100644 index e51bac121c..0000000000 --- a/package.bak/mtools/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_MTOOLS - bool "mtools" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - help - Mtools is a collection of utilities to access MS-DOS disks from - Unix without mounting them. It supports Win'95 style long file - names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high - density 3 1/2 disk). - - http://www.gnu.org/software/mtools/ - -comment "mtools needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_USE_MMU diff --git a/package.bak/mtools/Config.in.host b/package.bak/mtools/Config.in.host deleted file mode 100644 index 96b332b039..0000000000 --- a/package.bak/mtools/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_MTOOLS - bool "host mtools" - help - Mtools is a collection of utilities to access MS-DOS disks from - Unix without mounting them. It supports Win'95 style long file - names, OS/2 Xdf disks and 2m disks (store up to 1992k on a high - density 3 1/2 disk). - - http://www.gnu.org/software/mtools/ diff --git a/package.bak/mtools/mtools.hash b/package.bak/mtools/mtools.hash deleted file mode 100644 index 5d86498cdc..0000000000 --- a/package.bak/mtools/mtools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 59e9cf80885399c4f229e5d87e49c0c2bfeec044e1386d59fcd0b0aead6b2f85 mtools-4.0.18.tar.bz2 diff --git a/package.bak/mtools/mtools.mk b/package.bak/mtools/mtools.mk deleted file mode 100644 index adba1fc473..0000000000 --- a/package.bak/mtools/mtools.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# mtools -# -################################################################################ - -MTOOLS_VERSION = 4.0.18 -MTOOLS_SOURCE = mtools-$(MTOOLS_VERSION).tar.bz2 -MTOOLS_SITE = $(BR2_GNU_MIRROR)/mtools -MTOOLS_LICENSE = GPLv3+ -MTOOLS_LICENSE_FILES = COPYING -MTOOLS_CONF_OPTS = --without-x -# info documentation not needed -MTOOLS_CONF_ENV = \ - ac_cv_func_setpgrp_void=yes \ - ac_cv_path_INSTALL_INFO= - -HOST_MTOOLS_CONF_ENV = \ - ac_cv_path_INSTALL_INFO= - -# link with iconv if enabled -ifeq ($(BR2_PACKAGE_LIBICONV),y) -MTOOLS_DEPENDENCIES += libiconv -MTOOLS_CONF_ENV += LIBS=-liconv -endif - -# Package does not build in parallel due to improper make rules -MTOOLS_MAKE = $(MAKE1) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/mtr/Config.in b/package.bak/mtr/Config.in deleted file mode 100644 index ec83e25cb1..0000000000 --- a/package.bak/mtr/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_MTR - bool "mtr" - depends on BR2_USE_MMU # fork() - help - mtr combines the functionality of the 'traceroute' and 'ping' - programs in a single network diagnostic tool. - - http://www.bitwizard.nl/mtr/ diff --git a/package.bak/mtr/mtr.hash b/package.bak/mtr/mtr.hash deleted file mode 100644 index f3df81f42a..0000000000 --- a/package.bak/mtr/mtr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 12a6a94c0ec04d508de27eda5f5ba91f50d4b5fe74a98aca0973e2c16a42555a mtr-66de3ecbab28b054b868a73fbb57f30549d770ac.tar.gz diff --git a/package.bak/mtr/mtr.mk b/package.bak/mtr/mtr.mk deleted file mode 100644 index 5ee61249eb..0000000000 --- a/package.bak/mtr/mtr.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# mtr -# -################################################################################ - -MTR_VERSION = 66de3ecbab28b054b868a73fbb57f30549d770ac -MTR_SITE = $(call github,traviscross,mtr,$(MTR_VERSION)) -MTR_AUTORECONF = YES -MTR_CONF_OPTS = --without-gtk -MTR_DEPENDENCIES = host-pkgconf $(if $(BR2_PACKAGE_NCURSES),ncurses) -MTR_LICENSE = GPLv2 -MTR_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/multicat/0001-Fix-missing-pthread.patch b/package.bak/multicat/0001-Fix-missing-pthread.patch deleted file mode 100644 index 1ad2c98772..0000000000 --- a/package.bak/multicat/0001-Fix-missing-pthread.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile: link with pthread - -Otherwise building multicat in a static context fails: - aggregartp.c:381: undefined reference to `pthread_self' - -Signed-off-by: Jörg Krause -Sent upstream: https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000125.html - -diff -purN multicat-2.1.orig/Makefile multicat-2.1/Makefile ---- multicat-2.1.orig/Makefile 2015-10-05 18:36:29.000000000 +0200 -+++ multicat-2.1/Makefile 2016-03-19 21:47:59.467745127 +0100 -@@ -4,7 +4,7 @@ VERSION = 2.1 - CFLAGS += -Wall -Wformat-security -O3 -fomit-frame-pointer -D_FILE_OFFSET_BITS=64 -D_ISOC99_SOURCE -D_BSD_SOURCE - CFLAGS += -g - # Comment out the following line for Mac OS X build --LDLIBS += -lrt -+LDLIBS += -lrt -pthread - - OBJ_MULTICAT = multicat.o util.o - OBJ_INGESTS = ingests.o util.o diff --git a/package.bak/multicat/0002-Fix-musl-build.patch b/package.bak/multicat/0002-Fix-musl-build.patch deleted file mode 100644 index 07e15a353a..0000000000 --- a/package.bak/multicat/0002-Fix-musl-build.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fix musl build - -Defining _GNU_SOURCE is required to get proper member names in `struct udphdr` -when building against musl. Build error: - - util.c: In function 'RawFillHeaders': - util.c:481:9: error: 'struct udphdr' has no member named 'source' - udph->source = htons(portsrc); - ^ - util.c:482:9: error: 'struct udphdr' has no member named 'dest' - udph->dest = htons(portdst); - ^ - util.c:483:9: error: 'struct udphdr' has no member named 'len' - udph->len = htons(sizeof(struct udphdr) + len); - ^ - util.c:484:9: error: 'struct udphdr' has no member named 'check' - udph->check = 0; - -Including in needed for mode_t, otherwise musl build fails: - util.h:91:1: error: unknown type name 'mode_t' - -Signed-off-by: Jörg Krause -Sent upstream: https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000126.html - -diff -purN multicat-2.1.orig/util.c multicat-2.1/util.c ---- multicat-2.1.orig/util.c 2015-07-17 18:03:17.000000000 +0200 -+++ multicat-2.1/util.c 2016-03-19 22:21:01.110178772 +0100 -@@ -21,6 +21,8 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -+#define _GNU_SOURCE -+ - #include - #include - #include -diff -purN multicat-2.1.orig/util.h multicat-2.1/util.h ---- multicat-2.1.orig/util.h 2015-07-15 22:47:39.000000000 +0200 -+++ multicat-2.1/util.h 2016-03-19 22:21:58.649834990 +0100 -@@ -21,6 +21,7 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -+#include - #include - #include - diff --git a/package.bak/multicat/0003-Fix-have-clock-nanosleep-with-uclibc.patch b/package.bak/multicat/0003-Fix-have-clock-nanosleep-with-uclibc.patch deleted file mode 100644 index 108fb0b85b..0000000000 --- a/package.bak/multicat/0003-Fix-have-clock-nanosleep-with-uclibc.patch +++ /dev/null @@ -1,24 +0,0 @@ -uClibc may be configured without support for clock_nanosleep(). The function is -only available with uClibc if the C library is build with NPTL support (sets -__UCLIBC_HAS_THREADS_NATIVE__) and __UCLIBC_HAS_ADVANCED_REALTIME__ set. - -Upstream status: Pending -https://mailman.videolan.org/pipermail/multicat-devel/2016-March/000129.html - -Signed-off-by: Jörg Krause - -diff -purN multicat-2.1.orig/util.h multicat-2.1/util.h ---- multicat-2.1.orig/util.h 2015-07-15 22:47:39.000000000 +0200 -+++ multicat-2.1/util.h 2016-03-20 18:13:51.899780405 +0100 -@@ -26,7 +26,10 @@ - - #ifdef __APPLE__ - #define POLLRDHUP 0 --#else -+/* uClibc may not have clock_nanosleep() available */ -+#elif !defined (__UCLIBC__) || \ -+ defined (__UCLIBC__) && defined (__UCLIBC_HAS_THREADS_NATIVE__) \ -+ && defined (__UCLIBC_HAS_ADVANCED_REALTIME__) - #define HAVE_CLOCK_NANOSLEEP - #endif - diff --git a/package.bak/multicat/Config.in b/package.bak/multicat/Config.in deleted file mode 100644 index 1359358163..0000000000 --- a/package.bak/multicat/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_MULTICAT - bool "multicat" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BITSTREAM - help - Simple and efficient multicast and transport stream manipulation. - - http://www.videolan.org/projects/multicat.html - -comment "multicat needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/multicat/multicat.hash b/package.bak/multicat/multicat.hash deleted file mode 100644 index 38cf9d7dc4..0000000000 --- a/package.bak/multicat/multicat.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from https://get.videolan.org/multicat/2.1/multicat-2.1.tar.bz2.md5 -md5 2e3ecd8dee64f5bd32a61733d4cc2226 multicat-2.1.tar.bz2 -# locally calculated -sha256 5eabe8d9a3dde452b2d348683cc7da213680551a9d4059c356f7319c6aa9b3d1 multicat-2.1.tar.bz2 diff --git a/package.bak/multicat/multicat.mk b/package.bak/multicat/multicat.mk deleted file mode 100644 index cc6eb78d24..0000000000 --- a/package.bak/multicat/multicat.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# multicat -# -################################################################################ - -MULTICAT_VERSION = 2.1 -MULTICAT_SOURCE = multicat-$(MULTICAT_VERSION).tar.bz2 -MULTICAT_SITE = https://get.videolan.org/multicat/$(MULTICAT_VERSION) -MULTICAT_LICENSE = GPLv2+ -MULTICAT_LICENSE_FILES = COPYING - -MULTICAT_DEPENDENCIES = bitstream - -MULTICAT_MAKE_ENV = $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) - -define MULTICAT_BUILD_CMDS - $(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define MULTICAT_INSTALL_TARGET_CMDS - $(MULTICAT_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) PREFIX=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/musepack/0001-shared.patch b/package.bak/musepack/0001-shared.patch deleted file mode 100644 index d8c788db7c..0000000000 --- a/package.bak/musepack/0001-shared.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fixup installation of shared mpcdec library. -Based on gentoo patch. - -Signed-off-by: Gustavo Zacarias ---- - -diff -Nura musepack_src_r475.orig/libmpcdec/CMakeLists.txt musepack_src_r475/libmpcdec/CMakeLists.txt ---- musepack_src_r475.orig/libmpcdec/CMakeLists.txt 2010-08-21 12:55:01.000000000 -0300 -+++ musepack_src_r475/libmpcdec/CMakeLists.txt 2011-08-17 15:53:06.126873408 -0300 -@@ -1,7 +1,12 @@ - include_directories(${libmpc_SOURCE_DIR}/include) - if(SHARED) -- add_library(mpcdec SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) -+ add_library(mpcdec_shared SHARED huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) -+ set_target_properties(mpcdec_shared PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1 VERSION 7.0.1 SOVERSION 7) -+ target_link_libraries(mpcdec_shared m) -+ install(TARGETS mpcdec_shared LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") - else(SHARED) - add_library(mpcdec_static STATIC huffman mpc_decoder mpc_reader streaminfo mpc_bits_reader mpc_demux requant synth_filter ${libmpc_SOURCE_DIR}/common/crc32) -+ set_target_properties(mpcdec_static PROPERTIES OUTPUT_NAME mpcdec CLEAN_DIRECT_OUTPUT 1) -+ target_link_libraries(mpcdec_static m) -+ install(TARGETS mpcdec_static LIBRARY DESTINATION "lib${LIB_SUFFIX}" ARCHIVE DESTINATION "lib${LIB_SUFFIX}") - endif(SHARED) -- diff --git a/package.bak/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/package.bak/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch deleted file mode 100644 index 4bfeca0a04..0000000000 --- a/package.bak/musepack/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ /dev/null @@ -1,43 +0,0 @@ -From d2f01ba6fa2a065156fad686d1849309c661e527 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 31 Aug 2014 12:07:31 +0200 -Subject: [PATCH 2/2] cmake: use the standard CMake flag to drive the shared - object build - -If BUILD_SHARED_LIBS is set and SHARED undefined, then drive SHARED with -the BUILD_SHARED_LIBS value. - -Signed-off-by: Samuel Martin ---- - CMakeLists.txt | 15 ++++++++++----- - 1 file changed, 10 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b13f78c..db75510 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -7,11 +7,16 @@ project(libmpc C) - set(CMAKE_VERBOSE_MAKEFILE false) - TEST_BIG_ENDIAN(MPC_ENDIANNESS) - --if(WIN32) -- option(SHARED "Use shared libmpcdec" OFF) --else(WIN32) -- option(SHARED "Use shared libmpcdec" ON) --endif(WIN32) -+# Use the standard CMake flag to drive the shared object build. -+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED SHARED) -+ set(SHARED ${BUILD_SHARED_LIBS}) -+else() -+ if(WIN32) -+ option(SHARED "Use shared libmpcdec" OFF) -+ else(WIN32) -+ option(SHARED "Use shared libmpcdec" ON) -+ endif(WIN32) -+endif() - - add_definitions(-DFAST_MATH -DCVD_FASTLOG) - --- -2.1.0 - diff --git a/package.bak/musepack/0003-include-fpu-control-with-glibc-only.patch b/package.bak/musepack/0003-include-fpu-control-with-glibc-only.patch deleted file mode 100644 index 6f50155781..0000000000 --- a/package.bak/musepack/0003-include-fpu-control-with-glibc-only.patch +++ /dev/null @@ -1,26 +0,0 @@ -Include only on glibc systems - -The header provides _FPU_*() macros, which the -Init_FPU() function uses only on i386, and only when they are -defined. Since is not available, this causes a build -failure with C libraries such as musl. By simply including - explicitly on glibc systems, we avoid the build -failure, since mpcenc.c already conditionally uses the -macros only if they are defined. - -Signed-off-by: Bernd Kuhls -[Thomas: better commit log.] -Signed-off-by: Thomas Petazzoni - -diff -uNr musepack_src_r475.org/mpcenc/mpcenc.h musepack_src_r475/mpcenc/mpcenc.h ---- musepack_src_r475.org/mpcenc/mpcenc.h 2009-02-23 19:15:46.000000000 +0100 -+++ musepack_src_r475/mpcenc/mpcenc.h 2016-01-30 09:29:08.000000000 +0100 -@@ -50,7 +51,7 @@ - # include - #endif - --#if defined __linux__ -+#if defined __GLIBC__ - # include - #elif defined __FreeBSD__ - # include diff --git a/package.bak/musepack/0004-missing-sys-select.patch b/package.bak/musepack/0004-missing-sys-select.patch deleted file mode 100644 index 1e3a4b1140..0000000000 --- a/package.bak/musepack/0004-missing-sys-select.patch +++ /dev/null @@ -1,21 +0,0 @@ -Add missing include - -This header is needed when types like fd_set are used. This fixes a -build issue occuring on the musl C library. - -Signed-off-by: Bernd Kuhls -[Thomas: better commit log.] -Signed-off-by: Thomas Petazzoni - -Index: b/mpcenc/mpcenc.h -=================================================================== ---- a/mpcenc/mpcenc.h -+++ b/mpcenc/mpcenc.h -@@ -34,6 +34,7 @@ - //// portable system includes ////////////////////////////////////// - #include - #include -+#include - - //// system dependent system includes ////////////////////////////// - // low level I/O, where are prototypes and constants? diff --git a/package.bak/musepack/Config.in b/package.bak/musepack/Config.in deleted file mode 100644 index 2a966a473c..0000000000 --- a/package.bak/musepack/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_MUSEPACK - bool "musepack" - select BR2_PACKAGE_LIBCUEFILE - select BR2_PACKAGE_LIBREPLAYGAIN - help - Musepack is an audio compression format with a strong emphasis - on high quality. It's not lossless, but it is designed - for transparency, so that you won't be able to hear differences - between the original wave file and the much smaller MPC file. - - http://www.musepack.net/ diff --git a/package.bak/musepack/musepack.hash b/package.bak/musepack/musepack.hash deleted file mode 100644 index b1bd73ca89..0000000000 --- a/package.bak/musepack/musepack.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.musepack.net/index.php?pg=src -md5 754d67be67f713e54baf70fcfdb2817e musepack_src_r475.tar.gz -# Calculated based on the hash above -sha256 a4b1742f997f83e1056142d556a8c20845ba764b70365ff9ccf2e3f81c427b2b musepack_src_r475.tar.gz diff --git a/package.bak/musepack/musepack.mk b/package.bak/musepack/musepack.mk deleted file mode 100644 index db613a0a08..0000000000 --- a/package.bak/musepack/musepack.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# musepack -# -################################################################################ - -MUSEPACK_VERSION = r475 -MUSEPACK_SITE = http://files.musepack.net/source -MUSEPACK_SOURCE = musepack_src_$(MUSEPACK_VERSION).tar.gz -MUSEPACK_DEPENDENCIES = libcuefile libreplaygain -MUSEPACK_INSTALL_STAGING = YES -MUSEPACK_MAKE = $(MAKE1) -MUSEPACK_LICENSE = BSD-3c (*mpcdec), LGPLv2.1+ (*mpcenc) -MUSEPACK_LICENSE_FILES = libmpcdec/COPYING libmpcenc/quant.c - -$(eval $(cmake-package)) diff --git a/package.bak/musl-compat-headers/Config.in b/package.bak/musl-compat-headers/Config.in deleted file mode 100644 index c672f9cac3..0000000000 --- a/package.bak/musl-compat-headers/Config.in +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_MUSL_COMPAT_HEADERS - bool diff --git a/package.bak/musl-compat-headers/cdefs.h b/package.bak/musl-compat-headers/cdefs.h deleted file mode 100644 index 6fe7aa435d..0000000000 --- a/package.bak/musl-compat-headers/cdefs.h +++ /dev/null @@ -1,51 +0,0 @@ -/* Copyright (C) 2016 Yann E. MORIN - * - * This file is in the Public Domain. - * - * For jurisdictions in which the Public Domain does not exist - * or it is not otherwise applicable, this file is licensed CC0 - * (Creative Commons Zero). - */ - -/* This file contains definitions for non-standard macros defined by - * glibc, but quite commonly used in packages. - * - * Because they are non-standard, musl does not define those macros. - * It does not provide cdefs.h either. - * - * This file is a compatibility header written from scratch, to be - * installed when the C library is musl. - * - * Not all macros from the glibc's cdefs.h are available, only the - * most commonly used ones. - * - * Please refer to the glibc documentation and source code for - * explanations about those macros. - */ - -#ifndef BUILDROOT_SYS_CDEFS_H -#define BUILDROOT_SYS_CDEFS_H - -/* Function prototypes. */ -#undef __P -#define __P(arg) arg - -/* C declarations in C++ mode. */ -#ifdef __cplusplus -# define __BEGIN_DECLS extern "C" { -# define __END_DECLS } -#else -# define __BEGIN_DECLS -# define __END_DECLS -#endif - -/* Don't throw exceptions in C functions. */ -#ifndef __cplusplus -# define __THROW __attribute__ ((__nothrow__)) -# define __NTH(f) __attribute__ ((__nothrow__)) f -#else -# define __THROW -# define __NTH(f) f -#endif - -#endif /* ifndef BUILDROOT_SYS_CDEFS_H */ diff --git a/package.bak/musl-compat-headers/musl-compat-headers.hash b/package.bak/musl-compat-headers/musl-compat-headers.hash deleted file mode 100644 index f8e2a6c598..0000000000 --- a/package.bak/musl-compat-headers/musl-compat-headers.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c13407edd0e33be73cae72514cb234f8612e1c0e54401c9448daffd3a240158b queue.h?rev=1.70 diff --git a/package.bak/musl-compat-headers/musl-compat-headers.mk b/package.bak/musl-compat-headers/musl-compat-headers.mk deleted file mode 100644 index 25e032c727..0000000000 --- a/package.bak/musl-compat-headers/musl-compat-headers.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# musl-compat-headers -# -################################################################################ - -# No main site, just using extra downloads -MUSL_COMPAT_HEADERS_QUEUE_H = http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/sys/queue.h?rev=1.70 - -MUSL_COMPAT_HEADERS_EXTRA_DOWNLOADS = $(MUSL_COMPAT_HEADERS_QUEUE_H) - -MUSL_COMPAT_HEADERS_LICENSE = BSD-3c, Public Domain or CC0 -MUSL_COMPAT_HEADERS_LICENSE_FILES = queue.h cdefs.h - -MUSL_COMPAT_HEADERS_ADD_TOOLCHAIN_DEPENDENCY = NO - -# Only installs headers -MUSL_COMPAT_HEADERS_INSTALL_TARGET = NO -MUSL_COMPAT_HEADERS_INSTALL_STAGING = YES - -# Copying both headers so legal-info finds them (they are _LICENSE_FILES) -define MUSL_COMPAT_HEADERS_EXTRACT_CMDS - $(INSTALL) -m 0644 -D $(DL_DIR)/$(notdir $(MUSL_COMPAT_HEADERS_QUEUE_H)) $(@D)/queue.h - $(INSTALL) -m 0644 -D $(MUSL_COMPAT_HEADERS_PKGDIR)/cdefs.h $(@D)/cdefs.h -endef - -define MUSL_COMPAT_HEADERS_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0644 $(@D)/queue.h \ - $(STAGING_DIR)/usr/include/sys/queue.h - $(INSTALL) -D -m 0644 $(@D)/cdefs.h \ - $(STAGING_DIR)/usr/include/sys/cdefs.h -endef - -$(eval $(generic-package)) diff --git a/package.bak/musl/0001-avoid-kernel-if_ether.h.patch b/package.bak/musl/0001-avoid-kernel-if_ether.h.patch deleted file mode 100644 index 8efbcc8450..0000000000 --- a/package.bak/musl/0001-avoid-kernel-if_ether.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3984adc4976de7553f51e0cf4de1e18c373b332b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 15 Dec 2016 15:10:19 +0200 -Subject: [PATCH] Avoid redefinition of struct ethhdr - -This is a workaround to the if_ether.h conflict between musl and the kernel. -Both define struct ethhdr. - -Signed-off-by: Baruch Siach ---- - include/netinet/if_ether.h | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/include/netinet/if_ether.h b/include/netinet/if_ether.h -index 11ee65823f93..cfe1949d3371 100644 ---- a/include/netinet/if_ether.h -+++ b/include/netinet/if_ether.h -@@ -1,6 +1,9 @@ - #ifndef _NETINET_IF_ETHER_H - #define _NETINET_IF_ETHER_H - -+/* Suppress kernel if_ether.h header inclusion */ -+#define _LINUX_IF_ETHER_H -+ - #include - #include - --- -2.10.2 - diff --git a/package.bak/musl/Config.in b/package.bak/musl/Config.in deleted file mode 100644 index 2775313af5..0000000000 --- a/package.bak/musl/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_MUSL - bool - depends on BR2_TOOLCHAIN_USES_MUSL - default y - select BR2_PACKAGE_LINUX_HEADERS - # SSP broken on i386/ppc: http://www.openwall.com/lists/musl/2016/12/04/2 - select BR2_TOOLCHAIN_HAS_SSP if !(BR2_i386 || BR2_powerpc) - # Compatibility headers: cdefs.h, queue.h - select BR2_PACKAGE_MUSL_COMPAT_HEADERS diff --git a/package.bak/musl/musl.hash b/package.bak/musl/musl.hash deleted file mode 100644 index f3f3741092..0000000000 --- a/package.bak/musl/musl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 937185a5e5d721050306cf106507a006c3f1f86d86cd550024ea7be909071011 musl-1.1.16.tar.gz diff --git a/package.bak/musl/musl.mk b/package.bak/musl/musl.mk deleted file mode 100644 index 6d5603398b..0000000000 --- a/package.bak/musl/musl.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# musl -# -################################################################################ - -MUSL_VERSION = 1.1.16 -MUSL_SITE = http://www.musl-libc.org/releases -MUSL_LICENSE = MIT -MUSL_LICENSE_FILES = COPYRIGHT - -# Before musl is configured, we must have the first stage -# cross-compiler and the kernel headers -MUSL_DEPENDENCIES = host-gcc-initial linux-headers - -# musl does not provide an implementation for sys/queue.h or sys/cdefs.h. -# So, add the musl-compat-headers package that will install those files, -# into the staging directory: -# sys/queue.h: header from NetBSD -# sys/cdefs.h: minimalist header bundled in Buildroot -MUSL_DEPENDENCIES += musl-compat-headers - -# musl is part of the toolchain so disable the toolchain dependency -MUSL_ADD_TOOLCHAIN_DEPENDENCY = NO - -MUSL_INSTALL_STAGING = YES - -# Thumb build is broken, build in ARM mode, since all architectures -# that support Thumb1 also support ARM. -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -MUSL_EXTRA_CFLAGS += -marm -endif - -define MUSL_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,$(TARGET_CFLAGS)) $(MUSL_EXTRA_CFLAGS)" \ - CPPFLAGS="$(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64,$(TARGET_CPPFLAGS))" \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --prefix=/usr \ - --libdir=/lib \ - --disable-gcc-wrapper \ - --enable-static \ - $(if $(BR2_STATIC_LIBS),--disable-shared,--enable-shared)) -endef - -define MUSL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define MUSL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(STAGING_DIR) install-libs install-tools install-headers -endef - -define MUSL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install-libs - $(RM) $(addprefix $(TARGET_DIR)/lib/,crt1.o crtn.o crti.o Scrt1.o) -endef - -$(eval $(generic-package)) diff --git a/package.bak/mutt/0001-nodoc.patch b/package.bak/mutt/0001-nodoc.patch deleted file mode 100644 index 6fd556dcbc..0000000000 --- a/package.bak/mutt/0001-nodoc.patch +++ /dev/null @@ -1,21 +0,0 @@ -Disable the documentation build - -The documentation tool is compiled for the target, but executed on the -host. We don't bother fixing this, as we don't care of the -documentation in Buildroot. - -Signed-off-by: Thomas Petazzoni - -Index: mutt-1.5.17+20080114/Makefile.am -=================================================================== ---- mutt-1.5.17+20080114.orig/Makefile.am 2010-05-15 18:15:08.000000000 +0200 -+++ mutt-1.5.17+20080114/Makefile.am 2010-05-15 18:15:17.000000000 +0200 -@@ -9,7 +9,7 @@ - IMAP_INCLUDES = -I$(top_srcdir)/imap - endif - --SUBDIRS = m4 po intl doc contrib $(IMAP_SUBDIR) -+SUBDIRS = m4 po intl contrib $(IMAP_SUBDIR) - - bin_SCRIPTS = muttbug flea @SMIMEAUX_TARGET@ - diff --git a/package.bak/mutt/Config.in b/package.bak/mutt/Config.in deleted file mode 100644 index d85c1a7f7d..0000000000 --- a/package.bak/mutt/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_MUTT - bool "mutt" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - Mutt is a sophisticated text-based Mail User Agent (MUA) - - http://www.mutt.org/ - -if BR2_PACKAGE_MUTT - -config BR2_PACKAGE_MUTT_IMAP - bool "imap" - help - IMAP support - -config BR2_PACKAGE_MUTT_POP3 - bool "pop3" - help - POP3 support - -endif # BR2_PACKAGE_MUTT - -comment "mutt needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/mutt/mutt.hash b/package.bak/mutt/mutt.hash deleted file mode 100644 index 460cd5f04f..0000000000 --- a/package.bak/mutt/mutt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e9c6f88e83d48690033f0d862a70293ac746286b77241554f5448bc23bd0d6df mutt-1.7.1.tar.gz diff --git a/package.bak/mutt/mutt.mk b/package.bak/mutt/mutt.mk deleted file mode 100644 index cd44ca101d..0000000000 --- a/package.bak/mutt/mutt.mk +++ /dev/null @@ -1,74 +0,0 @@ -################################################################################ -# -# mutt -# -################################################################################ - -MUTT_VERSION = 1.7.1 -MUTT_SITE = https://bitbucket.org/mutt/mutt/downloads -MUTT_LICENSE = GPLv2+ -MUTT_LICENSE_FILES = GPL -MUTT_DEPENDENCIES = ncurses -MUTT_CONF_OPTS = --disable-smtp -MUTT_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -MUTT_DEPENDENCIES += libiconv -MUTT_CONF_OPTS += --enable-iconv -endif - -ifeq ($(BR2_PACKAGE_LIBIDN),y) -MUTT_DEPENDENCIES += libidn -MUTT_CONF_OPTS += --with-idn -else -MUTT_CONF_OPTS += --without-idn -endif - -ifeq ($(BR2_PACKAGE_MUTT_IMAP),y) -MUTT_CONF_OPTS += --enable-imap -else -MUTT_CONF_OPTS += --disable-imap -endif - -ifeq ($(BR2_PACKAGE_MUTT_POP3),y) -MUTT_CONF_OPTS += --enable-pop -else -MUTT_CONF_OPTS += --disable-pop -endif - -# SSL support is only used by imap or pop3 module -ifneq ($(BR2_PACKAGET_MUTT_IMAP)$(BR2_PACKAGE_MUTT_POP3),) -ifeq ($(BR2_PACKAGE_OPENSSL),y) -MUTT_DEPENDENCIES += openssl -MUTT_CONF_OPTS += --with-ssl=$(STAGING_DIR)/usr -else -MUTT_CONF_OPTS += --without-ssl -endif -else -MUTT_CONF_OPTS += --without-ssl -endif - -# Avoid running tests to check for: -# - target system is *BSD -# - C99 conformance (snprintf, vsnprintf) -# - behaviour of the regex library -# - if mail spool directory is world/group writable -# - we have a working libiconv -MUTT_CONF_ENV += \ - mutt_cv_bsdish=no \ - mutt_cv_c99_snprintf=yes \ - mutt_cv_c99_vsnprintf=yes \ - mutt_cv_regex_broken=no \ - mutt_cv_worldwrite=yes \ - mutt_cv_groupwrite=yes \ - mutt_cv_iconv_good=yes \ - mutt_cv_iconv_nontrans=no - -MUTT_CONF_OPTS += --with-mailpath=/var/mail - -define MUTT_VAR_MAIL - ln -sf /tmp $(TARGET_DIR)/var/mail -endef -MUTT_POST_INSTALL_TARGET_HOOKS += MUTT_VAR_MAIL - -$(eval $(autotools-package)) diff --git a/package.bak/mxml/0001-fix-cross-target-installation.patch b/package.bak/mxml/0001-fix-cross-target-installation.patch deleted file mode 100644 index 3a9fa0c0cf..0000000000 --- a/package.bak/mxml/0001-fix-cross-target-installation.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Baruch Siach -Subject: [PATCH] mxml: workaround for cross build - -The added patch is a workaround for cross build as follows: - - * disable run of a test binary at build time - * disable generation of documentation using the mxmldoc binary - * remove now non-existent entries from the install target - * disable strip when running install - -Signed-off-by: Baruch Siach ---- -diff -Nuar mxml-2.7-orig/Makefile.in mxml-2.7/Makefile.in ---- mxml-2.7-orig/Makefile.in 2011-04-13 18:43:32.000000000 +0300 -+++ mxml-2.7/Makefile.in 2012-05-16 07:21:42.677220980 +0300 -@@ -57,7 +57,7 @@ - # Install commands... - # - --INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 -s -+INSTALL_BIN = $(LIBTOOL) $(INSTALL) -m 755 - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_DIR = $(INSTALL) -d - INSTALL_LIB = $(LIBTOOL) $(INSTALL) -m 755 -@@ -88,7 +88,7 @@ - mxml-index.o mxml-node.o mxml-search.o mxml-set.o - LIBOBJS = $(PUBLIBOBJS) mxml-private.o mxml-string.o - OBJS = mxmldoc.o testmxml.o $(LIBOBJS) --TARGETS = $(LIBMXML) mxmldoc testmxml mxml.xml doc/mxml.man -+TARGETS = $(LIBMXML) libmxml.a - - - # -@@ -140,9 +140,6 @@ - # - - install: $(TARGETS) install-$(LIBMXML) install-libmxml.a -- echo Installing mxmldoc in $(BUILDROOT)$(bindir)... -- $(INSTALL_DIR) $(BUILDROOT)$(bindir) -- $(INSTALL_BIN) mxmldoc $(BUILDROOT)$(bindir) - echo Installing documentation in $(BUILDROOT)$(docdir)... - $(INSTALL_DIR) $(BUILDROOT)$(docdir) - for file in $(DOCFILES); do \ -@@ -154,11 +151,6 @@ - echo Installing pkgconfig files in $(BUILDROOT)$(libdir)/pkgconfig... - $(INSTALL_DIR) $(BUILDROOT)$(libdir)/pkgconfig - $(INSTALL_DATA) mxml.pc $(BUILDROOT)$(libdir)/pkgconfig -- echo Installing man pages in $(BUILDROOT)$(mandir)... -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man1 -- $(INSTALL_MAN) doc/mxmldoc.man $(BUILDROOT)$(mandir)/man1/mxmldoc.1 -- $(INSTALL_DIR) $(BUILDROOT)$(mandir)/man3 -- $(INSTALL_MAN) doc/mxml.man $(BUILDROOT)$(mandir)/man3/mxml.3 - - install-libmxml.a: - echo Installing libmxml.a to $(BUILDROOT)$(libdir)... diff --git a/package.bak/mxml/Config.in b/package.bak/mxml/Config.in deleted file mode 100644 index d3202b4bc9..0000000000 --- a/package.bak/mxml/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MXML - bool "Mini-XML" - help - Lightweight XML Library - - http://www.minixml.org diff --git a/package.bak/mxml/mxml.hash b/package.bak/mxml/mxml.hash deleted file mode 100644 index 90392755ba..0000000000 --- a/package.bak/mxml/mxml.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.msweet.org/downloads.php?L+Z3 -md5 8804c961a24500a95690ef287d150abe mxml-2.10.tar.gz -# Locally computed -sha256 267ff58b64ddc767170d71dab0c729c06f45e1df9a9b6f75180b564f09767891 mxml-2.10.tar.gz diff --git a/package.bak/mxml/mxml.mk b/package.bak/mxml/mxml.mk deleted file mode 100644 index f36c75cabb..0000000000 --- a/package.bak/mxml/mxml.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# mxml -# -################################################################################ - -MXML_VERSION = 2.10 -MXML_SITE = http://www.msweet.org/files/project3 -MXML_LICENSE = LGPLv2+ with exceptions -MXML_LICENSE_FILES = COPYING -MXML_INSTALL_STAGING = YES - -MXML_INSTALL_STAGING_OPTS = DSTROOT=$(STAGING_DIR) install -MXML_INSTALL_TARGET_OPTS = DSTROOT=$(TARGET_DIR) install - -$(eval $(autotools-package)) diff --git a/package.bak/mxsldr/Config.in.host b/package.bak/mxsldr/Config.in.host deleted file mode 100644 index a427e71cf7..0000000000 --- a/package.bak/mxsldr/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_MXSLDR - bool "host mxsldr" - depends on BR2_arm || BR2_armeb - help - This package contains tools to download and execute code on - Freescale i.MX23 and i.MX28 SoC's through the Serial - Download Protocol. - - git://git.denx.de/mxsldr.git diff --git a/package.bak/mxsldr/mxsldr.mk b/package.bak/mxsldr/mxsldr.mk deleted file mode 100644 index fa7ca8447a..0000000000 --- a/package.bak/mxsldr/mxsldr.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# mxsldr -# -################################################################################ - -MXSLDR_VERSION = 2793a657ab7a22487d21c1b020957806f8ae8383 -MXSLDR_SITE = git://git.denx.de/mxsldr.git -MXSLDR_LICENSE = GPLv2+ -MXSLDR_LICENSE_FILES = COPYING -HOST_MXSLDR_DEPENDENCIES = host-libusb host-pkgconf - -define HOST_MXSLDR_BUILD_CMDS - $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define HOST_MXSLDR_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/mxsldr $(HOST_DIR)/usr/bin/mxsldr -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/mysql/Config.in b/package.bak/mysql/Config.in deleted file mode 100644 index 69ad586548..0000000000 --- a/package.bak/mysql/Config.in +++ /dev/null @@ -1,75 +0,0 @@ -config BR2_PACKAGE_MYSQL - bool "mysql support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Select the desired mysql provider. - -if BR2_PACKAGE_MYSQL - -choice - prompt "mysql variant" - default BR2_PACKAGE_ORACLE_MYSQL - help - Select either the oracle mysql server or the mariadb server - -config BR2_PACKAGE_MARIADB - bool "mariadb" - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - select BR2_PACKAGE_LIBAIO - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_HAS_MYSQL - help - MariaDB is one of the most popular database servers in the world. - It's made by the original developers of MySQL and guaranteed to - stay open source. - - http://www.mariadb.org/ - -config BR2_PACKAGE_ORACLE_MYSQL - bool "oracle mysql" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_HAS_MYSQL - help - The MySQL Open Source Database System - - http://www.mysql.com/ - -endchoice - -if BR2_PACKAGE_MARIADB - -config BR2_PACKAGE_MARIADB_SERVER - bool "mariadb server" - help - Install the mariadb server on the target. - -endif - -if BR2_PACKAGE_ORACLE_MYSQL - -config BR2_PACKAGE_ORACLE_MYSQL_SERVER - bool "oracle mysql server" - help - Install the MySQL server on the target. - -endif - -config BR2_PACKAGE_HAS_MYSQL - bool - -config BR2_PACKAGE_PROVIDES_MYSQL - string - default "mariadb" if BR2_PACKAGE_MARIADB - default "oracle-mysql" if BR2_PACKAGE_ORACLE_MYSQL - -endif - -comment "mysql needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/mysql/mysql.mk b/package.bak/mysql/mysql.mk deleted file mode 100644 index d65562563d..0000000000 --- a/package.bak/mysql/mysql.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# mysql -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/nano/Config.in b/package.bak/nano/Config.in deleted file mode 100644 index 4b340ff5b8..0000000000 --- a/package.bak/nano/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_NANO - bool "nano" - depends on BR2_USE_WCHAR - # full version uses fork() - select BR2_PACKAGE_NANO_TINY if !BR2_USE_MMU - select BR2_PACKAGE_NCURSES - help - A nice ncurses-based editor. Started out as a clone of pico. - Great editor for new users. - - http://www.nano-editor.org/ - -if BR2_PACKAGE_NANO - -config BR2_PACKAGE_NANO_TINY - bool "optimize for size" - default y - help - Disable all features for the sake of size. - -endif - -comment "nano needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/nano/nano.hash b/package.bak/nano/nano.hash deleted file mode 100644 index aa3e27b917..0000000000 --- a/package.bak/nano/nano.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 752170643039e2c95a433de357f0c70a8c4c4c561a90a7e7259a63e225b659b9 nano-2.7.4.tar.xz diff --git a/package.bak/nano/nano.mk b/package.bak/nano/nano.mk deleted file mode 100644 index 4632bed3b1..0000000000 --- a/package.bak/nano/nano.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# nano -# -################################################################################ - -NANO_VERSION_MAJOR = 2.7 -NANO_VERSION = $(NANO_VERSION_MAJOR).4 -NANO_SITE = https://www.nano-editor.org/dist/v$(NANO_VERSION_MAJOR) -NANO_SOURCE = nano-$(NANO_VERSION).tar.xz -NANO_LICENSE = GPLv3+ -NANO_LICENSE_FILES = COPYING -NANO_CONF_OPTS = \ - --without-slang \ - --with-wordbounds -NANO_DEPENDENCIES = ncurses - -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -else -NANO_CONF_ENV += ac_cv_prog_NCURSESW_CONFIG=false -NANO_MAKE_ENV += CURSES_LIB="-lncurses" -endif - -ifeq ($(BR2_PACKAGE_FILE),y) -NANO_DEPENDENCIES += file -else -NANO_CONF_ENV += ac_cv_lib_magic_magic_open=no -endif - -ifeq ($(BR2_PACKAGE_NANO_TINY),y) -NANO_CONF_OPTS += --enable-tiny -define NANO_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/src/nano $(TARGET_DIR)/usr/bin/nano -endef -endif - -$(eval $(autotools-package)) diff --git a/package.bak/nanocom/Config.in b/package.bak/nanocom/Config.in deleted file mode 100644 index 51d628aec5..0000000000 --- a/package.bak/nanocom/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_NANOCOM - bool "nanocom" - help - Nanocom is based upon microcom (http://microcom.port5.com/) but - removes the scripting and logging features while introducing support - for setting local/remote echo, parity and stop bits. It also follows - a more standard command line style using the getopt function. - Internally much of the code has been rewritten and reformatted, the - menu system in particular is almost entirely different. - - http://nanocom.sourceforge.net/ diff --git a/package.bak/nanocom/nanocom.hash b/package.bak/nanocom/nanocom.hash deleted file mode 100644 index 7e7016c25b..0000000000 --- a/package.bak/nanocom/nanocom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5cb26e3e232cfc4a7cb16da432db532b775c5ebdb887ac9d39df5632f2c9a5e5 nanocom.tar.gz diff --git a/package.bak/nanocom/nanocom.mk b/package.bak/nanocom/nanocom.mk deleted file mode 100644 index caab3680e4..0000000000 --- a/package.bak/nanocom/nanocom.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# nanocom -# -################################################################################ - -NANOCOM_VERSION = 1.0 -NANOCOM_SOURCE = nanocom.tar.gz -NANOCOM_SITE = http://downloads.sourceforge.net/project/nanocom/nanocom/v$(NANOCOM_VERSION) -NANOCOM_STRIP_COMPONENTS = 0 -NANOCOM_LICENSE = GPLv2+ -NANOCOM_LICENSE_FILES = COPYING - -define NANOCOM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" -C $(@D) -endef - -define NANOCOM_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/nanocom $(TARGET_DIR)/usr/bin/nanocom -endef - -$(eval $(generic-package)) diff --git a/package.bak/nasm/nasm.hash b/package.bak/nasm/nasm.hash deleted file mode 100644 index 5d7c36dec5..0000000000 --- a/package.bak/nasm/nasm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4c866b60c0b1c4ebc715205d007b4640ff4e36af637c9a7deb87b2900e544321 nasm-2.12.02.tar.xz diff --git a/package.bak/nasm/nasm.mk b/package.bak/nasm/nasm.mk deleted file mode 100644 index f5d9ea0bbd..0000000000 --- a/package.bak/nasm/nasm.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# nasm -# -################################################################################ - -NASM_VERSION = 2.12.02 -NASM_SOURCE = nasm-$(NASM_VERSION).tar.xz -NASM_SITE = http://www.nasm.us/pub/nasm/releasebuilds/$(NASM_VERSION) -NASM_LICENSE = BSD-2c -NASM_LICENSE_FILES = LICENSE - -$(eval $(host-autotools-package)) diff --git a/package.bak/nbd/0001-avoid-name-clashing.patch b/package.bak/nbd/0001-avoid-name-clashing.patch deleted file mode 100644 index b3ea9c99c5..0000000000 --- a/package.bak/nbd/0001-avoid-name-clashing.patch +++ /dev/null @@ -1,28 +0,0 @@ -rename err() function to avoid clashing with err() form C library - -err() is a function available in the C library, so when static linking, -there is a clash at link timebecause the function is provided both by -nbd and the C library: - http://autobuild.buildroot.org/results/aa8/aa8a1ac35a93e1c8b9fddbc2b5d66ecaa921f31e/build-end.log - -Fix that by renaming err() to nbd_err() and providing a small maco -wrapper to avoid touching the many call sites. - -Signed-off-by: "Yann E. MORIN" - ---- -Upstream status: hack, not submitted. - -diff -durN nbd-3.11.orig/cliserv.h nbd-3.11/cliserv.h ---- nbd-3.11.orig/cliserv.h 2015-05-25 12:27:56.000000000 +0200 -+++ nbd-3.11/cliserv.h 2015-08-13 19:28:21.609467505 +0200 -@@ -75,7 +75,8 @@ - void setmysockopt(int sock); - void err_nonfatal(const char *s); - --void err(const char *s) G_GNUC_NORETURN; -+void nbd_err(const char *s) G_GNUC_NORETURN; -+#define err(S) nbd_err(S) - - void logging(const char* name); - diff --git a/package.bak/nbd/Config.in b/package.bak/nbd/Config.in deleted file mode 100644 index a5ded2984b..0000000000 --- a/package.bak/nbd/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_NBD - bool "nbd" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - help - NBD is a set of utilities to configure network block devices, - allowing access to remote block devices over TCP/IP network. - - http://nbd.sf.net/ - -if BR2_PACKAGE_NBD - -config BR2_NBD_CLIENT - bool "nbd client" - default y - help - the client part of NBD. - -config BR2_NBD_SERVER - bool "nbd server" - help - the server part of NBD. - -endif - -comment "nbd needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/nbd/nbd.hash b/package.bak/nbd/nbd.hash deleted file mode 100644 index c90682f481..0000000000 --- a/package.bak/nbd/nbd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/nbd/files/nbd/3.13/ -md5 784be37497cc2f9a53c67c8c77d1676d nbd-3.13.tar.xz -sha1 e43674a2d2b42d20719cba3149748e8f5683e554 nbd-3.13.tar.xz diff --git a/package.bak/nbd/nbd.mk b/package.bak/nbd/nbd.mk deleted file mode 100644 index d91c2d717e..0000000000 --- a/package.bak/nbd/nbd.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# nbd -# -################################################################################ - -NBD_VERSION = 3.13 -NBD_SOURCE = nbd-$(NBD_VERSION).tar.xz -NBD_SITE = http://downloads.sourceforge.net/project/nbd/nbd/$(NBD_VERSION) -NBD_CONF_OPTS = --enable-lfs -NBD_DEPENDENCIES = libglib2 -NBD_LICENSE = GPLv2 -NBD_LICENSE_FILES = COPYING - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# We have linux/falloc.h -# but uClibc lacks fallocate(2) which is a glibc-ism -NBD_CONF_ENV = ac_cv_header_linux_falloc_h=no -endif - -ifneq ($(BR2_NBD_CLIENT),y) -NBD_TOREMOVE += nbd-client -endif -ifneq ($(BR2_NBD_SERVER),y) -NBD_TOREMOVE += nbd-server -endif - -define NBD_CLEANUP_AFTER_INSTALL - rm -f $(addprefix $(TARGET_DIR)/usr/sbin/, $(NBD_TOREMOVE)) -endef - -NBD_POST_INSTALL_TARGET_HOOKS += NBD_CLEANUP_AFTER_INSTALL - -$(eval $(autotools-package)) diff --git a/package.bak/ncdu/Config.in b/package.bak/ncdu/Config.in deleted file mode 100644 index 0e4403444f..0000000000 --- a/package.bak/ncdu/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NCDU - bool "ncdu" - depends on BR2_USE_MMU # system() - select BR2_PACKAGE_NCURSES - help - ncdu is a disk usage analyzer with an ncurses interface - - http://dev.yorhel.nl/ncdu diff --git a/package.bak/ncdu/ncdu.hash b/package.bak/ncdu/ncdu.hash deleted file mode 100644 index 4bdda40219..0000000000 --- a/package.bak/ncdu/ncdu.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://dev.yorhel.nl/download/ncdu-1.11.tar.gz.{md5,sha1} -md5 9e44240a5356b029f05f0e70a63c4d12 ncdu-1.11.tar.gz -sha1 8f22d713e6d2b28e1f501eee2bd1e03b55550c8d ncdu-1.11.tar.gz diff --git a/package.bak/ncdu/ncdu.mk b/package.bak/ncdu/ncdu.mk deleted file mode 100644 index bccbb8d926..0000000000 --- a/package.bak/ncdu/ncdu.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ncdu -# -################################################################################ - -NCDU_VERSION = 1.11 -NCDU_SITE = http://dev.yorhel.nl/download - -NCDU_DEPENDENCIES = ncurses - -NCDU_LICENSE = MIT -NCDU_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/ncftp/Config.in b/package.bak/ncftp/Config.in deleted file mode 100644 index 135ab5350f..0000000000 --- a/package.bak/ncftp/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_NCFTP - bool "ncftp" - # fork() - depends on BR2_USE_MMU - help - NcFTP Client (also known as just NcFTP) is a set of FREE application - programs implementing the File Transfer Protocol (FTP). - - http://www.ncftp.com/ncftp/ - -if BR2_PACKAGE_NCFTP - -config BR2_PACKAGE_NCFTP_GET - bool "ncftpget" - default y - -config BR2_PACKAGE_NCFTP_PUT - bool "ncftpput" - default y - -config BR2_PACKAGE_NCFTP_LS - bool "ncftpls" - default y - -config BR2_PACKAGE_NCFTP_BATCH - bool "ncftpbatch/ncftpspooler" - default y - -config BR2_PACKAGE_NCFTP_BOOKMARKS - bool "ncftpbookmarks" - select BR2_PACKAGE_NCURSES - -endif diff --git a/package.bak/ncftp/ncftp.hash b/package.bak/ncftp/ncftp.hash deleted file mode 100644 index 0a7c26c9b2..0000000000 --- a/package.bak/ncftp/ncftp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 7abd3e8f848f0efb4bb6a4bc5da58a59524d4378fc8d70a52adb0fe1fd00b89d ncftp-3.2.6-src.tar.xz diff --git a/package.bak/ncftp/ncftp.mk b/package.bak/ncftp/ncftp.mk deleted file mode 100644 index 5c88556a39..0000000000 --- a/package.bak/ncftp/ncftp.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# ncftp -# -################################################################################ - -NCFTP_VERSION = 3.2.6 -NCFTP_SOURCE = ncftp-$(NCFTP_VERSION)-src.tar.xz -NCFTP_SITE = ftp://ftp.ncftp.com/ncftp -NCFTP_TARGET_BINS = ncftp -NCFTP_LICENSE = Clarified Artistic License -NCFTP_LICENSE_FILES = doc/LICENSE.txt - -NCFTP_DEPENDENCIES = host-autoconf - -# The bundled configure script is generated by autoconf 2.13 and doesn't -# detect cross-compilation correctly. Therefore, we have to regenerate it. -# We need to pass -I because of the non-standard m4 directory name, and -# none of the other autotools are used, so the below is the easiest. -define NCFTP_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/usr/bin/autoconf -I$(@D)/autoconf_local/) -endef -NCFTP_PRE_CONFIGURE_HOOKS += NCFTP_RUN_AUTOCONF - -ifeq ($(BR2_PACKAGE_NCFTP_GET),y) -NCFTP_TARGET_BINS += ncftpget -endif - -ifeq ($(BR2_PACKAGE_NCFTP_PUT),y) -NCFTP_TARGET_BINS += ncftpput -endif - -ifeq ($(BR2_PACKAGE_NCFTP_LS),y) -NCFTP_TARGET_BINS += ncftpls -endif - -ifeq ($(BR2_PACKAGE_NCFTP_BATCH),y) -NCFTP_TARGET_BINS += ncftpbatch -NCFTP_INSTALL_NCFTP_BATCH = \ - ln -sf /usr/bin/ncftpbatch $(TARGET_DIR)/usr/bin/ncftpspooler -endif - -ifeq ($(BR2_PACKAGE_NCFTP_BOOKMARKS),y) -NCFTP_TARGET_BINS += ncftpbookmarks -NCFTP_DEPENDENCIES += ncurses -endif - -define NCFTP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(addprefix $(NCFTP_DIR)/bin/, $(NCFTP_TARGET_BINS)) $(TARGET_DIR)/usr/bin - $(NCFTP_INSTALL_NCFTP_BATCH) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ncmpc/Config.in b/package.bak/ncmpc/Config.in deleted file mode 100644 index 324d8f7c2a..0000000000 --- a/package.bak/ncmpc/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_NCMPC - bool "ncmpc" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # libglib2 -> gettext - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBMPDCLIENT - select BR2_PACKAGE_NCURSES - help - ncmpc is a fully featured MPD client, which runs in a terminal - (using ncurses). Its goal is to provide a keyboard oriented - and consistent interface to MPD, without wasting resources. - - http://www.musicpd.org/clients/ncmpc/ - -comment "ncmpc needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ncmpc/ncmpc.hash b/package.bak/ncmpc/ncmpc.hash deleted file mode 100644 index e7646b2e3a..0000000000 --- a/package.bak/ncmpc/ncmpc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 6e328acb71d06ae9e6c5fced99bc28ae78bcab1a73130b42ce9ab08a814ecea4 ncmpc-0.25.tar.xz diff --git a/package.bak/ncmpc/ncmpc.mk b/package.bak/ncmpc/ncmpc.mk deleted file mode 100644 index b5fa7cdf3c..0000000000 --- a/package.bak/ncmpc/ncmpc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ncmpc -# -################################################################################ - -NCMPC_VERSION_MAJOR = 0 -NCMPC_VERSION = $(NCMPC_VERSION_MAJOR).25 -NCMPC_SOURCE = ncmpc-$(NCMPC_VERSION).tar.xz -NCMPC_SITE = http://www.musicpd.org/download/ncmpc/$(NCMPC_VERSION_MAJOR) -NCMPC_DEPENDENCIES = host-pkgconf libglib2 libmpdclient ncurses -NCMPC_LICENSE = GPLv2+ -NCMPC_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/ncurses/0001-fixup-pkg-config-handling.patch b/package.bak/ncurses/0001-fixup-pkg-config-handling.patch deleted file mode 100644 index e1cfc75164..0000000000 --- a/package.bak/ncurses/0001-fixup-pkg-config-handling.patch +++ /dev/null @@ -1,89 +0,0 @@ -Change handling of PKG_CONFIG_LIBDIR - -When PKG_CONFIG_LIBDIR was unset in the environment, the configure -script was deducing the PKG_CONFIG_LIBDIR from the location of the -pkg-config binary, which doesn't make a lot of sense, and isn't done -by other autotools based packages. - -Also, the configure script was checking that the directory really -exists. This forced to create the directory *and* provide an absolute -path in PKG_CONFIG_LIBDIR, which didn't play well with the fact that -at installation time, PKG_CONFIG_LIBDIR is suffixed to DESTDIR, which -means that we got two times the staging directory location. - -This patch fixes both of those issues. Also, since ncurses uses a fork -of autoconf 2.13, we can't simply use _AUTORECONF=YES, so we also fix -the configure script in this patch. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -3623,27 +3623,20 @@ - - # Leave this as something that can be overridden in the environment. - if test -z "$PKG_CONFIG_LIBDIR" ; then -- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig -+ PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" - fi -+ - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` -- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then - --# Check whether --enable-pc-files or --disable-pc-files was given. --if test "${enable_pc_files+set}" = set; then -- enableval="$enable_pc_files" -- enable_pc_files=$enableval --else -- enable_pc_files=no --fi; -- echo "$as_me:3638: result: $enable_pc_files" >&5 --echo "${ECHO_T}$enable_pc_files" >&6 -+ # Check whether --enable-pc-files or --disable-pc-files was given. -+ if test "${enable_pc_files+set}" = set; then -+ enableval="$enable_pc_files" -+ enable_pc_files=$enableval - else -- echo "$as_me:3641: result: no" >&5 --echo "${ECHO_T}no" >&6 -- { echo "$as_me:3643: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&5 --echo "$as_me: WARNING: did not find library $PKG_CONFIG_LIBDIR" >&2;} -- enable_pc_files=no -- fi -+ enable_pc_files=no -+ fi; -+ echo "$as_me:3638: result: $enable_pc_files" >&5 -+ echo "${ECHO_T}$enable_pc_files" >&6 - fi - - echo "$as_me:3649: checking if we should assume mixed-case filenames" >&5 -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -174,20 +174,14 @@ - - # Leave this as something that can be overridden in the environment. - if test -z "$PKG_CONFIG_LIBDIR" ; then -- PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig -+ PKG_CONFIG_LIBDIR="/usr/lib/pkgconfig" - fi - PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'` -- if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then -- AC_ARG_ENABLE(pc-files, -+ AC_ARG_ENABLE(pc-files, - [ --enable-pc-files generate and install .pc files for pkg-config], - [enable_pc_files=$enableval], - [enable_pc_files=no]) -- AC_MSG_RESULT($enable_pc_files) -- else -- AC_MSG_RESULT(no) -- AC_MSG_WARN(did not find library $PKG_CONFIG_LIBDIR) -- enable_pc_files=no -- fi -+ AC_MSG_RESULT($enable_pc_files) - fi - AC_SUBST(PKG_CONFIG_LIBDIR) - diff --git a/package.bak/ncurses/0002-gcc-5.x-MKlib_gen.patch b/package.bak/ncurses/0002-gcc-5.x-MKlib_gen.patch deleted file mode 100644 index 25c2bd02d1..0000000000 --- a/package.bak/ncurses/0002-gcc-5.x-MKlib_gen.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix gcc 5.x build failure - -Extracted from upstream commit -http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commit;h=97bb4678dc03e753290b39bbff30ba2825df9517. - -+ modify MKlib_gen.sh to work around change in development version of - gcc introduced here: - https://gcc.gnu.org/ml/gcc-patches/2014-06/msg02185.html - https://gcc.gnu.org/ml/gcc-patches/2014-07/msg00236.html - (reports by Marcus Shawcroft, Maohui Lei). - -Original author: Thomas E. Dickey -Signed-off-by: Mikhail Peselnik - ---- a/ncurses/base/MKlib_gen.sh.orig 2015-07-23 21:52:32.239481505 +0300 -+++ b/ncurses/base/MKlib_gen.sh 2015-07-23 21:53:20.772966587 +0300 -@@ -437,11 +437,22 @@ - -e 's/gen_$//' \ - -e 's/ / /g' >>$TMP - -+cat >$ED1 < $ED2 -+cat $ED2 >$TMP -+ - $preprocessor $TMP 2>/dev/null \ --| sed \ -- -e 's/ / /g' \ -- -e 's/^ //' \ -- -e 's/_Bool/NCURSES_BOOL/g' \ -+| sed -f $ED1 \ - | $AWK -f $AW2 \ - | sed -f $ED3 \ - | sed \ diff --git a/package.bak/ncurses/0003-recognise-uclinux.patch b/package.bak/ncurses/0003-recognise-uclinux.patch deleted file mode 100644 index e86546cc54..0000000000 --- a/package.bak/ncurses/0003-recognise-uclinux.patch +++ /dev/null @@ -1,30 +0,0 @@ -aclocal: fix detection for uclinux hosts - -uclinux is just a linux like the others... - -Signed-off-by: "Yann E. MORIN" - -diff -durN ncurses-5.9.orig/aclocal.m4 ncurses-5.9/aclocal.m4 ---- ncurses-5.9.orig/aclocal.m4 2011-04-01 01:35:38.000000000 +0200 -+++ ncurses-5.9/aclocal.m4 2016-08-21 15:24:47.003620029 +0200 -@@ -6531,7 +6531,7 @@ - irix[[56]].*) #(vi - cf_xopen_source="-D_SGI_SOURCE" - ;; --linux*|gnu*|mint*|k*bsd*-gnu) #(vi -+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi - CF_GNU_SOURCE - ;; - mirbsd*) #(vi -diff -durN ncurses-5.9.orig/configure ncurses-5.9/configure ---- ncurses-5.9.orig/configure 2016-08-21 15:21:50.789285661 +0200 -+++ ncurses-5.9/configure 2016-08-21 15:24:35.187463625 +0200 -@@ -6984,7 +6984,7 @@ - irix[56].*) #(vi - cf_xopen_source="-D_SGI_SOURCE" - ;; --linux*|gnu*|mint*|k*bsd*-gnu) #(vi -+linux*|uclinux*|gnu*|mint*|k*bsd*-gnu) #(vi - - echo "$as_me:6996: checking if we must define _GNU_SOURCE" >&5 - echo $ECHO_N "checking if we must define _GNU_SOURCE... $ECHO_C" >&6 diff --git a/package.bak/ncurses/Config.in b/package.bak/ncurses/Config.in deleted file mode 100644 index 92be16435a..0000000000 --- a/package.bak/ncurses/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_NCURSES - bool "ncurses" - help - The Ncurses (new curses) library is a free software emulation of - curses in System V Release 4.0, and more. - - This package installs only a few vital termcap entries - - http://www.gnu.org/software/ncurses/ - -if BR2_PACKAGE_NCURSES - -config BR2_PACKAGE_NCURSES_WCHAR - bool "enable wide char support" - depends on BR2_USE_WCHAR - # Build broken @ curses.priv.h with bad declarations - depends on !(BR2_bfin && BR2_BINFMT_FLAT) - help - Enable wide char & UTF-8 support in ncurses libraries - -config BR2_PACKAGE_NCURSES_TARGET_PROGS - bool "ncurses programs" - help - Include ncurses programs in target (clear, reset, tput, ...) - -endif diff --git a/package.bak/ncurses/ncurses.hash b/package.bak/ncurses/ncurses.hash deleted file mode 100644 index 482b2d4853..0000000000 --- a/package.bak/ncurses/ncurses.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b ncurses-5.9.tar.gz diff --git a/package.bak/ncurses/ncurses.mk b/package.bak/ncurses/ncurses.mk deleted file mode 100644 index 9d1b75d641..0000000000 --- a/package.bak/ncurses/ncurses.mk +++ /dev/null @@ -1,163 +0,0 @@ -################################################################################ -# -# ncurses -# -################################################################################ - -NCURSES_VERSION = 5.9 -NCURSES_SITE = $(BR2_GNU_MIRROR)/ncurses -NCURSES_INSTALL_STAGING = YES -NCURSES_DEPENDENCIES = host-ncurses -NCURSES_LICENSE = MIT with advertising clause -NCURSES_LICENSE_FILES = README -NCURSES_CONFIG_SCRIPTS = ncurses$(NCURSES_LIB_SUFFIX)$(NCURSES_ABI_VERSION)-config - -NCURSES_CONF_OPTS = \ - --without-cxx \ - --without-cxx-binding \ - --without-ada \ - --without-tests \ - --disable-big-core \ - --without-profile \ - --disable-rpath \ - --disable-rpath-hack \ - --enable-echo \ - --enable-const \ - --enable-overwrite \ - --enable-pc-files \ - $(if $(BR2_PACKAGE_NCURSES_TARGET_PROGS),,--without-progs) \ - --without-manpages - -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NCURSES_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_STATIC_LIBS),y) -NCURSES_CONF_OPTS += --without-shared --with-normal -else ifeq ($(BR2_SHARED_LIBS),y) -NCURSES_CONF_OPTS += --with-shared --without-normal -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -NCURSES_CONF_OPTS += --with-shared --with-normal -endif - -# configure can't find the soname for libgpm when cross compiling -ifeq ($(BR2_PACKAGE_GPM),y) -NCURSES_CONF_OPTS += --with-gpm=libgpm.so.2 -NCURSES_DEPENDENCIES += gpm -else -NCURSES_CONF_OPTS += --without-gpm -endif - -NCURSES_TERMINFO_FILES = \ - a/ansi \ - l/linux \ - p/putty \ - p/putty-vt100 \ - s/screen \ - v/vt100 \ - v/vt100-putty \ - v/vt102 \ - v/vt200 \ - v/vt220 \ - x/xterm \ - x/xterm-color \ - x/xterm-xfree86 \ - -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -NCURSES_CONF_OPTS += --enable-widec -NCURSES_LIB_SUFFIX = w -NCURSES_LIBS = ncurses menu panel form - -define NCURSES_LINK_LIBS_STATIC - $(foreach lib,$(NCURSES_LIBS:%=lib%), \ - ln -sf $(lib)$(NCURSES_LIB_SUFFIX).a $(STAGING_DIR)/usr/lib/$(lib).a - ) - ln -sf libncurses$(NCURSES_LIB_SUFFIX).a \ - $(STAGING_DIR)/usr/lib/libcurses.a -endef - -define NCURSES_LINK_LIBS_SHARED - $(foreach lib,$(NCURSES_LIBS:%=lib%), \ - ln -sf $(lib)$(NCURSES_LIB_SUFFIX).so $(STAGING_DIR)/usr/lib/$(lib).so - ) - ln -sf libncurses$(NCURSES_LIB_SUFFIX).so \ - $(STAGING_DIR)/usr/lib/libcurses.so -endef - -define NCURSES_LINK_PC - $(foreach pc,$(NCURSES_LIBS), \ - ln -sf $(pc)$(NCURSES_LIB_SUFFIX).pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/$(pc).pc - ) -endef - -NCURSES_LINK_STAGING_LIBS = \ - $(if $(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_STATIC);) \ - $(if $(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),$(call NCURSES_LINK_LIBS_SHARED)) - -NCURSES_LINK_STAGING_PC = $(call NCURSES_LINK_PC) - -NCURSES_CONF_OPTS += --enable-ext-colors -NCURSES_ABI_VERSION = 6 -NCURSES_TERMINFO_FILES += \ - p/putty-256color \ - x/xterm+256color \ - x/xterm-256color - -NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_LIBS -NCURSES_POST_INSTALL_STAGING_HOOKS += NCURSES_LINK_STAGING_PC - -else # BR2_PACKAGE_NCURSES_WCHAR -NCURSES_ABI_VERSION = 5 -endif # BR2_PACKAGE_NCURSES_WCHAR - -ifneq ($(BR2_ENABLE_DEBUG),y) -NCURSES_CONF_OPTS += --without-debug -endif - -# ncurses breaks with parallel build, but takes quite a while to -# build single threaded. Work around it similar to how Gentoo does -define NCURSES_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) sources - rm -rf $(@D)/misc/pc-files - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) -endef - -ifeq ($(BR2_PACKAGE_NCURSES_TARGET_PROGS),y) -define NCURSES_TARGET_SYMLINK_RESET - ln -sf tset $(TARGET_DIR)/usr/bin/reset -endef -NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_SYMLINK_RESET -endif - -define NCURSES_TARGET_CLEANUP_TERMINFO - $(RM) -rf $(TARGET_DIR)/usr/share/terminfo $(TARGET_DIR)/usr/share/tabset - $(foreach t,$(NCURSES_TERMINFO_FILES), \ - $(INSTALL) -D -m 0644 $(STAGING_DIR)/usr/share/terminfo/$(t) \ - $(TARGET_DIR)/usr/share/terminfo/$(t) - ) -endef -NCURSES_POST_INSTALL_TARGET_HOOKS += NCURSES_TARGET_CLEANUP_TERMINFO - -# -# On systems with an older version of tic, the installation of ncurses hangs -# forever. To resolve the problem, build a static version of tic on host -# ourselves, and use that during installation. -# -define HOST_NCURSES_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) sources - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/progs tic -endef - -HOST_NCURSES_CONF_OPTS = \ - --with-shared \ - --without-gpm \ - --without-manpages \ - --without-cxx \ - --without-cxx-binding \ - --without-ada \ - --without-normal - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch b/package.bak/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch deleted file mode 100644 index f84719cf36..0000000000 --- a/package.bak/ndisc6/0001-trace-tcp-upd-uClibc-fix.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 0be2fe3a750b62cafca9794e37f040624d3a59de Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 26 Apr 2012 23:45:25 +0200 -Subject: [PATCH] trace-{tcp,udp}.c: fix build on uClibc - -Selection of the BSD variant of struct tcphdr/udphdr on uClibc fails -because of config.h. This is caused by config.h setting _GNU_SOURCE -and the compat handling (uClibc doesn't have inet6_rth_*) including -sys/types.h which in term includes features.h, which figures out -what bsd/gnu/posix variant to use because of: - - /* If _BSD_SOURCE was defined by the user, favor BSD over POSIX. */ - #if defined _BSD_SOURCE && \ - !(defined _POSIX_SOURCE || defined _POSIX_C_SOURCE || \ - defined _XOPEN_SOURCE || defined _XOPEN_SOURCE_EXTENDED || \ - defined _GNU_SOURCE || defined _SVID_SOURCE) - # define __FAVOR_BSD 1 - #endif - -The current workaround of undefining _GNU_SOURCE after config.h doesn't -work as features.h has already been evaluated by then. Instead, simply -don't include config.h as it isn't needed in these two files. - -Signed-off-by: Peter Korsgaard ---- - src/trace-tcp.c | 5 ----- - src/trace-udp.c | 5 ----- - 2 files changed, 10 deletions(-) - -diff --git a/src/trace-tcp.c b/src/trace-tcp.c -index 6a7732d..91b64c2 100644 ---- a/src/trace-tcp.c -+++ b/src/trace-tcp.c -@@ -17,11 +17,6 @@ - * along with this program. If not, see . * - *************************************************************************/ - --#ifdef HAVE_CONFIG_H --# include --#endif -- --#undef _GNU_SOURCE - #define _BSD_SOURCE 1 - - #include -diff --git a/src/trace-udp.c b/src/trace-udp.c -index 821c24c..1754338 100644 ---- a/src/trace-udp.c -+++ b/src/trace-udp.c -@@ -17,11 +17,6 @@ - * along with this program. If not, see . * - *************************************************************************/ - --#ifdef HAVE_CONFIG_H --# include --#endif -- --#undef _GNU_SOURCE - #define _BSD_SOURCE 1 - - #include --- -1.7.10 - diff --git a/package.bak/ndisc6/Config.in b/package.bak/ndisc6/Config.in deleted file mode 100644 index 321bfbc963..0000000000 --- a/package.bak/ndisc6/Config.in +++ /dev/null @@ -1,47 +0,0 @@ -config BR2_PACKAGE_NDISC6 - bool "ndisc6 tools" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - NDisc6 is a small collection of useful tools for IPv6 networking - - http://www.remlab.net/ndisc6/ - -if BR2_PACKAGE_NDISC6 - -config BR2_PACKAGE_NDISC6_NAME2ADDR - bool "name2addr" - help - name2addr perform DNS lookups from scripts. - -config BR2_PACKAGE_NDISC6_NDISC6 - bool "ndisc6" - help - ndisc6 performs ICMPv6 Neighbor Discovery in userland. - -config BR2_PACKAGE_NDISC6_RDISC6 - bool "rdisc6" - help - rdisc6 performs ICMPv6 Router Discovery in userland. - -config BR2_PACKAGE_NDISC6_RDNSSD - bool "rdnssd" - help - IPv6 Recursive DNS Server discovery Daemon. - -config BR2_PACKAGE_NDISC6_RLTRACEROUTE6 - bool "rltraceroute6" - help - rltraceroute6 is an IPv6 traceroute implementation. - -config BR2_PACKAGE_NDISC6_TCPTRACEROUTE6 - bool "tcptraceroute6" - help - tcptraceroute6 is an TCP/IPv6 traceroute implementation. - -config BR2_PACKAGE_NDISC6_TCPSPRAY - bool "tcpspray" - help - TCP/IP bandwidth measurement tool (Discard and Echo client). - -endif diff --git a/package.bak/ndisc6/ndisc6.hash b/package.bak/ndisc6/ndisc6.hash deleted file mode 100644 index 8d71bdeaf1..0000000000 --- a/package.bak/ndisc6/ndisc6.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 6acec8a0cb9efa3ac98456f46c3016aeec0598b0c7557c95242b5228ad62ca7a ndisc6-1.0.2.tar.bz2 diff --git a/package.bak/ndisc6/ndisc6.mk b/package.bak/ndisc6/ndisc6.mk deleted file mode 100644 index f431035cd3..0000000000 --- a/package.bak/ndisc6/ndisc6.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# ndisc6 -# -################################################################################ - -NDISC6_VERSION = 1.0.2 -NDISC6_SOURCE = ndisc6-$(NDISC6_VERSION).tar.bz2 -NDISC6_SITE = http://www.remlab.net/files/ndisc6 -NDISC6_CONF_ENV = CC="$(TARGET_CC) -std=gnu99" -NDISC6_CONF_OPTS = --disable-rpath --disable-suid-install -NDISC6_LICENSE = GPLv2 or GPLv3 -NDISC6_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -NDISC6_DEPENDENCIES += gettext -NDISC6_CONF_ENV += LIBS="-lintl" -endif - -NDISC6_BIN_ += dnssort # perl script -NDISC6_BIN_$(BR2_PACKAGE_NDISC6_NAME2ADDR) += name2addr addr2name -NDISC6_BIN_$(BR2_PACKAGE_NDISC6_TCPSPRAY) += tcpspray tcpspray6 - -NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_NDISC6) += ndisc6 -NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RDISC6) += rdisc6 -NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RDNSSD) += rdnssd -NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_RLTRACEROUTE6) += rltraceroute6 tracert6 -NDISC6_SBIN_$(BR2_PACKAGE_NDISC6_TCPTRACEROUTE6) += tcptraceroute6 - -define NDISC6_REMOVE_UNNEEDED - rm -rf $(addprefix $(TARGET_DIR)/usr/bin/,$(NDISC6_BIN_)) \ - $(addprefix $(TARGET_DIR)/usr/sbin/,$(NDISC6_SBIN_)) - $(if $(BR2_PACKAGE_NDISC6_RDNSSD),,\ - rm -rf $(TARGET_DIR)/etc/rdnssd $(TARGET_DIR)/var/run/rdnssd) -endef - -NDISC6_POST_INSTALL_TARGET_HOOKS += NDISC6_REMOVE_UNNEEDED - -$(eval $(autotools-package)) diff --git a/package.bak/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch b/package.bak/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch deleted file mode 100644 index f140a60441..0000000000 --- a/package.bak/ne10/0001-CMakeLists-don-t-hard-code-thumb-code-generation.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9ff39800cec5f1dabba246b253794582d611bc6d Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Fri, 20 Feb 2015 10:44:15 -0600 -Subject: [PATCH] CMakeLists: don't hard code thumb code generation - -Migrating to version 1.2.0 - -Signed-off-by: Baruch Siach -Signed-off-by: Clayton Shotwell ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fdf01ec..34ae26e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -84,7 +84,7 @@ if(ANDROID_PLATFORM) - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ar - ${ANDROID_TOOLCHAIN_PATH}/arm-linux-androideabi-ranlib") - elseif(GNULINUX_PLATFORM) -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=vfp3") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -march=armv7-a -mfpu=vfp3") - set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -mthumb-interwork -mthumb -march=armv7-a -mfpu=neon") - elseif(IOS_PLATFORM) - #set minimal target ios version.If not provided this option, Xcode --- -1.9.1 - diff --git a/package.bak/ne10/Config.in b/package.bak/ne10/Config.in deleted file mode 100644 index 8d375793db..0000000000 --- a/package.bak/ne10/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_NE10 - bool "ne10" - depends on BR2_arm - depends on BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4 - help - The Ne10 project has been set up to provide a set of common, - useful functions which have been heavily optimized for the - ARM Architecture and provide consistent well tested behavior - that can be easily incorporated into applications. C - interfaces to the functions are provided for both assembler - and NEON implementations. - - http://projectne10.github.io/Ne10/ - -comment "ne10 needs a toolchain w/ neon" - depends on BR2_arm - depends on !(BR2_ARM_FPU_NEON || BR2_ARM_FPU_NEON_VFPV4) diff --git a/package.bak/ne10/ne10.hash b/package.bak/ne10/ne10.hash deleted file mode 100644 index db5b6f1277..0000000000 --- a/package.bak/ne10/ne10.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 450dac5bb3a2351019ae23792e97c3bf965d16a21c0598b73cea9fbc3b3a56af ne10-v1.2.0.tar.gz diff --git a/package.bak/ne10/ne10.mk b/package.bak/ne10/ne10.mk deleted file mode 100644 index aeaa0413b5..0000000000 --- a/package.bak/ne10/ne10.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# ne10 -# -################################################################################ - -NE10_VERSION = v1.2.0 -NE10_SITE = $(call github,projectNe10,Ne10,$(NE10_VERSION)) -NE10_LICENSE = BSD-3c or Apache-2.0 -NE10_LICENSE_FILES = doc/LICENSE -NE10_INSTALL_STAGING = YES - -NE10_CONF_OPTS = -DGNULINUX_PLATFORM=ON - -ifeq ($(BR2_STATIC_LIBS),) -NE10_CONF_OPTS += \ - -DNE10_BUILD_SHARED=ON -endif - -# The package does not have any install target, so have to provide -# INSTALL_STAGING_CMDS and INSTALL_TARGET_CMDS. - -ifeq ($(BR2_STATIC_LIBS),) -define NE10_INSTALL_STAGING_SHARED_LIB - cp -dpf $(@D)/modules/libNE10*.so* $(STAGING_DIR)/usr/lib/ -endef -endif - -define NE10_INSTALL_STAGING_CMDS - cp -dpf $(@D)/inc/NE10*h $(STAGING_DIR)/usr/include/ - cp -dpf $(@D)/modules/libNE10.a $(STAGING_DIR)/usr/lib/ - $(NE10_INSTALL_STAGING_SHARED_LIB) -endef - - -define NE10_INSTALL_TARGET_CMDS - cp -dpf $(@D)/modules/libNE10*.so* $(TARGET_DIR)/usr/lib/ -endef - -$(eval $(cmake-package)) diff --git a/package.bak/neard/Config.in b/package.bak/neard/Config.in deleted file mode 100644 index 8571e7c9a2..0000000000 --- a/package.bak/neard/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_NEARD - bool "neard" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl, dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 - depends on !BR2_STATIC_LIBS # dlopen - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBNL - help - Near Field Communication (NFC) manager. This userspace daemon is - a part of the NFC stack provided by the Linux NFC project. - - http://git.kernel.org/?p=network/nfc/neard.git;a=summary - - https://01.org/linux-nfc/documentation/how-start-linux-nfc-code... - -if BR2_PACKAGE_NEARD - -config BR2_PACKAGE_NEARD_TOOLS - bool "neard tools" - help - Build and install neard tools. - -endif - -comment "neard needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/neard/S53neard b/package.bak/neard/S53neard deleted file mode 100755 index f515668389..0000000000 --- a/package.bak/neard/S53neard +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Starts neard -# - -NAME=neard -DAEMON=/usr/libexec/nfc/$NAME - -# Exit gracefully if the package has been removed -[ -x $DAEMON ] || exit 0 - -case "$1" in - start) - printf "Starting $NAME: " - start-stop-daemon -S -q -p /var/run/${NAME}.pid -x $DAEMON -- -d '*' - echo "OK" - ;; - stop) - printf "Stopping $NAME: " - start-stop-daemon -K -q -p /var/run/${NAME}.pid - echo "OK" - ;; - restart|reload) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/neard/neard.hash b/package.bak/neard/neard.hash deleted file mode 100644 index 7517093176..0000000000 --- a/package.bak/neard/neard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/network/nfc/sha256sums.asc -sha256 6ea724b443d39d679168fc7776a965d1f64727c3735391df2c01469ee7cd8cca neard-0.14.tar.xz diff --git a/package.bak/neard/neard.mk b/package.bak/neard/neard.mk deleted file mode 100644 index ed2c6b1555..0000000000 --- a/package.bak/neard/neard.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# neard -# -################################################################################ - -NEARD_VERSION = 0.14 -NEARD_SOURCE = neard-$(NEARD_VERSION).tar.xz -NEARD_SITE = $(BR2_KERNEL_MIRROR)/linux/network/nfc -NEARD_LICENSE = GPLv2 -NEARD_LICENSE_FILES = COPYING - -NEARD_DEPENDENCIES = host-pkgconf dbus libglib2 libnl -NEARD_CONF_OPTS = --disable-traces - -ifeq ($(BR2_PACKAGE_NEARD_TOOLS),y) -NEARD_CONF_OPTS += --enable-tools -endif - -define NEARD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/neard/S53neard \ - $(TARGET_DIR)/etc/init.d/S53neard -endef - -$(eval $(autotools-package)) diff --git a/package.bak/neardal/Config.in b/package.bak/neardal/Config.in deleted file mode 100644 index c729283380..0000000000 --- a/package.bak/neardal/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_NEARDAL - bool "neardal" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, glib2 - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_READLINE if !BR2_PACKAGE_LIBEDIT - help - Provides a simple C API to exchange data with the neard NFC - manager daemon. - - https://github.com/connectivity/neardal - -if BR2_PACKAGE_NEARDAL - -config BR2_PACKAGE_NEARDAL_NCL - bool "ncl tool" - help - Build and install neardal ncl command line interpreter tool. - -endif - -comment "neardal needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/neardal/neardal.hash b/package.bak/neardal/neardal.hash deleted file mode 100644 index c767a74569..0000000000 --- a/package.bak/neardal/neardal.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9955753759a2604fa47562a4bbccd3b787d625e70311bb6662936d89d26715b7 neardal-33b54a55032b047fd885a5eb3592c169c0056c49.tar.gz diff --git a/package.bak/neardal/neardal.mk b/package.bak/neardal/neardal.mk deleted file mode 100644 index c3164ef0da..0000000000 --- a/package.bak/neardal/neardal.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# neardal -# -################################################################################ - -NEARDAL_VERSION = 33b54a55032b047fd885a5eb3592c169c0056c49 -NEARDAL_SITE = $(call github,connectivity,neardal,$(NEARDAL_VERSION)) -NEARDAL_INSTALL_STAGING = YES -NEARDAL_LICENSE = GPLv2 -NEARDAL_LICENSE_FILES = COPYING - -NEARDAL_DEPENDENCIES = host-pkgconf dbus dbus-glib -NEARDAL_AUTORECONF = YES - -# Either readline or libedit are needed, and the Config.in file -# guarantees at least one of them is enabled -ifeq ($(BR2_PACKAGE_READLINE),y) -NEARDAL_DEPENDENCIES += readline -else ifeq ($(BR2_PACKAGE_LIBEDIT),y) -NEARDAL_DEPENDENCIES += libedit -endif - -# Both readline and libedit link with ncurses but the configure script -# forgets to take that into account, causing the detection to fail -# when linking statically -ifeq ($(BR2_STATIC_LIBS),y) -NEARDAL_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs ncurses`" -endif - -define NEARDAL_INSTALL_NCL - $(INSTALL) -m 0755 -D $(@D)/ncl/ncl $(TARGET_DIR)/usr/bin/ncl -endef - -ifeq ($(BR2_PACKAGE_NEARDAL_NCL),y) -NEARDAL_POST_INSTALL_TARGET_HOOKS += NEARDAL_INSTALL_NCL -endif - -$(eval $(autotools-package)) diff --git a/package.bak/neon/Config.in b/package.bak/neon/Config.in deleted file mode 100644 index e76278c37e..0000000000 --- a/package.bak/neon/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_NEON - bool "libneon" - help - HTTP and WebDAV client library, with a C interface. - - http://www.webdav.org/neon/ - -if BR2_PACKAGE_NEON - -config BR2_PACKAGE_NEON_ZLIB - bool "ZLIB support" - select BR2_PACKAGE_ZLIB - help - build with ZLIB support - -config BR2_PACKAGE_NEON_SSL - bool "SSL support" - select BR2_PACKAGE_OPENSSL - help - build with SSL support - -# This is an hidden symbol other packages can select to ensure that -# Neon has XML support, either provided by Expat or libxml2. -config BR2_PACKAGE_NEON_XML - bool - select BR2_PACKAGE_NEON_EXPAT if !BR2_PACKAGE_NEON_LIBXML2 - -config BR2_PACKAGE_NEON_EXPAT - bool "XML support with expat" - select BR2_PACKAGE_EXPAT - depends on !BR2_PACKAGE_NEON_LIBXML2 - help - Enable XML support in neon, using the Expat XML library. - -config BR2_PACKAGE_NEON_LIBXML2 - bool "XML support with libxml2" - select BR2_PACKAGE_LIBXML2 - help - Enable XML support in neon, using the libxml2 XML library. - -endif diff --git a/package.bak/neon/neon.hash b/package.bak/neon/neon.hash deleted file mode 100644 index d66b6fd74c..0000000000 --- a/package.bak/neon/neon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca neon-0.30.2.tar.gz diff --git a/package.bak/neon/neon.mk b/package.bak/neon/neon.mk deleted file mode 100644 index ca1a6bd876..0000000000 --- a/package.bak/neon/neon.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# neon -# -################################################################################ - -NEON_VERSION = 0.30.2 -NEON_SITE = http://www.webdav.org/neon -NEON_LICENSE = LGPLv2+ (library), GPLv2+ (manual and tests) -NEON_LICENSE_FILES = src/COPYING.LIB test/COPYING README -NEON_INSTALL_STAGING = YES -NEON_CONF_OPTS = --without-gssapi --disable-rpath -NEON_CONFIG_SCRIPTS = neon-config -NEON_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_NEON_ZLIB),y) -NEON_CONF_OPTS += --with-zlib=$(STAGING_DIR) -NEON_DEPENDENCIES += zlib -else -NEON_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_NEON_SSL),y) -NEON_CONF_OPTS += --with-ssl -NEON_DEPENDENCIES += openssl -else -NEON_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_NEON_EXPAT),y) -NEON_CONF_OPTS += --with-expat=yes -NEON_DEPENDENCIES += expat -else -NEON_CONF_OPTS += --with-expat=no -endif - -ifeq ($(BR2_PACKAGE_NEON_LIBXML2),y) -NEON_CONF_OPTS += --with-libxml2=yes -NEON_CONF_ENV += ac_cv_prog_XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config -NEON_DEPENDENCIES += libxml2 -else -NEON_CONF_OPTS += --with-libxml2=no -endif - -ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),) -# webdav needs xml support -NEON_CONF_OPTS += --disable-webdav -endif - -$(eval $(autotools-package)) diff --git a/package.bak/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch b/package.bak/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch deleted file mode 100644 index a2d674e81d..0000000000 --- a/package.bak/net-tools/0001-Makefile-fix-static-linking-issue-with-lintl.patch +++ /dev/null @@ -1,79 +0,0 @@ -From a2076079a409141704701ec17a205d89e5b24052 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 28 May 2016 20:45:02 +0200 -Subject: [PATCH] Makefile: fix static linking issue with lintl - -When net-tools are build with uClibc-ng and statically linked, -some tools like hostname and route needs to link with -lintl. - -Adding -lintl in LDFLAGS place the library before object files: -arm-linux-gcc -O2 -g -Wall -fno-strict-aliasing -static -lintl -Llib -o hostname hostname.o - -Add $(LIBS) after object files in the Makefile to place -lintl correctly. - -Fixes: -http://autobuild.buildroot.net/results/134/1345b6d366125320b89512e7ce7f142f1a03acf8 - -Ref: -http://lists.busybox.net/pipermail/buildroot/2016-May/162216.html - -Signed-off-by: Romain Naour ---- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index 171123d..a2baf79 100644 ---- a/Makefile -+++ b/Makefile -@@ -158,37 +158,37 @@ subdirs: libdir - @for i in $(SUBDIRS:$(NET_LIB_PATH)/=); do $(MAKE) -C $$i || exit $$? ; done - - ifconfig: $(NET_LIB) ifconfig.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ifconfig.o $(LIBS) $(NLIB) - - nameif: $(NET_LIB) nameif.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ nameif.o $(NLIB) - - hostname: hostname.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(DNLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ hostname.o $(LIBS) $(DNLIB) - - route: $(NET_LIB) route.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ route.o $(LIBS) $(NLIB) - - arp: $(NET_LIB) arp.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ arp.o $(LIBS) $(NLIB) - - rarp: $(NET_LIB) rarp.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ rarp.o $(LIBS) $(NLIB) - - slattach: $(NET_LIB) slattach.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ slattach.o $(LIBS) $(NLIB) - - plipconfig: $(NET_LIB) plipconfig.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ plipconfig.o $(LIBS) $(NLIB) - - netstat: $(NET_LIB) netstat.o statistics.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(NLIB) $(SELIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ netstat.o statistics.o $(LIBS) $(NLIB) $(SELIB) - - iptunnel: $(NET_LIB) iptunnel.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ iptunnel.o $(LIBS) $(NLIB) - - ipmaddr: $(NET_LIB) ipmaddr.o -- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(NLIB) -+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ ipmaddr.o $(LIBS) $(NLIB) - - mii-tool: $(NET_LIB) mii-tool.o - $(CC) $(CFLAGS) $(LDFLAGS) -o $@ mii-tool.o $(NLIB) --- -2.5.5 - diff --git a/package.bak/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch b/package.bak/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch deleted file mode 100644 index a8658c4fec..0000000000 --- a/package.bak/net-tools/0002-iptunnel.c-do-not-include-netinet-ip.h.patch +++ /dev/null @@ -1,72 +0,0 @@ -From eec38a200357b195efbb23bb645ab721c040f246 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 3 Nov 2016 12:59:39 +0000 -Subject: [PATCH] iptunnel.c: do not include netinet/ip.h - -This fixes a struct redefinition problem like this one: - -================================ -In file included from /usr/include/linux/if_tunnel.h:6:0, - from iptunnel.c:34: -/usr/include/linux/ip.h:85:8: error: redefinition of 'struct iphdr' - struct iphdr { - ^ -In file included from iptunnel.c:29:0: -/usr/include/netinet/ip.h:45:8: note: originally defined here - struct iphdr - ^ -================================ - -iptunnel.c includes netinet/ip.h which contains a definition of the -iphdr struct. - -iptunnel.c also includes linux/if_tunnel.h which includes linux/ip.h -which contains a definition of the iphdr struct. - -So, both netinet/ip.h and linux/ip.h define the iphdr struct, and both -of them have been included directly or indirectly by iptunnel.c. Because -of that the compilation fails due to a struct redefinition. - -The problem can be solved by just not including netinet/ip.h. - -However, some Linux headers included in certain toolchains may not have -an updated linux/if_tunnel.h which includes linux/ip.h, so we need to -include it unconditionally otherwise linux/if_tunnel.h will use the -struct iphdr before being defined and the compilation will also fail in -this way: - -================================ -In file included from iptunnel.c:33:0: -/usr/include/linux/if_tunnel.h:37:16: error: field 'iph' has incomplete type - struct iphdr iph; - ^ -================================ - -Upstream status: merge request sent -https://sourceforge.net/p/net-tools/code/merge-requests/4/ - -Signed-off-by: Vicente Olivert Riera ---- - iptunnel.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/iptunnel.c b/iptunnel.c -index 3fe1b84..e2ec2d8 100644 ---- a/iptunnel.c -+++ b/iptunnel.c -@@ -26,11 +26,11 @@ - #include - #include - #include --#include - #include - #include - #include - #include -+#include - #include - - #include "config.h" --- -2.10.1 - diff --git a/package.bak/net-tools/Config.in b/package.bak/net-tools/Config.in deleted file mode 100644 index 3980b7edb8..0000000000 --- a/package.bak/net-tools/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_NET_TOOLS - bool "net-tools" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - A collection of programs that form the base set of the NET-3 - networking distribution for the Linux operating system. - Includes: arp, hostname, ifconfig, netstat, rarp, route, - plipconfig, slattach, mii-tool, iptunnel and ipmaddr. - - http://sourceforge.net/projects/net-tools/ diff --git a/package.bak/net-tools/net-tools.mk b/package.bak/net-tools/net-tools.mk deleted file mode 100644 index f0c61d5c4b..0000000000 --- a/package.bak/net-tools/net-tools.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# net-tools -# -################################################################################ - -NET_TOOLS_VERSION = 3f170bff115303e92319791cbd56371e33dcbf6d -NET_TOOLS_SITE = git://git.code.sf.net/p/net-tools/code -NET_TOOLS_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -NET_TOOLS_LICENSE = GPLv2+ -NET_TOOLS_LICENSE_FILES = COPYING - -# Install after busybox for the full-blown versions -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NET_TOOLS_DEPENDENCIES += busybox -endif - -define NET_TOOLS_CONFIGURE_CMDS - (cd $(@D); yes "" | ./configure.sh config.in ) -endef - -# Enable I18N when appropiate -ifeq ($(BR2_ENABLE_LOCALE),y) -define NET_TOOLS_ENABLE_I18N - $(SED) 's:I18N 0:I18N 1:' $(@D)/config.h -endef -endif - -# Enable IPv6 -define NET_TOOLS_ENABLE_IPV6 - $(SED) 's:_AFINET6 0:_AFINET6 1:' $(@D)/config.h -endef - -NET_TOOLS_POST_CONFIGURE_HOOKS += NET_TOOLS_ENABLE_I18N NET_TOOLS_ENABLE_IPV6 - -define NET_TOOLS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) \ - LIBS="$(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" \ - $(MAKE) -C $(@D) -endef - -# install renames conflicting binaries, update does not -# ifconfig & route reside in /sbin for busybox -define NET_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) update - mv -f $(TARGET_DIR)/bin/ifconfig $(TARGET_DIR)/sbin/ifconfig - mv -f $(TARGET_DIR)/bin/route $(TARGET_DIR)/sbin/route -endef - -$(eval $(generic-package)) diff --git a/package.bak/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch b/package.bak/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch deleted file mode 100644 index 01d5776596..0000000000 --- a/package.bak/netatalk/0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 60d100713b5289948e9cdf5b0646ff3cdd2c206b Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Mon, 17 Dec 2012 22:32:44 +0100 -Subject: [PATCH] Fix setting of LD_LIBRARY_FLAGS ($shlibpath_var). - -LD_LIBRARY_PATH should not be set when cross-compiling, because it -adds the cross-libraries to the build's LD-path. - -Also the restoring of LD_LIBRARY_PATH was done incorrectly: it would -set LD_LIBRARY_PATH=LD_LIBRARY_PATH. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - macros/db3-check.m4 | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/macros/db3-check.m4 b/macros/db3-check.m4 -index 902220b..d5a5446 100644 ---- a/macros/db3-check.m4 -+++ b/macros/db3-check.m4 -@@ -94,7 +94,7 @@ if test "x$bdb_required" = "xyes"; then - savedldflags="$LDFLAGS" - savedcppflags="$CPPFLAGS" - savedlibs="$LIBS" -- saved_shlibpath_var=$shlibpath_var -+ eval saved_shlibpath_var=\$$shlibpath_var - - dnl required BDB version: 4.6, because of cursor API change - DB_MAJOR_REQ=4 -@@ -148,7 +148,7 @@ if test "x$bdb_required" = "xyes"; then - dnl -- LD_LIBRARY_PATH on many platforms. This will be fairly - dnl -- portable hopefully. Reference: - dnl -- http://lists.gnu.org/archive/html/autoconf/2009-03/msg00040.html -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - -@@ -171,7 +171,7 @@ if test "x$bdb_required" = "xyes"; then - CPPFLAGS="-I${bdbdir}/include${subdir} $CPPFLAGS" - LDFLAGS="-L$bdblibdir $LDFLAGS" - -- eval export $shlibpath_var=$bdblibdir -+ test "$cross_compiling" = yes || eval export $shlibpath_var=$bdblibdir - NETATALK_BDB_TRY_LINK - eval export $shlibpath_var=$saved_shlibpath_var - --- diff --git a/package.bak/netatalk/0002-no-acl.patch b/package.bak/netatalk/0002-no-acl.patch deleted file mode 100644 index 165141b472..0000000000 --- a/package.bak/netatalk/0002-no-acl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix builds without acl, from http://sourceforge.net/p/netatalk/bugs/574/ - -Signed-off-by: Gustavo Zacarias - -diff -Nura netatalk-3.1.7.orig/include/atalk/acl.h netatalk-3.1.7/include/atalk/acl.h ---- netatalk-3.1.7.orig/include/atalk/acl.h 2014-12-03 17:34:49.895524464 -0300 -+++ netatalk-3.1.7/include/atalk/acl.h 2014-12-03 17:34:58.735243283 -0300 -@@ -61,6 +61,7 @@ - #else /* HAVE_ACLS=no */ - - #define O_NETATALK_ACL 0 -+#define O_IGNORE 0 - #define chmod_acl chmod - - #endif /* HAVE_ACLS */ diff --git a/package.bak/netatalk/Config.in b/package.bak/netatalk/Config.in deleted file mode 100644 index ce1731830b..0000000000 --- a/package.bak/netatalk/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_NETATALK - bool "netatalk" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBGPG_ERROR - help - Netatalk can be used to turn a *NIX machine into an extremely - high-performance and reliable file server for Macintosh computers. - - http://netatalk.sourceforge.net/ - -comment "netatalk needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/netatalk/S50netatalk b/package.bak/netatalk/S50netatalk deleted file mode 100755 index 287b20d774..0000000000 --- a/package.bak/netatalk/S50netatalk +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Start netatalk -# - -start() { - echo "Starting Netatalk" - start-stop-daemon -S -q -p /var/run/netatalk.pid --exec /usr/sbin/netatalk -} - -stop(){ - echo "Stopping Netatalk" - start-stop-daemon -K -q -p /var/run/netatalk.pid -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - start - stop - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/netatalk/netatalk.hash b/package.bak/netatalk/netatalk.hash deleted file mode 100644 index 955ffd4018..0000000000 --- a/package.bak/netatalk/netatalk.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/netatalk/files/netatalk/3.1.8/ -md5 9cab934ca32b8979f389da52d44c69c2 netatalk-3.1.8.tar.bz2 -sha1 00518461a311e6c17c95738ac214c8f06f863b4b netatalk-3.1.8.tar.bz2 diff --git a/package.bak/netatalk/netatalk.mk b/package.bak/netatalk/netatalk.mk deleted file mode 100644 index dbe13a9404..0000000000 --- a/package.bak/netatalk/netatalk.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# netatalk -# -################################################################################ - -NETATALK_VERSION = 3.1.8 -NETATALK_SITE = http://downloads.sourceforge.net/project/netatalk/netatalk/$(NETATALK_VERSION) -NETATALK_SOURCE = netatalk-$(NETATALK_VERSION).tar.bz2 -# For 0001-Fix-setting-of-LD_LIBRARY_FLAGS-shlibpath_var.patch -NETATALK_AUTORECONF = YES -NETATALK_CONFIG_SCRIPTS = netatalk-config -NETATALK_DEPENDENCIES = host-pkgconf openssl berkeleydb libgcrypt libgpg-error \ - libevent -NETATALK_LICENSE = GPLv2+, LGPLv3+, MIT-like -NETATALK_LICENSE_FILES = COPYING COPYRIGHT - -# Don't run ldconfig! -NETATALK_CONF_ENV += CC="$(TARGET_CC) -std=gnu99" \ - ac_cv_path_NETA_LDCONFIG="" -NETATALK_CONF_OPTS += \ - --with-cnid-cdb-backend \ - --with-bdb=$(STAGING_DIR)/usr \ - --with-ssl-dir=$(STAGING_DIR)/usr \ - --with-libgcrypt-dir=$(STAGING_DIR)/usr \ - --with-shadow \ - --disable-shell-check \ - --without-kerberos \ - --without-pam \ - --with-libevent=no \ - --with-dtrace=no \ - --with-mysql-config=no - -ifeq ($(BR2_PACKAGE_ACL),y) -NETATALK_DEPENDENCIES += acl -else -NETATALK_CONF_OPTS += --with-acls=no -endif - -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) -NETATALK_DEPENDENCIES += avahi -NETATALK_CONF_OPTS += --enable-zeroconf=$(STAGING_DIR)/usr -else -NETATALK_CONF_OPTS += --disable-zeroconf -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -NETATALK_DEPENDENCIES += cups -NETATALK_CONF_ENV += ac_cv_path_CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config -NETATALK_CONF_OPTS += --enable-cups -else -NETATALK_CONF_OPTS += --disable-cups -endif - -define NETATALK_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/netatalk/S50netatalk \ - $(TARGET_DIR)/etc/init.d/S50netatalk -endef - -$(eval $(autotools-package)) diff --git a/package.bak/netcat-openbsd/Config.in b/package.bak/netcat-openbsd/Config.in deleted file mode 100644 index 0df997cb22..0000000000 --- a/package.bak/netcat-openbsd/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_NETCAT_OPENBSD - bool "netcat-openbsd" - select BR2_PACKAGE_LIBBSD - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - A simple Unix utility which reads and writes data across network - connections using TCP or UDP protocol. It is designed to be a - reliable "back-end" tool that can be used directly or easily driven - by other programs and scripts. At the same time it is a feature-rich - network debugging and exploration tool, since it can create almost - any kind of connection you would need and has several interesting - built-in capabilities. - - This package contains the OpenBSD rewrite of netcat, including - support for IPv6, proxies, and Unix sockets. - - https://packages.debian.org/sid/netcat-openbsd - -comment "netcat-openbsd needs a glibc toolchain w/ threads" - depends on BR2_PACKAGE_LIBBSD_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/netcat-openbsd/netcat-openbsd.mk b/package.bak/netcat-openbsd/netcat-openbsd.mk deleted file mode 100644 index 5abfc7e165..0000000000 --- a/package.bak/netcat-openbsd/netcat-openbsd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# netcat-openbsd -# -################################################################################ - -NETCAT_OPENBSD_VERSION = debian/1.105-7 -NETCAT_OPENBSD_SITE = git://anonscm.debian.org/collab-maint/netcat-openbsd -NETCAT_OPENBSD_LICENSE = BSD-3c -NETCAT_OPENBSD_LICENSE_FILES = debian/copyright -NETCAT_OPENBSD_DEPENDENCIES = host-pkgconf libbsd - -# Ensure Busybox gets built/installed before, so that this package -# overrides Busybox nc. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -NETCAT_OPENBSD_DEPENDENCIES += busybox -endif - -define NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ - fi -endef - -NETCAT_OPENBSD_POST_PATCH_HOOKS += NETCAT_OPENBSD_APPLY_DEBIAN_PATCHES - -define NETCAT_OPENBSD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define NETCAT_OPENBSD_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/nc $(TARGET_DIR)/usr/bin/nc -endef - -$(eval $(generic-package)) diff --git a/package.bak/netcat/0001-signed-bit-counting.patch b/package.bak/netcat/0001-signed-bit-counting.patch deleted file mode 100644 index e29da311a9..0000000000 --- a/package.bak/netcat/0001-signed-bit-counting.patch +++ /dev/null @@ -1,30 +0,0 @@ -# Fix the endian-specific bit-counting code so that it works. -# SF:1068324 "netcat_flag_count() fix" -# http://sourceforge.net/tracker/?func=detail&aid=1205729&group_id=52204&atid=466046 -# SF:1205729 "doen't work on arm linux platform": -# http://sourceforge.net/tracker/?func=detail&aid=1068324&group_id=52204&atid=466046 - -Index: netcat-0.7.1/src/flagset.c -=================================================================== ---- netcat-0.7.1.orig/src/flagset.c 2010-07-19 13:51:46.000000000 +0100 -+++ netcat-0.7.1/src/flagset.c 2010-07-19 13:52:27.000000000 +0100 -@@ -134,7 +134,7 @@ - - int netcat_flag_count(void) - { -- register char c; -+ register unsigned char c; - register int i; - int ret = 0; - -@@ -154,8 +154,8 @@ - Assumed that the bit number 1 is the sign, and that we will shift the - bit 1 (or the bit that takes its place later) until the the most right, - WHY it has to keep the wrong sign? */ -- ret -= (c >> 7); -- c <<= 1; -+ ret += c&1; -+ c>>=1; - } - } - diff --git a/package.bak/netcat/Config.in b/package.bak/netcat/Config.in deleted file mode 100644 index 924069ee1f..0000000000 --- a/package.bak/netcat/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_NETCAT - bool "netcat" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Netcat is a featured networking utility which reads and writes data - across network connections, using the TCP/IP protocol. - It is designed to be a reliable "back-end" tool that can be used - directly or easily driven by other programs and scripts. At the - same time, it is a feature-rich network debugging and exploration - tool, since it can create almost any kind of connection you would - need and has several interesting built-in capabilities. - - http://netcat.sourceforge.net/download.php diff --git a/package.bak/netcat/netcat.hash b/package.bak/netcat/netcat.hash deleted file mode 100644 index e20c4c297a..0000000000 --- a/package.bak/netcat/netcat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 30719c9a4ffbcf15676b8f528233ccc54ee6cba96cb4590975f5fd60c68a066f netcat-0.7.1.tar.gz diff --git a/package.bak/netcat/netcat.mk b/package.bak/netcat/netcat.mk deleted file mode 100644 index 5d01ebbad6..0000000000 --- a/package.bak/netcat/netcat.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# netcat -# -################################################################################ - -NETCAT_VERSION = 0.7.1 -NETCAT_SITE = http://downloads.sourceforge.net/project/netcat/netcat/$(NETCAT_VERSION) -NETCAT_LICENSE = GPLv2+ -NETCAT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/netperf/Config.in b/package.bak/netperf/Config.in deleted file mode 100644 index 2f36b1b0da..0000000000 --- a/package.bak/netperf/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_NETPERF - bool "netperf" - help - Network performance benchmark tool - - http://www.netperf.org/ diff --git a/package.bak/netperf/netperf.hash b/package.bak/netperf/netperf.hash deleted file mode 100644 index f97274015c..0000000000 --- a/package.bak/netperf/netperf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 842af17655835c8be7203808c3393e6cb327a8067f3ed1f1053eb78b4e40375a netperf-2.7.0.tar.bz2 diff --git a/package.bak/netperf/netperf.mk b/package.bak/netperf/netperf.mk deleted file mode 100644 index 8b2280830f..0000000000 --- a/package.bak/netperf/netperf.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# netperf -# -################################################################################ - -NETPERF_VERSION = 2.7.0 -NETPERF_SITE = ftp://ftp.netperf.org/netperf -NETPERF_SOURCE = netperf-$(NETPERF_VERSION).tar.bz2 -# gcc 5+ defaults to gnu99 which breaks netperf -NETPERF_CONF_ENV = \ - ac_cv_func_setpgrp_void=set \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu89" -NETPERF_CONF_OPTS = --enable-demo=yes -NETPERF_LICENSE = netperf license -NETPERF_LICENSE_FILES = COPYING - -define NETPERF_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/src/netperf \ - $(TARGET_DIR)/usr/bin/netperf - $(INSTALL) -m 0755 $(@D)/src/netserver \ - $(TARGET_DIR)/usr/bin/netserver -endef - -$(eval $(autotools-package)) diff --git a/package.bak/netplug/0001-makefile-flags.patch b/package.bak/netplug/0001-makefile-flags.patch deleted file mode 100644 index b2468f8c84..0000000000 --- a/package.bak/netplug/0001-makefile-flags.patch +++ /dev/null @@ -1,21 +0,0 @@ -Preserve the cflags settings, because buildroot clobbers them. - ---- a/Makefile 2010-10-05 00:06:38.000000000 -0700 -+++ b/Makefile 2010-10-05 00:15:27.000000000 -0700 -@@ -11,11 +11,14 @@ mandir ?= $(prefix)/usr/share/man - - install_opts := - --CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \ -+NETPLUG_CFLAGS += -Wall -std=gnu99 -DNP_ETC_DIR='"$(etcdir)"' \ - -DNP_SCRIPT_DIR='"$(scriptdir)"' -ggdb3 -O3 -DNP_VERSION='"$(version)"' - -+%.o: %.c -+ $(CC) $(NETPLUG_CFLAGS) $(CFLAGS) -c -o $@ $< -+ - netplugd: config.o netlink.o lib.o if_info.o main.o -- $(CC) $(LDFLAGS) -o $@ $^ -+ $(CC) $(LDFLAGS) -o $@ $(NETPLUG_CFLAGS) $^ - - install: - install -d $(install_opts) -m 755 \ diff --git a/package.bak/netplug/0002-add-missing-time-include.patch b/package.bak/netplug/0002-add-missing-time-include.patch deleted file mode 100644 index f204c92431..0000000000 --- a/package.bak/netplug/0002-add-missing-time-include.patch +++ /dev/null @@ -1,20 +0,0 @@ -Add missing include - -netplug.h uses time_t, so it must include . This fixes a build -issue with the musl C library. - -Signed-off-by: Thomas Petazzoni - -Index: b/netplug.h -=================================================================== ---- a/netplug.h -+++ b/netplug.h -@@ -20,7 +20,7 @@ - #ifndef __netplug_h - #define __netplug_h - -- -+#include - #include - #include - #include diff --git a/package.bak/netplug/0003-remove-assert-fail.patch b/package.bak/netplug/0003-remove-assert-fail.patch deleted file mode 100644 index 635c462a5e..0000000000 --- a/package.bak/netplug/0003-remove-assert-fail.patch +++ /dev/null @@ -1,51 +0,0 @@ -Remove __assert_fail() - -The netplug code uses the assert() macro in various places. In glibc -internally, assert() uses a function called __assert_fail() to print a -message and abort. Relying on internal glibc details, netplug -re-defines __assert_fail() in the hope that it will get called instead -of glibc internal version. - -This attempt: - - * Doesn't work with uClibc, which doesn't use any __assert_fail() - function at all. It doesn't fail to build, but it is entirely - useless. - - * Fails to build with musl, which also defines __assert_fail(), but - with a different prototype. - -We simply remove the __assert_fail() implementation, so that the C -library implementation of assert() just does its normal work. The only -functionality lost is that the message is displayed on the standard -output rather than in netplug's logs (and this was only working with -glibc anyway). - -Signed-off-by: Thomas Petazzoni - -Index: b/lib.c -=================================================================== ---- a/lib.c -+++ b/lib.c -@@ -199,21 +199,6 @@ - return x; - } - -- --void --__assert_fail(const char *assertion, const char *file, -- unsigned int line, const char *function) --{ -- do_log(LOG_CRIT, "%s:%u: %s%sAssertion `%s' failed", -- file, line, -- function ? function : "", -- function ? ": " : "", -- assertion); -- -- abort(); --} -- -- - /* - * Local variables: - * c-file-style: "stroustrup" diff --git a/package.bak/netplug/Config.in b/package.bak/netplug/Config.in deleted file mode 100644 index 593c08a948..0000000000 --- a/package.bak/netplug/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NETPLUG - bool "netplug" - depends on BR2_USE_MMU # fork() - help - A Linux daemon that manages network interfaces in - response to network cables being plugged in and out. - - http://www.red-bean.com/~bos/ diff --git a/package.bak/netplug/S29netplug b/package.bak/netplug/S29netplug deleted file mode 100755 index 88f933d556..0000000000 --- a/package.bak/netplug/S29netplug +++ /dev/null @@ -1,69 +0,0 @@ -#!/bin/sh -# -# netplugd This shell script takes care of starting and stopping -# the network plug management daemon. -# -# chkconfig: - 11 89 -# description: netplugd is a daemon for managing non-static network \ -# interfaces. -# processname: netplugd -# pidfile: /var/run/netplugd.pid - -# Copyright 2003 Key Research, Inc. - -# Source function library. -if [ -f /etc/init.d/functions ]; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ]; then - . /etc/rc.d/init.d/functions -fi - -# Source networking configuration. -if [ -f /etc/sysconfig/network ]; then - . /etc/sysconfig/network - - # Check that networking is up. - [ ${NETWORKING} = "no" ] && exit 0 -elif [ ! -f /etc/network/interfaces ]; then - # No network support - exit 0 -fi - -[ -x /sbin/netplugd ] || exit 0 - -if [ -f /etc/sysconfig/netplugd ]; then - . /etc/sysconfig/netplugd -fi - -# See how we were called. -case "$1" in - start) - # Start daemon. - printf "Starting network plug daemon: " - start-stop-daemon -S -q -p /var/run/netplugd.pid -x /sbin/netplugd ${NETPLUGDARGS} - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/netplugd - ;; - stop) - # Stop daemon. - printf "Shutting down network plug daemon: " - start-stop-daemon -K -n netplugd - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/netplugd - ;; - restart|reload) - $0 stop - $0 start - ;; - condrestart) - [ -f /var/lock/subsys/netplugd ] && $0 restart || : - ;; - *) - echo "Usage: $0 {start|stop|restart}" - RETVAL=1 - ;; -esac - -exit $RETVAL diff --git a/package.bak/netplug/netplug-script b/package.bak/netplug/netplug-script deleted file mode 100755 index 1af714d69b..0000000000 --- a/package.bak/netplug/netplug-script +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/sh -# -# netplug - policy agent for netplugd -# -# Copyright 2003 Key Research, Inc. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License, version 2, as -# published by the Free Software Foundation. You are forbidden from -# redistributing or modifying it under the terms of any other license, -# including other versions of the GNU General Public License. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. - - -PATH=/usr/bin:/bin:/usr/sbin:/sbin -export PATH - -dev="$1" -action="$2" - -case "$action" in -in) - if [ -x /sbin/ifup ]; then - exec /sbin/ifup $dev - else - echo "Please teach me how to plug in an interface!" 1>&2 - exit 1 - fi - ;; -out) - if [ -x /sbin/ifdown ]; then - # At least on Fedora Core 1, the call to ip addr flush infloops - # /sbin/ifdown $dev && exec /sbin/ip addr flush $dev - exec /sbin/ifdown $dev - else - echo "Please teach me how to unplug an interface!" 1>&2 - exit 1 - fi - ;; -probe) - # exec /sbin/ip link set $dev up >/dev/null 2>&1 - if [ -x /sbin/ifconfig ]; then - exec /sbin/ifconfig $dev up >/dev/null 2>&1 - else - echo "Failed to probe an interface!" 1>&2 - exit 1 - fi - ;; -*) - echo "I have been called with a funny action of '%s'!" 1>&2 - exit 1 - ;; -esac diff --git a/package.bak/netplug/netplug.hash b/package.bak/netplug/netplug.hash deleted file mode 100644 index 16a98b7d66..0000000000 --- a/package.bak/netplug/netplug.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5180dfd9a7d3d0633a027b0a04f01b45a6a64623813cd48bd54423b90814864e netplug-1.2.9.2.tar.bz2 diff --git a/package.bak/netplug/netplug.mk b/package.bak/netplug/netplug.mk deleted file mode 100644 index a165192f8b..0000000000 --- a/package.bak/netplug/netplug.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# netplug -# -################################################################################ - -NETPLUG_VERSION = 1.2.9.2 -NETPLUG_SOURCE = netplug-$(NETPLUG_VERSION).tar.bz2 -NETPLUG_SITE = http://www.red-bean.com/~bos/netplug -NETPLUG_LICENSE = GPLv2 -NETPLUG_LICENSE_FILES = COPYING - -define NETPLUG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define NETPLUG_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -define NETPLUG_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/netplug/S29netplug \ - $(TARGET_DIR)/etc/init.d/S29netplug -endef - -define NETPLUG_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/netplug/netplug.service \ - $(TARGET_DIR)/usr/lib/systemd/system/netplug.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/netplug.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/netplug.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/netplug/netplug.service b/package.bak/netplug/netplug.service deleted file mode 100644 index 017a21f3f0..0000000000 --- a/package.bak/netplug/netplug.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Network cable hotplug management daemon -After=syslog.target network.target - -[Service] -ExecStart=/sbin/netplugd -F -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/netsniff-ng/Config.in b/package.bak/netsniff-ng/Config.in deleted file mode 100644 index 00617e3719..0000000000 --- a/package.bak/netsniff-ng/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_NETSNIFF_NG - bool "netsniff-ng" - select BR2_PACKAGE_LIBNL - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBCLI - select BR2_PACKAGE_LIBNETFILTER_CONNTRACK - select BR2_PACKAGE_LIBURCU - select BR2_PACKAGE_LIBNET - # Build with uClibc fails due to missing ceill() - depends on !BR2_TOOLCHAIN_USES_UCLIBC - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - help - netsniff-ng is a free, performant Linux network analyzer and - networking toolkit. If you will, the Swiss army knife for - network packets. - -comment "netsniff-ng needs a glibc or musl toolchain w/ threads, headers >= 3.0" - depends on BR2_PACKAGE_LIBURCU_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC \ - || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/netsniff-ng/netsniff-ng.hash b/package.bak/netsniff-ng/netsniff-ng.hash deleted file mode 100644 index 67b3331a92..0000000000 --- a/package.bak/netsniff-ng/netsniff-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 62e8aa970a4f46cdaddf54daf8ea26e7ae9f9f358efaf0651799c8c4e937c286 netsniff-ng-v0.6.2.tar.gz diff --git a/package.bak/netsniff-ng/netsniff-ng.mk b/package.bak/netsniff-ng/netsniff-ng.mk deleted file mode 100644 index 4ec7e743f5..0000000000 --- a/package.bak/netsniff-ng/netsniff-ng.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# netsniff-ng -# -################################################################################ - -NETSNIFF_NG_VERSION = v0.6.2 -NETSNIFF_NG_SITE = $(call github,netsniff-ng,netsniff-ng,$(NETSNIFF_NG_VERSION)) -NETSNIFF_NG_LICENSE = GPLv2 -NETSNIFF_NG_LICENSE_FILES = README COPYING -# Prevent netsniff-ng configure script from finding a host installed nacl -NETSNIFF_NG_CONF_ENV = \ - NACL_INC_DIR=/dev/null \ - NACL_LIB_DIR=/dev/null -NETSNIFF_NG_DEPENDENCIES = \ - libnl libpcap libcli libnetfilter_conntrack \ - liburcu libnet - -ifeq ($(BR2_PACKAGE_GEOIP),y) -NETSNIFF_NG_DEPENDENCIES += geoip -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -NETSNIFF_NG_DEPENDENCIES += ncurses -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -NETSNIFF_NG_DEPENDENCIES += zlib -endif - -# hand-written configure script and makefile -define NETSNIFF_NG_CONFIGURE_CMDS - (cd $(@D); \ - $(NETSNIFF_NG_CONF_ENV) \ - $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure \ - --prefix=$(TARGET_DIR)/usr \ - ) -endef - -define NETSNIFF_NG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define NETSNIFF_NG_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr ETCDIR=$(TARGET_DIR)/etc install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch b/package.bak/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch deleted file mode 100644 index cf0592233e..0000000000 --- a/package.bak/netsnmp/0001-configure-Eliminate-the-hard-coded-libnl-3-include-p.patch +++ /dev/null @@ -1,300 +0,0 @@ -From 57d6c3d36045aab8957ffeb7324728bf17faf8bd Mon Sep 17 00:00:00 2001 -From: Bart Van Assche -Date: Mon, 2 Feb 2015 20:31:29 +0100 -Subject: [PATCH] configure: Eliminate the hard-coded libnl-3 include path - -See also commit 3dde41998625fe0e24119a2e1f4509ba3ba2fd9a. - -(cherry picked from commit 852dcd644cfe4cfc7177649eaec163d6221f2be1) - -Original commit included modifications to configure script. -Do not keep these modifications, since they caused lots of conflicts, and -configure script is meant to be automatically generated. - -Signed-off-by: Julien Floret - -Conflicts: - configure ---- - aclocal.m4 | 1 + - configure.d/config_os_libs2 | 30 ++++++- - m4/pkg.m4 | 214 ++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 243 insertions(+), 2 deletions(-) - create mode 100644 m4/pkg.m4 - -diff --git a/aclocal.m4 b/aclocal.m4 -index cd80c7486f2f..45e3608ed480 100644 ---- a/aclocal.m4 -+++ b/aclocal.m4 -@@ -22,3 +22,4 @@ m4_include([m4/ltversion.m4]) - m4_include([m4/lt~obsolete.m4]) - m4_include([m4/netsnmp_arg.m4]) - m4_include([m4/netsnmp_search_libs.m4]) -+m4_include([m4/pkg.m4]) -diff --git a/configure.d/config_os_libs2 b/configure.d/config_os_libs2 -index 47491e24ce0a..10bd414b879e 100644 ---- a/configure.d/config_os_libs2 -+++ b/configure.d/config_os_libs2 -@@ -225,11 +225,37 @@ fi - if test "x$with_nl" != "xno"; then - case $target_os in - linux*) # Check for libnl (linux) -+ # The test below verifies whether the libnl-3 package been installed. -+ # This test works as follows: -+ # - If pkg-config was not installed at the time autogen.sh was run, -+ # the definition of the PKG_CHECK_EXISTS() macro will not be found by -+ # autogen.sh. Augogen.sh will generate a configure script that prints -+ # a warning about pkg-config and proceeds as if libnl-3 has not been -+ # installed. -+ # - If pkg-config was installed at the time autogen.sh was run, -+ # the generated configure script will try to detect the presence of -+ # the libnl-3 library by looking up compile and linker flags in the -+ # file called libnl-3.pc. -+ # - pkg-config settings can be overridden via the configure variables -+ # LIBNL3_CFLAGS and LIBNL3_LIBS (added by the pkg-config m4 macro's to -+ # the configure script -- see also ./configure --help). -+ # - The LIBNL3_CFLAGS and LIBNL3_LIBS configure variables can be used -+ # even if the pkg-config executable is not present on the system on -+ # which the configure script is run. -+ ifdef( -+ [PKG_CHECK_EXISTS], -+ [PKG_CHECK_EXISTS([libnl-3.0], -+ [PKG_CHECK_MODULES([LIBNL3], [libnl-3.0])]) -+ ], -+ AC_MSG_WARN([pkg-config has not been installed or is too old.]) -+ AC_MSG_WARN([Detection of libnl-3.0 will be skipped.]) -+ ) -+ - netsnmp_save_CPPFLAGS="$CPPFLAGS" -- CPPFLAGS="-I/usr/include/libnl3 $CPPFLAGS" -+ CPPFLAGS="${LIBNL3_CFLAGS} $CPPFLAGS" - NETSNMP_SEARCH_LIBS(nl_connect, nl-3, - [AC_CHECK_HEADERS(netlink/netlink.h) -- EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES -I/usr/include/libnl3"], -+ EXTERNAL_MIBGROUP_INCLUDES="$EXTERNAL_MIBGROUP_INCLUDES ${LIBNL3_CFLAGS}"], - [CPPFLAGS="$netsnmp_save_CPPFLAGS"], [], [], [LMIBLIBS]) - if test "x$ac_cv_header_netlink_netlink_h" != xyes; then - NETSNMP_SEARCH_LIBS(nl_connect, nl, [ -diff --git a/m4/pkg.m4 b/m4/pkg.m4 -new file mode 100644 -index 000000000000..c5b26b52e6cd ---- /dev/null -+++ b/m4/pkg.m4 -@@ -0,0 +1,214 @@ -+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -+# serial 1 (pkg-config-0.24) -+# -+# Copyright © 2004 Scott James Remnant . -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+# General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -+# ---------------------------------- -+AC_DEFUN([PKG_PROG_PKG_CONFIG], -+[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -+ -+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then -+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -+fi -+if test -n "$PKG_CONFIG"; then -+ _pkg_min_version=m4_default([$1], [0.9.0]) -+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) -+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ PKG_CONFIG="" -+ fi -+fi[]dnl -+])# PKG_PROG_PKG_CONFIG -+ -+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# -+# Check to see whether a particular set of modules exists. Similar -+# to PKG_CHECK_MODULES(), but does not set variables or print errors. -+# -+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+# only at the first occurence in configure.ac, so if the first place -+# it's called might be skipped (such as if it is within an "if", you -+# have to call PKG_CHECK_EXISTS manually -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_EXISTS], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+if test -n "$PKG_CONFIG" && \ -+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then -+ m4_default([$2], [:]) -+m4_ifvaln([$3], [else -+ $3])dnl -+fi]) -+ -+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -+# --------------------------------------------- -+m4_define([_PKG_CONFIG], -+[if test -n "$$1"; then -+ pkg_cv_[]$1="$$1" -+ elif test -n "$PKG_CONFIG"; then -+ PKG_CHECK_EXISTS([$3], -+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` -+ test "x$?" != "x0" && pkg_failed=yes ], -+ [pkg_failed=yes]) -+ else -+ pkg_failed=untried -+fi[]dnl -+])# _PKG_CONFIG -+ -+# _PKG_SHORT_ERRORS_SUPPORTED -+# ----------------------------- -+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then -+ _pkg_short_errors_supported=yes -+else -+ _pkg_short_errors_supported=no -+fi[]dnl -+])# _PKG_SHORT_ERRORS_SUPPORTED -+ -+ -+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -+# [ACTION-IF-NOT-FOUND]) -+# -+# -+# Note that if there is a possibility the first call to -+# PKG_CHECK_MODULES might not happen, you should be sure to include an -+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -+# -+# -+# -------------------------------------------------------------- -+AC_DEFUN([PKG_CHECK_MODULES], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -+ -+pkg_failed=no -+AC_MSG_CHECKING([for $1]) -+ -+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -+_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -+ -+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -+and $1[]_LIBS to avoid the need to call pkg-config. -+See the pkg-config man page for more details.]) -+ -+if test $pkg_failed = yes; then -+ AC_MSG_RESULT([no]) -+ _PKG_SHORT_ERRORS_SUPPORTED -+ if test $_pkg_short_errors_supported = yes; then -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` -+ else -+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` -+ fi -+ # Put the nasty error message in config.log where it belongs -+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -+ -+ m4_default([$4], [AC_MSG_ERROR( -+[Package requirements ($2) were not met: -+ -+$$1_PKG_ERRORS -+ -+Consider adjusting the PKG_CONFIG_PATH environment variable if you -+installed software in a non-standard prefix. -+ -+_PKG_TEXT])[]dnl -+ ]) -+elif test $pkg_failed = untried; then -+ AC_MSG_RESULT([no]) -+ m4_default([$4], [AC_MSG_FAILURE( -+[The pkg-config script could not be found or is too old. Make sure it -+is in your PATH or set the PKG_CONFIG environment variable to the full -+path to pkg-config. -+ -+_PKG_TEXT -+ -+To get pkg-config, see .])[]dnl -+ ]) -+else -+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS -+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS -+ AC_MSG_RESULT([yes]) -+ $3 -+fi[]dnl -+])# PKG_CHECK_MODULES -+ -+ -+# PKG_INSTALLDIR(DIRECTORY) -+# ------------------------- -+# Substitutes the variable pkgconfigdir as the location where a module -+# should install pkg-config .pc files. By default the directory is -+# $libdir/pkgconfig, but the default can be changed by passing -+# DIRECTORY. The user can override through the --with-pkgconfigdir -+# parameter. -+AC_DEFUN([PKG_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([pkgconfigdir], -+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, -+ [with_pkgconfigdir=]pkg_default) -+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+]) dnl PKG_INSTALLDIR -+ -+ -+# PKG_NOARCH_INSTALLDIR(DIRECTORY) -+# ------------------------- -+# Substitutes the variable noarch_pkgconfigdir as the location where a -+# module should install arch-independent pkg-config .pc files. By -+# default the directory is $datadir/pkgconfig, but the default can be -+# changed by passing DIRECTORY. The user can override through the -+# --with-noarch-pkgconfigdir parameter. -+AC_DEFUN([PKG_NOARCH_INSTALLDIR], -+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -+m4_pushdef([pkg_description], -+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -+AC_ARG_WITH([noarch-pkgconfigdir], -+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, -+ [with_noarch_pkgconfigdir=]pkg_default) -+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -+m4_popdef([pkg_default]) -+m4_popdef([pkg_description]) -+]) dnl PKG_NOARCH_INSTALLDIR -+ -+ -+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -+# ------------------------------------------- -+# Retrieves the value of the pkg-config variable for the given module. -+AC_DEFUN([PKG_CHECK_VAR], -+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl -+ -+_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -+AS_VAR_COPY([$1], [pkg_cv_][$1]) -+ -+AS_VAR_IF([$1], [""], [$5], [$4])dnl -+])# PKG_CHECK_VAR --- -2.1.0 - diff --git a/package.bak/netsnmp/Config.in b/package.bak/netsnmp/Config.in deleted file mode 100644 index 57cc6b93fd..0000000000 --- a/package.bak/netsnmp/Config.in +++ /dev/null @@ -1,60 +0,0 @@ -config BR2_PACKAGE_NETSNMP - bool "netsnmp" - depends on BR2_USE_MMU # fork() - help - Suite of applications used to implement SNMP v1, SNMP v2c, and - SNMP v3 using both IPv4 and IPv6. - - http://net-snmp.sourceforge.net/ - -if BR2_PACKAGE_NETSNMP - -config BR2_PACKAGE_NETSNMP_SERVER - bool "server" - default y - help - The snmpd server. - -config BR2_PACKAGE_NETSNMP_CLIENTS - bool "clients" - default y - help - The net-snmp clients (snmpget, snmpwalk, etc). - -config BR2_PACKAGE_NETSNMP_ENABLE_MIBS - bool "Install MIB files on target and enable MIB loading code" - default y - help - The net-snmp package contains a selection of MIB files. - Say yes if you want those MIB files installed on the target - and enable the code that parses the MIB files. - -config BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES - string "Build with these MIB modules" - default "host ucd-snmp/dlmod agentx" if !BR2_STATIC_LIBS - default "host agentx" if BR2_STATIC_LIBS - help - Specify which MIB modules to include. - -config BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES - string "Build without these MIB modules" - default "disman/event disman/schedule utilities" - help - Specify which MIB modules to exclude. - -config BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING - bool "Enable debugging code" - help - By default net-snmp is compiled without debugging support - (--disable-debugging). Enable this options if you need debugging - support, including the ability to log with DEBUGMSG(), - DEBUGMSGTL() and companion macros. - -config BR2_PACKAGE_NETSNMP_OPENSSL_INTERNAL - bool "Enable minimal internal OpenSSL code" - depends on !BR2_PACKAGE_OPENSSL - help - Enable a minimal internal copy of OpenSSL usable for USM - security. It will not enable the usage of SNMP over (D)TLS. - -endif diff --git a/package.bak/netsnmp/S59snmpd b/package.bak/netsnmp/S59snmpd deleted file mode 100755 index 4ff844ee3a..0000000000 --- a/package.bak/netsnmp/S59snmpd +++ /dev/null @@ -1,107 +0,0 @@ -#! /bin/sh -### BEGIN INIT INFO -# Provides: snmpd snmptrapd -# Required-Start: $network $local_fs -# Required-Stop: $network $local_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 6 -# Short-Description: SNMP agents -# Description: NET SNMP (Simple Network Management Protocol) Agents -### END INIT INFO -# -# Author: Jochen Friedrich -# - -export PATH=/sbin:/usr/sbin:/bin:/usr/bin - -test -x /usr/sbin/snmpd || exit 0 -test -x /usr/sbin/snmptrapd || exit 0 - -# Defaults -export MIBDIRS=/usr/share/snmp/mibs -SNMPDRUN=yes -SNMPDOPTS='-Lsd -Lf /dev/null -p /var/run/snmpd.pid 127.0.0.1' -TRAPDRUN=no -TRAPDOPTS='-Lsd -p /var/run/snmptrapd.pid' - -# Reads config file (will override defaults above) -[ -r /etc/default/snmpd ] && . /etc/default/snmpd - -ssd_oknodo="-o" - -# Cd to / before starting any daemons. -cd / - -# Create compatibility link to old AgentX socket location -if [ "$SNMPDCOMPAT" = "yes" ]; then - ln -sf /var/agentx/master /var/run/agentx -fi - -start() { - if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then - printf "Starting SNMP daemon: " - start-stop-daemon -q -S -x /usr/sbin/snmpd -- $SNMPDOPTS - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi - - if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then - printf "Starting SNMP trap daemon: " - start-stop-daemon -q -S -x /usr/sbin/snmptrapd -- $TRAPDOPTS - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi -} - -stop() { - if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then - printf "Stopping SNMP daemon: " - start-stop-daemon -q -K $ssd_oknodo -x /usr/sbin/snmpd - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi - - if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then - printf "Stopping SNMP trap daemon: " - start-stop-daemon -q -K $ssd_oknodo -x /usr/sbin/snmptrapd - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi -} - -reload() { - if [ "$SNMPDRUN" = "yes" -a -f /etc/snmp/snmpd.conf ]; then - printf "Reloading SNMP daemon: " - start-stop-daemon -q -K -s 1 -p /var/run/snmpd.pid -x /usr/sbin/snmpd - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi - - if [ "$TRAPDRUN" = "yes" -a -f /etc/snmp/snmptrapd.conf ]; then - printf "Reloading SNMP trap daemon: " - start-stop-daemon -q -K -s 1 -p /var/run/snmptrapd.pid -x /usr/sbin/snmptrapd - [ $? = 0 ] && echo "OK" || echo "FAIL" - fi -} - -case "$1" in - start) - start - ;; - - stop) - stop - ;; - - restart) - stop - # Allow the daemons time to exit completely. - sleep 2 - start - ;; - - reload|force-reload) - reload - ;; - - *) - echo "Usage: $0 {start|stop|restart|reload|force-reload}" - exit 1 -esac - -exit 0 diff --git a/package.bak/netsnmp/netsnmp.hash b/package.bak/netsnmp/netsnmp.hash deleted file mode 100644 index 2c18441fed..0000000000 --- a/package.bak/netsnmp/netsnmp.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://sourceforge.net/projects/net-snmp/files/net-snmp/5.7.3/ -md5 d4a3459e1577d0efa8d96ca70a885e53 net-snmp-5.7.3.tar.gz -sha1 97dc25077257680815de44e34128d365c76bd839 net-snmp-5.7.3.tar.gz - diff --git a/package.bak/netsnmp/netsnmp.mk b/package.bak/netsnmp/netsnmp.mk deleted file mode 100644 index 0f4b7d80bc..0000000000 --- a/package.bak/netsnmp/netsnmp.mk +++ /dev/null @@ -1,127 +0,0 @@ -################################################################################ -# -# netsnmp -# -################################################################################ - -NETSNMP_VERSION = 5.7.3 -NETSNMP_SITE = http://downloads.sourceforge.net/project/net-snmp/net-snmp/$(NETSNMP_VERSION) -NETSNMP_SOURCE = net-snmp-$(NETSNMP_VERSION).tar.gz -NETSNMP_LICENSE = Various BSD-like -NETSNMP_LICENSE_FILES = COPYING -NETSNMP_INSTALL_STAGING = YES -NETSNMP_CONF_ENV = ac_cv_NETSNMP_CAN_USE_SYSCTL=no -NETSNMP_CONF_OPTS = \ - --with-persistent-directory=/var/lib/snmp \ - --with-defaults \ - --enable-mini-agent \ - --without-rpm \ - --with-logfile=none \ - --without-kmem-usage \ - --enable-as-needed \ - --without-perl-modules \ - --disable-embedded-perl \ - --disable-perl-cc-checks \ - --disable-scripts \ - --with-default-snmp-version="1" \ - --enable-silent-libtool \ - --enable-mfd-rewrites \ - --with-sys-contact="root@localhost" \ - --with-sys-location="Unknown" \ - --with-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITH_MIB_MODULES))" \ - --with-out-mib-modules="$(call qstrip,$(BR2_PACKAGE_NETSNMP_WITHOUT_MIB_MODULES))" \ - --with-out-transports="Unix" \ - --disable-manuals -NETSNMP_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LIB_LDCONFIG_CMD=true install -NETSNMP_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) LIB_LDCONFIG_CMD=true install -NETSNMP_MAKE = $(MAKE1) -NETSNMP_CONFIG_SCRIPTS = net-snmp-config -NETSNMP_AUTORECONF = YES - -NETSNMP_BLOAT_MIBS = BRIDGE DISMAN-EVENT DISMAN-SCHEDULE DISMAN-SCRIPT EtherLike RFC-1215 RFC1155-SMI RFC1213 SCTP SMUX - -ifeq ($(BR2_ENDIAN),"BIG") -NETSNMP_CONF_OPTS += --with-endianness=big -else -NETSNMP_CONF_OPTS += --with-endianness=little -endif - -ifeq ($(BR2_PACKAGE_LIBNL),y) -NETSNMP_DEPENDENCIES += host-pkgconf libnl -NETSNMP_CONF_OPTS += --with-nl -else -NETSNMP_CONF_OPTS += --without-nl -endif - -# OpenSSL -ifeq ($(BR2_PACKAGE_OPENSSL),y) -NETSNMP_DEPENDENCIES += openssl -NETSNMP_CONF_OPTS += \ - --with-openssl=$(STAGING_DIR)/usr/include/openssl \ - --with-security-modules="tsm,usm" \ - --with-transports="DTLSUDP,TLSTCP" -ifeq ($(BR2_STATIC_LIBS),y) -# openssl uses zlib, so we need to explicitly link with it when static -NETSNMP_CONF_ENV += LIBS=-lz -endif -else ifeq ($(BR2_PACKAGE_NETSNMP_OPENSSL_INTERNAL),y) -NETSNMP_CONF_OPTS += --with-openssl=internal -else -NETSNMP_CONF_OPTS += --without-openssl -endif - -# There's no option to forcibly enable or disable it -ifeq ($(BR2_PACKAGE_PCIUTILS),y) -NETSNMP_DEPENDENCIES += pciutils -endif - -# For ucd-snmp/lmsensorsMib -ifeq ($(BR2_PACKAGE_LM_SENSORS),y) -NETSNMP_DEPENDENCIES += lm-sensors -endif - -ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_MIBS),y) -NETSNMP_CONF_OPTS += --disable-mib-loading -NETSNMP_CONF_OPTS += --disable-mibs -endif - -ifneq ($(BR2_PACKAGE_NETSNMP_ENABLE_DEBUGGING),y) -NETSNMP_CONF_OPTS += --disable-debugging -endif - -ifeq ($(BR2_PACKAGE_NETSNMP_SERVER),y) -NETSNMP_CONF_OPTS += --enable-agent -else -NETSNMP_CONF_OPTS += --disable-agent -endif - -ifeq ($(BR2_PACKAGE_NETSNMP_CLIENTS),y) -NETSNMP_CONF_OPTS += --enable-applications -else -NETSNMP_CONF_OPTS += --disable-applications -endif - -define NETSNMP_REMOVE_BLOAT_MIBS - for mib in $(NETSNMP_BLOAT_MIBS); do \ - rm -f $(TARGET_DIR)/usr/share/snmp/mibs/$$mib-MIB.txt; \ - done -endef - -NETSNMP_POST_INSTALL_TARGET_HOOKS += NETSNMP_REMOVE_BLOAT_MIBS - -ifeq ($(BR2_PACKAGE_NETSNMP_SERVER),y) -define NETSNMP_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/netsnmp/S59snmpd \ - $(TARGET_DIR)/etc/init.d/S59snmpd -endef -endif - -define NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP - $(SED) "s,^includedir=.*,includedir=\'$(STAGING_DIR)/usr/include\',g" \ - -e "s,^libdir=.*,libdir=\'$(STAGING_DIR)/usr/lib\',g" \ - $(STAGING_DIR)/usr/bin/net-snmp-config -endef - -NETSNMP_POST_INSTALL_STAGING_HOOKS += NETSNMP_STAGING_NETSNMP_CONFIG_FIXUP - -$(eval $(autotools-package)) diff --git a/package.bak/netstat-nat/Config.in b/package.bak/netstat-nat/Config.in deleted file mode 100644 index 6afcf89e3b..0000000000 --- a/package.bak/netstat-nat/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_NETSTAT_NAT - bool "netstat-nat" - help - Displays NAT connections - - http://tweegy.nl/projects/netstat-nat/ diff --git a/package.bak/netstat-nat/netstat-nat.hash b/package.bak/netstat-nat/netstat-nat.hash deleted file mode 100644 index 924da129f7..0000000000 --- a/package.bak/netstat-nat/netstat-nat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e945faa283a49f33af15de915a949c9273a230fc17154925364c547adab676ca netstat-nat-1.4.10.tar.gz diff --git a/package.bak/netstat-nat/netstat-nat.mk b/package.bak/netstat-nat/netstat-nat.mk deleted file mode 100644 index 9a60f123b6..0000000000 --- a/package.bak/netstat-nat/netstat-nat.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# netstat-nat -# -################################################################################ - -NETSTAT_NAT_VERSION = 1.4.10 -NETSTAT_NAT_SITE = http://tweegy.nl/download -NETSTAT_NAT_LICENSE = GPLv2+ -NETSTAT_NAT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/netsurf-buildsystem/netsurf-buildsystem.mk b/package.bak/netsurf-buildsystem/netsurf-buildsystem.mk deleted file mode 100644 index 347885072a..0000000000 --- a/package.bak/netsurf-buildsystem/netsurf-buildsystem.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# netsurf-buildsystem -# -################################################################################ - -NETSURF_BUILDSYSTEM_VERSION = 7574b41345968b5f7e9ca5875faccb1478ce0555 -NETSURF_BUILDSYSTEM_SITE = http://git.netsurf-browser.org/buildsystem.git -NETSURF_BUILDSYSTEM_SITE_METHOD = git -NETSURF_BUILDSYSTEM_LICENSE = MIT, BSD-3c (for llvm/* files) -NETSURF_BUILDSYSTEM_LICENSE_FILES = llvm/LICENSE.TXT - -NETSURF_BUILDSYSTEM_INSTALL_DIR = $(HOST_DIR)/usr/share/netsurf-buildsystem - -define HOST_NETSURF_BUILDSYSTEM_INSTALL_CMDS - mkdir -p $(NETSURF_BUILDSYSTEM_INSTALL_DIR) - cp -dpfr $(@D)/* $(NETSURF_BUILDSYSTEM_INSTALL_DIR) -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/nettle/0001-disable-testsuite-examples.patch b/package.bak/nettle/0001-disable-testsuite-examples.patch deleted file mode 100644 index 82d97d5d21..0000000000 --- a/package.bak/nettle/0001-disable-testsuite-examples.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile: disable testsuite and example - -We do not need them in the context of Buildroot. - -Also, they break for a shared-only build (but it's fixed in patch 0001). - -Signed-off-by: "Yann E. MORIN" - -diff -durN nettle-2.7.1.orig/Makefile.in nettle-2.7.1/Makefile.in ---- nettle-2.7.1.orig/Makefile.in 2013-05-28 16:21:54.000000000 +0200 -+++ nettle-2.7.1/Makefile.in 2014-12-12 19:57:12.499805574 +0100 -@@ -16,7 +16,7 @@ - - OPT_ASM_SOURCES = @OPT_ASM_SOURCES@ - --SUBDIRS = tools testsuite examples -+SUBDIRS = tools - - include config.make - diff --git a/package.bak/nettle/Config.in b/package.bak/nettle/Config.in deleted file mode 100644 index 55776216e4..0000000000 --- a/package.bak/nettle/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_NETTLE - bool "nettle" - select BR2_PACKAGE_GMP - help - Nettle is a cryptographic library that is designed to fit easily - in more or less any context: In crypto toolkits for object-oriented - languages, in applications like LSH or GNUPG, or even in kernel space - - http://www.lysator.liu.se/~nisse/nettle/ diff --git a/package.bak/nettle/nettle.hash b/package.bak/nettle/nettle.hash deleted file mode 100644 index cd911c0d13..0000000000 --- a/package.bak/nettle/nettle.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e nettle-3.3.tar.gz diff --git a/package.bak/nettle/nettle.mk b/package.bak/nettle/nettle.mk deleted file mode 100644 index 31789ec28b..0000000000 --- a/package.bak/nettle/nettle.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# nettle -# -################################################################################ - -NETTLE_VERSION = 3.3 -NETTLE_SITE = http://www.lysator.liu.se/~nisse/archive -NETTLE_DEPENDENCIES = gmp -NETTLE_INSTALL_STAGING = YES -NETTLE_LICENSE = Dual GPLv2+/LGPLv3+ -NETTLE_LICENSE_FILES = COPYING.LESSERv3 COPYINGv2 -# don't include openssl support for (unused) examples as it has problems -# with static linking -NETTLE_CONF_OPTS = --disable-openssl - -# ARM assembly requires v6+ ISA -ifeq ($(BR2_ARM_CPU_ARMV4)$(BR2_ARM_CPU_ARMV5)$(BR2_ARM_CPU_ARMV7M),y) -NETTLE_CONF_OPTS += --disable-assembler -endif - -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -NETTLE_CONF_OPTS += --enable-arm-neon -else -NETTLE_CONF_OPTS += --disable-arm-neon -endif - -$(eval $(autotools-package)) diff --git a/package.bak/network-manager/Config.in b/package.bak/network-manager/Config.in deleted file mode 100644 index c9dabfdd42..0000000000 --- a/package.bak/network-manager/Config.in +++ /dev/null @@ -1,64 +0,0 @@ -config BR2_PACKAGE_NETWORK_MANAGER - bool "networkmanager" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_USE_MMU # dbus - depends on BR2_PACKAGE_HAS_UDEV - # Tested with 3.2, but may even work with earlier versions - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - depends on BR2_TOOLCHAIN_USES_GLIBC # CLOCK_BOOTTIME, IPTOS_CLASS_* - select BR2_PACKAGE_DHCPCD if !BR2_PACKAGE_DHCP_CLIENT - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_GLIB - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBNL - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_WIRELESS_TOOLS - select BR2_PACKAGE_WIRELESS_TOOLS_LIB - select BR2_PACKAGE_READLINE - select BR2_PACKAGE_LIBNDP - help - NetworkManager is a set of co-operative tools that make networking - simple and straightforward. Whether WiFi, wired, 3G, or Bluetooth, - NetworkManager allows you to quickly move from one network to - another: once a network has been configured and joined once, it - can be detected and re-joined automatically the next time it's - available. - - http://projects.gnome.org/NetworkManager/ - -if BR2_PACKAGE_NETWORK_MANAGER - -config BR2_PACKAGE_NETWORK_MANAGER_TUI - bool "nmtui support" - select BR2_PACKAGE_NEWT - help - This option enables terminal based UI - -config BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER - bool "modem-manager support" - select BR2_PACKAGE_MODEM_MANAGER - select BR2_PACKAGE_MODEM_MANAGER_LIBMBIM - select BR2_PACKAGE_MODEM_MANAGER_LIBQMI - help - This option enables support for ModemManager - -config BR2_PACKAGE_NETWORK_MANAGER_PPPD - bool "pppd support" - depends on !BR2_TOOLCHAIN_USES_MUSL # pppd - select BR2_PACKAGE_PPPD - help - This option enables support for PPPD daemon - -comment "pppd support needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - -endif - -comment "NetworkManager needs udev /dev management and a glibc toolchain w/ headers >= 3.7" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 || \ - !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/network-manager/S45network-manager b/package.bak/network-manager/S45network-manager deleted file mode 100755 index f39e20d73b..0000000000 --- a/package.bak/network-manager/S45network-manager +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh - -prefix=/usr -exec_prefix=/usr -sbindir=${exec_prefix}/sbin - -NETWORKMANAGER_BIN=${sbindir}/NetworkManager - -[ -x $NETWORKMANAGER_BIN ] || exit 0 - -PID=`pidof NetworkManager` -case "$1" in - start) - printf "Starting NetworkManager ... " - [ ! -d /var/run/NetworkManager ] && install -d /var/run/NetworkManager - if [ -z "$PID" ]; then - $NETWORKMANAGER_BIN - fi - if [ ! -z "$PID" -o $? -gt 0 ]; then - echo "failed!" - else - echo "done." - fi - ;; - stop) - printf "Stopping NetworkManager ... " - [ ! -z "$PID" ] && kill $PID > /dev/null 2>&1 - if [ $? -gt 0 ]; then - echo "failed!" - else - echo "done." - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart|sleep|wake}" - ;; -esac -exit 0 - - - diff --git a/package.bak/network-manager/network-manager.hash b/package.bak/network-manager/network-manager.hash deleted file mode 100644 index 94f3e26784..0000000000 --- a/package.bak/network-manager/network-manager.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/1.4/NetworkManager-1.4.2.sha256sum -sha256 a864e347ddf6da8dabd40e0185b8c10a655d4a94b45cbaa2b3bb4b5e8360d204 NetworkManager-1.4.2.tar.xz diff --git a/package.bak/network-manager/network-manager.mk b/package.bak/network-manager/network-manager.mk deleted file mode 100644 index 3d7a1bf018..0000000000 --- a/package.bak/network-manager/network-manager.mk +++ /dev/null @@ -1,87 +0,0 @@ -################################################################################ -# -# network-manager -# -################################################################################ - -NETWORK_MANAGER_VERSION_MAJOR = 1.4 -NETWORK_MANAGER_VERSION = $(NETWORK_MANAGER_VERSION_MAJOR).2 -NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.xz -NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/$(NETWORK_MANAGER_VERSION_MAJOR) -NETWORK_MANAGER_INSTALL_STAGING = YES -NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ - libgcrypt wireless_tools util-linux host-intltool readline libndp libgudev -NETWORK_MANAGER_LICENSE = GPLv2+ (app), LGPLv2+ (libnm-util) -NETWORK_MANAGER_LICENSE_FILES = COPYING libnm-util/COPYING - -NETWORK_MANAGER_CONF_ENV = \ - ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - ac_cv_file__etc_fedora_release=no \ - ac_cv_file__etc_mandriva_release=no \ - ac_cv_file__etc_debian_version=no \ - ac_cv_file__etc_redhat_release=no \ - ac_cv_file__etc_SuSE_release=no - - -NETWORK_MANAGER_CONF_OPTS = \ - --disable-tests \ - --disable-qt \ - --disable-more-warnings \ - --without-docs \ - --with-crypto=gnutls \ - --with-iptables=/usr/sbin/iptables \ - --disable-ifupdown \ - --disable-ifnet - -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_TUI),y) -NETWORK_MANAGER_DEPENDENCIES += newt -NETWORK_MANAGER_CONF_OPTS += --with-nmtui=yes -else -NETWORK_MANAGER_CONF_OPTS += --with-nmtui=no -endif - -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_PPPD),y) -NETWORK_MANAGER_DEPENDENCIES += pppd -NETWORK_MANAGER_CONF_OPTS += --enable-ppp -else -NETWORK_MANAGER_CONF_OPTS += --disable-ppp -endif - -ifeq ($(BR2_PACKAGE_NETWORK_MANAGER_MODEM_MANAGER),y) -NETWORK_MANAGER_DEPENDENCIES += modem-manager -NETWORK_MANAGER_CONF_OPTS += --with-modem-manager-1 -else -NETWORK_MANAGER_CONF_OPTS += --without-modem-manager-1 -endif - -ifeq ($(BR2_PACKAGE_DHCP_CLIENT),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhclient=/sbin/dhclient -endif - -ifeq ($(BR2_PACKAGE_DHCPCD),y) -NETWORK_MANAGER_CONF_OPTS += --with-dhcpcd=/sbin/dhcpcd -endif - -# uClibc by default doesn't have backtrace support, so don't use it -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -NETWORK_MANAGER_CONF_OPTS += --disable-crashtrace -endif - -define NETWORK_MANAGER_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/network-manager/S45network-manager $(TARGET_DIR)/etc/init.d/S45network-manager -endef - -define NETWORK_MANAGER_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service - - ln -sf /usr/lib/systemd/system/NetworkManager.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/NetworkManager.service - - ln -sf /usr/lib/systemd/system/NetworkManager-dispatcher.service \ - $(TARGET_DIR)/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/newt/Config.in b/package.bak/newt/Config.in deleted file mode 100644 index a2216155bf..0000000000 --- a/package.bak/newt/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_NEWT - bool "newt" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # slang - depends on !BR2_STATIC_LIBS # unconditionally creates .so - select BR2_PACKAGE_SLANG - select BR2_PACKAGE_POPT - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Programming library for color text mode, widget based user interfaces. - - http://www.redhat.com/ - -comment "newt needs a toolchain w/ wchar, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/newt/newt.hash b/package.bak/newt/newt.hash deleted file mode 100644 index fe5870b062..0000000000 --- a/package.bak/newt/newt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 08c0db56c21996af6a7cbab99491b774c6c09cef91cd9b03903c84634bff2e80 newt-0.52.19.tar.gz diff --git a/package.bak/newt/newt.mk b/package.bak/newt/newt.mk deleted file mode 100644 index 2b8d337617..0000000000 --- a/package.bak/newt/newt.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# newt -# -################################################################################ - -NEWT_VERSION = 0.52.19 -NEWT_SITE = https://pagure.io/releases/newt -NEWT_INSTALL_STAGING = YES -NEWT_DEPENDENCIES = popt slang \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -NEWT_CONF_OPTS = --without-python --without-tcl -NEWT_MAKE = $(MAKE1) -NEWT_LICENSE = GPLv2 -NEWT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/nfacct/Config.in b/package.bak/nfacct/Config.in deleted file mode 100644 index e30d2d997b..0000000000 --- a/package.bak/nfacct/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NFACCT - bool "nfacct" - select BR2_PACKAGE_LIBNETFILTER_ACCT - help - nfacct is the command line tool to create/retrieve/delete - netfilter accounting objects. - - http://www.netfilter.org/projects/nfacct/ diff --git a/package.bak/nfacct/nfacct.hash b/package.bak/nfacct/nfacct.hash deleted file mode 100644 index 737354ef3f..0000000000 --- a/package.bak/nfacct/nfacct.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/nfacct/nfacct-1.0.2.tar.bz2.{md5sum,sha1sum} -md5 94faafdaaed85ca9220c5692be8a408e nfacct-1.0.2.tar.bz2 -sha1 17d6576778227ea93c62600d9b18ff4932963c6a nfacct-1.0.2.tar.bz2 diff --git a/package.bak/nfacct/nfacct.mk b/package.bak/nfacct/nfacct.mk deleted file mode 100644 index a4e20452bf..0000000000 --- a/package.bak/nfacct/nfacct.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# nfacct -# -################################################################################ - -NFACCT_VERSION = 1.0.2 -NFACCT_SOURCE = nfacct-$(NFACCT_VERSION).tar.bz2 -NFACCT_SITE = http://www.netfilter.org/projects/nfacct/files -NFACCT_DEPENDENCIES = host-pkgconf \ - libnetfilter_acct -NFACCT_LICENSE = GPLv2 -NFACCT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/nfs-utils/0001-Patch-taken-from-Gentoo.patch b/package.bak/nfs-utils/0001-Patch-taken-from-Gentoo.patch deleted file mode 100644 index 47bf9db40d..0000000000 --- a/package.bak/nfs-utils/0001-Patch-taken-from-Gentoo.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5796ca01e33596d4102dd714349c908fecc331c0 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 10 Nov 2012 18:56:12 +0100 -Subject: [PATCH] Patch taken from Gentoo - -Signed-off-by: Gustavo Zacarias ---- - tools/locktest/Makefile.am | 7 +++---- - tools/rpcgen/Makefile.am | 8 +++----- - 2 files changed, 6 insertions(+), 9 deletions(-) - -diff --git a/tools/locktest/Makefile.am b/tools/locktest/Makefile.am -index 3156815..efe6fcd 100644 ---- a/tools/locktest/Makefile.am -+++ b/tools/locktest/Makefile.am -@@ -1,12 +1,11 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = testlk - testlk_SOURCES = testlk.c --testlk_CFLAGS=$(CFLAGS_FOR_BUILD) --testlk_CPPFLAGS=$(CPPFLAGS_FOR_BUILD) --testlk_LDFLAGS=$(LDFLAGS_FOR_BUILD) - - MAINTAINERCLEANFILES = Makefile.in -diff --git a/tools/rpcgen/Makefile.am b/tools/rpcgen/Makefile.am -index 8a9ec89..5a5b4d3 100644 ---- a/tools/rpcgen/Makefile.am -+++ b/tools/rpcgen/Makefile.am -@@ -1,7 +1,9 @@ - ## Process this file with automake to produce Makefile.in - - CC=$(CC_FOR_BUILD) --LIBTOOL = @LIBTOOL@ --tag=CC -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) - - noinst_PROGRAMS = rpcgen - rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ -@@ -9,10 +11,6 @@ rpcgen_SOURCES = rpc_clntout.c rpc_cout.c rpc_hout.c rpc_main.c \ - rpc_util.c rpc_sample.c rpc_output.h rpc_parse.h \ - rpc_scan.h rpc_util.h - --rpcgen_CFLAGS=$(CFLAGS_FOR_BUILD) --rpcgen_CPPLAGS=$(CPPFLAGS_FOR_BUILD) --rpcgen_LDFLAGS=$(LDFLAGS_FOR_BUILD) --rpcgen_LDADD=$(LIBTIRPC) - - MAINTAINERCLEANFILES = Makefile.in - --- -2.1.0 - diff --git a/package.bak/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch b/package.bak/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch deleted file mode 100644 index 655d534253..0000000000 --- a/package.bak/nfs-utils/0002-Switch-legacy-index-in-favour-of-strchr.patch +++ /dev/null @@ -1,72 +0,0 @@ -From a1d45736286939b822fcc7b9c74843f6f90a747e Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 10 Nov 2012 18:58:15 +0100 -Subject: [PATCH] Switch legacy index() in favour of strchr() Updated for 1.2.6 - from the previous patch by Frederik Pasch. - -Signed-off-by: Gustavo Zacarias ---- - support/nfs/nfs_mntent.c | 6 +++--- - utils/mount/error.c | 2 +- - utils/mountd/fsloc.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/support/nfs/nfs_mntent.c b/support/nfs/nfs_mntent.c -index a2118a2..7496ed6 100644 ---- a/support/nfs/nfs_mntent.c -+++ b/support/nfs/nfs_mntent.c -@@ -9,7 +9,7 @@ - */ - - #include --#include /* for index */ -+#include /* for strchr */ - #include /* for isdigit */ - #include /* for umask */ - #include /* for ftruncate */ -@@ -172,7 +172,7 @@ nfs_getmntent (mntFILE *mfp) { - return NULL; - - mfp->mntent_lineno++; -- s = index (buf, '\n'); -+ s = strchr (buf, '\n'); - if (s == NULL) { - /* Missing final newline? Otherwise extremely */ - /* long line - assume file was corrupted */ -@@ -180,7 +180,7 @@ nfs_getmntent (mntFILE *mfp) { - fprintf(stderr, _("[mntent]: warning: no final " - "newline at the end of %s\n"), - mfp->mntent_file); -- s = index (buf, 0); -+ s = strchr (buf, 0); - } else { - mfp->mntent_errs = 1; - goto err; -diff --git a/utils/mount/error.c b/utils/mount/error.c -index e06f598..7bd1d27 100644 ---- a/utils/mount/error.c -+++ b/utils/mount/error.c -@@ -62,7 +62,7 @@ static int rpc_strerror(int spos) - char *tmp; - - if (estr) { -- if ((ptr = index(estr, ':'))) -+ if ((ptr = strchr(estr, ':'))) - estr = ++ptr; - - tmp = &errbuf[spos]; -diff --git a/utils/mountd/fsloc.c b/utils/mountd/fsloc.c -index bc737d1..ddbe92f 100644 ---- a/utils/mountd/fsloc.c -+++ b/utils/mountd/fsloc.c -@@ -127,7 +127,7 @@ static struct servers *method_list(char *data) - bool v6esc = false; - - xlog(L_NOTICE, "method_list(%s)", data); -- for (ptr--, listsize=1; ptr; ptr=index(ptr, ':'), listsize++) -+ for (ptr--, listsize=1; ptr; ptr=strchr(ptr, ':'), listsize++) - ptr++; - list = malloc(listsize * sizeof(char *)); - copy = strdup(data); --- -2.1.0 diff --git a/package.bak/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch b/package.bak/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch deleted file mode 100644 index dca44f6dbf..0000000000 --- a/package.bak/nfs-utils/0003-Let-the-configure-script-find-getrpcbynumber-in-libt.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 87f88b28ac01b6449463f00b660fe7416d7f9a55 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 18:53:03 +0100 -Subject: [PATCH] Let the configure script find getrpcbynumber in libtirpc - -The getrpcbynumber() function may not be available in the C library, -but only in the libtirpc library. Take this into account when checking -for the existence of getrpcbynumber() and getrpcbynumber_r(). - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8e427e3..6e42c96 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -433,11 +433,23 @@ AC_FUNC_STAT - AC_FUNC_VPRINTF - AC_CHECK_FUNCS([alarm atexit dup2 fdatasync ftruncate getcwd \ - gethostbyaddr gethostbyname gethostname getmntent \ -- getnameinfo getrpcbyname getrpcbynumber getrpcbynumber_r getifaddrs \ -+ getnameinfo getrpcbyname getifaddrs \ - gettimeofday hasmntopt inet_ntoa innetgr memset mkdir pathconf \ - ppoll realpath rmdir select socket strcasecmp strchr strdup \ - strerror strrchr strtol strtoul sigprocmask name_to_handle_at]) - -+save_CFLAGS=$CFLAGS -+save_LIBS=$LIBS -+CFLAGS="$CFLAGS $AM_CPPFLAGS" -+LIBS="$LIBS $LIBTIRPC" -+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) -+CFLAGS=$save_CFLAGS -+LIBS=$save_LIBS -+ -+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then -+ AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) -+fi -+ - dnl ************************************************************* - dnl Check for data sizes - dnl ************************************************************* --- -2.1.0 - diff --git a/package.bak/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch b/package.bak/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch deleted file mode 100644 index 7aca266977..0000000000 --- a/package.bak/nfs-utils/0004-mountd-Add-check-for-struct-file_handle.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 3c23b3ea7f5069e8fd4d5758704cd968504f1079 Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Tue, 2 Feb 2016 10:07:22 +0100 -Subject: [PATCH] mountd: Add check for 'struct file_handle' - -The code to check if name_to_handle_at() is implemented generates only a -warning but with some toolchain it doesn't fail to link (the function must be -implemented somewhere). -However the "struct file_handle" type is not available. - -So, this patch adds a check for this struct. - -Signed-off-by: Maxime Hadjinlian ---- - configure.ac | 1 + - utils/mountd/cache.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 25d2ba4..913a86f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -425,6 +425,7 @@ AC_TYPE_PID_T - AC_TYPE_SIZE_T - AC_HEADER_TIME - AC_STRUCT_TM -+AC_CHECK_TYPES([struct file_handle]) - - dnl ************************************************************* - dnl Check for functions -diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c -index 7847446..dc64f6d 100644 ---- a/utils/mountd/cache.c -+++ b/utils/mountd/cache.c -@@ -424,7 +424,7 @@ static int same_path(char *child, char *parent, int len) - if (count_slashes(p) != count_slashes(parent)) - return 0; - --#if HAVE_NAME_TO_HANDLE_AT -+#if defined(HAVE_NAME_TO_HANDLE_AT) && defined(HAVE_STRUCT_FILE_HANDLE) - struct { - struct file_handle fh; - unsigned char handle[128]; --- -2.7.0 - diff --git a/package.bak/nfs-utils/Config.in b/package.bak/nfs-utils/Config.in deleted file mode 100644 index bfaddd1516..0000000000 --- a/package.bak/nfs-utils/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -comment "nfs-utils needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_NFS_UTILS - bool "nfs-utils" - depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc, rpcbind - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - select BR2_PACKAGE_RPCBIND # runtime - depends on BR2_USE_MMU # fork() - help - The NFS Linux kernel server. - - http://sourceforge.net/projects/nfs - -if BR2_PACKAGE_NFS_UTILS - -config BR2_PACKAGE_NFS_UTILS_RPCDEBUG - bool "rpcdebug" - help - The RPC debugging utility - -config BR2_PACKAGE_NFS_UTILS_RPC_LOCKD - bool "rpc.lockd" - help - NFS lock manager for Linux kernels older than 2.4 - -config BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD - bool "rpc.rquotad" - help - NFS remote quota server - -endif diff --git a/package.bak/nfs-utils/S60nfs b/package.bak/nfs-utils/S60nfs deleted file mode 100755 index 893b1e49a6..0000000000 --- a/package.bak/nfs-utils/S60nfs +++ /dev/null @@ -1,88 +0,0 @@ -#!/bin/sh -# -# nfs This shell script takes care of starting and stopping -# the NFS services. Stolen from RedHat FC5. - -[ -x /usr/sbin/rpc.statd ] || exit 0 -[ -x /usr/sbin/rpc.nfsd ] || exit 0 -[ -x /usr/sbin/rpc.mountd ] || exit 0 -[ -x /usr/sbin/exportfs ] || exit 0 - -mkdir -p /var/lock/subsys -mkdir -p /run/nfs/sm -mkdir -p /run/nfs/sm.bak -touch /run/nfs/rmtab - -CFG_FILE=/etc/default/nfsd - -NR_THREADS=2 -if [ -f "${CFG_FILE}" ]; then - . "${CFG_FILE}" -fi - - -start() { - # Start daemons. - printf "Starting NFS statd: " - rpc.statd - [ $? = 0 ] && echo "OK" || echo "FAIL" - touch /var/lock/subsys/nfslock - - printf "Starting NFS services: " - /usr/sbin/exportfs -r - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Starting NFS daemon: " - rpc.nfsd ${NR_THREADS} - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Starting NFS mountd: " - rpc.mountd - [ $? = 0 ] && echo "OK" || echo "FAIL" - touch /var/lock/subsys/nfs -} - -stop() { - # Stop daemons. - printf "Shutting down NFS mountd: " - killall -q rpc.mountd 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Shutting down NFS daemon: " - killall -q nfsd 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Shutting down NFS services: " - /usr/sbin/exportfs -au - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Stopping NFS statd: " - killall -q rpc.statd 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - rm -f /var/lock/subsys/nfs - rm -f /var/run/rpc.statd.pid - rm -f /var/lock/subsys/nfslock -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - reload) - /usr/sbin/exportfs -r - touch /var/lock/subsys/nfs - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - -exit 0 diff --git a/package.bak/nfs-utils/nfs-utils.hash b/package.bak/nfs-utils/nfs-utils.hash deleted file mode 100644 index 2bd5121186..0000000000 --- a/package.bak/nfs-utils/nfs-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/nfs-utils/1.3.3/sha256sums.asc -sha256 700d689c5622c87953c34102e5befafc4d3c811e676852238f0dd79c9c0c084d nfs-utils-1.3.3.tar.xz diff --git a/package.bak/nfs-utils/nfs-utils.mk b/package.bak/nfs-utils/nfs-utils.mk deleted file mode 100644 index 179009dc5f..0000000000 --- a/package.bak/nfs-utils/nfs-utils.mk +++ /dev/null @@ -1,92 +0,0 @@ -################################################################################ -# -# nfs-utils -# -################################################################################ - -NFS_UTILS_VERSION = 1.3.3 -NFS_UTILS_SOURCE = nfs-utils-$(NFS_UTILS_VERSION).tar.xz -NFS_UTILS_SITE = https://www.kernel.org/pub/linux/utils/nfs-utils/$(NFS_UTILS_VERSION) -NFS_UTILS_LICENSE = GPLv2+ -NFS_UTILS_LICENSE_FILES = COPYING -NFS_UTILS_AUTORECONF = YES -NFS_UTILS_DEPENDENCIES = host-pkgconf - -NFS_UTILS_CONF_ENV = knfsd_cv_bsd_signals=no - -NFS_UTILS_CONF_OPTS = \ - --disable-nfsv4 \ - --disable-nfsv41 \ - --disable-gss \ - --disable-uuid \ - --disable-ipv6 \ - --without-tcp-wrappers \ - --with-statedir=/run/nfs \ - --with-rpcgen=internal - -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPCDEBUG) += usr/sbin/rpcdebug -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_LOCKD) += usr/sbin/rpc.lockd -NFS_UTILS_TARGETS_$(BR2_PACKAGE_NFS_UTILS_RPC_RQUOTAD) += usr/sbin/rpc.rquotad - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -NFS_UTILS_CONF_OPTS += --enable-caps -NFS_UTILS_DEPENDENCIES += libcap -else -NFS_UTILS_CONF_OPTS += --disable-caps -endif - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -NFS_UTILS_CONF_OPTS += --enable-tirpc -NFS_UTILS_DEPENDENCIES += libtirpc -else -NFS_UTILS_CONF_OPTS += --disable-tirpc -endif - -define NFS_UTILS_INSTALL_FIXUP - rm -f $(NFS_UTILS_TARGETS_) - touch $(TARGET_DIR)/etc/exports - $(INSTALL) -D -m 644 \ - $(@D)/utils/mount/nfsmount.conf $(TARGET_DIR)/etc/nfsmount.conf -endef -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += NFS_UTILS_INSTALL_FIXUP - -ifeq ($(BR2_INIT_SYSTEMD),y) -NFS_UTILS_CONF_OPTS += --with-systemd=/usr/lib/systemd/system -NFS_UTILS_DEPENDENCIES += systemd -else -NFS_UTILS_CONF_OPTS += --without-systemd -endif - -define NFS_UTILS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/nfs-utils/S60nfs \ - $(TARGET_DIR)/etc/init.d/S60nfs -endef - -define NFS_UTILS_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nfs-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-server.service - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nfs-client.target - - mkdir -p $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nfs-client.target \ - $(TARGET_DIR)/etc/systemd/system/remote-fs.target.wants/nfs-client.target - - $(INSTALL) -D -m 0755 package/nfs-utils/nfs-utils_env.sh \ - $(TARGET_DIR)/usr/lib/systemd/scripts/nfs-utils_env.sh - - $(INSTALL) -D -m 0644 package/nfs-utils/nfs-utils_tmpfiles.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/nfs-utils.conf -endef - -define NFS_UTILS_REMOVE_NFSIOSTAT - rm -f $(TARGET_DIR)/usr/sbin/nfsiostat -endef - -# nfsiostat is interpreted python, so remove it unless it's in the target -NFS_UTILS_POST_INSTALL_TARGET_HOOKS += $(if $(BR2_PACKAGE_PYTHON),,NFS_UTILS_REMOVE_NFSIOSTAT) - -$(eval $(autotools-package)) diff --git a/package.bak/nfs-utils/nfs-utils_env.sh b/package.bak/nfs-utils/nfs-utils_env.sh deleted file mode 100755 index 82284cef93..0000000000 --- a/package.bak/nfs-utils/nfs-utils_env.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# This script is empty, it simply needs to exist to make the -# nfs-config.service happy. diff --git a/package.bak/nfs-utils/nfs-utils_tmpfiles.conf b/package.bak/nfs-utils/nfs-utils_tmpfiles.conf deleted file mode 100644 index f87939fe2d..0000000000 --- a/package.bak/nfs-utils/nfs-utils_tmpfiles.conf +++ /dev/null @@ -1,4 +0,0 @@ -d /run/nfs/sm 0700 root root - -d /run/nfs/sm.bak 0700 root root - -f /run/nfs/rmtab 0644 root root - -f /run/nfs/etab 0644 root root - diff --git a/package.bak/nftables/Config.in b/package.bak/nftables/Config.in deleted file mode 100644 index d0a1b89277..0000000000 --- a/package.bak/nftables/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_NFTABLES - bool "nftables" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 - select BR2_PACKAGE_GMP - select BR2_PACKAGE_LIBMNL - select BR2_PACKAGE_LIBNFTNL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - nftables is the project that aims to replace the existing - {ip,ip6,arp,eb}tables framework. - Basically, this project provides a new packet filtering framework, - a new userspace utility and also a compatibility layer - for {ip,ip6}tables. - - http://www.netfilter.org/projects/nftables/index.html - -comment "nftables needs a toolchain w/ wchar, headers >= 3.12" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12 diff --git a/package.bak/nftables/nftables.hash b/package.bak/nftables/nftables.hash deleted file mode 100644 index a743476ae9..0000000000 --- a/package.bak/nftables/nftables.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.netfilter.org/projects/nftables/downloads.html#nftables-0.7 -sha1 c003fa8b63b1b44c52de345a4d84487d81865a98 nftables-0.7.tar.bz2 diff --git a/package.bak/nftables/nftables.mk b/package.bak/nftables/nftables.mk deleted file mode 100644 index 64d6be72ce..0000000000 --- a/package.bak/nftables/nftables.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# nftables -# -################################################################################ - -NFTABLES_VERSION = 0.7 -NFTABLES_SOURCE = nftables-$(NFTABLES_VERSION).tar.bz2 -NFTABLES_SITE = http://www.netfilter.org/projects/nftables/files -NFTABLES_DEPENDENCIES = gmp libmnl libnftnl host-bison host-flex \ - host-pkgconf $(if $(BR2_NEEDS_GETTEXT),gettext) -NFTABLES_LICENSE = GPLv2 -NFTABLES_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_READLINE),y) -NFTABLES_DEPENDENCIES += readline -NFTABLES_LIBS += -lncurses -else -NFTABLES_CONF_OPTS += --without-cli -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_JSON),yy) -NFTABLES_LIBS += -ljansson -lm -endif -ifeq ($(BR2_STATIC_LIBS)$(BR2_PACKAGE_LIBNFTNL_XML),yy) -NFTABLES_LIBS += -lmxml -lpthread -endif - -NFTABLES_CONF_ENV = \ - ac_cv_prog_CONFIG_PDF=no \ - LIBS="$(NFTABLES_LIBS)" \ - DBLATEX=no \ - DOCBOOK2X_MAN=no \ - DOCBOOK2MAN=no \ - DB2X_DOCBOOK2MAN=no - -$(eval $(autotools-package)) diff --git a/package.bak/nginx-dav-ext/Config.in b/package.bak/nginx-dav-ext/Config.in deleted file mode 100644 index 1e60321fe3..0000000000 --- a/package.bak/nginx-dav-ext/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NGINX_DAV_EXT - bool "nginx-dav-ext" - depends on BR2_PACKAGE_NGINX_HTTP_DAV_MODULE - select BR2_PACKAGE_EXPAT - help - NGINX WebDAV missing commands support (PROPFIND & OPTIONS). - - https://github.com/arut/nginx-dav-ext-module diff --git a/package.bak/nginx-dav-ext/nginx-dav-ext.hash b/package.bak/nginx-dav-ext/nginx-dav-ext.hash deleted file mode 100644 index ea7eb8632e..0000000000 --- a/package.bak/nginx-dav-ext/nginx-dav-ext.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d428a0236c933779cb40ac8c91afb19d5c25a376dc3caab825bfd543e1ee530d nginx-dav-ext-v0.0.3.tar.gz diff --git a/package.bak/nginx-dav-ext/nginx-dav-ext.mk b/package.bak/nginx-dav-ext/nginx-dav-ext.mk deleted file mode 100644 index 61e5bd0f57..0000000000 --- a/package.bak/nginx-dav-ext/nginx-dav-ext.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# nginx-dav-ext -# -################################################################################ - -NGINX_DAV_EXT_VERSION = v0.0.3 -NGINX_DAV_EXT_SITE = $(call github,arut,nginx-dav-ext-module,$(NGINX_DAV_EXT_VERSION)) -NGINX_DAV_EXT_LICENSE = BSD-2c -NGINX_DAV_EXT_LICENSE_FILES = ngx_http_dav_ext_module.c -NGINX_DAV_EXT_DEPENDENCIES = expat - -$(eval $(generic-package)) diff --git a/package.bak/nginx-naxsi/Config.in b/package.bak/nginx-naxsi/Config.in deleted file mode 100644 index fc2ba9bfe3..0000000000 --- a/package.bak/nginx-naxsi/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_NGINX_NAXSI - bool "nginx-naxsi" - depends on BR2_PACKAGE_NGINX_HTTP - # uses pcre, so nginx needs to be built with pcre support - select BR2_PACKAGE_PCRE - help - NAXSI means Nginx Anti XSS & SQL Injection. - - Technically, it is a third party nginx module, available as - a package for many UNIX-like platforms. This module, by - default, reads a small subset of simple (and readable) rules - containing 99% of known patterns involved in website - vulnerabilities. For example, <, | or drop are not supposed - to be part of a URI. - - Being very simple, those patterns may match legitimate - queries, it is the Naxsi's administrator duty to add - specific rules that will whitelist legitimate - behaviours. The administrator can either add whitelists - manually by analyzing nginx's error log, or (recommended) - start the project with an intensive auto-learning phase that - will automatically generate whitelisting rules regarding a - website's behaviour. - - In short, Naxsi behaves like a DROP-by-default firewall, the - only task is to add required ACCEPT rules for the target - website to work properly. - - https://github.com/nbs-system/naxsi diff --git a/package.bak/nginx-naxsi/nginx-naxsi.hash b/package.bak/nginx-naxsi/nginx-naxsi.hash deleted file mode 100644 index 967f78800e..0000000000 --- a/package.bak/nginx-naxsi/nginx-naxsi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 256378564e36b8f222adb8fbe746529e73413c6cbe2b0e5574f41dfd62d92577 nginx-naxsi-0.55.2.tar.gz diff --git a/package.bak/nginx-naxsi/nginx-naxsi.mk b/package.bak/nginx-naxsi/nginx-naxsi.mk deleted file mode 100644 index fb5e00a5ff..0000000000 --- a/package.bak/nginx-naxsi/nginx-naxsi.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# nginx-naxsi -# -################################################################################ - -NGINX_NAXSI_VERSION = 0.55.2 -NGINX_NAXSI_SITE = $(call github,nbs-system,naxsi,$(NGINX_NAXSI_VERSION)) -NGINX_NAXSI_LICENSE = GPLv2+ with OpenSSL exception -NGINX_NAXSI_LICENSE_FILES = naxsi_src/naxsi_json.c - -$(eval $(generic-package)) diff --git a/package.bak/nginx-upload/Config.in b/package.bak/nginx-upload/Config.in deleted file mode 100644 index 6bc1c3dbdd..0000000000 --- a/package.bak/nginx-upload/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_NGINX_UPLOAD - bool "nginx-upload" - depends on BR2_PACKAGE_NGINX_HTTP - select BR2_PACKAGE_OPENSSL - help - A module for nginx web server for handling file uploads - using multipart/form-data encoding (RFC 1867). - - https://github.com/vkholodkov/nginx-upload-module diff --git a/package.bak/nginx-upload/nginx-upload.hash b/package.bak/nginx-upload/nginx-upload.hash deleted file mode 100644 index 4fc4347361..0000000000 --- a/package.bak/nginx-upload/nginx-upload.hash +++ /dev/null @@ -1,2 +0,0 @@ -#Locally Computed: -sha256 8cd1d9d968ffba807de2e546ea9cad5e1ae294ec60b4927b2d60a98bdb4a1144 nginx-upload-aba1e3f34c754551f4f49e572bc86863d535609d.tar.gz diff --git a/package.bak/nginx-upload/nginx-upload.mk b/package.bak/nginx-upload/nginx-upload.mk deleted file mode 100644 index 6f94d35894..0000000000 --- a/package.bak/nginx-upload/nginx-upload.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# nginx-upload -# -################################################################################ - -NGINX_UPLOAD_VERSION = aba1e3f34c754551f4f49e572bc86863d535609d -NGINX_UPLOAD_SITE = $(call github,vkholodkov,nginx-upload-module,$(NGINX_UPLOAD_VERSION)) -NGINX_UPLOAD_LICENSE = BSD-3c -NGINX_UPLOAD_LICENSE_FILES = LICENCE -NGINX_UPLOAD_DEPENDENCIES = openssl - -$(eval $(generic-package)) diff --git a/package.bak/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch b/package.bak/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch deleted file mode 100644 index 603f7292da..0000000000 --- a/package.bak/nginx/0001-auto-type-sizeof-rework-autotest-to-be-cross-compila.patch +++ /dev/null @@ -1,87 +0,0 @@ -From fe05ccf80afe5de33d4f9c5e5545390c450bcd2d Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 24 Apr 2014 23:27:32 +0200 -Subject: [PATCH] auto/type/sizeof: rework autotest to be cross-compilation - friendly - -Rework the sizeof test to do the checks at compile time instead of at -runtime. This way, it does not break when cross-compiling for a -different CPU architecture. - -Signed-off-by: Samuel Martin - -Refresh for 1.8.0. - -Signed-off-by: Danomi Manchego -[martin@barkynet.com: Updated for 1.10.0] -Signed-off-by: Martin Bark ---- - auto/types/sizeof | 42 ++++++++++++++++++++++++++++-------------- - 1 file changed, 28 insertions(+), 14 deletions(-) - -diff --git a/auto/types/sizeof b/auto/types/sizeof -index a5f66bb..c6f31ec 100644 ---- a/auto/types/sizeof -+++ b/auto/types/sizeof -@@ -14,7 +14,7 @@ END - - ngx_size= - --cat << END > $NGX_AUTOTEST.c -+cat << _EOF > $NGX_AUTOTEST.c - - #include - #include -@@ -25,22 +25,40 @@ $NGX_INCLUDE_UNISTD_H - $NGX_INCLUDE_INTTYPES_H - $NGX_INCLUDE_AUTO_CONFIG_H - --int main() { -- printf("%d", (int) sizeof($ngx_type)); -+#if !defined( PASTE) -+#define PASTE2( x, y) x##y -+#define PASTE( x, y) PASTE2( x, y) -+#endif /* PASTE */ -+ -+#define SAY_IF_SIZEOF( typename, type, size) \\ -+ static char PASTE( PASTE( PASTE( sizeof_, typename), _is_), size) \\ -+ [(sizeof(type) == (size)) ? 1 : -1] -+ -+SAY_IF_SIZEOF(TEST_TYPENAME, TEST_TYPE, TEST_SIZE); -+ -+int main(void) -+{ - return 0; - } - --END -- -+_EOF - --ngx_test="$CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -- -o $NGX_AUTOTEST $NGX_AUTOTEST.c $NGX_LD_OPT $ngx_feature_libs" -+_ngx_typename=`echo "$ngx_type" | sed 's/ /_/g;s/\*/p/'` -+ngx_size="-1" -+ngx_size=`for i in 1 2 4 8 16 ; do \ -+ $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -DTEST_TYPENAME="$_ngx_typename" -DTEST_TYPE="$ngx_type" -DTEST_SIZE="$i" \ -+ $NGX_AUTOTEST.c -o $NGX_AUTOTEST \ -+ $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\ -+ echo $i ; break ; done` - --eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&1" -+rm -rf $NGX_AUTOTEST* - -+if test -z $ngx_size ; then -+ ngx_size=-1 -+fi - --if [ -x $NGX_AUTOTEST ]; then -- ngx_size=`$NGX_AUTOTEST` -+if [ $ngx_size -gt 0 ]; then - echo " $ngx_size bytes" - fi - --- -1.9.1 - diff --git a/package.bak/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch b/package.bak/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch deleted file mode 100644 index 13bef5ffdb..0000000000 --- a/package.bak/nginx/0002-auto-feature-add-mechanism-allowing-to-force-feature.patch +++ /dev/null @@ -1,135 +0,0 @@ -From ef72be22ad6d58e230f75553d80b470b80c3303a Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 4 May 2014 00:40:49 +0200 -Subject: [PATCH] auto/feature: add mechanism allowing to force feature run - test result - -Whenever a feature needs to run a test, the ngx_feature_run_force_result -variable can be set to the desired test result, and thus skip the test. - -Therefore, the generated config.h file will honor these presets. - -This mechanism aims to make easier cross-compilation support. - -Signed-off-by: Samuel Martin ---- - auto/feature | 80 ++++++++++++++++++++++++++++++++++++++++++++---------------- - 1 file changed, 59 insertions(+), 21 deletions(-) - -diff --git a/auto/feature b/auto/feature -index 1145f28..a194b85 100644 ---- a/auto/feature -+++ b/auto/feature -@@ -52,50 +52,88 @@ if [ -x $NGX_AUTOTEST ]; then - case "$ngx_feature_run" in - - yes) -- # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if test -n "$ngx_feature_run_force_result" ; then -+ echo " not tested (maybe cross-compiling)" -+ if test -n "$ngx_feature_name" ; then -+ if test "$ngx_feature_run_force_result" = "yes" ; then -+ have=$ngx_have_feature . auto/have -+ fi -+ fi - ngx_found=yes -+ else - -- if test -n "$ngx_feature_name"; then -- have=$ngx_have_feature . auto/have -+ # /bin/sh is used to intercept "Killed" or "Abort trap" messages -+ if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found" -+ ngx_found=yes -+ -+ if test -n "$ngx_feature_name"; then -+ have=$ngx_have_feature . auto/have -+ fi -+ -+ else -+ echo " found but is not working" - fi - -- else -- echo " found but is not working" - fi - ;; - - value) -- # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " found" -+ if test -n "$ngx_feature_run_force_result" ; then -+ echo " not tested (maybe cross-compiling)" -+ cat << END >> $NGX_AUTO_CONFIG_H -+ -+#ifndef $ngx_feature_name -+#define $ngx_feature_name $ngx_feature_run_force_result -+#endif -+ -+END - ngx_found=yes -+ else - -- cat << END >> $NGX_AUTO_CONFIG_H -+ # /bin/sh is used to intercept "Killed" or "Abort trap" messages -+ if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " found" -+ ngx_found=yes -+ -+ cat << END >> $NGX_AUTO_CONFIG_H - - #ifndef $ngx_feature_name - #define $ngx_feature_name `$NGX_AUTOTEST` - #endif - - END -- else -- echo " found but is not working" -+ else -+ echo " found but is not working" -+ fi -+ - fi - ;; - - bug) -- # /bin/sh is used to intercept "Killed" or "Abort trap" messages -- if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -- echo " not found" -- -- else -- echo " found" -+ if test -n "$ngx_feature_run_force_result" ; then -+ echo " not tested (maybe cross-compiling)" -+ if test -n "$ngx_feature_name"; then -+ if test "$ngx_feature_run_force_result" = "yes" ; then -+ have=$ngx_have_feature . auto/have -+ fi -+ fi - ngx_found=yes -+ else - -- if test -n "$ngx_feature_name"; then -- have=$ngx_have_feature . auto/have -+ # /bin/sh is used to intercept "Killed" or "Abort trap" messages -+ if /bin/sh -c $NGX_AUTOTEST >> $NGX_AUTOCONF_ERR 2>&1; then -+ echo " not found" -+ -+ else -+ echo " found" -+ ngx_found=yes -+ -+ if test -n "$ngx_feature_name"; then -+ have=$ngx_have_feature . auto/have -+ fi - fi -+ - fi - ;; - --- -1.9.2 - diff --git a/package.bak/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch b/package.bak/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch deleted file mode 100644 index ed67a67944..0000000000 --- a/package.bak/nginx/0003-auto-set-ngx_feature_run_force_result-for-each-featu.patch +++ /dev/null @@ -1,213 +0,0 @@ -From 71939b727a8fa9f722934700948a5b68960f6183 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 29 May 2014 18:52:10 +0200 -Subject: [PATCH] auto/*: set ngx_feature_run_force_result for each feature - requiring run test - -Each feature requiring a run test has a matching preset variable (called -ngx_force_*) used to set ngx_feature_run_force_result. - -These ngx_force_* variables are passed through the environment at configure -time. - -Signed-off-by: Samuel Martin - -Refresh for 1.8.0. - -Signed-off-by: Danomi Manchego ---- - auto/cc/conf | 3 +++ - auto/cc/name | 1 + - auto/lib/libatomic/conf | 1 + - auto/os/darwin | 3 +++ - auto/os/linux | 4 ++++ - auto/unix | 8 ++++++++ - 6 files changed, 20 insertions(+) - -diff --git a/auto/cc/conf b/auto/cc/conf -index edc6d74..a61ade4 100644 ---- a/auto/cc/conf -+++ b/auto/cc/conf -@@ -159,6 +159,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="gcc builtin atomic operations" - ngx_feature_name=NGX_HAVE_GCC_ATOMIC - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_gcc_have_atomic" - ngx_feature_incs= - ngx_feature_path= - ngx_feature_libs= -@@ -179,6 +180,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="C99 variadic macros" - ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS" - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_c99_have_variadic_macros" - ngx_feature_incs="#include - #define var(dummy, ...) sprintf(__VA_ARGS__)" - ngx_feature_path= -@@ -193,6 +195,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="gcc variadic macros" - ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS" - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_gcc_have_variadic_macros" - ngx_feature_incs="#include - #define var(dummy, args...) sprintf(args)" - ngx_feature_path= -diff --git a/auto/cc/name b/auto/cc/name -index 51a7ed9..d237d47 100644 ---- a/auto/cc/name -+++ b/auto/cc/name -@@ -8,6 +8,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then - ngx_feature="C compiler" - ngx_feature_name= - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_c_compiler" - ngx_feature_incs= - ngx_feature_path= - ngx_feature_libs= -diff --git a/auto/lib/libatomic/conf b/auto/lib/libatomic/conf -index d1e484a..3724916 100644 ---- a/auto/lib/libatomic/conf -+++ b/auto/lib/libatomic/conf -@@ -15,6 +15,7 @@ else - ngx_feature="atomic_ops library" - ngx_feature_name=NGX_HAVE_LIBATOMIC - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_have_libatomic" - ngx_feature_incs="#define AO_REQUIRE_CAS - #include " - ngx_feature_path= -diff --git a/auto/os/darwin b/auto/os/darwin -index 1d3e3d3..11b7276 100644 ---- a/auto/os/darwin -+++ b/auto/os/darwin -@@ -27,6 +27,7 @@ NGX_KQUEUE_CHECKED=YES - ngx_feature="kqueue's EVFILT_TIMER" - ngx_feature_name="NGX_HAVE_TIMER_EVENT" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_timer_event" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -57,6 +58,7 @@ ngx_feature_test="int kq; - ngx_feature="Darwin 64-bit kqueue millisecond timeout bug" - ngx_feature_name=NGX_DARWIN_KEVENT_BUG - ngx_feature_run=bug -+ngx_feature_run_force_result="$ngx_force_kevent_bug" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -87,6 +89,7 @@ CC_AUX_FLAGS="$CC_AUX_FLAGS" - ngx_feature="sendfile()" - ngx_feature_name="NGX_HAVE_SENDFILE" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_sendfile" - ngx_feature_incs="#include - #include - #include -diff --git a/auto/os/linux b/auto/os/linux -index 19bf832..16848b2 100644 ---- a/auto/os/linux -+++ b/auto/os/linux -@@ -49,6 +49,7 @@ fi - ngx_feature="epoll" - ngx_feature_name="NGX_HAVE_EPOLL" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_epoll" - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs= -@@ -106,6 +107,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE" - ngx_feature="sendfile()" - ngx_feature_name="NGX_HAVE_SENDFILE" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_sendfile" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -127,6 +129,7 @@ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64" - ngx_feature="sendfile64()" - ngx_feature_name="NGX_HAVE_SENDFILE64" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_sendfile64" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -145,6 +148,7 @@ ngx_include="sys/prctl.h"; . auto/include - ngx_feature="prctl(PR_SET_DUMPABLE)" - ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_pr_set_dumpable" - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs= -diff --git a/auto/unix b/auto/unix -index 6e54531..7dbf9d1 100755 ---- a/auto/unix -+++ b/auto/unix -@@ -99,6 +99,7 @@ if test -z "$NGX_KQUEUE_CHECKED"; then - ngx_feature="kqueue's EVFILT_TIMER" - ngx_feature_name="NGX_HAVE_TIMER_EVENT" - ngx_feature_run=yes -+ ngx_feature_run_force_result="$ngx_force_have_timer_event" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -589,6 +590,7 @@ ngx_feature_test="char buf[1]; ssize_t n; n = pwrite(1, buf, 1, 0); - ngx_feature="sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include ' - ngx_feature_path= -@@ -603,6 +605,7 @@ if [ $ngx_found = no ]; then - ngx_feature="_sys_nerr" - ngx_feature_name="NGX_SYS_NERR" - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include ' - ngx_feature_path= -@@ -618,6 +621,7 @@ if [ $ngx_found = no ]; then - ngx_feature='maximum errno' - ngx_feature_name=NGX_SYS_NERR - ngx_feature_run=value -+ ngx_feature_run_force_result="$ngx_force_sys_nerr" - ngx_feature_incs='#include - #include - #include ' -@@ -676,6 +680,7 @@ ngx_feature_test="void *p; p = memalign(4096, 4096); - ngx_feature="mmap(MAP_ANON|MAP_SHARED)" - ngx_feature_name="NGX_HAVE_MAP_ANON" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_map_anon" - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs= -@@ -689,6 +694,7 @@ ngx_feature_test="void *p; - ngx_feature='mmap("/dev/zero", MAP_SHARED)' - ngx_feature_name="NGX_HAVE_MAP_DEVZERO" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_map_devzero" - ngx_feature_incs="#include - #include - #include " -@@ -704,6 +710,7 @@ ngx_feature_test='void *p; int fd; - ngx_feature="System V shared memory" - ngx_feature_name="NGX_HAVE_SYSVSHM" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_sysvshm" - ngx_feature_incs="#include - #include " - ngx_feature_path= -@@ -718,6 +725,7 @@ ngx_feature_test="int id; - ngx_feature="POSIX semaphores" - ngx_feature_name="NGX_HAVE_POSIX_SEM" - ngx_feature_run=yes -+ngx_feature_run_force_result="$ngx_force_have_posix_sem" - ngx_feature_incs="#include " - ngx_feature_path= - ngx_feature_libs= --- -1.9.1 - diff --git a/package.bak/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch b/package.bak/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch deleted file mode 100644 index b315909c34..0000000000 --- a/package.bak/nginx/0004-auto-lib-libxslt-conf-use-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 211b9f19a3a62826fadef55d2f89d6f66fbf4aa6 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 29 May 2014 19:22:27 +0200 -Subject: [PATCH] auto/lib/libxslt/conf: use pkg-config - -Change to using pkg-config to find the path to libxslt and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/libxslt/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/auto/lib/libxslt/conf b/auto/lib/libxslt/conf -index 3a0f37b..3c2a60e 100644 ---- a/auto/lib/libxslt/conf -+++ b/auto/lib/libxslt/conf -@@ -12,8 +12,8 @@ - #include - #include - #include " -- ngx_feature_path="/usr/include/libxml2" -- ngx_feature_libs="-lxml2 -lxslt" -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I libxslt|sed 's/-I//g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs libxslt)" - ngx_feature_test="xmlParserCtxtPtr ctxt = NULL; - xsltStylesheetPtr sheet = NULL; - xmlDocPtr doc; --- -2.8.2 - diff --git a/package.bak/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch b/package.bak/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch deleted file mode 100644 index 2242d13363..0000000000 --- a/package.bak/nginx/0005-auto-unix-make-sys_nerr-guessing-cross-friendly.patch +++ /dev/null @@ -1,138 +0,0 @@ -From 08617a8d29ee22831175697555558fec8f52772c Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 1 Jun 2014 16:05:04 +0200 -Subject: [PATCH] auto/unix: make sys_nerr guessing cross-friendly - -This patch replaces the default sys_nerr runtest with a test done at -buildtime. - -The idea behind this buildtime test is finding the value of the ERR_MAX -macro if defined, or the EHWPOISON (which is currently the last errno) -otherwise. - -Signed-off-by: Samuel Martin - -Refresh for 1.8.0. - -Signed-off-by: Danomi Manchego ---- - auto/os/sys_nerr | 78 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - auto/unix | 10 ++++++++ - 2 files changed, 88 insertions(+) - create mode 100644 auto/os/sys_nerr - -diff --git a/auto/os/sys_nerr b/auto/os/sys_nerr -new file mode 100644 -index 0000000..8970f5f ---- /dev/null -+++ b/auto/os/sys_nerr -@@ -0,0 +1,78 @@ -+ -+# Copyright (C) Samuel Martin -+ -+ -+echo $ngx_n "checking for sys_nerr value...$ngx_c" -+ -+# sys_nerr guessing is done using a (very) poor (but working) -+# heuristics, by checking for the value of ERR_MAX if defined, or -+# EHWPOISON otherwise. -+ -+cat << END >> $NGX_AUTOCONF_ERR -+ -+---------------------------------------- -+checking for sys_nerr value -+ -+END -+ -+ngx_sys_nerr= -+ -+cat << _EOF > $NGX_AUTOTEST.c -+ -+#include -+#include -+ -+static char sys_nerr_test[ERR_MAX]; -+int main(void) -+{ -+ return 0; -+} -+ -+_EOF -+ -+if $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ $NGX_AUTOTEST.c -o $NGX_AUTOTEST \ -+ $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 ; then -+ _ngx_max_err_macro=ERR_MAX -+else -+ # the +2 has been empirically found! -+ _ngx_max_err_macro="EHWPOISON + 2" -+fi -+ -+cat << _EOF > $NGX_AUTOTEST.c -+ -+#include -+#include -+ -+static char sys_nerr_test[(TEST_ERR_MAX == $_ngx_max_err_macro) ? 1 : -1]; -+int main(void) -+{ -+ return 0; -+} -+ -+_EOF -+ -+ -+ngx_sys_nerr=`for i in $(seq 0 2000) ; do \ -+ $CC $CC_TEST_FLAGS $CC_AUX_FLAGS \ -+ -DTEST_ERR_MAX="$i" \ -+ $NGX_AUTOTEST.c -o $NGX_AUTOTEST \ -+ $NGX_LD_OPT $ngx_feature_libs >/dev/null 2>&1 || continue ;\ -+ echo $i ; break ; done` -+ -+rm -rf $NGX_AUTOTEST* -+ -+if test -z $ngx_sys_nerr ; then -+ ngx_size=0 -+ ngx_sys_nerr=0 -+fi -+ -+cat << END >> $NGX_AUTO_CONFIG_H -+ -+#ifndef $ngx_feature_name -+#define $ngx_feature_name $ngx_sys_nerr -+#endif -+ -+END -+ -+echo " $ngx_sys_nerr" -diff --git a/auto/unix b/auto/unix -index 7dbf9d1..00a7370 100755 ---- a/auto/unix -+++ b/auto/unix -@@ -595,6 +595,10 @@ ngx_feature_incs='#include - #include ' - ngx_feature_path= - ngx_feature_libs= -+ -+if false ; then -+# Disabled because only valid for native build. -+ - ngx_feature_test='printf("%d", sys_nerr);' - . auto/feature - -@@ -643,6 +647,12 @@ if [ $ngx_found = no ]; then - . auto/feature - fi - -+else -+ # Cross-compilation support -+ . auto/os/sys_nerr -+ -+fi -+ - - ngx_feature="localtime_r()" - ngx_feature_name="NGX_HAVE_LOCALTIME_R" --- -1.9.1 - diff --git a/package.bak/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch b/package.bak/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch deleted file mode 100644 index b826a3c8e7..0000000000 --- a/package.bak/nginx/0006-auto-lib-openssl-conf-use-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 756556d127da291cad8a2c007a89124a692aef7f Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 14:48:31 +0100 -Subject: [PATCH] auto/lib/openssl/conf: use pkg-config - -Change to using pkg-config to find the path to openssl and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/openssl/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/auto/lib/openssl/conf b/auto/lib/openssl/conf -index 39d9602..995c6f3 100644 ---- a/auto/lib/openssl/conf -+++ b/auto/lib/openssl/conf -@@ -50,8 +50,8 @@ else - ngx_feature_name="NGX_OPENSSL" - ngx_feature_run=no - ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lssl -lcrypto $NGX_LIBDL" -+ ngx_feature_path="$(${PKG_CONFIG:=pkg-config} --cflags-only-I openssl|sed 's/-I//g')" -+ ngx_feature_libs="$(${PKG_CONFIG:=pkg-config} --libs openssl)" - ngx_feature_test="SSL_CTX_set_options(NULL, 0)" - . auto/feature - --- -2.8.2 - diff --git a/package.bak/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch b/package.bak/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch deleted file mode 100644 index 34e7981c8f..0000000000 --- a/package.bak/nginx/0007-auto-lib-libgd-conf-use-pkg-config.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fd9885fe5fef5826034547ca6be7299863f99769 Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 14:48:49 +0100 -Subject: [PATCH] auto/lib/libgd/conf: use pkg-config - -Change to using pkg-config to find the path to libgd and its -dependencies. - -Signed-off-by: Martin Bark ---- - auto/lib/libgd/conf | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/auto/lib/libgd/conf b/auto/lib/libgd/conf -index 6e4e91c..1c536a2 100644 ---- a/auto/lib/libgd/conf -+++ b/auto/lib/libgd/conf -@@ -7,8 +7,8 @@ - ngx_feature_name= - ngx_feature_run=no - ngx_feature_incs="#include " -- ngx_feature_path= -- ngx_feature_libs="-lgd" -+ ngx_feature_path="$(${GDLIB_CONFIG:=gdlib-config} --includedir)" -+ ngx_feature_libs="$(${GDLIB_CONFIG:=gdlib-config} --libs)" - ngx_feature_test="gdImagePtr img = gdImageCreateFromGifPtr(1, NULL);" - . auto/feature - --- -2.8.2 - diff --git a/package.bak/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch b/package.bak/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch deleted file mode 100644 index c10fcd11c9..0000000000 --- a/package.bak/nginx/0008-src-os-unix-ngx_linux_config.h-only-include-dlfcn.h-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 8dc9dffc1f99ac951865f3135dfb5061a08d1f85 Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Fri, 6 May 2016 16:29:17 +0100 -Subject: [PATCH] src/os/unix/ngx_linux_config.h: only include dlfcn.h if - available - -Signed-off-by: Martin Bark ---- - src/os/unix/ngx_linux_config.h | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/src/os/unix/ngx_linux_config.h b/src/os/unix/ngx_linux_config.h -index 2f6129d..4244086 100644 ---- a/src/os/unix/ngx_linux_config.h -+++ b/src/os/unix/ngx_linux_config.h -@@ -55,10 +55,12 @@ - #include - #include /* uname() */ - --#include -+#include - - --#include -+#if (NGX_HAVE_DLOPEN) -+#include -+#endif - - - #if (NGX_HAVE_POSIX_SEM) --- -2.8.2 - diff --git a/package.bak/nginx/Config.in b/package.bak/nginx/Config.in deleted file mode 100644 index e6f2d96d34..0000000000 --- a/package.bak/nginx/Config.in +++ /dev/null @@ -1,383 +0,0 @@ -menuconfig BR2_PACKAGE_NGINX - bool "nginx" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBATOMIC_OPS if BR2_sparc_v8 || BR2_sparc_leon3 - help - nginx is an HTTP and reverse proxy server, as well as a mail proxy - server. - - http://nginx.org/ - -if BR2_PACKAGE_NGINX - -config BR2_PACKAGE_NGINX_FILE_AIO - bool "file AIO support" - # Does not build, because nginx hardcodes using SYS_eventfd, - # but it's available on neither AArch64 nor ARC where only - # eventfd() is available. See - # https://bugs.launchpad.net/linaro-aarch64/+bug/1160013 - depends on !BR2_aarch64 - depends on !BR2_arc - -config BR2_PACKAGE_NGINX_THREADS - bool "thread pool support" - depends on BR2_TOOLCHAIN_HAS_THREADS - -comment "thread pool support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_NGINX_HTTP - bool "http server" - default y - -if BR2_PACKAGE_NGINX_HTTP - -config BR2_PACKAGE_NGINX_HTTP_CACHE - bool "http cache support" - select BR2_PACKAGE_OPENSSL - -comment "http modules" - -config BR2_PACKAGE_NGINX_HTTP_SSL_MODULE - bool "ngx_http_ssl_module" - select BR2_PACKAGE_OPENSSL - help - Enable ngx_http_ssl_module - -config BR2_PACKAGE_NGINX_HTTP_V2_MODULE - bool "ngx_http_v2_module" - select BR2_PACKAGE_ZLIB - help - Enable ngx_http_spdy_module - -config BR2_PACKAGE_NGINX_HTTP_REALIP_MODULE - bool "ngx_http_realip_module" - help - Enable ngx_http_realip_module - -config BR2_PACKAGE_NGINX_HTTP_ADDITION_MODULE - bool "ngx_http_addition_module" - help - Enable ngx_http_addition_module - -config BR2_PACKAGE_NGINX_HTTP_XSLT_MODULE - bool "ngx_http_xslt_module" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - help - Enable ngx_http_xslt_module - -config BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE - bool "ngx_http_image_filter_module" - select BR2_PACKAGE_GD - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - help - Enable ngx_http_image_filter_module - -config BR2_PACKAGE_NGINX_HTTP_SUB_MODULE - bool "ngx_http_sub_module" - help - Enable ngx_http_sub_module - -config BR2_PACKAGE_NGINX_HTTP_DAV_MODULE - bool "ngx_http_dav_module" - help - Enable ngx_http_dav_module - -config BR2_PACKAGE_NGINX_HTTP_FLV_MODULE - bool "ngx_http_flv_module" - help - Enable ngx_http_flv_module - -config BR2_PACKAGE_NGINX_HTTP_MP4_MODULE - bool "ngx_http_mp4_module" - help - Enable ngx_http_mp4_module - -config BR2_PACKAGE_NGINX_HTTP_GUNZIP_MODULE - bool "ngx_http_gunzip_module" - select BR2_PACKAGE_ZLIB - help - Enable ngx_http_gunzip_module - -config BR2_PACKAGE_NGINX_HTTP_GZIP_STATIC_MODULE - bool "ngx_http_gzip_static_module" - select BR2_PACKAGE_ZLIB - help - Enable ngx_http_gzip_static_module - -config BR2_PACKAGE_NGINX_HTTP_AUTH_REQUEST_MODULE - bool "ngx_http_auth_request_module" - help - Enable ngx_http_auth_request_module - -config BR2_PACKAGE_NGINX_HTTP_RANDOM_INDEX_MODULE - bool "ngx_http_random_index_module" - help - Enable ngx_http_random_index_module - -config BR2_PACKAGE_NGINX_HTTP_SECURE_LINK_MODULE - bool "ngx_http_secure_link_module" - select BR2_PACKAGE_OPENSSL - help - Enable ngx_http_secure_link_module - -config BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE - bool "ngx_http_degradation_module" - help - Enable ngx_http_degradation_module - -config BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE - bool "ngx_http_stub_status_module" - help - Enable ngx_http_stub_status_module - -config BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE - bool "ngx_http_charset_module" - default y - help - Enable ngx_http_charset_module - -config BR2_PACKAGE_NGINX_HTTP_GZIP_MODULE - bool "ngx_http_gzip_module" - select BR2_PACKAGE_ZLIB - default y - help - Enable ngx_http_gzip_module - -config BR2_PACKAGE_NGINX_HTTP_SSI_MODULE - bool "ngx_http_ssi_module" - default y - help - Enable ngx_http_ssi_module - -config BR2_PACKAGE_NGINX_HTTP_USERID_MODULE - bool "ngx_http_userid_module" - default y - help - Enable ngx_http_userid_module - -config BR2_PACKAGE_NGINX_HTTP_ACCESS_MODULE - bool "ngx_http_access_module" - default y - help - Enable ngx_http_access_module - -config BR2_PACKAGE_NGINX_HTTP_AUTH_BASIC_MODULE - bool "ngx_http_auth_basic_module" - default y - help - Enable ngx_http_auth_basic_module - -config BR2_PACKAGE_NGINX_HTTP_AUTOINDEX_MODULE - bool "ngx_http_autoindex_module" - default y - help - Enable ngx_http_autoindex_module - -config BR2_PACKAGE_NGINX_HTTP_GEO_MODULE - bool "ngx_http_geo_module" - default y - help - Enable ngx_http_geo_module - -config BR2_PACKAGE_NGINX_HTTP_MAP_MODULE - bool "ngx_http_map_module" - default y - help - Enable ngx_http_map_module - -config BR2_PACKAGE_NGINX_HTTP_SPLIT_CLIENTS_MODULE - bool "ngx_http_split_clients_module" - default y - help - Enable ngx_http_split_clients_module - -config BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE - bool "ngx_http_referer_module" - default y - help - Enable ngx_http_referer_module - -config BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE - bool "ngx_http_rewrite_module" - select BR2_PACKAGE_PCRE - default y - help - Enable ngx_http_rewrite_module - -config BR2_PACKAGE_NGINX_HTTP_PROXY_MODULE - bool "ngx_http_proxy_module" - default y - help - Enable ngx_http_proxy_module - -config BR2_PACKAGE_NGINX_HTTP_FASTCGI_MODULE - bool "ngx_http_fastcgi_module" - default y - help - Enable ngx_http_fastcgi_module - -config BR2_PACKAGE_NGINX_HTTP_UWSGI_MODULE - bool "ngx_http_uwsgi_module" - default y - help - Enable ngx_http_uwsgi_module - -config BR2_PACKAGE_NGINX_HTTP_SCGI_MODULE - bool "ngx_http_scgi_module" - default y - help - Enable ngx_http_scgi_module - -config BR2_PACKAGE_NGINX_HTTP_MEMCACHED_MODULE - bool "ngx_http_memcached_module" - default y - help - Enable ngx_http_memcached_module - -config BR2_PACKAGE_NGINX_HTTP_LIMIT_CONN_MODULE - bool "ngx_http_limit_conn_module" - default y - help - Enable ngx_http_limit_conn_module - -config BR2_PACKAGE_NGINX_HTTP_LIMIT_REQ_MODULE - bool "ngx_http_limit_req_module" - default y - help - Enable ngx_http_limit_req_module - -config BR2_PACKAGE_NGINX_HTTP_EMPTY_GIF_MODULE - bool "ngx_http_empty_gif_module" - default y - help - Enable ngx_http_empty_gif_module - -config BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE - bool "ngx_http_browser_module" - default y - help - Enable ngx_http_browser_module - -config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE - bool "ngx_http_upstream_ip_hash_module" - default y - help - Enable ngx_http_upstream_ip_hash_module - -config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE - bool "ngx_http_upstream_least_conn_module" - default y - help - Enable ngx_http_upstream_least_conn_module - -config BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE - bool "ngx_http_upstream_keepalive_module" - default y - help - Enable ngx_http_upstream_keepalive_module - -endif #BR2_PACKAGE_NGINX_HTTP - -config BR2_PACKAGE_NGINX_MAIL - bool "mail proxy modules" - -if BR2_PACKAGE_NGINX_MAIL - -config BR2_PACKAGE_NGINX_MAIL_SSL_MODULE - bool "ngx_mail_ssl_module" - select BR2_PACKAGE_OPENSSL - help - Enable ngx_mail_ssl_module - -config BR2_PACKAGE_NGINX_MAIL_POP3_MODULE - bool "ngx_mail_pop3_module" - default y - help - Enable ngx_mail_pop3_module - -config BR2_PACKAGE_NGINX_MAIL_IMAP_MODULE - bool "ngx_mail_imap_module" - default y - help - Enable ngx_mail_imap_module - -config BR2_PACKAGE_NGINX_MAIL_SMTP_MODULE - bool "ngx_mail_smtp_module" - default y - help - Enable ngx_mail_smtp_module - -endif #BR2_PACKAGE_NGINX_MAIL - -config BR2_PACKAGE_NGINX_STREAM - bool "stream proxy modules" - -if BR2_PACKAGE_NGINX_STREAM - -config BR2_PACKAGE_NGINX_STREAM_SSL_MODULE - bool "ngx_stream_ssl_module" - select BR2_PACKAGE_OPENSSL - help - Enable ngx_stream_ssl_module - -config BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE - bool "ngx_stream_limit_conn_module" - default y - help - Enable ngx_stream_limit_conn_module - -config BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE - bool "ngx_stream_access_module" - default y - help - Enable ngx_stream_access_module - -config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE - bool "ngx_stream_upstream_hash_module" - default y - help - Enable ngx_stream_upstream_hash_module - -config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE - bool "ngx_stream_upstream_least_conn_module" - default y - help - Enable ngx_stream_upstream_least_conn_module - -config BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE - bool "ngx_stream_upstream_zone_module" - default y - help - Enable ngx_stream_upstream_zone_module - -endif #BR2_PACKAGE_NGINX_STREAM - -config BR2_PACKAGE_NGINX_DEBUG - bool "debug logging" - help - Enable debug logging. The debug level should be set with - the error_log directive. For example - - error_log /var/log/nginx/error.log debug; - -comment "misc. modules" - -config BR2_PACKAGE_NGINX_SELECT_MODULE - bool "ngx_select_module" - help - Enable ngx_select_module - -config BR2_PACKAGE_NGINX_POLL_MODULE - bool "ngx_poll_module" - help - Enable ngx_poll_module - -config BR2_PACKAGE_NGINX_ADD_MODULES - string "additional modules" - help - Space separated list of urls of the additional modules - -endif diff --git a/package.bak/nginx/S50nginx b/package.bak/nginx/S50nginx deleted file mode 100755 index b2f8b80855..0000000000 --- a/package.bak/nginx/S50nginx +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh -# -# Start/stop nginx -# - -PIDFILE=/var/run/nginx.pid - -case "$1" in - start) - echo "Starting nginx..." - mkdir -p /var/log/nginx /var/tmp/nginx - start-stop-daemon -S -x /usr/sbin/nginx -p $PIDFILE - ;; - stop) - printf "Stopping nginx..." - start-stop-daemon -K -o -p $PIDFILE - ;; - restart|reload) - "$0" stop - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/nginx/nginx.hash b/package.bak/nginx/nginx.hash deleted file mode 100644 index 498d272dac..0000000000 --- a/package.bak/nginx/nginx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 75020f1364cac459cb733c4e1caed2d00376e40ea05588fb8793076a4c69dd90 nginx-1.10.3.tar.gz diff --git a/package.bak/nginx/nginx.logrotate b/package.bak/nginx/nginx.logrotate deleted file mode 100644 index e0fa9ec4ce..0000000000 --- a/package.bak/nginx/nginx.logrotate +++ /dev/null @@ -1,9 +0,0 @@ -/var/log/nginx/*log { - missingok - create 640 http log - sharedscripts - compress - postrotate - test ! -r /var/run/nginx.pid || kill -USR1 `cat /var/run/nginx.pid` - endscript -} diff --git a/package.bak/nginx/nginx.mk b/package.bak/nginx/nginx.mk deleted file mode 100644 index f9b2cd1d3c..0000000000 --- a/package.bak/nginx/nginx.mk +++ /dev/null @@ -1,296 +0,0 @@ -################################################################################ -# -# nginx -# -################################################################################ - -NGINX_VERSION = 1.10.3 -NGINX_SITE = http://nginx.org/download -NGINX_LICENSE = BSD-2c -NGINX_LICENSE_FILES = LICENSE -NGINX_DEPENDENCIES = host-pkgconf - -NGINX_CONF_OPTS = \ - --crossbuild=Linux::$(BR2_ARCH) \ - --with-cc="$(TARGET_CC)" \ - --with-cpp="$(TARGET_CC)" \ - --with-ld-opt="$(TARGET_LDFLAGS)" \ - --with-ipv6 - -# www-data user and group are used for nginx. Because these user and group -# are already set by buildroot, it is not necessary to redefine them. -# See system/skeleton/etc/passwd -# username: www-data uid: 33 -# groupname: www-data gid: 33 -# -# 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 - - - - - -endef - -# disable external libatomic_ops because its detection fails. -NGINX_CONF_ENV += \ - ngx_force_c_compiler=yes \ - ngx_force_c99_have_variadic_macros=yes \ - ngx_force_gcc_have_variadic_macros=yes \ - ngx_force_gcc_have_atomic=yes \ - ngx_force_have_epoll=yes \ - ngx_force_have_sendfile=yes \ - ngx_force_have_sendfile64=yes \ - ngx_force_have_pr_set_dumpable=yes \ - ngx_force_have_timer_event=yes \ - ngx_force_have_map_anon=yes \ - ngx_force_have_map_devzero=yes \ - ngx_force_have_sysvshm=yes \ - ngx_force_have_posix_sem=yes - -# prefix: nginx root configuration location -NGINX_CONF_OPTS += \ - --prefix=/usr \ - --conf-path=/etc/nginx/nginx.conf \ - --sbin-path=/usr/sbin/nginx \ - --pid-path=/var/run/nginx.pid \ - --lock-path=/var/run/lock/nginx.lock \ - --user=www-data \ - --group=www-data \ - --error-log-path=/var/log/nginx/error.log \ - --http-log-path=/var/log/nginx/access.log \ - --http-client-body-temp-path=/var/tmp/nginx/client-body \ - --http-proxy-temp-path=/var/tmp/nginx/proxy \ - --http-fastcgi-temp-path=/var/tmp/nginx/fastcgi \ - --http-scgi-temp-path=/var/tmp/nginx/scgi \ - --http-uwsgi-temp-path=/var/tmp/nginx/uwsgi - -NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_FILE_AIO),--with-file-aio) \ - $(if $(BR2_PACKAGE_NGINX_THREADS),--with-threads) - -ifeq ($(BR2_PACKAGE_LIBATOMIC_OPS),y) -NGINX_DEPENDENCIES += libatomic_ops -NGINX_CONF_OPTS += --with-libatomic -NGINX_CONF_ENV += ngx_force_have_libatomic=yes -ifeq ($(BR2_sparc_v8)$(BR2_sparc_leon3),y) -NGINX_CFLAGS += "-DAO_NO_SPARC_V9" -endif -else -NGINX_CONF_ENV += ngx_force_have_libatomic=no -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -NGINX_DEPENDENCIES += pcre -NGINX_CONF_OPTS += --with-pcre -else -NGINX_CONF_OPTS += --without-pcre -endif - -# modules disabled or not activated because of missing dependencies: -# - google_perftools (googleperftools) -# - http_geoip_module (geoip) -# - http_perl_module (host-perl) -# - pcre-jit (want to rebuild pcre) - -# Notes: -# * Feature/module option are *not* symetric. -# If a feature is on by default, only its --without-xxx option exists; -# if a feature is off by default, only its --with-xxx option exists. -# * The configure script fails if unknown options are passed on the command -# line. - -# misc. modules -NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_SELECT_MODULE),--with-select_module,--without-select_module) \ - $(if $(BR2_PACKAGE_NGINX_POLL_MODULE),--with-poll_module,--without-poll_module) - -ifneq ($(BR2_PACKAGE_NGINX_ADD_MODULES),) -NGINX_CONF_OPTS += \ - $(addprefix --add-module=,$(call qstrip,$(BR2_PACKAGE_NGINX_ADD_MODULES))) -endif - -# http server modules -ifeq ($(BR2_PACKAGE_NGINX_HTTP),y) -ifeq ($(BR2_PACKAGE_NGINX_HTTP_CACHE),y) -NGINX_DEPENDENCIES += openssl -else -NGINX_CONF_OPTS += --without-http-cache -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_V2_MODULE),y) -NGINX_DEPENDENCIES += zlib -NGINX_CONF_OPTS += --with-http_v2_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_SSL_MODULE),y) -NGINX_DEPENDENCIES += openssl -NGINX_CONF_OPTS += --with-http_ssl_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_XSLT_MODULE),y) -NGINX_DEPENDENCIES += libxml2 libxslt -NGINX_CONF_OPTS += --with-http_xslt_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_IMAGE_FILTER_MODULE),y) -NGINX_DEPENDENCIES += gd jpeg libpng -NGINX_CONF_OPTS += --with-http_image_filter_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_GUNZIP_MODULE),y) -NGINX_DEPENDENCIES += zlib -NGINX_CONF_OPTS += --with-http_gunzip_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_GZIP_STATIC_MODULE),y) -NGINX_DEPENDENCIES += zlib -NGINX_CONF_OPTS += --with-http_gzip_static_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_SECURE_LINK_MODULE),y) -NGINX_DEPENDENCIES += openssl -NGINX_CONF_OPTS += --with-http_secure_link_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_GZIP_MODULE),y) -NGINX_DEPENDENCIES += zlib -else -NGINX_CONF_OPTS += --without-http_gzip_module -endif - -ifeq ($(BR2_PACKAGE_NGINX_HTTP_REWRITE_MODULE),y) -NGINX_DEPENDENCIES += pcre -else -NGINX_CONF_OPTS += --without-http_rewrite_module -endif - -NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_HTTP_REALIP_MODULE),--with-http_realip_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_ADDITION_MODULE),--with-http_addition_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_SUB_MODULE),--with-http_sub_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_DAV_MODULE),--with-http_dav_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_FLV_MODULE),--with-http_flv_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_MP4_MODULE),--with-http_mp4_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_AUTH_REQUEST_MODULE),--with-http_auth_request_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_RANDOM_INDEX_MODULE),--with-http_random_index_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_DEGRADATION_MODULE),--with-http_degradation_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_STUB_STATUS_MODULE),--with-http_stub_status_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_CHARSET_MODULE),,--without-http_charset_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_SSI_MODULE),,--without-http_ssi_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_USERID_MODULE),,--without-http_userid_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_ACCESS_MODULE),,--without-http_access_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_AUTH_BASIC_MODULE),,--without-http_auth_basic_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_AUTOINDEX_MODULE),,--without-http_autoindex_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_GEO_MODULE),,--without-http_geo_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_MAP_MODULE),,--without-http_map_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_SPLIT_CLIENTS_MODULE),,--without-http_split_clients_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_REFERER_MODULE),,--without-http_referer_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_PROXY_MODULE),,--without-http_proxy_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_FASTCGI_MODULE),,--without-http_fastcgi_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_UWSGI_MODULE),,--without-http_uwsgi_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_SCGI_MODULE),,--without-http_scgi_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_MEMCACHED_MODULE),,--without-http_memcached_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_LIMIT_CONN_MODULE),,--without-http_limit_conn_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_LIMIT_REQ_MODULE),,--without-http_limit_req_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_EMPTY_GIF_MODULE),,--without-http_empty_gif_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_BROWSER_MODULE),,--without-http_browser_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_IP_HASH_MODULE),,--without-http_upstream_ip_hash_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_LEAST_CONN_MODULE),,--without-http_upstream_least_conn_module) \ - $(if $(BR2_PACKAGE_NGINX_HTTP_UPSTREAM_KEEPALIVE_MODULE),,--without-http_upstream_keepalive_module) - -else # !BR2_PACKAGE_NGINX_HTTP -NGINX_CONF_OPTS += --without-http -endif # BR2_PACKAGE_NGINX_HTTP - -# mail modules -ifeq ($(BR2_PACKAGE_NGINX_MAIL),y) -NGINX_CONF_OPTS += --with-mail - -ifeq ($(BR2_PACKAGE_NGINX_MAIL_SSL_MODULE),y) -NGINX_DEPENDENCIES += openssl -NGINX_CONF_OPTS += --with-mail_ssl_module -endif - -NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_MAIL_POP3_MODULE),,--without-mail_pop3_module) \ - $(if $(BR2_PACKAGE_NGINX_MAIL_IMAP_MODULE),,--without-mail_imap_module) \ - $(if $(BR2_PACKAGE_NGINX_MAIL_SMTP_MODULE),,--without-mail_smtp_module) - -endif # BR2_PACKAGE_NGINX_MAIL - -# stream modules -ifeq ($(BR2_PACKAGE_NGINX_STREAM),y) -NGINX_CONF_OPTS += --with-stream - -ifeq ($(BR2_PACKAGE_NGINX_STREAM_SSL_MODULE),y) -NGINX_DEPENDENCIES += openssl -NGINX_CONF_OPTS += --with-stream_ssl_module -endif - -NGINX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_NGINX_STREAM_LIMIT_CONN_MODULE),,--without-stream_limit_conn_module) \ - $(if $(BR2_PACKAGE_NGINX_STREAM_ACCESS_MODULE),,--without-stream_access_module) \ - $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_HASH_MODULE),,--without-stream_upstream_hash_module) \ - $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_LEAST_CONN_MODULE),,--without-stream_upstream_least_conn_module) \ - $(if $(BR2_PACKAGE_NGINX_STREAM_UPSTREAM_ZONE_MODULE),,--without-stream_upstream_zone_module) - -endif # BR2_PACKAGE_NGINX_STREAM - -# external modules -ifeq ($(BR2_PACKAGE_NGINX_UPLOAD),y) -NGINX_CONF_OPTS += $(addprefix --add-module=,$(NGINX_UPLOAD_DIR)) -NGINX_DEPENDENCIES += nginx-upload -endif - -ifeq ($(BR2_PACKAGE_NGINX_DAV_EXT),y) -NGINX_CONF_OPTS += --add-module=$(NGINX_DAV_EXT_DIR) -NGINX_DEPENDENCIES += nginx-dav-ext -endif - -ifeq ($(BR2_PACKAGE_NGINX_NAXSI),y) -NGINX_DEPENDENCIES += nginx-naxsi -NGINX_CONF_OPTS += --add-module=$(NGINX_NAXSI_DIR)/naxsi_src -endif - -# Debug logging -NGINX_CONF_OPTS += $(if $(BR2_PACKAGE_NGINX_DEBUG),--with-debug) - -define NGINX_DISABLE_WERROR - $(SED) 's/-Werror//g' -i $(@D)/auto/cc/* -endef - -NGINX_PRE_CONFIGURE_HOOKS += NGINX_DISABLE_WERROR - -define NGINX_CONFIGURE_CMDS - cd $(@D) ; $(NGINX_CONF_ENV) \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - GDLIB_CONFIG=$(STAGING_DIR)/usr/bin/gdlib-config \ - ./configure $(NGINX_CONF_OPTS) \ - --with-cc-opt="$(TARGET_CFLAGS) $(NGINX_CFLAGS)" -endef - -define NGINX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define NGINX_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - $(RM) $(TARGET_DIR)/usr/sbin/nginx.old - $(INSTALL) -D -m 0664 package/nginx/nginx.logrotate \ - $(TARGET_DIR)/etc/logrotate.d/nginx -endef - -define NGINX_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/nginx/nginx.service \ - $(TARGET_DIR)/usr/lib/systemd/system/nginx.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/nginx.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nginx.service -endef - -define NGINX_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/nginx/S50nginx \ - $(TARGET_DIR)/etc/init.d/S50nginx -endef - -$(eval $(generic-package)) diff --git a/package.bak/nginx/nginx.service b/package.bak/nginx/nginx.service deleted file mode 100644 index 320df9a80e..0000000000 --- a/package.bak/nginx/nginx.service +++ /dev/null @@ -1,16 +0,0 @@ -[Unit] -Description=A high performance web server and a reverse proxy server -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/nginx.pid -ExecStartPre=/usr/bin/mkdir -p /var/log/nginx /var/tmp/nginx -ExecStartPre=/usr/sbin/nginx -t -q -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecStart=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -ExecReload=/usr/sbin/nginx -g 'pid /var/run/nginx.pid; daemon on; master_process on;' -s reload -ExecStop=/usr/sbin/nginx -g 'pid /var/run/nginx.pid;' -s quit -PrivateDevices=yes - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/ngircd/Config.in b/package.bak/ngircd/Config.in deleted file mode 100644 index f1d8bea904..0000000000 --- a/package.bak/ngircd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NGIRCD - bool "ngircd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_ZLIB - help - Next Generation IRC server deamon. - - http://ngircd.barton.de diff --git a/package.bak/ngircd/ngircd.hash b/package.bak/ngircd/ngircd.hash deleted file mode 100644 index 45e2d9e825..0000000000 --- a/package.bak/ngircd/ngircd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 93f953b2785ff0e6e29b8b3794ba5a64754b86251ce71bf39fc27f4f5074eada ngircd-20.3.tar.xz diff --git a/package.bak/ngircd/ngircd.mk b/package.bak/ngircd/ngircd.mk deleted file mode 100644 index 927474c8f3..0000000000 --- a/package.bak/ngircd/ngircd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# ngircd -# -################################################################################ - -NGIRCD_VERSION = 20.3 -NGIRCD_SOURCE = ngircd-$(NGIRCD_VERSION).tar.xz -NGIRCD_SITE = http://arthur.barton.de/pub/ngircd -NGIRCD_DEPENDENCIES = zlib -NGIRCD_LICENSE = GPLv2+ -NGIRCD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/ngrep/0001-make-objs.patch b/package.bak/ngrep/0001-make-objs.patch deleted file mode 100644 index 8b55e3f456..0000000000 --- a/package.bak/ngrep/0001-make-objs.patch +++ /dev/null @@ -1,23 +0,0 @@ -ngrep: don't include regex objects since we're using pcre - -Signed-off-by: Wade Berrier - ---- ngrep-1.45/Makefile.in.orig 2006-11-28 06:35:37.000000000 -0700 -+++ ngrep-1.45/Makefile.in 2011-06-29 14:05:27.000000000 -0600 -@@ -32,13 +32,13 @@ - - INSTALL = ./install-sh - --REGEX_DIR=@REGEX_DIR@ --REGEX_OBJS=@REGEX_OBJS@ -+REGEX_DIR= -+REGEX_OBJS= - - - all: $(TARGET) - --$(TARGET): $(REGEX_OBJS) $(OBJS) -+$(TARGET): $(OBJS) - $(CC) $(CFLAGS) $(LDFLAGS) $(STRIPFLAG) -o $(TARGET) $(OBJS) $(REGEX_OBJS) $(LIBS) - - debug: $(REGEX_OBJS) $(OBJS) diff --git a/package.bak/ngrep/0002-pcre-header.patch b/package.bak/ngrep/0002-pcre-header.patch deleted file mode 100644 index 40b9234dbc..0000000000 --- a/package.bak/ngrep/0002-pcre-header.patch +++ /dev/null @@ -1,16 +0,0 @@ -ngrep: don't use versioned header - -Signed-off-by: Wade Berrier - -diff -ur ngrep-1.45/ngrep.c ngrep-1.45.mod/ngrep.c ---- ngrep-1.45/ngrep.c Tue Nov 28 15:38:43 2006 -+++ ngrep-1.45.mod/ngrep.c Sat May 19 10:21:27 2007 -@@ -92,7 +92,7 @@ - #endif - - #if USE_PCRE --#include "pcre-5.0/pcre.h" -+#include "pcre.h" - #else - #include "regex-0.12/regex.h" - #endif diff --git a/package.bak/ngrep/0003-fix-static-link.patch b/package.bak/ngrep/0003-fix-static-link.patch deleted file mode 100644 index 98c262696d..0000000000 --- a/package.bak/ngrep/0003-fix-static-link.patch +++ /dev/null @@ -1,25 +0,0 @@ -ngrep: fix static link with pcre - -Libraries must be placed after object files. - -Signed-off-by: Romain Naour ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 2ae4506..761d7d9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -11,7 +11,7 @@ CFLAGS=@CFLAGS@ -D@OS@ @DEFS@ @EXTRA_DEFINES@ - INCLUDES=-I@srcdir@ @PCAP_INCLUDE@ @EXTRA_INCLUDES@ - - LDFLAGS=@LDFLAGS@ @PCAP_LINK@ --LIBS=-lpcap @EXTRA_LIBS@ -+LIBS=@LIBS@ @EXTRA_LIBS@ - - STRIPFLAG=@STRIPFLAG@ - --- -1.8.1.4 - diff --git a/package.bak/ngrep/Config.in b/package.bak/ngrep/Config.in deleted file mode 100644 index cd91225791..0000000000 --- a/package.bak/ngrep/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_NGREP - bool "ngrep" - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_PCRE - help - Network grep. - - http://ngrep.sourceforge.net/ diff --git a/package.bak/ngrep/ngrep.hash b/package.bak/ngrep/ngrep.hash deleted file mode 100644 index e0a6a2580b..0000000000 --- a/package.bak/ngrep/ngrep.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 aea6dd337da8781847c75b3b5b876e4de9c58520e0d77310679a979fc6402fa7 ngrep-1.45.tar.bz2 diff --git a/package.bak/ngrep/ngrep.mk b/package.bak/ngrep/ngrep.mk deleted file mode 100644 index 8daaf2d8ac..0000000000 --- a/package.bak/ngrep/ngrep.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# ngrep -# -################################################################################ - -NGREP_VERSION = 1.45 -NGREP_SOURCE = ngrep-$(NGREP_VERSION).tar.bz2 -NGREP_SITE = http://downloads.sourceforge.net/project/ngrep/ngrep/$(NGREP_VERSION) -NGREP_LICENSE = BSD-4c-like -NGREP_LICENSE_FILES = LICENSE.txt -NGREP_INSTALL_STAGING = YES - -NGREP_LIBS = -lpcap -lpcre -ifeq ($(BR2_STATIC_LIBS),y) -NGREP_LIBS += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` -endif -NGREP_CONF_ENV += LIBS+="$(NGREP_LIBS)" - -NGREP_CONF_OPTS = \ - --with-pcap-includes=$(STAGING_DIR)/usr/include/pcap \ - --enable-pcre \ - --with-pcre=$(STAGING_DIR)/usr \ - --disable-dropprivs \ - --disable-pcap-restart - -NGREP_DEPENDENCIES = libpcap pcre - -$(eval $(autotools-package)) diff --git a/package.bak/ninja/ninja.hash b/package.bak/ninja/ninja.hash deleted file mode 100644 index 47ec8229b9..0000000000 --- a/package.bak/ninja/ninja.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally generated -sha256 51581de53cf4705b89eb6b14a85baa73288ad08bff256e7d30d529155813be19 ninja-v1.7.1.tar.gz diff --git a/package.bak/ninja/ninja.mk b/package.bak/ninja/ninja.mk deleted file mode 100644 index 3cfe4faf2b..0000000000 --- a/package.bak/ninja/ninja.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ninja -# -################################################################################ - -NINJA_VERSION = v1.7.1 -NINJA_SITE = $(call github,ninja-build,ninja,$(NINJA_VERSION)) -NINJA_LICENSE = Apache-2.0 -NINJA_LICENSE_FILES = COPYING - -HOST_NINJA_DEPENDENCIES = $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) - -define HOST_NINJA_BUILD_CMDS - (cd $(@D); ./configure.py --bootstrap) -endef - -define HOST_NINJA_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/ninja $(HOST_DIR)/usr/bin/ninja -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/nload/Config.in b/package.bak/nload/Config.in deleted file mode 100644 index c938d8eae8..0000000000 --- a/package.bak/nload/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -comment "nload needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_NLOAD - bool "nload" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_NCURSES - help - nload is a console application which monitors network traffic - and bandwidth usage in real time. It visualizes the in- and - outgoing traffic using two graphs and provides additional info - like total amount of transfered data and min/max network - usage. - - http://www.roland-riegel.de/nload/ diff --git a/package.bak/nload/nload.hash b/package.bak/nload/nload.hash deleted file mode 100644 index 4a8a09d394..0000000000 --- a/package.bak/nload/nload.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/nload/files/nload/0.7.4/ -md5 3c733c528f244ca5a4f76bf185729c39 nload-0.7.4.tar.gz -sha1 bb0a168c93c588ad4fd5e3a653b3620b79ada1e8 nload-0.7.4.tar.gz diff --git a/package.bak/nload/nload.mk b/package.bak/nload/nload.mk deleted file mode 100644 index 1ead61ca0f..0000000000 --- a/package.bak/nload/nload.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# nload -# -################################################################################ - -NLOAD_VERSION = 0.7.4 -NLOAD_SITE = http://www.roland-riegel.de/nload -NLOAD_DEPENDENCIES = ncurses -NLOAD_LICENSE = GPLv2+ -NLOAD_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/nmap/0001-libdnet-wrapper-configure.patch b/package.bak/nmap/0001-libdnet-wrapper-configure.patch deleted file mode 100644 index a85242ad94..0000000000 --- a/package.bak/nmap/0001-libdnet-wrapper-configure.patch +++ /dev/null @@ -1,11 +0,0 @@ -libdnet: always build a static library - -Signed-off-by: "Yann E. MORIN" - -diff --git a/libdnet-stripped/configure.gnu b/libdnet-stripped/configure.gnu ---- /dev/null -+++ b/libdnet-stripped/configure.gnu -@@ -0,0 +1,3 @@ -+#!/bin/sh -+ -+exec "${0%.gnu}" "${@}" --enable-static --disable-shared diff --git a/package.bak/nmap/Config.in b/package.bak/nmap/Config.in deleted file mode 100644 index 79f587afd1..0000000000 --- a/package.bak/nmap/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_NMAP - bool "nmap" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_PCRE - help - Nmap ("Network Mapper") is a free and open source (license) - utility for network discovery and security auditing. - - http://nmap.org - -comment "nmap needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/nmap/nmap.hash b/package.bak/nmap/nmap.hash deleted file mode 100644 index 239ca13816..0000000000 --- a/package.bak/nmap/nmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://nmap.org/dist/sigs/nmap-7.40.tar.bz2.digest.txt -sha256 9e14665fffd054554d129d62c13ad95a7b5c7a046daa2290501909e65f4d3188 nmap-7.40.tar.bz2 diff --git a/package.bak/nmap/nmap.mk b/package.bak/nmap/nmap.mk deleted file mode 100644 index 6e178b1f1f..0000000000 --- a/package.bak/nmap/nmap.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# nmap -# -################################################################################ - -NMAP_VERSION = 7.40 -NMAP_SITE = http://nmap.org/dist -NMAP_SOURCE = nmap-$(NMAP_VERSION).tar.bz2 -NMAP_DEPENDENCIES = libpcap pcre -NMAP_CONF_OPTS = --without-liblua --without-zenmap \ - --with-libdnet=included --with-liblinear=included \ - --with-libpcre="$(STAGING_DIR)/usr" --without-ncat -NMAP_LICENSE = GPLv2 -NMAP_LICENSE_FILES = COPYING - -# needed by libpcap -NMAP_LIBS_FOR_STATIC_LINK += `$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs` - -ifeq ($(BR2_STATIC_LIBS),y) -NMAP_CONF_ENV += LIBS="$(NMAP_LIBS_FOR_STATIC_LINK)" -endif - -# for 0001-libdnet-wrapper-configure.patch -define NMAP_WRAPPER_EXEC - chmod +x $(@D)/libdnet-stripped/configure.gnu -endef -NMAP_POST_PATCH_HOOKS += NMAP_WRAPPER_EXEC - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -NMAP_CONF_OPTS += --with-openssl="$(STAGING_DIR)/usr" -NMAP_DEPENDENCIES += host-pkgconf openssl -NMAP_LIBS_FOR_STATIC_LINK += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` -else -NMAP_CONF_OPTS += --without-openssl -endif - -# ndiff only works with python2.x -ifeq ($(BR2_PACKAGE_PYTHON),y) -NMAP_DEPENDENCIES += python -else -NMAP_CONF_OPTS += --without-ndiff -endif - -$(eval $(autotools-package)) diff --git a/package.bak/nmon/Config.in b/package.bak/nmon/Config.in deleted file mode 100644 index 574ced3bdf..0000000000 --- a/package.bak/nmon/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_NMON - bool "nmon" - depends on BR2_TOOLCHAIN_USES_GLIBC # fstab.h - select BR2_PACKAGE_NCURSES - help - Nmon is short for Nigel's performance Monitor for Linux - - http://nmon.sourceforge.net/pmwiki.php - -comment "nmon needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/nmon/nmon.hash b/package.bak/nmon/nmon.hash deleted file mode 100644 index f3a073ffd6..0000000000 --- a/package.bak/nmon/nmon.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From https://sourceforge.net/projects/nmon/files/ -md5 a72e3eb737c230cd309329330a5545bd lmon16f.c -sha1 b69fdddf86ffe674e0133426fa09935ed678ab7d lmon16f.c -# Locally computed -sha256 280a371e17488f8a2c5e0c64273155789be6fa5b937ab5c465488e591bdc5cd9 lmon16f.c diff --git a/package.bak/nmon/nmon.mk b/package.bak/nmon/nmon.mk deleted file mode 100644 index 9b9f889078..0000000000 --- a/package.bak/nmon/nmon.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# nmon -# -################################################################################ - -NMON_VERSION = 16f -NMON_SITE = http://sourceforge.net/projects/nmon/files -NMON_SOURCE = lmon$(NMON_VERSION).c -NMON_LICENSE = GPLv3+ -NMON_LICENSE_FILES = $(NMON_SOURCE) -NMON_DEPENDENCIES = ncurses -NMON_CFLAGS = $(TARGET_CFLAGS) -D JFS -D GETUSER -D LARGEMEM -D DEBIAN - -define NMON_EXTRACT_CMDS - cp $(DL_DIR)/$(NMON_SOURCE) $(@D) -endef - -define NMON_BUILD_CMDS - $(TARGET_CC) $(NMON_CFLAGS) $(TARGET_LDFLAGS) -o $(@D)/nmon \ - $(@D)/$(NMON_SOURCE) -lncurses -lm -endef - -define NMON_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/nmon $(TARGET_DIR)/usr/bin/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch b/package.bak/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch deleted file mode 100644 index 75fe437502..0000000000 --- a/package.bak/nodejs/0.10.48/0001-remove-python-bz2-dependency.patch +++ /dev/null @@ -1,27 +0,0 @@ -Remove dependency on Python bz2 module - -The Python bz2 module is only needed in certain cases, so only import -it when needed. In the normal nodejs build, this allows to remove the -dependency on this module. - -Signed-off-by: Thomas Petazzoni -Index: b/deps/v8/tools/js2c.py -=================================================================== ---- a/deps/v8/tools/js2c.py -+++ b/deps/v8/tools/js2c.py -@@ -33,7 +33,6 @@ - - import os, re, sys, string - import jsmin --import bz2 - - - def ToCAsciiArray(lines): -@@ -344,6 +343,7 @@ - else: - raw_sources_declaration = RAW_SOURCES_COMPRESSION_DECLARATION - if env['COMPRESSION'] == 'bz2': -+ import bz2 - all_sources = bz2.compress("".join(all_sources)) - total_length = len(all_sources) - sources_data = ToCArray(all_sources) diff --git a/package.bak/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch b/package.bak/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch deleted file mode 100644 index a2f02abf34..0000000000 --- a/package.bak/nodejs/0.10.48/0002-gyp-force-link-command-to-use-CXX.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 00d809e9305241f8636a2d75e22c493293e6971a Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 20 Apr 2014 15:03:01 +0200 -Subject: [PATCH] gyp: force link command to use CXX - -Signed-off-by: Samuel Martin ---- - tools/gyp/pylib/gyp/generator/make.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py -index 0de510e..54e4c96 100644 ---- a/tools/gyp/pylib/gyp/generator/make.py -+++ b/tools/gyp/pylib/gyp/generator/make.py -@@ -134,7 +134,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) - # special "figure out circular dependencies" flags around the entire - # input list during linking. - quiet_cmd_link = LINK($(TOOLSET)) $@ --cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) -+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) - - # We support two kinds of shared objects (.so): - # 1) shared_library, which is just bundling together many dependent libraries --- -1.9.2 - diff --git a/package.bak/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch b/package.bak/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch deleted file mode 100644 index 128058df29..0000000000 --- a/package.bak/nodejs/0.10.48/0003-fix-musl-USE-MISC-build-issue.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0bc482abeb814573251ecafb5a1e045c885b13a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 25 May 2015 16:22:57 +0200 -Subject: [PATCH 1/1] Fix musl __USE_MISC issue -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The musl C library does not define __USE_MISC and so libuv (built-in dependency) -does not use the correct struct stat definition for musl. - -The feature test macro __USE_MISC is defined by glibc if _BSD_SOURCE or -_SVID_SOURCE is defined. - -The libuv build system enables the feature test macro _GNU_SOURCE for linux -builds. - -Since glibc 2.19, defining _GNU_SOURCE also has the effect of implicitly -defining _DEFAULT_SOURCE - the replacement for _BSD_SOURCE and _SVID_SOURCE. - -In glibc versions before 2.20, defining _GNU_SOURCE also had the effect of -implicitly defining _BSD_SOURCE and _SVID_SOURCE. This is also true for uClibc. - -Alltogether, we can safely replace __USE_MISC by _GNU_SOURCE to support building -nodejs 0.10.x with the musl C library. - -Signed-off-by: Jörg Krause ---- - deps/uv/src/fs-poll.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/uv/src/fs-poll.c b/deps/uv/src/fs-poll.c -index ad27f18..094447e 100644 ---- a/deps/uv/src/fs-poll.c -+++ b/deps/uv/src/fs-poll.c -@@ -198,7 +198,7 @@ static int statbuf_eq(const uv_statbuf_t* a, const uv_statbuf_t* b) { - - /* Jump through a few hoops to get sub-second granularity on Linux. */ - # if defined(__linux__) --# if defined(__USE_MISC) /* _BSD_SOURCE || _SVID_SOURCE */ -+# if defined(_GNU_SOURCE) /* _BSD_SOURCE || _SVID_SOURCE */ - if (a->st_ctim.tv_nsec != b->st_ctim.tv_nsec) return 0; - if (a->st_mtim.tv_nsec != b->st_mtim.tv_nsec) return 0; - # else --- -2.4.1 - diff --git a/package.bak/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch b/package.bak/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch deleted file mode 100644 index 59b9d5044c..0000000000 --- a/package.bak/nodejs/0.10.48/0004-Fix-support-for-uClibc-ng.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1cc08f6ceacbb0e5ba1f4638ca3a97ac002d7792 Mon Sep 17 00:00:00 2001 -From: "Bark, Martin" -Date: Mon, 14 Dec 2015 13:26:10 +0000 -Subject: [PATCH 2/2] Fix support for uClibc-ng - -uClibc-ng is currently at v1.0.9. The patch corrects the uClibc -version test so that HAVE_IFADDRS_H is defined for uClibc versions -after v0.9.32. - -Submitted upstream to libuv and accepted, see -https://github.com/libuv/libuv/pull/653 and -https://github.com/libuv/libuv/commit/c861972 - -Signed-off-by: Bark, Martin ---- - deps/uv/src/unix/linux-core.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/deps/uv/src/unix/linux-core.c b/deps/uv/src/unix/linux-core.c -index e6e6828..6cbbb71 100644 ---- a/deps/uv/src/unix/linux-core.c -+++ b/deps/uv/src/unix/linux-core.c -@@ -39,7 +39,7 @@ - #define HAVE_IFADDRS_H 1 - - #ifdef __UCLIBC__ --# if __UCLIBC_MAJOR__ < 0 || __UCLIBC_MINOR__ < 9 || __UCLIBC_SUBLEVEL__ < 32 -+# if __UCLIBC_MAJOR__ < 0 && __UCLIBC_MINOR__ < 9 && __UCLIBC_SUBLEVEL__ < 32 - # undef HAVE_IFADDRS_H - # endif - #endif --- -2.6.2 diff --git a/package.bak/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch b/package.bak/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch deleted file mode 100644 index 5746582c14..0000000000 --- a/package.bak/nodejs/6.9.4/0001-gyp-force-link-command-to-use-CXX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 90a3c113c19ec615249ab880c45c6c0a8d369098 Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Tue, 30 Jun 2015 09:43:47 +0100 -Subject: [PATCH 2/4] gyp: force link command to use CXX - -Signed-off-by: Samuel Martin -Signed-off-by: Martin Bark -[yann.morin.1998@free.fr: adapt to 4.1.2] -Signed-off-by: "Yann E. MORIN" ---- - tools/gyp/pylib/gyp/generator/make.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/gyp/pylib/gyp/generator/make.py b/tools/gyp/pylib/gyp/generator/make.py -index b88a433..0a1f2e0 100644 ---- a/tools/gyp/pylib/gyp/generator/make.py -+++ b/tools/gyp/pylib/gyp/generator/make.py -@@ -142,7 +142,7 @@ cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^) - # special "figure out circular dependencies" flags around the entire - # input list during linking. - quiet_cmd_link = LINK($(TOOLSET)) $@ --cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) -+cmd_link = $(CXX.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS) - - # We support two kinds of shared objects (.so): - # 1) shared_library, which is just bundling together many dependent libraries --- -2.1.4 - diff --git a/package.bak/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch b/package.bak/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch deleted file mode 100644 index c07cbf8c65..0000000000 --- a/package.bak/nodejs/6.9.4/0002-inspector-don-t-build-when-ssl-support-is-disabled.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7fa541f6c0a31e3ddcab6ea85040b531bbaa4651 Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Tue, 12 Jul 2016 19:03:28 +0100 -Subject: [PATCH] inspector: don't build when ssl support is disabled - -Signed-off-by: Martin Bark ---- - node.gyp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/node.gyp b/node.gyp -index 8a8bd00..fdccd60 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -302,7 +302,7 @@ - 'deps/v8/src/third_party/vtune/v8vtune.gyp:v8_vtune' - ], - }], -- [ 'v8_inspector=="true"', { -+ [ 'v8_inspector=="true" and node_use_openssl =="true"', { - 'defines': [ - 'HAVE_INSPECTOR=1', - 'V8_INSPECTOR_USE_STL=1', -@@ -828,7 +828,7 @@ - ], - - 'conditions': [ -- ['v8_inspector=="true"', { -+ ['v8_inspector=="true" and node_use_openssl =="true"', { - 'sources': [ - 'src/inspector_socket.cc', - 'test/cctest/test_inspector_socket.cc' --- -2.7.4 - diff --git a/package.bak/nodejs/Config.in b/package.bak/nodejs/Config.in deleted file mode 100644 index b8c45f5dcd..0000000000 --- a/package.bak/nodejs/Config.in +++ /dev/null @@ -1,103 +0,0 @@ -comment "nodejs needs a toolchain w/ C++, dynamic library, threads, gcc >= 4.8, wchar" - depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel - depends on !BR2_MIPS_SOFT_FLOAT - depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_HOST_GCC_AT_LEAST_4_8 || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR - -config BR2_PACKAGE_NODEJS - bool "nodejs" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_arm || BR2_aarch64 || BR2_i386 || BR2_x86_64 || BR2_mipsel - depends on !BR2_MIPS_SOFT_FLOAT - # ARM needs BLX, so v5t+ - depends on !BR2_ARM_CPU_ARMV4 - # 0.10.x could be built without the following toolchain dependencies but - # simplify things by requiring these basic dependencies for all versions. - depends on BR2_HOST_GCC_AT_LEAST_4_8 - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - # uses dlopen(). On ARMv5, we could technically support static - # linking, but that's too much of a corner case to support it. - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ZLIB - help - Event-driven I/O server-side JavaScript environment based on V8. - - http://nodejs.org/ - -if BR2_PACKAGE_NODEJS - -# Starting with 0.12.x, on ARM, V8 (the JS engine) -# now requires an armv6+ and a VFPv2+. -config BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS - bool - # On supported architectures other than ARM, no special requirement - default y if !BR2_arm - # On ARM, at least ARMv6+ with VFPv2+ is needed - default y if !BR2_ARM_CPU_ARMV5 && BR2_ARM_CPU_HAS_VFPV2 - -config BR2_PACKAGE_NODEJS_VERSION_STRING - string - default "6.9.4" if BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS - default "0.10.48" - -config BR2_PACKAGE_NODEJS_NPM - bool "NPM for the target" - select BR2_PACKAGE_OPENSSL - help - NPM is the package manager for the Node JavaScript platform. - Note that enabling NPM on the target also selects OpenSSL for the - target. - - http://www.npmjs.org - - Note that NPM is always built for the buildroot host. - -config BR2_PACKAGE_NODEJS_MODULES_EXPRESS - bool "Express web application framework" - help - Express is a minimal and flexible node.js web application - framework, providing a robust set of features for building - single and multi-page, and hybrid web applications. - - http://www.expressjs.com - https://github.com/visionmedia/express - -config BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT - bool "CoffeeScript" - help - CoffeeScript is a little language that compiles into JavaScript. - - http://www.coffeescript.org - -config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL - string "Additional modules" - help - List of space-separated nodejs modules to install via npm. - See https://npmjs.org/ to find modules and 'npm help install' - for available installation methods. For repeatable builds, - download and save tgz files or clone git repos for the - components you care about. - - Example: serialport uglify-js@1.3.4 /my/module/mymodule.tgz git://github.com/someuser/somemodule.git#v1.2 - - This would install the serialport module (at the newest version), - the uglify-js module at 1.3.4, a module from a filesystem path, - and a module from a git repository. - -config BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS - string "Additional module dependencies" - help - List of space-separated buildroot recipes which must be built before - your npms can be installed. For example, if in 'Additional modules' - you specified 'node-curl' (see: - https://github.com/jiangmiao/node-curl), you could then specify - 'libcurl' here, to ensure that buildroot builds the libcurl package, - and does so before building your node modules. - -endif diff --git a/package.bak/nodejs/nodejs.hash b/package.bak/nodejs/nodejs.hash deleted file mode 100644 index 8c8c5a3c23..0000000000 --- a/package.bak/nodejs/nodejs.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From upstream URL: http://nodejs.org/dist/v0.10.48/SHASUMS256.txt -sha256 365a93d9acc076a0d93f087d269f376abeebccad599a9dab72f2f6ed96c8ae6e node-v0.10.48.tar.xz - -# From upstream URL: http://nodejs.org/dist/v6.9.4/SHASUMS256.txt -sha256 c51d7c61db40455d57428abcadc7eb0f0a08a8878cb1d8ea3c1e211c54532c35 node-v6.9.4.tar.xz diff --git a/package.bak/nodejs/nodejs.mk b/package.bak/nodejs/nodejs.mk deleted file mode 100644 index 042cc3fb07..0000000000 --- a/package.bak/nodejs/nodejs.mk +++ /dev/null @@ -1,182 +0,0 @@ -################################################################################ -# -# nodejs -# -################################################################################ - -NODEJS_VERSION = $(call qstrip,$(BR2_PACKAGE_NODEJS_VERSION_STRING)) -NODEJS_SOURCE = node-v$(NODEJS_VERSION).tar.xz -NODEJS_SITE = http://nodejs.org/dist/v$(NODEJS_VERSION) -NODEJS_DEPENDENCIES = host-python host-nodejs zlib \ - $(call qstrip,$(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL_DEPS)) -HOST_NODEJS_DEPENDENCIES = host-python host-zlib -NODEJS_LICENSE = MIT (core code); MIT, Apache and BSD family licenses (Bundled components) -NODEJS_LICENSE_FILES = LICENSE - -NODEJS_CONF_OPTS = \ - --without-snapshot \ - --shared-zlib \ - --without-dtrace \ - --without-etw \ - --dest-os=linux - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -NODEJS_DEPENDENCIES += openssl -NODEJS_CONF_OPTS += --shared-openssl -else -NODEJS_CONF_OPTS += --without-ssl -endif - -# 0.10.x does not have icu support -ifeq ($(findstring 0.10.,$(NODEJS_VERSION)),) -ifeq ($(BR2_PACKAGE_ICU),y) -NODEJS_DEPENDENCIES += icu -NODEJS_CONF_OPTS += --with-intl=system-icu -else -NODEJS_CONF_OPTS += --with-intl=none -endif -endif - -ifneq ($(BR2_PACKAGE_NODEJS_NPM),y) -NODEJS_CONF_OPTS += --without-npm -endif - -# nodejs build system is based on python, but only support python-2.6 or -# python-2.7. So, we have to enforce PYTHON interpreter to be python2. -define HOST_NODEJS_CONFIGURE_CMDS - # The build system directly calls python. Work around this by forcing python2 - # into PATH. See https://github.com/nodejs/node/issues/2735 - mkdir -p $(@D)/bin - ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python - - # Build with the static, built-in OpenSSL which is supplied as part of - # the nodejs source distribution. This is needed on the host because - # NPM is non-functional without it, and host-openssl isn't part of - # buildroot. - (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(HOST_DIR)/usr/bin/python2 ./configure \ - --prefix=$(HOST_DIR)/usr \ - --without-snapshot \ - --without-dtrace \ - --without-etw \ - --shared-zlib \ - $(if $(BR2_PACKAGE_NODEJS_V8_ARCH_SUPPORTS),--with-intl=none) \ - ) -endef - -define HOST_NODEJS_BUILD_CMDS - $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(MAKE) -C $(@D) \ - $(HOST_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) -endef - -define HOST_NODEJS_INSTALL_CMDS - $(HOST_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(MAKE) -C $(@D) install \ - $(HOST_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) -endef - -ifeq ($(BR2_i386),y) -NODEJS_CPU = ia32 -else ifeq ($(BR2_x86_64),y) -NODEJS_CPU = x64 -else ifeq ($(BR2_mips),y) -NODEJS_CPU = mips -else ifeq ($(BR2_mipsel),y) -NODEJS_CPU = mipsel -else ifeq ($(BR2_arm),y) -NODEJS_CPU = arm -else ifeq ($(BR2_aarch64),y) -NODEJS_CPU = arm64 -# V8 needs to know what floating point ABI the target is using. -NODEJS_ARM_FP = $(call qstrip,$(BR2_GCC_TARGET_FLOAT_ABI)) -endif - -# MIPS architecture specific options -ifeq ($(BR2_mips)$(BR2_mipsel),y) -ifeq ($(BR2_MIPS_CPU_MIPS32R6),y) -NODEJS_MIPS_ARCH_VARIANT = r6 -NODEJS_MIPS_FPU_MODE = fp64 -else ifeq ($(BR2_MIPS_CPU_MIPS32R2),y) -NODEJS_MIPS_ARCH_VARIANT = r2 -else ifeq ($(BR2_MIPS_CPU_MIPS32),y) -NODEJS_MIPS_ARCH_VARIANT = r1 -endif -endif - -define NODEJS_CONFIGURE_CMDS - mkdir -p $(@D)/bin - ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/bin/python - - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) \ - LD="$(TARGET_CXX)" \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(HOST_DIR)/usr/bin/python2 ./configure \ - --prefix=/usr \ - --dest-cpu=$(NODEJS_CPU) \ - $(if $(NODEJS_ARM_FP),--with-arm-float-abi=$(NODEJS_ARM_FP)) \ - $(if $(NODEJS_MIPS_ARCH_VARIANT),--with-mips-arch-variant=$(NODEJS_MIPS_ARCH_VARIANT)) \ - $(if $(NODEJS_MIPS_FPU_MODE),--with-mips-fpu-mode=$(NODEJS_MIPS_FPU_MODE)) \ - $(NODEJS_CONF_OPTS) \ - ) -endef - -define NODEJS_BUILD_CMDS - $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) \ - LD="$(TARGET_CXX)" -endef - -# -# Build the list of modules to install based on the booleans for -# popular modules, as well as the "additional modules" list. -# -NODEJS_MODULES_LIST= $(call qstrip,\ - $(if $(BR2_PACKAGE_NODEJS_MODULES_EXPRESS),express) \ - $(if $(BR2_PACKAGE_NODEJS_MODULES_COFFEESCRIPT),coffee-script) \ - $(BR2_PACKAGE_NODEJS_MODULES_ADDITIONAL)) - -# Define NPM for other packages to use -NPM = $(TARGET_CONFIGURE_OPTS) \ - LD="$(TARGET_CXX)" \ - npm_config_arch=$(NODEJS_CPU) \ - npm_config_target_arch=$(NODEJS_CPU) \ - npm_config_build_from_source=true \ - npm_config_nodedir=$(BUILD_DIR)/nodejs-$(NODEJS_VERSION) \ - npm_config_prefix=$(TARGET_DIR)/usr \ - $(HOST_DIR)/usr/bin/npm - -# -# We can only call NPM if there's something to install. -# -ifneq ($(NODEJS_MODULES_LIST),) -define NODEJS_INSTALL_MODULES - # If you're having trouble with module installation, adding -d to the - # npm install call below and setting npm_config_rollback=false can both - # help in diagnosing the problem. - $(NPM) install -g $(NODEJS_MODULES_LIST) -endef -endif - -define NODEJS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) PYTHON=$(HOST_DIR)/usr/bin/python2 \ - $(MAKE) -C $(@D) install \ - DESTDIR=$(TARGET_DIR) \ - $(TARGET_CONFIGURE_OPTS) \ - PATH=$(@D)/bin:$(BR_PATH) \ - LD="$(TARGET_CXX)" - $(NODEJS_INSTALL_MODULES) -endef - -# node.js configure is a Python script and does not use autotools -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/nodm/Config.in b/package.bak/nodm/Config.in deleted file mode 100644 index 97ce8c39c8..0000000000 --- a/package.bak/nodm/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_NODM - bool "nodm" - depends on BR2_PACKAGE_XORG7 - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on !BR2_TOOLCHAIN_USES_UCLIBC # needs wordexp.h - depends on BR2_USE_MMU # linux-pam - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_LINUX_PAM - help - nodm is a minimal display manager that simply logs in - as a given user and starts an X session, without asking - for username or password. - - For those cases where automatic login is needed (and - does not imply a security issue), nodm is simple to setup, - lightweight, and it should do exactly the right thing. - - https://github.com/spanezz/nodm/ - -comment "nodm needs a glibc toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_XORG7 - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL \ - || BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package.bak/nodm/S90nodm b/package.bak/nodm/S90nodm deleted file mode 100755 index a966e839f5..0000000000 --- a/package.bak/nodm/S90nodm +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/sh -# -# Starts nodm -# - -NODM_FIRST_VT=7 -NODM_XSESSION=/etc/X11/Xsession -NODM_OPTIONS= -NODM_X_OPTIONS="-nolisten tcp" -NODM_USER=root -NODM_MIN_SESSION_TIME=60 -NODM_X_TIMEOUT=300 - -[ -r /etc/default/nodm ] && . /etc/default/nodm - -export NODM_XSESSION NODM_X_OPTIONS NODM_USER NODM_MIN_SESSION_TIME NODM_FIRST_VT NODM_X_TIMEOUT - -start() { - printf "Starting nodm: " - start-stop-daemon -S -q -p /var/run/nodm.pid --exec /usr/sbin/nodm -b -m -S -- ${NODM_OPTIONS} - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping nodm: " - start-stop-daemon -K -q -p /var/run/nodm.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - sleep 1 - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/nodm/nodm.hash b/package.bak/nodm/nodm.hash deleted file mode 100644 index e11e87563e..0000000000 --- a/package.bak/nodm/nodm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally calculated -sha256 840939d27d3d9b02ad09e1cffce24729bcdeee6cea6b3f0037d8ae76b49feecd nodm-0.12-1.tar.gz diff --git a/package.bak/nodm/nodm.mk b/package.bak/nodm/nodm.mk deleted file mode 100644 index da6bc8503c..0000000000 --- a/package.bak/nodm/nodm.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# nodm -# -################################################################################ - -NODM_VERSION = 0.12-1 -NODM_SITE = $(call github,spanezz,nodm,debian/$(NODM_VERSION)) -NODM_LICENSE = GPLv2+ -NODM_LICENSE_FILES = COPYING -NODM_AUTORECONF = YES - -NODM_DEPENDENCIES = xlib_libX11 linux-pam - -# help2man doesn't work when cross compiling -define NODM_DISABLE_HELP2MAN - $(SED) 's/help2man/true/' $(@D)/Makefile.am -endef - -NODM_POST_PATCH_HOOKS += NODM_DISABLE_HELP2MAN - -define NODM_INSTALL_PAM - $(INSTALL) -D -m 0644 package/nodm/nodm.pam \ - $(TARGET_DIR)/etc/pam.d/nodm -endef - -NODM_POST_INSTALL_TARGET_HOOKS += NODM_INSTALL_PAM - -define NODM_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/nodm/S90nodm \ - $(TARGET_DIR)/etc/init.d/S90nodm -endef - -$(eval $(autotools-package)) diff --git a/package.bak/nodm/nodm.pam b/package.bak/nodm/nodm.pam deleted file mode 100644 index f2cf43217a..0000000000 --- a/package.bak/nodm/nodm.pam +++ /dev/null @@ -1,14 +0,0 @@ -# Log service and allow promiscuously -# -auth required pam_warn.so -auth required pam_unix.so - -account required pam_warn.so -account required pam_permit.so - -password required pam_warn.so -password required pam_permit.so - -session required pam_warn.so -session required pam_permit.so -session required pam_env.so diff --git a/package.bak/noip/Config.in b/package.bak/noip/Config.in deleted file mode 100644 index aea5deb99b..0000000000 --- a/package.bak/noip/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_NOIP - bool "noip" - depends on BR2_USE_MMU # fork() - help - Dynamic DNS update client for no-ip.com - - http://www.no-ip.com/downloads.php diff --git a/package.bak/noip/noip.hash b/package.bak/noip/noip.hash deleted file mode 100644 index 166438db48..0000000000 --- a/package.bak/noip/noip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 82b9bafab96a0c53b21aaef688bf70b3572e26217b5e2072bdb09da3c4a6f593 noip-duc-linux.tar.gz diff --git a/package.bak/noip/noip.mk b/package.bak/noip/noip.mk deleted file mode 100644 index a61d141832..0000000000 --- a/package.bak/noip/noip.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# noip -# -################################################################################ - -NOIP_VERSION = 2.1.9 -NOIP_SITE = http://www.no-ip.com/client/linux -NOIP_SOURCE = noip-duc-linux.tar.gz -NOIP_LICENSE = GPLv2+ -NOIP_LICENSE_FILES = COPYING - -define NOIP_BUILD_CMDS - $(SED) "/^#define CONFIG_FILENAME/ s/PREFIX//" $(@D)/noip2.c - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" PREFIX=/usr CONFDIR=/etc -endef - -define NOIP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/noip2 $(TARGET_DIR)/usr/sbin/noip2 -endef - -$(eval $(generic-package)) diff --git a/package.bak/norm/0001-fix-bigendian-build.patch b/package.bak/norm/0001-fix-bigendian-build.patch deleted file mode 100644 index cf999c27cf..0000000000 --- a/package.bak/norm/0001-fix-bigendian-build.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix big-endian build breakage in protolib. -Patch status: submitted to author via email. - -Signed-off-by: Gustavo Zacarias - -diff -Nura norm-1.5r6.orig/protolib/include/protoSpace.h norm-1.5r6/protolib/include/protoSpace.h ---- norm-1.5r6.orig/protolib/include/protoSpace.h 2016-03-08 19:48:21.326357963 -0300 -+++ norm-1.5r6/protolib/include/protoSpace.h 2016-03-08 19:48:46.647234075 -0300 -@@ -89,7 +89,7 @@ - } - #else - ProtoTree::Endian GetEndian() const -- return ProtoTree::ENDIAN_BIG; -+ {return ProtoTree::ENDIAN_BIG;} - void SetNode(Node* theNode) - {memcpy(key+sizeof(double), &theNode, sizeof(Node*));} - Node* GetNode() const diff --git a/package.bak/norm/0002-protolib-drop-linux-version-check.patch b/package.bak/norm/0002-protolib-drop-linux-version-check.patch deleted file mode 100644 index 7852a30a37..0000000000 --- a/package.bak/norm/0002-protolib-drop-linux-version-check.patch +++ /dev/null @@ -1,38 +0,0 @@ -The char * to unsigned char * change happened for the libnetfilter_queue -1.0.0 release, not the linux headers. -So drop the linux headers version check since it causes more harm than -good by trying the old API when the toolchain uses old linux headers -with a new-enough libnetfilter_queue. - -Signed-off-by: Gustavo Zacarias - -diff -Nura norm-1.5r6.orig/protolib/src/linux/linuxDetour.cpp norm-1.5r6/protolib/src/linux/linuxDetour.cpp ---- norm-1.5r6.orig/protolib/src/linux/linuxDetour.cpp 2016-03-31 10:17:20.674745597 -0300 -+++ norm-1.5r6/protolib/src/linux/linuxDetour.cpp 2016-03-31 10:36:58.923084395 -0300 -@@ -16,8 +16,6 @@ - #include // for ETH_P_IP - #include // for ARPHRD_ETHER - --#include // for LINUX_VERSION_CODE -- - /** NOTES: - * - * 1) This newer implementation of LinuxDetour uses netfilter_queue -@@ -591,17 +589,7 @@ - - // Finally record packet length and cache pointer to IP packet data - -- // A change to the nfq_get_payload() prototype seemed to kick in around Linux header files -- // version 3.6? (This will probably need to be fine tuned for the right version threshold.) -- --#define LINUX_VERSION_MAJOR (LINUX_VERSION_CODE/65536) --#define LINUX_VERSION_MINOR ((LINUX_VERSION_CODE - (LINUX_VERSION_MAJOR*65536)) / 256) -- --#if ((LINUX_VERSION_MAJOR > 3) || ((LINUX_VERSION_MAJOR == 3) && (LINUX_VERSION_MINOR > 5))) - linuxDetour->nfq_pkt_len = nfq_get_payload(nfqData, (unsigned char**)(&linuxDetour->nfq_pkt_data)); --#else -- linuxDetour->nfq_pkt_len = nfq_get_payload(nfqData, &linuxDetour->nfq_pkt_data); --#endif // - return 0; - } // end LinuxDetour::NfqCallback() - diff --git a/package.bak/norm/Config.in b/package.bak/norm/Config.in deleted file mode 100644 index 494463344c..0000000000 --- a/package.bak/norm/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -comment "norm needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_NORM - bool "norm" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - The NORM protocol is designed to provide end-to-end reliable - transport of bulk data objects or streams over generic IP - multicast routing and forwarding services. - - http://www.nrl.navy.mil/itd/ncs/products/norm diff --git a/package.bak/norm/norm.hash b/package.bak/norm/norm.hash deleted file mode 100644 index 4693eed6bf..0000000000 --- a/package.bak/norm/norm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 20ea2e8dd5d5e1ff1ff91dc7dab6db53a77d7b7183d8cf2425c215fd294f22a7 src-norm-1.5r6.tgz diff --git a/package.bak/norm/norm.mk b/package.bak/norm/norm.mk deleted file mode 100644 index 8af76f8345..0000000000 --- a/package.bak/norm/norm.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# norm -# -################################################################################ - -NORM_VERSION = 1.5r6 -NORM_SITE = http://downloads.pf.itd.nrl.navy.mil/norm/archive -NORM_SOURCE = src-norm-$(NORM_VERSION).tgz -NORM_INSTALL_STAGING = YES -NORM_LICENSE = NRL License -NORM_LICENSE_FILES = LICENSE.TXT - -ifeq ($(BR2_PACKAGE_LIBNETFILTER_QUEUE),y) -NORM_DEPENDENCIES += libnetfilter_queue -endif - -# install target doesn't install headers unfortunately... -define NORM_INSTALL_HEADERS - cp -f $(@D)/include/norm* $(STAGING_DIR)/usr/include -endef -NORM_POST_INSTALL_STAGING_HOOKS += NORM_INSTALL_HEADERS - -$(eval $(waf-package)) diff --git a/package.bak/nss-mdns/Config.in b/package.bak/nss-mdns/Config.in deleted file mode 100644 index ad69e2aa4c..0000000000 --- a/package.bak/nss-mdns/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_NSS_MDNS - bool "nss-mdns" - # libdaemon->avahi uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_AVAHI_DAEMON - help - nss-mdns is a plugin for the GNU Name Service Switch (NSS) - functionality of the GNU C Library (glibc) providing host - name resolution via Multicast DNS (aka Zeroconf, aka Apple - Rendezvous, aka Apple Bonjour), effectively allowing name - resolution by common Unix/Linux programs in the ad-hoc - mDNS domain .local. - - http://0pointer.de/lennart/projects/nss-mdns/ - -comment "nss-mdns needs a glibc toolchain" - depends on BR2_USE_MMU && BR2_PACKAGE_AVAHI_DAEMON - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/nss-mdns/nss-mdns.hash b/package.bak/nss-mdns/nss-mdns.hash deleted file mode 100644 index 169c497bbe..0000000000 --- a/package.bak/nss-mdns/nss-mdns.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1e683c2e7c3921814706d62fbbd3e9cbf493a75fa00255e0e715508d8134fa6d nss-mdns-0.10.tar.gz diff --git a/package.bak/nss-mdns/nss-mdns.mk b/package.bak/nss-mdns/nss-mdns.mk deleted file mode 100644 index 9ec9c1af43..0000000000 --- a/package.bak/nss-mdns/nss-mdns.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# nss-mdns -# -################################################################################ - -NSS_MDNS_VERSION = 0.10 -NSS_MDNS_SITE = http://0pointer.de/lennart/projects/nss-mdns -NSS_MDNS_LICENSE = LGPLv2.1+ -NSS_MDNS_LICENSE_FILES = LICENSE - -define NSS_MDNS_INSTALL_CONFIG - if [ ! -f "$(TARGET_DIR)/etc/nsswitch.conf" ]; then \ - $(INSTALL) -D -m 0644 package/glibc/nsswitch.conf $(TARGET_DIR)/etc/nsswitch.conf ; \ - fi - sed -r -i -e 's/^(hosts:[[:space:]]+).*/\1files mdns4_minimal [NOTFOUND=return] dns mdns4/' \ - $(TARGET_DIR)/etc/nsswitch.conf -endef - -NSS_MDNS_POST_INSTALL_TARGET_HOOKS += NSS_MDNS_INSTALL_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/nss-pam-ldapd/Config.in b/package.bak/nss-pam-ldapd/Config.in deleted file mode 100644 index 233f21365c..0000000000 --- a/package.bak/nss-pam-ldapd/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_NSS_PAM_LDAPD - bool "nss-pam-ldapd" - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_OPENLDAP - help - Name Service Switch (NSS) module that allows your LDAP - server to provide user account, group, host name, alias, - netgroup, and basically any other information that you would - normally get from /etc flat files or NIS. It also provides a - Pluggable Authentication Module (PAM) to do authentication - to an LDAP server. - - http://arthurdejong.org/nss-pam-ldapd/ - -if BR2_PACKAGE_NSS_PAM_LDAPD - -config BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES - bool "nss-pam-ldapd utilities" - help - Build/Install command-line utilities. - -endif - -comment "nss-pam-ldapd needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/nss-pam-ldapd/S45nslcd b/package.bak/nss-pam-ldapd/S45nslcd deleted file mode 100644 index cd3e4d0f20..0000000000 --- a/package.bak/nss-pam-ldapd/S45nslcd +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -NAME="nslcd" -DAEMON="/usr/sbin/${NAME}" - -case "$1" in -start) - echo -n "Starting ${NAME}: " - start-stop-daemon -S -x ${DAEMON} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -stop) - echo -n "Stopping ${NAME}: " - start-stop-daemon -K -x ${DAEMON} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -restart|reload) - $0 stop - $0 start - ;; -*) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - diff --git a/package.bak/nss-pam-ldapd/nslcd.service b/package.bak/nss-pam-ldapd/nslcd.service deleted file mode 100644 index 6c0d71b241..0000000000 --- a/package.bak/nss-pam-ldapd/nslcd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Naming services LDAP client daemon. -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/nslcd/nslcd.pid -ExecStart=/usr/sbin/nslcd - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/nss-pam-ldapd/nss-pam-ldapd.hash b/package.bak/nss-pam-ldapd/nss-pam-ldapd.hash deleted file mode 100644 index b931e6fc12..0000000000 --- a/package.bak/nss-pam-ldapd/nss-pam-ldapd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://arthurdejong.org/nss-pam-ldapd/nss-pam-ldapd-0.9.6.tar.gz.md5 -md5 fa5ec49cb54428d6c73e244a11021695 nss-pam-ldapd-0.9.6.tar.gz -# Locally computed: -sha256 101d5a7fa10549cc77be48d07f2b8141f59182f10f2cc0fea93efd13c3a5a6f2 nss-pam-ldapd-0.9.5.tar.gz diff --git a/package.bak/nss-pam-ldapd/nss-pam-ldapd.mk b/package.bak/nss-pam-ldapd/nss-pam-ldapd.mk deleted file mode 100644 index ba250829bb..0000000000 --- a/package.bak/nss-pam-ldapd/nss-pam-ldapd.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# nss-pam-ldapd -# -################################################################################ - -NSS_PAM_LDAPD_VERSION = 0.9.6 -NSS_PAM_LDAPD_SITE = http://arthurdejong.org/nss-pam-ldapd -NSS_PAM_LDAPD_LICENSE = LGPLv2.1+ -NSS_PAM_LDAPD_LICENSE_FILES = COPYING -NSS_PAM_LDAPD_INSTALL_STAGING = YES - -NSS_PAM_LDAPD_CONF_OPTS = --disable-sasl -NSS_PAM_LDAPD_DEPENDENCIES = openldap - -ifeq ($(BR2_PACKAGE_NSS_PAM_LDAPD_UTILITIES),y) -NSS_PAM_LDAPD_CONF_OPTS += --enable-utils -else -NSS_PAM_LDAPD_CONF_OPTS += --disable-utils -endif - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -NSS_PAM_LDAPD_CONF_OPTS += --enable-pam -NSS_PAM_LDAPD_DEPENDENCIES += linux-pam -else -NSS_PAM_LDAPD_CONF_OPTS += --disable-pam -endif - -define NSS_PAM_LDAPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 755 -D package/nss-pam-ldapd/nslcd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/nslcd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/nslcd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nslcd.service -endef - -define NSS_PAM_LDAPD_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/nss-pam-ldapd/S45nslcd \ - $(TARGET_DIR)/etc/init.d/S45nslcd -endef - -define NSS_PAM_LDAPD_USERS - nslcd -1 nslcd -1 * - - - nslcd user -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch b/package.bak/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch deleted file mode 100644 index 1765f68c89..0000000000 --- a/package.bak/ntfs-3g/0001-libfuse-util-include-paths.h-when-needed.patch +++ /dev/null @@ -1,43 +0,0 @@ -From da021ed297ff7a69f3b7532ef68a9b6877a55265 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 20 Aug 2016 11:05:27 +0200 -Subject: [PATCH] libfuse-util: include when needed - -Both fusermount.c and mount_util.c use _PATH_MOUNTED, so they should -include , which provides this definition. - -This fixes the build with the musl C library. - -Signed-off-by: Thomas Petazzoni ---- - libfuse-lite/fusermount.c | 1 + - libfuse-lite/mount_util.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libfuse-lite/fusermount.c b/libfuse-lite/fusermount.c -index 4e724db..680fee1 100644 ---- a/libfuse-lite/fusermount.c -+++ b/libfuse-lite/fusermount.c -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - #ifdef __SOLARIS__ - #include -diff --git a/libfuse-lite/mount_util.c b/libfuse-lite/mount_util.c -index 8ea5e08..8b31722 100644 ---- a/libfuse-lite/mount_util.c -+++ b/libfuse-lite/mount_util.c -@@ -15,6 +15,7 @@ - #include - #include - #include -+#include - #include - #include - #ifdef __SOLARIS__ --- -2.7.4 - diff --git a/package.bak/ntfs-3g/Config.in b/package.bak/ntfs-3g/Config.in deleted file mode 100644 index b9f7eafc9e..0000000000 --- a/package.bak/ntfs-3g/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_NTFS_3G - bool "ntfs-3g" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on !BR2_STATIC_LIBS - help - The NTFS-3G driver is an open source, freely available - read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD, - and Haiku. It provides safe and fast handling of the Windows - XP, Windows Server 2003, Windows 2000 and Windows Vista file - systems. Most POSIX file system operations are supported, with - the exception of full file ownership and access right support. - - http://www.ntfs-3g.org/ - -if BR2_PACKAGE_NTFS_3G - -config BR2_PACKAGE_NTFS_3G_ENCRYPTED - bool "encrypted volumes" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT - help - Enable support for NTFS encrypted volumes. - -config BR2_PACKAGE_NTFS_3G_NTFSPROGS - bool "ntfsprogs" - help - Install NTFS utilities. - -endif - -comment "ntfs-3g needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ntfs-3g/ntfs-3g.hash b/package.bak/ntfs-3g/ntfs-3g.hash deleted file mode 100644 index eaa3d98718..0000000000 --- a/package.bak/ntfs-3g/ntfs-3g.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 d7b72c05e4b3493e6095be789a760c9f5f2b141812d5b885f3190c98802f1ea0 ntfs-3g_ntfsprogs-2016.2.22.tgz -sha256 43deadaeade489934b0b45e2ed8aa5f853ad0364fbde7ad144211b80132ea041 0003-CVE-2017-0358.patch diff --git a/package.bak/ntfs-3g/ntfs-3g.mk b/package.bak/ntfs-3g/ntfs-3g.mk deleted file mode 100644 index 6e1a8f9460..0000000000 --- a/package.bak/ntfs-3g/ntfs-3g.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# ntfs-3g -# -################################################################################ - -NTFS_3G_VERSION = 2016.2.22 -NTFS_3G_SOURCE = ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION).tgz -NTFS_3G_SITE = http://tuxera.com/opensource -NTFS_3G_PATCH = https://sources.debian.net/data/main/n/ntfs-3g/1:2016.2.22AR.1-4/debian/patches/0003-CVE-2017-0358.patch -NTFS_3G_CONF_OPTS = --disable-ldconfig -NTFS_3G_INSTALL_STAGING = YES -NTFS_3G_DEPENDENCIES = host-pkgconf -NTFS_3G_LICENSE = GPLv2+, LGPLv2+ -NTFS_3G_LICENSE_FILES = COPYING COPYING.LIB - -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -NTFS_3G_CONF_OPTS += --with-fuse=external -NTFS_3G_DEPENDENCIES += libfuse -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -NTFS_3G_DEPENDENCIES += util-linux -endif - -ifeq ($(BR2_PACKAGE_NTFS_3G_ENCRYPTED),y) -NTFS_3G_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -NTFS_3G_CONF_OPTS += --enable-crypto -NTFS_3G_DEPENDENCIES += gnutls libgcrypt -endif - -ifneq ($(BR2_PACKAGE_NTFS_3G_NTFSPROGS),y) -NTFS_3G_CONF_OPTS += --disable-ntfsprogs -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ntp/0001-nano.patch b/package.bak/ntp/0001-nano.patch deleted file mode 100644 index bce3478261..0000000000 --- a/package.bak/ntp/0001-nano.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixes issues with glibc header files, see -http://bugs.gentoo.org/show_bug.cgi?id=270483 - -Signed-off-by: Gustavo Zacarias - -Rebase to apply cleanly. - -Signed-off-by: Danomi Manchego - - -diff -purN a/include/ntp_syscall.h b/include/ntp_syscall.h ---- a/include/ntp_syscall.h 2015-02-11 08:42:37.794576469 -0500 -+++ b/include/ntp_syscall.h 2015-02-11 08:43:03.216957279 -0500 -@@ -10,6 +10,14 @@ - # include - #endif - -+#if defined(ADJ_NANO) && !defined(MOD_NANO) -+#define MOD_NANO ADJ_NANO -+#endif -+ -+#if defined(ADJ_TAI) && !defined(MOD_TAI) -+#define MOD_TAI ADJ_TAI -+#endif -+ - #ifndef NTP_SYSCALLS_LIBC - # ifdef NTP_SYSCALLS_STD - # define ntp_adjtime(t) syscall(SYS_ntp_adjtime, (t)) diff --git a/package.bak/ntp/0002-ntp-syscalls-fallback.patch b/package.bak/ntp/0002-ntp-syscalls-fallback.patch deleted file mode 100644 index 535fc93dfd..0000000000 --- a/package.bak/ntp/0002-ntp-syscalls-fallback.patch +++ /dev/null @@ -1,27 +0,0 @@ -inline ntp syscalls fallback - -Reference: - https://bugs.ntp.org/show_bug.cgi?id=769 - -Signed-off-by: James Knight ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -1523,11 +1523,11 @@ AC_CACHE_CHECK( - [ntp_cv_var_ntp_syscalls], - [ - ntp_cv_var_ntp_syscalls=no -- case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime$ac_cv_func___adjtimex" in -+ case "$ac_cv_func_ntp_adjtime$ac_cv_func_ntp_gettime$ac_cv_func___adjtimex$ac_cv_func_adjtimex" in - yesyes*) - ntp_cv_var_ntp_syscalls=libc - ;; -- *yes) -+ *yesyes | *yesno | *noyes) - ntp_cv_var_ntp_syscalls=inline - ;; - *) diff --git a/package.bak/ntp/Config.in b/package.bak/ntp/Config.in deleted file mode 100644 index 1af02dbc0b..0000000000 --- a/package.bak/ntp/Config.in +++ /dev/null @@ -1,96 +0,0 @@ -config BR2_PACKAGE_NTP - bool "ntp" - select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_OPENSSL - help - Network Time Protocol suite/programs. - Provides things like ntpd, ntpdate, ntpq, etc... - - http://www.ntp.org/ - -if BR2_PACKAGE_NTP - -config BR2_PACKAGE_NTP_SNTP - bool "sntp" - help - Simple network time protocol program - -config BR2_PACKAGE_NTP_NTP_KEYGEN - bool "ntp-keygen" - help - Create a NTP host key - -config BR2_PACKAGE_NTP_NTP_SHM_CLK - bool "SHM clock support" - help - Compile ntp with support for a SHM clock attached through - shared memory. - -config BR2_PACKAGE_NTP_NTP_WAIT - bool "ntp-wait" - depends on BR2_PACKAGE_PERL - help - ntp-wait waits until the locally running ntpd is in state 4 - (synchronized). This could be useful at boot time, to delay the - boot sequence until after "ntpd -g" has set the time. - -config BR2_PACKAGE_NTP_NTPD - bool "ntpd" - default y - help - ntpd is the time synchronization daemon keeping your local - system date and time in sync and optionally serving time and date - information on the network via the NTP protocol. - -config BR2_PACKAGE_NTP_NTPD_ATOM_PPS - bool "PPS support" - depends on BR2_PACKAGE_NTP_NTPD - select BR2_PACKAGE_PPS_TOOLS - help - Compile ntpd with the ability to use an ATOM PPS source. - -config BR2_PACKAGE_NTP_NTPDATE - bool "ntpdate" - help - The ntpdate utility program is used to set the local date and time - from an NTP server given as an argument. - -config BR2_PACKAGE_NTP_NTPDC - bool "ntpdc" - help - The ntpdc utility program is used to query an NTP daemon about - its current state and to request changes in that state. - -config BR2_PACKAGE_NTP_NTPQ - bool "ntpq" - help - The ntpq utility program is used to query NTP servers requesting - information about current state and/or changes in that state. - -config BR2_PACKAGE_NTP_NTPSNMPD - bool "ntpsnmpd" - depends on BR2_USE_MMU # netsnmp fork() - select BR2_PACKAGE_NETSNMP - help - Install ntpsnmpd NTP SNMP MIB agent. - -config BR2_PACKAGE_NTP_NTPTIME - bool "ntptime" - help - The ntptime utility program is used to read and set kernel time - variables. - -config BR2_PACKAGE_NTP_NTPTRACE - bool "ntptrace" - depends on BR2_PACKAGE_PERL - help - ntptrace is a perl script that uses the ntpq utility program to - follow the chain of NTP servers from a given host back to the - primary time source - -config BR2_PACKAGE_NTP_TICKADJ - bool "tickadj" - help - set time-related kernel variables - -endif diff --git a/package.bak/ntp/S49ntp b/package.bak/ntp/S49ntp deleted file mode 100755 index b4047fceda..0000000000 --- a/package.bak/ntp/S49ntp +++ /dev/null @@ -1,38 +0,0 @@ -#! /bin/sh - -NAME=ntpd -DAEMON=/usr/sbin/$NAME - -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - -# Read config file if it is present. -if [ -r /etc/default/$NAME ] -then - . /etc/default/$NAME -fi - -case "$1" in - start) - printf "Starting $NAME: " - start-stop-daemon -S -q -x $DAEMON -- -g - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping $NAME: " - start-stop-daemon -K -q -n $NAME - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - echo "Restarting $NAME: " - $0 stop - sleep 1 - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/ntp/ntp.hash b/package.bak/ntp/ntp.hash deleted file mode 100644 index c6838d812f..0000000000 --- a/package.bak/ntp/ntp.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p9.tar.gz.md5 -md5 857452b05f5f2e033786f77ade1974ed ntp-4.2.8p9.tar.gz -# Calculated based on the hash above -sha256 b724287778e1bac625b447327c9851eedef020517a3545625e9f652a90f30b72 ntp-4.2.8p9.tar.gz diff --git a/package.bak/ntp/ntp.mk b/package.bak/ntp/ntp.mk deleted file mode 100644 index edbf1c86b6..0000000000 --- a/package.bak/ntp/ntp.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# ntp -# -################################################################################ - -NTP_VERSION_MAJOR = 4.2 -NTP_VERSION = $(NTP_VERSION_MAJOR).8p9 -NTP_SITE = http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-$(NTP_VERSION_MAJOR) -NTP_DEPENDENCIES = host-pkgconf libevent openssl $(if $(BR2_PACKAGE_BUSYBOX),busybox) -NTP_LICENSE = ntp license -NTP_LICENSE_FILES = COPYRIGHT -NTP_CONF_ENV = ac_cv_lib_md5_MD5Init=no -NTP_CONF_OPTS = \ - --with-shared \ - --program-transform-name=s,,, \ - --disable-tickadj \ - --disable-debugging \ - --with-yielding-select=yes \ - --disable-local-libevent \ - --with-crypto - -# 0002-ntp-syscalls-fallback.patch -NTP_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -NTP_CONF_OPTS += --enable-linuxcaps -NTP_DEPENDENCIES += libcap -else -NTP_CONF_OPTS += --disable-linuxcaps -endif - -ifeq ($(BR2_PACKAGE_LIBEDIT),y) -NTP_CONF_OPTS += --with-lineeditlibs=edit -NTP_DEPENDENCIES += libedit -else -NTP_CONF_OPTS += --without-lineeditlibs -endif - -ifeq ($(BR2_PACKAGE_NTP_NTPSNMPD),y) -NTP_CONF_OPTS += \ - --with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config -NTP_DEPENDENCIES += netsnmp -else -NTP_CONF_OPTS += --without-ntpsnmpd -endif - -ifeq ($(BR2_PACKAGE_NTP_NTPD_ATOM_PPS),y) -NTP_CONF_OPTS += --enable-ATOM -NTP_DEPENDENCIES += pps-tools -else -NTP_CONF_OPTS += --disable-ATOM -endif - -ifeq ($(BR2_PACKAGE_NTP_NTP_SHM_CLK),y) -NTP_CONF_OPTS += --enable-SHM -else -NTP_CONF_OPTS += --disable-SHM -endif - -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_KEYGEN) += util/ntp-keygen -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTP_WAIT) += scripts/ntp-wait/ntp-wait -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDATE) += ntpdate/ntpdate -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPDC) += ntpdc/ntpdc -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPQ) += ntpq/ntpq -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPSNMPD) += ntpsnmpd/ntpsnmpd -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPTIME) += util/ntptime -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_NTPTRACE) += scripts/ntptrace/ntptrace -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_SNTP) += sntp/sntp -NTP_INSTALL_FILES_$(BR2_PACKAGE_NTP_TICKADJ) += util/tickadj - -define NTP_INSTALL_TARGET_CMDS - $(if $(BR2_PACKAGE_NTP_NTPD), install -m 755 $(@D)/ntpd/ntpd $(TARGET_DIR)/usr/sbin/ntpd) - test -z "$(NTP_INSTALL_FILES_y)" || install -m 755 $(addprefix $(@D)/,$(NTP_INSTALL_FILES_y)) $(TARGET_DIR)/usr/bin/ - $(INSTALL) -m 644 package/ntp/ntpd.etc.conf $(TARGET_DIR)/etc/ntp.conf -endef - -ifeq ($(BR2_PACKAGE_NTP_NTPD),y) -define NTP_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/ntp/S49ntp $(TARGET_DIR)/etc/init.d/S49ntp -endef - -define NTP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/ntp/ntpd.service $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service -endef -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ntp/ntpd.etc.conf b/package.bak/ntp/ntpd.etc.conf deleted file mode 100644 index c451aa9bb2..0000000000 --- a/package.bak/ntp/ntpd.etc.conf +++ /dev/null @@ -1,10 +0,0 @@ -server 0.pool.ntp.org iburst -server 1.pool.ntp.org iburst -server 2.pool.ntp.org iburst -server 3.pool.ntp.org iburst - -# Allow only time queries, at a limited rate, sending KoD when in excess. -# Allow all local queries (IPv4, IPv6) -restrict default nomodify nopeer noquery limited kod -restrict 127.0.0.1 -restrict [::1] diff --git a/package.bak/ntp/ntpd.service b/package.bak/ntp/ntpd.service deleted file mode 100644 index 7964c5389b..0000000000 --- a/package.bak/ntp/ntpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Network Time Service -After=network.target - -[Service] -Type=forking -PIDFile=/run/ntpd.pid -ExecStart=/usr/sbin/ntpd -g -p /run/ntpd.pid - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/numactl/Config.in b/package.bak/numactl/Config.in deleted file mode 100644 index f18e28d9ff..0000000000 --- a/package.bak/numactl/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_NUMACTL - bool "numactl" - # numactl uses some system calls that are not available on all - # architectures. - depends on BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || BR2_x86_64 - help - numactl allows you to run your application on specific cpus - and memory nodes. It does this by supplying a NUMA memory - policy to the operating system before running your program. - - http://oss.sgi.com/projects/libnuma/ diff --git a/package.bak/numactl/numactl.hash b/package.bak/numactl/numactl.hash deleted file mode 100644 index 77ccfae6fd..0000000000 --- a/package.bak/numactl/numactl.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally calculated -sha256 450c091235f891ee874a8651b179c30f57a1391ca5c4673354740ba65e527861 numactl-2.0.11.tar.gz -sha256 1f4c813cc8c81fa4dfd0be959457a5c3de8fc3316bbc80de3aa1d9ef9992b2b6 3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch -sha256 0c4cb6550b46976f2a21087490420b218e62ead7d9b178120ad782d53a7ad3a6 31dc2951c758698bff060aeae8ffd8854616183b.patch diff --git a/package.bak/numactl/numactl.mk b/package.bak/numactl/numactl.mk deleted file mode 100644 index e2d2590cde..0000000000 --- a/package.bak/numactl/numactl.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# numactl -# -################################################################################ - -NUMACTL_VERSION = 2.0.11 -NUMACTL_SITE = ftp://oss.sgi.com/www/projects/libnuma/download -NUMACTL_PATCH = \ - https://github.com/numactl/numactl/commit/3770bdc4fa7b9059db5cd2aa8bb09b50fa15e456.patch \ - https://github.com/numactl/numactl/commit/31dc2951c758698bff060aeae8ffd8854616183b.patch -NUMACTL_LICENSE = LGPLv2.1 (libnuma), GPLv2 (programs) -NUMACTL_LICENSE_FILES = README -NUMACTL_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch b/package.bak/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch deleted file mode 100644 index 308dbb1aa2..0000000000 --- a/package.bak/nut/0001-Allow-to-customize-path-to-gdlib-config-and-net-snmp.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 086b5fa8fe4ba74404e92b5f838263dfcf9f173d Mon Sep 17 00:00:00 2001 -From: Jim Klimov -Date: Thu, 7 Apr 2016 03:56:51 +0200 -Subject: [PATCH] Allow to customize path to gdlib-config and net-snmp-config - programs - -[yann.morin.1998@free.fr: backport] -Signed-off-by: "Yann E. MORIN" - ---- -Backported from upstream commit 086b5fa8fe4ba74404e92b5f838263dfcf9f173d ---- - docs/configure.txt | 14 ++++++++++++++ - m4/nut_check_libgd.m4 | 29 +++++++++++++++++++++++------ - m4/nut_check_libnetsnmp.m4 | 25 +++++++++++++++++++++---- - 3 files changed, 58 insertions(+), 10 deletions(-) - -diff --git a/docs/configure.txt b/docs/configure.txt -index aff82c1..b3b542a 100644 ---- a/docs/configure.txt -+++ b/docs/configure.txt -@@ -23,6 +23,13 @@ Note that you need to install the libusb development package or files. - Build and install the SNMP drivers (default: auto-detect) - Note that you need to install libsnmp development package or files. - -+ --with-net-snmp-config -+ -+In addition to the `--with-snmp` option above, this one allows to provide -+a custom program name (in `PATH`) or complete pathname to `net-snmp-config`. -+This may be needed on build systems which support multiple architectures, -+or in cases where your distribution names this program differently. -+ - --with-neon - - Build and install the XML drivers (default: auto-detect) -@@ -335,6 +342,13 @@ NOTE: the --with-gd switches are not necessary if you have gd 2.0.8 - or higher installed properly. The gdlib-config script will be - detected and used by default in that situation. - -+ --with-gdlib-config -+ -+This option allows to provide a custom program name (in `PATH`) or -+a complete pathname to `gdlib-config`. This may be needed on build -+systems which support multiple architectures, or in cases where your -+distribution names this program differently. -+ - --with-ssl-includes, --with-usb-includes, --with-snmp-includes, - --with-neon-includes, --with-libltdl-includes, - --with-powerman-includes="-I/foo/bar" -diff --git a/m4/nut_check_libgd.m4 b/m4/nut_check_libgd.m4 -index 01cc882..73f4da7 100644 ---- a/m4/nut_check_libgd.m4 -+++ b/m4/nut_check_libgd.m4 -@@ -19,8 +19,25 @@ if test -z "${nut_have_libgd_seen}"; then - LDFLAGS="-L/usr/X11R6/lib" - LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11" - -- AC_MSG_CHECKING(for gd version via gdlib-config) -- GD_VERSION=`gdlib-config --version 2>/dev/null` -+ dnl By default seek in PATH -+ GDLIB_CONFIG=gdlib-config -+ AC_ARG_WITH(gdlib-config, -+ AS_HELP_STRING([@<:@--with-gdlib-config=/path/to/gdlib-config@:>@], -+ [path to program that reports GDLIB configuration]), -+ [ -+ case "${withval}" in -+ "") ;; -+ yes|no) -+ AC_MSG_ERROR(invalid option --with(out)-gdlib-config - see docs/configure.txt) -+ ;; -+ *) -+ GDLIB_CONFIG="${withval}" -+ ;; -+ esac -+ ]) -+ -+ AC_MSG_CHECKING(for gd version via ${GDLIB_CONFIG}) -+ GD_VERSION=`${GDLIB_CONFIG} --version 2>/dev/null` - if test "$?" != "0" -o -z "${GD_VERSION}"; then - GD_VERSION="none" - fi -@@ -30,13 +47,13 @@ if test -z "${nut_have_libgd_seen}"; then - none) - ;; - 2.0.5 | 2.0.6 | 2.0.7) -- AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use gdlib-config script]]) -+ AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use ${GDLIB_CONFIG} script]]) - AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]]) - ;; - *) -- CFLAGS="`gdlib-config --includes 2>/dev/null`" -- LDFLAGS="`gdlib-config --ldflags 2>/dev/null`" -- LIBS="`gdlib-config --libs 2>/dev/null`" -+ CFLAGS="`${GDLIB_CONFIG} --includes 2>/dev/null`" -+ LDFLAGS="`${GDLIB_CONFIG} --ldflags 2>/dev/null`" -+ LIBS="`${GDLIB_CONFIG} --libs 2>/dev/null`" - ;; - esac - -diff --git a/m4/nut_check_libnetsnmp.m4 b/m4/nut_check_libnetsnmp.m4 -index e1c1426..83b2633 100644 ---- a/m4/nut_check_libnetsnmp.m4 -+++ b/m4/nut_check_libnetsnmp.m4 -@@ -13,9 +13,26 @@ if test -z "${nut_have_libnetsnmp_seen}"; then - CFLAGS_ORIG="${CFLAGS}" - LIBS_ORIG="${LIBS}" - -+ dnl By default seek in PATH -+ NET_SNMP_CONFIG=net-snmp-config -+ AC_ARG_WITH(net-snmp-config, -+ AS_HELP_STRING([@<:@--with-net-snmp-config=/path/to/net-snmp-config@:>@], -+ [path to program that reports Net-SNMP configuration]), -+ [ -+ case "${withval}" in -+ "") ;; -+ yes|no) -+ AC_MSG_ERROR(invalid option --with(out)-net-snmp-config - see docs/configure.txt) -+ ;; -+ *) -+ NET_SNMP_CONFIG="${withval}" -+ ;; -+ esac -+ ]) -+ - dnl See which version of the Net-SNMP library (if any) is installed -- AC_MSG_CHECKING(for Net-SNMP version via net-snmp-config) -- SNMP_VERSION=`net-snmp-config --version 2>/dev/null` -+ AC_MSG_CHECKING(for Net-SNMP version via ${NET_SNMP_CONFIG}) -+ SNMP_VERSION=`${NET_SNMP_CONFIG} --version 2>/dev/null` - if test "$?" != "0" -o -z "${SNMP_VERSION}"; then - SNMP_VERSION="none" - fi -@@ -33,7 +50,7 @@ if test -z "${nut_have_libnetsnmp_seen}"; then - CFLAGS="${withval}" - ;; - esac -- ], [CFLAGS="`net-snmp-config --base-cflags 2>/dev/null`"]) -+ ], [CFLAGS="`${NET_SNMP_CONFIG} --base-cflags 2>/dev/null`"]) - AC_MSG_RESULT([${CFLAGS}]) - - AC_MSG_CHECKING(for Net-SNMP libs) -@@ -48,7 +65,7 @@ if test -z "${nut_have_libnetsnmp_seen}"; then - LIBS="${withval}" - ;; - esac -- ], [LIBS="`net-snmp-config --libs 2>/dev/null`"]) -+ ], [LIBS="`${NET_SNMP_CONFIG} --libs 2>/dev/null`"]) - AC_MSG_RESULT([${LIBS}]) - - dnl Check if the Net-SNMP library is usable --- -2.7.4 - diff --git a/package.bak/nut/0002-client-ups-add-missing-include.patch b/package.bak/nut/0002-client-ups-add-missing-include.patch deleted file mode 100644 index 63fdcdcbb4..0000000000 --- a/package.bak/nut/0002-client-ups-add-missing-include.patch +++ /dev/null @@ -1,29 +0,0 @@ -From da0969b26ad4bb839bcb88362c8f41aaf0eb8363 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Tue, 11 Oct 2016 12:05:36 +0200 -Subject: [PATCH] client/ups: add missing include - -struct timeval is declared in sys/time.h, so we need to #include it. - -Signed-off-by: "Yann E. MORIN" ---- -Backported from upstream commit da0969b26ad4bb839bcb88362c8f41aaf0eb8363 ---- - clients/upsclient.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/clients/upsclient.c b/clients/upsclient.c -index 43c0e79..dfadd0d 100644 ---- a/clients/upsclient.c -+++ b/clients/upsclient.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "upsclient.h" - #include "common.h" --- -2.7.4 - diff --git a/package.bak/nut/Config.in b/package.bak/nut/Config.in deleted file mode 100644 index 659c9586f5..0000000000 --- a/package.bak/nut/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -comment "nut needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_NUT - bool "nut" - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP - help - Network UPS tools - - The primary goal of the Network UPS Tools (NUT) project is to provide - support for Power Devices, such as Uninterruptible Power Supplies, - Power Distribution Units and Solar Controllers. - - http://www.networkupstools.org/ - -if BR2_PACKAGE_NUT - -config BR2_PACKAGE_NUT_DRIVERS - string "drivers" - help - Select the individual drivers to enable, in a comma-separated list. - Leave empty for all. - -endif # BR2_PACKAGE_NUT diff --git a/package.bak/nut/nut.hash b/package.bak/nut/nut.hash deleted file mode 100644 index 870c67cc8e..0000000000 --- a/package.bak/nut/nut.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.networkupstools.org/source/2.7/nut-2.7.2.tar.gz.sha256 -sha256 980e82918c52d364605c0703a5dcf01f74ad2ef06e3d365949e43b7d406d25a7 nut-2.7.4.tar.gz diff --git a/package.bak/nut/nut.mk b/package.bak/nut/nut.mk deleted file mode 100644 index 7136e834cc..0000000000 --- a/package.bak/nut/nut.mk +++ /dev/null @@ -1,92 +0,0 @@ -################################################################################ -# -# nut -# -################################################################################ - -NUT_VERSION_MAJOR = 2.7 -NUT_VERSION = $(NUT_VERSION_MAJOR).4 -NUT_SITE = http://www.networkupstools.org/source/$(NUT_VERSION_MAJOR) -NUT_LICENSE = GPLv2+, GPLv3+ (python scripts), GPL/Artistic (perl client) -NUT_LICENSE_FILES = COPYING LICENSE-GPL2 LICENSE-GPL3 -NUT_DEPENDENCIES = host-pkgconf - -# Our patch changes m4 macros, so we need to autoreconf -NUT_AUTORECONF = YES - -# Put the PID files in a read-write place (/var/run is a tmpfs) -# since the default location (/var/state/ups) maybe readonly. -NUT_CONF_OPTS = \ - --with-altpidpath=/var/run/upsd \ - --without-hal - -# For uClibc-based toolchains, nut forgets to link with -lm -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -NUT_CONF_ENV += LDFLAGS="$(TARGET_LDFLAGS) -lm" -endif - -ifeq ($(call qstrip,$(BR2_PACKAGE_NUT_DRIVERS)),) -NUT_CONF_OPTS += --with-drivers=all -else -NUT_CONF_OPTS += --with-drivers=$(BR2_PACKAGE_NUT_DRIVERS) -endif - -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS),yy) -NUT_DEPENDENCIES += avahi dbus -NUT_CONF_OPTS += --with-avahi -else -NUT_CONF_OPTS += --without-avahi -endif - -# gd with support for png is required for the CGI -ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) -NUT_DEPENDENCIES += gd libpng -NUT_CONF_OPTS += \ - --with-cgi \ - --with-gdlib-config=$(STAGING_DIR)/usr/bin/gdlib-config -else -NUT_CONF_OPTS += --without-cgi -endif - -# nut-scanner needs libltdl, which is a wrapper arounf dlopen/dlsym, -# so is not available for static-only builds. -# There is no flag to directly enable/disable nut-scanner, it's done -# via the --enable/disable-libltdl flag. -ifeq ($(BR2_STATIC_LIBS):$(BR2_PACKAGE_LIBTOOL),:y) -NUT_DEPENDENCIES += libtool -NUT_CONF_OPTS += --with-libltdl -else -NUT_CONF_OPTS += --without-libltdl -endif - -ifeq ($(BR2_PACKAGE_LIBUSB_COMPAT),y) -NUT_DEPENDENCIES += libusb-compat -NUT_CONF_OPTS += --with-usb -else -NUT_CONF_OPTS += --without-usb -endif - -ifeq ($(BR2_PACKAGE_NEON_EXPAT)$(BR2_PACKAGE_NEON_LIBXML2),y) -NUT_DEPENDENCIES += neon -NUT_CONF_OPTS += --with-neon -else -NUT_CONF_OPTS += --without-neon -endif - -ifeq ($(BR2_PACKAGE_NETSNMP),y) -NUT_DEPENDENCIES += netsnmp -NUT_CONF_OPTS += \ - --with-snmp \ - --with-net-snmp-config=$(STAGING_DIR)/usr/bin/net-snmp-config -else -NUT_CONF_OPTS += --without-snmp -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -NUT_DEPENDENCIES += openssl -NUT_CONF_OPTS += --with-ssl -else -NUT_CONF_OPTS += --without-ssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/nuttcp/0001-susv3-legacy.patch b/package.bak/nuttcp/0001-susv3-legacy.patch deleted file mode 100644 index 9a215f8a86..0000000000 --- a/package.bak/nuttcp/0001-susv3-legacy.patch +++ /dev/null @@ -1,264 +0,0 @@ -[PATCH] Replace susv3 legacy function with modern equivalents - -Signed-off-by: Peter Korsgaard ---- - nuttcp-6.1.2.c | 90 ++++++++++++++++++++++++++++----------------------------- - 1 file changed, 45 insertions(+), 45 deletions(-) - -Index: nuttcp-6.1.2/nuttcp-6.1.2.c -=================================================================== ---- nuttcp-6.1.2.orig/nuttcp-6.1.2.c -+++ nuttcp-6.1.2/nuttcp-6.1.2.c -@@ -1925,11 +1925,11 @@ - if (udp && !haverateopt) - rate = DEFAULT_UDP_RATE; - -- bzero((char *)&frominet, sizeof(frominet)); -- bzero((char *)&clientaddr, sizeof(clientaddr)); -+ memset((char *)&frominet, 0, sizeof(frominet)); -+ memset((char *)&clientaddr, 0, sizeof(clientaddr)); - - #ifdef AF_INET6 -- bzero((char *)&clientaddr6, sizeof(clientaddr6)); -+ memset((char *)&clientaddr6, 0, sizeof(clientaddr6)); - clientscope6 = 0; - #endif - -@@ -1985,7 +1985,7 @@ - } - - while (stream_idx <= nstream) { -- bzero(&hints, sizeof(hints)); -+ memset(&hints, 0, sizeof(hints)); - res[stream_idx] = NULL; - if (explicitaf) hints.ai_family = af; - if ((cp2 = strchr(cp1, '/'))) { -@@ -3013,12 +3013,12 @@ - if ((stream_idx > 0) && skip_data) - break; - -- bzero((char *)&sinme[stream_idx], sizeof(sinme[stream_idx])); -- bzero((char *)&sinhim[stream_idx], sizeof(sinhim[stream_idx])); -+ memset((char *)&sinme[stream_idx], 0, sizeof(sinme[stream_idx])); -+ memset((char *)&sinhim[stream_idx], 0, sizeof(sinhim[stream_idx])); - - #ifdef AF_INET6 -- bzero((char *)&sinme6[stream_idx], sizeof(sinme6[stream_idx])); -- bzero((char *)&sinhim6[stream_idx], sizeof(sinhim6[stream_idx])); -+ memset((char *)&sinme6[stream_idx], 0, sizeof(sinme6[stream_idx])); -+ memset((char *)&sinhim6[stream_idx], 0, sizeof(sinhim6[stream_idx])); - #endif - - if (((trans && !reverse) && (stream_idx > 0)) || -@@ -3028,15 +3028,15 @@ - if (client) { - if (af == AF_INET) { - sinhim[stream_idx].sin_family = af; -- bcopy((char *)&(((struct sockaddr_in *)res[stream_idx]->ai_addr)->sin_addr), -- (char *)&sinhim[stream_idx].sin_addr.s_addr, -+ memcpy((char *)&sinhim[stream_idx].sin_addr.s_addr, -+ (char *)&(((struct sockaddr_in *)res[stream_idx]->ai_addr)->sin_addr), - sizeof(sinhim[stream_idx].sin_addr.s_addr)); - } - #ifdef AF_INET6 - else if (af == AF_INET6) { - sinhim6[stream_idx].sin6_family = af; -- bcopy((char *)&(((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_addr), -- (char *)&sinhim6[stream_idx].sin6_addr.s6_addr, -+ memcpy((char *)&sinhim6[stream_idx].sin6_addr.s6_addr, -+ (char *)&(((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_addr), - sizeof(sinhim6[stream_idx].sin6_addr.s6_addr)); - sinhim6[stream_idx].sin6_scope_id = ((struct sockaddr_in6 *)res[stream_idx]->ai_addr)->sin6_scope_id; - } -@@ -3113,8 +3113,8 @@ - * to the multicast group - */ - if (af == AF_INET) { -- bcopy((char *)&sinhim[1].sin_addr.s_addr, -- (char *)&save_sinhim.sin_addr.s_addr, -+ memcpy((char *)&save_sinhim.sin_addr.s_addr, -+ (char *)&sinhim[1].sin_addr.s_addr, - sizeof(struct in_addr)); - if (!client && (irvers >= 50505)) { - struct sockaddr_in peer; -@@ -3124,8 +3124,8 @@ - &peerlen) < 0) { - err("getpeername"); - } -- bcopy((char *)&peer.sin_addr.s_addr, -- (char *)&sinhim[1].sin_addr.s_addr, -+ memcpy((char *)&sinhim[1].sin_addr.s_addr, -+ (char *)&peer.sin_addr.s_addr, - sizeof(struct in_addr)); - } - else { -@@ -3136,8 +3136,8 @@ - &melen) < 0) { - err("getsockname"); - } -- bcopy((char *)&me.sin_addr.s_addr, -- (char *)&sinhim[1].sin_addr.s_addr, -+ memcpy((char *)&sinhim[1].sin_addr.s_addr, -+ (char *)&me.sin_addr.s_addr, - sizeof(struct in_addr)); - } - sinhim[1].sin_addr.s_addr &= -@@ -4197,13 +4197,13 @@ - &melen) < 0) { - err("getsockname"); - } -- bcopy((char *)&me.sin_addr.s_addr, -- (char *)&mc_group.imr_multiaddr.s_addr, -+ memcpy((char *)&mc_group.imr_multiaddr.s_addr, -+ (char *)&me.sin_addr.s_addr, - sizeof(struct in_addr)); - } - else { -- bcopy((char *)&peer.sin_addr.s_addr, -- (char *)&mc_group.imr_multiaddr.s_addr, -+ memcpy((char *)&mc_group.imr_multiaddr.s_addr, -+ (char *)&peer.sin_addr.s_addr, - sizeof(struct in_addr)); - } - mc_group.imr_multiaddr.s_addr &= htonl(0xFFFFFF); -@@ -4330,12 +4330,12 @@ - if(udp) { - strcpy(buf, "BOD0"); - if (multicast) { -- bcopy((char *)&sinhim[1].sin_addr.s_addr, -- (char *)&save_mc.sin_addr.s_addr, -- sizeof(struct in_addr)); -- bcopy((char *)&save_sinhim.sin_addr.s_addr, -+ memcpy((char *)&save_mc.sin_addr.s_addr, - (char *)&sinhim[1].sin_addr.s_addr, - sizeof(struct in_addr)); -+ memcpy((char *)&sinhim[1].sin_addr.s_addr, -+ (char *)&save_sinhim.sin_addr.s_addr, -+ sizeof(struct in_addr)); - } - (void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr start */ - if (two_bod) { -@@ -4344,8 +4344,8 @@ - (void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr start */ - } - if (multicast) { -- bcopy((char *)&save_mc.sin_addr.s_addr, -- (char *)&sinhim[1].sin_addr.s_addr, -+ memcpy((char *)&sinhim[1].sin_addr.s_addr, -+ (char *)&save_mc.sin_addr.s_addr, - sizeof(struct in_addr)); - } - if (timeout) -@@ -4361,7 +4361,7 @@ - fflush(stdout); - } - if (udplossinfo) -- bcopy(&nbytes, buf + 24, 8); -+ memcpy(buf + 24, &nbytes, 8); - if (!udp && interval && !(format & NORETRANS) && - ((retransinfo == 1) || - ((retransinfo >= 2) && -@@ -4372,13 +4372,13 @@ - tmp = 0x5254524Eu; /* "RTRN" */ - else - tmp = 0x48525452u; /* "HRTR" */ -- bcopy(&nretrans, buf + 24, 4); -- bcopy(&tmp, buf + 28, 4); -+ memcpy(buf + 24, &nretrans, 4); -+ memcpy(buf + 28, &tmp, 4); - } - else { - send_retrans = 0; - if (!udp) -- bzero(buf + 24, 8); -+ memset(buf + 24, 0, 8); - } - if (nbuf == INT_MAX) - nbuf = ULLONG_MAX; -@@ -4423,12 +4423,12 @@ - nbytes += buflen; - cnt = 0; - if (udplossinfo) -- bcopy(&nbytes, buf + 24, 8); -+ memcpy(buf + 24, &nbytes, 8); - if (send_retrans) { - nretrans = get_retrans( - fd[stream_idx + 1]); - nretrans -= iretrans; -- bcopy(&nretrans, buf + 24, 4); -+ memcpy(buf + 24, &nretrans, 4); - } - stream_idx++; - stream_idx = stream_idx % nstream; -@@ -4523,8 +4523,8 @@ - nbytes += cnt; - if(udp) { - if (multicast) -- bcopy((char *)&save_sinhim.sin_addr.s_addr, -- (char *)&sinhim[1].sin_addr.s_addr, -+ memcpy((char *)&sinhim[1].sin_addr.s_addr, -+ (char *)&save_sinhim.sin_addr.s_addr, - sizeof(struct in_addr)); - strcpy(buf, "EOD0"); - (void)Nwrite( fd[stream_idx + 1], buf, 4 ); /* rcvr end */ -@@ -4532,7 +4532,7 @@ - } else { - first_read = 1; - need_swap = 0; -- bzero(buf + 24, 8); -+ memset(buf + 24, 0, 8); - if (udp) { - ntbytesc = 0; - got_eod0 = 0; -@@ -4584,7 +4584,7 @@ - * goes off right here */ - if (udplossinfo) { - if (first_read) { -- bcopy(buf + 24, &ntbytesc, -+ memcpy(&ntbytesc, buf + 24, - 8); - first_read = 0; - if (ntbytesc > 0x100000000ull) -@@ -4598,7 +4598,7 @@ - } - } - if (!need_swap) -- bcopy(buf + 24, &ntbytesc, -+ memcpy(&ntbytesc, buf + 24, - 8); - else { - cp1 = (char *)&ntbytesc; -@@ -4627,8 +4627,8 @@ - uint32_t tmp; - - first_read = 0; -- bcopy(buf + 24, &nretrans, 4); -- bcopy(buf + 28, &tmp, 4); -+ memcpy(&nretrans, buf + 24, 4); -+ memcpy(&tmp, buf + 28, 4); - if (tmp == 0x5254524Eu) { - /* "RTRN" */ - retransinfo = 1; -@@ -4661,7 +4661,7 @@ - } - if (read_retrans) { - if (!need_swap) -- bcopy(buf + 24, &nretrans, -+ memcpy(&nretrans, buf + 24, - 4); - else { - cp1 = (char *)&nretrans; -@@ -5327,10 +5327,10 @@ - itimer.it_interval.tv_usec = 0; - setitimer(ITIMER_REAL, &itimer, 0); - signal(SIGALRM, SIG_DFL); -- bzero((char *)&frominet, sizeof(frominet)); -- bzero((char *)&clientaddr, sizeof(clientaddr)); -+ memset((char *)&frominet, 0, sizeof(frominet)); -+ memset((char *)&clientaddr, 0, sizeof(clientaddr)); - #ifdef AF_INET6 -- bzero((char *)&clientaddr6, sizeof(clientaddr)); -+ memset((char *)&clientaddr6, 0, sizeof(clientaddr)); - clientscope6 = 0; - #endif - cput = 0.000001; diff --git a/package.bak/nuttcp/Config.in b/package.bak/nuttcp/Config.in deleted file mode 100644 index 0b5f0811a5..0000000000 --- a/package.bak/nuttcp/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_NUTTCP - bool "nuttcp" - depends on BR2_USE_MMU # fork() - help - nuttcp is a TCP/UDP network testing tool, much like iperf - - http://nuttcp.net diff --git a/package.bak/nuttcp/nuttcp.hash b/package.bak/nuttcp/nuttcp.hash deleted file mode 100644 index 88310a31d6..0000000000 --- a/package.bak/nuttcp/nuttcp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freebsd.org/pipermail/freebsd-ports-bugs/2009-August/170685.html -sha256 054e96d9d68fe917df6f25fab15c7755bdd480f6420d7d48d9194a1a52378169 nuttcp-6.1.2.tar.bz2 diff --git a/package.bak/nuttcp/nuttcp.mk b/package.bak/nuttcp/nuttcp.mk deleted file mode 100644 index 455875a823..0000000000 --- a/package.bak/nuttcp/nuttcp.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# nuttcp -# -################################################################################ - -NUTTCP_VERSION = 6.1.2 -NUTTCP_SITE = http://nuttcp.net/nuttcp -NUTTCP_SOURCE = nuttcp-$(NUTTCP_VERSION).tar.bz2 -NUTTCP_LICENSE = GPLv2 -NUTTCP_LICENSE_FILES = LICENSE - -define NUTTCP_BUILD_CMDS - $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ - -C $(@D) all -endef - -define NUTTCP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 $(@D)/nuttcp-$(NUTTCP_VERSION) \ - $(TARGET_DIR)/usr/bin/nuttcp -endef - -$(eval $(generic-package)) diff --git a/package.bak/nvidia-driver/0001-use-LDFLAGS.patch b/package.bak/nvidia-driver/0001-use-LDFLAGS.patch deleted file mode 100644 index 7b7df80988..0000000000 --- a/package.bak/nvidia-driver/0001-use-LDFLAGS.patch +++ /dev/null @@ -1,48 +0,0 @@ -kernel: use LDFLAGS when linking modules - -Currently, linking module objects is simply using $(LD), assuming that -the default emulation is correct for the current architecture. - -However, that might not be the case when the toolchain default is not -the same as the current arch. For example, if the toolchain defaults to -i386 and is capable of x86_64, and we're targetting x86_64 (or the -opposite), the link would fail because the ld emulation is incorrect: - - .../i686-pc-linux-gnu-ld: Relocatable linking with relocations from - format elf64-x86-64 (.../nvidia-driver-370.23/kernel/nvidia/nv-frontend.o) - to format elf32-i386 (.../nvidia-driver-370.23/kernel/nvidia/nv-interface.o) - is not supported - -Add use of $(LDFLAGS) when doing the link, as the kernel provides the -proper emulation in those. - -Signed-off-by: "Yann E. MORIN" - ---- -Issue reported upstream: - https://devtalk.nvidia.com/default/topic/958653/ - -diff -durN nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild ---- nvidia-driver-370.23.orig/kernel/nvidia/nvidia.Kbuild 2016-08-09 01:57:50.000000000 +0200 -+++ nvidia-driver-370.23/kernel/nvidia/nvidia.Kbuild 2016-08-20 12:25:02.780233423 +0200 -@@ -87,7 +87,7 @@ - always += $(NVIDIA_INTERFACE) - - $(obj)/$(NVIDIA_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_OBJECTS)) -- $(LD) -r -o $@ $^ -+ $(LD) $(LDFLAGS) -r -o $@ $^ - - - # -diff -durN nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild ---- nvidia-driver-370.23.orig/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-09 01:43:19.000000000 +0200 -+++ nvidia-driver-370.23/kernel/nvidia-modeset/nvidia-modeset.Kbuild 2016-08-20 12:25:39.596772662 +0200 -@@ -70,7 +70,7 @@ - always += $(NVIDIA_MODESET_INTERFACE) - - $(obj)/$(NVIDIA_MODESET_INTERFACE): $(addprefix $(obj)/,$(NVIDIA_MODESET_OBJECTS)) -- $(LD) -r -o $@ $^ -+ $(LD) $(LDFLAGS) -r -o $@ $^ - - # - # Register the conftests needed by nvidia-modeset.ko diff --git a/package.bak/nvidia-driver/Config.in b/package.bak/nvidia-driver/Config.in deleted file mode 100644 index 1105ec63b6..0000000000 --- a/package.bak/nvidia-driver/Config.in +++ /dev/null @@ -1,88 +0,0 @@ -comment "nvidia-driver needs a glibc toolchain" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_USES_GLIBC - -config BR2_PACKAGE_NVIDIA_DRIVER - bool "nvidia-driver" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_USES_GLIBC - help - The binary-only driver blob for NVidia cards. - This is the userland part only. - - http://www.nvidia.com/ - -if BR2_PACKAGE_NVIDIA_DRIVER - -comment "nvidia-driver X.org drivers needs a modular Xorg server" - depends on !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - -config BR2_PACKAGE_NVIDIA_DRIVER_XORG - bool "X.org drivers" - default y - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_XLIB_LIBX11 # runtime - select BR2_PACKAGE_XLIB_LIBXEXT # runtime - select BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBEGL_WAYLAND - select BR2_PACKAGE_HAS_LIBGLES - -if BR2_PACKAGE_NVIDIA_DRIVER_XORG - -config BR2_PACKAGE_PROVIDES_LIBGL - default "nvidia-driver" - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "nvidia-driver" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "nvidia-driver" - -config BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS - bool "Install private libraries" - help - Two libraries require special agreement with NVidia to - develop code linking to those libraries: libnvidia-ifr.so - and libnvidia-fbc.so (to grab and encode an OpenGL buffer or - an X framebuffer.) - - Say 'y' here if you plan on running a program that uses - those private libraries. - -endif # BR2_PACKAGE_NVIDIA_DRIVER_XORG - -config BR2_PACKAGE_NVIDIA_DRIVER_CUDA - bool "CUDA support" - -if BR2_PACKAGE_NVIDIA_DRIVER_CUDA - -config BR2_PACKAGE_NVIDIA_DRIVER_OPENCL - bool "OpenCL support" - -config BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS - bool "CUDA MPS server and control" - help - Say 'y' here if you need to run more than one program - doing CUDA at the same time. The MPS server will be - launched automatically when needed. - -endif # BR2_PACKAGE_NVIDIA_DRIVER_CUDA - -comment "nvidia kernel module needs a kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_NVIDIA_DRIVER_MODULE - bool "nvidia kernel module" - depends on BR2_LINUX_KERNEL - select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra - help - Build the nvidia.ko kernel module. - - If CUDA support (above) is set, and the target is x86_64, then - this will also build the nvidia-uvm.ko kernel module, which - provides Unified Memory access to the GPU and CPU memories for - CUDA programs. - -endif # BR2_PACKAGE_NVIDIA_DRIVER diff --git a/package.bak/nvidia-driver/gl.pc b/package.bak/nvidia-driver/gl.pc deleted file mode 100644 index d822763f57..0000000000 --- a/package.bak/nvidia-driver/gl.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: gl -Description: Nvidia OpenGL library -Version: 10.4.2 -Libs: -L${libdir} -lGL -lm -lXext -lX11 -ldl -Cflags: -I${includedir} -DMESA_EGL_NO_X11_HEADERS -glx_tls: no diff --git a/package.bak/nvidia-driver/nvidia-driver.hash b/package.bak/nvidia-driver/nvidia-driver.hash deleted file mode 100644 index 04a44b821a..0000000000 --- a/package.bak/nvidia-driver/nvidia-driver.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 cc79d3ac2b688009ed2e47a1cf27557aea5dd745b3b6e9b83945c359ddab4335 NVIDIA-Linux-x86-375.20.run -sha256 d10e40a19dc57ac958567a2b247c2b113e5f1e4186ad48e9a58e70a46d07620b NVIDIA-Linux-x86_64-375.20.run diff --git a/package.bak/nvidia-driver/nvidia-driver.mk b/package.bak/nvidia-driver/nvidia-driver.mk deleted file mode 100644 index cb9b7faeca..0000000000 --- a/package.bak/nvidia-driver/nvidia-driver.mk +++ /dev/null @@ -1,195 +0,0 @@ -################################################################################ -# -# nvidia-driver -# -################################################################################ - -NVIDIA_DRIVER_VERSION = 375.20 -NVIDIA_DRIVER_SUFFIX = $(if $(BR2_x86_64),_64) -NVIDIA_DRIVER_SITE = ftp://download.nvidia.com/XFree86/Linux-x86$(NVIDIA_DRIVER_SUFFIX)/$(NVIDIA_DRIVER_VERSION) -NVIDIA_DRIVER_SOURCE = NVIDIA-Linux-x86$(NVIDIA_DRIVER_SUFFIX)-$(NVIDIA_DRIVER_VERSION).run -NVIDIA_DRIVER_LICENSE = NVIDIA Software License -NVIDIA_DRIVER_LICENSE_FILES = LICENSE -NVIDIA_DRIVER_REDISTRIBUTE = NO -NVIDIA_DRIVER_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_XORG),y) - -# Since nvidia-driver are binary blobs, the below dependencies are not -# strictly speaking build dependencies of nvidia-driver. However, they -# are build dependencies of packages that depend on nvidia-driver, so -# they should be built prior to those packages, and the only simple -# way to do so is to make nvidia-driver depend on them. -NVIDIA_DRIVER_DEPENDENCIES = mesa3d-headers -NVIDIA_DRIVER_PROVIDES = libgl libegl libgles - -# libGL.so.$(NVIDIA_DRIVER_VERSION) is the legacy libGL.so library; it -# has been replaced with libGL.so.1.0.0. Installing both is technically -# possible, but great care must be taken to ensure they do not conflict, -# so that EGL still works. The legacy library exposes an NVidia-specific -# API, so it should not be needed, except for legacy, binary-only -# applications (in other words: we don't care). -# -# libGL.so.1.0.0 is the new vendor-neutral library, aimed at replacing -# the old libGL.so.$(NVIDIA_DRIVER_VERSION) library. The latter contains -# NVidia extensions (which is deemed bad now), while the former follows -# the newly-introduced vendor-neutral "dispatching" API/ABI: -# https://github.com/aritger/linux-opengl-abi-proposal/blob/master/linux-opengl-abi-proposal.txt -# However, this is not very usefull to us, as we don't support multiple -# GL providers at the same time on the system, which this proposal is -# aimed at supporting. -# -# So we only install the legacy library for now. -NVIDIA_DRIVER_LIBS_GL = \ - libGLX.so.0 \ - libGL.so.$(NVIDIA_DRIVER_VERSION) \ - libGLX_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ - -NVIDIA_DRIVER_LIBS_EGL = \ - libEGL.so.1 \ - libGLdispatch.so.0 \ - libEGL_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ - -NVIDIA_DRIVER_LIBS_GLES = \ - libGLESv1_CM.so.1 \ - libGLESv2.so.2 \ - libGLESv1_CM_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ - libGLESv2_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ - -NVIDIA_DRIVER_LIBS_MISC = \ - libnvidia-eglcore.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-egl-wayland.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-glcore.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-glsi.so.$(NVIDIA_DRIVER_VERSION) \ - tls/libnvidia-tls.so.$(NVIDIA_DRIVER_VERSION) \ - libvdpau_nvidia.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-ml.so.$(NVIDIA_DRIVER_VERSION) \ - -NVIDIA_DRIVER_LIBS = \ - $(NVIDIA_DRIVER_LIBS_GL) \ - $(NVIDIA_DRIVER_LIBS_EGL) \ - $(NVIDIA_DRIVER_LIBS_GLES) \ - $(NVIDIA_DRIVER_LIBS_MISC) \ - -# Install the gl.pc file -define NVIDIA_DRIVER_INSTALL_GL_DEV - $(INSTALL) -D -m 0644 $(@D)/libGL.la $(STAGING_DIR)/usr/lib/libGL.la - $(SED) 's:__GENERATED_BY__:Buildroot:' $(STAGING_DIR)/usr/lib/libGL.la - $(SED) 's:__LIBGL_PATH__:/usr/lib:' $(STAGING_DIR)/usr/lib/libGL.la - $(SED) 's:-L[^[:space:]]\+::' $(STAGING_DIR)/usr/lib/libGL.la - $(INSTALL) -D -m 0644 package/nvidia-driver/gl.pc $(STAGING_DIR)/usr/lib/pkgconfig/gl.pc -endef - -# Those libraries are 'private' libraries requiring an agreement with -# NVidia to develop code for those libs. There seems to be no restriction -# on using those libraries (e.g. if the user has such an agreement, or -# wants to run a third-party program developped under such an agreement). -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_PRIVATE_LIBS),y) -NVIDIA_DRIVER_LIBS += \ - libnvidia-ifr.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-fbc.so.$(NVIDIA_DRIVER_VERSION) -endif - -# We refer to the destination path; the origin file has no directory component -NVIDIA_DRIVER_X_MODS = \ - drivers/nvidia_drv.so \ - extensions/libglx.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-wfb.so.$(NVIDIA_DRIVER_VERSION) - -endif # X drivers - -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA),y) -NVIDIA_DRIVER_LIBS += \ - libcuda.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-compiler.so.$(NVIDIA_DRIVER_VERSION) \ - libnvcuvid.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-fatbinaryloader.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-ptxjitcompiler.so.$(NVIDIA_DRIVER_VERSION) \ - libnvidia-encode.so.$(NVIDIA_DRIVER_VERSION) -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_CUDA_PROGS),y) -NVIDIA_DRIVER_PROGS = nvidia-cuda-mps-control nvidia-cuda-mps-server -endif -endif - -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_OPENCL),y) -NVIDIA_DRIVER_LIBS += \ - libOpenCL.so.1.0.0 \ - libnvidia-opencl.so.$(NVIDIA_DRIVER_VERSION) -endif - -# Build and install the kernel modules if needed -ifeq ($(BR2_PACKAGE_NVIDIA_DRIVER_MODULE),y) - -NVIDIA_DRIVER_MODULES = nvidia nvidia-modeset nvidia-drm -ifeq ($(BR2_x86_64),y) -NVIDIA_DRIVER_MODULES += nvidia-uvm -endif - -# They can't do everything like everyone. They need those variables, -# because they don't recognise the usual variables set by the kernel -# build system. We also need to tell them what modules to build. -NVIDIA_DRIVER_MODULE_MAKE_OPTS = \ - NV_KERNEL_SOURCES="$(LINUX_DIR)" \ - NV_KERNEL_OUTPUT="$(LINUX_DIR)" \ - NV_KERNEL_MODULES="$(NVIDIA_DRIVER_MODULES)" - -NVIDIA_DRIVER_MODULE_SUBDIRS = kernel - -$(eval $(kernel-module)) - -endif # BR2_PACKAGE_NVIDIA_DRIVER_MODULE == y - -# The downloaded archive is in fact an auto-extract script. So, it can run -# virtually everywhere, and it is fine enough to provide useful options. -# Except it can't extract into an existing (even empty) directory. -define NVIDIA_DRIVER_EXTRACT_CMDS - $(SHELL) $(DL_DIR)/$(NVIDIA_DRIVER_SOURCE) --extract-only --target \ - $(@D)/tmp-extract - chmod u+w -R $(@D) - mv $(@D)/tmp-extract/* $(@D)/tmp-extract/.manifest $(@D) - rm -rf $(@D)/tmp-extract -endef - -# Helper to install libraries -# $1: destination directory (target or staging) -# -# For all libraries, we install them and create a symlink using -# their SONAME, so we can link to them at runtime; we also create -# the no-version symlink, so we can link to them at build time. -define NVIDIA_DRIVER_INSTALL_LIBS - $(foreach lib,$(NVIDIA_DRIVER_LIBS),\ - $(INSTALL) -D -m 0644 $(@D)/$(lib) $(1)/usr/lib/$(notdir $(lib)) - libsoname="$$( $(TARGET_READELF) -d "$(@D)/$(lib)" \ - |sed -r -e '/.*\(SONAME\).*\[(.*)\]$$/!d; s//\1/;' )"; \ - if [ -n "$${libsoname}" -a "$${libsoname}" != "$(notdir $(lib))" ]; then \ - ln -sf $(notdir $(lib)) \ - $(1)/usr/lib/$${libsoname}; \ - fi - baseso=$(firstword $(subst .,$(space),$(notdir $(lib)))).so; \ - if [ -n "$${baseso}" -a "$${baseso}" != "$(notdir $(lib))" ]; then \ - ln -sf $(notdir $(lib)) $(1)/usr/lib/$${baseso}; \ - fi - ) -endef - -# For staging, install libraries and development files -define NVIDIA_DRIVER_INSTALL_STAGING_CMDS - $(call NVIDIA_DRIVER_INSTALL_LIBS,$(STAGING_DIR)) - $(NVIDIA_DRIVER_INSTALL_GL_DEV) -endef - -# For target, install libraries and X.org modules -define NVIDIA_DRIVER_INSTALL_TARGET_CMDS - $(call NVIDIA_DRIVER_INSTALL_LIBS,$(TARGET_DIR)) - $(foreach m,$(NVIDIA_DRIVER_X_MODS), \ - $(INSTALL) -D -m 0644 $(@D)/$(notdir $(m)) \ - $(TARGET_DIR)/usr/lib/xorg/modules/$(m) - ) - $(foreach p,$(NVIDIA_DRIVER_PROGS), \ - $(INSTALL) -D -m 0755 $(@D)/$(p) \ - $(TARGET_DIR)/usr/bin/$(p) - ) - $(NVIDIA_DRIVER_INSTALL_KERNEL_MODULE) -endef - -$(eval $(generic-package)) diff --git a/package.bak/nvidia-tegra23/Config.in b/package.bak/nvidia-tegra23/Config.in deleted file mode 100644 index 9c9fd198d9..0000000000 --- a/package.bak/nvidia-tegra23/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -menuconfig BR2_PACKAGE_NVIDIA_TEGRA23 - bool "nvidia-tegra23" - depends on BR2_cortex_a9 - depends on BR2_ARM_EABIHF && BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - help - Install NVidia proprietary blobs to drive Tegra2 or Tegra3 - GPUs found in some mobile-targeted ARM SoCs. - -if BR2_PACKAGE_NVIDIA_TEGRA23 - -choice - prompt "Tegra platform" - help - Select the SOC platform. - -config BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA2 - bool "Tegra 2" - help - NVIDIA Tegra 2 is a dual-core Cortex-A9 without NEON. - -config BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA3 - bool "Tegra 3" - depends on BR2_ARM_CPU_HAS_NEON - help - NVIDIA Tegra 3 is a quad-core Cortex-A9 with NEON. - -endchoice - -source "package/nvidia-tegra23/nvidia-tegra23-binaries/Config.in" -source "package/nvidia-tegra23/nvidia-tegra23-codecs/Config.in" -endif - -comment "nvidia-tegra23 needs Xorg <= 1.14 and a glibc toolchain w/ EABIhf" - depends on BR2_cortex_a9 - depends on !BR2_ARM_EABIHF || !BR2_TOOLCHAIN_USES_GLIBC \ - || !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/Config.in b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/Config.in deleted file mode 100644 index 573ab90bea..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - bool "nvidia-tegra23 binaries" - select BR2_PACKAGE_MESA3D_HEADERS - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENMAX - help - Those packages provide libraries, drivers and firmware that comes from - NVIDIA Linux For Tegra. - - https://developer.nvidia.com/linux-tegra - -if BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "nvidia-tegra23-binaries" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "nvidia-tegra23-binaries" - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - default "nvidia-tegra23-binaries" - -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - bool "GStreamer 0.10.x plugins" - depends on BR2_PACKAGE_GSTREAMER # Run-time only - select BR2_PACKAGE_XLIB_LIBXV - help - GStreamer 0.10.x plugins - -config BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS - bool "NVIDIA multimedia sample apps" - depends on BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS - help - nvgstplayer and nvgstcapture multimedia test applications. - -comment "GStreamer 0.10.x plugins need GStreamer 0.10" - depends on !BR2_PACKAGE_GSTREAMER - -endif diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc deleted file mode 100644 index 3af7eecc01..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/egl.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: egl -Description: EGL implementation -Version: 1 -Cflags: -I${includedir}/EGL -Libs: -L${libdir} -lEGL diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc deleted file mode 100644 index 91387c9793..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/gles.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 1.1 implementation -Version: 1.1 -Cflags: -I${includedir}/GLES -Libs: -L${libdir} -lGLESv1_CM diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc deleted file mode 100644 index 356a1cba4f..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/glesv2.pc +++ /dev/null @@ -1,10 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=/usr/lib -includedir=/usr/include - -Name: glesv2 -Description: OpenGL ES 2 implementation -Version: 2 -Cflags: -I${includedir}/GLESv2 -Libs: -L${libdir} -lGLESv2 diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash deleted file mode 100644 index 50c3cda645..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://developer.nvidia.com/linux-tegra-rel-16 -sha1 295dcd63b2f122c2d99f07fcc083db9adb8ac178 Tegra20_Linux_R16.5_armhf.tbz2 -sha1 6be645c20d81d518856bc8520ef4c2472d57eaef Tegra30_Linux_R16.5_armhf.tbz2 diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk b/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk deleted file mode 100644 index 4f7cdcf6d6..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-binaries/nvidia-tegra23-binaries.mk +++ /dev/null @@ -1,95 +0,0 @@ -################################################################################ -# -# nvidia-tegra23-binaries -# -################################################################################ - -NVIDIA_TEGRA23_BINARIES_VERSION = $(NVIDIA_TEGRA23_VERSION) -NVIDIA_TEGRA23_BINARIES_SITE = $(NVIDIA_TEGRA23_SITE) -NVIDIA_TEGRA23_BINARIES_SOURCE = $(NVIDIA_TEGRA23_BASE)_R$(NVIDIA_TEGRA23_BINARIES_VERSION)_armhf.tbz2 - -NVIDIA_TEGRA23_BINARIES_LICENSE = License For Customer Use of NVIDIA Software -NVIDIA_TEGRA23_BINARIES_LICENSE_FILES = nv_tegra/LICENSE -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_LICENSE += LGPLv2.1 -NVIDIA_TEGRA23_BINARIES_LICENSE_FILES += nv_tegra/nv_sample_apps/LICENSE.gst-openmax -endif - -NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING = YES - -# Those are not really needed to build nvidia-tegra23-binaries, but -# will be needed by packages who link against libraries provided by -# nvidia-tegra23-binaries. - -NVIDIA_TEGRA23_BINARIES_DEPENDENCIES = mesa3d-headers \ - xlib_libX11 xlib_libXext - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -NVIDIA_TEGRA23_BINARIES_DEPENDENCIES += xlib_libXv -endif - -NVIDIA_TEGRA23_BINARIES_PROVIDES = libegl libgles libopenmax - -NVIDIA_TEGRA23_BINARIES_DRV = \ - nv_tegra/nvidia_drivers/usr/lib/xorg/modules/drivers/tegra_drv.abi$(BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI).so - -define NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER - $(INSTALL) -d $(@D)/nv_tegra/nvidia_drivers - $(call suitable-extractor,$(@D)/nv_tegra/nvidia_drivers.tbz2) \ - $(@D)/nv_tegra/nvidia_drivers.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nvidia_drivers/ $(TAR_OPTIONS) - - $(INSTALL) -d $(@D)/nv_tegra/nv_sample_apps/nvgstapps - $(call suitable-extractor,$(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2) \ - $(@D)/nv_tegra/nv_sample_apps/nvgstapps.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/nv_tegra/nv_sample_apps/nvgstapps/ $(TAR_OPTIONS) - -endef -NVIDIA_TEGRA23_BINARIES_POST_EXTRACT_HOOKS += NVIDIA_TEGRA23_BINARIES_EXTRACT_FURTHER - -define NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS - mkdir -p $(1)/usr/lib - cp -dpfr $(@D)/nv_tegra/nvidia_drivers/usr/lib/*.so $(1)/usr/lib/ - (cd $(1)/usr/lib; \ - ln -sf libGLESv2.so.2 libGLESv2.so; \ - ln -sf libGLESv1_CM.so.1 libGLESv1_CM.so; \ - ln -sf libEGL.so.1 libEGL.so \ - ) -endef - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_GSTREAMER_PLUGINS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS - mkdir -p $(1)/usr/lib/gstreamer-0.10/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/lib/gstreamer-0.10/*.so \ - $(1)/usr/lib/gstreamer-0.10/ -endef -endif - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES_NV_SAMPLE_APPS),y) -define NVIDIA_TEGRA23_BINARIES_INSTALL_APPS - mkdir -p $(TARGET_DIR)/usr/bin/ - cp -dpfr $(@D)/nv_tegra/nv_sample_apps/nvgstapps/usr/bin/* \ - $(TARGET_DIR)/usr/bin/ -endef -endif - -define NVIDIA_TEGRA23_BINARIES_INSTALL_STAGING_CMDS - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(STAGING_DIR)) - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig/ - cp -dpfr package/nvidia-tegra23/nvidia-tegra23-binaries/*.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/ - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(STAGING_DIR)) -endef - -define NVIDIA_TEGRA23_BINARIES_INSTALL_TARGET_CMDS - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_LIBS,$(TARGET_DIR)) - mkdir -p $(TARGET_DIR)/lib/firmware/ - cp -dpfr $(@D)/nv_tegra/nvidia_drivers/lib/firmware/*.bin \ - $(TARGET_DIR)/lib/firmware/ - $(INSTALL) -D -m 0644 $(@D)/nv_tegra/nvidia_drivers/etc/nv_tegra_release \ - $(TARGET_DIR)/etc/nv_tegra_release - $(INSTALL) -D -m 0644 $(@D)/$(NVIDIA_TEGRA23_BINARIES_DRV) \ - $(TARGET_DIR)/usr/lib/xorg/modules/drivers/tegra_drv.so - $(call NVIDIA_TEGRA23_BINARIES_INSTALL_GST_PLUGINS,$(TARGET_DIR)) - $(NVIDIA_TEGRA23_BINARIES_INSTALL_APPS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/Config.in b/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/Config.in deleted file mode 100644 index df9de69dc4..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_NVIDIA_TEGRA23_CODECS - bool "nvidia-tegra23 codecs" - depends on BR2_PACKAGE_NVIDIA_TEGRA23_BINARIES - help - NVIDIA Tegra restricted codecs from Linux For Tegra 16.5. - - https://developer.nvidia.com/linux-tegra-rel-16 diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash b/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash deleted file mode 100644 index 9b5c61496f..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://developer.nvidia.com/linux-tegra-rel-16 -sha1 540e89d5462537cd59c8a86efdb786b3b4310868 Tegra20_Linux-codecs_R16.5_armhf.tbz2 -sha1 3637efe808f25594e3cdc2756aef6e0274ab70f4 Tegra30_Linux-codecs_R16.5_armhf.tbz2 diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk b/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk deleted file mode 100644 index 5514643416..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23-codecs/nvidia-tegra23-codecs.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# nvidia-tegra23-codecs -# -################################################################################ - -NVIDIA_TEGRA23_CODECS_VERSION = $(NVIDIA_TEGRA23_VERSION) -NVIDIA_TEGRA23_CODECS_SOURCE = $(NVIDIA_TEGRA23_BASE)-codecs_R$(NVIDIA_TEGRA23_CODECS_VERSION)_armhf.tbz2 -NVIDIA_TEGRA23_CODECS_SITE = $(NVIDIA_TEGRA23_SITE) -NVIDIA_TEGRA23_CODECS_LICENSE = NVIDIA(r) Tegra(r) Software License Agreement -NVIDIA_TEGRA23_CODECS_LICENSE_FILES = Tegra_Software_License_Agreement-Tegra-Linux-codecs.txt -NVIDIA_TEGRA23_CODECS_REDISTRIBUTE = NO - -# The archive contains an archive with the firmware codecs -define NVIDIA_TEGRA23_CODECS_EXTRACT_CMDS - $(INSTALL) -d $(@D) - $(call suitable-extractor,$(NVIDIA_TEGRA23_CODECS_SOURCE)) \ - $(DL_DIR)/$(NVIDIA_TEGRA23_CODECS_SOURCE) | \ - $(TAR) --strip-components=0 -C $(@D) $(TAR_OPTIONS) - - $(INSTALL) -d $(@D)/restricted_codecs - $(call suitable-extractor,$(@D)/restricted_codecs.tbz2) \ - $(@D)/restricted_codecs.tbz2 | \ - $(TAR) --strip-components=0 -C $(@D)/restricted_codecs/ $(TAR_OPTIONS) - -endef - -define NVIDIA_TEGRA23_CODECS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/lib/firmware/ - cp -dpfr $(@D)/restricted_codecs/lib/firmware/*.axf \ - $(TARGET_DIR)/lib/firmware/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/nvidia-tegra23/nvidia-tegra23.mk b/package.bak/nvidia-tegra23/nvidia-tegra23.mk deleted file mode 100644 index b97d0ccac4..0000000000 --- a/package.bak/nvidia-tegra23/nvidia-tegra23.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# nvidia-tegra23 -# -################################################################################ - -NVIDIA_TEGRA23_VERSION = 16.5 - -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA2),y) -NVIDIA_TEGRA23_SITE = http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/ventana_release_armhf -NVIDIA_TEGRA23_BASE = Tegra20_Linux -endif -ifeq ($(BR2_PACKAGE_NVIDIA_TEGRA23_TEGRA3),y) -NVIDIA_TEGRA23_SITE = http://developer.download.nvidia.com/mobile/tegra/l4t/r16.5.0/cardhu_release_armhf -NVIDIA_TEGRA23_BASE = Tegra30_Linux -endif - -include $(sort $(wildcard package/nvidia-tegra23/*/*.mk)) diff --git a/package.bak/nvme/Config.in b/package.bak/nvme/Config.in deleted file mode 100644 index dd8655fa1a..0000000000 --- a/package.bak/nvme/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_NVME - bool "nvme" - help - NVME utility, a utility for interacting with standard NVM - Express (optimized PCI Express SSD interface) devices. - - https://github.com/linux-nvme/nvme-cli diff --git a/package.bak/nvme/nvme.hash b/package.bak/nvme/nvme.hash deleted file mode 100644 index b299041960..0000000000 --- a/package.bak/nvme/nvme.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c631e90dd4d411cdb618b26bc36b06706e6f1f2d3db38874bcfe48f4bc15aac4 nvme-v0.3.tar.gz diff --git a/package.bak/nvme/nvme.mk b/package.bak/nvme/nvme.mk deleted file mode 100755 index b745025fdf..0000000000 --- a/package.bak/nvme/nvme.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# nvme -# -################################################################################ - -NVME_VERSION = v0.3 -NVME_SITE = $(call github,linux-nvme,nvme-cli,$(NVME_VERSION)) -NVME_LICENSE = GPLv2+ -NVME_LICENSE_FILES = LICENSE - -# Yes LIBUDEV=0 means udev support enabled, LIBUDEV=1 means udev -# support disabled. -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -NVME_DEPENDENCIES += udev -NVME_MAKE_OPTS += LIBUDEV=0 -else -NVME_MAKE_OPTS += LIBUDEV=1 -endif - -# LIBUDEV=1 means that libudev is _disabled_ -define NVME_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) \ - $(NVME_MAKE_OPTS) -C $(@D) -endef - -define NVME_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - PREFIX=/usr install-bin -endef - -$(eval $(generic-package)) diff --git a/package.bak/obsidian-cursors/Config.in b/package.bak/obsidian-cursors/Config.in deleted file mode 100644 index 49ec310170..0000000000 --- a/package.bak/obsidian-cursors/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_OBSIDIAN_CURSORS - bool "obsidian-cursors" - help - Obsidian Cursors is a shiny and clean cursor set. - - http://kde-look.org/content/show.php/Obsidian+Cursors?content=73135 diff --git a/package.bak/obsidian-cursors/obsidian-cursors.hash b/package.bak/obsidian-cursors/obsidian-cursors.hash deleted file mode 100644 index 8f1775e8a4..0000000000 --- a/package.bak/obsidian-cursors/obsidian-cursors.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3d38fe875f6feae8b7772e02cfda530fcf669479807915cd2c12c149da17cfb9 73135-Obsidian.tar.bz2 diff --git a/package.bak/obsidian-cursors/obsidian-cursors.mk b/package.bak/obsidian-cursors/obsidian-cursors.mk deleted file mode 100644 index 87a8d62f3e..0000000000 --- a/package.bak/obsidian-cursors/obsidian-cursors.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# obsidian-cursors -# -################################################################################ - -OBSIDIAN_CURSORS_VERSION = 1.0 -OBSIDIAN_CURSORS_SITE = http://kde-look.org/CONTENT/content-files -OBSIDIAN_CURSORS_SOURCE = 73135-Obsidian.tar.bz2 -OBSIDIAN_CURSORS_LICENSE = GPL - -define OBSIDIAN_CURSORS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/cursors/xorg-x11/Obsidian - cp -a $(@D)/cursors \ - $(TARGET_DIR)/usr/share/cursors/xorg-x11/Obsidian -endef - -$(eval $(generic-package)) diff --git a/package.bak/ocf-linux/ocf-linux.hash b/package.bak/ocf-linux/ocf-linux.hash deleted file mode 100644 index 0bd0ea19df..0000000000 --- a/package.bak/ocf-linux/ocf-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 5113609d2c2c43fde962bec1238fe5a81211a751ebb0337b54a9804d40cfef53 ocf-linux-20120127.tar.gz diff --git a/package.bak/ocf-linux/ocf-linux.mk b/package.bak/ocf-linux/ocf-linux.mk deleted file mode 100644 index 01854fa73a..0000000000 --- a/package.bak/ocf-linux/ocf-linux.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# ocf-linux -# -################################################################################ - -OCF_LINUX_VERSION = 20120127 -OCF_LINUX_SITE = http://downloads.sourceforge.net/project/ocf-linux/ocf-linux/$(OCF_LINUX_VERSION) -OCF_LINUX_INSTALL_STAGING = YES - -OCF_LINUX_PROVIDES = cryptodev - -OCF_LINUX_MODULE_SUBDIRS = ocf -OCF_LINUX_MODULE_MAKE_OPTS = \ - CONFIG_OCF_OCF=m \ - CONFIG_OCF_CRYPTOSOFT=m \ - CONFIG_OCF_BENCH=m \ - CONFIG_OCF_OCFNULL=m - -define OCF_LINUX_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/ocf/cryptodev.h \ - $(STAGING_DIR)/usr/include/crypto/cryptodev.h -endef - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/ocrad/Config.in b/package.bak/ocrad/Config.in deleted file mode 100644 index 38d37c612a..0000000000 --- a/package.bak/ocrad/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_OCRAD - bool "ocrad" - depends on BR2_INSTALL_LIBSTDCPP - help - GNU Ocrad is an OCR (Optical Character Recognition) program - based on a feature extraction method. - It reads images in pbm (bitmap), pgm (greyscale) or - ppm (color) formats and produces text in byte (8-bit) or - UTF-8 formats. - - http://www.gnu.org/software/ocrad/ - -comment "ocrad needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/ocrad/ocrad.hash b/package.bak/ocrad/ocrad.hash deleted file mode 100644 index d2a44ae77f..0000000000 --- a/package.bak/ocrad/ocrad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 e710be9c030fbcbce2315077326c8268feb422c0bc39fa744644cbbd1f5d4dd4 ocrad-0.25.tar.lz diff --git a/package.bak/ocrad/ocrad.mk b/package.bak/ocrad/ocrad.mk deleted file mode 100644 index 54b607c791..0000000000 --- a/package.bak/ocrad/ocrad.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# ocrad -# -################################################################################ - -OCRAD_VERSION = 0.25 -OCRAD_SOURCE = ocrad-$(OCRAD_VERSION).tar.lz -OCRAD_SITE = $(BR2_GNU_MIRROR)/ocrad -OCRAD_LICENSE = GPLv3+ -OCRAD_LICENSE_FILES = COPYING -OCRAD_INSTALL_STAGING = YES - -# This is not a true autotools package. -define OCRAD_CONFIGURE_CMDS - cd $(@D) && \ - $(TARGET_MAKE_ENV) ./configure --prefix=/usr --sysconfdir=/etc $(TARGET_CONFIGURE_OPTS) -endef - -define OCRAD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define OCRAD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define OCRAD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/odhcp6c/Config.in b/package.bak/odhcp6c/Config.in deleted file mode 100644 index 329b55c1c6..0000000000 --- a/package.bak/odhcp6c/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ODHCP6C - bool "odhcp6c" - depends on BR2_USE_MMU # fork() - help - odhcp6c is a minimal DHCPv6 and RA-client for use in embedded Linux - systems, especially routers. - - https://github.com/sbyx/odhcp6c diff --git a/package.bak/odhcp6c/odhcp6c.hash b/package.bak/odhcp6c/odhcp6c.hash deleted file mode 100644 index 688d77dc62..0000000000 --- a/package.bak/odhcp6c/odhcp6c.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d84a713010865215301b4186c7b5368c9f006e6d3b9b52b99bd25e2d9e7a1dfc odhcp6c-7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07.tar.gz diff --git a/package.bak/odhcp6c/odhcp6c.mk b/package.bak/odhcp6c/odhcp6c.mk deleted file mode 100644 index 0ec9657aaf..0000000000 --- a/package.bak/odhcp6c/odhcp6c.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# odhcp6c -# -################################################################################ - -ODHCP6C_VERSION = 7533a6243dc3ac5a747cf6ccbc4d0539dafd3e07 -ODHCP6C_SITE = $(call github,sbyx,odhcp6c,$(ODHCP6C_VERSION)) -ODHCP6C_LICENSE = GPLv2 -ODHCP6C_LICENSE_FILES = COPYING - -define ODHCP6C_INSTALL_SCRIPT - $(INSTALL) -m 0755 -D $(@D)/odhcp6c-example-script.sh \ - $(TARGET_DIR)/usr/sbin/odhcp6c-update -endef - -ODHCP6C_POST_INSTALL_TARGET_HOOKS += ODHCP6C_INSTALL_SCRIPT - -$(eval $(cmake-package)) diff --git a/package.bak/odhcploc/Config.in b/package.bak/odhcploc/Config.in deleted file mode 100644 index 74bf3630be..0000000000 --- a/package.bak/odhcploc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ODHCPLOC - bool "odhcploc" - help - Open DHCP Locate (ODHCPLoc) is program to locate and - display active DHCP servers on a subnet. - Can be used to scan for rogue DHCP servers. - - http://odhcploc.sourceforge.net/ diff --git a/package.bak/odhcploc/odhcploc.hash b/package.bak/odhcploc/odhcploc.hash deleted file mode 100644 index 201339f97c..0000000000 --- a/package.bak/odhcploc/odhcploc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 b0360a3aece8a29d131531da7bfc36d57c30c6eed30ff1ea360f7cccea1d62d7 odhcploc-20111021.tar.gz diff --git a/package.bak/odhcploc/odhcploc.mk b/package.bak/odhcploc/odhcploc.mk deleted file mode 100644 index bf4227ae5c..0000000000 --- a/package.bak/odhcploc/odhcploc.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# odhcploc -# -################################################################################ - -ODHCPLOC_VERSION = 20111021 -ODHCPLOC_SITE = http://downloads.sourceforge.net/project/odhcploc/$(ODHCPLOC_VERSION) -ODHCPLOC_LICENSE = ISC -ODHCPLOC_LICENSE_FILES = COPYING - -define ODHCPLOC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define ODHCPLOC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=/usr DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/odroid-mali/Config.in b/package.bak/odroid-mali/Config.in deleted file mode 100644 index e5c07f2378..0000000000 --- a/package.bak/odroid-mali/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_ODROID_MALI - bool "odroid-mali" - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_ODROID_SCRIPTS # runtime - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_aarch64 || BR2_ARM_EABIHF - help - Install the ARM Mali drivers for odroidc2 based systems. - - https://github.com/mdrjr/c2_mali - -if BR2_PACKAGE_ODROID_MALI - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "odroid-mali" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "odroid-mali" - -endif - -config BR2_PACKAGE_ODROID_MALI_X11 - bool - depends on BR2_aarch64 # No 32 bit version available - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - -comment "odroid-mali needs a glibc toolchain" - depends on BR2_aarch64 || BR2_ARM_EABIHF - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/odroid-mali/odroid-mali.hash b/package.bak/odroid-mali/odroid-mali.hash deleted file mode 100644 index 4d24824229..0000000000 --- a/package.bak/odroid-mali/odroid-mali.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 29d98ed4b8694b860d9289787c416faa847b0de26d36580a53add1752b4c2e9a odroid-mali-46fe49f37e3506c6205ad8c50980eca9bfff11e3.tar.gz diff --git a/package.bak/odroid-mali/odroid-mali.mk b/package.bak/odroid-mali/odroid-mali.mk deleted file mode 100644 index 142fd97c67..0000000000 --- a/package.bak/odroid-mali/odroid-mali.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# odroid-mali -# -################################################################################ - -ODROID_MALI_VERSION = 46fe49f37e3506c6205ad8c50980eca9bfff11e3 -ODROID_MALI_SITE = $(call github,mdrjr,c2_mali,$(ODROID_MALI_VERSION)) -ODROID_MALI_LICENSE = Hardkernel EULA -ODROID_MALI_LICENSE_FILES = README.md - -ODROID_MALI_INSTALL_STAGING = YES -ODROID_MALI_PROVIDES = libegl libgles - -ifeq ($(BR2_PACKAGE_ODROID_MALI_X11),y) -ODROID_MALI_HEADERS_SUBDIR = x11/mali_headers/ -ODROID_MALI_LIBS_SUBDIR = x11/mali_libs/ -# The X11 blobs are linked against those libraries, and the headers -# include headers from those libraries -ODROID_MALI_DEPENDENCIES += \ - libdrm xlib_libX11 xlib_libXdamage \ - xlib_libXext xlib_libXfixes -else -ODROID_MALI_HEADERS_SUBDIR = fbdev/mali_headers/ -ifeq ($(BR2_aarch64),y) -ODROID_MALI_LIBS_SUBDIR = fbdev/mali_libs/ -else -ODROID_MALI_LIBS_SUBDIR = fbdev/32bit_libs/ -endif -endif - -define ODROID_MALI_INSTALL_LIBS - cp -dpfr $(@D)/$(ODROID_MALI_LIBS_SUBDIR)/lib* $(1)/usr/lib/ -endef - -define ODROID_MALI_INSTALL_STAGING_CMDS - $(call ODROID_MALI_INSTALL_LIBS,$(STAGING_DIR)) - mkdir -p $(STAGING_DIR)/usr/lib/pkgconfig - cp -dpfr $(@D)/pkgconfig/*.pc $(STAGING_DIR)/usr/lib/pkgconfig/ - cp -dpfr $(@D)/$(ODROID_MALI_HEADERS_SUBDIR)/* $(STAGING_DIR)/usr/include -endef - -define ODROID_MALI_INSTALL_TARGET_CMDS - $(call ODROID_MALI_INSTALL_LIBS,$(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/odroid-scripts/Config.in b/package.bak/odroid-scripts/Config.in deleted file mode 100644 index c4e09cad72..0000000000 --- a/package.bak/odroid-scripts/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_ODROID_SCRIPTS - bool "odroid-scripts" - depends on BR2_aarch64 || BR2_arm - select BR2_PACKAGE_FBSET # runtime - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # needed for fbset - help - Install the scripts for the odroidc2 based systems. - - https://github.com/mdrjr/c2_bootini diff --git a/package.bak/odroid-scripts/S02odroidc2_fb b/package.bak/odroid-scripts/S02odroidc2_fb deleted file mode 100644 index 2aae59db98..0000000000 --- a/package.bak/odroid-scripts/S02odroidc2_fb +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh -# -# Set up frame buffer -# - -case "$1" in - start) - echo "Setting up display..." - /usr/sbin/odroidc2_init_fb.sh - ;; - stop) - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/odroid-scripts/odroid-scripts.hash b/package.bak/odroid-scripts/odroid-scripts.hash deleted file mode 100644 index e5a262d209..0000000000 --- a/package.bak/odroid-scripts/odroid-scripts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed hash -sha256 9d61472ee6aed2d1a7b5afdcb91b823003c8524a242572f24f89d4e57323daf3 odroid-scripts-cfd289b1d69136b8bfd725d90cd648da4654f2bd.tar.gz diff --git a/package.bak/odroid-scripts/odroid-scripts.mk b/package.bak/odroid-scripts/odroid-scripts.mk deleted file mode 100644 index fc1940dcef..0000000000 --- a/package.bak/odroid-scripts/odroid-scripts.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# odroid-scripts -# -################################################################################ - -ODROID_SCRIPTS_VERSION = cfd289b1d69136b8bfd725d90cd648da4654f2bd -ODROID_SCRIPTS_SITE = $(call github,mdrjr,c2_bootini,$(ODROID_SCRIPTS_VERSION)) -ODROID_SCRIPTS_LICENSE = unclear - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define ODROID_SCRIPTS_INSTALL_UDEV_RULES - $(INSTALL) -D -m 0644 $(@D)/10-odroid.rules \ - $(TARGET_DIR)/etc/udev/rules.d/10-odroid.rules -endef -endif - -define ODROID_SCRIPTS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/c2_init.sh $(TARGET_DIR)/usr/sbin/odroidc2_init_fb.sh - $(ODROID_SCRIPTS_INSTALL_UDEV_RULES) -endef - -define ODROID_SCRIPTS_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/amlogic.service \ - $(TARGET_DIR)/usr/lib/systemd/system/odroidc2_fb.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/odroidc2_fb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/odroidc2_fb.service -endef - -define ODROID_SCRIPTS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/odroid-scripts/S02odroidc2_fb \ - $(TARGET_DIR)/etc/init.d/S02odroidc2_fb -endef - -$(eval $(generic-package)) diff --git a/package.bak/ofono/0001-uclibc-backtrace.patch b/package.bak/ofono/0001-uclibc-backtrace.patch deleted file mode 100644 index 3ce7bf8cbc..0000000000 --- a/package.bak/ofono/0001-uclibc-backtrace.patch +++ /dev/null @@ -1,49 +0,0 @@ -[PATCH] fix build on uClibc without UCLIBC_HAS_BACKTRACE - -Backtrace support is only used for logging on signal errors, which -isn't really critical, so simply remove backtrace info if not -available in uClibc. - -NOTE: based on patch from Peter Korsgaard - -Signed-off-by: Petr Vorel ---- ---- ofono-1.7.orig/src/log.c -+++ ofono-1.7/src/log.c -@@ -30,7 +30,8 @@ - #include - #include - #include --#ifdef __GLIBC__ -+#if defined(__GLIBC__) && !(defined(__UCLIBC__) && !defined (__UCLIBC_HAS_BACKTRACE__)) -+#define HAVE_BACKTRACE - #include - #endif - #include -@@ -115,7 +116,7 @@ - va_end(ap); - } - --#ifdef __GLIBC__ -+#ifdef HAVE_BACKTRACE - static void print_backtrace(unsigned int offset) - { - void *frames[99]; -@@ -309,7 +310,7 @@ - if (detach == FALSE) - option |= LOG_PERROR; - --#ifdef __GLIBC__ -+#ifdef HAVE_BACKTRACE - signal_setup(signal_handler); - #endif - -@@ -326,7 +327,7 @@ - - closelog(); - --#ifdef __GLIBC__ -+#ifdef HAVE_BACKTRACE - signal_setup(SIG_DFL); - #endif - diff --git a/package.bak/ofono/Config.in b/package.bak/ofono/Config.in deleted file mode 100644 index 70daef7a1b..0000000000 --- a/package.bak/ofono/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_OFONO - bool "ofono" - depends on BR2_USE_WCHAR # gettext, libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, libglib2 - depends on BR2_USE_MMU # dbus, libglib2 - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_LIBCAP_NG - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO - help - oFono is a free, open source project for mobile telephony - (GSM/UMTS) applications. It uses high-level D-Bus API for - use by telephony applications. It uses 3GPP standard. - - http://ofono.org/ - -comment "ofono needs a toolchain w/ dynamic library, wchar, threads" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ofono/S46ofono b/package.bak/ofono/S46ofono deleted file mode 100755 index 7eb2fca3b8..0000000000 --- a/package.bak/ofono/S46ofono +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting ofono ... " - start-stop-daemon -S -q -m -b -p /var/run/ofonod.pid --exec /usr/sbin/ofonod -- -n - echo "done." - ;; - stop) - printf "Stopping ofono ..." - start-stop-daemon -K -q -p /var/run/ofonod.pid - echo "done." - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/ofono/ofono.hash b/package.bak/ofono/ofono.hash deleted file mode 100644 index d61173684d..0000000000 --- a/package.bak/ofono/ofono.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/network/ofono/sha256sums.asc -sha256 53cdbf342913f46bce4827241c60e24255a3d43a94945edf77482ae5b312d51f ofono-1.18.tar.xz diff --git a/package.bak/ofono/ofono.mk b/package.bak/ofono/ofono.mk deleted file mode 100644 index 82343963b1..0000000000 --- a/package.bak/ofono/ofono.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# ofono -# -################################################################################ - -OFONO_VERSION = 1.18 -OFONO_SOURCE = ofono-$(OFONO_VERSION).tar.xz -OFONO_SITE = $(BR2_KERNEL_MIRROR)/linux/network/ofono -OFONO_LICENSE = GPLv2 -OFONO_LICENSE_FILES = COPYING -OFONO_DEPENDENCIES = \ - host-pkgconf \ - dbus \ - libglib2 \ - libcap-ng \ - mobile-broadband-provider-info - -OFONO_CONF_OPTS = \ - --disable-test \ - --with-dbusconfdir=/etc \ - $(if $(BR2_INIT_SYSTEMD),--with-systemdunitdir=/usr/lib/systemd/system) - -# N.B. Qualcomm QMI modem support requires O_CLOEXEC; so -# make sure that it is defined. -OFONO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -define OFONO_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/ofono/S46ofono $(TARGET_DIR)/etc/init.d/S46ofono -endef - -define OFONO_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/systemd/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ofono.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants -endef - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -OFONO_CONF_OPTS += --enable-udev -OFONO_DEPENDENCIES += udev -else -OFONO_CONF_OPTS += --disable-udev -endif - -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS),y) -OFONO_CONF_OPTS += --enable-bluetooth -OFONO_DEPENDENCIES += bluez_utils -else -OFONO_CONF_OPTS += --disable-bluetooth -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ola/0001-Remove-fvisibiliy-inlines-hidden.patch b/package.bak/ola/0001-Remove-fvisibiliy-inlines-hidden.patch deleted file mode 100644 index f2bf247c2e..0000000000 --- a/package.bak/ola/0001-Remove-fvisibiliy-inlines-hidden.patch +++ /dev/null @@ -1,26 +0,0 @@ -From cd4f5d9d8a10c368584e8e714ebb0f9695267063 Mon Sep 17 00:00:00 2001 -From: Simon Marchi -Date: Mon, 10 Aug 2015 15:01:42 -0400 -Subject: [PATCH] Remove -fvisibiliy-inlines-hidden - -Signed-off-by: Simon Marchi ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 714e435..17a23e2 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -32,7 +32,7 @@ AM_DISTCHECK_CONFIGURE_FLAGS = --enable-python-libs - COMMON_CXXFLAGS_ONLY_WARNINGS = \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/include \ -- -Wall -Wformat -W -fvisibility-inlines-hidden \ -+ -Wall -Wformat -W \ - $(libprotobuf_CFLAGS) - - COMMON_CXXFLAGS = $(COMMON_CXXFLAGS_ONLY_WARNINGS) --- -2.5.0 - diff --git a/package.bak/ola/0002-Remove-replacing-I-with-isystem.patch b/package.bak/ola/0002-Remove-replacing-I-with-isystem.patch deleted file mode 100644 index 010c99a3bc..0000000000 --- a/package.bak/ola/0002-Remove-replacing-I-with-isystem.patch +++ /dev/null @@ -1,106 +0,0 @@ -From bbb03794def326c2e8ad2de523c5a61a4c8cb464 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Thu, 22 Sep 2016 00:58:58 +0200 -Subject: [PATCH] Remove replacing -I with -isystem -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building OLA with a GCC 6 cross-toolchain fails: - -``` -/usr/bin/arm-linux-g++ -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE --D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./include -I./include --Wall -Wformat -W -isystem -/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include -pthread --D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os --pthread -c -o libs/acn/e131_transmit_test.o -libs/acn/e131_transmit_test.cpp -/usr/bin/arm-linux-g++ -DHAVE_CONFIG_H -I. -D_LARGEFILE_SOURCE --D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -I./include -I./include --Wall -Wformat -W -isystem -/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include -pthread --D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os --pthread -c -o libs/acn/E131TestFramework.o -libs/acn/E131TestFramework.cpp -In file included from -/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/ext/string_conversions.h:41:0, - from -/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/bits/basic_string.h:5402, - from -/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/string:52, - from ./tools/ola_trigger/config.ypp:2: -/opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0/cstdlib:75:25: -fatal error: stdlib.h: No such file or directory - #include_next - ^ -compilation terminated. -``` - -The C++ library in GCC 6 now provides its own `` header that -wraps the C library header of the same name, so in `` the -header include - -``` -#include -``` - -has become - -``` -#include_next -``` - -`#include_next` is sensitive to the order of directories in the -preprocessor's search path, so if that order is changed with `-isystem` -then the compiler can't find the right header: - -``` -[1] /usr/arm-buildroot-linux-gnueabihf/sysroot/usr/include -[2] /opt/ext-toolchain/arm-buildroot-linux-gnueabihf/include/c++/6.1.0 -[..] -End of search list. -``` - -`` is located in [2] whereas `` (C library header) is -in [1]. In this case, the `#include_next ` statement in -``, located in [2], is evaluated **after** the search path [1], -so the compiler does not find the right system header. - -The problem is that the OLA build system replaces the `-I` in the CFLAGS -from libprotobuf with `-isystem` to fix some warnings treated as errors -in the libprotobuf header files. - -`-isystem` should be used to suppress warnings in system headers only -and the libprotobuf header files are not system files. - -The correct fix is to compile with less restrictions and remove -`-Werror` for the build. - -As using `-isystem` is reordering GCCs search path and using `-isystem` -is really not necessary, remove the faulty replacement of `-I`. - -Upstream status: https://github.com/OpenLightingProject/ola/pull/1126 - -Signed-off-by: Jörg Krause ---- - config/ola.m4 | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/config/ola.m4 b/config/ola.m4 -index 2796cfb..d3b8cc8 100644 ---- a/config/ola.m4 -+++ b/config/ola.m4 -@@ -24,9 +24,6 @@ AC_DEFUN([PROTOBUF_SUPPORT], - AC_REQUIRE_CPP() - PKG_CHECK_MODULES(libprotobuf, [protobuf >= $1]) - --# We want to replace -I with -isystem here to disable errors in the .h files --# See https://groups.google.com/forum/#!topic/open-lighting/39Mj0KXlCIk --libprotobuf_CFLAGS=`echo $libprotobuf_CFLAGS | sed 's/-I/-isystem /'` - AC_SUBST([libprotobuf_CFLAGS]) - - AC_ARG_WITH([protoc], --- -2.10.0 - diff --git a/package.bak/ola/Config.in b/package.bak/ola/Config.in deleted file mode 100644 index 90a92fd2f2..0000000000 --- a/package.bak/ola/Config.in +++ /dev/null @@ -1,131 +0,0 @@ -comment "ola needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - -menuconfig BR2_PACKAGE_OLA - bool "ola (open lighting architecture)" - select BR2_PACKAGE_PROTOBUF - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX - depends on BR2_INSTALL_LIBSTDCPP # protobuf - depends on !BR2_STATIC_LIBS # protobuf - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - help - Open Lighting Architecture provides applications - with a mechanism to send and receive DMX512 & RDM - commands using hardware devices and DMX over IP protocols. - - http://www.opendmx.net/index.php/OLA - -if BR2_PACKAGE_OLA - -comment "bindings and interface" - -config BR2_PACKAGE_OLA_WEB - bool "http interface" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt, libmicrohttpd - select BR2_PACKAGE_LIBMICROHTTPD - help - Build OLA with browser interface. - -config BR2_PACKAGE_OLA_PYTHON_BINDINGS - bool "python bindings" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_PROTOBUF - help - Build OLA with support for the Python language. - -config BR2_PACKAGE_OLA_SLP - bool "slp tools" - help - Build OLA with slp tools. - -comment "tests and examples" - -config BR2_PACKAGE_OLA_EXAMPLES - bool "examples" - select BR2_PACKAGE_NCURSES - help - Build OLA examples. - -config BR2_PACKAGE_OLA_RDM_TESTS - bool "rdm tests" - depends on BR2_PACKAGE_OLA_PYTHON_BINDINGS - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - select BR2_PACKAGE_PYTHON_NUMPY - help - Build OLA RDM tests. - -comment "plugin selections" - -config BR2_PACKAGE_OLA_PLUGIN_E131 - bool "acn E131" - help - Build ACN E131 plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_ARTNET - bool "artnet" - help - Build Artnet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_OPENDMX - bool "DMX4Linux" - help - Build DMX4Linux plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_DUMMY - bool "dummy" - help - Build Dummy plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_ESPNET - bool "espnet" - help - Build EspNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_KINET - bool "kinet" - help - Build KiNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_MILINT - bool "Milford Instruments" - help - Build Milford Instruments 1-463 plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_OSC - bool "osc" - select BR2_PACKAGE_LIBLO - help - Build Open Sound Control plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_PATHPORT - bool "pathport" - help - Build Pathport plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_SANDNET - bool "sandnet" - help - Build SandNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_SHOWNET - bool "shownet" - help - Build ShowNet plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI - bool "stageprofi" - select BR2_PACKAGE_LIBUSB - help - Build StageProfi plugin for OLA. - -config BR2_PACKAGE_OLA_PLUGIN_USBPRO - bool "usbpro" - select BR2_PACKAGE_LIBUSB - help - Build UsbPro plugin for OLA. - -endif diff --git a/package.bak/ola/ola.hash b/package.bak/ola/ola.hash deleted file mode 100644 index a791e9caa4..0000000000 --- a/package.bak/ola/ola.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 986e61874bc80db3b23cf201af2dafa39e3412cc50cddf1cd449c869110bfd27 ola-0.10.2.tar.gz diff --git a/package.bak/ola/ola.mk b/package.bak/ola/ola.mk deleted file mode 100644 index cfd66383d8..0000000000 --- a/package.bak/ola/ola.mk +++ /dev/null @@ -1,180 +0,0 @@ -################################################################################ -# -# ola -# -################################################################################ - -OLA_VERSION = 0.10.2 -OLA_SITE = https://github.com/OpenLightingProject/ola/releases/download/$(OLA_VERSION) -OLA_LICENSE = LGPLv2.1+ (libola, libolacommon, Python bindings), GPLv2+ (libolaserver, olad, Python examples and tests) -OLA_LICENSE_FILES = LICENCE GPL LGPL -OLA_INSTALL_STAGING = YES -OLA_AUTORECONF = YES - -# util-linux provides uuid lib -OLA_DEPENDENCIES = protobuf util-linux host-bison host-flex host-ola - -OLA_CONF_OPTS = \ - ac_cv_have_pymod_google_protobuf=yes \ - --disable-gcov \ - --disable-tcmalloc \ - --disable-unittests \ - --disable-root-check \ - --disable-java-libs \ - --disable-fatal-warnings \ - --with-ola-protoc-plugin=$(HOST_DIR)/usr/bin/ola_protoc_plugin - -HOST_OLA_DEPENDENCIES = host-util-linux host-protobuf - -# When building the host part, disable as much as possible to speed up -# the configure step and avoid missing host dependencies. -HOST_OLA_CONF_OPTS = \ - --disable-all-plugins \ - --disable-slp \ - --disable-osc \ - --disable-uart \ - --disable-libusb \ - --disable-libftdi \ - --disable-http \ - --disable-examples \ - --disable-unittests \ - --disable-doxygen-html \ - --disable-doxygen-doc \ - --disable-fatal-warnings - -# On the host side, we only need ola_protoc_plugin, so build and install this -# only. -HOST_OLA_MAKE_OPTS = protoc/ola_protoc_plugin -define HOST_OLA_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/protoc/ola_protoc_plugin $(HOST_DIR)/usr/bin/ola_protoc_plugin -endef - -# sets where to find python libs built for target and required by ola -OLA_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -OLA_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -## OLA Bindings and Interface selections - -ifeq ($(BR2_PACKAGE_OLA_WEB),y) -OLA_CONF_OPTS += --enable-http -OLA_DEPENDENCIES += libmicrohttpd -else -OLA_CONF_OPTS += --disable-http -endif - -ifeq ($(BR2_PACKAGE_OLA_SLP),y) -OLA_CONF_OPTS += --enable-slp -else -OLA_CONF_OPTS += --disable-slp -endif - -ifeq ($(BR2_PACKAGE_OLA_PYTHON_BINDINGS),y) -OLA_CONF_OPTS += --enable-python-libs -OLA_DEPENDENCIES += python python-protobuf -else -OLA_CONF_OPTS += --disable-python-libs -endif - -## OLA Examples and Tests - -ifeq ($(BR2_PACKAGE_OLA_EXAMPLES),y) -OLA_CONF_OPTS += --enable-examples -OLA_DEPENDENCIES += ncurses -else -OLA_CONF_OPTS += --disable-examples -endif - -ifeq ($(BR2_PACKAGE_OLA_RDM_TESTS),y) -OLA_CONF_OPTS += --enable-rdm-tests -OLA_DEPENDENCIES += python-numpy -# needed as numpy builds some shared libraries and ola checks for -# numpy using a host python test program which fails with 'wrong ELF -# class'. -OLA_CONF_ENV = ac_cv_have_pymod_numpy=yes -else -OLA_CONF_OPTS += --disable-rdm-tests -endif - -## OLA Plugin selections - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_E131),y) -OLA_CONF_OPTS += --enable-e131 -else -OLA_CONF_OPTS += --disable-e131 -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ARTNET),y) -OLA_CONF_OPTS += --enable-artnet -else -OLA_CONF_OPTS += --disable-artnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OPENDMX),y) -OLA_CONF_OPTS += --enable-opendmx -else -OLA_CONF_OPTS += --disable-opendmx -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_DUMMY),y) -OLA_CONF_OPTS += --enable-dummy -else -OLA_CONF_OPTS += --disable-dummy -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_ESPNET),y) -OLA_CONF_OPTS += --enable-espnet -else -OLA_CONF_OPTS += --disable-espnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_KINET),y) -OLA_CONF_OPTS += --enable-kinet -else -OLA_CONF_OPTS += --disable-kinet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_OSC),y) -OLA_CONF_OPTS += --enable-osc -OLA_DEPENDENCIES += liblo -else -OLA_CONF_OPTS += --disable-osc -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_MILINT),y) -OLA_CONF_OPTS += --enable-milinst -else -OLA_CONF_OPTS += --disable-milinst -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_PATHPORT),y) -OLA_CONF_OPTS += --enable-pathport -else -OLA_CONF_OPTS += --disable-pathport -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SANDNET),y) -OLA_CONF_OPTS += --enable-sandnet -else -OLA_CONF_OPTS += --disable-sandnet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_SHOWNET),y) -OLA_CONF_OPTS += --enable-shownet -else -OLA_CONF_OPTS += --disable-shownet -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_STAGEPROFI),y) -OLA_CONF_OPTS += --enable-stageprofi --enable-libusb -else -OLA_CONF_OPTS += --disable-stageprofi -endif - -ifeq ($(BR2_PACKAGE_OLA_PLUGIN_USBPRO),y) -OLA_CONF_OPTS += --enable-usbpro --enable-libusb -else -OLA_CONF_OPTS += --disable-usbpro -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/olsr/0001-configurable-ldconfig.patch b/package.bak/olsr/0001-configurable-ldconfig.patch deleted file mode 100644 index 73fff7eecf..0000000000 --- a/package.bak/olsr/0001-configurable-ldconfig.patch +++ /dev/null @@ -1,33 +0,0 @@ -Make ldconfig configurable - -In a cross-compilation set up, running /sbin/ldconfig is useless, so -we make the path to ldconfig configurable through the environment/make -command line. This allows to pass LDCONFIG=/bin/true when doing -cross-compilation. - -[Gustavo: update patch for olsr 0.6.4] -Signed-off-by: Thomas Petazzoni - -diff -Nura olsrd-0.6.4.orig/make/Makefile.linux olsrd-0.6.4/make/Makefile.linux ---- olsrd-0.6.4.orig/make/Makefile.linux 2013-01-29 09:00:18.041356389 -0300 -+++ olsrd-0.6.4/make/Makefile.linux 2013-01-29 09:01:51.598226624 -0300 -@@ -3,6 +3,7 @@ - # - - ARCH := $(shell uname -m) -+LDCONFIG ?= /sbin/ldconfig - - DESTDIR ?= - prefix ?= /usr/local -@@ -26,9 +27,9 @@ - PLUGIN_SONAME ?= lib$(PLUGIN_NAME).so - PLUGIN_FULLNAME ?= $(PLUGIN_NAME).so.$(PLUGIN_VER) - INSTALL_LIB = install -D -m 755 $(PLUGIN_FULLNAME) $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+ $(LDCONFIG) -n $(LIBDIR) - UNINSTALL_LIB = rm -f $(LIBDIR)/$(PLUGIN_FULLNAME); \ -- /sbin/ldconfig -n $(LIBDIR) -+ $(LDCONFIG) -n $(LIBDIR) - - ifdef OLSRD_PLUGIN - GENERATE_PIC = true diff --git a/package.bak/olsr/Config.in b/package.bak/olsr/Config.in deleted file mode 100644 index 85c5b4da1f..0000000000 --- a/package.bak/olsr/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_OLSR - bool "olsr" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - # doesn't build with musl, - # https://github.com/OLSR/olsrd/issues/6 - depends on !BR2_TOOLCHAIN_USES_MUSL - help - The Optimized Link State Routing protocol (OLSR) is a - routing protocol that is optimised for mobile ad-hoc - networks, sometimes called wireless mesh networks. It is a - proactive link-state routing protocol that floods a full - topology table to all nodes in the network which then - compute optimal forwarding paths locally. - - http://www.olsr.org/ - -comment "olsr needs a uClibc or glibc toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/olsr/S50olsr b/package.bak/olsr/S50olsr deleted file mode 100755 index fa1324facd..0000000000 --- a/package.bak/olsr/S50olsr +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting oslrd daemon: " - start-stop-daemon -S -q -x /usr/sbin/olsrd -- -d 0 -pidfile /run/olsrd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping olsrd daemon: " - start-stop-daemon -K -q -p /run/olsrd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/olsr/olsr.hash b/package.bak/olsr/olsr.hash deleted file mode 100644 index c6b14153e3..0000000000 --- a/package.bak/olsr/olsr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.olsr.org/releases/0.9/SHA256SUM-0.9.0.3 -sha256 1f038ed3ea72e4f73dfc9701de83de7313f5049161c8df17b9aaeba8e9711e92 olsrd-0.9.0.3.tar.bz2 diff --git a/package.bak/olsr/olsr.mk b/package.bak/olsr/olsr.mk deleted file mode 100644 index 5a456a953e..0000000000 --- a/package.bak/olsr/olsr.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# olsr -# -################################################################################ - -OLSR_VERSION_MAJOR = 0.9 -OLSR_VERSION = $(OLSR_VERSION_MAJOR).0.3 -OLSR_SOURCE = olsrd-$(OLSR_VERSION).tar.bz2 -OLSR_SITE = http://www.olsr.org/releases/$(OLSR_VERSION_MAJOR) -OLSR_PLUGINS = arprefresh bmf dot_draw dyn_gw dyn_gw_plain httpinfo jsoninfo \ - mdns nameservice p2pd pgraph secure txtinfo watchdog -# Doesn't really need quagga but not very useful without it -OLSR_PLUGINS += $(if $(BR2_PACKAGE_QUAGGA),quagga) -OLSR_LICENSE = BSD-3c, LGPLv2.1+ -OLSR_LICENSE_FILES = license.txt lib/pud/nmealib/LICENSE -OLSR_DEPENDENCIES = host-flex host-bison - -define OLSR_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D) olsrd - for p in $(OLSR_PLUGINS) ; do \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) ARCH=$(KERNEL_ARCH) -C $(@D)/lib/$$p ; \ - done -endef - -define OLSR_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) \ - prefix="/usr" install_bin - for p in $(OLSR_PLUGINS) ; do \ - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/lib/$$p \ - LDCONFIG=/bin/true DESTDIR=$(TARGET_DIR) \ - prefix="/usr" install ; \ - done - $(INSTALL) -D -m 0644 $(@D)/files/olsrd.conf.default.lq \ - $(TARGET_DIR)/etc/olsrd/olsrd.conf -endef - -define OLSR_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/olsr/S50olsr \ - $(TARGET_DIR)/etc/init.d/S50olsr -endef - -define OLSR_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/olsr/olsr.service \ - $(TARGET_DIR)/usr/lib/systemd/system/olsr.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/olsr.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/olsr.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/olsr/olsr.service b/package.bak/olsr/olsr.service deleted file mode 100644 index 9ec8930352..0000000000 --- a/package.bak/olsr/olsr.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Ad-hoc wireless mesh routing daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/olsrd -nofork -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/omap-u-boot-utils/Config.in.host b/package.bak/omap-u-boot-utils/Config.in.host deleted file mode 100644 index 87dcc06938..0000000000 --- a/package.bak/omap-u-boot-utils/Config.in.host +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_HOST_OMAP_U_BOOT_UTILS - bool "host omap-u-boot-utils" - depends on BR2_arm || BR2_armeb - help - U-Boot Utilities for Texas Instrument's OMAP platforms. - This is a set of tools to control U-Boot from scripts, generate - OMAP-specific signed image files and more. - - https://github.com/nmenon/omap-u-boot-utils diff --git a/package.bak/omap-u-boot-utils/omap-u-boot-utils.hash b/package.bak/omap-u-boot-utils/omap-u-boot-utils.hash deleted file mode 100644 index 020c4405c9..0000000000 --- a/package.bak/omap-u-boot-utils/omap-u-boot-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 f9c2553efeff1289b2b964a266a0b4a03a377f84a14d0599a779f6e3d7b75d5f omap-u-boot-utils-3f07426cddc0be9e24702e7aacc7574ddd7fba28.tar.gz diff --git a/package.bak/omap-u-boot-utils/omap-u-boot-utils.mk b/package.bak/omap-u-boot-utils/omap-u-boot-utils.mk deleted file mode 100644 index b8a342bfbd..0000000000 --- a/package.bak/omap-u-boot-utils/omap-u-boot-utils.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# omap-u-boot-utils -# -################################################################################ - -OMAP_U_BOOT_UTILS_VERSION = 3f07426cddc0be9e24702e7aacc7574ddd7fba28 -OMAP_U_BOOT_UTILS_SITE = $(call github,nmenon,omap-u-boot-utils,$(OMAP_U_BOOT_UTILS_VERSION)) -OMAP_U_BOOT_UTILS_LICENSE = GPLv2, GPLv2+ -OMAP_U_BOOT_UTILS_LICENSE_FILES = COPYING - -define HOST_OMAP_U_BOOT_UTILS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_OMAP_U_BOOT_UTILS_INSTALL_CMDS - for f in gpsign pserial tagger ucmd ukermit ; do \ - $(INSTALL) -D -m 755 $(@D)/$$f $(HOST_DIR)/usr/bin/$$f ; \ - done -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/omniorb/0001-fix-unistd-sys-time-includes.patch b/package.bak/omniorb/0001-fix-unistd-sys-time-includes.patch deleted file mode 100644 index 29d917b062..0000000000 --- a/package.bak/omniorb/0001-fix-unistd-sys-time-includes.patch +++ /dev/null @@ -1,61 +0,0 @@ -omniorb/thread: use proper autoconf macros for header inclusion - -src/lib/omnithread/posix.cc uses sleep() and usleep(), defined in - on numerous platforms, and struct timeval/gettimeofday(), -defined in on various platforms. - -Since those header files are not available on all platforms, posix.cc -currently uses the following condition: - -#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__) - -Unfortunately, this falls short on Linux systems based on the musl C -library. Indeed, the musl C library does not define the __GLIBC__ -symbol, but does have the sleep()/usleep() definitions in , -and the struct timeval/gettimeofday() definitions in , -like any Linux system. Also, the musl C library does not define any -constant like __MUSL__ to distinguish it. - -Due to this, on musl based systems, and are -not included, causing a build failure: - -posix.cc:864:22: error: '::sleep' has not been declared - while ((secs = ::sleep(secs))) ; - ^ -posix.cc:866:43: error: 'usleep' was not declared in this scope - usleep(secs * 1000000 + (nanosecs / 1000)); - ^ -posix.cc: In static member function 'static void omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)': -posix.cc:904:20: error: aggregate 'omni_thread::get_time(long unsigned int*, long unsigned int*, long unsigned int, long unsigned int)::timeval tv' has incomplete type and cannot be defined - struct timeval tv; - ^ -posix.cc:905:24: error: 'gettimeofday' was not declared in this scope - gettimeofday(&tv, 0); - -It turns out that the configure.ac already checks for the availability -of and . So all what this patch does is use the -C defines generated by the configure script to decide whether - and can be included or not. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/lib/omnithread/posix.cc -=================================================================== ---- a/src/lib/omnithread/posix.cc -+++ b/src/lib/omnithread/posix.cc -@@ -78,10 +78,14 @@ - #include - #include - #include -+#include - --#if (defined(__GLIBC__) && __GLIBC__ >= 2) || defined(__SCO_VERSION__) || defined(__aix__) || defined (__cygwin__) || defined(__darwin__) || defined(__macos__) - // typedef of struct timeval and gettimeofday(); -+#if defined(HAVE_SYS_TIME_H) - #include -+#endif -+ -+#if defined(HAVE_UNISTD_H) - #include - #endif - diff --git a/package.bak/omniorb/Config.in b/package.bak/omniorb/Config.in deleted file mode 100644 index b8c4e0a59e..0000000000 --- a/package.bak/omniorb/Config.in +++ /dev/null @@ -1,26 +0,0 @@ - -comment "omniORB needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OMNIORB - bool "omniorb" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - omniORB is a robust high performance CORBA ORB for C++ and Python. - omniORB is largely CORBA 2.6 compliant. omniORB is one of only - three ORBs to have been awarded the Open Group's Open Brand for - CORBA. This means that omniORB has been tested and certified - CORBA compliant, to version 2.1 of the CORBA specification. - - http://omniorb.sourceforge.net/ - -if BR2_PACKAGE_OMNIORB - -config BR2_PACKAGE_OMNIORB_WITH_APPS - bool "Enable Apps and Services" - help - omniORB applications and services disabled by default - embedded system build configuration. - -endif diff --git a/package.bak/omniorb/omniorb.hash b/package.bak/omniorb/omniorb.hash deleted file mode 100644 index 3d98b46619..0000000000 --- a/package.bak/omniorb/omniorb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/omniorb/files/omniORB/omniORB-4.2.1/ -sha1 cf0f3ca7caab901c9485ca8afd85087c080c9684 omniORB-4.2.1.tar.bz2 -md5 dbe349d2bd929d349083b303bb4317e5 omniORB-4.2.1.tar.bz2 diff --git a/package.bak/omniorb/omniorb.mk b/package.bak/omniorb/omniorb.mk deleted file mode 100644 index 98bae20a71..0000000000 --- a/package.bak/omniorb/omniorb.mk +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################ -# -# omniorb -# -################################################################################ - -OMNIORB_VERSION = 4.2.1 -OMNIORB_SITE = http://downloads.sourceforge.net/project/omniorb/omniORB/omniORB-$(OMNIORB_VERSION) -OMNIORB_SOURCE = omniORB-$(OMNIORB_VERSION).tar.bz2 -OMNIORB_INSTALL_STAGING = YES -OMNIORB_LICENSE = GPL2+, LGPLv2.1+ -OMNIORB_LICENSE_FILES = COPYING COPYING.LIB -OMNIORB_DEPENDENCIES = host-omniorb -HOST_OMNIORB_DEPENDENCIES = host-python - -# omniorb is not python3 friendly, so force the python interpreter -OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2 -HOST_OMNIORB_CONF_OPTS = ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2 - -# Defaulting long double support to a safe option for the -# mix of embedded targets, this could later be automated -# based on checking the capability of the cross toolchain -# for "__LONG_DOUBLE_128__". Currently the host and target -# need to match because of the code generation done by the -# host tools during the target compile (ie headers generated -# on host are used in target build). -OMNIORB_CONF_OPTS += --disable-longdouble -HOST_OMNIORB_CONF_OPTS += --disable-longdouble - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OMNIORB_CONF_OPTS += --with-openssl -OMNIORB_DEPENDENCIES += openssl -else -OMNIORB_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -OMNIORB_DEPENDENCIES += zlib -endif - -# The EmbeddedSystem define (set below in OMNIORB_ADJUST_TOOLDIR) -# enables building of just the lib and disables building of -# tools/apps/services. In some cases the apps/services are still -# required. The tools however are host related and should never -# be required on target. -define OMNIORB_ENABLE_EXTRA_APPS - $(SED) 's:SUBDIRS += lib:SUBDIRS += lib appl services:g' $(@D)/src/dir.mk -endef - -ifeq ($(BR2_PACKAGE_OMNIORB_WITH_APPS),y) -OMNIORB_POST_PATCH_HOOKS += OMNIORB_ENABLE_EXTRA_APPS -endif - -ifeq ($(BR2_STATIC_LIBS),y) -define OMNIORB_DISABLE_SHARED - echo "BuildSharedLibrary =" >> $(@D)/mk/beforeauto.mk -endef -OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_DISABLE_SHARED -endif - -# omniORB is not completely cross-compile friendly and has some -# assumptions where a couple host tools must be built and then -# used by the target build. The host tools generate code from -# the IDL description language, which is then built into the -# cross compiled target OMNIORB application. -define OMNIORB_ADJUST_TOOLDIR - # Point to the host folder to get HOST_OMNIORB tools - $(SED) 's:TOOLBINDIR = $$(TOP)/$$(BINDIR):TOOLBINDIR = $(HOST_DIR)/usr/bin:g' $(@D)/mk/beforeauto.mk - # Disables OMNIORB app/service/tool building - echo "EmbeddedSystem=1" >> $(@D)/mk/beforeauto.mk -endef -OMNIORB_POST_CONFIGURE_HOOKS += OMNIORB_ADJUST_TOOLDIR - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/omxplayer/0001-Makefiles-clean-up-the-cruft.patch b/package.bak/omxplayer/0001-Makefiles-clean-up-the-cruft.patch deleted file mode 100644 index 2dc6166975..0000000000 --- a/package.bak/omxplayer/0001-Makefiles-clean-up-the-cruft.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 563dafc1129848419482b540d149d0b8687cac1e Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 10 Apr 2016 16:22:53 +0200 -Subject: [PATCH] Makefiles: clean up the cruft - -Most of the variables that Makefile.include tries (but fails) to set, -are already available from Buildroot's variables: - - AR, AS, CC, CXX, OBJDUMP... - - CFLAGS, CXXFLAGS, CPPFLAGS... - -This leaves us with a few select variables that define include and -library paths local to the omxplayer package, plus a few optimisations. - -Finally, also remove hard-coded, absolute paths pointing to the host -system (won't work for cross-compilation, so our paranoid wrapper would -catch those paths). - -Signed-off-by: "Yann E. MORIN" ---- - Makefile | 2 +- - Makefile.include | 20 ++------------------ - 2 files changed, 3 insertions(+), 19 deletions(-) - -diff --git a/Makefile b/Makefile -index bcfadfb..3dc1a03 100644 ---- a/Makefile -+++ b/Makefile -@@ -4,7 +4,7 @@ CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX - - LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz - --INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -+INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ - - DIST ?= omxplayer-dist - -diff --git a/Makefile.include b/Makefile.include -index 58e9560..79ca277 100644 ---- a/Makefile.include -+++ b/Makefile.include -@@ -20,21 +20,5 @@ endif - - JOBS=7 - --CFLAGS := -isystem$(PREFIX)/include --CXXFLAGS := $(CFLAGS) --CPPFLAGS := $(CFLAGS) --LDFLAGS := -L$(BUILDROOT)/lib --LD := $(TOOLCHAIN)/bin/$(HOST)-ld --sysroot=$(SYSROOT) --CC := $(TOOLCHAIN)/bin/$(HOST)-gcc --sysroot=$(SYSROOT) --CXX := $(TOOLCHAIN)/bin/$(HOST)-g++ --sysroot=$(SYSROOT) --OBJDUMP := $(TOOLCHAIN)/bin/$(HOST)-objdump --RANLIB := $(TOOLCHAIN)/bin/$(HOST)-ranlib --STRIP := $(TOOLCHAIN)/bin/$(HOST)-strip --AR := $(TOOLCHAIN)/bin/$(HOST)-ar --CXXCP := $(CXX) -E --PATH := $(PREFIX)/bin:$(BUILDROOT)/output/host/usr/bin:$(PATH) -- --CFLAGS += -pipe -mfloat-abi=$(FLOAT) -mcpu=arm1176jzf-s -fomit-frame-pointer -mabi=aapcs-linux -mtune=arm1176jzf-s -mfpu=vfp -Wno-psabi -mno-apcs-stack-check -g -mstructure-size-boundary=32 -mno-sched-prolog --LDFLAGS += -L$(SDKSTAGE)/lib -L$(SDKSTAGE)/usr/lib -L$(SDKSTAGE)/opt/vc/lib/ -Lpcre/build --#INCLUDES += -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2 --INCLUDES += -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include -+CFLAGS += -fomit-frame-pointer -Wno-psabi -mno-apcs-stack-check \ -+ -mstructure-size-boundary=32 -mno-sched-prolog --- -1.9.1 - diff --git a/package.bak/omxplayer/Config.in b/package.bak/omxplayer/Config.in deleted file mode 100644 index b417aa3b0b..0000000000 --- a/package.bak/omxplayer/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_OMXPLAYER - bool "omxplayer" - depends on BR2_arm - depends on BR2_USE_MMU # dbus - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS # ffmpeg - depends on BR2_INSTALL_LIBSTDCPP # boost - depends on BR2_TOOLCHAIN_HAS_THREADS # boost, libusb - depends on BR2_USE_WCHAR # boost - depends on BR2_PACKAGE_RPI_USERLAND - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_AVRESAMPLE - select BR2_PACKAGE_FFMPEG_SWSCALE - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_LIBIDN - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_ZLIB - help - OMXPlayer is a commandline OMX player for the Raspberry Pi. It was - developed as a testbed for the XBMC Raspberry PI implementation - and is quite handy to use standalone. - - https://github.com/popcornmix/omxplayer - -comment "omxplayer needs rpi-userland and a toolchain w/ C++, threads, wchar, dynamic library" - depends on BR2_arm - depends on BR2_USE_MMU - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on !BR2_PACKAGE_RPI_USERLAND - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/omxplayer/omxplayer.hash b/package.bak/omxplayer/omxplayer.hash deleted file mode 100644 index 4ee215b767..0000000000 --- a/package.bak/omxplayer/omxplayer.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha1 23eb444757e445c127a7114ae233569cac64f984 omxplayer-6c90c7503ba4658221774759edf7f2ae816711de.tar.gz -sha256 93ebfd654314231749936e4fc09f5ec4a361806cdb640d7579a5106921e00299 omxplayer-6c90c7503ba4658221774759edf7f2ae816711de.tar.gz diff --git a/package.bak/omxplayer/omxplayer.mk b/package.bak/omxplayer/omxplayer.mk deleted file mode 100644 index da4614bf56..0000000000 --- a/package.bak/omxplayer/omxplayer.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# omxplayer -# -################################################################################ - -OMXPLAYER_VERSION = 6c90c7503ba4658221774759edf7f2ae816711de -OMXPLAYER_SITE = $(call github,popcornmix,omxplayer,$(OMXPLAYER_VERSION)) -OMXPLAYER_LICENSE = GPLv2+ -OMXPLAYER_LICENSE_FILES = COPYING - -OMXPLAYER_DEPENDENCIES = \ - host-pkgconf boost dbus ffmpeg freetype libidn libusb pcre \ - rpi-userland zlib - -OMXPLAYER_EXTRA_CFLAGS = \ - -DTARGET_LINUX -DTARGET_POSIX \ - `$(PKG_CONFIG_HOST_BINARY) --cflags bcm_host` \ - `$(PKG_CONFIG_HOST_BINARY) --cflags freetype2` \ - `$(PKG_CONFIG_HOST_BINARY) --cflags dbus-1` - -# OMXplayer has support for building in Buildroot, but that -# procedure is, well, tainted. Fix this by forcing the real, -# correct values. -OMXPLAYER_MAKE_ENV = \ - USE_BUILDROOT=1 \ - BUILDROOT=$(TOP_DIR) \ - SDKSTAGE=$(STAGING_DIR) \ - TARGETFS=$(TARGET_DIR) \ - TOOLCHAIN=$(HOST_DIR)/usr \ - HOST=$(GNU_TARGET_NAME) \ - SYSROOT=$(STAGING_DIR) \ - JOBS=$(PARALLEL_JOBS) \ - $(TARGET_CONFIGURE_OPTS) \ - STRIP=true \ - CFLAGS="$(TARGET_CFLAGS) $(OMXPLAYER_EXTRA_CFLAGS)" - -define OMXPLAYER_BUILD_CMDS - $(OMXPLAYER_MAKE_ENV) $(MAKE) -C $(@D) omxplayer.bin -endef - -define OMXPLAYER_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/omxplayer.bin $(TARGET_DIR)/usr/bin/omxplayer -endef - -$(eval $(generic-package)) diff --git a/package.bak/on2-8170-libs/Config.in b/package.bak/on2-8170-libs/Config.in deleted file mode 100644 index 40cad3d00c..0000000000 --- a/package.bak/on2-8170-libs/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_ON2_8170_LIBS - #This is a binary only package which has been compiled for glibc - depends on BR2_arm926t - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_LINUX_KERNEL # on2-8170-modules - select BR2_PACKAGE_ON2_8170_MODULES # runtime - bool "on2-8170-libs" - help - Libraries for Hantro X170 video decoder - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "on2-8170-libs needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/on2-8170-libs/on2-8170-libs.hash b/package.bak/on2-8170-libs/on2-8170-libs.hash deleted file mode 100644 index c8b76e5794..0000000000 --- a/package.bak/on2-8170-libs/on2-8170-libs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 db7390a13e7c0426894a6f966ecde1f89e6566416088c50729750e800306a2de on2-8170-libs-1.0.tar.gz diff --git a/package.bak/on2-8170-libs/on2-8170-libs.mk b/package.bak/on2-8170-libs/on2-8170-libs.mk deleted file mode 100644 index ad321d832f..0000000000 --- a/package.bak/on2-8170-libs/on2-8170-libs.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# on2-8170-libs -# -################################################################################ - -ON2_8170_LIBS_VERSION = 1.0 -ON2_8170_LIBS_SITE = ftp://ftp.linux4sam.org/pub/demo/linux4sam_1.9/codec - -ON2_8170_LIBS_LICENSE = PROPRIETARY -# No license file is included in the archive - -ON2_8170_LIBS_INSTALL_STAGING = YES - -define ON2_8170_LIBS_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/lib $(STAGING_DIR)/usr/include - cp -dpf $(@D)/*.a $(@D)/*.so $(STAGING_DIR)/usr/lib - cp -dpf $(@D)/*.h $(STAGING_DIR)/usr/include -endef - -define ON2_8170_LIBS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/lib - cp -dpf $(@D)/*.so $(TARGET_DIR)/usr/lib -endef - -$(eval $(generic-package)) diff --git a/package.bak/on2-8170-modules/Config.in b/package.bak/on2-8170-modules/Config.in deleted file mode 100644 index 06ce992fb4..0000000000 --- a/package.bak/on2-8170-modules/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_ON2_8170_MODULES - bool "on2-8170-modules" - depends on BR2_LINUX_KERNEL - depends on BR2_arm926t - help - Kernel modules for Hantro x170 hardware video decompression support. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SAM9M10Gstreamer - -comment "on2-8170-modules needs a Linux kernel to be built" - depends on BR2_arm926t - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/on2-8170-modules/on2-8170-modules.hash b/package.bak/on2-8170-modules/on2-8170-modules.hash deleted file mode 100644 index cfb1272dd3..0000000000 --- a/package.bak/on2-8170-modules/on2-8170-modules.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d04d3acb8755281f6721d2a2efe04014060f83f38972208f356a486d52ca8bfc on2-8170-modules-73b08061d30789178e692bc332b73d1d9922bf39.tar.gz diff --git a/package.bak/on2-8170-modules/on2-8170-modules.mk b/package.bak/on2-8170-modules/on2-8170-modules.mk deleted file mode 100644 index b40ed86cf9..0000000000 --- a/package.bak/on2-8170-modules/on2-8170-modules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# on2-8170-modules -# -################################################################################ - -ON2_8170_MODULES_VERSION = 73b08061d30789178e692bc332b73d1d9922bf39 -ON2_8170_MODULES_SITE = $(call github,alexandrebelloni,on2-8170-modules,$(ON2_8170_MODULES_VERSION)) - -ON2_8170_MODULES_LICENSE = GPLv2+ -#There is no license file - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch b/package.bak/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch deleted file mode 100644 index 9fc30a969f..0000000000 --- a/package.bak/open-plc-utils/0001-Remove-OWNER-and-GROUPS-parameters-to-install.patch +++ /dev/null @@ -1,298 +0,0 @@ -From fdfeac7e77382ddd0e3fb4f2abeae84f0a31584f Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Tue, 30 Sep 2014 13:46:59 +0200 -Subject: [PATCH] Remove OWNER and GROUPS parameters to install - -The Install tries to change the owner and groups of the binary. In -Buildroot we don't want that, since fakeroot will do its job when we -finalize the rootfs. - -Signed-off-by: Maxime Hadjinlian ---- - docbook/Makefile | 4 ++-- - ether/Makefile | 8 ++++---- - iso15118/Makefile | 8 ++++---- - key/Makefile | 8 ++++---- - mdio/Makefile | 8 ++++---- - mme/Makefile | 8 ++++---- - nvm/Makefile | 8 ++++---- - pib/Makefile | 8 ++++---- - plc/Makefile | 8 ++++---- - ram/Makefile | 8 ++++---- - scripts/Makefile | 4 ++-- - serial/Makefile | 8 ++++---- - slac/Makefile | 8 ++++---- - tools/Makefile | 2 +- - 14 files changed, 49 insertions(+), 49 deletions(-) - -diff --git a/docbook/Makefile b/docbook/Makefile -index d630822..23a9b5a 100755 ---- a/docbook/Makefile -+++ b/docbook/Makefile -@@ -32,9 +32,9 @@ manuals: - ${SHELL} ../docbook/manuals - scripts: - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${LIBRARY} -+ install -m ${DIR_PERM} -d ${LIBRARY} - install: library -- if [ -d ${LIBRARY} ]; then install -m ${WWW_PERM} -o ${OWNER} -g ${GROUP} *.html *.css *.png ${LIBRARY}; fi -+ if [ -d ${LIBRARY} ]; then install -m ${WWW_PERM} *.html *.css *.png ${LIBRARY}; fi - uninstall: - rm -f ${LIBRARY}/*.c.html ${LIBRARY}/*.h.html ${LIBRARY}/*.1.html - setup: -diff --git a/ether/Makefile b/ether/Makefile -index 807cbcb..574050a 100755 ---- a/ether/Makefile -+++ b/ether/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/iso15118/Makefile b/iso15118/Makefile -index 72afdc4..da11a1c 100755 ---- a/iso15118/Makefile -+++ b/iso15118/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}; fi -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -d ${MAN}; fi -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: compile library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} -diff --git a/key/Makefile b/key/Makefile -index 7de75ff..ee8968c 100755 ---- a/key/Makefile -+++ b/key/Makefile -@@ -28,13 +28,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - cd ${MAN}; rm -f ${PAGES} -diff --git a/mdio/Makefile b/mdio/Makefile -index 60a75a9..062d858 100755 ---- a/mdio/Makefile -+++ b/mdio/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f int6k ${TOOLS} - cd ${MAN}; rm -f int6k ${PAGES} -diff --git a/mme/Makefile b/mme/Makefile -index d6a9132..23f4775 100755 ---- a/mme/Makefile -+++ b/mme/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/nvm/Makefile b/nvm/Makefile -index 5ae47d2..d7f4037 100755 ---- a/nvm/Makefile -+++ b/nvm/Makefile -@@ -28,12 +28,12 @@ compact: compile - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/pib/Makefile b/pib/Makefile -index 3af94c8..908b03a 100644 ---- a/pib/Makefile -+++ b/pib/Makefile -@@ -30,12 +30,12 @@ compact: compile - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - check: -diff --git a/plc/Makefile b/plc/Makefile -index bd8b806..5b41c0b 100644 ---- a/plc/Makefile -+++ b/plc/Makefile -@@ -32,13 +32,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f int6k ${TOOLS} - cd ${MAN}; rm -f int6k ${PAGES} -diff --git a/ram/Makefile b/ram/Makefile -index 60b9bb3..c951218 100755 ---- a/ram/Makefile -+++ b/ram/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f ${TOOLS} - cd ${MAN}; rm -f ${PAGES} -diff --git a/serial/Makefile b/serial/Makefile -index c25f1a6..6420d4a 100755 ---- a/serial/Makefile -+++ b/serial/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- test -d ${MAN} || install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN} -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ test -d ${MAN} || install -m ${DIR_PERM} -d ${MAN} -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: $(TOOLS) library -- install -m ${BIN_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${BIN_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f int6k ${TOOLS} - cd ${MAN}; rm -f int6k ${PAGES} -diff --git a/slac/Makefile b/slac/Makefile -index d69da17..449f20a 100755 ---- a/slac/Makefile -+++ b/slac/Makefile -@@ -27,13 +27,13 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: -- if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${MAN}; fi -- install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} -+ if [ ! -d ${MAN} ]; then install -m ${DIR_PERM} -d ${MAN}; fi -+ install -m ${MAN_PERM} ${PAGES} ${MAN} - install: compile library -- install -m ${SUID_PERM} -o ${OWNER} -g ${GROUP} ${TOOLS} ${BIN} -+ install -m ${SUID_PERM} ${TOOLS} ${BIN} - uninstall: - cd ${BIN}; rm -f plc ${TOOLS} - cd ${MAN}; rm -f plc ${PAGES} -diff --git a/tools/Makefile b/tools/Makefile -index 1d992cf..f17db3d 100755 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -27,7 +27,7 @@ compact: compile - if [ ! -z ${STRIP} ]; then ${STRIP} ${TOOLS}; fi - if [ -x /usr/local/bin/upx ]; then upx --best ${TOOLS}; fi - library: -- install -m ${DIR_PERM} -o ${OWNER} -g ${GROUP} -d ${BIN} -+ install -m ${DIR_PERM} -d ${BIN} - scripts: - manuals: - # install -m ${MAN_PERM} -o ${OWNER} -g ${GROUP} ${PAGES} ${MAN} --- -2.1.0 diff --git a/package.bak/open-plc-utils/Config.in b/package.bak/open-plc-utils/Config.in deleted file mode 100644 index 8ae3504c9c..0000000000 --- a/package.bak/open-plc-utils/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_OPEN_PLC_UTILS - bool "open-plc-utils" - depends on BR2_USE_MMU # fork() - help - Open version of the Qualcomm Atheros Powerline Toolkit - - https://github.com/qca/open-plc-utils diff --git a/package.bak/open-plc-utils/open-plc-utils.hash b/package.bak/open-plc-utils/open-plc-utils.hash deleted file mode 100644 index a76630df96..0000000000 --- a/package.bak/open-plc-utils/open-plc-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 00cd7f71e03849b1d6a96ec040351b819481e2f420cfb246f0b0f02cde73e098 open-plc-utils-1be781d1ea81827e5f6c1a35961c65dd4d15472c.tar.gz diff --git a/package.bak/open-plc-utils/open-plc-utils.mk b/package.bak/open-plc-utils/open-plc-utils.mk deleted file mode 100644 index 67c8d7dc8a..0000000000 --- a/package.bak/open-plc-utils/open-plc-utils.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# open-plc-utils -# -################################################################################ - -OPEN_PLC_UTILS_VERSION = 1be781d1ea81827e5f6c1a35961c65dd4d15472c -OPEN_PLC_UTILS_SITE = $(call github,qca,open-plc-utils,$(OPEN_PLC_UTILS_VERSION)) -OPEN_PLC_UTILS_LICENSE = BSD-3c -OPEN_PLC_UTILS_LICENSE_FILES = LICENSE - -# We unfortunately can't use TARGET_CONFIGURE_OPTS, as it would -# override the package CFLAGS, LDFLAGS and CXXFLAGS definitions. -# -# Yes, we're passing __UCLIBC__ in EXTRA_CFLAGS, as it fixes a build -# issue for non-uClibc toolchains. It is the very crappy solution -# suggested at https://github.com/qca/open-plc-utils/issues/36. -define OPEN_PLC_UTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS=$(TARGET_CROSS) EXTRA_CFLAGS="-D__UCLIBC__" -C $(@D) -endef - -define OPEN_PLC_UTILS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) ROOTFS=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/open2300/0001-fix-makefile.patch b/package.bak/open2300/0001-fix-makefile.patch deleted file mode 100644 index c3bb252368..0000000000 --- a/package.bak/open2300/0001-fix-makefile.patch +++ /dev/null @@ -1,52 +0,0 @@ -From b0a1f12349bee43040a889c7e74873cfb253b9d8 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 6 Feb 2014 21:42:50 +0100 -Subject: [PATCH] fix makefile - -- allow to extend CFLAGS and CC_LDFLAGS -- remove hard-coded include dirs. and lib. dirs. (which pointed to some - location in the host system) - -Signed-off-by: Samuel Martin ---- - Makefile | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index 92a2cc0..1b54175 100755 ---- a/Makefile -+++ b/Makefile -@@ -37,9 +37,9 @@ MYSQLHISTLOGOBJ = mysqlhistlog2300.o rw2300.o linux2300.o win2300.o - - VERSION = 1.11 - --CFLAGS = -Wall -O3 -DVERSION=\"$(VERSION)\" --CC_LDFLAGS = -lm --CC_WINFLAG = -+override CFLAGS += -Wall -O3 -DVERSION=\"$(VERSION)\" -+override CC_LDFLAGS += -lm -+CC_WINFLAG = - # For Windows - comment the two line above and un-comment the two lines below. - #CC_LDFLAGS = -lm -lwsock32 - #CC_WINFLAG = -mwindows -@@ -80,7 +80,7 @@ xml2300 : $(XMLOBJ) - $(CC) $(CFLAGS) -o $@ $(XMLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) - - mysql2300: -- $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient -+ $(CC) $(CFLAGS) -o mysql2300 mysql2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) - - pgsql2300: $(PGSQLOBJ) - $(CC) $(CFLAGS) -o $@ $(PGSQLOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/pgsql -L/usr/lib/pgsql -lpq -@@ -95,7 +95,7 @@ minmax2300: $(MINMAXOBJ) - $(CC) $(CFLAGS) -o $@ $(MINMAXOBJ) $(CC_LDFLAGS) $(CC_WINFLAG) - - mysqlhistlog2300 : -- $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) -I/usr/include/mysql -L/usr/lib/mysql -lmysqlclient -+ $(CC) $(CFLAGS) -o mysqlhistlog2300 mysqlhistlog2300.c rw2300.c linux2300.c $(CC_LDFLAGS) $(CC_WINFLAG) - - - install: --- -1.8.5.3 - diff --git a/package.bak/open2300/Config.in b/package.bak/open2300/Config.in deleted file mode 100644 index df0a969fa6..0000000000 --- a/package.bak/open2300/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_OPEN2300 - bool "open2300" - help - open2300 reads (and writes) data from a Lacrosse - WS2300/WS2305/WS2310/WS2315 Weather Station - - http://www.lavrsen.dk/foswiki/bin/view/Open2300/WebHome diff --git a/package.bak/open2300/open2300.mk b/package.bak/open2300/open2300.mk deleted file mode 100644 index 588692d44f..0000000000 --- a/package.bak/open2300/open2300.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# open2300 -# -################################################################################ - -OPEN2300_SITE = http://www.lavrsen.dk/svn/open2300/trunk -OPEN2300_SITE_METHOD = svn -OPEN2300_VERSION = 12 -OPEN2300_LICENSE = GPLv2 -OPEN2300_LICENSE_FILES = COPYING - -OPEN2300_BINS = \ - open2300 dump2300 log2300 fetch2300 wu2300 cw2300 history2300 \ - histlog2300 bin2300 xml2300 light2300 interval2300 minmax2300 -OPEN2300_CFLAGS = $(TARGET_CFLAGS) -OPEN2300_LDFLAGS = $(TARGET_LDFLAGS) - -ifeq ($(BR2_PACKAGE_MYSQL),y) -OPEN2300_DEPENDENCIES += mysql -OPEN2300_BINS += mysql2300 mysqlhistlog2300 -OPEN2300_CFLAGS += -I$(STAGING_DIR)/usr/include/mysql -OPEN2300_LDFLAGS += -L$(STAGING_DIR)/usr/lib/mysql -lmysqlclient -ifeq ($(BR2_STATIC_LIBS),y) -# mysql needs -lz, so we need to specify it for static builds -OPEN2300_LDFLAGS += -lz -endif -endif - -define OPEN2300_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" \ - CFLAGS="$(OPEN2300_CFLAGS)" CC_LDFLAGS="$(OPEN2300_LDFLAGS)" \ - -C $(@D) $(OPEN2300_BINS) -endef - -define OPEN2300_INSTALL_TARGET_CMDS - for prog in $(OPEN2300_BINS); do \ - $(INSTALL) -D -m 0755 $(@D)/$$prog $(TARGET_DIR)/usr/bin/$$prog ; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/openal/0001-Fix-detection-of-C11-atomics.patch b/package.bak/openal/0001-Fix-detection-of-C11-atomics.patch deleted file mode 100644 index c6b9840908..0000000000 --- a/package.bak/openal/0001-Fix-detection-of-C11-atomics.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 10fee6d71a1f7d6e6319005196562b4a30b4e8ff Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 2 Feb 2016 14:58:52 +0100 -Subject: [PATCH] Fix detection of C11 atomics - -Currently, the CMakeLists.txt logic to detect the availability of C11 -atomics is based on building a small program that uses the -atomic_load(). - -However, atomic_load() does not need to use any function from -libatomic (part of the gcc runtime). So even if libatomic is missing, -this test concludes that C11 atomic support is available. For example -on SPARC, the example program builds fine without linking to -libatomic, but calling other functions of the atomic_*() APIs fail -without linking to libatomic. - -So, this patch adjusts the CMakeLists.txt test to use a function that -is known to require the libatomic run-time library (on architectures -where it is needed). This way, openal will only use the __atomic_*() -built-ins when they are actually functional. - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5784d35..a53f996 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -209,14 +209,17 @@ CHECK_C_SOURCE_COMPILES( - HAVE_C11_ALIGNAS) - - # Check if we have C11 _Atomic -+set(OLD_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES}) -+set(CMAKE_REQUIRED_LIBRARIES ${EXTRA_LIBS}) - CHECK_C_SOURCE_COMPILES( - "#include -- const int _Atomic foo = ATOMIC_VAR_INIT(~0); -+ int _Atomic foo = ATOMIC_VAR_INIT(~0); - int main() - { -- return atomic_load(&foo); -+ return atomic_fetch_add(&foo, 2); - }" - HAVE_C11_ATOMIC) -+set(CMAKE_REQUIRED_LIBRARIES ${OLD_REQUIRED_LIBRARIES}) - - # Add definitions, compiler switches, etc. - INCLUDE_DIRECTORIES("${OpenAL_SOURCE_DIR}/include" "${OpenAL_BINARY_DIR}") --- -2.6.4 - diff --git a/package.bak/openal/Config.in b/package.bak/openal/Config.in deleted file mode 100644 index a564156555..0000000000 --- a/package.bak/openal/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -# openal can: -# - use __atomic_*() intrinsics when available -# - otherwise use __sync_*() intrinsics when available. It needs the -# 4-byte ones on 32 bits architectures, and the 4-byte and 8-byte -# one on 64 bits architecture -# - it also provides its one implementation of atomic operations on -# x86 and x86_64, but we dont take those into account since in most -# situations __atomic_*() or __sync_*() will be available, and not -# all x86 CPUs provide the necessary assembly instructions. -config BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - bool - default y if BR2_TOOLCHAIN_HAS_ATOMIC - default y if BR2_TOOLCHAIN_HAS_SYNC_4 && !BR2_ARCH_IS_64 - default y if BR2_TOOLCHAIN_HAS_SYNC_4 && BR2_TOOLCHAIN_HAS_SYNC_8 && BR2_ARCH_IS_64 - -config BR2_PACKAGE_OPENAL - bool "openal" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - help - OpenAL provides capabilities for playing audio in a virtual - 3D environment. Distance attenuation, doppler shift, and - directional sound emitters are among the features handled by - the API. - - http://kcat.strangesoft.net/openal.html - -comment "openal needs a toolchain w/ NPTL, C++" - depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/openal/openal.hash b/package.bak/openal/openal.hash deleted file mode 100644 index 45f1421da0..0000000000 --- a/package.bak/openal/openal.hash +++ /dev/null @@ -1,6 +0,0 @@ -# Locally calculated -sha256 a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 openal-soft-1.17.2.tar.bz2 -sha256 9c9040269376aba77b1277bbae0f055aee535e14ad4a3ab4e66e39830504e83f 27916ce3db023454a0295ee63ea196fbc246674c.patch -sha256 4621f6b79d4bbac5ce423f227c92ad1e4f833d7e1f2ff1cc3b5f03721f75b933 a52cfc804813aef8e4b304e20cf843fa6907af6c.patch -sha256 f442da31b4001a5133f2762a5bc1e780b11d5e2d9f21b257f54695ee6d87d997 c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch -sha256 3691c1a327b87d5fb487841459fd00d3baaa79808ecb5e3b33b349363663640f 46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch diff --git a/package.bak/openal/openal.mk b/package.bak/openal/openal.mk deleted file mode 100644 index 63841047db..0000000000 --- a/package.bak/openal/openal.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# openal -# -################################################################################ - -OPENAL_VERSION = 1.17.2 -OPENAL_SOURCE = openal-soft-$(OPENAL_VERSION).tar.bz2 -OPENAL_SITE = http://kcat.strangesoft.net/openal-releases -OPENAL_PATCH = \ - https://github.com/kcat/openal-soft/commit/27916ce3db023454a0295ee63ea196fbc246674c.patch \ - https://github.com/kcat/openal-soft/commit/a52cfc804813aef8e4b304e20cf843fa6907af6c.patch \ - https://github.com/kcat/openal-soft/commit/c3c283a0b5d0130afafaa2a5b6ce6fbc30b6e6a1.patch \ - https://github.com/kcat/openal-soft/commit/46b3e1d08ca10e809eb2e20b6371812958b97e1f.patch -OPENAL_LICENSE = LGPLv2+ -OPENAL_LICENSE_FILES = COPYING -OPENAL_INSTALL_STAGING = YES - -# We don't need examples, tests and utilities, Distros don't ship them either -OPENAL_CONF_OPTS += -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_TESTS=OFF - -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_4_8),y) -OPENAL_CONF_OPTS += -DEXTRA_LIBS=atomic -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -OPENAL_DEPENDENCIES += alsa-lib -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_ALSA=ON -else -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_ALSA=OFF -endif - -ifeq ($(BR2_PACKAGE_JACK2),y) -OPENAL_DEPENDENCIES += jack2 -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_JACK=ON -else -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_JACK=OFF -endif - -ifeq ($(BR2_PACKAGE_PORTAUDIO),y) -OPENAL_DEPENDENCIES += portaudio -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_PORTAUDIO=ON -else -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_PORTAUDIO=OFF -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -OPENAL_DEPENDENCIES += pulseaudio -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_PULSEAUDIO=ON -else -OPENAL_CONF_OPTS += -DALSOFT_REQUIRE_PULSEAUDIO=OFF -endif - -ifeq ($(BR2_STATIC_LIBS),y) -OPENAL_CONF_OPTS += -DLIBTYPE=STATIC -endif - -$(eval $(cmake-package)) diff --git a/package.bak/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch b/package.bak/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch deleted file mode 100644 index 6e6c5a68bc..0000000000 --- a/package.bak/openblas/0001-Complete-support-for-MIPS-n32-ABI.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 7f28cd1f88145a701e5dbbf50558bb65fce79f61 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 14 Jul 2016 17:20:51 +0100 -Subject: [PATCH] Complete support for MIPS n32 ABI - -Pull request: https://github.com/xianyi/OpenBLAS/pull/926 - -Signed-off-by: Vicente Olivert Riera ---- - Makefile.system | 27 +++++++++------------------ - c_check | 9 +++++++-- - f_check | 7 ++++++- - 3 files changed, 22 insertions(+), 21 deletions(-) - -diff --git a/Makefile.system b/Makefile.system -index 24a7a64..bbcdb82 100644 ---- a/Makefile.system -+++ b/Makefile.system -@@ -502,13 +502,16 @@ endif - - ifdef NO_BINARY_MODE - --ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) -+ifeq ($(ARCH), $(filter $(ARCH),mips64)) - ifdef BINARY64 - CCOMMON_OPT += -mabi=64 - else --CCOMMON_OPT += -mabi=32 -+CCOMMON_OPT += -mabi=n32 - endif - BINARY_DEFINED = 1 -+else ifeq ($(ARCH), $(filter $(ARCH),mips)) -+CCOMMON_OPT += -mabi=32 -+BINARY_DEFINED = 1 - endif - - ifeq ($(CORE), LOONGSON3A) -@@ -599,12 +602,14 @@ ifneq ($(NO_LAPACK), 1) - EXTRALIB += -lgfortran - endif - ifdef NO_BINARY_MODE --ifeq ($(ARCH), $(filter $(ARCH),mips64 mips)) -+ifeq ($(ARCH), $(filter $(ARCH),mips64)) - ifdef BINARY64 - FCOMMON_OPT += -mabi=64 - else --FCOMMON_OPT += -mabi=32 -+FCOMMON_OPT += -mabi=n32 - endif -+else ifeq ($(ARCH), $(filter $(ARCH),mips)) -+FCOMMON_OPT += -mabi=32 - endif - else - ifdef BINARY64 -@@ -688,20 +693,6 @@ endif - endif - endif - --ifeq ($(filter $(ARCH),mips64 mips)) --ifndef BINARY64 --FCOMMON_OPT += -m32 --else --FCOMMON_OPT += -m64 --endif --else --ifdef BINARY64 --FCOMMON_OPT += -mabi=64 --else --FCOMMON_OPT += -mabi=32 --endif --endif -- - ifeq ($(USE_OPENMP), 1) - FCOMMON_OPT += -mp - endif -diff --git a/c_check b/c_check -index 50ff360..9f457df 100644 ---- a/c_check -+++ b/c_check -@@ -79,8 +79,13 @@ if ($os eq "AIX") { - $defined = 1; - } - --if (($architecture eq "mips") || ($architecture eq "mips64")) { -- $compiler_name .= " -mabi=32" if ($binary eq "32"); -+if ($architecture eq "mips") { -+ $compiler_name .= " -mabi=32"; -+ $defined = 1; -+} -+ -+if ($architecture eq "mips64") { -+ $compiler_name .= " -mabi=n32" if ($binary eq "32"); - $compiler_name .= " -mabi=64" if ($binary eq "64"); - $defined = 1; - } -diff --git a/f_check b/f_check -index 4c03ac7..3520e8b 100644 ---- a/f_check -+++ b/f_check -@@ -223,7 +223,12 @@ if (!$?) { - } - #For gfortran MIPS - if ($?) { -- $link = `$compiler $openmp -mabi=32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ $mips_data = `$compiler_bin -E -dM - < /dev/null`; -+ if ($mips_data =~ /_MIPS_ISA_MIPS64/) { -+ $link = `$compiler $openmp -mabi=n32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ } else { -+ $link = `$compiler $openmp -mabi=32 -v ftest2.f 2>&1 && rm -f a.out a.exe`; -+ } - } - $binary = "" if ($?); - } --- -2.7.3 - diff --git a/package.bak/openblas/0002-Makefile.arm-remove-march-flags.patch b/package.bak/openblas/0002-Makefile.arm-remove-march-flags.patch deleted file mode 100644 index 39058f7dfc..0000000000 --- a/package.bak/openblas/0002-Makefile.arm-remove-march-flags.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 71b9e9b7f080c464777d07bd1a917a1c449d2ef8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2016 23:20:00 +0200 -Subject: [PATCH] Makefile.arm: remove -march flags - -The provided -march flags, especially for ARMv5 and ARMv6 may not -necessarily match the needed ones: for ARMv5, it might be armv5, -armv5te, armv5t, etc. If the wrong one is used, the incorrect toolchain -sysroot can be used in a multilib toolchain. - -Therefore, let the user building OpenBLAS pass the appropriate -march -flag. - -The other flags, such as -mfpu=vfp or -mfloat-abi=hard are kept, as they -are actually required for the build to proceed (OpenBLAS uses VFP -instructions, and assume an EABIhf ABI). - -Signed-off-by: Thomas Petazzoni ---- - Makefile.arm | 24 ++++++++++++------------ - 1 file changed, 12 insertions(+), 12 deletions(-) - -diff --git a/Makefile.arm b/Makefile.arm -index 62bf275..c0d6ab8 100644 ---- a/Makefile.arm -+++ b/Makefile.arm -@@ -1,31 +1,31 @@ - # ifeq logical or - ifeq ($(CORE), $(filter $(CORE),CORTEXA9 CORTEXA15)) - ifeq ($(OSNAME), Android) --CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard - else --CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard - endif - endif - - ifeq ($(CORE), ARMV7) - ifeq ($(OSNAME), Android) --CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch --FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -march=armv7-a -Wl,--no-warn-mismatch -+CCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -Wl,--no-warn-mismatch -+FCOMMON_OPT += -marm -mfpu=neon -mfloat-abi=hard -Wl,--no-warn-mismatch - else --CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a --FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -march=armv7-a -+CCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfpv3 -mfloat-abi=hard - endif - endif - - ifeq ($(CORE), ARMV6) --CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6 --FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -march=armv6 -+CCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard -+FCOMMON_OPT += -marm -mfpu=vfp -mfloat-abi=hard - endif - - - ifeq ($(CORE), ARMV5) --CCOMMON_OPT += -marm -march=armv5 --FCOMMON_OPT += -marm -march=armv5 -+CCOMMON_OPT += -marm -+FCOMMON_OPT += -marm - endif --- -2.7.4 - diff --git a/package.bak/openblas/Config.in b/package.bak/openblas/Config.in deleted file mode 100644 index de26ab3b73..0000000000 --- a/package.bak/openblas/Config.in +++ /dev/null @@ -1,75 +0,0 @@ -config BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET - string - default "P2" if BR2_x86_pentium2 - default "KATMAI" if BR2_x86_pentium3 - default "NORTHWOOD" if BR2_x86_pentium4 - default "PRESCOTT" if BR2_x86_prescott - default "BANIAS" if BR2_x86_pentium_m - default "CORE2" if BR2_x86_core2 - default "NEHALEM" if BR2_x86_corei7 - default "SANDYBRIDGE" if BR2_x86_corei7_avx - default "HASWELL" if BR2_x86_core_avx2 - default "ATOM" if BR2_x86_atom - default "ATHLON" if BR2_x86_athlon || BR2_x86_athlon_4 - default "OPTERON" if BR2_x86_opteron - default "OPTERON_SSE3" if BR2_x86_opteron_sse3 - default "BARCELONA" if BR2_x86_barcelona - default "STEAMROLLER" if BR2_x86_steamroller - default "VIAC3" if BR2_x86_c3 || BR2_x86_c32 - default "SSE_GENERIC" if BR2_X86_CPU_HAS_SSE - default "POWER4" if BR2_powerpc_power4 - default "POWER5" if BR2_powerpc_power5 - default "POWER6" if BR2_powerpc_power6 - default "POWER7" if BR2_powerpc_power7 - default "POWER8" if BR2_powerpc_power8 - default "PPCG4" if BR2_powerpc_7400 || BR2_powerpc_7450 - default "PPC970" if BR2_powerpc_970 - default "PPC440" if BR2_powerpc_440 - default "PPC440FP2" if BR2_powerpc_440fp - # P5600 is built with MSA support which is only available in Codescape toolchains - default "P5600" if BR2_mips_p5600 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS - default "SICORTEX" if BR2_MIPS_CPU_MIPS64 - # I6400 is built with MSA support which is only available in Codescape toolchains - default "I6400" if BR2_mips_i6400 && BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS - default "SPARC" if BR2_sparc - # Cortex-A15 always have a VFPv4 - default "CORTEXA15" if (BR2_cortex_a15 && BR2_ARM_EABIHF) - # Cortex-A9 have an optional VFPv3, so we need to make sure it - # is available - default "CORTEXA9" if (BR2_cortex_a9 && BR2_ARM_EABIHF && \ - BR2_ARM_CPU_HAS_VFPV3) - default "ARMV5" if BR2_ARM_CPU_ARMV5 - # On ARMv6, OpenBLAS assumes that a VFP is available, and - # EABIhf is used - default "ARMV6" if (BR2_ARM_CPU_ARMV6 && BR2_ARM_EABIHF && \ - BR2_ARM_CPU_HAS_VFPV2) - # On ARMv7, OpenBLAS assumes that a full VFPv3+ is available - # (and not the more limited D16 variant), and that EABIhf is - # used. - default "ARMV7" if (BR2_ARM_CPU_ARMV7A && BR2_ARM_EABIHF && \ - BR2_ARM_CPU_HAS_VFPV3) - default "ARMV8" if BR2_aarch64 || BR2_aarch64_be - help - OpenBLAS target CPU. See TargetList.txt in the source tree for - the possible target strings. A possible value is set - automatically based on your Target Architecture Variant. - -config BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS - bool - default y if BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET != "" - -config BR2_PACKAGE_OPENBLAS - bool "openblas" - depends on BR2_PACKAGE_OPENBLAS_ARCH_SUPPORTS - help - An optimized BLAS library based on GotoBLAS2 1.13 BSD version. - - https://www.openblas.net/ - -if BR2_PACKAGE_OPENBLAS - -config BR2_PACKAGE_OPENBLAS_TARGET - string "OpenBLAS target CPU" - default BR2_PACKAGE_OPENBLAS_DEFAULT_TARGET - -endif diff --git a/package.bak/openblas/openblas.hash b/package.bak/openblas/openblas.hash deleted file mode 100644 index b402cac522..0000000000 --- a/package.bak/openblas/openblas.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2ad0270a39dbaf891b439baacf198ea4ab149cd6ed39a5f50c494723f1936be5 openblas-f04af36ad0e85b64f12a7c38095383192cc52345.tar.gz diff --git a/package.bak/openblas/openblas.mk b/package.bak/openblas/openblas.mk deleted file mode 100644 index a26e10a43c..0000000000 --- a/package.bak/openblas/openblas.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# openblas -# -################################################################################ - -OPENBLAS_VERSION = f04af36ad0e85b64f12a7c38095383192cc52345 -OPENBLAS_SITE = $(call github,xianyi,OpenBLAS,$(OPENBLAS_VERSION)) -OPENBLAS_LICENSE = BSD-3c -OPENBLAS_LICENSE_FILES = LICENSE -OPENBLAS_INSTALL_STAGING = YES - -# Initialise OpenBLAS make options to $(TARGET_CONFIGURE_OPTS) -OPENBLAS_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) - -# Enable cross-compiling -OPENBLAS_MAKE_OPTS += CROSS=1 - -# Set OpenBLAS target -OPENBLAS_MAKE_OPTS += TARGET=$(BR2_PACKAGE_OPENBLAS_TARGET) - -# When Fortran is not available, only build the C version of BLAS -ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),) -OPENBLAS_MAKE_OPTS += ONLY_CBLAS=1 -endif - -# Enable/Disable multi-threading (not for static-only since it uses dlfcn.h) -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS):$(BR2_STATIC_LIBS),y:) -OPENBLAS_MAKE_OPTS += USE_THREAD=1 -else -OPENBLAS_MAKE_OPTS += USE_THREAD=0 -endif - -# We don't know if OpenMP is available or not, so disable -OPENBLAS_MAKE_OPTS += USE_OPENMP=0 - -# Static-only/Shared-only toggle -ifeq ($(BR2_STATIC_LIBS),y) -OPENBLAS_MAKE_OPTS += NO_SHARED=1 -else ifeq ($(BR2_SHARED_LIBS),y) -OPENBLAS_MAKE_OPTS += NO_STATIC=1 -endif - -# binutils version <= 2.23.2 has a bug -# (https://sourceware.org/bugzilla/show_bug.cgi?id=14887) where -# whitespaces in ARM register specifications such as [ r1, #12 ] or [ -# r2 ] cause the assembler to reject the code. Since there are -# numerous instances of such cases in the code, we use sed rather than -# a patch. We simply replace [ foobar ] by [foobar] to work around the -# problem. -define OPENBLAS_FIXUP_ARM_ASSEMBLY - $(SED) 's%\[\s*%\[%;s%\s*\]%\]%' $(@D)/kernel/arm/*.S -endef - -OPENBLAS_POST_PATCH_HOOKS += OPENBLAS_FIXUP_ARM_ASSEMBLY - -define OPENBLAS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENBLAS_MAKE_OPTS) \ - -C $(@D) -endef - -define OPENBLAS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENBLAS_MAKE_OPTS) \ - -C $(@D) install PREFIX=$(STAGING_DIR)/usr -endef - -define OPENBLAS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENBLAS_MAKE_OPTS) \ - -C $(@D) install PREFIX=$(TARGET_DIR)/usr -endef - -$(eval $(generic-package)) diff --git a/package.bak/openbox/Config.in b/package.bak/openbox/Config.in deleted file mode 100644 index 3ddd376803..0000000000 --- a/package.bak/openbox/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_OPENBOX - bool "openbox" - depends on BR2_PACKAGE_XORG7 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_INSTALL_LIBSTDCPP # pango -> freetype - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_XLIB_LIBX11 - # libxft and libxrender are needed to get xft support in pango - select BR2_PACKAGE_XLIB_LIBXFT - select BR2_PACKAGE_XLIB_LIBXRENDER - help - Openbox is a highly configurable, next generation window - manager with extensive standards support. - - http://openbox.org - -comment "openbox needs a toolchain w/ C++, threads, wchar" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \ - !BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_XORG7 diff --git a/package.bak/openbox/openbox.hash b/package.bak/openbox/openbox.hash deleted file mode 100644 index a8696b3f87..0000000000 --- a/package.bak/openbox/openbox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 abe75855cc5616554ffd47134ad15291fe37ebbebf1a80b69cbde9d670f0e26d openbox-3.6.1.tar.xz diff --git a/package.bak/openbox/openbox.mk b/package.bak/openbox/openbox.mk deleted file mode 100644 index b5148e00e8..0000000000 --- a/package.bak/openbox/openbox.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# openbox -# -################################################################################ - -OPENBOX_VERSION = 3.6.1 -OPENBOX_SOURCE = openbox-$(OPENBOX_VERSION).tar.xz -OPENBOX_SITE = http://openbox.org/dist/openbox -OPENBOX_LICENSE = GPLv2+ -OPENBOX_LICENSE_FILES = COPYING - -OPENBOX_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib - -OPENBOX_DEPENDENCIES = xlib_libX11 libxml2 libglib2 pango host-pkgconf - -ifeq ($(BR2_PACKAGE_IMLIB2_X),y) -OPENBOX_CONF_OPTS += --enable-imlib2 -OPENBOX_DEPENDENCIES += imlib2 -else -OPENBOX_CONF_OPTS += --disable-imlib2 -endif - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -OPENBOX_CONF_OPTS += --enable-startup-notification -OPENBOX_DEPENDENCIES += startup-notification -else -OPENBOX_CONF_OPTS += --disable-startup-notification -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) -OPENBOX_CONF_OPTS += --enable-session-management -OPENBOX_DEPENDENCIES += xlib_libSM -else -OPENBOX_CONF_OPTS += --disable-session-management -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -OPENBOX_CONF_OPTS += --enable-xinerama -OPENBOX_DEPENDENCIES += xlib_libXinerama -else -OPENBOX_CONF_OPTS += --disable-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -OPENBOX_CONF_OPTS += --enable-xrandr -OPENBOX_DEPENDENCIES += xlib_libXrandr -else -OPENBOX_CONF_OPTS += --disable-xrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -OPENBOX_DEPENDENCIES += xlib_libXcursor -OPENBOX_CONF_OPTS += --enable-xcursor -else -OPENBOX_CONF_OPTS += --disable-xcursor -endif - -$(eval $(autotools-package)) diff --git a/package.bak/opencore-amr/Config.in b/package.bak/opencore-amr/Config.in deleted file mode 100644 index 1ccc631966..0000000000 --- a/package.bak/opencore-amr/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_OPENCORE_AMR - bool "opencore-amr" - depends on BR2_INSTALL_LIBSTDCPP - help - Library of OpenCORE Framework implementation of Adaptive Multi Rate - Narrowband and Wideband (AMR-NB and AMR-WB) speech codec. - - http://opencore-amr.sourceforge.net/ - -comment "opencore-amr needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/opencore-amr/opencore-amr.hash b/package.bak/opencore-amr/opencore-amr.hash deleted file mode 100644 index a984514d0f..0000000000 --- a/package.bak/opencore-amr/opencore-amr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 106bf811c1f36444d7671d8fd2589f8b2e0cca58a2c764da62ffc4a070595385 opencore-amr-0.1.3.tar.gz diff --git a/package.bak/opencore-amr/opencore-amr.mk b/package.bak/opencore-amr/opencore-amr.mk deleted file mode 100644 index 8b6aa29a96..0000000000 --- a/package.bak/opencore-amr/opencore-amr.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# opencore-amr -# -################################################################################ - -OPENCORE_AMR_VERSION = 0.1.3 -OPENCORE_AMR_SITE = http://downloads.sourceforge.net/project/opencore-amr/opencore-amr -OPENCORE_AMR_INSTALL_STAGING = YES -OPENCORE_AMR_LICENSE = Apache-2.0 -OPENCORE_AMR_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/opencv/0001-atomic.patch b/package.bak/opencv/0001-atomic.patch deleted file mode 100644 index 8c9724d25e..0000000000 --- a/package.bak/opencv/0001-atomic.patch +++ /dev/null @@ -1,259 +0,0 @@ -From f71c288c6d853e623461f97cd72e6a9e6541f61a Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 1 Nov 2016 09:25:30 +0100 -Subject: [PATCH 1/4] Bug#714923: opencv FTBFS on sparc64 - https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=714923 - -opencv uses functions from , but it wrongly assumes -this functions apply to an int type. While it is true for some -architectures, some architectures are using a long type there. The -correct type to use is _Atomic_word. - -Signed-off-by: Waldemar Brodkorb -[Samuel Martin: convert to git diff] -Signed-off-by: Samuel Martin ---- - modules/core/include/opencv2/core/core.hpp | 10 +++++----- - modules/core/include/opencv2/core/gpumat.hpp | 2 +- - modules/core/include/opencv2/core/operations.hpp | 4 ++-- - modules/core/src/gpumat.cpp | 2 +- - modules/core/src/matrix.cpp | 4 ++-- - modules/core/src/system.cpp | 8 ++++---- - modules/gpu/include/opencv2/gpu/gpu.hpp | 2 +- - modules/ocl/include/opencv2/ocl/ocl.hpp | 2 +- - modules/ocl/src/matrix_operations.cpp | 2 +- - modules/python/src2/cv2.cpp | 8 ++++---- - 10 files changed, 22 insertions(+), 22 deletions(-) - -diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp -index 591d50a..5b4261e 100644 ---- a/modules/core/include/opencv2/core/core.hpp -+++ b/modules/core/include/opencv2/core/core.hpp -@@ -1290,7 +1290,7 @@ public: - operator const _Tp*() const; - - _Tp* obj; //< the object pointer. -- int* refcount; //< the associated reference counter -+ _Atomic_word* refcount; //< the associated reference counter - }; - - template -@@ -1490,9 +1490,9 @@ class CV_EXPORTS MatAllocator - public: - MatAllocator() {} - virtual ~MatAllocator() {} -- virtual void allocate(int dims, const int* sizes, int type, int*& refcount, -+ virtual void allocate(int dims, const int* sizes, int type, _Atomic_word*& refcount, - uchar*& datastart, uchar*& data, size_t* step) = 0; -- virtual void deallocate(int* refcount, uchar* datastart, uchar* data) = 0; -+ virtual void deallocate(_Atomic_word* refcount, uchar* datastart, uchar* data) = 0; - }; - - /*! -@@ -1985,7 +1985,7 @@ public: - - //! pointer to the reference counter; - // when matrix points to user-allocated data, the pointer is NULL -- int* refcount; -+ _Atomic_word* refcount; - - //! helper fields used in locateROI and adjustROI - uchar* datastart; -@@ -3449,7 +3449,7 @@ public: - { - Hdr(int _dims, const int* _sizes, int _type); - void clear(); -- int refcount; -+ _Atomic_word refcount; - int dims; - int valueOffset; - size_t nodeSize; -diff --git a/modules/core/include/opencv2/core/gpumat.hpp b/modules/core/include/opencv2/core/gpumat.hpp -index 68647d9..d488c27 100644 ---- a/modules/core/include/opencv2/core/gpumat.hpp -+++ b/modules/core/include/opencv2/core/gpumat.hpp -@@ -301,7 +301,7 @@ namespace cv { namespace gpu - - //! pointer to the reference counter; - // when GpuMatrix points to user-allocated data, the pointer is NULL -- int* refcount; -+ _Atomic_word* refcount; - - //! helper fields used in locateROI and adjustROI - uchar* datastart; -diff --git a/modules/core/include/opencv2/core/operations.hpp b/modules/core/include/opencv2/core/operations.hpp -index 0ae51c6..a455502 100644 ---- a/modules/core/include/opencv2/core/operations.hpp -+++ b/modules/core/include/opencv2/core/operations.hpp -@@ -2589,7 +2589,7 @@ template inline Ptr<_Tp>::Ptr(_Tp* _obj) : obj(_obj) - { - if(obj) - { -- refcount = (int*)fastMalloc(sizeof(*refcount)); -+ refcount = (_Atomic_word*)fastMalloc(sizeof(*refcount)); - *refcount = 1; - } - else -@@ -2628,7 +2628,7 @@ template inline Ptr<_Tp>& Ptr<_Tp>::operator = (const Ptr<_Tp>& _p - { - if (this != &_ptr) - { -- int* _refcount = _ptr.refcount; -+ _Atomic_word* _refcount = _ptr.refcount; - if( _refcount ) - CV_XADD(_refcount, 1); - release(); -diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp -index 9669191..0bd2568 100644 ---- a/modules/core/src/gpumat.cpp -+++ b/modules/core/src/gpumat.cpp -@@ -716,7 +716,7 @@ void cv::gpu::GpuMat::create(int _rows, int _cols, int _type) - datastart = data = static_cast(devPtr); - dataend = data + nettosize; - -- refcount = static_cast(fastMalloc(sizeof(*refcount))); -+ refcount = static_cast<_Atomic_word*>(fastMalloc(sizeof(*refcount))); - *refcount = 1; - } - } -diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp -index 57abffc..7b840a0 100644 ---- a/modules/core/src/matrix.cpp -+++ b/modules/core/src/matrix.cpp -@@ -213,7 +213,7 @@ void Mat::create(int d, const int* _sizes, int _type) - { - size_t totalsize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); - data = datastart = (uchar*)fastMalloc(totalsize + (int)sizeof(*refcount)); -- refcount = (int*)(data + totalsize); -+ refcount = (_Atomic_word*)(data + totalsize); - *refcount = 1; - } - else -@@ -228,7 +228,7 @@ void Mat::create(int d, const int* _sizes, int _type) - allocator = 0; - size_t totalSize = alignSize(step.p[0]*size.p[0], (int)sizeof(*refcount)); - data = datastart = (uchar*)fastMalloc(totalSize + (int)sizeof(*refcount)); -- refcount = (int*)(data + totalSize); -+ refcount = (_Atomic_word*)(data + totalSize); - *refcount = 1; - } - #else -diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp -index f5a1af2..9a7b262 100644 ---- a/modules/core/src/system.cpp -+++ b/modules/core/src/system.cpp -@@ -892,7 +892,7 @@ struct Mutex::Impl - void unlock() { LeaveCriticalSection(&cs); } - - CRITICAL_SECTION cs; -- int refcount; -+ _Atomic_word refcount; - }; - - #ifndef __GNUC__ -@@ -920,7 +920,7 @@ struct Mutex::Impl - void unlock() { OSSpinLockUnlock(&sl); } - - OSSpinLock sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #elif defined __linux__ && !defined ANDROID && !defined __LINUXTHREADS_OLD__ -@@ -935,7 +935,7 @@ struct Mutex::Impl - void unlock() { pthread_spin_unlock(&sl); } - - pthread_spinlock_t sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #else -@@ -950,7 +950,7 @@ struct Mutex::Impl - void unlock() { pthread_mutex_unlock(&sl); } - - pthread_mutex_t sl; -- int refcount; -+ _Atomic_word refcount; - }; - - #endif -diff --git a/modules/gpu/include/opencv2/gpu/gpu.hpp b/modules/gpu/include/opencv2/gpu/gpu.hpp -index de16982..266fa2f 100644 ---- a/modules/gpu/include/opencv2/gpu/gpu.hpp -+++ b/modules/gpu/include/opencv2/gpu/gpu.hpp -@@ -125,7 +125,7 @@ public: - size_t step; - - uchar* data; -- int* refcount; -+ _Atomic_word* refcount; - - uchar* datastart; - uchar* dataend; -diff --git a/modules/ocl/include/opencv2/ocl/ocl.hpp b/modules/ocl/include/opencv2/ocl/ocl.hpp -index e8eb3e8..5ea05fc 100644 ---- a/modules/ocl/include/opencv2/ocl/ocl.hpp -+++ b/modules/ocl/include/opencv2/ocl/ocl.hpp -@@ -404,7 +404,7 @@ namespace cv - - //! pointer to the reference counter; - // when oclMatrix points to user-allocated data, the pointer is NULL -- int *refcount; -+ _Atomic_word *refcount; - - //! helper fields used in locateROI and adjustROI - //datastart and dataend are not used in current version -diff --git a/modules/ocl/src/matrix_operations.cpp b/modules/ocl/src/matrix_operations.cpp -index 331e432..c61dca4 100644 ---- a/modules/ocl/src/matrix_operations.cpp -+++ b/modules/ocl/src/matrix_operations.cpp -@@ -591,7 +591,7 @@ void cv::ocl::oclMat::createEx(int _rows, int _cols, int _type, DevMemRW rw_type - datastart = data = (uchar *)dev_ptr; - dataend = data + nettosize; - -- refcount = (int *)fastMalloc(sizeof(*refcount)); -+ refcount = (_Atomic_word *)fastMalloc(sizeof(*refcount)); - *refcount = 1; - } - } -diff --git a/modules/python/src2/cv2.cpp b/modules/python/src2/cv2.cpp -index 04cea39..40e5d43 100644 ---- a/modules/python/src2/cv2.cpp -+++ b/modules/python/src2/cv2.cpp -@@ -157,12 +157,12 @@ static PyObject* failmsgp(const char *fmt, ...) - static size_t REFCOUNT_OFFSET = (size_t)&(((PyObject*)0)->ob_refcnt) + - (0x12345678 != *(const size_t*)"\x78\x56\x34\x12\0\0\0\0\0")*sizeof(int); - --static inline PyObject* pyObjectFromRefcount(const int* refcount) -+static inline PyObject* pyObjectFromRefcount(const _Atomic_word* refcount) - { - return (PyObject*)((size_t)refcount - REFCOUNT_OFFSET); - } - --static inline int* refcountFromPyObject(const PyObject* obj) -+static inline _Atomic_word* refcountFromPyObject(const PyObject* obj) - { - return (int*)((size_t)obj + REFCOUNT_OFFSET); - } -@@ -173,7 +173,7 @@ public: - NumpyAllocator() {} - ~NumpyAllocator() {} - -- void allocate(int dims, const int* sizes, int type, int*& refcount, -+ void allocate(int dims, const int* sizes, int type, _Atomic_word*& refcount, - uchar*& datastart, uchar*& data, size_t* step) - { - PyEnsureGIL gil; -@@ -206,7 +206,7 @@ public: - datastart = data = (uchar*)PyArray_DATA((PyArrayObject*) o); - } - -- void deallocate(int* refcount, uchar*, uchar*) -+ void deallocate(_Atomic_word* refcount, uchar*, uchar*) - { - PyEnsureGIL gil; - if( !refcount ) --- -2.10.2 - diff --git a/package.bak/opencv/0002-avoid-sysctl_h.patch b/package.bak/opencv/0002-avoid-sysctl_h.patch deleted file mode 100644 index b63ba55ac1..0000000000 --- a/package.bak/opencv/0002-avoid-sysctl_h.patch +++ /dev/null @@ -1,61 +0,0 @@ -From e5e71c31d54562f9c67a8226f0bfc08ad24b81cf Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Tue, 1 Nov 2016 09:30:23 +0100 -Subject: [PATCH 2/4] From upstream master branch: - https://github.com/Itseez/opencv/blob/master/modules/core/src/ - -Do not include sysctl.h targeting Linux systems. - -Signed-off-by: Waldemar Brodkorb -[Samuel Martin: convert patch to git diff, add cap_ffmpeg_impl.hpp fix] -Signed-off-by: Samuel Martin ---- - modules/core/src/parallel.cpp | 2 +- - modules/core/src/system.cpp | 2 +- - modules/highgui/src/cap_ffmpeg_impl.hpp | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp -index 4459a24..0374876 100644 ---- a/modules/core/src/parallel.cpp -+++ b/modules/core/src/parallel.cpp -@@ -56,7 +56,7 @@ - #include - #if defined ANDROID - #include -- #else -+ #elif defined __APPLE__ - #include - #endif - #endif -diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp -index 9a7b262..731f090 100644 ---- a/modules/core/src/system.cpp -+++ b/modules/core/src/system.cpp -@@ -163,7 +163,7 @@ std::wstring GetTempFileNameWinRT(std::wstring prefix) - #include - #if defined ANDROID - #include --#else -+#elif defined __APPLE__ - #include - #endif - #endif -diff --git a/modules/highgui/src/cap_ffmpeg_impl.hpp b/modules/highgui/src/cap_ffmpeg_impl.hpp -index dc3e10d..23674ff 100644 ---- a/modules/highgui/src/cap_ffmpeg_impl.hpp -+++ b/modules/highgui/src/cap_ffmpeg_impl.hpp -@@ -126,9 +126,9 @@ extern "C" { - #include - #include - #include -- #include - #include - #if defined __APPLE__ -+ #include - #include - #include - #endif --- -2.10.2 - diff --git a/package.bak/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch b/package.bak/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch deleted file mode 100644 index 85a23a0740..0000000000 --- a/package.bak/opencv/0003-types_c.h-Fix-compiling-VFP-assembler-code.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 18c868c47307b786d1bea729dccaad7f8d696cb7 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Tue, 6 Sep 2016 11:49:00 +0200 -Subject: [PATCH 1/1] types_c.h: Fix compiling VFP assembler code - -Replace asm by __asm__ according to -https://gcc.gnu.org/onlinedocs/gcc/Alternate-Keywords.html#Alternate-Keywords -as suggested by Arnout Vandecappelle: -http://lists.busybox.net/pipermail/buildroot/2016-September/171491.html - -to fix build errors in ffmpeg with opencv2 support detected by -buildroot autobuilders: -http://autobuild.buildroot.net/results/c32/c32a21240a9933796ee850349a62ff3c2314f25c/build-end.log - -Patch sent upstream: https://github.com/opencv/opencv/pull/7242 - -Signed-off-by: Bernd Kuhls ---- - modules/core/include/opencv2/core/types_c.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/core/include/opencv2/core/types_c.h b/modules/core/include/opencv2/core/types_c.h -index c21cd2c..771715d 100644 ---- a/modules/core/include/opencv2/core/types_c.h -+++ b/modules/core/include/opencv2/core/types_c.h -@@ -318,7 +318,7 @@ enum { - int res; \ - float temp; \ - (void)temp; \ -- asm(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \ -+ __asm__(_asm_string : [res] "=r" (res), [temp] "=w" (temp) : [value] "w" (_value)); \ - return res; - // 2. version for double - #ifdef __clang__ --- -2.9.3 - diff --git a/package.bak/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch b/package.bak/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch deleted file mode 100644 index 6d63411b01..0000000000 --- a/package.bak/opencv/0004-CMakeLists.txt-Do-not-add-libdl-to-LINKER_LIBS-for-s.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 22e03ef8a9e3adcbc6b2f16c3cc98e4e14443eed Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 24 Sep 2016 17:51:22 +0200 -Subject: [PATCH 1/1] CMakeLists.txt: Do not add libdl to LINKER_LIBS for - static builds - -Without this patch -ldl is present in opencv.pc which breaks OpenCV -detection by ffmpeg, detected by buildroot autobuilders: - -http://autobuild.buildroot.net/results/765/7657e01481995a4f0d725467e935a83928a59a04//ffmpeg-3.1.3/config.log - -/home/peko/autobuild/instance-1/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.9.4/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: cannot find -ldl - -Patch sent upstream: https://github.com/opencv/opencv/pull/7337 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 007b80d..99b047d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -457,7 +457,10 @@ if(UNIX) - elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") - set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m) - else() -- set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl m pthread rt) -+ if(BUILD_SHARED_LIBS) -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} dl) -+ endif() -+ set(OPENCV_LINKER_LIBS ${OPENCV_LINKER_LIBS} m pthread rt) - endif() - else() - set(HAVE_LIBPTHREAD YES) --- -2.9.3 - diff --git a/package.bak/opencv/Config.in b/package.bak/opencv/Config.in deleted file mode 100644 index c046baaa4b..0000000000 --- a/package.bak/opencv/Config.in +++ /dev/null @@ -1,313 +0,0 @@ -menuconfig BR2_PACKAGE_OPENCV - bool "opencv-2.4" - select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - help - OpenCV (Open Source Computer Vision) is a library of programming - functions for real time computer vision. - - http://opencv.org/ - -if BR2_PACKAGE_OPENCV - -comment "OpenCV modules" - -config BR2_PACKAGE_OPENCV_LIB_CALIB3D - bool "calib3d" - default y - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_calib3d module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_CONTRIB - bool "contrib" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_contrib module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_FEATURES2D - bool "features2d" - default y - select BR2_PACKAGE_OPENCV_LIB_FLANN - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_features2d module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_FLANN - bool "flann" - default y - # opencv_core dependency is already enabled - help - Include opencv_flann module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_GPU - bool "gpu" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_LEGACY - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - select BR2_PACKAGE_OPENCV_LIB_PHOTO - select BR2_PACKAGE_OPENCV_LIB_VIDEO - depends on !BR2_STATIC_LIBS - help - Include opencv_gpu module into the OpenCV build. - -comment "gpu module needs a toolchain w/ dynamic libraries" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_OPENCV_LIB_HIGHGUI - bool "highgui" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_highgui module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_IMGPROC - bool "imgproc" - default y - # opencv_core dependency is already enabled - help - Include opencv_imgproc module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_LEGACY - bool "legacy" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_ML - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_legacy module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_ML - bool "ml (machine learning)" - default y - # opencv_core dependency is already enabled - help - Include opencv_ml module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_NONFREE - bool "nonfree" - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_nonfree module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_OBJDETECT - bool "objdetect" - default y - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_objdetect module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_PHOTO - bool "photo" - default y - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Binutils 2.25 nios2 issue - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_photo module into the OpenCV build. - -comment "opencv_python module requires numpy which is not yet available." - -config BR2_PACKAGE_OPENCV_LIB_STITCHING - bool "stitching" - default y - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - help - Include opencv_stitching module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_SUPERRES - bool "superres" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_superres "super resolution" - module into the OpenCV - build. - -config BR2_PACKAGE_OPENCV_LIB_TS - bool "ts (touchscreen)" - default y - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_ts module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_VIDEO - bool "video" - default y - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - help - Include opencv_video module into the OpenCV build. - -config BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB - bool "videostab" - default y - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # opencv libphoto - select BR2_PACKAGE_OPENCV_LIB_CALIB3D - select BR2_PACKAGE_OPENCV_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_PHOTO - select BR2_PACKAGE_OPENCV_LIB_VIDEO - help - Include opencv_videostab module into the OpenCV build. - -if !BR2_STATIC_LIBS - -comment "Test sets" - -config BR2_PACKAGE_OPENCV_BUILD_TESTS - bool "build tests" - -config BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS - bool "build performance tests" - -endif - -comment "Tests sets need a toolchain w/ dynamic libraries" - depends on BR2_STATIC_LIBS - -comment "3rd party support" - -config BR2_PACKAGE_OPENCV_WITH_FFMPEG - bool "ffmpeg support" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE - help - Use ffmpeg from the target system. - -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OPENCV_WITH_GSTREAMER1 - bool "gstreamer-1.x" - depends on BR2_USE_MMU # gstreamer1 -> libglib2 - depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -endchoice - -config BR2_PACKAGE_OPENCV_WITH_GTK - bool "gtk support" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libgtk2 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - select BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_OPENCV_WITH_JASPER - bool "jpeg2000 support" - select BR2_PACKAGE_JASPER - help - Enable jpeg2000 support. - - Note: this does not use the libjasper bundled with opencv, - but uses the libjasper package installed system-wide by - Buildroot. - -config BR2_PACKAGE_OPENCV_WITH_JPEG - bool "jpeg support" - select BR2_PACKAGE_JPEG - help - Use shared libjpeg from the target system. - -config BR2_PACKAGE_OPENCV_WITH_PNG - bool "png support" - select BR2_PACKAGE_LIBPNG - help - Use shared libpng from the target system. - -config BR2_PACKAGE_OPENCV_WITH_QT - bool "qt backend support" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # qt - depends on BR2_PACKAGE_OPENCV_LIB_HIGHGUI - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_TEST - help - Use Qt with QtTest module and STL support - -comment "qt backend support needs a toolchain not affected by Binutils bug 19405" - depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -config BR2_PACKAGE_OPENCV_WITH_TIFF - bool "tiff support" - select BR2_PACKAGE_TIFF - help - Use shared libtiff from the target system. - -config BR2_PACKAGE_OPENCV_WITH_V4L - bool "v4l support" - help - Enable Video 4 Linux support. - - If the package libv4l is enabled, its support is automatically enabled. - -comment "Install options" - -config BR2_PACKAGE_OPENCV_INSTALL_DATA - bool "install extra data" - help - Install various data that is used by cv libraries and/or demo - applications, specifically for haarcascades and lbpcascades - features. - - For further information: see OpenCV documentation. - -endif # BR2_PACKAGE_OPENCV - -comment "opencv needs a toolchain w/ C++, NPTL, wchar" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS_NPTL) diff --git a/package.bak/opencv/opencv.hash b/package.bak/opencv/opencv.hash deleted file mode 100644 index 9686cb287d..0000000000 --- a/package.bak/opencv/opencv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 94ebcca61c30034d5fb16feab8ec12c8a868f5162d20a9f0396f0f5f6d8bbbff opencv-2.4.13.tar.gz diff --git a/package.bak/opencv/opencv.mk b/package.bak/opencv/opencv.mk deleted file mode 100644 index 947589b83c..0000000000 --- a/package.bak/opencv/opencv.mk +++ /dev/null @@ -1,257 +0,0 @@ -################################################################################ -# -# opencv -# -################################################################################ - -OPENCV_VERSION = 2.4.13 -OPENCV_SITE = $(call github,itseez,opencv,$(OPENCV_VERSION)) -OPENCV_INSTALL_STAGING = YES -OPENCV_LICENSE = BSD-3c -OPENCV_LICENSE_FILES = LICENSE - -# OpenCV component options -OPENCV_CONF_OPTS += \ - -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_PERF_TESTS),ON,OFF) \ - -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV_BUILD_TESTS),ON,OFF) \ - -DBUILD_WITH_DEBUG_INFO=OFF - -# OpenCV build options -OPENCV_CONF_OPTS += \ - -DBUILD_WITH_STATIC_CRT=OFF \ - -DENABLE_FAST_MATH=ON \ - -DENABLE_NOISY_WARNINGS=OFF \ - -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DENABLE_PROFILING=OFF \ - -DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY=ON - -# OpenCV link options -OPENCV_CONF_OPTS += \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF - -# OpenCV packaging options: -OPENCV_CONF_OPTS += \ - -DBUILD_PACKAGE=OFF \ - -DENABLE_SOLUTION_FOLDERS=OFF \ - -DINSTALL_CREATE_DISTRIB=OFF - -# OpenCV module selection -OPENCV_CONF_OPTS += \ - -DBUILD_opencv_androidcamera=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV_LIB_CALIB3D),ON,OFF) \ - -DBUILD_opencv_contrib=$(if $(BR2_PACKAGE_OPENCV_LIB_CONTRIB),ON,OFF) \ - -DBUILD_opencv_core=ON \ - -DBUILD_opencv_dynamicuda=OFF \ - -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV_LIB_FEATURES2D),ON,OFF) \ - -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV_LIB_FLANN),ON,OFF) \ - -DBUILD_opencv_gpu=$(if $(BR2_PACKAGE_OPENCV_LIB_GPU),ON,OFF) \ - -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV_LIB_HIGHGUI),ON,OFF) \ - -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV_LIB_IMGPROC),ON,OFF) \ - -DBUILD_opencv_java=OFF \ - -DBUILD_opencv_legacy=$(if $(BR2_PACKAGE_OPENCV_LIB_LEGACY),ON,OFF) \ - -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV_LIB_ML),ON,OFF) \ - -DBUILD_opencv_nonfree=$(if $(BR2_PACKAGE_OPENCV_LIB_NONFREE),ON,OFF) \ - -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV_LIB_OBJDETECT),ON,OFF) \ - -DBUILD_opencv_ocl=OFF \ - -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV_LIB_PHOTO),ON,OFF) \ - -DBUILD_opencv_python=OFF \ - -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV_LIB_STITCHING),ON,OFF) \ - -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV_LIB_SUPERRES),ON,OFF) \ - -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV_LIB_TS),ON,OFF) \ - -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEO),ON,OFF) \ - -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV_LIB_VIDEOSTAB),ON,OFF) \ - -DBUILD_opencv_world=OFF - -# Hardware support options. -# -# * PowerPC support is turned off since its only effect is altering CFLAGS, -# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. -OPENCV_CONF_OPTS += \ - -DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ - -DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ - -DENABLE_POWERPC=OFF \ - -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \ - -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ - -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ - -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ - -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ - -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) - -# Cuda stuff -OPENCV_CONF_OPTS += \ - -DWITH_CUBLAS=OFF \ - -DWITH_CUDA=OFF \ - -DWITH_CUFFT=OFF - -# NVidia stuff -OPENCV_CONF_OPTS += -DWITH_NVCUVID=OFF - -# AMD stuff -OPENCV_CONF_OPTS += \ - -DWITH_OPENCLAMDBLAS=OFF \ - -DWITH_OPENCLAMDFFT=OFF - -# Intel stuff -OPENCV_CONF_OPTS += \ - -DWITH_INTELPERC=OFF \ - -DWITH_IPP=OFF \ - -DWITH_TBB=OFF - -# Smartek stuff -OPENCV_CONF_OPTS += -DWITH_GIGEAPI=OFF - -# Prosilica stuff -OPENCV_CONF_OPTS += -DWITH_PVAPI=OFF - -# Ximea stuff -OPENCV_CONF_OPTS += -DWITH_XIMEA=OFF - -# Non-Linux support (Android options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \ - -DBUILD_ANDROID_EXAMPLES=OFF \ - -DBUILD_FAT_JAVA_LIB=OFF \ - -DBUILD_JAVA_SUPPORT=OFF \ - -DINSTALL_ANDROID_EXAMPLES=OFF \ - -DWITH_ANDROID_CAMERA=OFF - -# Non-Linux support (Mac OSX options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DWITH_AVFOUNDATION=OFF \ - -DWITH_CARBON=OFF \ - -DWITH_QUICKTIME=OFF - -# Non-Linux support (Windows options) must remain OFF: -OPENCV_CONF_OPTS += \ - -DWITH_CSTRIPES=OFF \ - -DWITH_DSHOW=OFF \ - -DWITH_MSMF=OFF \ - -DWITH_VFW=OFF \ - -DWITH_VIDEOINPUT=OFF \ - -DWITH_WIN32UI=OFF - -# Software/3rd-party support options. -OPENCV_CONF_OPTS += \ - -DBUILD_JASPER=OFF \ - -DBUILD_JPEG=OFF \ - -DBUILD_NEW_PYTHON_SUPPORT=OFF \ - -DBUILD_OPENEXR=OFF \ - -DBUILD_PNG=OFF \ - -DBUILD_TIFF=OFF \ - -DBUILD_ZLIB=OFF \ - -DINSTALL_C_EXAMPLES=OFF \ - -DINSTALL_PYTHON_EXAMPLES=OFF \ - -DINSTALL_TO_MANGLED_PATHS=OFF - -# Disabled features (mostly because they are not available in Buildroot), but -# - eigen: OpenCV does not use it, not take any benefit from it. -OPENCV_CONF_OPTS += \ - -DWITH_1394=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_IMAGEIO=OFF \ - -DWITH_OPENCL=OFF \ - -DWITH_OPENEXR=OFF \ - -DWITH_OPENGL=OFF \ - -DWITH_OPENMP=OFF \ - -DWITH_OPENNI=OFF \ - -DWITH_UNICAP=OFF \ - -DWITH_XINE=OFF - -OPENCV_DEPENDENCIES += zlib - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_FFMPEG),y) -OPENCV_CONF_OPTS += -DWITH_FFMPEG=ON -OPENCV_DEPENDENCIES += ffmpeg bzip2 -else -OPENCV_CONF_OPTS += -DWITH_FFMPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GSTREAMER1),y) -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=ON -OPENCV_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -OPENCV_CONF_OPTS += -DWITH_GSTREAMER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_GTK),y) -OPENCV_CONF_OPTS += -DWITH_GTK=ON -OPENCV_DEPENDENCIES += libgtk2 -else -OPENCV_CONF_OPTS += -DWITH_GTK=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_JASPER),y) -OPENCV_CONF_OPTS += -DWITH_JASPER=ON -OPENCV_DEPENDENCIES += jasper -else -OPENCV_CONF_OPTS += -DWITH_JASPER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_JPEG),y) -OPENCV_CONF_OPTS += -DWITH_JPEG=ON -OPENCV_DEPENDENCIES += jpeg -else -OPENCV_CONF_OPTS += -DWITH_JPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_PNG),y) -OPENCV_CONF_OPTS += -DWITH_PNG=ON -OPENCV_DEPENDENCIES += libpng -else -OPENCV_CONF_OPTS += -DWITH_PNG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_QT),y) -OPENCV_CONF_OPTS += -DWITH_QT=4 -OPENCV_DEPENDENCIES += qt -else -OPENCV_CONF_OPTS += -DWITH_QT=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_TIFF),y) -OPENCV_CONF_OPTS += -DWITH_TIFF=ON -OPENCV_DEPENDENCIES += tiff -else -OPENCV_CONF_OPTS += -DWITH_TIFF=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV_WITH_V4L),y) -OPENCV_CONF_OPTS += \ - -DWITH_LIBV4L=$(if $(BR2_PACKAGE_LIBV4L),ON,OFF) \ - -DWITH_V4L=ON -OPENCV_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBV4L),libv4l) -else -OPENCV_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF -endif - -# Installation hooks: -define OPENCV_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DOC - -define OPENCV_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_CMAKE - -ifneq ($(BR2_PACKAGE_OPENCV_INSTALL_DATA),y) -define OPENCV_CLEAN_INSTALL_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ - $(TARGET_DIR)/usr/share/OpenCV/lbpcascades -endef -OPENCV_POST_INSTALL_TARGET_HOOKS += OPENCV_CLEAN_INSTALL_DATA -endif - -$(eval $(cmake-package)) diff --git a/package.bak/opencv3/Config.in b/package.bak/opencv3/Config.in deleted file mode 100644 index 4c00bf1b94..0000000000 --- a/package.bak/opencv3/Config.in +++ /dev/null @@ -1,343 +0,0 @@ -menuconfig BR2_PACKAGE_OPENCV3 - bool "opencv3" - select BR2_PACKAGE_ZLIB - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS # include dlfcn.h - depends on !BR2_PACKAGE_OPENCV - help - OpenCV (Open Source Computer Vision) is a library of programming - functions for real time computer vision. - - Note that the opencv_core module and the opencv_hal library - are always built and installed, not matter which other - modules are enabled below. - - http://opencv.org/ - -if BR2_PACKAGE_OPENCV3 - -comment "OpenCV modules" - -config BR2_PACKAGE_OPENCV3_LIB_CALIB3D - bool "calib3d" - select BR2_PACKAGE_OPENCV3_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - help - Include opencv_calib3d (camera calibration and 3d reconstruction) module - into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_FEATURES2D - bool "features2d" - select BR2_PACKAGE_OPENCV3_LIB_FLANN - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_ML - help - Include opencv_features2d (2d features framework) module into the OpenCV - build. - -config BR2_PACKAGE_OPENCV3_LIB_FLANN - bool "flann" - # opencv_core dependency is already enabled - help - Include opencv_flann (clustering and search in multi-dimensional spaces) - module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_HIGHGUI - bool "highgui" - select BR2_PACKAGE_OPENCV3_LIB_IMGCODECS - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_VIDEOIO - help - Include opencv_highgui (high-level gui and media i/o) module into the - OpenCV build. - -if BR2_PACKAGE_OPENCV3_LIB_HIGHGUI - -choice - prompt "gui toolkit" - help - GUI toolkit to be used by the opencv_highgui module. - -config BR2_PACKAGE_OPENCV3_GUI_NONE - bool "none" - -config BR2_PACKAGE_OPENCV3_WITH_GTK - bool "gtk2" - depends on BR2_PACKAGE_LIBGTK2 - -comment "gtk2 support needs libgtk2" - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK2 - -config BR2_PACKAGE_OPENCV3_WITH_GTK3 - bool "gtk3" - depends on BR2_PACKAGE_LIBGTK3 - -comment "gtk3 support needs libgtk3" - depends on BR2_USE_MMU # libgtk3 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_LIBGTK3 - -config BR2_PACKAGE_OPENCV3_WITH_QT - bool "qt4" - depends on BR2_PACKAGE_QT - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT_STL - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_TEST - help - Use Qt4 with QtTest and QtGui modules and STL support, as GUI toolkit. - -comment "qt4 support needs qt and a toolchain not affected by Binutils bug 19405" - depends on BR2_USE_MMU # qt - depends on (!BR2_PACKAGE_QT && !BR2_PACKAGE_QT5) || BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -config BR2_PACKAGE_OPENCV3_WITH_QT5 - bool "qt5" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_CONCURRENT - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS - help - Use Qt5 with base, concurrent, test, gui and widgets components, as GUI - toolkit. - -comment "qt5 support needs qt5" - depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 - -endchoice - -config BR2_PACKAGE_OPENCV3_WITH_OPENGL - bool "opengl support" - # OpenGL support done using Qt5OpenGL, so depends on WITH_QT5 - depends on BR2_PACKAGE_OPENCV3_WITH_QT5 - # OpenGL support requires Qt5OpenGL with GL support, not GLES - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_HAS_LIBGL - select BR2_PACKAGE_QT5BASE_OPENGL - help - Enable OpenGL for UI. - -comment "opengl support needs an OpenGL provider" - depends on BR2_PACKAGE_OPENCV3_WITH_QT5 - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || \ - !BR2_PACKAGE_HAS_LIBGL - -endif # BR2_PACKAGE_OPENCV3_LIB_HIGHGUI - - -config BR2_PACKAGE_OPENCV3_LIB_IMGCODECS - bool "imgcodecs" - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - help - Include opencv_imgcodecs (image codecs) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_IMGPROC - bool "imgproc" - # opencv_core dependency is already enabled - help - Include opencv_imgproc (image processing) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_ML - bool "ml" - # opencv_core dependency is already enabled - help - Include opencv_ml (machine learning) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_OBJDETECT - bool "objdetect" - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_ML - help - Include opencv_objdetect (object detection) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_PHOTO - bool "photo" - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - help - Include opencv_photo (computational photography) module into the OpenCV - build. - -config BR2_PACKAGE_OPENCV3_LIB_PYTHON - bool "python" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - select BR2_PACKAGE_PYTHON_NUMPY - help - Include opencv_python module into the OpenCV build. - No python example is installed. - -config BR2_PACKAGE_OPENCV3_LIB_SHAPE - bool "shape" - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_VIDEO - help - Include opencv_shape (shape descriptors and matchers) module into the - OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_STITCHING - bool "stitching" - select BR2_PACKAGE_OPENCV3_LIB_CALIB3D - select BR2_PACKAGE_OPENCV3_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT - help - Include opencv_stitching (images stitching) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_SUPERRES - bool "superres" - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_VIDEO - help - Include opencv_superres (super resolution) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_TS - bool "ts" - # opencv_core dependency is already enabled - select BR2_PACKAGE_OPENCV3_LIB_HIGHGUI - select BR2_PACKAGE_OPENCV3_LIB_IMGCODECS - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_VIDEOIO - help - Include opencv_ts (test) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_VIDEOIO - bool "videoio" - select BR2_PACKAGE_OPENCV3_LIB_IMGCODECS - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - help - Include opencv_videoio (media i/o) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_VIDEO - bool "video" - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - help - Include opencv_video (video analysis) module into the OpenCV build. - -config BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB - bool "videostab" - select BR2_PACKAGE_OPENCV3_LIB_CALIB3D - select BR2_PACKAGE_OPENCV3_LIB_FEATURES2D - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_PHOTO - select BR2_PACKAGE_OPENCV3_LIB_VIDEO - help - Include opencv_videostab (video stabilization) module into the OpenCV - build. - -comment "Test sets" -config BR2_PACKAGE_OPENCV3_BUILD_TESTS - bool "build tests" - -config BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS - bool "build performance tests" - -comment "3rd party support" - -config BR2_PACKAGE_OPENCV3_WITH_FFMPEG - bool "ffmpeg support" - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_AVRESAMPLE - select BR2_PACKAGE_FFMPEG_SWSCALE - help - Use ffmpeg from the target system. - -choice - prompt "gstreamer support" - help - OpenCV prefers gstreamer-1 over gstreamer-0.10. - -config BR2_PACKAGE_OPENCV3_WITHOUT_GSTREAMER - bool "none" - -config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER - bool "gstreamer-0.10" - depends on BR2_USE_MMU # gstreamer -> libglib2 - depends on BR2_USE_WCHAR # gstreamer -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer -> libglib2 - select BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-0.10 support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1 - bool "gstreamer-1.x" - depends on BR2_USE_MMU # gstreamer1 -> libglib2 - depends on BR2_USE_WCHAR # gstreamer1 -> libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # gstreamer1 -> libglib2 - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - -comment "gstreamer-1.x support needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -endchoice - -config BR2_PACKAGE_OPENCV3_WITH_JASPER - bool "jpeg2000 support" - select BR2_PACKAGE_JASPER - help - Enable jpeg2000 support. - - Note: this does not use the libjasper bundled with opencv, - but uses the libjasper package installed system-wide by - Buildroot. - -config BR2_PACKAGE_OPENCV3_WITH_JPEG - bool "jpeg support" - select BR2_PACKAGE_JPEG - help - Use shared libjpeg from the target system. - -config BR2_PACKAGE_OPENCV3_WITH_PNG - bool "png support" - select BR2_PACKAGE_LIBPNG - help - Use shared libpng from the target system. - -config BR2_PACKAGE_OPENCV3_WITH_TIFF - bool "tiff support" - select BR2_PACKAGE_TIFF - help - Use shared libtiff from the target system. - -config BR2_PACKAGE_OPENCV3_WITH_V4L - bool "v4l support" - help - Enable Video 4 Linux support. - - If the package libv4l is enabled, its support is automatically enabled. - -comment "Install options" - -config BR2_PACKAGE_OPENCV3_INSTALL_DATA - bool "install extra data" - help - Install various data that is used by cv libraries and/or demo - applications, specifically for haarcascades and lbpcascades - features. - - For further information: see OpenCV documentation. - -endif # BR2_PACKAGE_OPENCV3 - -comment "opencv3 needs a toolchain w/ C++, NPTL, wchar, dynamic library" - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_INSTALL_LIBSTDCPP || \ - !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_STATIC_LIBS diff --git a/package.bak/opencv3/opencv3.hash b/package.bak/opencv3/opencv3.hash deleted file mode 100644 index 20859ea2b5..0000000000 --- a/package.bak/opencv3/opencv3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f00b3c4f42acda07d89031a2ebb5ebe390764a133502c03a511f67b78bbd4fbf opencv3-3.1.0.tar.gz diff --git a/package.bak/opencv3/opencv3.mk b/package.bak/opencv3/opencv3.mk deleted file mode 100644 index 10660a90fb..0000000000 --- a/package.bak/opencv3/opencv3.mk +++ /dev/null @@ -1,369 +0,0 @@ -################################################################################ -# -# opencv3 -# -################################################################################ - -OPENCV3_VERSION = 3.1.0 -OPENCV3_SITE = $(call github,itseez,opencv,$(OPENCV3_VERSION)) -OPENCV3_INSTALL_STAGING = YES -OPENCV3_LICENSE = BSD-3c -OPENCV3_LICENSE_FILES = LICENSE - -# Uses __atomic_fetch_add_4 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -OPENCV3_CONF_OPTS += -DCMAKE_CXX_FLAGS="$(TARGET_CXXFLAGS) -latomic" -endif - -# OpenCV component options -OPENCV3_CONF_OPTS += \ - -DBUILD_DOCS=OFF \ - -DBUILD_PERF_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),ON,OFF) \ - -DBUILD_TESTS=$(if $(BR2_PACKAGE_OPENCV3_BUILD_TESTS),ON,OFF) \ - -DBUILD_WITH_DEBUG_INFO=OFF \ - -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF - -ifeq ($(BR2_PACKAGE_OPENCV3_BUILD_TESTS)$(BR2_PACKAGE_OPENCV3_BUILD_PERF_TESTS),) -OPENCV3_CONF_OPTS += -DINSTALL_TEST=OFF -else -OPENCV3_CONF_OPTS += -DINSTALL_TEST=ON -endif - -# OpenCV build options -OPENCV3_CONF_OPTS += \ - -DBUILD_WITH_STATIC_CRT=OFF \ - -DENABLE_COVERAGE=OFF \ - -DENABLE_FAST_MATH=ON \ - -DENABLE_IMPL_COLLECTION=OFF \ - -DENABLE_NOISY_WARNINGS=OFF \ - -DENABLE_OMIT_FRAME_POINTER=ON \ - -DENABLE_PRECOMPILED_HEADERS=OFF \ - -DENABLE_PROFILING=OFF \ - -DOPENCV3_WARNINGS_ARE_ERRORS=OFF - -# OpenCV link options -OPENCV3_CONF_OPTS += \ - -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=OFF \ - -DCMAKE_SKIP_RPATH=OFF \ - -DCMAKE_USE_RELATIVE_PATHS=OFF - -# OpenCV packaging options: -OPENCV3_CONF_OPTS += \ - -DBUILD_PACKAGE=OFF \ - -DENABLE_SOLUTION_FOLDERS=OFF \ - -DINSTALL_CREATE_DISTRIB=OFF - -# OpenCV module selection -# * Modules on: -# - core: if not set, opencv does not build anything -# - hal: core's dependency -# * Modules off: -# - android*: android stuff -# - apps: programs for training classifiers -# - java: java bindings -# - viz: missing VTK dependency -# - world: all-in-one module -# -# * Contrib modules from [1] are disabled: -# - opencv_contrib package is not available in Buildroot; -# - OPENCV3_EXTRA_MODULES_PATH is not set. -# -# [1] https://github.com/Itseez/opencv_contrib -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_androidcamera=OFF \ - -DBUILD_opencv_apps=OFF \ - -DBUILD_opencv_calib3d=$(if $(BR2_PACKAGE_OPENCV3_LIB_CALIB3D),ON,OFF) \ - -DBUILD_opencv_core=ON \ - -DBUILD_opencv_features2d=$(if $(BR2_PACKAGE_OPENCV3_LIB_FEATURES2D),ON,OFF) \ - -DBUILD_opencv_flann=$(if $(BR2_PACKAGE_OPENCV3_LIB_FLANN),ON,OFF) \ - -DBUILD_opencv_highgui=$(if $(BR2_PACKAGE_OPENCV3_LIB_HIGHGUI),ON,OFF) \ - -DBUILD_opencv_imgcodecs=$(if $(BR2_PACKAGE_OPENCV3_LIB_IMGCODECS),ON,OFF) \ - -DBUILD_opencv_imgproc=$(if $(BR2_PACKAGE_OPENCV3_LIB_IMGPROC),ON,OFF) \ - -DBUILD_opencv_java=OFF \ - -DBUILD_opencv_ml=$(if $(BR2_PACKAGE_OPENCV3_LIB_ML),ON,OFF) \ - -DBUILD_opencv_objdetect=$(if $(BR2_PACKAGE_OPENCV3_LIB_OBJDETECT),ON,OFF) \ - -DBUILD_opencv_photo=$(if $(BR2_PACKAGE_OPENCV3_LIB_PHOTO),ON,OFF) \ - -DBUILD_opencv_shape=$(if $(BR2_PACKAGE_OPENCV3_LIB_SHAPE),ON,OFF) \ - -DBUILD_opencv_stitching=$(if $(BR2_PACKAGE_OPENCV3_LIB_STITCHING),ON,OFF) \ - -DBUILD_opencv_superres=$(if $(BR2_PACKAGE_OPENCV3_LIB_SUPERRES),ON,OFF) \ - -DBUILD_opencv_ts=$(if $(BR2_PACKAGE_OPENCV3_LIB_TS),ON,OFF) \ - -DBUILD_opencv_video=$(if $(BR2_PACKAGE_OPENCV3_LIB_VIDEO),ON,OFF) \ - -DBUILD_opencv_videoio=$(if $(BR2_PACKAGE_OPENCV3_LIB_VIDEOIO),ON,OFF) \ - -DBUILD_opencv_videostab=$(if $(BR2_PACKAGE_OPENCV3_LIB_VIDEOSTAB),ON,OFF) \ - -DBUILD_opencv_viz=OFF \ - -DBUILD_opencv_world=OFF - -# Hardware support options. -# -# * PowerPC support is turned off since its only effect is altering CFLAGS, -# adding '-mcpu=G3 -mtune=G5' to them, which is already handled by Buildroot. -# * fma3 and popcnt support is disabled because according to gcc manual [2], it -# is only available on x86_64 haswell, broadwell and knl architecture. -# -# [2] https://gcc.gnu.org/onlinedocs/gcc-5.1.0/gcc/x86-Options.html#x86-Options -OPENCV3_CONF_OPTS += \ - -DENABLE_AVX=$(if $(BR2_X86_CPU_HAS_AVX),ON,OFF) \ - -DENABLE_AVX2=$(if $(BR2_X86_CPU_HAS_AVX2),ON,OFF) \ - -DENABLE_FMA3=OFF \ - -DENABLE_POPCNT=OFF \ - -DENABLE_POWERPC=OFF \ - -DENABLE_SSE=$(if $(BR2_X86_CPU_HAS_SSE),ON,OFF) \ - -DENABLE_SSE2=$(if $(BR2_X86_CPU_HAS_SSE2),ON,OFF) \ - -DENABLE_SSE3=$(if $(BR2_X86_CPU_HAS_SSE3),ON,OFF) \ - -DENABLE_SSE41=$(if $(BR2_X86_CPU_HAS_SSE4),ON,OFF) \ - -DENABLE_SSE42=$(if $(BR2_X86_CPU_HAS_SSE42),ON,OFF) \ - -DENABLE_SSSE3=$(if $(BR2_X86_CPU_HAS_SSSE3),ON,OFF) - -# Cuda stuff -OPENCV3_CONF_OPTS += \ - -DBUILD_CUDA_STUBS=OFF \ - -DBUILD_opencv_cudaarithm=OFF \ - -DBUILD_opencv_cudabgsegm=OFF \ - -DBUILD_opencv_cudacodec=OFF \ - -DBUILD_opencv_cudafeatures2d=OFF \ - -DBUILD_opencv_cudafilters=OFF \ - -DBUILD_opencv_cudaimgproc=OFF \ - -DBUILD_opencv_cudalegacy=OFF \ - -DBUILD_opencv_cudaobjdetect=OFF \ - -DBUILD_opencv_cudaoptflow=OFF \ - -DBUILD_opencv_cudastereo=OFF \ - -DBUILD_opencv_cudawarping=OFF \ - -DBUILD_opencv_cudev=OFF \ - -DWITH_CUBLAS=OFF \ - -DWITH_CUDA=OFF \ - -DWITH_CUFFT=OFF - -# NVidia stuff -OPENCV3_CONF_OPTS += -DWITH_NVCUVID=OFF - -# AMD stuff -OPENCV3_CONF_OPTS += \ - -DWITH_OPENCLAMDBLAS=OFF \ - -DWITH_OPENCLAMDFFT=OFF - -# Intel stuff -OPENCV3_CONF_OPTS += \ - -DBUILD_WITH_DYNAMIC_IPP=OFF \ - -DWITH_INTELPERC=OFF \ - -DWITH_IPP=OFF \ - -DWITH_IPP_A=OFF \ - -DWITH_TBB=OFF - -# Smartek stuff -OPENCV3_CONF_OPTS += -DWITH_GIGEAPI=OFF - -# Prosilica stuff -OPENCV3_CONF_OPTS += -DWITH_PVAPI=OFF - -# Ximea stuff -OPENCV3_CONF_OPTS += -DWITH_XIMEA=OFF - -# Non-Linux support (Android options) must remain OFF: -OPENCV3_CONF_OPTS += \ - -DANDROID=OFF \ - -DBUILD_ANDROID_CAMERA_WRAPPER=OFF \ - -DBUILD_ANDROID_EXAMPLES=OFF \ - -DBUILD_ANDROID_SERVICE=OFF \ - -DBUILD_FAT_JAVA_LIB=OFF \ - -DINSTALL_ANDROID_EXAMPLES=OFF \ - -DWITH_ANDROID_CAMERA=OFF - -# Non-Linux support (Mac OSX options) must remain OFF: -OPENCV3_CONF_OPTS += \ - -DWITH_AVFOUNDATION=OFF \ - -DWITH_CARBON=OFF \ - -DWITH_QUICKTIME=OFF - -# Non-Linux support (Windows options) must remain OFF: -OPENCV3_CONF_OPTS += \ - -DWITH_CSTRIPES=OFF \ - -DWITH_DSHOW=OFF \ - -DWITH_MSMF=OFF \ - -DWITH_PTHREADS_PF=OFF \ - -DWITH_VFW=OFF \ - -DWITH_VIDEOINPUT=OFF \ - -DWITH_WIN32UI=OFF - -# Software/3rd-party support options: -# - disable all examples -OPENCV3_CONF_OPTS += \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_JASPER=OFF \ - -DBUILD_JPEG=OFF \ - -DBUILD_OPENEXR=OFF \ - -DBUILD_PNG=OFF \ - -DBUILD_TIFF=OFF \ - -DBUILD_ZLIB=OFF \ - -DINSTALL_C_EXAMPLES=OFF \ - -DINSTALL_PYTHON_EXAMPLES=OFF \ - -DINSTALL_TO_MANGLED_PATHS=OFF - -# Disabled features (mostly because they are not available in Buildroot), but -# - eigen: OpenCV does not use it, not take any benefit from it. -OPENCV3_CONF_OPTS += \ - -DWITH_1394=OFF \ - -DWITH_CLP=OFF \ - -DWITH_EIGEN=OFF \ - -DWITH_GDAL=OFF \ - -DWITH_GPHOTO2=OFF \ - -DWITH_MATLAB=OFF \ - -DWITH_OPENCL=OFF \ - -DWITH_OPENCL_SVM=OFF \ - -DWITH_OPENEXR=OFF \ - -DWITH_OPENNI2=OFF \ - -DWITH_OPENNI=OFF \ - -DWITH_UNICAP=OFF \ - -DWITH_VA=OFF \ - -DWITH_VA_INTEL=OFF \ - -DWITH_VTK=OFF \ - -DWITH_WEBP=OFF \ - -DWITH_XINE=OFF - -OPENCV3_DEPENDENCIES += zlib - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),y) -OPENCV3_CONF_OPTS += -DWITH_FFMPEG=ON -OPENCV3_DEPENDENCIES += ffmpeg bzip2 -else -OPENCV3_CONF_OPTS += -DWITH_FFMPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER),y) -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=ON -OPENCV3_DEPENDENCIES += gstreamer gst-plugins-base -else -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER_0_10=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GSTREAMER1),y) -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=ON -OPENCV3_DEPENDENCIES += gstreamer1 gst1-plugins-base -else -OPENCV3_CONF_OPTS += -DWITH_GSTREAMER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK)$(BR2_PACKAGE_OPENCV3_WITH_GTK3),) -OPENCV3_CONF_OPTS += -DWITH_GTK=OFF -DWITH_GTK_2_X=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK),y) -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=ON -OPENCV3_DEPENDENCIES += libgtk2 -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_GTK3),y) -OPENCV3_CONF_OPTS += -DWITH_GTK=ON -DWITH_GTK_2_X=OFF -OPENCV3_DEPENDENCIES += libgtk3 -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_JASPER),y) -OPENCV3_CONF_OPTS += -DWITH_JASPER=ON -OPENCV3_DEPENDENCIES += jasper -else -OPENCV3_CONF_OPTS += -DWITH_JASPER=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_JPEG),y) -OPENCV3_CONF_OPTS += -DWITH_JPEG=ON -OPENCV3_DEPENDENCIES += jpeg -else -OPENCV3_CONF_OPTS += -DWITH_JPEG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_OPENGL),y) -OPENCV3_CONF_OPTS += -DWITH_OPENGL=ON -OPENCV3_DEPENDENCIES += libgl -else -OPENCV3_CONF_OPTS += -DWITH_OPENGL=OFF -endif - -OPENCV3_CONF_OPTS += -DWITH_OPENMP=$(if $(BR2_GCC_ENABLE_OPENMP),ON,OFF) - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_PNG),y) -OPENCV3_CONF_OPTS += -DWITH_PNG=ON -OPENCV3_DEPENDENCIES += libpng -else -OPENCV3_CONF_OPTS += -DWITH_PNG=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT)$(BR2_PACKAGE_OPENCV3_WITH_QT5),) -OPENCV3_CONF_OPTS += -DWITH_QT=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT),y) -OPENCV3_CONF_OPTS += -DWITH_QT=4 -OPENCV3_DEPENDENCIES += qt -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_QT5),y) -OPENCV3_CONF_OPTS += -DWITH_QT=5 -OPENCV3_DEPENDENCIES += qt5base -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_TIFF),y) -OPENCV3_CONF_OPTS += -DWITH_TIFF=ON -OPENCV3_DEPENDENCIES += tiff -else -OPENCV3_CONF_OPTS += -DWITH_TIFF=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_WITH_V4L),y) -OPENCV3_CONF_OPTS += \ - -DWITH_LIBV4L=$(if $(BR2_PACKAGE_LIBV4L),ON,OFF) \ - -DWITH_V4L=ON -OPENCV3_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBV4L),libv4l) -else -OPENCV3_CONF_OPTS += -DWITH_V4L=OFF -DWITH_LIBV4L=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENCV3_LIB_PYTHON),y) -ifeq ($(BR2_PACKAGE_PYTHON),y) -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=ON \ - -DBUILD_opencv_python3=OFF \ - -DPYTHON2_EXECUTABLE=$(HOST_DIR)/usr/bin/python2 \ - -DPYTHON2_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON_VERSION_MAJOR) \ - -DPYTHON2_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR).so \ - -DPYTHON2_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON2_PACKAGES_PATH=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages \ - -DPYTHON2_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python -else -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=OFF \ - -DBUILD_opencv_python3=ON \ - -DPYTHON3_EXECUTABLE=$(HOST_DIR)/usr/bin/python3 \ - -DPYTHON3_INCLUDE_PATH=$(STAGING_DIR)/usr/include/python$(PYTHON3_VERSION_MAJOR)m \ - -DPYTHON3_LIBRARIES=$(STAGING_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR)m.so \ - -DPYTHON3_NUMPY_INCLUDE_DIRS=$(STAGING_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/numpy/core/include \ - -DPYTHON3_PACKAGES_PATH=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages \ - -DPYTHON3_NUMPY_VERSION=$(PYTHON_NUMPY_VERSION) -OPENCV3_DEPENDENCIES += python3 -endif -OPENCV3_DEPENDENCIES += python-numpy -else -OPENCV3_CONF_OPTS += \ - -DBUILD_opencv_python2=OFF \ - -DBUILD_opencv_python3=OFF -endif - -# Installation hooks: -define OPENCV3_CLEAN_INSTALL_DOC - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/doc -endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_DOC - -define OPENCV3_CLEAN_INSTALL_CMAKE - $(RM) -f $(TARGET_DIR)/usr/share/OpenCV/OpenCVConfig*.cmake -endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_CMAKE - -ifneq ($(BR2_PACKAGE_OPENCV3_INSTALL_DATA),y) -define OPENCV3_CLEAN_INSTALL_DATA - $(RM) -fr $(TARGET_DIR)/usr/share/OpenCV/haarcascades \ - $(TARGET_DIR)/usr/share/OpenCV/lbpcascades -endef -OPENCV3_POST_INSTALL_TARGET_HOOKS += OPENCV3_CLEAN_INSTALL_DATA -endif - -$(eval $(cmake-package)) diff --git a/package.bak/opengl/Config.in b/package.bak/opengl/Config.in deleted file mode 100644 index 20ee28b06e..0000000000 --- a/package.bak/opengl/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -source "package/opengl/libgl/Config.in" -source "package/opengl/libegl/Config.in" -source "package/opengl/libgles/Config.in" -source "package/opengl/libopenvg/Config.in" -source "package/opengl/libopenmax/Config.in" diff --git a/package.bak/opengl/libegl/Config.in b/package.bak/opengl/libegl/Config.in deleted file mode 100644 index f756fbeadf..0000000000 --- a/package.bak/opengl/libegl/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HAS_LIBEGL - bool - -config BR2_PACKAGE_HAS_LIBEGL_WAYLAND - bool - depends on BR2_PACKAGE_HAS_LIBEGL - -config BR2_PACKAGE_PROVIDES_LIBEGL - depends on BR2_PACKAGE_HAS_LIBEGL - string diff --git a/package.bak/opengl/libegl/libegl.mk b/package.bak/opengl/libegl/libegl.mk deleted file mode 100644 index 1f5460e643..0000000000 --- a/package.bak/opengl/libegl/libegl.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# libegl -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/opengl/libgl/Config.in b/package.bak/opengl/libgl/Config.in deleted file mode 100644 index 8b99e5bdd3..0000000000 --- a/package.bak/opengl/libgl/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_LIBGL - bool - -config BR2_PACKAGE_PROVIDES_LIBGL - depends on BR2_PACKAGE_HAS_LIBGL - string diff --git a/package.bak/opengl/libgl/libgl.mk b/package.bak/opengl/libgl/libgl.mk deleted file mode 100644 index 7abc13d637..0000000000 --- a/package.bak/opengl/libgl/libgl.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# libgl -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/opengl/libgles/Config.in b/package.bak/opengl/libgles/Config.in deleted file mode 100644 index b7b800f3f2..0000000000 --- a/package.bak/opengl/libgles/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_LIBGLES - bool - -config BR2_PACKAGE_PROVIDES_LIBGLES - depends on BR2_PACKAGE_HAS_LIBGLES - string diff --git a/package.bak/opengl/libgles/libgles.mk b/package.bak/opengl/libgles/libgles.mk deleted file mode 100644 index 407f8f92ba..0000000000 --- a/package.bak/opengl/libgles/libgles.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# libgles -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/opengl/libopenmax/Config.in b/package.bak/opengl/libopenmax/Config.in deleted file mode 100644 index d50f2ced1f..0000000000 --- a/package.bak/opengl/libopenmax/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_LIBOPENMAX - bool - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - depends on BR2_PACKAGE_HAS_LIBOPENMAX - string diff --git a/package.bak/opengl/libopenmax/libopenmax.mk b/package.bak/opengl/libopenmax/libopenmax.mk deleted file mode 100644 index bc2e7f88e4..0000000000 --- a/package.bak/opengl/libopenmax/libopenmax.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# libopenmax -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/opengl/libopenvg/Config.in b/package.bak/opengl/libopenvg/Config.in deleted file mode 100644 index 53cde6a88c..0000000000 --- a/package.bak/opengl/libopenvg/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_LIBOPENVG - bool - -config BR2_PACKAGE_PROVIDES_LIBOPENVG - depends on BR2_PACKAGE_HAS_LIBOPENVG - string diff --git a/package.bak/opengl/libopenvg/libopenvg.mk b/package.bak/opengl/libopenvg/libopenvg.mk deleted file mode 100644 index 3ce85a1637..0000000000 --- a/package.bak/opengl/libopenvg/libopenvg.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# libopenvg -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/opengl/opengl.mk b/package.bak/opengl/opengl.mk deleted file mode 100644 index abf96d5c70..0000000000 --- a/package.bak/opengl/opengl.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard package/opengl/*/*.mk)) diff --git a/package.bak/openipmi/0001-Avoid-searching-host-library-path.patch b/package.bak/openipmi/0001-Avoid-searching-host-library-path.patch deleted file mode 100644 index 9a51d97e27..0000000000 --- a/package.bak/openipmi/0001-Avoid-searching-host-library-path.patch +++ /dev/null @@ -1,52 +0,0 @@ -From ca6e99d9fa4bf503a883407e964eaad5e18d51c7 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 22 Jul 2015 07:04:33 +0300 -Subject: [PATCH] Avoid searching host library path - -The $(libdir) variable points to the location of the directory on the target -system, /usr/lib by default. When cross compiling this directory contains the -host libraries which may be different than target libraries. Don't use -$(libdir) in the library search path. - -Signed-off-by: Baruch Siach ---- - cmdlang/Makefile.am | 2 +- - unix/Makefile.am | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/cmdlang/Makefile.am b/cmdlang/Makefile.am -index e80090dd0c6f..b59ff244b9a8 100644 ---- a/cmdlang/Makefile.am -+++ b/cmdlang/Makefile.am -@@ -16,7 +16,7 @@ libOpenIPMIcmdlang_la_LIBADD = -lm \ - $(top_builddir)/utils/libOpenIPMIutils.la \ - $(top_builddir)/lib/libOpenIPMI.la - libOpenIPMIcmdlang_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIcmdlang.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIcmdlang.map - - bin_PROGRAMS = openipmish - -diff --git a/unix/Makefile.am b/unix/Makefile.am -index a7921477e1c4..a108bc679c9a 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -11,13 +11,13 @@ libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ - $(top_builddir)/utils/libOpenIPMIutils.la - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIpthread.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIpthread.map - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ - $(GDBM_LIB) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ -- -Wl,-Map -Wl,libOpenIPMIposix.map -L$(libdir) -+ -Wl,-Map -Wl,libOpenIPMIposix.map - - noinst_HEADERS = heap.h - --- -2.1.4 - diff --git a/package.bak/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch b/package.bak/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch deleted file mode 100644 index d58ffd7caf..0000000000 --- a/package.bak/openipmi/0002-configure.ac-detect-lrt-requirement-for-clock_gettim.patch +++ /dev/null @@ -1,57 +0,0 @@ -From d3be03464be7fa3844dfe0837a7e2c920c107836 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 23 Jul 2015 13:35:35 +0300 -Subject: [PATCH] configure.ac: detect -lrt requirement for clock_gettime - -glibc versions before 2.17 require link with -lrt. - -Upstream status: sent, stuck in moderator's queue - -Signed-off-by: Baruch Siach ---- - configure.ac | 8 ++++++++ - unix/Makefile.am | 4 ++-- - 2 files changed, 10 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 18401f161d45..6b350a41a916 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -854,6 +854,14 @@ OPENIPMI_SWIG_SO="${PYTHON_POSIX_SO}:\$(top_builddir)/lib/.libs/libOpenIPMI.so:\ - AC_SUBST(OPENIPMI_SWIG_LIBS) - AC_SUBST(OPENIPMI_SWIG_SO) - -+LIB_CLOCK_GETTIME= -+clk_saved_libs=$LIBS -+AC_SEARCH_LIBS([clock_gettime], [rt], -+ [test "$ac_cv_search_clock_gettime" = "none required" || -+ LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) -+AC_SUBST([LIB_CLOCK_GETTIME]) -+LIBS=$clk_saved_libs -+ - # Everything from here to AC_OUTPUT is for libedit - - # AC_PROG_LIBTOOL runs AC_CANONICAL_HOST -diff --git a/unix/Makefile.am b/unix/Makefile.am -index a108bc679c9a..fb60242d5d3b 100644 ---- a/unix/Makefile.am -+++ b/unix/Makefile.am -@@ -9,13 +9,13 @@ lib_LTLIBRARIES = libOpenIPMIposix.la libOpenIPMIpthread.la - - libOpenIPMIpthread_la_SOURCES = posix_thread_os_hnd.c selector.c - libOpenIPMIpthread_la_LIBADD = -lpthread $(GDBM_LIB) \ -- $(top_builddir)/utils/libOpenIPMIutils.la -+ $(top_builddir)/utils/libOpenIPMIutils.la $(LIB_CLOCK_GETTIME) - libOpenIPMIpthread_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ - -Wl,-Map -Wl,libOpenIPMIpthread.map - - libOpenIPMIposix_la_SOURCES = posix_os_hnd.c selector.c - libOpenIPMIposix_la_LIBADD = $(top_builddir)/utils/libOpenIPMIutils.la \ -- $(GDBM_LIB) -+ $(GDBM_LIB) $(LIB_CLOCK_GETTIME) - libOpenIPMIposix_la_LDFLAGS = -rdynamic -version-info $(LD_VERSION) \ - -Wl,-Map -Wl,libOpenIPMIposix.map - --- -2.1.4 - diff --git a/package.bak/openipmi/Config.in b/package.bak/openipmi/Config.in deleted file mode 100644 index d8c94b307c..0000000000 --- a/package.bak/openipmi/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_OPENIPMI - bool "openipmi" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_POPT - select BR2_PACKAGE_NCURSES - help - IPMI allows remote monitoring and remote management of - devices. OpenIPMI provides a library and command line tools - to interact with IPMI enabled devices. OpenIPMI also provides - an IPMI BMC simulator. - - http://openipmi.sourceforge.net - -comment "openipmi needs a toolchain w/ dynamic library, NPTL" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/openipmi/openipmi.hash b/package.bak/openipmi/openipmi.hash deleted file mode 100644 index 30e37634ef..0000000000 --- a/package.bak/openipmi/openipmi.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library/ -sha1 826081e7ed0ad430de9b8fdb75a9eaa10c99b660 OpenIPMI-2.0.22.tar.gz -# Locally computed -sha256 4988900043c35fcfa9b2bf275d6593904f6429221befb770ba6ecb5502108e55 OpenIPMI-2.0.22.tar.gz -sha256 0eafaa502ccf752899c5089159574081067d0c4ac53ea0ace33a5087f33ea32a 0001-ui-use-standard-uint32_t.patch diff --git a/package.bak/openipmi/openipmi.mk b/package.bak/openipmi/openipmi.mk deleted file mode 100644 index 9faa7c685f..0000000000 --- a/package.bak/openipmi/openipmi.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# openipmi -# -################################################################################ - -OPENIPMI_VERSION = 2.0.22 -OPENIPMI_SITE = http://sourceforge.net/projects/openipmi/files/OpenIPMI%202.0%20Library -OPENIPMI_SOURCE = OpenIPMI-$(OPENIPMI_VERSION).tar.gz -OPENIPMI_PATCH = \ - http://sourceforge.net/p/openipmi/patches/26/attachment/0001-ui-use-standard-uint32_t.patch -OPENIPMI_LICENSE = LGPLv2+, GPLv2+, BSD-3c -OPENIPMI_LICENSE_FILES = COPYING.LIB COPYING COPYING.BSD -OPENIPMI_DEPENDENCIES = popt ncurses host-pkgconf -# Patching Makefile.am -OPENIPMI_AUTORECONF = YES -OPENIPMI_CONF_ENV = ac_cv_path_pkgprog="$(PKG_CONFIG_HOST_BINARY)" -OPENIPMI_CONF_OPTS = \ - --with-glib=no \ - --with-glib12=no \ - --with-tcl=no \ - --with-perl=no \ - --with-python=no \ - --with-swig=no - -ifeq ($(BR2_PACKAGE_GDBM),y) -OPENIPMI_DEPENDENCIES += gdbm -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENIPMI_DEPENDENCIES += openssl -OPENIPMI_CONF_OPTS += --with-openssl=yes -else -OPENIPMI_CONF_OPTS += --with-openssl=no -endif - -ifeq ($(BR2_PACKAGE_NETSNMP),y) -OPENIPMI_DEPENDENCIES += netsnmp -OPENIPMI_CONF_OPTS += --with-ucdsnmp=yes -else -OPENIPMI_CONF_OPTS += --with-ucdsnmp=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch b/package.bak/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch deleted file mode 100644 index bce790a478..0000000000 --- a/package.bak/openjpeg/0001-thirdparty-tiff-append-flags-found-by-pkg-config-if-.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 38f50c7d9ad3ba06b64583045665203afb53cbd9 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 6 Nov 2016 16:29:08 +0100 -Subject: [PATCH] thirdparty: tiff: append flags found by pkg-config if - available - -This change allows to get all required CFLAGS/LDFLAGS in case of static only -build. - -This build issue [1] was triggered by the Buildroot farms. - -[1] http://autobuild.buildroot.net/results/d0d/d0d22727311d6300e0e400728126170407bfd699/build-end.log - -Signed-off-by: Samuel Martin ---- - thirdparty/CMakeLists.txt | 23 +++++++++++++++++++++-- - 1 file changed, 21 insertions(+), 2 deletions(-) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index cb24b43b58e2..cd6a5e1391b0 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -1,5 +1,9 @@ - # 3rd party libs - -+if(NOT BUILD_THIRDPARTY) -+ include(FindPkgConfig) -+endif(NOT BUILD_THIRDPARTY) -+ - #------------ - # Try to find lib Z - if(BUILD_THIRDPARTY) -@@ -36,6 +40,9 @@ if(BUILD_THIRDPARTY) - else(BUILD_THIRDPARTY) - if(ZLIB_FOUND) - find_package(PNG) -+ # Static only build: -+ # it is not necessary to invoke pkg_check_module on libpng, because libpng -+ # only depends on zlib, which is already checked. - if(PNG_FOUND) - message(STATUS "Your system seems to have a PNG lib available, we will use it") - set(OPJ_HAVE_PNG_H 1 PARENT_SCOPE) -@@ -66,12 +73,24 @@ if(BUILD_THIRDPARTY) - set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) - else(BUILD_THIRDPARTY) - find_package(TIFF) -+ # Static only build: -+ # it is necessary to invoke pkg_check_module on libtiff since it may have -+ # several other dependencies not declared by its cmake module, but they are -+ # in the its pkgconfig module. -+ if(PKG_CONFIG_FOUND) -+ foreach(pc_tiff_module tiff tiff3 tiff4 tiff-3 tiff-4 libtiff libtiff3 libtiff4 libtiff-3 libtiff-4) -+ pkg_check_modules(PC_TIFF QUIET ${pc_tiff_module}) -+ if(PC_TIFF_FOUND) -+ break() -+ endif(PC_TIFF_FOUND) -+ endforeach() -+ endif(PKG_CONFIG_FOUND) - if(TIFF_FOUND) - message(STATUS "Your system seems to have a TIFF lib available, we will use it") - set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE) - set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE) -- set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE) -- set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} PARENT_SCOPE) -+ set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES} PARENT_SCOPE) -+ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR} ${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - else(TIFF_FOUND) # not found - set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE) - set(OPJ_HAVE_LIBTIFF 0 PARENT_SCOPE) --- -2.10.2 - diff --git a/package.bak/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch b/package.bak/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch deleted file mode 100644 index 5697b82de2..0000000000 --- a/package.bak/openjpeg/0002-thirdparty-lcms2-append-flags-found-by-pkg-config-if.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 226daa77ea5a35da306f9af2548f3e2c9e79f577 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 11 Nov 2016 23:35:13 +0100 -Subject: [PATCH] thirdparty: lcms2: append flags found by pkg-config if - available - -This change allows to get all required CFLAGS/LDFLAGS in case of static only -build. - -Fixes a buildroot build failure (see [1], [2] and [3]). - -[1] http://autobuild.buildroot.net/results/5ce/5cee20afd8bef5268832cddcb3a5270746be7a57 -[2] http://lists.busybox.net/pipermail/buildroot/2016-November/177187.html -[3] http://lists.busybox.net/pipermail/buildroot/2016-November/177188.html - -Signed-off-by: Peter Seiderer ---- - thirdparty/CMakeLists.txt | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/thirdparty/CMakeLists.txt b/thirdparty/CMakeLists.txt -index cd6a5e1391b0..a3a8494d89b1 100644 ---- a/thirdparty/CMakeLists.txt -+++ b/thirdparty/CMakeLists.txt -@@ -113,12 +113,19 @@ if( BUILD_THIRDPARTY) - set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) - else(BUILD_THIRDPARTY) - find_package(LCMS2) -+ # Static only build: -+ # it is necessary to invoke pkg_check_module on lcms2 since it may have -+ # several other dependencies not declared by its cmake module, but they are -+ # in the its pkgconfig module. -+ if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_LCMS2 QUIET lcms2) -+ endif(PKG_CONFIG_FOUND) - if(LCMS2_FOUND) - message(STATUS "Your system seems to have a LCMS2 lib available, we will use it") - set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE) - set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE) -- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE) -- set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} PARENT_SCOPE) -+ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES} PARENT_SCOPE) -+ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS} ${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE) - else(LCMS2_FOUND) # not found lcms2 - # try to find LCMS - find_package(LCMS) --- -2.10.2 - diff --git a/package.bak/openjpeg/Config.in b/package.bak/openjpeg/Config.in deleted file mode 100644 index 738999fed7..0000000000 --- a/package.bak/openjpeg/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_OPENJPEG - bool "openjpeg" - help - The OpenJPEG library is an open-source JPEG 2000 codec - written in C. - - http://www.openjpeg.org diff --git a/package.bak/openjpeg/openjpeg.hash b/package.bak/openjpeg/openjpeg.hash deleted file mode 100644 index c0abd0c54d..0000000000 --- a/package.bak/openjpeg/openjpeg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4ce77b6ef538ef090d9bde1d5eeff8b3069ab56c4906f083475517c2c023dfa7 openjpeg-2.1.2.tar.gz diff --git a/package.bak/openjpeg/openjpeg.mk b/package.bak/openjpeg/openjpeg.mk deleted file mode 100644 index ca22068113..0000000000 --- a/package.bak/openjpeg/openjpeg.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# openjpeg -# -################################################################################ - -OPENJPEG_VERSION = 2.1.2 -OPENJPEG_SITE = $(call github,uclouvain,openjpeg,v$(OPENJPEG_VERSION)) -OPENJPEG_LICENSE = BSD-2c -OPENJPEG_LICENSE_FILES = LICENSE -OPENJPEG_INSTALL_STAGING = YES - -OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) -OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBPNG),libpng) -OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) -OPENJPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LCMS2),lcms2) - -$(eval $(cmake-package)) diff --git a/package.bak/openldap/0001-fix_cross_strip.patch b/package.bak/openldap/0001-fix_cross_strip.patch deleted file mode 100644 index ed4964e44b..0000000000 --- a/package.bak/openldap/0001-fix_cross_strip.patch +++ /dev/null @@ -1,74 +0,0 @@ -Fix stripping when cross-compiling - -Probably-Signed-off-by: Dave Bender -[yann.morin.1998@free.fr: patch was made by Dave, but he - forgot his SoB line, so I added it] -Signed-off-by: "Yann E. MORIN" - -diff -rupN openldap-2.4.40/build/shtool openldap-2.4.40-br/build/shtool ---- openldap-2.4.40/build/shtool 2014-09-18 21:48:49.000000000 -0400 -+++ openldap-2.4.40-br/build/shtool 2015-01-21 13:21:35.689829372 -0500 -@@ -981,7 +981,7 @@ install ) - if [ ".$opt_t" = .yes ]; then - echo "strip $dsttmp" 1>&2 - fi -- strip $dsttmp || shtool_exit $? -+ $STRIP $dsttmp || shtool_exit $? - fi - if [ ".$opt_o" != . ]; then - if [ ".$opt_t" = .yes ]; then -diff -rupN openldap-2.4.40/build/top.mk openldap-2.4.40-br/build/top.mk ---- openldap-2.4.40/build/top.mk 2014-09-18 21:48:49.000000000 -0400 -+++ openldap-2.4.40-br/build/top.mk 2015-01-21 13:23:41.027810097 -0500 -@@ -59,7 +59,7 @@ INSTALL_PROGRAM = $(INSTALL) - INSTALL_DATA = $(INSTALL) -m 644 - INSTALL_SCRIPT = $(INSTALL) - --STRIP = -s -+STRIP_OPTS = -s - - LINT = lint - 5LINT = 5lint -diff -rupN openldap-2.4.40/clients/tools/Makefile.in openldap-2.4.40-br/clients/tools/Makefile.in ---- openldap-2.4.40/clients/tools/Makefile.in 2014-09-18 21:48:49.000000000 -0400 -+++ openldap-2.4.40-br/clients/tools/Makefile.in 2015-01-21 13:23:35.827727946 -0500 -@@ -120,7 +120,7 @@ install-local: FORCE - -$(MKDIR) $(DESTDIR)$(bindir) - @( \ - for prg in $(PROGRAMS); do \ -- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 $$prg$(EXEEXT) \ -+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 $$prg$(EXEEXT) \ - $(DESTDIR)$(bindir); \ - done \ - ) -diff -rupN openldap-2.4.40/configure.in openldap-2.4.40-br/configure.in ---- openldap-2.4.40/configure.in 2014-09-18 21:48:49.000000000 -0400 -+++ openldap-2.4.40-br/configure.in 2015-01-16 15:50:48.874816786 -0500 -@@ -669,6 +669,15 @@ if test -z "${AR}"; then - fi - fi - -+if test -z "${STRIP}"; then -+ AC_CHECK_PROGS(STRIP,strip,missing) -+ -+ if test "${STRIP}" = "missing" ; then -+ AC_MSG_ERROR([Unable to locate strip(1) or suitable replacement. Check PATH or set STRIP.]) -+ fi -+fi -+ -+ - AC_LIBTOOL_WIN32_DLL - AC_LIBTOOL_DLOPEN - AC_PROG_LIBTOOL -diff -rupN openldap-2.4.40/servers/slapd/Makefile.in openldap-2.4.40-br/servers/slapd/Makefile.in ---- openldap-2.4.40/servers/slapd/Makefile.in 2015-01-16 15:04:52.507473256 -0500 -+++ openldap-2.4.40-br/servers/slapd/Makefile.in 2015-01-16 15:05:02.299627229 -0500 -@@ -378,7 +378,7 @@ install-local-srv: install-slapd install - install-slapd: FORCE - -$(MKDIR) $(DESTDIR)$(libexecdir) - -$(MKDIR) $(DESTDIR)$(localstatedir)/run -- $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \ -+ $(LTINSTALL) $(INSTALLFLAGS) $(STRIP_OPTS) -m 755 \ - slapd$(EXEEXT) $(DESTDIR)$(libexecdir) - @for i in $(SUBDIRS); do \ - if test -d $$i && test -f $$i/Makefile ; then \ diff --git a/package.bak/openldap/0002-fix-bignum.patch b/package.bak/openldap/0002-fix-bignum.patch deleted file mode 100644 index d3dc88fc37..0000000000 --- a/package.bak/openldap/0002-fix-bignum.patch +++ /dev/null @@ -1,38 +0,0 @@ -configure: correctly detect bignum - -Building with bignum is currently not possible, since we're checking -ol_with_tls against a value it is never assigned in any case. - -Since bignum is from openssl, and openssl is the preferred TLS -implementation, if the bignum headers are found, it means we do have -TLS and it is opensl. - -So, keep the check for the bignum header, but check against ol_link_tls -which means that openssl is enabled when we find the bignum headers. - -Signed-off-by: "Yann E. MORIN" - -diff -durN openldap-2.4.40.orig/configure openldap-2.4.40/configure ---- openldap-2.4.40.orig/configure 2014-09-19 03:48:49.000000000 +0200 -+++ openldap-2.4.40/configure 2015-01-25 18:44:54.216879362 +0100 -@@ -23478,7 +23478,7 @@ - - if test "$ac_cv_header_openssl_bn_h" = "yes" && - test "$ac_cv_header_openssl_crypto_h" = "yes" && -- test "$ol_with_tls" = "found" ; then -+ test "$ol_link_tls" = "yes" ; then - ol_with_mp=bignum - - $as_echo "#define USE_MP_BIGNUM 1" >>confdefs.h -diff -durN openldap-2.4.40.orig/configure.in openldap-2.4.40/configure.in ---- openldap-2.4.40.orig/configure.in 2014-09-19 03:48:49.000000000 +0200 -+++ openldap-2.4.40/configure.in 2015-01-25 18:44:37.628676446 +0100 -@@ -2367,7 +2367,7 @@ - AC_CHECK_HEADERS(openssl/crypto.h) - if test "$ac_cv_header_openssl_bn_h" = "yes" && - test "$ac_cv_header_openssl_crypto_h" = "yes" && -- test "$ol_with_tls" = "found" ; then -+ test "$ol_link_tls" = "yes" ; then - ol_with_mp=bignum - AC_DEFINE(USE_MP_BIGNUM,1,[define to use OpenSSL BIGNUM for MP]) - elif test $ol_with_mp = bignum ; then diff --git a/package.bak/openldap/0003-disable-docs.patch b/package.bak/openldap/0003-disable-docs.patch deleted file mode 100644 index 7ce61e6526..0000000000 --- a/package.bak/openldap/0003-disable-docs.patch +++ /dev/null @@ -1,23 +0,0 @@ -doc: do not build - -Building the documentation fails on some autobuilders, -so disable it as we're not interested in it. - -Fixes: - http://autobuild.buildroot.org/results/1dc/1dc17a54e57130bffd19d360c9a7faae440b8916/ - http://autobuild.buildroot.org/results/407/40797597024cbb9054fdda8bdf4d011bba966b06/ - -Signed-off-by: "Yann E. MORIN" - -diff -durN openldap-2.4.40.orig/Makefile.in openldap-2.4.40/Makefile.in ---- openldap-2.4.40.orig/Makefile.in 2014-09-19 03:48:49.000000000 +0200 -+++ openldap-2.4.40/Makefile.in 2015-01-31 23:12:54.347678913 +0100 -@@ -13,7 +13,7 @@ - ## top-level directory of the distribution or, alternatively, at - ## . - --SUBDIRS= include libraries clients servers tests doc -+SUBDIRS= include libraries clients servers tests - CLEANDIRS= - INSTALLDIRS= - diff --git a/package.bak/openldap/Config.in b/package.bak/openldap/Config.in deleted file mode 100644 index 3085a5c87e..0000000000 --- a/package.bak/openldap/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_OPENLDAP - bool "openldap" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # needs fork() - help - OpenLDAP Software is an open source implementation of - the Lightweight Directory Access Protocol. - - This only installs client-side support. - - http://www.openldap.org/ - -if BR2_PACKAGE_OPENLDAP - -config BR2_PACKAGE_OPENLDAP_CLIENTS - bool "openldap client binaries" - default y - help - Install the OpenLDAP client tools (ldapadd, ldapcompare, ldapdelete, - ldapexop, ldapmodify, ldapmodrdn, ldappasswd, ldapsearch, ldapurl, - ldapwhoami) - -endif - -comment "openldap needs a toolchain w/ wchar" - depends on BR2_USE_MMU # needs fork() - depends on !BR2_USE_WCHAR diff --git a/package.bak/openldap/openldap.hash b/package.bak/openldap/openldap.hash deleted file mode 100644 index 785c4897f5..0000000000 --- a/package.bak/openldap/openldap.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.md5 -md5 693ac26de86231f8dcae2b4e9d768e51 openldap-2.4.44.tgz -# From http://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.44.sha1 -sha1 016a738d050a68d388602a74b5e991035cdba149 openldap-2.4.44.tgz diff --git a/package.bak/openldap/openldap.mk b/package.bak/openldap/openldap.mk deleted file mode 100644 index 2f738e51de..0000000000 --- a/package.bak/openldap/openldap.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# openldap -# -################################################################################ - -OPENLDAP_VERSION = 2.4.44 -OPENLDAP_SOURCE = openldap-$(OPENLDAP_VERSION).tgz -OPENLDAP_SITE = http://www.openldap.org/software/download/OpenLDAP/openldap-release -OPENLDAP_LICENSE = OpenLDAP Public License -OPENLDAP_LICENSE_FILES = LICENSE -OPENLDAP_INSTALL_STAGING = YES -OPENLDAP_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENLDAP_TLS = openssl -OPENLDAP_DEPENDENCIES += openssl -else ifeq ($(BR2_PACKAGE_GNUTLS),y) -OPENLDAP_TLS = gnutls -OPENLDAP_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_LIBNSS),y) -OPENLDAP_TLS = moznss -OPENLDAP_DEPENDENCIES += libnss -OPENLDAP_CPPFLAGS = \ - -I$(STAGING_DIR)/usr/include/nss \ - -I$(STAGING_DIR)/usr/include/nspr -else -OPENLDAP_TLS = no -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENLDAP_MP = bignum -OPENLDAP_DEPENDENCIES += openssl -OPENLDAP_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto`" -else ifeq ($(BR2_PACKAGE_GMP),y) -OPENLDAP_MP = gmp -OPENLDAP_DEPENDENCIES += gmp -else -OPENLDAP_MP = longlong -endif - -OPENLDAP_CONF_ENV += ac_cv_func_memcmp_working=yes - -OPENLDAP_CONF_OPTS += \ - --enable-syslog \ - --disable-proctitle \ - --disable-slapd \ - --with-yielding-select \ - --sysconfdir=/etc \ - --enable-dynamic=$(if $(BR2_STATIC_LIBS),no,yes) \ - --with-tls=$(OPENLDAP_TLS) \ - --with-mp=$(OPENLDAP_MP) \ - CPPFLAGS="$(TARGET_CPPFLAGS) $(OPENLDAP_CPPFLAGS)" - -# Somehow, ${STRIP} does not percolates through to the shtool script -# used to install the executables; thus, that script tries to run the -# executable it is supposed to install, resulting in an error. -OPENLDAP_MAKE_ENV = STRIP="$(TARGET_STRIP)" - -ifeq ($(BR2_PACKAGE_OPENLDAP_CLIENTS),) -OPENLDAP_CLIENTS = \ - ldapurl ldapexop ldapcompare ldapwhoami \ - ldappasswd ldapmodrdn ldapdelete ldapmodify \ - ldapsearch -define OPENLDAP_REMOVE_CLIENTS - $(RM) -f $(foreach p,$(OPENLDAP_CLIENTS),$(TARGET_DIR)/usr/bin/$(p)) - $(RM) -rf $(TARGET_DIR)/etc/openldap -endef -OPENLDAP_POST_INSTALL_TARGET_HOOKS += OPENLDAP_REMOVE_CLIENTS -endif - -$(eval $(autotools-package)) diff --git a/package.bak/openmpi/Config.in b/package.bak/openmpi/Config.in deleted file mode 100644 index 4413c55f9c..0000000000 --- a/package.bak/openmpi/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -comment "openmpi needs a toolchain w/ dynamic library, NPTL, wchar, C++" - depends on BR2_USE_MMU - depends on !BR2_sparc - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_OPENMPI - bool "openmpi" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS # dlfcn.h - # from the configure script: "Sparc v8 target is not supported - # in this release of Open MPI" - depends on !BR2_sparc - help - A High Performance Message Passing Library. - - https://www.open-mpi.org/ diff --git a/package.bak/openmpi/openmpi-mips32-fortran.cache b/package.bak/openmpi/openmpi-mips32-fortran.cache deleted file mode 100644 index 473f73a22e..0000000000 --- a/package.bak/openmpi/openmpi-mips32-fortran.cache +++ /dev/null @@ -1,51 +0,0 @@ -ompi_cv_fortran_sizeof_CHARACTER=1 -ompi_cv_fortran_sizeof_LOGICAL=4 -ompi_cv_fortran_sizeof_LOGICALp1=1 -ompi_cv_fortran_sizeof_LOGICALp2=2 -ompi_cv_fortran_sizeof_LOGICALp4=4 -ompi_cv_fortran_sizeof_LOGICALp8=8 -ompi_cv_fortran_sizeof_INTEGER=4 -ompi_cv_fortran_sizeof_INTEGERp1=1 -ompi_cv_fortran_sizeof_INTEGERp2=2 -ompi_cv_fortran_sizeof_INTEGERp4=4 -ompi_cv_fortran_sizeof_INTEGERp8=8 -ompi_cv_fortran_sizeof_REAL=4 -ompi_cv_fortran_sizeof_REALp4=4 -ompi_cv_fortran_sizeof_REALp8=8 -ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 -ompi_cv_fortran_sizeof_COMPLEX=8 -ompi_cv_fortran_sizeof_COMPLEXp8=8 -ompi_cv_fortran_sizeof_COMPLEXp16=16 -ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 -ompi_cv_fortran_alignment_CHARACTER=1 -ompi_cv_fortran_alignment_LOGICAL=4 -ompi_cv_fortran_alignment_LOGICALp1=1 -ompi_cv_fortran_alignment_LOGICALp2=2 -ompi_cv_fortran_alignment_LOGICALp4=4 -ompi_cv_fortran_alignment_LOGICALp8=8 -ompi_cv_fortran_alignment_INTEGER=4 -ompi_cv_fortran_alignment_INTEGERp1=1 -ompi_cv_fortran_alignment_INTEGERp2=2 -ompi_cv_fortran_alignment_INTEGERp4=4 -ompi_cv_fortran_alignment_INTEGERp8=8 -ompi_cv_fortran_alignment_REAL=4 -ompi_cv_fortran_alignment_REALp4=4 -ompi_cv_fortran_alignment_REALp8=8 -ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 -ompi_cv_fortran_alignment_COMPLEX=4 -ompi_cv_fortran_alignment_COMPLEXp8=4 -ompi_cv_fortran_alignment_COMPLEXp16=8 -ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 -ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 -ompi_cv_fortran_kind_value_C_SHORT=2 -ompi_cv_fortran_kind_value_C_INT=4 -ompi_cv_fortran_kind_value_C_INT16_T=2 -ompi_cv_fortran_kind_value_C_INT32_T=4 -ompi_cv_fortran_kind_value_C_INT64_T=8 -ompi_cv_fortran_kind_value_C_LONG_LONG=8 -ompi_cv_fortran_kind_value_C_FLOAT=4 -ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 -ompi_cv_fortran_kind_value_C_DOUBLE=8 -ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 -ompi_cv_fortran_true_value=1 -ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 diff --git a/package.bak/openmpi/openmpi-mips64-fortran.cache b/package.bak/openmpi/openmpi-mips64-fortran.cache deleted file mode 100644 index 7f0209971a..0000000000 --- a/package.bak/openmpi/openmpi-mips64-fortran.cache +++ /dev/null @@ -1,60 +0,0 @@ -ompi_cv_fortran_sizeof_CHARACTER=1 -ompi_cv_fortran_sizeof_LOGICAL=4 -ompi_cv_fortran_sizeof_LOGICALp1=1 -ompi_cv_fortran_sizeof_LOGICALp2=2 -ompi_cv_fortran_sizeof_LOGICALp4=4 -ompi_cv_fortran_sizeof_LOGICALp8=8 -ompi_cv_fortran_sizeof_INTEGER=4 -ompi_cv_fortran_sizeof_INTEGERp1=1 -ompi_cv_fortran_sizeof_INTEGERp2=2 -ompi_cv_fortran_sizeof_INTEGERp4=4 -ompi_cv_fortran_sizeof_INTEGERp8=8 -ompi_cv_fortran_sizeof_INTEGERp16=16 -ompi_cv_fortran_sizeof_REAL=4 -ompi_cv_fortran_sizeof_REALp4=4 -ompi_cv_fortran_sizeof_REALp8=8 -ompi_cv_fortran_sizeof_REALp16=16 -ompi_cv_fortran_sizeof_DOUBLE_PRECISION=8 -ompi_cv_fortran_sizeof_COMPLEX=8 -ompi_cv_fortran_sizeof_COMPLEXp8=8 -ompi_cv_fortran_sizeof_COMPLEXp16=16 -ompi_cv_fortran_sizeof_COMPLEXp32=32 -ompi_cv_fortran_sizeof_DOUBLE_COMPLEX=16 -ompi_cv_fortran_alignment_CHARACTER=1 -ompi_cv_fortran_alignment_LOGICAL=4 -ompi_cv_fortran_alignment_LOGICALp1=1 -ompi_cv_fortran_alignment_LOGICALp2=2 -ompi_cv_fortran_alignment_LOGICALp4=4 -ompi_cv_fortran_alignment_LOGICALp8=8 -ompi_cv_fortran_alignment_INTEGER=4 -ompi_cv_fortran_alignment_INTEGERp1=1 -ompi_cv_fortran_alignment_INTEGERp2=2 -ompi_cv_fortran_alignment_INTEGERp4=4 -ompi_cv_fortran_alignment_INTEGERp8=8 -ompi_cv_fortran_alignment_REAL=4 -ompi_cv_fortran_alignment_REALp4=4 -ompi_cv_fortran_alignment_REALp8=8 -ompi_cv_fortran_alignment_REALp16=16 -ompi_cv_fortran_alignment_DOUBLE_PRECISION=8 -ompi_cv_fortran_alignment_COMPLEX=4 -ompi_cv_fortran_alignment_COMPLEXp8=4 -ompi_cv_fortran_alignment_COMPLEXp16=8 -ompi_cv_fortran_alignment_COMPLEXp32=16 -ompi_cv_fortran_alignment_DOUBLE_COMPLEX=8 -ompi_cv_fortran_kind_value_C_SIGNED_CHAR=1 -ompi_cv_fortran_kind_value_C_SHORT=2 -ompi_cv_fortran_kind_value_C_INT=4 -ompi_cv_fortran_kind_value_C_INT16_T=2 -ompi_cv_fortran_kind_value_C_INT32_T=4 -ompi_cv_fortran_kind_value_C_INT64_T=8 -ompi_cv_fortran_kind_value_C_LONG_LONG=8 -ompi_cv_fortran_kind_value_C_LONG_DOUBLE=16 -ompi_cv_fortran_kind_value_C_LONG_DOUBLE_COMPLEX=16 -ompi_cv_fortran_kind_value_C_FLOAT=4 -ompi_cv_fortran_kind_value_C_FLOAT_COMPLEX=4 -ompi_cv_fortran_kind_value_C_DOUBLE=8 -ompi_cv_fortran_kind_value_C_DOUBLE_COMPLEX=8 -ompi_cv_fortran_kind_value_0=0 -ompi_cv_real16_c_equiv=yes -ompi_cv_fortran_true_value=1 -ompi_cv_fortran_sizeof_type_test_mpi_handle_=4 diff --git a/package.bak/openmpi/openmpi.hash b/package.bak/openmpi/openmpi.hash deleted file mode 100644 index 92152a2431..0000000000 --- a/package.bak/openmpi/openmpi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From: https://www.open-mpi.org/software/ompi/v1.10/ -md5 b2f43d9635d2d52826e5ef9feb97fd4c openmpi-1.10.2.tar.bz2 -sha1 03934fc0a2dd0d0d2d0459d714a976eabca938fb openmpi-1.10.2.tar.bz2 diff --git a/package.bak/openmpi/openmpi.mk b/package.bak/openmpi/openmpi.mk deleted file mode 100644 index c5b8a01b6f..0000000000 --- a/package.bak/openmpi/openmpi.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# openmpi -# -################################################################################ - -OPENMPI_VERSION_MAJOR = 1.10 -OPENMPI_VERSION = $(OPENMPI_VERSION_MAJOR).2 -OPENMPI_SITE = https://www.open-mpi.org/software/ompi/v$(OPENMPI_VERSION_MAJOR)/downloads -OPENMPI_SOURCE = openmpi-$(OPENMPI_VERSION).tar.bz2 -OPENMPI_LICENSE = BSD-3c -OPENMPI_LICENSE_FILES = LICENSE -OPENMPI_INSTALL_STAGING = YES -OPENMPI_CONF_OPTS = --disable-vt - -# Enabling Fortran support requires pre-seeding the configure script -# with various values that cannot be guessed, so we provide cache -# files for various architectures. - -ifeq ($(BR2_TOOLCHAIN_HAS_FORTRAN),y) -ifeq ($(BR2_mips)$(BR2_mipsel),y) -OPENMPI_FORTRAN_CONF_CACHE = package/openmpi/openmpi-mips32-fortran.cache -else ifeq ($(BR2_mips64)$(BR2_mips64el),y) -OPENMPI_FORTRAN_CONF_CACHE = package/openmpi/openmpi-mips64-fortran.cache -endif -endif - -ifneq ($(OPENMPI_FORTRAN_CONF_CACHE),) -define OPENMPI_COPY_FORTRAN_CACHE - cp $(OPENMPI_FORTRAN_CONF_CACHE) $(@D)/openmpi-config.cache -endef - -OPENMPI_POST_PATCH_HOOKS += OPENMPI_COPY_FORTRAN_CACHE -OPENMPI_CONF_OPTS += \ - --enable-mpi-fortran=yes \ - --cache-file=$(@D)/openmpi-config.cache -else -OPENMPI_CONF_OPTS += --enable-mpi-fortran=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/openntpd/Config.in b/package.bak/openntpd/Config.in deleted file mode 100644 index 1b856c03b8..0000000000 --- a/package.bak/openntpd/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_OPENNTPD - bool "openntpd" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU # fork () - depends on !BR2_PACKAGE_NTP # conflicting binaries - help - OpenNTPD is an easy to use implementation of the Network Time - Protocol. It provides the ability to sync the local clock - to remote NTP servers and can act as NTP server itself, - redistributing the local clock. It just works. - - http://www.openntpd.org/ - -comment "openntpd needs a toolchain w/ NPTL" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_NTP - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/openntpd/S49ntp b/package.bak/openntpd/S49ntp deleted file mode 100755 index c211ac835e..0000000000 --- a/package.bak/openntpd/S49ntp +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -[ -x /usr/sbin/ntpd ] || exit 0 -[ -f /etc/ntpd.conf ] || exit 0 - -case "$1" in - start) - printf "Starting openntpd: " - start-stop-daemon -S -x /usr/sbin/ntpd -- -s -p /run/ntpd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping openntpd: " - start-stop-daemon -K -q -p /run/ntpd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/openntpd/ntpd.service b/package.bak/openntpd/ntpd.service deleted file mode 100644 index a4ffa7318c..0000000000 --- a/package.bak/openntpd/ntpd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenNTP Daemon -After=network.target -Conflicts=systemd-timesyncd.service - -[Service] -Type=simple -ExecStart=/usr/sbin/ntpd -s -d - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/openntpd/openntpd.hash b/package.bak/openntpd/openntpd.hash deleted file mode 100644 index 7f5d3e3f63..0000000000 --- a/package.bak/openntpd/openntpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.openntpd.org/txt/release-6.0p1.txt -sha256 b1ab80094788912adb12b33cb1f251cc58db39294c1b5c6376972f5f7ba577e8 openntpd-6.0p1.tar.gz diff --git a/package.bak/openntpd/openntpd.mk b/package.bak/openntpd/openntpd.mk deleted file mode 100644 index 9c98064c7a..0000000000 --- a/package.bak/openntpd/openntpd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# openntpd -# -################################################################################ - -OPENNTPD_VERSION = 6.0p1 -OPENNTPD_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD -OPENNTPD_LICENSE = MIT-like, BSD-2c, BSD-3c -OPENNTPD_LICENSE_FILES = COPYING -# Ships a beta libtool version hence our patch doesn't apply. -OPENNTPD_AUTORECONF = YES - -# openntpd uses pthread functions for arc4random emulation but forgets -# to use -pthread -OPENNTPD_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -pthread" - -define OPENNTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/openntpd/ntpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ntpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/ntpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ntpd.service -endef - -define OPENNTPD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/openntpd/S49ntp \ - $(TARGET_DIR)/etc/init.d/S49ntp -endef - -define OPENNTPD_USERS - _ntp -1 _ntp -1 * - - - Network Time Protocol daemon -endef - -$(eval $(autotools-package)) diff --git a/package.bak/openobex/0001-libusb_check_when_cross-compiling.patch b/package.bak/openobex/0001-libusb_check_when_cross-compiling.patch deleted file mode 100644 index 7b8056afcc..0000000000 --- a/package.bak/openobex/0001-libusb_check_when_cross-compiling.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fix libusb check when cross-compiling. - -Signed-off-by: Julien Boibessot -Signed-off-by: Samuel Martin - -Index: openobex-1.5/acinclude.m4 -=================================================================== ---- openobex-1.5.orig/acinclude.m4 2010-06-16 10:32:47.000000000 +0200 -+++ openobex-1.5/acinclude.m4 2010-06-16 10:35:33.000000000 +0200 -@@ -158,7 +158,7 @@ - ;; - *) - PKG_CHECK_MODULES(USB, libusb, usb_lib_found=yes, AC_MSG_RESULT(no)) -- AC_CHECK_FILE(${prefix}/lib/pkgconfig/libusb.pc, REQUIRES="libusb") -+ REQUIRES="libusb" - ;; - esac - AC_SUBST(USB_CFLAGS) diff --git a/package.bak/openobex/0002-replace_deprecated_functions.patch b/package.bak/openobex/0002-replace_deprecated_functions.patch deleted file mode 100644 index 17274d385b..0000000000 --- a/package.bak/openobex/0002-replace_deprecated_functions.patch +++ /dev/null @@ -1,30 +0,0 @@ -obex_test_cable.c: avoid to use SuSv3 LEGACY APIs - -Signed-off-by: Julien Boibessot -Signed-off-by: Samuel Martin - -Index: openobex-1.5/apps/obex_test_cable.c -=================================================================== ---- openobex-1.5.orig/apps/obex_test_cable.c 2009-02-08 19:30:22.000000000 +0100 -+++ openobex-1.5/apps/obex_test_cable.c 2010-06-16 11:11:05.000000000 +0200 -@@ -113,9 +113,9 @@ - if(total == sizeof(tmpbuf)) - return -1; - -- if( (answer = index(tmpbuf, '\n')) ) { -+ if( (answer = strchr(tmpbuf, '\n')) ) { - // Remove first line (echo) -- if( (answer_end = index(answer+1, '\n')) ) { -+ if( (answer_end = strchr(answer+1, '\n')) ) { - // Found end of answer - done = 1; - } -@@ -178,7 +178,7 @@ - } - - tcgetattr(gt->ttyfd, >->oldtio); -- bzero(>->newtio, sizeof(struct termios)); -+ memset(>->newtio, 0, sizeof(struct termios)); - gt->newtio.c_cflag = B115200 | CS8 | CREAD | CRTSCTS; - gt->newtio.c_iflag = IGNPAR; - gt->newtio.c_oflag = 0; diff --git a/package.bak/openobex/Config.in b/package.bak/openobex/Config.in deleted file mode 100644 index ed1b81fe42..0000000000 --- a/package.bak/openobex/Config.in +++ /dev/null @@ -1,43 +0,0 @@ -config BR2_PACKAGE_OPENOBEX - bool "openobex" - help - Free open source implementation of the Object Exchange (OBEX) - protocol. - - http://sourceforge.net/projects/openobex - -if BR2_PACKAGE_OPENOBEX - -config BR2_PACKAGE_OPENOBEX_BLUEZ - bool "enable bluez support" - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_BLUEZ_UTILS - -comment "bluez support needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_OPENOBEX_LIBUSB - bool "enable libusb support" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - -comment "libusb support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OPENOBEX_APPS - bool "install test applications" - help - Also install the openobex test applications on target. - -config BR2_PACKAGE_OPENOBEX_SYSLOG - bool "enable debugging to the system logger" - -config BR2_PACKAGE_OPENOBEX_DUMP - bool "enable protocol dumping for debugging" - -endif diff --git a/package.bak/openobex/openobex.hash b/package.bak/openobex/openobex.hash deleted file mode 100644 index 2aef98194b..0000000000 --- a/package.bak/openobex/openobex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/openobex/files/openobex/1.5/ -sha1 5332ef95bc8b321bda675cdb74379804c6c1a83f openobex-1.5.0-Source.zip -md5 f6d87af55a1d702d582173c81619176e openobex-1.5.0-Source.zip diff --git a/package.bak/openobex/openobex.mk b/package.bak/openobex/openobex.mk deleted file mode 100644 index 6a1a10ba4f..0000000000 --- a/package.bak/openobex/openobex.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# openobex -# -################################################################################ - -OPENOBEX_VERSION_MAJOR = 1.5 -OPENOBEX_VERSION = $(OPENOBEX_VERSION_MAJOR).0 -OPENOBEX_SITE = http://downloads.sourceforge.net/project/openobex/openobex/$(OPENOBEX_VERSION_MAJOR) -OPENOBEX_SOURCE = openobex-$(OPENOBEX_VERSION)-Source.zip -# Libraries seems to be released under LGPLv2.1+, -# while other material is under GPLv2+. -OPENOBEX_LICENSE = GPLv2+/LGPLv2.1+ -OPENOBEX_LICENSE_FILES = COPYING COPYING.LIB - -OPENOBEX_DEPENDENCIES = host-pkgconf -OPENOBEX_AUTORECONF = YES -OPENOBEX_INSTALL_STAGING = YES - -define OPENOBEX_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(OPENOBEX_SOURCE) - mv $(@D)/openobex-$(OPENOBEX_VERSION)-Source/* $(@D) - $(RM) -r $(@D)/openobex-$(OPENOBEX_VERSION)-Source -endef - -OPENOBEX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_OPENOBEX_APPS),--enable-apps) \ - $(if $(BR2_PACKAGE_OPENOBEX_SYSLOG),--enable-syslog) \ - $(if $(BR2_PACKAGE_OPENOBEX_DUMP),--enable-dump) - -ifeq ($(BR2_PACKAGE_OPENOBEX_BLUEZ),y) -OPENOBEX_DEPENDENCIES += bluez_utils -OPENOBEX_CONF_OPTS += --with-bluez=$(STAGING_DIR) -else -OPENOBEX_CONF_OPTS += --disable-bluetooth -endif - -ifeq ($(BR2_PACKAGE_OPENOBEX_LIBUSB),y) -OPENOBEX_DEPENDENCIES += libusb-compat -OPENOBEX_CONF_OPTS += --with-usb=$(STAGING_DIR) -else -OPENOBEX_CONF_OPTS += --disable-usb -endif - -$(eval $(autotools-package)) diff --git a/package.bak/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch b/package.bak/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch deleted file mode 100644 index fd3cfa469a..0000000000 --- a/package.bak/openocd/0002-Fix-jimtcl-auto-configuration-to-force-static-librar.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 3bef159779c8fd39a070ec5c8191e18ba2efa79d Mon Sep 17 00:00:00 2001 -From: Claudio Laurita -Date: Sun, 30 Nov 2014 18:21:58 +0100 -Subject: [PATCH 2/2] Fix jimtcl auto configuration to force static library - only. jimtcl ignores a --disable-shared option if a previous --enable-shared - option was given. This breaks openocd compilation if shared was the preferred - option in buildroot project. - -Signed-off-by: Claudio Laurita - ---- a/jimtcl/auto.def -+++ b/jimtcl/auto.def -@@ -194,12 +194,8 @@ - msg-result "Enabling references" - define JIM_REFERENCES - } --if {[opt-bool shared with-jim-shared]} { -- msg-result "Building shared library" --} else { -- msg-result "Building static library" -- define JIM_STATICLIB --} -+msg-result "Building static library" -+define JIM_STATICLIB - define LIBSOEXT [format [get-define SH_SOEXTVER] [format %.2f [expr {[get-define JIM_VERSION] / 100.0}]]] - define JIM_INSTALL [opt-bool install-jim] - define JIM_DOCS [opt-bool docs] diff --git a/package.bak/openocd/Config.in b/package.bak/openocd/Config.in deleted file mode 100644 index 231367154e..0000000000 --- a/package.bak/openocd/Config.in +++ /dev/null @@ -1,214 +0,0 @@ -config BR2_PACKAGE_OPENOCD - bool "openocd" - help - OpenOCD - Open On-Chip Debugger - - http://openocd.sourceforge.net/ - -if BR2_PACKAGE_OPENOCD - -comment "Adapters" - -config BR2_PACKAGE_OPENOCD_FTDI - bool "MPSSE mode of FTDI based devices" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the MPSSE mode of FTDI - (FT2xxx/FT4xxx) based devices (default is auto) - -config BR2_PACKAGE_OPENOCD_STLINK - bool "ST-Link JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the ST-Link JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_TI_ICDI - bool "TI ICDI JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the TI ICDI JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_ULINK - bool "Keil ULINK JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the Keil ULINK JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_UBLASTER2 - bool "Altera USB-Blaster II Compatible" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the Altera USB-Blaster - II Compatible (default is auto) - -config BR2_PACKAGE_OPENOCD_JLINK - bool "Segger J-Link JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Segger J-Link JTAG Programmer and clone such as Atmel - SAM-ICE - -config BR2_PACKAGE_OPENOCD_OSDBM - bool "OSDBM JTAG (only) Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the OSBDM (JTAG only) - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_OPENDOUS - bool "eStick/opendous JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the eStick/opendous JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_AICE - bool "Andes JTAG Programmer" - select BR2_PACKAGE_LIBUSB - depends on BR2_USE_MMU # use fork() - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - help - Enable building support for the Andes JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_VSLLINK - bool "Versaloon-Link JTAG Programmer" - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb - help - Enable building support for the Versaloon-Link JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_USBPROG - bool "USBProg JTAG Programmer" - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb - help - Enable building support for the USBProg JTAG - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_RLINK - bool "Raisonance RLink JTAG Programmer" - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb - help - Enable building support for the Raisonance RLink - JTAG Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_ARMEW - bool "Olimex ARM-JTAG-EW Programmer" - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb-compat -> libusb - help - Enable building support for the Olimex ARM-JTAG-EW - Programmer (default is auto) - -config BR2_PACKAGE_OPENOCD_PARPORT - bool "pc parallel port driver" - help - Enable building the pc parallel port driver - -config BR2_PACKAGE_OPENOCD_FT2XXX - bool "FT2232 based devices (DEPRECATED)" - select BR2_PACKAGE_LIBFTDI1 - depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb - help - (DEPRECATED) Enable building support for FT2232 - based devices using the libftdi library - -config BR2_PACKAGE_OPENOCD_VPI - bool "JTAG VPI" - help - Enable building support for JTAG VPI - -config BR2_PACKAGE_OPENOCD_UBLASTER - bool "Altera USB-Blaster" - select BR2_PACKAGE_LIBFTDI1 - depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb - help - Enable building support for the Altera USB-Blaster - using the libftdi driver, opensource alternate of - FTD2XX - -config BR2_PACKAGE_OPENOCD_AMTJT - bool "Amontec JTAG-Accelerator" - help - Enable building the Amontec JTAG-Accelerator driver - -if BR2_arm - -config BR2_PACKAGE_OPENOCD_EP93XX - bool "EP93xx based SBCs" - help - Enable building support for EP93xx based SBCs - -config BR2_PACKAGE_OPENOCD_AT91RM - bool "AT91RM9200 based SBCs" - help - Enable building support for AT91RM9200 based SBCs - -config BR2_PACKAGE_OPENOCD_BCM2835 - bool "bitbanging on BCM2835" - help - Enable building support for bitbanging on BCM2835 - (as found in Raspberry Pi) - -endif # BR2_arm - -config BR2_PACKAGE_OPENOCD_GW16012 - bool "Gateworks GW16012 JTAG Programmer" - help - Enable building support for the Gateworks GW16012 - JTAG Programmer - -config BR2_PACKAGE_OPENOCD_PRESTO - bool "ASIX Presto Programmer" - select BR2_PACKAGE_LIBFTDI1 - depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb - help - Enable building support for ASIX Presto Programmer - using the libftdi driver - -config BR2_PACKAGE_OPENOCD_OPENJTAG - bool "OpenJTAG Programmer" - select BR2_PACKAGE_LIBFTDI1 - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT # needs usb.h - depends on BR2_TOOLCHAIN_HAS_THREADS # libftdi -> libusb - help - Enable building support for the OpenJTAG Programmer - with ftdi driver - -config BR2_PACKAGE_OPENOCD_BUSPIRATE - bool "Buspirate" - help - Enable building support for the Buspirate - -config BR2_PACKAGE_OPENOCD_SYSFS - bool "programming via sysfs gpios" - help - Enable building support for programming driven via - sysfs gpios. - -# Many adapters need libusb or libusb-compat, which require threads, -# but we don't want to duplicate this comment for all adapters that -# select libusb or libusb-compat. -comment "many openocd adapters needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -endif # BR2_PACKAGE_OPENOCD diff --git a/package.bak/openocd/Config.in.host b/package.bak/openocd/Config.in.host deleted file mode 100644 index e1d0e63308..0000000000 --- a/package.bak/openocd/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_OPENOCD - bool "host openocd" - help - OpenOCD - Open On-Chip Debugger - - http://openocd.org/ diff --git a/package.bak/openocd/openocd.hash b/package.bak/openocd/openocd.hash deleted file mode 100644 index 4ca11e206e..0000000000 --- a/package.bak/openocd/openocd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/openocd/files/openocd/0.9.0/ -sha1 bcf99bb21f09513065b2c9ece148ace7d16cdd0c openocd-0.9.0.tar.bz2 -md5 665cc98ae9e7297e09ec6ac7235fee49 openocd-0.9.0.tar.bz2 diff --git a/package.bak/openocd/openocd.mk b/package.bak/openocd/openocd.mk deleted file mode 100644 index 0d1836573d..0000000000 --- a/package.bak/openocd/openocd.mk +++ /dev/null @@ -1,118 +0,0 @@ -################################################################################ -# -# openocd -# -################################################################################ - -OPENOCD_VERSION = 0.9.0 -OPENOCD_SOURCE = openocd-$(OPENOCD_VERSION).tar.bz2 -OPENOCD_SITE = http://sourceforge.net/projects/openocd/files/openocd/$(OPENOCD_VERSION) - -OPENOCD_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" - -OPENOCD_CONF_OPTS = \ - --oldincludedir=$(STAGING_DIR)/usr/include \ - --includedir=$(STAGING_DIR)/usr/include \ - --disable-doxygen-html \ - --with-jim-shared=no \ - --disable-shared \ - --enable-dummy \ - --disable-werror - -# Rely on the Config.in options of each individual adapter selecting -# the dependencies they need. - -OPENOCD_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_LIBFTDI1),libftdi1) \ - $(if $(BR2_PACKAGE_LIBUSB),libusb) \ - $(if $(BR2_PACKAGE_LIBUSB_COMPAT),libusb-compat) \ - $(if $(BR2_PACKAGE_LIBHID),libhid) - -# Adapters -OPENOCD_CONF_OPTS += \ - $(if $(BR2_PACKAGE_OPENOCD_FTDI),--enable-ftdi,--disable-ftdi) \ - $(if $(BR2_PACKAGE_OPENOCD_STLINK),--enable-stlink,--disable-stlink) \ - $(if $(BR2_PACKAGE_OPENOCD_TI_ICDI),--enable-ti-icdi,--disable-ti-icdi) \ - $(if $(BR2_PACKAGE_OPENOCD_ULINK),--enable-ulink,--disable-ulink) \ - $(if $(BR2_PACKAGE_OPENOCD_UBLASTER2),--enable-usb-blaster-2,--disable-usb-blaster-2) \ - $(if $(BR2_PACKAGE_OPENOCD_JLINK),--enable-jlink,--disable-jlink) \ - $(if $(BR2_PACKAGE_OPENOCD_OSDBM),--enable-osbdm,--disable-osbdm) \ - $(if $(BR2_PACKAGE_OPENOCD_OPENDOUS),--enable-opendous,--disable-opendous) \ - $(if $(BR2_PACKAGE_OPENOCD_AICE),--enable-aice,--disable-aice) \ - $(if $(BR2_PACKAGE_OPENOCD_VSLLINK),--enable-vsllink,--disable-vsllink) \ - $(if $(BR2_PACKAGE_OPENOCD_USBPROG),--enable-usbprog,--disable-usbprog) \ - $(if $(BR2_PACKAGE_OPENOCD_RLINK),--enable-rlink,--disable-rlink) \ - $(if $(BR2_PACKAGE_OPENOCD_ARMEW),--enable-armjtagew,--disable-armjtagew) \ - $(if $(BR2_PACKAGE_OPENOCD_CMSIS_DAP),--enable-cmsis-dap,--disable-cmsis-dap) \ - $(if $(BR2_PACKAGE_OPENOCD_PARPORT),--enable-parport,--disable-parport) \ - $(if $(BR2_PACKAGE_OPENOCD_FT2XXX),--enable-legacy-ft2232_libftdi,--disable-legacy-ft2232_libftdi) \ - $(if $(BR2_PACKAGE_OPENOCD_VPI),--enable-jtag_vpi,--disable-jtag_vpi) \ - $(if $(BR2_PACKAGE_OPENOCD_UBLASTER),--enable-usb_blaster_libftdi,--disable-usb_blaster_libftdi) \ - $(if $(BR2_PACKAGE_OPENOCD_AMTJT),--enable-amtjtagaccel,--disable-amjtagaccel) \ - $(if $(BR2_PACKAGE_OPENOCD_ZY1000_MASTER),--enable-zy1000-master,--disable-zy1000-master) \ - $(if $(BR2_PACKAGE_OPENOCD_ZY1000),--enable-zy1000,--disable-zy1000) \ - $(if $(BR2_PACKAGE_OPENOCD_EP93XX),--enable-ep93xx,--disable-ep93xx) \ - $(if $(BR2_PACKAGE_OPENOCD_AT91RM),--enable-at91rm9200,--disable-at91rm9200) \ - $(if $(BR2_PACKAGE_OPENOCD_BCM2835),--enable-bcm2835gpio,--disable-bcm2835gpio) \ - $(if $(BR2_PACKAGE_OPENOCD_GW16012),--enable-gw16012,--disable-gw16012) \ - $(if $(BR2_PACKAGE_OPENOCD_PRESTO),--enable-presto_libftdi,--disable-presto_libftdi) \ - $(if $(BR2_PACKAGE_OPENOCD_OPENJTAG),--enable-openjtag_ftdi,--disable-openjtag_ftdi) \ - $(if $(BR2_PACKAGE_OPENOCD_BUSPIRATE),--enable-buspirate,--disable-buspirate) \ - $(if $(BR2_PACKAGE_OPENOCD_SYSFS),--enable-sysfsgpio,--disable-sysfsgpio) - -# Enable all configuration options for host build. -# -# Note that deprecated options have been removed. CMSIS_DAP needs -# hidapi (currently not included in buildroot) and zy1000 stuff fails -# to build, so they've been removed too. -# -HOST_OPENOCD_CONF_OPTS = \ - --enable-ftdi \ - --enable-stlink \ - --enable-ti-icdi \ - --enable-ulink \ - --enable-usb-blaster-2 \ - --enable-jlink \ - --enable-osbdm \ - --enable-opendous \ - --enable-aice \ - --enable-vsllink \ - --enable-usbprog \ - --enable-rlink \ - --enable-armjtagew \ - --enable-parport \ - --enable-jtag_vpi \ - --enable-usb_blaster_libftdi \ - --enable-amtjtagaccel \ - --enable-gw16012 \ - --enable-presto_libftdi \ - --enable-openjtag_ftdi \ - --enable-buspirate \ - --enable-sysfsgpio \ - --oldincludedir=$(HOST_DIR)/usr/include \ - --includedir=$(HOST_DIR)/usr/include \ - --disable-doxygen-html \ - --with-jim-shared=no \ - --disable-shared \ - --enable-dummy \ - --disable-werror - -HOST_OPENOCD_DEPENDENCIES = host-libftdi host-libusb host-libusb-compat - -# Avoid documentation rebuild. On PowerPC64(le), we patch the -# configure script. Due to this, the version.texi files gets -# regenerated, and then since it has a newer date than openocd.info, -# openocd build system rebuilds the documentation. Unfortunately, this -# documentation rebuild fails on old machines. We work around this by -# faking the date of the generated version.texi file, to make the -# build system believe the documentation doesn't need to be -# regenerated. -define OPENOCD_FIX_VERSION_TEXI - touch -r $(@D)/doc/openocd.info $(@D)/doc/version.texi -endef -OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI -HOST_OPENOCD_POST_BUILD_HOOKS += OPENOCD_FIX_VERSION_TEXI - - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/openpgm/0001-version_generator.py-make-it-python3-compliant.patch b/package.bak/openpgm/0001-version_generator.py-make-it-python3-compliant.patch deleted file mode 100644 index 97cff29df0..0000000000 --- a/package.bak/openpgm/0001-version_generator.py-make-it-python3-compliant.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e04f5c20fc1536f8e6d4faf32f2f4657d441f7c8 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Mon, 14 Apr 2014 17:54:37 +0200 -Subject: [PATCH] version_generator.py: make it python3 compliant - -Signed-off-by: Samuel Martin ---- - openpgm/pgm/version_generator.py | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/openpgm/pgm/version_generator.py b/openpgm/pgm/version_generator.py -index 2265480..c31376f 100755 ---- a/openpgm/pgm/version_generator.py -+++ b/openpgm/pgm/version_generator.py -@@ -1,5 +1,7 @@ - #!/usr/bin/python - -+from __future__ import print_function -+ - import os - import platform - import time -@@ -8,7 +10,7 @@ build_date = time.strftime ("%Y-%m-%d") - build_time = time.strftime ("%H:%M:%S") - build_rev = filter (str.isdigit, "$Revision: 1369 $") - --print """ -+print(""" - /* vim:ts=8:sts=8:sw=4:noai:noexpandtab - * - * OpenPGM version. -@@ -47,6 +49,6 @@ const char* pgm_build_revision = "%s"; - - - /* eof */ --"""%(build_date, build_time, platform.system(), platform.machine(), build_rev) -+"""%(build_date, build_time, platform.system(), platform.machine(), build_rev)) - - # end of file --- -1.9.2 - diff --git a/package.bak/openpgm/0002-cross-compile.patch b/package.bak/openpgm/0002-cross-compile.patch deleted file mode 100644 index 07a24492e5..0000000000 --- a/package.bak/openpgm/0002-cross-compile.patch +++ /dev/null @@ -1,38 +0,0 @@ -configure.ac: cross-compilation fix - -This patch enables to configure the package when cross-compiling in a way -recommended by Autoconf manual (see manual for version 2.69, Section 6.6 -Checking Runtime Behavior). - -Signed-off-by: Alexander Lukichev - ---- a/openpgm/pgm/configure.ac 2011-09-27 20:59:08.000000000 +0300 -+++ b/openpgm/pgm/configure.ac 2013-02-12 10:33:53.000000000 +0200 -@@ -272,14 +272,19 @@ uint32_t add32_with_carry (uint32_t a, u - ;; - esac - # ticket spinlock friendly: unaligned pointers & atomic ops (excl. Sun Pro) --AC_MSG_CHECKING([for unaligned pointers]) --AC_RUN_IFELSE( -- [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -- [[short x = *(short*)(nezumi + 2)]])], -- [AC_MSG_RESULT([yes]) -- pgm_unaligned_pointers=yes], -- [AC_MSG_RESULT([no]) -- pgm_unaligned_pointers=no]) -+AC_CACHE_CHECK([if unaligned access fails], [ac_cv_lbl_unaligned_fail], -+ [AC_RUN_IFELSE( -+ [AC_LANG_PROGRAM([[char* nezumi = "mouse";]], -+ [[short x = *(short*)(nezumi + 2)]])], -+ [ac_cv_lbl_unaligned_fail=no], -+ [ac_cv_lbl_unaligned_fail=yes], -+ [ac_cv_lbl_unaligned_fail=yes]) -+ ]) -+if test "$ac_cv_lbl_unaligned_fail" = yes; then -+ pgm_unaligned_pointers=no -+else -+ pgm_unaligned_pointers=yes -+fi - AC_MSG_CHECKING([for intrinsic atomic ops]) - # AC_PREPROC_IFELSE not always portable - AC_COMPILE_IFELSE( diff --git a/package.bak/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch b/package.bak/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch deleted file mode 100644 index 4d700fb4d6..0000000000 --- a/package.bak/openpgm/0003-Rework-headers-includes-to-fix-build-with-musl-libc.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 01128a2d8ad3288e8b96a908888049f186d156ee Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 21 May 2016 19:44:48 +0200 -Subject: [PATCH 1/1] Rework headers includes to fix build with musl libc - -Downloaded patch from -http://git.alpinelinux.org/cgit/aports/plain/main/openpgm/openpgm-fix-includes.patch -and adjusted paths by prefixing with "openpgm/pgm/" - -A build log with the compile error can be found here: -http://autobuild.buildroot.net/results/854/854554827ead82f29b293ddceced6eb7fbfeec27/build-end.log - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: https://github.com/steve-o/openpgm/pull/44) ---- - openpgm/pgm/include/impl/security.h | 3 ++- - openpgm/pgm/include/pgm/types.h | 1 + - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/openpgm/pgm/include/impl/security.h b/openpgm/pgm/include/impl/security.h -index c2b3e3d..896316f 100644 ---- a/openpgm/pgm/include/impl/security.h -+++ b/openpgm/pgm/include/impl/security.h -@@ -33,7 +33,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -41,6 +40,8 @@ - PGM_BEGIN_DECLS - - #ifdef HAVE_FTIME -+#include -+ - static inline - errno_t - # if !defined( _WIN32 ) -diff --git a/openpgm/pgm/include/pgm/types.h b/openpgm/pgm/include/pgm/types.h -index 4e41261..58731a3 100644 ---- a/openpgm/pgm/include/pgm/types.h -+++ b/openpgm/pgm/include/pgm/types.h -@@ -27,6 +27,7 @@ - - #ifndef _MSC_VER - # include -+# include - #endif - #include - --- -2.8.1 - diff --git a/package.bak/openpgm/Config.in b/package.bak/openpgm/Config.in deleted file mode 100644 index e37edfe964..0000000000 --- a/package.bak/openpgm/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_OPENPGM - bool "openpgm" - depends on BR2_TOOLCHAIN_HAS_SYNC_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - help - OpenPGM is an open source implementation of the Pragmatic - General Multicast (PGM) specification in RFC 3208 available at - www.ietf.org. PGM is a reliable and scalable multicast - protocol that enables receivers to detect loss, request - retransmission of lost data, or notify an application of - unrecoverable loss. - - https://github.com/steve-o/openpgm/ - -comment "openpgm needs a toolchain w/ wchar, threads" - depends on BR2_TOOLCHAIN_HAS_SYNC_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) diff --git a/package.bak/openpgm/openpgm.hash b/package.bak/openpgm/openpgm.hash deleted file mode 100644 index f20e02a7fb..0000000000 --- a/package.bak/openpgm/openpgm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ecd48fd0bcfd8351ce6dcf31b063dd8fe83d3dab41bca62a6ebd6880a88c4a69 openpgm-release-5-2-122.tar.gz diff --git a/package.bak/openpgm/openpgm.mk b/package.bak/openpgm/openpgm.mk deleted file mode 100644 index 42b0a5d809..0000000000 --- a/package.bak/openpgm/openpgm.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# openpgm -# -################################################################################ - -OPENPGM_VERSION = release-5-2-122 -OPENPGM_SITE = $(call github,steve-o,openpgm,$(OPENPGM_VERSION)) -OPENPGM_LICENSE = LGPLv2.1+ -OPENPGM_LICENSE_FILES = openpgm/pgm/LICENSE -OPENPGM_INSTALL_STAGING = YES -OPENPGM_SUBDIR = openpgm/pgm -OPENPGM_AUTORECONF = YES - -# We need to create the m4 directory to make sure that autoreconf will -# start calling libtoolize. Otherwise it will start with aclocal and it -# will fail because the m4 directory doesn't exist. -define OPENPGM_CREATE_M4_DIR - mkdir -p $(@D)/$(OPENPGM_SUBDIR)/m4 -endef -OPENPGM_POST_PATCH_HOOKS += OPENPGM_CREATE_M4_DIR - -OPENPGM_CONF_ENV = \ - ac_cv_file__proc_cpuinfo=yes \ - ac_cv_file__dev_rtc=no \ - ac_cv_file__dev_hpet=no - -$(eval $(autotools-package)) diff --git a/package.bak/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch b/package.bak/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch deleted file mode 100644 index 1f5eb89de5..0000000000 --- a/package.bak/openpowerlink/0001-install-the-stack-libraries-to-lib-subdirectory.patch +++ /dev/null @@ -1,167 +0,0 @@ -From 4e8aa3a9e1696e5e02ff0a3ae5a72f034ee60c2f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 May 2016 15:57:10 +0200 -Subject: [PATCH] install the stack libraries to "lib" subdirectory - -Using '.' to install the stack libraries is not correct since -it will install them to /usr/. - -ls /usr/liboplkmnapp-kernelintf.so - -Fix this by using 'lib' instead of '.' - -The problem with the openpowerlink build system is that it expect -the stack directory to be a "local staging" directory which -contains headers and libraries. So the libraries build by the -stack project are installed in stack/lib by default. - -This is wrong to do that because it becomes difficult to package -openpowerlink for normal Linux systems. - -Buildroot like others build system expect from a packaged software -to install libraries and headers build/provided in a staging -directory. - -It seems that CMAKE_INSTALL_PREFIX is misused by the default value -"${CMAKE_CURRENT_SOURCE_DIR}/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}" -since it already contains the lib directory and therefore the -entire build system is messed up. - -It seems that the openpowerlink's build system doesn't allow/support -CMAKE_INSTALL_PREFIX to be set externally -(which is the standard approach). - -The issue has been reported [1] upstream and a build system -refactoring is needed to fix this properly. - -[1] http://sourceforge.net/p/openpowerlink/discussion/newbie/thread/3f13af65/#8f80/a50a/4649/f07c - -[rebase on v2.5.0] -Signed-off-by: Romain Naour ---- - stack/proj/linux/liboplkcn-sim/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkcn/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmn-sim/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmn/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt | 2 +- - stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt -index 73b641d..b8b5c9d 100644 ---- a/stack/proj/linux/liboplkcn-sim/CMakeLists.txt -+++ b/stack/proj/linux/liboplkcn-sim/CMakeLists.txt -@@ -96,4 +96,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkcn/CMakeLists.txt b/stack/proj/linux/liboplkcn/CMakeLists.txt -index 323eafc..459124a 100644 ---- a/stack/proj/linux/liboplkcn/CMakeLists.txt -+++ b/stack/proj/linux/liboplkcn/CMakeLists.txt -@@ -90,4 +90,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt -index f8b1850..c16194a 100644 ---- a/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt -+++ b/stack/proj/linux/liboplkcnapp-kernelintf/CMakeLists.txt -@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt -index 0f07e63..0074616 100644 ---- a/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt -+++ b/stack/proj/linux/liboplkcnapp-userintf/CMakeLists.txt -@@ -83,4 +83,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt -index d0dad78..ee0fdec 100644 ---- a/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt -+++ b/stack/proj/linux/liboplkcndrv-pcap/CMakeLists.txt -@@ -76,4 +76,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt -index eb6396a..5beaa07 100644 ---- a/stack/proj/linux/liboplkmn-sim/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmn-sim/CMakeLists.txt -@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmn/CMakeLists.txt b/stack/proj/linux/liboplkmn/CMakeLists.txt -index cf7927f..6b19557 100644 ---- a/stack/proj/linux/liboplkmn/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmn/CMakeLists.txt -@@ -89,4 +89,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt -index 9daa2df..bfccb25 100644 ---- a/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmnapp-kernelintf/CMakeLists.txt -@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt -index 0135f46..83128eb 100644 ---- a/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmnapp-kernelpcp/CMakeLists.txt -@@ -91,4 +91,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt -index cd97882..aaaa526 100644 ---- a/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmnapp-userintf/CMakeLists.txt -@@ -82,4 +82,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) -diff --git a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt -index 7e1a820..82205c2 100644 ---- a/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt -+++ b/stack/proj/linux/liboplkmndrv-pcap/CMakeLists.txt -@@ -79,4 +79,4 @@ ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${LIB_SOURCES}) - TARGET_LINK_LIBRARIES(${LIB_NAME} ${ARCH_LIBRARIES}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY COMPILE_DEFINITIONS_DEBUG DEBUG;DEF_DEBUG_LVL=${CFG_DEBUG_LVL}) - SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY DEBUG_POSTFIX "_d") --INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION . LIBRARY DESTINATION .) -+INSTALL(TARGETS ${LIB_NAME} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib) --- -2.8.1 - diff --git a/package.bak/openpowerlink/0002-cmake-install-oplk-headers-files.patch b/package.bak/openpowerlink/0002-cmake-install-oplk-headers-files.patch deleted file mode 100644 index 7d338a4593..0000000000 --- a/package.bak/openpowerlink/0002-cmake-install-oplk-headers-files.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 8cb39257e12d6b82190aec8ab9ad89a9ee13af71 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 May 2016 15:57:29 +0200 -Subject: [PATCH] cmake: install oplk headers files - -In order to be able to link a third party application -with openpowerlink libraries, we need to install the -oplk headers files related to openpowerlink stack. - -Install all headers file from STACK_INCLUDE_DIR/oplk. - -Signed-off-by: Romain Naour ---- - stack/CMakeLists.txt | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/stack/CMakeLists.txt b/stack/CMakeLists.txt -index 3b11c54..4eadf44 100644 ---- a/stack/CMakeLists.txt -+++ b/stack/CMakeLists.txt -@@ -105,3 +105,8 @@ ELSEIF((CMAKE_SYSTEM_NAME STREQUAL "Generic") AND (CMAKE_SYSTEM_PROCESSOR STREQU - ELSE() - MESSAGE(FATAL_ERROR "Unknown Platform and processor combination ${CMAKE_SYSTEM_NAME} and ${CMAKE_SYSTEM_PROCESSOR}!!") - ENDIF() -+ -+################################################################################ -+# Install oplk headers files -+################################################################################ -+INSTALL(DIRECTORY ${STACK_INCLUDE_DIR}/oplk DESTINATION "include") --- -2.8.1 - diff --git a/package.bak/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch b/package.bak/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch deleted file mode 100644 index 9cbf02d28b..0000000000 --- a/package.bak/openpowerlink/0003-Add-top-level-CMakeLists.txt.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 7f81c74726aec4aef6bd93ee644200ab34375437 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Wed, 25 May 2016 15:59:20 +0200 -Subject: [PATCH] Add top level CMakeLists.txt - -This CMakeLists.txt can be used to build openpowerlink -using a automated build system. - -Don't use FIND_LIBRARY when the stack is built from a top -level build (ie CFG_OPLK_LIB is ON). -For a top level build, CMake will automatically add a build -dependency on oplk libraries for building demos applications. - -Also replace OPLKLIB_DEBUG by OPLKLIB in OPLK_LINK_LIBRARIES macro -if CMAKE_BUILD_TYPE is "Debug", otherwise TARGET_LINK_LIBRARIES can't -find the openpowerlink library. -This issue may be related to: -https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/issues/109 - -Fixes: -http://autobuild.buildroot.net/results/da4/da445b65cb136d71577f04e3a17fdb2ef6302a9b - -This patch has not been accepted by upstream: -https://github.com/openPOWERLINK/openPOWERLINK_V2/pull/57 - -Add PCIe support (v2.3.2) - -Signed-off-by: Romain Naour ---- - CMakeLists.txt | 42 +++++++++++++++++ - apps/common/cmake/findoplklib.cmake | 68 +++++++++++++++------------- - apps/common/cmake/linkoplklib.cmake | 2 +- - drivers/linux/drv_daemon_pcap/CMakeLists.txt | 12 +++-- - 4 files changed, 89 insertions(+), 35 deletions(-) - create mode 100644 CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..28d4e7a ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,42 @@ -+ -+CMAKE_MINIMUM_REQUIRED (VERSION 2.8.7) -+ -+#### LIB #### -+ -+IF (CFG_OPLK_LIB) -+ ADD_SUBDIRECTORY("stack") -+ENDIF (CFG_OPLK_LIB) -+ -+#### Linux kernel Ethernet module #### -+ -+IF (CFG_KERNEL_DRIVERS) -+ ADD_SUBDIRECTORY("drivers/linux/drv_kernelmod_edrv") -+ENDIF (CFG_KERNEL_DRIVERS) -+ -+#### Linux kernel PCIe module #### -+ -+IF (CFG_KERNEL_PCIE_DRIVERS) -+ ADD_SUBDIRECTORY("drivers/linux/drv_kernelmod_pcie") -+ENDIF (CFG_KERNEL_PCIE_DRIVERS) -+ -+#### Pcap userspace driver #### -+ -+IF (CFG_PCAP_DAEMON) -+ ADD_SUBDIRECTORY("drivers/linux/drv_daemon_pcap") -+ENDIF (CFG_PCAP_DAEMON) -+ -+#### OpenPowerLink Demos #### -+ -+# Add subdirectory of CN console demo application -+IF (CFG_DEMO_CN_CONSOLE) -+ ADD_SUBDIRECTORY("apps/demo_cn_console") -+ENDIF (CFG_DEMO_CN_CONSOLE) -+ -+# Add subdirectory of MN console demo application -+IF (CFG_DEMO_MN_CONSOLE) -+ ADD_SUBDIRECTORY("apps/demo_mn_console") -+ENDIF (CFG_DEMO_MN_CONSOLE) -+ -+IF (CFG_DEMO_MN_QT) -+ ADD_SUBDIRECTORY("apps/demo_mn_qt") -+ENDIF (CFG_DEMO_MN_QT) -diff --git a/apps/common/cmake/findoplklib.cmake b/apps/common/cmake/findoplklib.cmake -index f7e710f..b8b04c5 100644 ---- a/apps/common/cmake/findoplklib.cmake -+++ b/apps/common/cmake/findoplklib.cmake -@@ -85,36 +85,42 @@ MACRO(FIND_OPLK_LIBRARY OPLK_NODE_TYPE) - # Set oplk library directory - SET(OPLKLIB_DIR ${OPLK_BASE_DIR}/stack/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}) - -- IF((CMAKE_GENERATOR MATCHES "Visual Studio") OR (CMAKE_BUILD_TYPE STREQUAL "Release")) -- # Search for release library -- UNSET(OPLKLIB CACHE) -- MESSAGE(STATUS "Searching for LIBRARY ${OPLKLIB_NAME} in ${OPLKLIB_DIR}") -- FIND_LIBRARY(OPLKLIB NAME ${OPLKLIB_NAME} -- HINTS ${OPLKLIB_DIR} ${OPLKLIB_DIR}/${CFG_DEMO_BOARD_NAME}/${CFG_DEMO_NAME}) -- -- IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- -- UNSET(OPLKDLL CACHE) -- FIND_PROGRAM(OPLKDLL NAME ${OPLKLIB_NAME}.dll -- HINTS ${OPLKLIB_DIR}) -- -- ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- ENDIF() -- -- IF((CMAKE_GENERATOR MATCHES "Visual Studio") OR (CMAKE_BUILD_TYPE STREQUAL "Debug")) -- # Search for debug library -- UNSET(OPLKLIB_DEBUG CACHE) -- MESSAGE(STATUS "Searching for LIBRARY ${OPLKLIB_DEBUG_NAME} in ${OPLKLIB_DIR}") -- FIND_LIBRARY(OPLKLIB_DEBUG NAME ${OPLKLIB_DEBUG_NAME} -- HINTS ${OPLKLIB_DIR} ${OPLKLIB_DIR}/${CFG_DEMO_BOARD_NAME}/${CFG_DEMO_NAME}) -- -- IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- -- UNSET(OPLKDLL_DEBUG CACHE) -- FIND_PROGRAM(OPLKDLL_DEBUG NAME ${OPLKLIB_DEBUG_NAME}.dll -- HINTS ${OPLKLIB_DIR}) -- -- ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -- ENDIF() -+ # Don't look for oplk libraries for a top level build -+ IF(CFG_OPLK_LIB) -+ SET(OPLKLIB ${OPLKLIB_NAME}) -+ SET(OPLKLIB_DEBUG ${OPLKLIB_DEBUG_NAME}) -+ ELSE(CFG_OPLK_LIB) -+ IF((CMAKE_GENERATOR MATCHES "Visual Studio") OR (CMAKE_BUILD_TYPE STREQUAL "Release")) -+ # Search for release library -+ UNSET(OPLKLIB CACHE) -+ MESSAGE(STATUS "Searching for LIBRARY ${OPLKLIB_NAME} in ${OPLKLIB_DIR}") -+ FIND_LIBRARY(OPLKLIB NAME ${OPLKLIB_NAME} -+ HINTS ${OPLKLIB_DIR} ${OPLKLIB_DIR}/${CFG_DEMO_BOARD_NAME}/${CFG_DEMO_NAME}) -+ -+ IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -+ -+ UNSET(OPLKDLL CACHE) -+ FIND_PROGRAM(OPLKDLL NAME ${OPLKLIB_NAME}.dll -+ HINTS ${OPLKLIB_DIR}) -+ -+ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -+ ENDIF() -+ -+ IF((CMAKE_GENERATOR MATCHES "Visual Studio") OR (CMAKE_BUILD_TYPE STREQUAL "Debug")) -+ # Search for debug library -+ UNSET(OPLKLIB_DEBUG CACHE) -+ MESSAGE(STATUS "Searching for LIBRARY ${OPLKLIB_DEBUG_NAME} in ${OPLKLIB_DIR}") -+ FIND_LIBRARY(OPLKLIB_DEBUG NAME ${OPLKLIB_DEBUG_NAME} -+ HINTS ${OPLKLIB_DIR} ${OPLKLIB_DIR}/${CFG_DEMO_BOARD_NAME}/${CFG_DEMO_NAME}) -+ -+ IF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -+ -+ UNSET(OPLKDLL_DEBUG CACHE) -+ FIND_PROGRAM(OPLKDLL_DEBUG NAME ${OPLKLIB_DEBUG_NAME}.dll -+ HINTS ${OPLKLIB_DIR}) -+ -+ ENDIF(CMAKE_SYSTEM_NAME STREQUAL "Windows") -+ ENDIF() -+ ENDIF(CFG_OPLK_LIB) - - ENDMACRO(FIND_OPLK_LIBRARY) -diff --git a/apps/common/cmake/linkoplklib.cmake b/apps/common/cmake/linkoplklib.cmake -index 49aab66..d9fd418 100644 ---- a/apps/common/cmake/linkoplklib.cmake -+++ b/apps/common/cmake/linkoplklib.cmake -@@ -33,7 +33,7 @@ MACRO(OPLK_LINK_LIBRARIES EXECUTABLE_NAME) - TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB} debug ${OPLKLIB_DEBUG}) - ELSE() - IF(${CMAKE_BUILD_TYPE} STREQUAL "Debug") -- TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} debug ${OPLKLIB_DEBUG}) -+ TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} debug ${OPLKLIB}) - ELSE () - TARGET_LINK_LIBRARIES(${EXECUTABLE_NAME} optimized ${OPLKLIB}) - ENDIF() -diff --git a/drivers/linux/drv_daemon_pcap/CMakeLists.txt b/drivers/linux/drv_daemon_pcap/CMakeLists.txt -index 1ef9353..e720834 100644 ---- a/drivers/linux/drv_daemon_pcap/CMakeLists.txt -+++ b/drivers/linux/drv_daemon_pcap/CMakeLists.txt -@@ -104,9 +104,15 @@ ENDIF() - SET(OPLKLIB_DIR ${OPLK_BASE_DIR}/stack/lib/${SYSTEM_NAME_DIR}/${SYSTEM_PROCESSOR_DIR}) - SET(OPLKLIB_INCDIR ${OPLK_BASE_DIR}/stack/proj/${SYSTEM_NAME_DIR}/lib${LIB_NAME}) - --UNSET(OPLKLIB CACHE) --FIND_LIBRARY(OPLKLIB NAME ${LIB_NAME}${BUILD_TYPE_EXT} -- HINTS ${OPLKLIB_DIR}) -+# Don't look for oplk libraries for a top level build -+IF(CFG_OPLK_LIB) -+ SET(OPLKLIB ${LIB_NAME}${BUILD_TYPE_EXT}) -+ELSE(CFG_OPLK_LIB) -+ UNSET(OPLKLIB CACHE) -+ FIND_LIBRARY(OPLKLIB NAME ${LIB_NAME}${BUILD_TYPE_EXT} -+ HINTS ${OPLKLIB_DIR}) -+ENDIF(CFG_OPLK_LIB) -+ - INCLUDE_DIRECTORIES(${OPLKLIB_INCDIR}) - - SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -std=c99 -pthread -fno-strict-aliasing") --- -2.8.1 - diff --git a/package.bak/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch b/package.bak/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch deleted file mode 100644 index d246f46681..0000000000 --- a/package.bak/openpowerlink/0004-FIX-Veth-Fix-compilation-on-Linux-kernels-4.7.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 041799c4990d56b9822ee3ae3ffbb181e5c16c81 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 3 Nov 2016 21:09:57 +0100 -Subject: [PATCH] [FIX] Veth: Fix compilation on Linux kernels >= 4.7 - -dev->trans_start was replaced by netif_trans_update helper in kernel -4.7 by commit 860e9538a9482bb84589f7d0718a7e6d0a944d58. - -Upstream status: Pending -https://github.com/OpenAutomationTechnologies/openPOWERLINK_V2/pull/177 - -Signed-off-by: Romain Naour ---- - stack/src/kernel/veth/veth-linuxkernel.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/stack/src/kernel/veth/veth-linuxkernel.c b/stack/src/kernel/veth/veth-linuxkernel.c -index 8c68c47..ecdc000 100644 ---- a/stack/src/kernel/veth/veth-linuxkernel.c -+++ b/stack/src/kernel/veth/veth-linuxkernel.c -@@ -287,7 +287,11 @@ static int vethStartXmit(struct sk_buff* pSkb_p, struct net_device* pNetDevice_p - struct net_device_stats* pStats = netdev_priv(pNetDevice_p); - - //save time stamp -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)) - pNetDevice_p->trans_start = jiffies; -+#else -+ netif_trans_update(pNetDevice_p); -+#endif - - frameInfo.frame.pBuffer = (tPlkFrame*)pSkb_p->data; - frameInfo.frameSize = pSkb_p->len; --- -2.5.5 - diff --git a/package.bak/openpowerlink/Config.in b/package.bak/openpowerlink/Config.in deleted file mode 100644 index d5e976430f..0000000000 --- a/package.bak/openpowerlink/Config.in +++ /dev/null @@ -1,128 +0,0 @@ -comment "openpowerlink needs a toolchain w/ C++, threads" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_OPENPOWERLINK - bool "openpowerlink" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_i386 || BR2_x86_64 - help - openPOWERLINK is an Open Source Industrial Ethernet stack - implementing the POWERLINK protocol for Managing Node (MN, - POWERLINK Master) and Controlled Node (CN, POWERLINK Slave). - - It is provided by - SYSTEC electronic (http://www.systec-electronic.com), - B&R (http://www.br-automation.com) and - Kalycito (http://www.kalycito.com). - - http://openpowerlink.sourceforge.net/web/ - -if BR2_PACKAGE_OPENPOWERLINK - -choice - prompt "MN/CN mode" - -config BR2_PACKAGE_OPENPOWERLINK_MN - bool "Managing Node" - help - Enable Managing Node (master) mode - -config BR2_PACKAGE_OPENPOWERLINK_CN - bool "Controlled Node" - help - Enable Controlled Node (slave) mode - -endchoice - -choice - prompt "stack type" - -config BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB - bool "linked into application" - select BR2_PACKAGE_LIBPCAP - help - Compile a monolithic openPOWERLINK library. The library - contains an Ethernet driver which is using the PCAP library - for accessing the network. No kernel-side driver is needed. - -config BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB - bool "user-space pcap daemon" - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_OPENPOWERLINK_PCAP_DAEMON - help - Compile openPOWERLINK application library which contains the - interface to a Linux user space driver, and the Linux user - space driver. It is used for implementing a multi-process - solution where the openPOWERLINK layer is running as a - separate Linux user space daemon (i.e. a PCAP based user - space daemon). No kernel-side stack is needed. - -config BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB - bool "kernel-space driver" - depends on BR2_LINUX_KERNEL - help - Compile openPOWERLINK application library which contains the - interface to a Linux kernel space driver. This will also - build and install a Linux kernel module openPOWERLINK - driver. - -config BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB - bool "kernel-space PCIe driver" - depends on BR2_LINUX_KERNEL - depends on BR2_PACKAGE_OPENPOWERLINK_MN # MN support only - help - Compile openPOWERLINK application library which contains the - interface to a Linux kernel PCIe interface driver. The kernel - part of the openPOWERLINK stack is located on an external PCIe - device. The status/control and data exchange between the - application and kernel stack is handled by the PCIe interface - driver. - -comment "openpowerlink kernel stack needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -endchoice - -if BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB - -menu "Ethernet drivers" - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_82573 - bool "Intel 82573" - default y - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_8255x - bool "Intel 8255x" - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_I210 - bool "Intel I210" - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8111 - bool "Realtek RTL-8111/8168" - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8139 - bool "Realtek RTL-8139" - -endmenu - -endif # BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB - -config BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER - depends on BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB - bool "PCIe Powerlink Driver" - -menu "demos" - -config BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE - bool "console MN demo" - depends on BR2_PACKAGE_OPENPOWERLINK_MN - -config BR2_PACKAGE_OPENPOWERLINK_DEMO_CN_CONSOLE - bool "console CN demo" - depends on BR2_PACKAGE_OPENPOWERLINK_CN - -endmenu - -endif # BR2_PACKAGE_OPENPOWERLINK diff --git a/package.bak/openpowerlink/openpowerlink.hash b/package.bak/openpowerlink/openpowerlink.hash deleted file mode 100644 index f9c94f90d5..0000000000 --- a/package.bak/openpowerlink/openpowerlink.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://sourceforge.net/projects/openpowerlink/files/openPOWERLINK/V2.5.0/ -md5 929b778a6a4d448d502da5a428322949 openPOWERLINK_V2.5.0.tar.gz -sha1 28e2e5621550421e74ba94738f6c12eb8c279fce openPOWERLINK_V2.5.0.tar.gz -# sha256 locally computed -sha256 1cb8c44626dbb7f224520667e437b4b430a32699560914f379679b6c58c1309c openPOWERLINK_V2.5.0.tar.gz diff --git a/package.bak/openpowerlink/openpowerlink.mk b/package.bak/openpowerlink/openpowerlink.mk deleted file mode 100644 index dcb548cc91..0000000000 --- a/package.bak/openpowerlink/openpowerlink.mk +++ /dev/null @@ -1,151 +0,0 @@ -################################################################################ -# -# openpowerlink -# -################################################################################ - -OPENPOWERLINK_VERSION = V2.5.0 -OPENPOWERLINK_SITE = http://downloads.sourceforge.net/project/openpowerlink/openPOWERLINK/$(OPENPOWERLINK_VERSION) -OPENPOWERLINK_SOURCE = openPOWERLINK_$(OPENPOWERLINK_VERSION).tar.gz -OPENPOWERLINK_LICENSE = BSD-2c, GPLv2 -OPENPOWERLINK_LICENSE_FILES = license.md - -OPENPOWERLINK_INSTALL_STAGING = YES - -# The archive has no leading component. -OPENPOWERLINK_STRIP_COMPONENTS = 0 - -OPENPOWERLINK_MN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK_MN),ON,OFF) -OPENPOWERLINK_CN_ONOFF = $(if $(BR2_PACKAGE_OPENPOWERLINK_CN),ON,OFF) - -#### OPLK LIBRARY #### - -# Always build a oplk stack -# Disable library with simulation interface -# Disable zynq/FPGA (PCIe) interface -OPENPOWERLINK_CONF_OPTS += -DCFG_OPLK_LIB=ON \ - -DCFG_COMPILE_LIB_MN_SIM=OFF \ - -DCFG_COMPILE_LIB_CN_SIM=OFF \ - -DCFG_COMPILE_LIB_MNAPP_ZYNQINTF=OFF - -# All option are ON by default -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB),y) -OPENPOWERLINK_DEPENDENCIES += libpcap -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_COMPILE_LIB_MN=$(OPENPOWERLINK_MN_ONOFF) \ - -DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_PCIEINTF=OFF \ - -DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \ - -DCFG_COMPILE_LIB_CN=$(OPENPOWERLINK_CN_ONOFF) \ - -DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_CNDRV_PCAP=OFF -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB),y) -OPENPOWERLINK_DEPENDENCIES += libpcap -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_COMPILE_LIB_MN=OFF \ - -DCFG_COMPILE_LIB_MNAPP_USERINTF=$(OPENPOWERLINK_MN_ONOFF) \ - -DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_PCIEINTF=OFF \ - -DCFG_COMPILE_LIB_MNDRV_PCAP=$(OPENPOWERLINK_MN_ONOFF) \ - -DCFG_COMPILE_LIB_CN=OFF \ - -DCFG_COMPILE_LIB_CNAPP_USERINTF=$(OPENPOWERLINK_CN_ONOFF) \ - -DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_CNDRV_PCAP=$(OPENPOWERLINK_CN_ONOFF) -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_COMPILE_LIB_MN=OFF \ - -DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_KERNELINTF=$(OPENPOWERLINK_MN_ONOFF) \ - -DCFG_COMPILE_LIB_MNAPP_PCIEINTF=OFF \ - -DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \ - -DCFG_COMPILE_LIB_CN=OFF \ - -DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_CNAPP_KERNELINTF=$(OPENPOWERLINK_CN_ONOFF) \ - -DCFG_COMPILE_LIB_CNDRV_PCAP=OFF -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_COMPILE_LIB_MN=OFF \ - -DCFG_COMPILE_LIB_MNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_MNAPP_PCIEINTF=$(OPENPOWERLINK_MN_ONOFF) \ - -DCFG_COMPILE_LIB_MNDRV_PCAP=OFF \ - -DCFG_COMPILE_LIB_CN=OFF \ - -DCFG_COMPILE_LIB_CNAPP_USERINTF=OFF \ - -DCFG_COMPILE_LIB_CNAPP_KERNELINTF=OFF \ - -DCFG_COMPILE_LIB_CNDRV_PCAP=OFF -endif - -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_COMPILE_SHARED_LIBRARY=$(if $(BR2_STATIC_LIBS),OFF,ON) - -#### OPLK KERNEL DRIVERS #### - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB)$(BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER),y) -OPENPOWERLINK_DEPENDENCIES += linux - -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_KERNEL_DIR="$(LINUX_DIR)" \ - -DCMAKE_SYSTEM_VERSION="$(LINUX_VERSION)" \ - -DCFG_OPLK_MN="$(OPENPOWERLINK_MN_ONOFF)" \ - -DMAKE_KERNEL_ARCH="$(KERNEL_ARCH)" \ - -DMAKE_KERNEL_CROSS_COMPILE="$(CCACHE) $(TARGET_CROSS)" -endif - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_DRIVERS=ON \ - -DCFG_POWERLINK_EDRV_82573=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_82573),ON,OFF) \ - -DCFG_POWERLINK_EDRV_8255X=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_8255x),ON,OFF) \ - -DCFG_POWERLINK_EDRV_I210=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_I210),ON,OFF) \ - -DCFG_POWERLINK_EDRV_8111=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8111),ON,OFF) \ - -DCFG_POWERLINK_EDRV_8139=$(if $(BR2_PACKAGE_OPENPOWERLINK_KERNEL_DRIVER_RTL8139),ON,OFF) -else -OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_DRIVERS=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_KERNEL_PCIE_DRIVER),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_PCIE_DRIVERS=ON -else -OPENPOWERLINK_CONF_OPTS += -DCFG_KERNEL_PCIE_DRIVERS=OFF -endif - -#### OPLK PCAP DAEMON #### - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_PCAP_DAEMON=ON \ - -DCFG_OPLK_MN=$(OPENPOWERLINK_MN_ONOFF) -endif - -#### OPLK DEMO APPS #### - -# See apps/common/cmake/configure-linux.cmake for available options list. -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_MONOLITHIC_USER_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_BUILD_KERNEL_STACK="Link to Application" -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_USERSPACE_DAEMON_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_BUILD_KERNEL_STACK="Linux Userspace Daemon" -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_BUILD_KERNEL_STACK="Linux Kernel Module" -else ifeq ($(BR2_PACKAGE_OPENPOWERLINK_STACK_KERNEL_PCIE_STACK_LIB),y) -OPENPOWERLINK_CONF_OPTS += \ - -DCFG_BUILD_KERNEL_STACK="Kernel stack on PCIe card" -endif - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_MN_CONSOLE),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_DEMO_MN_CONSOLE=ON \ - -DCFG_DEMO_MN_CONSOLE_USE_SYNCTHREAD=ON -else -OPENPOWERLINK_CONF_OPTS += -DCFG_DEMO_MN_CONSOLE=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENPOWERLINK_DEMO_CN_CONSOLE),y) -OPENPOWERLINK_CONF_OPTS += -DCFG_DEMO_CN_CONSOLE=ON -else -OPENPOWERLINK_CONF_OPTS += -DCFG_DEMO_CN_CONSOLE=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/openssh/0001-fix-pam-uclibc-pthreads-clash.patch b/package.bak/openssh/0001-fix-pam-uclibc-pthreads-clash.patch deleted file mode 100644 index d9bc6e5d0c..0000000000 --- a/package.bak/openssh/0001-fix-pam-uclibc-pthreads-clash.patch +++ /dev/null @@ -1,44 +0,0 @@ -When PAM is enabled, openssh makes its own static versions of pthreads -functions. But when built with a uclibc toolchain, pthreads.h gets -indirectly included. The clashing exported and static definitions of -the pthreads functions then cause a compile error. This patch fixes -the problem by changing the static pthread function names with macros -when the static functions are defined. - -Signed-off-by: Danomi Manchego - -diff -urN openssh-6.1p1.orig/auth-pam.c openssh-6.1p1/auth-pam.c ---- openssh-6.1p1.orig/auth-pam.c 2009-07-12 08:07:21.000000000 -0400 -+++ openssh-6.1p1/auth-pam.c 2012-09-15 19:49:47.677288199 -0400 -@@ -166,6 +166,7 @@ - sigdie("PAM: authentication thread exited uncleanly"); - } - -+#define pthread_exit pthread_exit_AVOID_UCLIBC_PTHREAD_CLASH - /* ARGSUSED */ - static void - pthread_exit(void *value) -@@ -173,6 +174,7 @@ - _exit(0); - } - -+#define pthread_create pthread_create_AVOID_UCLIBC_PTHREAD_CLASH - /* ARGSUSED */ - static int - pthread_create(sp_pthread_t *thread, const void *attr, -@@ -200,6 +202,7 @@ - } - } - -+#define pthread_cancel pthread_cancel_AVOID_UCLIBC_PTHREAD_CLASH - static int - pthread_cancel(sp_pthread_t thread) - { -@@ -207,6 +210,7 @@ - return (kill(thread, SIGTERM)); - } - -+#define pthread_join pthread_join_AVOID_UCLIBC_PTHREAD_CLASH - /* ARGSUSED */ - static int - pthread_join(sp_pthread_t thread, void **value) diff --git a/package.bak/openssh/0002-fix-howmany-include.patch b/package.bak/openssh/0002-fix-howmany-include.patch deleted file mode 100644 index 7a2a8e3202..0000000000 --- a/package.bak/openssh/0002-fix-howmany-include.patch +++ /dev/null @@ -1,49 +0,0 @@ -Update patch from 2fea21799223d41605556858a95b55e69e9960ca to openssh -version 6.8p1 - -Signed-off-by: Gustavo Zacarias - -diff -Nura openssh-6.8p1.orig/openbsd-compat/bsd-poll.c openssh-6.8p1/openbsd-compat/bsd-poll.c ---- openssh-6.8p1.orig/openbsd-compat/bsd-poll.c 2015-03-18 07:11:46.184620677 -0300 -+++ openssh-6.8p1/openbsd-compat/bsd-poll.c 2015-03-18 07:12:29.120094555 -0300 -@@ -19,6 +19,7 @@ - #include "includes.h" - #if !defined(HAVE_POLL) - -+#include - #include - #include - #ifdef HAVE_SYS_SELECT_H -diff -Nura openssh-6.8p1.orig/sshd.c openssh-6.8p1/sshd.c ---- openssh-6.8p1.orig/sshd.c 2015-03-18 07:11:46.187620780 -0300 -+++ openssh-6.8p1/sshd.c 2015-03-18 07:13:11.889562735 -0300 -@@ -44,6 +44,7 @@ - - #include "includes.h" - -+#include - #include - #include - #include -diff -Nura openssh-6.8p1.orig/ssh-keyscan.c openssh-6.8p1/ssh-keyscan.c ---- openssh-6.8p1.orig/ssh-keyscan.c 2015-03-18 07:11:46.180620539 -0300 -+++ openssh-6.8p1/ssh-keyscan.c 2015-03-18 07:13:32.092256248 -0300 -@@ -9,6 +9,7 @@ - - #include "includes.h" - -+#include - #include - #include "openbsd-compat/sys-queue.h" - #include -diff -Nura openssh-6.8p1.orig/ssh-pkcs11-helper.c openssh-6.8p1/ssh-pkcs11-helper.c ---- openssh-6.8p1.orig/ssh-pkcs11-helper.c 2015-03-18 07:11:46.182620608 -0300 -+++ openssh-6.8p1/ssh-pkcs11-helper.c 2015-03-18 07:13:43.620651993 -0300 -@@ -17,6 +17,7 @@ - - #include "includes.h" - -+#include - #include - #ifdef HAVE_SYS_TIME_H - # include diff --git a/package.bak/openssh/Config.in b/package.bak/openssh/Config.in deleted file mode 100644 index 75911402ae..0000000000 --- a/package.bak/openssh/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_OPENSSH - bool "openssh" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - A free version of the SSH protocol suite of network connectivity - tools. The standard 'ssh', 'sshd', 'scp', and friends. - - http://www.openssh.com/ diff --git a/package.bak/openssh/S50sshd b/package.bak/openssh/S50sshd deleted file mode 100644 index 22da41d1ca..0000000000 --- a/package.bak/openssh/S50sshd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh -# -# sshd Starts sshd. -# - -# Make sure the ssh-keygen progam exists -[ -f /usr/bin/ssh-keygen ] || exit 0 - -umask 077 - -start() { - # Create any missing keys - /usr/bin/ssh-keygen -A - - printf "Starting sshd: " - /usr/sbin/sshd - touch /var/lock/sshd - echo "OK" -} -stop() { - printf "Stopping sshd: " - killall sshd - rm -f /var/lock/sshd - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/openssh/openssh.hash b/package.bak/openssh/openssh.hash deleted file mode 100644 index 09010d3b29..0000000000 --- a/package.bak/openssh/openssh.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated after checking pgp signature -# Also from http://www.openssh.com/txt/release-7.4 -sha256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 openssh-7.4p1.tar.gz diff --git a/package.bak/openssh/openssh.mk b/package.bak/openssh/openssh.mk deleted file mode 100644 index 3e18c0a9b5..0000000000 --- a/package.bak/openssh/openssh.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# openssh -# -################################################################################ - -OPENSSH_VERSION = 7.4p1 -OPENSSH_SITE = http://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable -OPENSSH_LICENSE = BSD-3c, BSD-2c, Public Domain -OPENSSH_LICENSE_FILES = LICENCE -OPENSSH_CONF_ENV = LD="$(TARGET_CC)" LDFLAGS="$(TARGET_CFLAGS)" -OPENSSH_CONF_OPTS = \ - --sysconfdir=/data/etc \ - --disable-lastlog \ - --disable-utmp \ - --disable-utmpx \ - --disable-wtmp \ - --disable-wtmpx \ - --disable-strip - -define OPENSSH_USERS - sshd -1 sshd -1 * - - - SSH drop priv user -endef - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -OPENSSH_CONF_OPTS += --without-pie -endif - -OPENSSH_DEPENDENCIES = zlib openssl - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -define OPENSSH_INSTALL_PAM_CONF - $(INSTALL) -D -m 644 $(@D)/contrib/sshd.pam.generic $(TARGET_DIR)/etc/pam.d/sshd - $(SED) '\%password required /lib/security/pam_cracklib.so%d' $(TARGET_DIR)/etc/pam.d/sshd - $(SED) 's/\#UsePAM no/UsePAM yes/' $(TARGET_DIR)/etc/ssh/sshd_config -endef - -OPENSSH_DEPENDENCIES += linux-pam -OPENSSH_CONF_OPTS += --with-pam -OPENSSH_POST_INSTALL_TARGET_HOOKS += OPENSSH_INSTALL_PAM_CONF -else -OPENSSH_CONF_OPTS += --without-pam -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -OPENSSH_DEPENDENCIES += libselinux -OPENSSH_CONF_OPTS += --with-selinux -else -OPENSSH_CONF_OPTS += --without-selinux -endif - -define OPENSSH_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/openssh/sshd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/sshd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/sshd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/sshd.service -endef - -define OPENSSH_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/openssh/S50sshd \ - $(TARGET_DIR)/etc/init.d/S50sshd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/openssh/sshd.service b/package.bak/openssh/sshd.service deleted file mode 100644 index b5e96b3a25..0000000000 --- a/package.bak/openssh/sshd.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=OpenSSH server daemon -After=syslog.target network.target auditd.service - -[Service] -ExecStartPre=/usr/bin/ssh-keygen -A -ExecStart=/usr/sbin/sshd -D -e -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch b/package.bak/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch deleted file mode 100644 index 10d2b7526c..0000000000 --- a/package.bak/openssl/0001-Dont-waste-time-building-manpages-if-we-re-not-going.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 389efb564fa1453a9da835393eec9006bfae2a52 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Sat, 16 May 2015 18:53:51 +0200 -Subject: Dont waste time building manpages if we're not going to use em. - -Signed-off-by: Ryan Barnett -[Gustavo: update for parallel-build] ---- - Makefile.org | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.org b/Makefile.org -index 60f07cc..976ceaf 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -527,7 +527,7 @@ dist: - dist_pem_h: - (cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean) - --install: install_docs install_sw -+install: install_sw - - install_sw: - @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \ --- -1.9.1 - diff --git a/package.bak/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch b/package.bak/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch deleted file mode 100644 index 47295500c0..0000000000 --- a/package.bak/openssl/0002-cryptodev-Fix-issue-with-signature-generation.patch +++ /dev/null @@ -1,450 +0,0 @@ -From 90fd7e8f1a316cda86ee442b43fcd7d5e5baeede Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sat, 16 May 2015 18:55:08 +0200 -Subject: cryptodev: Fix issue with signature generation - -Forward port of 0001-cryptodev-Fix-issue-with-signature-generation.patch -from http://rt.openssl.org/Ticket/Display.html?id=2770&user=guest&pass=guest -It was originally targetted at 1.0.2-beta3. - -Without this patch digest acceleration via cryptodev is broken. - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Ryan Barnett ---- - crypto/engine/eng_cryptodev.c | 195 +++++++++++++++++++++++++++++++----------- - 1 file changed, 146 insertions(+), 49 deletions(-) - -diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c -index 926d95c..7021d9a 100644 ---- a/crypto/engine/eng_cryptodev.c -+++ b/crypto/engine/eng_cryptodev.c -@@ -2,6 +2,7 @@ - * Copyright (c) 2002 Bob Beck - * Copyright (c) 2002 Theo de Raadt - * Copyright (c) 2002 Markus Friedl -+ * Copyright (c) 2012 Nikos Mavrogiannopoulos - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without -@@ -72,7 +73,6 @@ struct dev_crypto_state { - struct session_op d_sess; - int d_fd; - # ifdef USE_CRYPTODEV_DIGESTS -- char dummy_mac_key[HASH_MAX_LEN]; - unsigned char digest_res[HASH_MAX_LEN]; - char *mac_data; - int mac_len; -@@ -189,8 +189,10 @@ static struct { - static struct { - int id; - int nid; -- int keylen; -+ int digestlen; - } digests[] = { -+#if 0 -+ /* HMAC is not supported */ - { - CRYPTO_MD5_HMAC, NID_hmacWithMD5, 16 - }, -@@ -198,15 +200,15 @@ static struct { - CRYPTO_SHA1_HMAC, NID_hmacWithSHA1, 20 - }, - { -- CRYPTO_RIPEMD160_HMAC, NID_ripemd160, 16 -- /* ? */ -+ CRYPTO_SHA2_256_HMAC, NID_hmacWithSHA256, 32 - }, - { -- CRYPTO_MD5_KPDK, NID_undef, 0 -+ CRYPTO_SHA2_384_HMAC, NID_hmacWithSHA384, 48 - }, - { -- CRYPTO_SHA1_KPDK, NID_undef, 0 -+ CRYPTO_SHA2_512_HMAC, NID_hmacWithSHA512, 64 - }, -+#endif - { - CRYPTO_MD5, NID_md5, 16 - }, -@@ -214,6 +216,15 @@ static struct { - CRYPTO_SHA1, NID_sha1, 20 - }, - { -+ CRYPTO_SHA2_256, NID_sha256, 32 -+ }, -+ { -+ CRYPTO_SHA2_384, NID_sha384, 48 -+ }, -+ { -+ CRYPTO_SHA2_512, NID_sha512, 64 -+ }, -+ { - 0, NID_undef, 0 - }, - }; -@@ -288,13 +299,14 @@ static int get_cryptodev_ciphers(const int **cnids) - static int nids[CRYPTO_ALGORITHM_MAX]; - struct session_op sess; - int fd, i, count = 0; -+ unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN]; - - if ((fd = get_dev_crypto()) < 0) { - *cnids = NULL; - return (0); - } - memset(&sess, 0, sizeof(sess)); -- sess.key = (caddr_t) "123456789abcdefghijklmno"; -+ sess.key = (void*)fake_key; - - for (i = 0; ciphers[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { - if (ciphers[i].nid == NID_undef) -@@ -327,18 +339,19 @@ static int get_cryptodev_digests(const int **cnids) - static int nids[CRYPTO_ALGORITHM_MAX]; - struct session_op sess; - int fd, i, count = 0; -+ unsigned char fake_key[CRYPTO_CIPHER_MAX_KEY_LEN]; - - if ((fd = get_dev_crypto()) < 0) { - *cnids = NULL; - return (0); - } - memset(&sess, 0, sizeof(sess)); -- sess.mackey = (caddr_t) "123456789abcdefghijklmno"; -+ sess.mackey = fake_key; - for (i = 0; digests[i].id && count < CRYPTO_ALGORITHM_MAX; i++) { - if (digests[i].nid == NID_undef) - continue; - sess.mac = digests[i].id; -- sess.mackeylen = digests[i].keylen; -+ sess.mackeylen = 8; - sess.cipher = 0; - if (ioctl(fd, CIOCGSESSION, &sess) != -1 && - ioctl(fd, CIOCFSESSION, &sess.ses) != -1) -@@ -424,14 +437,14 @@ cryptodev_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, - cryp.ses = sess->ses; - cryp.flags = 0; - cryp.len = inl; -- cryp.src = (caddr_t) in; -- cryp.dst = (caddr_t) out; -+ cryp.src = (void*) in; -+ cryp.dst = (void*) out; - cryp.mac = 0; - - cryp.op = ctx->encrypt ? COP_ENCRYPT : COP_DECRYPT; - - if (ctx->cipher->iv_len) { -- cryp.iv = (caddr_t) ctx->iv; -+ cryp.iv = (void*) ctx->iv; - if (!ctx->encrypt) { - iiv = in + inl - ctx->cipher->iv_len; - memcpy(save_iv, iiv, ctx->cipher->iv_len); -@@ -483,7 +496,7 @@ cryptodev_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key, - if ((state->d_fd = get_dev_crypto()) < 0) - return (0); - -- sess->key = (caddr_t) key; -+ sess->key = (void*)key; - sess->keylen = ctx->key_len; - sess->cipher = cipher; - -@@ -749,16 +762,6 @@ static int digest_nid_to_cryptodev(int nid) - return (0); - } - --static int digest_key_length(int nid) --{ -- int i; -- -- for (i = 0; digests[i].id; i++) -- if (digests[i].nid == nid) -- return digests[i].keylen; -- return (0); --} -- - static int cryptodev_digest_init(EVP_MD_CTX *ctx) - { - struct dev_crypto_state *state = ctx->md_data; -@@ -769,7 +772,6 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) - printf("cryptodev_digest_init: Can't get digest \n"); - return (0); - } -- - memset(state, 0, sizeof(struct dev_crypto_state)); - - if ((state->d_fd = get_dev_crypto()) < 0) { -@@ -777,8 +779,8 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) - return (0); - } - -- sess->mackey = state->dummy_mac_key; -- sess->mackeylen = digest_key_length(ctx->digest->type); -+ sess->mackey = NULL; -+ sess->mackeylen = 0; - sess->mac = digest; - - if (ioctl(state->d_fd, CIOCGSESSION, sess) < 0) { -@@ -794,8 +796,8 @@ static int cryptodev_digest_init(EVP_MD_CTX *ctx) - static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, - size_t count) - { -- struct crypt_op cryp; - struct dev_crypto_state *state = ctx->md_data; -+ struct crypt_op cryp; - struct session_op *sess = &state->d_sess; - - if (!data || state->d_fd < 0) { -@@ -804,7 +806,7 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, - } - - if (!count) { -- return (0); -+ return (1); - } - - if (!(ctx->flags & EVP_MD_CTX_FLAG_ONESHOT)) { -@@ -828,9 +830,9 @@ static int cryptodev_digest_update(EVP_MD_CTX *ctx, const void *data, - cryp.ses = sess->ses; - cryp.flags = 0; - cryp.len = count; -- cryp.src = (caddr_t) data; -+ cryp.src = (void*) data; - cryp.dst = NULL; -- cryp.mac = (caddr_t) state->digest_res; -+ cryp.mac = (void*) state->digest_res; - if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { - printf("cryptodev_digest_update: digest failed\n"); - return (0); -@@ -844,8 +846,6 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - struct dev_crypto_state *state = ctx->md_data; - struct session_op *sess = &state->d_sess; - -- int ret = 1; -- - if (!md || state->d_fd < 0) { - printf("cryptodev_digest_final: illegal input\n"); - return (0); -@@ -859,7 +859,7 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - cryp.len = state->mac_len; - cryp.src = state->mac_data; - cryp.dst = NULL; -- cryp.mac = (caddr_t) md; -+ cryp.mac = (void*)md; - if (ioctl(state->d_fd, CIOCCRYPT, &cryp) < 0) { - printf("cryptodev_digest_final: digest failed\n"); - return (0); -@@ -870,7 +870,7 @@ static int cryptodev_digest_final(EVP_MD_CTX *ctx, unsigned char *md) - - memcpy(md, state->digest_res, ctx->digest->md_size); - -- return (ret); -+ return 1; - } - - static int cryptodev_digest_cleanup(EVP_MD_CTX *ctx) -@@ -921,8 +921,8 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) - - digest = digest_nid_to_cryptodev(to->digest->type); - -- sess->mackey = dstate->dummy_mac_key; -- sess->mackeylen = digest_key_length(to->digest->type); -+ sess->mackey = NULL; -+ sess->mackeylen = 0; - sess->mac = digest; - - dstate->d_fd = get_dev_crypto(); -@@ -947,32 +947,116 @@ static int cryptodev_digest_copy(EVP_MD_CTX *to, const EVP_MD_CTX *from) - - const EVP_MD cryptodev_sha1 = { - NID_sha1, -- NID_undef, -+ NID_sha1WithRSAEncryption, - SHA_DIGEST_LENGTH, -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif - EVP_MD_FLAG_ONESHOT, - cryptodev_digest_init, - cryptodev_digest_update, - cryptodev_digest_final, - cryptodev_digest_copy, - cryptodev_digest_cleanup, -- EVP_PKEY_NULL_method, -+ EVP_PKEY_RSA_method, - SHA_CBLOCK, -- sizeof(struct dev_crypto_state), -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), - }; - --const EVP_MD cryptodev_md5 = { -+static const EVP_MD cryptodev_sha256 = { -+ NID_sha256, -+ NID_sha256WithRSAEncryption, -+ SHA256_DIGEST_LENGTH, -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif -+ EVP_MD_FLAG_ONESHOT, -+ cryptodev_digest_init, -+ cryptodev_digest_update, -+ cryptodev_digest_final, -+ cryptodev_digest_copy, -+ cryptodev_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA256_CBLOCK, -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), -+}; -+ -+static const EVP_MD cryptodev_sha224 = { -+ NID_sha224, -+ NID_sha224WithRSAEncryption, -+ SHA224_DIGEST_LENGTH, -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif -+ EVP_MD_FLAG_ONESHOT, -+ cryptodev_digest_init, -+ cryptodev_digest_update, -+ cryptodev_digest_final, -+ cryptodev_digest_copy, -+ cryptodev_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA256_CBLOCK, -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), -+}; -+ -+static const EVP_MD cryptodev_sha384 = { -+ NID_sha384, -+ NID_sha384WithRSAEncryption, -+ SHA384_DIGEST_LENGTH, -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif -+ EVP_MD_FLAG_ONESHOT, -+ cryptodev_digest_init, -+ cryptodev_digest_update, -+ cryptodev_digest_final, -+ cryptodev_digest_copy, -+ cryptodev_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA512_CBLOCK, -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), -+}; -+ -+static const EVP_MD cryptodev_sha512 = { -+ NID_sha512, -+ NID_sha512WithRSAEncryption, -+ SHA512_DIGEST_LENGTH, -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif -+ EVP_MD_FLAG_ONESHOT, -+ cryptodev_digest_init, -+ cryptodev_digest_update, -+ cryptodev_digest_final, -+ cryptodev_digest_copy, -+ cryptodev_digest_cleanup, -+ EVP_PKEY_RSA_method, -+ SHA512_CBLOCK, -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), -+}; -+ -+static const EVP_MD cryptodev_md5 = { - NID_md5, -- NID_undef, -+ NID_md5WithRSAEncryption, - 16 /* MD5_DIGEST_LENGTH */ , -+#if defined(EVP_MD_FLAG_PKEY_METHOD_SIGNATURE) && defined(EVP_MD_FLAG_DIGALGID_ABSENT) -+ EVP_MD_FLAG_PKEY_METHOD_SIGNATURE| -+ EVP_MD_FLAG_DIGALGID_ABSENT| -+#endif - EVP_MD_FLAG_ONESHOT, - cryptodev_digest_init, - cryptodev_digest_update, - cryptodev_digest_final, - cryptodev_digest_copy, - cryptodev_digest_cleanup, -- EVP_PKEY_NULL_method, -+ EVP_PKEY_RSA_method, - 64 /* MD5_CBLOCK */ , -- sizeof(struct dev_crypto_state), -+ sizeof(EVP_MD *)+sizeof(struct dev_crypto_state), - }; - - # endif /* USE_CRYPTODEV_DIGESTS */ -@@ -992,6 +1076,18 @@ cryptodev_engine_digests(ENGINE *e, const EVP_MD **digest, - case NID_sha1: - *digest = &cryptodev_sha1; - break; -+ case NID_sha224: -+ *digest = &cryptodev_sha224; -+ break; -+ case NID_sha256: -+ *digest = &cryptodev_sha256; -+ break; -+ case NID_sha384: -+ *digest = &cryptodev_sha384; -+ break; -+ case NID_sha512: -+ *digest = &cryptodev_sha512; -+ break; - default: - # endif /* USE_CRYPTODEV_DIGESTS */ - *digest = NULL; -@@ -1022,7 +1118,7 @@ static int bn2crparam(const BIGNUM *a, struct crparam *crp) - return (1); - memset(b, 0, bytes); - -- crp->crp_p = (caddr_t) b; -+ crp->crp_p = (void*) b; - crp->crp_nbits = bits; - - for (i = 0, j = 0; i < a->top; i++) { -@@ -1277,7 +1373,7 @@ static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen, - kop.crk_op = CRK_DSA_SIGN; - - /* inputs: dgst dsa->p dsa->q dsa->g dsa->priv_key */ -- kop.crk_param[0].crp_p = (caddr_t) dgst; -+ kop.crk_param[0].crp_p = (void*)dgst; - kop.crk_param[0].crp_nbits = dlen * 8; - if (bn2crparam(dsa->p, &kop.crk_param[1])) - goto err; -@@ -1317,7 +1413,7 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen, - kop.crk_op = CRK_DSA_VERIFY; - - /* inputs: dgst dsa->p dsa->q dsa->g dsa->pub_key sig->r sig->s */ -- kop.crk_param[0].crp_p = (caddr_t) dgst; -+ kop.crk_param[0].crp_p = (void*)dgst; - kop.crk_param[0].crp_nbits = dlen * 8; - if (bn2crparam(dsa->p, &kop.crk_param[1])) - goto err; -@@ -1398,9 +1494,10 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh) - goto err; - kop.crk_iparams = 3; - -- kop.crk_param[3].crp_p = (caddr_t) key; -- kop.crk_param[3].crp_nbits = keylen * 8; -+ kop.crk_param[3].crp_p = (void*) key; -+ kop.crk_param[3].crp_nbits = keylen; - kop.crk_oparams = 1; -+ dhret = keylen / 8; - - if (ioctl(fd, CIOCKEY, &kop) == -1) { - const DH_METHOD *meth = DH_OpenSSL(); -@@ -1470,7 +1567,7 @@ void ENGINE_load_cryptodev(void) - put_dev_crypto(fd); - - if (!ENGINE_set_id(engine, "cryptodev") || -- !ENGINE_set_name(engine, "BSD cryptodev engine") || -+ !ENGINE_set_name(engine, "cryptodev engine") || - !ENGINE_set_ciphers(engine, cryptodev_engine_ciphers) || - !ENGINE_set_digests(engine, cryptodev_engine_digests) || - !ENGINE_set_ctrl_function(engine, cryptodev_ctrl) || --- -1.9.1 - diff --git a/package.bak/openssl/Config.in b/package.bak/openssl/Config.in deleted file mode 100644 index e08b648ba4..0000000000 --- a/package.bak/openssl/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_OPENSSL - bool "openssl" - select BR2_PACKAGE_ZLIB - help - A collaborative effort to develop a robust, commercial-grade, fully - featured, and Open Source toolkit implementing the Secure Sockets - Layer (SSL v2/v3) and Transport Security (TLS v1) as well as a - full-strength general-purpose cryptography library. - - http://www.openssl.org/ - - Note: Some helper scripts need perl. - -if BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_OPENSSL_BIN - bool "openssl binary" - help - Install the openssl binary and the associated helper scripts to the - target file system. This is a command line tool for doing various - cryptographic stuff. - -config BR2_PACKAGE_OPENSSL_ENGINES - bool "openssl additional engines" - help - Install additional encryption engine libraries. - -endif diff --git a/package.bak/openssl/openssl.hash b/package.bak/openssl/openssl.hash deleted file mode 100644 index 064eeca6f4..0000000000 --- a/package.bak/openssl/openssl.hash +++ /dev/null @@ -1,7 +0,0 @@ -# From https://www.openssl.org/source/openssl-1.0.2k.tar.gz.sha256 -sha256 6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0 openssl-1.0.2k.tar.gz -# Locally computed -sha256 eddd8a5123748052c598214487ac178e4bfa4e31ba2ec520c70d59c8c5bfa2e9 openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d -sha256 147c3eeaad614c044749ea527cb433eae5e2d5cad34a78c6ba61cd967bfbe01f openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d -sha256 30cb49489de5041841a74da9155cd4fabfbce33237262ba7cd23974314ae2956 openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d -sha256 deaf6f3af41874ecc6d63841ea14b8e6c71cea81d4a511a754bc90c9a993147f openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d diff --git a/package.bak/openssl/openssl.mk b/package.bak/openssl/openssl.mk deleted file mode 100644 index 1536982f8b..0000000000 --- a/package.bak/openssl/openssl.mk +++ /dev/null @@ -1,169 +0,0 @@ -################################################################################ -# -# openssl -# -################################################################################ - -OPENSSL_VERSION = 1.0.2k -OPENSSL_SITE = http://www.openssl.org/source -OPENSSL_LICENSE = OpenSSL or SSLeay -OPENSSL_LICENSE_FILES = LICENSE -OPENSSL_INSTALL_STAGING = YES -OPENSSL_DEPENDENCIES = zlib -HOST_OPENSSL_DEPENDENCIES = host-zlib -OPENSSL_TARGET_ARCH = generic32 -OPENSSL_CFLAGS = $(TARGET_CFLAGS) -OPENSSL_PATCH = \ - https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2d-parallel-build.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ - https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-obj-headers.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ - https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-install-dirs.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d \ - https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-libs/openssl/files/openssl-1.0.2a-parallel-symlinking.patch?id=c8abcbe8de5d3b6cdd68c162f398c011ff6e2d9d - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -OPENSSL_CFLAGS += -mxgot -endif - -ifeq ($(BR2_USE_MMU),) -OPENSSL_CFLAGS += -DHAVE_FORK=0 -endif - -ifeq ($(BR2_PACKAGE_HAS_CRYPTODEV),y) -OPENSSL_CFLAGS += -DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS -OPENSSL_DEPENDENCIES += cryptodev -endif - -# Some architectures are optimized in OpenSSL -# Doesn't work for thumb-only (Cortex-M?) -ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -OPENSSL_TARGET_ARCH = armv4 -endif -ifeq ($(ARCH),aarch64) -OPENSSL_TARGET_ARCH = aarch64 -endif -ifeq ($(ARCH),powerpc) -# 4xx cores seem to have trouble with openssl's ASM optimizations -ifeq ($(BR2_powerpc_401)$(BR2_powerpc_403)$(BR2_powerpc_405)$(BR2_powerpc_405fp)$(BR2_powerpc_440)$(BR2_powerpc_440fp),) -OPENSSL_TARGET_ARCH = ppc -endif -endif -ifeq ($(ARCH),powerpc64) -OPENSSL_TARGET_ARCH = ppc64 -endif -ifeq ($(ARCH),powerpc64le) -OPENSSL_TARGET_ARCH = ppc64le -endif -ifeq ($(ARCH),x86_64) -OPENSSL_TARGET_ARCH = x86_64 -endif - -define HOST_OPENSSL_CONFIGURE_CMDS - (cd $(@D); \ - $(HOST_CONFIGURE_OPTS) \ - ./config \ - --prefix=$(HOST_DIR)/usr \ - --openssldir=$(HOST_DIR)/etc/ssl \ - --libdir=/lib \ - shared \ - zlib-dynamic \ - ) - $(SED) "s#-O[0-9]#$(HOST_CFLAGS)#" $(@D)/Makefile -endef - -define OPENSSL_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_CONFIGURE_OPTS) \ - ./Configure \ - linux-$(OPENSSL_TARGET_ARCH) \ - --prefix=/usr \ - --openssldir=/etc/ssl \ - --libdir=/lib \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),threads,no-threads) \ - $(if $(BR2_STATIC_LIBS),no-shared,shared) \ - no-rc5 \ - enable-camellia \ - enable-mdc2 \ - enable-tlsext \ - $(if $(BR2_STATIC_LIBS),zlib,zlib-dynamic) \ - $(if $(BR2_STATIC_LIBS),no-dso) \ - ) - $(SED) "s#-march=[-a-z0-9] ##" -e "s#-mcpu=[-a-z0-9] ##g" $(@D)/Makefile - $(SED) "s#-O[0-9]#$(OPENSSL_CFLAGS)#" $(@D)/Makefile - $(SED) "s# build_tests##" $(@D)/Makefile -endef - -# libdl is not available in a static build, and this is not implied by no-dso -ifeq ($(BR2_STATIC_LIBS),y) -define OPENSSL_FIXUP_STATIC_MAKEFILE - $(SED) 's#-ldl##g' $(@D)/Makefile -endef -OPENSSL_POST_CONFIGURE_HOOKS += OPENSSL_FIXUP_STATIC_MAKEFILE -endif - -define HOST_OPENSSL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define OPENSSL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define OPENSSL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(STAGING_DIR) install -endef - -define HOST_OPENSSL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -define OPENSSL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_PREFIX=$(TARGET_DIR) install - rm -rf $(TARGET_DIR)/usr/lib/ssl - rm -f $(TARGET_DIR)/usr/bin/c_rehash -endef - -# libdl has no business in a static build -ifeq ($(BR2_STATIC_LIBS),y) -define OPENSSL_FIXUP_STATIC_PKGCONFIG - $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libcrypto.pc - $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/libssl.pc - $(SED) 's#-ldl##' $(STAGING_DIR)/usr/lib/pkgconfig/openssl.pc -endef -OPENSSL_POST_INSTALL_STAGING_HOOKS += OPENSSL_FIXUP_STATIC_PKGCONFIG -endif - -ifneq ($(BR2_STATIC_LIBS),y) -# libraries gets installed read only, so strip fails -define OPENSSL_INSTALL_FIXUPS_SHARED - chmod +w $(TARGET_DIR)/usr/lib/engines/lib*.so - for i in $(addprefix $(TARGET_DIR)/usr/lib/,libcrypto.so.* libssl.so.*); \ - do chmod +w $$i; done -endef -OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_INSTALL_FIXUPS_SHARED -endif - -ifeq ($(BR2_PACKAGE_PERL),) -define OPENSSL_REMOVE_PERL_SCRIPTS - $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.pl,tsget} -endef -OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_PERL_SCRIPTS -endif - -ifeq ($(BR2_PACKAGE_OPENSSL_BIN),) -define OPENSSL_REMOVE_BIN - $(RM) -f $(TARGET_DIR)/usr/bin/openssl - $(RM) -f $(TARGET_DIR)/etc/ssl/misc/{CA.*,c_*} -endef -OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_BIN -endif - -ifneq ($(BR2_PACKAGE_OPENSSL_ENGINES),y) -define OPENSSL_REMOVE_OPENSSL_ENGINES - rm -rf $(TARGET_DIR)/usr/lib/engines -endef -OPENSSL_POST_INSTALL_TARGET_HOOKS += OPENSSL_REMOVE_OPENSSL_ENGINES -endif - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch b/package.bak/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch deleted file mode 100644 index aa4d0ede24..0000000000 --- a/package.bak/openswan/0001-uClibc-ng-is-compatible-to-glibc.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 0f7bf4706d2932aaa50904fc529a853c9f86478f Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Mon, 13 Feb 2017 22:18:11 +0100 -Subject: [PATCH] uClibc-ng is compatible to glibc - -Signed-off-by: Waldemar Brodkorb - -Pull-Request: https://github.com/xelerance/Openswan/pull/227 - ---- - linux/include/openswan.h | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/linux/include/openswan.h b/linux/include/openswan.h -index e2c45a130..66b9d42b2 100644 ---- a/linux/include/openswan.h -+++ b/linux/include/openswan.h -@@ -27,18 +27,6 @@ - #endif - - /* -- * When using uclibc, malloc(0) returns NULL instead of success. This is -- * to make it use the inbuilt work-around. -- * See: http://osdir.com/ml/network.freeswan.devel/2003-11/msg00009.html -- */ --#ifdef __UCLIBC__ --# if !defined(__MALLOC_GLIBC_COMPAT__) && !defined(MALLOC_GLIBC_COMPAT) --# warning Please compile uclibc with GLIBC_COMPATIBILITY defined --# endif --#endif -- -- --/* - * We've just got to have some datatypes defined... And annoyingly, just - * where we get them depends on whether we're in userland or not. - */ --- -2.11.1 - diff --git a/package.bak/openswan/Config.in b/package.bak/openswan/Config.in deleted file mode 100644 index 5db665c6f7..0000000000 --- a/package.bak/openswan/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_OPENSWAN - bool "openswan" - depends on BR2_USE_MMU # iproute2 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # iproute2 - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE - select BR2_PACKAGE_GMP - select BR2_PACKAGE_IPROUTE2 - help - Openswan is an implementation of IPsec for Linux - - http://www.openswan.org - -comment "openswan needs a uClibc or glibc toolchain w/ headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || \ - BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/openswan/openswan.hash b/package.bak/openswan/openswan.hash deleted file mode 100644 index 5929f8d190..0000000000 --- a/package.bak/openswan/openswan.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c1605c96d3c3cf357cefea7622f3acbc7a02d6a3cebfb76979327b566084a5ea openswan-2.6.46.tar.gz diff --git a/package.bak/openswan/openswan.mk b/package.bak/openswan/openswan.mk deleted file mode 100644 index 5c8e143b4c..0000000000 --- a/package.bak/openswan/openswan.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# openswan -# -################################################################################ - -OPENSWAN_VERSION = 2.6.46 -OPENSWAN_SITE = http://download.openswan.org/openswan -OPENSWAN_LICENSE = GPLv2+, BSD-3c -OPENSWAN_LICENSE_FILES = COPYING LICENSE - -OPENSWAN_DEPENDENCIES = host-bison host-flex gmp iproute2 -OPENSWAN_MAKE_OPTS = ARCH=$(BR2_ARCH) CC="$(TARGET_CC)" \ - USERCOMPILE="$(TARGET_CFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - USERLINK="$(TARGET_LDFLAGS) $(if $(BR2_TOOLCHAIN_SUPPORTS_PIE),-fPIE)" \ - INC_USRLOCAL=/usr USE_KLIPS=false USE_MAST=false USE_NM=false - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -OPENSWAN_DEPENDENCIES += libcurl -OPENSWAN_MAKE_OPTS += USE_LIBCURL=true -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENSWAN_DEPENDENCIES += openssl -OPENSWAN_MAKE_OPTS += HAVE_OPENSSL=true -ifeq ($(BR2_PACKAGE_OCF_LINUX),y) -OPENSWAN_MAKE_OPTS += HAVE_OCF=true -endif -endif - -define OPENSWAN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(OPENSWAN_MAKE_OPTS) programs -endef - -define OPENSWAN_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) \ - $(OPENSWAN_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/opentyrian-data/Config.in b/package.bak/opentyrian-data/Config.in deleted file mode 100644 index df25c218ea..0000000000 --- a/package.bak/opentyrian-data/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_OPENTYRIAN_DATA - bool "OpenTyrian data" - depends on BR2_PACKAGE_OPENTYRIAN - help - Data files to use with OpenTyrian game. Currently only the original - Tyrian 2.1 data files, that have been released as Freeware in 2004, - are compatible. - - http://code.google.com/p/opentyrian/wiki/FAQ diff --git a/package.bak/opentyrian-data/opentyrian-data.hash b/package.bak/opentyrian-data/opentyrian-data.hash deleted file mode 100644 index 9a7079c4ae..0000000000 --- a/package.bak/opentyrian-data/opentyrian-data.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277 tyrian21.zip diff --git a/package.bak/opentyrian-data/opentyrian-data.mk b/package.bak/opentyrian-data/opentyrian-data.mk deleted file mode 100644 index 4b879df1c3..0000000000 --- a/package.bak/opentyrian-data/opentyrian-data.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# opentyrian-data -# -################################################################################ - -OPENTYRIAN_DATA_VERSION = 2.1 -OPENTYRIAN_DATA_SITE = http://www.camanis.net/opentyrian -OPENTYRIAN_DATA_SOURCE = tyrian21.zip -OPENTYRIAN_DATA_LICENSE = Freeware - -define OPENTYRIAN_DATA_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(OPENTYRIAN_DATA_SOURCE) -endef - -define OPENTYRIAN_DATA_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/opentyrian/data/ - cp $(@D)/tyrian21/* $(TARGET_DIR)/usr/share/opentyrian/data/ - rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.doc - rm -f $(TARGET_DIR)/usr/share/opentyrian/data/*.exe -endef - -$(eval $(generic-package)) diff --git a/package.bak/opentyrian/Config.in b/package.bak/opentyrian/Config.in deleted file mode 100644 index b0c519fae8..0000000000 --- a/package.bak/opentyrian/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_OPENTYRIAN - bool "OpenTyrian" - select BR2_PACKAGE_SDL - select BR2_PACKAGE_OPENTYRIAN_DATA - help - OpenTyrian is a port of the DOS shoot-em-up Tyrian. It uses SDL, - making it easily cross-platform. - It requires the original data files to run. - A display with minimum 640x480 resolution and a keyboard are needed - to play the game. - If you want some sound, activate ALSA with OSS emulation. - - https://bitbucket.org/opentyrian/opentyrian/wiki/Home - -if BR2_PACKAGE_OPENTYRIAN - -config BR2_PACKAGE_OPENTYRIAN_NET - bool "network support" - default y - select BR2_PACKAGE_SDL_NET - help - Activates network support in OpenTyrian. Will add SDL_net. - -endif diff --git a/package.bak/opentyrian/opentyrian.mk b/package.bak/opentyrian/opentyrian.mk deleted file mode 100644 index 6efbe4eeb8..0000000000 --- a/package.bak/opentyrian/opentyrian.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# opentyrian -# -################################################################################ - -OPENTYRIAN_VERSION = 9c9f0ec3532b -OPENTYRIAN_SITE = https://bitbucket.org/opentyrian/opentyrian -OPENTYRIAN_SITE_METHOD = hg -OPENTYRIAN_LICENSE = GPLv2+ -OPENTYRIAN_LICENSE_FILES = COPYING - -OPENTYRIAN_DEPENDENCIES = sdl - -ifeq ($(BR2_PACKAGE_OPENTYRIAN_NET),y) -OPENTYRIAN_DEPENDENCIES += sdl_net -OPENTYRIAN_NETWORK = true -else -OPENTYRIAN_NETWORK = false -endif - -define OPENTYRIAN_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PLATFORM=UNIX \ - CC="$(TARGET_CC)" \ - STRIP="/bin/true" \ - SDL_CONFIG="$(STAGING_DIR)/usr/bin/sdl-config" \ - LDFLAGS="-lm" \ - WITH_NETWORK="$(OPENTYRIAN_NETWORK)" \ - -C $(@D) release -endef - -define OPENTYRIAN_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/opentyrian $(TARGET_DIR)/usr/bin/opentyrian -endef - -$(eval $(generic-package)) diff --git a/package.bak/openvmtools/0001-has_bsd_printf.patch b/package.bak/openvmtools/0001-has_bsd_printf.patch deleted file mode 100644 index df23f00414..0000000000 --- a/package.bak/openvmtools/0001-has_bsd_printf.patch +++ /dev/null @@ -1,26 +0,0 @@ -lib/misc/msgList.c: missing #ifdef - -This macro checks for BSD style printf(), which is not present -when compiling for uClibc. The linked functions are unnecessary in -this case, and they break compilation. - -Signed-off-by: Karoly Kasza - ---- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/msgList.c 2015-06-17 10:01:00.000000000 +0200 -+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/msgList.c 2015-06-17 10:01:00.000000000 +0200 -@@ -487,6 +487,7 @@ - return messages->id; - } - -+#ifdef HAS_BSD_PRINTF - - /* - *---------------------------------------------------------------------- -@@ -566,6 +567,7 @@ - } - } - -+#endif - - /* - *---------------------------------------------------------------------- diff --git a/package.bak/openvmtools/0002-no_cflags_werror.patch b/package.bak/openvmtools/0002-no_cflags_werror.patch deleted file mode 100644 index 1621574f81..0000000000 --- a/package.bak/openvmtools/0002-no_cflags_werror.patch +++ /dev/null @@ -1,18 +0,0 @@ -configure.ac: disable -Werror - -Disable the mandatory flag -Werror in configure.ac. - -Signed-off-by: Karoly Kasza - ---- openvmtools-stable-9.10.0.orig/open-vm-tools/configure.ac 2015-06-17 10:02:00.000000000 +0200 -+++ openvmtools-stable-9.10.0/open-vm-tools/configure.ac 2015-06-17 10:02:00.000000000 +0200 -@@ -935,7 +935,7 @@ - - ### General flags / actions - CFLAGS="$CFLAGS -Wall" --CFLAGS="$CFLAGS -Werror" -+# CFLAGS="$CFLAGS -Werror" - - # -Wno-unknown-pragmas is due to gcc not understanding '#pragma ident' - # in Xlib.h on OpenSolaris. - diff --git a/package.bak/openvmtools/0003-dont-force-cppflags.patch b/package.bak/openvmtools/0003-dont-force-cppflags.patch deleted file mode 100644 index c8fa6b17c1..0000000000 --- a/package.bak/openvmtools/0003-dont-force-cppflags.patch +++ /dev/null @@ -1,21 +0,0 @@ -m4: do not force -I/usr/include in CPPFLAGS - -This is so horribly broken for cross-compilation. :-( - -Signed-off-by: "Yann E. MORIN" - ---- openvmtools-stable-9.10.0.orig/open-vm-tools/m4/vmtools.m4 2015-06-17 10:03:00.000000000 +0200 -+++ openvmtools-stable-9.10.0/open-vm-tools/m4/vmtools.m4 2015-06-17 10:03:00.000000000 +0200 -@@ -281,10 +281,10 @@ - if test "$os" = freebsd; then - CUSTOM_$1_CPPFLAGS="-I/usr/local/include" - else -- CUSTOM_$1_CPPFLAGS="-I/usr/include" -+ CUSTOM_$1_CPPFLAGS=" " - fi - if test -n "$2"; then -- CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2" -+ : CUSTOM_$1_CPPFLAGS="${CUSTOM_$1_CPPFLAGS}/$2" - fi - fi - ]) diff --git a/package.bak/openvmtools/0004-uclibc_secure_getenv.patch b/package.bak/openvmtools/0004-uclibc_secure_getenv.patch deleted file mode 100644 index 6fb9ebd723..0000000000 --- a/package.bak/openvmtools/0004-uclibc_secure_getenv.patch +++ /dev/null @@ -1,18 +0,0 @@ -lib/misc/idLinux.c: add uClibc support - -uClibc does not have a secure_getenv function, so we use the -Android method. - -Signed-off-by: Karoly Kasza - ---- openvmtools-stable-9.10.0.orig/open-vm-tools/lib/misc/idLinux.c 2015-06-17 10:04:00.000000000 +0200 -+++ openvmtools-stable-9.10.0/open-vm-tools/lib/misc/idLinux.c 2015-06-17 10:04:00.000000000 +0200 -@@ -997,7 +997,7 @@ - static Bool - IdIsSetUGid(void) - { --#if defined(__ANDROID__) -+#if defined(__ANDROID__) || defined(__UCLIBC__) - /* Android does not have a secure_getenv, so be conservative. */ - return TRUE; - #else diff --git a/package.bak/openvmtools/Config.in b/package.bak/openvmtools/Config.in deleted file mode 100644 index 79c503cfb8..0000000000 --- a/package.bak/openvmtools/Config.in +++ /dev/null @@ -1,54 +0,0 @@ -config BR2_PACKAGE_OPENVMTOOLS - bool "openvmtools" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_USE_MMU # libglib2 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_ENABLE_LOCALE - depends on !BR2_TOOLCHAIN_USES_UCLIBC - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBDNET - help - Open Virtual Machine Tools for VMware guest OS - - http://open-vm-tools.sourceforge.net/ - - ICU locales, Xerces, and X11 tools are currently not supported. - - NOTE: Support for vmblock-fuse will be enabled in openvmtools if the - libfuse package is selected. - -if BR2_PACKAGE_OPENVMTOOLS - -config BR2_PACKAGE_OPENVMTOOLS_PROCPS - bool "procps support" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_PROCPS_NG - help - Enable support for procps / meminfo - -comment "procps support needs BR2_PACKAGE_BUSYBOX_SHOW_OTHERS" - depends on !BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - -config BR2_PACKAGE_OPENVMTOOLS_PAM - bool "PAM support" - select BR2_PACKAGE_LINUX_PAM - # linux-pam needs locale and wchar, but we already have this - # dependency on the main symbol, above. - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - help - Support for PAM in openvmtools - -comment "PAM support needs a glibc toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - -endif - -comment "openvmtools needs a glibc or musl toolchain w/ wchar, threads, RPC, locale" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HAS_NATIVE_RPC || !BR2_ENABLE_LOCALE || \ - BR2_TOOLCHAIN_USES_UCLIBC diff --git a/package.bak/openvmtools/S10vmtoolsd b/package.bak/openvmtools/S10vmtoolsd deleted file mode 100644 index 6afb9ca08a..0000000000 --- a/package.bak/openvmtools/S10vmtoolsd +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh -# -# Starts vmtoolsd for openvmtools -# - -EXEC="/usr/bin/vmtoolsd" -ARGS="-b" -PID="/var/run/vmtoolsd.pid" - -case "$1" in - start) - printf "Starting vmtoolsd: " - start-stop-daemon -S -q -x $EXEC -- $ARGS $PID - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "OK" - fi - ;; - stop) - printf "Stopping vmtoolsd: " - start-stop-daemon -K -q -p $PID - echo "OK" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/openvmtools/openvmtools.hash b/package.bak/openvmtools/openvmtools.hash deleted file mode 100644 index bf344e506b..0000000000 --- a/package.bak/openvmtools/openvmtools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ff384ab0c11e19db0fd6ddab60e8ae48a4591b141fb3a8e8f1d4e1a489dd293f openvmtools-5a9033ddfa95786d867e4d02bbb9a29bac8fb64f.tar.gz diff --git a/package.bak/openvmtools/openvmtools.mk b/package.bak/openvmtools/openvmtools.mk deleted file mode 100644 index d3eda5c0b1..0000000000 --- a/package.bak/openvmtools/openvmtools.mk +++ /dev/null @@ -1,75 +0,0 @@ -################################################################################ -# -# openvmtools -# -################################################################################ - -OPENVMTOOLS_VERSION = 5a9033ddfa95786d867e4d02bbb9a29bac8fb64f -OPENVMTOOLS_SITE = $(call github,vmware,open-vm-tools,$(OPENVMTOOLS_VERSION)) -OPENVMTOOLS_SUBDIR = open-vm-tools -OPENVMTOOLS_LICENSE = LGPLv2.1 -OPENVMTOOLS_LICENSE_FILES = $(OPENVMTOOLS_SUBDIR)/COPYING - -# Autoreconf needed or config/missing will run configure again at buildtime -OPENVMTOOLS_AUTORECONF = YES -OPENVMTOOLS_CONF_OPTS = --with-dnet \ - --without-icu --without-x --without-gtk2 \ - --without-gtkmm --without-kernel-modules \ - --disable-deploypkg --without-xerces -OPENVMTOOLS_CONF_ENV += CUSTOM_DNET_CPPFLAGS=" " -OPENVMTOOLS_DEPENDENCIES = libglib2 libdnet - -# When libfuse is available, openvmtools can build vmblock-fuse, so -# make sure that libfuse gets built first -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -OPENVMTOOLS_DEPENDENCIES += libfuse -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPENVMTOOLS_CONF_OPTS += --with-ssl -OPENVMTOOLS_DEPENDENCIES += openssl -else -OPENVMTOOLS_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PROCPS),y) -OPENVMTOOLS_CONF_OPTS += --with-procps -OPENVMTOOLS_DEPENDENCIES += procps-ng -else -OPENVMTOOLS_CONF_OPTS += --without-procps -endif - -ifeq ($(BR2_PACKAGE_OPENVMTOOLS_PAM),y) -OPENVMTOOLS_CONF_OPTS += --with-pam -OPENVMTOOLS_DEPENDENCIES += linux-pam -else -OPENVMTOOLS_CONF_OPTS += --without-pam -endif - -# symlink needed by lib/system/systemLinux.c (or will cry in /var/log/messages) -# defined in lib/misc/hostinfoPosix.c -# /sbin/shutdown needed for Guest OS restart/shutdown from hypervisor -define OPENVMTOOLS_POST_INSTALL_TARGET_THINGIES - ln -fs os-release $(TARGET_DIR)/etc/lfs-release - if [ ! -e $(TARGET_DIR)/sbin/shutdown ]; then \ - $(INSTALL) -D -m 755 package/openvmtools/shutdown \ - $(TARGET_DIR)/sbin/shutdown; \ - fi -endef - -OPENVMTOOLS_POST_INSTALL_TARGET_HOOKS += OPENVMTOOLS_POST_INSTALL_TARGET_THINGIES - -define OPENVMTOOLS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/openvmtools/S10vmtoolsd \ - $(TARGET_DIR)/etc/init.d/S10vmtoolsd -endef - -define OPENVMTOOLS_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/openvmtools/vmtoolsd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vmtoolsd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/vmtoolsd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vmtoolsd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/openvmtools/shutdown b/package.bak/openvmtools/shutdown deleted file mode 100644 index bca9765a38..0000000000 --- a/package.bak/openvmtools/shutdown +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -#compatibility script for openvmtools -if [ "$1" == "-r" ]; then -/sbin/reboot -else -/sbin/poweroff -fi diff --git a/package.bak/openvmtools/vmtoolsd.service b/package.bak/openvmtools/vmtoolsd.service deleted file mode 100644 index 17a4df44c2..0000000000 --- a/package.bak/openvmtools/vmtoolsd.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=vmtoolsd for openvmtools -After=syslog.target network.target - -[Service] -Type=forking -PIDFile=/var/run/vmtoolsd.pid -ExecStart=/usr/bin/vmtoolsd -b /var/run/vmtoolsd.pid -Restart=on-failure -KillMode=process -KillSignal=SIGKILL - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/openvpn/Config.in b/package.bak/openvpn/Config.in deleted file mode 100644 index 5fa191d97b..0000000000 --- a/package.bak/openvpn/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_OPENVPN - bool "openvpn" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - help - OpenVPN is a full-featured SSL VPN solution which can - accomodate a wide range of configurations, including road - warrior access, home/office/campus telecommuting, WiFi - security, secure branch office linking, and enterprise-scale - remote access solutions with load balancing, failover, and - fine-grained access-controls. - - http://openvpn.net/ - -if BR2_PACKAGE_OPENVPN - -config BR2_PACKAGE_OPENVPN_LZO - bool "LZO compression" - default y - select BR2_PACKAGE_LZO - help - Enable LZO compression. - -config BR2_PACKAGE_OPENVPN_SMALL - bool "Optimize for small size" - help - Make OpenVPN as small as possible. - You loose eurephia, debugging info, help messages and more. - It saves around 100 KiB in binary file size. - -endif diff --git a/package.bak/openvpn/S60openvpn b/package.bak/openvpn/S60openvpn deleted file mode 100755 index de82a5095e..0000000000 --- a/package.bak/openvpn/S60openvpn +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh -e -# -# Original version by Robert Leslie -# , edited by iwj and cs -# Modified for openvpn by Alberto Gonzalez Iniesta -# Modified for restarting / starting / stopping single tunnels by Richard Mueller - -test $DEBIAN_SCRIPT_DEBUG && set -v -x - -DAEMON=/usr/sbin/openvpn -CONFIG_DIR=/etc/openvpn -test -x $DAEMON || exit 0 -test -d $CONFIG_DIR || exit 0 - -start_vpn () { - $DAEMON --daemon --writepid /var/run/openvpn.$NAME.pid \ - --config $CONFIG_DIR/$NAME.conf --cd $CONFIG_DIR || printf " FAILED->" - printf " $NAME" -} -stop_vpn () { - kill `cat $PIDFILE` || true - rm $PIDFILE -} - -case "$1" in -start) - printf "Starting openvpn:" - - if test -z $2 ; then - for CONFIG in `cd $CONFIG_DIR; ls *.conf 2> /dev/null`; do - NAME=${CONFIG%%.conf} - start_vpn - done - else - if test -e $CONFIG_DIR/$2.conf ; then - NAME=$2 - start_vpn - else - printf " No such VPN: $2" - fi - fi - echo "." - - ;; -stop) - printf "Stopping openvpn:" - - if test -z $2 ; then - for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - stop_vpn - printf " $NAME" - done - else - if test -e /var/run/openvpn.$2.pid ; then - PIDFILE=`ls /var/run/openvpn.$2.pid 2> /dev/null` - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} - stop_vpn - printf " $NAME" - else - printf " No such VPN: $2" - fi - fi - echo "." - ;; -# We only 'reload' for running VPNs. New ones will only start with 'start' or 'restart'. -reload|force-reload) - printf "Reloading openvpn:" - for PIDFILE in `ls /var/run/openvpn.*.pid 2> /dev/null`; do - NAME=`echo $PIDFILE | cut -c18-` - NAME=${NAME%%.pid} -# If openvpn if running under a different user than root we'll need to restart - if egrep '^( |\t)*user' $CONFIG_DIR/$NAME.conf > /dev/null 2>&1 ; then - stop_vpn - sleep 1 - start_vpn - printf "(restarted)" - else - kill -HUP `cat $PIDFILE` || true -# start-stop-daemon --stop --signal HUP --quiet --oknodo \ -# --exec $DAEMON --pidfile $PIDFILE - printf " $NAME" - fi - done - echo "." - ;; - -restart) - $0 stop $2 - sleep 1 - $0 start $2 - ;; -*) - echo "Usage: $0 {start|stop|reload|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 - -# vim:set ai et sts=2 sw=2 tw=0: diff --git a/package.bak/openvpn/openvpn.hash b/package.bak/openvpn/openvpn.hash deleted file mode 100644 index 600c25073f..0000000000 --- a/package.bak/openvpn/openvpn.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6f23ba49a1dbeb658f49c7ae17d9ea979de6d92c7357de3d55cd4525e1b2f87e openvpn-2.4.0.tar.xz diff --git a/package.bak/openvpn/openvpn.mk b/package.bak/openvpn/openvpn.mk deleted file mode 100644 index 5e3df59f30..0000000000 --- a/package.bak/openvpn/openvpn.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# openvpn -# -################################################################################ - -OPENVPN_VERSION = 2.4.0 -OPENVPN_SOURCE = openvpn-$(OPENVPN_VERSION).tar.xz -OPENVPN_SITE = http://swupdate.openvpn.net/community/releases -OPENVPN_DEPENDENCIES = host-pkgconf openssl -OPENVPN_LICENSE = GPLv2 -OPENVPN_LICENSE_FILES = COPYRIGHT.GPL -OPENVPN_CONF_OPTS = \ - --disable-plugin-auth-pam \ - --enable-iproute2 \ - --with-crypto-library=openssl \ - $(if $(BR2_STATIC_LIBS),--disable-plugins) -OPENVPN_CONF_ENV = IFCONFIG=/sbin/ifconfig \ - NETSTAT=/bin/netstat \ - ROUTE=/sbin/route - -ifeq ($(BR2_PACKAGE_OPENVPN_SMALL),y) -OPENVPN_CONF_OPTS += \ - --enable-small \ - --disable-plugins \ - --disable-eurephia -endif - -# BusyBox 1.21+ places the ip applet in the "correct" place -# but previous versions didn't. -ifeq ($(BR2_PACKAGE_IPROUTE2),y) -OPENVPN_CONF_ENV += IPROUTE=/sbin/ip -else ifeq ($(BR2_BUSYBOX_VERSION_1_19_X)$(BR2_BUSYBOX_VERSION_1_20_X),y) -OPENVPN_CONF_ENV += IPROUTE=/bin/ip -else -OPENVPN_CONF_ENV += IPROUTE=/sbin/ip -endif - -ifeq ($(BR2_PACKAGE_OPENVPN_LZO),y) -OPENVPN_DEPENDENCIES += lzo -else -OPENVPN_CONF_OPTS += --disable-lzo -endif - -define OPENVPN_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 $(@D)/src/openvpn/openvpn \ - $(TARGET_DIR)/usr/sbin/openvpn -endef - -define OPENVPN_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/openvpn/S60openvpn \ - $(TARGET_DIR)/etc/init.d/S60openvpn -endef - -$(eval $(autotools-package)) diff --git a/package.bak/openzwave/0001-Fix-warning-on-wcsdup-implicit-declaration.patch b/package.bak/openzwave/0001-Fix-warning-on-wcsdup-implicit-declaration.patch deleted file mode 100644 index 1fe30e41d8..0000000000 --- a/package.bak/openzwave/0001-Fix-warning-on-wcsdup-implicit-declaration.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 0878d933223158343af3fe13e03bcd128e8b4cbc Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Fri, 22 Apr 2016 17:06:27 +0200 -Subject: [PATCH 1/1] Fix warning on wcsdup implicit declaration - -Define __GNU_SOURCE in cpp/hidapi/linux/hid.c (like already done in -cpp/hidapi/libusb/hid.c) to fix implicit declaration of wcsdup function - -Signed-off-by: Fabrice Fontaine ---- - cpp/hidapi/linux/hid.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/cpp/hidapi/linux/hid.c b/cpp/hidapi/linux/hid.c -index dbf9b9b..c3eb22b 100644 ---- a/cpp/hidapi/linux/hid.c -+++ b/cpp/hidapi/linux/hid.c -@@ -21,6 +21,8 @@ - http://github.com/signal11/hidapi . - ********************************************************/ - -+#define _GNU_SOURCE /* needed for wcsdup() before glibc 2.10 */ -+ - /* C */ - #include - #include --- -1.9.1 - diff --git a/package.bak/openzwave/0002-Ensure-correct-git-repository-path.patch b/package.bak/openzwave/0002-Ensure-correct-git-repository-path.patch deleted file mode 100644 index 6c40ec9d0f..0000000000 --- a/package.bak/openzwave/0002-Ensure-correct-git-repository-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 89cdc83307f61422db21cc7965ea294862c128bf Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Mon, 30 May 2016 10:37:42 +0200 -Subject: [PATCH 2/2] Ensure correct git repository path - -Add "--git-dir ./.git" to ensure the correct git repository path is used (this -fix a bug when trying to add openzwave to buildroot build system) - -Signed-off-by: Fabrice Fontaine ---- - cpp/build/support.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpp/build/support.mk b/cpp/build/support.mk -index 3f74c7e..f529b25 100644 ---- a/cpp/build/support.mk -+++ b/cpp/build/support.mk -@@ -29,7 +29,7 @@ GIT := $(shell which git) - ifeq ($(GIT),) - VERSION_REV ?= 0 - else --GITVERSION := $(shell $(GIT) describe --long --tags --dirty 2>/dev/null | sed s/^v//) -+GITVERSION := $(shell $(GIT) --git-dir ./.git describe --long --tags --dirty 2>/dev/null | sed s/^v//) - ifeq ($(GITVERSION),) - GITVERSION := $(VERSION_MAJ).$(VERSION_MIN).-1 - VERSION_REV := 0 --- -2.7.4 - diff --git a/package.bak/openzwave/Config.in b/package.bak/openzwave/Config.in deleted file mode 100644 index 190b88b656..0000000000 --- a/package.bak/openzwave/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_OPENZWAVE - bool "openzwave" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_USE_WCHAR - help - Free software library that interfaces with selected Z-Wave PC - controllers, allowing anyone to create applications that manipulate - and respond to devices on a Z-Wave network, without requiring - in-depth knowledge of the Z-Wave protocol - - http://www.openzwave.net - -comment "openzwave needs udev and a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_PACKAGE_HAS_UDEV || !BR2_USE_WCHAR diff --git a/package.bak/openzwave/openzwave.hash b/package.bak/openzwave/openzwave.hash deleted file mode 100644 index d07961edb6..0000000000 --- a/package.bak/openzwave/openzwave.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 abfb4c7e7728e86ba374c2e0ef7de912594eb24a8c44935457352df844530238 openzwave-V1.5.tar.gz -sha256 98851964fd8de3dd40f00d0032b47c61c17a4cf789ad5792e14149da5ab8755e 599e2a11c6f48dde744012ec45686c08e15f3059.patch diff --git a/package.bak/openzwave/openzwave.mk b/package.bak/openzwave/openzwave.mk deleted file mode 100644 index 199d9e1bd0..0000000000 --- a/package.bak/openzwave/openzwave.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# openzwave -# -################################################################################ - -OPENZWAVE_VERSION = V1.5 -OPENZWAVE_SITE = $(call github,OpenZWave,open-zwave,$(OPENZWAVE_VERSION)) -OPENZWAVE_LICENSE = LGPLv3+, GPLv3 (examples), Apache-2.0 (sh2ju.sh) -OPENZWAVE_LICENSE_FILES = license/license.txt license/lgpl.txt \ - license/gpl.txt license/Apache-License-2.0.txt - -OPENZWAVE_DEPENDENCIES = host-pkgconf udev -OPENZWAVE_INSTALL_STAGING = YES - -# This patch fixes incorrect default value of LIBDIR: -# http://autobuild.buildroot.net/results/68719fdf1320a69310bada6d3c47654dacdb5898 -# This patch is currently in dev branch and will be a part of v1.6 -OPENZWAVE_PATCH = \ - https://github.com/OpenZWave/open-zwave/commit/599e2a11c6f48dde744012ec45686c08e15f3059.patch - -# Set instlibdir to install libopenzwave.so* in the correct directory -# otherwise openzwave will check that /lib64 exists (on the host) to -# know if the library should be installed in $(PREFIX)/lib or $(PREFIX)/lib64. -# Set pkgconfigdir to /lib/pkgconfig to install libopenzwave.pc in the -# correct directory otherwise openzwave will call -# "pkg-config --variable pc_path pkg-config" which returns an incorrect value. -# Set sysconfdir to /etc/openzwave to install openzwave configuration files in -# the correct directory otherwise openzwave will install configuration files in -# $(PREFIX)/etc/openzwave. -# Disable doxygen documentation. -OPENZWAVE_MAKE_OPTS = \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - PREFIX=/usr \ - instlibdir=/usr/lib \ - pkgconfigdir=/usr/lib/pkgconfig \ - sysconfdir=/etc/openzwave \ - DOXYGEN= - -define OPENZWAVE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENZWAVE_MAKE_OPTS) -C $(@D) -endef - -define OPENZWAVE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENZWAVE_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(STAGING_DIR) install -endef - -# Delete unneeded ozw_config binary from target directory as this is an utility -# application used to get the openzwave build configuration. -define OPENZWAVE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(OPENZWAVE_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install - rm -f $(TARGET_DIR)/usr/bin/ozw_config -endef - -$(eval $(generic-package)) diff --git a/package.bak/opkg-utils/Config.in.host b/package.bak/opkg-utils/Config.in.host deleted file mode 100644 index 1c9c474a9d..0000000000 --- a/package.bak/opkg-utils/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_OPKG_UTILS - bool "host opkg-utils" - help - Helper scripts for use with the opkg package manager. - - https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/ diff --git a/package.bak/opkg-utils/opkg-utils.hash b/package.bak/opkg-utils/opkg-utils.hash deleted file mode 100644 index 332823f2cb..0000000000 --- a/package.bak/opkg-utils/opkg-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c14284d999cdd18fee4c6b22720f38beee962b2c8e099166d8d55d76a2111beb opkg-utils-0.3.4.tar.gz diff --git a/package.bak/opkg-utils/opkg-utils.mk b/package.bak/opkg-utils/opkg-utils.mk deleted file mode 100644 index aa3c44d94d..0000000000 --- a/package.bak/opkg-utils/opkg-utils.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# opkg-utils -# -################################################################################ - -OPKG_UTILS_VERSION = 0.3.4 -OPKG_UTILS_SITE = http://git.yoctoproject.org/git/opkg-utils -OPKG_UTILS_SITE_METHOD = git -OPKG_UTILS_LICENSE = GPLv2+ -OPKG_UTILS_LICENSE_FILES = COPYING - -define HOST_OPKG_UTILS_BUILD_CMDS - $(MAKE) -C $(@D) $(HOST_CONFIGURE_OPTS) -endef - -define HOST_OPKG_UTILS_INSTALL_CMDS - $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR) PREFIX=/usr install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/opkg/Config.in b/package.bak/opkg/Config.in deleted file mode 100644 index 5a4bbc2654..0000000000 --- a/package.bak/opkg/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -comment "opkg needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_OPKG - bool "opkg" - select BR2_PACKAGE_LIBARCHIVE - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # libarchive - help - Opkg is a lightweight package management system, based on ipkg. It is - written in C and resembles apt/dpkg in operation. It is intended for - use on embedded Linux devices. - Opkg is maintained, stable, robust and conservative in its memory - usage, despite its buggy ipkg ancestry. As best it can, opkg - maintains backwards compatibility with ipkg and conforms to a subset - of debian's policy manual regarding control files. - - http://code.google.com/p/opkg/ - -if BR2_PACKAGE_OPKG - -config BR2_PACKAGE_OPKG_GPG_SIGN - bool "gnupg support" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgpg-error - select BR2_PACKAGE_LIBGPGME - select BR2_PACKAGE_LIBGPG_ERROR - help - Enable opkg package signature checking support using - gnupg/libgpgme. - -endif diff --git a/package.bak/opkg/opkg.mk b/package.bak/opkg/opkg.mk deleted file mode 100644 index bf19a60fbf..0000000000 --- a/package.bak/opkg/opkg.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# opkg -# -################################################################################ - -OPKG_VERSION = v0.3.1 -OPKG_SITE = http://git.yoctoproject.org/git/opkg -OPKG_SITE_METHOD = git -# Uses PKG_CHECK_MODULES() in configure.ac -OPKG_DEPENDENCIES = host-pkgconf libarchive -OPKG_LICENSE = GPLv2+ -OPKG_LICENSE_FILES = COPYING -OPKG_INSTALL_STAGING = YES -OPKG_CONF_OPTS = --disable-curl -OPKG_AUTORECONF = YES - -# Ensure directory for lockfile exists -define OPKG_CREATE_LOCKDIR - mkdir -p $(TARGET_DIR)/usr/lib/opkg -endef - -ifeq ($(BR2_PACKAGE_OPKG_GPG_SIGN),y) -OPKG_CONF_OPTS += --enable-gpg -OPKG_CONF_ENV += \ - ac_cv_path_GPGME_CONFIG=$(STAGING_DIR)/usr/bin/gpgme-config \ - ac_cv_path_GPGERR_CONFIG=$(STAGING_DIR)/usr/bin/gpg-error-config -OPKG_DEPENDENCIES += libgpgme libgpg-error -else -OPKG_CONF_OPTS += --disable-gpg -endif - -OPKG_POST_INSTALL_TARGET_HOOKS += OPKG_CREATE_LOCKDIR - -$(eval $(autotools-package)) diff --git a/package.bak/oprofile/0001-musl.patch b/package.bak/oprofile/0001-musl.patch deleted file mode 100644 index 094cd1647a..0000000000 --- a/package.bak/oprofile/0001-musl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Remove non-Posix use of FTW_ACTIONRETVAL - -The musl implementation of nftw doesn't support the glibc extension -FTW_ACTIONRETVAL. Since none of the features of FTW_ACTIONRETVAL are -used here, just use the normal nftw return value. - -Downloaded from: -https://github.com/openwrt-mirror/openwrt/blob/f22d5e25660106a48727c7aa5d1a73e4171a7987/package/devel/oprofile/patches/100-musl.patch -after I found a hint for the patch here: -http://patchwork.openembedded.org/patch/112675/ - -Removed unneeded patch for libop/op_events.c. - -Because openwrt removed the oprofile package from their repo last week -https://github.com/openwrt-mirror/openwrt/commit/aaf46a8524e138e1673a398e8d2dd9357405b313#diff-fe14456f94abf436d997e2c01c10f3bd -I decided to put this patch into the buildroot repo instead of adding -_PATCH to oprofile.mk - -Signed-off-by: Bernd Kuhls - ---- a/pe_profiling/operf.cpp -+++ b/pe_profiling/operf.cpp -@@ -857,11 +857,14 @@ static int __delete_old_previous_sample_ - int tflag __attribute__((unused)), - struct FTW *ftwbuf __attribute__((unused))) - { -+ int err; -+ - if (remove(fpath)) { -+ err = errno; - perror("sample data removal error"); -- return FTW_STOP; -+ return err; - } else { -- return FTW_CONTINUE; -+ return 0; - } - } - -@@ -896,7 +899,7 @@ static void convert_sample_data(void) - return; - - if (!operf_options::append) { -- int flags = FTW_DEPTH | FTW_ACTIONRETVAL; -+ int flags = FTW_DEPTH; - errno = 0; - if (nftw(previous_sampledir.c_str(), __delete_old_previous_sample_data, 32, flags) !=0 && - errno != ENOENT) { diff --git a/package.bak/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch b/package.bak/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch deleted file mode 100644 index 34bf365226..0000000000 --- a/package.bak/oprofile/0002-Fix-FTBFS-problem-with-GCC-6.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 39d4d46a0bd504ac708ffe72df87bf74cd12ad30 Mon Sep 17 00:00:00 2001 -From: William Cohen -Date: Fri, 5 Feb 2016 17:30:19 -0500 -Subject: [PATCH] Fix FTBFS problem with GCC-6 - -GCC-6 is pickier about some of the type conversions causing the Fedora -24 mass rebuild the build of oprofile failed with: - -make[3]: Entering directory '/builddir/build/BUILD/oprofile-1.1.0/libutil++' -g++ -DHAVE_CONFIG_H -I. -I.. -I ../libutil -I ../libop -I ../libpp -W -Wall -fno-common -ftemplate-depth-50 -O2 -g -pipe -Wall -Werror=format-security -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong --param=ssp-buffer-size=4 -grecord-gcc-switches -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1 -m32 -march=i686 -mtune=atom -fasynchronous-unwind-tables -c -o op_bfd.o op_bfd.cpp -op_bfd.cpp: In member function 'void op_bfd::get_symbol_range(symbol_index_t, long long unsigned int&, long long unsigned int&) const': -op_bfd.cpp:538:47: error: cannot convert 'std::ostream {aka std::basic_ostream}' to 'const bool' in initialization - bool const verbose = cverb << (vbfd & vlevel1); - ^ -op_bfd.cpp:546:7: error: in argument to unary ! - if (!verbose) - ^~~~~~~ - -Avoid the intermediate bool type to make GCC-6 happy. - -Signed-off-by: William Cohen -[Backported from upstream] -Signed-off-by: Romain Naour ---- - libutil++/op_bfd.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/libutil++/op_bfd.cpp b/libutil++/op_bfd.cpp -index 389c920..f2eb42b 100644 ---- a/libutil++/op_bfd.cpp -+++ b/libutil++/op_bfd.cpp -@@ -535,15 +535,13 @@ void op_bfd::get_symbol_range(symbol_index_t sym_idx, - { - op_bfd_symbol const & sym = syms[sym_idx]; - -- bool const verbose = cverb << (vbfd & vlevel1); -- - if (anon_obj) - start = sym.vma(); - else - start = sym.filepos(); - end = start + sym.size(); - -- if (!verbose) -+ if (!(cverb << (vbfd & vlevel1))) - return; - - io_state state(cverb << (vbfd & vlevel1)); --- -2.5.5 - diff --git a/package.bak/oprofile/Config.in b/package.bak/oprofile/Config.in deleted file mode 100644 index e2adde5802..0000000000 --- a/package.bak/oprofile/Config.in +++ /dev/null @@ -1,49 +0,0 @@ -# memory barrier function implemented only for some architectures -config BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS - bool - default y - depends on BR2_arceb || BR2_arcle || BR2_arm || BR2_armeb || \ - BR2_aarch64 || BR2_aarch64_be || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ - BR2_sparc || BR2_sparc64 || BR2_x86_64 - -config BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 - bool - default y if BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - -config BR2_PACKAGE_OPROFILE - bool "oprofile" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_POPT - select BR2_PACKAGE_BINUTILS - select BR2_PACKAGE_LIBPFM4 if BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # binutils - depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS - # libpfm4 is needed on PowerPC, and requires thread support - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL || !BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 - help - OProfile is a system-wide profiler for Linux systems, - capable of profiling all running code at low overhead. - OProfile is released under the GNU GPL. - - It consists of a kernel driver and a daemon for collecting - sample data, and several post-profiling tools for turning - data into information. - - OProfile leverages the hardware performance counters of the - CPU to enable profiling of a wide variety of interesting - statistics, which can also be used for basic time-spent - profiling. All code is profiled: hardware and software - interrupt handlers, kernel modules, the kernel, shared - libraries, and applications. - -comment "oprofile needs a toolchain w/ C++, wchar" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_OPROFILE_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -comment "oprofile needs a toolchain w/ NPTL on PowerPC(64)" - depends on BR2_USE_MMU && BR2_PACKAGE_OPROFILE_NEEDS_LIBPFM4 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/oprofile/oprofile.hash b/package.bak/oprofile/oprofile.hash deleted file mode 100644 index cc15ed1100..0000000000 --- a/package.bak/oprofile/oprofile.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/oprofile/files/oprofile/oprofile-1.1.0/ -sha1 38c0d8812fe605f6ddd1cd183a482aa7605c0e81 oprofile-1.1.0.tar.gz -md5 248c4c069f9476f427fa7195563f9867 oprofile-1.1.0.tar.gz diff --git a/package.bak/oprofile/oprofile.mk b/package.bak/oprofile/oprofile.mk deleted file mode 100644 index f6c0f130e9..0000000000 --- a/package.bak/oprofile/oprofile.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# oprofile -# -################################################################################ - -OPROFILE_VERSION = 1.1.0 -OPROFILE_SITE = http://downloads.sourceforge.net/project/oprofile/oprofile/oprofile-$(OPROFILE_VERSION) -OPROFILE_LICENSE = GPLv2+ -OPROFILE_LICENSE_FILES = COPYING -OPROFILE_CONF_OPTS = \ - --disable-account-check \ - --enable-gui=no \ - --with-kernel=$(STAGING_DIR)/usr - -OPROFILE_BINARIES = \ - utils/ophelp pp/opannotate pp/oparchive pp/opgprof \ - pp/opreport opjitconv/opjitconv \ - utils/op-check-perfevents libabi/opimport \ - pe_counting/ocount pe_profiling/operf - -ifeq ($(BR2_i386),y) -OPROFILE_ARCH = i386 -endif -ifeq ($(BR2_mipsel),y) -OPROFILE_ARCH = mips -endif -ifeq ($(BR2_powerpc),y) -OPROFILE_ARCH = ppc -endif -ifeq ($(BR2_x86_64),y) -OPROFILE_ARCH = x86-64 -endif -ifeq ($(OPROFILE_ARCH),) -OPROFILE_ARCH = $(BR2_ARCH) -endif - -OPROFILE_DEPENDENCIES = popt binutils host-pkgconf - -ifeq ($(BR2_PACKAGE_LIBPFM4),y) -OPROFILE_DEPENDENCIES += libpfm4 -endif - -# When gettext is enabled, popt links with -lintl, specifies it in its -# popt.pc and has done so for the past 6+ years. But oprofile does not -# use pkconfig to find popt, so misses -lintl, which is important for -# a static build. We have to do the call to pkgconfig manually... -OPROFILE_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs popt`" - -ifeq ($(BR2_STATIC_LIBS),) -define OPROFILE_INSTALL_SHARED_LIBRARY - $(INSTALL) -m 755 $(@D)/libopagent/.libs/*.so* $(TARGET_DIR)/usr/lib/oprofile -endef -endif - -define OPROFILE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/bin - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -d -m 755 $(TARGET_DIR)/usr/lib/oprofile - if [ -d $(@D)/events/$(OPROFILE_ARCH) ]; then \ - cp -dpfr $(@D)/events/$(OPROFILE_ARCH) \ - $(TARGET_DIR)/usr/share/oprofile; \ - fi - $(INSTALL) -m 644 $(@D)/libregex/stl.pat $(TARGET_DIR)/usr/share/oprofile - $(INSTALL) -m 755 $(addprefix $(@D)/, $(OPROFILE_BINARIES)) $(TARGET_DIR)/usr/bin - $(OPROFILE_INSTALL_SHARED_LIBRARY) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/opus-tools/Config.in b/package.bak/opus-tools/Config.in deleted file mode 100644 index 2552d19515..0000000000 --- a/package.bak/opus-tools/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_OPUS_TOOLS - bool "opus-tools" - select BR2_PACKAGE_OPUS - select BR2_PACKAGE_LIBOGG - help - Opus codec command line tools. This package provides the - reference implementations of encoder and decoder utilities - for libopus. - - http://opus-codec.org diff --git a/package.bak/opus-tools/opus-tools.hash b/package.bak/opus-tools/opus-tools.hash deleted file mode 100644 index 486384c31d..0000000000 --- a/package.bak/opus-tools/opus-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 b1873dd78c7fbc98cf65d6e10cfddb5c2c03b3af93f922139a2104baedb4643a opus-tools-0.1.9.tar.gz diff --git a/package.bak/opus-tools/opus-tools.mk b/package.bak/opus-tools/opus-tools.mk deleted file mode 100644 index de1b4399e3..0000000000 --- a/package.bak/opus-tools/opus-tools.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# opus-tools -# -################################################################################ - -OPUS_TOOLS_VERSION = 0.1.9 -OPUS_TOOLS_SITE = http://downloads.xiph.org/releases/opus -OPUS_TOOLS_LICENSE = BSD-2c -OPUS_TOOLS_LICENSE_FILES = COPYING -OPUS_TOOLS_CONF_OPTS = --disable-oggtest --disable-opustest -OPUS_TOOLS_DEPENDENCIES = opus libogg host-pkgconf - -ifeq ($(BR2_PACKAGE_LIBPCAP),y) -OPUS_TOOLS_DEPENDENCIES += libpcap -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -OPUS_TOOLS_CONF_OPTS += --enable-sse -else -OPUS_TOOLS_CONF_OPTS += --disable-sse -endif - -ifeq ($(BR2_PACKAGE_FLAC),y) -OPUS_TOOLS_DEPENDENCIES += flac -else -OPUS_TOOLS_CONF_OPTS += --without-flac -endif - -$(eval $(autotools-package)) diff --git a/package.bak/opus/Config.in b/package.bak/opus/Config.in deleted file mode 100644 index 22e7a5534b..0000000000 --- a/package.bak/opus/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_OPUS - bool "opus" - help - The Opus codec is designed for interactive speech and audio - transmission over the Internet. It is designed by the IETF - Codec Working Group and incorporates technology from Skype's - SILK codec and Xiph.Org's CELT codec. - - It is intended to suit a wide range of interactive audio - applications, including Voice over IP, videoconferencing, - in-game chat, and even remote live music performances. It - can scale from low bit-rate narrowband speech to very high - quality stereo music. - - http://opus-codec.org - -if BR2_PACKAGE_OPUS - -config BR2_PACKAGE_OPUS_FIXED_POINT - bool "use fixed-point" if !BR2_SOFT_FLOAT - default y if BR2_SOFT_FLOAT - help - Compile without floating point operations (for machines - without a fast enough FPU). - -endif diff --git a/package.bak/opus/opus.hash b/package.bak/opus/opus.hash deleted file mode 100644 index 7349ec4b75..0000000000 --- a/package.bak/opus/opus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 9122b6b380081dd2665189f97bfd777f04f92dc3ab6698eea1dbb27ad59d8692 opus-1.1.4.tar.gz diff --git a/package.bak/opus/opus.mk b/package.bak/opus/opus.mk deleted file mode 100644 index 020be88b66..0000000000 --- a/package.bak/opus/opus.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# opus -# -################################################################################ - -OPUS_VERSION = 1.1.4 -OPUS_SITE = http://downloads.xiph.org/releases/opus -OPUS_LICENSE = BSD-3c -OPUS_LICENSE_FILES = COPYING -OPUS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) -OPUS_CONF_OPTS += --enable-fixed-point -endif - -# When we're on ARM, but we don't have ARM instructions (only -# Thumb-2), disable the usage of assembly as it is not Thumb-ready. -ifeq ($(BR2_arm)$(BR2_armeb):$(BR2_ARM_CPU_HAS_ARM),y:) -OPUS_CONF_OPTS += --disable-asm -endif - -$(eval $(autotools-package)) diff --git a/package.bak/opusfile/Config.in b/package.bak/opusfile/Config.in deleted file mode 100644 index fe8a1b9ce1..0000000000 --- a/package.bak/opusfile/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_OPUSFILE - bool "opusfile" - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_OPUS - help - A convenient high-level API for decoding and basic manipulation - of all Ogg Opus audio streams. - - http://opus-codec.org diff --git a/package.bak/opusfile/opusfile.hash b/package.bak/opusfile/opusfile.hash deleted file mode 100644 index 541a21fe54..0000000000 --- a/package.bak/opusfile/opusfile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/opus/SHA256SUMS.txt -sha256 2c231ed3cfaa1b3173f52d740e5bbd77d51b9dfecb87014b404917fba4b855a4 opusfile-0.8.tar.gz diff --git a/package.bak/opusfile/opusfile.mk b/package.bak/opusfile/opusfile.mk deleted file mode 100644 index 4c3fb35553..0000000000 --- a/package.bak/opusfile/opusfile.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# opusfile -# -################################################################################ - -OPUSFILE_VERSION = 0.8 -OPUSFILE_SITE = http://downloads.xiph.org/releases/opus -OPUSFILE_DEPENDENCIES = host-pkgconf libogg opus -OPUSFILE_LICENSE = BSD-3c -OPUSFILE_LICENSE_FILES = COPYING -OPUSFILE_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -OPUSFILE_DEPENDENCIES += openssl -else -OPUSFILE_CONF_OPTS += --disable-http -endif - -# Use the same as opus package since it's a dep and we can't mix -ifeq ($(BR2_PACKAGE_OPUS_FIXED_POINT),y) -OPUSFILE_CONF_OPTS += --enable-fixed-point -endif - -$(eval $(autotools-package)) diff --git a/package.bak/oracle-mysql/0000-ac_cache_check.patch b/package.bak/oracle-mysql/0000-ac_cache_check.patch deleted file mode 100644 index c3b55ba8d3..0000000000 --- a/package.bak/oracle-mysql/0000-ac_cache_check.patch +++ /dev/null @@ -1,156 +0,0 @@ -Patch borrowed from -http://code.google.com/p/minimyth/source/browse/trunk/gar-minimyth/script/db/mysql/files/mysql-5.1.47-ac_cache_check.patch?r=6493. - -It allows to override through ac_cv_* variables various checks that -cannot be performed when cross-compiling. - -Signed-off-by: Thomas Petazzoni - ---- - storage/innodb_plugin/plug.in | 59 ++++++++++++++++++++++++++++-------------- - 1 file changed, 40 insertions(+), 19 deletions(-) - -Index: mysql-5.1.53/storage/innodb_plugin/plug.in -=================================================================== ---- mysql-5.1.53.orig/storage/innodb_plugin/plug.in -+++ mysql-5.1.53/storage/innodb_plugin/plug.in -@@ -53,9 +53,10 @@ - esac - AC_SUBST(INNODB_DYNAMIC_CFLAGS) - -- AC_MSG_CHECKING(whether GCC atomic builtins are available) -+ AC_CACHE_CHECK([whether GCC atomic builtins are available], -+ [ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS], - # either define HAVE_IB_GCC_ATOMIC_BUILTINS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() - { -@@ -95,18 +96,23 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -- [GCC atomic builtins are available]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_GCC_ATOMIC_BUILTINS], [1], -+ [GCC atomic builtins are available]) -+ fi - -- AC_MSG_CHECKING(whether pthread_t can be used by GCC atomic builtins) -+ AC_CACHE_CHECK([whether pthread_t can be used by GCC atomic builtins], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC], - # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -126,14 +132,18 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -- [pthread_t can be used by GCC atomic builtins]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_GCC], [1], -+ [pthread_t can be used by GCC atomic builtins]) -+ fi - - AC_MSG_CHECKING(whether Solaris libc atomic functions are available) - # either define HAVE_IB_SOLARIS_ATOMICS or not -@@ -148,9 +158,10 @@ - are available]) - ) - -- AC_MSG_CHECKING(whether pthread_t can be used by Solaris libc atomic functions) -+ AC_CACHE_CHECK([whether pthread_t can be used by Solaris libc atomic functions], -+ [ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], - # either define HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS or not -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - #include - #include -@@ -181,28 +192,33 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -- [pthread_t can be used by solaris atomics]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS], [1], -+ [pthread_t can be used by solaris atomics]) -+ fi - - # this is needed to know which one of atomic_cas_32() or atomic_cas_64() - # to use in the source - AC_CHECK_SIZEOF([pthread_t], [], [#include ]) - - # Check for x86 PAUSE instruction -- AC_MSG_CHECKING(for x86 PAUSE instruction) -+ AC_CACHE_CHECK([for x86 PAUSE instruction], -+ [ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION], - # We have to actually try running the test program, because of a bug - # in Solaris on x86_64, where it wrongly reports that PAUSE is not - # supported when trying to run an application. See - # http://bugs.opensolaris.org/bugdatabase/printableBug.do?bug_id=6478684 - # We use ib_ prefix to avoid collisoins if this code is added to - # mysql's configure.in. -- AC_TRY_RUN( -+ [AC_TRY_RUN( - [ - int main() { - __asm__ __volatile__ ("pause"); -@@ -210,16 +226,21 @@ - } - ], - [ -- AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) - AC_MSG_RESULT(yes) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=yes - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ], - [ - AC_MSG_RESULT(no) -+ ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION=no - ] -- ) -+ )]) -+ if test "x$ac_cv_have_decl_HAVE_IB_PAUSE_INSTRUCTION"= "xyes" ; then -+ AC_DEFINE([HAVE_IB_PAUSE_INSTRUCTION], [1], [Does x86 PAUSE instruction exist]) -+ fi - ]) - - # vim: set ft=config: diff --git a/package.bak/oracle-mysql/0001-configure-ps-cache-check.patch b/package.bak/oracle-mysql/0001-configure-ps-cache-check.patch deleted file mode 100644 index 336e80e0b7..0000000000 --- a/package.bak/oracle-mysql/0001-configure-ps-cache-check.patch +++ /dev/null @@ -1,39 +0,0 @@ -Patch borrowed from -http://cgit.openembedded.org/cgit.cgi/openembedded/tree/recipes/mysql/files/configure-ps-cache-check.patch - -It allows to specify through ac_cv_FIND_PROC how ps should be used on -the target to find the PID of a program. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -462,8 +462,8 @@ - # then Make, then shell. The autoconf substitution uses single quotes, so - # no unprotected single quotes should appear in the expression. - AC_PATH_PROG(PS, ps, ps) --AC_MSG_CHECKING("how to check if pid exists") --PS=$ac_cv_path_PS -+AC_CACHE_CHECK([how to check if pid exists], [ac_cv_FIND_PROC], -+[ - # Linux style - if $PS wwwp $$ 2> /dev/null | grep -- "$0" > /dev/null - then -@@ -502,8 +502,9 @@ - AC_MSG_ERROR([Could not find the right ps and/or grep switches. Which OS is this? See the Installation chapter in the Reference Manual.]) - esac - fi --AC_SUBST(FIND_PROC) --AC_MSG_RESULT("$FIND_PROC") -+ac_cv_FIND_PROC="$FIND_PROC" -+]) -+AC_SUBST([FIND_PROC], [$ac_cv_FIND_PROC]) - - # Check if a pid is valid - AC_PATH_PROG(KILL, kill, kill) diff --git a/package.bak/oracle-mysql/0002-use-new-readline-iface.patch b/package.bak/oracle-mysql/0002-use-new-readline-iface.patch deleted file mode 100644 index c5906563ce..0000000000 --- a/package.bak/oracle-mysql/0002-use-new-readline-iface.patch +++ /dev/null @@ -1,21 +0,0 @@ -Tell MySQL to use the new readline interface even when an external -readline is being used. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -Index: mysql-5.1.53/configure.in -=================================================================== ---- mysql-5.1.53.orig/configure.in -+++ mysql-5.1.53/configure.in -@@ -2689,6 +2689,7 @@ - # this way we avoid linking commercial source with GPL readline - readline_link="-lreadline" - want_to_use_readline="yes" -+ AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE, 1) - elif [test "$mysql_cv_libedit_interface" = "yes"] - then - # Use libedit diff --git a/package.bak/oracle-mysql/0003-ac_stack_direction-is-unset.patch b/package.bak/oracle-mysql/0003-ac_stack_direction-is-unset.patch deleted file mode 100644 index 6fef0a9acf..0000000000 --- a/package.bak/oracle-mysql/0003-ac_stack_direction-is-unset.patch +++ /dev/null @@ -1,15 +0,0 @@ -misc.m4: ac_cv_c_stack_direction is unset. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70.orig/config/ac-macros/misc.m4 -+++ mysql-5.1.70/config/ac-macros/misc.m4 -@@ -477,7 +477,7 @@ - exit(ptr_f(&a) < 0); - } - ], ac_cv_c_stack_direction=1, ac_cv_c_stack_direction=-1, -- ac_cv_c_stack_direction=)]) -+ ac_cv_c_stack_direction=0)]) - AC_DEFINE_UNQUOTED(STACK_DIRECTION, $ac_cv_c_stack_direction) - ])dnl - diff --git a/package.bak/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch b/package.bak/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch deleted file mode 100644 index b91ed4fef9..0000000000 --- a/package.bak/oracle-mysql/0004-Fix-gen_lex_hash-execution.patch +++ /dev/null @@ -1,32 +0,0 @@ -Makefile: fix cross-compiling the server - -MySQL Makefile believes it can run code it just compiled, to -generate a header. This does not work for cross-compilation. - -Instead, use a pre-installed host-version of the required tool. - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) - ---- mysql-5.1.70/sql/Makefile.am -+++ mysql-5.1.70.patch/sql/Makefile.am -@@ -177,7 +177,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # For testing of udf_example.so - ---- mysql-5.1.70/sql/Makefile.in -+++ mysql-5.1.70.patch/sql/Makefile.in -@@ -1310,7 +1310,7 @@ - # this avoid the rebuild of the built files in a source dist - lex_hash.h: gen_lex_hash.cc lex.h - $(MAKE) $(AM_MAKEFLAGS) gen_lex_hash$(EXEEXT) -- ./gen_lex_hash$(EXEEXT) > $@-t -+ gen_lex_hash$(EXEEXT) > $@-t - $(MV) $@-t $@ - - # We might have some stuff not built in this build, but that we want to install diff --git a/package.bak/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch b/package.bak/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch deleted file mode 100644 index 918fe2456a..0000000000 --- a/package.bak/oracle-mysql/0005-bison_3_breaks_mysql_server_build.patch +++ /dev/null @@ -1,3310 +0,0 @@ -fix the yacc code in mysql - -Signed-off-by: Marcelo Gutierrez (UTN/FRH) ---- -diff -uNr mysql-5.1.73.orig/sql/sql_lex.cc mysql-5.1.73/sql/sql_lex.cc ---- mysql-5.1.73.orig/sql/sql_lex.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.cc 2014-02-12 14:12:04.244111625 +0000 -@@ -775,14 +775,13 @@ - (which can't be followed by a signed number) - */ - --int MYSQLlex(void *arg, void *yythd) -+int MYSQLlex(void *arg, THD *thd) - { - reg1 uchar c= 0; - bool comment_closed; - int tokval, result_state; - uint length; - enum my_lex_states state; -- THD *thd= (THD *)yythd; - Lex_input_stream *lip= & thd->m_parser_state->m_lip; - LEX *lex= thd->lex; - YYSTYPE *yylval=(YYSTYPE*) arg; -diff -uNr mysql-5.1.73.orig/sql/sql_lex.h mysql-5.1.73/sql/sql_lex.h ---- mysql-5.1.73.orig/sql/sql_lex.h 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_lex.h 2014-02-12 14:17:19.424106423 +0000 -@@ -2072,7 +2072,7 @@ - extern void lex_free(void); - extern void lex_start(THD *thd); - extern void lex_end(LEX *lex); --extern int MYSQLlex(void *arg, void *yythd); -+extern int MYSQLlex(void *arg, THD *thd); - - extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str); - -diff -uNr mysql-5.1.73.orig/sql/sql_parse.cc mysql-5.1.73/sql/sql_parse.cc ---- mysql-5.1.73.orig/sql/sql_parse.cc 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_parse.cc 2014-02-12 14:19:20.424104427 +0000 -@@ -8012,7 +8012,7 @@ - } - - --extern int MYSQLparse(void *thd); // from sql_yacc.cc -+extern int MYSQLparse(THD *thd); // from sql_yacc.cc - - - /** -diff -uNr mysql-5.1.73.orig/sql/sql_yacc.yy mysql-5.1.73/sql/sql_yacc.yy ---- mysql-5.1.73.orig/sql/sql_yacc.yy 2013-11-04 18:52:27.000000000 +0000 -+++ mysql-5.1.73/sql/sql_yacc.yy 2014-02-12 20:17:06.707750140 +0000 -@@ -23,19 +23,13 @@ - */ - - %{ --/* thd is passed as an argument to yyparse(), and subsequently to yylex(). --** The type will be void*, so it must be cast to (THD*) when used. --** Use the YYTHD macro for this. --*/ --#define YYPARSE_PARAM yythd --#define YYLEX_PARAM yythd --#define YYTHD ((THD *)yythd) --#define YYLIP (& YYTHD->m_parser_state->m_lip) -+ -+#define YYLIP (& thd->m_parser_state->m_lip) - - #define MYSQL_YACC - #define YYINITDEPTH 100 - #define YYMAXDEPTH 3200 /* Because of 64K stack */ --#define Lex (YYTHD->lex) -+#define Lex (thd->lex) - #define Select Lex->current_select - #include "mysql_priv.h" - #include "slave.h" -@@ -55,7 +49,7 @@ - #pragma warning (disable : 4065) - #endif - --int yylex(void *yylval, void *yythd); -+int yylex(void *yylval, THD *thd); - - const LEX_STRING null_lex_str= {0,0}; - -@@ -64,7 +58,7 @@ - ulong val= *(F); \ - if (my_yyoverflow((B), (D), &val)) \ - { \ -- yyerror((char*) (A)); \ -+ yyerror(current_thd, (char*) (A)); \ - return 2; \ - } \ - else \ -@@ -76,7 +70,7 @@ - #define MYSQL_YYABORT \ - do \ - { \ -- LEX::cleanup_lex_after_parse_error(YYTHD);\ -+ LEX::cleanup_lex_after_parse_error(thd);\ - YYABORT; \ - } while (0) - -@@ -159,9 +153,8 @@ - to abort from the parser. - */ - --void MYSQLerror(const char *s) -+void MYSQLerror(THD *thd, const char *s) - { -- THD *thd= current_thd; - - /* - Restore the original LEX if it was replaced when parsing -@@ -675,7 +668,10 @@ - bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize); - %} - --%pure_parser /* We have threads */ -+/* We have threads */ -+%define api.pure -+%parse-param { THD *thd } -+%lex-param { THD *thd } - /* - Currently there are 169 shift/reduce conflicts. - We should not introduce new conflicts any more. -@@ -1516,7 +1512,6 @@ - query: - END_OF_INPUT - { -- THD *thd= YYTHD; - if (!thd->bootstrap && - (!(thd->lex->select_lex.options & OPTION_FOUND_COMMENT))) - { -@@ -1530,7 +1525,7 @@ - { - Lex_input_stream *lip = YYLIP; - -- if ((YYTHD->client_capabilities & CLIENT_MULTI_QUERIES) && -+ if ((thd->client_capabilities & CLIENT_MULTI_QUERIES) && - ! lip->stmt_prepare_mode && - ! lip->eof()) - { -@@ -1626,7 +1621,6 @@ - deallocate: - deallocate_or_drop PREPARE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_DEALLOCATE_PREPARE; - lex->prepared_stmt_name= $3; -@@ -1641,7 +1635,6 @@ - prepare: - PREPARE_SYM ident FROM prepare_src - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_PREPARE; - lex->prepared_stmt_name= $2; -@@ -1651,14 +1644,12 @@ - prepare_src: - TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $1; - lex->prepared_stmt_code_is_varref= FALSE; - } - | '@' ident_or_text - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->prepared_stmt_code= $2; - lex->prepared_stmt_code_is_varref= TRUE; -@@ -1668,7 +1659,6 @@ - execute: - EXECUTE_SYM ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_EXECUTE; - lex->prepared_stmt_name= $2; -@@ -1826,7 +1816,6 @@ - create: - CREATE opt_table_options TABLE_SYM opt_if_not_exists table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_TABLE; - if (!lex->select_lex.add_table_to_list(thd, $5, NULL, -@@ -1844,13 +1833,13 @@ - } - create2 - { -- LEX *lex= YYTHD->lex; -+ LEX *lex= thd->lex; - lex->current_select= &lex->select_lex; - if ((lex->create_info.used_fields & HA_CREATE_USED_ENGINE) && - !lex->create_info.db_type) - { -- lex->create_info.db_type= ha_default_handlerton(YYTHD); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ lex->create_info.db_type= ha_default_handlerton(thd); -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_WARN_USING_OTHER_HANDLER, - ER(ER_WARN_USING_OTHER_HANDLER), - ha_resolve_storage_engine_name(lex->create_info.db_type), -@@ -1979,7 +1968,7 @@ - event_tail: - remember_name EVENT_SYM opt_if_not_exists sp_name - { -- THD *thd= YYTHD; -+ THD *thd= thd; - LEX *lex=Lex; - - lex->stmt_definition_begin= $1; -@@ -2046,7 +2035,7 @@ - ev_starts: - /* empty */ - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->event_parse_data->item_starts= item; -@@ -2096,7 +2085,6 @@ - - ev_sql_stmt: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2139,7 +2127,6 @@ - } - ev_sql_stmt_inner - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* return back to the original memory root ASAP */ -@@ -2198,11 +2185,10 @@ - $$= new sp_name($1, $3, true); - if ($$ == NULL) - MYSQL_YYABORT; -- $$->init_qname(YYTHD); -+ $$->init_qname(thd); - } - | ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db; - if (check_routine_name(&$1)) -@@ -2272,7 +2258,7 @@ - lex->sql_command= SQLCOM_CALL; - lex->spname= $2; - lex->value_list.empty(); -- sp_add_used_routine(lex, YYTHD, $2, TYPE_ENUM_PROCEDURE); -+ sp_add_used_routine(lex, thd, $2, TYPE_ENUM_PROCEDURE); - } - opt_sp_cparam_list {} - ; -@@ -2345,7 +2331,7 @@ - (enum enum_field_types)$3, - sp_param_in); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $3, - &spvar->field_def)) - { -@@ -2382,7 +2368,7 @@ - (enum enum_field_types)$4, - (sp_param_mode_t)$1); - -- if (lex->sphead->fill_field_definition(YYTHD, lex, -+ if (lex->sphead->fill_field_definition(thd, lex, - (enum enum_field_types) $4, - &spvar->field_def)) - { -@@ -2445,13 +2431,12 @@ - { - LEX *lex= Lex; - -- lex->sphead->reset_lex(YYTHD); -+ lex->sphead->reset_lex(thd); - lex->spcont->declare_var_boundary($2); - } - type - sp_opt_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - sp_pcontext *pctx= lex->spcont; - uint num_vars= pctx->context_var_count(); -@@ -2477,7 +2462,7 @@ - spvar->type= var_type; - spvar->dflt= dflt_value_item; - -- if (lex->sphead->fill_field_definition(YYTHD, lex, var_type, -+ if (lex->sphead->fill_field_definition(thd, lex, var_type, - &spvar->field_def)) - { - MYSQL_YYABORT; -@@ -2501,7 +2486,7 @@ - } - - pctx->declare_var_boundary(0); -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - $$.vars= $2; - $$.conds= $$.hndlrs= $$.curs= 0; -@@ -2516,7 +2501,7 @@ - my_error(ER_SP_DUP_COND, MYF(0), $2.str); - MYSQL_YYABORT; - } -- if(YYTHD->lex->spcont->push_cond(&$2, $5)) -+ if(thd->lex->spcont->push_cond(&$2, $5)) - MYSQL_YYABORT; - $$.vars= $$.hndlrs= $$.curs= 0; - $$.conds= 1; -@@ -2602,7 +2587,7 @@ - - sp_cursor_stmt: - { -- Lex->sphead->reset_lex(YYTHD); -+ Lex->sphead->reset_lex(thd); - } - select - { -@@ -2618,7 +2603,7 @@ - } - lex->sp_lex_in_use= TRUE; - $$= lex; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -2662,7 +2647,7 @@ - sp_cond: - ulong_num - { /* mysql errno */ -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::number; -@@ -2675,7 +2660,7 @@ - my_error(ER_SP_BAD_SQLSTATE, MYF(0), $3.str); - MYSQL_YYABORT; - } -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::state; -@@ -2705,21 +2690,21 @@ - } - | SQLWARNING_SYM /* SQLSTATEs 01??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::warning; - } - | not FOUND_SYM /* SQLSTATEs 02??? */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::notfound; - } - | SQLEXCEPTION_SYM /* All other SQLSTATEs */ - { -- $$= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t)); -+ $$= (sp_cond_type_t *)thd->alloc(sizeof(sp_cond_type_t)); - if ($$ == NULL) - MYSQL_YYABORT; - $$->type= sp_cond_type_t::exception; -@@ -2789,7 +2774,6 @@ - - sp_proc_stmt_statement: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -2798,7 +2782,6 @@ - } - statement - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp= lex->sphead; -@@ -2845,7 +2828,7 @@ - - sp_proc_stmt_return: - RETURN_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr - { - LEX *lex= Lex; -@@ -2867,7 +2850,7 @@ - MYSQL_YYABORT; - sp->m_flags|= sp_head::HAS_RETURN; - } -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - ; -@@ -3094,7 +3077,7 @@ - ; - - sp_if: -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr THEN_SYM - { - LEX *lex= Lex; -@@ -3108,7 +3091,7 @@ - sp->add_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 -@@ -3147,7 +3130,7 @@ - { - LEX *lex= Lex; - case_stmt_action_case(lex); -- lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3156,7 +3139,7 @@ - MYSQL_YYABORT; - - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - simple_when_clause_list -@@ -3198,7 +3181,7 @@ - simple_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3208,7 +3191,7 @@ - if (case_stmt_action_when(lex, $3, true)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3223,7 +3206,7 @@ - searched_when_clause: - WHEN_SYM - { -- Lex->sphead->reset_lex(YYTHD); /* For expr $3 */ -+ Lex->sphead->reset_lex(thd); /* For expr $3 */ - } - expr - { -@@ -3231,7 +3214,7 @@ - if (case_stmt_action_when(lex, $3, false)) - MYSQL_YYABORT; - /* For expr $3 */ -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - } - THEN_SYM -@@ -3395,7 +3378,7 @@ - MYSQL_YYABORT; - } - | WHILE_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr DO_SYM - { - LEX *lex= Lex; -@@ -3409,7 +3392,7 @@ - sp->new_cont_backpatch(i) || - sp->add_instr(i)) - MYSQL_YYABORT; -- if (sp->restore_lex(YYTHD)) -+ if (sp->restore_lex(thd)) - MYSQL_YYABORT; - } - sp_proc_stmts1 END WHILE_SYM -@@ -3424,7 +3407,7 @@ - lex->sphead->do_cont_backpatch(); - } - | REPEAT_SYM sp_proc_stmts1 UNTIL_SYM -- { Lex->sphead->reset_lex(YYTHD); } -+ { Lex->sphead->reset_lex(thd); } - expr END REPEAT_SYM - { - LEX *lex= Lex; -@@ -3436,7 +3419,7 @@ - if (i == NULL || - lex->sphead->add_instr(i)) - MYSQL_YYABORT; -- if (lex->sphead->restore_lex(YYTHD)) -+ if (lex->sphead->restore_lex(thd)) - MYSQL_YYABORT; - /* We can shortcut the cont_backpatch here */ - i->m_cont_dest= ip+1; -@@ -3859,7 +3842,6 @@ - create3 {} - | LIKE table_ident - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -3873,7 +3855,6 @@ - } - | '(' LIKE table_ident ')' - { -- THD *thd= YYTHD; - TABLE_LIST *src_table; - LEX *lex= thd->lex; - -@@ -4342,7 +4323,6 @@ - bit_expr - { - Item *part_expr= $1; -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Name_resolution_context *context= &lex->current_select->context; - TABLE_LIST *save_list= context->table_list; -@@ -4364,7 +4344,7 @@ - my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); - MYSQL_YYABORT; - } -- if (part_expr->fix_fields(YYTHD, (Item**)0) || -+ if (part_expr->fix_fields(thd, (Item**)0) || - ((context->table_list= save_list), FALSE) || - (!part_expr->const_item()) || - (!lex->safe_to_cache_query)) -@@ -4629,7 +4609,7 @@ - | TYPE_SYM opt_equal storage_engines - { - Lex->create_info.db_type= $3; -- WARN_DEPRECATED(yythd, "6.0", "TYPE=storage_engine", -+ WARN_DEPRECATED(thd, "6.0", "TYPE=storage_engine", - "'ENGINE=storage_engine'"); - Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE; - } -@@ -4791,19 +4771,19 @@ - storage_engines: - ident_or_text - { -- plugin_ref plugin= ha_resolve_by_name(YYTHD, &$1); -+ plugin_ref plugin= ha_resolve_by_name(thd, &$1); - - if (plugin) - $$= plugin_data(plugin, handlerton*); - else - { -- if (YYTHD->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) -+ if (thd->variables.sql_mode & MODE_NO_ENGINE_SUBSTITUTION) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), $1.str); - MYSQL_YYABORT; - } - $$= 0; -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_WARN, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN, - ER_UNKNOWN_STORAGE_ENGINE, - ER(ER_UNKNOWN_STORAGE_ENGINE), - $1.str); -@@ -4815,7 +4795,7 @@ - ident_or_text - { - plugin_ref plugin; -- if ((plugin= ha_resolve_by_name(YYTHD, &$1))) -+ if ((plugin= ha_resolve_by_name(thd, &$1))) - $$= plugin_data(plugin, handlerton*); - else - { -@@ -5043,7 +5023,7 @@ - { - char buff[sizeof("YEAR()") + MY_INT64_NUM_DECIMAL_DIGITS + 1]; - my_snprintf(buff, sizeof(buff), "YEAR(%lu)", length); -- push_warning_printf(YYTHD, MYSQL_ERROR::WARN_LEVEL_NOTE, -+ push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_NOTE, - ER_WARN_DEPRECATED_SYNTAX, - ER(ER_WARN_DEPRECATED_SYNTAX), - buff, "YEAR(4)"); -@@ -5057,7 +5037,7 @@ - { $$=MYSQL_TYPE_TIME; } - | TIMESTAMP opt_field_length - { -- if (YYTHD->variables.sql_mode & MODE_MAXDB) -+ if (thd->variables.sql_mode & MODE_MAXDB) - $$=MYSQL_TYPE_DATETIME; - else - { -@@ -5189,7 +5169,7 @@ - real_type: - REAL - { -- $$= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ? -+ $$= thd->variables.sql_mode & MODE_REAL_AS_FLOAT ? - MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE; - } - | DOUBLE_SYM -@@ -5263,7 +5243,7 @@ - | DEFAULT now_or_signed_literal { Lex->default_value=$2; } - | ON UPDATE_SYM NOW_SYM optional_braces - { -- Item *item= new (YYTHD->mem_root) Item_func_now_local(); -+ Item *item= new (thd->mem_root) Item_func_now_local(); - if (item == NULL) - MYSQL_YYABORT; - Lex->on_update_value= item; -@@ -5312,7 +5292,7 @@ - now_or_signed_literal: - NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -5673,7 +5653,6 @@ - alter: - ALTER opt_ignore TABLE_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->name.str= 0; - lex->name.length= 0; -@@ -5799,7 +5778,7 @@ - Event_parse_data. - */ - -- if (!(Lex->event_parse_data= Event_parse_data::new_instance(YYTHD))) -+ if (!(Lex->event_parse_data= Event_parse_data::new_instance(thd))) - MYSQL_YYABORT; - Lex->event_parse_data->identifier= $4; - -@@ -6192,7 +6171,6 @@ - { - if (!$4) - { -- THD *thd= YYTHD; - $4= thd->variables.collation_database; - } - $5= $5 ? $5 : $4; -@@ -6556,7 +6534,7 @@ - assign_to_keycache: - table_ident cache_keys_spec - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, 0, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, 0, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6585,7 +6563,7 @@ - preload_keys: - table_ident cache_keys_spec opt_ignore_leaves - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, $3, TL_READ, -+ if (!Select->add_table_to_list(thd, $1, NULL, $3, TL_READ, - Select->pop_index_hints())) - MYSQL_YYABORT; - } -@@ -6593,7 +6571,7 @@ - - cache_keys_spec: - { -- Lex->select_lex.alloc_index_hints(YYTHD); -+ Lex->select_lex.alloc_index_hints(thd); - Select->set_index_hint_type(INDEX_HINT_USE, - global_system_variables.old_mode ? - INDEX_HINT_MASK_JOIN : -@@ -6813,7 +6791,6 @@ - | select_item - | '*' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) - Item_field(&thd->lex->current_select->context, - NULL, NULL, "*"); -@@ -6828,7 +6805,6 @@ - select_item: - remember_name select_item2 remember_end select_alias - { -- THD *thd= YYTHD; - DBUG_ASSERT($1 < $3); - - if (add_item_to_list(thd, $2)) -@@ -6929,7 +6905,7 @@ - else - { - /* X OR Y */ -- $$ = new (YYTHD->mem_root) Item_cond_or($1, $3); -+ $$ = new (thd->mem_root) Item_cond_or($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6937,7 +6913,7 @@ - | expr XOR expr %prec XOR - { - /* XOR is a proprietary extension */ -- $$ = new (YYTHD->mem_root) Item_cond_xor($1, $3); -+ $$ = new (thd->mem_root) Item_cond_xor($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -6979,50 +6955,50 @@ - else - { - /* X AND Y */ -- $$ = new (YYTHD->mem_root) Item_cond_and($1, $3); -+ $$ = new (thd->mem_root) Item_cond_and($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - } - | NOT_SYM expr %prec NOT_SYM - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_istrue($1); -+ $$= new (thd->mem_root) Item_func_istrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not TRUE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnottrue($1); -+ $$= new (thd->mem_root) Item_func_isnottrue($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isfalse($1); -+ $$= new (thd->mem_root) Item_func_isfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not FALSE_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotfalse($1); -+ $$= new (thd->mem_root) Item_func_isnotfalse($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not UNKNOWN_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7032,19 +7008,19 @@ - bool_pri: - bool_pri IS NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnull($1); -+ $$= new (thd->mem_root) Item_func_isnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri IS not NULL_SYM %prec IS - { -- $$= new (YYTHD->mem_root) Item_func_isnotnull($1); -+ $$= new (thd->mem_root) Item_func_isnotnull($1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bool_pri EQUAL_SYM predicate %prec EQUAL_SYM - { -- $$= new (YYTHD->mem_root) Item_func_equal($1,$3); -+ $$= new (thd->mem_root) Item_func_equal($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7066,13 +7042,12 @@ - predicate: - bit_expr IN_SYM '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_in_subselect($1, $4); -+ $$= new (thd->mem_root) Item_in_subselect($1, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' subselect ')' - { -- THD *thd= YYTHD; - Item *item= new (thd->mem_root) Item_in_subselect($1, $5); - if (item == NULL) - MYSQL_YYABORT; -@@ -7082,7 +7057,7 @@ - } - | bit_expr IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, true, $4); -+ $$= handle_sql2003_note184_exception(thd, $1, true, $4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7090,13 +7065,13 @@ - { - $6->push_front($4); - $6->push_front($1); -- $$= new (YYTHD->mem_root) Item_func_in(*$6); -+ $$= new (thd->mem_root) Item_func_in(*$6); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not IN_SYM '(' expr ')' - { -- $$= handle_sql2003_note184_exception(YYTHD, $1, false, $5); -+ $$= handle_sql2003_note184_exception(thd, $1, false, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7104,7 +7079,7 @@ - { - $7->push_front($5); - $7->push_front($1); -- Item_func_in *item = new (YYTHD->mem_root) Item_func_in(*$7); -+ Item_func_in *item = new (thd->mem_root) Item_func_in(*$7); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7112,14 +7087,14 @@ - } - | bit_expr BETWEEN_SYM bit_expr AND_SYM predicate - { -- $$= new (YYTHD->mem_root) Item_func_between($1,$3,$5); -+ $$= new (thd->mem_root) Item_func_between($1,$3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not BETWEEN_SYM bit_expr AND_SYM predicate - { - Item_func_between *item; -- item= new (YYTHD->mem_root) Item_func_between($1,$4,$6); -+ item= new (thd->mem_root) Item_func_between($1,$4,$6); - if (item == NULL) - MYSQL_YYABORT; - item->negate(); -@@ -7127,42 +7102,42 @@ - } - | bit_expr SOUNDS_SYM LIKE bit_expr - { -- Item *item1= new (YYTHD->mem_root) Item_func_soundex($1); -- Item *item4= new (YYTHD->mem_root) Item_func_soundex($4); -+ Item *item1= new (thd->mem_root) Item_func_soundex($1); -+ Item *item4= new (thd->mem_root) Item_func_soundex($4); - if ((item1 == NULL) || (item4 == NULL)) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_eq(item1, item4); -+ $$= new (thd->mem_root) Item_func_eq(item1, item4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr LIKE simple_expr opt_escape - { -- $$= new (YYTHD->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); -+ $$= new (thd->mem_root) Item_func_like($1,$3,$4,Lex->escape_used); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not LIKE simple_expr opt_escape - { -- Item *item= new (YYTHD->mem_root) Item_func_like($1,$4,$5, -+ Item *item= new (thd->mem_root) Item_func_like($1,$4,$5, - Lex->escape_used); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_func_not(item); -+ $$= new (thd->mem_root) Item_func_not(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr REGEXP bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_regex($1,$3); -+ $$= new (thd->mem_root) Item_func_regex($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr not REGEXP bit_expr - { -- Item *item= new (YYTHD->mem_root) Item_func_regex($1,$4); -+ Item *item= new (thd->mem_root) Item_func_regex($1,$4); - if (item == NULL) - MYSQL_YYABORT; -- $$= negate_expression(YYTHD, item); -+ $$= negate_expression(thd, item); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7172,85 +7147,85 @@ - bit_expr: - bit_expr '|' bit_expr %prec '|' - { -- $$= new (YYTHD->mem_root) Item_func_bit_or($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_or($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '&' bit_expr %prec '&' - { -- $$= new (YYTHD->mem_root) Item_func_bit_and($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_and($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_LEFT bit_expr %prec SHIFT_LEFT - { -- $$= new (YYTHD->mem_root) Item_func_shift_left($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_left($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr SHIFT_RIGHT bit_expr %prec SHIFT_RIGHT - { -- $$= new (YYTHD->mem_root) Item_func_shift_right($1,$3); -+ $$= new (thd->mem_root) Item_func_shift_right($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' bit_expr %prec '+' - { -- $$= new (YYTHD->mem_root) Item_func_plus($1,$3); -+ $$= new (thd->mem_root) Item_func_plus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' bit_expr %prec '-' - { -- $$= new (YYTHD->mem_root) Item_func_minus($1,$3); -+ $$= new (thd->mem_root) Item_func_minus($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '+' INTERVAL_SYM expr interval %prec '+' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,0); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '-' INTERVAL_SYM expr interval %prec '-' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($1,$4,$5,1); -+ $$= new (thd->mem_root) Item_date_add_interval($1,$4,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '*' bit_expr %prec '*' - { -- $$= new (YYTHD->mem_root) Item_func_mul($1,$3); -+ $$= new (thd->mem_root) Item_func_mul($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '/' bit_expr %prec '/' - { -- $$= new (YYTHD->mem_root) Item_func_div($1,$3); -+ $$= new (thd->mem_root) Item_func_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '%' bit_expr %prec '%' - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr DIV_SYM bit_expr %prec DIV_SYM - { -- $$= new (YYTHD->mem_root) Item_func_int_div($1,$3); -+ $$= new (thd->mem_root) Item_func_int_div($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr MOD_SYM bit_expr %prec MOD_SYM - { -- $$= new (YYTHD->mem_root) Item_func_mod($1,$3); -+ $$= new (thd->mem_root) Item_func_mod($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | bit_expr '^' bit_expr - { -- $$= new (YYTHD->mem_root) Item_func_bit_xor($1,$3); -+ $$= new (thd->mem_root) Item_func_bit_xor($1,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7299,7 +7274,6 @@ - | function_call_conflict - | simple_expr COLLATE_SYM ident_or_text %prec NEG - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_string($3.str, - $3.length, - thd->charset()); -@@ -7315,7 +7289,7 @@ - | sum_expr - | simple_expr OR_OR_SYM simple_expr - { -- $$= new (YYTHD->mem_root) Item_func_concat($1, $3); -+ $$= new (thd->mem_root) Item_func_concat($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7325,25 +7299,25 @@ - } - | '-' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_neg($2); -+ $$= new (thd->mem_root) Item_func_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '~' simple_expr %prec NEG - { -- $$= new (YYTHD->mem_root) Item_func_bit_neg($2); -+ $$= new (thd->mem_root) Item_func_bit_neg($2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | not2 simple_expr %prec NEG - { -- $$= negate_expression(YYTHD, $2); -+ $$= negate_expression(thd, $2); - if ($$ == NULL) - MYSQL_YYABORT; - } - | '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_singlerow_subselect($2); -+ $$= new (thd->mem_root) Item_singlerow_subselect($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7352,20 +7326,20 @@ - | '(' expr ',' expr_list ')' - { - $4->push_front($2); -- $$= new (YYTHD->mem_root) Item_row(*$4); -+ $$= new (thd->mem_root) Item_row(*$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ROW_SYM '(' expr ',' expr_list ')' - { - $5->push_front($3); -- $$= new (YYTHD->mem_root) Item_row(*$5); -+ $$= new (thd->mem_root) Item_row(*$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXISTS '(' subselect ')' - { -- $$= new (YYTHD->mem_root) Item_exists_subselect($3); -+ $$= new (thd->mem_root) Item_exists_subselect($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7374,7 +7348,7 @@ - | MATCH ident_list_arg AGAINST '(' bit_expr fulltext_options ')' - { - $2->push_front($5); -- Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*$2, $6); -+ Item_func_match *i1= new (thd->mem_root) Item_func_match(*$2, $6); - if (i1 == NULL) - MYSQL_YYABORT; - Select->add_ftfunc_to_list(i1); -@@ -7382,7 +7356,7 @@ - } - | BINARY simple_expr %prec NEG - { -- $$= create_func_cast(YYTHD, $2, ITEM_CAST_CHAR, NULL, NULL, -+ $$= create_func_cast(thd, $2, ITEM_CAST_CHAR, NULL, NULL, - &my_charset_bin); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7390,27 +7364,27 @@ - | CAST_SYM '(' expr AS cast_type ')' - { - LEX *lex= Lex; -- $$= create_func_cast(YYTHD, $3, $5, lex->length, lex->dec, -+ $$= create_func_cast(thd, $3, $5, lex->length, lex->dec, - lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CASE_SYM opt_expr when_list opt_else END - { -- $$= new (YYTHD->mem_root) Item_func_case(* $3, $2, $4 ); -+ $$= new (thd->mem_root) Item_func_case(* $3, $2, $4 ); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr ',' cast_type ')' - { -- $$= create_func_cast(YYTHD, $3, $5, Lex->length, Lex->dec, -+ $$= create_func_cast(thd, $3, $5, Lex->length, Lex->dec, - Lex->charset); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CONVERT_SYM '(' expr USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_conv_charset($3,$5); -+ $$= new (thd->mem_root) Item_func_conv_charset($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7423,14 +7397,14 @@ - my_error(ER_WRONG_COLUMN_NAME, MYF(0), il->my_name()->str); - MYSQL_YYABORT; - } -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VALUES '(' simple_ident_nospvar ')' - { -- $$= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(), -+ $$= new (thd->mem_root) Item_insert_value(Lex->current_context(), - $3); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -7438,7 +7412,7 @@ - | INTERVAL_SYM expr interval '+' expr %prec INTERVAL_SYM - /* we cannot put interval before - */ - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($5,$2,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($5,$2,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7453,19 +7427,19 @@ - function_call_keyword: - CHAR_SYM '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3); -+ $$= new (thd->mem_root) Item_func_char(*$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHAR_SYM '(' expr_list USING charset_name ')' - { -- $$= new (YYTHD->mem_root) Item_func_char(*$3, $5); -+ $$= new (thd->mem_root) Item_func_char(*$3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURRENT_USER optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context()); -+ $$= new (thd->mem_root) Item_func_current_user(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7473,31 +7447,30 @@ - } - | DATE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_typecast($3); -+ $$= new (thd->mem_root) Item_date_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DAY_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_dayofmonth($3); -+ $$= new (thd->mem_root) Item_func_dayofmonth($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HOUR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_hour($3); -+ $$= new (thd->mem_root) Item_func_hour($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INSERT '(' expr ',' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_insert($3,$5,$7,$9); -+ $$= new (thd->mem_root) Item_func_insert($3,$5,$7,$9); - if ($$ == NULL) - MYSQL_YYABORT; - } - | INTERVAL_SYM '(' expr ',' expr ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - List *list= new (thd->mem_root) List; - if (list == NULL) - MYSQL_YYABORT; -@@ -7512,7 +7485,6 @@ - } - | INTERVAL_SYM '(' expr ',' expr ',' expr_list ')' %prec INTERVAL_SYM - { -- THD *thd= YYTHD; - $7->push_front($5); - $7->push_front($3); - Item_row *item= new (thd->mem_root) Item_row(*$7); -@@ -7524,103 +7496,103 @@ - } - | LEFT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_left($3,$5); -+ $$= new (thd->mem_root) Item_func_left($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MINUTE_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_minute($3); -+ $$= new (thd->mem_root) Item_func_minute($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MONTH_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_month($3); -+ $$= new (thd->mem_root) Item_func_month($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | RIGHT '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_right($3,$5); -+ $$= new (thd->mem_root) Item_func_right($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_second($3); -+ $$= new (thd->mem_root) Item_func_second($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIME_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_time_typecast($3); -+ $$= new (thd->mem_root) Item_time_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_datetime_typecast($3); -+ $$= new (thd->mem_root) Item_datetime_typecast($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_add_time($3, $5, 1, 0); -+ $$= new (thd->mem_root) Item_func_add_time($3, $5, 1, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($3); -+ $$= new (thd->mem_root) Item_func_trim($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($6,$4); -+ $$= new (thd->mem_root) Item_func_ltrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($6,$4); -+ $$= new (thd->mem_root) Item_func_rtrim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($6,$4); -+ $$= new (thd->mem_root) Item_func_trim($6,$4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' LEADING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ltrim($5); -+ $$= new (thd->mem_root) Item_func_ltrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' TRAILING FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_rtrim($5); -+ $$= new (thd->mem_root) Item_func_rtrim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' BOTH FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5); -+ $$= new (thd->mem_root) Item_func_trim($5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRIM '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_trim($5,$3); -+ $$= new (thd->mem_root) Item_func_trim($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | USER '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_user(); -+ $$= new (thd->mem_root) Item_func_user(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->set_stmt_unsafe(); -@@ -7628,7 +7600,7 @@ - } - | YEAR_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_year($3); -+ $$= new (thd->mem_root) Item_func_year($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7649,34 +7621,34 @@ - function_call_nonkeyword: - ADDDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ADDDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 0); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CURDATE optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_local(); -+ $$= new (thd->mem_root) Item_func_curdate_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local(); -+ $$= new (thd->mem_root) Item_func_curtime_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | CURTIME '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_curtime_local($3); -+ $$= new (thd->mem_root) Item_func_curtime_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7684,83 +7656,83 @@ - | DATE_ADD_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,0); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATE_SUB_INTERVAL '(' expr ',' INTERVAL_SYM expr interval ')' - %prec INTERVAL_SYM - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3,$6,$7,1); -+ $$= new (thd->mem_root) Item_date_add_interval($3,$6,$7,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | EXTRACT_SYM '(' interval FROM expr ')' - { -- $$=new (YYTHD->mem_root) Item_extract( $3, $5); -+ $$=new (thd->mem_root) Item_extract( $3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | GET_FORMAT '(' date_time_type ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_get_format($3, $5); -+ $$= new (thd->mem_root) Item_func_get_format($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NOW_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | NOW_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | POSITION_SYM '(' bit_expr IN_SYM expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_locate($5,$3); -+ $$ = new (thd->mem_root) Item_func_locate($5,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $5, -+ $$= new (thd->mem_root) Item_date_add_interval($3, $5, - INTERVAL_DAY, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBDATE_SYM '(' expr ',' INTERVAL_SYM expr interval ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($3, $6, $7, 1); -+ $$= new (thd->mem_root) Item_date_add_interval($3, $6, $7, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr FOR_SYM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_substr($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUBSTRING '(' expr FROM expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_substr($3,$5); -+ $$= new (thd->mem_root) Item_func_substr($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7775,9 +7747,9 @@ - */ - Lex->set_stmt_unsafe(); - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local(); -+ $$= new (thd->mem_root) Item_func_sysdate_local(); - else -- $$= new (YYTHD->mem_root) Item_func_now_local(); -+ $$= new (thd->mem_root) Item_func_now_local(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7785,42 +7757,42 @@ - | SYSDATE '(' expr ')' - { - if (global_system_variables.sysdate_is_now == 0) -- $$= new (YYTHD->mem_root) Item_func_sysdate_local($3); -+ $$= new (thd->mem_root) Item_func_sysdate_local($3); - else -- $$= new (YYTHD->mem_root) Item_func_now_local($3); -+ $$= new (thd->mem_root) Item_func_now_local($3); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | TIMESTAMP_ADD '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_date_add_interval($7,$5,$3,0); -+ $$= new (thd->mem_root) Item_date_add_interval($7,$5,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TIMESTAMP_DIFF '(' interval_time_stamp ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_timestamp_diff($5,$7,$3); -+ $$= new (thd->mem_root) Item_func_timestamp_diff($5,$7,$3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UTC_DATE_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curdate_utc(); -+ $$= new (thd->mem_root) Item_func_curdate_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIME_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_curtime_utc(); -+ $$= new (thd->mem_root) Item_func_curtime_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | UTC_TIMESTAMP_SYM optional_braces - { -- $$= new (YYTHD->mem_root) Item_func_now_utc(); -+ $$= new (thd->mem_root) Item_func_now_utc(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; -@@ -7835,62 +7807,61 @@ - function_call_conflict: - ASCII_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_ascii($3); -+ $$= new (thd->mem_root) Item_func_ascii($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | CHARSET '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_charset($3); -+ $$= new (thd->mem_root) Item_func_charset($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COALESCE '(' expr_list ')' - { -- $$= new (YYTHD->mem_root) Item_func_coalesce(* $3); -+ $$= new (thd->mem_root) Item_func_coalesce(* $3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COLLATION_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_collation($3); -+ $$= new (thd->mem_root) Item_func_collation($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DATABASE '(' ')' - { -- $$= new (YYTHD->mem_root) Item_func_database(); -+ $$= new (thd->mem_root) Item_func_database(); - if ($$ == NULL) - MYSQL_YYABORT; - Lex->safe_to_cache_query=0; - } - | IF '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_if($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_if($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MICROSECOND_SYM '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_microsecond($3); -+ $$= new (thd->mem_root) Item_func_microsecond($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MOD_SYM '(' expr ',' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_mod($3, $5); -+ $$ = new (thd->mem_root) Item_func_mod($3, $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_old_password($3); -+ $$= new (thd->mem_root) Item_func_old_password($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | PASSWORD '(' expr ')' - { -- THD *thd= YYTHD; - Item* i1; - if (thd->variables.old_passwords) - i1= new (thd->mem_root) Item_func_old_password($3); -@@ -7902,31 +7873,30 @@ - } - | QUARTER_SYM '(' expr ')' - { -- $$ = new (YYTHD->mem_root) Item_func_quarter($3); -+ $$ = new (thd->mem_root) Item_func_quarter($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPEAT_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_repeat($3,$5); -+ $$= new (thd->mem_root) Item_func_repeat($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | REPLACE '(' expr ',' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_replace($3,$5,$7); -+ $$= new (thd->mem_root) Item_func_replace($3,$5,$7); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUNCATE_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_round($3,$5,1); -+ $$= new (thd->mem_root) Item_func_round($3,$5,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | WEEK_SYM '(' expr ')' - { -- THD *thd= YYTHD; - Item *i1= new (thd->mem_root) Item_int((char*) "0", - thd->variables.default_week_format, - 1); -@@ -7938,7 +7908,7 @@ - } - | WEEK_SYM '(' expr ',' expr ')' - { -- $$= new (YYTHD->mem_root) Item_func_week($3,$5); -+ $$= new (thd->mem_root) Item_func_week($3,$5); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -7960,52 +7930,52 @@ - geometry_function: - CONTAINS_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_rel($3, $5, - Item_func::SP_CONTAINS_FUNC)); - } - | GEOMETRYCOLLECTION '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_geometrycollection, - Geometry::wkb_point)); - } - | LINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_linestring, - Geometry::wkb_point)); - } - | MULTILINESTRING '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multilinestring, - Geometry::wkb_linestring)); - } - | MULTIPOINT '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipoint, - Geometry::wkb_point)); - } - | MULTIPOLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_multipolygon, - Geometry::wkb_polygon)); - } - | POINT_SYM '(' expr ',' expr ')' - { -- $$= GEOM_NEW(YYTHD, Item_func_point($3,$5)); -+ $$= GEOM_NEW(thd, Item_func_point($3,$5)); - } - | POLYGON '(' expr_list ')' - { -- $$= GEOM_NEW(YYTHD, -+ $$= GEOM_NEW(thd, - Item_func_spatial_collection(* $3, - Geometry::wkb_polygon, - Geometry::wkb_linestring)); -@@ -8043,7 +8013,6 @@ - } - opt_udf_expr_list ')' - { -- THD *thd= YYTHD; - Create_func *builder; - Item *item= NULL; - -@@ -8097,7 +8066,6 @@ - } - | ident '.' ident '(' opt_expr_list ')' - { -- THD *thd= YYTHD; - Create_qfunc *builder; - Item *item= NULL; - -@@ -8161,7 +8129,7 @@ - udf_expr_list: - udf_expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8194,7 +8162,7 @@ - remember_name we may get quoted or escaped names. - */ - else if ($2->type() != Item::FIELD_ITEM) -- $2->set_name($1, (uint) ($3 - $1), YYTHD->charset()); -+ $2->set_name($1, (uint) ($3 - $1), thd->charset()); - $$= $2; - } - ; -@@ -8202,46 +8170,46 @@ - sum_expr: - AVG_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg($3); -+ $$= new (thd->mem_root) Item_sum_avg($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | AVG_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_avg_distinct($4); -+ $$= new (thd->mem_root) Item_sum_avg_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_AND '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_and($3); -+ $$= new (thd->mem_root) Item_sum_and($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_OR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_or($3); -+ $$= new (thd->mem_root) Item_sum_or($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIT_XOR '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_xor($3); -+ $$= new (thd->mem_root) Item_sum_xor($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' opt_all '*' ')' - { -- Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1); -+ Item *item= new (thd->mem_root) Item_int((int32) 0L,1); - if (item == NULL) - MYSQL_YYABORT; -- $$= new (YYTHD->mem_root) Item_sum_count(item); -+ $$= new (thd->mem_root) Item_sum_count(item); - if ($$ == NULL) - MYSQL_YYABORT; - } - | COUNT_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count($3); -+ $$= new (thd->mem_root) Item_sum_count($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8251,13 +8219,13 @@ - { Select->in_sum_expr--; } - ')' - { -- $$= new (YYTHD->mem_root) Item_sum_count_distinct(* $5); -+ $$= new (thd->mem_root) Item_sum_count_distinct(* $5); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MIN_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($3); -+ $$= new (thd->mem_root) Item_sum_min($3); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8268,55 +8236,55 @@ - */ - | MIN_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_min($4); -+ $$= new (thd->mem_root) Item_sum_min($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($3); -+ $$= new (thd->mem_root) Item_sum_max($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | MAX_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_max($4); -+ $$= new (thd->mem_root) Item_sum_max($4); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STD_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 0); -+ $$= new (thd->mem_root) Item_sum_std($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VARIANCE_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 0); -+ $$= new (thd->mem_root) Item_sum_variance($3, 0); - if ($$ == NULL) - MYSQL_YYABORT; - } - | STDDEV_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_std($3, 1); -+ $$= new (thd->mem_root) Item_sum_std($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | VAR_SAMP_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_variance($3, 1); -+ $$= new (thd->mem_root) Item_sum_variance($3, 1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum($3); -+ $$= new (thd->mem_root) Item_sum_sum($3); - if ($$ == NULL) - MYSQL_YYABORT; - } - | SUM_SYM '(' DISTINCT in_sum_expr ')' - { -- $$= new (YYTHD->mem_root) Item_sum_sum_distinct($4); -+ $$= new (thd->mem_root) Item_sum_sum_distinct($4); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8328,7 +8296,7 @@ - { - SELECT_LEX *sel= Select; - sel->in_sum_expr--; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_func_group_concat(Lex->current_context(), $3, $5, - sel->gorder_list, $7); - if ($$ == NULL) -@@ -8357,7 +8325,7 @@ - ident_or_text SET_VAR expr - { - Item_func_set_user_var *item; -- $$= item= new (YYTHD->mem_root) Item_func_set_user_var($1, $3); -+ $$= item= new (thd->mem_root) Item_func_set_user_var($1, $3); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8366,7 +8334,7 @@ - } - | ident_or_text - { -- $$= new (YYTHD->mem_root) Item_func_get_user_var($1); -+ $$= new (thd->mem_root) Item_func_get_user_var($1); - if ($$ == NULL) - MYSQL_YYABORT; - LEX *lex= Lex; -@@ -8380,7 +8348,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (!($$= get_system_var(YYTHD, $2, $3, $4))) -+ if (!($$= get_system_var(thd, $2, $3, $4))) - MYSQL_YYABORT; - if (!((Item_func_get_system_var*) $$)->is_written_to_binlog()) - Lex->set_stmt_unsafe(); -@@ -8395,7 +8363,7 @@ - opt_gconcat_separator: - /* empty */ - { -- $$= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1); -+ $$= new (thd->mem_root) String(",", 1, &my_charset_latin1); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -8422,9 +8390,9 @@ - - gorder_list: - gorder_list ',' order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_gorder_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_gorder_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - in_sum_expr: -@@ -8477,7 +8445,7 @@ - expr_list: - expr - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8497,7 +8465,7 @@ - ident_list: - simple_ident - { -- $$= new (YYTHD->mem_root) List; -+ $$= new (thd->mem_root) List; - if ($$ == NULL) - MYSQL_YYABORT; - $$->push_back($1); -@@ -8595,7 +8563,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8610,7 +8578,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $3); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $3)) -+ if (push_new_name_resolution_context(thd, $1, $3)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8640,7 +8608,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8676,7 +8644,7 @@ - { - MYSQL_YYABORT_UNLESS($1 && $5); - /* Change the current name resolution context to a local context. */ -- if (push_new_name_resolution_context(YYTHD, $1, $5)) -+ if (push_new_name_resolution_context(thd, $1, $5)) - MYSQL_YYABORT; - Select->parsing_place= IN_ON; - } -@@ -8724,7 +8692,7 @@ - } - table_ident opt_table_alias opt_key_definition - { -- if (!($$= Select->add_table_to_list(YYTHD, $2, $3, -+ if (!($$= Select->add_table_to_list(thd, $2, $3, - Select->get_table_join_options(), - Lex->lock_option, - Select->pop_index_hints()))) -@@ -8922,7 +8890,7 @@ - - opt_index_hints_list: - /* empty */ -- | { Select->alloc_index_hints(YYTHD); } index_hints_list -+ | { Select->alloc_index_hints(thd); } index_hints_list - ; - - opt_key_definition: -@@ -8931,15 +8899,15 @@ - ; - - opt_key_usage_list: -- /* empty */ { Select->add_index_hint(YYTHD, NULL, 0); } -+ /* empty */ { Select->add_index_hint(thd, NULL, 0); } - | key_usage_list {} - ; - - key_usage_element: - ident -- { Select->add_index_hint(YYTHD, $1.str, $1.length); } -+ { Select->add_index_hint(thd, $1.str, $1.length); } - | PRIMARY_SYM -- { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); } -+ { Select->add_index_hint(thd, (char *)"PRIMARY", 7); } - ; - - key_usage_list: -@@ -8952,7 +8920,7 @@ - { - if (!($$= new List)) - MYSQL_YYABORT; -- String *s= new (YYTHD->mem_root) String((const char *) $1.str, -+ String *s= new (thd->mem_root) String((const char *) $1.str, - $1.length, - system_charset_info); - if (s == NULL) -@@ -8961,7 +8929,7 @@ - } - | using_list ',' ident - { -- String *s= new (YYTHD->mem_root) String((const char *) $3.str, -+ String *s= new (thd->mem_root) String((const char *) $3.str, - $3.length, - system_charset_info); - if (s == NULL) -@@ -9002,7 +8970,7 @@ - implementation without changing its - resolution. - */ -- WARN_DEPRECATED(yythd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); -+ WARN_DEPRECATED(thd, VER_CELOSIA, "FRAC_SECOND", "MICROSECOND"); - } - ; - -@@ -9086,7 +9054,6 @@ - } - | /* empty */ - { -- THD *thd= YYTHD; - Lex->escape_used= FALSE; - $$= ((thd->variables.sql_mode & MODE_NO_BACKSLASH_ESCAPES) ? - new (thd->mem_root) Item_string("", 0, &my_charset_latin1) : -@@ -9107,9 +9074,9 @@ - - group_list: - group_list ',' order_ident order_dir -- { if (add_group_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_group_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_group_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - olap_opt: -@@ -9156,7 +9123,6 @@ - alter_order_item: - simple_ident_nospvar order_dir - { -- THD *thd= YYTHD; - bool ascending= ($2 == 1) ? true : false; - if (add_order_to_list(thd, $1, ascending)) - MYSQL_YYABORT; -@@ -9209,9 +9175,9 @@ - - order_list: - order_list ',' order_ident order_dir -- { if (add_order_to_list(YYTHD, $3,(bool) $4)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $3,(bool) $4)) MYSQL_YYABORT; } - | order_ident order_dir -- { if (add_order_to_list(YYTHD, $1,(bool) $2)) MYSQL_YYABORT; } -+ { if (add_order_to_list(thd, $1,(bool) $2)) MYSQL_YYABORT; } - ; - - order_dir: -@@ -9271,19 +9237,19 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | LONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9365,7 +9331,7 @@ - lex->proc_list.elements=0; - lex->proc_list.first=0; - lex->proc_list.next= &lex->proc_list.first; -- Item_field *item= new (YYTHD->mem_root) -+ Item_field *item= new (thd->mem_root) - Item_field(&lex->current_select->context, - NULL, NULL, $2.str); - if (item == NULL) -@@ -9390,8 +9356,7 @@ - procedure_item: - remember_name expr remember_end - { -- THD *thd= YYTHD; -- -+ - if (add_proc_to_list(thd, $2)) - MYSQL_YYABORT; - if (!$2->name) -@@ -9560,7 +9525,6 @@ - } - | DROP FUNCTION_SYM if_exists ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_name *spname; - if ($4.str && check_db_name(&$4)) -@@ -9583,7 +9547,6 @@ - } - | DROP FUNCTION_SYM if_exists ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_STRING db= {0, 0}; - sp_name *spname; -@@ -9664,7 +9627,7 @@ - table_name: - table_ident - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $1, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -9677,7 +9640,7 @@ - table_alias_ref: - table_ident_opt_wild - { -- if (!Select->add_table_to_list(YYTHD, $1, NULL, -+ if (!Select->add_table_to_list(thd, $1, NULL, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, - Lex->lock_option )) - MYSQL_YYABORT; -@@ -9868,7 +9831,7 @@ - expr { $$= $1;} - | DEFAULT - { -- $$= new (YYTHD->mem_root) Item_default_value(Lex->current_context()); -+ $$= new (thd->mem_root) Item_default_value(Lex->current_context()); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -9922,7 +9885,7 @@ - update_elem: - simple_ident_nospvar equal expr_or_default - { -- if (add_item_to_list(YYTHD, $1) || add_value_to_list(YYTHD, $3)) -+ if (add_item_to_list(thd, $1) || add_value_to_list(thd, $3)) - MYSQL_YYABORT; - } - ; -@@ -9965,7 +9928,7 @@ - single_multi: - FROM table_ident - { -- if (!Select->add_table_to_list(YYTHD, $2, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $2, NULL, TL_OPTION_UPDATING, - Lex->lock_option)) - MYSQL_YYABORT; - } -@@ -9998,7 +9961,7 @@ - Table_ident *ti= new Table_ident($1); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $3, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10007,10 +9970,10 @@ - } - | ident '.' ident opt_wild opt_table_alias - { -- Table_ident *ti= new Table_ident(YYTHD, $1, $3, 0); -+ Table_ident *ti= new Table_ident(thd, $1, $3, 0); - if (ti == NULL) - MYSQL_YYABORT; -- if (!Select->add_table_to_list(YYTHD, -+ if (!Select->add_table_to_list(thd, - ti, - $5, - TL_OPTION_UPDATING | TL_OPTION_ALIAS, -@@ -10130,7 +10093,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_DATABASES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_SCHEMATA)) -+ if (prepare_schema_table(thd, lex, 0, SCH_SCHEMATA)) - MYSQL_YYABORT; - } - | opt_full TABLES opt_db wild_and_where -@@ -10138,7 +10101,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLE_NAMES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLE_NAMES)) - MYSQL_YYABORT; - } - | opt_full TRIGGERS_SYM opt_db wild_and_where -@@ -10146,7 +10109,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TRIGGERS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TRIGGERS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TRIGGERS)) - MYSQL_YYABORT; - } - | EVENTS_SYM opt_db wild_and_where -@@ -10154,7 +10117,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_EVENTS; - lex->select_lex.db= $2; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_EVENTS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_EVENTS)) - MYSQL_YYABORT; - } - | TABLE_SYM STATUS_SYM opt_db wild_and_where -@@ -10162,7 +10125,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_TABLE_STATUS; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_TABLES)) - MYSQL_YYABORT; - } - | OPEN_SYM TABLES opt_db wild_and_where -@@ -10170,22 +10133,22 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_OPEN_TABLES; - lex->select_lex.db= $3; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_OPEN_TABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_OPEN_TABLES)) - MYSQL_YYABORT; - } - | opt_full PLUGIN_SYM - { - LEX *lex= Lex; -- WARN_DEPRECATED(yythd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW PLUGIN", "'SHOW PLUGINS'"); - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | PLUGINS_SYM - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PLUGINS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PLUGINS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PLUGINS)) - MYSQL_YYABORT; - } - | ENGINE_SYM known_storage_engines show_engine_param -@@ -10198,7 +10161,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - if ($5) - $4->change_db($5); -- if (prepare_schema_table(YYTHD, lex, $4, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $4, SCH_COLUMNS)) - MYSQL_YYABORT; - } - | NEW_SYM MASTER_SYM FOR_SYM SLAVE -@@ -10233,7 +10196,7 @@ - lex->sql_command= SQLCOM_SHOW_KEYS; - if ($4) - $3->change_db($4); -- if (prepare_schema_table(YYTHD, lex, $3, SCH_STATISTICS)) -+ if (prepare_schema_table(thd, lex, $3, SCH_STATISTICS)) - MYSQL_YYABORT; - } - | COLUMN_SYM TYPES_SYM -@@ -10245,15 +10208,15 @@ - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- WARN_DEPRECATED(yythd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ WARN_DEPRECATED(thd, "6.0", "SHOW TABLE TYPES", "'SHOW [STORAGE] ENGINES'"); -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | opt_storage ENGINES_SYM - { - LEX *lex=Lex; - lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_ENGINES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_ENGINES)) - MYSQL_YYABORT; - } - | AUTHORS_SYM -@@ -10285,7 +10248,7 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_PROFILE; -- if (prepare_schema_table(YYTHD, lex, NULL, SCH_PROFILES) != 0) -+ if (prepare_schema_table(thd, lex, NULL, SCH_PROFILES) != 0) - YYABORT; - } - | opt_var_type STATUS_SYM wild_and_where -@@ -10293,7 +10256,7 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_STATUS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_STATUS)) - MYSQL_YYABORT; - } - | INNOBASE_SYM STATUS_SYM -@@ -10301,24 +10264,24 @@ - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_STATUS; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW INNODB STATUS", "'SHOW ENGINE INNODB STATUS'"); - } - | MUTEX_SYM STATUS_SYM - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_ENGINE_MUTEX; - if (!(lex->create_info.db_type= -- ha_resolve_by_legacy_type(YYTHD, DB_TYPE_INNODB))) -+ ha_resolve_by_legacy_type(thd, DB_TYPE_INNODB))) - { - my_error(ER_UNKNOWN_STORAGE_ENGINE, MYF(0), "InnoDB"); - MYSQL_YYABORT; - } -- WARN_DEPRECATED(yythd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); -+ WARN_DEPRECATED(thd, "6.0", "SHOW MUTEX STATUS", "'SHOW ENGINE INNODB MUTEX'"); - } - | opt_full PROCESSLIST_SYM - { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;} -@@ -10327,21 +10290,21 @@ - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_VARIABLES; - lex->option_type= $1; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_VARIABLES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_VARIABLES)) - MYSQL_YYABORT; - } - | charset wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_CHARSETS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_CHARSETS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_CHARSETS)) - MYSQL_YYABORT; - } - | COLLATION_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_COLLATIONS; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_COLLATIONS)) -+ if (prepare_schema_table(thd, lex, 0, SCH_COLLATIONS)) - MYSQL_YYABORT; - } - | GRANTS -@@ -10371,7 +10334,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL,0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL,0)) - MYSQL_YYABORT; - lex->only_view= 0; - lex->create_info.storage_media= HA_SM_DEFAULT; -@@ -10380,7 +10343,7 @@ - { - LEX *lex= Lex; - lex->sql_command = SQLCOM_SHOW_CREATE; -- if (!lex->select_lex.add_table_to_list(YYTHD, $3, NULL, 0)) -+ if (!lex->select_lex.add_table_to_list(thd, $3, NULL, 0)) - MYSQL_YYABORT; - lex->only_view= 1; - } -@@ -10416,14 +10379,14 @@ - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_PROC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | FUNCTION_SYM STATUS_SYM wild_and_where - { - LEX *lex= Lex; - lex->sql_command= SQLCOM_SHOW_STATUS_FUNC; -- if (prepare_schema_table(YYTHD, lex, 0, SCH_PROCEDURES)) -+ if (prepare_schema_table(thd, lex, 0, SCH_PROCEDURES)) - MYSQL_YYABORT; - } - | PROCEDURE CODE_SYM sp_name -@@ -10501,7 +10464,7 @@ - /* empty */ - | LIKE TEXT_STRING_sys - { -- Lex->wild= new (YYTHD->mem_root) String($2.str, $2.length, -+ Lex->wild= new (thd->mem_root) String($2.str, $2.length, - system_charset_info); - if (Lex->wild == NULL) - MYSQL_YYABORT; -@@ -10525,7 +10488,7 @@ - lex->sql_command= SQLCOM_SHOW_FIELDS; - lex->select_lex.db= 0; - lex->verbose= 0; -- if (prepare_schema_table(YYTHD, lex, $2, SCH_COLUMNS)) -+ if (prepare_schema_table(thd, lex, $2, SCH_COLUMNS)) - MYSQL_YYABORT; - } - opt_describe_column {} -@@ -10554,7 +10517,7 @@ - | text_string { Lex->wild= $1; } - | ident - { -- Lex->wild= new (YYTHD->mem_root) String((const char*) $1.str, -+ Lex->wild= new (thd->mem_root) String((const char*) $1.str, - $1.length, - system_charset_info); - if (Lex->wild == NULL) -@@ -10697,7 +10660,6 @@ - load: - LOAD DATA_SYM - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - if (lex->sphead) -@@ -10711,7 +10673,7 @@ - | LOAD TABLE_SYM table_ident FROM MASTER_SYM - { - LEX *lex=Lex; -- WARN_DEPRECATED(yythd, "6.0", "LOAD TABLE FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD TABLE FROM MASTER", - "MySQL Administrator (mysqldump, mysql)"); - if (lex->sphead) - { -@@ -10719,7 +10681,7 @@ - MYSQL_YYABORT; - } - lex->sql_command = SQLCOM_LOAD_MASTER_TABLE; -- if (!Select->add_table_to_list(YYTHD, $3, NULL, TL_OPTION_UPDATING)) -+ if (!Select->add_table_to_list(thd, $3, NULL, TL_OPTION_UPDATING)) - MYSQL_YYABORT; - } - ; -@@ -10739,7 +10701,7 @@ - opt_duplicate INTO TABLE_SYM table_ident - { - LEX *lex=Lex; -- if (!Select->add_table_to_list(YYTHD, $9, NULL, TL_OPTION_UPDATING, -+ if (!Select->add_table_to_list(thd, $9, NULL, TL_OPTION_UPDATING, - lex->lock_option)) - MYSQL_YYABORT; - lex->field_list.empty(); -@@ -10754,7 +10716,7 @@ - | FROM MASTER_SYM - { - Lex->sql_command = SQLCOM_LOAD_MASTER_DATA; -- WARN_DEPRECATED(yythd, "6.0", "LOAD DATA FROM MASTER", -+ WARN_DEPRECATED(thd, "6.0", "LOAD DATA FROM MASTER", - "mysqldump or future " - "BACKUP/RESTORE DATABASE facility"); - } -@@ -10872,7 +10834,7 @@ - simple_ident_nospvar {$$= $1;} - | '@' ident_or_text - { -- $$= new (YYTHD->mem_root) Item_user_var_as_out_param($2); -+ $$= new (thd->mem_root) Item_user_var_as_out_param($2); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -10889,7 +10851,6 @@ - TEXT_STRING - { - LEX_STRING tmp; -- THD *thd= YYTHD; - CHARSET_INFO *cs_con= thd->variables.collation_connection; - CHARSET_INFO *cs_cli= thd->variables.character_set_client; - uint repertoire= thd->lex->text_string_is_7bit && -@@ -10915,7 +10876,7 @@ - uint repertoire= Lex->text_string_is_7bit ? - MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30; - DBUG_ASSERT(my_charset_is_ascii_based(national_charset_info)); -- $$= new (YYTHD->mem_root) Item_string($1.str, $1.length, -+ $$= new (thd->mem_root) Item_string($1.str, $1.length, - national_charset_info, - DERIVATION_COERCIBLE, - repertoire); -@@ -10924,7 +10885,7 @@ - } - | UNDERSCORE_CHARSET TEXT_STRING - { -- Item_string *str= new (YYTHD->mem_root) Item_string($2.str, -+ Item_string *str= new (thd->mem_root) Item_string($2.str, - $2.length, $1); - if (str == NULL) - MYSQL_YYABORT; -@@ -10943,7 +10904,7 @@ - If the string has been pure ASCII so far, - check the new part. - */ -- CHARSET_INFO *cs= YYTHD->variables.collation_connection; -+ CHARSET_INFO *cs= thd->variables.collation_connection; - item->collation.repertoire|= my_string_repertoire(cs, - $2.str, - $2.length); -@@ -10954,15 +10915,15 @@ - text_string: - TEXT_STRING_literal - { -- $$= new (YYTHD->mem_root) String($1.str, -+ $$= new (thd->mem_root) String($1.str, - $1.length, -- YYTHD->variables.collation_connection); -+ thd->variables.collation_connection); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10974,7 +10935,7 @@ - } - | BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -10989,7 +10950,6 @@ - param_marker: - PARAM_MARKER - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - Item_param *item; -@@ -11022,38 +10982,38 @@ - | NUM_literal { $$ = $1; } - | NULL_SYM - { -- $$ = new (YYTHD->mem_root) Item_null(); -+ $$ = new (thd->mem_root) Item_null(); - if ($$ == NULL) - MYSQL_YYABORT; - YYLIP->next_state= MY_LEX_OPERATOR_OR_IDENT; - } - | FALSE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1); -+ $$= new (thd->mem_root) Item_int((char*) "FALSE",0,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | TRUE_SYM - { -- $$= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1); -+ $$= new (thd->mem_root) Item_int((char*) "TRUE",1,1); - if ($$ == NULL) - MYSQL_YYABORT; - } - | HEX_NUM - { -- $$ = new (YYTHD->mem_root) Item_hex_string($1.str, $1.length); -+ $$ = new (thd->mem_root) Item_hex_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BIN_NUM - { -- $$= new (YYTHD->mem_root) Item_bin_string($1.str, $1.length); -+ $$= new (thd->mem_root) Item_bin_string($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | UNDERSCORE_CHARSET HEX_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_hex_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_hex_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11064,7 +11024,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11082,7 +11042,7 @@ - } - | UNDERSCORE_CHARSET BIN_NUM - { -- Item *tmp= new (YYTHD->mem_root) Item_bin_string($2.str, $2.length); -+ Item *tmp= new (thd->mem_root) Item_bin_string($2.str, $2.length); - if (tmp == NULL) - MYSQL_YYABORT; - /* -@@ -11093,7 +11053,7 @@ - String *str= tmp->val_str((String*) 0); - - Item_string *item_str; -- item_str= new (YYTHD->mem_root) -+ item_str= new (thd->mem_root) - Item_string(NULL, /* name will be set in select_item */ - str ? str->ptr() : "", - str ? str->length() : 0, -@@ -11117,7 +11077,7 @@ - NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11127,7 +11087,7 @@ - | LONG_NUM - { - int error; -- $$= new (YYTHD->mem_root) -+ $$= new (thd->mem_root) - Item_int($1.str, - (longlong) my_strtoll10($1.str, NULL, &error), - $1.length); -@@ -11136,23 +11096,23 @@ - } - | ULONGLONG_NUM - { -- $$= new (YYTHD->mem_root) Item_uint($1.str, $1.length); -+ $$= new (thd->mem_root) Item_uint($1.str, $1.length); - if ($$ == NULL) - MYSQL_YYABORT; - } - | DECIMAL_NUM - { -- $$= new (YYTHD->mem_root) Item_decimal($1.str, $1.length, -- YYTHD->charset()); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_decimal($1.str, $1.length, -+ thd->charset()); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } - } - | FLOAT_NUM - { -- $$= new (YYTHD->mem_root) Item_float($1.str, $1.length); -- if (($$ == NULL) || (YYTHD->is_error())) -+ $$= new (thd->mem_root) Item_float($1.str, $1.length); -+ if (($$ == NULL) || (thd->is_error())) - { - MYSQL_YYABORT; - } -@@ -11172,7 +11132,7 @@ - ident '.' '*' - { - SELECT_LEX *sel= Select; -- $$= new (YYTHD->mem_root) Item_field(Lex->current_context(), -+ $$= new (thd->mem_root) Item_field(Lex->current_context(), - NullS, $1.str, "*"); - if ($$ == NULL) - MYSQL_YYABORT; -@@ -11180,7 +11140,6 @@ - } - | ident '.' ident '.' '*' - { -- THD *thd= YYTHD; - SELECT_LEX *sel= Select; - const char* schema= thd->client_capabilities & CLIENT_NO_SCHEMA ? - NullS : $1.str; -@@ -11200,7 +11159,6 @@ - simple_ident: - ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_variable_t *spv; -@@ -11251,7 +11209,6 @@ - simple_ident_nospvar: - ident - { -- THD *thd= YYTHD; - SELECT_LEX *sel=Select; - if ((sel->parsing_place != IN_HAVING) || - (sel->get_in_sum_expr() > 0)) -@@ -11273,7 +11230,6 @@ - simple_ident_q: - ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - /* -@@ -11352,7 +11308,6 @@ - } - | '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - if (sel->no_table_names_allowed) -@@ -11377,7 +11332,6 @@ - } - | ident '.' ident '.' ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - SELECT_LEX *sel= lex->current_select; - const char* schema= (thd->client_capabilities & CLIENT_NO_SCHEMA ? -@@ -11445,7 +11399,7 @@ - } - | ident '.' ident - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11467,7 +11421,7 @@ - } - | ident '.' ident opt_wild - { -- $$= new Table_ident(YYTHD, $1,$3,0); -+ $$= new Table_ident(thd, $1,$3,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11477,7 +11431,7 @@ - ident - { - LEX_STRING db={(char*) any_db,3}; -- $$= new Table_ident(YYTHD, db,$1,0); -+ $$= new Table_ident(thd, db,$1,0); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -11487,8 +11441,7 @@ - IDENT { $$= $1; } - | IDENT_QUOTED - { -- THD *thd= YYTHD; -- -+ - if (thd->charset_is_system_charset) - { - CHARSET_INFO *cs= system_charset_info; -@@ -11516,8 +11469,6 @@ - TEXT_STRING_sys: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_system_charset) - $$= $1; - else -@@ -11532,8 +11483,6 @@ - TEXT_STRING_literal: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_collation_connection) - $$= $1; - else -@@ -11548,8 +11497,6 @@ - TEXT_STRING_filesystem: - TEXT_STRING - { -- THD *thd= YYTHD; -- - if (thd->charset_is_character_set_filesystem) - $$= $1; - else -@@ -11566,7 +11513,6 @@ - IDENT_sys { $$=$1; } - | keyword - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11578,7 +11524,6 @@ - IDENT_sys { $$=$1; } - | keyword_sp - { -- THD *thd= YYTHD; - $$.str= thd->strmake($1.str, $1.length); - if ($$.str == NULL) - MYSQL_YYABORT; -@@ -11595,7 +11540,6 @@ - user: - ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; -@@ -11609,7 +11553,6 @@ - } - | ident_or_text '@' ident_or_text - { -- THD *thd= YYTHD; - if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - $$->user = $1; $$->host=$3; -@@ -11628,7 +11571,7 @@ - } - | CURRENT_USER optional_braces - { -- if (!($$=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user)))) -+ if (!($$=(LEX_USER*) thd->alloc(sizeof(st_lex_user)))) - MYSQL_YYABORT; - /* - empty LEX_USER means current_user and -@@ -11991,7 +11934,6 @@ - - option_type_value: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12022,7 +11964,6 @@ - } - ext_option_value - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -12105,7 +12046,6 @@ - sys_option_value: - option_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - LEX *lex= Lex; - LEX_STRING *name= &$2.base_name; - -@@ -12117,7 +12057,7 @@ - my_parse_error(ER(ER_SYNTAX_ERROR)); - MYSQL_YYABORT; - } -- if (set_trigger_new_row(YYTHD, name, $4)) -+ if (set_trigger_new_row(thd, name, $4)) - MYSQL_YYABORT; - } - else if ($2.var) -@@ -12147,7 +12087,6 @@ - } - | option_type TRANSACTION_SYM ISOLATION LEVEL_SYM isolation_types - { -- THD *thd= YYTHD; - LEX *lex=Lex; - lex->option_type= $1; - Item *item= new (thd->mem_root) Item_int((int32) $5); -@@ -12167,7 +12106,7 @@ - '@' ident_or_text equal expr - { - Item_func_set_user_var *item; -- item= new (YYTHD->mem_root) Item_func_set_user_var($2, $4); -+ item= new (thd->mem_root) Item_func_set_user_var($2, $4); - if (item == NULL) - MYSQL_YYABORT; - set_var_user *var= new set_var_user(item); -@@ -12177,7 +12116,6 @@ - } - | '@' '@' opt_var_ident_type internal_variable_name equal set_expr_or_default - { -- THD *thd= YYTHD; - struct sys_var_with_base tmp= $4; - /* Lookup if necessary: must be a system variable. */ - if (tmp.var == NULL) -@@ -12190,7 +12128,6 @@ - } - | charset old_or_new_charset_name_or_default - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - CHARSET_INFO *cs2; - cs2= $2 ? $2: global_system_variables.character_set_client; -@@ -12238,7 +12175,6 @@ - } - | PASSWORD equal text_or_password - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - LEX_USER *user; - sp_pcontext *spc= lex->spcont; -@@ -12278,7 +12214,6 @@ - internal_variable_name: - ident - { -- THD *thd= YYTHD; - sp_pcontext *spc= thd->lex->spcont; - sp_variable_t *spv; - -@@ -12337,7 +12272,7 @@ - } - else - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12348,7 +12283,7 @@ - } - | DEFAULT '.' ident - { -- sys_var *tmp=find_sys_var(YYTHD, $3.str, $3.length); -+ sys_var *tmp=find_sys_var(thd, $3.str, $3.length); - if (!tmp) - MYSQL_YYABORT; - if (!tmp->is_struct()) -@@ -12370,16 +12305,16 @@ - TEXT_STRING { $$=$1.str;} - | PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? YYTHD->variables.old_passwords ? -- Item_func_old_password::alloc(YYTHD, $3.str, $3.length) : -- Item_func_password::alloc(YYTHD, $3.str, $3.length) : -+ $$= $3.length ? thd->variables.old_passwords ? -+ Item_func_old_password::alloc(thd, $3.str, $3.length) : -+ Item_func_password::alloc(thd, $3.str, $3.length) : - $3.str; - if ($$ == NULL) - MYSQL_YYABORT; - } - | OLD_PASSWORD '(' TEXT_STRING ')' - { -- $$= $3.length ? Item_func_old_password::alloc(YYTHD, $3.str, -+ $$= $3.length ? Item_func_old_password::alloc(thd, $3.str, - $3.length) : - $3.str; - if ($$ == NULL) -@@ -12393,19 +12328,19 @@ - | DEFAULT { $$=0; } - | ON - { -- $$=new (YYTHD->mem_root) Item_string("ON", 2, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ON", 2, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | ALL - { -- $$=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info); -+ $$=new (thd->mem_root) Item_string("ALL", 3, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } - | BINARY - { -- $$=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info); -+ $$=new (thd->mem_root) Item_string("binary", 6, system_charset_info); - if ($$ == NULL) - MYSQL_YYABORT; - } -@@ -12443,7 +12378,7 @@ - table_ident opt_table_alias lock_option - { - thr_lock_type lock_type= (thr_lock_type) $3; -- if (!Select->add_table_to_list(YYTHD, $1, $2, 0, lock_type)) -+ if (!Select->add_table_to_list(thd, $1, $2, 0, lock_type)) - MYSQL_YYABORT; - /* If table is to be write locked, protect from a impending GRL. */ - if (lock_type >= TL_WRITE_ALLOW_WRITE) -@@ -12514,7 +12449,7 @@ - lex->expr_allows_subselect= FALSE; - lex->sql_command = SQLCOM_HA_READ; - lex->ha_rkey_mode= HA_READ_KEY_EXACT; /* Avoid purify warnings */ -- Item *one= new (YYTHD->mem_root) Item_int((int32) 1); -+ Item *one= new (thd->mem_root) Item_int((int32) 1); - if (one == NULL) - MYSQL_YYABORT; - lex->current_select->select_limit= one; -@@ -12836,10 +12771,10 @@ - $$=$1; $1->password=$4; - if ($4.length) - { -- if (YYTHD->variables.old_passwords) -+ if (thd->variables.old_passwords) - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH_323+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password_323(buff, $4.str, $4.length); -@@ -12849,7 +12784,7 @@ - else - { - char *buff= -- (char *) YYTHD->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); -+ (char *) thd->alloc(SCRAMBLED_PASSWORD_CHAR_LENGTH+1); - if (buff == NULL) - MYSQL_YYABORT; - my_make_scrambled_password(buff, $4.str, $4.length); -@@ -12881,7 +12816,7 @@ - column_list_id: - ident - { -- String *new_str = new (YYTHD->mem_root) String((const char*) $1.str,$1.length,system_charset_info); -+ String *new_str = new (thd->mem_root) String((const char*) $1.str,$1.length,system_charset_info); - if (new_str == NULL) - MYSQL_YYABORT; - List_iterator iter(Lex->columns); -@@ -12981,14 +12916,14 @@ - - opt_chain: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 1); } -+ { $$= (thd->variables.completion_type == 1); } - | AND_SYM NO_SYM CHAIN_SYM { $$=0; } - | AND_SYM CHAIN_SYM { $$=1; } - ; - - opt_release: - /* empty */ -- { $$= (YYTHD->variables.completion_type == 2); } -+ { $$= (thd->variables.completion_type == 2); } - | RELEASE_SYM { $$=1; } - | NO_SYM RELEASE_SYM { $$=0; } - ; -@@ -13102,7 +13037,6 @@ - - union_order_or_limit: - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - DBUG_ASSERT(lex->current_select->linkage != GLOBAL_OPTIONS_TYPE); - SELECT_LEX *sel= lex->current_select; -@@ -13118,7 +13052,6 @@ - } - order_or_limit - { -- THD *thd= YYTHD; - thd->lex->current_select->no_table_names_allowed= 0; - thd->where= ""; - } -@@ -13255,14 +13188,14 @@ - from older master servers (i.e. to create non-suid trigger in this - case). - */ -- YYTHD->lex->definer= 0; -+ thd->lex->definer= 0; - } - ; - - definer: - DEFINER_SYM EQ user - { -- YYTHD->lex->definer= get_current_user(YYTHD, $3); -+ thd->lex->definer= get_current_user(thd, $3); - } - ; - -@@ -13307,7 +13240,6 @@ - view_tail: - view_suid VIEW_SYM table_ident - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - lex->sql_command= SQLCOM_CREATE_VIEW; - /* first table in list is target VIEW name */ -@@ -13347,7 +13279,6 @@ - } - view_select_aux view_check_option - { -- THD *thd= YYTHD; - LEX *lex= Lex; - uint len= YYLIP->get_cpp_ptr() - lex->create_view_select.str; - void *create_view_select= thd->memdup(lex->create_view_select.str, len); -@@ -13403,7 +13334,6 @@ - EACH_SYM - ROW_SYM - { /* $15 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13437,8 +13367,8 @@ - sp_head *sp= lex->sphead; - - lex->sql_command= SQLCOM_CREATE_TRIGGER; -- sp->set_stmt_end(YYTHD); -- sp->restore_thd_mem_root(YYTHD); -+ sp->set_stmt_end(thd); -+ sp->restore_thd_mem_root(thd); - - if (sp->is_not_allowed_in_function("trigger")) - MYSQL_YYABORT; -@@ -13448,7 +13378,7 @@ - sp_proc_stmt alternatives are not saving/restoring LEX, so - lex->query_tables can be wiped out. - */ -- if (!lex->select_lex.add_table_to_list(YYTHD, $9, -+ if (!lex->select_lex.add_table_to_list(thd, $9, - (LEX_STRING*) 0, - TL_OPTION_UPDATING, - TL_IGNORE)) -@@ -13466,7 +13396,6 @@ - AGGREGATE_SYM remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $4)) - { -@@ -13484,7 +13413,6 @@ - | remember_name FUNCTION_SYM ident - RETURNS_SYM udf_type SONAME_SYM TEXT_STRING_sys - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - if (is_native_function(thd, & $3)) - { -@@ -13507,7 +13435,6 @@ - sp_name /* $3 */ - '(' /* $4 */ - { /* $5 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - sp_head *sp; -@@ -13565,7 +13492,7 @@ - MYSQL_YYABORT; - } - -- if (sp->fill_field_definition(YYTHD, lex, -+ if (sp->fill_field_definition(thd, lex, - (enum enum_field_types) $11, - &sp->m_return_field_def)) - MYSQL_YYABORT; -@@ -13574,7 +13501,6 @@ - } - sp_c_chistics /* $13 */ - { /* $14 */ -- THD *thd= YYTHD; - LEX *lex= thd->lex; - Lex_input_stream *lip= YYLIP; - -@@ -13583,7 +13509,6 @@ - } - sp_proc_stmt /* $15 */ - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - sp_head *sp= lex->sphead; - -@@ -13654,10 +13579,10 @@ - sp= new sp_head(); - if (sp == NULL) - MYSQL_YYABORT; -- sp->reset_thd_mem_root(YYTHD); -+ sp->reset_thd_mem_root(thd); - sp->init(lex); - sp->m_type= TYPE_ENUM_PROCEDURE; -- sp->init_sp_name(YYTHD, $3); -+ sp->init_sp_name(thd, $3); - - lex->sphead= sp; - } -@@ -13672,7 +13597,6 @@ - sp_pdparam_list - ')' - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_param_end= YYLIP->get_cpp_tok_start(); -@@ -13680,7 +13604,6 @@ - } - sp_c_chistics - { -- THD *thd= YYTHD; - LEX *lex= thd->lex; - - lex->sphead->m_chistics= &lex->sp_chistics; -@@ -13691,9 +13614,9 @@ - LEX *lex= Lex; - sp_head *sp= lex->sphead; - -- sp->set_stmt_end(YYTHD); -+ sp->set_stmt_end(thd); - lex->sql_command= SQLCOM_CREATE_PROCEDURE; -- sp->restore_thd_mem_root(YYTHD); -+ sp->restore_thd_mem_root(thd); - } - ; - -@@ -13730,21 +13653,21 @@ - text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), 0, 0); - } - | text_string ',' text_string - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set(1L, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } - | text_string ',' text_string ',' ulong_num - { - MYSQL_YYABORT_UNLESS($1->length() <= MAXGTRIDSIZE && $3->length() <= MAXBQUALSIZE); -- if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID)))) -+ if (!(Lex->xid=(XID *)thd->alloc(sizeof(XID)))) - MYSQL_YYABORT; - Lex->xid->set($5, $1->ptr(), $1->length(), $3->ptr(), $3->length()); - } diff --git a/package.bak/oracle-mysql/0006-no-force-static-build.patch b/package.bak/oracle-mysql/0006-no-force-static-build.patch deleted file mode 100644 index 8172a9848e..0000000000 --- a/package.bak/oracle-mysql/0006-no-force-static-build.patch +++ /dev/null @@ -1,18 +0,0 @@ -configure: do not force a static link for non-installed programs - -Otherwise, it tries to link against a static libz, which may not exist -in a shared-only system. - -Signed-off-by: "Yann E. MORIN" - -diff -durN mysql-5.1.73.orig/configure.in mysql-5.1.73/configure.in ---- mysql-5.1.73.orig/configure.in 2014-12-22 00:04:46.550508208 +0100 -+++ mysql-5.1.73/configure.in 2014-12-22 00:05:56.415307480 +0100 -@@ -562,7 +562,6 @@ - AC_MSG_ERROR([MySQL requires an ANSI C compiler (and a C++ compiler). Try gcc. See the Installation chapter in the Reference Manual.]) - fi - --NOINST_LDFLAGS="-static" - - static_nss="" - STATIC_NSS_FLAGS="" diff --git a/package.bak/oracle-mysql/0007-dont-install-in-mysql-directory.patch b/package.bak/oracle-mysql/0007-dont-install-in-mysql-directory.patch deleted file mode 100644 index 971b9ceeb5..0000000000 --- a/package.bak/oracle-mysql/0007-dont-install-in-mysql-directory.patch +++ /dev/null @@ -1,182 +0,0 @@ -Don't install in mysql directory - -Installing libraries in a subdirectory of /usr/lib leads to no end of -trouble. It requires either setting a RUN_PATH in the ELF files linked -with it or adding the path to ld.so.conf and calling ldconfig on the -target. - -So to simplify things, put everything in /usr/lib instead of -/usr/lib/mysql - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -diff -Nrup mysql-5.1.73.orig/dbug/Makefile.am mysql-5.1.73/dbug/Makefile.am ---- mysql-5.1.73.orig/dbug/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/dbug/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -17,7 +17,7 @@ - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include - LDADD = libdbug.a ../mysys/libmysys.a ../strings/libmystrings.a --pkglib_LIBRARIES = libdbug.a -+lib_LIBRARIES = libdbug.a - noinst_HEADERS = dbug_long.h - libdbug_a_SOURCES = dbug.c sanity.c - EXTRA_DIST = CMakeLists.txt example1.c example2.c example3.c \ -diff -Nrup mysql-5.1.73.orig/libmysql/Makefile.shared mysql-5.1.73/libmysql/Makefile.shared ---- mysql-5.1.73.orig/libmysql/Makefile.shared 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysql/Makefile.shared 2015-12-14 00:34:58.567937603 +0100 -@@ -25,7 +25,7 @@ MYSQLBASEdir= $(prefix) - ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded - ## until someone complains that they need separate options. - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) --pkglib_LTLIBRARIES = $(target) -+lib_LTLIBRARIES = $(target) - - noinst_PROGRAMS = conf_to_src - -diff -Nrup mysql-5.1.73.orig/libmysqld/Makefile.am mysql-5.1.73/libmysqld/Makefile.am ---- mysql-5.1.73.orig/libmysqld/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/libmysqld/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -38,7 +38,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - @condition_dependent_plugin_includes@ - - noinst_LIBRARIES = libmysqld_int.a --pkglib_LIBRARIES = libmysqld.a -+lib_LIBRARIES = libmysqld.a - SUBDIRS = . examples - libmysqld_sources= libmysqld.c lib_sql.cc emb_qcache.cc - libmysqlsources = errmsg.c get_password.c libmysql.c client.c pack.c \ -diff -Nrup mysql-5.1.73.orig/mysys/Makefile.am mysql-5.1.73/mysys/Makefile.am ---- mysql-5.1.73.orig/mysys/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/mysys/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -18,7 +18,7 @@ MYSQLSHAREdir = $(pkgdatadir) - MYSQLBASEdir= $(prefix) - INCLUDES = @ZLIB_INCLUDES@ -I$(top_builddir)/include \ - -I$(top_srcdir)/include -I$(srcdir) --pkglib_LIBRARIES = libmysys.a -+lib_LIBRARIES = libmysys.a - LDADD = libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a - noinst_HEADERS = mysys_priv.h my_static.h my_handler_errors.h - libmysys_a_SOURCES = my_init.c my_getwd.c mf_getdate.c my_mmap.c \ -diff -Nrup mysql-5.1.73.orig/storage/csv/Makefile.am mysql-5.1.73/storage/csv/Makefile.am ---- mysql-5.1.73.orig/storage/csv/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/csv/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - noinst_HEADERS = ha_tina.h transparent_file.h - - EXTRA_LTLIBRARIES = ha_csv.la --pkglib_LTLIBRARIES = @plugin_csv_shared_target@ -+lib_LTLIBRARIES = @plugin_csv_shared_target@ - ha_csv_la_LDFLAGS = -module -rpath $(MYSQLLIBdir) - ha_csv_la_CXXFLAGS = $(AM_CXXFLAGS) -DMYSQL_PLUGIN - ha_csv_la_SOURCES = transparent_file.cc ha_tina.cc -diff -Nrup mysql-5.1.73.orig/storage/heap/Makefile.am mysql-5.1.73/storage/heap/Makefile.am ---- mysql-5.1.73.orig/storage/heap/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/heap/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libheap.a -+lib_LIBRARIES = libheap.a - noinst_PROGRAMS = hp_test1 hp_test2 - noinst_LIBRARIES = libheap.a - hp_test1_LDFLAGS = @NOINST_LDFLAGS@ -diff -Nrup mysql-5.1.73.orig/storage/myisam/Makefile.am mysql-5.1.73/storage/myisam/Makefile.am ---- mysql-5.1.73.orig/storage/myisam/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisam/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -30,7 +30,7 @@ DEFS = @DEFS@ - EXTRA_DIST = mi_test_all.sh mi_test_all.res ft_stem.c CMakeLists.txt plug.in - pkgdata_DATA = mi_test_all mi_test_all.res - --pkglib_LIBRARIES = libmyisam.a -+lib_LIBRARIES = libmyisam.a - bin_PROGRAMS = myisamchk myisamlog myisampack myisam_ftdump - myisamchk_DEPENDENCIES= $(LIBRARIES) - myisamchk_LDADD= @CLIENT_EXTRA_LDFLAGS@ libmyisam.a \ -diff -Nrup mysql-5.1.73.orig/storage/myisammrg/Makefile.am mysql-5.1.73/storage/myisammrg/Makefile.am ---- mysql-5.1.73.orig/storage/myisammrg/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/storage/myisammrg/Makefile.am 2015-12-14 00:34:58.563937596 +0100 -@@ -26,7 +26,7 @@ WRAPLIBS= - LDADD = - - DEFS = @DEFS@ --pkglib_LIBRARIES = libmyisammrg.a -+lib_LIBRARIES = libmyisammrg.a - noinst_HEADERS = myrg_def.h ha_myisammrg.h - noinst_LIBRARIES = libmyisammrg.a - libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \ -diff -Nrup mysql-5.1.73.orig/strings/Makefile.am mysql-5.1.73/strings/Makefile.am ---- mysql-5.1.73.orig/strings/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/strings/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - # This file is public domain and comes with NO WARRANTY of any kind - - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include --pkglib_LIBRARIES = libmystrings.a -+lib_LIBRARIES = libmystrings.a - - # Exact one of ASSEMBLER_X - if ASSEMBLER_x86 -@@ -69,15 +69,15 @@ conf_to_src_LDFLAGS= @NOINST_LDFLAGS@ - - FLAGS=$(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @NOINST_LDFLAGS@ - --str_test: str_test.c $(pkglib_LIBRARIES) -- $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(pkglib_LIBRARIES) -+str_test: str_test.c $(lib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN $(INCLUDES) $(srcdir)/str_test.c $(LDADD) $(lib_LIBRARIES) - - uctypedump: uctypedump.c - $(LINK) $(INCLUDES) $(srcdir)/uctypedump.c - --test_decimal$(EXEEXT): decimal.c $(pkglib_LIBRARIES) -+test_decimal$(EXEEXT): decimal.c $(lib_LIBRARIES) - $(CP) $(srcdir)/decimal.c ./test_decimal.c -- $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(pkglib_LIBRARIES) -+ $(LINK) $(FLAGS) -DMAIN ./test_decimal.c $(LDADD) $(lib_LIBRARIES) - $(RM) -f ./test_decimal.c - - # Don't update the files from bitkeeper -diff -Nrup mysql-5.1.73.orig/tests/Makefile.am mysql-5.1.73/tests/Makefile.am ---- mysql-5.1.73.orig/tests/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/tests/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -51,11 +51,11 @@ mysql_client_test.o: mysql_client_fw.c - - insert_test_SOURCES= insert_test.c - select_test_SOURCES= select_test.c --insert_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) --select_test_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+insert_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) -+select_test_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - bug25714_SOURCES= bug25714.c --bug25714_DEPENDENCIES= $(LIBRARIES) $(pkglib_LTLIBRARIES) -+bug25714_DEPENDENCIES= $(LIBRARIES) $(lib_LTLIBRARIES) - - # Fix for mit-threads - DEFS = -DMYSQL_CLIENT_NO_THREADS -diff -Nrup mysql-5.1.73.orig/vio/Makefile.am mysql-5.1.73/vio/Makefile.am ---- mysql-5.1.73.orig/vio/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/vio/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -16,7 +16,7 @@ - INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - $(openssl_includes) - LDADD = @CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) $(yassl_libs) --pkglib_LIBRARIES = libvio.a -+lib_LIBRARIES = libvio.a - - noinst_HEADERS = vio_priv.h - -diff -Nrup mysql-5.1.73.orig/zlib/Makefile.am mysql-5.1.73/zlib/Makefile.am ---- mysql-5.1.73.orig/zlib/Makefile.am 2013-11-04 19:52:27.000000000 +0100 -+++ mysql-5.1.73/zlib/Makefile.am 2015-12-14 00:34:58.567937603 +0100 -@@ -19,7 +19,7 @@ INCLUDES= -I$(top_builddir)/include -I$ - - LIBS= $(NON_THREADED_LIBS) - --pkglib_LTLIBRARIES = libz.la -+lib_LTLIBRARIES = libz.la - noinst_LTLIBRARIES = libzlt.la - - libz_la_LDFLAGS = -static diff --git a/package.bak/oracle-mysql/S97mysqld b/package.bak/oracle-mysql/S97mysqld deleted file mode 100644 index 110ca2cd12..0000000000 --- a/package.bak/oracle-mysql/S97mysqld +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh - -MYSQL_DIR="/var/mysql" -MYSQL_USER="mysql" - -[ -r /etc/default/mysql ] && . /etc/default/mysql - -case "$1" in - start) - if [ ! -d $MYSQL_DIR/mysql ] ; then - echo "Creating MySQL system tables..." - mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR - fi - - # mysqld runs as user mysql, but /run is only writable by root - # so create a subdirectory for mysql. - install -d -o mysql -g root -m 0755 /run/mysql - - # We don't use start-stop-daemon because mysqld has - # its own wrapper script. - printf "Starting mysql..." - /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid & - echo "done." - ;; - stop) - printf "Stopping mysql..." - if test -f /run/mysql/mysqld.pid ; then - kill `cat /run/mysql/mysqld.pid` - fi - echo "done." - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: /etc/init.d/mysqld {start|stop|restart}" - ;; -esac diff --git a/package.bak/oracle-mysql/mysqld.service b/package.bak/oracle-mysql/mysqld.service deleted file mode 100644 index c9e5e42f71..0000000000 --- a/package.bak/oracle-mysql/mysqld.service +++ /dev/null @@ -1,13 +0,0 @@ -[Unit] -Description=MySQL database server - -[Service] -ExecStartPre=/bin/sh -c 'test -d /var/mysql/mysql || mysql_install_db --user=mysql --ldata=/var/mysql' -ExecStart=/usr/bin/mysqld_safe -Restart=always -User=mysql -RuntimeDirectory=mysql -RuntimeDirectoryMode=0755 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/oracle-mysql/oracle-mysql.hash b/package.bak/oracle-mysql/oracle-mysql.hash deleted file mode 100644 index bc309ec9a8..0000000000 --- a/package.bak/oracle-mysql/oracle-mysql.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://downloads.mariadb.com/archives/mysql-5.1/mysql-5.1.73.tar.gz.md5 -md5 887f869bcc757957067b9198f707f32f mysql-5.1.73.tar.gz -# Locally computed -sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 mysql-5.1.73.tar.gz diff --git a/package.bak/oracle-mysql/oracle-mysql.mk b/package.bak/oracle-mysql/oracle-mysql.mk deleted file mode 100644 index f0f0649618..0000000000 --- a/package.bak/oracle-mysql/oracle-mysql.mk +++ /dev/null @@ -1,136 +0,0 @@ -################################################################################ -# -# oracle-mysql -# -################################################################################ - -ORACLE_MYSQL_VERSION_MAJOR = 5.1 -ORACLE_MYSQL_VERSION = $(ORACLE_MYSQL_VERSION_MAJOR).73 -ORACLE_MYSQL_SOURCE = mysql-$(ORACLE_MYSQL_VERSION).tar.gz -ORACLE_MYSQL_SITE = http://dev.mysql.com/get/Downloads/MySQL-$(ORACLE_MYSQL_VERSION_MAJOR) -ORACLE_MYSQL_INSTALL_STAGING = YES -ORACLE_MYSQL_DEPENDENCIES = readline ncurses -ORACLE_MYSQL_AUTORECONF = YES -ORACLE_MYSQL_LICENSE = GPLv2 -ORACLE_MYSQL_LICENSE_FILES = README COPYING -ORACLE_MYSQL_PROVIDES = mysql - -# Unix socket. This variable can also be consulted by other buildroot packages -MYSQL_SOCKET = /run/mysql/mysql.sock - -ORACLE_MYSQL_CONF_ENV = \ - ac_cv_sys_restartable_syscalls=yes \ - ac_cv_path_PS=/bin/ps \ - ac_cv_FIND_PROC="/bin/ps p \$\$PID | grep -v grep | grep mysqld > /dev/null" \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_GCC=yes \ - ac_cv_have_decl_HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=no \ - ac_cv_have_decl_HAVE_IB_GCC_ATOMIC_BUILTINS=yes \ - mysql_cv_new_rl_interface=yes - -ORACLE_MYSQL_CONF_OPTS = \ - --without-ndb-binlog \ - --without-docs \ - --without-man \ - --without-libedit \ - --without-readline \ - --with-low-memory \ - --enable-thread-safe-client \ - --with-unix-socket-path=$(MYSQL_SOCKET) \ - --disable-mysql-maintainer-mode - -# host-oracle-mysql only installs what is needed to build mysql, i.e. the -# gen_lex_hash tool, and it only builds the parts that are needed to -# create this tool -HOST_ORACLE_MYSQL_DEPENDENCIES = host-zlib host-ncurses - -HOST_ORACLE_MYSQL_CONF_OPTS = \ - --with-embedded-server \ - --disable-mysql-maintainer-mode - -define HOST_ORACLE_MYSQL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/include my_config.h - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/mysys libmysys.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/strings libmystrings.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/vio libvio.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/dbug libdbug.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/regex libregex.a - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/sql gen_lex_hash -endef - -define HOST_ORACLE_MYSQL_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/sql/gen_lex_hash $(HOST_DIR)/usr/bin/ -endef - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ORACLE_MYSQL_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -ORACLE_MYSQL_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_ORACLE_MYSQL_SERVER),y) -ORACLE_MYSQL_DEPENDENCIES += host-oracle-mysql host-bison - -ORACLE_MYSQL_CONF_OPTS += \ - --localstatedir=/var/mysql \ - --with-atomic-ops=up \ - --with-embedded-server \ - --without-query-cache \ - --without-plugin-partition \ - --without-plugin-daemon_example \ - --without-plugin-ftexample \ - --without-plugin-archive \ - --without-plugin-blackhole \ - --without-plugin-example \ - --without-plugin-federated \ - --without-plugin-ibmdb2i \ - --without-plugin-innobase \ - --without-plugin-innodb_plugin \ - --without-plugin-ndbcluster - -# Debugging is only available for the server, so no need for -# this if-block outside of the server if-block -ifeq ($(BR2_ENABLE_DEBUG),y) -ORACLE_MYSQL_CONF_OPTS += --with-debug=full -else -ORACLE_MYSQL_CONF_OPTS += --without-debug -endif - -define ORACLE_MYSQL_USERS - mysql -1 nogroup -1 * /var/mysql - - MySQL daemon -endef - -define ORACLE_MYSQL_ADD_FOLDER - $(INSTALL) -d $(TARGET_DIR)/var/mysql -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_ADD_FOLDER - -define ORACLE_MYSQL_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(ORACLE_MYSQL_PKGDIR)/S97mysqld \ - $(TARGET_DIR)/etc/init.d/S97mysqld -endef - -define ORACLE_MYSQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(ORACLE_MYSQL_PKGDIR)/mysqld.service \ - $(TARGET_DIR)/usr/lib/systemd/system/mysqld.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/mysqld.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/mysqld.service -endef - -else -ORACLE_MYSQL_CONF_OPTS += \ - --without-server -endif - - -define ORACLE_MYSQL_REMOVE_TEST_PROGS - rm -rf $(TARGET_DIR)/usr/mysql-test $(TARGET_DIR)/usr/sql-bench -endef - -ORACLE_MYSQL_POST_INSTALL_TARGET_HOOKS += ORACLE_MYSQL_REMOVE_TEST_PROGS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/orbit/Config.in b/package.bak/orbit/Config.in deleted file mode 100644 index 556c46eaa3..0000000000 --- a/package.bak/orbit/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_ORBIT - bool "orbit" - # These are runtime dependencies - select BR2_PACKAGE_WSAPI - select BR2_PACKAGE_LUAFILESYSTEM - help - An MVC web framework for Lua. The design is inspired by lightweight - Ruby frameworks such as Camping - - http://keplerproject.github.com/orbit diff --git a/package.bak/orbit/orbit.hash b/package.bak/orbit/orbit.hash deleted file mode 100644 index 91eba3c63d..0000000000 --- a/package.bak/orbit/orbit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 42b0357041b4bdb051cb1a56cf73e3c2b2a2be207d431f70b4955465ad94b6a6 orbit-2.2.3-1.src.rock diff --git a/package.bak/orbit/orbit.mk b/package.bak/orbit/orbit.mk deleted file mode 100644 index fa30f38427..0000000000 --- a/package.bak/orbit/orbit.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# orbit -# -################################################################################ - -ORBIT_VERSION_UPSTREAM = 2.2.3 -ORBIT_VERSION = $(ORBIT_VERSION_UPSTREAM)-1 -ORBIT_SUBDIR = orbit -ORBIT_LICENSE = MIT -ORBIT_LICENSE_FILES = $(ORBIT_SUBDIR)/doc/us/license.md - -$(eval $(luarocks-package)) diff --git a/package.bak/orc/Config.in b/package.bak/orc/Config.in deleted file mode 100644 index 2470d99284..0000000000 --- a/package.bak/orc/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_ORC - bool "orc" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_BINFMT_FLAT # configure doesn't know uclinux - help - Orc is a library and set of tools for compiling and executing - very simple programs that operate on arrays of data. - - http://code.entropywave.com/projects/orc/ - -comment "orc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_BINFMT_FLAT diff --git a/package.bak/orc/orc.hash b/package.bak/orc/orc.hash deleted file mode 100644 index 200467cf7f..0000000000 --- a/package.bak/orc/orc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/gstreamer-devel/2016-August/060159.html -sha256 7d52fa80ef84988359c3434e1eea302d077a08987abdde6905678ebcad4fa649 orc-0.4.26.tar.xz diff --git a/package.bak/orc/orc.mk b/package.bak/orc/orc.mk deleted file mode 100644 index 4456f5310f..0000000000 --- a/package.bak/orc/orc.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# orc -# -################################################################################ - -ORC_VERSION = 0.4.26 -ORC_SOURCE = orc-$(ORC_VERSION).tar.xz -ORC_SITE = http://gstreamer.freedesktop.org/data/src/orc -ORC_LICENSE = BSD-2c, BSD-3c -ORC_LICENSE_FILES = COPYING -ORC_INSTALL_STAGING = YES -ORC_DEPENDENCIES = host-orc - -define ORC_REMOVE_BUGREPORT - rm -f $(TARGET_DIR)/usr/bin/orc-bugreport -endef - -define ORC_REMOVE_DEVFILES - rm -f $(TARGET_DIR)/usr/bin/orcc -endef - -ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_BUGREPORT -ORC_POST_INSTALL_TARGET_HOOKS += ORC_REMOVE_DEVFILES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/ortp/Config.in b/package.bak/ortp/Config.in deleted file mode 100644 index 788eaf4bbb..0000000000 --- a/package.bak/ortp/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_ORTP - bool "oRTP" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BCTOOLBOX - help - oRTP, a Real-time Transport Protocol (RTP,RFC3550) library - - http://www.linphone.org/eng/documentation/dev/ortp.html - -comment "ortp needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/ortp/ortp.hash b/package.bak/ortp/ortp.hash deleted file mode 100644 index c990d96eb3..0000000000 --- a/package.bak/ortp/ortp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 eb61a833ab3ad80978d7007411240f46e9b2d1034373b9d9dfaac88c1b6ec0af ortp-0.27.0.tar.gz diff --git a/package.bak/ortp/ortp.mk b/package.bak/ortp/ortp.mk deleted file mode 100644 index da17231f91..0000000000 --- a/package.bak/ortp/ortp.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# ortp -# -################################################################################ - -ORTP_VERSION = 0.27.0 -ORTP_SITE = http://download.savannah.nongnu.org/releases/linphone/ortp/sources - -ORTP_CONF_OPTS = --disable-strict -ORTP_INSTALL_STAGING = YES -ORTP_LICENSE = LGPLv2.1+ -ORTP_LICENSE_FILES = COPYING -ORTP_DEPENDENCIES = bctoolbox - -$(eval $(autotools-package)) diff --git a/package.bak/owfs/0001-configure.ac-check-for-localtime_r.patch b/package.bak/owfs/0001-configure.ac-check-for-localtime_r.patch deleted file mode 100644 index c4c384457f..0000000000 --- a/package.bak/owfs/0001-configure.ac-check-for-localtime_r.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 75e92438bcdb78a90912366b07bf503646806686 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sun, 21 Feb 2016 17:02:06 +0100 -Subject: [PATCH] configure.ac: check for localtime_r - -HAVE_LOCALTIME_R is used in owftp.c, so it should be checked for. - -Without this, static build fails because localtime_r is defined twice. - -Upstream-Status: Submitted -https://sourceforge.net/p/owfs/mailman/message/34873667/ - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index c22dde9..12fdd18 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1529,7 +1529,7 @@ AC_FUNC_SELECT_ARGTYPES - AC_FUNC_STRFTIME - AC_FUNC_STRTOD - AC_TYPE_SIGNAL --AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline]) -+AC_CHECK_FUNCS([accept daemon getaddrinfo freeaddrinfo gethostbyname2_r gethostbyaddr_r gethostbyname_r getservbyname_r getopt getopt_long gettimeofday inet_ntop inet_pton memchr memset select socket strcasecmp strchr strdup strncasecmp strtol strtoul twalk tsearch tfind tdelete tdestroy vasprintf strsep vsprintf vsnprintf writev getline localtime_r]) - - if test "${ENABLE_ZERO}" = "true" ; then - AC_SEARCH_LIBS(dlopen, dl, AC_DEFINE(HAVE_DLOPEN, 1, [Define if you have dlopen])) --- -2.7.0 - diff --git a/package.bak/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch b/package.bak/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch deleted file mode 100644 index 7ae79325f4..0000000000 --- a/package.bak/owfs/0002-compat.h-only-include-compat_netdb.h-if-needed.patch +++ /dev/null @@ -1,58 +0,0 @@ -From d24e63eea4f4d234f313145e40668a5e2f64e49c Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Wed, 9 Mar 2016 23:20:11 +0100 -Subject: [PATCH] compat.h: only include compat_netdb.h if needed - -compat_netdb.h is added for only one reason: to provide the definitions -for getaddrinfo, in case it is not provided by the system. -compat_netdb.h is just a copy from an old glibc version, but that makes -it incompatible with other standard C libraries. For example, uClibc -without RPC support doesn't have the rpc/netdb.h header. This leads to -build errors. - -To work around this, only include compat_netdb.h when needed, i.e. -when getaddrinfo isn't provided natively. - -Note that this getaddrinfo compat was introduced in commit bc54c431 to -support Solaris 7. Starting from Solaris 8, however, getaddrinfo is -available natively, and it's available on MacOS, Windows and any other -POSIX-2001 compliant system as well. So it may be worhtwhile to remove -it altogether. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - module/owlib/src/include/compat.h | 2 ++ - module/ownet/c/src/include/compat.h | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/module/owlib/src/include/compat.h b/module/owlib/src/include/compat.h -index c55bc96..e95e16f 100644 ---- a/module/owlib/src/include/compat.h -+++ b/module/owlib/src/include/compat.h -@@ -57,7 +57,9 @@ - #include - #endif - -+#ifndef HAVE_GETADDRINFO - #include "compat_netdb.h" -+#endif - #include "compat_getopt.h" - - #ifndef HAVE_STRSEP -diff --git a/module/ownet/c/src/include/compat.h b/module/ownet/c/src/include/compat.h -index c45d852..f8ae759 100644 ---- a/module/ownet/c/src/include/compat.h -+++ b/module/ownet/c/src/include/compat.h -@@ -58,7 +58,9 @@ $Id$ - #include - #endif - -+#ifndef HAVE_GETADDRINFO - #include "compat_netdb.h" -+#endif - #include "compat_getopt.h" - - #ifndef HAVE_STRSEP --- -2.7.0 - diff --git a/package.bak/owfs/Config.in b/package.bak/owfs/Config.in deleted file mode 100644 index 802d1e4609..0000000000 --- a/package.bak/owfs/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_OWFS - bool "owfs" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - OWFS is an easy way to use the powerful 1-wire system of - Dallas/Maxim. - - OWFS is a simple and flexible program to monitor and control - the physical environment. You can write scripts to read - temperature, flash lights, write to an LCD, log and graph, - etc. - - http://owfs.org/ - -comment "owfs needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/owfs/S25owserver b/package.bak/owfs/S25owserver deleted file mode 100755 index b8da768e96..0000000000 --- a/package.bak/owfs/S25owserver +++ /dev/null @@ -1,31 +0,0 @@ -NAME="owserver" -DAEMON="/usr/bin/${NAME}" -PID_F="/run/${NAME}.pid" - -OWSERVER_ARGS= -[ -r /etc/default/${NAME} ] && . /etc/default/${NAME} - -case "$1" in -start) - printf "Starting ${NAME}: " - if [ -z "${OWSERVER_ARGS}" ]; then - echo "OWSERVER_ARGS must be set in defaults file" 1>&2 - exit 1 - fi - start-stop-daemon -S -x ${DAEMON} -- \ - --pid_file ${PID_F} ${OWSERVER_ARGS} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -stop) - printf "Stopping ${NAME}: " - start-stop-daemon -K -p ${PID_F} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -restart|reload) - $0 stop - $0 start - ;; -*) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package.bak/owfs/S30owfs b/package.bak/owfs/S30owfs deleted file mode 100755 index feed676f8a..0000000000 --- a/package.bak/owfs/S30owfs +++ /dev/null @@ -1,33 +0,0 @@ -NAME="owfs" -DAEMON="/usr/bin/${NAME}" -PID_F="/run/${NAME}.pid" -OWFS_MOUNTPOINT="/dev/1wire" -OWFS_DEVICES="-s localhost:4304" -OWFS_ARGS="" - -[ -r /etc/default/${NAME} ] && . /etc/default/${NAME} - -case "$1" in -start) - printf "Starting ${NAME}: " - # Fuse may be in a module, so try to load it - modprobe -q fuse && printf "[fuse] " - mkdir -p ${OWFS_MOUNTPOINT} - start-stop-daemon -S -x ${DAEMON} -- \ - --pid_file ${PID_F} -m ${OWFS_MOUNTPOINT} ${OWFS_DEVICES} \ - ${OWFS_ARGS} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -stop) - printf "Stopping ${NAME}: " - start-stop-daemon -K -p ${PID_F} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -restart|reload) - $0 stop - $0 start - ;; -*) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package.bak/owfs/owfs.hash b/package.bak/owfs/owfs.hash deleted file mode 100644 index 3991eec930..0000000000 --- a/package.bak/owfs/owfs.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/owfs/files/owfs/3.1p1/ -sha1 80892ca3e72fef2979b8f0a04db15fd24a2cbda6 owfs-3.1p1.tar.gz -# Locally calculated -sha256 e69421ae534565c1f8530a2447f583401f4d0d4b1cf3cb8cf399a57133ed7f81 owfs-3.1p1.tar.gz diff --git a/package.bak/owfs/owfs.mk b/package.bak/owfs/owfs.mk deleted file mode 100644 index e0679d21b7..0000000000 --- a/package.bak/owfs/owfs.mk +++ /dev/null @@ -1,93 +0,0 @@ -################################################################################ -# -# owfs -# -################################################################################ - -OWFS_VERSION = 3.1p1 -OWFS_SITE = http://downloads.sourceforge.net/project/owfs/owfs/$(OWFS_VERSION) -OWFS_DEPENDENCIES = host-pkgconf -OWFS_CONF_OPTS = --disable-owperl --without-perl5 --disable-owtcl --without-tcl - -# 0001-configure.ac-check-for-localtime_r.patch touches configure.ac -OWFS_AUTORECONF = YES - -# owtcl license is declared in module/ownet/c/src/include/ow_functions.h -OWFS_LICENSE = GPLv2+, LGPLv2 (owtcl) -OWFS_LICENSE_FILES = COPYING COPYING.LIB -OWFS_INSTALL_STAGING = YES - -# owfs PHP support is not PHP 7 compliant -# https://sourceforge.net/p/owfs/support-requests/32/ -OWFS_CONF_OPTS += --disable-owphp --without-php - -ifeq ($(BR2_PACKAGE_LIBFUSE),y) -OWFS_DEPENDENCIES += libfuse -OWFS_CONF_OPTS += \ - --enable-owfs \ - --with-fuseinclude=$(STAGING_DIR)/usr/include \ - --with-fuselib=$(STAGING_DIR)/usr/lib -define OWFS_INSTALL_FUSE_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S30owfs \ - $(TARGET_DIR)/etc/init.d/S30owfs -endef -define OWFS_CREATE_MOUNTPOINT - mkdir -p $(TARGET_DIR)/dev/1wire -endef -OWFS_POST_INSTALL_TARGET_HOOKS += OWFS_CREATE_MOUNTPOINT -else -OWFS_CONF_OPTS += --disable-owfs -endif - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -OWFS_CONF_OPTS += --enable-usb -OWFS_DEPENDENCIES += libusb -else -OWFS_CONF_OPTS += --disable-usb -endif - -ifeq ($(BR2_PACKAGE_AVAHI),y) -OWFS_CONF_OPTS += --enable-avahi -OWFS_DEPENDENCIES += avahi -else -OWFS_CONF_OPTS += --disable-avahi -endif - -# setup.py isn't python3 compliant -ifeq ($(BR2_PACKAGE_PYTHON),y) -OWFS_CONF_OPTS += \ - --enable-owpython \ - --with-python \ - --with-pythonconfig=$(STAGING_DIR)/usr/bin/python-config -OWFS_MAKE_ENV += \ - CC="$(TARGET_CC)" \ - PYTHONPATH="$(PYTHON_PATH)" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr -OWFS_DEPENDENCIES += python host-swig -# The configure scripts finds PYSITEDIR as the python_lib directory of -# host-python, and then prepends DESTDIR in front of it. So we end up -# installing things in $(TARGET_DIR)/$(HOST_DIR)/usr/lib/python which is -# clearly wrong. -# Patching owfs to do the right thing is not trivial, it's much easier to -# override the PYSITEDIR variable in make. -OWFS_EXTRA_MAKE_OPTS += PYSITEDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -else -OWFS_CONF_OPTS += --disable-owpython --without-python -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# zeroconf support uses dlopen() -OWFS_CONF_OPTS += --disable-zero -endif - -OWFS_MAKE = $(MAKE) $(OWFS_EXTRA_MAKE_OPTS) - -define OWFS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(OWFS_PKGDIR)S25owserver \ - $(TARGET_DIR)/etc/init.d/S25owserver - $(OWFS_INSTALL_FUSE_INIT_SYSV) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/owl-linux/0001-fix-for-linux-3.3.x.patch b/package.bak/owl-linux/0001-fix-for-linux-3.3.x.patch deleted file mode 100644 index 831ac7fd11..0000000000 --- a/package.bak/owl-linux/0001-fix-for-linux-3.3.x.patch +++ /dev/null @@ -1,21 +0,0 @@ -Kernel commit b81693d9149c598302e8eb9c20cb20330d922c8e changed the -net_device_ops structure, removing the ndo_set_multicast_list callback. The -ndo_set_rx_mode has also been added to this structure. - -The upshot of these changes is that owl-linux fails to compile with 3.3.x -and later kernels. - -Signed-off-by: Simon Dawson -diff -Nurp a/owl_net.c b/owl_net.c ---- a/owl_net.c 2012-06-14 10:51:45.000000000 +0100 -+++ b/owl_net.c 2012-07-20 13:16:28.772351464 +0100 -@@ -384,7 +384,9 @@ static const struct net_device_ops netde - #endif /* OWL_CONFIG_IFUPDOWN */ - .ndo_start_xmit = owl_net_tx, - .ndo_get_stats = owl_net_get_stats, -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) - .ndo_set_multicast_list = NULL, -+#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) */ - .ndo_tx_timeout = owl_net_tx_timeout, - .ndo_set_mac_address = NULL, - }; diff --git a/package.bak/owl-linux/Config.in b/package.bak/owl-linux/Config.in deleted file mode 100644 index 595a1db798..0000000000 --- a/package.bak/owl-linux/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_OWL_LINUX - bool "owl-linux" - depends on BR2_LINUX_KERNEL - depends on (BR2_arm920t || BR2_arm922t || BR2_arm926t) - help - Linux kernel driver for the H&D Wireless SPB104 SD-card WiFi SIP. - - owl-linux requires the hidden kernel option WIRELESS_EXT enabled. - - http://linux.hd-wireless.se/bin/view/Linux/GettingStarted - -comment "owl-linux needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - depends on BR2_arm || BR2_armeb - -comment "owl-linux is only supported on ARM9 architecture" - depends on !(BR2_arm920t || BR2_arm922t || BR2_arm926t) - depends on BR2_arm || BR2_armeb diff --git a/package.bak/owl-linux/owl-linux.hash b/package.bak/owl-linux/owl-linux.hash deleted file mode 100644 index 4a5133df47..0000000000 --- a/package.bak/owl-linux/owl-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 a6b1bc6b3900954438a0f1a316bac5f74171125a88c80c35e137f4ca512dedc6 owl-linux-1.0.7.tar.gz diff --git a/package.bak/owl-linux/owl-linux.mk b/package.bak/owl-linux/owl-linux.mk deleted file mode 100644 index 1262425249..0000000000 --- a/package.bak/owl-linux/owl-linux.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# owl-linux -# -################################################################################ - -OWL_LINUX_VERSION = 1.0.7 -OWL_LINUX_SITE = http://linux.hd-wireless.se/pub/Linux/DownloadDrivers -OWL_LINUX_LICENSE = PROPRIETARY -OWL_LINUX_LICENSE_FILES = LICENSE -OWL_LINUX_REDISTRIBUTE = NO - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch b/package.bak/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch deleted file mode 100644 index 3562f3c2b6..0000000000 --- a/package.bak/p11-kit/0001-Fix-build-against-older-pthreads-implementations.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 05b6a7550756ffdced25a6c51cf2222bad9e59e7 Mon Sep 17 00:00:00 2001 -Message-Id: <05b6a7550756ffdced25a6c51cf2222bad9e59e7.1399285491.git.baruch@tkos.co.il> -From: Baruch Siach -Date: Mon, 5 May 2014 09:32:23 +0300 -Subject: [PATCH] Fix build against older pthreads implementations - -Older pthreads implementations like glibc NPTL prior to version 2.12, and -uClibc linuxthreads (both), need _XOPEN_SOURCE to expose -pthread_mutexattr_settype() and THREAD_MUTEX_DEFAULT. The value 600 (SuSv3, -POSIX.1-2001) is equivalent to _POSIX_C_SOURCE 200112L. - -Fixes the following build error: - - CC compat.lo -compat.c: In function 'p11_mutex_init': -compat.c:164:2: warning: implicit declaration of function 'pthread_mutexattr_settype' [-Wimplicit-function-declaration] -compat.c:164:2: warning: nested extern declaration of 'pthread_mutexattr_settype' [-Wnested-externs] -compat.c:164:36: error: 'PTHREAD_MUTEX_DEFAULT' undeclared (first use in this function) - -Patch status: sent upstream - -Signed-off-by: Baruch Siach ---- - common/compat.h | 6 ++++++ - common/message.c | 6 ------ - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/common/compat.h b/common/compat.h -index d7fe414a46bf..fbc1dc1d4f0f 100644 ---- a/common/compat.h -+++ b/common/compat.h -@@ -37,6 +37,12 @@ - - #include "config.h" - -+/* -+ * Oh god. glibc is nasty. Changes behavior and definitions of POSIX -+ * functions to completely different signatures depending on defines -+ */ -+#define _XOPEN_SOURCE 600 -+ - #include - #include - -diff --git a/common/message.c b/common/message.c -index 35f2764487a9..e68dfac561c8 100644 ---- a/common/message.c -+++ b/common/message.c -@@ -37,12 +37,6 @@ - - #include "config.h" - --/* -- * Oh god. glibc is nasty. Changes behavior and definitions of POSIX -- * functions to completely different signatures depending on defines -- */ --#define _POSIX_C_SOURCE 200112L -- - #include "compat.h" - #define P11_DEBUG_FLAG P11_DEBUG_LIB - #include "debug.h" --- -2.0.0.rc0 - diff --git a/package.bak/p11-kit/Config.in b/package.bak/p11-kit/Config.in deleted file mode 100644 index a6b7261886..0000000000 --- a/package.bak/p11-kit/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_P11_KIT - bool "p11-kit" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_LIBTASN1 - help - Provides a way to load and enumerate PKCS#11 modules. - Provides a standard configuration setup for installing PKCS#11 - modules in such a way that they're discoverable. - - http://p11-glue.freedesktop.org/p11-kit.html - -comment "p11-kit needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/p11-kit/p11-kit.hash b/package.bak/p11-kit/p11-kit.hash deleted file mode 100644 index c0182eb4ce..0000000000 --- a/package.bak/p11-kit/p11-kit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ba726ea8303c97467a33fca50ee79b7b35212964be808ecf9b145e9042fdfaf0 p11-kit-0.23.2.tar.gz diff --git a/package.bak/p11-kit/p11-kit.mk b/package.bak/p11-kit/p11-kit.mk deleted file mode 100644 index e856cac092..0000000000 --- a/package.bak/p11-kit/p11-kit.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# p11-kit -# -################################################################################ - -P11_KIT_VERSION = 0.23.2 -P11_KIT_SITE = http://p11-glue.freedesktop.org/releases -P11_KIT_DEPENDENCIES = host-pkgconf libffi libtasn1 -P11_KIT_INSTALL_STAGING = YES -P11_KIT_CONF_OPTS = --disable-static -P11_KIT_CONF_ENV = ac_cv_have_decl_program_invocation_short_name=yes \ - ac_cv_have_decl___progname=no -P11_KIT_LICENSE = BSD-3c -P11_KIT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/p7zip/0001-bfin.patch b/package.bak/p7zip/0001-bfin.patch deleted file mode 100644 index 76addb652f..0000000000 --- a/package.bak/p7zip/0001-bfin.patch +++ /dev/null @@ -1,19 +0,0 @@ -Add support for blackfin arch. - -Fixes compilation error: -../../../../CPP/myWindows/mySplitCommandLine.cpp:99:8: error: #error ENDIANNESS - -Signed-off-by: Bernd Kuhls -(Patch sent upstream: https://sourceforge.net/p/p7zip/patches/33/ - -diff -uNr p7zip_15.14.1.org/C/CpuArch.h p7zip_15.14.1/C/CpuArch.h ---- p7zip_15.14.1.org/C/CpuArch.h 2016-02-17 07:27:16.000000000 +0100 -+++ p7zip_15.14.1/C/CpuArch.h 2016-06-08 19:47:49.000000000 +0200 -@@ -66,6 +66,7 @@ - || defined(__MIPSEL__) \ - || defined(__MIPSEL) \ - || defined(_MIPSEL) \ -+ || defined(__BFIN__) \ - || (defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__)) - #define MY_CPU_LE - #endif diff --git a/package.bak/p7zip/Config.in b/package.bak/p7zip/Config.in deleted file mode 100644 index 840949c8ff..0000000000 --- a/package.bak/p7zip/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_P7ZIP - bool "p7zip" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - help - p7zip is a quick port of the command line version of 7-zip for Unix. - (see http://www.7-zip.org) - - 7-Zip is a file archiver with highest compression ratio. - - http://sourceforge.net/projects/p7zip - -comment "p7zip needs a toolchain w/ threads, wchar, C++" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/p7zip/p7zip.hash b/package.bak/p7zip/p7zip.hash deleted file mode 100644 index ead6d87182..0000000000 --- a/package.bak/p7zip/p7zip.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/p7zip/files/p7zip/ -md5 92cca093312b5a71a7be7dc7d1d32509 p7zip_15.14.1_src_all.tar.bz2 -sha1 9b15a79f94230fab9b9d4f9f532c723117145c7a p7zip_15.14.1_src_all.tar.bz2 diff --git a/package.bak/p7zip/p7zip.mk b/package.bak/p7zip/p7zip.mk deleted file mode 100644 index 15d5138149..0000000000 --- a/package.bak/p7zip/p7zip.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# p7zip -# -################################################################################ - -P7ZIP_VERSION = 15.14.1 -P7ZIP_SOURCE = p7zip_$(P7ZIP_VERSION)_src_all.tar.bz2 -P7ZIP_SITE = http://downloads.sourceforge.net/project/p7zip/p7zip/$(P7ZIP_VERSION) -P7ZIP_LICENSE = LGPLv2.1+ with unRAR restriction -P7ZIP_LICENSE_FILES = DOC/License.txt - -# p7zip buildsystem is a mess: it plays dirty tricks with CFLAGS and -# CXXFLAGS, so we can't pass them. Instead, it accepts ALLFLAGS_C -# and ALLFLAGS_CPP as variables to pass the CFLAGS and CXXFLAGS. -define P7ZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" ALLFLAGS_C="$(TARGET_CFLAGS)" \ - CXX="$(TARGET_CXX)" ALLFLAGS_CPP="$(TARGET_CXXFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - -C $(@D) 7zr -endef - -define P7ZIP_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/7zr $(TARGET_DIR)/usr/bin/7zr -endef - -$(eval $(generic-package)) diff --git a/package.bak/p910nd/Config.in b/package.bak/p910nd/Config.in deleted file mode 100644 index 33f6cf8a5d..0000000000 --- a/package.bak/p910nd/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_P910ND - bool "p910nd" - depends on BR2_USE_MMU # fork() - help - p910nd is a small printer daemon intended for diskless - workstations. Using ports 9100-9102, it accepts - print jobs and passes them directly to a USB printer. - - http://p910nd.sourceforge.net/ diff --git a/package.bak/p910nd/p910nd.hash b/package.bak/p910nd/p910nd.hash deleted file mode 100644 index 1b952c8e12..0000000000 --- a/package.bak/p910nd/p910nd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4ac980a3ae24babae6f70f0a692625ece03a4a92c357fbb10d2e368386c3c26f p910nd-0.97.tar.bz2 diff --git a/package.bak/p910nd/p910nd.mk b/package.bak/p910nd/p910nd.mk deleted file mode 100644 index a1afdb3855..0000000000 --- a/package.bak/p910nd/p910nd.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# p910nd -# -################################################################################ - -P910ND_VERSION = 0.97 -P910ND_SITE = http://downloads.sourceforge.net/project/p910nd/p910nd/$(P910ND_VERSION) -P910ND_SOURCE = p910nd-$(P910ND_VERSION).tar.bz2 -P910ND_LICENSE = GPLv2 -P910ND_LICENSE_FILES = COPYING - -define P910ND_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define P910ND_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/p910nd $(TARGET_DIR)/usr/sbin/p910nd -endef - -$(eval $(generic-package)) diff --git a/package.bak/paho-mqtt-c/Config.in b/package.bak/paho-mqtt-c/Config.in deleted file mode 100644 index 3560d8c08c..0000000000 --- a/package.bak/paho-mqtt-c/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PAHO_MQTT_C - bool "paho-mqtt-c" - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - MQTT client C library - - https://eclipse.org/paho/clients/c/ - -comment "paho-mqtt-c needs a toolchain w/ threads and dynamic library support" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/paho-mqtt-c/paho-mqtt-c.hash b/package.bak/paho-mqtt-c/paho-mqtt-c.hash deleted file mode 100644 index 8807d788a3..0000000000 --- a/package.bak/paho-mqtt-c/paho-mqtt-c.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 970b9621efc24251441d386274cd0a90cf6ad52b64031f3c8cb53fdd5526f5f3 paho-mqtt-c-v1.1.0.tar.gz diff --git a/package.bak/paho-mqtt-c/paho-mqtt-c.mk b/package.bak/paho-mqtt-c/paho-mqtt-c.mk deleted file mode 100644 index 7fb3026d93..0000000000 --- a/package.bak/paho-mqtt-c/paho-mqtt-c.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# paho-mqtt-c -# -################################################################################ - -PAHO_MQTT_C_VERSION = v1.1.0 -PAHO_MQTT_C_SITE = $(call github,eclipse,paho.mqtt.c,$(PAHO_MQTT_C_VERSION)) -PAHO_MQTT_C_LICENSE = EPL-1.0 or BSD-3c -PAHO_MQTT_C_LICENSE_FILES = epl-v10 edl-v10 -PAHO_MQTT_C_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -PAHO_MQTT_C_DEPENDENCIES += openssl -PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=TRUE -else -PAHO_MQTT_C_CONF_OPTS += -DPAHO_WITH_SSL=FALSE -endif - -$(eval $(cmake-package)) diff --git a/package.bak/pango/0001-no-tests.patch b/package.bak/pango/0001-no-tests.patch deleted file mode 100644 index 734409db68..0000000000 --- a/package.bak/pango/0001-no-tests.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prevent Pango to build tests. - -Updated to Pango 1.36.3 by Hadrien Boutteville. - -Signed-off-by: Hadrien Boutteville -[Gustavo: update for 1.38.1] - -diff -Nura pango-1.38.1.orig/Makefile.am pango-1.38.1/Makefile.am ---- pango-1.38.1.orig/Makefile.am 2015-10-14 15:41:27.620016974 +0000 -+++ pango-1.38.1/Makefile.am 2015-10-14 15:41:54.431240793 +0000 -@@ -1,6 +1,6 @@ - ## Process this file with automake to create Makefile.in. - --SUBDIRS= pango pango-view examples docs tools tests build -+SUBDIRS= pango pango-view examples docs tools build - - EXTRA_DIST = \ - autogen.sh \ -diff -Nura pango-1.38.1.orig/Makefile.in pango-1.38.1/Makefile.in ---- pango-1.38.1.orig/Makefile.in 2015-10-14 15:41:27.630016685 +0000 -+++ pango-1.38.1/Makefile.in 2015-10-14 15:41:58.753115676 +0000 -@@ -417,7 +417,7 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = pango pango-view examples docs tools tests build -+SUBDIRS = pango pango-view examples docs tools build - EXTRA_DIST = \ - autogen.sh \ - pango.pc.in \ diff --git a/package.bak/pango/0002-no-gtk-doc.patch b/package.bak/pango/0002-no-gtk-doc.patch deleted file mode 100644 index 926a263f1b..0000000000 --- a/package.bak/pango/0002-no-gtk-doc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Same patch as for systemd in commit -7144f2f04b705538a893e538a6b851f536f433b6: - -Fix deactivation of gtk-doc - -The tarball contains the Makefile for building documentation with gtk-doc, -Unfortunately the AM_CONDITIONAL variable is not the correct one, which -results in an error when running autoreconf. - -This patch fixes this issue. - -Signed-off-by: Eric Le Bihan -Signed-off-by: Hadrien Boutteville - ---- a/gtk-doc.make -+++ b/gtk-doc.make -@@ -267,7 +267,7 @@ - # - # Require gtk-doc when making dist - # --if HAVE_GTK_DOC -+if ENABLE_GTK_DOC - dist-check-gtkdoc: docs - else - dist-check-gtkdoc: diff --git a/package.bak/pango/Config.in b/package.bak/pango/Config.in deleted file mode 100644 index 7813c4ebaf..0000000000 --- a/package.bak/pango/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -config BR2_PACKAGE_PANGO - bool "pango" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - depends on BR2_INSTALL_LIBSTDCPP # freetype support - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # harfbuzz - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_HARFBUZZ - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - help - Pango is a library for laying out and rendering of text, with an - emphasis on internationalization. Pango can be used anywhere that - text layout is needed, though most of the work on Pango so far has - been done in the context of the GTK+ widget toolkit. Pango forms the - core of text and font handling for GTK+-2.x. - - http://www.pango.org/ - -comment "pango needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/pango/pango.hash b/package.bak/pango/pango.hash deleted file mode 100644 index 1ea9f6bdda..0000000000 --- a/package.bak/pango/pango.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/GNOME/sources/pango/1.40/pango-1.40.3.sha256sum -sha256 abba8b5ce728520c3a0f1535eab19eac3c14aeef7faa5aded90017ceac2711d3 pango-1.40.3.tar.xz diff --git a/package.bak/pango/pango.mk b/package.bak/pango/pango.mk deleted file mode 100644 index b45bf9a949..0000000000 --- a/package.bak/pango/pango.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# pango -# -################################################################################ - -PANGO_VERSION_MAJOR = 1.40 -PANGO_VERSION = $(PANGO_VERSION_MAJOR).3 -PANGO_SOURCE = pango-$(PANGO_VERSION).tar.xz -PANGO_SITE = http://ftp.gnome.org/pub/GNOME/sources/pango/$(PANGO_VERSION_MAJOR) -PANGO_AUTORECONF = YES -PANGO_INSTALL_STAGING = YES -PANGO_LICENSE = LGPLv2+ -PANGO_LICENSE_FILES = COPYING - -PANGO_CONF_OPTS = --enable-explicit-deps=no -HOST_PANGO_CONF_OPTS = --enable-explicit-deps=no - -PANGO_DEPENDENCIES = \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - host-pkgconf \ - libglib2 \ - cairo \ - harfbuzz \ - fontconfig \ - freetype -HOST_PANGO_DEPENDENCIES = \ - host-pkgconf \ - host-libglib2 \ - host-cairo \ - host-harfbuzz \ - host-fontconfig \ - host-freetype - -ifeq ($(BR2_PACKAGE_XORG7),y) -PANGO_CONF_OPTS += \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib -PANGO_DEPENDENCIES += xlib_libX11 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yy) -PANGO_DEPENDENCIES += xlib_libXft xlib_libXrender -PANGO_CONF_OPTS += --with-xft -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/pangomm/Config.in b/package.bak/pangomm/Config.in deleted file mode 100644 index a7c41a008f..0000000000 --- a/package.bak/pangomm/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_PANGOMM - bool "pangomm" - select BR2_PACKAGE_CAIROMM - select BR2_PACKAGE_GLIBMM - select BR2_PACKAGE_PANGO - select BR2_PACKAGE_LIBSIGC - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_INSTALL_LIBSTDCPP # glibmm/pango - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_TOOLCHAIN_HAS_THREADS # *mm/pango -> libglib2 - depends on BR2_USE_MMU # *mm/pango -> libglib2 - depends on BR2_USE_WCHAR # *mm/pango -> libglib2 - help - The pangomm package is a set of C++ bindings for Pango. - - http://www.gtkmm.org/ - -comment "pangomm needs a toolchain w/ C++, wchar, threads, gcc >= 4.8" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/pangomm/pangomm.hash b/package.bak/pangomm/pangomm.hash deleted file mode 100644 index b5d527fa7b..0000000000 --- a/package.bak/pangomm/pangomm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.gnome.org/pub/gnome/sources/pangomm/2.40/pangomm-2.40.1.sha256sum -sha256 9762ee2a2d5781be6797448d4dd2383ce14907159b30bc12bf6b08e7227be3af pangomm-2.40.1.tar.xz diff --git a/package.bak/pangomm/pangomm.mk b/package.bak/pangomm/pangomm.mk deleted file mode 100644 index 2a85e39fa3..0000000000 --- a/package.bak/pangomm/pangomm.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# pangomm -# -################################################################################ - -PANGOMM_VERSION_MAJOR = 2.40 -PANGOMM_VERSION = $(PANGOMM_VERSION_MAJOR).1 -PANGOMM_SOURCE = pangomm-$(PANGOMM_VERSION).tar.xz -PANGOMM_SITE = http://ftp.gnome.org/pub/gnome/sources/pangomm/$(PANGOMM_VERSION_MAJOR) -PANGOMM_LICENSE = LGPLv2.1+ (library), GPLv2+ (tools) -PANGOMM_LICENSE_FILES = COPYING COPYING.tools -PANGOMM_INSTALL_STAGING = YES -PANGOMM_DEPENDENCIES = glibmm cairomm libsigc pango host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/parted/0001-readline-deprecated.patch b/package.bak/parted/0001-readline-deprecated.patch deleted file mode 100644 index a3f40c8df6..0000000000 --- a/package.bak/parted/0001-readline-deprecated.patch +++ /dev/null @@ -1,19 +0,0 @@ -The CPPFunction typedef (among others) have been deprecated in favour of -specific prototyped typedefs since readline 4.2. -It's been working since because compatibility typedefs have been -in place until they were removed in readline 6.3. - -Signed-off-by: Gustavo Zacarias - -diff -Nura parted-3.1.orig/parted/ui.c parted-3.1/parted/ui.c ---- parted-3.1.orig/parted/ui.c 2014-03-01 16:11:41.970827134 -0300 -+++ parted-3.1/parted/ui.c 2014-03-01 16:11:55.540259786 -0300 -@@ -1474,7 +1474,7 @@ - #ifdef HAVE_LIBREADLINE - if (!opt_script_mode) { - rl_initialize (); -- rl_attempted_completion_function = (CPPFunction*) complete_function; -+ rl_attempted_completion_function = (rl_completion_func_t *) complete_function; - readline_state.in_readline = 0; - } - #endif diff --git a/package.bak/parted/0002-configure.ac-uclinux-is-also-linux.patch b/package.bak/parted/0002-configure.ac-uclinux-is-also-linux.patch deleted file mode 100644 index b2119bcdd7..0000000000 --- a/package.bak/parted/0002-configure.ac-uclinux-is-also-linux.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b3958317c5ee2940e7024bec2e7f288b5a6a26c3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 30 Jun 2014 10:09:04 -0300 -Subject: [PATCH] configure.ac: uclinux is also linux - -uclinux is used in the tuple for some noMMU linux builds like Blackfin -FLAT output, so accept it as linux too. - -Signed-off-by: Gustavo Zacarias ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 436d0e2..50ad478 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -58,10 +58,10 @@ AM_SILENT_RULES([yes]) # make --enable-silent-rules the default. - - AC_CANONICAL_HOST - case "$host_os" in -- linux*) OS=linux ;; -+ linux*|uclinux*) OS=linux ;; - gnu*) OS=gnu ;; - beos*) OS=beos ;; -- *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; -+ *) AC_MSG_ERROR([Unknown or unsupported OS "$host_os". Only "linux", "uclinux", "gnu" and "beos" are supported in this version of GNU Parted.]) ;; - esac - AC_SUBST([OS]) - --- -1.8.5.5 - diff --git a/package.bak/parted/0003-fix-static-link-uuid.patch b/package.bak/parted/0003-fix-static-link-uuid.patch deleted file mode 100644 index d6ec2cf365..0000000000 --- a/package.bak/parted/0003-fix-static-link-uuid.patch +++ /dev/null @@ -1,48 +0,0 @@ -configure: use pkg-config to find libuuid - -In some conditions, libuuid may be linked with -lintl. This can be the -case on uClibc when locales are enabled. - -When doing a shared link, this dependency is automatically pulled in via -a DT_NEEDED ELF tag - -For a static link, there is no such mechanism to pull in dependent -libraries. - -Currently, the check for libuuid is done with AC_CHECK_LIB, but this -does not handle dependencies, and thus a stattic build fails. - -Use pkg-config to find libuuid, that automatically pulls in the -dependencies of libuuid, if any. - -Signed-off-by: "Yann E. MORIN" - ---- -Note: of course, that relies on the fact that libuuid installs a proper -.pc file; a patch will be submitted upstream shortly. - -But even considering the current situation, where libuuid does not -provide a proper .pc file (yet), this patch does not change the -behaviour we've had so far; it is a bet on the future! ;-) - -diff -durN parted-3.1.orig/configure.ac parted-3.1/configure.ac ---- parted-3.1.orig/configure.ac 2014-11-29 16:27:49.520560137 +0100 -+++ parted-3.1/configure.ac 2014-11-29 16:32:50.799702049 +0100 -@@ -313,16 +313,7 @@ - AC_SUBST([DL_LIBS]) - - dnl Check for libuuid --UUID_LIBS="" --AC_CHECK_LIB([uuid], [uuid_generate], [UUID_LIBS="-luuid"], -- [AC_MSG_ERROR(dnl --[GNU Parted requires libuuid - a part of the util-linux-ng package (but --usually distributed separately in libuuid-devel, uuid-dev or similar) --This can probably be found on your distribution's CD or FTP site or at: -- http://userweb.kernel.org/~kzak/util-linux-ng/ --Note: originally, libuuid was part of the e2fsprogs package. Later, it --moved to util-linux-ng-2.16, and that package is now the preferred source.])]) --AC_SUBST([UUID_LIBS]) -+PKG_CHECK_MODULES([UUID],[uuid]) - - dnl Check for libdevmapper - DM_LIBS= diff --git a/package.bak/parted/0004-fix-includes-for-musl.patch b/package.bak/parted/0004-fix-includes-for-musl.patch deleted file mode 100644 index 28c94ace7c..0000000000 --- a/package.bak/parted/0004-fix-includes-for-musl.patch +++ /dev/null @@ -1,18 +0,0 @@ -Include to get loff_t definition - -Patch borrowed from Alpine Linux at -http://git.alpinelinux.org/cgit/aports/plain/main/parted/fix-includes.patch. Solves -build with musl. - -Signed-off-by: Thomas Petazzoni - ---- parted-3.1.orig/libparted/fs/xfs/platform_defs.h -+++ parted-3.1/libparted/fs/xfs/platform_defs.h -@@ -35,6 +35,7 @@ - #define __XFS_PLATFORM_DEFS_H__ - - #include -+#include - #include - #include - #include diff --git a/package.bak/parted/Config.in b/package.bak/parted/Config.in deleted file mode 100644 index 9d78f0f1f9..0000000000 --- a/package.bak/parted/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PARTED - bool "parted" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - parted, the GNU partition resizing program - - http://www.gnu.org/software/parted/ - -comment "parted needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/parted/Config.in.host b/package.bak/parted/Config.in.host deleted file mode 100644 index f5d7acc2a2..0000000000 --- a/package.bak/parted/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_PARTED - bool "host parted" - help - parted, the GNU partition resizing program - - http://www.gnu.org/software/parted/ diff --git a/package.bak/parted/parted.hash b/package.bak/parted/parted.hash deleted file mode 100644 index 297b5d7bbd..0000000000 --- a/package.bak/parted/parted.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 5e9cc1f91eaf016e5033d85b9b893fd6d3ffaca532a48de1082df9b94225ca15 parted-3.1.tar.xz diff --git a/package.bak/parted/parted.mk b/package.bak/parted/parted.mk deleted file mode 100644 index dc7ff2bd74..0000000000 --- a/package.bak/parted/parted.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# parted -# -################################################################################ - -PARTED_VERSION = 3.1 -PARTED_SOURCE = parted-$(PARTED_VERSION).tar.xz -PARTED_SITE = $(BR2_GNU_MIRROR)/parted -PARTED_DEPENDENCIES = host-pkgconf util-linux -PARTED_INSTALL_STAGING = YES -# For uclinux patch -PARTED_AUTORECONF = YES -PARTED_GETTEXTIZE = YES -PARTED_LICENSE = GPLv3+ -PARTED_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_READLINE),y) -PARTED_DEPENDENCIES += readline -PARTED_CONF_OPTS += --with-readline -else -PARTED_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_LVM2),y) -PARTED_DEPENDENCIES += lvm2 -PARTED_CONF_OPTS += --enable-device-mapper -else -PARTED_CONF_OPTS += --disable-device-mapper -endif - -ifeq ($(BR2_STATIC_LIBS),y) -PARTED_CONF_OPTS += --disable-dynamic-loading -endif - -HOST_PARTED_DEPENDENCIES = host-pkgconf host-util-linux -HOST_PARTED_CONF_OPTS += \ - --without-readline \ - --disable-device-mapper \ - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/patch/Config.in b/package.bak/patch/Config.in deleted file mode 100644 index c5b93e9fd5..0000000000 --- a/package.bak/patch/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PATCH - bool "patch" - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Take patch files (containing difference listings) and apply them - to original files, producing patched versions. - - http://www.gnu.org/software/patch/ - -comment "patch needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/patch/patch.hash b/package.bak/patch/patch.hash deleted file mode 100644 index d6e3a2d261..0000000000 --- a/package.bak/patch/patch.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299 patch-2.7.5.tar.xz diff --git a/package.bak/patch/patch.mk b/package.bak/patch/patch.mk deleted file mode 100644 index 3a942524f0..0000000000 --- a/package.bak/patch/patch.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# patch -# -################################################################################ - -PATCH_VERSION = 2.7.5 -PATCH_SOURCE = patch-$(PATCH_VERSION).tar.xz -PATCH_SITE = $(BR2_GNU_MIRROR)/patch -PATCH_LICENSE = GPLv3+ -PATCH_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_ATTR),y) -PATCH_CONF_OPTS += --enable-attr -PATCH_DEPENDENCIES += attr -else -PATCH_CONF_OPTS += --disable-attr -endif - -$(eval $(autotools-package)) diff --git a/package.bak/patchelf/Config.in.host b/package.bak/patchelf/Config.in.host deleted file mode 100644 index d1c8375704..0000000000 --- a/package.bak/patchelf/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_PATCHELF - bool "host patchelf" - help - PatchELF is a small utility to modify the dynamic linker - and RPATH of ELF executables. - - http://nixos.org/patchelf.html diff --git a/package.bak/patchelf/patchelf.hash b/package.bak/patchelf/patchelf.hash deleted file mode 100644 index 653eb466bf..0000000000 --- a/package.bak/patchelf/patchelf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a0f65c1ba148890e9f2f7823f4bedf7ecad5417772f64f994004f59a39014f83 patchelf-0.9.tar.bz2 diff --git a/package.bak/patchelf/patchelf.mk b/package.bak/patchelf/patchelf.mk deleted file mode 100644 index cf2e43a730..0000000000 --- a/package.bak/patchelf/patchelf.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# patchelf -# -################################################################################ - -PATCHELF_VERSION = 0.9 -PATCHELF_SITE = http://releases.nixos.org/patchelf/patchelf-$(PATCHELF_VERSION) -PATCHELF_SOURCE = patchelf-$(PATCHELF_VERSION).tar.bz2 -PATCHELF_LICENSE = GPLv3+ -PATCHELF_LICENSE_FILES = COPYING - -$(eval $(host-autotools-package)) diff --git a/package.bak/pax-utils/Config.in b/package.bak/pax-utils/Config.in deleted file mode 100644 index e61d9b31f7..0000000000 --- a/package.bak/pax-utils/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PAX_UTILS - bool "pax-utils" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 # needs PR_SET_NO_NEW_PRIVS - help - ELF related utils for ELF 32/64 binaries that can check files - for security relevant properties. - - http://www.gentoo.org/proj/en/hardened/pax-utils.xml - -comment "pax-utils needs a toolchain w/ headers >= 3.5" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_5 diff --git a/package.bak/pax-utils/pax-utils.hash b/package.bak/pax-utils/pax-utils.hash deleted file mode 100644 index 399bae40da..0000000000 --- a/package.bak/pax-utils/pax-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414 pax-utils-1.1.4.tar.xz diff --git a/package.bak/pax-utils/pax-utils.mk b/package.bak/pax-utils/pax-utils.mk deleted file mode 100644 index 8d5f3eea73..0000000000 --- a/package.bak/pax-utils/pax-utils.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# pax-utils -# -################################################################################ - -PAX_UTILS_VERSION = 1.1.4 -PAX_UTILS_SITE = http://distfiles.gentoo.org/distfiles -PAX_UTILS_SOURCE = pax-utils-$(PAX_UTILS_VERSION).tar.xz -PAX_UTILS_LICENSE = GPLv2 -PAX_UTILS_LICENSE_FILES = COPYING - -PAX_UTILS_DEPENDENCIES = host-pkgconf -PAX_UTILS_CONF_OPTS = --without-python - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -PAX_UTILS_DEPENDENCIES += libcap -PAX_UTILS_CONF_OPTS += --with-caps -else -PAX_UTILS_CONF_OPTS += --without-caps -endif - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -PAX_UTILS_DEPENDENCIES += libseccomp -PAX_UTILS_CONF_OPTS += --with-seccomp -else -PAX_UTILS_CONF_OPTS += --without-seccomp -endif - -# lddtree and symtree need bash -ifeq ($(BR2_PACKAGE_BASH),) -define PAX_UTILS_REMOVE_BASH_TOOLS - rm -f $(TARGET_DIR)/usr/bin/{lddtree,symtree} -endef -endif -PAX_UTILS_POST_INSTALL_TARGET_HOOKS += PAX_UTILS_REMOVE_BASH_TOOLS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/pciutils/Config.in b/package.bak/pciutils/Config.in deleted file mode 100644 index d46df6c0d6..0000000000 --- a/package.bak/pciutils/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PCIUTILS - bool "pciutils" - # PCI not supported on Blackfin - depends on !BR2_bfin - help - Various utilities dealing with the PCI bus. - Provides things like setpci and lspci. - - http://atrey.karlin.mff.cuni.cz/~mj/pciutils.html diff --git a/package.bak/pciutils/pciutils.hash b/package.bak/pciutils/pciutils.hash deleted file mode 100644 index 2572c35bca..0000000000 --- a/package.bak/pciutils/pciutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/utils/pciutils/sha256sums.asc -sha256 3a99141a9f40528d0a0035665a06dc37ddb1ae341658e51b50a76ecf86235efc pciutils-3.5.2.tar.xz diff --git a/package.bak/pciutils/pciutils.mk b/package.bak/pciutils/pciutils.mk deleted file mode 100644 index e65eadcaf1..0000000000 --- a/package.bak/pciutils/pciutils.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# pciutils -# -################################################################################ - -PCIUTILS_VERSION = 3.5.2 -PCIUTILS_SITE = $(BR2_KERNEL_MIRROR)/software/utils/pciutils -PCIUTILS_SOURCE = pciutils-$(PCIUTILS_VERSION).tar.xz -PCIUTILS_INSTALL_STAGING = YES -PCIUTILS_LICENSE = GPLv2+ -PCIUTILS_LICENSE_FILES = COPYING -PCIUTILS_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - HOST="$(KERNEL_ARCH)-linux" \ - OPT="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - RANLIB=$(TARGET_RANLIB) \ - AR=$(TARGET_AR) \ - DNS=no - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -PCIUTILS_DEPENDENCIES += udev -PCIUTILS_MAKE_OPTS += HWDB=yes -else -PCIUTILS_MAKE_OPTS += HWDB=no -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -PCIUTILS_MAKE_OPTS += ZLIB=yes -PCIUTILS_DEPENDENCIES += zlib -else -PCIUTILS_MAKE_OPTS += ZLIB=no -endif - -ifeq ($(BR2_PACKAGE_KMOD),y) -PCIUTILS_DEPENDENCIES += kmod -PCIUTILS_MAKE_OPTS += LIBKMOD=yes -else -PCIUTILS_MAKE_OPTS += LIBKMOD=no -endif - -ifeq ($(BR2_STATIC_LIBS),y) -PCIUTILS_MAKE_OPTS += SHARED=no -else -PCIUTILS_MAKE_OPTS += SHARED=yes -endif - -# Build after busybox since it's got a lightweight lspci -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PCIUTILS_DEPENDENCIES += busybox -endif - -define PCIUTILS_CONFIGURE_CMDS - $(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh - $(SED) 's/uname -s/echo Linux/' \ - -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \ - $(PCIUTILS_DIR)/lib/configure - $(SED) 's/^STRIP/#STRIP/' $(PCIUTILS_DIR)/Makefile -endef - -define PCIUTILS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(PCIUTILS_MAKE_OPTS) \ - PREFIX=/usr -endef - -define PCIUTILS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(PCIUTILS_MAKE_OPTS) \ - PREFIX=$(TARGET_DIR)/usr SBINDIR=$(TARGET_DIR)/usr/bin \ - install install-lib install-pcilib -endef - -define PCIUTILS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) $(PCIUTILS_MAKE_OPTS) \ - PREFIX=$(STAGING_DIR)/usr SBINDIR=$(STAGING_DIR)/usr/bin \ - install install-lib install-pcilib -endef - -$(eval $(generic-package)) diff --git a/package.bak/pcmanfm/Config.in b/package.bak/pcmanfm/Config.in deleted file mode 100644 index 40ebbdfcb4..0000000000 --- a/package.bak/pcmanfm/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_PCMANFM - bool "pcmanfm" - select BR2_PACKAGE_LIBFM - select BR2_PACKAGE_MENU_CACHE - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBGTK2 if !BR2_PACKAGE_LIBGTK3_X11 - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - help - PCMan File Manager (PCManFM) is a file manager application developed - by Hong Jen Yee from Taiwan which is meant to be a replacement for - Nautilus, Konqueror and Thunar. - - http://wiki.lxde.org/en/PCManFM - -comment "pcmanfm needs a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/pcmanfm/pcmanfm.hash b/package.bak/pcmanfm/pcmanfm.hash deleted file mode 100644 index cb0d20669e..0000000000 --- a/package.bak/pcmanfm/pcmanfm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/pcmanfm/files/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ -md5 19764c2f59653724c8713e0064fa6829 pcmanfm-1.2.4.tar.xz -sha1 4768ee564a36021977e4af8c33270b6835b3391d pcmanfm-1.2.4.tar.xz diff --git a/package.bak/pcmanfm/pcmanfm.mk b/package.bak/pcmanfm/pcmanfm.mk deleted file mode 100644 index e361909375..0000000000 --- a/package.bak/pcmanfm/pcmanfm.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# pcmanfm -# -################################################################################ - -PCMANFM_VERSION = 1.2.4 -PCMANFM_SOURCE = pcmanfm-$(PCMANFM_VERSION).tar.xz -PCMANFM_SITE = http://sourceforge.net/projects/pcmanfm/files -PCMANFM_DEPENDENCIES = libglib2 menu-cache libfm -PCMANFM_LICENSE = GPLv2+ -PCMANFM_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -PCMANFM_CONF_OPTS += --with-gtk=3 -PCMANFM_DEPENDENCIES += libgtk3 -else -PCMANFM_CONF_OPTS += --with-gtk=2 -PCMANFM_DEPENDENCIES += libgtk2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/pcre/0001-Kill-compatibility-bits.patch b/package.bak/pcre/0001-Kill-compatibility-bits.patch deleted file mode 100644 index 3563e4b714..0000000000 --- a/package.bak/pcre/0001-Kill-compatibility-bits.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e180a4085d8d2f82a05f037e465708cfc16bd2bf Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 14 Jun 2016 20:31:12 -0300 -Subject: [PATCH] Kill compatibility bits - -Kill ABI compatibility bits, we don't need them. -Fixes build failures on non-ELF targets. - -Signed-off-by: Gustavo Zacarias ---- - pcrecpp.cc | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/pcrecpp.cc b/pcrecpp.cc -index d09c9ab..6910db0 100644 ---- a/pcrecpp.cc -+++ b/pcrecpp.cc -@@ -58,22 +58,6 @@ static const int kVecSize = (1 + kMaxArgs) * 3; // results + PCRE workspace - // Special object that stands-in for no argument - Arg RE::no_arg((void*)NULL); - --// This is for ABI compatibility with old versions of pcre (pre-7.6), --// which defined a global no_arg variable instead of putting it in the --// RE class. This works on GCC >= 3, at least. It definitely works --// for ELF, but may not for other object formats (Mach-O, for --// instance, does not support aliases.) We could probably have a more --// inclusive test if we ever needed it. (Note that not only the --// __attribute__ syntax, but also __USER_LABEL_PREFIX__, are --// gnu-specific.) --#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__ELF__) && !defined(__INTEL_COMPILER) --# define ULP_AS_STRING(x) ULP_AS_STRING_INTERNAL(x) --# define ULP_AS_STRING_INTERNAL(x) #x --# define USER_LABEL_PREFIX_STR ULP_AS_STRING(__USER_LABEL_PREFIX__) --extern Arg no_arg -- __attribute__((alias(USER_LABEL_PREFIX_STR "_ZN7pcrecpp2RE6no_argE"))); --#endif -- - // If a regular expression has no error, its error_ field points here - static const string empty_string; - --- -2.7.3 - diff --git a/package.bak/pcre/0002-Disable-C-unit-tests.patch b/package.bak/pcre/0002-Disable-C-unit-tests.patch deleted file mode 100644 index c5c1a49f23..0000000000 --- a/package.bak/pcre/0002-Disable-C-unit-tests.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e3c636b8c7f9912d8d3a9fabdaa0a96ba69f7b29 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 14 Jun 2016 20:32:44 -0300 -Subject: [PATCH] Disable C++ unit tests - -They fail to build on static targets and they're not installed anyway. - -Signed-off-by: Gustavo Zacarias ---- - Makefile.in | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 6d03912..2c42b3e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -133,12 +133,6 @@ noinst_PROGRAMS = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) - @WITH_PCRE8_TRUE@am__append_20 = libpcreposix.la - @WITH_GCOV_TRUE@@WITH_PCRE8_TRUE@am__append_21 = $(GCOV_CFLAGS) - @WITH_PCRE_CPP_TRUE@am__append_22 = libpcrecpp.la --@WITH_PCRE_CPP_TRUE@am__append_23 = pcrecpp_unittest \ --@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest \ --@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest --@WITH_PCRE_CPP_TRUE@am__append_24 = pcrecpp_unittest \ --@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest \ --@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest - @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_25 = $(GCOV_CXXFLAGS) - @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_26 = $(GCOV_LIBS) - @WITH_GCOV_TRUE@@WITH_PCRE_CPP_TRUE@am__append_27 = $(GCOV_LIBS) -@@ -362,9 +356,6 @@ libpcreposix_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ - @WITH_PCRE8_TRUE@am__EXEEXT_1 = pcregrep$(EXEEXT) - @WITH_REBUILD_CHARTABLES_TRUE@am__EXEEXT_2 = dftables$(EXEEXT) - @WITH_JIT_TRUE@am__EXEEXT_3 = pcre_jit_test$(EXEEXT) --@WITH_PCRE_CPP_TRUE@am__EXEEXT_4 = pcrecpp_unittest$(EXEEXT) \ --@WITH_PCRE_CPP_TRUE@ pcre_scanner_unittest$(EXEEXT) \ --@WITH_PCRE_CPP_TRUE@ pcre_stringpiece_unittest$(EXEEXT) - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) - am__dftables_SOURCES_DIST = dftables.c - @WITH_REBUILD_CHARTABLES_TRUE@am_dftables_OBJECTS = \ --- -2.7.3 - diff --git a/package.bak/pcre/Config.in b/package.bak/pcre/Config.in deleted file mode 100644 index 9d3a143365..0000000000 --- a/package.bak/pcre/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_PCRE - bool "pcre" - help - Perl Compatible Regular Expressions. By default, only the - 8-bits libpcre is built. To get the 16-bits and/or 32-bits - variants libpcre16/libpcre32, use the package sub-options. - - http://www.pcre.org/ - -if BR2_PACKAGE_PCRE - -config BR2_PACKAGE_PCRE_16 - bool "16-bit pcre" - help - This option builds the 16-bits pcre library, i.e 'libpcre16' - -config BR2_PACKAGE_PCRE_32 - bool "32-bit pcre" - help - This option builds the 32-bits pcre library, i.e 'libpcre32' - -config BR2_PACKAGE_PCRE_UTF - bool "UTF-8/16/32 support in pcre" - help - This option builds the pcre library with UTF-8/16/32 support - -config BR2_PACKAGE_PCRE_UCP - bool "Unicode properties support in pcre" - select BR2_PACKAGE_PCRE_UTF - help - This option builds the pcre library with Unicode properties - support (implies UTF-8/16/32 support)' - -endif diff --git a/package.bak/pcre/pcre.hash b/package.bak/pcre/pcre.hash deleted file mode 100644 index 4c3c6c32ea..0000000000 --- a/package.bak/pcre/pcre.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 00e27a29ead4267e3de8111fcaa59b132d0533cdfdbdddf4b0604279acbcf4f4 pcre-8.40.tar.bz2 diff --git a/package.bak/pcre/pcre.mk b/package.bak/pcre/pcre.mk deleted file mode 100644 index 211e2359af..0000000000 --- a/package.bak/pcre/pcre.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# pcre -# -################################################################################ - -PCRE_VERSION = 8.40 -PCRE_SITE = ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre -PCRE_SOURCE = pcre-$(PCRE_VERSION).tar.bz2 -PCRE_LICENSE = BSD-3c -PCRE_LICENSE_FILES = LICENCE -PCRE_INSTALL_STAGING = YES -PCRE_CONFIG_SCRIPTS = pcre-config - -# They're required for host-libglib2 -HOST_PCRE_CONF_OPTS = --enable-unicode-properties - -ifneq ($(BR2_INSTALL_LIBSTDCPP),y) -# pcre will use the host g++ if a cross version isn't available -PCRE_CONF_OPTS = --disable-cpp -endif - -PCRE_CONF_OPTS += --enable-pcre8 -PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_16),--enable-pcre16,--disable-pcre16) -PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_32),--enable-pcre32,--disable-pcre32) -PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_UTF),--enable-utf,--disable-utf) -PCRE_CONF_OPTS += $(if $(BR2_PACKAGE_PCRE_UCP),--enable-unicode-properties,--disable-unicode-properties) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/pcsc-lite/0001-pthread-needed-for-libusb.patch b/package.bak/pcsc-lite/0001-pthread-needed-for-libusb.patch deleted file mode 100644 index acb777aa44..0000000000 --- a/package.bak/pcsc-lite/0001-pthread-needed-for-libusb.patch +++ /dev/null @@ -1,29 +0,0 @@ -configure.ac: explicitly add pthread cflags/libs in the libusb test - -If libusb-config does not exist, LIBUSB_CFLAGS and PTHREAD_CFLAGS will be -empty, and the test for libusb will be performed without additional flags. -However, when libusb needs threads, some extra flags are needed (depending -on the platform), like -pthreads, -lpthread, etc. Without these flags, the -test for libusb_init() will fail to link correctly, and pcsc-lite will fail -detecting libusb. - -Signed-off-by: Thomas De Schampheleire - -Upstream-status: will be submitted - ---- - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -254,8 +254,8 @@ if test "x$use_libusb" != xno ; then - saved_CPPFLAGS="$CPPFLAGS" - saved_LIBS="$LIBS" - -- CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS" -- LIBS="$LDFLAGS $LIBUSB_LIBS" -+ CPPFLAGS="$CPPFLAGS $LIBUSB_CFLAGS $PTHREAD_CFLAGS" -+ LIBS="$LDFLAGS $LIBUSB_LIBS $PTHREAD_LIBS" - - AC_CHECK_HEADERS(libusb.h, [], - [ AC_MSG_ERROR([libusb.h not found, use ./configure LIBUSB_CFLAGS=...]) ]) diff --git a/package.bak/pcsc-lite/Config.in b/package.bak/pcsc-lite/Config.in deleted file mode 100644 index 658ebe3068..0000000000 --- a/package.bak/pcsc-lite/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -config BR2_PACKAGE_PCSC_LITE - bool "pcsc-lite" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - help - Middleware to access smart card using SCard API (PC/SC). - - http://pcsclite.alioth.debian.org/ - -if BR2_PACKAGE_PCSC_LITE - -config BR2_PACKAGE_PCSC_LITE_FORCE_LIBUSB - bool "use libusb" - depends on !BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LIBUSB - help - Select Y if you want to support usb smart card readers. - -config BR2_PACKAGE_PCSC_LITE_DEBUGATR - bool "enable ATR debug messages" - help - Enable ATR debug messages from pcscd. - -config BR2_PACKAGE_PCSC_LITE_EMBEDDED - bool "enable embedded mode" - help - Limit RAM and CPU resources by disabling logs. - -endif - -comment "pcsc-lite needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/pcsc-lite/pcsc-lite.hash b/package.bak/pcsc-lite/pcsc-lite.hash deleted file mode 100644 index 3adb865245..0000000000 --- a/package.bak/pcsc-lite/pcsc-lite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 607c4bd730526d282a63edb2ba4ee043f497877be642c5c647e37995e21f2612 pcsc-lite-1.8.10.tar.bz2 diff --git a/package.bak/pcsc-lite/pcsc-lite.mk b/package.bak/pcsc-lite/pcsc-lite.mk deleted file mode 100644 index e53c004e8b..0000000000 --- a/package.bak/pcsc-lite/pcsc-lite.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# pcsc-lite -# -################################################################################ - -PCSC_LITE_VERSION = 1.8.10 -PCSC_LITE_SOURCE = pcsc-lite-$(PCSC_LITE_VERSION).tar.bz2 -PCSC_LITE_SITE = http://alioth.debian.org/frs/download.php/file/3963 -PCSC_LITE_INSTALL_STAGING = YES -PCSC_LITE_DEPENDENCIES = host-pkgconf -PCSC_LITE_LICENSE = BSD-3c -PCSC_LITE_LICENSE_FILES = COPYING -PCSC_LITE_AUTORECONF = YES - -# - libudev and libusb are optional -# - libudev and libusb can't be used together -# - libudev has a priority over libusb - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -PCSC_LITE_CONF_OPTS += --enable-libudev --disable-libusb -PCSC_LITE_DEPENDENCIES += udev -else -ifeq ($(BR2_PACKAGE_LIBUSB),y) -PCSC_LITE_CONF_OPTS += --enable-libusb --disable-libudev -PCSC_LITE_DEPENDENCIES += libusb -else -PCSC_LITE_CONF_OPTS += --disable-libusb --disable-libudev -endif -endif - -ifeq ($(PACKAGE_PCSC_LITE_DEBUGATR),y) -PCSC_LITE_CONF_OPTS += --enable-debugatr -endif - -ifeq ($(PACKAGE_PCSC_LITE_EMBEDDED),y) -PCSC_LITE_CONF_OPTS += --enable-embedded -endif - -$(eval $(autotools-package)) diff --git a/package.bak/pdbg/Config.in b/package.bak/pdbg/Config.in deleted file mode 100644 index 3e23c210c9..0000000000 --- a/package.bak/pdbg/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PDBG - bool "pdbg" - help - PowerPC FSI Debugger, for low level debugging of a IBM - Power8 CPU over FSI. - - pdbg runs on a BMC, which is generally an ARM-powered system - monitoring/controlling a host CPU. - - https://github.com/open-power/pdbg diff --git a/package.bak/pdbg/pdbg.hash b/package.bak/pdbg/pdbg.hash deleted file mode 100644 index 16bf58024c..0000000000 --- a/package.bak/pdbg/pdbg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8edabb9ae98ce3b1892b768f2ee5e779a00476b63cdcc6f905e8464a0b7d96a3 pdbg-90a7370a11e727f1482dea6ff2bd6aec20c64805.tar.gz diff --git a/package.bak/pdbg/pdbg.mk b/package.bak/pdbg/pdbg.mk deleted file mode 100644 index 9cc05cd728..0000000000 --- a/package.bak/pdbg/pdbg.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# pdbg -# -################################################################################ - -PDBG_VERSION = 90a7370a11e727f1482dea6ff2bd6aec20c64805 -PDBG_SITE = $(call github,open-power,pdbg,$(PDBG_VERSION)) -PDBG_LICENSE = Apache 2.0 -PDBG_LICENSE_FILES = COPYING -PDBG_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/perl-crypt-openssl-random/Config.in b/package.bak/perl-crypt-openssl-random/Config.in deleted file mode 100644 index 2ceb78dfd6..0000000000 --- a/package.bak/perl-crypt-openssl-random/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_CRYPT_OPENSSL_RANDOM - bool "perl-crypt-openssl-random" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENSSL - help - OpenSSL/LibreSSL pseudo-random number generator access - - http://sourceforge.net/projects/perl-openssl/ - -comment "perl-crypt-openssl-random needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.hash b/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.hash deleted file mode 100644 index caacdc9015..0000000000 --- a/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 5d71337503e0356ce1ce1481504e5885 Crypt-OpenSSL-Random-0.11.tar.gz -sha256 bb8c81c6a39b9b13a22d818ee9a746242f136f0fadceb6b9776ae615e7524c7a Crypt-OpenSSL-Random-0.11.tar.gz diff --git a/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.mk b/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.mk deleted file mode 100644 index 615282106b..0000000000 --- a/package.bak/perl-crypt-openssl-random/perl-crypt-openssl-random.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-crypt-openssl-random -# -################################################################################ - -PERL_CRYPT_OPENSSL_RANDOM_VERSION = 0.11 -PERL_CRYPT_OPENSSL_RANDOM_SOURCE = Crypt-OpenSSL-Random-$(PERL_CRYPT_OPENSSL_RANDOM_VERSION).tar.gz -PERL_CRYPT_OPENSSL_RANDOM_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RURBAN -PERL_CRYPT_OPENSSL_RANDOM_DEPENDENCIES = openssl -PERL_CRYPT_OPENSSL_RANDOM_LICENSE = Artistic or GPLv1+ -PERL_CRYPT_OPENSSL_RANDOM_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-crypt-openssl-rsa/Config.in b/package.bak/perl-crypt-openssl-rsa/Config.in deleted file mode 100644 index 1fa1fd9881..0000000000 --- a/package.bak/perl-crypt-openssl-rsa/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_CRYPT_OPENSSL_RSA - bool "perl-crypt-openssl-rsa" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_CRYPT_OPENSSL_RANDOM - help - RSA encoding and decoding, using the openSSL libraries - - https://metacpan.org/release/Crypt-OpenSSL-RSA - -comment "perl-crypt-openssl-rsa needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash b/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash deleted file mode 100644 index 6e060ce672..0000000000 --- a/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 86217a5036fc63779c30420b5fd84129 Crypt-OpenSSL-RSA-0.28.tar.gz -sha256 5357f977464bb3a8184cf2d3341851a10d5515b4b2b0dfb88bf78995c0ded7be Crypt-OpenSSL-RSA-0.28.tar.gz diff --git a/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk b/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk deleted file mode 100644 index 7a4e31ee1a..0000000000 --- a/package.bak/perl-crypt-openssl-rsa/perl-crypt-openssl-rsa.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-crypt-openssl-rsa -# -################################################################################ - -PERL_CRYPT_OPENSSL_RSA_VERSION = 0.28 -PERL_CRYPT_OPENSSL_RSA_SOURCE = Crypt-OpenSSL-RSA-$(PERL_CRYPT_OPENSSL_RSA_VERSION).tar.gz -PERL_CRYPT_OPENSSL_RSA_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERLER -PERL_CRYPT_OPENSSL_RSA_DEPENDENCIES = perl-crypt-openssl-random -PERL_CRYPT_OPENSSL_RSA_LICENSE = Artistic or GPLv1+ -PERL_CRYPT_OPENSSL_RSA_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-datetime-tiny/Config.in b/package.bak/perl-datetime-tiny/Config.in deleted file mode 100644 index 7721c0769a..0000000000 --- a/package.bak/perl-datetime-tiny/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_DATETIME_TINY - bool "perl-datetime-tiny" - help - A date object, with as little code as possible - - https://github.com/dagolden/DateTime-Tiny diff --git a/package.bak/perl-datetime-tiny/perl-datetime-tiny.hash b/package.bak/perl-datetime-tiny/perl-datetime-tiny.hash deleted file mode 100644 index 68f2c025ea..0000000000 --- a/package.bak/perl-datetime-tiny/perl-datetime-tiny.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 736be4b3e8171f4a029fb6ac3712a9b4 DateTime-Tiny-1.06.tar.gz -sha256 bd725df481d7223ee787e154c116098b08a129f55e0763194b07ebea3dda33ec DateTime-Tiny-1.06.tar.gz diff --git a/package.bak/perl-datetime-tiny/perl-datetime-tiny.mk b/package.bak/perl-datetime-tiny/perl-datetime-tiny.mk deleted file mode 100644 index 57589731f2..0000000000 --- a/package.bak/perl-datetime-tiny/perl-datetime-tiny.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-datetime-tiny -# -################################################################################ - -PERL_DATETIME_TINY_VERSION = 1.06 -PERL_DATETIME_TINY_SOURCE = DateTime-Tiny-$(PERL_DATETIME_TINY_VERSION).tar.gz -PERL_DATETIME_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN -PERL_DATETIME_TINY_LICENSE = Artistic or GPLv1+ -PERL_DATETIME_TINY_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-digest-hmac/Config.in b/package.bak/perl-digest-hmac/Config.in deleted file mode 100644 index 733a53d8ae..0000000000 --- a/package.bak/perl-digest-hmac/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_DIGEST_HMAC - bool "perl-digest-hmac" - help - Digest::HMAC - Keyed-Hashing for Message Authentication - - https://github.com/gisle/digest-hmac diff --git a/package.bak/perl-digest-hmac/perl-digest-hmac.hash b/package.bak/perl-digest-hmac/perl-digest-hmac.hash deleted file mode 100644 index 018e4eb0ab..0000000000 --- a/package.bak/perl-digest-hmac/perl-digest-hmac.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 e6a5d6f552da16eacb5157ea4369ff9d Digest-HMAC-1.03.tar.gz -sha256 3bc72c6d3ff144d73aefb90e9a78d33612d58cf1cd1631ecfb8985ba96da4a59 Digest-HMAC-1.03.tar.gz diff --git a/package.bak/perl-digest-hmac/perl-digest-hmac.mk b/package.bak/perl-digest-hmac/perl-digest-hmac.mk deleted file mode 100644 index bee32f4449..0000000000 --- a/package.bak/perl-digest-hmac/perl-digest-hmac.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-digest-hmac -# -################################################################################ - -PERL_DIGEST_HMAC_VERSION = 1.03 -PERL_DIGEST_HMAC_SOURCE = Digest-HMAC-$(PERL_DIGEST_HMAC_VERSION).tar.gz -PERL_DIGEST_HMAC_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_DIGEST_HMAC_LICENSE = Artistic or GPLv1+ -PERL_DIGEST_HMAC_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-digest-sha1/Config.in b/package.bak/perl-digest-sha1/Config.in deleted file mode 100644 index b72a4ae938..0000000000 --- a/package.bak/perl-digest-sha1/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PERL_DIGEST_SHA1 - bool "perl-digest-sha1" - depends on !BR2_STATIC_LIBS - help - Perl interface to the SHA-1 algorithm - - https://metacpan.org/release/Digest-SHA1 - -comment "perl-digest-sha1 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-digest-sha1/perl-digest-sha1.hash b/package.bak/perl-digest-sha1/perl-digest-sha1.hash deleted file mode 100644 index d24d5ab668..0000000000 --- a/package.bak/perl-digest-sha1/perl-digest-sha1.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 bd22388f268434f2b24f64e28bf1aa35 Digest-SHA1-2.13.tar.gz -sha256 68c1dac2187421f0eb7abf71452a06f190181b8fc4b28ededf5b90296fb943cc Digest-SHA1-2.13.tar.gz diff --git a/package.bak/perl-digest-sha1/perl-digest-sha1.mk b/package.bak/perl-digest-sha1/perl-digest-sha1.mk deleted file mode 100644 index 52b9ec355e..0000000000 --- a/package.bak/perl-digest-sha1/perl-digest-sha1.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-digest-sha1 -# -################################################################################ - -PERL_DIGEST_SHA1_VERSION = 2.13 -PERL_DIGEST_SHA1_SOURCE = Digest-SHA1-$(PERL_DIGEST_SHA1_VERSION).tar.gz -PERL_DIGEST_SHA1_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_DIGEST_SHA1_LICENSE = Artistic or GPLv1+ -PERL_DIGEST_SHA1_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-encode-detect/Config.in b/package.bak/perl-encode-detect/Config.in deleted file mode 100644 index 63ea432917..0000000000 --- a/package.bak/perl-encode-detect/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PERL_ENCODE_DETECT - bool "perl-encode-detect" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - help - An Encode::Encoding subclass that detects the encoding of - data. - - https://metacpan.org/release/Encode-Detect - -comment "perl-encode-detect needs a toolchain w/ C++, dynamic library" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/perl-encode-detect/perl-encode-detect.hash b/package.bak/perl-encode-detect/perl-encode-detect.hash deleted file mode 100644 index c727a44912..0000000000 --- a/package.bak/perl-encode-detect/perl-encode-detect.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 ee9faf55d7105c97b02b8ebe590819c7 Encode-Detect-1.01.tar.gz -sha256 834d893aa7db6ce3f158afbd0e432d6ed15a276e0940db0a74be13fd9c4bbbf1 Encode-Detect-1.01.tar.gz diff --git a/package.bak/perl-encode-detect/perl-encode-detect.mk b/package.bak/perl-encode-detect/perl-encode-detect.mk deleted file mode 100644 index 732fba8db5..0000000000 --- a/package.bak/perl-encode-detect/perl-encode-detect.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-encode-detect -# -################################################################################ - -PERL_ENCODE_DETECT_VERSION = 1.01 -PERL_ENCODE_DETECT_SOURCE = Encode-Detect-$(PERL_ENCODE_DETECT_VERSION).tar.gz -PERL_ENCODE_DETECT_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JG/JGMYERS -PERL_ENCODE_DETECT_DEPENDENCIES = host-perl-module-build -PERL_ENCODE_DETECT_LICENSE = MPL-1.1 -PERL_ENCODE_DETECT_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-encode-locale/Config.in b/package.bak/perl-encode-locale/Config.in deleted file mode 100644 index d15aecbdfa..0000000000 --- a/package.bak/perl-encode-locale/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_ENCODE_LOCALE - bool "perl-encode-locale" - help - Determine the locale encoding - - https://github.com/gisle/encode-locale diff --git a/package.bak/perl-encode-locale/perl-encode-locale.hash b/package.bak/perl-encode-locale/perl-encode-locale.hash deleted file mode 100644 index 1b6a6bcbc9..0000000000 --- a/package.bak/perl-encode-locale/perl-encode-locale.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 fcfdb8e4ee34bcf62aed429b4a23db27 Encode-Locale-1.05.tar.gz -sha256 176fa02771f542a4efb1dbc2a4c928e8f4391bf4078473bd6040d8f11adb0ec1 Encode-Locale-1.05.tar.gz diff --git a/package.bak/perl-encode-locale/perl-encode-locale.mk b/package.bak/perl-encode-locale/perl-encode-locale.mk deleted file mode 100644 index 2544b16fdb..0000000000 --- a/package.bak/perl-encode-locale/perl-encode-locale.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-encode-locale -# -################################################################################ - -PERL_ENCODE_LOCALE_VERSION = 1.05 -PERL_ENCODE_LOCALE_SOURCE = Encode-Locale-$(PERL_ENCODE_LOCALE_VERSION).tar.gz -PERL_ENCODE_LOCALE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_ENCODE_LOCALE_LICENSE = Artistic or GPLv1+ -PERL_ENCODE_LOCALE_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-file-listing/Config.in b/package.bak/perl-file-listing/Config.in deleted file mode 100644 index 85f8e2eb1d..0000000000 --- a/package.bak/perl-file-listing/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_FILE_LISTING - bool "perl-file-listing" - select BR2_PACKAGE_PERL_HTTP_DATE - help - Module to parse directoy listings - - https://github.com/gisle/file-listing diff --git a/package.bak/perl-file-listing/perl-file-listing.hash b/package.bak/perl-file-listing/perl-file-listing.hash deleted file mode 100644 index 1549c5af17..0000000000 --- a/package.bak/perl-file-listing/perl-file-listing.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 83f636b477741f3a014585bb9cc079a6 File-Listing-6.04.tar.gz -sha256 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5 File-Listing-6.04.tar.gz diff --git a/package.bak/perl-file-listing/perl-file-listing.mk b/package.bak/perl-file-listing/perl-file-listing.mk deleted file mode 100644 index a9d8cede72..0000000000 --- a/package.bak/perl-file-listing/perl-file-listing.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-file-listing -# -################################################################################ - -PERL_FILE_LISTING_VERSION = 6.04 -PERL_FILE_LISTING_SOURCE = File-Listing-$(PERL_FILE_LISTING_VERSION).tar.gz -PERL_FILE_LISTING_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_FILE_LISTING_DEPENDENCIES = perl-http-date -PERL_FILE_LISTING_LICENSE = Artistic or GPLv1+ -PERL_FILE_LISTING_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-file-util/Config.in b/package.bak/perl-file-util/Config.in deleted file mode 100644 index 871be988af..0000000000 --- a/package.bak/perl-file-util/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_FILE_UTIL - bool "perl-file-util" - help - Easy, versatile, portable file handling - - https://github.com/tommybutler/file-util/wiki diff --git a/package.bak/perl-file-util/perl-file-util.hash b/package.bak/perl-file-util/perl-file-util.hash deleted file mode 100644 index 1e613dc01f..0000000000 --- a/package.bak/perl-file-util/perl-file-util.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 93c572b4c54743a7ef383486dd2c4014 File-Util-4.132140.tar.gz -sha256 4233c493468da8b34f2df19b191aaa400f328d877c8c023605e43385976a99d1 File-Util-4.132140.tar.gz diff --git a/package.bak/perl-file-util/perl-file-util.mk b/package.bak/perl-file-util/perl-file-util.mk deleted file mode 100644 index 7026515e66..0000000000 --- a/package.bak/perl-file-util/perl-file-util.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# perl-file-util -# -################################################################################ - -PERL_FILE_UTIL_VERSION = 4.132140 -PERL_FILE_UTIL_SOURCE = File-Util-$(PERL_FILE_UTIL_VERSION).tar.gz -PERL_FILE_UTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/T/TO/TOMMY -PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build -PERL_FILE_UTIL_LICENSE = Artistic or GPLv1+ -PERL_FILE_UTIL_LICENSE_FILES = COPYING LICENSE -HOST_PERL_FILE_UTIL_DEPENDENCIES = host-perl-module-build - -$(eval $(perl-package)) -$(eval $(host-perl-package)) diff --git a/package.bak/perl-gd/0001-getoptions.patch b/package.bak/perl-gd/0001-getoptions.patch deleted file mode 100644 index 74f055bead..0000000000 --- a/package.bak/perl-gd/0001-getoptions.patch +++ /dev/null @@ -1,43 +0,0 @@ -fix option handling in Makefile.PL - -the call to GetOptions() must be unique. - -Signed-off-by: Francois Perrad -see https://github.com/lstein/Perl-GD/pull/6 - -Index: b/Makefile.PL -=================================================================== ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -24,7 +24,15 @@ - my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); - - use Getopt::Long; --GetOptions("ignore_missing_gd" => \$force); -+my $result = GetOptions("options=s" => \$options, -+ "lib_gd_path=s" => \$lib_gd_path, -+ "lib_ft_path=s" => \$lib_ft_path, -+ "lib_png_path=s" => \$lib_png_path, -+ "lib_jpeg_path=s" => \$lib_jpeg_path, -+ "lib_xpm_path=s" => \$lib_xpm_path, -+ "lib_zlib_path=s" => \$lib_zlib_path, -+ "ignore_missing_gd" => \$force, -+ ); - - unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { - die < \$options, -- "lib_gd_path=s" => \$lib_gd_path, -- "lib_ft_path=s" => \$lib_ft_path, -- "lib_png_path=s" => \$lib_png_path, -- "lib_jpeg_path=s" => \$lib_jpeg_path, -- "lib_xpm_path=s" => \$lib_xpm_path, -- "lib_zlib_path=s" => \$lib_zlib_path, -- ); - unless ($result) { - print STDERR < -see https://github.com/lstein/Perl-GD/pull/7 - -Index: b/Makefile.PL -=================================================================== ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -42,9 +42,9 @@ - END - } - -+push @LIBS, "-lgd"; - @INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; - @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; --@LIBS = qw(-lgd) unless @LIBS; - - # support for AMD64 libraries - if (-d '/usr/lib64') { -@@ -294,7 +294,6 @@ - @$LIBPATH = map {s/^-L// && "-L$_"} split /\s+/,$ldflags; - @$LIBS = split /\s+/,$libs; - -- push @$LIBS,"-lgd"; - push @$LIBPATH,"-L$libdir"; - ($$lib_gd_path = $libdir) =~ s!/[^/]+$!!; - $$options = $features; diff --git a/package.bak/perl-gd/0003-force.patch b/package.bak/perl-gd/0003-force.patch deleted file mode 100644 index 611066b919..0000000000 --- a/package.bak/perl-gd/0003-force.patch +++ /dev/null @@ -1,32 +0,0 @@ -let @INC and @LIBPATH empty when ignore_missing_gd - -Signed-off-by: Francois Perrad -see https://github.com/lstein/Perl-GD/pull/7 - -Index: b/Makefile.PL -=================================================================== ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -43,13 +43,15 @@ - } - - push @LIBS, "-lgd"; --@INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; --@LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; -- --# support for AMD64 libraries --if (-d '/usr/lib64') { -- my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH; -- @LIBPATH = (@LIBPATH,@libs64); -+unless ($force) { -+ @INC = qw(-I/usr/include -I/usr/include/gd) unless @INC; -+ @LIBPATH = qw(-L/usr/lib/X11 -L/usr/X11R6/lib -L/usr/X11/lib -L/usr/lib) unless @LIBPATH; -+ -+ # support for AMD64 libraries -+ if (-d '/usr/lib64') { -+ my @libs64 = map {my $a = $_; $a=~ s/lib$/lib64/; $a} @LIBPATH; -+ @LIBPATH = (@LIBPATH,@libs64); -+ } - } - - ############################################################################################# diff --git a/package.bak/perl-gd/0004-gdlib-config-is-now-configurable.patch b/package.bak/perl-gd/0004-gdlib-config-is-now-configurable.patch deleted file mode 100644 index 58df2255a3..0000000000 --- a/package.bak/perl-gd/0004-gdlib-config-is-now-configurable.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f417f38929fe558d388b9a9343da9b2c0e6984aa Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 20 Dec 2014 23:22:41 +0100 -Subject: [PATCH] Makefile.PL: gdlib-config is now configurable - -Signed-off-by: Romain Naour ---- - Makefile.PL | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/Makefile.PL b/Makefile.PL -index dfe8ad7..0fa6ef3 100644 ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -21,7 +21,7 @@ END - my (@INC,@LIBPATH,@LIBS); - my $AUTOCONFIG = 0; # global set by try_to_autoconfigure() below - --my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force); -+my ($options,$lib_gd_path,$lib_ft_path,$lib_png_path,$lib_jpeg_path,$lib_xpm_path,$lib_zlib_path,$force,$gdlib_config_path); - - use Getopt::Long; - my $result = GetOptions("options=s" => \$options, -@@ -32,6 +32,7 @@ my $result = GetOptions("options=s" => \$options, - "lib_xpm_path=s" => \$lib_xpm_path, - "lib_zlib_path=s" => \$lib_zlib_path, - "ignore_missing_gd" => \$force, -+ "gdlib_config_path=s" => \$gdlib_config_path, - ); - - unless (try_to_autoconfigure(\$options,\$lib_gd_path,\@INC,\@LIBPATH,\@LIBS) || $force) { -@@ -72,6 +73,7 @@ Configure GD module. - -lib_xpm_path path path to libxpm - -lib_zlib_path path path to libpng - -ignore_missing_gd Ignore missing or old libgd installations and try to compile anyway -+ -gdlib_config_path path path to gdlib-config - - If no options are passed on the command line. The program will - attempt to autoconfigure itself with the gdlib-config program (present -@@ -118,6 +120,15 @@ if( defined($lib_zlib_path) ) - @INC = ("-I$lib_zlib_path/include", @INC); - @LIBPATH = ("-L$lib_zlib_path/lib", @LIBPATH); - } -+if( defined($gdlib_config_path) ) -+{ -+ print "gdlib-config used: $gdlib_config_path\n"; -+} -+else -+{ -+ $gdlib_config_path = "gdlib-config"; -+ print "$gdlib_config_path used from the PATH\n"; -+} - ############################################################################################# - - if ($^O eq 'VMS'){ -@@ -278,7 +289,7 @@ exit 0; - - sub try_to_autoconfigure { - my ($options,$lib_gd_path,$INC,$LIBPATH,$LIBS) = @_; -- my $config = `gdlib-config --all`; -+ my $config = `$gdlib_config_path --all`; - return unless $config; - $AUTOCONFIG++; - --- -1.9.3 - diff --git a/package.bak/perl-gd/Config.in b/package.bak/perl-gd/Config.in deleted file mode 100644 index 2b7a265f15..0000000000 --- a/package.bak/perl-gd/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PERL_GD - bool "perl-gd" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_GD - help - Perl interface to the gd2 graphics library - - https://metacpan.org/release/GD - -comment "perl-gd needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-gd/perl-gd.hash b/package.bak/perl-gd/perl-gd.hash deleted file mode 100644 index 0c16d3f521..0000000000 --- a/package.bak/perl-gd/perl-gd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 c4b3afd98b2c4ce3c2e1027d101a8f1e GD-2.56.tar.gz -sha256 1f103d1c98de8621504642ed7fb79f1b40f5f6a63c2abe9390a8ab78617248f9 GD-2.56.tar.gz diff --git a/package.bak/perl-gd/perl-gd.mk b/package.bak/perl-gd/perl-gd.mk deleted file mode 100644 index ea8fd5cddb..0000000000 --- a/package.bak/perl-gd/perl-gd.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# perl-gd -# -################################################################################ - -PERL_GD_VERSION = 2.56 -PERL_GD_SOURCE = GD-$(PERL_GD_VERSION).tar.gz -PERL_GD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LD/LDS -PERL_GD_DEPENDENCIES = zlib libpng freetype gd -PERL_GD_LICENSE = Artistic or GPLv1+ -PERL_GD_LICENSE_FILES = LICENSE -PERL_GD_PREFER_INSTALLER = EUMM - -PERL_GD_CONF_OPTS = \ - -options=FT,PNG \ - -lib_gd_path=$(STAGING_DIR)/usr \ - -lib_ft_path=$(STAGING_DIR)/usr \ - -lib_png_path=$(STAGING_DIR)/usr \ - -lib_zlib_path=$(STAGING_DIR)/usr \ - -ignore_missing_gd \ - -gdlib=$(STAGING_DIR)/usr/bin/gdlib-config - -$(eval $(perl-package)) diff --git a/package.bak/perl-gdgraph/Config.in b/package.bak/perl-gdgraph/Config.in deleted file mode 100644 index 10b3cd0323..0000000000 --- a/package.bak/perl-gdgraph/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PERL_GDGRAPH - bool "perl-gdgraph" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_GD - select BR2_PACKAGE_PERL_GDTEXTUTIL - help - Produces charts with GD - - https://metacpan.org/release/GDGraph - -comment "perl-gdgraph needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-gdgraph/perl-gdgraph.hash b/package.bak/perl-gdgraph/perl-gdgraph.hash deleted file mode 100644 index 2e85452c18..0000000000 --- a/package.bak/perl-gdgraph/perl-gdgraph.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 38c6a188519e6272e9b2b722b315c3d8 GDGraph-1.54.tar.gz -sha256 b96f5c10b656c17d16ab65a1777c908297b028d3b6815f6d54b2337f006bfa4f GDGraph-1.54.tar.gz diff --git a/package.bak/perl-gdgraph/perl-gdgraph.mk b/package.bak/perl-gdgraph/perl-gdgraph.mk deleted file mode 100644 index dc7ffd9bca..0000000000 --- a/package.bak/perl-gdgraph/perl-gdgraph.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-gdgraph -# -################################################################################ - -PERL_GDGRAPH_VERSION = 1.54 -PERL_GDGRAPH_SOURCE = GDGraph-$(PERL_GDGRAPH_VERSION).tar.gz -PERL_GDGRAPH_SITE = $(BR2_CPAN_MIRROR)/authors/id/R/RU/RUZ -PERL_GDGRAPH_DEPENDENCIES = perl-gd perl-gdtextutil -PERL_GDGRAPH_LICENSE = Artistic or GPLv1+ -PERL_GDGRAPH_LICENSE_FILES = Dustismo.LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-gdtextutil/Config.in b/package.bak/perl-gdtextutil/Config.in deleted file mode 100644 index 9baf0a078b..0000000000 --- a/package.bak/perl-gdtextutil/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_GDTEXTUTIL - bool "perl-gdtextutil" - help - Text utilities for use with GD - - https://metacpan.org/release/GDTextUtil diff --git a/package.bak/perl-gdtextutil/perl-gdtextutil.hash b/package.bak/perl-gdtextutil/perl-gdtextutil.hash deleted file mode 100644 index 7996ed9d3d..0000000000 --- a/package.bak/perl-gdtextutil/perl-gdtextutil.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 941ad06eadc86b47f3a32da405665c41 GDTextUtil-0.86.tar.gz -sha256 886ecbf85cfe94f4135ee5689c4847a9ae783ecb99e6759e12c734f2dd6116bc GDTextUtil-0.86.tar.gz diff --git a/package.bak/perl-gdtextutil/perl-gdtextutil.mk b/package.bak/perl-gdtextutil/perl-gdtextutil.mk deleted file mode 100644 index 087102a749..0000000000 --- a/package.bak/perl-gdtextutil/perl-gdtextutil.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# perl-gdtextutil -# -################################################################################ - -PERL_GDTEXTUTIL_VERSION = 0.86 -PERL_GDTEXTUTIL_SOURCE = GDTextUtil-$(PERL_GDTEXTUTIL_VERSION).tar.gz -PERL_GDTEXTUTIL_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MV/MVERB -PERL_GDTEXTUTIL_LICENSE_FILES = Dustismo.LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-html-parser/Config.in b/package.bak/perl-html-parser/Config.in deleted file mode 100644 index 22a16d646f..0000000000 --- a/package.bak/perl-html-parser/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_HTML_PARSER - bool "perl-html-parser" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_HTML_TAGSET - help - HTML parser class - - https://metacpan.org/release/HTML-Parser - -comment "perl-html-parser needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-html-parser/perl-html-parser.hash b/package.bak/perl-html-parser/perl-html-parser.hash deleted file mode 100644 index 0c0bb1f298..0000000000 --- a/package.bak/perl-html-parser/perl-html-parser.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 eb7505e5f626913350df9dd4a03d54a8 HTML-Parser-3.72.tar.gz -sha256 ec28c7e1d9e67c45eca197077f7cdc41ead1bb4c538c7f02a3296a4bb92f608b HTML-Parser-3.72.tar.gz diff --git a/package.bak/perl-html-parser/perl-html-parser.mk b/package.bak/perl-html-parser/perl-html-parser.mk deleted file mode 100644 index 14a282649a..0000000000 --- a/package.bak/perl-html-parser/perl-html-parser.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-html-parser -# -################################################################################ - -PERL_HTML_PARSER_VERSION = 3.72 -PERL_HTML_PARSER_SOURCE = HTML-Parser-$(PERL_HTML_PARSER_VERSION).tar.gz -PERL_HTML_PARSER_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_HTML_PARSER_DEPENDENCIES = perl-html-tagset -PERL_HTML_PARSER_LICENSE = Artistic or GPLv1+ -PERL_HTML_PARSER_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-html-tagset/Config.in b/package.bak/perl-html-tagset/Config.in deleted file mode 100644 index a39bc651f2..0000000000 --- a/package.bak/perl-html-tagset/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_HTML_TAGSET - bool "perl-html-tagset" - help - HTML::Tagset - data tables useful in parsing HTML - - http://www.cpan.org/modules/by-authors/id/P/PE/PETDANCE/ diff --git a/package.bak/perl-html-tagset/perl-html-tagset.hash b/package.bak/perl-html-tagset/perl-html-tagset.hash deleted file mode 100644 index a4cf09082c..0000000000 --- a/package.bak/perl-html-tagset/perl-html-tagset.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 d2bfa18fe1904df7f683e96611e87437 HTML-Tagset-3.20.tar.gz -sha256 adb17dac9e36cd011f5243881c9739417fd102fce760f8de4e9be4c7131108e2 HTML-Tagset-3.20.tar.gz diff --git a/package.bak/perl-html-tagset/perl-html-tagset.mk b/package.bak/perl-html-tagset/perl-html-tagset.mk deleted file mode 100644 index d18d6a63c3..0000000000 --- a/package.bak/perl-html-tagset/perl-html-tagset.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-html-tagset -# -################################################################################ - -PERL_HTML_TAGSET_VERSION = 3.20 -PERL_HTML_TAGSET_SOURCE = HTML-Tagset-$(PERL_HTML_TAGSET_VERSION).tar.gz -PERL_HTML_TAGSET_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PETDANCE -PERL_HTML_TAGSET_LICENSE = Artistic or GPLv1+ -PERL_HTML_TAGSET_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-http-cookies/Config.in b/package.bak/perl-http-cookies/Config.in deleted file mode 100644 index cb5a3c1fa9..0000000000 --- a/package.bak/perl-http-cookies/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PERL_HTTP_COOKIES - bool "perl-http-cookies" - select BR2_PACKAGE_PERL_HTTP_DATE - select BR2_PACKAGE_PERL_HTTP_MESSAGE - help - Objects that represent a "cookie jar" - - http://github.com/gisle/http-cookies diff --git a/package.bak/perl-http-cookies/perl-http-cookies.hash b/package.bak/perl-http-cookies/perl-http-cookies.hash deleted file mode 100644 index 94e5f31c29..0000000000 --- a/package.bak/perl-http-cookies/perl-http-cookies.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 ecfd0eeb88512033352c2f13c9580f03 HTTP-Cookies-6.01.tar.gz -sha256 f5d3ade383ce6389d80cb0d0356b643af80435bb036afd8edce335215ec5eb20 HTTP-Cookies-6.01.tar.gz diff --git a/package.bak/perl-http-cookies/perl-http-cookies.mk b/package.bak/perl-http-cookies/perl-http-cookies.mk deleted file mode 100644 index 52ee74a568..0000000000 --- a/package.bak/perl-http-cookies/perl-http-cookies.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-http-cookies -# -################################################################################ - -PERL_HTTP_COOKIES_VERSION = 6.01 -PERL_HTTP_COOKIES_SOURCE = HTTP-Cookies-$(PERL_HTTP_COOKIES_VERSION).tar.gz -PERL_HTTP_COOKIES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_HTTP_COOKIES_DEPENDENCIES = perl-http-date perl-http-message -PERL_HTTP_COOKIES_LICENSE = Artistic or GPLv1+ -PERL_HTTP_COOKIES_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-http-daemon/Config.in b/package.bak/perl-http-daemon/Config.in deleted file mode 100644 index e09328c963..0000000000 --- a/package.bak/perl-http-daemon/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PERL_HTTP_DAEMON - bool "perl-http-daemon" - select BR2_PACKAGE_PERL_HTTP_DATE - select BR2_PACKAGE_PERL_HTTP_MESSAGE - select BR2_PACKAGE_PERL_LWP_MEDIATYPES - help - Instances of the `HTTP::Daemon' class are HTTP/1.1 servers that listen - on a socket for incoming requests. - - http://github.com/gisle/http-daemon diff --git a/package.bak/perl-http-daemon/perl-http-daemon.hash b/package.bak/perl-http-daemon/perl-http-daemon.hash deleted file mode 100644 index f4f6023083..0000000000 --- a/package.bak/perl-http-daemon/perl-http-daemon.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 ed0ae02d25d7f1e89456d4d69732adc2 HTTP-Daemon-6.01.tar.gz -sha256 43fd867742701a3f9fcc7bd59838ab72c6490c0ebaf66901068ec6997514adc2 HTTP-Daemon-6.01.tar.gz diff --git a/package.bak/perl-http-daemon/perl-http-daemon.mk b/package.bak/perl-http-daemon/perl-http-daemon.mk deleted file mode 100644 index 56dbd7846d..0000000000 --- a/package.bak/perl-http-daemon/perl-http-daemon.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-http-daemon -# -################################################################################ - -PERL_HTTP_DAEMON_VERSION = 6.01 -PERL_HTTP_DAEMON_SOURCE = HTTP-Daemon-$(PERL_HTTP_DAEMON_VERSION).tar.gz -PERL_HTTP_DAEMON_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_HTTP_DAEMON_DEPENDENCIES = perl-http-date perl-http-message perl-lwp-mediatypes -PERL_HTTP_DAEMON_LICENSE = Artistic or GPLv1+ -PERL_HTTP_DAEMON_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-http-date/Config.in b/package.bak/perl-http-date/Config.in deleted file mode 100644 index c45335fb23..0000000000 --- a/package.bak/perl-http-date/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_HTTP_DATE - bool "perl-http-date" - help - This module provides functions that deal the date formats used by the - HTTP protocol (and then some more) - - https://github.com/gisle/http-date diff --git a/package.bak/perl-http-date/perl-http-date.hash b/package.bak/perl-http-date/perl-http-date.hash deleted file mode 100644 index db85cd061c..0000000000 --- a/package.bak/perl-http-date/perl-http-date.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 52b7a0d5982d61be1edb217751d7daba HTTP-Date-6.02.tar.gz -sha256 e8b9941da0f9f0c9c01068401a5e81341f0e3707d1c754f8e11f42a7e629e333 HTTP-Date-6.02.tar.gz diff --git a/package.bak/perl-http-date/perl-http-date.mk b/package.bak/perl-http-date/perl-http-date.mk deleted file mode 100644 index bb5f4dc2fc..0000000000 --- a/package.bak/perl-http-date/perl-http-date.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-http-date -# -################################################################################ - -PERL_HTTP_DATE_VERSION = 6.02 -PERL_HTTP_DATE_SOURCE = HTTP-Date-$(PERL_HTTP_DATE_VERSION).tar.gz -PERL_HTTP_DATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_HTTP_DATE_LICENSE = Artistic or GPLv1+ -PERL_HTTP_DATE_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-http-message/Config.in b/package.bak/perl-http-message/Config.in deleted file mode 100644 index 9dda1ee3f1..0000000000 --- a/package.bak/perl-http-message/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PERL_HTTP_MESSAGE - bool "perl-http-message" - select BR2_PACKAGE_PERL_ENCODE_LOCALE - select BR2_PACKAGE_PERL_HTTP_DATE - select BR2_PACKAGE_PERL_IO_HTML - select BR2_PACKAGE_PERL_LWP_MEDIATYPES - select BR2_PACKAGE_PERL_URI - help - The HTTP-Message distribution contains classes useful for representing - the messages passed in HTTP style communication. - - https://github.com/libwww-perl/http-message diff --git a/package.bak/perl-http-message/perl-http-message.hash b/package.bak/perl-http-message/perl-http-message.hash deleted file mode 100644 index f57fec273a..0000000000 --- a/package.bak/perl-http-message/perl-http-message.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 4ed7add10daea3ab30abfeab6d03872f HTTP-Message-6.11.tar.gz -sha256 e7b368077ae6a188d99920411d8f52a8e5acfb39574d4f5c24f46fd22533d81b HTTP-Message-6.11.tar.gz diff --git a/package.bak/perl-http-message/perl-http-message.mk b/package.bak/perl-http-message/perl-http-message.mk deleted file mode 100644 index 77213fa1d6..0000000000 --- a/package.bak/perl-http-message/perl-http-message.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-http-message -# -################################################################################ - -PERL_HTTP_MESSAGE_VERSION = 6.11 -PERL_HTTP_MESSAGE_SOURCE = HTTP-Message-$(PERL_HTTP_MESSAGE_VERSION).tar.gz -PERL_HTTP_MESSAGE_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER -PERL_HTTP_MESSAGE_DEPENDENCIES = perl-encode-locale perl-http-date perl-io-html perl-lwp-mediatypes perl-uri -PERL_HTTP_MESSAGE_LICENSE = Artistic or GPLv1+ -PERL_HTTP_MESSAGE_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-http-negotiate/Config.in b/package.bak/perl-http-negotiate/Config.in deleted file mode 100644 index 2b7f7b9b9a..0000000000 --- a/package.bak/perl-http-negotiate/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PERL_HTTP_NEGOTIATE - bool "perl-http-negotiate" - select BR2_PACKAGE_PERL_HTTP_MESSAGE - help - This module provides a complete implementation of the HTTP content - negotiation algorithm specified in draft-ietf-http-v11-spec-00.ps - chapter 12. - - http://github.com/gisle/http-negotiate diff --git a/package.bak/perl-http-negotiate/perl-http-negotiate.hash b/package.bak/perl-http-negotiate/perl-http-negotiate.hash deleted file mode 100644 index f1db2fff65..0000000000 --- a/package.bak/perl-http-negotiate/perl-http-negotiate.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 1236195250e264d7436e7bb02031671b HTTP-Negotiate-6.01.tar.gz -sha256 1c729c1ea63100e878405cda7d66f9adfd3ed4f1d6cacaca0ee9152df728e016 HTTP-Negotiate-6.01.tar.gz diff --git a/package.bak/perl-http-negotiate/perl-http-negotiate.mk b/package.bak/perl-http-negotiate/perl-http-negotiate.mk deleted file mode 100644 index 569ed2b1f7..0000000000 --- a/package.bak/perl-http-negotiate/perl-http-negotiate.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-http-negotiate -# -################################################################################ - -PERL_HTTP_NEGOTIATE_VERSION = 6.01 -PERL_HTTP_NEGOTIATE_SOURCE = HTTP-Negotiate-$(PERL_HTTP_NEGOTIATE_VERSION).tar.gz -PERL_HTTP_NEGOTIATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_HTTP_NEGOTIATE_DEPENDENCIES = perl-http-message -PERL_HTTP_NEGOTIATE_LICENSE = Artistic or GPLv1+ -PERL_HTTP_NEGOTIATE_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-io-html/Config.in b/package.bak/perl-io-html/Config.in deleted file mode 100644 index 69770226b3..0000000000 --- a/package.bak/perl-io-html/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_IO_HTML - bool "perl-io-html" - help - Perl module that opens a file and performs automatic charset detection - - https://github.com/madsen/io-html diff --git a/package.bak/perl-io-html/perl-io-html.hash b/package.bak/perl-io-html/perl-io-html.hash deleted file mode 100644 index 8d8c48d433..0000000000 --- a/package.bak/perl-io-html/perl-io-html.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 3f8958718844dc96b9f6946f21d70d22 IO-HTML-1.001.tar.gz -sha256 ea78d2d743794adc028bc9589538eb867174b4e165d7d8b5f63486e6b828e7e0 IO-HTML-1.001.tar.gz diff --git a/package.bak/perl-io-html/perl-io-html.mk b/package.bak/perl-io-html/perl-io-html.mk deleted file mode 100644 index 4bdcc8dc38..0000000000 --- a/package.bak/perl-io-html/perl-io-html.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-io-html -# -################################################################################ - -PERL_IO_HTML_VERSION = 1.001 -PERL_IO_HTML_SOURCE = IO-HTML-$(PERL_IO_HTML_VERSION).tar.gz -PERL_IO_HTML_SITE = $(BR2_CPAN_MIRROR)/authors/id/C/CJ/CJM -PERL_IO_HTML_LICENSE = Artistic or GPLv1+ -PERL_IO_HTML_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-io-socket-ssl/Config.in b/package.bak/perl-io-socket-ssl/Config.in deleted file mode 100644 index d24e568bc5..0000000000 --- a/package.bak/perl-io-socket-ssl/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_IO_SOCKET_SSL - bool "perl-io-socket-ssl" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_NET_SSLEAY - help - Nearly transparent SSL encapsulation for IO::Socket::INET. - - https://github.com/noxxi/p5-io-socket-ssl - -comment "perl-io-socket-ssl needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.hash b/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.hash deleted file mode 100644 index 852eb8d728..0000000000 --- a/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 a5f284d543aec4a6fcd595eb5fc8898b IO-Socket-SSL-2.022.tar.gz -sha256 651c4e5e2762ca780f2743986639b64557295bb326fddaff32f3adc0eac4f806 IO-Socket-SSL-2.022.tar.gz diff --git a/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.mk b/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.mk deleted file mode 100644 index 5bbd0c6819..0000000000 --- a/package.bak/perl-io-socket-ssl/perl-io-socket-ssl.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-io-socket-ssl -# -################################################################################ - -PERL_IO_SOCKET_SSL_VERSION = 2.022 -PERL_IO_SOCKET_SSL_SOURCE = IO-Socket-SSL-$(PERL_IO_SOCKET_SSL_VERSION).tar.gz -PERL_IO_SOCKET_SSL_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SU/SULLR -PERL_IO_SOCKET_SSL_DEPENDENCIES = perl-net-ssleay -PERL_IO_SOCKET_SSL_LICENSE = Artistic or GPLv1+ -PERL_IO_SOCKET_SSL_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-json-tiny/Config.in b/package.bak/perl-json-tiny/Config.in deleted file mode 100644 index ce943cae18..0000000000 --- a/package.bak/perl-json-tiny/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_JSON_TINY - bool "perl-json-tiny" - help - Minimalistic JSON. No dependencies. - - https://metacpan.org/release/JSON-Tiny diff --git a/package.bak/perl-json-tiny/perl-json-tiny.hash b/package.bak/perl-json-tiny/perl-json-tiny.hash deleted file mode 100644 index 4b6bb89ce8..0000000000 --- a/package.bak/perl-json-tiny/perl-json-tiny.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 52a57f8bd5b7727bc0ee8c4591431045 JSON-Tiny-0.56.tar.gz -sha256 f5e3eecd278ddc0b15e3b3d8d108f89fa47cc039852bdb80b909b6bc1b538d04 JSON-Tiny-0.56.tar.gz diff --git a/package.bak/perl-json-tiny/perl-json-tiny.mk b/package.bak/perl-json-tiny/perl-json-tiny.mk deleted file mode 100644 index 3892da601a..0000000000 --- a/package.bak/perl-json-tiny/perl-json-tiny.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-json-tiny -# -################################################################################ - -PERL_JSON_TINY_VERSION = 0.56 -PERL_JSON_TINY_SOURCE = JSON-Tiny-$(PERL_JSON_TINY_VERSION).tar.gz -PERL_JSON_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAVIDO -PERL_JSON_TINY_LICENSE = Artistic-2.0 -PERL_JSON_TINY_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-libwww-perl/Config.in b/package.bak/perl-libwww-perl/Config.in deleted file mode 100644 index fc46bf1dff..0000000000 --- a/package.bak/perl-libwww-perl/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_PERL_LIBWWW_PERL - bool "perl-libwww-perl" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_ENCODE_LOCALE - select BR2_PACKAGE_PERL_FILE_LISTING - select BR2_PACKAGE_PERL_HTML_PARSER - select BR2_PACKAGE_PERL_HTTP_COOKIES - select BR2_PACKAGE_PERL_HTTP_DAEMON - select BR2_PACKAGE_PERL_HTTP_DATE - select BR2_PACKAGE_PERL_HTTP_MESSAGE - select BR2_PACKAGE_PERL_HTTP_NEGOTIATE - select BR2_PACKAGE_PERL_LWP_MEDIATYPES - select BR2_PACKAGE_PERL_NET_HTTP - select BR2_PACKAGE_PERL_URI - select BR2_PACKAGE_PERL_WWW_ROBOTRULES - help - The World-Wide Web library for Perl - - https://metacpan.org/release/libwww-perl - -comment "perl-libwww-perl needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-libwww-perl/perl-libwww-perl.hash b/package.bak/perl-libwww-perl/perl-libwww-perl.hash deleted file mode 100644 index d3b3328643..0000000000 --- a/package.bak/perl-libwww-perl/perl-libwww-perl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 0880fade10edcf5f60087e42f1db4481 libwww-perl-6.16.tar.gz -sha256 daffd268000f92d241f8ae5508ae5616dbd02f15a587b4fbcd14998ccc15ce22 libwww-perl-6.16.tar.gz diff --git a/package.bak/perl-libwww-perl/perl-libwww-perl.mk b/package.bak/perl-libwww-perl/perl-libwww-perl.mk deleted file mode 100644 index 8d4d00e3ff..0000000000 --- a/package.bak/perl-libwww-perl/perl-libwww-perl.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# perl-libwww-perl -# -################################################################################ - -PERL_LIBWWW_PERL_VERSION = 6.16 -PERL_LIBWWW_PERL_SOURCE = libwww-perl-$(PERL_LIBWWW_PERL_VERSION).tar.gz -PERL_LIBWWW_PERL_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS -PERL_LIBWWW_PERL_DEPENDENCIES = \ - perl-encode-locale \ - perl-file-listing \ - perl-html-parser \ - perl-http-cookies \ - perl-http-daemon \ - perl-http-date \ - perl-http-message \ - perl-http-negotiate \ - perl-lwp-mediatypes \ - perl-net-http \ - perl-uri \ - perl-www-robotrules -PERL_LIBWWW_PERL_LICENSE = Artistic or GPLv1+ -PERL_LIBWWW_PERL_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-lwp-mediatypes/Config.in b/package.bak/perl-lwp-mediatypes/Config.in deleted file mode 100644 index b362e9c13b..0000000000 --- a/package.bak/perl-lwp-mediatypes/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_LWP_MEDIATYPES - bool "perl-lwp-mediatypes" - help - This module provides functions for handling media (also known as MIME) - types and encodings. - - https://github.com/gisle/lwp-mediatypes diff --git a/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.hash b/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.hash deleted file mode 100644 index 0f6fee9230..0000000000 --- a/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 8c5f25fb64b974d22aff424476ba13c9 LWP-MediaTypes-6.02.tar.gz -sha256 18790b0cc5f0a51468495c3847b16738f785a2d460403595001e0b932e5db676 LWP-MediaTypes-6.02.tar.gz diff --git a/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.mk b/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.mk deleted file mode 100644 index cd7c75a49d..0000000000 --- a/package.bak/perl-lwp-mediatypes/perl-lwp-mediatypes.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-lwp-mediatypes -# -################################################################################ - -PERL_LWP_MEDIATYPES_VERSION = 6.02 -PERL_LWP_MEDIATYPES_SOURCE = LWP-MediaTypes-$(PERL_LWP_MEDIATYPES_VERSION).tar.gz -PERL_LWP_MEDIATYPES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_LWP_MEDIATYPES_LICENSE = Artistic or GPLv1+ -PERL_LWP_MEDIATYPES_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-mail-dkim/Config.in b/package.bak/perl-mail-dkim/Config.in deleted file mode 100644 index 3db54f3c39..0000000000 --- a/package.bak/perl-mail-dkim/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PERL_MAIL_DKIM - bool "perl-mail-dkim" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_PERL_CRYPT_OPENSSL_RSA - select BR2_PACKAGE_PERL_MAILTOOLS - select BR2_PACKAGE_PERL_NET_DNS - help - Signs/verifies Internet mail with DKIM/DomainKey signatures - - https://metacpan.org/release/Mail-DKIM - -comment "perl-mail-dkim needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-mail-dkim/perl-mail-dkim.hash b/package.bak/perl-mail-dkim/perl-mail-dkim.hash deleted file mode 100644 index b6bb545abe..0000000000 --- a/package.bak/perl-mail-dkim/perl-mail-dkim.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 9ceb8a0397aff83928e7a9760b1b190f Mail-DKIM-0.40.tar.gz -sha256 3c5ea0c3a2028a5a2c3b64bbcd6bd9de6a5fa5ee4e16046dd8875c4796aaa6f1 Mail-DKIM-0.40.tar.gz diff --git a/package.bak/perl-mail-dkim/perl-mail-dkim.mk b/package.bak/perl-mail-dkim/perl-mail-dkim.mk deleted file mode 100644 index 03a3b7442d..0000000000 --- a/package.bak/perl-mail-dkim/perl-mail-dkim.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-mail-dkim -# -################################################################################ - -PERL_MAIL_DKIM_VERSION = 0.40 -PERL_MAIL_DKIM_SOURCE = Mail-DKIM-$(PERL_MAIL_DKIM_VERSION).tar.gz -PERL_MAIL_DKIM_SITE = $(BR2_CPAN_MIRROR)/authors/id/J/JA/JASLONG -PERL_MAIL_DKIM_DEPENDENCIES = perl-crypt-openssl-rsa perl-mailtools perl-net-dns -PERL_MAIL_DKIM_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-mailtools/Config.in b/package.bak/perl-mailtools/Config.in deleted file mode 100644 index e02d3cba6b..0000000000 --- a/package.bak/perl-mailtools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_MAILTOOLS - bool "perl-mailtools" - select BR2_PACKAGE_PERL_TIMEDATE - help - Various e-mail related modules - - https://metacpan.org/release/MailTools diff --git a/package.bak/perl-mailtools/perl-mailtools.hash b/package.bak/perl-mailtools/perl-mailtools.hash deleted file mode 100644 index 65a424b068..0000000000 --- a/package.bak/perl-mailtools/perl-mailtools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 972468ab5207b90398d77bed4ffc361d MailTools-2.18.tar.gz -sha256 dfee9e770257371112f20d978e637759e81bc4f19e97b083585c71ecab37b527 MailTools-2.18.tar.gz diff --git a/package.bak/perl-mailtools/perl-mailtools.mk b/package.bak/perl-mailtools/perl-mailtools.mk deleted file mode 100644 index 1c41831ce5..0000000000 --- a/package.bak/perl-mailtools/perl-mailtools.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-mailtools -# -################################################################################ - -PERL_MAILTOOLS_VERSION = 2.18 -PERL_MAILTOOLS_SOURCE = MailTools-$(PERL_MAILTOOLS_VERSION).tar.gz -PERL_MAILTOOLS_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MA/MARKOV -PERL_MAILTOOLS_DEPENDENCIES = perl-timedate -PERL_MAILTOOLS_LICENSE = Artistic or GPLv1+ -PERL_MAILTOOLS_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-mime-base64/Config.in b/package.bak/perl-mime-base64/Config.in deleted file mode 100644 index 22563dd5ad..0000000000 --- a/package.bak/perl-mime-base64/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_MIME_BASE64 - bool "perl-mime-base64" - depends on !BR2_STATIC_LIBS - help - This package contains a base64 encoder/decoder and a quoted-printable - encoder/decoder. - - http://github.com/gisle/mime-base64 - -comment "perl-mime-base64 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-mime-base64/perl-mime-base64.hash b/package.bak/perl-mime-base64/perl-mime-base64.hash deleted file mode 100644 index 0cfe598c89..0000000000 --- a/package.bak/perl-mime-base64/perl-mime-base64.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 ef958dc2bf96be5f759391c6ac1debd4 MIME-Base64-3.15.tar.gz -sha256 7f863566a6a9cb93eda93beadb77d9aa04b9304d769cea3bb921b9a91b3a1eb9 MIME-Base64-3.15.tar.gz diff --git a/package.bak/perl-mime-base64/perl-mime-base64.mk b/package.bak/perl-mime-base64/perl-mime-base64.mk deleted file mode 100644 index d06433772a..0000000000 --- a/package.bak/perl-mime-base64/perl-mime-base64.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-mime-base64 -# -################################################################################ - -PERL_MIME_BASE64_VERSION = 3.15 -PERL_MIME_BASE64_SOURCE = MIME-Base64-$(PERL_MIME_BASE64_VERSION).tar.gz -PERL_MIME_BASE64_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_MIME_BASE64_LICENSE = Artistic or GPLv1+ -PERL_MIME_BASE64_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-module-build/perl-module-build.hash b/package.bak/perl-module-build/perl-module-build.hash deleted file mode 100644 index 0363ac5762..0000000000 --- a/package.bak/perl-module-build/perl-module-build.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 9df204e188462a4410d496f316c2c531 Module-Build-0.4220.tar.gz -sha256 fb1207c7e799366f7a8adda3f135bf8141c4d6068505650d4db2b2d3ce34b5a2 Module-Build-0.4220.tar.gz diff --git a/package.bak/perl-module-build/perl-module-build.mk b/package.bak/perl-module-build/perl-module-build.mk deleted file mode 100644 index 3c27002954..0000000000 --- a/package.bak/perl-module-build/perl-module-build.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-module-build -# -################################################################################ - -PERL_MODULE_BUILD_VERSION = 0.4220 -PERL_MODULE_BUILD_SOURCE = Module-Build-$(PERL_MODULE_BUILD_VERSION).tar.gz -PERL_MODULE_BUILD_SITE = $(BR2_CPAN_MIRROR)/authors/id/L/LE/LEONT -PERL_MODULE_BUILD_LICENSE = Artistic or GPLv1+ -PERL_MODULE_BUILD_LICENSE_FILES = LICENSE - -$(eval $(host-perl-package)) diff --git a/package.bak/perl-mojolicious/Config.in b/package.bak/perl-mojolicious/Config.in deleted file mode 100644 index ebf0932b9f..0000000000 --- a/package.bak/perl-mojolicious/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_MOJOLICIOUS - bool "perl-mojolicious" - help - Real-time web framework - - http://mojolicious.org diff --git a/package.bak/perl-mojolicious/perl-mojolicious.hash b/package.bak/perl-mojolicious/perl-mojolicious.hash deleted file mode 100644 index 21b2768b86..0000000000 --- a/package.bak/perl-mojolicious/perl-mojolicious.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 97a935d64fc2aaf5538e6ab704bbc420 Mojolicious-7.20.tar.gz -sha256 ddd034bdd2b99f64498f30b9859c2f2607318f43983dfe36e14bfdf1526fd693 Mojolicious-7.20.tar.gz diff --git a/package.bak/perl-mojolicious/perl-mojolicious.mk b/package.bak/perl-mojolicious/perl-mojolicious.mk deleted file mode 100644 index b3e6615f28..0000000000 --- a/package.bak/perl-mojolicious/perl-mojolicious.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-mojolicious -# -################################################################################ - -PERL_MOJOLICIOUS_VERSION = 7.20 -PERL_MOJOLICIOUS_SOURCE = Mojolicious-$(PERL_MOJOLICIOUS_VERSION).tar.gz -PERL_MOJOLICIOUS_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SR/SRI -PERL_MOJOLICIOUS_LICENSE = Artistic-2.0 -PERL_MOJOLICIOUS_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-net-dns/Config.in b/package.bak/perl-net-dns/Config.in deleted file mode 100644 index de720bf25e..0000000000 --- a/package.bak/perl-net-dns/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_NET_DNS - bool "perl-net-dns" - select BR2_PACKAGE_PERL_DIGEST_HMAC - help - Perl Interface to the Domain Name System - - http://www.net-dns.org diff --git a/package.bak/perl-net-dns/perl-net-dns.hash b/package.bak/perl-net-dns/perl-net-dns.hash deleted file mode 100644 index d2f072510a..0000000000 --- a/package.bak/perl-net-dns/perl-net-dns.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 96c1a801cab92b81696a037c7c326e59 Net-DNS-1.07.tar.gz -sha256 5f91497f1af9f690153fa05a27a7d73ddada08bed40536fe2d0ac759b7af8492 Net-DNS-1.07.tar.gz diff --git a/package.bak/perl-net-dns/perl-net-dns.mk b/package.bak/perl-net-dns/perl-net-dns.mk deleted file mode 100644 index f1a0b88deb..0000000000 --- a/package.bak/perl-net-dns/perl-net-dns.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-net-dns -# -################################################################################ - -PERL_NET_DNS_VERSION = 1.07 -PERL_NET_DNS_SOURCE = Net-DNS-$(PERL_NET_DNS_VERSION).tar.gz -PERL_NET_DNS_SITE = $(BR2_CPAN_MIRROR)/authors/id/N/NL/NLNETLABS -PERL_NET_DNS_DEPENDENCIES = perl-digest-hmac -PERL_NET_DNS_LICENSE = MIT -PERL_NET_DNS_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-net-http/Config.in b/package.bak/perl-net-http/Config.in deleted file mode 100644 index 63215772a4..0000000000 --- a/package.bak/perl-net-http/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_NET_HTTP - bool "perl-net-http" - select BR2_PACKAGE_PERL_URI - help - Low-level HTTP connection (client) - - https://github.com/libwww-perl/Net-HTTP diff --git a/package.bak/perl-net-http/perl-net-http.hash b/package.bak/perl-net-http/perl-net-http.hash deleted file mode 100644 index 4dfad86e3f..0000000000 --- a/package.bak/perl-net-http/perl-net-http.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 988c72ce2890df56e41df6695d108e5d Net-HTTP-6.12.tar.gz -sha256 8565aff76b3d09084642f3a83c654fb4ced8220e8e19d35c78b661519b4c1be6 Net-HTTP-6.12.tar.gz diff --git a/package.bak/perl-net-http/perl-net-http.mk b/package.bak/perl-net-http/perl-net-http.mk deleted file mode 100644 index ec74a3f32e..0000000000 --- a/package.bak/perl-net-http/perl-net-http.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-net-http -# -################################################################################ - -PERL_NET_HTTP_VERSION = 6.12 -PERL_NET_HTTP_SOURCE = Net-HTTP-$(PERL_NET_HTTP_VERSION).tar.gz -PERL_NET_HTTP_SITE = $(BR2_CPAN_MIRROR)/authors/id/O/OA/OALDERS -PERL_NET_HTTP_DEPENDENCIES = perl-uri -PERL_NET_HTTP_LICENSE = Artistic or GPLv1+ -PERL_NET_HTTP_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-net-ssleay/0001-fix-build-system.patch b/package.bak/perl-net-ssleay/0001-fix-build-system.patch deleted file mode 100644 index a6cd0f9ceb..0000000000 --- a/package.bak/perl-net-ssleay/0001-fix-build-system.patch +++ /dev/null @@ -1,36 +0,0 @@ -buildsystem: fix for cross-compilation - -Avoid running the openssl binary, since it would break for -cross-compilation. Buildroot has a supported version, anyway. - -Also, avoid adding hard-coded includes and libraries search -paths, since they are missing the destdir; Buildroot compilers -and linkers already know where to search, anyway. - -Signed-off-by: "Yann E. MORIN" - -diff -durN perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm ---- perl-net-ssleay-1.64.orig/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-04-01 08:08:37.000000000 +0200 -+++ perl-net-ssleay-1.64/inc/Module/Install/PRIVATE/Net/SSLeay.pm 2014-07-13 00:38:46.281380282 +0200 -@@ -37,14 +37,18 @@ - exit 0; # according http://wiki.cpantesters.org/wiki/CPANAuthorNotes this is best-practice when "missing library" - } - -- $self->check_openssl_version($prefix, $exec); -+# Does not work for cross-compilation. -+# In Buildroot, we do have a supported version. -+# $self->check_openssl_version($prefix, $exec); - my $opts = $self->ssleay_get_build_opts($prefix, $exec); - - $self->makemaker_args( - CCCDLFLAGS => $opts->{cccdlflags}, - OPTIMIZE => $opts->{optimize}, -- INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -- LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), -+# Buildroot already has the correct include and library search paths. -+# INC => join(' ', map {"-I$_"} @{$opts->{inc_paths}}), -+# LIBS => join(' ', (map {"-L$_"} @{$opts->{lib_paths}}), (map {"-l$_"} @{$opts->{lib_links}})), -+ LIBS => join(' ', (map {"-l$_"} @{$opts->{lib_links}})), - ); - - if ( $self->prompt( diff --git a/package.bak/perl-net-ssleay/Config.in b/package.bak/perl-net-ssleay/Config.in deleted file mode 100644 index 80178e0b98..0000000000 --- a/package.bak/perl-net-ssleay/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PERL_NET_SSLEAY - bool "perl-net-ssleay" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_OPENSSL - help - Perl extension for using OpenSSL - - https://metacpan.org/release/Net-SSLeay - -comment "perl-net-ssleay needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-net-ssleay/perl-net-ssleay.hash b/package.bak/perl-net-ssleay/perl-net-ssleay.hash deleted file mode 100644 index 556aea7d5e..0000000000 --- a/package.bak/perl-net-ssleay/perl-net-ssleay.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 a740d7792dbac8ca8c4eb38d3b8fbd01 Net-SSLeay-1.72.tar.gz -sha256 1baac39f0f12cee515d8bec633175bb5916ca542e5356e26420437bd6195d2f4 Net-SSLeay-1.72.tar.gz diff --git a/package.bak/perl-net-ssleay/perl-net-ssleay.mk b/package.bak/perl-net-ssleay/perl-net-ssleay.mk deleted file mode 100644 index 03a039e064..0000000000 --- a/package.bak/perl-net-ssleay/perl-net-ssleay.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# perl-net-ssleay -# -################################################################################ - -PERL_NET_SSLEAY_VERSION = 1.72 -PERL_NET_SSLEAY_SOURCE = Net-SSLeay-$(PERL_NET_SSLEAY_VERSION).tar.gz -PERL_NET_SSLEAY_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKEM -PERL_NET_SSLEAY_DEPENDENCIES = openssl -PERL_NET_SSLEAY_LICENSE = OpenSSL -PERL_NET_SSLEAY_LICENSE_FILES = LICENSE - -# Try as hard as possible to remedy to the brain-damage their build-system -# suffers from: don't search for openssl, they pick the host-system one. -PERL_NET_SSLEAY_CONF_ENV = OPENSSL_PREFIX=$(STAGING_DIR)/usr - -# Remove problematic single quotes in LDDLFLAGS, CCFLAGS & OPTIMIZE definition -define PERL_NET_SSLEAY_FIX_MAKEFILE - $(SED) "s/^LDDLFLAGS = '\(.*\)'/LDDLFLAGS = \1/" $(@D)/Makefile - $(SED) "s/^CCFLAGS = '\(.*\)'/CCFLAGS = \1/" $(@D)/Makefile - $(SED) "s/^OPTIMIZE = '\(.*\)'/OPTIMIZE = \1/" $(@D)/Makefile -endef -PERL_NET_SSLEAY_POST_CONFIGURE_HOOKS += PERL_NET_SSLEAY_FIX_MAKEFILE - -$(eval $(perl-package)) diff --git a/package.bak/perl-netaddr-ip/Config.in b/package.bak/perl-netaddr-ip/Config.in deleted file mode 100644 index 1525830083..0000000000 --- a/package.bak/perl-netaddr-ip/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PERL_NETADDR_IP - bool "perl-netaddr-ip" - help - Manages IPv4 and IPv6 addresses and subnets - - https://metacpan.org/release/NetAddr-IP - diff --git a/package.bak/perl-netaddr-ip/perl-netaddr-ip.hash b/package.bak/perl-netaddr-ip/perl-netaddr-ip.hash deleted file mode 100644 index fde62b1223..0000000000 --- a/package.bak/perl-netaddr-ip/perl-netaddr-ip.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 990dfcbffae356835c536e8ab56a2880 NetAddr-IP-4.079.tar.gz -sha256 ec5a82dfb7028bcd28bb3d569f95d87dd4166cc19867f2184ed3a59f6d6ca0e7 NetAddr-IP-4.079.tar.gz diff --git a/package.bak/perl-netaddr-ip/perl-netaddr-ip.mk b/package.bak/perl-netaddr-ip/perl-netaddr-ip.mk deleted file mode 100644 index b5ee9a1cfb..0000000000 --- a/package.bak/perl-netaddr-ip/perl-netaddr-ip.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# perl-netaddr-ip -# -################################################################################ - -PERL_NETADDR_IP_VERSION = 4.079 -PERL_NETADDR_IP_SOURCE = NetAddr-IP-$(PERL_NETADDR_IP_VERSION).tar.gz -PERL_NETADDR_IP_SITE = $(BR2_CPAN_MIRROR)/authors/id/M/MI/MIKER -PERL_NETADDR_IP_LICENSE = Artistic or GPLv1+ -PERL_NETADDR_IP_LICENSE_FILES = Artistic Copying - -# we always build the Pure Perl version. -# the build of the native part of NetAddr::IP::Util is buggy. -PERL_NETADDR_IP_CONF_OPTS = -noxs - -$(eval $(perl-package)) diff --git a/package.bak/perl-path-tiny/Config.in b/package.bak/perl-path-tiny/Config.in deleted file mode 100644 index f85e792dd9..0000000000 --- a/package.bak/perl-path-tiny/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_PATH_TINY - bool "perl-path-tiny" - help - File path utility - - https://github.com/dagolden/Path-Tiny diff --git a/package.bak/perl-path-tiny/perl-path-tiny.hash b/package.bak/perl-path-tiny/perl-path-tiny.hash deleted file mode 100644 index 259469cc11..0000000000 --- a/package.bak/perl-path-tiny/perl-path-tiny.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 92ece7b2aa09f18035b0550b0118bdee Path-Tiny-0.100.tar.gz -sha256 8b8c4c9db710470a26b356e7187eba47217fbba1fe8bd0ad72c5b2cc8f6ba10c Path-Tiny-0.100.tar.gz diff --git a/package.bak/perl-path-tiny/perl-path-tiny.mk b/package.bak/perl-path-tiny/perl-path-tiny.mk deleted file mode 100644 index ed1304d4cf..0000000000 --- a/package.bak/perl-path-tiny/perl-path-tiny.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-path-tiny -# -################################################################################ - -PERL_PATH_TINY_VERSION = 0.100 -PERL_PATH_TINY_SOURCE = Path-Tiny-$(PERL_PATH_TINY_VERSION).tar.gz -PERL_PATH_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/D/DA/DAGOLDEN -PERL_PATH_TINY_LICENSE = Apache-2.0 -PERL_PATH_TINY_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-time-hires/Config.in b/package.bak/perl-time-hires/Config.in deleted file mode 100644 index 37bad71d85..0000000000 --- a/package.bak/perl-time-hires/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PERL_TIME_HIRES - bool "perl-time-hires" - depends on !BR2_STATIC_LIBS - help - High resolution alarm, sleep, gettimeofday, interval timers - - http://search.cpan.org/dist/Time-HiRes/HiRes.pm - -comment "perl-time-hires needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-time-hires/perl-time-hires.hash b/package.bak/perl-time-hires/perl-time-hires.hash deleted file mode 100644 index 1852340456..0000000000 --- a/package.bak/perl-time-hires/perl-time-hires.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 077e5d7eda1349f98c564026603f8a0a Time-HiRes-1.9726.tar.gz -sha256 ff662ad9b1f6c75a149db7fa1bfc7a161ac8b271e5f3980345e08b734769109e Time-HiRes-1.9726.tar.gz diff --git a/package.bak/perl-time-hires/perl-time-hires.mk b/package.bak/perl-time-hires/perl-time-hires.mk deleted file mode 100644 index 7436d96de3..0000000000 --- a/package.bak/perl-time-hires/perl-time-hires.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-time-hires -# -################################################################################ - -PERL_TIME_HIRES_VERSION = 1.9726 -PERL_TIME_HIRES_SOURCE = Time-HiRes-$(PERL_TIME_HIRES_VERSION).tar.gz -PERL_TIME_HIRES_SITE = $(BR2_CPAN_MIRROR)/authors/id/Z/ZE/ZEFRAM -PERL_TIME_HIRES_LICENSE = Artistic or GPLv1+ -PERL_TIME_HIRES_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-timedate/Config.in b/package.bak/perl-timedate/Config.in deleted file mode 100644 index 7ce9de1a7d..0000000000 --- a/package.bak/perl-timedate/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_TIMEDATE - bool "perl-timedate" - help - Date formating subroutines - - https://metacpan.org/release/TimeDate diff --git a/package.bak/perl-timedate/perl-timedate.hash b/package.bak/perl-timedate/perl-timedate.hash deleted file mode 100644 index 28a9f078d0..0000000000 --- a/package.bak/perl-timedate/perl-timedate.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 b1d91153ac971347aee84292ed886c1c TimeDate-2.30.tar.gz -sha256 75bd254871cb5853a6aa0403ac0be270cdd75c9d1b6639f18ecba63c15298e86 TimeDate-2.30.tar.gz diff --git a/package.bak/perl-timedate/perl-timedate.mk b/package.bak/perl-timedate/perl-timedate.mk deleted file mode 100644 index 4c594fb799..0000000000 --- a/package.bak/perl-timedate/perl-timedate.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-timedate -# -################################################################################ - -PERL_TIMEDATE_VERSION = 2.30 -PERL_TIMEDATE_SOURCE = TimeDate-$(PERL_TIMEDATE_VERSION).tar.gz -PERL_TIMEDATE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GB/GBARR -PERL_TIMEDATE_LICENSE = Artistic or GPLv1+ -PERL_TIMEDATE_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-try-tiny/Config.in b/package.bak/perl-try-tiny/Config.in deleted file mode 100644 index 5c115b638c..0000000000 --- a/package.bak/perl-try-tiny/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_TRY_TINY - bool "perl-try-tiny" - help - Minimal try/catch with proper preservation of $@ - - https://github.com/p5sagit/Try-Tiny diff --git a/package.bak/perl-try-tiny/perl-try-tiny.hash b/package.bak/perl-try-tiny/perl-try-tiny.hash deleted file mode 100644 index c6dbd44f47..0000000000 --- a/package.bak/perl-try-tiny/perl-try-tiny.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 e2f8af601a62981aab30df15a6f47475 Try-Tiny-0.28.tar.gz -sha256 f1d166be8aa19942c4504c9111dade7aacb981bc5b3a2a5c5f6019646db8c146 Try-Tiny-0.28.tar.gz diff --git a/package.bak/perl-try-tiny/perl-try-tiny.mk b/package.bak/perl-try-tiny/perl-try-tiny.mk deleted file mode 100644 index b4d35ab198..0000000000 --- a/package.bak/perl-try-tiny/perl-try-tiny.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-try-tiny -# -################################################################################ - -PERL_TRY_TINY_VERSION = 0.28 -PERL_TRY_TINY_SOURCE = Try-Tiny-$(PERL_TRY_TINY_VERSION).tar.gz -PERL_TRY_TINY_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER -PERL_TRY_TINY_LICENSE = MIT -PERL_TRY_TINY_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-uri/Config.in b/package.bak/perl-uri/Config.in deleted file mode 100644 index 62a53f248a..0000000000 --- a/package.bak/perl-uri/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PERL_URI - bool "perl-uri" - help - The module implements the URI class. Objects of this class represent - Uniform Resource Identifier references as specified in RFC 2396 and - updated by RFC 2732. - - https://github.com/libwww-perl/uri diff --git a/package.bak/perl-uri/perl-uri.hash b/package.bak/perl-uri/perl-uri.hash deleted file mode 100644 index 8a265bfcb0..0000000000 --- a/package.bak/perl-uri/perl-uri.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 247c3da29a794f72730e01aa5a715daf URI-1.71.tar.gz -sha256 9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115 URI-1.71.tar.gz diff --git a/package.bak/perl-uri/perl-uri.mk b/package.bak/perl-uri/perl-uri.mk deleted file mode 100644 index e7118fceed..0000000000 --- a/package.bak/perl-uri/perl-uri.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-uri -# -################################################################################ - -PERL_URI_VERSION = 1.71 -PERL_URI_SOURCE = URI-$(PERL_URI_VERSION).tar.gz -PERL_URI_SITE = $(BR2_CPAN_MIRROR)/authors/id/E/ET/ETHER -PERL_URI_LICENSE = Artistic or GPLv1+ -PERL_URI_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl-www-robotrules/Config.in b/package.bak/perl-www-robotrules/Config.in deleted file mode 100644 index e80f5a0d9d..0000000000 --- a/package.bak/perl-www-robotrules/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PERL_WWW_ROBOTRULES - bool "perl-www-robotrules" - select BR2_PACKAGE_PERL_URI - help - This module provides functions that deal the date formats used by the - HTTP protocol (and then some more) - - http://github.com/gisle/www-robotrules diff --git a/package.bak/perl-www-robotrules/perl-www-robotrules.hash b/package.bak/perl-www-robotrules/perl-www-robotrules.hash deleted file mode 100644 index 9091a29659..0000000000 --- a/package.bak/perl-www-robotrules/perl-www-robotrules.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 b7186e8b8b3701e70c22abf430742403 WWW-RobotRules-6.02.tar.gz -sha256 46b502e7a288d559429891eeb5d979461dd3ecc6a5c491ead85d165b6e03a51e WWW-RobotRules-6.02.tar.gz diff --git a/package.bak/perl-www-robotrules/perl-www-robotrules.mk b/package.bak/perl-www-robotrules/perl-www-robotrules.mk deleted file mode 100644 index 0c68b98a3a..0000000000 --- a/package.bak/perl-www-robotrules/perl-www-robotrules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-www-robotrules -# -################################################################################ - -PERL_WWW_ROBOTRULES_VERSION = 6.02 -PERL_WWW_ROBOTRULES_SOURCE = WWW-RobotRules-$(PERL_WWW_ROBOTRULES_VERSION).tar.gz -PERL_WWW_ROBOTRULES_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GA/GAAS -PERL_WWW_ROBOTRULES_DEPENDENCIES = perl-uri -PERL_WWW_ROBOTRULES_LICENSE = Artistic or GPLv1+ -PERL_WWW_ROBOTRULES_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-xml-libxml/0001-Makefile-PL.patch b/package.bak/perl-xml-libxml/0001-Makefile-PL.patch deleted file mode 100644 index e043c6d24c..0000000000 --- a/package.bak/perl-xml-libxml/0001-Makefile-PL.patch +++ /dev/null @@ -1,18 +0,0 @@ -fake check_lib for cross-compilation - -Signed-off-by: Francois Perrad - -Index: b/Makefile.PL -=================================================================== ---- a/Makefile.PL -+++ b/Makefile.PL -@@ -88,8 +88,7 @@ - # -------------------------------------------------------------------------- # - # -------------------------------------------------------------------------- # - --use lib qw(inc); --use Devel::CheckLib; -+sub check_lib { return 1; } - - # Prompt the user here for any paths and other configuration - diff --git a/package.bak/perl-xml-libxml/Config.in b/package.bak/perl-xml-libxml/Config.in deleted file mode 100644 index fb15e1011c..0000000000 --- a/package.bak/perl-xml-libxml/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PERL_XML_LIBXML - bool "perl-xml-libxml" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT - select BR2_PACKAGE_PERL_XML_SAX - select BR2_PACKAGE_PERL_XML_SAX_BASE - help - Interface to Gnome libxml2 xml parsing and DOM library - - https://github.com/shlomif/perl-XML-LibXML - -comment "perl-xml-libxml needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/perl-xml-libxml/perl-xml-libxml.hash b/package.bak/perl-xml-libxml/perl-xml-libxml.hash deleted file mode 100644 index b6195c3b98..0000000000 --- a/package.bak/perl-xml-libxml/perl-xml-libxml.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 9904690371679e082ff2c23677b6c90e XML-LibXML-2.0128.tar.gz -sha256 26e7ba451f3bade4d29ff00653a2ee01d13fe38b9a2ebcd0b0f3f82f9f688f2b XML-LibXML-2.0128.tar.gz diff --git a/package.bak/perl-xml-libxml/perl-xml-libxml.mk b/package.bak/perl-xml-libxml/perl-xml-libxml.mk deleted file mode 100644 index 8d8f5905ac..0000000000 --- a/package.bak/perl-xml-libxml/perl-xml-libxml.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# perl-xml-libxml -# -################################################################################ - -PERL_XML_LIBXML_VERSION = 2.0128 -PERL_XML_LIBXML_SOURCE = XML-LibXML-$(PERL_XML_LIBXML_VERSION).tar.gz -PERL_XML_LIBXML_SITE = $(BR2_CPAN_MIRROR)/authors/id/S/SH/SHLOMIF -PERL_XML_LIBXML_DEPENDENCIES = zlib libxml2 perl-xml-namespacesupport perl-xml-sax perl-xml-sax-base -PERL_XML_LIBXML_LICENSE = Artistic or GPLv1+ -PERL_XML_LIBXML_LICENSE_FILES = LICENSE - -PERL_XML_LIBXML_CONF_OPTS = \ - LIBS="-L $(STAGING_DIR)/usr/lib" \ - INC="-I $(STAGING_DIR)/usr/include/libxml2" \ - NO_THREADS - -$(eval $(perl-package)) diff --git a/package.bak/perl-xml-namespacesupport/Config.in b/package.bak/perl-xml-namespacesupport/Config.in deleted file mode 100644 index bc67d47904..0000000000 --- a/package.bak/perl-xml-namespacesupport/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT - bool "perl-xml-namespacesupport" - help - a simple generic namespace support class - - https://metacpan.org/release/XML-NamespaceSupport diff --git a/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.hash b/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.hash deleted file mode 100644 index 9389601d0f..0000000000 --- a/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 222cca76161cd956d724286d36b607da XML-NamespaceSupport-1.11.tar.gz -sha256 6d8151f0a3f102313d76b64bfd1c2d9ed46bfe63a16f038e7d860fda287b74ea XML-NamespaceSupport-1.11.tar.gz diff --git a/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.mk b/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.mk deleted file mode 100644 index 31b71c13e5..0000000000 --- a/package.bak/perl-xml-namespacesupport/perl-xml-namespacesupport.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-xml-namespacesupport -# -################################################################################ - -PERL_XML_NAMESPACESUPPORT_VERSION = 1.11 -PERL_XML_NAMESPACESUPPORT_SOURCE = XML-NamespaceSupport-$(PERL_XML_NAMESPACESUPPORT_VERSION).tar.gz -PERL_XML_NAMESPACESUPPORT_SITE = $(BR2_CPAN_MIRROR)/authors/id/P/PE/PERIGRIN -PERL_XML_NAMESPACESUPPORT_LICENSE = Artistic or GPLv1+ -PERL_XML_NAMESPACESUPPORT_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-xml-sax-base/Config.in b/package.bak/perl-xml-sax-base/Config.in deleted file mode 100644 index 2ad25ac39b..0000000000 --- a/package.bak/perl-xml-sax-base/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PERL_XML_SAX_BASE - bool "perl-xml-sax-base" - help - Base class for SAX Drivers and Filters - - https://metacpan.org/release/XML-SAX-Base diff --git a/package.bak/perl-xml-sax-base/perl-xml-sax-base.hash b/package.bak/perl-xml-sax-base/perl-xml-sax-base.hash deleted file mode 100644 index 6822e1844a..0000000000 --- a/package.bak/perl-xml-sax-base/perl-xml-sax-base.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 38c8c3247dfd080712596118d70dbe32 XML-SAX-Base-1.08.tar.gz -sha256 666270318b15f88b8427e585198abbc19bc2e6ccb36dc4c0a4f2d9807330219e XML-SAX-Base-1.08.tar.gz diff --git a/package.bak/perl-xml-sax-base/perl-xml-sax-base.mk b/package.bak/perl-xml-sax-base/perl-xml-sax-base.mk deleted file mode 100644 index 60dec31695..0000000000 --- a/package.bak/perl-xml-sax-base/perl-xml-sax-base.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# perl-xml-sax-base -# -################################################################################ - -PERL_XML_SAX_BASE_VERSION = 1.08 -PERL_XML_SAX_BASE_SOURCE = XML-SAX-Base-$(PERL_XML_SAX_BASE_VERSION).tar.gz -PERL_XML_SAX_BASE_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM -PERL_XML_SAX_BASE_LICENSE = Artistic or GPLv1+ -PERL_XML_SAX_BASE_LICENSE_FILES = README - -$(eval $(perl-package)) diff --git a/package.bak/perl-xml-sax/Config.in b/package.bak/perl-xml-sax/Config.in deleted file mode 100644 index 4f5567e251..0000000000 --- a/package.bak/perl-xml-sax/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PERL_XML_SAX - bool "perl-xml-sax" - select BR2_PACKAGE_PERL_XML_NAMESPACESUPPORT - select BR2_PACKAGE_PERL_XML_SAX_BASE - help - Simple API for XML - - https://metacpan.org/release/XML-SAX diff --git a/package.bak/perl-xml-sax/perl-xml-sax.hash b/package.bak/perl-xml-sax/perl-xml-sax.hash deleted file mode 100644 index 6aa543c002..0000000000 --- a/package.bak/perl-xml-sax/perl-xml-sax.hash +++ /dev/null @@ -1,3 +0,0 @@ -# retrieved by scancpan from http://cpan.metacpan.org/ -md5 290f5375ae87fdebfdb5bc3854019f24 XML-SAX-0.99.tar.gz -sha256 32b04b8e36b6cc4cfc486de2d859d87af5386dd930f2383c49347050d6f5ad84 XML-SAX-0.99.tar.gz diff --git a/package.bak/perl-xml-sax/perl-xml-sax.mk b/package.bak/perl-xml-sax/perl-xml-sax.mk deleted file mode 100644 index f6d03729dc..0000000000 --- a/package.bak/perl-xml-sax/perl-xml-sax.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# perl-xml-sax -# -################################################################################ - -PERL_XML_SAX_VERSION = 0.99 -PERL_XML_SAX_SOURCE = XML-SAX-$(PERL_XML_SAX_VERSION).tar.gz -PERL_XML_SAX_SITE = $(BR2_CPAN_MIRROR)/authors/id/G/GR/GRANTM -PERL_XML_SAX_DEPENDENCIES = perl-xml-namespacesupport perl-xml-sax-base -PERL_XML_SAX_LICENSE = Artistic or GPLv1+ -PERL_XML_SAX_LICENSE_FILES = LICENSE - -$(eval $(perl-package)) diff --git a/package.bak/perl/0001-fix-static-build-with-gdbm-gettext.patch b/package.bak/perl/0001-fix-static-build-with-gdbm-gettext.patch deleted file mode 100644 index ca6bf011f0..0000000000 --- a/package.bak/perl/0001-fix-static-build-with-gdbm-gettext.patch +++ /dev/null @@ -1,20 +0,0 @@ -fix static build with gdbm + gettext - -see doc http://perldoc.perl.org/ExtUtils/MakeMaker.html#LIBS - -Signed-off-by: Francois Perrad - -index: b/ext/GDBM_File/Makefile.PL -=================================================================== ---- a/ext/GDBM_File/Makefile.PL -+++ b/ext/GDBM_File/Makefile.PL -@@ -2,7 +2,7 @@ use ExtUtils::MakeMaker; - use ExtUtils::Constant 0.11 'WriteConstants'; - WriteMakefile( - NAME => 'GDBM_File', -- LIBS => ["-lgdbm", "-ldbm"], -+ LIBS => ["-lgdbm -lintl", "-lgdbm", "-ldbm"], - XSPROTOARG => '-noprototypes', # XXX remove later? - VERSION_FROM => 'GDBM_File.pm', - realclean => {FILES=> 'const-c.inc const-xs.inc'}, - diff --git a/package.bak/perl/Config.in b/package.bak/perl/Config.in deleted file mode 100644 index cdd5aaba20..0000000000 --- a/package.bak/perl/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_PERL - bool "perl" - depends on BR2_USE_MMU # fork() - help - Larry Wall's Practical Extraction and Report Language - An interpreted scripting language, known among some as "Unix's Swiss - Army Chainsaw". - - http://www.perl.org/ - -if BR2_PACKAGE_PERL - -config BR2_PACKAGE_PERL_MODULES - string "custom module selection" - help - List of space-separated perl modules (without .pm) to copy to the - rootfs. - - Examples: constant Getopt/Std Time/Local - - Module dependencies on external libraries are not automatic so - check your needs. - - Leave empty for all modules (as far as the external libraries - are available). - -endif diff --git a/package.bak/perl/perl.hash b/package.bak/perl/perl.hash deleted file mode 100644 index 41c1ce8a61..0000000000 --- a/package.bak/perl/perl.hash +++ /dev/null @@ -1,7 +0,0 @@ -# Hashes from: http://www.cpan.org/src/5.0/perl-5.24.1.tar.xz.{md5,sha1,sha256}.txt -md5 af6a84c7c3e2b8b269c105a5db2f6d53 perl-5.24.1.tar.xz -sha1 5bec25d8821b81a5939ee220997f4c8ab1c13e31 perl-5.24.1.tar.xz -sha256 03a77bac4505c270f1890ece75afc7d4b555090b41aa41ea478747e23b2afb3f perl-5.24.1.tar.xz - -# Hashes from: http://github.com/arsv/perl-cross/releases/download/1.1.3/perl-cross-1.1.3.hash -sha256 181b24ff71815fb2c8065e6ea139d106796eee0964aebfd8081f0b7f69e0696d perl-cross-1.1.3.tar.gz diff --git a/package.bak/perl/perl.mk b/package.bak/perl/perl.mk deleted file mode 100644 index 224b4cbaae..0000000000 --- a/package.bak/perl/perl.mk +++ /dev/null @@ -1,120 +0,0 @@ -################################################################################ -# -# perl -# -################################################################################ - -# When updating the version here, also update support/scripts/scancpan -PERL_VERSION_MAJOR = 24 -PERL_VERSION = 5.$(PERL_VERSION_MAJOR).1 -PERL_SITE = http://www.cpan.org/src/5.0 -PERL_SOURCE = perl-$(PERL_VERSION).tar.xz -PERL_LICENSE = Artistic or GPLv1+ -PERL_LICENSE_FILES = Artistic Copying README -PERL_INSTALL_STAGING = YES - -PERL_CROSS_VERSION = 1.1.3 -# DO NOT refactor with the github helper (the result is not the same) -PERL_CROSS_SITE = https://github.com/arsv/perl-cross/releases/download/$(PERL_CROSS_VERSION) -PERL_CROSS_SOURCE = perl-cross-$(PERL_CROSS_VERSION).tar.gz -PERL_EXTRA_DOWNLOADS = $(PERL_CROSS_SITE)/$(PERL_CROSS_SOURCE) - -# We use the perlcross hack to cross-compile perl. It should -# be extracted over the perl sources, so we don't define that -# as a separate package. Instead, it is downloaded and extracted -# together with perl -define PERL_CROSS_EXTRACT - $(call suitable-extractor,$(PERL_CROSS_SOURCE)) $(DL_DIR)/$(PERL_CROSS_SOURCE) | \ - $(TAR) --strip-components=1 -C $(@D) $(TAR_OPTIONS) - -endef -PERL_POST_EXTRACT_HOOKS += PERL_CROSS_EXTRACT - -# Even though perl is not an autotools-package, it uses config.sub and -# config.guess. Up-to-date versions of these files may be needed to build perl -# on newer host architectures, so we borrow the hook which updates them from the -# autotools infrastructure. -PERL_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK - -ifeq ($(BR2_PACKAGE_BERKELEYDB),y) -PERL_DEPENDENCIES += berkeleydb -endif -ifeq ($(BR2_PACKAGE_GDBM),y) -PERL_DEPENDENCIES += gdbm -endif - -# We have to override LD, because an external multilib toolchain ld is not -# wrapped to provide the required sysroot options. -PERL_CONF_OPTS = \ - --target=$(GNU_TARGET_NAME) \ - --target-tools-prefix=$(TARGET_CROSS) \ - --prefix=/usr \ - -Dld="$(TARGET_CC)" \ - -Dccflags="$(TARGET_CFLAGS)" \ - -Dldflags="$(TARGET_LDFLAGS) -lm" \ - -Dmydomain="" \ - -Dmyhostname="noname" \ - -Dmyuname="Buildroot $(BR2_VERSION_FULL)" \ - -Dosname=linux \ - -Dosvers=$(LINUX_VERSION) \ - -Dperladmin=root - -ifeq ($(shell expr $(PERL_VERSION_MAJOR) % 2), 1) -PERL_CONF_OPTS += -Dusedevel -endif - -ifeq ($(BR2_STATIC_LIBS),y) -PERL_CONF_OPTS += --all-static --no-dynaloader -endif - -PERL_MODULES = $(call qstrip,$(BR2_PACKAGE_PERL_MODULES)) -ifneq ($(PERL_MODULES),) -PERL_CONF_OPTS += --only-mod=$(subst $(space),$(comma),$(PERL_MODULES)) -endif - -define PERL_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ - ./configure $(PERL_CONF_OPTS)) - $(SED) 's/UNKNOWN-/Buildroot $(BR2_VERSION_FULL) /' $(@D)/patchlevel.h -endef - -define PERL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) all -endef - -define PERL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(STAGING_DIR)" install.perl install.sym -endef - -define PERL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR="$(TARGET_DIR)" install.perl install.sym -endef - -HOST_PERL_CONF_OPTS = \ - -des \ - -Dprefix="$(HOST_DIR)/usr" \ - -Dcc="$(HOSTCC)" - -define HOST_PERL_CONFIGURE_CMDS - (cd $(@D); $(HOST_MAKE_ENV) HOSTCC='$(HOSTCC_NOCCACHE)' \ - ./Configure $(HOST_PERL_CONF_OPTS)) -endef - -define HOST_PERL_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_PERL_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALL_DEPENDENCE='' install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) - -define PERL_FINALIZE_TARGET - rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/pod - rm -rf $(TARGET_DIR)/usr/lib/perl5/$(PERL_VERSION)/$(PERL_ARCHNAME)/CORE - find $(TARGET_DIR)/usr/lib/perl5/ -name 'extralibs.ld' -print0 | xargs -0 rm -f - find $(TARGET_DIR)/usr/lib/perl5/ -name '*.bs' -print0 | xargs -0 rm -f - find $(TARGET_DIR)/usr/lib/perl5/ -name '.packlist' -print0 | xargs -0 rm -f -endef -PERL_TARGET_FINALIZE_HOOKS += PERL_FINALIZE_TARGET diff --git a/package.bak/phidgetwebservice/Config.in b/package.bak/phidgetwebservice/Config.in deleted file mode 100644 index db7577d744..0000000000 --- a/package.bak/phidgetwebservice/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_PHIDGETWEBSERVICE - bool "phidgetwebservice" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb, libphidget - depends on !BR2_STATIC_LIBS # libphidget - select BR2_PACKAGE_LIBPHIDGET - help - phidgetwebservice (the Phidget WebService) provides an HTTP - front-end to the libphidget device control API. This provides - an alternative to the libphidget C linkage interface for - controlling locally attached Phidgets USB devices and it also - allows you to control Phidget USB devices remotely when the host - running the phidgetwebservice has an exposed network interface. - - The phidgetwebservice client program uses the libphidget HTTP - functions to send commands to the phidgetwebservice. - - http://phidgets.com/ - -comment "phidgetwebservice needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_STATIC_LIBS diff --git a/package.bak/phidgetwebservice/phidgetwebservice.hash b/package.bak/phidgetwebservice/phidgetwebservice.hash deleted file mode 100644 index 7cd85da79a..0000000000 --- a/package.bak/phidgetwebservice/phidgetwebservice.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e8add82fd41d9cb274b88ee369a1f7366e35f85abcfcabb9e2a383574bb779c5 phidgetwebservice_2.1.8.20140319.tar.gz diff --git a/package.bak/phidgetwebservice/phidgetwebservice.mk b/package.bak/phidgetwebservice/phidgetwebservice.mk deleted file mode 100644 index f7d1b48411..0000000000 --- a/package.bak/phidgetwebservice/phidgetwebservice.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# phidgetwebservice -# -################################################################################ - -PHIDGETWEBSERVICE_VERSION = 2.1.8.20140319 -PHIDGETWEBSERVICE_SOURCE = phidgetwebservice_$(PHIDGETWEBSERVICE_VERSION).tar.gz -PHIDGETWEBSERVICE_SITE = http://www.phidgets.com/downloads/libraries -PHIDGETWEBSERVICE_DEPENDENCIES = libphidget -PHIDGETWEBSERVICE_LICENSE = LGPLv3 -PHIDGETWEBSERVICE_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/php-amqp/Config.in b/package.bak/php-amqp/Config.in deleted file mode 100644 index 0aa2021f5a..0000000000 --- a/package.bak/php-amqp/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PHP_AMQP - bool "php-amqp" - depends on BR2_PACKAGE_PHP - depends on BR2_TOOLCHAIN_HAS_THREADS # rabbitmq-c - select BR2_PACKAGE_RABBITMQ_C - help - Communicate with any AMQP compliant server. - - http://pecl.php.net/package/amqp - -comment "php-amqp needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/php-amqp/php-amqp.hash b/package.bak/php-amqp/php-amqp.hash deleted file mode 100644 index 73c69d920b..0000000000 --- a/package.bak/php-amqp/php-amqp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 38a92eaef1aa863404170bcd15605f7f78140eeec1ff5be6af65c5b8081e2599 amqp-1.7.1.tgz diff --git a/package.bak/php-amqp/php-amqp.mk b/package.bak/php-amqp/php-amqp.mk deleted file mode 100644 index d3ffe1600d..0000000000 --- a/package.bak/php-amqp/php-amqp.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# php-amqp -# -################################################################################ - -PHP_AMQP_VERSION = 1.7.1 -PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz -PHP_AMQP_SITE = https://pecl.php.net/get -PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-amqp=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_AMQP_DEPENDENCIES = rabbitmq-c php host-autoconf -PHP_AMQP_LICENSE = PHP -PHP_AMQP_LICENSE_FILES = LICENSE - -define PHP_AMQP_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_AMQP_PRE_CONFIGURE_HOOKS += PHP_AMQP_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-geoip/Config.in b/package.bak/php-geoip/Config.in deleted file mode 100644 index adb20466fc..0000000000 --- a/package.bak/php-geoip/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PHP_GEOIP - bool "php-geoip" - depends on BR2_PACKAGE_PHP - select BR2_PACKAGE_GEOIP - help - PHP GeoIP-based IP address mapper to geographical places. - - http://pecl.php.net/package/geoip diff --git a/package.bak/php-geoip/php-geoip.hash b/package.bak/php-geoip/php-geoip.hash deleted file mode 100644 index 37298802dc..0000000000 --- a/package.bak/php-geoip/php-geoip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 63167b717f624580b93f3c6c050d8d64ebc6cbe1377069646eb387534c7a2f7e php-geoip-ebb68228ad94298a305710f701b2ade9acff985d.tar.gz diff --git a/package.bak/php-geoip/php-geoip.mk b/package.bak/php-geoip/php-geoip.mk deleted file mode 100644 index c39c95c4ec..0000000000 --- a/package.bak/php-geoip/php-geoip.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# php-geoip -# -################################################################################ - -PHP_GEOIP_VERSION = ebb68228ad94298a305710f701b2ade9acff985d -PHP_GEOIP_SITE = $(call github,php7-extensions,ext-php7-geoip,$(PHP_GEOIP_VERSION)) -PHP_GEOIP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-geoip=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_GEOIP_DEPENDENCIES = geoip php host-autoconf -PHP_GEOIP_LICENSE = PHP -PHP_GEOIP_LICENSE_FILES = geoip.c - -define PHP_GEOIP_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_GEOIP_PRE_CONFIGURE_HOOKS += PHP_GEOIP_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-gnupg/Config.in b/package.bak/php-gnupg/Config.in deleted file mode 100644 index 113017d02a..0000000000 --- a/package.bak/php-gnupg/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PHP_GNUPG - bool "php-gnupg" - depends on BR2_PACKAGE_PHP - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # ligpgme - depends on BR2_USE_MMU # libassuan - select BR2_PACKAGE_LIBGPGME - help - PHP wrapper around the gpgme library. - - http://pecl.php.net/package/gnupg diff --git a/package.bak/php-gnupg/php-gnupg.hash b/package.bak/php-gnupg/php-gnupg.hash deleted file mode 100644 index f0654b5781..0000000000 --- a/package.bak/php-gnupg/php-gnupg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6f1a4b5a95fe501519de76d66602e46290cc452fc48f3a5ec2eacaffe68d9a01 php-gnupg-30fab6eaf9eb61c65b3b46987442be058cbd7823.tar.gz diff --git a/package.bak/php-gnupg/php-gnupg.mk b/package.bak/php-gnupg/php-gnupg.mk deleted file mode 100644 index c1c6680bb7..0000000000 --- a/package.bak/php-gnupg/php-gnupg.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# php-gnupg -# -################################################################################ - -PHP_GNUPG_VERSION = 30fab6eaf9eb61c65b3b46987442be058cbd7823 -PHP_GNUPG_SITE = $(call github,Sean-Der,pecl-encryption-gnupg,$(PHP_GNUPG_VERSION)) -# phpize does the autoconf magic -PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf -PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg -PHP_GNUPG_LICENSE = BSD-2c -PHP_GNUPG_LICENSE_FILES = LICENSE - -define PHP_GNUPG_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_GNUPG_PRE_CONFIGURE_HOOKS += PHP_GNUPG_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-imagick/Config.in b/package.bak/php-imagick/Config.in deleted file mode 100644 index f759eea2f5..0000000000 --- a/package.bak/php-imagick/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PHP_IMAGICK - bool "php-imagick" - depends on BR2_PACKAGE_PHP - depends on BR2_USE_MMU # imagemagick - depends on BR2_TOOLCHAIN_HAS_THREADS # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - PHP wrapper to the ImageMagick library. - - http://pecl.php.net/package/imagick - -comment "php-imagemagick needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_PHP - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/php-imagick/php-imagick.hash b/package.bak/php-imagick/php-imagick.hash deleted file mode 100644 index e9912371b1..0000000000 --- a/package.bak/php-imagick/php-imagick.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 50bbc46e78cd6e1ea5d7660be1722258e60b1729483ca14b02da7cf9f5ed3e6a imagick-3.4.3RC1.tgz diff --git a/package.bak/php-imagick/php-imagick.mk b/package.bak/php-imagick/php-imagick.mk deleted file mode 100644 index ddcefdaa40..0000000000 --- a/package.bak/php-imagick/php-imagick.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# php-imagick -# -################################################################################ - -PHP_IMAGICK_VERSION = 3.4.3RC1 -PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz -PHP_IMAGICK_SITE = http://pecl.php.net/get -PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-imagick=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_IMAGICK_DEPENDENCIES = imagemagick php host-autoconf -PHP_IMAGICK_LICENSE = PHP -PHP_IMAGICK_LICENSE_FILES = LICENSE - -define PHP_IMAGICK_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_IMAGICK_PRE_CONFIGURE_HOOKS += PHP_IMAGICK_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-memcached/Config.in b/package.bak/php-memcached/Config.in deleted file mode 100644 index cd97c15285..0000000000 --- a/package.bak/php-memcached/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PHP_MEMCACHED - bool "php-memcached" - depends on BR2_INSTALL_LIBSTDCPP # libmemcached - depends on BR2_TOOLCHAIN_HAS_THREADS # libmemcached - select BR2_PACKAGE_PHP_EXT_SESSION - select BR2_PACKAGE_LIBMEMCACHED - select BR2_PACKAGE_ZLIB - help - PHP extension for interfacing with memcached via - libmemcached library. - - http://pecl.php.net/package/memcached - -comment "php-memcached needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/php-memcached/php-memcached.hash b/package.bak/php-memcached/php-memcached.hash deleted file mode 100644 index f2a096f3dd..0000000000 --- a/package.bak/php-memcached/php-memcached.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 73266212e791a4817da06be1daddf9ff7dd5b5b0b650b3fbd0f5fc6ccc18491b php-memcached-6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce.tar.gz diff --git a/package.bak/php-memcached/php-memcached.mk b/package.bak/php-memcached/php-memcached.mk deleted file mode 100644 index ea241b2656..0000000000 --- a/package.bak/php-memcached/php-memcached.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# php-memcached -# -################################################################################ - -PHP_MEMCACHED_VERSION = 6ee96cad7be5caa1f13a1f3e5a4d5f900b9c04ce -PHP_MEMCACHED_SITE = $(call github,php-memcached-dev,php-memcached,$(PHP_MEMCACHED_VERSION)) -PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --disable-memcached-sasl \ - --with-libmemcached-dir=$(STAGING_DIR)/usr \ - --with-zlib-dir=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_MEMCACHED_DEPENDENCIES = libmemcached php zlib host-autoconf host-pkgconf -PHP_MEMCACHED_LICENSE = MIT -PHP_MEMCACHED_LICENSE_FILES = LICENSE - -define PHP_MEMCACHED_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_MEMCACHED_PRE_CONFIGURE_HOOKS += PHP_MEMCACHED_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-ssh2/Config.in b/package.bak/php-ssh2/Config.in deleted file mode 100644 index b457900740..0000000000 --- a/package.bak/php-ssh2/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PHP_SSH2 - bool "php-ssh2" - depends on BR2_PACKAGE_PHP - select BR2_PACKAGE_LIBSSH2 - help - PHP bindings for the libssh2 library. - - http://pecl.php.net/package/ssh2 diff --git a/package.bak/php-ssh2/php-ssh2.hash b/package.bak/php-ssh2/php-ssh2.hash deleted file mode 100644 index b514601b93..0000000000 --- a/package.bak/php-ssh2/php-ssh2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3d79a6c9ffed3fd6ec16e834c0cc93cf125d9f5bdbb951b8b76a3507498548d5 php-ssh2-12dd52236c601577a63e33ee71e3ce6dad811e40.tar.gz diff --git a/package.bak/php-ssh2/php-ssh2.mk b/package.bak/php-ssh2/php-ssh2.mk deleted file mode 100644 index 2b616321e4..0000000000 --- a/package.bak/php-ssh2/php-ssh2.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# php-ssh2 -# -################################################################################ - -PHP_SSH2_VERSION = 12dd52236c601577a63e33ee71e3ce6dad811e40 -PHP_SSH2_SITE = $(call github,php,pecl-networking-ssh2,$(PHP_SSH2_VERSION)) -PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-ssh2=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_SSH2_DEPENDENCIES = libssh2 php host-autoconf -PHP_SSH2_LICENSE = PHP -PHP_SSH2_LICENSE_FILES = LICENSE - -define PHP_SSH2_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_SSH2_PRE_CONFIGURE_HOOKS += PHP_SSH2_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-yaml/Config.in b/package.bak/php-yaml/Config.in deleted file mode 100644 index 8d09ce28f3..0000000000 --- a/package.bak/php-yaml/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PHP_YAML - bool "php-yaml" - depends on BR2_PACKAGE_PHP - select BR2_PACKAGE_LIBYAML - help - PHP YAML-1.1 parser and emitter. - - http://pecl.php.net/package/yaml diff --git a/package.bak/php-yaml/php-yaml.hash b/package.bak/php-yaml/php-yaml.hash deleted file mode 100644 index a40677ef5f..0000000000 --- a/package.bak/php-yaml/php-yaml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d49acf2b7843258957a16df0d7ced56c0e1fc3eaa54f54289e4012edc002814c yaml-2.0.0RC7.tgz diff --git a/package.bak/php-yaml/php-yaml.mk b/package.bak/php-yaml/php-yaml.mk deleted file mode 100644 index 27118906d4..0000000000 --- a/package.bak/php-yaml/php-yaml.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# php-yaml -# -################################################################################ - -PHP_YAML_VERSION = 2.0.0RC7 -PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz -PHP_YAML_SITE = https://pecl.php.net/get -PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \ - --with-yaml=$(STAGING_DIR)/usr -# phpize does the autoconf magic -PHP_YAML_DEPENDENCIES = libyaml php host-autoconf -PHP_YAML_LICENSE = MIT -PHP_YAML_LICENSE_FILES = LICENSE - -define PHP_YAML_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_YAML_PRE_CONFIGURE_HOOKS += PHP_YAML_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php-zmq/Config.in b/package.bak/php-zmq/Config.in deleted file mode 100644 index 058f93d9a8..0000000000 --- a/package.bak/php-zmq/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -comment "php-zmq needs a toolchain w/ C++, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) - -config BR2_PACKAGE_PHP_ZMQ - bool "php-zmq" - depends on BR2_PACKAGE_PHP - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_ZEROMQ - help - ZeroMQ messaging bindings for PHP - - http://pecl.php.net/package/zmq diff --git a/package.bak/php-zmq/php-zmq.hash b/package.bak/php-zmq/php-zmq.hash deleted file mode 100644 index c99e351edc..0000000000 --- a/package.bak/php-zmq/php-zmq.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce zmq-1.1.3.tgz diff --git a/package.bak/php-zmq/php-zmq.mk b/package.bak/php-zmq/php-zmq.mk deleted file mode 100644 index 2730996d4c..0000000000 --- a/package.bak/php-zmq/php-zmq.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# php-zmq -# -################################################################################ - -PHP_ZMQ_VERSION = 1.1.3 -PHP_ZMQ_SOURCE = zmq-$(PHP_ZMQ_VERSION).tgz -PHP_ZMQ_SITE = https://pecl.php.net/get -# phpize does the autoconf magic -PHP_ZMQ_DEPENDENCIES = php zeromq host-autoconf host-pkgconf -PHP_ZMQ_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config -PHP_ZMQ_LICENSE = BSD-3c -PHP_ZMQ_LICENSE_FILES = LICENSE - -define PHP_ZMQ_PHPIZE - (cd $(@D); \ - PHP_AUTOCONF=$(HOST_DIR)/usr/bin/autoconf \ - PHP_AUTOHEADER=$(HOST_DIR)/usr/bin/autoheader \ - $(STAGING_DIR)/usr/bin/phpize) -endef - -PHP_ZMQ_PRE_CONFIGURE_HOOKS += PHP_ZMQ_PHPIZE - -$(eval $(autotools-package)) diff --git a/package.bak/php/0001-acinclude.m4-don-t-unset-variables.patch b/package.bak/php/0001-acinclude.m4-don-t-unset-variables.patch deleted file mode 100644 index d507775b8a..0000000000 --- a/package.bak/php/0001-acinclude.m4-don-t-unset-variables.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 7a4168062fbab2e33ef9a42bca9f87a5921afac2 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:49:56 +0200 -Subject: [PATCH] acinclude.m4: don't unset variables - -Unsetting ac_cv_{func,lib}_* is bad, you can't feed the configure cache. -Terminate them with extreme prejudice. - -Signed-off-by: Gustavo Zacarias ---- - acinclude.m4 | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index 28506b6..af4aa06 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -1898,8 +1898,6 @@ define([phpshift],[ifelse(index([$@],[,]),-1,,[substr([$@],incr(index([$@],[,])) - dnl - AC_DEFUN([PHP_CHECK_FUNC_LIB],[ - ifelse($2,,:,[ -- unset ac_cv_lib_$2[]_$1 -- unset ac_cv_lib_$2[]___$1 - unset found - AC_CHECK_LIB($2, $1, [found=yes], [ - AC_CHECK_LIB($2, __$1, [found=yes], [found=no]) -@@ -1931,8 +1929,6 @@ dnl in the default libraries and as a fall back in the specified library. - dnl Defines HAVE_func and HAVE_library if found and adds the library to LIBS. - dnl - AC_DEFUN([PHP_CHECK_FUNC],[ -- unset ac_cv_func_$1 -- unset ac_cv_func___$1 - unset found - - AC_CHECK_FUNC($1, [found=yes],[ AC_CHECK_FUNC(__$1,[found=yes],[found=no]) ]) --- -2.7.4 - diff --git a/package.bak/php/0002-iconv-tweak-iconv-detection.patch b/package.bak/php/0002-iconv-tweak-iconv-detection.patch deleted file mode 100644 index a34664930b..0000000000 --- a/package.bak/php/0002-iconv-tweak-iconv-detection.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 1357df0196806d5697b1f84497ef72aab5faa8a3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:50:49 +0200 -Subject: [PATCH] iconv: tweak iconv detection - -Tweak PHP_SETUP_ICONV from aclocal/acinclude.m4 to not -PHP_ADD_INCLUDE $ICONV_DIR/include since the tests use -test instead of AC_TRY_LINK to find headers which is bad, -specially when adding /usr and /usr/local to the mix. -Do basically the same with ext/iconv/config.m4 by tweaking -PHP_ICONV_H_PATH which, again, uses test and absolute paths. - -Signed-off-by: Gustavo Zacarias -[Gustavo: convert to nice m4 instead of patching configure] -[Gustavo: update for 5.6.10] ---- - acinclude.m4 | 2 +- - ext/iconv/config.m4 | 22 ---------------------- - 2 files changed, 1 insertion(+), 23 deletions(-) - -diff --git a/acinclude.m4 b/acinclude.m4 -index af4aa06..1bd2652 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -2471,7 +2471,7 @@ AC_DEFUN([PHP_SETUP_ICONV], [ - dnl - if test "$found_iconv" = "no"; then - -- for i in $PHP_ICONV /usr/local /usr; do -+ for i in $PHP_ICONV; do - if test -r $i/include/giconv.h; then - AC_DEFINE(HAVE_GICONV_H, 1, [ ]) - ICONV_DIR=$i -diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4 -index 6a05697..694fcb8 100644 ---- a/ext/iconv/config.m4 -+++ b/ext/iconv/config.m4 -@@ -14,28 +14,6 @@ if test "$PHP_ICONV" != "no"; then - ]) - - if test "$iconv_avail" != "no"; then -- if test -z "$ICONV_DIR"; then -- for i in /usr/local /usr; do -- if test -f "$i/include/iconv.h" || test -f "$i/include/giconv.h"; then -- PHP_ICONV_PREFIX="$i" -- break -- fi -- done -- if test -z "$PHP_ICONV_PREFIX"; then -- PHP_ICONV_PREFIX="/usr" -- fi -- else -- PHP_ICONV_PREFIX="$ICONV_DIR" -- fi -- -- CFLAGS="-I$PHP_ICONV_PREFIX/include $CFLAGS" -- LDFLAGS="-L$PHP_ICONV_PREFIX/$PHP_LIBDIR $LDFLAGS" -- -- if test -r "$PHP_ICONV_PREFIX/include/giconv.h"; then -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h" -- else -- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h" -- fi - - AC_MSG_CHECKING([if iconv is glibc's]) - AC_TRY_LINK([#include ],[gnu_get_libc_version();], --- -2.7.4 - diff --git a/package.bak/php/0003-configure-disable-the-phar-tool.patch b/package.bak/php/0003-configure-disable-the-phar-tool.patch deleted file mode 100644 index 3b64b7b6bf..0000000000 --- a/package.bak/php/0003-configure-disable-the-phar-tool.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 5ba6355e489f647c88ca48afbc75965468193181 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:51:53 +0200 -Subject: [PATCH] configure: disable the 'phar' tool - -Disable the 'phar' command-line tool build/installation since it requires -php to run and pack up phar itself in phar format. This would require -a host-php instance and really probably nobody needs the phar tool -on the target. - -Signed-off-by: Gustavo Zacarias -[Gustavo: update for autoreconf/configure.in] ---- - configure.in | 9 ++------- - 1 file changed, 2 insertions(+), 7 deletions(-) - -diff --git a/configure.in b/configure.in -index 25c8abf..4dc8a09 100644 ---- a/configure.in -+++ b/configure.in -@@ -1445,13 +1445,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag" - INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag" - CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)" - --if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then -- pharcmd=pharcmd -- pharcmd_install=install-pharcmd --else -- pharcmd= -- pharcmd_install= --fi; -+pharcmd= -+pharcmd_install= - - all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_BINARIES) $pharcmd" - install_targets="$install_sapi $install_modules $install_binaries install-build install-headers install-programs $install_pear $pharcmd_install" --- -2.7.4 - diff --git a/package.bak/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch b/package.bak/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch deleted file mode 100644 index 9b530361c9..0000000000 --- a/package.bak/php/0004-OPcache-flock-mechanism-is-obviously-linux-so-force-.patch +++ /dev/null @@ -1,58 +0,0 @@ -From bedbd41ef0a5ce80b83a6f6eaebd7c90f0bc5615 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:52:19 +0200 -Subject: [PATCH] OPcache: flock mechanism is obviously linux so force it. - -Signed-off-by: Gustavo Zacarias ---- - ext/opcache/config.m4 | 34 ++-------------------------------- - 1 file changed, 2 insertions(+), 32 deletions(-) - -diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4 -index fbb9b21..ffddc8e 100644 ---- a/ext/opcache/config.m4 -+++ b/ext/opcache/config.m4 -@@ -343,38 +343,8 @@ int main() { - msg=yes,msg=no,msg=no) - AC_MSG_RESULT([$msg]) - --flock_type=unknown --AC_MSG_CHECKING("whether flock struct is linux ordered") --AC_TRY_RUN([ -- #include -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_type == 1 && lock.l_whence == 2 && lock.l_start == 3 && lock.l_len == 4) { -- return 0; -- } -- return 1; -- } --], [ -- flock_type=linux -- AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) -- AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -- --AC_MSG_CHECKING("whether flock struct is BSD ordered") --AC_TRY_RUN([ -- #include -- struct flock lock = { 1, 2, 3, 4, 5 }; -- int main() { -- if(lock.l_start == 1 && lock.l_len == 2 && lock.l_type == 4 && lock.l_whence == 5) { -- return 0; -- } -- return 1; -- } --], [ -- flock_type=bsd -- AC_DEFINE([HAVE_FLOCK_BSD], [], [Struct flock is BSD-type]) -- AC_MSG_RESULT("yes") --], AC_MSG_RESULT("no") ) -+flock_type=linux -+AC_DEFINE([HAVE_FLOCK_LINUX], [], [Struct flock is Linux-type]) - - if test "$flock_type" = "unknown"; then - AC_MSG_ERROR([Don't know how to define struct flock on this system[,] set --enable-opcache=no]) --- -2.7.4 - diff --git a/package.bak/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch b/package.bak/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch deleted file mode 100644 index a36c2a3ae0..0000000000 --- a/package.bak/php/0005-ext-fileinfo-config.m4-allow-cache-answer-for-strcas.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a874ba472151c6811018de322a5787d0ca6148c9 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 9 Aug 2016 11:52:51 +0200 -Subject: [PATCH] ext/fileinfo/config.m4: allow cache answer for strcasestr - discovery - -Signed-off-by: Gustavo Zacarias ---- - ext/fileinfo/config.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 -index 7e98d62..8561962 100644 ---- a/ext/fileinfo/config.m4 -+++ b/ext/fileinfo/config.m4 -@@ -14,6 +14,7 @@ if test "$PHP_FILEINFO" != "no"; then - libmagic/readcdf.c libmagic/softmagic.c" - - AC_MSG_CHECKING([for strcasestr]) -+ AC_CACHE_VAL(ac_cv_func_strcasestr, - AC_TRY_RUN([ - #include - #include -@@ -46,7 +47,7 @@ int main(void) - AC_MSG_RESULT(no) - AC_MSG_NOTICE(using libmagic strcasestr implementation) - libmagic_sources="$libmagic_sources libmagic/strcasestr.c" -- ]) -+ ])) - - PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic) - PHP_ADD_BUILD_DIR($ext_builddir/libmagic) --- -2.7.4 - diff --git a/package.bak/php/0007-avoid-bfin-gcc-segfault.patch b/package.bak/php/0007-avoid-bfin-gcc-segfault.patch deleted file mode 100644 index 4dccb25f1f..0000000000 --- a/package.bak/php/0007-avoid-bfin-gcc-segfault.patch +++ /dev/null @@ -1,16 +0,0 @@ -Avoid gcc segmentation fault - -Signed-off-by: Waldemar Brodkorb - -diff -Nur php-7.0.12.orig/Zend/zend_portability.h php-7.0.12/Zend/zend_portability.h ---- php-7.0.12.orig/Zend/zend_portability.h 2016-10-13 16:04:17.000000000 +0200 -+++ php-7.0.12/Zend/zend_portability.h 2016-11-08 02:49:39.118388999 +0100 -@@ -97,7 +97,7 @@ - - #if defined(ZEND_WIN32) && !defined(__clang__) - # define ZEND_ASSUME(c) __assume(c) --#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT -+#elif ((defined(__GNUC__) && ZEND_GCC_VERSION >= 4005) || __has_builtin(__builtin_unreachable)) && PHP_HAVE_BUILTIN_EXPECT && !defined(__bfin__) - # define ZEND_ASSUME(c) do { \ - if (__builtin_expect(!(c), 0)) __builtin_unreachable(); \ - } while (0) diff --git a/package.bak/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch b/package.bak/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch deleted file mode 100644 index f4812daaa5..0000000000 --- a/package.bak/php/0008-fix-asm-constraints-in-aarch64-multiply-macro.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 1622f24fde4220967bd907bf8f0325d444bf9339 Mon Sep 17 00:00:00 2001 -From: Andy Postnikov -Date: Sat, 10 Dec 2016 23:51:17 +0300 -Subject: [PATCH] Fix bug #70015 - Compilation failure on aarch64 - -Fixes build at -O0. - -[From pull request https://github.com/php/php-src/pull/2236.] -Signed-off-by: Tatsuyuki Ishi ---- - Zend/zend_multiply.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Zend/zend_multiply.h b/Zend/zend_multiply.h -index 75769db..fbd69ab 100644 ---- a/Zend/zend_multiply.h -+++ b/Zend/zend_multiply.h -@@ -75,8 +75,8 @@ - __asm__("mul %0, %2, %3\n" \ - "smulh %1, %2, %3\n" \ - "sub %1, %1, %0, asr #63\n" \ -- : "=X"(__tmpvar), "=X"(usedval) \ -- : "X"(a), "X"(b)); \ -+ : "=&r"(__tmpvar), "=&r"(usedval) \ -+ : "r"(a), "r"(b)); \ - if (usedval) (dval) = (double) (a) * (double) (b); \ - else (lval) = __tmpvar; \ - } while (0) diff --git a/package.bak/php/0009-Call-apxs-with-correct-prefix.patch b/package.bak/php/0009-Call-apxs-with-correct-prefix.patch deleted file mode 100644 index b850ab7755..0000000000 --- a/package.bak/php/0009-Call-apxs-with-correct-prefix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 4342bdea7a1a21430ce0d051fa4387441166c473 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 11 Dec 2016 23:12:46 +0100 -Subject: [PATCH] Call apxs with correct prefix - -php uses apache's apxs script from staging directory to install libphp -dynamic library and update /etc/apache2/httpd.conf in the staging and target -directories. Here is the full command line: -"apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules' - -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7" -This does not work for target directory as apxs sets the full path of the -library and not the relative one. Indeed, apxs is smart enough to substitute -away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so -httpd.conf will only be correct in the staging directory. -To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure - -Signed-off-by: Fabrice Fontaine ---- - sapi/apache2handler/config.m4 | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sapi/apache2handler/config.m4 b/sapi/apache2handler/config.m4 -index 2e64b21..f5bf002 100644 ---- a/sapi/apache2handler/config.m4 -+++ b/sapi/apache2handler/config.m4 -@@ -66,10 +66,12 @@ if test "$PHP_APXS2" != "no"; then - AC_MSG_ERROR([Please note that Apache version >= 2.0.44 is required]) - fi - -+ APXS_PREFIX='$(INSTALL_ROOT)'/usr - APXS_LIBEXECDIR='$(INSTALL_ROOT)'`$APXS -q LIBEXECDIR` - if test -z `$APXS -q SYSCONFDIR`; then - INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ -+ -S PREFIX='$APXS_PREFIX' \ - -i -n php7" - else - APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR` -@@ -77,6 +79,7 @@ if test "$PHP_APXS2" != "no"; then - \$(mkinstalldirs) '$APXS_SYSCONFDIR' && \ - $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \ - -S SYSCONFDIR='$APXS_SYSCONFDIR' \ -+ -S PREFIX='$APXS_PREFIX' \ - -i -a -n php7" - fi - --- -2.5.0 - diff --git a/package.bak/php/Config.ext b/package.bak/php/Config.ext deleted file mode 100644 index 7c3ba7e8c4..0000000000 --- a/package.bak/php/Config.ext +++ /dev/null @@ -1,380 +0,0 @@ -menu "Extensions" - -config BR2_PACKAGE_PHP_EXT_CALENDAR - bool "Calendar" - help - Calendar and event support - -config BR2_PACKAGE_PHP_EXT_FILEINFO - bool "Fileinfo" - help - File Information support - -config BR2_PACKAGE_PHP_EXT_OPCACHE - bool "OPcache" - help - Enable the Zend OPcache accelerator. - -comment "Readline needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_PHP_EXT_READLINE - bool "Readline" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - Readline support - -config BR2_PACKAGE_PHP_EXT_SESSION - bool "Session" - default y - help - Session support - -comment "Compression extensions" - -config BR2_PACKAGE_PHP_EXT_BZIP2 - bool "bzip2" - select BR2_PACKAGE_BZIP2 - help - bzip2 read/write support - -config BR2_PACKAGE_PHP_EXT_PHAR - bool "phar" - help - PHP Archive support - -config BR2_PACKAGE_PHP_EXT_ZIP - bool "zip" - select BR2_PACKAGE_ZLIB - help - Zip read/write support - -config BR2_PACKAGE_PHP_EXT_ZLIB - bool "zlib" - select BR2_PACKAGE_ZLIB - default y - help - zlib support - -comment "Cryptography extensions" - -config BR2_PACKAGE_PHP_EXT_HASH - bool "hash" - help - HASH message digest framework - -config BR2_PACKAGE_PHP_EXT_MCRYPT - bool "mcrypt" - select BR2_PACKAGE_LIBMCRYPT - help - mcrypt support - -config BR2_PACKAGE_PHP_EXT_OPENSSL - bool "openssl" - select BR2_PACKAGE_OPENSSL - help - openssl support - -comment "Database extensions" - -config BR2_PACKAGE_PHP_EXT_DBA - bool "DBA" - help - Database Abstraction Layer - -if BR2_PACKAGE_PHP_EXT_DBA - -config BR2_PACKAGE_PHP_EXT_DBA_CDB - bool "cdb" - help - CDB handler - -config BR2_PACKAGE_PHP_EXT_DBA_DB4 - bool "db4/5" - select BR2_PACKAGE_BERKELEYDB - help - BerkeleyDB version 4/5 handler - -config BR2_PACKAGE_PHP_EXT_DBA_FLAT - bool "flat" - default y - help - Flat file handler - -config BR2_PACKAGE_PHP_EXT_DBA_INI - bool "ini" - default y - help - INI file handler - -endif - -config BR2_PACKAGE_PHP_EXT_MYSQLI - bool "Mysqli" - help - MySQL Improved extension support - -config BR2_PACKAGE_PHP_EXT_SQLITE - bool "SQLite3" - select BR2_PACKAGE_SQLITE - help - SQLite3 support - -config BR2_PACKAGE_PHP_EXT_PDO - bool "PDO" - help - PHP Data Objects support - -if BR2_PACKAGE_PHP_EXT_PDO - -config BR2_PACKAGE_PHP_EXT_PDO_MYSQL - bool "MySQL" - help - PDO driver for MySQL - -config BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL - bool "PostgreSQL" - select BR2_PACKAGE_POSTGRESQL - depends on BR2_USE_MMU # postgresql - depends on !BR2_STATIC_LIBS - help - PDO driver for PostgreSQL - -comment "PostgreSQL drivers need a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_PHP_EXT_PDO_SQLITE - bool "SQLite3" - select BR2_PACKAGE_SQLITE - help - SQLite3 driver for PDO - -config BR2_PACKAGE_PHP_EXT_PDO_UNIXODBC - bool "unixODBC" - select BR2_PACKAGE_UNIXODBC - help - unixODBC driver for PDO - -endif - -comment "Human language and character encoding support" - -config BR2_PACKAGE_PHP_EXT_GETTEXT - bool "Gettext" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - depends on BR2_USE_WCHAR - help - Gettext support - -comment "Gettext support needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_PHP_EXT_ICONV - bool "iconv" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - iconv character set conversion support - -config BR2_PACKAGE_PHP_EXT_INTL - bool "intl" - select BR2_PACKAGE_ICU - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on !BR2_BINFMT_FLAT # icu - depends on BR2_TOOLCHAIN_HAS_THREADS # icu - help - Internationalization support - -comment "intl support needs a toolchain w/ C++, wchar, threads" - depends on !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_PHP_EXT_MBSTRING - bool "mbstring" - help - multibyte string support - -comment "Image processing" - -config BR2_PACKAGE_PHP_EXT_EXIF - bool "EXIF" - help - EXIF support - -config BR2_PACKAGE_PHP_EXT_GD - bool "GD" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBPNG - help - GD support - -comment "Mathematical extensions" - -config BR2_PACKAGE_PHP_EXT_BCMATH - bool "BC math" - help - BCMath arbitrary precision mathematics support - -config BR2_PACKAGE_PHP_EXT_GMP - bool "GMP" - select BR2_PACKAGE_GMP - help - GNU Multiple Precision support - -comment "Other basic extensions" - -config BR2_PACKAGE_PHP_EXT_JSON - bool "JSON" - help - JavaScript Object Serialization support - -config BR2_PACKAGE_PHP_EXT_TOKENIZER - bool "Tokenizer" - help - Tokenizer functions support - -comment "Other services" - -config BR2_PACKAGE_PHP_EXT_CURL - bool "cURL" - select BR2_PACKAGE_LIBCURL - help - cURL for URL streams - -config BR2_PACKAGE_PHP_EXT_FTP - bool "FTP" - help - FTP support - -config BR2_PACKAGE_PHP_EXT_SNMP - bool "SNMP" - depends on BR2_USE_MMU # netsnmp fork() - select BR2_PACKAGE_NETSNMP - select BR2_PACKAGE_NETSNMP_ENABLE_MIBS - help - SNMP support - -config BR2_PACKAGE_PHP_EXT_SOCKETS - bool "sockets" - help - Sockets support - -comment "Process Control" - -config BR2_PACKAGE_PHP_EXT_PCNTL - bool "PCNTL" - depends on BR2_USE_MMU # fork() - help - Process control support - -config BR2_PACKAGE_PHP_EXT_POSIX - bool "Posix" - default y - help - POSIX.1 (IEEE 1003.1) function support - -config BR2_PACKAGE_PHP_EXT_SHMOP - bool "shmop" - help - Shared memory support - -config BR2_PACKAGE_PHP_EXT_SYSVMSG - bool "sysvmsg" - help - System V message queue support - -config BR2_PACKAGE_PHP_EXT_SYSVSEM - bool "sysvsem" - help - System V semaphore support - -config BR2_PACKAGE_PHP_EXT_SYSVSHM - bool "sysvshm" - help - System V shared memory support - -comment "Variable and Type related" - -config BR2_PACKAGE_PHP_EXT_CTYPE - bool "Ctype" - help - Character type checking support - -config BR2_PACKAGE_PHP_EXT_FILTER - bool "Filter" - help - Input filter support - -comment "Web services" - -config BR2_PACKAGE_PHP_EXT_SOAP - bool "SOAP" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - SOAP support - -config BR2_PACKAGE_PHP_EXT_XMLRPC - bool "XML-RPC" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - XML-RPC support - -comment "XML manipulation" - -config BR2_PACKAGE_PHP_EXT_DOM - bool "DOM" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - Document Object Model support - -config BR2_PACKAGE_PHP_EXT_LIBXML2 - bool "libxml" - select BR2_PACKAGE_LIBXML2 - help - libxml2 support - -config BR2_PACKAGE_PHP_EXT_SIMPLEXML - bool "SimpleXML" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - SimpleXML support - -config BR2_PACKAGE_PHP_EXT_WDDX - bool "WDDX" - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - WDDX support - -config BR2_PACKAGE_PHP_EXT_XML - bool "XML Parser" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - XML Parser support - -config BR2_PACKAGE_PHP_EXT_XMLREADER - bool "XMLReader" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - XMLReader support - -config BR2_PACKAGE_PHP_EXT_XMLWRITER - bool "XMLWriter" - select BR2_PACKAGE_PHP_EXT_LIBXML2 - help - XMLWriter support - -config BR2_PACKAGE_PHP_EXT_XSL - bool "XSL" - select BR2_PACKAGE_PHP_EXT_DOM - select BR2_PACKAGE_PHP_EXT_LIBXML2 - select BR2_PACKAGE_LIBXSLT - help - XSL transformation support - -endmenu diff --git a/package.bak/php/Config.in b/package.bak/php/Config.in deleted file mode 100644 index 0fb80063af..0000000000 --- a/package.bak/php/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config BR2_PACKAGE_PHP - bool "php" - select BR2_PACKAGE_PHP_SAPI_CGI if \ - !BR2_PACKAGE_PHP_SAPI_APACHE && \ - !BR2_PACKAGE_PHP_SAPI_CLI && \ - !BR2_PACKAGE_PHP_SAPI_FPM && \ - BR2_USE_MMU - select BR2_PACKAGE_PHP_SAPI_CLI if !BR2_USE_MMU - help - PHP is a widely-used general-purpose scripting - language that is especially suited for Web development - and can be embedded into HTML. - - http://www.php.net - -if BR2_PACKAGE_PHP - -config BR2_PACKAGE_PHP_SAPI_APACHE - bool "Apache interface" - depends on BR2_PACKAGE_APACHE - help - Apache module - -config BR2_PACKAGE_PHP_SAPI_CGI - bool "CGI interface" - # CGI uses fork() - depends on BR2_USE_MMU - help - Common Gateway Interface - -config BR2_PACKAGE_PHP_SAPI_CLI - bool "CLI interface" - help - Command Line Interface - -config BR2_PACKAGE_PHP_SAPI_FPM - bool "FPM interface" - depends on BR2_USE_MMU - # "Sparc v8 and predecessors are not and will not be supported" - depends on !BR2_sparc - help - PHP-FPM (FastCGI Process Manager) - -source "package/php/Config.ext" - -endif diff --git a/package.bak/php/php-fpm.conf b/package.bak/php/php-fpm.conf deleted file mode 100644 index 88014b8c80..0000000000 --- a/package.bak/php/php-fpm.conf +++ /dev/null @@ -1,11 +0,0 @@ -[www] -pm = ondemand -pm.process_idle_timeout = 120s -pm.max_children = 5 - -listen = /var/run/php-fpm.sock -listen.owner = www-data -listen.group = www-data -user = www-data -group = www-data - diff --git a/package.bak/php/php.hash b/package.bak/php/php.hash deleted file mode 100644 index 9c94b9e4cf..0000000000 --- a/package.bak/php/php.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://php.net/downloads.php -sha256 b3565b0c1441064eba204821608df1ec7367abff881286898d900c2c2a5ffe70 php-7.1.1.tar.xz diff --git a/package.bak/php/php.mk b/package.bak/php/php.mk deleted file mode 100644 index 1379ad571b..0000000000 --- a/package.bak/php/php.mk +++ /dev/null @@ -1,348 +0,0 @@ -################################################################################ -# -# php -# -################################################################################ - -PHP_VERSION = 7.1.1 -PHP_SITE = http://www.php.net/distributions -PHP_SOURCE = php-$(PHP_VERSION).tar.xz -PHP_INSTALL_STAGING = YES -PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install -PHP_INSTALL_TARGET_OPTS = INSTALL_ROOT=$(TARGET_DIR) install -PHP_DEPENDENCIES = host-pkgconf -PHP_LICENSE = PHP -PHP_LICENSE_FILES = LICENSE -PHP_CONF_OPTS = \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --disable-all \ - --without-pear \ - --with-config-file-path=/etc \ - --disable-phpdbg \ - --disable-rpath -PHP_CONF_ENV = \ - ac_cv_func_strcasestr=yes \ - EXTRA_LIBS="$(PHP_EXTRA_LIBS)" - -ifeq ($(BR2_STATIC_LIBS),y) -PHP_CONF_ENV += LIBS="$(PHP_STATIC_LIBS)" -endif - -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -PHP_STATIC_LIBS += -lpthread -endif - -ifeq ($(call qstrip,$(BR2_TARGET_LOCALTIME)),) -PHP_LOCALTIME = UTC -else -# Not q-stripping this value, as we need quotes in the php.ini file -PHP_LOCALTIME = $(BR2_TARGET_LOCALTIME) -endif - -# PHP can't be AUTORECONFed the standard way unfortunately -PHP_DEPENDENCIES += host-autoconf host-automake host-libtool -define PHP_BUILDCONF - cd $(@D) ; $(TARGET_MAKE_ENV) ./buildconf --force -endef -PHP_PRE_CONFIGURE_HOOKS += PHP_BUILDCONF - -ifeq ($(BR2_ENDIAN),"BIG") -PHP_CONF_ENV += ac_cv_c_bigendian_php=yes -else -PHP_CONF_ENV += ac_cv_c_bigendian_php=no -endif -PHP_CONFIG_SCRIPTS = php-config - -PHP_CFLAGS = $(TARGET_CFLAGS) - -# The OPcache extension isn't cross-compile friendly -# Throw some defines here to avoid patching heavily -ifeq ($(BR2_PACKAGE_PHP_EXT_OPCACHE),y) -PHP_CONF_OPTS += --enable-opcache -PHP_CONF_ENV += ac_cv_func_mprotect=yes -PHP_CFLAGS += \ - -DHAVE_SHM_IPC \ - -DHAVE_SHM_MMAP_ANON \ - -DHAVE_SHM_MMAP_ZERO \ - -DHAVE_SHM_MMAP_POSIX \ - -DHAVE_SHM_MMAP_FILE -endif - -# We need to force dl "detection" -ifeq ($(BR2_STATIC_LIBS),) -PHP_CONF_ENV += ac_cv_func_dlopen=yes ac_cv_lib_dl_dlopen=yes -PHP_EXTRA_LIBS += -ldl -else -PHP_CONF_ENV += ac_cv_func_dlopen=no ac_cv_lib_dl_dlopen=no -endif - -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CLI),--enable-cli,--disable-cli) -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_CGI),--enable-cgi,--disable-cgi) -PHP_CONF_OPTS += $(if $(BR2_PACKAGE_PHP_SAPI_FPM),--enable-fpm,--disable-fpm) - -ifeq ($(BR2_PACKAGE_PHP_SAPI_APACHE),y) -PHP_DEPENDENCIES += apache -PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs - -# Enable thread safety option if Apache MPM is event or worker -ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y) -PHP_CONF_OPTS += --enable-maintainer-zts -endif -endif - -### Extensions -PHP_CONF_OPTS += \ - $(if $(BR2_PACKAGE_PHP_EXT_SOCKETS),--enable-sockets) \ - $(if $(BR2_PACKAGE_PHP_EXT_POSIX),--enable-posix) \ - $(if $(BR2_PACKAGE_PHP_EXT_SESSION),--enable-session) \ - $(if $(BR2_PACKAGE_PHP_EXT_HASH),--enable-hash) \ - $(if $(BR2_PACKAGE_PHP_EXT_DOM),--enable-dom) \ - $(if $(BR2_PACKAGE_PHP_EXT_SIMPLEXML),--enable-simplexml) \ - $(if $(BR2_PACKAGE_PHP_EXT_SOAP),--enable-soap) \ - $(if $(BR2_PACKAGE_PHP_EXT_XML),--enable-xml) \ - $(if $(BR2_PACKAGE_PHP_EXT_XMLREADER),--enable-xmlreader) \ - $(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \ - $(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \ - $(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \ - $(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \ - $(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \ - $(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \ - $(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \ - $(if $(BR2_PACKAGE_PHP_EXT_SYSVMSG),--enable-sysvmsg) \ - $(if $(BR2_PACKAGE_PHP_EXT_SYSVSEM),--enable-sysvsem) \ - $(if $(BR2_PACKAGE_PHP_EXT_SYSVSHM),--enable-sysvshm) \ - $(if $(BR2_PACKAGE_PHP_EXT_ZIP),--enable-zip) \ - $(if $(BR2_PACKAGE_PHP_EXT_CTYPE),--enable-ctype) \ - $(if $(BR2_PACKAGE_PHP_EXT_FILTER),--enable-filter) \ - $(if $(BR2_PACKAGE_PHP_EXT_CALENDAR),--enable-calendar) \ - $(if $(BR2_PACKAGE_PHP_EXT_FILEINFO),--enable-fileinfo) \ - $(if $(BR2_PACKAGE_PHP_EXT_BCMATH),--enable-bcmath) \ - $(if $(BR2_PACKAGE_PHP_EXT_MBSTRING),--enable-mbstring) \ - $(if $(BR2_PACKAGE_PHP_EXT_PHAR),--enable-phar) - -ifeq ($(BR2_PACKAGE_PHP_EXT_MCRYPT),y) -PHP_CONF_OPTS += --with-mcrypt=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += libmcrypt -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_OPENSSL),y) -PHP_CONF_OPTS += --with-openssl=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += openssl -# openssl needs zlib, but the configure script forgets to link against -# it causing detection failures with static linking -PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs openssl` -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_LIBXML2),y) -PHP_CONF_ENV += php_cv_libxml_build_works=yes -PHP_CONF_OPTS += --enable-libxml --with-libxml-dir=${STAGING_DIR}/usr -PHP_DEPENDENCIES += libxml2 -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_WDDX),y) -PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += expat -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y) -PHP_CONF_OPTS += \ - --with-xmlrpc \ - $(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr) -PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) -endif - -ifneq ($(BR2_PACKAGE_PHP_EXT_ZLIB)$(BR2_PACKAGE_PHP_EXT_ZIP),) -PHP_CONF_OPTS += --with-zlib=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_GETTEXT),y) -PHP_CONF_OPTS += --with-gettext=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += $(if $(BR2_NEEDS_GETTEXT),gettext) -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_ICONV),y) -ifeq ($(BR2_PACKAGE_LIBICONV),y) -PHP_CONF_OPTS += --with-iconv=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += libiconv -else -PHP_CONF_OPTS += --with-iconv -endif -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_INTL),y) -PHP_CONF_OPTS += --enable-intl --with-icu-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += icu -# The intl module is implemented in C++, but PHP fails to use -# g++ as the compiler for the final link. As a workaround, -# tell it to link libstdc++. -PHP_EXTRA_LIBS += -lstdc++ -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_GMP),y) -PHP_CONF_OPTS += --with-gmp=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += gmp -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_READLINE),y) -PHP_CONF_OPTS += --with-readline=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += readline -endif - -### Native SQL extensions -ifeq ($(BR2_PACKAGE_PHP_EXT_MYSQLI),y) -PHP_CONF_OPTS += --with-mysqli -endif -ifeq ($(BR2_PACKAGE_PHP_EXT_SQLITE),y) -PHP_CONF_OPTS += --with-sqlite3=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += sqlite -PHP_STATIC_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs sqlite3` -endif - -### PDO -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO),y) -PHP_CONF_OPTS += --enable-pdo -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_SQLITE),y) -PHP_CONF_OPTS += --with-pdo-sqlite=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += sqlite -PHP_CFLAGS += -DSQLITE_OMIT_LOAD_EXTENSION -endif -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),y) -PHP_CONF_OPTS += --with-pdo-mysql -endif -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_POSTGRESQL),y) -PHP_CONF_OPTS += --with-pdo-pgsql=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += postgresql -endif -ifeq ($(BR2_PACKAGE_PHP_EXT_PDO_UNIXODBC),y) -PHP_CONF_OPTS += --with-pdo-odbc=unixODBC,$(STAGING_DIR)/usr -PHP_DEPENDENCIES += unixodbc -endif -endif - -ifneq ($(BR2_PACKAGE_PHP_EXT_MYSQLI)$(BR2_PACKAGE_PHP_EXT_PDO_MYSQL),) -# Set default MySQL unix socket to what the MySQL server is using by default -PHP_CONF_OPTS += --with-mysql-sock=$(MYSQL_SOCKET) -endif - -define PHP_DISABLE_PCRE_JIT - $(SED) '/^#define SUPPORT_JIT/d' $(@D)/ext/pcre/pcrelib/config.h -endef - -### Use external PCRE if it's available -ifeq ($(BR2_PACKAGE_PCRE),y) -PHP_CONF_OPTS += --with-pcre-regex=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += pcre -else -# The bundled pcre library is not configurable through ./configure options, -# and by default is configured to be thread-safe, so it wants pthreads. So -# we must explicitly tell it when we don't have threads. -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -PHP_CFLAGS += -DSLJIT_SINGLE_THREADED=1 -endif -# check ext/pcre/pcrelib/sljit/sljitConfigInternal.h for supported archs -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_arm)$(BR2_armeb)$(BR2_aarch64)$(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el)$(BR2_powerpc)$(BR2_sparc),) -PHP_POST_CONFIGURE_HOOKS += PHP_DISABLE_PCRE_JIT -endif -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_CURL),y) -PHP_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += libcurl -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_XSL),y) -PHP_CONF_OPTS += --with-xsl=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += libxslt -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_BZIP2),y) -PHP_CONF_OPTS += --with-bz2=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += bzip2 -endif - -### DBA -ifeq ($(BR2_PACKAGE_PHP_EXT_DBA),y) -PHP_CONF_OPTS += --enable-dba -ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_CDB),y) -PHP_CONF_OPTS += --without-cdb -endif -ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_FLAT),y) -PHP_CONF_OPTS += --without-flatfile -endif -ifneq ($(BR2_PACKAGE_PHP_EXT_DBA_INI),y) -PHP_CONF_OPTS += --without-inifile -endif -ifeq ($(BR2_PACKAGE_PHP_EXT_DBA_DB4),y) -PHP_CONF_OPTS += --with-db4=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += berkeleydb -endif -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_SNMP),y) -PHP_CONF_OPTS += --with-snmp=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += netsnmp -endif - -ifeq ($(BR2_PACKAGE_PHP_EXT_GD),y) -PHP_CONF_OPTS += \ - --with-gd \ - --with-jpeg-dir=$(STAGING_DIR)/usr \ - --with-png-dir=$(STAGING_DIR)/usr \ - --with-zlib-dir=$(STAGING_DIR)/usr \ - --with-freetype-dir=$(STAGING_DIR)/usr -PHP_DEPENDENCIES += jpeg libpng freetype -endif - -ifeq ($(BR2_PACKAGE_PHP_SAPI_FPM),y) -define PHP_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(@D)/sapi/fpm/init.d.php-fpm \ - $(TARGET_DIR)/etc/init.d/S49php-fpm -endef - -define PHP_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/sapi/fpm/php-fpm.service \ - $(TARGET_DIR)/usr/lib/systemd/system/php-fpm.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/php-fpm.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/php-fpm.service -endef - -define PHP_INSTALL_FPM_CONF - $(INSTALL) -D -m 0644 package/php/php-fpm.conf \ - $(TARGET_DIR)/etc/php-fpm.conf - rm -f $(TARGET_DIR)/etc/php-fpm.conf.default - # remove unused sample status page /usr/php/php/fpm/status.html - rm -rf $(TARGET_DIR)/usr/php -endef - -PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FPM_CONF -endif - -define PHP_EXTENSIONS_FIXUP - $(SED) "/prefix/ s:/usr:$(STAGING_DIR)/usr:" \ - $(STAGING_DIR)/usr/bin/phpize - $(SED) "/extension_dir/ s:/usr:$(TARGET_DIR)/usr:" \ - $(STAGING_DIR)/usr/bin/php-config -endef - -PHP_POST_INSTALL_TARGET_HOOKS += PHP_EXTENSIONS_FIXUP - -define PHP_INSTALL_FIXUP - rm -rf $(TARGET_DIR)/usr/lib/php/build - rm -f $(TARGET_DIR)/usr/bin/phpize - $(INSTALL) -D -m 0755 $(PHP_DIR)/php.ini-production \ - $(TARGET_DIR)/etc/php.ini - $(SED) 's%;date.timezone =.*%date.timezone = $(PHP_LOCALTIME)%' \ - $(TARGET_DIR)/etc/php.ini - $(if $(BR2_PACKAGE_PHP_EXT_OPCACHE), - $(SED) '/;extension=php_xsl.dll/azend_extension=opcache.so' \ - $(TARGET_DIR)/etc/php.ini) -endef - -PHP_POST_INSTALL_TARGET_HOOKS += PHP_INSTALL_FIXUP - -PHP_CONF_ENV += CFLAGS="$(PHP_CFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/picocom/Config.in b/package.bak/picocom/Config.in deleted file mode 100644 index 671d01fb5a..0000000000 --- a/package.bak/picocom/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PICOCOM - bool "picocom" - depends on BR2_USE_MMU # fork() - help - picocom is a minimal dumb-terminal emulation program. It is, in - principle, very much like minicom, only it's pico instead of mini! - - https://github.com/npat-efault/picocom/ diff --git a/package.bak/picocom/picocom.hash b/package.bak/picocom/picocom.hash deleted file mode 100644 index 674b6209d3..0000000000 --- a/package.bak/picocom/picocom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6b152fc5f816eaef6b86336a4cec7cf1496b7c712061e5aea5a36f143a0b09ed picocom-2.1.tar.gz diff --git a/package.bak/picocom/picocom.mk b/package.bak/picocom/picocom.mk deleted file mode 100644 index 59a749fba1..0000000000 --- a/package.bak/picocom/picocom.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# picocom -# -################################################################################ - -PICOCOM_VERSION = 2.1 -PICOCOM_SITE = $(call github,npat-efault,picocom,$(PICOCOM_VERSION)) -PICOCOM_LICENSE = GPLv2+ -PICOCOM_LICENSE_FILES = LICENSE.txt - -define PICOCOM_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define PICOCOM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/picocom $(TARGET_DIR)/usr/bin/picocom -endef - -$(eval $(generic-package)) diff --git a/package.bak/pifmrds/0001-Makefile-cross-compile-friendly.patch b/package.bak/pifmrds/0001-Makefile-cross-compile-friendly.patch deleted file mode 100644 index 414d97c115..0000000000 --- a/package.bak/pifmrds/0001-Makefile-cross-compile-friendly.patch +++ /dev/null @@ -1,37 +0,0 @@ -Makefile: make it cross-compile (and Buildroot) friendly. - -The current Makefile makes heavy assumptions that it is doing native -compilation on the RPi, as it checks that `uname -m` is an ARM machine. - -This is wrong in the cross-compilation case. - -Remove the conditional altogether, and do not override the CFLAGS -as passed in the environment (Buildroot passes proper CFLAGS). - -[intial patch by: Eric Limpens ] -Signed-off-by: "Yann E. MORIN" - -diff -durN pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1.orig/src/Makefile pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1/src/Makefile ---- pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1.orig/src/Makefile 2014-05-04 18:21:40.000000000 +0200 -+++ pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1/src/Makefile 2014-06-21 16:38:31.971804343 +0200 -@@ -1,20 +1,8 @@ - CC = gcc --STD_CFLAGS = -Wall -std=gnu99 -c -g -O3 - --# Enable ARM-specific options only on ARM, and compilation of the app only on ARM --UNAME := $(shell uname -m) -- --ifeq ($(UNAME), armv6l) -- CFLAGS = $(STD_CFLAGS) -march=armv6 -mtune=arm1176jzf-s -mfloat-abi=hard -mfpu=vfp -ffast-math -- - app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o - $(CC) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile - --else -- CFLAGS = $(STD_CFLAGS) --endif -- -- - rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o - $(CC) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile - diff --git a/package.bak/pifmrds/0002-Makefile-use-LDFLAGS.patch b/package.bak/pifmrds/0002-Makefile-use-LDFLAGS.patch deleted file mode 100644 index 54c142701b..0000000000 --- a/package.bak/pifmrds/0002-Makefile-use-LDFLAGS.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile: use LDFLAGS when linking - -Signed-off-by: "Yann E. MORIN" - -diff -durN pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1.orig/src/Makefile pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1/src/Makefile ---- pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1.orig/src/Makefile 2014-06-21 16:46:49.101118754 +0200 -+++ pifmrds-c67306ea9b8d827f45e0d90279d367e97119bcb1/src/Makefile 2014-06-21 16:47:47.801745683 +0200 -@@ -1,10 +1,10 @@ - CC = gcc - - app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -- $(CC) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile - - rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o -- $(CC) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile - - rds.o: rds.c waveforms.h - $(CC) $(CFLAGS) rds.c diff --git a/package.bak/pifmrds/0003-Makefile-fix-static-link.patch b/package.bak/pifmrds/0003-Makefile-fix-static-link.patch deleted file mode 100644 index ecd7c4fc4c..0000000000 --- a/package.bak/pifmrds/0003-Makefile-fix-static-link.patch +++ /dev/null @@ -1,23 +0,0 @@ -Makefile: Fix static linking - -Since libsndfile uses funtions from libm, the -lm should be specified -after libsndfile for static linking. - -Signed-off-by: "Eric Limpens" - -diff -purN pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile ---- pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.orig/src/Makefile 2016-02-26 08:06:43.102962592 +0100 -+++ pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2/src/Makefile 2016-02-26 08:27:11.069148203 +0100 -@@ -1,10 +1,10 @@ - CC = gcc - - app: rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -- $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o pi_fm_rds rds.o waveforms.o pi_fm_rds.o fm_mpx.o control_pipe.o -lsndfile -lm - - rds_wav: rds.o waveforms.o rds_wav.o fm_mpx.o -- $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lm -lsndfile -+ $(CC) $(LDFLAGS) -o rds_wav rds_wav.o rds.o waveforms.o fm_mpx.o -lsndfile -lm - - rds.o: rds.c waveforms.h - $(CC) $(CFLAGS) rds.c diff --git a/package.bak/pifmrds/Config.in b/package.bak/pifmrds/Config.in deleted file mode 100644 index 6d492683d5..0000000000 --- a/package.bak/pifmrds/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PIFMRDS - bool "pifmrds" - depends on BR2_arm - select BR2_PACKAGE_LIBSNDFILE - help - pifmrds, FM-RDS transmitter using the Raspberry Pi's PWM - - https://github.com/ChristopheJacquet/PiFmRds diff --git a/package.bak/pifmrds/pifmrds.hash b/package.bak/pifmrds/pifmrds.hash deleted file mode 100644 index 0c91d3d449..0000000000 --- a/package.bak/pifmrds/pifmrds.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2afc9f3c9fc206ba32865d7dd77f3a97d7d86dcfc9b44eeb5665e8fddaafcf44 pifmrds-0bf57f9ce0d954365a38d8af8e7be6f28521c3f2.tar.gz diff --git a/package.bak/pifmrds/pifmrds.mk b/package.bak/pifmrds/pifmrds.mk deleted file mode 100644 index a30c0136f2..0000000000 --- a/package.bak/pifmrds/pifmrds.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# pifmrds -# -################################################################################ - -PIFMRDS_VERSION = 0bf57f9ce0d954365a38d8af8e7be6f28521c3f2 -PIFMRDS_SITE = $(call github,ChristopheJacquet,PiFmRds,$(PIFMRDS_VERSION)) -PIFMRDS_DEPENDENCIES = libsndfile -PIFMRDS_LICENSE = GPLv3+ -PIFMRDS_LICENSE_FILES = LICENSE - -define PIFMRDS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src CC="$(TARGET_CC)" LDFLAGS="$(TARGET_LDFLAGS)" \ - CFLAGS="$(TARGET_CFLAGS) -std=gnu99 -ffast-math -c" \ - app rds_wav -endef - -define PIFMRDS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/pi_fm_rds $(TARGET_DIR)/usr/bin/pi_fm_rds - $(INSTALL) -D -m 0755 $(@D)/src/rds_wav $(TARGET_DIR)/usr/bin/rds_wav -endef - -$(eval $(generic-package)) diff --git a/package.bak/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch b/package.bak/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch deleted file mode 100644 index c9903c4573..0000000000 --- a/package.bak/pinentry/0001-remove-hard-wired-ncursesw-include-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -From cf84bf3ef505059d42184b22cf38f89336bec43d Mon Sep 17 00:00:00 2001 -From: Gergely Imreh -Date: Mon, 22 Jun 2015 07:51:17 +0000 -Subject: [PATCH 1/1] remove hard-wired ncursesw include path - -Don't assume that the ncursesw headers are in ../usr/include/ncursesw/.., -and pkg-config finds the correct include path anyways. - -Signed-off-by: Gergely Imreh ---- - pinentry/pinentry-curses.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/pinentry/pinentry-curses.c b/pinentry/pinentry-curses.c -index 235435a..bdcd0f4 100644 ---- a/pinentry/pinentry-curses.c -+++ b/pinentry/pinentry-curses.c -@@ -22,11 +22,7 @@ - #include - #endif - #include --#ifdef HAVE_NCURSESW --#include --#else - #include --#endif - #include - #include - #include --- -1.9.1 - diff --git a/package.bak/pinentry/Config.in b/package.bak/pinentry/Config.in deleted file mode 100644 index 682af9f3f2..0000000000 --- a/package.bak/pinentry/Config.in +++ /dev/null @@ -1,56 +0,0 @@ -menuconfig BR2_PACKAGE_PINENTRY - bool "pinentry" - # At least one backend is needed to avoid build breakage - select BR2_PACKAGE_PINENTRY_NCURSES if !BR2_PACKAGE_PINENTRY_GTK2 && !BR2_PACKAGE_PINENTRY_QT4 - help - A collection of simple PIN or pass-phrase entry dialogs - - https://www.gnupg.org/related_software/pinentry/ - -if BR2_PACKAGE_PINENTRY - -config BR2_PACKAGE_PINENTRY_NCURSES - bool "pinentry-ncurses" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - The pinentry-ncurses tool - -config BR2_PACKAGE_PINENTRY_GTK2 - bool "pinentry-gtk2" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - The pinentry-gtk2 tool - -comment "pinentry-gtk2 needs X and a toolchain w/ wchar, threads, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_PACKAGE_XORG7 || !BR2_USE_WCHAR || \ - !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_PINENTRY_QT4 - bool "pinentry-qt4" - depends on BR2_USE_MMU # fork - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT - select BR2_PACKAGE_QT_GUI_MODULE - help - The pinentry-qt4 tool - -comment "pinentry-qt4 support needs a toolchain not affected by Binutils bug 19405" - depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -comment "pinentry-qt4 needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -endif diff --git a/package.bak/pinentry/pinentry.hash b/package.bak/pinentry/pinentry.hash deleted file mode 100644 index d544efd7f0..0000000000 --- a/package.bak/pinentry/pinentry.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.gnupg.org/download/integrity_check.html -sha1 0c47f0ddea4631bcba01ebbeca8bffe0bf43e440 pinentry-0.9.4.tar.bz2 diff --git a/package.bak/pinentry/pinentry.mk b/package.bak/pinentry/pinentry.mk deleted file mode 100644 index bcb910a0e2..0000000000 --- a/package.bak/pinentry/pinentry.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# pinentry -# -################################################################################ - -PINENTRY_VERSION = 0.9.4 -PINENTRY_SOURCE = pinentry-$(PINENTRY_VERSION).tar.bz2 -PINENTRY_SITE = ftp://ftp.gnupg.org/gcrypt/pinentry -PINENTRY_LICENSE = GPLv2+ -PINENTRY_LICENSE_FILES = COPYING -PINENTRY_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - host-pkgconf -PINENTRY_CONF_OPTS += --without-libcap # requires PAM - -# pinentry uses some std::string functionality that needs C++11 -# support when gcc >= 5.x. This should be removed when bumping -# pinentry, since newer versions no longer use std::string. -ifeq ($(BR2_TOOLCHAIN_GCC_AT_LEAST_5),y) -PINENTRY_CONF_ENV = CXXFLAGS="$(TARGET_CXXFLAGS) -std=gnu++11" -endif - -# build with X if available -ifeq ($(BR2_PACKAGE_XORG7),y) -PINENTRY_CONF_OPTS += --with-x -else -PINENTRY_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_LIBSECRET),y) -PINENTRY_CONF_OPTS += --enable-libsecret -PINENTRY_DEPENDENCIES += libsecret -else -PINENTRY_CONF_OPTS += --disable-libsecret -endif - -# pinentry-ncurses backend -ifeq ($(BR2_PACKAGE_PINENTRY_NCURSES),y) -PINENTRY_CONF_OPTS += --enable-ncurses --with-ncurses-include-dir=none -PINENTRY_DEPENDENCIES += ncurses -else -PINENTRY_CONF_OPTS += --disable-ncurses -endif - -# pinentry-gtk2 backend -ifeq ($(BR2_PACKAGE_PINENTRY_GTK2),y) -PINENTRY_CONF_OPTS += --enable-pinentry-gtk2 -PINENTRY_DEPENDENCIES += libgtk2 -else -PINENTRY_CONF_OPTS += --disable-pinentry-gtk2 -endif - -# pinentry-qt4 backend -ifeq ($(BR2_PACKAGE_PINENTRY_QT4),y) -# -pthread needs to be passed for certain toolchains -# http://autobuild.buildroot.net/results/6be/6be109ccedec603a67cebdb31b55865dcce0e128/ -PINENTRY_CONF_OPTS += LIBS=-pthread MOC=$(HOST_DIR)/usr/bin/moc -PINENTRY_CONF_OPTS += --enable-pinentry-qt4 -PINENTRY_DEPENDENCIES += qt -else -PINENTRY_CONF_OPTS += --disable-pinentry-qt4 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/pixman/0001-Disable-tests.patch b/package.bak/pixman/0001-Disable-tests.patch deleted file mode 100644 index dfadd69a67..0000000000 --- a/package.bak/pixman/0001-Disable-tests.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9b8132738c364fc3c886e81e7d383aaff80dc867 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 5 Dec 2015 12:00:53 +0100 -Subject: [PATCH] Disable tests - -Tests are causing build failures on some architectures that are missing -a proper fenv.h, so just disable them. - -Signed-off-by: "Yann E. MORIN" - ---- -Status: Buildroot specific, not suitable for upstream in this state. ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 5137c9e..eae79fd 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = pixman demos test -+SUBDIRS = pixman demos - - pkgconfigdir=$(libdir)/pkgconfig - pkgconfig_DATA=pixman-1.pc --- -1.9.1 - diff --git a/package.bak/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch b/package.bak/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch deleted file mode 100644 index 455cebb265..0000000000 --- a/package.bak/pixman/0002-pixman-private-include-float.h-only-in-C-code.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 2a5b33fe5cb921993573392afac19185e224b49a Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 17 Jan 2016 14:14:28 +0100 -Subject: [PATCH] pixman-private: include only in C code - - is included unconditionally by pixman-private.h, which in -turn gets included by assembler files. Unfortunately, with certain C -libraries (like the musl C library), cannot be included in -assembler files: - - CCLD libpixman-arm-simd.la -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h: Assembler messages: -/home/test/buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/float.h:8: Error: bad instruction `int __flt_rounds(void)' - -It turns out however that is not needed by assembly files, -so we move its inclusion within the #ifndef __ASSEMBLER__ condition, -which solves the problem. - -Signed-off-by: Thomas Petazzoni ---- - pixman/pixman-private.h | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/pixman/pixman-private.h b/pixman/pixman-private.h -index 73108a0..73a5414 100644 ---- a/pixman/pixman-private.h -+++ b/pixman/pixman-private.h -@@ -1,5 +1,3 @@ --#include -- - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H - -@@ -30,6 +28,7 @@ - #include - #include - #include -+#include - - #include "pixman-compiler.h" - --- -2.6.4 - diff --git a/package.bak/pixman/Config.in b/package.bak/pixman/Config.in deleted file mode 100644 index aa2a68f625..0000000000 --- a/package.bak/pixman/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PIXMAN - bool "pixman" - help - Cairo pixel manager - - http://cairographics.org/releases/ diff --git a/package.bak/pixman/pixman.hash b/package.bak/pixman/pixman.hash deleted file mode 100644 index d5b8934e46..0000000000 --- a/package.bak/pixman/pixman.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2016-January/002672.html -sha1 367698744e74d6d4f363041482965b9ea7fbe4a5 pixman-0.34.0.tar.bz2 diff --git a/package.bak/pixman/pixman.mk b/package.bak/pixman/pixman.mk deleted file mode 100644 index c797b3e60c..0000000000 --- a/package.bak/pixman/pixman.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# pixman -# -################################################################################ - -PIXMAN_VERSION = 0.34.0 -PIXMAN_SOURCE = pixman-$(PIXMAN_VERSION).tar.bz2 -PIXMAN_SITE = http://xorg.freedesktop.org/releases/individual/lib -PIXMAN_LICENSE = MIT -PIXMAN_LICENSE_FILES = COPYING - -PIXMAN_INSTALL_STAGING = YES -PIXMAN_DEPENDENCIES = host-pkgconf -HOST_PIXMAN_DEPENDENCIES = host-pkgconf - -# For 0001-Disable-tests.patch -PIXMAN_AUTORECONF = YES - -# don't build gtk based demos -PIXMAN_CONF_OPTS = --disable-gtk - -# The ARM SIMD code from pixman requires a recent enough ARM core, but -# there is a runtime CPU check that makes sure it doesn't get used if -# the HW doesn't support it. The only case where the ARM SIMD code -# cannot be *built* at all is when the platform doesn't support ARM -# instructions at all, so we have to disable that explicitly. -ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -PIXMAN_CONF_OPTS += --enable-arm-simd -else -PIXMAN_CONF_OPTS += --disable-arm-simd -endif - -ifeq ($(BR2_ARM_CPU_HAS_ARM)$(BR2_ARM_CPU_HAS_NEON),yy) -PIXMAN_CONF_OPTS += --enable-arm-neon -else -PIXMAN_CONF_OPTS += --disable-arm-neon -endif - -# disable iwmmxt support for CPU's that don't have -# this feature -ifneq ($(BR2_iwmmxt),y) -PIXMAN_CONF_OPTS += --disable-arm-iwmmxt -endif - -# toolchain gets confused about TLS access through GOT (PIC), so disable TLS -# movhi r4, %got_hiadj(%tls_ldo(fast_path_cache)) -# {standard input}:172: Error: bad expression -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII),y) -PIXMAN_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DPIXMAN_NO_TLS" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/pkg-autotools.mk b/package.bak/pkg-autotools.mk deleted file mode 100644 index f7b848888b..0000000000 --- a/package.bak/pkg-autotools.mk +++ /dev/null @@ -1,331 +0,0 @@ -################################################################################ -# Autotools package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for autotools packages. It should be used for all -# packages that use the autotools as their build system. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this autotools infrastructure requires -# the .mk file to only specify metadata information about the -# package: name, version, download URL, etc. -# -# We still allow the package .mk file to override what the different -# steps are doing, if needed. For example, if _BUILD_CMDS is -# already defined, it is used as the list of commands to perform to -# build the package, instead of the default autotools behaviour. The -# package can also define some post operation hooks. -# -################################################################################ - - -# -# Utility function to upgrade config.sub and config.guess files -# -# argument 1 : directory into which config.guess and config.sub need -# to be updated. Note that config.sub and config.guess are searched -# recursively in this directory. -# -define CONFIG_UPDATE - for file in config.guess config.sub; do \ - for i in $$(find $(1) -name $$file); do \ - cp support/gnuconfig/$$file $$i; \ - done; \ - done -endef - -# This function generates the ac_cv_file_ value for a given -# filename. This is needed to convince configure script doing -# AC_CHECK_FILE() tests that the file actually exists, since such -# tests cannot be done in a cross-compilation context. This function -# takes as argument the path of the file. An example usage is: -# -# FOOBAR_CONF_ENV = \ -# $(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)_DIR) -name ltmain.sh`; do \ - ltmain_version=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9]*\.[0-9]*\).*/\1/' -e 's/\"//'`; \ - ltmain_patchlevel=`sed -n '/^[ \t]*VERSION=/{s/^[ \t]*VERSION=//;p;q;}' $$i | \ - sed -e 's/\([0-9]*\.[0-9]*\.*\)\([0-9]*\).*/\2/' -e 's/\"//'`; \ - if test $${ltmain_version} = '1.5'; then \ - patch -i support/libtool/buildroot-libtool-v1.5.patch $${i}; \ - elif test $${ltmain_version} = "2.2"; then\ - patch -i support/libtool/buildroot-libtool-v2.2.patch $${i}; \ - elif test $${ltmain_version} = "2.4"; then\ - if test $${ltmain_patchlevel:-0} -gt 2; then\ - patch -i support/libtool/buildroot-libtool-v2.4.4.patch $${i}; \ - else \ - patch -i support/libtool/buildroot-libtool-v2.4.patch $${i}; \ - fi \ - fi \ - done -endef - -# -# Hook to patch common issue with configure on powerpc64{,le} failing -# to detect shared library support: -# -define CONFIGURE_FIX_POWERPC64_HOOK - @$(call MESSAGE,"Checking configure (powerpc64/powerpc64le)") - support/scripts/fix-configure-powerpc64.sh $($(PKG)_DIR) -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 -# few hooks to tune the build process for autotools specifities and -# calls the generic package infrastructure to generate the necessary -# make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-autotools-package - -ifndef $(2)_LIBTOOL_PATCH - ifdef $(3)_LIBTOOL_PATCH - $(2)_LIBTOOL_PATCH = $$($(3)_LIBTOOL_PATCH) - else - $(2)_LIBTOOL_PATCH ?= YES - endif -endif - -ifndef $(2)_MAKE - ifdef $(3)_MAKE - $(2)_MAKE = $$($(3)_MAKE) - else - $(2)_MAKE ?= $$(MAKE) - endif -endif - -ifndef $(2)_AUTORECONF - ifdef $(3)_AUTORECONF - $(2)_AUTORECONF = $$($(3)_AUTORECONF) - else - $(2)_AUTORECONF ?= NO - endif -endif - -ifndef $(2)_GETTEXTIZE - ifdef $(3)_GETTEXTIZE - $(2)_GETTEXTIZE = $$($(3)_GETTEXTIZE) - else - $(2)_GETTEXTIZE ?= NO - endif -endif - -ifeq ($(4),host) - $(2)_GETTEXTIZE_OPTS ?= $$($(3)_GETTEXTIZE_OPTS) -endif - -ifeq ($(4),host) - $(2)_AUTORECONF_OPTS ?= $$($(3)_AUTORECONF_OPTS) -endif - -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= -$(2)_MAKE_ENV ?= -$(2)_MAKE_OPTS ?= -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install - -# -# Configure step. Only define it if not already defined by the package -# .mk file. And take care of the differences between host and target -# packages. -# -ifndef $(2)_CONFIGURE_CMDS -ifeq ($(4),target) - -# Configure package for target -define $(2)_CONFIGURE_CMDS - (cd $$($$(PKG)_SRCDIR) && rm -rf config.cache && \ - $$(TARGET_CONFIGURE_OPTS) \ - $$(TARGET_CONFIGURE_ARGS) \ - $$($$(PKG)_CONF_ENV) \ - CONFIG_SITE=/dev/null \ - ./configure \ - --target=$$(GNU_TARGET_NAME) \ - --host=$$(GNU_TARGET_NAME) \ - --build=$$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --program-prefix="" \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-doc \ - --disable-docs \ - --disable-documentation \ - --with-xmlto=no \ - --with-fop=no \ - --disable-dependency-tracking \ - --enable-ipv6 \ - $$(DISABLE_NLS) \ - $$(SHARED_STATIC_LIBS_OPTS) \ - $$(QUIET) $$($$(PKG)_CONF_OPTS) \ - ) -endef -else - -# Configure package for host -# disable all kind of documentation generation in the process, -# because it often relies on host tools which may or may not be -# installed. -define $(2)_CONFIGURE_CMDS - (cd $$($$(PKG)_SRCDIR) && rm -rf config.cache; \ - $$(HOST_CONFIGURE_OPTS) \ - CFLAGS="$$(HOST_CFLAGS)" \ - LDFLAGS="$$(HOST_LDFLAGS)" \ - $$($$(PKG)_CONF_ENV) \ - CONFIG_SITE=/dev/null \ - ./configure \ - --prefix="$$(HOST_DIR)/usr" \ - --sysconfdir="$$(HOST_DIR)/etc" \ - --localstatedir="$$(HOST_DIR)/var" \ - --enable-shared --disable-static \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-doc \ - --disable-docs \ - --disable-documentation \ - --disable-debug \ - --with-xmlto=no \ - --with-fop=no \ - --disable-dependency-tracking \ - $$(QUIET) $$($$(PKG)_CONF_OPTS) \ - ) -endef -endif -endif - -$(2)_POST_PATCH_HOOKS += UPDATE_CONFIG_HOOK - -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 - -# Append a configure hook if building for a powerpc64 (or powerpc64le) arch. -# Must be added after other pre-configure hooks that might regenerate the -# configure script and overwrite the changes made here. -ifneq ($$(filter powerpc64%,$$(if $$(filter target,$(4)),$$(ARCH),$$(HOSTARCH))),) -$(2)_PRE_CONFIGURE_HOOKS += CONFIGURE_FIX_POWERPC64_HOOK -endif - -# -# Build step. Only define it if not already defined by the package .mk -# file. -# -ifndef $(2)_BUILD_CMDS -ifeq ($(4),target) -define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR) -endef -else -define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_SRCDIR) -endef -endif -endif - -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_SRCDIR) -endef -endif - -# -# Staging installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_STAGING_CMDS -define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_SRCDIR) -endef -endif - -# -# Target installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_SRCDIR) -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# autotools-package -- the target generator macro for autotools packages -################################################################################ - -autotools-package = $(call inner-autotools-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-autotools-package = $(call inner-autotools-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package.bak/pkg-cmake.mk b/package.bak/pkg-cmake.mk deleted file mode 100644 index a7c8dc3b34..0000000000 --- a/package.bak/pkg-cmake.mk +++ /dev/null @@ -1,251 +0,0 @@ -################################################################################ -# CMake package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for CMake packages. It should be used for all -# packages that use CMake as their build system. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this CMake infrastructure requires -# the .mk file to only specify metadata information about the -# package: name, version, download URL, etc. -# -# We still allow the package .mk file to override what the different -# steps are doing, if needed. For example, if _BUILD_CMDS is -# already defined, it is used as the list of commands to perform to -# build the package, instead of the default CMake behaviour. The -# package can also define some post operation hooks. -# -################################################################################ - -# Set compiler variables. -ifeq ($(BR2_CCACHE),y) -CMAKE_HOST_C_COMPILER = $(HOST_DIR)/usr/bin/ccache -CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/usr/bin/ccache -CMAKE_HOST_C_COMPILER_ARG1 = $(HOSTCC_NOCCACHE) -CMAKE_HOST_CXX_COMPILER_ARG1 = $(HOSTCXX_NOCCACHE) -else -CMAKE_HOST_C_COMPILER = $(HOSTCC) -CMAKE_HOST_CXX_COMPILER = $(HOSTCXX) -endif - -ifneq ($(QUIET),) -CMAKE_QUIET = -DCMAKE_RULE_MESSAGES=OFF -DCMAKE_INSTALL_MESSAGE=NEVER -endif - -################################################################################ -# inner-cmake-package -- defines how the configuration, compilation and -# installation of a CMake package should be done, implements a few hooks to -# tune the build process and calls the generic package infrastructure to -# generate the necessary make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-cmake-package - -$(2)_CONF_ENV ?= -$(2)_CONF_OPTS ?= -$(2)_MAKE ?= $$(MAKE) -$(2)_MAKE_ENV ?= -$(2)_MAKE_OPTS ?= -$(2)_INSTALL_OPTS ?= install -$(2)_INSTALL_STAGING_OPTS ?= DESTDIR=$$(STAGING_DIR) install/fast -$(2)_INSTALL_TARGET_OPTS ?= DESTDIR=$$(TARGET_DIR) install/fast - -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) - -$(3)_SUPPORTS_IN_SOURCE_BUILD ?= YES - - -ifeq ($$($(3)_SUPPORTS_IN_SOURCE_BUILD),YES) -$(2)_BUILDDIR = $$($(2)_SRCDIR) -else -$(2)_BUILDDIR = $$($(2)_SRCDIR)/buildroot-build -endif - -# -# Configure step. Only define it if not already defined by the package -# .mk file. And take care of the differences between host and target -# packages. -# -ifndef $(2)_CONFIGURE_CMDS -ifeq ($(4),target) - -# Configure package for target -define $(2)_CONFIGURE_CMDS - (mkdir -p $$($$(PKG)_BUILDDIR) && \ - cd $$($$(PKG)_BUILDDIR) && \ - rm -f CMakeCache.txt && \ - PATH=$$(BR_PATH) \ - $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -DCMAKE_TOOLCHAIN_FILE="$$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake" \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_COLOR_MAKEFILE=OFF \ - -DBUILD_DOC=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLE=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TEST=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_TESTING=OFF \ - -DBUILD_SHARED_LIBS=$$(if $$(BR2_STATIC_LIBS),OFF,ON) \ - $$(CMAKE_QUIET) \ - $$($$(PKG)_CONF_OPTS) \ - ) -endef -else - -# Configure package for host -define $(2)_CONFIGURE_CMDS - (mkdir -p $$($$(PKG)_BUILDDIR) && \ - cd $$($$(PKG)_BUILDDIR) && \ - rm -f CMakeCache.txt && \ - PATH=$$(BR_PATH) \ - $$($$(PKG)_CONF_ENV) $$(BR2_CMAKE) $$($$(PKG)_SRCDIR) \ - -DCMAKE_INSTALL_SO_NO_EXE=0 \ - -DCMAKE_FIND_ROOT_PATH="$$(HOST_DIR)" \ - -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" \ - -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY="BOTH" \ - -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" \ - -DCMAKE_INSTALL_PREFIX="$$(HOST_DIR)/usr" \ - -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ - -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ - -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ - -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ - -DCMAKE_CXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER)" \ - $(if $$(CMAKE_HOST_C_COMPILER_ARG1),\ - -DCMAKE_C_COMPILER_ARG1="$$(CMAKE_HOST_C_COMPILER_ARG1)" \ - -DCMAKE_CXX_COMPILER_ARG1="$$(CMAKE_HOST_CXX_COMPILER_ARG1)" \ - ) \ - -DCMAKE_COLOR_MAKEFILE=OFF \ - -DBUILD_DOC=OFF \ - -DBUILD_DOCS=OFF \ - -DBUILD_EXAMPLE=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DBUILD_TEST=OFF \ - -DBUILD_TESTS=OFF \ - -DBUILD_TESTING=OFF \ - $$(CMAKE_QUIET) \ - $$($$(PKG)_CONF_OPTS) \ - ) -endef -endif -endif - -# Since some CMake modules (even upstream ones) use pgk_check_modules -# primitives to find {C,LD}FLAGS, add it to the dependency list. -$(2)_DEPENDENCIES += host-pkgconf - -$(2)_DEPENDENCIES += $(BR2_CMAKE_HOST_DEPENDENCY) - -# -# Build step. Only define it if not already defined by the package .mk -# file. -# -ifndef $(2)_BUILD_CMDS -ifeq ($(4),target) -define $(2)_BUILD_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) -endef -else -define $(2)_BUILD_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) -C $$($$(PKG)_BUILDDIR) -endef -endif -endif - -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - $$(HOST_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_OPTS) -C $$($$(PKG)_BUILDDIR) -endef -endif - -# -# Staging installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_STAGING_CMDS -define $(2)_INSTALL_STAGING_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_STAGING_OPTS) -C $$($$(PKG)_BUILDDIR) -endef -endif - -# -# Target installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$($$(PKG)_MAKE) $$($$(PKG)_MAKE_OPTS) $$($$(PKG)_INSTALL_TARGET_OPTS) -C $$($$(PKG)_BUILDDIR) -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# cmake-package -- the target generator macro for CMake packages -################################################################################ - -cmake-package = $(call inner-cmake-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-cmake-package = $(call inner-cmake-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) - -################################################################################ -# Generation of the CMake toolchain file -################################################################################ - -# CMAKE_SYSTEM_PROCESSOR should match uname -m -ifeq ($(BR2_ARM_CPU_ARMV4),y) -CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv4 -else ifeq ($(BR2_ARM_CPU_ARMV5),y) -CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv5 -else ifeq ($(BR2_ARM_CPU_ARMV6),y) -CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv6 -else ifeq ($(BR2_ARM_CPU_ARMV7A),y) -CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT = armv7 -endif - -ifeq ($(BR2_arm),y) -CMAKE_SYSTEM_PROCESSOR = $(CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT)l -else ifeq ($(BR2_armeb),y) -CMAKE_SYSTEM_PROCESSOR = $(CMAKE_SYSTEM_PROCESSOR_ARM_VARIANT)b -else -CMAKE_SYSTEM_PROCESSOR = $(BR2_ARCH) -endif - -# In order to allow the toolchain to be relocated, we calculate the HOST_DIR -# based on the toolchainfile.cmake file's location: $(HOST_DIR)/usr/share/buildroot -# In all the other variables, HOST_DIR will be replaced by RELOCATED_HOST_DIR, -# so we have to strip "$(HOST_DIR)/" from the paths that contain it. -$(HOST_DIR)/usr/share/buildroot/toolchainfile.cmake: - @mkdir -p $(@D) - sed \ - -e 's#@@STAGING_SUBDIR@@#$(call qstrip,$(STAGING_SUBDIR))#' \ - -e 's#@@TARGET_CFLAGS@@#$(call qstrip,$(TARGET_CFLAGS))#' \ - -e 's#@@TARGET_CXXFLAGS@@#$(call qstrip,$(TARGET_CXXFLAGS))#' \ - -e 's#@@TARGET_FCFLAGS@@#$(call qstrip,$(TARGET_FCFLAGS))#' \ - -e 's#@@TARGET_LDFLAGS@@#$(call qstrip,$(TARGET_LDFLAGS))#' \ - -e 's#@@TARGET_CC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CC)))#' \ - -e 's#@@TARGET_CXX@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_CXX)))#' \ - -e 's#@@TARGET_FC@@#$(subst $(HOST_DIR)/,,$(call qstrip,$(TARGET_FC)))#' \ - -e 's#@@CMAKE_SYSTEM_PROCESSOR@@#$(call qstrip,$(CMAKE_SYSTEM_PROCESSOR))#' \ - -e 's#@@TOOLCHAIN_HAS_FORTRAN@@#$(if $(BR2_TOOLCHAIN_HAS_FORTRAN),1,0)#' \ - -e 's#@@CMAKE_BUILD_TYPE@@#$(if $(BR2_ENABLE_DEBUG),Debug,Release)#' \ - $(TOPDIR)/support/misc/toolchainfile.cmake.in \ - > $@ diff --git a/package.bak/pkg-download.mk b/package.bak/pkg-download.mk deleted file mode 100644 index cfc550e77b..0000000000 --- a/package.bak/pkg-download.mk +++ /dev/null @@ -1,255 +0,0 @@ -################################################################################ -# -# This file contains the download helpers for the various package -# infrastructures. It is used to handle downloads from HTTP servers, -# FTP servers, Git repositories, Subversion repositories, Mercurial -# repositories, Bazaar repositories, and SCP servers. -# -################################################################################ - -# Download method commands -export WGET := $(call qstrip,$(BR2_WGET)) -export SVN := $(call qstrip,$(BR2_SVN)) -export CVS := $(call qstrip,$(BR2_CVS)) -export BZR := $(call qstrip,$(BR2_BZR)) -export GIT := $(call qstrip,$(BR2_GIT)) -export HG := $(call qstrip,$(BR2_HG)) -export SCP := $(call qstrip,$(BR2_SCP)) -SSH := $(call qstrip,$(BR2_SSH)) -export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) - -DL_WRAPPER = support/download/dl-wrapper - -# DL_DIR may have been set already from the environment -ifeq ($(origin DL_DIR),undefined) -DL_DIR ?= $(call qstrip,$(BR2_DL_DIR)) -ifeq ($(DL_DIR),) -DL_DIR := $(TOPDIR)/dl -endif -else -# Restore the BR2_DL_DIR that was overridden by the .config file -BR2_DL_DIR = $(DL_DIR) -endif - -# ensure it exists and a absolute path -DL_DIR := $(shell mkdir -p $(DL_DIR) && cd $(DL_DIR) >/dev/null && pwd) - -# -# URI scheme helper functions -# Example URIs: -# * http://www.example.com/dir/file -# * scp://www.example.com:dir/file (with domainseparator :) -# -# geturischeme: http -geturischeme = $(firstword $(subst ://, ,$(call qstrip,$(1)))) -# stripurischeme: www.example.com/dir/file -stripurischeme = $(lastword $(subst ://, ,$(call qstrip,$(1)))) -# domain: www.example.com -domain = $(firstword $(subst $(call domainseparator,$(2)), ,$(call stripurischeme,$(1)))) -# notdomain: dir/file -notdomain = $(patsubst $(call domain,$(1),$(2))$(call domainseparator,$(2))%,%,$(call stripurischeme,$(1))) -# -# default domainseparator is /, specify alternative value as first argument -domainseparator = $(if $(1),$(1),/) - -# github(user,package,version): returns site of GitHub repository -github = https://github.com/$(1)/$(2)/archive/$(3) - -# Expressly do not check hashes for those files -# Exported variables default to immediately expanded in some versions of -# make, but we need it to be recursively-epxanded, so explicitly assign it. -export BR_NO_CHECK_HASH_FOR = - -################################################################################ -# The DOWNLOAD_* helpers are in charge of getting a working copy -# of the source repository for their corresponding SCM, -# checking out the requested version / commit / tag, and create an -# archive out of it. DOWNLOAD_SCP uses scp to obtain a remote file with -# ssh authentication. DOWNLOAD_WGET is the normal wget-based download -# mechanism. -# -# The SOURCE_CHECK_* helpers are in charge of simply checking that the source -# is available for download. This can be used to make sure one will be able -# to get all the sources needed for one's build configuration. -################################################################################ - -define DOWNLOAD_GIT - $(EXTRA_ENV) $(DL_WRAPPER) -b git \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(if $($(PKG)_GIT_SUBMODULES),-r) \ - $(QUIET) \ - -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ - $($(PKG)_DL_OPTS) -endef - -# TODO: improve to check that the given PKG_DL_VERSION exists on the remote -# repository -define SOURCE_CHECK_GIT - $(GIT) ls-remote --heads $($(PKG)_SITE) > /dev/null -endef - -define DOWNLOAD_BZR - $(EXTRA_ENV) $(DL_WRAPPER) -b bzr \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ - $($(PKG)_DL_OPTS) -endef - -define SOURCE_CHECK_BZR - $(BZR) ls --quiet $($(PKG)_SITE) > /dev/null -endef - -define DOWNLOAD_CVS - $(EXTRA_ENV) $(DL_WRAPPER) -b cvs \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - $(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAWNAME) \ - $($(PKG)_RAW_BASE_NAME) \ - $($(PKG)_DL_OPTS) -endef - -# Not all CVS servers support ls/rls, use login to see if we can connect -define SOURCE_CHECK_CVS - $(CVS) -d:pserver:anonymous:@$(call stripurischeme,$(call qstrip,$($(PKG)_SITE))) login -endef - -define DOWNLOAD_SVN - $(EXTRA_ENV) $(DL_WRAPPER) -b svn \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ - $($(PKG)_DL_OPTS) -endef - -define SOURCE_CHECK_SVN - $(SVN) ls $($(PKG)_SITE)@$($(PKG)_DL_VERSION) > /dev/null -endef - -# SCP URIs should be of the form scp://[user@]host:filepath -# Note that filepath is relative to the user's home directory, so you may want -# to prepend the path with a slash: scp://[user@]host:/absolutepath -define DOWNLOAD_SCP - $(EXTRA_ENV) $(DL_WRAPPER) -b scp \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - '$(call stripurischeme,$(call qstrip,$(1)))' \ - $($(PKG)_DL_OPTS) -endef - -define SOURCE_CHECK_SCP - $(SSH) $(call domain,$(1),:) ls '$(call notdomain,$(1),:)' > /dev/null -endef - -define DOWNLOAD_HG - $(EXTRA_ENV) $(DL_WRAPPER) -b hg \ - -o $(DL_DIR)/$($(PKG)_SOURCE) \ - $(QUIET) \ - -- \ - $($(PKG)_SITE) \ - $($(PKG)_DL_VERSION) \ - $($(PKG)_RAW_BASE_NAME) \ - $($(PKG)_DL_OPTS) -endef - -# TODO: improve to check that the given PKG_DL_VERSION exists on the remote -# repository -define SOURCE_CHECK_HG - $(HG) incoming --force -l1 $($(PKG)_SITE) > /dev/null -endef - -define DOWNLOAD_WGET - $(EXTRA_ENV) $(DL_WRAPPER) -b wget \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - '$(call qstrip,$(1))' \ - $($(PKG)_DL_OPTS) -endef - -define SOURCE_CHECK_WGET - $(WGET) --spider '$(call qstrip,$(1))' -endef - -define DOWNLOAD_LOCALFILES - $(EXTRA_ENV) $(DL_WRAPPER) -b cp \ - -o $(DL_DIR)/$(2) \ - -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ - $(QUIET) \ - -- \ - $(call stripurischeme,$(call qstrip,$(1))) \ - $($(PKG)_DL_OPTS) -endef - -define SOURCE_CHECK_LOCALFILES - test -e $(call stripurischeme,$(call qstrip,$(1))) -endef - -################################################################################ -# DOWNLOAD -- Download helper. Will try to download source from: -# 1) BR2_PRIMARY_SITE if enabled -# 2) Download site, unless BR2_PRIMARY_SITE_ONLY is set -# 3) BR2_BACKUP_SITE if enabled, unless BR2_PRIMARY_SITE_ONLY is set -# -# Argument 1 is the source location -# -# E.G. use like this: -# $(call DOWNLOAD,$(FOO_SITE)) -# -# For PRIMARY and BACKUP site, any ? in the URL is replaced by %3F. A ? in -# the URL is used to separate query arguments, but the PRIMARY and BACKUP -# sites serve just plain files. -################################################################################ - -define DOWNLOAD - $(call DOWNLOAD_INNER,$(1),$(notdir $(1)),DOWNLOAD) -endef - -define SOURCE_CHECK - $(call DOWNLOAD_INNER,$(1),$(notdir $(1)),SOURCE_CHECK) -endef - -define DOWNLOAD_INNER - $(Q)$(if $(filter bzr cvs git hg svn,$($(PKG)_SITE_METHOD)),export BR_NO_CHECK_HASH_FOR=$(2);) \ - if test -n "$(call qstrip,$(BR2_PRIMARY_SITE))" ; then \ - case "$(call geturischeme,$(BR2_PRIMARY_SITE))" in \ - file) $(call $(3)_LOCALFILES,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ - scp) $(call $(3)_SCP,$(BR2_PRIMARY_SITE)/$(2),$(2)) && exit ;; \ - *) $(call $(3)_WGET,$(BR2_PRIMARY_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ;; \ - esac ; \ - fi ; \ - if test "$(BR2_PRIMARY_SITE_ONLY)" = "y" ; then \ - exit 1 ; \ - fi ; \ - if test -n "$(1)" ; then \ - case "$($(PKG)_SITE_METHOD)" in \ - git) $($(3)_GIT) && exit ;; \ - svn) $($(3)_SVN) && exit ;; \ - cvs) $($(3)_CVS) && exit ;; \ - bzr) $($(3)_BZR) && exit ;; \ - file) $($(3)_LOCALFILES) && exit ;; \ - scp) $($(3)_SCP) && exit ;; \ - hg) $($(3)_HG) && exit ;; \ - *) $(call $(3)_WGET,$(1),$(2)) && exit ;; \ - esac ; \ - fi ; \ - if test -n "$(call qstrip,$(BR2_BACKUP_SITE))" ; then \ - $(call $(3)_WGET,$(BR2_BACKUP_SITE)/$(subst ?,%3F,$(2)),$(2)) && exit ; \ - fi ; \ - exit 1 -endef diff --git a/package.bak/pkg-generic.mk b/package.bak/pkg-generic.mk deleted file mode 100644 index e8a8021e3c..0000000000 --- a/package.bak/pkg-generic.mk +++ /dev/null @@ -1,990 +0,0 @@ -################################################################################ -# Generic package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files. It should be used for packages that do not rely -# on a well-known build system for which Buildroot has a dedicated -# infrastructure (so far, Buildroot has special support for -# autotools-based and CMake-based packages). -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this generic infrastructure requires the -# .mk file to specify: -# -# 1. Metadata information about the package: name, version, -# download URL, etc. -# -# 2. Description of the commands to be executed to configure, build -# and install the package -################################################################################ - -################################################################################ -# Helper functions to catch start/end of each step -################################################################################ - -# Those two functions are called by each step below. -# They are responsible for calling all hooks defined in -# $(GLOBAL_INSTRUMENTATION_HOOKS) and pass each of them -# three arguments: -# $1: either 'start' or 'end' -# $2: the name of the step -# $3: the name of the package - -# Start step -# $1: step name -define step_start - $(foreach hook,$(GLOBAL_INSTRUMENTATION_HOOKS),$(call $(hook),start,$(1),$($(PKG)_NAME))$(sep)) -endef - -# End step -# $1: step name -define step_end - $(foreach hook,$(GLOBAL_INSTRUMENTATION_HOOKS),$(call $(hook),end,$(1),$($(PKG)_NAME))$(sep)) -endef - -####################################### -# Actual steps hooks - -# Time steps -define step_time - printf "%s:%-5.5s:%-20.20s: %s\n" \ - "$$(date +%s)" "$(1)" "$(2)" "$(3)" \ - >>"$(BUILD_DIR)/build-time.log" -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_time - -# Hooks to collect statistics about installed files - -# This hook will be called before the target installation of a -# package. We store in a file named .br_filelist_before the list of -# files currently installed in the target. Note that the MD5 is also -# stored, in order to identify if the files are overwritten. -define step_pkg_size_start - (cd $(TARGET_DIR) ; find . -type f -print0 | xargs -0 md5sum) | sort > \ - $($(PKG)_DIR)/.br_filelist_before -endef - -# This hook will be called after the target installation of a -# package. We store in a file named .br_filelist_after the list of -# files (and their MD5) currently installed in the target. We then do -# a diff with the .br_filelist_before to compute the list of files -# installed by this package. -define step_pkg_size_end - (cd $(TARGET_DIR); find . -type f -print0 | xargs -0 md5sum) | sort > \ - $($(PKG)_DIR)/.br_filelist_after - comm -13 $($(PKG)_DIR)/.br_filelist_before $($(PKG)_DIR)/.br_filelist_after | \ - while read hash file ; do \ - echo "$(1),$${file}" >> $(BUILD_DIR)/packages-file-list.txt ; \ - done -endef - -define step_pkg_size - $(if $(filter install-target,$(2)),\ - $(if $(filter start,$(1)),$(call step_pkg_size_start,$(3))) \ - $(if $(filter end,$(1)),$(call step_pkg_size_end,$(3)))) -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_pkg_size - -# This hook checks that host packages that need libraries that we build -# have a proper DT_RPATH or DT_RUNPATH tag -define check_host_rpath - $(if $(filter install-host,$(2)),\ - $(if $(filter end,$(1)),support/scripts/check-host-rpath $(3) $(HOST_DIR))) -endef -GLOBAL_INSTRUMENTATION_HOOKS += check_host_rpath - -define step_check_build_dir_one - if [ -d $(2) ]; then \ - printf "%s: installs files in %s\n" $(1) $(2) >&2; \ - exit 1; \ - fi -endef - -define step_check_build_dir - $(if $(filter install-staging,$(2)),\ - $(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(STAGING_DIR)/$(O)))) - $(if $(filter install-target,$(2)),\ - $(if $(filter end,$(1)),$(call step_check_build_dir_one,$(3),$(TARGET_DIR)/$(O)))) -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_check_build_dir - -# User-supplied script -ifneq ($(BR2_INSTRUMENTATION_SCRIPTS),) -define step_user - @$(foreach user_hook, $(BR2_INSTRUMENTATION_SCRIPTS), \ - $(EXTRA_ENV) $(user_hook) "$(1)" "$(2)" "$(3)"$(sep)) -endef -GLOBAL_INSTRUMENTATION_HOOKS += step_user -endif - -################################################################################ -# Implicit targets -- produce a stamp file for each step of a package build -################################################################################ - -# Retrieve the archive -$(BUILD_DIR)/%/.stamp_downloaded: - $(foreach hook,$($(PKG)_PRE_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) -# Only show the download message if it isn't already downloaded - $(Q)for p in $($(PKG)_ALL_DOWNLOADS); do \ - if test ! -e $(DL_DIR)/`basename $$p` ; then \ - $(call MESSAGE,"Downloading") ; \ - break ; \ - fi ; \ - done - $(foreach p,$($(PKG)_ALL_DOWNLOADS),$(call DOWNLOAD,$(p))$(sep)) - $(foreach hook,$($(PKG)_POST_DOWNLOAD_HOOKS),$(call $(hook))$(sep)) - $(Q)mkdir -p $(@D) - $(Q)touch $@ - -# Retrieve actual source archive, e.g. for prebuilt external toolchains -$(BUILD_DIR)/%/.stamp_actual_downloaded: - $(call DOWNLOAD,$($(PKG)_ACTUAL_SOURCE_SITE)/$($(PKG)_ACTUAL_SOURCE_TARBALL)); \ - $(Q)mkdir -p $(@D) - $(Q)touch $@ - -# Unpack the archive -$(BUILD_DIR)/%/.stamp_extracted: - @$(call step_start,extract) - @$(call MESSAGE,"Extracting") - $(foreach hook,$($(PKG)_PRE_EXTRACT_HOOKS),$(call $(hook))$(sep)) - $(Q)mkdir -p $(@D) - $($(PKG)_EXTRACT_CMDS) -# some packages have messed up permissions inside - $(Q)chmod -R +rw $(@D) - $(foreach hook,$($(PKG)_POST_EXTRACT_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,extract) - $(Q)touch $@ - -# Rsync the source directory if the _OVERRIDE_SRCDIR feature is -# used. -$(BUILD_DIR)/%/.stamp_rsynced: - @$(call MESSAGE,"Syncing from source dir $(SRCDIR)") - $(foreach hook,$($(PKG)_PRE_RSYNC_HOOKS),$(call $(hook))$(sep)) - @test -d $(SRCDIR) || (echo "ERROR: $(SRCDIR) does not exist" ; exit 1) - rsync -au --chmod=u=rwX,go=rX $(RSYNC_VCS_EXCLUSIONS) $(call qstrip,$(SRCDIR))/ $(@D) - $(foreach hook,$($(PKG)_POST_RSYNC_HOOKS),$(call $(hook))$(sep)) - $(Q)touch $@ - -# Patch -# -# The RAWNAME variable is the lowercased package name, which allows to -# find the package directory (typically package/) and the -# prefix of the patches -# -# For BR2_GLOBAL_PATCH_DIR, only generate if it is defined -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS = $(PKGDIR) -$(BUILD_DIR)/%/.stamp_patched: PATCH_BASE_DIRS += $(addsuffix /$(RAWNAME),$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) -$(BUILD_DIR)/%/.stamp_patched: - @$(call step_start,patch) - @$(call MESSAGE,"Patching") - $(foreach hook,$($(PKG)_PRE_PATCH_HOOKS),$(call $(hook))$(sep)) - $(foreach p,$($(PKG)_PATCH),$(APPLY_PATCHES) $(@D) $(DL_DIR) $(notdir $(p))$(sep)) - $(Q)( \ - for D in $(PATCH_BASE_DIRS); do \ - if test -d $${D}; then \ - if test -d $${D}/$($(PKG)_VERSION); then \ - $(APPLY_PATCHES) $(@D) $${D}/$($(PKG)_VERSION) \*.patch \*.patch.$(ARCH) || exit 1; \ - else \ - $(APPLY_PATCHES) $(@D) $${D} \*.patch \*.patch.$(ARCH) || exit 1; \ - fi; \ - fi; \ - done; \ - ) - $(foreach hook,$($(PKG)_POST_PATCH_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,patch) - $(Q)touch $@ - -# Check that all directories specified in BR2_GLOBAL_PATCH_DIR exist. -$(foreach dir,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)),\ - $(if $(wildcard $(dir)),,\ - $(error BR2_GLOBAL_PATCH_DIR contains nonexistent directory $(dir)))) - -# Configure -$(BUILD_DIR)/%/.stamp_configured: - @$(call step_start,configure) - @$(call MESSAGE,"Configuring") - $(foreach hook,$($(PKG)_PRE_CONFIGURE_HOOKS),$(call $(hook))$(sep)) - $($(PKG)_CONFIGURE_CMDS) - $(foreach hook,$($(PKG)_POST_CONFIGURE_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,configure) - $(Q)touch $@ - -# Build -$(BUILD_DIR)/%/.stamp_built:: - @$(call step_start,build) - @$(call MESSAGE,"Building") - $(foreach hook,$($(PKG)_PRE_BUILD_HOOKS),$(call $(hook))$(sep)) - +$($(PKG)_BUILD_CMDS) - $(foreach hook,$($(PKG)_POST_BUILD_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,build) - $(Q)touch $@ - -# Install to host dir -$(BUILD_DIR)/%/.stamp_host_installed: - @$(call step_start,install-host) - @$(call MESSAGE,"Installing to host directory") - $(foreach hook,$($(PKG)_PRE_INSTALL_HOOKS),$(call $(hook))$(sep)) - +$($(PKG)_INSTALL_CMDS) - $(foreach hook,$($(PKG)_POST_INSTALL_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,install-host) - $(Q)touch $@ - -# Install to staging dir -# -# Some packages install libtool .la files alongside any installed -# libraries. These .la files sometimes refer to paths relative to the -# sysroot, which libtool will interpret as absolute paths to host -# libraries instead of the target libraries. Since this is not what we -# want, these paths are fixed by prefixing them with $(STAGING_DIR). -# As we configure with --prefix=/usr, this fix needs to be applied to -# any path that starts with /usr. -# -# To protect against the case that the output or staging directories or -# the pre-installed external toolchain themselves are under /usr, we first -# substitute away any occurrences of these directories with @BASE_DIR@, -# @STAGING_DIR@ and @TOOLCHAIN_EXTERNAL_INSTALL_DIR@ respectively. -# -# Note that STAGING_DIR can be outside BASE_DIR when the user sets -# BR2_HOST_DIR to a custom value. Note that TOOLCHAIN_EXTERNAL_INSTALL_DIR -# can be under @BASE_DIR@ when it's a downloaded toolchain, and can be -# empty when we use an internal toolchain. -# -$(BUILD_DIR)/%/.stamp_staging_installed: - @$(call step_start,install-staging) - @$(call MESSAGE,"Installing to staging directory") - $(foreach hook,$($(PKG)_PRE_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) - +$($(PKG)_INSTALL_STAGING_CMDS) - $(foreach hook,$($(PKG)_POST_INSTALL_STAGING_HOOKS),$(call $(hook))$(sep)) - $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ - $(call MESSAGE,"Fixing package configuration files") ;\ - $(SED) "s,$(BASE_DIR),@BASE_DIR@,g" \ - -e "s,$(STAGING_DIR),@STAGING_DIR@,g" \ - -e "s,^\(exec_\)\?prefix=.*,\1prefix=@STAGING_DIR@/usr,g" \ - -e "s,-I/usr/,-I@STAGING_DIR@/usr/,g" \ - -e "s,-L/usr/,-L@STAGING_DIR@/usr/,g" \ - -e "s,@STAGING_DIR@,$(STAGING_DIR),g" \ - -e "s,@BASE_DIR@,$(BASE_DIR),g" \ - $(addprefix $(STAGING_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ;\ - fi - @$(call MESSAGE,"Fixing libtool files") - $(Q)find $(STAGING_DIR)/usr/lib* -name "*.la" | xargs --no-run-if-empty \ - $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \ - -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \ - $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ - -e "s:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:g") \ - -e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \ - $(if $(TOOLCHAIN_EXTERNAL_INSTALL_DIR),\ - -e "s:@TOOLCHAIN_EXTERNAL_INSTALL_DIR@:$(TOOLCHAIN_EXTERNAL_INSTALL_DIR):g") \ - -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ - -e "s:@BASE_DIR@:$(BASE_DIR):g" - @$(call step_end,install-staging) - $(Q)touch $@ - -# Install to images dir -$(BUILD_DIR)/%/.stamp_images_installed: - @$(call step_start,install-image) - $(foreach hook,$($(PKG)_PRE_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) - @$(call MESSAGE,"Installing to images directory") - +$($(PKG)_INSTALL_IMAGES_CMDS) - $(foreach hook,$($(PKG)_POST_INSTALL_IMAGES_HOOKS),$(call $(hook))$(sep)) - @$(call step_end,install-image) - $(Q)touch $@ - -# Install to target dir -$(BUILD_DIR)/%/.stamp_target_installed: - @$(call step_start,install-target) - @$(call MESSAGE,"Installing to target") - $(foreach hook,$($(PKG)_PRE_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) - +$($(PKG)_INSTALL_TARGET_CMDS) - $(if $(BR2_INIT_SYSTEMD),\ - $($(PKG)_INSTALL_INIT_SYSTEMD)) - $(if $(BR2_INIT_SYSV)$(BR2_INIT_BUSYBOX),\ - $($(PKG)_INSTALL_INIT_SYSV)) - $(foreach hook,$($(PKG)_POST_INSTALL_TARGET_HOOKS),$(call $(hook))$(sep)) - $(Q)if test -n "$($(PKG)_CONFIG_SCRIPTS)" ; then \ - $(RM) -f $(addprefix $(TARGET_DIR)/usr/bin/,$($(PKG)_CONFIG_SCRIPTS)) ; \ - fi - @$(call step_end,install-target) - $(Q)touch $@ - -# Remove package sources -$(BUILD_DIR)/%/.stamp_dircleaned: - rm -Rf $(@D) - -################################################################################ -# virt-provides-single -- check that provider-pkg is the declared provider for -# the virtual package virt-pkg -# -# argument 1 is the lower-case name of the virtual package -# argument 2 is the upper-case name of the virtual package -# argument 3 is the lower-case name of the provider -# -# example: -# $(call virt-provides-single,libegl,LIBEGL,rpi-userland) -################################################################################ -define virt-provides-single -ifneq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),$(3)) -$$(error Configuration error: both "$(3)" and $$(BR2_PACKAGE_PROVIDES_$(2))\ -are selected as providers for virtual package "$(1)". Only one provider can\ -be selected at a time. Please fix your configuration) -endif -endef - -define pkg-graph-depends - @$$(INSTALL) -d $$(GRAPHS_DIR) - @cd "$$(CONFIG_DIR)"; \ - $$(TOPDIR)/support/scripts/graph-depends $$(BR2_GRAPH_DEPS_OPTS) \ - -p $(1) $(2) -o $$(GRAPHS_DIR)/$$(@).dot - dot $$(BR2_GRAPH_DOT_OPTS) -T$$(BR_GRAPH_OUT) \ - -o $$(GRAPHS_DIR)/$$(@).$$(BR_GRAPH_OUT) \ - $$(GRAPHS_DIR)/$$(@).dot -endef - -################################################################################ -# inner-generic-package -- generates the make targets needed to build a -# generic package -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -# -# Note about variable and function references: inside all blocks that are -# evaluated with $(eval), which includes all 'inner-xxx-package' blocks, -# specific rules apply with respect to variable and function references. -# - Numbered variables (parameters to the block) can be referenced with a single -# dollar sign: $(1), $(2), $(3), etc. -# - pkgdir and pkgname should be referenced with a single dollar sign too. These -# functions rely on 'the most recently parsed makefile' which is supposed to -# be the package .mk file. If we defer the evaluation of these functions using -# double dollar signs, then they may be evaluated too late, when other -# makefiles have already been parsed. One specific case is when $$(pkgdir) is -# assigned to a variable using deferred evaluation with '=' and this variable -# is used in a target rule outside the eval'ed inner block. In this case, the -# pkgdir will be that of the last makefile parsed by buildroot, which is not -# the expected value. This mechanism is for example used for the TARGET_PATCH -# rule. -# - All other variables should be referenced with a double dollar sign: -# $$(TARGET_DIR), $$($(2)_VERSION), etc. Also all make functions should be -# referenced with a double dollar sign: $$(subst), $$(call), $$(filter-out), -# etc. This rule ensures that these variables and functions are only expanded -# during the $(eval) step, and not earlier. Otherwise, unintuitive and -# undesired behavior occurs with respect to these variables and functions. -# -################################################################################ - -define inner-generic-package - -# Ensure the package is only declared once, i.e. do not accept that a -# package be re-defined by a br2-external tree -ifneq ($(call strip,$(filter $(1),$(PACKAGES_ALL))),) -$$(error Package '$(1)' defined a second time in '$(pkgdir)'; \ - previous definition was in '$$($(2)_PKGDIR)') -endif -PACKAGES_ALL += $(1) - -# Define default values for various package-related variables, if not -# already defined. For some variables (version, source, site and -# subdir), if they are undefined, we try to see if a variable without -# the HOST_ prefix is defined. If so, we use such a variable, so that -# this information has only to be specified once, for both the -# target and host packages of a given .mk file. - -$(2)_TYPE = $(4) -$(2)_NAME = $(1) -$(2)_RAWNAME = $$(patsubst host-%,%,$(1)) -$(2)_PKGDIR = $(pkgdir) - -# Keep the package version that may contain forward slashes in the _DL_VERSION -# variable, then replace all forward slashes ('/') by underscores ('_') to -# sanitize the package version that is used in paths, directory and file names. -# Forward slashes may appear in the package's version when pointing to a -# version control system branch or tag, for example remotes/origin/1_10_stable. -# Similar for spaces and colons (:) that may appear in date-based revisions for -# CVS. -ifndef $(2)_VERSION - ifdef $(3)_DL_VERSION - $(2)_DL_VERSION := $$($(3)_DL_VERSION) - else ifdef $(3)_VERSION - $(2)_DL_VERSION := $$($(3)_VERSION) - endif -else - $(2)_DL_VERSION := $$(strip $$($(2)_VERSION)) -endif -$(2)_VERSION := $$(call sanitize,$$($(2)_DL_VERSION)) - -ifdef $(3)_OVERRIDE_SRCDIR - $(2)_OVERRIDE_SRCDIR ?= $$($(3)_OVERRIDE_SRCDIR) -endif - -$(2)_BASE_NAME = $$(if $$($(2)_VERSION),$(1)-$$($(2)_VERSION),$(1)) -$(2)_RAW_BASE_NAME = $$(if $$($(2)_VERSION),$$($(2)_RAWNAME)-$$($(2)_VERSION),$$($(2)_RAWNAME)) -$(2)_DL_DIR = $$(DL_DIR)/$$($(2)_BASE_NAME) -$(2)_DIR = $$(BUILD_DIR)/$$($(2)_BASE_NAME) - -ifndef $(2)_SUBDIR - ifdef $(3)_SUBDIR - $(2)_SUBDIR = $$($(3)_SUBDIR) - else - $(2)_SUBDIR ?= - endif -endif - -ifndef $(2)_STRIP_COMPONENTS - ifdef $(3)_STRIP_COMPONENTS - $(2)_STRIP_COMPONENTS = $$($(3)_STRIP_COMPONENTS) - else - $(2)_STRIP_COMPONENTS ?= 1 - endif -endif - -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) -$(2)_BUILDDIR ?= $$($(2)_SRCDIR) - -ifneq ($$($(2)_OVERRIDE_SRCDIR),) -$(2)_VERSION = custom -endif - -ifndef $(2)_SOURCE - ifdef $(3)_SOURCE - $(2)_SOURCE = $$($(3)_SOURCE) - else ifdef $(2)_VERSION - $(2)_SOURCE ?= $$($(2)_RAW_BASE_NAME).tar.gz - endif -endif - -# If FOO_ACTUAL_SOURCE_TARBALL is explicitly defined, it means FOO_SOURCE is -# indeed a binary (e.g. external toolchain) and FOO_ACTUAL_SOURCE_TARBALL/_SITE -# point to the actual sources tarball. Use the actual sources for legal-info. -# For most packages the FOO_SITE/FOO_SOURCE pair points to real source code, -# so these are the defaults for FOO_ACTUAL_*. -$(2)_ACTUAL_SOURCE_TARBALL ?= $$($(2)_SOURCE) -$(2)_ACTUAL_SOURCE_SITE ?= $$(call qstrip,$$($(2)_SITE)) - -ifndef $(2)_PATCH - ifdef $(3)_PATCH - $(2)_PATCH = $$($(3)_PATCH) - endif -endif - -$(2)_ALL_DOWNLOADS = \ - $$(foreach p,$$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS),\ - $$(if $$(findstring ://,$$(p)),$$(p),\ - $$($(2)_SITE)/$$(p))) - -ifndef $(2)_SITE - ifdef $(3)_SITE - $(2)_SITE = $$($(3)_SITE) - endif -endif - -ifndef $(2)_SITE_METHOD - ifdef $(3)_SITE_METHOD - $(2)_SITE_METHOD = $$($(3)_SITE_METHOD) - else - # Try automatic detection using the scheme part of the URI - $(2)_SITE_METHOD = $$(call geturischeme,$$($(2)_SITE)) - endif -endif - -# Do not accept to download git submodule if not using the git method -ifneq ($$($(2)_GIT_SUBMODULES),) - ifneq ($$($(2)_SITE_METHOD),git) - $$(error $(2) declares having git sub-modules, but does not use the \ - 'git' method (uses '$$($(2)_SITE_METHOD)' instead)) - endif -endif - -ifeq ($$($(2)_SITE_METHOD),local) -ifeq ($$($(2)_OVERRIDE_SRCDIR),) -$(2)_OVERRIDE_SRCDIR = $$($(2)_SITE) -endif -endif - -ifndef $(2)_LICENSE - ifdef $(3)_LICENSE - $(2)_LICENSE = $$($(3)_LICENSE) - endif -endif - -$(2)_LICENSE ?= unknown - -ifndef $(2)_LICENSE_FILES - ifdef $(3)_LICENSE_FILES - $(2)_LICENSE_FILES = $$($(3)_LICENSE_FILES) - endif -endif - -ifndef $(2)_REDISTRIBUTE - ifdef $(3)_REDISTRIBUTE - $(2)_REDISTRIBUTE = $$($(3)_REDISTRIBUTE) - endif -endif - -$(2)_REDISTRIBUTE ?= YES - -$(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2)_RAW_BASE_NAME) - -# When a target package is a toolchain dependency set this variable to -# 'NO' so the 'toolchain' dependency is not added to prevent a circular -# dependency -$(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES - -ifeq ($(4),target) -ifneq ($(1),skeleton) -$(2)_DEPENDENCIES += skeleton -endif -ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES) -$(2)_DEPENDENCIES += toolchain -endif -endif - -# Eliminate duplicates in dependencies -$(2)_FINAL_DEPENDENCIES = $$(sort $$($(2)_DEPENDENCIES)) -$(2)_FINAL_PATCH_DEPENDENCIES = $$(sort $$($(2)_PATCH_DEPENDENCIES)) -$(2)_FINAL_ALL_DEPENDENCIES = $$(sort $$($(2)_FINAL_DEPENDENCIES) $$($(2)_FINAL_PATCH_DEPENDENCIES)) - -$(2)_INSTALL_STAGING ?= NO -$(2)_INSTALL_IMAGES ?= NO -$(2)_INSTALL_TARGET ?= YES - -# define sub-target stamps -$(2)_TARGET_INSTALL_TARGET = $$($(2)_DIR)/.stamp_target_installed -$(2)_TARGET_INSTALL_STAGING = $$($(2)_DIR)/.stamp_staging_installed -$(2)_TARGET_INSTALL_IMAGES = $$($(2)_DIR)/.stamp_images_installed -$(2)_TARGET_INSTALL_HOST = $$($(2)_DIR)/.stamp_host_installed -$(2)_TARGET_BUILD = $$($(2)_DIR)/.stamp_built -$(2)_TARGET_CONFIGURE = $$($(2)_DIR)/.stamp_configured -$(2)_TARGET_RSYNC = $$($(2)_DIR)/.stamp_rsynced -$(2)_TARGET_PATCH = $$($(2)_DIR)/.stamp_patched -$(2)_TARGET_EXTRACT = $$($(2)_DIR)/.stamp_extracted -$(2)_TARGET_SOURCE = $$($(2)_DIR)/.stamp_downloaded -$(2)_TARGET_ACTUAL_SOURCE = $$($(2)_DIR)/.stamp_actual_downloaded -$(2)_TARGET_DIRCLEAN = $$($(2)_DIR)/.stamp_dircleaned - -# default extract command -$(2)_EXTRACT_CMDS ?= \ - $$(if $$($(2)_SOURCE),$$(INFLATE$$(suffix $$($(2)_SOURCE))) $$(DL_DIR)/$$($(2)_SOURCE) | \ - $$(TAR) --strip-components=$$($(2)_STRIP_COMPONENTS) \ - -C $$($(2)_DIR) \ - $$(foreach x,$$($(2)_EXCLUDES),--exclude='$$(x)' ) \ - $$(TAR_OPTIONS) -) - -# pre/post-steps hooks -$(2)_PRE_DOWNLOAD_HOOKS ?= -$(2)_POST_DOWNLOAD_HOOKS ?= -$(2)_PRE_EXTRACT_HOOKS ?= -$(2)_POST_EXTRACT_HOOKS ?= -$(2)_PRE_RSYNC_HOOKS ?= -$(2)_POST_RSYNC_HOOKS ?= -$(2)_PRE_PATCH_HOOKS ?= -$(2)_POST_PATCH_HOOKS ?= -$(2)_PRE_CONFIGURE_HOOKS ?= -$(2)_POST_CONFIGURE_HOOKS ?= -$(2)_PRE_BUILD_HOOKS ?= -$(2)_POST_BUILD_HOOKS ?= -$(2)_PRE_INSTALL_HOOKS ?= -$(2)_POST_INSTALL_HOOKS ?= -$(2)_PRE_INSTALL_STAGING_HOOKS ?= -$(2)_POST_INSTALL_STAGING_HOOKS ?= -$(2)_PRE_INSTALL_TARGET_HOOKS ?= -$(2)_POST_INSTALL_TARGET_HOOKS ?= -$(2)_PRE_INSTALL_IMAGES_HOOKS ?= -$(2)_POST_INSTALL_IMAGES_HOOKS ?= -$(2)_PRE_LEGAL_INFO_HOOKS ?= -$(2)_POST_LEGAL_INFO_HOOKS ?= -$(2)_TARGET_FINALIZE_HOOKS ?= - -# human-friendly targets and target sequencing -$(1): $(1)-install - -ifeq ($$($(2)_TYPE),host) -$(1)-install: $(1)-install-host -else -$(1)-install: $(1)-install-staging $(1)-install-target $(1)-install-images -endif - -ifeq ($$($(2)_INSTALL_TARGET),YES) -$(1)-install-target: $$($(2)_TARGET_INSTALL_TARGET) -$$($(2)_TARGET_INSTALL_TARGET): $$($(2)_TARGET_BUILD) -else -$(1)-install-target: -endif - -ifeq ($$($(2)_INSTALL_STAGING),YES) -$(1)-install-staging: $$($(2)_TARGET_INSTALL_STAGING) -$$($(2)_TARGET_INSTALL_STAGING): $$($(2)_TARGET_BUILD) -# Some packages use install-staging stuff for install-target -$$($(2)_TARGET_INSTALL_TARGET): $$($(2)_TARGET_INSTALL_STAGING) -else -$(1)-install-staging: -endif - -ifeq ($$($(2)_INSTALL_IMAGES),YES) -$(1)-install-images: $$($(2)_TARGET_INSTALL_IMAGES) -$$($(2)_TARGET_INSTALL_IMAGES): $$($(2)_TARGET_BUILD) -else -$(1)-install-images: -endif - -$(1)-install-host: $$($(2)_TARGET_INSTALL_HOST) -$$($(2)_TARGET_INSTALL_HOST): $$($(2)_TARGET_BUILD) - -$(1)-build: $$($(2)_TARGET_BUILD) -$$($(2)_TARGET_BUILD): $$($(2)_TARGET_CONFIGURE) - -# Since $(2)_FINAL_DEPENDENCIES are phony targets, they are always "newer" -# than $(2)_TARGET_CONFIGURE. This would force the configure step (and -# therefore the other steps as well) to be re-executed with every -# invocation of make. Therefore, make $(2)_FINAL_DEPENDENCIES an order-only -# dependency by using |. - -$(1)-configure: $$($(2)_TARGET_CONFIGURE) -$$($(2)_TARGET_CONFIGURE): | $$($(2)_FINAL_DEPENDENCIES) - -$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dirs prepare -ifeq ($$(filter $(1),$$(DEPENDENCIES_HOST_PREREQ)),) -$$($(2)_TARGET_SOURCE) $$($(2)_TARGET_RSYNC): | dependencies -endif - -ifeq ($$($(2)_OVERRIDE_SRCDIR),) -# In the normal case (no package override), the sequence of steps is -# source, by downloading -# depends -# extract -# patch -# configure -$$($(2)_TARGET_CONFIGURE): $$($(2)_TARGET_PATCH) - -$(1)-patch: $$($(2)_TARGET_PATCH) -$$($(2)_TARGET_PATCH): $$($(2)_TARGET_EXTRACT) -# Order-only dependency -$$($(2)_TARGET_PATCH): | $$(patsubst %,%-patch,$$($(2)_FINAL_PATCH_DEPENDENCIES)) - -$(1)-extract: $$($(2)_TARGET_EXTRACT) -$$($(2)_TARGET_EXTRACT): $$($(2)_TARGET_SOURCE) - -$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) - -$(1)-source: $$($(2)_TARGET_SOURCE) - -$(1)-all-source: $(1)-legal-source -$(1)-legal-info: $(1)-legal-source -$(1)-legal-source: $(1)-source - -# Only download the actual source if it differs from the 'main' archive -ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),) -ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_SOURCE)) -$(1)-legal-source: $$($(2)_TARGET_ACTUAL_SOURCE) -endif # actual sources != sources -endif # actual sources != "" - -$(1)-source-check: - $$(foreach p,$$($(2)_ALL_DOWNLOADS),$$(call SOURCE_CHECK,$$(p))$$(sep)) - -$(1)-external-deps: - @for p in $$($(2)_SOURCE) $$($(2)_PATCH) $$($(2)_EXTRA_DOWNLOADS) ; do \ - echo `basename $$$$p` ; \ - done -else -# In the package override case, the sequence of steps -# source, by rsyncing -# depends -# configure - -# Use an order-only dependency so the "-clean-for-rebuild" rule -# can remove the stamp file without triggering the configure step. -$$($(2)_TARGET_CONFIGURE): | $$($(2)_TARGET_RSYNC) - -$(1)-depends: $$($(2)_FINAL_DEPENDENCIES) - -$(1)-patch: $(1)-rsync -$(1)-extract: $(1)-rsync - -$(1)-rsync: $$($(2)_TARGET_RSYNC) - -$(1)-source: -$(1)-legal-source: - -$(1)-source-check: - test -d $$($(2)_OVERRIDE_SRCDIR) - -$(1)-external-deps: - @echo "file://$$($(2)_OVERRIDE_SRCDIR)" -endif - -$(1)-show-version: - @echo $$($(2)_VERSION) - -$(1)-show-depends: - @echo $$($(2)_FINAL_ALL_DEPENDENCIES) - -$(1)-show-rdepends: - @echo $$($(2)_RDEPENDENCIES) - -$(1)-graph-depends: graph-depends-requirements - $(call pkg-graph-depends,$(1),--direct) - -$(1)-graph-rdepends: graph-depends-requirements - $(call pkg-graph-depends,$(1),--reverse) - -$(1)-all-source: $(1)-source -$(1)-all-source: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source) - -$(1)-all-source-check: $(1)-source-check -$(1)-all-source-check: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-source-check) - -$(1)-all-external-deps: $(1)-external-deps -$(1)-all-external-deps: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-external-deps) - -$(1)-all-legal-info: $(1)-legal-info -$(1)-all-legal-info: $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),$$(p)-all-legal-info) - -$(1)-dirclean: $$($(2)_TARGET_DIRCLEAN) - -$(1)-clean-for-reinstall: -ifneq ($$($(2)_OVERRIDE_SRCDIR),) - rm -f $$($(2)_TARGET_RSYNC) -endif - rm -f $$($(2)_TARGET_INSTALL_STAGING) - rm -f $$($(2)_TARGET_INSTALL_TARGET) - rm -f $$($(2)_TARGET_INSTALL_IMAGES) - rm -f $$($(2)_TARGET_INSTALL_HOST) - -$(1)-reinstall: $(1)-clean-for-reinstall $(1) - -$(1)-clean-for-rebuild: $(1)-clean-for-reinstall - rm -f $$($(2)_TARGET_BUILD) - -$(1)-rebuild: $(1)-clean-for-rebuild $(1) - -$(1)-clean-for-reconfigure: $(1)-clean-for-rebuild - rm -f $$($(2)_TARGET_CONFIGURE) - -$(1)-reconfigure: $(1)-clean-for-reconfigure $(1) - -# define the PKG variable for all targets, containing the -# uppercase package variable prefix -$$($(2)_TARGET_INSTALL_TARGET): PKG=$(2) -$$($(2)_TARGET_INSTALL_STAGING): PKG=$(2) -$$($(2)_TARGET_INSTALL_IMAGES): PKG=$(2) -$$($(2)_TARGET_INSTALL_HOST): PKG=$(2) -$$($(2)_TARGET_BUILD): PKG=$(2) -$$($(2)_TARGET_CONFIGURE): PKG=$(2) -$$($(2)_TARGET_RSYNC): SRCDIR=$$($(2)_OVERRIDE_SRCDIR) -$$($(2)_TARGET_RSYNC): PKG=$(2) -$$($(2)_TARGET_PATCH): PKG=$(2) -$$($(2)_TARGET_PATCH): RAWNAME=$$(patsubst host-%,%,$(1)) -$$($(2)_TARGET_PATCH): PKGDIR=$(pkgdir) -$$($(2)_TARGET_EXTRACT): PKG=$(2) -$$($(2)_TARGET_SOURCE): PKG=$(2) -$$($(2)_TARGET_SOURCE): PKGDIR=$(pkgdir) -$$($(2)_TARGET_ACTUAL_SOURCE): PKG=$(2) -$$($(2)_TARGET_ACTUAL_SOURCE): PKGDIR=$(pkgdir) -$$($(2)_TARGET_DIRCLEAN): PKG=$(2) - -# Compute the name of the Kconfig option that correspond to the -# package being enabled. We handle three cases: the special Linux -# kernel case, the bootloaders case, and the normal packages case. -ifeq ($(1),linux) -$(2)_KCONFIG_VAR = BR2_LINUX_KERNEL -else ifneq ($$(filter boot/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/boot/%),$(pkgdir)),) -$(2)_KCONFIG_VAR = BR2_TARGET_$(2) -else ifneq ($$(filter toolchain/% $$(foreach dir,$$(BR2_EXTERNAL_DIRS),$$(dir)/toolchain/%),$(pkgdir)),) -$(2)_KCONFIG_VAR = BR2_$(2) -else -$(2)_KCONFIG_VAR = BR2_PACKAGE_$(2) -endif - -# legal-info: declare dependencies and set values used later for the manifest -ifneq ($$($(2)_LICENSE_FILES),) -$(2)_MANIFEST_LICENSE_FILES = $$($(2)_LICENSE_FILES) -endif - -# We need to extract and patch a package to be able to retrieve its -# license files (if any) and the list of patches applied to it (if -# any). -$(1)-legal-info: $(1)-patch - -# We only save the sources of packages we want to redistribute, that are -# non-overriden (local or true override). -ifeq ($$($(2)_REDISTRIBUTE),YES) -ifeq ($$($(2)_OVERRIDE_SRCDIR),) -# Packages that have a tarball need it downloaded beforehand -$(1)-legal-info: $(1)-source $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) -endif -endif - -# legal-info: produce legally relevant info. -$(1)-legal-info: -# Packages without a source are assumed to be part of Buildroot, skip them. - $$(foreach hook,$$($(2)_PRE_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) -ifneq ($$(call qstrip,$$($(2)_SOURCE)),) - -# Save license files if defined -# We save the license files for any kind of package: normal, local, -# overridden, or non-redistributable alike. -# The reason to save license files even for no-redistribute packages -# is that the license still applies to the files distributed as part -# of the rootfs, even if the sources are not themselves redistributed. -ifeq ($$(call qstrip,$$($(2)_LICENSE_FILES)),) - @$$(call legal-warning-pkg,$$($(2)_RAW_BASE_NAME),cannot save license ($(2)_LICENSE_FILES not defined)) -else - @$$(foreach F,$$($(2)_LICENSE_FILES),$$(call legal-license-file,$$($(2)_RAW_BASE_NAME),$$(F),$$($(2)_DIR)/$$(F),$$(call UPPERCASE,$(4)))$$(sep)) -endif # license files - -ifeq ($$($(2)_SITE_METHOD),local) -# Packages without a tarball: don't save and warn - @$$(call legal-warning-nosource,$$($(2)_RAWNAME),local) - -else ifneq ($$($(2)_OVERRIDE_SRCDIR),) - @$$(call legal-warning-nosource,$$($(2)_RAWNAME),override) - -else -# Other packages - -ifeq ($$($(2)_REDISTRIBUTE),YES) -# Save the source tarball and any extra downloads, but not -# patches, as they are handled specially afterwards. - $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ - $$(Q)support/scripts/hardlink-or-copy \ - $$(DL_DIR)/$$(e) \ - $$($(2)_REDIST_SOURCES_DIR)$$(sep)) -# Save patches and generate the series file - $$(Q)while read f; do \ - support/scripts/hardlink-or-copy \ - $$$${f} \ - $$($(2)_REDIST_SOURCES_DIR) || exit 1; \ - printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \ - done <$$($(2)_DIR)/.applied_patches_list -endif # redistribute - -endif # other packages - @$$(call legal-manifest,$$($(2)_RAWNAME),$$($(2)_VERSION),$$($(2)_LICENSE),$$($(2)_MANIFEST_LICENSE_FILES),$$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_ACTUAL_SOURCE_SITE),$$(call UPPERCASE,$(4))) -endif # ifneq ($$(call qstrip,$$($(2)_SOURCE)),) - $$(foreach hook,$$($(2)_POST_LEGAL_INFO_HOOKS),$$(call $$(hook))$$(sep)) - -# add package to the general list of targets if requested by the buildroot -# configuration -ifeq ($$($$($(2)_KCONFIG_VAR)),y) - -# Ensure the calling package is the declared provider for all the virtual -# packages it claims to be an implementation of. -ifneq ($$($(2)_PROVIDES),) -$$(foreach pkg,$$($(2)_PROVIDES),\ - $$(eval $$(call virt-provides-single,$$(pkg),$$(call UPPERCASE,$$(pkg)),$(1))$$(sep))) -endif - -# Register package as a reverse-dependencies of all its dependencies -$$(eval $$(foreach p,$$($(2)_FINAL_ALL_DEPENDENCIES),\ - $$(call UPPERCASE,$$(p))_RDEPENDENCIES += $(1)$$(sep))) - -# Ensure unified variable name conventions between all packages Some -# of the variables are used by more than one infrastructure; so, -# rather than duplicating the checks in each infrastructure, we check -# all variables here in pkg-generic, even though pkg-generic should -# have no knowledge of infra-specific variables. -$(eval $(call check-deprecated-variable,$(2)_MAKE_OPT,$(2)_MAKE_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_INSTALL_OPT,$(2)_INSTALL_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_INSTALL_TARGET_OPT,$(2)_INSTALL_TARGET_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_INSTALL_STAGING_OPT,$(2)_INSTALL_STAGING_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_INSTALL_HOST_OPT,$(2)_INSTALL_HOST_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_AUTORECONF_OPT,$(2)_AUTORECONF_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_CONF_OPT,$(2)_CONF_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_BUILD_OPT,$(2)_BUILD_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_GETTEXTIZE_OPT,$(2)_GETTEXTIZE_OPTS)) -$(eval $(call check-deprecated-variable,$(2)_KCONFIG_OPT,$(2)_KCONFIG_OPTS)) - -PACKAGES += $(1) - -ifneq ($$($(2)_PERMISSIONS),) -PACKAGES_PERMISSIONS_TABLE += $$($(2)_PERMISSIONS)$$(sep) -endif -ifneq ($$($(2)_DEVICES),) -PACKAGES_DEVICES_TABLE += $$($(2)_DEVICES)$$(sep) -endif -ifneq ($$($(2)_USERS),) -PACKAGES_USERS += $$($(2)_USERS)$$(sep) -endif -TARGET_FINALIZE_HOOKS += $$($(2)_TARGET_FINALIZE_HOOKS) - -ifeq ($$($(2)_SITE_METHOD),svn) -DL_TOOLS_DEPENDENCIES += svn -else ifeq ($$($(2)_SITE_METHOD),git) -DL_TOOLS_DEPENDENCIES += git -else ifeq ($$($(2)_SITE_METHOD),bzr) -DL_TOOLS_DEPENDENCIES += bzr -else ifeq ($$($(2)_SITE_METHOD),scp) -DL_TOOLS_DEPENDENCIES += scp ssh -else ifeq ($$($(2)_SITE_METHOD),hg) -DL_TOOLS_DEPENDENCIES += hg -else ifeq ($$($(2)_SITE_METHOD),cvs) -DL_TOOLS_DEPENDENCIES += cvs -endif # SITE_METHOD - -DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) - -# Ensure all virtual targets are PHONY. Listed alphabetically. -.PHONY: $(1) \ - $(1)-all-external-deps \ - $(1)-all-legal-info \ - $(1)-all-source \ - $(1)-all-source-check \ - $(1)-build \ - $(1)-clean-for-rebuild \ - $(1)-clean-for-reconfigure \ - $(1)-clean-for-reinstall \ - $(1)-configure \ - $(1)-depends \ - $(1)-dirclean \ - $(1)-external-deps \ - $(1)-extract \ - $(1)-graph-depends \ - $(1)-install \ - $(1)-install-host \ - $(1)-install-images \ - $(1)-install-staging \ - $(1)-install-target \ - $(1)-legal-info \ - $(1)-legal-source \ - $(1)-patch \ - $(1)-rebuild \ - $(1)-reconfigure \ - $(1)-reinstall \ - $(1)-rsync \ - $(1)-show-depends \ - $(1)-show-version \ - $(1)-source \ - $(1)-source-check - -ifneq ($$($(2)_SOURCE),) -ifeq ($$($(2)_SITE),) -$$(error $(2)_SITE cannot be empty when $(2)_SOURCE is not) -endif -endif - -ifeq ($$(patsubst %/,ERROR,$$($(2)_SITE)),ERROR) -$$(error $(2)_SITE ($$($(2)_SITE)) cannot have a trailing slash) -endif - -ifneq ($$($(2)_HELP_CMDS),) -HELP_PACKAGES += $(2) -endif - -endif # $(2)_KCONFIG_VAR -endef # inner-generic-package - -################################################################################ -# generic-package -- the target generator macro for generic packages -################################################################################ - -# In the case of target packages, keep the package name "pkg" -generic-package = $(call inner-generic-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -# In the case of host packages, turn the package name "pkg" into "host-pkg" -host-generic-package = $(call inner-generic-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) - -# :mode=makefile: diff --git a/package.bak/pkg-kconfig.mk b/package.bak/pkg-kconfig.mk deleted file mode 100644 index 215f01b430..0000000000 --- a/package.bak/pkg-kconfig.mk +++ /dev/null @@ -1,243 +0,0 @@ -################################################################################ -# Kconfig package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for packages that use kconfig for configuration files. -# It is based on the generic-package infrastructure, and inherits all of its -# features. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure. -# -################################################################################ - -################################################################################ -# inner-kconfig-package -- generates the make targets needed to support a -# kconfig package -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-kconfig-package - -# Call the generic package infrastructure to generate the necessary -# make targets. -# Note: this must be done _before_ attempting to use $$($(2)_DIR) in a -# dependency expression -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -# Default values -$(2)_KCONFIG_EDITORS ?= menuconfig -$(2)_KCONFIG_OPTS ?= -$(2)_KCONFIG_FIXUP_CMDS ?= -$(2)_KCONFIG_FRAGMENT_FILES ?= -$(2)_KCONFIG_DOTCONFIG ?= .config - -# The config file as well as the fragments could be in-tree, so before -# depending on them the package should be extracted (and patched) first. -# -# Since those files only have a order-only dependency, make would treat -# any missing one as a "force" target: -# https://www.gnu.org/software/make/manual/make.html#Force-Targets -# and would forcibly any rule that depend on those files, causing a -# rebuild of the kernel each time make is called. -# -# So, we provide a recipe that checks all of those files exist, to -# overcome that standard make behaviour. -# -$$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES): | $(1)-patch - for f in $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES); do \ - if [ ! -f "$$$${f}" ]; then \ - printf "Kconfig fragment '%s' for '%s' does not exist\n" "$$$${f}" "$(1)"; \ - exit 1; \ - fi; \ - done - -$(2)_KCONFIG_MAKE = \ - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) $$($(2)_KCONFIG_OPTS) - -# $(2)_KCONFIG_MAKE may already rely on shell expansion. As the $() syntax -# of the shell conflicts with Make's own syntax, this means that backticks -# are used with those shell constructs. Unfortunately, the backtick syntax -# does not nest, and we need to use Make instead of the shell to handle -# conditions. - -# A recursively expanded variable is necessary, to be sure that the shell -# command is called when the rule is processed during the build and not -# when the rule is created when parsing all packages. -$(2)_KCONFIG_RULES = \ - $$(shell $$($(2)_KCONFIG_MAKE) -pn config 2>/dev/null | \ - sed 's/^\([_0-9a-zA-Z]*config\):.*/\1/ p; d') - -# The correct way to regenerate a .config file is to use 'make olddefconfig'. -# For historical reasons, the target name is 'oldnoconfig' between Linux kernel -# versions 2.6.36 and 3.6, and remains as an alias in later versions. -# In older versions, and in some other projects that use kconfig, the target is -# not supported at all, and we use 'yes "" | make oldconfig' as a fallback -# only, as this can fail in complex cases. -define $(2)_REGEN_DOT_CONFIG - $$(if $$(filter olddefconfig,$$($(2)_KCONFIG_RULES)), - $$(Q)$$($(2)_KCONFIG_MAKE) olddefconfig, - $$(if $$(filter oldnoconfig,$$($(2)_KCONFIG_RULES)), - $$(Q)$$($(2)_KCONFIG_MAKE) oldnoconfig, - $$(Q)(yes "" | $$($(2)_KCONFIG_MAKE) oldconfig))) -endef - -# The specified source configuration file and any additional configuration file -# fragments are merged together to .config, after the package has been patched. -# Since the file could be a defconfig file it needs to be expanded to a -# full .config first. -$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): $$($(2)_KCONFIG_FILE) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$(Q)$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - $$($(2)_KCONFIG_MAKE) $$($(2)_KCONFIG_DEFCONFIG), \ - $$(INSTALL) -m 0644 -D $$($(2)_KCONFIG_FILE) $$(@)) - $$(Q)support/kconfig/merge_config.sh -m -O $$(@D) \ - $$(@) $$($(2)_KCONFIG_FRAGMENT_FILES) - $$($(2)_REGEN_DOT_CONFIG) - -# If _KCONFIG_FILE or _KCONFIG_FRAGMENT_FILES exists, this dependency is -# already implied, but if we only have a _KCONFIG_DEFCONFIG we have to add -# it explicitly. It doesn't hurt to always have it though. -$$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG): | $(1)-patch - -# In order to get a usable, consistent configuration, some fixup may be needed. -# The exact rules are specified by the package .mk file. -define $(2)_FIXUP_DOT_CONFIG - $$($(2)_KCONFIG_FIXUP_CMDS) - $$($(2)_REGEN_DOT_CONFIG) - $$(Q)touch $$($(2)_DIR)/.stamp_kconfig_fixup_done -endef - -$$($(2)_DIR)/.stamp_kconfig_fixup_done: $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) - $$($(2)_FIXUP_DOT_CONFIG) - -# Before running configure, the configuration file should be present and fixed -$$($(2)_TARGET_CONFIGURE): $$($(2)_DIR)/.stamp_kconfig_fixup_done - -# Force olddefconfig again on -reconfigure -$(1)-clean-for-reconfigure: $(1)-clean-kconfig-for-reconfigure - -$(1)-clean-kconfig-for-reconfigure: - rm -f $$($(2)_DIR)/.stamp_kconfig_fixup_done - -# Only enable the foo-*config targets when the package is actually enabled. -# Note: the variable $(2)_KCONFIG_VAR is not related to the kconfig -# infrastructure, but defined by pkg-generic.mk. The generic infrastructure is -# already called above, so we can effectively use this variable. -ifeq ($$($$($(2)_KCONFIG_VAR)),y) - -ifeq ($$(BR_BUILDING),y) -# Either FOO_KCONFIG_FILE or FOO_KCONFIG_DEFCONFIG is required... -ifeq ($$(or $$($(2)_KCONFIG_FILE),$$($(2)_KCONFIG_DEFCONFIG)),) -$$(error Internal error: no value specified for $(2)_KCONFIG_FILE or $(2)_KCONFIG_DEFCONFIG) -endif -# ... but not both: -ifneq ($$(and $$($(2)_KCONFIG_FILE),$$($(2)_KCONFIG_DEFCONFIG)),) -$$(error Internal error: $(2)_KCONFIG_FILE and $(2)_KCONFIG_DEFCONFIG are mutually exclusive but both are defined) -endif -endif - -# For the configurators, we do want to use the system-provided host -# tools, not the ones we build. This is particularly true for -# pkg-config; if we use our pkg-config (from host-pkgconf), then it -# would not look for the .pc from the host, but we do need them, -# especially to find ncurses, GTK+, Qt (resp. for menuconfig and -# nconfig, gconfig, xconfig). -# So we simply remove our PATH and PKG_CONFIG_* variables. -$(2)_CONFIGURATOR_MAKE_ENV = \ - $$(filter-out PATH=% PKG_CONFIG=% PKG_CONFIG_SYSROOT_DIR=% PKG_CONFIG_LIBDIR=%,$$($(2)_MAKE_ENV)) \ - PKG_CONFIG_PATH="$(HOST_PKG_CONFIG_PATH)" - -# Configuration editors (menuconfig, ...) -# -# We need to apply the configuration fixups right after a configuration -# editor exits, so that it is possible to save the configuration right -# after exiting an editor, and so the user always sees a .config file -# that is clean wrt. our requirements. -# -# Because commands in $(1)_FIXUP_KCONFIG are probably using $(@D), we -# need to have a valid @D set. But, because the configurators rules are -# not real files and do not contain the path to the package build dir, -# @D would be just '.' in this case. So, we use an intermediate rule -# with a stamp-like file which path is in the package build dir, so we -# end up having a valid @D. -# -$$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)): $(1)-%: $$($(2)_DIR)/.kconfig_editor_% -$$($(2)_DIR)/.kconfig_editor_%: $$($(2)_DIR)/.stamp_kconfig_fixup_done - $$($(2)_CONFIGURATOR_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) $$(*) - rm -f $$($(2)_DIR)/.stamp_{kconfig_fixup_done,configured,built} - rm -f $$($(2)_DIR)/.stamp_{target,staging,images}_installed - $$($(2)_FIXUP_DOT_CONFIG) - -# Saving back the configuration -# -# Ideally, that should directly depend on $$($(2)_DIR)/.stamp_kconfig_fixup_done, -# but that breaks the use-case in PR-8156 (from a clean tree): -# make menuconfig <- enable kernel, use an in-tree defconfig, save and exit -# make linux-menuconfig <- enable/disable whatever option, save and exit -# make menuconfig <- change to use a custom defconfig file, set a path, save and exit -# make linux-update-config <- should save to the new custom defconfig file -# -# Because of that use-case, saving the configuration can *not* directly -# depend on the stamp file, because it itself depends on the .config, -# which in turn depends on the (newly-set an non-existent) custom -# defconfig file. -# -# Instead, we use an PHONY rule that will catch that situation. -# -$(1)-check-configuration-done: - @if [ ! -f $$($(2)_DIR)/.stamp_kconfig_fixup_done ]; then \ - echo "$(1) is not yet configured"; \ - exit 1; \ - fi - -$(1)-savedefconfig: $(1)-check-configuration-done - $$($(2)_MAKE_ENV) $$(MAKE) -C $$($(2)_DIR) \ - $$($(2)_KCONFIG_OPTS) savedefconfig - -# Target to copy back the configuration to the source configuration file -# Even though we could use 'cp --preserve-timestamps' here, the separate -# cp and 'touch --reference' is used for symmetry with $(1)-update-defconfig. -$(1)-update-config: $(1)-check-configuration-done - @$$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \ - echo "Unable to perform $(1)-update-config when fragment files are set"; exit 1) - @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - echo "Unable to perform $(1)-update-config when using a defconfig rule"; exit 1) - cp -f $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) - -# Note: make sure the timestamp of the stored configuration is not newer than -# the .config to avoid a useless rebuild. Note that, contrary to -# $(1)-update-config, the reference for 'touch' is _not_ the file from which -# we copy. -$(1)-update-defconfig: $(1)-savedefconfig - @$$(if $$($(2)_KCONFIG_FRAGMENT_FILES), \ - echo "Unable to perform $(1)-update-defconfig when fragment files are set"; exit 1) - @$$(if $$($(2)_KCONFIG_DEFCONFIG), \ - echo "Unable to perform $(1)-update-defconfig when using a defconfig rule"; exit 1) - cp -f $$($(2)_DIR)/defconfig $$($(2)_KCONFIG_FILE) - touch --reference $$($(2)_DIR)/$$($(2)_KCONFIG_DOTCONFIG) $$($(2)_KCONFIG_FILE) - -endif # package enabled - -.PHONY: \ - $(1)-update-config \ - $(1)-update-defconfig \ - $(1)-savedefconfig \ - $(1)-check-configuration-done \ - $$($(2)_DIR)/.kconfig_editor_% \ - $$(addprefix $(1)-,$$($(2)_KCONFIG_EDITORS)) - -endef # inner-kconfig-package - -################################################################################ -# kconfig-package -- the target generator macro for kconfig packages -################################################################################ - -kconfig-package = $(call inner-kconfig-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) diff --git a/package.bak/pkg-kernel-module.mk b/package.bak/pkg-kernel-module.mk deleted file mode 100644 index 200c91dfef..0000000000 --- a/package.bak/pkg-kernel-module.mk +++ /dev/null @@ -1,101 +0,0 @@ -################################################################################ -# kernel module infrastructure for building Linux kernel modules -# -# This file implements an infrastructure that eases development of package -# .mk files for out-of-tree Linux kernel modules. It should be used for all -# packages that build a Linux kernel module using the kernel's out-of-tree -# buildsystem, unless they use a complex custom buildsystem. -# -# The kernel-module infrastructure requires the packages that use it to also -# use another package infrastructure. kernel-module only defines post-build -# and post-install hooks. This allows the package to build both kernel -# modules and/or user-space components (with any of the other *-package -# infra). -# -# As such, it is to be used in conjunction with another *-package infra, -# like so: -# -# $(eval $(kernel-module)) -# $(eval $(generic-package)) -# -# Note: if the caller needs access to the kernel modules (either after they -# are built or after they are installed), it will have to define its own -# post-build/install hooks *after* calling kernel-module, but *before* -# calling the other *-package infra, like so: -# -# $(eval $(kernel-module)) -# define FOO_MOD_TWEAK -# # do something -# endef -# FOO_POST_BUILD_HOOKS += FOO_MOD_TWEAK -# $(eval $(generic-package)) -# -# Note: this infra does not check that the kernel is enabled; it is expected -# to be enforced at the Kconfig level with proper 'depends on'. -################################################################################ - -################################################################################ -# inner-kernel-module -- generates the make targets needed to support building -# a kernel module -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name -################################################################################ - -define inner-kernel-module - -# If the package is enabled, ensure the kernel will support modules -ifeq ($$(BR2_PACKAGE_$(2)),y) -LINUX_NEEDS_MODULES = y -endif - -# The kernel must be built first. -$(2)_DEPENDENCIES += linux - -# This is only defined in some infrastructures (e.g. autotools, cmake), -# but not in others (e.g. generic). So define it here as well. -$(2)_MAKE ?= $$(MAKE) - -# If not specified, consider the source of the kernel module to be at -# the root of the package. -$(2)_MODULE_SUBDIRS ?= . - -# Build the kernel module(s) -# Force PWD for those packages that want to use it to find their -# includes and other support files (Booo!) -define $(2)_KERNEL_MODULES_BUILD - @$$(call MESSAGE,"Building kernel module(s)") - $$(foreach d,$$($(2)_MODULE_SUBDIRS), \ - $$(LINUX_MAKE_ENV) $$($$(PKG)_MAKE) \ - -C $$(LINUX_DIR) \ - $$(LINUX_MAKE_FLAGS) \ - $$($(2)_MODULE_MAKE_OPTS) \ - PWD=$$(@D)/$$(d) \ - M=$$(@D)/$$(d) \ - modules$$(sep)) -endef -$(2)_POST_BUILD_HOOKS += $(2)_KERNEL_MODULES_BUILD - -# Install the kernel module(s) -# Force PWD for those packages that want to use it to find their -# includes and other support files (Booo!) -define $(2)_KERNEL_MODULES_INSTALL - @$$(call MESSAGE,"Installing kernel module(s)") - $$(foreach d,$$($(2)_MODULE_SUBDIRS), \ - $$(LINUX_MAKE_ENV) $$($$(PKG)_MAKE) \ - -C $$(LINUX_DIR) \ - $$(LINUX_MAKE_FLAGS) \ - $$($(2)_MODULE_MAKE_OPTS) \ - PWD=$$(@D)/$$(d) \ - M=$$(@D)/$$(d) \ - modules_install$$(sep)) -endef -$(2)_POST_INSTALL_TARGET_HOOKS += $(2)_KERNEL_MODULES_INSTALL - -endef - -################################################################################ -# kernel-module -- the target generator macro for kernel module packages -################################################################################ - -kernel-module = $(call inner-kernel-module,$(pkgname),$(call UPPERCASE,$(pkgname))) diff --git a/package.bak/pkg-luarocks.mk b/package.bak/pkg-luarocks.mk deleted file mode 100644 index da5c912c81..0000000000 --- a/package.bak/pkg-luarocks.mk +++ /dev/null @@ -1,81 +0,0 @@ -################################################################################ -# LuaRocks package infrastructure -# see http://luarocks.org/ -# -# This file implements an infrastructure that eases development of -# package .mk files for LuaRocks packages. -# LuaRocks supports various build.type : builtin, make, cmake. -# This luarocks infrastructure supports only the builtin mode, -# the make & cmake modes could be directly handled by generic & cmake infrastructure. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this LuaRocks infrastructure requires -# the .mk file to only specify metadata information about the -# package: name, version, etc. -# -################################################################################ - -################################################################################ -# inner-luarocks-package -- defines how the configuration, compilation and -# installation of a LuaRocks package should be done, implements a few hooks to -# tune the build process and calls the generic package infrastructure to -# generate the necessary make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-luarocks-package - -$(2)_BUILD_OPTS ?= -$(2)_SUBDIR ?= $(1)-$$(shell echo "$$($(3)_VERSION)" | sed -e "s/-[0-9]$$$$//") -$(2)_ROCKSPEC ?= $(1)-$$($(3)_VERSION).rockspec -$(2)_SOURCE ?= $(1)-$$($(3)_VERSION).src.rock -$(2)_SITE ?= $$(call qstrip,$$(BR2_LUAROCKS_MIRROR)) - -# Since we do not support host-luarocks-package, we know this is -# a target package, and can just add the required dependencies -$(2)_DEPENDENCIES += host-luarocks luainterpreter - -# -# Extract step -# -ifndef $(2)_EXTRACT_CMDS -define $(2)_EXTRACT_CMDS - cd $$($(2)_DIR)/.. && \ - $$(LUAROCKS_RUN_ENV) $$(LUAROCKS_RUN_CMD) unpack --force $$(DL_DIR)/$$($(2)_SOURCE) -endef -endif - -# -# Build/install step. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - cd $$($(2)_SRCDIR) && $$(LUAROCKS_RUN_ENV) flock $$(TARGET_DIR) \ - $$(LUAROCKS_RUN_CMD) make --keep $$($(2)_ROCKSPEC) $$($(2)_BUILD_OPTS) -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -# $(2)_DEPENDENCIES are handled for configure step (too late) -# but host-luarocks is required to do the extract -$$($(2)_TARGET_EXTRACT): | host-luarocks - -endef - -################################################################################ -# luarocks-package -- the target generator macro for LuaRocks packages -################################################################################ - -luarocks-package = $(call inner-luarocks-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -# host-luarocks-package not supported diff --git a/package.bak/pkg-perl.mk b/package.bak/pkg-perl.mk deleted file mode 100644 index cc94cd9f8b..0000000000 --- a/package.bak/pkg-perl.mk +++ /dev/null @@ -1,207 +0,0 @@ -################################################################################ -# Perl package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for Perl packages. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this perl infrastructure requires -# the .mk file to only specify metadata information about the -# package: name, version, download URL, etc. -# -# We still allow the package .mk file to override what the different -# steps are doing, if needed. For example, if _BUILD_CMDS is -# already defined, it is used as the list of commands to perform to -# build the package, instead of the default perl behaviour. The -# package can also define some post operation hooks. -# -################################################################################ - -PERL_ARCHNAME = $(ARCH)-linux -PERL_RUN = PERL5LIB= PERL_USE_UNSAFE_INC=1 $(HOST_DIR)/usr/bin/perl - -################################################################################ -# inner-perl-package -- defines how the configuration, compilation and -# installation of a perl package should be done, implements a -# few hooks to tune the build process for perl specifities and -# calls the generic package infrastructure to generate the necessary -# make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-perl-package - -# Target packages need both the perl interpreter on the target (for -# runtime) and the perl interpreter on the host (for -# compilation). However, host packages only need the perl -# interpreter on the host. -ifeq ($(4),target) -$(2)_DEPENDENCIES += host-perl perl -else -$(2)_DEPENDENCIES += host-perl -endif - -# From http://perldoc.perl.org/CPAN.html#Config-Variables - prefer_installer -# legal values are MB and EUMM: if a module comes -# with both a Makefile.PL and a Build.PL, use the -# former (EUMM) or the latter (MB); if the module -# comes with only one of the two, that one will be -# used no matter the setting -$(2)_PREFER_INSTALLER ?= MB - -# -# Configure step. Only define it if not already defined by the package -# .mk file. And take care of the differences between host and target -# packages. -# -ifndef $(2)_CONFIGURE_CMDS -ifeq ($(4),target) - -# Configure package for target -define $(2)_CONFIGURE_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$($(2)_CONF_ENV) \ - PERL_MM_USE_DEFAULT=1 \ - $$(PERL_RUN) Build.PL \ - --config ar="$$(TARGET_AR)" \ - --config full_ar="$$(TARGET_AR)" \ - --config cc="$$(TARGET_CC)" \ - --config ccflags="$$(TARGET_CFLAGS)" \ - --config optimize=" " \ - --config ld="$$(TARGET_CC)" \ - --config lddlflags="-shared $$(TARGET_LDFLAGS)" \ - --config ldflags="$$(TARGET_LDFLAGS)" \ - --include_dirs $$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \ - --destdir $$(TARGET_DIR) \ - --installdirs vendor \ - --install_path lib=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \ - --install_path arch=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \ - --install_path bin=/usr/bin \ - --install_path script=/usr/bin \ - --install_path bindoc=/usr/share/man/man1 \ - --install_path libdoc=/usr/share/man/man3 \ - $$($(2)_CONF_OPTS); \ - else \ - $$($(2)_CONF_ENV) \ - PERL_MM_USE_DEFAULT=1 \ - PERL_AUTOINSTALL=--skipdeps \ - $$(PERL_RUN) Makefile.PL \ - AR="$$(TARGET_AR)" \ - FULL_AR="$$(TARGET_AR)" \ - CC="$$(TARGET_CC)" \ - CCFLAGS="$$(TARGET_CFLAGS)" \ - OPTIMIZE=" " \ - LD="$$(TARGET_CC)" \ - LDDLFLAGS="-shared $$(TARGET_LDFLAGS)" \ - LDFLAGS="$$(TARGET_LDFLAGS)" \ - DESTDIR=$$(TARGET_DIR) \ - INSTALLDIRS=vendor \ - INSTALLVENDORLIB=/usr/lib/perl5/site_perl/$$(PERL_VERSION) \ - INSTALLVENDORARCH=/usr/lib/perl5/site_perl/$$(PERL_VERSION)/$$(PERL_ARCHNAME) \ - INSTALLVENDORBIN=/usr/bin \ - INSTALLVENDORSCRIPT=/usr/bin \ - INSTALLVENDORMAN1DIR=/usr/share/man/man1 \ - INSTALLVENDORMAN3DIR=/usr/share/man/man3 \ - $$($(2)_CONF_OPTS); \ - fi -endef -else - -# Configure package for host -define $(2)_CONFIGURE_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$($(2)_CONF_ENV) \ - PERL_MM_USE_DEFAULT=1 \ - $$(PERL_RUN) Build.PL \ - $$($(2)_CONF_OPTS); \ - else \ - $$($(2)_CONF_ENV) \ - PERL_MM_USE_DEFAULT=1 \ - PERL_AUTOINSTALL=--skipdeps \ - $$(PERL_RUN) Makefile.PL \ - $$($(2)_CONF_OPTS); \ - fi -endef -endif -endif - -# -# Build step. Only define it if not already defined by the package .mk -# file. And take care of the differences between host and target -# packages. -# -ifndef $(2)_BUILD_CMDS -ifeq ($(4),target) - -# Build package for target -define $(2)_BUILD_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \ - else \ - $$(MAKE1) \ - PERL_INC=$$(STAGING_DIR)/usr/lib/perl5/$$(PERL_VERSION)/$$(PERL_ARCHNAME)/CORE \ - FIXIN=: \ - $$($(2)_BUILD_OPTS) pure_all; \ - fi -endef -else - -# Build package for host -define $(2)_BUILD_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$(PERL_RUN) Build $$($(2)_BUILD_OPTS) build; \ - else \ - $$(MAKE1) $$($(2)_BUILD_OPTS) pure_all; \ - fi -endef -endif -endif - -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \ - else \ - $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \ - fi -endef -endif - -# -# Target installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - cd $$($$(PKG)_SRCDIR) && if [ -f Build.PL ] && [ $$($(2)_PREFER_INSTALLER) != "EUMM" ] ; then \ - $$(PERL_RUN) Build $$($(2)_INSTALL_TARGET_OPTS) install; \ - else \ - $$(MAKE1) $$($(2)_INSTALL_TARGET_OPTS) pure_install; \ - fi -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# perl-package -- the target generator macro for Perl packages -################################################################################ - -perl-package = $(call inner-perl-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-perl-package = $(call inner-perl-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package.bak/pkg-python.mk b/package.bak/pkg-python.mk deleted file mode 100644 index 38bc45ffa3..0000000000 --- a/package.bak/pkg-python.mk +++ /dev/null @@ -1,272 +0,0 @@ -################################################################################ -# Python package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for Python packages. It should be used for all -# packages that use Python setup.py/setuptools as their build system. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this Python infrastructure requires the -# .mk file to only specify metadata information about the package: -# name, version, download URL, etc. -# -# We still allow the package .mk file to override what the different -# steps are doing, if needed. For example, if _BUILD_CMDS is -# already defined, it is used as the list of commands to perform to -# build the package, instead of the default Python behaviour. The -# package can also define some post operation hooks. -# -################################################################################ - -# Target distutils-based packages -PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - LDSHARED="$(TARGET_CROSS)gcc -shared" \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr - -PKG_PYTHON_DISTUTILS_BUILD_OPTS = \ - --executable=/usr/bin/python - -PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS = \ - --prefix=$(TARGET_DIR)/usr - -PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS = \ - --prefix=$(STAGING_DIR)/usr - -# Host distutils-based packages -HOST_PKG_PYTHON_DISTUTILS_ENV = \ - PATH=$(BR_PATH) - -HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS = \ - --prefix=$(HOST_DIR)/usr - -# Target setuptools-based packages -PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) \ - PYTHONPATH="$(if $(BR2_PACKAGE_PYTHON3),$(PYTHON3_PATH),$(PYTHON_PATH))" \ - _python_sysroot=$(STAGING_DIR) \ - _python_prefix=/usr \ - _python_exec_prefix=/usr - -PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS = \ - --prefix=$(TARGET_DIR)/usr \ - --executable=/usr/bin/python \ - --single-version-externally-managed \ - --root=/ - -PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS = \ - --prefix=$(STAGING_DIR)/usr \ - --executable=/usr/bin/python \ - --single-version-externally-managed \ - --root=/ - -# Host setuptools-based packages -HOST_PKG_PYTHON_SETUPTOOLS_ENV = \ - PATH=$(BR_PATH) - -HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS = \ - --prefix=$(HOST_DIR)/usr - -################################################################################ -# inner-python-package -- defines how the configuration, compilation -# and installation of a Python package should be done, implements a -# few hooks to tune the build process and calls the generic package -# infrastructure to generate the necessary make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-python-package - -$(2)_SRCDIR = $$($(2)_DIR)/$$($(2)_SUBDIR) -$(2)_BUILDDIR = $$($(2)_SRCDIR) - -$(2)_ENV ?= -$(2)_BUILD_OPTS ?= -$(2)_INSTALL_OPTS ?= - -ifndef $(2)_SETUP_TYPE - ifdef $(3)_SETUP_TYPE - $(2)_SETUP_TYPE = $$($(3)_SETUP_TYPE) - else - $$(error "$(2)_SETUP_TYPE must be set") - endif -endif - -# Distutils -ifeq ($$($(2)_SETUP_TYPE),distutils) -ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = $$(PKG_PYTHON_DISTUTILS_BUILD_OPTS) -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_DISTUTILS_INSTALL_STAGING_OPTS) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_DISTUTILS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS) -endif -# Setuptools -else ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifeq ($(4),target) -$(2)_BASE_ENV = $$(PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = -$(2)_BASE_INSTALL_TARGET_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_TARGET_OPTS) -$(2)_BASE_INSTALL_STAGING_OPTS = $$(PKG_PYTHON_SETUPTOOLS_INSTALL_STAGING_OPTS) -else -$(2)_BASE_ENV = $$(HOST_PKG_PYTHON_SETUPTOOLS_ENV) -$(2)_BASE_BUILD_TGT = build -$(2)_BASE_BUILD_OPTS = -$(2)_BASE_INSTALL_OPTS = $$(HOST_PKG_PYTHON_SETUPTOOLS_INSTALL_OPTS) -endif -else -$$(error "Invalid $(2)_SETUP_TYPE. Valid options are 'distutils' or 'setuptools'") -endif - -# Target packages need both the python interpreter on the target (for -# runtime) and the python interpreter on the host (for -# compilation). However, host packages only need the python -# interpreter on the host, whose version may be enforced by setting -# the *_NEEDS_HOST_PYTHON variable. -# -# So: -# - for target packages, we always depend on the default python interpreter -# (the one selected by the config); -# - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we depend on use the default -# interperter; -# - otherwise, we depend on the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3 python3,host-python python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_DEPENDENCIES += $$(if $$(BR2_PACKAGE_PYTHON3),host-python3,host-python) -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),python2) -$(2)_DEPENDENCIES += host-python -else ifeq ($$($(2)_NEEDS_HOST_PYTHON),python3) -$(2)_DEPENDENCIES += host-python3 -else -$$(error Incorrect value '$$($(2)_NEEDS_HOST_PYTHON)' for $(2)_NEEDS_HOST_PYTHON) -endif -endif # ($$($(2)_NEEDS_HOST_PYTHON),) -endif # ($(4),target) - -# Setuptools based packages will need host-python-setuptools (both -# host and target). We need to have a special exclusion for the -# host-setuptools package itself: it is setuptools-based, but -# shouldn't depend on host-setuptools (because it would otherwise -# depend on itself!). -ifeq ($$($(2)_SETUP_TYPE),setuptools) -ifneq ($(2),HOST_PYTHON_SETUPTOOLS) -$(2)_DEPENDENCIES += host-python-setuptools -endif -endif - -# Python interpreter to use for building the package. -# -# We may want to specify the python interpreter to be used for building a -# package, especially for host-packages (target packages must be built using -# the same version of the interpreter as the one installed on the target). -# -# So: -# - for target packages, we always use the default python interpreter (which -# is the same version as the one built and installed on the target); -# - for host packages: -# - if *_NEEDS_HOST_PYTHON is not set, then we use use the default -# interperter; -# - otherwise, we use the one requested by *_NEEDS_HOST_PYTHON. -# -ifeq ($(4),target) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python -else -ifeq ($$($(2)_NEEDS_HOST_PYTHON),) -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/python -else -$(2)_PYTHON_INTERPRETER = $$(HOST_DIR)/usr/bin/$$($(2)_NEEDS_HOST_PYTHON) -endif -endif - -# -# Build step. Only define it if not already defined by the package .mk -# file. -# -ifndef $(2)_BUILD_CMDS -define $(2)_BUILD_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py \ - $$($$(PKG)_BASE_BUILD_TGT) \ - $$($$(PKG)_BASE_BUILD_OPTS) $$($$(PKG)_BUILD_OPTS)) -endef -endif - -# -# Host installation step. Only define it if not already defined by the -# package .mk file. -# -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_OPTS) $$($$(PKG)_INSTALL_OPTS)) -endef -endif - -# -# Target installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install --no-compile \ - $$($$(PKG)_BASE_INSTALL_TARGET_OPTS) \ - $$($$(PKG)_INSTALL_TARGET_OPTS)) -endef -endif - -# -# Staging installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_STAGING_CMDS -define $(2)_INSTALL_STAGING_CMDS - (cd $$($$(PKG)_BUILDDIR)/; \ - $$($$(PKG)_BASE_ENV) $$($$(PKG)_ENV) \ - $$($(2)_PYTHON_INTERPRETER) setup.py install \ - $$($$(PKG)_BASE_INSTALL_STAGING_OPTS) \ - $$($$(PKG)_INSTALL_STAGING_OPTS)) -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# python-package -- the target generator macro for Python packages -################################################################################ - -python-package = $(call inner-python-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-python-package = $(call inner-python-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package.bak/pkg-rebar.mk b/package.bak/pkg-rebar.mk deleted file mode 100644 index 7605a64ade..0000000000 --- a/package.bak/pkg-rebar.mk +++ /dev/null @@ -1,241 +0,0 @@ -################################################################################ -# rebar package infrastructure for Erlang packages -# -# This file implements an infrastructure that eases development of -# package .mk files for rebar packages. It should be used for all -# packages that use rebar as their build system. -# -# In terms of implementation, this rebar infrastructure requires the -# .mk file to only specify metadata information about the package: -# name, version, download URL, etc. -# -# We still allow the package .mk file to override what the different -# steps are doing, if needed. For example, if _BUILD_CMDS is -# already defined, it is used as the list of commands to perform to -# build the package, instead of the default rebar behaviour. The -# package can also define some post operation hooks. -# -################################################################################ - -# Directories to store rebar dependencies in. -# -# These directories actually only contain symbolic links to Erlang -# applications in either $(HOST_DIR) or $(STAGING_DIR). One needs -# them to avoid rebar complaining about missing dependencies, as this -# infrastructure tells rebar to NOT download dependencies during -# the build stage. -# -REBAR_HOST_DEPS_DIR = $(HOST_DIR)/usr/share/rebar/deps -REBAR_TARGET_DEPS_DIR = $(STAGING_DIR)/usr/share/rebar/deps - -# Tell rebar where to find the dependencies -# -REBAR_HOST_DEPS_ENV = \ - ERL_COMPILER_OPTIONS='{i, "$(REBAR_HOST_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(HOST_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib -REBAR_TARGET_DEPS_ENV = \ - ERL_COMPILER_OPTIONS='{i, "$(REBAR_TARGET_DEPS_DIR)"}' \ - ERL_EI_LIBDIR=$(STAGING_DIR)/usr/lib/erlang/lib/erl_interface-$(ERLANG_EI_VSN)/lib - -################################################################################ -# Helper functions -################################################################################ - -# Install an Erlang application from $(@D). -# -# i.e., define a recipe that installs the "bin ebin priv $(2)" directories -# from $(@D) to $(1)$($(PKG)_ERLANG_LIBDIR). -# -# argument 1 should typically be $(HOST_DIR), $(TARGET_DIR), -# or $(STAGING_DIR). -# argument 2 is typically empty when installing in $(TARGET_DIR) and -# "include" when installing in $(HOST_DIR) or -# $(STAGING_DIR). -# -# Note: calling this function must be done with $$(call ...) because it -# expands package-related variables. -# -define install-erlang-directories - $(INSTALL) -d $(1)/$($(PKG)_ERLANG_LIBDIR) - for dir in bin ebin priv $(2); do \ - if test -d $(@D)/$$dir; then \ - cp -r $(@D)/$$dir $(1)$($(PKG)_ERLANG_LIBDIR); \ - fi; \ - done -endef - -# Setup a symbolic link in rebar's deps_dir to the actual location -# where an Erlang application is installed. -# -# i.e., define a recipe that creates a symbolic link -# from $($(PKG)_REBAR_DEPS_DIR)/$($(PKG)_ERLANG_APP) -# to $(1)$($(PKG)_ERLANG_LIBDIR). -# -# For target packages for example, one uses this to setup symbolic -# links from $(STAGING_DIR)/usr/share/rebar/deps/ to -# $(STAGING_DIR)/usr/lib/erlang/lib/-. This -# infrastructure points rebar at the former in order to tell rebar to -# NOT download dependencies during the build stage, and instead use -# the already available dependencies. -# -# Therefore, -# argument 1 is $(HOST_DIR) (for host packages) or -# $(STAGING_DIR) (for target packages). -# -# argument 2 is HOST (for host packages) or -# TARGET (for target packages). -# -# Note: calling this function must be done with $$(call ...) because it -# expands package-related variables. -# -define install-rebar-deps - $(INSTALL) -d $(REBAR_$(2)_DEPS_DIR) - ln -f -s $(1)/$($(PKG)_ERLANG_LIBDIR) \ - $(REBAR_$(2)_DEPS_DIR)/$($(PKG)_ERLANG_APP) -endef - -################################################################################ -# inner-rebar-package -- defines how the configuration, compilation -# and installation of a rebar package should be done, implements a few -# hooks to tune the build process according to rebar specifities, and -# calls the generic package infrastructure to generate the necessary -# make targets. -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -# -################################################################################ - -define inner-rebar-package - -# Extract just the raw package name, lowercase without the leading -# erlang- or host- prefix, as this is used by rebar to find the -# dependencies a package specifies. -# -$(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1)))) - -# Path where to store the package's libs, relative to either $(HOST_DIR) -# for host packages, or $(STAGING_DIR) for target packages. -# -$(2)_ERLANG_LIBDIR = \ - /usr/lib/erlang/lib/$$($$(PKG)_ERLANG_APP)-$$($$(PKG)_VERSION) - -# If a host package, inherit _USE_BUNDLED_REBAR from the target -# package, if not explicitly defined. Otherwise, default to NO. -ifndef $(2)_USE_BUNDLED_REBAR - ifdef $(3)_USE_BUNDLED_REBAR - $(2)_USE_BUNDLED_REBAR = $$($(3)_USE_BUNDLED_REBAR) - else - $(2)_USE_BUNDLED_REBAR ?= NO - endif -endif - -# If a host package, inherit _USE_AUTOCONF from the target -# package, if not explicitly defined. Otherwise, default to NO. -ifndef $(2)_USE_AUTOCONF - ifdef $(3)_USE_AUTOCONF - $(2)_USE_AUTOCONF = $$($(3)_USE_AUTOCONF) - else - $(2)_USE_AUTOCONF ?= NO - endif -endif - -# Define the build and install commands -# -ifeq ($(4),target) - -# Target packages need the erlang interpreter on the target -$(2)_DEPENDENCIES += erlang - -# Used only if the package uses autotools underneath; otherwise, ignored -$(2)_CONF_ENV += $$(REBAR_TARGET_DEPS_ENV) - -ifndef $(2)_BUILD_CMDS -define $(2)_BUILD_CMDS - (cd $$(@D); \ - CC="$$(TARGET_CC)" \ - CXX="$$(TARGET_CXX)" \ - CFLAGS="$$(TARGET_CFLAGS)" \ - CXXFLAGS="$$(TARGET_CXXFLAGS)" \ - LDFLAGS="$$(TARGET_LDFLAGS)" \ - $$(REBAR_TARGET_DEPS_ENV) \ - $$(TARGET_MAKE_ENV) \ - $$($$(PKG)_REBAR_ENV) $$($$(PKG)_REBAR) deps_dir=$$(REBAR_TARGET_DEPS_DIR) compile \ - ) -endef -endif - -# We need to double-$ the 'call' because it wants to expand -# package-related variables -ifndef $(2)_INSTALL_STAGING_CMDS -define $(2)_INSTALL_STAGING_CMDS - $$(call install-erlang-directories,$$(STAGING_DIR),include) - $$(call install-rebar-deps,$$(STAGING_DIR),TARGET) -endef -endif - -# We need to double-$ the 'call' because it wants to expand -# package-related variables -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - $$(call install-erlang-directories,$$(TARGET_DIR)) -endef -endif - -else # !target - -# Host packages need the erlang interpreter on the host -$(2)_DEPENDENCIES += host-erlang - -# Used only if the package uses autotools underneath; otherwise, ignored -$(2)_CONF_ENV += $$(REBAR_HOST_DEPS_ENV) - -ifndef $(2)_BUILD_CMDS -define $(2)_BUILD_CMDS - (cd $$(@D); \ - CC="$$(HOSTCC)" \ - CFLAGS="$$(HOST_CFLAGS)" \ - LDFLAGS="$$(HOST_LDFLAGS)" \ - $$(REBAR_HOST_DEPS_ENV) \ - $$(HOST_MAKE_ENV) \ - $$($$(PKG)_REBAR_ENV) $$($$(PKG)_REBAR) deps_dir=$$(REBAR_HOST_DEPS_DIR) compile \ - ) -endef -endif - -# We need to double-$ the 'call' because it wants to expand -# package-related variables -ifndef $(2)_INSTALL_CMDS -define $(2)_INSTALL_CMDS - $$(call install-erlang-directories,$$(HOST_DIR),include) - $$(call install-rebar-deps,$$(HOST_DIR),HOST) -endef -endif - -endif # !target - -# Whether to use the generic rebar or the package's bundled rebar -# -ifeq ($$($(2)_USE_BUNDLED_REBAR),YES) -$(2)_REBAR = ./rebar -else -$(2)_REBAR = rebar -$(2)_DEPENDENCIES += host-erlang-rebar -endif - -# The package sub-infra to use -# -ifeq ($$($(2)_USE_AUTOCONF),YES) -$(call inner-autotools-package,$(1),$(2),$(3),$(4)) -else -$(call inner-generic-package,$(1),$(2),$(3),$(4)) -endif - -endef # inner-rebar-package - -rebar-package = $(call inner-rebar-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-rebar-package = $(call inner-rebar-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package.bak/pkg-utils.mk b/package.bak/pkg-utils.mk deleted file mode 100644 index c95e77953b..0000000000 --- a/package.bak/pkg-utils.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# This file contains various utility functions used by the package -# infrastructure, or by the packages themselves. -# -################################################################################ - -# -# Manipulation of .config files based on the Kconfig -# infrastructure. Used by the BusyBox package, the Linux kernel -# package, and more. -# - -define KCONFIG_ENABLE_OPT # (option, file) - $(SED) "/\\<$(1)\\>/d" $(2) - echo '$(1)=y' >> $(2) -endef - -define KCONFIG_SET_OPT # (option, value, file) - $(SED) "/\\<$(1)\\>/d" $(3) - echo '$(1)=$(2)' >> $(3) -endef - -define KCONFIG_DISABLE_OPT # (option, file) - $(SED) "/\\<$(1)\\>/d" $(2) - echo '# $(1) is not set' >> $(2) -endef - -# Helper functions to determine the name of a package and its -# directory from its makefile directory, using the $(MAKEFILE_LIST) -# variable provided by make. This is used by the *-package macros to -# automagically find where the package is located. -pkgdir = $(dir $(lastword $(MAKEFILE_LIST))) -pkgname = $(lastword $(subst /, ,$(pkgdir))) - -# Define extractors for different archive suffixes -INFLATE.bz2 = $(BZCAT) -INFLATE.gz = $(ZCAT) -INFLATE.lz = $(LZCAT) -INFLATE.lzma = $(XZCAT) -INFLATE.tbz = $(BZCAT) -INFLATE.tbz2 = $(BZCAT) -INFLATE.tgz = $(ZCAT) -INFLATE.xz = $(XZCAT) -INFLATE.tar = cat -# suitable-extractor(filename): returns extractor based on suffix -suitable-extractor = $(INFLATE$(suffix $(1))) - -# extractor-dependency(filename): returns extractor for 'filename' if the -# extractor is a dependency. If we build the extractor return nothing. -# $(firstword) is used here because the extractor can have arguments, like -# ZCAT="gzip -d -c", and to check for the dependency we only want 'gzip'. -extractor-dependency = $(firstword $(INFLATE$(filter-out \ - $(EXTRACTOR_DEPENDENCY_PRECHECKED_EXTENSIONS),$(suffix $(1))))) - -# check-deprecated-variable -- throw an error on deprecated variables -# example: -# $(eval $(call check-deprecated-variable,FOO_MAKE_OPT,FOO_MAKE_OPTS)) -define check-deprecated-variable # (deprecated var, new var) -ifneq ($$(origin $(1)),undefined) -$$(error Package error: use $(2) instead of $(1). Please fix your .mk file) -endif -endef - -# -# legal-info helper functions -# -LEGAL_INFO_SEPARATOR = "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::" - -define legal-warning # text - echo "WARNING: $(1)" >>$(LEGAL_WARNINGS) -endef - -define legal-warning-pkg # pkg, text - echo "WARNING: $(1): $(2)" >>$(LEGAL_WARNINGS) -endef - -define legal-warning-nosource # pkg, {local|override} - $(call legal-warning-pkg,$(1),sources not saved ($(2) packages not handled)) -endef - -define legal-manifest # pkg, version, license, license-files, source, url, {HOST|TARGET} - echo '"$(1)","$(2)","$(3)","$(4)","$(5)","$(6)"' >>$(LEGAL_MANIFEST_CSV_$(7)) -endef - -define legal-license-file # pkg, filename, file-fullpath, {HOST|TARGET} - mkdir -p $(LICENSE_FILES_DIR_$(4))/$(1)/$(dir $(2)) && \ - cp $(3) $(LICENSE_FILES_DIR_$(4))/$(1)/$(2) -endef diff --git a/package.bak/pkg-virtual.mk b/package.bak/pkg-virtual.mk deleted file mode 100644 index 2e83e077e0..0000000000 --- a/package.bak/pkg-virtual.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# Virtual package infrastructure -# -# This file implements an infrastructure that eases development of -# package .mk files for virtual packages. It should be used for all -# virtual packages. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this virtual infrastructure requires -# the .mk file to only call the 'virtual-package' macro. -# -################################################################################ - - -################################################################################ -# inner-virtual-package -- defines the dependency rules of the virtual -# package against its provider. -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -# Note: putting this comment here rather than in the define block, otherwise -# make would try to expand the $(error ...) in the comment, which is not -# really what we want. -# We need to use second-expansion for the $(error ...) call, below, -# so it is not evaluated now, but as part of the generated make code. - -define inner-virtual-package - -# Ensure the virtual package has an implementation defined. -ifeq ($$(BR2_PACKAGE_HAS_$(2)),y) -ifeq ($$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))),) -$$(error No implementation selected for virtual package $(1). Configuration error) -endif -endif - -$(2)_IS_VIRTUAL = YES - -# Add dependency against the provider -# For a host package, there is no corresponding BR2_PACKAGE_PROVIDES_HOST_FOO, -# so we need to compute it from the target variant. -ifeq ($(4),target) -$(2)_DEPENDENCIES += $$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(2))) -else -$(2)_DEPENDENCIES += host-$$(call qstrip,$$(BR2_PACKAGE_PROVIDES_$(3))) -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# virtual-package -- the target generator macro for virtual packages -################################################################################ - -virtual-package = $(call inner-virtual-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) -host-virtual-package = $(call inner-virtual-package,host-$(pkgname),$(call UPPERCASE,host-$(pkgname)),$(call UPPERCASE,$(pkgname)),host) diff --git a/package.bak/pkg-waf.mk b/package.bak/pkg-waf.mk deleted file mode 100644 index 2cdd654b1b..0000000000 --- a/package.bak/pkg-waf.mk +++ /dev/null @@ -1,125 +0,0 @@ -################################################################################ -# WAF package infrastructure -# -# This file implements an infrastructure that eases development of package -# .mk files for WAF packages. It should be used for all packages that use -# WAF as their build system. -# -# See the Buildroot documentation for details on the usage of this -# infrastructure -# -# In terms of implementation, this WAF infrastructure requires the .mk file -# to only specify metadata information about the package: name, version, -# download URL, etc. -# -# We still allow the package .mk file to override what the different steps -# are doing, if needed. For example, if _BUILD_CMDS is already defined, -# it is used as the list of commands to perform to build the package, -# instead of the default WAF behaviour. The package can also define some -# post operation hooks. -# -################################################################################ - -################################################################################ -# inner-waf-package -- defines how the configuration, compilation and -# installation of a waf package should be done, implements a few hooks -# to tune the build process for waf specifities and calls the generic -# package infrastructure to generate the necessary make targets -# -# argument 1 is the lowercase package name -# argument 2 is the uppercase package name, including a HOST_ prefix -# for host packages -# argument 3 is the uppercase package name, without the HOST_ prefix -# for host packages -# argument 4 is the type (target or host) -################################################################################ - -define inner-waf-package - -# We need host-python to run waf -$(2)_DEPENDENCIES += host-python - -$(2)_NEEDS_EXTERNAL_WAF ?= NO - -# If the package does not have its own waf, use our own. -ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES) -$(2)_DEPENDENCIES += host-waf -$(2)_WAF = $(HOST_DIR)/usr/bin/waf -else -$(2)_WAF = ./waf -endif - -$(2)_BUILD_OPTS ?= -$(2)_INSTALL_STAGING_OPTS ?= -$(2)_INSTALL_TARGET_OPTS ?= -$(2)_WAF_OPTS ?= - -# -# Configure step. Only define it if not already defined by the package -# .mk file. -# -ifndef $(2)_CONFIGURE_CMDS -define $(2)_CONFIGURE_CMDS - cd $$(@D) && \ - $$(TARGET_CONFIGURE_OPTS) \ - $$($(2)_CONF_ENV) \ - $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \ - --prefix=/usr \ - --libdir=/usr/lib \ - $$($(2)_CONF_OPTS) \ - $$($(2)_WAF_OPTS) -endef -endif - -# -# Build step. Only define it if not already defined by the package .mk -# file. -# -ifndef $(2)_BUILD_CMDS -define $(2)_BUILD_CMDS - cd $$(@D) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ - $$($(2)_WAF_OPTS) -endef -endif - -# -# Staging installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_STAGING_CMDS -define $(2)_INSTALL_STAGING_CMDS - cd $$(@D) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - install --destdir=$$(STAGING_DIR) \ - $$($(2)_INSTALL_STAGING_OPTS) \ - $$($(2)_WAF_OPTS) -endef -endif - -# -# Target installation step. Only define it if not already defined by -# the package .mk file. -# -ifndef $(2)_INSTALL_TARGET_CMDS -define $(2)_INSTALL_TARGET_CMDS - cd $$(@D) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - install --destdir=$$(TARGET_DIR) \ - $$($(2)_INSTALL_TARGET_OPTS) \ - $$($(2)_WAF_OPTS) -endef -endif - -# Call the generic package infrastructure to generate the necessary -# make targets -$(call inner-generic-package,$(1),$(2),$(3),$(4)) - -endef - -################################################################################ -# waf-package -- the target generator macro for WAF packages -################################################################################ - -waf-package = $(call inner-waf-package,$(pkgname),$(call UPPERCASE,$(pkgname)),$(call UPPERCASE,$(pkgname)),target) diff --git a/package.bak/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch b/package.bak/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch deleted file mode 100644 index bc2b5273cd..0000000000 --- a/package.bak/pkgconf/0001-Fix-all-variables-sysroot-prefix-problem.patch +++ /dev/null @@ -1,64 +0,0 @@ -From aa6bbc09e68426592faf722630fe92b6ede75bc8 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Mon, 2 Nov 2015 18:38:00 -0300 -Subject: [PATCH] Fix all-variables sysroot prefix problem - -According to the pkg-config specifications (or rather documentation) -only the -L/-I directory entries should be sysroot-prefixed. - -We also need to prefix the mapdir/sdkdir variables since they're used by -xorg and expected that way. - -Also allow prefixing for includedir and libdir since in some silly cases -the directories may be requested barebones via pkg-config ---variable=includedir libfool for example. - -Signed-off-by: Gustavo Zacarias - -Added pkgdatadir to the list of to-be-prefixed variables. - -Signed-off-by: Bernd Kuhls ---- - main.c | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/main.c b/main.c -index 6947126..ce5e18f 100644 ---- a/main.c -+++ b/main.c -@@ -313,9 +313,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) - memset(req->buf, 0, sizeof(req->buf)); - - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && -- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) -- strlcat(req->buf, sysroot_dir, sizeof(req->buf)); -- -+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) && -+ (!strcmp(req->variable, "includedir") || \ -+ !strcmp(req->variable, "libdir") || \ -+ !strcmp(req->variable, "mapdir") || \ -+ !strcmp(req->variable, "pkgdatadir") || \ -+ !strcmp(req->variable, "sdkdir"))) -+ strlcat(req->buf, sysroot_dir, sizeof(req->buf)); - strlcat(req->buf, var, sizeof(req->buf)); - return; - } -@@ -323,8 +327,13 @@ print_variable(pkg_t *pkg, void *data, unsigned int flags) - strlcat(req->buf, " ", sizeof(req->buf)); - - if (*var == '/' && (flags & PKGF_MUNGE_SYSROOT_PREFIX) && -- (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir)))) -- strlcat(req->buf, sysroot_dir, sizeof(req->buf)); -+ (sysroot_dir != NULL && strncmp(var, sysroot_dir, strlen(sysroot_dir))) && -+ (!strcmp(req->variable, "includedir") || \ -+ !strcmp(req->variable, "libdir") || \ -+ !strcmp(req->variable, "mapdir") || \ -+ !strcmp(req->variable, "pkgdatadir") || \ -+ !strcmp(req->variable, "sdkdir"))) -+ strlcat(req->buf, sysroot_dir, sizeof(req->buf)); - - strlcat(req->buf, var, sizeof(req->buf)); - } --- -2.4.10 - diff --git a/package.bak/pkgconf/Config.in b/package.bak/pkgconf/Config.in deleted file mode 100644 index f95847fa3c..0000000000 --- a/package.bak/pkgconf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PKGCONF - bool "pkgconf" - help - pkgconf is a program which helps to configure compiler and linker - flags for development frameworks. It is similar to pkg-config, - but was written from scratch in the summer of 2011 to replace - pkg-config, which now needs itself to build itself - - https://github.com/nenolod/pkgconf diff --git a/package.bak/pkgconf/pkg-config.in b/package.bak/pkgconf/pkg-config.in deleted file mode 100644 index 4dec48789a..0000000000 --- a/package.bak/pkgconf/pkg-config.in +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -PKG_CONFIG_LIBDIR=${PKG_CONFIG_LIBDIR:-@PKG_CONFIG_LIBDIR@} PKG_CONFIG_SYSROOT_DIR=${PKG_CONFIG_SYSROOT_DIR:-@STAGING_DIR@} $(dirname $0)/pkgconf @STATIC@ $@ diff --git a/package.bak/pkgconf/pkgconf.hash b/package.bak/pkgconf/pkgconf.hash deleted file mode 100644 index 79191bc94e..0000000000 --- a/package.bak/pkgconf/pkgconf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f pkgconf-0.9.12.tar.bz2 diff --git a/package.bak/pkgconf/pkgconf.mk b/package.bak/pkgconf/pkgconf.mk deleted file mode 100644 index c8b0cbaf51..0000000000 --- a/package.bak/pkgconf/pkgconf.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# pkgconf -# -################################################################################ - -PKGCONF_VERSION = 0.9.12 -PKGCONF_SITE = https://github.com/pkgconf/pkgconf/releases/download/pkgconf-$(PKGCONF_VERSION) -PKGCONF_SOURCE = pkgconf-$(PKGCONF_VERSION).tar.bz2 -PKGCONF_LICENSE = pkgconf license -PKGCONF_LICENSE_FILES = COPYING - -PKG_CONFIG_HOST_BINARY = $(HOST_DIR)/usr/bin/pkg-config - -define PKGCONF_LINK_PKGCONFIG - ln -sf pkgconf $(TARGET_DIR)/usr/bin/pkg-config -endef - -define HOST_PKGCONF_INSTALL_WRAPPER - $(INSTALL) -m 0755 -D package/pkgconf/pkg-config.in \ - $(HOST_DIR)/usr/bin/pkg-config - $(SED) 's,@PKG_CONFIG_LIBDIR@,$(STAGING_DIR)/usr/lib/pkgconfig:$(STAGING_DIR)/usr/share/pkgconfig,' \ - -e 's,@STAGING_DIR@,$(STAGING_DIR),' \ - $(HOST_DIR)/usr/bin/pkg-config -endef - -define HOST_PKGCONF_STATIC - $(SED) 's,@STATIC@,--static,' $(HOST_DIR)/usr/bin/pkg-config -endef - -define HOST_PKGCONF_SHARED - $(SED) 's,@STATIC@,,' $(HOST_DIR)/usr/bin/pkg-config -endef - -PKGCONF_POST_INSTALL_TARGET_HOOKS += PKGCONF_LINK_PKGCONFIG -HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_INSTALL_WRAPPER - -ifeq ($(BR2_STATIC_LIBS),y) -HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_STATIC -else -HOST_PKGCONF_POST_INSTALL_HOOKS += HOST_PKGCONF_SHARED -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/poco/0001-poco-add-the-staging-path-to-search-path.patch b/package.bak/poco/0001-poco-add-the-staging-path-to-search-path.patch deleted file mode 100644 index 5695b62618..0000000000 --- a/package.bak/poco/0001-poco-add-the-staging-path-to-search-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b8417607ec8840e6a1e27cf03b6958c794a33e49 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Tue, 4 Aug 2015 10:14:00 +0200 -Subject: [PATCH 1/2] poco: add the staging path to search path -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add the mysql headers and client libraries to the search path of the -preprocessor and the linker. The $MYSQL_LIBDIR / $MYSQL_INCIDR variables -must be set from the make command line. - -[Peter: Remove host dirs, add MYSQL_INCDIR] -Signed-off-by: Baruch Siach -[Jörg: Update to version 1.6.1 from github] -Signed-off-by: Jörg Krause ---- - Data/MySQL/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Data/MySQL/Makefile b/Data/MySQL/Makefile -index 0b18ca5..094e807 100644 ---- a/Data/MySQL/Makefile -+++ b/Data/MySQL/Makefile -@@ -8,8 +8,8 @@ - - include $(POCO_BASE)/build/rules/global - --SYSLIBS += -L/usr/local/lib$(LIB64SUFFIX)/mysql -L/usr/lib$(LIB64SUFFIX)/mysql -L/usr/mysql/lib$(LIB64SUFFIX) -L/usr/mysql/lib$(LIB64SUFFIX)/mysql -L/usr/local/mysql/lib$(LIB64SUFFIX) -lmysqlclient --INCLUDE += -I/usr/local/include/mysql/ -I/usr/include/mysql/ -I/usr/mysql/include/mysql -I/usr/local/mysql/include -+SYSLIBS += -L$(MYSQL_LIBDIR) -lmysqlclient -+INCLUDE += -I$(MYSQL_INCDIR) - SYSFLAGS += -DTHREADSAFE -DNO_TCL - - objects = Binder Extractor SessionImpl Connector \ --- -2.5.0 - diff --git a/package.bak/poco/0002-fix-m68k-double-conv-detect.patch b/package.bak/poco/0002-fix-m68k-double-conv-detect.patch deleted file mode 100644 index 3ca03fc7be..0000000000 --- a/package.bak/poco/0002-fix-m68k-double-conv-detect.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fixes compile for m68k. - -From upstream double-conversion commit da111796231: -https://github.com/google/double-conversion/blob/master/double-conversion/utils.h - -Signed-off-by: Waldemar Brodkorb - -diff -Nur poco-poco-1.7.2-release.orig/Foundation/src/utils.h poco-poco-1.7.2-release/Foundation/src/utils.h ---- poco-poco-1.7.2-release.orig/Foundation/src/utils.h 2016-03-19 08:19:35.000000000 +0100 -+++ poco-poco-1.7.2-release/Foundation/src/utils.h 2016-08-11 02:55:02.827238119 +0200 -@@ -63,6 +63,8 @@ - defined(__AARCH64EL__) || \ - defined(nios2) || defined(__nios2) || defined(__nios2__) - #define DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS 1 -+#elif defined(__mc68000__) -+#undef DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS - #elif defined(_M_IX86) || defined(__i386__) || defined(__i386) - #if defined(_WIN32) - // Windows uses a 64bit wide floating point stack. diff --git a/package.bak/poco/Config.in b/package.bak/poco/Config.in deleted file mode 100644 index b3b247f906..0000000000 --- a/package.bak/poco/Config.in +++ /dev/null @@ -1,68 +0,0 @@ -config BR2_PACKAGE_POCO - bool "poco" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # dlopen() - depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_xtensa) - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE - help - The C++ Portable Components Libraries - - http://pocoproject.org - -if BR2_PACKAGE_POCO - -comment "poco components" - -config BR2_PACKAGE_POCO_XML - bool "xml" - select BR2_PACKAGE_EXPAT - -config BR2_PACKAGE_POCO_UTIL - bool "util" - select BR2_PACKAGE_POCO_XML - -config BR2_PACKAGE_POCO_NET - bool "net" - -config BR2_PACKAGE_POCO_CRYPTO - bool "crypto" - select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_NETSSL_OPENSSL - bool "netssl_openssl" - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_CRYPTO - select BR2_PACKAGE_POCO_UTIL - select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_POCO_ZIP - bool "zip" - select BR2_PACKAGE_POCO_XML - select BR2_PACKAGE_POCO_NET - select BR2_PACKAGE_POCO_UTIL - -config BR2_PACKAGE_POCO_DATA - bool - -config BR2_PACKAGE_POCO_DATA_SQLITE - bool "sqlite" - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_SQLITE - -config BR2_PACKAGE_POCO_DATA_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_POCO_DATA - select BR2_PACKAGE_MYSQL - -endif # BR2_PACKAGE_POCO - -comment "poco needs a toolchain w/ wchar, threads, C++, dynamic library" - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !(BR2_arc || BR2_bfin || BR2_microblaze || BR2_mipsel \ - || BR2_or1k || BR2_xtensa) diff --git a/package.bak/poco/poco.hash b/package.bak/poco/poco.hash deleted file mode 100644 index 1730f1c287..0000000000 --- a/package.bak/poco/poco.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 cfd311ecbc9e58accf1c4ea70170af88f92f88e73dd14944e528e7f6229e6cab poco-poco-1.7.2-release.tar.gz -sha256 32182791e7eac00ba367d2f22dd1dd5bfce0b6d6f76fd52f853364f98402dda3 30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch diff --git a/package.bak/poco/poco.mk b/package.bak/poco/poco.mk deleted file mode 100644 index 90dfb34340..0000000000 --- a/package.bak/poco/poco.mk +++ /dev/null @@ -1,78 +0,0 @@ -################################################################################ -# -# poco -# -################################################################################ - -POCO_VERSION = poco-1.7.2-release -POCO_SITE = $(call github,pocoproject,poco,$(POCO_VERSION)) -POCO_LICENSE = Boost-v1.0 -POCO_LICENSE_FILES = LICENSE -POCO_INSTALL_STAGING = YES -POCO_PATCH = https://github.com/pocoproject/poco/commit/30159aea4b3f6421da9d74a8bf22aad6d3bf26b4.patch - -POCO_DEPENDENCIES = zlib pcre \ - $(if $(BR2_PACKAGE_POCO_XML),expat) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),openssl) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),mysql) - -POCO_OMIT = Data/ODBC PageCompiler \ - $(if $(BR2_PACKAGE_POCO_XML),,XML) \ - $(if $(BR2_PACKAGE_POCO_UTIL),,Util) \ - $(if $(BR2_PACKAGE_POCO_NET),,Net) \ - $(if $(BR2_PACKAGE_POCO_NETSSL_OPENSSL),,NetSSL_OpenSSL) \ - $(if $(BR2_PACKAGE_POCO_CRYPTO),,Crypto) \ - $(if $(BR2_PACKAGE_POCO_ZIP),,Zip) \ - $(if $(BR2_PACKAGE_POCO_DATA),,Data) \ - $(if $(BR2_PACKAGE_POCO_DATA_MYSQL),,Data/MySQL) \ - $(if $(BR2_PACKAGE_POCO_DATA_SQLITE),,Data/SQLite) - -ifeq ($(LIBC),uclibc) -POCO_CONF_OPTS += --no-fpenvironment --no-wstring -endif - -# architectures missing some FE_* in their fenv.h -ifeq ($(BR2_sh4a)$(BR2_nios2),y) -POCO_CONF_OPTS += --no-fpenvironment -endif - -ifeq ($(BR2_STATIC_LIBS),y) -POCO_MAKE_TARGET = static_release -else ifeq ($(BR2_SHARED_LIBS),y) -POCO_MAKE_TARGET = shared_release -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -POCO_MAKE_TARGET = all_release -endif - -define POCO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) ./configure \ - --config=Linux \ - --prefix=/usr \ - --omit="$(POCO_OMIT)" \ - $(POCO_CONF_OPTS) \ - --unbundled \ - --no-tests \ - --no-samples) -endef - -# Use $(MAKE1) to avoid failures on heavilly parallel machines (e.g. -j25) -define POCO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) POCO_TARGET_OSARCH=$(ARCH) CROSS_COMPILE=$(TARGET_CROSS) \ - MYSQL_LIBDIR=$(STAGING_DIR)/usr/lib/mysql \ - MYSQL_INCDIR=$(STAGING_DIR)/usr/include/mysql \ - DEFAULT_TARGET=$(POCO_MAKE_TARGET) -C $(@D) -endef - -define POCO_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(STAGING_DIR) POCO_TARGET_OSARCH=$(ARCH) \ - DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) -endef - -define POCO_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) POCO_TARGET_OSARCH=$(ARCH) \ - DEFAULT_TARGET=$(POCO_MAKE_TARGET) install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/polarssl/0001-no-test-suite.patch b/package.bak/polarssl/0001-no-test-suite.patch deleted file mode 100644 index 4c8552a948..0000000000 --- a/package.bak/polarssl/0001-no-test-suite.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add BUILD_TESTS option to disable test suite - -By default, PolarSSL builds a fairly extensive test suite to validate -the library. In the context of Buildroot, building this test suite is -not really useful, so we add a BUILD_TESTS to disable its build. - -[Gustavo: update for 1.2.11] -Signed-off-by: Thomas Petazzoni -Signed-off-by: Gustavo Zacarias - -diff -Nura polarssl-1.2.11.orig/CMakeLists.txt polarssl-1.2.11/CMakeLists.txt ---- polarssl-1.2.11.orig/CMakeLists.txt 2014-07-11 17:14:43.414651327 -0300 -+++ polarssl-1.2.11/CMakeLists.txt 2014-07-11 17:23:00.573498626 -0300 -@@ -49,9 +49,11 @@ - add_subdirectory(library) - add_subdirectory(include) - --if(CMAKE_COMPILER_IS_GNUCC) -+option(BUILD_TESTS "Build tests." ON) -+ -+if(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS) - add_subdirectory(tests) --endif(CMAKE_COMPILER_IS_GNUCC) -+endif(CMAKE_COMPILER_IS_GNUCC AND BUILD_TESTS) - if(CMAKE_COMPILER_IS_CLANG) - add_subdirectory(tests) - endif(CMAKE_COMPILER_IS_CLANG) diff --git a/package.bak/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch b/package.bak/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch deleted file mode 100644 index d241ae264b..0000000000 --- a/package.bak/polarssl/0002-cmake-use-the-standard-CMake-flag-to-drive-the-share.patch +++ /dev/null @@ -1,39 +0,0 @@ -From a14028b0878c1ba27f7c7a6d0962874d0f7f3801 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 31 Aug 2014 11:54:37 +0200 -Subject: [PATCH 3/3] cmake: use the standard CMake flag to drive the shared - object build - -If BUILD_SHARED_LIBS is set and not USE_SHARED_POLARSSL_LIBRARY, then -drive USE_SHARED_POLARSSL_LIBRARY with the BUILD_SHARED_LIBS value. - -Signed-off-by: Samuel Martin ---- - library/CMakeLists.txt | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt -index 27bd2e0..2ae0aba 100644 ---- a/library/CMakeLists.txt -+++ b/library/CMakeLists.txt -@@ -1,5 +1,15 @@ --option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL static library." ON) --option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL shared library." OFF) -+# Use the standard CMake flag to drive the shared object build. -+if(DEFINED BUILD_SHARED_LIBS AND NOT DEFINED USE_STATIC_POLARSSL_LIBRARY AND NOT DEFINED USE_SHARED_POLARSSL_LIBRARY) -+ set(USE_STATIC_POLARSSL_LIBRARY ON) -+ if(BUILD_SHARED_LIBS) -+ set(USE_SHARED_POLARSSL_LIBRARY ON) -+ else() -+ set(USE_SHARED_POLARSSL_LIBRARY OFF) -+ endif() -+else() -+ option(USE_STATIC_POLARSSL_LIBRARY "Build PolarSSL static library." ON) -+ option(USE_SHARED_POLARSSL_LIBRARY "Build PolarSSL shared library." OFF) -+endif() - - set(src - aes.c --- -2.1.0 - diff --git a/package.bak/polarssl/Config.in b/package.bak/polarssl/Config.in deleted file mode 100644 index 17125a3cd8..0000000000 --- a/package.bak/polarssl/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_POLARSSL - bool "polarssl" - help - PolarSSL is an SSL library written in ANSI C. PolarSSL makes - it easy for developers to include cryptographic and SSL/TLS - capabilities in their (embedded) products with as little - hassle as possible. It is designed to be readable, - documented, tested, loosely coupled and portable. - - Warning: PolarSSL is licensed under the GPL. If you want to - use it in your own proprietary applications, you have to - purchase a commercial license. - - https://tls.mbed.org/ - -if BR2_PACKAGE_POLARSSL - -config BR2_PACKAGE_POLARSSL_PROGRAMS - bool "polarssl programs" - depends on BR2_USE_MMU # fork() - help - This option enables the installation and the build of - PolarSSL companion programs: aescrypt2, benchmark, cert_app, - crl_app, crypt_and_hash, dh_client, dh_genprime, dh_server, - gen_entropy, generic_sum, gen_random_ctr_drbg, - gen_random_havege, hello, key_app, md5sum, mpi_demo, - rsa_decrypt, rsa_encrypt, rsa_genkey, rsa_sign, rsa_verify, - selftest, sha1sum, sha2sum, ssi-cgi, ssl_cert_test, - ssl_client1, ssl_client2, ssl_fork_server, ssl_mail_client, - ssl_server, ssl_test - -endif diff --git a/package.bak/polarssl/polarssl.hash b/package.bak/polarssl/polarssl.hash deleted file mode 100644 index 3f1871c8f4..0000000000 --- a/package.bak/polarssl/polarssl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://tls.mbed.org/tech-updates/releases/mbedtls-2.2.1-2.1.4-1.3.16-and-polarssl.1.2.19-released -sha256 24cb1608a160101ead3c7240f35fc447fe7880cd60f7ed6c9db7a1d773ccd4b8 polarssl-1.2.19-gpl.tgz diff --git a/package.bak/polarssl/polarssl.mk b/package.bak/polarssl/polarssl.mk deleted file mode 100644 index 7f4c5827a0..0000000000 --- a/package.bak/polarssl/polarssl.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# polarssl -# -################################################################################ - -POLARSSL_SITE = https://tls.mbed.org/code/releases -POLARSSL_VERSION = 1.2.19 -POLARSSL_SOURCE = polarssl-$(POLARSSL_VERSION)-gpl.tgz -POLARSSL_CONF_OPTS = \ - -DENABLE_PROGRAMS=$(if $(BR2_PACKAGE_POLARSSL_PROGRAMS),ON,OFF) - -POLARSSL_INSTALL_STAGING = YES -POLARSSL_LICENSE = GPLv2 -POLARSSL_LICENSE_FILES = LICENSE - -define POLARSSL_DISABLE_ASM - $(SED) '/^#define POLARSSL_HAVE_ASM/d' $(@D)/include/polarssl/config.h -endef - -# ARM in thumb mode breaks debugging with asm optimizations -# Microblaze asm optimizations are broken in general -# MIPS R6 asm is not yet supported -ifeq ($(BR2_ENABLE_DEBUG)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_ARM_INSTRUCTIONS_THUMB2),yy) -POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM -else ifeq ($(BR2_microblaze),y) -POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM -else ifeq ($(BR2_MIPS_CPU_MIPS32R6)$(BR2_MIPS_CPU_MIPS64R6),y) -POLARSSL_POST_CONFIGURE_HOOKS += POLARSSL_DISABLE_ASM -endif - -$(eval $(cmake-package)) diff --git a/package.bak/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch b/package.bak/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch deleted file mode 100644 index bbd6895e7f..0000000000 --- a/package.bak/policycoreutils/0001-Add-DESTDIR-to-all-paths-that-use-an-absolute-path.patch +++ /dev/null @@ -1,131 +0,0 @@ -The addition of this patch makes the use of DESTDIR -mandatory as there are conditional checks which would fail if it's not -defined. - -This patch was updated from the patch provided by Niranjan Reddy to -accomodate version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/Makefile | 2 +- - policycoreutils/newrole/Makefile | 4 ++-- - policycoreutils/restorecond/Makefile | 5 +++-- - policycoreutils/run_init/Makefile | 4 ++-- - policycoreutils/sepolicy/Makefile | 2 +- - policycoreutils/sestatus/Makefile | 2 +- - policycoreutils/setfiles/Makefile | 4 ++-- - 7 files changed, 12 insertions(+), 11 deletions(-) - -diff --git a/Makefile b/Makefile -index 962ac12..0634a2a 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,6 +1,6 @@ - SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll - --INOTIFYH = $(shell ls /usr/include/sys/inotify.h 2>/dev/null) -+INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) - - ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) - SUBDIRS += restorecond -diff --git a/newrole/Makefile b/newrole/Makefile -index 646cd4d..f124a6a 100644 ---- a/newrole/Makefile -+++ b/newrole/Makefile -@@ -4,8 +4,8 @@ BINDIR ?= $(PREFIX)/bin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - LOCALEDIR = /usr/share/locale --PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - # Enable capabilities to permit newrole to generate audit records. - # This will make newrole a setuid root program. - # The capabilities used are: CAP_AUDIT_WRITE. -diff --git a/restorecond/Makefile b/restorecond/Makefile -index f99e1e7..92a4a4d 100644 ---- a/restorecond/Makefile -+++ b/restorecond/Makefile -@@ -11,11 +11,12 @@ autostart_DATA = sealertauto.desktop - INITDIR ?= $(DESTDIR)/etc/rc.d/init.d - SELINUXDIR = $(DESTDIR)/etc/selinux - --DBUSFLAGS = -DHAVE_DBUS -I/usr/include/dbus-1.0 -I/usr/lib64/dbus-1.0/include -I/usr/lib/dbus-1.0/include -+DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include - DBUSLIB = -ldbus-glib-1 -ldbus-1 - - CFLAGS ?= -g -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include $(DBUSFLAGS) -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/lib/glib-2.0/include -+override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ -+-I$(DESTDIR)/usr/lib64/glib-2.0/include -I$(DESTDIR)/usr/lib/glib-2.0/include - - LDLIBS += -lselinux $(DBUSLIB) -lglib-2.0 -L$(LIBDIR) - -diff --git a/run_init/Makefile b/run_init/Makefile -index 5815a08..c81179b 100644 ---- a/run_init/Makefile -+++ b/run_init/Makefile -@@ -5,8 +5,8 @@ SBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc - LOCALEDIR ?= /usr/share/locale --PAMH = $(shell ls /usr/include/security/pam_appl.h 2>/dev/null) --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - - CFLAGS ?= -Werror -Wall -W - override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 39d46e8..6624373 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -12,7 +12,7 @@ LOCALEDIR ?= /usr/share/locale - BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions - SHAREDIR ?= $(PREFIX)/share/sandbox - CFLAGS ?= -Wall -Werror -Wextra -W --override CFLAGS += -I$(PREFIX)/include -DPACKAGE="policycoreutils" -DSHARED -shared -+override CFLAGS = $(LDFLAGS) -I$(DESTDIR)/usr/include -DPACKAGE="policycoreutils" -Wall -Werror -Wextra -W -DSHARED -shared - - BASHCOMPLETIONS=sepolicy-bash-completion.sh - -diff --git a/sestatus/Makefile b/sestatus/Makefile -index c04ff00..e10c32c 100644 ---- a/sestatus/Makefile -+++ b/sestatus/Makefile -@@ -6,7 +6,7 @@ ETCDIR ?= $(DESTDIR)/etc - LIBDIR ?= $(PREFIX)/lib - - CFLAGS ?= -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include -D_FILE_OFFSET_BITS=64 -+override CFLAGS += -I$(DESTDIR)/usr/include -D_FILE_OFFSET_BITS=64 - LDLIBS = -lselinux -L$(LIBDIR) - - all: sestatus -diff --git a/setfiles/Makefile b/setfiles/Makefile -index 98f4f7d..eb26ed0 100644 ---- a/setfiles/Makefile -+++ b/setfiles/Makefile -@@ -3,13 +3,13 @@ PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(DESTDIR)/sbin - MANDIR = $(PREFIX)/share/man - LIBDIR ?= $(PREFIX)/lib --AUDITH = $(shell ls /usr/include/libaudit.h 2>/dev/null) -+AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - - PROGRESS_STEP=$(shell grep "^\#define STAR_COUNT" restore.h | awk -S '{ print $$3 }') - ABORT_ON_ERRORS=$(shell grep "^\#define ABORT_ON_ERRORS" setfiles.c | awk -S '{ print $$3 }') - - CFLAGS ?= -g -Werror -Wall -W --override CFLAGS += -I$(PREFIX)/include -+override CFLAGS += -I$(DESTDIR)/usr/include - LDLIBS = -lselinux -lsepol -L$(LIBDIR) - - ifeq ($(AUDITH), /usr/include/libaudit.h) --- -2.7.4 - diff --git a/package.bak/policycoreutils/0002-Add-PREFIX-to-host-paths.patch b/package.bak/policycoreutils/0002-Add-PREFIX-to-host-paths.patch deleted file mode 100644 index 56aae74ba0..0000000000 --- a/package.bak/policycoreutils/0002-Add-PREFIX-to-host-paths.patch +++ /dev/null @@ -1,211 +0,0 @@ -From 7f99a727cdb8160d49bb0d0554fc88787980c971 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:16:03 -0400 -Subject: [PATCH] Add PREFIX to host paths - -Updates the remaining hardcoded host paths used in the build to be -prefixed with a PREFIX path to allow cross compilation. - -Updated to work with version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/Makefile | 4 +++- - policycoreutils/audit2allow/Makefile | 2 +- - policycoreutils/load_policy/Makefile | 2 +- - policycoreutils/mcstrans/src/Makefile | 17 +++++++++-------- - policycoreutils/newrole/Makefile | 8 ++++---- - policycoreutils/run_init/Makefile | 8 ++++---- - policycoreutils/sepolicy/Makefile | 2 +- - policycoreutils/setfiles/Makefile | 4 ++-- - 8 files changed, 25 insertions(+), 22 deletions(-) - -diff --git a/Makefile b/Makefile -index 0634a2a..bd99b1c 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,10 @@ -+PREFIX ?= $(DESTDIR)/usr -+ - SUBDIRS = sepolicy setfiles semanage load_policy newrole run_init sandbox secon audit2allow sestatus semodule_package semodule semodule_link semodule_expand semodule_deps sepolgen-ifgen setsebool scripts po man gui hll - - INOTIFYH = $(shell ls $(DESTDIR)/usr/include/sys/inotify.h 2>/dev/null) - --ifeq (${INOTIFYH}, /usr/include/sys/inotify.h) -+ifeq (${INOTIFYH}, $(PREFIX)/include/sys/inotify.h) - SUBDIRS += restorecond - endif - -diff --git a/audit2allow/Makefile b/audit2allow/Makefile -index 87d2502..d4108fe 100644 ---- a/audit2allow/Makefile -+++ b/audit2allow/Makefile -@@ -5,7 +5,7 @@ PREFIX ?= $(DESTDIR)/usr - BINDIR ?= $(PREFIX)/bin - LIBDIR ?= $(PREFIX)/lib - MANDIR ?= $(PREFIX)/share/man --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - - all: audit2why - -diff --git a/load_policy/Makefile b/load_policy/Makefile -index 7c5bab0..5cd0bbb 100644 ---- a/load_policy/Makefile -+++ b/load_policy/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(DESTDIR)/sbin - USRSBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - - CFLAGS ?= -Werror -Wall -W - override CFLAGS += $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" -diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile -index 907a1f1..6fda57e 100644 ---- a/mcstrans/src/Makefile -+++ b/mcstrans/src/Makefile -@@ -1,23 +1,24 @@ - ARCH = $(shell uname -i) -+# Installation directories. -+PREFIX ?= $(DESTDIR)/usr -+SBINDIR ?= $(DESTDIR)/sbin -+INITDIR ?= $(DESTDIR)/etc/rc.d/init.d -+SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd -+ - ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines -- LIBDIR=/usr/lib64 -+ LIBDIR=$(PREFIX)/lib64 - else - ifeq "$(ARCH)" "i686" - # In case of 32 bit system, use these lines -- LIBDIR=/usr/lib -+ LIBDIR=$(PREFIX)/lib - else - ifeq "$(ARCH)" "i386" - # In case of 32 bit system, use these lines -- LIBDIR=/usr/lib -+ LIBDIR=$(PREFIX)/lib - endif - endif - endif --# Installation directories. --PREFIX ?= $(DESTDIR)/usr --SBINDIR ?= $(DESTDIR)/sbin --INITDIR ?= $(DESTDIR)/etc/rc.d/init.d --SYSTEMDDIR ?= $(DESTDIR)/usr/lib/systemd - - PROG_SRC=mcstrans.c mcscolor.c mcstransd.c mls_level.c - PROG_OBJS= $(patsubst %.c,%.o,$(PROG_SRC)) -diff --git a/newrole/Makefile b/newrole/Makefile -index f124a6a..b687a09 100644 ---- a/newrole/Makefile -+++ b/newrole/Makefile -@@ -3,7 +3,7 @@ PREFIX ?= $(DESTDIR)/usr - BINDIR ?= $(PREFIX)/bin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc --LOCALEDIR = /usr/share/locale -+LOCALEDIR = $(PREFIX)/share/locale - PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) - AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - # Enable capabilities to permit newrole to generate audit records. -@@ -24,7 +24,7 @@ CFLAGS ?= -Werror -Wall -W - EXTRA_OBJS = - override CFLAGS += -DVERSION=\"$(VERSION)\" $(LDFLAGS) -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" - LDLIBS += -lselinux -L$(PREFIX)/lib --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - override CFLAGS += -DUSE_PAM - EXTRA_OBJS += hashtab.o - LDLIBS += -lpam -lpam_misc -@@ -32,7 +32,7 @@ else - override CFLAGS += -D_XOPEN_SOURCE=500 - LDLIBS += -lcrypt - endif --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif -@@ -66,7 +66,7 @@ install: all - test -d $(MANDIR)/man1 || install -m 755 -d $(MANDIR)/man1 - install -m $(MODE) newrole $(BINDIR) - install -m 644 newrole.1 $(MANDIR)/man1/ --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - test -d $(ETCDIR)/pam.d || install -m 755 -d $(ETCDIR)/pam.d - ifeq ($(LSPP_PRIV),y) - install -m 644 newrole-lspp.pamd $(ETCDIR)/pam.d/newrole -diff --git a/run_init/Makefile b/run_init/Makefile -index c81179b..ce0df9f 100644 ---- a/run_init/Makefile -+++ b/run_init/Makefile -@@ -4,21 +4,21 @@ PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(PREFIX)/sbin - MANDIR ?= $(PREFIX)/share/man - ETCDIR ?= $(DESTDIR)/etc --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - PAMH = $(shell ls $(DESTDIR)/usr/include/security/pam_appl.h 2>/dev/null) - AUDITH = $(shell ls $(DESTDIR)/usr/include/libaudit.h 2>/dev/null) - - CFLAGS ?= -Werror -Wall -W - override CFLAGS += -I$(PREFIX)/include -DUSE_NLS -DLOCALEDIR="\"$(LOCALEDIR)\"" -DPACKAGE="\"policycoreutils\"" - LDLIBS += -lselinux -L$(PREFIX)/lib --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - override CFLAGS += -DUSE_PAM - LDLIBS += -lpam -lpam_misc - else - override CFLAGS += -D_XOPEN_SOURCE=500 - LDLIBS += -lcrypt - endif --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif -@@ -38,7 +38,7 @@ install: all - install -m 755 open_init_pty $(SBINDIR) - install -m 644 run_init.8 $(MANDIR)/man8/ - install -m 644 open_init_pty.8 $(MANDIR)/man8/ --ifeq ($(PAMH), /usr/include/security/pam_appl.h) -+ifeq ($(PAMH), $(PREFIX)/include/security/pam_appl.h) - install -m 644 run_init.pamd $(ETCDIR)/pam.d/run_init - endif - -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index 6624373..a16f8de 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -8,7 +8,7 @@ BINDIR ?= $(PREFIX)/bin - SBINDIR ?= $(PREFIX)/sbin - DATADIR ?= $(PREFIX)/share - MANDIR ?= $(PREFIX)/share/man --LOCALEDIR ?= /usr/share/locale -+LOCALEDIR ?= $(PREFIX)/share/locale - BASHCOMPLETIONDIR ?= $(DESTDIR)/usr/share/bash-completion/completions - SHAREDIR ?= $(PREFIX)/share/sandbox - CFLAGS ?= -Wall -Werror -Wextra -W -diff --git a/setfiles/Makefile b/setfiles/Makefile -index eb26ed0..3c6b80d 100644 ---- a/setfiles/Makefile -+++ b/setfiles/Makefile -@@ -12,7 +12,7 @@ CFLAGS ?= -g -Werror -Wall -W - override CFLAGS += -I$(DESTDIR)/usr/include - LDLIBS = -lselinux -lsepol -L$(LIBDIR) - --ifeq ($(AUDITH), /usr/include/libaudit.h) -+ifeq ($(AUDITH), $(PREFIX)/include/libaudit.h) - override CFLAGS += -DUSE_AUDIT - LDLIBS += -laudit - endif --- -2.7.4 - diff --git a/package.bak/policycoreutils/0003-Remove-hardcoded-arch-variable.patch b/package.bak/policycoreutils/0003-Remove-hardcoded-arch-variable.patch deleted file mode 100644 index 375fb577f7..0000000000 --- a/package.bak/policycoreutils/0003-Remove-hardcoded-arch-variable.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 7424f2bea0cb412e96202f596ad8077131589f40 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:18:24 -0400 -Subject: [PATCH] Remove hardcoded arch variable. - -Allow the ARCH value to be passed in as original configuration was -solely based on host architecture. - -This patch was updated to work with version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Niranjan Reddy -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/mcstrans/src/Makefile | 1 - - policycoreutils/mcstrans/utils/Makefile | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/mcstrans/src/Makefile b/mcstrans/src/Makefile -index 6fda57e..7b4489f 100644 ---- a/mcstrans/src/Makefile -+++ b/mcstrans/src/Makefile -@@ -1,4 +1,3 @@ --ARCH = $(shell uname -i) - # Installation directories. - PREFIX ?= $(DESTDIR)/usr - SBINDIR ?= $(DESTDIR)/sbin -diff --git a/mcstrans/utils/Makefile b/mcstrans/utils/Makefile -index 1ffb027..912fe12 100644 ---- a/mcstrans/utils/Makefile -+++ b/mcstrans/utils/Makefile -@@ -2,7 +2,6 @@ - PREFIX ?= $(DESTDIR)/usr - BINDIR ?= $(PREFIX)/sbin - --ARCH = $(shell uname -i) - ifeq "$(ARCH)" "x86_64" - # In case of 64 bit system, use these lines - LIBDIR=/usr/lib64 --- -2.7.4 - diff --git a/package.bak/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch b/package.bak/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch deleted file mode 100644 index 636b722b70..0000000000 --- a/package.bak/policycoreutils/0004-Change-sepolicy-python-install-arguments-to-be-a-var.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 27fd1c85ca95b5d66ab0241a08242a75b60b375c Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:22:57 -0400 -Subject: [PATCH] Change sepolicy python install arguments to be a variable - -To allow the python install arguments to be overwritten, change the -arguments to be a variable. This also cleans up the DESTDIR detection a -little bit. - -Updated to work with version 2.5 - -Signed-off-by: Clayton Shotwell -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/sepolicy/Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/sepolicy/Makefile b/sepolicy/Makefile -index a16f8de..2013301 100644 ---- a/sepolicy/Makefile -+++ b/sepolicy/Makefile -@@ -1,4 +1,7 @@ - PYTHON ?= python -+ifneq ($(DESTDIR),) -+PYTHON_INSTALL_ARGS ?= --root $(DESTDIR) -+endif - - # Installation directories. - PREFIX ?= $(DESTDIR)/usr -@@ -32,7 +35,7 @@ test: - @$(PYTHON) test_sepolicy.py -v - - install: -- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py install $(PYTHON_INSTALL_ARGS) - [ -d $(BINDIR) ] || mkdir -p $(BINDIR) - install -m 755 sepolicy.py $(BINDIR)/sepolicy - (cd $(BINDIR); ln -sf sepolicy sepolgen) --- -2.7.4 - diff --git a/package.bak/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch b/package.bak/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch deleted file mode 100644 index 37ffac8de8..0000000000 --- a/package.bak/policycoreutils/0005-Check-to-see-if-DBUS-is-enabled.patch +++ /dev/null @@ -1,56 +0,0 @@ -From d1bc28c5b2efe60a0ee04d9c171928d0f3475654 Mon Sep 17 00:00:00 2001 -From: Adam Duskett -Date: Thu, 14 Jul 2016 13:26:23 -0400 -Subject: [PATCH] Check to see if DBUS is enabled. - -Adds a condition to prevent linking against dbus when at build time -dbus has not been enabled. - -Updated for 2.5. - -Signed-off-by: Matthew Weber -Signed-off-by: Adam Duskett -Signed-off-by: Adam Duskett ---- - policycoreutils/restorecond/Makefile | 2 ++ - policycoreutils/restorecond/user.c | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/restorecond/Makefile b/restorecond/Makefile -index 92a4a4d..95f38a6 100644 ---- a/restorecond/Makefile -+++ b/restorecond/Makefile -@@ -11,8 +11,10 @@ autostart_DATA = sealertauto.desktop - INITDIR ?= $(DESTDIR)/etc/rc.d/init.d - SELINUXDIR = $(DESTDIR)/etc/selinux - -+ifdef ENABLE_DBUS - DBUSFLAGS = -DHAVE_DBUS -I$(DESTDIR)/usr/include/dbus-1.0 -I$(DESTDIR)/usr/lib64/dbus-1.0/include -I$(DESTDIR)/usr/lib/dbus-1.0/include - DBUSLIB = -ldbus-glib-1 -ldbus-1 -+endif - - CFLAGS ?= -g -Werror -Wall -W - override CFLAGS += -I$(DESTDIR)/usr/include $(DBUSFLAGS) -I$(DESTDIR)/usr/include/glib-2.0 \ -diff --git a/restorecond/user.c b/restorecond/user.c -index 714aae7..a04cddb 100644 ---- a/restorecond/user.c -+++ b/restorecond/user.c -@@ -54,7 +54,6 @@ static const char *PATH="/org/selinux/Restorecond"; - static const char *INTERFACE="org.selinux.RestorecondIface"; - static const char *RULE="type='signal',interface='org.selinux.RestorecondIface'"; - --static int local_lock_fd = -1; - - static DBusHandlerResult - signal_filter (DBusConnection *connection __attribute__ ((__unused__)), DBusMessage *message, void *user_data) -@@ -101,6 +100,7 @@ static int dbus_server(GMainLoop *loop) { - #include - #include - -+static int local_lock_fd = -1; - /* size of the event structure, not counting name */ - #define EVENT_SIZE (sizeof (struct inotify_event)) - /* reasonable guess as to size of 1024 events */ --- -2.7.4 - diff --git a/package.bak/policycoreutils/Config.in b/package.bak/policycoreutils/Config.in deleted file mode 100644 index 53238b4eac..0000000000 --- a/package.bak/policycoreutils/Config.in +++ /dev/null @@ -1,61 +0,0 @@ -comment "policycoreutils needs a glibc toolchain w/ threads, dynamic library" - depends on !BR2_arc - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_POLICYCOREUTILS - bool "policycoreutils" - select BR2_PACKAGE_LIBSEMANAGE - select BR2_PACKAGE_LIBCAP_NG - depends on BR2_PACKAGE_AUDIT_ARCH_SUPPORTS # libsemanage - depends on BR2_TOOLCHAIN_HAS_THREADS # libsemanage - depends on !BR2_STATIC_LIBS #libsemanage - depends on !BR2_arc # libsemanage - depends on BR2_TOOLCHAIN_USES_GLIBC # libsemanage - help - Policycoreutils is a collection of policy utilities (originally - the "core" set of utilities needed to use SELinux, although it - has grown a bit over time), which have different dependencies. - sestatus, secon, run_init, and newrole only use libselinux. - load_policy and setfiles only use libselinux and libsepol. - semodule and semanage use libsemanage (and thus bring in - dependencies on libsepol and libselinux as well). setsebool - uses libselinux to make non-persistent boolean changes (via - the kernel interface) and uses libsemanage to make persistent - boolean changes. - - The base package will install the following utilities: - load_policy - newrole - restorecond - run_init - secon - semodule - semodule_deps - semodule_expand - semodule_link - semodule_package - sepolgen-ifgen - sestatus - setfiles - setsebool - - http://selinuxproject.org/page/Main_Page - -if BR2_PACKAGE_POLICYCOREUTILS - -config BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND - bool "restorecond" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - help - Enable restorecond to be built - -comment "restorecond needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -endif diff --git a/package.bak/policycoreutils/policycoreutils.hash b/package.bak/policycoreutils/policycoreutils.hash deleted file mode 100644 index 999a7788d2..0000000000 --- a/package.bak/policycoreutils/policycoreutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 68891b376f5048edc53c6ccb2fca44da3dc7f4563f4b6894e201d70c04a05a29 policycoreutils-2.6.tar.gz diff --git a/package.bak/policycoreutils/policycoreutils.mk b/package.bak/policycoreutils/policycoreutils.mk deleted file mode 100644 index 6076bb9c07..0000000000 --- a/package.bak/policycoreutils/policycoreutils.mk +++ /dev/null @@ -1,122 +0,0 @@ -################################################################################ -# -# policycoreutils -# -################################################################################ - -POLICYCOREUTILS_VERSION = 2.6 -POLICYCOREUTILS_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -POLICYCOREUTILS_LICENSE = GPLv2 -POLICYCOREUTILS_LICENSE_FILES = COPYING - -POLICYCOREUTILS_DEPENDENCIES = libsemanage libcap-ng - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -POLICYCOREUTILS_DEPENDENCIES += linux-pam -POLICYCOREUTILS_MAKE_OPTS += NAMESPACE_PRIV=y -define POLICYCOREUTILS_INSTALL_TARGET_LINUX_PAM_CONFS - $(INSTALL) -D -m 0644 $(@D)/newrole/newrole-lspp.pamd $(TARGET_DIR)/etc/pam.d/newrole - $(INSTALL) -D -m 0644 $(@D)/run_init/run_init.pamd $(TARGET_DIR)/etc/pam.d/run_init -endef -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -POLICYCOREUTILS_DEPENDENCIES += audit -POLICYCOREUTILS_MAKE_OPTS += AUDIT_LOG_PRIV=y -endif - -# Enable LSPP_PRIV if both audit and linux pam are enabled -ifeq ($(BR2_PACKAGE_LINUX_PAM)$(BR2_PACKAGE_AUDIT),yy) -POLICYCOREUTILS_MAKE_OPTS += LSPP_PRIV=y -endif - -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -POLICYCOREUTILS_MAKE_OPTS += \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(TARGET_CPPFLAGS) -U_FILE_OFFSET_BITS" \ - ARCH="$(BR2_ARCH)" - -POLICYCOREUTILS_MAKE_DIRS = \ - load_policy newrole run_init \ - secon semodule semodule_deps \ - semodule_expand semodule_link \ - semodule_package sepolgen-ifgen \ - sestatus setfiles setsebool - -ifeq ($(BR2_PACKAGE_POLICYCOREUTILS_RESTORECOND),y) -POLICYCOREUTILS_MAKE_DIRS += restorecond -POLICYCOREUTILS_DEPENDENCIES += libglib2 -endif -# We need to pass DESTDIR at build time because it's used by -# policycoreutils build system to find headers and libraries. -define POLICYCOREUTILS_BUILD_CMDS - $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(STAGING_DIR) all - ) -endef - -define POLICYCOREUTILS_INSTALL_TARGET_CMDS - $(foreach d,$(POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(TARGET_DIR) install - ) -endef - -HOST_POLICYCOREUTILS_DEPENDENCIES = \ - host-libsemanage host-dbus-glib \ - host-sepolgen host-setools - -# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h -# large file support. -# See https://bugzilla.redhat.com/show_bug.cgi?id=574992 for more information -HOST_POLICYCOREUTILS_MAKE_OPTS = \ - $(HOST_CONFIGURE_OPTS) \ - CFLAGS="$(HOST_CFLAGS) -U_FILE_OFFSET_BITS" \ - CPPFLAGS="$(HOST_CPPFLAGS) -U_FILE_OFFSET_BITS" \ - PYTHON="$(HOST_DIR)/usr/bin/python" \ - PYTHON_INSTALL_ARGS="$(HOST_PKG_PYTHON_DISTUTILS_INSTALL_OPTS)" \ - ARCH="$(HOSTARCH)" - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_POLICYCOREUTILS_DEPENDENCIES += host-python3 -HOST_POLICYCOREUTILS_MAKE_OPTS += \ - PYLIBVER="python$(PYTHON3_VERSION_MAJOR)" -else -HOST_POLICYCOREUTILS_DEPENDENCIES += host-python -HOST_POLICYCOREUTILS_MAKE_OPTS += \ - PYLIBVER="python$(PYTHON_VERSION_MAJOR)" -endif - -# Note: We are only building the programs required by the refpolicy build -HOST_POLICYCOREUTILS_MAKE_DIRS = \ - load_policy semodule semodule_deps \ - semodule_expand semodule_link \ - semodule_package setfiles restorecond \ - audit2allow scripts semanage sepolicy - -# We need to pass DESTDIR at build time because it's used by -# policycoreutils build system to find headers and libraries. -define HOST_POLICYCOREUTILS_BUILD_CMDS - $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(HOST_DIR) all - ) -endef - -define HOST_POLICYCOREUTILS_INSTALL_CMDS - $(foreach d,$(HOST_POLICYCOREUTILS_MAKE_DIRS), - $(MAKE) -C $(@D)/$(d) $(HOST_POLICYCOREUTILS_MAKE_OPTS) \ - DESTDIR=$(HOST_DIR) install - ) - # Fix python paths - $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/audit2allow - $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolgen-ifgen - $(SED) 's%/usr/bin/%$(HOST_DIR)/usr/bin/%g' $(HOST_DIR)/usr/bin/sepolicy -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/polkit/Config.in b/package.bak/polkit/Config.in deleted file mode 100644 index debd1d9daf..0000000000 --- a/package.bak/polkit/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_POLKIT - bool "polkit" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_EXPAT - help - PolicyKit is a toolkit for defining and handling - authorizations. It is used for allowing unprivileged - processes to speak to privileged processes. - - http://www.freedesktop.org/wiki/Software/polkit - -comment "polkit needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/polkit/polkit.hash b/package.bak/polkit/polkit.hash deleted file mode 100644 index 5e133b43e2..0000000000 --- a/package.bak/polkit/polkit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 36607c8ce576980ee55bd12bab1944f13217eb8e9d04ab56022545861ece3bc5 polkit-0.103.tar.gz diff --git a/package.bak/polkit/polkit.mk b/package.bak/polkit/polkit.mk deleted file mode 100644 index f31387ec6b..0000000000 --- a/package.bak/polkit/polkit.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# polkit -# -################################################################################ - -POLKIT_VERSION = 0.103 -POLKIT_SITE = http://www.freedesktop.org/software/polkit/releases -POLKIT_LICENSE = GPLv2 -POLKIT_LICENSE_FILES = COPYING - -POLKIT_INSTALL_STAGING = YES - -POLKIT_DEPENDENCIES = libglib2 host-intltool expat - -# We could also support --with-authfw=pam -POLKIT_CONF_OPTS = \ - --with-authfw=shadow \ - --with-os-type=unknown \ - --disable-man-pages \ - --disable-examples - -$(eval $(autotools-package)) diff --git a/package.bak/poppler/Config.in b/package.bak/poppler/Config.in deleted file mode 100644 index d741f65287..0000000000 --- a/package.bak/poppler/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -config BR2_PACKAGE_POPPLER - bool "poppler" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 - help - Poppler is a PDF rendering library based on the xpdf-3.0 code base. - - http://poppler.freedesktop.org/ - -if BR2_PACKAGE_POPPLER - -config BR2_PACKAGE_POPPLER_QT - bool "Qt support" - depends on BR2_PACKAGE_QT - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_XML - help - Build Qt support into the Poppler library - -comment "poppler Qt support needs a toolchain not affected by Binutils bug 19405" - depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -config BR2_PACKAGE_POPPLER_QT5 - bool "Qt5 support" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5BASE_XML - help - Build Qt support into the Poppler library - -endif - -comment "poppler needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/poppler/poppler.hash b/package.bak/poppler/poppler.hash deleted file mode 100644 index af597e0297..0000000000 --- a/package.bak/poppler/poppler.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e997c9ad81a8372f2dd03a02b00692b8cc479c220340c8881edaca540f402c1f poppler-0.51.0.tar.xz diff --git a/package.bak/poppler/poppler.mk b/package.bak/poppler/poppler.mk deleted file mode 100644 index fda8284507..0000000000 --- a/package.bak/poppler/poppler.mk +++ /dev/null @@ -1,108 +0,0 @@ -################################################################################ -# -# poppler -# -################################################################################ - -POPPLER_VERSION = 0.51.0 -POPPLER_SOURCE = poppler-$(POPPLER_VERSION).tar.xz -POPPLER_SITE = http://poppler.freedesktop.org -POPPLER_DEPENDENCIES = fontconfig host-pkgconf -POPPLER_LICENSE = GPLv2+ -POPPLER_LICENSE_FILES = COPYING -POPPLER_INSTALL_STAGING = YES -POPPLER_CONF_OPTS = --with-font-configuration=fontconfig \ - --enable-xpdf-headers - -ifeq ($(BR2_PACKAGE_CAIRO),y) -POPPLER_CONF_OPTS += --enable-cairo-output -POPPLER_DEPENDENCIES += cairo -else -POPPLER_CONF_OPTS += --disable-cairo-output -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -POPPLER_CONF_OPTS += --enable-cms=lcms2 -POPPLER_DEPENDENCIES += lcms2 -else -POPPLER_CONF_OPTS += --enable-cms=none -endif - -ifeq ($(BR2_PACKAGE_CAIRO)$(BR2_PACKAGE_LIBGLIB2),yy) -POPPLER_CONF_OPTS += --enable-poppler-glib -POPPLER_DEPENDENCIES += libglib2 -else -POPPLER_CONF_OPTS += --disable-poppler-glib -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -POPPLER_CONF_OPTS += --enable-libtiff -# Help poppler to find libtiff in static linking scenarios -POPPLER_CONF_ENV += \ - LIBTIFF_LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`" -POPPLER_DEPENDENCIES += tiff -else -POPPLER_CONF_OPTS += --disable-libtiff -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -POPPLER_CONF_OPTS += --enable-libjpeg -POPPLER_DEPENDENCIES += jpeg -else -POPPLER_CONF_OPTS += --disable-libjpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -POPPLER_CONF_OPTS += --enable-libpng -POPPLER_DEPENDENCIES += libpng -else -POPPLER_CONF_OPTS += --disable-libpng -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -POPPLER_CONF_OPTS += --enable-zlib -POPPLER_DEPENDENCIES += zlib -else -POPPLER_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_POPPLER_LIBCURL),y) -POPPLER_CONF_OPTS += --enable-libcurl -POPPLER_DEPENDENCIES += libcurl -else -POPPLER_CONF_OPTS += --disable-libcurl -endif - -ifeq ($(BR2_PACKAGE_XORG7),y) -POPPLER_CONF_OPTS += --with-x -POPPLER_DEPENDENCIES += xlib_libX11 xlib_libXext -else -POPPLER_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_POPPLER_QT),y) -POPPLER_DEPENDENCIES += qt -POPPLER_CONF_OPTS += --enable-poppler-qt4 -else -POPPLER_CONF_OPTS += --disable-poppler-qt4 -endif - -ifeq ($(BR2_PACKAGE_POPPLER_QT5),y) -POPPLER_DEPENDENCIES += qt5base -POPPLER_CONF_OPTS += --enable-poppler-qt5 -# since Qt5.7.x c++11 is needed (LTS Qt5.6.x is the last one without this requirement) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -POPPLER_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11" -endif -else -POPPLER_CONF_OPTS += --disable-poppler-qt5 -endif - -ifeq ($(BR2_PACKAGE_OPENJPEG),y) -POPPLER_DEPENDENCIES += openjpeg -POPPLER_CONF_OPTS += --enable-libopenjpeg -else -POPPLER_CONF_OPTS += --enable-libopenjpeg=none -endif - -$(eval $(autotools-package)) diff --git a/package.bak/popt/0001-no-wchar.patch b/package.bak/popt/0001-no-wchar.patch deleted file mode 100644 index 161165e72c..0000000000 --- a/package.bak/popt/0001-no-wchar.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru popt-1.14_vanilla/popthelp.c popt-1.14_no-wchar/popthelp.c ---- popt-1.14_vanilla/popthelp.c 2008-03-27 17:33:08.000000000 +0000 -+++ popt-1.14_no-wchar/popthelp.c 2008-04-10 05:44:43.000000000 +0000 -@@ -15,7 +15,7 @@ - #include - #endif - --#define POPT_WCHAR_HACK -+/* #define POPT_WCHAR_HACK */ - #ifdef POPT_WCHAR_HACK - #include /* for mbsrtowcs */ - /*@access mbstate_t @*/ diff --git a/package.bak/popt/0002-fix-autoreconf.patch b/package.bak/popt/0002-fix-autoreconf.patch deleted file mode 100644 index f1fcc57a85..0000000000 --- a/package.bak/popt/0002-fix-autoreconf.patch +++ /dev/null @@ -1,38 +0,0 @@ -Make sure we can autoreconfigure popt - -This commit makes a few changes in the popt build system to allow it -to be autoreconfigured with modern autotools: - - - the TESTS variable shouldn't be using $(top_srcdir), and since we - don't care about tests in Buildroot, we just disable it. - - - the AM_C_PROTOTYPES macro is deprecated and should no longer be - used, causes an error with autoconf/automake. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.am -=================================================================== ---- a/Makefile.am -+++ b/Makefile.am -@@ -37,8 +37,6 @@ - TESTS_ENVIRONMENT = \ - test1="$(top_builddir)/test1" - --TESTS = $(top_srcdir)/testit.sh -- - include_HEADERS = popt.h - - usrlibdir = $(libdir) -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -46,7 +46,6 @@ - AC_SYS_LARGEFILE - - AC_ISC_POSIX --AM_C_PROTOTYPES - - AC_CHECK_HEADERS(float.h fnmatch.h glob.h langinfo.h libintl.h mcheck.h unistd.h) - diff --git a/package.bak/popt/0003-glob-detection.patch b/package.bak/popt/0003-glob-detection.patch deleted file mode 100644 index 7bdce7d717..0000000000 --- a/package.bak/popt/0003-glob-detection.patch +++ /dev/null @@ -1,41 +0,0 @@ -Detect glob_pattern_p() - -The current popt build system tests the existence of , and -then assumes that if __GLIBC__ is defined, then glob_pattern_p() must -be available. Unfortunately, that's not true with uClibc: may -be installed, but not necessarily the GNU glob extensions... and -uClibc defines __GLIBC__. This is causing build issues with certain -uClibc toolchains that do not have GNU glob extensions enabled. - -To fix this, this patch adds an AC_CHECK_FUNCS() test for -glob_pattern_p, and uses that to find out whether glob_pattern_p() is -available or not. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -81,7 +81,7 @@ - AC_CHECK_FUNC(setreuid, [], [ - AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) - ]) --AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom) -+AC_CHECK_FUNCS(getuid geteuid iconv mtrace __secure_getenv setregid stpcpy strerror vasprintf srandom glob_pattern_p) - - AM_GNU_GETTEXT([external]) - AM_ICONV_LINK -Index: b/poptconfig.c -=================================================================== ---- a/poptconfig.c -+++ b/poptconfig.c -@@ -42,7 +42,7 @@ - /*@=declundef =exportheader =incondefs =protoparammatch =redecl =type @*/ - #endif /* __LCLINT__ */ - --#if !defined(__GLIBC__) -+#if !defined(HAVE_GLOB_PATTERN_P) - /* Return nonzero if PATTERN contains any metacharacters. - Metacharacters can be quoted with backslashes if QUOTE is nonzero. */ - static int diff --git a/package.bak/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch b/package.bak/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch deleted file mode 100644 index 9b0b07e383..0000000000 --- a/package.bak/popt/0004-popt.pc-add-the-libintl-library-to-the-Libs.private-.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 470755ccc353b59107c957972d908cbde4942c8d Mon Sep 17 00:00:00 2001 -From: Fabio Porcedda -Date: Sun, 1 Mar 2015 21:13:48 +0100 -Subject: [PATCH] popt.pc: add the libintl library to the Libs.private field - -If static linking and libintl is used, the program that uses the popt -library needs to link to the libintl library too so add the libintl -library to the libs.private field because is useful for programs that call - pkg-config --static --libs popt -they get the libintl library too: - -L<...> -lpopt -lintl - -This patch was already sent upstream: -http://rpm5.org/community/popt-devel/0294.html - -Signed-off-by: Fabio Porcedda ---- - configure.ac | 1 + - popt.pc.in | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index e8eb238..816d272 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -90,6 +90,7 @@ popt_sysconfdir="${sysconfdir}" - eval "popt_sysconfdir=\"${popt_sysconfdir}\"" # expand contained ${prefix} - AC_DEFINE_UNQUOTED([POPT_SYSCONFDIR], ["$popt_sysconfdir"], [Full path to default POPT configuration directory]) - -+AC_SUBST([POPT_PKGCONFIG_LIBS_PRIVATE],"$LIBINTL") - - # Define a (hope) portable Libs pkgconfig directive that - # - Don't harm if the default library search path include ${libdir} -diff --git a/popt.pc.in b/popt.pc.in -index a86437c..0acfdb9 100644 ---- a/popt.pc.in -+++ b/popt.pc.in -@@ -6,5 +6,6 @@ includedir=@includedir@ - Name: popt - Version: @VERSION@ - Description: popt library. -+Libs.private: @POPT_PKGCONFIG_LIBS_PRIVATE@ - Libs: @POPT_PKGCONFIG_LIBS@ - Cflags: -I${includedir} --- -2.3.1 - diff --git a/package.bak/popt/Config.in b/package.bak/popt/Config.in deleted file mode 100644 index cbcdc15dc0..0000000000 --- a/package.bak/popt/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_POPT - bool "popt" - help - Popt is a C library for parsing command line parameters. - - http://rpm5.org diff --git a/package.bak/popt/popt.hash b/package.bak/popt/popt.hash deleted file mode 100644 index 875bbae7a3..0000000000 --- a/package.bak/popt/popt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated: -sha256 e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8 popt-1.16.tar.gz diff --git a/package.bak/popt/popt.mk b/package.bak/popt/popt.mk deleted file mode 100644 index 863a47a658..0000000000 --- a/package.bak/popt/popt.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# popt -# -################################################################################ - -POPT_VERSION = 1.16 -POPT_SITE = http://rpm5.org/files/popt -POPT_INSTALL_STAGING = YES -POPT_LICENSE = MIT -POPT_LICENSE_FILES = COPYING -POPT_AUTORECONF = YES -POPT_GETTEXTIZE = YES - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -POPT_DEPENDENCIES += gettext -endif - -POPT_CONF_ENV = ac_cv_va_copy=yes - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -POPT_CONF_ENV += am_cv_lib_iconv=yes -POPT_CONF_OPTS += --with-libiconv-prefix=$(STAGING_DIR)/usr -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/portaudio/Config.in b/package.bak/portaudio/Config.in deleted file mode 100644 index 252a92a650..0000000000 --- a/package.bak/portaudio/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -comment "portaudio needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_PORTAUDIO - bool "portaudio" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - PortAudio is a free, cross-platform, open-source, - audio I/O library. - - http://www.portaudio.com/ - -if BR2_PACKAGE_PORTAUDIO - -config BR2_PACKAGE_PORTAUDIO_ALSA - bool "alsa support" - select BR2_PACKAGE_ALSA_LIB - default y - help - Compile with ALSA support. - -config BR2_PACKAGE_PORTAUDIO_OSS - bool "oss support" - help - Compile with OSS support. - -config BR2_PACKAGE_PORTAUDIO_CXX - bool "C++ bindings" - depends on BR2_INSTALL_LIBSTDCPP - help - Enables C++ bindings. - -endif # BR2_PACKAGE_PORTAUDIO diff --git a/package.bak/portaudio/portaudio.hash b/package.bak/portaudio/portaudio.hash deleted file mode 100644 index ca7baf7fbc..0000000000 --- a/package.bak/portaudio/portaudio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f5a21d7dcd6ee84397446fa1fa1a0675bb2e8a4a6dceb4305a8404698d8d1513 pa_stable_v190600_20161030.tgz diff --git a/package.bak/portaudio/portaudio.mk b/package.bak/portaudio/portaudio.mk deleted file mode 100644 index 0cf754c7d5..0000000000 --- a/package.bak/portaudio/portaudio.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# portaudio -# -################################################################################ - -PORTAUDIO_VERSION = v190600_20161030 -PORTAUDIO_SITE = http://www.portaudio.com/archives -PORTAUDIO_SOURCE = pa_stable_$(PORTAUDIO_VERSION).tgz -PORTAUDIO_INSTALL_STAGING = YES -PORTAUDIO_MAKE = $(MAKE1) -PORTAUDIO_LICENSE = portaudio license (MIT-like plus special clause) -PORTAUDIO_LICENSE_FILES = LICENSE.txt - -PORTAUDIO_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_PORTAUDIO_ALSA),alsa-lib) - -PORTAUDIO_CONF_OPTS = \ - $(if $(BR2_PACKAGE_PORTAUDIO_ALSA),--with-alsa,--without-alsa) \ - $(if $(BR2_PACKAGE_PORTAUDIO_OSS),--with-oss,--without-oss) \ - $(if $(BR2_PACKAGE_PORTAUDIO_CXX),--enable-cxx,--disable-cxx) - -$(eval $(autotools-package)) diff --git a/package.bak/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch b/package.bak/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch deleted file mode 100644 index 01aa7bf849..0000000000 --- a/package.bak/portmap/0001-README-fix-typo-in-tcp-wrapper-doc.patch +++ /dev/null @@ -1,26 +0,0 @@ -From af4a27a17bbdbe941f2462e116c2e4c8ade110e3 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 19 Nov 2010 23:35:20 -0500 -Subject: [PATCH 1/4] README: fix typo in tcp wrapper doc - -Signed-off-by: Mike Frysinger ---- - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/README b/README -index 0da54cc..916de7e 100644 ---- a/README -+++ b/README -@@ -18,7 +18,7 @@ There is no "./configure", just use "make". - - Some make variable can be used to control compilation. - -- NO_TCP_WRAPPER= if non-empty, doen't use tcp_wrappers -+ NO_TCP_WRAPPER= if non-empty, don't use tcp_wrappers - USE_DNS= if set, tcp_wrappers can check peers based on hostname - as well as IP address. This should only be used if you - are certain that gethostbyname will never trigger a --- -1.7.3.1 - diff --git a/package.bak/portmap/0002-NO_PIE-make-PIE-support-controllable.patch b/package.bak/portmap/0002-NO_PIE-make-PIE-support-controllable.patch deleted file mode 100644 index 6e544bfaf0..0000000000 --- a/package.bak/portmap/0002-NO_PIE-make-PIE-support-controllable.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 087874b15367a04fd482541d1832696d7163d1ac Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 19 Nov 2010 23:35:47 -0500 -Subject: [PATCH 2/4] NO_PIE: make PIE support controllable - -Signed-off-by: Mike Frysinger ---- - Makefile | 8 ++++++-- - README | 1 + - 2 files changed, 7 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 5343428..cfcfdbb 100644 ---- a/Makefile -+++ b/Makefile -@@ -106,6 +106,10 @@ CPPFLAGS += -DIGNORE_SIGCHLD # AIX 4.x, HP-UX 9.x - # - # LDLIBS += -m - # CFLAGS += -arch m68k -arch i386 -arch hppa -+ifeq ($(NO_PIE),) -+CFLAGS_PIE = -fpie -+LDFLAGS_PIE = -pie -+endif - - # Auxiliary libraries that you may have to specify - # -@@ -125,9 +129,9 @@ CFLAGS += -Wall -Wstrict-prototypes - all: portmap pmap_dump pmap_set portmap.man - - CPPFLAGS += $(HOSTS_ACCESS) --portmap: CFLAGS += -fpie -+portmap: CFLAGS += $(CFLAGS_PIE) - portmap: LDLIBS += $(WRAP_LIB) --portmap: LDFLAGS += -pie -+portmap: LDFLAGS += $(LDFLAGS_PIE) - portmap: portmap.o pmap_check.o from_local.o - - from_local: CPPFLAGS += -DTEST -diff --git a/README b/README -index 916de7e..e0b561a 100644 ---- a/README -+++ b/README -@@ -18,6 +18,7 @@ There is no "./configure", just use "make". - - Some make variable can be used to control compilation. - -+ NO_PIE= if non-empty, don't build portmap as a PIE - NO_TCP_WRAPPER= if non-empty, don't use tcp_wrappers - USE_DNS= if set, tcp_wrappers can check peers based on hostname - as well as IP address. This should only be used if you --- -1.7.3.1 - diff --git a/package.bak/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch b/package.bak/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch deleted file mode 100644 index 41396b6631..0000000000 --- a/package.bak/portmap/0003-NO_FORK-control-usage-of-fork-for-nommu-systems.patch +++ /dev/null @@ -1,95 +0,0 @@ -From b3afea5757af1a7356ba30d2e0a7d5909ca18121 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 19 Nov 2010 23:48:20 -0500 -Subject: [PATCH 3/4] NO_FORK: control usage of fork() for nommu systems - -nommu systems lack a fork() function, so add a NO_FORK flag to control -its usage. We don't lose a ton of functionality in doing so, and on an -embedded system, this is OK. - -Signed-off-by: Mike Frysinger ---- - Makefile | 5 +++++ - README | 1 + - pmap_check.c | 6 ++++-- - portmap.c | 6 ++++++ - 4 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index cfcfdbb..9df5574 100644 ---- a/Makefile -+++ b/Makefile -@@ -27,6 +27,11 @@ MAN_SED += -e 's/USE_DNS/yes/' - endif - endif - -+# For no-mmu systems, we have to disable the fork() functions. -+ifneq ($(NO_FORK),) -+CPPFLAGS += -DNO_FORK -+endif -+ - # Comment out if your RPC library does not allocate privileged ports for - # requests from processes with root privilege, or the new portmap will - # always reject requests to register/unregister services on privileged -diff --git a/README b/README -index e0b561a..bda1707 100644 ---- a/README -+++ b/README -@@ -18,6 +18,7 @@ There is no "./configure", just use "make". - - Some make variable can be used to control compilation. - -+ NO_FORK= if non-empty, don't use fork (good for nommu systems) - NO_PIE= if non-empty, don't build portmap as a PIE - NO_TCP_WRAPPER= if non-empty, don't use tcp_wrappers - USE_DNS= if set, tcp_wrappers can check peers based on hostname -diff --git a/pmap_check.c b/pmap_check.c -index 6b3e490..983414e 100644 ---- a/pmap_check.c -+++ b/pmap_check.c -@@ -302,8 +302,10 @@ static void logit(int severity, struct sockaddr_in *addr, - * getrpcbynumber() or syslog() does its thing. - */ - -- if (fork() == 0) { -- -+#ifndef NO_FORK -+ if (fork() == 0) -+#endif -+ { - /* Try to map program number to name. */ - - if (prognum == 0) { -diff --git a/portmap.c b/portmap.c -index 2a98881..94abc64 100644 ---- a/portmap.c -+++ b/portmap.c -@@ -753,6 +755,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt) - if ((pml = find_service(a.rmt_prog, a.rmt_vers, - (u_long)IPPROTO_UDP)) == NULL) - return; -+#ifndef NO_FORK - /* - * fork a child to do the work. Parent immediately returns. - * Child exits upon completion. -@@ -763,6 +766,7 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt) - a.rmt_prog); - return; - } -+#endif - port = pml->pml_map.pm_port; - get_myaddress(&me); - me.sin_port = htons(port); -@@ -783,7 +787,9 @@ static void callit(struct svc_req *rqstp, SVCXPRT *xprt) - clnt_destroy(client); - } - (void)close(so); -+#ifndef NO_FORK - exit(0); -+#endif - } - - #ifndef IGNORE_SIGCHLD /* Lionel Cons */ --- -1.7.3.1 - diff --git a/package.bak/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch b/package.bak/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch deleted file mode 100644 index 665d6a1f99..0000000000 --- a/package.bak/portmap/0004-NO_PERROR-control-overriding-of-perror-symbol.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 8cea0778f0fb838a7bd764be08f15e1494e5a0b2 Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Fri, 19 Nov 2010 23:50:27 -0500 -Subject: [PATCH 4/4] NO_PERROR: control overriding of perror() symbol - -Doing static builds of portmap might fail when the C library's perror() -function is pulled in and collides with portmap's definition. So add a -flag to control the local override. - -Signed-off-by: Mike Frysinger ---- - Makefile | 5 +++++ - README | 1 + - 2 files changed, 6 insertions(+), 0 deletions(-) - -diff --git a/Makefile b/Makefile -index 9df5574..1635107 100644 ---- a/Makefile -+++ b/Makefile -@@ -32,6 +32,11 @@ ifneq ($(NO_FORK),) - CPPFLAGS += -DNO_FORK - endif - -+# For static builds, we might hit perror() symbol clashes -+ifneq ($(NO_PERROR),) -+CPPFLAGS += -DNO_PERROR -+endif -+ - # Comment out if your RPC library does not allocate privileged ports for - # requests from processes with root privilege, or the new portmap will - # always reject requests to register/unregister services on privileged -diff --git a/README b/README -index bda1707..05861a8 100644 ---- a/README -+++ b/README -@@ -19,6 +19,7 @@ There is no "./configure", just use "make". - Some make variable can be used to control compilation. - - NO_FORK= if non-empty, don't use fork (good for nommu systems) -+ NO_PERROR= if non-empty, don't override the perror() func - NO_PIE= if non-empty, don't build portmap as a PIE - NO_TCP_WRAPPER= if non-empty, don't use tcp_wrappers - USE_DNS= if set, tcp_wrappers can check peers based on hostname -diff --git a/portmap.c b/portmap.c -index 2a98881..94abc64 100644 ---- a/portmap.c -+++ b/portmap.c -@@ -391,12 +391,14 @@ main(int argc, char **argv) - abort(); - } - -+#ifndef NO_PERROR - /* need to override perror calls in rpc library */ - void perror(const char *what) - { - - syslog(LOG_ERR, "%s: %m", what); - } -+#endif - - static struct pmaplist * - find_service(u_long prog, u_long vers, u_long prot) --- -1.7.3.1 - diff --git a/package.bak/portmap/0005-tcpd.patch b/package.bak/portmap/0005-tcpd.patch deleted file mode 100644 index c6af8f8c80..0000000000 --- a/package.bak/portmap/0005-tcpd.patch +++ /dev/null @@ -1,18 +0,0 @@ -Enable compile without tcp-wrappers - -Patch by Timothy Redaelli - -http://bugs.gentoo.org/178242 - ---- portmap_6.0/pmap_check.c -+++ portmap_6.0/pmap_check.c -@@ -44,7 +44,9 @@ - #include - #include - #endif -+#ifdef HOSTS_ACCESS - #include -+#endif - #include - #include - diff --git a/package.bak/portmap/Config.in b/package.bak/portmap/Config.in deleted file mode 100644 index d960690d7b..0000000000 --- a/package.bak/portmap/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PORTMAP - bool "portmap" - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - # portmap and rpcbind provide the same feature, so they are - # mutually exclusive. rpcbind is the newer, preferred - # implementation. - depends on !BR2_PACKAGE_RPCBIND - help - The standard portmapper for RPC services. - - Note that portmap is being deprecated in favour of rpcbind. - - http://neil.brown.name/portmap/ - -comment "portmap needs a toolchain w/ RPC" - depends on !BR2_TOOLCHAIN_HAS_NATIVE_RPC diff --git a/package.bak/portmap/S13portmap b/package.bak/portmap/S13portmap deleted file mode 100755 index 9aa6adfc5b..0000000000 --- a/package.bak/portmap/S13portmap +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh - -[ -f /sbin/portmap ] || exit 0 - -start() { - printf "Starting portmap: " - portmap - mkdir -p /var/lock/subsys - touch /var/lock/subsys/portmap - echo "done" -} - - -stop() { - printf "Stopping portmap: " - echo - killall portmap - rm -rf /var/lock/subsys - echo "done" -} - -restart() { - stop - start - rm -f /var/run/portmap.state -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|reload|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/portmap/portmap.hash b/package.bak/portmap/portmap.hash deleted file mode 100644 index e542b2d981..0000000000 --- a/package.bak/portmap/portmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 02c820d39f3e6e729d1bea3287a2d8a6c684f1006fb9612f97dcad4a281d41de portmap-6.0.tgz diff --git a/package.bak/portmap/portmap.mk b/package.bak/portmap/portmap.mk deleted file mode 100644 index 5caf54cb21..0000000000 --- a/package.bak/portmap/portmap.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# portmap -# -################################################################################ - -PORTMAP_VERSION = 6.0 -PORTMAP_SOURCE = portmap-$(PORTMAP_VERSION).tgz -PORTMAP_SITE = http://neil.brown.name/portmap -PORTMAP_LICENSE = BSD-4c (portmap.c) SunRPC License (portmap.c from_local.c) -PORTMAP_LICENSE_FILES = portmap.c from_local.c -PORTMAP_SBINS = portmap pmap_dump pmap_set - -PORTMAP_FLAGS = NO_TCP_WRAPPER=1 NO_PIE=1 NO_PERROR=1 -ifeq ($(BR2_USE_MMU),) -PORTMAP_FLAGS += NO_FORK=1 -endif - -define PORTMAP_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(PORTMAP_FLAGS) -endef - -define PORTMAP_INSTALL_TARGET_CMDS - for sbin in $(PORTMAP_SBINS); do \ - $(INSTALL) -D -m 0755 $(@D)/$$sbin $(TARGET_DIR)/sbin/$$sbin || exit 1; \ - done -endef - -define PORTMAP_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/portmap/S13portmap $(TARGET_DIR)/etc/init.d/S13portmap -endef - -$(eval $(generic-package)) diff --git a/package.bak/postgresql/Config.in b/package.bak/postgresql/Config.in deleted file mode 100644 index e9b8f48d4a..0000000000 --- a/package.bak/postgresql/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_POSTGRESQL - bool "postgresql" - depends on BR2_USE_MMU # fork() - # fails to build in a pure static linking scenario, and - # postgresql is unlikely to be used in a pure statically - # linked environment. - depends on !BR2_STATIC_LIBS - help - PostgreSQL is a powerful, open source object-relational - database system. - - Enable the readline package to gain readline support in - pgsql (the command line interpreter), which offers - command history and edit functions. - - Enable the zlib package to gain builtin compression for - archives with pg_dump and pg_restore. - - http://www.postgresql.org - -comment "postgresql needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/postgresql/S50postgresql b/package.bak/postgresql/S50postgresql deleted file mode 100644 index 1ece4fca9e..0000000000 --- a/package.bak/postgresql/S50postgresql +++ /dev/null @@ -1,44 +0,0 @@ -#!/bin/sh -# -# start postgresql -# - -umask 077 - -if [ ! -f /var/lib/pgsql/PG_VERSION ]; then - echo "Initializing postgresql data base..." - su - postgres -c '/usr/bin/pg_ctl initdb -D /var/lib/pgsql' - echo "done" -fi - -start() { - printf "Starting postgresql: " - su - postgres -c '/usr/bin/pg_ctl start -w -D /var/lib/pgsql -l logfile' - echo "OK" -} -stop() { - printf "Stopping postgresql: " - su - postgres -c '/usr/bin/pg_ctl stop -D /var/lib/pgsql -m fast' - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/postgresql/pg_config b/package.bak/postgresql/pg_config deleted file mode 100644 index 85c0e63ddb..0000000000 --- a/package.bak/postgresql/pg_config +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# -# Minimal pg_config implementation as replacement for the native pg_config application -# Only implements --includedir and --libdir -# - -prefix=/usr - -case "$1" in - --includedir) - echo "$prefix/include" - ;; - --libdir) - echo "$prefix/lib" - ;; - *) - echo "Usage: $0 {--includedir|--libdir}" -esac diff --git a/package.bak/postgresql/postgresql.hash b/package.bak/postgresql/postgresql.hash deleted file mode 100644 index 900a55a7ad..0000000000 --- a/package.bak/postgresql/postgresql.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://ftp.postgresql.org/pub/source/v9.6.1/postgresql-9.6.1.tar.bz2.sha256 -sha256 e5101e0a49141fc12a7018c6dad594694d3a3325f5ab71e93e0e51bd94e51fcd postgresql-9.6.1.tar.bz2 diff --git a/package.bak/postgresql/postgresql.mk b/package.bak/postgresql/postgresql.mk deleted file mode 100644 index bc2bf47ee7..0000000000 --- a/package.bak/postgresql/postgresql.mk +++ /dev/null @@ -1,99 +0,0 @@ -################################################################################ -# -# postgresql -# -################################################################################ - -POSTGRESQL_VERSION = 9.6.1 -POSTGRESQL_SOURCE = postgresql-$(POSTGRESQL_VERSION).tar.bz2 -POSTGRESQL_SITE = http://ftp.postgresql.org/pub/source/v$(POSTGRESQL_VERSION) -POSTGRESQL_LICENSE = PostgreSQL -POSTGRESQL_LICENSE_FILES = COPYRIGHT -POSTGRESQL_INSTALL_STAGING = YES -POSTGRESQL_CONFIG_SCRIPTS = pg_config -POSTGRESQL_CONF_ENV = \ - ac_cv_type_struct_sockaddr_in6=yes \ - pgac_cv_snprintf_long_long_int_modifier="ll" \ - pgac_cv_snprintf_size_t_support=yes -POSTGRESQL_CONF_OPTS = --disable-rpath - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# PostgreSQL does not build against uClibc with locales -# enabled, due to an uClibc bug, see -# http://lists.uclibc.org/pipermail/uclibc/2014-April/048326.html -# so overwrite automatic detection and disable locale support -POSTGRESQL_CONF_ENV += pgac_cv_type_locale_t=no -endif - -ifneq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -POSTGRESQL_CONF_OPTS += --disable-thread-safety -endif - -ifeq ($(BR2_arcle)$(BR2_arceb)$(BR2_microblazeel)$(BR2_microblazebe)$(BR2_or1k)$(BR2_nios2)$(BR2_xtensa),y) -POSTGRESQL_CONF_OPTS += --disable-spinlocks -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -POSTGRESQL_DEPENDENCIES += readline -else -POSTGRESQL_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -POSTGRESQL_DEPENDENCIES += zlib -else -POSTGRESQL_CONF_OPTS += --without-zlib -endif - -ifeq ($(BR2_PACKAGE_TZDATA),y) -POSTGRESQL_DEPENDENCIES += tzdata -POSTGRESQL_CONF_OPTS += --with-system-tzdata=/usr/share/zoneinfo -else -POSTGRESQL_DEPENDENCIES += host-zic -POSTGRESQL_CONF_ENV += ZIC="$(ZIC)" -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -POSTGRESQL_DEPENDENCIES += openssl -POSTGRESQL_CONF_OPTS += --with-openssl -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -POSTGRESQL_DEPENDENCIES += openldap -POSTGRESQL_CONF_OPTS += --with-ldap -else -POSTGRESQL_CONF_OPTS += --without-ldap -endif - -define POSTGRESQL_USERS - postgres -1 postgres -1 * /var/lib/pgsql /bin/sh - PostgreSQL Server -endef - -define POSTGRESQL_INSTALL_TARGET_FIXUP - $(INSTALL) -dm 0700 $(TARGET_DIR)/var/lib/pgsql - $(RM) -rf $(TARGET_DIR)/usr/lib/postgresql/pgxs -endef - -POSTGRESQL_POST_INSTALL_TARGET_HOOKS += POSTGRESQL_INSTALL_TARGET_FIXUP - -define POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG - $(INSTALL) -m 0755 -D package/postgresql/pg_config \ - $(STAGING_DIR)/usr/bin/pg_config -endef - -POSTGRESQL_POST_INSTALL_STAGING_HOOKS += POSTGRESQL_INSTALL_CUSTOM_PG_CONFIG - -define POSTGRESQL_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/postgresql/S50postgresql \ - $(TARGET_DIR)/etc/init.d/S50postgresql -endef - -define POSTGRESQL_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/postgresql/postgresql.service \ - $(TARGET_DIR)/usr/lib/systemd/system/postgresql.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/postgresql.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/postgresql.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/postgresql/postgresql.service b/package.bak/postgresql/postgresql.service deleted file mode 100644 index 4a96258684..0000000000 --- a/package.bak/postgresql/postgresql.service +++ /dev/null @@ -1,24 +0,0 @@ -[Unit] -Description=PostgreSQL database server -After=network.target - -[Service] -Type=forking - -# start timeout disabled because initdb may run a little -# longer (eg. 5 minutes on RaspberryPi) -TimeoutStartSec=0 - -User=postgres -Group=postgres - -SyslogIdentifier=postgres -PIDFile=/var/lib/pgsql/postmaster.pid - -ExecStartPre=/bin/sh -c "if [ ! -f /var/lib/pgsql/PG_VERSION ]; then /usr/bin/pg_ctl initdb -D /var/lib/pgsql; fi" -ExecStart=/usr/bin/pg_ctl start -D /var/lib/pgsql -w -l /var/lib/pgsql/logfile -ExecReload=/usr/bin/pg_ctl reload -D /var/lib/pgsql -ExecStop=/usr/bin/pg_ctl stop -D /var/lib/pgsql -m fast - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/pound/Config.in b/package.bak/pound/Config.in deleted file mode 100644 index 91c29ea7a6..0000000000 --- a/package.bak/pound/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_POUND - bool "pound" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - help - The Pound program is a reverse proxy, load balancer and HTTPS - front-end for Web server(s). Pound was developed to enable - distributing the load among several Web-servers and to allow - for a convenient SSL wrapper for those Web servers that do not - offer it natively. - - http://www.apsis.ch/pound - -comment "pound needs a toolchain w/ dynamic library, threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/pound/pound.hash b/package.bak/pound/pound.hash deleted file mode 100644 index 6908b9060c..0000000000 --- a/package.bak/pound/pound.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 cdfbf5a7e8dc8fbbe0d6c1e83cd3bd3f2472160aac65684bb01ef661c626a8e4 Pound-2.7.tgz diff --git a/package.bak/pound/pound.mk b/package.bak/pound/pound.mk deleted file mode 100644 index 408664214b..0000000000 --- a/package.bak/pound/pound.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# pound -# -################################################################################ - -POUND_VERSION = 2.7 -POUND_SITE = http://www.apsis.ch/pound -POUND_SOURCE = Pound-$(POUND_VERSION).tgz -POUND_LICENSE = GPLv3+ -POUND_LICENSE_FILES = GPL.txt -POUND_DEPENDENCIES = openssl - -# Force owner/group to us, otherwise it will try proxy:proxy by -# default. -POUND_CONF_OPTS = \ - --with-owner=$(shell id -un) \ - --with-group=$(shell id -gn) - -ifeq ($(BR2_PACKAGE_PCRE),y) -POUND_DEPENDENCIES += pcre -endif - -$(eval $(autotools-package)) diff --git a/package.bak/powerpc-utils/Config.in b/package.bak/powerpc-utils/Config.in deleted file mode 100644 index fb2fb7fac2..0000000000 --- a/package.bak/powerpc-utils/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -comment "powerpc-utils tools needs a toolchain w/ dynamic library" - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_POWERPC_UTILS - bool "powerpc-utils" - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le - select BR2_PACKAGE_ZLIB - help - System utilities for PowerPC machines. - - https://github.com/nfont/powerpc-utils - -if BR2_PACKAGE_POWERPC_UTILS - -config BR2_PACKAGE_POWERPC_UTILS_RTAS - bool "RTAS support" - select BR2_PACKAGE_LIBRTAS - depends on BR2_TOOLCHAIN_USES_GLIBC - help - Enable support for functions that require RTAS. - - This adds a dependency on librtas and provides the following - additional features at the cost of increasing the installed - package size from about 0.5MB to about 2MB: - ppc64_cpu --run-mode, uesensor, set_poweron_time, drmgr, - lsslot, activate_firmware, rtas_ibm_get_vpd, serv_config, - rtas_event_decode, sys_ident. - -comment "RTAS support needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC - -endif diff --git a/package.bak/powerpc-utils/powerpc-utils.hash b/package.bak/powerpc-utils/powerpc-utils.hash deleted file mode 100644 index 9e299da38a..0000000000 --- a/package.bak/powerpc-utils/powerpc-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 657790a4aea7f3e4649a454b4c384e255145bff9b9c5e40402170603980a6736 powerpc-utils-v1.3.1.tar.gz diff --git a/package.bak/powerpc-utils/powerpc-utils.mk b/package.bak/powerpc-utils/powerpc-utils.mk deleted file mode 100644 index 036be52dc3..0000000000 --- a/package.bak/powerpc-utils/powerpc-utils.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# powerpc-utils -# -################################################################################ - -POWERPC_UTILS_VERSION = v1.3.1 -POWERPC_UTILS_SITE = $(call github,nfont,powerpc-utils,$(POWERPC_UTILS_VERSION)) -POWERPC_UTILS_DEPENDENCIES = zlib -POWERPC_UTILS_AUTORECONF = YES -POWERPC_UTILS_LICENSE = GPLv2+ -POWERPC_UTILS_LICENSE_FILES = COPYING - -POWERPC_UTILS_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector_all=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) - -ifeq ($(BR2_PACKAGE_POWERPC_UTILS_RTAS),y) -POWERPC_UTILS_DEPENDENCIES += librtas -POWERPC_UTILS_CONF_OPTS = --with-librtas -else -POWERPC_UTILS_CONF_OPTS = --without-librtas -endif - -$(eval $(autotools-package)) diff --git a/package.bak/powertop/0001-autotune-fix-use-after-close.patch b/package.bak/powertop/0001-autotune-fix-use-after-close.patch deleted file mode 100644 index f2b3dff102..0000000000 --- a/package.bak/powertop/0001-autotune-fix-use-after-close.patch +++ /dev/null @@ -1,15 +0,0 @@ -Patch pulled from https://projects.archlinux.org/svntogit/community.git/tree/trunk?h=packages/powertop&id=37469c47b885c50365f57044e4ad72e0e3512b91 - -Fixes a use-after-close bug in create_all_devfreq_devices(). - -Signed-off-by: Steven Noonan - ---- a/src/devices/devfreq.cpp -+++ b/src/devices/devfreq.cpp -@@ -247,6 +247,7 @@ void create_all_devfreq_devices(void) - fprintf(stderr, "Devfreq not enabled\n"); - is_enabled = false; - closedir(dir); -+ dir = NULL; - return; - } diff --git a/package.bak/powertop/0002-dont-force-stack-smashing-protection.patch b/package.bak/powertop/0002-dont-force-stack-smashing-protection.patch deleted file mode 100644 index 75ed2d1c24..0000000000 --- a/package.bak/powertop/0002-dont-force-stack-smashing-protection.patch +++ /dev/null @@ -1,18 +0,0 @@ -Do not pass -fstack-protector unconditionally - -Using -fstack-protector only works when the toolchain has SSP support. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile.am -=================================================================== ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -127,7 +127,6 @@ - -Wformat \ - -Wshadow \ - -fno-omit-frame-pointer \ -- -fstack-protector \ - $(GLIB2_CFLAGS) \ - $(LIBNL_CFLAGS) \ - $(NCURSES_CFLAGS) \ diff --git a/package.bak/powertop/0003-add-missing-sys-time.h-header.patch b/package.bak/powertop/0003-add-missing-sys-time.h-header.patch deleted file mode 100644 index 7156e4256a..0000000000 --- a/package.bak/powertop/0003-add-missing-sys-time.h-header.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 283cab667a9ac3ae3a675b5e5d1a42191188699f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 18:24:48 +0200 -Subject: [PATCH] add missing sys/time.h header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -struct timeval is defined in sys/time.h with a musl toolchain. - -Fixes: -In file included from devices/devfreq.cpp:35:0: -devices/devfreq.h:35:18: error: field ‘stamp_before’ has incomplete type ‘timeval’ - struct timeval stamp_before, stamp_after; - -Signed-off-by: Romain Naour ---- - src/devices/devfreq.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/devices/devfreq.h b/src/devices/devfreq.h -index 16a60fb..4a8983b 100644 ---- a/src/devices/devfreq.h -+++ b/src/devices/devfreq.h -@@ -27,6 +27,7 @@ - - #include "device.h" - #include "../parameters/parameters.h" -+#include - - struct frequency; - --- -2.4.3 - diff --git a/package.bak/powertop/0004-add-missing-stdio.h-header.patch b/package.bak/powertop/0004-add-missing-stdio.h-header.patch deleted file mode 100644 index 7619cca131..0000000000 --- a/package.bak/powertop/0004-add-missing-stdio.h-header.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e6cfd977c81b335664db1d5d3d6b5488c245e30f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 8 Aug 2015 18:26:15 +0200 -Subject: [PATCH] add missing stdio.h header -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -snprinf is defined in stdio.h. - -Fixes: -perf/perf_bundle.cpp: In function ‘void parse_event_format(const char*)’: -perf/perf_bundle.cpp:141:75: error: ‘sprintf’ was not declared in this scope - sprintf(file, "/sys/kernel/debug/tracing/events/%s/%s/format", sys, event); - -Signed-off-by: Romain Naour ---- - src/perf/perf_bundle.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/perf/perf_bundle.cpp b/src/perf/perf_bundle.cpp -index cf1ae11..3d216ff 100644 ---- a/src/perf/perf_bundle.cpp -+++ b/src/perf/perf_bundle.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include "perf_bundle.h" - #include "perf_event.h" --- -2.4.3 - diff --git a/package.bak/powertop/Config.in b/package.bak/powertop/Config.in deleted file mode 100644 index a532302a64..0000000000 --- a/package.bak/powertop/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_POWERTOP - bool "powertop" - depends on !BR2_bfin # pciutils - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - depends on BR2_USE_WCHAR - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_PCIUTILS - select BR2_PACKAGE_LIBNL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - A tool to diagnose issues with power consumption and power management - - https://01.org/powertop/ - -comment "powertop needs a toolchain w/ C++, threads, wchar" - depends on !BR2_bfin - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR diff --git a/package.bak/powertop/powertop.hash b/package.bak/powertop/powertop.hash deleted file mode 100644 index b64981ea7a..0000000000 --- a/package.bak/powertop/powertop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally-generated hash -sha256 8d4b1490e2baad4467c0ded3c423db4472dcbf7b2dd8f8f2a928f54047c678ca powertop-2.7.tar.gz diff --git a/package.bak/powertop/powertop.mk b/package.bak/powertop/powertop.mk deleted file mode 100644 index 53be483a6d..0000000000 --- a/package.bak/powertop/powertop.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# powertop -# -################################################################################ - -POWERTOP_VERSION = 2.7 -POWERTOP_SITE = https://01.org/sites/default/files/downloads/powertop -POWERTOP_DEPENDENCIES = pciutils ncurses libnl host-gettext host-pkgconf -POWERTOP_LICENSE = GPLv2 -POWERTOP_LICENSE_FILES = COPYING -# We're patching Makefile.am -POWERTOP_AUTORECONF = YES -POWERTOP_GETTEXTIZE = YES - -ifeq ($(BR2_NEEDS_GETTEXT),y) -POWERTOP_DEPENDENCIES += gettext -POWERTOP_CONF_ENV += LIBS='-lintl' -endif - -# Help powertop at finding the right ncurses library depending on -# which one is available. -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -POWERTOP_CONF_ENV += ac_cv_search_delwin="-lncursesw" -else -POWERTOP_CONF_ENV += ac_cv_search_delwin="-lncurses" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/powervr/Config.in b/package.bak/powervr/Config.in deleted file mode 100644 index 746e15b291..0000000000 --- a/package.bak/powervr/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_POWERVR - bool - -config BR2_PACKAGE_PROVIDES_POWERVR - depends on BR2_PACKAGE_HAS_POWERVR - string diff --git a/package.bak/powervr/powervr.mk b/package.bak/powervr/powervr.mk deleted file mode 100644 index 5a55860556..0000000000 --- a/package.bak/powervr/powervr.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# powervr -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch b/package.bak/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch deleted file mode 100644 index 2f6933f5e5..0000000000 --- a/package.bak/pppd/0001-Move-netinet-in.h-above-linux-header-includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/pppd/plugins/rp-pppoe/pppoe.h b/pppd/plugins/rp-pppoe/pppoe.h -index 9ab2eee..b827620 100644 ---- a/pppd/plugins/rp-pppoe/pppoe.h -+++ b/pppd/plugins/rp-pppoe/pppoe.h -@@ -47,6 +47,8 @@ - #include - #endif - -+#include -+ - /* Ugly header files on some Linux boxes... */ - #if defined(HAVE_LINUX_IF_H) - #include -@@ -84,8 +86,6 @@ typedef unsigned long UINT32_t; - #include - #endif - --#include -- - #ifdef HAVE_NETINET_IF_ETHER_H - #include - diff --git a/package.bak/pppd/Config.in b/package.bak/pppd/Config.in deleted file mode 100644 index b56b623459..0000000000 --- a/package.bak/pppd/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_PPPD - bool "pppd" - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # Use __P() macro all over the tree - depends on BR2_USE_MMU - help - An implementation of the Point-to-point protocol. - - http://www.samba.org/ppp/ - -if BR2_PACKAGE_PPPD - -config BR2_PACKAGE_PPPD_FILTER - select BR2_PACKAGE_LIBPCAP - bool "filtering" - help - Packet filtering abilities for pppd. If enabled, - the pppd active-filter and pass-filter options - are available. - -config BR2_PACKAGE_PPPD_RADIUS - bool "radius" - help - Install RADIUS support for pppd - -endif - -comment "pppd needs a uClibc or glibc toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU diff --git a/package.bak/pppd/pppd.hash b/package.bak/pppd/pppd.hash deleted file mode 100644 index 2bc248d89f..0000000000 --- a/package.bak/pppd/pppd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 02e0a3dd3e4799e33103f70ec7df75348c8540966ee7c948e4ed8a42bbccfb30 ppp-2.4.7.tar.gz diff --git a/package.bak/pppd/pppd.mk b/package.bak/pppd/pppd.mk deleted file mode 100644 index 55630a8a8d..0000000000 --- a/package.bak/pppd/pppd.mk +++ /dev/null @@ -1,110 +0,0 @@ -################################################################################ -# -# pppd -# -################################################################################ - -PPPD_VERSION = 2.4.7 -PPPD_SOURCE = ppp-$(PPPD_VERSION).tar.gz -PPPD_SITE = https://download.samba.org/pub/ppp -PPPD_LICENSE = LGPLv2+, LGPL, BSD-4c, BSD-3c, GPLv2+ -PPPD_LICENSE_FILES = \ - pppd/tdb.c pppd/plugins/pppoatm/COPYING \ - pppdump/bsd-comp.c pppd/ccp.c pppd/plugins/passprompt.c - -PPPD_MAKE_OPTS = HAVE_INET6=y -PPPD_INSTALL_STAGING = YES -PPPD_TARGET_BINS = chat pppd pppdump pppstats -PPPD_RADIUS_CONF = \ - dictionary dictionary.ascend dictionary.compat \ - dictionary.merit dictionary.microsoft \ - issue port-id-map realms servers radiusclient.conf - -ifeq ($(BR2_PACKAGE_PPPD_FILTER),y) -PPPD_DEPENDENCIES += libpcap -PPPD_MAKE_OPTS += FILTER=y -endif - -# pppd bundles some but not all of the needed kernel headers. The embedded -# if_pppol2tp.h is unfortunately not compatible with kernel headers > 2.6.34, -# and has been part of the kernel headers since 2.6.23, so drop it -define PPPD_DROP_INTERNAL_IF_PPOL2TP_H - $(RM) $(@D)/include/linux/if_pppol2tp.h -endef - -PPPD_POST_EXTRACT_HOOKS += PPPD_DROP_INTERNAL_IF_PPOL2TP_H - -# pppd defaults to /etc/ppp/resolv.conf, which not be writable and is -# definitely not useful since the C library only uses -# /etc/resolv.conf. Therefore, we change pppd to use /etc/resolv.conf -# instead. -define PPPD_SET_RESOLV_CONF - $(SED) 's,ppp/resolv.conf,resolv.conf,' $(@D)/pppd/pathnames.h -endef -PPPD_POST_EXTRACT_HOOKS += PPPD_SET_RESOLV_CONF - -define PPPD_CONFIGURE_CMDS - $(SED) 's/FILTER=y/#FILTER=y/' $(PPPD_DIR)/pppd/Makefile.linux - $(SED) 's/ifneq ($$(wildcard \/usr\/include\/pcap-bpf.h),)/ifdef FILTER/' $(PPPD_DIR)/*/Makefile.linux - ( cd $(@D); $(TARGET_MAKE_ENV) ./configure --prefix=/usr ) -endef - -define PPPD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" COPTS="$(TARGET_CFLAGS)" \ - -C $(@D) $(PPPD_MAKE_OPTS) -endef - -ifeq ($(BR2_PACKAGE_PPPD_RADIUS),y) -define PPPD_INSTALL_RADIUS - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radattr.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radattr.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radius.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radius.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/radius/radrealms.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/radrealms.so - for m in $(PPPD_RADIUS_CONF); do \ - $(INSTALL) -m 644 -D $(PPPD_DIR)/pppd/plugins/radius/etc/$$m \ - $(TARGET_DIR)/etc/ppp/radius/$$m; \ - done - $(SED) 's:/usr/local/etc:/etc:' \ - $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf - $(SED) 's:/usr/local/sbin:/usr/sbin:' \ - $(TARGET_DIR)/etc/ppp/radius/radiusclient.conf - $(SED) 's:/etc/radiusclient:/etc/ppp/radius:g' \ - $(TARGET_DIR)/etc/ppp/radius/* -endef -endif - -define PPPD_INSTALL_TARGET_CMDS - for sbin in $(PPPD_TARGET_BINS); do \ - $(INSTALL) -D $(PPPD_DIR)/$$sbin/$$sbin \ - $(TARGET_DIR)/usr/sbin/$$sbin; \ - done - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/minconn.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/minconn.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/passprompt.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/passprompt.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/passwordfd.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/passwordfd.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppoatm/pppoatm.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/pppoatm.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/rp-pppoe/rp-pppoe.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/rp-pppoe.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/rp-pppoe/pppoe-discovery \ - $(TARGET_DIR)/usr/sbin/pppoe-discovery - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/winbind.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/winbind.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppol2tp/openl2tp.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/openl2tp.so - $(INSTALL) -D $(PPPD_DIR)/pppd/plugins/pppol2tp/pppol2tp.so \ - $(TARGET_DIR)/usr/lib/pppd/$(PPPD_VERSION)/pppol2tp.so - $(INSTALL) -D -m 0755 $(PPPD_DIR)/scripts/pon $(TARGET_DIR)/usr/bin/pon - $(INSTALL) -D -m 0755 $(PPPD_DIR)/scripts/poff $(TARGET_DIR)/usr/bin/poff - $(PPPD_INSTALL_RADIUS) -endef - -define PPPD_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) INSTROOT=$(STAGING_DIR)/ -C $(@D) $(PPPD_MAKE_OPTS) install-devel -endef - -$(eval $(generic-package)) diff --git a/package.bak/pps-tools/Config.in b/package.bak/pps-tools/Config.in deleted file mode 100644 index 83308f4f32..0000000000 --- a/package.bak/pps-tools/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PPS_TOOLS - bool "pps-tools" - help - Pulse per second tools. Provides timepps.h and other PPS utilities. - - https://github.com/ago/pps-tools/ diff --git a/package.bak/pps-tools/pps-tools.hash b/package.bak/pps-tools/pps-tools.hash deleted file mode 100644 index da7bce45bf..0000000000 --- a/package.bak/pps-tools/pps-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 eee0a76118cf11d94f575ee43804a6991379f2c734b400ba01ac4811d0498e97 pps-tools-47333f24af878f67ce48022e8af16419713aa1ac.tar.gz diff --git a/package.bak/pps-tools/pps-tools.mk b/package.bak/pps-tools/pps-tools.mk deleted file mode 100644 index c3e147a455..0000000000 --- a/package.bak/pps-tools/pps-tools.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# pps-tools -# -################################################################################ - -PPS_TOOLS_VERSION = 47333f24af878f67ce48022e8af16419713aa1ac -PPS_TOOLS_SITE = $(call github,ago,pps-tools,$(PPS_TOOLS_VERSION)) -PPS_TOOLS_INSTALL_STAGING = YES -PPS_TOOLS_LICENSE = GPLv2+ -PPS_TOOLS_LICENSE_FILES = COPYING - -define PPS_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) all -endef - -define PPS_TOOLS_INSTALL_STAGING_CMDS - mkdir -p $(STAGING_DIR)/usr/include/sys $(STAGING_DIR)/usr/bin - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR=$(STAGING_DIR) -C $(@D) install -endef - -define PPS_TOOLS_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/include/sys $(TARGET_DIR)/usr/bin - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR=$(TARGET_DIR) -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/pptp-linux/0001-susv3-legacy.patch b/package.bak/pptp-linux/0001-susv3-legacy.patch deleted file mode 100644 index 5cc9f57809..0000000000 --- a/package.bak/pptp-linux/0001-susv3-legacy.patch +++ /dev/null @@ -1,29 +0,0 @@ -bzero is deprecated in POSIX.1-2001 and removed for POSIX.1-2008 so -switch to memset instead. - -Signed-off-by: Gustavo Zacarias - -diff -Nura pptp-1.8.0.orig/pptp_callmgr.c pptp-1.8.0/pptp_callmgr.c ---- pptp-1.8.0.orig/pptp_callmgr.c 2013-10-23 05:10:46.000000000 -0300 -+++ pptp-1.8.0/pptp_callmgr.c 2014-03-31 16:47:42.617643298 -0300 -@@ -340,7 +340,7 @@ - } - #endif - if (localbind.s_addr != INADDR_NONE) { -- bzero(&src, sizeof(src)); -+ memset(&src, 0, sizeof(src)); - src.i.sin_family = AF_INET; - src.i.sin_addr = localbind; - if (bind(s, &src.a, sizeof(src.i)) != 0) { -diff -Nura pptp-1.8.0.orig/pptp_gre.c pptp-1.8.0/pptp_gre.c ---- pptp-1.8.0.orig/pptp_gre.c 2013-10-23 05:10:46.000000000 -0300 -+++ pptp-1.8.0/pptp_gre.c 2014-03-31 16:47:30.745249066 -0300 -@@ -103,7 +103,7 @@ - } - #endif - if (localbind.s_addr != INADDR_NONE) { -- bzero(&loc_addr, sizeof(loc_addr)); -+ memset(&loc_addr, 0, sizeof(loc_addr)); - loc_addr.i.sin_family = AF_INET; - loc_addr.i.sin_addr = localbind; - if (bind(s, &loc_addr.a, sizeof(loc_addr.i)) != 0) { diff --git a/package.bak/pptp-linux/0002-fix-parallel-build.patch b/package.bak/pptp-linux/0002-fix-parallel-build.patch deleted file mode 100644 index 04a797743f..0000000000 --- a/package.bak/pptp-linux/0002-fix-parallel-build.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fix parallel build issue - -The config.h header file must be created before being used to build -source files that include it, especially version.c. In order for this -to happen even in highly-parallel builds, we add a dependency of all -object files on config.h, in order to ensure it gets generated before -make attempts to build the object files. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -37,6 +37,8 @@ - - all: config.h $(PPTP_BIN) pptpsetup.8 - -+$(PPTP_OBJS): config.h -+ - $(PPTP_BIN): $(PPTP_OBJS) $(PPTP_DEPS) - $(CC) -o $(PPTP_BIN) $(PPTP_OBJS) $(LDFLAGS) $(LIBS) - diff --git a/package.bak/pptp-linux/0003-pqueue.h-include-sys-types.h.patch b/package.bak/pptp-linux/0003-pqueue.h-include-sys-types.h.patch deleted file mode 100644 index d6b5445fa9..0000000000 --- a/package.bak/pptp-linux/0003-pqueue.h-include-sys-types.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 060ad28b9ca5e99d7c6e8010132da58a3a8a0585 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 22 Jan 2016 10:19:18 -0300 -Subject: [PATCH] pqueue.h: include sys/types.h - -We're using u_int32_t here, this breaks on musl libc builds otherwise. - -Signed-off-by: Gustavo Zacarias ---- -Patch status: sent upstream to the devel mailing list -(moderated, no archive link yet) - - pqueue.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pqueue.h b/pqueue.h -index a56590f..8c60c62 100644 ---- a/pqueue.h -+++ b/pqueue.h -@@ -3,6 +3,7 @@ - - #include - #include -+#include - - /* wait this many seconds for missing packets before forgetting about them */ - #define DEFAULT_PACKET_TIMEOUT 0.3 --- -2.4.10 - diff --git a/package.bak/pptp-linux/Config.in b/package.bak/pptp-linux/Config.in deleted file mode 100644 index e03a906efd..0000000000 --- a/package.bak/pptp-linux/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PPTP_LINUX - bool "pptp-linux" - depends on BR2_USE_MMU # fork() - help - An implementation of the Point-to-point protocol client. - - http://pptpclient.sourceforge.net/ diff --git a/package.bak/pptp-linux/pptp-linux.hash b/package.bak/pptp-linux/pptp-linux.hash deleted file mode 100644 index 839d0bf84f..0000000000 --- a/package.bak/pptp-linux/pptp-linux.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/pptpclient/files/pptp/pptp-1.8.0/ -md5 4efce9f263e2c3f38d79d9df222476de pptp-1.8.0.tar.gz -sha1 6289953812ac986c7234e83aefb10b5e279dc613 pptp-1.8.0.tar.gz diff --git a/package.bak/pptp-linux/pptp-linux.mk b/package.bak/pptp-linux/pptp-linux.mk deleted file mode 100644 index 1538457a12..0000000000 --- a/package.bak/pptp-linux/pptp-linux.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# pptp-linux -# -################################################################################ - -PPTP_LINUX_VERSION = 1.8.0 -PPTP_LINUX_SITE = http://downloads.sourceforge.net/project/pptpclient/pptp/pptp-$(PPTP_LINUX_VERSION) -PPTP_LINUX_SOURCE = pptp-$(PPTP_LINUX_VERSION).tar.gz -PPTP_LINUX_MAKE = $(MAKE1) -PPTP_LINUX_LICENSE = GPLv2+ -PPTP_LINUX_LICENSE_FILES = COPYING - -define PPTP_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) OPTIMIZE= DEBUG= \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - IP=/sbin/ip -endef - -define PPTP_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/pptp $(TARGET_DIR)/usr/sbin/pptp -endef - -$(eval $(generic-package)) diff --git a/package.bak/prboom/0001-libpng-1.4.patch b/package.bak/prboom/0001-libpng-1.4.patch deleted file mode 100644 index 0d2a3a5ba8..0000000000 --- a/package.bak/prboom/0001-libpng-1.4.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] fix build with libpng 1.4.x - -In 1.4.x the png_*_NULL defines are gone. Replace them with a normal -NULL instead. - -Signed-off-by: Peter Korsgaard ---- - src/SDL/i_sshot.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: prboom-2.5.0/src/SDL/i_sshot.c -=================================================================== ---- prboom-2.5.0.orig/src/SDL/i_sshot.c -+++ prboom-2.5.0/src/SDL/i_sshot.c -@@ -231,7 +231,7 @@ int I_ScreenShot (const char *fname) - if (fp) - { - png_struct *png_ptr = png_create_write_struct( -- PNG_LIBPNG_VER_STRING, png_error_ptr_NULL, error_fn, warning_fn); -+ PNG_LIBPNG_VER_STRING, NULL, error_fn, warning_fn); - - if (png_ptr) - { -@@ -279,7 +279,7 @@ int I_ScreenShot (const char *fname) - break; - } - } -- png_destroy_write_struct(&png_ptr, png_infopp_NULL); -+ png_destroy_write_struct(&png_ptr, NULL); - } - fclose(fp); - } diff --git a/package.bak/prboom/Config.in b/package.bak/prboom/Config.in deleted file mode 100644 index 6884f31e46..0000000000 --- a/package.bak/prboom/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PRBOOM - bool "prboom" - # These result in internal compiler error - depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - select BR2_PACKAGE_SDL - select BR2_PACKAGE_SDL_MIXER - select BR2_PACKAGE_SDL_NET - help - PrBoom is a Doom client which allows you to play the good old game on - newer hardware. It even supports higher resolution and better - rendering, while still keeping the old style alive. - - http://prboom.sourceforge.net/ diff --git a/package.bak/prboom/prboom.hash b/package.bak/prboom/prboom.hash deleted file mode 100644 index 0d80349a61..0000000000 --- a/package.bak/prboom/prboom.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 226c1c470f8cc983327536404f405a1d026cf0a5188c694a1243cc8630014bae prboom-2.5.0.tar.gz diff --git a/package.bak/prboom/prboom.mk b/package.bak/prboom/prboom.mk deleted file mode 100644 index 5f5e7fb677..0000000000 --- a/package.bak/prboom/prboom.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# prboom -# -################################################################################ - -PRBOOM_VERSION = 2.5.0 -PRBOOM_SITE = http://downloads.sourceforge.net/project/prboom/prboom%20stable/$(PRBOOM_VERSION) -PRBOOM_CONF_ENV = ac_cv_type_uid_t=yes -PRBOOM_DEPENDENCIES = sdl sdl_net sdl_mixer -PRBOOM_LICENSE = GPLv2+ -PRBOOM_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -PRBOOM_DEPENDENCIES += libpng -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# SDL_mixer uses symbols from SDL, but ends up after it on the link -# cmdline. Fix it by forcing the SDL libs at the very end -PRBOOM_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/sdl-config --static-libs`" -endif - -PRBOOM_CONF_OPTS = \ - --oldincludedir=$(STAGING_DIR)/usr/include \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ - --disable-cpu-opt \ - --disable-sdltest \ - --disable-gl - -# endianness detection isn't used when cross compiling -define PRBOOM_BIG_ENDIAN_FIXUP - $(SED) 's,.*#undef WORDS_BIGENDIAN.*,#define WORDS_BIGENDIAN 1,g' \ - $(PRBOOM_DIR)/config.h -endef - -ifeq ($(BR2_ENDIAN),"BIG") -PRBOOM_POST_CONFIGURE_HOOKS += PRBOOM_BIG_ENDIAN_FIXUP -endif - -define PRBOOM_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/src/prboom $(TARGET_DIR)/usr/games/prboom - $(INSTALL) -D $(@D)/src/prboom-game-server $(TARGET_DIR)/usr/games/prboom-game-server - $(INSTALL) -D $(@D)/data/prboom.wad $(TARGET_DIR)/usr/share/games/doom/prboom.wad -endef - -$(eval $(autotools-package)) diff --git a/package.bak/privoxy/Config.in b/package.bak/privoxy/Config.in deleted file mode 100644 index accb48dfc2..0000000000 --- a/package.bak/privoxy/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_PRIVOXY - bool "privoxy" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_ZLIB - help - A non-caching web proxy with advanced filtering capabilities - for enhancing privacy, modifying web page data and HTTP - headers, controlling access, and removing ads and other - obnoxious Internet junk. - - http://www.privoxy.org/ - -comment "privoxy needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/privoxy/privoxy.hash b/package.bak/privoxy/privoxy.hash deleted file mode 100644 index 72226b14fc..0000000000 --- a/package.bak/privoxy/privoxy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/ijbswa/files/Sources/3.0.26%20%28stable%29/ -md5 8a1c842112ccea68c19b7ceb4a0e999f privoxy-3.0.26-stable-src.tar.gz -sha1 b646624006225979f83453ba542e448667f45998 privoxy-3.0.26-stable-src.tar.gz diff --git a/package.bak/privoxy/privoxy.mk b/package.bak/privoxy/privoxy.mk deleted file mode 100644 index 267ddc2704..0000000000 --- a/package.bak/privoxy/privoxy.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# privoxy -# -################################################################################ - -PRIVOXY_VERSION = 3.0.26 -PRIVOXY_SITE = http://downloads.sourceforge.net/project/ijbswa/Sources/$(PRIVOXY_VERSION)%20%28stable%29 -PRIVOXY_SOURCE = privoxy-$(PRIVOXY_VERSION)-stable-src.tar.gz -# configure not shipped -PRIVOXY_AUTORECONF = YES -PRIVOXY_DEPENDENCIES = pcre zlib -PRIVOXY_LICENSE = GPLv2+ -PRIVOXY_LICENSE_FILES = LICENSE - -$(eval $(autotools-package)) diff --git a/package.bak/procps-ng/0001-remove-index.patch b/package.bak/procps-ng/0001-remove-index.patch deleted file mode 100644 index 1d85b31cb5..0000000000 --- a/package.bak/procps-ng/0001-remove-index.patch +++ /dev/null @@ -1,16 +0,0 @@ -sysctl: remove use of legacy index() - -[yann.morin.1998@free.fr: adapt to procps-ng] -Signed-off-by: "Yann E. MORIN" -diff -durN procps-v3.3.9.orig/sysctl.c procps-v3.3.9/sysctl.c ---- procps-v3.3.9.orig/sysctl.c 2013-12-03 12:16:18.000000000 +0100 -+++ procps-v3.3.9/sysctl.c 2014-05-31 00:45:00.869748741 +0200 -@@ -794,7 +794,7 @@ - program_invocation_short_name); - - for ( ; *argv; argv++) { -- if (WriteMode || index(*argv, '=')) -+ if (WriteMode || strchr(*argv, '=')) - ReturnCode += WriteSetting(*argv); - else - ReturnCode += ReadSetting(*argv); diff --git a/package.bak/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch b/package.bak/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch deleted file mode 100644 index 1329ac4bbd..0000000000 --- a/package.bak/procps-ng/0002-use-pkgconfig-for-ncursesw-cflags.patch +++ /dev/null @@ -1,57 +0,0 @@ -Don't assume ncursesw headers are in ../usr/include/ncursesw/.. -On a pure build/system without legacy ncurses that may not be true. -Since we're using pkg-config let it provide the correct include path. - -Status: contacted one of the maintainers on sf.net -(ticket submission closed to the public, no other way of contacting them). - -Signed-off-by: Gustavo Zacarias -[Bernd: Rebased for version 3.3.11] - -diff -Nura procps-ng-3.3.10.orig/configure.ac procps-ng-3.3.10/configure.ac ---- procps-ng-3.3.10.orig/configure.ac 2015-04-07 19:21:55.729819952 -0300 -+++ procps-ng-3.3.10/configure.ac 2015-04-07 19:32:09.511706653 -0300 -@@ -138,7 +138,8 @@ - ]) - AM_CONDITIONAL(WITH_NCURSES, true) - if test "$enable_watch8bit" = yes; then -- PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [ -+ PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"] -+ [WATCH_NCURSES_CFLAGS="$NCURSESW_CFLAGS"], [ - AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw], - [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])]) - ]) -@@ -148,6 +149,7 @@ - fi - AC_SUBST([NCURSES_LIBS]) - AC_SUBST([WATCH_NCURSES_LIBS]) -+AC_SUBST([WATCH_NCURSES_CFLAGS]) - - AC_ARG_WITH([systemd], - [AS_HELP_STRING([--with-systemd], [enable systemd support])], -diff -Nura procps-ng-3.3.10.orig/Makefile.am procps-ng-3.3.10/Makefile.am ---- procps-ng-3.3.10.orig/Makefile.am 2015-04-07 19:21:55.655817434 -0300 -+++ procps-ng-3.3.10/Makefile.am 2015-04-07 19:32:54.516238136 -0300 -@@ -97,6 +97,7 @@ - slabtop_LDADD = $(LDADD) @NCURSES_LIBS@ - watch_SOURCES = watch.c lib/strutils.c lib/fileutils.c - watch_LDADD = @WATCH_NCURSES_LIBS@ $(CYGWINFLAGS) -+watch_CFLAGS = @WATCH_NCURSES_CFLAGS@ - top_top_SOURCES = \ - top/top.h \ - top/top.c \ -diff -Nura procps-ng-3.3.10.orig/watch.c procps-ng-3.3.10/watch.c ---- procps-ng-3.3.10.orig/watch.c 2015-04-07 19:21:55.707819203 -0300 -+++ procps-ng-3.3.10/watch.c 2015-04-07 19:22:27.323895083 -0300 -@@ -51,10 +51,8 @@ - #ifdef WITH_WATCH8BIT - # include - # include --# include --#else --# include - #endif /* WITH_WATCH8BIT */ -+#include - - #ifdef FORCE_8BIT - # undef isprint diff --git a/package.bak/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch b/package.bak/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch deleted file mode 100644 index dca28fab14..0000000000 --- a/package.bak/procps-ng/0003-ps-output.c-include-dlfcn.h-only-when-necessary.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4fc9a348026a945aec8eddffc7613de9cb10b10c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Aug 2016 11:08:26 +0200 -Subject: [PATCH] ps/output.c: include only when necessary - -dlopen() functionality is only used when SELinux support is enabled, so - only needs to be included when ENABLE_LIBSELINUX is -defined. This fixes the build in configurations where is not -available. - -Signed-off-by: Thomas Petazzoni ---- - ps/output.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/ps/output.c b/ps/output.c -index 42c04cf..f540832 100644 ---- a/ps/output.c -+++ b/ps/output.c -@@ -46,7 +46,9 @@ - */ - - #include -+#if ENABLE_LIBSELINUX - #include -+#endif - #include - #include - #include --- -2.7.4 - diff --git a/package.bak/procps-ng/Config.in b/package.bak/procps-ng/Config.in deleted file mode 100644 index 553bea1a11..0000000000 --- a/package.bak/procps-ng/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PROCPS_NG - bool "procps-ng" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Standard informational utilities and process-handling tools. - Provides things like kill, ps, uptime, free, top, etc... - - http://sourceforge.net/projects/procps-ng/ diff --git a/package.bak/procps-ng/procps-ng.hash b/package.bak/procps-ng/procps-ng.hash deleted file mode 100644 index 62d61727b1..0000000000 --- a/package.bak/procps-ng/procps-ng.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/procps-ng/files/Production/ -md5 957e42e8b193490b2111252e4a2b443c procps-ng-3.3.12.tar.xz -sha1 82c0745f150f1385ca01fe7d24f05f74e31c94c6 procps-ng-3.3.12.tar.xz diff --git a/package.bak/procps-ng/procps-ng.mk b/package.bak/procps-ng/procps-ng.mk deleted file mode 100644 index 0f8b20c560..0000000000 --- a/package.bak/procps-ng/procps-ng.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# procps-ng -# -################################################################################ - -PROCPS_NG_VERSION = 3.3.12 -PROCPS_NG_SOURCE = procps-ng-$(PROCPS_NG_VERSION).tar.xz -PROCPS_NG_SITE = http://downloads.sourceforge.net/project/procps-ng/Production -PROCPS_NG_LICENSE = GPLv2+, LGPLv2+ (libproc and libps) -PROCPS_NG_LICENSE_FILES = COPYING COPYING.LIB -PROCPS_NG_INSTALL_STAGING = YES -PROCPS_NG_DEPENDENCIES = ncurses host-pkgconf -# For 0002-use-pkgconfig-for-ncursesw-cflags.patch -PROCPS_NG_AUTORECONF = YES -PROCPS_NG_GETTEXTIZE = YES - -# If both procps-ng and busybox are selected, make certain procps-ng -# wins the fight over who gets to have their utils actually installed. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PROCPS_NG_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -PROCPS_NG_DEPENDENCIES += gettext -PROCPS_NG_CONF_OPTS += LIBS=-lintl -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -PROCPS_NG_DEPENDENCIES += systemd -PROCPS_NG_CONF_OPTS += --with-systemd -else -PROCPS_NG_CONF_OPTS += --without-systemd -endif - -# Make sure binaries get installed in /bin, so that they overwrite -# their busybox counterparts. -# Make sure libprocps.pc is installed in STAGING_DIR/usr/lib/pkgconfig/ -# otherwise it's installed in STAGING_DIR/lib/pkgconfig/ breaking -# pkg-config --libs libprocps. -PROCPS_NG_CONF_OPTS += --exec-prefix=/ \ - --libdir=/usr/lib - -# Allows unicode characters to show in 'watch' -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -PROCPS_NG_CONF_OPTS += \ - --enable-watch8bit -endif - -# numa support requires libdl, so explicitly disable it when -# BR2_STATIC_LIBS=y -ifeq ($(BR2_STATIC_LIBS),y) -PROCPS_NG_CONF_OPTS += --disable-numa -endif - -$(eval $(autotools-package)) diff --git a/package.bak/procrank_linux/Config.in b/package.bak/procrank_linux/Config.in deleted file mode 100644 index 59d462b6d4..0000000000 --- a/package.bak/procrank_linux/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PROCRANK_LINUX - bool "procrank_linux" - help - procrank is a tool commonly used by Android platform - developers to find out how much memory is really being used. - - https://github.com/csimmonds/procrank_linux diff --git a/package.bak/procrank_linux/procrank_linux.hash b/package.bak/procrank_linux/procrank_linux.hash deleted file mode 100644 index b28a8e3683..0000000000 --- a/package.bak/procrank_linux/procrank_linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1c3592b549b6793b29ab561568f493d0edbfe288ea2aed59afa689eaa26b5d9e procrank_linux-21c30ab4514a5b15ac6e813e21bee0d3d714cb08.tar.gz diff --git a/package.bak/procrank_linux/procrank_linux.mk b/package.bak/procrank_linux/procrank_linux.mk deleted file mode 100644 index 7e743194fc..0000000000 --- a/package.bak/procrank_linux/procrank_linux.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# procrank_linux -# -################################################################################ - -PROCRANK_LINUX_VERSION = 21c30ab4514a5b15ac6e813e21bee0d3d714cb08 -PROCRANK_LINUX_SITE = $(call github,csimmonds,procrank_linux,$(PROCRANK_LINUX_VERSION)) -PROCRANK_LINUX_LICENSE = Apache-2.0 -PROCRANK_LINUX_LICENSE_FILES = NOTICE - -define PROCRANK_LINUX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CROSS_COMPILE="$(TARGET_CROSS)" -endef - -define PROCRANK_LINUX_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/procrank \ - $(TARGET_DIR)/usr/bin/procrank -endef - -$(eval $(generic-package)) diff --git a/package.bak/proftpd/0001-fix-kernel-header-capability-version.patch b/package.bak/proftpd/0001-fix-kernel-header-capability-version.patch deleted file mode 100644 index 4401c9aeaf..0000000000 --- a/package.bak/proftpd/0001-fix-kernel-header-capability-version.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/lib/libcap/libcap.h 2008-08-22 19:49:48.000000000 -0700 -+++ b/lib/libcap/libcap.h 2010-10-06 15:31:11.000000000 -0700 -@@ -65,7 +65,8 @@ struct _cap_struct { - */ - - #if !defined(_LINUX_CAPABILITY_VERSION_1) || \ -- (_LINUX_CAPABILITY_VERSION_1 != 0x19980330) -+ ((_LINUX_CAPABILITY_VERSION_1 != 0x19980330) && \ -+ (_LINUX_CAPABILITY_VERSION_1 != 0x20071026)) - - # error "Kernel does not match library" - # error "file "libcap.h" --> fix and recompile libcap" diff --git a/package.bak/proftpd/0002-__mempcpy.patch b/package.bak/proftpd/0002-__mempcpy.patch deleted file mode 100644 index 1b8f0b0bd3..0000000000 --- a/package.bak/proftpd/0002-__mempcpy.patch +++ /dev/null @@ -1,54 +0,0 @@ -[PATCH] pr_fnmatch.c: use mempcpy, not __mempcpy to fix linker issue with uClibc - -The standard name (as checked for by configure) for the function is mempcpy, -not __mempcpy, so use that instead. - -The existing code happens to work on glibc, as that provides an __mempcpy -alias, but other C libraries (E.G. uClibc) don't: - -./host/usr/bin/arm-linux-nm -D ./staging/lib/libuClibc-0.9.33.2.so | grep mempcpy -00035d2c W mempcpy -00036cf8 W wmempcpy - -vs - -./host/usr/bin/arm-none-linux-gnueabi-nm -D staging/lib/libc-2.18.so | grep mempcpy -0007d140 T mempcpy -0007d140 T __mempcpy -000e15f0 T __mempcpy_chk -00081828 T __mempcpy_small -00083148 W wmempcpy -000e4e3c T __wmempcpy_chk - -Signed-off-by: Peter Korsgaard ---- - lib/pr_fnmatch.c | 2 +- - lib/pr_fnmatch_loop.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: proftpd-1.3.4d/lib/pr_fnmatch.c -=================================================================== ---- proftpd-1.3.4d.orig/lib/pr_fnmatch.c -+++ proftpd-1.3.4d/lib/pr_fnmatch.c -@@ -250,7 +250,7 @@ - # endif - # define STRLEN(S) strlen (S) - # define STRCAT(D, S) strcat (D, S) --# define MEMPCPY(D, S, N) __mempcpy (D, S, N) -+# define MEMPCPY(D, S, N) mempcpy (D, S, N) - # define MEMCHR(S, C, N) memchr (S, C, N) - # define STRCOLL(S1, S2) strcoll (S1, S2) - # include "pr_fnmatch_loop.c" -Index: proftpd-1.3.4d/lib/pr_fnmatch_loop.c -=================================================================== ---- proftpd-1.3.4d.orig/lib/pr_fnmatch_loop.c -+++ proftpd-1.3.4d/lib/pr_fnmatch_loop.c -@@ -54,7 +54,7 @@ - /* Copy N bytes of SRC to DEST, return pointer to bytes after the - last written byte. */ - static void * --__mempcpy (void *dest, const void *src, size_t n) -+mempcpy (void *dest, const void *src, size_t n) - { - return (char *) memcpy (dest, src, n) + n; - } diff --git a/package.bak/proftpd/Config.in b/package.bak/proftpd/Config.in deleted file mode 100644 index dd87eb45aa..0000000000 --- a/package.bak/proftpd/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PROFTPD - bool "proftpd" - depends on BR2_USE_MMU # fork() - help - ProFTPD, a highly configurable FTP server. - - http://www.proftpd.org/ - -if BR2_PACKAGE_PROFTPD - -config BR2_PACKAGE_PROFTPD_MOD_REWRITE - bool "mod_rewrite support" - help - Compile ProFTPD with mod_rewrite support - -endif diff --git a/package.bak/proftpd/S50proftpd b/package.bak/proftpd/S50proftpd deleted file mode 100755 index 336680a456..0000000000 --- a/package.bak/proftpd/S50proftpd +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -DAEMON=/usr/sbin/proftpd -trap "" HUP -trap "" TERM -test -f $DAEMON || exit 0 -[ ! -d /var/run/proftpd ] && mkdir /var/run/proftpd -[ ! -f /var/log/wtmp ] && touch /var/log/wtmp - -start() { - printf "Starting ProFTPD: " - $DAEMON - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "done" - fi -} - -stop() { - printf "Stopping ProFTPD: " - killall proftpd - echo "done" -} - -case "$1" in - start) - start - ;; - - stop) - stop - ;; - - restart) - stop - start - ;; - - *) - echo "Usage: /etc/init.d/S50proftpd {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/proftpd/proftpd.hash b/package.bak/proftpd/proftpd.hash deleted file mode 100644 index cc8add9966..0000000000 --- a/package.bak/proftpd/proftpd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.5d.tar.gz.md5 -md5 bcd2846edf0dad4c4d49a7c8c176d83a proftpd-1.3.5d.tar.gz -# Locally calculated -sha256 f4e2997be7f22a5b31d7ac72497ed4f4471d24d32385978350410713e76129ac proftpd-1.3.5d.tar.gz diff --git a/package.bak/proftpd/proftpd.mk b/package.bak/proftpd/proftpd.mk deleted file mode 100644 index b5ffddc036..0000000000 --- a/package.bak/proftpd/proftpd.mk +++ /dev/null @@ -1,69 +0,0 @@ -################################################################################ -# -# proftpd -# -################################################################################ - -PROFTPD_VERSION = 1.3.5d -PROFTPD_SITE = ftp://ftp.proftpd.org/distrib/source -PROFTPD_LICENSE = GPLv2+ -PROFTPD_LICENSE_FILES = COPYING - -PROFTPD_CONF_ENV = \ - ac_cv_func_setpgrp_void=yes \ - ac_cv_func_setgrent_void=yes - -PROFTPD_CONF_OPTS = \ - --localstatedir=/var/run \ - --disable-static \ - --disable-curses \ - --disable-ncurses \ - --disable-facl \ - --disable-dso \ - --enable-shadow \ - --with-gnu-ld - -ifeq ($(BR2_PACKAGE_PROFTPD_MOD_REWRITE),y) -PROFTPD_CONF_OPTS += --with-modules=mod_rewrite -endif - -# configure script doesn't handle detection of %llu format string -# support for printing the file size when cross compiling, breaking -# access for large files. -# We unfortunately cannot AUTORECONF the package, so instead force it -# on if we know we support it -define PROFTPD_USE_LLU - $(SED) 's/HAVE_LU/HAVE_LLU/' $(@D)/configure -endef -PROFTPD_PRE_CONFIGURE_HOOKS += PROFTPD_USE_LLU - -define PROFTPD_MAKENAMES - $(MAKE1) CC="$(HOSTCC)" CFLAGS="" LDFLAGS="" -C $(@D)/lib/libcap _makenames -endef - -PROFTPD_POST_CONFIGURE_HOOKS = PROFTPD_MAKENAMES - -PROFTPD_MAKE = $(MAKE1) - -define PROFTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd - $(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf -endef - -define PROFTPD_USERS - ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User -endef - -define PROFTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d/S50proftpd -endef - -define PROFTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/proftpd/proftpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/proftpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/proftpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/proftpd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/proftpd/proftpd.service b/package.bak/proftpd/proftpd.service deleted file mode 100644 index 1c730e5161..0000000000 --- a/package.bak/proftpd/proftpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=FTP server -After=syslog.target network.target - -[Service] -ExecStart=/usr/sbin/proftpd -n -q -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/protobuf-c/Config.in b/package.bak/protobuf-c/Config.in deleted file mode 100644 index 28555502f9..0000000000 --- a/package.bak/protobuf-c/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PROTOBUF_C - bool "protobuf-c" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # host-protobuf only builds on certain architectures - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - help - Code generator and runtime libraries to use Protocol Buffers - from pure C (not C++). - - http://code.google.com/p/protobuf-c/ - -comment "protobuf-c needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/package.bak/protobuf-c/protobuf-c.hash b/package.bak/protobuf-c/protobuf-c.hash deleted file mode 100644 index 7584058e95..0000000000 --- a/package.bak/protobuf-c/protobuf-c.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 49340784ca0f8657f38547088731fff3bfe8084adb89bf5e8dbc19ac43339aa6 protobuf-c-v1.1.1.tar.gz diff --git a/package.bak/protobuf-c/protobuf-c.mk b/package.bak/protobuf-c/protobuf-c.mk deleted file mode 100644 index ee4500ee0d..0000000000 --- a/package.bak/protobuf-c/protobuf-c.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# protobuf-c -# -################################################################################ - -PROTOBUF_C_VERSION = v1.1.1 -PROTOBUF_C_SITE = $(call github,protobuf-c,protobuf-c,$(PROTOBUF_C_VERSION)) -PROTOBUF_C_DEPENDENCIES = host-protobuf-c -HOST_PROTOBUF_C_DEPENDENCIES = host-protobuf host-pkgconf -PROTOBUF_C_MAKE = $(MAKE1) -PROTOBUF_C_CONF_OPTS = --disable-protoc -PROTOBUF_C_INSTALL_STAGING = YES -PROTOBUF_C_LICENSE = BSD-2c -PROTOBUF_C_LICENSE_FILES = LICENSE -PROTOBUF_C_AUTORECONF = YES -HOST_PROTOBUF_C_AUTORECONF = YES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch b/package.bak/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch deleted file mode 100644 index fffdf49fac..0000000000 --- a/package.bak/protobuf/0001-configure.ac-check-if-libatomic-is-needed.patch +++ /dev/null @@ -1,34 +0,0 @@ -From f020fe05a20dfcd16cd7df833dcf3cdeef770538 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Thu, 11 Feb 2016 10:58:35 -0200 -Subject: [PATCH 2/2] configure.ac: check if libatomic is needed - -Compilation of protobuf for PowerPC and SPARC may fail due to missing -references to __atomic_fetch_add_4 and __atomic_compare_exchange_4. - -The __atomic_*() intrinsics for all sizes are provided by libatomic when -gcc is >= 4.8. This can be achieved by adding this to configure.ac: - - AC_SEARCH_LIBS([__atomic_fetch_add_4], [atomic]) - -Signed-off-by: Carlos Santos ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index c07067c..88d4a0d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -160,6 +160,8 @@ AM_CONDITIONAL([HAVE_PTHREAD], [test "x$acx_pthread_ok" = "xyes"]) - # We still keep this for improving pbconfig.h for unsupported platforms. - AC_CXX_STL_HASH - -+AC_SEARCH_LIBS([__atomic_load_4], [atomic]) -+ - case "$target_os" in - mingw* | cygwin* | win*) - ;; --- -2.5.0 - diff --git a/package.bak/protobuf/Config.in b/package.bak/protobuf/Config.in deleted file mode 100644 index bccf258f62..0000000000 --- a/package.bak/protobuf/Config.in +++ /dev/null @@ -1,47 +0,0 @@ -# See src/google/protobuf/stubs/platform_macros.h for supported archs. -# -# On PowerPC, the __atomic_*() built-ins for 1-byte, 2-byte and 4-byte -# types are available built-in. However, the __atomic_*() built-ins for -# 8-byte types is implemented via libatomic, so only available since gcc -# 4.8. -# -# In Buildroot, to simplify things, we've decided to simply require gcc -# 4.8 as soon as the architectures has at least one __atomic_*() built-in -# variant that requires libatomic. -# -# Since protobuf most likely only uses the 1, 2 and 4-byte variants, it -# *could* technically build with gcc 4.7. This is probably not a big deal, -# and we can live with requiring gcc 4.8 on PowerPC to build protobuf. -# -# The SPARC64 build fails due to a missing definition of Atomic64. This -# has been fixed on the master branch but the build still breaks due to -# undefined references to internal NoBarrier_Atomic*() functions. -# -# host-protobuf only builds on certain architectures -config BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - bool - default y if BR2_arm - default y if BR2_i386 - default y if BR2_mipsel - default y if BR2_x86_64 - default y if BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_sparc64 # missing definition of Atomic64 - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_USE_MMU # fork() - -config BR2_PACKAGE_PROTOBUF - bool "protobuf" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS - depends on !BR2_STATIC_LIBS - help - Protocol buffers are Google's language-neutral, platform-neutral, - extensible mechanism for serializing structured data. - - https://developers.google.com/protocol-buffers - -comment "protobuf needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ - || BR2_STATIC_LIBS - depends on BR2_PACKAGE_PROTOBUF_ARCH_SUPPORTS diff --git a/package.bak/protobuf/protobuf.hash b/package.bak/protobuf/protobuf.hash deleted file mode 100644 index b681650a13..0000000000 --- a/package.bak/protobuf/protobuf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f5b3563f118f1d3d6e001705fa7082e8fc3bda50038ac3dff787650795734146 protobuf-v3.0.0.tar.gz diff --git a/package.bak/protobuf/protobuf.mk b/package.bak/protobuf/protobuf.mk deleted file mode 100644 index dabbfb7a4a..0000000000 --- a/package.bak/protobuf/protobuf.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# protobuf -# -################################################################################ - -# When bumping this package, make sure to also verify if the -# python-protobuf package still works, as they share the same -# version/site variables. -PROTOBUF_VERSION = v3.0.0 -PROTOBUF_SITE = $(call github,google,protobuf,$(PROTOBUF_VERSION)) -PROTOBUF_LICENSE = BSD-3c -PROTOBUF_LICENSE_FILES = LICENSE -# no configure script -PROTOBUF_AUTORECONF = YES - -# N.B. Need to use host protoc during cross compilation. -PROTOBUF_DEPENDENCIES = host-protobuf -PROTOBUF_CONF_OPTS = --with-protoc=$(HOST_DIR)/usr/bin/protoc - -PROTOBUF_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_ZLIB),y) -PROTOBUF_DEPENDENCIES += zlib -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/proxychains-ng/Config.in b/package.bak/proxychains-ng/Config.in deleted file mode 100644 index 1f89b1317f..0000000000 --- a/package.bak/proxychains-ng/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PROXYCHAINS_NG - bool "proxychains-ng" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - Force any tcp connections to flow through a proxy (or proxy chain) - - https://github.com/rofl0r/proxychains - -comment "proxychains-ng needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/proxychains-ng/proxychains-ng.hash b/package.bak/proxychains-ng/proxychains-ng.hash deleted file mode 100644 index e2e8c01af0..0000000000 --- a/package.bak/proxychains-ng/proxychains-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 859a717e18ed88c9291078a6ed8748dfe95c61220993203890fef8a04d28dda5 proxychains-4.6.tar.bz2 diff --git a/package.bak/proxychains-ng/proxychains-ng.mk b/package.bak/proxychains-ng/proxychains-ng.mk deleted file mode 100644 index 54e7dcd631..0000000000 --- a/package.bak/proxychains-ng/proxychains-ng.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# proxychains-ng -# -################################################################################ - -PROXYCHAINS_NG_VERSION = 4.6 -PROXYCHAINS_NG_SOURCE = proxychains-$(PROXYCHAINS_NG_VERSION).tar.bz2 -PROXYCHAINS_NG_SITE = http://downloads.sourceforge.net/project/proxychains-ng -PROXYCHAINS_NG_LICENSE = GPLv2+ -PROXYCHAINS_NG_LICENSE_FILES = COPYING - -define PROXYCHAINS_NG_CONFIGURE_CMDS - cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) ./configure --prefix=/usr --sysconfdir=/etc -endef - -define PROXYCHAINS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define PROXYCHAINS_NG_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install install-config -endef - -$(eval $(generic-package)) diff --git a/package.bak/pru-software-support/Config.in b/package.bak/pru-software-support/Config.in deleted file mode 100644 index 4e34806ee7..0000000000 --- a/package.bak/pru-software-support/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PRU_SOFTWARE_SUPPORT - bool "pru-software-support" - depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_PRU_SOFTWARE_SUPPORT - help - PRU firmware examples extracted from TI's PRU software - support package. See readme.txt for installation details. - - https://git.ti.com/pru-software-support-package/pru-software-support-package diff --git a/package.bak/pru-software-support/Config.in.host b/package.bak/pru-software-support/Config.in.host deleted file mode 100644 index d362ac5afb..0000000000 --- a/package.bak/pru-software-support/Config.in.host +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_HOST_PRU_SOFTWARE_SUPPORT - bool "host pru-software-support" - depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS - select BR2_PACKAGE_HOST_TI_CGT_PRU - help - This package provides useful headers and libraries for the - PRU unit found on some TI processors e.g. AM3358. Note that - the included labs and examples aren't built, they can be - built using the corresponding target package. - - https://git.ti.com/pru-software-support-package/pru-software-support-package diff --git a/package.bak/pru-software-support/pru-software-support.hash b/package.bak/pru-software-support/pru-software-support.hash deleted file mode 100644 index 8f624da764..0000000000 --- a/package.bak/pru-software-support/pru-software-support.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally-calculated hash -sha256 b257535ca9b1641d1a238795f3c7004064c573a91cf4a1fa566e3f7c2360c38f pru-software-support-804b548e69ef9fdf44445f6d0968d81cb8a1e7b4.tar.gz diff --git a/package.bak/pru-software-support/pru-software-support.mk b/package.bak/pru-software-support/pru-software-support.mk deleted file mode 100644 index 06983c275d..0000000000 --- a/package.bak/pru-software-support/pru-software-support.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# pru-software-support -# -################################################################################ - -PRU_SOFTWARE_SUPPORT_VERSION = 804b548e69ef9fdf44445f6d0968d81cb8a1e7b4 -PRU_SOFTWARE_SUPPORT_SITE = git://git.ti.com/pru-software-support-package/pru-software-support-package.git -PRU_SOFTWARE_SUPPORT_LICENSE = BSD-3c, GPLv2, Public Domain -PRU_SOFTWARE_SUPPORT_LICENSE_FILES = PRU-Package-v4.0-Manifest.html -PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru host-pru-software-support -HOST_PRU_SOFTWARE_SUPPORT_DEPENDENCIES = host-ti-cgt-pru - -define HOST_PRU_SOFTWARE_SUPPORT_BUILD_CMDS - $(MAKE) PRU_CGT=$(TI_CGT_PRU_INSTALLDIR) -C $(@D)/lib/src -endef - -# install this library support alongside PRU toolchain i.e. -# everything in TI_CGT_PRU_INSTALLDIR as PRU_CGT -define HOST_PRU_SOFTWARE_SUPPORT_INSTALL_CMDS - mkdir -p $(TI_CGT_PRU_INSTALLDIR)/usr/include - cp -dpfr $(@D)/include/* $(TI_CGT_PRU_INSTALLDIR)/usr/include - mkdir -p $(TI_CGT_PRU_INSTALLDIR)/usr/lib - cp -dpfr $(@D)/lib/src/*/gen/*.lib $(TI_CGT_PRU_INSTALLDIR)/usr/lib/ -endef - -define PRU_SOFTWARE_SUPPORT_BUILD_CMDS - $(MAKE) PRU_CGT=$(TI_CGT_PRU_INSTALLDIR) -C $(@D)/examples -endef - -define PRU_SOFTWARE_SUPPORT_INSTALL_TARGET_CMDS - mkdir -p $(TARGET_DIR)/usr/share/pru-software-support - cp -dpfr $(@D)/examples/* $(TARGET_DIR)/usr/share/pru-software-support/ -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/pru-software-support/readme.txt b/package.bak/pru-software-support/readme.txt deleted file mode 100644 index 85d7af828f..0000000000 --- a/package.bak/pru-software-support/readme.txt +++ /dev/null @@ -1,21 +0,0 @@ -PRU Software Support -==================== - -Two different packages are provided from the TI PRU software support -code base. - -1. The include files and rpmsg static library for the PRU are - installed alongside the host package for the PRU code generation - tools package i.e. $(TI_CGT_PRU_INSTALLDIR). - -2. A target package for all the examples installed to - /usr/share/pru-software-support/. Users wanting to test a specific - example should copy or link it to a directory where the kernel - looks for firmware, e.g: - - # cp /usr/share/pru-software-support/am335x/PRU_gpioToggle/gen/PRU_gpioToggle.out \ - /lib/firmware/am335x-pru0-fw - -To get started with the PRU, have a look at the labs [1]. - -[1] http://processors.wiki.ti.com/index.php/PRU_Training:_Hands-on_Labs diff --git a/package.bak/pseudo/0001-Fix-mixed-tab-space-indentation.patch b/package.bak/pseudo/0001-Fix-mixed-tab-space-indentation.patch deleted file mode 100644 index 6b62c1af94..0000000000 --- a/package.bak/pseudo/0001-Fix-mixed-tab-space-indentation.patch +++ /dev/null @@ -1,105 +0,0 @@ -From bf4e5310547603bf36e67dc4cba027963f16508e Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 11:53:48 -0400 -Subject: [PATCH 1/3] Fix mixed tab/space indentation -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" - File "./makewrappers", line 327 - return """/* This function is not called if pseudo is configured --enable-force-async */ - ^ -TabError: inconsistent use of tabs and spaces in indentation - -Signed-off-by: Gaël PORTAY ---- - makewrappers | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/makewrappers b/makewrappers -index e9191ed..303e2cc 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -324,7 +324,7 @@ class Function: - - def maybe_async_skip(self): - if self.async_skip: -- return """/* This function is not called if pseudo is configured --enable-force-async */ -+ return """/* This function is not called if pseudo is configured --enable-force-async */ - #ifdef PSEUDO_FORCE_ASYNC - if (!pseudo_allow_fsync) { - PROFILE_DONE; -@@ -333,7 +333,7 @@ class Function: - #endif - """ % self.async_skip - else: -- return "" -+ return "" - - def comment(self): - """declare self (in a comment)""" -@@ -393,11 +393,11 @@ class Function: - - def rc_format(self): - """the format string to use for the return value""" -- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] -+ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['format'] - - def rc_value(self): - """the value to pass for the format string for the return value""" -- return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] -+ return typedata.get(self.type, { 'format': '[%s]', 'value': '"' + self.type + '"' })['value'] - - def rc_decl(self): - """declare rc (if needed)""" -@@ -456,7 +456,7 @@ additional ports to include. - self.name = port - self.subports = [] - self.preports = [] -- print port -+ print port - - if os.path.exists(self.portfile("pseudo_wrappers.c")): - self.wrappers = self.portfile("pseudo_wrappers.c") -@@ -522,11 +522,11 @@ additional ports to include. - return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') - - def portdeps(self): -- deps = [] -- if self.wrappers: -- deps.append(self.wrappers) -- if self.portdef_file: -- deps.append(self.portdef_file) -+ deps = [] -+ if self.wrappers: -+ deps.append(self.wrappers) -+ if self.portdef_file: -+ deps.append(self.portdef_file) - if deps: - return 'pseudo_wrappers.o: %s' % ' '.join(deps) - else: -@@ -590,7 +590,7 @@ def main(argv): - - for arg in argv: - name, value = arg.split('=') -- os.environ["port_" + name] = value -+ os.environ["port_" + name] = value - - # error checking helpfully provided by the exception handler - copyright_file = open('guts/COPYRIGHT') -@@ -599,9 +599,9 @@ def main(argv): - - for path in glob.glob('templates/*'): - try: -- print "Considering template: " + path -+ print "Considering template: " + path - source = TemplateFile(path) -- if source.name.endswith('.c') or source.name.endswith('.h'): -+ if source.name.endswith('.c') or source.name.endswith('.h'): - source.emit('copyright') - source.emit('header') - sources.append(source) --- -2.10.1 - diff --git a/package.bak/pseudo/0002-Fix-missing-parentheses-at-print.patch b/package.bak/pseudo/0002-Fix-missing-parentheses-at-print.patch deleted file mode 100644 index b023fcf831..0000000000 --- a/package.bak/pseudo/0002-Fix-missing-parentheses-at-print.patch +++ /dev/null @@ -1,190 +0,0 @@ -From 6488a68ca715d8e18f899e536effceb548ed136e Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 12:23:25 -0400 -Subject: [PATCH 2/3] Fix missing parentheses at print -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -CC="cc -pipe -std=gnu99 -Wall -W -Wextra -fPIC -D_LARGEFILE64_SOURCE -D_ATFILE_SOURCE -DPSEUDO_PREFIX='"/usr/local"' -DPSEUDO_SUFFIX='""' -DPSEUDO_BINDIR='"bin"' -DPSEUDO_LIBDIR='"lib64"' -DPSEUDO_LOCALSTATEDIR='"var/pseudo"' -DPSEUDO_VERSION='"1.8.1"' -DUSE_MEMORY_DB -DPSEUDO_PASSWD_FALLBACK='""' -DPSEUDO_XATTR_SUPPORT -O2 -g " ./makewrappers "xattr=true" - File "./makewrappers", line 459 - print port - ^ -SyntaxError: Missing parentheses in call to 'print' - -Signed-off-by: Gaël PORTAY ---- - maketables | 12 ++++++------ - makewrappers | 32 ++++++++++++++++---------------- - templatefile.py | 8 ++++---- - 3 files changed, 26 insertions(+), 26 deletions(-) - -diff --git a/maketables b/maketables -index b32312e..0726485 100755 ---- a/maketables -+++ b/maketables -@@ -73,7 +73,7 @@ class DataType: - for col in columns: - indexed = False - if col.startswith("FLAGS"): -- print "Flags: set for %s" % self.name -+ print("Flags: set for %s" % self.name) - self.flags = True - continue - if col.startswith("INDEXED "): -@@ -248,7 +248,7 @@ def main(): - template_file.emit('header') - templates.append(template_file) - except IOError: -- print "Invalid or malformed template %s. Aborting." % path -+ print("Invalid or malformed template %s. Aborting." % path) - exit(1) - - for filename in sys.argv[1:]: -@@ -256,15 +256,15 @@ def main(): - sys.stdout.write("%s: " % filename) - datatype = DataType(filename) - datatypes.append(datatype) -- print datatype.__repr__() -- print "" -+ print(datatype.__repr__()) -+ print("") - -- print "Writing datatypes...", -+ print("Writing datatypes...") - for datatype in datatypes: - # populate various tables and files with each datatype - for template_file in templates: - template_file.emit('body', datatype) -- print "done. Cleaning up." -+ print("done. Cleaning up.") - - for template_file in templates: - # clean up files -diff --git a/makewrappers b/makewrappers -index 303e2cc..bac856b 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -456,7 +456,7 @@ additional ports to include. - self.name = port - self.subports = [] - self.preports = [] -- print port -+ print(port) - - if os.path.exists(self.portfile("pseudo_wrappers.c")): - self.wrappers = self.portfile("pseudo_wrappers.c") -@@ -504,17 +504,17 @@ additional ports to include. - prefuncs = pre.functions() - for name in prefuncs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, pre.name, mergedfuncs[name].port)) - mergedfuncs[name] = prefuncs[name] - for name in self.funcs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, self.name, mergedfuncs[name].port)) - mergedfuncs[name] = self.funcs[name] - for sub in self.subports: - subfuncs = sub.functions() - for name in subfuncs.keys(): - if name in mergedfuncs: -- print "Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port) -+ print("Warning: %s from %s overriding %s" % (name, sub.name, mergedfuncs[name].port)) - mergedfuncs[name] = subfuncs[name] - return mergedfuncs - -@@ -576,11 +576,11 @@ def process_wrapfuncs(port): - func.directory = directory - funcs[func.name] = func - sys.stdout.write(".") -- except Exception, e: -- print "Parsing failed:", e -+ except Exception(e): -+ print("Parsing failed:", e) - exit(1) - funclist.close() -- print "" -+ print("") - return funcs - - def main(argv): -@@ -599,35 +599,35 @@ def main(argv): - - for path in glob.glob('templates/*'): - try: -- print "Considering template: " + path -+ print("Considering template: " + path) - source = TemplateFile(path) - if source.name.endswith('.c') or source.name.endswith('.h'): - source.emit('copyright') - source.emit('header') - sources.append(source) - except IOError: -- print "Invalid or malformed template %s. Aborting." % path -+ print("Invalid or malformed template %s. Aborting." % path) - exit(1) - - try: - port = Port('common', sources) - - except KeyError: -- print "Unknown uname -s result: '%s'." % uname_s -- print "Known system types are:" -- print "%-20s %-10s %s" % ("uname -s", "port name", "description") -+ print("Unknown uname -s result: '%s'." % uname_s) -+ print("Known system types are:") -+ print("%-20s %-10s %s" % ("uname -s", "port name", "description")) - for key in host_ports: -- print "%-20s %-10s %s" % (key, host_ports[key], -- host_descrs[host_ports[key]]) -+ print("%-20s %-10s %s" % (key, host_ports[key], -+ host_descrs[host_ports[key]])) - - # the per-function stuff -- print "Writing functions...", -+ print("Writing functions...") - all_funcs = port.functions() - for name in sorted(all_funcs.keys()): - # populate various tables and files with each function - for source in sources: - source.emit('body', all_funcs[name]) -- print "done. Cleaning up." -+ print("done. Cleaning up.") - - for source in sources: - # clean up files -diff --git a/templatefile.py b/templatefile.py -index 2789b22..abf9a2c 100644 ---- a/templatefile.py -+++ b/templatefile.py -@@ -79,13 +79,13 @@ class TemplateFile: - return - path = Template(self.path).safe_substitute(item) - if os.path.exists(path): -- # print "We don't overwrite existing files." -+ # print("We don't overwrite existing files.") - return - self.file = open(path, 'w') - if not self.file: -- print "Couldn't open '%s' (expanded from %s), " \ -+ print("Couldn't open '%s' (expanded from %s), " \ - "not emitting '%s'." % \ -- (path, self.path, template) -+ (path, self.path, template)) - return - - def emit(self, template, item=None): -@@ -103,7 +103,7 @@ class TemplateFile: - self.file.write(templ.safe_substitute(item)) - self.file.write("\n") - else: -- print "Warning: Unknown template '%s'." % template -+ print("Warning: Unknown template '%s'." % template) - - if self.file_per_item: - if self.file: --- -2.10.1 - diff --git a/package.bak/pseudo/0003-Make-it-compatible-with-python3.patch b/package.bak/pseudo/0003-Make-it-compatible-with-python3.patch deleted file mode 100644 index 3bb74deacf..0000000000 --- a/package.bak/pseudo/0003-Make-it-compatible-with-python3.patch +++ /dev/null @@ -1,215 +0,0 @@ -From fcc10b1f4a9968af5cda1adb9e449df92939d5f2 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= -Date: Fri, 4 Nov 2016 15:58:46 -0400 -Subject: [PATCH 3/3] Make it compatible with python3 -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf-8 -Content-Transfer-Encoding: 8bit - -Python scripts are now compatible with both version of python, 2 and 3. - -Helped-by: Damien Riegel -Helped-by: Alexandre Leblanc -Signed-off-by: Gaël PORTAY ---- - maketables | 135 ++++++++++++++++++++++++++++++----------------------------- - makewrappers | 8 ++-- - 2 files changed, 73 insertions(+), 70 deletions(-) - -diff --git a/maketables b/maketables -index 0726485..f74f2b1 100755 ---- a/maketables -+++ b/maketables -@@ -51,6 +51,7 @@ value. (This is for consistency with C array bounds.) - import glob - import sys - import string -+import os - from templatefile import TemplateFile - - class DataType: -@@ -58,74 +59,74 @@ class DataType: - - def __init__(self, path): - """read the first line of path, then make tuples of the rest""" -- source = file(path) -- definition = source.readline().rstrip() -- self.name, qualifiers = string.split(definition, ': ', 2) -- if '; ' in qualifiers: -- self.prefix, columns = string.split(qualifiers, '; ') -- else: -- self.prefix = qualifiers -- columns = [] -- self.flags = False -- if len(columns): -- self.columns = [] -- columns = string.split(columns, ', ') -- for col in columns: -- indexed = False -- if col.startswith("FLAGS"): -- print("Flags: set for %s" % self.name) -- self.flags = True -+ with open(path,'r') as source: -+ definition = source.readline().rstrip() -+ self.name, qualifiers = definition.split(': ', 2) -+ if '; ' in qualifiers: -+ self.prefix, columns = qualifiers.split('; ') -+ else: -+ self.prefix = qualifiers -+ columns = [] -+ self.flags = False -+ if len(columns): -+ self.columns = [] -+ columns = columns.split(', ') -+ for col in columns: -+ indexed = False -+ if col.startswith("FLAGS"): -+ print("Flags: set for %s" % self.name) -+ self.flags = True -+ continue -+ if col.startswith("INDEXED "): -+ col = col[8:] -+ indexed = True -+ if "=" in col: -+ name, default = col.split(' = ') -+ else: -+ name, default = col, "" -+ if " " in name: -+ words = name.split(' ') -+ name = words[-1] -+ del words[-1] -+ type = ' '.join(words) -+ else: -+ type = "char *" -+ self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) -+ else: -+ self.columns = [] -+ self.data = [] -+ self.comments = [] -+ index = 1 -+ for line in source.readlines(): -+ item = {} -+ if line.startswith('#'): -+ self.comments.append(line.rstrip().replace('#', '')) - continue -- if col.startswith("INDEXED "): -- col = col[8:] -- indexed = True -- if "=" in col: -- name, default = string.split(col, ' = ') -- else: -- name, default = col, "" -- if " " in name: -- words = string.split(name, ' ') -- name = words[-1] -- del words[-1] -- type = ' '.join(words) -- else: -- type = "char *" -- self.columns.append({"indexed":indexed, "type":type, "name":name, "value":default}) -- else: -- self.columns = [] -- self.data = [] -- self.comments = [] -- index = 1 -- for line in source.readlines(): -- item = {} -- if line.startswith('#'): -- self.comments.append(line.rstrip().replace('#', '')) -- continue -- # first entry on the line is the "real" name/id, following hunks -- # are additional columns -- cols = string.split(line.rstrip(), ', ') -- item["name"] = cols.pop(0) -- item["upper"] = item["name"].replace('-', '_').upper() -- column_list = [] -- for col in self.columns: -- if len(cols) > 0: -- value = cols.pop(0) -- if col["indexed"]: -- if not "max" in col: -- col["max"] = value -- if value > col["max"]: -- col["max"] = value -- if not "min" in col: -- col["min"] = value -- if value < col["min"]: -- col["min"] = value -- column_list.append({"name":col["name"], "value":value}) -- else: -- column_list.append({"name":col["name"], "value":col["value"]}) -- item["cols"] = column_list -- item["index"] = index -- index = index + 1 -- self.data.append(item) -+ # first entry on the line is the "real" name/id, following hunks -+ # are additional columns -+ cols = line.rstrip().split(', ') -+ item["name"] = cols.pop(0) -+ item["upper"] = item["name"].replace('-', '_').upper() -+ column_list = [] -+ for col in self.columns: -+ if len(cols) > 0: -+ value = cols.pop(0) -+ if col["indexed"]: -+ if not "max" in col: -+ col["max"] = value -+ if value > col["max"]: -+ col["max"] = value -+ if not "min" in col: -+ col["min"] = value -+ if value < col["min"]: -+ col["min"] = value -+ column_list.append({"name":col["name"], "value":value}) -+ else: -+ column_list.append({"name":col["name"], "value":col["value"]}) -+ item["cols"] = column_list -+ item["index"] = index -+ index = index + 1 -+ self.data.append(item) - - def __getitem__(self, key): - """Make this object look like a dict for Templates to use""" -diff --git a/makewrappers b/makewrappers -index bac856b..ff08ba0 100755 ---- a/makewrappers -+++ b/makewrappers -@@ -453,6 +453,8 @@ additional ports to include. - """ - - def __init__(self, port, sources): -+ if type(port) is not str: -+ port = str(port, encoding="ascii") - self.name = port - self.subports = [] - self.preports = [] -@@ -483,7 +485,7 @@ additional ports to include. - if retcode: - raise Exception("preports script failed for port %s" % self.name) - -- for preport in string.split(portlist): -+ for preport in portlist.split(): - next = Port(preport, sources) - self.preports.append(next) - -@@ -494,7 +496,7 @@ additional ports to include. - if retcode: - raise Exception("subports script failed for port %s" % self.name) - -- for subport in string.split(portlist): -+ for subport in portlist.split(): - next = Port(subport, sources) - self.subports.append(next) - -@@ -519,7 +521,7 @@ additional ports to include. - return mergedfuncs - - def define(self): -- return '#define PSEUDO_PORT_%s 1' % string.upper(self.name).replace('/', '_') -+ return '#define PSEUDO_PORT_%s 1' % self.name.upper().replace('/', '_') - - def portdeps(self): - deps = [] --- -2.10.1 - diff --git a/package.bak/pseudo/pseudo.hash b/package.bak/pseudo/pseudo.hash deleted file mode 100644 index 1553a293fd..0000000000 --- a/package.bak/pseudo/pseudo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7d4b767302f118fa1c3f89b551cf3f3f2aa92721dab86ff62f0600a394b8a81a pseudo-45eca34c754d416a38bee90fb2d3c110a0b6cc5f.tar.gz diff --git a/package.bak/pseudo/pseudo.mk b/package.bak/pseudo/pseudo.mk deleted file mode 100644 index 8144cca825..0000000000 --- a/package.bak/pseudo/pseudo.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# pseudo -# -################################################################################ - -PSEUDO_VERSION = 45eca34c754d416a38bee90fb2d3c110a0b6cc5f -PSEUDO_SITE = https://git.yoctoproject.org/git/pseudo -PSEUDO_SITE_METHOD = git - -# No "or later" clause. -PSEUDO_LICENSE = LGPLv2.1 -PSEUDO_LICENSE_FILES = COPYING - -HOST_PSEUDO_DEPENDENCIES = host-attr host-sqlite - -# configure script is not generated by autoconf, so passing --libdir -# is necessary, even if the infrastructure passes --prefix already. -# It also does not use CFLAGS from the environment, they need to be -# specified with a custom --cflags option. Also force rpath to avoid -# a warning at configure time. -HOST_PSEUDO_CONF_OPTS = \ - --cflags="$(HOSTCFLAGS)" \ - --with-rpath=$(HOST_DIR)/usr/lib \ - --bits=$(if $(filter %64,$(HOSTARCH)),64,32) \ - --libdir=$(HOST_DIR)/usr/lib \ - --with-sqlite=$(HOST_DIR)/usr - -$(eval $(host-autotools-package)) diff --git a/package.bak/psmisc/0001-link-against-libintl.patch b/package.bak/psmisc/0001-link-against-libintl.patch deleted file mode 100644 index 907e7e75bd..0000000000 --- a/package.bak/psmisc/0001-link-against-libintl.patch +++ /dev/null @@ -1,33 +0,0 @@ -Link against libintl if needed - -When built against a C library that has locale support, but for which -intl support is provided by an external libintl library, psmisc -forgets to link against this library, even though the configure script -properly checks that. - -This patch therefore ensure that we link against libintl when needed, -thanks to the @INTLLIBS@ variable provided by the configure script. - -We do not modify the Makefile.am file, because autoreconfiguring this -package doesn't work: because of its usage of gettext, it wants to run -the "autopoint" program, which itself depends on CVS being installed, -for some strange reasons. That's the reason why we fall back to the -hacky solution of modifying the Makefile.in file. - -Forward-ported Thomas's patch to psmisc 22.16 -from commit f066ed70cd6939838d4057f66798cbc1d972cc73 - -Signed-off-by: Gustavo Zacarias - -diff -Nura psmisc-22.16.orig/src/Makefile.in psmisc-22.16/src/Makefile.in ---- psmisc-22.16.orig/src/Makefile.in 2012-03-28 22:27:33.106660358 -0300 -+++ psmisc-22.16/src/Makefile.in 2012-03-28 22:28:55.752219349 -0300 -@@ -76,7 +76,7 @@ - killall_DEPENDENCIES = - am_peekfd_OBJECTS = peekfd.$(OBJEXT) - peekfd_OBJECTS = $(am_peekfd_OBJECTS) --peekfd_LDADD = $(LDADD) -+peekfd_LDADD = $(LDADD) @LIBINTL@ - am_prtstat_OBJECTS = prtstat.$(OBJEXT) - prtstat_OBJECTS = $(am_prtstat_OBJECTS) - prtstat_DEPENDENCIES = diff --git a/package.bak/psmisc/0002-no-__progname.patch b/package.bak/psmisc/0002-no-__progname.patch deleted file mode 100644 index 51096571cb..0000000000 --- a/package.bak/psmisc/0002-no-__progname.patch +++ /dev/null @@ -1,47 +0,0 @@ -[PATCH]: pstree: don't use glibc-specific __progname - -uclibc (per default) doesn't implement __progname, and the pstree.x11 -stuff isn't that critical, so just disable it. - -Signed-off-by: Peter Korsgaard -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni - -Index: psmisc-22.13/src/pstree.c -=================================================================== ---- psmisc-22.13.orig/src/pstree.c 2010-07-12 13:10:03.000000000 +0200 -+++ psmisc-22.13/src/pstree.c 2011-05-21 16:33:37.456530775 +0200 -@@ -49,8 +49,6 @@ - #include - #endif /*WITH_SELINUX */ - --extern const char *__progname; -- - #define PROC_BASE "/proc" - - /* UTF-8 defines by Johan Myreen, updated by Ben Winslow */ -@@ -854,9 +852,6 @@ - textdomain(PACKAGE); - #endif - -- if (!strcmp(__progname, "pstree.x11")) -- wait_end = 1; -- - /* - * Attempt to figure out a good default symbol set. Will be overriden by - * command-line options, if given. -Index: psmisc-22.13/src/Makefile.in -=================================================================== ---- psmisc-22.13.orig/src/Makefile.in 2011-05-21 16:33:42.748530777 +0200 -+++ psmisc-22.13/src/Makefile.in 2011-05-21 16:33:47.360530782 +0200 -@@ -557,10 +557,6 @@ - grep '^{ 1,"HUP" },$$' signames.h >/dev/null || \ - { rm -f signames.h; exit 1; } - --install-exec-hook: -- cd $(DESTDIR)$(bindir) && \ -- ( [ -h pstree.x11 ] || $(LN_S) pstree pstree.x11) -- - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/package.bak/psmisc/Config.in b/package.bak/psmisc/Config.in deleted file mode 100644 index 734542cc8a..0000000000 --- a/package.bak/psmisc/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PSMISC - bool "psmisc" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Helpful /proc related utilities such as pstree, fuser, and killall - - http://psmisc.sourceforge.net/ diff --git a/package.bak/psmisc/psmisc.hash b/package.bak/psmisc/psmisc.hash deleted file mode 100644 index 5e489ed34c..0000000000 --- a/package.bak/psmisc/psmisc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed: -sha256 97323cad619210845b696d7d722c383852b2acb5c49b5b0852c4f29c77a8145a psmisc-22.21.tar.gz -sha256 4f1cb11c7182ad96e682ec50a2d9a6a22079a2b11dffde3bb3cb67823b679422 e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff diff --git a/package.bak/psmisc/psmisc.mk b/package.bak/psmisc/psmisc.mk deleted file mode 100644 index 2f83b7d8c9..0000000000 --- a/package.bak/psmisc/psmisc.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# psmisc -# -################################################################################ - -PSMISC_VERSION = 22.21 -PSMISC_SITE = http://downloads.sourceforge.net/project/psmisc/psmisc -PSMISC_PATCH = \ - https://gitlab.com/psmisc/psmisc/commit/e7203c36a2a4dc10cd8268a5dc036fc9c2a73b6c.diff -PSMISC_LICENSE = GPLv2 -PSMISC_LICENSE_FILES = COPYING -PSMISC_DEPENDENCIES = ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) - -ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) -# Don't force -fstack-protector when SSP is not available in toolchain -PSMISC_CONF_OPTS = --disable-harden-flags -endif - -# build after busybox, we prefer fat versions while we're at it -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -PSMISC_DEPENDENCIES += busybox -endif - -$(eval $(autotools-package)) diff --git a/package.bak/psplash/Config.in b/package.bak/psplash/Config.in deleted file mode 100644 index d68aaa210f..0000000000 --- a/package.bak/psplash/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_PSPLASH - bool "psplash" - depends on BR2_USE_WCHAR - help - PSplash is a userspace graphical boot splash screen for mainly - embedded Linux devices supporting a 16bpp or 32bpp framebuffer. - It has few dependencies (just libc), supports basic images and - text and handles rotation. Its visual look is configurable by - basic source changes. - - Also included is a 'client' command utility for sending - information to psplash such as boot progress information. - - Start the drawing process with 'psplash -n&' as early as possible. - Note: psplash creates a FIFO in /tmp for communication with - psplash-write. - - Usage: - * Set progress bar to 50 percent: - psplash-write "PROGRESS 50" - - * Display message "foobar" above progress bar: - psplash-write "MSG foobar" - - * Terminate psplash: - psplash-write "QUIT" - - http://git.yoctoproject.org/cgit/cgit.cgi/psplash/ - -comment "psplash needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/psplash/psplash-quit.service b/package.bak/psplash/psplash-quit.service deleted file mode 100644 index 14bd4994b5..0000000000 --- a/package.bak/psplash/psplash-quit.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Terminate Psplash Boot Screen -After=psplash-start.service - -[Service] -Type=oneshot -ExecStart=/usr/bin/psplash-write QUIT -TimeoutSec=20 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/psplash/psplash-start.service b/package.bak/psplash/psplash-start.service deleted file mode 100644 index 2de3cfce22..0000000000 --- a/package.bak/psplash/psplash-start.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Starts Psplash Boot screen -Wants=systemd-vconsole-setup.service -After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service -DefaultDependencies=no - -[Service] -ExecStart=/usr/bin/psplash -n - -[Install] -WantedBy=sysinit.target diff --git a/package.bak/psplash/psplash.mk b/package.bak/psplash/psplash.mk deleted file mode 100644 index 4e365c53e4..0000000000 --- a/package.bak/psplash/psplash.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# psplash -# -################################################################################ - -PSPLASH_VERSION = 14c8f7b705de944beb4de3f296506d80871e410f -PSPLASH_SITE = git://git.yoctoproject.org/psplash -PSPLASH_LICENSE = GPLv2+ -PSPLASH_AUTORECONF = YES - -define PSPLASH_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/psplash/psplash-start.service \ - $(TARGET_DIR)/usr/lib/systemd/system/psplash-start.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-start.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/ - - $(INSTALL) -D -m 644 package/psplash/psplash-quit.service \ - $(TARGET_DIR)/usr/lib/systemd/system/psplash-quit.service - $(INSTALL) -d $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/psplash-quit.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ptpd/Config.in b/package.bak/ptpd/Config.in deleted file mode 100644 index 2d87ca31bb..0000000000 --- a/package.bak/ptpd/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PTPD - bool "ptpd" - help - The PTP daemon (PTPd) implements the Precision Time protocol - (PTP) as defined by the IEEE-1588-2002. - - http://ptpd.sourceforge.net/ diff --git a/package.bak/ptpd/S65ptpd b/package.bak/ptpd/S65ptpd deleted file mode 100755 index 89914e96bc..0000000000 --- a/package.bak/ptpd/S65ptpd +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Start ptpd -# - -case "$1" in - start) - printf "Starting ptpd: " - start-stop-daemon -S -q -x /usr/sbin/ptpd -- -S - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "OK" - fi - ;; - stop) - printf "Stopping ptpd: " - start-stop-daemon -K -q -x /usr/sbin/ptpd - echo "OK" - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/ptpd/ptpd.hash b/package.bak/ptpd/ptpd.hash deleted file mode 100644 index ccd1d84c31..0000000000 --- a/package.bak/ptpd/ptpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a7c6ea83bd53da75ae04a7b7a25fe7c597b4e9ff1f93d46f4502e3fa8a2cb950 ptpd-1.1.0.tar.gz diff --git a/package.bak/ptpd/ptpd.mk b/package.bak/ptpd/ptpd.mk deleted file mode 100644 index dad8ccfe10..0000000000 --- a/package.bak/ptpd/ptpd.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# ptpd -# -################################################################################ - -PTPD_VERSION = 1.1.0 -PTPD_SITE = http://downloads.sourceforge.net/project/ptpd/ptpd/$(PTPD_VERSION) -PTPD_LICENSE = BSD -PTPD_LICENSE_FILES = COPYRIGHT - -define PTPD_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/src -endef - -define PTPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/src/ptpd $(TARGET_DIR)/usr/sbin/ptpd -endef - -define PTPD_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/ptpd/S65ptpd \ - $(TARGET_DIR)/etc/init.d/S65ptpd -endef - -define PTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/ptpd/ptpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ptpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/ptpd/ptpd.service b/package.bak/ptpd/ptpd.service deleted file mode 100644 index c9da3f422c..0000000000 --- a/package.bak/ptpd/ptpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Precision Time Protocol daemon -After=syslog.target network.target - -[Service] -ExecStart=/usr/sbin/ptpd -c -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/ptpd2/0001-musl.patch b/package.bak/ptpd2/0001-musl.patch deleted file mode 100644 index 2e214b2188..0000000000 --- a/package.bak/ptpd2/0001-musl.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr ptpd-ptpd-2.3.1.org/src/dep/net.c ptpd-ptpd-2.3.1/src/dep/net.c ---- ptpd-ptpd-2.3.1.org/src/dep/net.c 2015-06-29 17:13:29.000000000 +0200 -+++ ptpd-ptpd-2.3.1/src/dep/net.c 2016-01-24 00:35:44.509860065 +0100 -@@ -82,7 +82,6 @@ - #ifdef SO_TIMESTAMPING - #include - #include --#include - #endif /* SO_TIMESTAMPING */ - - /** diff --git a/package.bak/ptpd2/Config.in b/package.bak/ptpd2/Config.in deleted file mode 100644 index e88a9bb1ac..0000000000 --- a/package.bak/ptpd2/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PTPD2 - bool "ptpd2" - select BR2_PACKAGE_LIBPCAP - help - The PTP daemon (PTPd) implements the Precision Time protocol - (PTP) as defined by the IEEE-1588-2008. - - https://github.com/ptpd/ptpd - diff --git a/package.bak/ptpd2/S65ptpd2 b/package.bak/ptpd2/S65ptpd2 deleted file mode 100755 index f815cb5a7b..0000000000 --- a/package.bak/ptpd2/S65ptpd2 +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh -# -# Start ptpd2 -# - -case "$1" in - start) - printf "Starting ptpd2: " - start-stop-daemon -S -q -x /usr/sbin/ptpd2 -- -g - if [ $? != 0 ]; then - echo "FAILED" - exit 1 - else - echo "OK" - fi - ;; - stop) - printf "Stopping ptpd2: " - start-stop-daemon -K -q -x /usr/sbin/ptpd2 - echo "OK" - ;; - restart|reload) - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/ptpd2/ptpd2.hash b/package.bak/ptpd2/ptpd2.hash deleted file mode 100644 index af1f78a5a8..0000000000 --- a/package.bak/ptpd2/ptpd2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 267ad61d09d97069acec5d4878dceda20d0ddbebd27557d80230847848cee6c2 ptpd2-ptpd-2.3.1.tar.gz diff --git a/package.bak/ptpd2/ptpd2.mk b/package.bak/ptpd2/ptpd2.mk deleted file mode 100644 index d53b13534c..0000000000 --- a/package.bak/ptpd2/ptpd2.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# ptpd2 -# -################################################################################ - -PTPD2_VERSION = ptpd-2.3.1 -PTPD2_SITE = $(call github,ptpd,ptpd,$(PTPD2_VERSION)) -PTPD2_DEPENDENCIES = libpcap -PTPD2_CONF_OPTS = --with-pcap-config=$(STAGING_DIR)/usr/bin/pcap-config -# configure not shipped -PTPD2_AUTORECONF = YES -PTPD2_LICENSE = BSD-2c -PTPD2_LICENSE_FILES = COPYRIGHT - -ifeq ($(BR2_STATIC_LIBS),y) -PTPD2_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - -ifeq ($(BR2_PACKAGE_NETSNMP),y) -PTPD2_CONF_ENV += ac_cv_path_PATH_NET_SNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config -PTPD2_DEPENDENCIES += netsnmp -else -PTPD2_CONF_OPTS += --disable-snmp -endif - -# GCC bug with Os/O1/O2/O3 -# internal compiler error: in gen_add2_insn, at optabs.c:4454 -ifeq ($(BR2_bfin),y) -PTPD2_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0" -endif - -define PTPD2_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/ptpd2/S65ptpd2 \ - $(TARGET_DIR)/etc/init.d/S65ptpd2 -endef - -define PTPD2_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/ptpd2/ptpd2.service \ - $(TARGET_DIR)/usr/lib/systemd/system/ptpd2.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/ptpd2.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ptpd2.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ptpd2/ptpd2.service b/package.bak/ptpd2/ptpd2.service deleted file mode 100644 index 66e71ce0a4..0000000000 --- a/package.bak/ptpd2/ptpd2.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Precision Time Protocol daemon -After=syslog.target network.target - -[Service] -ExecStart=/usr/sbin/ptpd2 -C -g -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/pugixml/0001-check-cxx_long_long_type-existence.patch b/package.bak/pugixml/0001-check-cxx_long_long_type-existence.patch deleted file mode 100644 index a53c84a29a..0000000000 --- a/package.bak/pugixml/0001-check-cxx_long_long_type-existence.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6cfd9c14ced26c8220f7f7ea99610cbdbfb9eba7 Mon Sep 17 00:00:00 2001 -From: Theo Debrouwere -Date: Mon, 12 Sep 2016 09:38:56 +0200 -Subject: [PATCH] Bugfix: check if cxx_long_long_type is present before - applying it. - -Check if cxx_long_long_type is present in the list of compiler features -before adding it as a target_compile_feature. - -Patch was backported from -https://github.com/zeux/pugixml/commit/4dbb5646196a4a3cc94097f1473ef11d1d44df11 - -Signed-off-by: Theo Debrouwere ---- - scripts/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt -index 40a7ab0..6403753 100644 ---- a/scripts/CMakeLists.txt -+++ b/scripts/CMakeLists.txt -@@ -26,7 +26,7 @@ else() - endif() - - # Enable C++11 long long for compilers that are capable of it --if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1) -+if(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} STRLESS 3.1 AND ";${CMAKE_CXX_COMPILE_FEATURES};" MATCHES ";cxx_long_long_type;") - target_compile_features(pugixml PUBLIC cxx_long_long_type) - endif() - --- -2.9.3 - diff --git a/package.bak/pugixml/Config.in b/package.bak/pugixml/Config.in deleted file mode 100644 index d67e69573c..0000000000 --- a/package.bak/pugixml/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_PUGIXML - bool "pugixml" - depends on BR2_INSTALL_LIBSTDCPP - help - Light-weight, simple and fast XML parser for C++ with XPath support - - Features: - * DOM-like interface with rich traversal/modification capabilities - * Extremely fast non-validating XML parser which constructs the DOM tree - from an XML file/buffer - * XPath 1.0 implementation for complex data-driven tree queries - * Full Unicode support with Unicode interface variants and automatic - encoding conversions - - http://pugixml.org/ - https://github.com/zeux/pugixml - -comment "pugixml needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/pugixml/pugixml.hash b/package.bak/pugixml/pugixml.hash deleted file mode 100644 index 9007f7cae6..0000000000 --- a/package.bak/pugixml/pugixml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fbe10d46f61d769f7d92a296102e4e2bd3ee16130f11c5b10a1aae590ea1f5ca pugixml-1.7.tar.gz diff --git a/package.bak/pugixml/pugixml.mk b/package.bak/pugixml/pugixml.mk deleted file mode 100644 index 2e4f0ce561..0000000000 --- a/package.bak/pugixml/pugixml.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# pugixml -# -################################################################################ - -PUGIXML_VERSION = 1.7 -PUGIXML_SITE = http://github.com/zeux/pugixml/releases/download/v$(PUGIXML_VERSION) -PUGIXML_LICENSE = MIT -PUGIXML_LICENSE_FILES = readme.txt -PUGIXML_INSTALL_STAGING = YES - -PUGIXML_SUBDIR = scripts - -$(eval $(cmake-package)) diff --git a/package.bak/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch b/package.bak/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch deleted file mode 100644 index 19842fadf0..0000000000 --- a/package.bak/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch +++ /dev/null @@ -1,75 +0,0 @@ -From f6ab3c3aa7a1841c8add04828029356d2a8c88e7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 6 Apr 2015 21:56:31 -0700 -Subject: [PATCH] padsp: Make it compile on musl - -break assumptions on glibc and there is no stat64 on non -glibc C libraries - -See pulseaudio bug - -https://bugs.freedesktop.org/show_bug.cgi?id=85319 - -Upstream-Status: Pending -Signed-off-by: Khem Raj -[Bernd: taken from -http://git.alpinelinux.org/cgit/aports/tree/testing/pulseaudio/0001-padsp-Make-it-compile-on-musl.patch, -adjusted paths.] -Signed-off-by: Bernd Kuhls - ---- - src/utils/padsp.c | 15 +++++++++------ - 1 file changed, 9 insertions(+), 6 deletions(-) - -diff --git a/src/utils/padsp.c b/src/utils/padsp.c -index e61373c..684721a 100644 ---- a/src/utils/padsp.c -+++ b/src/utils/padsp.c -@@ -2368,7 +2368,7 @@ fail: - return ret; - } - --#ifdef sun -+#ifndef __GLIBC__ - int ioctl(int fd, int request, ...) { - #else - int ioctl(int fd, unsigned long request, ...) { -@@ -2508,10 +2508,13 @@ int stat(const char *pathname, struct stat *buf) { - - return 0; - } -- - #ifdef HAVE_OPEN64 -- -+#undef stat64 -+#ifdef __GLIBC__ - int stat64(const char *pathname, struct stat64 *buf) { -+#else -+int stat64(const char *pathname, struct stat *buf) { -+#endif - struct stat oldbuf; - int ret; - -@@ -2544,7 +2547,7 @@ int stat64(const char *pathname, struct stat64 *buf) { - - return 0; - } -- -+#undef open64 - int open64(const char *filename, int flags, ...) { - va_list args; - mode_t mode = 0; -@@ -2670,8 +2673,8 @@ FILE* fopen(const char *filename, const char *mode) { - } - - #ifdef HAVE_OPEN64 -- --FILE *fopen64(const char *filename, const char *mode) { -+#undef fopen64 -+FILE *fopen64(const char *__restrict filename, const char *__restrict mode) { - - debug(DEBUG_LEVEL_VERBOSE, __FILE__": fopen64(%s)\n", filename?filename:"NULL"); - --- -2.1.4 - diff --git a/package.bak/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch b/package.bak/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch deleted file mode 100644 index b2c065196b..0000000000 --- a/package.bak/pulseaudio/0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 7af6cbe74d48a9853b60b029d4ce38a963386138 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 3 Jul 2016 20:19:48 +0200 -Subject: [PATCH] webrtc: C++11 is only required for WebRTC support - -Make C++11 support optional and explicitely check for gnu++11. - -Stop the build only if no C++11 support has been found and WebRTC -support has been resquested. - -Signed-off-by: Romain Naour ---- - configure.ac | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 4edc8e0..fea93a9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -84,7 +84,7 @@ AM_PROG_CC_C_O - # Only required if you want the WebRTC canceller -- no runtime dep on - # libstdc++ otherwise - AC_PROG_CXX --AX_CXX_COMPILE_STDCXX_11 -+AX_CXX_COMPILE_STDCXX_11([ext],[optional]) - AC_PROG_GCC_TRADITIONAL - AC_USE_SYSTEM_EXTENSIONS - -@@ -1414,6 +1414,9 @@ fi - AC_ARG_ENABLE([webrtc-aec], - AS_HELP_STRING([--enable-webrtc-aec], [Enable the optional WebRTC-based echo canceller])) - -+AS_IF([test "x$enable_webrtc_aec" = "xyes" && test "$HAVE_CXX11" = "0"], -+ [AC_MSG_ERROR([*** webrtc-audio-processing needs C++11 support])]) -+ - AS_IF([test "x$enable_webrtc_aec" != "xno"], - [PKG_CHECK_MODULES(WEBRTC, [ webrtc-audio-processing >= 0.2 ], [HAVE_WEBRTC=1], [HAVE_WEBRTC=0])], - [HAVE_WEBRTC=0]) --- -2.5.5 - diff --git a/package.bak/pulseaudio/Config.in b/package.bak/pulseaudio/Config.in deleted file mode 100644 index 20aa374fce..0000000000 --- a/package.bak/pulseaudio/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_PULSEAUDIO - bool "pulseaudio" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - select BR2_PACKAGE_LIBTOOL - select BR2_PACKAGE_JSON_C - select BR2_PACKAGE_LIBSNDFILE - select BR2_PACKAGE_SPEEX - depends on BR2_USE_MMU # fork() - help - PulseAudio is a sound system for POSIX OSes, meaning that it - is a proxy for your sound applications. It allows you to do - advanced operations on your sound data as it passes between - your application and your hardware. Things like transferring - the audio to a different machine, changing the sample format - or channel count and mixing several sounds into one are - easily achieved using a sound server. - - http://pulseaudio.org - -if BR2_PACKAGE_PULSEAUDIO - -config BR2_PACKAGE_PULSEAUDIO_DAEMON - bool "start as a system daemon" - help - PulseAudio can be started as a system daemon. This is not the - recommended way of using PulseAudio unless you are building a - headless system. - -endif - -comment "pulseaudio needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/pulseaudio/S50pulseaudio b/package.bak/pulseaudio/S50pulseaudio deleted file mode 100755 index c1d88626f4..0000000000 --- a/package.bak/pulseaudio/S50pulseaudio +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/sh -# -# Starts pulseaudio. -# - - -start() { - printf "Starting pulseaudio: " - umask 077 - /usr/bin/pulseaudio --system --daemonize - echo "OK" -} -stop() { - printf "Stopping pulseaudio: " - pulseaudio --kill - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/pulseaudio/pulseaudio.hash b/package.bak/pulseaudio/pulseaudio.hash deleted file mode 100644 index 0ef825d83a..0000000000 --- a/package.bak/pulseaudio/pulseaudio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://freedesktop.org/software/pulseaudio/releases/pulseaudio-9.0.tar.xz.{md5,sha1} -md5 da7162541b3a9bc20576dbd0d7d1489a pulseaudio-9.0.tar.xz -sha1 d9a9d7cb667ed95ee1de4b6544d5c7444c5a0064 pulseaudio-9.0.tar.xz diff --git a/package.bak/pulseaudio/pulseaudio.mk b/package.bak/pulseaudio/pulseaudio.mk deleted file mode 100644 index 0ab23707c9..0000000000 --- a/package.bak/pulseaudio/pulseaudio.mk +++ /dev/null @@ -1,173 +0,0 @@ -################################################################################ -# -# pulseaudio -# -################################################################################ - -PULSEAUDIO_VERSION = 9.0 -PULSEAUDIO_SOURCE = pulseaudio-$(PULSEAUDIO_VERSION).tar.xz -PULSEAUDIO_SITE = http://freedesktop.org/software/pulseaudio/releases -PULSEAUDIO_INSTALL_STAGING = YES -PULSEAUDIO_LICENSE = LGPLv2.1+ (specific license for modules, see LICENSE file) -PULSEAUDIO_LICENSE_FILES = LICENSE GPL LGPL -PULSEAUDIO_CONF_OPTS = \ - --disable-default-build-tests \ - --disable-legacy-database-entry-format \ - --disable-manpages - -# Make sure we don't detect libatomic_ops. Indeed, since pulseaudio -# requires json-c, which needs 4 bytes __sync builtins, there should -# be no need for pulseaudio to rely on libatomic_ops. -PULSEAUDIO_CONF_ENV += \ - ac_cv_header_atomic_ops_h=no - -# 0002-webrtc-C-11-is-only-required-for-WebRTC-support.patch -PULSEAUDIO_AUTORECONF = YES - -PULSEAUDIO_DEPENDENCIES = \ - host-pkgconf libtool json-c libsndfile speex host-intltool \ - $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) \ - $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) \ - $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) \ - $(if $(BR2_PACKAGE_AVAHI_DAEMON),avahi) \ - $(if $(BR2_PACKAGE_DBUS),dbus) \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_FFTW),fftw) \ - $(if $(BR2_PACKAGE_SYSTEMD),systemd) - -ifeq ($(BR2_PACKAGE_GDBM),y) -PULSEAUDIO_CONF_OPTS += --with-database=gdbm -PULSEAUDIO_DEPENDENCIES += gdbm -else -PULSEAUDIO_CONF_OPTS += --with-database=simple -endif - -ifeq ($(BR2_PACKAGE_JACK2),y) -PULSEAUDIO_CONF_OPTS += --enable-jack -PULSEAUDIO_DEPENDENCIES += jack2 -else -PULSEAUDIO_CONF_OPTS += --disable-jack -endif - -ifeq ($(BR2_PACKAGE_ORC),y) -PULSEAUDIO_DEPENDENCIES += orc -PULSEAUDIO_CONF_ENV += ORCC=$(HOST_DIR)/usr/bin/orcc -PULSEAUDIO_CONF_OPTS += --enable-orc -else -PULSEAUDIO_CONF_OPTS += --disable-orc -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -PULSEAUDIO_DEPENDENCIES += libcap -PULSEAUDIO_CONF_OPTS += --with-caps -else -PULSEAUDIO_CONF_OPTS += --without-caps -endif - -# gtk3 support needs X11 backend -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -PULSEAUDIO_DEPENDENCIES += libgtk3 -PULSEAUDIO_CONF_OPTS += --enable-gtk3 -else -PULSEAUDIO_CONF_OPTS += --disable-gtk3 -endif - -ifeq ($(BR2_PACKAGE_LIBSOXR),y) -PULSEAUDIO_CONF_OPTS += --with-soxr -PULSEAUDIO_DEPENDENCIES += libsoxr -else -PULSEAUDIO_CONF_OPTS += --without-soxr -endif - -ifeq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_SBC),yy) -PULSEAUDIO_CONF_OPTS += --enable-bluez4 -PULSEAUDIO_DEPENDENCIES += bluez_utils sbc -else -PULSEAUDIO_CONF_OPTS += --disable-bluez4 -endif - -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS)$(BR2_PACKAGE_SBC),yy) -PULSEAUDIO_CONF_OPTS += --enable-bluez5 -PULSEAUDIO_DEPENDENCIES += bluez5_utils sbc -else -PULSEAUDIO_CONF_OPTS += --disable-bluez5 -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -PULSEAUDIO_CONF_OPTS += --enable-udev -PULSEAUDIO_DEPENDENCIES += udev -else -PULSEAUDIO_CONF_OPTS += --disable-udev -endif - -ifeq ($(BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING),y) -PULSEAUDIO_CONF_OPTS += --enable-webrtc-aec -PULSEAUDIO_DEPENDENCIES += webrtc-audio-processing -else -PULSEAUDIO_CONF_OPTS += --disable-webrtc-aec -endif - -# neon intrinsics not available with float-abi=soft -ifeq ($(BR2_ARM_SOFT_FLOAT),) -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -PULSEAUDIO_USE_NEON = y -endif -endif - -ifeq ($(PULSEAUDIO_USE_NEON),y) -PULSEAUDIO_CONF_OPTS += --enable-neon-opt=yes -else -PULSEAUDIO_CONF_OPTS += --enable-neon-opt=no -endif - -# pulseaudio alsa backend needs pcm/mixer apis -ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) -PULSEAUDIO_CONF_OPTS += --disable-alsa -endif - -ifeq ($(BR2_PACKAGE_LIBXCB)$(BR2_PACKAGE_XLIB_LIBSM)$(BR2_PACKAGE_XLIB_LIBXTST),yyy) -PULSEAUDIO_DEPENDENCIES += libxcb xlib_libSM xlib_libXtst - -# .desktop file generation needs nls support, so fake it for !locale builds -# https://bugs.freedesktop.org/show_bug.cgi?id=54658 -ifneq ($(BR2_ENABLE_LOCALE),y) -define PULSEAUDIO_FIXUP_DESKTOP_FILES - cp $(@D)/src/daemon/pulseaudio.desktop.in \ - $(@D)/src/daemon/pulseaudio.desktop - cp $(@D)/src/daemon/pulseaudio-kde.desktop.in \ - $(@D)/src/daemon/pulseaudio-kde.desktop -endef -PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FIXUP_DESKTOP_FILES -endif - -else -PULSEAUDIO_CONF_OPTS += --disable-x11 -endif - -define PULSEAUDIO_REMOVE_VALA - rm -rf $(TARGET_DIR)/usr/share/vala -endef - -PULSEAUDIO_POST_INSTALL_TARGET_HOOKS += PULSEAUDIO_REMOVE_VALA - -ifeq ($(BR2_PACKAGE_PULSEAUDIO_DAEMON),y) -define PULSEAUDIO_USERS - pulse -1 pulse -1 * /var/run/pulse - audio,pulse-access -endef - -define PULSEAUDIO_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/pulseaudio/S50pulseaudio \ - $(TARGET_DIR)/etc/init.d/S50pulseaudio -endef - -define PULSEAUDIO_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/pulseaudio/pulseaudio.service \ - $(TARGET_DIR)/usr/lib/systemd/system/pulseaudio.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/pulseaudio.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/pulseaudio.service -endef - -endif - -$(eval $(autotools-package)) diff --git a/package.bak/pulseaudio/pulseaudio.service b/package.bak/pulseaudio/pulseaudio.service deleted file mode 100644 index fc82f03392..0000000000 --- a/package.bak/pulseaudio/pulseaudio.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=PulseAudio Sound System -After=syslog.target - -[Service] -UMask=077 -ExecStart=/usr/bin/pulseaudio --system --daemonize=no -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/pulseview/0001-musl.patch b/package.bak/pulseview/0001-musl.patch deleted file mode 100644 index 1acee73719..0000000000 --- a/package.bak/pulseview/0001-musl.patch +++ /dev/null @@ -1,54 +0,0 @@ -From dcfe0a01f72021aab961245d0ebcc9f8d4504b40 Mon Sep 17 00:00:00 2001 -From: Soeren Apel -Date: Sun, 31 Jan 2016 14:12:44 +0100 -Subject: [PATCH] View: Honor ENABLE_DECODE compiler switch - -Signed-off-by: Soeren Apel -Signed-off-by: Bernd Kuhls ---- -Patch downloaded from upstream git: -http://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff;h=dcfe0a01f72021aab961245d0ebcc9f8d4504b40 -as suggested by upstream: -http://article.gmane.org/gmane.comp.debugging.sigrok.devel/1954 - - pv/view/view.cpp | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/pv/view/view.cpp b/pv/view/view.cpp -index c9b08bf..6ad7dea 100644 ---- a/pv/view/view.cpp -+++ b/pv/view/view.cpp -@@ -43,7 +43,6 @@ - #include - - #include "analogsignal.hpp" --#include "decodetrace.hpp" - #include "header.hpp" - #include "logicsignal.hpp" - #include "ruler.hpp" -@@ -59,6 +58,10 @@ - #include "pv/data/logicsegment.hpp" - #include "pv/util.hpp" - -+#ifdef ENABLE_DECODE -+#include "decodetrace.hpp" -+#endif -+ - using boost::shared_lock; - using boost::shared_mutex; - -@@ -455,9 +458,11 @@ void View::enable_coloured_bg(bool state) - if (l) - l->set_coloured_bg(state); - -+#ifdef ENABLE_DECODE - shared_ptr d = dynamic_pointer_cast(i); - if (d) - d->set_coloured_bg(state); -+#endif - } - - viewport_->update(); --- -2.6.2 - diff --git a/package.bak/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch b/package.bak/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch deleted file mode 100644 index 70549e6d72..0000000000 --- a/package.bak/pulseview/0002-cmake-add-check-for-explicit-linking-against-libatom.patch +++ /dev/null @@ -1,117 +0,0 @@ -From 71830c804be76cf6abe913ac2fe584947b7a91ea Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Tue, 24 May 2016 23:08:40 +0200 -Subject: [PATCH] cmake: add check for explicit linking against libatomic - -To use atomics functions, some toolchains requires to explicitly add --latomic to the linker flags (because they are not provided by libc, -but libatomic). - -This change adds a helper function trying to build/link a test program -using atomics, then calls it to: -* first check if atomics are directly available in the libc; -* if not and libatomic has been found, then run the same test with - "-latomic" added to the linker flags. -The pulseview link library list is updated according to the results of -these tests. - -This issue was triggered by the Buildroot farms: - http://autobuild.buildroot.org/results/1e3/1e3101261252d5f30fdf842cc99604e4f4c25eef/build-end.log - -Notes: -1- CMAKE_REQUIRED_* variables are only used in check functions. They - are not automatically forwarded to/handled by the target commands - (such as target_link_library), because the check functions are - implemented as macro in CMake code, whereas many target commands - are native. -2- Because of note #1, CMAKE_REQUIRED_LIBRARIES (or its value) must be - explicitly passed to the target_link_library command when this is - needed. -3- In this implementation, LIBATOMIC_LIBRARY is only set when it is - needed; so, unconditionally appending it to PULSEVIEW_LINK_LIBS - will produce the expected behavior. - -Signed-off-by: Samuel Martin - ---- -changes v1->v2: -- use std::atomic_fetch_add_explicit function instead of - __atomic_fetch_add_4; -- rework code using cmake_*_check_state and find_library helpers; -- quiet-ize checks and clean outputs -- extend the commit log ---- - CMakeLists.txt | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 50 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9dac69f..44f810e 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -107,6 +107,55 @@ endif() - # This will set ${CMAKE_THREAD_LIBS_INIT} to the correct, OS-specific value. - find_package(Threads REQUIRED) - -+ -+# Check for explicit link against libatomic -+# -+# Depending on the toolchain, linking a program using atomic functions may need -+# "-latomic" explicitly passed to the linker -+# -+# This check first tests if atomics are available in the C-library, if not and -+# libatomic exists, then it runs the same test with -latomic added to the -+# linker flags. -+ -+# Helper for checking for atomics -+function(check_working_cxx_atomics varname additional_lib) -+ include(CheckCXXSourceCompiles) -+ include(CMakePushCheckState) -+ cmake_push_check_state() -+ set(CMAKE_REQUIRED_FLAGS "-std=c++11") -+ set(CMAKE_REQUIRED_LIBRARIES "${additional_lib}") -+ set(CMAKE_REQUIRED_QUIET 1) -+ CHECK_CXX_SOURCE_COMPILES(" -+#include -+std::atomic x; -+int main() { -+ return std::atomic_fetch_add_explicit(&x, 1, std::memory_order_seq_cst); -+} -+" ${varname}) -+ cmake_pop_check_state() -+endfunction(check_working_cxx_atomics) -+ -+# First check if atomics work without the library. -+# If not, check if the library exists, and atomics work with it. -+check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITHOUT_LIB "") -+if(HAVE_CXX_ATOMICS_WITHOUT_LIB) -+ message(STATUS "Atomics provided by the C-library - yes") -+else() -+ message(STATUS "Atomics provided by the C-library - no") -+ find_library(LIBATOMIC_LIBRARY NAMES atomic PATH_SUFFIXES lib) -+ if(LIBATOMIC_LIBRARY) -+ check_working_cxx_atomics(HAVE_CXX_ATOMICS_WITH_LIB "${LIBATOMIC_LIBRARY}") -+ if (HAVE_CXX_ATOMICS_WITH_LIB) -+ message(STATUS "Atomics provided by libatomic - yes") -+ else() -+ message(STATUS "Atomics provided by libatomic - no") -+ message(FATAL_ERROR "Compiler must support std::atomic!") -+ endif() -+ else() -+ message(FATAL_ERROR "Compiler appears to require libatomic, but cannot find it.") -+ endif() -+endif() -+ - #=============================================================================== - #= System Introspection - #------------------------------------------------------------------------------- -@@ -387,6 +436,7 @@ set(PULSEVIEW_LINK_LIBS - ${Boost_LIBRARIES} - ${QT_LIBRARIES} - ${CMAKE_THREAD_LIBS_INIT} -+ ${LIBATOMIC_LIBRARY} - ) - - if(STATIC_PKGDEPS_LIBS) --- -2.8.3 - diff --git a/package.bak/pulseview/Config.in b/package.bak/pulseview/Config.in deleted file mode 100644 index 46abe78f76..0000000000 --- a/package.bak/pulseview/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_PULSEVIEW - bool "pulseview" - select BR2_PACKAGE_LIBSIGROK - select BR2_PACKAGE_LIBSIGROKCXX - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5BASE_PNG - select BR2_PACKAGE_QT5SVG - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_FILESYSTEM - select BR2_PACKAGE_BOOST_SYSTEM - select BR2_PACKAGE_BOOST_THREAD - # libsigrok->libglib2: - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - depends on BR2_INSTALL_LIBSTDCPP - # libsigrok - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - help - PulseView is a Qt based logic analyzer, oscilloscope - and MSO GUI for sigrok. - - http://sigrok.org/wiki/PulseView - -comment "pulseview needs a toolchain w/ wchar, threads, C++, gcc >= 4.8" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_QT5 - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/pulseview/pulseview.hash b/package.bak/pulseview/pulseview.hash deleted file mode 100644 index dc50ec6149..0000000000 --- a/package.bak/pulseview/pulseview.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 5ffe2cb7a602fcdc60933d400c77bcd66e6ce529bc4f6e97d6a5e5a86f2f530e pulseview-0.3.0.tar.gz -sha256 7de425dfe3b0f76e76e266374dca8b2951510d232380901ef2abda71c7c30bb0 dcfe0a01f72021aab961245d0ebcc9f8d4504b40.patch diff --git a/package.bak/pulseview/pulseview.mk b/package.bak/pulseview/pulseview.mk deleted file mode 100644 index cc9718712f..0000000000 --- a/package.bak/pulseview/pulseview.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# pulseview -# -################################################################################ - -# TODO Pulseview can be built and linked against Qt4 as well. - -PULSEVIEW_VERSION = 0.3.0 -PULSEVIEW_SITE = http://sigrok.org/download/source/pulseview -PULSEVIEW_LICENSE = GPLv3+ -PULSEVIEW_LICENSE_FILES = COPYING -PULSEVIEW_DEPENDENCIES = libsigrok qt5base qt5svg boost -PULSEVIEW_CONF_OPTS = -DDISABLE_WERROR=TRUE - -ifeq ($(BR2_PACKAGE_BOOST_TEST),y) -PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=TRUE -else -PULSEVIEW_CONF_OPTS += -DENABLE_TESTS=FALSE -endif - -ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y) -PULSEVIEW_CONF_OPTS += -DENABLE_DECODE=TRUE -PULSEVIEW_DEPENDENCIES += libsigrokdecode -else -PULSEVIEW_CONF_OPTS += -DENABLE_DECODE=FALSE -endif - -$(eval $(cmake-package)) diff --git a/package.bak/pure-ftpd/0001-cross.patch b/package.bak/pure-ftpd/0001-cross.patch deleted file mode 100644 index f8b1d81da8..0000000000 --- a/package.bak/pure-ftpd/0001-cross.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not include host paths when cross-compiling. - -Signed-off-by: Bernd Kuhls - -diff -uNr pure-ftpd-1.0.36.org/configure pure-ftpd-1.0.36/configure ---- pure-ftpd-1.0.36.org/configure 2012-03-16 06:29:23.000000000 +0100 -+++ pure-ftpd-1.0.36/configure 2014-09-28 19:55:56.650529713 +0200 -@@ -6319,17 +6319,6 @@ - - - --if test -d /usr/local/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/local/include" --fi -- --if test -d /usr/kerberos/include; then -- CPPFLAGS="$CPPFLAGS -I/usr/kerberos/include" --fi -- --if test -d /usr/local/lib; then -- LDFLAGS="$LDFLAGS -L/usr/local/lib" --fi - - if uname | fgrep SunOS > /dev/null 2> /dev/null ; then - CPPFLAGS="$CPPFLAGS -D_XPG4_2=1" diff --git a/package.bak/pure-ftpd/Config.in b/package.bak/pure-ftpd/Config.in deleted file mode 100644 index 57b78d1ae6..0000000000 --- a/package.bak/pure-ftpd/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_PURE_FTPD - bool "pure-ftpd" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_USE_MMU # fork() - help - Pure-FTPd is a free (BSD), secure, production-quality and standard- - conformant FTP server. It doesn't provide useless bells and whistles, - but focuses on efficiency and ease of use. It provides simple answers - to common needs, plus unique useful features for personal users as - well as hosting providers. - - http://www.pureftpd.org - -if BR2_PACKAGE_PURE_FTPD - -config BR2_PACKAGE_PURE_FTPD_FTPWHO - bool "ftpwho" - help - Enable the pure-ftpd command. Pure-ftpwho shows current Pure-ftpd - client sessions. Only the system administrator may run this. Output - can be text (default), HTML, XML data and parser-optimized. - -config BR2_PACKAGE_PURE_FTPD_QUOTAS - bool "quotas" - help - Enable virtual quotas. With virtual quotas, restrictions can - be placed on the maximum number of files a user can store in - his account. In addition, restrictions can also be placed - on the total size. - -endif diff --git a/package.bak/pure-ftpd/pure-ftpd.hash b/package.bak/pure-ftpd/pure-ftpd.hash deleted file mode 100644 index 6996290521..0000000000 --- a/package.bak/pure-ftpd/pure-ftpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 efd11295998453e31dbeef9159624beabbac2643a338134ae8c2ef529aa2ec10 pure-ftpd-1.0.42.tar.bz2 diff --git a/package.bak/pure-ftpd/pure-ftpd.mk b/package.bak/pure-ftpd/pure-ftpd.mk deleted file mode 100644 index 95e7065580..0000000000 --- a/package.bak/pure-ftpd/pure-ftpd.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# pure-ftpd -# -################################################################################ - -PURE_FTPD_VERSION = 1.0.42 -PURE_FTPD_SITE = http://download.pureftpd.org/pub/pure-ftpd/releases -PURE_FTPD_SOURCE = pure-ftpd-$(PURE_FTPD_VERSION).tar.bz2 -PURE_FTPD_LICENSE = ISC -PURE_FTPD_LICENSE_FILES = COPYING -PURE_FTPD_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -PURE_FTPD_CONF_OPTS = \ - --with-altlog \ - --with-puredb \ - --with-rfc2640 - -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -PURE_FTPD_DEPENDENCIES += elfutils -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -PURE_FTPD_CONF_OPTS += --with-capabilities -PURE_FTPD_DEPENDENCIES += libcap -else -PURE_FTPD_CONF_OPTS += --without-capabilities -endif - -ifeq ($(BR2_PACKAGE_LIBSODIUM),y) -PURE_FTPD_DEPENDENCIES += libsodium -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -PURE_FTPD_CONF_OPTS += --with-tls -PURE_FTPD_DEPENDENCIES += openssl -ifeq ($(BR2_STATIC_LIBS),y) -PURE_FTPD_CONF_ENV += LIBS='-lssl -lcrypto -lz' -endif -else -PURE_FTPD_CONF_OPTS += --without-tls -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -PURE_FTPD_CONF_ENV += ax_cv_check_cflags___fPIE=no ax_cv_check_ldflags___fPIE=no -endif - -ifeq ($(BR2_PACKAGE_PURE_FTPD_FTPWHO),y) -PURE_FTPD_CONF_OPTS += --with-ftpwho -endif - -ifeq ($(BR2_PACKAGE_PURE_FTPD_QUOTAS),y) -PURE_FTPD_CONF_OPTS += --with-quotas -endif - -$(eval $(autotools-package)) diff --git a/package.bak/putty/0001-uxcons-Fix-on-musl-libc.patch b/package.bak/putty/0001-uxcons-Fix-on-musl-libc.patch deleted file mode 100644 index 5f43af0d05..0000000000 --- a/package.bak/putty/0001-uxcons-Fix-on-musl-libc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4ae1577b432c1859704d2763f70a764dee23bd98 Mon Sep 17 00:00:00 2001 -From: Kylie McClain -Date: Thu, 28 Apr 2016 22:40:32 -0400 -Subject: [PATCH] uxcons: Fix on musl libc - -musl libc exports FD_SET and friends in sys/select.h. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 4ae1577b432c - - unix/uxcons.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/unix/uxcons.c b/unix/uxcons.c -index b9fd67fe9274..f2a25f3fed70 100644 ---- a/unix/uxcons.c -+++ b/unix/uxcons.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - - #include "putty.h" - #include "storage.h" --- -2.8.1 - diff --git a/package.bak/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch b/package.bak/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch deleted file mode 100644 index 514b6298d9..0000000000 --- a/package.bak/putty/0002-Fix-__uint128_t-compile-error-on-MinGW.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3377ea57f5d333d65d44a1130161396782389e88 Mon Sep 17 00:00:00 2001 -From: Tim Kosse -Date: Tue, 11 Aug 2015 09:43:34 +0200 -Subject: [PATCH] Fix __uint128_t compile error on MinGW. - -MinGW has __uint128_t, but not __uint64_t. - -Signed-off-by: Baruch Siach ---- -Patch status: upstream commit 3377ea57f5 - - sshbn.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sshbn.h b/sshbn.h -index a043241eea67..9366f614ae4c 100644 ---- a/sshbn.h -+++ b/sshbn.h -@@ -26,7 +26,7 @@ - * using the same 'two machine registers' kind of code generation that - * 32-bit targets use for 64-bit ints. If we have one of these, we can - * use a 64-bit BignumInt and a 128-bit BignumDblInt. */ --typedef __uint64_t BignumInt; -+typedef unsigned long long BignumInt; - typedef __uint128_t BignumDblInt; - #define BIGNUM_INT_MASK 0xFFFFFFFFFFFFFFFFULL - #define BIGNUM_TOP_BIT 0x8000000000000000ULL --- -2.8.1 - diff --git a/package.bak/putty/Config.in b/package.bak/putty/Config.in deleted file mode 100644 index fe5b9eb78e..0000000000 --- a/package.bak/putty/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PUTTY - bool "putty" - depends on BR2_USE_MMU # fork() - help - PuTTY is a free SSH and Telnet client. Without GTK2 activated, - only the commandline tools plink, pscp, psftp, and puttygen are - built; enable GTK2 for the graphical client. - - http://www.chiark.greenend.org.uk/~sgtatham/putty/ diff --git a/package.bak/putty/putty.hash b/package.bak/putty/putty.hash deleted file mode 100644 index 75990e4176..0000000000 --- a/package.bak/putty/putty.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Hashes from: http://the.earth.li/~sgtatham/putty/0.67/{sha256,sha512}sums -sha256 80192458e8a46229de512afeca5c757dd8fce09606b3c992fbaeeee29b994a47 putty-0.67.tar.gz -sha512 c2b17da46b8db3fe3837a10cb9cf5dd4b3ef6bfa15cadab83f3b87cf1479ed31fced90b774297ae53bdcbbdf230fc80d5c73d5ff3be6916fb591fd7ce3d35eca putty-0.67.tar.gz diff --git a/package.bak/putty/putty.mk b/package.bak/putty/putty.mk deleted file mode 100644 index 5155714c32..0000000000 --- a/package.bak/putty/putty.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# putty -# -################################################################################ - -PUTTY_VERSION = 0.67 -PUTTY_SITE = http://the.earth.li/~sgtatham/putty/$(PUTTY_VERSION) -PUTTY_SUBDIR = unix -PUTTY_LICENSE = MIT -PUTTY_LICENSE_FILES = LICENCE -PUTTY_CONF_OPTS = --disable-gtktest -PUTTY_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -Wno-error" - -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -PUTTY_CONF_OPTS += --with-gtk=2 -PUTTY_DEPENDENCIES += libgtk2 -else -PUTTY_CONF_OPTS += --without-gtk -endif - -$(eval $(autotools-package)) diff --git a/package.bak/pv/Config.in b/package.bak/pv/Config.in deleted file mode 100644 index d7322963c0..0000000000 --- a/package.bak/pv/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PV - bool "pv" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Pipe Viewer - is a terminal-based tool for - monitoring the progress of data through a - pipeline. - - http://www.ivarch.com/programs/pv.shtml diff --git a/package.bak/pv/pv.hash b/package.bak/pv/pv.hash deleted file mode 100644 index 291d6dd06f..0000000000 --- a/package.bak/pv/pv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0ece824e0da27b384d11d1de371f20cafac465e038041adab57fcf4b5036ef8d pv-1.6.0.tar.bz2 diff --git a/package.bak/pv/pv.mk b/package.bak/pv/pv.mk deleted file mode 100644 index 2279805a65..0000000000 --- a/package.bak/pv/pv.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# pv -# -################################################################################ - -PV_VERSION = 1.6.0 -PV_SOURCE = pv-$(PV_VERSION).tar.bz2 -PV_SITE = http://www.ivarch.com/programs/sources -PV_LICENSE = Artistic-2.0 -PV_LICENSE_FILES = doc/COPYING - -# pv configure script is somewhat stupid: if it cannot find the host -# gettext tool msgfmt, it concludes that gettext is not available, and -# provides its own minimal version. Unfortunately, this minimal -# version conflicts with the available target gettext. We fix this by -# ensuring that host-gettext is built if gettext support is enabled; -PV_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext host-gettext) - -# --relax linker option is enabled by default on sparc/sparc64 -# architectures, and it can't be used together with -r option, so -# disable it. -ifeq ($(BR2_sparc)$(BR2_sparc64),y) -PV_LDFLAGS = "-Wl,--no-relax" -endif - -# While 'pv' uses autoconf, it does not use automake for its -# makefiles. It uses $(LD) $(LDFLAGS) to achieve partial linking, but -# using 'ld' directly doesn't work well with some toolchain -# configuration, as the ld default emulation may not necessarily be -# the correct one. By passing the below values for LD and LDFLAGS, we -# ensure that 'gcc' is used to do these partial linking steps. -PV_MAKE_OPTS = \ - LD="$(TARGET_CC)" \ - LDFLAGS="-Wl,-r -nostdlib $(PV_LDFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/pwgen/Config.in b/package.bak/pwgen/Config.in deleted file mode 100644 index 7bbc1d6d55..0000000000 --- a/package.bak/pwgen/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PWGEN - bool "pwgen" - help - Pwgen is a small, GPL'ed password generator which creates passwords - which can be easily memorized by a human. - - http://sourceforge.net/projects/pwgen/ diff --git a/package.bak/pwgen/Config.in.host b/package.bak/pwgen/Config.in.host deleted file mode 100644 index 0c56851dcb..0000000000 --- a/package.bak/pwgen/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_PWGEN - bool "host pwgen" - help - Pwgen is a small, GPL'ed password generator which creates passwords - which can be easily memorized by a human. - - http://sourceforge.net/projects/pwgen/ diff --git a/package.bak/pwgen/pwgen.hash b/package.bak/pwgen/pwgen.hash deleted file mode 100644 index 2997ed3eb4..0000000000 --- a/package.bak/pwgen/pwgen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/pwgen/files/pwgen/2.07/ -md5 910b1008cdd86445e9e01305d21ee4c5 pwgen-2.07.tar.gz -sha1 51180f9cd5530d79eea18b2443780dec4ec5ea43 pwgen-2.07.tar.gz diff --git a/package.bak/pwgen/pwgen.mk b/package.bak/pwgen/pwgen.mk deleted file mode 100644 index 9810097e21..0000000000 --- a/package.bak/pwgen/pwgen.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# pwgen -# -################################################################################ - -PWGEN_VERSION = 2.07 -PWGEN_SITE = http://downloads.sourceforge.net/project/pwgen/pwgen/$(PWGEN_VERSION) -PWGEN_LICENSE = GPLv2 -PWGEN_LICENSE_FILES = debian/copyright - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/python-alsaaudio/Config.in b/package.bak/python-alsaaudio/Config.in deleted file mode 100644 index 60523bf70a..0000000000 --- a/package.bak/python-alsaaudio/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "python-alsaaudio needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_PYTHON_ALSAAUDIO - bool "python-alsaaudio" - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_PCM - select BR2_PACKAGE_ALSA_LIB_MIXER - help - The PyAlsaAudio package contains bindings for the ALSA sound - API. - - http://larsimmisch.github.io/pyalsaaudio/ diff --git a/package.bak/python-alsaaudio/python-alsaaudio.hash b/package.bak/python-alsaaudio/python-alsaaudio.hash deleted file mode 100644 index 92277ec393..0000000000 --- a/package.bak/python-alsaaudio/python-alsaaudio.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/pypi?:action=show_md5&digest=1f22415a3d8da4b303182ad81c2d062e -md5 1f22415a3d8da4b303182ad81c2d062e pyalsaaudio-0.8.2.tar.gz -# Locally calculated -sha256 b6df486f1c4035041a5f3800496b86c64e48e4a7d47f94dcbca11b0187aa3a15 pyalsaaudio-0.8.2.tar.gz diff --git a/package.bak/python-alsaaudio/python-alsaaudio.mk b/package.bak/python-alsaaudio/python-alsaaudio.mk deleted file mode 100644 index 92c354e3f8..0000000000 --- a/package.bak/python-alsaaudio/python-alsaaudio.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-alsaaudio -# -################################################################################ - -PYTHON_ALSAAUDIO_VERSION = 0.8.2 -PYTHON_ALSAAUDIO_SOURCE = pyalsaaudio-$(PYTHON_ALSAAUDIO_VERSION).tar.gz -PYTHON_ALSAAUDIO_SITE = https://pypi.python.org/packages/source/p/pyalsaaudio -PYTHON_ALSAAUDIO_SETUP_TYPE = distutils -PYTHON_ALSAAUDIO_LICENSE = Python software foundation license v2 -PYTHON_ALSAAUDIO_LICENSE_FILES = LICENSE -PYTHON_ALSAAUDIO_DEPENDENCIES = alsa-lib - -$(eval $(python-package)) diff --git a/package.bak/python-argh/Config.in b/package.bak/python-argh/Config.in deleted file mode 100644 index 5da6625ddd..0000000000 --- a/package.bak/python-argh/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_ARGH - bool "python-argh" - help - An unobtrusive argparse wrapper with natural syntax. - - http://github.com/neithere/argh/ diff --git a/package.bak/python-argh/python-argh.hash b/package.bak/python-argh/python-argh.hash deleted file mode 100644 index 6f19de10be..0000000000 --- a/package.bak/python-argh/python-argh.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/argh/json, sha256 locally computed -md5 edda25f3f0164a963dd89c0e3c619973 argh-0.26.2.tar.gz -sha256 e9535b8c84dc9571a48999094fda7f33e63c3f1b74f3e5f3ac0105a58405bb65 argh-0.26.2.tar.gz diff --git a/package.bak/python-argh/python-argh.mk b/package.bak/python-argh/python-argh.mk deleted file mode 100644 index bc5d7133a1..0000000000 --- a/package.bak/python-argh/python-argh.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-argh -# -################################################################################ - -PYTHON_ARGH_VERSION = 0.26.2 -PYTHON_ARGH_SOURCE = argh-$(PYTHON_ARGH_VERSION).tar.gz -PYTHON_ARGH_SITE = https://pypi.python.org/packages/e3/75/1183b5d1663a66aebb2c184e0398724b624cecd4f4b679cb6e25de97ed15 -PYTHON_ARGH_SETUP_TYPE = setuptools -PYTHON_ARGH_LICENSE = LGPLv3+ -PYTHON_ARGH_LICENSE_FILES = README.rst - -$(eval $(python-package)) diff --git a/package.bak/python-arrow/Config.in b/package.bak/python-arrow/Config.in deleted file mode 100644 index 244956879c..0000000000 --- a/package.bak/python-arrow/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_ARROW - bool "python-arrow" - select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - help - Better dates and times for Python. - - https://github.com/crsmithdev/arrow/ diff --git a/package.bak/python-arrow/python-arrow.hash b/package.bak/python-arrow/python-arrow.hash deleted file mode 100644 index 0b5076aa96..0000000000 --- a/package.bak/python-arrow/python-arrow.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/arrow/json, sha256 locally computed -md5 5d00592200050ad58284d45a4ee147c6 arrow-0.10.0.tar.gz -sha256 805906f09445afc1f0fc80187db8fe07670e3b25cdafa09b8d8ac264a8c0c722 arrow-0.10.0.tar.gz diff --git a/package.bak/python-arrow/python-arrow.mk b/package.bak/python-arrow/python-arrow.mk deleted file mode 100644 index 6e2e331e3c..0000000000 --- a/package.bak/python-arrow/python-arrow.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-arrow -# -################################################################################ - -PYTHON_ARROW_VERSION = 0.10.0 -PYTHON_ARROW_SOURCE = arrow-$(PYTHON_ARROW_VERSION).tar.gz -PYTHON_ARROW_SITE = https://pypi.python.org/packages/54/db/76459c4dd3561bbe682619a5c576ff30c42e37c2e01900ed30a501957150 -PYTHON_ARROW_SETUP_TYPE = setuptools -PYTHON_ARROW_LICENSE = Apache-2.0 -PYTHON_ARROW_LICENSE_FILES = LICENSE docs/_themes/COPYING.txt - -$(eval $(python-package)) diff --git a/package.bak/python-attrs/Config.in b/package.bak/python-attrs/Config.in deleted file mode 100644 index fb0ab248fa..0000000000 --- a/package.bak/python-attrs/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_ATTRS - bool "python-attrs" - help - attrs is the Python package that will bring back the joy of - writing classes by relieving you from the drudgery of - implementing object protocols (aka dunder methods). - - https://attrs.readthedocs.io/ diff --git a/package.bak/python-attrs/python-attrs.hash b/package.bak/python-attrs/python-attrs.hash deleted file mode 100644 index 33ecd2c0fe..0000000000 --- a/package.bak/python-attrs/python-attrs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/attrs/json, sha256 locally computed -md5 4ec003c49360853cf935113d1ae56151 attrs-16.3.0.tar.gz -sha256 80203177723e36f3bbe15aa8553da6e80d47bfe53647220ccaa9ad7a5e473ccc attrs-16.3.0.tar.gz diff --git a/package.bak/python-attrs/python-attrs.mk b/package.bak/python-attrs/python-attrs.mk deleted file mode 100644 index 5e7985a3f2..0000000000 --- a/package.bak/python-attrs/python-attrs.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-attrs -# -################################################################################ - -PYTHON_ATTRS_VERSION = 16.3.0 -PYTHON_ATTRS_SOURCE = attrs-$(PYTHON_ATTRS_VERSION).tar.gz -PYTHON_ATTRS_SITE = https://pypi.python.org/packages/01/b0/3ac73bf6df716a38568a16f6a9cbc46cc9e8ed6fe30c8768260030db55d4 -PYTHON_ATTRS_SETUP_TYPE = setuptools -PYTHON_ATTRS_LICENSE = MIT -PYTHON_ATTRS_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-autobahn/Config.in b/package.bak/python-autobahn/Config.in deleted file mode 100644 index 7e1429cdd7..0000000000 --- a/package.bak/python-autobahn/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_AUTOBAHN - bool "python-autobahn" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_TXAIO # runtime - help - WebSocket client Hhh server library, WAMP real-time - framework. - - https://pypi.python.org/pypi/autobahn diff --git a/package.bak/python-autobahn/python-autobahn.hash b/package.bak/python-autobahn/python-autobahn.hash deleted file mode 100644 index cae9160ef8..0000000000 --- a/package.bak/python-autobahn/python-autobahn.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/autobahn/json, sha256 locally computed -md5 9850702d0078c5a4aa17170afe2f233c autobahn-0.16.0.tar.gz -sha256 a1dcb4315a0914da56ec484659816de72dfad229be4ac19fa61bbc0111ada884 autobahn-0.16.0.tar.gz diff --git a/package.bak/python-autobahn/python-autobahn.mk b/package.bak/python-autobahn/python-autobahn.mk deleted file mode 100644 index a5e9aeea77..0000000000 --- a/package.bak/python-autobahn/python-autobahn.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-autobahn -# -################################################################################ - -PYTHON_AUTOBAHN_VERSION = 0.16.0 -PYTHON_AUTOBAHN_SOURCE = autobahn-$(PYTHON_AUTOBAHN_VERSION).tar.gz -PYTHON_AUTOBAHN_SITE = https://pypi.python.org/packages/68/37/2523309412f0fb93a7784c65e5c5639b4b5d7a84f91374ad6c3c2d5af60b -PYTHON_AUTOBAHN_LICENSE = MIT -PYTHON_AUTOBAHN_LICENSE_FILES = LICENSE -PYTHON_AUTOBAHN_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-babel/Config.in b/package.bak/python-babel/Config.in deleted file mode 100644 index 1a22b83f2c..0000000000 --- a/package.bak/python-babel/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BABEL - bool "python-babel" - select BR2_PACKAGE_PYTHON_PYTZ # runtime - help - A collection of tools for internationalizing Python - applications. - - http://babel.pocoo.org/en/latest/ diff --git a/package.bak/python-babel/python-babel.hash b/package.bak/python-babel/python-babel.hash deleted file mode 100644 index 4d7536799f..0000000000 --- a/package.bak/python-babel/python-babel.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/Babel/json, sha256 locally computed -md5 afa20bc55b0e991833030129ad498f35 Babel-2.3.4.tar.gz -sha256 c535c4403802f6eb38173cd4863e419e2274921a01a8aad8a5b497c131c62875 Babel-2.3.4.tar.gz diff --git a/package.bak/python-babel/python-babel.mk b/package.bak/python-babel/python-babel.mk deleted file mode 100644 index 3627b15f78..0000000000 --- a/package.bak/python-babel/python-babel.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-babel -# -################################################################################ - -PYTHON_BABEL_VERSION = 2.3.4 -PYTHON_BABEL_SOURCE = Babel-$(PYTHON_BABEL_VERSION).tar.gz -PYTHON_BABEL_SITE = https://pypi.python.org/packages/6e/96/ba2a2462ed25ca0e651fb7b66e7080f5315f91425a07ea5b34d7c870c114 -PYTHON_BABEL_SETUP_TYPE = setuptools -PYTHON_BABEL_LICENSE = BSD-3c -PYTHON_BABEL_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-backports-abc/Config.in b/package.bak/python-backports-abc/Config.in deleted file mode 100644 index 43566279e8..0000000000 --- a/package.bak/python-backports-abc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BACKPORTS_ABC - bool "python-backports-abc" - depends on BR2_PACKAGE_PYTHON - help - A backport of recent additions to the 'collections.abc' - module. - - https://pypi.python.org/pypi/backports_abc diff --git a/package.bak/python-backports-abc/python-backports-abc.hash b/package.bak/python-backports-abc/python-backports-abc.hash deleted file mode 100644 index 07e954e6cb..0000000000 --- a/package.bak/python-backports-abc/python-backports-abc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=0b65a216ce9dc9c1a7e20a729dd7c05b, sha256 locally computed -md5 0b65a216ce9dc9c1a7e20a729dd7c05b backports_abc-0.4.tar.gz -sha256 8b3e4092ba3d541c7a2f9b7d0d9c0275b21c6a01c53a61c731eba6686939d0a5 backports_abc-0.4.tar.gz diff --git a/package.bak/python-backports-abc/python-backports-abc.mk b/package.bak/python-backports-abc/python-backports-abc.mk deleted file mode 100644 index 1e3a9a6e9c..0000000000 --- a/package.bak/python-backports-abc/python-backports-abc.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-backports-abc -# -################################################################################ - -PYTHON_BACKPORTS_ABC_VERSION = 0.4 -PYTHON_BACKPORTS_ABC_SOURCE = backports_abc-$(PYTHON_BACKPORTS_ABC_VERSION).tar.gz -PYTHON_BACKPORTS_ABC_SITE = https://pypi.python.org/packages/source/b/backports_abc -PYTHON_BACKPORTS_ABC_LICENSE = Python Software Foundation License -PYTHON_BACKPORTS_ABC_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-beautifulsoup4/Config.in b/package.bak/python-beautifulsoup4/Config.in deleted file mode 100644 index 76f6d9471c..0000000000 --- a/package.bak/python-beautifulsoup4/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 - bool "python-beautifulsoup4" - help - Beautiful Soup is a Python library for pulling data out of - HTML and XML files. It works with your favorite parser to - provide idiomatic ways of navigating, searching, and - modifying the parse tree. It commonly saves programmers - hours or days of work. - - http://www.crummy.com/software/BeautifulSoup/bs4/ diff --git a/package.bak/python-beautifulsoup4/python-beautifulsoup4.hash b/package.bak/python-beautifulsoup4/python-beautifulsoup4.hash deleted file mode 100644 index c86879fc9d..0000000000 --- a/package.bak/python-beautifulsoup4/python-beautifulsoup4.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/beautifulsoup4/json, sha256 locally computed -md5 994abd90e691beaf7d42c00ffb2f3a67 beautifulsoup4-4.5.1.tar.gz -sha256 3c9474036afda9136aac6463def733f81017bf9ef3510d25634f335b0c87f5e1 beautifulsoup4-4.5.1.tar.gz diff --git a/package.bak/python-beautifulsoup4/python-beautifulsoup4.mk b/package.bak/python-beautifulsoup4/python-beautifulsoup4.mk deleted file mode 100644 index e2fa9b3c8f..0000000000 --- a/package.bak/python-beautifulsoup4/python-beautifulsoup4.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-beautifulsoup4 -# -################################################################################ - -PYTHON_BEAUTIFULSOUP4_VERSION = 4.5.1 -PYTHON_BEAUTIFULSOUP4_SOURCE = beautifulsoup4-$(PYTHON_BEAUTIFULSOUP4_VERSION).tar.gz -PYTHON_BEAUTIFULSOUP4_SITE = https://pypi.python.org/packages/86/ea/8e9fbce5c8405b9614f1fd304f7109d9169a3516a493ce4f7f77c39435b7 -PYTHON_BEAUTIFULSOUP4_SETUP_TYPE = setuptools -PYTHON_BEAUTIFULSOUP4_LICENSE = MIT -PYTHON_BEAUTIFULSOUP4_LICENSE_FILES = COPYING.txt - -$(eval $(python-package)) diff --git a/package.bak/python-bitstring/Config.in b/package.bak/python-bitstring/Config.in deleted file mode 100644 index 93d7682577..0000000000 --- a/package.bak/python-bitstring/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_BITSTRING - bool "python-bitstring" - help - Simple construction, analysis and modification of binary data. - - https://github.com/scott-griffiths/bitstring diff --git a/package.bak/python-bitstring/python-bitstring.hash b/package.bak/python-bitstring/python-bitstring.hash deleted file mode 100644 index 52630e0aa8..0000000000 --- a/package.bak/python-bitstring/python-bitstring.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 b769620c1b52d6c1548c6c4f055613f4eee3120ed8a5cff4ba4ffbbc8a582286 bitstring-3.1.5.tar.gz diff --git a/package.bak/python-bitstring/python-bitstring.mk b/package.bak/python-bitstring/python-bitstring.mk deleted file mode 100644 index 2c8fb9959e..0000000000 --- a/package.bak/python-bitstring/python-bitstring.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bitstring -# -################################################################################ - -PYTHON_BITSTRING_VERSION = 3.1.5 -PYTHON_BITSTRING_SOURCE = bitstring-$(PYTHON_BITSTRING_VERSION).tar.gz -PYTHON_BITSTRING_SITE = https://github.com/scott-griffiths/bitstring/archive -PYTHON_BITSTRING_SETUP_TYPE = distutils -PYTHON_BITSTRING_LICENSE = MIT -PYTHON_BITSTRING_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-bottle/Config.in b/package.bak/python-bottle/Config.in deleted file mode 100644 index f9b60ca724..0000000000 --- a/package.bak/python-bottle/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_BOTTLE - bool "python-bottle" - 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 - dependencies other than the Python Standard Library. - - http://bottlepy.org diff --git a/package.bak/python-bottle/python-bottle.hash b/package.bak/python-bottle/python-bottle.hash deleted file mode 100644 index 3006c16e9a..0000000000 --- a/package.bak/python-bottle/python-bottle.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/bottle/json, sha256 locally computed -md5 d2fe1b48c1d49217e78bf326b1cad437 bottle-0.12.13.tar.gz -sha256 39b751aee0b167be8dffb63ca81b735bbf1dd0905b3bc42761efedee8f123355 bottle-0.12.13.tar.gz diff --git a/package.bak/python-bottle/python-bottle.mk b/package.bak/python-bottle/python-bottle.mk deleted file mode 100644 index 6f071f64b5..0000000000 --- a/package.bak/python-bottle/python-bottle.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-bottle -# -################################################################################ - -PYTHON_BOTTLE_VERSION = 0.12.13 -PYTHON_BOTTLE_SOURCE = bottle-$(PYTHON_BOTTLE_VERSION).tar.gz -PYTHON_BOTTLE_SITE = https://pypi.python.org/packages/bd/99/04dc59ced52a8261ee0f965a8968717a255ea84a36013e527944dbf3468c -PYTHON_BOTTLE_LICENSE = MIT -# README.rst refers to the file "LICENSE" but it's not included -PYTHON_BOTTLE_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-can/Config.in b/package.bak/python-can/Config.in deleted file mode 100644 index 6b4e0fa76e..0000000000 --- a/package.bak/python-can/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_CAN - bool "python-can" - help - This module provides controller area network support for Python. - - https://bitbucket.org/hardbyte/python-can diff --git a/package.bak/python-can/python-can.hash b/package.bak/python-can/python-can.hash deleted file mode 100644 index a8778622bf..0000000000 --- a/package.bak/python-can/python-can.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b9b556fe6f016c0a3b27cc67790cf821, sha256 locally computed -md5 b9b556fe6f016c0a3b27cc67790cf821 python-can-1.4.3.tar.gz -sha256 2dcd32737cc39fbf39f41521146a9685f594942c99c6183bad7e3c404930198b python-can-1.4.3.tar.gz diff --git a/package.bak/python-can/python-can.mk b/package.bak/python-can/python-can.mk deleted file mode 100644 index ae9ef1a0ce..0000000000 --- a/package.bak/python-can/python-can.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-can -# -################################################################################ - -PYTHON_CAN_VERSION = 1.4.3 -PYTHON_CAN_SITE = https://pypi.python.org/packages/source/p/python-can -PYTHON_CAN_LICENSE = LGPLv3 -PYTHON_CAN_LICENSE_FILES = LICENSE.txt -PYTHON_CAN_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-cbor/Config.in b/package.bak/python-cbor/Config.in deleted file mode 100644 index 2d0962d592..0000000000 --- a/package.bak/python-cbor/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_CBOR - bool "python-cbor" - help - RFC 7049 - Concise Binary Object Representation. - - https://pypi.python.org/pypi/cbor - diff --git a/package.bak/python-cbor/python-cbor.hash b/package.bak/python-cbor/python-cbor.hash deleted file mode 100644 index a47607d9d4..0000000000 --- a/package.bak/python-cbor/python-cbor.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/cbor/json, sha256 locally computed -md5 22b03b59784fd78cb6c27aa498af0db6 cbor-1.0.0.tar.gz -sha256 13225a262ddf5615cbd9fd55a76a0d53069d18b07d2e9f19c39e6acb8609bbb6 cbor-1.0.0.tar.gz diff --git a/package.bak/python-cbor/python-cbor.mk b/package.bak/python-cbor/python-cbor.mk deleted file mode 100644 index 32ca4594d5..0000000000 --- a/package.bak/python-cbor/python-cbor.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-cbor -# -################################################################################ - -PYTHON_CBOR_VERSION = 1.0.0 -PYTHON_CBOR_SOURCE = cbor-$(PYTHON_CBOR_VERSION).tar.gz -PYTHON_CBOR_SITE = https://pypi.python.org/packages/9b/99/01c6a987c920500189eb74a291bd3a388e6c7cf85736bb6b066d9833315e -PYTHON_CBOR_LICENSE = Apache -PYTHON_CBOR_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-certifi/Config.in b/package.bak/python-certifi/Config.in deleted file mode 100644 index 9390b4f898..0000000000 --- a/package.bak/python-certifi/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -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.bak/python-certifi/python-certifi.hash b/package.bak/python-certifi/python-certifi.hash deleted file mode 100644 index 443cc6d3a2..0000000000 --- a/package.bak/python-certifi/python-certifi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/certifi/json, sha256 locally computed -md5 baa81e951a29958563689d868ef1064d certifi-2016.9.26.tar.gz -sha256 8275aef1bbeaf05c53715bfc5d8569bd1e04ca1e8e69608cc52bcaac2604eb19 certifi-2016.9.26.tar.gz diff --git a/package.bak/python-certifi/python-certifi.mk b/package.bak/python-certifi/python-certifi.mk deleted file mode 100644 index f69e7c18db..0000000000 --- a/package.bak/python-certifi/python-certifi.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-certifi -# -################################################################################ - -PYTHON_CERTIFI_VERSION = 2016.9.26 -PYTHON_CERTIFI_SOURCE = certifi-$(PYTHON_CERTIFI_VERSION).tar.gz -PYTHON_CERTIFI_SITE = https://pypi.python.org/packages/4f/75/e1bc6e363a2c76f8d7e754c27c437dbe4086414e1d6d2f6b2a3e7846f22b -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.bak/python-cffi/Config.in b/package.bak/python-cffi/Config.in deleted file mode 100644 index 3805d3d10a..0000000000 --- a/package.bak/python-cffi/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_CFFI - bool "python-cffi" - select BR2_PACKAGE_LIBFFI - help - This is the Foreign Function Interface for Python calling C - code. The aim of this project is to provide a convenient - and reliable way of calling C code from Python. - - https://pypi.python.org/pypi/cffi diff --git a/package.bak/python-cffi/python-cffi.hash b/package.bak/python-cffi/python-cffi.hash deleted file mode 100644 index 39065bcd0c..0000000000 --- a/package.bak/python-cffi/python-cffi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/cffi/json, sha256 locally computed -md5 c8e877fe0426a99d0cf5872cf2f95b27 cffi-1.8.3.tar.gz -sha256 c321bd46faa7847261b89c0469569530cad5a41976bb6dba8202c0159f476568 cffi-1.8.3.tar.gz diff --git a/package.bak/python-cffi/python-cffi.mk b/package.bak/python-cffi/python-cffi.mk deleted file mode 100644 index d34869561b..0000000000 --- a/package.bak/python-cffi/python-cffi.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# python-cffi -# -################################################################################ - -PYTHON_CFFI_VERSION = 1.8.3 -PYTHON_CFFI_SOURCE = cffi-$(PYTHON_CFFI_VERSION).tar.gz -PYTHON_CFFI_SITE = https://pypi.python.org/packages/0a/f3/686af8873b70028fccf67b15c78fd4e4667a3da995007afc71e786d61b0a -PYTHON_CFFI_SETUP_TYPE = setuptools -PYTHON_CFFI_DEPENDENCIES = host-pkgconf libffi -PYTHON_CFFI_LICENSE = MIT -PYTHON_CFFI_LICENSE_FILES = LICENSE - -# This host package uses pkg-config to find libffi, so we have to -# provide the proper hints for pkg-config to behave properly for host -# packages. -HOST_PYTHON_CFFI_ENV = \ - PKG_CONFIG_ALLOW_SYSTEM_CFLAGS=1 \ - PKG_CONFIG_ALLOW_SYSTEM_LIBS=1 \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_SYSROOT_DIR="/" \ - PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig:$(HOST_DIR)/usr/share/pkgconfig" -HOST_PYTHON_CFFI_DEPENDENCIES = host-pkgconf host-python-pycparser host-libffi - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-characteristic/Config.in b/package.bak/python-characteristic/Config.in deleted file mode 100644 index 1226fa85e2..0000000000 --- a/package.bak/python-characteristic/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_CHARACTERISTIC - bool "python-characteristic" - help - Python attributes without boilerplate. - - https://pypi.python.org/pypi/characteristic diff --git a/package.bak/python-characteristic/python-characteristic.hash b/package.bak/python-characteristic/python-characteristic.hash deleted file mode 100644 index 41dc18ccae..0000000000 --- a/package.bak/python-characteristic/python-characteristic.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b249368dd021fde1c06b4802867c0913, sha256 locally computed. -md5 b249368dd021fde1c06b4802867c0913 characteristic-14.3.0.tar.gz -sha256 ded68d4e424115ed44e5c83c2a901a0b6157a959079d7591d92106ffd3ada380 characteristic-14.3.0.tar.gz diff --git a/package.bak/python-characteristic/python-characteristic.mk b/package.bak/python-characteristic/python-characteristic.mk deleted file mode 100644 index dc3e8bb299..0000000000 --- a/package.bak/python-characteristic/python-characteristic.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-characteristic -# -################################################################################ - -PYTHON_CHARACTERISTIC_VERSION = 14.3.0 -PYTHON_CHARACTERISTIC_SOURCE = characteristic-$(PYTHON_CHARACTERISTIC_VERSION).tar.gz -PYTHON_CHARACTERISTIC_SITE = http://pypi.python.org/packages/source/c/characteristic -PYTHON_CHARACTERISTIC_LICENSE = MIT -PYTHON_CHARACTERISTIC_LICENSE_FILES = LICENSE -PYTHON_CHARACTERISTIC_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-chardet/Config.in b/package.bak/python-chardet/Config.in deleted file mode 100644 index 8f1cd602af..0000000000 --- a/package.bak/python-chardet/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_CHARDET - bool "python-chardet" - help - Universal encoding detector for Python 2 and 3. - - https://github.com/chardet/chardet diff --git a/package.bak/python-chardet/python-chardet.hash b/package.bak/python-chardet/python-chardet.hash deleted file mode 100644 index aa4efeb104..0000000000 --- a/package.bak/python-chardet/python-chardet.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/chardet/json, sha256 locally computed -md5 25274d664ccb5130adae08047416e1a8 chardet-2.3.0.tar.gz -sha256 e53e38b3a4afe6d1132de62b7400a4ac363452dc5dfcf8d88e8e0cce663c68aa chardet-2.3.0.tar.gz diff --git a/package.bak/python-chardet/python-chardet.mk b/package.bak/python-chardet/python-chardet.mk deleted file mode 100644 index 19629548d4..0000000000 --- a/package.bak/python-chardet/python-chardet.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-chardet -# -################################################################################ - -PYTHON_CHARDET_VERSION = 2.3.0 -PYTHON_CHARDET_SOURCE = chardet-$(PYTHON_CHARDET_VERSION).tar.gz -PYTHON_CHARDET_SITE = https://pypi.python.org/packages/7d/87/4e3a3f38b2f5c578ce44f8dc2aa053217de9f0b6d737739b0ddac38ed237 -PYTHON_CHARDET_SETUP_TYPE = setuptools -PYTHON_CHARDET_LICENSE = LGPLv2.1+ -PYTHON_CHARDET_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-cheetah/Config.in b/package.bak/python-cheetah/Config.in deleted file mode 100644 index e98dc39249..0000000000 --- a/package.bak/python-cheetah/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_CHEETAH - bool "python-cheetah" - depends on BR2_PACKAGE_PYTHON - help - Cheetah is an open source template engine and code generation tool. - - It can be used standalone or combined with other tools and frameworks. - Web development is its principle use, but Cheetah is very flexible - and is also being used to generate C++ game code, Java, sql, form - emails and even Python code. - - https://pypi.python.org/pypi/Cheetah/ diff --git a/package.bak/python-cheetah/python-cheetah.hash b/package.bak/python-cheetah/python-cheetah.hash deleted file mode 100644 index 477ee5483a..0000000000 --- a/package.bak/python-cheetah/python-cheetah.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/pypi/Cheetah/2.4.4 -md5 853917116e731afbc8c8a43c37e6ddba Cheetah-2.4.4.tar.gz -# Calculated based on the hash above -sha256 be308229f0c1e5e5af4f27d7ee06d90bb19e6af3059794e5fd536a6f29a9b550 Cheetah-2.4.4.tar.gz diff --git a/package.bak/python-cheetah/python-cheetah.mk b/package.bak/python-cheetah/python-cheetah.mk deleted file mode 100644 index af7d1f5494..0000000000 --- a/package.bak/python-cheetah/python-cheetah.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# python-cheetah -# -################################################################################ - -PYTHON_CHEETAH_VERSION = 2.4.4 -PYTHON_CHEETAH_SOURCE = Cheetah-$(PYTHON_CHEETAH_VERSION).tar.gz -PYTHON_CHEETAH_SITE = http://pypi.python.org/packages/source/C/Cheetah -PYTHON_CHEETAH_LICENSE = MIT -PYTHON_CHEETAH_SETUP_TYPE = setuptools - -HOST_PYTHON_CHEETAH_NEEDS_HOST_PYTHON = python2 - -# The dependency on host-python-markdown is needed to prevent -# setuptools from downloading markdown if it is not installed yet. -HOST_PYTHON_CHEETAH_DEPENDENCIES = host-python-markdown - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-cherrypy/Config.in b/package.bak/python-cherrypy/Config.in deleted file mode 100644 index 6e32ec2a1a..0000000000 --- a/package.bak/python-cherrypy/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CHERRYPY - bool "python-cherrypy" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - help - A minimalist web framework - - http://www.cherrypy.org diff --git a/package.bak/python-cherrypy/python-cherrypy.hash b/package.bak/python-cherrypy/python-cherrypy.hash deleted file mode 100644 index 6befa457d8..0000000000 --- a/package.bak/python-cherrypy/python-cherrypy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=4b765329b0b4b65ec25811e3febb6c93, sha256 locally computed -md5 4b765329b0b4b65ec25811e3febb6c93 CherryPy-4.0.0.tar.gz -sha256 73ad4f8870b5a3e9988a7778b5d3003a390d440527ec3458a0c7e58865d2611a CherryPy-4.0.0.tar.gz diff --git a/package.bak/python-cherrypy/python-cherrypy.mk b/package.bak/python-cherrypy/python-cherrypy.mk deleted file mode 100644 index 754e0a2bec..0000000000 --- a/package.bak/python-cherrypy/python-cherrypy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-cherrypy -# -################################################################################ - -PYTHON_CHERRYPY_VERSION = 4.0.0 -PYTHON_CHERRYPY_SOURCE = CherryPy-$(PYTHON_CHERRYPY_VERSION).tar.gz -PYTHON_CHERRYPY_SITE = http://pypi.python.org/packages/source/C/CherryPy -PYTHON_CHERRYPY_LICENSE = BSD-3c -PYTHON_CHERRYPY_LICENSE_FILES = cherrypy/LICENSE.txt -PYTHON_CHERRYPY_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-click/Config.in b/package.bak/python-click/Config.in deleted file mode 100644 index c026998677..0000000000 --- a/package.bak/python-click/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_CLICK - bool "python-click" - help - A simple wrapper around optparse for powerful command line - utilities. - - https://pypi.python.org/pypi/click diff --git a/package.bak/python-click/python-click.hash b/package.bak/python-click/python-click.hash deleted file mode 100644 index c0d0568288..0000000000 --- a/package.bak/python-click/python-click.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=d0b09582123605220ad6977175f3e51d, sha256 locally computed. -md5 d0b09582123605220ad6977175f3e51d click-6.6.tar.gz -sha256 cc6a19da8ebff6e7074f731447ef7e112bd23adf3de5c597cf9989f2fd8defe9 click-6.6.tar.gz diff --git a/package.bak/python-click/python-click.mk b/package.bak/python-click/python-click.mk deleted file mode 100644 index 839a4673f4..0000000000 --- a/package.bak/python-click/python-click.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-click -# -################################################################################ - -PYTHON_CLICK_VERSION = 6.6 -PYTHON_CLICK_SOURCE = click-$(PYTHON_CLICK_VERSION).tar.gz -PYTHON_CLICK_SITE = http://pypi.python.org/packages/source/c/click -PYTHON_CLICK_LICENSE = BSD-3c -PYTHON_CLICK_LICENSE_FILES = LICENSE -PYTHON_CLICK_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-coherence/0001-Fix-twisted-detection.patch b/package.bak/python-coherence/0001-Fix-twisted-detection.patch deleted file mode 100644 index c0e51b9e31..0000000000 --- a/package.bak/python-coherence/0001-Fix-twisted-detection.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 3cf8d89cbb44b5c7a0693d0b5d665e68acc3927c Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Tue, 10 May 2016 00:14:33 +0200 -Subject: [PATCH] Fix twisted detection. - -Addresses https://github.com/coherence-project/Coherence/issues/25 - -Signed-off-by: Thomas Klausner -Signed-off-by: Yegor Yefremov ---- - coherence/__init__.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/coherence/__init__.py b/coherence/__init__.py -index 2e4e8f1..4c4d73d 100644 ---- a/coherence/__init__.py -+++ b/coherence/__init__.py -@@ -24,8 +24,6 @@ try: - if twisted_version < Version("twisted", 2, 5, 0): - raise ImportError("Twisted >= 2.5 is required. Please install it.") - -- if twisted_web_version < Version("twisted.web", 2, 5, 0): -- raise ImportError("Twisted.Web >= 2.5 is required. Please install it") - except ImportError, exc: - # log error to stderr, might be useful for debugging purpose - for arg in exc.args: --- -2.8.1 - diff --git a/package.bak/python-coherence/Config.in b/package.bak/python-coherence/Config.in deleted file mode 100644 index 71f79f42ee..0000000000 --- a/package.bak/python-coherence/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PYTHON_COHERENCE - bool "python-coherence" - depends on BR2_PACKAGE_PYTHON - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - select BR2_PACKAGE_PYTHON_PYASN - help - A DLNA/UPnP Media Server and Framework for the Digital Living. - - http://coherence-project.org/ - -comment "python-coherence needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-coherence/python-coherence.hash b/package.bak/python-coherence/python-coherence.hash deleted file mode 100644 index f788ca3750..0000000000 --- a/package.bak/python-coherence/python-coherence.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 fd5a2db9661994a57232ace4a90d259b6554c43b8bf5bfbf8ec2518c03627922 python-coherence-0.6.6.2.tar.gz diff --git a/package.bak/python-coherence/python-coherence.mk b/package.bak/python-coherence/python-coherence.mk deleted file mode 100644 index f9df37c322..0000000000 --- a/package.bak/python-coherence/python-coherence.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-coherence -# -################################################################################ - -PYTHON_COHERENCE_VERSION = 0.6.6.2 -PYTHON_COHERENCE_SITE = $(call github,coherence-project,Coherence,Coherence-$(PYTHON_COHERENCE_VERSION)) -PYTHON_COHERENCE_SETUP_TYPE = setuptools -PYTHON_COHERENCE_LICENSE = MIT -PYTHON_COHERENCE_LICENSE_FILES = LICENCE -PYTHON_COHERENCE_DEPENDENCIES = python-twisted python-zope-interface python-pyasn - -$(eval $(python-package)) diff --git a/package.bak/python-configobj/Config.in b/package.bak/python-configobj/Config.in deleted file mode 100644 index fc57e26f1c..0000000000 --- a/package.bak/python-configobj/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGOBJ - bool "python-configobj" - depends on BR2_PACKAGE_PYTHON - help - ConfigObj is a simple but powerful config file reader and - writer: an ini file round tripper. Its main feature is that - it is very easy to use, with a straightforward programmer's - interface and a simple syntax for config files. - - http://www.voidspace.org.uk/python/configobj.html diff --git a/package.bak/python-configobj/python-configobj.hash b/package.bak/python-configobj/python-configobj.hash deleted file mode 100644 index d43c453796..0000000000 --- a/package.bak/python-configobj/python-configobj.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/configobj/json, sha256 locally computed -md5 e472a3a1c2a67bb0ec9b5d54c13a47d6 configobj-5.0.6.tar.gz -sha256 a2f5650770e1c87fb335af19a9b7eb73fc05ccf22144eb68db7d00cd2bcb0902 configobj-5.0.6.tar.gz diff --git a/package.bak/python-configobj/python-configobj.mk b/package.bak/python-configobj/python-configobj.mk deleted file mode 100644 index d9591d5be3..0000000000 --- a/package.bak/python-configobj/python-configobj.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-configobj -# -################################################################################ - -PYTHON_CONFIGOBJ_VERSION = 5.0.6 -PYTHON_CONFIGOBJ_SOURCE = configobj-$(PYTHON_CONFIGOBJ_VERSION).tar.gz -PYTHON_CONFIGOBJ_SITE = https://pypi.python.org/packages/64/61/079eb60459c44929e684fa7d9e2fdca403f67d64dd9dbac27296be2e0fab -PYTHON_CONFIGOBJ_LICENSE = BSD-3c -# License only mentioned in the source -PYTHON_CONFIGOBJ_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-configshell-fb/Config.in b/package.bak/python-configshell-fb/Config.in deleted file mode 100644 index 90a295fc8d..0000000000 --- a/package.bak/python-configshell-fb/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONFIGSHELL_FB - bool "python-configshell-fb" - select BR2_PACKAGE_PYTHON_PYPARSING - select BR2_PACKAGE_PYTHON3_READLINE if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_READLINE if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX - select BR2_PACKAGE_PYTHON_URWID - help - configshell-fb is a Python library that provides a framework - for building simple but nice CLI-based applications. - - https://github.com/open-iscsi/configshell-fb diff --git a/package.bak/python-configshell-fb/python-configshell-fb.hash b/package.bak/python-configshell-fb/python-configshell-fb.hash deleted file mode 100644 index 7bf4d347ca..0000000000 --- a/package.bak/python-configshell-fb/python-configshell-fb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 3685446d6ee02881930bb2fdc5fdd254938da66ce9843a5b3676c4246b058e4b python-configshell-fb-v1.1.fb18.tar.gz diff --git a/package.bak/python-configshell-fb/python-configshell-fb.mk b/package.bak/python-configshell-fb/python-configshell-fb.mk deleted file mode 100644 index a2e9cae157..0000000000 --- a/package.bak/python-configshell-fb/python-configshell-fb.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-configshell-fb -# -################################################################################ - -# When upgrading the version, be sure to also upgrade python-rtslib-fb -# and targetcli-fb at the same time. -PYTHON_CONFIGSHELL_FB_VERSION = v1.1.fb18 -PYTHON_CONFIGSHELL_FB_SITE = $(call github,open-iscsi,configshell-fb,$(PYTHON_CONFIGSHELL_FB_VERSION)) -PYTHON_CONFIGSHELL_FB_LICENSE = Apache-2.0 -PYTHON_CONFIGSHELL_FB_LICENSE_FILES = COPYING -PYTHON_CONFIGSHELL_FB_SETUP_TYPE = setuptools -PYTHON_CONFIGSHELL_FB_DEPENDENCIES = python-pyparsing python-six python-urwid - -$(eval $(python-package)) diff --git a/package.bak/python-constantly/Config.in b/package.bak/python-constantly/Config.in deleted file mode 100644 index 13bb2e86d0..0000000000 --- a/package.bak/python-constantly/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_CONSTANTLY - bool "python-constantly" - help - A library that provides symbolic constant support. It - includes collections and constants with text, numeric, - and bit flag values. - - https://github.com/twisted/constantly diff --git a/package.bak/python-constantly/python-constantly.hash b/package.bak/python-constantly/python-constantly.hash deleted file mode 100644 index fb7787709c..0000000000 --- a/package.bak/python-constantly/python-constantly.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/constantly/json, sha256 locally computed -md5 f0762f083d83039758e53f8cf0086eef constantly-15.1.0.tar.gz -sha256 586372eb92059873e29eba4f9dec8381541b4d3834660707faf8ba59146dfc35 constantly-15.1.0.tar.gz diff --git a/package.bak/python-constantly/python-constantly.mk b/package.bak/python-constantly/python-constantly.mk deleted file mode 100644 index 783d198d06..0000000000 --- a/package.bak/python-constantly/python-constantly.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-constantly -# -################################################################################ - -PYTHON_CONSTANTLY_VERSION = 15.1.0 -PYTHON_CONSTANTLY_SOURCE = constantly-$(PYTHON_CONSTANTLY_VERSION).tar.gz -PYTHON_CONSTANTLY_SITE = https://pypi.python.org/packages/95/f1/207a0a478c4bb34b1b49d5915e2db574cadc415c9ac3a7ef17e29b2e8951 -PYTHON_CONSTANTLY_SETUP_TYPE = setuptools -PYTHON_CONSTANTLY_LICENSE = MIT -PYTHON_CONSTANTLY_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-couchdb/Config.in b/package.bak/python-couchdb/Config.in deleted file mode 100644 index 9156883b38..0000000000 --- a/package.bak/python-couchdb/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_COUCHDB - bool "python-couchdb" - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - help - Python client library for working with CouchDB. - - https://github.com/djc/couchdb-python/ diff --git a/package.bak/python-couchdb/python-couchdb.hash b/package.bak/python-couchdb/python-couchdb.hash deleted file mode 100644 index f9422a8ce7..0000000000 --- a/package.bak/python-couchdb/python-couchdb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/couchdb/json, sha256 locally computed -md5 2ed5ad2a477fd3cb472ed6dc5a381ff3 CouchDB-1.1.tar.gz -sha256 9503ea413956c33b5e2af248235afb5e0f011f33f816a32e872f8ff9b0a0e710 CouchDB-1.1.tar.gz diff --git a/package.bak/python-couchdb/python-couchdb.mk b/package.bak/python-couchdb/python-couchdb.mk deleted file mode 100644 index c88787c1db..0000000000 --- a/package.bak/python-couchdb/python-couchdb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-couchdb -# -################################################################################ - -PYTHON_COUCHDB_VERSION = 1.1 -PYTHON_COUCHDB_SOURCE = CouchDB-$(PYTHON_COUCHDB_VERSION).tar.gz -PYTHON_COUCHDB_SITE = https://pypi.python.org/packages/9a/e8/c3c8da6d00145aaca07f2b784794917613dad26532068da4e8392dc48d7f -PYTHON_COUCHDB_SETUP_TYPE = setuptools -PYTHON_COUCHDB_LICENSE = BSD-3c -PYTHON_COUCHDB_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/package.bak/python-crc16/Config.in b/package.bak/python-crc16/Config.in deleted file mode 100644 index 3fd8da7a85..0000000000 --- a/package.bak/python-crc16/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_CRC16 - bool "python-crc16" - depends on BR2_PACKAGE_PYTHON - help - This library calculates only CRC16 (16-bit codes) and the - only supported variant at the moment is CRC-CCITT (XModem). - CRC is a way of detecting accidental changes in data storage - or transmission. There are many variants of CRC and CRC16, - in particular. - - http://pycrc16.googlecode.com/ diff --git a/package.bak/python-crc16/python-crc16.hash b/package.bak/python-crc16/python-crc16.hash deleted file mode 100644 index 81b39a0376..0000000000 --- a/package.bak/python-crc16/python-crc16.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 10aeda70fbe8b284874b3b1b8f74b9c1f6d5e8dee20ac8f9d5bc49f45f12a42a python-crc16-0.1.1.tar.gz diff --git a/package.bak/python-crc16/python-crc16.mk b/package.bak/python-crc16/python-crc16.mk deleted file mode 100644 index 3a292a0ebe..0000000000 --- a/package.bak/python-crc16/python-crc16.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-crc16 -# -################################################################################ - -PYTHON_CRC16_VERSION = 0.1.1 -PYTHON_CRC16_SITE = $(call github,gennady,pycrc16,v$(PYTHON_CRC16_VERSION)) -PYTHON_CRC16_LICENSE = LGPLv3+ -PYTHON_CRC16_LICENSE_FILES = COPYING.txt -PYTHON_CRC16_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-crcmod/Config.in b/package.bak/python-crcmod/Config.in deleted file mode 100644 index 289a3aee8b..0000000000 --- a/package.bak/python-crcmod/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_CRCMOD - bool "python-crcmod" - help - The software in this package is a Python module for - generating objects that compute the Cyclic Redundancy - Check (CRC). - - http://crcmod.sourceforge.net/ diff --git a/package.bak/python-crcmod/python-crcmod.hash b/package.bak/python-crcmod/python-crcmod.hash deleted file mode 100644 index 7ce549c302..0000000000 --- a/package.bak/python-crcmod/python-crcmod.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/crcmod/json, sha256 locally computed -md5 2d5b92117d958dcead94f9e17f54cd32 crcmod-1.7.tar.gz -sha256 dc7051a0db5f2bd48665a990d3ec1cc305a466a77358ca4492826f41f283601e crcmod-1.7.tar.gz diff --git a/package.bak/python-crcmod/python-crcmod.mk b/package.bak/python-crcmod/python-crcmod.mk deleted file mode 100644 index 1aab7f5084..0000000000 --- a/package.bak/python-crcmod/python-crcmod.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-crcmod -# -################################################################################ - -PYTHON_CRCMOD_VERSION = 1.7 -PYTHON_CRCMOD_SOURCE = crcmod-$(PYTHON_CRCMOD_VERSION).tar.gz -PYTHON_CRCMOD_SITE = https://pypi.python.org/packages/6b/b0/e595ce2a2527e169c3bcd6c33d2473c1918e0b7f6826a043ca1245dd4e5b -PYTHON_CRCMOD_SETUP_TYPE = distutils -PYTHON_CRCMOD_LICENSE = MIT -PYTHON_CRCMOD_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-crossbar/0001-Avoid-intentional-syntax-error.patch b/package.bak/python-crossbar/0001-Avoid-intentional-syntax-error.patch deleted file mode 100644 index fb8e4a2763..0000000000 --- a/package.bak/python-crossbar/0001-Avoid-intentional-syntax-error.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9ab2b96c2ee679c6dcb387174be211db5d70fa97 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 1 May 2016 15:35:32 +0200 -Subject: [PATCH] Avoid intentional syntax error - -This file has an intentional syntax error, meant to validate QA, but -it breaks byte compilation of this package. - -Issue reported upstream: -https://github.com/crossbario/crossbar/issues/750. - -Signed-off-by: Thomas Petazzoni ---- - crossbar/worker/test/examples/syntaxerror.py | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/crossbar/worker/test/examples/syntaxerror.py b/crossbar/worker/test/examples/syntaxerror.py -index a5947cc..585c995 100644 ---- a/crossbar/worker/test/examples/syntaxerror.py -+++ b/crossbar/worker/test/examples/syntaxerror.py -@@ -29,5 +29,3 @@ - ##################################################################################### - - from __future__ import absolute_import, division -- --class # noqa --- -2.7.4 - diff --git a/package.bak/python-crossbar/Config.in b/package.bak/python-crossbar/Config.in deleted file mode 100644 index 7ef1aadbc9..0000000000 --- a/package.bak/python-crossbar/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config BR2_PACKAGE_PYTHON_CROSSBAR - bool "python-crossbar" - depends on !BR2_TOOLCHAIN_USES_MUSL # python-psutil - # All the following dependencies are runtime dependencies - select BR2_PACKAGE_PYTHON_AUTOBAHN - select BR2_PACKAGE_PYTHON_CBOR - select BR2_PACKAGE_PYTHON_CLICK - select BR2_PACKAGE_PYTHON_PYCPARSER - select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY - select BR2_PACKAGE_PYTHON_JINJA2 - select BR2_PACKAGE_PYTHON_LMDB - select BR2_PACKAGE_PYTHON_MISTUNE - select BR2_PACKAGE_PYTHON_NETADDR - select BR2_PACKAGE_PYTHON_PSUTIL - select BR2_PACKAGE_PYTHON_PYASN - select BR2_PACKAGE_PYTHON_PYASN_MODULES - select BR2_PACKAGE_PYTHON_PYGMENTS - select BR2_PACKAGE_PYTHON_PYINOTIFY - select BR2_PACKAGE_PYTHON_PYNACL - select BR2_PACKAGE_PYTHON_PYOPENSSL - select BR2_PACKAGE_PYTHON_PYTRIE - select BR2_PACKAGE_PYTHON_PYYAML - select BR2_PACKAGE_PYTHON_SDNOTIFY - select BR2_PACKAGE_PYTHON_SETUPTOOLS - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY - select BR2_PACKAGE_PYTHON_SETPROCTITLE - select BR2_PACKAGE_PYTHON_SETUPTOOLS - select BR2_PACKAGE_PYTHON_SHUTILWHICH if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_TREQ - select BR2_PACKAGE_PYTHON_TWISTED - select BR2_PACKAGE_PYTHON_U_MSGPACK - select BR2_PACKAGE_PYTHON_UBJSON - select BR2_PACKAGE_PYTHON_WATCHDOG - select BR2_PACKAGE_PYTHON_WSACCEL - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn - help - Crossbar.io is an open-source WAMP application router that - allows to build advanced applications from loosely-coupled - components that can talk in real-time with each other. - - https://pypi.python.org/pypi/crossbar - -comment "python-crossbar needs a uClibc or glibc toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/python-crossbar/python-crossbar.hash b/package.bak/python-crossbar/python-crossbar.hash deleted file mode 100644 index a500bcf69f..0000000000 --- a/package.bak/python-crossbar/python-crossbar.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/crossbar/json, sha256 locally computed. -md5 516478cc368503a0a0babc1dc28c5085 crossbar-0.14.0.tar.gz -sha256 6242ef34c56061850743d750d042993590ca7ec8ebe7b28c21ed05bb0904d71b crossbar-0.14.0.tar.gz diff --git a/package.bak/python-crossbar/python-crossbar.mk b/package.bak/python-crossbar/python-crossbar.mk deleted file mode 100644 index 3d82d77043..0000000000 --- a/package.bak/python-crossbar/python-crossbar.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-crossbar -# -################################################################################ - -PYTHON_CROSSBAR_VERSION = 0.14.0 -PYTHON_CROSSBAR_SOURCE = crossbar-$(PYTHON_CROSSBAR_VERSION).tar.gz -PYTHON_CROSSBAR_SITE = https://pypi.python.org/packages/f0/9a/e0b77e15698c47b6293655bc0e1996dd8e87bd8af7bc7434a5c8281a024e -PYTHON_CROSSBAR_LICENSE = AGPLv3 -PYTHON_CROSSBAR_LICENSE_FILES = LICENSE -PYTHON_CROSSBAR_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-cryptography/Config.in b/package.bak/python-cryptography/Config.in deleted file mode 100644 index 9827cf82b6..0000000000 --- a/package.bak/python-cryptography/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_PYTHON_CRYPTOGRAPHY - bool "python-cryptography" - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PYTHON_IDNA # runtime - select BR2_PACKAGE_PYTHON_PYASN # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_ENUM34 if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_IPADDRESS if BR2_PACKAGE_PYTHON # runtime - help - cryptography is a package designed to expose cryptographic - primitives and recipes to Python developers. - - https://cryptography.io - -comment "python-cryptography needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-cryptography/python-cryptography.hash b/package.bak/python-cryptography/python-cryptography.hash deleted file mode 100644 index 7738d23490..0000000000 --- a/package.bak/python-cryptography/python-cryptography.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/cryptography/json, sha256 locally computed -md5 2f63dee6ace602d1d20d1995f8538015 cryptography-1.7.1.tar.gz -sha256 953fef7d40a49a795f4d955c5ce4338abcec5dea822ed0414ed30348303fdb4c cryptography-1.7.1.tar.gz diff --git a/package.bak/python-cryptography/python-cryptography.mk b/package.bak/python-cryptography/python-cryptography.mk deleted file mode 100644 index d4e18ec152..0000000000 --- a/package.bak/python-cryptography/python-cryptography.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-cryptography -# -################################################################################ - -PYTHON_CRYPTOGRAPHY_VERSION = 1.7.1 -PYTHON_CRYPTOGRAPHY_SOURCE = cryptography-$(PYTHON_CRYPTOGRAPHY_VERSION).tar.gz -PYTHON_CRYPTOGRAPHY_SITE = https://pypi.python.org/packages/82/f7/d6dfd7595910a20a563a83a762bf79a253c4df71759c3b228accb3d7e5e4 -PYTHON_CRYPTOGRAPHY_SETUP_TYPE = setuptools -PYTHON_CRYPTOGRAPHY_LICENSE = Apache-2.0 or BSD-3c -PYTHON_CRYPTOGRAPHY_LICENSE_FILES = LICENSE LICENSE.APACHE LICENSE.BSD -PYTHON_CRYPTOGRAPHY_DEPENDENCIES = host-python-cffi openssl - -$(eval $(python-package)) diff --git a/package.bak/python-cssselect/Config.in b/package.bak/python-cssselect/Config.in deleted file mode 100644 index 9c1ffe4610..0000000000 --- a/package.bak/python-cssselect/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_CSSSELECT - bool "python-cssselect" - help - cssselect parses CSS3 Selectors and translates them to XPath 1.0 - - http://packages.python.org/cssselect/ diff --git a/package.bak/python-cssselect/python-cssselect.hash b/package.bak/python-cssselect/python-cssselect.hash deleted file mode 100644 index d3ee055a7e..0000000000 --- a/package.bak/python-cssselect/python-cssselect.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/cssselect/json -md5 4c5931d8456dfe72fa4662f9c0509bfa cssselect-0.9.2.tar.gz -# sha256 locally computed -sha256 713b5b99ef08022257b3409c7ae1b18b2c6536b3f155e6237c5cfba0f67ae6f5 cssselect-0.9.2.tar.gz diff --git a/package.bak/python-cssselect/python-cssselect.mk b/package.bak/python-cssselect/python-cssselect.mk deleted file mode 100644 index 0db69b967d..0000000000 --- a/package.bak/python-cssselect/python-cssselect.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-cssselect -# -################################################################################ - -PYTHON_CSSSELECT_VERSION = 0.9.2 -PYTHON_CSSSELECT_SOURCE = cssselect-$(PYTHON_CSSSELECT_VERSION).tar.gz -PYTHON_CSSSELECT_SITE = https://pypi.python.org/packages/11/21/47b5d2696a945da177d2344b6e330b7b0d1c52404063cb387d2261517ccb -PYTHON_CSSSELECT_SETUP_TYPE = setuptools -PYTHON_CSSSELECT_LICENSE = BSD-3c -PYTHON_CSSSELECT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-cssutils/Config.in b/package.bak/python-cssutils/Config.in deleted file mode 100644 index 74de742c31..0000000000 --- a/package.bak/python-cssutils/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_CSSUTILS - bool "python-cssutils" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - help - A CSS Cascading Style Sheets library for Python. - - http://cthedot.de/cssutils/ diff --git a/package.bak/python-cssutils/python-cssutils.hash b/package.bak/python-cssutils/python-cssutils.hash deleted file mode 100644 index 7b188bcd43..0000000000 --- a/package.bak/python-cssutils/python-cssutils.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/cssutils/json, sha256 locally computed -md5 7fcdf2c3e9f053136af1990146eb361d cssutils-1.0.1.tar.gz -sha256 d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063 cssutils-1.0.1.tar.gz diff --git a/package.bak/python-cssutils/python-cssutils.mk b/package.bak/python-cssutils/python-cssutils.mk deleted file mode 100644 index 3dd501aa04..0000000000 --- a/package.bak/python-cssutils/python-cssutils.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-cssutils -# -################################################################################ - -PYTHON_CSSUTILS_VERSION = 1.0.1 -PYTHON_CSSUTILS_SOURCE = cssutils-$(PYTHON_CSSUTILS_VERSION).tar.gz -PYTHON_CSSUTILS_SITE = https://pypi.python.org/packages/22/de/6b03e0088baf0299ab7d2e95a9e26c2092e9cb3855876b958b6a62175ca2 -PYTHON_CSSUTILS_LICENSE = LGPLv3+ -PYTHON_CSSUTILS_LICENSE_FILES = COPYING.LESSER -PYTHON_CSSUTILS_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-daemon/Config.in b/package.bak/python-daemon/Config.in deleted file mode 100644 index 21f4407452..0000000000 --- a/package.bak/python-daemon/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_DAEMON - bool "python-daemon" - select BR2_PACKAGE_PYTHON_DOCUTILS # runtime - help - Library to implement a well-behaved Unix daemon process. - - https://pypi.python.org/pypi/python-daemon/ diff --git a/package.bak/python-daemon/python-daemon.hash b/package.bak/python-daemon/python-daemon.hash deleted file mode 100644 index 12977b5795..0000000000 --- a/package.bak/python-daemon/python-daemon.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=72e2acf2c3d69c7fa75a6625d06adfd0, sha256 locally computed -md5 72e2acf2c3d69c7fa75a6625d06adfd0 python-daemon-2.1.1.tar.gz -sha256 58a8c187ee37c3a28913bef00f83240c9ecd4a59dce09a24d92f5c941606689f python-daemon-2.1.1.tar.gz diff --git a/package.bak/python-daemon/python-daemon.mk b/package.bak/python-daemon/python-daemon.mk deleted file mode 100644 index 648d549ca8..0000000000 --- a/package.bak/python-daemon/python-daemon.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-daemon -# -################################################################################ - -PYTHON_DAEMON_VERSION = 2.1.1 -PYTHON_DAEMON_SITE = https://pypi.python.org/packages/source/p/python-daemon -PYTHON_DAEMON_LICENSE = Apache-2.0 (library), GPLv3+ (test, build) -PYTHON_DAEMON_LICENSE_FILES = LICENSE.ASF-2 LICENSE.GPL-3 -PYTHON_DAEMON_SETUP_TYPE = setuptools -PYTHON_DAEMON_DEPENDENCIES = host-python-docutils - -$(eval $(python-package)) diff --git a/package.bak/python-dataproperty/Config.in b/package.bak/python-dataproperty/Config.in deleted file mode 100644 index 7ef7f085be..0000000000 --- a/package.bak/python-dataproperty/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DATAPROPERTY - bool "python-dataproperty" - select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_DATEUTIL # runtime - select BR2_PACKAGE_PYTHON_PYTZ # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Python library for extract property from data. - - https://github.com/thombashi/DataProperty diff --git a/package.bak/python-dataproperty/python-dataproperty.hash b/package.bak/python-dataproperty/python-dataproperty.hash deleted file mode 100644 index d84b21458a..0000000000 --- a/package.bak/python-dataproperty/python-dataproperty.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/dataproperty/json, sha256 locally computed -md5 a05cb97210d41677bde224b53562add4 DataProperty-0.16.2.tar.gz -sha256 c2c6e1f2558bf03b0f8f2dc53a5eb00d9540babd3d69d299be878f2e32937e53 DataProperty-0.16.2.tar.gz diff --git a/package.bak/python-dataproperty/python-dataproperty.mk b/package.bak/python-dataproperty/python-dataproperty.mk deleted file mode 100644 index 997019c72d..0000000000 --- a/package.bak/python-dataproperty/python-dataproperty.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-dataproperty -# -################################################################################ - -PYTHON_DATAPROPERTY_VERSION = 0.16.2 -PYTHON_DATAPROPERTY_SOURCE = DataProperty-$(PYTHON_DATAPROPERTY_VERSION).tar.gz -PYTHON_DATAPROPERTY_SITE = https://pypi.python.org/packages/c8/95/4803e558a7e29ccf3adbf8f993ec53fe28c46df450892c4cc35c2f0ccedc -PYTHON_DATAPROPERTY_SETUP_TYPE = setuptools -PYTHON_DATAPROPERTY_LICENSE = MIT -PYTHON_DATAPROPERTY_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-dateutil/Config.in b/package.bak/python-dateutil/Config.in deleted file mode 100644 index 56a1d838f7..0000000000 --- a/package.bak/python-dateutil/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_DATEUTIL - bool "python-dateutil" - select BR2_PACKAGE_PYTHON_SIX - help - Extensions to the standard Python datetime module. - - https://dateutil.readthedocs.org diff --git a/package.bak/python-dateutil/python-dateutil.hash b/package.bak/python-dateutil/python-dateutil.hash deleted file mode 100644 index adc24bdd16..0000000000 --- a/package.bak/python-dateutil/python-dateutil.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/python-dateutil/json, sha256 locally computed -md5 6e38f91e8c94c15a79ce22768dfeca87 python-dateutil-2.6.0.tar.gz -sha256 62a2f8df3d66f878373fd0072eacf4ee52194ba302e00082828e0d263b0418d2 python-dateutil-2.6.0.tar.gz diff --git a/package.bak/python-dateutil/python-dateutil.mk b/package.bak/python-dateutil/python-dateutil.mk deleted file mode 100644 index b1f5e68b8f..0000000000 --- a/package.bak/python-dateutil/python-dateutil.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-dateutil -# -################################################################################ - -PYTHON_DATEUTIL_VERSION = 2.6.0 -PYTHON_DATEUTIL_SITE = https://pypi.python.org/packages/51/fc/39a3fbde6864942e8bb24c93663734b74e281b984d1b8c4f95d64b0c21f6 -PYTHON_DATEUTIL_SETUP_TYPE = setuptools -PYTHON_DATEUTIL_LICENSE = BSD-3c -PYTHON_DATEUTIL_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-dialog/Config.in b/package.bak/python-dialog/Config.in deleted file mode 100644 index c1fdb23723..0000000000 --- a/package.bak/python-dialog/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG - bool "python-dialog" - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package.bak/python-dialog/python-dialog.hash b/package.bak/python-dialog/python-dialog.hash deleted file mode 100644 index 3cf0eaa3d6..0000000000 --- a/package.bak/python-dialog/python-dialog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 58466c2f897ef761716b811ff74e035979b5ecefb529ba004b12db117a0f4581 python2-pythondialog-3.0.1.tar.bz2 diff --git a/package.bak/python-dialog/python-dialog.mk b/package.bak/python-dialog/python-dialog.mk deleted file mode 100644 index b75d19fd9f..0000000000 --- a/package.bak/python-dialog/python-dialog.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog -# -################################################################################ - -PYTHON_DIALOG_VERSION = 3.0.1 -PYTHON_DIALOG_SOURCE = python2-pythondialog-$(PYTHON_DIALOG_VERSION).tar.bz2 -PYTHON_DIALOG_SITE = http://downloads.sourceforge.net/project/pythondialog/pythondialog/$(PYTHON_DIALOG_VERSION) -PYTHON_DIALOG_LICENSE = LGPLv2.1+ -PYTHON_DIALOG_LICENSE_FILES = COPYING -PYTHON_DIALOG_SETUP_TYPE = distutils -PYTHON_DIALOG_DEPENDENCIES = dialog - -$(eval $(python-package)) diff --git a/package.bak/python-dialog3/Config.in b/package.bak/python-dialog3/Config.in deleted file mode 100644 index cd0760854b..0000000000 --- a/package.bak/python-dialog3/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_DIALOG3 - bool "python-dialog3" - depends on BR2_PACKAGE_PYTHON3 - depends on BR2_USE_MMU # dialog - select BR2_PACKAGE_DIALOG - help - A Python 3 only interface to the UNIX dialog utility and - mostly-compatible programs. - - http://pythondialog.sourceforge.net/ diff --git a/package.bak/python-dialog3/python-dialog3.hash b/package.bak/python-dialog3/python-dialog3.hash deleted file mode 100644 index dae863b76a..0000000000 --- a/package.bak/python-dialog3/python-dialog3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pythondialog/json, sha256 locally computed -md5 3d5ebc33e85f6313964f5eef720dab19 pythondialog-3.4.0.tar.bz2 -sha256 019cdbffe3f61d32d6fb158ce48a767478af2aac2f31fb40460b39aefae604fe pythondialog-3.4.0.tar.bz2 diff --git a/package.bak/python-dialog3/python-dialog3.mk b/package.bak/python-dialog3/python-dialog3.mk deleted file mode 100644 index abc4a395ce..0000000000 --- a/package.bak/python-dialog3/python-dialog3.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-dialog3 -# -################################################################################ - -PYTHON_DIALOG3_VERSION = 3.4.0 -PYTHON_DIALOG3_SOURCE = pythondialog-$(PYTHON_DIALOG3_VERSION).tar.bz2 -PYTHON_DIALOG3_SITE = https://pypi.python.org/packages/fa/f4/686742f01ebb5863d4c5e1acab620acfed0fe97280a26b4ed25917f4f333 -PYTHON_DIALOG3_LICENSE = LGPLv2.1+ -PYTHON_DIALOG3_LICENSE_FILES = COPYING -PYTHON_DIALOG3_SETUP_TYPE = distutils -PYTHON_DIALOG3_DEPENDENCIES = dialog - -$(eval $(python-package)) diff --git a/package.bak/python-dicttoxml/Config.in b/package.bak/python-dicttoxml/Config.in deleted file mode 100644 index 152afbb6bf..0000000000 --- a/package.bak/python-dicttoxml/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_DICTTOXML - bool "python-dicttoxml" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - help - Converts a Python dictionary or other native data type into a valid - XML string. - - https://github.com/quandyfactory/dicttoxml diff --git a/package.bak/python-dicttoxml/python-dicttoxml.hash b/package.bak/python-dicttoxml/python-dicttoxml.hash deleted file mode 100644 index 32ba6b0fd0..0000000000 --- a/package.bak/python-dicttoxml/python-dicttoxml.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/dicttoxml/json, sha256 locally computed -md5 ec5643a048cf32dad3c28db236b923e4 dicttoxml-1.7.4.tar.gz -sha256 ea44cc4ec6c0f85098c57a431a1ee891b3549347b07b7414c8a24611ecf37e45 dicttoxml-1.7.4.tar.gz diff --git a/package.bak/python-dicttoxml/python-dicttoxml.mk b/package.bak/python-dicttoxml/python-dicttoxml.mk deleted file mode 100644 index 6976715002..0000000000 --- a/package.bak/python-dicttoxml/python-dicttoxml.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-dicttoxml -# -################################################################################ - -PYTHON_DICTTOXML_VERSION = 1.7.4 -PYTHON_DICTTOXML_SOURCE = dicttoxml-$(PYTHON_DICTTOXML_VERSION).tar.gz -PYTHON_DICTTOXML_SITE = https://pypi.python.org/packages/74/36/534db111db9e7610a41641a1f6669a964aacaf51858f466de264cc8dcdd9 -PYTHON_DICTTOXML_SETUP_TYPE = distutils -PYTHON_DICTTOXML_LICENSE = GPLv2 -PYTHON_DICTTOXML_LICENSE_FILES = LICENCE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-django/Config.in b/package.bak/python-django/Config.in deleted file mode 100644 index ff84227593..0000000000 --- a/package.bak/python-django/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_DJANGO - bool "python-django" - select BR2_PACKAGE_PYTHON_UNICODEDATA if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_UNICODEDATA if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - help - Django is a high-level Python Web framework that encourages - rapid development and clean, pragmatic design. It takes your - Web applications from concept to launch in a matter of hours. - Django takes care of user authentication, content administration, - site maps, RSS feeds, user comments and many more tasks. - Django takes security seriously and helps developers avoid - many common security mistakes - - https://www.djangoproject.com/ diff --git a/package.bak/python-django/python-django.hash b/package.bak/python-django/python-django.hash deleted file mode 100644 index 38b303bbf6..0000000000 --- a/package.bak/python-django/python-django.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/django/json, sha256 locally computed -md5 5342e77374b2acd2eafa86d2bb68f8c9 Django-1.10.2.tar.gz -sha256 e127f12a0bfb34843b6e8c82f91e26fff6445a7ca91d222c0794174cf97cbce1 Django-1.10.2.tar.gz diff --git a/package.bak/python-django/python-django.mk b/package.bak/python-django/python-django.mk deleted file mode 100644 index 2a502314c6..0000000000 --- a/package.bak/python-django/python-django.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-django -# -################################################################################ - -PYTHON_DJANGO_VERSION = 1.10.2 -PYTHON_DJANGO_SOURCE = Django-$(PYTHON_DJANGO_VERSION).tar.gz -# The official Django site has an unpractical URL -PYTHON_DJANGO_SITE = https://pypi.python.org/packages/57/9e/59444485f092b6ed4f1931e7d2e13b67fdab967c041d02f58a0d1dab8c23 -PYTHON_DJANGO_LICENSE = BSD-3c -PYTHON_DJANGO_LICENSE_FILES = LICENSE -PYTHON_DJANGO_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-docopt/Config.in b/package.bak/python-docopt/Config.in deleted file mode 100644 index 9942d671b3..0000000000 --- a/package.bak/python-docopt/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_DOCOPT - bool "python-docopt" - help - docopt helps you create most beautiful command-line - interfaces easily. The option parser is generated based on - the beautiful help message that you write yourself. This way - you don't need to write this stupid repeatable parser-code, - and instead can write only the help message-- the way you - want it. - - https://github.com/docopt/docopt diff --git a/package.bak/python-docopt/python-docopt.hash b/package.bak/python-docopt/python-docopt.hash deleted file mode 100644 index c38e1ab737..0000000000 --- a/package.bak/python-docopt/python-docopt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2113eed1e7fbbcd43fb7ee6a977fb02d0b482753586c9dc1a8e3b7d541426e99 python-docopt-0.6.2.tar.gz diff --git a/package.bak/python-docopt/python-docopt.mk b/package.bak/python-docopt/python-docopt.mk deleted file mode 100644 index f87d2f85a6..0000000000 --- a/package.bak/python-docopt/python-docopt.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-docopt -# -################################################################################ - -PYTHON_DOCOPT_VERSION = 0.6.2 -PYTHON_DOCOPT_SITE = $(call github,docopt,docopt,$(PYTHON_DOCOPT_VERSION)) -PYTHON_DOCOPT_LICENSE = MIT -PYTHON_DOCOPT_LICENSE_FILES = LICENSE-MIT -PYTHON_DOCOPT_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-docutils/Config.in b/package.bak/python-docutils/Config.in deleted file mode 100644 index e7bf7e6321..0000000000 --- a/package.bak/python-docutils/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_DOCUTILS - bool "python-docutils" - help - Docutils is a modular system for processing documentation - into useful formats, such as HTML, XML, and LaTeX. For input - Docutils supports reStructuredText, an easy-to-read, - what-you-see-is-what-you-get plaintext markup syntax. - - http://docutils.sourceforge.net/ diff --git a/package.bak/python-docutils/python-docutils.hash b/package.bak/python-docutils/python-docutils.hash deleted file mode 100644 index 9d45058f1a..0000000000 --- a/package.bak/python-docutils/python-docutils.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/docutils/json, sha256 locally computed -md5 4622263b62c5c771c03502afa3157768 docutils-0.12.tar.gz -sha256 c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa docutils-0.12.tar.gz diff --git a/package.bak/python-docutils/python-docutils.mk b/package.bak/python-docutils/python-docutils.mk deleted file mode 100644 index a67d89fad1..0000000000 --- a/package.bak/python-docutils/python-docutils.mk +++ /dev/null @@ -1,15 +0,0 @@ -############################################################# -# -# python-docutils -# -############################################################# - -PYTHON_DOCUTILS_VERSION = 0.12 -PYTHON_DOCUTILS_SOURCE = docutils-$(PYTHON_DOCUTILS_VERSION).tar.gz -PYTHON_DOCUTILS_SITE = https://pypi.python.org/packages/37/38/ceda70135b9144d84884ae2fc5886c6baac4edea39550f28bcd144c1234d -PYTHON_DOCUTILS_LICENSE = Public Domain, BSD-2c, GPLv3 (emacs mode), other -PYTHON_DOCUTILS_LICENSE_FILES = COPYING.txt -PYTHON_DOCUTILS_SETUP_TYPE = distutils - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-dominate/Config.in b/package.bak/python-dominate/Config.in deleted file mode 100644 index 35e9a0c85f..0000000000 --- a/package.bak/python-dominate/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_DOMINATE - bool "python-dominate" - help - Dominate is a Python library for creating and manipulating - HTML documents using an elegant DOM API. - - http://github.com/Knio/dominate/ diff --git a/package.bak/python-dominate/python-dominate.hash b/package.bak/python-dominate/python-dominate.hash deleted file mode 100644 index 2480b004be..0000000000 --- a/package.bak/python-dominate/python-dominate.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/dominate/json, sha256 locally computed -md5 45bd97e6f7888aac24ae86013c57638e dominate-2.3.1.tar.gz -sha256 4b8ce6f33633c9dd9175b228d21c00c801b6bd0327747cd5e17fc2da934c3a69 dominate-2.3.1.tar.gz diff --git a/package.bak/python-dominate/python-dominate.mk b/package.bak/python-dominate/python-dominate.mk deleted file mode 100644 index 3e264caa7d..0000000000 --- a/package.bak/python-dominate/python-dominate.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-dominate -# -################################################################################ - -PYTHON_DOMINATE_VERSION = 2.3.1 -PYTHON_DOMINATE_SOURCE = dominate-$(PYTHON_DOMINATE_VERSION).tar.gz -PYTHON_DOMINATE_SITE = https://pypi.python.org/packages/43/b2/3b7d67dd59dab93ae08569384b254323516e8868b453eea5614a53835baf -PYTHON_DOMINATE_SETUP_TYPE = setuptools -PYTHON_DOMINATE_LICENSE = LGPLv3+ -PYTHON_DOMINATE_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-dpkt/Config.in b/package.bak/python-dpkt/Config.in deleted file mode 100644 index f1e4ddff15..0000000000 --- a/package.bak/python-dpkt/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_DPKT - bool "python-dpkt" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_ZLIB - help - Fast, simple packet creation / parsing, with definitions - for the basic TCP/IP protocols. - - http://code.google.com/p/dpkt/ diff --git a/package.bak/python-dpkt/python-dpkt.hash b/package.bak/python-dpkt/python-dpkt.hash deleted file mode 100644 index db46016d08..0000000000 --- a/package.bak/python-dpkt/python-dpkt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 33a98fd44eb0b6dfa6790c0fcef4d7e73a5cc12a664ea3c30f4d3c2b95f5efc4 python-dpkt-1.8.r98.tar.gz diff --git a/package.bak/python-dpkt/python-dpkt.mk b/package.bak/python-dpkt/python-dpkt.mk deleted file mode 100644 index 301550247b..0000000000 --- a/package.bak/python-dpkt/python-dpkt.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-dpkt -# -################################################################################ - -PYTHON_DPKT_VERSION = 1.8.r98 -PYTHON_DPKT_SITE = $(call github,kbandla,dpkt,$(PYTHON_DPKT_VERSION)) -PYTHON_DPKT_SETUP_TYPE = distutils -PYTHON_DPKT_LICENSE = BSD-3c -PYTHON_DPKT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-ecdsa/Config.in b/package.bak/python-ecdsa/Config.in deleted file mode 100644 index ce11910e8b..0000000000 --- a/package.bak/python-ecdsa/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_ECDSA - bool "python-ecdsa" - help - ECDSA cryptographic signature library (pure python). - - http://github.com/warner/python-ecdsa diff --git a/package.bak/python-ecdsa/python-ecdsa.hash b/package.bak/python-ecdsa/python-ecdsa.hash deleted file mode 100644 index b4bd70638d..0000000000 --- a/package.bak/python-ecdsa/python-ecdsa.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/ecdsa/json -md5 1f60eda9cb5c46722856db41a3ae6670 ecdsa-0.13.tar.gz -# sha256 calculated by scanpypi -sha256 64cf1ee26d1cde3c73c6d7d107f835fed7c6a2904aef9eac223d57ad800c43fa ecdsa-0.13.tar.gz diff --git a/package.bak/python-ecdsa/python-ecdsa.mk b/package.bak/python-ecdsa/python-ecdsa.mk deleted file mode 100644 index 75b0634e14..0000000000 --- a/package.bak/python-ecdsa/python-ecdsa.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ecdsa -# -################################################################################ - -PYTHON_ECDSA_VERSION = 0.13 -PYTHON_ECDSA_SOURCE = ecdsa-$(PYTHON_ECDSA_VERSION).tar.gz -PYTHON_ECDSA_SITE = https://pypi.python.org/packages/source/e/ecdsa -PYTHON_ECDSA_SETUP_TYPE = setuptools -PYTHON_ECDSA_LICENSE = MIT -PYTHON_ECDSA_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-engineio/Config.in b/package.bak/python-engineio/Config.in deleted file mode 100644 index b12db922a2..0000000000 --- a/package.bak/python-engineio/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENGINEIO - bool "python-engineio" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - help - Engine.IO server. - - http://github.com/miguelgrinberg/python-engineio/ diff --git a/package.bak/python-engineio/python-engineio.hash b/package.bak/python-engineio/python-engineio.hash deleted file mode 100644 index b2c0669bcc..0000000000 --- a/package.bak/python-engineio/python-engineio.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/python-engineio/json -md5 9b0075dbbb25d7a302eba99dd9ba4af8 python-engineio-0.9.2.tar.gz -# sha256 calculated by scanpypi -sha256 c53282415ed9bc3cb4e7beafb2a1ce5c369af95dcf8f968061e5bc7572b60867 python-engineio-0.9.2.tar.gz diff --git a/package.bak/python-engineio/python-engineio.mk b/package.bak/python-engineio/python-engineio.mk deleted file mode 100644 index 61d5da9aff..0000000000 --- a/package.bak/python-engineio/python-engineio.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-engineio -# -################################################################################ - -PYTHON_ENGINEIO_VERSION = 0.9.2 -PYTHON_ENGINEIO_SITE = https://pypi.python.org/packages/c3/8f/0e066fc7a7029893b96b1d68a0cd5e75f6410f154fa4079b2be4991f5ae0 -PYTHON_ENGINEIO_SETUP_TYPE = setuptools -PYTHON_ENGINEIO_LICENSE = MIT -PYTHON_ENGINEIO_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-enum/Config.in b/package.bak/python-enum/Config.in deleted file mode 100644 index e26ae8bf97..0000000000 --- a/package.bak/python-enum/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM - bool "python-enum" - depends on BR2_PACKAGE_PYTHON - help - Robust enumerated type support in Python - - An enumeration object is an immutable sequence object built - from a sequence of strings. Each value is also available as - an attribute. Such values are constant. Comparisons and - enumeration are supported. - - https://pypi.python.org/pypi/enum diff --git a/package.bak/python-enum/python-enum.hash b/package.bak/python-enum/python-enum.hash deleted file mode 100644 index c7c1924abe..0000000000 --- a/package.bak/python-enum/python-enum.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ce75c7c3c86741175a84456cc5bd531e, sha256 locally computed -md5 ce75c7c3c86741175a84456cc5bd531e enum-0.4.4.tar.gz -sha256 9bdfacf543baf2350df7613eb37f598a802f346985ca0dc1548be6494140fdff enum-0.4.4.tar.gz diff --git a/package.bak/python-enum/python-enum.mk b/package.bak/python-enum/python-enum.mk deleted file mode 100644 index 0131be3f9f..0000000000 --- a/package.bak/python-enum/python-enum.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum -# -################################################################################ - -PYTHON_ENUM_VERSION = 0.4.4 -PYTHON_ENUM_SOURCE = enum-$(PYTHON_ENUM_VERSION).tar.gz -PYTHON_ENUM_SITE = http://pypi.python.org/packages/source/e/enum -PYTHON_ENUM_SETUP_TYPE = setuptools -PYTHON_ENUM_LICENSE = GPLv2+ or Python software foundation license v2 -PYTHON_ENUM_LICENSE_FILES = LICENSE.GPL LICENSE.PSF - -$(eval $(python-package)) diff --git a/package.bak/python-enum34/Config.in b/package.bak/python-enum34/Config.in deleted file mode 100644 index 2511a350e0..0000000000 --- a/package.bak/python-enum34/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_ENUM34 - bool "python-enum34" - depends on BR2_PACKAGE_PYTHON - help - Python 3.4 Enum backported to 2.x. - - An enumeration is a set of symbolic names (members) bound to - unique, constant values. Within an enumeration, the members - can be compared by identity, and the enumeration itself can - be iterated over. - - https://pypi.python.org/pypi/enum34 diff --git a/package.bak/python-enum34/python-enum34.hash b/package.bak/python-enum34/python-enum34.hash deleted file mode 100644 index dd6ce3408d..0000000000 --- a/package.bak/python-enum34/python-enum34.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=ac80f432ac9373e7d162834b264034b6, sha256 locally computed -md5 ac80f432ac9373e7d162834b264034b6 enum34-1.0.4.tar.gz -sha256 d3c19f26a6a34629c18c775f59dfc5dd595764c722b57a2da56ebfb69b94e447 enum34-1.0.4.tar.gz diff --git a/package.bak/python-enum34/python-enum34.mk b/package.bak/python-enum34/python-enum34.mk deleted file mode 100644 index 13c529d2f9..0000000000 --- a/package.bak/python-enum34/python-enum34.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-enum34 -# -################################################################################ - -PYTHON_ENUM34_VERSION = 1.0.4 -PYTHON_ENUM34_SOURCE = enum34-$(PYTHON_ENUM34_VERSION).tar.gz -PYTHON_ENUM34_SITE = http://pypi.python.org/packages/source/e/enum34 -PYTHON_ENUM34_SETUP_TYPE = distutils -PYTHON_ENUM34_LICENSE = BSD-3c -PYTHON_ENUM34_LICENSE_FILES = enum/LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-flask-babel/Config.in b/package.bak/python-flask-babel/Config.in deleted file mode 100644 index 61fd2c0570..0000000000 --- a/package.bak/python-flask-babel/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_FLASK_BABEL - bool "python-flask-babel" - select BR2_PACKAGE_PYTHON_FLASK # runtime - select BR2_PACKAGE_PYTHON_BABEL # runtime - help - Flask-Babel is an extension to Flask that adds i18n and l10n - support to any Flask application with the help of babel, - pytz and speaklater. It has builtin support for date - formatting with timezone support as well as a very simple - and friendly interface to gettext translations. - - https://pythonhosted.org/Flask-Babel/ diff --git a/package.bak/python-flask-babel/python-flask-babel.hash b/package.bak/python-flask-babel/python-flask-babel.hash deleted file mode 100644 index c4420e4a99..0000000000 --- a/package.bak/python-flask-babel/python-flask-babel.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/Flask-Babel/json, sha256 locally computed -md5 658e84a20ddc545a7612144fe2c758d3 Flask-Babel-0.11.1.tar.gz -sha256 d29b36c399e42e98bc9401c8c1c159f2befcb8c12a2a2a87ec49ad7623036899 Flask-Babel-0.11.1.tar.gz diff --git a/package.bak/python-flask-babel/python-flask-babel.mk b/package.bak/python-flask-babel/python-flask-babel.mk deleted file mode 100644 index 35d34d1ced..0000000000 --- a/package.bak/python-flask-babel/python-flask-babel.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-flask-babel -# -################################################################################ - -PYTHON_FLASK_BABEL_VERSION = 0.11.1 -PYTHON_FLASK_BABEL_SOURCE = Flask-Babel-$(PYTHON_FLASK_BABEL_VERSION).tar.gz -PYTHON_FLASK_BABEL_SITE = https://pypi.python.org/packages/47/96/6013d4091fb4238e27e918aec4929f082942fa8c9489ae3aad2f18de4b5b -PYTHON_FLASK_BABEL_LICENSE = BSD-3c -PYTHON_FLASK_BABEL_SETUP_TYPE = setuptools -PYTHON_FLASK_BABEL_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-flask-jsonrpc/Config.in b/package.bak/python-flask-jsonrpc/Config.in deleted file mode 100644 index c8ecd854b3..0000000000 --- a/package.bak/python-flask-jsonrpc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FLASK_JSONRPC - bool "python-flask-jsonrpc" - # runtime dependency - select BR2_PACKAGE_PYTHON_FLASK - help - A basic JSON-RPC implementation for your Flask-powered sites. - - https://github.com/cenobites/flask-jsonrpc diff --git a/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.hash b/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.hash deleted file mode 100644 index a25fbb7294..0000000000 --- a/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/flask-jsonrpc/json, sha256 locally computed -md5 5c0592f53b2f18e34d5be435acee8842 Flask-JSONRPC-0.3.1.tar.gz -sha256 4d0cc9c20874093306af91f5a48009fb8659a041428dcdb11703598ffbbc97d0 Flask-JSONRPC-0.3.1.tar.gz diff --git a/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.mk b/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.mk deleted file mode 100644 index ade39e1b3e..0000000000 --- a/package.bak/python-flask-jsonrpc/python-flask-jsonrpc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-flask-jsonrpc -# -################################################################################ - -PYTHON_FLASK_JSONRPC_VERSION = 0.3.1 -PYTHON_FLASK_JSONRPC_SOURCE = Flask-JSONRPC-$(PYTHON_FLASK_JSONRPC_VERSION).tar.gz -PYTHON_FLASK_JSONRPC_SITE = https://pypi.python.org/packages/cb/1f/e6d66e8498609ba04bac76155b2ea884df95531e93501bf4ef009d40a83c -PYTHON_FLASK_JSONRPC_LICENSE = BSD-3c -PYTHON_FLASK_JSONRPC_LICENSE_FILES = setup.py -PYTHON_FLASK_JSONRPC_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-flask-login/Config.in b/package.bak/python-flask-login/Config.in deleted file mode 100644 index 88c413e2a2..0000000000 --- a/package.bak/python-flask-login/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_FLASK_LOGIN - bool "python-flask-login" - # runtime dependency - select BR2_PACKAGE_PYTHON_FLASK - help - Flask-Login provides user session management for Flask. - - https://github.com/maxcountryman/flask-login diff --git a/package.bak/python-flask-login/python-flask-login.hash b/package.bak/python-flask-login/python-flask-login.hash deleted file mode 100644 index c488a35e24..0000000000 --- a/package.bak/python-flask-login/python-flask-login.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/Flask-Login/0.3.2, sha256 locally computed: -md5 d95c2275d3e1c755145910077366dc45 Flask-Login-0.3.2.tar.gz -sha256 e72eff5c35e5a31db1aeca1db5d2501be702674ea88e8f223b5d2b11644beee6 Flask-Login-0.3.2.tar.gz diff --git a/package.bak/python-flask-login/python-flask-login.mk b/package.bak/python-flask-login/python-flask-login.mk deleted file mode 100644 index aa6d8e3de5..0000000000 --- a/package.bak/python-flask-login/python-flask-login.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-flask-login -# -################################################################################ - -PYTHON_FLASK_LOGIN_VERSION = 0.3.2 -PYTHON_FLASK_LOGIN_SOURCE = Flask-Login-$(PYTHON_FLASK_LOGIN_VERSION).tar.gz -PYTHON_FLASK_LOGIN_SITE = http://pypi.python.org/packages/source/F/Flask-Login -PYTHON_FLASK_LOGIN_LICENSE = MIT -PYTHON_FLASK_LOGIN_LICENSE_FILES = LICENSE -PYTHON_FLASK_LOGIN_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-flask/Config.in b/package.bak/python-flask/Config.in deleted file mode 100644 index 6f77913ed1..0000000000 --- a/package.bak/python-flask/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_FLASK - bool "python-flask" - select BR2_PACKAGE_PYTHON_CLICK # runtime - select BR2_PACKAGE_PYTHON_JINJA2 # runtime - select BR2_PACKAGE_PYTHON_WERKZEUG # runtime - select BR2_PACKAGE_PYTHON_ITSDANGEROUS # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - help - Flask is a microframework for Python based on Werkzeug, - Jinja 2 and good intentions. - - http://flask.pocoo.org/ diff --git a/package.bak/python-flask/python-flask.hash b/package.bak/python-flask/python-flask.hash deleted file mode 100644 index 919b075989..0000000000 --- a/package.bak/python-flask/python-flask.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/flask/json, sha256 locally computed -md5 c1d30f51cff4a38f9454b23328a15c5a Flask-0.12.tar.gz -sha256 93e803cdbe326a61ebd5c5d353959397c85f829bec610d59cb635c9f97d7ca8b Flask-0.12.tar.gz diff --git a/package.bak/python-flask/python-flask.mk b/package.bak/python-flask/python-flask.mk deleted file mode 100644 index 6c25a6d144..0000000000 --- a/package.bak/python-flask/python-flask.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-flask -# -################################################################################ - -PYTHON_FLASK_VERSION = 0.12 -PYTHON_FLASK_SOURCE = Flask-$(PYTHON_FLASK_VERSION).tar.gz -PYTHON_FLASK_SITE = https://pypi.python.org/packages/4b/3a/4c20183df155dd2e39168e35d53a388efb384a512ca6c73001d8292c094a -PYTHON_FLASK_SETUP_TYPE = setuptools -PYTHON_FLASK_LICENSE = BSD-3c -PYTHON_FLASK_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-flup/Config.in b/package.bak/python-flup/Config.in deleted file mode 100644 index 2c21323515..0000000000 --- a/package.bak/python-flup/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_FLUP - bool "python-flup" - depends on BR2_PACKAGE_PYTHON - help - flup provides of a collection of WSGI modules for Python. - It allows a webserver to use scgi-mod and fastcgi-mod - with python. - - https://pypi.python.org/pypi/flup diff --git a/package.bak/python-flup/python-flup.hash b/package.bak/python-flup/python-flup.hash deleted file mode 100644 index 50a0381d3b..0000000000 --- a/package.bak/python-flup/python-flup.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/pypi/flup/1.0.3.dev-20110405 -md5 a005b072d144fc0e44b0fa4c5a9ba029 flup-1.0.3.dev-20110405.tar.gz -# Calculated based on the hash above -sha256 6649cf41854ea8782c795cdde64fdf79a90db821533d3652f91d21b0a7f39c79 flup-1.0.3.dev-20110405.tar.gz diff --git a/package.bak/python-flup/python-flup.mk b/package.bak/python-flup/python-flup.mk deleted file mode 100644 index 5e612bb357..0000000000 --- a/package.bak/python-flup/python-flup.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-flup -# -################################################################################ - -PYTHON_FLUP_VERSION = 1.0.3.dev-20110405 -PYTHON_FLUP_SOURCE = flup-$(PYTHON_FLUP_VERSION).tar.gz -PYTHON_FLUP_SITE = http://pypi.python.org/packages/source/f/flup - -PYTHON_FLUP_LICENSE = BSD-2c, MIT - -PYTHON_FLUP_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-functools32/Config.in b/package.bak/python-functools32/Config.in deleted file mode 100644 index acfd0f3b0d..0000000000 --- a/package.bak/python-functools32/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUNCTOOLS32 - bool "python-functools32" - depends on BR2_PACKAGE_PYTHON - help - Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy. - - https://github.com/MiCHiLU/python-functools32 diff --git a/package.bak/python-functools32/python-functools32.mk b/package.bak/python-functools32/python-functools32.mk deleted file mode 100644 index 1590c51238..0000000000 --- a/package.bak/python-functools32/python-functools32.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-functools32 -# -################################################################################ - -PYTHON_FUNCTOOLS32_VERSION = 3.2.3-2 -PYTHON_FUNCTOOLS32_SOURCE = functools32-$(PYTHON_FUNCTOOLS32_VERSION).tar.gz -PYTHON_FUNCTOOLS32_SITE = https://pypi.python.org/packages/c5/60/6ac26ad05857c601308d8fb9e87fa36d0ebf889423f47c3502ef034365db -PYTHON_FUNCTOOLS32_SETUP_TYPE = distutils - -$(eval $(python-package)) - diff --git a/package.bak/python-futures/Config.in b/package.bak/python-futures/Config.in deleted file mode 100644 index 2eb40e93bd..0000000000 --- a/package.bak/python-futures/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_FUTURES - bool "python-futures" - depends on BR2_PACKAGE_PYTHON # not needed for python3 - help - Backport of the concurrent.futures package from Python 3.2. - - https://github.com/agronholm/pythonfutures diff --git a/package.bak/python-futures/python-futures.hash b/package.bak/python-futures/python-futures.hash deleted file mode 100644 index f0948ae4e2..0000000000 --- a/package.bak/python-futures/python-futures.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/futures/json, sha256 locally computed -md5 ced2c365e518242512d7a398b515ff95 futures-3.0.5.tar.gz -sha256 0542525145d5afc984c88f914a0c85c77527f65946617edb5274f72406f981df futures-3.0.5.tar.gz diff --git a/package.bak/python-futures/python-futures.mk b/package.bak/python-futures/python-futures.mk deleted file mode 100644 index 8a1afa3386..0000000000 --- a/package.bak/python-futures/python-futures.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-futures -# -################################################################################ - -PYTHON_FUTURES_VERSION = 3.0.5 -PYTHON_FUTURES_SOURCE = futures-$(PYTHON_FUTURES_VERSION).tar.gz -PYTHON_FUTURES_SITE = https://pypi.python.org/packages/55/db/97c1ca37edab586a1ae03d6892b6633d8eaa23b23ac40c7e5bbc55423c78 -PYTHON_FUTURES_SETUP_TYPE = setuptools -PYTHON_FUTURES_LICENSE = BSD-2c -PYTHON_FUTURES_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-gobject/0001-add-PYTHON_INCLUDES-override.patch b/package.bak/python-gobject/0001-add-PYTHON_INCLUDES-override.patch deleted file mode 100644 index d883f60ddf..0000000000 --- a/package.bak/python-gobject/0001-add-PYTHON_INCLUDES-override.patch +++ /dev/null @@ -1,32 +0,0 @@ -[PATCH] m4/python.m4: add PYTHON_INCLUDES override for cross compilation - -As the configure script mixes up host/target python. Equivalent to the -similar code in dbus-python. - -Signed-off-by: Peter Korsgaard ---- - m4/python.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -Index: python-gobject-2.28.6/m4/python.m4 -=================================================================== ---- python-gobject-2.28.6.orig/m4/python.m4 -+++ python-gobject-2.28.6/m4/python.m4 -@@ -43,6 +43,9 @@ - [AC_REQUIRE([AM_PATH_PYTHON]) - AC_MSG_CHECKING(for headers required to compile python extensions) - dnl deduce PYTHON_INCLUDES -+if test "${PYTHON_INCLUDES+set}" = set; then -+ AC_MSG_NOTICE([PYTHON_INCLUDES overridden to: $PYTHON_INCLUDES]) -+else - py_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.prefix)"` - py_exec_prefix=`$PYTHON -c "import sys; sys.stdout.write(sys.exec_prefix)"` - PYTHON_CONFIG=`which $PYTHON`-config -@@ -54,6 +57,7 @@ - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi - fi -+fi - AC_SUBST(PYTHON_INCLUDES) - dnl check if the headers exist: - save_CPPFLAGS="$CPPFLAGS" diff --git a/package.bak/python-gobject/Config.in b/package.bak/python-gobject/Config.in deleted file mode 100644 index 475ff25185..0000000000 --- a/package.bak/python-gobject/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_GOBJECT - bool "python-gobject" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_LIBGLIB2 - help - Python bindings for the GLib/GObject library - - https://wiki.gnome.org/action/show/Projects/PyGObject - -comment "python-gobject needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/python-gobject/python-gobject.hash b/package.bak/python-gobject/python-gobject.hash deleted file mode 100644 index 024419e965..0000000000 --- a/package.bak/python-gobject/python-gobject.hash +++ /dev/null @@ -1,2 +0,0 @@ -# from http://ftp.gnome.org/pub/GNOME/sources/pygobject/2.28/pygobject-2.28.6.sha256sum -sha256 fb8a1d4f665130a125011659bd347c7339c944232163dbb9a34fd0686577adb8 pygobject-2.28.6.tar.xz diff --git a/package.bak/python-gobject/python-gobject.mk b/package.bak/python-gobject/python-gobject.mk deleted file mode 100644 index 74cb0540cc..0000000000 --- a/package.bak/python-gobject/python-gobject.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# python-gobject -# -################################################################################ - -PYTHON_GOBJECT_VERSION_MAJOR = 2.28 -PYTHON_GOBJECT_VERSION = $(PYTHON_GOBJECT_VERSION_MAJOR).6 -PYTHON_GOBJECT_SOURCE = pygobject-$(PYTHON_GOBJECT_VERSION).tar.xz -PYTHON_GOBJECT_SITE = http://ftp.gnome.org/pub/gnome/sources/pygobject/$(PYTHON_GOBJECT_VERSION_MAJOR) -PYTHON_GOBJECT_LICENSE = LGPLv2.1+ -PYTHON_GOBJECT_LICENSE_FILES = COPYING -PYTHON_GOBJECT_DEPENDENCIES = host-pkgconf libglib2 -PYTHON_GOBJECT_CONF_OPTS = --disable-introspection -# for 0001-add-PYTHON_INCLUDES-override.patch -PYTHON_GOBJECT_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_GOBJECT_DEPENDENCIES += python host-python - -PYTHON_GOBJECT_CONF_ENV = \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" -else -PYTHON_GOBJECT_DEPENDENCIES += python3 host-python3 - -PYTHON_GOBJECT_CONF_ENV = \ - PYTHON=$(HOST_DIR)/usr/bin/python3 \ - PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" -endif - -ifeq ($(BR2_PACKAGE_LIBFFI),y) -PYTHON_GOBJECT_CONF_OPTS += --with-ffi -PYTHON_GOBJECT_DEPENDENCIES += libffi -else -PYTHON_GOBJECT_CONF_OPTS += --without-ffi -endif - -$(eval $(autotools-package)) diff --git a/package.bak/python-gunicorn/Config.in b/package.bak/python-gunicorn/Config.in deleted file mode 100644 index 79cda3eaa6..0000000000 --- a/package.bak/python-gunicorn/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_GUNICORN - bool "python-gunicorn" - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_SSL if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_SSL if BR2_PACKAGE_PYTHON3 # runtime - help - Gunicorn ‘Green Unicorn’ is a Python WSGI HTTP Server for - UNIX. It’s a pre-fork worker model ported from Ruby’s - Unicorn project. The Gunicorn server is broadly compatible - with various web frameworks, simply implemented, light on - server resource usage, and fairly speedy. - - http://gunicorn.org/ diff --git a/package.bak/python-gunicorn/python-gunicorn.hash b/package.bak/python-gunicorn/python-gunicorn.hash deleted file mode 100644 index a282bc995d..0000000000 --- a/package.bak/python-gunicorn/python-gunicorn.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/gunicorn/json, sha256 locally computed -md5 338e5e8a83ea0f0625f768dba4597530 gunicorn-19.6.0.tar.gz -sha256 813f6916d18a4c8e90efde72f419308b357692f81333cb1125f80013d22fb618 gunicorn-19.6.0.tar.gz diff --git a/package.bak/python-gunicorn/python-gunicorn.mk b/package.bak/python-gunicorn/python-gunicorn.mk deleted file mode 100644 index cfb7da110c..0000000000 --- a/package.bak/python-gunicorn/python-gunicorn.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# python-gunicorn -# -################################################################################ - -PYTHON_GUNICORN_VERSION = 19.6.0 -PYTHON_GUNICORN_SOURCE = gunicorn-$(PYTHON_GUNICORN_VERSION).tar.gz -PYTHON_GUNICORN_SITE = https://pypi.python.org/packages/84/ce/7ea5396efad1cef682bbc4068e72a0276341d9d9d0f501da609fab9fcb80 -PYTHON_GUNICORN_SETUP_TYPE = setuptools -PYTHON_GUNICORN_LICENSE = MIT -PYTHON_GUNICORN_LICENSE_FILES = LICENSE - -# At the end of the build, we try to compile all py files using the host python -# that has been built. -# The GAIO HTTP Worker is only compatible with Python3.4.2 and up. So don't try -# to compile it with python 2.x -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_GUNICORN_REMOVE_GAIO_WORKER - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/ \ - -name "_gaiohttp.py" -exec rm -f {} \; -endef -PYTHON_GUNICORN_POST_INSTALL_TARGET_HOOKS += PYTHON_GUNICORN_REMOVE_GAIO_WORKER -endif - -$(eval $(python-package)) diff --git a/package.bak/python-html5lib/Config.in b/package.bak/python-html5lib/Config.in deleted file mode 100644 index c3e9f2a859..0000000000 --- a/package.bak/python-html5lib/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_HTML5LIB - bool "python-html5lib" - help - HTML parser based on the WHATWG HTML specification. - - https://github.com/html5lib/html5lib-python diff --git a/package.bak/python-html5lib/python-html5lib.hash b/package.bak/python-html5lib/python-html5lib.hash deleted file mode 100644 index 7ea082fa70..0000000000 --- a/package.bak/python-html5lib/python-html5lib.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/html5lib/json, sha256 locally computed -md5 5ada1243b7a863624b2f35245b2186e9 html5lib-1.0b10.tar.gz -sha256 0d5fd54d5b2b79b876007a70c033a4023577768d18022c15681c00561432a0f9 html5lib-1.0b10.tar.gz diff --git a/package.bak/python-html5lib/python-html5lib.mk b/package.bak/python-html5lib/python-html5lib.mk deleted file mode 100644 index 38affcbb4e..0000000000 --- a/package.bak/python-html5lib/python-html5lib.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-html5lib -# -################################################################################ - -PYTHON_HTML5LIB_VERSION = 1.0b10 -PYTHON_HTML5LIB_SOURCE = html5lib-$(PYTHON_HTML5LIB_VERSION).tar.gz -PYTHON_HTML5LIB_SITE = https://pypi.python.org/packages/97/16/982214624095c1420c75f3bd295d9e658794aafb95fc075823de107e0ae4 -PYTHON_HTML5LIB_LICENSE = MIT -PYTHON_HTML5LIB_LICENSE_FILES = LICENSE -PYTHON_HTML5LIB_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-httplib2/Config.in b/package.bak/python-httplib2/Config.in deleted file mode 100644 index e42f5132b7..0000000000 --- a/package.bak/python-httplib2/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -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.bak/python-httplib2/python-httplib2.hash b/package.bak/python-httplib2/python-httplib2.hash deleted file mode 100644 index 879f18b9d2..0000000000 --- a/package.bak/python-httplib2/python-httplib2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=bd1b1445b3b2dfa7276b09b1a07b7f0e, sha256 locally computed -md5 bd1b1445b3b2dfa7276b09b1a07b7f0e httplib2-0.9.2.tar.gz -sha256 c3aba1c9539711551f4d83e857b316b5134a1c4ddce98a875b7027be7dd6d988 httplib2-0.9.2.tar.gz diff --git a/package.bak/python-httplib2/python-httplib2.mk b/package.bak/python-httplib2/python-httplib2.mk deleted file mode 100644 index adeddd33b2..0000000000 --- a/package.bak/python-httplib2/python-httplib2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-httplib2 -# -################################################################################ - -PYTHON_HTTPLIB2_VERSION = 0.9.2 -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.bak/python-humanize/Config.in b/package.bak/python-humanize/Config.in deleted file mode 100644 index f4f4e67b65..0000000000 --- a/package.bak/python-humanize/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_HUMANIZE - bool "python-humanize" - help - Python humanize package contains various common humanization - utilities, like turning a number into a fuzzy human readable - duration ('3 minutes ago') or into a human readable size or - throughput. - - http://github.com/jmoiron/humanize diff --git a/package.bak/python-humanize/python-humanize.hash b/package.bak/python-humanize/python-humanize.hash deleted file mode 100644 index bb66e44467..0000000000 --- a/package.bak/python-humanize/python-humanize.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/humanize/json, sha256 locally computed -md5 e8473d9dc1b220911cac2edd53b1d973 humanize-0.5.1.tar.gz -sha256 a43f57115831ac7c70de098e6ac46ac13be00d69abbf60bdcac251344785bb19 humanize-0.5.1.tar.gz diff --git a/package.bak/python-humanize/python-humanize.mk b/package.bak/python-humanize/python-humanize.mk deleted file mode 100644 index 60ec82bd48..0000000000 --- a/package.bak/python-humanize/python-humanize.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-humanize -# -################################################################################ - -PYTHON_HUMANIZE_VERSION = 0.5.1 -PYTHON_HUMANIZE_SOURCE = humanize-$(PYTHON_HUMANIZE_VERSION).tar.gz -PYTHON_HUMANIZE_SITE = https://pypi.python.org/packages/8c/e0/e512e4ac6d091fc990bbe13f9e0378f34cf6eecd1c6c268c9e598dcf5bb9 -PYTHON_HUMANIZE_SETUP_TYPE = setuptools -PYTHON_HUMANIZE_LICENSE = MIT -PYTHON_HUMANIZE_LICENSE_FILES = LICENCE - -$(eval $(python-package)) diff --git a/package.bak/python-id3/Config.in b/package.bak/python-id3/Config.in deleted file mode 100644 index 6ddfd541bd..0000000000 --- a/package.bak/python-id3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ID3 - bool "python-id3" - depends on BR2_PACKAGE_PYTHON - help - This module allows one to read and manipulate so-called ID3 - informational tags on MP3 files through an object-oriented - Python interface. - - http://id3-py.sourceforge.net/ diff --git a/package.bak/python-id3/python-id3.hash b/package.bak/python-id3/python-id3.hash deleted file mode 100644 index 28b58e8954..0000000000 --- a/package.bak/python-id3/python-id3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 ba612342b59a49cbf9a7eb23a646667757ffda96dc23b67245fc6cd8d90c2022 id3-py_1.2.tar.gz diff --git a/package.bak/python-id3/python-id3.mk b/package.bak/python-id3/python-id3.mk deleted file mode 100644 index 157576e6c8..0000000000 --- a/package.bak/python-id3/python-id3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-id3 -# -################################################################################ - -PYTHON_ID3_VERSION = 1.2 -PYTHON_ID3_SOURCE = id3-py_$(PYTHON_ID3_VERSION).tar.gz -PYTHON_ID3_SITE = http://downloads.sourceforge.net/project/id3-py/id3-py/$(PYTHON_ID3_VERSION) -PYTHON_ID3_SETUP_TYPE = distutils -PYTHON_ID3_LICENSE = GPLv2+ -PYTHON_ID3_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/package.bak/python-idna/Config.in b/package.bak/python-idna/Config.in deleted file mode 100644 index 4ff4581d53..0000000000 --- a/package.bak/python-idna/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_IDNA - bool "python-idna" - help - A library to support the Internationalised Domain Names in - Applications (IDNA) protocol as specified in RFC 5891. This - version of the protocol is often referred to as “IDNA2008” - and can produce different results from the earlier standard - from 2003. - - https://github.com/kjd/idna diff --git a/package.bak/python-idna/python-idna.hash b/package.bak/python-idna/python-idna.hash deleted file mode 100644 index 4e4c6771bf..0000000000 --- a/package.bak/python-idna/python-idna.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f6473caa9c5e0cc1ad3fd5d04c3c114b, sha256 locally computed -md5 f6473caa9c5e0cc1ad3fd5d04c3c114b idna-2.1.tar.gz -sha256 ed36f281aebf3cd0797f163bb165d84c31507cedd15928b095b1675e2d04c676 idna-2.1.tar.gz diff --git a/package.bak/python-idna/python-idna.mk b/package.bak/python-idna/python-idna.mk deleted file mode 100644 index 3f9f109372..0000000000 --- a/package.bak/python-idna/python-idna.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-idna -# -################################################################################ - -PYTHON_IDNA_VERSION = 2.1 -PYTHON_IDNA_SOURCE = idna-$(PYTHON_IDNA_VERSION).tar.gz -PYTHON_IDNA_SITE = https://pypi.python.org/packages/source/i/idna -PYTHON_IDNA_LICENSE = BSD-3c -PYTHON_IDNA_LICENSE_FILES = LICENSE.rst -PYTHON_IDNA_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-incremental/Config.in b/package.bak/python-incremental/Config.in deleted file mode 100644 index 64f8623354..0000000000 --- a/package.bak/python-incremental/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_INCREMENTAL - bool "python-incremental" - help - A library for versioning your Python projects. - - https://github.com/hawkowl/incremental diff --git a/package.bak/python-incremental/python-incremental.hash b/package.bak/python-incremental/python-incremental.hash deleted file mode 100644 index 580e76c7c2..0000000000 --- a/package.bak/python-incremental/python-incremental.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/incremental/json, sha256 locally computed -md5 3fe6b3b1da1d26a48187fb27e969f072 incremental-16.10.1.tar.gz -sha256 14ad6b720ec47aad6c9caa83e47db1843e2b9b98742da5dda08e16a99f400342 incremental-16.10.1.tar.gz diff --git a/package.bak/python-incremental/python-incremental.mk b/package.bak/python-incremental/python-incremental.mk deleted file mode 100644 index 64eda68e85..0000000000 --- a/package.bak/python-incremental/python-incremental.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-incremental -# -################################################################################ - -PYTHON_INCREMENTAL_VERSION = 16.10.1 -PYTHON_INCREMENTAL_SOURCE = incremental-$(PYTHON_INCREMENTAL_VERSION).tar.gz -PYTHON_INCREMENTAL_SITE = https://pypi.python.org/packages/da/b0/32233c9e84b0d44b39015fba8fec03e88053723c1b455925081dc6ccd9e7 -PYTHON_INCREMENTAL_SETUP_TYPE = setuptools -PYTHON_INCREMENTAL_LICENSE = MIT -PYTHON_INCREMENTAL_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-iniparse/Config.in b/package.bak/python-iniparse/Config.in deleted file mode 100644 index 65c1064927..0000000000 --- a/package.bak/python-iniparse/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_INIPARSE - bool "python-iniparse" - depends on BR2_PACKAGE_PYTHON - help - iniparse is an INI parser for Python which is API compatible - with the standard library's ConfigParser, preserves - structure of INI files (order of sections & options, - indentation, comments, and blank lines are preserved when - data is updated), and is more convenient to use. - - https://pypi.python.org/pypi/iniparse diff --git a/package.bak/python-iniparse/python-iniparse.hash b/package.bak/python-iniparse/python-iniparse.hash deleted file mode 100644 index d7d8e9336d..0000000000 --- a/package.bak/python-iniparse/python-iniparse.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5e573e9e9733d97623881ce9bbe5eca6, sha256 locally computed -md5 5e573e9e9733d97623881ce9bbe5eca6 iniparse-0.4.tar.gz -sha256 abc1ee12d2cfb2506109072d6c21e40b6c75a3fe90a9c924327d80bc0d99c054 iniparse-0.4.tar.gz - diff --git a/package.bak/python-iniparse/python-iniparse.mk b/package.bak/python-iniparse/python-iniparse.mk deleted file mode 100644 index b00e0c4ae1..0000000000 --- a/package.bak/python-iniparse/python-iniparse.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-iniparse -# -################################################################################ - -PYTHON_INIPARSE_VERSION = 0.4 -PYTHON_INIPARSE_SOURCE = iniparse-$(PYTHON_INIPARSE_VERSION).tar.gz -PYTHON_INIPARSE_SITE = https://pypi.python.org/packages/source/i/iniparse -PYTHON_INIPARSE_LICENSE = Python software foundation license v2, MIT -PYTHON_INIPARSE_LICENSE_FILES = LICENSE-PSF LICENSE -PYTHON_INIPARSE_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-iowait/Config.in b/package.bak/python-iowait/Config.in deleted file mode 100644 index ebe96db13d..0000000000 --- a/package.bak/python-iowait/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_IOWAIT - bool "python-iowait" - help - Platform-independent module for I/O completion events. - - https://launchpad.net/python-iowait diff --git a/package.bak/python-iowait/python-iowait.hash b/package.bak/python-iowait/python-iowait.hash deleted file mode 100644 index 67dac15f4a..0000000000 --- a/package.bak/python-iowait/python-iowait.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/iowait/json -md5 f49ca7766fe4a67e03a731e575614f87 iowait-0.2.tar.gz -# sha256 calculated by scanpypi -sha256 ab1bc2eb84c22ccf61f17a0024f9fb6df781b39f1852764a66a7769d5adfb299 iowait-0.2.tar.gz diff --git a/package.bak/python-iowait/python-iowait.mk b/package.bak/python-iowait/python-iowait.mk deleted file mode 100644 index 99c292287b..0000000000 --- a/package.bak/python-iowait/python-iowait.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-iowait -# -################################################################################ - -PYTHON_IOWAIT_VERSION = 0.2 -PYTHON_IOWAIT_SOURCE = iowait-$(PYTHON_IOWAIT_VERSION).tar.gz -PYTHON_IOWAIT_SITE = https://pypi.python.org/packages/65/30/e953673fe9619938e9c74408401cf865f37716da89f61f6e5d9328c0f71e -PYTHON_IOWAIT_SETUP_TYPE = distutils -PYTHON_IOWAIT_LICENSE = LGPLv3+ -PYTHON_IOWAIT_LICENSE_FILES = COPYING.LESSER - -$(eval $(python-package)) diff --git a/package.bak/python-ipaddr/Config.in b/package.bak/python-ipaddr/Config.in deleted file mode 100644 index 746d720d86..0000000000 --- a/package.bak/python-ipaddr/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDR - depends on BR2_PACKAGE_PYTHON # included since python3.3 - bool "python-ipaddr" - help - An IPv4/IPv6 manipulation library in Python. This library is - used to create/poke/manipulate IPv4 and IPv6 addresses and - prefixes. - - https://code.google.com/p/ipaddr-py/ diff --git a/package.bak/python-ipaddr/python-ipaddr.hash b/package.bak/python-ipaddr/python-ipaddr.hash deleted file mode 100644 index 99e1ca9415..0000000000 --- a/package.bak/python-ipaddr/python-ipaddr.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f2c7852f95862715f92e7d089dc3f2cf, sha256 locally computed -md5 f2c7852f95862715f92e7d089dc3f2cf ipaddr-2.1.11.tar.gz -sha256 1b555b8a8800134fdafe32b7d0cb52f5bdbfdd093707c3dd484c5ea59f1d98b7 ipaddr-2.1.11.tar.gz diff --git a/package.bak/python-ipaddr/python-ipaddr.mk b/package.bak/python-ipaddr/python-ipaddr.mk deleted file mode 100644 index 8bfb543791..0000000000 --- a/package.bak/python-ipaddr/python-ipaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddr -# -################################################################################ - -PYTHON_IPADDR_VERSION = 2.1.11 -PYTHON_IPADDR_SOURCE = ipaddr-$(PYTHON_IPADDR_VERSION).tar.gz -PYTHON_IPADDR_SITE = http://pypi.python.org/packages/source/i/ipaddr -PYTHON_IPADDR_SETUP_TYPE = distutils -PYTHON_IPADDR_LICENSE = Apache-2.0 -PYTHON_IPADDR_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/package.bak/python-ipaddress/Config.in b/package.bak/python-ipaddress/Config.in deleted file mode 100644 index b2b9f0b1c3..0000000000 --- a/package.bak/python-ipaddress/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPADDRESS - bool "python-ipaddress" - depends on BR2_PACKAGE_PYTHON - help - Python 3.3's ipaddress for older Python versions. - - https://github.com/phihag/ipaddress diff --git a/package.bak/python-ipaddress/python-ipaddress.hash b/package.bak/python-ipaddress/python-ipaddress.hash deleted file mode 100644 index a7c3803fd8..0000000000 --- a/package.bak/python-ipaddress/python-ipaddress.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/ipaddress/json, sha256 locally computed -md5 8bbf0326719fafb1f453921ef96729fe ipaddress-1.0.17.tar.gz -sha256 3a21c5a15f433710aaa26f1ae174b615973a25182006ae7f9c26de151cd51716 ipaddress-1.0.17.tar.gz diff --git a/package.bak/python-ipaddress/python-ipaddress.mk b/package.bak/python-ipaddress/python-ipaddress.mk deleted file mode 100644 index 5ff70d48e0..0000000000 --- a/package.bak/python-ipaddress/python-ipaddress.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipaddress -# -################################################################################ - -PYTHON_IPADDRESS_VERSION = 1.0.17 -PYTHON_IPADDRESS_SOURCE = ipaddress-$(PYTHON_IPADDRESS_VERSION).tar.gz -PYTHON_IPADDRESS_SITE = https://pypi.python.org/packages/bb/26/3b64955ff73f9e3155079b9ed31812afdfa5333b5c76387454d651ef593a -PYTHON_IPADDRESS_LICENSE = Python software foundation license -PYTHON_IPADDRESS_LICENSE_FILES = LICENSE -PYTHON_IPADDRESS_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-ipy/Config.in b/package.bak/python-ipy/Config.in deleted file mode 100644 index bead932da8..0000000000 --- a/package.bak/python-ipy/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPY - bool "python-ipy" - depends on BR2_PACKAGE_PYTHON - help - IPy - class and tools for handling of IPv4 and - IPv6 addresses and networks. - - https://github.com/haypo/python-ipy/ diff --git a/package.bak/python-ipy/python-ipy.hash b/package.bak/python-ipy/python-ipy.hash deleted file mode 100644 index ed93448b1d..0000000000 --- a/package.bak/python-ipy/python-ipy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/ipy/json, sha256 locally computed -md5 7b8c6eb4111b15aea31b67108e769712 IPy-0.83.tar.gz -sha256 61da5a532b159b387176f6eabf11946e7458b6df8fb8b91ff1d345ca7a6edab8 IPy-0.83.tar.gz diff --git a/package.bak/python-ipy/python-ipy.mk b/package.bak/python-ipy/python-ipy.mk deleted file mode 100644 index ec0d0d7f39..0000000000 --- a/package.bak/python-ipy/python-ipy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipy -# -################################################################################ - -PYTHON_IPY_VERSION = 0.83 -PYTHON_IPY_SOURCE = IPy-$(PYTHON_IPY_VERSION).tar.gz -PYTHON_IPY_SITE = https://pypi.python.org/packages/88/28/79162bfc351a3f1ab44d663ab3f03fb495806fdb592170990a1568ffbf63 -PYTHON_IPY_LICENSE = BSD-3c -PYTHON_IPY_LICENSE_FILES = COPYING -PYTHON_IPY_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-ipython/0001-set-correct-python-executable-path.patch b/package.bak/python-ipython/0001-set-correct-python-executable-path.patch deleted file mode 100644 index 0fbd5a1c8e..0000000000 --- a/package.bak/python-ipython/0001-set-correct-python-executable-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -Set correct Python executable path - -Signed-off-by: Philippe Proulx - ---- python-ipython-2.1.0/setupbase.py 2014-05-21 15:19:12.000000000 -0400 -+++ python-ipython-2.1.0-new/setupbase.py 2014-07-23 23:34:32.892030423 -0400 -@@ -394,7 +394,7 @@ class build_scripts_entrypt(build_script - - mod, func = entrypt.split(':') - with open(outfile, 'w') as f: -- f.write(script_src.format(executable=sys.executable, -+ f.write(script_src.format(executable='/usr/bin/env python', - mod=mod, func=func)) - - return outfiles, outfiles diff --git a/package.bak/python-ipython/Config.in b/package.bak/python-ipython/Config.in deleted file mode 100644 index 1d92873f82..0000000000 --- a/package.bak/python-ipython/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_IPYTHON - bool "python-ipython" - help - IPython is a command shell for interactive computing in multiple - programming languages, originally developed for the Python - programming language, that offers enhanced introspection, rich - media, additional shell syntax, tab completion, and rich history. - - http://ipython.org/ diff --git a/package.bak/python-ipython/python-ipython.hash b/package.bak/python-ipython/python-ipython.hash deleted file mode 100644 index 250a022561..0000000000 --- a/package.bak/python-ipython/python-ipython.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ca86a6308c4b53ea8a040ba776066dc9a7af4ac738ad43ab2059a016c09b0c2d ipython-2.1.0.tar.gz diff --git a/package.bak/python-ipython/python-ipython.mk b/package.bak/python-ipython/python-ipython.mk deleted file mode 100644 index 236462a561..0000000000 --- a/package.bak/python-ipython/python-ipython.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ipython -# -################################################################################ - -PYTHON_IPYTHON_VERSION = 2.1.0 -PYTHON_IPYTHON_SOURCE = ipython-$(PYTHON_IPYTHON_VERSION).tar.gz -PYTHON_IPYTHON_SITE = https://pypi.python.org/packages/source/i/ipython -PYTHON_IPYTHON_LICENSE = BSD-3c -PYTHON_IPYTHON_LICENSE_FILES = COPYING.rst -PYTHON_IPYTHON_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-itsdangerous/Config.in b/package.bak/python-itsdangerous/Config.in deleted file mode 100644 index 39ec0b7725..0000000000 --- a/package.bak/python-itsdangerous/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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.bak/python-itsdangerous/python-itsdangerous.hash b/package.bak/python-itsdangerous/python-itsdangerous.hash deleted file mode 100644 index a927b8b7ab..0000000000 --- a/package.bak/python-itsdangerous/python-itsdangerous.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b035b2da1d493b00a5ee7a5b750f96929de87b610643939fbe382902774626fc python-itsdangerous-0.24.tar.gz diff --git a/package.bak/python-itsdangerous/python-itsdangerous.mk b/package.bak/python-itsdangerous/python-itsdangerous.mk deleted file mode 100644 index 8b055d6da6..0000000000 --- a/package.bak/python-itsdangerous/python-itsdangerous.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# 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.bak/python-jinja2/Config.in b/package.bak/python-jinja2/Config.in deleted file mode 100644 index a1900e94d5..0000000000 --- a/package.bak/python-jinja2/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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.bak/python-jinja2/python-jinja2.hash b/package.bak/python-jinja2/python-jinja2.hash deleted file mode 100644 index 46ea75faa9..0000000000 --- a/package.bak/python-jinja2/python-jinja2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/jinja2/json, sha256 locally computed -md5 b151bfab6fb728fb7a06da4299161c74 Jinja2-2.9.4.tar.gz -sha256 aab8d8ca9f45624f1e77f2844bf3c144d180e97da8824c2a6d7552ad039b5442 Jinja2-2.9.4.tar.gz diff --git a/package.bak/python-jinja2/python-jinja2.mk b/package.bak/python-jinja2/python-jinja2.mk deleted file mode 100644 index 16b7b204ca..0000000000 --- a/package.bak/python-jinja2/python-jinja2.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# python-jinja2 -# -################################################################################ - -PYTHON_JINJA2_VERSION = 2.9.4 -PYTHON_JINJA2_SOURCE = Jinja2-$(PYTHON_JINJA2_VERSION).tar.gz -PYTHON_JINJA2_SITE = https://pypi.python.org/packages/f4/3f/28387a5bbc6883082c16784c6135440b94f9d5938fb156ff579798e18eda -PYTHON_JINJA2_SETUP_TYPE = setuptools -PYTHON_JINJA2_LICENSE = BSD-3c -PYTHON_JINJA2_LICENSE_FILES = LICENSE -# In host build, setup.py tries to download markupsafe if it is not installed -HOST_PYTHON_JINJA2_DEPENDENCIES = host-python-markupsafe - -# Both asyncsupport.py and asyncfilters.py use async feature, that is -# not available in Python 2 and some features available in Python 3.6. -# So in both cases *.py compilation would produce compiler errors. -# Hence remove both files after package extraction. -define PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT - rm $(@D)/jinja2/asyncsupport.py $(@D)/jinja2/asyncfilters.py -endef - -PYTHON_JINJA2_POST_EXTRACT_HOOKS = PYTHON_JINJA2_REMOVE_ASYNC_SUPPORT - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-json-schema-validator/Config.in b/package.bak/python-json-schema-validator/Config.in deleted file mode 100644 index 6ae1eb162a..0000000000 --- a/package.bak/python-json-schema-validator/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR - bool "python-json-schema-validator" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_VERSIONTOOLS - help - JSON Schema Validator - - https://pypi.python.org/pypi/json-schema-validator diff --git a/package.bak/python-json-schema-validator/python-json-schema-validator.hash b/package.bak/python-json-schema-validator/python-json-schema-validator.hash deleted file mode 100644 index 7360abab9a..0000000000 --- a/package.bak/python-json-schema-validator/python-json-schema-validator.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/json-schema-validator/json, sha256 locally computed -md5 7691b41739faaa8b0965279e72889932 json-schema-validator-2.4.1.tar.gz -sha256 1562a21d83e56231cef09b9aa2c06e8f845974bd26f24be293de6cab9a2fac91 json-schema-validator-2.4.1.tar.gz diff --git a/package.bak/python-json-schema-validator/python-json-schema-validator.mk b/package.bak/python-json-schema-validator/python-json-schema-validator.mk deleted file mode 100644 index 1456c349eb..0000000000 --- a/package.bak/python-json-schema-validator/python-json-schema-validator.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-json-schema-validator -# -################################################################################ - -PYTHON_JSON_SCHEMA_VALIDATOR_VERSION = 2.4.1 -PYTHON_JSON_SCHEMA_VALIDATOR_SOURCE = json-schema-validator-$(PYTHON_JSON_SCHEMA_VALIDATOR_VERSION).tar.gz -PYTHON_JSON_SCHEMA_VALIDATOR_SITE = https://pypi.python.org/packages/70/46/ba39cb7efad1898cfc89bf3588b8612f24d128f1c25b761994f524a59cef -PYTHON_JSON_SCHEMA_VALIDATOR_LICENSE = LGPLv3 -PYTHON_JSON_SCHEMA_VALIDATOR_SETUP_TYPE = setuptools -PYTHON_JSON_SCHEMA_VALIDATOR_DEPENDENCIES = python-versiontools - -$(eval $(python-package)) diff --git a/package.bak/python-jsonschema/Config.in b/package.bak/python-jsonschema/Config.in deleted file mode 100644 index 7002653722..0000000000 --- a/package.bak/python-jsonschema/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_JSONSCHEMA - bool "python-jsonschema" - help - An implementation of JSON Schema validation for Python. - - http://github.com/Julian/jsonschema diff --git a/package.bak/python-jsonschema/python-jsonschema.hash b/package.bak/python-jsonschema/python-jsonschema.hash deleted file mode 100644 index fc13630d66..0000000000 --- a/package.bak/python-jsonschema/python-jsonschema.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/jsonschema/json, sha256 locally computed -md5 374e848fdb69a3ce8b7e778b47c30640 jsonschema-2.5.1.tar.gz -sha256 36673ac378feed3daa5956276a829699056523d7961027911f064b52255ead41 jsonschema-2.5.1.tar.gz diff --git a/package.bak/python-jsonschema/python-jsonschema.mk b/package.bak/python-jsonschema/python-jsonschema.mk deleted file mode 100644 index 0fb2be869f..0000000000 --- a/package.bak/python-jsonschema/python-jsonschema.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-jsonschema -# -################################################################################ - -PYTHON_JSONSCHEMA_VERSION = 2.5.1 -PYTHON_JSONSCHEMA_SOURCE = jsonschema-$(PYTHON_JSONSCHEMA_VERSION).tar.gz -PYTHON_JSONSCHEMA_SITE = https://pypi.python.org/packages/58/0d/c816f5ea5adaf1293a1d81d32e4cdfdaf8496973aa5049786d7fdb14e7e7 -PYTHON_JSONSCHEMA_SETUP_TYPE = setuptools -PYTHON_JSONSCHEMA_LICENSE = MIT -PYTHON_JSONSCHEMA_LICENSE_FILES = COPYING json/LICENSE -PYTHON_JSONSCHEMA_DEPENDENCIES = host-python-vcversioner - -$(eval $(python-package)) diff --git a/package.bak/python-keyring/Config.in b/package.bak/python-keyring/Config.in deleted file mode 100644 index a6eacf52a5..0000000000 --- a/package.bak/python-keyring/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_KEYRING - bool "python-keyring" - depends on BR2_PACKAGE_PYTHON - help - The Python keyring lib provides a easy way to access the - system keyring service from Python. - - https://pypi.python.org/pypi/keyring diff --git a/package.bak/python-keyring/python-keyring.hash b/package.bak/python-keyring/python-keyring.hash deleted file mode 100644 index cd1683a7d1..0000000000 --- a/package.bak/python-keyring/python-keyring.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 c3f0665ee2d969170dcd6b9e83e76cc7fca2be5a40943700ce2624a0a02f9658 keyring-3.0.5.zip diff --git a/package.bak/python-keyring/python-keyring.mk b/package.bak/python-keyring/python-keyring.mk deleted file mode 100644 index ef8b8af261..0000000000 --- a/package.bak/python-keyring/python-keyring.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# python-keyring -# -################################################################################ - -PYTHON_KEYRING_VERSION = 3.0.5 -PYTHON_KEYRING_SOURCE = keyring-$(PYTHON_KEYRING_VERSION).zip -PYTHON_KEYRING_SITE = http://pypi.python.org/packages/source/k/keyring -PYTHON_KEYRING_SETUP_TYPE = setuptools -PYTHON_KEYRING_LICENSE = python software foundation license - -define PYTHON_KEYRING_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(PYTHON_KEYRING_SOURCE) - mv $(@D)/keyring-$(PYTHON_KEYRING_VERSION)/* $(@D) - $(RM) -r $(@D)/keyring-$(PYTHON_KEYRING_VERSION) -endef - -$(eval $(python-package)) diff --git a/package.bak/python-libconfig/Config.in b/package.bak/python-libconfig/Config.in deleted file mode 100644 index a222f9a130..0000000000 --- a/package.bak/python-libconfig/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -comment "python-libconfig needs a glibc or uClibc toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_PYTHON_LIBCONFIG - bool "python-libconfig" - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_PYTHON - select BR2_PACKAGE_LIBCONFIG - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - # error: invalid use of incomplete type 'struct _IO_FILE' - depends on !BR2_TOOLCHAIN_USES_MUSL - help - Python bindings to the C++ library libconfig - - Libconfig is a simple library for manipulating structured - configuration files. The file format is more compact and more - readable than XML. And unlike XML, it is type-aware, so it is - not necessary to do string parsing in application code. - http://www.hyperrealm.com/libconfig/ - - https://github.com/cnangel/python-libconfig diff --git a/package.bak/python-libconfig/python-libconfig.hash b/package.bak/python-libconfig/python-libconfig.hash deleted file mode 100644 index 3839043439..0000000000 --- a/package.bak/python-libconfig/python-libconfig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 f4cfb7e60b8fcee32ca3392c99932c579038db0852c1c2c42d7c4b859eea3c5c python-libconfig-b271c3d9dac938ad5cd29b67bd08cc5536a5a391.tar.gz diff --git a/package.bak/python-libconfig/python-libconfig.mk b/package.bak/python-libconfig/python-libconfig.mk deleted file mode 100644 index 3f5984b665..0000000000 --- a/package.bak/python-libconfig/python-libconfig.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-libconfig -# -################################################################################ - -PYTHON_LIBCONFIG_VERSION = b271c3d9dac938ad5cd29b67bd08cc5536a5a391 -PYTHON_LIBCONFIG_SITE = $(call github,cnangel,python-libconfig,$(PYTHON_LIBCONFIG_VERSION)) - -PYTHON_LIBCONFIG_LICENSE = BSD -PYTHON_LIBCONFIG_LICENSE_FILES = README - -PYTHON_LIBCONFIG_SETUP_TYPE = setuptools - -PYTHON_LIBCONFIG_DEPENDENCIES = libconfig boost - -$(eval $(python-package)) diff --git a/package.bak/python-lmdb/Config.in b/package.bak/python-lmdb/Config.in deleted file mode 100644 index baf9bce5ac..0000000000 --- a/package.bak/python-lmdb/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_LMDB - bool "python-lmdb" - select BR2_PACKAGE_PYTHON_CFFI # runtime - help - Universal Python binding for the LMDB 'Lightning' Database. - - https://pypi.python.org/pypi/lmdb diff --git a/package.bak/python-lmdb/python-lmdb.hash b/package.bak/python-lmdb/python-lmdb.hash deleted file mode 100644 index 7c2946044d..0000000000 --- a/package.bak/python-lmdb/python-lmdb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 abd2b2ae9ecf2fd1e1bc55ef4e8463b5910722fcd70a1bbf34a3e669a74a41a4 python-lmdb-py-lmdb_0.89.tar.gz diff --git a/package.bak/python-lmdb/python-lmdb.mk b/package.bak/python-lmdb/python-lmdb.mk deleted file mode 100644 index 62fb0465b1..0000000000 --- a/package.bak/python-lmdb/python-lmdb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-lmdb -# -################################################################################ - -PYTHON_LMDB_VERSION = py-lmdb_0.89 -PYTHON_LMDB_SITE = $(call github,dw,py-lmdb,$(PYTHON_LMDB_VERSION)) -PYTHON_LMDB_LICENSE = OLDAP-2.8 -PYTHON_LMDB_LICENSE_FILES = LICENSE -PYTHON_LMDB_SETUP_TYPE = setuptools -PYTHON_LMDB_DEPENDENCIES = host-python-cffi - -$(eval $(python-package)) diff --git a/package.bak/python-logbook/Config.in b/package.bak/python-logbook/Config.in deleted file mode 100644 index 9ae914432d..0000000000 --- a/package.bak/python-logbook/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_LOGBOOK - bool "python-logbook" - help - A logging replacement for Python. - - http://logbook.pocoo.org/ diff --git a/package.bak/python-logbook/python-logbook.hash b/package.bak/python-logbook/python-logbook.hash deleted file mode 100644 index 1a79046c3d..0000000000 --- a/package.bak/python-logbook/python-logbook.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/logbook/json, sha256 locally computed -md5 22fea705e067c118925898f0c30b0508 Logbook-1.0.0.tar.gz -sha256 87da2515a6b3db866283cb9d4e5a6ec44e52a1d556ebb2ea3b6e7e704b5f1872 Logbook-1.0.0.tar.gz diff --git a/package.bak/python-logbook/python-logbook.mk b/package.bak/python-logbook/python-logbook.mk deleted file mode 100644 index 291237973a..0000000000 --- a/package.bak/python-logbook/python-logbook.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-logbook -# -################################################################################ - -PYTHON_LOGBOOK_VERSION = 1.0.0 -PYTHON_LOGBOOK_SOURCE = Logbook-$(PYTHON_LOGBOOK_VERSION).tar.gz -PYTHON_LOGBOOK_SITE = https://pypi.python.org/packages/34/e8/6419c217bbf464fe8a902418120cccaf476201bd03b50958db24d6e90f65 -PYTHON_LOGBOOK_SETUP_TYPE = setuptools -PYTHON_LOGBOOK_LICENSE = BSD-3c - -$(eval $(python-package)) diff --git a/package.bak/python-lxml/Config.in b/package.bak/python-lxml/Config.in deleted file mode 100644 index 1ccaa5e387..0000000000 --- a/package.bak/python-lxml/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_LXML - bool "python-lxml" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_ZLIB - help - The lxml XML toolkit is a Pythonic binding for the C libraries - libxml2 and libxslt. - - http://lxml.de/ diff --git a/package.bak/python-lxml/python-lxml.hash b/package.bak/python-lxml/python-lxml.hash deleted file mode 100644 index a1dc09391b..0000000000 --- a/package.bak/python-lxml/python-lxml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 59d9176360dbc3919e9d4bfca85c1ca64ab4f4ee00e6f119d7150ba887e3410a lxml-3.7.2.tgz diff --git a/package.bak/python-lxml/python-lxml.mk b/package.bak/python-lxml/python-lxml.mk deleted file mode 100644 index 62c2980b01..0000000000 --- a/package.bak/python-lxml/python-lxml.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# python-lxml -# -################################################################################ - -PYTHON_LXML_VERSION = 3.7.2 -PYTHON_LXML_SITE = http://lxml.de/files -PYTHON_LXML_SOURCE = lxml-$(PYTHON_LXML_VERSION).tgz - -# Not including the GPL, because it is used only for the test scripts. -PYTHON_LXML_LICENSE = BSD-3c, Others -PYTHON_LXML_LICENSE_FILES = \ - LICENSES.txt \ - doc/licenses/BSD.txt \ - doc/licenses/elementtree.txt \ - src/lxml/isoschematron/resources/rng/iso-schematron.rng - -# python-lxml can use either setuptools, or distutils as a fallback. -# So, we use setuptools. -PYTHON_LXML_SETUP_TYPE = setuptools - -PYTHON_LXML_DEPENDENCIES = libxml2 libxslt zlib - -# python-lxml needs these scripts in order to properly detect libxml2 and -# libxslt compiler and linker flags -PYTHON_LXML_BUILD_OPTS = \ - --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config \ - --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config - -$(eval $(python-package)) diff --git a/package.bak/python-mad/Config.in b/package.bak/python-mad/Config.in deleted file mode 100644 index 25354213d6..0000000000 --- a/package.bak/python-mad/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAD - bool "python-mad" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBMAD - help - python-mad is a Python binding for the MAD library, a - high-quality integer-only MPEG decoder. - - http://spacepants.org/src/pymad/ diff --git a/package.bak/python-mad/python-mad.hash b/package.bak/python-mad/python-mad.hash deleted file mode 100644 index ab91c3fe44..0000000000 --- a/package.bak/python-mad/python-mad.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 1c9fc529b78de7d26e9e47cf182c9f8bf43838d8f62a9c1773540d57f5ebc522 pymad-0.6.tar.gz diff --git a/package.bak/python-mad/python-mad.mk b/package.bak/python-mad/python-mad.mk deleted file mode 100644 index 5a49887a82..0000000000 --- a/package.bak/python-mad/python-mad.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# python-mad -# -################################################################################ - -PYTHON_MAD_VERSION = 0.6 -PYTHON_MAD_SOURCE = pymad-$(PYTHON_MAD_VERSION).tar.gz -PYTHON_MAD_SITE = http://spacepants.org/src/pymad/download -PYTHON_MAD_SETUP_TYPE = distutils -PYTHON_MAD_LICENSE = GPLv2+ -PYTHON_MAD_LICENSE_FILES = COPYING - -PYTHON_MAD_DEPENDENCIES = libmad - -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_MAD_ENDIAN = little -else -PYTHON_MAD_ENDIAN = big -endif - -define PYTHON_MAD_CONFIGURE_CMDS - echo "endian = $(PYTHON_MAD_ENDIAN)" > $(@D)/Setup - echo "mad_libs = mad" >> $(@D)/Setup - echo "mad_lib_dir = $(STAGING_DIR)/usr/lib" >> $(@D)/Setup - echo "mad_include_dir = $(STAGING_DIR)/usr/include" >> $(@D)/Setup -endef - -$(eval $(python-package)) diff --git a/package.bak/python-mako/Config.in b/package.bak/python-mako/Config.in deleted file mode 100644 index 442e290efa..0000000000 --- a/package.bak/python-mako/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_MAKO - bool "python-mako" - help - Mako is a template library written in Python. It provides a - familiar, non-XML syntax which compiles into Python modules - for maximum performance. - - https://pypi.python.org/pypi/Mako diff --git a/package.bak/python-mako/python-mako.hash b/package.bak/python-mako/python-mako.hash deleted file mode 100644 index b6a74f3dd1..0000000000 --- a/package.bak/python-mako/python-mako.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/Mako/json, sha256 locally computed -md5 c5fc31a323dd4990683d2f2da02d4e20 Mako-1.0.4.tar.gz -sha256 fed99dbe4d0ddb27a33ee4910d8708aca9ef1fe854e668387a9ab9a90cbf9059 Mako-1.0.4.tar.gz diff --git a/package.bak/python-mako/python-mako.mk b/package.bak/python-mako/python-mako.mk deleted file mode 100644 index 88ce13efd3..0000000000 --- a/package.bak/python-mako/python-mako.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# python-mako -# -################################################################################ - -PYTHON_MAKO_VERSION = 1.0.4 -PYTHON_MAKO_SOURCE = Mako-$(PYTHON_MAKO_VERSION).tar.gz -PYTHON_MAKO_SITE = https://pypi.python.org/packages/7a/ae/925434246ee90b42e8ef57d3b30a0ab7caf9a2de3e449b876c56dcb48155 -PYTHON_MAKO_SETUP_TYPE = setuptools -PYTHON_MAKO_LICENSE = MIT -PYTHON_MAKO_LICENSE_FILES = LICENSE - -# In host build, setup.py tries to download markupsafe if it is not installed -HOST_PYTHON_MAKO_DEPENDENCIES = host-python-markupsafe - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-markdown/Config.in b/package.bak/python-markdown/Config.in deleted file mode 100644 index 6706684142..0000000000 --- a/package.bak/python-markdown/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_MARKDOWN - bool "python-markdown" - # runtime dependency on Python's xml module - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - help - This is a Python implementation of John Gruber's Markdown - - https://pypi.python.org/pypi/Markdown diff --git a/package.bak/python-markdown/python-markdown.hash b/package.bak/python-markdown/python-markdown.hash deleted file mode 100644 index d30faaedda..0000000000 --- a/package.bak/python-markdown/python-markdown.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/markdown/json, sha256 locally computed -md5 a06f1c5d462b32e0e8da014e9eebb0d9 Markdown-2.6.7.tar.gz -sha256 daebf24846efa7ff269cfde8c41a48bb2303920c7b2c7c5e04fa82e6282d05c0 Markdown-2.6.7.tar.gz diff --git a/package.bak/python-markdown/python-markdown.mk b/package.bak/python-markdown/python-markdown.mk deleted file mode 100644 index fb87ada759..0000000000 --- a/package.bak/python-markdown/python-markdown.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-markdown -# -################################################################################ - -PYTHON_MARKDOWN_VERSION = 2.6.7 -PYTHON_MARKDOWN_SOURCE = Markdown-$(PYTHON_MARKDOWN_VERSION).tar.gz -PYTHON_MARKDOWN_SITE = https://pypi.python.org/packages/d4/32/642bd580c577af37b00a1eb59b0eaa996f2d11dfe394f3dd0c7a8a2de81a -PYTHON_MARKDOWN_LICENSE = BSD-3c -PYTHON_MARKDOWN_LICENSE_FILES = LICENSE.md -PYTHON_MARKDOWN_SETUP_TYPE = distutils - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-markdown2/Config.in b/package.bak/python-markdown2/Config.in deleted file mode 100644 index 8fe2332491..0000000000 --- a/package.bak/python-markdown2/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_MARKDOWN2 - bool "python-markdown2" - help - A fast and complete Python implementation of Markdown. - - https://github.com/trentm/python-markdown2 diff --git a/package.bak/python-markdown2/python-markdown2.hash b/package.bak/python-markdown2/python-markdown2.hash deleted file mode 100644 index 17ae7d901d..0000000000 --- a/package.bak/python-markdown2/python-markdown2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 07e077f5d4aa5f1e2f061f9f94d9e22f9ea266411b8c557b9164fc0e6dff0595 python-markdown2-2.3.2.tar.gz diff --git a/package.bak/python-markdown2/python-markdown2.mk b/package.bak/python-markdown2/python-markdown2.mk deleted file mode 100644 index 1e343b43ff..0000000000 --- a/package.bak/python-markdown2/python-markdown2.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-markdown2 -# -################################################################################ - -PYTHON_MARKDOWN2_VERSION = 2.3.2 -PYTHON_MARKDOWN2_SITE = $(call github,trentm,python-markdown2,$(PYTHON_MARKDOWN2_VERSION)) -PYTHON_MARKDOWN2_SETUP_TYPE = distutils -PYTHON_MARKDOWN2_LICENSE = MIT -PYTHON_MARKDOWN2_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-markupsafe/Config.in b/package.bak/python-markupsafe/Config.in deleted file mode 100644 index 48421e0a32..0000000000 --- a/package.bak/python-markupsafe/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -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.bak/python-markupsafe/python-markupsafe.hash b/package.bak/python-markupsafe/python-markupsafe.hash deleted file mode 100644 index 448252b0d0..0000000000 --- a/package.bak/python-markupsafe/python-markupsafe.hash +++ /dev/null @@ -1,3 +0,0 @@ -# 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.bak/python-markupsafe/python-markupsafe.mk b/package.bak/python-markupsafe/python-markupsafe.mk deleted file mode 100644 index c815728cd5..0000000000 --- a/package.bak/python-markupsafe/python-markupsafe.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# 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)) -$(eval $(host-python-package)) diff --git a/package.bak/python-mbstrdecoder/Config.in b/package.bak/python-mbstrdecoder/Config.in deleted file mode 100644 index 017002c97a..0000000000 --- a/package.bak/python-mbstrdecoder/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_MBSTRDECODER - bool "python-mbstrdecoder" - help - multi-byte character string decoder. - - https://github.com/thombashi/mbstrdecoder diff --git a/package.bak/python-mbstrdecoder/python-mbstrdecoder.hash b/package.bak/python-mbstrdecoder/python-mbstrdecoder.hash deleted file mode 100644 index 1389ac3a86..0000000000 --- a/package.bak/python-mbstrdecoder/python-mbstrdecoder.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/mbstrdecoder/json, sha256 locally computed -md5 5548c4748cf0bc16befcf7ef848f95ff mbstrdecoder-0.1.0.tar.gz -sha256 7c65c4ea6681729ddfdb7612ac39f5accb10abb4e838ca810d810931ec023aad mbstrdecoder-0.1.0.tar.gz diff --git a/package.bak/python-mbstrdecoder/python-mbstrdecoder.mk b/package.bak/python-mbstrdecoder/python-mbstrdecoder.mk deleted file mode 100644 index f64bde95f2..0000000000 --- a/package.bak/python-mbstrdecoder/python-mbstrdecoder.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-mbstrdecoder -# -################################################################################ - -PYTHON_MBSTRDECODER_VERSION = 0.1.0 -PYTHON_MBSTRDECODER_SOURCE = mbstrdecoder-$(PYTHON_MBSTRDECODER_VERSION).tar.gz -PYTHON_MBSTRDECODER_SITE = https://pypi.python.org/packages/e4/10/fa3d8716b28e2b37eba1edab1c6831a56b805032328279c14fc99d37c391 -PYTHON_MBSTRDECODER_SETUP_TYPE = setuptools -PYTHON_MBSTRDECODER_LICENSE = MIT -PYTHON_MBSTRDECODER_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-meld3/Config.in b/package.bak/python-meld3/Config.in deleted file mode 100644 index 9366b3cda5..0000000000 --- a/package.bak/python-meld3/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_MELD3 - bool "python-meld3" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - help - A HTML/XML templating system. - - https://github.com/supervisor/meld3 diff --git a/package.bak/python-meld3/python-meld3.hash b/package.bak/python-meld3/python-meld3.hash deleted file mode 100644 index c7d9025e7c..0000000000 --- a/package.bak/python-meld3/python-meld3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/meld3/json, sha256 locally computed -md5 3ccc78cd79cffd63a751ad7684c02c91 meld3-1.0.2.tar.gz -sha256 f7b754a0fde7a4429b2ebe49409db240b5699385a572501bb0d5627d299f9558 meld3-1.0.2.tar.gz diff --git a/package.bak/python-meld3/python-meld3.mk b/package.bak/python-meld3/python-meld3.mk deleted file mode 100644 index 529425c8b1..0000000000 --- a/package.bak/python-meld3/python-meld3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-meld3 -# -################################################################################ - -PYTHON_MELD3_VERSION = 1.0.2 -PYTHON_MELD3_SOURCE = meld3-$(PYTHON_MELD3_VERSION).tar.gz -PYTHON_MELD3_SITE = https://pypi.python.org/packages/45/a0/317c6422b26c12fe0161e936fc35f36552069ba8e6f7ecbd99bbffe32a5f -PYTHON_MELD3_LICENSE = ZPLv2.1 -PYTHON_MELD3_LICENSE_FILES = COPYRIGHT.txt LICENSE.txt -PYTHON_MELD3_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-mistune/Config.in b/package.bak/python-mistune/Config.in deleted file mode 100644 index e62689d0a7..0000000000 --- a/package.bak/python-mistune/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_MISTUNE - bool "python-mistune" - help - The fastest markdown parser in pure Python with renderer - features, inspired by marked. - - https://pypi.python.org/pypi/mistune diff --git a/package.bak/python-mistune/python-mistune.hash b/package.bak/python-mistune/python-mistune.hash deleted file mode 100644 index cfc6a25e2c..0000000000 --- a/package.bak/python-mistune/python-mistune.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/mistune/json, sha256 locally computed -md5 4eba50bd121b83716fa4be6a4049004b mistune-0.7.3.tar.gz -sha256 21d0e869df3b9189f248e022f1c9763cf9069e1a2f00676f1f1852bd7f98b713 mistune-0.7.3.tar.gz diff --git a/package.bak/python-mistune/python-mistune.mk b/package.bak/python-mistune/python-mistune.mk deleted file mode 100644 index 91e97e8635..0000000000 --- a/package.bak/python-mistune/python-mistune.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-mistune -# -################################################################################ - -PYTHON_MISTUNE_VERSION = 0.7.3 -PYTHON_MISTUNE_SOURCE = mistune-$(PYTHON_MISTUNE_VERSION).tar.gz -PYTHON_MISTUNE_SITE = https://pypi.python.org/packages/88/1e/be99791262b3a794332fda598a07c2749a433b9378586361ba9d8e824607 -PYTHON_MISTUNE_LICENSE = BSD-3c -PYTHON_MISTUNE_LICENSE_FILES = LICENSE -PYTHON_MISTUNE_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-msgpack/Config.in b/package.bak/python-msgpack/Config.in deleted file mode 100644 index 7dfe8e81f1..0000000000 --- a/package.bak/python-msgpack/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_MSGPACK - bool "python-msgpack" - select BR2_PACKAGE_MSGPACK - depends on BR2_INSTALL_LIBSTDCPP # msgpack - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # msgpack - help - MessagePack (http://msgpack.org/) is a fast, compact binary - serialization format, suitable for similar data to JSON. - This package provides CPython bindings for reading and - writing MessagePack data. - - https://pypi.python.org/pypi/msgpack-python/ - -comment "python-msgpack needs a toolchain w/ C++" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-msgpack/python-msgpack.hash b/package.bak/python-msgpack/python-msgpack.hash deleted file mode 100644 index 636aa905e2..0000000000 --- a/package.bak/python-msgpack/python-msgpack.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=eb2aad1081534ef3a9f32a0ecd350b9b, sha356 locally computed. -md5 eb2aad1081534ef3a9f32a0ecd350b9b msgpack-python-0.4.7.tar.gz -sha256 5e001229a54180a02dcdd59db23c9978351af55b1290c27bc549e381f43acd6b msgpack-python-0.4.7.tar.gz diff --git a/package.bak/python-msgpack/python-msgpack.mk b/package.bak/python-msgpack/python-msgpack.mk deleted file mode 100644 index 344b7bf150..0000000000 --- a/package.bak/python-msgpack/python-msgpack.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-msgpack -# -################################################################################ - -PYTHON_MSGPACK_VERSION = 0.4.7 -PYTHON_MSGPACK_SOURCE = msgpack-python-$(PYTHON_MSGPACK_VERSION).tar.gz -PYTHON_MSGPACK_SITE = https://pypi.python.org/packages/source/m/msgpack-python -PYTHON_MSGPACK_LICENSE = Apache-2.0 -PYTHON_MSGPACK_LICENSE_FILES = COPYING -PYTHON_MSGPACK_SETUP_TYPE = setuptools -PYTHON_MSGPACK_DEPENDENCIES = msgpack - -$(eval $(python-package)) diff --git a/package.bak/python-mutagen/Config.in b/package.bak/python-mutagen/Config.in deleted file mode 100644 index 470cd996a7..0000000000 --- a/package.bak/python-mutagen/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_PYTHON_MUTAGEN - bool "python-mutagen" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - help - Mutagen is a Python module to handle audio metadata. It - supports ASF, FLAC, MP4, Monkey’s Audio, MP3, Musepack, Ogg - Opus, Ogg FLAC, Ogg Speex, Ogg Theora, Ogg Vorbis, True - Audio, WavPack, OptimFROG, and AIFF audio files. All - versions of ID3v2 are supported, and all standard ID3v2.4 - frames are parsed. - - It can read Xing headers to accurately calculate the bitrate - and length of MP3s. ID3 and APEv2 tags can be edited - regardless of audio format. It can also manipulate Ogg - streams on an individual packet/page level. - - https://mutagen.readthedocs.io/en/latest/ diff --git a/package.bak/python-mutagen/python-mutagen.hash b/package.bak/python-mutagen/python-mutagen.hash deleted file mode 100644 index 8970a23f8f..0000000000 --- a/package.bak/python-mutagen/python-mutagen.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/mutagen, sha256 locally computed -md5 2bd50519d64411626fa22d405afbf078 mutagen-1.36.tar.gz -sha256 d7ee37e33b8c5893c3ebf66edac31241eb9d48e1dc7ec647bbfbc180565a4bcd mutagen-1.36.tar.gz diff --git a/package.bak/python-mutagen/python-mutagen.mk b/package.bak/python-mutagen/python-mutagen.mk deleted file mode 100644 index 8458de5500..0000000000 --- a/package.bak/python-mutagen/python-mutagen.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-mutagen -# -################################################################################ - -PYTHON_MUTAGEN_VERSION = 1.36 -PYTHON_MUTAGEN_SOURCE = mutagen-$(PYTHON_MUTAGEN_VERSION).tar.gz -PYTHON_MUTAGEN_SITE = https://pypi.python.org/packages/69/14/4a5c8360a727563291a7159de935ffff2b99ee783928169f0fea7445370f -PYTHON_MUTAGEN_LICENSE = GPLv2 -PYTHON_MUTAGEN_LICENSE_FILES = COPYING -PYTHON_MUTAGEN_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch b/package.bak/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch deleted file mode 100644 index ac7838a7f7..0000000000 --- a/package.bak/python-mwclient/0001-use-exec-in-py3-compatible-manner.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5de1bb82465d39962e26175c62f644a3e423d030 Mon Sep 17 00:00:00 2001 -From: Adam Williamson -Date: Thu, 21 Jan 2016 17:21:52 -0800 -Subject: [PATCH] use 'exec' in py3-compatible manner - -per https://docs.python.org/2/reference/simple_stmts.html , -as exec is a function not a statement in py3, the py2 version -has been set to allow the subsequent statement to be a tuple, -so we can invoke it like this to make it both py2 and py3 -compatible. Without this, byte-compiling the file fails under -py3. - -Signed-off-by: Bernd Kuhls ---- -downloaded from upstream commit: -https://github.com/mwclient/mwclient/commit/5de1bb82465d39962e26175c62f644a3e423d030 - - mwclient/ex.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mwclient/ex.py b/mwclient/ex.py -index db4006c..c0b1eae 100644 ---- a/mwclient/ex.py -+++ b/mwclient/ex.py -@@ -12,7 +12,7 @@ def read_config(config_files, **predata): - - def _read_config_file(_config_file, predata): - _file = open(_config_file) -- exec _file in globals(), predata -+ exec(_file, globals(), predata) - _file.close() - - for _k, _v in predata.iteritems(): --- -2.9.3 - diff --git a/package.bak/python-mwclient/Config.in b/package.bak/python-mwclient/Config.in deleted file mode 100644 index be8897864c..0000000000 --- a/package.bak/python-mwclient/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_MWCLIENT - bool "python-mwclient" - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - help - MediaWiki API client. - - https://github.com/btongminh/mwclient diff --git a/package.bak/python-mwclient/python-mwclient.hash b/package.bak/python-mwclient/python-mwclient.hash deleted file mode 100644 index 109897173e..0000000000 --- a/package.bak/python-mwclient/python-mwclient.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/mwclient/json, sha256 locally computed -md5 c1334facf2d6ca54fe6dba4ab75ecf34 mwclient-0.8.1.tar.gz -sha256 5f892711cc0b23ff2a6d8b7986ee63cd43fd1ec92b0783604ffa7613cd1662e4 mwclient-0.8.1.tar.gz diff --git a/package.bak/python-mwclient/python-mwclient.mk b/package.bak/python-mwclient/python-mwclient.mk deleted file mode 100644 index 1f1e209661..0000000000 --- a/package.bak/python-mwclient/python-mwclient.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-mwclient -# -################################################################################ - -PYTHON_MWCLIENT_VERSION = 0.8.1 -PYTHON_MWCLIENT_SOURCE = mwclient-$(PYTHON_MWCLIENT_VERSION).tar.gz -PYTHON_MWCLIENT_SITE = https://pypi.python.org/packages/19/79/481b288a497f625ee8f76141ff3472d81428b1f14b7155a28a63a3247197 -PYTHON_MWCLIENT_LICENSE = MIT -PYTHON_MWCLIENT_LICENSE_FILES = mwclient/__init__.py -PYTHON_MWCLIENT_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-mwscrape/Config.in b/package.bak/python-mwscrape/Config.in deleted file mode 100644 index 273ce9a4a8..0000000000 --- a/package.bak/python-mwscrape/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_MWSCRAPE - bool "python-mwscrape" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_COUCHDB # runtime - select BR2_PACKAGE_PYTHON_FUTURES # runtime - select BR2_PACKAGE_PYTHON_MWCLIENT # runtime - select BR2_PACKAGE_PYTHON_PYLRU # runtime - help - Download rendered articles from MediaWiki API to CouchDB - - https://github.com/itkach/mwscrape diff --git a/package.bak/python-mwscrape/python-mwscrape.hash b/package.bak/python-mwscrape/python-mwscrape.hash deleted file mode 100644 index b91ef69a28..0000000000 --- a/package.bak/python-mwscrape/python-mwscrape.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 8de8a5ef257851f6e1e41247f64710f48859a5e3f91ebc7200bb60769f02f296 python-mwscrape-6a58d7801eb1e884fd0516f1adbedbd4481c10e6.tar.gz diff --git a/package.bak/python-mwscrape/python-mwscrape.mk b/package.bak/python-mwscrape/python-mwscrape.mk deleted file mode 100644 index 47b943f45f..0000000000 --- a/package.bak/python-mwscrape/python-mwscrape.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-mwscrape -# -################################################################################ - -PYTHON_MWSCRAPE_VERSION = 6a58d7801eb1e884fd0516f1adbedbd4481c10e6 -PYTHON_MWSCRAPE_SITE = $(call github,itkach,mwscrape,$(PYTHON_MWSCRAPE_VERSION)) -PYTHON_MWSCRAPE_LICENSE = MPL-2.0 -PYTHON_MWSCRAPE_LICENSE_FILES = LICENSE.txt -PYTHON_MWSCRAPE_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-mwscrape2slob/Config.in b/package.bak/python-mwscrape2slob/Config.in deleted file mode 100644 index 799ab29c34..0000000000 --- a/package.bak/python-mwscrape2slob/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_PYTHON_MWSCRAPE2SLOB - bool "python-mwscrape2slob" - depends on !BR2_BINFMT_FLAT # python-slob -> python-pyicu -> icu - depends on BR2_INSTALL_LIBSTDCPP # python-slob -> python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_COUCHDB # runtime - select BR2_PACKAGE_PYTHON_CSSSELECT # runtime - select BR2_PACKAGE_PYTHON_CSSUTILS # runtime - select BR2_PACKAGE_PYTHON_LXML # runtime - select BR2_PACKAGE_PYTHON_SLOB # runtime - help - A tool to create slob with content from a MediaWiki CouchDB - created by mwscrape. - - https://github.com/itkach/mwscrape2slob - -comment "python-mwscrape2slob needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-mwscrape2slob/python-mwscrape2slob.hash b/package.bak/python-mwscrape2slob/python-mwscrape2slob.hash deleted file mode 100644 index f1f5e4f166..0000000000 --- a/package.bak/python-mwscrape2slob/python-mwscrape2slob.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 367ffc3203f7eb2cc26211f58c0693526652d9a238af48c88f936920e804faf7 python-mwscrape2slob-0f9124ed62009dff6a230947d80340f5a61a6f49.tar.gz diff --git a/package.bak/python-mwscrape2slob/python-mwscrape2slob.mk b/package.bak/python-mwscrape2slob/python-mwscrape2slob.mk deleted file mode 100644 index 4d27d8d6ea..0000000000 --- a/package.bak/python-mwscrape2slob/python-mwscrape2slob.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-mwscrape2slob -# -################################################################################ - -PYTHON_MWSCRAPE2SLOB_VERSION = 0f9124ed62009dff6a230947d80340f5a61a6f49 -PYTHON_MWSCRAPE2SLOB_SITE = $(call github,itkach,mwscrape2slob,$(PYTHON_MWSCRAPE2SLOB_VERSION)) -PYTHON_MWSCRAPE2SLOB_LICENSE = GPLv3, Apache-2.0 (MathJax), GPL (MediaWiki monobook style sheet) -PYTHON_MWSCRAPE2SLOB_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-netaddr/Config.in b/package.bak/python-netaddr/Config.in deleted file mode 100644 index 534d136f06..0000000000 --- a/package.bak/python-netaddr/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_NETADDR - bool "python-netaddr" - help - A network address manipulation library for Python. - - https://pypi.python.org/pypi/netaddr diff --git a/package.bak/python-netaddr/python-netaddr.hash b/package.bak/python-netaddr/python-netaddr.hash deleted file mode 100644 index 5fcdda4539..0000000000 --- a/package.bak/python-netaddr/python-netaddr.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=c65bb34f8bedfbbca0b316c490cd13a0, sha256 locally computed. -md5 c65bb34f8bedfbbca0b316c490cd13a0 netaddr-0.7.18.tar.gz -sha256 a1f5c9fcf75ac2579b9995c843dade33009543c04f218ff7c007b3c81695bd19 netaddr-0.7.18.tar.gz diff --git a/package.bak/python-netaddr/python-netaddr.mk b/package.bak/python-netaddr/python-netaddr.mk deleted file mode 100644 index c68b24fca1..0000000000 --- a/package.bak/python-netaddr/python-netaddr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-netaddr -# -################################################################################ - -PYTHON_NETADDR_VERSION = 0.7.18 -PYTHON_NETADDR_SOURCE = netaddr-$(PYTHON_NETADDR_VERSION).tar.gz -PYTHON_NETADDR_SITE = http://pypi.python.org/packages/source/n/netaddr -PYTHON_NETADDR_LICENSE = BSD-3c -PYTHON_NETADDR_LICENSE_FILES = LICENSE -PYTHON_NETADDR_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-netifaces/Config.in b/package.bak/python-netifaces/Config.in deleted file mode 100644 index 1f54f4bd18..0000000000 --- a/package.bak/python-netifaces/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_NETIFACES - bool "python-netifaces" - help - Portable access to network interfaces from Python. - - http://alastairs-place.net/projects/netifaces diff --git a/package.bak/python-netifaces/python-netifaces.hash b/package.bak/python-netifaces/python-netifaces.hash deleted file mode 100644 index 6f3e358b08..0000000000 --- a/package.bak/python-netifaces/python-netifaces.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/netifaces/json, sha256 locally computed -md5 5b4d1f1310ed279e6df27ef3a9b71519 netifaces-0.10.5.tar.gz -sha256 59d8ad52dd3116fcb6635e175751b250dc783fb011adba539558bd764e5d628b netifaces-0.10.5.tar.gz diff --git a/package.bak/python-netifaces/python-netifaces.mk b/package.bak/python-netifaces/python-netifaces.mk deleted file mode 100644 index 3e01c24805..0000000000 --- a/package.bak/python-netifaces/python-netifaces.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-netifaces -# -################################################################################ - -PYTHON_NETIFACES_VERSION = 0.10.5 -PYTHON_NETIFACES_SOURCE = netifaces-$(PYTHON_NETIFACES_VERSION).tar.gz -PYTHON_NETIFACES_SITE = https://pypi.python.org/packages/a7/4c/8e0771a59fd6e55aac993a7cc1b6a0db993f299514c464ae6a1ecf83b31d -PYTHON_NETIFACES_LICENSE = MIT -PYTHON_NETIFACES_LICENSE_FILES = README.rst -PYTHON_NETIFACES_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-networkmanager/Config.in b/package.bak/python-networkmanager/Config.in deleted file mode 100644 index fcbce5748d..0000000000 --- a/package.bak/python-networkmanager/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -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.bak/python-networkmanager/python-networkmanager.hash b/package.bak/python-networkmanager/python-networkmanager.hash deleted file mode 100644 index cbd6febcd1..0000000000 --- a/package.bak/python-networkmanager/python-networkmanager.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=97c84c19b84b1124903a06379b107f77, sha256 locally computed -md5 97c84c19b84b1124903a06379b107f77 python-networkmanager-1.2.1.tar.gz -sha256 7107c07383f8077cfac33fdbb3c4cda4de40be20a6b20d30840055eb519a0e89 python-networkmanager-1.2.1.tar.gz diff --git a/package.bak/python-networkmanager/python-networkmanager.mk b/package.bak/python-networkmanager/python-networkmanager.mk deleted file mode 100644 index 875748f3ab..0000000000 --- a/package.bak/python-networkmanager/python-networkmanager.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-networkmanager -# -################################################################################ - -PYTHON_NETWORKMANAGER_VERSION = 1.2.1 -PYTHON_NETWORKMANAGER_SITE = https://pypi.python.org/packages/e7/b1/09993250ceea9e03bc65fbabcd5286540200292c011b22237b2963c11471 -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.bak/python-nfc/0001-add-setup-py.patch b/package.bak/python-nfc/0001-add-setup-py.patch deleted file mode 100644 index 5a5145271b..0000000000 --- a/package.bak/python-nfc/0001-add-setup-py.patch +++ /dev/null @@ -1,26 +0,0 @@ -Add simple setup.py - -Having a setup.py allows to easily get the .py files compiled into -.pyc, which is good because by default, Buildroot only keeps .pyc -files on the target. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- /dev/null -+++ b/setup.py -@@ -0,0 +1,13 @@ -+#!/usr/bin/env python -+ -+from distutils.core import setup -+ -+setup(name='NFC', -+ version='1.0', -+ description='Python NFC', -+ author='Stephen Tiedemann', -+ author_email='stephen.tiedemann@googlemail.com', -+ url='https://launchpad.net/nfcpy', -+ packages=['nfc', 'nfc/dev', 'nfc/llcp', 'nfc/ndef', -+ 'nfc/snep'], -+ ) diff --git a/package.bak/python-nfc/Config.in b/package.bak/python-nfc/Config.in deleted file mode 100644 index 9a8102c23c..0000000000 --- a/package.bak/python-nfc/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_NFC - bool "python-nfc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - help - Python module for near field communication. - - https://launchpad.net/nfcpy - -comment "python-nfc needs a toolchain w/ threads" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/python-nfc/python-nfc.mk b/package.bak/python-nfc/python-nfc.mk deleted file mode 100644 index 87db577b22..0000000000 --- a/package.bak/python-nfc/python-nfc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-nfc -# -################################################################################ - -PYTHON_NFC_VERSION = 212 -PYTHON_NFC_SITE = https://launchpad.net/nfcpy -PYTHON_NFC_SITE_METHOD = bzr -PYTHON_NFC_DEPENDENCIES = libusb libusb-compat -PYTHON_NFC_SETUP_TYPE = distutils -PYTHON_NFC_LICENSE = EUPLv1.1+ - -$(eval $(python-package)) diff --git a/package.bak/python-numpy/0001-no-fenv-on-uclibc.patch b/package.bak/python-numpy/0001-no-fenv-on-uclibc.patch deleted file mode 100644 index 633dbcdff4..0000000000 --- a/package.bak/python-numpy/0001-no-fenv-on-uclibc.patch +++ /dev/null @@ -1,79 +0,0 @@ -Don't use on uClibc - -The python-numpy code already has provisions to not use when -not available. However, it uses __GLIBC__ to know whether fenv.h is -available or not, but uClibc defines __GLIBC__, so python-numpy thinks -fenv.h is available. - -This patch fixes that by changing all defined(__GLIBC__) occurences by -(defined(__GLIBC__) && !defined(__UCLIBC__)). - -Signed-off-by: Thomas Petazzoni - -Index: b/numpy/core/include/numpy/ufuncobject.h -=================================================================== ---- a/numpy/core/include/numpy/ufuncobject.h -+++ b/numpy/core/include/numpy/ufuncobject.h -@@ -413,11 +413,11 @@ - (void) fpsetsticky(0); \ - } - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - --#if defined(__GLIBC__) || defined(__APPLE__) || \ -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__MINGW32__) || defined(__FreeBSD__) - #include - #elif defined(__CYGWIN__) -Index: b/numpy/core/src/npymath/ieee754.c.src -=================================================================== ---- a/numpy/core/src/npymath/ieee754.c.src -+++ b/numpy/core/src/npymath/ieee754.c.src -@@ -586,11 +586,11 @@ - } - - --#elif defined(__GLIBC__) || defined(__APPLE__) || \ -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__CYGWIN__) || defined(__MINGW32__) || \ - (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - --# if defined(__GLIBC__) || defined(__APPLE__) || \ -+# if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || \ - defined(__MINGW32__) || defined(__FreeBSD__) - # include - # elif defined(__CYGWIN__) -Index: b/numpy/numarray/_capi.c -=================================================================== ---- a/numpy/numarray/_capi.c -+++ b/numpy/numarray/_capi.c -@@ -10,7 +10,7 @@ - #include - #endif - --#if defined(__GLIBC__) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - #include - #elif defined(__CYGWIN__) - #include "numpy/fenv/fenv.h" -@@ -258,7 +258,7 @@ - } - - /* Likewise for Integer overflows */ --#if defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#if (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - static int int_overflow_error(Float64 value) { /* For x86_64 */ - feraiseexcept(FE_OVERFLOW); - return (int) value; -@@ -3007,7 +3007,7 @@ - return retstatus; - } - --#elif defined(__GLIBC__) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) -+#elif (defined(__GLIBC__) && !defined(__UCLIBC__)) || defined(__APPLE__) || defined(__CYGWIN__) || defined(__MINGW32__) || (defined(__FreeBSD__) && (__FreeBSD_version >= 502114)) - - static int - NA_checkFPErrors(void) diff --git a/package.bak/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch b/package.bak/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch deleted file mode 100644 index 42d194182f..0000000000 --- a/package.bak/python-numpy/0002-Don-t-blindly-enable-frexpl-and-ldexpl-for-uClibc.patch +++ /dev/null @@ -1,33 +0,0 @@ -From b0a1b9628d17251bb417a063ec6c6e09f32393c2 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Tue, 6 Oct 2015 01:20:48 +0100 -Subject: [PATCH] Don't blindly enable frexpl and ldexpl for uClibc - -When the size of double and long double are equal, numpy blindly -assumes that frexpl and ldexpl will be available as well. But for -uClibc, that's not true: it only defines the long double functions -when long double "exists" on the architecture. - -So make an exception for uClibc. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - numpy/core/src/private/npy_config.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h -index 453dbd0..7ecf72c 100644 ---- a/numpy/core/src/private/npy_config.h -+++ b/numpy/core/src/private/npy_config.h -@@ -11,7 +11,7 @@ - #endif - - /* Safe to use ldexp and frexp for long double for MSVC builds */ --#if (NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) || defined(_MSC_VER) -+#if ((NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) && !defined(__UCLIBC__)) || defined(_MSC_VER) - #ifdef HAVE_LDEXP - #define HAVE_LDEXPL 1 - #endif --- -2.5.3 - diff --git a/package.bak/python-numpy/Config.in b/package.bak/python-numpy/Config.in deleted file mode 100644 index f7822efc79..0000000000 --- a/package.bak/python-numpy/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - bool - # Numpy has some CPU specific code - default y if BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 \ - || BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 \ - || BR2_sh || BR2_x86_64 - -config BR2_PACKAGE_PYTHON_NUMPY - bool "python-numpy" - depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS - help - NumPy is the fundamental package for scientific computing - with Python. - - Note that NumPy needs fenv.h fully supported by the - C library. - - http://www.numpy.org/ diff --git a/package.bak/python-numpy/python-numpy.hash b/package.bak/python-numpy/python-numpy.hash deleted file mode 100644 index 39b134be5b..0000000000 --- a/package.bak/python-numpy/python-numpy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 2764d0819acc77e9ff81b060fe7f69530b0d85c26ac9d162639b787cb227d253 numpy-1.8.0.tar.gz diff --git a/package.bak/python-numpy/python-numpy.mk b/package.bak/python-numpy/python-numpy.mk deleted file mode 100644 index 0ab58b0000..0000000000 --- a/package.bak/python-numpy/python-numpy.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# python-numpy -# -################################################################################ - -PYTHON_NUMPY_VERSION = 1.8.0 -PYTHON_NUMPY_SOURCE = numpy-$(PYTHON_NUMPY_VERSION).tar.gz -PYTHON_NUMPY_SITE = http://downloads.sourceforge.net/numpy -PYTHON_NUMPY_LICENSE = BSD-3c -PYTHON_NUMPY_LICENSE_FILES = LICENSE.txt -PYTHON_NUMPY_SETUP_TYPE = distutils - -ifeq ($(BR2_PACKAGE_CLAPACK),y) -PYTHON_NUMPY_DEPENDENCIES += clapack -PYTHON_NUMPY_SITE_CFG_LIBS += blas lapack -endif - -PYTHON_NUMPY_BUILD_OPTS = --fcompiler=None - -define PYTHON_NUMPY_CONFIGURE_CMDS - -rm -f $(@D)/site.cfg - echo "[DEFAULT]" >> $(@D)/site.cfg - echo "library_dirs = $(STAGING_DIR)/usr/lib" >> $(@D)/site.cfg - echo "include_dirs = $(STAGING_DIR)/usr/include" >> $(@D)/site.cfg - echo "libraries =" $(subst $(space),$(comma),$(PYTHON_NUMPY_SITE_CFG_LIBS)) >> $(@D)/site.cfg -endef - -# Some package may include few headers from NumPy, so let's install it -# in the staging area. -PYTHON_NUMPY_INSTALL_STAGING = YES - -$(eval $(python-package)) diff --git a/package.bak/python-paho-mqtt/Config.in b/package.bak/python-paho-mqtt/Config.in deleted file mode 100644 index 79d8b3319c..0000000000 --- a/package.bak/python-paho-mqtt/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PAHO_MQTT - bool "python-paho-mqtt" - help - The Paho Python Client provides a client class with support - for both MQTT v3.1 and v3.1.1 on Python 2.7 or 3.x. It also - provides some helper functions to make publishing messages - to an MQTT server very straightforward. - - https://pypi.python.org/pypi/paho-mqtt diff --git a/package.bak/python-paho-mqtt/python-paho-mqtt.hash b/package.bak/python-paho-mqtt/python-paho-mqtt.hash deleted file mode 100644 index 6cb3cc2bf0..0000000000 --- a/package.bak/python-paho-mqtt/python-paho-mqtt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/paho-mqtt/json, sha256 locally computed -md5 241150b3fcb920ddca4d33181f3238b1 paho-mqtt-1.2.tar.gz -sha256 9100a6aa706ab699d414ec02705a21eb66f436184691d0bf1f2a85a6213c6c1f paho-mqtt-1.2.tar.gz diff --git a/package.bak/python-paho-mqtt/python-paho-mqtt.mk b/package.bak/python-paho-mqtt/python-paho-mqtt.mk deleted file mode 100644 index d783a9cb0d..0000000000 --- a/package.bak/python-paho-mqtt/python-paho-mqtt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-paho-mqtt -# -################################################################################ - -PYTHON_PAHO_MQTT_VERSION = 1.2 -PYTHON_PAHO_MQTT_SOURCE = paho-mqtt-$(PYTHON_PAHO_MQTT_VERSION).tar.gz -PYTHON_PAHO_MQTT_SITE = https://pypi.python.org/packages/82/d9/7064d3a0a1d62756a1a809c85b99f864c641b66de84c15458f72193b7708 -PYTHON_PAHO_MQTT_LICENSE = EPLv1.0 or EDLv1.0 -PYTHON_PAHO_MQTT_LICENSE_FILES = LICENSE.txt edl-v10 epl-v10 -PYTHON_PAHO_MQTT_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pam/0001-dealloc.patch b/package.bak/python-pam/0001-dealloc.patch deleted file mode 100644 index dd4f9610c7..0000000000 --- a/package.bak/python-pam/0001-dealloc.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] fix two bugs in the PAM object deallocation - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=658955 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-dealloc.patch - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.dealloc PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.dealloc 2011-01-17 22:48:22.000000000 +0100 -+++ PyPAM-0.5.0/PAMmodule.c 2011-01-18 21:24:59.000000000 +0100 -@@ -538,10 +538,11 @@ static void PyPAM_dealloc(PyPAMObject *s - free(self->service); - free(self->user); - free(self->conv); -- pam_end(self->pamh, PAM_SUCCESS); -+ if (self->pamh) -+ pam_end(self->pamh, PAM_SUCCESS); - dlclose(self->dlh2); - dlclose(self->dlh1); -- PyMem_DEL(self); -+ PyObject_Del(self); - } - - static PyObject * PyPAM_getattr(PyPAMObject *self, char *name) diff --git a/package.bak/python-pam/0002-nofree.patch b/package.bak/python-pam/0002-nofree.patch deleted file mode 100644 index 7de8801707..0000000000 --- a/package.bak/python-pam/0002-nofree.patch +++ /dev/null @@ -1,68 +0,0 @@ -[PATCH] deallocate the conversation response only in case of error - -Fixes https://bugzilla.redhat.com/show_bug.cgi?id=679714 - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-nofree.patch - -Signed-off-by: Peter Korsgaard -diff --git a/PAMmodule.c b/PAMmodule.c -index 03cb799..a7ff8a5 100644 ---- a/PAMmodule.c -+++ b/PAMmodule.c -@@ -24,8 +24,6 @@ typedef struct { - char *service; - char *user; - PyObject *callback; -- struct pam_response *response_data; -- int response_len; - PyObject *user_data; - void *dlh1, *dlh2; - } PyPAMObject; -@@ -54,15 +52,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - - Py_INCREF(self); - -- if (NULL != self->response_data) { -- for (int i = 0; i < self->response_len; i++) { -- free(self->response_data[0].resp); -- } -- free(self->response_data); -- self->response_data = NULL; -- self->response_len = 0; -- } -- - PyObject* msgList = PyList_New(num_msg); - - for (int i = 0; i < num_msg; i++) { -@@ -92,6 +81,10 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - char* resp_text; - int resp_retcode = 0; - if (!PyArg_ParseTuple(respTuple, "si", &resp_text, &resp_retcode)) { -+ while (i > 0) { -+ free((--spr)->resp); -+ --i; -+ } - free(*resp); - Py_DECREF(respList); - return PAM_CONV_ERR; -@@ -100,10 +93,6 @@ static int PyPAM_conv(int num_msg, const struct pam_message **msg, - spr->resp_retcode = resp_retcode; - Py_DECREF(respTuple); - } -- -- // Save this so we can free it later. -- self->response_data = *resp; -- self->response_len = PyList_Size(respList); - - Py_DECREF(respList); - -@@ -144,8 +133,6 @@ static PyObject * PyPAM_pam(PyObject *self, PyObject *args) - p->user = NULL; - Py_INCREF(Py_None); - p->callback = Py_None; -- p->response_data = NULL; -- p->response_len = 0; - Py_INCREF(Py_None); - p->user_data = Py_None; - diff --git a/package.bak/python-pam/0003-memory-errors-CVE2012-1502.patch b/package.bak/python-pam/0003-memory-errors-CVE2012-1502.patch deleted file mode 100644 index 62405db058..0000000000 --- a/package.bak/python-pam/0003-memory-errors-CVE2012-1502.patch +++ /dev/null @@ -1,136 +0,0 @@ -[PATCH] Fix Double Free Corruption (CVE2012-1502) - -Downloaded from: -http://pkgs.fedoraproject.org/cgit/PyPAM.git/plain/PyPAM-0.5.0-memory-errors.patch - -For details, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-1502 - -Signed-off-by: Peter Korsgaard -diff -up PyPAM-0.5.0/PAMmodule.c.memory PyPAM-0.5.0/PAMmodule.c ---- PyPAM-0.5.0/PAMmodule.c.memory 2012-05-07 17:22:54.503914026 +0200 -+++ PyPAM-0.5.0/PAMmodule.c 2012-05-07 17:23:15.644381942 +0200 -@@ -37,33 +37,48 @@ static void PyPAM_Err(PyPAMObject *self, - - err_msg = pam_strerror(self->pamh, result); - error = Py_BuildValue("(si)", err_msg, result); -- Py_INCREF(PyPAM_Error); - PyErr_SetObject(PyPAM_Error, error); -+ Py_XDECREF(error); - } - - static int PyPAM_conv(int num_msg, const struct pam_message **msg, - struct pam_response **resp, void *appdata_ptr) - { -- PyObject *args; -- -+ PyObject *args, *msgList, *respList, *item; -+ struct pam_response *response, *spr; - PyPAMObject* self = (PyPAMObject *) appdata_ptr; -+ - if (self->callback == NULL) - return PAM_CONV_ERR; - - Py_INCREF(self); - -- PyObject* msgList = PyList_New(num_msg); -- -+ msgList = PyList_New(num_msg); -+ if (msgList == NULL) { -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ - for (int i = 0; i < num_msg; i++) { -- PyList_SetItem(msgList, i, -- Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style)); -+ item = Py_BuildValue("(si)", msg[i]->msg, msg[i]->msg_style); -+ if (item == NULL) { -+ Py_DECREF(msgList); -+ Py_DECREF(self); -+ return PAM_CONV_ERR; -+ } -+ PyList_SetItem(msgList, i, item); - } -- -+ - args = Py_BuildValue("(OO)", self, msgList); -- PyObject* respList = PyEval_CallObject(self->callback, args); -+ if (args == NULL) { -+ Py_DECREF(self); -+ Py_DECREF(msgList); -+ return PAM_CONV_ERR; -+ } -+ respList = PyEval_CallObject(self->callback, args); - Py_DECREF(args); - Py_DECREF(self); -- -+ - if (respList == NULL) - return PAM_CONV_ERR; - -@@ -71,11 +86,15 @@ static int PyPAM_conv(int num_msg, const - Py_DECREF(respList); - return PAM_CONV_ERR; - } -- -- *resp = (struct pam_response *) malloc( -+ -+ response = (struct pam_response *) malloc( - PyList_Size(respList) * sizeof(struct pam_response)); -+ if (response == NULL) { -+ Py_DECREF(respList); -+ return PAM_CONV_ERR; -+ } -+ spr = response; - -- struct pam_response* spr = *resp; - for (int i = 0; i < PyList_Size(respList); i++, spr++) { - PyObject* respTuple = PyList_GetItem(respList, i); - char* resp_text; -@@ -85,7 +104,7 @@ static int PyPAM_conv(int num_msg, const - free((--spr)->resp); - --i; - } -- free(*resp); -+ free(response); - Py_DECREF(respList); - return PAM_CONV_ERR; - } -@@ -95,7 +114,8 @@ static int PyPAM_conv(int num_msg, const - } - - Py_DECREF(respList); -- -+ *resp = response; -+ - return PAM_SUCCESS; - } - -@@ -122,7 +142,11 @@ static PyObject * PyPAM_pam(PyObject *se - PyPAMObject_Type.ob_type = &PyType_Type; - p = (PyPAMObject *) PyObject_NEW(PyPAMObject, &PyPAMObject_Type); - -+ if (p == NULL) -+ return NULL; -+ - if ((spc = (struct pam_conv *) malloc(sizeof(struct pam_conv))) == NULL) { -+ Py_DECREF((PyObject *)p); - PyErr_SetString(PyExc_MemoryError, "out of memory"); - return NULL; - } -@@ -455,9 +479,15 @@ static PyObject * PyPAM_getenvlist(PyObj - } - - retval = PyList_New(0); -+ if (retval == NULL) -+ return NULL; - - while ((cp = *(result++)) != NULL) { - entry = Py_BuildValue("s", cp); -+ if (entry == NULL) { -+ Py_DECREF(retval); -+ return NULL; -+ } - PyList_Append(retval, entry); - Py_DECREF(entry); - } diff --git a/package.bak/python-pam/Config.in b/package.bak/python-pam/Config.in deleted file mode 100644 index 02865d00d6..0000000000 --- a/package.bak/python-pam/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -comment "python-pam needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on BR2_PACKAGE_PYTHON - depends on !BR2_ENABLE_LOCALE || !BR2_USE_WCHAR || BR2_STATIC_LIBS || \ - BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_PYTHON_PAM - bool "python-pam" - depends on BR2_PACKAGE_PYTHON # C extension not compatible with python3 - depends on BR2_ENABLE_LOCALE # linux-pam - depends on BR2_USE_WCHAR # linux-pam - depends on BR2_USE_MMU # linux-pam - depends on !BR2_STATIC_LIBS # linux-pam - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - PAM (Pluggable Authentication Module) bindings for Python. - - https://admin.fedoraproject.org/pkgdb/package/PyPAM/ diff --git a/package.bak/python-pam/python-pam.hash b/package.bak/python-pam/python-pam.hash deleted file mode 100644 index 14a89484a1..0000000000 --- a/package.bak/python-pam/python-pam.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 796ac019b9ee805696d0d277d8fb912fa2391b6ac070dc6f9f1a9a0fadbc3a5a PyPAM-0.5.0.tar.gz diff --git a/package.bak/python-pam/python-pam.mk b/package.bak/python-pam/python-pam.mk deleted file mode 100644 index d737291c4b..0000000000 --- a/package.bak/python-pam/python-pam.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pam -# -################################################################################ - -PYTHON_PAM_VERSION = 0.5.0 -PYTHON_PAM_SOURCE = PyPAM-$(PYTHON_PAM_VERSION).tar.gz -# pangalactic.org gone -PYTHON_PAM_SITE = http://pkgs.fedoraproject.org/repo/pkgs/PyPAM/PyPAM-0.5.0.tar.gz/f1e7c2c56421dda28a75ace59a3c8871 -PYTHON_PAM_SETUP_TYPE = distutils -PYTHON_PAM_LICENSE = LGPLv2.1 -PYTHON_PAM_LICENSE_FILES = COPYING -PYTHON_PAM_DEPENDENCIES = linux-pam - -$(eval $(python-package)) diff --git a/package.bak/python-paramiko/Config.in b/package.bak/python-paramiko/Config.in deleted file mode 100644 index aad85cb134..0000000000 --- a/package.bak/python-paramiko/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_PARAMIKO - bool "python-paramiko" - depends on BR2_INSTALL_LIBSTDCPP # python-pyasn - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime - select BR2_PACKAGE_PYTHON_PYASN # runtime - help - SSH2 protocol library. - - https://github.com/paramiko/paramiko/ - -comment "python-paramiko needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-paramiko/python-paramiko.hash b/package.bak/python-paramiko/python-paramiko.hash deleted file mode 100644 index fca8fd754b..0000000000 --- a/package.bak/python-paramiko/python-paramiko.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/paramiko/json, sha256 locally computed -md5 9e8abe635baa6bb75a4cd55dcb56a264 paramiko-2.1.1.tar.gz -sha256 d51dada7ad0736c116f8bfe3263627925947e4a50e61436a83d58bfe7055b575 paramiko-2.1.1.tar.gz diff --git a/package.bak/python-paramiko/python-paramiko.mk b/package.bak/python-paramiko/python-paramiko.mk deleted file mode 100644 index 6c0df4d9fb..0000000000 --- a/package.bak/python-paramiko/python-paramiko.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-paramiko -# -################################################################################ - -PYTHON_PARAMIKO_VERSION = 2.1.1 -PYTHON_PARAMIKO_SOURCE = paramiko-$(PYTHON_PARAMIKO_VERSION).tar.gz -PYTHON_PARAMIKO_SITE = https://pypi.python.org/packages/d1/5a/ebd00d884f30baf208359a027eb7b38372d81d0c004724bb1aa71ae43b37 -PYTHON_PARAMIKO_SETUP_TYPE = setuptools -PYTHON_PARAMIKO_LICENSE = LGPLv2.1+ -PYTHON_PARAMIKO_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pathpy/Config.in b/package.bak/python-pathpy/Config.in deleted file mode 100644 index 98c05126bf..0000000000 --- a/package.bak/python-pathpy/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHPY - bool "python-pathpy" - help - path.py implements a path objects as first-class - entities, allowing common operations on files to - be invoked on those path objects directly. - - https://github.com/jaraco/path.py diff --git a/package.bak/python-pathpy/python-pathpy.hash b/package.bak/python-pathpy/python-pathpy.hash deleted file mode 100644 index 4824e2a3c8..0000000000 --- a/package.bak/python-pathpy/python-pathpy.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/path.py/json, sha256 locally computed -md5 eb8469ad498d2e462bff8f3b2b5ea68d path.py-10.0.tar.gz -sha256 ba984a2b536158a8841dd33150fce16bcf04210e83f92da674cad0a8a8f61e00 path.py-10.0.tar.gz diff --git a/package.bak/python-pathpy/python-pathpy.mk b/package.bak/python-pathpy/python-pathpy.mk deleted file mode 100644 index 5776586027..0000000000 --- a/package.bak/python-pathpy/python-pathpy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathpy -# -################################################################################ - -PYTHON_PATHPY_VERSION = 10.0 -PYTHON_PATHPY_SOURCE = path.py-$(PYTHON_PATHPY_VERSION).tar.gz -PYTHON_PATHPY_SITE = https://pypi.python.org/packages/f3/4e/3bce93c0d9e20abc6ed3aa7866beb688e889828ca2666743df11d9a30050 -PYTHON_PATHPY_SETUP_TYPE = setuptools -PYTHON_PATHPY_LICENSE = MIT -PYTHON_PATHPY_DEPENDENCIES = host-python-setuptools-scm - -$(eval $(python-package)) diff --git a/package.bak/python-pathtools/Config.in b/package.bak/python-pathtools/Config.in deleted file mode 100644 index 63777bd37f..0000000000 --- a/package.bak/python-pathtools/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHTOOLS - bool "python-pathtools" - help - File system general utilities. - - http://github.com/gorakhargosh/pathtools diff --git a/package.bak/python-pathtools/python-pathtools.hash b/package.bak/python-pathtools/python-pathtools.hash deleted file mode 100644 index 1fa624df02..0000000000 --- a/package.bak/python-pathtools/python-pathtools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pathtools/json -md5 9a1af5c605768ea5804b03b734ff0f82 pathtools-0.1.2.tar.gz -# sha256 calculated by scanpypi -sha256 7c35c5421a39bb82e58018febd90e3b6e5db34c5443aaaf742b3f33d4655f1c0 pathtools-0.1.2.tar.gz diff --git a/package.bak/python-pathtools/python-pathtools.mk b/package.bak/python-pathtools/python-pathtools.mk deleted file mode 100644 index 2b4a271150..0000000000 --- a/package.bak/python-pathtools/python-pathtools.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathtools -# -################################################################################ - -PYTHON_PATHTOOLS_VERSION = 0.1.2 -PYTHON_PATHTOOLS_SOURCE = pathtools-$(PYTHON_PATHTOOLS_VERSION).tar.gz -PYTHON_PATHTOOLS_SITE = https://pypi.python.org/packages/e7/7f/470d6fcdf23f9f3518f6b0b76be9df16dcc8630ad409947f8be2eb0ed13a -PYTHON_PATHTOOLS_SETUP_TYPE = setuptools -PYTHON_PATHTOOLS_LICENSE = MIT -PYTHON_PATHTOOLS_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pathvalidate/Config.in b/package.bak/python-pathvalidate/Config.in deleted file mode 100644 index 60163fbe0b..0000000000 --- a/package.bak/python-pathvalidate/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PATHVALIDATE - bool "python-pathvalidate" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - help - pathvalidate is a python library to validate/sanitize a string - such as filename/variable-name. - - https://github.com/thombashi/pathvalidate diff --git a/package.bak/python-pathvalidate/python-pathvalidate.hash b/package.bak/python-pathvalidate/python-pathvalidate.hash deleted file mode 100644 index 68e6907db3..0000000000 --- a/package.bak/python-pathvalidate/python-pathvalidate.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pathvalidate/json, sha256 locally computed -md5 03f0af69596f7de52d52753c2a585fce pathvalidate-0.13.0.tar.gz -sha256 1ecaebfbd32794abe5f47a20189d5f7dd196a6ba445c1a07429de6ce608bf9b9 pathvalidate-0.13.0.tar.gz diff --git a/package.bak/python-pathvalidate/python-pathvalidate.mk b/package.bak/python-pathvalidate/python-pathvalidate.mk deleted file mode 100644 index a8ab4ad242..0000000000 --- a/package.bak/python-pathvalidate/python-pathvalidate.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pathvalidate -# -################################################################################ - -PYTHON_PATHVALIDATE_VERSION = 0.13.0 -PYTHON_PATHVALIDATE_SOURCE = pathvalidate-$(PYTHON_PATHVALIDATE_VERSION).tar.gz -PYTHON_PATHVALIDATE_SITE = https://pypi.python.org/packages/3a/03/ca01cdbf0f7b766b414d134e71b2eb689619dba0ddee002d53c2d58f6436 -PYTHON_PATHVALIDATE_SETUP_TYPE = setuptools -PYTHON_PATHVALIDATE_LICENSE = MIT -PYTHON_PATHVALIDATE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pexpect/Config.in b/package.bak/python-pexpect/Config.in deleted file mode 100644 index 58a3af5783..0000000000 --- a/package.bak/python-pexpect/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PEXPECT - bool "python-pexpect" - select BR2_PACKAGE_PYTHON_PTYPROCESS # runtime - help - Pexpect is a pure Python module for spawning child - applications; controlling them; and responding to expected - patterns in their output. Pexpect works like Don Libes’ - Expect. Pexpect allows your script to spawn a child - application and control it as if a human were typing - commands. - - https://pexpect.readthedocs.org diff --git a/package.bak/python-pexpect/python-pexpect.hash b/package.bak/python-pexpect/python-pexpect.hash deleted file mode 100644 index e3836074ec..0000000000 --- a/package.bak/python-pexpect/python-pexpect.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pexpect/json, sha256 locally computed -md5 3694410001a99dff83f0b500a1ca1c95 pexpect-4.2.1.tar.gz -sha256 3d132465a75b57aa818341c6521392a06cc660feb3988d7f1074f39bd23c9a92 pexpect-4.2.1.tar.gz diff --git a/package.bak/python-pexpect/python-pexpect.mk b/package.bak/python-pexpect/python-pexpect.mk deleted file mode 100644 index f1f9903946..0000000000 --- a/package.bak/python-pexpect/python-pexpect.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# python-pexpect -# -################################################################################ - -PYTHON_PEXPECT_VERSION = 4.2.1 -PYTHON_PEXPECT_SOURCE = pexpect-$(PYTHON_PEXPECT_VERSION).tar.gz -PYTHON_PEXPECT_SITE = https://pypi.python.org/packages/e8/13/d0b0599099d6cd23663043a2a0bb7c61e58c6ba359b2656e6fb000ef5b98 -PYTHON_PEXPECT_LICENSE = ISC -PYTHON_PEXPECT_LICENSE_FILES = LICENSE -PYTHON_PEXPECT_SETUP_TYPE = distutils - -# async.py is not usable with Python 2, and removing is the solution -# recommended by upstream: -# https://github.com/pexpect/pexpect/issues/290 -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_PEXPECT_REMOVE_ASYNC_PY - $(RM) $(@D)/pexpect/async.py -endef -PYTHON_PEXPECT_POST_PATCH_HOOKS += PYTHON_PEXPECT_REMOVE_ASYNC_PY -endif - -$(eval $(python-package)) diff --git a/package.bak/python-picamera/Config.in b/package.bak/python-picamera/Config.in deleted file mode 100644 index d2317c1e47..0000000000 --- a/package.bak/python-picamera/Config.in +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_PYTHON_PICAMERA - bool "python-picamera" diff --git a/package.bak/python-picamera/python-picamera.mk b/package.bak/python-picamera/python-picamera.mk deleted file mode 100644 index ef2a1a48a5..0000000000 --- a/package.bak/python-picamera/python-picamera.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-picamera -# -################################################################################ - -PYTHON_PICAMERA_VERSION = 1.12 -PYTHON_PICAMERA_SOURCE = picamera-$(PYTHON_PICAMERA_VERSION).tar.gz -PYTHON_PICAMERA_SITE = https://pypi.python.org/packages/ab/53/54a20f53e61df5c329480207fb0b6e6e25c64d16e82e899de335e08df7d9 -PYTHON_PICAMERA_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pillow/Config.in b/package.bak/python-pillow/Config.in deleted file mode 100644 index 3820ba8fb1..0000000000 --- a/package.bak/python-pillow/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PILLOW - bool "python-pillow" - help - Pillow is the "friendly" PIL fork by Alex Clark and - Contributors. PIL is the Python Imaging Library by Fredrik - Lundh and Contributors. - - Pillow relies on external libraries to provide support - various image formats. Select the corresponding package(s) - to get this support. Pillow can use jpeg, zlib (for PNG), - tiff, freetype, webp, and openjpeg (JPEG-2000). - - https://pypi.python.org/pypi/Pillow/ diff --git a/package.bak/python-pillow/python-pillow.hash b/package.bak/python-pillow/python-pillow.hash deleted file mode 100644 index 182e82f8a5..0000000000 --- a/package.bak/python-pillow/python-pillow.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pillow/json, sha256 locally computed -md5 d5af224b0fa2c66dacc9814785fef9e7 Pillow-4.0.0.tar.gz -sha256 ee26d2d7e7e300f76ba7b796014c04011394d0c4a5ed9a288264a3e443abca50 Pillow-4.0.0.tar.gz diff --git a/package.bak/python-pillow/python-pillow.mk b/package.bak/python-pillow/python-pillow.mk deleted file mode 100644 index faa0e16688..0000000000 --- a/package.bak/python-pillow/python-pillow.mk +++ /dev/null @@ -1,73 +0,0 @@ -################################################################################ -# -# python-pillow -# -################################################################################ - -PYTHON_PILLOW_VERSION = 4.0.0 -PYTHON_PILLOW_SOURCE = Pillow-$(PYTHON_PILLOW_VERSION).tar.gz -PYTHON_PILLOW_SITE = https://pypi.python.org/packages/8d/80/eca7a2d1a3c2dafb960f32f844d570de988e609f5fd17de92e1cf6a01b0a -PYTHON_PILLOW_LICENSE = PIL Software License -PYTHON_PILLOW_LICENSE_FILES = LICENSE -PYTHON_PILLOW_SETUP_TYPE = setuptools -PYTHON_PILLOW_BUILD_OPTS = --disable-platform-guessing - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -PYTHON_PILLOW_DEPENDENCIES += freetype -PYTHON_PILLOW_BUILD_OPTS += --enable-freetype -else -PYTHON_PILLOW_BUILD_OPTS += --disable-freetype -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -PYTHON_PILLOW_DEPENDENCIES += jpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg -else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_OPENJPEG),y) -PYTHON_PILLOW_DEPENDENCIES += openjpeg -PYTHON_PILLOW_BUILD_OPTS += --enable-jpeg2000 -else -PYTHON_PILLOW_BUILD_OPTS += --disable-jpeg2000 -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -PYTHON_PILLOW_DEPENDENCIES += tiff -PYTHON_PILLOW_BUILD_OPTS += --enable-tiff -else -PYTHON_PILLOW_BUILD_OPTS += --disable-tiff -endif - -ifeq ($(BR2_PACKAGE_WEBP),y) -PYTHON_PILLOW_DEPENDENCIES += webp -PYTHON_PILLOW_BUILD_OPTS += --enable-webp -else -PYTHON_PILLOW_BUILD_OPTS += --disable-webp -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -PYTHON_PILLOW_DEPENDENCIES += zlib -PYTHON_PILLOW_BUILD_OPTS += --enable-zlib -else -PYTHON_PILLOW_BUILD_OPTS += --disable-zlib -endif - -define PYTHON_PILLOW_BUILD_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BASE_BUILD_OPTS) $(PYTHON_PILLOW_BUILD_OPTS) -endef - -define PYTHON_PILLOW_INSTALL_TARGET_CMDS - cd $(PYTHON_PILLOW_BUILDDIR); \ - $(PYTHON_PILLOW_BASE_ENV) $(PYTHON_PILLOW_ENV) \ - $(PYTHON_PILLOW_PYTHON_INTERPRETER) setup.py build_ext \ - $(PYTHON_PILLOW_BUILD_OPTS) install \ - $(PYTHON_PILLOW_BASE_INSTALL_TARGET_OPTS) \ - $(PYTHON_PILLOW_INSTALL_TARGET_OPTS) -endef - -$(eval $(python-package)) diff --git a/package.bak/python-posix-ipc/Config.in b/package.bak/python-posix-ipc/Config.in deleted file mode 100644 index eba36edd7b..0000000000 --- a/package.bak/python-posix-ipc/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_POSIX_IPC - bool "python-posix-ipc" - depends on BR2_PACKAGE_PYTHON - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The Python extension module posix_ipc gives access to POSIX - inter-process semaphores, shared memory and message queues - on systems that support the POSIX Realtime Extensions - a.k.a. POSIX 1003.1b-1993. - - http://semanchuk.com/philip/posix_ipc/ - -comment "python-posix-ipc needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/python-posix-ipc/python-posix-ipc.hash b/package.bak/python-posix-ipc/python-posix-ipc.hash deleted file mode 100644 index 196f186de1..0000000000 --- a/package.bak/python-posix-ipc/python-posix-ipc.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/posix-ipc/json, sha256 locally computed -md5 85607a392087715ac3a3c7ded2492d06 posix_ipc-1.0.0.tar.gz -sha256 9c93070374ca672725575e5c9874930c8cde69367fb90378b2255e048e31efcb posix_ipc-1.0.0.tar.gz diff --git a/package.bak/python-posix-ipc/python-posix-ipc.mk b/package.bak/python-posix-ipc/python-posix-ipc.mk deleted file mode 100644 index 79165375f9..0000000000 --- a/package.bak/python-posix-ipc/python-posix-ipc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-posix-ipc -# -################################################################################ - -PYTHON_POSIX_IPC_VERSION = 1.0.0 -PYTHON_POSIX_IPC_SOURCE = posix_ipc-$(PYTHON_POSIX_IPC_VERSION).tar.gz -PYTHON_POSIX_IPC_SITE = https://pypi.python.org/packages/f0/e6/bff62b62b2e75f695b737695951b7a4c1c6595369268a37868f5c34e1c12 -PYTHON_POSIX_IPC_LICENSE = BSD-3c -PYTHON_POSIX_IPC_LICENSE_FILES = LICENSE -PYTHON_POSIX_IPC_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-prompt-toolkit/Config.in b/package.bak/python-prompt-toolkit/Config.in deleted file mode 100644 index ccc9ebb0f5..0000000000 --- a/package.bak/python-prompt-toolkit/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PROMPT_TOOLKIT - bool "python-prompt-toolkit" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_WCWIDTH # runtime - help - Library for building powerful interactive command lines in - Python. - - https://github.com/jonathanslenders/python-prompt-toolkit diff --git a/package.bak/python-prompt-toolkit/python-prompt-toolkit.hash b/package.bak/python-prompt-toolkit/python-prompt-toolkit.hash deleted file mode 100644 index 0211a96fae..0000000000 --- a/package.bak/python-prompt-toolkit/python-prompt-toolkit.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/prompt-toolkit/json, sha256 locally computed -md5 f74cd8ac84176fac1cdb136843ccb0d6 prompt_toolkit-1.0.7.tar.gz -sha256 ef0b8188179fe7d052161ed274b43e18f5a680ff84d01462293b327e1668d2ef prompt_toolkit-1.0.7.tar.gz diff --git a/package.bak/python-prompt-toolkit/python-prompt-toolkit.mk b/package.bak/python-prompt-toolkit/python-prompt-toolkit.mk deleted file mode 100644 index 7e85dcd221..0000000000 --- a/package.bak/python-prompt-toolkit/python-prompt-toolkit.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-prompt-toolkit -# -################################################################################ - -PYTHON_PROMPT_TOOLKIT_VERSION = 1.0.7 -PYTHON_PROMPT_TOOLKIT_SOURCE = prompt_toolkit-$(PYTHON_PROMPT_TOOLKIT_VERSION).tar.gz -PYTHON_PROMPT_TOOLKIT_SITE = https://pypi.python.org/packages/dd/55/2fb4883d2b21d072204fd21ca5e6040faa253135554590d0b67380669176 -PYTHON_PROMPT_TOOLKIT_SETUP_TYPE = setuptools -PYTHON_PROMPT_TOOLKIT_LICENSE = BSD-3c -PYTHON_PROMPT_TOOLKIT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-protobuf/Config.in b/package.bak/python-protobuf/Config.in deleted file mode 100644 index 6649dfc094..0000000000 --- a/package.bak/python-protobuf/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PROTOBUF - bool "python-protobuf" - depends on BR2_PACKAGE_PYTHON - # host-protobuf only builds on certain architectures - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - help - Python implementation of the Google Protocol Buffers. - - Protocol buffers are Google's language-neutral, platform-neutral, - extensible mechanism for serializing structured data. - - http://code.google.com/p/protobuf/ diff --git a/package.bak/python-protobuf/python-protobuf.hash b/package.bak/python-protobuf/python-protobuf.hash deleted file mode 120000 index 57a40ce5bd..0000000000 --- a/package.bak/python-protobuf/python-protobuf.hash +++ /dev/null @@ -1 +0,0 @@ -../protobuf/protobuf.hash \ No newline at end of file diff --git a/package.bak/python-protobuf/python-protobuf.mk b/package.bak/python-protobuf/python-protobuf.mk deleted file mode 100644 index d8be76dd70..0000000000 --- a/package.bak/python-protobuf/python-protobuf.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-protobuf -# -################################################################################ - -PYTHON_PROTOBUF_VERSION = $(PROTOBUF_VERSION) -PYTHON_PROTOBUF_SOURCE = $(PROTOBUF_SOURCE) -PYTHON_PROTOBUF_SITE = $(PROTOBUF_SITE) -PYTHON_PROTOBUF_LICENSE = BSD-3c -PYTHON_PROTOBUF_LICENSE_FILES = LICENSE -PYTHON_PROTOBUF_DEPENDENCIES = host-protobuf -PYTHON_PROTOBUF_SETUP_TYPE = setuptools -PYTHON_PROTOBUF_SUBDIR = python - -$(eval $(python-package)) diff --git a/package.bak/python-psutil/Config.in b/package.bak/python-psutil/Config.in deleted file mode 100644 index 1aec35d274..0000000000 --- a/package.bak/python-psutil/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PSUTIL - bool "python-psutil" - # sys/sysinfo.h conflict with kernel headers - depends on !BR2_TOOLCHAIN_USES_MUSL - help - psutil is a cross-platform library for retrieving - information on running processes and system utilization - (CPU, memory, disks, network) in Python. - - https://pypi.python.org/pypi/psutil - -comment "python-psutil needs a uClibc or glibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/python-psutil/python-psutil.hash b/package.bak/python-psutil/python-psutil.hash deleted file mode 100644 index ead2d9c5ba..0000000000 --- a/package.bak/python-psutil/python-psutil.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/psutil/json, sha256 locally computed -md5 199a366dba829c88bddaf5b41d19ddc0 psutil-4.3.1.tar.gz -sha256 38f74182fb9e15cafd0cdf0821098a95cc17301807aed25634a18b66537ba51b psutil-4.3.1.tar.gz diff --git a/package.bak/python-psutil/python-psutil.mk b/package.bak/python-psutil/python-psutil.mk deleted file mode 100644 index 1032318813..0000000000 --- a/package.bak/python-psutil/python-psutil.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-psutil -# -################################################################################ - -PYTHON_PSUTIL_VERSION = 4.3.1 -PYTHON_PSUTIL_SOURCE = psutil-$(PYTHON_PSUTIL_VERSION).tar.gz -PYTHON_PSUTIL_SITE = https://pypi.python.org/packages/78/cc/f267a1371f229bf16db6a4e604428c3b032b823b83155bd33cef45e49a53 -PYTHON_PSUTIL_SETUP_TYPE = setuptools -PYTHON_PSUTIL_LICENSE = BSD-3c -PYTHON_PSUTIL_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-ptyprocess/Config.in b/package.bak/python-ptyprocess/Config.in deleted file mode 100644 index b95dacbd35..0000000000 --- a/package.bak/python-ptyprocess/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PTYPROCESS - bool "python-ptyprocess" - help - Launch a subprocess in a pseudo terminal (pty), and interact - with both the process and its pty. - - https://github.com/pexpect/ptyprocess diff --git a/package.bak/python-ptyprocess/python-ptyprocess.hash b/package.bak/python-ptyprocess/python-ptyprocess.hash deleted file mode 100644 index 0e2e0aeda4..0000000000 --- a/package.bak/python-ptyprocess/python-ptyprocess.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org, sha256 locally computed -md5 94e537122914cc9ec9c1eadcd36e73a1 ptyprocess-0.5.1.tar.gz -sha256 0530ce63a9295bfae7bd06edc02b6aa935619f486f0f1dc0972f516265ee81a6 ptyprocess-0.5.1.tar.gz diff --git a/package.bak/python-ptyprocess/python-ptyprocess.mk b/package.bak/python-ptyprocess/python-ptyprocess.mk deleted file mode 100644 index 59329d01e0..0000000000 --- a/package.bak/python-ptyprocess/python-ptyprocess.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ptyprocess -# -################################################################################ - -PYTHON_PTYPROCESS_VERSION = 0.5.1 -PYTHON_PTYPROCESS_SITE = https://pypi.python.org/packages/source/p/ptyprocess -PYTHON_PTYPROCESS_SOURCE = ptyprocess-$(PYTHON_PTYPROCESS_VERSION).tar.gz -PYTHON_PTYPROCESS_LICENSE = ISC -PYTHON_PTYPROCESS_LICENSE_FILES = LICENSE -PYTHON_PTYPROCESS_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pudb/Config.in b/package.bak/python-pudb/Config.in deleted file mode 100644 index d4a4f73e6a..0000000000 --- a/package.bak/python-pudb/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_PUDB - bool "python-pudb" - select BR2_PACKAGE_PYTHON_URWID # runtime - select BR2_PACKAGE_PYTHON_PYGMENTS # runtime - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 # runtime - help - A full-screen, console-based Python debugger. - - https://github.com/inducer/pudb diff --git a/package.bak/python-pudb/python-pudb.hash b/package.bak/python-pudb/python-pudb.hash deleted file mode 100644 index b06d5e8b0a..0000000000 --- a/package.bak/python-pudb/python-pudb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pudb/json, sha256 locally computed -md5 4573b70163329c1cb59836a357bfdf7c pudb-2016.2.tar.gz -sha256 e958d7f7b1771cf297714e95054075df3b2a47455d7a740be4abbbd41289505a pudb-2016.2.tar.gz diff --git a/package.bak/python-pudb/python-pudb.mk b/package.bak/python-pudb/python-pudb.mk deleted file mode 100644 index 5349c1e1ed..0000000000 --- a/package.bak/python-pudb/python-pudb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pudb -# -################################################################################ - -PYTHON_PUDB_VERSION = 2016.2 -PYTHON_PUDB_SOURCE = pudb-$(PYTHON_PUDB_VERSION).tar.gz -PYTHON_PUDB_SITE = https://pypi.python.org/packages/50/1a/d9b692e32afff09ccb5aa33c3d51c6d5a80efbb59de90307b33601e7fa62 -PYTHON_PUDB_SETUP_TYPE = setuptools -PYTHON_PUDB_LICENSE = MIT -PYTHON_PUDB_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pyasn-modules/Config.in b/package.bak/python-pyasn-modules/Config.in deleted file mode 100644 index 387020d9d6..0000000000 --- a/package.bak/python-pyasn-modules/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN_MODULES - bool "python-pyasn-modules" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYASN # runtime - help - A collection of ASN.1-based protocols modules. - - https://pypi.python.org/pypi/pyasn1-modules - -comment "python-pyasn-modules needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pyasn-modules/python-pyasn-modules.hash b/package.bak/python-pyasn-modules/python-pyasn-modules.hash deleted file mode 100644 index 6d9a707931..0000000000 --- a/package.bak/python-pyasn-modules/python-pyasn-modules.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=178129bc7fbf07215c25230c5f053f81, sha256 locally computed. -md5 178129bc7fbf07215c25230c5f053f81 pyasn1-modules-0.0.8.tar.gz -sha256 10561934f1829bcc455c7ecdcdacdb4be5ffd3696f26f468eb6eb41e107f3837 pyasn1-modules-0.0.8.tar.gz diff --git a/package.bak/python-pyasn-modules/python-pyasn-modules.mk b/package.bak/python-pyasn-modules/python-pyasn-modules.mk deleted file mode 100644 index bb32227a20..0000000000 --- a/package.bak/python-pyasn-modules/python-pyasn-modules.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn-modules -# -################################################################################ - -PYTHON_PYASN_MODULES_VERSION = 0.0.8 -PYTHON_PYASN_MODULES_SOURCE = pyasn1-modules-$(PYTHON_PYASN_MODULES_VERSION).tar.gz -PYTHON_PYASN_MODULES_SITE = http://pypi.python.org/packages/source/p/pyasn1-modules -PYTHON_PYASN_MODULES_LICENSE = BSD-2c -PYTHON_PYASN_MODULES_LICENSE_FILES = LICENSE.txt -PYTHON_PYASN_MODULES_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyasn/Config.in b/package.bak/python-pyasn/Config.in deleted file mode 100644 index 997b737f5b..0000000000 --- a/package.bak/python-pyasn/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYASN - bool "python-pyasn" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - help - PyASN is a Python extension module that enables you to - perform very fast IP address to Autonomous System Number - lookups. - - https://code.google.com/p/pyasn/ - -comment "python-pyasn needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pyasn/python-pyasn.hash b/package.bak/python-pyasn/python-pyasn.hash deleted file mode 100644 index 59c90a832b..0000000000 --- a/package.bak/python-pyasn/python-pyasn.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f00a02a631d4016818659d1cc38d229a, sha256 locally computed -md5 f00a02a631d4016818659d1cc38d229a pyasn1-0.1.9.tar.gz -sha256 853cacd96d1f701ddd67aa03ecc05f51890135b7262e922710112f12a2ed2a7f pyasn1-0.1.9.tar.gz diff --git a/package.bak/python-pyasn/python-pyasn.mk b/package.bak/python-pyasn/python-pyasn.mk deleted file mode 100644 index 80d18cd135..0000000000 --- a/package.bak/python-pyasn/python-pyasn.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyasn -# -################################################################################ - -PYTHON_PYASN_VERSION = 0.1.9 -PYTHON_PYASN_SOURCE = pyasn1-$(PYTHON_PYASN_VERSION).tar.gz -PYTHON_PYASN_SITE = https://pypi.python.org/packages/source/p/pyasn1 -PYTHON_PYASN_LICENSE = BSD-2c -PYTHON_PYASN_LICENSE_FILES = LICENSE.txt -PYTHON_PYASN_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pycli/Config.in b/package.bak/python-pycli/Config.in deleted file mode 100644 index e1ce3b99a6..0000000000 --- a/package.bak/python-pycli/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCLI - bool "python-pycli" - help - The cli package is a framework for making simple, correct - command line applications in Python. - - https://pythonhosted.org/pyCLI/ diff --git a/package.bak/python-pycli/python-pycli.hash b/package.bak/python-pycli/python-pycli.hash deleted file mode 100644 index 8be31787be..0000000000 --- a/package.bak/python-pycli/python-pycli.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/pypi?:action=show_md5&digest=5cad880168f3423a1235b396735c1360 -md5 5cad880168f3423a1235b396735c1360 pyCLI-devel.tar.gz -# Locally calculated -sha256 d7dc3245d79ef00ba5c0d6b008eb3d1a519c0df4cfa4467eee5160a80c6ddc0a pyCLI-devel.tar.gz diff --git a/package.bak/python-pycli/python-pycli.mk b/package.bak/python-pycli/python-pycli.mk deleted file mode 100644 index 8e48a065bc..0000000000 --- a/package.bak/python-pycli/python-pycli.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycli -# -################################################################################ - -PYTHON_PYCLI_VERSION = devel -PYTHON_PYCLI_SOURCE = pyCLI-$(PYTHON_PYCLI_VERSION).tar.gz -PYTHON_PYCLI_SITE = https://pypi.python.org/packages/source/p/pyCLI -PYTHON_PYCLI_LICENSE = ISC-like -PYTHON_PYCLI_LICENSE_FILES = lib/cli/__init__.py -PYTHON_PYCLI_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pycparser/Config.in b/package.bak/python-pycparser/Config.in deleted file mode 100644 index 49190c3405..0000000000 --- a/package.bak/python-pycparser/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCPARSER - bool "python-pycparser" - help - C parser in Python - - https://github.com/eliben/pycparser diff --git a/package.bak/python-pycparser/python-pycparser.hash b/package.bak/python-pycparser/python-pycparser.hash deleted file mode 100644 index a87bfd44c7..0000000000 --- a/package.bak/python-pycparser/python-pycparser.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=a2bc8d28c923b4fe2b2c3b4b51a4f935, sha256 locally computed -md5 a2bc8d28c923b4fe2b2c3b4b51a4f935 pycparser-2.14.tar.gz -sha256 7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73 pycparser-2.14.tar.gz diff --git a/package.bak/python-pycparser/python-pycparser.mk b/package.bak/python-pycparser/python-pycparser.mk deleted file mode 100644 index a32f1aa2a4..0000000000 --- a/package.bak/python-pycparser/python-pycparser.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pycparser -# -################################################################################ - -PYTHON_PYCPARSER_VERSION = 2.14 -PYTHON_PYCPARSER_SOURCE = pycparser-$(PYTHON_PYCPARSER_VERSION).tar.gz -PYTHON_PYCPARSER_SITE = https://pypi.python.org/packages/source/p/pycparser -PYTHON_PYCPARSER_SETUP_TYPE = setuptools -PYTHON_PYCPARSER_LICENSE = BSD-3c -PYTHON_PYCPARSER_LICENSE_FILES = LICENSE - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-pycrypto/0001-remove-incorrect-header-path.patch b/package.bak/python-pycrypto/0001-remove-incorrect-header-path.patch deleted file mode 100644 index 9268d311d5..0000000000 --- a/package.bak/python-pycrypto/0001-remove-incorrect-header-path.patch +++ /dev/null @@ -1,21 +0,0 @@ -Do not use /usr/include for headers - -Using /usr/include is wrong when doing cross-compilation, so get rid -of it, and rely on the compiler to use the appropriate default paths -for headers. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -370,7 +370,7 @@ - 'ext_modules': plat_ext + [ - # _fastmath (uses GNU mp library) - Extension("Crypto.PublicKey._fastmath", -- include_dirs=['src/','/usr/include/'], -+ include_dirs=['src/'], - libraries=['gmp'], - sources=["src/_fastmath.c"]), - diff --git a/package.bak/python-pycrypto/Config.in b/package.bak/python-pycrypto/Config.in deleted file mode 100644 index e998ecf89c..0000000000 --- a/package.bak/python-pycrypto/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCRYPTO - bool "python-pycrypto" - select BR2_PACKAGE_GMP - help - PyCrypto is a collection of cryptographic algorithms and - protocols, implemented for use from Python. - - http://www.pycrypto.org/ diff --git a/package.bak/python-pycrypto/python-pycrypto.hash b/package.bak/python-pycrypto/python-pycrypto.hash deleted file mode 100644 index 46378945d8..0000000000 --- a/package.bak/python-pycrypto/python-pycrypto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c pycrypto-2.6.1.tar.gz diff --git a/package.bak/python-pycrypto/python-pycrypto.mk b/package.bak/python-pycrypto/python-pycrypto.mk deleted file mode 100644 index 927ba918ae..0000000000 --- a/package.bak/python-pycrypto/python-pycrypto.mk +++ /dev/null @@ -1,49 +0,0 @@ -################################################################################ -# -# python-pycrypto -# -################################################################################ - -PYTHON_PYCRYPTO_VERSION = 2.6.1 -PYTHON_PYCRYPTO_SOURCE = pycrypto-$(PYTHON_PYCRYPTO_VERSION).tar.gz -PYTHON_PYCRYPTO_SITE = http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto -PYTHON_PYCRYPTO_SETUP_TYPE = distutils - -PYTHON_PYCRYPTO_LICENSE = Public Domain, Python 2.2 License (HMAC.py, setup.py) -PYTHON_PYCRYPTO_LICENSE_FILES = \ - COPYRIGHT LEGAL/copy/LICENSE.libtom \ - LEGAL/copy/LICENSE.python-2.2 - -# The pycrypto package contains a LICENSE.orig file, but our patching -# infrastrucure removes all .orig file, so we must rename that license -# file prior to patching, so it is still available to the legal-info -# infrastructure -define PYTHON_PYCRYPTO_RENAME_LICENSE - mv $(@D)/LEGAL/copy/LICENSE.orig $(@D)/LEGAL/copy/LICENSE.original -endef -PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE -HOST_PYTHON_PYCRYPTO_POST_EXTRACT_HOOKS += PYTHON_PYCRYPTO_RENAME_LICENSE -PYTHON_PYCRYPTO_LICENSE_FILES += LEGAL/copy/LICENSE.original - -PYTHON_PYCRYPTO_DEPENDENCIES = gmp -HOST_PYTHON_PYCRYPTO_DEPENDENCIES = host-gmp - -# The configure step needs to be run outside of the setup.py since it isn't -# run correctly for cross-compiling -define PYTHON_PYCRYPTO_CONFIGURE_CMDS - (cd $(@D) && \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure \ - --target=$(GNU_TARGET_NAME) \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ - --prefix=/usr \ - --exec-prefix=/usr \ - --sysconfdir=/etc \ - --program-prefix="" \ - ) -endef - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-pycurl/0001-link-with-crypto.patch b/package.bak/python-pycurl/0001-link-with-crypto.patch deleted file mode 100644 index be4ebe39c4..0000000000 --- a/package.bak/python-pycurl/0001-link-with-crypto.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -uNr pycurl-7.19.5.1-orig/setup.py pycurl-7.19.5.1-new/setup.py ---- pycurl-7.19.5.1-orig/setup.py 2015-01-07 05:37:47.000000000 +0200 -+++ pycurl-7.19.5.1-new/setup.py 2015-04-05 11:44:25.356335107 +0300 -@@ -56,7 +56,7 @@ - self.include_dirs = [] - self.define_macros = [("PYCURL_VERSION", '"%s"' % VERSION)] - self.library_dirs = [] -- self.libraries = [] -+ self.libraries = ['crypto'] - self.runtime_library_dirs = [] - self.extra_objects = [] - self.extra_compile_args = [] diff --git a/package.bak/python-pycurl/Config.in b/package.bak/python-pycurl/Config.in deleted file mode 100644 index 787018779a..0000000000 --- a/package.bak/python-pycurl/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYCURL - bool "python-pycurl" - diff --git a/package.bak/python-pycurl/python-pycurl.mk b/package.bak/python-pycurl/python-pycurl.mk deleted file mode 100644 index 0cd7c72d77..0000000000 --- a/package.bak/python-pycurl/python-pycurl.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pycurl -# -################################################################################ - -PYTHON_PYCURL_VERSION = 7.19.5.1 -PYTHON_PYCURL_SOURCE = pycurl-$(PYTHON_PYCURL_VERSION).tar.gz -PYTHON_PYCURL_SITE = http://pypi.python.org/packages/source/p/pycurl -PYTHON_PYCURL_SETUP_TYPE = distutils -PYTHON_PYCURL_BUILD_OPTS = --curl-config=$(STAGING_DIR)/usr/bin/curl-config --with-ssl -PYTHON_PYCURL_ENV = PATH=$(STAGING_DIR)/usr/bin - -$(eval $(python-package)) diff --git a/package.bak/python-pydal/Config.in b/package.bak/python-pydal/Config.in deleted file mode 100644 index f1c97f91a0..0000000000 --- a/package.bak/python-pydal/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYDAL - bool python-pydal - help - pyDAL is a pure Python Database Abstraction Layer. It - dynamically generates the SQL in real time using the - specified dialect for the database back end, so that you do - not have to write SQL code or learn different SQL dialects - (the term SQL is used generically), and your code will be - portable among different types of databases. - - pyDAL comes from the original web2py's DAL, with the aim of - being wide-compatible. pyDAL doesn't require web2py and can - be used in any Python context. - - https://github.com/web2py/pydal diff --git a/package.bak/python-pydal/python-pydal.hash b/package.bak/python-pydal/python-pydal.hash deleted file mode 100644 index ad17c33c02..0000000000 --- a/package.bak/python-pydal/python-pydal.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pydal/json, sha256 locally computed -md5 74c6cc43d5ee57bcffa804c1204030d8 pyDAL-16.9.tar.gz -sha256 e5e18b10df044c4328a5a2fe0400793a8f643fe3526daee8c99103fc5589476e pyDAL-16.9.tar.gz diff --git a/package.bak/python-pydal/python-pydal.mk b/package.bak/python-pydal/python-pydal.mk deleted file mode 100644 index a0e9729d44..0000000000 --- a/package.bak/python-pydal/python-pydal.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pydal -# -################################################################################ - -PYTHON_PYDAL_VERSION = 16.9 -PYTHON_PYDAL_SOURCE = pyDAL-$(PYTHON_PYDAL_VERSION).tar.gz -PYTHON_PYDAL_SITE = https://pypi.python.org/packages/31/cb/7537f8d848106e3e4b4063955395a5dc3177c32c2cd2cc0a1938a486d4fa -PYTHON_PYDAL_LICENSE = BSD-3c -PYTHON_PYDAL_LICENSE_FILES = LICENSE -PYTHON_PYDAL_SETUP_TYPE = setuptools - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-pyelftools/Config.in b/package.bak/python-pyelftools/Config.in deleted file mode 100644 index ca27302227..0000000000 --- a/package.bak/python-pyelftools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYELFTOOLS - bool "python-pyelftools" - help - Pyelftools is a Python library for parsing and analyzing ELF - files and DWARF debug information. - - https://github.com/eliben/pyelftools diff --git a/package.bak/python-pyelftools/python-pyelftools.hash b/package.bak/python-pyelftools/python-pyelftools.hash deleted file mode 100644 index e345a5bbf9..0000000000 --- a/package.bak/python-pyelftools/python-pyelftools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494/pyelftools-0.24.tar.gz#md5=c960d5fe0a9308d96ba38b4beec8ac8e -md5 c960d5fe0a9308d96ba38b4beec8ac8e pyelftools-0.24.tar.gz -# Locally calculated -sha256 e9dd97d685a5b96b88a988dabadb88e5a539b64cd7d7927fac9a7368dc4c459c pyelftools-0.24.tar.gz diff --git a/package.bak/python-pyelftools/python-pyelftools.mk b/package.bak/python-pyelftools/python-pyelftools.mk deleted file mode 100644 index 5b5b488cf0..0000000000 --- a/package.bak/python-pyelftools/python-pyelftools.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyelftools -# -################################################################################ - -PYTHON_PYELFTOOLS_VERSION = 0.24 -PYTHON_PYELFTOOLS_SOURCE = pyelftools-$(PYTHON_PYELFTOOLS_VERSION).tar.gz -PYTHON_PYELFTOOLS_SITE = https://pypi.python.org/packages/ba/78/d4a186a2e38731286c99dc3e3ca8123b6f55cf2e28608e8daf2d84b65494 -PYTHON_PYELFTOOLS_LICENSE = Public domain -PYTHON_PYELFTOOLS_LICENSE_FILES = LICENSE -PYTHON_PYELFTOOLS_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pyftpdlib/Config.in b/package.bak/python-pyftpdlib/Config.in deleted file mode 100644 index e25c34e5a3..0000000000 --- a/package.bak/python-pyftpdlib/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYFTPDLIB - bool "python-pyftpdlib" - help - Extremely fast and scalable Python FTP server library. - - https://github.com/giampaolo/pyftpdlib diff --git a/package.bak/python-pyftpdlib/python-pyftpdlib.hash b/package.bak/python-pyftpdlib/python-pyftpdlib.hash deleted file mode 100644 index 9726f9f723..0000000000 --- a/package.bak/python-pyftpdlib/python-pyftpdlib.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=61b23e2362df23d0dfa5fe76f6e2ab55, sha256 locally computed -md5 61b23e2362df23d0dfa5fe76f6e2ab55 pyftpdlib-1.5.1.tar.gz -sha256 7bcd7fc825123414a157718c6dcdcb0978208d3c865d4650564acef4acce3354 pyftpdlib-1.5.1.tar.gz diff --git a/package.bak/python-pyftpdlib/python-pyftpdlib.mk b/package.bak/python-pyftpdlib/python-pyftpdlib.mk deleted file mode 100644 index 85d0b56adf..0000000000 --- a/package.bak/python-pyftpdlib/python-pyftpdlib.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyftpdlib -# -################################################################################ - -PYTHON_PYFTPDLIB_VERSION = 1.5.1 -PYTHON_PYFTPDLIB_SOURCE = pyftpdlib-$(PYTHON_PYFTPDLIB_VERSION).tar.gz -PYTHON_PYFTPDLIB_SITE = https://pypi.python.org/packages/a8/f8/0f6db156898616dbcbd7bf865660295c81479071ab0fcd1898fe1b3a4fc4 -PYTHON_PYFTPDLIB_SETUP_TYPE = setuptools -PYTHON_PYFTPDLIB_LICENSE = MIT -PYTHON_PYFTPDLIB_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pygame/Config.in b/package.bak/python-pygame/Config.in deleted file mode 100644 index 932b0f1229..0000000000 --- a/package.bak/python-pygame/Config.in +++ /dev/null @@ -1,54 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYGAME - bool "python-pygame" - select BR2_PACKAGE_SDL - help - Pygame is a cross-platfrom library designed to make it easy to write - multimedia software, such as games, in Python. Pygame requires the - Python language and SDL multimedia library. - It can also make use of several other popular libraries. - - http://www.pygame.org/ - -if BR2_PACKAGE_PYTHON_PYGAME -config BR2_PACKAGE_PYTHON_PYGAME_IMAGE - bool "pygame.image" - select BR2_PACKAGE_SDL_IMAGE - select BR2_PACKAGE_SDL_IMAGE_PNG - select BR2_PACKAGE_SDL_IMAGE_JPEG - help - pygame module for loading, saving and transfering images. - Will autoselect sdl_image with png and jpeg support. - -config BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES - bool "pygame.examples" - help - Include examples. - Selecting this option adds about 1.5 MB to the target file system. - -config BR2_PACKAGE_PYTHON_PYGAME_FONT - bool "pygame.font" - select BR2_PACKAGE_SDL_TTF - help - pygame module for loading and rendering fonts. - Will autoselect sdl_ttf. - -config BR2_PACKAGE_PYTHON_PYGAME_MIXER - bool "pygame.mixer" - select BR2_PACKAGE_SDL_MIXER - help - pygame module for loading and playing sounds. - Will autoselect sdl_mixer. - -config BR2_PACKAGE_PYTHON_PYGAME_MIXER_MUSIC - bool "pygame.mixer.music" - depends on BR2_PACKAGE_PYTHON_PYGAME_MIXER - help - pygame module for controlling streamed audio - -config BR2_PACKAGE_PYTHON_PYGAME_SCRAP - bool "pygame.scrap" - depends on BR2_PACKAGE_SDL_X11 - help - pygame module for clipboard support (X11 needed) - -endif diff --git a/package.bak/python-pygame/python-pygame.mk b/package.bak/python-pygame/python-pygame.mk deleted file mode 100644 index 1ef2bdf62b..0000000000 --- a/package.bak/python-pygame/python-pygame.mk +++ /dev/null @@ -1,111 +0,0 @@ -################################################################################ -# -# python-pygame -# -################################################################################ - -# stable 1.9.1 release requires V4L which has been wiped out of recent Linux -# kernels, so use latest mercurial revision until next stable release is out. -PYTHON_PYGAME_VERSION = d61ea8eabd56 -PYTHON_PYGAME_SOURCE = pygame-$(PYTHON_PYGAME_VERSION).tar.gz -PYTHON_PYGAME_SITE = https://bitbucket.org/pygame/pygame -PYTHON_PYGAME_SITE_METHOD = hg -PYTHON_PYGAME_SETUP_TYPE = distutils -PYTHON_PYGAME_LICENSE = LGPLv2.1+ -PYTHON_PYGAME_LICENSE_FILES = LGPL - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_image -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_ttf -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -PYTHON_PYGAME_OPT_DEPENDS += sdl_mixer -endif - -PYTHON_PYGAME_DEPENDENCIES = sdl $(PYTHON_PYGAME_OPT_DEPENDS) - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_IMAGE),y) -define PYTHON_PYGAME_UNCONFIGURE_IMAGE - $(SED) 's/^imageext/#imageext/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_FONT),y) -define PYTHON_PYGAME_UNCONFIGURE_FONT - $(SED) 's/^font/#font/' $(@D)/Setup -endef -endif - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_MIXER),y) -define PYTHON_PYGAME_UNCONFIGURE_MIXER - $(SED) 's/^mixer/#mixer/g' $(@D)/Setup -endef -endif - -# Both require numpy or numeric python module -define PYTHON_PYGAME_UNCONFIGURE_SNDARRAY - $(SED) 's/^_numericsndarray/#_numericsndarray/' $(@D)/Setup -endef - -define PYTHON_PYGAME_UNCONFIGURE_SURFARRAY - $(SED) 's/^_numericsurfarray/#_numericsurfarray/' $(@D)/Setup -endef - -# Requires smpeg -define PYTHON_PYGAME_UNCONFIGURE_MOVIE - $(SED) 's/^movie/#movie/' $(@D)/Setup -endef - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_SCRAP),y) -define PYTHON_PYGAME_UNCONFIGURE_SCRAP - $(SED) 's/^scrap/#scrap/' $(@D)/Setup -endef -endif - -define PYTHON_PYGAME_UNCONFIGURE_FREETYPE - $(SED) 's/^_freetype/#_freetype/' $(@D)/Setup -endef - -PYTHON_PYGAME_SDL_FLAGS = `$(STAGING_DIR)/usr/bin/sdl-config --cflags` -PYTHON_PYGAME_SDL_FLAGS += `$(STAGING_DIR)/usr/bin/sdl-config --libs` - -# Pygame needs a Setup file where options should be commented out if -# dependencies are not available -define PYTHON_PYGAME_CONFIGURE_CMDS - cp -f $(@D)/Setup.in $(@D)/Setup - $(SED) "s~^SDL = ~SDL = $(PYTHON_PYGAME_SDL_FLAGS) \n#~" $(@D)/Setup - $(SED) 's/^pypm/#pypm/' $(@D)/Setup - $(PYTHON_PYGAME_UNCONFIGURE_IMAGE) - $(PYTHON_PYGAME_UNCONFIGURE_FONT) - $(PYTHON_PYGAME_UNCONFIGURE_MIXER) - $(PYTHON_PYGAME_UNCONFIGURE_SNDARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_SURFARRAY) - $(PYTHON_PYGAME_UNCONFIGURE_MOVIE) - $(PYTHON_PYGAME_UNCONFIGURE_SCRAP) - $(PYTHON_PYGAME_UNCONFIGURE_FREETYPE) -endef - -define PYTHON_PYGAME_REMOVE_DOC - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/docs -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_DOC - -define PYTHON_PYGAME_REMOVE_TESTS - rm -rf $(TARGET_DIR)/usr/lib/python*/site-packages/pygame/tests -endef - -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_TESTS - -ifneq ($(BR2_PACKAGE_PYTHON_PYGAME_EXAMPLES),y) -define PYTHON_PYGAME_REMOVE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/pygame/examples -endef -PYTHON_PYGAME_POST_INSTALL_TARGET_HOOKS += PYTHON_PYGAME_REMOVE_EXAMPLES -endif - -$(eval $(python-package)) diff --git a/package.bak/python-pygments/Config.in b/package.bak/python-pygments/Config.in deleted file mode 100644 index f097c52397..0000000000 --- a/package.bak/python-pygments/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYGMENTS - bool "python-pygments" - help - Pygments is a syntax highlighting package written in Python. - - https://pypi.python.org/pypi/Pygments diff --git a/package.bak/python-pygments/python-pygments.hash b/package.bak/python-pygments/python-pygments.hash deleted file mode 100644 index 2af1597fe8..0000000000 --- a/package.bak/python-pygments/python-pygments.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pygments/json, sha256 locally computed -md5 ed3fba2467c8afcda4d317e4ef2c6150 Pygments-2.1.3.tar.gz -sha256 88e4c8a91b2af5962bfa5ea2447ec6dd357018e86e94c7d14bd8cacbc5b55d81 Pygments-2.1.3.tar.gz diff --git a/package.bak/python-pygments/python-pygments.mk b/package.bak/python-pygments/python-pygments.mk deleted file mode 100644 index 16ed90dc37..0000000000 --- a/package.bak/python-pygments/python-pygments.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pygments -# -################################################################################ - -PYTHON_PYGMENTS_VERSION = 2.1.3 -PYTHON_PYGMENTS_SOURCE = Pygments-$(PYTHON_PYGMENTS_VERSION).tar.gz -PYTHON_PYGMENTS_SITE = https://pypi.python.org/packages/b8/67/ab177979be1c81bc99c8d0592ef22d547e70bb4c6815c383286ed5dec504 -PYTHON_PYGMENTS_LICENSE = BSD-2c -PYTHON_PYGMENTS_LICENSE_FILES = LICENSE -PYTHON_PYGMENTS_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyicu/Config.in b/package.bak/python-pyicu/Config.in deleted file mode 100644 index a3578f10c1..0000000000 --- a/package.bak/python-pyicu/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYICU - bool "python-pyicu" - depends on !BR2_BINFMT_FLAT # icu - depends on BR2_INSTALL_LIBSTDCPP # icu - select BR2_PACKAGE_ICU - help - Python extension wrapping the ICU C++ API. - - http://pyicu.osafoundation.org/ - -comment "python-pyicu needs a toolchain w/ C++" - depends on !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pyicu/python-pyicu.hash b/package.bak/python-pyicu/python-pyicu.hash deleted file mode 100644 index 69edba83b1..0000000000 --- a/package.bak/python-pyicu/python-pyicu.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/PyICU/json, sha256 locally computed -md5 30f85b7272f15b26c110c9f3e3a9e7a0 PyICU-1.9.5.tar.gz -sha256 73b052b800861fae3281dbaf9c92d12a81cabf3d31912d94c51862e093ef359b PyICU-1.9.5.tar.gz diff --git a/package.bak/python-pyicu/python-pyicu.mk b/package.bak/python-pyicu/python-pyicu.mk deleted file mode 100644 index 5c01421376..0000000000 --- a/package.bak/python-pyicu/python-pyicu.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyicu -# -################################################################################ - -PYTHON_PYICU_VERSION = 1.9.5 -PYTHON_PYICU_SOURCE = PyICU-$(PYTHON_PYICU_VERSION).tar.gz -PYTHON_PYICU_SITE = https://pypi.python.org/packages/a2/9f/1947f288143191b903e58633ee597cb98bc284de28dafb1231b6f8b67b99 -PYTHON_PYICU_LICENSE = MIT -PYTHON_PYICU_LICENSE_FILES = LICENSE -PYTHON_PYICU_DEPENDENCIES = icu -PYTHON_PYICU_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyinotify/Config.in b/package.bak/python-pyinotify/Config.in deleted file mode 100644 index b3e74e13b1..0000000000 --- a/package.bak/python-pyinotify/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYINOTIFY - bool "python-pyinotify" - help - Monitoring filesystems events with inotify on Linux. - - https://github.com/seb-m/pyinotify diff --git a/package.bak/python-pyinotify/python-pyinotify.hash b/package.bak/python-pyinotify/python-pyinotify.hash deleted file mode 100644 index 2bcf0541d0..0000000000 --- a/package.bak/python-pyinotify/python-pyinotify.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7943f198c5cef2bdc121d847937fbe565daaa7d4daaf1b8de8ef5689812f481c python-pyinotify-0.9.6.tar.gz diff --git a/package.bak/python-pyinotify/python-pyinotify.mk b/package.bak/python-pyinotify/python-pyinotify.mk deleted file mode 100644 index b4ea66299d..0000000000 --- a/package.bak/python-pyinotify/python-pyinotify.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-pyinotify -# -################################################################################ - -PYTHON_PYINOTIFY_VERSION = 0.9.6 -PYTHON_PYINOTIFY_SITE = $(call github,seb-m,pyinotify,$(PYTHON_PYINOTIFY_VERSION)) -PYTHON_PYINOTIFY_SETUP_TYPE = setuptools -PYTHON_PYINOTIFY_LICENSE = MIT -PYTHON_PYINOTIFY_LICENSE_FILES = COPYING - -$(eval $(python-package)) diff --git a/package.bak/python-pylru/Config.in b/package.bak/python-pylru/Config.in deleted file mode 100644 index c174576942..0000000000 --- a/package.bak/python-pylru/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYLRU - bool "python-pylru" - help - A least recently used (LRU) cache implementation. - - https://github.com/jlhutch/pylru diff --git a/package.bak/python-pylru/python-pylru.hash b/package.bak/python-pylru/python-pylru.hash deleted file mode 100644 index 806ea36a0f..0000000000 --- a/package.bak/python-pylru/python-pylru.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pylru/json, sha256 locally computed -md5 41369d58a1c4391c5cc36f84262abcdc pylru-1.0.9.tar.gz -sha256 71376192671f0ad1690b2a7427d39a29b1df994c8469a9b46b03ed7e28c0172c pylru-1.0.9.tar.gz diff --git a/package.bak/python-pylru/python-pylru.mk b/package.bak/python-pylru/python-pylru.mk deleted file mode 100644 index e670f3d1cf..0000000000 --- a/package.bak/python-pylru/python-pylru.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pylru -# -################################################################################ - -PYTHON_PYLRU_VERSION = 1.0.9 -PYTHON_PYLRU_SOURCE = pylru-$(PYTHON_PYLRU_VERSION).tar.gz -PYTHON_PYLRU_SITE = https://pypi.python.org/packages/c0/7d/0de1055632f3871dfeaabe5a3f0510317cd98b93e7b792b44e4c7de2b17b -PYTHON_PYLRU_SETUP_TYPE = distutils -PYTHON_PYLRU_LICENSE = GPLv2 -PYTHON_PYLRU_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-pymongo/Config.in b/package.bak/python-pymongo/Config.in deleted file mode 100644 index 3badfe9089..0000000000 --- a/package.bak/python-pymongo/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYMONGO - bool "python-pymongo" - depends on BR2_PACKAGE_PYTHON - help - Python driver for MongoDB - - http://www.mongodb.org diff --git a/package.bak/python-pymongo/python-pymongo.mk b/package.bak/python-pymongo/python-pymongo.mk deleted file mode 100644 index 7c72a9aa75..0000000000 --- a/package.bak/python-pymongo/python-pymongo.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-pymongo -# -################################################################################ - -PYTHON_PYMONGO_VERSION = 3.4.0 -PYTHON_PYMONGO_SOURCE = pymongo-$(PYTHON_PYMONGO_VERSION).tar.gz -PYTHON_PYMONGO_SITE = https://pypi.python.org/packages/82/26/f45f95841de5164c48e2e03aff7f0702e22cef2336238d212d8f93e91ea8 -PYTHON_PYMONGO_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pymysql/Config.in b/package.bak/python-pymysql/Config.in deleted file mode 100644 index 75b447cbd1..0000000000 --- a/package.bak/python-pymysql/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYMYSQL - bool "python-pymysql" - help - PyMySQL is a pure-Python MySQL client library. It follows - the DB-API 2.0. - - https://pypi.python.org/pypi/PyMySQL/ diff --git a/package.bak/python-pymysql/python-pymysql.hash b/package.bak/python-pymysql/python-pymysql.hash deleted file mode 100644 index 9e058abf30..0000000000 --- a/package.bak/python-pymysql/python-pymysql.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pymysql/json, sha256 locally computed -md5 bf82311ac2df4c43adad003a8c805b90 PyMySQL-0.7.9.tar.gz -sha256 2331f82b7b85d407c8d9d7a8d7901a6abbeb420533e5d5d64ded5009b5c6dcc3 PyMySQL-0.7.9.tar.gz diff --git a/package.bak/python-pymysql/python-pymysql.mk b/package.bak/python-pymysql/python-pymysql.mk deleted file mode 100644 index 94a93a26cf..0000000000 --- a/package.bak/python-pymysql/python-pymysql.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pymysql -# -################################################################################ - -PYTHON_PYMYSQL_VERSION = 0.7.9 -PYTHON_PYMYSQL_SOURCE = PyMySQL-$(PYTHON_PYMYSQL_VERSION).tar.gz -PYTHON_PYMYSQL_SITE = https://pypi.python.org/packages/a4/c4/c15457f261fda9839637de044eca9b6da8f55503183fe887523801b85701 -PYTHON_PYMYSQL_LICENSE = MIT -PYTHON_PYMYSQL_LICENSE_FILES = LICENSE -PYTHON_PYMYSQL_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pynacl/Config.in b/package.bak/python-pynacl/Config.in deleted file mode 100644 index 5a53648cb9..0000000000 --- a/package.bak/python-pynacl/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYNACL - bool "python-pynacl" - select BR2_PACKAGE_LIBSODIUM - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_CFFI # runtime - help - Python binding to the Networking and Cryptography (NaCl) library. - - https://pypi.python.org/pypi/PyNaCl diff --git a/package.bak/python-pynacl/python-pynacl.hash b/package.bak/python-pynacl/python-pynacl.hash deleted file mode 100644 index 7035ac7637..0000000000 --- a/package.bak/python-pynacl/python-pynacl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=12fd03d8ce64e0318cb1c69272f17704, sha256 locally computed. -md5 12fd03d8ce64e0318cb1c69272f17704 PyNaCl-1.0.1.tar.gz -sha256 d21d7a7358a85fb9b9ddadfbd1176c40fe199334fe2202881255e77f6d3773f4 PyNaCl-1.0.1.tar.gz diff --git a/package.bak/python-pynacl/python-pynacl.mk b/package.bak/python-pynacl/python-pynacl.mk deleted file mode 100644 index e1769b8f70..0000000000 --- a/package.bak/python-pynacl/python-pynacl.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pynacl -# -################################################################################ - -PYTHON_PYNACL_VERSION = 1.0.1 -PYTHON_PYNACL_SOURCE = PyNaCl-$(PYTHON_PYNACL_VERSION).tar.gz -PYTHON_PYNACL_SITE = http://pypi.python.org/packages/source/P/PyNaCl -PYTHON_PYNACL_LICENSE = Apache-2.0 -PYTHON_PYNACL_LICENSE_FILES = LICENSE -PYTHON_PYNACL_SETUP_TYPE = setuptools -PYTHON_PYNACL_DEPENDENCIES = libsodium host-python-cffi -PYTHON_PYNACL_ENV = SODIUM_INSTALL=system - -$(eval $(python-package)) diff --git a/package.bak/python-pyopenssl/Config.in b/package.bak/python-pyopenssl/Config.in deleted file mode 100644 index c32e211e17..0000000000 --- a/package.bak/python-pyopenssl/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYOPENSSL - bool "python-pyopenssl" - depends on BR2_INSTALL_LIBSTDCPP # python-cryptography - select BR2_PACKAGE_PYTHON_CRYPTOGRAPHY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Python wrapper module around the OpenSSL library. - - https://github.com/pyca/pyopenssl - -comment "python-pyopenssl needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pyopenssl/python-pyopenssl.hash b/package.bak/python-pyopenssl/python-pyopenssl.hash deleted file mode 100644 index 894c4f8bab..0000000000 --- a/package.bak/python-pyopenssl/python-pyopenssl.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyopenssl/json, sha256 locally computed -md5 6635503758c65ea6f70d18d1b18e46d5 pyOpenSSL-16.2.0.tar.gz -sha256 7779a3bbb74e79db234af6a08775568c6769b5821faecf6e2f4143edb227516e pyOpenSSL-16.2.0.tar.gz diff --git a/package.bak/python-pyopenssl/python-pyopenssl.mk b/package.bak/python-pyopenssl/python-pyopenssl.mk deleted file mode 100644 index a5312a0635..0000000000 --- a/package.bak/python-pyopenssl/python-pyopenssl.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyopenssl -# -################################################################################ - -PYTHON_PYOPENSSL_VERSION = 16.2.0 -PYTHON_PYOPENSSL_SOURCE = pyOpenSSL-$(PYTHON_PYOPENSSL_VERSION).tar.gz -PYTHON_PYOPENSSL_SITE = https://pypi.python.org/packages/0c/d6/b1fe519846a21614fa4f8233361574eddb223e0bc36b182140d916acfb3b -PYTHON_PYOPENSSL_LICENSE = Apache-2.0 -PYTHON_PYOPENSSL_LICENSE_FILES = LICENSE -PYTHON_PYOPENSSL_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyparsing/Config.in b/package.bak/python-pyparsing/Config.in deleted file mode 100644 index b926286cc4..0000000000 --- a/package.bak/python-pyparsing/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPARSING - bool "python-pyparsing" - help - The pyparsing module is an alternative approach to creating and - executing simple grammars, vs. the traditional lex/yacc approach, - or the use of regular expressions. The pyparsing module provides - a library of classes that client code uses to construct the grammar - directly in Python code. - - http://pyparsing.wikispaces.com/ diff --git a/package.bak/python-pyparsing/python-pyparsing.hash b/package.bak/python-pyparsing/python-pyparsing.hash deleted file mode 100644 index 6cf686a809..0000000000 --- a/package.bak/python-pyparsing/python-pyparsing.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyparsing/json, sha256 locally computed -md5 ee943c354eac79526533c58342f322c7 pyparsing-2.1.9.tar.gz -sha256 93326f5490bcfe7069806ff342692e75f72529cfa82f20683b5fceeb5d4a7fc2 pyparsing-2.1.9.tar.gz diff --git a/package.bak/python-pyparsing/python-pyparsing.mk b/package.bak/python-pyparsing/python-pyparsing.mk deleted file mode 100644 index 652345d300..0000000000 --- a/package.bak/python-pyparsing/python-pyparsing.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyparsing -# -################################################################################ - -PYTHON_PYPARSING_VERSION = 2.1.9 -PYTHON_PYPARSING_SOURCE = pyparsing-$(PYTHON_PYPARSING_VERSION).tar.gz -PYTHON_PYPARSING_SITE = https://pypi.python.org/packages/87/ee/6f3a94d834c82a5c1a74f2fc77775ff05b5fbbf7d97f844e6fff5e2ff94b -PYTHON_PYPARSING_LICENSE = MIT -PYTHON_PYPARSING_LICENSE_FILES = LICENSE -PYTHON_PYPARSING_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyparted/Config.in b/package.bak/python-pyparted/Config.in deleted file mode 100644 index 150159559b..0000000000 --- a/package.bak/python-pyparted/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPARTED - bool "python-pyparted" - depends on BR2_USE_WCHAR - select BR2_PACKAGE_PYTHON_CFFI # runtime - select BR2_PACKAGE_PARTED - help - Python bindings for GNU parted (libparted). - - https://github.com/rhinstaller/pyparted - -comment "pyparted needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/python-pyparted/python-pyparted.hash b/package.bak/python-pyparted/python-pyparted.hash deleted file mode 100644 index a2adc41083..0000000000 --- a/package.bak/python-pyparted/python-pyparted.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 5914e3a60437fe3e3758a9e86ee4a539dfa46cfe18e3df386a5cf1f75a963431 python-pyparted-v3.10.7.tar.gz diff --git a/package.bak/python-pyparted/python-pyparted.mk b/package.bak/python-pyparted/python-pyparted.mk deleted file mode 100644 index 4bf58c49eb..0000000000 --- a/package.bak/python-pyparted/python-pyparted.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyparted -# -################################################################################ - -PYTHON_PYPARTED_VERSION = v3.10.7 -PYTHON_PYPARTED_SITE = $(call github,rhinstaller,pyparted,$(PYTHON_PYPARTED_VERSION)) -PYTHON_PYPARTED_SETUP_TYPE = distutils -PYTHON_PYPARTED_LICENSE = GPLv2+ -PYTHON_PYPARTED_LICENSE_FILES = COPYING -PYTHON_PYPARTED_DEPENDENCIES = host-python-cffi parted - -$(eval $(python-package)) diff --git a/package.bak/python-pypcap/Config.in b/package.bak/python-pypcap/Config.in deleted file mode 100644 index ed336ca356..0000000000 --- a/package.bak/python-pypcap/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYPCAP - bool "python-pypcap" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_LIBPCAP - help - The pypcap module is an object-oriented wrapper of the C libpcap library. - - https://code.google.com/p/pypcap/ diff --git a/package.bak/python-pypcap/python-pypcap.hash b/package.bak/python-pypcap/python-pypcap.hash deleted file mode 100644 index 30ddfab411..0000000000 --- a/package.bak/python-pypcap/python-pypcap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 5716d97b39d40b79daf7b0c6a8c8c514f5f1de8f20561c8621ee62a90b93fb03 python-pypcap-6f46e7bf29a648256ddc732a7d0ec83d3ffca390.tar.gz diff --git a/package.bak/python-pypcap/python-pypcap.mk b/package.bak/python-pypcap/python-pypcap.mk deleted file mode 100644 index 97d07f8658..0000000000 --- a/package.bak/python-pypcap/python-pypcap.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# python-pypcap -# -################################################################################ - -PYTHON_PYPCAP_VERSION = 6f46e7bf29a648256ddc732a7d0ec83d3ffca390 -PYTHON_PYPCAP_SITE = $(call github,dugsong,pypcap,$(PYTHON_PYPCAP_VERSION)) -PYTHON_PYPCAP_LICENSE = BSD-3c -PYTHON_PYPCAP_LICENSE_FILES = LICENSE -PYTHON_PYPCAP_SETUP_TYPE = distutils -PYTHON_PYPCAP_DEPENDENCIES = host-python-pyrex libpcap - -define PYTHON_PYPCAP_CONFIGURE_CMDS - $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/pyrexc $(@D)/pcap.pyx - (cd $(@D); \ - $(HOST_DIR)/usr/bin/python setup.py \ - config --with-pcap=$(STAGING_DIR)/usr) -endef - -$(eval $(python-package)) diff --git a/package.bak/python-pyqrcode/Config.in b/package.bak/python-pyqrcode/Config.in deleted file mode 100644 index 01b7ae8132..0000000000 --- a/package.bak/python-pyqrcode/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYQRCODE - bool "python-pyqrcode" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_CODECSCJK if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_CODECSCJK if BR2_PACKAGE_PYTHON3 # runtime - help - A QR code generator written purely in Python with SVG, EPS, - PNG and terminal output. - - https://github.com/mnooner256/pyqrcode diff --git a/package.bak/python-pyqrcode/python-pyqrcode.hash b/package.bak/python-pyqrcode/python-pyqrcode.hash deleted file mode 100644 index 619ddb0cc4..0000000000 --- a/package.bak/python-pyqrcode/python-pyqrcode.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyqrcode/json, sha256 locally computed -md5 371f29f4b03bd2830c6e0319258b1259 PyQRCode-1.2.1.tar.gz -sha256 fdbf7634733e56b72e27f9bce46e4550b75a3a2c420414035cae9d9d26b234d5 PyQRCode-1.2.1.tar.gz diff --git a/package.bak/python-pyqrcode/python-pyqrcode.mk b/package.bak/python-pyqrcode/python-pyqrcode.mk deleted file mode 100644 index 67e167a4bb..0000000000 --- a/package.bak/python-pyqrcode/python-pyqrcode.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyqrcode -# -################################################################################ - -PYTHON_PYQRCODE_VERSION = 1.2.1 -PYTHON_PYQRCODE_SOURCE = PyQRCode-$(PYTHON_PYQRCODE_VERSION).tar.gz -PYTHON_PYQRCODE_SITE = https://pypi.python.org/packages/37/61/f07226075c347897937d4086ef8e55f0a62ae535e28069884ac68d979316 -PYTHON_PYQRCODE_SETUP_TYPE = setuptools -PYTHON_PYQRCODE_LICENSE = BSD-3c -PYTHON_PYQRCODE_LICENSE_FILES = setup.py - -$(eval $(python-package)) diff --git a/package.bak/python-pyqt/0001-configure-skip-qtdetail.patch b/package.bak/python-pyqt/0001-configure-skip-qtdetail.patch deleted file mode 100644 index 08e99d026c..0000000000 --- a/package.bak/python-pyqt/0001-configure-skip-qtdetail.patch +++ /dev/null @@ -1,29 +0,0 @@ -Do not run qtdetail - -qtdetail is a tool that generates qtdetail.out. Since this program is -cross-compiled, it's not possible to run it on the host. - -Consequently, python-pyqt.mk generates the qtdetail.out file before -calling configure-ng.py. - -Therefore, this patch makes sure that the pre-generated qtdetail.out -file is kept, and that qtdetail is not executed. - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt-x11-gpl-4.11.3/configure-ng.py -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py -+++ PyQt-x11-gpl-4.11.3/configure-ng.py -@@ -672,10 +672,6 @@ int main(int argc, char **argv) - if cmd is None: - error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") - -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(cmd, verbose) -- - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) - diff --git a/package.bak/python-pyqt/0002-configure-set-qws.patch b/package.bak/python-pyqt/0002-configure-set-qws.patch deleted file mode 100644 index 33a5648bee..0000000000 --- a/package.bak/python-pyqt/0002-configure-set-qws.patch +++ /dev/null @@ -1,43 +0,0 @@ -Add support for several Qt flavors - -Qt has two flavors: X11 and embedded (QWS). QWS has some limitations -compared to X11. This patch adds an option to select which version to -use. - -Signed-off-by: Gwenhael Goavec-Merou ---- -Index: PyQt-x11-gpl-4.11.3/configure-ng.py -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/configure-ng.py -+++ PyQt-x11-gpl-4.11.3/configure-ng.py -@@ -960,6 +960,9 @@ int main(int argc, char **argv) - if opts.vendlibdir is not None: - self.vend_lib_dir = opts.vendlibdir - -+ if opts.qtflavor is not None: -+ self.qt_flavor = opts.qtflavor -+ - # Handle any conflicts. - if self.qt_shared: - if len(self.static_plugins) != 0: -@@ -1177,6 +1180,11 @@ def create_optparser(target_config): - dest="notools", - help="disable the building of pyuic5, pyrcc5 and pylupdate5 " - "[default: enabled]") -+ g.add_option("--qt-flavor", dest='qtflavor', type='string', -+ default="WS_X11", metavar='QTFLAVOR', action='store', -+ help="select Qt flavor beetween WS_X11 and WS_QWS " -+ "only available on Linux)" -+ "[default: WS_X11]") - p.add_option_group(g) - - # Vendor ID. -@@ -2088,7 +2096,7 @@ def get_sip_flags(target_config): - elif target_config.py_platform == 'darwin': - plattag = 'WS_MACX' - else: -- plattag = 'WS_X11' -+ plattag = target_config.qt_flavor - - sip_flags.append('-t') - sip_flags.append(plattag) diff --git a/package.bak/python-pyqt/0003-sip-add_qws.patch b/package.bak/python-pyqt/0003-sip-add_qws.patch deleted file mode 100644 index 1ff706f624..0000000000 --- a/package.bak/python-pyqt/0003-sip-add_qws.patch +++ /dev/null @@ -1,44 +0,0 @@ -Add WS_QWS in the Platforms variable and to define some types - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/QtCoremod.sip -+++ PyQt-x11-gpl-4.11.3/sip/QtCore/QtCoremod.sip -@@ -29,7 +29,7 @@ - - %Timeline {Qt_4_1_0 Qt_4_1_1 Qt_4_1_2 Qt_4_1_3 Qt_4_2_0 Qt_4_2_1 Qt_4_2_2 Qt_4_2_3 Qt_4_3_0 Qt_4_3_1 Qt_4_3_2 Qt_4_3_3 Qt_4_3_4 Qt_4_4_0 Qt_4_4_1 Qt_4_4_2 Qt_4_5_0 Qt_4_5_1 Qt_4_5_2 Qt_4_5_3 Qt_4_6_0 Qt_4_6_1 Qt_4_6_2 Qt_4_6_3 Qt_4_7_0 Qt_4_7_1 Qt_4_7_2 Qt_4_7_3 Qt_4_7_4 Qt_4_8_0 Qt_4_8_1 Qt_4_8_2 Qt_4_8_3 Qt_4_8_4 Qt_4_8_5 Qt_4_8_6 Qt_5_0_0} - --%Platforms {WS_X11 WS_WIN WS_MACX} -+%Platforms {WS_X11 WS_QWS WS_WIN WS_MACX} - - %Feature PyQt_Accessibility - %Feature PyQt_SessionManager -Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qprocess.sip -+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qprocess.sip -@@ -28,7 +28,7 @@ - %If (WS_WIN) - typedef void *Q_PID; - %End --%If (WS_X11 || WS_MACX) -+%If (WS_X11 || WS_QWS || WS_MACX) - typedef qint64 Q_PID; - %End - -Index: PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/sip/QtGui/qwindowdefs.sip -+++ PyQt-x11-gpl-4.11.3/sip/QtGui/qwindowdefs.sip -@@ -27,7 +27,7 @@ - - typedef QList QWidgetList; - %If (- Qt_5_0_0) --%If (WS_X11) -+%If (WS_X11 || WS_QWS) - // X11 specific definitions. - typedef unsigned long WId; - %End diff --git a/package.bak/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch b/package.bak/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch deleted file mode 100644 index c07bea777f..0000000000 --- a/package.bak/python-pyqt/0004-sip-QtGuit-hide-qfont-cachestatistics.patch +++ /dev/null @@ -1,18 +0,0 @@ -Hide QFont::cacheStatistics which isn't available in QWS - -Signed-off-by: Sergey Kostanbaev ---- - -diff -ur PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip pyqt-4.9.6/sip/QtGui/qfont.sip ---- PyQt-x11-gpl-4.9.6/sip/QtGui/qfont.sip 2012-12-08 13:51:38.000000000 +0400 -+++ pyqt-4.9.6/sip/QtGui/qfont.sip 2013-05-22 14:06:38.335000022 +0400 -@@ -185,7 +185,9 @@ - %End - static void initialize(); - static void cleanup(); -+%If (!WS_QWS) - static void cacheStatistics(); -+%End - QString defaultFamily() const; - QString lastResortFamily() const; - QString lastResortFont() const; diff --git a/package.bak/python-pyqt/0005-sip-fix_qws_handle.patch b/package.bak/python-pyqt/0005-sip-fix_qws_handle.patch deleted file mode 100644 index 80623d112a..0000000000 --- a/package.bak/python-pyqt/0005-sip-fix_qws_handle.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix build issue in QWS flavor - -Change HANDLE to void* to get rid of : -buildroot/output/build/python-pyqt-4.11.3/QtCore/sipQtCoreQThread.cpp:318:50: -error: invalid conversion from 'Qt::HANDLE {aka void*}' to 'long -unsigned int' [-fpermissive] error during compilation. - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip -=================================================================== ---- PyQt-x11-gpl-4.11.3.orig/sip/QtCore/qnamespace.sip -+++ PyQt-x11-gpl-4.11.3/sip/QtCore/qnamespace.sip -@@ -1673,6 +1673,9 @@ namespace Qt - %If (WS_X11) - typedef unsigned long HANDLE; - %End -+%If (WS_QWS) -+ typedef void* HANDLE; -+%End - %End - %If (PyQt_Deprecated_5_0) - typedef Qt::WindowFlags WFlags; diff --git a/package.bak/python-pyqt/Config.in b/package.bak/python-pyqt/Config.in deleted file mode 100644 index 6934a4c4ab..0000000000 --- a/package.bak/python-pyqt/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -comment "python-pyqt needs Qt4" - depends on !BR2_PACKAGE_QT - -config BR2_PACKAGE_PYTHON_PYQT - bool "python-pyqt" - depends on BR2_PACKAGE_QT - select BR2_PACKAGE_PYTHON_SIP - help - PyQt4 for Qt Embedded 4 bindings. - - http://www.riverbankcomputing.com/software/pyqt/ - -if BR2_PACKAGE_PYTHON_PYQT - -config BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT - bool - default y if BR2_arm || BR2_armeb - default y if BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb - default y if (BR2_mipsel || BR2_mips) && BR2_PACKAGE_QT_EMBEDDED - -endif diff --git a/package.bak/python-pyqt/python-pyqt.hash b/package.bak/python-pyqt/python-pyqt.hash deleted file mode 100644 index 1709b66ab8..0000000000 --- a/package.bak/python-pyqt/python-pyqt.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.11.3/ -md5 997c3e443165a89a559e0d96b061bf70 PyQt-x11-gpl-4.11.3.tar.gz - -# Locally calculated: -sha256 853780dcdbe2e6ba785d703d059b096e1fc49369d3e8d41a060be874b8745686 PyQt-x11-gpl-4.11.3.tar.gz diff --git a/package.bak/python-pyqt/python-pyqt.mk b/package.bak/python-pyqt/python-pyqt.mk deleted file mode 100644 index 50e835170f..0000000000 --- a/package.bak/python-pyqt/python-pyqt.mk +++ /dev/null @@ -1,113 +0,0 @@ -################################################################################ -# -# python-pyqt -# -################################################################################ - -PYTHON_PYQT_VERSION = 4.11.3 -PYTHON_PYQT_SOURCE = PyQt-x11-gpl-$(PYTHON_PYQT_VERSION).tar.gz -PYTHON_PYQT_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt4/PyQt-$(PYTHON_PYQT_VERSION) -PYTHON_PYQT_LICENSE = GPLv2 or GPLv3 -PYTHON_PYQT_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPL3 - -PYTHON_PYQT_DEPENDENCIES = python-sip host-python-sip qt - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT_RM_PORT_BASE = port_v2 -endif - -ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y) -PYTHON_PYQT_QTFLAVOR = WS_QWS -else -PYTHON_PYQT_QTFLAVOR = WS_X11 -endif - -PYTHON_PYQT_QTDETAIL_LICENSE = Open Source - -ifeq ($(BR2_PACKAGE_QT_SHARED),y) -PYTHON_PYQT_QTDETAIL_TYPE = shared -endif - -# Turn off features that aren't available in QWS and current qt -# configuration. -PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES = \ - PyQt_Accessibility PyQt_SessionManager \ - PyQt_Shortcut PyQt_RawFont - -ifeq ($(BR2_PACKAGE_QT_OPENSSL),) -PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_OpenSSL -endif - -# Yes, this looks a bit weird: when OpenGL ES is available, we have to -# disable the feature that consists in not having OpenGL ES support. -ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) -PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_NoOpenGLES -endif - -# PyQt_qreal_double must be disabled on a number of architectures that -# use float for qreal. -ifeq ($(BR2_PACKAGE_PYTHON_PYQT_ARCH_USES_QREAL_FLOAT),y) -PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES += PyQt_qreal_double -endif - -define PYTHON_PYQT_QTDETAIL - echo $(1) >> $(2)/qtdetail.out -endef - -# Since we can't run generate qtdetail.out by running qtdetail on target device -# we must generate the configuration. -define PYTHON_PYQT_GENERATE_QTDETAIL - $(RM) -f $(1)/qtdetail.out - $(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_LICENSE),$(1)) - $(call PYTHON_PYQT_QTDETAIL,$(PYTHON_PYQT_QTDETAIL_TYPE),$(1)) - $(foreach f,$(PYTHON_PYQT_QTDETAIL_DISABLE_FEATURES), - $(call PYTHON_PYQT_QTDETAIL,$(f),$(1)) \ - ) -endef - -PYTHON_PYQT_CONF_OPTS = \ - --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages \ - --qmake $(HOST_DIR)/usr/bin/qmake \ - --sysroot $(STAGING_DIR)/usr \ - -w --confirm-license \ - --no-designer-plugin \ - --no-docstrings \ - --no-sip-files \ - --qt-flavor=$(PYTHON_PYQT_QTFLAVOR) - -# The VendorID related information is only needed for Python 2.x, not -# Python 3.x. -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT_CONF_OPTS += \ - --vendorid-incdir $(STAGING_DIR)/usr/include/$(PYTHON_PYQT_PYTHON_DIR) \ - --vendorid-libdir $(STAGING_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/config -endif - -define PYTHON_PYQT_CONFIGURE_CMDS - $(call PYTHON_PYQT_GENERATE_QTDETAIL,$(@D)) - (cd $(@D); \ - $(TARGET_MAKE_ENV) \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python configure-ng.py \ - $(PYTHON_PYQT_CONF_OPTS) \ - ) -endef - -define PYTHON_PYQT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# __init__.py is needed to import PyQt4 -# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set -define PYTHON_PYQT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT_PYTHON_DIR)/site-packages/PyQt4/uic/$(PYTHON_PYQT_RM_PORT_BASE) -endef - -$(eval $(generic-package)) diff --git a/package.bak/python-pyqt5/0001-configure-skip-qtdetail.patch b/package.bak/python-pyqt5/0001-configure-skip-qtdetail.patch deleted file mode 100644 index 2e7b331ed6..0000000000 --- a/package.bak/python-pyqt5/0001-configure-skip-qtdetail.patch +++ /dev/null @@ -1,29 +0,0 @@ -Do not run qtdetail - -qtdetail is a tool that generates qtdetail.out. Since this program is -cross-compiled, it's not possible to run it on the host. - -Consequently, python-pyqt5.mk generates the qtdetail.out file before -calling configure.py. - -Therefore, this patch makes sure that the pre-generated qtdetail.out -file is kept, and that qtdetail is not executed. - -Signed-off-by: Gwenhael Goavec-Merou -Signed-off-by: Sergey Kostanbaev ---- -Index: PyQt5_gpl-5.7/configure.py -=================================================================== ---- PyQt5_gpl-5.7.orig/configure.py -+++ PyQt5_gpl-5.7/configure.py -@@ -672,10 +672,6 @@ int main(int argc, char **argv) - if cmd is None: - error("Failed to determine the detail of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") - -- # Create the output file, first making sure it doesn't exist. -- remove_file(out_file) -- run_command(cmd, verbose) -- - if not os.access(out_file, os.F_OK): - error("%s failed to create %s. Make sure your Qt installation is correct." % (cmd, out_file)) - diff --git a/package.bak/python-pyqt5/0002-fix-qt-5.6.2.patch b/package.bak/python-pyqt5/0002-fix-qt-5.6.2.patch deleted file mode 100644 index a56af09025..0000000000 --- a/package.bak/python-pyqt5/0002-fix-qt-5.6.2.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix the build with Qt 5.6.2 - -Building PyQt 5.7 with versions of Qt older than Qt 5.7 is supposed to -work, but currently fails in practice. In fact, this is due to the -fact that the %Timeline variable in QtCoremod.sip didn't contain the -5.6.2 Qt version, so if this version was used, PyQt was assuming it -was the later version 5.7, and therefore started enabling APIs only -available in Qt 5.7, causing build failures when building against Qt -5.6.2. - -Adding Qt_5_6_2 to the timeline fixes this problem. This fix was -suggested by Phil Thompson . - -Signed-off-by: Thomas Petazzoni - -Index: PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip -=================================================================== ---- PyQt5_gpl-5.7.orig/sip/QtCore/QtCoremod.sip 2016-07-25 15:55:37.000000000 +0200 -+++ PyQt5_gpl-5.7/sip/QtCore/QtCoremod.sip 2016-10-26 15:45:43.577153825 +0200 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", version=1) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_7_0} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_7_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/package.bak/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch b/package.bak/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch deleted file mode 100644 index 146cce0348..0000000000 --- a/package.bak/python-pyqt5/0003-remove-WindowOkButtonHint-and-WindowCancelButtonHint.patch +++ /dev/null @@ -1,27 +0,0 @@ -From bb7cbdede46f72468bbb1b9bbefd43a1dbad21c0 Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Mon, 30 Jan 2017 18:28:15 +0100 -Subject: [PATCH] remove WindowOkButtonHint and WindowCancelButtonHint from - qnamespace.sip as they are removed from qt5.8 - -Signed-off-by: Zoltan Gyarmati ---- - sip/QtCore/qnamespace.sip | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/sip/QtCore/qnamespace.sip b/sip/QtCore/qnamespace.sip -index 2db83b7..559f410 100644 ---- a/sip/QtCore/qnamespace.sip -+++ b/sip/QtCore/qnamespace.sip -@@ -209,8 +209,6 @@ namespace Qt - WindowContextHelpButtonHint, - WindowShadeButtonHint, - WindowStaysOnTopHint, -- WindowOkButtonHint, -- WindowCancelButtonHint, - WindowStaysOnBottomHint, - WindowCloseButtonHint, - MacWindowToolBarButtonHint, --- -2.7.4 - diff --git a/package.bak/python-pyqt5/Config.in b/package.bak/python-pyqt5/Config.in deleted file mode 100644 index 20ac988703..0000000000 --- a/package.bak/python-pyqt5/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -comment "python-pyqt5 needs Qt5" - depends on !BR2_PACKAGE_QT5 - -config BR2_PACKAGE_PYTHON_PYQT5 - bool "python-pyqt5" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_PYTHON_SIP - help - Python bindings for Qt 5 - - http://www.riverbankcomputing.com/software/pyqt/ diff --git a/package.bak/python-pyqt5/python-pyqt5.hash b/package.bak/python-pyqt5/python-pyqt5.hash deleted file mode 100644 index 2a7d05b49a..0000000000 --- a/package.bak/python-pyqt5/python-pyqt5.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from http://http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7, sha256 locally computed -md5 e3dc21f31fd714659f0688e1eb31bacf PyQt5_gpl-5.7.tar.gz -sha256 892693ba5f79989abb2061dad2d5c4e6f127e9dd3240f73f8220c7152cd35b05 PyQt5_gpl-5.7.tar.gz diff --git a/package.bak/python-pyqt5/python-pyqt5.mk b/package.bak/python-pyqt5/python-pyqt5.mk deleted file mode 100644 index e58ee5ad93..0000000000 --- a/package.bak/python-pyqt5/python-pyqt5.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# python-pyqt5 -# -################################################################################ - -PYTHON_PYQT5_VERSION = 5.7 -PYTHON_PYQT5_SOURCE = PyQt5_gpl-$(PYTHON_PYQT5_VERSION).tar.gz -PYTHON_PYQT5_SITE = http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-$(PYTHON_PYQT5_VERSION) -PYTHON_PYQT5_LICENSE = GPLv3 -PYTHON_PYQT5_LICENSE_FILES = LICENSE - -PYTHON_PYQT5_DEPENDENCIES = python-sip host-python-sip qt5base - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v3 -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_PYQT5_PYTHON_DIR = python$(PYTHON3_VERSION_MAJOR) -PYTHON_PYQT5_RM_PORT_BASE = port_v2 -endif - -PYTHON_PYQT5_QTDETAIL_LICENSE = Open Source - -PYTHON_PYQT5_QTDETAIL_TYPE = shared - -# Turn off features that aren't available in current qt configuration -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_OPENSSL),,PyQt_SSL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL),,PyQt_OpenGL) -PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES += $(if $(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),,PyQt_Desktop_OpenGL) - -define PYTHON_PYQT5_QTDETAIL - echo $(1) >> $(2)/qtdetail.out -endef - -# Since we can't run generate qtdetail.out by running qtdetail on target device -# we must generate the configuration. -define PYTHON_PYQT5_GENERATE_QTDETAIL - $(RM) -f $(1)/qtdetail.out - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_LICENSE),$(1)) - $(call PYTHON_PYQT5_QTDETAIL,$(PYTHON_PYQT5_QTDETAIL_TYPE),$(1)) - $(foreach f,$(PYTHON_PYQT5_QTDETAIL_DISABLE_FEATURES), - $(call PYTHON_PYQT5_QTDETAIL,$(f),$(1)) \ - ) -endef - -PYTHON_PYQT5_CONF_OPTS = \ - --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages \ - --qmake $(HOST_DIR)/usr/bin/qmake \ - --sysroot $(STAGING_DIR)/usr \ - -w --confirm-license \ - --no-designer-plugin \ - --no-docstrings \ - --no-sip-files - -define PYTHON_PYQT5_CONFIGURE_CMDS - $(call PYTHON_PYQT5_GENERATE_QTDETAIL,$(@D)) - (cd $(@D); \ - $(TARGET_MAKE_ENV) \ - $(TARGET_CONFIGURE_OPTS) \ - $(HOST_DIR)/usr/bin/python configure.py \ - $(PYTHON_PYQT5_CONF_OPTS) \ - ) -endef - -define PYTHON_PYQT5_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# __init__.py is needed to import PyQt5 -# __init__.pyc is needed if BR2_PACKAGE_PYTHON_PYC_ONLY is set -define PYTHON_PYQT5_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) install - touch $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/__init__.py - $(RM) -rf $(TARGET_DIR)/usr/lib/$(PYTHON_PYQT5_PYTHON_DIR)/site-packages/PyQt5/uic/$(PYTHON_PYQT5_RM_PORT_BASE) -endef - -$(eval $(generic-package)) diff --git a/package.bak/python-pyratemp/Config.in b/package.bak/python-pyratemp/Config.in deleted file mode 100644 index 9a299d1aee..0000000000 --- a/package.bak/python-pyratemp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRATEMP - bool "python-pyratemp" - help - python-pyratemp is a Python library for doing html - templates. written entirely in Python, that is designed to - be very easy to use and very like writing Python. - - https://pypi.python.org/pypi/pyratemp/ diff --git a/package.bak/python-pyratemp/python-pyratemp.hash b/package.bak/python-pyratemp/python-pyratemp.hash deleted file mode 100644 index f3f29a39a8..0000000000 --- a/package.bak/python-pyratemp/python-pyratemp.hash +++ /dev/null @@ -1,4 +0,0 @@ -#md5 from https://pypi.python.org/pypi?:action=show_md5&digest=e4bbe5d4a98016efef882b2b2f47defb -md5 e4bbe5d4a98016efef882b2b2f47defb pyratemp-0.3.2.tgz -# Locally calculated: -sha256 c45ed656ada482a02fe780495f37a695e7671accb04f918f7e7f18abf877bc71 pyratemp-0.3.2.tgz diff --git a/package.bak/python-pyratemp/python-pyratemp.mk b/package.bak/python-pyratemp/python-pyratemp.mk deleted file mode 100644 index 055fb3049c..0000000000 --- a/package.bak/python-pyratemp/python-pyratemp.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyratemp -# -################################################################################ - -PYTHON_PYRATEMP_VERSION = 0.3.2 -PYTHON_PYRATEMP_SOURCE = pyratemp-$(PYTHON_PYRATEMP_VERSION).tgz -PYTHON_PYRATEMP_SITE = https://pypi.python.org/packages/source/p/pyratemp -PYTHON_PYRATEMP_LICENSE = MIT -PYTHON_PYRATEMP_LICENSE_FILES = LICENSE -PYTHON_PYRATEMP_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pyrex/python-pyrex.hash b/package.bak/python-pyrex/python-pyrex.hash deleted file mode 100644 index 607d30360b..0000000000 --- a/package.bak/python-pyrex/python-pyrex.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5f87df06831d0b3412eb4bc9d3fc2ee7bfae1b913d7da8c23ab2bf5699fb6b50 Pyrex-0.9.9.tar.gz diff --git a/package.bak/python-pyrex/python-pyrex.mk b/package.bak/python-pyrex/python-pyrex.mk deleted file mode 100644 index 6ddb2dcf37..0000000000 --- a/package.bak/python-pyrex/python-pyrex.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyrex -# -################################################################################ - -PYTHON_PYREX_VERSION = 0.9.9 -PYTHON_PYREX_SOURCE = Pyrex-$(PYTHON_PYREX_VERSION).tar.gz -PYTHON_PYREX_SITE = http://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex -PYTHON_PYREX_LICENSE = Apache-v2 -PYTHON_PYREX_LICENSE_FILES = LICENSE.txt -PYTHON_PYREX_SETUP_TYPE = distutils -HOST_PYTHON_PYREX_NEEDS_HOST_PYTHON = python2 - -$(eval $(host-python-package)) diff --git a/package.bak/python-pyro/Config.in b/package.bak/python-pyro/Config.in deleted file mode 100644 index eb998c3970..0000000000 --- a/package.bak/python-pyro/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYRO - bool "python-pyro" - depends on BR2_PACKAGE_PYTHON - help - python-pyro is a Python library stands for PYthon Remote Objects. - It is an advanced and powerful Distributed Object Technology system - written entirely in Python, that is designed to be very easy to use.. - - https://pypi.python.org/pypi/Pyro/ diff --git a/package.bak/python-pyro/python-pyro.hash b/package.bak/python-pyro/python-pyro.hash deleted file mode 100644 index 65ff0ae4e6..0000000000 --- a/package.bak/python-pyro/python-pyro.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 f01e32f8d1c3f427c4916e13d9e8cee24dbf924f72922a06591515911bd13756 Pyro-3.14.tar.gz diff --git a/package.bak/python-pyro/python-pyro.mk b/package.bak/python-pyro/python-pyro.mk deleted file mode 100644 index 26c026e87c..0000000000 --- a/package.bak/python-pyro/python-pyro.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyro -# -################################################################################ - -PYTHON_PYRO_VERSION = 3.14 -PYTHON_PYRO_SOURCE = Pyro-$(PYTHON_PYRO_VERSION).tar.gz -PYTHON_PYRO_SITE = https://pypi.python.org/packages/source/P/Pyro -PYTHON_PYRO_LICENSE = MIT -PYTHON_PYRO_LICENSE_FILES = LICENSE -PYTHON_PYRO_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pyroute2/Config.in b/package.bak/python-pyroute2/Config.in deleted file mode 100644 index 4f13ab2c7b..0000000000 --- a/package.bak/python-pyroute2/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYROUTE2 - bool "python-pyroute2" - help - Python netlink library - Linux network / netns / wireless / - ipset configuration. - - https://github.com/svinota/pyroute2 diff --git a/package.bak/python-pyroute2/python-pyroute2.hash b/package.bak/python-pyroute2/python-pyroute2.hash deleted file mode 100644 index ff680fc235..0000000000 --- a/package.bak/python-pyroute2/python-pyroute2.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyroute2/json, sha256 locally computed -md5 317303ba8a5e3d55b4f918fd1b7e186d pyroute2-0.4.8.tar.gz -sha256 a59907d2c5756f188b5f8aa48e3060e31c6f40e076f8143b99240fe0108a48d6 pyroute2-0.4.8.tar.gz diff --git a/package.bak/python-pyroute2/python-pyroute2.mk b/package.bak/python-pyroute2/python-pyroute2.mk deleted file mode 100644 index 5ea4f54576..0000000000 --- a/package.bak/python-pyroute2/python-pyroute2.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyroute2 -# -################################################################################ - -PYTHON_PYROUTE2_VERSION = 0.4.8 -PYTHON_PYROUTE2_SOURCE = pyroute2-$(PYTHON_PYROUTE2_VERSION).tar.gz -PYTHON_PYROUTE2_SITE = https://pypi.python.org/packages/fb/c1/2cbd9d3f91c663be7168ee2d8d6e919006ffeef57cac76bdd9e6cba7f468 -PYTHON_PYROUTE2_LICENSE = Apache-2.0 or GPLv2+ -PYTHON_PYROUTE2_LICENSE_FILES = LICENSE.Apache.v2 LICENSE.GPL.v2 README.license.md -PYTHON_PYROUTE2_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pysendfile/Config.in b/package.bak/python-pysendfile/Config.in deleted file mode 100644 index 5a919dd979..0000000000 --- a/package.bak/python-pysendfile/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSENDFILE - bool "python-pysendfile" - help - A Python interface to sendfile(2) syscall - - https://github.com/giampaolo/pysendfile diff --git a/package.bak/python-pysendfile/python-pysendfile.hash b/package.bak/python-pysendfile/python-pysendfile.hash deleted file mode 100644 index 755be50364..0000000000 --- a/package.bak/python-pysendfile/python-pysendfile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 f4ca8a7f0be67e3d710c0633dd9aadab6881203c31cb9eb9be4f10361ad3f937 python-pysendfile-2.0.1.tar.gz diff --git a/package.bak/python-pysendfile/python-pysendfile.mk b/package.bak/python-pysendfile/python-pysendfile.mk deleted file mode 100644 index bb8f057d3d..0000000000 --- a/package.bak/python-pysendfile/python-pysendfile.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-pysendfile -# -################################################################################ - -PYTHON_PYSENDFILE_VERSION = 2.0.1 -PYTHON_PYSENDFILE_SITE = $(call github,giampaolo,pysendfile,release-$(PYTHON_PYSENDFILE_VERSION)) -PYTHON_PYSENDFILE_SETUP_TYPE = setuptools -PYTHON_PYSENDFILE_LICENSE = MIT -PYTHON_PYSENDFILE_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pysmb/Config.in b/package.bak/python-pysmb/Config.in deleted file mode 100644 index 42a9984ef7..0000000000 --- a/package.bak/python-pysmb/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSMB - bool "python-pysmb" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PYTHON_PYASN - help - pysmb is an experimental SMB/CIFS library written in Python. - It implements the client-side SMB/CIFS protocol (SMB1 and SMB2) - which allows your Python application to access and transfer files - to/from SMB/CIFS shared folders like your Windows file sharing and - Samba folders. - - https://miketeo.net/wp/index.php/projects/pysmb - -comment "python-pysmb needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pysmb/python-pysmb.hash b/package.bak/python-pysmb/python-pysmb.hash deleted file mode 100644 index 4c410689a1..0000000000 --- a/package.bak/python-pysmb/python-pysmb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=9fe70cbc812b2e789915bedea7e45b1a, sha256 locally computed -md5 9fe70cbc812b2e789915bedea7e45b1a pysmb-1.1.18.tar.gz -sha256 580f7dcf8048656d2924c2f78731feaeaf6f9fa8ef5c251fc6964d39bfd3a6b9 pysmb-1.1.18.tar.gz diff --git a/package.bak/python-pysmb/python-pysmb.mk b/package.bak/python-pysmb/python-pysmb.mk deleted file mode 100644 index 51df91da3c..0000000000 --- a/package.bak/python-pysmb/python-pysmb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pysmb -# -################################################################################ - -PYTHON_PYSMB_VERSION = 1.1.18 -PYTHON_PYSMB_SOURCE = pysmb-$(PYTHON_PYSMB_VERSION).tar.gz -PYTHON_PYSMB_SITE = https://pypi.python.org/packages/source/p/pysmb -PYTHON_PYSMB_LICENSE = libpng license -PYTHON_PYSMB_LICENSE_FILES = LICENSE -PYTHON_PYSMB_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pysnmp-apps/Config.in b/package.bak/python-pysnmp-apps/Config.in deleted file mode 100644 index b032eba1fe..0000000000 --- a/package.bak/python-pysnmp-apps/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSNMP_APPS - bool "python-pysnmp-apps" - select BR2_PACKAGE_PYTHON_PYSNMP - depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn - help - A collection of command-line tools for SNMP management - purposes built on top of the PySNMP package. - - http://pysnmp.sf.net - -comment "python-pysnmp-apps needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pysnmp-apps/python-pysnmp-apps.hash b/package.bak/python-pysnmp-apps/python-pysnmp-apps.hash deleted file mode 100644 index 2b865cbce9..0000000000 --- a/package.bak/python-pysnmp-apps/python-pysnmp-apps.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pysnmp-apps/json, sha256 locally computed -md5 7fc08e2d81a77d558b38be5e49ff833e pysnmp-apps-0.4.1.tar.gz -sha256 57accb8c2fcb255b4da85af07ef9cd6a266dc5143b2834419ec8a39a879edeb7 pysnmp-apps-0.4.1.tar.gz diff --git a/package.bak/python-pysnmp-apps/python-pysnmp-apps.mk b/package.bak/python-pysnmp-apps/python-pysnmp-apps.mk deleted file mode 100644 index 2c831df1ee..0000000000 --- a/package.bak/python-pysnmp-apps/python-pysnmp-apps.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pysnmp-apps -# -################################################################################ - -PYTHON_PYSNMP_APPS_VERSION = 0.4.1 -PYTHON_PYSNMP_APPS_SOURCE = pysnmp-apps-$(PYTHON_PYSNMP_APPS_VERSION).tar.gz -PYTHON_PYSNMP_APPS_SITE = https://pypi.python.org/packages/source/p/pysnmp-apps -PYTHON_PYSNMP_APPS_SETUP_TYPE = setuptools -PYTHON_PYSNMP_APPS_LICENSE = BSD-3c -PYTHON_PYSNMP_APPS_LICENSE_FILES = LICENSE.txt - -PYTHON_PYSNMP_APPS_DEPENDENCIES = python-pysnmp - -$(eval $(python-package)) diff --git a/package.bak/python-pysnmp-mibs/Config.in b/package.bak/python-pysnmp-mibs/Config.in deleted file mode 100644 index eca17d26aa..0000000000 --- a/package.bak/python-pysnmp-mibs/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSNMP_MIBS - bool "python-pysnmp-mibs" - select BR2_PACKAGE_PYTHON_PYSNMP - depends on BR2_INSTALL_LIBSTDCPP # pysnmp -> pyasn - help - PySNMP MIBs is a set of IETF & IANA MIBs pre-compiled and - packaged to simplify their use with the PySNMP library. - - http://pysnmp.sf.net - -comment "python-pysnmp-libs needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.hash b/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.hash deleted file mode 100644 index 8deb2e530e..0000000000 --- a/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pysnmp-mibs/json, sha256 locally computed -md5 01845c4595d87d3c3485c0449616cbda pysnmp-mibs-0.1.6.tar.gz -sha256 00fa321ca598e8a14c0ad98702bf10fb5e9d57b7d06bb99dc818fea07683720c pysnmp-mibs-0.1.6.tar.gz diff --git a/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.mk b/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.mk deleted file mode 100644 index a0db763cc6..0000000000 --- a/package.bak/python-pysnmp-mibs/python-pysnmp-mibs.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# python-pysnmp-mibs -# -################################################################################ - -PYTHON_PYSNMP_MIBS_VERSION = 0.1.6 -PYTHON_PYSNMP_MIBS_SOURCE = pysnmp-mibs-$(PYTHON_PYSNMP_MIBS_VERSION).tar.gz -PYTHON_PYSNMP_MIBS_SITE = https://pypi.python.org/packages/bf/7c/99ab192af934ed5d41ceef92a1b949b41652f29b46241b902ffec55642f4 -PYTHON_PYSNMP_MIBS_SETUP_TYPE = setuptools -PYTHON_PYSNMP_MIBS_LICENSE = BSD-3c -PYTHON_PYSNMP_MIBS_LICENSE_FILES = LICENSE.txt - -PYTHON_PYSNMP_MIBS_DEPENDENCIES = python-pysnmp - -$(eval $(python-package)) diff --git a/package.bak/python-pysnmp/Config.in b/package.bak/python-pysnmp/Config.in deleted file mode 100644 index c7cdf3892d..0000000000 --- a/package.bak/python-pysnmp/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSNMP - bool "python-pysnmp" - depends on BR2_INSTALL_LIBSTDCPP # pyasn - select BR2_PACKAGE_PYTHON_PYASN - select BR2_PACKAGE_PYTHON_PYCRYPTO - help - PySNMP is a cross-platform, pure-Python SNMP engine - implementation. - - http://pysnmp.sf.net - -comment "python-pysnmp needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-pysnmp/python-pysnmp.hash b/package.bak/python-pysnmp/python-pysnmp.hash deleted file mode 100644 index b0f0f4962b..0000000000 --- a/package.bak/python-pysnmp/python-pysnmp.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pysnmp/json, sha256 locally computed -md5 9a4d23c4c1edea1c77faed72c469d8e8 pysnmp-4.3.2.tar.gz -sha256 7c2bd81df17aa7dca0057a68e7a32284a72231309a0237d66d5b803b5c118977 pysnmp-4.3.2.tar.gz diff --git a/package.bak/python-pysnmp/python-pysnmp.mk b/package.bak/python-pysnmp/python-pysnmp.mk deleted file mode 100644 index dff8bdd3ce..0000000000 --- a/package.bak/python-pysnmp/python-pysnmp.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-pysnmp -# -################################################################################ - -PYTHON_PYSNMP_VERSION = 4.3.2 -PYTHON_PYSNMP_SOURCE = pysnmp-$(PYTHON_PYSNMP_VERSION).tar.gz -PYTHON_PYSNMP_SITE = https://pypi.python.org/packages/9e/77/795fcc9d9a01adcb6175a3bf6532132addb8904922afd7877a9930d89f2f -PYTHON_PYSNMP_SETUP_TYPE = setuptools - -PYTHON_PYSNMP_LICENSE = BSD-3c -PYTHON_PYSNMP_LICENSE_FILES = LICENSE.txt - -PYTHON_PYSNMP_DEPENDENCIES = python-pyasn python-pycrypto - -$(eval $(python-package)) diff --git a/package.bak/python-pysocks/Config.in b/package.bak/python-pysocks/Config.in deleted file mode 100644 index cd38d4d3bc..0000000000 --- a/package.bak/python-pysocks/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYSOCKS - bool "python-pysocks" - help - A Python SOCKS client module. - - https://github.com/Anorov/PySocks diff --git a/package.bak/python-pysocks/python-pysocks.hash b/package.bak/python-pysocks/python-pysocks.hash deleted file mode 100644 index 556996a267..0000000000 --- a/package.bak/python-pysocks/python-pysocks.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/PySocks/json, sha256 locally computed -md5 68f4ad7a8d4fa725656ae3e9dd142d29 PySocks-1.5.7.tar.gz -sha256 e51c7694b10288e6fd9a28e15c0bcce9aca0327e7b32ebcd9af05fcd56f38b88 PySocks-1.5.7.tar.gz diff --git a/package.bak/python-pysocks/python-pysocks.mk b/package.bak/python-pysocks/python-pysocks.mk deleted file mode 100644 index a99a399ce8..0000000000 --- a/package.bak/python-pysocks/python-pysocks.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pysocks -# -################################################################################ - -PYTHON_PYSOCKS_VERSION = 1.5.7 -PYTHON_PYSOCKS_SOURCE = PySocks-$(PYTHON_PYSOCKS_VERSION).tar.gz -PYTHON_PYSOCKS_SITE = https://pypi.python.org/packages/16/56/9b3513078f837fa8cb88ee01ec1cd805ed8104a37bc02ca8c2588ae8fe5a -PYTHON_PYSOCKS_LICENSE = BSD-3c -PYTHON_PYSOCKS_LICENSE_FILES = socks.py -PYTHON_PYSOCKS_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pytablereader/Config.in b/package.bak/python-pytablereader/Config.in deleted file mode 100644 index 050ff65c17..0000000000 --- a/package.bak/python-pytablereader/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYTABLEREADER - bool "python-pytablereader" - select BR2_PACKAGE_PYTHON_BEAUTIFULSOUP4 # runtime - select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_JSONSCHEMA # runtime - select BR2_PACKAGE_PYTHON_LOGBOOK # runtime - select BR2_PACKAGE_PYTHON_MARKDOWN2 # runtime - select BR2_PACKAGE_PYTHON_MBSTRDECODER # runtime - select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_PATHPY # runtime - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_XLRD # runtime - help - A python library to load structured table data from - files/URL with various data formats: - CSV/Excel/HTML/JSON/LTSV/Markdown/TSV. - - https://github.com/thombashi/pytablereader diff --git a/package.bak/python-pytablereader/python-pytablereader.hash b/package.bak/python-pytablereader/python-pytablereader.hash deleted file mode 100644 index 7d1438a1d5..0000000000 --- a/package.bak/python-pytablereader/python-pytablereader.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pytablereader/json, sha256 locally computed -md5 ae95462a1a982186d1307ee0d6e275e2 pytablereader-0.8.8.tar.gz -sha256 6ba95dc699d2c7ab7bc4b3f0224a17404255d110a3ece8ba12217d650aa7de79 pytablereader-0.8.8.tar.gz diff --git a/package.bak/python-pytablereader/python-pytablereader.mk b/package.bak/python-pytablereader/python-pytablereader.mk deleted file mode 100644 index 2b6f2d46bb..0000000000 --- a/package.bak/python-pytablereader/python-pytablereader.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pytablereader -# -################################################################################ - -PYTHON_PYTABLEREADER_VERSION = 0.8.8 -PYTHON_PYTABLEREADER_SOURCE = pytablereader-$(PYTHON_PYTABLEREADER_VERSION).tar.gz -PYTHON_PYTABLEREADER_SITE = https://pypi.python.org/packages/05/0c/7801617e60ce0d9b4cc57cb542cc431a95b9f43ac1ac14030017163da29d -PYTHON_PYTABLEREADER_SETUP_TYPE = setuptools -PYTHON_PYTABLEREADER_LICENSE = MIT -PYTHON_PYTABLEREADER_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pytablewriter/Config.in b/package.bak/python-pytablewriter/Config.in deleted file mode 100644 index f270d0daa8..0000000000 --- a/package.bak/python-pytablewriter/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYTABLEWRITER - bool "python-pytablewriter" - select BR2_PACKAGE_PYTHON_DATAPROPERTY # runtime - select BR2_PACKAGE_PYTHON_DOMINATE # runtime - select BR2_PACKAGE_PYTHON_PATHVALIDATE # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_XLSXWRITER # runtime - select BR2_PACKAGE_PYTHON_XLWT # runtime - select BR2_PACKAGE_PYTHON_TOML # runtime - select BR2_PACKAGE_PYTHON_PYTABLEREADER # runtime - help - pytablewriter is a python library to write a table in various - formats: CSV, HTML, JavaScript, JSON, Markdown, Excel, Pandas, - Python, reStructuredText. - - https://github.com/thombashi/pytablewriter diff --git a/package.bak/python-pytablewriter/python-pytablewriter.hash b/package.bak/python-pytablewriter/python-pytablewriter.hash deleted file mode 100644 index 3b5bef3220..0000000000 --- a/package.bak/python-pytablewriter/python-pytablewriter.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pytablewriter/json, sha256 locally computed -md5 7b909647bb8a87373f2553a6fccdf419 pytablewriter-0.17.1.tar.gz -sha256 20c58c41359941262bf288d2fe81ca506e2a38cfdd337d982dbcb2e26ec4a3ed pytablewriter-0.17.1.tar.gz diff --git a/package.bak/python-pytablewriter/python-pytablewriter.mk b/package.bak/python-pytablewriter/python-pytablewriter.mk deleted file mode 100644 index 6d2e5456dd..0000000000 --- a/package.bak/python-pytablewriter/python-pytablewriter.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pytablewriter -# -################################################################################ - -PYTHON_PYTABLEWRITER_VERSION = 0.17.1 -PYTHON_PYTABLEWRITER_SOURCE = pytablewriter-$(PYTHON_PYTABLEWRITER_VERSION).tar.gz -PYTHON_PYTABLEWRITER_SITE = https://pypi.python.org/packages/a2/2f/093dded4e265705c1d87d68a9062acb69b39c6ec615f74d71c62f6625afa -PYTHON_PYTABLEWRITER_SETUP_TYPE = setuptools -PYTHON_PYTABLEWRITER_LICENSE = MIT -PYTHON_PYTABLEWRITER_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-pytrie/Config.in b/package.bak/python-pytrie/Config.in deleted file mode 100644 index fb1df41d0a..0000000000 --- a/package.bak/python-pytrie/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYTRIE - bool "python-pytrie" - help - A pure Python implementation of the trie data structure. - - https://pypi.python.org/pypi/PyTrie diff --git a/package.bak/python-pytrie/python-pytrie.hash b/package.bak/python-pytrie/python-pytrie.hash deleted file mode 100644 index 88d2542a8d..0000000000 --- a/package.bak/python-pytrie/python-pytrie.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=5997b46c854a68bc588f4527c987663a, sha256 locally computed. -md5 5997b46c854a68bc588f4527c987663a PyTrie-0.2.tar.gz -sha256 b272021351efadc6757591aac03ed4794bdfd091122204a4673e94bfb66cc500 PyTrie-0.2.tar.gz diff --git a/package.bak/python-pytrie/python-pytrie.mk b/package.bak/python-pytrie/python-pytrie.mk deleted file mode 100644 index e3bea4f690..0000000000 --- a/package.bak/python-pytrie/python-pytrie.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pytrie -# -################################################################################ - -PYTHON_PYTRIE_VERSION = 0.2 -PYTHON_PYTRIE_SITE = http://pypi.python.org/packages/source/P/PyTrie -PYTHON_PYTRIE_SOURCE = PyTrie-$(PYTHON_PYTRIE_VERSION).tar.gz -PYTHON_PYTRIE_LICENSE = BSD-3c -PYTHON_PYTRIE_LICENSE_FILES = LICENSE -PYTHON_PYTRIE_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pytz/Config.in b/package.bak/python-pytz/Config.in deleted file mode 100644 index 949fbd3cd1..0000000000 --- a/package.bak/python-pytz/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYTZ - bool "python-pytz" - help - World timezone definitions, modern and historical. - - http://pythonhosted.org/pytz diff --git a/package.bak/python-pytz/python-pytz.hash b/package.bak/python-pytz/python-pytz.hash deleted file mode 100644 index fbccc52bce..0000000000 --- a/package.bak/python-pytz/python-pytz.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pytz/json, sha256 locally computed -md5 88b1d6c50c764579292edce3493c8a3a pytz-2016.10.tar.bz2 -sha256 7016b2c4fa075c564b81c37a252a5fccf60d8964aa31b7f5eae59aeb594ae02b pytz-2016.10.tar.bz2 diff --git a/package.bak/python-pytz/python-pytz.mk b/package.bak/python-pytz/python-pytz.mk deleted file mode 100644 index 9a8bd07e0f..0000000000 --- a/package.bak/python-pytz/python-pytz.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pytz -# -################################################################################ - -PYTHON_PYTZ_VERSION = 2016.10 -PYTHON_PYTZ_SOURCE = pytz-$(PYTHON_PYTZ_VERSION).tar.bz2 -PYTHON_PYTZ_SITE = https://pypi.python.org/packages/d0/e1/aca6ef73a7bd322a7fc73fd99631ee3454d4fc67dc2bee463e2adf6bb3d3 -PYTHON_PYTZ_SETUP_TYPE = setuptools -PYTHON_PYTZ_LICENSE = MIT -PYTHON_PYTZ_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch b/package.bak/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch deleted file mode 100644 index 93b9568593..0000000000 --- a/package.bak/python-pyudev/0001-Workaround-finding-libudev-on-systems-without-ldconf.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e86a1c199d45c9751da67f947af202927dee07f8 Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Thu, 10 Dec 2015 08:44:55 +0100 -Subject: [PATCH] Workaround finding libudev on systems without ldconf - -This patch tries to load libudev.so directly without relying on -Python's find_library(). find_library() fails on systems -without library cache mechanism. - -Taken from pyudev issue 117 discussion: -https://github.com/pyudev/pyudev/pull/117 - -Signed-off-by: Yegor Yefremov ---- - src/pyudev/_libudev.py | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/pyudev/_libudev.py b/src/pyudev/_libudev.py -index a0de8fb..1348d17 100644 ---- a/src/pyudev/_libudev.py -+++ b/src/pyudev/_libudev.py -@@ -30,7 +30,7 @@ - from __future__ import (print_function, division, unicode_literals, - absolute_import) - --from ctypes import (CDLL, Structure, POINTER, -+from ctypes import (cdll, CDLL, Structure, POINTER, - c_char, c_char_p, c_int, c_uint, c_ulonglong) - from ctypes.util import find_library - -@@ -265,10 +265,10 @@ def load_udev_library(): - - Raise :exc:`~exceptions.ImportError`, if the udev library was not found. - """ -- udev_library_name = find_library('udev') -- if not udev_library_name: -+ try: -+ libudev = cdll.LoadLibrary('libudev.so') -+ except OSError: - raise ImportError('No library named udev') -- libudev = CDLL(udev_library_name, use_errno=True) - # context function signature - for namespace, members in SIGNATURES.items(): - for funcname in members: --- -2.1.4 - diff --git a/package.bak/python-pyudev/Config.in b/package.bak/python-pyudev/Config.in deleted file mode 100644 index 137a983ae7..0000000000 --- a/package.bak/python-pyudev/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYUDEV - bool "python-pyudev" - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - help - pyudev is a LGPL licenced, pure Python 2/3 binding to libudev, - the device and hardware management and information library of Linux. - - https://github.com/pyudev/pyudev - -comment "python-pyudev needs udev /dev management" - depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/python-pyudev/python-pyudev.hash b/package.bak/python-pyudev/python-pyudev.hash deleted file mode 100644 index adda9a4d25..0000000000 --- a/package.bak/python-pyudev/python-pyudev.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=07a60f5f7a6028e83725f759a1b9490a, sha256 locally computed -md5 07a60f5f7a6028e83725f759a1b9490a pyudev-0.18.tar.gz -sha256 83b315f74e29c3a4aa6ea38b6cf73b0bb7e37066d7a5d70972ac418a80aed62a pyudev-0.18.tar.gz diff --git a/package.bak/python-pyudev/python-pyudev.mk b/package.bak/python-pyudev/python-pyudev.mk deleted file mode 100644 index 70c4faf8de..0000000000 --- a/package.bak/python-pyudev/python-pyudev.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyudev -# -################################################################################ - -PYTHON_PYUDEV_VERSION = 0.18 -PYTHON_PYUDEV_SOURCE = pyudev-$(PYTHON_PYUDEV_VERSION).tar.gz -PYTHON_PYUDEV_SITE = https://pypi.python.org/packages/source/p/pyudev -PYTHON_PYUDEV_LICENSE = LGPLv2.1+ -PYTHON_PYUDEV_LICENSE_FILES = COPYING -PYTHON_PYUDEV_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-pyusb/Config.in b/package.bak/python-pyusb/Config.in deleted file mode 100644 index 1f97979c71..0000000000 --- a/package.bak/python-pyusb/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYUSB - bool "python-pyusb" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - The PyUSB module provides easy access to the Universal - Serial Bus (USB) from Python. - - http://sourceforge.net/apps/trac/pyusb/ - -comment "python-pyusb needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/python-pyusb/python-pyusb.hash b/package.bak/python-pyusb/python-pyusb.hash deleted file mode 100644 index 098d08f751..0000000000 --- a/package.bak/python-pyusb/python-pyusb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyusb/json, sha256 locally computed -md5 c8a571bfdba778555156af3facaea6fc PyUSB-1.0.0.tar.gz -sha256 5b34ffa74ac34f330bff949c94ee00ec4a9d147234db17ee2eed2a67c0275368 PyUSB-1.0.0.tar.gz diff --git a/package.bak/python-pyusb/python-pyusb.mk b/package.bak/python-pyusb/python-pyusb.mk deleted file mode 100644 index cfdef533a1..0000000000 --- a/package.bak/python-pyusb/python-pyusb.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyusb -# -################################################################################ - -PYTHON_PYUSB_VERSION = 1.0.0 -PYTHON_PYUSB_SOURCE = PyUSB-$(PYTHON_PYUSB_VERSION).tar.gz -PYTHON_PYUSB_SITE = https://pypi.python.org/packages/8a/19/66fb48a4905e472f5dfeda3a1bafac369fbf6d6fc5cf55b780864962652d -PYTHON_PYUSB_LICENSE = BSD-3c -PYTHON_PYUSB_LICENSE_FILES = LICENSE -PYTHON_PYUSB_SETUP_TYPE = distutils -PYTHON_PYUSB_DEPENDENCIES = libusb - -$(eval $(python-package)) diff --git a/package.bak/python-pyxb/Config.in b/package.bak/python-pyxb/Config.in deleted file mode 100644 index f1226717ab..0000000000 --- a/package.bak/python-pyxb/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYXB - bool "python-pyxb" - help - PyXB is a pure Python package that generates Python code - for classes that correspond to data structures defined by XMLSchema. - - http://pyxb.sourceforge.net/ diff --git a/package.bak/python-pyxb/python-pyxb.hash b/package.bak/python-pyxb/python-pyxb.hash deleted file mode 100644 index 9aa50fc76e..0000000000 --- a/package.bak/python-pyxb/python-pyxb.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyxb/json, sha256 locally computed -md5 197c462ab8427ea197313ca3776b252a PyXB-1.2.5.tar.gz -sha256 4e8f62ee2cfffc37e4f40634ab9c79e0311cfaf28cf4ce5e7f4828ec56e4ff67 PyXB-1.2.5.tar.gz diff --git a/package.bak/python-pyxb/python-pyxb.mk b/package.bak/python-pyxb/python-pyxb.mk deleted file mode 100644 index d0b2da5461..0000000000 --- a/package.bak/python-pyxb/python-pyxb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-pyxb -# -################################################################################ - -PYTHON_PYXB_VERSION = 1.2.5 -PYTHON_PYXB_SOURCE = PyXB-$(PYTHON_PYXB_VERSION).tar.gz -PYTHON_PYXB_SITE = https://pypi.python.org/packages/43/7a/9d40392e4380463f37bf5aa2851dfd8ba7c0e4d2a9dc2355177b8b785794 -PYTHON_PYXB_LICENSE = Apache-2.0 -PYTHON_PYXB_LICENSE_FILES = LICENSE -PYTHON_PYXB_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-pyyaml/Config.in b/package.bak/python-pyyaml/Config.in deleted file mode 100644 index 45e818b7e7..0000000000 --- a/package.bak/python-pyyaml/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYYAML - bool "python-pyyaml" - select BR2_PACKAGE_LIBYAML - help - The PyYAML package contains binding to the libyaml API. - - http://pyyaml.org/ diff --git a/package.bak/python-pyyaml/python-pyyaml.hash b/package.bak/python-pyyaml/python-pyyaml.hash deleted file mode 100644 index 209ab27e53..0000000000 --- a/package.bak/python-pyyaml/python-pyyaml.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyyaml/json, sha256 locally computed -md5 4c129761b661d181ebf7ff4eb2d79950 PyYAML-3.12.tar.gz -sha256 592766c6303207a20efc445587778322d7f73b161bd994f227adaa341ba212ab PyYAML-3.12.tar.gz diff --git a/package.bak/python-pyyaml/python-pyyaml.mk b/package.bak/python-pyyaml/python-pyyaml.mk deleted file mode 100644 index 0509a7adb0..0000000000 --- a/package.bak/python-pyyaml/python-pyyaml.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-pyyaml -# -################################################################################ - -PYTHON_PYYAML_VERSION = 3.12 -PYTHON_PYYAML_SOURCE = PyYAML-$(PYTHON_PYYAML_VERSION).tar.gz -PYTHON_PYYAML_SITE = https://pypi.python.org/packages/4a/85/db5a2df477072b2902b0eb892feb37d88ac635d36245a72a6a69b23b383a -PYTHON_PYYAML_SETUP_TYPE = distutils -PYTHON_PYYAML_LICENSE = Python software foundation license v2 -PYTHON_PYYAML_LICENSE_FILES = LICENSE -PYTHON_PYYAML_DEPENDENCIES = libyaml - -$(eval $(python-package)) diff --git a/package.bak/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch b/package.bak/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch deleted file mode 100644 index cb52eaf6de..0000000000 --- a/package.bak/python-pyzmq/0001-use-buildroot-zmq-version-instead-of-detect.patch +++ /dev/null @@ -1,51 +0,0 @@ -detect.py: fix the ZMQ version check to the ZMQ version of the buildroot - -The setup.py script tries to compile a test C program and runs it, to -retrieve a version string for the installed ZMQ library, but if the cross -compiler links it together, the result cannot be run on the host, due to -different architectures and libraries. - -And if the host compiler would compile/link it, it would not link with -the library version inside buildroot but with the library from the -host, possibly returning a wrong version number. - -Instead of trying to run the compiled test program to get the version -dynamically, return the version of the buildroot environment. - -Written by Michael Rommel, modified for version 16.0.2 by Lionel -Flandrin. - -Signed-off-by: Lionel Flandrin ---- - buildutils/detect.py | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/buildutils/detect.py b/buildutils/detect.py -index 9520da7..823144f 100644 ---- a/buildutils/detect.py -+++ b/buildutils/detect.py -@@ -117,13 +117,15 @@ def detect_zmq(basedir, compiler=None, **compiler_attrs): - - cc = get_compiler(compiler=compiler, **compiler_attrs) - efile = test_compilation(cfile, compiler=cc) -- patch_lib_paths(efile, cc.library_dirs) -+ #patch_lib_paths(efile, cc.library_dirs) - -- rc, so, se = get_output_error([efile]) -- if rc: -- msg = "Error running version detection script:\n%s\n%s" % (so,se) -- logging.error(msg) -- raise IOError(msg) -+ #rc, so, se = get_output_error([efile]) -+ # if rc: -+ # msg = "Error running version detection script:\n%s\n%s" % (so,se) -+ # logging.error(msg) -+ # raise IOError(msg) -+ -+ so = "vers: ##ZEROMQ_VERSION##" - - handlers = {'vers': lambda val: tuple(int(v) for v in val.split('.'))} - --- -2.11.0 - diff --git a/package.bak/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch b/package.bak/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch deleted file mode 100644 index 278e939e0e..0000000000 --- a/package.bak/python-pyzmq/0002-replace-compile_and_run-with-compile_and_forget.patch +++ /dev/null @@ -1,76 +0,0 @@ -detect.py: replace compile_and_run with compile_and_forget - -This function is only used in setup.py to detect the availability of -sys/un.h by compiling and running a small test program. Since we're -cross-compiling we can't run the generated program, however if the -header is missing the test will fail at the compilation step so -running the test in unnecessary. - -Signed-off-by: Lionel Flandrin ---- - buildutils/detect.py | 16 ++++++++-------- - setup.py | 4 ++-- - 2 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/buildutils/detect.py b/buildutils/detect.py -index 7a6c115..9520da7 100644 ---- a/buildutils/detect.py -+++ b/buildutils/detect.py -@@ -58,7 +58,7 @@ def test_compilation(cfile, compiler=None, **compiler_attrs): - cc.link_executable(objs, efile, extra_preargs=lpreargs) - return efile - --def compile_and_run(basedir, src, compiler=None, **compiler_attrs): -+def compile_and_forget(basedir, src, compiler=None, **compiler_attrs): - if not os.path.exists(basedir): - os.makedirs(basedir) - cfile = pjoin(basedir, os.path.basename(src)) -@@ -66,16 +66,16 @@ def compile_and_run(basedir, src, compiler=None, **compiler_attrs): - try: - cc = get_compiler(compiler, **compiler_attrs) - efile = test_compilation(cfile, compiler=cc) -- patch_lib_paths(efile, cc.library_dirs) -- result = Popen(efile, stdout=PIPE, stderr=PIPE) -- so, se = result.communicate() -- # for py3k: -- so = so.decode() -- se = se.decode() -+ # patch_lib_paths(efile, cc.library_dirs) -+ # result = Popen(efile, stdout=PIPE, stderr=PIPE) -+ # so, se = result.communicate() -+ # # for py3k: -+ # so = so.decode() -+ # se = se.decode() - finally: - shutil.rmtree(basedir) - -- return result.returncode, so, se -+ return None - - - def detect_zmq(basedir, compiler=None, **compiler_attrs): -diff --git a/setup.py b/setup.py -index c3a2879..b8b0aaf 100755 ---- a/setup.py -+++ b/setup.py -@@ -54,7 +54,7 @@ from buildutils import ( - info, warn, fatal, debug, line, copy_and_patch_libzmq, localpath, - fetch_libzmq, stage_platform_hpp, - bundled_version, customize_mingw, -- compile_and_run, -+ compile_and_forget, - patch_lib_paths, - ) - -@@ -327,7 +327,7 @@ class Configure(build_ext): - except Exception: - pass - try: -- compile_and_run(self.tempdir, -+ compile_and_forget(self.tempdir, - pjoin('buildutils', 'check_sys_un.c'), - **minus_zmq - ) --- -2.11.0 - diff --git a/package.bak/python-pyzmq/Config.in b/package.bak/python-pyzmq/Config.in deleted file mode 100644 index 8f33a635c8..0000000000 --- a/package.bak/python-pyzmq/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_PYZMQ - bool "python-pyzmq" - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - select BR2_PACKAGE_ZEROMQ - help - This package contains the python language binding for zeromq. - - http://zeromq.org/bindings:python - -comment "python-pyzmq needs a toolchain w/ C++, threads" - depends on BR2_PACKAGE_PYTHON - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/python-pyzmq/python-pyzmq.hash b/package.bak/python-pyzmq/python-pyzmq.hash deleted file mode 100644 index 6cdd0b9f18..0000000000 --- a/package.bak/python-pyzmq/python-pyzmq.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/pyzmq/json, sha256 locally computed -md5 9a8768b00a566a400d70318f8c359cfe pyzmq-16.0.2.tar.gz -sha256 0322543fff5ab6f87d11a8a099c4c07dd8a1719040084b6ce9162bcdf5c45c9d pyzmq-16.0.2.tar.gz diff --git a/package.bak/python-pyzmq/python-pyzmq.mk b/package.bak/python-pyzmq/python-pyzmq.mk deleted file mode 100644 index ade2d3a234..0000000000 --- a/package.bak/python-pyzmq/python-pyzmq.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# python-pyzmq -# -################################################################################ - -PYTHON_PYZMQ_VERSION = 16.0.2 -PYTHON_PYZMQ_SOURCE = pyzmq-$(PYTHON_PYZMQ_VERSION).tar.gz -PYTHON_PYZMQ_SITE = https://pypi.python.org/packages/af/37/8e0bf3800823bc247c36715a52e924e8f8fd5d1432f04b44b8cd7a5d7e55 -PYTHON_PYZMQ_LICENSE = LGPLv3+, BSD-3c, Apache-2.0 -# Apache license only online: http://www.apache.org/licenses/LICENSE-2.0 -PYTHON_PYZMQ_LICENSE_FILES = COPYING.LESSER COPYING.BSD -PYTHON_PYZMQ_DEPENDENCIES = zeromq -PYTHON_PYZMQ_SETUP_TYPE = distutils -PYTHON_PYZMQ_BUILD_OPTS = --zmq=$(STAGING_DIR)/usr - -# Due to issues with cross-compiling, hardcode to the zeromq in BR -define PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION - $(SED) 's/##ZEROMQ_VERSION##/$(ZEROMQ_VERSION)/' \ - $(@D)/buildutils/detect.py -endef - -PYTHON_PYZMQ_POST_PATCH_HOOKS += PYTHON_PYZMQ_PATCH_ZEROMQ_VERSION - -$(eval $(python-package)) diff --git a/package.bak/python-requests-toolbelt/Config.in b/package.bak/python-requests-toolbelt/Config.in deleted file mode 100644 index ba2b95152e..0000000000 --- a/package.bak/python-requests-toolbelt/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_REQUESTS_TOOLBELT - bool "python-requests-toolbelt" - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - help - A utility belt for advanced users of python-requests. - - https://toolbelt.readthedocs.org diff --git a/package.bak/python-requests-toolbelt/python-requests-toolbelt.hash b/package.bak/python-requests-toolbelt/python-requests-toolbelt.hash deleted file mode 100644 index 89f5ca1114..0000000000 --- a/package.bak/python-requests-toolbelt/python-requests-toolbelt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/requests-toolbelt/json, sha256 locally computed -md5 bfe2009905f460f4764c32cfbbf4205f requests-toolbelt-0.7.0.tar.gz -sha256 33899d4a559c3f0f5e9fbc115d337c4236febdc083755a160a4132d92fc3c91a requests-toolbelt-0.7.0.tar.gz diff --git a/package.bak/python-requests-toolbelt/python-requests-toolbelt.mk b/package.bak/python-requests-toolbelt/python-requests-toolbelt.mk deleted file mode 100644 index 2e944c067d..0000000000 --- a/package.bak/python-requests-toolbelt/python-requests-toolbelt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-requests-toolbelt -# -################################################################################ - -PYTHON_REQUESTS_TOOLBELT_VERSION = 0.7.0 -PYTHON_REQUESTS_TOOLBELT_SOURCE = requests-toolbelt-$(PYTHON_REQUESTS_TOOLBELT_VERSION).tar.gz -PYTHON_REQUESTS_TOOLBELT_SITE = https://pypi.python.org/packages/59/78/1d391d30ebf74079a8e4de6ab66fdca5362903ef2df64496f4697e9bb626 -PYTHON_REQUESTS_TOOLBELT_SETUP_TYPE = setuptools -PYTHON_REQUESTS_TOOLBELT_LICENSE = Apache-2.0 -PYTHON_REQUESTS_TOOLBELT_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-requests/Config.in b/package.bak/python-requests/Config.in deleted file mode 100644 index 23ab3092d5..0000000000 --- a/package.bak/python-requests/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_REQUESTS - bool "python-requests" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - help - Requests is an Apache2 Licensed HTTP library, written in - Python, for human beings. - - http://www.python-requests.org/ diff --git a/package.bak/python-requests/python-requests.hash b/package.bak/python-requests/python-requests.hash deleted file mode 100644 index e441c00825..0000000000 --- a/package.bak/python-requests/python-requests.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/requests/json, sha256 locally computed -md5 ad5f9c47b5c5dfdb28363ad7546b0763 requests-2.11.1.tar.gz -sha256 5acf980358283faba0b897c73959cecf8b841205bb4b2ad3ef545f46eae1a133 requests-2.11.1.tar.gz diff --git a/package.bak/python-requests/python-requests.mk b/package.bak/python-requests/python-requests.mk deleted file mode 100644 index 49980bf9bc..0000000000 --- a/package.bak/python-requests/python-requests.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-requests -# -################################################################################ - -PYTHON_REQUESTS_VERSION = 2.11.1 -PYTHON_REQUESTS_SOURCE = requests-$(PYTHON_REQUESTS_VERSION).tar.gz -PYTHON_REQUESTS_SITE = https://pypi.python.org/packages/2e/ad/e627446492cc374c284e82381215dcd9a0a87c4f6e90e9789afefe6da0ad -PYTHON_REQUESTS_SETUP_TYPE = setuptools -PYTHON_REQUESTS_LICENSE = Apache-2.0 -PYTHON_REQUESTS_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-rpi-gpio/Config.in b/package.bak/python-rpi-gpio/Config.in deleted file mode 100755 index 4f59ebdb06..0000000000 --- a/package.bak/python-rpi-gpio/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_RPI_GPIO - bool "python-rpi-gpio" - depends on BR2_arm - help - A Python module to control the GPIO on a Raspberry Pi. - - http://sourceforge.net/p/raspberry-gpio-python diff --git a/package.bak/python-rpi-gpio/python-rpi-gpio.hash b/package.bak/python-rpi-gpio/python-rpi-gpio.hash deleted file mode 100644 index a502972c35..0000000000 --- a/package.bak/python-rpi-gpio/python-rpi-gpio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/rpi-gpio/json, sha256 locally computed -md5 9db86fd5f3bae872de9dbb068ee0b096 RPi.GPIO-0.6.2.tar.gz -sha256 82acff0ef6bbe3cdf6f4dbdd73d96add5294bb94baf7f51c1d901861af3c2392 RPi.GPIO-0.6.2.tar.gz diff --git a/package.bak/python-rpi-gpio/python-rpi-gpio.mk b/package.bak/python-rpi-gpio/python-rpi-gpio.mk deleted file mode 100644 index 8f02d160e5..0000000000 --- a/package.bak/python-rpi-gpio/python-rpi-gpio.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-rpi-gpio -# -################################################################################ - -PYTHON_RPI_GPIO_VERSION = 0.6.2 -PYTHON_RPI_GPIO_SOURCE = RPi.GPIO-$(PYTHON_RPI_GPIO_VERSION).tar.gz -PYTHON_RPI_GPIO_SITE = https://pypi.python.org/packages/c1/a8/de92cf6d04376f541ce250de420f4fe7cbb2b32a7128929a600bc89aede5 -PYTHON_RPI_GPIO_LICENSE = MIT -PYTHON_RPI_GPIO_LICENSE_FILES = LICENCE.txt -PYTHON_RPI_GPIO_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-rtslib-fb/Config.in b/package.bak/python-rtslib-fb/Config.in deleted file mode 100644 index f4083340e6..0000000000 --- a/package.bak/python-rtslib-fb/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_RTSLIB_FB - bool "python-rtslib-fb" - select BR2_PACKAGE_PYTHON_SIX - help - rtslib-fb is an object-based Python library for configuring - the LIO generic SCSI target, present in 3.x Linux kernel - versions. - - https://github.com/open-iscsi/rtslib-fb diff --git a/package.bak/python-rtslib-fb/python-rtslib-fb.hash b/package.bak/python-rtslib-fb/python-rtslib-fb.hash deleted file mode 100644 index fd0618581e..0000000000 --- a/package.bak/python-rtslib-fb/python-rtslib-fb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d5d81a78046b4c228d29ba88d9950e0f63858e5fcf601e3d0f8bf107fbaadc03 python-rtslib-fb-v2.1.fb57.tar.gz diff --git a/package.bak/python-rtslib-fb/python-rtslib-fb.mk b/package.bak/python-rtslib-fb/python-rtslib-fb.mk deleted file mode 100644 index 8236fb8eb1..0000000000 --- a/package.bak/python-rtslib-fb/python-rtslib-fb.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# python-rtslib-fb -# -################################################################################ - -# When upgrading the version, be sure to also upgrade -# python-configshell-fb and targetcli-fb at the same time. -PYTHON_RTSLIB_FB_VERSION = v2.1.fb57 -# Do not switch site to PyPI: it does not contain the latest version. -PYTHON_RTSLIB_FB_SITE = $(call github,open-iscsi,rtslib-fb,$(PYTHON_RTSLIB_FB_VERSION)) -PYTHON_RTSLIB_FB_LICENSE = Apache-2.0 -PYTHON_RTSLIB_FB_LICENSE_FILES = COPYING -PYTHON_RTSLIB_FB_SETUP_TYPE = setuptools -PYTHON_RTSLIB_FB_DEPENDENCIES = python-six - -$(eval $(python-package)) diff --git a/package.bak/python-scapy3k/Config.in b/package.bak/python-scapy3k/Config.in deleted file mode 100644 index 3e75fcd177..0000000000 --- a/package.bak/python-scapy3k/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SCAPY3K - bool "python-scapy3k" - depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON3_ZLIB - help - Network packet and pcap file crafting/sniffing/manipulation - security tool (based on scapy) with python3 compatibility. - - https://github.com/phaethon/scapy diff --git a/package.bak/python-scapy3k/python-scapy3k.hash b/package.bak/python-scapy3k/python-scapy3k.hash deleted file mode 100644 index 36d5dfed3c..0000000000 --- a/package.bak/python-scapy3k/python-scapy3k.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 a4c68ef2f787d82a3aec8640cac8dbab6f5b9e31ae4d89a1877efbb9150a9e25 python-scapy3k-v0.18.tar.gz diff --git a/package.bak/python-scapy3k/python-scapy3k.mk b/package.bak/python-scapy3k/python-scapy3k.mk deleted file mode 100644 index 661cb9d7fd..0000000000 --- a/package.bak/python-scapy3k/python-scapy3k.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# python-scapy3k -# -################################################################################ - -PYTHON_SCAPY3K_VERSION = v0.18 -PYTHON_SCAPY3K_SITE = $(call github,phaethon,scapy,$(PYTHON_SCAPY3K_VERSION)) -PYTHON_SCAPY3K_SETUP_TYPE = distutils -PYTHON_SCAPY3K_LICENSE = GPLv2+ - -$(eval $(python-package)) diff --git a/package.bak/python-sdnotify/Config.in b/package.bak/python-sdnotify/Config.in deleted file mode 100644 index bc77a06774..0000000000 --- a/package.bak/python-sdnotify/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_SDNOTIFY - bool "python-sdnotify" - help - A pure Python implementation of systemd's service notification - protocol (sd_notify). - - https://github.com/bb4242/sdnotify diff --git a/package.bak/python-sdnotify/python-sdnotify.hash b/package.bak/python-sdnotify/python-sdnotify.hash deleted file mode 100644 index 6d3ad6ba89..0000000000 --- a/package.bak/python-sdnotify/python-sdnotify.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/sdnotify/json -md5 a182c1ef47e1c6c965771aa3029da16f sdnotify-0.3.1.tar.gz -# sha256 calculated by scanpypi -sha256 e69220d4f6cbb02130f43f929350a80cf51033fde47dcb056fbda71e2dff2d5a sdnotify-0.3.1.tar.gz diff --git a/package.bak/python-sdnotify/python-sdnotify.mk b/package.bak/python-sdnotify/python-sdnotify.mk deleted file mode 100644 index 7c24d32729..0000000000 --- a/package.bak/python-sdnotify/python-sdnotify.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-sdnotify -# -################################################################################ - -PYTHON_SDNOTIFY_VERSION = 0.3.1 -PYTHON_SDNOTIFY_SOURCE = sdnotify-$(PYTHON_SDNOTIFY_VERSION).tar.gz -PYTHON_SDNOTIFY_SITE = https://pypi.python.org/packages/57/f9/ae03e3ebc83be0d501cde1f5d6d23dee74f5c2105f2cdb98bff4fa9ada9c -PYTHON_SDNOTIFY_SETUP_TYPE = distutils -PYTHON_SDNOTIFY_LICENSE = MIT -PYTHON_SDNOTIFY_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-serial/Config.in b/package.bak/python-serial/Config.in deleted file mode 100644 index ca12d12e6e..0000000000 --- a/package.bak/python-serial/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_SERIAL - bool "python-serial" - help - python-serial is a Python library to access serial ports. - - https://github.com/pyserial/pyserial diff --git a/package.bak/python-serial/python-serial.hash b/package.bak/python-serial/python-serial.hash deleted file mode 100644 index f98a8b91b2..0000000000 --- a/package.bak/python-serial/python-serial.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from http://pypi.python.org/pypi?:action=show_md5&digest=e849af7f8b7ec75cbc7a53da67c51a51, sha256 locally computed -md5 e849af7f8b7ec75cbc7a53da67c51a51 pyserial-3.1.tar.gz -sha256 c8ffdcbd8bfd308842409e558848c32aa3499a1bfe95a591e4210072b9520f1e pyserial-3.1.tar.gz diff --git a/package.bak/python-serial/python-serial.mk b/package.bak/python-serial/python-serial.mk deleted file mode 100644 index 4b3ffadc1c..0000000000 --- a/package.bak/python-serial/python-serial.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# python-serial -# -################################################################################ - -PYTHON_SERIAL_VERSION = 3.1 -PYTHON_SERIAL_SOURCE = pyserial-$(PYTHON_SERIAL_VERSION).tar.gz -PYTHON_SERIAL_SITE = https://pypi.python.org/packages/ce/9c/694ce79a9d4a164e109aeba1a40fba23336f3b7554978553e22a5d41d54d -PYTHON_SERIAL_LICENSE = Python Software Foundation License -PYTHON_SERIAL_LICENSE_FILES = LICENSE.txt -PYTHON_SERIAL_SETUP_TYPE = setuptools - -# aio.py is an experimental module, that is compatible only with -# Python 3, so remove it for Python 2 environment or it will -# cause compilation errors -ifeq ($(BR2_PACKAGE_PYTHON),y) -define PYTHON_SERIAL_REMOVE_AIO_PY - rm $(@D)/serial/aio.py -endef -PYTHON_SERIAL_POST_EXTRACT_HOOKS = PYTHON_SERIAL_REMOVE_AIO_PY -endif - -$(eval $(python-package)) diff --git a/package.bak/python-service-identity/Config.in b/package.bak/python-service-identity/Config.in deleted file mode 100644 index c9cbb6cca1..0000000000 --- a/package.bak/python-service-identity/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_PYTHON_SERVICE_IDENTITY - bool "python-service-identity" - select BR2_PACKAGE_PYTHON_CHARACTERISTIC # runtime - select BR2_PACKAGE_PYTHON_PYASN # runtime - select BR2_PACKAGE_PYTHON_PYASN_MODULES # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl, python-pyasn - help - Service identity verification for pyOpenSSL. - - https://pypi.python.org/pypi/service_identity - -comment "python-service-identify needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-service-identity/python-service-identity.hash b/package.bak/python-service-identity/python-service-identity.hash deleted file mode 100644 index 09561d8f93..0000000000 --- a/package.bak/python-service-identity/python-service-identity.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/service_identity/json, sha256 locally computed -md5 d52392597b9c44a740abf322bfdb21e6 service_identity-16.0.0.tar.gz -sha256 0630e222f59f91f3db498be46b1d879ff220955d7bbad719a5cb9ad14e3c3036 service_identity-16.0.0.tar.gz diff --git a/package.bak/python-service-identity/python-service-identity.mk b/package.bak/python-service-identity/python-service-identity.mk deleted file mode 100644 index 88549abff3..0000000000 --- a/package.bak/python-service-identity/python-service-identity.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-service-identity -# -################################################################################ - -PYTHON_SERVICE_IDENTITY_VERSION = 16.0.0 -PYTHON_SERVICE_IDENTITY_SOURCE = service_identity-$(PYTHON_SERVICE_IDENTITY_VERSION).tar.gz -PYTHON_SERVICE_IDENTITY_SITE = https://pypi.python.org/packages/f3/2a/7c04e7ab74f9f2be026745a9ffa81fd9d56139fa6f5f4b4c8a8c07b2bfba -PYTHON_SERVICE_IDENTITY_LICENSE = MIT -PYTHON_SERVICE_IDENTITY_LICENSE_FILES = LICENSE -PYTHON_SERVICE_IDENTITY_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-setproctitle/Config.in b/package.bak/python-setproctitle/Config.in deleted file mode 100644 index d13afaa401..0000000000 --- a/package.bak/python-setproctitle/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_SETPROCTITLE - bool "python-setproctitle" - help - A Python module to customize the process title. - - https://pypi.python.org/pypi/setproctitle diff --git a/package.bak/python-setproctitle/python-setproctitle.hash b/package.bak/python-setproctitle/python-setproctitle.hash deleted file mode 100644 index bf4d960358..0000000000 --- a/package.bak/python-setproctitle/python-setproctitle.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2dcdd1b761700a5a13252fea3dfd1977, sha256 locally computed. -md5 2dcdd1b761700a5a13252fea3dfd1977 setproctitle-1.1.10.tar.gz -sha256 6283b7a58477dd8478fbb9e76defb37968ee4ba47b05ec1c053cb39638bd7398 setproctitle-1.1.10.tar.gz diff --git a/package.bak/python-setproctitle/python-setproctitle.mk b/package.bak/python-setproctitle/python-setproctitle.mk deleted file mode 100644 index 36cfec3223..0000000000 --- a/package.bak/python-setproctitle/python-setproctitle.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-setproctitle -# -################################################################################ - -PYTHON_SETPROCTITLE_VERSION = 1.1.10 -PYTHON_SETPROCTITLE_SOURCE = setproctitle-$(PYTHON_SETPROCTITLE_VERSION).tar.gz -PYTHON_SETPROCTITLE_SITE = https://pypi.python.org/packages/5a/0d/dc0d2234aacba6cf1a729964383e3452c52096dc695581248b548786f2b3 -PYTHON_SETPROCTITLE_LICENSE = BSD-3c -PYTHON_SETPROCTITLE_LICENSE_FILES = COPYRIGHT -PYTHON_SETPROCTITLE_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-setuptools-scm/python-setuptools-scm.hash b/package.bak/python-setuptools-scm/python-setuptools-scm.hash deleted file mode 100644 index 734fc5a9df..0000000000 --- a/package.bak/python-setuptools-scm/python-setuptools-scm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/setuptools_scm/json, sha256 locally computed -md5 b6916c78ed6253d6602444fad4279c5b setuptools_scm-1.15.0.tar.gz -sha256 daf12d05aa2155a46aa357453757ffdc47d87f839e62114f042bceac6a619e2f setuptools_scm-1.15.0.tar.gz diff --git a/package.bak/python-setuptools-scm/python-setuptools-scm.mk b/package.bak/python-setuptools-scm/python-setuptools-scm.mk deleted file mode 100644 index 993fbb978b..0000000000 --- a/package.bak/python-setuptools-scm/python-setuptools-scm.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-setuptools-scm -# -################################################################################ - -PYTHON_SETUPTOOLS_SCM_VERSION = 1.15.0 -PYTHON_SETUPTOOLS_SCM_SOURCE = setuptools_scm-$(PYTHON_SETUPTOOLS_SCM_VERSION).tar.gz -PYTHON_SETUPTOOLS_SCM_SITE = https://pypi.python.org/packages/80/b7/31b6ae5fcb188e37f7e31abe75f9be90490a5456a72860fa6e643f8a3cbc -PYTHON_SETUPTOOLS_SCM_LICENSE = MIT -PYTHON_SETUPTOOLS_SCM_LICENSE_FILES = LICENSE -PYTHON_SETUPTOOLS_SCM_SETUP_TYPE = setuptools - -$(eval $(host-python-package)) diff --git a/package.bak/python-setuptools/0001-add-executable.patch b/package.bak/python-setuptools/0001-add-executable.patch deleted file mode 100644 index 1f8714eaeb..0000000000 --- a/package.bak/python-setuptools/0001-add-executable.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 9b3d307f8f6a1af88f3f810f5a6cf0835830e1e8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 7 Dec 2015 01:14:33 +0100 -Subject: [PATCH 1/1] add executable -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Add a new --executable option to distribute so that we can -force the shebang line in installed python scripts. - -[Thomas: refresh for setuptools 5.8.] -[Jörg: refresh for setuptools 18.7.1] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni -Signed-off-by: Jörg Krause ---- - setuptools/command/install.py | 2 ++ - setuptools/command/install_scripts.py | 9 +++++++++ - 2 files changed, 11 insertions(+) - -diff --git a/setuptools/command/install.py b/setuptools/command/install.py -index d2bca2e..b60ef19 100644 ---- a/setuptools/command/install.py -+++ b/setuptools/command/install.py -@@ -16,6 +16,7 @@ class install(orig.install): - """Use easy_install to install the package, w/dependencies""" - - user_options = orig.install.user_options + [ -+ ('executable=', 'e', "specify final destination interpreter path"), - ('old-and-unmanageable', None, "Try not to use this!"), - ('single-version-externally-managed', None, - "used by system package builders to create 'flat' eggs"), -@@ -31,6 +32,7 @@ class install(orig.install): - - def initialize_options(self): - orig.install.initialize_options(self) -+ self.executable = None - self.old_and_unmanageable = None - self.single_version_externally_managed = None - -diff --git a/setuptools/command/install_scripts.py b/setuptools/command/install_scripts.py -index be66cb2..07afaf8 100755 ---- a/setuptools/command/install_scripts.py -+++ b/setuptools/command/install_scripts.py -@@ -11,6 +11,13 @@ class install_scripts(orig.install_scripts): - def initialize_options(self): - orig.install_scripts.initialize_options(self) - self.no_ep = False -+ self.executable = None -+ -+ def finalize_options(self): -+ orig.install_scripts.finalize_options(self) -+ self.set_undefined_options('install', -+ ('executable','executable') -+ ) - - def run(self): - import setuptools.command.easy_install as ei -@@ -31,6 +38,8 @@ class install_scripts(orig.install_scripts): - ) - bs_cmd = self.get_finalized_command('build_scripts') - exec_param = getattr(bs_cmd, 'executable', None) -+ if self.executable is not None: -+ exec_param = self.executable - bw_cmd = self.get_finalized_command("bdist_wininst") - is_wininst = getattr(bw_cmd, '_is_running', False) - writer = ei.ScriptWriter --- -2.6.3 - diff --git a/package.bak/python-setuptools/Config.in b/package.bak/python-setuptools/Config.in deleted file mode 100644 index c72c59fbc8..0000000000 --- a/package.bak/python-setuptools/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_SETUPTOOLS - bool "python-setuptools" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 # runtime - help - Download, build, install, upgrade, and uninstall Python packages. - - http://pypi.python.org/pypi/setuptools diff --git a/package.bak/python-setuptools/python-setuptools.hash b/package.bak/python-setuptools/python-setuptools.hash deleted file mode 100644 index 88113fa1f9..0000000000 --- a/package.bak/python-setuptools/python-setuptools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://pypi.python.org/pypi/setuptools/18.7.1 -md5 a0984da9cd8d7b582e1fd7de67dfdbcc setuptools-18.7.1.tar.gz -# Locally calculated -sha256 aff36c95035e0b311eacb1434e3f7e85f5ccaad477773847e582978f8f45bd74 setuptools-18.7.1.tar.gz diff --git a/package.bak/python-setuptools/python-setuptools.mk b/package.bak/python-setuptools/python-setuptools.mk deleted file mode 100644 index 15edc6fd07..0000000000 --- a/package.bak/python-setuptools/python-setuptools.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-setuptools -# -################################################################################ - -PYTHON_SETUPTOOLS_VERSION = 18.7.1 -PYTHON_SETUPTOOLS_SOURCE = setuptools-$(PYTHON_SETUPTOOLS_VERSION).tar.gz -PYTHON_SETUPTOOLS_SITE = http://pypi.python.org/packages/source/s/setuptools -PYTHON_SETUPTOOLS_LICENSE = Python Software Foundation or Zope Public License -PYTHON_SETUPTOOLS_LICENSE_FILES = PKG-INFO -PYTHON_SETUPTOOLS_SETUP_TYPE = setuptools - -$(eval $(python-package)) -$(eval $(host-python-package)) diff --git a/package.bak/python-sh/Config.in b/package.bak/python-sh/Config.in deleted file mode 100644 index b55ea4a311..0000000000 --- a/package.bak/python-sh/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_SH - bool "python-sh" - help - Python subprocess replacement that allows you to call any - program as if it were a function. - - https://github.com/amoffat/sh diff --git a/package.bak/python-sh/python-sh.hash b/package.bak/python-sh/python-sh.hash deleted file mode 100644 index 0445fa62fd..0000000000 --- a/package.bak/python-sh/python-sh.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/sh/json, sha256 locally computed -md5 89d46b1dba32713b7df74b1bc59d74a1 sh-1.12.7.tar.gz -sha256 5a07373657a1a704a34ea1bf73b2e55c42388c5d449634d6d7c96147f5660086 sh-1.12.7.tar.gz diff --git a/package.bak/python-sh/python-sh.mk b/package.bak/python-sh/python-sh.mk deleted file mode 100644 index 1aa6bb9b11..0000000000 --- a/package.bak/python-sh/python-sh.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-sh -# -################################################################################ - -PYTHON_SH_VERSION = 1.12.7 -PYTHON_SH_SOURCE = sh-$(PYTHON_SH_VERSION).tar.gz -PYTHON_SH_SITE = https://pypi.python.org/packages/c2/98/565d9b566b3153607336ae9e91c1c467896f7f786c2d5d8e50fef7d75b08 -PYTHON_SH_SETUP_TYPE = setuptools -PYTHON_SH_LICENSE = MIT -PYTHON_SH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-shutilwhich/Config.in b/package.bak/python-shutilwhich/Config.in deleted file mode 100644 index abdc8d77a1..0000000000 --- a/package.bak/python-shutilwhich/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_SHUTILWHICH - bool "python-shutilwhich" - depends on BR2_PACKAGE_PYTHON - help - shutil.which for those not using Python 3.3 yet. - - https://pypi.python.org/pypi/shutilwhich/ diff --git a/package.bak/python-shutilwhich/python-shutilwhich.hash b/package.bak/python-shutilwhich/python-shutilwhich.hash deleted file mode 100644 index b1a2c7854f..0000000000 --- a/package.bak/python-shutilwhich/python-shutilwhich.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=915947c5cdae7afd748ac715ee547adb, sha256 locally computed. -md5 915947c5cdae7afd748ac715ee547adb shutilwhich-1.1.0.tar.gz -sha256 db1f39c6461e42f630fa617bb8c79090f7711c9ca493e615e43d0610ecb64dc6 shutilwhich-1.1.0.tar.gz diff --git a/package.bak/python-shutilwhich/python-shutilwhich.mk b/package.bak/python-shutilwhich/python-shutilwhich.mk deleted file mode 100644 index 0497e1b6d0..0000000000 --- a/package.bak/python-shutilwhich/python-shutilwhich.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-shutilwhich -# -################################################################################ - -PYTHON_SHUTILWHICH_VERSION = 1.1.0 -PYTHON_SHUTILWHICH_SOURCE = shutilwhich-$(PYTHON_SHUTILWHICH_VERSION).tar.gz -PYTHON_SHUTILWHICH_SITE = http://pypi.python.org/packages/source/s/shutilwhich -PYTHON_SHUTILWHICH_LICENSE = Python Software Foundation License -PYTHON_SHUTILWHICH_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-simpleaudio/Config.in b/package.bak/python-simpleaudio/Config.in deleted file mode 100644 index a3e07f9e2f..0000000000 --- a/package.bak/python-simpleaudio/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_PYTHON_SIMPLEAUDIO - bool "python-simpleaudio" - depends on BR2_PACKAGE_PYTHON3 - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - select BR2_PACKAGE_ALSA_LIB - help - The simplaudio package provides cross-platform, dependency-free - audio playback capability for Python 3 on OSX, Windows, and Linux. - - https://github.com/hamiltron/py-simple-audio - -comment "python-simpleaudio needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/python-simpleaudio/python-simpleaudio.hash b/package.bak/python-simpleaudio/python-simpleaudio.hash deleted file mode 100644 index 7e3a7fb39b..0000000000 --- a/package.bak/python-simpleaudio/python-simpleaudio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/simpleaudio/json, sha256 locally computed -md5 8c1c82fdf7ebba1a79b1243651e451d7 simpleaudio-1.0.1.tar.gz -sha256 6cc84d50d8192c074505c719722138ae6ea987fd8eee7fd930237cb308962604 simpleaudio-1.0.1.tar.gz diff --git a/package.bak/python-simpleaudio/python-simpleaudio.mk b/package.bak/python-simpleaudio/python-simpleaudio.mk deleted file mode 100644 index b9562ee6b9..0000000000 --- a/package.bak/python-simpleaudio/python-simpleaudio.mk +++ /dev/null @@ -1,15 +0,0 @@ -############################################################# -# -# python-simpleaudio -# -############################################################# - -PYTHON_SIMPLEAUDIO_VERSION = 1.0.1 -PYTHON_SIMPLEAUDIO_SOURCE = simpleaudio-$(PYTHON_SIMPLEAUDIO_VERSION).tar.gz -PYTHON_SIMPLEAUDIO_SITE = https://pypi.python.org/packages/12/f6/327c1af94062a6a6a5ff06dcf9dc689ed81aa07ae757cca3438c3c9e50fe -PYTHON_SIMPLEAUDIO_LICENSE = MIT -PYTHON_SIMPLEAUDIO_LICENSE_FILES = LICENSE.txt -PYTHON_SIMPLEAUDIO_SETUP_TYPE = setuptools -PYTHON_SIMPLEAUDIO_DEPENDENCIES = alsa-lib - -$(eval $(python-package)) diff --git a/package.bak/python-simplejson/Config.in b/package.bak/python-simplejson/Config.in deleted file mode 100644 index be0ee8f929..0000000000 --- a/package.bak/python-simplejson/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_SIMPLEJSON - bool "python-simplejson" - depends on BR2_PACKAGE_PYTHON - help - Simple, fast, extensible JSON encoder/decoder for Python - - https://pypi.python.org/pypi/simplejson/ diff --git a/package.bak/python-simplejson/python-simplejson.hash b/package.bak/python-simplejson/python-simplejson.hash deleted file mode 100644 index 19421b8633..0000000000 --- a/package.bak/python-simplejson/python-simplejson.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/simplejson/json, sha256 locally computed -md5 53b1371bbf883b129a12d594a97e9a18 simplejson-3.8.2.tar.gz -sha256 d58439c548433adcda98e695be53e526ba940a4b9c44fb9a05d92cd495cdd47f simplejson-3.8.2.tar.gz diff --git a/package.bak/python-simplejson/python-simplejson.mk b/package.bak/python-simplejson/python-simplejson.mk deleted file mode 100644 index 703bca22d6..0000000000 --- a/package.bak/python-simplejson/python-simplejson.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-simplejson -# -################################################################################ - -PYTHON_SIMPLEJSON_VERSION = 3.8.2 -PYTHON_SIMPLEJSON_SOURCE = simplejson-$(PYTHON_SIMPLEJSON_VERSION).tar.gz -PYTHON_SIMPLEJSON_SITE = https://pypi.python.org/packages/f0/07/26b519e6ebb03c2a74989f7571e6ae6b82e9d7d81b8de6fcdbfc643c7b58 -PYTHON_SIMPLEJSON_LICENSE = Academic Free License (AFL), MIT -PYTHON_SIMPLEJSON_LICENSE_FILES = LICENSE.txt -PYTHON_SIMPLEJSON_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-singledispatch/Config.in b/package.bak/python-singledispatch/Config.in deleted file mode 100644 index 4abc219f95..0000000000 --- a/package.bak/python-singledispatch/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SINGLEDISPATCH - bool "python-singledispatch" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_SIX # runtime - help - This library brings functools.singledispatch from - Python 3.4 to Python 2.6-3.3 - - https://pypi.python.org/pypi/singledispatch diff --git a/package.bak/python-singledispatch/python-singledispatch.hash b/package.bak/python-singledispatch/python-singledispatch.hash deleted file mode 100644 index 8a96d21a95..0000000000 --- a/package.bak/python-singledispatch/python-singledispatch.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=af2fc6a3d6cc5a02d0bf54d909785fcb, sha256 locally computed -md5 af2fc6a3d6cc5a02d0bf54d909785fcb singledispatch-3.4.0.3.tar.gz -sha256 5b06af87df13818d14f08a028e42f566640aef80805c3b50c5056b086e3c2b9c singledispatch-3.4.0.3.tar.gz diff --git a/package.bak/python-singledispatch/python-singledispatch.mk b/package.bak/python-singledispatch/python-singledispatch.mk deleted file mode 100644 index 7e1d5ac8e0..0000000000 --- a/package.bak/python-singledispatch/python-singledispatch.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-singledispatch -# -################################################################################ - -PYTHON_SINGLEDISPATCH_VERSION = 3.4.0.3 -PYTHON_SINGLEDISPATCH_SOURCE = singledispatch-$(PYTHON_SINGLEDISPATCH_VERSION).tar.gz -PYTHON_SINGLEDISPATCH_SITE = https://pypi.python.org/packages/source/s/singledispatch -PYTHON_SINGLEDISPATCH_LICENSE = MIT -PYTHON_SINGLEDISPATCH_LICENSE_FILES = setup.py -PYTHON_SINGLEDISPATCH_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-sip/Config.in b/package.bak/python-sip/Config.in deleted file mode 100644 index 1f8961d0df..0000000000 --- a/package.bak/python-sip/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -comment "python-sip needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -comment "python-sip needs qt or qt5" - depends on BR2_USE_MMU - depends on BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 - -config BR2_PACKAGE_PYTHON_SIP - bool "python-sip" - depends on BR2_INSTALL_LIBSTDCPP # qt - depends on BR2_TOOLCHAIN_HAS_THREADS # qt - depends on BR2_USE_MMU # qt - depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 - help - SIP is a tool that makes it very easy to create Python - bindings for C and C++ libraries. It was originally - developed to create PyQt, the Python bindings for the Qt - toolkit, but can be used to create bindings for any C or C++ - library. - - SIP comprises a code generator and a Python module. The code - generator processes a set of specification files and - generates C or C++ code which is then compiled to create the - bindings extension module. The SIP Python module provides - support functions to the automatically generated code. - - http://www.riverbankcomputing.com/software/sip/intro diff --git a/package.bak/python-sip/python-sip.hash b/package.bak/python-sip/python-sip.hash deleted file mode 100644 index 2f7d4309bc..0000000000 --- a/package.bak/python-sip/python-sip.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/pyqt/files/sip/sip-4.18/ -md5 78724bf2a79878201c3bc81a1d8248ea sip-4.18.tar.gz -# Locally calculated: -sha256 f1dc5c81c07a9ad97edcd4a0af964a41e420024ba7ca165afd2b351efd249cb6 sip-4.18.tar.gz diff --git a/package.bak/python-sip/python-sip.mk b/package.bak/python-sip/python-sip.mk deleted file mode 100644 index 0c0a94738d..0000000000 --- a/package.bak/python-sip/python-sip.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# python-sip -# -################################################################################ - -PYTHON_SIP_VERSION = 4.18 -PYTHON_SIP_SOURCE = sip-$(PYTHON_SIP_VERSION).tar.gz -PYTHON_SIP_SITE = http://downloads.sourceforge.net/project/pyqt/sip/sip-$(PYTHON_SIP_VERSION) -PYTHON_SIP_LICENSE = SIP license or GPLv2 or GPLv3 -PYTHON_SIP_LICENSE_FILES = LICENSE LICENSE-GPL2 LICENSE-GPL3 - -ifeq ($(BR2_PACKAGE_QT5),y) -PYTHON_SIP_DEPENDENCIES = qt5base -else -PYTHON_SIP_DEPENDENCIES = qt -endif - -ifeq ($(BR2_PACKAGE_PYTHON),y) -PYTHON_SIP_DEPENDENCIES += python -HOST_PYTHON_SIP_DEPENDENCIES += host-python -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -PYTHON_SIP_DEPENDENCIES += python3 -HOST_PYTHON_SIP_DEPENDENCIES += host-python3 -PYTHON_SIP_LIB_DIR = usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -PYTHON_SIP_INCLUDE_DIR = usr/include/python$(PYTHON3_VERSION_MAJOR)m -endif - -define HOST_PYTHON_SIP_CONFIGURE_CMDS - (cd $(@D); \ - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python configure.py) -endef - -define HOST_PYTHON_SIP_BUILD_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define HOST_PYTHON_SIP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(HOST_CONFIGURE_OPTS) $(MAKE) install -C $(@D) -endef - -define PYTHON_SIP_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(HOST_DIR)/usr/bin/python configure.py \ - --bindir $(TARGET_DIR)/usr/bin \ - --destdir $(TARGET_DIR)/$(PYTHON_SIP_LIB_DIR) \ - --incdir $(STAGING_DIR)/$(PYTHON_SIP_INCLUDE_DIR) \ - --sipdir $(TARGET_DIR)/usr/share/sip \ - --sysroot $(STAGING_DIR)/usr \ - --use-qmake && \ - $(HOST_DIR)/usr/bin/qmake) -endef - -define PYTHON_SIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define PYTHON_SIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) install -C $(@D) -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/python-six/Config.in b/package.bak/python-six/Config.in deleted file mode 100644 index 0a8b69ace6..0000000000 --- a/package.bak/python-six/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_SIX - bool "python-six" - help - Six is a Python 2 and 3 compatibility library. It provides - utility functions for smoothing over the differences between - the Python versions with the goal of writing Python code that - is compatible on both Python versions. - - http://pythonhosted.org/six diff --git a/package.bak/python-six/python-six.hash b/package.bak/python-six/python-six.hash deleted file mode 100644 index a90c79b75c..0000000000 --- a/package.bak/python-six/python-six.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 105f8d68616f8248e24bf0e9372ef04d3cc10104f1980f54d57b2ce73a5ad56a six-1.10.0.tar.gz diff --git a/package.bak/python-six/python-six.mk b/package.bak/python-six/python-six.mk deleted file mode 100644 index 0edefe346f..0000000000 --- a/package.bak/python-six/python-six.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-six -# -################################################################################ - -PYTHON_SIX_VERSION = 1.10.0 -PYTHON_SIX_SOURCE = six-$(PYTHON_SIX_VERSION).tar.gz -PYTHON_SIX_SITE = https://pypi.python.org/packages/source/s/six -PYTHON_SIX_SETUP_TYPE = setuptools -PYTHON_SIX_LICENSE = MIT -PYTHON_SIX_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-slob/Config.in b/package.bak/python-slob/Config.in deleted file mode 100644 index 2c8ddb0880..0000000000 --- a/package.bak/python-slob/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_PYTHON_SLOB - bool "python-slob" - depends on !BR2_BINFMT_FLAT # python-pyicu -> icu - depends on BR2_INSTALL_LIBSTDCPP # python-pyicu -> icu - depends on BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_PYICU # runtime - # although optional, it is used as default compression - select BR2_PACKAGE_PYTHON3_XZ # runtime - help - slob.py is a reference implementation of slob format reader - and writer. - - https://github.com/itkach/slob - -comment "python-slob needs a toolchain w/ C++" - depends on BR2_PACKAGE_PYTHON3 && !BR2_BINFMT_FLAT - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-slob/python-slob.hash b/package.bak/python-slob/python-slob.hash deleted file mode 100644 index 39d5d81f30..0000000000 --- a/package.bak/python-slob/python-slob.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 18eb4f45d09d49b1f776cac52ea70ab951566c60cd30bbec39e88f10908fd8ff python-slob-31ad0e769360a5b10a4893f686587bb8e48c3895.tar.gz diff --git a/package.bak/python-slob/python-slob.mk b/package.bak/python-slob/python-slob.mk deleted file mode 100644 index 474c0c94df..0000000000 --- a/package.bak/python-slob/python-slob.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-slob -# -################################################################################ - -PYTHON_SLOB_VERSION = 31ad0e769360a5b10a4893f686587bb8e48c3895 -PYTHON_SLOB_SITE = $(call github,itkach,slob,$(PYTHON_SLOB_VERSION)) -PYTHON_SLOB_LICENSE = GPLv3 -PYTHON_SLOB_LICENSE_FILES = LICENSE -PYTHON_SLOB_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/python-smbus-cffi/Config.in b/package.bak/python-smbus-cffi/Config.in deleted file mode 100644 index 32f005c096..0000000000 --- a/package.bak/python-smbus-cffi/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_PYTHON_SMBUS_CFFI - bool "python-smbus-cffi" - select BR2_PACKAGE_PYTHON_CFFI - help - This Python module allows SMBus access through the I2C /dev - interface on Linux hosts. The host kernel must have I2C - support, I2C device interface support, and a bus adapter - driver. - - https://github.com/bivab/smbus-cffi diff --git a/package.bak/python-smbus-cffi/python-smbus-cffi.hash b/package.bak/python-smbus-cffi/python-smbus-cffi.hash deleted file mode 100644 index 1e28df99b7..0000000000 --- a/package.bak/python-smbus-cffi/python-smbus-cffi.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=f621c871bd658ee665751ad78e3b2df9, sha256 locally computed -md5 f621c871bd658ee665751ad78e3b2df9 smbus-cffi-0.5.1.tar.gz -sha256 fb4195aaabfc01586863f60d3190b5cb1bf8f12622fd597e23e48768dad6bde8 smbus-cffi-0.5.1.tar.gz diff --git a/package.bak/python-smbus-cffi/python-smbus-cffi.mk b/package.bak/python-smbus-cffi/python-smbus-cffi.mk deleted file mode 100644 index 5fd9558e87..0000000000 --- a/package.bak/python-smbus-cffi/python-smbus-cffi.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-smbus-cffi -# -################################################################################ - -PYTHON_SMBUS_CFFI_VERSION = 0.5.1 -PYTHON_SMBUS_CFFI_SOURCE = smbus-cffi-$(PYTHON_SMBUS_CFFI_VERSION).tar.gz -PYTHON_SMBUS_CFFI_SITE = https://pypi.python.org/packages/source/s/smbus-cffi -PYTHON_SMBUS_CFFI_SETUP_TYPE = setuptools -PYTHON_SMBUS_CFFI_LICENSE = GPLv2 -PYTHON_SMBUS_CFFI_LICENSE_FILES = LICENSE -PYTHON_SMBUS_CFFI_DEPENDENCIES = host-python-cffi - -$(eval $(python-package)) diff --git a/package.bak/python-socketio/Config.in b/package.bak/python-socketio/Config.in deleted file mode 100644 index af0f6f32e8..0000000000 --- a/package.bak/python-socketio/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_SOCKETIO - bool "python-socketio" - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_ENGINEIO # runtime - help - Socket.IO server. - - http://github.com/miguelgrinberg/python-socketio/ diff --git a/package.bak/python-socketio/python-socketio.hash b/package.bak/python-socketio/python-socketio.hash deleted file mode 100644 index 659d4d540c..0000000000 --- a/package.bak/python-socketio/python-socketio.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/python-socketio/json -md5 44fd24e839dc3102920765f345740646 python-socketio-1.4.1.tar.gz -# sha256 calculated by scanpypi -sha256 ebd0984d831d602c8ec6d586ecde4466972cc7ed37dbbfe613192864e8263779 python-socketio-1.4.1.tar.gz diff --git a/package.bak/python-socketio/python-socketio.mk b/package.bak/python-socketio/python-socketio.mk deleted file mode 100644 index 57dc1f8b48..0000000000 --- a/package.bak/python-socketio/python-socketio.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-socketio -# -################################################################################ - -PYTHON_SOCKETIO_VERSION = 1.4.1 -PYTHON_SOCKETIO_SITE = https://pypi.python.org/packages/da/00/66103df6a116a2ce3ea662a9c8c80f337d43d7f138caf04e9af6dec24ba7 -PYTHON_SOCKETIO_SETUP_TYPE = setuptools -PYTHON_SOCKETIO_LICENSE = MIT -PYTHON_SOCKETIO_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-spidev/Config.in b/package.bak/python-spidev/Config.in deleted file mode 100644 index 8540d55469..0000000000 --- a/package.bak/python-spidev/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_SPIDEV - bool "python-spidev" - help - Python module for interfacing with SPI devices from user - space via the spidev linux kernel driver. - - https://pypi.python.org/pypi/spidev diff --git a/package.bak/python-spidev/python-spidev.hash b/package.bak/python-spidev/python-spidev.hash deleted file mode 100644 index dc08925d30..0000000000 --- a/package.bak/python-spidev/python-spidev.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/spidev/json, sha256 locally computed -md5 f601676f1bb48b9aa3b3897f95216365 spidev-3.2.tar.gz -sha256 09d2b5122f0dd79910713a11f9a0020f71537224bf829916def4fffc0ea59456 spidev-3.2.tar.gz diff --git a/package.bak/python-spidev/python-spidev.mk b/package.bak/python-spidev/python-spidev.mk deleted file mode 100644 index d839bb3f7f..0000000000 --- a/package.bak/python-spidev/python-spidev.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-spidev -# -################################################################################ - -PYTHON_SPIDEV_VERSION = 3.2 -PYTHON_SPIDEV_SOURCE = spidev-$(PYTHON_SPIDEV_VERSION).tar.gz -PYTHON_SPIDEV_SITE = https://pypi.python.org/packages/36/83/73748b6e1819b57d8e1df8090200195cdae33aaa22a49a91ded16785eedd -PYTHON_SPIDEV_SETUP_TYPE = distutils -PYTHON_SPIDEV_LICENSE = GPLv2 -PYTHON_SPIDEV_LICENSE_FILES = LICENSE.md - -$(eval $(python-package)) diff --git a/package.bak/python-thrift/Config.in b/package.bak/python-thrift/Config.in deleted file mode 100644 index 94a75900fe..0000000000 --- a/package.bak/python-thrift/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_THRIFT - bool "python-thrift" - depends on BR2_PACKAGE_PYTHON - help - python-thrift is a Python bindings for the Apache Thrift RPC system. - - http://thrift.apache.org/ diff --git a/package.bak/python-thrift/python-thrift.hash b/package.bak/python-thrift/python-thrift.hash deleted file mode 100644 index 72269eb836..0000000000 --- a/package.bak/python-thrift/python-thrift.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/thrift/json, sha256 locally computed -md5 b519551d7a086bb0b4f222a8f566b7e8 thrift-0.9.3.tar.gz -sha256 dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e thrift-0.9.3.tar.gz diff --git a/package.bak/python-thrift/python-thrift.mk b/package.bak/python-thrift/python-thrift.mk deleted file mode 100644 index d0e3a14685..0000000000 --- a/package.bak/python-thrift/python-thrift.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-thrift -# -################################################################################ - -PYTHON_THRIFT_VERSION = 0.9.3 -PYTHON_THRIFT_SOURCE = thrift-$(PYTHON_THRIFT_VERSION).tar.gz -PYTHON_THRIFT_SITE = https://pypi.python.org/packages/ae/58/35e3f0cd290039ff862c2c9d8ae8a76896665d70343d833bdc2f748b8e55 -PYTHON_THRIFT_LICENSE = Apache-2.0 -PYTHON_THRIFT_LICENSE_FILES = setup.py -PYTHON_THRIFT_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-tomako/Config.in b/package.bak/python-tomako/Config.in deleted file mode 100644 index bd6d29982a..0000000000 --- a/package.bak/python-tomako/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_TOMAKO - bool "python-tomako" - select BR2_PACKAGE_PYTHON_TORNADO # runtime - select BR2_PACKAGE_PYTHON_MAKO # runtime - help - Tomako is the easiest way to use Mako as a template engine for - Tornado. - - https://github.com/rcmachado/tomako diff --git a/package.bak/python-tomako/python-tomako.hash b/package.bak/python-tomako/python-tomako.hash deleted file mode 100644 index af07a88abc..0000000000 --- a/package.bak/python-tomako/python-tomako.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/tomako/json, sha256 locally computed -md5 a2e9e99be4ddf2263ed441ddc3dfcf96 tomako-0.1.0.post1.tar.gz -sha256 2d8ec113199408eb16ec00361aac6f10b716925779b6331083f304d01dafd150 tomako-0.1.0.post1.tar.gz diff --git a/package.bak/python-tomako/python-tomako.mk b/package.bak/python-tomako/python-tomako.mk deleted file mode 100644 index 23c0b34ff3..0000000000 --- a/package.bak/python-tomako/python-tomako.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-tomako -# -################################################################################ - -PYTHON_TOMAKO_VERSION = 0.1.0.post1 -PYTHON_TOMAKO_SOURCE = tomako-$(PYTHON_TOMAKO_VERSION).tar.gz -PYTHON_TOMAKO_SITE = https://pypi.python.org/packages/30/64/e174248281cb2fa8f5bce955d4bd49b253e622bb540a6001e48dec378a07 -PYTHON_TOMAKO_SETUP_TYPE = setuptools -PYTHON_TOMAKO_LICENSE = MIT -PYTHON_TOMAKO_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-toml/Config.in b/package.bak/python-toml/Config.in deleted file mode 100644 index a41622fc2f..0000000000 --- a/package.bak/python-toml/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_TOML - bool "python-toml" - help - Python Library for Tom's Obvious, Minimal Language. - - https://github.com/uiri/toml diff --git a/package.bak/python-toml/python-toml.hash b/package.bak/python-toml/python-toml.hash deleted file mode 100644 index cbc71a961b..0000000000 --- a/package.bak/python-toml/python-toml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 aee9679726f42fb09f48b9701a321571e0b6a51305c3e0f3913b3057d8bf7083 python-toml-0.9.2.tar.gz diff --git a/package.bak/python-toml/python-toml.mk b/package.bak/python-toml/python-toml.mk deleted file mode 100644 index fec113e1cb..0000000000 --- a/package.bak/python-toml/python-toml.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-toml -# -################################################################################ - -PYTHON_TOML_VERSION = 0.9.2 -PYTHON_TOML_SITE = $(call github,uiri,toml,$(PYTHON_TOML_VERSION)) -PYTHON_TOML_SETUP_TYPE = distutils -PYTHON_TOML_LICENSE = MIT -PYTHON_TOML_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-tornado/Config.in b/package.bak/python-tornado/Config.in deleted file mode 100644 index a0ee78fb7a..0000000000 --- a/package.bak/python-tornado/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_PYTHON_TORNADO - bool "python-tornado" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_SINGLEDISPATCH if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_BACKPORTS_ABC if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON_CERTIFI if BR2_PACKAGE_PYTHON # runtime - help - Tornado is a Python web framework and asynchronous networking - library, originally developed at FriendFeed. - - http://www.tornadoweb.org diff --git a/package.bak/python-tornado/python-tornado.hash b/package.bak/python-tornado/python-tornado.hash deleted file mode 100644 index ee4080fe75..0000000000 --- a/package.bak/python-tornado/python-tornado.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/tornado/json, sha256 locally computed -md5 b4816ea209118667ffc52ce9ff06ac85 tornado-4.4.2.tar.gz -sha256 2898f992f898cd41eeb8d53b6df75495f2f423b6672890aadaf196ea1448edcc tornado-4.4.2.tar.gz diff --git a/package.bak/python-tornado/python-tornado.mk b/package.bak/python-tornado/python-tornado.mk deleted file mode 100644 index e512e60fa1..0000000000 --- a/package.bak/python-tornado/python-tornado.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-tornado -# -################################################################################ - -PYTHON_TORNADO_VERSION = 4.4.2 -PYTHON_TORNADO_SOURCE = tornado-$(PYTHON_TORNADO_VERSION).tar.gz -PYTHON_TORNADO_SITE = https://pypi.python.org/packages/1e/7c/ea047f7bbd1ff22a7f69fe55e7561040e3e54d6f31da6267ef9748321f98 -PYTHON_TORNADO_LICENSE = Apache-2.0 -PYTHON_TORNADO_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-treq/Config.in b/package.bak/python-treq/Config.in deleted file mode 100644 index 4a237373d1..0000000000 --- a/package.bak/python-treq/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_PYTHON_TREQ - bool "python-treq" - select BR2_PACKAGE_PYTHON_REQUESTS # runtime - select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY # runtime - select BR2_PACKAGE_PYTHON_SIX # runtime - select BR2_PACKAGE_PYTHON_TWISTED # runtime - select BR2_PACKAGE_PYTHON_PYOPENSSL # runtime - depends on BR2_INSTALL_LIBSTDCPP # python-pyopenssl - help - treq is an HTTP library inspired by requests but written on - top of Twisted's Agents. It provides a simple, higher level - API for making HTTP requests when using Twisted. - - https://github.com/twisted/treq - -comment "python-treq needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/python-treq/python-treq.hash b/package.bak/python-treq/python-treq.hash deleted file mode 100644 index f4cc4d6f11..0000000000 --- a/package.bak/python-treq/python-treq.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=b1fb60759ad5a885cb8ea562553f2d4c, sha256 locally computed -md5 b1fb60759ad5a885cb8ea562553f2d4c treq-15.1.0.tar.gz -sha256 425a47d5d52a993d51211028fb6ade252e5fbea094e878bb4b644096a7322de8 treq-15.1.0.tar.gz diff --git a/package.bak/python-treq/python-treq.mk b/package.bak/python-treq/python-treq.mk deleted file mode 100644 index dbf0e148a7..0000000000 --- a/package.bak/python-treq/python-treq.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-treq -# -################################################################################ - -PYTHON_TREQ_VERSION = 15.1.0 -PYTHON_TREQ_SOURCE = treq-$(PYTHON_TREQ_VERSION).tar.gz -PYTHON_TREQ_SITE = http://pypi.python.org/packages/source/t/treq -PYTHON_TREQ_LICENSE = MIT -PYTHON_TREQ_LICENSE_FILES = LICENSE -PYTHON_TREQ_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-twisted/Config.in b/package.bak/python-twisted/Config.in deleted file mode 100644 index 7fe4289d46..0000000000 --- a/package.bak/python-twisted/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_TWISTED - bool "python-twisted" - select BR2_PACKAGE_PYTHON_INCREMENTAL - select BR2_PACKAGE_PYTHON_CONSTANTLY # runtime - select BR2_PACKAGE_PYTHON_ZOPE_INTERFACE # runtime - help - Twisted is an event-driven networking engine written in Python. - - https://twistedmatrix.com/trac/ diff --git a/package.bak/python-twisted/python-twisted.hash b/package.bak/python-twisted/python-twisted.hash deleted file mode 100644 index cc78a4cb53..0000000000 --- a/package.bak/python-twisted/python-twisted.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/twisted/json, sha256 locally computed -md5 54a88ffe773d5a83c91fcfe86044b094 Twisted-16.6.0.tar.bz2 -sha256 d0fe115ea7ef8cf632d05103de60356c6e992b2153d6830bdc4476f8accb1fca Twisted-16.6.0.tar.bz2 diff --git a/package.bak/python-twisted/python-twisted.mk b/package.bak/python-twisted/python-twisted.mk deleted file mode 100644 index 29fe735895..0000000000 --- a/package.bak/python-twisted/python-twisted.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# python-twisted -# -################################################################################ - -PYTHON_TWISTED_VERSION = 16.6.0 -PYTHON_TWISTED_SOURCE = Twisted-$(PYTHON_TWISTED_VERSION).tar.bz2 -PYTHON_TWISTED_SITE = https://pypi.python.org/packages/dc/c0/a0114a6d7fa211c0904b0de931e8cafb5210ad824996cc6a9d67f3bae22c -PYTHON_TWISTED_SETUP_TYPE = setuptools -PYTHON_TWISTED_LICENSE = MIT -PYTHON_TWISTED_LICENSE_FILES = LICENSE -PYTHON_TWISTED_DEPENDENCIES = python-incremental - -$(eval $(python-package)) diff --git a/package.bak/python-txaio/Config.in b/package.bak/python-txaio/Config.in deleted file mode 100644 index 9d4238215e..0000000000 --- a/package.bak/python-txaio/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_TXAIO - bool "python-txaio" - select BR2_PACKAGE_PYTHON_SIX # runtime - help - Compatibility API between asyncio/Twisted/Trollius. - - https://pypi.python.org/pypi/txaio diff --git a/package.bak/python-txaio/python-txaio.hash b/package.bak/python-txaio/python-txaio.hash deleted file mode 100644 index 37da82b1b7..0000000000 --- a/package.bak/python-txaio/python-txaio.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/txaio/json, sha256 locally computed. -md5 7b0f5321515d380ad5d32f01666b6ee7 txaio-2.5.1.tar.gz -sha256 625076477182e2dde78b79d0b2b0d6b3cecb0e24fe0ea7eaf2abd26a4c0dd1de txaio-2.5.1.tar.gz diff --git a/package.bak/python-txaio/python-txaio.mk b/package.bak/python-txaio/python-txaio.mk deleted file mode 100644 index 34c6e99cc6..0000000000 --- a/package.bak/python-txaio/python-txaio.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-txaio -# -################################################################################ - -PYTHON_TXAIO_VERSION = 2.5.1 -PYTHON_TXAIO_SOURCE = txaio-$(PYTHON_TXAIO_VERSION).tar.gz -PYTHON_TXAIO_SITE = https://pypi.python.org/packages/45/e1/f7d88767d65dbfc20d4b4aa0dad657dbbe8ca629ead2bef24da04630a12a -PYTHON_TXAIO_LICENSE = MIT -PYTHON_TXAIO_LICENSE_FILES = LICENSE -PYTHON_TXAIO_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-u-msgpack/Config.in b/package.bak/python-u-msgpack/Config.in deleted file mode 100644 index ad0f90e8d2..0000000000 --- a/package.bak/python-u-msgpack/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_U_MSGPACK - bool "python-u-msgpack" - help - A portable, lightweight MessagePack serializer and deserializer - written in pure Python. - - https://github.com/vsergeev/u-msgpack-python diff --git a/package.bak/python-u-msgpack/python-u-msgpack.hash b/package.bak/python-u-msgpack/python-u-msgpack.hash deleted file mode 100644 index 12f2be37af..0000000000 --- a/package.bak/python-u-msgpack/python-u-msgpack.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/u-msgpack-python/json, sha256 locally computed -md5 f5adfb3e19910d8a41e331d3b03aa7c6 u-msgpack-python-2.2.tar.gz -sha256 cdd5a88f2313856a6a9f481f652dab9edd5731059badbb0111280f27249930d7 u-msgpack-python-2.2.tar.gz diff --git a/package.bak/python-u-msgpack/python-u-msgpack.mk b/package.bak/python-u-msgpack/python-u-msgpack.mk deleted file mode 100644 index a88beeb1c9..0000000000 --- a/package.bak/python-u-msgpack/python-u-msgpack.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-u-msgpack -# -################################################################################ - -PYTHON_U_MSGPACK_VERSION = 2.2 -PYTHON_U_MSGPACK_SOURCE = u-msgpack-python-$(PYTHON_U_MSGPACK_VERSION).tar.gz -PYTHON_U_MSGPACK_SITE = https://pypi.python.org/packages/66/5b/36fe0fcf290bd39f6ef6c1f5924cf0a9a76b0dc94575975ad7d318619cf9 -PYTHON_U_MSGPACK_SETUP_TYPE = distutils -PYTHON_U_MSGPACK_LICENSE = MIT -PYTHON_U_MSGPACK_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-ubjson/Config.in b/package.bak/python-ubjson/Config.in deleted file mode 100644 index 86ed3b2e1b..0000000000 --- a/package.bak/python-ubjson/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_UBJSON - bool "python-ubjson" - help - This is a Python v3.2+ (and 2.7+) Universal Binary JSON - encoder/decoder based on the draft-12 specification. - - https://pypi.python.org/pypi/py-ubjson diff --git a/package.bak/python-ubjson/python-ubjson.hash b/package.bak/python-ubjson/python-ubjson.hash deleted file mode 100644 index 88c8c62b3a..0000000000 --- a/package.bak/python-ubjson/python-ubjson.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/py-ubjson/json, sha256 locally computed -md5 09584b02508451a8133095c3b5f2bf41 py-ubjson-0.8.5.tar.gz -sha256 e58e99753aaff3ed5d884989a6236bd98a4b0dfdb0e62f9753c20f485691fa9e py-ubjson-0.8.5.tar.gz diff --git a/package.bak/python-ubjson/python-ubjson.mk b/package.bak/python-ubjson/python-ubjson.mk deleted file mode 100644 index e42b2dc50c..0000000000 --- a/package.bak/python-ubjson/python-ubjson.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ubjson -# -################################################################################ - -PYTHON_UBJSON_VERSION = 0.8.5 -PYTHON_UBJSON_SOURCE = py-ubjson-$(PYTHON_UBJSON_VERSION).tar.gz -PYTHON_UBJSON_SITE = https://pypi.python.org/packages/99/12/173cd417cacdacd158f947365bb17952a93b4e9d08f8a2f4b77d6c17cb4e -PYTHON_UBJSON_LICENSE = Apache-2.0 -PYTHON_UBJSON_LICENSE_FILES = LICENSE -PYTHON_UBJSON_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-ujson/Config.in b/package.bak/python-ujson/Config.in deleted file mode 100644 index d185c98532..0000000000 --- a/package.bak/python-ujson/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_UJSON - bool "python-ujson" - help - UltraJSON is an ultra fast JSON encoder and decoder written - in pure C with bindings for Python 2.5+ and 3. - - https://pypi.python.org/pypi/ujson diff --git a/package.bak/python-ujson/python-ujson.hash b/package.bak/python-ujson/python-ujson.hash deleted file mode 100644 index 21320346a1..0000000000 --- a/package.bak/python-ujson/python-ujson.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=42f77b0cce686dfa4da2e68480b1dd24,sha256 locally computed. -md5 42f77b0cce686dfa4da2e68480b1dd24 ujson-1.35.tar.gz -sha256 f66073e5506e91d204ab0c614a148d5aa938bdbf104751be66f8ad7a222f5f86 ujson-1.35.tar.gz diff --git a/package.bak/python-ujson/python-ujson.mk b/package.bak/python-ujson/python-ujson.mk deleted file mode 100644 index 8d4a12b811..0000000000 --- a/package.bak/python-ujson/python-ujson.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-ujson -# -################################################################################ - -PYTHON_UJSON_VERSION = 1.35 -PYTHON_UJSON_SOURCE = ujson-$(PYTHON_UJSON_VERSION).tar.gz -PYTHON_UJSON_SITE = http://pypi.python.org/packages/source/u/ujson -PYTHON_UJSON_LICENSE = BSD-3c -PYTHON_UJSON_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-urllib3/Config.in b/package.bak/python-urllib3/Config.in deleted file mode 100644 index 21d3f6748e..0000000000 --- a/package.bak/python-urllib3/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_URLLIB3 - bool "python-urllib3" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - help - Python HTTP library with thread-safe connection pooling, file - post support, sanity friendly, and more. - - http://urllib3.readthedocs.org/ diff --git a/package.bak/python-urllib3/python-urllib3.hash b/package.bak/python-urllib3/python-urllib3.hash deleted file mode 100644 index fb5fd9dd27..0000000000 --- a/package.bak/python-urllib3/python-urllib3.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/urllib3/json, sha256 locally computed -md5 1eadd93bd5e58d3528d977111f2997ea urllib3-1.18.tar.gz -sha256 d30dd4d1cbbc36ebab6e4a2076820cfe0c60f10adf087fecbc5a3edae79fdc81 urllib3-1.18.tar.gz diff --git a/package.bak/python-urllib3/python-urllib3.mk b/package.bak/python-urllib3/python-urllib3.mk deleted file mode 100644 index 9043aa35a6..0000000000 --- a/package.bak/python-urllib3/python-urllib3.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-urllib3 -# -################################################################################ - -PYTHON_URLLIB3_VERSION = 1.18 -PYTHON_URLLIB3_SOURCE = urllib3-$(PYTHON_URLLIB3_VERSION).tar.gz -PYTHON_URLLIB3_SITE = https://pypi.python.org/packages/8f/45/7434a6a44d42744b74fb969a39720f0c3d4f31f921737e51a69d8b15c859 -PYTHON_URLLIB3_LICENSE = MIT -PYTHON_URLLIB3_LICENSE_FILES = LICENSE.txt -PYTHON_URLLIB3_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-urwid/Config.in b/package.bak/python-urwid/Config.in deleted file mode 100644 index f584a9258d..0000000000 --- a/package.bak/python-urwid/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_URWID - bool "python-urwid" - help - Urwid is a console user interface library for Python - - http://urwid.org/ diff --git a/package.bak/python-urwid/python-urwid.hash b/package.bak/python-urwid/python-urwid.hash deleted file mode 100644 index c600851646..0000000000 --- a/package.bak/python-urwid/python-urwid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/urwid/json, sha256 locally computed -md5 2e1a005cb31368fe21bfeba2d6ad5a5c urwid-1.3.1.tar.gz -sha256 cfcec03e36de25a1073e2e35c2c7b0cc6969b85745715c3a025a31d9786896a1 urwid-1.3.1.tar.gz diff --git a/package.bak/python-urwid/python-urwid.mk b/package.bak/python-urwid/python-urwid.mk deleted file mode 100644 index e52a155eb7..0000000000 --- a/package.bak/python-urwid/python-urwid.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-urwid -# -################################################################################ - -PYTHON_URWID_VERSION = 1.3.1 -PYTHON_URWID_SOURCE = urwid-$(PYTHON_URWID_VERSION).tar.gz -PYTHON_URWID_SITE = https://pypi.python.org/packages/source/u/urwid -PYTHON_URWID_LICENSE = LGPLv2.1+ -PYTHON_URWID_LICENSE_FILES = COPYING -PYTHON_URWID_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-vcversioner/python-vcversioner.hash b/package.bak/python-vcversioner/python-vcversioner.hash deleted file mode 100644 index 58573a18b3..0000000000 --- a/package.bak/python-vcversioner/python-vcversioner.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/vcversioner/json, sha256 locally computed -md5 aab6ef5e0cf8614a1b1140ed5b7f107d vcversioner-2.16.0.0.tar.gz -sha256 dae60c17a479781f44a4010701833f1829140b1eeccd258762a74974aa06e19b vcversioner-2.16.0.0.tar.gz diff --git a/package.bak/python-vcversioner/python-vcversioner.mk b/package.bak/python-vcversioner/python-vcversioner.mk deleted file mode 100644 index e7a62f864b..0000000000 --- a/package.bak/python-vcversioner/python-vcversioner.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-vcversioner -# -################################################################################ - -PYTHON_VCVERSIONER_VERSION = 2.16.0.0 -PYTHON_VCVERSIONER_SOURCE = vcversioner-$(PYTHON_VCVERSIONER_VERSION).tar.gz -PYTHON_VCVERSIONER_SITE = https://pypi.python.org/packages/c5/cc/33162c0a7b28a4d8c83da07bc2b12cee58c120b4a9e8bba31c41c8d35a16 -PYTHON_VCVERSIONER_SETUP_TYPE = setuptools -PYTHON_VCVERSIONER_LICENSE = ISC - -$(eval $(host-python-package)) diff --git a/package.bak/python-versiontools/Config.in b/package.bak/python-versiontools/Config.in deleted file mode 100644 index cb260c1fbd..0000000000 --- a/package.bak/python-versiontools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_VERSIONTOOLS - bool "python-versiontools" - depends on BR2_PACKAGE_PYTHON - help - Smart replacement for plain tuple used in __version__. - - https://pypi.python.org/pypi/versiontools diff --git a/package.bak/python-versiontools/python-versiontools.hash b/package.bak/python-versiontools/python-versiontools.hash deleted file mode 100644 index 1067c415cd..0000000000 --- a/package.bak/python-versiontools/python-versiontools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 a969332887a18a9c98b0df0ea4d4ca75972f24ca94f06fb87d591377e83414f6 versiontools-1.9.1.tar.gz diff --git a/package.bak/python-versiontools/python-versiontools.mk b/package.bak/python-versiontools/python-versiontools.mk deleted file mode 100644 index 4f763db1ff..0000000000 --- a/package.bak/python-versiontools/python-versiontools.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-versiontools -# -################################################################################ - -PYTHON_VERSIONTOOLS_VERSION = 1.9.1 -PYTHON_VERSIONTOOLS_SOURCE = versiontools-$(PYTHON_VERSIONTOOLS_VERSION).tar.gz -PYTHON_VERSIONTOOLS_SITE = http://pypi.python.org/packages/source/v/versiontools -PYTHON_VERSIONTOOLS_SETUP_TYPE = setuptools -PYTHON_VERSIONTOOLS_LICENSE = LGPLv3 - -$(eval $(python-package)) diff --git a/package.bak/python-watchdog/Config.in b/package.bak/python-watchdog/Config.in deleted file mode 100644 index e5290897e8..0000000000 --- a/package.bak/python-watchdog/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_WATCHDOG - bool "python-watchdog" - select BR2_PACKAGE_PYTHON_PYYAML - select BR2_PACKAGE_PYTHON_ARGH - select BR2_PACKAGE_PYTHON_PATHTOOLS - help - Python API and shell utilities to monitor file system events. - - http://github.com/gorakhargosh/watchdog diff --git a/package.bak/python-watchdog/python-watchdog.hash b/package.bak/python-watchdog/python-watchdog.hash deleted file mode 100644 index 9da2b37a7b..0000000000 --- a/package.bak/python-watchdog/python-watchdog.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/watchdog/json -md5 bb16926bccc98eae2a04535e4512ddf1 watchdog-0.8.3.tar.gz -# sha256 calculated by scanpypi -sha256 7e65882adb7746039b6f3876ee174952f8eaaa34491ba34333ddf1fe35de4162 watchdog-0.8.3.tar.gz diff --git a/package.bak/python-watchdog/python-watchdog.mk b/package.bak/python-watchdog/python-watchdog.mk deleted file mode 100644 index 3dd92e3a3d..0000000000 --- a/package.bak/python-watchdog/python-watchdog.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-watchdog -# -################################################################################ - -PYTHON_WATCHDOG_VERSION = 0.8.3 -PYTHON_WATCHDOG_SOURCE = watchdog-$(PYTHON_WATCHDOG_VERSION).tar.gz -PYTHON_WATCHDOG_SITE = https://pypi.python.org/packages/54/7d/c7c0ad1e32b9f132075967fc353a244eb2b375a3d2f5b0ce612fd96e107e -PYTHON_WATCHDOG_SETUP_TYPE = setuptools -PYTHON_WATCHDOG_LICENSE = Apache-2.0 -PYTHON_WATCHDOG_LICENSE_FILES = LICENSE COPYING - -$(eval $(python-package)) diff --git a/package.bak/python-wcwidth/Config.in b/package.bak/python-wcwidth/Config.in deleted file mode 100644 index c5cc02234b..0000000000 --- a/package.bak/python-wcwidth/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_WCWIDTH - bool "python-wcwidth" - help - This library measures number of Terminal column cells of - wide-character codes. - - https://github.com/jquast/wcwidth diff --git a/package.bak/python-wcwidth/python-wcwidth.hash b/package.bak/python-wcwidth/python-wcwidth.hash deleted file mode 100644 index a3ab50faed..0000000000 --- a/package.bak/python-wcwidth/python-wcwidth.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/wcwidth/json, sha256 locally computed -md5 b3b6a0a08f0c8a34d1de8cf44150a4ad wcwidth-0.1.7.tar.gz -sha256 3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e wcwidth-0.1.7.tar.gz diff --git a/package.bak/python-wcwidth/python-wcwidth.mk b/package.bak/python-wcwidth/python-wcwidth.mk deleted file mode 100644 index 2dd392a595..0000000000 --- a/package.bak/python-wcwidth/python-wcwidth.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-wcwidth -# -################################################################################ - -PYTHON_WCWIDTH_VERSION = 0.1.7 -PYTHON_WCWIDTH_SOURCE = wcwidth-$(PYTHON_WCWIDTH_VERSION).tar.gz -PYTHON_WCWIDTH_SITE = https://pypi.python.org/packages/55/11/e4a2bb08bb450fdbd42cc709dd40de4ed2c472cf0ccb9e64af22279c5495 -PYTHON_WCWIDTH_SETUP_TYPE = setuptools -PYTHON_WCWIDTH_LICENSE = MIT -PYTHON_WCWIDTH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-web2py/Config.in b/package.bak/python-web2py/Config.in deleted file mode 100644 index b10d3a48a5..0000000000 --- a/package.bak/python-web2py/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_PYTHON_WEB2PY - bool "python-web2py" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_PYDAL - select BR2_PACKAGE_PYTHON_ZLIB - select BR2_PACKAGE_PYTHON_PYEXPAT - select BR2_PACKAGE_PYTHON_SQLITE - help - web2py is a free open source full-stack framework for rapid - development of fast, scalable, secure and portable - database-driven web-based applications. - - http://web2py.com - -if BR2_PACKAGE_PYTHON_WEB2PY - -config BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD - string "admin panel password" - default web2py - help - Set the admin panel password. - -endif diff --git a/package.bak/python-web2py/S51web2py b/package.bak/python-web2py/S51web2py deleted file mode 100644 index 8d229e16cf..0000000000 --- a/package.bak/python-web2py/S51web2py +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting web2py: " - start-stop-daemon -S -q -m -p /run/web2py.pid \ - -c www-data \ - -b -x /var/www/web2py/web2py.py \ - -- --nogui -a '""' -i 0.0.0.0 -p 8000 - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping web2py: " - start-stop-daemon -K -q -p /run/web2py.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - "$0" stop - sleep 1 - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; -esac diff --git a/package.bak/python-web2py/python-web2py.hash b/package.bak/python-web2py/python-web2py.hash deleted file mode 100644 index 3de8dbf4de..0000000000 --- a/package.bak/python-web2py/python-web2py.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 7e22a5624d8d2909e165110f0bec6b43ee36ff6834d689f4027e06dece662031 python-web2py-R-2.12.3.tar.gz diff --git a/package.bak/python-web2py/python-web2py.mk b/package.bak/python-web2py/python-web2py.mk deleted file mode 100644 index 38faabc55d..0000000000 --- a/package.bak/python-web2py/python-web2py.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# python-web2py -# -################################################################################ - -PYTHON_WEB2PY_VERSION = R-2.12.3 -PYTHON_WEB2PY_SITE = $(call github,web2py,web2py,$(PYTHON_WEB2PY_VERSION)) -PYTHON_WEB2PY_LICENSE = LGPLv3 -PYTHON_WEB2PY_LICENSE_FILES = LICENSE -PYTHON_WEB2PY_DEPENDENCIES = python python-pydal host-python-pydal - -define PYTHON_WEB2PY_INSTALL_TARGET_CMDS - $(HOST_DIR)/usr/bin/python2 -c 'import os; \ - os.chdir("$(@D)"); \ - from gluon.main import save_password; \ - save_password($(BR2_PACKAGE_PYTHON_WEB2PY_PASSWORD),8000)' - mkdir -p $(TARGET_DIR)/var/www/web2py - cp -dpfr $(@D)/* $(TARGET_DIR)/var/www/web2py -endef - -define PYTHON_WEB2PY_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/python-web2py/S51web2py \ - $(TARGET_DIR)/etc/init.d/S51web2py -endef - -define PYTHON_WEB2PY_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/python-web2py/web2py.service \ - $(TARGET_DIR)/usr/lib/systemd/system/web2py.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib//systemd/system/web2py.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/web2py.service -endef - -# www-data user and group are used for web2py. Because these user and group -# are already set by buildroot, it is not necessary to redefine them. -# See system/skeleton/etc/passwd -# username: www-data uid: 33 -# groupname: www-data gid: 33 -# -# So, we just need to create the directories used by web2py with the right -# ownership. -define PYTHON_WEB2PY_PERMISSIONS - /var/www/web2py r 750 33 33 - - - - - -endef - -$(eval $(generic-package)) diff --git a/package.bak/python-web2py/web2py.service b/package.bak/python-web2py/web2py.service deleted file mode 100644 index 0274bd8c53..0000000000 --- a/package.bak/python-web2py/web2py.service +++ /dev/null @@ -1,11 +0,0 @@ -[Unit] -Description=Web2py daemon -After=network.target - -[Service] -Type=simple -ExecStart=/var/www/web2py/web2py.py --nogui -a '' -i 0.0.0.0 -p 8000 -User=www-data - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/python-webpy/Config.in b/package.bak/python-webpy/Config.in deleted file mode 100644 index e9a51217fa..0000000000 --- a/package.bak/python-webpy/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_WEBPY - bool "python-webpy" - depends on BR2_PACKAGE_PYTHON - help - web.py is a web framework for Python that is as simple as it is - powerful. - - http://webpy.org/ diff --git a/package.bak/python-webpy/python-webpy.hash b/package.bak/python-webpy/python-webpy.hash deleted file mode 100644 index 0e0a8d0fb8..0000000000 --- a/package.bak/python-webpy/python-webpy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 c3cb8930739294103b1ad109e5fd1d0efae67c06d5b6d59fce5b5a2ee6b21624 python-webpy-webpy-0.37.tar.gz diff --git a/package.bak/python-webpy/python-webpy.mk b/package.bak/python-webpy/python-webpy.mk deleted file mode 100644 index 8bcc8ec37f..0000000000 --- a/package.bak/python-webpy/python-webpy.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-webpy -# -################################################################################ - -PYTHON_WEBPY_VERSION = webpy-0.37 -PYTHON_WEBPY_SITE = $(call github,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.bak/python-werkzeug/Config.in b/package.bak/python-werkzeug/Config.in deleted file mode 100644 index 79e9a4561e..0000000000 --- a/package.bak/python-werkzeug/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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.bak/python-werkzeug/python-werkzeug.hash b/package.bak/python-werkzeug/python-werkzeug.hash deleted file mode 100644 index 3f233524bd..0000000000 --- a/package.bak/python-werkzeug/python-werkzeug.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/werkzeug/json, sha256 locally computed -md5 1d34afa1f19abcef4c0da51ebc2c4ea7 Werkzeug-0.11.11.tar.gz -sha256 e72c46bc14405cba7a26bd2ce28df734471bc9016bc8b4cb69466c2c14c2f7e5 Werkzeug-0.11.11.tar.gz diff --git a/package.bak/python-werkzeug/python-werkzeug.mk b/package.bak/python-werkzeug/python-werkzeug.mk deleted file mode 100644 index 072937fc27..0000000000 --- a/package.bak/python-werkzeug/python-werkzeug.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-werkzeug -# -################################################################################ - -PYTHON_WERKZEUG_VERSION = 0.11.11 -PYTHON_WERKZEUG_SOURCE = Werkzeug-$(PYTHON_WERKZEUG_VERSION).tar.gz -PYTHON_WERKZEUG_SITE = https://pypi.python.org/packages/43/2e/d822b4a4216804519ace92e0368dcfc4b0b2887462d852fdd476b253ecc9 -PYTHON_WERKZEUG_SETUP_TYPE = setuptools -PYTHON_WERKZEUG_LICENSE = BSD-3c -PYTHON_WERKZEUG_LICENSE_FILES = LICENSE - -$(eval $(python-package)) diff --git a/package.bak/python-whoosh/Config.in b/package.bak/python-whoosh/Config.in deleted file mode 100644 index 1128ce6417..0000000000 --- a/package.bak/python-whoosh/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_WHOOSH - bool "python-whoosh" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON # runtime - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 # runtime - help - Whoosh is a fast, pure-Python full text indexing, search and - spell checking library. - - https://pypi.python.org/pypi/Whoosh/ diff --git a/package.bak/python-whoosh/python-whoosh.hash b/package.bak/python-whoosh/python-whoosh.hash deleted file mode 100644 index b14dd0f877..0000000000 --- a/package.bak/python-whoosh/python-whoosh.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/Whoosh/json, sha256 locally computed -md5 9a0fc2df9335e1d2e81dd84a2c4c416f Whoosh-2.7.0.tar.gz -sha256 cdfc0e1c5173207ac7b312afe78d83fb552cfed30427bf7b3dba8b1d26cea8f7 Whoosh-2.7.0.tar.gz diff --git a/package.bak/python-whoosh/python-whoosh.mk b/package.bak/python-whoosh/python-whoosh.mk deleted file mode 100644 index 64f3820c8a..0000000000 --- a/package.bak/python-whoosh/python-whoosh.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-whoosh -# -################################################################################ - -PYTHON_WHOOSH_VERSION = 2.7.0 -PYTHON_WHOOSH_SOURCE = Whoosh-$(PYTHON_WHOOSH_VERSION).tar.gz -PYTHON_WHOOSH_SITE = http://pypi.python.org/packages/source/W/Whoosh -PYTHON_WHOOSH_SETUP_TYPE = setuptools -PYTHON_WHOOSH_LICENSE = BSD-3c -PYTHON_WHOOSH_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-ws4py/Config.in b/package.bak/python-ws4py/Config.in deleted file mode 100644 index f4763a8027..0000000000 --- a/package.bak/python-ws4py/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_PYTHON_WS4PY - bool "python-ws4py" - help - ws4py is a Python package implementing the WebSocket protocol - as defined in RFC 6455. - - https://ws4py.readthedocs.org diff --git a/package.bak/python-ws4py/python-ws4py.hash b/package.bak/python-ws4py/python-ws4py.hash deleted file mode 100644 index 4d5904ee0c..0000000000 --- a/package.bak/python-ws4py/python-ws4py.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/ws4py/json, sha256 locally computed -md5 b0cbe30433350ef5ec98e8cbb3c3b39c ws4py-0.3.5.tar.gz -sha256 c4cc4a872027f6a6006a6142a38eb6d65c2ece29a4cefac98dd20a48c34ec7a9 ws4py-0.3.5.tar.gz diff --git a/package.bak/python-ws4py/python-ws4py.mk b/package.bak/python-ws4py/python-ws4py.mk deleted file mode 100644 index fac99f328a..0000000000 --- a/package.bak/python-ws4py/python-ws4py.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-ws4py -# -################################################################################ - -PYTHON_WS4PY_VERSION = 0.3.5 -PYTHON_WS4PY_SOURCE = ws4py-$(PYTHON_WS4PY_VERSION).tar.gz -PYTHON_WS4PY_SITE = https://pypi.python.org/packages/c8/b4/1784512791fbd196a48f282ca6c79398cace9541a9c151d89c30b6add6e1 -PYTHON_WS4PY_SETUP_TYPE = setuptools -PYTHON_WS4PY_LICENSE = BSD-3c -PYTHON_WS4PY_LICENSE_FILES = ws4py/__init__.py - -$(eval $(python-package)) diff --git a/package.bak/python-wsaccel/Config.in b/package.bak/python-wsaccel/Config.in deleted file mode 100644 index ee61e8a07a..0000000000 --- a/package.bak/python-wsaccel/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_PYTHON_WSACCEL - bool "python-wsaccel" - help - Accelerator for ws4py and AutobahnPython. - - https://pypi.python.org/pypi/wsaccel diff --git a/package.bak/python-wsaccel/python-wsaccel.hash b/package.bak/python-wsaccel/python-wsaccel.hash deleted file mode 100644 index a02b5a8712..0000000000 --- a/package.bak/python-wsaccel/python-wsaccel.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi?:action=show_md5&digest=2b4ea3d6847855c0587d37fca9db0557, sha256 locally computed. -md5 2b4ea3d6847855c0587d37fca9db0557 wsaccel-0.6.2.tar.gz -sha256 425706acf0724d2f6bfa391ec37b4ef121d3432c956029de3cea4e101c218e0c wsaccel-0.6.2.tar.gz diff --git a/package.bak/python-wsaccel/python-wsaccel.mk b/package.bak/python-wsaccel/python-wsaccel.mk deleted file mode 100644 index 3e7b3324b9..0000000000 --- a/package.bak/python-wsaccel/python-wsaccel.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# python-wsaccel -# -################################################################################ - -PYTHON_WSACCEL_VERSION = 0.6.2 -PYTHON_WSACCEL_SOURCE = wsaccel-$(PYTHON_WSACCEL_VERSION).tar.gz -PYTHON_WSACCEL_SITE = http://pypi.python.org/packages/source/w/wsaccel -PYTHON_WSACCEL_LICENSE = Apache-2.0 -PYTHON_WSACCEL_SETUP_TYPE = setuptools - -$(eval $(python-package)) diff --git a/package.bak/python-xlrd/Config.in b/package.bak/python-xlrd/Config.in deleted file mode 100644 index 81331f9d58..0000000000 --- a/package.bak/python-xlrd/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_PYTHON_XLRD - bool "python-xlrd" - select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - help - Library for developers to extract data from Microsoft Excel (tm) - spreadsheet files. - - http://www.python-excel.org/ diff --git a/package.bak/python-xlrd/python-xlrd.hash b/package.bak/python-xlrd/python-xlrd.hash deleted file mode 100644 index 8075605a95..0000000000 --- a/package.bak/python-xlrd/python-xlrd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/xlrd/json -md5 9a91b688cd4945477ac28187a54f9a3b xlrd-1.0.0.tar.gz -# sha256 calculated by scanpypi -sha256 0ff87dd5d50425084f7219cb6f86bb3eb5aa29063f53d50bf270ed007e941069 xlrd-1.0.0.tar.gz diff --git a/package.bak/python-xlrd/python-xlrd.mk b/package.bak/python-xlrd/python-xlrd.mk deleted file mode 100644 index 50f76243ee..0000000000 --- a/package.bak/python-xlrd/python-xlrd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-xlrd -# -################################################################################ - -PYTHON_XLRD_VERSION = 1.0.0 -PYTHON_XLRD_SOURCE = xlrd-$(PYTHON_XLRD_VERSION).tar.gz -PYTHON_XLRD_SITE = https://pypi.python.org/packages/42/85/25caf967c2d496067489e0bb32df069a8361e1fd96a7e9f35408e56b3aab -PYTHON_XLRD_SETUP_TYPE = setuptools -PYTHON_XLRD_LICENSE = BSD-3c -PYTHON_XLRD_LICENSE_FILES = xlrd/licences.py - -$(eval $(python-package)) diff --git a/package.bak/python-xlsxwriter/Config.in b/package.bak/python-xlsxwriter/Config.in deleted file mode 100644 index 3641bd0525..0000000000 --- a/package.bak/python-xlsxwriter/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_XLSXWRITER - bool "python-xlsxwriter" - select BR2_PACKAGE_PYTHON_ZLIB if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_ZLIB if BR2_PACKAGE_PYTHON3 - help - A Python module for creating Excel XLSX files. - - https://github.com/jmcnamara/XlsxWriter diff --git a/package.bak/python-xlsxwriter/python-xlsxwriter.hash b/package.bak/python-xlsxwriter/python-xlsxwriter.hash deleted file mode 100644 index 5d9a5ac2b5..0000000000 --- a/package.bak/python-xlsxwriter/python-xlsxwriter.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/xlsxwriter/json, sha256 locally computed -md5 17f48e222aa091b053fa2a14986b21c5 XlsxWriter-0.9.4.tar.gz -sha256 1642cf0adc6486dd3b17db9aba72a47fd41b947da6081e97acd6ab9872a22386 XlsxWriter-0.9.4.tar.gz diff --git a/package.bak/python-xlsxwriter/python-xlsxwriter.mk b/package.bak/python-xlsxwriter/python-xlsxwriter.mk deleted file mode 100644 index bd2ca086b8..0000000000 --- a/package.bak/python-xlsxwriter/python-xlsxwriter.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-xlsxwriter -# -################################################################################ - -PYTHON_XLSXWRITER_VERSION = 0.9.4 -PYTHON_XLSXWRITER_SOURCE = XlsxWriter-$(PYTHON_XLSXWRITER_VERSION).tar.gz -PYTHON_XLSXWRITER_SITE = https://pypi.python.org/packages/52/66/670322b9999b8e47659c8b172a11aa3c0e629a5fc86b5a8fd497b85941c0 -PYTHON_XLSXWRITER_SETUP_TYPE = setuptools -PYTHON_XLSXWRITER_LICENSE = BSD-2c -PYTHON_XLSXWRITER_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python-xlutils/Config.in b/package.bak/python-xlutils/Config.in deleted file mode 100644 index 9c12d766b0..0000000000 --- a/package.bak/python-xlutils/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_XLUTILS - bool "python-xlutils" - select BR2_PACKAGE_PYTHON_XLRD # runtime - select BR2_PACKAGE_PYTHON_XLWT # runtime - help - Utilities for working with Excel files that require both - xlrd and xlwt. - - http://www.python-excel.org diff --git a/package.bak/python-xlutils/python-xlutils.hash b/package.bak/python-xlutils/python-xlutils.hash deleted file mode 100644 index 4f99860cb6..0000000000 --- a/package.bak/python-xlutils/python-xlutils.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/xlutils/json -md5 7a6a339ddaacabce244341582ee61353 xlutils-2.0.0.tar.gz -# sha256 calculated by scanpypi -sha256 7e0e2c233bd185fecf5e2bd3f4e9469ca4a3bd87da64c82cfe5b2af27e7f9e54 xlutils-2.0.0.tar.gz diff --git a/package.bak/python-xlutils/python-xlutils.mk b/package.bak/python-xlutils/python-xlutils.mk deleted file mode 100644 index fc26b3cee5..0000000000 --- a/package.bak/python-xlutils/python-xlutils.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-xlutils -# -################################################################################ - -PYTHON_XLUTILS_VERSION = 2.0.0 -PYTHON_XLUTILS_SOURCE = xlutils-$(PYTHON_XLUTILS_VERSION).tar.gz -PYTHON_XLUTILS_SITE = https://pypi.python.org/packages/93/fe/af6d73e4bc7b0ce359d34bebb2e8d4d129763acfecd66a3a7efc587e54c9 -PYTHON_XLUTILS_SETUP_TYPE = setuptools -PYTHON_XLUTILS_LICENSE = MIT -PYTHON_XLUTILS_LICENSE_FILES = xlutils/license.txt - -$(eval $(python-package)) diff --git a/package.bak/python-xlwt/Config.in b/package.bak/python-xlwt/Config.in deleted file mode 100644 index a48ac6fb70..0000000000 --- a/package.bak/python-xlwt/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_PYTHON_XLWT - bool "python-xlwt" - help - Library to create spreadsheet files compatible with MS Excel - 97/2000/XP/2003 XLS files, on any platform, with Python 2.6, - 2.7, 3.3+. - - http://www.python-excel.org/ diff --git a/package.bak/python-xlwt/python-xlwt.hash b/package.bak/python-xlwt/python-xlwt.hash deleted file mode 100644 index 4cacf2b492..0000000000 --- a/package.bak/python-xlwt/python-xlwt.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 from https://pypi.python.org/pypi/xlwt/json -md5 fadf8d1be8c5f071561c4145ed5f5b89 xlwt-1.1.2.tar.gz -# sha256 calculated by scanpypi -sha256 aed648c17731f40f84550dd2a1aaa53569f0cbcaf5610ba895cd2632587b723c xlwt-1.1.2.tar.gz diff --git a/package.bak/python-xlwt/python-xlwt.mk b/package.bak/python-xlwt/python-xlwt.mk deleted file mode 100644 index 38d5f09d31..0000000000 --- a/package.bak/python-xlwt/python-xlwt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-xlwt -# -################################################################################ - -PYTHON_XLWT_VERSION = 1.1.2 -PYTHON_XLWT_SOURCE = xlwt-$(PYTHON_XLWT_VERSION).tar.gz -PYTHON_XLWT_SITE = https://pypi.python.org/packages/0b/69/644313df86e6375ec2c6b34ec8ac544b9cc7803b7d943223d32811860f3d -PYTHON_XLWT_SETUP_TYPE = setuptools -PYTHON_XLWT_LICENSE = BSD-3c, BSD-4c -PYTHON_XLWT_LICENSE_FILES = docs/licenses.rst - -$(eval $(python-package)) diff --git a/package.bak/python-zope-interface/Config.in b/package.bak/python-zope-interface/Config.in deleted file mode 100644 index 01f4a94cdb..0000000000 --- a/package.bak/python-zope-interface/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_PYTHON_ZOPE_INTERFACE - bool "python-zope-interface" - help - This package provides an implementation of "object interfaces" for - Python. Interfaces are a mechanism for labeling objects as conforming - to a given API or contract. So, this package can be considered as - implementation of the Design By Contract methodology support in Python. - - http://docs.zope.org/zope.interface/ diff --git a/package.bak/python-zope-interface/python-zope-interface.hash b/package.bak/python-zope-interface/python-zope-interface.hash deleted file mode 100644 index 7a46cd348f..0000000000 --- a/package.bak/python-zope-interface/python-zope-interface.hash +++ /dev/null @@ -1,3 +0,0 @@ -# md5 from https://pypi.python.org/pypi/zope-interface/json, sha256 locally computed -md5 ba3f32eacaea66094b7e2ae2788cec89 zope.interface-4.3.3.tar.gz -sha256 8780ef68ca8c3fe1abb30c058a59015129d6e04a6b02c2e56b9c7de6078dfa88 zope.interface-4.3.3.tar.gz diff --git a/package.bak/python-zope-interface/python-zope-interface.mk b/package.bak/python-zope-interface/python-zope-interface.mk deleted file mode 100644 index 3e3b464b28..0000000000 --- a/package.bak/python-zope-interface/python-zope-interface.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# python-zope-interface -# -################################################################################ - -PYTHON_ZOPE_INTERFACE_VERSION = 4.3.3 -PYTHON_ZOPE_INTERFACE_SOURCE = zope.interface-$(PYTHON_ZOPE_INTERFACE_VERSION).tar.gz -PYTHON_ZOPE_INTERFACE_SITE = https://pypi.python.org/packages/44/af/cea1e18bc0d3be0e0824762d3236f0e61088eeed75287e7b854d65ec9916 -PYTHON_ZOPE_INTERFACE_SETUP_TYPE = setuptools -PYTHON_ZOPE_INTERFACE_LICENSE = ZPLv2.1 -PYTHON_ZOPE_INTERFACE_LICENSE_FILES = LICENSE.txt - -$(eval $(python-package)) diff --git a/package.bak/python/001-remove-host-header-path.patch b/package.bak/python/001-remove-host-header-path.patch deleted file mode 100644 index dfb84ffa1e..0000000000 --- a/package.bak/python/001-remove-host-header-path.patch +++ /dev/null @@ -1,32 +0,0 @@ -setup.py: do not add invalid header locations - -This piece of code incorrectly adds /usr/include to -self.compiler.include_dirs, and results in the following invalid -compilation line: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC \ - -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ - -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include \ - -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6/Include \ - -I/home/thomas/projets/buildroot/output/build/python-2.7.6 \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/mathmodule.o -cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories] -[...] - -Signed-off-by: Thomas Petazzoni -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -480,7 +480,7 @@ - for directory in reversed(options.dirs): - add_dir_to_list(dir_list, directory) - -- if os.path.normpath(sys.prefix) != '/usr' \ -+ if False and os.path.normpath(sys.prefix) != '/usr' \ - and not sysconfig.get_config_var('PYTHONFRAMEWORK'): - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when diff --git a/package.bak/python/002-fix-get-python-inc.patch b/package.bak/python/002-fix-get-python-inc.patch deleted file mode 100644 index bfee03aaac..0000000000 --- a/package.bak/python/002-fix-get-python-inc.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix get_python_inc() for cross-compilation - -When we are cross compiling, doing os.path.dirname(sys.executable) to -get the build directory is incorrect, because we're executing the host -Python to build things for the target. Instead, we should use the -project_base variable. - -This fixes cross-compilation, which was adding incorrect header paths -pointing to the location where the host Python was built: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc -fPIC -fno-strict-aliasing \ - -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -pipe -Os -DNDEBUG -g -O3 -Wall -Wstrict-prototypes \ - -I/usr/include -I. -IInclude -I./Include -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include \ - -I/home/thomas/projets/buildroot/output/host/usr/bin/Include -I/home/thomas/projets/buildroot/output/host/usr/bin \ - -c /home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.c \ - -o build/temp.linux2-arm-2.7/home/thomas/projets/buildroot/output/build/python-2.7.6/Modules/_struct.o - -This patch allows to fix the -/home/thomas/projets/buildroot/output/host/usr/bin/Include and -/home/thomas/projets/buildroot/output/host/usr/bin paths that are -incorrectly added to the header paths. - -Signed-off-by: Thomas Petazzoni -Index: b/Lib/distutils/sysconfig.py -=================================================================== ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -79,7 +79,7 @@ - - if os.name == "posix": - if python_build: -- buildir = os.path.dirname(sys.executable) -+ buildir = project_base - if plat_specific: - # python.h is located in the buildir - inc_dir = buildir diff --git a/package.bak/python/004-sysconfigdata-install-location.patch b/package.bak/python/004-sysconfigdata-install-location.patch deleted file mode 100644 index 2998364fbf..0000000000 --- a/package.bak/python/004-sysconfigdata-install-location.patch +++ /dev/null @@ -1,76 +0,0 @@ -Change the install location of _sysconfigdata.py - -The _sysconfigdata.py module contains definitions that are needed when -building Python modules. In cross-compilation mode, when building -Python extensions for the target, we need to use the _sysconfigdata.py -of the target Python while executing the host Python. - -However until now, the _sysconfigdata.py module was installed in -build/lib.- directory, together with a number of -architecture-specific shared objects, which cannot be used with the -host Python. - -To solve this problem, this patch moves _sysconfigdata.py to a -separate location, build/sysconfigdata.-/, and only -this directory gets added to the PYTHONPATH of the host Python -interpreter when building Python modules for the target. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -462,6 +462,9 @@ - rm -f ./pybuilddir.txt ; \ - exit 1 ; \ - fi -+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt -+ mkdir -p `cat pysysconfigdatadir.txt` -+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt` - - # Build the shared modules - # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for -@@ -1002,7 +1005,7 @@ - else true; \ - fi; \ - done -- @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ -+ @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.doc $(srcdir)/Lib/*.egg-info ; \ - do \ - if test -x $$i; then \ - $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ -@@ -1012,6 +1015,11 @@ - echo $(INSTALL_DATA) $$i $(LIBDEST); \ - fi; \ - done -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST) -+ mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST)/sysconfigdata - @for d in $(LIBSUBDIRS); \ - do \ - a=$(srcdir)/Lib/$$d; \ -@@ -1337,7 +1345,7 @@ - Modules/Setup Modules/Setup.local Modules/Setup.config \ - Modules/ld_so_aix Modules/python.exp Misc/python.pc - -rm -f python*-gdb.py -- -rm -f pybuilddir.txt -+ -rm -f pybuilddir.txt pysysconfigdatadir.txt - # Issue #28258: set LC_ALL to avoid issues with Estonian locale. - # Expansion is performed here by shell (spawned by make) itself before - # arguments are passed to find. So LC_ALL=C must be set as a separate -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -33,7 +33,7 @@ - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) diff --git a/package.bak/python/005-pyc-pyo-conditional.patch b/package.bak/python/005-pyc-pyo-conditional.patch deleted file mode 100644 index 1b677dfb11..0000000000 --- a/package.bak/python/005-pyc-pyo-conditional.patch +++ /dev/null @@ -1,59 +0,0 @@ -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1050,24 +1050,32 @@ - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -+ifeq (@PYC_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYO_BUILD@,yes) - PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -tt -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ - -x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \ - $(DESTDIR)$(LIBDEST) -+endif -+ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif -+ifeq (@PYO_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi -t -O $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -739,6 +739,17 @@ - ;; - esac - -+AC_SUBST(PYC_BUILD) -+ -+AC_ARG_ENABLE(pyc-build, -+ AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), -+ [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) -+ -+AC_SUBST(PYO_BUILD) -+ -+AC_ARG_ENABLE(pyo-build, -+ AS_HELP_STRING([--disable-pyo-build], [disable build of pyo files]), -+ [ PYO_BUILD="${enableval}" ], [ PYO_BUILD=yes ]) - - AC_SUBST(LIBRARY) - AC_MSG_CHECKING(LIBRARY) diff --git a/package.bak/python/006-cross-compile-getaddrinfo.patch b/package.bak/python/006-cross-compile-getaddrinfo.patch deleted file mode 100644 index dd44ec1558..0000000000 --- a/package.bak/python/006-cross-compile-getaddrinfo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -3353,7 +3353,7 @@ - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no -o "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes - then - if test $ipv6 = yes - then diff --git a/package.bak/python/007-disable-extensions.patch b/package.bak/python/007-disable-extensions.patch deleted file mode 100644 index 9365cb1f5b..0000000000 --- a/package.bak/python/007-disable-extensions.patch +++ /dev/null @@ -1,60 +0,0 @@ -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -156,6 +156,8 @@ - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -+# disabled extensions -+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ -@@ -477,6 +479,7 @@ - esac; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - - # Build static library -@@ -1191,7 +1194,8 @@ - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ -+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2290,6 +2290,8 @@ - - PKG_PROG_PKG_CONFIG - -+AC_SUBST(DISABLED_EXTENSIONS) -+ - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -33,7 +33,10 @@ - COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -+except KeyError: -+ disabled_module_list = list() - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (at the front) if diff --git a/package.bak/python/008-distutils-use-python-sysroot.patch b/package.bak/python/008-distutils-use-python-sysroot.patch deleted file mode 100644 index 7cd748761a..0000000000 --- a/package.bak/python/008-distutils-use-python-sysroot.patch +++ /dev/null @@ -1,54 +0,0 @@ -Adjust library/header paths for cross-compilation - -When cross-compiling third-party extensions, the get_python_inc() or -get_python_lib() can be called, to return the path to headers or -libraries. However, they use the sys.prefix of the host Python, which -returns incorrect paths when cross-compiling (paths pointing to host -headers and libraries). - -In order to fix this, we introduce the _python_sysroot, _python_prefix -and _python_exec_prefix variables, that allow to override these -values, and get correct header/library paths when cross-compiling -third-party Python modules. - -The _python_sysroot variable is also used to prefix the LIBDIR value -taken from the sysconfigdata module. - -Signed-off-by: Thomas Petazzoni - -Index: b/Lib/distutils/sysconfig.py -=================================================================== ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -19,8 +19,13 @@ - from distutils.errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+if "_python_sysroot" in os.environ: -+ _sysroot=os.environ.get('_python_sysroot') -+ PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) -+ EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) -+else: -+ PREFIX = os.path.normpath(sys.prefix) -+ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild9. If we're dealing with an x64 Windows build, -Index: b/Lib/distutils/command/build_ext.py -=================================================================== ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -237,7 +237,10 @@ - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): - if not sysconfig.python_build: - # building third party extensions -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if "_python_sysroot" in os.environ: -+ libdir = os.environ.get("_python_sysroot") + libdir -+ self.library_dirs.append(libdir) - else: - # building python standard extensions - self.library_dirs.append('.') diff --git a/package.bak/python/009-no-termcap-host-path.patch b/package.bak/python/009-no-termcap-host-path.patch deleted file mode 100644 index 781e17952f..0000000000 --- a/package.bak/python/009-no-termcap-host-path.patch +++ /dev/null @@ -1,23 +0,0 @@ -Don't look in /usr/lib/termcap for libraries - -Signed-off-by: Thomas Petazzoni - - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -764,12 +764,9 @@ - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: diff --git a/package.bak/python/010-fix-python-config.patch b/package.bak/python/010-fix-python-config.patch deleted file mode 100644 index b40339b42d..0000000000 --- a/package.bak/python/010-fix-python-config.patch +++ /dev/null @@ -1,208 +0,0 @@ -Add a backport of http://bugs.python.org/issue16235 so we can use -python-config for cross builds. -This basically replaces the python version of python-config with a pure-shell -version that's already preprocessed when installed and doesn't depend -on the sysconfig import that usually leads to bad data/results. - -Signed-off-by: Gustavo Zacarias - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -885,6 +885,7 @@ - - # Other platforms follow - if test $enable_shared = "yes"; then -+ PY_ENABLE_SHARED=1 - AC_DEFINE(Py_ENABLE_SHARED, 1, [Defined if Python is built as a shared library.]) - case $ac_sys_system in - BeOS*) -@@ -945,6 +946,7 @@ - - esac - else # shared is disabled -+ PY_ENABLE_SHARED=0 - case $ac_sys_system in - CYGWIN*) - BLDLIBRARY='$(LIBRARY)' -@@ -1921,6 +1923,9 @@ - AC_SUBST(BLDSHARED) - AC_SUBST(CCSHARED) - AC_SUBST(LINKFORSHARED) -+AC_SUBST(PY_ENABLE_SHARED) -+LIBPL="${prefix}/lib/python${VERSION}/config" -+AC_SUBST(LIBPL) - # SO is the extension of shared libraries `(including the dot!) - # -- usually .so, .sl on HP-UX, .dll on Cygwin - AC_MSG_CHECKING(SO) -@@ -4588,7 +4593,7 @@ - AC_SUBST(ENSUREPIP) - - # generate output files --AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc) -+AC_CONFIG_FILES(Makefile.pre Modules/Setup.config Misc/python.pc Misc/python-config.sh) - AC_CONFIG_FILES([Modules/ld_so_aix], [chmod +x Modules/ld_so_aix]) - AC_OUTPUT - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -166,7 +166,7 @@ - SUBDIRSTOO= Include Lib Misc Demo - - # Files and directories to be distributed --CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in -+CONFIGFILES= configure configure.ac acconfig.h pyconfig.h.in Makefile.pre.in Misc/python-config.sh - DISTFILES= README ChangeLog $(CONFIGFILES) - DISTDIRS= $(SUBDIRS) $(SUBDIRSTOO) Ext-dummy - DIST= $(DISTFILES) $(DISTDIRS) -@@ -410,7 +410,7 @@ - - # Default target - all: @DEF_MAKE_ALL_RULE@ --build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks -+build_all: $(BUILDPYTHON) oldsharedmods sharedmods gdbhooks python-config - - # Compile a binary with gcc profile guided optimization. - profile-opt: -@@ -1101,10 +1101,12 @@ - fi; \ - cd $(srcdir)/Lib/$(PLATDIR); $(RUNSHARED) ./regen - --python-config: $(srcdir)/Misc/python-config.in -+python-config: $(srcdir)/Misc/python-config.in Misc/python-config.sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure -- sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config -+ sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config.py -+ # Replace makefile compat. variable references with shell script compat. ones; $(VAR) -> ${VAR} -+ sed -e 's,\$$(\([A-Za-z0-9_]*\)),\$$\{\1\},g' Misc/python-config.sh >python-config - - # Install the include files - INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) -@@ -1163,7 +1165,7 @@ - $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config -- rm python-config -+ $(INSTALL_SCRIPT) python-config.py $(DESTDIR)$(LIBPL)/python-config.py - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ -@@ -1345,6 +1347,7 @@ - config.cache config.log pyconfig.h Modules/config.c - -rm -rf build platform - -rm -rf $(PYTHONFRAMEWORKDIR) -+ -rm -f python-config.py python-config - - # Make things extra clean, before making a distribution: - # remove all generated files, even Makefile[.pre] -Index: b/Misc/python-config.sh.in -=================================================================== ---- /dev/null -+++ b/Misc/python-config.sh.in -@@ -0,0 +1,102 @@ -+#!/bin/sh -+ -+exit_with_usage () -+{ -+ echo "Usage: $0 --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--help|--configdir" -+ exit $1 -+} -+ -+if [ "$1" = "" ] ; then -+ exit_with_usage 1 -+fi -+ -+# Returns the actual prefix where this script was installed to. -+installed_prefix () -+{ -+ RESULT=$(dirname $(cd $(dirname "$1") && pwd -P)) -+ if which readlink >/dev/null 2>&1 ; then -+ RESULT=$(readlink -f "$RESULT") -+ fi -+ echo $RESULT -+} -+ -+prefix_build="@prefix@" -+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#") -+exec_prefix_build="@exec_prefix@" -+exec_prefix=$(echo "$exec_prefix_build" | sed "s#$exec_prefix_build#$prefix_real#") -+includedir=$(echo "@includedir@") -+libdir=$(echo "@libdir@" | sed "s#$prefix_build#$prefix_real#") -+CFLAGS=$(echo "@CFLAGS@" | sed "s#$prefix_build#$prefix_real#") -+VERSION="@VERSION@" -+LIBM="@LIBM@" -+LIBC="@LIBC@" -+SYSLIBS="$LIBM $LIBC" -+LIBS="@LIBS@ $SYSLIBS -lpython${VERSION}" -+BASECFLAGS="@BASECFLAGS@" -+LDLIBRARY="@LDLIBRARY@" -+LINKFORSHARED="@LINKFORSHARED@" -+OPT="@OPT@" -+PY_ENABLE_SHARED="@PY_ENABLE_SHARED@" -+LDVERSION="@LDVERSION@" -+LIBDEST=${prefix}/lib/python${VERSION} -+LIBPL=$(echo "@LIBPL@" | sed "s#$prefix_build#$prefix_real#") -+SO="@SO@" -+PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" -+INCDIR="-I$includedir/python${VERSION}" -+PLATINCDIR="-I$includedir/python${VERSION}" -+ -+# Scan for --help or unknown argument. -+for ARG in $* -+do -+ case $ARG in -+ --help) -+ exit_with_usage 0 -+ ;; -+ --prefix|--exec-prefix|--includes|--libs|--cflags|--ldflags|--extension-suffix|--abiflags|--configdir) -+ ;; -+ *) -+ exit_with_usage 1 -+ ;; -+esac -+done -+ -+for ARG in "$@" -+do -+ case "$ARG" in -+ --prefix) -+ echo "$prefix" -+ ;; -+ --exec-prefix) -+ echo "$exec_prefix" -+ ;; -+ --includes) -+ echo "$INCDIR $PLATINCDIR" -+ ;; -+ --cflags) -+ echo "$INCDIR $PLATINCDIR $BASECFLAGS $CFLAGS $OPT" -+ ;; -+ --libs) -+ echo "$LIBS" -+ ;; -+ --ldflags) -+ LINKFORSHAREDUSED= -+ if [ -z "$PYTHONFRAMEWORK" ] ; then -+ LINKFORSHAREDUSED=$LINKFORSHARED -+ fi -+ LIBPLUSED= -+ if [ "$PY_ENABLE_SHARED" = "0" ] ; then -+ LIBPLUSED="-L$LIBPL" -+ fi -+ echo "$LIBPLUSED -L$libdir $LIBS $LINKFORSHAREDUSED" -+ ;; -+ --extension-suffix) -+ echo "$SO" -+ ;; -+ --configdir) -+ echo "$LIBPL" -+ ;; -+esac -+done diff --git a/package.bak/python/011-remove-python-symlink.patch b/package.bak/python/011-remove-python-symlink.patch deleted file mode 100644 index e021d8320a..0000000000 --- a/package.bak/python/011-remove-python-symlink.patch +++ /dev/null @@ -1,32 +0,0 @@ -Remove the python symlink install rules. - -The python symlink installation will be handled by Buildroot itself, because -Buildroot needs to control to what python interpreter (python2 or python3) the -python symlink points to. - -Signed-off-by: Samuel Martin -Signed-off-by: Bernd Kuhls -(rebased against version 2.7.12) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -974,17 +974,10 @@ - echo "Creating directory $(LIBPC)"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC); \ - fi -- -if test -f $(DESTDIR)$(BINDIR)/$(PYTHON) -o -h $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- then rm -f $(DESTDIR)$(BINDIR)/$(PYTHON); \ -- else true; \ -- fi -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2$(EXE) $(PYTHON)) - -rm -f $(DESTDIR)$(BINDIR)/python2$(EXE) - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)$(EXE) python2$(EXE)) - -rm -f $(DESTDIR)$(BINDIR)/python2-config - (cd $(DESTDIR)$(BINDIR); $(LN) -s python$(VERSION)-config python2-config) -- -rm -f $(DESTDIR)$(BINDIR)/python-config -- (cd $(DESTDIR)$(BINDIR); $(LN) -s python2-config python-config) - -test -d $(DESTDIR)$(LIBPC) || $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$(LIBPC) - -rm -f $(DESTDIR)$(LIBPC)/python2.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python2.pc) diff --git a/package.bak/python/013-dont-add-multiarch-path.patch b/package.bak/python/013-dont-add-multiarch-path.patch deleted file mode 100644 index 94fcb0f7fb..0000000000 --- a/package.bak/python/013-dont-add-multiarch-path.patch +++ /dev/null @@ -1,27 +0,0 @@ -Don't add multiarch paths - -The add_multiarch_paths() function leads, in certain build -environments, to the addition of host header paths to the CFLAGS, -which is not appropriate for cross-compilation. This patch fixes that -by simply removing the call to add_multiarch_paths() when we're -cross-compiling. - -Investigation done by David . - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -445,9 +445,9 @@ - if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ self.add_multiarch_paths() - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. diff --git a/package.bak/python/014-abort-on-failed-modules.patch b/package.bak/python/014-abort-on-failed-modules.patch deleted file mode 100644 index 4bceeb62d7..0000000000 --- a/package.bak/python/014-abort-on-failed-modules.patch +++ /dev/null @@ -1,21 +0,0 @@ -Abort on failed module build - -When building a Python module fails, the setup.py script currently -doesn't exit with an error, and simply continues. This is not a really -nice behavior, so this patch changes setup.py to abort with an error, -so that the build issue is clearly noticeable. - -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -283,6 +283,7 @@ - print "Failed to build these modules:" - print_three_column(failed) - print -+ sys.exit(1) - - def build_extension(self, ext): - diff --git a/package.bak/python/015-fix-sqlite-without-threads.patch b/package.bak/python/015-fix-sqlite-without-threads.patch deleted file mode 100644 index f51c37b372..0000000000 --- a/package.bak/python/015-fix-sqlite-without-threads.patch +++ /dev/null @@ -1,49 +0,0 @@ -sqlite3: fix build when threads are not used/available - -When threads are not used/available, a function in the sqlite3 extension -ends up with a label at the end: - - void _pysqlite_final_callback(sqlite3_context* context) - { - PyObject* function_result; - PyObject** aggregate_instance; - int ok; - - #ifdef WITH_THREAD - PyGILState_STATE threadstate; - - threadstate = PyGILState_Ensure(); - #endif - - aggregate_instance = (PyObject**)sqlite3_aggregate_context(context, sizeof(PyObject*)); - if (!*aggregate_instance) { - goto error; - } - - [......] - - error: - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif - } - -This is not valid, and gcc complains. - -Fix that by adding a dummy statement after the label, so that the label -is never the last statement of the function. - -Signed-off-by: "Yann E. MORIN" - -Index: b/Modules/_sqlite/connection.c -=================================================================== ---- a/Modules/_sqlite/connection.c -+++ b/Modules/_sqlite/connection.c -@@ -786,6 +786,7 @@ - #ifdef WITH_THREAD - PyGILState_Release(threadstate); - #endif -+ ; /* Make gcc happy: a label can't be at the end of a function */ - } - - static void _pysqlite_drop_unused_statement_references(pysqlite_Connection* self) diff --git a/package.bak/python/016-serial-ioctl-workaround.patch b/package.bak/python/016-serial-ioctl-workaround.patch deleted file mode 100644 index 80ed65e39a..0000000000 --- a/package.bak/python/016-serial-ioctl-workaround.patch +++ /dev/null @@ -1,24 +0,0 @@ -Serial ioctl() workaround - -The ioctls.h of some architectures (notably xtensa) references structs from -linux/serial.h. Make sure to include this header as well. - -Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct, -but isn't actually referenced in modern kernels. - -Signed-off-by: Baruch Siach ---- -Index: b/Modules/termios.c -=================================================================== ---- a/Modules/termios.c -+++ b/Modules/termios.c -@@ -16,7 +16,9 @@ - * so this needs to be included first on that platform. */ - #include - #endif -+#include - #include -+#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (appearantly used internally by some things diff --git a/package.bak/python/017-distutils-scripts-dont-adjust-shebang.patch b/package.bak/python/017-distutils-scripts-dont-adjust-shebang.patch deleted file mode 100644 index da4dc36df5..0000000000 --- a/package.bak/python/017-distutils-scripts-dont-adjust-shebang.patch +++ /dev/null @@ -1,25 +0,0 @@ -Do not adjust the shebang of Python scripts for cross-compilation - -The copy_scripts() method in distutils copies the scripts listed in -the setup file and adjusts the first line to refer to the current -Python interpreter. When cross-compiling, this means that the adjusted -shebang refers to the host Python interpreter. - -This patch modifies copy_scripts() to preserve the shebang when -cross-compilation is detected. - -Signed-off-by: Christophe Vu-Brugier - -Index: b/Lib/distutils/command/build_scripts.py -=================================================================== ---- a/Lib/distutils/command/build_scripts.py -+++ b/Lib/distutils/command/build_scripts.py -@@ -89,7 +89,7 @@ - adjust = 1 - post_interp = match.group(1) or '' - -- if adjust: -+ if adjust and not '_python_sysroot' in os.environ: - log.info("copying and adjusting %s -> %s", script, - self.build_dir) - if not self.dry_run: diff --git a/package.bak/python/018-fix-add-gcc-paths-logic.patch b/package.bak/python/018-fix-add-gcc-paths-logic.patch deleted file mode 100644 index af6efcc38c..0000000000 --- a/package.bak/python/018-fix-add-gcc-paths-logic.patch +++ /dev/null @@ -1,27 +0,0 @@ -Override system locale and set to default when adding gcc paths - -Forces the use of the default locale in the function -add_gcc_paths, which is called when cross compiling to add the -include and library paths. This is necessary because otherwise -the gcc output is localized and the output parsing fails, which -results in no paths added and detect_modules not able to find -any system library (eg. libz, libssl, etc.) - -[Thomas: patch taken from https://bugs.python.org/issue23767.] - -Signed-off-by: Samuel Cabrero -Signed-off-by: Thomas Petazzoni - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -414,7 +414,7 @@ - tmpfile = os.path.join(self.build_temp, 'gccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) - is_gcc = False - in_incdirs = False - inc_dirs = [] diff --git a/package.bak/python/100-optional-test-modules.patch b/package.bak/python/100-optional-test-modules.patch deleted file mode 100644 index 3de6f2669d..0000000000 --- a/package.bak/python/100-optional-test-modules.patch +++ /dev/null @@ -1,94 +0,0 @@ -Add an option to disable installation of test modules - -The Python standard distribution comes with many test modules, that -are not necessarly useful on embedded targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 40 +++++++++++++++++++++++++++------------- - configure.in | 6 ++++++ - 2 files changed, 33 insertions(+), 13 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -960,27 +960,43 @@ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk site-packages test test/audiodata test/capath \ -- test/data test/cjkencodings test/decimaltestdata test/xmltestdata \ -- test/imghdrdata \ -- test/subprocessdata \ -- test/tracedmodules \ -+LIBSUBDIRS= lib-tk site-packages \ - encodings compiler hotshot \ -- email email/mime email/test email/test/data \ -+ email email/mime \ - ensurepip ensurepip/_bundled \ -- json json/tests \ -- sqlite3 sqlite3/test \ -- logging bsddb bsddb/test csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -- ctypes ctypes/test ctypes/macholib \ -- idlelib idlelib/Icons idlelib/idle_test \ -- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ -+ json \ -+ sqlite3 \ -+ logging bsddb csv importlib wsgiref \ -+ lib2to3 lib2to3/fixes lib2to3/pgen2 \ -+ ctypes ctypes/macholib \ -+ idlelib idlelib/Icons \ -+ distutils distutils/command $(XMLLIBSUBDIRS) \ - multiprocessing multiprocessing/dummy \ -- unittest unittest/test \ -+ unittest \ - lib-old \ - curses pydoc_data $(MACHDEPS) -+ -+TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+ test/cjkencodings test/decimaltestdata test/xmltestdata \ -+ test/imghdrdata \ -+ test/subprocessdata \ -+ test/tracedmodules \ -+ email/test email/test/data \ -+ json/tests \ -+ sqlite3/test \ -+ bsddb/test \ -+ lib2to3/tests \ -+ lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ -+ ctypes/test \ -+ idlelib/idle_test \ -+ distutils/tests \ -+ unittest/test -+ -+ifeq (@TEST_MODULES@,yes) -+LIBSUBDIRS += $(TESTSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2634,6 +2634,12 @@ - fi - - -+AC_SUBST(TEST_MODULES) -+ -+AC_ARG_ENABLE(test-modules, -+ AS_HELP_STRING([--disable-test-modules], [disable test modules]), -+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) diff --git a/package.bak/python/101-optional-pydoc.patch b/package.bak/python/101-optional-pydoc.patch deleted file mode 100644 index 143e11ab92..0000000000 --- a/package.bak/python/101-optional-pydoc.patch +++ /dev/null @@ -1,82 +0,0 @@ -Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 6 +++++- - configure.in | 5 +++++ - setup.py | 10 +++++++--- - 3 files changed, 17 insertions(+), 4 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -974,7 +974,7 @@ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses pydoc_data $(MACHDEPS) -+ curses $(MACHDEPS) - - TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ - lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -@@ -997,6 +997,10 @@ - LIBSUBDIRS += $(TESTSUBDIRS) - endif - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2633,6 +2633,11 @@ - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) - - AC_SUBST(TEST_MODULES) - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -2211,6 +2211,12 @@ - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -2231,9 +2237,7 @@ - ext_modules=[Extension('_struct', ['_struct.c'])], - - # Scripts to install -- scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle', -- 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = scripts, - ) - - # --install-platlib diff --git a/package.bak/python/102-optional-2to3.patch b/package.bak/python/102-optional-2to3.patch deleted file mode 100644 index 100c417a21..0000000000 --- a/package.bak/python/102-optional-2to3.patch +++ /dev/null @@ -1,85 +0,0 @@ -Add an option to disable lib2to3 - -lib2to3 is a library to convert Python 2.x code to Python 3.x. As -such, it is probably not very useful on embedded system targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 24 +++++++++++++++++------- - configure.in | 6 ++++++ - setup.py | 5 +++-- - 3 files changed, 26 insertions(+), 9 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -967,7 +967,6 @@ - json \ - sqlite3 \ - logging bsddb csv importlib wsgiref \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -986,8 +985,6 @@ - json/tests \ - sqlite3/test \ - bsddb/test \ -- lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1001,6 +998,14 @@ - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2645,6 +2645,12 @@ - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -2212,10 +2212,11 @@ - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", diff --git a/package.bak/python/103-optional-sqlite.patch b/package.bak/python/103-optional-sqlite.patch deleted file mode 100644 index 3a48011919..0000000000 --- a/package.bak/python/103-optional-sqlite.patch +++ /dev/null @@ -1,62 +0,0 @@ -Add option to disable the sqlite3 module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 24 +++++++++++++++++------- - configure.in | 9 +++++++++ - 2 file changed, 9 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2633,6 +2633,15 @@ - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(SQLITE3) -+AC_ARG_ENABLE(sqlite3, -+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), -+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -965,7 +965,6 @@ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- sqlite3 \ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -983,7 +982,6 @@ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- sqlite3/test \ - bsddb/test \ - ctypes/test \ - idlelib/idle_test \ -@@ -1006,6 +1004,11 @@ - lib2to3/tests/data/fixers/myfixes - endif - -+ifeq (@SQLITE3@,yes) -+LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ diff --git a/package.bak/python/104-optional-tk.patch b/package.bak/python/104-optional-tk.patch deleted file mode 100644 index 18024d3a1e..0000000000 --- a/package.bak/python/104-optional-tk.patch +++ /dev/null @@ -1,66 +0,0 @@ -Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 14 ++++++++++---- - configure.in | 9 +++++++++ - 2 files changed, 19 insertions(+), 4 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -960,7 +960,7 @@ - plat-mac/lib-scriptpackages/SystemEvents \ - plat-mac/lib-scriptpackages/Terminal - PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages --LIBSUBDIRS= lib-tk site-packages \ -+LIBSUBDIRS= site-packages \ - encodings compiler hotshot \ - email email/mime \ - ensurepip ensurepip/_bundled \ -@@ -974,8 +974,7 @@ - lib-old \ - curses $(MACHDEPS) - --TESTSUBDIRS = lib-tk/test lib-tk/test/test_tkinter \ -- lib-tk/test/test_ttk test test/audiodata test/capath test/data \ -+TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ - test/imghdrdata \ - test/subprocessdata \ -@@ -1009,6 +1008,12 @@ - TESTSUBDIRS += sqlite3/test - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += lib-tk -+TESTSUBDIRS += lib-tk/test lib-tk/test/test_tkinter \ -+ lib-tk/test/test_ttk -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2642,6 +2642,15 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, diff --git a/package.bak/python/105-optional-curses.patch b/package.bak/python/105-optional-curses.patch deleted file mode 100644 index 9e1ac5ad54..0000000000 --- a/package.bak/python/105-optional-curses.patch +++ /dev/null @@ -1,54 +0,0 @@ -Add an option to disable the curses module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 6 +++++- - configure.in | 9 +++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -972,7 +972,7 @@ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -- curses $(MACHDEPS) -+ $(MACHDEPS) - - TESTSUBDIRS = test test/audiodata test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1014,6 +1014,10 @@ - lib-tk/test/test_ttk - endif - -+ifeq (@CURSES@,yes) -+LIBSUBDIRS += curses -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2651,6 +2651,15 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -+AC_SUBST(CURSES) -+AC_ARG_ENABLE(curses, -+ AS_HELP_STRING([--disable-curses], [disable curses]), -+ [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, diff --git a/package.bak/python/106-optional-expat.patch b/package.bak/python/106-optional-expat.patch deleted file mode 100644 index 6ebaf166d1..0000000000 --- a/package.bak/python/106-optional-expat.patch +++ /dev/null @@ -1,85 +0,0 @@ -Add an option to disable expat - -This patch replaces the existing --with-system-expat option with a ---with-expat={system,builtin,none} option, which allows to tell Python -whether we want to use the system expat (already installed), the expat -builtin the Python sources, or no expat at all (which disables the -installation of XML modules). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 6 +++++- - configure.in | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -968,7 +968,7 @@ - logging bsddb csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ -+ distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ - lib-old \ -@@ -1018,6 +1018,10 @@ - LIBSUBDIRS += curses - endif - -+ifeq (@EXPAT@,yes) -+LIBSUBDIRS += $(XMLLIBSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2298,13 +2298,21 @@ - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), -+AC_MSG_CHECKING(for --with-expat) -+AC_ARG_WITH(expat, -+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) -+ [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) -+AC_MSG_RESULT($with_expat) -+ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi -+AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -1463,7 +1463,7 @@ - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - expat_lib = ['expat'] diff --git a/package.bak/python/107-optional-codecs-cjk.patch b/package.bak/python/107-optional-codecs-cjk.patch deleted file mode 100644 index 22a2fed8b8..0000000000 --- a/package.bak/python/107-optional-codecs-cjk.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2650,6 +2650,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), diff --git a/package.bak/python/108-optional-nis.patch b/package.bak/python/108-optional-nis.patch deleted file mode 100644 index d19ebe1e07..0000000000 --- a/package.bak/python/108-optional-nis.patch +++ /dev/null @@ -1,28 +0,0 @@ -Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2656,6 +2656,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), diff --git a/package.bak/python/109-optional-unicodedata.patch b/package.bak/python/109-optional-unicodedata.patch deleted file mode 100644 index 841f2a77b5..0000000000 --- a/package.bak/python/109-optional-unicodedata.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2662,6 +2662,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), diff --git a/package.bak/python/110-optional-db.patch b/package.bak/python/110-optional-db.patch deleted file mode 100644 index b8c454c90b..0000000000 --- a/package.bak/python/110-optional-db.patch +++ /dev/null @@ -1,80 +0,0 @@ -Add an option to disable bsddb - -bsddb has an external dependency on Berkeley DB. Since we want to be -able to build Python without it, this patch adds an option to disable -the build/installation of this Python module. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin - ---- - Makefile.pre.in | 10 ++++++++-- - configure.in | 22 ++++++++++++++++++++++ - 2 files changed, 30 insertions(+), 2 deletions(-) - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -965,7 +965,7 @@ - email email/mime \ - ensurepip ensurepip/_bundled \ - json \ -- logging bsddb csv importlib wsgiref \ -+ logging csv importlib wsgiref \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command \ -@@ -981,7 +981,6 @@ - test/tracedmodules \ - email/test email/test/data \ - json/tests \ -- bsddb/test \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1022,6 +1021,11 @@ - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -+ifeq (@BSDDB@,yes) -+LIBSUBDIRS += bsddb -+TESTSUBDIRS += bsddb/test -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2662,6 +2662,28 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(dbm, -+ AS_HELP_STRING([--disable-dbm], [disable DBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} dbm" -+ fi]) -+ -+AC_ARG_ENABLE(gdbm, -+ AS_HELP_STRING([--disable-gdbm], [disable GDBM]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} gdbm" -+ fi]) -+ -+AC_SUBST(BSDDB) -+AC_ARG_ENABLE(bsddb, -+ AS_HELP_STRING([--disable-bsddb], [disable BerkeyleyDB]), -+ [ if test "$enableval" = "no"; then -+ BSDDB=no -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _bsddb" -+ else -+ BSDDB=yes -+ fi], [ BSDDB=yes ]) -+ - AC_ARG_ENABLE(unicodedata, - AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), - [ if test "$enableval" = "no"; then diff --git a/package.bak/python/111-optional-ssl.patch b/package.bak/python/111-optional-ssl.patch deleted file mode 100644 index 956d2a0726..0000000000 --- a/package.bak/python/111-optional-ssl.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add an option to disable the ssl module - -Signed-off-by: Thomas Petazzoni - ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2662,6 +2662,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(ssl, -+ AS_HELP_STRING([--disable-ssl], [disable SSL]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then diff --git a/package.bak/python/112-optional-bzip2.patch b/package.bak/python/112-optional-bzip2.patch deleted file mode 100644 index 99fe83ca69..0000000000 --- a/package.bak/python/112-optional-bzip2.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add an option to disable the bz2 module - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2668,6 +2668,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl" - fi]) - -+AC_ARG_ENABLE(bz2, -+ AS_HELP_STRING([--disable-bz2], [disable BZIP2]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then diff --git a/package.bak/python/113-optional-zlib.patch b/package.bak/python/113-optional-zlib.patch deleted file mode 100644 index 652a586eae..0000000000 --- a/package.bak/python/113-optional-zlib.patch +++ /dev/null @@ -1,24 +0,0 @@ -Add an option to disable the zlib module - -Signed-off-by: Thomas Petazzoni ---- - configure.in | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2674,6 +2674,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} bz2" - fi]) - -+AC_ARG_ENABLE(zlib, -+ AS_HELP_STRING([--disable-zlib], [disable ZLIB]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} zlib" -+ fi]) -+ - AC_ARG_ENABLE(dbm, - AS_HELP_STRING([--disable-dbm], [disable DBM]), - [ if test "$enableval" = "no"; then diff --git a/package.bak/python/114-remove-idle-editor.patch b/package.bak/python/114-remove-idle-editor.patch deleted file mode 100644 index 512eedcb5f..0000000000 --- a/package.bak/python/114-remove-idle-editor.patch +++ /dev/null @@ -1,43 +0,0 @@ -Do not install the idle editor - -IDLE is the Python IDE built with the tkinter GUI toolkit. Since it's -highly unlikely to ever be useful in an embedded Linux system -generated by Buildroot, this patch simply disables the installation of -idle and the related Python modules. It saves 800 KB-900 KB of -installed .pyc files. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.pre.in -=================================================================== ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -967,7 +967,6 @@ - json \ - logging csv importlib wsgiref \ - ctypes ctypes/macholib \ -- idlelib idlelib/Icons \ - distutils distutils/command \ - multiprocessing multiprocessing/dummy \ - unittest \ -@@ -982,7 +981,6 @@ - email/test email/test/data \ - json/tests \ - ctypes/test \ -- idlelib/idle_test \ - distutils/tests \ - unittest/test - -Index: b/setup.py -=================================================================== ---- a/setup.py -+++ b/setup.py -@@ -2212,7 +2212,7 @@ - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle', 'Lib/smtpd.py'] -+ scripts = ['Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): diff --git a/package.bak/python/115-optional-ossaudiodev.patch b/package.bak/python/115-optional-ossaudiodev.patch deleted file mode 100644 index 89335ba2d0..0000000000 --- a/package.bak/python/115-optional-ossaudiodev.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 30351d9b41a03c43d627d52d46e49ab91bfe342d Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Thu, 8 Jan 2015 11:41:40 +0100 -Subject: [PATCH 1/1] Add an option to disable the ossaudiodev module - -Signed-off-by: Zoltan Gyarmati ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -2726,6 +2726,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" - fi - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, diff --git a/package.bak/python/Config.in b/package.bak/python/Config.in deleted file mode 100644 index fa83e7774a..0000000000 --- a/package.bak/python/Config.in +++ /dev/null @@ -1,132 +0,0 @@ -comment "python needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON - bool "python" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON - -choice - prompt "python module format to install" - default BR2_PACKAGE_PYTHON_PYC_ONLY - help - Select Python module format to install on target (py, pyc or both) - -config BR2_PACKAGE_PYTHON_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON_BZIP2 - select BR2_PACKAGE_BZIP2 - bool "bzip2 module" - help - bzip2 module for Python - -config BR2_PACKAGE_PYTHON_BSDDB - select BR2_PACKAGE_BERKELEYDB - bool "bsddb module" - help - bsddb module for Python. - -config BR2_PACKAGE_PYTHON_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON_CURSES - select BR2_PACKAGE_NCURSES - bool "curses module" - help - curses module for Python. - -config BR2_PACKAGE_PYTHON_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python. - -config BR2_PACKAGE_PYTHON_READLINE - select BR2_PACKAGE_READLINE - bool "readline" - help - readline module for Python (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON_SSL - select BR2_PACKAGE_OPENSSL - bool "ssl" - help - _ssl module for Python (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) (large). - -if BR2_PACKAGE_PYTHON_UNICODEDATA - -choice - prompt "Python unicode database format" - default BR2_PACKAGE_PYTHON_UCS2 - help - Select Python unicode database format for target - -config BR2_PACKAGE_PYTHON_UCS2 - bool "Universal Character Set 2-byte (UCS2)" - -config BR2_PACKAGE_PYTHON_UCS4 - bool "Universal Character Set 4-byte (UCS4)" - -endchoice - -endif - -config BR2_PACKAGE_PYTHON_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON_PYEXPAT - select BR2_PACKAGE_EXPAT - bool "xml module" - help - pyexpat and xml libraries for Python - -config BR2_PACKAGE_PYTHON_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python - -config BR2_PACKAGE_PYTHON_HASHLIB - bool "hashlib module" - select BR2_PACKAGE_OPENSSL - help - hashlib support in Python - -endmenu - -endif diff --git a/package.bak/python/python.hash b/package.bak/python/python.hash deleted file mode 100644 index f285e4243f..0000000000 --- a/package.bak/python/python.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.python.org/downloads/release/python-2713/ -md5 53b43534153bb2a0363f08bae8b9d990 Python-2.7.13.tar.xz -# Locally calculated -sha256 35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731 Python-2.7.13.tar.xz diff --git a/package.bak/python/python.mk b/package.bak/python/python.mk deleted file mode 100644 index 281130c68b..0000000000 --- a/package.bak/python/python.mk +++ /dev/null @@ -1,273 +0,0 @@ -################################################################################ -# -# python -# -################################################################################ - -PYTHON_VERSION_MAJOR = 2.7 -PYTHON_VERSION = $(PYTHON_VERSION_MAJOR).13 -PYTHON_SOURCE = Python-$(PYTHON_VERSION).tar.xz -PYTHON_SITE = http://python.org/ftp/python/$(PYTHON_VERSION) -PYTHON_LICENSE = Python software foundation license v2, others -PYTHON_LICENSE_FILES = LICENSE -PYTHON_LIBTOOL_PATCH = NO - -# Python needs itself to be built, so in order to cross-compile -# Python, we need to build a host Python first. This host Python is -# also installed in $(HOST_DIR), as it is needed when cross-compiling -# third-party Python modules. - -HOST_PYTHON_CONF_OPTS += \ - --enable-static \ - --without-cxx-main \ - --disable-sqlite3 \ - --disable-tk \ - --with-expat=system \ - --disable-curses \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ - --disable-dbm \ - --disable-gdbm \ - --disable-bsddb \ - --disable-test-modules \ - --disable-bz2 \ - --disable-ssl \ - --disable-ossaudiodev \ - --disable-pyo-build - -# Make sure that LD_LIBRARY_PATH overrides -rpath. -# This is needed because libpython may be installed at the same time that -# python is called. -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -HOST_PYTHON_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# Building host python in parallel sometimes triggers a "Bus error" -# during the execution of "./python setup.py build" in the -# installation step. It is probably due to the installation of a -# shared library taking place in parallel to the execution of -# ./python, causing spurious Bus error. Building host-python with -# MAKE1 has shown to workaround the problem. -HOST_PYTHON_MAKE = $(MAKE1) - -PYTHON_DEPENDENCIES = host-python libffi - -HOST_PYTHON_DEPENDENCIES = host-expat host-zlib - -PYTHON_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y) -PYTHON_DEPENDENCIES += readline -endif - -ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y) -PYTHON_DEPENDENCIES += ncurses -else -PYTHON_CONF_OPTS += --disable-curses -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYEXPAT),y) -PYTHON_DEPENDENCIES += expat -PYTHON_CONF_OPTS += --with-expat=system -else -PYTHON_CONF_OPTS += --with-expat=none -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BSDDB),y) -PYTHON_DEPENDENCIES += berkeleydb -else -PYTHON_CONF_OPTS += --disable-bsddb -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SQLITE),y) -PYTHON_DEPENDENCIES += sqlite -else -PYTHON_CONF_OPTS += --disable-sqlite3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_SSL),y) -PYTHON_DEPENDENCIES += openssl -else -PYTHON_CONF_OPTS += --disable-ssl -endif - -ifneq ($(BR2_PACKAGE_PYTHON_CODECSCJK),y) -PYTHON_CONF_OPTS += --disable-codecs-cjk -endif - -ifneq ($(BR2_PACKAGE_PYTHON_UNICODEDATA),y) -PYTHON_CONF_OPTS += --disable-unicodedata -endif - -# Default is UCS2 w/o a conf opt -ifeq ($(BR2_PACKAGE_PYTHON_UCS4),y) -# host-python must have the same UCS2/4 configuration as the target -# python -HOST_PYTHON_CONF_OPTS += --enable-unicode=ucs4 -PYTHON_CONF_OPTS += --enable-unicode=ucs4 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_BZIP2),y) -PYTHON_DEPENDENCIES += bzip2 -else -PYTHON_CONF_OPTS += --disable-bz2 -endif - -ifeq ($(BR2_PACKAGE_PYTHON_ZLIB),y) -PYTHON_DEPENDENCIES += zlib -else -PYTHON_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON_HASHLIB),y) -PYTHON_DEPENDENCIES += openssl -endif - -ifeq ($(BR2_PACKAGE_PYTHON_OSSAUDIODEV),y) -PYTHON_CONF_OPTS += --enable-ossaudiodev -else -PYTHON_CONF_OPTS += --disable-ossaudiodev -endif - -# Make python believe we don't have 'hg' and 'svn', so that it doesn't -# try to communicate over the network during the build. -PYTHON_CONF_ENV += \ - ac_cv_have_long_long_format=yes \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false \ - ac_cv_prog_SVNVERSION=/bin/false - -# GCC is always compliant with IEEE754 -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON_CONF_ENV += ac_cv_little_endian_double=yes -else -PYTHON_CONF_ENV += ac_cv_big_endian_double=yes -endif - -PYTHON_CONF_OPTS += \ - --without-cxx-main \ - --without-doc-strings \ - --with-system-ffi \ - --disable-pydoc \ - --disable-test-modules \ - --disable-lib2to3 \ - --disable-gdbm \ - --disable-tk \ - --disable-nis \ - --disable-dbm \ - --disable-pyo-build \ - --disable-pyc-build - -# This is needed to make sure the Python build process doesn't try to -# regenerate those files with the pgen program. Otherwise, it builds -# pgen for the target, and tries to run it on the host. - -define PYTHON_TOUCH_GRAMMAR_FILES - touch $(@D)/Include/graminit.h $(@D)/Python/graminit.c -endef - -PYTHON_POST_PATCH_HOOKS += PYTHON_TOUCH_GRAMMAR_FILES - -# -# Remove useless files. In the config/ directory, only the Makefile -# and the pyconfig.h files are needed at runtime. -# -# idle & smtpd.py have bad shebangs and are mostly samples -# -define PYTHON_REMOVE_USELESS_FILES - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python2-config - rm -f $(TARGET_DIR)/usr/bin/python-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/config/ \ - -type f -not -name pyconfig.h -a -not -name Makefile` ; do \ - rm -f $$i ; \ - done -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_REMOVE_USELESS_FILES - -# -# Make sure libpython gets stripped out on target -# -define PYTHON_ENSURE_LIBPYTHON_STRIPPED - chmod u+w $(TARGET_DIR)/usr/lib/libpython$(PYTHON_VERSION_MAJOR)*.so -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_ENSURE_LIBPYTHON_STRIPPED - -# Always install the python symlink in the target tree -define PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - ln -sf python2 $(TARGET_DIR)/usr/bin/python -endef - -PYTHON_POST_INSTALL_TARGET_HOOKS += PYTHON_INSTALL_TARGET_PYTHON_SYMLINK - -# Always install the python-config symlink in the staging tree -define PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - ln -sf python2-config $(STAGING_DIR)/usr/bin/python-config -endef - -PYTHON_POST_INSTALL_STAGING_HOOKS += PYTHON_INSTALL_STAGING_PYTHON_CONFIG_SYMLINK - -PYTHON_AUTORECONF = YES - -# Some packages may have build scripts requiring python2. -# Only install the python symlink in the host tree if python3 is not enabled -# for the target, otherwise the default python program may be missing. -ifneq ($(BR2_PACKAGE_PYTHON3),y) -define HOST_PYTHON_INSTALL_PYTHON_SYMLINK - ln -sf python2 $(HOST_DIR)/usr/bin/python - ln -sf python2-config $(HOST_DIR)/usr/bin/python-config -endef - -HOST_PYTHON_POST_INSTALL_HOOKS += HOST_PYTHON_INSTALL_PYTHON_SYMLINK -endif - -# Provided to other packages -PYTHON_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/ - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -define PYTHON_CREATE_PYC_FILES - PYTHONPATH="$(PYTHON_PATH)" \ - $(HOST_DIR)/usr/bin/python$(PYTHON_VERSION_MAJOR) \ - support/scripts/pycompile.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -endef - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PY_PYC),y) -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_CREATE_PYC_FILES -endif - -ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) -define PYTHON_REMOVE_PY_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PY_FILES -endif - -# Normally, *.pyc files should not have been compiled, but just in -# case, we make sure we remove all of them. -ifeq ($(BR2_PACKAGE_PYTHON_PY_ONLY),y) -define PYTHON_REMOVE_PYC_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyc' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYC_FILES -endif - -# In all cases, we don't want to keep the optimized .pyo files -define PYTHON_REMOVE_PYO_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR) -name '*.pyo' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON_TARGET_FINALIZE_HOOKS += PYTHON_REMOVE_PYO_FILES diff --git a/package.bak/python3/0001-setup.py-do-not-add-invalid-header-locations.patch b/package.bak/python3/0001-setup.py-do-not-add-invalid-header-locations.patch deleted file mode 100644 index defaad9c45..0000000000 --- a/package.bak/python3/0001-setup.py-do-not-add-invalid-header-locations.patch +++ /dev/null @@ -1,46 +0,0 @@ -From d6093bad6c700312ff7ff4a7bb15c815dda6f46b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:28:34 +0100 -Subject: [PATCH] setup.py: do not add invalid header locations - -This piece of code incorrectly adds /usr/include to -self.compiler.include_dirs, and results in the following invalid -compilation line: - -/home/thomas/projets/buildroot/output/host/usr/bin/arm-none-linux-gnueabi-gcc - -fPIC -Wno-unused-result -Werror=declaration-after-statement -DNDEBUG -g - -O3 -Wall -Wstrict-prototypes -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE - -D_FILE_OFFSET_BITS=64 -pipe -Os - -I./Include -I/usr/include -I. -IInclude - -I/home/thomas/projets/buildroot/output/host/usr/arm-buildroot-linux-gnueabi/sysroot/usr/include - -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Include - -I/home/thomas/projets/buildroot/output/build/python3-3.4.0b1 - -c /home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.c - -o build/temp.linux-arm-3.4/home/thomas/projets/buildroot/output/build/python3-3.4.0b1/Modules/_struct.o -cc1: warning: include location "/usr/include" is unsafe for cross-compilation [-Wpoison-system-directories] - -The -I/usr/include is wrong when cross compiling, so we disable adding -INCLUDEDIR and LIBDIR from the host when cross compiling. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index da67731..dbd2a3c 100644 ---- a/setup.py -+++ b/setup.py -@@ -511,7 +511,8 @@ class PyBuildExt(build_ext): - add_dir_to_list(dir_list, directory) - - if os.path.normpath(sys.base_prefix) != '/usr' \ -- and not sysconfig.get_config_var('PYTHONFRAMEWORK'): -+ and not sysconfig.get_config_var('PYTHONFRAMEWORK') \ -+ and not cross_compiling: - # OSX note: Don't add LIBDIR and INCLUDEDIR to building a framework - # (PYTHONFRAMEWORK is set) to avoid # linking problems when - # building a framework with different architectures than --- -2.6.4 - diff --git a/package.bak/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch b/package.bak/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch deleted file mode 100644 index 8e930abf82..0000000000 --- a/package.bak/python3/0002-Change-the-install-location-of-_sysconfigdata.py.patch +++ /dev/null @@ -1,86 +0,0 @@ -From 4ac038d30ec71b3f223ac7c91613856dd82b6347 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:29:04 +0100 -Subject: [PATCH] Change the install location of _sysconfigdata.py - -The _sysconfigdata.py module contains definitions that are needed when -building Python modules. In cross-compilation mode, when building -Python extensions for the target, we need to use the _sysconfigdata.py -of the target Python while executing the host Python. - -However until now, the _sysconfigdata.py module was installed in -build/lib.- directory, together with a number of -architecture-specific shared objects, which cannot be used with the -host Python. - -To solve this problem, this patch moves _sysconfigdata.py to a -separate location, build/sysconfigdata.-/, and only -this directory gets added to the PYTHONPATH of the host Python -interpreter when building Python modules for the target. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.pre.in | 12 ++++++++++-- - configure.ac | 2 +- - 2 files changed, 11 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 823def3..4d2a061 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -585,6 +585,9 @@ pybuilddir.txt: $(BUILDPYTHON) - rm -f ./pybuilddir.txt ; \ - exit 1 ; \ - fi -+ echo `cat pybuilddir.txt`/sysconfigdata > pysysconfigdatadir.txt -+ mkdir -p `cat pysysconfigdatadir.txt` -+ cp `cat pybuilddir.txt`/_sysconfigdata.py `cat pysysconfigdatadir.txt` - - # Build the shared modules - # Under GNU make, MAKEFLAGS are sorted and normalized; the 's' for -@@ -1235,7 +1238,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - else true; \ - fi; \ - done -- @for i in $(srcdir)/Lib/*.py `cat pybuilddir.txt`/_sysconfigdata.py; \ -+ @for i in $(srcdir)/Lib/*.py ; \ - do \ - if test -x $$i; then \ - $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ -@@ -1245,6 +1248,11 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - echo $(INSTALL_DATA) $$i $(LIBDEST); \ - fi; \ - done -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST) -+ mkdir -p $(DESTDIR)$(LIBDEST)/sysconfigdata -+ $(INSTALL_DATA) `cat pysysconfigdatadir.txt`/_sysconfigdata.py \ -+ $(DESTDIR)$(LIBDEST)/sysconfigdata - @for d in $(LIBSUBDIRS); \ - do \ - a=$(srcdir)/Lib/$$d; \ -@@ -1580,7 +1588,7 @@ clean: pycremoval - find build -name 'fficonfig.h' -exec rm -f {} ';' || true - find build -name '*.py' -exec rm -f {} ';' || true - find build -name '*.py[co]' -exec rm -f {} ';' || true -- -rm -f pybuilddir.txt -+ -rm -f pybuilddir.txt pysysconfigdatadir.txt - -rm -f Lib/lib2to3/*Grammar*.pickle - -rm -f Programs/_testembed Programs/_freeze_importlib - -rm -rf build -diff --git a/configure.ac b/configure.ac -index 694293e..76b70a0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -70,7 +70,7 @@ if test "$cross_compiling" = yes; then - AC_MSG_ERROR([python$PACKAGE_VERSION interpreter not found]) - fi - AC_MSG_RESULT($interp) -- PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pybuilddir.txt && echo $(abs_builddir)/`cat pybuilddir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp -+ PYTHON_FOR_BUILD='_PYTHON_PROJECT_BASE=$(abs_builddir) _PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) PYTHONPATH=$(shell test -f pysysconfigdatadir.txt && echo $(abs_builddir)/`cat pysysconfigdatadir.txt`:)$(srcdir)/Lib:$(srcdir)/Lib/$(PLATDIR) '$interp - fi - elif test "$cross_compiling" = maybe; then - AC_MSG_ERROR([Cross compiling required --host=HOST-TUPLE and --build=ARCH]) --- -2.6.4 - diff --git a/package.bak/python3/0003-Make-the-build-of-pyc-files-conditional.patch b/package.bak/python3/0003-Make-the-build-of-pyc-files-conditional.patch deleted file mode 100644 index 3251da5f3e..0000000000 --- a/package.bak/python3/0003-Make-the-build-of-pyc-files-conditional.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 28f81597314ea3ed03935b519453a55cf6c3c20d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:29:35 +0100 -Subject: [PATCH] Make the build of pyc files conditional - -This commit adds a new configure option --disable-pyc-build to disable -the compilation of pyc. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.pre.in | 2 ++ - configure.ac | 6 ++++++ - 2 files changed, 8 insertions(+) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 4d2a061..272f312 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1283,6 +1283,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - $(INSTALL_DATA) $(srcdir)/Modules/xxmodule.c \ - $(DESTDIR)$(LIBDEST)/distutils/tests ; \ - fi -+ifeq (@PYC_BUILD@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST) -f \ -@@ -1310,6 +1311,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - $(PYTHON_FOR_BUILD) -Wi -OO $(DESTDIR)$(LIBDEST)/compileall.py \ - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -+endif - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ -diff --git a/configure.ac b/configure.ac -index 76b70a0..66d4642 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1056,6 +1056,12 @@ fi - - AC_MSG_CHECKING(LDLIBRARY) - -+AC_SUBST(PYC_BUILD) -+ -+AC_ARG_ENABLE(pyc-build, -+ AS_HELP_STRING([--disable-pyc-build], [disable build of pyc files]), -+ [ PYC_BUILD="${enableval}" ], [ PYC_BUILD=yes ]) -+ - # MacOSX framework builds need more magic. LDLIBRARY is the dynamic - # library that we build, but we do not want to link against it (we - # will find it with a -framework option). For this reason there is an --- -2.6.4 - diff --git a/package.bak/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch b/package.bak/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch deleted file mode 100644 index 183d6b300f..0000000000 --- a/package.bak/python3/0004-Disable-buggy_getaddrinfo-configure-test-when-cross-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 093caf46b7a742ee2f7bcf617a915ac1653aa8ac Mon Sep 17 00:00:00 2001 -From: Vanya Sergeev -Date: Wed, 23 Dec 2015 11:30:33 +0100 -Subject: [PATCH] Disable buggy_getaddrinfo configure test when cross-compiling - with IPv6 support - -Signed-off-by: Vanya Sergeev ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 66d4642..c492594 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3662,7 +3662,7 @@ fi - - AC_MSG_RESULT($ac_cv_buggy_getaddrinfo) - --if test $have_getaddrinfo = no || test "$ac_cv_buggy_getaddrinfo" = yes -+if test $have_getaddrinfo = no || test "$cross_compiling" != "yes" -a "$ac_cv_buggy_getaddrinfo" = yes - then - if test $ipv6 = yes - then --- -2.6.4 - diff --git a/package.bak/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch b/package.bak/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch deleted file mode 100644 index 76a553b505..0000000000 --- a/package.bak/python3/0005-Add-infrastructure-to-disable-the-build-of-certain-e.patch +++ /dev/null @@ -1,106 +0,0 @@ -From 3a9f4aa255909ed152883eee787313efd20dbc58 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:31:08 +0100 -Subject: [PATCH] Add infrastructure to disable the build of certain extensions - -Some of the extensions part of the Python core have dependencies on -external libraries (sqlite, tk, etc.) or are relatively big and not -necessarly always useful (CJK codecs for example). By extensions, we -mean part of Python modules that are written in C and therefore -compiled to binary code. - -Therefore, we introduce a small infrastructure that allows to disable -some of those extensions. This can be done inside the configure.ac by -adding values to the DISABLED_EXTENSIONS variable (which is a -word-separated list of extensions). - -The implementation works as follow : - - * configure.ac defines a DISABLED_EXTENSIONS variable, which is - substituted (so that when Makefile.pre is generated from - Makefile.pre.in, the value of the variable is substituted). For - now, this DISABLED_EXTENSIONS variable is empty, later patches will - use it. - - * Makefile.pre.in passes the DISABLED_EXTENSIONS value down to the - variables passed in the environment when calling the setup.py - script that actually builds and installs those extensions. - - * setup.py is modified so that the existing "disabled_module_list" is - filled with those pre-disabled extensions listed in - DISABLED_EXTENSIONS. - -Patch ported to python2.7 by Maxime Ripard , and -then extended by Thomas Petazzoni -. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.pre.in | 6 +++++- - configure.ac | 2 ++ - setup.py | 5 ++++- - 3 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 272f312..9420860 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -182,6 +182,8 @@ FILEMODE= 644 - # configure script arguments - CONFIG_ARGS= @CONFIG_ARGS@ - -+# disabled extensions -+DISABLED_EXTENSIONS= @DISABLED_EXTENSIONS@ - - # Subdirectories with code - SRCDIRS= @SRCDIRS@ -@@ -600,6 +602,7 @@ sharedmods: $(BUILDPYTHON) pybuilddir.txt - esac; \ - $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \ - _TCLTK_INCLUDES='$(TCLTK_INCLUDES)' _TCLTK_LIBS='$(TCLTK_LIBS)' \ -+ DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ - $(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build - - # Build static library -@@ -1425,7 +1428,8 @@ libainstall: all python-config - # Install the dynamically loadable modules - # This goes into $(exec_prefix) - sharedinstall: sharedmods -- $(RUNSHARED) $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ -+ $(RUNSHARED) DISABLED_EXTENSIONS="$(DISABLED_EXTENSIONS)" \ -+ $(PYTHON_FOR_BUILD) $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ -diff --git a/configure.ac b/configure.ac -index c492594..bfb599e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2588,6 +2588,8 @@ LIBS="$withval $LIBS" - - PKG_PROG_PKG_CONFIG - -+AC_SUBST(DISABLED_EXTENSIONS) -+ - # Check for use of the system expat library - AC_MSG_CHECKING(for --with-system-expat) - AC_ARG_WITH(system_expat, -diff --git a/setup.py b/setup.py -index dbd2a3c..1ebfa50 100644 ---- a/setup.py -+++ b/setup.py -@@ -44,7 +44,10 @@ host_platform = get_platform() - COMPILED_WITH_PYDEBUG = ('--with-pydebug' in sysconfig.get_config_var("CONFIG_ARGS")) - - # This global variable is used to hold the list of modules to be disabled. --disabled_module_list = [] -+try: -+ disabled_module_list = sysconfig.get_config_var("DISABLED_EXTENSIONS").split(" ") -+except KeyError: -+ disabled_module_list = list() - - def add_dir_to_list(dirlist, dir): - """Add the directory 'dir' to the list 'dirlist' (after any relative --- -2.6.4 - diff --git a/package.bak/python3/0006-distutils-sysconfig-use-sysconfigdata.patch b/package.bak/python3/0006-distutils-sysconfig-use-sysconfigdata.patch deleted file mode 100644 index b3e41b10d5..0000000000 --- a/package.bak/python3/0006-distutils-sysconfig-use-sysconfigdata.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 7c560d917ee0e536c76fac275d1cb0b6136269ab Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:32:23 +0100 -Subject: [PATCH] distutils/sysconfig: use sysconfigdata - -In order to make the use of sysconfig cross-compilation compatible, -use _sysconfigdata. - -Signed-off-by: Thomas Petazzoni ---- - Lib/distutils/sysconfig.py | 37 ++++--------------------------------- - 1 file changed, 4 insertions(+), 33 deletions(-) - -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 573724d..721edec 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -414,40 +414,11 @@ def expand_makefile_vars(s, vars): - _config_vars = None - - def _init_posix(): -- """Initialize the module as appropriate for POSIX systems.""" -- g = {} -- # load the installed Makefile: -- try: -- filename = get_makefile_filename() -- parse_makefile(filename, g) -- except OSError as msg: -- my_msg = "invalid Python installation: unable to open %s" % filename -- if hasattr(msg, "strerror"): -- my_msg = my_msg + " (%s)" % msg.strerror -- -- raise DistutilsPlatformError(my_msg) -- -- # load the installed pyconfig.h: -- try: -- filename = get_config_h_filename() -- with open(filename) as file: -- parse_config_h(file, g) -- except OSError as msg: -- my_msg = "invalid Python installation: unable to open %s" % filename -- if hasattr(msg, "strerror"): -- my_msg = my_msg + " (%s)" % msg.strerror -- -- raise DistutilsPlatformError(my_msg) -- -- # On AIX, there are wrong paths to the linker scripts in the Makefile -- # -- these paths are relative to the Python source, but when installed -- # the scripts are in another directory. -- if python_build: -- g['LDSHARED'] = g['BLDSHARED'] -- -+ # _sysconfigdata is generated at build time, see the sysconfig module -+ from _sysconfigdata import build_time_vars - global _config_vars -- _config_vars = g -- -+ _config_vars = {} -+ _config_vars.update(build_time_vars) - - def _init_nt(): - """Initialize the module as appropriate for NT""" --- -2.6.4 - diff --git a/package.bak/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch b/package.bak/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch deleted file mode 100644 index 9ac65ba93b..0000000000 --- a/package.bak/python3/0007-Adjust-library-header-paths-for-cross-compilation.patch +++ /dev/null @@ -1,67 +0,0 @@ -From e634929f76a45f5b683dc19bc01efed2ab83e19e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:33:14 +0100 -Subject: [PATCH] Adjust library/header paths for cross-compilation - -When cross-compiling third-party extensions, the get_python_inc() or -get_python_lib() can be called, to return the path to headers or -libraries. However, they use the sys.prefix of the host Python, which -returns incorrect paths when cross-compiling (paths pointing to host -headers and libraries). - -In order to fix this, we introduce the _python_sysroot, _python_prefix -and _python_exec_prefix variables, that allow to override these -values, and get correct header/library paths when cross-compiling -third-party Python modules. - -Signed-off-by: Thomas Petazzoni ---- - Lib/distutils/command/build_ext.py | 5 ++++- - Lib/distutils/sysconfig.py | 15 +++++++++++---- - 2 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/Lib/distutils/command/build_ext.py b/Lib/distutils/command/build_ext.py -index d4cb11e..e7a0ba9 100644 ---- a/Lib/distutils/command/build_ext.py -+++ b/Lib/distutils/command/build_ext.py -@@ -232,7 +232,10 @@ class build_ext(Command): - if (sysconfig.get_config_var('Py_ENABLE_SHARED')): - if not sysconfig.python_build: - # building third party extensions -- self.library_dirs.append(sysconfig.get_config_var('LIBDIR')) -+ libdir = sysconfig.get_config_var('LIBDIR') -+ if "_python_sysroot" in os.environ: -+ libdir = os.environ.get("_python_sysroot") + libdir -+ self.library_dirs.append(libdir) - else: - # building python standard extensions - self.library_dirs.append('.') -diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py -index 721edec..d20e2d8 100644 ---- a/Lib/distutils/sysconfig.py -+++ b/Lib/distutils/sysconfig.py -@@ -17,10 +17,17 @@ import sys - from .errors import DistutilsPlatformError - - # These are needed in a couple of spots, so just compute them once. --PREFIX = os.path.normpath(sys.prefix) --EXEC_PREFIX = os.path.normpath(sys.exec_prefix) --BASE_PREFIX = os.path.normpath(sys.base_prefix) --BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) -+if "_python_sysroot" in os.environ: -+ _sysroot=os.environ.get('_python_sysroot') -+ PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_prefix')) -+ EXEC_PREFIX = os.path.normpath(_sysroot + os.environ.get('_python_exec_prefix')) -+ BASE_PREFIX = PREFIX -+ BASE_EXEC_PREFIX = EXEC_PREFIX -+else: -+ PREFIX = os.path.normpath(sys.prefix) -+ EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+ BASE_PREFIX = os.path.normpath(sys.base_prefix) -+ BASE_EXEC_PREFIX = os.path.normpath(sys.base_exec_prefix) - - # Path to the base directory of the project. On Windows the binary may - # live in project/PCBuild/win32 or project/PCBuild/amd64. --- -2.6.4 - diff --git a/package.bak/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch b/package.bak/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch deleted file mode 100644 index 47a0b83291..0000000000 --- a/package.bak/python3/0008-Don-t-look-in-usr-lib-termcap-for-libraries.patch +++ /dev/null @@ -1,31 +0,0 @@ -From d7c568632f7cb83346096ea114a06f89a0b488d6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:36:00 +0100 -Subject: [PATCH] Don't look in /usr/lib/termcap for libraries - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -diff --git a/setup.py b/setup.py -index 1ebfa50..24a7153 100644 ---- a/setup.py -+++ b/setup.py -@@ -753,12 +753,9 @@ class PyBuildExt(build_ext): - pass # Issue 7384: Already linked against curses or tinfo. - elif curses_library: - readline_libs.append(curses_library) -- elif self.compiler.find_library_file(lib_dirs + -- ['/usr/lib/termcap'], -- 'termcap'): -+ elif self.compiler.find_library_file(lib_dirs, 'termcap'): - readline_libs.append('termcap') - exts.append( Extension('readline', ['readline.c'], -- library_dirs=['/usr/lib/termcap'], - extra_link_args=readline_extra_link_args, - libraries=readline_libs) ) - else: --- -2.6.4 - diff --git a/package.bak/python3/0009-Don-t-add-multiarch-paths.patch b/package.bak/python3/0009-Don-t-add-multiarch-paths.patch deleted file mode 100644 index 921e25ccbe..0000000000 --- a/package.bak/python3/0009-Don-t-add-multiarch-paths.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bac5ac529cc0902a340a5cd03308433c6e80d1f6 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:36:27 +0100 -Subject: [PATCH] Don't add multiarch paths - -The add_multiarch_paths() function leads, in certain build -environments, to the addition of host header paths to the CFLAGS, -which is not appropriate for cross-compilation. This patch fixes that -by simply removing the call to add_multiarch_paths() when we're -cross-compiling. - -Investigation done by David . - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 24a7153..8380a64 100644 ---- a/setup.py -+++ b/setup.py -@@ -474,10 +474,10 @@ class PyBuildExt(build_ext): - if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') - add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') -+ self.add_multiarch_paths() - # only change this for cross builds for 3.3, issues on Mageia - if cross_compiling: - self.add_gcc_paths() -- self.add_multiarch_paths() - - # Add paths specified in the environment variables LDFLAGS and - # CPPFLAGS for header and library files. --- -2.6.4 - diff --git a/package.bak/python3/0010-Abort-on-failed-module-build.patch b/package.bak/python3/0010-Abort-on-failed-module-build.patch deleted file mode 100644 index 131354b3f5..0000000000 --- a/package.bak/python3/0010-Abort-on-failed-module-build.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 86ef08e36597e14cac06aef176f12375a27fdef5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:43:24 +0100 -Subject: [PATCH] Abort on failed module build - -When building a Python module fails, the setup.py script currently -doesn't exit with an error, and simply continues. This is not a really -nice behavior, so this patch changes setup.py to abort with an error, -so that the build issue is clearly noticeable. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/setup.py b/setup.py -index 8380a64..15b39f5 100644 ---- a/setup.py -+++ b/setup.py -@@ -296,6 +296,7 @@ class PyBuildExt(build_ext): - print("Failed to build these modules:") - print_three_column(failed) - print() -+ sys.exit(1) - - if self.failed_on_import: - failed = self.failed_on_import[:] --- -2.6.4 - diff --git a/package.bak/python3/0011-Serial-ioctl-workaround.patch b/package.bak/python3/0011-Serial-ioctl-workaround.patch deleted file mode 100644 index 9e7d79c49f..0000000000 --- a/package.bak/python3/0011-Serial-ioctl-workaround.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ace3ebd517ea0ac42208b6a06c7e8f82da3b9c1b Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Wed, 23 Dec 2015 11:44:02 +0100 -Subject: [PATCH] Serial ioctl() workaround - -The ioctls.h of some architectures (notably xtensa) references structs from -linux/serial.h. Make sure to include this header as well. - -Also, undef TIOCTTYGSTRUCT that require reference to internal kernel tty_struct, -but isn't actually referenced in modern kernels. - -Signed-off-by: Baruch Siach ---- - Modules/termios.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Modules/termios.c b/Modules/termios.c -index b78d33e..58b0444 100644 ---- a/Modules/termios.c -+++ b/Modules/termios.c -@@ -9,7 +9,9 @@ - #endif - - #include -+#include - #include -+#undef TIOCTTYGSTRUCT - - /* HP-UX requires that this be included to pick up MDCD, MCTS, MDSR, - * MDTR, MRI, and MRTS (appearantly used internally by some things --- -2.6.4 - diff --git a/package.bak/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch b/package.bak/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch deleted file mode 100644 index 2e50c1b1af..0000000000 --- a/package.bak/python3/0012-Do-not-adjust-the-shebang-of-Python-scripts-for-cros.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 45f482813de828415906e6a416c9c35450c38da7 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 23 Dec 2015 11:44:30 +0100 -Subject: [PATCH] Do not adjust the shebang of Python scripts for - cross-compilation - -The copy_scripts() method in distutils copies the scripts listed in -the setup file and adjusts the first line to refer to the current -Python interpreter. When cross-compiling, this means that the adjusted -shebang refers to the host Python interpreter. - -This patch modifies copy_scripts() to preserve the shebang when -cross-compilation is detected. - -Signed-off-by: Christophe Vu-Brugier ---- - Lib/distutils/command/build_scripts.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Lib/distutils/command/build_scripts.py b/Lib/distutils/command/build_scripts.py -index 90a8380..bdf4cf1 100644 ---- a/Lib/distutils/command/build_scripts.py -+++ b/Lib/distutils/command/build_scripts.py -@@ -91,7 +91,7 @@ class build_scripts(Command): - adjust = True - post_interp = match.group(1) or b'' - -- if adjust: -+ if adjust and not '_python_sysroot' in os.environ: - log.info("copying and adjusting %s -> %s", script, - self.build_dir) - updated_files.append(outfile) --- -2.6.4 - diff --git a/package.bak/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch b/package.bak/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch deleted file mode 100644 index 872f04023f..0000000000 --- a/package.bak/python3/0013-Misc-python-config.sh.in-ensure-sed-invocations-only.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5858abdc25acd522869103d64b60a0c9687e2ec1 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 30c6927..f905a71 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="@EXT_SUFFIX@" - PYTHONFRAMEWORK="@PYTHONFRAMEWORK@" - INCDIR="-I$includedir/python${VERSION}${ABIFLAGS}" --- -2.6.4 - diff --git a/package.bak/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch b/package.bak/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch deleted file mode 100644 index f11d946461..0000000000 --- a/package.bak/python3/0014-Do-not-harcode-invalid-path-to-ncursesw-headers.patch +++ /dev/null @@ -1,30 +0,0 @@ -From be44636b36086ca1b6de24265b7c3cc0c2bae913 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:45:13 +0100 -Subject: [PATCH] Do not harcode invalid path to ncursesw headers - -Adding /usr/include/ncursesw is obviously invalid when -cross-compiling. Since the ncursesw headers are no longer installed in -usr/include/ncursesw/, but directly in usr/include, there is anyway no -need for a special header path. - -Signed-off-by: Thomas Petazzoni ---- - setup.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 15b39f5..9e08e7e 100644 ---- a/setup.py -+++ b/setup.py -@@ -1296,7 +1296,6 @@ class PyBuildExt(build_ext): - panel_library = 'panel' - if curses_library == 'ncursesw': - curses_defines.append(('HAVE_NCURSESW', '1')) -- curses_includes.append('/usr/include/ncursesw') - # Bug 1464056: If _curses.so links with ncursesw, - # _curses_panel.so must link with panelw. - panel_library = 'panelw' --- -2.6.4 - diff --git a/package.bak/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch b/package.bak/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch deleted file mode 100644 index 22af71d1db..0000000000 --- a/package.bak/python3/0015-Override-system-locale-and-set-to-default-when-addin.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 46fda6fc83500bf5663397f9d28b618e6b6b20c1 Mon Sep 17 00:00:00 2001 -From: Samuel Cabrero -Date: Wed, 23 Dec 2015 11:45:48 +0100 -Subject: [PATCH] Override system locale and set to default when adding gcc - paths - -Forces the use of the default locale in the function -add_gcc_paths, which is called when cross compiling to add the -include and library paths. This is necessary because otherwise -the gcc output is localized and the output parsing fails, which -results in no paths added and detect_modules not able to find -any system library (eg. libz, libssl, etc.) - -[Thomas: patch taken from https://bugs.python.org/issue23767.] - -Signed-off-by: Samuel Cabrero -Signed-off-by: Thomas Petazzoni ---- - setup.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/setup.py b/setup.py -index 9e08e7e..3feca04 100644 ---- a/setup.py -+++ b/setup.py -@@ -441,7 +441,7 @@ class PyBuildExt(build_ext): - tmpfile = os.path.join(self.build_temp, 'gccpaths') - if not os.path.exists(self.build_temp): - os.makedirs(self.build_temp) -- ret = os.system('%s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) -+ ret = os.system('LC_ALL=C %s -E -v - %s 1>/dev/null' % (gcc, tmpfile)) - is_gcc = False - in_incdirs = False - inc_dirs = [] --- -2.6.4 - diff --git a/package.bak/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch b/package.bak/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch deleted file mode 100644 index 54a0b87ada..0000000000 --- a/package.bak/python3/0016-Add-importlib-fix-for-PEP-3147-issue.patch +++ /dev/null @@ -1,96 +0,0 @@ -From d2b5be9a0627e38d2280ef865dab3e74b7d2bde4 Mon Sep 17 00:00:00 2001 -From: Christophe Vu-Brugier -Date: Wed, 23 Dec 2015 11:46:14 +0100 -Subject: [PATCH] Add importlib fix for PEP 3147 issue - -Python 3 has a new standard for installing .pyc file, called PEP -3147. Unfortunately, this standard requires both the .py and .pyc -files to be installed for a Python module to be found. This is quite -annoying on space-constrained embedded systems, since the .py file is -technically not required for execution. - -This patch changes cache_from_source() and source_from_cache() in -importlib to get rid of the "__pycache__" directory. -This effectively disables PEP 3147 for: - -* The python standard library -* Packages built with distutils or setuptools -* Packages built with automake that use the `py-compile` helper - -Signed-off-by: Christophe Vu-Brugier ---- - Lib/importlib/_bootstrap_external.py | 37 +++++------------------------------- - 1 file changed, 5 insertions(+), 32 deletions(-) - -diff --git a/Lib/importlib/_bootstrap_external.py b/Lib/importlib/_bootstrap_external.py -index 616b17f..e30129c 100644 ---- a/Lib/importlib/_bootstrap_external.py -+++ b/Lib/importlib/_bootstrap_external.py -@@ -255,8 +255,6 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - a True value is the same as setting 'optimization' to the empty string - while a False value is equivalent to setting 'optimization' to '1'. - -- If sys.implementation.cache_tag is None then NotImplementedError is raised. -- - """ - if debug_override is not None: - _warnings.warn('the debug_override parameter is deprecated; use ' -@@ -267,10 +265,7 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - optimization = '' if debug_override else 1 - head, tail = _path_split(path) - base, sep, rest = tail.rpartition('.') -- tag = sys.implementation.cache_tag -- if tag is None: -- raise NotImplementedError('sys.implementation.cache_tag is None') -- almost_filename = ''.join([(base if base else rest), sep, tag]) -+ almost_filename = ''.join([(base if base else rest)]) - if optimization is None: - if sys.flags.optimize == 0: - optimization = '' -@@ -281,39 +276,17 @@ def cache_from_source(path, debug_override=None, *, optimization=None): - if not optimization.isalnum(): - raise ValueError('{!r} is not alphanumeric'.format(optimization)) - almost_filename = '{}.{}{}'.format(almost_filename, _OPT, optimization) -- return _path_join(head, _PYCACHE, almost_filename + BYTECODE_SUFFIXES[0]) -+ return _path_join(head, almost_filename + BYTECODE_SUFFIXES[0]) - - - def source_from_cache(path): - """Given the path to a .pyc. file, return the path to its .py file. - - The .pyc file does not need to exist; this simply returns the path to -- the .py file calculated to correspond to the .pyc file. If path does -- not conform to PEP 3147/488 format, ValueError will be raised. If -- sys.implementation.cache_tag is None then NotImplementedError is raised. -- -+ the .py file calculated to correspond to the .pyc file. - """ -- if sys.implementation.cache_tag is None: -- raise NotImplementedError('sys.implementation.cache_tag is None') -- head, pycache_filename = _path_split(path) -- head, pycache = _path_split(head) -- if pycache != _PYCACHE: -- raise ValueError('{} not bottom-level directory in ' -- '{!r}'.format(_PYCACHE, path)) -- dot_count = pycache_filename.count('.') -- if dot_count not in {2, 3}: -- raise ValueError('expected only 2 or 3 dots in ' -- '{!r}'.format(pycache_filename)) -- elif dot_count == 3: -- optimization = pycache_filename.rsplit('.', 2)[-2] -- if not optimization.startswith(_OPT): -- raise ValueError("optimization portion of filename does not start " -- "with {!r}".format(_OPT)) -- opt_level = optimization[len(_OPT):] -- if not opt_level.isalnum(): -- raise ValueError("optimization level {!r} is not an alphanumeric " -- "value".format(optimization)) -- base_filename = pycache_filename.partition('.')[0] -+ head, filename = _path_split(path) -+ base_filename = filename.partition('.')[0] - return _path_join(head, base_filename + SOURCE_SUFFIXES[0]) - - --- -2.6.4 - diff --git a/package.bak/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch b/package.bak/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch deleted file mode 100644 index ee0134a5d6..0000000000 --- a/package.bak/python3/0017-Add-an-option-to-disable-installation-of-test-module.patch +++ /dev/null @@ -1,113 +0,0 @@ -From 1d2891204c6bf05d5e2eb0e5fa2ee78f6a2b755b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:47:00 +0100 -Subject: [PATCH] Add an option to disable installation of test modules - -The Python standard distribution comes with many test modules, that -are not necessarly useful on embedded targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 56 ++++++++++++++++++++++++++++++++++++-------------------- - configure.ac | 6 ++++++ - 2 files changed, 42 insertions(+), 20 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 9420860..d4c771a 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1166,8 +1166,30 @@ maninstall: altmaninstall - PLATDIR= @PLATDIR@ - MACHDEPS= $(PLATDIR) - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax --LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ -- tkinter/test/test_ttk site-packages test \ -+LIBSUBDIRS= tkinter \ -+ site-packages \ -+ asyncio \ -+ collections concurrent concurrent/futures encodings \ -+ email email/mime \ -+ ensurepip ensurepip/_bundled \ -+ html json http dbm xmlrpc \ -+ sqlite3 \ -+ logging csv wsgiref urllib \ -+ lib2to3 lib2to3/fixes lib2to3/pgen2 \ -+ ctypes ctypes/macholib \ -+ idlelib idlelib/Icons \ -+ distutils distutils/command $(XMLLIBSUBDIRS) \ -+ importlib \ -+ turtledemo \ -+ multiprocessing multiprocessing/dummy \ -+ unittest \ -+ venv venv/scripts venv/scripts/posix \ -+ curses pydoc_data $(MACHDEPS) -+ -+TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ -+ test test/test_asyncio \ -+ test/test_email test/test_email/data \ -+ test/test_json \ - test/audiodata \ - test/capath test/data \ - test/cjkencodings test/decimaltestdata test/xmltestdata \ -@@ -1199,28 +1221,22 @@ LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ - test/test_importlib/namespace_pkgs/project3/parent/child \ - test/test_importlib/namespace_pkgs/module_and_namespace_package \ - test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \ -- asyncio \ -- test/test_asyncio \ -- collections concurrent concurrent/futures encodings \ -- email email/mime test/test_email test/test_email/data \ -- ensurepip ensurepip/_bundled \ -- html json test/test_json http dbm xmlrpc \ -- sqlite3 sqlite3/test \ -- logging csv wsgiref urllib \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ -+ sqlite3/test \ -+ lib2to3/tests \ - lib2to3/tests/data lib2to3/tests/data/fixers \ - lib2to3/tests/data/fixers/myfixes \ -- ctypes ctypes/test ctypes/macholib \ -- idlelib idlelib/Icons idlelib/idle_test \ -- distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ -- importlib test/test_importlib test/test_importlib/builtin \ -+ ctypes/test \ -+ idlelib/idle_test \ -+ distutils/tests \ -+ test/test_importlib test/test_importlib/builtin \ - test/test_importlib/extension test/test_importlib/frozen \ - test/test_importlib/import_ test/test_importlib/source \ -- turtledemo \ -- multiprocessing multiprocessing/dummy \ -- unittest unittest/test unittest/test/testmock \ -- venv venv/scripts venv/scripts/posix \ -- curses pydoc_data $(MACHDEPS) -+ unittest/test unittest/test/testmock -+ -+ifeq (@TEST_MODULES@,yes) -+LIBSUBDIRS += $(TESTSUBDIRS) -+endif -+ - libinstall: build_all $(srcdir)/Lib/$(PLATDIR) $(srcdir)/Modules/xxmodule.c - @for i in $(SCRIPTDIR) $(LIBDEST); \ - do \ -diff --git a/configure.ac b/configure.ac -index bfb599e..9f3d226 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2895,6 +2895,12 @@ if test "$posix_threads" = "yes"; then - fi - - -+AC_SUBST(TEST_MODULES) -+ -+AC_ARG_ENABLE(test-modules, -+ AS_HELP_STRING([--disable-test-modules], [disable test modules]), -+ [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) --- -2.6.4 - diff --git a/package.bak/python3/0018-Add-an-option-to-disable-pydoc.patch b/package.bak/python3/0018-Add-an-option-to-disable-pydoc.patch deleted file mode 100644 index 670ad40c5e..0000000000 --- a/package.bak/python3/0018-Add-an-option-to-disable-pydoc.patch +++ /dev/null @@ -1,96 +0,0 @@ -From a83b79b964700604de386800f86e5a55f53a0e17 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:47:11 +0100 -Subject: [PATCH] Add an option to disable pydoc - -It removes 0.5 MB of data from the target plus the pydoc script -itself. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 8 +++++++- - configure.ac | 5 +++++ - setup.py | 9 +++++++-- - 3 files changed, 19 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index d4c771a..a98ad65 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1134,7 +1134,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(BINDIR)/idle3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 -+ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) - -rm -f $(DESTDIR)$(BINDIR)/pyvenv -@@ -1184,7 +1186,7 @@ LIBSUBDIRS= tkinter \ - multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/posix \ -- curses pydoc_data $(MACHDEPS) -+ curses $(MACHDEPS) - - TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ - test test/test_asyncio \ -@@ -1233,6 +1235,10 @@ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ - test/test_importlib/import_ test/test_importlib/source \ - unittest/test unittest/test/testmock - -+ifeq (@PYDOC@,yes) -+LIBSUBDIRS += pydoc_data -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index 9f3d226..e9b6d6f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2894,6 +2894,11 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(PYDOC) -+ -+AC_ARG_ENABLE(pydoc, -+ AS_HELP_STRING([--disable-pydoc], [disable pydoc]), -+ [ PYDOC="${enableval}" ], [ PYDOC=yes ]) - - AC_SUBST(TEST_MODULES) - -diff --git a/setup.py b/setup.py -index 3feca04..137911d 100644 ---- a/setup.py -+++ b/setup.py -@@ -2220,6 +2220,12 @@ def main(): - # turn off warnings when deprecated modules are imported - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) -+ -+ scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -+ 'Lib/smtpd.py'] -+ if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/pydoc3' ] -+ - setup(# PyPI Metadata (PEP 301) - name = "Python", - version = sys.version.split()[0], -@@ -2244,8 +2250,7 @@ def main(): - # If you change the scripts installed here, you also need to - # check the PyBuildScripts command above, and change the links - # created by the bininstall target in Makefile.pre.in -- scripts = ["Tools/scripts/pydoc3", "Tools/scripts/idle3", -- "Tools/scripts/2to3", "Tools/scripts/pyvenv"] -+ scripts = scripts, - ) - - # --install-platlib --- -2.6.4 - diff --git a/package.bak/python3/0019-Add-an-option-to-disable-lib2to3.patch b/package.bak/python3/0019-Add-an-option-to-disable-lib2to3.patch deleted file mode 100644 index f0d4770135..0000000000 --- a/package.bak/python3/0019-Add-an-option-to-disable-lib2to3.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 3c877ea9f09913586f87064b7a2b9d2b49cb05aa Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:48:44 +0100 -Subject: [PATCH] Add an option to disable lib2to3 - -lib2to3 is a library to convert Python 2.x code to Python 3.x. As -such, it is probably not very useful on embedded system targets. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 16 ++++++++++++---- - configure.ac | 6 ++++++ - setup.py | 5 +++-- - 3 files changed, 21 insertions(+), 6 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index a98ad65..3823940 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1138,7 +1138,9 @@ ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) - endif - -rm -f $(DESTDIR)$(BINDIR)/2to3 -+ifeq (@LIB2TO3@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/pyvenv - (cd $(DESTDIR)$(BINDIR); $(LN) -s pyvenv-$(VERSION) pyvenv) - if test "x$(LIPO_32BIT_FLAGS)" != "x" ; then \ -@@ -1177,7 +1179,6 @@ LIBSUBDIRS= tkinter \ - html json http dbm xmlrpc \ - sqlite3 \ - logging csv wsgiref urllib \ -- lib2to3 lib2to3/fixes lib2to3/pgen2 \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ - distutils distutils/command $(XMLLIBSUBDIRS) \ -@@ -1224,9 +1225,6 @@ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ - test/test_importlib/namespace_pkgs/module_and_namespace_package \ - test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \ - sqlite3/test \ -- lib2to3/tests \ -- lib2to3/tests/data lib2to3/tests/data/fixers \ -- lib2to3/tests/data/fixers/myfixes \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1239,6 +1237,14 @@ ifeq (@PYDOC@,yes) - LIBSUBDIRS += pydoc_data - endif - -+ifeq (@LIB2TO3@,yes) -+LIBSUBDIRS += lib2to3 lib2to3/fixes lib2to3/pgen2 -+TESTSUBDIRS += lib2to3/tests \ -+ lib2to3/tests/data \ -+ lib2to3/tests/data/fixers \ -+ lib2to3/tests/data/fixers/myfixes -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -@@ -1337,10 +1343,12 @@ ifeq (@PYC_BUILD@,yes) - -d $(LIBDEST)/site-packages -f \ - -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages - endif -+ifeq (@LIB2TO3@,yes) - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/Grammar.txt - -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - $(PYTHON_FOR_BUILD) -m lib2to3.pgen2.driver $(DESTDIR)$(LIBDEST)/lib2to3/PatternGrammar.txt -+endif - - # Create the PLATDIR source directory, if one wasn't distributed.. - $(srcdir)/Lib/$(PLATDIR): -diff --git a/configure.ac b/configure.ac -index e9b6d6f..652ad88 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2906,6 +2906,12 @@ AC_ARG_ENABLE(test-modules, - AS_HELP_STRING([--disable-test-modules], [disable test modules]), - [ TEST_MODULES="${enableval}" ], [ TEST_MODULES=yes ]) - -+AC_SUBST(LIB2TO3) -+ -+AC_ARG_ENABLE(lib2to3, -+ AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), -+ [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) -diff --git a/setup.py b/setup.py -index 137911d..722308b 100644 ---- a/setup.py -+++ b/setup.py -@@ -2221,10 +2221,11 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3', 'Tools/scripts/2to3', -- 'Lib/smtpd.py'] -+ scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] -+ if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/2to3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", --- -2.6.4 - diff --git a/package.bak/python3/0020-Add-option-to-disable-the-sqlite3-module.patch b/package.bak/python3/0020-Add-option-to-disable-the-sqlite3-module.patch deleted file mode 100644 index 20936841c4..0000000000 --- a/package.bak/python3/0020-Add-option-to-disable-the-sqlite3-module.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 9ae1dce0a2fa01fc3dbc83d8b8c1b56e4b1b162b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:01 +0100 -Subject: [PATCH] Add option to disable the sqlite3 module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 7 +++++-- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 3823940..c822dbd 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1177,7 +1177,6 @@ LIBSUBDIRS= tkinter \ - email email/mime \ - ensurepip ensurepip/_bundled \ - html json http dbm xmlrpc \ -- sqlite3 \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -@@ -1224,7 +1223,6 @@ TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ - test/test_importlib/namespace_pkgs/project3/parent/child \ - test/test_importlib/namespace_pkgs/module_and_namespace_package \ - test/test_importlib/namespace_pkgs/module_and_namespace_package/a_test \ -- sqlite3/test \ - ctypes/test \ - idlelib/idle_test \ - distutils/tests \ -@@ -1245,6 +1243,11 @@ TESTSUBDIRS += lib2to3/tests \ - lib2to3/tests/data/fixers/myfixes - endif - -+ifeq (@SQLITE3@,yes) -+LIBSUBDIRS += sqlite3 -+TESTSUBDIRS += sqlite3/test -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index 652ad88..cae12ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2894,6 +2894,15 @@ if test "$posix_threads" = "yes"; then - AC_CHECK_FUNCS(pthread_atfork) - fi - -+AC_SUBST(SQLITE3) -+AC_ARG_ENABLE(sqlite3, -+ AS_HELP_STRING([--disable-sqlite3], [disable sqlite3]), -+ [ SQLITE3="${enableval}" ], [ SQLITE3=yes ]) -+ -+if test "$SQLITE3" = "no" ; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.6.4 - diff --git a/package.bak/python3/0021-Add-an-option-to-disable-the-tk-module.patch b/package.bak/python3/0021-Add-an-option-to-disable-the-tk-module.patch deleted file mode 100644 index 7dfb339ea4..0000000000 --- a/package.bak/python3/0021-Add-an-option-to-disable-the-tk-module.patch +++ /dev/null @@ -1,71 +0,0 @@ -From d0d42570e5a23c3bf559e0413ec97729fd2f9e24 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:14 +0100 -Subject: [PATCH] Add an option to disable the tk module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 11 ++++++++--- - configure.ac | 9 +++++++++ - 2 files changed, 17 insertions(+), 3 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index c822dbd..0a93c27 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1170,7 +1170,7 @@ maninstall: altmaninstall - PLATDIR= @PLATDIR@ - MACHDEPS= $(PLATDIR) - XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax --LIBSUBDIRS= tkinter \ -+LIBSUBDIRS= \ - site-packages \ - asyncio \ - collections concurrent concurrent/futures encodings \ -@@ -1188,8 +1188,7 @@ LIBSUBDIRS= tkinter \ - venv venv/scripts venv/scripts/posix \ - curses $(MACHDEPS) - --TESTSUBDIRS = tkinter/test tkinter/test/test_tkinter tkinter/test/test_ttk \ -- test test/test_asyncio \ -+TESTSUBDIRS = test test/test_asyncio \ - test/test_email test/test_email/data \ - test/test_json \ - test/audiodata \ -@@ -1248,6 +1247,12 @@ LIBSUBDIRS += sqlite3 - TESTSUBDIRS += sqlite3/test - endif - -+ifeq (@TK@,yes) -+LIBSUBDIRS += tkinter -+TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ -+ tkinter/test/test_ttk -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index cae12ad..787b185 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2903,6 +2903,15 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_SUBST(TK) -+AC_ARG_ENABLE(tk, -+ AS_HELP_STRING([--disable-tk], [disable tk]), -+ [ TK="${enableval}" ], [ TK=yes ]) -+ -+if test "$TK" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.6.4 - diff --git a/package.bak/python3/0022-Add-an-option-to-disable-the-curses-module.patch b/package.bak/python3/0022-Add-an-option-to-disable-the-curses-module.patch deleted file mode 100644 index 22f7a24945..0000000000 --- a/package.bak/python3/0022-Add-an-option-to-disable-the-curses-module.patch +++ /dev/null @@ -1,59 +0,0 @@ -From d04ec780bf7c0825ab260bd1d6b7292141b2dcde Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:30 +0100 -Subject: [PATCH] Add an option to disable the curses module - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 6 +++++- - configure.ac | 9 +++++++++ - 2 files changed, 14 insertions(+), 1 deletion(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 0a93c27..b97c21e 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1186,7 +1186,7 @@ LIBSUBDIRS= \ - multiprocessing multiprocessing/dummy \ - unittest \ - venv venv/scripts venv/scripts/posix \ -- curses $(MACHDEPS) -+ $(MACHDEPS) - - TESTSUBDIRS = test test/test_asyncio \ - test/test_email test/test_email/data \ -@@ -1253,6 +1253,10 @@ TESTSUBDIRS += tkinter/test tkinter/test/test_tkinter \ - tkinter/test/test_ttk - endif - -+ifeq (@CURSES@,yes) -+LIBSUBDIRS += curses -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index 787b185..0be47b2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2912,6 +2912,15 @@ if test "$TK" = "no"; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _tkinter" - fi - -+AC_SUBST(CURSES) -+AC_ARG_ENABLE(curses, -+ AS_HELP_STRING([--disable-curses], [disable curses]), -+ [ CURSES="${enableval}" ], [ CURSES=yes ]) -+ -+if test "$CURSES" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _curses _curses_panel" -+fi -+ - AC_SUBST(PYDOC) - - AC_ARG_ENABLE(pydoc, --- -2.6.4 - diff --git a/package.bak/python3/0023-Add-an-option-to-disable-expat.patch b/package.bak/python3/0023-Add-an-option-to-disable-expat.patch deleted file mode 100644 index 73f9b36bd0..0000000000 --- a/package.bak/python3/0023-Add-an-option-to-disable-expat.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 6281850ee8c3fb6d93b4997833af0cca4a48947b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:42 +0100 -Subject: [PATCH] Add an option to disable expat - -This patch replaces the existing --with-system-expat option with a ---with-expat={system,builtin,none} option, which allows to tell Python -whether we want to use the system expat (already installed), the expat -builtin the Python sources, or no expat at all (which disables the -installation of XML modules). - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Samuel Martin ---- - Makefile.pre.in | 6 +++++- - configure.ac | 18 +++++++++++++----- - setup.py | 2 +- - 3 files changed, 19 insertions(+), 7 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index b97c21e..bdfee19 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1180,7 +1180,7 @@ LIBSUBDIRS= \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ - idlelib idlelib/Icons \ -- distutils distutils/command $(XMLLIBSUBDIRS) \ -+ distutils distutils/command \ - importlib \ - turtledemo \ - multiprocessing multiprocessing/dummy \ -@@ -1257,6 +1257,10 @@ ifeq (@CURSES@,yes) - LIBSUBDIRS += curses - endif - -+ifeq (@EXPAT@,yes) -+LIBSUBDIRS += $(XMLLIBSUBDIRS) -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index 0be47b2..e6bcacc 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2591,13 +2591,21 @@ PKG_PROG_PKG_CONFIG - AC_SUBST(DISABLED_EXTENSIONS) - - # Check for use of the system expat library --AC_MSG_CHECKING(for --with-system-expat) --AC_ARG_WITH(system_expat, -- AS_HELP_STRING([--with-system-expat], [build pyexpat module using an installed expat library]), -+AC_MSG_CHECKING(for --with-expat) -+AC_ARG_WITH(expat, -+ AS_HELP_STRING([--with-expat], [select which expat version to use: system, builtin, none]), - [], -- [with_system_expat="no"]) -+ [with_expat="builtin"]) - --AC_MSG_RESULT($with_system_expat) -+AC_MSG_RESULT($with_expat) -+ -+if test "$with_expat" != "none"; then -+ EXPAT=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} pyexpat" -+ EXPAT=no -+fi -+AC_SUBST(EXPAT) - - # Check for use of the system libffi library - AC_MSG_CHECKING(for --with-system-ffi) -diff --git a/setup.py b/setup.py -index 722308b..ecddb6a 100644 ---- a/setup.py -+++ b/setup.py -@@ -1434,7 +1434,7 @@ class PyBuildExt(build_ext): - # - # More information on Expat can be found at www.libexpat.org. - # -- if '--with-system-expat' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-expat=system' in sysconfig.get_config_var("CONFIG_ARGS"): - expat_inc = [] - define_macros = [] - expat_lib = ['expat'] --- -2.6.4 - diff --git a/package.bak/python3/0024-Add-an-option-to-disable-CJK-codecs.patch b/package.bak/python3/0024-Add-an-option-to-disable-CJK-codecs.patch deleted file mode 100644 index d3af94fb29..0000000000 --- a/package.bak/python3/0024-Add-an-option-to-disable-CJK-codecs.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 18265d05ee97ad0c43995acdadce2458b57d7d64 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:49:55 +0100 -Subject: [PATCH] Add an option to disable CJK codecs - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index e6bcacc..38b7515 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2911,6 +2911,12 @@ if test "$SQLITE3" = "no" ; then - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _sqlite3" - fi - -+AC_ARG_ENABLE(codecs-cjk, -+ AS_HELP_STRING([--disable-codecs-cjk], [disable CJK codecs]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.6.4 - diff --git a/package.bak/python3/0025-Add-an-option-to-disable-NIS.patch b/package.bak/python3/0025-Add-an-option-to-disable-NIS.patch deleted file mode 100644 index ef9ff42715..0000000000 --- a/package.bak/python3/0025-Add-an-option-to-disable-NIS.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 733ee65f308ec48be427463c06f372ca116ccada Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:11 +0100 -Subject: [PATCH] Add an option to disable NIS - -NIS is not necessarily available in uClibc, so we need an option to -not compile support for it. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 38b7515..f25733a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2917,6 +2917,12 @@ AC_ARG_ENABLE(codecs-cjk, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _codecs_kr _codecs_jp _codecs_cn _codecs_tw _codecs_hk _codecs_iso2022" - fi]) - -+AC_ARG_ENABLE(nis, -+ AS_HELP_STRING([--disable-nis], [disable NIS]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.6.4 - diff --git a/package.bak/python3/0026-Add-an-option-to-disable-unicodedata.patch b/package.bak/python3/0026-Add-an-option-to-disable-unicodedata.patch deleted file mode 100644 index 56a5178952..0000000000 --- a/package.bak/python3/0026-Add-an-option-to-disable-unicodedata.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 64fa1fc3a9aea7ffba7b96d08a14df91051f2b6f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:50:27 +0100 -Subject: [PATCH] Add an option to disable unicodedata - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f25733a..a7ddb2b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2923,6 +2923,12 @@ AC_ARG_ENABLE(nis, - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} nis" - fi]) - -+AC_ARG_ENABLE(unicodedata, -+ AS_HELP_STRING([--disable-unicodedata], [disable unicodedata]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), --- -2.6.4 - diff --git a/package.bak/python3/0027-Add-an-option-to-disable-IDLE.patch b/package.bak/python3/0027-Add-an-option-to-disable-IDLE.patch deleted file mode 100644 index 73fc3959b3..0000000000 --- a/package.bak/python3/0027-Add-an-option-to-disable-IDLE.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 2766bcdd8f9b7395ce32a6d8480ef0a2186f2098 Mon Sep 17 00:00:00 2001 -From: Maxime Ripard -Date: Wed, 23 Dec 2015 11:50:42 +0100 -Subject: [PATCH] Add an option to disable IDLE - -IDLE is an IDE embedded into python, written using Tk, so it doesn't make -much sense to have it into our build. - -Signed-off-by: Maxime Ripard ---- - Makefile.pre.in | 7 ++++++- - configure.ac | 6 ++++++ - setup.py | 4 +++- - 3 files changed, 15 insertions(+), 2 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index bdfee19..2466615 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -1132,7 +1132,9 @@ bininstall: altbininstall - -rm -f $(DESTDIR)$(LIBPC)/python3.pc - (cd $(DESTDIR)$(LIBPC); $(LN) -s python-$(VERSION).pc python3.pc) - -rm -f $(DESTDIR)$(BINDIR)/idle3 -+ifeq (@IDLE@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s idle$(VERSION) idle3) -+endif - -rm -f $(DESTDIR)$(BINDIR)/pydoc3 - ifeq (@PYDOC@,yes) - (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -@@ -1179,7 +1181,6 @@ LIBSUBDIRS= \ - html json http dbm xmlrpc \ - logging csv wsgiref urllib \ - ctypes ctypes/macholib \ -- idlelib idlelib/Icons \ - distutils distutils/command \ - importlib \ - turtledemo \ -@@ -1261,6 +1262,10 @@ ifeq (@EXPAT@,yes) - LIBSUBDIRS += $(XMLLIBSUBDIRS) - endif - -+ifeq (@IDLE@,yes) -+LIBSUBDIRS += idlelib idlelib/Icons -+endif -+ - ifeq (@TEST_MODULES@,yes) - LIBSUBDIRS += $(TESTSUBDIRS) - endif -diff --git a/configure.ac b/configure.ac -index a7ddb2b..6b59792 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2965,6 +2965,12 @@ AC_ARG_ENABLE(lib2to3, - AS_HELP_STRING([--disable-lib2to3], [disable lib2to3]), - [ LIB2TO3="${enableval}" ], [ LIB2TO3=yes ]) - -+AC_SUBST(IDLE) -+ -+AC_ARG_ENABLE(idle3, -+ AS_HELP_STRING([--disable-idle3], [disable idle3 IDE]), -+ [ IDLE="${enableval}" ], [ IDLE=yes ]) -+ - # Check for enable-ipv6 - AH_TEMPLATE(ENABLE_IPV6, [Define if --enable-ipv6 is specified]) - AC_MSG_CHECKING([if --enable-ipv6 is specified]) -diff --git a/setup.py b/setup.py -index ecddb6a..7fe68e8 100644 ---- a/setup.py -+++ b/setup.py -@@ -2221,11 +2221,13 @@ def main(): - import warnings - warnings.filterwarnings("ignore",category=DeprecationWarning) - -- scripts = ['Tools/scripts/idle3', 'Lib/smtpd.py'] -+ scripts = ['Lib/smtpd.py'] - if not '--disable-pydoc' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/pydoc3' ] - if not '--disable-lib2to3' in sysconfig.get_config_var("CONFIG_ARGS"): - scripts += [ 'Tools/scripts/2to3' ] -+ if not '--disable-idle3' in sysconfig.get_config_var("CONFIG_ARGS"): -+ scripts += [ 'Tools/scripts/idle3' ] - - setup(# PyPI Metadata (PEP 301) - name = "Python", --- -2.6.4 - diff --git a/package.bak/python3/0028-Add-an-option-to-disable-decimal.patch b/package.bak/python3/0028-Add-an-option-to-disable-decimal.patch deleted file mode 100644 index 1ac91dd611..0000000000 --- a/package.bak/python3/0028-Add-an-option-to-disable-decimal.patch +++ /dev/null @@ -1,62 +0,0 @@ -From ff77defc777a57d4caee5183796fd44dd265e78b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:31 +0100 -Subject: [PATCH] Add an option to disable decimal - -This patch replaces the existing --with-system-libmpdec option with a ---with-libmpdec={system,builtin,none} option, which allows to tell -Python whether we want to use the system libmpdec (already installed), -the libmpdec builtin the Python sources, or no libmpdec at all. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 17 ++++++++++++----- - setup.py | 2 +- - 2 files changed, 13 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6b59792..51e1760 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2624,13 +2624,20 @@ AC_SUBST(LIBFFI_INCLUDEDIR) - AC_MSG_RESULT($with_system_ffi) - - # Check for use of the system libmpdec library --AC_MSG_CHECKING(for --with-system-libmpdec) --AC_ARG_WITH(system_libmpdec, -- AS_HELP_STRING([--with-system-libmpdec], [build _decimal module using an installed libmpdec library]), -+AC_MSG_CHECKING(for --with-libmpdec) -+AC_ARG_WITH(libmpdec, -+ AS_HELP_STRING([--with-libmpdec], [select which libmpdec version to use: system, builtin, none]), - [], -- [with_system_libmpdec="no"]) -+ [with_libmpdec="builtin"]) - --AC_MSG_RESULT($with_system_libmpdec) -+AC_MSG_RESULT($with_libmpdec) -+if test "$with_libmpdec" != "none"; then -+ MPDEC=yes -+else -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} _decimal" -+ MPDEC=no -+fi -+AC_SUBST(MPDEC) - - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) -diff --git a/setup.py b/setup.py -index 7fe68e8..364b350 100644 ---- a/setup.py -+++ b/setup.py -@@ -1988,7 +1988,7 @@ class PyBuildExt(build_ext): - def _decimal_ext(self): - extra_compile_args = [] - undef_macros = [] -- if '--with-system-libmpdec' in sysconfig.get_config_var("CONFIG_ARGS"): -+ if '--with-libmpdec=system' in sysconfig.get_config_var("CONFIG_ARGS"): - include_dirs = [] - libraries = [':libmpdec.so.2'] - sources = ['_decimal/_decimal.c'] --- -2.6.4 - diff --git a/package.bak/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch b/package.bak/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch deleted file mode 100644 index 9ac9173dcf..0000000000 --- a/package.bak/python3/0029-Add-an-option-to-disable-the-ossaudiodev-module.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 789b0f99d7c1d25bfa9c05fd12f4d55bb70f377b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 11:51:58 +0100 -Subject: [PATCH] Add an option to disable the ossaudiodev module - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 51e1760..c4c2353 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2639,6 +2639,12 @@ else - fi - AC_SUBST(MPDEC) - -+AC_ARG_ENABLE(ossaudiodev, -+ AS_HELP_STRING([--disable-ossaudiodev], [disable OSSAUDIODEV]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ossaudiodev" -+ fi]) -+ - # Check for support for loadable sqlite extensions - AC_MSG_CHECKING(for --enable-loadable-sqlite-extensions) - AC_ARG_ENABLE(loadable-sqlite-extensions, --- -2.6.4 - diff --git a/package.bak/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch b/package.bak/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch deleted file mode 100644 index 156eb2958d..0000000000 --- a/package.bak/python3/0030-Support-PGEN_FOR_BUILD-and-FREEZE_IMPORTLIB_FOR_BUIL.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 4f851142b8f3149d23654117621285df34ec768b Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 23 Dec 2015 13:58:00 +0100 -Subject: [PATCH] Support PGEN_FOR_BUILD and FREEZE_IMPORTLIB_FOR_BUILD - -Signed-off-by: Thomas Petazzoni ---- - Makefile.pre.in | 10 ++++++++++ - configure.ac | 3 +++ - 2 files changed, 13 insertions(+) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 2466615..fdf622d 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -712,10 +712,15 @@ Programs/_testembed: Programs/_testembed.o $(LIBRARY) $(LDLIBRARY) $(PY3LIBRARY) - ############################################################################ - # Importlib - -+ifeq (@FREEZE_IMPORTLIB_FOR_BUILD@,) - Programs/_freeze_importlib.o: Programs/_freeze_importlib.c Makefile - - Programs/_freeze_importlib: Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) - $(LINKCC) $(PY_LDFLAGS) -o $@ Programs/_freeze_importlib.o $(LIBRARY_OBJS_OMIT_FROZEN) $(LIBS) $(MODLIBS) $(SYSLIBS) $(LDLAST) -+else -+Programs/_freeze_importlib: @FREEZE_IMPORTLIB_FOR_BUILD@ -+ cp $^ $@ -+endif - - Python/importlib_external.h: $(srcdir)/Lib/importlib/_bootstrap_external.py Programs/_freeze_importlib - ./Programs/_freeze_importlib \ -@@ -789,8 +794,13 @@ $(GRAMMAR_H): $(GRAMMAR_INPUT) $(PGEN) - $(GRAMMAR_C): $(GRAMMAR_H) - touch $(GRAMMAR_C) - -+ifeq (@PGEN_FOR_BUILD@,) - $(PGEN): $(PGENOBJS) - $(CC) $(OPT) $(PY_LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) -+else -+$(PGEN): @PGEN_FOR_BUILD@ -+ cp $^ $@ -+endif - - Parser/grammar.o: $(srcdir)/Parser/grammar.c \ - $(srcdir)/Include/token.h \ -diff --git a/configure.ac b/configure.ac -index c4c2353..750c232 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -79,6 +79,9 @@ else - fi - AC_SUBST(PYTHON_FOR_BUILD) - -+AC_SUBST(PGEN_FOR_BUILD) -+AC_SUBST(FREEZE_IMPORTLIB_FOR_BUILD) -+ - dnl Ensure that if prefix is specified, it does not end in a slash. If - dnl it does, we get path names containing '//' which is both ugly and - dnl can cause trouble. --- -2.6.4 - diff --git a/package.bak/python3/0031-Add-an-option-to-disable-openssl.patch b/package.bak/python3/0031-Add-an-option-to-disable-openssl.patch deleted file mode 100644 index d4375203b4..0000000000 --- a/package.bak/python3/0031-Add-an-option-to-disable-openssl.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Nicolas Cavallari -Subject: [PATCH] Add an option to disable openssl support. - -Signed-off-by: Nicolas Cavallari ---- - configure.ac | 6 ++++++ - 1 file changed, 6 insertions(+) - ---- a/configure.ac -+++ b/configure.ac -@@ -3027,6 +3027,12 @@ - DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} unicodedata" - fi]) - -+AC_ARG_ENABLE(openssl, -+ AS_HELP_STRING([--disable-openssl], [disable openssl support]), -+ [ if test "$enableval" = "no"; then -+ DISABLED_EXTENSIONS="${DISABLED_EXTENSIONS} ssl _ssl _hashlib" -+ fi]) -+ - AC_SUBST(TK) - AC_ARG_ENABLE(tk, - AS_HELP_STRING([--disable-tk], [disable tk]), diff --git a/package.bak/python3/Config.in b/package.bak/python3/Config.in deleted file mode 100644 index 35f57e65ce..0000000000 --- a/package.bak/python3/Config.in +++ /dev/null @@ -1,115 +0,0 @@ -comment "python3 needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_PYTHON3 - bool "python3" - depends on !BR2_PACKAGE_PYTHON - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS # libffi - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -if BR2_PACKAGE_PYTHON3 - -choice - prompt "python3 module format to install" - default BR2_PACKAGE_PYTHON3_PYC_ONLY - help - Select Python module format to install on target (py, pyc or both) - -config BR2_PACKAGE_PYTHON3_PY_ONLY - bool ".py sources only" - -config BR2_PACKAGE_PYTHON3_PYC_ONLY - bool ".pyc compiled sources only" - -config BR2_PACKAGE_PYTHON3_PY_PYC - bool ".py sources and .pyc compiled" - -endchoice - -menu "core python3 modules" - -comment "The following modules are unusual or require extra libraries" - -config BR2_PACKAGE_PYTHON3_BZIP2 - bool "bz2 module" - select BR2_PACKAGE_BZIP2 - help - bzip2 module for Python3 - -config BR2_PACKAGE_PYTHON3_CODECSCJK - bool "codecscjk module" - help - Chinese/Japanese/Korean codecs module for Python (large). - -config BR2_PACKAGE_PYTHON3_CURSES - bool "curses module" - select BR2_PACKAGE_NCURSES - help - curses module for Python3. - -config BR2_PACKAGE_PYTHON3_DECIMAL - bool "decimal module" - select BR2_PACKAGE_MPDECIMAL - help - decimal module for Python3. - -config BR2_PACKAGE_PYTHON3_OSSAUDIODEV - bool "ossaudiodev module" - help - ossaudiodev module for Python3. - -config BR2_PACKAGE_PYTHON3_READLINE - bool "readline" - select BR2_PACKAGE_READLINE - help - readline module for Python3 (required for command-line - editing in the Python shell). - -config BR2_PACKAGE_PYTHON3_SSL - bool "ssl" - select BR2_PACKAGE_OPENSSL - help - _ssl module for Python3 (required for https in urllib etc). - -config BR2_PACKAGE_PYTHON3_UNICODEDATA - bool "unicodedata module" - default y - help - Unicode character database (used by stringprep module) (large). - -config BR2_PACKAGE_PYTHON3_SQLITE - bool "sqlite module" - select BR2_PACKAGE_SQLITE - help - SQLite database support - -config BR2_PACKAGE_PYTHON3_PYEXPAT - bool "xml module" - select BR2_PACKAGE_EXPAT - help - pyexpat and xml libraries for Python3. - -config BR2_PACKAGE_PYTHON3_XZ - bool "xz module" - select BR2_PACKAGE_XZ - help - xz (a.k.a lzma) module for Python3 - -config BR2_PACKAGE_PYTHON3_ZLIB - bool "zlib module" - select BR2_PACKAGE_ZLIB - help - zlib support in Python3 - -endmenu - -endif diff --git a/package.bak/python3/python3.hash b/package.bak/python3/python3.hash deleted file mode 100644 index f6f70a206c..0000000000 --- a/package.bak/python3/python3.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.python.org/downloads/release/python-352/ -md5 8906efbacfcdc7c3c9198aeefafd159e Python-3.5.2.tar.xz -# Locally computed -sha256 0010f56100b9b74259ebcd5d4b295a32324b58b517403a10d1a2aa7cb22bca40 Python-3.5.2.tar.xz diff --git a/package.bak/python3/python3.mk b/package.bak/python3/python3.mk deleted file mode 100644 index 8bfae79f58..0000000000 --- a/package.bak/python3/python3.mk +++ /dev/null @@ -1,266 +0,0 @@ -################################################################################ -# -# python3 -# -################################################################################ - -PYTHON3_VERSION_MAJOR = 3.5 -PYTHON3_VERSION = $(PYTHON3_VERSION_MAJOR).2 -PYTHON3_SOURCE = Python-$(PYTHON3_VERSION).tar.xz -PYTHON3_SITE = http://python.org/ftp/python/$(PYTHON3_VERSION) -PYTHON3_LICENSE = Python software foundation license v2, others -PYTHON3_LICENSE_FILES = LICENSE - -# Python itself doesn't use libtool, but it includes the source code -# of libffi, which uses libtool. Unfortunately, it uses a beta version -# of libtool for which we don't have a matching patch. However, this -# is not a problem, because we don't use the libffi copy included in -# the Python sources, but instead use an external libffi library. -PYTHON3_LIBTOOL_PATCH = NO - -# Python needs itself and a "pgen" program to build itself, both being -# provided in the Python sources. So in order to cross-compile Python, -# we need to build a host Python first. This host Python is also -# installed in $(HOST_DIR), as it is needed when cross-compiling -# third-party Python modules. - -HOST_PYTHON3_CONF_OPTS += \ - --without-ensurepip \ - --without-cxx-main \ - --disable-sqlite3 \ - --disable-tk \ - --with-expat=system \ - --disable-curses \ - --disable-codecs-cjk \ - --disable-nis \ - --enable-unicodedata \ - --disable-test-modules \ - --disable-idle3 \ - --disable-ossaudiodev \ - --disable-openssl - -# Make sure that LD_LIBRARY_PATH overrides -rpath. -# This is needed because libpython may be installed at the same time that -# python is called. -# Make python believe we don't have 'hg', so that it doesn't try to -# communicate over the network during the build. -HOST_PYTHON3_CONF_ENV += \ - LDFLAGS="$(HOST_LDFLAGS) -Wl,--enable-new-dtags" \ - ac_cv_prog_HAS_HG=/bin/false - -PYTHON3_DEPENDENCIES = host-python3 libffi - -HOST_PYTHON3_DEPENDENCIES = host-expat host-zlib - -PYTHON3_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_PYTHON3_READLINE),y) -PYTHON3_DEPENDENCIES += readline -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y) -PYTHON3_DEPENDENCIES += ncurses -else -PYTHON3_CONF_OPTS += --disable-curses -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_DECIMAL),y) -PYTHON3_DEPENDENCIES += mpdecimal -PYTHON3_CONF_OPTS += --with-libmpdec=system -else -PYTHON3_CONF_OPTS += --with-libmpdec=none -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_PYEXPAT),y) -PYTHON3_DEPENDENCIES += expat -PYTHON3_CONF_OPTS += --with-expat=system -else -PYTHON3_CONF_OPTS += --with-expat=none -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) -PYTHON3_CONF_OPTS += --enable-old-stdlib-cache -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_SQLITE),y) -PYTHON3_DEPENDENCIES += sqlite -else -PYTHON3_CONF_OPTS += --disable-sqlite3 -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_SSL),y) -PYTHON3_DEPENDENCIES += openssl -endif - -ifneq ($(BR2_PACKAGE_PYTHON3_CODECSCJK),y) -PYTHON3_CONF_OPTS += --disable-codecs-cjk -endif - -ifneq ($(BR2_PACKAGE_PYTHON3_UNICODEDATA),y) -PYTHON3_CONF_OPTS += --disable-unicodedata -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_BZIP2),y) -PYTHON3_DEPENDENCIES += bzip2 -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_XZ),y) -PYTHON3_DEPENDENCIES += xz -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_ZLIB),y) -PYTHON3_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_OSSAUDIODEV),y) -PYTHON3_CONF_OPTS += --enable-ossaudiodev -else -PYTHON3_CONF_OPTS += --disable-ossaudiodev -endif - -# Make python believe we don't have 'hg', so that it doesn't try to -# communicate over the network during the build. -PYTHON3_CONF_ENV += \ - ac_cv_have_long_long_format=yes \ - ac_cv_file__dev_ptmx=yes \ - ac_cv_file__dev_ptc=yes \ - ac_cv_working_tzset=yes \ - ac_cv_prog_HAS_HG=/bin/false - -# GCC is always compliant with IEEE754 -ifeq ($(BR2_ENDIAN),"LITTLE") -PYTHON3_CONF_ENV += ac_cv_little_endian_double=yes -else -PYTHON3_CONF_ENV += ac_cv_big_endian_double=yes -endif - -# uClibc is known to have a broken wcsftime() implementation, so tell -# Python 3 to fall back to strftime() instead. -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -PYTHON3_CONF_ENV += ac_cv_func_wcsftime=no -endif - -PYTHON3_CONF_OPTS += \ - --without-ensurepip \ - --without-cxx-main \ - --with-system-ffi \ - --disable-pydoc \ - --disable-test-modules \ - --disable-lib2to3 \ - --disable-tk \ - --disable-nis \ - --disable-idle3 \ - --disable-pyc-build - -# Python builds two tools to generate code: 'pgen' and -# '_freeze_importlib'. Unfortunately, for the target Python, they are -# built for the target, while we need to run them at build time. So -# when installing host-python, we copy them to -# $(HOST_DIR)/usr/bin. And then, when building the target python -# package, we tell the configure script where they are located. -define HOST_PYTHON3_INSTALL_TOOLS - cp $(@D)/Parser/pgen $(HOST_DIR)/usr/bin/python-pgen - cp $(@D)/Programs/_freeze_importlib $(HOST_DIR)/usr/bin/python-freeze-importlib -endef -HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_TOOLS - -PYTHON3_CONF_ENV += \ - PGEN_FOR_BUILD=$(HOST_DIR)/usr/bin/python-pgen \ - FREEZE_IMPORTLIB_FOR_BUILD=$(HOST_DIR)/usr/bin/python-freeze-importlib - -# -# Remove useless files. In the config/ directory, only the Makefile -# and the pyconfig.h files are needed at runtime. -# -define PYTHON3_REMOVE_USELESS_FILES - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)-config - rm -f $(TARGET_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR)m-config - rm -f $(TARGET_DIR)/usr/bin/python3-config - rm -f $(TARGET_DIR)/usr/bin/smtpd.py.3 - for i in `find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/config-$(PYTHON3_VERSION_MAJOR)m/ \ - -type f -not -name pyconfig.h -a -not -name Makefile` ; do \ - rm -f $$i ; \ - done - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/__pycache__/ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/lib-dynload/sysconfigdata/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/collections/__pycache__ - rm -rf $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/importlib/__pycache__ -endef - -PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_REMOVE_USELESS_FILES - -# -# Make sure libpython gets stripped out on target -# -define PYTHON3_ENSURE_LIBPYTHON_STRIPPED - chmod u+w $(TARGET_DIR)/usr/lib/libpython$(PYTHON3_VERSION_MAJOR)*.so -endef - -PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_ENSURE_LIBPYTHON_STRIPPED - -PYTHON3_AUTORECONF = YES - -define PYTHON3_INSTALL_SYMLINK - ln -fs python3 $(TARGET_DIR)/usr/bin/python -endef - -ifneq ($(BR2_PACKAGE_PYTHON),y) -PYTHON3_POST_INSTALL_TARGET_HOOKS += PYTHON3_INSTALL_SYMLINK -endif - -# Some packages may have build scripts requiring python3, whatever is the -# python version chosen for the target. -# Only install the python symlink in the host tree if python3 is enabled -# for the target. -ifeq ($(BR2_PACKAGE_PYTHON3),y) -define HOST_PYTHON3_INSTALL_SYMLINK - ln -fs python3 $(HOST_DIR)/usr/bin/python - ln -fs python3-config $(HOST_DIR)/usr/bin/python-config -endef - -HOST_PYTHON3_POST_INSTALL_HOOKS += HOST_PYTHON3_INSTALL_SYMLINK -endif - -# Provided to other packages -PYTHON3_PATH = $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/sysconfigdata/:$(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages/ - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -define PYTHON3_CREATE_PYC_FILES - PYTHONPATH="$(PYTHON3_PATH)" \ - $(HOST_DIR)/usr/bin/python$(PYTHON3_VERSION_MAJOR) \ - support/scripts/pycompile.py \ - $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -endef - -ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY)$(BR2_PACKAGE_PYTHON3_PY_PYC),y) -PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_CREATE_PYC_FILES -endif - -ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY),y) -define PYTHON3_REMOVE_PY_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.py' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_REMOVE_PY_FILES -endif - -# Normally, *.pyc files should not have been compiled, but just in -# case, we make sure we remove all of them. -ifeq ($(BR2_PACKAGE_PYTHON3_PY_ONLY),y) -define PYTHON3_REMOVE_PYC_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.pyc' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_REMOVE_PYC_FILES -endif - -# In all cases, we don't want to keep the optimized .opt-1.pyc and -# .opt-2.pyc files, since they can't work without their non-optimized -# variant. -define PYTHON3_REMOVE_OPTIMIZED_PYC_FILES - find $(TARGET_DIR)/usr/lib/python$(PYTHON3_VERSION_MAJOR) -name '*.opt-1.pyc' -print0 -o -name '*.opt-2.pyc' -print0 | \ - xargs -0 --no-run-if-empty rm -f -endef -PYTHON3_TARGET_FINALIZE_HOOKS += PYTHON3_REMOVE_OPTIMIZED_PYC_FILES diff --git a/package.bak/qdecoder/0001-fix-make-install.patch b/package.bak/qdecoder/0001-fix-make-install.patch deleted file mode 100644 index f353566839..0000000000 --- a/package.bak/qdecoder/0001-fix-make-install.patch +++ /dev/null @@ -1,40 +0,0 @@ -[PATCH] fix make install to respect DESTDIR - -And also ensure destination directories exist. - -Signed-off-by: Peter Korsgaard ---- - src/Makefile.in | 17 +++++++++-------- - 1 file changed, 9 insertions(+), 8 deletions(-) - -Index: qdecoder-r12.0.5/src/Makefile.in -=================================================================== ---- qdecoder-r12.0.5.orig/src/Makefile.in -+++ qdecoder-r12.0.5/src/Makefile.in -@@ -78,17 +78,18 @@ - ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} - - install: all -- ${INSTALL_DATA} qdecoder.h ${HEADERDIR}/qdecoder.h -- ${INSTALL_DATA} ${LIBNAME} ${LIBDIR}/${LIBNAME} -- ${INSTALL_DATA} ${SLIBREALNAME} ${LIBDIR}/${SLIBREALNAME} -- ( cd ${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} ) -+ mkdir -p ${DESTDIR}/${HEADERDIR} ${DESTDIR}/${LIBDIR} -+ ${INSTALL_DATA} qdecoder.h ${DESTDIR}/${HEADERDIR}/qdecoder.h -+ ${INSTALL_DATA} ${LIBNAME} ${DESTDIR}/${LIBDIR}/${LIBNAME} -+ ${INSTALL_DATA} ${SLIBREALNAME} ${DESTDIR}/${LIBDIR}/${SLIBREALNAME} -+ ( cd ${DESTDIR}/${LIBDIR}; ${LN_S} -f ${SLIBREALNAME} ${SLIBNAME} ) - - deinstall: uninstall - uninstall: -- ${RM} -f ${HEADERDIR}/qdecoder.h -- ${RM} -f ${LIBDIR}/${LIBNAME} -- ${RM} -f ${LIBDIR}/${SLIBREALNAME} -- ${RM} -f ${LIBDIR}/${SLIBNAME} -+ ${RM} -f ${DESTDIR}/${HEADERDIR}/qdecoder.h -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${LIBNAME} -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${SLIBREALNAME} -+ ${RM} -f ${DESTDIR}/${LIBDIR}/${SLIBNAME} - - doc: - doxygen doxygen.conf diff --git a/package.bak/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch b/package.bak/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch deleted file mode 100644 index 689d1d9124..0000000000 --- a/package.bak/qdecoder/0002-configure.ac-drop-hardcoded-paths.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] configure.ac: drop hardcoded paths - -Causing problems with cross compilation. - -Signed-off-by: Peter Korsgaard ---- - configure.ac | 5 +---- - 1 file changed, 1 insertion(+), 4 deletions(-) - -Index: qdecoder-r12.0.5/configure.ac -=================================================================== ---- qdecoder-r12.0.5.orig/configure.ac -+++ qdecoder-r12.0.5/configure.ac -@@ -81,10 +81,7 @@ - AC_CONFIG_HEADER([config.h]) - AC_CONFIG_FILES([Makefile src/Makefile examples/Makefile]) - --## Set path --PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" --CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include -I./ -D_GNU_SOURCE" --LDFLAGS="$LDFLAGS -L/usr/lib -L/usr/local/lib" -+CPPFLAGS="$CPPFLAGS -I./ -D_GNU_SOURCE" - - ## Set autoconf setting - #AC_CANONICAL_TARGET diff --git a/package.bak/qdecoder/0003-errno.patch b/package.bak/qdecoder/0003-errno.patch deleted file mode 100644 index 71d5cfd662..0000000000 --- a/package.bak/qdecoder/0003-errno.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fixes build error - -qcgireq.c: In function '_parse_multipart_value_into_disk': -qcgireq.c:738:60: error: 'errno' undeclared (first use in this function) - DEBUG("I/O error. (errno=%d)", (ioerror == true) ? errno : 0); - -Patch downloaded from upstream repo: -https://github.com/wolkykim/qdecoder/commit/574f0216a51e3e852cd94e2a0a3b52dc64e74548 - -Signed-off-by: Bernd Kuhls - - -From 574f0216a51e3e852cd94e2a0a3b52dc64e74548 Mon Sep 17 00:00:00 2001 -From: nyov -Date: Fri, 5 Sep 2014 18:41:10 +0000 -Subject: [PATCH] add missing header include - -fixes #7 ---- - src/qcgireq.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/qcgireq.c b/src/qcgireq.c -index dcb8c57..d34ff83 100644 ---- a/src/qcgireq.c -+++ b/src/qcgireq.c -@@ -139,6 +139,7 @@ - #ifndef _WIN32 - #include - #endif -+#include - #include "qdecoder.h" - #include "internal.h" - diff --git a/package.bak/qdecoder/Config.in b/package.bak/qdecoder/Config.in deleted file mode 100644 index 4873877693..0000000000 --- a/package.bak/qdecoder/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_QDECODER - bool "qdecoder" - depends on !BR2_STATIC_LIBS - help - qDecoder is a simple and powerful CGI library - for the C/C++ programming language. - - http://wolkykim.github.io/qdecoder diff --git a/package.bak/qdecoder/qdecoder.hash b/package.bak/qdecoder/qdecoder.hash deleted file mode 100644 index 6b30310784..0000000000 --- a/package.bak/qdecoder/qdecoder.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 641d3df4895626d7a530c5d26724e9b5887e9845d4b47f42c1cbce4a17ebf6af qdecoder-r12.0.5.tar.gz diff --git a/package.bak/qdecoder/qdecoder.mk b/package.bak/qdecoder/qdecoder.mk deleted file mode 100644 index bbbf42a98c..0000000000 --- a/package.bak/qdecoder/qdecoder.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# qdecoder -# -################################################################################ - -QDECODER_VERSION = r12.0.5 -QDECODER_SITE = $(call github,wolkykim,qdecoder,$(QDECODER_VERSION)) -QDECODER_LICENSE = BSD-2 -QDECODER_LICENSE_FILES = COPYING -# we patch configure.ac -QDECODER_AUTORECONF = YES -QDECODER_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - -QDECODER_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/qemu/Config.in b/package.bak/qemu/Config.in deleted file mode 100644 index f4a75fc269..0000000000 --- a/package.bak/qemu/Config.in +++ /dev/null @@ -1,120 +0,0 @@ -config BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET - bool - # Only tested on these architectures - default y if BR2_aarch64 || BR2_i386 || BR2_mips || BR2_mipsel \ - || BR2_x86_64 || BR2_arm \ - || BR2_powerpc64 || BR2_powerpc64le - -comment "QEMU requires a toolchain with wchar, threads" - depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET - depends on BR2_USE_MMU - depends on !(BR2_TOOLCHAIN_HAS_THREADS && BR2_USE_WCHAR) - -config BR2_PACKAGE_QEMU - bool "QEMU" - depends on BR2_PACKAGE_QEMU_ARCH_SUPPORTS_TARGET - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR # gettext - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_ZLIB - help - QEMU is a generic and open source machine emulator and virtualizer. - - When used as a machine emulator, QEMU can run OSes and programs made - for one machine (e.g. an ARM board) on a different machine (e.g. - your own PC). By using dynamic translation, it achieves very good - performance. - - When used as a virtualizer, QEMU achieves near native performances - by executing the guest code directly on the host CPU. QEMU supports - virtualization when executing under the Xen hypervisor or using the - KVM kernel module in Linux. When using KVM, QEMU can virtualize x86, - server and embedded PowerPC, and S390 guests. - - http://qemu.org/ - -if BR2_PACKAGE_QEMU - -comment "Emulators selection" - -config BR2_PACKAGE_QEMU_CUSTOM_TARGETS - string "Enable specific targets" - help - Enter here the list of QEMU targets you want to build. For example: - - System emulation | User-land emulation - ----------------------+----------------------- - i386-softmmu | i386-linux-user - arm-softmmu | ppc-linux-user - x86_64-softmmu | sparc-bsd-user - ... | ... - -config QEMU_FOO - bool # To break the indentation - -if BR2_PACKAGE_QEMU_CUSTOM_TARGETS = "" - -comment "... or you can select emulator families to enable, below:" - -config BR2_PACKAGE_QEMU_SYSTEM - bool "Enable all systems emulation" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_QEMU_FDT - help - Say 'y' to build all system emulators/virtualisers that QEMU supports. - -comment "systems emulation needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_QEMU_LINUX_USER - bool "Enable all Linux user-land emulation" - # Incompatible "struct sigevent" definition on musl - depends on !BR2_TOOLCHAIN_USES_MUSL - help - Say 'y' to build all Linux user-land emulators that QEMU supports. - -# Note: bsd-user can not be build on Linux - -comment "Linux user-land emulation needs a glibc or uClibc toolchain" - depends on BR2_TOOLCHAIN_USES_MUSL - -endif # BR2_PACKAGE_QEMU_CUSTOM_TARGETS == "" - -config BR2_PACKAGE_QEMU_HAS_EMULS - def_bool y - depends on BR2_PACKAGE_QEMU_SYSTEM || BR2_PACKAGE_QEMU_LINUX_USER || BR2_PACKAGE_QEMU_CUSTOM_TARGETS != "" - -if BR2_PACKAGE_QEMU_HAS_EMULS - -comment "Frontends" - -config BR2_PACKAGE_QEMU_SDL - bool "Enable SDL frontend" - select BR2_PACKAGE_SDL - help - Say 'y' to enable the SDL frontend, that is, a graphical window - presenting the VM's display. - -comment "Misc. features" - -config BR2_PACKAGE_QEMU_FDT - bool "Enable FDT" - depends on !BR2_STATIC_LIBS # dtc - select BR2_PACKAGE_DTC - help - Say 'y' here to have QEMU capable of constructing Device Trees, - and passing them to the VMs. - -comment "FDT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -endif # BR2_PACKAGE_QEMU_HAS_EMULS - -config BR2_PACKAGE_QEMU_TOOLS - bool "Enable tools" - help - Say 'y' here to include tools packaged with QEMU (e.g. qemu-img). - -endif # BR2_PACKAGE_QEMU diff --git a/package.bak/qemu/Config.in.host b/package.bak/qemu/Config.in.host deleted file mode 100644 index b3eb5906cc..0000000000 --- a/package.bak/qemu/Config.in.host +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_HOST_QEMU - bool "host qemu" - select BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE \ - if !BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_i386 || BR2_m68k || BR2_microblazeel || \ - BR2_microblazebe || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ - BR2_sparc || BR2_x86_64 - help - QEMU is a generic and open source machine emulator and virtualizer. - - This option builds an emulator for your selected architecture. - - http://www.qemu.org - -if BR2_PACKAGE_HOST_QEMU - -comment "Emulators selection" - -config BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE - bool "Enable system emulation" - help - Enables the build of the system emulator, which allows to - boot an entire system in Qemu. - -config BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE - bool "Enable Linux user-land emulation" - help - Enables the build of the user-land emulator, which allows to - run user-space applications. - -config BR2_PACKAGE_HOST_QEMU_VDE2 - bool "VDE2 support" - help - Enables VDE2 support. VDE2 stands for Virtual Distributed - Ethernet and can be used to create virtual switches to - "plug" both physical and virtual machines in them. - -endif diff --git a/package.bak/qemu/qemu.hash b/package.bak/qemu/qemu.hash deleted file mode 100644 index 572a5c911a..0000000000 --- a/package.bak/qemu/qemu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed, tarball verified with GPG signature -sha256 326e739506ba690daf69fc17bd3913a6c313d9928d743bd8eddb82f403f81e53 qemu-2.7.0.tar.bz2 diff --git a/package.bak/qemu/qemu.mk b/package.bak/qemu/qemu.mk deleted file mode 100644 index 66efcba345..0000000000 --- a/package.bak/qemu/qemu.mk +++ /dev/null @@ -1,265 +0,0 @@ -################################################################################ -# -# qemu -# -################################################################################ - -QEMU_VERSION = 2.7.0 -QEMU_SOURCE = qemu-$(QEMU_VERSION).tar.bz2 -QEMU_SITE = http://wiki.qemu.org/download -QEMU_LICENSE = GPLv2, LGPLv2.1, MIT, BSD-3c, BSD-2c, Others/BSD-1c -QEMU_LICENSE_FILES = COPYING COPYING.LIB -# NOTE: there is no top-level license file for non-(L)GPL licenses; -# the non-(L)GPL license texts are specified in the affected -# individual source files. - -#------------------------------------------------------------- -# Host-qemu - -HOST_QEMU_DEPENDENCIES = host-pkgconf host-python host-zlib host-libglib2 host-pixman - -# BR ARCH qemu -# ------- ---- -# arm arm -# armeb armeb -# bfin not supported -# i486 i386 -# i586 i386 -# i686 i386 -# x86_64 x86_64 -# m68k m68k -# microblaze microblaze -# mips mips -# mipsel mipsel -# mips64 mips64 -# mips64el mips64el -# powerpc ppc -# powerpc64 ppc64 -# powerpc64le ppc64 (system) / ppc64le (usermode) -# sh2a not supported -# sh4 sh4 -# sh4eb sh4eb -# sh4a sh4 -# sh4aeb sh4eb -# sh64 not supported -# sparc sparc - -HOST_QEMU_ARCH = $(ARCH) -ifeq ($(HOST_QEMU_ARCH),i486) -HOST_QEMU_ARCH = i386 -endif -ifeq ($(HOST_QEMU_ARCH),i586) -HOST_QEMU_ARCH = i386 -endif -ifeq ($(HOST_QEMU_ARCH),i686) -HOST_QEMU_ARCH = i386 -endif -ifeq ($(HOST_QEMU_ARCH),powerpc) -HOST_QEMU_ARCH = ppc -endif -ifeq ($(HOST_QEMU_ARCH),powerpc64) -HOST_QEMU_ARCH = ppc64 -endif -ifeq ($(HOST_QEMU_ARCH),powerpc64le) -HOST_QEMU_ARCH = ppc64le -HOST_QEMU_SYS_ARCH = ppc64 -endif -ifeq ($(HOST_QEMU_ARCH),sh4a) -HOST_QEMU_ARCH = sh4 -endif -ifeq ($(HOST_QEMU_ARCH),sh4aeb) -HOST_QEMU_ARCH = sh4eb -endif -HOST_QEMU_SYS_ARCH ?= $(HOST_QEMU_ARCH) - -ifeq ($(BR2_PACKAGE_HOST_QEMU_SYSTEM_MODE),y) -HOST_QEMU_TARGETS += $(HOST_QEMU_SYS_ARCH)-softmmu -HOST_QEMU_OPTS += --enable-system --enable-fdt -HOST_QEMU_DEPENDENCIES += host-dtc -else -HOST_QEMU_OPTS += --disable-system -endif - -ifeq ($(BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE),y) -HOST_QEMU_TARGETS += $(HOST_QEMU_ARCH)-linux-user -HOST_QEMU_OPTS += --enable-linux-user - -HOST_QEMU_HOST_SYSTEM_TYPE = $(shell uname -s) -ifneq ($(HOST_QEMU_HOST_SYSTEM_TYPE),Linux) -$(error "qemu-user can only be used on Linux hosts") -endif - -# kernel version as major*256 + minor -HOST_QEMU_HOST_SYSTEM_VERSION = $(shell uname -r | awk -F. '{ print $$1 * 256 + $$2 }') -HOST_QEMU_TARGET_SYSTEM_VERSION = $(shell echo $(BR2_TOOLCHAIN_HEADERS_AT_LEAST) | awk -F. '{ print $$1 * 256 + $$2 }') -HOST_QEMU_COMPARE_VERSION = $(shell test $(HOST_QEMU_HOST_SYSTEM_VERSION) -ge $(HOST_QEMU_TARGET_SYSTEM_VERSION) && echo OK) - -# -# The principle of qemu-user is that it emulates the instructions of -# the target architecture when running the binary, and then when this -# binary does a system call, it converts this system call into a -# system call on the host machine. This mechanism makes an assumption: -# that the target binary will not do system calls that do not exist on -# the host. This basically requires that the target binary should be -# built with kernel headers that are older or the same as the kernel -# version running on the host machine. -# - -ifeq ($(BR_BUILDING),y) -ifneq ($(HOST_QEMU_COMPARE_VERSION),OK) -$(error "Refusing to build qemu-user: target Linux version newer than host's.") -endif -endif # BR_BUILDING - -else # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE -HOST_QEMU_OPTS += --disable-linux-user -endif # BR2_PACKAGE_HOST_QEMU_LINUX_USER_MODE - -ifeq ($(BR2_PACKAGE_HOST_QEMU_VDE2),y) -HOST_QEMU_OPTS += --enable-vde -HOST_QEMU_DEPENDENCIES += host-vde2 -endif - -# Override CPP, as it expects to be able to call it like it'd -# call the compiler. -define HOST_QEMU_CONFIGURE_CMDS - cd $(@D); $(HOST_CONFIGURE_OPTS) CPP="$(HOSTCC) -E" \ - ./configure \ - --target-list="$(HOST_QEMU_TARGETS)" \ - --prefix="$(HOST_DIR)/usr" \ - --interp-prefix=$(STAGING_DIR) \ - --cc="$(HOSTCC)" \ - --host-cc="$(HOSTCC)" \ - --python=$(HOST_DIR)/usr/bin/python2 \ - --extra-cflags="$(HOST_CFLAGS)" \ - --extra-ldflags="$(HOST_LDFLAGS)" \ - $(HOST_QEMU_OPTS) -endef - -define HOST_QEMU_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_QEMU_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -$(eval $(host-generic-package)) - -# variable used by other packages -QEMU_USER = $(HOST_DIR)/usr/bin/qemu-$(HOST_QEMU_ARCH) - -#------------------------------------------------------------- -# Target-qemu - -QEMU_DEPENDENCIES = host-pkgconf host-python libglib2 zlib pixman - -# Need the LIBS variable because librt and libm are -# not automatically pulled. :-( -QEMU_LIBS = -lrt -lm - -QEMU_OPTS = - -QEMU_VARS = \ - LIBTOOL=$(HOST_DIR)/usr/bin/libtool \ - PYTHON=$(HOST_DIR)/usr/bin/python2 \ - PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -# If we want to specify only a subset of targets, we must still enable all -# of them, so that QEMU properly builds its list of default targets, from -# which it then checks if the specified sub-set is valid. That's what we -# do in the first part of the if-clause. -# Otherwise, if we do not want to pass a sub-set of targets, we then need -# to either enable or disable -user and/or -system emulation appropriately. -# That's what we do in the else-clause. -ifneq ($(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS)),) -QEMU_OPTS += --enable-system --enable-linux-user -QEMU_OPTS += --target-list="$(call qstrip,$(BR2_PACKAGE_QEMU_CUSTOM_TARGETS))" -else - -ifeq ($(BR2_PACKAGE_QEMU_SYSTEM),y) -QEMU_OPTS += --enable-system -else -QEMU_OPTS += --disable-system -endif - -ifeq ($(BR2_PACKAGE_QEMU_LINUX_USER),y) -QEMU_OPTS += --enable-linux-user -else -QEMU_OPTS += --disable-linux-user -endif - -endif - -ifeq ($(BR2_PACKAGE_QEMU_SDL),y) -QEMU_OPTS += --enable-sdl -QEMU_DEPENDENCIES += sdl -QEMU_VARS += SDL_CONFIG=$(BR2_STAGING_DIR)/usr/bin/sdl-config -else -QEMU_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_QEMU_FDT),y) -QEMU_OPTS += --enable-fdt -QEMU_DEPENDENCIES += dtc -else -QEMU_OPTS += --disable-fdt -endif - -ifeq ($(BR2_PACKAGE_QEMU_TOOLS),y) -QEMU_OPTS += --enable-tools -else -QEMU_OPTS += --disable-tools -endif - -# Override CPP, as it expects to be able to call it like it'd -# call the compiler. -define QEMU_CONFIGURE_CMDS - ( cd $(@D); \ - LIBS='$(QEMU_LIBS)' \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - CPP="$(TARGET_CC) -E" \ - $(QEMU_VARS) \ - ./configure \ - --prefix=/usr \ - --cross-prefix=$(TARGET_CROSS) \ - --with-system-pixman \ - --audio-drv-list= \ - --enable-kvm \ - --enable-attr \ - --enable-vhost-net \ - --disable-bsd-user \ - --disable-xen \ - --disable-slirp \ - --disable-vnc \ - --disable-virtfs \ - --disable-brlapi \ - --disable-curses \ - --disable-curl \ - --disable-bluez \ - --disable-uuid \ - --disable-vde \ - --disable-linux-aio \ - --disable-cap-ng \ - --disable-docs \ - --disable-spice \ - --disable-rbd \ - --disable-libiscsi \ - --disable-usb-redir \ - --disable-strip \ - --disable-seccomp \ - --disable-sparse \ - $(QEMU_OPTS) \ - ) -endef - -define QEMU_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QEMU_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(QEMU_MAKE_ENV) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch b/package.bak/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch deleted file mode 100644 index e1d99f0fcb..0000000000 --- a/package.bak/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 62fbe9c3539945df6204501b7e3ae0d51db075a3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 24 Nov 2016 22:30:40 +0100 -Subject: [PATCH] Create a main include file QExtSerialPort - -This main include file will be installed in - so that Qt applications can use this -library by including header files in a Qt-like style. - -Signed-off-by: Thomas Petazzoni -[Arnout: add it to qextserialport.pri so it is installed] -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - src/QExtSerialPort | 2 ++ - src/qextserialport.pri | 3 ++- - 2 files changed, 4 insertions(+), 1 deletion(-) - create mode 100644 src/QExtSerialPort - -diff --git a/src/QExtSerialPort b/src/QExtSerialPort -new file mode 100644 -index 0000000..a48aeea ---- /dev/null -+++ b/src/QExtSerialPort -@@ -0,0 +1,2 @@ -+#include "qextserialport.h" -+#include "qextserialenumerator.h" -diff --git a/src/qextserialport.pri b/src/qextserialport.pri -index 461d56f..f8a678d 100644 ---- a/src/qextserialport.pri -+++ b/src/qextserialport.pri -@@ -3,7 +3,8 @@ - - PUBLIC_HEADERS += $$PWD/qextserialport.h \ - $$PWD/qextserialenumerator.h \ -- $$PWD/qextserialport_global.h -+ $$PWD/qextserialport_global.h \ -+ $$PWD/QExtSerialPort - - HEADERS += $$PUBLIC_HEADERS \ - $$PWD/qextserialport_p.h \ diff --git a/package.bak/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch b/package.bak/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch deleted file mode 100644 index 09e26a961c..0000000000 --- a/package.bak/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 14d4d3e7b5c748118acffddd397fb67b37fd5054 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Thu, 24 Nov 2016 22:44:02 +0100 -Subject: [PATCH] Tell qmake to add a pkgconfig file to ease usage with - applications - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - qextserialport.pro | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/qextserialport.pro b/qextserialport.pro -index 8d2c03a..2fcb39c 100644 ---- a/qextserialport.pro -+++ b/qextserialport.pro -@@ -42,7 +42,8 @@ TEMPLATE=lib - include(src/qextserialport.pri) - - #create_prl is needed, otherwise, MinGW can't found libqextserialport1.a --CONFIG += create_prl -+CONFIG += create_prl create_pc -+QMAKE_PKGCONFIG_DESTDIR = pkgconfig - - #mac framework is designed for shared library - macx:qesp_mac_framework:qesp_static: CONFIG -= qesp_static --- -2.10.2 - diff --git a/package.bak/qextserialport/Config.in b/package.bak/qextserialport/Config.in deleted file mode 100644 index ab05920b20..0000000000 --- a/package.bak/qextserialport/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_QEXTSERIALPORT - bool "qextserialport" - depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 - help - A Qt library to manage serial ports - - http://code.google.com/p/qextserialport/ diff --git a/package.bak/qextserialport/qextserialport.hash b/package.bak/qextserialport/qextserialport.hash deleted file mode 100644 index 60c0ff3224..0000000000 --- a/package.bak/qextserialport/qextserialport.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 23e3b10a8d8a1e2fb071047144222c43d150748ce6670e5d047ba5b0502ad0b2 qextserialport-ada321a9ee463f628e7b781b8ed00ff219152158.tar.gz diff --git a/package.bak/qextserialport/qextserialport.mk b/package.bak/qextserialport/qextserialport.mk deleted file mode 100644 index e3e325ce6c..0000000000 --- a/package.bak/qextserialport/qextserialport.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# qextserialport -# -################################################################################ - -QEXTSERIALPORT_VERSION = ada321a9ee463f628e7b781b8ed00ff219152158 -QEXTSERIALPORT_SITE = $(call github,qextserialport,qextserialport,$(QEXTSERIALPORT_VERSION)) -QEXTSERIALPORT_LICENSE = MIT -QEXTSERIALPORT_LICENSE_FILES = LICENSE.md -QEXTSERIALPORT_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),y) -QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static -endif - -ifeq ($(BR2_PACKAGE_QT),y) -QEXTSERIALPORT_DEPENDENCIES += qt -QEXTSERIALPORT_QMAKE = $(QT_QMAKE) -else ifeq ($(BR2_PACKAGE_QT5),y) -QEXTSERIALPORT_DEPENDENCIES += qt5base -QEXTSERIALPORT_QMAKE = $(QT5_QMAKE) -endif - -define QEXTSERIALPORT_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS) -endef - -define QEXTSERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QEXTSERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),y) -QEXTSERIALPORT_INSTALL_TARGET = NO -else -define QEXTSERIALPORT_INSTALL_TARGET_CMDS - cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qhull/Config.in b/package.bak/qhull/Config.in deleted file mode 100644 index 0a4b60ffbe..0000000000 --- a/package.bak/qhull/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_QHULL - bool "qhull" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 # needs gcc >= 4.4 - help - Qhull computes the convex hull, Delaunay triangulation, - Voronoi diagram, halfspace intersection about a point, - furthest-site Delaunay triangulation, and furthest-site - Voronoi diagram. The source code runs in 2-d, 3-d, 4-d, and - higher dimensions. Qhull implements the Quickhull algorithm - for computing the convex hull. It handles roundoff errors - from floating point arithmetic. It computes volumes, surface - areas, and approximations to the convex hull. - - http://www.qhull.org - -comment "qhull needs a toolchain w/ C++, dynamic library, gcc >= 4.4" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_4 diff --git a/package.bak/qhull/qhull.hash b/package.bak/qhull/qhull.hash deleted file mode 100644 index 4f059f2b5b..0000000000 --- a/package.bak/qhull/qhull.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.qhull.org/download/qhull-2015.2.md5sum -md5 e6270733a826a6a7c32b796e005ec3dc qhull-2015-src-7.2.0.tgz -# Locally computed -sha256 78b010925c3b577adc3d58278787d7df08f7c8fb02c3490e375eab91bb58a436 qhull-2015-src-7.2.0.tgz diff --git a/package.bak/qhull/qhull.mk b/package.bak/qhull/qhull.mk deleted file mode 100644 index 8ea38f01ad..0000000000 --- a/package.bak/qhull/qhull.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# qhull -# -################################################################################ - -QHULL_VERSION = 7.2.0 -QHULL_SITE = http://www.qhull.org/download -QHULL_SOURCE = qhull-2015-src-$(QHULL_VERSION).tgz -QHULL_INSTALL_STAGING = YES -QHULL_LICENSE = BSD-Style -QHULL_LICENSE_FILES = COPYING.txt - -$(eval $(cmake-package)) diff --git a/package.bak/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch b/package.bak/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch deleted file mode 100644 index a9e34e4c26..0000000000 --- a/package.bak/qjson/0001-fix-Qt4-package-error-in-CMakeLists.txt.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 254858bbf443bded2e80480e9f9032ce166b923e Mon Sep 17 00:00:00 2001 -From: Zoltan Gyarmati -Date: Fri, 2 Dec 2016 23:00:58 +0100 -Subject: [PATCH] CMake, Qt4: check specifically for QtCore, fixes #96 - -Signed-off-by: Zoltan Gyarmati ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 31d9987..2fde79f 100755 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -62,7 +62,7 @@ IF (Qt5Core_FOUND) - ELSE() - MESSAGE ("Qt5 not found, searching for Qt4") - # Find Qt4 -- FIND_PACKAGE( Qt4 4.5 REQUIRED ) -+ FIND_PACKAGE( Qt4 4.5 REQUIRED QtCore) - # QStringBuilder is supported since Qt 4.8 for both QString and QByteArray - IF (NOT (${QT_VERSION_MINOR} STRLESS "8")) - MESSAGE ("Enable QStringBuilder") --- -2.7.4 - diff --git a/package.bak/qjson/Config.in b/package.bak/qjson/Config.in deleted file mode 100644 index 5c423bf317..0000000000 --- a/package.bak/qjson/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_QJSON - bool "qjson" - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_QT || BR2_PACKAGE_QT5 - help - QJson is a Qt-based library that maps JSON data to - QVariant objects and vice versa. - - http://qjson.sourceforge.net - -comment "qjson needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_PACKAGE_QT && !BR2_PACKAGE_QT5 diff --git a/package.bak/qjson/qjson.hash b/package.bak/qjson/qjson.hash deleted file mode 100644 index d794b48727..0000000000 --- a/package.bak/qjson/qjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e812617477f3c2bb990561767a4cd8b1d3803a52018d4878da302529552610d4 qjson-0.9.0.tar.gz diff --git a/package.bak/qjson/qjson.mk b/package.bak/qjson/qjson.mk deleted file mode 100644 index dab2381bee..0000000000 --- a/package.bak/qjson/qjson.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# qjson -# -################################################################################ - -QJSON_VERSION = 0.9.0 -QJSON_SITE = $(call github,flavio,qjson,$(QJSON_VERSION)) -QJSON_INSTALL_STAGING = YES -QJSON_DEPENDENCIES = \ - $(if $(BR2_PACKAGE_QT),qt) \ - $(if $(BR2_PACKAGE_QT5),qt5base) -QJSON_LICENSE = LGPLv2.1 -QJSON_LICENSE_FILES = COPYING.lib - -$(eval $(cmake-package)) diff --git a/package.bak/qlibc/0001-remove-absolute-paths.patch b/package.bak/qlibc/0001-remove-absolute-paths.patch deleted file mode 100644 index 5976c3c4db..0000000000 --- a/package.bak/qlibc/0001-remove-absolute-paths.patch +++ /dev/null @@ -1,19 +0,0 @@ -Remove absolute paths to host locations - -Signed-off-by: Sagaert Johan - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -85,10 +85,8 @@ - - ## Set path - PATH="$PATH:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin" --CPPFLAGS="$CPPFLAGS -I/usr/include -I/usr/local/include" - CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" - CPPFLAGS="$CPPFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" --LDFLAGS="$LDFLAGS -L/usr/lib -L/usr/local/lib" - - ## Set autoconf setting - #AC_CANONICAL_TARGET diff --git a/package.bak/qlibc/0002-obey-destdir.patch b/package.bak/qlibc/0002-obey-destdir.patch deleted file mode 100644 index f007aa4f24..0000000000 --- a/package.bak/qlibc/0002-obey-destdir.patch +++ /dev/null @@ -1,144 +0,0 @@ -From dbdc772a35244b45c725a72fad5ddade9bd7d521 Mon Sep 17 00:00:00 2001 -From: pcarpent -Date: Tue, 15 Dec 2015 10:23:44 +0100 -Subject: [PATCH] fix makefile - -add DESTDIR variables in install targets - -Signed-off-by: Bernd Kuhls -(downloaded from upstream commit not included in v2.4.1 - https://github.com/wolkykim/qlibc/commit/dbdc772a35244b45c725a72fad5ddade9bd7d521) ---- - src/Makefile.in | 110 ++++++++++++++++++++++++++++---------------------------- - 1 file changed, 55 insertions(+), 55 deletions(-) - -diff --git a/src/Makefile.in b/src/Makefile.in -index 8a7ab43..4e274ed 100644 ---- a/src/Makefile.in -+++ b/src/Makefile.in -@@ -122,70 +122,70 @@ qlibcext: ${QLIBCEXT_OBJS} - install: ${INSTALL_TARGETS} - - install-qlibc: qlibc -- ${MKDIR_P} ${INST_INCDIR}/qlibc -- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h ${INST_INCDIR}/qlibc/qlibc.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/containers/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h ${INST_INCDIR}/qlibc/containers/qtreetbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h ${INST_INCDIR}/qlibc/containers/qhashtbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h ${INST_INCDIR}/qlibc/containers/qhasharr.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h ${INST_INCDIR}/qlibc/containers/qlisttbl.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h ${INST_INCDIR}/qlibc/containers/qlist.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h ${INST_INCDIR}/qlibc/containers/qvector.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h ${INST_INCDIR}/qlibc/containers/qqueue.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h ${INST_INCDIR}/qlibc/containers/qstack.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h ${INST_INCDIR}/qlibc/containers/qgrow.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/utilities/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h ${INST_INCDIR}/qlibc/utilities/qcount.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h ${INST_INCDIR}/qlibc/utilities/qencode.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h ${INST_INCDIR}/qlibc/utilities/qfile.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h ${INST_INCDIR}/qlibc/utilities/qhash.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h ${INST_INCDIR}/qlibc/utilities/qio.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h ${INST_INCDIR}/qlibc/utilities/qsocket.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h ${INST_INCDIR}/qlibc/utilities/qstring.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h ${INST_INCDIR}/qlibc/utilities/qsystem.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h ${INST_INCDIR}/qlibc/utilities/qtime.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/ipc/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h ${INST_INCDIR}/qlibc/ipc/qsem.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h ${INST_INCDIR}/qlibc/ipc/qshm.h -- ${MKDIR_P} ${INST_LIBDIR} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} ${INST_LIBDIR}/${QLIBC_LIBNAME} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibc.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/containers/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qtreetbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qtreetbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhashtbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhashtbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qhasharr.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qhasharr.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlisttbl.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlisttbl.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qlist.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qlist.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qvector.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qvector.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qqueue.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qqueue.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qstack.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qstack.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/containers/qgrow.h $(DESTDIR)/${INST_INCDIR}/qlibc/containers/qgrow.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qcount.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qcount.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qencode.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qencode.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qfile.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qfile.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qhash.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qhash.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qio.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qio.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsocket.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsocket.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qstring.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qstring.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qsystem.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qsystem.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/utilities/qtime.h $(DESTDIR)/${INST_INCDIR}/qlibc/utilities/qtime.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qsem.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qsem.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/ipc/qshm.h $(DESTDIR)/${INST_INCDIR}/qlibc/ipc/qshm.h -+ ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBC_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBC_SLIBREALNAME} ${QLIBC_SLIBNAME} ) - - uninstall-qlibc: -- ${RM} -f ${INST_INCDIR}/qlibc/qlibc.h -- ${RM} -rf ${INST_INCDIR}/qlibc/containers -- ${RM} -rf ${INST_INCDIR}/qlibc/utilities -- ${RM} -rf ${INST_INCDIR}/qlibc/ipc -- ${RM} -f ${INST_LIBDIR}/${QLIBC_LIBNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBC_SLIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibc.h -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/containers -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/utilities -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/ipc -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_LIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBREALNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBC_SLIBNAME} - - install-qlibcext: qlibcext -- ${MKDIR_P} ${INST_INCDIR}/qlibc -- ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h ${INST_INCDIR}/qlibc/qlibcext.h -- ${MKDIR_P} ${INST_INCDIR}/qlibc/extensions/ -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h ${INST_INCDIR}/qlibc/extensions/qconfig.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h ${INST_INCDIR}/qlibc/extensions/qaconf.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h ${INST_INCDIR}/qlibc/extensions/qlog.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h ${INST_INCDIR}/qlibc/extensions/qhttpclient.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h ${INST_INCDIR}/qlibc/extensions/qdatabase.h -- ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h ${INST_INCDIR}/qlibc/extensions/qtokenbucket.h -- ${MKDIR_P} ${INST_LIBDIR} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -- ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -- ( cd ${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/qlibcext.h $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h -+ ${MKDIR_P} $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/ -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qconfig.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qconfig.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qaconf.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qaconf.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qlog.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qlog.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qhttpclient.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qhttpclient.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qdatabase.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qdatabase.h -+ ${INSTALL_DATA} ${QLIBC_INCDIR}/extensions/qtokenbucket.h $(DESTDIR)/${INST_INCDIR}/qlibc/extensions/qtokenbucket.h -+ ${MKDIR_P} $(DESTDIR)/${INST_LIBDIR} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_LIBNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -+ ${INSTALL_DATA} ${QLIBC_LIBDIR}/${QLIBCEXT_SLIBREALNAME} $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -+ ( cd $(DESTDIR)/${INST_LIBDIR}; ${LN_S} -f ${QLIBCEXT_SLIBREALNAME} ${QLIBCEXT_SLIBNAME} ) - - uninstall-qlibcext: -- ${RM} -f ${INST_INCDIR}/qlibc/qlibcext.h -- ${RM} -rf ${INST_INCDIR}/qlibc/extensions -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -- ${RM} -f ${INST_LIBDIR}/${QLIBCEXT_SLIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_INCDIR}/qlibc/qlibcext.h -+ ${RM} -rf $(DESTDIR)/${INST_INCDIR}/qlibc/extensions -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_LIBNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBREALNAME} -+ ${RM} -f $(DESTDIR)/${INST_LIBDIR}/${QLIBCEXT_SLIBNAME} - - deinstall: uninstall - uninstall: uninstall-qlibc uninstall-qlibcext -- ${RMDIR} ${INST_INCDIR}/qlibc -+ ${RMDIR} $(DESTDIR)/${INST_INCDIR}/qlibc - - clean: - ${RM} -f ${QLIBC_OBJS} diff --git a/package.bak/qlibc/0003-fix-openssl-mysql-checks.patch b/package.bak/qlibc/0003-fix-openssl-mysql-checks.patch deleted file mode 100644 index bb609b2446..0000000000 --- a/package.bak/qlibc/0003-fix-openssl-mysql-checks.patch +++ /dev/null @@ -1,36 +0,0 @@ -Allow to explicitly disable openssl and mysql - -AC_ARG_WITH() is being incorrectly used: the third argument indicates -the action that needs to be taken when a value was passed, when not -the option is enabled. Therefore, the result of the existing code was -that when you passed --without-mysql or --without-openssl, the -$withval variable would get the value 'yes', which is obviously wrong. - -Instead, we simply empty this third argument, because $withval is -already properly filled with 'yes' or 'no' by the AC_ARG_WITH() -function. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -170,7 +170,7 @@ - ## --with section - ## - --AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[withval=yes],[withval=no]) -+AC_ARG_WITH([openssl],[AS_HELP_STRING([--with-openssl], [This will enable HTTPS support in qhttpclient extension API. When it's enabled, user applications will need to link openssl library with -lssl option.])],[],[withval=no]) - if test "$withval" = yes; then - if test "$with_openssl" = yes; then - with_openssl="/usr/include" -@@ -185,7 +185,7 @@ - fi - fi - --AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[withval=yes],[withval=no]) -+AC_ARG_WITH([mysql],[AS_HELP_STRING([--with-mysql], [This will enable MySQL database support in qdatabase extension API. When it's enabled, user applications need to link mysql client library. (ex: -lmysqlclient)])],[],[withval=no]) - if test "$withval" = yes; then - if test "$with_mysql" = yes; then - with_mysql="/usr/include/mysql" diff --git a/package.bak/qlibc/Config.in b/package.bak/qlibc/Config.in deleted file mode 100644 index 170da4940f..0000000000 --- a/package.bak/qlibc/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_QLIBC - bool "qlibc" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS - help - qLibc is currently one of the most functionally complete - public licensed C/C++ libraries. The C/C++ library which - includes all kinds of containers and general library - routines. It provides ready-made set of common container - APIs with consistant API look. - - https://github.com/wolkykim/qlibc - -comment "qlibc needs a toolchain w/ threads, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || BR2_STATIC_LIBS diff --git a/package.bak/qlibc/qlibc.hash b/package.bak/qlibc/qlibc.hash deleted file mode 100644 index 6b8e4d8940..0000000000 --- a/package.bak/qlibc/qlibc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1f9aa5eefd28c45d409130a35104816d41405da64fe900f70a1c41150891501a qlibc-v2.4.1.tar.gz diff --git a/package.bak/qlibc/qlibc.mk b/package.bak/qlibc/qlibc.mk deleted file mode 100644 index a146fa387f..0000000000 --- a/package.bak/qlibc/qlibc.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# qlibc -# -################################################################################ - -QLIBC_VERSION = v2.4.1 -QLIBC_SITE = $(call github,wolkykim,qlibc,$(QLIBC_VERSION)) -QLIBC_LICENSE = BSD-2c -QLIBC_LICENSE_FILES = LICENSE - -# We're patching configure.ac -QLIBC_AUTORECONF = YES -QLIBC_INSTALL_STAGING = YES -QLIBC_DEPENDENCIES = $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -# The configure.ac checks for these use AC_CHECK_FILE() which doesn't -# work for cross-compilation. If someone wants to enable the support -# for OpenSSL or MySQL, some changes to the configure.ac will be -# needed. -QLIBC_CONF_OPTS = --without-mysql --without-openssl - -$(eval $(autotools-package)) diff --git a/package.bak/qpdf/Config.in b/package.bak/qpdf/Config.in deleted file mode 100644 index e8ab9ba969..0000000000 --- a/package.bak/qpdf/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_QPDF - bool "qpdf" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_ZLIB - help - QPDF is a command-line program that does structural, content- - preserving transformations on PDF files. It could have been called - something like pdf-to-pdf. It also provides many useful capabilities - to developers of PDF-producing software or for people who just want - to look at the innards of a PDF file to learn more about how they - work. - - http://qpdf.sourceforge.net/ - -comment "qpdf needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/qpdf/qpdf.hash b/package.bak/qpdf/qpdf.hash deleted file mode 100644 index c882708b52..0000000000 --- a/package.bak/qpdf/qpdf.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://sourceforge.net/projects/qpdf/files/qpdf/6.0.0/qpdf-6.0.0.sha1/download -sha1 15ebe09d9b9ddd2309a67e4295693fcf82494e33 qpdf-6.0.0.tar.gz -# Locally computed -sha256 a9fdc7e94d38fcd3831f37b6e0fe36492bf79aa6d54f8f66062cf7f9c4155233 qpdf-6.0.0.tar.gz diff --git a/package.bak/qpdf/qpdf.mk b/package.bak/qpdf/qpdf.mk deleted file mode 100644 index 9601f98542..0000000000 --- a/package.bak/qpdf/qpdf.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# qpdf -# -################################################################################ - -QPDF_VERSION = 6.0.0 -QPDF_SITE = http://downloads.sourceforge.net/project/qpdf/qpdf/$(QPDF_VERSION) -QPDF_INSTALL_STAGING = YES -QPDF_LICENSE = Artistic-2.0 -QPDF_LICENSE_FILES = Artistic-2.0 -QPDF_DEPENDENCIES = pcre zlib - -QPDF_CONF_OPTS = --without-random - -$(eval $(autotools-package)) diff --git a/package.bak/qpid-proton/Config.in b/package.bak/qpid-proton/Config.in deleted file mode 100644 index 47cddebe91..0000000000 --- a/package.bak/qpid-proton/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_QPID_PROTON - bool "qpid-proton" - depends on !BR2_STATIC_LIBS # build a shared library - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - The AMQP messaging toolkit - - Qpid Proton is a high-performance, lightweight messaging library. - It can be used in the widest range of messaging applications, - including brokers, client libraries, routers, bridges, proxies, and - more. - - https://qpid.apache.org/proton/ - -comment "qpid-proton needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/qpid-proton/qpid-proton.hash b/package.bak/qpid-proton/qpid-proton.hash deleted file mode 100644 index 8c2cc4f350..0000000000 --- a/package.bak/qpid-proton/qpid-proton.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://www.apache.org/dist/qpid/proton/0.9.1/qpid-proton-0.9.1.tar.gz.sha -sha1 98008d90acd0d47cbd7ac1572a2bb50b452338ed qpid-proton-0.9.1.tar.gz diff --git a/package.bak/qpid-proton/qpid-proton.mk b/package.bak/qpid-proton/qpid-proton.mk deleted file mode 100644 index 2e8c1d0e92..0000000000 --- a/package.bak/qpid-proton/qpid-proton.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# qpid-proton -# -################################################################################ - -QPID_PROTON_VERSION = 0.9.1 -QPID_PROTON_SITE = http://apache.panu.it/qpid/proton/$(QPID_PROTON_VERSION) -QPID_PROTON_STRIP_COMPONENTS = 2 -QPID_PROTON_LICENSE = Apache-2.0 -QPID_PROTON_LICENSE_FILES = LICENSE -QPID_PROTON_INSTALL_STAGING = YES -QPID_PROTON_DEPENDENCIES = \ - host-python \ - util-linux \ - $(if $(BR2_PACKAGE_OPENSSL),openssl) - -# Language bindings are enabled when host-swig tool is present in HOST_DIR. -# For now, disable all of them. -QPID_PROTON_CONF_OPTS = \ - -DBUILD_JAVA=OFF \ - -DBUILD_JAVASCRIPT=OFF \ - -DBUILD_PERL=OFF \ - -DBUILD_PHP=OFF \ - -DBUILD_PYTHON=OFF \ - -DBUILD_RUBY=OFF \ - -DENABLE_VALGRIND=OFF \ - -DENABLE_WARNING_ERROR=OFF \ - -DPYTHON_EXECUTABLE=$(HOST_DIR)/usr/bin/python2 - -define QPID_PROTON_REMOVE_USELESS_FILES - rm -fr $(TARGET_DIR)/usr/share/proton-*/ -endef - -QPID_PROTON_POST_INSTALL_TARGET_HOOKS += QPID_PROTON_REMOVE_USELESS_FILES - -$(eval $(cmake-package)) diff --git a/package.bak/qt-webkit-kiosk/Config.in b/package.bak/qt-webkit-kiosk/Config.in deleted file mode 100644 index 1b0e0dee09..0000000000 --- a/package.bak/qt-webkit-kiosk/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_QT_WEBKIT_KIOSK - bool "qt-webkit-kiosk" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5WEBKIT - select BR2_PACKAGE_QT5MULTIMEDIA - depends on !BR2_STATIC_LIBS # qt5webkit - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5webkit - depends on !BR2_BINFMT_FLAT # qt5webkit - depends on !BR2_MIPS_SOFT_FLOAT # qt5webkit - help - Simple kiosk-mode browser powered by Qt5Webkit - -if BR2_PACKAGE_QT_WEBKIT_KIOSK - -config BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS - bool "Install browser sound files" - help - Deploy browser sound files on target - -endif diff --git a/package.bak/qt-webkit-kiosk/qt-webkit-kiosk.mk b/package.bak/qt-webkit-kiosk/qt-webkit-kiosk.mk deleted file mode 100644 index d54c8d5eb7..0000000000 --- a/package.bak/qt-webkit-kiosk/qt-webkit-kiosk.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# qt-webkit-kiosk -# -################################################################################ - -QT_WEBKIT_KIOSK_VERSION = 7fe40a350abfbe5ec194e7c6c740f7099e8704cd -QT_WEBKIT_KIOSK_SITE = https://github.com/sergey-dryabzhinsky/qt-webkit-kiosk.git -QT_WEBKIT_KIOSK_SITE_METHOD = git -QT_WEBKIT_KIOSK_DEPENDENCIES = qt5webkit qt5multimedia -QT_WEBKIT_KIOSK_LICENSE = LGPLv3 -QT_WEBKIT_KIOSK_LICENSE_FILES = doc/lgpl.html - -define QT_WEBKIT_KIOSK_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE) PREFIX=/usr) -endef - -define QT_WEBKIT_KIOSK_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT_WEBKIT_KIOSK_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src -f Makefile.qt-webkit-kiosk \ - INSTALL_ROOT=$(TARGET_DIR) \ - install_target - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - INSTALL_ROOT=$(TARGET_DIR) \ - install_config \ - $(if $(BR2_PACKAGE_QT_WEBKIT_KIOSK_SOUNDS),install_sound) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt/0001-configure.patch b/package.bak/qt/0001-configure.patch deleted file mode 100644 index 07c9630c90..0000000000 --- a/package.bak/qt/0001-configure.patch +++ /dev/null @@ -1,52 +0,0 @@ -Fix -hostprefix behaviour - -When -hostprefix ./configure option is used, Qt installs all its -headers, libraries and binaries inside the given host prefix, instead -of the prefix. This is used by Buildroot to make sure that all Qt -libraries and headers are installed in $(STAGING_DIR). - -Qt ./configure script also allows to tune the installation location of -various elements, for examples the plugins through the -plugindir -option. Unfortunately, this option only impact the installation path -on the target, but not on the host when -hostprefix is used. - -This patch modifies Qt ./configure script so that HOST_*PATH_STR -variables are composed of the host prefix concatenated with the path -of installation on the target. This way, the plugin installation local -in the $(STAGING_DIR) and on the target remains the same. - -Signed-off-by: Thomas Petazzoni - ---- - configure | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -Index: qt-everywhere-opensource-src-4.8.1/configure -=================================================================== ---- qt-everywhere-opensource-src-4.8.1.orig/configure -+++ qt-everywhere-opensource-src-4.8.1/configure -@@ -4661,15 +4661,15 @@ - - - if [ ! -z "$QT_HOST_PREFIX" ]; then -- HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX"` -- HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/doc"` -- HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/include"` -- HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/lib"` -- HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/bin"` -- HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/plugins"` -- HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/IMPORTS"` -- HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX"` -- HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/translations"` -+ HOSTPREFIX_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_prfxpath=$QT_HOST_PREFIX/$QT_INSTALL_PREFIX"` -+ HOSTDOCUMENTATION_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_docspath=$QT_HOST_PREFIX/$QT_INSTALL_DOCS"` -+ HOSTHEADERS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_hdrspath=$QT_HOST_PREFIX/$QT_INSTALL_HEADERS"` -+ HOSTLIBRARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_libspath=$QT_HOST_PREFIX/$QT_INSTALL_LIBS"` -+ HOSTBINARIES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_binspath=$QT_HOST_PREFIX/$QT_INSTALL_BINS"` -+ HOSTPLUGINS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_plugpath=$QT_HOST_PREFIX/$QT_INSTALL_PLUGINS"` -+ HOSTIMPORTS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_impspath=$QT_HOST_PREFIX/$QT_INSTALL_IMPORTS"` -+ HOSTDATA_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_datapath=$QT_HOST_PREFIX/$QT_INSTALL_DATA"` -+ HOSTTRANSLATIONS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_trnspath=$QT_HOST_PREFIX/$QT_INSTALL_TRANSLATIONS"` - HOSTSETTINGS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_stngpath=$QT_INSTALL_SETTINGS"` - HOSTEXAMPLES_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_xmplpath=$QT_INSTALL_EXAMPLES"` - HOSTDEMOS_PATH_STR=`"$relpath/config.tests/unix/padstring" 268 "qt_demopath=$QT_INSTALL_DEMOS"` diff --git a/package.bak/qt/0002-eglwsegl-use-system.patch b/package.bak/qt/0002-eglwsegl-use-system.patch deleted file mode 100644 index cb3038138f..0000000000 --- a/package.bak/qt/0002-eglwsegl-use-system.patch +++ /dev/null @@ -1,802 +0,0 @@ -Patch to remove obsolete powervr headers and instead use the headers provided -on the system. - -Signed-off-by: Spenser Gilliland ---- -Index: qt-4.8.5/src/3rdparty/powervr/pvr2d.h -=================================================================== ---- qt-4.8.5.orig/src/3rdparty/powervr/pvr2d.h 2013-07-08 11:24:33.010516867 -0500 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,502 +0,0 @@ --/*!**************************************************************************** --@File pvr2d.h --@Title PVR2D external header file --@Author Imagination Technologies --@Copyright Copyright (c) by Imagination Technologies Limited. -- This specification is protected by copyright laws and contains -- material proprietary to Imagination Technologies Limited. -- You may use and distribute this specification free of charge for implementing -- the functionality therein, without altering or removing any trademark, copyright, -- or other notice from the specification. --@Platform Generic --@Description PVR2D definitions for PVR2D clients --******************************************************************************/ -- -- --/****************************************************************************** --Modifications :- --$Log: pvr2d.h $ --******************************************************************************/ -- --#ifndef _PVR2D_H_ --#define _PVR2D_H_ -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* PVR2D Platform-specific definitions */ --#define PVR2D_EXPORT --#define PVR2D_IMPORT -- -- --#define PVR2D_REV_MAJOR 2 --#define PVR2D_REV_MINOR 1 -- --typedef enum --{ -- PVR2D_FALSE = 0, -- PVR2D_TRUE --} PVR2D_BOOL; -- -- --/* error codes */ --typedef enum --{ -- PVR2D_OK = 0, -- PVR2DERROR_INVALID_PARAMETER = -1, -- PVR2DERROR_DEVICE_UNAVAILABLE = -2, -- PVR2DERROR_INVALID_CONTEXT = -3, -- PVR2DERROR_MEMORY_UNAVAILABLE = -4, -- PVR2DERROR_DEVICE_NOT_PRESENT = -5, -- PVR2DERROR_IOCTL_ERROR = -6, -- PVR2DERROR_GENERIC_ERROR = -7, -- PVR2DERROR_BLT_NOTCOMPLETE = -8, -- PVR2DERROR_HW_FEATURE_NOT_SUPPORTED = -9, -- PVR2DERROR_NOT_YET_IMPLEMENTED = -10, -- PVR2DERROR_MAPPING_FAILED = -11 --}PVR2DERROR; -- -- --/* pixel formats */ --typedef enum --{ -- PVR2D_1BPP = 0, -- PVR2D_RGB565, -- PVR2D_ARGB4444, -- PVR2D_RGB888, -- PVR2D_ARGB8888, -- PVR2D_ARGB1555, -- PVR2D_ALPHA8, -- PVR2D_ALPHA4, -- PVR2D_PAL2, -- PVR2D_PAL4, -- PVR2D_PAL8, -- PVR2D_VGAEMU -- --}PVR2DFORMAT; -- -- --/* wrap surface type */ --typedef enum --{ -- PVR2D_WRAPFLAG_NONCONTIGUOUS = 0, -- PVR2D_WRAPFLAG_CONTIGUOUS = 1, -- --}PVR2DWRAPFLAGS; -- --/* flags for control information of additional blits */ --typedef enum --{ -- PVR2D_BLIT_DISABLE_ALL = 0x0000, /* disable all additional controls */ -- PVR2D_BLIT_CK_ENABLE = 0x0001, /* enable colour key */ -- PVR2D_BLIT_GLOBAL_ALPHA_ENABLE = 0x0002, /* enable standard global alpha */ -- PVR2D_BLIT_PERPIXEL_ALPHABLEND_ENABLE = 0x0004, /* enable per-pixel alpha bleding */ -- PVR2D_BLIT_PAT_SURFACE_ENABLE = 0x0008, /* enable pattern surf (disable fill) */ -- PVR2D_BLIT_FULLY_SPECIFIED_ALPHA_ENABLE = 0x0010, /* enable fully specified alpha */ -- PVR2D_BLIT_ROT_90 = 0x0020, /* apply 90 degree rotation to the blt */ -- PVR2D_BLIT_ROT_180 = 0x0040, /* apply 180 degree rotation to the blt */ -- PVR2D_BLIT_ROT_270 = 0x0080, /* apply 270 degree rotation to the blt */ -- PVR2D_BLIT_COPYORDER_TL2BR = 0x0100, /* copy order overrides */ -- PVR2D_BLIT_COPYORDER_BR2TL = 0x0200, -- PVR2D_BLIT_COPYORDER_TR2BL = 0x0400, -- PVR2D_BLIT_COPYORDER_BL2TR = 0x0800, -- PVR2D_BLIT_COLKEY_SOURCE = 0x1000, /* Key colour is on the source surface */ -- PVR2D_BLIT_COLKEY_DEST = 0x2000 /* Key colour is on the destination surface */ -- --} PVR2DBLITFLAGS; -- --/* standard alpha-blending functions, AlphaBlendingFunc field of PVR2DBLTINFO */ --typedef enum --{ -- PVR2D_ALPHA_OP_SRC_DSTINV = 1, /* source alpha : Cdst = Csrc*Asrc + Cdst*(1-Asrc) */ -- PVR2D_ALPHA_OP_SRCP_DSTINV = 2 /* premultiplied source alpha : Cdst = Csrc + Cdst*(1-Asrc) */ --} PVR2D_ALPHABLENDFUNC; -- --/* blend ops for fully specified alpha */ --typedef enum --{ -- PVR2D_BLEND_OP_ZERO = 0, -- PVR2D_BLEND_OP_ONE = 1, -- PVR2D_BLEND_OP_SRC = 2, -- PVR2D_BLEND_OP_DST = 3, -- PVR2D_BLEND_OP_GLOBAL = 4, -- PVR2D_BLEND_OP_SRC_PLUS_GLOBAL = 5, -- PVR2D_BLEND_OP_DST_PLUS_GLOBAL = 6 --}PVR2D_BLEND_OP; -- -- --typedef void* PVR2D_HANDLE; -- -- --/* Fully specified alpha blend : pAlpha field of PVR2DBLTINFO structure */ --/* a fully specified Alpha Blend operation is defined as */ --/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (ALPHA_3 * DST (ALPHA)) */ --/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (ALPHA_4 * DST (RGB)) */ --/* if the pre-multiplication stage is enabled then the equations become the following: */ --/* PRE_MUL = ((SRC(A)) * (Global Alpha Value)) */ --/* DST (ALPHA) = (ALPHA_1 * SRC (ALPHA)) + (PRE_MUL * DST (ALPHA)) */ --/* DST (RGB) = (ALPHA_2 * SRC (RGB)) + (PRE_MUL * DST (RGB)) */ --/* if the transparent source alpha stage is enabled then a source alpha of zero forces the */ --/* source to be transparent for that pixel regardless of the blend equation being used. */ --typedef struct _PVR2D_ALPHABLT --{ -- PVR2D_BLEND_OP eAlpha1; -- PVR2D_BOOL bAlpha1Invert; -- PVR2D_BLEND_OP eAlpha2; -- PVR2D_BOOL bAlpha2Invert; -- PVR2D_BLEND_OP eAlpha3; -- PVR2D_BOOL bAlpha3Invert; -- PVR2D_BLEND_OP eAlpha4; -- PVR2D_BOOL bAlpha4Invert; -- PVR2D_BOOL bPremulAlpha; /* enable pre-multiplication stage */ -- PVR2D_BOOL bTransAlpha; /* enable transparent source alpha stage */ -- PVR2D_BOOL bUpdateAlphaLookup; /* enable and update the 1555-Lookup alpha table */ -- unsigned char uAlphaLookup0; /* 8 bit alpha when A=0 in a 1555-Lookup surface */ -- unsigned char uAlphaLookup1; /* 8 bit alpha when A=1 in a 1555-Lookup surface */ -- unsigned char uGlobalRGB; /* Global Alpha Value for RGB, 0=transparent 255=opaque */ -- unsigned char uGlobalA; /* Global Alpha Value for Alpha */ -- --} PVR2D_ALPHABLT, *PPVR2D_ALPHABLT; -- -- --/* surface memory info structure */ --typedef struct _PVR2DMEMINFO --{ -- void *pBase; -- unsigned long ui32MemSize; -- unsigned long ui32DevAddr; -- unsigned long ulFlags; -- void *hPrivateData; -- void *hPrivateMapData; -- --}PVR2DMEMINFO, *PPVR2DMEMINFO; -- -- --#define PVR2D_MAX_DEVICE_NAME 20 -- --typedef struct _PVR2DDEVICEINFO --{ -- unsigned long ulDevID; -- char szDeviceName[PVR2D_MAX_DEVICE_NAME]; --}PVR2DDEVICEINFO; -- -- --typedef struct _PVR2DISPLAYINFO --{ -- unsigned long ulMaxFlipChains; -- unsigned long ulMaxBuffersInChain; -- PVR2DFORMAT eFormat; -- unsigned long ulWidth; -- unsigned long ulHeight; -- long lStride; -- unsigned long ulMinFlipInterval; -- unsigned long ulMaxFlipInterval; -- --}PVR2DDISPLAYINFO; -- -- --typedef struct _PVR2DBLTINFO --{ -- unsigned long CopyCode; /* rop code */ -- unsigned long Colour; /* fill colour */ -- unsigned long ColourKey; /* colour key */ -- unsigned char GlobalAlphaValue; /* global alpha blending */ -- unsigned char AlphaBlendingFunc; /* per-pixel alpha-blending function */ -- -- PVR2DBLITFLAGS BlitFlags; /* additional blit control information */ -- -- PVR2DMEMINFO *pDstMemInfo; /* destination memory */ -- unsigned long DstOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */ -- long DstStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ -- long DstX, DstY; /* pixel offset from start of dest surface to start of blt rectangle */ -- long DSizeX,DSizeY; /* blt size */ -- PVR2DFORMAT DstFormat; /* dest format */ -- unsigned long DstSurfWidth; /* size of dest surface in pixels */ -- unsigned long DstSurfHeight; /* size of dest surface in pixels */ -- -- PVR2DMEMINFO *pSrcMemInfo; /* source mem, (source fields are also used for patterns) */ -- unsigned long SrcOffset; /* byte offset from start of allocation to src/pat surface pixel 0,0 */ -- long SrcStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ -- long SrcX, SrcY; /* pixel offset from start of surface to start of source rectangle */ -- /* for patterns this is the start offset within the pattern */ -- long SizeX,SizeY; /* source rectangle size or pattern size in pixels */ -- PVR2DFORMAT SrcFormat; /* source/pattern format */ -- PVR2DMEMINFO *pPalMemInfo; /* source/pattern palette memory containing argb8888 colour table */ -- unsigned long PalOffset; /* byte offset from start of allocation to start of palette */ -- unsigned long SrcSurfWidth; /* size of source surface in pixels */ -- unsigned long SrcSurfHeight; /* size of source surface in pixels */ -- -- PVR2DMEMINFO *pMaskMemInfo; /* mask memory, 1bpp format implied */ -- unsigned long MaskOffset; /* byte offset from start of allocation to mask surface pixel 0,0 */ -- long MaskStride; /* signed stride, the number of bytes from pixel 0,0 to 0,1 */ -- long MaskX, MaskY; /* mask rect top left (mask size = blt size) */ -- unsigned long MaskSurfWidth; /* size of mask surface in pixels */ -- unsigned long MaskSurfHeight; /* size of mask surface in pixels */ -- -- PPVR2D_ALPHABLT pAlpha; /* fully specified alpha blend */ -- --}PVR2DBLTINFO, *PPVR2DBLTINFO; -- --typedef struct _PVR2DRECT --{ -- long left, top; -- long right, bottom; --} PVR2DRECT; -- --typedef struct --{ -- PVR2DMEMINFO *pSurfMemInfo; /* surface memory */ -- unsigned long SurfOffset; /* byte offset from start of allocation to destination surface pixel 0,0 */ -- long Stride; /* signed stride */ -- PVR2DFORMAT Format; -- unsigned long SurfWidth; /* surface size in pixels */ -- unsigned long SurfHeight; -- --} PVR2D_SURFACE, *PPVR2D_SURFACE; -- --typedef struct --{ -- unsigned long *pUseCode; /* USSE code */ -- unsigned long UseCodeSize; /* usse code size in bytes */ -- --} PVR2D_USECODE, *PPVR2D_USECODE; -- --typedef struct --{ -- PVR2D_SURFACE sDst; /* destination surface */ -- PVR2D_SURFACE sSrc; /* source surface */ -- PVR2DRECT rcDest; /* destination rectangle */ -- PVR2DRECT rcSource; /* source rectangle */ -- PVR2D_HANDLE hUseCode; /* custom USE code (NULL implies source copy) */ -- unsigned long UseParams[2]; /* per-blt params for use code */ -- --} PVR2D_3DBLT, *PPVR2D_3DBLT; -- -- --#define MAKE_COPY_BLIT(src,soff,dest,doff,sx,sy,dx,dy,sz) -- --typedef void* PVR2DCONTEXTHANDLE; --typedef void* PVR2DFLIPCHAINHANDLE; -- -- --// CopyCode field of PVR2DBLTINFO structure: --// the CopyCode field of the PVR2DBLTINFO structure should contain a rop3 or rop4 code. --// a rop3 is an 8 bit code that describes a blt with three inputs : source dest and pattern --// rop4 is a 16 bit code that describes a blt with four inputs : source dest pattern and mask --// common rop3 codes are defined below --// a colour fill blt is processed in the pattern channel as a constant colour with a rop code of 0xF0 --// PVR2D_BLIT_PAT_SURFACE_ENABLE defines whether the pattern channel is a surface or a fill colour. --// a rop4 is defined by two rop3 codes, and the 1 bit-per-pixel mask surface defines which is used. --// a common rop4 is 0xAAF0 which is the mask copy blt used for text glyphs. --// CopyCode is taken to be a rop4 when pMaskMemInfo is non zero, otherwise it is assumed to be a rop3 --// use the PVR2DMASKROP4 macro below to construct a rop4 from two rop3's --// rop3a is the rop used when mask pixel = 1, and rop3b when mask = 0 --#define PVR2DROP4(rop3b, rop3a) ((rop3b<<8)|rop3a) -- --/* common rop codes */ --#define PVR2DROPclear 0x00 /* 0 (whiteness) */ --#define PVR2DROPset 0xFF /* 1 (blackness) */ --#define PVR2DROPnoop 0xAA /* dst (used for masked blts) */ -- --/* source and dest rop codes */ --#define PVR2DROPand 0x88 /* src AND dst */ --#define PVR2DROPandReverse 0x44 /* src AND NOT dst */ --#define PVR2DROPcopy 0xCC /* src (used for source copy and alpha blts) */ --#define PVR2DROPandInverted 0x22 /* NOT src AND dst */ --#define PVR2DROPxor 0x66 /* src XOR dst */ --#define PVR2DROPor 0xEE /* src OR dst */ --#define PVR2DROPnor 0x11 /* NOT src AND NOT dst */ --#define PVR2DROPequiv 0x99 /* NOT src XOR dst */ --#define PVR2DROPinvert 0x55 /* NOT dst */ --#define PVR2DROPorReverse 0xDD /* src OR NOT dst */ --#define PVR2DROPcopyInverted 0x33 /* NOT src */ --#define PVR2DROPorInverted 0xBB /* NOT src OR dst */ --#define PVR2DROPnand 0x77 /* NOT src OR NOT dst */ -- --/* pattern rop codes */ --#define PVR2DPATROPand 0xA0 /* pat AND dst */ --#define PVR2DPATROPandReverse 0x50 /* pat AND NOT dst */ --#define PVR2DPATROPcopy 0xF0 /* pat (used for solid color fills and pattern blts) */ --#define PVR2DPATROPandInverted 0x0A /* NOT pat AND dst */ --#define PVR2DPATROPxor 0x5A /* pat XOR dst */ --#define PVR2DPATROPor 0xFA /* pat OR dst */ --#define PVR2DPATROPnor 0x05 /* NOT pat AND NOT dst */ --#define PVR2DPATROPequiv 0xA5 /* NOT pat XOR dst */ --#define PVR2DPATROPinvert 0x55 /* NOT dst */ --#define PVR2DPATROPorReverse 0xF5 /* pat OR NOT dst */ --#define PVR2DPATROPcopyInverted 0x0F /* NOT pat */ --#define PVR2DPATROPorInverted 0xAF /* NOT pat OR dst */ --#define PVR2DPATROPnand 0x5F /* NOT pat OR NOT dst */ -- --/* common rop4 codes */ --#define PVR2DROP4MaskedCopy PVR2DROP4(PVR2DROPnoop,PVR2DROPcopy) /* masked source copy blt (used for rounded window corners etc) */ --#define PVR2DROP4MaskedFill PVR2DROP4(PVR2DROPnoop,PVR2DPATROPcopy) /* masked colour fill blt (used for text) */ -- --/* Legacy support */ --#define PVR2DROP3_PATMASK PVR2DPATROPcopy --#define PVR2DROP3_SRCMASK PVR2DROPcopy -- --/* pixmap memory alignment */ --#define PVR2D_ALIGNMENT_4 4 /* DWORD alignment */ --#define PVR2D_ALIGNMENT_ANY 0 /* no alignment */ --#define PVR2D_ALIGNMENT_PALETTE 16 /* 16 byte alignment is required for palettes */ -- --/* Heap number for PVR2DGetFrameBuffer */ --#define PVR2D_FB_PRIMARY_SURFACE 0 -- --#define PVR2D_PRESENT_PROPERTY_SRCSTRIDE (1 << 0) --#define PVR2D_PRESENT_PROPERTY_DSTSIZE (1 << 1) --#define PVR2D_PRESENT_PROPERTY_DSTPOS (1 << 2) --#define PVR2D_PRESENT_PROPERTY_CLIPRECTS (1 << 3) --#define PVR2D_PRESENT_PROPERTY_INTERVAL (1 << 4) -- -- --#define PVR2D_CREATE_FLIPCHAIN_SHARED (1 << 0) --#define PVR2D_CREATE_FLIPCHAIN_QUERY (1 << 1) -- --/* Functions that the library exports */ -- --PVR2D_IMPORT --int PVR2DEnumerateDevices(PVR2DDEVICEINFO *pDevInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DCreateDeviceContext(unsigned long ulDevID, -- PVR2DCONTEXTHANDLE* phContext, -- unsigned long ulFlags); -- --PVR2D_IMPORT --PVR2DERROR PVR2DDestroyDeviceContext(PVR2DCONTEXTHANDLE hContext); -- --PVR2D_IMPORT --PVR2DERROR PVR2DGetDeviceInfo(PVR2DCONTEXTHANDLE hContext, -- PVR2DDISPLAYINFO *pDisplayInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DGetScreenMode(PVR2DCONTEXTHANDLE hContext, -- PVR2DFORMAT *pFormat, -- long *plWidth, -- long *plHeight, -- long *plStride, -- int *piRefreshRate); -- --PVR2D_IMPORT --PVR2DERROR PVR2DGetFrameBuffer(PVR2DCONTEXTHANDLE hContext, -- int nHeap, -- PVR2DMEMINFO **ppsMemInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DMemAlloc(PVR2DCONTEXTHANDLE hContext, -- unsigned long ulBytes, -- unsigned long ulAlign, -- unsigned long ulFlags, -- PVR2DMEMINFO **ppsMemInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DMemWrap(PVR2DCONTEXTHANDLE hContext, -- void *pMem, -- unsigned long ulFlags, -- unsigned long ulBytes, -- unsigned long alPageAddress[], -- PVR2DMEMINFO **ppsMemInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DMemMap(PVR2DCONTEXTHANDLE hContext, -- unsigned long ulFlags, -- void *hPrivateMapData, -- PVR2DMEMINFO **ppsDstMem); -- --PVR2D_IMPORT --PVR2DERROR PVR2DMemFree(PVR2DCONTEXTHANDLE hContext, -- PVR2DMEMINFO *psMemInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DBlt(PVR2DCONTEXTHANDLE hContext, -- PVR2DBLTINFO *pBltInfo); -- --PVR2D_IMPORT --PVR2DERROR PVR2DBltClipped(PVR2DCONTEXTHANDLE hContext, -- PVR2DBLTINFO *pBltInfo, -- unsigned long ulNumClipRects, -- PVR2DRECT *pClipRects); -- --PVR2D_IMPORT --PVR2DERROR PVR2DQueryBlitsComplete(PVR2DCONTEXTHANDLE hContext, -- PVR2DMEMINFO *pMemInfo, -- unsigned int uiWaitForComplete); -- --PVR2D_IMPORT --PVR2DERROR PVR2DSetPresentBltProperties(PVR2DCONTEXTHANDLE hContext, -- unsigned long ulPropertyMask, -- long lSrcStride, -- unsigned long ulDstWidth, -- unsigned long ulDstHeight, -- long lDstXPos, -- long lDstYPos, -- unsigned long ulNumClipRects, -- PVR2DRECT *pClipRects, -- unsigned long ulSwapInterval); -- --PVR2D_IMPORT --PVR2DERROR PVR2DPresentBlt(PVR2DCONTEXTHANDLE hContext, -- PVR2DMEMINFO *pMemInfo, -- long lRenderID); -- --PVR2D_IMPORT --PVR2DERROR PVR2DCreateFlipChain(PVR2DCONTEXTHANDLE hContext, -- unsigned long ulFlags, -- unsigned long ulNumBuffers, -- unsigned long ulWidth, -- unsigned long ulHeight, -- PVR2DFORMAT eFormat, -- long *plStride, -- unsigned long *pulFlipChainID, -- PVR2DFLIPCHAINHANDLE *phFlipChain); -- --PVR2D_IMPORT --PVR2DERROR PVR2DDestroyFlipChain(PVR2DCONTEXTHANDLE hContext, -- PVR2DFLIPCHAINHANDLE hFlipChain); -- --PVR2D_IMPORT --PVR2DERROR PVR2DGetFlipChainBuffers(PVR2DCONTEXTHANDLE hContext, -- PVR2DFLIPCHAINHANDLE hFlipChain, -- unsigned long *pulNumBuffers, -- PVR2DMEMINFO *psMemInfo[]); -- --PVR2D_IMPORT --PVR2DERROR PVR2DSetPresentFlipProperties(PVR2DCONTEXTHANDLE hContext, -- PVR2DFLIPCHAINHANDLE hFlipChain, -- unsigned long ulPropertyMask, -- long lDstXPos, -- long lDstYPos, -- unsigned long ulNumClipRects, -- PVR2DRECT *pClipRects, -- unsigned long ulSwapInterval); -- --PVR2D_IMPORT --PVR2DERROR PVR2DPresentFlip(PVR2DCONTEXTHANDLE hContext, -- PVR2DFLIPCHAINHANDLE hFlipChain, -- PVR2DMEMINFO *psMemInfo, -- long lRenderID); -- --PVR2D_IMPORT --PVR2DERROR PVR2DGetAPIRev(long *lRevMajor, long *lRevMinor); -- --PVR2D_IMPORT --PVR2DERROR PVR2DLoadUseCode (const PVR2DCONTEXTHANDLE hContext, const unsigned char *pUseCode, -- const unsigned long UseCodeSize, PVR2D_HANDLE *pUseCodeHandle); --PVR2D_IMPORT --PVR2DERROR PVR2DFreeUseCode (const PVR2DCONTEXTHANDLE hContext, const PVR2D_HANDLE hUseCodeHandle); -- --PVR2D_IMPORT --PVR2DERROR PVR2DBlt3D (const PVR2DCONTEXTHANDLE hContext, const PPVR2D_3DBLT pBlt3D); -- --#ifdef __cplusplus --} --#endif -- --#endif /* _PVR2D_H_ */ -- --/****************************************************************************** -- End of file (pvr2d.h) --******************************************************************************/ -Index: qt-4.8.5/src/3rdparty/powervr/wsegl.h -=================================================================== ---- qt-4.8.5.orig/src/3rdparty/powervr/wsegl.h 2013-07-08 11:24:33.010516867 -0500 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,240 +0,0 @@ --/****************************************************************************** -- Name : wsegl.h -- Copyright : Copyright (c) Imagination Technologies Limited. -- This specification is protected by copyright laws and contains -- material proprietary to Imagination Technologies Limited. -- You may use and distribute this specification free of charge for implementing -- the functionality therein, without altering or removing any trademark, copyright, -- or other notice from the specification. -- Platform : ANSI --*****************************************************************************/ -- -- --#if !defined(__WSEGL_H__) --#define __WSEGL_H__ -- --#ifdef __cplusplus --extern "C" { --#endif -- --/* --// WSEGL Platform-specific definitions --*/ --#define WSEGL_EXPORT --#define WSEGL_IMPORT -- --/* --// WSEGL API Version Number --*/ -- --#define WSEGL_VERSION 1 --#define WSEGL_DEFAULT_DISPLAY 0 --#define WSEGL_DEFAULT_NATIVE_ENGINE 0 -- --#define WSEGL_FALSE 0 --#define WSEGL_TRUE 1 --#define WSEGL_NULL 0 -- --#define WSEGL_UNREFERENCED_PARAMETER(param) (param) = (param) -- --/* --// WSEGL handles --*/ --typedef void *WSEGLDisplayHandle; --typedef void *WSEGLDrawableHandle; -- --/* --// Display capability type --*/ --typedef enum WSEGLCapsType_TAG --{ -- WSEGL_NO_CAPS = 0, -- WSEGL_CAP_MIN_SWAP_INTERVAL = 1, /* System default value = 1 */ -- WSEGL_CAP_MAX_SWAP_INTERVAL = 2, /* System default value = 1 */ -- WSEGL_CAP_WINDOWS_USE_HW_SYNC = 3, /* System default value = 0 (FALSE) */ -- WSEGL_CAP_PIXMAPS_USE_HW_SYNC = 4, /* System default value = 0 (FALSE) */ -- --} WSEGLCapsType; -- --/* --// Display capability --*/ --typedef struct WSEGLCaps_TAG --{ -- WSEGLCapsType eCapsType; -- unsigned long ui32CapsValue; -- --} WSEGLCaps; -- --/* --// Drawable type --*/ --#define WSEGL_NO_DRAWABLE 0x0 --#define WSEGL_DRAWABLE_WINDOW 0x1 --#define WSEGL_DRAWABLE_PIXMAP 0x2 -- -- --/* --// Pixel format of display/drawable --*/ --typedef enum WSEGLPixelFormat_TAG --{ -- WSEGL_PIXELFORMAT_565 = 0, -- WSEGL_PIXELFORMAT_4444 = 1, -- WSEGL_PIXELFORMAT_8888 = 2, -- WSEGL_PIXELFORMAT_1555 = 3 -- --} WSEGLPixelFormat; -- --/* --// Transparent of display/drawable --*/ --typedef enum WSEGLTransparentType_TAG --{ -- WSEGL_OPAQUE = 0, -- WSEGL_COLOR_KEY = 1, -- --} WSEGLTransparentType; -- --/* --// Display/drawable configuration --*/ --typedef struct WSEGLConfig_TAG --{ -- /* -- // Type of drawables this configuration applies to - -- // OR'd values of drawable types. -- */ -- unsigned long ui32DrawableType; -- -- /* Pixel format */ -- WSEGLPixelFormat ePixelFormat; -- -- /* Native Renderable - set to WSEGL_TRUE if native renderable */ -- unsigned long ulNativeRenderable; -- -- /* FrameBuffer Level Parameter */ -- unsigned long ulFrameBufferLevel; -- -- /* Native Visual ID */ -- unsigned long ulNativeVisualID; -- -- /* Native Visual */ -- void *hNativeVisual; -- -- /* Transparent Type */ -- WSEGLTransparentType eTransparentType; -- -- /* Transparent Color - only used if transparent type is COLOR_KEY */ -- unsigned long ulTransparentColor; /* packed as 0x00RRGGBB */ -- -- --} WSEGLConfig; -- --/* --// WSEGL errors --*/ --typedef enum WSEGLError_TAG --{ -- WSEGL_SUCCESS = 0, -- WSEGL_CANNOT_INITIALISE = 1, -- WSEGL_BAD_NATIVE_DISPLAY = 2, -- WSEGL_BAD_NATIVE_WINDOW = 3, -- WSEGL_BAD_NATIVE_PIXMAP = 4, -- WSEGL_BAD_NATIVE_ENGINE = 5, -- WSEGL_BAD_DRAWABLE = 6, -- WSEGL_BAD_CONFIG = 7, -- WSEGL_OUT_OF_MEMORY = 8 -- --} WSEGLError; -- --/* --// Drawable orientation (in degrees anti-clockwise) --*/ --typedef enum WSEGLRotationAngle_TAG --{ -- WSEGL_ROTATE_0 = 0, -- WSEGL_ROTATE_90 = 1, -- WSEGL_ROTATE_180 = 2, -- WSEGL_ROTATE_270 = 3 -- --} WSEGLRotationAngle; -- --/* --// Drawable information required by OpenGL-ES driver --*/ --typedef struct WSEGLDrawableParams_TAG --{ -- /* Width in pixels of the drawable */ -- unsigned long ui32Width; -- -- /* Height in pixels of the drawable */ -- unsigned long ui32Height; -- -- /* Stride in pixels of the drawable */ -- unsigned long ui32Stride; -- -- /* Pixel format of the drawable */ -- WSEGLPixelFormat ePixelFormat; -- -- /* User space cpu virtual address of the drawable */ -- void *pvLinearAddress; -- -- /* HW address of the drawable */ -- unsigned long ui32HWAddress; -- -- /* Private data for the drawable */ -- void *hPrivateData; -- --} WSEGLDrawableParams; -- -- --/* --// Table of function pointers that is returned by WSEGL_GetFunctionTablePointer() --// --// The first entry in the table is the version number of the wsegl.h header file that --// the module has been written against, and should therefore be set to WSEGL_VERSION --*/ --typedef struct WSEGL_FunctionTable_TAG --{ -- unsigned long ui32WSEGLVersion; -- -- WSEGLError (*pfnWSEGL_IsDisplayValid)(NativeDisplayType); -- -- WSEGLError (*pfnWSEGL_InitialiseDisplay)(NativeDisplayType, WSEGLDisplayHandle *, const WSEGLCaps **, WSEGLConfig **); -- -- WSEGLError (*pfnWSEGL_CloseDisplay)(WSEGLDisplayHandle); -- -- WSEGLError (*pfnWSEGL_CreateWindowDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativeWindowType, WSEGLRotationAngle *); -- -- WSEGLError (*pfnWSEGL_CreatePixmapDrawable)(WSEGLDisplayHandle, WSEGLConfig *, WSEGLDrawableHandle *, NativePixmapType, WSEGLRotationAngle *); -- -- WSEGLError (*pfnWSEGL_DeleteDrawable)(WSEGLDrawableHandle); -- -- WSEGLError (*pfnWSEGL_SwapDrawable)(WSEGLDrawableHandle, unsigned long); -- -- WSEGLError (*pfnWSEGL_SwapControlInterval)(WSEGLDrawableHandle, unsigned long); -- -- WSEGLError (*pfnWSEGL_WaitNative)(WSEGLDrawableHandle, unsigned long); -- -- WSEGLError (*pfnWSEGL_CopyFromDrawable)(WSEGLDrawableHandle, NativePixmapType); -- -- WSEGLError (*pfnWSEGL_CopyFromPBuffer)(void *, unsigned long, unsigned long, unsigned long, WSEGLPixelFormat, NativePixmapType); -- -- WSEGLError (*pfnWSEGL_GetDrawableParameters)(WSEGLDrawableHandle, WSEGLDrawableParams *, WSEGLDrawableParams *); -- -- --} WSEGL_FunctionTable; -- -- --WSEGL_IMPORT const WSEGL_FunctionTable *WSEGL_GetFunctionTablePointer(void); -- --#ifdef __cplusplus --} --#endif -- --#endif /* __WSEGL_H__ */ -- --/****************************************************************************** -- End of file (wsegl.h) --******************************************************************************/ -Index: qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c -=================================================================== ---- qt-4.8.5.orig/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2013-07-08 11:24:33.010516867 -0500 -+++ qt-4.8.5/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c 2013-07-08 11:28:26.142521123 -0500 -@@ -39,7 +39,7 @@ - ** - ****************************************************************************/ - --#include -+#include - #include - #include - #include -@@ -379,6 +379,20 @@ - return WSEGL_SUCCESS; - } - -+/* Function stub for ConnectDrawable() */ -+static WSEGLError wseglConnectDrawable(WSEGLDrawableHandle hDrawable) -+{ -+ WSEGL_UNREFERENCED_PARAMETER(hDrawable); -+ return WSEGL_SUCCESS; -+} -+ -+/* Function stub for DisconnectDrawable() */ -+static WSEGLError wseglDisconnectDrawable(WSEGLDrawableHandle hDrawable) -+{ -+ WSEGL_UNREFERENCED_PARAMETER(hDrawable); -+ return WSEGL_SUCCESS; -+} -+ - static WSEGL_FunctionTable const wseglFunctions = { - WSEGL_VERSION, - wseglIsDisplayValid, -@@ -392,7 +406,9 @@ - wseglWaitNative, - wseglCopyFromDrawable, - wseglCopyFromPBuffer, -- wseglGetDrawableParameters -+ wseglGetDrawableParameters, -+ wseglConnectDrawable, -+ wseglDisconnectDrawable - }; - - /* Return the table of WSEGL functions to the EGL implementation */ diff --git a/package.bak/qt/0003-fix-const-atomics.patch b/package.bak/qt/0003-fix-const-atomics.patch deleted file mode 100644 index 64853565e8..0000000000 --- a/package.bak/qt/0003-fix-const-atomics.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d4d07dac01796b2aa0fb501c14865cab7e42b3a9 Mon Sep 17 00:00:00 2001 -From: Mischa Jonker -Date: Sun, 4 Nov 2012 11:42:04 +0100 -Subject: [PATCH] Fix const-related build error in generic atomic ops - -It's still not entirely const-correct though. In all other architectures -this is obfuscated through the use of inline asm (which the compiler -doesn't check). This patch obfuscates through const_cast ---- - src/corelib/arch/generic/qatomic_generic_unix.cpp | 8 ++++---- - src/corelib/arch/qatomic_generic.h | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/corelib/arch/generic/qatomic_generic_unix.cpp b/src/corelib/arch/generic/qatomic_generic_unix.cpp -index 1c6cbf0..6fce81d 100644 ---- a/src/corelib/arch/generic/qatomic_generic_unix.cpp -+++ b/src/corelib/arch/generic/qatomic_generic_unix.cpp -@@ -85,13 +85,13 @@ int QBasicAtomicInt_fetchAndAddOrdered(volatile int *_q_value, int valueToAdd) - - Q_CORE_EXPORT - bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *_q_value, -- void *expectedValue, -- void *newValue) -+ const void *expectedValue, -+ const void *newValue) - { - bool returnValue = false; - pthread_mutex_lock(&qAtomicMutex); - if (*_q_value == expectedValue) { -- *_q_value = newValue; -+ *_q_value = const_cast(newValue); - returnValue = true; - } - pthread_mutex_unlock(&qAtomicMutex); -diff --git a/src/corelib/arch/qatomic_generic.h b/src/corelib/arch/qatomic_generic.h -index 621a767..4c14679 100644 ---- a/src/corelib/arch/qatomic_generic.h -+++ b/src/corelib/arch/qatomic_generic.h -@@ -105,7 +105,7 @@ Q_CORE_EXPORT bool QBasicAtomicInt_testAndSetOrdered(volatile int *, int, int); - Q_CORE_EXPORT int QBasicAtomicInt_fetchAndStoreOrdered(volatile int *, int); - Q_CORE_EXPORT int QBasicAtomicInt_fetchAndAddOrdered(volatile int *, int); - --Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, void *, void *); -+Q_CORE_EXPORT bool QBasicAtomicPointer_testAndSetOrdered(void * volatile *, const void *, const void *); - Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndStoreOrdered(void * volatile *, void *); - Q_CORE_EXPORT void *QBasicAtomicPointer_fetchAndAddOrdered(void * volatile *, qptrdiff); - --- -1.7.0.4 - diff --git a/package.bak/qt/0004-pthread_getattr_np.patch b/package.bak/qt/0004-pthread_getattr_np.patch deleted file mode 100644 index 28f0c8411b..0000000000 --- a/package.bak/qt/0004-pthread_getattr_np.patch +++ /dev/null @@ -1,107 +0,0 @@ -Add pthred_getattr_np / phread_attr_getstrack alternatives for uClibc - -Based on https://dev.openwrt.org/log/packages/Xorg/lib/qt4/patches/100-fix-webkit-for-uclibc.patch?rev=20371 - -Signed-off-by: Johan Sagaert ---- - src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp | 61 ++++++++++ - 1 file changed, 61 insertions(+) - -Index: qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -=================================================================== ---- qt-everywhere-opensource-src-4.8.1.orig/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -+++ qt-everywhere-opensource-src-4.8.1/src/3rdparty/javascriptcore/JavaScriptCore/runtime/Collector.cpp -@@ -70,6 +70,23 @@ - #endif - #include - -+#if defined(QT_LINUXBASE) -+#include -+#endif -+ -+#if defined(__UCLIBC__) -+// versions of uClibc 0.9.32 and below with linuxthreads.old do not have -+// pthread_getattr_np or pthread_attr_getstack. -+#if __UCLIBC_MAJOR__ == 0 && \ -+ (__UCLIBC_MINOR__ < 9 || \ -+ (__UCLIBC_MINOR__ == 9 && __UCLIBC_SUBLEVEL__ <= 32)) && \ -+ defined(__LINUXTHREADS_OLD__) -+#define UCLIBC_USE_PROC_SELF_MAPS 1 -+#include -+extern int *__libc_stack_end; -+#endif -+#endif -+ - #if OS(SOLARIS) - #include - #else -@@ -648,6 +665,37 @@ - get_thread_info(find_thread(NULL), &threadInfo); - return threadInfo.stack_end; - #elif OS(UNIX) -+#ifdef UCLIBC_USE_PROC_SELF_MAPS -+ // Read /proc/self/maps and locate the line whose address -+ // range contains __libc_stack_end. -+ FILE *file = fopen("/proc/self/maps", "r"); -+ if (!file) -+ return 0; -+ __fsetlocking(file, FSETLOCKING_BYCALLER); -+ char *line = NULL; -+ size_t lineLen = 0; -+ while (!feof_unlocked(file)) { -+ if (getdelim(&line, &lineLen, '\n', file) <= 0) -+ break; -+ -+ long from; -+ long to; -+ if (sscanf (line, "%lx-%lx", &from, &to) != 2) -+ continue; -+ if (from <= (long)__libc_stack_end && (long)__libc_stack_end < to) { -+ fclose(file); -+ free(line); -+#ifdef _STACK_GROWS_UP -+ return (void *)from; -+#else -+ return (void *)to; -+#endif -+ } -+ } -+ fclose(file); -+ free(line); -+ return 0; -+#else - AtomicallyInitializedStatic(Mutex&, mutex = *new Mutex); - MutexLocker locker(mutex); - static void* stackBase = 0; -@@ -655,11 +703,23 @@ - static pthread_t stackThread; - pthread_t thread = pthread_self(); - if (stackBase == 0 || thread != stackThread) { -+ -+#if defined(QT_LINUXBASE) -+ // LinuxBase is missing pthread_getattr_np - resolve it once at runtime instead -+ // see http://bugs.linuxbase.org/show_bug.cgi?id=2364 -+ typedef int (*GetAttrPtr)(pthread_t, pthread_attr_t *); -+ static int (*pthread_getattr_np_ptr)(pthread_t, pthread_attr_t *) = 0; -+ if (!pthread_getattr_np_ptr) -+ *(void **)&pthread_getattr_np_ptr = dlsym(RTLD_DEFAULT, "pthread_getattr_np"); -+#endif - pthread_attr_t sattr; - pthread_attr_init(&sattr); - #if HAVE(PTHREAD_NP_H) || OS(NETBSD) - // e.g. on FreeBSD 5.4, neundorf@kde.org - pthread_attr_get_np(thread, &sattr); -+#elif defined(QT_LINUXBASE) -+ if (pthread_getattr_np_ptr) -+ pthread_getattr_np_ptr(thread, &sattr); - #else - // FIXME: this function is non-portable; other POSIX systems may have different np alternatives - pthread_getattr_np(thread, &sattr); -@@ -671,6 +731,7 @@ - stackThread = thread; - } - return static_cast(stackBase) + stackSize; -+#endif - #else - #error Need a way to get the stack base on this platform - #endif diff --git a/package.bak/qt/0005-script-qtdbus-no-gui.patch b/package.bak/qt/0005-script-qtdbus-no-gui.patch deleted file mode 100644 index e29e9e4a1b..0000000000 --- a/package.bak/qt/0005-script-qtdbus-no-gui.patch +++ /dev/null @@ -1,22 +0,0 @@ -[PATCH] fix build with script+dbus enabled, but no gui - -The script/qtdbus plugin doesn't need gui support, so don't try to -link it against libQtGui. - -Signed-off-by: Peter Korsgaard ---- - src/plugins/script/qtdbus/qtdbus.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro -=================================================================== ---- qt-4.7.3.orig/src/plugins/script/qtdbus/qtdbus.pro -+++ qt-4.7.3/src/plugins/script/qtdbus/qtdbus.pro -@@ -1,6 +1,6 @@ - TARGET = qtscriptdbus - include(../../qpluginbase.pri) --QT = core gui script -+QT = core script - CONFIG += qdbus - - SOURCES += main.cpp diff --git a/package.bak/qt/0006-Add-initial-support-of-ARC-architecture.patch b/package.bak/qt/0006-Add-initial-support-of-ARC-architecture.patch deleted file mode 100644 index 4470d3b0df..0000000000 --- a/package.bak/qt/0006-Add-initial-support-of-ARC-architecture.patch +++ /dev/null @@ -1,183 +0,0 @@ -From a695eec2ef21240bbc6cd8cd1bdbab76f8da8dfd Mon Sep 17 00:00:00 2001 -From: Vineet Gupta -Date: Wed, 20 May 2015 10:37:25 +0300 -Subject: [PATCH 1/2] Add initial support of ARC architecture - -DesignWare ARC 700 and ARC HS38 are families of 32-bit CPUs -developed by Synopsys, Inc. - -This change implements following: - [1] Defines ARC as one embedded targets - [2] Defines default tools prefixed for ARC like - arc-linux-g++ etc - [3] Defines "inotify" syscall numbers for ARC - (note ARC fully compliant to Linux UAPI headers) - [4] Disables 16-bit aligned data access - -For now we're using generic atomic ops even though it may -introduce performance panalty. - -Change-Id: I91e879ac55c2f3643a544f97cd59671a81ccc3c2 - -This patch was submited in upstream Qt4 and if it ever gets accepted, -it should be removed from Buildroot. - -https://codereview.qt-project.org/#/c/112667 ---- - configure | 6 ++++ - mkspecs/qws/linux-arc-g++/qmake.conf | 21 ++++++++++++++ - mkspecs/qws/linux-arc-g++/qplatformdefs.h | 42 +++++++++++++++++++++++++++ - src/corelib/arch/qatomic_arch.h | 2 ++ - src/corelib/io/qfilesystemwatcher_inotify.cpp | 5 ++++ - src/gui/painting/qblendfunctions.cpp | 4 +-- - 6 files changed, 78 insertions(+), 2 deletions(-) - create mode 100644 mkspecs/qws/linux-arc-g++/qmake.conf - create mode 100644 mkspecs/qws/linux-arc-g++/qplatformdefs.h - -diff --git a/configure b/configure -index 10ad7ca..c7ef074 100755 ---- a/configure -+++ b/configure -@@ -2829,6 +2829,9 @@ if [ "$CFG_EMBEDDED" != "no" ]; then - *86_64) - CFG_EMBEDDED=x86_64 - ;; -+ *arc) -+ CFG_EMBEDDED=arc -+ ;; - *) - CFG_EMBEDDED=generic - ;; -@@ -3309,6 +3312,9 @@ if [ "$PLATFORM" != "$XPLATFORM" -a "$CFG_EMBEDDED" != "no" ]; then - arm*) - CFG_ARCH=arm - ;; -+ arc) -+ CFG_ARCH=arc -+ ;; - *) - CFG_ARCH="$CFG_EMBEDDED" - ;; -diff --git a/mkspecs/qws/linux-arc-g++/qmake.conf b/mkspecs/qws/linux-arc-g++/qmake.conf -new file mode 100644 -index 0000000..a14587b ---- /dev/null -+++ b/mkspecs/qws/linux-arc-g++/qmake.conf -@@ -0,0 +1,21 @@ -+# -+# qmake configuration for building with arc-linux-g++ -+# -+ -+include(../../common/linux.conf) -+include(../../common/gcc-base-unix.conf) -+include(../../common/g++-unix.conf) -+include(../../common/qws.conf) -+ -+# modifications to g++.conf -+QMAKE_CC = arc-linux-gcc -+QMAKE_CXX = arc-linux-g++ -+QMAKE_LINK = arc-linux-g++ -+QMAKE_LINK_SHLIB = arc-linux-g++ -+ -+# modifications to linux.conf -+QMAKE_AR = arc-linux-ar cqs -+QMAKE_OBJCOPY = arc-linux-objcopy -+QMAKE_STRIP = arc-linux-strip -+ -+load(qt_config) -diff --git a/mkspecs/qws/linux-arc-g++/qplatformdefs.h b/mkspecs/qws/linux-arc-g++/qplatformdefs.h -new file mode 100644 -index 0000000..a654aa7 ---- /dev/null -+++ b/mkspecs/qws/linux-arc-g++/qplatformdefs.h -@@ -0,0 +1,42 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2015 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ -+** -+** This file is part of the qmake spec of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see http://www.qt.io/terms-conditions. For further -+** information use the contact form at http://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 or version 3 as published by the Free -+** Software Foundation and appearing in the file LICENSE.LGPLv21 and -+** LICENSE.LGPLv3 included in the packaging of this file. Please review the -+** following information to ensure the GNU Lesser General Public License -+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** As a special exception, The Qt Company gives you certain additional -+** rights. These rights are described in The Qt Company LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** GNU General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU -+** General Public License version 3.0 as published by the Free Software -+** Foundation and appearing in the file LICENSE.GPL included in the -+** packaging of this file. Please review the following information to -+** ensure the GNU General Public License version 3.0 requirements will be -+** met: http://www.gnu.org/copyleft/gpl.html. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include "../../linux-g++/qplatformdefs.h" -diff --git a/src/corelib/arch/qatomic_arch.h b/src/corelib/arch/qatomic_arch.h -index d154b7e..a48c42a 100644 ---- a/src/corelib/arch/qatomic_arch.h -+++ b/src/corelib/arch/qatomic_arch.h -@@ -94,6 +94,8 @@ QT_BEGIN_HEADER - # include "QtCore/qatomic_sh4a.h" - #elif defined(QT_ARCH_NACL) - # include "QtCore/qatomic_generic.h" -+#elif defined(QT_ARCH_ARC) -+# include "QtCore/qatomic_generic.h" - #else - # error "Qt has not been ported to this architecture" - #endif -diff --git a/src/corelib/io/qfilesystemwatcher_inotify.cpp b/src/corelib/io/qfilesystemwatcher_inotify.cpp -index 8bca422..e3e2565 100644 ---- a/src/corelib/io/qfilesystemwatcher_inotify.cpp -+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp -@@ -143,6 +143,11 @@ - # define __NR_inotify_add_watch 27 - # define __NR_inotify_rm_watch 28 - // no inotify_init for aarch64 -+#elif defined (__arc__) -+# define __NR_inotify_init 1043 -+# define __NR_inotify_add_watch 27 -+# define __NR_inotify_rm_watch 28 -+# define __NR_inotify_init1 26 - #else - # error "This architecture is not supported. Please talk to qt-bugs@trolltech.com" - #endif -diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp -index de8790a..cc2f5b6 100644 ---- a/src/gui/painting/qblendfunctions.cpp -+++ b/src/gui/painting/qblendfunctions.cpp -@@ -309,9 +309,9 @@ template void qt_blend_argb24_on_rgb16(uchar *destPixels, int dbpl, - const uchar *src = srcPixels + y * sbpl; - const uchar *srcEnd = src + srcOffset; - while (src < srcEnd) { --#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_)) -+#if defined(QT_ARCH_ARMV5) || defined(QT_ARCH_POWERPC) || defined(QT_ARCH_SH) || defined(QT_ARCH_AVR32) || (defined(QT_ARCH_WINDOWSCE) && !defined(_X86_)) || (defined(QT_ARCH_SPARC) && defined(Q_CC_GNU)) || (defined(QT_ARCH_INTEGRITY) && !defined(_X86_)) || defined(QT_ARCH_ARC) - // non-16-bit aligned memory access is not possible on PowerPC, -- // ARM -Date: Wed, 20 May 2015 10:53:59 +0300 -Subject: [PATCH 2/2] Prevent unaligned access on ARC - -As many other architectures ARC cores by default don't support -unaligned word access to data. - -Even though it's possible to enable unaligned access to data in -ARC HS38 core (we're talking about configuration of core design) -to make sure Qt could be executed on any flavour of ARC fall-back -to byte-accesses is used. - -Change-Id: I96068d40b449f11ba987ed1e5d5e44f493d1eb5f - -This patch was submited in upstream Qt4 and if it ever gets accepted, -it should be removed from Buildroot. - -https://codereview.qt-project.org/#/c/112668 ---- - src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h | 2 +- - src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h | 13 ++++++++++++- - .../webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp | 2 +- - .../webkit/Source/JavaScriptCore/wtf/text/StringHash.h | 2 +- - 4 files changed, 15 insertions(+), 4 deletions(-) - -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h -index 2d76809..ee9b7f0 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/runtime/UString.h -@@ -202,7 +202,7 @@ struct UStringHash { - - // FIXME: perhaps we should have a more abstract macro that indicates when - // going 4 bytes at a time is unsafe --#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) -+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC) - const UChar* aChars = a->characters(); - const UChar* bChars = b->characters(); - for (unsigned i = 0; i != aLength; ++i) { -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -index e8b03be..cd17e9c 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h -@@ -369,7 +369,18 @@ - - #endif /* ARM */ - --#if CPU(ARM) || CPU(MIPS) || CPU(SH4) -+/* CPU(ARC) - ARC, any version*/ -+#if defined(arc) \ -+ || defined(__arc__) \ -+ || defined(ARC) \ -+ || defined(_ARC_) -+#define WTF_CPU_ARC 1 -+#if defined(__BIG_ENDIAN__) -+#define WTF_CPU_BIG_ENDIAN 1 -+#endif -+#endif -+ -+#if CPU(ARM) || CPU(MIPS) || CPU(SH4) || CPU(ARC) - #define WTF_CPU_NEEDS_ALIGNED_ACCESS 1 - #endif - -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp -index 9dd655e..bd3ab95 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/AtomicString.cpp -@@ -142,7 +142,7 @@ static inline bool equal(StringImpl* string, const UChar* characters, unsigned l - - // FIXME: perhaps we should have a more abstract macro that indicates when - // going 4 bytes at a time is unsafe --#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) -+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC) - const UChar* stringCharacters = string->characters(); - for (unsigned i = 0; i != length; ++i) { - if (*stringCharacters++ != *characters++) -diff --git a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h -index 4637c3d..91cef81 100644 ---- a/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h -+++ b/src/3rdparty/webkit/Source/JavaScriptCore/wtf/text/StringHash.h -@@ -55,7 +55,7 @@ namespace WTF { - - // FIXME: perhaps we should have a more abstract macro that indicates when - // going 4 bytes at a time is unsafe --#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) -+#if CPU(ARM) || CPU(SH4) || CPU(MIPS) || CPU(SPARC) || CPU(ARC) - const UChar* aChars = a->characters(); - const UChar* bChars = b->characters(); - for (unsigned i = 0; i != aLength; ++i) { --- -2.1.0 - diff --git a/package.bak/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch b/package.bak/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch deleted file mode 100644 index d7d387a78d..0000000000 --- a/package.bak/qt/0008-Fix-conversion-constructor-error-for-legacy-c-compil.patch +++ /dev/null @@ -1,163 +0,0 @@ -From ea46f47fb3c475ba2d7581c15185b8d43e63b8c2 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Fri, 27 Feb 2015 21:30:52 +0100 -Subject: [PATCH] Fix conversion/constructor error for legacy c++ compiler. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes the following compile error with legacy c++ compiler: - -error: in C++98 ‘blitRect’ must be initialized by constructor, not by ‘{...}’ - -Signed-off-by: Peter Seiderer ---- - src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp | 14 +++++++------- - src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp | 6 +++--- - src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 6 +++--- - src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 2 +- - 4 files changed, 14 insertions(+), 14 deletions(-) - -diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp -index 876d0c2..ed69386 100644 ---- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp -+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp -@@ -942,7 +942,7 @@ void QDirectFBPaintEngine::drawBufferSpan(const uint *buffer, int bufsize, - IDirectFBSurface *src = d->surfaceCache->getSurface(buffer, bufsize); - // ### how does this play with setDFBColor - src->SetColor(src, 0, 0, 0, const_alpha); -- const DFBRectangle rect = { 0, 0, length, 1 }; -+ const DFBRectangle rect = (DFBRectangle_C){ 0, 0, length, 1 }; - d->surface->Blit(d->surface, src, &rect, x, y); - } - -@@ -1223,14 +1223,14 @@ void QDirectFBPaintEnginePrivate::blit(const QRectF &dest, IDirectFBSurface *s, - const QRect dr = engine->state()->matrix.mapRect(dest).toRect(); - if (dr.isEmpty()) - return; -- const DFBRectangle sRect = { sr.x(), sr.y(), sr.width(), sr.height() }; -+ const DFBRectangle sRect = (DFBRectangle_C){ sr.x(), sr.y(), sr.width(), sr.height() }; - DFBResult result; - - if (dr.size() == sr.size()) { - result = surface->Blit(surface, s, &sRect, dr.x(), dr.y()); - } else { - Q_ASSERT(supportsStretchBlit()); -- const DFBRectangle dRect = { dr.x(), dr.y(), dr.width(), dr.height() }; -+ const DFBRectangle dRect = (DFBRectangle_C){ dr.x(), dr.y(), dr.width(), dr.height() }; - result = surface->StretchBlit(surface, s, &sRect, &dRect); - } - if (result != DFB_OK) -@@ -1261,7 +1261,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix - if (newClip.isNull()) - return; - -- const DFBRegion clip = { -+ const DFBRegion clip = (DFBRegion_C){ - newClip.x(), - newClip.y(), - newClip.right(), -@@ -1295,7 +1295,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix - while (y <= destinationRect.bottom()) { - qreal x = startX; - while (x <= destinationRect.right()) { -- const DFBRectangle destination = { qRound(x), qRound(y), mappedSize.width(), mappedSize.height() }; -+ const DFBRectangle destination = (DFBRectangle_C){ qRound(x), qRound(y), (int)mappedSize.width(), (int)mappedSize.height() }; - surface->StretchBlit(surface, sourceSurface, 0, &destination); - x += mappedSize.width(); - } -@@ -1337,7 +1337,7 @@ void QDirectFBPaintEnginePrivate::drawTiledPixmap(const QRectF &dest, const QPix - if (currentClip.isEmpty()) { - surface->SetClip(surface, 0); - } else { -- const DFBRegion clip = { -+ const DFBRegion clip = (DFBRegion_C){ - currentClip.x(), - currentClip.y(), - currentClip.right(), -@@ -1356,7 +1356,7 @@ void QDirectFBPaintEnginePrivate::updateClip() - surface->SetClip(surface, NULL); - clipType = NoClip; - } else if (clipData->hasRectClip) { -- const DFBRegion r = { -+ const DFBRegion r = (DFBRegion_C){ - clipData->clipRect.x(), - clipData->clipRect.y(), - clipData->clipRect.right(), -diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp -index 412e684..c59c47d 100644 ---- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp -+++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp -@@ -363,7 +363,7 @@ void QDirectFBPixmapData::copy(const QPixmapData *data, const QRect &rect) - } else { - dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX); - } -- const DFBRectangle blitRect = { rect.x(), rect.y(), -+ const DFBRectangle blitRect = (DFBRectangle_C){ rect.x(), rect.y(), - rect.width(), rect.height() }; - w = rect.width(); - h = rect.height(); -@@ -465,7 +465,7 @@ QPixmap QDirectFBPixmapData::transformed(const QTransform &transform, - } - data->dfbSurface->SetBlittingFlags(data->dfbSurface, flags); - -- const DFBRectangle destRect = { 0, 0, size.width(), size.height() }; -+ const DFBRectangle destRect = (DFBRectangle_C){ 0, 0, size.width(), size.height() }; - data->dfbSurface->StretchBlit(data->dfbSurface, dfbSurface, 0, &destRect); - data->w = size.width(); - data->h = size.height(); -@@ -551,7 +551,7 @@ bool QDirectFBPixmapData::scroll(int dx, int dy, const QRect &rect) - return false; - } - -- const DFBRectangle source = { rect.x(), rect.y(), rect.width(), rect.height() }; -+ const DFBRectangle source = (DFBRectangle_C){ rect.x(), rect.y(), rect.width(), rect.height() }; - result = dfbSurface->Blit(dfbSurface, dfbSurface, &source, source.x + dx, source.y + dy); - if (result != DFB_OK) { - DirectFBError("QDirectFBPixmapData::scroll", result); -diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp -index eab9580..d26e5bf 100644 ---- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp -+++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp -@@ -1635,7 +1635,7 @@ void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion) - static inline void clearRect(IDirectFBSurface *surface, const QColor &color, const QRect &rect) - { - Q_ASSERT(surface); -- const DFBRegion region = { rect.left(), rect.top(), rect.right(), rect.bottom() }; -+ const DFBRegion region = (DFBRegion_C){ rect.left(), rect.top(), rect.right(), rect.bottom() }; - // could just reinterpret_cast this to a DFBRegion - surface->SetClip(surface, ®ion); - surface->Clear(surface, color.red(), color.green(), color.blue(), color.alpha()); -@@ -1716,14 +1716,14 @@ void QDirectFBScreen::flipSurface(IDirectFBSurface *surface, DFBSurfaceFlipFlags - const DFBSurfaceFlipFlags nonWaitFlags = flipFlags & ~DSFLIP_WAIT; - for (int i=0; iFlip(surface, &dfbReg, i + 1 < rects.size() ? nonWaitFlags : flipFlags); - } - } else { - const QRect r = region.boundingRect(); -- const DFBRegion dfbReg = { r.x() + offset.x(), r.y() + offset.y(), -+ const DFBRegion dfbReg = (DFBRegion_C){ r.x() + offset.x(), r.y() + offset.y(), - r.right() + offset.x(), - r.bottom() + offset.y() }; - surface->Flip(surface, &dfbReg, flipFlags); -diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -index 4dff907..25ad06b 100644 ---- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -+++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp -@@ -333,7 +333,7 @@ bool QDirectFBWindowSurface::scroll(const QRegion ®ion, int dx, int dy) - } - dfbSurface->SetBlittingFlags(dfbSurface, DSBLIT_NOFX); - const QRect r = region.boundingRect(); -- const DFBRectangle rect = { r.x(), r.y(), r.width(), r.height() }; -+ const DFBRectangle rect = (DFBRectangle_C){ r.x(), r.y(), r.width(), r.height() }; - dfbSurface->Blit(dfbSurface, dfbSurface, &rect, r.x() + dx, r.y() + dy); - return true; - } --- -2.1.4 - diff --git a/package.bak/qt/0009-Fix-library-inclusion-order-when-building-statically.patch b/package.bak/qt/0009-Fix-library-inclusion-order-when-building-statically.patch deleted file mode 100644 index f6163fa0d2..0000000000 --- a/package.bak/qt/0009-Fix-library-inclusion-order-when-building-statically.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 7a912823158a4113256c3113a34c38d6b241d275 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 13 Jan 2016 20:15:36 +0300 -Subject: [PATCH] Fix library inclusion order when building statically - -When building application statically it's important to keep -libraries we're linking against in order. Otherwise if libA depends on -libB but it is mentioned after libB in linker command line -there will be unresolved symbols. - -Consider real example - configuration of Qt with glib for static build. -Initially reported by Buildroot autobuilder here: -http://autobuild.buildroot.net/results/174/174c6e47eb761f9897275b6fedff742ace2f3081 - -What happens here: - -[1] Qt's configuration script tries to build glib test app - (in config.tests/unix/glib) - -[2] For that it first asks which libs to use during linkage this way: - QT_LIBS_GLIB=`$PKG_CONFIG --libs glib-2.0 gthread-2.0 2>/dev/null` - - In our case we're getting something like this: - -L/.../sysroot/usr/lib -lintl -lgthread-2.0 -pthread -lglib-2.0 \ - -lintl -pthread -lintl - - Note "-lintl" is mentioned 3 times because libgthread depends on - libthread and both of them plus libglib all depend on libintl - so - we're getting "lintl" for each separate library mentioned above. - -[3] Now we execute "compileTest" for real heavy lifting this way: - compileTest unix/glib "Glib" $QT_CFLAGS_GLIB $QT_LIBS_GLIB ... - -[4] compileTest (the one for unix) parses command-line passed to it - groups all entries with "-l" prefix and puts them in LFLAGS - variable. And finally executes qmake passing it that kind of - construction: - $OUTDIR/bin/qmake ..."LIBS*=$LFLAGS" - -[5] When qmake sees construction "MYVAR*=MYVAL" it populates MYVAR with - unique values from MYVAL string. - -[6] As a result qmake generated Makefile with the following: - LIBS = $(SUBLIBS) -pthread -L/.../sysroot/usr/lib -lintl -lgthread-2.0 \ - -lglib-2.0 - -[7] And essentially on attempt to link glib test app a failure happens - because libglib needs libintl, i.e. "-lintl" must follow "-lglib-2.0": --------------------->8------------------ -linking glib - -g++ -static -Wl,-O1 -o glib glib.o -pthread -L/.../sysroot/usr/lib \ --lintl -lgthread-2.0 -lglib-2.0 - -/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function '_g_dgettext_should_translate': -ggettext.c:(.text+0x28): undefined reference to `libintl_textdomain' -ggettext.c:(.text+0x36): undefined reference to `libintl_gettext' -/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `ensure_gettext_initialized': -ggettext.c:(.text+0xe6): undefined reference to `libintl_bindtextdomain' -ggettext.c:(.text+0xf6): undefined reference to `libintl_bind_textdomain_codeset' -/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dgettext': -ggettext.c:(.text+0x148): undefined reference to `libintl_dgettext' -/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dcgettext': -ggettext.c:(.text+0x2dc): undefined reference to `libintl_dcgettext' -/.../sysroot/usr/lib/libglib-2.0.a(libglib_2_0_la-ggettext.o): In function `g_dngettext': -ggettext.c:(.text+0x32a): undefined reference to `libintl_dngettext' -collect2: error: ld returned 1 exit status -Makefile:99: recipe for target 'glib' failed -make: *** [glib] Error 1 - -Glib disabled. -Glib support cannot be enabled due to functionality tests! - Turn on verbose messaging (-v) to ./configure to see the final report. - If you believe this message is in error you may use the continue - switch (-continue) to ./configure to continue. --------------------->8------------------ - -Solution to this problem is simple we have to pass all libraries exactly -in order of their initial mention by upper layers. - -Change-Id: I7ff00901031a8eb85b4fbd7889b0e0c02be806bb - -This fix was sent to Qt Gerrit for review here: -https://codereview.qt-project.org/#/c/145967/ - ---- - config.tests/unix/compile.test | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config.tests/unix/compile.test b/config.tests/unix/compile.test -index f484f03..dac0a4f 100755 ---- a/config.tests/unix/compile.test -+++ b/config.tests/unix/compile.test -@@ -73,7 +73,7 @@ test -r Makefile && $MAKE distclean >/dev/null 2>&1 - rm -f "$EXE" "${EXE}.exe" - - echo "QT_BUILD_TREE = $OUTDIR" > "$OUTDIR/$TEST/.qmake.cache" --"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS*=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" -+"$OUTDIR/bin/qmake" -spec "$QMKSPEC" "CONFIG+=$QMAKE_CONFIG" "CONFIG-=debug_and_release" "LIBS=$LFLAGS" "LIBS+=$MAC_ARCH_LFLAGS" "INCLUDEPATH*=$INCLUDEPATH" "QMAKE_CXXFLAGS*=$CXXFLAGS" "QMAKE_CXXFLAGS+=$MAC_ARCH_CXXFLAGS" "$SRCDIR/$TEST/$EXE.pro" -o "$OUTDIR/$TEST/Makefile" - - if [ "$VERBOSE" = "yes" ]; then - $MAKE --- -2.4.3 - diff --git a/package.bak/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch b/package.bak/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch deleted file mode 100644 index 9b1655322a..0000000000 --- a/package.bak/qt/0010-Fix-for-platform-socklen_t-on-other-C-libraries-than.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 0bf90de93b9fe21df32319e27b2507154fa8a21d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 15 Apr 2016 00:37:26 +0200 -Subject: [PATCH] Fix for platform socklen_t on other C libraries than glibc -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This helps to make sure that QT_SOCKLEN_T is defined to be 'int' -only when its glibc < 2 and not also for the libraries which may define -it as per standards but are not glibc, e.g. musl. - -This patch is adapted from Qt5 [1]. - -[1] -https://github.com/qtproject/qtbase/commit/813f468a14fb84af43c1f8fc0a1430277358eba2 - -Signed-off-by: Jörg Krause ---- - mkspecs/linux-g++/qplatformdefs.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/mkspecs/linux-g++/qplatformdefs.h b/mkspecs/linux-g++/qplatformdefs.h -index de751dd..d4146ed 100644 ---- a/mkspecs/linux-g++/qplatformdefs.h -+++ b/mkspecs/linux-g++/qplatformdefs.h -@@ -86,10 +86,10 @@ - - #undef QT_SOCKLEN_T - --#if defined(__GLIBC__) && (__GLIBC__ >= 2) --#define QT_SOCKLEN_T socklen_t --#else -+#if defined(__GLIBC__) && (__GLIBC__ < 2) - #define QT_SOCKLEN_T int -+#else -+#define QT_SOCKLEN_T socklen_t - #endif - - #if defined(_XOPEN_SOURCE) && (_XOPEN_SOURCE >= 500) --- -2.8.0 - diff --git a/package.bak/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch b/package.bak/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch deleted file mode 100644 index f3d47f754e..0000000000 --- a/package.bak/qt/0011-Link-with-ldl-option-only-when-it-is-supported.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 438f088ad520ac91ae47dba9a515ab0d1088c89c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 15 Apr 2016 03:32:02 +0200 -Subject: [PATCH] Link with -ldl option only when it is supported -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -`-ldl` option is used unconditionally in `QMAKE_LIBS_DYNLOAD` while libdl is -not supported when libc is static. As the value of `QMAKE_LIBS_DYNLOAD` goes -into 'Libs.private' field of the pkgconfig files created by qmake, static -linking with qt will fail with: - /usr/bin/ld: cannot find -ldl - -Fix this issue by adding a build test to configure to check if libdl is -supported. `QMAKE_LIBS_DYNLOAD` in "src/corelib/plugin/plugin.pri" is now used -only if libdl is available. - -Backported from Qt5: -https://github.com/qtproject/qtbase/commit/f669ea0d54302de31456d57286aa0e4ca1443e98 - -Signed-off-by: Jörg Krause ---- - config.tests/unix/libdl/libdl.cpp | 39 +++++++++++++++++++++++++++++++++++++++ - config.tests/unix/libdl/libdl.pro | 3 +++ - configure | 6 ++++++ - src/corelib/plugin/plugin.pri | 2 +- - 4 files changed, 49 insertions(+), 1 deletion(-) - create mode 100644 config.tests/unix/libdl/libdl.cpp - create mode 100644 config.tests/unix/libdl/libdl.pro - -diff --git a/config.tests/unix/libdl/libdl.cpp b/config.tests/unix/libdl/libdl.cpp -new file mode 100644 -index 0000000..28a8233 ---- /dev/null -+++ b/config.tests/unix/libdl/libdl.cpp -@@ -0,0 +1,39 @@ -+/**************************************************************************** -+** -+** Copyright (C) 2015 The Qt Company Ltd. -+** Contact: http://www.qt.io/licensing/ -+** -+** This file is part of the config.tests of the Qt Toolkit. -+** -+** $QT_BEGIN_LICENSE:LGPL21$ -+** Commercial License Usage -+** Licensees holding valid commercial Qt licenses may use this file in -+** accordance with the commercial license agreement provided with the -+** Software or, alternatively, in accordance with the terms contained in -+** a written agreement between you and The Qt Company. For licensing terms -+** and conditions see http://www.qt.io/terms-conditions. For further -+** information use the contact form at http://www.qt.io/contact-us. -+** -+** GNU Lesser General Public License Usage -+** Alternatively, this file may be used under the terms of the GNU Lesser -+** General Public License version 2.1 or version 3 as published by the Free -+** Software Foundation and appearing in the file LICENSE.LGPLv21 and -+** LICENSE.LGPLv3 included in the packaging of this file. Please review the -+** following information to ensure the GNU Lesser General Public License -+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -+** -+** As a special exception, The Qt Company gives you certain additional -+** rights. These rights are described in The Qt Company LGPL Exception -+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -+** -+** $QT_END_LICENSE$ -+** -+****************************************************************************/ -+ -+#include -+ -+int main(int, char **) -+{ -+ dlopen(0, 0); -+} -diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro -new file mode 100644 -index 0000000..a643934 ---- /dev/null -+++ b/config.tests/unix/libdl/libdl.pro -@@ -0,0 +1,3 @@ -+SOURCES = libdl.cpp -+CONFIG -= qt dylib -+LIBS += -ldl -\ No newline at end of file -diff --git a/configure b/configure -index 10ad7ca..1c70691 100755 ---- a/configure -+++ b/configure -@@ -5506,6 +5506,12 @@ if [ "$CFG_LIBPNG" = "auto" ]; then - fi - fi - -+# detect dl -+if ! compileTest unix/libdl "libdl"; then -+ QMakeVar add DEFINES QT_NO_DYNAMIC_LIBRARY -+ QMAKE_CONFIG="$QMAKE_CONFIG no-libdl" -+fi -+ - # detect accessibility - if [ "$CFG_ACCESSIBILITY" = "auto" ]; then - if [ "$XPLATFORM_SYMBIAN" = "yes" ]; then -diff --git a/src/corelib/plugin/plugin.pri b/src/corelib/plugin/plugin.pri -index eb7a7f7..c342f2e 100644 ---- a/src/corelib/plugin/plugin.pri -+++ b/src/corelib/plugin/plugin.pri -@@ -32,4 +32,4 @@ integrity { - SOURCES += plugin/qlibrary_unix.cpp - } - --LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD -+!no-libdl: LIBS_PRIVATE += $$QMAKE_LIBS_DYNLOAD --- -2.8.0 - diff --git a/package.bak/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch b/package.bak/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch deleted file mode 100644 index 8c65d1db38..0000000000 --- a/package.bak/qt/0012-OpenGL-EGL-Avoid-X11-header-collision.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 87c9c18fad02744238336a6cf1ce70d3ec2c89c2 Mon Sep 17 00:00:00 2001 -From: Bernd Kuhls -Date: Sat, 11 Jun 2016 17:03:07 +0200 -Subject: [PATCH 1/1] OpenGL/EGL: Avoid X11 header collision - -Including X11 headers via EGL/egl.h leads to a collision of defines -between Qt and X11. To fix this qt5 added - DEFINES += MESA_EGL_NO_X11_HEADERS -in various files: - -https://github.com/qtproject/qtbase/blob/dev/src/platformsupport/eglconvenience/eglconvenience.pri#L19 -https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/minimalegl/minimalegl.pro#L10 -https://github.com/qtproject/qtbase/blob/dev/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/eglfs_x11.pro#L6 -[...] - -This patch fixes a similar compile error in qt4: -http://autobuild.buildroot.net/results/9b0/9b0ed92984eead89d148eaa71aff6e2f1e117837/ -http://autobuild.buildroot.org/results/4fd/4fd57553336d36439fab32a7221fc8639758e887/ -http://autobuild.buildroot.org/results/5cb/5cb8072f8220f7203fa79936eedcc43eab53ec66/ - -Signed-off-by: Bernd Kuhls -(patch not sent upstream because qt4 branch is closed: - http://blog.qt.io/blog/2015/05/26/qt-4-8-7-released/) ---- - - src/gui/egl/egl.pri | 3 +++ - src/opengl/opengl.pro | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/src/gui/egl/egl.pri b/src/gui/egl/egl.pri -index 8e8664c..715ffd7 100644 ---- a/src/gui/egl/egl.pri -+++ b/src/gui/egl/egl.pri -@@ -22,6 +22,9 @@ contains(QT_CONFIG, egl): { - !isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL - } - -+ # Avoid X11 header collision -+ DEFINES += MESA_EGL_NO_X11_HEADERS -+ - wince*: SOURCES += egl/qegl_wince.cpp - - unix { -diff --git a/src/opengl/opengl.pro b/src/opengl/opengl.pro -index ce1a5d2..65b1031 100644 ---- a/src/opengl/opengl.pro -+++ b/src/opengl/opengl.pro -@@ -149,6 +149,9 @@ embedded { - qglwindowsurface_qws_p.h \ - qgl_egl_p.h - -+ # Avoid X11 header collision -+ DEFINES += MESA_EGL_NO_X11_HEADERS -+ - contains(QT_CONFIG, fontconfig) { - include($$QT_SOURCE_TREE/config.tests/unix/freetype/freetype.pri) - } else { --- -2.8.1 - diff --git a/package.bak/qt/Config.gfx.in b/package.bak/qt/Config.gfx.in deleted file mode 100644 index 70adeef2ff..0000000000 --- a/package.bak/qt/Config.gfx.in +++ /dev/null @@ -1,31 +0,0 @@ -menu "Graphics drivers" - -config BR2_PACKAGE_QT_GFX_LINUXFB - bool "Linux Framebuffer" - default y - -config BR2_PACKAGE_QT_GFX_TRANSFORMED - bool "Transformed" - -config BR2_PACKAGE_QT_GFX_QVFB - bool "Qt Virtual Framebuffer" - -config BR2_PACKAGE_QT_GFX_VNC - bool "VNC" - -config BR2_PACKAGE_QT_GFX_MULTISCREEN - bool "multiscreen" - -comment "directfb Qt driver not available (need directfb)" - depends on !BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_QT_GFX_DIRECTFB - depends on BR2_PACKAGE_DIRECTFB - bool "directFB" - -config BR2_PACKAGE_QT_GFX_POWERVR - depends on BR2_PACKAGE_QT_OPENGL_ES - depends on BR2_PACKAGE_HAS_POWERVR - bool "powervr" - -endmenu diff --git a/package.bak/qt/Config.in b/package.bak/qt/Config.in deleted file mode 100644 index fa5235d6f4..0000000000 --- a/package.bak/qt/Config.in +++ /dev/null @@ -1,551 +0,0 @@ -comment "qt needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - -menuconfig BR2_PACKAGE_QT - bool "Qt" - depends on BR2_USE_MMU # fork - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Qt is a cross-platform application and UI framework for - developers using C++. - - http://qt-project.org - -if BR2_PACKAGE_QT - -choice - prompt "Qt installation" - help - Selects the type of installation: standard or embedded - -config BR2_PACKAGE_QT_EMBEDDED - bool "Qt embedded" - help - The embedded Qt installation targets embedded systems without X.org. - Provides backends for framebuffer. - If unsure, say Y. - -comment "Qt standard (X11) not available (need X.org)" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_QT_X11 - bool "Qt standard (X11)" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXV - select BR2_PACKAGE_QT_SYSTEMFREETYPE - select BR2_PACKAGE_QT_GUI_MODULE - help - The standard Qt installation provides X.org backend. If you don't want to - use X.org, say N. - -endchoice - -config BR2_PACKAGE_QT_DEBUG - bool "Compile with debug support" - help - If unsure, say N. - -config BR2_PACKAGE_QT_DEMOS - bool "Compile and install Qt demos (with code)" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT_GUI_MODULE - help - If unsure, say N. - -config BR2_PACKAGE_QT_TRANSLATION_FILES - bool "Install translation files" - help - Install binary .qm translation files. - Say y if you need these files. They will take about 8 MB - on the target root filesystem. - -config BR2_PACKAGE_QT_EXAMPLES - bool "Compile and install Qt examples (with code)" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # Qt GUI module - select BR2_PACKAGE_QT_GUI_MODULE - help - If unsure, say N. - -choice - prompt "Library type" - help - Selects the library type: Shared or Static - -config BR2_PACKAGE_QT_SHARED - bool "Shared library" - depends on !BR2_STATIC_LIBS - help - Create and use shared Qt libraries. - If you have multiple programs that depend on Qt or intend to use - plugins, say Y. - -config BR2_PACKAGE_QT_STATIC - bool "Static Library" - help - Create and use static Qt libraries. - If you don't have multiple programs on the target that depends on - Qt, then this will save you quite some of storage space. - If unsure, say Y. - -endchoice - -config BR2_PACKAGE_QT_LICENSE_APPROVED - bool "Approve free license" - help - Select this if you approve one of the available free licenses for the - Qt4 library. - By doing this you will not be asked while the library is compiled. - Please read and understand the license terms before approving this. - - LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html - GPL v3.0: http://doc.trolltech.com/4.5/gpl.html - -config BR2_PACKAGE_QT_CONFIG_FILE - string "Config file" - help - Configure options allow to set which modules are being - compiled or not in Qt, but Qt also provide a more - fine-grained mechanism to configure which features should be - enabled or disabled, through a header file. Examples of such - header files can be found in src/corelib/global/qconfig-*.h - in the Qt sources. - - This option allows to set the path of such a configuration - file, which Buildroot will give to Qt at compile time. - -config BR2_PACKAGE_QT_QT3SUPPORT - bool "Compatibility with Qt3" - depends on BR2_PACKAGE_QT_GUI_MODULE - select BR2_PACKAGE_QT_SQL_MODULE - help - Turns on support for older Qt3. This will create an additional - library with proxy code and increase the space required on target. - If unsure say n. - -config BR2_PACKAGE_QT_GUI_MODULE - bool "Gui Module" - depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 # nios2 Binutils 2.25.1 bug - select BR2_PACKAGE_QT_NETWORK - default y - help - Turns on support for Gui applications. If your board doesn't have - video output, or you don't require Qt GUI, say n. - -comment "Qt Gui Module needs a toolchain not affected by Binutils bug 19405" - depends on BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -if BR2_PACKAGE_QT_GUI_MODULE - -if BR2_PACKAGE_QT_EMBEDDED - -menu "Pixel depths" -comment "Deselecting each option leads to Qt's default (8,16,32)" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_1 - bool "1 bpp, black/white" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_4 - bool "4 bpp, grayscale" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_8 - bool "8 bpp, paletted" - default y - -config BR2_PACKAGE_QT_PIXEL_DEPTH_12 - bool "12 bpp, rgb 4-4-4" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_15 - bool "15 bpp, rgb 5-5-5" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_16 - bool "16 bpp, rgb 5-6-5" - default y - -config BR2_PACKAGE_QT_PIXEL_DEPTH_18 - bool "18 bpp, rgb 6-6-6" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_24 - bool "24 bpp, rgb 8-8-8" - -config BR2_PACKAGE_QT_PIXEL_DEPTH_32 - bool "32 bpp, argb 8-8-8-8 and rgb 8-8-8" - default y - -endmenu - -menu "Fonts" - -config BR2_PACKAGE_QT_FONT_MICRO - bool "micro" - default y - -config BR2_PACKAGE_QT_FONT_FIXED - bool "fixed" - default y - -config BR2_PACKAGE_QT_FONT_HELVETICA - bool "helvetica" - default y - -config BR2_PACKAGE_QT_FONT_JAPANESE - bool "japanese" - -config BR2_PACKAGE_QT_FONT_UNIFONT - bool "unicode" - -endmenu - -endif # BR2_PACKAGE_QT_EMBEDDED - -choice - prompt "freetype2 support" - default BR2_PACKAGE_QT_NOFREETYPE - help - Select freetype2 support. - -config BR2_PACKAGE_QT_NOFREETYPE - bool "no freetype2 support" - depends on BR2_PACKAGE_QT_EMBEDDED - help - Do not compile in Freetype2 support. - -comment "Qt freetype2 needs Qt embedded" - depends on BR2_PACKAGE_QT_X11 - -config BR2_PACKAGE_QT_QTFREETYPE - bool "Qt freetype2" - depends on BR2_PACKAGE_QT_EMBEDDED - help - Use the libfreetype bundled with Qt. - -config BR2_PACKAGE_QT_SYSTEMFREETYPE - bool "System freetype2" - select BR2_PACKAGE_FREETYPE - help - Use shared libfreetype from the target system. - See http://www.freetype.org/ -endchoice - -config BR2_PACKAGE_QT_GIF - bool "Enable GIF support" - help - This compiles and installs the plugin for GIF reading support. - -config BR2_PACKAGE_QT_LIBMNG - bool "Enable libmng support" - help - This compiles and installs the plugin for MNG support. - -choice - prompt "JPEG support" - default BR2_PACKAGE_QT_NOJPEG - help - Select libjpeg support. - -config BR2_PACKAGE_QT_NOJPEG - bool "No jpeg support" - help - Disable JPEG support - -config BR2_PACKAGE_QT_SYSTEMJPEG - select BR2_PACKAGE_JPEG - bool "System libjpeg" - help - Link against system libjpeg - -config BR2_PACKAGE_QT_QTJPEG - bool "Use Qt bundled libjpeg" - help - Link against libjpeg provided with Qt -endchoice - -choice - prompt "PNG support" - default BR2_PACKAGE_QT_NOPNG - help - Select which library to use if PNG support should be enabled. - -config BR2_PACKAGE_QT_NOPNG - bool "No PNG support" - -config BR2_PACKAGE_QT_SYSTEMPNG - bool "System libpng" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_QT_QTPNG - bool "Use Qt bundled libpng" -endchoice - -choice - prompt "TIFF support" - default BR2_PACKAGE_QT_NOTIFF - help - Select which library to use if TIFF support should be enabled. - -config BR2_PACKAGE_QT_NOTIFF - bool "No TIFF support" - -config BR2_PACKAGE_QT_SYSTEMTIFF - bool "System libtiff" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_QT_QTTIFF - bool "Use Qt bundled libtiff" -endchoice - -config BR2_PACKAGE_QT_ACCESSIBILITY - bool "Enable accessibility support" - help - This enables and compiles the accessibility support. - -endif # BR2_PACKAGE_QT_GUI_MODULE - -choice - prompt "zlib support" - default BR2_PACKAGE_QT_QTZLIB - help - Select zlib support. - -config BR2_PACKAGE_QT_QTZLIB - bool "Qt zlib" - help - Use the zlib bundled with Qt. - -config BR2_PACKAGE_QT_SYSTEMZLIB - bool "System zlib" - select BR2_PACKAGE_ZLIB - help - Use the shared zlib from the system. -endchoice - -source "package/qt/Config.sql.in" -if BR2_PACKAGE_QT_GUI_MODULE -if BR2_PACKAGE_QT_EMBEDDED -source "package/qt/Config.gfx.in" -source "package/qt/Config.mouse.in" -source "package/qt/Config.keyboard.in" -endif - -config BR2_PACKAGE_QT_PHONON - bool "Phonon Module" - depends on BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - default y - help - Build the Phonon module. Support for different audio/video - formats can be configured at the GStreamer package. - If unsure, say n. - -comment "Phonon module needs gstreamer" - depends on !BR2_PACKAGE_GSTREAMER - -config BR2_PACKAGE_QT_PHONON_BACKEND - bool "Phonon Module Backend" - depends on BR2_PACKAGE_QT_PHONON - help - Build the platform Phonon plugin. - If unsure, say n. - -config BR2_PACKAGE_QT_OPENGL - bool "OpenGL support" - depends on (BR2_PACKAGE_HAS_LIBGL && BR2_PACKAGE_QT_X11) || \ - (BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_HAS_LIBGLES) - default y - help - This option enables OpenGL support. - -if BR2_PACKAGE_QT_OPENGL - -choice - prompt "OpenGL API" - help - Select OpenGL API. - -comment "Desktop OpenGL not available (needs Qt standard (X11))" - depends on !BR2_PACKAGE_QT_X11 - -config BR2_PACKAGE_QT_OPENGL_GL_DESKTOP - bool "Desktop OpenGL" - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_QT_X11 - help - Use desktop OpenGL. - -config BR2_PACKAGE_QT_OPENGL_ES - bool "OpenGL ES v2.x support" - depends on BR2_PACKAGE_HAS_LIBGLES - depends on BR2_PACKAGE_HAS_LIBEGL - help - Enable the OpenGL ES v2.x support. - -endchoice - -endif # BR2_PACKAGE_QT_OPENGL - -endif - -config BR2_PACKAGE_QT_DBUS - bool "DBus Module" - select BR2_PACKAGE_DBUS - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus - depends on BR2_USE_MMU # dbus - help - Build the Qt DBus module. - -comment "DBus Module needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_QT_XML - bool "XML Module" - default y - help - Build the XML module. - -config BR2_PACKAGE_QT_XMLPATTERNS - bool "XML Patterns Module" - depends on BR2_PACKAGE_QT_XML - help - Build QtXmlPatterns module. - If unsure, say n - -config BR2_PACKAGE_QT_MULTIMEDIA - bool "Multimedia Module" - depends on BR2_PACKAGE_QT_GUI_MODULE - help - Build QtMultimedia module. - -config BR2_PACKAGE_QT_AUDIO_BACKEND - bool "QtMultimedia Audio backend" - depends on BR2_PACKAGE_QT_MULTIMEDIA - select BR2_PACKAGE_ALSA_LIB - depends on BR2_TOOLCHAIN_HAS_THREADS # alsa-lib - help - Build the ALSA audio backend into QtMultimedia - -config BR2_PACKAGE_QT_SVG - bool "SVG Module" - depends on BR2_PACKAGE_QT_GUI_MODULE - help - Build the SVG module. - If unsure, say n - -config BR2_PACKAGE_QT_NETWORK - bool "Network Module" - default y - help - Install the Network module. - if unsure, say y - -config BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - bool - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - # see src/3rdparty/webkit/Source/JavaScriptCore/wtf/Platform.h - # see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html - default y if BR2_arc || BR2_arm || BR2_armeb || BR2_i386 || BR2_microblazeel || \ - BR2_microblazebe || BR2_mips || BR2_mipsel || \ - (BR2_mips64 || BR2_mips64el) && !BR2_MIPS_NABI32 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_x86_64 - # The CodeSourcery SuperH toolchain fails to build Webkit, - # with an assertion failure in binutils. - default y if (BR2_sh4 || BR2_sh4eb || BR2_sh4a || BR2_sh4aeb) && \ - !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_SH - -config BR2_PACKAGE_QT_WEBKIT - bool "WebKit Module" - depends on BR2_PACKAGE_QT_SCRIPT - depends on BR2_PACKAGE_QT_SHARED - depends on BR2_PACKAGE_QT_GUI_MODULE - depends on BR2_PACKAGE_QT_NETWORK - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np() - depends on BR2_PACKAGE_GSTREAMER - select BR2_PACKAGE_GST_PLUGINS_BASE - select BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_APP - help - Build the WebKit module. - If unsure, say n. - -comment "WebKit needs a toolchain w/ dynamic library, NPTL" - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIB - -comment "WebKit needs QtShared/Script/Gui/Network and Gstreamer 0.10" - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_WEBKIT - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL && !BR2_STATIC_LIB - depends on !BR2_PACKAGE_QT_SCRIPT || !BR2_PACKAGE_QT_SHARED \ - || !BR2_PACKAGE_QT_GUI_MODULE || !BR2_PACKAGE_QT_NETWORK \ - || !BR2_PACKAGE_GSTREAMER - -config BR2_PACKAGE_QT_STL - bool "STL support" - help - Compile STL support. - If unsure, say n. - -config BR2_PACKAGE_QT_OPENSSL - bool "Enable OpenSSL support" - depends on BR2_PACKAGE_QT_NETWORK - select BR2_PACKAGE_OPENSSL - help - Enable support for the OpenSSL encryption library. If you use - QSslSocket say y here, otherwise, say no to save space on the - target. - If unsure, say n. - -config BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT - bool - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - # see http://lists.busybox.net/pipermail/buildroot/2014-November/112605.html - default y if BR2_arc || BR2_arm || BR2_armeb || BR2_aarch64 || BR2_i386 || \ - BR2_microblazeel || BR2_microblazebe || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_nios2 || BR2_powerpc || \ - BR2_powerpc64 || BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_x86_64 - -config BR2_PACKAGE_QT_SCRIPT - bool "Script Module" - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # needs pthread_getattr_np() - default y - help - Build the Qt Script module. - if unsure, say y. - -comment "Script Module needs a toolchain with NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_PACKAGE_QT_ARCH_SUPPORTS_SCRIPT - -config BR2_PACKAGE_QT_SCRIPTTOOLS - bool "Script Tools Module" - depends on BR2_PACKAGE_QT_SCRIPT - depends on BR2_PACKAGE_QT_GUI_MODULE - help - Build the Qt Script Tools module. - if unsure, say n. - -config BR2_PACKAGE_QT_DECLARATIVE - bool "Declarative module" - depends on BR2_PACKAGE_QT_SCRIPT - depends on BR2_PACKAGE_QT_GUI_MODULE - depends on BR2_PACKAGE_QT_SQL_MODULE - help - Build the Qt Declarative Module for qml support - if unsure, say n. - -config BR2_PACKAGE_QT_TEST - bool "Test Module" - help - Install the Test module. - -endif # BR2_PACKAGE_QT diff --git a/package.bak/qt/Config.keyboard.in b/package.bak/qt/Config.keyboard.in deleted file mode 100644 index b0425471ed..0000000000 --- a/package.bak/qt/Config.keyboard.in +++ /dev/null @@ -1,12 +0,0 @@ -menu "Keyboard drivers" - -config BR2_PACKAGE_QT_KEYBOARD_TTY - bool "tty" - -config BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT - bool "linux input" - -config BR2_PACKAGE_QT_KEYBOARD_QVFB - bool "qvfb" - -endmenu diff --git a/package.bak/qt/Config.mouse.in b/package.bak/qt/Config.mouse.in deleted file mode 100644 index 11da956f62..0000000000 --- a/package.bak/qt/Config.mouse.in +++ /dev/null @@ -1,30 +0,0 @@ -menu "Mouse drivers" - -config BR2_PACKAGE_QT_MOUSE_PC - bool "pc" - -config BR2_PACKAGE_QT_MOUSE_LINUXTP - bool "linuxtp" - -config BR2_PACKAGE_QT_MOUSE_LINUXINPUT - bool "linux input" - -config BR2_PACKAGE_QT_MOUSE_TSLIB - bool "tslib" - select BR2_PACKAGE_TSLIB - depends on !BR2_STATIC_LIBS # tslib - -comment "tslib support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_QT_MOUSE_QVFB - bool "qvfb" - -comment "Mouse Options" - -config BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR - bool "Hide the mouse cursor" - help - Do not show the mouse cursor in QWS. - -endmenu diff --git a/package.bak/qt/Config.sql.in b/package.bak/qt/Config.sql.in deleted file mode 100644 index 452edd5133..0000000000 --- a/package.bak/qt/Config.sql.in +++ /dev/null @@ -1,66 +0,0 @@ -menuconfig BR2_PACKAGE_QT_SQL_MODULE - bool "SQL Module" - help - Compile Qt SQL Module - -if BR2_PACKAGE_QT_SQL_MODULE -config BR2_PACKAGE_QT_MYSQL - bool "MySQL Driver" - select BR2_PACKAGE_MYSQL - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - depends on BR2_USE_MMU # mysql - help - Build MySQL driver - If unsure, say n. - -config BR2_PACKAGE_QT_IBASE - bool "iBase Driver" - depends on BROKEN # libfbclient not in BR - help - Build iBase driver - If unsure, say n. - -config BR2_PACKAGE_QT_ODBC - bool "ODBC Driver" - select BR2_PACKAGE_UNIXODBC - help - Build ODBC driver - If unsure, say n. - -config BR2_PACKAGE_QT_PSQL - bool "PostgreSQL Driver" - select BR2_PACKAGE_POSTGRESQL - depends on !BR2_STATIC_LIBS - help - Build PostgreSQL driver - If unsure, say n. - -comment "PostgreSQL driver needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -choice - prompt "SQLite 3 support" - default BR2_PACKAGE_QT_SQLITE_NONE - help - Select SQLite support. - -config BR2_PACKAGE_QT_SQLITE_NONE - bool "No sqlite support" - help - Do not compile any kind of SQLite support. - -config BR2_PACKAGE_QT_SQLITE_QT - bool "Qt SQLite" - help - Use Qt bundled SQLite support. - -config BR2_PACKAGE_QT_SQLITE_SYSTEM - bool "System SQLite" - select BR2_PACKAGE_SQLITE - help - Use system SQLite. - -endchoice - -endif diff --git a/package.bak/qt/powervr.ini b/package.bak/qt/powervr.ini deleted file mode 100644 index 57863ebc44..0000000000 --- a/package.bak/qt/powervr.ini +++ /dev/null @@ -1,2 +0,0 @@ -[default] -WindowSystem=libpvrQWSWSEGL.so.1 diff --git a/package.bak/qt/qt.hash b/package.bak/qt/qt.hash deleted file mode 100644 index de81368511..0000000000 --- a/package.bak/qt/qt.hash +++ /dev/null @@ -1,4 +0,0 @@ -# md5 http://download.qt.io/official_releases/qt/4.8/4.8.7/md5sums-4.8.7, sha256 locally computed: -md5 d990ee66bf7ab0c785589776f35ba6ad qt-everywhere-opensource-src-4.8.7.tar.gz -sha256 e2882295097e47fe089f8ac741a95fef47e0a73a3f3cdf21b56990638f626ea0 qt-everywhere-opensource-src-4.8.7.tar.gz -sha256 e03740e20b8dbf52d163d8a4a37125e7c55b59a9a5e7cf7e89a08e07286b6135 b8f98d956501dfa4ce03a137f15d404930a56066.patch diff --git a/package.bak/qt/qt.mk b/package.bak/qt/qt.mk deleted file mode 100644 index 29dcc46b7b..0000000000 --- a/package.bak/qt/qt.mk +++ /dev/null @@ -1,735 +0,0 @@ -################################################################################ -# -# Qt Embedded for Linux -# -# This makefile was originally composed by Thomas Lundquist -# Later heavily modified by buildroot developers -# -# BTW, this uses alot of FPU calls and it's pretty slow if you use -# the kernels FPU emulation so it's better to choose soft float in the -# buildroot config (and uClibc.config of course, if you have your own.) -# -################################################################################ - -QT_VERSION_MAJOR = 4.8 -QT_VERSION = $(QT_VERSION_MAJOR).7 -QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz -QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION) -# Patch fixing ALSA detection. Taken from Qt5, but applies fine to -# Qt4. -QT_PATCH = https://github.com/qtproject/qtbase/commit/b8f98d956501dfa4ce03a137f15d404930a56066.patch -QT_DEPENDENCIES = host-pkgconf -QT_INSTALL_STAGING = YES - -QT_LICENSE := LGPLv2.1 with exceptions or GPLv3 -ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) -QT_LICENSE := $(QT_LICENSE) or Digia Qt Commercial license -endif -QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3 - -ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) -QT_CONFIGURE_OPTS += -opensource -confirm-license -endif - -QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE)) - -ifneq ($(QT_CONFIG_FILE),) -QT_CONFIGURE_OPTS += -qconfig buildroot -endif - -QT_CFLAGS = $(TARGET_CFLAGS) -QT_CXXFLAGS = $(TARGET_CXXFLAGS) -QT_LDFLAGS = $(TARGET_LDFLAGS) - -# Qt WebKit build fails when gcc-6 is used for build, because -# 'std::auto_ptr' is deprecated starting from gcc 6.x. So, we have to -# use an older c++ standard to prevent build failure -QT_CXXFLAGS += -std=gnu++98 - -# Qt has some assembly function that are not present in thumb1 mode: -# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]' -# so, we desactivate thumb mode -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y) -QT_CFLAGS += -marm -QT_CXXFLAGS += -marm -endif - -ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) -QT_CONFIGURE_OPTS += -qt3support -else -QT_CONFIGURE_OPTS += -no-qt3support -endif - -ifeq ($(BR2_PACKAGE_QT_DEMOS),y) -QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos -else -QT_CONFIGURE_OPTS += -nomake demos -endif -ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y) -QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples -else -QT_CONFIGURE_OPTS += -nomake examples -endif - -# ensure glib is built first if enabled for Qt's glib support -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -QT_CONFIGURE_OPTS += -glib -QT_DEPENDENCIES += libglib2 -else -QT_CONFIGURE_OPTS += -no-glib -endif - - -### Pixel depths -QT_PIXEL_DEPTHS = # empty -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y) -QT_PIXEL_DEPTHS += 1 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y) -QT_PIXEL_DEPTHS += 4 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y) -QT_PIXEL_DEPTHS += 8 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y) -QT_PIXEL_DEPTHS += 12 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y) -QT_PIXEL_DEPTHS += 15 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y) -QT_PIXEL_DEPTHS += 16 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y) -QT_PIXEL_DEPTHS += 18 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y) -QT_PIXEL_DEPTHS += 24 -endif -ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y) -QT_PIXEL_DEPTHS += 32 -endif -ifneq ($(QT_PIXEL_DEPTHS),) -QT_CONFIGURE_OPTS += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS))) -endif - -### Display drivers -ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y) -QT_CONFIGURE_OPTS += -qt-gfx-linuxfb -else -QT_CONFIGURE_OPTS += -no-gfx-linuxfb -endif -ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y) -QT_CONFIGURE_OPTS += -qt-gfx-transformed -else -QT_CONFIGURE_OPTS += -no-gfx-transformed -endif -ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y) -QT_CONFIGURE_OPTS += -qt-gfx-qvfb -else -QT_CONFIGURE_OPTS += -no-gfx-qvfb -endif -ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y) -QT_CONFIGURE_OPTS += -qt-gfx-vnc -else -QT_CONFIGURE_OPTS += -no-gfx-vnc -endif -ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y) -QT_CONFIGURE_OPTS += -qt-gfx-multiscreen -else -QT_CONFIGURE_OPTS += -no-gfx-multiscreen -endif -ifeq ($(BR2_PACKAGE_QT_GFX_DIRECTFB),y) -QT_CONFIGURE_OPTS += -qt-gfx-directfb -QT_DEPENDENCIES += directfb -else -QT_CONFIGURE_OPTS += -no-gfx-directfb -endif -ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y) -QT_CONFIGURE_OPTS += \ - -plugin-gfx-powervr -D QT_NO_QWS_CURSOR -D QT_QWS_CLIENTBLIT -QT_DEPENDENCIES += powervr -endif - -### Mouse drivers -ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y) -QT_CONFIGURE_OPTS += -qt-mouse-pc -else -QT_CONFIGURE_OPTS += -no-mouse-pc -endif -ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y) -QT_CONFIGURE_OPTS += -qt-mouse-linuxtp -else -QT_CONFIGURE_OPTS += -no-mouse-linuxtp -endif -ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXINPUT),y) -QT_CONFIGURE_OPTS += -qt-mouse-linuxinput -else -QT_CONFIGURE_OPTS += -no-mouse-linuxinput -endif -ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y) -QT_CONFIGURE_OPTS += -qt-mouse-tslib -QT_DEPENDENCIES += tslib -else -QT_CONFIGURE_OPTS += -no-mouse-tslib -endif -ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y) -QT_CONFIGURE_OPTS += -qt-mouse-qvfb -else -QT_CONFIGURE_OPTS += -no-mouse-qvfb -endif -ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y) -QT_CONFIGURE_OPTS += -D QT_NO_QWS_CURSOR -endif - -### Keyboard drivers -ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y) -QT_CONFIGURE_OPTS += -qt-kbd-tty -else -QT_CONFIGURE_OPTS += -no-kbd-tty -endif -ifeq ($(BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT),y) -QT_CONFIGURE_OPTS += -qt-kbd-linuxinput -else -QT_CONFIGURE_OPTS += -no-kbd-linuxinput -endif -ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y) -QT_CONFIGURE_OPTS += -qt-kbd-qvfb -else -QT_CONFIGURE_OPTS += -no-kbd-qvfb -endif - -ifeq ($(BR2_PACKAGE_QT_DEBUG),y) -QT_CONFIGURE_OPTS += -debug -else -QT_CONFIGURE_OPTS += -release -endif - -ifeq ($(BR2_PACKAGE_QT_SHARED),y) -QT_CONFIGURE_OPTS += -shared -else -QT_CONFIGURE_OPTS += -static -endif - -ifeq ($(BR2_STATIC_LIBS),y) -QT_CONFIGURE_OPTS += -D QT_NO_DYNAMIC_LIBRARY -endif - -ifeq ($(BR2_ENDIAN),"LITTLE") -QT_CONFIGURE_OPTS += -little-endian -else -QT_CONFIGURE_OPTS += -big-endian -endif - -ifeq ($(BR2_arm)$(BR2_armeb),y) -QT_EMB_PLATFORM = arm -else ifeq ($(BR2_i386),y) -QT_EMB_PLATFORM = x86 -else ifeq ($(BR2_x86_64),y) -QT_EMB_PLATFORM = x86_64 -else ifeq ($(BR2_mips)$(BR2_mipsel),y) -QT_EMB_PLATFORM = mips -else ifeq ($(BR2_powerpc),y) -QT_EMB_PLATFORM = powerpc -else ifeq ($(BR2_sh4)$(BR2_sh4eb)$(BR2_sh4a)$(BR2_sh4aeb),y) -QT_EMB_PLATFORM = sh -else -QT_EMB_PLATFORM = generic -endif - -ifeq ($(BR2_PACKAGE_QT_X11),y) -QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \ - xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv -# Using pkg-config avoids us some logic to redefine and sed again mkspecs files -# to add X11 include path and link options -QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11` -QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags x11` -QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs x11 xext` -QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \ - -xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \ - -no-openvg -else # if BR2_PACKAGE_QT_EMBEDDED -QT_CONFIGURE_OPTS += -embedded $(QT_EMB_PLATFORM) -endif - -ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y) -QT_CONFIGURE_OPTS += -no-gui -endif - -ifneq ($(BR2_PACKAGE_QT_GIF),y) -QT_CONFIGURE_OPTS += -no-gif -endif - -ifeq ($(BR2_PACKAGE_QT_LIBMNG),y) -QT_CONFIGURE_OPTS += -qt-libmng -else -QT_CONFIGURE_OPTS += -no-libmng -endif - -ifeq ($(BR2_PACKAGE_QT_ACCESSIBILITY),y) -QT_CONFIGURE_OPTS += -accessibility -else -QT_CONFIGURE_OPTS += -no-accessibility -endif - -ifeq ($(BR2_PACKAGE_QT_QTZLIB),y) -QT_CONFIGURE_OPTS += -qt-zlib -else -ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y) -QT_CONFIGURE_OPTS += -system-zlib -QT_DEPENDENCIES += zlib -endif -endif - -ifeq ($(BR2_PACKAGE_QT_QTJPEG),y) -QT_CONFIGURE_OPTS += -qt-libjpeg -else -ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y) -QT_CONFIGURE_OPTS += -system-libjpeg -QT_DEPENDENCIES += jpeg -else -QT_CONFIGURE_OPTS += -no-libjpeg -endif -endif - -ifeq ($(BR2_PACKAGE_QT_QTPNG),y) -QT_CONFIGURE_OPTS += -qt-libpng -else -ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y) -QT_CONFIGURE_OPTS += -system-libpng -QT_DEPENDENCIES += libpng -else -QT_CONFIGURE_OPTS += -no-libpng -endif -endif - -ifeq ($(BR2_PACKAGE_QT_QTTIFF),y) -QT_CONFIGURE_OPTS += -qt-libtiff -else -ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y) -QT_CONFIGURE_OPTS += -system-libtiff -QT_DEPENDENCIES += tiff -else -QT_CONFIGURE_OPTS += -no-libtiff -endif -endif - -QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \ - $(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \ - $(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \ - $(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \ - $(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \ - $(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont))) - -ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y) -QT_CONFIGURE_OPTS += -qt-freetype -else -ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) -QT_CONFIGURE_OPTS += -system-freetype -QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/ -QT_DEPENDENCIES += freetype -else -QT_CONFIGURE_OPTS += -no-freetype -endif -endif - -ifeq ($(BR2_PACKAGE_QT_DBUS),y) -QT_DEPENDENCIES += dbus -endif - -ifeq ($(BR2_PACKAGE_QT_OPENSSL),y) -QT_CONFIGURE_OPTS += -openssl -QT_DEPENDENCIES += openssl -else -QT_CONFIGURE_OPTS += -no-openssl -endif - -ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) -QT_CONFIGURE_OPTS += -opengl es2 -egl -QT_DEPENDENCIES += libgles libegl -QT_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -QT_CXXFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags egl` -QT_LDFLAGS += `$(PKG_CONFIG_HOST_BINARY) --libs egl` -else ifeq ($(BR2_PACKAGE_QT_OPENGL_GL_DESKTOP),y) -QT_CONFIGURE_OPTS += -opengl desktop -QT_DEPENDENCIES += libgl -else -QT_CONFIGURE_OPTS += -no-opengl -endif - -# Qt SQL Drivers -ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y) -ifeq ($(BR2_PACKAGE_QT_IBASE),y) -QT_CONFIGURE_OPTS += -qt-sql-ibase -endif -ifeq ($(BR2_PACKAGE_QT_MYSQL),y) -QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config -QT_DEPENDENCIES += mysql -endif -ifeq ($(BR2_PACKAGE_QT_ODBC),y) -QT_CONFIGURE_OPTS += -qt-sql-odbc -QT_DEPENDENCIES += unixodbc -endif -ifeq ($(BR2_PACKAGE_QT_PSQL),y) -QT_CONFIGURE_OPTS += -qt-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config -QT_DEPENDENCIES += postgresql -endif -ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y) -QT_CONFIGURE_OPTS += -qt-sql-sqlite -else -ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y) -QT_CONFIGURE_OPTS += -system-sqlite -QT_DEPENDENCIES += sqlite -else -QT_CONFIGURE_OPTS += -no-sql-sqlite -endif -endif -ifeq ($(BR2_PACKAGE_QT_SQLITE2),y) -QT_CONFIGURE_OPTS += -qt-sql-sqlite2 -endif -else -# By default, no SQL driver is turned on by configure. -# but it seems sqlite isn't disabled despite what says -# configure --help -QT_CONFIGURE_OPTS += -no-sql-sqlite -endif - -ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y) -QT_CONFIGURE_OPTS += -xmlpatterns -exceptions -else -QT_CONFIGURE_OPTS += -no-xmlpatterns -endif - -ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y) -QT_CONFIGURE_OPTS += -multimedia -else -QT_CONFIGURE_OPTS += -no-multimedia -endif - -ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y) -QT_CONFIGURE_OPTS += -audio-backend -QT_DEPENDENCIES += alsa-lib -else -QT_CONFIGURE_OPTS += -no-audio-backend -endif - -ifeq ($(BR2_PACKAGE_QT_PHONON),y) -QT_CONFIGURE_OPTS += -phonon -QT_DEPENDENCIES += gstreamer gst-plugins-base -else -QT_CONFIGURE_OPTS += -no-phonon -endif - -ifeq ($(BR2_PACKAGE_QT_PHONON_BACKEND),y) -QT_CONFIGURE_OPTS += -phonon-backend -else -QT_CONFIGURE_OPTS += -no-phonon-backend -endif - -ifeq ($(BR2_PACKAGE_QT_SVG),y) -QT_CONFIGURE_OPTS += -svg -else -QT_CONFIGURE_OPTS += -no-svg -endif - -ifeq ($(BR2_PACKAGE_QT_WEBKIT),y) -QT_CONFIGURE_OPTS += -webkit -QT_DEPENDENCIES += gstreamer gst-plugins-base -else -QT_CONFIGURE_OPTS += -no-webkit -endif - -ifeq ($(BR2_PACKAGE_QT_SCRIPT),y) -QT_CONFIGURE_OPTS += -script -else -QT_CONFIGURE_OPTS += -no-script -endif - -ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y) -QT_CONFIGURE_OPTS += -scripttools -else -QT_CONFIGURE_OPTS += -no-scripttools -endif - -ifeq ($(BR2_PACKAGE_QT_STL),y) -QT_CONFIGURE_OPTS += -stl -else -QT_CONFIGURE_OPTS += -no-stl -endif - -ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y) -QT_CONFIGURE_OPTS += -declarative -else -QT_CONFIGURE_OPTS += -no-declarative -endif - -# -no-pch is needed to workaround the issue described at -# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -# In addition, ccache and precompiled headers don't play well together -QT_CONFIGURE_OPTS += -no-pch - -# x86x86fix -# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux -# host. It's unclear if this would happen on other hosts. -ifneq ($(findstring linux,$(GNU_HOST_NAME)),) -ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),) -QT_CONFIGURE_OPTS += -platform linux-g++ -endif -endif -# End of workaround. - -# Variable for other Qt applications to use -QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++ - -################################################################################ -# QT_QMAKE_SET -- helper macro to set = in -# the qmake.conf file. Will remove existing variable declaration if -# available. -# -# Argument 1 is the variable name -# Argument 2 is the value to set variable to -# Argument 3 is the base source directory of Qt -# -# E.G. use like this: -# $(call QT_QMAKE_SET,variable,value,directory) -################################################################################ -define QT_QMAKE_SET - $(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf - $(SED) "/include.*qws.conf/a$(1) = $(2)" $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf -endef - -ifneq ($(QT_CONFIG_FILE),) -define QT_CONFIGURE_CONFIG_FILE - cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h -endef -endif - -define QT_CONFIGURE_CMDS - -[ -f $(@D)/Makefile ] && $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) confclean - $(QT_CONFIGURE_IPV6) - $(QT_CONFIGURE_CONFIG_FILE) - # Fix compiler path - $(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D)) - $(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D)) - $(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D)) - $(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D)) - $(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D)) - $(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D)) - $(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D)) - $(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D)) - $(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D)) - $(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D)) -# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target -# instead of the host then. So set PKG_CONFIG* manually. - (cd $(@D); \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \ - $(TARGET_MAKE_ENV) \ - MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \ - $(if $(VERBOSE),-verbose,-silent) \ - -force-pkg-config \ - $(QT_CONFIGURE_OPTS) \ - -no-xinerama \ - -no-cups \ - -no-nis \ - -no-separate-debug-info \ - -prefix /usr \ - -plugindir /usr/lib/qt/plugins \ - -importdir /usr/lib/qt/imports \ - -translationdir /usr/share/qt/translations \ - -hostprefix $(STAGING_DIR) \ - -fast \ - -no-rpath \ - ) -endef - -define QT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - - -# Build the list of libraries and plugins to install to the target - -QT_INSTALL_LIBS += QtCore -QT_HOST_PROGRAMS += moc rcc qmake lrelease - -ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) -QT_INSTALL_LIBS += QtGui -QT_HOST_PROGRAMS += uic -endif -ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y) -QT_INSTALL_LIBS += QtSql -endif -ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y) -QT_INSTALL_LIBS += QtMultimedia -endif -ifeq ($(BR2_PACKAGE_QT_PHONON),y) -QT_INSTALL_LIBS += phonon -endif -ifeq ($(BR2_PACKAGE_QT_SVG),y) -QT_INSTALL_LIBS += QtSvg -endif -ifeq ($(BR2_PACKAGE_QT_NETWORK),y) -QT_INSTALL_LIBS += QtNetwork -endif -ifeq ($(BR2_PACKAGE_QT_WEBKIT),y) -QT_INSTALL_LIBS += QtWebKit -endif -ifeq ($(BR2_PACKAGE_QT_XML),y) -QT_INSTALL_LIBS += QtXml -endif -ifeq ($(BR2_PACKAGE_QT_DBUS),y) -QT_INSTALL_LIBS += QtDBus -endif -ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y) -QT_INSTALL_LIBS += QtXmlPatterns -endif -ifeq ($(BR2_PACKAGE_QT_SCRIPT),y) -QT_INSTALL_LIBS += QtScript -endif -ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y) -QT_INSTALL_LIBS += QtScriptTools -endif -ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y) -QT_INSTALL_LIBS += QtDeclarative -endif -ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y) -QT_INSTALL_LIBS += Qt3Support -endif -ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y) -QT_INSTALL_LIBS += QtOpenGL -endif -ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y) -QT_INSTALL_LIBS += pvrQWSWSEGL -endif -ifeq ($(BR2_PACKAGE_QT_TEST),y) -QT_INSTALL_LIBS += QtTest -endif - -QT_CONF_FILE = $(HOST_DIR)/usr/bin/qt.conf - -# Since host programs and spec files have been moved to $(HOST_DIR), -# we need to tell qmake the new location of the various elements, -# through a qt.conf file. -define QT_INSTALL_QT_CONF - mkdir -p $(dir $(QT_CONF_FILE)) - echo "[Paths]" > $(QT_CONF_FILE) - echo "Prefix=$(HOST_DIR)/usr" >> $(QT_CONF_FILE) - echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE) - echo "Libraries=$(STAGING_DIR)/usr/lib" >> $(QT_CONF_FILE) - echo "Data=$(HOST_DIR)/usr" >> $(QT_CONF_FILE) - echo "Binaries=$(HOST_DIR)/usr/bin" >> $(QT_CONF_FILE) -endef - -# After running Qt normal installation process (which installs -# everything in the STAGING_DIR), we move host programs such as qmake, -# rcc or uic to the HOST_DIR so that they are available at the usual -# location. A qt.conf file is generated to make sure that all host -# programs still find all files they need. The .pc files are tuned to -# remove the sysroot path from them, since pkg-config already adds it -# automatically. -define QT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - mkdir -p $(HOST_DIR)/usr/bin - mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin - ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs - $(QT_INSTALL_QT_CONF) - for i in moc uic rcc lupdate lrelease ; do \ - $(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/usr/bin/$${i}," \ - $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \ - done - $(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc -endef - -# Library installation -ifeq ($(BR2_PACKAGE_QT_SHARED),y) -define QT_INSTALL_TARGET_LIBS - mkdir -p $(TARGET_DIR)/usr/lib - for lib in $(QT_INSTALL_LIBS); do \ - cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \ - done -endef -endif - -# Plugin installation -define QT_INSTALL_TARGET_PLUGINS - if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \ - fi -endef - -# Import installation -define QT_INSTALL_TARGET_IMPORTS - if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \ - fi -endef - -# Fonts installation -ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y) -ifneq ($(QT_FONTS),) -define QT_INSTALL_TARGET_FONTS - mkdir -p $(TARGET_DIR)/usr/lib/fonts - cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts -endef -ifneq ($(BR2_PACKAGE_QT_FONT_MICRO)$(BR2_PACKAGE_QT_FONT_FIXED),) -# as stated in the font source src/3rdparty/fonts/micro.bdf -# source src/3rdparty/fonts/5x7.bdf and source src/3rdparty/fonts/6x13.bdf -QT_LICENSE := $(QT_LICENSE), Public Domain (Micro/Fixed font) -endif -ifneq ($(BR2_PACKAGE_QT_FONT_HELVETICA)$(BR2_PACKAGE_QT_FONT_JAPANESE),) -QT_LICENSE := $(QT_LICENSE), Adobe Helvetica license (Helvetica/Japanese fonts) -QT_LICENSE_FILES += src/3rdparty/fonts/COPYING.Helvetica -endif -ifeq ($(BR2_PACKAGE_QT_FONT_UNIFONT),y) -QT_LICENSE := $(QT_LICENSE), Freeware (Unifont font) -QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.Unifont -endif -endif # QT_FONTS - -ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y) -define QT_INSTALL_TARGET_FONTS_TTF - mkdir -p $(TARGET_DIR)/usr/lib/fonts - cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts -endef -QT_LICENSE := $(QT_LICENSE), Bitstream license (DejaVu/Vera TrueType fonts) -QT_LICENSE_FILES += src/3rdparty/fonts/COPYRIGHT.DejaVu \ - src/3rdparty/fonts/README.DejaVu \ - src/3rdparty/fonts/COPYRIGHT.Vera -endif -endif # BR2_PACKAGE_QT_EMBEDDED - -ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y) -define QT_INSTALL_TARGET_POWERVR - # Note: this overwrites the default powervr.ini provided by the ti-gfx - # package. - $(INSTALL) -D -m 0644 package/qt/powervr.ini \ - $(TARGET_DIR)/etc/powervr.ini -endef -endif - -ifeq ($(BR2_PACKAGE_QT_TRANSLATION_FILES),y) -define QT_INSTALL_TARGET_TRANSLATIONS - if [ -d $(STAGING_DIR)/usr/share/qt/translations/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/share/qt/translations ; \ - cp -dpfr $(STAGING_DIR)/usr/share/qt/translations/* $(TARGET_DIR)/usr/share/qt/translations ; \ - fi -endef -endif - -define QT_INSTALL_TARGET_CMDS - $(QT_INSTALL_TARGET_LIBS) - $(QT_INSTALL_TARGET_PLUGINS) - $(QT_INSTALL_TARGET_IMPORTS) - $(QT_INSTALL_TARGET_FONTS) - $(QT_INSTALL_TARGET_FONTS_TTF) - $(QT_INSTALL_TARGET_POWERVR) - $(QT_INSTALL_TARGET_TRANSLATIONS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/Config.in b/package.bak/qt5/Config.in deleted file mode 100644 index 4bcbc6ef54..0000000000 --- a/package.bak/qt5/Config.in +++ /dev/null @@ -1,84 +0,0 @@ -config BR2_PACKAGE_QT5_GL_AVAILABLE - bool - depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBGLES - default y - -config BR2_PACKAGE_QT5_JSCORE_AVAILABLE - bool - # Javascript engine is only available on certain architectures - depends on BR2_arm || BR2_i386 || BR2_x86_64 || BR2_mipsel - # ARM needs BLX, so v5t+ - depends on !BR2_ARM_CPU_ARMV4 - default y - -comment "Qt5 needs a toolchain w/ wchar, NPTL, C++, dynamic library" - depends on !BR2_PACKAGE_QT - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS - -menuconfig BR2_PACKAGE_QT5 - bool "Qt5" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_STATIC_LIBS - depends on !BR2_PACKAGE_QT - select BR2_PACKAGE_QT5BASE - help - This option enables the Qt5 framework. Sub-options allow to - select which modules should be built. - - http://qt.io - -if BR2_PACKAGE_QT5 - -choice - prompt "Qt5 version" - -config BR2_PACKAGE_QT5_VERSION_LATEST - bool "Latest (5.8)" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - depends on BR2_HOST_GCC_AT_LEAST_4_8 # C++11 - depends on !BR2_ARM_CPU_ARMV4 # needs ARMv5+ - # no built-in double-conversion support - depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa - help - This option builds Qt 5.8, which is licensed under - (L)GPLv3+. - -comment "Latest Qt version needs host/toolchain w/ gcc >= 4.8" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 || !BR2_HOST_GCC_AT_LEAST_4_8 - depends on !BR2_ARM_CPU_ARMV4 - depends on !BR2_arc && !BR2_nios2 && !BR2_xtensa - -config BR2_PACKAGE_QT5_VERSION_5_6 - bool "LTS (5.6)" - help - This option builds Qt 5.6, which is licensed under - (L)GPLv2+. - -endchoice - -source "package/qt5/qt53d/Config.in" -source "package/qt5/qt5base/Config.in" -source "package/qt5/qt5canvas3d/Config.in" -source "package/qt5/qt5connectivity/Config.in" -source "package/qt5/qt5declarative/Config.in" -source "package/qt5/qt5enginio/Config.in" -source "package/qt5/qt5graphicaleffects/Config.in" -source "package/qt5/qt5imageformats/Config.in" -source "package/qt5/qt5location/Config.in" -source "package/qt5/qt5multimedia/Config.in" -source "package/qt5/qt5quickcontrols/Config.in" -source "package/qt5/qt5quickcontrols2/Config.in" -source "package/qt5/qt5script/Config.in" -source "package/qt5/qt5sensors/Config.in" -source "package/qt5/qt5serialbus/Config.in" -source "package/qt5/qt5serialport/Config.in" -source "package/qt5/qt5svg/Config.in" -source "package/qt5/qt5tools/Config.in" -source "package/qt5/qt5webchannel/Config.in" -source "package/qt5/qt5webkit/Config.in" -source "package/qt5/qt5websockets/Config.in" -source "package/qt5/qt5x11extras/Config.in" -source "package/qt5/qt5xmlpatterns/Config.in" -endif diff --git a/package.bak/qt5/qt5.mk b/package.bak/qt5/qt5.mk deleted file mode 100644 index 9e77ce351c..0000000000 --- a/package.bak/qt5/qt5.mk +++ /dev/null @@ -1,31 +0,0 @@ -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5_VERSION_MAJOR = 5.8 -QT5_VERSION = $(QT5_VERSION_MAJOR).0 -QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules -QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules -else -QT5_VERSION_MAJOR = 5.6 -QT5_VERSION = $(QT5_VERSION_MAJOR).2 -QT5_SITE = http://download.qt.io/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules -QT5_SNAPSHOTS_SITE = http://download.qt.io/snapshots/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/latest_src/submodules -endif - -include $(sort $(wildcard package/qt5/*/*.mk)) - -define QT5_LA_PRL_FILES_FIXUP - for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.la"); do \ - $(SED) "s:$(BASE_DIR):@BASE_DIR@:g" \ - -e "s:$(STAGING_DIR):@STAGING_DIR@:g" \ - -e "s:\(['= ]\)/usr:\\1@STAGING_DIR@/usr:g" \ - -e "s:@STAGING_DIR@:$(STAGING_DIR):g" \ - -e "s:@BASE_DIR@:$(BASE_DIR):g" \ - $$i ; \ - $(SED) "/^dependency_libs=/s%-L/usr/lib %%g" $$i ; \ - done - for i in $$(find $(STAGING_DIR)/usr/lib* -name "libQt5*.prl"); do \ - $(SED) "s%-L/usr/lib%%" $$i; \ - done -endef - -# Variable for other Qt applications to use -QT5_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec devices/linux-buildroot-g++ diff --git a/package.bak/qt5/qt53d/Config.in b/package.bak/qt5/qt53d/Config.in deleted file mode 100644 index 27f27a8070..0000000000 --- a/package.bak/qt5/qt53d/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_QT53D - bool "qt53d" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative_quick - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package corresponds to the qt53d module. - - - This module was in tech preview in Qt 5.6, and promoted - to a core module in Qt 5.7.0. - - Enable the assimp package to gain the assimp sceneparser plugin. - - http://doc.qt.io/qt-5/qt3d-index.html - -comment "qt53d module needs an OpenGL-capable backend" - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE diff --git a/package.bak/qt5/qt53d/qt53d.hash b/package.bak/qt5/qt53d/qt53d.hash deleted file mode 100644 index 7eaf2cdb13..0000000000 --- a/package.bak/qt5/qt53d/qt53d.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qt3d-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 a21786db6e0f5c6c70213fe1a3530ed3d7f28f28401a0f793970e9bc860ce941 qt3d-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qt3d-opensource-src-5.8.0.tar.xz -sha256 3a224576fc922195ac0063b5b351cd6b9d13afcde9cec14317be0347d10c8ae5 qt3d-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt53d/qt53d.mk b/package.bak/qt5/qt53d/qt53d.mk deleted file mode 100644 index 5dac5b0b62..0000000000 --- a/package.bak/qt5/qt53d/qt53d.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# qt53d -# -################################################################################ - -QT53D_VERSION = $(QT5_VERSION) -QT53D_SITE = $(QT5_SITE) -QT53D_SOURCE = qt3d-opensource-src-$(QT5SVG_VERSION).tar.xz -QT53D_DEPENDENCIES = qt5base qt5declarative -QT53D_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_ASSIMP),y) -QT53D_DEPENDENCIES += assimp -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT53D_LICENSE = GPLv2 or GPLv3 or LGPLv3 -QT53D_LICENSE_FILES = LICENSE.GPL LICENSE.GPLv3 LICENSE.LGPLv3 -else -QT53D_LICENSE = Commercial license -QT53D_REDISTRIBUTE = NO -endif - -define QT53D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT53D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT53D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT53D_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt53D*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sceneparsers $(TARGET_DIR)/usr/lib/qt/plugins - cp -dpfr $(STAGING_DIR)/usr/qml/Qt3D $(TARGET_DIR)/usr/qml -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch b/package.bak/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch deleted file mode 100644 index f1f6d9b0b7..0000000000 --- a/package.bak/qt5/qt5base/5.6.2/0001-eglfs-rasp-pi-header-inclusion.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 91c3b111e45dd476aba057836b1b618eacf90f3f Mon Sep 17 00:00:00 2001 -From: Julien Corjon -Date: Tue, 21 Jul 2015 09:58:14 +0200 -Subject: [PATCH] eglfs - fix rasp-pi header inclusion - -eglplateform.h include headers for low level instruction and fail on brcm -headers inclusion - For the brcm presence test we use egl pkg-config file - For the eglfs-plugin compilation we use the egl configuration - -Upstream-Status: https://bugreports.qt.io/browse/QTBUG-47339 -Signed-off-by: Julien Corjon ---- - config.tests/qpa/eglfs-brcm/eglfs-brcm.pro | 2 ++ - src/plugins/platforms/eglfs/eglfs-plugin.pro | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -index ce16a3a..192a8ad 100644 ---- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro -@@ -1,6 +1,8 @@ - SOURCES = eglfs-brcm.cpp - - CONFIG -= qt -+CONFIG += link_pkgconfig -+PKGCONFIG += egl - - INCLUDEPATH += $$QMAKE_INCDIR_EGL - -diff --git a/src/plugins/platforms/eglfs/eglfs-plugin.pro b/src/plugins/platforms/eglfs/eglfs-plugin.pro -index 0f493fd..8479496 100644 ---- a/src/plugins/platforms/eglfs/eglfs-plugin.pro -+++ b/src/plugins/platforms/eglfs/eglfs-plugin.pro -@@ -6,6 +6,7 @@ PLUGIN_CLASS_NAME = QEglFSIntegrationPlugin - load(qt_plugin) - - QT += platformsupport-private eglfs_device_lib-private -+CONFIG += egl - - SOURCES += $$PWD/qeglfsmain.cpp - --- -2.1.0 - diff --git a/package.bak/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch b/package.bak/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch deleted file mode 100644 index cbafb397bb..0000000000 --- a/package.bak/qt5/qt5base/5.6.2/0002-eglfs-fix-eglfs_mali-compile-for-odroid-mali.patch +++ /dev/null @@ -1,53 +0,0 @@ -From b6c602e4264021f98ec2c72316e2a2000bf35e82 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 14 Nov 2016 23:42:25 +0100 -Subject: [PATCH] eglfs: fix eglfs_mali compile for odroid-mali - -Avoid duplicated struct fbdev_window definition (introduced by [1]) by -renaming struct fbdev_window to shadow_fbdev_window. - -Fixes the following buildroot compile failure ([2]): - -qeglfsmaliintegration.cpp:45:8: error: redefinition of 'struct fbdev_window' - struct fbdev_window { - ^ -In file included from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/eglplatform.h:28:0, - from /accts/mlweber1/rc-buildroot-test/scripts/instance-0/output/host/usr/aarch64-buildroot-linux-gnu/sysroot/usr/include/EGL/egl.h:36, - from ../../../eglfs/qeglfsglobal.h:45, - from ../../../eglfs/qeglfsdeviceintegration.h:48, - from qeglfsmaliintegration.h:37, - from qeglfsmaliintegration.cpp:34: - -[1] https://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=58bed4cda98e8e25db8adc61c7db73b6853077dc -[2] http://autobuild.buildroot.net/results/48c/48c458c035162169e8ca7c34ae65e9064822f25a - -Signed-off-by: Peter Seiderer ---- - .../eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -index 43decdf..aeba83f 100644 ---- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -+++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_mali/qeglfsmaliintegration.cpp -@@ -42,7 +42,7 @@ - - QT_BEGIN_NAMESPACE - --struct fbdev_window { -+struct shadow_fbdev_window { - unsigned short width; - unsigned short height; - }; -@@ -85,7 +85,7 @@ EGLNativeWindowType QEglFSMaliIntegration::createNativeWindow(QPlatformWindow *w - Q_UNUSED(window); - Q_UNUSED(format); - -- fbdev_window *fbwin = reinterpret_cast(malloc(sizeof(fbdev_window))); -+ shadow_fbdev_window *fbwin = reinterpret_cast(malloc(sizeof(shadow_fbdev_window))); - if (NULL == fbwin) - return 0; - --- -2.8.1 - diff --git a/package.bak/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch b/package.bak/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch deleted file mode 100644 index 8548ef0e25..0000000000 --- a/package.bak/qt5/qt5base/5.8.0/0001-fix-parallel-builds-with-qt-freetype-system-libpng.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 74af93f5298b54bc2327843f390bf202776f2f48 Mon Sep 17 00:00:00 2001 -From: Oswald Buddenhagen -Date: Tue, 10 Jan 2017 14:18:02 +0100 -Subject: [PATCH] fix parallel builds with -qt-freetype -system-libpng - -freetype has no dependency on gui, so it needs to pull in gui's -configuration manually, as that's where the system libpng is found. - -Task-number: QTBUG-58038 -Change-Id: I881495f7d2a8f7c1a45d7d4c9e7698ff1d30f2a9 -Reviewed-by: Joerg Bornemann -Reviewed-by: Joni Poikelin - -Upstream: https://code.qt.io/cgit/qt/qtbase.git/commit/?id=4dcfd90e4fd7d4c49138038dbbcbda8794a9fbff -Signed-off-by: Peter Seiderer ---- - src/3rdparty/freetype/freetype.pro | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/3rdparty/freetype/freetype.pro b/src/3rdparty/freetype/freetype.pro -index 5b1eb92e..390a6da7 100644 ---- a/src/3rdparty/freetype/freetype.pro -+++ b/src/3rdparty/freetype/freetype.pro -@@ -69,6 +69,7 @@ DEFINES += FT_CONFIG_OPTION_SYSTEM_ZLIB - include(../zlib_dependency.pri) - - DEFINES += FT_CONFIG_OPTION_USE_PNG -+include($$OUT_PWD/../../gui/qtgui-config.pri) - QMAKE_USE_PRIVATE += libpng - - DEFINES += TT_CONFIG_OPTION_SUBPIXEL_HINTING --- -2.11.0 - diff --git a/package.bak/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch b/package.bak/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch deleted file mode 100644 index e7d7ee3600..0000000000 --- a/package.bak/qt5/qt5base/5.8.0/0002-fix-VNC-platform-plugin-build-on-big-endian-machines.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 35ee8b53549fab6ebffe289417e1d94298447af7 Mon Sep 17 00:00:00 2001 -From: Shawn Rutledge -Date: Fri, 10 Feb 2017 13:56:58 +0100 -Subject: [PATCH] fix VNC platform plugin build on big-endian machines - -Task-number: QTBUG-58734 -Change-Id: I3e44ee4be5003acaba2f1b8ed2658a3ff1bd700e -Reviewed-by: Lars Knoll -Reviewed-by: Dmitry Shachnev - -Upstream: http://code.qt.io/cgit/qt/qtbase.git/patch/?id=6f64bfa654fb7e20bb75ec3b0544b81482babb44 -Signed-off-by: Peter Seiderer ---- - src/plugins/platforms/vnc/qvncclient.cpp | 6 +++--- - src/plugins/platforms/vnc/qvncscreen.cpp | 7 ++++++- - src/plugins/platforms/vnc/qvncscreen.h | 2 +- - 3 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/src/plugins/platforms/vnc/qvncclient.cpp b/src/plugins/platforms/vnc/qvncclient.cpp -index dae3e83f..58dcfc9b 100644 ---- a/src/plugins/platforms/vnc/qvncclient.cpp -+++ b/src/plugins/platforms/vnc/qvncclient.cpp -@@ -142,7 +142,7 @@ void QVncClient::convertPixels(char *dst, const char *src, int count) const - case 16: { - quint16 p = *reinterpret_cast(src); - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- if (swapBytes) -+ if (m_swapBytes) - p = ((p & 0xff) << 8) | ((p & 0xff00) >> 8); - #endif - r = (p >> 11) & 0x1f; -@@ -484,7 +484,7 @@ void QVncClient::setPixelFormat() - m_sameEndian = (QSysInfo::ByteOrder == QSysInfo::BigEndian) == !!m_pixelFormat.bigEndian; - m_needConversion = pixelConversionNeeded(); - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- m_swapBytes = qvnc_screen->swapBytes(); -+ m_swapBytes = server()->screen()->swapBytes(); - #endif - } - } -@@ -639,7 +639,7 @@ bool QVncClient::pixelConversionNeeded() const - return true; - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- if (qvnc_screen->swapBytes()) -+ if (server()->screen()->swapBytes()) - return true; - #endif - -diff --git a/src/plugins/platforms/vnc/qvncscreen.cpp b/src/plugins/platforms/vnc/qvncscreen.cpp -index 34def457..64f1bc0b 100644 ---- a/src/plugins/platforms/vnc/qvncscreen.cpp -+++ b/src/plugins/platforms/vnc/qvncscreen.cpp -@@ -43,6 +43,7 @@ - #include - - #include -+#include - #include - - -@@ -172,14 +173,18 @@ QPixmap QVncScreen::grabWindow(WId wid, int x, int y, int width, int height) con - } - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN --bool QVNCScreen::swapBytes() const -+bool QVncScreen::swapBytes() const - { -+ return false; -+ -+ /* TODO - if (depth() != 16) - return false; - - if (screen()) - return screen()->frameBufferLittleEndian(); - return frameBufferLittleEndian(); -+ */ - } - #endif - -diff --git a/src/plugins/platforms/vnc/qvncscreen.h b/src/plugins/platforms/vnc/qvncscreen.h -index 785abd6d..0b42c3c7 100644 ---- a/src/plugins/platforms/vnc/qvncscreen.h -+++ b/src/plugins/platforms/vnc/qvncscreen.h -@@ -73,7 +73,7 @@ public: - void clearDirty() { dirtyRegion = QRegion(); } - - #if Q_BYTE_ORDER == Q_BIG_ENDIAN -- bool swapBytes() const -+ bool swapBytes() const; - #endif - - QStringList mArgs; --- -2.11.0 - diff --git a/package.bak/qt5/qt5base/Config.in b/package.bak/qt5/qt5base/Config.in deleted file mode 100644 index 337dcf2454..0000000000 --- a/package.bak/qt5/qt5base/Config.in +++ /dev/null @@ -1,289 +0,0 @@ -config BR2_PACKAGE_QT5BASE - bool "qt5base" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_PCRE_16 - select BR2_PACKAGE_PCRE_UTF - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package corresponds to the qt5base module, which - contains the base Qt libraries: QtCore, QtNetwork, QtGui, - QtWidgets, etc. - - http://qt.io - -if BR2_PACKAGE_QT5BASE - -config BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS - string "Custom configuration options" - help - Define custom qt5 configuration options which can be used to - enable or disable options not managed by buildroot. These - options are appended to the ones generated by buildroot and - passed to qt5base during configuration. - - E.g. to remove the Windows Vista style option, add the option - -no-feature-style_windowsvista. - -config BR2_PACKAGE_QT5BASE_LICENSE_APPROVED - bool "Approve free license" - help - Select this if you approve one of the available free licenses for the - Qt5 library. - By doing this you will not be asked while the library is compiled. - Please read and understand the license terms before approving this. - - LGPL: http://doc.qt.io/qt-5/lgpl.html - - See also http://doc.qt.io/qt-5/licensing.html - -config BR2_PACKAGE_QT5BASE_CONFIG_FILE - string "Config file" - help - Configure options allow to set which modules are being - compiled or not in Qt, but Qt also provide a more - fine-grained mechanism to configure which features should be - enabled or disabled, through a header file. Examples of such - header files can be found in src/corelib/global/qconfig-*.h - in the Qt sources. - - This option allows to set the path of such a configuration - file, which Buildroot will give to Qt at compile time. - -config BR2_PACKAGE_QT5BASE_EXAMPLES - bool "Compile and install examples (with code)" - select BR2_PACKAGE_QT5BASE_NETWORK - select BR2_PACKAGE_QT5BASE_XML - help - If unsure, say N. - -config BR2_PACKAGE_QT5BASE_NETWORK - def_bool y - -config BR2_PACKAGE_QT5BASE_CONCURRENT - bool "concurrent module" - help - This options enables the Qt5Concurrent library. - -config BR2_PACKAGE_QT5BASE_SQL - def_bool y - -if BR2_PACKAGE_QT5BASE_SQL -config BR2_PACKAGE_QT5BASE_MYSQL - bool "MySQL Plugin" - select BR2_PACKAGE_MYSQL - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - depends on BR2_USE_MMU # mysql - help - Build MySQL plugin - If unsure, say n. - -config BR2_PACKAGE_QT5BASE_PSQL - bool "PostgreSQL Plugin" - select BR2_PACKAGE_POSTGRESQL - depends on BR2_USE_MMU # postgresql - depends on !BR2_STATIC_LIBS - help - Build PostgreSQL plugin - If unsure, say n. - -comment "PostgreSQL plugin needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS - -choice - prompt "SQLite 3 support" - default BR2_PACKAGE_QT5BASE_SQLITE_NONE - help - Select SQLite support. - -config BR2_PACKAGE_QT5BASE_SQLITE_NONE - bool "No sqlite support" - help - Do not compile any kind of SQLite support. - -config BR2_PACKAGE_QT5BASE_SQLITE_QT - bool "Qt SQLite" - help - Use Qt bundled SQLite support. - -config BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM - bool "System SQLite" - select BR2_PACKAGE_SQLITE - help - Use system SQLite. - -endchoice - -endif - -config BR2_PACKAGE_QT5BASE_TEST - def_bool y - -config BR2_PACKAGE_QT5BASE_XML - def_bool y - -config BR2_PACKAGE_QT5BASE_GUI - bool "gui module" - select BR2_PACKAGE_FREETYPE - # At least one graphic backend must be enabled, so enable - # linuxfb if nothing is enabled. - select BR2_PACKAGE_QT5BASE_LINUXFB if \ - !BR2_PACKAGE_QT5BASE_DIRECTFB && \ - !BR2_PACKAGE_QT5BASE_XCB && \ - !BR2_PACKAGE_QT5BASE_EGLFS - help - This option enables the Qt5Gui library. - -if BR2_PACKAGE_QT5BASE_GUI - -config BR2_PACKAGE_QT5BASE_WIDGETS - bool "widgets module" - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB - help - This option enables the Qt5Widgets library. - -comment "OpenGL support needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - -config BR2_PACKAGE_QT5BASE_OPENGL - bool "OpenGL support" - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - help - This option enables OpenGL support. - -if BR2_PACKAGE_QT5BASE_OPENGL - -choice - prompt "OpenGL API" - help - Select OpenGL API. - -config BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP - bool "Desktop OpenGL" - depends on BR2_PACKAGE_HAS_LIBGL - help - Use desktop OpenGL. - -config BR2_PACKAGE_QT5BASE_OPENGL_ES2 - bool "OpenGL ES 2.0+" - depends on BR2_PACKAGE_HAS_LIBGLES - help - Use OpenGL ES 2.0 and later versions. - -endchoice - -config BR2_PACKAGE_QT5BASE_OPENGL_LIB - bool "opengl module" - select BR2_PACKAGE_QT5BASE_WIDGETS - help - This option enables the Qt5OpenGL library. This library includes - OpenGL support classes provided to ease porting from Qt 4.x. - -endif - -config BR2_PACKAGE_QT5BASE_LINUXFB - bool "linuxfb support" - -config BR2_PACKAGE_QT5BASE_DIRECTFB - bool "directfb support" - depends on BR2_PACKAGE_DIRECTFB - -comment "directfb backend available if directfb is enabled" - depends on !BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_QT5BASE_XCB - bool "X.org XCB support" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XCB_UTIL_IMAGE - select BR2_PACKAGE_XCB_UTIL_KEYSYMS - select BR2_PACKAGE_XCB_UTIL_WM - select BR2_PACKAGE_LIBXKBCOMMON - -comment "X.org XCB backend available if X.org is enabled" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_QT5BASE_EGLFS - bool "eglfs support" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_HAS_LIBEGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - -comment "eglfs backend available if OpenGL and EGL are enabled" - depends on !BR2_PACKAGE_HAS_LIBEGL || !BR2_PACKAGE_QT5_GL_AVAILABLE - -config BR2_PACKAGE_QT5BASE_DEFAULT_QPA - string "Default graphical platform" - help - Choose the default platform abstraction to use for graphical - applications (e.g xcb, linuxfb, eglfs, ...). If this is empty, the - default for your architecture will be used (usually this is eglfs). - - You can get a list of supported platforms by running a Qt application - with the option "-platform help" on your target. You can choose a - different platform at runtime with the -platform option. - -config BR2_PACKAGE_QT5BASE_PRINTSUPPORT - depends on BR2_PACKAGE_QT5BASE_WIDGETS - def_bool y - -config BR2_PACKAGE_QT5BASE_FONTCONFIG - bool "fontconfig support" - select BR2_PACKAGE_FONTCONFIG - help - This option enables Fontconfig and Freetype support using - the system fontconfig and freetype2 libraries. - -config BR2_PACKAGE_QT5BASE_GIF - bool "GIF support" - help - This compiles and installs the plugin for GIF reading support. - -config BR2_PACKAGE_QT5BASE_JPEG - bool "JPEG support" - select BR2_PACKAGE_JPEG - help - This option enables JPEG support using the system libjpeg - library. - -config BR2_PACKAGE_QT5BASE_PNG - bool "PNG support" - select BR2_PACKAGE_LIBPNG - help - This option enables PNG support using the system libpng - library. - -endif - -config BR2_PACKAGE_QT5BASE_DBUS - bool "DBus module" - select BR2_PACKAGE_DBUS - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - help - This option enables the D-Bus module. - -config BR2_PACKAGE_QT5BASE_ICU - bool "Enable ICU support" - select BR2_PACKAGE_ICU - depends on !BR2_BINFMT_FLAT # icu - help - This option enables ICU support in Qt5. This is for example - needed for Qt5Webkit. - -config BR2_PACKAGE_QT5BASE_TSLIB - bool "Enable Tslib support" - depends on !BR2_STATIC_LIBS # dlopen - select BR2_PACKAGE_TSLIB - help - This options enables the Tslib plugin - -comment "tslib support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -endif diff --git a/package.bak/qt5/qt5base/qmake.conf b/package.bak/qt5/qt5base/qmake.conf deleted file mode 100644 index 49cf898316..0000000000 --- a/package.bak/qt5/qt5base/qmake.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Qt5 has a mechanism to support "device" profiles, so that people can -# specify the compiler, compiler flags and so on for a specific device. - -# We leverage this mechanism in the Buildroot packaging of qt5 to -# simplify cross-compilation: we have our own "device" definition, which -# allows us to easily pass the cross-compiler paths and flags from our -# qt5.mk. - -include(../common/linux_device_pre.conf) - -# modifications to g++-unix.conf -QMAKE_CC = $${CROSS_COMPILE}gcc -QMAKE_CXX = $${CROSS_COMPILE}g++ - -# modifications to gcc-base.conf -QMAKE_CFLAGS += $${BR_COMPILER_CFLAGS} -QMAKE_CXXFLAGS += $${BR_COMPILER_CXXFLAGS} -QMAKE_CXXFLAGS_RELEASE += -O3 -CONFIG += nostrip - -QMAKE_LIBS += -lrt -lpthread -ldl -QMAKE_CFLAGS_ISYSTEM = - -include(../common/linux_device_post.conf) -load(qt_config) diff --git a/package.bak/qt5/qt5base/qplatformdefs.h b/package.bak/qt5/qt5base/qplatformdefs.h deleted file mode 100644 index 99e9a27923..0000000000 --- a/package.bak/qt5/qt5base/qplatformdefs.h +++ /dev/null @@ -1 +0,0 @@ -#include "../../linux-g++/qplatformdefs.h" diff --git a/package.bak/qt5/qt5base/qt5base.hash b/package.bak/qt5/qt5base/qt5base.hash deleted file mode 100644 index 3f6af8acb0..0000000000 --- a/package.bak/qt5/qt5base/qt5base.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtbase-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 qtbase-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtbase-opensource-src-5.8.0.tar.xz -sha256 c17111ae02a44dc7be1ec2cf979a47ee9e58edf4904041a525c21f4fa53fc005 qtbase-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5base/qt5base.mk b/package.bak/qt5/qt5base/qt5base.mk deleted file mode 100644 index 7a335736db..0000000000 --- a/package.bak/qt5/qt5base/qt5base.mk +++ /dev/null @@ -1,301 +0,0 @@ -################################################################################ -# -# qt5base -# -################################################################################ - -QT5BASE_VERSION = $(QT5_VERSION) -QT5BASE_SITE = $(QT5_SITE) -QT5BASE_SOURCE = qtbase-opensource-src-$(QT5BASE_VERSION).tar.xz - -QT5BASE_DEPENDENCIES = host-pkgconf zlib pcre -QT5BASE_INSTALL_STAGING = YES - -# A few comments: -# * -no-pch to workaround the issue described at -# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. -# * -system-zlib because zlib is mandatory for Qt build, and we -# want to use the Buildroot packaged zlib -# * -system-pcre because pcre is mandatory to build Qt, and we -# want to use the one packaged in Buildroot -QT5BASE_CONFIGURE_OPTS += \ - -optimized-qmake \ - -no-cups \ - -no-iconv \ - -system-zlib \ - -system-pcre \ - -no-pch \ - -shared - -QT5BASE_CONFIGURE_OPTS += $(call qstrip,$(BR2_PACKAGE_QT5BASE_CUSTOM_CONF_OPTS)) - -# Uses libgbm from mesa3d -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y) -QT5BASE_CONFIGURE_OPTS += -kms -gbm -QT5BASE_DEPENDENCIES += mesa3d -else -QT5BASE_CONFIGURE_OPTS += -no-kms -endif - -ifeq ($(BR2_ENABLE_DEBUG),y) -QT5BASE_CONFIGURE_OPTS += -debug -else -QT5BASE_CONFIGURE_OPTS += -release -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -QT5BASE_CONFIGURE_OPTS += -largefile -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5BASE_CONFIGURE_OPTS += -opensource -confirm-license -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5BASE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5BASE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5BASE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5BASE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5BASE_LICENSE := $(QT5BASE_LICENSE), BSD-3c (examples) -QT5BASE_LICENSE_FILES += header.BSD -endif -else -QT5BASE_LICENSE = Commercial license -QT5BASE_REDISTRIBUTE = NO -endif - -QT5BASE_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT5BASE_CONFIG_FILE)) - -ifneq ($(QT5BASE_CONFIG_FILE),) -QT5BASE_CONFIGURE_OPTS += -qconfig buildroot -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -QT5BASE_DEPENDENCIES += udev -endif - -# Qt5 SQL Plugins -ifeq ($(BR2_PACKAGE_QT5BASE_SQL),y) -ifeq ($(BR2_PACKAGE_QT5BASE_MYSQL),y) -QT5BASE_CONFIGURE_OPTS += -plugin-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config -QT5BASE_DEPENDENCIES += mysql -else -QT5BASE_CONFIGURE_OPTS += -no-sql-mysql -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_PSQL),y) -QT5BASE_CONFIGURE_OPTS += -plugin-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config -QT5BASE_DEPENDENCIES += postgresql -else -QT5BASE_CONFIGURE_OPTS += -no-sql-psql -endif - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_QT),-plugin-sql-sqlite) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),-system-sqlite) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_SYSTEM),sqlite) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_SQLITE_NONE),-no-sql-sqlite) -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_GUI),y) -QT5BASE_CONFIGURE_OPTS += -gui -system-freetype -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5_VERSION_5_6),-I$(STAGING_DIR)/usr/include/freetype2) -QT5BASE_DEPENDENCIES += freetype -else -QT5BASE_CONFIGURE_OPTS += -no-gui -no-freetype -endif -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_WIDGETS),-widgets,-no-widgets) -# We have to use --enable-linuxfb, otherwise Qt thinks that -linuxfb -# is to add a link against the "inuxfb" library. -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_LINUXFB),--enable-linuxfb,-no-linuxfb) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),-directfb,-no-directfb) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DIRECTFB),directfb) - -ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5BASE_CONFIGURE_OPTS += -xcb -system-xkbcommon -QT5BASE_DEPENDENCIES += \ - libxcb \ - xcb-util-wm \ - xcb-util-image \ - xcb-util-keysyms \ - xlib_libX11 \ - libxkbcommon -ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) -QT5BASE_DEPENDENCIES += xlib_libXext -endif -else -QT5BASE_CONFIGURE_OPTS += -no-xcb -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_DESKTOP),y) -QT5BASE_CONFIGURE_OPTS += -opengl desktop -QT5BASE_DEPENDENCIES += libgl -else ifeq ($(BR2_PACKAGE_QT5BASE_OPENGL_ES2),y) -QT5BASE_CONFIGURE_OPTS += -opengl es2 -QT5BASE_DEPENDENCIES += libgles -else -QT5BASE_CONFIGURE_OPTS += -no-opengl -endif - -QT5BASE_DEFAULT_QPA = $(call qstrip,$(BR2_PACKAGE_QT5BASE_DEFAULT_QPA)) -QT5BASE_CONFIGURE_OPTS += $(if $(QT5BASE_DEFAULT_QPA),-qpa $(QT5BASE_DEFAULT_QPA)) - -ifeq ($(BR2_PACKAGE_QT5BASE_EGLFS),y) -QT5BASE_CONFIGURE_OPTS += -eglfs -QT5BASE_DEPENDENCIES += libegl -else -QT5BASE_CONFIGURE_OPTS += -no-eglfs -endif - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_OPENSSL),-openssl,-no-openssl) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_OPENSSL),openssl) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),-fontconfig,-no-fontconfig) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_FONTCONFIG),fontconfig) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_GIF),,-no-gif) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_JPEG),-system-libjpeg,-no-libjpeg) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_JPEG),jpeg) -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_PNG),-system-libpng,-no-libpng) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_PNG),libpng) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_DBUS),-dbus,-no-dbus) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_DBUS),dbus) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),-tslib,-no-tslib) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_TSLIB),tslib) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_LIBGLIB2),-glib,-no-glib) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBGLIB2),libglib2) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_ICU),-icu,-no-icu) -QT5BASE_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5BASE_ICU),icu) - -QT5BASE_CONFIGURE_OPTS += $(if $(BR2_PACKAGE_QT5BASE_EXAMPLES),-make,-nomake) examples - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -# gstreamer 0.10 support is broken in qt5multimedia -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -QT5BASE_CONFIGURE_OPTS += -gstreamer 1.0 -QT5BASE_DEPENDENCIES += gst1-plugins-base -else -QT5BASE_CONFIGURE_OPTS += -no-gstreamer -endif -endif - -ifeq ($(BR2_PACKAGE_LIBINPUT),y) -QT5BASE_CONFIGURE_OPTS += -libinput -QT5BASE_DEPENDENCIES += libinput -else -QT5BASE_CONFIGURE_OPTS += -no-libinput -endif - -# Build the list of libraries to be installed on the target -QT5BASE_INSTALL_LIBS_y += Qt5Core -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XCB) += Qt5XcbQpa -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_NETWORK) += Qt5Network -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_CONCURRENT) += Qt5Concurrent -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_SQL) += Qt5Sql -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_TEST) += Qt5Test -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_XML) += Qt5Xml -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_OPENGL_LIB) += Qt5OpenGL -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglFSDeviceIntegration -else -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_EGLFS) += Qt5EglDeviceIntegration -endif - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_GUI) += Qt5Gui -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_WIDGETS) += Qt5Widgets -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_PRINTSUPPORT) += Qt5PrintSupport - -QT5BASE_INSTALL_LIBS_$(BR2_PACKAGE_QT5BASE_DBUS) += Qt5DBus - -ifneq ($(QT5BASE_CONFIG_FILE),) -define QT5BASE_CONFIGURE_CONFIG_FILE - cp $(QT5BASE_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h -endef -endif - -define QT5BASE_CONFIGURE_CMDS - $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qmake.conf \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qmake.conf - $(INSTALL) -m 0644 -D $(QT5BASE_PKGDIR)/qplatformdefs.h \ - $(@D)/mkspecs/devices/linux-buildroot-g++/qplatformdefs.h - $(QT5BASE_CONFIGURE_CONFIG_FILE) - (cd $(@D); \ - $(TARGET_MAKE_ENV) \ - PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \ - PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" \ - ./configure \ - -v \ - -prefix /usr \ - -hostprefix $(HOST_DIR)/usr \ - -headerdir /usr/include/qt5 \ - -sysroot $(STAGING_DIR) \ - -plugindir /usr/lib/qt/plugins \ - -examplesdir /usr/lib/qt/examples \ - -no-rpath \ - -nomake tests \ - -device buildroot \ - -device-option CROSS_COMPILE="$(TARGET_CROSS)" \ - -device-option BR_COMPILER_CFLAGS="$(TARGET_CFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - -device-option BR_COMPILER_CXXFLAGS="$(TARGET_CXXFLAGS) $(QT5BASE_EXTRA_CFLAGS)" \ - $(QT5BASE_CONFIGURE_OPTS) \ - ) -endef - -define QT5BASE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5BASE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -define QT5BASE_INSTALL_TARGET_LIBS - for lib in $(QT5BASE_INSTALL_LIBS_y); do \ - cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib || exit 1 ; \ - done -endef - -define QT5BASE_INSTALL_TARGET_PLUGINS - if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \ - fi -endef - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5BASE_INSTALL_TARGET_FONTS - if [ -d $(STAGING_DIR)/usr/lib/fonts/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/fonts ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/fonts/* $(TARGET_DIR)/usr/lib/fonts ; \ - fi -endef -endif - -define QT5BASE_INSTALL_TARGET_EXAMPLES - if [ -d $(STAGING_DIR)/usr/lib/qt/examples/ ] ; then \ - mkdir -p $(TARGET_DIR)/usr/lib/qt/examples ; \ - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/* $(TARGET_DIR)/usr/lib/qt/examples ; \ - fi -endef - -ifeq ($(BR2_STATIC_LIBS),y) -define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_FONTS) - $(QT5BASE_INSTALL_TARGET_EXAMPLES) -endef -else -define QT5BASE_INSTALL_TARGET_CMDS - $(QT5BASE_INSTALL_TARGET_LIBS) - $(QT5BASE_INSTALL_TARGET_PLUGINS) - $(QT5BASE_INSTALL_TARGET_FONTS) - $(QT5BASE_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5canvas3d/Config.in b/package.bak/qt5/qt5canvas3d/Config.in deleted file mode 100644 index 8058a2e25f..0000000000 --- a/package.bak/qt5/qt5canvas3d/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_QT5CANVAS3D - bool "qt5canvas3d" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Canvas 3D module provides a way to make WebGL-like - 3D drawing calls from Qt Quick JavaScript. - - http://doc.qt.io/qt-5/qtcanvas3d-index.html - -comment "qt5canvas3d needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package.bak/qt5/qt5canvas3d/qt5canvas3d.hash b/package.bak/qt5/qt5canvas3d/qt5canvas3d.hash deleted file mode 100644 index 2d84fe45c8..0000000000 --- a/package.bak/qt5/qt5canvas3d/qt5canvas3d.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtcanvas3d-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 d7584d006b03f99692ccabce922e755a6f12bb1ed1fbc99c2b84842b9e0aa0ad qtcanvas3d-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtcanvas3d-opensource-src-5.8.0.tar.xz -sha256 5446f790f526f582df7790e1e1442357f61aac9c23ea9b00d4a791c9d78ccaa3 qtcanvas3d-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5canvas3d/qt5canvas3d.mk b/package.bak/qt5/qt5canvas3d/qt5canvas3d.mk deleted file mode 100644 index 3f605ab031..0000000000 --- a/package.bak/qt5/qt5canvas3d/qt5canvas3d.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# qt5canvas3d -# -################################################################################ - -QT5CANVAS3D_VERSION = $(QT5_VERSION) -QT5CANVAS3D_SITE = $(QT5_SITE) -QT5CANVAS3D_SOURCE = qtcanvas3d-opensource-src-$(QT5CANVAS3D_VERSION).tar.xz -QT5CANVAS3D_DEPENDENCIES = qt5base qt5declarative -QT5CANVAS3D_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5CANVAS3D_LICENSE = GPLv2 or GPLv3 or LGPLv3 -QT5CANVAS3D_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 -else -QT5CANVAS3D_LICENSE = Commercial license -QT5CANVAS3D_REDISTRIBUTE = NO -endif - -define QT5CANVAS3D_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5CANVAS3D_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CANVAS3D_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -define QT5CANVAS3D_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtCanvas3D $(TARGET_DIR)/usr/qml/ -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5connectivity/Config.in b/package.bak/qt5/qt5connectivity/Config.in deleted file mode 100644 index 8903fc9496..0000000000 --- a/package.bak/qt5/qt5connectivity/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_QT5CONNECTIVITY - bool "qt5connectivity" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_CONCURRENT - select BR2_PACKAGE_QT5BASE_DBUS - depends on BR2_PACKAGE_NEARD || BR2_PACKAGE_BLUEZ_UTILS || BR2_PACKAGE_BLUEZ5_UTILS - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Connectivity module provides support for Bluetooth/NFC - peripherials. - - http://doc.qt.io/qt-5/qtbluetooth-index.html - http://doc.qt.io/qt-5/qtnfc-index.html - -comment "qt5connectivity needs neard and/or bluez(5)_utils" - depends on !BR2_PACKAGE_NEARD && !BR2_PACKAGE_BLUEZ_UTILS && \ - !BR2_PACKAGE_BLUEZ5_UTILS diff --git a/package.bak/qt5/qt5connectivity/qt5connectivity.hash b/package.bak/qt5/qt5connectivity/qt5connectivity.hash deleted file mode 100644 index d6b841aa45..0000000000 --- a/package.bak/qt5/qt5connectivity/qt5connectivity.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtconnectivity-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 1b672923e0703d62f605ccec97b454b1a04c1f0db47f54b687d009e84eabedf9 qtconnectivity-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtconnectivity-opensource-src-5.8.0.tar.xz -sha256 7b2d01e9d67f6390a9e64bdae62e81a965b0f0b21137cf1a021e08a28bb227f1 qtconnectivity-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5connectivity/qt5connectivity.mk b/package.bak/qt5/qt5connectivity/qt5connectivity.mk deleted file mode 100644 index f00dcb22f8..0000000000 --- a/package.bak/qt5/qt5connectivity/qt5connectivity.mk +++ /dev/null @@ -1,92 +0,0 @@ -################################################################################ -# -# qt5connectivity -# -################################################################################ - -QT5CONNECTIVITY_VERSION = $(QT5_VERSION) -QT5CONNECTIVITY_SITE = $(QT5_SITE) -QT5CONNECTIVITY_SOURCE = qtconnectivity-opensource-src-$(QT5CONNECTIVITY_VERSION).tar.xz -QT5CONNECTIVITY_DEPENDENCIES = qt5base -QT5CONNECTIVITY_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5CONNECTIVITY_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5CONNECTIVITY_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5CONNECTIVITY_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5CONNECTIVITY_LICENSE := $(QT5CONNECTIVITY_LICENSE), BSD-3c (examples) -endif -else -QT5CONNECTIVITY_LICENSE = Commercial license -QT5CONNECTIVITY_REDISTRIBUTE = NO -endif - -QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_QT5DECLARATIVE),qt5declarative) -QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ_UTILS),bluez_utils) -QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_BLUEZ5_UTILS),bluez5_utils) -QT5CONNECTIVITY_DEPENDENCIES += $(if $(BR2_PACKAGE_NEARD),neard) - -define QT5CONNECTIVITY_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5CONNECTIVITY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5CONNECTIVITY_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtBluetooth $(TARGET_DIR)/usr/qml/ -endef -endif -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtNfc $(TARGET_DIR)/usr/qml/ -endef -endif -endif - -ifneq ($(BR2_PACKAGE_BLUEZ_UTILS)$(BR2_PACKAGE_BLUEZ5_UTILS),) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Bluetooth.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/bin/sdpscanner $(TARGET_DIR)/usr/bin -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/bluetooth $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -ifeq ($(BR2_PACKAGE_NEARD),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Nfc.so.* $(TARGET_DIR)/usr/lib -endef -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/nfc $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif -endif - -define QT5CONNECTIVITY_INSTALL_TARGET_CMDS - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_QMLS) - $(QT5CONNECTIVITY_INSTALL_TARGET_BLUETOOTH_EXAMPLES) - $(QT5CONNECTIVITY_INSTALL_TARGET_NFC_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5declarative/Config.in b/package.bak/qt5/qt5declarative/Config.in deleted file mode 100644 index 853322cab3..0000000000 --- a/package.bak/qt5/qt5declarative/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_QT5DECLARATIVE - bool "qt5declarative" - select BR2_PACKAGE_QT5XMLPATTERNS - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Declarative module provides the Qt QML and Qt Quick - modules for developing UIs with the QML language - - http://doc.qt.io/qt-5/qtqml-index.html - http://doc.qt.io/qt-5/qtquick-index.html - -if BR2_PACKAGE_QT5DECLARATIVE - -comment "quick module needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - -config BR2_PACKAGE_QT5DECLARATIVE_QUICK - bool "quick module" - select BR2_PACKAGE_QT5BASE_OPENGL - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - -endif diff --git a/package.bak/qt5/qt5declarative/qt5declarative.hash b/package.bak/qt5/qt5declarative/qt5declarative.hash deleted file mode 100644 index 98a46f1fed..0000000000 --- a/package.bak/qt5/qt5declarative/qt5declarative.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtdeclarative-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 0086a986bc36b398ba518c404d08cdff0a0d7978c30aa3fa2ab73d71654209da qtdeclarative-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtdeclarative-opensource-src-5.8.0.tar.xz -sha256 32941eb9ad12d8735dfc64de8b50b5ab830a6d8705a421c57369de7cb5708a46 qtdeclarative-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5declarative/qt5declarative.mk b/package.bak/qt5/qt5declarative/qt5declarative.mk deleted file mode 100644 index fb546bd73b..0000000000 --- a/package.bak/qt5/qt5declarative/qt5declarative.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# qt5declarative -# -################################################################################ - -QT5DECLARATIVE_VERSION = $(QT5_VERSION) -QT5DECLARATIVE_SITE = $(QT5_SITE) -QT5DECLARATIVE_SOURCE = qtdeclarative-opensource-src-$(QT5DECLARATIVE_VERSION).tar.xz -QT5DECLARATIVE_DEPENDENCIES = qt5base qt5xmlpatterns -QT5DECLARATIVE_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5DECLARATIVE_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5DECLARATIVE_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5DECLARATIVE_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5DECLARATIVE_LICENSE = Commercial license -QT5DECLARATIVE_REDISTRIBUTE = NO -endif - -define QT5DECLARATIVE_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5DECLARATIVE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - sub-src-all sub-tools-all -endef - -define QT5DECLARATIVE_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - sub-src-install_subtargets \ - sub-tools-install_subtargets - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Quick*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5DECLARATIVE_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Qml*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/qml* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5DECLARATIVE_INSTALL_TARGET_QUICK_LIBS) -endef - -endif - -define QT5DECLARATIVE_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/bin/qml* $(TARGET_DIR)/usr/bin - cp -dpfr $(STAGING_DIR)/usr/qml $(TARGET_DIR)/usr - $(QT5DECLARATIVE_INSTALL_TARGET_LIBS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5enginio/Config.in b/package.bak/qt5/qt5enginio/Config.in deleted file mode 100644 index 102058e7c5..0000000000 --- a/package.bak/qt5/qt5enginio/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_QT5ENGINIO - bool "qt5enginio" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_NETWORK - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Enginio is a Backend-as-a-Service solution for simplifying - backend development of connected and data-driven applications. - - This package has been tagged as deprecated since version - 5.6 and not recommended for new design. - - http://doc.qt.io/archives/qt-5.5/enginio-index.html diff --git a/package.bak/qt5/qt5enginio/qt5enginio.hash b/package.bak/qt5/qt5enginio/qt5enginio.hash deleted file mode 100644 index 995183484c..0000000000 --- a/package.bak/qt5/qt5enginio/qt5enginio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtenginio-opensource-src-1.6.2.tar.xz.mirrorlist -sha256 90ffc38d214a75ab0ef90a4760843f12bc073ae49c17de24c677d1d403bddcc3 qtenginio-opensource-src-1.6.2.tar.xz diff --git a/package.bak/qt5/qt5enginio/qt5enginio.mk b/package.bak/qt5/qt5enginio/qt5enginio.mk deleted file mode 100644 index dad7889767..0000000000 --- a/package.bak/qt5/qt5enginio/qt5enginio.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# qt5enginio -# -################################################################################ - -# Qt5Enginio does not follow Qt versionning -# see https://bugreports.qt.io/browse/QTBUG-50111 -QT5ENGINIO_VERSION = 1.6.2 -QT5ENGINIO_SITE = $(QT5_SITE) -QT5ENGINIO_SOURCE = qtenginio-opensource-src-$(QT5ENGINIO_VERSION).tar.xz -QT5ENGINIO_DEPENDENCIES = openssl qt5base -QT5ENGINIO_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5ENGINIO_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5ENGINIO_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5ENGINIO_LICENSE := $(QT5ENGINIO_LICENSE), BSD-3c (examples) -endif -else -QT5ENGINIO_LICENSE = Commercial license -QT5ENGINIO_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5ENGINIO_DEPENDENCIES += qt5declarative -endif - -define QT5ENGINIO_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5ENGINIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5ENGINIO_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5ENGINIO_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Enginio $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5ENGINIO_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/enginio $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5ENGINIO_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libEnginio.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5ENGINIO_INSTALL_TARGET_CMDS - $(QT5ENGINIO_INSTALL_TARGET_LIBS) - $(QT5ENGINIO_INSTALL_TARGET_QMLS) - $(QT5ENGINIO_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5graphicaleffects/Config.in b/package.bak/qt5/qt5graphicaleffects/Config.in deleted file mode 100644 index df23425975..0000000000 --- a/package.bak/qt5/qt5graphicaleffects/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_QT5GRAPHICALEFFECTS - bool "qt5graphicaleffects" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Graphical Effects module provides a set of QML types - for adding visually impressive and configurable effects to - user interfaces. - - http://doc.qt.io/qt-5/qtgraphicaleffects-index.html - -comment "qt5graphicaleffects needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.hash b/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.hash deleted file mode 100644 index ac4167be9e..0000000000 --- a/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtgraphicaleffects-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 1e9f0fac2c72a812d396db74b2d9d12f513d2ec9135d5982ca85aee7f00be75e qtgraphicaleffects-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtgraphicaleffects-opensource-src-5.8.0.tar.xz -sha256 5f2a9b50530ac83d7c2b2ce73fbdf03ac61f83a9521e9d4b796fa17a969dd919 qtgraphicaleffects-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.mk b/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.mk deleted file mode 100644 index aef69eb419..0000000000 --- a/package.bak/qt5/qt5graphicaleffects/qt5graphicaleffects.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# qt5graphicaleffects -# -################################################################################ - -QT5GRAPHICALEFFECTS_VERSION = $(QT5_VERSION) -QT5GRAPHICALEFFECTS_SITE = $(QT5_SITE) -QT5GRAPHICALEFFECTS_SOURCE = qtgraphicaleffects-opensource-src-$(QT5GRAPHICALEFFECTS_VERSION).tar.xz -QT5GRAPHICALEFFECTS_DEPENDENCIES = qt5base qt5declarative -QT5GRAPHICALEFFECTS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5GRAPHICALEFFECTS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5GRAPHICALEFFECTS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5GRAPHICALEFFECTS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5GRAPHICALEFFECTS_LICENSE = Commercial license -QT5GRAPHICALEFFECTS_REDISTRIBUTE = NO -endif - -define QT5GRAPHICALEFFECTS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5GRAPHICALEFFECTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5GRAPHICALEFFECTS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -define QT5GRAPHICALEFFECTS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtGraphicalEffects $(TARGET_DIR)/usr/qml -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5imageformats/Config.in b/package.bak/qt5/qt5imageformats/Config.in deleted file mode 100644 index 44c85c9b38..0000000000 --- a/package.bak/qt5/qt5imageformats/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_QT5IMAGEFORMATS - bool "qt5imageformats" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Image Formats module provides plugins for - additional image formats: TIFF, MNG, TGA, WBMP - - http://doc.qt.io/qt-5/qtimageformats-index.html diff --git a/package.bak/qt5/qt5imageformats/qt5imageformats.hash b/package.bak/qt5/qt5imageformats/qt5imageformats.hash deleted file mode 100644 index 0a635233f2..0000000000 --- a/package.bak/qt5/qt5imageformats/qt5imageformats.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtimageformats-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 4fb153be62dac393cbcebab65040b3b9d6edecd1ebbe5e543401b0e45bd147e4 qtimageformats-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtimageformats-opensource-src-5.8.0.tar.xz -sha256 75045eeac11c96194260badbdb4d3e9eb7b7f9972d18d3491230ea820be4606f qtimageformats-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5imageformats/qt5imageformats.mk b/package.bak/qt5/qt5imageformats/qt5imageformats.mk deleted file mode 100644 index d7649255f1..0000000000 --- a/package.bak/qt5/qt5imageformats/qt5imageformats.mk +++ /dev/null @@ -1,44 +0,0 @@ -################################################################################ -# -# qt5imageformats -# -################################################################################ - -QT5IMAGEFORMATS_VERSION = $(QT5_VERSION) -QT5IMAGEFORMATS_SITE = $(QT5_SITE) -QT5IMAGEFORMATS_SOURCE = qtimageformats-opensource-src-$(QT5IMAGEFORMATS_VERSION).tar.xz -QT5IMAGEFORMATS_DEPENDENCIES = qt5base -QT5IMAGEFORMATS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5IMAGEFORMATS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5IMAGEFORMATS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5IMAGEFORMATS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5IMAGEFORMATS_LICENSE = Commercial license -QT5IMAGEFORMATS_REDISTRIBUTE = NO -endif - -define QT5IMAGEFORMATS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5IMAGEFORMATS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5IMAGEFORMATS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5IMAGEFORMATS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/*.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5location/Config.in b/package.bak/qt5/qt5location/Config.in deleted file mode 100644 index e1778182a0..0000000000 --- a/package.bak/qt5/qt5location/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_QT5LOCATION - bool "qt5location" - select BR2_PACKAGE_QT5BASE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Location API helps you create viable mapping - solutions using the data available from some of the - popular location services. - - http://doc.qt.io/qt-5/qtlocation-index.html diff --git a/package.bak/qt5/qt5location/qt5location.hash b/package.bak/qt5/qt5location/qt5location.hash deleted file mode 100644 index 6afc918ea8..0000000000 --- a/package.bak/qt5/qt5location/qt5location.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtlocation-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 7a8995206ed0220f943a33c037527a1a8243d5386f5ca77bf88152675c28d23a qtlocation-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtlocation-opensource-src-5.8.0.tar.xz -sha256 48a1e39ed989f0133aeacaa379e9c3958ec9b08c043626bba503619891d21abb qtlocation-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5location/qt5location.mk b/package.bak/qt5/qt5location/qt5location.mk deleted file mode 100644 index dbdc64573d..0000000000 --- a/package.bak/qt5/qt5location/qt5location.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# qt5location -# -################################################################################ - -QT5LOCATION_VERSION = $(QT5_VERSION) -QT5LOCATION_SITE = $(QT5_SITE) -QT5LOCATION_SOURCE = qtlocation-opensource-src-$(QT5LOCATION_VERSION).tar.xz -QT5LOCATION_DEPENDENCIES = qt5base -QT5LOCATION_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5LOCATION_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5LOCATION_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5LOCATION_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5LOCATION_LICENSE = Commercial license -QT5LOCATION_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5LOCATION_DEPENDENCIES += qt5declarative -endif - -define QT5LOCATION_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5LOCATION_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5LOCATION_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5LOCATION_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtPositioning $(TARGET_DIR)/usr/qml/ - cp -dpfr $(STAGING_DIR)/usr/qml/QtLocation $(TARGET_DIR)/usr/qml/ -endef -define QT5LOCATION_INSTALL_TARGET_LOCATION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Location.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/geoservices $(TARGET_DIR)/usr/lib/qt/plugins/ -endef -endif - -define QT5LOCATION_INSTALL_TARGET_POSITION - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Positioning.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/position $(TARGET_DIR)/usr/lib/qt/plugins/ -endef - -define QT5LOCATION_INSTALL_TARGET_CMDS - $(QT5LOCATION_INSTALL_TARGET_POSITION) - $(QT5LOCATION_INSTALL_TARGET_LOCATION) - $(QT5LOCATION_INSTALL_TARGET_QMLS) -endef - - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5multimedia/Config.in b/package.bak/qt5/qt5multimedia/Config.in deleted file mode 100644 index 5b14ac57f1..0000000000 --- a/package.bak/qt5/qt5multimedia/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_QT5MULTIMEDIA - bool "qt5multimedia" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_NETWORK - select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5BASE_OPENGL - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Multimedia module provides a rich feature set that - enables you to easily take advantage of a platform's multimedia - capabilities such as media playback and the use of camera and - radio devices. - - http://doc.qt.io/qt-5/multimediaoverview.html diff --git a/package.bak/qt5/qt5multimedia/qt5multimedia.hash b/package.bak/qt5/qt5multimedia/qt5multimedia.hash deleted file mode 100644 index ffd8a77912..0000000000 --- a/package.bak/qt5/qt5multimedia/qt5multimedia.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtmultimedia-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 cb9a70a7c6c0eb5be4a3fcaf9590863479e95a255308bbf07d5b7aa303bb8caf qtmultimedia-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtmultimedia-opensource-src-5.8.0.tar.xz -sha256 a8bc044834f95208261915feefe5e2fdb6761b76f0f99e21062963bd9f9d4a07 qtmultimedia-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5multimedia/qt5multimedia.mk b/package.bak/qt5/qt5multimedia/qt5multimedia.mk deleted file mode 100644 index fccdd5d64b..0000000000 --- a/package.bak/qt5/qt5multimedia/qt5multimedia.mk +++ /dev/null @@ -1,79 +0,0 @@ -################################################################################ -# -# qt5multimedia -# -################################################################################ - -QT5MULTIMEDIA_VERSION = $(QT5_VERSION) -QT5MULTIMEDIA_SITE = $(QT5_SITE) -QT5MULTIMEDIA_SOURCE = qtmultimedia-opensource-src-$(QT5MULTIMEDIA_VERSION).tar.xz -QT5MULTIMEDIA_DEPENDENCIES = qt5base -QT5MULTIMEDIA_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5MULTIMEDIA_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5MULTIMEDIA_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5MULTIMEDIA_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5MULTIMEDIA_LICENSE = Commercial license -QT5MULTIMEDIA_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -QT5MULTIMEDIA_DEPENDENCIES += gst1-plugins-base -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5MULTIMEDIA_DEPENDENCIES += qt5declarative -endif - -define QT5MULTIMEDIA_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5MULTIMEDIA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5MULTIMEDIA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -define QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB - cp -dpf $(STAGING_DIR)/usr/lib/libqgsttools*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5MULTIMEDIA_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Multimedia*.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins - $(QT5MULTIMEDIA_INSTALL_TARGET_QGSTTOOLS_LIB) -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5MULTIMEDIA_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtMultimedia $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/multimedia* $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5MULTIMEDIA_INSTALL_TARGET_CMDS - $(QT5MULTIMEDIA_INSTALL_TARGET_LIBS) - $(QT5MULTIMEDIA_INSTALL_TARGET_QMLS) - $(QT5MULTIMEDIA_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5quickcontrols/Config.in b/package.bak/qt5/qt5quickcontrols/Config.in deleted file mode 100644 index 3ab6ded403..0000000000 --- a/package.bak/qt5/qt5quickcontrols/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_QT5QUICKCONTROLS - bool "qt5quickcontrols" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Quick Controls module provides a set of controls - that can be used to build complete interfaces in Qt Quick. - - http://doc.qt.io/qt-5/qtquickcontrols-index.html - -comment "qt5quickcontrols needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.hash b/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.hash deleted file mode 100644 index 95657d2588..0000000000 --- a/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 5ed0f2292be10222dfb1b57a05472798fd759279f65455d91c02ef4fb746102c qtquickcontrols-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols-opensource-src-5.8.0.tar.xz -sha256 04e70d0ccfd9ba882691a5e8f81e3428ae1b72a76bb9f43ba242f1c33bd7b326 qtquickcontrols-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.mk b/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.mk deleted file mode 100644 index 43254ba06b..0000000000 --- a/package.bak/qt5/qt5quickcontrols/qt5quickcontrols.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# qt5quickcontrols -# -################################################################################ - -QT5QUICKCONTROLS_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS_SITE = $(QT5_SITE) -QT5QUICKCONTROLS_SOURCE = qtquickcontrols-opensource-src-$(QT5QUICKCONTROLS_VERSION).tar.xz -QT5QUICKCONTROLS_DEPENDENCIES = qt5base qt5declarative -QT5QUICKCONTROLS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5QUICKCONTROLS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs) -QT5QUICKCONTROLS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5QUICKCONTROLS_LICENSE = Commercial license -QT5QUICKCONTROLS_REDISTRIBUTE = NO -endif - -define QT5QUICKCONTROLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5QUICKCONTROLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK)$(BR2_PACKAGE_QT5BASE_WIDGETS),yy) -define QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/PrivateWidgets $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y) -define QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Layouts $(TARGET_DIR)/usr/qml/QtQuick -endef -endif - -define QT5QUICKCONTROLS_INSTALL_TARGET_CMDS - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Dialogs $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Extras $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS_INSTALL_TARGET_PRIVATEWIDGETS) - $(QT5QUICKCONTROLS_INSTALL_TARGET_LAYOUTS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5quickcontrols2/Config.in b/package.bak/qt5/qt5quickcontrols2/Config.in deleted file mode 100644 index adf89d0de7..0000000000 --- a/package.bak/qt5/qt5quickcontrols2/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_QT5QUICKCONTROLS2 - bool "qt5quickcontrols2" - select BR2_PACKAGE_QT5DECLARATIVE - select BR2_PACKAGE_QT5DECLARATIVE_QUICK - depends on BR2_PACKAGE_QT5_GL_AVAILABLE # qt5declarative/quick - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE # qt5declarative/quick - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package corresponds to the qt5quickcontrols2 module. - - This module was in tech preview in Qt 5.6, and promoted - to a core module in Qt 5.7.0. - - https://doc.qt.io/qt-5/qtquickcontrols2-index.html - -comment "qt5quickcontrols2 needs an OpenGL-capable backend" - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE diff --git a/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.hash b/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.hash deleted file mode 100644 index 80a3103b95..0000000000 --- a/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtquickcontrols2-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 09dc1710aa4701aebe145829eb99bab94d0870cf578f7dddcec0af92286dfec1 qtquickcontrols2-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtquickcontrols2-opensource-src-5.8.0.tar.xz -sha256 b099866ec74f13cf0047274c61f0486d1eba27716fa07b69f682c54d3a4ade1b qtquickcontrols2-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.mk b/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.mk deleted file mode 100644 index f6aca2cd46..0000000000 --- a/package.bak/qt5/qt5quickcontrols2/qt5quickcontrols2.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# qt5quickcontrols2 -# -################################################################################ - -QT5QUICKCONTROLS2_VERSION = $(QT5_VERSION) -QT5QUICKCONTROLS2_SITE = $(QT5_SITE) -QT5QUICKCONTROLS2_SOURCE = qtquickcontrols2-opensource-src-$(QT5QUICKCONTROLS2_VERSION).tar.xz -QT5QUICKCONTROLS2_DEPENDENCIES = qt5base qt5declarative -QT5QUICKCONTROLS2_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5QUICKCONTROLS2_LICENSE = GPLv3 or LGPLv3, GFDLv1.3 (docs) -QT5QUICKCONTROLS2_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5QUICKCONTROLS2_LICENSE = Commercial license -QT5QUICKCONTROLS2_REDISTRIBUTE = NO -endif - -define QT5QUICKCONTROLS2_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5QUICKCONTROLS2_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5QUICKCONTROLS2_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/quickcontrols2 $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickTemplates2.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/libQt5QuickControls2.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/platform $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Controls.2 $(TARGET_DIR)/usr/qml/QtQuick - cp -dpfr $(STAGING_DIR)/usr/qml/QtQuick/Templates.2 $(TARGET_DIR)/usr/qml/QtQuick - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -else -define QT5QUICKCONTROLS2_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5LabsTemplates.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/controls $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/calendar $(TARGET_DIR)/usr/qml/Qt/labs - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/labs/templates $(TARGET_DIR)/usr/qml/Qt/labs - $(QT5QUICKCONTROLS2_INSTALL_TARGET_EXAMPLES) -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5script/Config.in b/package.bak/qt5/qt5script/Config.in deleted file mode 100644 index ad19727ac2..0000000000 --- a/package.bak/qt5/qt5script/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_QT5SCRIPT - bool "qt5script" - select BR2_PACKAGE_QT5BASE - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Script provides support for making Qt applications - scriptable. Provided for Qt 4.x compatibility. - - This package has been tagged as deprecated since version - 5.5.0 and should be replaced by Qt QML module in new - design. - - http://doc.qt.io/qt-5/qtscript-index.html diff --git a/package.bak/qt5/qt5script/qt5script.hash b/package.bak/qt5/qt5script/qt5script.hash deleted file mode 100644 index 6e369d8e0c..0000000000 --- a/package.bak/qt5/qt5script/qt5script.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtscript-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 e06ef6b271cae2187b57cd4ffdd6759428fd47f94a060e2ed2af024a8c14110e qtscript-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtscript-opensource-src-5.8.0.tar.xz -sha256 293ab91d2d189d889dc80609aa259190fb7de636d360e904784a5ce1a45e5ad3 qtscript-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5script/qt5script.mk b/package.bak/qt5/qt5script/qt5script.mk deleted file mode 100644 index 57ba6f0072..0000000000 --- a/package.bak/qt5/qt5script/qt5script.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# qt5script -# -################################################################################ - -QT5SCRIPT_VERSION = $(QT5_VERSION) -QT5SCRIPT_SITE = $(QT5_SITE) -QT5SCRIPT_SOURCE = qtscript-opensource-src-$(QT5SCRIPT_VERSION).tar.xz -QT5SCRIPT_DEPENDENCIES = qt5base -QT5SCRIPT_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5SCRIPT_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5SCRIPT_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -else -QT5SCRIPT_LICENSE = Commercial license -QT5SCRIPT_REDISTRIBUTE = NO -endif - -define QT5SCRIPT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5SCRIPT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SCRIPT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SCRIPT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Script*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5sensors/Config.in b/package.bak/qt5/qt5sensors/Config.in deleted file mode 100644 index 4846a3f95f..0000000000 --- a/package.bak/qt5/qt5sensors/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_QT5SENSORS - bool "qt5sensors" - select BR2_PACKAGE_QT5BASE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt Sensors API provides access to sensor hardware - via QML and C++ interfaces. - - http://doc.qt.io/qt-5/qtsensors-index.html diff --git a/package.bak/qt5/qt5sensors/qt5sensors.hash b/package.bak/qt5/qt5sensors/qt5sensors.hash deleted file mode 100644 index 307ad6fbd7..0000000000 --- a/package.bak/qt5/qt5sensors/qt5sensors.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsensors-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 a7809081aab4f2f0d7a4f40c3abb02e1690bb390d1dd410d7c6c5019a5053427 qtsensors-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsensors-opensource-src-5.8.0.tar.xz -sha256 3a5d0639ecf8cd30c8ca349c353a8f3c424889b53831e70b6d8c481fc45de796 qtsensors-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5sensors/qt5sensors.mk b/package.bak/qt5/qt5sensors/qt5sensors.mk deleted file mode 100644 index fb9ef32e64..0000000000 --- a/package.bak/qt5/qt5sensors/qt5sensors.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# qt5sensors -# -################################################################################ - -QT5SENSORS_VERSION = $(QT5_VERSION) -QT5SENSORS_SITE = $(QT5_SITE) -QT5SENSORS_SOURCE = qtsensors-opensource-src-$(QT5SENSORS_VERSION).tar.xz -QT5SENSORS_DEPENDENCIES = qt5base -QT5SENSORS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5SENSORS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5SENSORS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5SENSORS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5SENSORS_LICENSE = Commercial license -QT5SENSORS_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5SENSORS_DEPENDENCIES += qt5declarative -endif - -define QT5SENSORS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5SENSORS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SENSORS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SENSORS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Sensors.so.* $(TARGET_DIR)/usr/lib - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/sensor* $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5SENSORS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtSensors $(TARGET_DIR)/usr/qml -endef -endif - -define QT5SENSORS_INSTALL_TARGET_CMDS - $(QT5SENSORS_INSTALL_TARGET_LIBS) - $(QT5SENSORS_INSTALL_TARGET_QMLS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5serialbus/Config.in b/package.bak/qt5/qt5serialbus/Config.in deleted file mode 100644 index 2882d50644..0000000000 --- a/package.bak/qt5/qt5serialbus/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_QT5SERIALBUS - bool "qt5serialbus" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 # CAN FD - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5SERIALPORT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - This package corresponds to the qt5serialbus module. - - This module was in tech preview in Qt 5.6, and promoted - to a core module in Qt 5.8.0. - - http://doc.qt.io/qt-5/qtserialbus-index.html - -comment "qt5serialbus needs headers >= 3.6" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6 diff --git a/package.bak/qt5/qt5serialbus/qt5serialbus.hash b/package.bak/qt5/qt5serialbus/qt5serialbus.hash deleted file mode 100644 index f15945c736..0000000000 --- a/package.bak/qt5/qt5serialbus/qt5serialbus.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialbus-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 b39260091691532382935ed51de9ead8e66cfb5f7a6e5410c17cd0695ccaf826 qtserialbus-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialbus-opensource-src-5.8.0.tar.xz -sha256 58343dd9f2e339d4900a2d4b54ee25ed959cf62bacb012fe61e6b99d7958c10a qtserialbus-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5serialbus/qt5serialbus.mk b/package.bak/qt5/qt5serialbus/qt5serialbus.mk deleted file mode 100644 index b188f5d85d..0000000000 --- a/package.bak/qt5/qt5serialbus/qt5serialbus.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# qt5serialbus -# -################################################################################ - -QT5SERIALBUS_VERSION = $(QT5_VERSION) -QT5SERIALBUS_SITE = $(QT5_SITE) -QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz -QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport -QT5SERIALBUS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs) -QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5SERIALBUS_LICENSE = Commercial license -QT5SERIALBUS_REDISTRIBUTE = NO -endif - -define QT5SERIALBUS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5SERIALBUS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALBUS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALBUS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \ - $(TARGET_DIR)/usr/lib - mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \ - $(TARGET_DIR)/usr/lib/qt/plugins/canbus -endef -endif - -define QT5SERIALBUS_INSTALL_TARGET_CMDS - $(QT5SERIALBUS_INSTALL_TARGET_LIBS) - $(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \ - $(TARGET_DIR)/usr/bin/canbusutil -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5serialport/Config.in b/package.bak/qt5/qt5serialport/Config.in deleted file mode 100644 index 3538c52556..0000000000 --- a/package.bak/qt5/qt5serialport/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_QT5SERIALPORT - bool "qt5serialport" - select BR2_PACKAGE_QT5BASE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Serial Port provides the basic functionality, which - includes configuring, I/O operations, getting and setting - the control signals of the RS-232 pinouts. - - http://doc.qt.io/qt-5/qtserialport-index.html diff --git a/package.bak/qt5/qt5serialport/qt5serialport.hash b/package.bak/qt5/qt5serialport/qt5serialport.hash deleted file mode 100644 index 18c590b642..0000000000 --- a/package.bak/qt5/qt5serialport/qt5serialport.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtserialport-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 af76281bad2c2bd283189635316b46091f6712134b845ae1b9e3016eec94f376 qtserialport-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtserialport-opensource-src-5.8.0.tar.xz -sha256 52317fded73ad0beb0a2ecf93124a8e2dfdcf14270a762c1f4fd06fb075506ad qtserialport-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5serialport/qt5serialport.mk b/package.bak/qt5/qt5serialport/qt5serialport.mk deleted file mode 100644 index 4fbca9ea1b..0000000000 --- a/package.bak/qt5/qt5serialport/qt5serialport.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# qt5serialport -# -################################################################################ - -QT5SERIALPORT_VERSION = $(QT5_VERSION) -QT5SERIALPORT_SITE = $(QT5_SITE) -QT5SERIALPORT_SOURCE = qtserialport-opensource-src-$(QT5SERIALPORT_VERSION).tar.xz -QT5SERIALPORT_DEPENDENCIES = qt5base -QT5SERIALPORT_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5SERIALPORT_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5SERIALPORT_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5SERIALPORT_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5SERIALPORT_LICENSE = Commercial license -QT5SERIALPORT_REDISTRIBUTE = NO -endif - -define QT5SERIALPORT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5SERIALPORT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SERIALPORT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SERIALPORT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialPort.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5svg/Config.in b/package.bak/qt5/qt5svg/Config.in deleted file mode 100644 index bc80b62674..0000000000 --- a/package.bak/qt5/qt5svg/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_QT5SVG - bool "qt5svg" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_GUI - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt SVG provides classes for rendering and displaying SVG - drawings in widgets and on other paint devices. - - http://doc.qt.io/qt-5/qtsvg-index.html diff --git a/package.bak/qt5/qt5svg/qt5svg.hash b/package.bak/qt5/qt5svg/qt5svg.hash deleted file mode 100644 index 6855e85cbd..0000000000 --- a/package.bak/qt5/qt5svg/qt5svg.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtsvg-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 f7a361bf661b31ae7779513559dd0b774171911bc57f5cfb6bed6878ddc8bc4e qtsvg-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtsvg-opensource-src-5.8.0.tar.xz -sha256 9873191c211ab4da9c0bc47b1e3549f475db4d448bba3175e0f86b24eefadc89 qtsvg-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5svg/qt5svg.mk b/package.bak/qt5/qt5svg/qt5svg.mk deleted file mode 100644 index 08821e486e..0000000000 --- a/package.bak/qt5/qt5svg/qt5svg.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# qt5svg -# -################################################################################ - -QT5SVG_VERSION = $(QT5_VERSION) -QT5SVG_SITE = $(QT5_SITE) -QT5SVG_SOURCE = qtsvg-opensource-src-$(QT5SVG_VERSION).tar.xz -QT5SVG_DEPENDENCIES = qt5base -QT5SVG_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5SVG_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5SVG_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5SVG_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5SVG_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5SVG_LICENSE = Commercial license -QT5SVG_REDISTRIBUTE = NO -endif - -define QT5SVG_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5SVG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5SVG_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5BASE_WIDGETS),y) -define QT5SVG_INSTALL_ICONENGINES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/iconengines $(TARGET_DIR)/usr/lib/qt/plugins -endef -endif - -ifeq ($(BR2_STATIC_LIBS),) -define QT5SVG_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5Svg*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/imageformats/libqsvg.so $(TARGET_DIR)/usr/lib/qt/plugins/imageformats/ - $(QT5SVG_INSTALL_ICONENGINES) -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5tools/Config.in b/package.bak/qt5/qt5tools/Config.in deleted file mode 100644 index 20f00f6b2f..0000000000 --- a/package.bak/qt5/qt5tools/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config BR2_PACKAGE_QT5TOOLS - bool "qt5tools" - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt Tools provides tools facilitate the development - and design of applications. - - http://doc.qt.io/qt-5/qtmodules.html#qt-tools - -if BR2_PACKAGE_QT5TOOLS - -config BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS - bool "Linguist host tools (lconvert, lrelease, lupdate)" - help - This option enables the linguist host tools - lconvert, lrelease and lupdate. - -config BR2_PACKAGE_QT5TOOLS_PIXELTOOL - bool "pixeltool" - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5BASE_PNG # saving png images - help - Compile and install the pixeltool program. - -config BR2_PACKAGE_QT5TOOLS_QTDIAG - bool "qtdiag" - select BR2_PACKAGE_QT5BASE_GUI - help - Compile and install the qtdiag program. - -config BR2_PACKAGE_QT5TOOLS_QTPATHS - bool "qtpaths" - help - Compile and install the qtpaths program. - -config BR2_PACKAGE_QT5TOOLS_QTPLUGININFO - bool "qtplugininfo" - help - Compile and install the qtplugininfo program. - -endif diff --git a/package.bak/qt5/qt5tools/qt5tools.hash b/package.bak/qt5/qt5tools/qt5tools.hash deleted file mode 100644 index 541d95bef1..0000000000 --- a/package.bak/qt5/qt5tools/qt5tools.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qttools-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 db2bb4318786257a47172c377d9c456d5d5ec760d5d69240a4693dc87989e1b7 qttools-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qttools-opensource-src-5.8.0.tar.xz -sha256 95ec8e76d393b6ba26ffff5041fce41946d2bf3aec1402c6533e24d9fc269d83 qttools-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5tools/qt5tools.mk b/package.bak/qt5/qt5tools/qt5tools.mk deleted file mode 100644 index 0395f96bab..0000000000 --- a/package.bak/qt5/qt5tools/qt5tools.mk +++ /dev/null @@ -1,71 +0,0 @@ -################################################################################ -# -# qt5tools -# -################################################################################ - -QT5TOOLS_VERSION = $(QT5_VERSION) -QT5TOOLS_SITE = $(QT5_SITE) -QT5TOOLS_SOURCE = qttools-opensource-src-$(QT5BASE_VERSION).tar.xz - -QT5TOOLS_DEPENDENCIES = qt5base -QT5TOOLS_INSTALL_STAGING = YES - -# linguist tools compile conditionally on qtHaveModule(qmldevtools-private), -# but the condition is used only used to decide if lupdate will support -# parsing qml files (via setting QT_NO_QML define), no linking against -# target qt5 will happen -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5TOOLS_DEPENDENCIES += qt5declarative -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5TOOLS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5TOOLS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL -else -QT5TOOLS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5TOOLS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5TOOLS_LICENSE = Commercial license -QT5TOOLS_REDISTRIBUTE = NO -endif - -QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS) += \ - linguist/lconvert linguist/lrelease linguist/lupdate -ifeq ($(BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS),y) -# use install target to copy cmake module files -define QT5TOOLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/linguist install -endef -endif - -QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool -QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_PIXELTOOL) += pixeltool - -QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag -QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTDIAG) += qtdiag - -QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths -QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPATHS) += qtpaths - -QT5TOOLS_BUILD_DIRS_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo -QT5TOOLS_INSTALL_TARGET_$(BR2_PACKAGE_QT5TOOLS_QTPLUGININFO) += qtplugininfo - -define QT5TOOLS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) sub-src-qmake_all - $(foreach p,$(QT5TOOLS_BUILD_DIRS_y), \ - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src/$(p)$(sep)) -endef - -define QT5TOOLS_INSTALL_TARGET_CMDS - $(foreach p,$(QT5TOOLS_INSTALL_TARGET_y), \ - $(INSTALL) -D -m0755 $(@D)/bin/$(p) $(TARGET_DIR)/usr/bin/$(p)$(sep)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5webchannel/Config.in b/package.bak/qt5/qt5webchannel/Config.in deleted file mode 100644 index e3d840584f..0000000000 --- a/package.bak/qt5/qt5webchannel/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_QT5WEBCHANNEL - bool "qt5webchannel" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5WEBSOCKETS - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt WebChannel enables peer-to-peer communication between - a server (QML/C++ application) and a client - (HTML/JavaScript or QML application). - - http://doc.qt.io/qt-5/qtwebchannel-index.html diff --git a/package.bak/qt5/qt5webchannel/qt5webchannel.hash b/package.bak/qt5/qt5webchannel/qt5webchannel.hash deleted file mode 100644 index 7fd01efbe7..0000000000 --- a/package.bak/qt5/qt5webchannel/qt5webchannel.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebchannel-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 700efdef5f51bdb77093f4db212afe275ad35a710ea08ba0e9e9cbc8f09f1a52 qtwebchannel-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebchannel-opensource-src-5.8.0.tar.xz -sha256 5bf5b15413baa235ee2cbfd136ea3b9303b32879b54f9f25bfb4dc96d37d0b4a qtwebchannel-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5webchannel/qt5webchannel.mk b/package.bak/qt5/qt5webchannel/qt5webchannel.mk deleted file mode 100644 index 9522a745ac..0000000000 --- a/package.bak/qt5/qt5webchannel/qt5webchannel.mk +++ /dev/null @@ -1,76 +0,0 @@ -################################################################################ -# -# qt5webchannel -# -################################################################################ - -QT5WEBCHANNEL_VERSION = $(QT5_VERSION) -QT5WEBCHANNEL_SITE = $(QT5_SITE) -QT5WEBCHANNEL_SOURCE = qtwebchannel-opensource-src-$(QT5WEBCHANNEL_VERSION).tar.xz -QT5WEBCHANNEL_DEPENDENCIES = qt5base qt5websockets -QT5WEBCHANNEL_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5WEBCHANNEL_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5WEBCHANNEL_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5WEBCHANNEL_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5WEBCHANNEL_LICENSE := $(QT5WEBCHANNEL_LICENSE), BSD-3c (examples) -endif -else -QT5WEBCHANNEL_LICENSE = Commercial license -QT5WEBCHANNEL_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBCHANNEL_DEPENDENCIES += qt5declarative -endif - -define QT5WEBCHANNEL_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5WEBCHANNEL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBCHANNEL_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -define QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT - $(INSTALL) -m 0644 -D $(@D)/src/webchannel/qwebchannel.js \ - $(TARGET_DIR)/var/www/qwebchannel.js -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBCHANNEL_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebChannel $(TARGET_DIR)/usr/qml/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/webchannel $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBCHANNEL_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebChannel.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5WEBCHANNEL_INSTALL_TARGET_CMDS - $(QT5WEBCHANNEL_INSTALL_TARGET_LIBS) - $(QT5WEBCHANNEL_INSTALL_TARGET_QMLS) - $(QT5WEBCHANNEL_INSTALL_TARGET_JAVASCRIPT) - $(QT5WEBCHANNEL_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch b/package.bak/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch deleted file mode 100644 index 669c7e6aa2..0000000000 --- a/package.bak/qt5/qt5webkit/0001-qtwebkit-fix-QA-issue-bad-RPATH.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1735a8484ef9ae336f8d607b56bda64c8af10c79 Mon Sep 17 00:00:00 2001 -From: Trevor Woerner -Date: Fri, 7 Feb 2014 04:07:17 +0100 -Subject: [PATCH] qtwebkit: fix QA issue (bad RPATH) - -Building qtwebkit causes a QA issue such that QtWebPluginProcess and -QtWebProcess contain bad RPATHs which point into the build location. This fix -adds a patch to not include the rpath.prf which causes this problem. - -Signed-off-by: Trevor Woerner -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0001-qtwebkit-fix-QA-issue-bad-RPATH.patch - -Signed-off-by: Gary Bisson ---- - Tools/qmake/mkspecs/features/unix/default_post.prf | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Tools/qmake/mkspecs/features/unix/default_post.prf b/Tools/qmake/mkspecs/features/unix/default_post.prf -index fd66af6..ef754c3 100644 ---- a/Tools/qmake/mkspecs/features/unix/default_post.prf -+++ b/Tools/qmake/mkspecs/features/unix/default_post.prf -@@ -61,7 +61,6 @@ linux-*g++* { - } - } - --contains(TEMPLATE, app): CONFIG += rpath - - CONFIG(debug, debug|release)|force_debug_info { - # Make ld not cache the symbol tables of input files in memory to avoid memory exhaustion during the linking phase. --- -2.7.0 - diff --git a/package.bak/qt5/qt5webkit/0002-Remove-TEXTREL-tag-in-x86.patch b/package.bak/qt5/qt5webkit/0002-Remove-TEXTREL-tag-in-x86.patch deleted file mode 100644 index 14352a160c..0000000000 --- a/package.bak/qt5/qt5webkit/0002-Remove-TEXTREL-tag-in-x86.patch +++ /dev/null @@ -1,85 +0,0 @@ -From ae16ce17cc7060274a0b0c165b953fc32540f977 Mon Sep 17 00:00:00 2001 -From: Magnus Granberg -Date: Fri, 27 Feb 2015 11:55:09 +0100 -Subject: [PATCH] Remove TEXTREL tag in x86 - -Fix textrel QA warnings when building qtwebkit for x86: - - WARNING: QA Issue: ELF binary '/home/andre/rdk/rdk-master/build-vbox32/tmp/work/core2-32-rdk-linux/qtwebkit/5.4.0-r0/packages-split/qtwebkit/usr/lib/libQt5WebKit.so.5.4.0' has relocations in .text [textrel] - -Patch from upstream webkit: - - https://bugs.webkit.org/show_bug.cgi?id=70610 - -Minor refresh required to apply cleanly to the older webkit sources used -by qtwebkit. Specifically, the patch needed to be modified to account -for PLATFORM(MAC) -> OS(DARWIN) renaming in recent webkit which is not -part of qtwebkit yet ( https://bugs.webkit.org/show_bug.cgi?id=99683 ). - -Upstream status [webkit] : backport -Upstream status [qtwebkit] : unclear - -Bug: https://bugs.webkit.org/show_bug.cgi?id=70610 -Signed-off-by: Martin Jansa - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0002-Remove-TEXTREL-tag-in-x86.patch - -Signed-off-by: Gary Bisson ---- - Source/JavaScriptCore/jit/ThunkGenerators.cpp | 24 ++++++++++++++++++++++++ - Source/WTF/wtf/InlineASM.h | 2 ++ - 2 files changed, 26 insertions(+) - -diff --git a/Source/JavaScriptCore/jit/ThunkGenerators.cpp b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -index 9684df2..8af82d8 100644 ---- a/Source/JavaScriptCore/jit/ThunkGenerators.cpp -+++ b/Source/JavaScriptCore/jit/ThunkGenerators.cpp -@@ -524,6 +524,30 @@ double jsRound(double d) - } \ - static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; - -+#elif CPU(X86) && COMPILER(GCC) && OS(LINUX) && defined(__PIC__) -+#define defineUnaryDoubleOpWrapper(function) \ -+ asm( \ -+ ".text\n" \ -+ ".globl " SYMBOL_STRING(function##Thunk) "\n" \ -+ HIDE_SYMBOL(function##Thunk) "\n" \ -+ SYMBOL_STRING(function##Thunk) ":" "\n" \ -+ "pushl %ebx\n" \ -+ "subl $20, %esp\n" \ -+ "movsd %xmm0, (%esp) \n" \ -+ "call __x86.get_pc_thunk.bx\n" \ -+ "addl $_GLOBAL_OFFSET_TABLE_, %ebx\n" \ -+ "call " GLOBAL_REFERENCE(function) "\n" \ -+ "fstpl (%esp) \n" \ -+ "movsd (%esp), %xmm0 \n" \ -+ "addl $20, %esp\n" \ -+ "popl %ebx\n" \ -+ "ret\n" \ -+ );\ -+ extern "C" { \ -+ MathThunkCallingConvention function##Thunk(MathThunkCallingConvention); \ -+ } \ -+ static MathThunk UnaryDoubleOpWrapper(function) = &function##Thunk; -+ - #elif CPU(X86) && COMPILER(GCC) && (PLATFORM(MAC) || OS(LINUX)) - #define defineUnaryDoubleOpWrapper(function) \ - asm( \ -diff --git a/Source/WTF/wtf/InlineASM.h b/Source/WTF/wtf/InlineASM.h -index 0a2fe78..2dc40ef 100644 ---- a/Source/WTF/wtf/InlineASM.h -+++ b/Source/WTF/wtf/InlineASM.h -@@ -46,6 +46,8 @@ - #define GLOBAL_REFERENCE(name) #name "@plt" - #elif CPU(X86) && COMPILER(MINGW) - #define GLOBAL_REFERENCE(name) "@" #name "@4" -+#elif OS(LINUX) && CPU(X86) && defined(__PIC__) -+#define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) "@plt" - #else - #define GLOBAL_REFERENCE(name) SYMBOL_STRING(name) - #endif --- -2.7.0 - diff --git a/package.bak/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch b/package.bak/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch deleted file mode 100644 index a2597a54bb..0000000000 --- a/package.bak/qt5/qt5webkit/0003-Exclude-backtrace-API-for-non-glibc-libraries.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 6c36f0ff8c1f5852c33d2b23714f9f187cc6ff26 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 5 Jun 2015 19:55:05 -0700 -Subject: [PATCH] Exclude backtrace() API for non-glibc libraries - -It was excluding musl with current checks, so lets make it such that it -considers only glibc when using backtrace API - -Signed-off-by: Khem Raj - -Downloaded from: -https://github.com/meta-qt5/meta-qt5/blob/krogoth/recipes-qt/qt5/qtwebkit/ -0003-Exclude-backtrace-API-for-non-glibc-libraries.patch - -Signed-off-by: Gary Bisson ---- - Source/WTF/wtf/Assertions.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Source/WTF/wtf/Assertions.cpp b/Source/WTF/wtf/Assertions.cpp -index 1b2091f..ba03a28 100644 ---- a/Source/WTF/wtf/Assertions.cpp -+++ b/Source/WTF/wtf/Assertions.cpp -@@ -61,7 +61,7 @@ - #include - #endif - --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined (__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - #include - #include - #include -@@ -245,7 +245,7 @@ void WTFReportArgumentAssertionFailure(const char* file, int line, const char* f - - void WTFGetBacktrace(void** stack, int* size) - { --#if (OS(DARWIN) || (OS(LINUX) && !defined(__UCLIBC__))) && !OS(ANDROID) -+#if (OS(DARWIN) || (OS(LINUX) && defined(__GLIBC__) && !defined(__UCLIBC__))) && !OS(ANDROID) - *size = backtrace(stack, *size); - #elif OS(WINDOWS) && !OS(WINCE) - // The CaptureStackBackTrace function is available in XP, but it is not defined --- -2.7.0 - diff --git a/package.bak/qt5/qt5webkit/Config.in b/package.bak/qt5/qt5webkit/Config.in deleted file mode 100644 index 2534360459..0000000000 --- a/package.bak/qt5/qt5webkit/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_QT5WEBKIT - bool "qt5webkit" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_ICU - select BR2_PACKAGE_QT5BASE_GUI - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_QT5BASE_XCB - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_BINFMT_FLAT # icu - # assumes a FPU is available on MIPS - depends on !BR2_MIPS_SOFT_FLOAT - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt WebKit module provides the WebView API, which - allows QML applications to render regions of dynamic - web content. - - This package has been removed from the official release packages - since Qt5.6.0, but it is still available for users to build it - from source. This is useful for platforms without GPU since the - successor (QtWebEngine) requires OpenGL support. - - http://doc.qt.io/archives/qt-5.5/qtwebkit-index.html - -comment "qt5webkit needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_BINFMT_FLAT - depends on !BR2_MIPS_SOFT_FLOAT diff --git a/package.bak/qt5/qt5webkit/qt5webkit.hash b/package.bak/qt5/qt5webkit/qt5webkit.hash deleted file mode 100644 index 4431e2d163..0000000000 --- a/package.bak/qt5/qt5webkit/qt5webkit.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/snapshots/qt/5.6/5.6.2/latest_src/submodules/qtwebkit-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 528a6b8b1c5095367b26e8ce4f3a46bb739e2e9913ff4dfc6ef58a04fcd73966 qtwebkit-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebkit-opensource-src-5.8.0.tar.xz -sha256 79ae8660086bf92ffb0008b17566270e6477c8fa0daf9bb3ac29404fb5911bec qtwebkit-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5webkit/qt5webkit.mk b/package.bak/qt5/qt5webkit/qt5webkit.mk deleted file mode 100644 index 980d2aff01..0000000000 --- a/package.bak/qt5/qt5webkit/qt5webkit.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# qt5webkit -# -################################################################################ - -QT5WEBKIT_VERSION = $(QT5_VERSION) -QT5WEBKIT_SITE = $(QT5_SNAPSHOTS_SITE) -QT5WEBKIT_SOURCE = qtwebkit-opensource-src-$(QT5WEBKIT_VERSION).tar.xz -QT5WEBKIT_DEPENDENCIES = \ - host-bison host-flex host-gperf host-python host-ruby \ - qt5base sqlite -QT5WEBKIT_INSTALL_STAGING = YES - -QT5WEBKIT_LICENSE_FILES = Source/WebCore/LICENSE-LGPL-2 Source/WebCore/LICENSE-LGPL-2.1 - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -QT5WEBKIT_LICENSE = LGPLv2.1+, BSD-3c, BSD-2c -# Source files contain references to LGPL_EXCEPTION.txt but it is not included -# in the archive. -QT5WEBKIT_LICENSE_FILES += LICENSE.LGPLv21 -else -QT5WEBKIT_LICENSE = LGPLv2.1+ (WebCore), Commercial license -QT5WEBKIT_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_XCB),y) -QT5WEBKIT_DEPENDENCIES += xlib_libXext xlib_libXrender -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBKIT_DEPENDENCIES += qt5declarative -endif - -# QtWebkit's build system uses python, but only supports python2. We work -# around this by forcing python2 early in the PATH, via a python->python2 -# symlink. -QT5WEBKIT_ENV = PATH=$(@D)/host-bin:$(BR_PATH) -define QT5WEBKIT_PYTHON2_SYMLINK - mkdir -p $(@D)/host-bin - ln -sf $(HOST_DIR)/usr/bin/python2 $(@D)/host-bin/python -endef -QT5WEBKIT_PRE_CONFIGURE_HOOKS += QT5WEBKIT_PYTHON2_SYMLINK - -define QT5WEBKIT_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5WEBKIT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBKIT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(QT5WEBKIT_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBKIT_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/QtWebKit $(TARGET_DIR)/usr/qml/ -endef -endif - -define QT5WEBKIT_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebKit*.so.* $(TARGET_DIR)/usr/lib - cp -dpf $(@D)/bin/* $(TARGET_DIR)/usr/bin/ - $(QT5WEBKIT_INSTALL_TARGET_QMLS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5websockets/Config.in b/package.bak/qt5/qt5websockets/Config.in deleted file mode 100644 index 0cfde91c8b..0000000000 --- a/package.bak/qt5/qt5websockets/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_QT5WEBSOCKETS - bool "qt5websockets" - select BR2_PACKAGE_QT5BASE - select BR2_PACKAGE_QT5BASE_NETWORK - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt WebSockets module provides C++ and QML interfaces - that enable Qt applications to act as a server that can - process WebSocket requests, or a client that can - consume data received from the server, or both. - - http://doc.qt.io/qt-5/qtwebsockets-index.html diff --git a/package.bak/qt5/qt5websockets/qt5websockets.hash b/package.bak/qt5/qt5websockets/qt5websockets.hash deleted file mode 100644 index a91e0842c7..0000000000 --- a/package.bak/qt5/qt5websockets/qt5websockets.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtwebsockets-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 3cd9d4bbff8e6be5e252f00fc9ecb9ac2d8a193020288c7d1e82583daeb5ba35 qtwebsockets-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtwebsockets-opensource-src-5.8.0.tar.xz -sha256 aa110af297d0d3239f346c3ee0cd43621adf463eb62a04941bbfe3fcccb845f5 qtwebsockets-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5websockets/qt5websockets.mk b/package.bak/qt5/qt5websockets/qt5websockets.mk deleted file mode 100644 index 975ea64388..0000000000 --- a/package.bak/qt5/qt5websockets/qt5websockets.mk +++ /dev/null @@ -1,70 +0,0 @@ -################################################################################ -# -# qt5websockets -# -################################################################################ - -QT5WEBSOCKETS_VERSION = $(QT5_VERSION) -QT5WEBSOCKETS_SITE = $(QT5_SITE) -QT5WEBSOCKETS_SOURCE = qtwebsockets-opensource-src-$(QT5WEBSOCKETS_VERSION).tar.xz -QT5WEBSOCKETS_DEPENDENCIES = qt5base -QT5WEBSOCKETS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5WEBSOCKETS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools) -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 -else -QT5WEBSOCKETS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3 -QT5WEBSOCKETS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5WEBSOCKETS_LICENSE := $(QT5WEBSOCKETS_LICENSE), BSD-3c (examples) -endif -else -QT5WEBSOCKETS_LICENSE = Commercial license -QT5WEBSOCKETS_REDISTRIBUTE = NO -endif - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE),y) -QT5WEBSOCKETS_DEPENDENCIES += qt5declarative -endif - -define QT5WEBSOCKETS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5WEBSOCKETS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5WEBSOCKETS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_PACKAGE_QT5DECLARATIVE_QUICK),y) -define QT5WEBSOCKETS_INSTALL_TARGET_QMLS - cp -dpfr $(STAGING_DIR)/usr/qml/Qt/WebSockets $(TARGET_DIR)/usr/qml/Qt/ -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/websockets $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -ifneq ($(BR2_STATIC_LIBS),y) -define QT5WEBSOCKETS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5WebSockets.so.* $(TARGET_DIR)/usr/lib -endef -endif - -define QT5WEBSOCKETS_INSTALL_TARGET_CMDS - $(QT5WEBSOCKETS_INSTALL_TARGET_LIBS) - $(QT5WEBSOCKETS_INSTALL_TARGET_QMLS) - $(QT5WEBSOCKETS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5x11extras/Config.in b/package.bak/qt5/qt5x11extras/Config.in deleted file mode 100644 index 9c514cdd03..0000000000 --- a/package.bak/qt5/qt5x11extras/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_QT5X11EXTRAS - bool "qt5x11extras" - select BR2_PACKAGE_QT5BASE_WIDGETS - depends on BR2_PACKAGE_QT5BASE_XCB - help - Qt is a cross-platform application and UI framework for - developers using C++. - - Qt X11 Extras enables the Qt programmer to write - applications for the Linux/X11 platform. - - http://doc.qt.io/qt-5/qtx11extras-index.html diff --git a/package.bak/qt5/qt5x11extras/qt5x11extras.hash b/package.bak/qt5/qt5x11extras/qt5x11extras.hash deleted file mode 100644 index eb0dc6c254..0000000000 --- a/package.bak/qt5/qt5x11extras/qt5x11extras.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtx11extras-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 71ffde1cfaeec310677b69ecd16cb5992e8885cf3e73b4cec7d6e7a115b40ced qtx11extras-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtx11extras-opensource-src-5.8.0.tar.xz -sha256 bed7f2b5123a9849ec94afa67db5f296e6f527c6330f47a680c83586d3a4280e qtx11extras-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5x11extras/qt5x11extras.mk b/package.bak/qt5/qt5x11extras/qt5x11extras.mk deleted file mode 100644 index 996056b719..0000000000 --- a/package.bak/qt5/qt5x11extras/qt5x11extras.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# qt5x11extras -# -################################################################################ - -QT5X11EXTRAS_VERSION = $(QT5_VERSION) -QT5X11EXTRAS_SITE = $(QT5_SITE) -QT5X11EXTRAS_SOURCE = qtx11extras-opensource-src-$(QT5X11EXTRAS_VERSION).tar.xz -QT5X11EXTRAS_DEPENDENCIES = qt5base -QT5X11EXTRAS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5X11EXTRAS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5X11EXTRAS_LICENSE = GPLv2 or GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5X11EXTRAS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -else -QT5X11EXTRAS_LICENSE = Commercial license -QT5X11EXTRAS_REDISTRIBUTE = NO -endif - -define QT5X11EXTRAS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5X11EXTRAS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5X11EXTRAS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5X11EXTRAS_INSTALL_TARGET_CMDS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5X11Extras.so.* $(TARGET_DIR)/usr/lib -endef -endif - -$(eval $(generic-package)) diff --git a/package.bak/qt5/qt5xmlpatterns/Config.in b/package.bak/qt5/qt5xmlpatterns/Config.in deleted file mode 100644 index dd8b54eba1..0000000000 --- a/package.bak/qt5/qt5xmlpatterns/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_QT5XMLPATTERNS - bool "qt5xmlpatterns" - select BR2_PACKAGE_QT5BASE - help - Qt is a cross-platform application and UI framework for - developers using C++. - - The Qt XML Patterns module provides support for XPath, - XQuery, XSLT, and XML Schema validation. - - http://doc.qt.io/qt-5/qtxmlpatterns-index.html diff --git a/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.hash b/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.hash deleted file mode 100644 index c1bb6637db..0000000000 --- a/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.2/submodules/qtxmlpatterns-opensource-src-5.6.2.tar.xz.mirrorlist -sha256 7c6df3eebf188d8ce6822a22cebbc63da5ac27047cf1bd7236d5b988244782cc qtxmlpatterns-opensource-src-5.6.2.tar.xz - -# Hash from: http://download.qt.io/official_releases/qt/5.8/5.8.0/submodules/qtxmlpatterns-opensource-src-5.8.0.tar.xz -sha256 7bffa65ea52e54fb1314b45222888612d55eaf51a936a6119b8756266439da04 qtxmlpatterns-opensource-src-5.8.0.tar.xz diff --git a/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.mk b/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.mk deleted file mode 100644 index e5981af532..0000000000 --- a/package.bak/qt5/qt5xmlpatterns/qt5xmlpatterns.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# qt5xmlpatterns -# -################################################################################ - -QT5XMLPATTERNS_VERSION = $(QT5_VERSION) -QT5XMLPATTERNS_SITE = $(QT5_SITE) -QT5XMLPATTERNS_SOURCE = qtxmlpatterns-opensource-src-$(QT5XMLPATTERNS_VERSION).tar.xz -QT5XMLPATTERNS_DEPENDENCIES = qt5base -QT5XMLPATTERNS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y) -ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST),y) -QT5XMLPATTERNS_LICENSE = GPLv2+ or LGPLv3, GPLv3 with exception(tools), GFDLv1.3 (docs) -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPL2 LICENSE.GPLv3 LICENSE.GPL3-EXCEPT LICENSE.LGPLv3 LICENSE.FDL -else -QT5XMLPATTERNS_LICENSE = GPLv3 or LGPLv2.1 with exception or LGPLv3, GFDLv1.3 (docs) -QT5XMLPATTERNS_LICENSE_FILES = LICENSE.GPLv3 LICENSE.LGPLv21 LGPL_EXCEPTION.txt LICENSE.LGPLv3 LICENSE.FDL -endif -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -QT5XMLPATTERNS_LICENSE := $(QT5XMLPATTERNS_LICENSE), BSD-3c (examples) -endif -else -QT5XMLPATTERNS_LICENSE = Commercial license -QT5XMLPATTERNS_REDISTRIBUTE = NO -endif - -define QT5XMLPATTERNS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake) -endef - -define QT5XMLPATTERNS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QT5XMLPATTERNS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install - $(QT5_LA_PRL_FILES_FIXUP) -endef - -ifeq ($(BR2_STATIC_LIBS),) -define QT5XMLPATTERNS_INSTALL_TARGET_LIBS - cp -dpf $(STAGING_DIR)/usr/lib/libQt5XmlPatterns*.so.* $(TARGET_DIR)/usr/lib -endef -endif - -ifeq ($(BR2_PACKAGE_QT5BASE_EXAMPLES),y) -define QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES - cp -dpfr $(STAGING_DIR)/usr/lib/qt/examples/xmlpatterns $(TARGET_DIR)/usr/lib/qt/examples/ -endef -endif - -define QT5XMLPATTERNS_INSTALL_TARGET_CMDS - $(QT5XMLPATTERNS_INSTALL_TARGET_LIBS) - $(QT5XMLPATTERNS_INSTALL_TARGET_EXAMPLES) -endef - -$(eval $(generic-package)) diff --git a/package.bak/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch b/package.bak/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch deleted file mode 100644 index ceae8cc898..0000000000 --- a/package.bak/qt5cinex/0001-Fix-execution-problem-with-Qt5.3.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 9b045ee7988daf3bb4c7cbe1ed1b9d744820e82b Mon Sep 17 00:00:00 2001 -From: Pierre Le Magourou -Date: Mon, 15 Dec 2014 11:54:51 +0100 -Subject: [PATCH] Fix execution problem with Qt5.3. - -This patch has been inspired from Open Embedded meta-qt5. - -Signed-off-by: Pierre Le Magourou ---- - content/SettingsView.qml | 4 ++-- - content/Switch.qml | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/content/SettingsView.qml b/content/SettingsView.qml -index 7944803..a0ddcc8 100644 ---- a/content/SettingsView.qml -+++ b/content/SettingsView.qml -@@ -127,8 +127,8 @@ Item { - Switch { - text: "Do you l-o-v-e colors?" - checked: settings.showColors -- onText: "Yes" -- offText: "No!" -+ textON: "Yes" -+ textOFF: "No!" - onCheckedChanged: { - settings.showColors = checked; - } -diff --git a/content/Switch.qml b/content/Switch.qml -index 967c03f..66955fc 100644 ---- a/content/Switch.qml -+++ b/content/Switch.qml -@@ -6,8 +6,8 @@ Item { - - property alias text: textItem.text - property bool checked: false -- property string onText: "On" -- property string offText: "Off" -+ property string textON: "On" -+ property string textOFF: "Off" - - QtObject { - id: priv -@@ -120,7 +120,7 @@ Item { - color: "#000000" - font.pixelSize: 18 - font.bold: true -- text: onText -+ text: textON - } - Text { - anchors.verticalCenter: parent.verticalCenter -@@ -129,7 +129,7 @@ Item { - color: "#ffffff" - font.pixelSize: 18 - font.bold: true -- text: offText -+ text: textOFF - } - - Image { --- -2.1.3 - diff --git a/package.bak/qt5cinex/CinematicExperience-demo b/package.bak/qt5cinex/CinematicExperience-demo deleted file mode 100755 index 919958fa7b..0000000000 --- a/package.bak/qt5cinex/CinematicExperience-demo +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -exec /usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience "$@" diff --git a/package.bak/qt5cinex/Config.in b/package.bak/qt5cinex/Config.in deleted file mode 100644 index b273231be5..0000000000 --- a/package.bak/qt5cinex/Config.in +++ /dev/null @@ -1,34 +0,0 @@ -comment "qt5cinex needs an Open(E)GL-capable backend" - depends on BR2_PACKAGE_QT5 - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - depends on !BR2_PACKAGE_QT5_GL_AVAILABLE || !BR2_PACKAGE_HAS_LIBEGL - -config BR2_PACKAGE_QT5CINEX - bool "qt5cinex" - depends on BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_NETWORK - select BR2_PACKAGE_QT5BASE_PNG - select BR2_PACKAGE_QT5BASE_WIDGETS - select BR2_PACKAGE_QT5BASE_EGLFS - select BR2_PACKAGE_QT5GRAPHICALEFFECTS - depends on BR2_PACKAGE_HAS_LIBEGL # qt5base-eglfs - depends on BR2_PACKAGE_QT5_GL_AVAILABLE - # No comment needed for this option, it's an architecture - # dependency. - depends on BR2_PACKAGE_QT5_JSCORE_AVAILABLE - help - This application demonstrates the power of Qt5 and few of the new - additions available in QtQuick 2.0. - - http://quitcoding.com/?page=work#cinex - -if BR2_PACKAGE_QT5CINEX - -config BR2_PACKAGE_QT5CINEX_HD - bool "High-definition version (aka RPi Edition)" - help - High definition version (1920x1080 resolution) of the - application, optimised for Raspberry PI cards. This version - can also be run on any platform supported by Qt5. - -endif diff --git a/package.bak/qt5cinex/qt5cinex.hash b/package.bak/qt5cinex/qt5cinex.hash deleted file mode 100644 index 637f388b73..0000000000 --- a/package.bak/qt5cinex/qt5cinex.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 0dd602983ced5f7c0cfd5ad0fbfe2b0b7e3c9ff715e4ef23eef818ccc2b6c60b Qt5_CinematicExperience_rpi_1.0.tgz -sha256 0e547e0259667915a24e84ade5efdcd0c553f81786734452c2c8dbce19a19f44 Qt5_CinematicExperience_1.0.tgz diff --git a/package.bak/qt5cinex/qt5cinex.mk b/package.bak/qt5cinex/qt5cinex.mk deleted file mode 100644 index bfe14ce74e..0000000000 --- a/package.bak/qt5cinex/qt5cinex.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# qt5cinex -# -################################################################################ - -QT5CINEX_VERSION = 1.0 -QT5CINEX_SITE = http://quitcoding.com/download - -ifeq ($(BR2_PACKAGE_QT5CINEX_HD),y) -QT5CINEX_HD = "rpi_" -endif - -QT5CINEX_SOURCE = Qt5_CinematicExperience_$(QT5CINEX_HD)$(QT5CINEX_VERSION).tgz -QT5CINEX_DEPENDENCIES = qt5base qt5declarative - -QT5CINEX_LICENSE = CC-BY-3.0 -QT5CINEX_LICENSE_FILES = README - -define QT5CINEX_CONFIGURE_CMDS - cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake -endef - -define QT5CINEX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -# In addition to the Cinematic Experience itself, we also install a -# wrapper shell script to /usr/bin: the Cinematic Experience binary -# wants its resource files to be available directly under a contents/ -# sub-directory, which isn't very practical to install in /usr/bin/. -define QT5CINEX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/Qt5_CinematicExperience \ - $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience - $(INSTALL) -D -m 0664 $(@D)/Qt5_CinematicExperience.qml \ - $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/Qt5_CinematicExperience.qml - cp -dpfr $(@D)/content $(TARGET_DIR)/usr/share/Qt5/CinematicExperience/content - $(INSTALL) -m 0755 -D package/qt5cinex/CinematicExperience-demo \ - $(TARGET_DIR)/usr/bin/CinematicExperience-demo -endef - -$(eval $(generic-package)) diff --git a/package.bak/qtuio/0001-TuioServer.cpp-add-missing-include.patch b/package.bak/qtuio/0001-TuioServer.cpp-add-missing-include.patch deleted file mode 100644 index 99337026df..0000000000 --- a/package.bak/qtuio/0001-TuioServer.cpp-add-missing-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4dd7cad8c95484a882eaa2aeaa74595a3dd93a07 Mon Sep 17 00:00:00 2001 -From: Stephan Hoffmann -Date: Sun, 2 Dec 2012 13:36:41 +0100 -Subject: [PATCH] TuioServer.cpp: add missing include - -If usleep() is used the header has to be included - -Signed-off-by: Stephan Hoffmann ---- - src/3rdparty/tuio/TuioServer.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/3rdparty/tuio/TuioServer.cpp b/src/3rdparty/tuio/TuioServer.cpp -index f17bef9..851144c 100644 ---- a/src/3rdparty/tuio/TuioServer.cpp -+++ b/src/3rdparty/tuio/TuioServer.cpp -@@ -25,6 +25,8 @@ using namespace TUIO; - using namespace osc; - - #ifndef WIN32 -+#include -+ - static void* ThreadFunc( void* obj ) - #else - static DWORD WINAPI ThreadFunc( LPVOID obj ) --- -1.7.0.4 - diff --git a/package.bak/qtuio/0002-dont-append-_d-for-debug.patch b/package.bak/qtuio/0002-dont-append-_d-for-debug.patch deleted file mode 100644 index fbaaf19222..0000000000 --- a/package.bak/qtuio/0002-dont-append-_d-for-debug.patch +++ /dev/null @@ -1,29 +0,0 @@ -[PATCH] don't append _d to library name when Qt is built with debug support - -qtuio appends _d to the library name when Qt was built with debug support, -breaking linking step for examples and staging/target install. - -There's no real advantage to the _d suffix, so simply fix it by removing -the logic appending _d. - -Signed-off-by: Peter Korsgaard ---- - src/qTUIO.pro | 5 ----- - 1 file changed, 5 deletions(-) - -Index: qtuio-abe4973ff6/src/qTUIO.pro -=================================================================== ---- qtuio-abe4973ff6.orig/src/qTUIO.pro -+++ qtuio-abe4973ff6/src/qTUIO.pro -@@ -16,11 +16,6 @@ - win32:LIBS += ws2_32.lib \ - winmm.lib - --# Changes the name of the target, when is debug mode --CONFIG( debug, debug|release ) { -- TARGET = $${TARGET}_d -- BUILD_NAME = debug --} - CONFIG( release, debug|release ):BUILD_NAME = release - - # Temporary folders for the auxiliar files diff --git a/package.bak/qtuio/Config.in b/package.bak/qtuio/Config.in deleted file mode 100644 index f46f1dd407..0000000000 --- a/package.bak/qtuio/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_QTUIO - bool "qtuio" - depends on BR2_PACKAGE_QT - depends on BR2_PACKAGE_QT_GUI_MODULE - help - Implementation of an interface connecting TUIO messages - and QT events - - https://github.com/x29a/qTUIO - -if BR2_PACKAGE_QTUIO - -config BR2_QTUIO_EXAMPLES - bool "qtuio examples" - help - Build and install qtuio examples - -endif - -comment "qtuio depends on QT gui module" - depends on BR2_PACKAGE_QT - depends on !BR2_PACKAGE_QT_GUI_MODULE diff --git a/package.bak/qtuio/qtuio.hash b/package.bak/qtuio/qtuio.hash deleted file mode 100644 index bb9bdb1848..0000000000 --- a/package.bak/qtuio/qtuio.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 65308adb59e910d552d4885772c7f99c7d19dec5e924d852a5a39a1972f8d223 qtuio-abe4973ff60654aad9df7037c4ca15c45f811d24.tar.gz diff --git a/package.bak/qtuio/qtuio.mk b/package.bak/qtuio/qtuio.mk deleted file mode 100644 index 6238b50f8b..0000000000 --- a/package.bak/qtuio/qtuio.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# qtuio -# -################################################################################ - -QTUIO_VERSION = abe4973ff60654aad9df7037c4ca15c45f811d24 -QTUIO_SITE = $(call github,x29a,qTUIO,$(QTUIO_VERSION)) -QTUIO_INSTALL_STAGING = YES -QTUIO_DEPENDENCIES = qt - -QTUIO_LICENSE = GPLv3+ -QTUIO_LICENSE_FILES = COPYING - -# The pong example needs QtOpenGL support, which might become available -# some time in the future. Then add pong to the list of examples. -QTUIO_EXAMPLES = dials fingerpaint knobs pinchzoom - -ifeq ($(BR2_QTUIO_EXAMPLES),y) -define QTUIO_CONFIGURE_EXAMPLES - for example in $(QTUIO_EXAMPLES) ; do \ - (cd $(@D)/examples/$${example} && $(TARGET_MAKE_ENV) $(QT_QMAKE)) || exit 1; \ - done -endef -endif - -define QTUIO_CONFIGURE_CMDS - cd $(@D)/src && $(TARGET_MAKE_ENV) $(QT_QMAKE) - $(QTUIO_CONFIGURE_EXAMPLES) -endef - -ifeq ($(BR2_QTUIO_EXAMPLES),y) -define QTUIO_BUILD_EXAMPLES - for example in $(QTUIO_EXAMPLES) ; do \ - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/examples/$${example} || exit 1; \ - done -endef -endif - -define QTUIO_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/src - $(QTUIO_BUILD_EXAMPLES) -endef - -# Unfortunately, there is no working "install" target available -ifeq ($(BR2_QTUIO_EXAMPLES),y) -define QTUIO_INSTALL_EXAMPLES - for example in $(QTUIO_EXAMPLES) ; do \ - $(INSTALL) -D -m 0755 $(@D)/examples/$${example}/$${example} $(TARGET_DIR)/usr/share/qtuio/$${example} || exit 1 ; \ - done -endef -endif - -ifeq ($(BR2_PACKAGE_QT_STATIC),y) -QTUIO_LIBRARY = libqTUIO.a -else -QTUIO_LIBRARY = libqTUIO.so* -define QTUIO_INSTALL_TARGET_LIBRARY - cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(TARGET_DIR)/usr/lib -endef -endif - -define QTUIO_INSTALL_TARGET_CMDS - $(QTUIO_INSTALL_TARGET_LIBRARY) - $(QTUIO_INSTALL_EXAMPLES) -endef - -define QTUIO_INSTALL_STAGING_CMDS - cp -dpf $(@D)/lib/$(QTUIO_LIBRARY) $(STAGING_DIR)/usr/lib -endef - -$(eval $(generic-package)) diff --git a/package.bak/quagga/0001-fix-ipctl-forwarding.patch b/package.bak/quagga/0001-fix-ipctl-forwarding.patch deleted file mode 100644 index e2e3421edb..0000000000 --- a/package.bak/quagga/0001-fix-ipctl-forwarding.patch +++ /dev/null @@ -1,27 +0,0 @@ -Add definitions for IPCTL_FORWARDING and IP6CTL_FORWARDING. - -Inspired from -http://svn.gnumonks.org/trunk/grouter/build/src/quagga/quagga/quagga-0.99.1-forward_sysctl-2.6.14.patch - -Signed-off-by: Thomas Petazzoni - -Index: quagga-0.99.16/zebra/ipforward_sysctl.c -=================================================================== ---- quagga-0.99.16.orig/zebra/ipforward_sysctl.c 2010-06-20 23:40:45.000000000 +0200 -+++ quagga-0.99.16/zebra/ipforward_sysctl.c 2010-06-20 23:41:37.000000000 +0200 -@@ -31,6 +31,15 @@ - - #define MIB_SIZ 4 - -+/* Fix for recent (2.6.14) kernel headers */ -+#ifndef IPCTL_FORWARDING -+#define IPCTL_FORWARDING NET_IPV4_FORWARD -+#endif -+ -+#ifndef IP6CTL_FORWARDING -+#define IP6CTL_FORWARDING NET_IPV6_FORWARDING -+#endif -+ - extern struct zebra_privs_t zserv_privs; - - /* IPv4 forwarding control MIB. */ diff --git a/package.bak/quagga/0002-configure-fix-static-linking-with-readline.patch b/package.bak/quagga/0002-configure-fix-static-linking-with-readline.patch deleted file mode 100644 index 243dfaf75d..0000000000 --- a/package.bak/quagga/0002-configure-fix-static-linking-with-readline.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 62ede7482da15d276b880f6d8540dce400dc50a7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 Nov 2015 15:59:07 +0100 -Subject: [PATCH] configure: fix static linking with readline - -When static linking is used, the order of the libraries is important, -and the libraries using a symbol from another library should be listed -*before* the library providing that symbol (see -http://eli.thegreenplace.net/2013/07/09/library-order-in-static-linking) -for details. - -When vtysh is linked statically, the command line contains "-lcurses --lreadline", which causes a build failure due to unresolved -symbols. This is because readline is using symbols from the curses -library: the order should be the opposite. - -This patch fixes that problem by putting the -lreadline at the -beginning of the LIBREADLINE variable calcualted by the configure -script. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 3003e62..290953d 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -652,7 +652,7 @@ dnl [TODO] on Linux, and in [TODO] on Solaris. - )] - )] - ) -- AC_CHECK_LIB(readline, main, LIBREADLINE="$LIBREADLINE -lreadline",, -+ AC_CHECK_LIB(readline, main, LIBREADLINE="-lreadline $LIBREADLINE",, - "$LIBREADLINE") - if test $ac_cv_lib_readline_main = no; then - AC_MSG_ERROR([vtysh needs libreadline but was not found and usable on your system.]) --- -2.6.3 - diff --git a/package.bak/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch b/package.bak/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch deleted file mode 100644 index 6990f47cda..0000000000 --- a/package.bak/quagga/0003-lib-memory-fix-indirect-static-link-with-zlib.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 008dd9771057dbbd7ce971c43bce2a0b05e2cf97 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Sun, 21 Aug 2016 08:56:57 +0300 -Subject: [PATCH] lib/memory: fix indirect static link with zlib - -quagga SNMP support depends on netsnmp, that optionally depends on OpenSSL, -which in turn requires zlib. zlib exports the 'zcalloc' symbol, which collides -with a function of the same name in memory.c. This is not a problem when -linking dynamically, since quagga does not use zlib directly. But static -linking fails with the error: - - CCLD ospfd -.../output/host/usr/mips64el-buildroot-linux-uclibc/sysroot/usr/lib/libz.a(zutil.o): In function `zcalloc': -zutil.c:(.text+0x48): multiple definition of `zcalloc' -.../output/build/quagga-1.0.20160315/lib/.libs/libzebra.a(memory.o):memory.c:(.text+0x1a0): first defined here - -Rename 'zcalloc' to 'zzcalloc' to avoid symbol collision. - -Signed-off-by: Baruch Siach ---- -Patch status: posted upstream -https://lists.quagga.net/pipermail/quagga-dev/2016-August/016109.html - - lib/memory.c | 14 ++++++++------ - lib/memory.h | 4 ++-- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/lib/memory.c b/lib/memory.c -index 269520d5a435..b1680a5e6f07 100644 ---- a/lib/memory.c -+++ b/lib/memory.c -@@ -80,9 +80,11 @@ zmalloc (int type, size_t size) - - /* - * Allocate memory as in zmalloc, and also clear the memory. -+ * Add an extra 'z' prefix to function name to avoid collision when linking -+ * statically with zlib that exports the 'zcalloc' symbol. - */ - void * --zcalloc (int type, size_t size) -+zzcalloc (int type, size_t size) - { - void *memory; - -@@ -97,9 +99,9 @@ zcalloc (int type, size_t size) - } - - /* -- * Given a pointer returned by zmalloc or zcalloc, free it and -+ * Given a pointer returned by zmalloc or zzcalloc, free it and - * return a pointer to a new size, basically acting like realloc(). -- * Requires: ptr was returned by zmalloc, zcalloc, or zrealloc with the -+ * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the - * same type. - * Effects: Returns a pointer to the new memory, or aborts. - */ -@@ -109,7 +111,7 @@ zrealloc (int type, void *ptr, size_t size) - void *memory; - - if (ptr == NULL) /* is really alloc */ -- return zcalloc(type, size); -+ return zzcalloc(type, size); - - memory = realloc (ptr, size); - if (memory == NULL) -@@ -122,7 +124,7 @@ zrealloc (int type, void *ptr, size_t size) - - /* - * Free memory allocated by z*alloc or zstrdup. -- * Requires: ptr was returned by zmalloc, zcalloc, or zrealloc with the -+ * Requires: ptr was returned by zmalloc, zzcalloc, or zrealloc with the - * same type. - * Effects: The memory is freed and may no longer be referenced. - */ -@@ -196,7 +198,7 @@ mtype_zcalloc (const char *file, int line, int type, size_t size) - mstat[type].c_calloc++; - mstat[type].t_calloc++; - -- memory = zcalloc (type, size); -+ memory = zzcalloc (type, size); - mtype_log ("xcalloc", memory, file, line, type); - - return memory; -diff --git a/lib/memory.h b/lib/memory.h -index 23962235dbfe..501352993d21 100644 ---- a/lib/memory.h -+++ b/lib/memory.h -@@ -56,7 +56,7 @@ extern struct mlist mlists[]; - mtype_zstrdup (__FILE__, __LINE__, (mtype), (str)) - #else - #define XMALLOC(mtype, size) zmalloc ((mtype), (size)) --#define XCALLOC(mtype, size) zcalloc ((mtype), (size)) -+#define XCALLOC(mtype, size) zzcalloc ((mtype), (size)) - #define XREALLOC(mtype, ptr, size) zrealloc ((mtype), (ptr), (size)) - #define XFREE(mtype, ptr) do { \ - zfree ((mtype), (ptr)); \ -@@ -67,7 +67,7 @@ extern struct mlist mlists[]; - - /* Prototypes of memory function. */ - extern void *zmalloc (int type, size_t size); --extern void *zcalloc (int type, size_t size); -+extern void *zzcalloc (int type, size_t size); - extern void *zrealloc (int type, void *ptr, size_t size); - extern void zfree (int type, void *ptr); - extern char *zstrdup (int type, const char *str); --- -2.8.1 - diff --git a/package.bak/quagga/Config.in b/package.bak/quagga/Config.in deleted file mode 100644 index 4eacaf047a..0000000000 --- a/package.bak/quagga/Config.in +++ /dev/null @@ -1,87 +0,0 @@ -config BR2_PACKAGE_QUAGGA - bool "quagga" - depends on BR2_USE_MMU # fork() - help - Routing software suite, providing implementations of - OSPFv2, OSPFv3 (IPv6), RIP v1 and v2, RIPng (IPv6) and BGPv4+. - - http://www.quagga.net/ - -if BR2_PACKAGE_QUAGGA - -config BR2_PACKAGE_QUAGGA_ZEBRA - bool "zebra daemon" - help - Build zebra daemon. - -config BR2_PACKAGE_QUAGGA_TCP_ZEBRA - bool "Use TCP sockets between zebra and protocol daemons" - depends on BR2_PACKAGE_QUAGGA_ZEBRA - help - Use a TCP socket to communicate between zebra (supervisor) and - the different protocol daemons. - - You'll want this enabled if zebra and the protocol daemon(s) run - on different hosts. - -config BR2_PACKAGE_QUAGGA_BGPD - bool "BGPv4+ protocol" - help - Build bgpd daemon. - -config BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE - bool "BGP route announcement" - depends on BR2_PACKAGE_QUAGGA_BGPD - -config BR2_PACKAGE_QUAGGA_ISISD - bool "IS-IS protocol" - help - Enable isisd support in quagga. - -config BR2_PACKAGE_QUAGGA_OSPFD - bool "OSPFv2 protocol" - help - Build ospfd daemon. - -config BR2_PACKAGE_QUAGGA_OSPF6D - bool "OSPFv3 (IPv6) protocol" - help - Build ospf6d daemon. - -config BR2_PACKAGE_QUAGGA_RIPD - bool "RIPv2/v3 protocol" - help - Build ripd daemon. - -config BR2_PACKAGE_QUAGGA_RIPNGD - bool "RIPng (IPv6) protocol" - help - Build ripngd daemon. - -config BR2_PACKAGE_QUAGGA_PIMD - bool "PIMd protocol" - help - Provides IPv4 PIM-SSM multicast routing. - -config BR2_PACKAGE_QUAGGA_WATCHQUAGGA - bool "Build watchquagga" - help - Build and install watchquagga, a zebra/protocol daemon supervisor. - -config BR2_PACKAGE_QUAGGA_VTYSH - bool "Build vtysh" - select BR2_PACKAGE_READLINE - help - Build and install vtysh, a vty shell for Quagga. - -config BR2_PACKAGE_QUAGGA_SNMP - bool "SNMP support" - depends on BR2_USE_MMU # net-snmp - select BR2_PACKAGE_NETSNMP - help - Make quagga information available via SNMP SMUX. - -comment "AgentX support must be enabled in net-snmp or the build will break" - depends on BR2_PACKAGE_QUAGGA_SNMP - -endif diff --git a/package.bak/quagga/quagga.hash b/package.bak/quagga/quagga.hash deleted file mode 100644 index 6da37cf806..0000000000 --- a/package.bak/quagga/quagga.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 b5a94e5bdad3062e04595a5692b8cc435f0a85102f75dfdca0a06d093b4ef63f quagga-1.1.1.tar.gz diff --git a/package.bak/quagga/quagga.mk b/package.bak/quagga/quagga.mk deleted file mode 100644 index c17ceaade3..0000000000 --- a/package.bak/quagga/quagga.mk +++ /dev/null @@ -1,88 +0,0 @@ -################################################################################ -# -# quagga -# -################################################################################ - -QUAGGA_VERSION = 1.1.1 -QUAGGA_SITE = http://download.savannah.gnu.org/releases/quagga -QUAGGA_DEPENDENCIES = host-gawk host-pkgconf -QUAGGA_LICENSE = GPLv2+ -QUAGGA_LICENSE_FILES = COPYING - -# We need to override the sysconf and localstate directories so that -# quagga can create files as the quagga user without extra -# intervention -QUAGGA_CONF_OPTS = \ - --program-transform-name='' \ - --sysconfdir=/etc/quagga \ - --localstatedir=/var/run/quagga - -# 0002-configure-fix-static-linking-with-readline.patch -QUAGGA_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -QUAGGA_CONF_OPTS += --enable-capabilities -QUAGGA_DEPENDENCIES += libcap -else -QUAGGA_CONF_OPTS += --disable-capabilities -endif - -ifeq ($(BR2_PACKAGE_PROTOBUF_C),y) -QUAGGA_CONF_OPTS += --enable-protobuf -QUAGGA_DEPENDENCIES += protobuf-c -else -QUAGGA_CONF_OPTS += --disable-protobuf -endif - -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ZEBRA),--enable-zebra,--disable-zebra) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGPD),--enable-bgpd,--disable-bgpd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPD),--enable-ripd,--disable-ripd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_RIPNGD),--enable-ripngd,--disable-ripngd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPFD),--enable-ospfd,--disable-ospfd --disable-ospfapi) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_OSPF6D),--enable-ospf6d,--disable-ospf6d) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_PIMD),--enable-pimd,--disable-pimd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_WATCHQUAGGA),--enable-watchquagga,--disable-watchquagga) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_ISISD),--enable-isisd,--disable-isisd) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_BGP_ANNOUNCE),--enable-bgp-announce,--disable-bgp-announce) -QUAGGA_CONF_OPTS += $(if $(BR2_PACKAGE_QUAGGA_TCP_ZERBRA),--enable-tcp-zebra,--disable-tcp-zebra) - -define QUAGGA_USERS - quagga -1 quagga -1 * - - - Quagga priv drop user -endef - -# Set the permissions of /etc/quagga such that quagga (through vtysh) -# can save the configuration - set the folder recursively as the files -# need to be 600, and then set the folder (non-recursively) to 755 so -# it can used. Quagga also needs to write to the folder as it moves -# and creates, rather than overwriting. -define QUAGGA_PERMISSIONS - /etc/quagga r 600 quagga quagga - - - - - - /etc/quagga d 755 quagga quagga - - - - - -endef - -ifeq ($(BR2_PACKAGE_QUAGGA_SNMP),y) -QUAGGA_CONF_ENV += ac_cv_path_NETSNMP_CONFIG=$(STAGING_DIR)/usr/bin/net-snmp-config -QUAGGA_CONF_OPTS += --enable-snmp=agentx -QUAGGA_DEPENDENCIES += netsnmp -endif - -ifeq ($(BR2_PACKAGE_QUAGGA_VTYSH),y) -QUAGGA_CONF_OPTS += --enable-vtysh -QUAGGA_DEPENDENCIES += readline -else -QUAGGA_CONF_OPTS += --disable-vtysh -endif - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -QUAGGA_CONF_OPTS += --disable-pie -endif - -define QUAGGA_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/quagga/quagga_tmpfiles.conf \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/quagga.conf - $(INSTALL) -D -m 644 package/quagga/quagga@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/quagga@.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/quagga/quagga@.service b/package.bak/quagga/quagga@.service deleted file mode 100644 index 797af32e12..0000000000 --- a/package.bak/quagga/quagga@.service +++ /dev/null @@ -1,17 +0,0 @@ -[Unit] -Description=Quagga %i routing daemon -ConditionFileIsExecutable=/usr/sbin/%i -Wants=quagga@zebra.service - -[Service] -Type=simple -EnvironmentFile=/etc/default/quagga-%i -PrivateTmp=true -# Systemd doesn't like having %i in the executable path. -ExecStart=/usr/bin/env /usr/sbin/%i $OPTS -f /etc/quagga/%i.conf -ExecReload=/bin/kill -HUP $MAINPID -Restart=on-failure - -[Install] -WantedBy=multi-user.target - diff --git a/package.bak/quagga/quagga_tmpfiles.conf b/package.bak/quagga/quagga_tmpfiles.conf deleted file mode 100644 index e16c475fd4..0000000000 --- a/package.bak/quagga/quagga_tmpfiles.conf +++ /dev/null @@ -1 +0,0 @@ -d /var/run/quagga/ 1755 quagga quagga - diff --git a/package.bak/quazip/Config.in b/package.bak/quazip/Config.in deleted file mode 100644 index 83537d4613..0000000000 --- a/package.bak/quazip/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_QUAZIP - bool "quazip" - select BR2_PACKAGE_ZLIB - help - QuaZIP is a simple C++ wrapper over Gilles Vollant's - ZIP/UNZIP package that can be used to access ZIP - archives. It uses the Qt toolkit. - - http://quazip.sourceforge.net diff --git a/package.bak/quazip/quazip.hash b/package.bak/quazip/quazip.hash deleted file mode 100644 index 2f73c459c6..0000000000 --- a/package.bak/quazip/quazip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 91d827fbcafd099ae814cc18a8dd3bb709da6b8a27c918ee1c6c03b3f29440f4 quazip-0.7.2.tar.gz diff --git a/package.bak/quazip/quazip.mk b/package.bak/quazip/quazip.mk deleted file mode 100644 index 91b2f56328..0000000000 --- a/package.bak/quazip/quazip.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# quazip -# -################################################################################ - -QUAZIP_VERSION = 0.7.2 -QUAZIP_SITE = http://sourceforge.net/projects/quazip/files/quazip/$(QUAZIP_VERSION) -QUAZIP_INSTALL_STAGING = YES -QUAZIP_DEPENDENCIES = \ - zlib \ - $(if $(BR2_PACKAGE_QT),qt) \ - $(if $(BR2_PACKAGE_QT5),qt5base) -QUAZIP_LICENSE = LGPLv2.1 -QUAZIP_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_QT5),y) -QUAZIP_QMAKE = $(QT5_QMAKE) -else -QUAZIP_QMAKE = $(QT_QMAKE) -endif - -define QUAZIP_CONFIGURE_CMDS - (cd $(@D); $(TARGET_MAKE_ENV) $(QUAZIP_QMAKE) PREFIX=/usr) -endef - -define QUAZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define QUAZIP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) -endef - -define QUAZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/quota/0001-tools-getrpcbynumber.patch b/package.bak/quota/0001-tools-getrpcbynumber.patch deleted file mode 100644 index 899db914f0..0000000000 --- a/package.bak/quota/0001-tools-getrpcbynumber.patch +++ /dev/null @@ -1,42 +0,0 @@ -allow usage of getrpcbynumber() instead of getrpcbynumber_r() - -libtirpc does not implement the reentrant function getrpcbynumber_r(), -so allow quota to use the non-reentrant version getrpcbynumber(). This -should not be a problem as quota tools are not multi-threaded. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.in -=================================================================== ---- a/configure.in -+++ b/configure.in -@@ -182,6 +182,12 @@ - AC_C_CONST - AC_C_INLINE - -+AC_CHECK_FUNCS([getrpcbynumber getrpcbynumber_r]) -+ -+if test "$ac_cv_func_getrpcbynumber_r" != "yes" -a "$ac_cv_func_getrpcbynumber" != "yes"; then -+ AC_MSG_ERROR([Neither getrpcbynumber_r nor getrpcbynumber are available]) -+fi -+ - AC_ARG_ENABLE(rpc, - [ --enable-rpc=[yes/no] Enable RPC support [default=yes].], - , -Index: b/svc_socket.c -=================================================================== ---- a/svc_socket.c -+++ b/svc_socket.c -@@ -55,7 +55,12 @@ - addr.sin_family = AF_INET; - - if (!port) { -+#if HAVE_GETRPCBYNUMBER_R - ret = getrpcbynumber_r(number, &rpcbuf, rpcdata, sizeof(rpcdata), &rpcp); -+#else -+ rpcp = getrpcbynumber(number); -+ ret = 0; -+#endif - if (ret == 0 && rpcp != NULL) { - /* First try name */ - ret = getservbyname_r(rpcp->r_name, proto, &servbuf, servdata, diff --git a/package.bak/quota/0002-fix-static-linking.patch b/package.bak/quota/0002-fix-static-linking.patch deleted file mode 100644 index fd73f64eb6..0000000000 --- a/package.bak/quota/0002-fix-static-linking.patch +++ /dev/null @@ -1,55 +0,0 @@ -Use $(LIBS) properly - -This patch makes sure the quota build system uses $(LIBS) where -appropriate, so that it can be used to link with additional libraries, -which is needed when linking statically. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -105,30 +105,40 @@ - -$(INSTALL) -m $(DEF_MAN_MODE) *.8 $(ROOTDIR)$(mandir)/man8 - - quotaon: quotaon.o quotaon_xfs.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quotacheck: quotacheck.o quotacheck_v1.o quotacheck_v2.o quotaops.o $(LIBOBJS) -- $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(EXT2LIBS) $(LIBS) - - quota: quota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quotasync: quotasync.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - quot: quot.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - repquota: repquota.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - warnquota: warnquota.o $(LIBOBJS) -- $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LDAPLIBS) $(LIBS) - - quotastats: quotastats.o common.o pot.o -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - xqmstats: xqmstats.o common.o pot.o -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - edquota: edquota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - setquota: setquota.o quotaops.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - convertquota: convertquota.o $(LIBOBJS) -+ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) - - rpc.rquotad: rquota_server.o rquota_svc.o svc_socket.o $(LIBOBJS) - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) diff --git a/package.bak/quota/0003-remove-non-posix-types.patch b/package.bak/quota/0003-remove-non-posix-types.patch deleted file mode 100644 index 869c85f23e..0000000000 --- a/package.bak/quota/0003-remove-non-posix-types.patch +++ /dev/null @@ -1,200 +0,0 @@ -Use proper C99 integer types - -Upstream-Status: Pending - -Signed-off-by: Khem Raj -[Thomas: borrowed from OpenEmbedded.] -Signed-off-by: Thomas Petazzoni - -Index: quota-tools/bylabel.c -=================================================================== ---- quota-tools.orig/bylabel.c -+++ quota-tools/bylabel.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - #include "bylabel.h" - #include "common.h" -@@ -37,32 +38,32 @@ static struct uuidCache_s { - - #define EXT2_SUPER_MAGIC 0xEF53 - struct ext2_super_block { -- u_char s_dummy1[56]; -- u_char s_magic[2]; -- u_char s_dummy2[46]; -- u_char s_uuid[16]; -- u_char s_volume_name[16]; -+ uint8_t s_dummy1[56]; -+ uint8_t s_magic[2]; -+ uint8_t s_dummy2[46]; -+ uint8_t s_uuid[16]; -+ uint8_t s_volume_name[16]; - }; - --#define ext2magic(s) ((uint) s.s_magic[0] + (((uint) s.s_magic[1]) << 8)) -+#define ext2magic(s) ((uint32_t) s.s_magic[0] + (((uint32_t) s.s_magic[1]) << 8)) - - #define XFS_SUPER_MAGIC "XFSB" - #define XFS_SUPER_MAGIC2 "BSFX" - struct xfs_super_block { -- u_char s_magic[4]; -- u_char s_dummy[28]; -- u_char s_uuid[16]; -- u_char s_dummy2[60]; -- u_char s_fsname[12]; -+ uint8_t s_magic[4]; -+ uint8_t s_dummy[28]; -+ uint8_t s_uuid[16]; -+ uint8_t s_dummy2[60]; -+ uint8_t s_fsname[12]; - }; - - #define REISER_SUPER_MAGIC "ReIsEr2Fs" - struct reiserfs_super_block { -- u_char s_dummy1[52]; -- u_char s_magic[10]; -- u_char s_dummy2[22]; -- u_char s_uuid[16]; -- u_char s_volume_name[16]; -+ uint8_t s_dummy1[52]; -+ uint8_t s_magic[10]; -+ uint8_t s_dummy2[22]; -+ uint8_t s_uuid[16]; -+ uint8_t s_volume_name[16]; - }; - - static inline unsigned short swapped(unsigned short a) -@@ -222,7 +223,7 @@ static char *get_spec_by_x(int n, const - return NULL; - } - --static u_char fromhex(char c) -+static uint8_t fromhex(char c) - { - if (isdigit(c)) - return (c - '0'); -@@ -234,7 +235,7 @@ static u_char fromhex(char c) - - static char *get_spec_by_uuid(const char *s) - { -- u_char uuid[16]; -+ uint8_t uuid[16]; - int i; - - if (strlen(s) != 36 || s[8] != '-' || s[13] != '-' || s[18] != '-' || s[23] != '-') -Index: quota-tools/quot.c -=================================================================== ---- quota-tools.orig/quot.c -+++ quota-tools/quot.c -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - #include "pot.h" - #include "quot.h" -@@ -56,8 +57,8 @@ - #include "quotasys.h" - - #define TSIZE 500 --static __uint64_t sizes[TSIZE]; --static __uint64_t overflow; -+static uint64_t sizes[TSIZE]; -+static uint64_t overflow; - - static int aflag; - static int cflag; -@@ -72,7 +73,7 @@ static time_t now; - char *progname; - - static void mounttable(void); --static char *idname(__uint32_t, int); -+static char *idname(uint32_t, int); - static void report(const char *, const char *, int); - static void creport(const char *, const char *); - -@@ -173,7 +174,7 @@ static int qcmp(du_t * p1, du_t * p2) - static void creport(const char *file, const char *fsdir) - { - int i; -- __uint64_t t = 0; -+ uint64_t t = 0; - - printf(_("%s (%s):\n"), file, fsdir); - for (i = 0; i < TSIZE - 1; i++) -@@ -219,7 +220,7 @@ static void report(const char *file, con - } - } - --static idcache_t *getnextent(int type, __uint32_t id, int byid) -+static idcache_t *getnextent(int type, uint32_t id, int byid) - { - struct passwd *pw; - struct group *gr; -@@ -240,7 +241,7 @@ static idcache_t *getnextent(int type, _ - return &idc; - } - --static char *idname(__uint32_t id, int type) -+static char *idname(uint32_t id, int type) - { - idcache_t *ncp, *idp; - static idcache_t nc[2][NID]; -@@ -286,8 +287,8 @@ static void acctXFS(xfs_bstat_t *p) - { - register du_t *dp; - du_t **hp; -- __uint64_t size; -- __uint32_t i, id; -+ uint64_t size; -+ uint32_t i, id; - - if ((p->bs_mode & S_IFMT) == 0) - return; -Index: quota-tools/quot.h -=================================================================== ---- quota-tools.orig/quot.h -+++ quota-tools/quot.h -@@ -35,18 +35,18 @@ - #define SEC24HR (60*60*24) /* seconds per day */ - - typedef struct { -- __uint32_t id; -+ uint32_t id; - char name[UT_NAMESIZE + 1]; - } idcache_t; - - typedef struct du { - struct du *next; -- __uint64_t blocks; -- __uint64_t blocks30; -- __uint64_t blocks60; -- __uint64_t blocks90; -- __uint64_t nfiles; -- __uint32_t id; -+ uint64_t blocks; -+ uint64_t blocks30; -+ uint64_t blocks60; -+ uint64_t blocks90; -+ uint64_t nfiles; -+ uint32_t id; - } du_t; - - #define NDU 60000 -Index: quota-tools/rquota_server.c -=================================================================== ---- quota-tools.orig/rquota_server.c -+++ quota-tools/rquota_server.c -@@ -60,7 +60,7 @@ extern char nfs_pseudoroot[PATH_MAX]; - */ - extern struct authunix_parms *unix_cred; - --int in_group(gid_t * gids, u_int len, gid_t gid) -+int in_group(gid_t * gids, uint32_t len, gid_t gid) - { - gid_t *gidsp = gids + len; - diff --git a/package.bak/quota/0004-import-sys-cdefs.patch b/package.bak/quota/0004-import-sys-cdefs.patch deleted file mode 100644 index 9acd1fe4f9..0000000000 --- a/package.bak/quota/0004-import-sys-cdefs.patch +++ /dev/null @@ -1,18 +0,0 @@ -Add missing include - -quota.h uses the __P definition, so it must include . - -Signed-off-by: Thomas Petazzoni - -Index: b/quota.h -=================================================================== ---- a/quota.h -+++ b/quota.h -@@ -2,6 +2,7 @@ - #define GUARD_QUOTA_H - - #include -+#include - - typedef u_int32_t qid_t; /* Type in which we store ids in memory */ - typedef int64_t qsize_t; /* Type in which we store size limitations */ diff --git a/package.bak/quota/0005-include-fcntl.patch b/package.bak/quota/0005-include-fcntl.patch deleted file mode 100644 index fe7ea98831..0000000000 --- a/package.bak/quota/0005-include-fcntl.patch +++ /dev/null @@ -1,20 +0,0 @@ -Include to get loff_t definition - -Fixes the following build issue with musl: - -dqblk_v2.h:32:2: error: unknown type name ‘loff_t’ - -Signed-off-by: Thomas Petazzoni - -Index: b/dqblk_v2.h -=================================================================== ---- a/dqblk_v2.h -+++ b/dqblk_v2.h -@@ -8,6 +8,7 @@ - #define GUARD_DQBLK_V2_H - - #include -+#include - #include "quota_tree.h" - - #define Q_V2_GETQUOTA 0x0D00 /* Get limits and usage */ diff --git a/package.bak/quota/Config.in b/package.bak/quota/Config.in deleted file mode 100644 index c8ab0d7ed3..0000000000 --- a/package.bak/quota/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_QUOTA - bool "quota" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC || BR2_TOOLCHAIN_HAS_THREADS # libtirpc - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBTIRPC if !BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - Implementation of the disk quota system. - - http://sourceforge.net/projects/linuxquota/ - -comment "quota needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || \ - !(BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_HAS_NATIVE_RPC) diff --git a/package.bak/quota/quota.hash b/package.bak/quota/quota.hash deleted file mode 100644 index 5e49693646..0000000000 --- a/package.bak/quota/quota.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/linuxquota/files/quota-tools/4.01/ (click on info button) -md5 5c2c31e321d2e1322ce12d69ae5c66d6 quota-4.01.tar.gz -sha1 64d2ab8b039cfea1aa4bd9e77e8c373488a7f0bf quota-4.01.tar.gz diff --git a/package.bak/quota/quota.mk b/package.bak/quota/quota.mk deleted file mode 100644 index a1e343a388..0000000000 --- a/package.bak/quota/quota.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# quota -# -################################################################################ - -QUOTA_VERSION = 4.01 -QUOTA_SITE = http://downloads.sourceforge.net/project/linuxquota/quota-tools/$(QUOTA_VERSION) -QUOTA_DEPENDENCIES = host-gettext -QUOTA_AUTORECONF = YES -QUOTA_LICENSE = GPLv2+ -QUOTA_CONF_OPTS = --disable-strip-binaries - -QUOTA_CFLAGS = $(TARGET_CFLAGS) - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -QUOTA_DEPENDENCIES += gettext -QUOTA_LIBS += -lintl -endif - -ifeq ($(BR2_PACKAGE_E2FSPROGS),y) -QUOTA_DEPENDENCIES += e2fsprogs -QUOTA_CONF_OPTS += --enable-ext2direct -# quote does not use pkg-config to find e2fsprogs, so it does not know it -# may require -pthreads in case of static build -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -QUOTA_LIBS += -pthread -endif -else -QUOTA_CONF_OPTS += --disable-ext2direct -endif - -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -QUOTA_DEPENDENCIES += libtirpc host-pkgconf -QUOTA_CFLAGS += `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc` -QUOTA_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libtirpc` -endif - -QUOTA_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LIBS="$(QUOTA_LIBS)" -QUOTA_CONF_ENV = \ - CFLAGS="$(QUOTA_CFLAGS) -D_GNU_SOURCE" LIBS="$(QUOTA_LIBS)" - -# Package uses autoconf but not automake. -QUOTA_INSTALL_TARGET_OPTS = \ - ROOTDIR=$(TARGET_DIR) \ - install - -$(eval $(autotools-package)) diff --git a/package.bak/qwt/Config.in b/package.bak/qwt/Config.in deleted file mode 100644 index a678637b6c..0000000000 --- a/package.bak/qwt/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -comment "qwt needs a toolchain not affected by Binutils bug 19405" - depends on BR2_PACKAGE_QT && BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405 - -config BR2_PACKAGE_QWT - bool "qwt" - depends on (BR2_PACKAGE_QT && !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_19405) || \ - BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT_GUI_MODULE if BR2_PACKAGE_QT - select BR2_PACKAGE_QT5BASE_GUI if BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_WIDGETS if BR2_PACKAGE_QT5 # printsupport - select BR2_PACKAGE_QT5BASE_CONCURRENT if BR2_PACKAGE_QT5 - help - Qwt is a graphics extension to the Qt GUI application - framework. It provides a 2D plotting widget and more. - - http://qwt.sourceforge.net/ - -if BR2_PACKAGE_QWT - -config BR2_PACKAGE_QWT_SVG - bool "SVG support" - select BR2_PACKAGE_QT_SVG if BR2_PACKAGE_QT - select BR2_PACKAGE_QT5SVG if BR2_PACKAGE_QT5 - -config BR2_PACKAGE_QWT_MATHML - bool "MathML support" - -config BR2_PACKAGE_QWT_OPENGL - bool "OpenGL support" - depends on (BR2_PACKAGE_HAS_LIBGLES && BR2_PACKAGE_HAS_LIBEGL && BR2_PACKAGE_QT) || \ - (BR2_PACKAGE_QT5_GL_AVAILABLE && BR2_PACKAGE_QT5) - select BR2_PACKAGE_QT_OPENGL if BR2_PACKAGE_QT - select BR2_PACKAGE_QT5BASE_OPENGL if BR2_PACKAGE_QT5 - select BR2_PACKAGE_QT5BASE_OPENGL_LIB if BR2_PACKAGE_QT5 - -endif diff --git a/package.bak/qwt/qwt.hash b/package.bak/qwt/qwt.hash deleted file mode 100644 index a0077a6804..0000000000 --- a/package.bak/qwt/qwt.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/qwt/files/qwt/6.1.3/ -sha1 90ec21bc42f7fae270482e1a0df3bc79cb10e5c7 qwt-6.1.3.tar.bz2 -md5 19d1f5fa5e22054d22ee3accc37c54ba qwt-6.1.3.tar.bz2 diff --git a/package.bak/qwt/qwt.mk b/package.bak/qwt/qwt.mk deleted file mode 100644 index d1bb5245b1..0000000000 --- a/package.bak/qwt/qwt.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# qwt -# -################################################################################ - -QWT_VERSION = 6.1.3 -QWT_SOURCE = qwt-$(QWT_VERSION).tar.bz2 -QWT_SITE = http://downloads.sourceforge.net/project/qwt/qwt/$(QWT_VERSION) -QWT_INSTALL_STAGING = YES -ifeq ($(BR2_PACKAGE_QT),y) -QWT_DEPENDENCIES = qt -QWT_QMAKE = $(QT_QMAKE) -else ifeq ($(BR2_PACKAGE_QT5),y) -QWT_DEPENDENCIES += qt5base -QWT_QMAKE = $(QT5_QMAKE) -endif - -QWT_LICENSE = LGPLv2.1 with exceptions -QWT_LICENSE_FILES = COPYING - -QWT_CONFIG = 's%QWT_INSTALL_PREFIX.*/usr/local/.*%QWT_INSTALL_PREFIX = /usr%' -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtDesigner.*$$/\# QWT_CONFIG += QwtDesigner/' -QWT_CONFIG += -e 's%/features%/mkspecs/features%' - -ifeq ($(BR2_PACKAGE_QWT_SVG),y) -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/QWT_CONFIG += QwtSvg/' -else -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtSvg.*$$/\# QWT_CONFIG += QwtSvg/' -endif - -ifeq ($(BR2_PACKAGE_QWT_MATHML),y) -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/QWT_CONFIG += QwtMathML/' -else -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtMathML.*$$/\# QWT_CONFIG += QwtMathML/' -endif - -ifeq ($(BR2_PACKAGE_QWT_OPENGL),y) -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/QWT_CONFIG += QwtOpenGL/' -else -QWT_CONFIG += -e 's/^.*QWT_CONFIG.*QwtOpenGL.*$$/\# QWT_CONFIG += QwtOpenGL/' -endif - -define QWT_CONFIGURE_CMDS - $(SED) $(QWT_CONFIG) $(@D)/qwtconfig.pri - (cd $(@D); $(TARGET_MAKE_ENV) $(QWT_QMAKE)) -endef - -define QWT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -# After installation, we fixup the INSTALL_PREFIX in qwtconfig.pri so -# that when building with qmake, -L$(STAGING_DIR)/usr/lib is used and -# not -L/usr/lib. -define QWT_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(STAGING_DIR) - $(SED) "s%QWT_INSTALL_PREFIX = .*%QWT_INSTALL_PREFIX = $(STAGING_DIR)/usr%" \ - $(STAGING_DIR)/usr/mkspecs/features/qwtconfig.pri -endef - -define QWT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install INSTALL_ROOT=$(TARGET_DIR) - rm -Rf $(TARGET_DIR)/usr/mkspecs -endef - -$(eval $(generic-package)) diff --git a/package.bak/rabbitmq-c/Config.in b/package.bak/rabbitmq-c/Config.in deleted file mode 100644 index b330c90474..0000000000 --- a/package.bak/rabbitmq-c/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_RABBITMQ_C - bool "rabbitmq-c" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - This is a C-language AMQP client library for use with v2.0+ - of the RabbitMQ broker. - - https://github.com/alanxz/rabbitmq-c - -comment "rabbitmq-c needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/rabbitmq-c/rabbitmq-c.hash b/package.bak/rabbitmq-c/rabbitmq-c.hash deleted file mode 100644 index 45e8cbd822..0000000000 --- a/package.bak/rabbitmq-c/rabbitmq-c.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d8ed9dcb49903d83d79d7b227da35ef68c60e5e0b08d0fc1fb4e4dc577b8802b rabbitmq-c-v0.8.0.tar.gz diff --git a/package.bak/rabbitmq-c/rabbitmq-c.mk b/package.bak/rabbitmq-c/rabbitmq-c.mk deleted file mode 100644 index 1ca35ad00c..0000000000 --- a/package.bak/rabbitmq-c/rabbitmq-c.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# rabbitmq-c -# -################################################################################ - -RABBITMQ_C_VERSION = v0.8.0 -RABBITMQ_C_SITE = $(call github,alanxz,rabbitmq-c,$(RABBITMQ_C_VERSION)) -RABBITMQ_C_LICENSE = MIT -RABBITMQ_C_LICENSE_FILES = LICENSE-MIT -RABBITMQ_C_INSTALL_STAGING = YES -RABBITMQ_C_CONF_OPTS = \ - -DBUILD_API_DOCS=OFF \ - -DBUILD_TOOLS_DOCS=OFF - -ifeq ($(BR2_STATIC_LIBS),y) -RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=OFF -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=ON -else ifeq ($(BR2_SHARED_LIBS),y) -RABBITMQ_C_CONF_OPTS += -DBUILD_SHARED_LIBS=ON -DBUILD_STATIC_LIBS=OFF -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=ON -RABBITMQ_C_DEPENDENCIES += openssl -else -RABBITMQ_C_CONF_OPTS += -DENABLE_SSL_SUPPORT=OFF -endif - -ifeq ($(BR2_PACKAGE_POPT), y) -RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=ON -RABBITMQ_C_DEPENDENCIES += popt -else -RABBITMQ_C_CONF_OPTS += -DBUILD_TOOLS=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/rabbitmq-server/Config.in b/package.bak/rabbitmq-server/Config.in deleted file mode 100644 index 6a323aff92..0000000000 --- a/package.bak/rabbitmq-server/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RABBITMQ_SERVER - bool "rabbitmq-server" - depends on BR2_PACKAGE_ERLANG - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_OPENSSL # Required to build Erlang's crypto and ssl - # applications - help - High-performance AMQP-compliant message broker written in Erlang. - - http://www.rabbitmq.com - -comment "rabbitmq-server needs erlang" - depends on !BR2_PACKAGE_ERLANG diff --git a/package.bak/rabbitmq-server/S50rabbitmq-server b/package.bak/rabbitmq-server/S50rabbitmq-server deleted file mode 100755 index faf248ded2..0000000000 --- a/package.bak/rabbitmq-server/S50rabbitmq-server +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# Start/stop rabbitmq-server -# - -INSTALLUSER=rabbitmq -RUNDIR=/var/run/rabbitmq - -case "$1" in - start) - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" || exit 1 - printf "Starting rabbitmq-server: " - su -c "/usr/sbin/rabbitmq-server -detached" - "$INSTALLUSER" 2>/dev/null - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping rabbitmq-server: " - su -c "/usr/sbin/rabbitmqctl stop" - "$INSTALLUSER" - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart|reload) - "$0" stop || true - "$0" start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/rabbitmq-server/rabbitmq-server.hash b/package.bak/rabbitmq-server/rabbitmq-server.hash deleted file mode 100644 index 3cd412dd0f..0000000000 --- a/package.bak/rabbitmq-server/rabbitmq-server.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 395689bcf57fd48aed452fcd43ff9a992de40067d3ea5c44e14680d69db7b78e rabbitmq-server-3.6.6.tar.xz diff --git a/package.bak/rabbitmq-server/rabbitmq-server.mk b/package.bak/rabbitmq-server/rabbitmq-server.mk deleted file mode 100644 index d55a8cc47c..0000000000 --- a/package.bak/rabbitmq-server/rabbitmq-server.mk +++ /dev/null @@ -1,55 +0,0 @@ -############################################################# -# -# rabbitmq-server -# -############################################################# - -RABBITMQ_SERVER_VERSION = 3.6.6 -RABBITMQ_SERVER_SITE = http://www.rabbitmq.com/releases/rabbitmq-server/v$(RABBITMQ_SERVER_VERSION) -RABBITMQ_SERVER_SOURCE = rabbitmq-server-$(RABBITMQ_SERVER_VERSION).tar.xz -RABBITMQ_SERVER_LICENSE = MPLv1.1, Apache-2.0, BSD-2c, EPL, MIT, MPLv2.0 -RABBITMQ_SERVER_LICENSE_FILES = LICENSE-MPL-RabbitMQ \ - LICENSE LICENSE-APACHE2-ExplorerCanvas \ - LICENSE-APL2-Rebar LICENSE-APL2-Stomp-Websocket \ - LICENSE-BSD-base64js LICENSE-BSD-glMatrix \ - LICENSE-EPL-OTP LICENSE-MIT-EJS10 \ - LICENSE-MIT-Flot LICENSE-MIT-jQuery164 \ - LICENSE-MIT-Mochi LICENSE-MIT-Mochiweb \ - LICENSE-MIT-Sammy060 LICENSE-MIT-SockJS \ - LICENSE-MPL2 -RABBITMQ_SERVER_DEPENDENCIES = host-libxslt host-zip erlang libxslt -RABBITMQ_SERVER_TARGET_BINS = rabbitmq-plugins rabbitmq-server rabbitmqctl rabbitmq-env rabbitmq-defaults - -define RABBITMQ_SERVER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define RABBITMQ_SERVER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install - - for bin in $(RABBITMQ_SERVER_TARGET_BINS); do \ - ln -sf ../lib/erlang/lib/rabbitmq_server-$(RABBITMQ_SERVER_VERSION)/sbin/$$bin \ - $(TARGET_DIR)/usr/sbin/$$bin; \ - done -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/rabbitmq-server/rabbitmq-server.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rabbitmq-server.service - - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - - ln -fs ../../../../usr/lib/systemd/system/rabbitmq-server.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rabbitmq-server.service -endef - -define RABBITMQ_SERVER_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/rabbitmq-server/S50rabbitmq-server \ - $(TARGET_DIR)/etc/init.d/S50rabbitmq-server -endef - -define RABBITMQ_SERVER_USERS - rabbitmq -1 rabbitmq -1 * /var/lib/rabbitmq /bin/sh - rabbitmq-server daemon -endef - -$(eval $(generic-package)) diff --git a/package.bak/rabbitmq-server/rabbitmq-server.service b/package.bak/rabbitmq-server/rabbitmq-server.service deleted file mode 100644 index 268b4bdcd2..0000000000 --- a/package.bak/rabbitmq-server/rabbitmq-server.service +++ /dev/null @@ -1,15 +0,0 @@ -[Unit] -Description=RabbitMQ Messaging Server -After=syslog.target network.target - -[Service] -Type=simple -User=rabbitmq -Group=rabbitmq -Environment=HOME=/var/lib/rabbitmq -WorkingDirectory=/var/lib/rabbitmq -ExecStart=/usr/sbin/rabbitmq-server -ExecStop=/usr/sbin/rabbitmqctl stop - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch b/package.bak/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch deleted file mode 100644 index 6cac55d3eb..0000000000 --- a/package.bak/racehound/0001-Fix-module-install-path-lib-instead-of-usr-lib-prefi.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4f8ed39ddaf17c7dd4ddbdb88e67097f00c98173 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 16 Jul 2015 23:11:25 +0200 -Subject: [PATCH] Fix module install path (/lib instead of /usr/lib prefix) - -Signed-off-by: Peter Seiderer ---- - cmake/modules/path_prefixes.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cmake/modules/path_prefixes.cmake b/cmake/modules/path_prefixes.cmake -index 3cb1fe2..9dc50a4 100644 ---- a/cmake/modules/path_prefixes.cmake -+++ b/cmake/modules/path_prefixes.cmake -@@ -113,7 +113,7 @@ set(RH_INSTALL_PREFIX_DOC - # Set derivative prefixes - - # additional, 1 --set(RH_INSTALL_PREFIX_KMODULE "${RH_INSTALL_PREFIX_LIB}/modules/${KBUILD_VERSION_STRING}/misc") -+set(RH_INSTALL_PREFIX_KMODULE "/lib/modules/${KBUILD_VERSION_STRING}/misc") - # Another variant - #"${RH_INSTALL_PREFIX_LIB}/modules/${KBUILD_VERSION_STRING}/extra") - # additional, 2 --- -2.1.4 - diff --git a/package.bak/racehound/Config.in b/package.bak/racehound/Config.in deleted file mode 100644 index 2d1ccb8381..0000000000 --- a/package.bak/racehound/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_RACEHOUND - bool "racehound" - depends on BR2_LINUX_KERNEL - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR # elfutils - depends on !BR2_STATIC_LIBS # elfutils - depends on BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC # elfutils - # only x86/x86_64 supported - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_ELFUTILS - select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra - help - RaceHound can be used to detect data races in the Linux - kernel on x86. - - RaceHound needs the following kernel configurations enabled: - - CONFIG_X86_32 or CONFIG_X86_64 - - CONFIG_MODULES - - CONFIG_MODULE_UNLOAD - - CONFIG_SYSFS - - CONFIG_DEBUG_FS - - CONFIG_KALLSYMS - - CONFIG_KALLSYMS_ALL - - CONFIG_KPROBES - - https://github.com/winnukem/racehound - -comment "racehound needs an Linux kernel >= 3.14 to be built" - depends on !BR2_LINUX_KERNEL - depends on BR2_i386 || BR2_x86_64 - -comment "racehound needs a uClibc or glibc toolchain w/ C++, wchar, dynamic library" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || BR2_STATIC_LIBS \ - || !(BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package.bak/racehound/racehound.hash b/package.bak/racehound/racehound.hash deleted file mode 100644 index d9a7f061f7..0000000000 --- a/package.bak/racehound/racehound.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 935bc4a7c7b645dee5b905f6e97d0db3f0ac4f48e71d15f4e3982811017ac43c racehound-f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c.tar.gz diff --git a/package.bak/racehound/racehound.mk b/package.bak/racehound/racehound.mk deleted file mode 100644 index 8e282c1e9b..0000000000 --- a/package.bak/racehound/racehound.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# racehound -# -################################################################################ - -RACEHOUND_VERSION = f09f06fcc3c77c8c5541be3ba5be80aa8148ce0c -RACEHOUND_SITE = $(call github,winnukem,racehound,$(RACEHOUND_VERSION)) -RACEHOUND_LICENSE = GPLv2 -RACEHOUND_LICENSE_FILES = LICENSE -RACEHOUND_SUPPORTS_IN_SOURCE_BUILD = NO - -RACEHOUND_DEPENDENCIES = elfutils linux - -# override auto detection (uses host parameters, not cross compile -# ready) -RACEHOUND_CONF_OPTS += \ - -DKERNEL_VERSION_OK=YES \ - -DMODULE_BUILD_SUPPORTED=YES \ - -DKERNEL_CONFIG_OK=YES \ - -DKBUILD_BUILD_DIR=$(LINUX_DIR) \ - -DKBUILD_VERSION_STRING=$(LINUX_VERSION_PROBED) - -# cross compile environment for linux kernel module -RACEHOUND_MAKE_ENV = $(LINUX_MAKE_FLAGS) - -$(eval $(cmake-package)) diff --git a/package.bak/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch b/package.bak/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch deleted file mode 100644 index 44768086cc..0000000000 --- a/package.bak/radvd/0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 324e1ebc7b86f68f49fb4f1c34a4de60d18dd3c1 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Sun, 23 Nov 2014 12:17:11 +0100 -Subject: [PATCH 2/3] Don't force -fstack-protector, the toolchain might lack - support for it - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 80633e7..8b5a2e4 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -43,7 +43,6 @@ DISABLE_WARNINGS = \ - - AM_CFLAGS = \ - -fno-strict-aliasing \ -- -fstack-protector \ - $(ENABLE_WARNINGS) \ - $(DISABLE_WARNINGS) - --- -2.1.0 - diff --git a/package.bak/radvd/Config.in b/package.bak/radvd/Config.in deleted file mode 100644 index 48aeedc08f..0000000000 --- a/package.bak/radvd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_RADVD - bool "radvd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_FLEX - help - IPv6 Router Advertisement Daemon. - - http://www.litech.org/radvd/ diff --git a/package.bak/radvd/S50radvd b/package.bak/radvd/S50radvd deleted file mode 100755 index 9f1407c95a..0000000000 --- a/package.bak/radvd/S50radvd +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/sh - -RADVD=/usr/sbin/radvd - -echo "1" > /proc/sys/net/ipv6/conf/all/forwarding - -printf "Starting radvd: " -if [ ! -x "${RADVD}" ]; then - echo "missing" - exit 1 -fi - -if ${RADVD} ; then - echo "done" -else - echo "failed" - exit 1 -fi diff --git a/package.bak/radvd/radvd.hash b/package.bak/radvd/radvd.hash deleted file mode 100644 index ac6014b776..0000000000 --- a/package.bak/radvd/radvd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.litech.org/radvd/dist/radvd-2.12.tar.gz.sha256 -sha256 b070e77238e789e298a82cba2b1bfb0b0180b4ebc1adfc4e75058adfdbff747b radvd-2.12.tar.xz diff --git a/package.bak/radvd/radvd.mk b/package.bak/radvd/radvd.mk deleted file mode 100644 index 8b6e5b2d01..0000000000 --- a/package.bak/radvd/radvd.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# radvd -# -################################################################################ - -RADVD_VERSION = 2.12 -RADVD_SOURCE = radvd-$(RADVD_VERSION).tar.xz -RADVD_SITE = http://www.litech.org/radvd/dist -RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf -RADVD_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -# For 0002-Don-t-force-fstack-protector-the-toolchain-might-lac.patch -RADVD_AUTORECONF = YES -RADVD_LICENSE = BSD-4c-like -RADVD_LICENSE_FILES = COPYRIGHT - -define RADVD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d/S50radvd -endef - -$(eval $(autotools-package)) diff --git a/package.bak/ramsmp/Config.in b/package.bak/ramsmp/Config.in deleted file mode 100644 index ecab6a46ad..0000000000 --- a/package.bak/ramsmp/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_RAMSMP - bool "ramspeed/smp" - depends on BR2_USE_MMU # fork() - help - RAMspeed/SMP is a free open source command line utility - to measure cache and memory performance of multiprocessor machines. - - http://alasir.com/software/ramspeed/ diff --git a/package.bak/ramsmp/Makefile b/package.bak/ramsmp/Makefile deleted file mode 100644 index 5cd76e09d9..0000000000 --- a/package.bak/ramsmp/Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -all: generic - -generic: ramsmp.c fltmem.c fltmark.c intmem.c intmark.c - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramsmp - -i386: ramsmp.c i386/*.s i386/cpuinfo/*.s - $(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramsmp - -x86_64: ramsmp.c amd64/*.s - $(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramsmp - -clean: - rm -f *.o ramsmp diff --git a/package.bak/ramsmp/ramsmp.hash b/package.bak/ramsmp/ramsmp.hash deleted file mode 100644 index 46aa3f10e7..0000000000 --- a/package.bak/ramsmp/ramsmp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 39fb15493fb3c293575746d56f6ab9faaa1d876d8b1f0d8e5a4042d2ace95839 ramsmp-3.5.0.tar.gz diff --git a/package.bak/ramsmp/ramsmp.mk b/package.bak/ramsmp/ramsmp.mk deleted file mode 100644 index 6098376da5..0000000000 --- a/package.bak/ramsmp/ramsmp.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ramsmp -# -################################################################################ - -RAMSMP_VERSION = 3.5.0 -RAMSMP_SITE = http://www.alasir.com/software/ramspeed -RAMSMP_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64) -RAMSMP_LICENSE = Alasir License -RAMSMP_LICENSE_FILES = LICENCE - -define RAMSMP_BUILD_CMDS - cp -f package/ramsmp/Makefile $(@D) - $(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSMP_ARCH) -endef - -define RAMSMP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/ramsmp $(TARGET_DIR)/usr/bin/ramsmp -endef - -$(eval $(generic-package)) diff --git a/package.bak/ramspeed/Config.in b/package.bak/ramspeed/Config.in deleted file mode 100644 index b236329a84..0000000000 --- a/package.bak/ramspeed/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_RAMSPEED - bool "ramspeed" - help - RAMspeed is a free open source command line utility - to measure cache and memory performance. - - http://alasir.com/software/ramspeed/ diff --git a/package.bak/ramspeed/Makefile b/package.bak/ramspeed/Makefile deleted file mode 100644 index f4a4de6a1e..0000000000 --- a/package.bak/ramspeed/Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -all: generic - -generic: ramspeed.c fltmem.c fltmark.c intmem.c intmark.c - $(CC) $(CFLAGS) $(LDFLAGS) $^ -o ramspeed - -i386: ramspeed.c i386/*.s i386/cpuinfo/*.s - $(CC) $(CFLAGS) -DI386_ASM $(LDFLAGS) $^ -o ramspeed - -x86_64: ramspeed.c amd64/*.s - $(CC) $(CFLAGS) -DAMD64_ASM $(LDFLAGS) $^ -o ramspeed - -clean: - rm -f *.o ramspeed diff --git a/package.bak/ramspeed/ramspeed.hash b/package.bak/ramspeed/ramspeed.hash deleted file mode 100644 index 71052a3491..0000000000 --- a/package.bak/ramspeed/ramspeed.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 f84e2e42b2b6b221ef9b586f6ae63d863db4ff21858e0ce7c84622a7c9522950 ramspeed-2.6.0.tar.gz diff --git a/package.bak/ramspeed/ramspeed.mk b/package.bak/ramspeed/ramspeed.mk deleted file mode 100644 index 7dc4faae7c..0000000000 --- a/package.bak/ramspeed/ramspeed.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# ramspeed -# -################################################################################ - -RAMSPEED_VERSION = 2.6.0 -RAMSPEED_SITE = http://www.alasir.com/software/ramspeed -RAMSPEED_ARCH = $(if $(BR2_i386),i386)$(if $(BR2_x86_64),x86_64) -RAMSPEED_LICENSE = Alasir License -RAMSPEED_LICENSE_FILES = LICENCE - -define RAMSPEED_BUILD_CMDS - cp -f package/ramspeed/Makefile $(@D) - $(TARGET_CONFIGURE_OPTS) make -C $(@D) $(RAMSPEED_ARCH) -endef - -define RAMSPEED_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/ramspeed $(TARGET_DIR)/usr/bin/ramspeed -endef - -$(eval $(generic-package)) diff --git a/package.bak/ranger/0001-colorscheme-check-for-compiled-python-files.patch b/package.bak/ranger/0001-colorscheme-check-for-compiled-python-files.patch deleted file mode 100644 index bde3fee035..0000000000 --- a/package.bak/ranger/0001-colorscheme-check-for-compiled-python-files.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 654e3116825c4d12340613196279fb13a5662113 Mon Sep 17 00:00:00 2001 -From: Thijs Vermeir -Date: Tue, 20 Oct 2015 18:13:36 +0200 -Subject: [PATCH] colorscheme: check for compiled python files - -Some systems only provide *.pyc files - -Patch accepted upstream: -https://github.com/hut/ranger/commit/d69f1ed3207c785d1a39ddd2992f6abb021b7540 - -Signed-off-by: Thijs Vermeir ---- - ranger/gui/colorscheme.py | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ranger/gui/colorscheme.py b/ranger/gui/colorscheme.py -index d6afcac..d2b3b2d 100644 ---- a/ranger/gui/colorscheme.py -+++ b/ranger/gui/colorscheme.py -@@ -86,7 +86,7 @@ def _colorscheme_name_to_class(signal): - usecustom = not ranger.arg.clean - - def exists(colorscheme): -- return os.path.exists(colorscheme + '.py') -+ return os.path.exists(colorscheme + '.py') or os.path.exists(colorscheme + '.pyc') - - def is_scheme(x): - try: --- -2.6.1 - diff --git a/package.bak/ranger/Config.in b/package.bak/ranger/Config.in deleted file mode 100644 index ee0ffecd13..0000000000 --- a/package.bak/ranger/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_RANGER - bool "ranger" - depends on BR2_USE_MMU # python3 - depends on BR2_USE_WCHAR # python3 - depends on BR2_TOOLCHAIN_HAS_THREADS # python3 - depends on !BR2_STATIC_LIBS # python3 - select BR2_PACKAGE_PYTHON3 if !BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_CURSES if BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON3_CURSES if BR2_PACKAGE_PYTHON3 - help - ranger is a console file manager with VI key bindings. It - provides a minimalistic and nice curses interface with a - view on the directory hierarchy. It ships with "rifle", a - file launcher that is good at automatically finding out - which program to use for what file type. - - http://ranger.nongnu.org - -comment "ranger needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ranger/ranger.hash b/package.bak/ranger/ranger.hash deleted file mode 100644 index 30bdbede04..0000000000 --- a/package.bak/ranger/ranger.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 ranger-1.7.2.tar.gz diff --git a/package.bak/ranger/ranger.mk b/package.bak/ranger/ranger.mk deleted file mode 100644 index fd6809a660..0000000000 --- a/package.bak/ranger/ranger.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# ranger -# -################################################################################ - -RANGER_VERSION = 1.7.2 -RANGER_SITE = http://ranger.nongnu.org -RANGER_SETUP_TYPE = distutils -RANGER_LICENSE = GPLv3 -RANGER_LICENSE_FILES = AUTHORS - -# The ranger script request python to be called with -O (optimize generated -# bytecode slightly; also PYTHONOPTIMIZE=x). This implicitly requires the python -# source files to be present. Therefore, the -O flag is removed when only the .pyc -# files are installed. - -define RANGER_DO_NOT_GENERATE_BYTECODE_AT_RUNTIME - $(SED) 's%/usr/bin/python -O%/usr/bin/python%g' $(@D)/scripts/ranger -endef - -ifeq ($(BR2_PACKAGE_PYTHON3_PYC_ONLY)$(BR2_PACKAGE_PYTHON_PYC_ONLY),y) -RANGER_POST_PATCH_HOOKS += RANGER_DO_NOT_GENERATE_BYTECODE_AT_RUNTIME -endif - -$(eval $(python-package)) diff --git a/package.bak/rapidjson/Config.in b/package.bak/rapidjson/Config.in deleted file mode 100644 index b8c8bcf6a6..0000000000 --- a/package.bak/rapidjson/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_RAPIDJSON - bool "rapidjson" - help - A fast JSON parser/generator for C++ with both SAX/DOM style API. - - http://rapidjson.org/ diff --git a/package.bak/rapidjson/rapidjson.hash b/package.bak/rapidjson/rapidjson.hash deleted file mode 100644 index bde8319cd8..0000000000 --- a/package.bak/rapidjson/rapidjson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d7dd4039d0787f8bed98e rapidjson-v1.1.0.tar.gz diff --git a/package.bak/rapidjson/rapidjson.mk b/package.bak/rapidjson/rapidjson.mk deleted file mode 100644 index d06f52962e..0000000000 --- a/package.bak/rapidjson/rapidjson.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# rapidjson -# -################################################################################ - -RAPIDJSON_VERSION = v1.1.0 -RAPIDJSON_SITE = $(call github,miloyip,rapidjson,$(RAPIDJSON_VERSION)) -RAPIDJSON_LICENSE = MIT -RAPIDJSON_LICENSE_FILES = license.txt - -# rapidjson is a header-only C++ library -RAPIDJSON_INSTALL_TARGET = NO -RAPIDJSON_INSTALL_STAGING = YES - -define RAPIDJSON_INSTALL_STAGING_CMDS - cp -dpfr $(@D)/include/* $(STAGING_DIR)/usr/include -endef - -$(eval $(generic-package)) diff --git a/package.bak/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch b/package.bak/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch deleted file mode 100644 index fcf1b3cce6..0000000000 --- a/package.bak/rapidxml/0001-ensure-internal-print-operations-are-declared-before.patch +++ /dev/null @@ -1,38 +0,0 @@ -[PATCH] ensure internal print operations are declared before use - -Stock rapidxml-1.13 does not allow implementers of the -`rapidxml_print.hpp` header to build under GCC 4.7 (or newer) due to -compliation issues. This is a result of "Name lookup changes" introduced -in GCC 4.7 [1]. The following adds forward declarations required to -compile with GCC 4.7+. - -This issue has been mentioned upstream [2], but it has yet to be fixed -in official sources. - -[1]: https://gcc.gnu.org/gcc-4.7/porting_to.html -[2]: https://sourceforge.net/p/rapidxml/bugs/16/ - -Signed-off-by: James Knight - -Index: b/rapidxml_print.hpp -=================================================================== ---- a/rapidxml_print.hpp -+++ b/rapidxml_print.hpp -@@ -101,7 +101,16 @@ - - /////////////////////////////////////////////////////////////////////////// - // Internal printing operations -- -+ -+ template inline OutIt print_cdata_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_children(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_comment_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_data_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_declaration_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_doctype_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_element_node(OutIt out, const xml_node *node, int flags, int indent); -+ template inline OutIt print_pi_node(OutIt out, const xml_node *node, int flags, int indent); -+ - // Print node - template - inline OutIt print_node(OutIt out, const xml_node *node, int flags, int indent) diff --git a/package.bak/rapidxml/Config.in b/package.bak/rapidxml/Config.in deleted file mode 100644 index 76b2248ec2..0000000000 --- a/package.bak/rapidxml/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_RAPIDXML - bool "rapidxml" - help - RapidXml is an attempt to create the fastest XML parser - possible, while retaining useability, portability and - reasonable W3C compatibility. It is an in-situ parser with - parsing speed approaching speed of strlen function executed - on the same data. - - http://sourceforge.net/projects/rapidxml/ - https://en.wikipedia.org/wiki/RapidXml diff --git a/package.bak/rapidxml/rapidxml.hash b/package.bak/rapidxml/rapidxml.hash deleted file mode 100644 index 81919f0373..0000000000 --- a/package.bak/rapidxml/rapidxml.hash +++ /dev/null @@ -1,6 +0,0 @@ -# From https://sourceforge.net/projects/rapidxml/files/rapidxml/rapidxml%201.13/ -sha1 f5fd4fbc5ad7e96045313697811d65ea8089a950 rapidxml-1.13.zip -md5 7b4b42c9331c90aded23bb55dc725d6a rapidxml-1.13.zip - -# Locally calculated -sha256 c3f0b886374981bb20fabcf323d755db4be6dba42064599481da64a85f5b3571 rapidxml-1.13.zip diff --git a/package.bak/rapidxml/rapidxml.mk b/package.bak/rapidxml/rapidxml.mk deleted file mode 100644 index a76a21b4f5..0000000000 --- a/package.bak/rapidxml/rapidxml.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# rapidxml -# -################################################################################ - -RAPIDXML_VERSION = 1.13 -RAPIDXML_SOURCE = rapidxml-$(RAPIDXML_VERSION).zip -RAPIDXML_SITE = http://downloads.sourceforge.net/project/rapidxml/rapidxml/rapidxml%20$(RAPIDXML_VERSION) -RAPIDXML_LICENSE = Boost Software License 1.0 or MIT -RAPIDXML_LICENSE_FILES = license.txt - -# C++ headers only -RAPIDXML_INSTALL_TARGET = NO -RAPIDXML_INSTALL_STAGING = YES - -define RAPIDXML_EXTRACT_CMDS - $(UNZIP) -d $(@D) $(DL_DIR)/$(RAPIDXML_SOURCE) - mv $(@D)/rapidxml-$(RAPIDXML_VERSION)/* $(@D)/ - rmdir $(@D)/rapidxml-$(RAPIDXML_VERSION) -endef - -define RAPIDXML_INSTALL_STAGING_CMDS - cp -dpfr $(@D)/*hpp $(STAGING_DIR)/usr/include -endef - -$(eval $(generic-package)) diff --git a/package.bak/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch b/package.bak/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch deleted file mode 100644 index 7367ad2332..0000000000 --- a/package.bak/raptor/0001-configure.ac-remove-conditional-lib-inclusion.patch +++ /dev/null @@ -1,21 +0,0 @@ -Removed header Include path from the configure file as path was -from the host, which is wrong for the cross compilation. -Upstream: None - -Signed-off-by: Nitin Mendiratta - -diff --git a/configure.ac b/configure.ac -index 10ff870..27b9957 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1145,9 +1145,7 @@ have_lininn=no - have_inn_parsedate=no - - oCPPFLAGS="$CPPFLAGS" --if test -d /usr/include/inn; then -- CPPFLAGS="$CPPFLAGS -I/usr/include/inn" --fi -+ - AC_CHECK_HEADER(libinn.h) - CPPFLAGS="$oCPPFLAGS" - diff --git a/package.bak/raptor/Config.in b/package.bak/raptor/Config.in deleted file mode 100644 index 65979a2b1f..0000000000 --- a/package.bak/raptor/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_RAPTOR - bool "raptor" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - help - A C library that provides a set of parsers and - serializers that generate Resource Description - Framework (RDF) triples by parsing syntaxes or - serialize the triples into a syntax. - - http://librdf.org/raptor/ diff --git a/package.bak/raptor/raptor.hash b/package.bak/raptor/raptor.hash deleted file mode 100644 index ee7a71b4cf..0000000000 --- a/package.bak/raptor/raptor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed raptor2-2.0.15.tar.gz diff --git a/package.bak/raptor/raptor.mk b/package.bak/raptor/raptor.mk deleted file mode 100644 index aea14e393f..0000000000 --- a/package.bak/raptor/raptor.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# raptor -# -################################################################################ - -RAPTOR_VERSION = 2.0.15 -RAPTOR_SOURCE = raptor2-$(RAPTOR_VERSION).tar.gz -RAPTOR_SITE = http://download.librdf.org/source -RAPTOR_DEPENDENCIES = libxml2 libxslt -RAPTOR_LICENSE = GPLv2+ or LGPLv2.1+ or Apache-2.0+ -RAPTOR_LICENSE_FILES = LICENSE.txt - -# Flag is added to make sure the patch is applied for the configure.ac of raptor. -RAPTOR_AUTORECONF = YES - -RAPTOR_CONF_OPTS =\ - --with-xml2-config=$(STAGING_DIR)/usr/bin/xml2-config \ - --with-xslt-config=$(STAGING_DIR)/usr/bin/xslt-config - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -RAPTOR_DEPENDENCIES += libcurl -RAPTOR_CONF_OPTS += --with-curl-config=$(STAGING_DIR)/usr/bin/curl-config -else -RAPTOR_CONF_OPTS += --with-curl-config=no -endif - -ifeq ($(BR2_PACKAGE_YAJL),y) -RAPTOR_DEPENDENCIES += yajl -RAPTOR_CONF_ENV += LIBS="-lm" -RAPTOR_CONF_OPTS += --with-yajl=$(STAGING_DIR)/usr -else -RAPTOR_CONF_OPTS += --with-yajl=no -endif - -ifeq ($(BR2_PACKAGE_ICU),y) -RAPTOR_DEPENDENCIES += icu -RAPTOR_CONF_OPTS += --with-icu-config=$(STAGING_DIR)/usr/bin/icu-config -else -RAPTOR_CONF_OPTS += --with-icu-config=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch b/package.bak/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch deleted file mode 100644 index cdab6070c2..0000000000 --- a/package.bak/raspberrypi-usbboot/0001-Makefile-allow-passing-CFLAGS-LDFLAGS.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 5b015e67af27679f4ca8f7f5f2f71020ec054b0c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:09:44 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS/LDFLAGS - -This might be needed to pass some custom CFLAGS/LDFLAGS when building -rpiboot. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 3e7d1e4..d9a7220 100755 ---- a/Makefile -+++ b/Makefile -@@ -1,5 +1,5 @@ - rpiboot: main.c -- $(CC) -g -o $@ $< -lusb-1.0 -+ $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) - - install: rpiboot - cp rpiboot /usr/bin --- -2.7.4 - diff --git a/package.bak/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch b/package.bak/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch deleted file mode 100644 index c37d5a1e0a..0000000000 --- a/package.bak/raspberrypi-usbboot/0002-Makefile-add-DESTDIR-support.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 905bc741b189d67160b27551b8ad01459c2707a0 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:10:37 +0100 -Subject: [PATCH] Makefile: add DESTDIR support - -This allows installing rpiboot outside of /usr if needed. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni ---- - Makefile | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/Makefile b/Makefile -index d9a7220..7835b7f 100755 ---- a/Makefile -+++ b/Makefile -@@ -2,18 +2,18 @@ rpiboot: main.c - $(CC) -g $(CFLAGS) -o $@ $< -lusb-1.0 $(LDFLAGS) - - install: rpiboot -- cp rpiboot /usr/bin -- mkdir -p /usr/share/rpiboot -- cp usbbootcode.bin /usr/share/rpiboot -- cp msd.elf /usr/share/rpiboot -- cp buildroot.elf /usr/share/rpiboot -+ cp rpiboot $(DESTDIR)/usr/bin -+ mkdir -p $(DESTDIR)//usr/share/rpiboot -+ cp usbbootcode.bin $(DESTDIR)/usr/share/rpiboot -+ cp msd.elf $(DESTDIR)/usr/share/rpiboot -+ cp buildroot.elf $(DESTDIR)/usr/share/rpiboot - - uninstall: -- rm -f /usr/bin/rpiboot -- rm -f /usr/share/rpiboot/usbbootcode.bin -- rm -f /usr/share/rpiboot/msd.elf -- rm -f /usr/share/rpiboot/buildroot.elf -- rmdir --ignore-fail-on-non-empty /usr/share/rpiboot/ -+ rm -f $(DESTDIR)/usr/bin/rpiboot -+ rm -f $(DESTDIR)/usr/share/rpiboot/usbbootcode.bin -+ rm -f $(DESTDIR)/usr/share/rpiboot/msd.elf -+ rm -f $(DESTDIR)/usr/share/rpiboot/buildroot.elf -+ rmdir --ignore-fail-on-non-empty $(DESTDIR)/usr/share/rpiboot/ - - clean: - rm rpiboot --- -2.7.4 - diff --git a/package.bak/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch b/package.bak/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch deleted file mode 100644 index 30cde49f34..0000000000 --- a/package.bak/raspberrypi-usbboot/0003-main.c-rework-logic-to-find-def1-def2-and-def3-files.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 935894908dc24acda0acea7d211a9d80e55ecadb Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 2 Dec 2016 23:43:23 +0100 -Subject: [PATCH] main.c: rework logic to find def1, def2 and def3 files - -The current logic to find def1, def2 and def3 first tries to find them -in the local directory, and if they are not available, find them in -/usr/share. - -However, this doesn't work if rpiboot and its related files are -installed, but not in /usr. In order to address this use-case, this -commit reworks the logic to find the file path. - -A new function, getfilepath() is created. If the requested file is -available in the current directory, it is used. If not, then the path to -the file is inferred from the location of the currently running -program. I.e if we run /home/foo/sys/bin/rpiboot, then we will search -def1 in usbbootcode.bin in -/home/foo/sys/bin/../share/rpiboot/usbbootcode.bin. - -This continues to address the case of an installation in /usr, while -allowing installation in other locations as well. - -Submitted-upstream: https://github.com/raspberrypi/usbboot/pull/2 -Signed-off-by: Thomas Petazzoni ---- - main.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 48 insertions(+), 13 deletions(-) - -diff --git a/main.c b/main.c -index 1b4e042..7c571d6 100755 ---- a/main.c -+++ b/main.c -@@ -1,10 +1,12 @@ --#include "libusb-1.0/libusb.h" -+#define _GNU_SOURCE - #include - #include - #include -- -+#include - #include - -+#include "libusb-1.0/libusb.h" -+ - int verbose = 0; - int out_ep = 1; - int in_ep = 2; -@@ -146,6 +148,37 @@ int ep_read(unsigned char *buf, int len, libusb_device_handle * usb_device) - return len; - } - -+char *getfilepath(char *filename) -+{ -+ char *progpath, *filepath, *progdir; -+ ssize_t len; -+ -+ /* If file is available locally, use it */ -+ if (access(filename, F_OK) != -1) -+ return filename; -+ -+ /* Otherwise, use the installed version */ -+ progpath = malloc(PATH_MAX); -+ len = readlink("/proc/self/exe", progpath, PATH_MAX - 1); -+ if (len == -1) -+ { -+ free(progpath); -+ return NULL; -+ } -+ -+ progpath[len] = '\0'; -+ progdir = dirname(progpath); -+ if (asprintf(&filepath, "%s/../share/rpiboot/%s", progdir, filename) < 0) -+ { -+ free(progpath); -+ return NULL; -+ } -+ -+ free(progpath); -+ -+ return filepath; -+} -+ - int main(int argc, char *argv[]) - { - int result; -@@ -157,13 +190,9 @@ int main(int argc, char *argv[]) - int last_serial = -1; - FILE *fp1, *fp2, *fp; - -- char def1_inst[] = "/usr/share/rpiboot/usbbootcode.bin"; -- char def2_inst[] = "/usr/share/rpiboot/msd.elf"; -- char def3_inst[] = "/usr/share/rpiboot/buildroot.elf"; -- -- char def1_loc[] = "./usbbootcode.bin"; -- char def2_loc[] = "./msd.elf"; -- char def3_loc[] = "./buildroot.elf"; -+ char def1_name[] = "usbbootcode.bin"; -+ char def2_name[] = "msd.elf"; -+ char def3_name[] = "buildroot.elf"; - - char *def1, *def2, *def3; - -@@ -171,10 +200,16 @@ int main(int argc, char *argv[]) - char *fatimage = NULL, *executable = NULL; - int loop = 0; - --// if local file version exists use it else use installed -- if( access( def1_loc, F_OK ) != -1 ) { def1 = def1_loc; } else { def1 = def1_inst; } -- if( access( def2_loc, F_OK ) != -1 ) { def2 = def2_loc; } else { def2 = def2_inst; } -- if( access( def3_loc, F_OK ) != -1 ) { def3 = def3_loc; } else { def3 = def3_inst; } -+ def1 = getfilepath(def1_name); -+ def2 = getfilepath(def2_name); -+ def3 = getfilepath(def3_name); -+ -+ if (!def1 || !def2 || !def3) -+ { -+ fprintf(stderr, "One of %s, %s or %s cannot be found\n", -+ def1_name, def2_name, def3_name); -+ exit(1); -+ } - - stage1 = def1; - stage2 = def2; --- -2.7.4 - diff --git a/package.bak/raspberrypi-usbboot/Config.in.host b/package.bak/raspberrypi-usbboot/Config.in.host deleted file mode 100644 index dce2fccd54..0000000000 --- a/package.bak/raspberrypi-usbboot/Config.in.host +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_HOST_RASPBERRYPI_USBBOOT - bool "host raspberrypi-usbboot" - depends on BR2_arm - help - This package builds and install the "rpiboot" tool for the - host machine. This tool allows to boot the Broadcom BCM - processor used in the RaspberryPi to boot over USB, and have - it expose a USB mass storage device in order to reflash the - built-in storage of the RaspberryPi (useful for the eMMC - built into the Compute module). - - https://github.com/raspberrypi/usbboot diff --git a/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.hash b/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.hash deleted file mode 100644 index 94860a9dab..0000000000 --- a/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a8893f8a10522bd58866eb34e7f0d7731c43200d585f122681f428cdef76e676 raspberrypi-usbboot-f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051.tar.gz diff --git a/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.mk b/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.mk deleted file mode 100644 index 7018617906..0000000000 --- a/package.bak/raspberrypi-usbboot/raspberrypi-usbboot.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# raspberrypi-usbboot -# -################################################################################ - -RASPBERRYPI_USBBOOT_VERSION = f4e3f0f9a3c64d846ba53ec3367e33a4f9a7d051 -RASPBERRYPI_USBBOOT_SITE = $(call github,raspberrypi,usbboot,$(RASPBERRYPI_USBBOOT_VERSION)) - -HOST_RASPBERRYPI_USBBOOT_DEPENDENCIES = host-libusb - -define HOST_RASPBERRYPI_USBBOOT_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -endef - -define HOST_RASPBERRYPI_USBBOOT_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ - DESTDIR=$(HOST_DIR) install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/rdesktop/0001-8bit-colors.patch b/package.bak/rdesktop/0001-8bit-colors.patch deleted file mode 100644 index 710f8debef..0000000000 --- a/package.bak/rdesktop/0001-8bit-colors.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -urpN rdesktop-1.5.0-orig/xwin.c rdesktop-1.5.0/xwin.c ---- rdesktop-1.5.0-orig/xwin.c 2007-01-17 12:01:18.000000000 +0100 -+++ rdesktop-1.5.0/xwin.c 2007-01-17 12:05:02.000000000 +0100 -@@ -1461,7 +1461,7 @@ select_visual(int screen_num) - } - - /* we use a colourmap, so the default visual should do */ -- g_owncolmap = True; -+// g_owncolmap = True; - g_visual = vmatches[0].visual; - g_depth = vmatches[0].depth; - } -@@ -1568,7 +1568,7 @@ ui_init(void) - { - g_xcolmap = - XCreateColormap(g_display, RootWindowOfScreen(g_screen), g_visual, -- AllocNone); -+ (g_depth <= 8) ? AllocAll : AllocNone); - if (g_depth <= 8) - warning("Display colour depth is %d bit: you may want to use -C for a private colourmap.\n", g_depth); - } diff --git a/package.bak/rdesktop/Config.in b/package.bak/rdesktop/Config.in deleted file mode 100644 index f683ed314e..0000000000 --- a/package.bak/rdesktop/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_RDESKTOP - bool "rdesktop" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - depends on BR2_PACKAGE_XORG7 - help - rdesktop is an open source client for Windows NT Terminal - Server and Windows 2000/2003 Terminal Services, capable of - natively speaking Remote Desktop Protocol (RDP) in order to - present the user's NT desktop. - - http://rdesktop.sf.net/ diff --git a/package.bak/rdesktop/rdesktop.hash b/package.bak/rdesktop/rdesktop.hash deleted file mode 100644 index cc1f55b771..0000000000 --- a/package.bak/rdesktop/rdesktop.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/rdesktop/files/rdesktop/1.8.3/ -md5 86e8b368a7c715e74ded92e0d7912dc5 rdesktop-1.8.3.tar.gz -sha1 aa1e56043782e04a0121357b24874e3ad6ae7b1d rdesktop-1.8.3.tar.gz diff --git a/package.bak/rdesktop/rdesktop.mk b/package.bak/rdesktop/rdesktop.mk deleted file mode 100644 index 79187b5c37..0000000000 --- a/package.bak/rdesktop/rdesktop.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# rdesktop -# -################################################################################ - -RDESKTOP_VERSION = 1.8.3 -RDESKTOP_SITE = http://downloads.sourceforge.net/project/rdesktop/rdesktop/$(RDESKTOP_VERSION) -RDESKTOP_DEPENDENCIES = host-pkgconf openssl xlib_libX11 xlib_libXt \ - $(if $(BR2_PACKAGE_ALSA_LIB_PCM),alsa-lib) \ - $(if $(BR2_PACKAGE_LIBAO),libao) \ - $(if $(BR2_PACKAGE_LIBSAMPLERATE),libsamplerate) -RDESKTOP_CONF_OPTS = --with-openssl=$(STAGING_DIR)/usr --disable-credssp -RDESKTOP_LICENSE = GPLv3+ -RDESKTOP_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PCSC_LITE),y) -RDESKTOP_DEPENDENCIES += pcsc-lite -else -RDESKTOP_CONF_OPTS += --disable-smartcard -endif - -$(eval $(autotools-package)) diff --git a/package.bak/read-edid/0001-Fix-install-file-list.patch b/package.bak/read-edid/0001-Fix-install-file-list.patch deleted file mode 100644 index 622e97daa8..0000000000 --- a/package.bak/read-edid/0001-Fix-install-file-list.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 562f48bee3443bda0ac257f2b0c52a72208163e0 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Mon, 7 Dec 2015 21:20:38 +0100 -Subject: [PATCH] Fix install file list. - -Fixes: - CMake Error at cmake_install.cmake:40 (file): - file INSTALL cannot find - ".../build/read-edid-3.0.2/COPYING". - -Signed-off-by: Peter Seiderer ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7bf4561..2b9bc86 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,5 +13,5 @@ endif () - add_subdirectory (parse-edid) - - INSTALL(FILES get-edid.1 DESTINATION share/man/man1) --INSTALL(FILES AUTHORS ChangeLog COPYING README DESTINATION -+INSTALL(FILES AUTHORS ChangeLog README DESTINATION - share/doc/read-edid) --- -2.1.4 - diff --git a/package.bak/read-edid/0002-Fix-compiler-check.patch b/package.bak/read-edid/0002-Fix-compiler-check.patch deleted file mode 100644 index 6c5f58c0bd..0000000000 --- a/package.bak/read-edid/0002-Fix-compiler-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix compiler check - -By default CMake looks for c++ which the project does not need. - -Patch by Thomas: -http://lists.busybox.net/pipermail/buildroot/2015-December/146865.html - -Signed-off-by: Bernd Kuhls - -diff -uNr read-edid-3.0.2.org/CMakeLists.txt read-edid-3.0.2/CMakeLists.txt ---- read-edid-3.0.2.org/CMakeLists.txt 2014-02-05 17:27:26.000000000 +0100 -+++ read-edid-3.0.2/CMakeLists.txt 2015-12-13 16:08:43.000000000 +0100 -@@ -1,5 +1,5 @@ - cmake_minimum_required (VERSION 2.6) --project (read-edid) -+project (read-edid C) - - option(I2CBUILD "Build I2C get-edid implementation" ON) - option(CLASSICBUILD "Build VBE get-edid implementation" ON) diff --git a/package.bak/read-edid/Config.in b/package.bak/read-edid/Config.in deleted file mode 100644 index c830e17f1f..0000000000 --- a/package.bak/read-edid/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_READ_EDID - bool "read-edid" - help - Read-edid is a pair of tools for reading the EDID from a - monitor. It should work with most monitors made since 1996 - (except for newer ones with 256-byte EDID's - WiP), assuming - the video card supports the standard read commands (most - do). Read-edid is a set of two tools - get-edid, which gets - the raw edid information from the monitor, and parse-edid, - which turns the raw binary information into an - XF86Config-compatible monitor section. - - http://polypux.org/projects/read-edid/ diff --git a/package.bak/read-edid/read-edid.hash b/package.bak/read-edid/read-edid.hash deleted file mode 100644 index 30052171e1..0000000000 --- a/package.bak/read-edid/read-edid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c7c6d8440f5b90f98e276829271ccea5b2ff5a3413df8a0f87ec09f834af186f read-edid-3.0.2.tar.gz diff --git a/package.bak/read-edid/read-edid.mk b/package.bak/read-edid/read-edid.mk deleted file mode 100644 index 3e38f503fd..0000000000 --- a/package.bak/read-edid/read-edid.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# read-edid -# -################################################################################ - -READ_EDID_VERSION = 3.0.2 -READ_EDID_SITE = http://www.polypux.org/projects/read-edid -READ_EDID_LICENSE = BSD-like -READ_EDID_LICENSE_FILES = LICENSE - -# disable classic get-edid support (needs libx86) -READ_EDID_CONF_OPTS += -DCLASSICBUILD=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/readline/0000-curses-link.patch b/package.bak/readline/0000-curses-link.patch deleted file mode 100644 index 56b4770220..0000000000 --- a/package.bak/readline/0000-curses-link.patch +++ /dev/null @@ -1,16 +0,0 @@ -link readline directly to ncurses since it needs symbols from it - -upstream readline does this on purpose (no direct linking), but -it doesn't make much sense in a Linux world - ---- a/support/shobj-conf -+++ b/support/shobj-conf -@@ -42,7 +42,7 @@ - SHOBJ_LIBS= - - SHLIB_XLDFLAGS= --SHLIB_LIBS= -+SHLIB_LIBS=-lncurses - - SHLIB_DOT='.' - SHLIB_LIBPREF='lib' diff --git a/package.bak/readline/Config.in b/package.bak/readline/Config.in deleted file mode 100644 index 1cb0672cf1..0000000000 --- a/package.bak/readline/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_READLINE - bool "readline" - select BR2_PACKAGE_NCURSES - help - The GNU Readline library provides a set of functions for use - by applications that allow users to edit command lines - as they are typed in. - - https://cnswww.cns.cwru.edu/php/chet/readline/rltop.html diff --git a/package.bak/readline/inputrc b/package.bak/readline/inputrc deleted file mode 100644 index 2f1cb601a5..0000000000 --- a/package.bak/readline/inputrc +++ /dev/null @@ -1,44 +0,0 @@ -# /etc/inputrc - global inputrc for libreadline -# See readline(3readline) and `info readline' for more information. - -# Be 8 bit clean. -set input-meta on -set output-meta on -set bell-style visible - -# To allow the use of 8bit-characters like the german umlauts, comment out -# the line below. However this makes the meta key not work as a meta key, -# which is annoying to those which don't need to type in 8-bit characters. - -# set convert-meta off - -"\e0d": backward-word -"\e0c": forward-word -"\e[h": beginning-of-line -"\e[f": end-of-line -"\e[1~": beginning-of-line -"\e[4~": end-of-line -#"\e[5~": beginning-of-history -#"\e[6~": end-of-history -"\e[3~": delete-char -"\e[2~": quoted-insert - -# Common standard keypad and cursor -# (codes courtsey Werner Fink, ) -#"\e[1~": history-search-backward -"\e[2~": yank -"\e[3~": delete-char -#"\e[4~": set-mark -"\e[5~": history-search-backward -"\e[6~": history-search-forward -# Normal keypad and cursor of xterm -"\e[F": end-of-line -"\e[H": beginning-of-line -# Application keypad and cursor of xterm -"\eOA": previous-history -"\eOC": forward-char -"\eOB": next-history -"\eOD": backward-char -"\eOF": end-of-line -"\eOH": beginning-of-line - diff --git a/package.bak/readline/readline.hash b/package.bak/readline/readline.hash deleted file mode 100644 index 43f8c64bb2..0000000000 --- a/package.bak/readline/readline.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334 readline-7.0.tar.gz diff --git a/package.bak/readline/readline.mk b/package.bak/readline/readline.mk deleted file mode 100644 index ed4e1442ee..0000000000 --- a/package.bak/readline/readline.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# readline -# -################################################################################ - -READLINE_VERSION = 7.0 -READLINE_SITE = $(BR2_GNU_MIRROR)/readline -READLINE_INSTALL_STAGING = YES -READLINE_DEPENDENCIES = ncurses -HOST_READLINE_DEPENDENCIES = host-ncurses -READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes \ - bash_cv_wcwidth_broken=no -READLINE_LICENSE = GPLv3+ -READLINE_LICENSE_FILES = COPYING - -define READLINE_PURGE_EXAMPLES - rm -rf $(TARGET_DIR)/usr/share/readline -endef -READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES - -define READLINE_INSTALL_INPUTRC - $(INSTALL) -D -m 644 package/readline/inputrc $(TARGET_DIR)/etc/inputrc -endef -READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_INPUTRC - -ifneq ($(BR2_STATIC_LIBS),y) -# libraries get installed read only, so strip fails -define READLINE_INSTALL_FIXUPS_SHARED - chmod +w $(addprefix $(TARGET_DIR)/usr/lib/,libhistory.so.* libreadline.so.*) -endef -READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_INSTALL_FIXUPS_SHARED -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/redis/0001-uclibc.patch b/package.bak/redis/0001-uclibc.patch deleted file mode 100644 index a0534d5748..0000000000 --- a/package.bak/redis/0001-uclibc.patch +++ /dev/null @@ -1,23 +0,0 @@ -redis-001-uclibc.patch: This patch fixes redis so that it can be compiled -against uclibc. Patch originates from: - - Support cross-compiling for uClibc targets - https://github.com/antirez/redis/pull/537 - Mike Steinert, mike.steinert@gmail.com - -Signed-off-by: Daniel Price -[Martin: adapt to 3.0.3] -Signed-off-by: Martin Bark - -========================================================================= -diff -ur old/src/config.h new/src/config.h ---- old/src/config.h 2012-10-26 07:20:24.000000000 -0700 -+++ new/src/config.h 2012-10-31 13:41:51.206309564 -0700 -@@ -62,7 +62,7 @@ - #endif - - /* Test for backtrace() */ --#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__)) -+#if defined(__APPLE__) || (defined(__linux__) && defined(__GLIBC__) && !defined(__UCLIBC__)) - #define HAVE_BACKTRACE 1 - #endif diff --git a/package.bak/redis/0002-largefile-conditional-define.patch b/package.bak/redis/0002-largefile-conditional-define.patch deleted file mode 100644 index 747e0552b3..0000000000 --- a/package.bak/redis/0002-largefile-conditional-define.patch +++ /dev/null @@ -1,32 +0,0 @@ -Define _LARGEFILE_SOURCE and _FILE_OFFSET_BITS conditionally - -In order to avoid ugly warnings at compile time, only define -_LARGEFILE_SOURCE and _FILE_OFFSET_BITS if they have not already been -defined through the build command line. - -Avoids: - - In file included from redis.h:33:0, - from migrate.c:1: - fmacros.h:45:0: warning: "_LARGEFILE_SOURCE" redefined - :0:0: note: this is the location of the previous definition - -Signed-off-by: Thomas Petazzoni - -Index: redis-2.6.11/src/fmacros.h -=================================================================== ---- redis-2.6.11.orig/src/fmacros.h 2013-03-25 22:09:15.000000000 +0100 -+++ redis-2.6.11/src/fmacros.h 2013-03-25 22:09:40.000000000 +0100 -@@ -42,7 +42,12 @@ - #define _XOPEN_SOURCE - #endif - -+#ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE -+#endif -+ -+#ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 -+#endif - - #endif diff --git a/package.bak/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch b/package.bak/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch deleted file mode 100644 index 6ad81a493d..0000000000 --- a/package.bak/redis/0003-redis.conf-adjust-defauts-for-buildroot.patch +++ /dev/null @@ -1,29 +0,0 @@ -From f79d1d1bf9e6f54b67e5482602084fbff7fd9cc9 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Fri, 28 Oct 2016 12:50:34 -0300 -Subject: [PATCH] redis.conf: adjust defauts for buildroot - -Based on Martin Bark's patch hence archlinux package. -We just need to specify a proper db directory. - -Signed-off-by: Gustavo Zacarias ---- - redis.conf | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/redis.conf b/redis.conf -index 22e00bc..3bb0430 100644 ---- a/redis.conf -+++ b/redis.conf -@@ -244,7 +244,7 @@ dbfilename dump.rdb - # The Append Only File will also be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - --- -2.7.3 - diff --git a/package.bak/redis/Config.in b/package.bak/redis/Config.in deleted file mode 100644 index 5d7edd8139..0000000000 --- a/package.bak/redis/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_REDIS - bool "redis" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Redis is an open source, advanced key-value store. It is - often referred to as a data structure server since keys can - contain strings, hashes, lists, sets and sorted sets. - - http://www.redis.io - -comment "redis needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/redis/S50redis b/package.bak/redis/S50redis deleted file mode 100644 index ae2a34174d..0000000000 --- a/package.bak/redis/S50redis +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# start redis -# - -start() { - printf "Starting redis: " - umask 077 - start-stop-daemon -S -q -c redis:redis -b \ - --exec /usr/bin/redis-server -- /etc/redis.conf - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -stop() { - printf "Stopping redis: " - /usr/bin/redis-cli shutdown - [ $? = 0 ] && echo "OK" || echo "FAIL" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/redis/redis.hash b/package.bak/redis/redis.hash deleted file mode 100644 index 3cd86470bd..0000000000 --- a/package.bak/redis/redis.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/antirez/redis-hashes/blob/master/README -sha1 6780d1abb66f33a97aad0edbe020403d0a15b67f redis-3.2.8.tar.gz -# Calculated based on the hash above -sha256 61b373c23d18e6cc752a69d5ab7f676c6216dc2853e46750a8c4ed791d68482c redis-3.2.8.tar.gz diff --git a/package.bak/redis/redis.mk b/package.bak/redis/redis.mk deleted file mode 100644 index 8ab6e726e3..0000000000 --- a/package.bak/redis/redis.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# redis -# -################################################################################ - -REDIS_VERSION = 3.2.8 -REDIS_SITE = http://download.redis.io/releases -REDIS_LICENSE = BSD-3c (core); MIT and BSD family licenses (Bundled components) -REDIS_LICENSE_FILES = COPYING - -define REDIS_USERS - redis -1 redis -1 * /var/lib/redis /bin/false - Redis Server -endef - -# Uses __atomic_fetch_add_4 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -REDIS_LIBATOMIC = -latomic -endif - -# Redis doesn't support DESTDIR (yet, see -# https://github.com/antirez/redis/pull/609). We set PREFIX -# instead. -REDIS_BUILDOPTS = $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(TARGET_LDFLAGS) $(REDIS_LIBATOMIC)" \ - PREFIX=$(TARGET_DIR)/usr MALLOC=libc \ - -define REDIS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) -endef - -define REDIS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(REDIS_BUILDOPTS) -C $(@D) \ - LDCONFIG=true install - $(INSTALL) -D -m 0644 $(@D)/redis.conf \ - $(TARGET_DIR)/etc/redis.conf -endef - -define REDIS_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/redis/S50redis \ - $(TARGET_DIR)/etc/init.d/S50redis -endef - -define REDIS_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/redis/redis.service \ - $(TARGET_DIR)/usr/lib/systemd/system/redis.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/redis.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/redis.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/redis/redis.service b/package.bak/redis/redis.service deleted file mode 100644 index 0a8162b8ab..0000000000 --- a/package.bak/redis/redis.service +++ /dev/null @@ -1,22 +0,0 @@ -[Unit] -Description=Advanced key-value store -After=network.target - -[Service] -Type=simple -User=redis -Group=redis -ExecStart=/usr/bin/redis-server /etc/redis.conf -ExecStop=/usr/bin/redis-cli shutdown -CapabilityBoundingSet= -PrivateTmp=true -PrivateDevices=true -ProtectSystem=full -ProtectHome=true -NoNewPrivileges=true -RuntimeDirectory=redis -RuntimeDirectoryMode=755 -LimitNOFILE=10032 - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/rfkill/Config.in b/package.bak/rfkill/Config.in deleted file mode 100644 index 0d079138b8..0000000000 --- a/package.bak/rfkill/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_RFKILL - bool "rfkill" - help - rfkill is a small userspace tool to query the state of the - rfkill switches. - - https://wireless.wiki.kernel.org/en/users/documentation/rfkill diff --git a/package.bak/rfkill/rfkill.hash b/package.bak/rfkill/rfkill.hash deleted file mode 100644 index 21be0a2074..0000000000 --- a/package.bak/rfkill/rfkill.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: https://www.kernel.org/pub/software/network/rfkill/sha256sums.asc -sha256 e0ae3004215e39a6c5c36e0726558740728d16f67ebdb8bea621250f6091d86a rfkill-0.5.tar.xz diff --git a/package.bak/rfkill/rfkill.mk b/package.bak/rfkill/rfkill.mk deleted file mode 100644 index 2f9fe9f9a1..0000000000 --- a/package.bak/rfkill/rfkill.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# rfkill -# -################################################################################ - -RFKILL_VERSION = 0.5 -RFKILL_SOURCE = rfkill-$(RFKILL_VERSION).tar.xz -RFKILL_SITE = https://www.kernel.org/pub/software/network/rfkill -RFKILL_LICENSE = ISC -RFKILL_LICENSE_FILES = COPYING - -define RFKILL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - VERSION_SUFFIX="br" -endef - -define RFKILL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/riemann-c-client/Config.in b/package.bak/riemann-c-client/Config.in deleted file mode 100644 index e9982b2fb0..0000000000 --- a/package.bak/riemann-c-client/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_RIEMANN_C_CLIENT - bool "riemann-c-client" - depends on BR2_INSTALL_LIBSTDCPP # protobuf-c - depends on BR2_TOOLCHAIN_HAS_THREADS # protobuf-c - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" # protobuf-c - select BR2_PACKAGE_PROTOBUF_C - help - Riemann-c-client is a C client library for the Riemann - monitoring system, providing a convenient and simple API, - high test coverage and a copyleft license, along with API - and ABI stability. - - https://github.com/algernon/riemann-c-client - -comment "riemann-c-client needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" diff --git a/package.bak/riemann-c-client/riemann-c-client.hash b/package.bak/riemann-c-client/riemann-c-client.hash deleted file mode 100644 index 090288156c..0000000000 --- a/package.bak/riemann-c-client/riemann-c-client.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4b18804f489834fa953f4af887290173c745b471a5993bb108a9142c867de457 riemann-c-client-1.9.1.tar.xz diff --git a/package.bak/riemann-c-client/riemann-c-client.mk b/package.bak/riemann-c-client/riemann-c-client.mk deleted file mode 100644 index c8a411c32b..0000000000 --- a/package.bak/riemann-c-client/riemann-c-client.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# riemann-c-client -# -################################################################################ - -RIEMANN_C_CLIENT_VERSION = 1.9.1 -RIEMANN_C_CLIENT_SOURCE = riemann-c-client-$(RIEMANN_C_CLIENT_VERSION).tar.xz -RIEMANN_C_CLIENT_SITE = https://github.com/algernon/riemann-c-client/releases/download/riemann-c-client-$(RIEMANN_C_CLIENT_VERSION) -RIEMANN_C_CLIENT_LICENSE = LGPLv3+ -RIEMANN_C_CLIENT_LICENSE_FILES = LICENSE -RIEMANN_C_CLIENT_INSTALL_STAGING = YES -RIEMANN_C_CLIENT_MAKE = $(MAKE1) -RIEMANN_C_CLIENT_DEPENDENCIES = \ - host-pkgconf protobuf-c \ - $(if $(BR2_PACKAGE_GNUTLS),gnutls) \ - $(if $(BR2_PACKAGE_JSON_C),json-c) - -ifeq ($(BR2_bfin),y) -# ld symbol versioning not working on bfin -RIEMANN_C_CLIENT_CONF_ENV += ac_cv_prog_ld_version_script=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/rings/Config.in b/package.bak/rings/Config.in deleted file mode 100644 index 87ade07cb1..0000000000 --- a/package.bak/rings/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_RINGS - bool "rings" - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - help - Provides a way to create new Lua states from within Lua. - - http://github.com/keplerproject/rings diff --git a/package.bak/rings/rings.hash b/package.bak/rings/rings.hash deleted file mode 100644 index 59da2fa32c..0000000000 --- a/package.bak/rings/rings.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 627ac55d4a420fab766e6870fcd82cb39da12fb4ec8efddc7220b188a4ad4bc3 rings-1.3.0-1.src.rock diff --git a/package.bak/rings/rings.mk b/package.bak/rings/rings.mk deleted file mode 100644 index 151546aeaa..0000000000 --- a/package.bak/rings/rings.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# rings -# -################################################################################ - -RINGS_VERSION_MAJOR = 1.3.0 -RINGS_VERSION = $(RINGS_VERSION_MAJOR)-1 -RINGS_SUBDIR = rings-v_$(subst .,_,$(RINGS_VERSION_MAJOR)) -RINGS_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/rng-tools/0001-rngd-exit-code.patch b/package.bak/rng-tools/0001-rngd-exit-code.patch deleted file mode 100644 index 709e20c70d..0000000000 --- a/package.bak/rng-tools/0001-rngd-exit-code.patch +++ /dev/null @@ -1,22 +0,0 @@ -Exit with a special value when RNG modules are not available - -Instead of returning with an error, exit with a special value when the -RNG kernel modules are not present in the kernel. This is not really a -hard failure. - -Patch borrowed from Fedora, at -http://pkgs.fedoraproject.org/cgit/rng-tools.git/tree/rngd-exit-code.patch. - -Signed-off-by: Maxim Mikityanskiy - ---- a/rngd.c -+++ b/rngd.c -@@ -319,7 +319,7 @@ int main(int argc, char **argv) - message(LOG_DAEMON|LOG_ERR, - "Maybe RNG device modules are not loaded\n"); - } -- return 1; -+ return 66; - } - - if (arguments->verbose) { diff --git a/package.bak/rng-tools/Config.in b/package.bak/rng-tools/Config.in deleted file mode 100644 index b00477d336..0000000000 --- a/package.bak/rng-tools/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_RNG_TOOLS - bool "rng-tools" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS || !(BR2_i386 || BR2_x86_64) # libgcrypt - select BR2_PACKAGE_ARGP_STANDALONE if BR2_TOOLCHAIN_USES_UCLIBC || BR2_TOOLCHAIN_USES_MUSL - # 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. - - http://sourceforge.net/projects/gkernel/ diff --git a/package.bak/rng-tools/S21rngd b/package.bak/rng-tools/S21rngd deleted file mode 100755 index b38be5a507..0000000000 --- a/package.bak/rng-tools/S21rngd +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -NAME="rngd" -DAEMON="/usr/sbin/${NAME}" -DAEMON_ARGS="" -CFG_FILE="/etc/default/${NAME}" -PID_FILE="/var/run/${NAME}.pid" - -# Read configuration variable file if it is present -[ -r "${CFG_FILE}" ] && . "${CFG_FILE}" - -start() -{ - printf "Starting ${NAME}: " - start-stop-daemon -S -q -x "${DAEMON}" -- ${DAEMON_ARGS} - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() -{ - printf "Stopping ${NAME}: " - # This daemon does not exit properly with the default TERM signal unless - # it's forced to work by something reading /dev/random. Killing it and - # removing its PID file is more straightforward. - if start-stop-daemon -K -q -s KILL -p "${PID_FILE}" -n "${NAME}"; then - rm -f "${PID_FILE}" - echo "OK" - else - echo "FAIL" - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac diff --git a/package.bak/rng-tools/rng-tools.hash b/package.bak/rng-tools/rng-tools.hash deleted file mode 100644 index 09769e4622..0000000000 --- a/package.bak/rng-tools/rng-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# 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.bak/rng-tools/rng-tools.mk b/package.bak/rng-tools/rng-tools.mk deleted file mode 100644 index cc07bdf15c..0000000000 --- a/package.bak/rng-tools/rng-tools.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# rng-tools -# -################################################################################ - -RNG_TOOLS_VERSION = 5 -RNG_TOOLS_SITE = http://downloads.sourceforge.net/project/gkernel/rng-tools/$(RNG_TOOLS_VERSION) -RNG_TOOLS_LICENSE = GPLv2 -RNG_TOOLS_LICENSE_FILES = COPYING - -# Work around for uClibc or musl toolchains which lack argp_*() -# functions. -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),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 - -define RNG_TOOLS_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/rng-tools/S21rngd \ - $(TARGET_DIR)/etc/init.d/S21rngd -endef - -define RNG_TOOLS_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/rng-tools/rngd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rngd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/rngd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rngd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/rng-tools/rngd.service b/package.bak/rng-tools/rngd.service deleted file mode 100644 index c0bcffe59e..0000000000 --- a/package.bak/rng-tools/rngd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Hardware RNG Entropy Gatherer Daemon - -[Service] -ExecStart=/usr/sbin/rngd -f $DAEMON_ARGS -SuccessExitStatus=66 -EnvironmentFile=-/etc/default/rngd - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/rp-pppoe/0002-krn-plugin.patch b/package.bak/rp-pppoe/0002-krn-plugin.patch deleted file mode 100644 index d364e8684c..0000000000 --- a/package.bak/rp-pppoe/0002-krn-plugin.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -Nura rp-pppoe-3.11.orig/src/configure rp-pppoe-3.11/src/configure ---- rp-pppoe-3.11.orig/src/configure 2012-08-21 10:01:10.536440032 -0300 -+++ rp-pppoe-3.11/src/configure 2012-08-21 10:01:45.353442397 -0300 -@@ -4517,7 +4517,7 @@ - modprobe pppoe > /dev/null 2>&1 - fi - if test "$cross_compiling" = yes; then : -- ac_cv_linux_kernel_pppoe=no; $ECHO "cross-compiling, default: " -+ ac_cv_linux_kernel_pppoe=yes; $ECHO "cross-compiling, default: " - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ -diff -Nura rp-pppoe-3.11.orig/src/pppoe-server.c rp-pppoe-3.11/src/pppoe-server.c ---- rp-pppoe-3.11.orig/src/pppoe-server.c 2012-08-21 10:01:10.535440032 -0300 -+++ rp-pppoe-3.11/src/pppoe-server.c 2012-08-21 10:02:02.597443569 -0300 -@@ -20,6 +20,9 @@ - - #include "config.h" - -+/* Patched hack to make this cross compile */ -+#define HAVE_LINUX_KERNEL_PPPOE 1 -+ - #if defined(HAVE_NETPACKET_PACKET_H) || defined(HAVE_LINUX_IF_PACKET_H) - #define _POSIX_SOURCE 1 /* For sigaction defines */ - #endif diff --git a/package.bak/rp-pppoe/Config.in b/package.bak/rp-pppoe/Config.in deleted file mode 100644 index a41de33332..0000000000 --- a/package.bak/rp-pppoe/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -comment "rp-pppoe needs a uClibc or glibc toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_USE_MMU - -config BR2_PACKAGE_RP_PPPOE - bool "rp-pppoe" - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # pppd - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_PPPD - help - An implementation of the Point-to-point protocol over Ethernet. - Has userspace client and server deamons. You likely only need - this package if you are implementing the pppoe server that will - service other pppoe client devices. Otherwise the normal client - functionality already exists in the pppd package (and kernel). - - http://www.roaringpenguin.com/pppoe.html diff --git a/package.bak/rp-pppoe/rp-pppoe.hash b/package.bak/rp-pppoe/rp-pppoe.hash deleted file mode 100644 index 0cf85a089a..0000000000 --- a/package.bak/rp-pppoe/rp-pppoe.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 00794e04031546b0e9b8cf286f2a6d1ccfc4a621b2a3abb2d7ef2a7ab7cc86c2 rp-pppoe-3.12.tar.gz diff --git a/package.bak/rp-pppoe/rp-pppoe.mk b/package.bak/rp-pppoe/rp-pppoe.mk deleted file mode 100644 index 99d231e579..0000000000 --- a/package.bak/rp-pppoe/rp-pppoe.mk +++ /dev/null @@ -1,41 +0,0 @@ -################################################################################ -# -# rp-pppoe -# -################################################################################ - -RP_PPPOE_VERSION = 3.12 -RP_PPPOE_SITE = http://www.roaringpenguin.com/files/download -RP_PPPOE_LICENSE = GPLv2 -RP_PPPOE_LICENSE_FILES = doc/LICENSE -RP_PPPOE_DEPENDENCIES = pppd -RP_PPPOE_SUBDIR = src -RP_PPPOE_TARGET_FILES = pppoe pppoe-server pppoe-relay pppoe-sniff -RP_PPPOE_TARGET_SCRIPTS = pppoe-connect pppoe-init pppoe-setup pppoe-start \ - pppoe-status pppoe-stop -RP_PPPOE_MAKE_OPTS = PLUGIN_DIR=/usr/lib/pppd/$(PPPD_VERSION) -RP_PPPOE_CONF_OPTS = --disable-debugging - -# The pppd, echo, setsid and id paths must be the ones on the -# target. Indeed, the result of these checks is used to replace -# variables in scripts that are installed in the target. -RP_PPPOE_CONF_ENV = \ - rpppoe_cv_pack_bitfields=normal \ - ac_cv_path_PPPD=/usr/sbin/pppd \ - ac_cv_path_ECHO=/bin/echo \ - ac_cv_path_SETSID=/usr/bin/setsid \ - ac_cv_path_ID=/usr/bin/id \ - PPPD_H=$(PPPD_DIR)/pppd/pppd.h - -define RP_PPPOE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/configs/pppoe.conf \ - $(TARGET_DIR)/etc/ppp/pppoe.conf - for ff in $(RP_PPPOE_TARGET_FILES); do \ - $(INSTALL) -m 0755 $(@D)/src/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \ - done - for ff in $(RP_PPPOE_TARGET_SCRIPTS); do \ - $(INSTALL) -m 0755 $(@D)/scripts/$$ff $(TARGET_DIR)/usr/sbin/$$ff || exit 1; \ - done -endef - -$(eval $(autotools-package)) diff --git a/package.bak/rpcbind/0001-Remove-yellow-pages-support.patch b/package.bak/rpcbind/0001-Remove-yellow-pages-support.patch deleted file mode 100644 index 314e32e9c8..0000000000 --- a/package.bak/rpcbind/0001-Remove-yellow-pages-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 226b9c57ff403b407dbf1ff8a615da455a4cbd23 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 10 Nov 2012 22:03:43 +0100 -Subject: [PATCH] Remove yellow pages support - -This support requires yellow pages support in libtirpc, which isn't -available. As most Buildroot users are most likely never going to need -such feature, get rid of it. - -Signed-off-by: Thomas Petazzoni ---- - src/security.c | 18 ------------------ - 1 file changed, 18 deletions(-) - -diff --git a/src/security.c b/src/security.c -index 0c9453f..abc81bb 100644 ---- a/src/security.c -+++ b/src/security.c -@@ -24,9 +24,6 @@ - #include - #include - #include --#include --#include --#include - #else - # define MOUNTPROC_MNT 1 - # define MOUNTPROC_UMNT 3 -@@ -325,24 +322,9 @@ check_callit(SVCXPRT *xprt, struct r_rmtcall_args *args, int versnum /*__unused* - args->rmt_proc != MOUNTPROC_UMNT) - break; - goto deny; -- case YPBINDPROG: -- if (args->rmt_proc != YPBINDPROC_SETDOM) -- break; -- /* FALLTHROUGH */ -- case YPPASSWDPROG: - case NFS_PROGRAM: - case RQUOTAPROG: - goto deny; -- case YPPROG: -- switch (args->rmt_proc) { -- case YPPROC_ALL: -- case YPPROC_MATCH: -- case YPPROC_FIRST: -- case YPPROC_NEXT: -- goto deny; -- default: -- break; -- } - default: - break; - } --- -2.4.5 - diff --git a/package.bak/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch b/package.bak/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch deleted file mode 100644 index 6145514bea..0000000000 --- a/package.bak/rpcbind/0002-handle_reply-Don-t-use-the-xp_auth-pointer-directly.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9194122389f2a56b1cd1f935e64307e2e963c2da Mon Sep 17 00:00:00 2001 -From: Steve Dickson -Date: Mon, 2 Nov 2015 17:05:18 -0500 -Subject: [PATCH] handle_reply: Don't use the xp_auth pointer directly - -In the latest libtirpc version to access the xp_auth -one must use the SVC_XP_AUTH macro. To be backwards -compatible a couple ifdefs were added to use the -macro when it exists. - -Signed-off-by: Steve Dickson -[peda@axentia.se: backport from upstream] -Signed-off-by: Peter Rosin ---- - src/rpcb_svc_com.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 4ae93f1..22d6c84 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -1295,10 +1295,17 @@ handle_reply(int fd, SVCXPRT *xprt) - a.rmt_localvers = fi->versnum; - - xprt_set_caller(xprt, fi); -+#if defined(SVC_XP_AUTH) -+ SVC_XP_AUTH(xprt) = svc_auth_none; -+#else - xprt->xp_auth = &svc_auth_none; -+#endif - svc_sendreply(xprt, (xdrproc_t) xdr_rmtcall_result, (char *) &a); -+#if !defined(SVC_XP_AUTH) - SVCAUTH_DESTROY(xprt->xp_auth); - xprt->xp_auth = NULL; -+#endif -+ - done: - if (buffer) - free(buffer); --- -2.5.3 - diff --git a/package.bak/rpcbind/0003-src-remove-use-of-the-__P-macro.patch b/package.bak/rpcbind/0003-src-remove-use-of-the-__P-macro.patch deleted file mode 100644 index 72fda880ce..0000000000 --- a/package.bak/rpcbind/0003-src-remove-use-of-the-__P-macro.patch +++ /dev/null @@ -1,243 +0,0 @@ -From 2f7d15304e0544e4c693c86d8ab8b2f08b9e9886 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 15 Aug 2016 16:36:40 +0200 -Subject: [PATCH] src: remove use of the __P() macro - -The __P() macro is a legacy compatibility macro aimed making pre-ANSI -(i.e. K&R) compilers that do not support function prototypes happy, -while still allowing such prototypes for ANSI-compliant compilers. - -Since virtually all compilers have been ANSI-compliant for a few decades -now, use of __P() is totally useless. - -Furthermore, __P() is defined in the non-standard sys/cdefs.h header. -This header is present in glibc and uClibc, and both have it included -from many of their headers. So, sys/cdefs.h is automagically included in -most cases and its macros are available. - -However, the musl C library does not provide this sys/cdefs.h header. -Thus, the build breaks on musl. - -For all the above reasons, get rid of __P() wherever it is used; just -always declare real function prototypes. - -Signed-off-by: "Yann E. MORIN" -Cc: Chuck Lever -Cc: Steve Dickson ---- - src/check_bound.c | 2 +- - src/pmap_svc.c | 10 +++++----- - src/rpcb_svc.c | 10 +++++----- - src/rpcb_svc_4.c | 14 ++++++-------- - src/rpcb_svc_com.c | 46 +++++++++++++++++++++++----------------------- - src/rpcbind.c | 12 ++++++------ - src/util.c | 2 +- - src/warmstart.c | 4 ++-- - 8 files changed, 49 insertions(+), 51 deletions(-) - -diff --git a/src/check_bound.c b/src/check_bound.c -index c70b845..92bfd36 100644 ---- a/src/check_bound.c -+++ b/src/check_bound.c -@@ -70,7 +70,7 @@ static struct fdlist *fdhead; /* Link list of the check fd's */ - static struct fdlist *fdtail; - static char *nullstring = ""; - --static bool_t check_bound __P((struct fdlist *, char *uaddr)); -+static bool_t check_bound(struct fdlist *, char *uaddr); - - /* - * Returns 1 if the given address is bound for the given addr & transport -diff --git a/src/pmap_svc.c b/src/pmap_svc.c -index ad28b93..4c744fe 100644 ---- a/src/pmap_svc.c -+++ b/src/pmap_svc.c -@@ -60,11 +60,11 @@ static char sccsid[] = "@(#)pmap_svc.c 1.23 89/04/05 Copyr 1984 Sun Micro"; - #include "rpcbind.h" - #include "xlog.h" - #include /* svc_getcaller routine definition */ --static struct pmaplist *find_service_pmap __P((rpcprog_t, rpcvers_t, -- rpcprot_t)); --static bool_t pmapproc_change __P((struct svc_req *, SVCXPRT *, u_long)); --static bool_t pmapproc_getport __P((struct svc_req *, SVCXPRT *)); --static bool_t pmapproc_dump __P((struct svc_req *, SVCXPRT *)); -+static struct pmaplist *find_service_pmap(rpcprog_t, rpcvers_t, -+ rpcprot_t); -+static bool_t pmapproc_change(struct svc_req *, SVCXPRT *, u_long); -+static bool_t pmapproc_getport(struct svc_req *, SVCXPRT *); -+static bool_t pmapproc_dump(struct svc_req *, SVCXPRT *); - - /* - * Called for all the version 2 inquiries. -diff --git a/src/rpcb_svc.c b/src/rpcb_svc.c -index bd92201..709e3fb 100644 ---- a/src/rpcb_svc.c -+++ b/src/rpcb_svc.c -@@ -53,10 +53,10 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_dump_3_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); -+static void *rpcbproc_getaddr_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); -+static void *rpcbproc_dump_3_local(void *, struct svc_req *, SVCXPRT *, -+ rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -75,7 +75,7 @@ rpcb_service_3(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_3_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_4.c b/src/rpcb_svc_4.c -index b673452..5094879 100644 ---- a/src/rpcb_svc_4.c -+++ b/src/rpcb_svc_4.c -@@ -54,13 +54,11 @@ - #include "rpcbind.h" - #include "xlog.h" - --static void *rpcbproc_getaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, -- rpcvers_t)); --static void *rpcbproc_getversaddr_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void *rpcbproc_getaddrlist_4_local -- __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); --static void free_rpcb_entry_list __P((rpcb_entry_list_ptr *)); --static void *rpcbproc_dump_4_local __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+static void *rpcbproc_getaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getversaddr_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void *rpcbproc_getaddrlist_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); -+static void free_rpcb_entry_list(rpcb_entry_list_ptr *); -+static void *rpcbproc_dump_4_local(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - - /* - * Called by svc_getreqset. There is a separate server handle for -@@ -78,7 +76,7 @@ rpcb_service_4(struct svc_req *rqstp, SVCXPRT *transp) - } argument; - char *result; - xdrproc_t xdr_argument, xdr_result; -- void *(*local) __P((void *, struct svc_req *, SVCXPRT *, rpcvers_t)); -+ void *(*local)(void *, struct svc_req *, SVCXPRT *, rpcvers_t); - rpcprog_t setprog = 0; - - rpcbs_procinfo(RPCBVERS_4_STAT, rqstp->rq_proc); -diff --git a/src/rpcb_svc_com.c b/src/rpcb_svc_com.c -index 148fe42..5862c26 100644 ---- a/src/rpcb_svc_com.c -+++ b/src/rpcb_svc_com.c -@@ -100,29 +100,29 @@ struct finfo { - static struct finfo FINFO[NFORWARD]; - - --static bool_t xdr_encap_parms __P((XDR *, struct encap_parms *)); --static bool_t xdr_rmtcall_args __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_rmtcall_result __P((XDR *, struct r_rmtcall_args *)); --static bool_t xdr_opaque_parms __P((XDR *, struct r_rmtcall_args *)); --static int find_rmtcallfd_by_netid __P((char *)); --static SVCXPRT *find_rmtcallxprt_by_fd __P((int)); --static int forward_register __P((u_int32_t, struct netbuf *, int, char *, -- rpcproc_t, rpcvers_t, u_int32_t *)); --static struct finfo *forward_find __P((u_int32_t)); --static int free_slot_by_xid __P((u_int32_t)); --static int free_slot_by_index __P((int)); --static int netbufcmp __P((struct netbuf *, struct netbuf *)); --static struct netbuf *netbufdup __P((struct netbuf *)); --static void netbuffree __P((struct netbuf *)); --static int check_rmtcalls __P((struct pollfd *, int)); --static void xprt_set_caller __P((SVCXPRT *, struct finfo *)); --static void send_svcsyserr __P((SVCXPRT *, struct finfo *)); --static void handle_reply __P((int, SVCXPRT *)); --static void find_versions __P((rpcprog_t, char *, rpcvers_t *, rpcvers_t *)); --static rpcblist_ptr find_service __P((rpcprog_t, rpcvers_t, char *)); --static char *getowner __P((SVCXPRT *, char *, size_t)); --static int add_pmaplist __P((RPCB *)); --static int del_pmaplist __P((RPCB *)); -+static bool_t xdr_encap_parms(XDR *, struct encap_parms *); -+static bool_t xdr_rmtcall_args(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_rmtcall_result(XDR *, struct r_rmtcall_args *); -+static bool_t xdr_opaque_parms(XDR *, struct r_rmtcall_args *); -+static int find_rmtcallfd_by_netid(char *); -+static SVCXPRT *find_rmtcallxprt_by_fd(int); -+static int forward_register(u_int32_t, struct netbuf *, int, char *, -+ rpcproc_t, rpcvers_t, u_int32_t *); -+static struct finfo *forward_find(u_int32_t); -+static int free_slot_by_xid(u_int32_t); -+static int free_slot_by_index(int); -+static int netbufcmp(struct netbuf *, struct netbuf *); -+static struct netbuf *netbufdup(struct netbuf *); -+static void netbuffree(struct netbuf *); -+static int check_rmtcalls(struct pollfd *, int); -+static void xprt_set_caller(SVCXPRT *, struct finfo *); -+static void send_svcsyserr(SVCXPRT *, struct finfo *); -+static void handle_reply(int, SVCXPRT *); -+static void find_versions(rpcprog_t, char *, rpcvers_t *, rpcvers_t *); -+static rpcblist_ptr find_service(rpcprog_t, rpcvers_t, char *); -+static char *getowner(SVCXPRT *, char *, size_t); -+static int add_pmaplist(RPCB *); -+static int del_pmaplist(RPCB *); - - /* - * Set a mapping of program, version, netid -diff --git a/src/rpcbind.c b/src/rpcbind.c -index c4265cd..87ccdc2 100644 ---- a/src/rpcbind.c -+++ b/src/rpcbind.c -@@ -136,13 +136,13 @@ char *tcp_uaddr; /* Universal TCP address */ - static char servname[] = "rpcbind"; - static char superuser[] = "superuser"; - --int main __P((int, char *[])); -+int main(int, char *[]); - --static int init_transport __P((struct netconfig *)); --static void rbllist_add __P((rpcprog_t, rpcvers_t, struct netconfig *, -- struct netbuf *)); --static void terminate __P((int)); --static void parseargs __P((int, char *[])); -+static int init_transport(struct netconfig *); -+static void rbllist_add(rpcprog_t, rpcvers_t, struct netconfig *, -+ struct netbuf *); -+static void terminate(int); -+static void parseargs(int, char *[]); - - int - main(int argc, char *argv[]) -diff --git a/src/util.c b/src/util.c -index a6c835b..74b0284 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -70,7 +70,7 @@ static struct sockaddr_in *local_in4; - static struct sockaddr_in6 *local_in6; - #endif - --static int bitmaskcmp __P((void *, void *, void *, int)); -+static int bitmaskcmp(void *, void *, void *, int); - - /* - * For all bits set in "mask", compare the corresponding bits in -diff --git a/src/warmstart.c b/src/warmstart.c -index b6eb73e..122a058 100644 ---- a/src/warmstart.c -+++ b/src/warmstart.c -@@ -58,8 +58,8 @@ - #define PMAPFILE RPCBIND_STATEDIR "/portmap.xdr" - #endif - --static bool_t write_struct __P((char *, xdrproc_t, void *)); --static bool_t read_struct __P((char *, xdrproc_t, void *)); -+static bool_t write_struct(char *, xdrproc_t, void *); -+static bool_t read_struct(char *, xdrproc_t, void *); - - static bool_t - write_struct(char *filename, xdrproc_t structproc, void *list) --- -2.7.4 - diff --git a/package.bak/rpcbind/Config.in b/package.bak/rpcbind/Config.in deleted file mode 100644 index 9ff64a589c..0000000000 --- a/package.bak/rpcbind/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_RPCBIND - bool "rpcbind" - # We really need libtirpc and can't work with the native RPC - # implementation of toolchains. - depends on BR2_TOOLCHAIN_HAS_THREADS # libtirpc - select BR2_PACKAGE_LIBTIRPC - # fork() - depends on BR2_USE_MMU - help - The rpcbind utility is a server that converts RPC program numbers - into universal addresses. - -comment "rpcbind needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/rpcbind/S30rpcbind b/package.bak/rpcbind/S30rpcbind deleted file mode 100644 index 532d3f8866..0000000000 --- a/package.bak/rpcbind/S30rpcbind +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# -# Starts rpcbind. -# - -start() { - printf "Starting rpcbind: " - umask 077 - start-stop-daemon -S -q -p /var/run/rpcbind.pid --exec /usr/bin/rpcbind - echo "OK" -} -stop() { - printf "Stopping rpcbind daemon: " - start-stop-daemon -K -q -p /var/run/rpcbind.pid - echo "OK" -} -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? - diff --git a/package.bak/rpcbind/rpcbind.hash b/package.bak/rpcbind/rpcbind.hash deleted file mode 100644 index 5c9ecd1429..0000000000 --- a/package.bak/rpcbind/rpcbind.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9897823a9d820ea011d9ea02054d5ab99469b9ca5346265fee380713c8fed27b rpcbind-0.2.3.tar.bz2 diff --git a/package.bak/rpcbind/rpcbind.mk b/package.bak/rpcbind/rpcbind.mk deleted file mode 100644 index 4360d1f47a..0000000000 --- a/package.bak/rpcbind/rpcbind.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# rpcbind -# -################################################################################ - -RPCBIND_VERSION = 0.2.3 -RPCBIND_SITE = http://downloads.sourceforge.net/project/rpcbind/rpcbind/$(RPCBIND_VERSION) -RPCBIND_SOURCE = rpcbind-$(RPCBIND_VERSION).tar.bz2 -RPCBIND_LICENSE = BSD-3c -RPCBIND_LICENSE_FILES = COPYING - -RPCBIND_CONF_ENV += \ - CFLAGS="$(TARGET_CFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" -RPCBIND_DEPENDENCIES += libtirpc host-pkgconf -RPCBIND_CONF_OPTS += --with-rpcuser=root - -ifeq ($(BR2_INIT_SYSTEMD),y) -RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=/usr/lib/systemd/system -else -RPCBIND_CONF_OPTS += --with-systemdsystemunitdir=no -endif - -define RPCBIND_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.service \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.service - $(INSTALL) -m 0755 -D package/rpcbind/rpcbind.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/rpcbind.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/sockets.target.wants - ln -fs ../../../../usr/lib/systemd/system/rpcbind.socket \ - $(TARGET_DIR)/etc/systemd/system/sockets.target.wants/rpcbind.socket -endef - -define RPCBIND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rpcbind/S30rpcbind \ - $(TARGET_DIR)/etc/init.d/S30rpcbind -endef - - -$(eval $(autotools-package)) diff --git a/package.bak/rpcbind/rpcbind.service b/package.bak/rpcbind/rpcbind.service deleted file mode 100644 index b7a32a19d0..0000000000 --- a/package.bak/rpcbind/rpcbind.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=RPC bind service -Requires=rpcbind.socket - -[Service] -Type=forking -ExecStart=/usr/bin/rpcbind - -[Install] -Also=rpcbind.socket diff --git a/package.bak/rpcbind/rpcbind.socket b/package.bak/rpcbind/rpcbind.socket deleted file mode 100644 index d63c1d9720..0000000000 --- a/package.bak/rpcbind/rpcbind.socket +++ /dev/null @@ -1,8 +0,0 @@ -[Unit] -Description=RPCbind Server Activation Socket - -[Socket] -ListenStream=/var/run/rpcbind.sock - -[Install] -WantedBy=sockets.target diff --git a/package.bak/rpi-armmem/Config.in b/package.bak/rpi-armmem/Config.in deleted file mode 100644 index 6435ea89f5..0000000000 --- a/package.bak/rpi-armmem/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RPI_ARMMEM - bool "rpi-armmem" - depends on BR2_arm && BR2_PACKAGE_RPI_FIRMWARE && BR2_PACKAGE_RPI_USERLAND - help - A replacement for memcpy and memset functionality for the - Raspberry Pi with the intention of gaining greater performance. - - https://github.com/bavison/arm-mem/ - diff --git a/package.bak/rpi-armmem/rpi-armmem.mk b/package.bak/rpi-armmem/rpi-armmem.mk deleted file mode 100644 index 95607f012c..0000000000 --- a/package.bak/rpi-armmem/rpi-armmem.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# rpi-armmem -# -################################################################################ - -RPI_ARMMEM_VERSION = 3aee5f40c201b9fd50d6f79b8db89f4343820f2c -RPI_ARMMEM_SITE = $(call github,bavison,arm-mem,$(RPI_ARMMEM_VERSION)) -CFLAGS = -fPIC -std=gnu99 -O2 - -define RPI_ARMMEM_BUILD_CMDS - $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" CFLAGS="$(CFLAGS)" libarmmem.so -C $(@D) -endef - -define RPI_ARMMEM_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/libarmmem.so $(TARGET_DIR)/usr/lib/libarmmem.so -endef - -$(eval $(generic-package)) - diff --git a/package.bak/rpi-firmware/Config.in b/package.bak/rpi-firmware/Config.in deleted file mode 100644 index c2983aa84e..0000000000 --- a/package.bak/rpi-firmware/Config.in +++ /dev/null @@ -1,79 +0,0 @@ -config BR2_PACKAGE_RPI_FIRMWARE - bool "rpi-firmware" - depends on BR2_arm - help - RaspberryPi Firmware - Pre-compiled binaries of the current bootloader and GPU firmware - - https://github.com/raspberrypi/firmware - -if BR2_PACKAGE_RPI_FIRMWARE - -choice - bool "Firmware to boot" - default BR2_PACKAGE_RPI_FIRMWARE_DEFAULT - help - There are three different firmware files: - - the default firmware, that enables standard GPU features; - - the extended firmware, that enables additional GPU features - (eg. more audio/video codecs); - - the cut-down firmware, for emergency situations, with only - features required to boot a Linux kernel. - -config BR2_PACKAGE_RPI_FIRMWARE_DEFAULT - bool "default" - help - The default firmware, that enables standard GPU features. - -config BR2_PACKAGE_RPI_FIRMWARE_X - bool "extended ('x', more codecs)" - help - The extended firmware, that enables additional GPU features - (eg. more audio/video codecs). - -config BR2_PACKAGE_RPI_FIRMWARE_CD - bool "cut-down ('cd', emergency)" - help - The cut-down firmware, for emergency situations, with only - features required to boot a Linux kernel. - -endchoice - -config BR2_PACKAGE_RPI_FIRMWARE_BOOT - string - default "" if BR2_PACKAGE_RPI_FIRMWARE_DEFAULT - default "_x" if BR2_PACKAGE_RPI_FIRMWARE_X - default "_cd" if BR2_PACKAGE_RPI_FIRMWARE_CD - -config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS - bool "Install Device Tree Blobs (DTBs)" - depends on !BR2_LINUX_KERNEL_DTS_SUPPORT - default y - help - If you are using a Linux kernel <= 3.18, you should say 'y' here. - - If you are using a Linux kernel >= 3.19, you should say 'n' here, - and enable BR2_LINUX_KERNEL_DTS_SUPPORT to let the kernel build - the DTB. - -config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - bool "Install DTB overlays" - depends on BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS \ - || BR2_LINUX_KERNEL_DTS_SUPPORT - default y - help - Say 'y' here if you need to load one or more of the DTB overlays, - to support HATs (Hardware Attached on Top, add-on modules). - -config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG - bool "vcdbg" - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_INSTALL_LIBSTDCPP # rpi-userland - select BR2_PACKAGE_RPI_USERLAND - help - Install vcdbg, to help debug communication with the GPU. - -comment "vcdbg needs a glibc toolchain w/ C++" - depends on !BR2_TOOLCHAIN_USES_GLIBC || !BR2_INSTALL_LIBSTDCPP - -endif # BR2_PACKAGE_RPI_FIRMWARE diff --git a/package.bak/rpi-firmware/cmdline.txt b/package.bak/rpi-firmware/cmdline.txt deleted file mode 100644 index 155a54693b..0000000000 --- a/package.bak/rpi-firmware/cmdline.txt +++ /dev/null @@ -1 +0,0 @@ -root=/dev/mmcblk0p2 rootwait console=tty1 console=ttyAMA0,115200 diff --git a/package.bak/rpi-firmware/config.txt b/package.bak/rpi-firmware/config.txt deleted file mode 100644 index 58cc966a87..0000000000 --- a/package.bak/rpi-firmware/config.txt +++ /dev/null @@ -1,20 +0,0 @@ -# Please note that this is only a sample, we recommend you to change it to fit -# your needs. -# You should override this file using a post-build script. -# See http://buildroot.org/manual.html#rootfs-custom -# and http://elinux.org/RPiconfig for a description of config.txt syntax - -kernel=zImage - -# To use an external initramfs file -#initramfs rootfs.cpio.gz - -# Disable overscan assuming the display supports displaying the full resolution -# If the text shown on the screen disappears off the edge, comment this out -disable_overscan=1 - -# How much memory in MB to assign to the GPU on Pi models having -# 256, 512 or 1024 MB total memory -gpu_mem_256=100 -gpu_mem_512=100 -gpu_mem_1024=100 diff --git a/package.bak/rpi-firmware/rpi-firmware.mk b/package.bak/rpi-firmware/rpi-firmware.mk deleted file mode 100644 index 43bd68d658..0000000000 --- a/package.bak/rpi-firmware/rpi-firmware.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# rpi-firmware -# -################################################################################ - -RPI_FIRMWARE_VERSION = 6ba0dabbe76ce02d261cc4658c3484fa12b10385 -RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) -RPI_FIRMWARE_LICENSE = BSD-3c -RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom -RPI_FIRMWARE_INSTALL_IMAGES = YES - -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y) -define RPI_FIRMWARE_INSTALL_DTB - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2709-rpi-2-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2709-rpi-2-b.dtb - $(INSTALL) -D -m 0644 $(@D)/boot/bcm2710-rpi-3-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2710-rpi-3-b.dtb -endef -endif - -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTB_OVERLAYS),y) -define RPI_FIRMWARE_INSTALL_DTB_OVERLAYS - for ovldtb in $(@D)/boot/overlays/*.dtbo; do \ - $(INSTALL) -D -m 0644 $${ovldtb} $(BINARIES_DIR)/rpi-firmware/overlays/$${ovldtb##*/} || exit 1; \ - done -endef -endif - -ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG),y) -define RPI_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0700 $(@D)/$(if BR2_ARM_EABIHF,hardfp/)opt/vc/bin/vcdbg \ - $(TARGET_DIR)/usr/sbin/vcdbg -endef -endif # INSTALL_VCDBG - -define RPI_FIRMWARE_INSTALL_IMAGES_CMDS - $(INSTALL) -D -m 0644 $(@D)/boot/bootcode.bin $(BINARIES_DIR)/rpi-firmware/bootcode.bin - $(INSTALL) -D -m 0644 $(@D)/boot/start$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).elf $(BINARIES_DIR)/rpi-firmware/start.elf - $(INSTALL) -D -m 0644 $(@D)/boot/fixup$(BR2_PACKAGE_RPI_FIRMWARE_BOOT).dat $(BINARIES_DIR)/rpi-firmware/fixup.dat - $(INSTALL) -D -m 0644 package/rpi-firmware/config.txt $(BINARIES_DIR)/rpi-firmware/config.txt - $(INSTALL) -D -m 0644 package/rpi-firmware/cmdline.txt $(BINARIES_DIR)/rpi-firmware/cmdline.txt - $(RPI_FIRMWARE_INSTALL_DTB) - $(RPI_FIRMWARE_INSTALL_DTB_OVERLAYS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch b/package.bak/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch deleted file mode 100644 index fb87337111..0000000000 --- a/package.bak/rpi-userland/0001-Add-.pc-files-for-the-OpenGLESv2-EGL-and-bcm_host-li.patch +++ /dev/null @@ -1,107 +0,0 @@ -From 4824be8986c2b6ef0b0bd2b32bc99c4ba6406640 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 24 Jan 2015 19:44:14 +0100 -Subject: [PATCH] Add .pc files for the OpenGLESv2, EGL and bcm_host libraries - -Those pkg-config files make it easier for Qt5 to find those libraries -and the appropriate link flags. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: "Yann E. MORIN" - -[Rebased for rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163] -Signed-off-by: Peter Seiderer ---- - host_applications/linux/libs/bcm_host/CMakeLists.txt | 4 ++++ - host_applications/linux/libs/bcm_host/bcm_host.pc.in | 10 ++++++++++ - interface/khronos/CMakeLists.txt | 8 ++++++++ - interface/khronos/egl/egl.pc.in | 11 +++++++++++ - interface/khronos/glxx/glesv2.pc.in | 10 ++++++++++ - 5 files changed, 43 insertions(+) - create mode 100644 host_applications/linux/libs/bcm_host/bcm_host.pc.in - create mode 100644 interface/khronos/egl/egl.pc.in - create mode 100644 interface/khronos/glxx/glesv2.pc.in - -diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt -index 1edf50a..1f29ead 100644 ---- a/host_applications/linux/libs/bcm_host/CMakeLists.txt -+++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt -@@ -20,3 +20,7 @@ target_link_libraries(bcm_host vcos vchostif) - - install(TARGETS bcm_host DESTINATION lib) - -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bcm_host.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -diff --git a/host_applications/linux/libs/bcm_host/bcm_host.pc.in b/host_applications/linux/libs/bcm_host/bcm_host.pc.in -new file mode 100644 -index 0000000..d40d350 ---- /dev/null -+++ b/host_applications/linux/libs/bcm_host/bcm_host.pc.in -@@ -0,0 +1,10 @@ -+prefix=/usr -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: bcm_host -+Description: Broadcom VideoCore host API library -+Version: 1 -+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm -+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM -diff --git a/interface/khronos/CMakeLists.txt b/interface/khronos/CMakeLists.txt -index 4231af4..2844ebd 100644 ---- a/interface/khronos/CMakeLists.txt -+++ b/interface/khronos/CMakeLists.txt -@@ -74,6 +74,14 @@ target_link_libraries(OpenVG EGL) - - install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) - install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") - - # recommended names to use to avoid conflicts with mesa libs - add_library(brcmEGL ${SHARED} ${EGL_SOURCE}) -diff --git a/interface/khronos/egl/egl.pc.in b/interface/khronos/egl/egl.pc.in -new file mode 100644 -index 0000000..5868706 ---- /dev/null -+++ b/interface/khronos/egl/egl.pc.in -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: egl -+Description: RasberryPi implementation of EGL -+Version: 10 -+Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif -+Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \ -+ -I${includedir}/interface/vmcs_host/linux/ -diff --git a/interface/khronos/glxx/glesv2.pc.in b/interface/khronos/glxx/glesv2.pc.in -new file mode 100644 -index 0000000..2f58eed ---- /dev/null -+++ b/interface/khronos/glxx/glesv2.pc.in -@@ -0,0 +1,10 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: glesv2 -+Description: RasberryPi implementation of OpenGL ESv2 -+Version: 2.0 -+Libs: -L${libdir} -lGLESv2 -+Cflags: -I${includedir}/ --- -2.8.1 - diff --git a/package.bak/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch b/package.bak/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch deleted file mode 100644 index 0e9dede5eb..0000000000 --- a/package.bak/rpi-userland/0002-interface-remove-faulty-assert-to-make-weston-happy-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a126ee5a3235792abb58daffd9d4b3e1012f675b Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 24 Jan 2015 22:07:19 +0100 -Subject: [PATCH] interface: remove faulty assert() to make weston happy at - runtime - -This was removed after a discussion on IRC with the weston guys -('daniels' on irc.freenode.net/#wayland). - -Upstream status: no, will be pushed by weston guys later. -If not, I'll do it. - -Signed-off-by: "Yann E. MORIN" - -[Rebased for rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163] -Signed-off-by: Peter Seiderer ---- - interface/vmcs_host/vc_vchi_dispmanx.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/interface/vmcs_host/vc_vchi_dispmanx.c b/interface/vmcs_host/vc_vchi_dispmanx.c -index 133e86d..0c7873c 100755 ---- a/interface/vmcs_host/vc_vchi_dispmanx.c -+++ b/interface/vmcs_host/vc_vchi_dispmanx.c -@@ -1306,7 +1306,6 @@ static void *dispmanx_notify_func( void *arg ) { - // Decrement the use count - the corresponding "use" is in vc_dispmanx_update_submit. - vchi_service_release(dispmanx_client.notify_handle[0]); - if (dispmanx_client.update_callback ) { -- vcos_assert( dispmanx_client.pending_update_handle == handle); - dispmanx_client.update_callback(handle, dispmanx_client.update_callback_param); - } - } else { --- -2.8.1 - diff --git a/package.bak/rpi-userland/0003-Disable-Werror-everywhere.patch b/package.bak/rpi-userland/0003-Disable-Werror-everywhere.patch deleted file mode 100644 index 64ae8ed254..0000000000 --- a/package.bak/rpi-userland/0003-Disable-Werror-everywhere.patch +++ /dev/null @@ -1,171 +0,0 @@ -From 67924a43d52862a7b4c9076d49071449313fea85 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Thu, 22 Sep 2016 22:59:11 +0200 -Subject: [PATCH] Disable Werror everywhere - -With gcc-5.1, some constructs that were previously accepted (but wrong) -are now considered warnings, and thus -Werror makes them errors. - -Ditch -Werror altoghether. - -Signed-off-by: "Yann E. MORIN" - -[Rebased for rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163] -Signed-off-by: Peter Seiderer ---- - host_applications/android/apps/vidtex/CMakeLists.txt | 2 +- - host_applications/linux/apps/gencmd/CMakeLists.txt | 2 +- - host_applications/linux/apps/raspicam/CMakeLists.txt | 2 +- - host_applications/linux/apps/smem/CMakeLists.txt | 2 +- - host_applications/linux/libs/bcm_host/CMakeLists.txt | 2 +- - host_applications/linux/libs/sm/CMakeLists.txt | 2 +- - interface/mmal/CMakeLists.txt | 2 +- - interface/vcos/CMakeLists.txt | 2 +- - interface/vcos/pthreads/CMakeLists.txt | 2 +- - interface/vmcs_host/CMakeLists.txt | 2 +- - interface/vmcs_host/linux/vcfiled/CMakeLists.txt | 2 +- - 11 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt b/host_applications/android/apps/vidtex/CMakeLists.txt -index 1f705ef..37d037d 100644 ---- a/host_applications/android/apps/vidtex/CMakeLists.txt -+++ b/host_applications/android/apps/vidtex/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.8) - --SET(COMPILE_DEFINITIONS -Werror -Wall) -+SET(COMPILE_DEFINITIONS -Wall) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - - set (VIDTEX_SOURCES -diff --git a/host_applications/linux/apps/gencmd/CMakeLists.txt b/host_applications/linux/apps/gencmd/CMakeLists.txt -index f95d1a1..034bf20 100644 ---- a/host_applications/linux/apps/gencmd/CMakeLists.txt -+++ b/host_applications/linux/apps/gencmd/CMakeLists.txt -@@ -4,7 +4,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall ) - endif () - - include_directories( ../../../.. -diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt b/host_applications/linux/apps/raspicam/CMakeLists.txt -index 2afc145..04e446f 100644 ---- a/host_applications/linux/apps/raspicam/CMakeLists.txt -+++ b/host_applications/linux/apps/raspicam/CMakeLists.txt -@@ -1,7 +1,7 @@ - - # raspistill/raspivid/raspiyuv - --SET(COMPILE_DEFINITIONS -Werror) -+SET(COMPILE_DEFINITIONS ) - - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/libs/bcm_host/include) - include_directories(${PROJECT_SOURCE_DIR}/host_applications/linux/apps/raspicam/) -diff --git a/host_applications/linux/apps/smem/CMakeLists.txt b/host_applications/linux/apps/smem/CMakeLists.txt -index 0fa8328..f0d1e77 100644 ---- a/host_applications/linux/apps/smem/CMakeLists.txt -+++ b/host_applications/linux/apps/smem/CMakeLists.txt -@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT ../../../.. ABSOLUTE) - include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake) - - if (NOT WIN32) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall ) - endif () - - include_directories ( -diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt b/host_applications/linux/libs/bcm_host/CMakeLists.txt -index 1f29ead..fb78cea 100644 ---- a/host_applications/linux/libs/bcm_host/CMakeLists.txt -+++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt -@@ -3,7 +3,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall ) - endif () - - include_directories( ../../../.. -diff --git a/host_applications/linux/libs/sm/CMakeLists.txt b/host_applications/linux/libs/sm/CMakeLists.txt -index c6bf764..4bca0b0 100644 ---- a/host_applications/linux/libs/sm/CMakeLists.txt -+++ b/host_applications/linux/libs/sm/CMakeLists.txt -@@ -3,7 +3,7 @@ if (WIN32) - set(VCOS_PLATFORM win32) - else () - set(VCOS_PLATFORM pthreads) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall ) - endif () - - include_directories( ../../../.. -diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt -index 37ae757..78b24a9 100644 ---- a/interface/mmal/CMakeLists.txt -+++ b/interface/mmal/CMakeLists.txt -@@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE) - set(LIBRARY_TYPE SHARED) - endif (NOT DEFINED LIBRARY_TYPE) - --add_definitions(-Wall -Werror) -+add_definitions(-Wall ) - - add_library(mmal SHARED util/mmal_util.c) - -diff --git a/interface/vcos/CMakeLists.txt b/interface/vcos/CMakeLists.txt -index 23a8d72..988b104 100644 ---- a/interface/vcos/CMakeLists.txt -+++ b/interface/vcos/CMakeLists.txt -@@ -43,7 +43,7 @@ foreach (header ${HEADERS}) - endforeach () - - if (CMAKE_COMPILER_IS_GNUCC) -- add_definitions (-ggdb -Werror -Wall) -+ add_definitions (-ggdb -Wall) - endif () - - if (CMAKE_COMPILER_2005) -diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt -index 1d81ca3..b35cd8e 100644 ---- a/interface/vcos/pthreads/CMakeLists.txt -+++ b/interface/vcos/pthreads/CMakeLists.txt -@@ -1,7 +1,7 @@ - # MSVC5 does not fully support C99, enabling declaration-after-statement - # warnings allows a common MSVC5 build error to be detected in Linux builds. - if (CMAKE_COMPILER_IS_GNUCC) -- set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wdeclaration-after-statement") -+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement") - add_definitions (-D_GNU_SOURCE) - endif () - -diff --git a/interface/vmcs_host/CMakeLists.txt b/interface/vmcs_host/CMakeLists.txt -index 0b3adc9..c5156d8 100755 ---- a/interface/vmcs_host/CMakeLists.txt -+++ b/interface/vmcs_host/CMakeLists.txt -@@ -2,7 +2,7 @@ - # interface/vmcs_host - - # not working in release build --# add_definitions(-Werror) -+# add_definitions() - - # vc_vchi_gencmd.c has a type-punning problem in vc_gencmd_read_response - add_definitions(-fno-strict-aliasing) -diff --git a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -index aed0e83..d834b3f 100644 ---- a/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -+++ b/interface/vmcs_host/linux/vcfiled/CMakeLists.txt -@@ -1,5 +1,5 @@ - --add_definitions(-Werror) -+add_definitions() - - # vcfiled - serves files to videocore. used for media handlers from - # OpenMAX/IL and loading VLLs. --- -2.8.1 - diff --git a/package.bak/rpi-userland/0004-host-applications-disable-missing-applications.patch b/package.bak/rpi-userland/0004-host-applications-disable-missing-applications.patch deleted file mode 100644 index 08039123a4..0000000000 --- a/package.bak/rpi-userland/0004-host-applications-disable-missing-applications.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c8d2c332da2a03ed80d62628bbf54187a66f49b6 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Fri, 24 Jul 2015 20:20:33 +0200 -Subject: [PATCH] host-applications: disable missing applications - -Those applications are missing from the public rpi-firmware package, so -do not even try to build them. - -Signed-off-by: "Yann E. MORIN" - -[Rebased for rpi-userland-a1b89e91f393c7134b4cdc36431f863bb3333163] -Signed-off-by: Peter Seiderer ---- - host_applications/linux/CMakeLists.txt | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/host_applications/linux/CMakeLists.txt b/host_applications/linux/CMakeLists.txt -index 5a648e7..83bb66e 100644 ---- a/host_applications/linux/CMakeLists.txt -+++ b/host_applications/linux/CMakeLists.txt -@@ -12,10 +12,7 @@ add_subdirectory(apps/dtoverlay) - add_subdirectory(apps/dtmerge) - - if(ALL_APPS) -- add_subdirectory(apps/vcdbg) -- add_subdirectory(libs/elftoolchain) - # add_subdirectory(apps/smct) -- add_subdirectory(apps/edid_parser) - add_subdirectory(apps/hello_pi) - endif() - --- -2.8.1 - diff --git a/package.bak/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch b/package.bak/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch deleted file mode 100644 index f028f67bdc..0000000000 --- a/package.bak/rpi-userland/0005-dtmerge-add-missing-include-for-va_list.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1ffed0e8601afb7e65545bd545772edd0fccc404 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 23 Apr 2016 17:48:13 +0200 -Subject: [PATCH] dtmerge: add missing include for va_list -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes compile error with uclibc-1.0.14: - - In file included from rpi-userland-52eca998aa43f278314579dba4798a3fe1da46c3/host_applications/linux/apps/dtmerge/dtmerge.c:32:0: - rpi-userland-52eca998aa43f278314579dba4798a3fe1da46c3/helpers/dtoverlay/dtoverlay.h:65:54: error: unknown type name ‘va_list’ - const char *fmt, va_list args); - -Signed-off-by: Peter Seiderer ---- - host_applications/linux/apps/dtmerge/dtmerge.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host_applications/linux/apps/dtmerge/dtmerge.c b/host_applications/linux/apps/dtmerge/dtmerge.c -index 9243da1..2ac8d39 100644 ---- a/host_applications/linux/apps/dtmerge/dtmerge.c -+++ b/host_applications/linux/apps/dtmerge/dtmerge.c -@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - #include - #include - #include -+#include - - #include "dtoverlay.h" - --- -2.8.1 - diff --git a/package.bak/rpi-userland/Config.in b/package.bak/rpi-userland/Config.in deleted file mode 100644 index 9bb2bfc570..0000000000 --- a/package.bak/rpi-userland/Config.in +++ /dev/null @@ -1,51 +0,0 @@ -config BR2_PACKAGE_RPI_USERLAND - bool "rpi-userland" - depends on BR2_arm - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_LIBOPENVG - select BR2_PACKAGE_HAS_LIBOPENMAX - help - Raspberry Pi Userland contains the necessary library to use the - VideoCore driver. - - Includes source for the ARM side code to interface to: - EGL, mmal, GLESv2, vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG. - - https://github.com/raspberrypi/userland/ - -if BR2_PACKAGE_RPI_USERLAND - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "rpi-userland" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "rpi-userland" - -config BR2_PACKAGE_PROVIDES_LIBOPENVG - default "rpi-userland" - -config BR2_PACKAGE_PROVIDES_LIBOPENMAX - default "rpi-userland" - -config BR2_PACKAGE_RPI_USERLAND_START_VCFILED - bool "Start vcfiled" - depends on BR2_INIT_SYSV || BR2_INIT_BUSYBOX - help - vcfiled is a daemon serving files to VideoCore from the host file - system. - -config BR2_PACKAGE_RPI_USERLAND_HELLO - bool "hello_pi examples" - help - Install the hello-pi examples to test the HW (GPU, camera...) - -endif - -comment "rpi-userland needs a toolchain w/ C++, threads, dynamic library" - depends on BR2_arm - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/rpi-userland/S94vcfiled b/package.bak/rpi-userland/S94vcfiled deleted file mode 100755 index 4d27b91bae..0000000000 --- a/package.bak/rpi-userland/S94vcfiled +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/sh - -NAME=vcfiled -DESC="VideoCore file server daemon $NAME" -DAEMON="/usr/sbin/$NAME" -DAEMON_ARGS="" -CFGFILE="/etc/default/$NAME" -PIDFILE="/var/run/$NAME.pid" - -# Read configuration variable file if it is present -[ -r "$CFGFILE" ] && . "$CFGFILE" - -start() -{ - printf "Starting $DESC: " - start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS && - echo "done" || echo "failed" -} - -stop() -{ - printf "Stopping $DESC: " - if start-stop-daemon -K -q -R TERM/30/KILL/5 -p "$PIDFILE" -n "$NAME"; then - # This daemon does not remove its PID file when it exits. - rm -f "$PIDFILE" - echo "done" - else - echo "failed" - fi -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" >&2 - exit 1 - ;; -esac diff --git a/package.bak/rpi-userland/rpi-userland.mk b/package.bak/rpi-userland/rpi-userland.mk deleted file mode 100644 index ae03f74566..0000000000 --- a/package.bak/rpi-userland/rpi-userland.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# rpi-userland -# -################################################################################ - -RPI_USERLAND_VERSION = aa3977538b04038628ff5b3a39a8e42ddcbc9176 -RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION)) -RPI_USERLAND_LICENSE = BSD-3c -RPI_USERLAND_LICENSE_FILES = LICENCE -RPI_USERLAND_INSTALL_STAGING = YES -RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \ - -DCMAKE_C_FLAGS="$(TARGET_CFLAGS) \ - -DVCFILED_LOCKFILE=\\\"/var/run/vcfiled.pid\\\"" - -RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg - -ifeq ($(BR2_PACKAGE_RPI_USERLAND_START_VCFILED),y) -define RPI_USERLAND_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rpi-userland/S94vcfiled \ - $(TARGET_DIR)/etc/init.d/S94vcfiled -endef -define RPI_USERLAND_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/rpi-userland/vcfiled.service \ - $(TARGET_DIR)/usr/lib/systemd/system/vcfiled.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/vcfiled.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/vcfiled.service -endef -endif - -ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) - -RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON - -define RPI_USERLAND_EXTRA_LIBS_TARGET - $(INSTALL) -m 0644 -D \ - $(@D)/build/lib/libilclient.so \ - $(TARGET_DIR)/usr/lib/libilclient.so -endef -RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET - -define RPI_USERLAND_EXTRA_LIBS_STAGING - $(INSTALL) -m 0644 -D \ - $(@D)/build/lib/libilclient.so \ - $(STAGING_DIR)/usr/lib/libilclient.so -endef -RPI_USERLAND_POST_INSTALL_STAGING_HOOKS += RPI_USERLAND_EXTRA_LIBS_STAGING - -else - -RPI_USERLAND_CONF_OPTS += -DALL_APPS=OFF - -endif # BR2_PACKAGE_RPI_USERLAND_HELLO - -define RPI_USERLAND_POST_TARGET_CLEANUP - rm -f $(TARGET_DIR)/etc/init.d/vcfiled - rm -f $(TARGET_DIR)/usr/share/install/vcfiled - rmdir --ignore-fail-on-non-empty $(TARGET_DIR)/usr/share/install - rm -Rf $(TARGET_DIR)/usr/src -endef -RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_POST_TARGET_CLEANUP - -$(eval $(cmake-package)) diff --git a/package.bak/rpi-userland/vcfiled.service b/package.bak/rpi-userland/vcfiled.service deleted file mode 100644 index b09aa62774..0000000000 --- a/package.bak/rpi-userland/vcfiled.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=VideoCore file server daemon - -[Service] -ExecStart=/usr/sbin/vcfiled --foreground -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch b/package.bak/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch deleted file mode 100644 index e1fd0697e6..0000000000 --- a/package.bak/rpm/0001-Detect-bfd.h-to-enable-disable-sepdebugcrcfix-buildi.patch +++ /dev/null @@ -1,55 +0,0 @@ -From edadcf67980764c104c25c7c1a0ba91257b89698 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 8 Dec 2016 23:33:30 +0100 -Subject: [PATCH 1/2] Detect bfd.h to enable/disable sepdebugcrcfix building - -tools/sepdebugcrcfix includes , but this header from binutils -is not checked in the configure script. Due to this, sepdebugcrcfix is -attempted to be built even when is not available. This commit -addresses that by adding the appropriate configure check. - -This fixes the following build error: - -tools/sepdebugcrcfix.c:31:17: fatal error: bfd.h: No such file or directory -compilation terminated. -make[3]: *** [tools/sepdebugcrcfix.o] Error 1 - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 2 ++ - configure.ac | 3 +++ - 2 files changed, 5 insertions(+) - -diff --git a/Makefile.am b/Makefile.am -index 863138c..d8a68f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -168,9 +168,11 @@ elfdeps_SOURCES = tools/elfdeps.c - elfdeps_LDADD = rpmio/librpmio.la - elfdeps_LDADD += @WITH_LIBELF_LIB@ @WITH_POPT_LIB@ - -+if HAS_BFD_H - rpmlibexec_PROGRAMS += sepdebugcrcfix - sepdebugcrcfix_SOURCES = tools/sepdebugcrcfix.c - sepdebugcrcfix_LDADD = @WITH_LIBELF_LIB@ -+endif # HAS_BFD_H - endif - endif - -diff --git a/configure.ac b/configure.ac -index c5ae701..b99ecb8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -242,6 +242,9 @@ AC_CHECK_HEADERS([dwarf.h], [ - ]) - AM_CONDITIONAL(LIBDWARF,[test "$WITH_LIBDWARF" = yes]) - -+AC_CHECK_HEADERS([bfd.h]) -+AM_CONDITIONAL(HAS_BFD_H, [test "${ac_cv_header_bfd_h}" = "yes"]) -+ - #================= - # Check for beecrypt library if requested. - AC_ARG_WITH(beecrypt, [ --with-beecrypt build with beecrypt support ],,[with_beecrypt=no]) --- -2.7.4 - diff --git a/package.bak/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch b/package.bak/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch deleted file mode 100644 index bebe94511d..0000000000 --- a/package.bak/rpm/0002-tools-sepdebugcrcfix.c-fix-build-with-recent-binutil.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 65afab91444d4996a8e61d1e2d27d52e18417ef5 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 8 Dec 2016 23:45:55 +0100 -Subject: [PATCH 2/2] tools/sepdebugcrcfix.c: fix build with recent binutils - -Moderately recent binutils versions install a header that -checks if config.h is included. While this makes sense in binutils -itself, it does not outside. So the binutils developers have added a -check: if PACKAGE or PACKAGE_VERSION are defined, they assume you're -re-using bfd.h outside of binutils, and therefore including it without -including config.h is legit. - -So we take the same approch as numerous users of bfd.h: fake a PACKAGE -definition. See for example tools/perf/util/srcline.c in the Linux -kernel source tree. - -This fixes the following build error: - -In file included from tools/sepdebugcrcfix.c:31:0: -/home/test/autobuild/run/instance-0/output/host/usr/arc-buildroot-linux-uclibc/sysroot/usr/include/bfd.h:35:2: error: #error config.h must be included before this header - #error config.h must be included before this header - -Signed-off-by: Thomas Petazzoni ---- - tools/sepdebugcrcfix.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/tools/sepdebugcrcfix.c b/tools/sepdebugcrcfix.c -index cd7fa02..e7b480f 100644 ---- a/tools/sepdebugcrcfix.c -+++ b/tools/sepdebugcrcfix.c -@@ -28,6 +28,8 @@ - #include - #include - #include -+/* Needed to please */ -+#define PACKAGE "rpm" - #include - - #define _(x) x --- -2.7.4 - diff --git a/package.bak/rpm/Config.in b/package.bak/rpm/Config.in deleted file mode 100644 index 9b4c8a7e82..0000000000 --- a/package.bak/rpm/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -comment "rpm needs a toolchain w/ dynamic library and threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - depends on BR2_USE_MMU - -config BR2_PACKAGE_RPM - bool "rpm" - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - depends on BR2_TOOLCHAIN_HAS_THREADS # beecrypt - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_BEECRYPT if !BR2_PACKAGE_LIBNSS - select BR2_PACKAGE_BERKELEYDB - select BR2_PACKAGE_FILE - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_POPT - select BR2_PACKAGE_ZLIB - help - The RPM Package Manager (RPM). - - http://www.rpm.org/ diff --git a/package.bak/rpm/rpm.hash b/package.bak/rpm/rpm.hash deleted file mode 100644 index c9c4d659a1..0000000000 --- a/package.bak/rpm/rpm.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://rpm.org/wiki/Releases/4.13.0 -sha1 c6ce4f879ca6a75340921093105e5ef9d33381d3 rpm-4.13.0.tar.bz2 -# Locally computed -sha256 a3e5568d721737a24141737e6036bb39ba9dfbeaa03fa4a51cc7881a243e0c5d b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch -sha256 7ab0e08e143bb2d43d5b0553ee22ea34da15a611c597860a6110745467d20fa8 c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch diff --git a/package.bak/rpm/rpm.mk b/package.bak/rpm/rpm.mk deleted file mode 100644 index 2e829d751a..0000000000 --- a/package.bak/rpm/rpm.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# rpm -# -################################################################################ - -RPM_VERSION = 4.13.0 -RPM_SOURCE = rpm-$(RPM_VERSION).tar.bz2 -RPM_SITE = https://github.com/rpm-software-management/rpm/releases/download/rpm-$(RPM_VERSION)-release -RPM_DEPENDENCIES = host-pkgconf berkeleydb file popt zlib -RPM_LICENSE = GPLv2 or LGPLv2 (library only) -RPM_LICENSE_FILES = COPYING -RPM_PATCH = \ - https://github.com/rpm-software-management/rpm/commit/b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch \ - https://github.com/rpm-software-management/rpm/commit/c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch - -# b5f1895aae096836d6e8e155ee289e1b10fcabcb.patch -# c810a0aca3f1148d2072d44b91b8cc9caeb4cf19.patch -RPM_AUTORECONF = YES - -RPM_CONF_OPTS = \ - --disable-python \ - --disable-rpath \ - --with-external-db \ - --with-gnu-ld \ - --without-cap \ - --without-hackingdocs \ - --without-lua - -ifeq ($(BR2_PACKAGE_ACL),y) -RPM_DEPENDENCIES += acl -RPM_CONF_OPTS += --with-acl -else -RPM_CONF_OPTS += --without-acl -endif - -ifeq ($(BR2_PACKAGE_LIBNSS),y) -RPM_DEPENDENCIES += libnss -RPM_CONF_OPTS += --without-beecrypt -RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/nss -I$(STAGING_DIR)/usr/include/nspr -else -RPM_DEPENDENCIES += beecrypt -RPM_CONF_OPTS += --with-beecrypt -RPM_CFLAGS += -I$(STAGING_DIR)/usr/include/beecrypt -endif - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -RPM_DEPENDENCIES += gettext -RPM_CONF_OPTS += --with-libintl-prefix=$(STAGING_DIR)/usr -else -RPM_CONF_OPTS += --without-libintl-prefix -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -RPM_DEPENDENCIES += libarchive -RPM_CONF_OPTS += --with-archive -else -RPM_CONF_OPTS += --without-archive -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -RPM_DEPENDENCIES += libselinux -RPM_CONF_OPTS += --with-selinux -else -RPM_CONF_OPTS += --without-selinux -endif - -# For the elfutils and binutils dependencies, there are no -# configuration options to explicitly enable/disable them. -ifeq ($(BR2_PACKAGE_ELFUTILS),y) -RPM_DEPENDENCIES += elfutils -endif - -ifeq ($(BR2_PACKAGE_BINUTILS),y) -RPM_DEPENDENCIES += binutils -endif - -# RPM, when using NLS, requires GNU gettext's _nl_msg_cat_cntr, which is not -# provided in musl. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -RPM_CONF_OPTS += --disable-nls -endif - -# ac_cv_prog_cc_c99: RPM uses non-standard GCC extensions (ex. `asm`). -RPM_CONF_ENV = \ - ac_cv_prog_cc_c99='-std=gnu99' \ - CFLAGS="$(TARGET_CFLAGS) $(RPM_CFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/rrdtool/Config.in b/package.bak/rrdtool/Config.in deleted file mode 100644 index 3d8c0c6444..0000000000 --- a/package.bak/rrdtool/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -config BR2_PACKAGE_RRDTOOL - bool "rrdtool" - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - RRDtool is the OpenSource industry standard, high performance - data logging and graphing system for time series data. - - http://oss.oetiker.ch/rrdtool/ - -if BR2_PACKAGE_RRDTOOL - -config BR2_PACKAGE_RRDTOOL_RRDGRAPH - bool "rrd_graph" - default y - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # pango -> harfbuzz - depends on BR2_INSTALL_LIBSTDCPP # freetype support from pango - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PDF - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_CAIRO_PS - select BR2_PACKAGE_CAIRO_SVG - select BR2_PACKAGE_PANGO - help - This enables the graphing capabilities ('rrdgraph'). - Without this it will only act as a database backend. - -comment "rrd_graph support needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -endif - -comment "rrdtool needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/rrdtool/rrdtool.hash b/package.bak/rrdtool/rrdtool.hash deleted file mode 100644 index cff5501de9..0000000000 --- a/package.bak/rrdtool/rrdtool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cd948e89cd2d8825fab4a6fb0323f810948d934af7d92c9ee8b5e9e1350e52d7 rrdtool-1.6.0.tar.gz diff --git a/package.bak/rrdtool/rrdtool.mk b/package.bak/rrdtool/rrdtool.mk deleted file mode 100644 index abca1d80f5..0000000000 --- a/package.bak/rrdtool/rrdtool.mk +++ /dev/null @@ -1,45 +0,0 @@ -################################################################################ -# -# rrdtool -# -################################################################################ - -RRDTOOL_VERSION = 1.6.0 -RRDTOOL_SITE = http://oss.oetiker.ch/rrdtool/pub -RRDTOOL_LICENSE = GPLv2+ with FLOSS license exceptions as explained in COPYRIGHT -RRDTOOL_LICENSE_FILES = COPYRIGHT LICENSE -RRDTOOL_DEPENDENCIES = host-pkgconf libglib2 -# autoreconf needed to avoid link failure due to missing -lintl, -# gettextize needed as a consequence of autoreconf -RRDTOOL_AUTORECONF = YES -RRDTOOL_GETTEXTIZE = YES -RRDTOOL_INSTALL_STAGING = YES -RRDTOOL_CONF_OPTS = \ - --disable-examples \ - --disable-libdbi \ - --disable-librados \ - --disable-libwrap \ - --disable-lua \ - --disable-perl \ - --disable-python \ - --disable-ruby \ - --disable-tcl - - -ifeq ($(BR2_NEEDS_GETTEXT),y) -RRDTOOL_DEPENDENCIES += gettext -endif - -ifeq ($(BR2_PACKAGE_RRDTOOL_RRDGRAPH),y) -RRDTOOL_DEPENDENCIES += cairo pango -else -RRDTOOL_CONF_OPTS += --disable-rrd_graph -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -RRDTOOL_DEPENDENCIES += libxml2 -else -RRDTOOL_CONF_OPTS += --disable-rrd_restore -endif - -$(eval $(autotools-package)) diff --git a/package.bak/rs485conf/Config.in b/package.bak/rs485conf/Config.in deleted file mode 100644 index ff0b7432fd..0000000000 --- a/package.bak/rs485conf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_RS485CONF - bool "rs485conf" - help - rs485conf is intended to be used on embedded boards with RS485 - interface. It can show as well as modify RS485 configuration - parameters of TTY device with easy to use command line - options. - - https://github.com/mniestroj/rs485conf diff --git a/package.bak/rs485conf/rs485conf.hash b/package.bak/rs485conf/rs485conf.hash deleted file mode 100644 index e2ccbfd433..0000000000 --- a/package.bak/rs485conf/rs485conf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 f163f81cd50aae6fa39cbb4f6408a3699da7a87a56649c4b96d6f168c9be6a7d rs485conf-5c8d00cf70950fab3454549b81dea843d844492a.tar.gz diff --git a/package.bak/rs485conf/rs485conf.mk b/package.bak/rs485conf/rs485conf.mk deleted file mode 100644 index 8749268fd5..0000000000 --- a/package.bak/rs485conf/rs485conf.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# rs485conf -# -################################################################################ - -RS485CONF_VERSION = 5c8d00cf70950fab3454549b81dea843d844492a -RS485CONF_SITE = $(call github,mniestroj,rs485conf,$(RS485CONF_VERSION)) -RS485CONF_LICENSE = BSD-3c -RS485CONF_LICENSE_FILES = LICENSE - -define RS485CONF_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define RS485CONF_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/rsh-redone/Config.in b/package.bak/rsh-redone/Config.in deleted file mode 100644 index 6a8aec0369..0000000000 --- a/package.bak/rsh-redone/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_RSH_REDONE - bool "rsh-redone" - help - Rsh-redone is a reimplementation of the remote shell clients and - servers. It is written from the ground up to avoid the bugs found - in the standard clients and servers. It also fully supports IPv6. - - http://packages.debian.org/source/sid/rsh-redone - -if BR2_PACKAGE_RSH_REDONE - -config BR2_PACKAGE_RSH_REDONE_RLOGIN - bool "rlogin" - -config BR2_PACKAGE_RSH_REDONE_RLOGIND - bool "rlogind" - depends on !BR2_STATIC_LIBS - depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on BR2_USE_MMU # linux-pam - select BR2_PACKAGE_LINUX_PAM - -comment "rlogind needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_RSH_REDONE_RSH - bool "rsh" - -config BR2_PACKAGE_RSH_REDONE_RSHD - bool "rshd" - depends on BR2_ENABLE_LOCALE && BR2_USE_WCHAR - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on BR2_USE_MMU # linux-pam - select BR2_PACKAGE_LINUX_PAM - -comment "rshd needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - -endif diff --git a/package.bak/rsh-redone/rsh-redone.hash b/package.bak/rsh-redone/rsh-redone.hash deleted file mode 100644 index ba85607df7..0000000000 --- a/package.bak/rsh-redone/rsh-redone.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rsh-redone/rsh-redone_85-2.dsc -sha256 55ac8ee2acacbc3490f073e3922c0cde46ffe4ea3c593e05c48fed4c1e1a8811 rsh-redone_85.orig.tar.gz diff --git a/package.bak/rsh-redone/rsh-redone.mk b/package.bak/rsh-redone/rsh-redone.mk deleted file mode 100644 index a62c2df193..0000000000 --- a/package.bak/rsh-redone/rsh-redone.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# rsh-redone -# -################################################################################ - -RSH_REDONE_VERSION = 85 -RSH_REDONE_SOURCE = rsh-redone_$(RSH_REDONE_VERSION).orig.tar.gz -RSH_REDONE_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/r/rsh-redone -RSH_REDONE_LICENSE = GPLv2 -RSH_REDONE_LICENSE_FILES = rsh.c - -RSH_REDONE_BINS-y = -RSH_REDONE_BINS-$(BR2_PACKAGE_RSH_REDONE_RLOGIN) += rlogin -RSH_REDONE_BINS-$(BR2_PACKAGE_RSH_REDONE_RSH) += rsh -RSH_REDONE_SBINS-y = -RSH_REDONE_SBINS-$(BR2_PACKAGE_RSH_REDONE_RLOGIND) += in.rlogind -RSH_REDONE_SBINS-$(BR2_PACKAGE_RSH_REDONE_RSHD) += in.rshd - -RSH_REDONE_MAKE_FLAGS = \ - BIN="$(RSH_REDONE_BINS-y)" SBIN="$(RSH_REDONE_SBINS-y)" - -ifneq ($(BR2_PACKAGE_RSH_REDONE_RSHD)$(BR2_PACKAGE_RSH_REDONE_RLOGIND),) -RSH_REDONE_DEPENDENCIES = linux-pam -endif - -define RSH_REDONE_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) $(RSH_REDONE_MAKE_FLAGS) -endef - -define RSH_REDONE_INSTALL_TARGET_CMDS - $(if $(RSH_REDONE_BINS-y)$(RSH_REDONE_SBINS-y), - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(RSH_REDONE_MAKE_FLAGS) DESTDIR=$(TARGET_DIR) \ - $(if $(RSH_REDONE_BINS-y),install-bin) \ - $(if $(RSH_REDONE_SBINS-y),install-sbin)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/rsync/Config.in b/package.bak/rsync/Config.in deleted file mode 100644 index b952974efb..0000000000 --- a/package.bak/rsync/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_RSYNC - bool "rsync" - # fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_POPT - help - File transfer program to keep remote files in sync. - - http://rsync.samba.org/ diff --git a/package.bak/rsync/rsync.hash b/package.bak/rsync/rsync.hash deleted file mode 100644 index 6311116141..0000000000 --- a/package.bak/rsync/rsync.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2 rsync-3.1.2.tar.gz diff --git a/package.bak/rsync/rsync.mk b/package.bak/rsync/rsync.mk deleted file mode 100644 index e1e850c440..0000000000 --- a/package.bak/rsync/rsync.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# rsync -# -################################################################################ - -RSYNC_VERSION = 3.1.2 -RSYNC_SITE = http://rsync.samba.org/ftp/rsync/src -RSYNC_LICENSE = GPLv3+ -RSYNC_LICENSE_FILES = COPYING -RSYNC_DEPENDENCIES = zlib popt -RSYNC_CONF_OPTS = \ - --with-included-zlib=no \ - --with-included-popt=no - -ifeq ($(BR2_PACKAGE_ACL),y) -RSYNC_DEPENDENCIES += acl -else -RSYNC_CONF_OPTS += --disable-acl-support -endif - -$(eval $(autotools-package)) diff --git a/package.bak/rsyslog/Config.in b/package.bak/rsyslog/Config.in deleted file mode 100644 index c4dc97af33..0000000000 --- a/package.bak/rsyslog/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_RSYSLOG - bool "rsyslog" - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LIBESTR - select BR2_PACKAGE_LIBLOGGING - select BR2_PACKAGE_LIBFASTJSON - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # modules - depends on !BR2_TOOLCHAIN_USES_MUSL # GLOB_BRACE - # Propagate the exact same dependency from libfastjson, - # even though rsyslog already depends on threads for itself: - depends on BR2_TOOLCHAIN_HAS_SYNC_4 || BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Rsyslog is a powerful and flexible syslog implementation - - http://www.rsyslog.com - -comment "rsyslog needs a uClibc or glibc toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/rsyslog/S01logging b/package.bak/rsyslog/S01logging deleted file mode 100644 index 8e4a59c2d5..0000000000 --- a/package.bak/rsyslog/S01logging +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh - -start() { - printf "Starting rsyslog daemon: " - start-stop-daemon -S -q -p /var/run/rsyslogd.pid --exec /usr/sbin/rsyslogd - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping rsyslog daemon: " - start-stop-daemon -K -q -p /var/run/rsyslogd.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/rsyslog/rsyslog.hash b/package.bak/rsyslog/rsyslog.hash deleted file mode 100644 index 4fe6a0e261..0000000000 --- a/package.bak/rsyslog/rsyslog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.rsyslog.com/downloads/download-v8-stable/ -sha256 06e2884181333dccecceaca82827ae24ca7a258b4fbf7b1e07a80d4caae640ca rsyslog-8.22.0.tar.gz diff --git a/package.bak/rsyslog/rsyslog.mk b/package.bak/rsyslog/rsyslog.mk deleted file mode 100644 index 3254d99933..0000000000 --- a/package.bak/rsyslog/rsyslog.mk +++ /dev/null @@ -1,106 +0,0 @@ -################################################################################ -# -# rsyslog -# -################################################################################ - -RSYSLOG_VERSION = 8.22.0 -RSYSLOG_SITE = http://rsyslog.com/files/download/rsyslog -RSYSLOG_LICENSE = GPLv3, LGPLv3, Apache-2.0 -RSYSLOG_LICENSE_FILES = COPYING COPYING.LESSER COPYING.ASL20 -RSYSLOG_DEPENDENCIES = zlib libestr liblogging libfastjson host-pkgconf -RSYSLOG_CONF_ENV = ac_cv_prog_cc_c99='-std=c99' -RSYSLOG_PLUGINS = imdiag imfile impstats imptcp \ - mmanon mmaudit mmfields mmjsonparse mmpstrucdata mmsequence mmutf8fix \ - mail omprog omruleset omstdout omuxsock \ - pmaixforwardedfrom pmciscoios pmcisconames pmlastmsg pmsnare -RSYSLOG_CONF_OPTS = --disable-generate-man-pages \ - $(foreach x,$(call qstrip,$(RSYSLOG_PLUGINS)),--enable-$(x)) - -# Build after BusyBox -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -RSYSLOG_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -RSYSLOG_DEPENDENCIES += gnutls -RSYSLOG_CONF_OPTS += --enable-gnutls -else -RSYSLOG_CONF_OPTS += --disable-gnutls -endif - -ifeq ($(BR2_PACKAGE_LIBEE),y) -RSYSLOG_DEPENDENCIES += libee -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -RSYSLOG_DEPENDENCIES += libgcrypt -RSYSLOG_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -RSYSLOG_CONF_OPTS += --enable-libgcrypt -else -RSYSLOG_CONF_OPTS += --disable-libgcrypt -endif - -ifeq ($(BR2_PACKAGE_MYSQL),y) -RSYSLOG_DEPENDENCIES += mysql -RSYSLOG_CONF_OPTS += --enable-mysql -RSYSLOG_CONF_ENV += ac_cv_prog_MYSQL_CONFIG=$(STAGING_DIR)/usr/bin/mysql_config -else -RSYSLOG_CONF_OPTS += --disable-mysql -endif - -ifeq ($(BR2_PACKAGE_POSTGRESQL),y) -RSYSLOG_DEPENDENCIES += postgresql -RSYSLOG_CONF_OPTS += --enable-pgsql -RSYSLOG_CONF_ENV += ac_cv_prog_PG_CONFIG=$(STAGING_DIR)/usr/bin/pg_config -else -RSYSLOG_CONF_OPTS += --disable-pgsql -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -RSYSLOG_DEPENDENCIES += util-linux -RSYSLOG_CONF_OPTS += --enable-uuid -else -RSYSLOG_CONF_OPTS += --disable-uuid -endif - -ifeq ($(BR2_INIT_SYSTEMD),y) -RSYSLOG_CONF_OPTS += \ - --enable-imjournal \ - --enable-omjournal \ - --with-systemdsystemunitdir=/usr/lib/systemd/system -RSYSLOG_DEPENDENCIES += systemd -else -RSYSLOG_CONF_OPTS += \ - --disable-imjournal \ - --disable-omjournal -endif - -define RSYSLOG_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/rsyslog/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging -endef - -# The rsyslog.service is installed by rsyslog, but the link is not created -# so the service is not enabled. -# We need to create another link which is due to the fact that the -# rsyslog.service contains an Alias= -# If we were to use systemctl enable to enable the service, it would -# create both, so we mimic that. -define RSYSLOG_INSTALL_INIT_SYSTEMD - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/rsyslog.service - ln -sf ../../../../usr/lib/systemd/system/rsyslog.service \ - $(TARGET_DIR)/etc/systemd/system/syslog.service -endef - -define RSYSLOG_INSTALL_CONF - $(INSTALL) -m 0644 -D $(@D)/platform/redhat/rsyslog.conf \ - $(TARGET_DIR)/etc/rsyslog.conf - mkdir -p $(TARGET_DIR)/etc/rsyslog.d -endef - -RSYSLOG_POST_INSTALL_TARGET_HOOKS += RSYSLOG_INSTALL_CONF - -$(eval $(autotools-package)) diff --git a/package.bak/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch b/package.bak/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch deleted file mode 100644 index 157514a8e3..0000000000 --- a/package.bak/rt-tests/0001-Fix-various-minor-issues-with-rt-tests-build-system.patch +++ /dev/null @@ -1,55 +0,0 @@ -From eb47c07e9d20e0b1a6cc4b0df26f24f22f024f1c Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Mon, 10 Nov 2014 11:44:55 +0300 -Subject: [PATCH] Fix various minor issues with rt-tests build system - -The issues fixed are : - - * Remove the automatic NUMA detection from the host - architecture. This is broken when doing cross-compilation. One can - still set NUMA=1 if NUMA support is desired. - -Signed-off-by: Thomas Petazzoni -Signed-off-by: Alexey Brodkin -Cc: Peter Korsgaard -[Romain: - rebase on v1.0 - Remove HASPYTHON since PYLIB can be overriden from the environment] -Signed-off-by: Romain Naour ---- - Makefile | 19 ------------------- - 1 file changed, 19 deletions(-) - -diff --git a/Makefile b/Makefile -index a54d82b..0946f93 100644 ---- a/Makefile -+++ b/Makefile -@@ -38,25 +38,6 @@ else - CFLAGS += -O0 -g - endif - --# We make some gueses on how to compile rt-tests based on the machine type --# and the ostype. These can often be overridden. --dumpmachine := $(shell $(CC) -dumpmachine) -- --# The ostype is typically something like linux or android --ostype := $(lastword $(subst -, ,$(dumpmachine))) -- --machinetype := $(shell echo $(dumpmachine)| \ -- sed -e 's/-.*//' -e 's/i.86/i386/' -e 's/mips.*/mips/' -e 's/ppc.*/powerpc/') -- --# The default is to assume you have libnuma installed, which is fine to do --# even on non-numa machines. If you don't want to install the numa libs, for --# example, they might not be available in an embedded environment, then --# compile with --# make NUMA=0 --ifneq ($(filter x86_64 i386 ia64 mips powerpc,$(machinetype)),) --NUMA := 1 --endif -- - # The default is to assume that you have numa_parse_cpustring_all - # If you have an older version of libnuma that only has numa_parse_cpustring - # then compile with --- -2.5.5 - diff --git a/package.bak/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch b/package.bak/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch deleted file mode 100644 index 785d93c9be..0000000000 --- a/package.bak/rt-tests/0002-Fix-a-build-issue-with-uClibc-ng.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 21e0c16a85c2e028a963703511d750d1751bc254 Mon Sep 17 00:00:00 2001 -From: Alexey Brodkin -Date: Wed, 13 Jul 2016 23:46:38 +0200 -Subject: [PATCH] Fix a build issue with uClibc-ng - -uClibc-ng has clock_nanosleep() if built with UCLIBC_HAS_ADVANCED_REALTIME, - conflicting with emulation function. - -Signed-off-by: Peter Korsgaard -[Romain: - rebase on v1.0 - remove uClibc legacy support, uClibc-ng provide utmpx.h] -Signed-off-by: Romain Naour ---- - src/cyclictest/cyclictest.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cyclictest/cyclictest.c b/src/cyclictest/cyclictest.c -index 00e5f3d..92fa3dd 100644 ---- a/src/cyclictest/cyclictest.c -+++ b/src/cyclictest/cyclictest.c -@@ -58,7 +58,7 @@ - #define gettid() syscall(__NR_gettid) - #define sigev_notify_thread_id _sigev_un._tid - --#ifdef __UCLIBC__ -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_ADVANCED_REALTIME__) - #define MAKE_PROCESS_CPUCLOCK(pid, clock) \ - ((~(clockid_t) (pid) << 3) | (clockid_t) (clock)) - #define CPUCLOCK_SCHED 2 --- -2.5.5 - diff --git a/package.bak/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch b/package.bak/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch deleted file mode 100644 index 9d606a4dfd..0000000000 --- a/package.bak/rt-tests/0003-Add-syscall-number-for-sched_-gs-etattr-for-SH4.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 53c7e8bc75f0f27752309ddae49e8d3b867a7681 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Mon, 15 Aug 2016 18:20:47 +0200 -Subject: [PATCH] Add syscall-number for sched_(gs)etattr() for SH4 - -Signed-off-by: Romain Naour ---- - src/include/rt-sched.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/src/include/rt-sched.h b/src/include/rt-sched.h -index 679c4bd..83394c6 100644 ---- a/src/include/rt-sched.h -+++ b/src/include/rt-sched.h -@@ -51,6 +51,16 @@ - #endif - #endif - -+/* SCHED_DEADLINE available on sh4 since kernel 4.8 */ -+#ifdef __SH4__ -+#ifndef __NR_sched_setattr -+#define __NR_sched_setattr 370 -+#endif -+#ifndef __NR_sched_getattr -+#define __NR_sched_getattr 369 -+#endif -+#endif -+ - #ifdef __tilegx__ - #define __NR_sched_setattr 274 - #define __NR_sched_getattr 275 --- -2.5.5 - diff --git a/package.bak/rt-tests/Config.in b/package.bak/rt-tests/Config.in deleted file mode 100644 index b39856d34f..0000000000 --- a/package.bak/rt-tests/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_RT_TESTS - bool "rt-tests" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 # deadline scheduler syscall - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen - depends on !BR2_TOOLCHAIN_USES_MUSL # cyclictest - help - Set of utilities for testing the real-time behaviour of a - Linux system. - - All tools are simple C programs with no dependencies, except - the hwlatdetect utility, which is a Python script and - therefore requires the Python interpreter. It will only be - installed if a Python interpreter has been selected in the - Buildroot configuration. - - Note that this package requires a toolchain built with the - NPTL implementation of the pthread API (this is always the - case with glibc toolchains, but may not necessarily be the - case with uClibc toolchains, since the thread implementation - is configurable). - - http://rt.wiki.kernel.org - - -comment "rt-tests may not work on MIPS with an external uClibc toolchain" - depends on BR2_PACKAGE_RT_TESTS - depends on BR2_TOOLCHAIN_EXTERNAL_UCLIBC - depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - -comment "rt-tests needs a uClibc or glibc toolchain w/ NPTL, headers >= 3.14, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS \ - || BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_14 - depends on BR2_USE_MMU diff --git a/package.bak/rt-tests/rt-tests.hash b/package.bak/rt-tests/rt-tests.hash deleted file mode 100644 index f37af4384f..0000000000 --- a/package.bak/rt-tests/rt-tests.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 aea85fd8eda8c1d96e9d32a019bfd4a1d2e0d362971d97838996f49d1af2d470 rt-tests-1.0.tar.xz diff --git a/package.bak/rt-tests/rt-tests.mk b/package.bak/rt-tests/rt-tests.mk deleted file mode 100644 index addc15e6fd..0000000000 --- a/package.bak/rt-tests/rt-tests.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# rt-tests -# -################################################################################ - -RT_TESTS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/rt-tests -RT_TESTS_SOURCE = rt-tests-$(RT_TESTS_VERSION).tar.xz -RT_TESTS_VERSION = 1.0 -RT_TESTS_LICENSE = GPLv2+ -RT_TESTS_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PYTHON),y) -RT_TESTS_DEPENDENCIES = python -endif - -define RT_TESTS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - prefix=/usr -endef - -define RT_TESTS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR="$(TARGET_DIR)" \ - prefix=/usr \ - $(if $(BR2_PACKAGE_PYTHON),PYLIB=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages/,PYLIB="") \ - install -endef - -$(eval $(generic-package)) diff --git a/package.bak/rtai/Config.in b/package.bak/rtai/Config.in deleted file mode 100644 index 14b1854837..0000000000 --- a/package.bak/rtai/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_RTAI - bool "rtai" - depends on BR2_LINUX_KERNEL_EXT_RTAI - select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra - help - RTAI - the RealTime Application Interface for Linux. - - http://www.rtai.org diff --git a/package.bak/rtai/rtai.hash b/package.bak/rtai/rtai.hash deleted file mode 100644 index f0afafbd7c..0000000000 --- a/package.bak/rtai/rtai.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 13669da744a0ba411bdb8e47fa47b6e19171646ae42c8dbb2735d12e555fb1a3 rtai-4.0.1.tar.bz2 diff --git a/package.bak/rtai/rtai.mk b/package.bak/rtai/rtai.mk deleted file mode 100644 index dfd8e0c190..0000000000 --- a/package.bak/rtai/rtai.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# rtai -# -################################################################################ - -RTAI_VERSION = 4.0.1 -RTAI_SOURCE = rtai-$(RTAI_VERSION).tar.bz2 -RTAI_SITE = https://www.rtai.org/userfiles/downloads/RTAI -RTAI_INSTALL_STAGING = YES - -# The _CONFIG_SCRIPTS cannot apply here to the specificities of rtai-config -define RTAI_POST_PATCH_FIXUP - $(SED) 's%^staging=.*%staging=$(STAGING_DIR)%' $(STAGING_DIR)/usr/bin/rtai-config -endef - -RTAI_POST_INSTALL_STAGING_HOOKS += RTAI_POST_PATCH_FIXUP - -RTAI_DEPENDENCIES = linux - -RTAI_CONF_OPTS = \ - --includedir=/usr/include/rtai \ - --with-linux-dir=$(LINUX_DIR) \ - --disable-leds \ - --enable-usi \ - --enable-align-priority \ - --disable-rtailab \ - --with-module-dir=/lib/modules/$(LINUX_VERSION_PROBED)/rtai - -RTAI_MAKE = $(MAKE1) - -$(eval $(autotools-package)) diff --git a/package.bak/rtl8188eu/Config.in b/package.bak/rtl8188eu/Config.in deleted file mode 100644 index 09cde24a0f..0000000000 --- a/package.bak/rtl8188eu/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_RTL8188EU - bool "rtl8188eu" - depends on BR2_LINUX_KERNEL - help - A standalone driver for the RTL8188EU USB Wi-Fi adapter. - This is needed only for Linux kernels before 3.12. - Since 3.12, there is a (staging) driver in mainline, with a similar - codebase. - - Make sure your target kernel has the CONFIG_WIRELESS_EXT config - option enabled. - - Note: this package needs a firmware loading mechanism to load the - binary blob for the chip to work. - - https://github.com/lwfinger/rtl8188eu - -comment "rtl8188eu needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/rtl8188eu/rtl8188eu.hash b/package.bak/rtl8188eu/rtl8188eu.hash deleted file mode 100644 index 6f68f44259..0000000000 --- a/package.bak/rtl8188eu/rtl8188eu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 9f16fab009bd7bc9e377cf7dcdf82be1b60e7f88e27f2833eea5b422d104e3fe rtl8188eu-ced2b64a1139dcaf86947e3a9f7617dffbd64239.tar.gz diff --git a/package.bak/rtl8188eu/rtl8188eu.mk b/package.bak/rtl8188eu/rtl8188eu.mk deleted file mode 100644 index 8560be297d..0000000000 --- a/package.bak/rtl8188eu/rtl8188eu.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# rtl8188eu -# -################################################################################ - -RTL8188EU_VERSION = ced2b64a1139dcaf86947e3a9f7617dffbd64239 -RTL8188EU_SITE = $(call github,lwfinger,rtl8188eu,$(RTL8188EU_VERSION)) -RTL8188EU_LICENSE = GPLv2, proprietary (rtl8188eufw.bin firmware blob) -RTL8188EU_LICENSE_FILES = COPYING -RTL8188EU_MODULE_MAKE_OPTS = CONFIG_RTL8188EU=m - -define RTL8188EU_INSTALL_FIRMWARE - $(INSTALL) -D -m 644 $(@D)/rtl8188eufw.bin \ - $(TARGET_DIR)/lib/firmware/rtlwifi/rtl8188eufw.bin -endef -RTL8188EU_POST_INSTALL_TARGET_HOOKS += RTL8188EU_INSTALL_FIRMWARE - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch b/package.bak/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch deleted file mode 100644 index 0443c1f995..0000000000 --- a/package.bak/rtl8723bs/0001-rtl8723bs-add-debug-level-modparam.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 9f70428f506ac9d5af325004c01c59c62669d7eb Mon Sep 17 00:00:00 2001 -From: Jason Abele -Date: Sat, 15 Aug 2015 18:20:54 -0700 -Subject: [PATCH] rtl8723bs: add debug level modparam - -For ease of controlling debug printk verbosity, add a module parameter -which sets debug level at module load. - -Signed-off-by: Jason Abele -[Fixed to apply on current version] -Signed-off-by: Ariel D'Alessandro ---- - os_dep/os_intfs.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/os_dep/os_intfs.c b/os_dep/os_intfs.c -index b30c2a0..eeb8946 100644 ---- a/os_dep/os_intfs.c -+++ b/os_dep/os_intfs.c -@@ -231,6 +231,10 @@ module_param(rtw_decrypt_phy_file, int, 0644); - MODULE_PARM_DESC(rtw_decrypt_phy_file,"Enable Decrypt PHY File"); - #endif - -+int rtw_debug_level = _drv_err_; -+module_param(rtw_debug_level, int, 0644); -+MODULE_PARM_DESC(rtw_debug_level,"Set Driver Debug Verbosity"); -+ - int _netdev_open(struct net_device *pnetdev); - int netdev_open (struct net_device *pnetdev); - static int netdev_close (struct net_device *pnetdev); -@@ -347,6 +351,7 @@ static uint loadparam(struct adapter *padapter, _nic_hdl pnetdev) - registry_par->qos_opt_enable = (u8)rtw_qos_opt_enable; - - registry_par->hiq_filter = (u8)rtw_hiq_filter; -+ GlobalDebugLevel = rtw_debug_level; - return status; - } - --- -2.8.3 - diff --git a/package.bak/rtl8723bs/Config.in b/package.bak/rtl8723bs/Config.in deleted file mode 100644 index 3d5dea40b5..0000000000 --- a/package.bak/rtl8723bs/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_RTL8723BS - bool "rtl8723bs" - depends on BR2_LINUX_KERNEL - help - rtl8723bs wifi driver - - https://github.com/hadess/rtl8723bs - -comment "rtl8723bs needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL diff --git a/package.bak/rtl8723bs/rtl8723bs.mk b/package.bak/rtl8723bs/rtl8723bs.mk deleted file mode 100644 index f5bc1acd3c..0000000000 --- a/package.bak/rtl8723bs/rtl8723bs.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# rtl8723bs -# -################################################################################ - -RTL8723BS_VERSION = 11ab92d8ccd71c80f0102828366b14ef6b676fb2 -RTL8723BS_SITE = $(call github,hadess,rtl8723bs,$(RTL8723BS_VERSION)) -RTL8723BS_LICENSE = GPLv2, proprietary (*.bin firmware blobs) - -RTL8723BS_MODULE_MAKE_OPTS = \ - CONFIG_RTL8723BS=m \ - KVER=$(LINUX_VERSION_PROBED) \ - KSRC=$(LINUX_DIR) - -RTL8723BS_BINS = rtl8723bs_ap_wowlan.bin rtl8723bs_wowlan.bin \ - rtl8723bs_bt.bin rtl8723bs_nic.bin - -define RTL8723BS_INSTALL_FIRMWARE - $(foreach bin, $(RTL8723BS_BINS), \ - $(INSTALL) -D -m 644 $(@D)/$(bin) $(TARGET_DIR)/lib/firmware/rtlwifi/$(bin) - ) -endef -RTL8723BS_POST_INSTALL_TARGET_HOOKS += RTL8723BS_INSTALL_FIRMWARE - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/rtl8821au/Config.in b/package.bak/rtl8821au/Config.in deleted file mode 100644 index 9827ad5b94..0000000000 --- a/package.bak/rtl8821au/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -comment "rtl8821au needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_RTL8821AU - bool "rtl8821au" - depends on BR2_LINUX_KERNEL - help - rtl8821au wifi driver - - https://github.com/paralin/rtl8821au diff --git a/package.bak/rtl8821au/rtl8821au.hash b/package.bak/rtl8821au/rtl8821au.hash deleted file mode 100644 index 01f22cc072..0000000000 --- a/package.bak/rtl8821au/rtl8821au.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6e4334b0718b2ac611bf8b4d7a493b016bdb1c24daa7b459f091b92b6fd961c7 rtl8821au-c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e.tar.gz diff --git a/package.bak/rtl8821au/rtl8821au.mk b/package.bak/rtl8821au/rtl8821au.mk deleted file mode 100644 index 9ba43ef146..0000000000 --- a/package.bak/rtl8821au/rtl8821au.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# rtl8821au -# -################################################################################ - -RTL8821AU_VERSION = c33ddb05a77741d2a9c9b974ad0cf0fa26d17b6e -RTL8821AU_SITE = $(call github,abperiasamy,rtl8812AU_8821AU_linux,$(RTL8821AU_VERSION)) -RTL8821AU_LICENSE = GPLv2 -RTL8821AU_LICENSE_FILES = COPYING - -RTL8821AU_MODULE_MAKE_OPTS = \ - CONFIG_RTL8812AU_8821AU=m \ - KVER=$(LINUX_VERSION_PROBED) \ - USER_EXTRA_CFLAGS=-DCONFIG_$(call qstrip,$(BR2_ENDIAN))_ENDIAN - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/rtmpdump/Config.in b/package.bak/rtmpdump/Config.in deleted file mode 100644 index 5e9c50849f..0000000000 --- a/package.bak/rtmpdump/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_RTMPDUMP - bool "librtmp" - select BR2_PACKAGE_ZLIB - help - rtmpdump - RTMPDump Real-Time Messaging Protocol API - Only librtmp is installed by this package. - - http://rtmpdump.mplayerhq.hu diff --git a/package.bak/rtmpdump/rtmpdump.mk b/package.bak/rtmpdump/rtmpdump.mk deleted file mode 100644 index 2e3428f15e..0000000000 --- a/package.bak/rtmpdump/rtmpdump.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# rtmpdump -# -################################################################################ - -RTMPDUMP_VERSION = a107cef9b392616dff54fabfd37f985ee2190a6f -RTMPDUMP_SITE = git://git.ffmpeg.org/rtmpdump -RTMPDUMP_INSTALL_STAGING = YES -# Note that rtmpdump is GPLv2 but librtmp has its own license and since we only -# care about librtmp, it's LGPLv2.1+ -RTMPDUMP_LICENSE = LGPLv2.1+ -RTMPDUMP_LICENSE_FILES = librtmp/COPYING -RTMPDUMP_DEPENDENCIES = zlib - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -RTMPDUMP_DEPENDENCIES += gnutls -RTMPDUMP_CRYPTO = GNUTLS -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -RTMPDUMP_DEPENDENCIES += openssl -RTMPDUMP_CRYPTO = OPENSSL -else -# no crypto -RTMPDUMP_CRYPTO = -endif - -RTMPDUMP_CFLAGS = $(TARGET_CFLAGS) - -ifneq ($(BR2_STATIC_LIBS),y) -RTMPDUMP_CFLAGS += -fPIC -else -RTMPDUMP_SHARED = "SHARED=" -endif - -RTMPDUMP_MAKE_FLAGS = \ - CRYPTO=$(RTMPDUMP_CRYPTO) \ - prefix=/usr \ - $(RTMPDUMP_SHARED) - -define RTMPDUMP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(RTMPDUMP_MAKE_FLAGS) \ - XCFLAGS="$(RTMPDUMP_CFLAGS)" \ - XLDFLAGS="$(TARGET_LDFLAGS)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - -C $(@D)/librtmp -endef - -define RTMPDUMP_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(STAGING_DIR) $(RTMPDUMP_MAKE_FLAGS) -endef - -define RTMPDUMP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/librtmp install DESTDIR=$(TARGET_DIR) $(RTMPDUMP_MAKE_FLAGS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/rtorrent/0001-cross_compile.patch b/package.bak/rtorrent/0001-cross_compile.patch deleted file mode 100644 index a8ad696e6d..0000000000 --- a/package.bak/rtorrent/0001-cross_compile.patch +++ /dev/null @@ -1,65 +0,0 @@ -From d62f7474289970d5be3fd658dd6ace4489408bdf Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 5 Oct 2015 00:52:26 +0100 -Subject: [PATCH] Fix cross compilation, based on OpenWRT patch. - -[Vincent: tweak the patch for version 0.9.6] - -Signed-off-by: Gustavo Zacarias -Signed-off-by: Vicente Olivert Riera ---- - configure.ac | 1 - - scripts/checks.m4 | 2 +- - scripts/common.m4 | 4 ++-- - 3 files changed, 3 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ba5bbf2..0821d4e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4,7 +4,6 @@ AC_DEFINE(API_VERSION, 9, api version) - - AM_INIT_AUTOMAKE - AC_CONFIG_HEADERS(config.h) --AM_PATH_CPPUNIT(1.9.6) - - AC_PROG_CXX - AC_PROG_LIBTOOL -diff --git a/scripts/checks.m4 b/scripts/checks.m4 -index 598f39b..0e5abe0 100644 ---- a/scripts/checks.m4 -+++ b/scripts/checks.m4 -@@ -96,7 +96,7 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [ - AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ - AC_MSG_CHECKING(whether kqueue supports pipes and ptys) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - #include - #include -diff --git a/scripts/common.m4 b/scripts/common.m4 -index 5127624..cc68269 100644 ---- a/scripts/common.m4 -+++ b/scripts/common.m4 -@@ -223,7 +223,7 @@ dnl Need to fix this so that it uses the stuff defined by the system. - AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_MSG_CHECKING(for execinfo.h) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} - ])], -@@ -238,7 +238,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [ - AC_DEFUN([TORRENT_CHECK_ALIGNED], [ - AC_MSG_CHECKING(the byte alignment) - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ - #include - int main() { - char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; --- -1.7.1 - diff --git a/package.bak/rtorrent/Config.in b/package.bak/rtorrent/Config.in deleted file mode 100644 index 190e50fe26..0000000000 --- a/package.bak/rtorrent/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_RTORRENT - bool "rtorrent" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBTORRENT - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - help - BitTorrent Client using libtorrent - - https://github.com/rakshasa/rtorrent - -comment "rtorrent needs a toolchain w/ C++, threads, wchar" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/rtorrent/rtorrent.hash b/package.bak/rtorrent/rtorrent.hash deleted file mode 100644 index 15257acf43..0000000000 --- a/package.bak/rtorrent/rtorrent.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1e69c24f1f26f8f07d58d673480dc392bfc4317818c1115265b08a7813ff5b0e rtorrent-0.9.6.tar.gz diff --git a/package.bak/rtorrent/rtorrent.mk b/package.bak/rtorrent/rtorrent.mk deleted file mode 100644 index edde02ee4b..0000000000 --- a/package.bak/rtorrent/rtorrent.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# rtorrent -# -################################################################################ - -RTORRENT_VERSION = 0.9.6 -RTORRENT_SITE = http://rtorrent.net/downloads -RTORRENT_DEPENDENCIES = host-pkgconf libcurl libtorrent ncurses -RTORRENT_AUTORECONF = YES -RTORRENT_LICENSE = GPLv2 -RTORRENT_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch b/package.bak/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch deleted file mode 100644 index 1bf7c13491..0000000000 --- a/package.bak/rtptools/0001-host2ip.c-disable-NIS-support-for-toolchains-lacking.patch +++ /dev/null @@ -1,73 +0,0 @@ -From f8ffde6c0c0a9008cd65601f6c9712899106e42c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 11 Apr 2016 23:03:48 +0200 -Subject: [PATCH] host2ip.c: disable NIS support for toolchains lacking SUN RPC - -Some toolchains are missing SUN RPC; this is the case for toolchains -based on uClibc, and some glibc-based toolchains (when SUN RPC headers -were taken out of glibc). - -Add a configure check for the required SUN RPC header, and make the code -using SUN RPC conditional on the result. - -Also drop the legacy AM_C_PROTOTYPES: it is no longer supported by -autoconf and breaks autoreconf. - -Signed-off-by: Peter Korsgaard -[yann.morin.1998@free.fr: add the ./configure check; do not include - features.h; do not check specifically for uClibc] -Signed-off-by: "Yann E. MORIN" ---- - configure.in | 3 ++- - host2ip.c | 5 +++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index de394cf..889e6ed 100644 ---- a/configure.in -+++ b/configure.in -@@ -39,9 +39,10 @@ CU_CHECK_LIB(socket, socket) - dnl Checks for header files. - AC_HEADER_STDC - AC_CHECK_HEADERS(search.h sys/time.h unistd.h) -+AC_CHECK_HEADER([rpcsvc/ypclnt.h], -+ [AC_DEFINE([HAVE_YP],[1],[Define to 1 if you have rpcsvc/ypclnt.h])]) - - dnl Checks for typedefs, structures, and compiler characteristics. --AM_C_PROTOTYPES - AC_C_CONST - AC_C_BIGENDIAN - AC_TYPE_UID_T -diff --git a/host2ip.c b/host2ip.c -index b094343..95014cd 100644 ---- a/host2ip.c -+++ b/host2ip.c -@@ -3,7 +3,10 @@ - #include /* gethostbyname() */ - #include /* sockaddr_in */ - #include /* inet_addr() */ -+#ifdef HAVE_YP - #include /* YP */ -+#endif -+ - #include /* strlen() added by Akira 12/27/01 */ - #include "sysdep.h" - -@@ -28,6 +31,7 @@ struct in_addr host2ip(char *host) - else if ((hep = gethostbyname(host))) { - in = *(struct in_addr *)(hep->h_addr_list[0]); - } -+#ifdef HAVE_YP - /* As a last resort, try YP. */ - else { - static char *domain = 0; /* YP domain */ -@@ -39,5 +43,6 @@ struct in_addr host2ip(char *host) - in.s_addr = inet_addr(value); - } - } -+#endif - return in; - } /* host2ip */ --- -1.9.1 - diff --git a/package.bak/rtptools/Config.in b/package.bak/rtptools/Config.in deleted file mode 100644 index 80bbb7a7a0..0000000000 --- a/package.bak/rtptools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_RTPTOOLS - bool "rtptools" - help - The rtptools distribution consists of a number of small - applications that can be used for processing RTP data. - - http://www.cs.columbia.edu/irt/software/rtptools/ diff --git a/package.bak/rtptools/rtptools.hash b/package.bak/rtptools/rtptools.hash deleted file mode 100644 index bf5b4a6f04..0000000000 --- a/package.bak/rtptools/rtptools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 99d681f6e328486fa1fc16581b0a5974e31eb2708101683ee9c8a0b6bed31050 rtptools-1.20.tar.gz diff --git a/package.bak/rtptools/rtptools.mk b/package.bak/rtptools/rtptools.mk deleted file mode 100644 index 7990e8f1c6..0000000000 --- a/package.bak/rtptools/rtptools.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# rtptools -# -################################################################################ - -RTPTOOLS_VERSION = 1.20 -RTPTOOLS_SITE = http://www.cs.columbia.edu/irt/software/rtptools/download -RTPTOOLS_LICENSE = MIT-like (research and education only) -RTPTOOLS_LICENSE_FILES = COPYRIGHT -RTPTOOLS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/rubix/0001-dont-use-legacy-functions.patch b/package.bak/rubix/0001-dont-use-legacy-functions.patch deleted file mode 100644 index 9c34aee6d3..0000000000 --- a/package.bak/rubix/0001-dont-use-legacy-functions.patch +++ /dev/null @@ -1,18 +0,0 @@ -Use strstr() instead of index(), since index() is a legacy function -and it may not be available in uClibc, depending on the configuration. - -Signed-off-by: Thomas Petazzoni - -Index: rubix-1.0.5/cube.c -=================================================================== ---- rubix-1.0.5.orig/cube.c 2010-02-14 14:19:05.000000000 +0100 -+++ rubix-1.0.5/cube.c 2010-02-14 14:19:14.000000000 +0100 -@@ -257,7 +257,7 @@ - if (i==-1) goto finish; - if (buffer[0]=='%') goto new_section; - buffer[0]=toupper(buffer[0]); -- ptr = index(buffer, '='); -+ ptr = strstr(buffer, '='); - if (ptr) { - ++ptr; - while (isspace(*ptr)) ++ptr; diff --git a/package.bak/rubix/0002-misc-fixes.patch b/package.bak/rubix/0002-misc-fixes.patch deleted file mode 100644 index 3ce6dad220..0000000000 --- a/package.bak/rubix/0002-misc-fixes.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff -Nrup rubix-1.0.5/fillpoly.c rubix-1.0.5-avr32/fillpoly.c ---- rubix-1.0.5/fillpoly.c 2003-10-12 15:41:43.000000000 -0400 -+++ rubix-1.0.5-avr32/fillpoly.c 2008-02-29 12:39:51.000000000 -0500 -@@ -435,7 +435,7 @@ void fill_lines(device *d, int thecol) - ); - #endif - } -- } else if (d->depth==16) { /* here 16bpp */ -+ } else if ((d->depth==16) | (d->depth==15)) { /* here 16bpp */ - register int i; - #ifndef PC_ARCHI - register int j; -diff -Nrup rubix-1.0.5/line.c rubix-1.0.5-avr32/line.c ---- rubix-1.0.5/line.c 2003-10-12 14:15:19.000000000 -0400 -+++ rubix-1.0.5-avr32/line.c 2008-02-29 12:39:51.000000000 -0500 -@@ -1317,7 +1317,7 @@ void drawline(device *d, line *l) - #endif - if (d->depth==8) - drawline8(d, l); -- else if (d->depth==16) -+ else if ((d->depth==16) | (d->depth==15)) - drawline16(d, l); - else if (d->depth==24) - drawline24(d, l); -diff -Nrup rubix-1.0.5/Makefile rubix-1.0.5-avr32/Makefile ---- rubix-1.0.5/Makefile 2003-12-04 14:27:58.000000000 -0500 -+++ rubix-1.0.5-avr32/Makefile 2008-02-29 12:58:30.000000000 -0500 -@@ -11,21 +11,17 @@ - # Customize to fit your needs (especially if it does not work for now). - - LANGUAGE=ENGLISH --GAMESDIR=/usr/games - - #architecture=-DPC_ARCHI - - # For Solaris - #EXTRALIBS=-lsocket - --CC=gcc - CFLAGS=-Wall -O3 -fomit-frame-pointer -ffast-math \ - -DGAMESDIR="\"$(GAMESDIR)\"" \ - -D$(LANGUAGE) $(architecture) - - #CFLAGS=-Wall -g -ffast-math -Iplayer $(architecture) --XINC=-I/usr/X11R6/include --XLIB=-L/usr/X11R6/lib -lX11 - - #the following should not be changed. - -@@ -37,7 +33,7 @@ rubix : $(OBJ) - - install : - mkdir -p $(GAMESDIR) -- install -c -s rubix $(GAMESDIR) -+ install -c rubix $(GAMESDIR) - - clean : - rm -f *.o *~ core *.bak *.dat gmon.out -diff -Nrup rubix-1.0.5/screen.c rubix-1.0.5-avr32/screen.c ---- rubix-1.0.5/screen.c 2004-04-26 04:26:05.000000000 -0400 -+++ rubix-1.0.5-avr32/screen.c 2008-02-29 12:39:51.000000000 -0500 -@@ -80,11 +80,17 @@ void error_statement(SCREEN *s) - - int reset_data_buffers(SCREEN *s) - { -+ int temp; - - if (s->im) - XDestroyImage(s->im); -+ if (s->depth == 15) { -+ temp=16; -+ } else { -+ temp=s->depth; -+ } - -- s->buffer=(char *)malloc(((SCREEN_X+7)/8)*SCREEN_Y*s->depth); -+ s->buffer=(char *)malloc(((SCREEN_X+7)/8)*SCREEN_Y*temp); - - if (!s->buffer) { - error_statement(s); -@@ -106,7 +112,7 @@ int reset_data_buffers(SCREEN *s) - */ - /* Sed - december 2003 - no it has to be 8 */ - s->im=XCreateImage(s->d, DefaultVisual(s->d, DefaultScreen(s->d)), -- s->depth==32?24:s->depth, ZPixmap, -+ s->depth, ZPixmap, - 0, s->buffer, SCREEN_X, SCREEN_Y, 8, 0); - - if (!s->im) { -@@ -139,8 +145,8 @@ int init_screen(SCREEN *s) - - s->depth=DefaultDepth(s->d, DefaultScreen(s->d)); - -- if (s->depth!=8 && s->depth!=16 && s->depth!=24) { -- fprintf(stderr, "screen depth not supported (only 8, 16 and 24bpp (which means 32bpp too) handled\n"); -+ if (s->depth!=8 && s->depth!=15 && s->depth!=16 && s->depth!=24) { -+ fprintf(stderr, "screen depth not supported (only 8, 15, 16 and 24bpp (which means 32bpp too) handled\n"); - XCloseDisplay(s->d); - s->d=(Display *)0; - return -1; -@@ -182,10 +188,10 @@ int init_screen(SCREEN *s) - - /* let's create and map our window */ - s->w=XCreateWindow(s->d, DefaultRootWindow(s->d), 0, 0, -- SCREEN_X, SCREEN_Y, 3, s->depth==32?24:s->depth, -+ SCREEN_X, SCREEN_Y, 3, s->depth, - CopyFromParent, CopyFromParent, 0, NULL); - s->h=XCreateWindow(s->d, DefaultRootWindow(s->d), 0, 0, -- HELP_X, HELP_Y, 3, s->depth==32?24:s->depth, -+ HELP_X, HELP_Y, 3, s->depth, - CopyFromParent, CopyFromParent, 0, NULL); - - xch.res_name = "rubix"; -@@ -946,13 +952,18 @@ void close_screen(SCREEN *s) - void clear_screen(SCREEN *s) - { - /* fill s->im with pixel[10], avoid XPutPixel which is rather slow... */ -- int i, w, dw; -+ int i, w, dw, temp; -+ if (s->depth == 15) { -+ temp = 16; -+ } else { -+ temp = s->depth; -+ } - w = (SCREEN_X+7)/8; -- dw = s->depth/8; -+ dw = temp/8; - XPutPixel(s->im, 0, 0, pixel[10]); - for (i=1; i<8*w; i++) - memcpy(s->buffer + i*dw, s->buffer, dw); -- w = w * s->depth; -+ w = w * temp; - for (i=1; ibuffer + i*w, s->buffer, w); - } diff --git a/package.bak/rubix/Config.in b/package.bak/rubix/Config.in deleted file mode 100644 index 7afc0ae7b9..0000000000 --- a/package.bak/rubix/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_RUBIX - bool "rubix" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - help - A 3D rubiks cube game for X - - http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix diff --git a/package.bak/rubix/rubix.hash b/package.bak/rubix/rubix.hash deleted file mode 100644 index 90fc9cd11e..0000000000 --- a/package.bak/rubix/rubix.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d3c6bf8bfa891e72baac0250a79d26045ddb4412b72d90de7c46091c07516b43 rubix-1.0.5.tar.bz2 diff --git a/package.bak/rubix/rubix.mk b/package.bak/rubix/rubix.mk deleted file mode 100644 index b808bc0b87..0000000000 --- a/package.bak/rubix/rubix.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# rubix -# -################################################################################ - -RUBIX_VERSION = 1.0.5 -RUBIX_SOURCE = rubix-$(RUBIX_VERSION).tar.bz2 -RUBIX_SITE = http://mirror.egtvedt.no/avr32linux.org/twiki/pub/Main/Rubix -RUBIX_LICENSE = Public Domain -RUBIX_LICENSE_FILES = LICENCE -RUBIX_DEPENDENCIES = xlib_libX11 - -RUBIX_MAKE_OPTS = \ - CC="$(TARGET_CC)" \ - XINC="-I$(STAGING_DIR)/usr/include/X11" \ - XLIB="-L$(STAGING_DIR)/usr/lib -lX11" - -RUBIX_INSTALL_TARGET_OPTS = GAMESDIR=$(TARGET_DIR)/usr/games install - -$(eval $(autotools-package)) diff --git a/package.bak/ruby/Config.in b/package.bak/ruby/Config.in deleted file mode 100644 index 141db90140..0000000000 --- a/package.bak/ruby/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_RUBY - bool "ruby" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - Object Oriented Scripting Language. - - http://www.ruby-lang.org/ - -comment "ruby needs a toolchain w/ wchar, threads, dynamic library" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/ruby/ruby.hash b/package.bak/ruby/ruby.hash deleted file mode 100644 index 19722a3c96..0000000000 --- a/package.bak/ruby/ruby.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.ruby-lang.org/en/news/2016/12/25/ruby-2-4-0-released/ -sha256 3a87fef45cba48b9322236be60c455c13fd4220184ce7287600361319bb63690 ruby-2.4.0.tar.xz diff --git a/package.bak/ruby/ruby.mk b/package.bak/ruby/ruby.mk deleted file mode 100644 index f0dc63b471..0000000000 --- a/package.bak/ruby/ruby.mk +++ /dev/null @@ -1,102 +0,0 @@ -################################################################################ -# -# ruby -# -################################################################################ - -RUBY_VERSION_MAJOR = 2.4 -RUBY_VERSION = $(RUBY_VERSION_MAJOR).0 -RUBY_VERSION_EXT = 2.4.0 -RUBY_SITE = http://cache.ruby-lang.org/pub/ruby/$(RUBY_VERSION_MAJOR) -RUBY_SOURCE = ruby-$(RUBY_VERSION).tar.xz -RUBY_DEPENDENCIES = host-pkgconf host-ruby -HOST_RUBY_DEPENDENCIES = host-pkgconf -RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) -RUBY_CONF_OPTS = --disable-install-doc --disable-rpath --disable-rubygems -HOST_RUBY_CONF_OPTS = \ - --disable-install-doc \ - --with-out-ext=curses,openssl,readline \ - --without-gmp -RUBY_LICENSE = Ruby or BSD-2c, BSD-3c, others -RUBY_LICENSE_FILES = LEGAL COPYING BSDL - -RUBY_CFLAGS = $(TARGET_CFLAGS) -# With some SuperH toolchains (like Sourcery CodeBench 2012.09), ruby fails to -# build with 'pcrel too far'. This seems to be caused by the -Os option we pass -# by default. To fix the problem, use standard -O2 optimization instead. -ifeq ($(BR2_sh),y) -RUBY_CFLAGS += -O2 -endif -RUBY_CONF_ENV = CFLAGS="$(RUBY_CFLAGS)" - -ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),y) -# On uClibc, finite, isinf and isnan are not directly implemented as -# functions. Instead math.h #define's these to __finite, __isinf and -# __isnan, confusing the Ruby configure script. Tell it that they -# really are available. -RUBY_CONF_ENV += \ - ac_cv_func_finite=yes \ - ac_cv_func_isinf=yes \ - ac_cv_func_isnan=yes -endif - -ifeq ($(BR2_bfin),y) -RUBY_CONF_ENV += ac_cv_func_dl_iterate_phdr=no -# Blackfin doesn't have FFI closure support, needed by the fiddle -# extension. -RUBY_CONF_OPTS += --with-out-ext=fiddle -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_SSP),) -RUBY_CONF_ENV += stack_protector=no -endif - -# Force optionals to build before we do -ifeq ($(BR2_PACKAGE_BERKELEYDB),y) -RUBY_DEPENDENCIES += berkeleydb -endif -ifeq ($(BR2_PACKAGE_GDBM),y) -RUBY_DEPENDENCIES += gdbm -endif -ifeq ($(BR2_PACKAGE_LIBYAML),y) -RUBY_DEPENDENCIES += libyaml -endif -ifeq ($(BR2_PACKAGE_NCURSES),y) -RUBY_DEPENDENCIES += ncurses -endif -ifeq ($(BR2_PACKAGE_OPENSSL),y) -RUBY_DEPENDENCIES += openssl -endif -ifeq ($(BR2_PACKAGE_READLINE),y) -RUBY_DEPENDENCIES += readline -endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -RUBY_DEPENDENCIES += zlib -endif -ifeq ($(BR2_PACKAGE_GMP),y) -RUBY_DEPENDENCIES += gmp -RUBY_CONF_OPTS += --with-gmp -else -RUBY_CONF_OPTS += --without-gmp -endif - -# workaround for amazing build failure, see -# http://lists.busybox.net/pipermail/buildroot/2014-December/114273.html -define RUBY_REMOVE_VERCONF_H - rm -f $(@D)/verconf.h -endef -RUBY_POST_CONFIGURE_HOOKS += RUBY_REMOVE_VERCONF_H - -# Remove rubygems and friends, as they need extensions that aren't -# built and a target compiler. -RUBY_EXTENSIONS_REMOVE = rake* rdoc* rubygems* -define RUBY_REMOVE_RUBYGEMS - rm -f $(addprefix $(TARGET_DIR)/usr/bin/, gem rdoc ri rake) - rm -rf $(TARGET_DIR)/usr/lib/ruby/gems - rm -rf $(addprefix $(TARGET_DIR)/usr/lib/ruby/$(RUBY_VERSION_EXT)/, \ - $(RUBY_EXTENSIONS_REMOVE)) -endef -RUBY_POST_INSTALL_TARGET_HOOKS += RUBY_REMOVE_RUBYGEMS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/runc/Config.in b/package.bak/runc/Config.in deleted file mode 100644 index fd5dee7c5b..0000000000 --- a/package.bak/runc/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_RUNC - bool "runc" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS - depends on BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - help - runC is a CLI tool for spawning and running containers - according to the OCP specification. - - https://github.com/opencontainers/runc - -comment "runc needs a toolchain w/ threads" - depends on BR2_PACKAGE_HOST_GO_ARCH_SUPPORTS && \ - BR2_PACKAGE_HOST_GO_CGO_LINKING_SUPPORTS - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/runc/runc.hash b/package.bak/runc/runc.hash deleted file mode 100644 index 0b6a24ffcb..0000000000 --- a/package.bak/runc/runc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 374822cc2895ed3899b7a3a03b566413ea782fccec1307231f27894e9c6d5bea runc-50a19c6ff828c58e5dab13830bd3dacde268afe5.tar.gz diff --git a/package.bak/runc/runc.mk b/package.bak/runc/runc.mk deleted file mode 100644 index 95afcaaff8..0000000000 --- a/package.bak/runc/runc.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# runc -# -################################################################################ - -RUNC_VERSION = 50a19c6ff828c58e5dab13830bd3dacde268afe5 -RUNC_SITE = $(call github,opencontainers,runc,$(RUNC_VERSION)) -RUNC_LICENSE = Apache-2.0 -RUNC_LICENSE_FILES = LICENSE - -RUNC_DEPENDENCIES = host-go - -RUNC_GOPATH = "$(@D)/Godeps/_workspace" -RUNC_MAKE_ENV = $(HOST_GO_TARGET_ENV) \ - CGO_ENABLED=1 \ - GOBIN="$(@D)/bin" \ - GOPATH="$(RUNC_GOPATH)" \ - PATH=$(BR_PATH) - -RUNC_GLDFLAGS = \ - -X main.gitCommit=$(RUNC_VERSION) - -ifeq ($(BR2_STATIC_LIBS),y) -RUNC_GLDFLAGS += -extldflags '-static' -endif - -RUNC_GOTAGS = cgo static_build - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -RUNC_GOTAGS += seccomp -RUNC_DEPENDENCIES += libseccomp host-pkgconf -endif - -define RUNC_CONFIGURE_CMDS - mkdir -p $(RUNC_GOPATH)/src/github.com/opencontainers - ln -s $(@D) $(RUNC_GOPATH)/src/github.com/opencontainers/runc -endef - -define RUNC_BUILD_CMDS - cd $(@D) && $(RUNC_MAKE_ENV) $(HOST_DIR)/usr/bin/go \ - build -v -o $(@D)/bin/runc \ - -tags "$(RUNC_GOTAGS)" -ldflags "$(RUNC_GLDFLAGS)" . -endef - -define RUNC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/bin/runc $(TARGET_DIR)/usr/bin/runc -endef - -$(eval $(generic-package)) diff --git a/package.bak/sam-ba/Config.in.host b/package.bak/sam-ba/Config.in.host deleted file mode 100644 index 6093865e4c..0000000000 --- a/package.bak/sam-ba/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_SAM_BA - bool "host sam-ba" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - select BR2_HOSTARCH_NEEDS_IA32_LIBS - help - Atmel SAM-BA software provides an open set of tools for - programming the Atmel SAM3, SAM7 and SAM9 ARM-based - microcontrollers. - - http://www.at91.com/linux4sam/bin/view/Linux4SAM/SoftwareTools diff --git a/package.bak/sam-ba/sam-ba.hash b/package.bak/sam-ba/sam-ba.hash deleted file mode 100644 index 61feb32d8d..0000000000 --- a/package.bak/sam-ba/sam-ba.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 302734f53e471b5d1a292c9af937262f4fd766ec47ebfea62439761e7c1cd9d7 sam-ba_2.16_linux.zip diff --git a/package.bak/sam-ba/sam-ba.mk b/package.bak/sam-ba/sam-ba.mk deleted file mode 100644 index 7fc65c01a9..0000000000 --- a/package.bak/sam-ba/sam-ba.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# sam-ba -# -################################################################################ - -SAM_BA_SITE = http://www.atmel.com/dyn/resources/prod_documents -SAM_BA_VERSION = 2.16 -SAM_BA_SOURCE = sam-ba_$(SAM_BA_VERSION)_linux.zip -SAM_BA_LICENSE = SAM-BA license (sam-ba executable), \ - BSD-2c like, BSD-4c (TCL and applets code) -SAM_BA_LICENSE_FILES = doc/license.txt tcl_lib/boards.tcl \ - applets/sam4c/libraries/libchip_sam4c/include/sam4c/sam4c32e-1.h - -define HOST_SAM_BA_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(SAM_BA_SOURCE) - mv $(BUILD_DIR)/sam-ba_cdc_linux/* $(@D) - rmdir $(BUILD_DIR)/sam-ba_cdc_linux/ -endef - -# Since it's a prebuilt application and it does not conform to the -# usual Unix hierarchy, we install it in $(HOST_DIR)/opt/sam-ba and -# then create a symbolic link from $(HOST_DIR)/usr/bin to the -# application binary, for easier usage. - -define HOST_SAM_BA_INSTALL_CMDS - mkdir -p $(HOST_DIR)/opt/sam-ba/ - cp -a $(@D)/* $(HOST_DIR)/opt/sam-ba/ - ln -sf ../../opt/sam-ba/sam-ba $(HOST_DIR)/usr/bin/sam-ba -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/samba4/0001-libreplace-disable-libbsd-support.patch b/package.bak/samba4/0001-libreplace-disable-libbsd-support.patch deleted file mode 100644 index 4d0c770af4..0000000000 --- a/package.bak/samba4/0001-libreplace-disable-libbsd-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From fc0304ba92ec7ae9a2f75fbc31d97fee39d19665 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Wed, 7 Sep 2016 23:03:43 -0300 -Subject: [PATCH] libreplace: disable libbsd support - -Disable libbsd support, samba4 uses a global config.h for its own -codebase and that of heimdal (when building with builtin). -This causes redefinition conflicts for link(2) when both standard -unistd.h and bsd/unistd.h get included. - -Signed-off-by: Gustavo Zacarias ---- - lib/replace/wscript | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/lib/replace/wscript b/lib/replace/wscript -index 1dfd902..456be9b 100644 ---- a/lib/replace/wscript -+++ b/lib/replace/wscript -@@ -248,18 +248,6 @@ def configure(conf): - - conf.CHECK_FUNCS('prctl dirname basename') - -- # libbsd on some platforms provides strlcpy and strlcat -- if not conf.CHECK_FUNCS('strlcpy strlcat'): -- conf.CHECK_FUNCS_IN('strlcpy strlcat', 'bsd', headers='bsd/string.h', -- checklibc=True) -- if not conf.CHECK_FUNCS('getpeereid'): -- conf.CHECK_FUNCS_IN('getpeereid', 'bsd', headers='sys/types.h bsd/unistd.h') -- if not conf.CHECK_FUNCS_IN('setproctitle', 'setproctitle', headers='setproctitle.h'): -- conf.CHECK_FUNCS_IN('setproctitle', 'bsd', headers='sys/types.h bsd/unistd.h') -- -- if not conf.CHECK_FUNCS('closefrom'): -- conf.CHECK_FUNCS_IN('closefrom', 'bsd', headers='bsd/unistd.h') -- - conf.CHECK_CODE(''' - struct ucred cred; - socklen_t cred_len; --- -2.7.3 - diff --git a/package.bak/samba4/Config.in b/package.bak/samba4/Config.in deleted file mode 100644 index 447418568d..0000000000 --- a/package.bak/samba4/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, NPTL" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \ - || BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU - -config BR2_PACKAGE_SAMBA4 - bool "samba4" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # python - depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # python -> libffi - depends on !BR2_STATIC_LIBS # python - depends on !BR2_nios2 # binary too large, relocations don't fit - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_E2FSPROGS - select BR2_PACKAGE_POPT - select BR2_PACKAGE_PYTHON - select BR2_PACKAGE_ZLIB - help - Provides secure, stable and fast file and print services - for all clients using the SMB/CIFS protocol, such as all - versions of DOS, Windows, OS/2, Linux and many others. - - http://www.samba.org/ - -if BR2_PACKAGE_SAMBA4 - -config BR2_PACKAGE_SAMBA4_AD_DC - bool "AD DC" - select BR2_PACKAGE_GNUTLS - help - Enable Active Directory Domain Controller functionality. - -config BR2_PACKAGE_SAMBA4_ADS - bool "ADS" - select BR2_PACKAGE_OPENLDAP - help - Enable Active Directory member Server functionality. - -config BR2_PACKAGE_SAMBA4_SMBTORTURE - bool "smbtorture" - help - Install the smbtorture test suite. - It's normally used for validation and stress testing. - Approximately +5 MB of stripped uncompressed target space. - -endif diff --git a/package.bak/samba4/S91smb b/package.bak/samba4/S91smb deleted file mode 100644 index c8c5fc86a4..0000000000 --- a/package.bak/samba4/S91smb +++ /dev/null @@ -1,56 +0,0 @@ -#!/bin/sh - -[ -f /etc/samba/smb.conf ] || exit 0 - -mkdir -p /var/log/samba - -start() { - printf "Starting SMB services: " - smbd -D - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Starting NMB services: " - nmbd -D - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Shutting down SMB services: " - kill -9 `pidof smbd` - [ $? = 0 ] && echo "OK" || echo "FAIL" - - printf "Shutting down NMB services: " - kill -9 `pidof nmbd` - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - start -} - -reload() { - printf "Reloading smb.conf file: " - kill -HUP `pidof smbd` - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - reload) - reload - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - -exit $? diff --git a/package.bak/samba4/samba4-cache.txt b/package.bak/samba4/samba4-cache.txt deleted file mode 100644 index 3ba8a75ea6..0000000000 --- a/package.bak/samba4/samba4-cache.txt +++ /dev/null @@ -1,39 +0,0 @@ -Checking simple C program: OK -rpath library support: OK --Wl,--version-script support: OK -Checking getconf LFS_CFLAGS: NO -Checking for large file support without additional flags: OK -Checking for -D_LARGE_FILES: OK -Checking correct behavior of strtoll: NO -Checking for working strptime: OK -Checking for C99 vsnprintf: OK -Checking for HAVE_SHARED_MMAP: OK -Checking for HAVE_MREMAP: OK -Checking for HAVE_INCOHERENT_MMAP: NO -Checking for HAVE_SECURE_MKSTEMP: OK -Checking for HAVE_IFACE_GETIFADDRS: OK -Checking for kernel change notify support: OK -Checking for Linux kernel oplocks: OK -Checking for kernel share modes: OK -Checking if can we convert from CP850 to UCS-2LE: OK -Checking if can we convert from UTF-8 to UCS-2LE: OK -Checking whether we can use Linux thread-specific credentials with 32-bit system calls: OK -Checking whether we can use Linux thread-specific credentials: OK -Checking whether setreuid is available: OK -Checking whether setresuid is available: OK -Checking whether seteuid is available: OK -Checking whether fcntl locking is available: OK -Checking whether fcntl lock supports open file description locks: OK -Checking for the maximum value of the 'time_t' type: OK -Checking whether the realpath function allows a NULL argument: OK -Checking whether POSIX capabilities are available: OK -Checking for ftruncate extend: OK -vfs_fileid checking for statfs() and struct statfs.f_fsid: OK -getcwd takes a NULL argument: OK -Checking uname sysname type: "Linux" -Checking uname release type: "3.0.0" -Checking uname version type: "#1 Tue Nov 1 12:34:56 UTC 2013" -Checking value of NSIG: "65" -Checking value of _NSIG: "65" -Checking value of SIGRTMAX: "64" -Checking value of SIGRTMIN: "34" diff --git a/package.bak/samba4/samba4.hash b/package.bak/samba4/samba4.hash deleted file mode 100644 index 4fec55dd60..0000000000 --- a/package.bak/samba4/samba4.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bff02762b3e4ee030f02266c6e24a0b888248b387246219b7fbe3e1758ef2184 samba-4.5.5.tar.gz diff --git a/package.bak/samba4/samba4.mk b/package.bak/samba4/samba4.mk deleted file mode 100644 index f64b684bf8..0000000000 --- a/package.bak/samba4/samba4.mk +++ /dev/null @@ -1,162 +0,0 @@ -################################################################################ -# -# samba4 -# -################################################################################ - -SAMBA4_VERSION = 4.5.5 -SAMBA4_SITE = https://download.samba.org/pub/samba/stable -SAMBA4_SOURCE = samba-$(SAMBA4_VERSION).tar.gz -SAMBA4_INSTALL_STAGING = YES -SAMBA4_LICENSE = GPLv3+ -SAMBA4_LICENSE_FILES = COPYING -SAMBA4_DEPENDENCIES = \ - host-e2fsprogs host-heimdal host-python \ - e2fsprogs popt python zlib \ - $(if $(BR2_PACKAGE_LIBAIO),libaio) \ - $(if $(BR2_PACKAGE_LIBCAP),libcap) \ - $(if $(BR2_PACKAGE_READLINE),readline) - -ifeq ($(BR2_PACKAGE_ACL),y) -SAMBA4_CONF_OPTS += --with-acl-support -SAMBA4_DEPENDENCIES += acl -else -SAMBA4_CONF_OPTS += --without-acl-support -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -SAMBA4_CONF_ENV += CUPS_CONFIG="$(STAGING_DIR)/usr/bin/cups-config" -SAMBA4_CONF_OPTS += --enable-cups -SAMBA4_DEPENDENCIES += cups -else -SAMBA4_CONF_OPTS += --disable-cups -endif - -ifeq ($(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_AVAHI_DAEMON),yy) -SAMBA4_CONF_OPTS += --enable-avahi -SAMBA4_DEPENDENCIES += avahi -else -SAMBA4_CONF_OPTS += --disable-avahi -endif - -ifeq ($(BR2_PACKAGE_GAMIN),y) -SAMBA4_CONF_OPTS += --with-fam -SAMBA4_DEPENDENCIES += gamin -else -SAMBA4_CONF_OPTS += --without-fam -endif - -ifeq ($(BR2_PACKAGE_GETTEXT),y) -SAMBA4_DEPENDENCIES += gettext -else -SAMBA4_CONF_OPTS += --without-gettext -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -SAMBA4_CONF_OPTS += --enable-gnutls -SAMBA4_DEPENDENCIES += gnutls -else -SAMBA4_CONF_OPTS += --disable-gnutls -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -SAMBA4_CONF_ENV += NCURSES_CONFIG="$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS)" -SAMBA4_DEPENDENCIES += ncurses -else -SAMBA4_CONF_OPTS += --without-regedit -endif - -# The ctdb tests (cluster) need bash and take up some space -# They're normally intended for debugging so remove them -define SAMBA4_REMOVE_CTDB_TESTS - rm -rf $(TARGET_DIR)/usr/lib/ctdb-tests - rm -rf $(TARGET_DIR)/usr/share/ctdb-tests - rm -f $(TARGET_DIR)/usr/bin/ctdb_run_*tests -endef -SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_REMOVE_CTDB_TESTS - -define SAMBA4_CONFIGURE_CMDS - cp package/samba4/samba4-cache.txt $(@D)/cache.txt; - echo 'Checking uname machine type: $(BR2_ARCH)' >>$(@D)/cache.txt; - (cd $(@D); \ - PYTHON_CONFIG="$(STAGING_DIR)/usr/bin/python-config" \ - python_LDFLAGS="" \ - python_LIBDIR="" \ - $(TARGET_CONFIGURE_OPTS) \ - $(SAMBA4_CONF_ENV) \ - ./buildtools/bin/waf configure \ - --prefix=/usr \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --with-libiconv=$(STAGING_DIR)/usr \ - --enable-fhs \ - --cross-compile \ - --cross-answers=$(@D)/cache.txt \ - --hostcc=gcc \ - --disable-rpath \ - --disable-rpath-install \ - --disable-iprint \ - --without-pam \ - --without-dmapi \ - --disable-glusterfs \ - --with-cluster-support \ - --bundled-libraries='!asn1_compile,!compile_et' \ - $(SAMBA4_CONF_OPTS) \ - ) -endef - -define SAMBA4_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define SAMBA4_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -define SAMBA4_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -ifeq ($(BR2_PACKAGE_SAMBA4_AD_DC),) -SAMBA4_CONF_OPTS += --without-ad-dc -endif - -ifeq ($(BR2_PACKAGE_SAMBA4_ADS),y) -SAMBA4_CONF_OPTS += --with-ads --with-ldap --with-shared-modules=idmap_ad -SAMBA4_DEPENDENCIES += openldap -else -SAMBA4_CONF_OPTS += --without-ads --without-ldap -endif - -ifeq ($(BR2_PACKAGE_SAMBA4_SMBTORTURE),) -define SAMBA4_REMOVE_SMBTORTURE - rm -f $(TARGET_DIR)/usr/bin/smbtorture -endef -SAMBA4_POST_INSTALL_TARGET_HOOKS += SAMBA4_REMOVE_SMBTORTURE -endif - -define SAMBA4_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/samba4/S91smb \ - $(TARGET_DIR)/etc/init.d/S91smb -endef - -define SAMBA4_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/nmb.service \ - $(TARGET_DIR)/usr/lib/systemd/system/nmb.service - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/smb.service \ - $(TARGET_DIR)/usr/lib/systemd/system/smb.service - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/winbind.service \ - $(TARGET_DIR)/usr/lib/systemd/system/winbind.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/nmb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/nmb.service - ln -sf ../../../../usr/lib/systemd/system/smb.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/smb.service - ln -sf ../../../../usr/lib/systemd/system/winbind.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/winbind.service - $(INSTALL) -D -m 644 $(@D)/packaging/systemd/samba.conf.tmp \ - $(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf - printf "d /var/log/samba 755 root root\n" >>$(TARGET_DIR)/usr/lib/tmpfiles.d/samba.conf -endef - -$(eval $(generic-package)) diff --git a/package.bak/sane-backends/0001-qcam-x86.patch b/package.bak/sane-backends/0001-qcam-x86.patch deleted file mode 100644 index f14dd0e980..0000000000 --- a/package.bak/sane-backends/0001-qcam-x86.patch +++ /dev/null @@ -1,61 +0,0 @@ -[PATCH] backend/qcam.c: fix build on !x86 - -inb/outb/ioperm are x86 specific interfaces, so replace with noops on -!x86. - -Inspired by similar patch in openwrt: -https://dev.openwrt.org/ticket/5689 - -Signed-off-by: Peter Korsgaard ---- - backend/qcam.c | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -Index: sane-backends-1.0.22/backend/qcam.c -=================================================================== ---- sane-backends-1.0.22.orig/backend/qcam.c -+++ sane-backends-1.0.22/backend/qcam.c -@@ -205,12 +205,20 @@ - - #endif /* || || */ - -+/* inb / outb only exist on x86 */ -+#if defined(__i386__) || defined(__x86_64__) - #define read_lpdata(d) inb ((d)->port) - #define read_lpstatus(d) inb ((d)->port + 1) - #define read_lpcontrol(d) inb ((d)->port + 2) - #define write_lpdata(d,v) outb ((v), (d)->port) - #define write_lpcontrol(d,v) outb ((v), (d)->port + 2) -- -+#else -+#define read_lpdata(d) 0 -+#define read_lpstatus(d) 0 -+#define read_lpcontrol(d) 0 -+#define write_lpdata(d,v) -+#define write_lpcontrol(d,v) -+#endif - - static SANE_Status - enable_ports (QC_Device * q) -@@ -219,8 +227,10 @@ - if (q->port < 0x278 || q->port > 0x3bc) - return SANE_STATUS_INVAL; - -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 1) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } -@@ -228,8 +238,10 @@ - static SANE_Status - disable_ports (QC_Device * q) - { -+#if defined(__i386__) || defined(__x86_64__) - if (ioperm (q->port, 3, 0) < 0) - return SANE_STATUS_INVAL; -+#endif - - return SANE_STATUS_GOOD; - } diff --git a/package.bak/sane-backends/0002-Add-missing-sys-types.h-includes.patch b/package.bak/sane-backends/0002-Add-missing-sys-types.h-includes.patch deleted file mode 100644 index 8ab41f1fef..0000000000 --- a/package.bak/sane-backends/0002-Add-missing-sys-types.h-includes.patch +++ /dev/null @@ -1,106 +0,0 @@ -From d33f16f463e888846d69ddfbeeb963d40972b654 Mon Sep 17 00:00:00 2001 -From: Luiz Angelo Daros de Luca -Date: Thu, 15 Oct 2015 12:35:00 +0900 -Subject: [PATCH] Add missing includes - -[Thomas: backport from upstream commit -33495ef9b42a783c8f5f2c056ac5699481d3cc7e, allows to fix the build with -the musl C library.] -Signed-off-by: Thomas Petazzoni ---- - backend/epsonds-io.c | 3 +++ - backend/hp5400.c | 3 +++ - backend/hp5590.c | 3 +++ - backend/kvs20xx_cmd.h | 4 ++++ - backend/kvs40xx.h | 3 +++ - include/sane/sanei_udp.h | 3 +++ - 6 files changed, 19 insertions(+) - -diff --git a/backend/epsonds-io.c b/backend/epsonds-io.c -index 28bacfc..512997d 100644 ---- a/backend/epsonds-io.c -+++ b/backend/epsonds-io.c -@@ -16,6 +16,9 @@ - #include "sane/config.h" - #include - #include /* sleep */ -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "epsonds.h" - #include "epsonds-io.h" -diff --git a/backend/hp5400.c b/backend/hp5400.c -index 61de3db..cfa2dc9 100644 ---- a/backend/hp5400.c -+++ b/backend/hp5400.c -@@ -67,6 +67,9 @@ - #include /* malloc, free */ - #include /* memcpy */ - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - - #define HP5400_CONFIG_FILE "hp5400.conf" -diff --git a/backend/hp5590.c b/backend/hp5590.c -index 7b1cd60..5422372 100644 ---- a/backend/hp5590.c -+++ b/backend/hp5590.c -@@ -48,6 +48,9 @@ - #include - #include - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #include "../include/sane/sane.h" - #define BACKEND_NAME hp5590 -diff --git a/backend/kvs20xx_cmd.h b/backend/kvs20xx_cmd.h -index c18b754..4acaf62 100644 ---- a/backend/kvs20xx_cmd.h -+++ b/backend/kvs20xx_cmd.h -@@ -9,6 +9,10 @@ - Panasonic KV-S20xx USB-SCSI scanners. - */ - -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif -+ - #define COMMAND_BLOCK 1 - #define DATA_BLOCK 2 - #define RESPONSE_BLOCK 3 -diff --git a/backend/kvs40xx.h b/backend/kvs40xx.h -index fa17163..02e0da6 100644 ---- a/backend/kvs40xx.h -+++ b/backend/kvs40xx.h -@@ -10,6 +10,9 @@ - - #include "../include/sane/config.h" - #include -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - #undef BACKEND_NAME - #define BACKEND_NAME kvs40xx -diff --git a/include/sane/sanei_udp.h b/include/sane/sanei_udp.h -index c44afdd..e32fc1a 100644 ---- a/include/sane/sanei_udp.h -+++ b/include/sane/sanei_udp.h -@@ -27,6 +27,9 @@ - #include - #include - #endif -+#ifdef HAVE_SYS_TYPES_H -+#include -+#endif - - extern SANE_Status sanei_udp_open(const char *host, int port, int *fdp); - extern SANE_Status sanei_udp_open_broadcast(int *fdp); --- -2.7.4 - diff --git a/package.bak/sane-backends/0003-sane_backend-add-missing-config.h.patch b/package.bak/sane-backends/0003-sane_backend-add-missing-config.h.patch deleted file mode 100644 index 8e56b0284b..0000000000 --- a/package.bak/sane-backends/0003-sane_backend-add-missing-config.h.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 13aadf79659dd238b618c8be7c1de44960bd5d50 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 11 Nov 2016 22:20:03 +0100 -Subject: [PATCH] sane_backend: add missing config.h - -We should include config.h from sanei_backend.h in order to use the -correct if/else HAVE_FOO. - -For some reason with Glibc or uClibc there is no problem but with musl -we have the following weird issue: - -In file included from epsonds.h:41:0, - from epsonds-jpeg.c:18: -../include/sane/sanei_backend.h:99:33: error: expected ';', identifier or '(' before 'int' - # define sigset_t int - ^ -../include/sane/sanei_backend.h:99:33: warning: useless type name in empty declaration - -That's because HAVE_SIGPROCMASK is not defined although it's correctly -detected by the configure script. - -$ grep config.log -config.log:#define HAVE_SIGPROCMASK 1 - -So, include config.h to avoid to redefine sigset_t. - -Fixes: -http://autobuild.buildroot.net/results/9f1/9f1f1cb727b5c5407e69172280a3dee880e55cdf - -Signed-off-by: Romain Naour ---- - include/sane/sanei_backend.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/include/sane/sanei_backend.h b/include/sane/sanei_backend.h -index 1b5afe2..2a96532 100644 ---- a/include/sane/sanei_backend.h -+++ b/include/sane/sanei_backend.h -@@ -8,6 +8,7 @@ - * @sa sanei.h sanei_thread.h - */ - -+#include "../include/sane/config.h" - - /* - * Compiler related options --- -2.5.5 - diff --git a/package.bak/sane-backends/Config.in b/package.bak/sane-backends/Config.in deleted file mode 100644 index 3e5a27ffe0..0000000000 --- a/package.bak/sane-backends/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_SANE_BACKENDS - bool "sane-backends" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - help - SANE - Scanner Access Now Easy - - http://www.sane-project.org - - Backends are included automatically based on the libraries that have - been selected: libusb, jpeg, tiff, avahi (with dbus and libglib2), - and netsnmp. - -comment "sane-backends needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/sane-backends/sane-backends.hash b/package.bak/sane-backends/sane-backends.hash deleted file mode 100644 index a7693e2527..0000000000 --- a/package.bak/sane-backends/sane-backends.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.sane-project.org/sane-md5sums.txt -md5 f9ed5405b3c12f07c6ca51ee60225fe7 sane-backends-1.0.25.tar.gz diff --git a/package.bak/sane-backends/sane-backends.mk b/package.bak/sane-backends/sane-backends.mk deleted file mode 100644 index 37e5136c11..0000000000 --- a/package.bak/sane-backends/sane-backends.mk +++ /dev/null @@ -1,78 +0,0 @@ -################################################################################ -# -# sane-backends -# -################################################################################ - -SANE_BACKENDS_VERSION = 1.0.25 -SANE_BACKENDS_SITE = https://alioth.debian.org/frs/download.php/file/4146 -SANE_BACKENDS_CONFIG_SCRIPTS = sane-config -SANE_BACKENDS_LICENSE = GPLv2+ -SANE_BACKENDS_LICENSE_FILES = COPYING -SANE_BACKENDS_INSTALL_STAGING = YES - -SANE_BACKENDS_CONF_OPTS = \ - $(if $(BR2_TOOLCHAIN_HAS_THREADS),--enable-pthread,--disable-pthread) - -ifeq ($(BR2_INIT_SYSTEMD),y) -SANE_BACKENDS_CONF_OPTS += --with-systemd -SANE_BACKENDS_DEPENDENCIES += systemd -else -SANE_BACKENDS_CONF_OPTS += --without-systemd -endif - -ifeq ($(BR2_PACKAGE_LIBUSB),y) -SANE_BACKENDS_DEPENDENCIES += libusb -SANE_BACKENDS_CONF_OPTS += --enable-libusb_1_0 -else -SANE_BACKENDS_CONF_OPTS += --disable-libusb -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -SANE_BACKENDS_DEPENDENCIES += jpeg -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -SANE_BACKENDS_DEPENDENCIES += tiff -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -SANE_BACKENDS_DEPENDENCIES += libv4l -endif - -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_DBUS)$(BR2_PACKAGE_LIBGLIB2),yyy) -SANE_BACKENDS_DEPENDENCIES += avahi -SANE_BACKENDS_CONF_OPTS += --enable-avahi -endif - -ifeq ($(BR2_PACKAGE_NETSNMP),y) -SANE_BACKENDS_CONF_ENV += ac_cv_path_SNMP_CONFIG_PATH=$(STAGING_DIR)/usr/bin/net-snmp-config -SANE_BACKENDS_DEPENDENCIES += netsnmp -else -SANE_BACKENDS_CONF_OPTS += --without-snmp -endif - -define SANE_BACKENDS_DISABLE_DOCS - $(SED) 's/ doc//' $(@D)/Makefile -endef - -SANE_BACKENDS_POST_CONFIGURE_HOOKS += SANE_BACKENDS_DISABLE_DOCS - -define SANE_BACKENDS_USERS - saned -1 saned -1 * /etc/sane.d - - Saned User -endef - -define SANE_BACKENDS_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/sane-backends/saned.socket \ - $(TARGET_DIR)/usr/lib/systemd/system/saned.socket - mkdir -p $(TARGET_DIR)/etc/systemd/system/socket.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned.socket \ - $(TARGET_DIR)/etc/systemd/system/socket.target.wants/saned.socket - $(INSTALL) -m 0644 -D package/sane-backends/saned@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/saned@.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/saned@.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/saned@.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/sane-backends/saned.socket b/package.bak/sane-backends/saned.socket deleted file mode 100644 index 1aa19e703c..0000000000 --- a/package.bak/sane-backends/saned.socket +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=saned incoming socket - -[Socket] -ListenStream=6566 -Accept=yes -MaxConnections=1 - -[Install] -WantedBy=sockets.target diff --git a/package.bak/sane-backends/saned@.service b/package.bak/sane-backends/saned@.service deleted file mode 100644 index 1905dbf5e2..0000000000 --- a/package.bak/sane-backends/saned@.service +++ /dev/null @@ -1,18 +0,0 @@ -[Unit] -Description=Scanner Service -Requires=saned.socket - -[Service] -ExecStart=/usr/sbin/saned -User=saned -Group=saned -StandardInput=null -StandardOutput=syslog -StandardError=syslog -Environment=SANE_CONFIG_DIR=/etc/sane.d -# If you need to debug your configuration uncomment the next line and -# change it as appropriate to set the desired debug options -# Environment=SANE_DEBUG_DLL=255 SANE_DEBUG_BJNP=5 - -[Install] -Also=saned.socket diff --git a/package.bak/sbc/Config.in b/package.bak/sbc/Config.in deleted file mode 100644 index f1dbc0ec2c..0000000000 --- a/package.bak/sbc/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SBC - bool "sbc" - select BR2_PACKAGE_LIBSNDFILE - help - An audio codec to connect bluetooth high quality audio - devices like headphones or loudspeakers. - - http://www.bluez.org/ diff --git a/package.bak/sbc/sbc.hash b/package.bak/sbc/sbc.hash deleted file mode 100644 index be3c8f76f4..0000000000 --- a/package.bak/sbc/sbc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/bluetooth/sha256sums.asc -sha256 e61022cf576f14190241e7071753fdacdce5d1dea89ffd704110fc50be689309 sbc-1.3.tar.xz diff --git a/package.bak/sbc/sbc.mk b/package.bak/sbc/sbc.mk deleted file mode 100644 index 60ebc74819..0000000000 --- a/package.bak/sbc/sbc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# sbc -# -################################################################################ - -SBC_VERSION = 1.3 -SBC_SOURCE = sbc-$(SBC_VERSION).tar.xz -SBC_SITE = $(BR2_KERNEL_MIRROR)/linux/bluetooth -SBC_INSTALL_STAGING = YES -SBC_DEPENDENCIES = libsndfile host-pkgconf -SBC_LICENSE = GPLv2+ (programs), LGPLv2.1+ (library) -SBC_LICENSE_FILES = COPYING COPYING.LIB - -$(eval $(autotools-package)) diff --git a/package.bak/sconeserver/Config.in b/package.bak/sconeserver/Config.in deleted file mode 100644 index f03af8dd22..0000000000 --- a/package.bak/sconeserver/Config.in +++ /dev/null @@ -1,108 +0,0 @@ -menuconfig BR2_PACKAGE_SCONESERVER - bool "sconeserver" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_STATIC_LIBS # dlopen() - select BR2_PACKAGE_PCRE - help - Sconeserver is a modular, object-orientated and extremely versatile - network server framework for GNU/Linux and UNIX-like platforms. - - http://www.sconemad.com/sconeserver/ - -if BR2_PACKAGE_SCONESERVER - -comment "Sconeserver modules" - -config BR2_PACKAGE_SCONESERVER_EXAMPLES - bool "examples" - help - Example modules for Sconeserver - -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - bool "http::sconesite" - select BR2_PACKAGE_LIBXML2 - help - http::sconesite module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE - bool "http::sconesite::image" - depends on BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE - depends on BR2_USE_MMU # imagemagick - select BR2_PACKAGE_IMAGEMAGICK - help - http::sconesite::image module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_MYSQL - bool "mysql" - depends on BR2_USE_MMU # mysql - select BR2_PACKAGE_MYSQL - help - MySQL module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_BLUETOOTH - bool "bluetooth" - depends on BR2_USE_WCHAR # bluez->libglib2 - depends on BR2_USE_MMU # bluez->dbus - depends on BR2_TOOLCHAIN_HAS_THREADS # bluez->dbus, bluez->libglib2 - depends on !BR2_STATIC_LIBS # bluez_utils - select BR2_PACKAGE_BLUEZ_UTILS - help - Bluetooth module for Sconeserver - -comment "bluetooth support needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_SCONESERVER_RSS - bool "rss" - select BR2_PACKAGE_LIBXML2 - help - RSS module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_LOCATION - bool "location" - depends on BR2_USE_MMU # gpsd - depends on BR2_TOOLCHAIN_HAS_THREADS # gpsd - depends on !BR2_STATIC_LIBS # gpsd - select BR2_PACKAGE_GPSD - help - Location module for Sconeserver - -comment "location support needs a toolchain w/ theads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBRARY - -config BR2_PACKAGE_SCONESERVER_LETTUCE - bool "lettuce" - help - Sconeserver module for Lettuce embedded automation platform - - http://www.sconemad.com/lettuce/ - -config BR2_PACKAGE_SCONESERVER_MATHS - bool "maths" - select BR2_PACKAGE_MPFR - help - Mathematics module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_TESTBUILDER - bool "testbuilder" - help - Testbuilder module for Sconeserver - -config BR2_PACKAGE_SCONESERVER_UI - bool "ui" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - help - UI module for Sconeserver - -comment "ui module requires X.org" - depends on !BR2_PACKAGE_XORG7 - -endif # BR2_PACKAGE_SCONESERVER - -comment "sconeserver needs a toolchain with dynamic library, C++, NPTL" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || BR2_STATIC_LIBS diff --git a/package.bak/sconeserver/sconeserver.hash b/package.bak/sconeserver/sconeserver.hash deleted file mode 100644 index 978b442f53..0000000000 --- a/package.bak/sconeserver/sconeserver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 38e72b962eb42bea8f0deb6f101833f8f2f2fa8c53f0dc03f3eb5d56873517c8 sconeserver-d659468cd164e6a6cc12932cc6780566b04f8328.tar.gz diff --git a/package.bak/sconeserver/sconeserver.mk b/package.bak/sconeserver/sconeserver.mk deleted file mode 100644 index 793ca6fb26..0000000000 --- a/package.bak/sconeserver/sconeserver.mk +++ /dev/null @@ -1,114 +0,0 @@ -################################################################################ -# -# sconeserver -# -################################################################################ - -SCONESERVER_VERSION = d659468cd164e6a6cc12932cc6780566b04f8328 -SCONESERVER_SITE = $(call github,sconemad,sconeserver,$(SCONESERVER_VERSION)) -SCONESERVER_LICENSE = GPLv2+ -SCONESERVER_LICENSE_FILES = COPYING -# fetching from Git, we need to generate the configure script -SCONESERVER_AUTORECONF = YES -SCONESERVER_DEPENDENCIES = host-pkgconf pcre -# disable markdown module because its git submodule cmark -# https://github.com/sconemad/sconeserver/tree/master/markdown -# has no cross-compile support provided by the sconeserver build system -SCONESERVER_CONF_OPTS += --with-ip --with-local --with-ip6 --without-markdown - -# Sconeserver configure script fails to find the libxml2 headers. -ifeq ($(BR2_PACKAGE_LIBXML2),y) -SCONESERVER_CONF_OPTS += \ - --with-xml2-config="$(STAGING_DIR)/usr/bin/xml2-config" -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SCONESERVER_DEPENDENCIES += openssl -SCONESERVER_CONF_OPTS += --with-ssl -ifeq ($(BR2_STATIC_LIBS),y) -SCONESERVER_CONF_ENV += SSL_LIBADD=-lz -endif -else -SCONESERVER_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_EXAMPLES),y) -SCONESERVER_CONF_OPTS += --with-examples -else -SCONESERVER_CONF_OPTS += --without-examples -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE),y) -SCONESERVER_DEPENDENCIES += libxml2 -SCONESERVER_CONF_OPTS += --with-sconesite -else -SCONESERVER_CONF_OPTS += --without-sconesite -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_HTTP_SCONESITE_IMAGE),y) -SCONESERVER_DEPENDENCIES += imagemagick -SCONESERVER_CONF_OPTS += \ - --with-sconesite-image \ - --with-Magick++-config="$(STAGING_DIR)/usr/bin/Magick++-config" -else -SCONESERVER_CONF_OPTS += --without-sconesite-image --with-Magick++-config=no -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_MYSQL),y) -SCONESERVER_DEPENDENCIES += mysql -SCONESERVER_CONF_OPTS += \ - --with-mysql \ - --with-mysql_config="$(STAGING_DIR)/usr/bin/mysql_config" \ - LDFLAGS="$(TARGET_LDFLAGS) -L$(STAGING_DIR)/usr/lib/mysql" -else -SCONESERVER_CONF_OPTS += --without-mysql -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_BLUETOOTH),y) -SCONESERVER_DEPENDENCIES += bluez_utils -SCONESERVER_CONF_OPTS += --with-bluetooth -else -SCONESERVER_CONF_OPTS += --without-bluetooth -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_RSS),y) -SCONESERVER_DEPENDENCIES += libxml2 -SCONESERVER_CONF_OPTS += --with-rss -else -SCONESERVER_CONF_OPTS += --without-rss -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_LOCATION),y) -SCONESERVER_DEPENDENCIES += gpsd -SCONESERVER_CONF_OPTS += --with-location -else -SCONESERVER_CONF_OPTS += --without-location -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_LETTUCE),y) -SCONESERVER_CONF_OPTS += --with-lettuce -else -SCONESERVER_CONF_OPTS += --without-lettuce -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_MATHS),y) -SCONESERVER_DEPENDENCIES += mpfr -SCONESERVER_CONF_OPTS += --with-maths -else -SCONESERVER_CONF_OPTS += --without-maths -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_TESTBUILDER),y) -SCONESERVER_CONF_OPTS += --with-testbuilder -else -SCONESERVER_CONF_OPTS += --without-testbuilder -endif - -ifeq ($(BR2_PACKAGE_SCONESERVER_UI),y) -SCONESERVER_DEPENDENCIES += xlib_libX11 -SCONESERVER_CONF_OPTS += --with-ui -else -SCONESERVER_CONF_OPTS += --without-ui -endif - -$(eval $(autotools-package)) diff --git a/package.bak/scons/scons.hash b/package.bak/scons/scons.hash deleted file mode 100644 index 1b47d6457a..0000000000 --- a/package.bak/scons/scons.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9442069999cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b scons-2.3.0.tar.gz diff --git a/package.bak/scons/scons.mk b/package.bak/scons/scons.mk deleted file mode 100644 index 39fb258d0d..0000000000 --- a/package.bak/scons/scons.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# scons -# -################################################################################ - -SCONS_VERSION = 2.3.0 -SCONS_SITE = http://downloads.sourceforge.net/project/scons/scons/$(SCONS_VERSION) -SCONS_LICENSE = MIT -SCONS_LICENSE_FILES = LICENSE.txt -SCONS_SETUP_TYPE = distutils - -HOST_SCONS_NEEDS_HOST_PYTHON = python2 - -HOST_SCONS_INSTALL_OPTS = \ - --install-lib=$(HOST_DIR)/usr/lib/scons-$(SCONS_VERSION) - -$(eval $(host-python-package)) - -# variables used by other packages -SCONS = $(HOST_DIR)/usr/bin/python2 $(HOST_DIR)/usr/bin/scons $(if $(QUIET),-s) diff --git a/package.bak/screen/0001-compiler-sanity-checks.patch b/package.bak/screen/0001-compiler-sanity-checks.patch deleted file mode 100644 index fe6c3fdbc1..0000000000 --- a/package.bak/screen/0001-compiler-sanity-checks.patch +++ /dev/null @@ -1,62 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 10:27:27 +0200 -Subject: Removed redundant compiler sanity checks - -AC_PROG_CC already performs sanity checks. And unlike the removed -checks, it does so in a way that supports cross compilation. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 27 --------------------------- - 1 file changed, 27 deletions(-) - -diff --git a/configure.ac b/configure.ac -index ffe2e37..27690a6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -48,31 +48,6 @@ AC_PROG_GCC_TRADITIONAL - AC_ISC_POSIX - AC_USE_SYSTEM_EXTENSIONS - --AC_TRY_RUN(main(){exit(0);},,[ --if test $CC != cc ; then --AC_NOTE(Your $CC failed - restarting with CC=cc) --AC_NOTE() --CC=cc --export CC --exec $0 $configure_args --fi --]) -- --AC_TRY_RUN(main(){exit(0);},, --exec 5>&2 --eval $ac_link --AC_NOTE(CC=$CC; CFLAGS=$CFLAGS; LIBS=$LIBS;) --AC_NOTE($ac_compile) --AC_MSG_ERROR(Can't run the compiler - sorry)) -- --AC_TRY_RUN([ --main() --{ -- int __something_strange_(); -- __something_strange_(0); --} --],AC_MSG_ERROR(Your compiler does not set the exit status - sorry)) -- - AC_PROG_AWK - - AC_PROG_INSTALL -@@ -1300,8 +1275,6 @@ fi - dnl Ptx bug workaround -- insert -lc after -ltermcap - test -n "$seqptx" && LIBS="-ltermcap -lc -lsocket -linet -lnsl -lsec -lseq" - --AC_TRY_RUN(main(){exit(0);},,AC_MSG_ERROR(Can't run the compiler - internal error. Sorry.)) -- - ETCSCREENRC= - AC_MSG_CHECKING(for the global screenrc file) - AC_ARG_WITH(sys-screenrc, [ --with-sys-screenrc=path to the global screenrc file], [ ETCSCREENRC="${withval}" ]) --- -1.8.4.5 - diff --git a/package.bak/screen/0002-no-memcpy-fallback.patch b/package.bak/screen/0002-no-memcpy-fallback.patch deleted file mode 100644 index f3a6a70d2a..0000000000 --- a/package.bak/screen/0002-no-memcpy-fallback.patch +++ /dev/null @@ -1,124 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: Do not use memcpy as an alternative for bcopy/memmove - -The configure script runs a small test program to check whether -memcpy can handle overlapping memory areas. However, it is not valid -to conclude that if a single case of overlapping memory is handled -correctly, all cases will be handled correctly. - -Since screen already has its own bcopy implementation as a fallback -for the case that bcopy and memmove are unusable, removing the memcpy -option should not break any systems. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - acconfig.h | 3 +-- - configure.ac | 18 +----------------- - os.h | 8 ++------ - osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 34 deletions(-) - -diff --git a/acconfig.h b/acconfig.h -index 2e46985..9b0b9d4 100644 ---- a/acconfig.h -+++ b/acconfig.h -@@ -476,7 +476,7 @@ - #undef GETTTYENT - - /* -- * Define USEBCOPY if the bcopy/memcpy from your system's C library -+ * Define USEBCOPY if the bcopy from your system's C library - * supports the overlapping of source and destination blocks. When - * undefined, screen uses its own (probably slower) version of bcopy(). - * -@@ -487,7 +487,6 @@ - * Their memove fails the test in the configure script. Sigh. (Juergen) - */ - #undef USEBCOPY --#undef USEMEMCPY - #undef USEMEMMOVE - - /* -diff --git a/configure.ac b/configure.ac -index 27690a6..b8e3bec 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1145,7 +1145,7 @@ AC_TRY_LINK(,[getttyent();], AC_DEFINE(GETTTYENT)) - AC_CHECKING(fdwalk) - AC_TRY_LINK([#include ], [fdwalk(NULL, NULL);],AC_DEFINE(HAVE_FDWALK)) - --AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) -+AC_CHECKING(whether memmove/bcopy handles overlapping arguments) - AC_TRY_RUN([ - main() { - char buf[10]; -@@ -1175,22 +1175,6 @@ main() { - exit(0); /* libc version works properly. */ - }], AC_DEFINE(USEMEMMOVE)) - -- --AC_TRY_RUN([ --#define bcopy(s,d,l) memcpy(d,s,l) --main() { -- char buf[10]; -- strcpy(buf, "abcdefghi"); -- bcopy(buf, buf + 2, 3); -- if (strncmp(buf, "ababcf", 6)) -- exit(1); -- strcpy(buf, "abcdefghi"); -- bcopy(buf + 2, buf, 3); -- if (strncmp(buf, "cdedef", 6)) -- exit(1); -- exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEMEMCPY)) -- - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) -diff --git a/os.h b/os.h -index e827ac9..0b41fb9 100644 ---- a/os.h -+++ b/os.h -@@ -142,12 +142,8 @@ extern int errno; - # ifdef USEMEMMOVE - # define bcopy(s,d,len) memmove(d,s,len) - # else --# ifdef USEMEMCPY --# define bcopy(s,d,len) memcpy(d,s,len) --# else --# define NEED_OWN_BCOPY --# define bcopy xbcopy --# endif -+# define NEED_OWN_BCOPY -+# define bcopy xbcopy - # endif - #endif - -diff --git a/osdef.h.in b/osdef.h.in -index 8687b60..e4057a0 100644 ---- a/osdef.h.in -+++ b/osdef.h.in -@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); - extern int killpg __P((int, int)); - #endif - --#ifndef USEBCOPY --# ifdef USEMEMCPY --extern void memcpy __P((char *, char *, int)); --# else --# ifdef USEMEMMOVE -+#if defined(USEMEMMOVE) && !defined(USEBCOPY) - extern void memmove __P((char *, char *, int)); --# else --extern void bcopy __P((char *, char *, int)); --# endif --# endif - #else - extern void bcopy __P((char *, char *, int)); - #endif --- -1.8.4.5 - diff --git a/package.bak/screen/0003-cross-compilation-AC_TRY_RUN.patch b/package.bak/screen/0003-cross-compilation-AC_TRY_RUN.patch deleted file mode 100644 index eafe3d5ad1..0000000000 --- a/package.bak/screen/0003-cross-compilation-AC_TRY_RUN.patch +++ /dev/null @@ -1,125 +0,0 @@ -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 12:04:41 +0200 -Subject: Provide cross compilation alternatives for all AC_TRY_RUN uses - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 30 +++++++++++++++++++----------- - 1 file changed, 19 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b8e3bec..c4b7cd4 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,7 +348,8 @@ main() - exit(0); - } - ], AC_NOTE(- your fifos are usable) fifo=1, --AC_NOTE(- your fifos are not usable)) -+AC_NOTE(- your fifos are not usable), -+AC_NOTE(- skipping check because we are cross compiling; assuming fifos are usable) fifo=1) - rm -f /tmp/conftest* - - if test -n "$fifo"; then -@@ -396,7 +397,8 @@ main() - exit(0); - } - ], AC_NOTE(- your implementation is ok), --AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1) -+AC_NOTE(- you have a broken implementation) AC_DEFINE(BROKEN_PIPE) fifobr=1, -+AC_NOTE(- skipping check because we are cross compiling; assuming fifo implementation is ok)) - rm -f /tmp/conftest* - fi - -@@ -458,7 +460,8 @@ main() - exit(0); - } - ], AC_NOTE(- your sockets are usable) sock=1, --AC_NOTE(- your sockets are not usable)) -+AC_NOTE(- your sockets are not usable), -+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are usable) sock=1) - rm -f /tmp/conftest* - - if test -n "$sock"; then -@@ -497,7 +500,8 @@ main() - } - ],AC_NOTE(- you are normal), - AC_NOTE(- unix domain sockets are not kept in the filesystem) --AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1) -+AC_DEFINE(SOCK_NOT_IN_FS) socknofs=1, -+AC_NOTE(- skipping check because we are cross compiling; assuming sockets are normal)) - rm -f /tmp/conftest* - fi - -@@ -624,7 +628,8 @@ main() - exit(0); - } - ],AC_NOTE(- select is ok), --AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN)) -+AC_NOTE(- select can't count) AC_DEFINE(SELECT_BROKEN), -+AC_NOTE(- skipping check because we are cross compiling; assuming select is ok)) - - dnl - dnl **** termcap or terminfo **** -@@ -666,7 +671,8 @@ main() - { - exit(strcmp(tgoto("%p1%d", 0, 1), "1") ? 0 : 1); - }], AC_NOTE(- you use the termcap database), --AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO)) -+AC_NOTE(- you use the terminfo database) AC_DEFINE(TERMINFO), -+AC_NOTE(- skipping check because we are cross compiling; assuming terminfo database is used) AC_DEFINE(TERMINFO)) - AC_CHECKING(ospeed) - AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) - -@@ -801,7 +807,8 @@ main() - else - AC_NOTE(- can't determine - assume ptys are world accessable) - fi -- ] -+ ], -+ AC_NOTE(- skipping check because we are cross compiling; assuming ptys are world accessable) - ) - rm -f conftest_grp - fi -@@ -885,7 +892,7 @@ AC_EGREP_CPP(yes, - #endif - ], load=1) - fi --if test -z "$load" ; then -+if test -z "$load" && test "$cross_compiling" = no ; then - AC_CHECKING(for kernelfile) - for core in /unix /vmunix /dynix /hp-ux /xelos /dev/ksyms /kernel/unix /kernel/genunix /unicos /mach /netbsd /386bsd /dgux /bsd /stand/vmunix; do - if test -f $core || test -c $core; then -@@ -1078,7 +1085,7 @@ main() - #endif - exit(0); - } --],,AC_DEFINE(SYSVSIGS)) -+],,AC_DEFINE(SYSVSIGS),:) - - fi - -@@ -1158,7 +1165,7 @@ main() { - if (strncmp(buf, "cdedef", 6)) - exit(1); - exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEBCOPY)) -+}], AC_DEFINE(USEBCOPY),,:) - - AC_TRY_RUN([ - #define bcopy(s,d,l) memmove(d,s,l) -@@ -1173,7 +1180,8 @@ main() { - if (strncmp(buf, "cdedef", 6)) - exit(1); - exit(0); /* libc version works properly. */ --}], AC_DEFINE(USEMEMMOVE)) -+}], AC_DEFINE(USEMEMMOVE),, -+ AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) - - AC_SYS_LONG_FILE_NAMES - --- -1.8.4.5 - diff --git a/package.bak/screen/0004-cross-compilation-ignore-host-fs.patch b/package.bak/screen/0004-cross-compilation-ignore-host-fs.patch deleted file mode 100644 index fa698ef1f7..0000000000 --- a/package.bak/screen/0004-cross-compilation-ignore-host-fs.patch +++ /dev/null @@ -1,132 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 07:10:59 +0200 -Subject: When cross-compiling, skip checks that look in the host file system - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 23 +++++++++++++++++++---- - 1 file changed, 19 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4b7cd4..9cf7cee 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -85,7 +85,7 @@ AC_ARG_ENABLE(socket-dir, - dnl - dnl **** special unix variants **** - dnl --if test -n "$ISC"; then -+if test "$cross_compiling" = no && test -n "$ISC" ; then - AC_DEFINE(ISC) LIBS="$LIBS -linet" - fi - -@@ -96,10 +96,11 @@ dnl AC_DEFINE(OSF1) # this disables MIPS again.... - dnl fi - dnl fi - --if test -f /sysV68 ; then -+if test "$cross_compiling" = no && test -f /sysV68 ; then - AC_DEFINE(sysV68) - fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for MIPS) - if test -f /lib/libmld.a || test -f /usr/lib/libmld.a || test -f /usr/lib/cmplrs/cc/libmld.a; then - oldlibs="$LIBS" -@@ -123,6 +124,7 @@ AC_DEFINE(USE_WAIT2) LIBS="$LIBS -lbsd" ; CC="$CC -I/usr/include/bsd" - )) - fi - fi -+fi - - - AC_CHECKING(for Ultrix) -@@ -132,7 +134,7 @@ AC_EGREP_CPP(yes, - #endif - ], ULTRIX=1) - --if test -f /usr/lib/libpyr.a ; then -+if test "$cross_compiling" = no && test -f /usr/lib/libpyr.a ; then - oldlibs="$LIBS" - LIBS="$LIBS -lpyr" - AC_CHECKING(Pyramid OSX) -@@ -679,17 +681,21 @@ AC_TRY_LINK(extern short ospeed;,ospeed=5;,,AC_DEFINE(NEED_OSPEED)) - dnl - dnl **** PTY specific things **** - dnl -+if test "$cross_compiling" = no ; then - AC_CHECKING(for /dev/ptc) - if test -r /dev/ptc; then - AC_DEFINE(HAVE_DEV_PTC) - fi -+fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for SVR4 ptys) - sysvr4ptys= - if test -c /dev/ptmx ; then - AC_TRY_LINK([],[ptsname(0);grantpt(0);unlockpt(0);],[AC_DEFINE(HAVE_SVR4_PTYS) - sysvr4ptys=1]) - fi -+fi - - AC_CHECK_FUNCS(getpt) - -@@ -699,6 +705,7 @@ AC_CHECK_FUNCS(openpty,, - [AC_CHECK_LIB(util,openpty, [AC_DEFINE(HAVE_OPENPTY)] [LIBS="$LIBS -lutil"])]) - fi - -+if test "$cross_compiling" = no ; then - AC_CHECKING(for ptyranges) - if test -d /dev/ptym ; then - pdir='/dev/ptym' -@@ -722,6 +729,7 @@ p1=`echo $ptys | tr ' ' '\012' | sed -e 's/^.*\(.\)$/\1/g' | sort -u | tr -d '\ - AC_DEFINE_UNQUOTED(PTYRANGE0,"$p0") - AC_DEFINE_UNQUOTED(PTYRANGE1,"$p1") - fi -+fi - - dnl **** pty mode/group handling **** - dnl -@@ -869,14 +877,16 @@ fi - dnl - dnl **** loadav **** - dnl -+if test "$cross_compiling" = no ; then - AC_CHECKING(for libutil(s)) - test -f /usr/lib/libutils.a && LIBS="$LIBS -lutils" - test -f /usr/lib/libutil.a && LIBS="$LIBS -lutil" -+fi - - AC_CHECKING(getloadavg) - AC_TRY_LINK(,[getloadavg((double *)0, 0);], - AC_DEFINE(LOADAV_GETLOADAVG) load=1, --if test -f /usr/lib/libkvm.a ; then -+if test "$cross_compiling" = no && test -f /usr/lib/libkvm.a ; then - olibs="$LIBS" - LIBS="$LIBS -lkvm" - AC_CHECKING(getloadavg with -lkvm) -@@ -1094,13 +1104,18 @@ dnl **** libraries **** - dnl - - AC_CHECKING(for crypt and sec libraries) -+if test "$cross_compiling" = no ; then - test -f /lib/libcrypt_d.a || test -f /usr/lib/libcrypt_d.a && LIBS="$LIBS -lcrypt_d" -+fi - oldlibs="$LIBS" - LIBS="$LIBS -lcrypt" - AC_CHECKING(crypt) - AC_TRY_LINK(,,,LIBS="$oldlibs") -+if test "$cross_compiling" = no ; then - test -f /lib/libsec.a || test -f /usr/lib/libsec.a && LIBS="$LIBS -lsec" - test -f /lib/libshadow.a || test -f /usr/lib/libshadow.a && LIBS="$LIBS -lshadow" -+fi -+ - oldlibs="$LIBS" - LIBS="$LIBS -lsun" - AC_CHECKING(IRIX sun library) --- -1.8.4.5 - diff --git a/package.bak/screen/0005-avoid-identifying-as-SVR4.patch b/package.bak/screen/0005-avoid-identifying-as-SVR4.patch deleted file mode 100644 index 745ef41931..0000000000 --- a/package.bak/screen/0005-avoid-identifying-as-SVR4.patch +++ /dev/null @@ -1,54 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 11:16:58 +0200 -Subject: Avoid mis-identifying systems as SVR4 - -My openSUSE 13.1 Linux system was detected as SVR4 because it had -libelf installed. This leads to linking with libelf, even though no -symbols from that library were actually used, and to a workaround for -a buggy getlogin() being enabled. - -It is not documented which exact SVR4 system had the bug that the -workaround was added for, so all I could do is make an educated guess -at the #defines its compiler would be likely to set. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski ---- - configure.ac | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 9cf7cee..e09e4cf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -179,14 +179,24 @@ AC_EGREP_CPP(yes, - #endif - ], LIBS="$LIBS -lsocket -linet";seqptx=1) - -+AC_CHECKING(SVR4) -+AC_EGREP_CPP(yes, -+[main () { -+#if defined(SVR4) || defined(__SVR4) -+ yes; -+#endif -+], AC_NOTE(- you have a SVR4 system) AC_DEFINE(SVR4) svr4=1) -+if test -n "$svr4" ; then - oldlibs="$LIBS" - LIBS="$LIBS -lelf" - AC_CHECKING(SVR4) - AC_TRY_LINK([#include - ],, --[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN), --[AC_CHECK_HEADER(elf.h, AC_DEFINE(SVR4) AC_DEFINE(BUGGYGETLOGIN))])] -+[AC_CHECK_HEADER(dwarf.h, AC_DEFINE(BUGGYGETLOGIN), -+[AC_CHECK_HEADER(elf.h, AC_DEFINE(BUGGYGETLOGIN))])] - ,LIBS="$oldlibs") -+fi -+ - AC_CHECK_HEADERS([stropts.h string.h strings.h]) - - AC_CHECKING(for Solaris 2.x) --- -1.8.4.5 - diff --git a/package.bak/screen/0006-install-no-backup-binary.patch b/package.bak/screen/0006-install-no-backup-binary.patch deleted file mode 100644 index 504862a299..0000000000 --- a/package.bak/screen/0006-install-no-backup-binary.patch +++ /dev/null @@ -1,39 +0,0 @@ -From: Maarten ter Huurne -Date: Sun, 14 Sep 2014 23:58:34 +0200 -Subject: Do not create backup of old installed binary - -This is a rather unusual feature that packagers will not expect. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 187a69b..65549e9 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -83,12 +83,9 @@ screen: $(OFILES) - $(OPTIONS) $(CFLAGS) $< - - install_bin: .version screen -- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ -- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink -- -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -@@ -113,7 +110,6 @@ installdirs: - uninstall: .version - rm -f $(DESTDIR)$(bindir)/$(SCREEN) - rm -f $(DESTDIR)$(bindir)/screen -- -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen - rm -f $(DESTDIR)$(ETCSCREENRC) - cd doc; $(MAKE) uninstall - --- -1.8.4.5 - diff --git a/package.bak/screen/0007-install-always-chmod.patch b/package.bak/screen/0007-install-always-chmod.patch deleted file mode 100644 index 0aa7690b08..0000000000 --- a/package.bak/screen/0007-install-always-chmod.patch +++ /dev/null @@ -1,29 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:03:05 +0200 -Subject: Change binary permission flags even if chown fails - -Typically when creating a package, the build is not run as root, so -the chown will fail. But the chmod can still be done. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 65549e9..3c12fdb 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -84,7 +84,8 @@ screen: $(OFILES) - - install_bin: .version screen - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -- -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+ -chown root $(DESTDIR)$(bindir)/$(SCREEN) -+ -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) --- -1.8.4.5 - diff --git a/package.bak/screen/0008-install-nonversioned-binary.patch b/package.bak/screen/0008-install-nonversioned-binary.patch deleted file mode 100644 index ecbbd65197..0000000000 --- a/package.bak/screen/0008-install-nonversioned-binary.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:06:20 +0200 -Subject: Support overriding SCREEN to get a non-versioned binary - -If a packager runs "make install SCREEN=screen", do not create -"screen" as a symlink to itself. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Makefile.in b/Makefile.in -index 3c12fdb..860f351 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) - -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -+ifneq (${SCREEN},screen) - # This doesn't work if $(bindir)/screen is a symlink - rm -f $(DESTDIR)$(bindir)/screen - (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) -+endif - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) - - ############################################################################### --- -1.8.4.5 - diff --git a/package.bak/screen/0009-install-dir-dependency.patch b/package.bak/screen/0009-install-dir-dependency.patch deleted file mode 100644 index 9016cb90be..0000000000 --- a/package.bak/screen/0009-install-dir-dependency.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 02:27:09 +0200 -Subject: Ensure that installation dirs exist before copying files into them - -Since the "install_bin" target requires the installation directories -to exist, it should depend on the "installdirs" target. The previous -approach of having "install" depend on "installdirs" is not reliable. - -For example, in a parallel build, there was no guarantee that -"installdirs" would be finished before "install_bin" runs. Also if -the user requested only "install_bin" to be made, "installdirs" would -be skipped altogether. - -Signed-off-by: Maarten ter Huurne ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 860f351..f0fe08d 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -82,7 +82,7 @@ screen: $(OFILES) - $(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \ - $(OPTIONS) $(CFLAGS) $< - --install_bin: .version screen -+install_bin: .version screen installdirs - $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) - -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) -@@ -94,7 +94,7 @@ endif - cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) - - ############################################################################### --install: installdirs install_bin -+install: install_bin - cd doc ; $(MAKE) install - -if [ -d /usr/lib/terminfo ]; then \ - PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \ --- -1.8.4.5 - diff --git a/package.bak/screen/0010-rename-sched_h.patch b/package.bak/screen/0010-rename-sched_h.patch deleted file mode 100644 index cdbb0335f9..0000000000 --- a/package.bak/screen/0010-rename-sched_h.patch +++ /dev/null @@ -1,142 +0,0 @@ -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne ---- - eventqueue.h | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ - sched.h | 48 ------------------------------------------------ - screen.h | 2 +- - 3 files changed, 49 insertions(+), 49 deletions(-) - create mode 100644 eventqueue.h - delete mode 100644 sched.h - -diff --git a/eventqueue.h b/eventqueue.h -new file mode 100644 -index 0000000..fdc3fc4 ---- /dev/null -+++ b/eventqueue.h -@@ -0,0 +1,48 @@ -+/* Copyright (c) 2008, 2009 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Micah Cowan (micah@cowan.name) -+ * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -+ * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -+ * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -+ * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -+ * Copyright (c) 1987 Oliver Laumann -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 3, or (at your option) -+ * any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program (see the file COPYING); if not, see -+ * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -+ * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -+ * -+ **************************************************************** -+ * $Id$ GNU -+ */ -+ -+struct event -+{ -+ struct event *next; -+ void (*handler) __P((struct event *, char *)); -+ char *data; -+ int fd; -+ int type; -+ int pri; -+ struct timeval timeout; -+ int queued; /* in evs queue */ -+ int active; /* in fdset */ -+ int *condpos; /* only active if condpos - condneg > 0 */ -+ int *condneg; -+}; -+ -+#define EV_TIMEOUT 0 -+#define EV_READ 1 -+#define EV_WRITE 2 -+#define EV_ALWAYS 3 -diff --git a/sched.h b/sched.h -deleted file mode 100644 -index fdc3fc4..0000000 ---- a/sched.h -+++ /dev/null -@@ -1,48 +0,0 @@ --/* Copyright (c) 2008, 2009 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Micah Cowan (micah@cowan.name) -- * Sadrul Habib Chowdhury (sadrul@users.sourceforge.net) -- * Copyright (c) 1993-2002, 2003, 2005, 2006, 2007 -- * Juergen Weigert (jnweiger@immd4.informatik.uni-erlangen.de) -- * Michael Schroeder (mlschroe@immd4.informatik.uni-erlangen.de) -- * Copyright (c) 1987 Oliver Laumann -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 3, or (at your option) -- * any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program (see the file COPYING); if not, see -- * http://www.gnu.org/licenses/, or contact Free Software Foundation, Inc., -- * 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA -- * -- **************************************************************** -- * $Id$ GNU -- */ -- --struct event --{ -- struct event *next; -- void (*handler) __P((struct event *, char *)); -- char *data; -- int fd; -- int type; -- int pri; -- struct timeval timeout; -- int queued; /* in evs queue */ -- int active; /* in fdset */ -- int *condpos; /* only active if condpos - condneg > 0 */ -- int *condneg; --}; -- --#define EV_TIMEOUT 0 --#define EV_READ 1 --#define EV_WRITE 2 --#define EV_ALWAYS 3 -diff --git a/screen.h b/screen.h -index 603ca3f..34238c8 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -1.8.4.5 - diff --git a/package.bak/screen/Config.in b/package.bak/screen/Config.in deleted file mode 100644 index b5876e87cf..0000000000 --- a/package.bak/screen/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_SCREEN - bool "screen" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - Screen is a full-screen window manager that multiplexes a physical - terminal between several processes, typically interactive shells. - Each virtual terminal provides the functions of the DEC VT100 - terminal and, in addition, several control functions from the ANSI - X3.64 (ISO 6429) and ISO 2022 standards (e.g., insert/delete line - and support for multiple character sets). - - http://www.gnu.org/software/screen/ diff --git a/package.bak/screen/screen.hash b/package.bak/screen/screen.hash deleted file mode 100644 index 7ddc33700a..0000000000 --- a/package.bak/screen/screen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 01c3a7c362185f35d6a95dff52d64337076496acd034d717de3c263500cfefb0 screen-4.5.0.tar.gz diff --git a/package.bak/screen/screen.mk b/package.bak/screen/screen.mk deleted file mode 100644 index 519a02ab42..0000000000 --- a/package.bak/screen/screen.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# screen -# -################################################################################ - -SCREEN_VERSION = 4.5.0 -SCREEN_SITE = $(BR2_GNU_MIRROR)/screen -SCREEN_LICENSE = GPLv3+ -SCREEN_LICENSE_FILES = COPYING -SCREEN_DEPENDENCIES = ncurses -SCREEN_AUTORECONF = YES -SCREEN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS)" -SCREEN_CONF_OPTS = --enable-colors256 -SCREEN_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) SCREEN=screen install_bin - -define SCREEN_INSTALL_SCREENRC - $(INSTALL) -m 0755 -D $(@D)/etc/screenrc $(TARGET_DIR)/etc/screenrc -endef - -SCREEN_POST_INSTALL_TARGET_HOOKS += SCREEN_INSTALL_SCREENRC - -$(eval $(autotools-package)) diff --git a/package.bak/scrub/Config.in b/package.bak/scrub/Config.in deleted file mode 100644 index 84bcc29633..0000000000 --- a/package.bak/scrub/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_SCRUB - bool "scrub" - help - Scrub iteratively writes patterns on files or disk devices - to make retrieving the data more difficult. - - https://github.com/chaos/scrub/ diff --git a/package.bak/scrub/scrub.hash b/package.bak/scrub/scrub.hash deleted file mode 100644 index 0041fd055c..0000000000 --- a/package.bak/scrub/scrub.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 838b061b2e1932b342fb9695c5579cdff5d2d72506cb41d6d8032eba18aed969 scrub-2.6.1.tar.gz -sha256 6a129b4e0df6ebe02d449fa481db7b75be5eff08ce518aa77edd74c6b17c5ae4 11d30916dd9c11a26c7c8a0f6db9e6ebca301594.patch diff --git a/package.bak/scrub/scrub.mk b/package.bak/scrub/scrub.mk deleted file mode 100644 index b816272163..0000000000 --- a/package.bak/scrub/scrub.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# scrub -# -################################################################################ - -SCRUB_VERSION = 2.6.1 -SCRUB_SITE = $(call github,chaos,scrub,$(SCRUB_VERSION)) -SCRUB_LICENSE = GPLv2+ -SCRUB_LICENSE_FILES = COPYING DISCLAIMER -SCRUB_PATCH = https://github.com/chaos/scrub/commit/11d30916dd9c11a26c7c8a0f6db9e6ebca301594.patch - -# Fetching from the git repo, no configure/Makefile generated, and patching -# configure.ac -SCRUB_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/scrypt/Config.in b/package.bak/scrypt/Config.in deleted file mode 100644 index e6d1ac1a65..0000000000 --- a/package.bak/scrypt/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SCRYPT - bool "scrypt" - select BR2_PACKAGE_OPENSSL - help - A password-based key derivation function specifically - designed to make it costly to perform large-scale custom - hardware attacks by requiring large amounts of memory. - - http://www.tarsnap.com/scrypt.html diff --git a/package.bak/scrypt/scrypt.hash b/package.bak/scrypt/scrypt.hash deleted file mode 100644 index 6694456763..0000000000 --- a/package.bak/scrypt/scrypt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.tarsnap.com/scrypt/scrypt-sigs-1.2.0.asc -sha256 1754bc89405277c8ac14220377a4c240ddc34b1ce70882aa92cd01bfdc8569d4 scrypt-1.2.0.tgz diff --git a/package.bak/scrypt/scrypt.mk b/package.bak/scrypt/scrypt.mk deleted file mode 100644 index 7ffa7ccf3f..0000000000 --- a/package.bak/scrypt/scrypt.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# scrypt -# -################################################################################ - -SCRYPT_VERSION = 1.2.0 -SCRYPT_SOURCE = scrypt-$(SCRYPT_VERSION).tgz -SCRYPT_SITE = http://www.tarsnap.com/scrypt -SCRYPT_LICENSE = BSD-2c -SCRYPT_LICENSE_FILES = main.c -SCRYPT_DEPENDENCIES = openssl -SCRYPT_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/sdl/0001-use-correct-directfb-config.patch b/package.bak/sdl/0001-use-correct-directfb-config.patch deleted file mode 100644 index ef671a1ddd..0000000000 --- a/package.bak/sdl/0001-use-correct-directfb-config.patch +++ /dev/null @@ -1,25 +0,0 @@ -[PATCH] configure.in: use correct directfb-config in version check - -The configure script has just checked for the correct directfb-config -script, so also use it for the version check instead of whatever -might be in the path. - -Signed-off-by: Peter Korsgaard ---- - configure.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -Index: SDL-1.2.15/configure.in -=================================================================== ---- SDL-1.2.15.orig/configure.in -+++ SDL-1.2.15/configure.in -@@ -1276,7 +1276,7 @@ - else - set -- `echo $DIRECTFB_REQUIRED_VERSION | sed 's/\./ /g'` - NEED_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` -- set -- `directfb-config --version | sed 's/\./ /g'` -+ set -- `$DIRECTFBCONFIG --version | sed 's/\./ /g'` - HAVE_VERSION=`expr $1 \* 10000 + $2 \* 100 + $3` - if test $HAVE_VERSION -ge $NEED_VERSION; then - DIRECTFB_CFLAGS=`$DIRECTFBCONFIG --cflags` - diff --git a/package.bak/sdl/0002-fix-compilation-with-libx11.patch b/package.bak/sdl/0002-fix-compilation-with-libx11.patch deleted file mode 100644 index 27f244883e..0000000000 --- a/package.bak/sdl/0002-fix-compilation-with-libx11.patch +++ /dev/null @@ -1,60 +0,0 @@ -sdl: Fix compilation with libX11 >= 1.5.99.902 -Signed-off-by: Vicente Olivert Riera - -# HG changeset patch -# User Azamat H. Hackimov -# Date 1370184533 -21600 -# Node ID 91ad7b43317a6387e115ecdf63a49137f47e42c8 -# Parent f7fd5c3951b9ed922fdf696f7182e71b58a13268 -Fix compilation with libX11 >= 1.5.99.902. - -These changes fixes bug #1769 for SDL 1.2 -(http://bugzilla.libsdl.org/show_bug.cgi?id=1769). - -diff -r f7fd5c3951b9 -r 91ad7b43317a configure.in ---- a/configure.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/configure.in Sun Jun 02 20:48:53 2013 +0600 -@@ -1169,6 +1169,17 @@ - if test x$definitely_enable_video_x11_xrandr = xyes; then - AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) - fi -+ AC_MSG_CHECKING(for const parameter to _XData32) -+ have_const_param_xdata32=no -+ AC_TRY_COMPILE([ -+ #include -+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len); -+ ],[ -+ ],[ -+ have_const_param_xdata32=yes -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32) -+ ]) -+ AC_MSG_RESULT($have_const_param_xdata32) - fi - fi - } -diff -r f7fd5c3951b9 -r 91ad7b43317a include/SDL_config.h.in ---- a/include/SDL_config.h.in Wed Apr 17 00:56:53 2013 -0700 -+++ b/include/SDL_config.h.in Sun Jun 02 20:48:53 2013 +0600 -@@ -283,6 +283,7 @@ - #undef SDL_VIDEO_DRIVER_WINDIB - #undef SDL_VIDEO_DRIVER_WSCONS - #undef SDL_VIDEO_DRIVER_X11 -+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 - #undef SDL_VIDEO_DRIVER_X11_DGAMOUSE - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC - #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT -diff -r f7fd5c3951b9 -r 91ad7b43317a src/video/x11/SDL_x11sym.h ---- a/src/video/x11/SDL_x11sym.h Wed Apr 17 00:56:53 2013 -0700 -+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:48:53 2013 +0600 -@@ -165,7 +165,11 @@ - */ - #ifdef LONG64 - SDL_X11_MODULE(IO_32BIT) -+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 -+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return) -+#else - SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return) -+#endif - SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),) - #endif - diff --git a/package.bak/sdl/Config.in b/package.bak/sdl/Config.in deleted file mode 100644 index 65ac8a2469..0000000000 --- a/package.bak/sdl/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_SDL - bool "SDL" - help - Simple DirectMedia Layer - SDL is a library that allows - programs portable low level access to a video framebuffer, - audio output, mouse, and keyboard. - - http://www.libsdl.org/ - -if BR2_PACKAGE_SDL - -config BR2_PACKAGE_SDL_FBCON - bool "SDL framebuffer console video driver" - default y - -config BR2_PACKAGE_SDL_DIRECTFB - bool "SDL DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_SDL_QTOPIA - bool "SDL Qtopia video driver" - depends on BR2_PACKAGE_QT - -config BR2_PACKAGE_SDL_X11 - bool "SDL X11 video driver" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - -endif diff --git a/package.bak/sdl/sdl.hash b/package.bak/sdl/sdl.hash deleted file mode 100644 index ad59b90042..0000000000 --- a/package.bak/sdl/sdl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00 SDL-1.2.15.tar.gz diff --git a/package.bak/sdl/sdl.mk b/package.bak/sdl/sdl.mk deleted file mode 100644 index 38b4b97752..0000000000 --- a/package.bak/sdl/sdl.mk +++ /dev/null @@ -1,101 +0,0 @@ -################################################################################ -# -# sdl -# -################################################################################ - -SDL_VERSION = 1.2.15 -SDL_SOURCE = SDL-$(SDL_VERSION).tar.gz -SDL_SITE = http://www.libsdl.org/release -SDL_LICENSE = LGPLv2.1+ -SDL_LICENSE_FILES = COPYING -SDL_INSTALL_STAGING = YES - -# we're patching configure.in, but package cannot autoreconf with our version of -# autotools, so we have to do it manually instead of setting SDL_AUTORECONF = YES -define SDL_RUN_AUTOGEN - cd $(@D) && PATH=$(BR_PATH) ./autogen.sh -endef - -SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN -HOST_SDL_PRE_CONFIGURE_HOOKS += SDL_RUN_AUTOGEN - -SDL_DEPENDENCIES += host-automake host-autoconf host-libtool -HOST_SDL_DEPENDENCIES += host-automake host-autoconf host-libtool - -ifeq ($(BR2_PACKAGE_SDL_FBCON),y) -SDL_CONF_OPTS += --enable-video-fbcon=yes -else -SDL_CONF_OPTS += --enable-video-fbcon=no -endif - -ifeq ($(BR2_PACKAGE_SDL_DIRECTFB),y) -SDL_DEPENDENCIES += directfb -SDL_CONF_OPTS += --enable-video-directfb=yes -SDL_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL_CONF_OPTS += --enable-video-directfb=no -endif - -ifeq ($(BR2_PACKAGE_SDL_QTOPIA),y) -SDL_CONF_OPTS += --enable-video-qtopia=yes -SDL_DEPENDENCIES += qt -else -SDL_CONF_OPTS += --enable-video-qtopia=no -endif - -ifeq ($(BR2_PACKAGE_SDL_X11),y) -SDL_CONF_OPTS += --enable-video-x11=yes -SDL_DEPENDENCIES += \ - xlib_libX11 xlib_libXext \ - $(if $(BR2_PACKAGE_XLIB_LIBXRENDER), xlib_libXrender) \ - $(if $(BR2_PACKAGE_XLIB_LIBXRANDR), xlib_libXrandr) -else -SDL_CONF_OPTS += --enable-video-x11=no -endif - -ifneq ($(BR2_USE_MMU),y) -SDL_CONF_OPTS += --enable-dga=no -endif - -# overwrite autodection (prevents confusion with host libpth version) -ifeq ($(BR2_PACKAGE_LIBPTHSEM_COMPAT),y) -SDL_CONF_OPTS += --enable-pth -SDL_CONF_ENV += ac_cv_path_PTH_CONFIG=$(STAGING_DIR)/usr/bin/pth-config -SDL_DEPENDENCIES += libpthsem -else -SDL_CONF_OPTS += --disable-pth -endif - -ifeq ($(BR2_PACKAGE_TSLIB),y) -SDL_DEPENDENCIES += tslib -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -SDL_DEPENDENCIES += alsa-lib -endif - -ifeq ($(BR2_PACKAGE_MESA3D),y) -SDL_DEPENDENCIES += mesa3d -endif - -SDL_CONF_OPTS += \ - --disable-rpath \ - --enable-pulseaudio=no \ - --disable-arts \ - --disable-esd \ - --disable-nasm \ - --disable-video-ps3 - -HOST_SDL_CONF_OPTS += \ - --enable-pulseaudio=no \ - --enable-video-x11=no \ - --disable-arts \ - --disable-esd \ - --disable-nasm \ - --disable-video-ps3 - -SDL_CONFIG_SCRIPTS = sdl-config - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/sdl2/0001-ppc.patch b/package.bak/sdl2/0001-ppc.patch deleted file mode 100644 index 0161103067..0000000000 --- a/package.bak/sdl2/0001-ppc.patch +++ /dev/null @@ -1,47 +0,0 @@ -Fixed bug 3466 - Can't build 2.0.5 on ppc64 - -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] -const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, -^ - -Downloaded from upstream repo -https://hg.libsdl.org/SDL/rev/5184186d4366 - -Signed-off-by: Bernd Kuhls - -diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c ---- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 -+++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 -@@ -118,12 +118,6 @@ - 16, 8, 0, 24, - 0, NULL - }; -- if (!srcfmt) { -- srcfmt = &default_pixel_format; -- } -- if (!dstfmt) { -- dstfmt = &default_pixel_format; -- } - const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, - 0x04, 0x04, 0x04, 0x04, - 0x08, 0x08, 0x08, 0x08, -@@ -136,6 +130,14 @@ - Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); - Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); - Uint32 amask; -+ -+ if (!srcfmt) { -+ srcfmt = &default_pixel_format; -+ } -+ if (!dstfmt) { -+ dstfmt = &default_pixel_format; -+ } -+ - /* Use zero for alpha if either surface doesn't have alpha */ - if (dstfmt->Amask) { - amask = - - - - diff --git a/package.bak/sdl2/0002-gcc6.patch b/package.bak/sdl2/0002-gcc6.patch deleted file mode 100644 index 6b5e901dfe..0000000000 --- a/package.bak/sdl2/0002-gcc6.patch +++ /dev/null @@ -1,64 +0,0 @@ - -# HG changeset patch -# User Sam Lantinga -# Date 1479201270 28800 -# Node ID ea44906e19b837f4d5b309525ca79ed9d00b1897 -# Parent 6b2307dbec54f0bf4d5d8abf86241e29f3a03562 -Fixed bug 3490 - Build failure with --enable-video-directfb - -felix - -Building SDL 2.0.5, or even the Mercurial snapshot (r10608) with GCC 6.2.1 and --enable-video-directfb generates a number of compiler diagnostics and fails. - -Downloaded from upstream repo -https://hg.libsdl.org/SDL/rev/ea44906e19b8 - -Signed-off-by: Bernd Kuhls - -diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_render.c ---- a/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:12:27 2016 -0800 -+++ b/src/video/directfb/SDL_DirectFB_render.c Tue Nov 15 01:14:30 2016 -0800 -@@ -1273,7 +1273,7 @@ - Uint32 format, void * pixels, int pitch) - { - Uint32 sdl_format; -- void * laypixels; -+ unsigned char* laypixels; - int laypitch; - DFBSurfacePixelFormat dfb_format; - DirectFB_RenderData *data = (DirectFB_RenderData *) renderer->driverdata; -@@ -1303,7 +1303,7 @@ - SDL_Window *window = renderer->window; - SDL_DFB_WINDOWDATA(window); - Uint32 sdl_format; -- void * laypixels; -+ unsigned char* laypixels; - int laypitch; - DFBSurfacePixelFormat dfb_format; - -diff -r 6b2307dbec54 -r ea44906e19b8 src/video/directfb/SDL_DirectFB_shape.c ---- a/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:12:27 2016 -0800 -+++ b/src/video/directfb/SDL_DirectFB_shape.c Tue Nov 15 01:14:30 2016 -0800 -@@ -37,17 +37,19 @@ - SDL_WindowShaper* - DirectFB_CreateShaper(SDL_Window* window) { - SDL_WindowShaper* result = NULL; -+ SDL_ShapeData* data; -+ int resized_properly; - - result = malloc(sizeof(SDL_WindowShaper)); - result->window = window; - result->mode.mode = ShapeModeDefault; - result->mode.parameters.binarizationCutoff = 1; - result->userx = result->usery = 0; -- SDL_ShapeData* data = SDL_malloc(sizeof(SDL_ShapeData)); -+ data = SDL_malloc(sizeof(SDL_ShapeData)); - result->driverdata = data; - data->surface = NULL; - window->shaper = result; -- int resized_properly = DirectFB_ResizeWindowShape(window); -+ resized_properly = DirectFB_ResizeWindowShape(window); - SDL_assert(resized_properly == 0); - - return result; - diff --git a/package.bak/sdl2/Config.in b/package.bak/sdl2/Config.in deleted file mode 100644 index 8fc14ee737..0000000000 --- a/package.bak/sdl2/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_SDL2 - bool "sdl2" - depends on !BR2_STATIC_LIBS - help - Simple DirectMedia Layer 2 - SDL2 is a library that allows - programs portable low level access to a video framebuffer, - audio output, mouse, and keyboard. It is not compatible with - SDL1. - - http://www.libsdl.org/ - -if BR2_PACKAGE_SDL2 - -config BR2_PACKAGE_SDL2_DIRECTFB - bool "DirectFB video driver" - depends on BR2_PACKAGE_DIRECTFB - -comment "DirectFB video driver needs directfb" - depends on !BR2_PACKAGE_DIRECTFB - -config BR2_PACKAGE_SDL2_X11 - bool "X11 video driver" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - -comment "X11 video driver needs X.org" - depends on !BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU - -endif - -comment "sdl2 needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/sdl2/sdl2.hash b/package.bak/sdl2/sdl2.hash deleted file mode 100644 index d69d43811d..0000000000 --- a/package.bak/sdl2/sdl2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking http://www.libsdl.org/release/SDL2-2.0.5.tar.gz.sig -sha256 442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785 SDL2-2.0.5.tar.gz diff --git a/package.bak/sdl2/sdl2.mk b/package.bak/sdl2/sdl2.mk deleted file mode 100644 index 2ec12e639e..0000000000 --- a/package.bak/sdl2/sdl2.mk +++ /dev/null @@ -1,116 +0,0 @@ -################################################################################ -# -# sdl2 -# -################################################################################ - -SDL2_VERSION = 2.0.5 -SDL2_SOURCE = SDL2-$(SDL2_VERSION).tar.gz -SDL2_SITE = http://www.libsdl.org/release -SDL2_LICENSE = zlib -SDL2_LICENSE_FILES = COPYING.txt -SDL2_INSTALL_STAGING = YES -SDL2_CONFIG_SCRIPTS = sdl2-config - -SDL2_CONF_OPTS += \ - --disable-rpath \ - --disable-arts \ - --disable-esd \ - --disable-dbus \ - --disable-pulseaudio \ - --disable-video-opengl \ - --disable-video-opengles \ - --disable-video-wayland - -# We must enable static build to get compilation successful. -SDL2_CONF_OPTS += --enable-static - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -SDL2_DEPENDENCIES += udev -SDL2_CONF_OPTS += --enable-libudev -else -SDL2_CONF_OPTS += --disable-libudev -endif - -ifeq ($(BR2_PACKAGE_SDL2_DIRECTFB),y) -SDL2_DEPENDENCIES += directfb -SDL2_CONF_OPTS += --enable-video-directfb -SDL2_CONF_ENV = ac_cv_path_DIRECTFBCONFIG=$(STAGING_DIR)/usr/bin/directfb-config -else -SDL2_CONF_OPTS += --disable-video-directfb -endif - -# x-includes and x-libraries must be set for cross-compiling -# By default x_includes and x_libraries contains unsafe paths. -# (/usr/X11R6/include and /usr/X11R6/lib) -ifeq ($(BR2_PACKAGE_SDL2_X11),y) -SDL2_DEPENDENCIES += xlib_libX11 xlib_libXext - -# X11/extensions/shape.h is provided by libXext. -SDL2_CONF_OPTS += --enable-video-x11 \ - --with-x=$(STAGING_DIR) \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib \ - --enable-video-x11-xshape - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -SDL2_DEPENDENCIES += xlib_libXcursor -SDL2_CONF_OPTS += --enable-video-x11-xcursor -else -SDL2_CONF_OPTS += --disable-video-x11-xcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -SDL2_DEPENDENCIES += xlib_libXinerama -SDL2_CONF_OPTS += --enable-video-x11-xinerama -else -SDL2_CONF_OPTS += --disable-video-x11-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -SDL2_DEPENDENCIES += xlib_libXi -SDL2_CONF_OPTS += --enable-video-x11-xinput -else -SDL2_CONF_OPTS += --disable-video-x11-xinput -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -SDL2_DEPENDENCIES += xlib_libXrandr -SDL2_CONF_OPTS += --enable-video-x11-xrandr -else -SDL2_CONF_OPTS += --disable-video-x11-xrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y) -SDL2_DEPENDENCIES += xlib_libXScrnSaver -SDL2_CONF_OPTS += --enable-video-x11-scrnsaver -else -SDL2_CONF_OPTS += --disable-video-x11-scrnsaver -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -SDL2_DEPENDENCIES += xlib_libXxf86vm -SDL2_CONF_OPTS += --enable-video-x11-vm -else -SDL2_CONF_OPTS += --disable-video-x11-vm -endif - -else -SDL2_CONF_OPTS += --disable-video-x11 --without-x -endif - -ifeq ($(BR2_PACKAGE_TSLIB),y) -SDL2_DEPENDENCIES += tslib -SDL2_CONF_OPTS += --enable-input-tslib -else -SDL2_CONF_OPTS += --disable-input-tslib -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -SDL2_DEPENDENCIES += alsa-lib -SDL2_CONF_OPTS += --enable-alsa -else -SDL2_CONF_OPTS += --disable-alsa -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl2_gfx/Config.in b/package.bak/sdl2_gfx/Config.in deleted file mode 100644 index f5dafc56f3..0000000000 --- a/package.bak/sdl2_gfx/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_SDL2_GFX - bool "sdl2_gfx" - depends on BR2_PACKAGE_SDL2 - help - The SDL2_gfx library is an extension to the SDL2 library - which provides basic antialiased drawing routines such as - lines, circles or polygons, an interpolating rotozoomer for - SDL surfaces, framerate control and MMX image filters. - - http://www.ferzkopp.net/wordpress/2016/01/02/sdl_gfx-sdl2_gfx diff --git a/package.bak/sdl2_gfx/sdl2_gfx.hash b/package.bak/sdl2_gfx/sdl2_gfx.hash deleted file mode 100644 index 4cb07ee935..0000000000 --- a/package.bak/sdl2_gfx/sdl2_gfx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d69bcbceb811b4e5712fbad3ede737166327f44b727f1388c32581dbbe8c599a SDL2_gfx-1.0.1.tar.gz diff --git a/package.bak/sdl2_gfx/sdl2_gfx.mk b/package.bak/sdl2_gfx/sdl2_gfx.mk deleted file mode 100644 index 975bca73ad..0000000000 --- a/package.bak/sdl2_gfx/sdl2_gfx.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# sdl2_gfx -# -################################################################################ - -SDL2_GFX_VERSION = 1.0.1 -SDL2_GFX_SOURCE = SDL2_gfx-$(SDL2_GFX_VERSION).tar.gz -SDL2_GFX_SITE = http://www.ferzkopp.net/Software/SDL2_gfx -SDL2_GFX_LICENSE = zlib -SDL2_GFX_LICENSE_FILES = COPYING SDL2_framerate.h -SDL2_GFX_INSTALL_STAGING = YES -SDL2_GFX_DEPENDENCIES = sdl2 host-pkgconf -SDL2_GFX_CONF_OPTS = --disable-sdltest -# configure/Makefile.in not up-to-date, causing aclocal to be used at -# build time if we don't autoreconf. -SDL2_GFX_AUTORECONF = YES - -# Even though x86_64 processors support MMX, the MMX-specific assembly -# code in sdl2_gfx is IA32 specific, and does not build for x86_64. -ifeq ($(BR2_i386)$(BR2_X86_CPU_HAS_MMX),yy) -SDL2_GFX_CONF_OPTS += --enable-mmx -else -SDL2_GFX_CONF_OPTS += --disable-mmx -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl2_image/Config.in b/package.bak/sdl2_image/Config.in deleted file mode 100644 index 9b4a38354f..0000000000 --- a/package.bak/sdl2_image/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SDL2_IMAGE - bool "sdl2_image" - depends on BR2_PACKAGE_SDL2 - help - SDL2_image is an image file loading library. It loads images - as SDL surfaces, and supports the following formats: BMP, - GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, XCF, XPM, XV. - - http://www.libsdl.org/projects/SDL_image/ diff --git a/package.bak/sdl2_image/sdl2_image.hash b/package.bak/sdl2_image/sdl2_image.hash deleted file mode 100644 index 26d0a88cb5..0000000000 --- a/package.bak/sdl2_image/sdl2_image.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3a3eafbceea5125c04be585373bfd8b3a18f259bd7eae3efc4e6d8e60e0d7f64 SDL2_image-2.0.1.tar.gz diff --git a/package.bak/sdl2_image/sdl2_image.mk b/package.bak/sdl2_image/sdl2_image.mk deleted file mode 100644 index cf3b738edc..0000000000 --- a/package.bak/sdl2_image/sdl2_image.mk +++ /dev/null @@ -1,58 +0,0 @@ -################################################################################ -# -# sdl2_image -# -################################################################################ - -SDL2_IMAGE_VERSION = 2.0.1 -SDL2_IMAGE_SOURCE = SDL2_image-$(SDL2_IMAGE_VERSION).tar.gz -SDL2_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release -SDL2_IMAGE_INSTALL_STAGING = YES -SDL2_IMAGE_LICENSE = zlib -SDL2_IMAGE_LICENSE_FILES = COPYING.txt - -# Unconditionally enable support for image formats that don't require -# any dependency. -SDL2_IMAGE_CONF_OPTS = \ - --disable-sdltest \ - --enable-bmp \ - --enable-gif \ - --enable-lbm \ - --enable-pcx \ - --enable-pnm \ - --enable-tga \ - --enable-xcf \ - --enable-xpm \ - --enable-xv - -SDL2_IMAGE_DEPENDENCIES = sdl2 host-pkgconf - -ifeq ($(BR2_PACKAGE_JPEG),y) -SDL2_IMAGE_CONF_OPTS += --enable-jpg -SDL2_IMAGE_DEPENDENCIES += jpeg -else -SDL2_IMAGE_CONF_OPTS += --disable-jpg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -SDL2_IMAGE_CONF_OPTS += --enable-png -SDL2_IMAGE_DEPENDENCIES += libpng -else -SDL2_IMAGE_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -SDL2_IMAGE_CONF_OPTS += --enable-tif -SDL2_IMAGE_DEPENDENCIES += tiff -else -SDL2_IMAGE_CONF_OPTS += --disable-tif -endif - -ifeq ($(BR2_PACKAGE_WEBP),y) -SDL2_IMAGE_CONF_OPTS += --enable-webp -SDL2_IMAGE_DEPENDENCIES += webp -else -SDL2_IMAGE_CONF_OPTS += --disable-webp -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl2_ttf/0001-fix-opengl-detection.patch b/package.bak/sdl2_ttf/0001-fix-opengl-detection.patch deleted file mode 100644 index 06e0abf8b9..0000000000 --- a/package.bak/sdl2_ttf/0001-fix-opengl-detection.patch +++ /dev/null @@ -1,37 +0,0 @@ -# HG changeset patch -# User Sam Lantinga -# Date 1485568474 28800 -# Node ID 3b93536d291a34183592fd29ef1df9cf1416ac09 -# Parent 184c34c673d479477d34194e3c0b1abe7ca5d828 -Make sure we can link with OpenGL libraries in the OpenGL configure test - -[yann.morin.1998@free.fr: - - backported from upstream - - drop the configure hunk for autoreconf -] -Signed-off-by: "Yann E. MORIN" - -diff -r 184c34c673d4 -r 3b93536d291a configure.in ---- a/configure.in Sun Jan 01 18:46:38 2017 -0800 -+++ b/configure.in Fri Jan 27 17:54:34 2017 -0800 -@@ -164,14 +164,17 @@ - esac - AC_MSG_CHECKING(for OpenGL support) - have_opengl=no --AC_TRY_COMPILE([ -+save_LIBS="$LIBS" -+LIBS="$LIBS $SYS_GL_LIBS" -+AC_TRY_LINK([ - #include "SDL_opengl.h" - ],[ -- GLuint texture; -+ glOrtho( -2.0, 2.0, -2.0, 2.0, -20.0, 20.0 ); - ],[ - have_opengl=yes - ]) - AC_MSG_RESULT($have_opengl) -+LIBS="$save_LIBS" - if test x$have_opengl = xyes; then - CFLAGS="$CFLAGS -DHAVE_OPENGL" - GL_LIBS="$SYS_GL_LIBS" - diff --git a/package.bak/sdl2_ttf/0002-fix-autoreconf.patch b/package.bak/sdl2_ttf/0002-fix-autoreconf.patch deleted file mode 100644 index 88543a9491..0000000000 --- a/package.bak/sdl2_ttf/0002-fix-autoreconf.patch +++ /dev/null @@ -1,30 +0,0 @@ -# HG changeset patch -# User "Yann E. MORIN" -# Date 1485597428 -3600 -# Node ID 26376ce4a3e6565885fd984b3fe5a39a6895dcdd -# Parent 3b93536d291a34183592fd29ef1df9cf1416ac09 -configure: fix autoreconf - -Signed-off-by: "Yann E. MORIN" - -diff --git a/configure.in b/configure.in ---- a/configure.in -+++ b/configure.in -@@ -1,5 +1,6 @@ - dnl Process this file with autoconf to produce a configure script. --AC_INIT(README.txt) -+dnl The version string must be a literal -+AC_INIT([SDL2_ttf],[2.0.14]) - - dnl Set various version strings - taken gratefully from the GTk sources - -@@ -42,7 +42,7 @@ - AC_CANONICAL_HOST - - dnl Setup for automake --AM_INIT_AUTOMAKE(SDL2_ttf, $VERSION) -+AM_INIT_AUTOMAKE([foreign]) - - dnl Check for tools - AC_PROG_LIBTOOL - diff --git a/package.bak/sdl2_ttf/Config.in b/package.bak/sdl2_ttf/Config.in deleted file mode 100644 index fc870a71c5..0000000000 --- a/package.bak/sdl2_ttf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SDL2_TTF - bool "sdl2_ttf" - depends on BR2_PACKAGE_SDL2 - select BR2_PACKAGE_FREETYPE - help - SDL2_ttf is a sample TrueType font library. It allows you to - use TrueType fonts in your SDL2 applications. - - http://www.libsdl.org/projects/SDL_ttf/ diff --git a/package.bak/sdl2_ttf/sdl2_ttf.hash b/package.bak/sdl2_ttf/sdl2_ttf.hash deleted file mode 100644 index 515189afd9..0000000000 --- a/package.bak/sdl2_ttf/sdl2_ttf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 34db5e20bcf64e7071fe9ae25acaa7d72bdc4f11ab3ce59acc768ab62fe39276 SDL2_ttf-2.0.14.tar.gz diff --git a/package.bak/sdl2_ttf/sdl2_ttf.mk b/package.bak/sdl2_ttf/sdl2_ttf.mk deleted file mode 100644 index 86916c3443..0000000000 --- a/package.bak/sdl2_ttf/sdl2_ttf.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# sdl2_ttf -# -################################################################################ - -SDL2_TTF_VERSION = 2.0.14 -SDL2_TTF_SOURCE = SDL2_ttf-$(SDL2_TTF_VERSION).tar.gz -SDL2_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release -SDL2_TTF_LICENSE = zlib -SDL2_TTF_LICENSE_FILES = COPYING.txt -SDL2_TTF_INSTALL_STAGING = YES -SDL2_TTF_DEPENDENCIES = sdl2 freetype host-pkgconf - -# Two patches touching configure.in -SDL2_TTF_AUTORECONF = YES - -SDL2_TTF_CONF_ENV = \ - FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config - -# x-includes and x-libraries must be set for cross-compiling -# By default x_includes and x_libraries contains unsafe paths. -# (/usr/include and /usr/lib) -ifeq ($(BR2_PACKAGE_SDL2_X11),y) -SDL2_TTF_CONF_OPTS += \ - --with-x \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib -else -SDL2_TTF_CONF_OPTS += \ - --without-x -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl_gfx/Config.in b/package.bak/sdl_gfx/Config.in deleted file mode 100644 index b5d5cac5ad..0000000000 --- a/package.bak/sdl_gfx/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_SDL_GFX - bool "SDL_gfx" - depends on BR2_PACKAGE_SDL - help - The SDL_gfx library is an extension to the SDL library which - provides basic antialiased drawing routines such as lines, - circles or polygons, an interpolating rotozoomer for SDL - surfaces, framerate control and MMX image filters. - - http://cms.ferzkopp.net/index.php/software/13-sdl-gfx diff --git a/package.bak/sdl_gfx/sdl_gfx.hash b/package.bak/sdl_gfx/sdl_gfx.hash deleted file mode 100644 index 8c2be96fff..0000000000 --- a/package.bak/sdl_gfx/sdl_gfx.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/sdlgfx/files/ -md5 fcc3c4f2d1b4943409bf7e67dd65d03a SDL_gfx-2.0.23.tar.gz -sha1 aae60e7fed539f3f8a0a0bd6da3bbcf625642596 SDL_gfx-2.0.23.tar.gz diff --git a/package.bak/sdl_gfx/sdl_gfx.mk b/package.bak/sdl_gfx/sdl_gfx.mk deleted file mode 100644 index 7f3a2ffec8..0000000000 --- a/package.bak/sdl_gfx/sdl_gfx.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# sdl_gfx -# -################################################################################ - -SDL_GFX_VERSION_MAJOR = 2.0 -SDL_GFX_VERSION = $(SDL_GFX_VERSION_MAJOR).23 -SDL_GFX_SOURCE = SDL_gfx-$(SDL_GFX_VERSION).tar.gz -SDL_GFX_SITE = http://www.ferzkopp.net/Software/SDL_gfx-$(SDL_GFX_VERSION_MAJOR) -SDL_GFX_LICENSE = zlib -SDL_GFX_LICENSE_FILES = COPYING LICENSE -SDL_GFX_INSTALL_STAGING = YES -SDL_GFX_DEPENDENCIES = sdl -SDL_GFX_CONF_OPTS = \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-sdltest \ - --enable-static - -# Even though x86_64 processors support MMX, the MMX-specific assembly -# code in sdl_gfx is IA32 specific, and does not build for x86_64. -ifeq ($(BR2_i386)$(BR2_X86_CPU_HAS_MMX),yy) -SDL_GFX_CONF_OPTS += --enable-mmx -else -SDL_GFX_CONF_OPTS += --disable-mmx -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl_image/Config.in b/package.bak/sdl_image/Config.in deleted file mode 100644 index c719d441bd..0000000000 --- a/package.bak/sdl_image/Config.in +++ /dev/null @@ -1,57 +0,0 @@ -menuconfig BR2_PACKAGE_SDL_IMAGE - bool "SDL_image" - depends on BR2_PACKAGE_SDL - help - SDL_image is an image file loading library. It loads images - as SDL surfaces, and supports the following formats: - BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, XCF, XPM, XV. - - http://www.libsdl.org/projects/SDL_image/ - -if BR2_PACKAGE_SDL_IMAGE - -config BR2_PACKAGE_SDL_IMAGE_BMP - bool "BMP support" - default y - -config BR2_PACKAGE_SDL_IMAGE_GIF - bool "GIF support" - -config BR2_PACKAGE_SDL_IMAGE_JPEG - bool "JPEG support" - select BR2_PACKAGE_JPEG - -config BR2_PACKAGE_SDL_IMAGE_LBM - bool "LBM support" - -config BR2_PACKAGE_SDL_IMAGE_PCX - bool "PCX support" - -config BR2_PACKAGE_SDL_IMAGE_PNG - bool "PNG support" - select BR2_PACKAGE_LIBPNG - -config BR2_PACKAGE_SDL_IMAGE_PNM - bool "PNM support" - -config BR2_PACKAGE_SDL_IMAGE_TARGA - bool "TARGA support" - -config BR2_PACKAGE_SDL_IMAGE_TIFF - bool "TIFF support" - select BR2_PACKAGE_TIFF - -config BR2_PACKAGE_SDL_IMAGE_WEBP - bool "WEBP support" - select BR2_PACKAGE_WEBP - -config BR2_PACKAGE_SDL_IMAGE_XCF - bool "XCF support" - -config BR2_PACKAGE_SDL_IMAGE_XPM - bool "XPM support" - -config BR2_PACKAGE_SDL_IMAGE_XV - bool "XV support" - -endif diff --git a/package.bak/sdl_image/sdl_image.hash b/package.bak/sdl_image/sdl_image.hash deleted file mode 100644 index 836223489c..0000000000 --- a/package.bak/sdl_image/sdl_image.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699 SDL_image-1.2.12.tar.gz diff --git a/package.bak/sdl_image/sdl_image.mk b/package.bak/sdl_image/sdl_image.mk deleted file mode 100644 index f88aa0e7c7..0000000000 --- a/package.bak/sdl_image/sdl_image.mk +++ /dev/null @@ -1,51 +0,0 @@ -################################################################################ -# -# sdl_image -# -################################################################################ - -SDL_IMAGE_VERSION = 1.2.12 -SDL_IMAGE_SOURCE = SDL_image-$(SDL_IMAGE_VERSION).tar.gz -SDL_IMAGE_SITE = http://www.libsdl.org/projects/SDL_image/release -SDL_IMAGE_INSTALL_STAGING = YES -SDL_IMAGE_LICENSE = zlib -SDL_IMAGE_LICENSE_FILES = COPYING - -SDL_IMAGE_CONF_OPTS = \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ - --disable-sdltest \ - --disable-static \ - --enable-bmp=$(if $(BR2_PACKAGE_SDL_IMAGE_BMP),yes,no) \ - --enable-gif=$(if $(BR2_PACKAGE_SDL_IMAGE_GIF),yes,no) \ - --enable-jpg=$(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),yes,no) \ - --enable-lbm=$(if $(BR2_PACKAGE_SDL_IMAGE_LBM),yes,no) \ - --enable-pcx=$(if $(BR2_PACKAGE_SDL_IMAGE_PCX),yes,no) \ - --enable-png=$(if $(BR2_PACKAGE_SDL_IMAGE_PNG),yes,no) \ - --enable-pnm=$(if $(BR2_PACKAGE_SDL_IMAGE_PNM),yes,no) \ - --enable-tga=$(if $(BR2_PACKAGE_SDL_IMAGE_TARGA),yes,no) \ - --enable-tif=$(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),yes,no) \ - --enable-webp=$(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),yes,no) \ - --enable-xcf=$(if $(BR2_PACKAGE_SDL_IMAGE_XCF),yes,no) \ - --enable-xpm=$(if $(BR2_PACKAGE_SDL_IMAGE_XPM),yes,no) \ - --enable-xv=$(if $(BR2_PACKAGE_SDL_IMAGE_XV),yes,no) - -SDL_IMAGE_DEPENDENCIES = sdl \ - $(if $(BR2_PACKAGE_SDL_IMAGE_JPEG),jpeg) \ - $(if $(BR2_PACKAGE_SDL_IMAGE_PNG),libpng) \ - $(if $(BR2_PACKAGE_SDL_IMAGE_TIFF),tiff) \ - $(if $(BR2_PACKAGE_SDL_IMAGE_WEBP),webp) - -HOST_SDL_IMAGE_CONF_OPTS = \ - --with-sdl-prefix=$(HOST_DIR)/usr \ - --with-sdl-exec-prefix=$(HOST_DIR)/usr \ - --disable-sdltest \ - --disable-static \ - --disable-jpg-shared \ - --disable-png-shared \ - --disable-tif-shared - -HOST_SDL_IMAGE_DEPENDENCIES = host-libjpeg host-libpng host-sdl - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch b/package.bak/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch deleted file mode 100644 index e0e85710d9..0000000000 --- a/package.bak/sdl_mixer/0001-Add-Libs.private-field-to-pkg-config-file.patch +++ /dev/null @@ -1,64 +0,0 @@ -From abf3a1b9c9cdacb574c2b9cdbf3f2a5e18c39ab9 Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Mon, 29 Feb 2016 22:53:49 -0300 -Subject: [PATCH 1/1] Add 'Libs.private' field to pkg-config file - -In order to support static linking, SDL_mixer.pc should include a -'Libs.private' field listing all the libraries that SDL_mixer requires. - -This patch adds such a field and also modifies configure.in so that -EXTRA_LDFLAGS (which is now also used as the value of 'Libs.private') -no longer includes SDL_LIBS. This is done so as to prevent libraries -required by SDL from being listed twice when 'pkg-config --libs --static -SDL_mixer' is run (they're already shown because of the 'Requires: sdl' -line in SDL_mixer.pc). Makefile.in is also adjusted accordingly. - -Upstream status: submitted -https://bugzilla.libsdl.org/show_bug.cgi?id=3278 - -Signed-off-by: Rodrigo Rebello ---- - Makefile.in | 2 +- - SDL_mixer.pc.in | 1 + - configure.in | 1 - - 3 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 3d10565..ce4efd4 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -63,7 +63,7 @@ $(objects): - .PHONY: all install install-hdrs install-lib install-bin uninstall uninstall-hdrs uninstall-lib uninstall-bin clean distclean dist - - $(objects)/$(TARGET): $(OBJECTS) $(VERSION_OBJECTS) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(SDL_LIBS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) - $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) -diff --git a/SDL_mixer.pc.in b/SDL_mixer.pc.in -index 1c4965d..d793521 100644 ---- a/SDL_mixer.pc.in -+++ b/SDL_mixer.pc.in -@@ -8,5 +8,6 @@ Description: mixer library for Simple DirectMedia Layer - Version: @VERSION@ - Requires: sdl >= @SDL_VERSION@ - Libs: -L${libdir} -lSDL_mixer -+Libs.private: @EXTRA_LDFLAGS@ - Cflags: -I${includedir}/SDL - -diff --git a/configure.in b/configure.in -index 2272b29..442eca6 100644 ---- a/configure.in -+++ b/configure.in -@@ -202,7 +202,6 @@ AM_PATH_SDL($SDL_VERSION, - AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) - ) - EXTRA_CFLAGS="$EXTRA_CFLAGS $SDL_CFLAGS" --EXTRA_LDFLAGS="$EXTRA_LDFLAGS $SDL_LIBS" - - dnl Check for math library - AC_CHECK_LIB(m, pow, [LIBM="-lm"]) --- -2.1.4 - diff --git a/package.bak/sdl_mixer/0002-add-LDFLAGS-while-linking.patch b/package.bak/sdl_mixer/0002-add-LDFLAGS-while-linking.patch deleted file mode 100644 index 4144660741..0000000000 --- a/package.bak/sdl_mixer/0002-add-LDFLAGS-while-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -Pass LDFLAGS while creating binaries. - -Fixes following linking error with uClibc-ng: -br/output/host/usr/lib/gcc/powerpc-buildroot-linux-uclibc/5.4.0/libgcc.a(unwind-dw2-fde-dip.o): In function `_Unwind_Find_FDE': -br/output/build/host-gcc-final-5.4.0/build/powerpc-buildroot-linux-uclibc/libgcc/../../../libgcc/unwind-dw2-fde-dip.c:465: undefined reference to `dl_iterate_phdr' -collect2: error: ld returned 1 exit status - -Since uClibc-ng 1.0.18 a circular dependency between libc and libgcc -exist, when static linking is used. It can be resolved by the compiler -when -static is correctly passed in the linking step. - -Signed-off-by: Waldemar Brodkorb - -diff -Nur SDL_mixer-1.2.12.orig/Makefile.in SDL_mixer-1.2.12/Makefile.in ---- SDL_mixer-1.2.12.orig/Makefile.in 2012-01-15 23:01:04.000000000 +0100 -+++ SDL_mixer-1.2.12/Makefile.in 2016-12-07 08:29:22.479786596 +0100 -@@ -66,10 +66,10 @@ - $(LIBTOOL) --mode=link $(CC) -o $@ $(OBJECTS) $(VERSION_OBJECTS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LT_LDFLAGS) - - $(objects)/playwave$(EXE): $(objects)/playwave.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playwave.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) - - $(objects)/playmus$(EXE): $(objects)/playmus.lo $(objects)/$(TARGET) -- $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(objects)/$(TARGET) -+ $(LIBTOOL) --mode=link $(CC) -o $@ $(objects)/playmus.lo $(SDL_CFLAGS) $(SDL_LIBS) $(LDFLAGS) $(objects)/$(TARGET) - - install: all install-hdrs install-lib #install-bin - install-hdrs: diff --git a/package.bak/sdl_mixer/Config.in b/package.bak/sdl_mixer/Config.in deleted file mode 100644 index 42dfe63c0a..0000000000 --- a/package.bak/sdl_mixer/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_SDL_MIXER - bool "SDL_mixer" - depends on BR2_PACKAGE_SDL - help - SDL_mixer is a sample multi-channel audio mixer library. - It supports any number of simultaneously playing channels of - 16 bit stereo audio, plus a single channel of music, mixed - by the popular MikMod MOD, Timidity MIDI, Ogg Vorbis, and - SMPEG MP3 libraries. - - http://www.libsdl.org/projects/SDL_mixer/ diff --git a/package.bak/sdl_mixer/sdl_mixer.hash b/package.bak/sdl_mixer/sdl_mixer.hash deleted file mode 100644 index cfe8b07cb0..0000000000 --- a/package.bak/sdl_mixer/sdl_mixer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1644308279a975799049e4826af2cfc787cad2abb11aa14562e402521f86992a SDL_mixer-1.2.12.tar.gz diff --git a/package.bak/sdl_mixer/sdl_mixer.mk b/package.bak/sdl_mixer/sdl_mixer.mk deleted file mode 100644 index 897b308e9d..0000000000 --- a/package.bak/sdl_mixer/sdl_mixer.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# sdl_mixer -# -################################################################################ - -SDL_MIXER_VERSION = 1.2.12 -SDL_MIXER_SOURCE = SDL_mixer-$(SDL_MIXER_VERSION).tar.gz -SDL_MIXER_SITE = http://www.libsdl.org/projects/SDL_mixer/release -SDL_MIXER_LICENSE = zlib -SDL_MIXER_LICENSE_FILES = COPYING - -SDL_MIXER_INSTALL_STAGING = YES -SDL_MIXER_DEPENDENCIES = sdl - -# We're patching configure.in, so we need to autoreconf -SDL_MIXER_AUTORECONF = YES -SDL_MIXER_AUTORECONF_OPTS = -Iacinclude - -SDL_MIXER_CONF_OPTS = \ - --without-x \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --disable-music-midi \ - --disable-music-mod \ - --disable-music-mp3 \ - --disable-music-flac # configure script fails when cross compiling - -ifeq ($(BR2_PACKAGE_LIBMAD),y) -SDL_MIXER_CONF_OPTS += --enable-music-mp3-mad-gpl -SDL_MIXER_DEPENDENCIES += libmad -else -SDL_MIXER_CONF_OPTS += --disable-music-mp3-mad-gpl -endif - -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -SDL_MIXER_CONF_OPTS += --enable-music-ogg -SDL_MIXER_DEPENDENCIES += libvorbis -else -SDL_MIXER_CONF_OPTS += --disable-music-ogg -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl_net/Config.in b/package.bak/sdl_net/Config.in deleted file mode 100644 index 2001d230fe..0000000000 --- a/package.bak/sdl_net/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SDL_NET - bool "SDL_net" - depends on BR2_PACKAGE_SDL - help - SDL_net is a small, low-level, cross-platform network library, that - can be used with the Simple DirectMedia Layer library (SDL). - - http://www.libsdl.org/projects/SDL_net/ diff --git a/package.bak/sdl_net/sdl_net.hash b/package.bak/sdl_net/sdl_net.hash deleted file mode 100644 index 56a7484284..0000000000 --- a/package.bak/sdl_net/sdl_net.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5f4a7a8bb884f793c278ac3f3713be41980c5eedccecff0260411347714facb4 SDL_net-1.2.8.tar.gz diff --git a/package.bak/sdl_net/sdl_net.mk b/package.bak/sdl_net/sdl_net.mk deleted file mode 100644 index 4534dee3a9..0000000000 --- a/package.bak/sdl_net/sdl_net.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# sdl_net -# -################################################################################ - -SDL_NET_VERSION = 1.2.8 -SDL_NET_SITE = http://www.libsdl.org/projects/SDL_net/release -SDL_NET_SOURCE = SDL_net-$(SDL_NET_VERSION).tar.gz -SDL_NET_LICENSE = zlib -SDL_NET_LICENSE_FILES = COPYING - -SDL_NET_CONF_OPTS = \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr - -SDL_NET_INSTALL_STAGING = YES - -SDL_NET_DEPENDENCIES = sdl - -$(eval $(autotools-package)) diff --git a/package.bak/sdl_sound/0001-fix-constness.patch b/package.bak/sdl_sound/0001-fix-constness.patch deleted file mode 100644 index 1f27a071dc..0000000000 --- a/package.bak/sdl_sound/0001-fix-constness.patch +++ /dev/null @@ -1,16 +0,0 @@ -decoders/speex: fix constness of speex mode - -Signed-off-by: "Yann E. MORIN" - -diff -durN sdl_sound-1.0.3.orig/decoders/speex.c sdl_sound-1.0.3/decoders/speex.c ---- sdl_sound-1.0.3.orig/decoders/speex.c 2014-11-17 19:40:09.543553556 +0100 -+++ sdl_sound-1.0.3/decoders/speex.c 2014-11-17 19:40:37.119864580 +0100 -@@ -124,7 +124,7 @@ - - static int process_header(speex_t *speex, Sound_Sample *sample) - { -- SpeexMode *mode; -+ const SpeexMode * mode; - SpeexHeader *hptr; - SpeexHeader header; - int enh_enabled = SPEEX_USE_PERCEPTUAL_ENHANCER; diff --git a/package.bak/sdl_sound/0002-remove-werror.patch b/package.bak/sdl_sound/0002-remove-werror.patch deleted file mode 100644 index c08bbdb893..0000000000 --- a/package.bak/sdl_sound/0002-remove-werror.patch +++ /dev/null @@ -1,29 +0,0 @@ -Do not add -Werror when --enable-debug is used - -Using -Werror causes some problems due to warnings in the SDL_sound -code, so let's disable it. - -We patch configure directly, because: - - 1/ configure.in doesn't autoreconf properly out of the box. - - 2/ the length of the configure or configure.in patch would be exactly - the same (one line), or maybe more for the configure.in patch if - we want the package to autoreconf properly - - 3/ the patch will never go upstream, because upstream is dead. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure -=================================================================== ---- a/configure -+++ b/configure -@@ -19561,7 +19561,6 @@ - else - CFLAGS="-O0" - fi -- CFLAGS="$CFLAGS -Werror" - - cat >>confdefs.h <<\_ACEOF - #define DEBUG 1 diff --git a/package.bak/sdl_sound/Config.in b/package.bak/sdl_sound/Config.in deleted file mode 100644 index 6da19853e0..0000000000 --- a/package.bak/sdl_sound/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_SDL_SOUND - bool "SDL_sound" - depends on BR2_PACKAGE_SDL - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - SDL_sound is a library that handles the decoding of several - popular sound file formats, such as .WAV and .MP3. - It is meant to make the programmer's sound playback tasks - simpler. The programmer gives SDL_sound a filename, or feeds - it data directly from one of many sources, and then reads the - decoded waveform data back at her leisure. - - http://icculus.org/SDL_sound/ - -if BR2_PACKAGE_SDL_SOUND - -config BR2_PACKAGE_SDL_SOUND_PLAYSOUND - bool "install playsound tool" - help - Enable this option to install the playsound/playsound_simple - tools to target. - -endif diff --git a/package.bak/sdl_sound/sdl_sound.hash b/package.bak/sdl_sound/sdl_sound.hash deleted file mode 100644 index a548627916..0000000000 --- a/package.bak/sdl_sound/sdl_sound.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3999fd0bbb485289a52be14b2f68b571cb84e380cc43387eadf778f64c79e6df SDL_sound-1.0.3.tar.gz diff --git a/package.bak/sdl_sound/sdl_sound.mk b/package.bak/sdl_sound/sdl_sound.mk deleted file mode 100644 index 4fa7d9be0a..0000000000 --- a/package.bak/sdl_sound/sdl_sound.mk +++ /dev/null @@ -1,68 +0,0 @@ -################################################################################ -# -# sdl_sound -# -################################################################################ - -SDL_SOUND_VERSION = 1.0.3 -SDL_SOUND_SOURCE = SDL_sound-$(SDL_SOUND_VERSION).tar.gz -SDL_SOUND_SITE = http://icculus.org/SDL_sound/downloads -SDL_SOUND_LICENSE = LGPLv2.1+ -SDL_SOUND_LICENSE_FILES = COPYING -SDL_SOUND_INSTALL_STAGING = YES -SDL_SOUND_DEPENDENCIES = sdl - -ifneq ($(BR2_ENABLE_LOCALE),y) -SDL_SOUND_DEPENDENCIES += libiconv -endif - -# optional dependencies -ifeq ($(BR2_PACKAGE_FLAC)$(BR2_PACKAGE_LIBOGG),yy) -SDL_SOUND_CONF_OPTS += --enable-flac -SDL_SOUND_DEPENDENCIES += flac libogg -else -SDL_SOUND_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) -SDL_SOUND_CONF_OPTS += --enable-modplug -SDL_SOUND_DEPENDENCIES += libmodplug -else -SDL_SOUND_CONF_OPTS += --disable-modplug -endif - -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -SDL_SOUND_CONF_OPTS += --enable-ogg -SDL_SOUND_DEPENDENCIES += libvorbis -else -SDL_SOUND_CONF_OPTS += --disable-ogg -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -SDL_SOUND_CONF_OPTS += --enable-speex -SDL_SOUND_DEPENDENCIES += speex -else -SDL_SOUND_CONF_OPTS += --disable-speex -endif - -SDL_SOUND_CONF_OPTS = \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr \ - --disable-sdltest \ - --enable-static - -ifeq ($(BR2_X86_CPU_HAS_MMX),y) -SDL_SOUND_CONF_OPTS += --enable-mmx -else -SDL_SOUND_CONF_OPTS += --disable-mmx -endif - -define SDL_SOUND_REMOVE_PLAYSOUND - rm $(addprefix $(TARGET_DIR)/usr/bin/,playsound playsound_simple) -endef - -ifneq ($(BR2_PACKAGE_SDL_SOUND_PLAYSOUND),y) -SDL_SOUND_POST_INSTALL_TARGET_HOOKS += SDL_SOUND_REMOVE_PLAYSOUND -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sdl_ttf/Config.in b/package.bak/sdl_ttf/Config.in deleted file mode 100644 index efc92e5ad9..0000000000 --- a/package.bak/sdl_ttf/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SDL_TTF - bool "SDL_TTF" - depends on BR2_PACKAGE_SDL - select BR2_PACKAGE_FREETYPE - help - SDL_ttf is a sample TrueType font library. It allows you to - use TrueType fonts in your SDL applications. - - http://www.libsdl.org/projects/SDL_ttf/ diff --git a/package.bak/sdl_ttf/sdl_ttf.hash b/package.bak/sdl_ttf/sdl_ttf.hash deleted file mode 100644 index ac7d6a6be0..0000000000 --- a/package.bak/sdl_ttf/sdl_ttf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 724cd895ecf4da319a3ef164892b72078bd92632a5d812111261cde248ebcdb7 SDL_ttf-2.0.11.tar.gz diff --git a/package.bak/sdl_ttf/sdl_ttf.mk b/package.bak/sdl_ttf/sdl_ttf.mk deleted file mode 100644 index 3e494b4ca2..0000000000 --- a/package.bak/sdl_ttf/sdl_ttf.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# sdl_ttf -# -################################################################################ - -SDL_TTF_VERSION = 2.0.11 -SDL_TTF_SOURCE = SDL_ttf-$(SDL_TTF_VERSION).tar.gz -SDL_TTF_SITE = http://www.libsdl.org/projects/SDL_ttf/release -SDL_TTF_LICENSE = zlib -SDL_TTF_LICENSE_FILES = COPYING - -SDL_TTF_INSTALL_STAGING = YES -SDL_TTF_DEPENDENCIES = sdl freetype -SDL_TTF_CONF_OPTS = \ - --without-x \ - --with-freetype-prefix=$(STAGING_DIR)/usr \ - --with-sdl-prefix=$(STAGING_DIR)/usr - -SDL_TTF_MAKE_OPTS = INCLUDES="-I$(STAGING_DIR)/usr/include/SDL" LDFLAGS="-L$(STAGING_DIR)/usr/lib" -$(eval $(autotools-package)) diff --git a/package.bak/sdparm/Config.in b/package.bak/sdparm/Config.in deleted file mode 100644 index cec0f840f1..0000000000 --- a/package.bak/sdparm/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_SDPARM - bool "sdparm" - help - Utility to accesses SCSI device parameters. - - http://sg.danny.cz/sg/sdparm.html diff --git a/package.bak/sdparm/sdparm.hash b/package.bak/sdparm/sdparm.hash deleted file mode 100644 index 050785ab71..0000000000 --- a/package.bak/sdparm/sdparm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 7dc9e148cef22744e00809dad21b59ac544e3615001bc1b2399978f73e1d58ca sdparm-1.10.tar.xz diff --git a/package.bak/sdparm/sdparm.mk b/package.bak/sdparm/sdparm.mk deleted file mode 100644 index ed1606c1cf..0000000000 --- a/package.bak/sdparm/sdparm.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# sdparm -# -################################################################################ - -SDPARM_VERSION = 1.10 -SDPARM_SOURCE = sdparm-$(SDPARM_VERSION).tar.xz -SDPARM_SITE = http://sg.danny.cz/sg/p -SDPARM_LICENSE = BSD-3c -SDPARM_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_SG3_UTILS),y) -SDPARM_DEPENDENCIES += sg3_utils -else -SDPARM_CONF_OPTS += --disable-libsgutils -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sed/Config.in b/package.bak/sed/Config.in deleted file mode 100644 index 6adebf24de..0000000000 --- a/package.bak/sed/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SED - bool "sed" - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Super-useful stream editor. - - http://sed.sourceforge.net/ - -comment "sed needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/sed/sed.hash b/package.bak/sed/sed.hash deleted file mode 100644 index e7f2db591f..0000000000 --- a/package.bak/sed/sed.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff sed-4.2.2.tar.gz diff --git a/package.bak/sed/sed.mk b/package.bak/sed/sed.mk deleted file mode 100644 index 71c62d0fd2..0000000000 --- a/package.bak/sed/sed.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# sed -# -################################################################################ - -SED_VERSION = 4.2.2 -SED_SITE = $(BR2_GNU_MIRROR)/sed -SED_LICENSE = GPLv3 -SED_LICENSE_FILES = COPYING - -SED_CONF_OPTS = \ - --bindir=/bin \ - --libdir=/lib \ - --libexecdir=/usr/lib \ - --sysconfdir=/etc \ - --datadir=/usr/share \ - --mandir=/usr/share/man \ - --infodir=/usr/share/info \ - --include=$(STAGING_DIR)/usr/include - -$(eval $(autotools-package)) diff --git a/package.bak/sepolgen/sepolgen.hash b/package.bak/sepolgen/sepolgen.hash deleted file mode 100644 index b338a7019f..0000000000 --- a/package.bak/sepolgen/sepolgen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://github.com/SELinuxProject/selinux/wiki/Releases -sha256 6a327b1576d914e57ad796a541a7a9bcceefb14c445355559993de0fdb8e7a60 sepolgen-2.6.tar.gz diff --git a/package.bak/sepolgen/sepolgen.mk b/package.bak/sepolgen/sepolgen.mk deleted file mode 100644 index 137eaed612..0000000000 --- a/package.bak/sepolgen/sepolgen.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# sepolgen -# -################################################################################ - -SEPOLGEN_VERSION = 2.6 -SEPOLGEN_SITE = https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases/20161014 -SEPOLGEN_LICENSE = GPLv2 -SEPOLGEN_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_SEPOLGEN_DEPENDENCIES = host-python3 -HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \ - PYTHONLIBDIR=/usr/lib/python$(PYTHON3_VERSION_MAJOR)/site-packages -else -HOST_SEPOLGEN_DEPENDENCIES = host-python -HOST_SEPOLGEN_MAKE_CMDS = $(HOST_CONFIGURE_OPTS) \ - PYTHONLIBDIR=/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -endif - -define HOST_SEPOLGEN_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) -endef - -define HOST_SEPOLGEN_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) $(HOST_SEPOLGEN_MAKE_CMDS) DESTDIR=$(HOST_DIR) install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/ser2net/Config.in b/package.bak/ser2net/Config.in deleted file mode 100644 index 3f0d15b30d..0000000000 --- a/package.bak/ser2net/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SER2NET - bool "ser2net" - depends on BR2_USE_MMU # fork() - help - Ser2net provides a way for a user to connect from a network - connection to a serial port.. - - http://ser2net.sourceforge.net diff --git a/package.bak/ser2net/S50ser2net b/package.bak/ser2net/S50ser2net deleted file mode 100644 index 200dfd0e4d..0000000000 --- a/package.bak/ser2net/S50ser2net +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Startup script for ser2net -# - -start() { - printf "Starting ser2net: " - if [ ! -f /etc/ser2net.conf ] ; then - echo "no configuration file" - exit 1 - fi - - start-stop-daemon -S -q --exec /usr/sbin/ser2net -- -P /var/run/ser2net.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Shutting down ser2net: " - start-stop-daemon -K -q -p /var/run/ser2net.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - *) - echo "Usage: ser2net {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/ser2net/ser2net.hash b/package.bak/ser2net/ser2net.hash deleted file mode 100644 index ae45e9cecf..0000000000 --- a/package.bak/ser2net/ser2net.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 3d1cef5f48df8291e57d4d7d4eac2fc809ae644a5524ffca4aebef0f4e4153dc ser2net-3.3.tar.gz diff --git a/package.bak/ser2net/ser2net.mk b/package.bak/ser2net/ser2net.mk deleted file mode 100644 index a786b1a2a7..0000000000 --- a/package.bak/ser2net/ser2net.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# ser2net -# -################################################################################ - -SER2NET_VERSION = 3.3 -SER2NET_SITE = http://downloads.sourceforge.net/project/ser2net/ser2net -SER2NET_LICENSE = GPLv2+ -SER2NET_LICENSE_FILES = COPYING - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -SER2NET_CONF_OPTS += --with-pthreads -else -SER2NET_CONF_OPTS += --without-pthreads -endif - -define SER2NET_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/ser2net/S50ser2net \ - $(TARGET_DIR)/etc/init.d/S50ser2net -endef - -$(eval $(autotools-package)) diff --git a/package.bak/setools/0001-cross-compile-fixes.patch b/package.bak/setools/0001-cross-compile-fixes.patch deleted file mode 100644 index 1a4af0ce31..0000000000 --- a/package.bak/setools/0001-cross-compile-fixes.patch +++ /dev/null @@ -1,125 +0,0 @@ -Correct build issues to enable cross compiling. These changes require the -package to be auto reconfigured. - -These updates were not upsteamed as the 3.3.x version has stablized and they -were only taking bug fixes. Also the 4.0 preview has completely reworked -the build infrastructure which will require this to be revisited. - -Signed-off-by Clayton Shotwell - -diff -urN a/configure.ac b/configure.ac ---- a/configure.ac 2013-01-16 10:36:24.000000000 -0600 -+++ b/configure.ac 2013-07-12 08:22:10.380255248 -0500 -@@ -448,8 +448,9 @@ - sepol_srcdir="") - if test "x${sepol_srcdir}" = "x"; then - sepol_srcdir=${sepol_devel_libdir} -- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],, -- AC_MSG_ERROR([make sure libsepol-static is installed])) -+ if test ! -f ${sepol_srcdir}/libsepol.a; then -+ AC_MSG_ERROR([could not find precompiled libsepol.a]) -+ fi - else - AC_MSG_CHECKING([for compatible sepol source tree]) - sepol_version=${sepol_srcdir}/VERSION -@@ -484,8 +485,9 @@ - AC_CHECK_HEADER([sepol/policydb/policydb.h], , AC_MSG_ERROR([could not find sepol source tree])) - CFLAGS="${sepol_src_save_CFLAGS}" - CPPFLAGS="${sepol_src_save_CPPFLAGS}" -- AC_CHECK_FILE([${sepol_srcdir}/libsepol.a],, -- AC_MSG_ERROR([could not find precompiled libsepol.a])) -+ if test ! -f ${sepol_srcdir}/libsepol.a; then -+ AC_MSG_ERROR([could not find precompiled libsepol.a]) -+ fi - sepol_devel_incdir="${sepol_srcdir}/../include" - fi - SELINUX_CFLAGS="-I${sepol_devel_incdir} -I${selinux_devel_incdir}" -@@ -578,12 +580,13 @@ - [AC_LANG_SOURCE([ - #include - int main () { -- return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0); -+ return expand_module_avrules(NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0); - }])], - AC_MSG_RESULT([yes]), - AC_MSG_ERROR([this version of libsepol is incompatible with SETools])) - fi - sepol_new_expand_boolmap="yes" -+ sepol_new_user_role_mapping="yes" - else - sepol_new_expand_boolmap="no" - fi -@@ -607,7 +610,8 @@ - exit(EXIT_FAILURE); - }])], - sepol_policy_version_max=`cat conftest.data`, -- AC_MSG_FAILURE([could not determine maximum libsepol policy version])) -+ AC_MSG_FAILURE([could not determine maximum libsepol policy version]), -+ sepol_policy_version_max="26") - AC_DEFINE_UNQUOTED(SEPOL_POLICY_VERSION_MAX, ${sepol_policy_version_max}, [maximum policy version supported by libsepol]) - CFLAGS="${sepol_save_CFLAGS}" - CPPFLAGS="${sepol_save_CPPFLAGS}" -@@ -631,7 +635,7 @@ - changequote([,])dnl - selinux_save_CFLAGS="${CFLAGS}" - CFLAGS="${SELINUX_CFLAGS} ${SELINUX_LIB_FLAG} -lselinux -lsepol ${CFLAGS}" -- gcc ${CFLAGS} -o conftest conftest.c >&5 -+ ${CC} ${CFLAGS} -o conftest conftest.c >&5 - selinux_policy_dir=`./conftest` - AC_MSG_RESULT(${selinux_policy_dir}) - CFLAGS="${selinux_save_CFLAGS}" -diff -urN a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c ---- a/libqpol/src/policy_define.c 2013-01-16 10:36:24.000000000 -0600 -+++ b/libqpol/src/policy_define.c 2013-07-12 08:22:10.380255248 -0500 -@@ -2135,7 +2135,7 @@ - #ifdef HAVE_SEPOL_ROLE_ATTRS - if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL)) - #elif HAVE_SEPOL_USER_ROLE_MAPPING -- if (role_set_expand(&roles, &e_roles, policydbp, NULL)) -+ if (role_set_expand(&roles, &e_roles, policydbp, NULL, NULL)) - #else - if (role_set_expand(&roles, &e_roles, policydbp)) - #endif -diff -urN a/m4/ac_python_devel.m4 b/m4/ac_python_devel.m4 ---- a/m4/ac_python_devel.m4 2013-01-16 10:36:22.000000000 -0600 -+++ b/m4/ac_python_devel.m4 2013-07-12 08:22:10.380255248 -0500 -@@ -234,7 +234,7 @@ - AC_MSG_CHECKING([consistency of all components of python development environment]) - AC_LANG_PUSH([C]) - # save current global flags -- LIBS="$ac_save_LIBS $PYTHON_LDFLAGS" -+ LIBS="$ac_save_LIBS $PYTHON_EXTRA_LIBS $PYTHON_LDFLAGS" - CPPFLAGS="$ac_save_CPPFLAGS $PYTHON_CPPFLAGS" - AC_TRY_LINK([ - #include -diff -urN a/python/setools/Makefile.am b/python/setools/Makefile.am ---- a/python/setools/Makefile.am 2013-01-16 10:36:22.000000000 -0600 -+++ b/python/setools/Makefile.am 2013-07-12 08:22:19.200251011 -0500 -@@ -22,13 +22,13 @@ - python-build: sesearch.c seinfo.c - @mkdir -p setools - @cp __init__.py setools -- LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" INCLUDES="$(QPOL_CFLAGS) $(APOL_CFLAGS)" $(PYTHON) setup.py build -+ LIBS="$(QPOL_LIB_FLAG) $(APOL_LIB_FLAG)" LIBDIRS="$(PYTHON_LDFLAGS)" INCLUDES="$(PYTHON_CPPFLAGS) $(QPOL_CFLAGS) $(APOL_CFLAGS)" CC="$(CC)" CFLAGS="$(CFLAGS)" LDSHARED="$(CC) -shared" LDFLAGS="$(LDFLAGS)" $(PYTHON) setup.py build_ext - - install-exec-hook: -- $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py install `test -n "$(DESTDIR)" && echo --prefix=$(DESTDIR)/usr` - - uninstall-hook: -- $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --root $(DESTDIR)` -+ $(PYTHON) setup.py uninstall `test -n "$(DESTDIR)" && echo --prefix=$(DESTDIR)/usr` - - clean-local: - $(PYTHON) setup.py clean -a ---- a/python/setools/setup.py 2013-01-16 10:36:22.000000000 -0600 -+++ b/python/setools/setup.py 2013-09-04 09:17:48.452916991 -0500 -@@ -8,7 +8,7 @@ - try: - inc=os.getenv("INCLUDES").split(" ") - INCLUDES=map(lambda x: x[2:], inc) -- LIBDIRS=map(lambda x: "/".join(x.split("/")[:-1]), os.getenv("LIBS").split()) -+ LIBDIRS=map(lambda x: "/".join(x.split("/")[:-1]), os.getenv("LIBS").split()) + map(lambda x: x[2:], os.getenv("LIBDIRS").split()) - except: - INCLUDES="" - LIBDIRS="" diff --git a/package.bak/setools/0002-move-python-check.patch b/package.bak/setools/0002-move-python-check.patch deleted file mode 100644 index cef2cec996..0000000000 --- a/package.bak/setools/0002-move-python-check.patch +++ /dev/null @@ -1,25 +0,0 @@ -Correct a build issue that occurs when python is not found -in the path. This check should only be done if swig-python -option is selected. - -Signed-off-by Clayton Shotwell - ---- a/configure.ac 2015-05-15 12:28:07.566060349 -0500 -+++ b/configure.ac 2015-05-28 15:07:25.357072800 -0500 -@@ -217,8 +217,6 @@ - do_swigify=yes - fi - --AM_PATH_PYTHON(2.7) -- - AC_ARG_ENABLE(swig-python, - AC_HELP_STRING([--enable-swig-python], - [build SWIG interfaces for Python]), -@@ -227,6 +225,7 @@ - if test ${do_swigify} = no; then - AC_PROG_SWIG(2.0.0) - fi -+ AM_PATH_PYTHON(2.7) - SWIG_PYTHON - do_swigify_python=yes - do_swigify=yes diff --git a/package.bak/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch b/package.bak/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch deleted file mode 100644 index b0842d961a..0000000000 --- a/package.bak/setools/0003-setools-Update-for-2015-02-02-Userspace-release.patch +++ /dev/null @@ -1,90 +0,0 @@ -setools: Add patch to support 2.4 toolstack. -Signed-off-by: Philip Tricca -Signed-off-by: Joe MacDonald -URL: https://github.com/flihp/meta-selinux/commit/e09eaef7a9acb552a4a5e1f90117154ae06b6fda - -Signed-off-by: Adam Duskett - -diff --git a/libqpol/src/policy_define.c b/libqpol/src/policy_define.c -index fad6b60..231962f 100644 ---- a/libqpol/src/policy_define.c -+++ b/libqpol/src/policy_define.c -@@ -1449,7 +1449,7 @@ int define_compute_type_helper(int which, avrule_t ** rule) - return -1; - } - class_perm_node_init(perm); -- perm->class = i + 1; -+ perm->tclass = i + 1; - perm->data = datum->s.value; - perm->next = avrule->perms; - avrule->perms = perm; -@@ -1699,7 +1699,7 @@ int define_te_avtab_helper(int which, avrule_t ** rule) - goto out; - } - class_perm_node_init(cur_perms); -- cur_perms->class = i + 1; -+ cur_perms->tclass = i + 1; - if (!perms) - perms = cur_perms; - if (tail) -diff --git a/libqpol/src/policy_extend.c b/libqpol/src/policy_extend.c -index 5325a87..1417271 100644 ---- a/libqpol/src/policy_extend.c -+++ b/libqpol/src/policy_extend.c -@@ -843,7 +843,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ - for (class_node = rule->perms; class_node; class_node = class_node->next) { - key.rule_type = rule->specified; - key.source_val = key.target_val = i + 1; -- key.class_val = class_node->class; -+ key.class_val = class_node->tclass; - key.cond = cond; - if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) - goto err; -@@ -856,7 +856,7 @@ static int qpol_syn_rule_table_insert_sepol_avrule(qpol_policy_t * policy, qpol_ - key.rule_type = rule->specified; - key.source_val = i + 1; - key.target_val = j + 1; -- key.class_val = class_node->class; -+ key.class_val = class_node->tclass; - key.cond = cond; - if (qpol_syn_rule_table_insert_entry(policy, table, &key, new_rule)) - goto err; -diff --git a/libqpol/src/syn_rule_query.c b/libqpol/src/syn_rule_query.c -index 3e63204..d7578f1 100644 ---- a/libqpol/src/syn_rule_query.c -+++ b/libqpol/src/syn_rule_query.c -@@ -67,7 +67,7 @@ static void *syn_rule_class_state_get_cur(const qpol_iterator_t * iter) - return NULL; - } - -- return db->class_val_to_struct[srcs->cur->class - 1]; -+ return db->class_val_to_struct[srcs->cur->tclass - 1]; - } - - static int syn_rule_class_state_next(qpol_iterator_t * iter) -@@ -465,10 +465,10 @@ int qpol_syn_avrule_get_perm_iter(const qpol_policy_t * policy, const qpol_syn_a - } - - for (node = internal_rule->perms; node; node = node->next) { -- for (i = 0; i < db->class_val_to_struct[node->class - 1]->permissions.nprim; i++) { -+ for (i = 0; i < db->class_val_to_struct[node->tclass - 1]->permissions.nprim; i++) { - if (!(node->data & (1 << i))) - continue; -- tmp = sepol_av_to_string(db, node->class, (sepol_access_vector_t) (1 << i)); -+ tmp = sepol_av_to_string(db, node->tclass, (sepol_access_vector_t) (1 << i)); - if (tmp) { - tmp++; /* remove prepended space */ - for (cur = 0; cur < perm_list_sz; cur++) -diff --git a/secmds/replcon.cc b/secmds/replcon.cc -index 34f7c1a..307c39f 100644 ---- a/secmds/replcon.cc -+++ b/secmds/replcon.cc -@@ -60,7 +60,7 @@ static struct option const longopts[] = { - {NULL, 0, NULL, 0} - }; - --extern int lsetfilecon_raw(const char *, security_context_t) __attribute__ ((weak)); -+extern int lsetfilecon_raw(const char *, const char *) __attribute__ ((weak)); - - /** - * As that setools must work with older libselinux versions that may diff --git a/package.bak/setools/Config.in b/package.bak/setools/Config.in deleted file mode 100644 index 5e7f39d65f..0000000000 --- a/package.bak/setools/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_SETOOLS - bool "setools" - select BR2_PACKAGE_LIBSELINUX - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_BZIP2 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_USES_GLIBC # libselinux - # bfin: infamous _ symbol prefix issue - # nios2: triggers some toolchain issue "No symbol version - # section for versioned symbol" - # arc: libselinux not available - depends on !BR2_nios2 && !BR2_bfin && !BR2_arc - help - SETools is an open source project designed to facilitate - SELinux policy analysis. The primary tools are: - * apol - analyze a SELinux policy. - * seaudit - analyze audit messages from SELinux. - * seaudit-report - generate highly-customized audit log - reports. - * sechecker - command line tool for performing modular - checks on an SELinux policy. - * sediff - semantic policy difference tool for SELinux. - * secmds - command-line tools to analyze and search SELinux - policy. - - https://github.com/TresysTechnology/setools3/wiki - -comment "setools needs a glibc toolchain w/ threads, C++, wchar, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_USES_GLIBC - depends on !BR2_nios2 && !BR2_bfin && !BR2_arc diff --git a/package.bak/setools/setools.hash b/package.bak/setools/setools.hash deleted file mode 100644 index d422e6607b..0000000000 --- a/package.bak/setools/setools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/TresysTechnology/setools3/wiki/Download -md5 d68d0d4e4da0f01da0f208782ff04b91 setools-3.3.8.tar.bz2 -# Locally computed -sha256 44387ecc9a231ec536a937783440cd8960a72c51f14bffc1604b7525e341e999 setools-3.3.8.tar.bz2 diff --git a/package.bak/setools/setools.mk b/package.bak/setools/setools.mk deleted file mode 100644 index 87a19cf5ae..0000000000 --- a/package.bak/setools/setools.mk +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################ -# -# setools -# -################################################################################ - -SETOOLS_VERSION = 3.3.8 -SETOOLS_SOURCE = setools-$(SETOOLS_VERSION).tar.bz2 -SETOOLS_SITE = https://raw.githubusercontent.com/wiki/TresysTechnology/setools3/files/dists/setools-$(SETOOLS_VERSION) -SETOOLS_DEPENDENCIES = libselinux libsepol sqlite libxml2 bzip2 host-bison host-flex -SETOOLS_INSTALL_STAGING = YES -SETOOLS_LICENSE = GPLv2+, LGPLv2.1+ -SETOOLS_LICENSE_FILES = COPYING COPYING.GPL COPYING.LGPL - -# configure.ac is patched by the cross compile patch, -# so autoreconf is necessary -SETOOLS_AUTORECONF = YES - -# Notes: Need "disable-selinux-check" so the configure does not check to see -# if host has selinux enabled. -# No python support as only the libraries and commandline tools are -# installed on target -SETOOLS_CONF_OPTS = \ - --disable-debug \ - --disable-gui \ - --disable-bwidget-check \ - --disable-selinux-check \ - --disable-swig-java \ - --disable-swig-python \ - --disable-swig-tcl \ - --with-sepol-devel="$(STAGING_DIR)/usr" \ - --with-selinux-devel="$(STAGING_DIR)/usr" - -ifeq ($(BR2_sparc64):$(BR2_STATIC_LIBS),y:) -SETOOLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -fPIC" -endif - -HOST_SETOOLS_DEPENDENCIES = host-libselinux host-libsepol host-sqlite \ - host-libxml2 host-bzip2 host-bison - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -HOST_SETOOLS_PYTHON_VERSION=$(PYTHON3_VERSION_MAJOR) -HOST_SETOOLS_DEPENDENCIES += host-python3 -HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON3_VERSION) -else -HOST_SETOOLS_PYTHON_VERSION=$(PYTHON_VERSION_MAJOR) -HOST_SETOOLS_DEPENDENCIES += host-python -HOST_SETOOLS_CONF_ENV += am_cv_python_version=$(PYTHON_VERSION) -endif - -HOST_SETOOLS_PYTHON_SITE_PACKAGES = $(HOST_DIR)/usr/lib/python$(HOST_SETOOLS_PYTHON_VERSION)/site-packages -HOST_SETOOLS_PYTHON_INCLUDES = $(HOST_DIR)/usr/include/python$(HOST_SETOOLS_PYTHON_VERSION) -HOST_SETOOLS_PYTHON_LIB = -lpython$(HOST_SETOOLS_PYTHON_VERSION) - -# Notes: Need "disable-selinux-check" so the configure does not check to see -# if host has selinux enabled. -# Host builds with python support to enable tools for offline target -# policy analysis -HOST_SETOOLS_CONF_OPTS = \ - --disable-debug \ - --disable-gui \ - --disable-bwidget-check \ - --disable-selinux-check \ - --disable-swig-java \ - --disable-swig-python \ - --disable-swig-tcl \ - --with-sepol-devel="$(HOST_DIR)/usr" \ - --with-selinux-devel="$(HOST_DIR)/usr" \ - PYTHON_LDFLAGS="-L$(HOST_DIR)/usr/lib/" \ - PYTHON_CPPFLAGS="-I$(HOST_SETOOLS_PYTHON_INCLUDES)" \ - PYTHON_SITE_PKG="$(HOST_SETOOLS_PYTHON_SITE_PACKAGES)" \ - PYTHON_EXTRA_LIBS="-lpthread -ldl -lutil $(HOST_SETOOLS_PYTHON_LIB)" - -HOST_SETOOLS_CONF_ENV += \ - am_cv_pathless_PYTHON=python \ - ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python \ - am_cv_python_platform=linux2 \ - am_cv_python_version=$(HOST_SETOOLS_PYTHON_VERSION) \ - am_cv_python_pythondir=$(HOST_SETOOLS_PYTHON_SITE_PACKAGES) \ - am_cv_python_pyexecdir=$(HOST_SETOOLS_PYTHON_SITE_PACKAGES) \ - am_cv_python_includes=-I$(HOST_SETOOLS_PYTHON_INCLUDES) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/setserial/0001-build-system-fix.patch b/package.bak/setserial/0001-build-system-fix.patch deleted file mode 100644 index eec7993d19..0000000000 --- a/package.bak/setserial/0001-build-system-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -Install the setserial program in /usr/bin instead of /bin, and make -sure that the directories (especially the manpages directory) are -created before installing files to them. This is similar to what -automake does. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.in | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - -Index: setserial-2.17/Makefile.in -=================================================================== ---- setserial-2.17.orig/Makefile.in -+++ setserial-2.17/Makefile.in -@@ -26,9 +26,10 @@ setserial.cat: setserial.8 - nroff -man setserial.8 > setserial.cat - - install: setserial setserial.8 -- $(INSTALL_PROGRAM) setserial $(DESTDIR)/bin -- $(STRIP) $(DESTDIR)/bin/setserial -- $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/man/man8 -+ mkdir -p $(DESTDIR)/usr/bin -+ $(INSTALL_PROGRAM) setserial $(DESTDIR)/usr/bin -+ mkdir -p $(DESTDIR)/usr/share/man/man8 -+ $(INSTALL_DATA) setserial.8 $(DESTDIR)/usr/share/man/man8 - - clean: - $(RM) setserial setserial.o setserial.cat *~ diff --git a/package.bak/setserial/0002-tiocghayesesp-build-fix.patch b/package.bak/setserial/0002-tiocghayesesp-build-fix.patch deleted file mode 100644 index 176a0c9e15..0000000000 --- a/package.bak/setserial/0002-tiocghayesesp-build-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -[PATCH] setserial: fix build with 2.6.33+ kernel headers - -linux/hayesesp.h got removed in 2.6.33, but some archs (like x86) still -define the TIOCGHAYESESP ioctl, breaking the build. - -It's very unlikely to be of interest anymore, so just undef it. - -Signed-off-by: Peter Korsgaard ---- - setserial.c | 5 +++++ - 1 file changed, 5 insertions(+) - -Index: setserial-2.17/setserial.c -=================================================================== ---- setserial-2.17.orig/setserial.c -+++ setserial-2.17/setserial.c -@@ -24,6 +24,11 @@ - #endif - #include - -+/* linux/hayesesp.h got removed in 2.6.33 but some archs (like x86) -+ still define TIOCGHAYESESP. It's very unlikely to be of interest -+ anymore, so just undef it */ -+#undef TIOCGHAYESESP -+ - #include "version.h" - - static char version_str[] = "setserial version " SETSERIAL_VERSION ", " diff --git a/package.bak/setserial/Config.in b/package.bak/setserial/Config.in deleted file mode 100644 index 4ff2477e84..0000000000 --- a/package.bak/setserial/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_SETSERIAL - bool "setserial" - # Uses fork() - depends on BR2_USE_MMU - help - Setserial : configuration of serial ports diff --git a/package.bak/setserial/setserial.hash b/package.bak/setserial/setserial.hash deleted file mode 100644 index ce3b369f56..0000000000 --- a/package.bak/setserial/setserial.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial/setserial_2.17-45.3.dsc -sha256 7e4487d320ac31558563424189435d396ddf77953bb23111a17a3d1487b5794a setserial_2.17.orig.tar.gz -sha256 33db87e8a86cf12b7c97efca9e056865e71358e8cfeb3931118b2647ce1eecc6 setserial_2.17-45.3.diff.gz diff --git a/package.bak/setserial/setserial.mk b/package.bak/setserial/setserial.mk deleted file mode 100644 index 561fbe98c9..0000000000 --- a/package.bak/setserial/setserial.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# setserial -# -################################################################################ - -SETSERIAL_VERSION = 2.17 -SETSERIAL_PATCH = setserial_2.17-45.3.diff.gz -SETSERIAL_SOURCE = setserial_$(SETSERIAL_VERSION).orig.tar.gz -SETSERIAL_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/setserial -SETSERIAL_LICENSE = GPLv2 -SETSERIAL_LICENSE_FILES = debian/copyright -# make all also builds setserial.cat which needs nroff -SETSERIAL_MAKE_OPTS = setserial - -define SETSERIAL_APPLY_DEBIAN_PATCHES - # Touching gorhack.h is needed for the Debian patch 18 to work - if [ -d $(@D)/debian/patches ]; then \ - touch $(@D)/gorhack.h; \ - rm $(@D)/debian/patches/01_makefile.dpatch; \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches *.dpatch; \ - fi -endef - -SETSERIAL_POST_PATCH_HOOKS += SETSERIAL_APPLY_DEBIAN_PATCHES - -$(eval $(autotools-package)) diff --git a/package.bak/sg3_utils/0001-support-uclinux-as-a-linux.patch b/package.bak/sg3_utils/0001-support-uclinux-as-a-linux.patch deleted file mode 100644 index d9106cd9f8..0000000000 --- a/package.bak/sg3_utils/0001-support-uclinux-as-a-linux.patch +++ /dev/null @@ -1,16 +0,0 @@ -Recognise uclinux as a linux - -Signed-off-by: "Yann E. MORIN" - -diff -durN sg3_utils-1.42.orig/configure.ac sg3_utils-1.42/configure.ac ---- sg3_utils-1.42.orig/configure.ac 2015-10-21 01:10:59.000000000 +0200 -+++ sg3_utils-1.42/configure.ac 2016-08-14 19:30:37.841766149 +0200 -@@ -71,7 +71,7 @@ - - # Define platform-specific symbol. - AM_CONDITIONAL(OS_FREEBSD, [echo $host_os | grep 'freebsd' > /dev/null]) --AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep '^linux' > /dev/null]) -+AM_CONDITIONAL(OS_LINUX, [echo $host_os | grep -E '^(uc)?linux' > /dev/null]) - AM_CONDITIONAL(OS_OSF, [echo $host_os | grep '^osf' > /dev/null]) - AM_CONDITIONAL(OS_SOLARIS, [echo $host_os | grep '^solaris' > /dev/null]) - AM_CONDITIONAL(OS_WIN32_MINGW, [echo $host_os | grep '^mingw' > /dev/null]) diff --git a/package.bak/sg3_utils/Config.in b/package.bak/sg3_utils/Config.in deleted file mode 100644 index 4b74eda641..0000000000 --- a/package.bak/sg3_utils/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_SG3_UTILS - bool "sg3-utils" - depends on !BR2_bfin # symbol prefixing problems - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Low level utilities for devices that use a SCSI command set. - This option install only libsgutils2 library not programs. - - http://sg.danny.cz/sg/sg3_utils.html - -if BR2_PACKAGE_SG3_UTILS - -config BR2_PACKAGE_SG3_UTILS_PROGS - bool "install programs" - -endif - -comment "sg3-utils needs a toolchain w/ threads" - depends on !BR2_bfin - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/sg3_utils/sg3_utils.hash b/package.bak/sg3_utils/sg3_utils.hash deleted file mode 100644 index a884063f4f..0000000000 --- a/package.bak/sg3_utils/sg3_utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated from download (no sig, hash) -sha256 97aeed65894feb2add896b4adfa4cf343966c8a61c7d206795ed0507640ee7b9 sg3_utils-1.42.tar.xz diff --git a/package.bak/sg3_utils/sg3_utils.mk b/package.bak/sg3_utils/sg3_utils.mk deleted file mode 100644 index e7af83a523..0000000000 --- a/package.bak/sg3_utils/sg3_utils.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# sg3_utils -# -################################################################################ - -SG3_UTILS_VERSION = 1.42 -SG3_UTILS_SOURCE = sg3_utils-$(SG3_UTILS_VERSION).tar.xz -SG3_UTILS_SITE = http://sg.danny.cz/sg/p -SG3_UTILS_LICENSE = BSD-3c -# utils progs are GPLv2+ licenced -ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),y) -SG3_UTILS_LICENSE += GPLv2+ -endif -SG3_UTILS_LICENSE_FILES = COPYING BSD_LICENSE - -# Patching configure.ac -SG3_UTILS_AUTORECONF = YES - -# install the libsgutils2 library -SG3_UTILS_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_SG3_UTILS_PROGS),) -define SG3_UTILS_REMOVE_PROGS - for prog in \ - compare_and_write copy_results dd decode_sense \ - emc_trespass format get_config \ - get_lba_status ident inq logs luns map26 \ - map sgm_dd modes opcodes sgp_dd persist prevent \ - raw rbuf rdac read readcap read_block_limits \ - read_attr read_buffer read_long reassign referrals \ - rep_zones requests reset reset_wp rmsn rtpg safte sanitize \ - sat_identify sat_phy_event sat_read_gplog sat_set_features \ - scan senddiag ses ses_microcode start stpg sync test_rwbuf \ - timestamp turs unmap verify vpd write_buffer write_long \ - write_same write_verify wr_mode xcopy zone; do \ - $(RM) $(TARGET_DIR)/usr/bin/sg_$${prog} ; \ - done - for prog in \ - logging_level mandat readcap ready satl start stop \ - temperature; do \ - $(RM) $(TARGET_DIR)/usr/bin/scsi_$${prog} ; \ - done - for prog in \ - sginfo sgm_dd sgp_dd; do \ - $(RM) $(TARGET_DIR)/usr/bin/$${prog}; \ - done -endef - -SG3_UTILS_POST_INSTALL_TARGET_HOOKS += SG3_UTILS_REMOVE_PROGS -endif - -$(eval $(autotools-package)) diff --git a/package.bak/shairport-sync/Config.in b/package.bak/shairport-sync/Config.in deleted file mode 100644 index c558a64c5b..0000000000 --- a/package.bak/shairport-sync/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -config BR2_PACKAGE_SHAIRPORT_SYNC - bool "shairport-sync" - depends on BR2_USE_MMU # libdaemon - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_LIBCONFIG - select BR2_PACKAGE_LIBDAEMON - select BR2_PACKAGE_POLARSSL if !BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_POPT - help - Shairport Sync emulates an AirPort Express for the purpose of - streaming audio from iTunes, iPods, iPhones, iPads and AppleTVs. - Audio played by a Shairport Sync-powered device stays in synchrony - with the source and thus with other devices that are playing the same - source synchronously. Thus, for example, synchronised multi-room - audio is possible without difficulty. - - https://github.com/mikebrady/shairport-sync - -if BR2_PACKAGE_SHAIRPORT_SYNC - -config BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR - bool "libsoxr support" - select BR2_PACKAGE_LIBSOXR - help - Enable support for libsoxr, the SoX Resampler library. - - Briefly, Shairport Sync keeps in step with the audio source by - deleting or inserting frames of audio into the stream as needed. This - "interpolation" is normally inaudible, but it can be heard in some - circumstances. Libsoxr allows this interpolation to be done much more - smoothly and subtly. - -endif - -comment "shairport-sync needs a toolchain w/ NPTL" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/shairport-sync/S99shairport-sync b/package.bak/shairport-sync/S99shairport-sync deleted file mode 100644 index 5443ed138c..0000000000 --- a/package.bak/shairport-sync/S99shairport-sync +++ /dev/null @@ -1,25 +0,0 @@ -#! /bin/sh - -# Additional options that are passed to Shairport Sync -OPTIONS="-d" - -case "$1" in - start) - printf "Starting shairport-sync: " - start-stop-daemon -S -q -p /var/run/shairport-sync.pid --exec /usr/bin/shairport-sync -- $OPTIONS - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - stop) - printf "Stopping shairport-sync: " - start-stop-daemon -K -q -p /var/run/shairport-sync.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac diff --git a/package.bak/shairport-sync/shairport-sync.hash b/package.bak/shairport-sync/shairport-sync.hash deleted file mode 100644 index 45bce1016a..0000000000 --- a/package.bak/shairport-sync/shairport-sync.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2e73416ac8fdda1657034afaa143f1710852ebed06e0aa43dafc2b7dc5eb653d shairport-sync-2.8.6.tar.gz diff --git a/package.bak/shairport-sync/shairport-sync.mk b/package.bak/shairport-sync/shairport-sync.mk deleted file mode 100644 index 00d6a695b8..0000000000 --- a/package.bak/shairport-sync/shairport-sync.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# shairport-sync -# -################################################################################ - -SHAIRPORT_SYNC_VERSION = 2.8.6 -SHAIRPORT_SYNC_SITE = $(call github,mikebrady,shairport-sync,$(SHAIRPORT_SYNC_VERSION)) - -SHAIRPORT_SYNC_LICENSE = MIT, BSD-3c -SHAIRPORT_SYNC_LICENSE_FILES = LICENSES -SHAIRPORT_SYNC_DEPENDENCIES = alsa-lib libconfig libdaemon popt host-pkgconf - -# git clone, no configure -SHAIRPORT_SYNC_AUTORECONF = YES - -SHAIRPORT_SYNC_CONF_OPTS = --with-alsa \ - --with-metadata \ - --with-pipe \ - --with-stdout - -# Avahi or tinysvcmdns (shaiport-sync bundles its own version of tinysvcmdns). -# Avahi support needs libavahi-client, which is built by avahi if avahi-daemon -# and dbus is selected. Since there is no BR2_PACKAGE_LIBAVAHI_CLIENT config -# option yet, use the avahi-daemon and dbus congig symbols to check for -# libavahi-client. -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) -SHAIRPORT_SYNC_DEPENDENCIES += avahi -SHAIRPORT_SYNC_CONF_OPTS += --with-avahi -else -SHAIRPORT_SYNC_CONF_OPTS += --with-tinysvcmdns -endif - -# OpenSSL or PolarSSL -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SHAIRPORT_SYNC_DEPENDENCIES += openssl -SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=openssl -else -SHAIRPORT_SYNC_DEPENDENCIES += polarssl -SHAIRPORT_SYNC_CONF_OPTS += --with-ssl=polarssl -endif - -ifeq ($(BR2_PACKAGE_SHAIRPORT_SYNC_LIBSOXR),y) -SHAIRPORT_SYNC_DEPENDENCIES += libsoxr -SHAIRPORT_SYNC_CONF_OPTS += --with-soxr -endif - -define SHAIRPORT_SYNC_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/shairport-sync \ - $(TARGET_DIR)/usr/bin/shairport-sync - $(INSTALL) -D -m 0644 $(@D)/scripts/shairport-sync.conf \ - $(TARGET_DIR)/etc/shairport-sync.conf -endef - -define SHAIRPORT_SYNC_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/shairport-sync/S99shairport-sync \ - $(TARGET_DIR)/etc/init.d/S99shairport-sync -endef - -$(eval $(autotools-package)) diff --git a/package.bak/shapelib/Config.in b/package.bak/shapelib/Config.in deleted file mode 100644 index aa2297b277..0000000000 --- a/package.bak/shapelib/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SHAPELIB - bool "shapelib" - help - The Shapefile C Library provides the ability to write simple - C programs for reading, writing and updating (to a limited - extent) ESRI Shapefiles, and the associated attribute file - (.dbf). - - http://shapelib.maptools.org/ diff --git a/package.bak/shapelib/shapelib.hash b/package.bak/shapelib/shapelib.hash deleted file mode 100644 index f3f812ebf9..0000000000 --- a/package.bak/shapelib/shapelib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f shapelib-1.3.0.tar.gz diff --git a/package.bak/shapelib/shapelib.mk b/package.bak/shapelib/shapelib.mk deleted file mode 100644 index 2e8fe6d7b2..0000000000 --- a/package.bak/shapelib/shapelib.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# shapelib -# -################################################################################ - -SHAPELIB_VERSION = 1.3.0 -SHAPELIB_SITE = http://download.osgeo.org/shapelib -SHAPELIB_LICENSE = MIT or LGPLv2 -SHAPELIB_LICENSE_FILES = web/license.html LICENSE.LGPL -SHAPELIB_INSTALL_STAGING = YES - -define SHAPELIB_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define SHAPELIB_INSTALL_STAGING_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(STAGING_DIR)/usr/ lib_install -endef - -define SHAPELIB_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) PREFIX=$(TARGET_DIR)/usr/ bin_install -endef - -$(eval $(generic-package)) diff --git a/package.bak/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch b/package.bak/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch deleted file mode 100644 index a0d3fb0fb3..0000000000 --- a/package.bak/shared-mime-info/0001-Remove-incorrect-dependency-from-install-data-hook.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 3bcb00e27ab09c433fdfecace0d48a6a7ed55ea8 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 22 Apr 2016 23:14:32 +0200 -Subject: [PATCH] Remove incorrect dependency from install-data-hook - -Having install-binPROGRAMS as a dependency of install-data-hook is not -correct, as it causes the installation of programs to be executed -twice, and those two installations are racing with each other, causing -random installation failures. - -In addition, this dependency is not needed: the install-data-hook -calls the update-mime-database program in one of two ways: - - - When cross-compiling, using the program pointed by - UPDATE_MIME_DATABASE, which is already built, and is not installed - by install-binPROGRAMS. - - - When compiling natively, suing the update-mime-database from the - build directory, so there is no need to depend on - install-binPROGRAMS. - -This patch is similar to the patch used by the Yocto Project at -http://git.yoctoproject.org/cgit.cgi/poky/plain/meta/recipes-support/shared-mime-info/shared-mime-info/install-data-hook.patch. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 6fc4f73..c318dc3 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -52,7 +52,7 @@ else - update_mime_database="$(top_builddir)/update-mime-database$(EXEEXT)" - endif - --install-data-hook: install-binPROGRAMS -+install-data-hook: - if ENABLE_UPDATE_MIMEDB - $(update_mime_database) -V "$(DESTDIR)$(datadir)/mime" - endif --- -2.6.4 - diff --git a/package.bak/shared-mime-info/Config.in b/package.bak/shared-mime-info/Config.in deleted file mode 100644 index 514044bea2..0000000000 --- a/package.bak/shared-mime-info/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_SHARED_MIME_INFO - bool "shared-mime-info" - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_LIBXML2 - help - The shared-mime-info package contains the core - database of common types and the update-mime-database - command used to extend it. - - https://freedesktop.org/wiki/Software/shared-mime-info/ - -comment "shared-mime-info needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/shared-mime-info/shared-mime-info.hash b/package.bak/shared-mime-info/shared-mime-info.hash deleted file mode 100644 index cf6c8f3eb7..0000000000 --- a/package.bak/shared-mime-info/shared-mime-info.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9 shared-mime-info-1.8.tar.xz diff --git a/package.bak/shared-mime-info/shared-mime-info.mk b/package.bak/shared-mime-info/shared-mime-info.mk deleted file mode 100644 index 64bb4d5187..0000000000 --- a/package.bak/shared-mime-info/shared-mime-info.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# shared-mime-info -# -################################################################################ - -SHARED_MIME_INFO_VERSION = 1.8 -SHARED_MIME_INFO_SOURCE = shared-mime-info-$(SHARED_MIME_INFO_VERSION).tar.xz -SHARED_MIME_INFO_SITE = https://people.freedesktop.org/~hadess -SHARED_MIME_INFO_INSTALL_STAGING = YES -SHARED_MIME_INFO_CONF_ENV = XMLLINT=$(HOST_DIR)/usr/bin/xmllint -SHARED_MIME_INFO_DEPENDENCIES = host-shared-mime-info libxml2 libglib2 -SHARED_MIME_INFO_CONF_OPTS = \ - --disable-update-mimedb \ - --disable-default-make-check -HOST_SHARED_MIME_INFO_CONF_OPTS = \ - --disable-update-mimedb \ - --disable-default-make-check -SHARED_MIME_INFO_LICENSE = GPLv2 -SHARED_MIME_INFO_LICENSE_FILES = COPYING - -HOST_SHARED_MIME_INFO_DEPENDENCIES = \ - host-pkgconf host-intltool host-libxml2 host-libglib2 - -define SHARED_MIME_INFO_INSTALL_TARGET_CMDS - $(HOST_MAKE_ENV) $(SHARED_MIME_INFO_HOST_BINARY) $(STAGING_DIR)/usr/share/mime - $(INSTALL) -D $(STAGING_DIR)/usr/share/mime/mime.cache $(TARGET_DIR)/usr/share/mime/mime.cache -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# shared-mime-info for the host -SHARED_MIME_INFO_HOST_BINARY = $(HOST_DIR)/usr/bin/update-mime-database diff --git a/package.bak/shellinabox/0001-Makefile-disable-always-building-statically.patch b/package.bak/shellinabox/0001-Makefile-disable-always-building-statically.patch deleted file mode 100644 index 2f2097e099..0000000000 --- a/package.bak/shellinabox/0001-Makefile-disable-always-building-statically.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c060e6f06a81ffa400266a6d0bfc58511265a16f Mon Sep 17 00:00:00 2001 -From: Olivier Singla -Date: Thu, 4 Aug 2016 21:23:41 +0200 -Subject: [PATCH] Makefile: disable always building statically - -Signed-off-by: Olivier Singla ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 7b8e7ab..5c4c71e 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -126,7 +126,7 @@ BUILT_SOURCES = shellinabox/beep.h \ - - shellinaboxd_LDADD = liblogging.la \ - libhttp.la --shellinaboxd_LDFLAGS = -static -+shellinaboxd_LDFLAGS = - ## Added this for compatibility with older versions of autoconf/automake - docdir = ${datadir}/doc/${PACKAGE} - --- -2.7.4 - diff --git a/package.bak/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch b/package.bak/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch deleted file mode 100644 index caa5456609..0000000000 --- a/package.bak/shellinabox/0002-launcher.c-include-sys-ttydefaults.h.patch +++ /dev/null @@ -1,27 +0,0 @@ -From c8d9df500b1ca83ad6da9b6055549adaba6ee0d3 Mon Sep 17 00:00:00 2001 -From: Olivier Singla -Date: Thu, 4 Aug 2016 22:05:08 +0200 -Subject: [PATCH] launcher.c: include - -This include is needed to get the definition of TTYDEF_*. - -Signed-off-by: Olivier Singla ---- - shellinabox/launcher.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/shellinabox/launcher.c b/shellinabox/launcher.c -index 2bac171..c8ba6cb 100644 ---- a/shellinabox/launcher.c -+++ b/shellinabox/launcher.c -@@ -66,6 +66,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.7.4 - diff --git a/package.bak/shellinabox/Config.in b/package.bak/shellinabox/Config.in deleted file mode 100644 index 63a298dcae..0000000000 --- a/package.bak/shellinabox/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_SHELLINABOX - bool "shellinabox" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlfcn.h - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - Shell In A Box implements a web server that can export - arbitrary command line tools to a web based terminal - emulator. This emulator is accessible to any JavaScript and - CSS enabled web browser and does not require any additional - browser plugins. - - https://github.com/shellinabox/shellinabox - -comment "shellinabox needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/shellinabox/shellinabox.hash b/package.bak/shellinabox/shellinabox.hash deleted file mode 100644 index 4bc110385a..0000000000 --- a/package.bak/shellinabox/shellinabox.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 d25ba9f72f04471fc1a8a564c65ef466c4553280ff3eeb365ed9c897d05ed2da shellinabox-v2.19.tar.gz diff --git a/package.bak/shellinabox/shellinabox.mk b/package.bak/shellinabox/shellinabox.mk deleted file mode 100644 index 1173ef7d1c..0000000000 --- a/package.bak/shellinabox/shellinabox.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# shellinabox -# -################################################################################ - -SHELLINABOX_VERSION = v2.19 -SHELLINABOX_SITE = $(call github,shellinabox,shellinabox,$(SHELLINABOX_VERSION)) -SHELLINABOX_LICENSE = GPLv2 with OpenSSL exception -SHELLINABOX_LICENSE_FILES = COPYING GPL-2 - -# Fetching from Github, and patching Makefile.am, so we need to autoreconf -SHELLINABOX_AUTORECONF = YES - -# The OpenSSL support is supposed to be optional, but in practice, -# with OpenSSL disabled, it fails to build. See -# https://github.com/shellinabox/shellinabox/issues/385. -SHELLINABOX_DEPENDENCIES = zlib openssl -SHELLINABOX_CONF_OPTS = \ - --disable-runtime-loading \ - --enable-ssl - -# musl's implementation of utmpx is a dummy one, and some aspects of -# it cause build failures in shellinabox -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -SHELLINABOX_CONF_ENV += ac_cv_header_utmpx_h=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sigrok-cli/Config.in b/package.bak/sigrok-cli/Config.in deleted file mode 100644 index b8eb60d1ba..0000000000 --- a/package.bak/sigrok-cli/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_SIGROK_CLI - bool "sigrok-cli" - select BR2_PACKAGE_LIBSIGROK - # libsigrok->libglib2: - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU - # libsigrok - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Sigrok-cli is a command-line frontend for the sigrok - software suite. - - http://sigrok.org/wiki/Sigrok-cli - -comment "sigrok-cli needs a toolchain w/ wchar, threads, gcc >= 4.7" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/sigrok-cli/sigrok-cli.hash b/package.bak/sigrok-cli/sigrok-cli.hash deleted file mode 100644 index b60b57e71e..0000000000 --- a/package.bak/sigrok-cli/sigrok-cli.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ab2ede4e245f3987e19a89a530bd204e0d792c07474d9fed3345d4af4e84723c sigrok-cli-0.6.0.tar.gz diff --git a/package.bak/sigrok-cli/sigrok-cli.mk b/package.bak/sigrok-cli/sigrok-cli.mk deleted file mode 100644 index ec5c8bd864..0000000000 --- a/package.bak/sigrok-cli/sigrok-cli.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# sigrok-cli -# -################################################################################ - -SIGROK_CLI_VERSION = 0.6.0 -SIGROK_CLI_SITE = http://sigrok.org/download/source/sigrok-cli -SIGROK_CLI_LICENSE = GPLv3+ -SIGROK_CLI_LICENSE_FILES = COPYING -SIGROK_CLI_DEPENDENCIES = host-pkgconf libsigrok - -ifeq ($(BR2_PACKAGE_LIBSIGROKDECODE),y) -SIGROK_CLI_CONF_OPTS += --with-libsigrokdecode -SIGROK_CLI_DEPENDENCIES += libsigrokdecode -else -SIGROK_CLI_CONF_OPTS += --with-libsigrokdecode=NO -endif - -$(eval $(autotools-package)) diff --git a/package.bak/simicsfs/Config.in b/package.bak/simicsfs/Config.in deleted file mode 100644 index 12b05c17de..0000000000 --- a/package.bak/simicsfs/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -comment "simicsfs needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -config BR2_PACKAGE_SIMICSFS - bool "simicsfs" - depends on BR2_LINUX_KERNEL - help - A kernel driver that provides access to a host computer's local - filesystem when the target is executing within a SIMICS simulation. - - http://www.cs.sfu.ca/~fedorova/Tech/simics-guides-3.0.26/simics-user-guide-unix/topic33.html diff --git a/package.bak/simicsfs/simicsfs.hash b/package.bak/simicsfs/simicsfs.hash deleted file mode 100644 index 42ada91031..0000000000 --- a/package.bak/simicsfs/simicsfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d0cf7caf888dc1e7dc9496c4b59af98eb2b69d6113d6920757465902e1f21f38 simicsfs-1.18.tar.gz diff --git a/package.bak/simicsfs/simicsfs.mk b/package.bak/simicsfs/simicsfs.mk deleted file mode 100644 index 91ed413839..0000000000 --- a/package.bak/simicsfs/simicsfs.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# simicsfs -# -################################################################################ - -SIMICSFS_VERSION = 1.18 -SIMICSFS_SITE = http://download.simics.net/pub -SIMICSFS_LICENSE = GPLv2+ -SIMICSFS_LICENSE_FILES = hostfs.h - -$(eval $(kernel-module)) -$(eval $(generic-package)) diff --git a/package.bak/sispmctl/0001-configure-add-pkg-config-support.patch b/package.bak/sispmctl/0001-configure-add-pkg-config-support.patch deleted file mode 100644 index 9466080641..0000000000 --- a/package.bak/sispmctl/0001-configure-add-pkg-config-support.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8002a7e6fa965dfd304d098fbc64b0f1a6e3b465 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 24 Aug 2014 22:34:29 +0200 -Subject: [PATCH 1/1] configure: add pkg-config support - -The static linking doesn't works with libusb-compat when using libusb-config. -Also the CFLAGS initialization with libusb-config --cflags is comented out. - -Based on libftdi's patch, add the support for pkg-config to link sispmctl -correctly. - -This allow to add correct include directory to CFLAGS -(Add -I$(STAGING_DIR)/usr/include and -I$(STAGING_DIR)/usr/include/libusb-1.0) -Also add needed libraries during static linking (-lusb -lusb-1.0 and -pthread) - -Signed-off-by: Romain Naour ---- - configure.in | 36 +++++++++++------------------------- - 1 file changed, 11 insertions(+), 25 deletions(-) - -diff --git a/configure.in b/configure.in -index 08d39ea..65d0c1d 100644 ---- a/configure.in -+++ b/configure.in -@@ -23,31 +23,17 @@ AC_SUBST(WEBDIR) - AC_ARG_WITH(bindaddr,[ --with-bindaddr=IP bind listening socket to IP], [BINDADDR="$withval"]) - AC_SUBST(BINDADDR) - -- --# Checks for libraries. --dnl check for libusb-config --AC_PATH_PROG(HAVELIBUSB, libusb-config, $PATH) -- --if test -e "$HAVELIBUSB"; then -- dnl LIBUSB_CFLAGS=`$HAVELIBUSB --cflags` -- LIBUSB_LIBS=`$HAVELIBUSB --libs` -- CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -- LIBS="$LIBS $LIBUSB_LIBS" --else -- AC_MSG_ERROR([*** libusb-config not found. You need a working libusb installation. Version >=0.1.7]) --fi -- --dnl check for version of libusb --AC_MSG_CHECKING([if libusb version is >= 0.1.9]) --libusb_version_needed="1009" --libusb_version=`$HAVELIBUSB --version | sed -e "s/libusb //" | awk 'BEGIN { FS = "."; } { printf "%d", ($''1 * 1000 + $''2) * 1000 + $''3;}'` -- --if test $libusb_version -lt $libusb_version_needed; then -- AC_MSG_RESULT(no) -- AC_MSG_ERROR([*** libusb is too old ($libusb_version). You need a libusb installation newer or equal to 0.1.9.]) --else -- AC_MSG_RESULT(yes) --fi -+dnl check for libusb -+PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1.11) -+CFLAGS="$CFLAGS $LIBUSB_CFLAGS" -+LIBS="$LIBS $LIBUSB_LIBS" -+ -+dnl Check for recent pkg-config which supports Requires.private -+case `$PKG_CONFIG --version` in -+0.?|0.1[0-7]) PKGCONFIG_REQUIRES="Requires"; ;; -+*) PKGCONFIG_REQUIRES="Requires.private"; ;; -+esac -+AC_SUBST(PKGCONFIG_REQUIRES) - - # Checks for header files. - AC_HEADER_STDC --- -1.9.3 - diff --git a/package.bak/sispmctl/Config.in b/package.bak/sispmctl/Config.in deleted file mode 100644 index 976b08f885..0000000000 --- a/package.bak/sispmctl/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_SISPMCTL - bool "sispmctl" - select BR2_PACKAGE_LIBUSB - select BR2_PACKAGE_LIBUSB_COMPAT - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - help - sispmctl is an application enabling the use of the GEMBIRD - SiS-PM and mSiS(sispm) USB-controlled power-outlet device - under Linux. Note that the device is also sold under - different Names, i.e. as "IntelliPlug" in Germany. - - http://sispmctl.sourceforge.net/ - -comment "sispmctl needs a toolchain w/ threads, wchar" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR - depends on BR2_USE_MMU diff --git a/package.bak/sispmctl/sispmctl.hash b/package.bak/sispmctl/sispmctl.hash deleted file mode 100644 index 9f34b4399d..0000000000 --- a/package.bak/sispmctl/sispmctl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e9a99cc81ef0a93f3484e5093efd14d93cc967221fcd22c151f0bea32eb91da7 sispmctl-3.1.tar.gz diff --git a/package.bak/sispmctl/sispmctl.mk b/package.bak/sispmctl/sispmctl.mk deleted file mode 100644 index 3f3635e1f4..0000000000 --- a/package.bak/sispmctl/sispmctl.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# sispmctl -# -################################################################################ - -SISPMCTL_VERSION = 3.1 -SISPMCTL_SITE = http://downloads.sourceforge.net/project/sispmctl/sispmctl/sispmctl-$(SISPMCTL_VERSION) -SISPMCTL_LICENSE = GPLv2+ -SISPMCTL_LICENSE_FILES = LICENCE -SISPMCTL_DEPENDENCIES = libusb-compat - -SISPMCTL_CONF_OPTS = --enable-webless - -# We're patching configure.in -SISPMCTL_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/skalibs/0001-No-runtime-tests-for-endianness.patch b/package.bak/skalibs/0001-No-runtime-tests-for-endianness.patch deleted file mode 100644 index 4390d449dd..0000000000 --- a/package.bak/skalibs/0001-No-runtime-tests-for-endianness.patch +++ /dev/null @@ -1,95 +0,0 @@ -From 1e6f0b094c6ce6454be572704b866d2ce0962e59 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sun, 4 Dec 2016 19:10:40 +0100 -Subject: [PATCH] No runtime tests for endianness - -Replace build and execution of runtime test programs for determining -the endianness of the target with compile time test programs. - -This improves support for cross-compilation. - -Signed-off-by: Eric Le Bihan ---- - configure | 15 +++++++++++---- - src/sysdeps/trybigendian.c | 16 ++++++++++++++++ - src/sysdeps/trylittleendian.c | 16 ++++++++++++++++ - 3 files changed, 43 insertions(+), 4 deletions(-) - create mode 100644 src/sysdeps/trybigendian.c - create mode 100644 src/sysdeps/trylittleendian.c - -diff --git a/configure b/configure -index 1579025..4da9c5e 100755 ---- a/configure -+++ b/configure -@@ -463,13 +463,20 @@ EOF - fi - exec 3>&- - -- echo "Checking system endianness..." -- $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o tryendianness src/sysdeps/tryendianness.c -- endianness=$(./tryendianness) || fail "$0: unable to determine endianness" -+ echo "Checking system endianness..." -+ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trybigendian src/sysdeps/trybigendian.c 2>/dev/null; then -+ endianness=big -+ else -+ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -o trylittleendian src/sysdeps/trylittleendian.c 2>/dev/null; then -+ endianness=little -+ else -+ fail "$0: unable to determine endianness" -+ fi -+ fi - echo "endianness: $endianness" >> $sysdeps/sysdeps - echo "#define ${package_macro_name}_ENDIANNESS \"$endianness\"" >> $sysdeps/sysdeps.h - echo " ... $endianness" -- rm -f tryendianness -+ rm -f trybigendian trylittleendian - - trytypesize ushort USHORT "unsigned short" - trytypesize uint UINT "unsigned int" -diff --git a/src/sysdeps/trybigendian.c b/src/sysdeps/trybigendian.c -new file mode 100644 -index 0000000..d857572 ---- /dev/null -+++ b/src/sysdeps/trybigendian.c -@@ -0,0 +1,16 @@ -+#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __BIG_ENDIAN) || \ -+ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__) || \ -+ defined(__BIG_ENDIAN) || \ -+ defined(__ARMEB__) || \ -+ defined(__THUMBEB__) || \ -+ defined(__AARCH64EB__) || \ -+ defined(_MIPSEB) || defined(__MIPSEB) || defined(__MIPSEB__) -+#define YEAH -+#else -+#error "not big endian" -+#endif -+ -+int main(void) -+{ -+ return 0; -+} -diff --git a/src/sysdeps/trylittleendian.c b/src/sysdeps/trylittleendian.c -new file mode 100644 -index 0000000..eba065a ---- /dev/null -+++ b/src/sysdeps/trylittleendian.c -@@ -0,0 +1,16 @@ -+#if defined(__BYTE_ORDER) && (__BYTE_ORDER == __LITTLE_ENDIAN) || \ -+ defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__) || \ -+ defined(__LITTLE_ENDIAN) || \ -+ defined(__ARMEL__) || \ -+ defined(__THUMBEL__) || \ -+ defined(__AARCH64EL__) || \ -+ defined(_MIPSEL) || defined(__MIPSEL) || defined(__MIPSEL__) -+#define YEAH -+#else -+#error "not little endian" -+#endif -+ -+int main(void) -+{ -+ return 0; -+} --- -2.5.5 - diff --git a/package.bak/skalibs/0002-No-runtime-tests-for-type-sizes.patch b/package.bak/skalibs/0002-No-runtime-tests-for-type-sizes.patch deleted file mode 100644 index 3f16171e21..0000000000 --- a/package.bak/skalibs/0002-No-runtime-tests-for-type-sizes.patch +++ /dev/null @@ -1,54 +0,0 @@ -From d868600a3f437750bc44a783d677a25a48100096 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Sun, 4 Dec 2016 19:11:25 +0100 -Subject: [PATCH] No runtime tests for type sizes - -Replace build and execution of runtime test programs for determining -some type sizes of the target with compile time test programs. - -This improves support for cross-compilation. - -Signed-off-by: Eric Le Bihan ---- - configure | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/configure b/configure -index 4da9c5e..b5926ca 100755 ---- a/configure -+++ b/configure -@@ -157,10 +157,28 @@ choose () { - - trytypesize () { - echo "Checking size of $3..." -- $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 src/sysdeps/trysizeof$1.c -- type_size=$(./trysizeof$1) || fail "$0: unable to determine size of $3" -+ r=false -+ type_size=0 -+ while true; do -+ cat<trysizeof$1.c -+#include -+ -+int main(void) -+{ -+ static int v = 1 / !!((sizeof($3) == $type_size)); -+ return 0; -+} -+EOF -+ if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o trysizeof$1 trysizeof$1.c 2>/dev/null; then -+ r=true -+ break -+ fi -+ type_size=$(expr $type_size + 1) -+ test $type_size -le 16 || break -+ done -+ test $r = true || fail "$0: unable to determine size of $3" - type_bits=$(expr 8 \* $type_size) -- rm -f trysizeof$1 -+ rm -f trysizeof$1 trysizeof$1.c - echo "sizeof$1: $type_size" >> $sysdeps/sysdeps - echo "#define ${package_macro_name}_SIZEOF$2 $type_size" >> $sysdeps/sysdeps.h - echo "#define ${package_macro_name}_$2_BITS $type_bits" >> $sysdeps/sysdeps.h --- -2.5.5 - diff --git a/package.bak/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch b/package.bak/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch deleted file mode 100644 index ef0e173b91..0000000000 --- a/package.bak/skalibs/0003-Make-linker-use-dummy-file-when-testing-libs.patch +++ /dev/null @@ -1,44 +0,0 @@ -From da293110f429e1206728c1551cf0f6b462b3d8c0 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Thu, 29 Dec 2016 19:36:24 +0100 -Subject: [PATCH] Make linker use dummy file when testing libs - -For some architectures, like Xtensa or HPPA, ld from binutils requires -the output file to be a regular file, as mentioned in a bug report on -the mailing list [1]. - -So, use a dummy file as output file for ld in trylibs(), instead of -/dev/null. - -[1] https://sourceware.org/bugzilla/show_bug.cgi?id=19526 - -Signed-off-by: Eric Le Bihan ---- - configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 1579025..12980fb 100755 ---- a/configure -+++ b/configure -@@ -173,7 +173,7 @@ trylibs () { - echo "Checking whether system has $2..." >&3 - shift 2 - if $CC_AUTO $CPPFLAGS_AUTO $CFLAGS_AUTO -c -o try$name.o src/sysdeps/try$name.c 2>/dev/null ; then -- until $CC_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o /dev/null try$name.o $args 2>/dev/null ; do -+ until $CC_AUTO $CFLAGS_AUTO $LDFLAGS_AUTO -o try$name try$name.o $args 2>/dev/null ; do - if test -z "$*" ; then - rm -f try$name.o - echo -@@ -189,7 +189,7 @@ trylibs () { - else - echo " ... yes, with$args" >&3 - fi -- rm -f try$name.o -+ rm -f try$name.o try$name - return 0 - else - echo --- -2.4.11 - diff --git a/package.bak/skalibs/Config.in b/package.bak/skalibs/Config.in deleted file mode 100644 index 7802ae30c4..0000000000 --- a/package.bak/skalibs/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SKALIBS - bool "skalibs" - depends on BR2_USE_MMU # fork() - help - skalibs is a package centralizing the FOSS C development - files used for building all software at skarnet.org: - it contains essentially general-purpose libraries. - - http://skarnet.org/software/skalibs/ diff --git a/package.bak/skalibs/skalibs.hash b/package.bak/skalibs/skalibs.hash deleted file mode 100644 index 195ac47988..0000000000 --- a/package.bak/skalibs/skalibs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally generated -sha256 0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8 skalibs-2.4.0.2.tar.gz diff --git a/package.bak/skalibs/skalibs.mk b/package.bak/skalibs/skalibs.mk deleted file mode 100644 index 55b8a293a7..0000000000 --- a/package.bak/skalibs/skalibs.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# skalibs -# -################################################################################ - -SKALIBS_VERSION = 2.4.0.2 -SKALIBS_SITE = http://skarnet.org/software/skalibs -SKALIBS_LICENSE = ISC -SKALIBS_LICENSE_FILES = COPYING -SKALIBS_INSTALL_STAGING = YES - -SKALIBS_CONF_OPTS = \ - --prefix=/usr \ - --with-default-path=/sbin:/usr/sbin:/bin:/usr/bin \ - $(SHARED_STATIC_LIBS_OPTS) - -define SKALIBS_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure $(SKALIBS_CONF_OPTS)) -endef - -define SKALIBS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define SKALIBS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - rm -rf $(TARGET_DIR)/usr/lib/skalibs -endef - -define SKALIBS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(STAGING_DIR) install -endef - -HOST_SKALIBS_CONF_OPTS = \ - --prefix=$(HOST_DIR)/usr \ - --disable-static \ - --enable-shared \ - --disable-allstatic - -define HOST_SKALIBS_CONFIGURE_CMDS - (cd $(@D); $(HOST_CONFIGURE_OPTS) ./configure $(HOST_SKALIBS_CONF_OPTS)) -endef - -define HOST_SKALIBS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_SKALIBS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/skeleton/Config.in b/package.bak/skeleton/Config.in deleted file mode 100644 index d25147bd92..0000000000 --- a/package.bak/skeleton/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_SKELETON - bool - default y - help - The basic skeleton for your rootfs. diff --git a/package.bak/skeleton/nfs_check b/package.bak/skeleton/nfs_check deleted file mode 100755 index dfa0cbf580..0000000000 --- a/package.bak/skeleton/nfs_check +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# This allows NFS booting to work while also being able to configure -# the network interface via DHCP when not NFS booting. Otherwise, a -# NFS booted system will likely hang during DHCP configuration. - -# Attempting to configure the network interface used for NFS will -# initially bring that network down. Since the root filesystem is -# accessed over this network, the system hangs. - -# This script is run by ifup and will attempt to detect if a NFS root -# mount uses the interface to be configured (IFACE), and if so does -# not configure it. This should allow the same build to be disk/flash -# booted or NFS booted. - -nfsip=`sed -n '/^[^ ]*:.* \/ nfs.*[ ,]addr=\([0-9.]\+\).*/s//\1/p' /proc/mounts` -if [ -n "$nfsip" ] && ip route get to "$nfsip" | grep -q "dev $IFACE"; then - echo Skipping $IFACE, used for NFS from $nfsip - exit 1 -fi diff --git a/package.bak/skeleton/skeleton.mk b/package.bak/skeleton/skeleton.mk deleted file mode 100644 index 1000161c34..0000000000 --- a/package.bak/skeleton/skeleton.mk +++ /dev/null @@ -1,247 +0,0 @@ -################################################################################ -# -# skeleton -# -################################################################################ - -# The skeleton can't depend on the toolchain, since all packages depends on the -# skeleton and the toolchain is a target package, as is skeleton. -# Hence, skeleton would depends on the toolchain and the toolchain would depend -# on skeleton. -SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO - -# The skeleton also handles the merged /usr case in the sysroot -SKELETON_INSTALL_STAGING = YES - -ifeq ($(BR2_ROOTFS_SKELETON_CUSTOM),y) - -SKELETON_PATH = $(call qstrip,$(BR2_ROOTFS_SKELETON_CUSTOM_PATH)) - -ifeq ($(BR_BUILDING),y) -ifeq ($(SKELETON_PATH),) -$(error No path specified for the custom skeleton) -endif -endif - -ifeq ($(BR2_ROOTFS_MERGED_USR),y) - -# Ensure the user has prepared a merged /usr. -# -# Extract the inode numbers for all of those directories. In case any is -# a symlink, we want to get the inode of the pointed-to directory, so we -# append '/.' to be sure we get the target directory. Since the symlinks -# can be anyway (/bin -> /usr/bin or /usr/bin -> /bin), we do that for -# all of them. -# -SKELETON_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/lib/.) -SKELETON_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/bin/.) -SKELETON_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/sbin/.) -SKELETON_USR_LIB_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/lib/.) -SKELETON_USR_BIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/bin/.) -SKELETON_USR_SBIN_INODE = $(shell stat -c '%i' $(SKELETON_PATH)/usr/sbin/.) - -ifneq ($(SKELETON_LIB_INODE),$(SKELETON_USR_LIB_INODE)) -SKELETON_CUSTOM_NOT_MERGED_USR += /lib -endif -ifneq ($(SKELETON_BIN_INODE),$(SKELETON_USR_BIN_INODE)) -SKELETON_CUSTOM_NOT_MERGED_USR += /bin -endif -ifneq ($(SKELETON_SBIN_INODE),$(SKELETON_USR_SBIN_INODE)) -SKELETON_CUSTOM_NOT_MERGED_USR += /sbin -endif - -ifneq ($(SKELETON_CUSTOM_NOT_MERGED_USR),) -$(error The custom skeleton in $(SKELETON_PATH) is not \ - using a merged /usr for the following directories: \ - $(SKELETON_CUSTOM_NOT_MERGED_USR)) -endif - -endif # merged /usr - -else # ! custom skeleton - -SKELETON_PATH = system/skeleton - -endif # ! custom skeleton - -# This function handles the merged or non-merged /usr cases -ifeq ($(BR2_ROOTFS_MERGED_USR),y) -define SKELETON_USR_SYMLINKS_OR_DIRS - ln -snf usr/bin $(1)/bin - ln -snf usr/sbin $(1)/sbin - ln -snf usr/lib $(1)/lib -endef -else -define SKELETON_USR_SYMLINKS_OR_DIRS - $(INSTALL) -d -m 0755 $(1)/bin - $(INSTALL) -d -m 0755 $(1)/sbin - $(INSTALL) -d -m 0755 $(1)/lib -endef -endif - -# We make a symlink lib32->lib or lib64->lib as appropriate -# MIPS64/n32 requires lib32 even though it's a 64-bit arch. -ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y) -SKELETON_LIB_SYMLINK = lib64 -else -SKELETON_LIB_SYMLINK = lib32 -endif - -define SKELETON_INSTALL_TARGET_CMDS - rsync -a --ignore-times $(RSYNC_VCS_EXCLUSIONS) \ - --chmod=u=rwX,go=rX --exclude .empty --exclude '*~' \ - $(SKELETON_PATH)/ $(TARGET_DIR)/ - $(call SKELETON_USR_SYMLINKS_OR_DIRS,$(TARGET_DIR)) - ln -snf lib $(TARGET_DIR)/$(SKELETON_LIB_SYMLINK) - ln -snf lib $(TARGET_DIR)/usr/$(SKELETON_LIB_SYMLINK) - $(INSTALL) -m 0644 support/misc/target-dir-warning.txt \ - $(TARGET_DIR_WARNING_FILE) -endef - -# For the staging dir, we don't really care about /bin and /sbin. -# But for consistency with the target dir, and to simplify the code, -# we still handle them for the merged or non-merged /usr cases. -# Since the toolchain is not yet available, the staging is not yet -# populated, so we need to create the directories in /usr -define SKELETON_INSTALL_STAGING_CMDS - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/lib - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/bin - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/sbin - $(INSTALL) -d -m 0755 $(STAGING_DIR)/usr/include - $(call SKELETON_USR_SYMLINKS_OR_DIRS,$(STAGING_DIR)) - ln -snf lib $(STAGING_DIR)/$(SKELETON_LIB_SYMLINK) - ln -snf lib $(STAGING_DIR)/usr/$(SKELETON_LIB_SYMLINK) -endef - -# The TARGET_FINALIZE_HOOKS must be sourced only if the users choose to use the -# default skeleton. -ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) - -SKELETON_TARGET_GENERIC_HOSTNAME = $(call qstrip,$(BR2_TARGET_GENERIC_HOSTNAME)) -SKELETON_TARGET_GENERIC_ISSUE = $(call qstrip,$(BR2_TARGET_GENERIC_ISSUE)) -SKELETON_TARGET_GENERIC_ROOT_PASSWD = $(call qstrip,$(BR2_TARGET_GENERIC_ROOT_PASSWD)) -SKELETON_TARGET_GENERIC_PASSWD_METHOD = $(call qstrip,$(BR2_TARGET_GENERIC_PASSWD_METHOD)) -SKELETON_TARGET_GENERIC_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH)) -SKELETON_TARGET_GENERIC_GETTY_PORT = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)) -SKELETON_TARGET_GENERIC_GETTY_BAUDRATE = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -SKELETON_TARGET_GENERIC_GETTY_TERM = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_TERM)) -SKELETON_TARGET_GENERIC_GETTY_OPTIONS = $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_OPTIONS)) - -ifneq ($(SKELETON_TARGET_GENERIC_HOSTNAME),) -define SKELETON_SET_HOSTNAME - mkdir -p $(TARGET_DIR)/etc - echo "$(SKELETON_TARGET_GENERIC_HOSTNAME)" > $(TARGET_DIR)/etc/hostname - $(SED) '$$a \127.0.1.1\t$(SKELETON_TARGET_GENERIC_HOSTNAME)' \ - -e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts -endef -TARGET_FINALIZE_HOOKS += SKELETON_SET_HOSTNAME -endif - -ifneq ($(SKELETON_TARGET_GENERIC_ISSUE),) -define SKELETON_SET_ISSUE - mkdir -p $(TARGET_DIR)/etc - echo "$(SKELETON_TARGET_GENERIC_ISSUE)" > $(TARGET_DIR)/etc/issue -endef -TARGET_FINALIZE_HOOKS += SKELETON_SET_ISSUE -endif - -define SKELETON_SET_NETWORK_LOCALHOST - ( \ - echo "# interface file auto-generated by buildroot"; \ - echo ; \ - echo "auto lo"; \ - echo "iface lo inet loopback"; \ - ) > $(TARGET_DIR)/etc/network/interfaces -endef - -SKELETON_NETWORK_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) - -ifneq ($(SKELETON_NETWORK_DHCP_IFACE),) -define SKELETON_SET_NETWORK_DHCP - ( \ - echo ; \ - echo "auto $(SKELETON_NETWORK_DHCP_IFACE)"; \ - echo "iface $(SKELETON_NETWORK_DHCP_IFACE) inet dhcp"; \ - echo " pre-up /etc/network/nfs_check"; \ - echo " wait-delay 15"; \ - ) >> $(TARGET_DIR)/etc/network/interfaces - $(INSTALL) -m 0755 -D $(SKELETON_PKGDIR)/nfs_check \ - $(TARGET_DIR)/etc/network/nfs_check -endef -endif - -define SKELETON_SET_NETWORK - mkdir -p $(TARGET_DIR)/etc/network/ - $(SKELETON_SET_NETWORK_LOCALHOST) - $(SKELETON_SET_NETWORK_DHCP) -endef - -TARGET_FINALIZE_HOOKS += SKELETON_SET_NETWORK - -ifeq ($(BR2_TARGET_ENABLE_ROOT_LOGIN),y) -ifeq ($(SKELETON_TARGET_GENERIC_ROOT_PASSWD),) -SKELETON_ROOT_PASSWORD = -else ifneq ($(filter $$1$$% $$5$$% $$6$$%,$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)),) -SKELETON_ROOT_PASSWORD = '$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)' -else -SKELETON_DEPENDENCIES += host-mkpasswd -# This variable will only be evaluated in the finalize stage, so we can -# be sure that host-mkpasswd will have already been built by that time. -SKELETON_ROOT_PASSWORD = "`$(MKPASSWD) -m "$(SKELETON_TARGET_GENERIC_PASSWD_METHOD)" "$(SKELETON_TARGET_GENERIC_ROOT_PASSWD)"`" -endif -else # !BR2_TARGET_ENABLE_ROOT_LOGIN -SKELETON_ROOT_PASSWORD = "*" -endif - -define SKELETON_SET_ROOT_PASSWD - $(SED) s,^root:[^:]*:,root:$(SKELETON_ROOT_PASSWORD):, $(TARGET_DIR)/etc/shadow -endef -TARGET_FINALIZE_HOOKS += SKELETON_SET_ROOT_PASSWD - -ifeq ($(BR2_SYSTEM_BIN_SH_NONE),y) -define SKELETON_BIN_SH - rm -f $(TARGET_DIR)/bin/sh -endef -else -define SKELETON_BIN_SH - ln -sf $(SKELETON_TARGET_GENERIC_BIN_SH) $(TARGET_DIR)/bin/sh -endef -endif -TARGET_FINALIZE_HOOKS += SKELETON_BIN_SH - -ifeq ($(BR2_TARGET_GENERIC_GETTY),y) -ifeq ($(BR2_INIT_SYSV),y) -# In sysvinit inittab, the "id" must not be longer than 4 bytes, so we -# skip the "tty" part and keep only the remaining. -define SKELETON_SET_GETTY - $(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(shell echo $(SKELETON_TARGET_GENERIC_GETTY_PORT) | tail -c+4)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \ - $(TARGET_DIR)/etc/inittab -endef -else ifeq ($(BR2_INIT_BUSYBOX),y) -# Add getty to busybox inittab -define SKELETON_SET_GETTY - $(SED) '/# GENERIC_SERIAL$$/s~^.*#~$(SKELETON_TARGET_GENERIC_GETTY_PORT)::respawn:/sbin/getty -L $(SKELETON_TARGET_GENERIC_GETTY_OPTIONS) $(SKELETON_TARGET_GENERIC_GETTY_PORT) $(SKELETON_TARGET_GENERIC_GETTY_BAUDRATE) $(SKELETON_TARGET_GENERIC_GETTY_TERM) #~' \ - $(TARGET_DIR)/etc/inittab -endef -endif -TARGET_FINALIZE_HOOKS += SKELETON_SET_GETTY -endif - -ifeq ($(BR2_INIT_BUSYBOX)$(BR2_INIT_SYSV),y) -ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) -# Find commented line, if any, and remove leading '#'s -define SKELETON_REMOUNT_RW - $(SED) '/^#.*-o remount,rw \/$$/s~^#\+~~' $(TARGET_DIR)/etc/inittab -endef -else -# Find uncommented line, if any, and add a leading '#' -define SKELETON_REMOUNT_RW - $(SED) '/^[^#].*-o remount,rw \/$$/s~^~#~' $(TARGET_DIR)/etc/inittab -endef -endif -TARGET_FINALIZE_HOOKS += SKELETON_REMOUNT_RW -endif # BR2_INIT_BUSYBOX || BR2_INIT_SYSV - -endif # BR2_ROOTFS_SKELETON_DEFAULT - -$(eval $(generic-package)) diff --git a/package.bak/sl/Config.in b/package.bak/sl/Config.in deleted file mode 100644 index 7abe705673..0000000000 --- a/package.bak/sl/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SL - bool "sl" - select BR2_PACKAGE_NCURSES - help - SL (Steam Locomotive) runs across your terminal when you - type "sl" as you meant to type "ls". It's just a joke - command, and not useful at all. - - https://github.com/mtoyoda/sl diff --git a/package.bak/sl/sl.hash b/package.bak/sl/sl.hash deleted file mode 100644 index be74670ffb..0000000000 --- a/package.bak/sl/sl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1e5996757f879c81f202a18ad8e982195cf51c41727d3fea4af01fdcbbb5563a sl-5.02.tar.gz diff --git a/package.bak/sl/sl.mk b/package.bak/sl/sl.mk deleted file mode 100644 index bb28b2a49b..0000000000 --- a/package.bak/sl/sl.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# sl -# -################################################################################ - -SL_VERSION = 5.02 -SL_SITE = $(call github,mtoyoda,sl,$(SL_VERSION)) -SL_LICENSE = Custom -SL_LICENSE_FILES = LICENSE -SL_DEPENDENCIES = ncurses - -define SL_BUILD_CMDS - $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define SL_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/sl $(TARGET_DIR)/usr/bin/sl -endef - -$(eval $(generic-package)) diff --git a/package.bak/slang/0001-slsh-libs.patch b/package.bak/slang/0001-slsh-libs.patch deleted file mode 100644 index e8b6e6d223..0000000000 --- a/package.bak/slang/0001-slsh-libs.patch +++ /dev/null @@ -1,17 +0,0 @@ -Link against sources instead of installation paths that aren't DESTDIRed. -Patch taken from gentoo portage, upstream status unknown, author -probably Diego Pettenò. - -Signed-off-by: Gustavo Zacarias - ---- a/slsh/Makefile.in -+++ b/slsh/Makefile.in -@@ -80,7 +80,7 @@ - $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o - $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS) - $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(INST_LIBS) -+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS) - $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile - cd $(OBJDIR) && $(CC) -c $(CFLAGS) $(SLANG_SRCINC) $(DEFS) $(SRCDIR)/slsh.c - $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile diff --git a/package.bak/slang/0002-Enable-a-statically-linked-version-of-slsh.patch b/package.bak/slang/0002-Enable-a-statically-linked-version-of-slsh.patch deleted file mode 100644 index ee306a1d56..0000000000 --- a/package.bak/slang/0002-Enable-a-statically-linked-version-of-slsh.patch +++ /dev/null @@ -1,120 +0,0 @@ -Enable a statically-linked version of slsh to be built and installed - -Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes -have been ignored. - -Repository: git://git.jedsoft.org/git/slang.git -Commit ID: 3796db6fb94a2fc7fe2fb0b6918501b69a4d3a02 -Author: John E. Davis - -Signed-off-by: Vicente Olivert Riera ---- -diff -rup a/autoconf/Makefile.in b/autoconf/Makefile.in ---- a/autoconf/Makefile.in 2014-09-18 04:02:24.000000000 +0100 -+++ b/autoconf/Makefile.in 2014-12-08 11:59:30.879313080 +0000 -@@ -41,16 +41,19 @@ src/Makefile: configure src/Makefile.in - # - makefiles: Makefile slsh/Makefile modules/Makefile src/Makefile - help: -- @echo "make install : install a shared version of the library" -- @echo "make install-static : install a static version" -- @echo "make install-all : install both shared and static versions" -- @echo "make check : Build the library and run the regression tests" -+ @echo "make install ==> shared version of the library, slsh and modules" -+ @echo "make install-static ==> static version of the library and slsh; no modules" -+ @echo "make install-all ==> shared/static versions of the library/modules + shared slsh." -+ @echo "make install-modules ==> install the modules" -+ @echo "make check ==> Build the library and run the regression tests" - slang.pc: configure autoconf/slangpc.in - @echo "slang.pc needs to be updated -- rerun configure" - @exit 1 - static: makefiles slang.pc - cd src; $(MAKE) static -- cd slsh; $(MAKE) all -+ cd slsh; $(MAKE) static -+modules: -+ cd modules; $(MAKE) all - elf: makefiles slang.pc - cd src; $(MAKE) elf - cd slsh; $(MAKE) all -@@ -73,10 +76,11 @@ clean: - cd demo; $(MAKE) clean - install-static: - cd src; $(MAKE) install-static -+ cd slsh; $(MAKE) install-static - install-pkgconfig: slang.pc - $(MKINSDIR) $(DEST_PKGCONFIGDIR) - $(INSTALL_DATA) slang.pc $(DEST_PKGCONFIGDIR)/ --install-elf: -+install-elf: install-pkgconfig - cd src; $(MAKE) install-elf - @echo Now installing slsh - cd slsh; $(MAKE) install -@@ -86,7 +90,10 @@ install-elf: - @echo "On some systems, e.g., linux, you may also have to run ldconfig." - @echo "" - install: install-elf install-pkgconfig --install-all: install-elf install-static install-pkgconfig -+install-all: install-elf -+ cd src; $(MAKE) install-static -+install-modules: -+ cd modules; $(MAKE) install - install-links: - cd src; $(MAKE) install-links - # -diff -rup a/slsh/Makefile.in b/slsh/Makefile.in ---- a/slsh/Makefile.in 2014-12-08 11:52:51.303284637 +0000 -+++ b/slsh/Makefile.in 2014-12-08 12:06:44.811939732 +0000 -@@ -16,7 +16,8 @@ SLANG_INST_INC = -I@includedir@ - SLANG_INST_LIB = -L$(INST_LIB_DIR) - #--------------------------------------------------------------------------- - SLANG_SRCINC = -I@SRCDIR@ --SLANG_SRCLIB = -L@ELFDIR@ -+SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked -+SLANG_OBJLIB = -L@OBJDIR@# for statically linked - #--------------------------------------------------------------------------- - OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@ - RPATH = @RPATH@ -@@ -73,10 +74,12 @@ INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(S - DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ - -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ - -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' --SRC_LIBS = $(SLANG_SRCLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) -+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) -+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) - # - all: $(OBJDIR)/slsh_exe - slsh: $(OBJDIR)/slsh -+static: $(OBJDIR)/slsh_static - $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o - $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS) - $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -@@ -85,6 +88,8 @@ $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh. - cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c - $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile - cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c -+$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS) - $(OBJDIR): - -$(MKINSDIR) $(OBJDIR) - config.h: ../src/config.h -@@ -151,6 +156,12 @@ install: slsh install_directories instal - $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/ - echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc - $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ -+install-static: static install_directories install_lib_files install_rline_files \ -+ install_scripts install_help install_docs -+ $(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh -+ $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/ -+ echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc -+ $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ - #--------------------------------------------------------------------------- - # Housekeeping - #--------------------------------------------------------------------------- -@@ -161,5 +172,5 @@ distclean: clean - # - .PHONY: all clean distclean symlinks slsh install install_directories \ - install_lib_files install_rline_files install_scripts install_help \ -- install_docs -+ install_docs install-static static - diff --git a/package.bak/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch b/package.bak/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch deleted file mode 100644 index 4bc8f768be..0000000000 --- a/package.bak/slang/0003-Disable-module-support-in-the-statically-linked-version-of-slsh.patch +++ /dev/null @@ -1,114 +0,0 @@ -Disable module support in the statically linked version of slsh - -Adapt an upstream patch to make it apply on 2.3.0. Unnecessary changes -have been ignored. - -Repository: git://git.jedsoft.org/git/slang.git -Commit ID: 997c85f5cdb19802a5c97afe44e366a60f94a069 -Author: John E. Davis - -Signed-off-by: Vicente Olivert Riera ---- -diff -rup a/slsh/Makefile.in b/slsh/Makefile.in ---- a/slsh/Makefile.in 2014-12-09 10:04:44.084899944 +0000 -+++ b/slsh/Makefile.in 2014-12-09 10:16:11.545897275 +0000 -@@ -1,9 +1,11 @@ - #-*-sh-*- - CC = @CC@ - CFLAGS = @CFLAGS@ @SLANG_DLL_CFLAGS@ --LDFLAGS = @LDFLAGS@ @DYNAMIC_LINK_FLAGS@ -+LDFLAGS = @LDFLAGS@ -+DLINK_FLAGS = @DYNAMIC_LINK_FLAGS@ - CONFIG_DIR = @CONFIG_DIR@ - OBJDIR = $(ARCH)objs -+SOBJDIR = static_objs - SRCDIR = $(CONFIG_DIR)/slsh - #--------------------------------------------------------------------------- - # Installation location of the slang library -@@ -19,7 +21,8 @@ SLANG_SRCINC = -I@SRCDIR@ - SLANG_ELFLIB = -L@ELFDIR@# for dynamically linked - SLANG_OBJLIB = -L@OBJDIR@# for statically linked - #--------------------------------------------------------------------------- --OTHER_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@ -+DYNAMIC_LIBS = @TERMCAP@ @DYNAMIC_LINK_LIB@ @LIBS@ @M_LIB@ -+STATIC_LIBS = @TERMCAP@ @LIBS@ @M_LIB@ - RPATH = @RPATH@ - #---------------------------------------------------------------------------- - INSTALL = @INSTALL@ -@@ -69,29 +72,37 @@ DEST_SLSH_DOC_DIR= $(DESTDIR)$(SLSH_DOC_ - #---------------------------------------------------------------------------- - @SET_MAKE@ - SHELL = /bin/sh --#INST_LIBS = $(RPATH) $(SLANG_INST_LIB) $(DEST_LIB_DIR) -lslang $(READLINE_LIB) $(OTHER_LIBS) --INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) -+INST_LIBS = $(DEST_LIB_DIR) $(RPATH) $(SLANG_INST_LIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) - DEFS = -DSLSH_CONF_DIR='"$(SLSH_CONF_DIR)"' -DSLSH_PATH='"$(SLSH_LIB_DIR)"' \ - -DSLSH_CONF_DIR_ENV='$(SLSH_CONF_DIR_ENV)' -DSLSH_LIB_DIR_ENV='$(SLSH_LIB_DIR_ENV)' \ - -DSLSH_PATH_ENV='$(SLSH_PATH_ENV)' --SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) --STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(OTHER_LIBS) -+SDEFS = $(DEFS) -DSLSH_STATIC -+SRC_LIBS = $(SLANG_ELFLIB) -lslang $(READLINE_LIB) $(DYNAMIC_LIBS) -+STATIC_SRC_LIBS = $(SLANG_OBJLIB) -lslang $(READLINE_LIB) $(STATIC_LIBS) - # - all: $(OBJDIR)/slsh_exe - slsh: $(OBJDIR)/slsh --static: $(OBJDIR)/slsh_static - $(OBJDIR)/slsh_exe: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(SRC_LIBS) -+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_exe $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) - $(OBJDIR)/slsh: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(SRC_LIBS) -+ $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh $(LDFLAGS) $(DLINK_FLAGS) $(SRC_LIBS) - $(OBJDIR)/slsh.o: $(OBJDIR) slsh.c slsh.h config.h Makefile - cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) $(SRCDIR)/slsh.c - $(OBJDIR)/readline.o: $(OBJDIR) readline.c slsh.h config.h Makefile - cd $(OBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(DEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c --$(OBJDIR)/slsh_static: $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -- $(CC) $(CFLAGS) $(OBJDIR)/slsh.o $(OBJDIR)/readline.o -o $(OBJDIR)/slsh_static $(LDFLAGS) $(STATIC_SRC_LIBS) - $(OBJDIR): - -$(MKINSDIR) $(OBJDIR) -+# -+static: $(SOBJDIR)/slsh -+$(SOBJDIR)/slsh: $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o -+ $(CC) $(CFLAGS) $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o -o $(SOBJDIR)/slsh $(LDFLAGS) $(STATIC_SRC_LIBS) -+$(SOBJDIR)/slsh.o: $(SOBJDIR) slsh.c slsh.h config.h Makefile -+ cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) $(SRCDIR)/slsh.c -+$(SOBJDIR)/readline.o: $(SOBJDIR) readline.c slsh.h config.h Makefile -+ cd $(SOBJDIR) && $(CC) $(SLANG_SRCINC) $(CFLAGS) -c $(SDEFS) -DUSE_GNU_READLINE=$(GNU_READLINE) $(SRCDIR)/readline.c -+$(SOBJDIR): -+ -$(MKINSDIR) $(SOBJDIR) -+# - config.h: ../src/config.h - cp ../src/config.h . - install_directories: -@@ -158,7 +169,7 @@ install: slsh install_directories instal - $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ - install-static: static install_directories install_lib_files install_rline_files \ - install_scripts install_help install_docs -- $(INSTALL) $(OBJDIR)/slsh_static $(DEST_BIN_DIR)/slsh -+ $(INSTALL) $(SOBJDIR)/slsh $(DEST_BIN_DIR)/ - $(INSTALL_DATA) etc/slsh.rc $(DEST_SLSH_CONF_DIR)/ - echo 'prepend_to_slang_load_path("$(SLSH_LOCALLIB_DIR)");' >> $(DEST_SLSH_CONF_DIR)/slsh.rc - $(INSTALL_DATA) doc/man/slsh.1 $(DEST_MAN_DIR)/ -@@ -167,6 +178,7 @@ install-static: static install_directori - #--------------------------------------------------------------------------- - clean: - -/bin/rm -f *~ $(OBJDIR)/slsh.o $(OBJDIR)/readline.o $(OBJDIR)/slsh $(OBJDIR)/slsh_exe scripts/*~ lib/*~ -+ -/bin/rm -f $(SOBJDIR)/slsh.o $(SOBJDIR)/readline.o $(SOBJDIR)/slsh $(SOBJDIR)/slsh_exe - distclean: clean - -/bin/rm -f Makefile config.h - # -diff -rup a/slsh/slsh.c b/slsh/slsh.c ---- a/slsh/slsh.c 2014-09-18 04:02:24.000000000 +0100 -+++ b/slsh/slsh.c 2014-12-09 10:17:04.602824146 +0000 -@@ -514,7 +514,9 @@ int main (int argc, char **argv) - - if ((-1 == SLang_init_all ()) - || (-1 == SLang_init_array_extra ()) -+#ifndef SLSH_STATIC - || (-1 == SLang_init_import ()) /* dynamic linking */ -+#endif - || (-1 == SLadd_intrin_fun_table (Intrinsics, NULL)) - || (-1 == slsh_init_readline_intrinsics ())) - { diff --git a/package.bak/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch b/package.bak/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch deleted file mode 100644 index 4b3c869a60..0000000000 --- a/package.bak/slang/0004-Rename-posix_close-function-to-posix_close_slfile.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 055b02cf98ab9b7301988c3be2d277f262f0957e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 18 Nov 2015 23:12:15 +0100 -Subject: [PATCH] Rename posix_close() function to posix_close_slfile() - -posix_close() is a function that will be implemented as part of an -upcoming of the POSIX standard. For this reason, the musl C library -has already started implementing this function call. Unfortunately, -since slang already defines a function with the same name, it cannot -build properly with the musl C library. - -This commit fixes that by renaming the slang function to -posix_close_slfile(). - -This patch has been taken from the Alpine Linux repository, at -http://git.alpinelinux.org/cgit/aports/plain/main/slang/musl-fix-posix_close-clash.patch. - -Signed-off-by: Thomas Petazzoni ---- - src/slposio.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/slposio.c b/src/slposio.c -index 94f20dd..475e2c9 100644 ---- a/src/slposio.c -+++ b/src/slposio.c -@@ -372,7 +372,7 @@ static int posix_close_fd (int *fd) - return 0; - } - --static int posix_close (SLFile_FD_Type *f) -+static int posix_close_slfile (SLFile_FD_Type *f) - { - int status = do_close (f); - -@@ -1011,7 +1011,7 @@ static SLang_Intrin_Fun_Type Fd_Name_Table [] = - MAKE_INTRINSIC_2("write", posix_write, V, F, B), - MAKE_INTRINSIC_1("dup_fd", posix_dup, V, F), - MAKE_INTRINSIC_2("dup2_fd", posix_dup2, I, F, I), -- MAKE_INTRINSIC_1("close", posix_close, I, F), -+ MAKE_INTRINSIC_1("close", posix_close_slfile, I, F), - MAKE_INTRINSIC_1("_close", posix_close_fd, I, I), - #if defined(TTYNAME_R) - MAKE_INTRINSIC_0("ttyname", posix_ttyname, V), --- -2.6.3 - diff --git a/package.bak/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch b/package.bak/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch deleted file mode 100644 index 1572e09bb1..0000000000 --- a/package.bak/slang/0005-make-install-static-do-install-pkgconfig-as-install-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 294bcde1afa0b3866f339f82709e867d827cea6c Mon Sep 17 00:00:00 2001 -From: Max Filippov -Date: Mon, 14 Mar 2016 07:28:56 +0300 -Subject: [PATCH] make install-static do install-pkgconfig as install-elf does - -...so that install-static installs everything needed for linking with -slang. This fixes e.g. the following mc build: - - http://autobuild.buildroot.net/results/085/085194f18bc7db1e801d98e6620e3a75fd988cc5/build-end.log - -Signed-off-by: Max Filippov ---- - autoconf/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/autoconf/Makefile.in b/autoconf/Makefile.in -index a6defa6..ca1ffb2 100644 ---- a/autoconf/Makefile.in -+++ b/autoconf/Makefile.in -@@ -74,7 +74,7 @@ clean: - cd modules; $(MAKE) clean - cd slsh; $(MAKE) clean - cd demo; $(MAKE) clean --install-static: -+install-static: install-pkgconfig - cd src; $(MAKE) install-static - cd slsh; $(MAKE) install-static - install-pkgconfig: slang.pc --- -2.1.4 - diff --git a/package.bak/slang/Config.in b/package.bak/slang/Config.in deleted file mode 100644 index a500ff5b7d..0000000000 --- a/package.bak/slang/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_SLANG - bool "slang" - depends on BR2_USE_MMU # fork() - help - Multi-platform console display library. - - http://www.jedsoft.org/slang/index.html diff --git a/package.bak/slang/slang.hash b/package.bak/slang/slang.hash deleted file mode 100644 index 000ac11e36..0000000000 --- a/package.bak/slang/slang.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.jedsoft.org/releases/slang/ -sha1 c3270b58a58e6cbfd47f0a6e3d2194dd9e7c7d14 slang-2.3.0.tar.gz diff --git a/package.bak/slang/slang.mk b/package.bak/slang/slang.mk deleted file mode 100644 index 9078bf293c..0000000000 --- a/package.bak/slang/slang.mk +++ /dev/null @@ -1,62 +0,0 @@ -################################################################################ -# -# slang -# -################################################################################ - -SLANG_VERSION = 2.3.0 -SLANG_SITE = http://www.jedsoft.org/releases/slang -SLANG_LICENSE = GPLv2+ -SLANG_LICENSE_FILES = COPYING -SLANG_INSTALL_STAGING = YES -SLANG_CONF_OPTS = --with-onig=no -SLANG_MAKE = $(MAKE1) - -# Racy and we don't have/do libtermcap -define SLANG_DISABLE_TERMCAP - $(SED) '/^TERMCAP=/s:=.*:=:' $(@D)/configure -endef -SLANG_POST_PATCH_HOOKS += SLANG_DISABLE_TERMCAP - -# Absolute path hell, sigh... -ifeq ($(BR2_PACKAGE_LIBPNG),y) -SLANG_CONF_OPTS += --with-png=$(STAGING_DIR)/usr -SLANG_DEPENDENCIES += libpng -else -SLANG_CONF_OPTS += --with-png=no -endif -ifeq ($(BR2_PACKAGE_PCRE),y) -SLANG_CONF_OPTS += --with-pcre=$(STAGING_DIR)/usr -SLANG_DEPENDENCIES += pcre -else -SLANG_CONF_OPTS += --with-pcre=no -endif -ifeq ($(BR2_PACKAGE_ZLIB),y) -SLANG_CONF_OPTS += --with-z=$(STAGING_DIR)/usr -SLANG_DEPENDENCIES += zlib -else -SLANG_CONF_OPTS += --with-z=no -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -SLANG_DEPENDENCIES += ncurses -SLANG_CONF_ENV += ac_cv_path_nc5config=$(STAGING_DIR)/usr/bin/ncurses5-config -else -SLANG_CONF_OPTS += ac_cv_path_nc5config=no -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -SLANG_CONF_OPTS += --with-readline=gnu -SLANG_DEPENDENCIES += readline -ifeq ($(BR2_STATIC_LIBS),y) -SLANG_CONF_ENV += LIBS="`$(STAGING_DIR)/usr/bin/ncurses5-config --libs`" -endif -endif - -ifeq ($(BR2_STATIC_LIBS),y) -SLANG_MAKE_OPTS = static -SLANG_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-static -SLANG_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-static -endif - -$(eval $(autotools-package)) diff --git a/package.bak/slirp/Config.in b/package.bak/slirp/Config.in deleted file mode 100644 index ecd492dd11..0000000000 --- a/package.bak/slirp/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_SLIRP - bool "slirp" - help - The Spice project aims to provide a complete open source - solution for interaction with virtualized desktop devices. - The Spice project deals with both the virtualized devices - and the front-end. Interaction between front-end and - back-end is done using VD-Interfaces. - - This package implements the slirp-part for Spice. - Slirp emulates a PPP or SLIP connection over a normal terminal. - - http://www.spice-space.org/ - - NOTE: - This package has some history of a unique kind: - - originally developped as 'slirp' by Danny Gasparovski, and - seemingly abandonned (developper /disapeared/) - - then re-maintained at sourceforge by "Kelly", up to some - time around 2009: http://slirp.sourceforge.net/ - - during that period, QEMU (Fabrice BELLARD) forked the code - and included it in QEMU - - and it was imported from this breed by the Spice project - around May 2009 - - which is what we use here diff --git a/package.bak/slirp/slirp.mk b/package.bak/slirp/slirp.mk deleted file mode 100644 index be3e72d951..0000000000 --- a/package.bak/slirp/slirp.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# slirp -# -################################################################################ - -# There's no tarball releases of slirp, so we use the git repo -# Also, there's no tag, so we use a random SHA1 (master's HEAD -# of today) -SLIRP_VERSION = 8c2da74c1385242f20799fec8c04f8378edc6550 -SLIRP_SITE = git://anongit.freedesktop.org/spice/slirp -SLIRP_LICENSE = BSD-4c, BSD-2c -# Note: The license file 'COPYRIGHT' is missing from the sources, -# although some files refer to it. -SLIRP_INSTALL_STAGING = YES - -# As we're using the git tree, there's no ./configure, -# so we need to autoreconf. -SLIRP_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch b/package.bak/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index 0e30ef5e39..0000000000 --- a/package.bak/smack/0001-libsmack-common.c-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 316c911aa741b14513622a4206ed6d324e951fa0 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Wed, 20 May 2015 21:25:22 +0200 -Subject: [PATCH 1/1] libsmack/common.c: Include for PATH_MAX - -Signed-off-by: Felix Janda -Signed-off-by: Bernd Kuhls ---- -Downloaded from upstream commit -https://github.com/smack-team/smack/commit/316c911aa741b14513622a4206ed6d324e951fa0 - - libsmack/common.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libsmack/common.c b/libsmack/common.c -index 55fee1a..55b59e3 100644 ---- a/libsmack/common.c -+++ b/libsmack/common.c -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - #include --- -2.7.0 - diff --git a/package.bak/smack/Config.in b/package.bak/smack/Config.in deleted file mode 100644 index 67c70bb6f3..0000000000 --- a/package.bak/smack/Config.in +++ /dev/null @@ -1,35 +0,0 @@ -config BR2_PACKAGE_SMACK - bool "smack" - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - help - User space programs and libraries for SMACK. - - SMACK stands for Simplified Mandatory Access Control Kernel. - It is a Linux Security Module which provides a Mandatory Access - Control mechanism, aimed towards simplicity. - - This package provides a library which allows applications to work - with SMACK and tools to load/unload rules from the kernel, as well - as query the policy. - - SMACK requires the following kernel options to be enabled: - - - CONFIG_SECURITY - - CONFIG_SECURITY_SMACK - - CONFIG_SECURITY_NETWORK - - These options will be automatically enabled by Buildroot if it is - responsible for building the kernel. Otherwise, if you are building - your kernel outside of Buildroot, make sure these options are - enabled. - - To activate SMACK, do not forget to add "security=smack" to your - kernel command line. - - https://github.com/smack-team/smack - -comment "smack needs a toolchain w/ dynamic library, threads, headers >= 3.0" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 \ - || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/smack/smack.hash b/package.bak/smack/smack.hash deleted file mode 100644 index fd51249811..0000000000 --- a/package.bak/smack/smack.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 94dc21b4a5e570af0eb44debf57491170cccdbf60e03b5a3210f2a14d6448390 smack-v1.1.0.tar.gz diff --git a/package.bak/smack/smack.mk b/package.bak/smack/smack.mk deleted file mode 100644 index 3ef4d476d1..0000000000 --- a/package.bak/smack/smack.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# smack -# -################################################################################ - -SMACK_VERSION = v1.1.0 -SMACK_SITE = $(call github,smack-team,smack,$(SMACK_VERSION)) -SMACK_LICENSE = LGPLv2.1 -SMACK_LICENSE_FILES = COPYING -SMACK_INSTALL_STAGING = YES -SMACK_DEPENDENCIES = host-pkgconf - -# Sources from GitHub, no configure script included. -SMACK_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/smartmontools/Config.in b/package.bak/smartmontools/Config.in deleted file mode 100644 index 92e0037a5a..0000000000 --- a/package.bak/smartmontools/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SMARTMONTOOLS - bool "smartmontools" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - help - Control and monitor storage systems using S.M.A.R.T. - - http://smartmontools.sourceforge.net/ - -comment "smartmontools needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/smartmontools/smartmontools.hash b/package.bak/smartmontools/smartmontools.hash deleted file mode 100644 index 2f2b7aa096..0000000000 --- a/package.bak/smartmontools/smartmontools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/smartmontools/files/smartmontools/6.5/ -md5 093aeec3f8f39fa9a37593c4012d3156 smartmontools-6.5.tar.gz -sha1 7e788b429534a4ae627858fbcc826b93402cee7e smartmontools-6.5.tar.gz diff --git a/package.bak/smartmontools/smartmontools.mk b/package.bak/smartmontools/smartmontools.mk deleted file mode 100644 index cd0c076e19..0000000000 --- a/package.bak/smartmontools/smartmontools.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# smartmontools -# -################################################################################ - -SMARTMONTOOLS_VERSION = 6.5 -SMARTMONTOOLS_SITE = http://downloads.sourceforge.net/project/smartmontools/smartmontools/$(SMARTMONTOOLS_VERSION) -SMARTMONTOOLS_LICENSE = GPLv2+ -SMARTMONTOOLS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/smcroute/Config.in b/package.bak/smcroute/Config.in deleted file mode 100755 index f104075207..0000000000 --- a/package.bak/smcroute/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SMCROUTE - bool "smcroute" - depends on BR2_USE_MMU # fork() - help - SMCRoute is a command line tool to manipulate the multicast - routes of a UNIX kernel. It supports both IPv4 and IPv6 multicast - routing. SMCRoute can be used as an alternative to dynamic - multicast routers like mrouted or pimd in setups where static - multicast routes should be maintained and/or no proper IGMP or - MLD signaling exists. - - https://github.com/troglobit/smcroute diff --git a/package.bak/smcroute/smcroute.hash b/package.bak/smcroute/smcroute.hash deleted file mode 100644 index e1483ec180..0000000000 --- a/package.bak/smcroute/smcroute.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally generated -sha256 cf344922b4298b94e53fa2db8f2b064bece60f75926966f330437dfcbd76d425 smcroute-2.1.1.tar.xz -# From https://github.com/troglobit/smcroute/releases/download/2.1.1/smcroute-2.1.1.tar.xz.md5 -md5 cd9256577fe06beaf8da2eba1a02f953 smcroute-2.1.1.tar.xz diff --git a/package.bak/smcroute/smcroute.mk b/package.bak/smcroute/smcroute.mk deleted file mode 100755 index a3d4bc4f17..0000000000 --- a/package.bak/smcroute/smcroute.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# smcroute -# -################################################################################ - -SMCROUTE_VERSION = 2.1.1 -SMCROUTE_SOURCE = smcroute-$(SMCROUTE_VERSION).tar.xz -SMCROUTE_SITE = https://github.com/troglobit/smcroute/releases/download/$(SMCROUTE_VERSION) -SMCROUTE_LICENSE = GPLv2+ -SMCROUTE_LICENSE_FILES = COPYING - -SMCROUTE_CONF_OPTS = ac_cv_func_setpgrp_void=yes -#BUG:The package Makefile uses CC?= even though the package is autotools based -SMCROUTE_MAKE_ENV = $(TARGET_CONFIGURE_OPTS) - -$(eval $(autotools-package)) diff --git a/package.bak/smstools3/0001-fix-Makefile.patch b/package.bak/smstools3/0001-fix-Makefile.patch deleted file mode 100644 index 5842357451..0000000000 --- a/package.bak/smstools3/0001-fix-Makefile.patch +++ /dev/null @@ -1,29 +0,0 @@ -Makefile: fix rules - -In a Makefile, recipes should follow rules, there can not be variable -definitions in-between. - -Although make-3.81 is happy about it, make-4.0 (and probably 3.82 too) -do whine loudly. - -Signed-off-by: "Yann E. MORIN" - -diff -durN smstools3-3.1.15.orig/src/Makefile smstools3-3.1.15/src/Makefile ---- smstools3-3.1.15.orig/src/Makefile 2010-09-21 13:29:14.000000000 +0200 -+++ smstools3-3.1.15/src/Makefile 2014-09-01 22:27:02.719939329 +0200 -@@ -39,14 +39,13 @@ - - all: smsd - --smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o -- - ifneq (,$(findstring SOLARIS,$(CFLAGS))) - ifeq (,$(findstring DISABLE_INET_SOCKET,$(CFLAGS))) - override LFLAGS += -lsocket -lnsl - endif - endif - -+smsd: smsd.c extras.o locking.o cfgfile.o logging.o alarm.o smsd_cfg.o charset.o stats.o blacklist.o whitelist.o modeminit.o pdu.o - ifneq (,$(findstring NOSTATS,$(CFLAGS))) - $(CC) $(CFLAGS) -o $@ $^ $(LFLAGS) - else diff --git a/package.bak/smstools3/Config.in b/package.bak/smstools3/Config.in deleted file mode 100644 index 3e2ea252fc..0000000000 --- a/package.bak/smstools3/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_SMSTOOLS3 - bool "smstools3" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - help - The SMS Server Tools 3 is a SMS Gateway software which can send and - receive short messages through GSM modems and mobile phones. - - http://smstools3.kekekasvi.com/ - -if BR2_PACKAGE_SMSTOOLS3 - -config BR2_PACKAGE_SMSTOOLS3_NB_MODEMS - int "Number of modems to support" - default 1 - help - To reduce memory footprint of SMS Server Tools, you can specify the - exact number of modems connected to your board. By default only 1 - modem is used. - -endif - -comment "smstools3 needs a toolchain w/ wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/smstools3/S50smsd b/package.bak/smstools3/S50smsd deleted file mode 100644 index cd78150883..0000000000 --- a/package.bak/smstools3/S50smsd +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# -# Starts the SMS Server Tools 3 -# - -NAME=smsd -DAEMON=/usr/bin/$NAME -PIDFILE=/var/run/$NAME.pid -SPOOL=/var/spool/sms - -start() -{ - printf "Starting $NAME: " - mkdir -p $SPOOL/outgoing - mkdir -p $SPOOL/incoming - mkdir -p $SPOOL/checked - start-stop-daemon -S -q -p $PIDFILE --exec $DAEMON -- -c /etc/smsd.conf && echo "OK" || echo "Failed" -} - -stop() -{ - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE && echo "OK" || echo "Failed" - rm -f $PIDFILE -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/smstools3/smstools3.hash b/package.bak/smstools3/smstools3.hash deleted file mode 100644 index b0b521f747..0000000000 --- a/package.bak/smstools3/smstools3.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 ed00ffaeaa312a5b4f969f4e97a64603a866bbe16e393ea02f5bf05234814d59 smstools3-3.1.15.tar.gz diff --git a/package.bak/smstools3/smstools3.mk b/package.bak/smstools3/smstools3.mk deleted file mode 100644 index 52f9b319e9..0000000000 --- a/package.bak/smstools3/smstools3.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# smstools3 -# -################################################################################ - -SMSTOOLS3_VERSION = 3.1.15 -SMSTOOLS3_SITE = http://smstools3.kekekasvi.com/packages -SMSTOOLS3_LICENSE = GPLv2+ -SMSTOOLS3_LICENSE_FILES = doc/license.html LICENSE - -SMSTOOLS3_CFLAGS = $(TARGET_CFLAGS) -SMSTOOLS3_CFLAGS += -D NUMBER_OF_MODEMS=$(BR2_PACKAGE_SMSTOOLS3_NB_MODEMS) -SMSTOOLS3_CFLAGS += -D NOSTATS - -define SMSTOOLS3_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(SMSTOOLS3_CFLAGS)" -C $(@D) -endef - -define SMSTOOLS3_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/smstools3/S50smsd \ - $(TARGET_DIR)/etc/init.d/S50smsd -endef - -define SMSTOOLS3_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/src/smsd \ - $(TARGET_DIR)/usr/bin/smsd - $(INSTALL) -m 0755 -D $(@D)/scripts/sendsms \ - $(TARGET_DIR)/usr/bin/sendsms - $(INSTALL) -m 0644 -D $(@D)/examples/smsd.conf.easy \ - $(TARGET_DIR)/etc/smsd.conf -endef - -$(eval $(generic-package)) diff --git a/package.bak/snappy/Config.in b/package.bak/snappy/Config.in deleted file mode 100644 index 06d537f1c9..0000000000 --- a/package.bak/snappy/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_SNAPPY - bool "snappy" - depends on BR2_INSTALL_LIBSTDCPP - help - Snappy is a compression/decompression library. It does not aim for - maximum compression, or compatibility with any other compression - library; instead, it aims for very high speeds and reasonable - compression. - - http://code.google.com/p/snappy/ - -comment "snappy needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/snappy/snappy.hash b/package.bak/snappy/snappy.hash deleted file mode 100644 index bb7f104cca..0000000000 --- a/package.bak/snappy/snappy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f50719c6dc7103d65df66882a3b4569d598eda251266463eca716928187dc12b snappy-32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda.tar.gz diff --git a/package.bak/snappy/snappy.mk b/package.bak/snappy/snappy.mk deleted file mode 100644 index fcbcd1368f..0000000000 --- a/package.bak/snappy/snappy.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# snappy -# -################################################################################ - -SNAPPY_VERSION = 32d6d7d8a2ef328a2ee1dd40f072e21f4983ebda -SNAPPY_SITE = $(call github,google,snappy,$(SNAPPY_VERSION)) -SNAPPY_LICENSE = BSD-3c -SNAPPY_LICENSE_FILES = COPYING -# from git -SNAPPY_AUTORECONF = YES -SNAPPY_DEPENDENCIES = host-pkgconf -SNAPPY_INSTALL_STAGING = YES - -# Disable tests -SNAPPY_CONF_OPTS = --disable-gtest - -# libsnappy links with libstdc++. Some libstdc++/arch variants use -# pthread symbols for internal locking if built with thead -# support. libstdc++ does not have a .pc file, and its .la file does -# not mention -pthread. So, static linkig to libstdc++ will fail if -# -pthread is not explicity linked to. Only do that for static builds. -ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy) -SNAPPY_CONF_OPTS += LIBS=-pthread -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sngrep/Config.in b/package.bak/sngrep/Config.in deleted file mode 100644 index 4d0d80c13c..0000000000 --- a/package.bak/sngrep/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "sngrep needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_SNGREP - bool "sngrep" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBPCAP - help - sngrep is a tool for displaying SIP calls message flows from - terminal. It supports live capture to display realtime SIP - packets and can also be used as PCAP viewer. - - https://github.com/irontec/sngrep diff --git a/package.bak/sngrep/sngrep.hash b/package.bak/sngrep/sngrep.hash deleted file mode 100644 index dd75f89566..0000000000 --- a/package.bak/sngrep/sngrep.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 30fbfb4f90ed8805194b39683a8a2ed465776ffd60df4482bd029d63b316b3f1 sngrep-v1.4.2.tar.gz diff --git a/package.bak/sngrep/sngrep.mk b/package.bak/sngrep/sngrep.mk deleted file mode 100644 index b82d8cefa7..0000000000 --- a/package.bak/sngrep/sngrep.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# sngrep -# -################################################################################ - -SNGREP_VERSION = v1.4.2 -SNGREP_SITE = $(call github,irontec,sngrep,$(SNGREP_VERSION)) -SNGREP_LICENSE = GPLv3+ -SNGREP_LICENSE_FILES = LICENSE -SNGREP_AUTORECONF = YES -SNGREP_DEPENDENCIES = libpcap ncurses - -SNGREP_CONF_ENV += \ - $(if $(BR2_STATIC_LIBS),LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --libs`") - -# our ncurses wchar support is not properly detected -SNGREP_CONF_OPTS += --disable-unicode - -# openssl and gnutls can't be enabled at the same time. -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SNGREP_DEPENDENCIES += openssl -SNGREP_CONF_OPTS += --with-openssl --without-gnutls -# gnutls support also requires libgcrypt -else ifeq ($(BR2_PACKAGE_GNUTLS)$(BR2_PACKAGE_LIBGCRYPT),yy) -SNGREP_DEPENDENCIES += gnutls -SNGREP_CONF_OPTS += --with-gnutls --without-openssl -else -SNGREP_CONF_OPTS += --without-gnutls --without-openssl -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -SNGREP_DEPENDENCIES += pcre -SNGREP_CONF_OPTS += --with-pcre -else -SNGREP_CONF_OPTS += --without-pcre -endif - -$(eval $(autotools-package)) diff --git a/package.bak/snmppp/Config.in b/package.bak/snmppp/Config.in deleted file mode 100644 index 9e800fd57e..0000000000 --- a/package.bak/snmppp/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_SNMPPP - bool "snmp++" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - SNMP++v3.x is a C++ API which supports SNMP v1, v2c, and v3. - - http://www.agentpp.com/snmp_pp3_x/snmp_pp3_x.html - -if BR2_PACKAGE_SNMPPP - -config BR2_PACKAGE_SNMPPP_LOGGING - bool "enable logging" - help - Enable logging output for SNMP++. - According to the SNMP++ documentation, disabling logging "increases - performance drastically and minimizes memory consumption". - -config BR2_PACKAGE_SNMPPP_SNMPV3 - bool "enable SNMPv3" - default y - select BR2_PACKAGE_OPENSSL - help - Enable optional support for SNMP++. This selects OpenSSL. - -endif - -comment "snmp++ needs a toolchain w/ threads, C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/snmppp/snmppp.hash b/package.bak/snmppp/snmppp.hash deleted file mode 100644 index 75ecddade2..0000000000 --- a/package.bak/snmppp/snmppp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 2ef0cb20658c1eb9e053f8a7a9d5c8f5ebf2f734d37b692fdbf7163ea17dde6f snmp++-3.3.9.tar.gz diff --git a/package.bak/snmppp/snmppp.mk b/package.bak/snmppp/snmppp.mk deleted file mode 100644 index 67410d9e4d..0000000000 --- a/package.bak/snmppp/snmppp.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# snmppp -# -################################################################################ - -SNMPPP_VERSION = 3.3.9 -SNMPPP_SOURCE = snmp++-$(SNMPPP_VERSION).tar.gz -SNMPPP_SITE = http://www.agentpp.com/download -SNMPPP_DEPENDENCIES = host-pkgconf -SNMPPP_INSTALL_STAGING = YES -SNMPPP_CONF_OPTS = $(if $(BR2_PACKAGE_SNMPPP_LOGGING),--enable-logging,--disable-logging) -SNMPPP_LICENSE = SNMP++ -SNMPPP_LICENSE_FILES = src/v3.cpp - -ifeq ($(BR2_PACKAGE_SNMPPP_SNMPV3),y) -SNMPPP_CONF_OPTS += --enable-snmpv3 -SNMPPP_DEPENDENCIES += openssl -else -SNMPPP_CONF_OPTS += --disable-snmpv3 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/socat/0001-no-documentation.patch b/package.bak/socat/0001-no-documentation.patch deleted file mode 100644 index ce088dfafc..0000000000 --- a/package.bak/socat/0001-no-documentation.patch +++ /dev/null @@ -1,37 +0,0 @@ -socat: disable documentation build/installation - -The documentation generation process requires a special yold2man -program, for which we don't have a package in Buildroot. Since we -generally don't care much about documentation of packages, just adjust -the package Makefile.in to not build/install its documentation. - -Signed-off-by: Thomas Petazzoni - -Index: b/Makefile.in -=================================================================== ---- a/Makefile.in -+++ b/Makefile.in -@@ -93,7 +93,7 @@ - Config/Makefile.Cygwin-1-5-25 Config/config.Cygwin-1-5-25.h \ - Config/Makefile.MacOSX-10-5 Config/config.MacOSX-10-5.h - --all: progs doc -+all: progs - - scmclean: gitclean - -@@ -136,13 +136,11 @@ - strip: progs - strip $(PROGS) - --install: progs $(srcdir)/doc/socat.1 -+install: progs - mkdir -p $(DESTDIR)$(BINDEST) - $(INSTALL) -m 755 socat $(DESTDIR)$(BINDEST) - $(INSTALL) -m 755 procan $(DESTDIR)$(BINDEST) - $(INSTALL) -m 755 filan $(DESTDIR)$(BINDEST) -- mkdir -p $(DESTDIR)$(MANDEST)/man1 -- $(INSTALL) -m 644 $(srcdir)/doc/socat.1 $(DESTDIR)$(MANDEST)/man1/ - - uninstall: - rm -f $(DESTDIR)$(BINDEST)/socat diff --git a/package.bak/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch b/package.bak/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch deleted file mode 100644 index acae641b34..0000000000 --- a/package.bak/socat/0002-ptrdiff_t-is-defined-in-stddef.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 99c55f2694fe8621ca2344eb002610dac7f9c969 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 2 Feb 2016 09:34:24 -0300 -Subject: [PATCH] ptrdiff_t is defined in stddef.h - -Status: sent upstream via email. - -Signed-off-by: Gustavo Zacarias ---- - nestlex.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/nestlex.c b/nestlex.c -index f7950f0..f49482d 100644 ---- a/nestlex.c -+++ b/nestlex.c -@@ -4,6 +4,8 @@ - - /* a function for lexical scanning of nested character patterns */ - -+#include /* ptrdiff_t */ -+ - #include "config.h" - #include "mytypes.h" - --- -2.4.10 - diff --git a/package.bak/socat/0003-compat-set-NETDB_INTERNAL.patch b/package.bak/socat/0003-compat-set-NETDB_INTERNAL.patch deleted file mode 100644 index da31073ba5..0000000000 --- a/package.bak/socat/0003-compat-set-NETDB_INTERNAL.patch +++ /dev/null @@ -1,35 +0,0 @@ -From e7804d1750652e39c7a5803d360b29b2637a695f Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 21:04:01 +0200 -Subject: [PATCH] compat: set NETDB_INTERNAL - -Musl doesn't provide NETDB_INTERNAL which is defined in resolv/netdb.h -in Glibc [1]. - -Set NETDB_INTERNAL to -1 locally if not already defined. -Based on [2]. - -[1] https://sourceware.org/git/?p=glibc.git;a=blob;f=resolv/netdb.h;h=3aba530932c7a62a4f23e3193e9186da677f552b;hb=fdfc9260b61d3d72541f18104d24c7bcb0ce5ca2#l74 -[2] http://git.alpinelinux.org/cgit/aports/tree/main/socat/netdb-internal.patch?id=5a45173b50892cb634197c30b3506ebff98d3b7d - -Signed-off-by: Romain Naour ---- - compat.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/compat.h b/compat.h -index 19a929f..4f5ee6d 100644 ---- a/compat.h -+++ b/compat.h -@@ -666,6 +666,8 @@ typedef int sig_atomic_t; - - #if !defined(NETDB_INTERNAL) && defined(h_NETDB_INTERNAL) - # define NETDB_INTERNAL h_NETDB_INTERNAL -+#elif !defined(NETDB_INTERNAL) -+# define NETDB_INTERNAL (-1) - #endif - - #ifndef INET_ADDRSTRLEN --- -2.5.5 - diff --git a/package.bak/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch b/package.bak/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch deleted file mode 100644 index 7704123f30..0000000000 --- a/package.bak/socat/0004-xio-tun-remove-if_tun.h-kernel-header.patch +++ /dev/null @@ -1,91 +0,0 @@ -From 1c141194e3587cc8124e5f4512dc3030e5a104b1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 28 Aug 2016 22:06:09 +0200 -Subject: [PATCH] xio-tun: remove if_tun.h kernel header - -xio-tun mixes userspace and kernel headers. - -http://wiki.musl-libc.org/wiki/FAQ#Q:_why_am_i_getting_.22error:_redefinition_of_struct_ethhdr.2Ftcphdr.2Fetc.22_.3F - -Signed-off-by: Romain Naour ---- - config.h.in | 3 --- - configure.in | 8 +------- - sysincludes.h | 3 --- - xio-tun.c | 6 ++++++ - 4 files changed, 7 insertions(+), 13 deletions(-) - -diff --git a/config.h.in b/config.h.in -index 9058bf8..ed0962c 100644 ---- a/config.h.in -+++ b/config.h.in -@@ -258,9 +258,6 @@ - /* Define if you have the header file. */ - #undef HAVE_LINUX_ERRQUEUE_H - --/* Define if you have the header file. */ --#undef HAVE_LINUX_IF_TUN_H -- - /* Define if you have the header file. */ - #undef HAVE_NETPACKET_PACKET_H - -diff --git a/configure.in b/configure.in -index 1d2e76f..27bb3d5 100644 ---- a/configure.in -+++ b/configure.in -@@ -78,7 +78,7 @@ AC_CHECK_HEADERS(arpa/nameser.h) - - AC_HEADER_RESOLV() - --AC_CHECK_HEADERS(termios.h linux/if_tun.h) -+AC_CHECK_HEADERS(termios.h) - AC_CHECK_HEADERS(net/if_dl.h) - AC_CHECK_HEADERS(linux/types.h) - AC_CHECK_HEADER(linux/errqueue.h, AC_DEFINE(HAVE_LINUX_ERRQUEUE_H), [], [#include -@@ -680,12 +680,6 @@ AC_ARG_ENABLE(tun, [ --disable-tun disable TUN/TAP support], - esac], - [AC_MSG_RESULT(yes); WITH_TUN=1 ]) - --# --if ! test "$ac_cv_header_linux_if_tun_h" = 'yes'; then -- AC_MSG_WARN(include file linux/if_tun.h not found, disabling TUN) -- WITH_TUN= --fi --# - if test -n "$WITH_TUN"; then - AC_DEFINE(WITH_TUN) - fi -diff --git a/sysincludes.h b/sysincludes.h -index 98dff77..28067f4 100644 ---- a/sysincludes.h -+++ b/sysincludes.h -@@ -142,9 +142,6 @@ - #if HAVE_NETINET_IF_ETHER_H - #include - #endif --#if HAVE_LINUX_IF_TUN_H --#include --#endif - - #if HAVE_TERMIOS_H && _WITH_TERMIOS - #include -diff --git a/xio-tun.c b/xio-tun.c -index 0628d27..f965a7e 100644 ---- a/xio-tun.c -+++ b/xio-tun.c -@@ -14,6 +14,12 @@ - - #include "xio-tun.h" - -+/* TUNSETIFF flags from if_tun.h kernel header */ -+#define IFF_TUN 0x0001 -+#define IFF_TAP 0x0002 -+#define IFF_NO_PI 0x1000 -+ -+#define TUNSETIFF _IOW('T', 202, int) - - static int xioopen_tun(int argc, const char *argv[], struct opt *opts, int xioflags, xiofile_t *fd, unsigned groups, int dummy1, int dummy2, int dummy3); - --- -2.5.5 - diff --git a/package.bak/socat/Config.in b/package.bak/socat/Config.in deleted file mode 100644 index 09eb2b616d..0000000000 --- a/package.bak/socat/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SOCAT - bool "socat" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Multipurpose socket relay program. - - http://www.dest-unreach.org/socat/ - -comment "socat needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/socat/socat.hash b/package.bak/socat/socat.hash deleted file mode 100644 index d867d8ac10..0000000000 --- a/package.bak/socat/socat.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.dest-unreach.org/socat/download.md5sum -md5 553b1593d0a192cb09cbdc687ef1baac socat-2.0.0-b9.tar.bz2 -# Calculated based on the hash above -sha256 49efb0a5c66b94b279014addc2851faf8ebbd1ec4b7e31c1de7e912d7b4983d2 socat-2.0.0-b9.tar.bz2 diff --git a/package.bak/socat/socat.mk b/package.bak/socat/socat.mk deleted file mode 100644 index 754b210b6c..0000000000 --- a/package.bak/socat/socat.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# socat -# -################################################################################ - -SOCAT_VERSION = 2.0.0-b9 -SOCAT_SOURCE = socat-$(SOCAT_VERSION).tar.bz2 -SOCAT_SITE = http://www.dest-unreach.org/socat/download -SOCAT_LICENSE = GPLv2 -SOCAT_LICENSE_FILES = COPYING -SOCAT_CONF_ENV = \ - sc_cv_termios_ispeed=no \ - sc_cv_sys_crdly_shift=9 \ - sc_cv_sys_tabdly_shift=11 \ - sc_cv_sys_csize_shift=4 - -# We need to run autoconf to regenerate the configure script, in order -# to ensure that the test checking linux/ext2_fs.h works -# properly. However, the package only uses autoconf and not automake, -# so we can't use the normal autoreconf logic. - -SOCAT_DEPENDENCIES = host-autoconf - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SOCAT_DEPENDENCIES += openssl -else -SOCAT_CONF_OPTS += --disable-openssl -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -SOCAT_DEPENDENCIES += readline -else -SOCAT_CONF_OPTS += --disable-readline -endif - -define SOCAT_RUN_AUTOCONF - (cd $(@D); $(HOST_DIR)/usr/bin/autoconf) -endef - -SOCAT_PRE_CONFIGURE_HOOKS += SOCAT_RUN_AUTOCONF - -$(eval $(autotools-package)) diff --git a/package.bak/socketcand/Config.in b/package.bak/socketcand/Config.in deleted file mode 100644 index 7d663251cd..0000000000 --- a/package.bak/socketcand/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_SOCKETCAND - bool "socketcand" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - Socketcand is a daemon that provides access to CAN interfaces - on a machine via a network interface. - - https://github.com/dschanoeh/socketcand - -comment "socketcand needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/socketcand/socketcand.hash b/package.bak/socketcand/socketcand.hash deleted file mode 100644 index 6398d6dd83..0000000000 --- a/package.bak/socketcand/socketcand.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 7e9a02fdd61be8780ca3ff8678a37f8574fdcf74b1ab9de79bbb65257daf05db socketcand-df7fb4ff8a4439d7737fe2df3540e1ab7465721a.tar.gz diff --git a/package.bak/socketcand/socketcand.mk b/package.bak/socketcand/socketcand.mk deleted file mode 100644 index 0cc56ef9f1..0000000000 --- a/package.bak/socketcand/socketcand.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# socketcand -# -################################################################################ - -SOCKETCAND_VERSION = df7fb4ff8a4439d7737fe2df3540e1ab7465721a -SOCKETCAND_SITE = $(call github,dschanoeh,socketcand,$(SOCKETCAND_VERSION)) -SOCKETCAND_AUTORECONF = YES -SOCKETCAND_LICENSE = BSD-3c or GPLv2 -SOCKETCAND_LICENSE_FILES = socketcand.c - -ifeq ($(BR2_PACKAGE_LIBCONFIG),y) -SOCKETCAND_DEPENDENCIES = libconfig -else -SOCKETCAND_CONF_OPTS = --without-config -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch b/package.bak/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch deleted file mode 100644 index 2d52348617..0000000000 --- a/package.bak/sofia-sip/0001-soa_tag.h-reintroduce-soatag_local_sdp_str_ref.patch +++ /dev/null @@ -1,26 +0,0 @@ -From bcd0f17fd83f2dfe570a3ab17249a5c7290b27f2 Mon Sep 17 00:00:00 2001 -From: Pekka Pessi -Date: Thu, 24 Mar 2011 14:45:21 +0200 -Subject: [PATCH] soa_tag.h: reintroduce soatag_local_sdp_str_ref - -Thanks to Erik Habicht for spotting it ---- - libsofia-sip-ua/soa/sofia-sip/soa_tag.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -index 723ca02..d9448d6 100644 ---- a/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -+++ b/libsofia-sip-ua/soa/sofia-sip/soa_tag.h -@@ -118,7 +118,7 @@ SOFIAPUBVAR tag_typedef_t soatag_local_sdp_ref; - SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str; - #define SOATAG_LOCAL_SDP_STR_REF(x) \ - soatag_local_sdp_str_ref, tag_str_vr(&(x)) --SOFIAPUBVAR tag_typedef_t soatag_session_sdp_str_ref; -+SOFIAPUBVAR tag_typedef_t soatag_local_sdp_str_ref; - - #define SOATAG_AF(x) soatag_af, tag_int_v((x)) - SOFIAPUBVAR tag_typedef_t soatag_af; --- -1.7.7 - diff --git a/package.bak/sofia-sip/Config.in b/package.bak/sofia-sip/Config.in deleted file mode 100644 index 24e2148ab9..0000000000 --- a/package.bak/sofia-sip/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_SOFIA_SIP - bool "sofia-sip" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - Sofia-SIP is an open-source SIP User-Agent library, - compliant with the IETF RFC3261 specification (see the - feature table). It can be used as a building block for SIP - client software for uses such as VoIP, IM, and many other - real-time and person-to-person communication services. - - http://sofia-sip.sourceforge.net/ - -comment "sofia-sip needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/sofia-sip/sofia-sip.hash b/package.bak/sofia-sip/sofia-sip.hash deleted file mode 100644 index fe9c4b11c2..0000000000 --- a/package.bak/sofia-sip/sofia-sip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2b01bc2e1826e00d1f7f57d29a2854b15fd5fe24695e47a14a735d195dd37c81 sofia-sip-1.12.11.tar.gz diff --git a/package.bak/sofia-sip/sofia-sip.mk b/package.bak/sofia-sip/sofia-sip.mk deleted file mode 100644 index 5ece44839f..0000000000 --- a/package.bak/sofia-sip/sofia-sip.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# sofia-sip -# -################################################################################ - -SOFIA_SIP_VERSION = 1.12.11 -SOFIA_SIP_SITE = http://downloads.sourceforge.net/project/sofia-sip/sofia-sip/$(SOFIA_SIP_VERSION) -SOFIA_SIP_INSTALL_STAGING = YES -SOFIA_SIP_DEPENDENCIES = host-pkgconf -SOFIA_SIP_LICENSE = LGPLv2.1+ -SOFIA_SIP_LICENSE_FILES = COPYING COPYRIGHTS -SOFIA_SIP_CONF_OPTS = --with-doxygen=no - -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -SOFIA_SIP_CONF_OPTS += --with-glib -SOFIA_SIP_DEPENDENCIES += libglib2 -else -SOFIA_SIP_CONF_OPTS += --without-glib -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SOFIA_SIP_CONF_OPTS += --with-openssl -SOFIA_SIP_DEPENDENCIES += openssl -else -SOFIA_SIP_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_ENABLE_DEBUG),y) -SOFIA_SIP_CONF_OPTS += --enable-ndebug -endif - -$(eval $(autotools-package)) diff --git a/package.bak/softether/0001-use-fhs-install-directories.patch b/package.bak/softether/0001-use-fhs-install-directories.patch deleted file mode 100644 index c489cc1a6c..0000000000 --- a/package.bak/softether/0001-use-fhs-install-directories.patch +++ /dev/null @@ -1,318 +0,0 @@ -From b9420c3bfc2a8b9d35d0c8e5f6849007c2bc21fa Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Mon, 14 Apr 2014 13:22:24 -0400 -Subject: [PATCH] Use FHS installation directories. - -Install to `/usr/sbin`, `/usr/lib`, and `/var/lib` according to the Linux -filesystem hierarchy standard if SoftEther is built through autotools. - -In a managed installation, the FHS stipulates that the application must -accomodate a read-only installation path. This requires a new `GetStateDir` -function that substitues `GetExeDir` in some parts of the code. - -Taken from Github at -https://github.com/dajhorn/SoftEtherVPN/commit/b9420c3bfc2a8b9d35d0c8e5f6849007c2bc21fa. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - autotools/softether.am | 1 + - src/Cedar/Admin.c | 2 +- - src/Cedar/Command.c | 6 +++++- - src/Cedar/Logging.c | 2 +- - src/Cedar/Server.c | 4 ++-- - src/Mayaqua/Encrypt.c | 2 +- - src/Mayaqua/FileIO.c | 39 ++++++++++++++++++++++++++++++++++++--- - src/Mayaqua/FileIO.h | 2 ++ - src/Mayaqua/Mayaqua.c | 4 ++++ - src/Mayaqua/Table.c | 6 +++++- - src/Mayaqua/Unix.c | 6 +++--- - src/bin/hamcore/Makefile.am | 8 ++++++-- - 12 files changed, 67 insertions(+), 15 deletions(-) - -Index: b/autotools/softether.am -=================================================================== ---- a/autotools/softether.am -+++ b/autotools/softether.am -@@ -27,6 +27,7 @@ - -I$(top_srcdir)/src \ - -I$(top_srcdir)/src/Mayaqua \ - -I$(top_srcdir)/src/Cedar \ -+ -DSTATE_DIR='"@localstatedir@/lib/softether"' \ - -DUNIX \ - -DUNIX_LINUX \ - -D_REENTRANT \ -Index: b/src/Cedar/Admin.c -=================================================================== ---- a/src/Cedar/Admin.c -+++ b/src/Cedar/Admin.c -@@ -10334,7 +10334,7 @@ - - Zero(t, sizeof(RPC_READ_LOG_FILE)); - -- GetExeDir(exe_dir, sizeof(exe_dir)); -+ GetStateDir(exe_dir, sizeof(exe_dir)); - Format(full_path, sizeof(full_path), "%s/%s", exe_dir, filepath); - - // Read file -Index: b/src/Cedar/Command.c -=================================================================== ---- a/src/Cedar/Command.c -+++ b/src/Cedar/Command.c -@@ -527,7 +527,7 @@ - UINT i; - - GetExeName(exe, sizeof(exe)); -- GetExeDir(exe_dir, sizeof(exe_dir)); -+ GetStateDir(exe_dir, sizeof(exe_dir)); - - ok = false; - dirs = EnumDir(exe_dir); -@@ -552,7 +552,11 @@ - UCHAR *buf; - IO *io; - #ifndef OS_WIN32 -+#ifdef STATE_DIR -+ wchar_t *filename = L"" STATE_DIR L"/vpn_checker_tmp"; -+#else - wchar_t *filename = L"/tmp/vpn_checker_tmp"; -+#endif - #else // OS_WIN32 - wchar_t filename[MAX_PATH]; - CombinePathW(filename, sizeof(filename), MsGetMyTempDirW(), L"vpn_checker_tmp"); -Index: b/src/Cedar/Logging.c -=================================================================== ---- a/src/Cedar/Logging.c -+++ b/src/Cedar/Logging.c -@@ -508,7 +508,7 @@ - - e = ZeroMalloc(sizeof(ERASER)); - -- GetExeDir(dir, sizeof(dir)); -+ GetStateDir(dir, sizeof(dir)); - - e->Log = log; - e->MinFreeSpace = min_size; -Index: b/src/Cedar/Server.c -=================================================================== ---- a/src/Cedar/Server.c -+++ b/src/Cedar/Server.c -@@ -1060,7 +1060,7 @@ - hubname = NULL; - } - -- GetExeDir(exe_dir, sizeof(exe_dir)); -+ GetStateDir(exe_dir, sizeof(exe_dir)); - - // Enumerate in the server_log - if (hubname == NULL) -@@ -1134,7 +1134,7 @@ - return; - } - -- GetExeDir(exe_dir, sizeof(exe_dir)); -+ GetStateDir(exe_dir, sizeof(exe_dir)); - Format(dir_full_path, sizeof(dir_full_path), "%s/%s", exe_dir, dirname); - - dir = EnumDir(dir_full_path); -Index: b/src/Mayaqua/Encrypt.c -=================================================================== ---- a/src/Mayaqua/Encrypt.c -+++ b/src/Mayaqua/Encrypt.c -@@ -579,7 +579,7 @@ - return false; - } - -- GetExeDir(dirname, sizeof(dirname)); -+ GetStateDir(dirname, sizeof(dirname)); - - // Search the CRL file - t = EnumDir(dirname); -Index: b/src/Mayaqua/FileIO.c -=================================================================== ---- a/src/Mayaqua/FileIO.c -+++ b/src/Mayaqua/FileIO.c -@@ -122,8 +122,14 @@ - #include - #include - -+#ifdef STATE_DIR -+static char exe_file_name[MAX_SIZE] = STATE_DIR "/a.out"; -+static wchar_t exe_file_name_w[MAX_SIZE] = L"" STATE_DIR L"/a.out"; -+#else - static char exe_file_name[MAX_SIZE] = "/tmp/a.out"; - static wchar_t exe_file_name_w[MAX_SIZE] = L"/tmp/a.out"; -+#endif -+ - static LIST *hamcore = NULL; - static IO *hamcore_io = NULL; - -@@ -1038,7 +1044,7 @@ - } - - // If the file exist in hamcore/ directory on the local disk, read it -- GetExeDirW(exe_dir, sizeof(exe_dir)); -+ GetStateDirW(exe_dir, sizeof(exe_dir)); - - UniFormat(tmp, sizeof(tmp), L"%s/%S/%S", exe_dir, HAMCORE_DIR_NAME, filename); - -@@ -1154,7 +1160,7 @@ - return; - } - -- GetExeDirW(exe_dir, sizeof(exe_dir)); -+ GetStateDirW(exe_dir, sizeof(exe_dir)); - UniFormat(tmp, sizeof(tmp), L"%s/%S", exe_dir, HAMCORE_FILE_NAME); - - UniFormat(tmp2, sizeof(tmp2), L"%s/%S", exe_dir, HAMCORE_FILE_NAME_2); -@@ -1438,6 +1444,33 @@ - GetDirNameFromFilePathW(name, size, exe_file_name_w); - } - -+void GetStateDir(char *name, UINT size) -+{ -+ // Validate arguments -+ if (name == NULL) -+ { -+ return; -+ } -+#ifdef STATE_DIR -+ StrCpy(name, size, STATE_DIR); -+#else -+ GetExeDir(name, size) -+#endif -+} -+void GetStateDirW(wchar_t *name, UINT size) -+{ -+ // Validate arguments -+ if (name == NULL) -+ { -+ return; -+ } -+#ifdef STATE_DIR -+ UniStrCpy(name, size, L"" STATE_DIR L""); -+#else -+ GetExeDirW(name, size) -+#endif -+} -+ - // Get the EXE file name - void GetExeName(char *name, UINT size) - { -@@ -2389,7 +2422,7 @@ - else - { - wchar_t dir[MAX_SIZE]; -- GetExeDirW(dir, sizeof(dir)); -+ GetStateDirW(dir, sizeof(dir)); - ConbinePathW(dst, size, dir, &src[1]); - } - } -Index: b/src/Mayaqua/FileIO.h -=================================================================== ---- a/src/Mayaqua/FileIO.h -+++ b/src/Mayaqua/FileIO.h -@@ -349,6 +349,8 @@ - void GetExeNameW(wchar_t *name, UINT size); - void GetExeDir(char *name, UINT size); - void GetExeDirW(wchar_t *name, UINT size); -+void GetStateDir(char *name, UINT size); -+void GetStateDirW(wchar_t *name, UINT size); - void BuildHamcore(char *dst_filename, char *src_dir, bool unix_only); - int CompareHamcore(void *p1, void *p2); - void InitHamcore(); -Index: b/src/Mayaqua/Mayaqua.c -=================================================================== ---- a/src/Mayaqua/Mayaqua.c -+++ b/src/Mayaqua/Mayaqua.c -@@ -611,7 +611,11 @@ - _exit(0); - } - -+#ifndef STATE_DIR -+ // This check causes hamcorebuilder to fail in an unprivileged -+ // environment, and is unnecessary for a managed installation. - CheckUnixTempDir(); -+#endif - - // Initialization of Probe - InitProbe(); -Index: b/src/Mayaqua/Table.c -=================================================================== ---- a/src/Mayaqua/Table.c -+++ b/src/Mayaqua/Table.c -@@ -1191,7 +1191,7 @@ - return; - } - -- GetExeDirW(exe, sizeof(exe)); -+ GetStateDirW(exe, sizeof(exe)); - UniStrCpy(hashtemp, sizeof(hashtemp), strfilename); - BinToStrW(tmp, sizeof(tmp), filehash, MD5_SIZE); - UniStrCat(hashtemp, sizeof(hashtemp), tmp); -@@ -1204,7 +1204,11 @@ - UniStrLower(tmp); - - #ifndef OS_WIN32 -+#ifdef STATE_DIR -+ UniStrCpy(exe, sizeof(exe), L"" STATE_DIR L""); -+#else - UniStrCpy(exe, sizeof(exe), L"/tmp"); -+#endif - #else // OS_WIN32 - StrToUni(exe, sizeof(exe), MsGetTempDir()); - #endif // OS_WIN32 -Index: b/src/Mayaqua/Unix.c -=================================================================== ---- a/src/Mayaqua/Unix.c -+++ b/src/Mayaqua/Unix.c -@@ -928,7 +928,7 @@ - StrCpy(tmp, sizeof(tmp), instance_name); - } - -- GetExeDir(dir, sizeof(dir)); -+ GetStateDir(dir, sizeof(dir)); - - // File name generation - Format(name, sizeof(name), "%s/.%s", dir, tmp); -@@ -2260,7 +2260,7 @@ - return; - } - -- GetExeDir(dir, sizeof(dir)); -+ GetStateDir(dir, sizeof(dir)); - - GetExeName(exe_name, sizeof(exe_name)); - StrCat(exe_name, sizeof(exe_name), ":pid_hash"); -@@ -2305,7 +2305,7 @@ - return; - } - -- GetExeDir(dir, sizeof(dir)); -+ GetStateDir(dir, sizeof(dir)); - - GetExeName(exe_name, sizeof(exe_name)); - StrCat(exe_name, sizeof(exe_name), ":pid_hash"); -Index: b/src/bin/hamcore/Makefile.am -=================================================================== ---- a/src/bin/hamcore/Makefile.am -+++ b/src/bin/hamcore/Makefile.am -@@ -18,12 +18,16 @@ - - include $(top_srcdir)/autotools/softether.am - --# This is required to use a custom build rule with -Wall and -Werror enabled. -+# An empty EXEEXT required for overrides with -Wall and -Werror enabled. - AUTOMAKE_OPTIONS = -Wno-override - EXEEXT = -+ - HAMCOREBUILDER = $(top_builddir)/src/hamcorebuilder/hamcorebuilder - --sbin_PROGRAMS = hamcore.se2 -+noinst_PROGRAMS = hamcore.se2 - - hamcore.se2$(EXEEXT): $(HAMCOREBUILDER) - $(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@ -+ -+install-exec-local: hamcore.se2$(EXEEXT) -+ $(INSTALL_DATA) -D hamcore.se2$(EXEEXT) $(DESTDIR)$(localstatedir)/lib/softether/hamcore.se2 diff --git a/package.bak/softether/0002-create-non-forking-softetherd-for-upstart-and-systemd.patch b/package.bak/softether/0002-create-non-forking-softetherd-for-upstart-and-systemd.patch deleted file mode 100644 index 72913b0bf3..0000000000 --- a/package.bak/softether/0002-create-non-forking-softetherd-for-upstart-and-systemd.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 64dd780905ae339a0a57e4aba541799016816a1a Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Fri, 3 Oct 2014 13:30:24 -0400 -Subject: [PATCH] Create a non-forking softetherd for upstart and systemd. - -Implement a daemon that expects to be invoked by a new-style init like upstart -or systemd as: - - /usr/sbin/softetherd [vpnbridge|vpnclient|vpnserver] - -Alternatively, if the command line argument is empty, then use the -`SOFTETHER_MODE` environment variable instead. - -Conflicts: - src/bin/hamcore/strtable_en.stb - -Taken from Github at -https://github.com/dajhorn/SoftEtherVPN/commit/64dd780905ae339a0a57e4aba541799016816a1a. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 1 + - src/Makefile.am | 3 ++ - src/bin/hamcore/strtable_en.stb | 1 + - src/softetherd/Makefile.am | 28 ++++++++++ - src/softetherd/softetherd.c | 114 ++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 147 insertions(+) - create mode 100644 src/softetherd/Makefile.am - create mode 100644 src/softetherd/softetherd.c - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -36,6 +36,7 @@ - src/vpnclient/Makefile - src/vpnbridge/Makefile - src/vpncmd/Makefile -+ src/softetherd/Makefile - ]) - - -Index: b/src/Makefile.am -=================================================================== ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -27,3 +27,6 @@ - - # These are the final build products. - SUBDIRS += vpnserver vpnclient vpnbridge vpncmd -+ -+# This is a daemon for upstart and systemd. -+SUBDIRS += softetherd -Index: b/src/bin/hamcore/strtable_en.stb -=================================================================== ---- a/src/bin/hamcore/strtable_en.stb -+++ b/src/bin/hamcore/strtable_en.stb -@@ -1062,6 +1062,7 @@ - - - # Concerning services (UNIX) -+UNIX_DAEMON_HELP SoftEther VPN non-forking daemon for upstart and systemd.\nCommand Usage:\n %S vpnbridge - Enable bridging features.\n %S vpnclient - Enable client features.\n %S vpnserver - Enable all features.\nThe parameter can be set in the SOFTETHER_MODE environment variable.\n\n - UNIX_SVC_HELP %S service program\nCopyright (c) SoftEther VPN Project. All Rights Reserved.\n\n%S command usage:\n %S start - Start the %S service.\n %S stop - Stop the %S service if the service has been already started.\n\n - UNIX_SVC_STARTED The %S service has been started.\n - UNIX_SVC_STOPPING Stopping the %S service ...\n -Index: b/src/softetherd/Makefile.am -=================================================================== ---- /dev/null -+++ b/src/softetherd/Makefile.am -@@ -0,0 +1,28 @@ -+# Copyright 2014 Darik Horn -+# -+# This file is part of SoftEther. -+# -+# SoftEther is free software: you can redistribute it and/or modify it under -+# the terms of the GNU General Public License as published by the Free -+# Software Foundation, either version 2 of the License, or (at your option) -+# any later version. -+# -+# SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY -+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -+# details. -+# -+# You should have received a copy of the GNU General Public License along with -+# SoftEther. If not, see . -+ -+ -+include $(top_srcdir)/autotools/softether.am -+ -+sbin_PROGRAMS = \ -+ softetherd -+ -+softetherd_SOURCES = \ -+ softetherd.c -+ -+softetherd_LDADD = \ -+ $(top_builddir)/src/libsoftether/libsoftether.la -Index: b/src/softetherd/softetherd.c -=================================================================== ---- /dev/null -+++ b/src/softetherd/softetherd.c -@@ -0,0 +1,114 @@ -+// SoftEther VPN daemon for upstart and systemd. -+// -+// Copyright 2014 Darik Horn -+// -+// This file is part of SoftEther. -+// -+// SoftEther is free software: you can redistribute it and/or modify it under -+// the terms of the GNU General Public License as published by the Free -+// Software Foundation, either version 2 of the License, or (at your option) -+// any later version. -+// -+// SoftEther is distributed in the hope that it will be useful, but WITHOUT ANY -+// WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS -+// FOR A PARTICULAR PURPOSE. See the GNU General Public License for more -+// details. -+// -+// You should have received a copy of the GNU General Public License along with -+// SoftEther. If not, see . -+ -+ -+#include -+ -+#define VPN_EXE -+ -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+ -+void DaemonUsage(char *name) -+{ -+ UniPrint(_UU("UNIX_DAEMON_HELP"), name, name, name); -+} -+ -+ -+void DaemonStartProcess() -+{ -+ // This environment variable is exported by upstart. -+ char *upstart_job = getenv("UPSTART_JOB"); -+ -+ InitCedar(); -+ StInit(); -+ StStartServer(false); -+ -+ // Notify upstart that softetherd is ready. -+ if (upstart_job != NULL) -+ { -+ unsetenv("UPSTART_JOB"); -+ raise(SIGSTOP); -+ } -+} -+ -+ -+void DaemonStopProcess() -+{ -+ StStopServer(); -+ StFree(); -+ FreeCedar(); -+} -+ -+ -+int main(int argc, char *argv[]) -+{ -+ // This environment variable is sourced and exported by the init process from /etc/default/softether. -+ char *softether_mode = getenv("SOFTETHER_MODE"); -+ -+ InitMayaqua(false, false, argc, argv); -+ -+ // Check for an explicit invocation. (eg: "/usr/sbin/softetherd vpnserver") -+ if (argc >= 2) -+ { -+ if (StrCmpi(argv[1], "vpnbridge") == 0 -+ || StrCmpi(argv[1], "vpnclient") == 0 -+ || StrCmpi(argv[1], "vpnserver") == 0) -+ { -+ UnixExecService(argv[1], DaemonStartProcess, DaemonStopProcess); -+ FreeMayaqua(); -+ return 0; -+ } -+ -+ // Exit status codes 150..199 are reserved for the application by the LSB. -+ fprintf(stderr, "Error: Unrecognized parameter: %s\n", argv[1]); -+ fflush(stderr); -+ FreeMayaqua(); -+ return 150; -+ } -+ -+ // Alternatively, use the environment variable. -+ if (softether_mode != NULL) -+ { -+ if (StrCmpi(softether_mode, "vpnbridge") == 0 -+ || StrCmpi(softether_mode, "vpnclient") == 0 -+ || StrCmpi(softether_mode, "vpnserver") == 0) -+ { -+ UnixExecService(softether_mode, DaemonStartProcess, DaemonStopProcess); -+ FreeMayaqua(); -+ return 0; -+ } -+ -+ // Exit status codes 150..199 are reserved for the application by the LSB. -+ fprintf(stderr, "Error: Unrecognized environment variable: SOFTETHER_MODE=%s\n", softether_mode); -+ fflush(stderr); -+ FreeMayaqua(); -+ return 151; -+ } -+ -+ DaemonUsage(argv[0]); -+ FreeMayaqua(); -+ return 3; -+} diff --git a/package.bak/softether/0003-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch b/package.bak/softether/0003-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch deleted file mode 100644 index 6cb4e728b4..0000000000 --- a/package.bak/softether/0003-change-GetExeDir-to-GetStateDir-in-Cedar-and-Mayaqua.patch +++ /dev/null @@ -1,90 +0,0 @@ -From d68db9f2cee975aad5e07b44485615f3d842ab45 Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Fri, 11 Jul 2014 16:17:18 -0400 -Subject: [PATCH] Change GetExeDir to GetStateDir in Cedar and Mayaqua. - -Resolve this AppArmor error by ensuring that certificate files files are -written into /var/lib/softether instead of the current working directory: - - Profile: /usr/sbin/softetherd - Operation: mkdir - Name: /usr/sbin/chain_certs - Denied: c - Logfile: /var/log/kern.log - - type=1400 audit: apparmor="DENIED" operation="mkdir" profile="/usr/sbin/softetherd" name="/usr/sbin/chain_certs/" pid=36448 comm="softetherd" requested_mask="c" denied_mask="c" fsuid=0 ouid=0 - -Taken from Github -https://github.com/dajhorn/SoftEtherVPN/commit/d68db9f2cee975aad5e07b44485615f3d842ab45. - -Signed-off-by: Bernd Kuhls -Signed-off-by: Thomas Petazzoni ---- - src/Cedar/Protocol.c | 12 ++++++------ - src/Mayaqua/Network.c | 6 +++--- - 2 files changed, 9 insertions(+), 9 deletions(-) - -Index: b/src/Cedar/Protocol.c -=================================================================== ---- a/src/Cedar/Protocol.c -+++ b/src/Cedar/Protocol.c -@@ -161,10 +161,10 @@ - UINT i; - DIRLIST *dir; - wchar_t dirname[MAX_SIZE]; -- wchar_t exedir[MAX_SIZE]; -+ wchar_t statedir[MAX_SIZE]; - -- GetExeDirW(exedir, sizeof(exedir)); -- CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ GetStateDirW(statedir, sizeof(statedir)); -+ CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs"); - MakeDirExW(dirname); - - if (auto_save) -@@ -461,7 +461,7 @@ - void AddAllChainCertsToCertList(LIST *o) - { - wchar_t dirname[MAX_SIZE]; -- wchar_t exedir[MAX_SIZE]; -+ wchar_t statedir[MAX_SIZE]; - DIRLIST *dir; - // Validate arguments - if (o == NULL) -@@ -469,9 +469,9 @@ - return; - } - -- GetExeDirW(exedir, sizeof(exedir)); -+ GetStateDirW(statedir, sizeof(statedir)); - -- CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs"); - - MakeDirExW(dirname); - -Index: b/src/Mayaqua/Network.c -=================================================================== ---- a/src/Mayaqua/Network.c -+++ b/src/Mayaqua/Network.c -@@ -12588,7 +12588,7 @@ - void AddChainSslCertOnDirectory(struct ssl_ctx_st *ctx) - { - wchar_t dirname[MAX_SIZE]; -- wchar_t exedir[MAX_SIZE]; -+ wchar_t statedir[MAX_SIZE]; - wchar_t txtname[MAX_SIZE]; - DIRLIST *dir; - LIST *o; -@@ -12602,9 +12602,9 @@ - - o = NewListFast(NULL); - -- GetExeDirW(exedir, sizeof(exedir)); -+ GetStateDirW(statedir, sizeof(statedir)); - -- CombinePathW(dirname, sizeof(dirname), exedir, L"chain_certs"); -+ CombinePathW(dirname, sizeof(dirname), statedir, L"chain_certs"); - - MakeDirExW(dirname); - diff --git a/package.bak/softether/0004-cross-compile.patch b/package.bak/softether/0004-cross-compile.patch deleted file mode 100644 index 0b31eca65c..0000000000 --- a/package.bak/softether/0004-cross-compile.patch +++ /dev/null @@ -1,30 +0,0 @@ -Host version of hamcorebuilder is needed during cross-compile - -Signed-off-by: Bernd Kuhls - -diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am ---- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/bin/hamcore/Makefile.am 2014-09-27 12:56:53.108725793 +0200 -+++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/bin/hamcore/Makefile.am 2014-09-27 12:57:50.280009025 +0200 -@@ -26,8 +26,8 @@ - - noinst_PROGRAMS = hamcore.se2 - --hamcore.se2$(EXEEXT): $(HAMCOREBUILDER) -- $(HAMCOREBUILDER) $(top_srcdir)/src/bin/hamcore $@ -+hamcore.se2$(EXEEXT): -+ hamcorebuilder $(top_srcdir)/src/bin/hamcore $@ - - install-exec-local: hamcore.se2$(EXEEXT) - $(INSTALL_DATA) -D hamcore.se2$(EXEEXT) $(DESTDIR)$(localstatedir)/lib/softether/hamcore.se2 -diff -uNr SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am ---- SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824.org/src/Makefile.am 2014-09-27 12:56:53.136726809 +0200 -+++ SoftEtherVPN-16b713b98da8dba29f0f845d5a8c36d6f7c34824/src/Makefile.am 2014-09-27 12:58:12.959723109 +0200 -@@ -20,7 +20,7 @@ - SUBDIRS = Mayaqua Cedar - - # This is a nodist helper. --SUBDIRS += hamcorebuilder -+# SUBDIRS += hamcorebuilder - - # These are shared components. - SUBDIRS += libsoftether bin/hamcore diff --git a/package.bak/softether/0005-iconv.patch b/package.bak/softether/0005-iconv.patch deleted file mode 100644 index 09d7777e42..0000000000 --- a/package.bak/softether/0005-iconv.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix linking with libiconv - -Inspired by https://github.com/el1n/OpenWRT-package-softether/blob/4cb1cd9073a76edf34c512e587069626e02e2404/patches/120-fix-iconv-headers-common.patch - -Signed-off-by: Bernd Kuhls - -Index: b/src/Mayaqua/Mayaqua.h -=================================================================== ---- a/src/Mayaqua/Mayaqua.h -+++ b/src/Mayaqua/Mayaqua.h -@@ -282,17 +282,7 @@ - #include - #endif // MAYAQUA_SUPPORTS_GETIFADDRS - --#ifdef UNIX_LINUX --typedef void *iconv_t; --iconv_t iconv_open (__const char *__tocode, __const char *__fromcode); --size_t iconv (iconv_t __cd, char **__restrict __inbuf, -- size_t *__restrict __inbytesleft, -- char **__restrict __outbuf, -- size_t *__restrict __outbytesleft); --int iconv_close (iconv_t __cd); --#else // UNIX_LINUX - #include --#endif // UNIX_LINUX - - - diff --git a/package.bak/softether/0006-librt.patch b/package.bak/softether/0006-librt.patch deleted file mode 100644 index 661c960a95..0000000000 --- a/package.bak/softether/0006-librt.patch +++ /dev/null @@ -1,33 +0,0 @@ -Downloaded from -https://github.com/dajhorn/SoftEtherVPN/commit/9a8538a6f2287fe8bebd0a7185de408e31e5a7df - -Fixes -http://autobuild.buildroot.net/results/48f/48f778a891e0bf6a60ed2e4bec057c338ec25ec9/ -and many others - -Signed-off-by: Bernd Kuhls - - -From 9a8538a6f2287fe8bebd0a7185de408e31e5a7df Mon Sep 17 00:00:00 2001 -From: Darik Horn -Date: Thu, 5 Jun 2014 21:02:02 -0400 -Subject: [PATCH] Add an explicit autoconf check for librt. - -The realtime extensions library is not automatically linked on Debian ARM -platforms, so do an AC_CHECK_LIB for it in the configuration macro. ---- - configure.ac | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.ac b/configure.ac -index 165623a..6f85393 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,7 @@ CC="$PTHREAD_CC" - CFLAGS="$CFLAGS $PTHREAD_CFLAGS" - LIBS="$PTHREAD_LIBS $LIBS" - -+AC_CHECK_LIB([rt],[clock_gettime]) - - AX_CHECK_OPENSSL([ - AC_SUBST(OPENSSL_LIBS) diff --git a/package.bak/softether/0007-uclibc-ai-addrconfig.patch b/package.bak/softether/0007-uclibc-ai-addrconfig.patch deleted file mode 100644 index 7d8f1c67c1..0000000000 --- a/package.bak/softether/0007-uclibc-ai-addrconfig.patch +++ /dev/null @@ -1,27 +0,0 @@ -Only enable getifaddrs support when available - -On uClibc, the ifaddrs.h support is optional. While the default -Buildroot uClibc configuration has it enabled, some external -toolchains may not. Therefore this patch detects that and adjusts -softether usage of ifaddrs accordingly. - -Based on an initial patch from Bernd Kuhls. - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Mayaqua/Mayaqua.h -=================================================================== ---- a/src/Mayaqua/Mayaqua.h -+++ b/src/Mayaqua/Mayaqua.h -@@ -235,9 +235,11 @@ - #ifdef OS_UNIX - #ifndef UNIX_SOLARIS - #ifndef CPU_SH4 -+#if !defined(__UCLIBC__) || defined(__UCLIBC_SUPPORT_AI_ADDRCONFIG__) - // Getifaddrs system call is supported on UNIX other than Solaris. - // However, it is not supported also by the Linux on SH4 CPU - #define MAYAQUA_SUPPORTS_GETIFADDRS -+#endif // !UCLIBC || UCLIBC_SUPPORT_AI_ADDRCONFIG - #endif // CPU_SH4 - #endif // UNIX_SOLARIS - #endif // OS_UNIX diff --git a/package.bak/softether/Config.in b/package.bak/softether/Config.in deleted file mode 100644 index 60f1357529..0000000000 --- a/package.bak/softether/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_SOFTETHER - bool "softether" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_READLINE - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR - help - The SoftEther Server is a fully integrated implementation of the SSTP, - L2TP, L2TPv3, OpenVPN, and IPSec virtual private networking protocols - on Linux and several other platforms. It is generally compatible with - other implementations by Apple, Cisco, Juniper, Microsoft, et al. - - Convenient Layer-2 and Layer-3 bridging capabilities can connect - several branch offices into a single broadcast or routing domain, even - behind a NAT or without a static IPv4 address. - - In addition to supporting most VPN protocols, the SoftEther Client can - penetrate hardened firewalls and captured gateways through HTTPS, DNS, - and ICMP exfiltration. - - http://www.softether.org - -comment "softether needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !(BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/softether/softether.hash b/package.bak/softether/softether.hash deleted file mode 100644 index ecc5d25d1a..0000000000 --- a/package.bak/softether/softether.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally computed -sha256 4bdcc05fcd163eea735444283264e40b86626d24fddf110aa416f2c8cb82448b softether-1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a.tar.gz -sha256 fe5ff8f13b42737dfd5eb53f14c55aed714c380f181a1ae112055b04e8c97229 c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch -sha256 b5a8750426387b9211754b199f7f9f6a013dba6a1cd731c210a205679ffa1d1c 75625af541fd128f51079d0ffe5ef24645b8f421.patch diff --git a/package.bak/softether/softether.mk b/package.bak/softether/softether.mk deleted file mode 100644 index da7d129723..0000000000 --- a/package.bak/softether/softether.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# softether -# -################################################################################ - -SOFTETHER_VERSION = 1e17c9bcfd7e7b31756aa5389bcbff76c2c9c88a -SOFTETHER_SITE = $(call github,SoftEtherVPN,SoftEtherVPN,$(SOFTETHER_VERSION)) -SOFTETHER_PATCH = \ - https://github.com/dajhorn/SoftEtherVPN/commit/c5e5d7e93c6f3302adf5821c29c4efdb7630e418.patch \ - https://github.com/dajhorn/SoftEtherVPN/commit/75625af541fd128f51079d0ffe5ef24645b8f421.patch -SOFTETHER_LICENSE = GPLv2 -SOFTETHER_LICENSE_FILES = LICENSE -SOFTETHER_DEPENDENCIES = host-softether openssl readline -SOFTETHER_AUTORECONF = YES - -ifeq ($(BR2_ENABLE_LOCALE),) -SOFTETHER_DEPENDENCIES += libiconv -SOFTETHER_CONF_ENV = LIBS+=" -liconv" -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# openssl needs zlib -SOFTETHER_CONF_ENV += LIBS+=" -lz" -endif - -SOFTETHER_CONF_OPTS = \ - --with-openssl="$(STAGING_DIR)/usr" \ - --with-zlib="$(STAGING_DIR)/usr" - -# host-libiconv does not exist, therefore we need this extra line -HOST_SOFTETHER_DEPENDENCIES = host-pkgconf host-openssl host-readline - -# target build creates the file hamcore.se2 which needs the host variant of -# hamcorebuilder, for details see http://www.vpnusers.com/viewtopic.php?p=5426 -define HOST_SOFTETHER_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/Mayaqua - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/Cedar - $(HOST_MAKE_ENV) $(MAKE) -C $(@D)/src/hamcorebuilder -endef - -define HOST_SOFTETHER_INSTALL_CMDS - $(INSTALL) -m 0755 $(@D)/src/hamcorebuilder/hamcorebuilder $(HOST_DIR)/usr/bin/hamcorebuilder -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/sound-theme-borealis/Config.in b/package.bak/sound-theme-borealis/Config.in deleted file mode 100644 index fcc109fe94..0000000000 --- a/package.bak/sound-theme-borealis/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_SOUND_THEME_BOREALIS - bool "sound-theme-borealis" - help - Borealis sound theme. - - http://kde-look.org/content/show.php?content=12584 diff --git a/package.bak/sound-theme-borealis/sound-theme-borealis.hash b/package.bak/sound-theme-borealis/sound-theme-borealis.hash deleted file mode 100644 index 7a4d3e1313..0000000000 --- a/package.bak/sound-theme-borealis/sound-theme-borealis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 dd80a9c6317de29d42786ba7d95b114b64d06ec6c0c17dd18df853a5c668e727 Borealis_sound_theme_ogg-0.9a.tar.bz2 diff --git a/package.bak/sound-theme-borealis/sound-theme-borealis.mk b/package.bak/sound-theme-borealis/sound-theme-borealis.mk deleted file mode 100644 index 9242837bec..0000000000 --- a/package.bak/sound-theme-borealis/sound-theme-borealis.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# sound-theme-borealis -# -################################################################################ - -SOUND_THEME_BOREALIS_VERSION = 0.9a -SOUND_THEME_BOREALIS_SITE = http://ico.bukvic.net/Linux/Borealis_soundtheme -SOUND_THEME_BOREALIS_SOURCE = \ - Borealis_sound_theme_ogg-$(SOUND_THEME_BOREALIS_VERSION).tar.bz2 - -define SOUND_THEME_BOREALIS_INSTALL_TARGET_CMDS - for f in $(@D)/*.ogg ; do \ - $(INSTALL) -D -m 0644 $$f $(TARGET_DIR)/usr/share/sounds/borealis/stereo/`basename $$f` || exit 1; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/sound-theme-freedesktop/Config.in b/package.bak/sound-theme-freedesktop/Config.in deleted file mode 100644 index 8b48015f59..0000000000 --- a/package.bak/sound-theme-freedesktop/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_SOUND_THEME_FREEDESKTOP - bool "sound-theme-freedesktop" - help - Default theme for the XDG Sound Theme Specification. - - http://freedesktop.org/wiki/Specifications/sound-theme-spec diff --git a/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.hash b/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.hash deleted file mode 100644 index cde02ca3e6..0000000000 --- a/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e6595afb02b76099ef6df42c2ac7c4f9680c21c3f26b2a7ca0943d1fdbbd9aef sound-theme-freedesktop-0.7.tar.bz2 diff --git a/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.mk b/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.mk deleted file mode 100644 index ea4c8536c7..0000000000 --- a/package.bak/sound-theme-freedesktop/sound-theme-freedesktop.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# sound-theme-freedesktop -# -################################################################################ - -SOUND_THEME_FREEDESKTOP_VERSION = 0.7 -SOUND_THEME_FREEDESKTOP_SITE = \ - http://people.freedesktop.org/~mccann/dist -SOUND_THEME_FREEDESKTOP_SOURCE = \ - sound-theme-freedesktop-$(SOUND_THEME_FREEDESKTOP_VERSION).tar.bz2 -SOUND_THEME_FREEDESKTOP_DEPENDENCIES = host-intltool - -$(eval $(autotools-package)) diff --git a/package.bak/sox/0001-uclibc.patch b/package.bak/sox/0001-uclibc.patch deleted file mode 100644 index 5c118fa4dc..0000000000 --- a/package.bak/sox/0001-uclibc.patch +++ /dev/null @@ -1,26 +0,0 @@ -Make SoX support uclibc-based toolchains, from: -http://sourceforge.net/p/sox/bugs/179/ - -Signed-off-by: Gustavo Zacarias - -Index: sox-14.4.1/src/formats.c -=================================================================== ---- sox-14.4.1.orig/src/formats.c -+++ sox-14.4.1/src/formats.c -@@ -409,7 +409,7 @@ static void UNUSED rewind_pipe(FILE * fp - #if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__ - fp->_p -= PIPE_AUTO_DETECT_SIZE; - fp->_r += PIPE_AUTO_DETECT_SIZE; --#elif defined __GLIBC__ -+#elif defined __GLIBC__ && ! defined __UCLIBC__ - fp->_IO_read_ptr = fp->_IO_read_base; - #elif defined _MSC_VER || defined _WIN32 || defined _WIN64 || defined _ISO_STDIO_ISO_H - fp->_ptr = fp->_base; -@@ -417,7 +417,6 @@ static void UNUSED rewind_pipe(FILE * fp - /* To fix this #error, either simply remove the #error line and live without - * file-type detection with pipes, or add support for your compiler in the - * lines above. Test with cat monkey.wav | ./sox --info - */ -- #error FIX NEEDED HERE - #define NO_REWIND_PIPE - (void)fp; - #endif diff --git a/package.bak/sox/Config.in b/package.bak/sox/Config.in deleted file mode 100644 index a96553a2ef..0000000000 --- a/package.bak/sox/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_SOX - bool "sox" - help - SoX is a cross-platform (Windows, Linux, MacOS X, etc.) command line - utility that can convert various formats of computer audio files - into other formats. - It can also apply various effects to these sound files, and, as an - added bonus, SoX can play and record audio files on most platforms. - - http://sox.sourceforge.net/ diff --git a/package.bak/sox/sox.hash b/package.bak/sox/sox.hash deleted file mode 100644 index 2f8069b69f..0000000000 --- a/package.bak/sox/sox.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/sox/files/sox/14.4.2/ -md5 ba804bb1ce5c71dd484a102a5b27d0dd sox-14.4.2.tar.bz2 -sha1 dc9668256b9d81ef25d672f14f12ec026b0b4087 sox-14.4.2.tar.bz2 diff --git a/package.bak/sox/sox.mk b/package.bak/sox/sox.mk deleted file mode 100644 index 61f5220189..0000000000 --- a/package.bak/sox/sox.mk +++ /dev/null @@ -1,112 +0,0 @@ -################################################################################ -# -# sox -# -################################################################################ - -SOX_VERSION = 14.4.2 -SOX_SITE = http://downloads.sourceforge.net/project/sox/sox/$(SOX_VERSION) -SOX_SOURCE = sox-$(SOX_VERSION).tar.bz2 -SOX_DEPENDENCIES = host-pkgconf -SOX_CONF_OPTS = --with-distro="Buildroot" --without-ffmpeg --disable-gomp \ - $(if $(BR2_TOOLCHAIN_HAS_SSP),,--disable-stack-protector) -SOX_LICENSE = GPLv2+ (sox binary), LGPLv2.1+ (libraries) -SOX_LICENSE_FILES = LICENSE.GPL LICENSE.LGPL - -# MIPS Codescape toolchains don't support stack-smashing protection -# despite of using glibc. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_IMG_MIPS)$(BR2_TOOLCHAIN_EXTERNAL_CODESCAPE_MTI_MIPS),y) -SOX_CONF_OPTS += --disable-stack-protector -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB_PCM),y) -SOX_DEPENDENCIES += alsa-lib -else -SOX_CONF_OPTS += --without-alsa -endif - -ifeq ($(BR2_PACKAGE_FILE),y) -SOX_DEPENDENCIES += file -else -SOX_CONF_OPTS += --without-magic -endif - -ifeq ($(BR2_PACKAGE_FLAC),y) -SOX_DEPENDENCIES += flac -else -SOX_CONF_OPTS += --without-flac -endif - -ifeq ($(BR2_PACKAGE_LAME),y) -SOX_DEPENDENCIES += lame -else -SOX_CONF_OPTS += --without-lame -endif - -ifeq ($(BR2_PACKAGE_LIBAO),y) -SOX_DEPENDENCIES += libao -else -SOX_CONF_OPTS += --without-ao -endif - -ifeq ($(BR2_PACKAGE_LIBID3TAG),y) -SOX_DEPENDENCIES += libid3tag -else -SOX_CONF_OPTS += --without-id3tag -endif - -ifeq ($(BR2_PACKAGE_LIBMAD),y) -SOX_DEPENDENCIES += libmad -else -SOX_CONF_OPTS += --without-mad -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -SOX_DEPENDENCIES += libpng -else -SOX_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_LIBSNDFILE),y) -SOX_DEPENDENCIES += libsndfile -else -SOX_CONF_OPTS += --without-sndfile -endif - -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -SOX_DEPENDENCIES += libvorbis -else -SOX_CONF_OPTS += --without-oggvorbis -endif - -ifeq ($(BR2_PACKAGE_OPENCORE_AMR),y) -SOX_DEPENDENCIES += opencore-amr -else -SOX_CONF_OPTS += --without-amrwb --without-amrnb -endif - -ifeq ($(BR2_PACKAGE_OPUSFILE),y) -SOX_DEPENDENCIES += opusfile -else -SOX_CONF_OPTS += --without-opus -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -SOX_DEPENDENCIES += pulseaudio -else -SOX_CONF_OPTS += --without-pulseaudio -endif - -ifeq ($(BR2_PACKAGE_TWOLAME),y) -SOX_DEPENDENCIES += twolame -else -SOX_CONF_OPTS += --without-twolame -endif - -ifeq ($(BR2_PACKAGE_WAVPACK),y) -SOX_DEPENDENCIES += wavpack -else -SOX_CONF_OPTS += --without-wavpack -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch b/package.bak/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch deleted file mode 100644 index 67153c27bc..0000000000 --- a/package.bak/sp-oops-extract/0001-Make-the-Makefile-more-cross-compiler-friendly.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fetch from: https://github.com/Schischu/ptxdist_sh/tree/master/patches/sp-oops-extract-0.0.7 - -From: Bernhard Walle -Date: Wed, 21 Mar 2012 15:55:06 +0100 -Subject: [PATCH] Make the Makefile more cross-compiler friendly - -Signed-off-by: Bernhard Walle ---- - src/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile b/src/Makefile -index cf5b550..e05eb1f 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,4 +9,4 @@ distclean: clean - $(RM) $(TARGETS) - - sp-oops-extract: oopslog.c -- gcc -Wall -s -o $@ $^ -+ $(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) -Wall -o $@ $^ - diff --git a/package.bak/sp-oops-extract/0002-stdint-cleanup.patch b/package.bak/sp-oops-extract/0002-stdint-cleanup.patch deleted file mode 100644 index 255fe8a8ce..0000000000 --- a/package.bak/sp-oops-extract/0002-stdint-cleanup.patch +++ /dev/null @@ -1,33 +0,0 @@ -consolidate use of stdint types - -Change u_int*_t to uint*_t for compatibility with a larger number of C -libraries. - -Signed-off-by: Doug Kehn - -Index: sp-oops-extract-0.0.7-1/src/oopslog.c -=================================================================== ---- sp-oops-extract-0.0.7-1.orig/src/oopslog.c -+++ sp-oops-extract-0.0.7-1/src/oopslog.c -@@ -64,8 +64,8 @@ static int try_to_check_for_bad_blocks(v - - int main(const int argc, const char *argv[]) - { -- u_int32_t *count, maxcount = 0xffffffff; -- u_int32_t *magic_ptr, magic_value = 0x5d005d00; -+ uint32_t *count, maxcount = 0xffffffff; -+ uint32_t *magic_ptr, magic_value = 0x5d005d00; - - unsigned char *charbuf; - unsigned long size; -@@ -137,8 +137,8 @@ int main(const int argc, const char *arg - errx(-1, "%s is something weird", device); - - charbuf = buf; -- count = (u_int32_t *) buf; -- magic_ptr = (u_int32_t *) (buf + sizeof(u_int32_t)); -+ count = (uint32_t *) buf; -+ magic_ptr = (uint32_t *) (buf + sizeof(uint32_t)); - - for (i = 0; i < (size / OOPS_PAGE_SIZE); i++) { - pread(fd, buf, OOPS_PAGE_SIZE, i * OOPS_PAGE_SIZE); diff --git a/package.bak/sp-oops-extract/Config.in b/package.bak/sp-oops-extract/Config.in deleted file mode 100644 index d4e0252c89..0000000000 --- a/package.bak/sp-oops-extract/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_SP_OOPS_EXTRACT - bool "sp-oops-extract" - help - A tool for extracting OOPS/panic logs from MTD. - - http://maemo.org/packages/view/sp-oops-extract/ diff --git a/package.bak/sp-oops-extract/sp-oops-extract.hash b/package.bak/sp-oops-extract/sp-oops-extract.hash deleted file mode 100644 index 835bfe8915..0000000000 --- a/package.bak/sp-oops-extract/sp-oops-extract.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 85601a569af1f4584db75fad21d3a70e377ce12d1bccad7dbe1112abd3b43d93 sp-oops-extract_0.0.7-1.tar.gz diff --git a/package.bak/sp-oops-extract/sp-oops-extract.mk b/package.bak/sp-oops-extract/sp-oops-extract.mk deleted file mode 100644 index 991980713f..0000000000 --- a/package.bak/sp-oops-extract/sp-oops-extract.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# sp-oops-extract -# -################################################################################ - -SP_OOPS_EXTRACT_VERSION = 0.0.7-1 -SP_OOPS_EXTRACT_SITE = http://repository.maemo.org/pool/maemo5.0/free/s/sp-oops-extract -SP_OOPS_EXTRACT_SOURCE = sp-oops-extract_$(SP_OOPS_EXTRACT_VERSION).tar.gz -SP_OOPS_EXTRACT_LICENSE = GPLv2 -SP_OOPS_EXTRACT_LICENSE_FILES = COPYING - -define SP_OOPS_EXTRACT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) -endef - -define SP_OOPS_EXTRACT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install \ - DESTDIR=$(TARGET_DIR) -endef - -$(eval $(generic-package)) diff --git a/package.bak/spawn-fcgi/Config.in b/package.bak/spawn-fcgi/Config.in deleted file mode 100644 index 59791e8d8e..0000000000 --- a/package.bak/spawn-fcgi/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SPAWN_FCGI - bool "spawn-fcgi" - depends on BR2_USE_MMU # fork() - help - FastCGI process spawner. - Project split from lighttpd. - - http://redmine.lighttpd.net/projects/spawn-fcgi diff --git a/package.bak/spawn-fcgi/spawn-fcgi.hash b/package.bak/spawn-fcgi/spawn-fcgi.hash deleted file mode 100644 index c1911e4e9f..0000000000 --- a/package.bak/spawn-fcgi/spawn-fcgi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://redmine.lighttpd.net/news/9 -sha256 a3cfc7c9581b6ddc31084b379c9160323fa345d357ace6cd2d3d3af3593e2873 spawn-fcgi-1.6.4.tar.bz2 diff --git a/package.bak/spawn-fcgi/spawn-fcgi.mk b/package.bak/spawn-fcgi/spawn-fcgi.mk deleted file mode 100644 index 13357bba3b..0000000000 --- a/package.bak/spawn-fcgi/spawn-fcgi.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# spawn-fcgi -# -################################################################################ - -SPAWN_FCGI_VERSION = 1.6.4 -SPAWN_FCGI_SITE = http://www.lighttpd.net/download -SPAWN_FCGI_SOURCE = spawn-fcgi-$(SPAWN_FCGI_VERSION).tar.bz2 -SPAWN_FCGI_LICENSE = BSD-3c -SPAWN_FCGI_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/speex/0001-thumb2-support.patch b/package.bak/speex/0001-thumb2-support.patch deleted file mode 100644 index b6f7369299..0000000000 --- a/package.bak/speex/0001-thumb2-support.patch +++ /dev/null @@ -1,220 +0,0 @@ -Make speex Thumb2 compatible - -Patch written by Michael Hope from Linaro, available at -http://lists.xiph.org/pipermail/speex-dev/2010-November/008041.html. - -Signed-off-by: Thomas Petazzoni - -diff --git a/libspeex/filters_arm4.h b/libspeex/filters_arm4.h -index 7a74042..6ec1f75 100644 ---- a/libspeex/filters_arm4.h -+++ b/libspeex/filters_arm4.h -@@ -47,8 +47,10 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le - - "\tldr %4, [%0], #4 \n" - "\tcmps %4, %1 \n" -+ "\tit gt \n" - "\tmovgt %1, %4 \n" - "\tcmps %4, %3 \n" -+ "\tit lt \n" - "\tmovlt %3, %4 \n" - - "\tsubs %2, %2, #1 \n" -@@ -56,6 +58,7 @@ int normalize16(const spx_sig_t *x, spx_word16_t *y, spx_sig_t max_scale, int le - - "\trsb %3, %3, #0 \n" - "\tcmp %1, %3 \n" -+ "\tit lt \n" - "\tmovlt %1, %3 \n" - : "=r" (dead1), "=r" (max_val), "=r" (dead3), "=r" (dead4), - "=r" (dead5), "=r" (dead6) -diff --git a/libspeex/fixed_arm4.h b/libspeex/fixed_arm4.h -index b6981ca..b6218ca 100644 ---- a/libspeex/fixed_arm4.h -+++ b/libspeex/fixed_arm4.h -@@ -69,72 +69,90 @@ static inline short DIV32_16(int a, int b) - __asm__ __volatile__ ( - "\teor %5, %0, %1\n" - "\tmovs %4, %0\n" -+ "\tit mi \n" - "\trsbmi %0, %0, #0 \n" - "\tmovs %4, %1\n" -+ "\tit mi \n" - "\trsbmi %1, %1, #0 \n" - "\tmov %4, #1\n" - - "\tsubs %3, %0, %1, asl #14 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #14 \n" - - "\tsubs %3, %0, %1, asl #13 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #13 \n" - - "\tsubs %3, %0, %1, asl #12 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #12 \n" - - "\tsubs %3, %0, %1, asl #11 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #11 \n" - - "\tsubs %3, %0, %1, asl #10 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #10 \n" - - "\tsubs %3, %0, %1, asl #9 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #9 \n" - - "\tsubs %3, %0, %1, asl #8 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #8 \n" - - "\tsubs %3, %0, %1, asl #7 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #7 \n" - - "\tsubs %3, %0, %1, asl #6 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #6 \n" - - "\tsubs %3, %0, %1, asl #5 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #5 \n" - - "\tsubs %3, %0, %1, asl #4 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #4 \n" - - "\tsubs %3, %0, %1, asl #3 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #3 \n" - - "\tsubs %3, %0, %1, asl #2 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #2 \n" - - "\tsubs %3, %0, %1, asl #1 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4, asl #1 \n" - - "\tsubs %3, %0, %1 \n" -+ "\titt pl \n" - "\tmovpl %0, %3 \n" - "\torrpl %2, %2, %4 \n" - - "\tmovs %5, %5, lsr #31 \n" -+ "\tit ne \n" - "\trsbne %2, %2, #0 \n" - : "=r" (dead1), "=r" (dead2), "=r" (res), - "=r" (dead3), "=r" (dead4), "=r" (dead5) -diff --git a/libspeex/fixed_arm5e.h b/libspeex/fixed_arm5e.h -index 9b4861c..bdadd02 100644 ---- a/libspeex/fixed_arm5e.h -+++ b/libspeex/fixed_arm5e.h -@@ -97,72 +97,90 @@ static inline short DIV32_16(int a, int b) - __asm__ __volatile__ ( - "\teor %5, %0, %1\n" - "\tmovs %4, %0\n" -+ "\tit mi \n" - "\trsbmi %0, %0, #0 \n" - "\tmovs %4, %1\n" -+ "\tit mi \n" - "\trsbmi %1, %1, #0 \n" - "\tmov %4, #1\n" - - "\tsubs %3, %0, %1, asl #14 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #14 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #13 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #13 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #12 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #12 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #11 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #11 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #10 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #10 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #9 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #9 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #8 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #8 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #7 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #7 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #6 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #6 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #5 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #5 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #4 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #4 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #3 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #3 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #2 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #2 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1, asl #1 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4, asl #1 \n" - "\tmovpl %0, %3 \n" - - "\tsubs %3, %0, %1 \n" -+ "\titt pl \n" - "\torrpl %2, %2, %4 \n" - "\tmovpl %0, %3 \n" - - "\tmovs %5, %5, lsr #31 \n" -+ "\tit ne \n" - "\trsbne %2, %2, #0 \n" - : "=r" (dead1), "=r" (dead2), "=r" (res), - "=r" (dead3), "=r" (dead4), "=r" (dead5) diff --git a/package.bak/speex/Config.in b/package.bak/speex/Config.in deleted file mode 100644 index f18e866f1b..0000000000 --- a/package.bak/speex/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_SPEEX - bool "speex" - select BR2_PACKAGE_LIBOGG - help - Speex is an Open Source/Free Software patent-free - audio compression format designed for speech. - It can be used for Voice over IP - - http://www.speex.org/ - -if BR2_PACKAGE_SPEEX - -config BR2_PACKAGE_SPEEX_ARM4 - bool - default y - depends on BR2_ARM_CPU_ARMV4 - -config BR2_PACKAGE_SPEEX_ARM5E - default y - bool - depends on BR2_arm && !BR2_PACKAGE_SPEEX_ARM4 - -endif diff --git a/package.bak/speex/speex.hash b/package.bak/speex/speex.hash deleted file mode 100644 index c38a0a7b22..0000000000 --- a/package.bak/speex/speex.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/speex/SHA256SUMS.txt -sha256 342f30dc57bd4a6dad41398365baaa690429660b10d866b7d508e8f1179cb7a6 speex-1.2rc1.tar.gz diff --git a/package.bak/speex/speex.mk b/package.bak/speex/speex.mk deleted file mode 100644 index a34bfaca89..0000000000 --- a/package.bak/speex/speex.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# speex -# -################################################################################ - -SPEEX_VERSION = 1.2rc1 -SPEEX_SITE = http://downloads.us.xiph.org/releases/speex -SPEEX_LICENSE = BSD-3c -SPEEX_LICENSE_FILES = COPYING - -SPEEX_INSTALL_STAGING = YES -SPEEX_DEPENDENCIES = libogg -SPEEX_CONF_OPTS = \ - --with-ogg-libraries=$(STAGING_DIR)/usr/lib \ - --with-ogg-includes=$(STAGING_DIR)/usr/include \ - --enable-fixed-point - -ifeq ($(BR2_PACKAGE_SPEEX_ARM4),y) -SPEEX_CONF_OPTS += --enable-arm4-asm -endif - -ifeq ($(BR2_PACKAGE_SPEEX_ARM5E),y) -SPEEX_CONF_OPTS += --enable-arm5e-asm -endif - -define SPEEX_LIBTOOL_FIXUP - $(SED) 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' $(@D)/libtool - $(SED) 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' $(@D)/libtool -endef - -SPEEX_POST_CONFIGURE_HOOKS += SPEEX_LIBTOOL_FIXUP - -define SPEEX_BUILD_CMDS - $($(PKG)_MAKE_ENV) $(MAKE) $($(PKG)_MAKE_OPTS) -C $(@D)/$($(PKG)_SUBDIR) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/sphinxbase/Config.in b/package.bak/sphinxbase/Config.in deleted file mode 100644 index 00a19f6178..0000000000 --- a/package.bak/sphinxbase/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_SPHINXBASE - bool "sphinxbase" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - CMUSphinx toolkit is a leading speech recognition toolkit - with various tools used to build speech applications. CMU - Sphinx toolkit has a number of packages for different tasks - and applications. - - http://cmusphinx.sourceforge.net/ - -comment "sphinxbase needs a toolchain with threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/sphinxbase/sphinxbase.hash b/package.bak/sphinxbase/sphinxbase.hash deleted file mode 100644 index 9fbb6dfd79..0000000000 --- a/package.bak/sphinxbase/sphinxbase.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 06971dbe272d2f73bde0ef7b3538c0c8f8ea885cb171fd6b17a5975bced66e64 sphinxbase-5prealpha.tar.gz diff --git a/package.bak/sphinxbase/sphinxbase.mk b/package.bak/sphinxbase/sphinxbase.mk deleted file mode 100644 index 5c87c89a43..0000000000 --- a/package.bak/sphinxbase/sphinxbase.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# sphinxbase -# -################################################################################ - -SPHINXBASE_VERSION = 5prealpha -SPHINXBASE_SITE = http://downloads.sourceforge.net/project/cmusphinx/sphinxbase/5prealpha -SPHINXBASE_LICENSE = BSD-2c -# Note http://sourceforge.net/p/cmusphinx/bugs/441/ "LICENSE file missing in" -# 5prealpha tarballs". The license is contained in the copyright notice at the -# top of each source file. For example: -SPHINXBASE_LICENSE_FILES = src/libsphinxbase/util/bio.c - -SPHINXBASE_DEPENDENCIES = host-bison - -SPHINXBASE_CONF_OPTS = --without-python --without-lapack - -$(eval $(autotools-package)) diff --git a/package.bak/spi-tools/Config.in b/package.bak/spi-tools/Config.in deleted file mode 100644 index 8d2634444a..0000000000 --- a/package.bak/spi-tools/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_SPI_TOOLS - bool "spi-tools" - help - This package contains some simple command line tools to help - using Linux spidev devices. - - https://github.com/cpb-/spi-tools diff --git a/package.bak/spi-tools/spi-tools.hash b/package.bak/spi-tools/spi-tools.hash deleted file mode 100644 index 25c73814ba..0000000000 --- a/package.bak/spi-tools/spi-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 72a6c4a9d13011addc61bc3906543cd06f76f567270ae4b6ca4d0115fd6a9538 spi-tools-0.8.1.tar.gz diff --git a/package.bak/spi-tools/spi-tools.mk b/package.bak/spi-tools/spi-tools.mk deleted file mode 100644 index 384ae41e68..0000000000 --- a/package.bak/spi-tools/spi-tools.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# spi-tools -# -################################################################################ - -SPI_TOOLS_VERSION = 0.8.1 -SPI_TOOLS_SITE = $(call github,cpb-,spi-tools,$(SPI_TOOLS_VERSION)) -# autoreconf must be run as specified in package documentation -SPI_TOOLS_AUTORECONF = YES -SPI_TOOLS_LICENSE = GPLv2 -SPI_TOOLS_LICENSE_FILES = LICENSE - -$(eval $(autotools-package)) diff --git a/package.bak/spice-protocol/Config.in b/package.bak/spice-protocol/Config.in deleted file mode 100644 index 63b08aa090..0000000000 --- a/package.bak/spice-protocol/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_SPICE_PROTOCOL - bool "spice protocol" - help - The Spice project aims to provide a complete open source - solution for interaction with virtualized desktop devices. - The Spice project deals with both the virtualized devices - and the front-end. Interaction between front-end and - back-end is done using VD-Interfaces. - - This package implements the protocol-part of Spice. - - http://www.spice-space.org/ diff --git a/package.bak/spice-protocol/spice-protocol.hash b/package.bak/spice-protocol/spice-protocol.hash deleted file mode 100644 index c75c095cbf..0000000000 --- a/package.bak/spice-protocol/spice-protocol.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 788f0d7195bec5b14371732b562eb55ca82712aab12273b0e87529fb30532efb spice-protocol-0.12.10.tar.bz2 diff --git a/package.bak/spice-protocol/spice-protocol.mk b/package.bak/spice-protocol/spice-protocol.mk deleted file mode 100644 index 4e81e6cd7b..0000000000 --- a/package.bak/spice-protocol/spice-protocol.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# spice-protocol -# -################################################################################ - -SPICE_PROTOCOL_VERSION = 0.12.10 -SPICE_PROTOCOL_SOURCE = spice-protocol-$(SPICE_PROTOCOL_VERSION).tar.bz2 -SPICE_PROTOCOL_SITE = http://www.spice-space.org/download/releases -SPICE_PROTOCOL_LICENSE = BSD-3c -SPICE_PROTOCOL_LICENSE_FILES = COPYING -SPICE_PROTOCOL_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/spice/0001-fix-missing-monitor_latency-argument.patch b/package.bak/spice/0001-fix-missing-monitor_latency-argument.patch deleted file mode 100644 index e14dd2ce37..0000000000 --- a/package.bak/spice/0001-fix-missing-monitor_latency-argument.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0d3767853ca179ce04a9b312d7a30d33d1266a3b Mon Sep 17 00:00:00 2001 -From: Axel Lin -Date: Thu, 10 Oct 2013 12:36:40 +0800 -Subject: [PATCH] red_tunnel_worker: Fix build error due to missing monitor_latency argument - -Fix missing monitor_latency argument in red_channel_client_create call. - -Signed-off-by: Axel Lin ---- - server/red_tunnel_worker.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/server/red_tunnel_worker.c b/server/red_tunnel_worker.c -index 97dcafd..6781d73 100644 ---- a/server/red_tunnel_worker.c -+++ b/server/red_tunnel_worker.c -@@ -3417,7 +3417,7 @@ static void handle_tunnel_channel_link(RedChannel *channel, RedClient *client, - } - - tcc = (TunnelChannelClient*)red_channel_client_create(sizeof(TunnelChannelClient), -- channel, client, stream, -+ channel, client, stream, FALSE, - 0, NULL, 0, NULL); - if (!tcc) { - return; --- -1.8.1.2 - diff --git a/package.bak/spice/Config.in b/package.bak/spice/Config.in deleted file mode 100644 index bde3a92859..0000000000 --- a/package.bak/spice/Config.in +++ /dev/null @@ -1,70 +0,0 @@ -comment "spice server needs a toolchain w/ wchar, threads" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - -comment "spice server depends on python (for pyparsing)" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_PYTHON - -config BR2_PACKAGE_SPICE - bool "spice server" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_PYTHON - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_CELT051 - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_PYTHON_PYPARSING - select BR2_PACKAGE_SPICE_PROTOCOL - help - The Spice project aims to provide a complete open source - solution for interaction with virtualized desktop devices. - The Spice project deals with both the virtualized devices - and the front-end. Interaction between front-end and - back-end is done using VD-Interfaces. - - This package implements the server-part of Spice. - - http://www.spice-space.org/ - -if BR2_PACKAGE_SPICE - -comment "client depends on X.org" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_SPICE_CLIENT - bool "Enable client" - depends on BR2_PACKAGE_XORG7 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRANDR - -comment "client needs a toolchain w/ threads, C++" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_SPICE_GUI - bool "Enable GUI" - depends on BR2_PACKAGE_SPICE_CLIENT - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_CEGUI06 - help - Say 'y' here to enable the Graphical User Interface (GUI) - start dialog. - -comment "gui needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_SPICE_TUNNEL - bool "Enable network redirection" - select BR2_PACKAGE_SLIRP - help - Say 'y' here to enable network redirection, aka tunnelling - through a SLIP/SLIRP session. - -endif # BR2_PACKAGE_SPICE diff --git a/package.bak/spice/spice.hash b/package.bak/spice/spice.hash deleted file mode 100644 index c4d63198fb..0000000000 --- a/package.bak/spice/spice.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 cf063e7df42e331a835529d2f613d8a01f8cb2963e8edaadf73a8d65c46fb387 spice-0.12.4.tar.bz2 diff --git a/package.bak/spice/spice.mk b/package.bak/spice/spice.mk deleted file mode 100644 index 61a977225e..0000000000 --- a/package.bak/spice/spice.mk +++ /dev/null @@ -1,81 +0,0 @@ -################################################################################ -# -# spice -# -################################################################################ - -SPICE_VERSION = 0.12.4 -SPICE_SOURCE = spice-$(SPICE_VERSION).tar.bz2 -SPICE_SITE = http://www.spice-space.org/download/releases -SPICE_LICENSE = LGPLv2.1+ -SPICE_LICENSE_FILES = COPYING -SPICE_INSTALL_STAGING = YES -SPICE_DEPENDENCIES = \ - alsa-lib \ - celt051 \ - jpeg \ - libglib2 \ - openssl \ - pixman \ - python-pyparsing \ - spice-protocol \ - -# We disable everything for now, because the dependency tree can become -# quite deep if we try to enable some features, and I have not tested that. -SPICE_CONF_OPTS = \ - --disable-opengl \ - --disable-smartcard \ - --disable-automated-tests \ - --without-sasl \ - -SPICE_DEPENDENCIES += host-pkgconf - -ifeq ($(BR2_PACKAGE_SPICE_CLIENT),y) -SPICE_CONF_OPTS += --enable-client -SPICE_DEPENDENCIES += xlib_libXfixes xlib_libXrandr -else -SPICE_CONF_OPTS += --disable-client -endif - -ifeq ($(BR2_PACKAGE_SPICE_GUI),y) -SPICE_CONF_OPTS += --enable-gui -SPICE_DEPENDENCIES += cegui06 -else -SPICE_CONF_OPTS += --disable-gui -endif - -ifeq ($(BR2_PACKAGE_SPICE_TUNNEL),y) -SPICE_CONF_OPTS += --enable-tunnel -SPICE_DEPENDENCIES += slirp -else -SPICE_CONF_OPTS += --disable-tunnel -endif - -SPICE_CONF_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages -SPICE_MAKE_ENV = PYTHONPATH=$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages - -# We need to tweak spice.pc because it /forgets/ (for static linking) that -# it should link against libz and libjpeg. libz is pkg-config-aware, while -# libjpeg isn't, hence the two-line tweak -define SPICE_POST_INSTALL_STAGING_FIX_PC - $(SED) 's/^\(Requires.private:.*\)$$/\1 zlib/; s/^\(Libs.private:.*\)$$/\1 -ljpeg/;' \ - "$(STAGING_DIR)/usr/lib/pkgconfig/spice-server.pc" -endef -SPICE_POST_INSTALL_STAGING_HOOKS += SPICE_POST_INSTALL_STAGING_FIX_PC - -# It is currently not possible to detect if stack-protection is available -# or not, because it requires support from both the compiler *and* the -# C library, but the C library (eg. uClibc) can be compiled without that -# support, even if gcc accepts the -fstack-protector-all option. -# spice's ./configure only checks for gcc's -fstack-protector-all option, -# so it misses the case where the C library doe not provide the requires -# support. -# A correct fix would be to fix spice's ./configure to also check the C -# library, but it might be much more involved. -# So, we simply disable it for now. After all, as uClibc's help puts it: -# Note that NOEXECSTACK on a kernel with address space randomization -# is generally sufficient to prevent most buffer overflow exploits -# without increasing code size. -SPICE_CONF_OPTS += gl_cv_warn__fstack_protector_all=no - -$(eval $(autotools-package)) diff --git a/package.bak/spidev_test/Config.in b/package.bak/spidev_test/Config.in deleted file mode 100644 index 0d8214cc29..0000000000 --- a/package.bak/spidev_test/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_SPIDEV_TEST - bool "spidev_test" - help - SPI testing utility (using spidev driver). - - This package builds and installs the userspace 'spidev_test' - command. It is up to the user to ensure that the kernel - configuration has all suitable options enabled to allow a - proper operation of 'spidev_test'. - - The version used is based on your toolchain headers version, - if it's older than 3.15 then 3.0 is used, otherwise 3.15 - is used. - This means you won't have quad-pumped SPI support if your - toolchain is too old. - - https://www.kernel.org/doc/Documentation/spi/spidev_test.c diff --git a/package.bak/spidev_test/spidev_test.hash b/package.bak/spidev_test/spidev_test.hash deleted file mode 100644 index 6871288ccc..0000000000 --- a/package.bak/spidev_test/spidev_test.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated -sha256 80471c330d8c0bf5ba6479c434a54a54bdd2dc59a703b9c76c2541ec04cfb8c3 spidev_test.c?id=v3.0 -sha256 57fa6c534e0b7b4d234075e18bc89e2f3c9fc4ecc27e80f349a8057708e0de46 spidev_test.c?id=v3.15 diff --git a/package.bak/spidev_test/spidev_test.mk b/package.bak/spidev_test/spidev_test.mk deleted file mode 100644 index 52441bb3da..0000000000 --- a/package.bak/spidev_test/spidev_test.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# spidev_test -# -################################################################################ - -# v3.15+ requires SPI_TX_QUAD/SPI_RX_QUAD to build -# Normally kernel headers can't be newer than kernel so switch based on that. -# If you need quad-pumped spi support you need to upgrade your toolchain. -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_15),y) -SPIDEV_TEST_VERSION = v3.15 -else -SPIDEV_TEST_VERSION = v3.0 -endif -SPIDEV_TEST_SITE = http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/Documentation/spi -SPIDEV_TEST_SOURCE = spidev_test.c?id=$(SPIDEV_TEST_VERSION) -SPIDEV_TEST_LICENSE = GPLv2 - -# musl libc requires linux/ioctl.h for _IOC_SIZEBITS. Do a sed patch to keep -# compatibility with different spidev_test.c versions that we support. -define SPIDEV_ADD_LINUX_IOCTL - $(SED) 's~^#include ~#include \n#include ~' \ - $(@D)/spidev_test.c -endef - -SPIDEV_TEST_POST_PATCH_HOOKS += SPIDEV_ADD_LINUX_IOCTL - -define SPIDEV_TEST_EXTRACT_CMDS - cp $(BR2_DL_DIR)/$(SPIDEV_TEST_SOURCE) $(@D)/spidev_test.c -endef - -define SPIDEV_TEST_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CC) $(TARGET_CFLAGS) \ - -o $(@D)/spidev_test $(@D)/spidev_test.c -endef - -define SPIDEV_TEST_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/spidev_test \ - $(TARGET_DIR)/usr/sbin/spidev_test -endef - -$(eval $(generic-package)) diff --git a/package.bak/sqlcipher/Config.in b/package.bak/sqlcipher/Config.in deleted file mode 100644 index 98b2f8955d..0000000000 --- a/package.bak/sqlcipher/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_SQLCIPHER - bool "sqlcipher" - depends on !BR2_PACKAGE_SQLITE - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_OPENSSL - help - SQLCipher is an SQLite extension that provides 256 bits AES - encryption of database files. Note that it is a fork of SQLite - and they cannot be installed side-by-side. - - http://sqlcipher.net - -if BR2_PACKAGE_SQLCIPHER - -config BR2_PACKAGE_SQLCIPHER_READLINE - bool "Command-line editing" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_READLINE - help - Enable command-line editing. This requires ncurses and readline. - -config BR2_PACKAGE_SQLCIPHER_STAT3 - bool "Additional query optimizations (stat3)" - help - Adds additional logic to the ANALYZE command and to the query - planner that can help SQLite to choose a better query plan under - certain situations. - -endif - -comment "sqlcipher conflicts with sqlite" - depends on BR2_PACKAGE_SQLITE - -comment "sqlcipher needs a toolchain w/ threads" - depends on !BR2_PACKAGE_SQLITE - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/sqlcipher/sqlcipher.hash b/package.bak/sqlcipher/sqlcipher.hash deleted file mode 100644 index f3c7e0bd9c..0000000000 --- a/package.bak/sqlcipher/sqlcipher.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 25fa4f4cb38dcf9e52e4d1f46be8fee9c7aaef35b6df96912a216b289e22c2af sqlcipher-v3.2.0.tar.gz diff --git a/package.bak/sqlcipher/sqlcipher.mk b/package.bak/sqlcipher/sqlcipher.mk deleted file mode 100644 index 196f16275b..0000000000 --- a/package.bak/sqlcipher/sqlcipher.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# sqlcipher -# -################################################################################ - -SQLCIPHER_VERSION = v3.2.0 -SQLCIPHER_SITE = $(call github,sqlcipher,sqlcipher,$(SQLCIPHER_VERSION)) -SQLCIPHER_DEPENDENCIES = openssl host-tcl -SQLCIPHER_INSTALL_STAGING = YES - -SQLCIPHER_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) $(SQLCIPHER_CFLAGS)" \ - TCLSH_CMD=$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR) - -SQLCIPHER_CONF_OPTS = \ - --enable-threadsafe \ - --disable-tcl - -SQLCIPHER_CFLAGS += -DSQLITE_HAS_CODEC # Required according to the README -SQLCIPHER_CONF_ENV += LIBS="-lcrypto -lz" - -ifeq ($(BR2_PACKAGE_SQLCIPHER_STAT3),y) -SQLCIPHER_CFLAGS += -DSQLITE_ENABLE_STAT3 -endif - -ifeq ($(BR2_PACKAGE_SQLCIPHER_READLINE),y) -SQLCIPHER_DEPENDENCIES += ncurses readline -SQLCIPHER_CONF_OPTS += --with-readline-inc="-I$(STAGING_DIR)/usr/include" -else -SQLCIPHER_CONF_OPTS += --disable-readline -endif - -$(eval $(autotools-package)) diff --git a/package.bak/sqlite/Config.in b/package.bak/sqlite/Config.in deleted file mode 100644 index c9fde53b36..0000000000 --- a/package.bak/sqlite/Config.in +++ /dev/null @@ -1,58 +0,0 @@ -config BR2_PACKAGE_SQLITE - bool "sqlite" - help - SQLite is a small C library that implements a self-contained, - embeddable, zero-configuration SQL database engine. - - http://www.sqlite.org/ - -if BR2_PACKAGE_SQLITE - -config BR2_PACKAGE_SQLITE_STAT3 - bool "Additional query optimizations (stat3)" - help - Adds additional logic to the ANALYZE command and to the query - planner that can help SQLite to choose a better query plan under - certain situations. - -config BR2_PACKAGE_SQLITE_ENABLE_FTS3 - bool "Enable version 3 of the full-text search engine" - help - When this option is defined in the amalgamation - (see http://www.sqlite.org/amalgamation.html), version 3 of - the full-text search engine is added to the build automatically. - -config BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY - bool "Enable sqlite3_unlock_notify() interface" - help - This option enables the sqlite3_unlock_notify() interface and its - accosiated functionality. See the documentation - http://www.sqlite.org/unlock_notify.html for additional information. - -config BR2_PACKAGE_SQLITE_SECURE_DELETE - bool "Set the secure_delete pragma on by default" - help - This compile-time option changes the default settings of the - secure_delete pragma. When this option is not used, secure_delete - defaults to off. When this option is present, secure_delete defaults - to on. - - The secure_delete setting causes deleted content to be overwritten - with zeros. There is a small performance penalty for this since - additional I/O must occur. On the other hand, secure_delete can - prevent sensitive information from lingering in unused parts - of the database file after it has allegedly been deleted. - See the documentation on the - http://www.sqlite.org/pragma.html#pragma_secure_delete - for additional information. - -config BR2_PACKAGE_SQLITE_NO_SYNC - bool "Disable fsync" - help - By default SQLite forces all database transactions to storage - immediately using fsync() to protect against data loss in case - of power failure. - This option turns this behavior off resulting in higher performance - especially when using slow flash storage. - -endif diff --git a/package.bak/sqlite/sqlite.hash b/package.bak/sqlite/sqlite.hash deleted file mode 100644 index bb3707da5e..0000000000 --- a/package.bak/sqlite/sqlite.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.sqlite.org/download.html -sha1 64ca578ad44a94115b1db0406740e14288f74bb8 sqlite-autoconf-3160200.tar.gz -# Calculated based on the hash above -sha256 65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615 sqlite-autoconf-3160200.tar.gz diff --git a/package.bak/sqlite/sqlite.mk b/package.bak/sqlite/sqlite.mk deleted file mode 100644 index 790caaf4df..0000000000 --- a/package.bak/sqlite/sqlite.mk +++ /dev/null @@ -1,59 +0,0 @@ -################################################################################ -# -# sqlite -# -################################################################################ - -SQLITE_VERSION = 3160200 -SQLITE_SOURCE = sqlite-autoconf-$(SQLITE_VERSION).tar.gz -SQLITE_SITE = http://www.sqlite.org/2017 -SQLITE_LICENSE = Public domain -SQLITE_LICENSE_FILES = tea/license.terms -SQLITE_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_SQLITE_STAT3),y) -SQLITE_CFLAGS += -DSQLITE_ENABLE_STAT3 -endif - -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_FTS3),y) -SQLITE_CFLAGS += -DSQLITE_ENABLE_FTS3 -endif - -ifeq ($(BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY),y) -SQLITE_CFLAGS += -DSQLITE_ENABLE_UNLOCK_NOTIFY -endif - -ifeq ($(BR2_PACKAGE_SQLITE_SECURE_DELETE),y) -SQLITE_CFLAGS += -DSQLITE_SECURE_DELETE -endif - -ifeq ($(BR2_PACKAGE_SQLITE_NO_SYNC),y) -SQLITE_CFLAGS += -DSQLITE_NO_SYNC -endif - -SQLITE_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) $(SQLITE_CFLAGS)" - -ifeq ($(BR2_STATIC_LIBS),y) -SQLITE_CONF_OPTS += --enable-dynamic-extensions=no -else -SQLITE_CONF_OPTS += --disable-static-shell -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -SQLITE_CONF_OPTS += --enable-threadsafe -else -SQLITE_CONF_OPTS += --disable-threadsafe -endif - -ifeq ($(BR2_PACKAGE_NCURSES)$(BR2_PACKAGE_READLINE),yy) -SQLITE_DEPENDENCIES += ncurses readline -SQLITE_CONF_OPTS += --disable-editline --enable-readline -else ifeq ($(BR2_PACKAGE_LIBEDIT),y) -SQLITE_DEPENDENCIES += libedit -SQLITE_CONF_OPTS += --enable-editline --disable-readline -else -SQLITE_CONF_OPTS += --disable-editline --disable-readline -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/squashfs/0001-musl.patch b/package.bak/squashfs/0001-musl.patch deleted file mode 100644 index 891b1717a2..0000000000 --- a/package.bak/squashfs/0001-musl.patch +++ /dev/null @@ -1,71 +0,0 @@ -Fix musl build - -Downloaded from -http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-devtools/squashfs-tools/squashfs-tools/fix-compat.patch -and adjusted paths. - -Signed-off-by: Bernd Kuhls - -Define FNM_EXTMATCH if not defined its glibc specific define -include missing sys/stat.h for stat* function declarations - -Upstream-Status: Pending -Signed-off-by: Khem Raj - -Index: squashfs-tools/action.c -=================================================================== ---- a/squashfs-tools.orig/action.c -+++ b/squashfs-tools/action.c -@@ -44,6 +44,10 @@ - #include "action.h" - #include "error.h" - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - /* - * code to parse actions - */ -Index: squashfs-tools/mksquashfs.c -=================================================================== ---- a/squashfs-tools.orig/mksquashfs.c -+++ b/squashfs-tools/mksquashfs.c -@@ -1286,6 +1286,10 @@ void write_dir(squashfs_inode *inode, st - dir_size + 3, directory_block, directory_offset, NULL, NULL, - dir, 0); - -+#if !defined(FNM_EXTMATCH) -+#define FNM_EXTMATCH 0 -+#endif -+ - #ifdef SQUASHFS_TRACE - { - unsigned char *dirp; -Index: squashfs-tools/pseudo.c -=================================================================== ---- a/squashfs-tools.orig/pseudo.c -+++ b/squashfs-tools/pseudo.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - - #include "pseudo.h" -Index: squashfs-tools/unsquashfs.c -=================================================================== ---- a/squashfs-tools.orig/unsquashfs.c -+++ b/squashfs-tools/unsquashfs.c -@@ -38,6 +38,10 @@ - #include - #include - -+#ifndef FNM_EXTMATCH -+#define FNM_EXTMATCH 0 -+#endif -+ - struct cache *fragment_cache, *data_cache; - struct queue *to_reader, *to_inflate, *to_writer, *from_writer; - pthread_t *thread, *inflator_thread; diff --git a/package.bak/squashfs/Config.in b/package.bak/squashfs/Config.in deleted file mode 100644 index 70c0fc9808..0000000000 --- a/package.bak/squashfs/Config.in +++ /dev/null @@ -1,48 +0,0 @@ -config BR2_PACKAGE_SQUASHFS - bool "squashfs" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_SQUASHFS_GZIP if !(BR2_PACKAGE_SQUASHFS_LZMA || BR2_PACKAGE_SQUASHFS_LZO) - help - Tools to generate SquashFS filesystems. - - http://squashfs.sourceforge.net/ - -if BR2_PACKAGE_SQUASHFS - -config BR2_PACKAGE_SQUASHFS_GZIP - bool "gzip support" - default y - select BR2_PACKAGE_ZLIB - help - Support GZIP compression algorithm - -config BR2_PACKAGE_SQUASHFS_LZ4 - bool "lz4 support" - select BR2_PACKAGE_LZ4 - help - Support LZ4 compression algorithm - -config BR2_PACKAGE_SQUASHFS_LZMA - bool "lzma support" - select BR2_PACKAGE_XZ - help - Support LZMA compression algorithm - -config BR2_PACKAGE_SQUASHFS_LZO - bool "lzo support" - select BR2_PACKAGE_LZO - help - Support LZO compression algorithm - -config BR2_PACKAGE_SQUASHFS_XZ - bool "xz support" - select BR2_PACKAGE_XZ - help - Support XZ compression algorithm - -endif - -comment "squashfs needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU diff --git a/package.bak/squashfs/Config.in.host b/package.bak/squashfs/Config.in.host deleted file mode 100644 index b353374dd0..0000000000 --- a/package.bak/squashfs/Config.in.host +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HOST_SQUASHFS - bool "host squashfs" - help - Tools to generate SquashFS filesystems. - - http://squashfs.sourceforge.net/ diff --git a/package.bak/squashfs/squashfs.hash b/package.bak/squashfs/squashfs.hash deleted file mode 100644 index eb456be364..0000000000 --- a/package.bak/squashfs/squashfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e807202ab4dcfeea214df49d3a728b9a85644a7e7262fc6fcd875a0def99d4ed squashfs-9c1db6d13a51a2e009f0027ef336ce03624eac0d.tar.gz diff --git a/package.bak/squashfs/squashfs.mk b/package.bak/squashfs/squashfs.mk deleted file mode 100644 index 4f84872319..0000000000 --- a/package.bak/squashfs/squashfs.mk +++ /dev/null @@ -1,88 +0,0 @@ -################################################################################ -# -# squashfs -# -################################################################################ - -SQUASHFS_VERSION = 3de1687d7432ea9b302c2db9521996f506c140a3 -SQUASHFS_SITE = https://git.kernel.org/pub/scm/fs/squashfs/squashfs-tools.git -SQUASHFS_SITE_METHOD = git -SQUASHFS_LICENSE = GPLv2+ -SQUASHFS_LICENSE_FILES = COPYING -SQUASHFS_MAKE_ARGS = XATTR_SUPPORT=1 - -ifeq ($(BR2_PACKAGE_SQUASHFS_LZ4),y) -SQUASHFS_DEPENDENCIES += lz4 -SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=1 COMP_DEFAULT=lz4 -else -SQUASHFS_MAKE_ARGS += LZ4_SUPPORT=0 -endif - -ifeq ($(BR2_PACKAGE_SQUASHFS_LZMA),y) -SQUASHFS_DEPENDENCIES += xz -SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=1 COMP_DEFAULT=lzma -else -SQUASHFS_MAKE_ARGS += LZMA_XZ_SUPPORT=0 -endif - -ifeq ($(BR2_PACKAGE_SQUASHFS_XZ),y) -SQUASHFS_DEPENDENCIES += xz -SQUASHFS_MAKE_ARGS += XZ_SUPPORT=1 COMP_DEFAULT=xz -else -SQUASHFS_MAKE_ARGS += XZ_SUPPORT=0 -endif - -ifeq ($(BR2_PACKAGE_SQUASHFS_LZO),y) -SQUASHFS_DEPENDENCIES += lzo -SQUASHFS_MAKE_ARGS += LZO_SUPPORT=1 COMP_DEFAULT=lzo -else -SQUASHFS_MAKE_ARGS += LZO_SUPPORT=0 -endif - -ifeq ($(BR2_PACKAGE_SQUASHFS_GZIP),y) -SQUASHFS_DEPENDENCIES += zlib -SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=1 COMP_DEFAULT=gzip -else -SQUASHFS_MAKE_ARGS += GZIP_SUPPORT=0 -endif - -HOST_SQUASHFS_DEPENDENCIES = host-zlib host-lz4 host-lzo host-xz - -HOST_SQUASHFS_MAKE_ARGS = \ - XATTR_SUPPORT=1 \ - XZ_SUPPORT=1 \ - GZIP_SUPPORT=1 \ - LZ4_SUPPORT=1 \ - LZO_SUPPORT=1 \ - LZMA_XZ_SUPPORT=1 - -define SQUASHFS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - CC="$(TARGET_CC)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - $(SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ -endef - -define SQUASHFS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ INSTALL_DIR=$(TARGET_DIR)/usr/bin install -endef - -define HOST_SQUASHFS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) \ - CC="$(HOSTCC)" \ - EXTRA_CFLAGS="$(HOST_CFLAGS)" \ - EXTRA_LDFLAGS="$(HOST_LDFLAGS)" \ - $(HOST_SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ -endef - -define HOST_SQUASHFS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_SQUASHFS_MAKE_ARGS) \ - -C $(@D)/squashfs-tools/ INSTALL_DIR=$(HOST_DIR)/usr/bin install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch b/package.bak/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch deleted file mode 100644 index 2f002a80bc..0000000000 --- a/package.bak/squeezelite/0001-Makefile-allow-passing-CFLAGS-and-LDFLAGS.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a0f2e79d1373967dac9f3df4c500a71cd1b96b2b Mon Sep 17 00:00:00 2001 -From: Hiroshi Kawashima -Date: Sun, 7 Feb 2016 18:04:53 +0100 -Subject: [PATCH] Makefile: allow passing CFLAGS and LDFLAGS - -This patch is applied to squeezelite Makefile to add override -directive for CFLAGS and LDFLAGS assignment. -This enables adding flags to CFLAGS and LDFLAGS in Makefile. - -Signed-off-by: Hiroshi Kawashima ---- - Makefile | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index dca2abd..286c725 100644 ---- a/Makefile -+++ b/Makefile -@@ -1,4 +1,6 @@ - # Cross compile support - create a Makefile which defines these three variables and then includes this Makefile... -+override CFLAGS += $(OPTS) -+override LDFLAGS += -lasound -lpthread -lm -lrt - CFLAGS ?= -Wall -fPIC -O2 $(OPTS) - LDFLAGS ?= -lasound -lpthread -lm -lrt - EXECUTABLE ?= squeezelite -@@ -52,20 +54,20 @@ endif - - # add optional link options - ifneq (,$(findstring $(OPT_LINKALL), $(CFLAGS))) -- LDFLAGS += $(LINKALL) -+ override LDFLAGS += $(LINKALL) - ifneq (,$(findstring $(OPT_FF), $(CFLAGS))) -- LDFLAGS += $(LINKALL_FF) -+ override LDFLAGS += $(LINKALL_FF) - endif - ifneq (,$(findstring $(OPT_RESAMPLE), $(CFLAGS))) -- LDFLAGS += $(LINKALL_RESAMPLE) -+ override LDFLAGS += $(LINKALL_RESAMPLE) - endif - ifneq (,$(findstring $(OPT_IR), $(CFLAGS))) -- LDFLAGS += $(LINKALL_IR) -+ override LDFLAGS += $(LINKALL_IR) - endif - else - # if not LINKALL and linux add LINK_LINUX - ifeq ($(UNAME), Linux) -- LDFLAGS += $(LINK_LINUX) -+ override LDFLAGS += $(LINK_LINUX) - endif - endif - --- -2.6.4 - diff --git a/package.bak/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch b/package.bak/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch deleted file mode 100644 index 6962b7b8fd..0000000000 --- a/package.bak/squeezelite/0002-output_alsa-use-mallopt-only-on-glibc.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 903922a7bcf06e04d9830b47bba6d65ed37304c1 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 7 Feb 2016 18:05:56 +0100 -Subject: [PATCH] output_alsa: use mallopt() only on glibc - -The musl C library does not provide the glibc specific mallopt() -functionality, so use it only when __GLIBC__ is defined. - -uClibc pretends to be glibc by defining __GLIBC__, but it implements -mallopt(), so it works fine. - -Signed-off-by: Thomas Petazzoni ---- - output_alsa.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/output_alsa.c b/output_alsa.c -index aa01560..44c9fc7 100644 ---- a/output_alsa.c -+++ b/output_alsa.c -@@ -862,8 +862,10 @@ void output_init_alsa(log_level level, const char *device, unsigned output_buf_s - LOG_INFO("memory locked"); - } - -+#ifdef __GLIBC__ - mallopt(M_TRIM_THRESHOLD, -1); - mallopt(M_MMAP_MAX, 0); -+#endif - - touch_memory(silencebuf, MAX_SILENCE_FRAMES * BYTES_PER_FRAME); - touch_memory(outputbuf->buf, outputbuf->size); --- -2.6.4 - diff --git a/package.bak/squeezelite/0003-ffmpeg_2_9.patch b/package.bak/squeezelite/0003-ffmpeg_2_9.patch deleted file mode 100644 index f69b829b38..0000000000 --- a/package.bak/squeezelite/0003-ffmpeg_2_9.patch +++ /dev/null @@ -1,57 +0,0 @@ -Fix compilation with ffmpeg >= 2.9 - -Downloaded from Debian: -https://sources.debian.net/src/squeezelite/1.8-3/debian/patches/ffmpeg_2.9.patch/ - -Signed-off-by: Bernd Kuhls - - -Description: Replace deprecated FFmpeg API -Author: Andreas Cadhalpun -Last-Update: <2015-11-02> - ---- squeezelite-1.8.orig/ffmpeg.c -+++ squeezelite-1.8/ffmpeg.c -@@ -52,8 +52,8 @@ struct ff_s { - unsigned (* avcodec_version)(void); - AVCodec * (* avcodec_find_decoder)(int); - int attribute_align_arg (* avcodec_open2)(AVCodecContext *, const AVCodec *, AVDictionary **); -- AVFrame * (* avcodec_alloc_frame)(void); -- void (* avcodec_free_frame)(AVFrame **); -+ AVFrame * (* av_frame_alloc)(void); -+ void (* av_frame_free)(AVFrame **); - int attribute_align_arg (* avcodec_decode_audio4)(AVCodecContext *, AVFrame *, int *, const AVPacket *); - // ffmpeg symbols to be dynamically loaded from libavformat - unsigned (* avformat_version)(void); -@@ -324,7 +324,7 @@ static decode_state ff_decode(void) { - - AVCODEC(ff, open2, ff->codecC, codec, NULL); - -- ff->frame = AVCODEC(ff, alloc_frame); -+ ff->frame = AV(ff, frame_alloc); - - ff->avpkt = AV(ff, malloc, sizeof(AVPacket)); - if (ff->avpkt == NULL) { -@@ -520,9 +520,9 @@ static void _free_ff_data(void) { - if (ff->frame) { - // ffmpeg version dependant free function - #if !LINKALL -- ff->avcodec_free_frame ? AVCODEC(ff, free_frame, &ff->frame) : AV(ff, freep, &ff->frame); -+ ff->av_frame_free ? AV(ff, frame_free, &ff->frame) : AV(ff, freep, &ff->frame); - #elif LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,28,0) -- AVCODEC(ff, free_frame, &ff->frame); -+ AV(ff, frame_free, &ff->frame); - #else - AV(ff, freep, &ff->frame); - #endif -@@ -607,8 +607,8 @@ static bool load_ff() { - ff->avcodec_version = dlsym(handle_codec, "avcodec_version"); - ff->avcodec_find_decoder = dlsym(handle_codec, "avcodec_find_decoder"); - ff->avcodec_open2 = dlsym(handle_codec, "avcodec_open2"); -- ff->avcodec_alloc_frame = dlsym(handle_codec, "avcodec_alloc_frame"); -- ff->avcodec_free_frame = dlsym(handle_codec, "avcodec_free_frame"); -+ ff->av_frame_alloc = dlsym(handle_codec, "av_frame_alloc"); -+ ff->av_frame_free = dlsym(handle_codec, "av_frame_free"); - ff->avcodec_decode_audio4 = dlsym(handle_codec, "avcodec_decode_audio4"); - ff->av_init_packet = dlsym(handle_codec, "av_init_packet"); - ff->av_free_packet = dlsym(handle_codec, "av_free_packet"); diff --git a/package.bak/squeezelite/Config.in b/package.bak/squeezelite/Config.in deleted file mode 100644 index 63b9183026..0000000000 --- a/package.bak/squeezelite/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_SQUEEZELITE - bool "squeezelite" - depends on BR2_USE_WCHAR # flac - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU # mpg123 - depends on !BR2_STATIC_LIBS # dlopen - select BR2_PACKAGE_ALSA_LIB - select BR2_PACKAGE_ALSA_LIB_MIXER - select BR2_PACKAGE_FLAC - select BR2_PACKAGE_LIBMAD - select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_FAAD2 - select BR2_PACKAGE_MPG123 - help - Logitech Media Server client - - https://code.google.com/p/squeezelite/ - -if BR2_PACKAGE_SQUEEZELITE - -config BR2_PACKAGE_SQUEEZELITE_FFMPEG - bool "Enable WMA and ALAC decoding" - default y - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - select BR2_PACKAGE_FFMPEG - -config BR2_PACKAGE_SQUEEZELITE_DSD - bool "Enable DSD decoding" - -config BR2_PACKAGE_SQUEEZELITE_RESAMPLE - bool "Enable resampling support" - select BR2_PACKAGE_LIBSOXR - -config BR2_PACKAGE_SQUEEZELITE_VISEXPORT - bool "Enable visualiser support" - -endif - -comment "squeezelite needs a toolchain w/ wchar, NPTL, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || BR2_STATIC_LIBS diff --git a/package.bak/squeezelite/squeezelite.hash b/package.bak/squeezelite/squeezelite.hash deleted file mode 100644 index 1dbb4c155a..0000000000 --- a/package.bak/squeezelite/squeezelite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0c844e7714d3f15325629c59ee75e6309763116e61a6b73486b502e2e5cce5fd squeezelite-v1.8.tar.gz diff --git a/package.bak/squeezelite/squeezelite.mk b/package.bak/squeezelite/squeezelite.mk deleted file mode 100644 index 7a82f4a026..0000000000 --- a/package.bak/squeezelite/squeezelite.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# squeezelite -# -################################################################################ - -SQUEEZELITE_VERSION = v1.8 -SQUEEZELITE_SITE = $(call github,robadenshi,squeezelite,$(SQUEEZELITE_VERSION)) -SQUEEZELITE_LICENSE = GPLv3 -SQUEEZELITE_LICENSE_FILES = LICENSE.txt -SQUEEZELITE_DEPENDENCIES = alsa-lib flac libmad libvorbis faad2 mpg123 -SQUEEZELITE_MAKE_OPTS = -DLINKALL - -ifeq ($(BR2_PACKAGE_SQUEEZELITE_FFMPEG),y) -SQUEEZELITE_DEPENDENCIES += ffmpeg -SQUEEZELITE_MAKE_OPTS += -DFFMPEG -endif - -ifeq ($(BR2_PACKAGE_SQUEEZELITE_DSD),y) -SQUEEZELITE_MAKE_OPTS += -DDSD -endif - -ifeq ($(BR2_PACKAGE_SQUEEZELITE_RESAMPLE),y) -SQUEEZELITE_DEPENDENCIES += libsoxr -SQUEEZELITE_MAKE_OPTS += -DRESAMPLE -endif - -ifeq ($(BR2_PACKAGE_SQUEEZELITE_VISEXPORT),y) -SQUEEZELITE_MAKE_OPTS += -DVISEXPORT -endif - -define SQUEEZELITE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - OPTS="$(SQUEEZELITE_MAKE_OPTS)" -C $(@D) all -endef - -define SQUEEZELITE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/squeezelite \ - $(TARGET_DIR)/usr/bin/squeezelite -endef - -$(eval $(generic-package)) diff --git a/package.bak/squid/0001-assume-get-certificate-ok.patch b/package.bak/squid/0001-assume-get-certificate-ok.patch deleted file mode 100644 index e26b50d7bb..0000000000 --- a/package.bak/squid/0001-assume-get-certificate-ok.patch +++ /dev/null @@ -1,17 +0,0 @@ -The openssl get_certificate working test isn't cross compile friendly. -Just assume it works ok since we're using a modern OpenSSL version. - -Signed-off-by: Gustavo Zacarias - -diff -Nura squid-3.5.1.orig/configure.ac squid-3.5.1/configure.ac ---- squid-3.5.1.orig/configure.ac 2015-01-27 11:09:15.035711981 -0300 -+++ squid-3.5.1/configure.ac 2015-01-27 11:09:25.829084482 -0300 -@@ -1342,7 +1342,7 @@ - AC_DEFINE(USE_OPENSSL,1,[OpenSSL support is available]) - - # check for other specific broken implementations -- SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS -+ #SQUID_CHECK_OPENSSL_GETCERTIFICATE_WORKS - SQUID_CHECK_OPENSSL_CONST_SSL_METHOD - SQUID_CHECK_OPENSSL_TXTDB - SQUID_CHECK_OPENSSL_HELLO_OVERWRITE_HACK diff --git a/package.bak/squid/0002-missing-include-time_h.patch b/package.bak/squid/0002-missing-include-time_h.patch deleted file mode 100644 index 18b3ab3b55..0000000000 --- a/package.bak/squid/0002-missing-include-time_h.patch +++ /dev/null @@ -1,28 +0,0 @@ -ipc/Kid.cc: add missing include of time.h - -Function time() comes from , so add the necessary include. -This fixes compilation on some configurations, for example -http://autobuild.buildroot.net/results/b33/b33e1f41e50b6e7ac3e30806b9a617d451bc27b4/ - -Signed-off-by: Thomas De Schampheleire -Upstream-status: submitted (http://bugs.squid-cache.org/show_bug.cgi?id=3967) - ---- - src/ipc/Kid.cc | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - - -diff --git a/src/ipc/Kid.cc b/src/ipc/Kid.cc ---- a/src/ipc/Kid.cc -+++ b/src/ipc/Kid.cc -@@ -11,6 +11,10 @@ - #include - #endif - -+#if HAVE_TIME_H -+#include -+#endif -+ - int TheProcessKind = pkOther; - - Kid::Kid(): diff --git a/package.bak/squid/Config.in b/package.bak/squid/Config.in deleted file mode 100644 index 12bfe19a42..0000000000 --- a/package.bak/squid/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "squid needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_SQUID - bool "squid" - depends on BR2_INSTALL_LIBSTDCPP - # needs fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBCAP - help - Caching proxy for the Web supporting HTTP, HTTPS, FTP, and more. - - http://www.squid-cache.org/ diff --git a/package.bak/squid/S97squid b/package.bak/squid/S97squid deleted file mode 100755 index 535b1d9622..0000000000 --- a/package.bak/squid/S97squid +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -[ -x /usr/sbin/squid ] || exit 0 -[ -f /etc/squid.conf ] || exit 0 - -case "$1" in - start) - printf "Starting squid: " - if [ ! -d /var/log/squid ]; then - mkdir -p /var/log/squid - chown squid:squid /var/log/squid - fi - start-stop-daemon -S -x /usr/sbin/squid - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - - stop) - printf "Stopping squid: " - /usr/sbin/squid -k shutdown - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - - reload) - printf "Reloading squid configuration: " - /usr/sbin/squid -k reconfigure - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - - restart) - printf "Restarting squid: " - /usr/sbin/squid -k restart - [ $? = 0 ] && echo "OK" || echo "FAIL" - ;; - - *) - echo "Usage: $0 {start|stop|reload|restart}" - exit 1 -esac - -exit 0 diff --git a/package.bak/squid/squid.hash b/package.bak/squid/squid.hash deleted file mode 100644 index d9b7924de1..0000000000 --- a/package.bak/squid/squid.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://www.squid-cache.org/Versions/v3/3.5/squid-3.5.24.tar.xz.asc -md5 3fae511e16b6379b61c011914673973d squid-3.5.24.tar.xz -sha1 f203637783301a4b86e554b6dd226de721762ae5 squid-3.5.24.tar.xz diff --git a/package.bak/squid/squid.mk b/package.bak/squid/squid.mk deleted file mode 100644 index cf0378a8d2..0000000000 --- a/package.bak/squid/squid.mk +++ /dev/null @@ -1,98 +0,0 @@ -################################################################################ -# -# squid -# -################################################################################ - -SQUID_VERSION_MAJOR = 3.5 -SQUID_VERSION = $(SQUID_VERSION_MAJOR).24 -SQUID_SOURCE = squid-$(SQUID_VERSION).tar.xz -SQUID_SITE = http://www.squid-cache.org/Versions/v3/$(SQUID_VERSION_MAJOR) -SQUID_LICENSE = GPLv2+ -SQUID_LICENSE_FILES = COPYING -# For 0001-assume-get-certificate-ok.patch -SQUID_AUTORECONF = YES -SQUID_DEPENDENCIES = libcap host-libcap host-pkgconf \ - $(if $(BR2_PACKAGE_LIBNETFILTER_CONNTRACK),libnetfilter_conntrack) -SQUID_CONF_ENV = \ - ac_cv_epoll_works=yes \ - ac_cv_func_setresuid=yes \ - ac_cv_func_va_copy=yes \ - ac_cv_func___va_copy=yes \ - ac_cv_func_strnstr=no \ - ac_cv_have_squid=yes \ - BUILXCXX="$(HOSTCXX)" \ - BUILDCXXFLAGS="$(HOST_CXXFLAGS)" -SQUID_CONF_OPTS = \ - --enable-async-io=8 \ - $(if $(BR2_TOOLCHAIN_USES_MUSL),--disable-linux-netfilter,--enable-linux-netfilter) \ - --enable-removal-policies="lru,heap" \ - --with-filedescriptors=1024 \ - --disable-ident-lookups \ - --without-mit-krb5 \ - --enable-auth-basic="fake getpwnam" \ - --enable-auth-digest="file" \ - --enable-auth-negotiate="wrapper" \ - --enable-auth-ntlm="fake" \ - --disable-strict-error-checking \ - --enable-external-acl-helpers="file_userip" \ - --with-logdir=/var/log/squid/ \ - --with-pidfile=/var/run/squid.pid \ - --with-swapdir=/var/cache/squid/ \ - --with-default-user=squid - -# Atomics in Squid use __sync built-ins on 4 and 8 bytes. However, the -# configure script tests them using AC_TRY_RUN, so we have to give -# some hints. -ifeq ($(BR2_TOOLCHAIN_HAS_SYNC_4)$(BR2_TOOLCHAIN_HAS_SYNC_8),yy) -SQUID_CONF_ENV += squid_cv_gnu_atomics=yes -else -SQUID_CONF_ENV += squid_cv_gnu_atomics=no -endif - -# On uClibc librt needs libpthread -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS)$(BR2_TOOLCHAIN_USES_UCLIBC),yy) -SQUID_CONF_ENV += ac_cv_search_shm_open="-lrt -lpthread" -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SQUID_CONF_OPTS += --with-openssl -SQUID_DEPENDENCIES += openssl -else -SQUID_CONF_OPTS += --without-openssl -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -SQUID_CONF_OPTS += --with-gnutls -SQUID_DEPENDENCIES += gnutls -else -SQUID_CONF_OPTS += --without-gnutls -endif - -define SQUID_CLEANUP_TARGET - rm -f $(addprefix $(TARGET_DIR)/usr/bin/, \ - RunCache RunAccel) - rm -f $(addprefix $(TARGET_DIR)/etc/, \ - cachemgr.conf mime.conf.default squid.conf.default) -endef - -SQUID_POST_INSTALL_TARGET_HOOKS += SQUID_CLEANUP_TARGET - -define SQUID_USERS - squid -1 squid -1 * - - - Squid proxy cache -endef - -define SQUID_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/squid/S97squid \ - $(TARGET_DIR)/etc/init.d/S97squid -endef - -define SQUID_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 $(@D)/tools/systemd/squid.service \ - $(TARGET_DIR)/usr/lib/systemd/system/squid.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../..//usr/lib/systemd/system/squid.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/squid.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/sredird/0001-termio.patch b/package.bak/sredird/0001-termio.patch deleted file mode 100644 index 7c7c67f5a3..0000000000 --- a/package.bak/sredird/0001-termio.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix musl build - -Patch was inspired by -http://svnweb.freebsd.org/ports/head/comms/sredird/files/patch-sredird.c?revision=363168&view=markup -http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/sysutils/sredird/patches/patch-aa -https://github.com/bitrig/bitrig-ports/blob/master/comms/sredird/patches/patch-sredird_c - -Signed-off-by: Bernd Kuhls - -diff -uNr sredird-2.2.2.org/sredird.c sredird-2.2.2/sredird.c ---- sredird-2.2.2.org/sredird.c 2005-08-12 16:10:46.000000000 +0200 -+++ sredird-2.2.2/sredird.c 2016-01-31 18:53:08.000000000 +0100 -@@ -110,7 +110,6 @@ - #include - #include - #include --#include - #include - #include - #include diff --git a/package.bak/sredird/Config.in b/package.bak/sredird/Config.in deleted file mode 100644 index d8c5ef9caf..0000000000 --- a/package.bak/sredird/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SREDIRD - bool "sredird" - help - Sredird is a serial port redirector that is compliant with - the RFC 2217 "Telnet Com Port Control Option" protocol. This - protocol lets you share a serial port through the network. - - http://freecode.com/projects/sredird diff --git a/package.bak/sredird/sredird.hash b/package.bak/sredird/sredird.hash deleted file mode 100644 index 63a419fc87..0000000000 --- a/package.bak/sredird/sredird.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 640c47dcd84b3b90640165a38eb336a675fdab06c14c09cae2f4a604cae560d3 sredird-2.2.2.tar.gz diff --git a/package.bak/sredird/sredird.mk b/package.bak/sredird/sredird.mk deleted file mode 100644 index b564f1ac2a..0000000000 --- a/package.bak/sredird/sredird.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# sredird -# -################################################################################ - -SREDIRD_VERSION = 2.2.2 -SREDIRD_SITE = http://www.ibiblio.org/pub/Linux/system/serial -SREDIRD_LICENSE = GPLv2+ -SREDIRD_LICENSE_FILES = COPYING - -define SREDIRD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define SREDIRD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/sredird $(TARGET_DIR)/usr/sbin/sredird -endef - -$(eval $(generic-package)) diff --git a/package.bak/sshfs/Config.in b/package.bak/sshfs/Config.in deleted file mode 100644 index 31fef9fc86..0000000000 --- a/package.bak/sshfs/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_SSHFS - bool "sshfs (FUSE)" - select BR2_PACKAGE_LIBFUSE - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_OPENSSH - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse, glib2 - depends on BR2_USE_MMU # libfuse, glib2 - depends on !BR2_STATIC_LIBS # libfuse - help - FUSE filesystem client based on the SSH File Transfer Protocol. - - https://github.com/libfuse/sshfs - -comment "sshfs needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/sshfs/sshfs.hash b/package.bak/sshfs/sshfs.hash deleted file mode 100644 index 09ae5d1cfa..0000000000 --- a/package.bak/sshfs/sshfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 7f689174d02e6b7e2631306fda4fb8e6b4483102d1bce82b3cdafba33369ad22 sshfs-2.8.tar.gz diff --git a/package.bak/sshfs/sshfs.mk b/package.bak/sshfs/sshfs.mk deleted file mode 100644 index de4c361d9f..0000000000 --- a/package.bak/sshfs/sshfs.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# sshfs -# -################################################################################ - -SSHFS_VERSION = 2.8 -SSHFS_SITE = https://github.com/libfuse/sshfs/releases/download/sshfs_$(SSHFS_VERSION) -SSHFS_LICENSE = GPLv2 -SSHFS_LICENSE_FILES = COPYING -SSHFS_DEPENDENCIES = \ - libglib2 libfuse openssh \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - $(if $(BR2_ENABLE_LOCALE),,libiconv) - -$(eval $(autotools-package)) diff --git a/package.bak/sshpass/Config.in b/package.bak/sshpass/Config.in deleted file mode 100644 index 24e46295df..0000000000 --- a/package.bak/sshpass/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SSHPASS - bool "sshpass" - depends on BR2_USE_MMU # fork() - help - Sshpass is a tool for non-interactivly performing - password authentication with SSH's so called - "interactive keyboard password authentication". - - http://sshpass.sourceforge.net diff --git a/package.bak/sshpass/sshpass.hash b/package.bak/sshpass/sshpass.hash deleted file mode 100644 index f6e0611c2f..0000000000 --- a/package.bak/sshpass/sshpass.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 c6324fcee608b99a58f9870157dfa754837f8c48be3df0f5e2f3accf145dee60 sshpass-1.06.tar.gz diff --git a/package.bak/sshpass/sshpass.mk b/package.bak/sshpass/sshpass.mk deleted file mode 100644 index de46604812..0000000000 --- a/package.bak/sshpass/sshpass.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# sshpass -# -################################################################################ - -SSHPASS_VERSION = 1.06 -SSHPASS_SITE = http://downloads.sourceforge.net/project/sshpass/sshpass/$(SSHPASS_VERSION) -SSHPASS_LICENSE = GPLv2+ -SSHPASS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch b/package.bak/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch deleted file mode 100644 index d23bc9fae6..0000000000 --- a/package.bak/sslh/0001-secure-version-while-building-sslh-in-a-larger-git-t.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 0c39699da9a3d6534b6d26e7c9686ee76d81b64a Mon Sep 17 00:00:00 2001 -From: David Bachelart -Date: Thu, 26 Jan 2017 10:07:47 +0100 -Subject: [PATCH] fix version extraction when building in a larger git tree - -sslh uses host git to extract its own version number. In buildroot, this -is an issue since extracted information is conflicting with buildroot git -status if we use git as VCS for buildroot. - -Since these git calls are legitimate only if git is used for the sslh -subtree only, this patch adds a check : a .git directory has to exist at -the root of the project to enable git-extracted version string. - -Signed-off-by: David Bachelart -[yann.morin.1998@free.fr: fix troll character U+c2a0] -Signed-off-by: "Yann E. MORIN" ---- - genver.sh | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/genver.sh b/genver.sh -index 79fd0a0..051e57b 100755 ---- a/genver.sh -+++ b/genver.sh -@@ -7,7 +7,7 @@ else - QUIET=0 - fi - --if ! `(git status | grep -q "On branch") 2> /dev/null`; then -+if [ ! -d .git ] || ! `(git status | grep -q "On branch") 2> /dev/null`; then - # If we don't have git, we can't work out what - # version this is. It must have been downloaded as a - # zip file. -@@ -25,7 +25,7 @@ if ! `(git status | grep -q "On branch") 2> /dev/null`; then - fi - fi - --if head=`git rev-parse --verify HEAD 2>/dev/null`; then -+if [ -d .git ] && head=`git rev-parse --verify HEAD 2>/dev/null`; then - # generate the version info based on the tag - release=`(git describe --tags || git --describe || git describe --all --long) \ - 2>/dev/null | tr -d '\n'` --- -2.1.4 - diff --git a/package.bak/sslh/Config.in b/package.bak/sslh/Config.in deleted file mode 100644 index 21bd65f165..0000000000 --- a/package.bak/sslh/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_SSLH - bool "sslh" - depends on BR2_INSTALL_LIBSTDCPP - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBCONFIG - help - Applicative protocol multiplexer - - http://www.rutschle.net/tech/sslh.shtml - -comment "sslh needs a toolchain w/ C++" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/sslh/S35sslh b/package.bak/sslh/S35sslh deleted file mode 100644 index 4a613f8400..0000000000 --- a/package.bak/sslh/S35sslh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# -# Starts the SSLH server -# - -# default setup : listen on port 8090 forward ssh traffic to -# localhost:22 and http traffic to localhost:80 -SSLH_ARGS="--listen 0.0.0.0:8090 --ssh 127.0.0.1:22 --http 127.0.0.1:80" - -# Allow a few customizations from a config file (overrides -# default setup) -test -r /etc/default/sslh && . /etc/default/sslh - -start() { - SSLH_ARGS="$SSLH_ARGS --user root" - echo -n "Starting sslh: " - start-stop-daemon -S -q -p /var/run/sslh.pid \ - --exec /usr/sbin/sslh -- $SSLH_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping sslh: " - start-stop-daemon -K -q -p /var/run/sslh.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/sslh/sslh.hash b/package.bak/sslh/sslh.hash deleted file mode 100644 index 757005dd38..0000000000 --- a/package.bak/sslh/sslh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 1601a5b377dcafc6b47d2fbb8d4d25cceb83053a4adcc5874d501a2d5a7745ad sslh-v1.18.tar.gz diff --git a/package.bak/sslh/sslh.mk b/package.bak/sslh/sslh.mk deleted file mode 100644 index 17aafd16c2..0000000000 --- a/package.bak/sslh/sslh.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# sslh -# -################################################################################ - -SSLH_VERSION = v1.18 -SSLH_SITE = http://www.rutschle.net/tech/sslh -SSLH_LICENSE = GPLv2+ -SSLH_LICENSE_FILES = COPYING - -SSLH_DEPENDENCIES = libconfig - -define SSLH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define SSLH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -define SSLH_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/sslh/S35sslh $(TARGET_DIR)/etc/init.d/S35sslh -endef - -$(eval $(generic-package)) diff --git a/package.bak/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch b/package.bak/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch deleted file mode 100644 index 64dc00d72c..0000000000 --- a/package.bak/start-stop-daemon/0001-add-uclibc-alias-and-musl.patch +++ /dev/null @@ -1,30 +0,0 @@ -Make linux-uclibcgnueabi an alias for linux-uclibceabi since it's -what we use in buildroot toolchains. -Slightly tweak musleabi to match the buildroot-used tuple. - -Signed-off-by: Gustavo Zacarias - -diff -Nura dpkg-1.18.3.orig/ostable dpkg-1.18.3/ostable ---- dpkg-1.18.3.orig/ostable 2015-10-15 08:05:04.471762555 -0300 -+++ dpkg-1.18.3/ostable 2015-10-15 08:11:05.206132648 -0300 -@@ -12,10 +12,10 @@ - # system part of the output of the GNU config.guess script. - # - # --uclibceabi-linux linux-uclibceabi linux[^-]*-uclibceabi -+uclibceabi-linux linux-uclibceabi linux[^-]*-uclibc.*eabi - uclibc-linux linux-uclibc linux[^-]*-uclibc - musleabihf-linux linux-musleabihf linux[^-]*-musleabihf --musl-linux linux-musl linux[^-]*-musl -+musl-linux linux-musl linux[^-]*-musl[^-]* - gnueabihf-linux linux-gnueabihf linux[^-]*-gnueabihf - gnueabi-linux linux-gnueabi linux[^-]*-gnueabi - gnuabin32-linux linux-gnuabin32 linux[^-]*-gnuabin32 -@@ -34,6 +34,6 @@ - bsd-netbsd netbsd netbsd[^-]* - bsd-openbsd openbsd openbsd[^-]* - sysv-solaris solaris solaris[^-]* --uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibceabi -+uclibceabi-uclinux uclinux-uclibceabi uclinux[^-]*-uclibc.*eabi - uclibc-uclinux uclinux-uclibc uclinux[^-]*(-uclibc.*)? - tos-mint mint mint[^-]* diff --git a/package.bak/start-stop-daemon/0002-just-warn-on-missing-arch.patch b/package.bak/start-stop-daemon/0002-just-warn-on-missing-arch.patch deleted file mode 100644 index 2b9cd3db17..0000000000 --- a/package.bak/start-stop-daemon/0002-just-warn-on-missing-arch.patch +++ /dev/null @@ -1,19 +0,0 @@ -Just warn on missing arch - -Some architectures are not listed in dpkg list (e.g. mips64el, xtensa, sh4a). -Don't break the build for that. - -Signed-off-by: Baruch Siach ---- -diff -Nuar dpkg-1.16.15-orig/m4/dpkg-arch.m4 dpkg-1.16.15/m4/dpkg-arch.m4 ---- dpkg-1.16.15-orig/m4/dpkg-arch.m4 2014-05-30 02:47:25.000000000 +0300 -+++ dpkg-1.16.15/m4/dpkg-arch.m4 2015-01-16 06:55:19.701596362 +0200 -@@ -57,7 +57,7 @@ - AC_MSG_CHECKING([dpkg architecture name]) - _DPKG_ARCHITECTURE([DEB_HOST_ARCH], [dpkg_arch]) - if test "x$dpkg_arch" = "x"; then -- AC_MSG_ERROR([cannot determine host dpkg architecture]) -+ AC_MSG_WARN([cannot determine host dpkg architecture]) - else - AC_MSG_RESULT([$dpkg_arch]) - fi diff --git a/package.bak/start-stop-daemon/Config.in b/package.bak/start-stop-daemon/Config.in deleted file mode 100644 index 8cf44f7805..0000000000 --- a/package.bak/start-stop-daemon/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_START_STOP_DAEMON - bool "start-stop-daemon" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - start-stop-daemon is used to control the creation and termination - of system-level processes. - - https://tracker.debian.org/pkg/dpkg diff --git a/package.bak/start-stop-daemon/start-stop-daemon.hash b/package.bak/start-stop-daemon/start-stop-daemon.hash deleted file mode 100644 index 7ce6cc3663..0000000000 --- a/package.bak/start-stop-daemon/start-stop-daemon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.de.debian.org/debian/pool/main/d/dpkg/dpkg_1.18.10.dsc -sha256 025524da41ba18b183ff11e388eb8686f7cc58ee835ed7d48bd159c46a8b6dc5 dpkg_1.18.10.tar.xz diff --git a/package.bak/start-stop-daemon/start-stop-daemon.mk b/package.bak/start-stop-daemon/start-stop-daemon.mk deleted file mode 100644 index 5aac541707..0000000000 --- a/package.bak/start-stop-daemon/start-stop-daemon.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# start-stop-daemon -# -################################################################################ - -# Debian start-stop-daemon is part of dpkg. Since start-stop-daemon is the only -# interesting tool in it, we call the buildroot package start-stop-daemon. - -START_STOP_DAEMON_VERSION = 1.18.10 -START_STOP_DAEMON_SOURCE = dpkg_$(START_STOP_DAEMON_VERSION).tar.xz -START_STOP_DAEMON_SITE = http://snapshot.debian.org/archive/debian/20160731T221931Z/pool/main/d/dpkg -START_STOP_DAEMON_CONF_OPTS = \ - --disable-dselect \ - --disable-update-alternatives \ - --disable-install-info \ - --exec-prefix=/ -START_STOP_DAEMON_CONF_ENV = \ - dpkg_cv_va_copy=yes \ - dpkg_cv_c99_snprintf=yes \ - DPKG_DEVEL_MODE=1 -START_STOP_DAEMON_DEPENDENCIES = host-pkgconf \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) -# Patching m4/dpkg-arch.m4 -START_STOP_DAEMON_AUTORECONF = YES -START_STOP_DAEMON_LICENSE = GPLv2+ -START_STOP_DAEMON_LICENSE_FILES = COPYING - -define START_STOP_DAEMON_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib/compat - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/utils -endef - -define START_STOP_DAEMON_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/utils/start-stop-daemon \ - $(TARGET_DIR)/sbin/start-stop-daemon -endef - -$(eval $(autotools-package)) diff --git a/package.bak/startup-notification/Config.in b/package.bak/startup-notification/Config.in deleted file mode 100644 index 1fc6dad1e7..0000000000 --- a/package.bak/startup-notification/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_STARTUP_NOTIFICATION - bool "startup-notification" - select BR2_PACKAGE_XLIB_LIBX11 - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - help - Startup-notification is a library used to monitor application startup. - - http://freedesktop.org/software/startup-notification/releases diff --git a/package.bak/startup-notification/startup-notification.hash b/package.bak/startup-notification/startup-notification.hash deleted file mode 100644 index cadbf98434..0000000000 --- a/package.bak/startup-notification/startup-notification.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c2fa09f9a49d8b319e79638e49e967c682df8726006e03059b1ffca5ab82099c startup-notification-0.9.tar.gz diff --git a/package.bak/startup-notification/startup-notification.mk b/package.bak/startup-notification/startup-notification.mk deleted file mode 100644 index e8dd0a35b6..0000000000 --- a/package.bak/startup-notification/startup-notification.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# startup-notification -# -################################################################################ - -STARTUP_NOTIFICATION_VERSION = 0.9 -STARTUP_NOTIFICATION_SITE = http://freedesktop.org/software/startup-notification/releases -STARTUP_NOTIFICATION_INSTALL_STAGING = YES -STARTUP_NOTIFICATION_DEPENDENCIES = xlib_libX11 -STARTUP_NOTIFICATION_CONF_ENV = lf_cv_sane_realloc=yes -STARTUP_NOTIFICATION_CONF_OPTS = --with-x \ - --x-includes="$(STAGING_DIR)/usr/include/X11" \ - --x-libraries="$(STAGING_DIR)/usr/lib" -STARTUP_NOTIFICATION_LICENSE = LGPLv2 -STARTUP_NOTIFICATION_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/statserial/0001-ncurses-link.patch b/package.bak/statserial/0001-ncurses-link.patch deleted file mode 100644 index b1c41e673f..0000000000 --- a/package.bak/statserial/0001-ncurses-link.patch +++ /dev/null @@ -1,16 +0,0 @@ -Link to libncurses instead of the legacy libcurses. - -Signed-off-by: Gustavo Zacarias - -diff -Nura statserial-1.1.orig/Makefile statserial-1.1/Makefile ---- statserial-1.1.orig/Makefile 2014-07-04 12:47:41.279440415 -0300 -+++ statserial-1.1/Makefile 2014-07-04 12:47:47.948665740 -0300 -@@ -10,7 +10,7 @@ - LDFLAGS = -s -N - - statserial: statserial.o -- $(LD) $(LDFLAGS) -o statserial statserial.o -lcurses -+ $(LD) $(LDFLAGS) -o statserial statserial.o -lncurses - - statserial.o: statserial.c - $(CC) $(CFLAGS) -c statserial.c diff --git a/package.bak/statserial/Config.in b/package.bak/statserial/Config.in deleted file mode 100644 index 4db5eb1aa7..0000000000 --- a/package.bak/statserial/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_STATSERIAL - bool "statserial" - select BR2_PACKAGE_NCURSES - help - Displays a table of the signals on a standard - 9-pin or 25-pin serial port, and indicates the - status of the handshaking lines. It can be - useful for debugging problems with serial - ports or modems. - - https://sites.google.com/site/tranter/software diff --git a/package.bak/statserial/statserial.hash b/package.bak/statserial/statserial.hash deleted file mode 100644 index 3cdb17d6c2..0000000000 --- a/package.bak/statserial/statserial.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 40cf3bd506852942aa98f468c90ed4ea66dbd343b93efacd40d617b55caf3967 statserial-1.1.tar.gz diff --git a/package.bak/statserial/statserial.mk b/package.bak/statserial/statserial.mk deleted file mode 100644 index 22b468ebb8..0000000000 --- a/package.bak/statserial/statserial.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# statserial -# -################################################################################ - -STATSERIAL_VERSION = 1.1 -STATSERIAL_SITE = http://www.ibiblio.org/pub/Linux/system/serial -STATSERIAL_DEPENDENCIES = ncurses -STATSERIAL_LICENSE = GPLv2+ -STATSERIAL_LICENSE_FILES = COPYING - -define STATSERIAL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) -endef - -define STATSERIAL_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/statserial $(TARGET_DIR)/usr/bin/statserial -endef - -$(eval $(generic-package)) diff --git a/package.bak/stella/0001-Add-cross-compilation-support.patch b/package.bak/stella/0001-Add-cross-compilation-support.patch deleted file mode 100644 index 3266d31d26..0000000000 --- a/package.bak/stella/0001-Add-cross-compilation-support.patch +++ /dev/null @@ -1,29 +0,0 @@ -From fba2627bebc7d497f64827a0517316e9b5c64c0a Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Tue, 26 Jul 2016 13:24:00 -0300 -Subject: [PATCH 1/2] Add cross-compilation support - -Signed-off-by: Sergio Prado ---- - configure | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 0d90a4f0acde..a4afea8e1880 100755 ---- a/configure -+++ b/configure -@@ -502,8 +502,9 @@ if test -n "$_host"; then - _host_os=win32 - ;; - *) -- echo "Cross-compiling to unknown target, please add your target to configure." -- exit 1 -+ echo "Cross-compiling to $_host target" -+ DEFINES="$DEFINES -DUNIX" -+ _host_os=unix - ;; - esac - --- -1.9.1 - diff --git a/package.bak/stella/0002-Do-not-strip-when-installing.patch b/package.bak/stella/0002-Do-not-strip-when-installing.patch deleted file mode 100644 index cba4b088fd..0000000000 --- a/package.bak/stella/0002-Do-not-strip-when-installing.patch +++ /dev/null @@ -1,26 +0,0 @@ -From a86140353cb2e162d88da9caa1716915be2f6893 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Tue, 26 Jul 2016 13:25:12 -0300 -Subject: [PATCH 2/2] Do not strip when installing - -Signed-off-by: Sergio Prado ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6dd0129587b3..b1aea5eed4a1 100644 ---- a/Makefile -+++ b/Makefile -@@ -172,7 +172,7 @@ config.mak: $(srcdir)/configure - - install: all - $(INSTALL) -d "$(DESTDIR)$(BINDIR)" -- $(INSTALL) -c -s -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" -+ $(INSTALL) -c -m 755 "$(srcdir)/stella$(EXEEXT)" "$(DESTDIR)$(BINDIR)/stella$(EXEEXT)" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)" - $(INSTALL) -c -m 644 "$(srcdir)/Announce.txt" "$(srcdir)/Changes.txt" "$(srcdir)/Copyright.txt" "$(srcdir)/License.txt" "$(srcdir)/README-SDL.txt" "$(srcdir)/Readme.txt" "$(srcdir)/Todo.txt" "$(srcdir)/docs/index.html" "$(srcdir)/docs/debugger.html" "$(DESTDIR)$(DOCDIR)/" - $(INSTALL) -d "$(DESTDIR)$(DOCDIR)/graphics" --- -1.9.1 - diff --git a/package.bak/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch b/package.bak/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch deleted file mode 100644 index c548d0825f..0000000000 --- a/package.bak/stella/0003-configure-Add-CXXFLAGS-for-test-compilations.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 28f0c20302e5c64712899848cae3d0a48a9dc952 Mon Sep 17 00:00:00 2001 -From: Vlad Zakharov -Date: Wed, 10 Aug 2016 18:02:59 +0300 -Subject: [PATCH] configure: Add $CXXFLAGS for test compilations - -Why we are passing only linker flags when compiling test code? -Loosing compiler flags leads to errors. - -Signed-off-by: Vlad Zakharov ---- - configure | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure b/configure -index 0d90a4f..618fe78 100755 ---- a/configure -+++ b/configure -@@ -63,9 +63,9 @@ cc_check() { - echo >> "$TMPLOG" - cat "$TMPC" >> "$TMPLOG" - echo >> "$TMPLOG" -- echo "$CXX $TMPC $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG" -+ echo "$CXX $TMPC $CXXFLAGS $LDFLAGS -o $TMPO$EXEEXT $@" >> "$TMPLOG" - rm -f "$TMPO$EXEEXT" -- ( $CXX "$TMPC" $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1 -+ ( $CXX "$TMPC" $CXXFLAGS $LDFLAGS -o "$TMPO$EXEEXT" "$@" ) >> "$TMPLOG" 2>&1 - TMP="$?" - echo >> "$TMPLOG" - return "$TMP" -@@ -107,9 +107,9 @@ EOF - - if test -n "$_host"; then - # In cross-compiling mode, we cannot run the result -- eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp -+ eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp - else -- eval "$1 $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp -+ eval "$1 $CXXFLAGS $LDFLAGS -o tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp 2> /dev/null" && eval "./tmp_cxx_compiler 2> /dev/null" && rm -f tmp_cxx_compiler$EXEEXT tmp_cxx_compiler.cpp - fi - } - --- -2.5.5 - diff --git a/package.bak/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch b/package.bak/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch deleted file mode 100644 index 76d12a2cdd..0000000000 --- a/package.bak/stella/0004-Use-gnu-11-standard-to-prevent-errors-on-PPC.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 6946a491cae42b971aad3bc5d822e0e549eca8bd Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Thu, 1 Dec 2016 15:20:33 -0200 -Subject: [PATCH] Use gnu++11 standard to prevent errors on PPC. - -PPC altivec vectorization triggers a bug when compiling with -std=c++11 -because "bool" is redefined in altivec.h. - -Acording to a bug report in GCC, "You need to use -std=g++11 or -undefine bool after the include of altivec.h as context sensitive -keywords is not part of the C++11 standard". - -So let's use gnu++11 standard. - -Signed-off-by: Sergio Prado ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 6dd0129587b3..6ed50ea4c335 100644 ---- a/Makefile -+++ b/Makefile -@@ -51,7 +51,7 @@ else - endif - CXXFLAGS+= -Wall -Wextra -Wno-unused-parameter -Wno-ignored-qualifiers - ifdef HAVE_GCC -- CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=c++11 -+ CXXFLAGS+= -Wno-multichar -Wunused -fno-rtti -Woverloaded-virtual -Wnon-virtual-dtor -std=gnu++11 - endif - - ifdef PROFILE --- -1.9.1 - diff --git a/package.bak/stella/Config.in b/package.bak/stella/Config.in deleted file mode 100644 index 55f177f753..0000000000 --- a/package.bak/stella/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_STELLA - bool "stella" - select BR2_PACKAGE_SDL2 - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_ZLIB - depends on !BR2_STATIC_LIBS # sdl2 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11 - help - Stella is a multi-platform Atari 2600 VCS emulator. - - http://stella.sourceforge.net/ - -comment "stella needs a toolchain w/ dynamic library, C++, gcc >= 4.8" - depends on BR2_STATIC_LIBS || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package.bak/stella/stella.hash b/package.bak/stella/stella.hash deleted file mode 100644 index 71defd28d0..0000000000 --- a/package.bak/stella/stella.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 b2727a0e2d3b112d35dcb89b4bdc789e2c7f15e9d9c7054a69a2f67facd7416e stella-4.7.2-src.tar.xz diff --git a/package.bak/stella/stella.mk b/package.bak/stella/stella.mk deleted file mode 100644 index 2e9d57b8c1..0000000000 --- a/package.bak/stella/stella.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# stella -# -################################################################################ - -STELLA_VERSION = 4.7.2 -STELLA_SOURCE = stella-$(STELLA_VERSION)-src.tar.xz -STELLA_SITE = http://downloads.sourceforge.net/stella -STELLA_LICENSE = GPLv2+ -STELLA_LICENSE_FILES = Copyright.txt License.txt - -STELLA_DEPENDENCIES = sdl2 libpng zlib - -STELLA_CONF_OPTS = \ - --host=$(GNU_TARGET_NAME) \ - --prefix=/usr \ - --with-sdl-prefix=$(STAGING_DIR)/usr - -# The configure script is not autoconf based, so we use the -# generic-package infrastructure -define STELLA_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - ./configure $(STELLA_CONF_OPTS) \ - ) -endef - -define STELLA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define STELLA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/stm32flash/Config.in b/package.bak/stm32flash/Config.in deleted file mode 100644 index cb6f4805ed..0000000000 --- a/package.bak/stm32flash/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_STM32FLASH - bool "stm32flash" - help - Open source cross platform flash program for the STM32 ARM - microcontrollers using the built-in ST serial bootloader over UART - or I2C. - - http://sourceforge.net/projects/stm32flash/ diff --git a/package.bak/stm32flash/stm32flash.mk b/package.bak/stm32flash/stm32flash.mk deleted file mode 100644 index 2c0fa56adc..0000000000 --- a/package.bak/stm32flash/stm32flash.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# stm32flash -# -################################################################################ - -STM32FLASH_VERSION = 4ac0566f188f39eace0223d966d349cd2f2c5895 -STM32FLASH_SITE = git://git.code.sf.net/p/stm32flash/code -STM32FLASH_LICENSE = GPLv2+ -STM32FLASH_LICENSE_FILES = gpl-2.0.txt - -define STM32FLASH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define STM32FLASH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" PREFIX="/usr" \ - -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/strace/Config.in b/package.bak/strace/Config.in deleted file mode 100644 index bbb582ad53..0000000000 --- a/package.bak/strace/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_STRACE - bool "strace" - help - A useful diagnostic, instructional, and debugging tool. - Allows you to track what system calls a program makes - while it is running. - - http://sourceforge.net/projects/strace/ diff --git a/package.bak/strace/strace.hash b/package.bak/strace/strace.hash deleted file mode 100644 index c7695ff391..0000000000 --- a/package.bak/strace/strace.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/strace/files/strace/4.15/ -md5 1ff96209fec19914c920608ed0791864 strace-4.15.tar.xz -sha1 18fbaeb07d089023764f618f179091b663a0d21e strace-4.15.tar.xz diff --git a/package.bak/strace/strace.mk b/package.bak/strace/strace.mk deleted file mode 100644 index b8de81afd2..0000000000 --- a/package.bak/strace/strace.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# strace -# -################################################################################ - -STRACE_VERSION = 4.15 -STRACE_SOURCE = strace-$(STRACE_VERSION).tar.xz -STRACE_SITE = http://downloads.sourceforge.net/project/strace/strace/$(STRACE_VERSION) -STRACE_LICENSE = BSD-3c -STRACE_LICENSE_FILES = COPYING - -# strace bundle some kernel headers to build libmpers, this mixes userspace -# headers and kernel headers which break the build with musl. -# The stddef.h from gcc is used instead of the one from musl. -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -STRACE_CONF_OPTS += st_cv_m32_mpers=no \ - st_cv_mx32_mpers=no -endif - -define STRACE_REMOVE_STRACE_GRAPH - rm -f $(TARGET_DIR)/usr/bin/strace-graph -endef - -STRACE_POST_INSTALL_TARGET_HOOKS += STRACE_REMOVE_STRACE_GRAPH - -$(eval $(autotools-package)) diff --git a/package.bak/stress-ng/Config.in b/package.bak/stress-ng/Config.in deleted file mode 100644 index 20ec93affb..0000000000 --- a/package.bak/stress-ng/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_STRESS_NG - bool "stress-ng" - depends on BR2_USE_MMU # fork() - # disabled on musl: stress-malloc.c needs mallopt() and M_MMAP_THRESHOLD - # disabled on uClibc: stress-aio.c needs aio.h - depends on BR2_TOOLCHAIN_USES_GLIBC - # perf.c needs PERF_COUNT_HW_REF_CPU_CYCLES - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 - depends on !BR2_microblaze # keyutils - # fenv.h lacks FE_INVALID, FE_OVERFLOW & FE_UNDERFLOW on nios2 - depends on !BR2_nios2 - depends on !BR2_STATIC_LIBS # keyutils - select BR2_PACKAGE_KEYUTILS # stress-key.c needs keyutils.h - select BR2_PACKAGE_ATTR # stress-xattr.c needs xattr.h - help - stress-ng will stress test a computer system in various - selectable ways. It was designed to exercise various physical - subsystems of a computer as well as the various operating - system kernel interfaces. - - http://kernel.ubuntu.com/~cking/stress-ng/ - -comment "stress-ng needs a glibc toolchain w/ dynamic library, headers >= 3.3" - depends on !BR2_microblaze && !BR2_nios2 - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_3 \ - || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/stress-ng/stress-ng.hash b/package.bak/stress-ng/stress-ng.hash deleted file mode 100644 index e735439a7e..0000000000 --- a/package.bak/stress-ng/stress-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 0e1d7733b35f594f7461dedbf836bd4966d0611da4cd4e85cde4804d2a425e6d stress-ng-0.06.15.tar.gz diff --git a/package.bak/stress-ng/stress-ng.mk b/package.bak/stress-ng/stress-ng.mk deleted file mode 100644 index b4d4699383..0000000000 --- a/package.bak/stress-ng/stress-ng.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# stress-ng -# -################################################################################ - -STRESS_NG_VERSION = 0.06.15 -STRESS_NG_SITE = http://kernel.ubuntu.com/~cking/tarballs/stress-ng -STRESS_NG_LICENSE = GPLv2+ -STRESS_NG_LICENSE_FILES = COPYING - -STRESS_NG_DEPENDENCIES = attr keyutils - -define STRESS_NG_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# Don't use make install otherwise stress-ng will be rebuild without -# required link libraries if any. Furthermore, using INSTALL allow to -# set the file permission correcly on the target. -define STRESS_NG_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/stress-ng $(TARGET_DIR)/usr/bin/stress-ng -endef - -$(eval $(generic-package)) diff --git a/package.bak/stress/Config.in b/package.bak/stress/Config.in deleted file mode 100644 index b22c3f19bb..0000000000 --- a/package.bak/stress/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_STRESS - bool "stress" - depends on BR2_USE_MMU # fork() - help - A deliberately simple workload generator for POSIX systems. - It imposes a configurable amount of CPU, memory, I/O, and - disk stress on the system. - - http://people.seas.harvard.edu/~apw/stress/ diff --git a/package.bak/stress/stress.hash b/package.bak/stress/stress.hash deleted file mode 100644 index 24cf0431b2..0000000000 --- a/package.bak/stress/stress.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 057e4fc2a7706411e1014bf172e4f94b63a12f18412378fca8684ca92408825b stress-1.0.4.tar.gz diff --git a/package.bak/stress/stress.mk b/package.bak/stress/stress.mk deleted file mode 100644 index 1b5ba06a07..0000000000 --- a/package.bak/stress/stress.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# stress -# -################################################################################ - -STRESS_VERSION = 1.0.4 -STRESS_SITE = http://people.seas.harvard.edu/~apw/stress -STRESS_LICENSE = GPLv2+ -STRESS_LICENSE_FILES = COPYING - -# Stress is linked statically if the --enable-static is specified. -# However, this option is always specified in the global -# SHARED_STATIC_LIBS_OPTS to tell packages to build static libraries, -# if supported. -# -# If the BR2_STATIC_LIBS is not defined, we have to specify -# --disable-static explicitly to get stress linked dynamically. -# -# Also, disable documentation by undefining makeinfo -STRESS_CONF_OPTS = \ - $(if $(BR2_STATIC_LIBS),,--disable-static) \ - MAKEINFO=: - -$(eval $(autotools-package)) diff --git a/package.bak/strongswan/Config.in b/package.bak/strongswan/Config.in deleted file mode 100644 index 0a95ac021e..0000000000 --- a/package.bak/strongswan/Config.in +++ /dev/null @@ -1,131 +0,0 @@ -comment "strongswan needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -menuconfig BR2_PACKAGE_STRONGSWAN - bool "strongswan" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HAS_ATOMIC - depends on !BR2_STATIC_LIBS - help - strongSwan is an OpenSource IPsec implementation for the - Linux operating system. It is based on the discontinued - FreeS/WAN project and the X.509 patch. - - The focus is on: - - simplicity of configuration - - strong encryption and authentication methods - - powerful IPsec policies supporting large and complex VPN networks - - strongSwan provide many plugins. Only a few are presented here. - - http://www.strongswan.org/ - -if BR2_PACKAGE_STRONGSWAN - -choice - prompt "Cryptographic backend" - default BR2_PACKAGE_STRONGSWAN_GMP - -config BR2_PACKAGE_STRONGSWAN_OPENSSL - bool "OpenSSL" - select BR2_PACKAGE_OPENSSL - -config BR2_PACKAGE_STRONGSWAN_GCRYPT - bool "libgcrypt" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - select BR2_PACKAGE_LIBGCRYPT - -config BR2_PACKAGE_STRONGSWAN_GMP - bool "GNU MP (libgmp)" - select BR2_PACKAGE_GMP - -endchoice - -config BR2_PACKAGE_STRONGSWAN_AF_ALG - bool "Enable AF_ALG crypto interface to Linux Crypto API" - -config BR2_PACKAGE_STRONGSWAN_CURL - bool "Enable CURL fetcher plugin to fetch files via libcurl" - select BR2_PACKAGE_LIBCURL - -config BR2_PACKAGE_STRONGSWAN_CHARON - bool "Enable the IKEv1/IKEv2 keying daemon charon" - default y - -if BR2_PACKAGE_STRONGSWAN_CHARON - -config BR2_PACKAGE_STRONGSWAN_TNCCS_11 - bool "Enable TNCCS 1.1 protocol module" - select BR2_PACKAGE_LIBXML2 - -config BR2_PACKAGE_STRONGSWAN_TNCCS_20 - bool "Enable TNCCS 2.0 protocol module" - -config BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC - bool "Enable dynamic TNCCS protocol discovery module" - -config BR2_PACKAGE_STRONGSWAN_EAP - bool "Enable EAP protocols" - help - Enable various EAP protocols: - - mschapv2 - - tls - - ttls - - peap - - sim - - sim-file - - aka - - aka-3gpp2 - - simaka-sql - - simaka-pseudonym - - simaka-reauth - - identity - - md5 - - gtc - - tnc - - dynamic - - radius - -if BR2_PACKAGE_STRONGSWAN_EAP - -config BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC - bool "Enable EAP-SIM smart card backend" - depends on !BR2_STATIC_LIBS # pcsc-lite - select BR2_PACKAGE_PCSC_LITE - -endif - -config BR2_PACKAGE_STRONGSWAN_UNITY - bool "Enables Cisco Unity extension plugin" - -config BR2_PACKAGE_STRONGSWAN_STROKE - bool "Enable charons stroke configuration backend" - default y - -config BR2_PACKAGE_STRONGSWAN_SQL - bool "Enable SQL database configuration backend" - depends on BR2_PACKAGE_SQLITE || BR2_PACKAGE_MYSQL - -endif - -config BR2_PACKAGE_STRONGSWAN_PKI - bool "Enable pki certificate utility" - default y - -config BR2_PACKAGE_STRONGSWAN_SCEP - bool "Enable SCEP client tool" - -config BR2_PACKAGE_STRONGSWAN_SCRIPTS - bool "Enable additional utilities (found in scripts directory)" - depends on BR2_PACKAGE_STRONGSWAN_CHARON - default y - -config BR2_PACKAGE_STRONGSWAN_VICI - bool "Enable vici/swanctl" - depends on BR2_PACKAGE_STRONGSWAN_CHARON - default y - -endif diff --git a/package.bak/strongswan/strongswan.hash b/package.bak/strongswan/strongswan.hash deleted file mode 100644 index 97fb1998e4..0000000000 --- a/package.bak/strongswan/strongswan.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://download.strongswan.org/strongswan-5.4.0.tar.bz2.md5 -md5 9d7c77b0da9b69f859624897e5e9ebbf strongswan-5.4.0.tar.bz2 -# Calculated based on the hash above -sha256 f8288faaea6a9cd8a7d413c0b76b7922be5da3dfcd01fd05cb30d2c55d3bbe89 strongswan-5.4.0.tar.bz2 diff --git a/package.bak/strongswan/strongswan.mk b/package.bak/strongswan/strongswan.mk deleted file mode 100644 index 36b5148535..0000000000 --- a/package.bak/strongswan/strongswan.mk +++ /dev/null @@ -1,84 +0,0 @@ -################################################################################ -# -# strongswan -# -################################################################################ - -STRONGSWAN_VERSION = 5.4.0 -STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 -STRONGSWAN_SITE = http://download.strongswan.org -STRONGSWAN_LICENSE = GPLv2+ -STRONGSWAN_LICENSE_FILES = COPYING LICENSE -STRONGSWAN_DEPENDENCIES = host-pkgconf -STRONGSWAN_CONF_OPTS += \ - --without-lib-prefix \ - --enable-led \ - --enable-pkcs11=yes \ - --enable-kernel-netlink=yes \ - --enable-socket-default=yes \ - --enable-openssl=$(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),yes,no) \ - --enable-gcrypt=$(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),yes,no) \ - --enable-gmp=$(if $(BR2_PACKAGE_STRONGSWAN_GMP),yes,no) \ - --enable-af-alg=$(if $(BR2_PACKAGE_STRONGSWAN_AF_ALG),yes,no) \ - --enable-curl=$(if $(BR2_PACKAGE_STRONGSWAN_CURL),yes,no) \ - --enable-charon=$(if $(BR2_PACKAGE_STRONGSWAN_CHARON),yes,no) \ - --enable-tnccs-11=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),yes,no) \ - --enable-tnccs-20=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_20),yes,no) \ - --enable-tnccs-dynamic=$(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_DYNAMIC),yes,no) \ - --enable-eap-sim-pcsc=$(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),yes,no) \ - --enable-unity=$(if $(BR2_PACKAGE_STRONGSWAN_UNITY),yes,no) \ - --enable-stroke=$(if $(BR2_PACKAGE_STRONGSWAN_STROKE),yes,no) \ - --enable-sql=$(if $(BR2_PACKAGE_STRONGSWAN_SQL),yes,no) \ - --enable-pki=$(if $(BR2_PACKAGE_STRONGSWAN_PKI),yes,no) \ - --enable-scepclient=$(if $(BR2_PACKAGE_STRONGSWAN_SCEP),yes,no) \ - --enable-scripts=$(if $(BR2_PACKAGE_STRONGSWAN_SCRIPTS),yes,no) \ - --enable-vici=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) \ - --enable-swanctl=$(if $(BR2_PACKAGE_STRONGSWAN_VICI),yes,no) - -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -STRONGSWAN_CONF_ENV += LIBS='-latomic' -endif - -ifeq ($(BR2_PACKAGE_STRONGSWAN_EAP),y) -STRONGSWAN_CONF_OPTS += \ - --enable-eap-sim \ - --enable-eap-sim-file \ - --enable-eap-aka \ - --enable-eap-aka-3gpp2 \ - --enable-eap-simaka-sql \ - --enable-eap-simaka-pseudonym \ - --enable-eap-simaka-reauth \ - --enable-eap-identity \ - --enable-eap-md5 \ - --enable-eap-gtc \ - --enable-eap-mschapv2 \ - --enable-eap-tls \ - --enable-eap-ttls \ - --enable-eap-peap \ - --enable-eap-tnc \ - --enable-eap-dynamic \ - --enable-eap-radius -STRONGSWAN_DEPENDENCIES += gmp -endif - -STRONGSWAN_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_STRONGSWAN_OPENSSL),openssl) \ - $(if $(BR2_PACKAGE_STRONGSWAN_GCRYPT),libgcrypt) \ - $(if $(BR2_PACKAGE_STRONGSWAN_GMP),gmp) \ - $(if $(BR2_PACKAGE_STRONGSWAN_CURL),libcurl) \ - $(if $(BR2_PACKAGE_STRONGSWAN_TNCCS_11),libxml2) \ - $(if $(BR2_PACKAGE_STRONGSWAN_EAP_SIM_PCSC),pcsc-lite) - -ifeq ($(BR2_PACKAGE_STRONGSWAN_SQL),y) -STRONGSWAN_DEPENDENCIES += \ - $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) -endif - -# disable connmark/forecast until net/if.h vs. linux/if.h conflict resolved -# problem exist since linux 4.5 header changes -STRONGSWAN_CONF_OPTS += \ - --disable-connmark \ - --disable-forecast - -$(eval $(autotools-package)) diff --git a/package.bak/stunnel/Config.in b/package.bak/stunnel/Config.in deleted file mode 100644 index e4a956770e..0000000000 --- a/package.bak/stunnel/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_STUNNEL - bool "stunnel" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_OPENSSL - help - Stunnel is a program that wraps any TCP connection with an SSL - connection. - - http://www.stunnel.org/ diff --git a/package.bak/stunnel/S50stunnel b/package.bak/stunnel/S50stunnel deleted file mode 100644 index 04637b694c..0000000000 --- a/package.bak/stunnel/S50stunnel +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh - -start() { - printf "Starting stunnel: " - start-stop-daemon -S -q -p /var/run/stunnel.pid --exec /usr/bin/stunnel - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping stunnel: " - start-stop-daemon -K -q -p /var/run/stunnel.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/stunnel/stunnel.hash b/package.bak/stunnel/stunnel.hash deleted file mode 100644 index c4e70a7f9a..0000000000 --- a/package.bak/stunnel/stunnel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.stunnel.org/pipermail/stunnel-announce/2016-September/000125.html -sha256 eb8952fcfdfcdf5056a1f1a78e1ec5014b819c5f5f7599b924dc4490ffe4b5ea stunnel-5.36.tar.gz diff --git a/package.bak/stunnel/stunnel.mk b/package.bak/stunnel/stunnel.mk deleted file mode 100644 index f98e7b59eb..0000000000 --- a/package.bak/stunnel/stunnel.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# stunnel -# -################################################################################ - -STUNNEL_VERSION_MAJOR = 5 -STUNNEL_VERSION = $(STUNNEL_VERSION_MAJOR).36 -STUNNEL_SITE = http://www.usenix.org.uk/mirrors/stunnel/archive/$(STUNNEL_VERSION_MAJOR).x -STUNNEL_DEPENDENCIES = openssl -STUNNEL_CONF_OPTS = --with-ssl=$(STAGING_DIR)/usr --with-threads=fork \ - --disable-libwrap -STUNNEL_CONF_ENV = \ - ax_cv_check_cflags___fstack_protector=$(if $(BR2_TOOLCHAIN_HAS_SSP),yes,no) \ - LIBS=$(if $(BR2_STATIC_LIBS),-lz) -STUNNEL_LICENSE = GPLv2+ -STUNNEL_LICENSE_FILES = COPYING COPYRIGHT.GPL - -ifeq ($(BR2_INIT_SYSTEMD),y) -STUNNEL_DEPENDENCIES += systemd -else -STUNNEL_CONF_OPTS += --disable-systemd -endif - -define STUNNEL_INSTALL_CONF - $(INSTALL) -m 0644 -D $(@D)/tools/stunnel.conf \ - $(TARGET_DIR)/etc/stunnel/stunnel.conf - rm -f $(TARGET_DIR)/etc/stunnel/stunnel.conf-sample -endef - -STUNNEL_POST_INSTALL_TARGET_HOOKS += STUNNEL_INSTALL_CONF - -define STUNNEL_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/stunnel/S50stunnel $(TARGET_DIR)/etc/init.d/S50stunnel -endef - -$(eval $(autotools-package)) diff --git a/package.bak/subversion/0001-dont-mangle-cflags.patch b/package.bak/subversion/0001-dont-mangle-cflags.patch deleted file mode 100644 index adb8b8e933..0000000000 --- a/package.bak/subversion/0001-dont-mangle-cflags.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] configure.ac: don't mangle CFLAGS - -Ensure that the sed expression to strip debugging options from CFLAGS -doesn't mangle flags like -mfloat-gprs=double, breaking the build. - -[Vincent: adapt to 1.9.2 and patch configure.ac instead of configure] - -Signed-off-by: Peter Korsgaard -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2015-07-27 00:03:10.000000000 +0100 -+++ b/configure.ac 2015-09-28 10:33:39.175048493 +0100 -@@ -1110,8 +1110,8 @@ if test "$enable_debugging" = "yes" ; th - CXXFLAGS="$CXXFLAGS -DSVN_DEBUG -DAP_DEBUG" - elif test "$enable_debugging" = "no" ; then - AC_MSG_NOTICE([Disabling debugging]) -- CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -- CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9] //g' -e 's/-g //g'`"] -+ CFLAGS=["`echo $CFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] -+ CXXFLAGS=["`echo $CXXFLAGS' ' | $SED -e 's/-g[0-9]* //g'`"] - dnl Compile with NDEBUG to get rid of assertions - CFLAGS="$CFLAGS -DNDEBUG" - CXXFLAGS="$CXXFLAGS -DNDEBUG" diff --git a/package.bak/subversion/0002-disable-macos-specific-features.patch b/package.bak/subversion/0002-disable-macos-specific-features.patch deleted file mode 100644 index b960ca2937..0000000000 --- a/package.bak/subversion/0002-disable-macos-specific-features.patch +++ /dev/null @@ -1,23 +0,0 @@ -Disable Mac OS specific features - -We only support Linux so we don't need them. Also, they cause a build -failure when cross compiling: - -checking for Mach-O dynamic module iteration functions -error: cannot run test program while cross compiling - -Signed-off-by: Vicente Olivert Riera - -diff -Nrup a/configure.ac b/configure.ac ---- a/configure.ac 2015-09-28 10:33:39.175048493 +0100 -+++ b/configure.ac 2015-09-28 10:47:53.921428143 +0100 -@@ -467,9 +467,6 @@ fi - - dnl Mac OS specific features ------------------- - --SVN_LIB_MACHO_ITERATE --SVN_LIB_MACOS_PLIST --SVN_LIB_MACOS_KEYCHAIN - - dnl APR_HAS_DSO ------------------- - diff --git a/package.bak/subversion/Config.in b/package.bak/subversion/Config.in deleted file mode 100644 index ffe424a7e2..0000000000 --- a/package.bak/subversion/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_SUBVERSION - bool "subversion" - select BR2_PACKAGE_APR - select BR2_PACKAGE_APR_UTIL - # apr really needs shared library support - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU # apr - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_SQLITE - help - Subversion is an open source version control system - - http://subversion.apache.org/ - -comment "subversion needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/subversion/subversion.hash b/package.bak/subversion/subversion.hash deleted file mode 100644 index 1a85961fe1..0000000000 --- a/package.bak/subversion/subversion.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From http://subversion.apache.org/download.cgi#recommended-release -sha1 8bd6a44a1aed30c4c6b6b068488dafb44eaa6adf subversion-1.9.5.tar.bz2 -# Locally calculated after checking PGP signature -# https://www.apache.org/dist/subversion/subversion-1.9.5.tar.bz2.asc -sha256 8a4fc68aff1d18dcb4dd9e460648d24d9e98657fbed496c582929c6b3ce555e5 subversion-1.9.5.tar.bz2 diff --git a/package.bak/subversion/subversion.mk b/package.bak/subversion/subversion.mk deleted file mode 100644 index 05569c11a7..0000000000 --- a/package.bak/subversion/subversion.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# subversion -# -################################################################################ - -SUBVERSION_VERSION = 1.9.5 -SUBVERSION_SOURCE = subversion-$(SUBVERSION_VERSION).tar.bz2 -SUBVERSION_SITE = http://mirror.catn.com/pub/apache/subversion -SUBVERSION_LICENSE = Apache-2.0 -SUBVERSION_LICENSE_FILES = LICENSE -SUBVERSION_DEPENDENCIES = host-pkgconf apr apr-util expat zlib sqlite -SUBVERSION_AUTORECONF = YES -SUBVERSION_CONF_OPTS = \ - --with-expat=$(STAGING_DIR)/usr/include:$(STAGING_DIR)/usr/lib: \ - --with-apr=$(STAGING_DIR)/usr \ - --with-apr-util=$(STAGING_DIR)/usr \ - --with-zlib=$(STAGING_DIR)/usr \ - --without-serf \ - --without-apxs \ - --without-berkeley-db \ - --without-sasl \ - --without-gnome-keyring \ - --without-libmagic - -$(eval $(autotools-package)) diff --git a/package.bak/sudo/Config.in b/package.bak/sudo/Config.in deleted file mode 100644 index cbef15d67b..0000000000 --- a/package.bak/sudo/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_SUDO - bool "sudo" - # uses fork() - depends on BR2_USE_MMU - help - Sudo is a program designed to allow a sysadmin to give - limited root privileges to users and log root activity. The - basic philosophy is to give as few privileges as possible - but still allow people to get their work done. - - http://www.sudo.ws/sudo/ diff --git a/package.bak/sudo/sudo.hash b/package.bak/sudo/sudo.hash deleted file mode 100644 index 82e1ad66fe..0000000000 --- a/package.bak/sudo/sudo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: http://www.sudo.ws/download.html -sha256 237e18e67c2ad59ecacfa4b7707198b09fcf84914621585a9bc670dcc31a52e0 sudo-1.8.19p2.tar.gz diff --git a/package.bak/sudo/sudo.mk b/package.bak/sudo/sudo.mk deleted file mode 100644 index bb0a2b5e69..0000000000 --- a/package.bak/sudo/sudo.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# sudo -# -################################################################################ - -SUDO_VERSION = 1.8.19p2 -SUDO_SITE = http://www.sudo.ws/sudo/dist -SUDO_LICENSE = ISC, BSD-3c -SUDO_LICENSE_FILES = doc/LICENSE -# This is to avoid sudo's make install from chown()ing files which fails -SUDO_INSTALL_TARGET_OPTS = INSTALL_OWNER="" DESTDIR="$(TARGET_DIR)" install -SUDO_CONF_OPTS = \ - --without-lecture \ - --without-sendmail \ - --without-umask \ - --with-logging=syslog \ - --without-interfaces \ - --with-env-editor - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -define SUDO_INSTALL_PAM_CONF - $(INSTALL) -D -m 0644 package/sudo/sudo.pam $(TARGET_DIR)/etc/pam.d/sudo -endef - -SUDO_DEPENDENCIES += linux-pam -SUDO_CONF_OPTS += --with-pam -SUDO_POST_INSTALL_TARGET_HOOKS += SUDO_INSTALL_PAM_CONF -else -SUDO_CONF_OPTS += --without-pam -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -SUDO_CONF_OPTS += --enable-zlib -SUDO_DEPENDENCIES += zlib -else -SUDO_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -SUDO_DEPENDENCIES += openldap -SUDO_CONF_OPTS += --with-ldap -else -SUDO_CONF_OPTS += --without-ldap -endif - -# mksigname/mksiglist needs to run on build host to generate source files -define SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - $(MAKE) $(HOST_CONFIGURE_OPTS) \ - CPPFLAGS="$(HOST_CPPFLAGS) -I../../include -I../.." \ - -C $(@D)/lib/util mksigname mksiglist -endef - -SUDO_POST_CONFIGURE_HOOKS += SUDO_BUILD_MKSIGNAME_MKSIGLIST_HOST - -define SUDO_PERMISSIONS - /usr/bin/sudo f 4755 0 0 - - - - - -endef - -$(eval $(autotools-package)) diff --git a/package.bak/sudo/sudo.pam b/package.bak/sudo/sudo.pam deleted file mode 100644 index c6e6f20a08..0000000000 --- a/package.bak/sudo/sudo.pam +++ /dev/null @@ -1,12 +0,0 @@ -auth sufficient pam_rootok.so -auth required pam_wheel.so use_uid -auth required pam_env.so -auth required pam_unix.so nullok - -account required pam_unix.so - -password required pam_unix.so nullok - -session required pam_limits.so -session required pam_env.so -session required pam_unix.so diff --git a/package.bak/sunxi-boards/Config.in b/package.bak/sunxi-boards/Config.in deleted file mode 100644 index d9fd8529f3..0000000000 --- a/package.bak/sunxi-boards/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_SUNXI_BOARDS - bool "sunxi script.bin board file" - depends on BR2_arm - select BR2_PACKAGE_HOST_SUNXI_TOOLS - help - Sunxi-boards requires a compiled .fex files for hardware - description, used by the kernel during boot for hardware - initialization. This package is specific for linux-sunxi - kernel and it is useless for mainline kernel versions. - - https://github.com/linux-sunxi/sunxi-boards - -if BR2_PACKAGE_SUNXI_BOARDS -config BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE - string ".fex file to compile" - help - This field defines the name of the .fex file for which the - .bin file should be generated. - - This should be the path of the .fex file relative to the - sys_config/ directory, and including the .fex extension. - - See inside sys_config/ directory in sunxi-boards source code - to see the list of valid .fex files. -endif diff --git a/package.bak/sunxi-boards/sunxi-boards.hash b/package.bak/sunxi-boards/sunxi-boards.hash deleted file mode 100644 index 755682402d..0000000000 --- a/package.bak/sunxi-boards/sunxi-boards.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ff1fa509fd5716d26c23a82e59300876a848122f745713a610f8f3c47d448064 sunxi-boards-a6a4e94066f4ec6b26fc7060dc453a6bcf26a504.tar.gz diff --git a/package.bak/sunxi-boards/sunxi-boards.mk b/package.bak/sunxi-boards/sunxi-boards.mk deleted file mode 100644 index 83b3842caa..0000000000 --- a/package.bak/sunxi-boards/sunxi-boards.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# sunxi-boards -# -################################################################################ - -SUNXI_BOARDS_VERSION = a6a4e94066f4ec6b26fc7060dc453a6bcf26a504 -SUNXI_BOARDS_SITE = $(call github,linux-sunxi,sunxi-boards,$(SUNXI_BOARDS_VERSION)) -SUNXI_BOARDS_DEPENDENCIES = host-sunxi-tools -SUNXI_BOARDS_INSTALL_IMAGES = YES -SUNXI_BOARDS_INSTALL_TARGET = NO -SUNXI_BOARDS_FEX_FILE = $(call qstrip,$(BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE)) - -define SUNXI_BOARDS_INSTALL_IMAGES_CMDS - $(FEX2BIN) $(@D)/sys_config/$(SUNXI_BOARDS_FEX_FILE) \ - $(BINARIES_DIR)/script.bin -endef - -ifeq ($(BR2_PACKAGE_SUNXI_BOARDS)$(BR_BUILDING),yy) -# we NEED a board name -ifeq ($(SUNXI_BOARDS_FEX_FILE),) -$(error No sunxi .fex file specified. Check your BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE settings) -endif -endif - -$(eval $(generic-package)) diff --git a/package.bak/sunxi-cedarx/Config.in b/package.bak/sunxi-cedarx/Config.in deleted file mode 100644 index 43fcce58c2..0000000000 --- a/package.bak/sunxi-cedarx/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_SUNXI_CEDARX - bool "sunxi-cedarx" - depends on BR2_arm - depends on BR2_TOOLCHAIN_USES_GLIBC - help - Sunxi CedarX decoder libraries. CedarX is Allwinner's - multimedia co-processing technology for hardware accelerated - video and image decoding, as used inside their A10 SoC's and - others. - - http://github.com/linux-sunxi/cedarx-libs - http://linux-sunxi.org/CedarX - -comment "sunxi-cedarx needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/sunxi-cedarx/sunxi-cedarx.hash b/package.bak/sunxi-cedarx/sunxi-cedarx.hash deleted file mode 100644 index 048b868982..0000000000 --- a/package.bak/sunxi-cedarx/sunxi-cedarx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ea7426f83325d247ba0d4734eaf1cb53bab178a81f935e2535ddb3069f70ba84 sunxi-cedarx-b8f52d913f73720e50d8f1b2f8610467b575dc45.tar.gz diff --git a/package.bak/sunxi-cedarx/sunxi-cedarx.mk b/package.bak/sunxi-cedarx/sunxi-cedarx.mk deleted file mode 100644 index 219f1bc74b..0000000000 --- a/package.bak/sunxi-cedarx/sunxi-cedarx.mk +++ /dev/null @@ -1,60 +0,0 @@ -################################################################################ -# -# sunxi-cedarx -# -################################################################################ - -SUNXI_CEDARX_VERSION = b8f52d913f73720e50d8f1b2f8610467b575dc45 -SUNXI_CEDARX_SITE = $(call github,linux-sunxi,cedarx-libs,$(SUNXI_CEDARX_VERSION)) - -SUNXI_CEDARX_INSTALL_STAGING = YES - -SUNXI_CEDARX_CONFIGURE_OPTS = \ - CROSS_COMPILE=$(TARGET_CROSS) - -ifeq ($(BR2_ARM_EABIHF),y) -SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf -else -SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel2 -endif - -define SUNXI_CEDARX_BUILD_AVHEAP - $(TARGET_CC) $(TARGET_CFLAGS) \ - -c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \ - -o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o \ - -I $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap \ - -I $(SUNXI_CEDARX_BIN_DIR)/ - $(TARGET_CC) -shared -L./ -Wl,-soname,libavheap.so \ - -o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ - $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o -endef - -define SUNXI_CEDARX_INSTALL_AVHEAP - $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ - $(1)/usr/lib/libavheap.so -endef - -define SUNXI_CEDARX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \ - $(SUNXI_CEDARX_CONFIGURE_OPTS) - $(SUNXI_CEDARX_BUILD_AVHEAP) -endef - -define SUNXI_CEDARX_INSTALL_STAGING_CMDS - $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/include/libvecore - $(INSTALL) -m 664 $(SUNXI_CEDARX_BIN_DIR)/libvecore/*.h \ - $(STAGING_DIR)/usr/include/libvecore - $(INSTALL) -m 644 $(SUNXI_CEDARX_BIN_DIR)/*.h \ - $(STAGING_DIR)/usr/include/ - $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \ - $(STAGING_DIR)/usr/lib/libvecore.so - $(call SUNXI_CEDARX_INSTALL_AVHEAP, $(STAGING_DIR)) -endef - -define SUNXI_CEDARX_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \ - $(TARGET_DIR)/usr/lib/libvecore.so - $(call SUNXI_CEDARX_INSTALL_AVHEAP, $(TARGET_DIR)) -endef - -$(eval $(generic-package)) diff --git a/package.bak/sunxi-mali/0001-Add-missing-GLchar-definitions.patch b/package.bak/sunxi-mali/0001-Add-missing-GLchar-definitions.patch deleted file mode 100644 index a9370b009d..0000000000 --- a/package.bak/sunxi-mali/0001-Add-missing-GLchar-definitions.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 058d5e8cd90d117535b5d314fd9e15c70028ff20 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Mon, 21 Apr 2014 19:31:23 +0200 -Subject: [PATCH] Add missing GLchar definitions. - -The GLES and GLES2 header files provided by sunxi-mali do not define the -type "GLchar" and use "char" instead in the prototype of some functions. - -This issue has been reported upstream some time ago, but the pull -request has not been merged yet. (See -https://github.com/linux-sunxi/sunxi-mali/pull/8). - -Signed-off-by: Eric Le Bihan ---- - include/GLES/gl.h | 1 + - include/GLES2/gl2.h | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/include/GLES/gl.h b/include/GLES/gl.h -index 858f394..a6bb591 100644 ---- a/include/GLES/gl.h -+++ b/include/GLES/gl.h -@@ -29,6 +29,7 @@ typedef float GLfloat; - typedef float GLclampf; - typedef signed int GLfixed; - typedef signed int GLclampx; -+typedef char GLchar; - - typedef int * GLintptr; - typedef int * GLsizeiptr; -diff --git a/include/GLES2/gl2.h b/include/GLES2/gl2.h -index 59e376c..90d96bb 100644 ---- a/include/GLES2/gl2.h -+++ b/include/GLES2/gl2.h -@@ -32,6 +32,7 @@ typedef unsigned int GLuint; - typedef khronos_float_t GLfloat; - typedef khronos_float_t GLclampf; - typedef khronos_int32_t GLfixed; -+typedef char GLchar; - - /* GL types for handling large vertex buffer objects */ - typedef khronos_intptr_t GLintptr; --- -1.9.0 - diff --git a/package.bak/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch b/package.bak/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch deleted file mode 100644 index 1c8f7ee21b..0000000000 --- a/package.bak/sunxi-mali/0002-linking-of-test-app-needs-libUMP.patch +++ /dev/null @@ -1,18 +0,0 @@ -linking of test app needs libUMP - -Signed-off-by: Francois Perrad - -diff --git a/test/Makefile b/test/Makefile -index 700416e..92085cb 100644 ---- a/test/Makefile -+++ b/test/Makefile -@@ -5,7 +5,7 @@ - all: test - - test: ../config.mk test.c -- $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -+ $(CC) $(CFLAGS) -o $@ test.c -lEGL -lGLESv2 -lUMP - - clean: - rm -f test - diff --git a/package.bak/sunxi-mali/Config.in b/package.bak/sunxi-mali/Config.in deleted file mode 100644 index c6754c2821..0000000000 --- a/package.bak/sunxi-mali/Config.in +++ /dev/null @@ -1,66 +0,0 @@ -config BR2_PACKAGE_SUNXI_MALI - bool "sunxi-mali" - depends on BR2_arm - depends on BR2_TOOLCHAIN_USES_GLIBC - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_LIBUMP - help - Install the ARM Mali drivers for sunxi based systems (i.e - systems based on ARM Allwinner SoCs). This driver requires - either the sunxi-kernel with the ARM Mali driver enabled or - the installation of the ARM Mali drivers as an external - module. - - http://github.com/linux-sunxi/sunxi-mali - -if BR2_PACKAGE_SUNXI_MALI - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "sunxi-mali" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "sunxi-mali" - -config BR2_PACKAGE_SUNXI_MALI_DBG - bool "install malitest and maliver tools" - help - Install 3D triangle demo malitest application and the maliver application - which describes the kernel module version. - -choice - prompt "Version" - default BR2_PACKAGE_SUNXI_MALI_R3P0 - help - Select the version of the kernel module. For the sunxi-kernel, the - appropriate version number is r3p0. For other kernels, use the maliver - application to determine the appropriate version. - -config BR2_PACKAGE_SUNXI_MALI_R2P4 - bool "r2p4" - depends on BR2_ARM_EABI - -comment "r2p4 requires an EABI toolchain" - depends on !BR2_ARM_EABI - -config BR2_PACKAGE_SUNXI_MALI_R3P0 - bool "r3p0" - depends on BR2_ARM_EABIHF - -comment "r3p0 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF - -config BR2_PACKAGE_SUNXI_MALI_R3P1 - depends on BR2_ARM_EABIHF - bool "r3p1" - -comment "r3p1 requires an EABIhf toolchain" - depends on !BR2_ARM_EABIHF - -endchoice - -endif - -comment "sunxi-mali needs a glibc toolchain" - depends on BR2_arm - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/sunxi-mali/S80mali b/package.bak/sunxi-mali/S80mali deleted file mode 100644 index ecfbab97b4..0000000000 --- a/package.bak/sunxi-mali/S80mali +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -e - -install_driver() { - DRIVER=$1 - OPTS=$2 - - modprobe $DRIVER $OPTS - maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices) - - rm -f /dev/${DRIVER} - - mknod /dev/${DRIVER} c $maj 0 - chmod 600 /dev/${DRIVER} -} - -start() { - echo "mali: starting driver" - - BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')" - YRES="$(fbset | awk '/geom/ {print $3}')" - # Set RGBA ordering to something the drivers like - if [ "$BITSPERPIXEL" = "32" ] ; then - fbset -rgba 8/16,8/8,8/0,8/24 - fi - # Try to enable triple buffering when there's enough VRAM - fbset -vyres $(( YRES*3 )) - - install_driver mali - install_driver ump -} - -stop() { - echo "mali: stopping driver" - - rmmod ump - rmmod mali -} - -case "$1" in -start) - start -;; -stop) - stop -;; -restart) - stop - start -;; -*) - echo "mali: Please use start, stop, or restart." - exit 1 -;; -esac diff --git a/package.bak/sunxi-mali/egl.pc b/package.bak/sunxi-mali/egl.pc deleted file mode 100644 index 2823209a72..0000000000 --- a/package.bak/sunxi-mali/egl.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr/ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: ARM Mali implementation of EGL -Version: 1.4 -Requires: -Libs: -L${libdir} -lEGL -lGLESv2 -lUMP -Cflags: -I${includedir} - diff --git a/package.bak/sunxi-mali/glesv2.pc b/package.bak/sunxi-mali/glesv2.pc deleted file mode 100644 index 4702d1394c..0000000000 --- a/package.bak/sunxi-mali/glesv2.pc +++ /dev/null @@ -1,12 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: glesv2 -Description: ARM Mali implementation of OpenGL ESv2 -Version: 2.0 -Requires: -Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP -Cflags: -I${includedir} - diff --git a/package.bak/sunxi-mali/sunxi-mali.mk b/package.bak/sunxi-mali/sunxi-mali.mk deleted file mode 100644 index c808db6cf6..0000000000 --- a/package.bak/sunxi-mali/sunxi-mali.mk +++ /dev/null @@ -1,81 +0,0 @@ -################################################################################ -# -# sunxi-mali -# -################################################################################ - -# last sha1 character dropped to ensure unique filename -SUNXI_MALI_VERSION = d343311efc8db166d8371b28494f0f27b6a5872 -SUNXI_MALI_SITE = https://github.com/linux-sunxi/sunxi-mali -SUNXI_MALI_SITE_METHOD = git - -# Get the sunxi-mali-proprietary libraries -SUNXI_MALI_GIT_SUBMODULES = YES - -SUNXI_MALI_INSTALL_STAGING = YES -SUNXI_MALI_DEPENDENCIES = libump -SUNXI_MALI_PROVIDES = libegl libgles - -# The options below must be provided in the environment. Providing these -# through options overrides the value and prevents the makefiles from -# appending to these variables. This is used throughout the sunxi-mali build -# system. -# -# Furthermore, the -lm -dl -lpthread options are included due to a possible bug -# in the way the linaro 2013.06 toolchain handles shared libraries. -SUNXI_MALI_MAKE_ENV = \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS) -lm -ldl -lpthread" \ - $(TARGET_MAKE_ENV) - -ifeq ($(BR2_ARM_EABIHF),y) -SUNXI_MALI_MAKE_OPTS += ABI=armhf -else -SUNXI_MALI_MAKE_OPTS += ABI=armel -endif - -SUNXI_MALI_MAKE_OPTS += EGL_TYPE=framebuffer - -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R2P4),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r2p4 -endif -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P0),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p0 -endif -ifeq ($(BR2_PACKAGE_SUNXI_MALI_R3P1),y) -SUNXI_MALI_MAKE_OPTS += VERSION=r3p1 -endif - -define SUNXI_MALI_BUILD_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) all - $(TARGET_CC) $(TARGET_CFLAGS) -o $(@D)/version/version \ - $(@D)/version/version.c -endef - -define SUNXI_MALI_INSTALL_STAGING_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install - # test must be built after install because it depends on headers that are - # generated during the install above. - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D) $(SUNXI_MALI_MAKE_OPTS) test - $(INSTALL) -D -m 0644 package/sunxi-mali/egl.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/egl.pc - $(INSTALL) -D -m 0644 package/sunxi-mali/glesv2.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/glesv2.pc -endef - -define SUNXI_MALI_INSTALL_TARGET_CMDS - $(SUNXI_MALI_MAKE_ENV) $(MAKE) -C $(@D)/lib \ - $(SUNXI_MALI_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install - $(if $(BR2_PACKAGE_SUNXI_MALI_DBG), - $(INSTALL) -m 755 $(@D)/version/version $(TARGET_DIR)/usr/bin/maliver; \ - $(INSTALL) -m 755 $(@D)/test/test $(TARGET_DIR)/usr/bin/malitest - ) -endef - -define SUNXI_MALI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/sunxi-mali/S80mali \ - $(TARGET_DIR)/etc/init.d/S80mali -endef - -$(eval $(generic-package)) diff --git a/package.bak/sunxi-tools/Config.in b/package.bak/sunxi-tools/Config.in deleted file mode 100644 index 16bf2dc57b..0000000000 --- a/package.bak/sunxi-tools/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SUNXI_TOOLS - bool "sunxi nand-part" - depends on BR2_arm - help - nand-part is part of sunxi-tools for Allwinner A10 (aka sun4i) and - A13 (aka sun5i) based devices. It is a tool to repartition the - internal NAND on sunxi devices. - - http://linux-sunxi.org/Sunxi-tools diff --git a/package.bak/sunxi-tools/Config.in.host b/package.bak/sunxi-tools/Config.in.host deleted file mode 100644 index 5fab5e6ff5..0000000000 --- a/package.bak/sunxi-tools/Config.in.host +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_HOST_SUNXI_TOOLS - bool "host sunxi-tools" - depends on BR2_arm - help - Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i) - based devices. This includes fex2bin which can be used to - compile .fex board definition files to the binary script.bin - format required by the linux-sunxi kernel. These tools are - specific for linux-sunxi kernel and do not apply to the - mainline Linux kernel version. - - http://linux-sunxi.org/Sunxi-tools diff --git a/package.bak/sunxi-tools/sunxi-tools.hash b/package.bak/sunxi-tools/sunxi-tools.hash deleted file mode 100644 index efb2b54d9c..0000000000 --- a/package.bak/sunxi-tools/sunxi-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 da5d762608517b4b2e9bd392bd9a63afae3973d9c8264cbcfb757ddac8120d1b sunxi-tools-v1.4.1.tar.gz diff --git a/package.bak/sunxi-tools/sunxi-tools.mk b/package.bak/sunxi-tools/sunxi-tools.mk deleted file mode 100644 index 1a58aff1be..0000000000 --- a/package.bak/sunxi-tools/sunxi-tools.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# sunxi-tools -# -################################################################################ - -SUNXI_TOOLS_VERSION = v1.4.1 -SUNXI_TOOLS_SITE = $(call github,linux-sunxi,sunxi-tools,$(SUNXI_TOOLS_VERSION)) -SUNXI_TOOLS_LICENSE = GPLv2+ -SUNXI_TOOLS_LICENSE_FILES = LICENSE.md -HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf -FEX2BIN = $(HOST_DIR)/usr/bin/fex2bin - -define HOST_SUNXI_TOOLS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR)/usr \ - EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \ - -C $(@D) tools -endef - -define HOST_SUNXI_TOOLS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR)/usr \ - -C $(@D) install-tools -endef - -define SUNXI_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" PREFIX=/usr \ - EXTRA_CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \ - -C $(@D) sunxi-nand-part -endef - -define SUNXI_TOOLS_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/sunxi-nand-part $(TARGET_DIR)/usr/bin/sunxi-nand-part -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch b/package.bak/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch deleted file mode 100644 index 351b5875a3..0000000000 --- a/package.bak/supertuxkart/0001-irrlicht-Get-rid-of-unprefixed-cflags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 73bed675202cf1f1c748540a4363d7d99e161dca Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Thu, 9 Jun 2016 18:58:51 -0300 -Subject: [PATCH 1/2] irrlicht: Get rid of unprefixed cflags - -Cross-building requires proper include paths. This commit -removes the unprefixed -I/usr/X11R6/include in irrlicht cflags. - -Signed-off-by: Ezequiel Garcia ---- -Fix sent upstream as part of pull: -https://github.com/supertuxkart/stk-code/pull/2554 - - lib/irrlicht/CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/lib/irrlicht/CMakeLists.txt b/lib/irrlicht/CMakeLists.txt -index 46d54008c291..5f4975e3a6f9 100644 ---- a/lib/irrlicht/CMakeLists.txt -+++ b/lib/irrlicht/CMakeLists.txt -@@ -25,8 +25,8 @@ elseif(MINGW) - add_definitions(-D_IRR_STATIC_LIB_) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) # Shut up about unsafe stuff - else() -- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include") -- set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing -I/usr/X11R6/include") -+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") -+ set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -pipe -O3 -fno-exceptions -fstrict-aliasing") - if(CMAKE_COMPILER_IS_GNUCC) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fexpensive-optimizations") - endif() --- -2.9.0 - diff --git a/package.bak/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch b/package.bak/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch deleted file mode 100644 index 1a89bead85..0000000000 --- a/package.bak/supertuxkart/0002-irrlicht-Fix-boolean-return-type-for-jpeglib-s-callb.patch +++ /dev/null @@ -1,39 +0,0 @@ -From fe71624eb39e0bc302a7603c79503fb12667dc2b Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Sun, 3 Jul 2016 15:16:59 -0300 -Subject: [PATCH 2/2] irrlicht: Fix boolean return type for jpeglib's callback - -Building on certain toolchains can fail due to returning an integer -instead of TRUE. In any case, only {TRUE,FALSE} should be used -as 'boolean' jpeglib type. Fix this by returning TRUE. - - CImageLoaderJPG.cpp: In static member function 'static boolean - irr::video::CImageLoaderJPG::fill_input_buffer(j_decompress_ptr)': - CImageLoaderJPG.cpp:69:9: error: invalid conversion from 'int' to 'boolean' - [-fpermissive] - -Signed-off-by: Romain Naour -Signed-off-by: Ezequiel Garcia ---- -Fix sent upstream as part of pull: -https://github.com/supertuxkart/stk-code/pull/2554 - - lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp -index 8fc5222a1e9b..1811f31dd28f 100644 ---- a/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp -+++ b/lib/irrlicht/source/Irrlicht/CImageLoaderJPG.cpp -@@ -66,7 +66,7 @@ void CImageLoaderJPG::init_source (j_decompress_ptr cinfo) - boolean CImageLoaderJPG::fill_input_buffer (j_decompress_ptr cinfo) - { - // DO NOTHING -- return 1; -+ return TRUE; - } - - --- -2.9.0 - diff --git a/package.bak/supertuxkart/Config.in b/package.bak/supertuxkart/Config.in deleted file mode 100644 index 4919b50a2b..0000000000 --- a/package.bak/supertuxkart/Config.in +++ /dev/null @@ -1,38 +0,0 @@ -config BR2_PACKAGE_SUPERTUXKART - bool "supertuxkart" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP # openal - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal - depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS # openal - depends on BR2_PACKAGE_HAS_LIBGL - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_USES_MUSL - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBGLU - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_OPENAL - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_ZLIB - help - Karts. Nitro. Action! SuperTuxKart is a free 3D arcade kart - racer with multiple karts, tracks and modes you can play. - Beat the evil Nolok by any means necessary, and make the - mascot kingdom safe once again! - - http://supertuxkart.sourceforge.net/Main_Page - -comment "supertuxkart needs an OpenGL backend, a uClibc or glibc toolchain w/ NPTL, C++" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_USE_MMU - depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS - depends on BR2_PACKAGE_XORG7 - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_PACKAGE_HAS_LIBGL \ - || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/supertuxkart/supertuxkart.hash b/package.bak/supertuxkart/supertuxkart.hash deleted file mode 100644 index 45ad8c5089..0000000000 --- a/package.bak/supertuxkart/supertuxkart.hash +++ /dev/null @@ -1,5 +0,0 @@ -# Locally computed -sha256 0b080bb098a26adb552d6fd48905bcb6b1e873ef1567457d7268d7d3aaa48282 supertuxkart-0.9.2-src.tar.xz -# From https://sourceforge.net/projects/supertuxkart/files/SuperTuxKart/0.9.2/ -sha1 df3805a8f9dc556a0fc5af44442dae8126db5d5a supertuxkart-0.9.2-src.tar.xz -md5 f1f5081fd41b8eeb310b4edc07b9ee12 supertuxkart-0.9.2-src.tar.xz diff --git a/package.bak/supertuxkart/supertuxkart.mk b/package.bak/supertuxkart/supertuxkart.mk deleted file mode 100644 index 037c6f359d..0000000000 --- a/package.bak/supertuxkart/supertuxkart.mk +++ /dev/null @@ -1,48 +0,0 @@ -################################################################################ -# -# supertuxkart -# -################################################################################ - -SUPERTUXKART_VERSION = 0.9.2 -SUPERTUXKART_SOURCE = supertuxkart-$(SUPERTUXKART_VERSION)-src.tar.xz -SUPERTUXKART_SITE = http://downloads.sourceforge.net/project/supertuxkart/SuperTuxKart/$(SUPERTUXKART_VERSION) - -# Supertuxkart itself is GPLv3+, but it bundles a few libraries with different -# licenses. Irrlicht, bullet and angelscript have zlib license, while glew is -# BSD-3c. Since they are linked statically, the result is GPLv3+. -SUPERTUXKART_LICENSE = GPLv3+ -SUPERTUXKART_LICENSE_FILES = COPYING - -SUPERTUXKART_DEPENDENCIES = \ - jpeg \ - libcurl \ - libgl \ - libglu \ - libogg \ - libpng \ - libvorbis \ - openal \ - xlib_libXrandr \ - zlib - -# Since supertuxkart is not installing libstkirrlicht.so, and since it is -# the only user of the bundled libraries, turn off shared libraries entirely. -SUPERTUXKART_CONF_OPTS = -DBUILD_SHARED_LIBS=OFF - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -SUPERTUXKART_DEPENDENCIES += libfribidi -SUPERTUXKART_CONF_OPTS += -DUSE_FRIBIDI=ON -else -SUPERTUXKART_CONF_OPTS += -DUSE_FRIBIDI=OFF -endif - -ifeq ($(BR2_PACKAGE_BLUEZ5_UTILS),y) -SUPERTUXKART_DEPENDENCIES += bluez5_utils -SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=ON -else -# Wiimote support relies on bluez5. -SUPERTUXKART_CONF_OPTS += -DUSE_WIIUSE=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/supervisor/Config.in b/package.bak/supervisor/Config.in deleted file mode 100644 index 2ab0e048f6..0000000000 --- a/package.bak/supervisor/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_SUPERVISOR - bool "supervisor" - depends on BR2_PACKAGE_PYTHON - select BR2_PACKAGE_PYTHON_MELD3 - select BR2_PACKAGE_PYTHON_SETUPTOOLS # runtime dependency - help - A client/server system that allows its users to control a - number of processes on UNIX-like operating systems. - - http://supervisord.org/ - -comment "supervisor needs the python interpreter" - depends on !BR2_PACKAGE_PYTHON diff --git a/package.bak/supervisor/S99supervisord b/package.bak/supervisor/S99supervisord deleted file mode 100755 index 921dcf6333..0000000000 --- a/package.bak/supervisor/S99supervisord +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/sh - -mkdir -p /var/log/supervisor - -case "$1" in - start) - printf "Starting supervisord: " - start-stop-daemon -S -q -p /var/run/supervisord.pid --exec /usr/bin/supervisord - echo "done" - ;; - stop) - printf "Stopping supervisord: " - start-stop-daemon -K -q -p /var/run/supervisord.pid - echo "done" - ;; - restart) - "$0" stop - sleep 5 - "$0" start - ;; - reload) - start-stop-daemon -K -q -p /var/run/supervisord.pid -s HUP - ;; - *) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac - -exit $? diff --git a/package.bak/supervisor/supervisor.hash b/package.bak/supervisor/supervisor.hash deleted file mode 100644 index 03f337e7d0..0000000000 --- a/package.bak/supervisor/supervisor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e32c546fe8d2a6e079ec4819c49fd24534d4075a58af39118d04367918b3c282 supervisor-3.1.3.tar.gz diff --git a/package.bak/supervisor/supervisor.mk b/package.bak/supervisor/supervisor.mk deleted file mode 100644 index 4c62b66feb..0000000000 --- a/package.bak/supervisor/supervisor.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# supervisor -# -################################################################################ - -SUPERVISOR_VERSION = 3.1.3 -SUPERVISOR_SITE = http://pypi.python.org/packages/source/s/supervisor -SUPERVISOR_LICENSE = BSD-like, rdflib (http_client.py), PSF (medusa), ZPL-2.1 -SUPERVISOR_LICENSE_FILES = COPYRIGHT.txt LICENSES.txt -SUPERVISOR_SETUP_TYPE = setuptools - -define SUPERVISOR_INSTALL_CONF_FILES - $(INSTALL) -d -m 755 $(TARGET_DIR)/etc/supervisor.d - $(INSTALL) -D -m 644 package/supervisor/supervisord.conf \ - $(TARGET_DIR)/etc/supervisord.conf -endef - -SUPERVISOR_POST_INSTALL_TARGET_HOOKS += SUPERVISOR_INSTALL_CONF_FILES - -define SUPERVISOR_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/supervisor/S99supervisord \ - $(TARGET_DIR)/etc/init.d/S99supervisord -endef - -define SUPERVISOR_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/supervisor/supervisord.service \ - $(TARGET_DIR)/usr/lib/systemd/system/supervisord.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/supervisord.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/supervisord.service -endef - -$(eval $(python-package)) diff --git a/package.bak/supervisor/supervisord.conf b/package.bak/supervisor/supervisord.conf deleted file mode 100644 index 1372a688ab..0000000000 --- a/package.bak/supervisor/supervisord.conf +++ /dev/null @@ -1,18 +0,0 @@ -[unix_http_server] -file = /var/run/supervisor.sock - -[supervisord] -logfile = /var/log/supervisor/supervisord.log -logfile_maxbytes = 200KB -logfile_backups = 1 -pidfile = /var/run/supervisord.pid -childlogdir = /var/log/supervisor - -[rpcinterface:supervisor] -supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface - -[supervisorctl] -serverurl = unix:///var/run/supervisor.sock - -[include] -files = /etc/supervisor.d/*.conf diff --git a/package.bak/supervisor/supervisord.service b/package.bak/supervisor/supervisord.service deleted file mode 100644 index 92c38c7d1f..0000000000 --- a/package.bak/supervisor/supervisord.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Process Control System -After=syslog.target - -[Service] -ExecStart=/usr/bin/supervisord -n -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/swig/swig.hash b/package.bak/swig/swig.hash deleted file mode 100644 index 92ddc110ca..0000000000 --- a/package.bak/swig/swig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 2939aae39dec06095462f1b95ce1c958ac80d07b926e48871046d17c0094f44c swig-3.0.10.tar.gz diff --git a/package.bak/swig/swig.mk b/package.bak/swig/swig.mk deleted file mode 100644 index 8fed8dabc4..0000000000 --- a/package.bak/swig/swig.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# swig -# -################################################################################ - -SWIG_VERSION_MAJOR = 3.0 -SWIG_VERSION = $(SWIG_VERSION_MAJOR).10 -SWIG_SITE = http://downloads.sourceforge.net/project/swig/swig/swig-$(SWIG_VERSION) -HOST_SWIG_DEPENDENCIES = host-bison -HOST_SWIG_CONF_OPTS = \ - --without-pcre \ - --disable-ccache \ - --without-octave -SWIG_LICENSE = GPLv3+, BSD-2c, BSD-3c -SWIG_LICENSE_FILES = LICENSE LICENSE-GPL LICENSE-UNIVERSITIES - -# CMake looks first at swig3.0, then swig2.0 and then swig. However, -# when doing the search, it will look into the PATH for swig2.0 first, -# and then for swig. -# While the PATH contains first our $(HOST_DIR)/usr/bin, it also contains -# /usr/bin and other system directories. Therefore, if there is an -# installed swig3.0 on the system, it will get the preference over the -# swig installed in $(HOST_DIR)/usr/bin, which isn't nice. To prevent -# this from happening we create a symbolic link swig3.0 -> swig, so that -# our swig always gets used. - -define HOST_SWIG_INSTALL_SYMLINK - ln -fs swig $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR) -endef - -HOST_SWIG_POST_INSTALL_HOOKS += HOST_SWIG_INSTALL_SYMLINK - -$(eval $(host-autotools-package)) - -SWIG = $(HOST_DIR)/usr/bin/swig$(SWIG_VERSION_MAJOR) diff --git a/package.bak/swupdate/Config.in b/package.bak/swupdate/Config.in deleted file mode 100644 index d9ef1bc7a4..0000000000 --- a/package.bak/swupdate/Config.in +++ /dev/null @@ -1,62 +0,0 @@ -config BR2_PACKAGE_SWUPDATE - bool "swupdate" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - # swupdate requires a parser and uses libconfig as default - select BR2_PACKAGE_LIBCONFIG if !BR2_PACKAGE_JSON_C && \ - !BR2_PACKAGE_HAS_LUAINTERPRETER - help - swupdate provides a reliable way to update the software on an - embedded system. - - swupdate is highly configurable to fit the targets requirements and - to minimize the footprint. The provided default configuration file - BR2_PACKAGE_SWUPDATE_CONFIG will enable swupdate with an embedded - webserver, a parser and a handler for raw NAND or NOR flash. - - The default configuration file builds a reasonable firmware update - system with minimal external dependencies in my mind. If you like to - use your own modified configuration, you have to select the - necessary packages manually: - - * Select BR2_PACKAGE_LUA or BR2_PACKAGE_LUAJIT if you want - to have Lua support. - CONFIG_HANDLER_IN_LUA is not supported in LuaJIT or Lua 5.1. - Note that for LuaJIT support, you need to set - CONFIG_LUAVERSION="jit-5.1". - * Select BR2_LIBCURL if you want to use the download feature. - * Select BR2_PACKAGE_OPENSSL is you want to add encryption support. - * Select BR2_PACKAGE_MTD if you want to use swupdate with UBI - partitions. - * Select BR2_PACKAGE_ZLIB if you want to deal with gzip compressed - archives. - * Select BR2_PACKAGE_UBOOT_TOOLS and BR2_PACKAGE_ZLIB to add support - for setting the U-Boot environment. - - https://sbabic.github.io/swupdate - -if BR2_PACKAGE_SWUPDATE - -config BR2_PACKAGE_SWUPDATE_CONFIG - string "swupdate configuration file" - default "package/swupdate/swupdate.config" - help - Path to the swupdate configuration file. - - I you wish to use your own modified swupdate configuration file - specify the config file location with this option. - -config BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE - bool "install default website" - default y - help - Install the provided website to /var/www/swupdate. - - This is necessary if you want to run swupdate with the embedded - webserver and do not provide an own website to be installed to - /var/www/swupdate. -endif - -comment "swupdate needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/swupdate/swupdate.config b/package.bak/swupdate/swupdate.config deleted file mode 100644 index 51869bb9d9..0000000000 --- a/package.bak/swupdate/swupdate.config +++ /dev/null @@ -1,72 +0,0 @@ -# -# Automatically generated file; DO NOT EDIT. -# Swupdate Configuration -# -CONFIG_HAVE_DOT_CONFIG=y - -# -# Swupdate Settings -# - -# -# General Configuration -# -CONFIG_SCRIPTS=y -# CONFIG_HW_COMPATIBILITY is not set -CONFIG_SW_VERSIONS_FILE="/etc/sw-versions" -# CONFIG_MTD is not set -# CONFIG_LUA is not set -# CONFIG_FEATURE_SYSLOG is not set - -# -# Build Options -# -# CONFIG_STATIC is not set -CONFIG_CROSS_COMPILE="" -CONFIG_SYSROOT="" -CONFIG_EXTRA_CFLAGS="" -CONFIG_EXTRA_LDFLAGS="" -CONFIG_EXTRA_LDLIBS="" - -# -# Debugging Options -# -# CONFIG_DEBUG is not set -# CONFIG_WERROR is not set -# CONFIG_NOCLEANUP is not set -# CONFIG_DOWNLOAD is not set -# CONFIG_SIGNED_IMAGES is not set -# CONFIG_SURICATTA is not set -CONFIG_WEBSERVER=y - -# -# Webserver Features -# -CONFIG_MONGOOSE=y - -# -# Mongoose Feature -# -CONFIG_MONGOOSEIPV6=y -# CONFIG_MONGOOSESSL is not set - -# -# Archival Features -# -# CONFIG_GUNZIP is not set - -# -# Parser Features -# -CONFIG_LIBCONFIG=y -CONFIG_LIBCONFIGROOT="" -# CONFIG_JSON is not set -# CONFIG_SETSWDESCRIPTION is not set - -# -# Image Handlers -# -CONFIG_RAW=y -# CONFIG_SHELLSCRIPTHANDLER is not set -# CONFIG_ARCHIVE is not set -# CONFIG_UBOOT is not set \ No newline at end of file diff --git a/package.bak/swupdate/swupdate.hash b/package.bak/swupdate/swupdate.hash deleted file mode 100644 index 1ba10f6457..0000000000 --- a/package.bak/swupdate/swupdate.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 840d6287a41f7a42e08a74045ee40b7c2f82c1ecfedf8c915e3935d4f0084376 swupdate-2016.10.tar.gz diff --git a/package.bak/swupdate/swupdate.mk b/package.bak/swupdate/swupdate.mk deleted file mode 100644 index 688f4eef86..0000000000 --- a/package.bak/swupdate/swupdate.mk +++ /dev/null @@ -1,127 +0,0 @@ -################################################################################ -# -# swupdate -# -################################################################################ - -SWUPDATE_VERSION = 2016.10 -SWUPDATE_SITE = $(call github,sbabic,swupdate,$(SWUPDATE_VERSION)) -SWUPDATE_LICENSE = GPLv2+, MIT, Public Domain -SWUPDATE_LICENSE_FILES = COPYING - -# swupdate bundles its own version of mongoose (version 3.8) - -ifeq ($(BR2_PACKAGE_JSON_C),y) -SWUPDATE_DEPENDENCIES += json-c -SWUPDATE_MAKE_ENV += HAVE_JSON_C=y -else -SWUPDATE_MAKE_ENV += HAVE_JSON_C=n -endif - -ifeq ($(BR2_PACKAGE_LIBARCHIVE),y) -SWUPDATE_DEPENDENCIES += libarchive -SWUPDATE_MAKE_ENV += HAVE_LIBARCHIVE=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBARCHIVE=n -endif - -ifeq ($(BR2_PACKAGE_LIBCONFIG),y) -SWUPDATE_DEPENDENCIES += libconfig -SWUPDATE_MAKE_ENV += HAVE_LIBCONFIG=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBCONFIG=n -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -SWUPDATE_DEPENDENCIES += libcurl -SWUPDATE_MAKE_ENV += HAVE_LIBCURL=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBCURL=n -endif - -ifeq ($(BR2_PACKAGE_HAS_LUAINTERPRETER),y) -SWUPDATE_DEPENDENCIES += luainterpreter host-pkgconf -SWUPDATE_MAKE_ENV += HAVE_LUA=y -else -SWUPDATE_MAKE_ENV += HAVE_LUA=n -endif - -ifeq ($(BR2_PACKAGE_MTD),y) -SWUPDATE_DEPENDENCIES += mtd -SWUPDATE_MAKE_ENV += HAVE_LIBMTD=y -SWUPDATE_MAKE_ENV += HAVE_LIBUBI=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBMTD=n -SWUPDATE_MAKE_ENV += HAVE_LIBUBI=n -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SWUPDATE_DEPENDENCIES += openssl -SWUPDATE_MAKE_ENV += HAVE_LIBSSL=y -SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBSSL=n -SWUPDATE_MAKE_ENV += HAVE_LIBCRYPTO=n -endif - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS),y) -SWUPDATE_DEPENDENCIES += uboot-tools -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=y -else -SWUPDATE_MAKE_ENV += HAVE_LIBUBOOTENV=n -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -SWUPDATE_DEPENDENCIES += zlib -SWUPDATE_MAKE_ENV += HAVE_ZLIB=y -else -SWUPDATE_MAKE_ENV += HAVE_ZLIB=n -endif - -SWUPDATE_BUILD_CONFIG = $(@D)/.config - -SWUPDATE_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)) -SWUPDATE_KCONFIG_EDITORS = menuconfig xconfig gconfig nconfig - -ifeq ($(BR2_STATIC_LIBS),y) -define SWUPDATE_PREFER_STATIC - $(call KCONFIG_ENABLE_OPT,CONFIG_STATIC,$(SWUPDATE_BUILD_CONFIG)) -endef -endif - -define SWUPDATE_SET_BUILD_OPTIONS - $(call KCONFIG_SET_OPT,CONFIG_CROSS_COMPILE,"$(TARGET_CROSS)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_SYSROOT,"$(STAGING_DIR)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_EXTRA_CFLAGS,"$(TARGET_CFLAGS)", \ - $(SWUPDATE_BUILD_CONFIG)) - $(call KCONFIG_SET_OPT,CONFIG_EXTRA_LDFLAGS,"$(TARGET_LDFLAGS)", \ - $(SWUPDATE_BUILD_CONFIG)) -endef - -define SWUPDATE_KCONFIG_FIXUP_CMDS - $(SWUPDATE_PREFER_STATIC) - $(SWUPDATE_SET_BUILD_OPTIONS) -endef - -define SWUPDATE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(SWUPDATE_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define SWUPDATE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/swupdate $(TARGET_DIR)/usr/bin/swupdate - $(if $(BR2_PACKAGE_SWUPDATE_INSTALL_WEBSITE), \ - mkdir -p $(TARGET_DIR)/var/www/swupdate; \ - cp -dpf $(@D)/www/* $(TARGET_DIR)/var/www/swupdate) -endef - -# Checks to give errors that the user can understand -# Must be before we call to kconfig-package -ifeq ($(BR2_PACKAGE_SWUPDATE)$(BR_BUILDING),yy) -ifeq ($(call qstrip,$(BR2_PACKAGE_SWUPDATE_CONFIG)),) -$(error No Swupdate configuration file specified, check your BR2_PACKAGE_SWUPDATE_CONFIG setting) -endif -endif - -$(eval $(kconfig-package)) diff --git a/package.bak/sylpheed/Config.in b/package.bak/sylpheed/Config.in deleted file mode 100644 index f03ae87706..0000000000 --- a/package.bak/sylpheed/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_SYLPHEED - bool "sylpheed" - depends on BR2_PACKAGE_LIBGTK2 - help - lightweight and user-friendly e-mail client. - - http://sylpheed.sraoss.jp/en/ diff --git a/package.bak/sylpheed/sylpheed.hash b/package.bak/sylpheed/sylpheed.hash deleted file mode 100644 index 39c0927735..0000000000 --- a/package.bak/sylpheed/sylpheed.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 4aeb7c6436ad485a2cc101dd68a1fb84abcad4c6471ed9ddefec65e482e5b2b1 sylpheed-3.2.0.tar.bz2 diff --git a/package.bak/sylpheed/sylpheed.mk b/package.bak/sylpheed/sylpheed.mk deleted file mode 100644 index 8d426233b2..0000000000 --- a/package.bak/sylpheed/sylpheed.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# sylpheed -# -################################################################################ - -SYLPHEED_VERSION_MAJOR = 3.2 -SYLPHEED_VERSION = $(SYLPHEED_VERSION_MAJOR).0 -SYLPHEED_SOURCE = sylpheed-$(SYLPHEED_VERSION).tar.bz2 -SYLPHEED_SITE = http://sylpheed.sraoss.jp/sylpheed/v$(SYLPHEED_VERSION_MAJOR) -SYLPHEED_LICENSE = GPLv2+ (executables), LGPLv2.1+ (library, attachment plugin) -SYLPHEED_LICENSE_FILES = COPYING COPYING.LIB -SYLPHEED_CONF_OPTS = --disable-gtkspell --disable-gpgme -SYLPHEED_DEPENDENCIES = host-pkgconf libgtk2 - -# Remove the -I$(includedir) from the Makefiles -# because it refers to the host /usr/include. -define SYLPHEED_PRECONFIGURE - for i in $$(find $(@D) -name "Makefile*"); do \ - sed -i 's:-I$$(includedir)::g' $$i; \ - done -endef - -SYLPHEED_PRE_CONFIGURE_HOOKS += SYLPHEED_PRECONFIGURE - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -SYLPHEED_DEPENDENCIES += openssl -SYLPHEED_CONF_OPTS += --enable-ssl -else -SYLPHEED_CONF_OPTS += --disable-ssl -endif - -$(eval $(autotools-package)) diff --git a/package.bak/synergy/0001-includes.patch b/package.bak/synergy/0001-includes.patch deleted file mode 100644 index accaf8292a..0000000000 --- a/package.bak/synergy/0001-includes.patch +++ /dev/null @@ -1,167 +0,0 @@ -[PATCH] fix build with modern toolchains - -Several files are missing the correct includes for exit/getenvmemcpy/strlen/.. - -Signed-off-by: Peter Korsgaard ---- - lib/arch/CArchDaemonUnix.cpp | 1 + - lib/arch/CMultibyte.cpp | 1 + - lib/base/CStringUtil.cpp | 1 + - lib/client/CClient.cpp | 3 ++- - lib/client/CServerProxy.cpp | 1 + - lib/net/CTCPSocket.cpp | 2 +- - lib/platform/CXWindowsScreen.cpp | 1 + - lib/server/CClientProxy1_3.cpp | 1 + - lib/server/CServer.cpp | 1 + - lib/synergy/CPacketStreamFilter.cpp | 1 + - lib/synergy/IKeyState.cpp | 1 + - lib/synergy/IPrimaryScreen.cpp | 1 + - 12 files changed, 13 insertions(+), 2 deletions(-) - -Index: synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/arch/CArchDaemonUnix.cpp -+++ synergy-1.3.1/lib/arch/CArchDaemonUnix.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - - // - // CArchDaemonUnix -Index: synergy-1.3.1/lib/arch/CMultibyte.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/arch/CMultibyte.cpp -+++ synergy-1.3.1/lib/arch/CMultibyte.cpp -@@ -19,6 +19,7 @@ - #include "CArch.h" - #include - #include -+#include - #if HAVE_LOCALE_H - # include - #endif -Index: synergy-1.3.1/lib/base/CStringUtil.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/base/CStringUtil.cpp -+++ synergy-1.3.1/lib/base/CStringUtil.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - - // -Index: synergy-1.3.1/lib/client/CClient.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/client/CClient.cpp -+++ synergy-1.3.1/lib/client/CClient.cpp -@@ -26,7 +26,8 @@ - #include "CLog.h" - #include "IEventQueue.h" - #include "TMethodEventJob.h" -- -+#include -+#include - // - // CClient - // -Index: synergy-1.3.1/lib/client/CServerProxy.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/client/CServerProxy.cpp -+++ synergy-1.3.1/lib/client/CServerProxy.cpp -@@ -24,6 +24,7 @@ - #include "TMethodEventJob.h" - #include "XBase.h" - #include -+#include - - // - // CServerProxy -Index: synergy-1.3.1/lib/net/CTCPSocket.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/net/CTCPSocket.cpp -+++ synergy-1.3.1/lib/net/CTCPSocket.cpp -@@ -24,7 +24,7 @@ - #include "CArch.h" - #include "XArch.h" - #include -- -+#include - // - // CTCPSocket - // -Index: synergy-1.3.1/lib/platform/CXWindowsScreen.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/platform/CXWindowsScreen.cpp -+++ synergy-1.3.1/lib/platform/CXWindowsScreen.cpp -@@ -27,6 +27,7 @@ - #include "IEventQueue.h" - #include "TMethodEventJob.h" - #include -+#include - #if X_DISPLAY_MISSING - # error X11 is required to build synergy - #else -Index: synergy-1.3.1/lib/server/CClientProxy1_3.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/server/CClientProxy1_3.cpp -+++ synergy-1.3.1/lib/server/CClientProxy1_3.cpp -@@ -17,6 +17,7 @@ - #include "CLog.h" - #include "IEventQueue.h" - #include "TMethodEventJob.h" -+#include - - // - // CClientProxy1_3 -Index: synergy-1.3.1/lib/server/CServer.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/server/CServer.cpp -+++ synergy-1.3.1/lib/server/CServer.cpp -@@ -29,6 +29,7 @@ - #include "TMethodEventJob.h" - #include "CArch.h" - #include -+#include - - // - // CServer -Index: synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/synergy/CPacketStreamFilter.cpp -+++ synergy-1.3.1/lib/synergy/CPacketStreamFilter.cpp -@@ -16,6 +16,7 @@ - #include "IEventQueue.h" - #include "CLock.h" - #include "TMethodEventJob.h" -+#include - - // - // CPacketStreamFilter -Index: synergy-1.3.1/lib/synergy/IKeyState.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/synergy/IKeyState.cpp -+++ synergy-1.3.1/lib/synergy/IKeyState.cpp -@@ -14,6 +14,7 @@ - - #include "IKeyState.h" - #include -+#include - - // - // IKeyState -Index: synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp -=================================================================== ---- synergy-1.3.1.orig/lib/synergy/IPrimaryScreen.cpp -+++ synergy-1.3.1/lib/synergy/IPrimaryScreen.cpp -@@ -13,6 +13,7 @@ - */ - - #include "IPrimaryScreen.h" -+#include - - // - // IPrimaryScreen diff --git a/package.bak/synergy/0002-remove-werror.patch b/package.bak/synergy/0002-remove-werror.patch deleted file mode 100644 index 31a8c2b510..0000000000 --- a/package.bak/synergy/0002-remove-werror.patch +++ /dev/null @@ -1,16 +0,0 @@ -Remove -Werror from CXXFLAGS - -Signed-off-by: Markos Chandras - -Index: synergy-1.3.1/configure.in -=================================================================== ---- synergy-1.3.1.orig/configure.in -+++ synergy-1.3.1/configure.in -@@ -239,7 +239,6 @@ dnl checks for system services - - dnl enable maximum compiler warnings and warnings are errors. - ACX_CXX_WARNINGS --ACX_CXX_WARNINGS_ARE_ERRORS - - dnl adjust compiler and linker variables - CXXFLAGS="$CXXFLAGS $SYNERGY_CXXFLAGS $ARCH_CFLAGS" diff --git a/package.bak/synergy/0003-Fix-build-with-gcc-6.patch b/package.bak/synergy/0003-Fix-build-with-gcc-6.patch deleted file mode 100644 index 843078fe63..0000000000 --- a/package.bak/synergy/0003-Fix-build-with-gcc-6.patch +++ /dev/null @@ -1,86 +0,0 @@ -From b79d478c21ed6af20554ead97da72de845dc3206 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 25 Feb 2017 21:57:19 +0100 -Subject: [PATCH] Fix build with gcc 6 - -Gcc 6.x defaults to C++14, and the iostream operator bool behaviour changed -in C++11. In previous versions, a somewhat odd operator void* was used to -return the status of the stream as a pointer. Since C++11 a more sensible -operator bool is used to return the stream staus. - -For details, see: - -http://en.cppreference.com/w/cpp/io/basic_ios/operator_bool - -The code in CConfigReadContext assumes the pre-C++11 behaviour and provides -its own operator void overload to return the status of the embedded -iostream. With C++11, iostream no longer provides this overload, breaking -the build: - -CConfig.cpp: In member function 'CConfigReadContext::operator void*() const': -CConfig.cpp:1851:9: error: cannot convert 'std::istream {aka std::basic_istream}' to 'void*' in return - return m_stream; - -To fix it, backport part of upstream commit 3d963bfbe7897d0a33ad (possible -fix for mavericks) which changes the code to simply provide a getStream() -method which returns a reference to the embedded stream and the calling code -is changed to use operator bool on the returned stream, making the code -compatible with both old and new compilers. - -This upstream commit is part of the 1.6.0 release, so can be dropped when -the version is bumped. - -Signed-off-by: Peter Korsgaard ---- - lib/server/CConfig.cpp | 7 +------ - lib/server/CConfig.h | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) - -diff --git a/lib/server/CConfig.cpp b/lib/server/CConfig.cpp -index a502fe78..d67dde20 100644 ---- a/lib/server/CConfig.cpp -+++ b/lib/server/CConfig.cpp -@@ -607,7 +607,7 @@ void - CConfig::read(CConfigReadContext& context) - { - CConfig tmp; -- while (context) { -+ while (context.getStream()) { - tmp.readSection(context); - } - *this = tmp; -@@ -1846,11 +1846,6 @@ CConfigReadContext::getLineNumber() const - return m_line; - } - --CConfigReadContext::operator void*() const --{ -- return m_stream; --} -- - bool - CConfigReadContext::operator!() const - { -diff --git a/lib/server/CConfig.h b/lib/server/CConfig.h -index c0d2faa8..0ee453cb 100644 ---- a/lib/server/CConfig.h -+++ b/lib/server/CConfig.h -@@ -480,7 +480,6 @@ public: - bool readLine(CString&); - UInt32 getLineNumber() const; - -- operator void*() const; - bool operator!() const; - - OptionValue parseBoolean(const CString&) const; -@@ -502,6 +501,7 @@ public: - IPlatformScreen::CButtonInfo* - parseMouse(const CString& mouse) const; - KeyModifierMask parseModifier(const CString& modifiers) const; -+ std::istream& getStream() const { return m_stream; }; - - private: - // not implemented --- -2.11.0 - diff --git a/package.bak/synergy/Config.in b/package.bak/synergy/Config.in deleted file mode 100644 index 6b64b79e34..0000000000 --- a/package.bak/synergy/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_SYNERGY - bool "synergy" - depends on BR2_PACKAGE_XORG7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXTST - help - Synergy lets you easily share a single mouse and - keyboard between multiple computers with different - operating systems, each with its own display, - without special hardware. - - http://synergy2.sourceforge.net/ - -comment "synergy needs a toolchain w/ C++, wchar" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/package.bak/synergy/synergy.hash b/package.bak/synergy/synergy.hash deleted file mode 100644 index 2a6950e327..0000000000 --- a/package.bak/synergy/synergy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4a15e26456498dda5f3aa7d688a4892e0c50394a2f01685136fbc954bacc9691 synergy-1.3.1.tar.gz diff --git a/package.bak/synergy/synergy.mk b/package.bak/synergy/synergy.mk deleted file mode 100644 index 7b52085a3e..0000000000 --- a/package.bak/synergy/synergy.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# synergy -# -################################################################################ - -SYNERGY_VERSION = 1.3.1 -SYNERGY_SITE = http://downloads.sourceforge.net/project/synergy2/Sources/$(SYNERGY_VERSION) -SYNERGY_AUTORECONF = YES -SYNERGY_CONF_OPTS = \ - --x-includes=$(STAGING_DIR)/usr/include/X11 \ - --x-libraries=$(STAGING_DIR)/usr/lib -SYNERGY_DEPENDENCIES = \ - xlib_libXtst \ - $(if $(BR2_PACKAGE_XLIB_LIBXINERAMA),xlib_libXinerama) -SYNERGY_LICENSE = GPLv2 -SYNERGY_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/sysdig/Config.in b/package.bak/sysdig/Config.in deleted file mode 100644 index dfb9db5065..0000000000 --- a/package.bak/sysdig/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_SYSDIG - bool "sysdig" - depends on BR2_LINUX_KERNEL - depends on BR2_INSTALL_LIBSTDCPP # libjson - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp - depends on !BR2_STATIC_LIBS # luajit - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_LUAJIT - select BR2_PACKAGE_JSONCPP - help - Sysdig is open source, system-level exploration: - capture system state and activity from a running Linux instance, - then save, filter and analyze. - Think of it as strace + tcpdump + lsof + awesome sauce. - With a little Lua cherry on top. - - http://sysdig.org - -comment "sysdig needs a toolchain w/ C++, gcc >= 4.7, dynamic library and a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || BR2_STATIC_LIBS - depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS diff --git a/package.bak/sysdig/sysdig.hash b/package.bak/sysdig/sysdig.hash deleted file mode 100644 index f64ef9e749..0000000000 --- a/package.bak/sysdig/sysdig.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e72490eaf413745aef87965a5abb1024908053064f86593b257f12bf5b0d6b97 sysdig-0.1.100.tar.gz diff --git a/package.bak/sysdig/sysdig.mk b/package.bak/sysdig/sysdig.mk deleted file mode 100644 index 85d16a4d49..0000000000 --- a/package.bak/sysdig/sysdig.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# sysdig -# -################################################################################ - -SYSDIG_VERSION = 0.1.100 -SYSDIG_SITE = $(call github,draios,sysdig,$(SYSDIG_VERSION)) -SYSDIG_LICENSE = GPLv2 -SYSDIG_LICENSE_FILES = COPYING -SYSDIG_CONF_OPTS = -DUSE_BUNDLED_LUAJIT=OFF -DUSE_BUNDLED_ZLIB=OFF \ - -DUSE_BUNDLED_JSONCPP=OFF -DENABLE_DKMS=OFF -SYSDIG_DEPENDENCIES = zlib luajit jsoncpp -SYSDIG_SUPPORTS_IN_SOURCE_BUILD = NO - -# sysdig creates the module Makefile from a template, which contains a -# single place-holder, KBUILD_FLAGS, wich is only replaced with two -# things: -# - debug flags, which we don't care about here, -# - 'sysdig-feature' flags, which are never set, so always empty -# So, just replace the place-holder with the only meaningful value: nothing. -define SYSDIG_MODULE_GEN_MAKEFILE - $(INSTALL) -m 0644 $(@D)/driver/Makefile.in $(@D)/driver/Makefile - $(SED) 's/@KBUILD_FLAGS@//;' $(@D)/driver/Makefile -endef -SYSDIG_POST_PATCH_HOOKS += SYSDIG_MODULE_GEN_MAKEFILE - -# Don't build the driver as part of the 'standard' procedure, we'll -# build it on our own with the kernel-module infra. -SYSDIG_CONF_OPTS += -DBUILD_DRIVER=OFF - -SYSDIG_MODULE_SUBDIRS = driver -SYSDIG_MODULE_MAKE_OPTS = KERNELDIR=$(LINUX_DIR) - -$(eval $(kernel-module)) -$(eval $(cmake-package)) diff --git a/package.bak/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch b/package.bak/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch deleted file mode 100644 index d3fc0dc188..0000000000 --- a/package.bak/sysklogd/0001-Replace-deprecated-union-wait-with-int.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 76685540a7882926c54bc0d1a8945b7a6abffe40 Mon Sep 17 00:00:00 2001 -From: Ryan Coe -Date: Fri, 7 Oct 2016 19:42:40 -0700 -Subject: [PATCH] Replace deprecated union wait with int - -This is needed for compatibility with glibc >= 2.24. - -Signed-off-by: Ryan Coe ---- - syslogd.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syslogd.c b/syslogd.c -index ea73ea5..ace96c8 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -2094,7 +2094,7 @@ void reapchild() - (void) signal(SIGCHLD, reapchild); /* reset signal handler -ASP */ - wait ((int *)0); - #else -- union wait status; -+ int status; - - while (wait3(&status, WNOHANG, (struct rusage *) NULL) > 0) - ; --- -2.7.4 - diff --git a/package.bak/sysklogd/0002-Fix-improper-header-includes.patch b/package.bak/sysklogd/0002-Fix-improper-header-includes.patch deleted file mode 100644 index 3518ef0270..0000000000 --- a/package.bak/sysklogd/0002-Fix-improper-header-includes.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 7a043f619a91fbb998863c08e3e5e94a4747b11d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:07:36 +0100 -Subject: [PATCH] Fix improper header includes - -When building with the musl C library, a number of warnings indicate -that sysklogd is directly including headers that are considered internal -to the C library: - - - Instead of including , should be included. - - - Instead of including , should be included. - - - Instead of includeing , should be included. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 2 +- - ksym_mod.c | 2 +- - syslog.c | 2 +- - syslogd.c | 2 +- - 4 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/klogd.c b/klogd.c -index 6cc80ed..a173353 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -260,7 +260,7 @@ - #include - #include - #include --#include -+#include - #include - #if !defined(__GLIBC__) - #include -diff --git a/ksym_mod.c b/ksym_mod.c -index 68cd6b6..2e69d65 100644 ---- a/ksym_mod.c -+++ b/ksym_mod.c -@@ -113,7 +113,7 @@ - #include - #include - #include --#include -+#include - #include - #include "module.h" - #if !defined(__GLIBC__) -diff --git a/syslog.c b/syslog.c -index bdb3ff2..f96b43c 100644 ---- a/syslog.c -+++ b/syslog.c -@@ -55,7 +55,7 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; - #include - #include - #include --#include -+#include - #include - #if 0 - #include "syslog.h" -diff --git a/syslogd.c b/syslogd.c -index ace96c8..b5e8054 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -521,7 +521,7 @@ static char sccsid[] = "@(#)syslogd.c 5.27 (Berkeley) 10/10/88"; - #define SYSLOG_NAMES - #include - #include --#include -+#include - #include - #include - #include --- -2.7.4 - diff --git a/package.bak/sysklogd/0003-Remove-include-of-linux-time.h.patch b/package.bak/sysklogd/0003-Remove-include-of-linux-time.h.patch deleted file mode 100644 index 374d89bd05..0000000000 --- a/package.bak/sysklogd/0003-Remove-include-of-linux-time.h.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f4926a61ba2d3766255dd996bf0315bc8fa0c528 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:09:03 +0100 -Subject: [PATCH] Remove include of - -klogd.c and ksym_mod.c currently include if GLIBC is not -defined. Unfortunately, this breaks badly with the musl C library: this -C library is not glibc so it doesn't define GLIBC, but it does have a -definition of "struct timespec" in its header file, which conflict with -the one provided by the Linux kernel headers. - -So, this commit simply gets rid of this header inclusion. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 3 --- - ksym_mod.c | 3 --- - 2 files changed, 6 deletions(-) - -diff --git a/klogd.c b/klogd.c -index a173353..6505d96 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -262,9 +262,6 @@ - #include - #include - #include --#if !defined(__GLIBC__) --#include --#endif /* __GLIBC__ */ - #include - #include - #include -diff --git a/ksym_mod.c b/ksym_mod.c -index 2e69d65..6e26da1 100644 ---- a/ksym_mod.c -+++ b/ksym_mod.c -@@ -116,9 +116,6 @@ - #include - #include - #include "module.h" --#if !defined(__GLIBC__) --#include --#endif /* __GLIBC__ */ - #include - #include - #include --- -2.7.4 - diff --git a/package.bak/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch b/package.bak/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch deleted file mode 100644 index 548f160718..0000000000 --- a/package.bak/sysklogd/0004-Remove-bogus-hand-written-klogctl-syscall-implementa.patch +++ /dev/null @@ -1,38 +0,0 @@ -From fe92a7a8197241f7d6b28ea3c8214bb6d2c7fda4 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:10:55 +0100 -Subject: [PATCH] Remove bogus hand-written klogctl() syscall implementation - -The way the hand-written klogctl() syscall is written cannot compile, as -_syscall3() is just a function provided by the C library, so calling it -outside of a function doesn't build. - -Since the musl C library provides a klogctl() function, we don't need -this hand-written system call anyway. - -Signed-off-by: Thomas Petazzoni ---- - klogd.c | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/klogd.c b/klogd.c -index 6505d96..9219671 100644 ---- a/klogd.c -+++ b/klogd.c -@@ -274,13 +274,8 @@ - - #define __LIBRARY__ - #include --#if !defined(__GLIBC__) --# define __NR_ksyslog __NR_syslog --_syscall3(int,ksyslog,int, type, char *, buf, int, len); --#else - #include - #define ksyslog klogctl --#endif - - #define LOG_BUFFER_SIZE 4096 - #define LOG_LINE_LENGTH 1000 --- -2.7.4 - diff --git a/package.bak/sysklogd/0005-Add-missing-headers-for-open-flags.patch b/package.bak/sysklogd/0005-Add-missing-headers-for-open-flags.patch deleted file mode 100644 index 1a7ad84868..0000000000 --- a/package.bak/sysklogd/0005-Add-missing-headers-for-open-flags.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0dff338a704f4ad11a2b78871e1f2a0b8030b4d2 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:12:37 +0100 -Subject: [PATCH] Add missing headers for open() flags - -Both pidfile.c and syslog.c use open() and its flags, but forgets to -include all relevant headers, causing build failures with the musl C -library. - -Signed-off-by: Thomas Petazzoni ---- - pidfile.c | 2 ++ - syslog.c | 2 ++ - 2 files changed, 4 insertions(+) - -diff --git a/pidfile.c b/pidfile.c -index e0959a0..14de56f 100644 ---- a/pidfile.c -+++ b/pidfile.c -@@ -26,8 +26,10 @@ - - #include - #include -+#include - #include - #include -+#include - #include - #include - #include -diff --git a/syslog.c b/syslog.c -index f96b43c..d09e7aa 100644 ---- a/syslog.c -+++ b/syslog.c -@@ -57,6 +57,8 @@ static char sccsid[] = "@(#)syslog.c 5.28 (Berkeley) 6/27/90"; - #include - #include - #include -+#include -+#include - #if 0 - #include "syslog.h" - #include "pathnames.h" --- -2.7.4 - diff --git a/package.bak/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch b/package.bak/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch deleted file mode 100644 index a1fb5331e4..0000000000 --- a/package.bak/sysklogd/0006-syslogd.c-rename-dprintf-to-mydprintf.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 68213f6902d291d2ba1626fd950fd7d4a1329d33 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 28 Nov 2016 23:13:08 +0100 -Subject: [PATCH] syslogd.c: rename dprintf() to mydprintf() - -There is an existing kludge in syslogd.c to rename all dprintf() -function calls and its definition to mydprintf(). This kludge is only -applied when the glibc C library is used (i.e when GLIBC is defined), -because glibc also provides a dprintf() function, with a different -signature and behavior. - -However, the musl C library also provides the dprintf() function (with -the same signature as the one in glibc, obviously), but does not define -the GLIBC macro, causing a conflicting definition of dprintf. - -This commit fixes that by having the rename kludge used unconditionally. - -Signed-off-by: Thomas Petazzoni ---- - syslogd.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/syslogd.c b/syslogd.c -index b5e8054..22a9ed5 100644 ---- a/syslogd.c -+++ b/syslogd.c -@@ -818,9 +818,7 @@ void doexit(int sig); - void init(); - void cfline(char *line, register struct filed *f); - int decode(char *name, struct code *codetab); --#if defined(__GLIBC__) - #define dprintf mydprintf --#endif /* __GLIBC__ */ - static void dprintf(char *, ...); - static void allocate_log(void); - void sighup_handler(); --- -2.7.4 - diff --git a/package.bak/sysklogd/Config.in b/package.bak/sysklogd/Config.in deleted file mode 100644 index 4188fb8274..0000000000 --- a/package.bak/sysklogd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_SYSKLOGD - bool "syslogd & klogd" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - System log daemons syslogd and klogd. - - http://www.infodrom.org/projects/sysklogd/ diff --git a/package.bak/sysklogd/S01logging b/package.bak/sysklogd/S01logging deleted file mode 100644 index 1cbfe869fa..0000000000 --- a/package.bak/sysklogd/S01logging +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -case "$1" in - start) - printf "Starting logging: " - /sbin/syslogd -m 0 - /sbin/klogd - echo "OK" - ;; - stop) - printf "Stopping logging: " - [ -f /var/run/klogd.pid ] && kill `cat /var/run/klogd.pid` - [ -f /var/run/syslogd.pid ] && kill `cat /var/run/syslogd.pid` - echo "OK" - ;; - restart|reload) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/sysklogd/sysklogd.hash b/package.bak/sysklogd/sysklogd.hash deleted file mode 100644 index dd5b89a884..0000000000 --- a/package.bak/sysklogd/sysklogd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated from download (no sig, hash) -sha256 5166c185ae23c92e8b9feee66a6e3d0bc944bf673112f53e3ecf62e08ce7c201 sysklogd-1.5.1.tar.gz diff --git a/package.bak/sysklogd/sysklogd.mk b/package.bak/sysklogd/sysklogd.mk deleted file mode 100644 index 49997d4f23..0000000000 --- a/package.bak/sysklogd/sysklogd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# sysklogd -# -################################################################################ - -SYSKLOGD_VERSION = 1.5.1 -SYSKLOGD_SITE = http://www.infodrom.org/projects/sysklogd/download -SYSKLOGD_LICENSE = GPLv2+ -SYSKLOGD_LICENSE_FILES = COPYING - -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSKLOGD_DEPENDENCIES = busybox -endif - -# Override SKFLAGS which is used as CFLAGS. -define SYSKLOGD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) SKFLAGS="$(TARGET_CFLAGS) -DSYSV" \ - -C $(@D) -endef - -define SYSKLOGD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0500 $(@D)/syslogd $(TARGET_DIR)/sbin/syslogd - $(INSTALL) -D -m 0500 $(@D)/klogd $(TARGET_DIR)/sbin/klogd - $(INSTALL) -D -m 0644 package/sysklogd/syslog.conf \ - $(TARGET_DIR)/etc/syslog.conf -endef - -define SYSKLOGD_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/sysklogd/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging -endef - -$(eval $(generic-package)) diff --git a/package.bak/sysklogd/syslog.conf b/package.bak/sysklogd/syslog.conf deleted file mode 100644 index 3184139052..0000000000 --- a/package.bak/sysklogd/syslog.conf +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/syslog.conf - Configuration file for syslogd - -auth,authpriv.* /var/log/auth.log -*.*;auth,authpriv.none /var/log/messages -user.* /var/log/user.log - -*.emerg * diff --git a/package.bak/syslog-ng/Config.in b/package.bak/syslog-ng/Config.in deleted file mode 100644 index 7f47d86bcf..0000000000 --- a/package.bak/syslog-ng/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_SYSLOG_NG - bool "syslog-ng" - select BR2_PACKAGE_EVENTLOG - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_PCRE - select BR2_PACKAGE_OPENSSL - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - syslog-ng is an enhanced log daemon, supporting a wide range - of input and output methods: syslog, unstructured text, - queueing, SQL & NoSQL - - https://syslog-ng.org/ - -comment "syslog-ng needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/syslog-ng/S01logging b/package.bak/syslog-ng/S01logging deleted file mode 100644 index d7c899a1e3..0000000000 --- a/package.bak/syslog-ng/S01logging +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -start() { - printf "Starting syslog-ng daemon: " - start-stop-daemon -S -q -p /var/run/syslog-ng.pid \ - -x /usr/sbin/syslog-ng -- --pidfile /var/run/syslog-ng.pid - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping syslog-ng daemon: " - start-stop-daemon -K -q -p /var/run/syslog-ng.pid \ - -x /usr/sbin/syslog-ng - [ $? = 0 ] && echo "OK" || echo "FAIL" -} - -restart() { - stop - sleep 1 - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac - -exit $? diff --git a/package.bak/syslog-ng/syslog-ng.conf b/package.bak/syslog-ng/syslog-ng.conf deleted file mode 100644 index 0b4a860cfa..0000000000 --- a/package.bak/syslog-ng/syslog-ng.conf +++ /dev/null @@ -1,16 +0,0 @@ -@version: 3.7 - -source s_sys { - file("/proc/kmsg" program_override("kernel")); - unix-stream ("/dev/log"); - internal(); -}; - -destination d_all { - file("/var/log/messages"); -}; - -log { - source(s_sys); - destination(d_all); -}; diff --git a/package.bak/syslog-ng/syslog-ng.hash b/package.bak/syslog-ng/syslog-ng.hash deleted file mode 100644 index ba066d1388..0000000000 --- a/package.bak/syslog-ng/syslog-ng.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 5678856a550ae790618fabde9d1447f932ce7a9080d55dca8fc5df1202c70a17 syslog-ng-3.9.1.tar.gz diff --git a/package.bak/syslog-ng/syslog-ng.mk b/package.bak/syslog-ng/syslog-ng.mk deleted file mode 100644 index 61fc48fd4a..0000000000 --- a/package.bak/syslog-ng/syslog-ng.mk +++ /dev/null @@ -1,114 +0,0 @@ -################################################################################ -# -# syslog-ng -# -################################################################################ - -SYSLOG_NG_VERSION = 3.9.1 -SYSLOG_NG_SITE = https://github.com/balabit/syslog-ng/releases/download/syslog-ng-$(SYSLOG_NG_VERSION) -SYSLOG_NG_LICENSE = LGPLv2.1+ (syslog-ng core), GPLv2+ (modules) -SYSLOG_NG_LICENSE_FILES = COPYING -SYSLOG_NG_DEPENDENCIES = host-bison host-flex host-pkgconf \ - eventlog libglib2 openssl pcre -# rabbit-mq needs -lrt -SYSLOG_NG_CONF_ENV = LIBS=-lrt -SYSLOG_NG_CONF_OPTS = --disable-manpages --localstatedir=/var/run \ - --disable-java --disable-java-modules - -# We override busybox's S01logging init script -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSLOG_NG_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_GEOIP),y) -SYSLOG_NG_DEPENDENCIES += geoip -SYSLOG_NG_CONF_OPTS += --enable-geoip -else -SYSLOG_NG_CONF_OPTS += --disable-geoip -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -SYSLOG_NG_DEPENDENCIES += libcap -SYSLOG_NG_CONF_OPTS += --enable-linux-caps -else -SYSLOG_NG_CONF_OPTS += --disable-linux-caps -endif - -ifeq ($(BR2_PACKAGE_PYTHON),y) -SYSLOG_NG_DEPENDENCIES += python -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON_VERSION_MAJOR) -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -SYSLOG_NG_DEPENDENCIES += python3 -SYSLOG_NG_CONF_OPTS += \ - --enable-python \ - --with-python=$(PYTHON3_VERSION_MAJOR) -else -SYSLOG_NG_CONF_OPTS += \ - --disable-python \ - --without-python -endif - -ifeq ($(BR2_PACKAGE_LIBESMTP),y) -SYSLOG_NG_DEPENDENCIES += libesmtp -SYSLOG_NG_CONF_OPTS += --enable-smtp -SYSLOG_NG_CONF_OPTS += --with-libesmtp="$(STAGING_DIR)/usr" -else -SYSLOG_NG_CONF_OPTS += --disable-smtp -endif - -ifeq ($(BR2_PACKAGE_JSON_C),y) -SYSLOG_NG_DEPENDENCIES += json-c -SYSLOG_NG_CONF_OPTS += --enable-json -else -SYSLOG_NG_CONF_OPTS += --disable-json -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -SYSLOG_NG_DEPENDENCIES += util-linux -endif - -ifeq ($(BR2_PACKAGE_LIBNET),y) -SYSLOG_NG_DEPENDENCIES += libnet -SYSLOG_NG_CONF_OPTS += --enable-spoof-source -else -SYSLOG_NG_CONF_OPTS += --disable-spoof-source -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -SYSLOG_NG_DEPENDENCIES += libcurl -SYSLOG_NG_CONF_OPTS += --enable-http -SYSLOG_NG_CONF_OPTS += --with-libcurl="$(STAGING_DIR)/usr" -else -SYSLOG_NG_CONF_OPTS += --disable-http -endif - -ifeq ($(BR2_INIT_SYSTEMD),y) -SYSLOG_NG_DEPENDENCIES += systemd -SYSLOG_NG_CONF_OPTS += \ - --enable-systemd \ - --with-systemdsystemunitdir=/usr/lib/systemd/system -else -SYSLOG_NG_CONF_OPTS += --disable-systemd -endif - -define SYSLOG_NG_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/syslog-ng/S01logging \ - $(TARGET_DIR)/etc/init.d/S01logging -endef - -# By default syslog-ng installs a number of sample configuration -# files. Some of these rely on optional features being -# enabled. Because of this buildroot uninstalls the shipped config -# files and provides a simplified configuration. -define SYSLOG_NG_FIXUP_CONFIG - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) scl-uninstall-local - $(INSTALL) -D -m 0644 package/syslog-ng/syslog-ng.conf \ - $(TARGET_DIR)/etc/syslog-ng.conf -endef - -SYSLOG_NG_POST_INSTALL_TARGET_HOOKS = SYSLOG_NG_FIXUP_CONFIG - -$(eval $(autotools-package)) diff --git a/package.bak/sysprof/0001-define-NT_GNU_BUILD_ID.patch b/package.bak/sysprof/0001-define-NT_GNU_BUILD_ID.patch deleted file mode 100644 index dcc2cbe67c..0000000000 --- a/package.bak/sysprof/0001-define-NT_GNU_BUILD_ID.patch +++ /dev/null @@ -1,22 +0,0 @@ -On uclibc elf.h does not have GNU extentions but we need this define -so we define it locally if its not getting it from elf.h - -Signed-off-by: Khem Raj - -Upstream-Status: Pending - -Index: git/elfparser.h -=================================================================== ---- git.orig/elfparser.h 2011-07-16 18:57:41.000000000 -0700 -+++ git/elfparser.h 2011-07-16 20:28:54.733829895 -0700 -@@ -17,6 +17,10 @@ - */ - #include - -+#ifndef NT_GNU_BUILD_ID -+#define NT_GNU_BUILD_ID 3 -+#endif -+ - typedef struct ElfSym ElfSym; - typedef struct ElfParser ElfParser; - diff --git a/package.bak/sysprof/Config.in b/package.bak/sysprof/Config.in deleted file mode 100644 index e1b0488e84..0000000000 --- a/package.bak/sysprof/Config.in +++ /dev/null @@ -1,31 +0,0 @@ -config BR2_PACKAGE_SYSPROF - bool "sysprof" - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - depends on BR2_USE_MMU # glib2 - # In its util.h file, sysprof contains architecture-specific - # code - depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb - help - Sysprof is a statistical, system-wide profiler that can - profile user and kernel code using the perf API. - - http://sysprof.com - -if BR2_PACKAGE_SYSPROF - -config BR2_PACKAGE_SYSPROF_GUI - bool "sysprof GUI" - depends on BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBGLADE - select BR2_PACKAGE_GDK_PIXBUF - help - GUI for the sysprof system-wide statistical profiler. - -endif - -comment "sysprof needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_i386 || BR2_x86_64 || BR2_powerpc || BR2_sh4a || BR2_sh4aeb - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/sysprof/sysprof.hash b/package.bak/sysprof/sysprof.hash deleted file mode 100644 index 8541ecc1a1..0000000000 --- a/package.bak/sysprof/sysprof.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 baf03c6fc01a845c705873e6fc7927aa89539dcda6963f9ec4c8eb4c086a64f1 sysprof-1.2.0.tar.gz diff --git a/package.bak/sysprof/sysprof.mk b/package.bak/sysprof/sysprof.mk deleted file mode 100644 index 0650781e48..0000000000 --- a/package.bak/sysprof/sysprof.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# sysprof -# -################################################################################ - -SYSPROF_VERSION = 1.2.0 -SYSPROF_SITE = http://sysprof.com -SYSPROF_DEPENDENCIES = libglib2 -SYSPROF_LICENSE = GPLv2+ -SYSPROF_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_SYSPROF_GUI),y) -SYSPROF_DEPENDENCIES += libgtk2 libglade gdk-pixbuf -endif - -define SYSPROF_CREATE_M4_DIR - mkdir -p $(@D)/m4 -endef - -SYSPROF_POST_PATCH_HOOKS += SYSPROF_CREATE_M4_DIR - -$(eval $(autotools-package)) diff --git a/package.bak/sysstat/Config.in b/package.bak/sysstat/Config.in deleted file mode 100644 index c262799104..0000000000 --- a/package.bak/sysstat/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -config BR2_PACKAGE_SYSSTAT - bool "sysstat" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - # Uses fork() - depends on BR2_USE_MMU - help - The sysstat utilities are a collection of performance - monitoring tools for Linux. These include sar, sadf, mpstat, - iostat, pidstat and sa tools. - - Some Features : - - * Input / Output and transfer rate statistics (global, per - device, per partition, per network filesystem and per - Linux task / PID) - * CPU statistics (global, per CPU and per Linux task / - PID), including support for virtualization architectures - * Memory and swap space utilization statistics - * Virtual memory, paging and fault statistics - * Per-task (per-PID) memory and page fault statistics - * Global CPU and page fault statistics for tasks and all - their children - * Process creation activity - * Interrupt statistics (global, per CPU and per interrupt, - including potential APIC interrupt sources) - * Extensive network statistics: network interface activity - (number of packets and kB received and transmitted per - second, etc.) including failures from network devices; - network traffic statistics for IP, TCP, ICMP and UDP - protocols based on SNMPv2 standards; support for - IPv6-related protocols. - * NFS server and client activity - * Socket statistics - * Run queue and system load statistics - * Kernel internal tables utilization statistics - * System and per Linux task switching activity - * Swapping statistics - * TTY device activity - * Power management statistics - - http://pagesperso-orange.fr/sebastien.godard/ diff --git a/package.bak/sysstat/sysstat.hash b/package.bak/sysstat/sysstat.hash deleted file mode 100644 index 3b4dda8f15..0000000000 --- a/package.bak/sysstat/sysstat.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From: http://sebastien.godard.pagesperso-orange.fr/download.html -sha1 805002b2bef00cd9ab44c5037d09b29cb71a17f8 sysstat-11.4.3.tar.xz -# Locally calculated -sha256 02e9cafa5557fbae435d33e592373655df929d817ae711d31142dd2f7d4dcee7 sysstat-11.4.3.tar.xz diff --git a/package.bak/sysstat/sysstat.mk b/package.bak/sysstat/sysstat.mk deleted file mode 100644 index c2853422a9..0000000000 --- a/package.bak/sysstat/sysstat.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# sysstat -# -################################################################################ - -SYSSTAT_VERSION = 11.4.3 -SYSSTAT_SOURCE = sysstat-$(SYSSTAT_VERSION).tar.xz -SYSSTAT_SITE = http://pagesperso-orange.fr/sebastien.godard -SYSSTAT_CONF_OPTS = --disable-man-group --disable-sensors -SYSSTAT_DEPENDENCIES = host-gettext -SYSSTAT_LICENSE = GPLv2+ -SYSSTAT_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -SYSSTAT_DEPENDENCIES += gettext -SYSSTAT_MAKE_OPTS += LFLAGS="$(TARGET_LDFLAGS) -lintl" -endif - -# The isag tool is a post processing script that depends on tcl/tk -# among other things. So we don't install it. -SYSSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) INSTALL_ISAG=n install - -$(eval $(autotools-package)) diff --git a/package.bak/systemd-bootchart/Config.in b/package.bak/systemd-bootchart/Config.in deleted file mode 100644 index 8deb6b9b7b..0000000000 --- a/package.bak/systemd-bootchart/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_SYSTEMD_BOOTCHART - bool "systemd-bootchart" - depends on BR2_INIT_SYSTEMD - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - help - systemd-bootchart is a tool, usually run at system startup, - that collects the CPU load, disk load, memory usage, as well - as per-process information from a running system. Collected - results are output as an SVG graph. - - systemd-bootchart requires a Linux kernel >= 3.0 with the - following options enabled: - - - CONFIG_SCHEDSTATS - - CONFIG_SCHED_DEBUG - - These options will be automatically enabled by Buildroot if - it is responsible for building the kernel. Otherwise, if you - are building your kernel outside of Buildroot, make sure - these options are enabled. - - http://www.freedesktop.org/software/systemd/man/systemd-bootchart.html - -comment "systemd-bootchart needs a toolchain w/ headers >= 3.17" - depends on BR2_INIT_SYSTEMD - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 diff --git a/package.bak/systemd-bootchart/systemd-bootchart.hash b/package.bak/systemd-bootchart/systemd-bootchart.hash deleted file mode 100644 index 2d2175a0b4..0000000000 --- a/package.bak/systemd-bootchart/systemd-bootchart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 1ef7b4f440bf53aced26979cf8153482840699c556700671eb5dadb4222c70bd systemd-bootchart-231.tar.xz diff --git a/package.bak/systemd-bootchart/systemd-bootchart.mk b/package.bak/systemd-bootchart/systemd-bootchart.mk deleted file mode 100644 index 31b9413bc5..0000000000 --- a/package.bak/systemd-bootchart/systemd-bootchart.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# systemd-bootchart -# -################################################################################ - -SYSTEMD_BOOTCHART_VERSION = 231 -SYSTEMD_BOOTCHART_SOURCE = systemd-bootchart-$(SYSTEMD_BOOTCHART_VERSION).tar.xz -# Do not use the github helper here: the uploaded release tarball already -# contains the generated autotools scripts. It also slightly differs with -# two missing source files... :-/ -SYSTEMD_BOOTCHART_SITE = https://github.com/systemd/systemd-bootchart/releases/download/v$(SYSTEMD_BOOTCHART_VERSION) -SYSTEMD_BOOTCHART_LICENSE = LGPLv2.1+ -SYSTEMD_BOOTCHART_LICENSE_FILES = LICENSE.LGPL2.1 -SYSTEMD_BOOTCHART_DEPENDENCIES = systemd - -SYSTEMD_BOOTCHART_CONF_OPTS = --disable-man - -$(eval $(autotools-package)) diff --git a/package.bak/systemd/0001-fix-getty-unit.patch b/package.bak/systemd/0001-fix-getty-unit.patch deleted file mode 100644 index 8ec3bcf25a..0000000000 --- a/package.bak/systemd/0001-fix-getty-unit.patch +++ /dev/null @@ -1,30 +0,0 @@ -Prefer getty to agetty in console setup systemd units - -Signed-off-by: Maxime Ripard -Signed-off-by: Eric Le Bihan ---- - -diff -aburN systemd-212.orig/units/getty@.service.m4 systemd-212/units/getty@.service.m4 ---- systemd-212.orig/units/getty@.service.m4 2014-01-28 11:08:51.000000000 +0100 -+++ systemd-212/units/getty@.service.m4 2014-03-26 11:06:27.000000000 +0100 -@@ -27,7 +27,7 @@ - - [Service] - # the VT is cleared by TTYVTDisallocate --ExecStart=-/sbin/agetty --noclear %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 -diff -aburN systemd-212.orig/units/serial-getty@.service.m4 systemd-212/units/serial-getty@.service.m4 ---- systemd-212.orig/units/serial-getty@.service.m4 2014-03-13 18:47:24.000000000 +0100 -+++ systemd-212/units/serial-getty@.service.m4 2014-03-26 11:07:01.000000000 +0100 -@@ -22,7 +22,7 @@ - IgnoreOnIsolate=yes - - [Service] --ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM -+ExecStart=-/sbin/getty -L %I 115200 vt100 - Type=idle - Restart=always - RestartSec=0 diff --git a/package.bak/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch b/package.bak/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch deleted file mode 100644 index 2c1d929ebc..0000000000 --- a/package.bak/systemd/0002-build-sys-revert-use-of-ln-relative-option.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 32b6c22006767f0762edfa116b8b0f7be0c5c121 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Wed, 27 Jul 2016 15:43:16 +0200 -Subject: [PATCH] build-sys: revert use of ln relative option. - -Systemd build system now uses the `--relative` option from `ln(1)`. - -This option was added to GNU coreutils 8.16, which is not widely -deployed yet by GNU/Linux distributions (not available in Debian Wheezy -for example). - -Signed-off-by: Eric Le Bihan -[Maxime: refresh the patch] -[Vincent: - refresh the patch, move-to-rootlibdir removed by: - https://github.com/systemd/systemd/commit/082210c7a837063fd8b520b18c221b42059d7eff -] -Signed-off-by: Maxime Hadjinlian -Signed-off-by: Vicente Olivert Riera ---- - Makefile.am | 11 ++--------- - configure.ac | 2 -- - 2 files changed, 2 insertions(+), 11 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 0c27f81..4de1595 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -312,9 +312,9 @@ install-aliases-hook: - set -- $(SYSTEM_UNIT_ALIASES) && \ - dir=$(systemunitdir) && $(install-aliases) - set -- $(USER_UNIT_ALIASES) && \ -- dir=$(userunitdir) && $(install-relative-aliases) -+ dir=$(userunitdir) && $(install-aliases) - set -- $(GENERAL_ALIASES) && \ -- dir= && $(install-relative-aliases) -+ dir= && $(install-aliases) - - define install-aliases - while [ -n "$$1" ]; do \ -@@ -325,15 +325,6 @@ define install-aliases - done - endef - --define install-relative-aliases -- while [ -n "$$1" ]; do \ -- $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \ -- rm -f $(DESTDIR)$$dir/$$2 && \ -- $(LN_S) --relative $(DESTDIR)$$1 $(DESTDIR)$$dir/$$2 && \ -- shift 2 || exit $$?; \ -- done --endef -- - install-touch-usr-hook: - touch -c $(DESTDIR)/$(prefix) - -diff --git a/configure.ac b/configure.ac -index cf595e6..d58f303 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -110,8 +110,6 @@ AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([MOUNT_PATH], [mount], [/usr/bin/mount], [$PATH:/usr/sbin:/sbin]) - AC_PATH_PROG([UMOUNT_PATH], [umount], [/usr/bin/umount], [$PATH:/usr/sbin:/sbin]) - --AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])]) -- - M4_DEFINES= - - AC_CHECK_TOOL(OBJCOPY, objcopy) --- -2.8.1 - diff --git a/package.bak/systemd/0003-fix-am-path-libgcrypt-no-found.patch b/package.bak/systemd/0003-fix-am-path-libgcrypt-no-found.patch deleted file mode 100644 index 2287ac5115..0000000000 --- a/package.bak/systemd/0003-fix-am-path-libgcrypt-no-found.patch +++ /dev/null @@ -1,145 +0,0 @@ -Fix AM_PATH_LIBGCRYPT not found - -This patch installs a copy of libgcrypt.m4 from the libgcrypt source tarball -to systemd m4 directory. - -Libgcrypt uses a custom m4 macro and not pkg-config to check if the -development files are available. Though libgcrypt support is optional in -systemd, this macro should be available whenever autoreconf is used, otherwise -the re-configuration will fail with: - - configure.ac:616: warning: macro 'AM_PATH_LIBGCRYPT' not found in library - -As asking the user to install the development package of libgcrypt on the host -machine or adding libgcrypt as a build dependency to systemd is not -acceptable, the required file is added to the m4 directory. - -Signed-off-by: Eric Le Bihan -Index: systemd-213/m4/libgcrypt.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ systemd-213/m4/libgcrypt.m4 2014-06-11 10:41:11.749305509 +0200 -@@ -0,0 +1,123 @@ -+dnl Autoconf macros for libgcrypt -+dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. -+dnl -+dnl This file is free software; as a special exception the author gives -+dnl unlimited permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+dnl This file is distributed in the hope that it will be useful, but -+dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -+dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -+dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -+dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -+dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -+dnl with the API version to also check the API compatibility. Example: -+dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -+dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -+dnl this features allows to prevent build against newer versions of libgcrypt -+dnl with a changed API. -+dnl -+AC_DEFUN([AM_PATH_LIBGCRYPT], -+[ AC_ARG_WITH(libgcrypt-prefix, -+ AC_HELP_STRING([--with-libgcrypt-prefix=PFX], -+ [prefix where LIBGCRYPT is installed (optional)]), -+ libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") -+ if test x$libgcrypt_config_prefix != x ; then -+ if test x${LIBGCRYPT_CONFIG+set} != xset ; then -+ LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config -+ fi -+ fi -+ -+ AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) -+ tmp=ifelse([$1], ,1:1.2.0,$1) -+ if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then -+ req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` -+ min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` -+ else -+ req_libgcrypt_api=0 -+ min_libgcrypt_version="$tmp" -+ fi -+ -+ AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) -+ ok=no -+ if test "$LIBGCRYPT_CONFIG" != "no" ; then -+ req_major=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` -+ req_minor=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` -+ req_micro=`echo $min_libgcrypt_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` -+ libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` -+ major=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` -+ minor=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` -+ micro=`echo $libgcrypt_config_version | \ -+ sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` -+ if test "$major" -gt "$req_major"; then -+ ok=yes -+ else -+ if test "$major" -eq "$req_major"; then -+ if test "$minor" -gt "$req_minor"; then -+ ok=yes -+ else -+ if test "$minor" -eq "$req_minor"; then -+ if test "$micro" -ge "$req_micro"; then -+ ok=yes -+ fi -+ fi -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ AC_MSG_RESULT([yes ($libgcrypt_config_version)]) -+ else -+ AC_MSG_RESULT(no) -+ fi -+ if test $ok = yes; then -+ # If we have a recent libgcrypt, we should also check that the -+ # API is compatible -+ if test "$req_libgcrypt_api" -gt 0 ; then -+ tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` -+ if test "$tmp" -gt 0 ; then -+ AC_MSG_CHECKING([LIBGCRYPT API version]) -+ if test "$req_libgcrypt_api" -eq "$tmp" ; then -+ AC_MSG_RESULT([okay]) -+ else -+ ok=no -+ AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) -+ fi -+ fi -+ fi -+ fi -+ if test $ok = yes; then -+ LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` -+ LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` -+ ifelse([$2], , :, [$2]) -+ if test x"$host" != x ; then -+ libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` -+ if test x"$libgcrypt_config_host" != xnone ; then -+ if test x"$libgcrypt_config_host" != x"$host" ; then -+ AC_MSG_WARN([[ -+*** -+*** The config script $LIBGCRYPT_CONFIG was -+*** built for $libgcrypt_config_host and thus may not match the -+*** used host $host. -+*** You may want to use the configure option --with-libgcrypt-prefix -+*** to specify a matching config script. -+***]]) -+ fi -+ fi -+ fi -+ else -+ LIBGCRYPT_CFLAGS="" -+ LIBGCRYPT_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(LIBGCRYPT_CFLAGS) -+ AC_SUBST(LIBGCRYPT_LIBS) -+]) diff --git a/package.bak/systemd/Config.in b/package.bak/systemd/Config.in deleted file mode 100644 index aaed7dc020..0000000000 --- a/package.bak/systemd/Config.in +++ /dev/null @@ -1,325 +0,0 @@ -config BR2_PACKAGE_SYSTEMD_ARCH_SUPPORTS - bool - # see src/shared/architecture.h - default y if BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || \ - BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sh4 || BR2_sh4eb || \ - BR2_sh4a || BR2_sh4aeb || BR2_sparc || BR2_x86_64 || \ - BR2_aarch64 || BR2_m68k - -menuconfig BR2_PACKAGE_SYSTEMD - bool "systemd" - depends on BR2_INIT_SYSTEMD - depends on !BR2_STATIC_LIBS # kmod - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_DBUS # runtime dependency only - select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_BINARIES - select BR2_PACKAGE_UTIL_LINUX_MOUNT - select BR2_PACKAGE_UTIL_LINUX_NOLOGIN - select BR2_PACKAGE_KMOD - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # kmod-tools - select BR2_PACKAGE_KMOD_TOOLS - help - systemd is a system and service manager for Linux, compatible with - SysV and LSB init scripts. systemd provides aggressive parallelization - capabilities, uses socket and D-Bus activation for starting services, - offers on-demand starting of daemons, keeps track of processes using - Linux cgroups, supports snapshotting and restoring of the system - state, maintains mount and automount points and implements an - elaborate transactional dependency-based service control logic. - It can work as a drop-in replacement for sysvinit. - - Systemd requires a Linux kernel >= 3.0 with the following options - enabled: - - - CONFIG_CGROUPS - - CONFIG_INOTIFY_USER - - CONFIG_FHANDLE - - CONFIG_AUTOFS4_FS - - CONFIG_TMPFS_POSIX_ACL - - CONFIG_TMPFS_XATTR - - These options will be automatically enabled by Buildroot if - it is responsible for building the kernel. Otherwise, if you - are building your kernel outside of Buildroot, make sure - these options are enabled. - - Systemd also provides udev, the userspace device daemon. - - The selection of other packages will enable some features: - - - acl package will add support for multi-seat. - - xz and/or l4 packages will add compression support in - journal and coredump. - - libcurl package will add support for systemd-journal-upload. - - libgcrypt package will add support for journal sealing and - DNSSEC verification in resolved. - - http://freedesktop.org/wiki/Software/systemd - -if BR2_PACKAGE_SYSTEMD - -config BR2_PACKAGE_PROVIDES_UDEV - default "systemd" - -config BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY - bool "HTTP server for journal events" - select BR2_PACKAGE_LIBMICROHTTPD - help - systemd-journal-gatewayd serves journal events over the - network. Clients must connect using HTTP. The server - listens on port 19531 by default. - - http://www.freedesktop.org/software/systemd/man/systemd-journal-gatewayd.service.html - -config BR2_PACKAGE_SYSTEMD_BACKLIGHT - bool "enable backlight support" - help - systemd-backlight is a service that restores the display - backlight brightness at early boot and saves it at shutdown. - - http://www.freedesktop.org/software/systemd/man/systemd-backlight@.service.html - -config BR2_PACKAGE_SYSTEMD_BINFMT - bool "enable binfmt tool" - help - systemd-binfmt is an early boot service that registers - additional binary formats for executables in the kernel. - - http://www.freedesktop.org/software/systemd/man/systemd-binfmt.service.html - -config BR2_PACKAGE_SYSTEMD_COREDUMP - bool "enable coredump hook" - help - systemd-coredump can be used as a helper binary by the - kernel when a user space program receives a fatal signal and - dumps core. - - http://www.freedesktop.org/software/systemd/man/systemd-coredump.html - -config BR2_PACKAGE_SYSTEMD_FIRSTBOOT - bool "enable firstboot support" - help - systemd-firstboot initializes the most basic system settings - interactively on the first boot. - - http://www.freedesktop.org/software/systemd/man/systemd-firstboot.html - -config BR2_PACKAGE_SYSTEMD_HIBERNATE - bool "enable hibernation support" - help - When this features is enabled, additional tools and services - are built to support suspending and resuming the system. - - http://www.freedesktop.org/software/systemd/man/systemd-sleep.html - -config BR2_PACKAGE_SYSTEMD_HOSTNAMED - bool "enable hostname daemon" - default y - help - systemd-hostnamed is a system service that may be used as a - mechanism to change the system's hostname. - - http://www.freedesktop.org/software/systemd/man/systemd-hostnamed.service.html - -config BR2_PACKAGE_SYSTEMD_HWDB - bool "enable hwdb installation" - default y - help - Enables hardware database installation to /usr/lib/udev/hwdb.d - - Disabling this option improves first boot time (or every boot - time in case of initramfs images) and saves several MB space. - - https://www.freedesktop.org/software/systemd/man/hwdb.html - -config BR2_PACKAGE_SYSTEMD_IMPORTD - bool "enable import daemon" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LZ4 - select BR2_PACKAGE_XZ - select BR2_PACKAGE_ZLIB - help - systemd-importd is a system service that manages virtual - machine and container images for systemd-machined and - machinectl. - - http://www.freedesktop.org/software/systemd/man/machinectl.html#Image%20Transfer%20Commands - -config BR2_PACKAGE_SYSTEMD_KDBUS - bool "enable kdbus support" - help - Enable kdbus support for Systemd. - -config BR2_PACKAGE_SYSTEMD_LOCALED - bool "enable locale daemon" - help - systemd-localed is a system service that may be used as - mechanism to change the system locale settings, as well as - the console key mapping and default X11 key mapping. - - http://www.freedesktop.org/software/systemd/man/systemd-localed.service.html - -config BR2_PACKAGE_SYSTEMD_LOGIND - bool "enable login daemon" - help - systemd-logind is a system service that manages user logins. - - http://www.freedesktop.org/software/systemd/man/systemd-logind.service.html - -config BR2_PACKAGE_SYSTEMD_MACHINED - bool "enable machine daemon" - help - systemd-machined is a system service that keeps track of - virtual machines and containers, and processes belonging to - them. - - http://www.freedesktop.org/software/systemd/man/systemd-machined.service.html - -config BR2_PACKAGE_SYSTEMD_MYHOSTNAME - bool "enable myhostname NSS plugin" - default y - help - nss-myhostname is a plug-in module for the GNU Name Service - Switch (NSS) functionality of the GNU C Library (glibc), - primarily providing hostname resolution for the locally - configured system hostname as returned by gethostname(2). - - http://www.freedesktop.org/software/systemd/man/nss-myhostname.html - -config BR2_PACKAGE_SYSTEMD_NETWORKD - bool "enable network manager" - default y - help - systemd-networkd is a system service that manages networks. - It detects and configures network devices as they appear, as well as - creating virtual network devices. - - This simple network configuration solution is an alternative to - dhcpcd or ISC dhcp. - - http://www.freedesktop.org/software/systemd/man/systemd-networkd.html - -config BR2_PACKAGE_SYSTEMD_POLKIT - bool "enable polkit support" - select BR2_PACKAGE_POLKIT - help - If enabled, systemd is built with polkit support and policy - files for its services are generated and installed. It is - useful for allowing unprivileged processes to speak to - systemd's many privileged processes. - - http://wiki.freedesktop.org/www/Software/polkit/ - -config BR2_PACKAGE_SYSTEMD_QUOTACHECK - bool "enable quotacheck tools" - help - systemd-quotacheck is a service responsible for file system - quota checks. It is run once at boot after all necessary - file systems are mounted. It is pulled in only if at least - one file system has quotas enabled. - - http://www.freedesktop.org/software/systemd/man/systemd-quotacheck.service.html - -config BR2_PACKAGE_SYSTEMD_RANDOMSEED - bool "enable random-seed support" - help - systemd-random-seed is a service that restores the random - seed of the system at early boot and saves it at - shutdown. Saving/restoring the random seed across boots - increases the amount of available entropy early at boot. - - http://www.freedesktop.org/software/systemd/man/systemd-random-seed.service.html - -config BR2_PACKAGE_SYSTEMD_RESOLVED - bool "enable resolve daemon" - default y - help - systemd-resolved is a system service that provides network - name resolution to local applications. It implements a - caching and validating DNS/DNSSEC stub resolver, as well as - an LLMNR resolver and responder. - - http://www.freedesktop.org/software/systemd/man/systemd-resolved.html - -config BR2_PACKAGE_SYSTEMD_RFKILL - bool "enable rfkill tools" - help - systemd-rfkill is a service that restores the RF kill switch - state at early boot and saves it at shutdown. - - http://www.freedesktop.org/software/systemd/man/systemd-rfkill@.service.html - -config BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT - bool "enable SMACK support" - select BR2_PACKAGE_ATTR - select BR2_PACKAGE_SMACK - help - Enable support for SMACK, the Simple Mandatory Access Control - Kernel, a minimal approach to Access Control implemented as a kernel - LSM. - - This feature requires a kernel >= 3.8. - - When this feature is enabled, Systemd mounts smackfs and manages - security labels for sockets. - -config BR2_PACKAGE_SYSTEMD_SYSUSERS - bool "enable sysusers support" - help - systemd-sysusers creates system users and groups, based on - the file format and location specified in sysusers.d(5). - - http://www.freedesktop.org/software/systemd/man/systemd-sysusers.html - -config BR2_PACKAGE_SYSTEMD_TIMEDATED - bool "enable timedate daemon" - default y - help - systemd-timedated is a system service that may be used as a - mechanism to change the system clock and timezone, as well - as to enable/disable NTP time synchronization. - - http://www.freedesktop.org/software/systemd/man/systemd-timedated.service.html - -config BR2_PACKAGE_SYSTEMD_TIMESYNCD - bool "enable timesync daemon" - default y - help - systemd-timesyncd is a service that may be used to synchronize the - local system clock with a Network Time Protocol server. - - This simple NTP solution is an alternative to sntp/ntpd from the ntp - package. - - http://www.freedesktop.org/software/systemd/man/systemd-timesyncd.html - -config BR2_PACKAGE_SYSTEMD_TMPFILES - bool "enable tmpfiles support" - default y - help - systemd-tmpfiles creates, deletes, and cleans up volatile - and temporary files and directories, based on the - configuration file format and location specified in - tmpfiles.d(5). - - http://www.freedesktop.org/software/systemd/man/systemd-tmpfiles.html - -config BR2_PACKAGE_SYSTEMD_VCONSOLE - bool "enable vconsole tool" - help - systemd-vconsole-setup is an early boot service that - configures the virtual console font and console keymap. - - http://www.freedesktop.org/software/systemd/man/systemd-vconsole-setup.service.html - -endif diff --git a/package.bak/systemd/dhcp.network b/package.bak/systemd/dhcp.network deleted file mode 100644 index 9b636fa989..0000000000 --- a/package.bak/systemd/dhcp.network +++ /dev/null @@ -1,4 +0,0 @@ -[Match] -Name=SYSTEMD_NETWORKD_DHCP_IFACE -[Network] -DHCP=ipv4 diff --git a/package.bak/systemd/network.service b/package.bak/systemd/network.service deleted file mode 100644 index 0d77bb824a..0000000000 --- a/package.bak/systemd/network.service +++ /dev/null @@ -1,21 +0,0 @@ -[Unit] -Description=Network Connectivity -Wants=network.target -Before=network.target - -[Service] -Type=oneshot -RemainAfterExit=yes - -# lo is brought up earlier, which will cause the upcoming "ifup -a" to fail -# with exit code 1, due to an "ip: RTNETLINK answers: File exists" error during -# its "ip addr add ..." command, subsequently causing this unit to fail even -# though it is a benign error. Flushing the lo address with the command below -# before ifup prevents this failure. -ExecStart=/sbin/ip addr flush dev lo - -ExecStart=/sbin/ifup -a -ExecStop=/sbin/ifdown -a - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/systemd/systemd.hash b/package.bak/systemd/systemd.hash deleted file mode 100644 index 0acaa3cdcd..0000000000 --- a/package.bak/systemd/systemd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# sha256 locally computed -sha256 1172c7c7d5d72fbded53186e7599d5272231f04cc8b72f9a0fb2c5c20dfc4880 systemd-232.tar.gz diff --git a/package.bak/systemd/systemd.mk b/package.bak/systemd/systemd.mk deleted file mode 100644 index fce5d8411c..0000000000 --- a/package.bak/systemd/systemd.mk +++ /dev/null @@ -1,397 +0,0 @@ -################################################################################ -# -# systemd -# -################################################################################ - -SYSTEMD_VERSION = 232 -SYSTEMD_SITE = $(call github,systemd,systemd,v$(SYSTEMD_VERSION)) -SYSTEMD_LICENSE = LGPLv2.1+, GPLv2+ (udev), Public Domain (few source files, see README) -SYSTEMD_LICENSE_FILES = LICENSE.GPL2 LICENSE.LGPL2.1 README -SYSTEMD_INSTALL_STAGING = YES -SYSTEMD_DEPENDENCIES = \ - host-intltool \ - libcap \ - util-linux \ - kmod \ - host-gperf - -SYSTEMD_PROVIDES = udev -SYSTEMD_AUTORECONF = YES - -# Make sure that systemd will always be built after busybox so that we have -# a consistent init setup between two builds -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSTEMD_DEPENDENCIES += busybox -endif - -SYSTEMD_CONF_OPTS += \ - --with-rootprefix= \ - --enable-blkid \ - --enable-static=no \ - --disable-manpages \ - --disable-pam \ - --disable-ima \ - --disable-libcryptsetup \ - --disable-efi \ - --disable-gnuefi \ - --disable-ldconfig \ - --disable-tests \ - --disable-coverage \ - --with-default-dnssec=no \ - --without-python - -SYSTEMD_CFLAGS = $(TARGET_CFLAGS) -fno-lto - -# Override path to kmod, used in kmod-static-nodes.service -SYSTEMD_CONF_ENV = \ - CFLAGS="$(SYSTEMD_CFLAGS)" \ - ac_cv_path_KMOD=/usr/bin/kmod - -define SYSTEMD_RUN_INTLTOOLIZE - cd $(@D) && $(HOST_DIR)/usr/bin/intltoolize --force --automake -endef -SYSTEMD_PRE_CONFIGURE_HOOKS += SYSTEMD_RUN_INTLTOOLIZE - -ifeq ($(BR2_PACKAGE_ACL),y) -SYSTEMD_CONF_OPTS += --enable-acl -SYSTEMD_DEPENDENCIES += acl -else -SYSTEMD_CONF_OPTS += --disable-acl -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -SYSTEMD_CONF_OPTS += --enable-audit -SYSTEMD_DEPENDENCIES += audit -else -SYSTEMD_CONF_OPTS += --disable-audit -endif - -ifeq ($(BR2_PACKAGE_LIBIDN),y) -SYSTEMD_CONF_OPTS += --enable-libidn -SYSTEMD_DEPENDENCIES += libidn -else -SYSTEMD_CONF_OPTS += --disable-libidn -endif - -ifeq ($(BR2_PACKAGE_LIBSECCOMP),y) -SYSTEMD_CONF_OPTS += --enable-seccomp -SYSTEMD_DEPENDENCIES += libseccomp -else -SYSTEMD_CONF_OPTS += --disable-seccomp -endif - -ifeq ($(BR2_PACKAGE_LIBXKBCOMMON),y) -SYSTEMD_CONF_OPTS += --enable-xkbcommon -SYSTEMD_DEPENDENCIES += libxkbcommon -else -SYSTEMD_CONF_OPTS += --disable-xkbcommon -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_KDBUS),y) -SYSTEMD_CONF_OPTS += --enable-kdbus -else -SYSTEMD_CONF_OPTS += --disable-kdbus -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -SYSTEMD_DEPENDENCIES += bzip2 -SYSTEMD_CONF_OPTS += --enable-bzip2 -else -SYSTEMD_CONF_OPTS += --disable-bzip2 -endif - -ifeq ($(BR2_PACKAGE_LZ4),y) -SYSTEMD_DEPENDENCIES += lz4 -SYSTEMD_CONF_OPTS += --enable-lz4 -else -SYSTEMD_CONF_OPTS += --disable-lz4 -endif - -ifeq ($(BR2_PACKAGE_XZ),y) -SYSTEMD_DEPENDENCIES += xz -SYSTEMD_CONF_OPTS += --enable-xz -else -SYSTEMD_CONF_OPTS += --disable-xz -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -SYSTEMD_DEPENDENCIES += zlib -SYSTEMD_CONF_OPTS += --enable-zlib -else -SYSTEMD_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -SYSTEMD_DEPENDENCIES += libcurl -SYSTEMD_CONF_OPTS += --enable-libcurl -else -SYSTEMD_CONF_OPTS += --disable-libcurl -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -SYSTEMD_DEPENDENCIES += libgcrypt -SYSTEMD_CONF_OPTS += \ - --enable-gcrypt \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr \ - --with-libgpg-error-prefix=$(STAGING_DIR)/usr -else -SYSTEMD_CONF_OPTS += --disable-gcrypt -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_GATEWAY),y) -SYSTEMD_DEPENDENCIES += libmicrohttpd -SYSTEMD_CONF_OPTS += --enable-microhttpd -ifeq ($(BR2_PACKAGE_LIBQRENCODE),y) -SYSTEMD_CONF_OPTS += --enable-qrencode -SYSTEMD_DEPENDENCIES += libqrencode -else -SYSTEMD_CONF_OPTS += --disable-qrencode -endif -else -SYSTEMD_CONF_OPTS += --disable-microhttpd --disable-qrencode -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -SYSTEMD_DEPENDENCIES += libselinux -SYSTEMD_CONF_OPTS += --enable-selinux -else -SYSTEMD_CONF_OPTS += --disable-selinux -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_HWDB),y) -SYSTEMD_CONF_OPTS += --enable-hwdb -else -SYSTEMD_CONF_OPTS += --disable-hwdb -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_BINFMT),y) -SYSTEMD_CONF_OPTS += --enable-binfmt -else -SYSTEMD_CONF_OPTS += --disable-binfmt -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_VCONSOLE),y) -SYSTEMD_CONF_OPTS += --enable-vconsole -else -SYSTEMD_CONF_OPTS += --disable-vconsole -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_QUOTACHECK),y) -SYSTEMD_CONF_OPTS += --enable-quotacheck -else -SYSTEMD_CONF_OPTS += --disable-quotacheck -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_TMPFILES),y) -SYSTEMD_CONF_OPTS += --enable-tmpfiles -else -SYSTEMD_CONF_OPTS += --disable-tmpfiles -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_SYSUSERS),y) -SYSTEMD_CONF_OPTS += --enable-sysusers -else -SYSTEMD_CONF_OPTS += --disable-sysusers -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_FIRSTBOOT),y) -SYSTEMD_CONF_OPTS += --enable-firstboot -else -SYSTEMD_CONF_OPTS += --disable-firstboot -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_RANDOMSEED),y) -SYSTEMD_CONF_OPTS += --enable-randomseed -else -SYSTEMD_CONF_OPTS += --disable-randomseed -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_BACKLIGHT),y) -SYSTEMD_CONF_OPTS += --enable-backlight -else -SYSTEMD_CONF_OPTS += --disable-backlight -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_RFKILL),y) -SYSTEMD_CONF_OPTS += --enable-rfkill -else -SYSTEMD_CONF_OPTS += --disable-rfkill -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_LOGIND),y) -SYSTEMD_CONF_OPTS += --enable-logind -else -SYSTEMD_CONF_OPTS += --disable-logind -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_MACHINED),y) -SYSTEMD_CONF_OPTS += --enable-machined -else -SYSTEMD_CONF_OPTS += --disable-machined -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_IMPORTD),y) -SYSTEMD_CONF_OPTS += --enable-importd -else -SYSTEMD_CONF_OPTS += --disable-importd -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_HOSTNAMED),y) -SYSTEMD_CONF_OPTS += --enable-hostnamed -else -SYSTEMD_CONF_OPTS += --disable-hostnamed -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_MYHOSTNAME),y) -SYSTEMD_CONF_OPTS += --enable-myhostname -else -SYSTEMD_CONF_OPTS += --disable-myhostname -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_TIMEDATED),y) -SYSTEMD_CONF_OPTS += --enable-timedated -else -SYSTEMD_CONF_OPTS += --disable-timedated -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_LOCALED),y) -SYSTEMD_CONF_OPTS += --enable-localed -else -SYSTEMD_CONF_OPTS += --disable-localed -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) -SYSTEMD_CONF_OPTS += --enable-coredump -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /var/lib/systemd/coredump - - Core Dumper -else -SYSTEMD_CONF_OPTS += --disable-coredump -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_POLKIT),y) -SYSTEMD_CONF_OPTS += --enable-polkit -else -SYSTEMD_CONF_OPTS += --disable-polkit -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) -SYSTEMD_CONF_OPTS += --enable-networkd -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * - - - Network Manager -define SYSTEMD_INSTALL_RESOLVCONF_HOOK - ln -sf ../run/systemd/resolve/resolv.conf \ - $(TARGET_DIR)/etc/resolv.conf -endef -SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) -ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) -define SYSTEMD_INSTALL_NETWORK_CONFS - sed s/SYSTEMD_NETWORKD_DHCP_IFACE/$(SYSTEMD_NETWORKD_DHCP_IFACE)/ \ - package/systemd/dhcp.network > \ - $(TARGET_DIR)/etc/systemd/network/dhcp.network -endef -endif -else -SYSTEMD_CONF_OPTS += --disable-networkd -define SYSTEMD_INSTALL_SERVICE_NETWORK - $(INSTALL) -D -m 644 package/systemd/network.service \ - $(TARGET_DIR)/etc/systemd/system/network.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../network.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/network.service -endef -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_RESOLVED),y) -SYSTEMD_CONF_OPTS += --enable-resolved -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * - - - Network Name Resolution Manager -else -SYSTEMD_CONF_OPTS += --disable-resolved -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) -SYSTEMD_CONF_OPTS += --enable-timesyncd -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * - - - Network Time Synchronization -define SYSTEMD_INSTALL_SERVICE_TIMESYNC - mkdir -p $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants - ln -sf ../../../../lib/systemd/system/systemd-timesyncd.service \ - $(TARGET_DIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service -endef -else -SYSTEMD_CONF_OPTS += --disable-timesyncd -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_SMACK_SUPPORT),y) -SYSTEMD_CONF_OPTS += --enable-smack -else -SYSTEMD_CONF_OPTS += --disable-smack -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD_HIBERNATE),y) -SYSTEMD_CONF_OPTS += --enable-hibernate -else -SYSTEMD_CONF_OPTS += --disable-hibernate -endif - -define SYSTEMD_INSTALL_INIT_HOOK - ln -fs ../lib/systemd/systemd $(TARGET_DIR)/sbin/init - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/halt - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/poweroff - ln -fs ../bin/systemctl $(TARGET_DIR)/sbin/reboot - - ln -fs ../../../lib/systemd/system/multi-user.target \ - $(TARGET_DIR)/etc/systemd/system/default.target -endef - -define SYSTEMD_INSTALL_MACHINEID_HOOK - touch $(TARGET_DIR)/etc/machine-id -endef - -SYSTEMD_POST_INSTALL_TARGET_HOOKS += \ - SYSTEMD_INSTALL_INIT_HOOK \ - SYSTEMD_INSTALL_MACHINEID_HOOK \ - SYSTEMD_INSTALL_RESOLVCONF_HOOK - -define SYSTEMD_USERS - - - input -1 * - - - Input device group - - - systemd-journal -1 * - - - Journal - systemd-bus-proxy -1 systemd-bus-proxy -1 * - - - Proxy D-Bus messages to/from a bus - systemd-journal-gateway -1 systemd-journal-gateway -1 * /var/log/journal - - Journal Gateway - systemd-journal-remote -1 systemd-journal-remote -1 * /var/log/journal/remote - - Journal Remote - systemd-journal-upload -1 systemd-journal-upload -1 * - - - Journal Upload - $(SYSTEMD_COREDUMP_USER) - $(SYSTEMD_NETWORKD_USER) - $(SYSTEMD_RESOLVED_USER) - $(SYSTEMD_TIMESYNCD_USER) -endef - -define SYSTEMD_DISABLE_SERVICE_TTY1 - rm -f $(TARGET_DIR)/etc/systemd/system/getty.target.wants/getty@tty1.service -endef - -ifneq ($(call qstrip,$(BR2_TARGET_GENERIC_GETTY_PORT)),) -# systemd needs getty.service for VTs and serial-getty.service for serial ttys -# also patch the file to use the correct baud-rate, the default baudrate is 115200 so look for that -define SYSTEMD_INSTALL_SERVICE_TTY - if echo $(BR2_TARGET_GENERIC_GETTY_PORT) | egrep -q 'tty[0-9]*$$'; \ - then \ - SERVICE="getty"; \ - else \ - SERVICE="serial-getty"; \ - fi; \ - ln -fs ../../../../lib/systemd/system/$${SERVICE}@.service \ - $(TARGET_DIR)/etc/systemd/system/getty.target.wants/$${SERVICE}@$(BR2_TARGET_GENERIC_GETTY_PORT).service; \ - if [ $(call qstrip,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE)) -gt 0 ] ; \ - then \ - $(SED) 's,115200,$(BR2_TARGET_GENERIC_GETTY_BAUDRATE),' $(TARGET_DIR)/lib/systemd/system/$${SERVICE}@.service; \ - fi -endef -endif - -define SYSTEMD_INSTALL_INIT_SYSTEMD - $(SYSTEMD_DISABLE_SERVICE_TTY1) - $(SYSTEMD_INSTALL_SERVICE_TTY) - $(SYSTEMD_INSTALL_SERVICE_NETWORK) - $(SYSTEMD_INSTALL_SERVICE_TIMESYNC) - $(SYSTEMD_INSTALL_NETWORK_CONFS) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/sysvinit/0001-fix-libcrypt-test.patch b/package.bak/sysvinit/0001-fix-libcrypt-test.patch deleted file mode 100644 index 6c22436d74..0000000000 --- a/package.bak/sysvinit/0001-fix-libcrypt-test.patch +++ /dev/null @@ -1,20 +0,0 @@ -Make the libcrypt test somewhat cross-compilation compliant - -Signed-off-by: Thomas Petazzoni - -Index: b/src/Makefile -=================================================================== ---- a/src/Makefile -+++ b/src/Makefile -@@ -78,8 +78,9 @@ else - endif - - # Additional libs for GNU libc. --ifneq ($(wildcard /usr/lib*/libcrypt.a),) -- SULOGINLIBS += -lcrypt -+HAS_LIBCRYPT=$(shell f=`mktemp` && echo 'int main(void) {}' | $(CC) -o $$f -xc - -lcrypt >/dev/null 2>&1 && echo yes; rm -f $$f) -+ifeq ($(HAS_LIBCRYPT),yes) -+ SULOGINLIBS += -lcrypt - endif - - all: $(BIN) $(SBIN) $(USRBIN) diff --git a/package.bak/sysvinit/Config.in b/package.bak/sysvinit/Config.in deleted file mode 100644 index 94f1612375..0000000000 --- a/package.bak/sysvinit/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_SYSVINIT - bool "sysvinit" - depends on BR2_USE_MMU # fork() - depends on BR2_INIT_SYSV - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - /sbin/init - parent of all processes - - http://savannah.nongnu.org/projects/sysvinit diff --git a/package.bak/sysvinit/inittab b/package.bak/sysvinit/inittab deleted file mode 100644 index fad91eae8b..0000000000 --- a/package.bak/sysvinit/inittab +++ /dev/null @@ -1,27 +0,0 @@ -# /etc/inittab -# -# This inittab is a basic inittab sample for sysvinit, which mimics -# Buildroot's default inittab for BusyBox. -id:3:initdefault: - -si0::sysinit:/bin/mount -t proc proc /proc -si1::sysinit:/bin/mount -o remount,rw / -si2::sysinit:/bin/mkdir -p /dev/pts -si3::sysinit:/bin/mkdir -p /dev/shm -si4::sysinit:/bin/mount -a -si5::sysinit:/bin/hostname -F /etc/hostname -rcS:12345:wait:/etc/init.d/rcS - -# S0:1:respawn:/sbin/getty -L ttyS0 115200 vt100 # GENERIC_SERIAL - -# Stuff to do for the 3-finger salute -#ca::ctrlaltdel:/sbin/reboot - -# Stuff to do before rebooting -shd0:06:wait:/etc/init.d/rcK -shd1:06:wait:/sbin/swapoff -a -shd2:06:wait:/bin/umount -a -r - -# The usual halt or reboot actions -hlt0:0:wait:/sbin/halt -dhp -reb0:6:wait:/sbin/reboot diff --git a/package.bak/sysvinit/sysvinit.hash b/package.bak/sysvinit/sysvinit.hash deleted file mode 100644 index 268b9841b0..0000000000 --- a/package.bak/sysvinit/sysvinit.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit/sysvinit_2.88dsf-13.1%2Bsqueeze1.dsc -sha256 b016f937958d2809a020d407e1287bdc09abf1d44efaa96530e2ea57f544f4e8 sysvinit_2.88dsf.orig.tar.gz -sha256 26b456a31036b1e1c2486c22ca2b7fde6d723b7c63669604eacc61cfb6609ef8 sysvinit_2.88dsf-13.1+squeeze1.diff.gz diff --git a/package.bak/sysvinit/sysvinit.mk b/package.bak/sysvinit/sysvinit.mk deleted file mode 100644 index faefd5c913..0000000000 --- a/package.bak/sysvinit/sysvinit.mk +++ /dev/null @@ -1,50 +0,0 @@ -################################################################################ -# -# sysvinit -# -################################################################################ - -SYSVINIT_VERSION = 2.88 -SYSVINIT_SOURCE = sysvinit_$(SYSVINIT_VERSION)dsf.orig.tar.gz -SYSVINIT_PATCH = sysvinit_$(SYSVINIT_VERSION)dsf-13.1+squeeze1.diff.gz -SYSVINIT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/s/sysvinit -SYSVINIT_LICENSE = GPLv2+ -SYSVINIT_LICENSE_FILES = COPYING - -SYSVINIT_MAKE_OPTS = SYSROOT=$(STAGING_DIR) - -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -SYSVINIT_DEPENDENCIES = busybox -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -SYSVINIT_DEPENDENCIES += libselinux -SYSVINIT_MAKE_OPTS += WITH_SELINUX="yes" -endif - -define SYSVINIT_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ - fi -endef - -SYSVINIT_POST_PATCH_HOOKS = SYSVINIT_DEBIAN_PATCHES - -define SYSVINIT_BUILD_CMDS - # Force sysvinit to link against libcrypt as it otherwise - # use an incorrect test to see if it's available - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(SYSVINIT_MAKE_OPTS) -C $(@D)/src -endef - -define SYSVINIT_INSTALL_TARGET_CMDS - for x in halt init shutdown killall5; do \ - $(INSTALL) -D -m 0755 $(@D)/src/$$x $(TARGET_DIR)/sbin/$$x || exit 1; \ - done - $(INSTALL) -D -m 0644 package/sysvinit/inittab $(TARGET_DIR)/etc/inittab - ln -sf /sbin/halt $(TARGET_DIR)/sbin/reboot - ln -sf /sbin/halt $(TARGET_DIR)/sbin/poweroff - ln -sf killall5 $(TARGET_DIR)/sbin/pidof -endef - -$(eval $(generic-package)) diff --git a/package.bak/szip/Config.in b/package.bak/szip/Config.in deleted file mode 100644 index 5a24362f29..0000000000 --- a/package.bak/szip/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_SZIP - bool "szip" - help - Szip is an implementation of the extended-Rice lossless - compression algorithm. - - The Consultative Committee on Space Data Systems (CCSDS) has - adopted the extended-Rice algorithm for international - standards for space applications[1,6,7]. Szip is reported to - provide fast and effective compression, specifically for the - EOS data generated by the NASA Earth Observatory System - (EOS)[1]. It was originally developed at University of New - Mexico (UNM) and integrated with HDF4 by UNM researchers and - developers. - - http://www.hdfgroup.org/doc_resource/SZIP diff --git a/package.bak/szip/szip.hash b/package.bak/szip/szip.hash deleted file mode 100644 index c6caf36481..0000000000 --- a/package.bak/szip/szip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 a816d95d5662e8279625abdbea7d0e62157d7d1f028020b1075500bf483ed5ef szip-2.1.tar.gz diff --git a/package.bak/szip/szip.mk b/package.bak/szip/szip.mk deleted file mode 100644 index f3a47581bf..0000000000 --- a/package.bak/szip/szip.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# szip -# -################################################################################ - -SZIP_VERSION = 2.1 -SZIP_SITE = http://www.hdfgroup.org/ftp/lib-external/szip/2.1/src -SZIP_LICENSE = szip license -SZIP_LICENSE_FILES = COPYING -SZIP_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/taglib/Config.in b/package.bak/taglib/Config.in deleted file mode 100644 index 6521d48c60..0000000000 --- a/package.bak/taglib/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_TAGLIB - bool "taglib" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - help - TagLib is a library for reading and editing the meta-data of - several popular audio formats. Currently it supports both ID3v1 - and ID3v2 for MP3 files, Ogg Vorbis comments and ID3 tags and - Vorbis comments in FLAC, MPC, Speex, WavPack and TrueAudio files. - - http://taglib.github.com - -if BR2_PACKAGE_TAGLIB - -config BR2_PACKAGE_TAGLIB_MP4 - bool "taglib mp4 support" - -config BR2_PACKAGE_TAGLIB_ASF - bool "taglib wma support" - -endif - -comment "taglib needs a toolchain w/ C++, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package.bak/taglib/taglib.hash b/package.bak/taglib/taglib.hash deleted file mode 100644 index 7a5c5cf98c..0000000000 --- a/package.bak/taglib/taglib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b6d1a5a610aae6ff39d93de5efd0fdc787aa9e9dc1e7026fa4c961b26563526b taglib-1.11.1.tar.gz diff --git a/package.bak/taglib/taglib.mk b/package.bak/taglib/taglib.mk deleted file mode 100644 index f47c4ba43f..0000000000 --- a/package.bak/taglib/taglib.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# taglib -# -################################################################################ - -TAGLIB_VERSION = 1.11.1 -TAGLIB_SITE = http://taglib.github.io/releases -TAGLIB_INSTALL_STAGING = YES -TAGLIB_LICENSE = LGPLv2.1, MPL -TAGLIB_LICENSE_FILES = COPYING.LGPL COPYING.MPL - -ifeq ($(BR2_PACKAGE_ZLIB),y) -TAGLIB_DEPENDENCIES += zlib -endif - -ifeq ($(BR2_PACKAGE_TAGLIB_ASF),y) -TAGLIB_CONF_OPTS += -DWITH_ASF=ON -endif - -ifeq ($(BR2_PACKAGE_TAGLIB_MP4),y) -TAGLIB_CONF_OPTS += -DWITH_MP4=ON -endif - -define TAGLIB_REMOVE_DEVFILE - rm -f $(TARGET_DIR)/usr/bin/taglib-config -endef - -TAGLIB_POST_INSTALL_TARGET_HOOKS += TAGLIB_REMOVE_DEVFILE - -$(eval $(cmake-package)) diff --git a/package.bak/tar/Config.in b/package.bak/tar/Config.in deleted file mode 100644 index 0eea1b8456..0000000000 --- a/package.bak/tar/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_TAR - bool "tar" - depends on BR2_USE_WCHAR - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - A program that saves many files together into a single tape or disk - archive, and can restore individual files from the archive. - - http://www.gnu.org/software/tar/ - -comment "tar needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/tar/tar.hash b/package.bak/tar/tar.hash deleted file mode 100644 index e5634566e0..0000000000 --- a/package.bak/tar/tar.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated after checking signature -sha256 402dcfd0022fd7a1f2c5611f5c61af1cd84910a760a44a688e18ddbff4e9f024 tar-1.29.tar.xz -sha256 9173f222464dd3676118408840da5990527062b5c7daf6487bed7c396c45bfb1 tar-1.29.cpio.gz diff --git a/package.bak/tar/tar.mk b/package.bak/tar/tar.mk deleted file mode 100644 index 26f113a4d2..0000000000 --- a/package.bak/tar/tar.mk +++ /dev/null @@ -1,47 +0,0 @@ -################################################################################ -# -# tar -# -################################################################################ - -TAR_VERSION = 1.29 -TAR_SOURCE = tar-$(TAR_VERSION).tar.xz -TAR_SITE = $(BR2_GNU_MIRROR)/tar -# busybox installs in /bin, so we need tar to install as well in /bin -# so that it overrides the Busybox symlinks. -TAR_CONF_OPTS = --exec-prefix=/ -TAR_LICENSE = GPLv3+ -TAR_LICENSE_FILES = COPYING - -# Prefer full-blown tar over buybox's version -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -TAR_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_ACL),y) -TAR_DEPENDENCIES += acl -TAR_CONF_OPTS += --with-posix-acls -else -TAR_CONF_OPTS += --without-posix-acls -endif - -ifeq ($(BR2_PACKAGE_ATTR),y) -TAR_DEPENDENCIES += attr -TAR_CONF_OPTS += --with-xattrs -else -TAR_CONF_OPTS += --without-xattrs -endif - -$(eval $(autotools-package)) - -# host-tar: use cpio.gz instead of tar.gz to prevent chicken-egg problem -# of needing tar to build tar. -HOST_TAR_SOURCE = tar-$(TAR_VERSION).cpio.gz -define HOST_TAR_EXTRACT_CMDS - mkdir -p $(@D) - cd $(@D) && \ - $(call suitable-extractor,$(HOST_TAR_SOURCE)) $(DL_DIR)/$(HOST_TAR_SOURCE) | cpio -i --preserve-modification-time - mv $(@D)/tar-$(TAR_VERSION)/* $(@D) - rmdir $(@D)/tar-$(TAR_VERSION) -endef -$(eval $(host-autotools-package)) diff --git a/package.bak/targetcli-fb/Config.in b/package.bak/targetcli-fb/Config.in deleted file mode 100644 index 24ff3145f6..0000000000 --- a/package.bak/targetcli-fb/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -comment "targetcli-fb depends on Python" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 - -config BR2_PACKAGE_TARGETCLI_FB - bool "targetcli-fb" - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - select BR2_PACKAGE_PYTHON_CONFIGSHELL_FB - select BR2_PACKAGE_PYTHON_RTSLIB_FB - select BR2_PACKAGE_PYTHON_SIX - help - targetcli-fb is a command-line interface for configuring the - LIO generic SCSI target, present in 3.x Linux kernel - versions. - - https://github.com/open-iscsi/targetcli-fb diff --git a/package.bak/targetcli-fb/S50target b/package.bak/targetcli-fb/S50target deleted file mode 100755 index 3ce55ab492..0000000000 --- a/package.bak/targetcli-fb/S50target +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -# -# Restore / clear the Linux "SCSI target" driver configuration with `targetctl` -# - -start() { - local ret - - printf "Restoring target configuration: " - /usr/bin/targetctl restore >/dev/null 2>&1 - ret=$? - echo "done" - - return $ret -} - -stop() { - local ret - - printf "Clearing target configuration: " - /usr/bin/targetctl clear >/dev/null 2>&1 - ret=$? - echo "done" - - return $ret -} - -restart() { - stop - start -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/targetcli-fb/target.service b/package.bak/targetcli-fb/target.service deleted file mode 100644 index 400284edd1..0000000000 --- a/package.bak/targetcli-fb/target.service +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Restore LIO kernel target configuration -Requires=sys-kernel-config.mount -After=sys-kernel-config.mount network.target local-fs.target - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/usr/bin/targetctl restore -ExecStop=/usr/bin/targetctl clear -SyslogIdentifier=target - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/targetcli-fb/targetcli-fb.hash b/package.bak/targetcli-fb/targetcli-fb.hash deleted file mode 100644 index 50cb3e3f62..0000000000 --- a/package.bak/targetcli-fb/targetcli-fb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 0f32ab6f3ecd234280d55be5e89ce2b3a02f9c82c8dccaae66e26464cff8901a targetcli-fb-v2.1.fb41.tar.gz diff --git a/package.bak/targetcli-fb/targetcli-fb.mk b/package.bak/targetcli-fb/targetcli-fb.mk deleted file mode 100644 index 4057592564..0000000000 --- a/package.bak/targetcli-fb/targetcli-fb.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# targetcli-fb -# -################################################################################ - -# When upgrading the version, be sure to also upgrade python-rtslib-fb -# and python-configshell-fb at the same time. -TARGETCLI_FB_VERSION = v2.1.fb41 -TARGETCLI_FB_SITE = $(call github,open-iscsi,targetcli-fb,$(TARGETCLI_FB_VERSION)) -TARGETCLI_FB_LICENSE = Apache-2.0 -TARGETCLI_FB_LICENSE_FILES = COPYING -TARGETCLI_FB_SETUP_TYPE = setuptools -TARGETCLI_FB_DEPENDENCIES = python-configshell-fb python-rtslib-fb python-six - -define TARGETCLI_FB_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/targetcli-fb/S50target \ - $(TARGET_DIR)/etc/init.d/S50target -endef - -define TARGETCLI_FB_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D package/targetcli-fb/target.service \ - $(TARGET_DIR)/usr/lib/systemd/system/target.service -endef - -# Targetcli stores its configuration in /etc/target/saveconfig.json -# and complains if the /etc/target/ directory does not exist. -define TARGETCLI_FB_INSTALL_CONF_DIR - $(INSTALL) -m 0755 -d $(TARGET_DIR)/etc/target -endef - -TARGETCLI_FB_POST_INSTALL_TARGET_HOOKS += TARGETCLI_FB_INSTALL_CONF_DIR - -$(eval $(python-package)) diff --git a/package.bak/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch b/package.bak/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch deleted file mode 100644 index 960c71b9ea..0000000000 --- a/package.bak/taskd/0001-Fix-missing-cmakedefine-HAVE_GET_CURRENT_DIR_NAME.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b067ab9bf667bb9257bb9eeaa6bf25f9a1a17f06 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Fri, 6 May 2016 23:35:42 +0200 -Subject: [PATCH] Fix missing cmakedefine HAVE_GET_CURRENT_DIR_NAME -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Jörg Krause ---- - cmake.h.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/cmake.h.in b/cmake.h.in -index 4124ce9..0b8f9d0 100644 ---- a/cmake.h.in -+++ b/cmake.h.in -@@ -51,6 +51,7 @@ - #cmakedefine HAVE_ST_BIRTHTIME - - /* Functions */ -+#cmakedefine HAVE_GET_CURRENT_DIR_NAME - #cmakedefine HAVE_TIMEGM - #cmakedefine HAVE_UUID_UNPARSE_LOWER - --- -2.8.2 - diff --git a/package.bak/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch b/package.bak/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch deleted file mode 100644 index f2365ea298..0000000000 --- a/package.bak/taskd/0002-Use-correct-variables-for-GnuTLS-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 88fee5c6eb2271d3de6b9878cd29a0494999aa18 Mon Sep 17 00:00:00 2001 -From: "Arnout Vandecappelle (Essensium/Mind)" -Date: Sun, 20 Nov 2016 23:46:45 +0100 -Subject: [PATCH] Use correct variables for GnuTLS detection - -At least with recent CMake, it seems the variables created by -find_package (GnuTLS) are called PC_GNUTLS_INCLUDE_DIRS and -PC_GNUTLS_LIBRARIES. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8125d9..ccf827b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -110,8 +110,8 @@ message ("-- Looking for GnuTLS") - find_package (GnuTLS REQUIRED) - if (GNUTLS_FOUND) - set (HAVE_LIBGNUTLS true) -- set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${GNUTLS_INCLUDE_DIR}) -- set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${GNUTLS_LIBRARIES}) -+ set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${PC_GNUTLS_INCLUDE_DIRS}) -+ set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${PC_GNUTLS_LIBRARIES}) - endif (GNUTLS_FOUND) - - message ("-- Looking for libuuid") --- -2.10.2 - diff --git a/package.bak/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch b/package.bak/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch deleted file mode 100644 index 34139fef74..0000000000 --- a/package.bak/taskd/0003-CMakeLists-use-pkg-config-uuid-detection.patch +++ /dev/null @@ -1,40 +0,0 @@ -CMakeLists.txt: use pkg-config to detect uuid when possible - -In order to take into account the libraries used by libuuid when -building statically, using pkg-config is recommended. This patch -therefore improves the CMakeLists.txt to use pkg-config to detect -libuuid when pkg-config is available. - -Signed-off-by: Thomas Petazzoni - -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,6 +6,7 @@ - - include (CheckFunctionExists) - include (CheckStructHasMember) -+include (FindPkgConfig) - - set (HAVE_CMAKE true) - -@@ -119,8 +120,16 @@ - # Apple and FreeBSD include the uuid functions in their libc, rather than libuuid - check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER) - else (DARWIN OR FREEBSD) -- find_path (UUID_INCLUDE_DIR uuid/uuid.h) -- find_library (UUID_LIBRARY NAMES uuid) -+ if(PKG_CONFIG_FOUND) -+ pkg_check_modules(PC_UUID uuid) -+ if(PC_UUID_FOUND) -+ set (UUID_INCLUDE_DIR ${PC_UUID_INCLUDE_DIRS}) -+ set (UUID_LIBRARY ${PC_UUID_LIBRARIES}) -+ endif(PC_UUID_FOUND) -+ else(PKG_CONFIG_FOUND) -+ find_path (UUID_INCLUDE_DIR uuid/uuid.h) -+ find_library (UUID_LIBRARY NAMES uuid) -+ endif(PKG_CONFIG_FOUND) - if (UUID_INCLUDE_DIR AND UUID_LIBRARY) - set (TASKD_INCLUDE_DIRS ${TASKD_INCLUDE_DIRS} ${UUID_INCLUDE_DIR}) - set (TASKD_LIBRARIES ${TASKD_LIBRARIES} ${UUID_LIBRARY}) diff --git a/package.bak/taskd/Config.in b/package.bak/taskd/Config.in deleted file mode 100644 index 7d26abaae3..0000000000 --- a/package.bak/taskd/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_TASKD - bool "taskd" - depends on BR2_USE_WCHAR # gnutls - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Task management synchronization daemon. - - http://taskwarrior.org/ - -comment "taskd needs a toolchain w/ C++, wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/taskd/taskd.hash b/package.bak/taskd/taskd.hash deleted file mode 100644 index 41d37bbadb..0000000000 --- a/package.bak/taskd/taskd.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://taskwarrior.org/download/ -sha1 ded339deeee65277e4712f71a9159502f8b20b52 taskd-1.1.0.tar.gz -# Locally calculated -sha256 7b8488e687971ae56729ff4e2e5209ff8806cf8cd57718bfd7e521be130621b4 taskd-1.1.0.tar.gz diff --git a/package.bak/taskd/taskd.mk b/package.bak/taskd/taskd.mk deleted file mode 100644 index b19be68912..0000000000 --- a/package.bak/taskd/taskd.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# taskd -# -################################################################################ - -TASKD_VERSION = 1.1.0 -TASKD_SITE = http://taskwarrior.org/download -TASKD_LICENSE = MIT -TASKD_LICENSE_FILES = COPYING -TASKD_DEPENDENCIES = gnutls util-linux host-pkgconf - -$(eval $(cmake-package)) diff --git a/package.bak/tcl/0001-dont-build-compat.patch b/package.bak/tcl/0001-dont-build-compat.patch deleted file mode 100644 index 85c5c57df4..0000000000 --- a/package.bak/tcl/0001-dont-build-compat.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Andrew Ruder -Subject: [PATCH] Disable tcl compatibility layers - -Turn off building compatibility layers for old/broken versions of -standard functions (strstr, strtoul, strtod) with the assumption that -anything buildroot is using as a standard C library will be good enough -to not have broken behavior. - -Signed-off-by: Andrew Ruder ---- - -diff --git a/unix/tcl.m4 b/unix/tcl.m4 ---- a/unix/tcl.m4 -+++ b/unix/tcl.m4 -@@ -2466,7 +2466,7 @@ AC_DEFUN([SC_BUGGY_STRTOD], [ - } - exit(0); - }], tcl_cv_strtod_buggy=ok, tcl_cv_strtod_buggy=buggy, -- tcl_cv_strtod_buggy=buggy)]) -+ tcl_cv_strtod_buggy=ok)]) - if test "$tcl_cv_strtod_buggy" = buggy; then - AC_LIBOBJ([fixstrtod]) - USE_COMPAT=1 -@@ -2725,7 +2725,7 @@ AC_DEFUN([SC_TCL_CHECK_BROKEN_FUNC],[ - if test ["$tcl_ok"] = 1; then - AC_CACHE_CHECK([proper ]$1[ implementation], [tcl_cv_]$1[_unbroken], - AC_TRY_RUN([[int main() {]$2[}]],[tcl_cv_]$1[_unbroken]=ok, -- [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=unknown)) -+ [tcl_cv_]$1[_unbroken]=broken,[tcl_cv_]$1[_unbroken]=ok)) - if test ["$tcl_cv_]$1[_unbroken"] = "ok"; then - tcl_ok=1 - else diff --git a/package.bak/tcl/Config.in b/package.bak/tcl/Config.in deleted file mode 100644 index f1fa0541a1..0000000000 --- a/package.bak/tcl/Config.in +++ /dev/null @@ -1,39 +0,0 @@ -comment "tcl needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - -config BR2_PACKAGE_TCL - bool "tcl" - # fork() - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_THREADS - # See this mailing list thread: - # http://lists.busybox.net/pipermail/buildroot/2015-March/121198.html - depends on !BR2_STATIC_LIBS - help - TCL (Tool Command Language) is a simple textual language. - - http://www.tcl.tk - -if BR2_PACKAGE_TCL - -config BR2_PACKAGE_TCL_DEL_ENCODINGS - bool "delete encodings (saves 1.6Mb)" - default y - help - Delete encoding files for TCL. If your programs do not use - various tcl character recoding functions, you may safely - choose Y here. - - It saves approx. 1.6 Mb of space. - -config BR2_PACKAGE_TCL_SHLIB_ONLY - bool "install only shared library" - default y - help - Install only TCL shared library and not binary tcl - interpreter (tclsh). - - Saves ~14kb. - -endif diff --git a/package.bak/tcl/tcl.hash b/package.bak/tcl/tcl.hash deleted file mode 100644 index b344d26589..0000000000 --- a/package.bak/tcl/tcl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a265409781e4b3edcc4ef822533071b34c3dc6790b893963809b9fe221befe07 tcl8.6.6-src.tar.gz diff --git a/package.bak/tcl/tcl.mk b/package.bak/tcl/tcl.mk deleted file mode 100644 index ffef9cf8bd..0000000000 --- a/package.bak/tcl/tcl.mk +++ /dev/null @@ -1,80 +0,0 @@ -################################################################################ -# -# tcl -# -################################################################################ - -TCL_VERSION_MAJOR = 8.6 -TCL_VERSION = $(TCL_VERSION_MAJOR).6 -TCL_SOURCE = tcl$(TCL_VERSION)-src.tar.gz -TCL_SITE = http://downloads.sourceforge.net/project/tcl/Tcl/$(TCL_VERSION) -TCL_LICENSE = tcl license -TCL_LICENSE_FILES = license.terms -TCL_SUBDIR = unix -TCL_INSTALL_STAGING = YES -TCL_AUTORECONF = YES - -TCL_CONF_OPTS = \ - --disable-symbols \ - --disable-langinfo \ - --disable-framework - -HOST_TCL_CONF_OPTS = \ - --disable-symbols \ - --disable-langinfo \ - --disable-framework - -# I haven't found a good way to force pkgs to not build -# or configure without just removing the entire pkg directory. -define HOST_TCL_REMOVE_PACKAGES - rm -fr $(@D)/pkgs/sqlite3* $(@D)/pkgs/tdbc* -endef -HOST_TCL_PRE_CONFIGURE_HOOKS += HOST_TCL_REMOVE_PACKAGES - -# We remove the bundled sqlite as we prefer to not use bundled stuff at all. -define TCL_REMOVE_PACKAGES - rm -fr $(@D)/pkgs/sqlite3* \ - $(if $(BR2_PACKAGE_MYSQL),,$(@D)/pkgs/tdbcmysql*) \ - $(@D)/pkgs/tdbcodbc* \ - $(if $(BR2_PACKAGE_POSTGRESQL),,$(@D)/pkgs/tdbcpostgres*) \ - $(if $(BR2_PACKAGE_SQLITE),,$(@D)/pkgs/tdbcsqlite3*) -endef -TCL_PRE_CONFIGURE_HOOKS += TCL_REMOVE_PACKAGES - -ifeq ($(BR2_PACKAGE_TCL_DEL_ENCODINGS),y) -define TCL_REMOVE_ENCODINGS - rm -rf $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/encoding/* -endef -TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_ENCODINGS -endif - -ifeq ($(BR2_PACKAGE_TCL_SHLIB_ONLY),y) -define TCL_REMOVE_TCLSH - rm -f $(TARGET_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR) -endef -TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_TCLSH -else -define TCL_SYMLINK_TCLSH - ln -sf tclsh$(TCL_VERSION_MAJOR) $(TARGET_DIR)/usr/bin/tclsh -endef -TCL_POST_INSTALL_TARGET_HOOKS += TCL_SYMLINK_TCLSH -endif - -# Until someone needs it, we don't handle locale installation. tcl has -# a complicated method of translating LANG-style locale names into its internal -# .msg name which makes it difficult to save the correct locales per the -# configured whitelist. -define TCL_REMOVE_EXTRA - rm -fr $(TARGET_DIR)/usr/lib/tclConfig.sh \ - $(TARGET_DIR)/usr/lib/tclooConfig.sh \ - $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/tclAppInit.c \ - $(TARGET_DIR)/usr/lib/tcl$(TCL_VERSION_MAJOR)/msgs -endef -TCL_POST_INSTALL_TARGET_HOOKS += TCL_REMOVE_EXTRA - -TCL_DEPENDENCIES = $(if $(BR2_PACKAGE_SQLITE),sqlite) \ - $(if $(BR2_PACKAGE_MYSQL),mysql) \ - $(if $(BR2_PACKAGE_POSTGRESQL),postgresql) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/tclap/Config.in b/package.bak/tclap/Config.in deleted file mode 100644 index 667117d91b..0000000000 --- a/package.bak/tclap/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -comment "tclap needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_TCLAP - bool "tclap" - depends on BR2_INSTALL_LIBSTDCPP - help - This is a small, flexible library that provides a simple interface - for defining and accessing command line arguments. It was initially - inspired by the user friendly CLAP libary. The difference is that - this library is templatized, so the argument class is type - independent. Type independence avoids identical-except-for-type - objects, such as IntArg, FloatArg, and StringArg. While the library - is not strictly compliant with the GNU or POSIX standards, it is - close. - - http://tclap.sourceforge.net/ diff --git a/package.bak/tclap/tclap.hash b/package.bak/tclap/tclap.hash deleted file mode 100644 index 55d475fc89..0000000000 --- a/package.bak/tclap/tclap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 9f9f0fe3719e8a89d79b6ca30cf2d16620fba3db5b9610f9b51dd2cd033deebb tclap-1.2.1.tar.gz diff --git a/package.bak/tclap/tclap.mk b/package.bak/tclap/tclap.mk deleted file mode 100644 index 807f247988..0000000000 --- a/package.bak/tclap/tclap.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# tclap -# -################################################################################ - -TCLAP_VERSION = 1.2.1 -TCLAP_SITE = http://downloads.sourceforge.net/project/tclap -TCLAP_LICENSE = MIT -TCLAP_LICENSE_FILES = COPYING -TCLAP_INSTALL_STAGING = YES - -# This package is a pure C++ template library, only made of headers. -TCLAP_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/tcllib/Config.in b/package.bak/tcllib/Config.in deleted file mode 100644 index b0a4ad060e..0000000000 --- a/package.bak/tcllib/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TCLLIB - bool "tcllib" - help - Tcllib is a collection of utility modules for Tcl. These - modules provide a wide variety of functionality, from - implementations of standard data structures to - implementations of common networking protocols. The intent - is to collect commonly used function into a single library, - which users can rely on to be available and stable - - http://tcl.activestate.com/software/tcllib/ diff --git a/package.bak/tcllib/tcllib.hash b/package.bak/tcllib/tcllib.hash deleted file mode 100644 index eb990a2aba..0000000000 --- a/package.bak/tcllib/tcllib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 0db9e17d6c0f44d3ca2df2ea5023e35c0f3767e7008c3cb26d201446eb68add1 tcllib-1.13.tar.bz2 diff --git a/package.bak/tcllib/tcllib.mk b/package.bak/tcllib/tcllib.mk deleted file mode 100644 index 9eb3b7dbe9..0000000000 --- a/package.bak/tcllib/tcllib.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# tcllib -# -################################################################################ - -TCLLIB_VERSION = 1.13 -TCLLIB_SOURCE = tcllib-$(TCLLIB_VERSION).tar.bz2 -TCLLIB_SITE = http://downloads.sourceforge.net/project/tcllib/tcllib/$(TCLLIB_VERSION) -TCLLIB_LICENSE = tcl license -TCLLIB_LICENSE_FILES = license.terms -TCLLIB_DEPENDENCIES = host-tcl -TCLLIB_CONF_ENV = ac_cv_path_tclsh="$(HOST_DIR)/usr/bin/tclsh$(TCL_VERSION_MAJOR)" - -$(eval $(autotools-package)) diff --git a/package.bak/tcpdump/Config.in b/package.bak/tcpdump/Config.in deleted file mode 100644 index 8b54c603df..0000000000 --- a/package.bak/tcpdump/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_TCPDUMP - bool "tcpdump" - select BR2_PACKAGE_LIBPCAP - help - A tool for network monitoring and data acquisition. - - http://www.tcpdump.org/ - -if BR2_PACKAGE_TCPDUMP - -config BR2_PACKAGE_TCPDUMP_SMB - bool "smb dump support" - help - enable possibly-buggy SMB printer - -endif diff --git a/package.bak/tcpdump/tcpdump.hash b/package.bak/tcpdump/tcpdump.hash deleted file mode 100644 index 966db1f3aa..0000000000 --- a/package.bak/tcpdump/tcpdump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 eae98121cbb1c9adbedd9a777bf2eae9fa1c1c676424a54740311c8abcee5a5e tcpdump-4.9.0.tar.gz diff --git a/package.bak/tcpdump/tcpdump.mk b/package.bak/tcpdump/tcpdump.mk deleted file mode 100644 index e71f9c113f..0000000000 --- a/package.bak/tcpdump/tcpdump.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# tcpdump -# -################################################################################ - -TCPDUMP_VERSION = 4.9.0 -TCPDUMP_SITE = http://www.tcpdump.org/release -TCPDUMP_LICENSE = BSD-3c -TCPDUMP_LICENSE_FILES = LICENSE -TCPDUMP_CONF_ENV = \ - ac_cv_linux_vers=2 \ - td_cv_buggygetaddrinfo=no \ - PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config -TCPDUMP_CONF_OPTS = \ - --without-crypto \ - --with-system-libpcap \ - $(if $(BR2_PACKAGE_TCPDUMP_SMB),--enable-smb,--disable-smb) -TCPDUMP_DEPENDENCIES = zlib libpcap - -ifeq ($(BR2_STATIC_LIBS),y) -TCPDUMP_CONF_OPTS += LIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - -# make install installs an unneeded extra copy of the tcpdump binary -define TCPDUMP_REMOVE_DUPLICATED_BINARY - rm -f $(TARGET_DIR)/usr/sbin/tcpdump.$(TCPDUMP_VERSION) -endef - -TCPDUMP_POST_INSTALL_TARGET_HOOKS += TCPDUMP_REMOVE_DUPLICATED_BINARY - -$(eval $(autotools-package)) diff --git a/package.bak/tcping/Config.in b/package.bak/tcping/Config.in deleted file mode 100644 index e72df096c3..0000000000 --- a/package.bak/tcping/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_TCPING - bool "tcping" - help - tcping does a TCP connect to the given ip/port - combination. The user can specify a timeout in seconds. This - is useful in shell scripts running in firewalled - environments. Often SYNs are just being dropped by - firewalls, thus connection establishment will be retried - several times (for minutes) until a TCP timeout is - reached. With tcping it is possible to check first if the - desired port is reachable and then start connection - establishment. - - http://linuxco.de/tcping/tcping.html diff --git a/package.bak/tcping/tcping.hash b/package.bak/tcping/tcping.hash deleted file mode 100644 index de42775cc1..0000000000 --- a/package.bak/tcping/tcping.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 1ad52e904094d12b225ac4a0bc75297555e931c11a1501445faa548ff5ecdbd0 tcping-1.3.5.tar.gz diff --git a/package.bak/tcping/tcping.mk b/package.bak/tcping/tcping.mk deleted file mode 100644 index f5919bb8bc..0000000000 --- a/package.bak/tcping/tcping.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tcping -# -################################################################################ - -TCPING_VERSION = 1.3.5 -TCPING_SITE = http://linuxco.de/tcping -TCPING_LICENSE = GPLv3+ -TCPING_LICENSE_FILES = LICENSE - -define TCPING_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CCFLAGS="$(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ - -C $(@D) tcping.linux -endef - -define TCPING_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/tcping $(TARGET_DIR)/usr/bin/tcping -endef - -$(eval $(generic-package)) diff --git a/package.bak/tcpreplay/Config.in b/package.bak/tcpreplay/Config.in deleted file mode 100644 index 2ba2eb5944..0000000000 --- a/package.bak/tcpreplay/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_TCPREPLAY - bool "tcpreplay" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBPCAP - help - Tcpreplay is a tool for replaying network traffic from files saved - with tcpdump or other tools which write pcap(3) files. - - http://tcpreplay.appneta.com/ diff --git a/package.bak/tcpreplay/tcpreplay.hash b/package.bak/tcpreplay/tcpreplay.hash deleted file mode 100644 index e7ba4400ec..0000000000 --- a/package.bak/tcpreplay/tcpreplay.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 da483347e83a9b5df0e0dbb0f822a2d37236e79dda35f4bc4e6684fa827f25ea tcpreplay-4.1.2.tar.gz diff --git a/package.bak/tcpreplay/tcpreplay.mk b/package.bak/tcpreplay/tcpreplay.mk deleted file mode 100644 index a8bcf1c5dd..0000000000 --- a/package.bak/tcpreplay/tcpreplay.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# tcpreplay -# -################################################################################ - -TCPREPLAY_VERSION = 4.1.2 -TCPREPLAY_SITE = https://github.com/appneta/tcpreplay/releases/download/v$(TCPREPLAY_VERSION) -TCPREPLAY_LICENSE = GPLv3 -TCPREPLAY_LICENSE_FILES = docs/LICENSE -TCPREPLAY_CONF_ENV = \ - tr_cv_libpcap_version=">= 0.7.0" \ - ac_cv_have_bpf=no \ - $(call AUTOCONF_AC_CHECK_FILE_VAL,$(STAGING_DIR)/usr/include/pcap-netmap.c)=no -TCPREPLAY_CONF_OPTS = --with-libpcap=$(STAGING_DIR)/usr -TCPREPLAY_DEPENDENCIES = libpcap - -# libpcap may depend on symbols in other libs -TCPREPLAY_LIBS = $(STAGING_DIR)/usr/bin/pcap-config --static --libs -TCPREPLAY_CONF_ENV += ac_cv_search_pcap_close="`$(TCPREPLAY_LIBS)`" \ - LIBS="`$(TCPREPLAY_LIBS)`" - -ifeq ($(BR2_STATIC_LIBS),y) -TCPREPLAY_CONF_OPTS += --enable-dynamic-link=no -endif - -ifeq ($(BR2_PACKAGE_TCPDUMP),y) -TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=/usr/sbin/tcpdump -else -TCPREPLAY_CONF_ENV += ac_cv_path_tcpdump_path=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch b/package.bak/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch deleted file mode 100644 index 3c738d86a4..0000000000 --- a/package.bak/tegrarcm/0001-Don-t-assume-cryptopp-is-system-wide-installed.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 5ea6b3859ebe16ff47856b58262b14463e119c13 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Tue, 19 Apr 2016 22:14:42 +0200 -Subject: [PATCH] Don't assume cryptopp is system-wide installed - -The current build system adds "-isystem /usr/include/$(CRYPTOLIB)" to -AM_CPPFLAGS, but this is wrong because cryptopp might not be installed -in this location. Instead, the build system should simply include - or and rely on the compiler include -path. - -The tricky part is that it can be or . To -solve this, we use a solution similar to the one used in -https://github.com/bingmann/crypto-speedtest/blob/master/m4/cryptopp.m4 -and -https://github.com/bingmann/crypto-speedtest/blob/master/src/speedtest_cryptopp.cpp: -the configure script fills in a variable called -CRYPTOLIB_HEADER_PREFIX, and we use that in the C++ code to include -the right header file. - -It is worth mentioning that doing #include - doesn't work, and we have to use an -intermediate #define'd constant to overcome this C preprocessor -limitation. - -Signed-off-by: Thomas Petazzoni -Submitted upstream at https://github.com/NVIDIA/tegrarcm/pull/2 ---- - configure.ac | 1 + - src/Makefile.am | 2 +- - src/aes-cmac.cpp | 28 +++++++++++++++++----------- - 3 files changed, 19 insertions(+), 12 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 943654f..620e158 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -33,6 +33,7 @@ AC_LINK_IFELSE( - [AC_MSG_ERROR([libcrypto++/libcryptopp is not installed.])])] - ) - AC_SUBST(CRYPTOLIB) -+AC_DEFINE_UNQUOTED([CRYPTOLIB_HEADER_PREFIX], [$CRYPTOLIB], [Location of cryptolib header]) - LDFLAGS=$SAVED_LDFLAGS - AC_LANG(C) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3dad0e6..35a606f 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,5 +1,5 @@ - AM_CFLAGS = -Wall -std=c99 --AM_CPPFLAGS = -isystem /usr/include/$(CRYPTOLIB) $(LIBUSB_CFLAGS) -+AM_CPPFLAGS = $(LIBUSB_CFLAGS) - - bin_PROGRAMS = tegrarcm - tegrarcm_SOURCES = \ -diff --git a/src/aes-cmac.cpp b/src/aes-cmac.cpp -index 24c89f8..da8be5a 100644 ---- a/src/aes-cmac.cpp -+++ b/src/aes-cmac.cpp -@@ -26,6 +26,9 @@ - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -+ -+#include "config.h" -+ - #include - using std::cout; - using std::cerr; -@@ -40,26 +43,29 @@ using std::string; - #include - using std::exit; - --#include "cryptlib.h" --using CryptoPP::Exception; -+#define CRYPTOPP_INCLUDE_CRYPTLIB -+#define CRYPTOPP_INCLUDE_CMAC -+#define CRYPTOPP_INCLUDE_AES -+#define CRYPTOPP_INCLUDE_HEX -+#define CRYPTOPP_INCLUDE_FILTERS -+#define CRYPTOPP_INCLUDE_SECBLOCK - --#include "cmac.h" --using CryptoPP::CMAC; -+#include CRYPTOPP_INCLUDE_CRYPTLIB -+#include CRYPTOPP_INCLUDE_CMAC -+#include CRYPTOPP_INCLUDE_AES -+#include CRYPTOPP_INCLUDE_HEX -+#include CRYPTOPP_INCLUDE_FILTERS -+#include CRYPTOPP_INCLUDE_SECBLOCK - --#include "aes.h" -+using CryptoPP::Exception; -+using CryptoPP::CMAC; - using CryptoPP::AES; -- --#include "hex.h" - using CryptoPP::HexEncoder; - using CryptoPP::HexDecoder; -- --#include "filters.h" - using CryptoPP::StringSink; - using CryptoPP::StringSource; - using CryptoPP::HashFilter; - using CryptoPP::HashVerificationFilter; -- --#include "secblock.h" - using CryptoPP::SecByteBlock; - - extern "C" int cmac_hash(const unsigned char *msg, int len, unsigned char *cmac_buf) --- -2.6.4 - diff --git a/package.bak/tegrarcm/Config.in.host b/package.bak/tegrarcm/Config.in.host deleted file mode 100644 index 47590fa127..0000000000 --- a/package.bak/tegrarcm/Config.in.host +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_HOST_TEGRARCM - bool "host tegrarcm" - depends on BR2_arm || BR2_armeb - help - This program is used to send code to a Tegra device in recovery - mode. - - https://github.com/NVIDIA/tegrarcm diff --git a/package.bak/tegrarcm/tegrarcm.hash b/package.bak/tegrarcm/tegrarcm.hash deleted file mode 100644 index 4194a4cd21..0000000000 --- a/package.bak/tegrarcm/tegrarcm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 538cb0af237ab33e070d3aeb6cc828cd7ef453753ba2ccc21b87ed43faac51bd tegrarcm-v1.7.tar.gz diff --git a/package.bak/tegrarcm/tegrarcm.mk b/package.bak/tegrarcm/tegrarcm.mk deleted file mode 100644 index 06fd039651..0000000000 --- a/package.bak/tegrarcm/tegrarcm.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# tegrarcm -# -################################################################################ - -TEGRARCM_VERSION = v1.7 -TEGRARCM_SITE = $(call github,NVIDIA,tegrarcm,$(TEGRARCM_VERSION)) -TEGRARCM_LICENSE = BSD-3c / NVIDIA Software License (src/miniloader) -TEGRARCM_LICENSE_FILES = LICENSE -TEGRARCM_AUTORECONF = YES -HOST_TEGRARCM_DEPENDENCIES = host-libusb host-pkgconf host-cryptopp - -$(eval $(host-autotools-package)) diff --git a/package.bak/tekui/Config.in b/package.bak/tekui/Config.in deleted file mode 100644 index 1203667b68..0000000000 --- a/package.bak/tekui/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_TEKUI - bool "tekui" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_LUAFILESYSTEM # runtime only - select BR2_PACKAGE_LUAEXPAT # runtime only - select BR2_PACKAGE_LUASOCKET # runtime only - select BR2_PACKAGE_LUAPOSIX # runtime only - depends on !BR2_STATIC_LIBS - depends on BR2_PACKAGE_HAS_LUAINTERPRETER - depends on BR2_TOOLCHAIN_HAS_THREADS - help - TekUI is a small, freestanding and portable graphical user interface - (GUI) toolkit written in Lua and C. It was initially developed for - the X Window System and has been ported to DirectFB, Windows, Nano-X - and a raw framebuffer since - - http://tekui.neoscientists.org/ - -comment "tekui needs a Lua interpreter and a toolchain w/ threads, dynamic library" - depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS diff --git a/package.bak/tekui/tekui.hash b/package.bak/tekui/tekui.hash deleted file mode 100644 index 07de2ed6d2..0000000000 --- a/package.bak/tekui/tekui.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 28abfaacc0f2ddae962afbbca862a7fb619c33a99a497be9edd746091013dd7f tekui-1.12.tgz diff --git a/package.bak/tekui/tekui.mk b/package.bak/tekui/tekui.mk deleted file mode 100644 index f9ae849033..0000000000 --- a/package.bak/tekui/tekui.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# tekui -# -################################################################################ - -TEKUI_VERSION = 1.12 -TEKUI_SOURCE = tekui-$(TEKUI_VERSION).tgz -TEKUI_SITE = http://tekui.neoscientists.org/releases -TEKUI_LICENSE = MIT -TEKUI_LICENSE_FILES = COPYRIGHT -TEKUI_DEPENDENCIES = freetype luainterpreter - -TEKUI_MAKE_OPTS = \ - CC="$(TARGET_CC) -fPIC" \ - AR="$(TARGET_AR) rcu" \ - INSTALL_S="install" \ - LUAVER=$(LUAINTERPRETER_ABIVER) \ - LUA_DEFS="" - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -TEKUI_DEPENDENCIES += libpng -TEKUI_MAKE_OPTS += TEKUI_DEFS="-DENABLE_GRADIENT -DENABLE_FILENO -DENABLE_PIXMAP_CACHE -DENABLE_PNG" -TEKUI_MAKE_OPTS += TEKUI_LIBS=-lpng -else -TEKUI_MAKE_OPTS += TEKUI_DEFS="-DENABLE_GRADIENT -DENABLE_FILENO -DENABLE_PIXMAP_CACHE" -endif - -ifeq ($(BR2_PACKAGE_DEJAVU),y) -TEKUI_FONTDIR=/usr/share/fonts/dejavu -else -TEKUI_FONTDIR=/usr/share/lua/$(LUAINTERPRETER_ABIVER)/tek/ui/font -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXXF86VM),yy) -TEKUI_DEPENDENCIES += xlib_libXft xlib_libXxf86vm -TEKUI_MAKE_OPTS += \ - X11_LIBS="-lXext -lXxf86vm -lXft -lfreetype -lfontconfig" \ - X11_DEFS="-D_XOPEN_SOURCE -DENABLE_XFT -DENABLE_XVID -I$(STAGING_DIR)/usr/include/freetype2 -I$(STAGING_DIR)/usr/include/fontconfig" \ - DISPLAY_DRIVER=x11 -else -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -TEKUI_DEPENDENCIES += directfb -TEKUI_MAKE_OPTS += \ - DIRECTFB_LIBS="-lfreetype -ldirectfb -lpthread" \ - DIRECTFB_DEFS="-D_REENTRANT -I$(STAGING_DIR)/usr/include/directfb -I$(STAGING_DIR)/usr/include/freetype2" \ - DISPLAY_DRIVER=directfb -else -TEKUI_MAKE_OPTS += \ - FREETYPE_LIBS=-lfreetype \ - FREETYPE_DEFS="-I$(STAGING_DIR)/usr/include/freetype2" \ - RAWFB_SUB_LIBS="" \ - RAWFB_SUB_DEFS="-DDEF_FONTDIR=\\\"$(TEKUI_FONTDIR)\\\"" \ - DISPLAY_DRIVER=rawfb -endif -endif - -define TEKUI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="/usr" -C $(@D) all -endef - -define TEKUI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TEKUI_MAKE_OPTS) PREFIX="$(TARGET_DIR)/usr" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/terminology/Config.in b/package.bak/terminology/Config.in deleted file mode 100644 index f367ce51e9..0000000000 --- a/package.bak/terminology/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_TERMINOLOGY - bool "terminology" - depends on BR2_PACKAGE_EFL - help - Terminology is an EFL terminal emulator with some extra - bells and whistles. - - https://www.enlightenment.org/about-terminology diff --git a/package.bak/terminology/terminology.hash b/package.bak/terminology/terminology.hash deleted file mode 100644 index 86f6606ae2..0000000000 --- a/package.bak/terminology/terminology.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://sourceforge.net/p/enlightenment/mailman/message/35600707/ -sha256 bfed42b83bce854d35ba33a4d38373c6d42fb2c0ea0335d76420488c091692f4 terminology-1.0.0.tar.xz diff --git a/package.bak/terminology/terminology.mk b/package.bak/terminology/terminology.mk deleted file mode 100644 index d7e98270e6..0000000000 --- a/package.bak/terminology/terminology.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# terminology -# -################################################################################ - -TERMINOLOGY_VERSION = 1.0.0 -TERMINOLOGY_SOURCE = terminology-$(TERMINOLOGY_VERSION).tar.xz -TERMINOLOGY_SITE = https://download.enlightenment.org/rel/apps/terminology -TERMINOLOGY_LICENSE = BSD-2c -TERMINOLOGY_LICENSE_FILES = COPYING - -TERMINOLOGY_DEPENDENCIES = efl host-pkgconf -TERMINOLOGY_CONF_OPTS = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc - -$(eval $(autotools-package)) diff --git a/package.bak/tftpd/Config.in b/package.bak/tftpd/Config.in deleted file mode 100644 index ea5cb303f9..0000000000 --- a/package.bak/tftpd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_TFTPD - bool "tftpd" - # linker issue with pre-6.x toolchains - depends on !(BR2_nios2 && !BR2_TOOLCHAIN_GCC_AT_LEAST_6) - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - HPA's Trivial File Transfer Protocol (tftp) server. diff --git a/package.bak/tftpd/S80tftpd-hpa b/package.bak/tftpd/S80tftpd-hpa deleted file mode 100755 index 4e8361faa7..0000000000 --- a/package.bak/tftpd/S80tftpd-hpa +++ /dev/null @@ -1,81 +0,0 @@ -#! /bin/sh - -OPTIONS="-c -l -s /var/lib/tftpboot" - -set -e - -PATH=/sbin:/bin:/usr/sbin:/usr/bin -DESC="HPA's tftpd" -NAME=tftpd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/S80tftpd-hpa - -# -# Function that starts the daemon/service. -# -d_start() { - mkdir -p /var/lib/tftpboot - chmod 1777 /var/lib/tftpboot - $DAEMON $OPTIONS -} - -# -# Function that stops the daemon/service. -# -d_stop() { - killall -q $NAME -} - -# -# Function that sends a SIGHUP to the daemon/service. -# -d_reload() { - d_start - d_stop -} - -case "$1" in - start) - printf "Starting $DESC: " - d_start - echo "done" - ;; - stop) - printf "Stopping $DESC: " - d_stop - echo "done" - ;; - #reload) - # - # If the daemon can reload its configuration without - # restarting (for example, when it is sent a SIGHUP), - # then implement that here. - # - # If the daemon responds to changes in its config file - # directly anyway, make this an "exit 0". - # - # printf "Reloading $DESC configuration..." - # d_reload - # echo "done." - #;; - restart|force-reload) - # - # If the "reload" option is implemented, move the "force-reload" - # option to the "reload" entry above. If not, "force-reload" is - # just the same as "restart". - # - printf "Restarting $DESC: " - d_stop - sleep 1 - d_start - echo "done" - ;; - *) - # echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/tftpd/tftpd.hash b/package.bak/tftpd/tftpd.hash deleted file mode 100644 index 247b757fa6..0000000000 --- a/package.bak/tftpd/tftpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/network/tftp/tftp-hpa/sha256sums.asc -sha256 afee361df96a2f88344e191f6a25480fd714e1d28d176c3f10cc43fa206b718b tftp-hpa-5.2.tar.xz diff --git a/package.bak/tftpd/tftpd.mk b/package.bak/tftpd/tftpd.mk deleted file mode 100644 index 78df835aa5..0000000000 --- a/package.bak/tftpd/tftpd.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# tftpd -# -################################################################################ - -TFTPD_VERSION = 5.2 -TFTPD_SOURCE = tftp-hpa-$(TFTPD_VERSION).tar.xz -TFTPD_SITE = $(BR2_KERNEL_MIRROR)/software/network/tftp/tftp-hpa -TFTPD_CONF_OPTS = --without-tcpwrappers - -# Override BusyBox implementations if BusyBox is enabled. -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -TFTPD_DEPENDENCIES += busybox -endif - -define TFTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/tftp/tftp $(TARGET_DIR)/usr/bin/tftp - $(INSTALL) -D $(@D)/tftpd/tftpd $(TARGET_DIR)/usr/sbin/tftpd -endef - -define TFTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/tftpd/S80tftpd-hpa $(TARGET_DIR)/etc/init.d/S80tftpd-hpa -endef - -$(eval $(autotools-package)) diff --git a/package.bak/thrift/0001-libevent-cross.patch b/package.bak/thrift/0001-libevent-cross.patch deleted file mode 100644 index f07caa762a..0000000000 --- a/package.bak/thrift/0001-libevent-cross.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make it cross-compile happy the hard way, there's no clean way. - -Signed-off-by: Gustavo Zacarias - -diff -Nura thrift-0.9.1.orig/aclocal/ax_lib_event.m4 thrift-0.9.1/aclocal/ax_lib_event.m4 ---- thrift-0.9.1.orig/aclocal/ax_lib_event.m4 2013-08-15 11:04:29.000000000 -0300 -+++ thrift-0.9.1/aclocal/ax_lib_event.m4 2013-10-07 20:40:44.076435613 -0300 -@@ -75,7 +75,7 @@ - AC_LANG_PUSH([C]) - dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling, - dnl but then the version cannot be checked. -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #include - ]], [[ diff --git a/package.bak/thrift/0002-autoreconf.patch b/package.bak/thrift/0002-autoreconf.patch deleted file mode 100644 index 1a52f7c70d..0000000000 --- a/package.bak/thrift/0002-autoreconf.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fillers to make autoreconf (automake) happy. - -Signed-off-by: Gustavo Zacarias - -diff -Nura thrift-0.9.2.orig/AUTHORS thrift-0.9.2/AUTHORS ---- thrift-0.9.2.orig/AUTHORS 1969-12-31 21:00:00.000000000 -0300 -+++ thrift-0.9.2/AUTHORS 2014-12-05 14:46:20.431211224 -0300 -@@ -0,0 +1,2 @@ -+ -+ -diff -Nura thrift-0.9.2.orig/ChangeLog thrift-0.9.2/ChangeLog ---- thrift-0.9.2.orig/ChangeLog 1969-12-31 21:00:00.000000000 -0300 -+++ thrift-0.9.2/ChangeLog 2014-12-05 14:46:34.290686170 -0300 -@@ -0,0 +1,2 @@ -+ -+ -diff -Nura thrift-0.9.2.orig/NEWS thrift-0.9.2/NEWS ---- thrift-0.9.2.orig/NEWS 1969-12-31 21:00:00.000000000 -0300 -+++ thrift-0.9.2/NEWS 2014-12-05 14:46:32.308618241 -0300 -@@ -0,0 +1,2 @@ -+ -+ -diff -Nura thrift-0.9.2.orig/README thrift-0.9.2/README ---- thrift-0.9.2.orig/README 1969-12-31 21:00:00.000000000 -0300 -+++ thrift-0.9.2/README 2014-12-05 14:46:28.305481028 -0300 -@@ -0,0 +1,2 @@ -+ -+ diff --git a/package.bak/thrift/0003-zlib-cross.patch b/package.bak/thrift/0003-zlib-cross.patch deleted file mode 100644 index 3af39c4691..0000000000 --- a/package.bak/thrift/0003-zlib-cross.patch +++ /dev/null @@ -1,16 +0,0 @@ -Make zlib version detection cross-compile happy. - -Signed-off-by: Gustavo Zacarias - -diff -Nura thrift-0.9.1.orig/aclocal/ax_lib_zlib.m4 thrift-0.9.1/aclocal/ax_lib_zlib.m4 ---- thrift-0.9.1.orig/aclocal/ax_lib_zlib.m4 2013-08-15 11:04:29.000000000 -0300 -+++ thrift-0.9.1/aclocal/ax_lib_zlib.m4 2013-10-07 20:47:44.523177973 -0300 -@@ -73,7 +73,7 @@ - # (defined in the library). - AC_LANG_PUSH([C]) - dnl This can be changed to AC_LINK_IFELSE if you are cross-compiling. -- AC_RUN_IFELSE([AC_LANG_PROGRAM([[ -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include - #if ZLIB_VERNUM >= 0x$WANT_ZLIB_VERSION - #else diff --git a/package.bak/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch b/package.bak/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch deleted file mode 100644 index ec2e22566c..0000000000 --- a/package.bak/thrift/0004-THRIFT-3071-check-minimum-required-version-of-automa.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 9b03d2b02d32302008d2bd0218b31b9a0ca5a748 Mon Sep 17 00:00:00 2001 -From: Jens Geyer -Date: Fri, 3 Apr 2015 12:37:03 +0200 -Subject: [PATCH] THRIFT-3071 check minimum required version of automake in bootstrap.sh -Client: Build process -Patch: James E. King, III - -This closes #421 - -- remove a warning when using libtool - -"libtoolize: Consider adding 'AC_CONFIG_MACRO_DIRS([./aclocal])' to configure.ac," - -[Romain: - - This is upstream commit 4aa95df383bfa13c46a4dc0b41672ec29d476300 - - remove the part for bootstrap.sh which is not - bundled in thrift archive. - - fix the commit log accordingly] - -Signed-off-by: Romain Naour ---- - configure.ac | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/configure.ac b/configure.ac -index 5fa611e..8daeb03 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -18,6 +18,7 @@ - # - - AC_PREREQ(2.65) -+AC_CONFIG_MACRO_DIR([./aclocal]) - - AC_INIT([thrift], [0.9.2]) - -@@ -540,6 +541,7 @@ AC_CHECK_FUNCS([memset]) - AC_CHECK_FUNCS([mkdir]) - AC_CHECK_FUNCS([realpath]) - AC_CHECK_FUNCS([select]) -+AC_CHECK_FUNCS([setlocale]) - AC_CHECK_FUNCS([socket]) - AC_CHECK_FUNCS([strchr]) - AC_CHECK_FUNCS([strdup]) --- -1.9.3 - diff --git a/package.bak/thrift/0005-configure.ac-C-11-is-optional.patch b/package.bak/thrift/0005-configure.ac-C-11-is-optional.patch deleted file mode 100644 index 9ed7e0a691..0000000000 --- a/package.bak/thrift/0005-configure.ac-C-11-is-optional.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9c3a7e79b256730dd85a7acadbaf57ab018b3127 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 7 Apr 2015 07:37:26 +0200 -Subject: [PATCH] configure.ac: C++11 is optional - -Thrift build fine whitout c++11 support. - -Signed-off-by: Romain Naour ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 8daeb03..bfd49ae 100755 ---- a/configure.ac -+++ b/configure.ac -@@ -99,7 +99,7 @@ AC_PROG_AWK - AC_PROG_RANLIB - - AC_LANG([C++]) --AX_CXX_COMPILE_STDCXX_11([noext]) -+AX_CXX_COMPILE_STDCXX_11([noext], [optional]) - - AC_ARG_ENABLE([libs], - AS_HELP_STRING([--enable-libs], [build the Apache Thrift libraries [default=yes]]), --- -1.9.3 - diff --git a/package.bak/thrift/Config.in b/package.bak/thrift/Config.in deleted file mode 100644 index 0ee3f000d7..0000000000 --- a/package.bak/thrift/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_THRIFT - bool "thrift" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - The Apache Thrift software framework, for scalable cross-language - services development, combines a software stack with a - code generation engine to build services that work - efficiently and seamlessly between C++, Java, Python, PHP, Ruby, - Erlang, Perl, Haskell, C#, Cocoa, JavaScript, Node.js, Smalltalk, - OCaml and Delphi and other languages. - - http://thrift.apache.org/ - -comment "thrift needs a toolchain w/ C++, wchar, threads" - depends on !BR2_USE_WCHAR || \ - !BR2_TOOLCHAIN_HAS_THREADS || !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/thrift/thrift.hash b/package.bak/thrift/thrift.hash deleted file mode 100644 index 811aa988e3..0000000000 --- a/package.bak/thrift/thrift.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz.md5 -md5 89f63cc4d0100912f4a1f8a9dee63678 thrift-0.9.2.tar.gz diff --git a/package.bak/thrift/thrift.mk b/package.bak/thrift/thrift.mk deleted file mode 100644 index 185e1ec1c3..0000000000 --- a/package.bak/thrift/thrift.mk +++ /dev/null @@ -1,78 +0,0 @@ -################################################################################ -# -# thrift -# -################################################################################ - -THRIFT_VERSION = 0.9.2 -THRIFT_SITE = http://www.us.apache.org/dist/thrift/$(THRIFT_VERSION) -THRIFT_DEPENDENCIES = host-autoconf-archive host-pkgconf host-thrift boost \ - libevent openssl zlib -THRIFT_INSTALL_STAGING = YES -HOST_THRIFT_DEPENDENCIES = host-autoconf-archive host-bison host-boost \ - host-flex host-libevent host-openssl host-pkgconf host-zlib - -THRIFT_CONF_OPTS = --with-sysroot=$(STAGING_DIR) \ - --with-boost \ - --with-boost-libdir=$(STAGING_DIR)/usr/lib \ - --disable-tests \ - --disable-tutorial -HOST_THRIFT_CONF_OPTS = --with-sysroot=$(HOST_DIR) \ - --disable-tests \ - --disable-tutorial -THRIFT_AUTORECONF = YES -THRIFT_AUTORECONF_OPTS = -I $(HOST_DIR)/usr/share/autoconf-archive -THRIFT_LICENSE = Apache-2.0 -THRIFT_LICENSE_FILES = LICENSE - -# relocation truncated to fit: R_68K_GOT16O -ifeq ($(BR2_m68k_cf),y) -THRIFT_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) -mxgot" -endif - -ifeq ($(BR2_STATIC_LIBS),y) -# openssl uses zlib, so we need to explicitly link with it when static -THRIFT_CONF_ENV += LIBS=-lz -endif - -# Language selection -# The generator (host tool) works with all of them regardless -# This is just for the libraries / bindings -THRIFT_LANG_CONF_OPTS += --without-csharp --without-java --without-erlang \ - --without-python --without-perl --without-php --without-php_extension \ - --without-ruby --without-haskell --without-go --without-d \ - --without-qt4 --without-lua -HOST_THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS) --without-c_glib -THRIFT_CONF_OPTS += $(THRIFT_LANG_CONF_OPTS) - -# C bindings -ifeq ($(BR2_PACKAGE_LIBGLIB2),y) -THRIFT_DEPENDENCIES += libglib2 -else -THRIFT_CONF_OPTS += --without-c_glib -endif - -# De-hardcode THRIFT for cross compiling -define THRIFT_TOOL_NO_HARDCODE - for f in `find $(@D) -name Makefile.am -type f`; do \ - $(SED) "/^THRIFT =/d" $$f; \ - done - $(SED) "s:top_builddir)/compiler/cpp/thrift:THRIFT):" $(@D)/tutorial/Makefile.am -endef - -THRIFT_POST_PATCH_HOOKS += THRIFT_TOOL_NO_HARDCODE - -define THRIFT_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) THRIFT=$(HOST_DIR)/usr/bin/thrift -C $(@D) -endef - -# Install runtime only -define THRIFT_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/lib DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) - -# to be used by other packages -THRIFT = $(HOST_DIR)/usr/bin/thrift diff --git a/package.bak/thttpd/0001-getline.patch b/package.bak/thttpd/0001-getline.patch deleted file mode 100644 index 35c366aef1..0000000000 --- a/package.bak/thttpd/0001-getline.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix glibc/eglibc getline() conflicting functions. - -Signed-off-by: Gustavo Zacarias ---- - -diff -Nura thttpd-2.25b.orig/extras/htpasswd.c thttpd-2.25b/extras/htpasswd.c ---- thttpd-2.25b.orig/extras/htpasswd.c 2001-12-18 21:08:08.000000000 -0300 -+++ thttpd-2.25b/extras/htpasswd.c 2011-11-25 11:42:47.198582812 -0300 -@@ -49,7 +49,7 @@ - while((line[y++] = line[x++])); - } - --static int getline(char *s, int n, FILE *f) { -+static int get_line(char *s, int n, FILE *f) { - register int i=0; - - while(1) { -@@ -189,7 +189,7 @@ - strcpy(user,argv[2]); - - found = 0; -- while(!(getline(line,MAX_STRING_LEN,f))) { -+ while(!(get_line(line,MAX_STRING_LEN,f))) { - if(found || (line[0] == '#') || (!line[0])) { - putline(tfp,line); - continue; diff --git a/package.bak/thttpd/Config.in b/package.bak/thttpd/Config.in deleted file mode 100644 index d359785435..0000000000 --- a/package.bak/thttpd/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_THTTPD - bool "thttpd" - depends on BR2_USE_MMU # fork() - help - thttpd is a simple, small, portable, fast, and secure HTTP server - - http://www.acme.com/software/thttpd/ diff --git a/package.bak/thttpd/thttpd.hash b/package.bak/thttpd/thttpd.hash deleted file mode 100644 index 2400f5bc8d..0000000000 --- a/package.bak/thttpd/thttpd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd/thttpd_2.25b-11.dsc -sha256 07719b08b1cff6a21c08697a7bcb4395425b07ee753106262fb62a03a7d32360 thttpd_2.25b.orig.tar.gz -sha256 4d213c18daf121d21412cc54864fbca250e1773a91df6573373e1d2273a2cec9 thttpd_2.25b-11.diff.gz diff --git a/package.bak/thttpd/thttpd.mk b/package.bak/thttpd/thttpd.mk deleted file mode 100644 index 5b4b0c4591..0000000000 --- a/package.bak/thttpd/thttpd.mk +++ /dev/null @@ -1,55 +0,0 @@ -################################################################################ -# -# thttpd -# -################################################################################ - -THTTPD_VERSION = 2.25b -THTTPD_SOURCE = thttpd_$(THTTPD_VERSION).orig.tar.gz -THTTPD_PATCH = thttpd_$(THTTPD_VERSION)-11.diff.gz -THTTPD_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/t/thttpd -THTTPD_LICENSE = BSD-2c -THTTPD_LICENSE_FILES = thttpd.c - -ifneq ($(THTTPD_PATCH),) -define THTTPD_DEBIAN_PATCHES - if [ -d $(@D)/debian/patches ]; then \ - $(APPLY_PATCHES) $(@D) $(@D)/debian/patches \*.patch; \ - fi -endef -endif - -THTTPD_POST_PATCH_HOOKS = THTTPD_DEBIAN_PATCHES - -THTTPD_MAKE = $(MAKE1) - -define THTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/thttpd $(TARGET_DIR)/usr/sbin/thttpd - $(INSTALL) -D -m 0755 $(@D)/extras/htpasswd $(TARGET_DIR)/usr/bin/htpasswd - $(INSTALL) -D -m 0755 $(@D)/extras/makeweb $(TARGET_DIR)/usr/bin/makeweb - $(INSTALL) -D -m 0755 $(@D)/extras/syslogtocern $(TARGET_DIR)/usr/bin/syslogtocern - $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd_wrapper $(TARGET_DIR)/usr/sbin/thttpd_wrapper - $(SED) 's:/usr/local/sbin:/usr/sbin:g' -e \ - 's:/usr/local/www:/var/www:g' $(TARGET_DIR)/usr/sbin/thttpd_wrapper - $(INSTALL) -d $(TARGET_DIR)/var/www/data - $(INSTALL) -d $(TARGET_DIR)/var/www/logs - echo "dir=/var/www/data" > $(TARGET_DIR)/var/www/thttpd_config - echo 'cgipat=**.cgi' >> $(TARGET_DIR)/var/www/thttpd_config - echo "logfile=/var/www/logs/thttpd_log" >> $(TARGET_DIR)/var/www/thttpd_config - echo "pidfile=/var/run/thttpd.pid" >> $(TARGET_DIR)/var/www/thttpd_config -endef - -define THTTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 $(@D)/scripts/thttpd.sh $(TARGET_DIR)/etc/init.d/S90thttpd - $(SED) 's:/usr/local/sbin:/usr/sbin:g' $(TARGET_DIR)/etc/init.d/S90thttpd -endef - -define THTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0644 package/thttpd/thttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/thttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/ - ln -fs ../../../../usr/lib/systemd/system/thttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/thttpd.service -endef - -$(eval $(autotools-package)) diff --git a/package.bak/thttpd/thttpd.service b/package.bak/thttpd/thttpd.service deleted file mode 100644 index e3c93e7b3c..0000000000 --- a/package.bak/thttpd/thttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Tiny HTTP Daemon - -[Service] -PIDFile=/run/thttpd.pid -ExecStart=/usr/sbin/thttpd -D -C /etc/thttpd.conf -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/ti-cgt-pru/Config.in.host b/package.bak/ti-cgt-pru/Config.in.host deleted file mode 100644 index a36633705d..0000000000 --- a/package.bak/ti-cgt-pru/Config.in.host +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS - bool - default y - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_arm - -config BR2_PACKAGE_HOST_TI_CGT_PRU - bool "host ti-cgt-pru" - depends on BR2_PACKAGE_HOST_TI_CGT_PRU_ARCH_SUPPORTS - help - This package provides the Code Generation Tools for the PRU - unit found on some TI processors e.g. AM3358. - - Note: this is a binary cross toolchain that runs on x86 hosts - targeting PRU cores found alongside some ARM processors. - - http://processors.wiki.ti.com/index.php/Programmable_Realtime_Unit_Software_Development diff --git a/package.bak/ti-cgt-pru/ti-cgt-pru.hash b/package.bak/ti-cgt-pru/ti-cgt-pru.hash deleted file mode 100644 index 1c19b33fd6..0000000000 --- a/package.bak/ti-cgt-pru/ti-cgt-pru.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 df85cd1ed3aea12d577854ece11bf5f2af6ace8c39959eea4cf2fa5973924e0e ti_cgt_pru_2.1.3_linux_installer_x86.bin diff --git a/package.bak/ti-cgt-pru/ti-cgt-pru.mk b/package.bak/ti-cgt-pru/ti-cgt-pru.mk deleted file mode 100644 index d94f09197f..0000000000 --- a/package.bak/ti-cgt-pru/ti-cgt-pru.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# ti-cgt-pru -# -################################################################################ - -TI_CGT_PRU_VERSION = 2.1.3 -TI_CGT_PRU_SOURCE = ti_cgt_pru_$(TI_CGT_PRU_VERSION)_linux_installer_x86.bin -TI_CGT_PRU_SITE = http://software-dl.ti.com/codegen/esd/cgt_public_sw/PRU/$(TI_CGT_PRU_VERSION) -TI_CGT_PRU_LICENSE = TI Technology and Software Publicly Available License (compiler + PRU library), \ - Boost Software License 1.0 (compiler), \ - BSD-2c, BSD-3c, MIT, Academic Free License 3.0, Hewlett-Packard (PRU library) -TI_CGT_PRU_LICENSE_FILES = PRU_Code_Generation_Tools_2.1.x_manifest.html \ - PRU_CodeGen_Library_2.1_0222433C-30C1-442d-B5C6-2073BD97F80F.spdx.tag - -define HOST_TI_CGT_PRU_EXTRACT_CMDS - chmod +x $(DL_DIR)/$(TI_CGT_PRU_SOURCE) - $(DL_DIR)/$(TI_CGT_PRU_SOURCE) --prefix $(@D) --mode unattended - mv $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/* $(@D) - rmdir $(@D)/ti-cgt-pru_$(TI_CGT_PRU_VERSION)/ -endef - -# Since this is largely prebuilt toolchain and likes to live in its -# own directory, put it in $(HOST_DIR)/usr/share/ti-cgt-pru/. -# Packages wanting to use this toolchain need to use this path as TI's -# standard PRU_CGT path e.g. make PRU_CGT=$(TI_CGT_PRU_INSTALLDIR)... -TI_CGT_PRU_INSTALLDIR = $(HOST_DIR)/usr/share/ti-cgt-pru - -define HOST_TI_CGT_PRU_INSTALL_CMDS - mkdir -p $(TI_CGT_PRU_INSTALLDIR) - cp -dpfr $(@D)/* $(TI_CGT_PRU_INSTALLDIR) -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/ti-gfx/0001-newclkapi.patch b/package.bak/ti-gfx/0001-newclkapi.patch deleted file mode 100644 index 69574c15f4..0000000000 --- a/package.bak/ti-gfx/0001-newclkapi.patch +++ /dev/null @@ -1,118 +0,0 @@ -This patch adjusts the omap3630 portion of the powervr driver to use the new -clk kernel api. - -Signed-off-by: Spenser Gilliland -[yann.morin.1998@free.fr: rebased ontop of 5.01.00.01] -Signed-off-by: "Yann E. MORIN" -diff -durN ti-gfx-5_01_00_01.orig/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c ti-gfx-5_01_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c ---- ti-gfx-5_01_00_01.orig/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c 2013-12-23 15:44:20.000000000 +0100 -+++ ti-gfx-5_01_00_01/GFX_Linux_KM/services4/system/omap3630/sysutils_linux.c 2014-02-26 19:17:39.829571846 +0100 -@@ -182,6 +182,49 @@ - @Return PVRSRV_ERROR - - ******************************************************************************/ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) -+int clk_disable_unprepare(struct clk *clk) -+{ -+ return clk_disable(clk); -+} -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) -+int clk_disable_unprepare(struct clk *clk) -+{ -+ res = clk_disable(clk); -+ if (res < 0) -+ return res; -+ -+ res = clk_unprepare(clk); -+ if (ret < 0) -+ return res; -+ -+ return 0; -+} -+#endif -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,2,0) -+int clk_prepare_enable(struct clk *clk) -+{ -+ return clk_enable(clk); -+} -+#elif LINUX_VERSION_CODE < KERNEL_VERSION(3,3,0) -+int clk_prepare_enable(struct clk *clk) -+{ -+ res = clk_prepare(clk); -+ if (ret < 0) -+ return res; -+ -+ res = clk_enable(clk); -+ if (res < 0) { -+ clk_unprepare(clk); -+ return res; -+ } -+ -+ return 0; -+} -+#endif -+ - PVRSRV_ERROR EnableSGXClocks(SYS_DATA *psSysData) - { - #if !defined(NO_HARDWARE) -@@ -198,7 +241,7 @@ - - #if !defined(PM_RUNTIME_SUPPORT) - PVR_DPF((PVR_DBG_MESSAGE, "EnableSGXClocks: Enabling SGX Clocks")); -- res=clk_enable(psSysSpecData->psSGX_FCK); -+ res=clk_prepare_enable(psSysSpecData->psSGX_FCK); - if (res < 0) - { - PVR_DPF((PVR_DBG_ERROR, "EnableSGXClocks: Couldn't enable SGX functional clock (%d)", res)); -@@ -324,7 +367,7 @@ - - PVR_DPF((PVR_DBG_MESSAGE, "DisableSGXClocks: Disabling SGX Clocks")); - #if !defined(PM_RUNTIME_SUPPORT) -- clk_disable(psSysSpecData->psSGX_FCK); -+ clk_disable_unprepare(psSysSpecData->psSGX_FCK); - #endif - SysDisableSGXInterrupts(psSysData); - -@@ -540,14 +583,14 @@ - rate = clk_get_rate(psSysSpecData->psGPT11_FCK); - PVR_TRACE(("GPTIMER11 clock is %dMHz", HZ_TO_MHZ(rate))); - -- res = clk_enable(psSysSpecData->psGPT11_FCK); -+ res = clk_prepare_enable(psSysSpecData->psGPT11_FCK); - if (res < 0) - { - PVR_DPF((PVR_DBG_ERROR, "EnableSystemClocks: Couldn't enable GPTIMER11 functional clock (%d)", res)); - goto ExitError; - } - -- res = clk_enable(psSysSpecData->psGPT11_ICK); -+ res = clk_prepare_enable(psSysSpecData->psGPT11_ICK); - if (res < 0) - { - PVR_DPF((PVR_DBG_ERROR, "EnableSystemClocks: Couldn't enable GPTIMER11 interface clock (%d)", res)); -@@ -610,9 +653,9 @@ - - ExitDisableGPT11ICK: - #if defined(PVR_OMAP4_TIMING_PRCM) -- clk_disable(psSysSpecData->psGPT11_ICK); -+ clk_disable_unprepare(psSysSpecData->psGPT11_ICK); - ExitDisableGPT11FCK: -- clk_disable(psSysSpecData->psGPT11_FCK); -+ clk_disable_unprepare(psSysSpecData->psGPT11_FCK); - ExitError: - #endif /* defined(PVR_OMAP4_TIMING_PRCM) */ - eError = PVRSRV_ERROR_CLOCK_REQUEST_FAILED; -@@ -664,9 +707,9 @@ - psSysSpecData->sTimerRegPhysBase.uiAddr = 0; - #endif - #if defined(PVR_OMAP4_TIMING_PRCM) -- clk_disable(psSysSpecData->psGPT11_ICK); -+ clk_disable_unprepare(psSysSpecData->psGPT11_ICK); - -- clk_disable(psSysSpecData->psGPT11_FCK); -+ clk_disable_unprepare(psSysSpecData->psGPT11_FCK); - #endif /* defined(PVR_OMAP4_TIMING_PRCM) */ - } - #endif /* PVR_OMAP_USE_DM_TIMER_API */ diff --git a/package.bak/ti-gfx/0002-fix-build-omaplfb-linux.patch b/package.bak/ti-gfx/0002-fix-build-omaplfb-linux.patch deleted file mode 100644 index 002d01c1af..0000000000 --- a/package.bak/ti-gfx/0002-fix-build-omaplfb-linux.patch +++ /dev/null @@ -1,21 +0,0 @@ -Since commit a73fdc647417699833f22d0f239affe22e062827 in the kernel, -omap_dss_device's 'output' is renamed 'src'. - -Fix build with at least es5.x selected (AM35xx). - -Signed-off-by: Hadrien Boutteville - ---- a/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c -+++ b/GFX_Linux_KM/services4/3rdparty/dc_omapfb3_linux/omaplfb_linux.c -@@ -176,8 +176,10 @@ - #define OMAP_DSS_DRIVER(drv, dev) struct omap_dss_driver *drv = (dev) != NULL ? (dev)->driver : NULL - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0)) - #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->manager : NULL --#else -+#elif (LINUX_VERSION_CODE < KERNEL_VERSION(3,12,0)) - #define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->output->manager : NULL -+#else -+#define OMAP_DSS_MANAGER(man, dev) struct omap_overlay_manager *man = (dev) != NULL ? (dev)->src->manager : NULL - #endif - - #define WAIT_FOR_VSYNC(man) ((man)->wait_for_vsync) diff --git a/package.bak/ti-gfx/0003-km_install_modules.patch b/package.bak/ti-gfx/0003-km_install_modules.patch deleted file mode 100644 index 2cf6e81557..0000000000 --- a/package.bak/ti-gfx/0003-km_install_modules.patch +++ /dev/null @@ -1,19 +0,0 @@ -Patch to add modules_install target to the modules makefile. This makes -installation a little easier. - -Signed-off-by: Spenser Gilliland ----- -Index: ti-gfx-4_09_00_01/GFX_Linux_KM/Makefile -=================================================================== ---- ti-gfx-4_09_00_01.orig/GFX_Linux_KM/Makefile 2013-03-07 11:00:11.000000000 -0600 -+++ ti-gfx-4_09_00_01/GFX_Linux_KM/Makefile 2013-05-23 01:36:29.356676281 -0500 -@@ -479,6 +479,9 @@ - all: - $(MAKE) -C $(KERNELDIR) M=`pwd` $* - -+install: -+ $(MAKE) -C $(KERNELDIR) M=`pwd` modules_install -+ - clean: - @find . -name "*.o" -exec rm -r {} \; - @find . -name "*.ko" -exec rm -r {} \; diff --git a/package.bak/ti-gfx/Config.in b/package.bak/ti-gfx/Config.in deleted file mode 100644 index 6ec2f23117..0000000000 --- a/package.bak/ti-gfx/Config.in +++ /dev/null @@ -1,82 +0,0 @@ -config BR2_PACKAGE_TI_GFX - bool "ti-gfx" - depends on BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC && BR2_arm - select BR2_HOSTARCH_NEEDS_IA32_LIBS - select BR2_PACKAGE_HAS_LIBEGL - select BR2_PACKAGE_HAS_LIBGLES - select BR2_PACKAGE_HAS_POWERVR - select BR2_PACKAGE_FBSET if !BR2_PACKAGE_BUSYBOX # Runtime dependency only - select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra - help - Graphics libraries for TI boards using SGX acceleration. - - Supports OMAP35xx, DM37xx/AM37xx, DM816x, DM814x, AM335x and - AM43xx. - - For newer CPUs or kernels use the ti-sgx-{km,um} packages. - - http://downloads.ti.com/dsps/dsps_public_sw/gfxsdk/ - -if BR2_PACKAGE_TI_GFX - -config BR2_PACKAGE_PROVIDES_LIBEGL - default "ti-gfx" - -config BR2_PACKAGE_PROVIDES_LIBGLES - default "ti-gfx" - -config BR2_PACKAGE_PROVIDES_POWERVR - default "ti-gfx" - -config BR2_PACKAGE_TI_GFX_DEBUG - bool "enable debug support" - help - Turns on debugging in the kernel module, install libraries built with - debugging enabled, installs various tests and installs esrev script. - -config BR2_PACKAGE_TI_GFX_DEMOS - bool "install demos" - default y - help - Install the OGLES2ChameleonMan and OGLES2MagicLantern demos - -config BR2_PACKAGE_TI_GFX_EGLIMAGE - bool "install eglimage version of libraries" - help - Installs OpenGL libaries which support the eglimage api. - -choice - prompt "Target" - default BR2_PACKAGE_TI_GFX_ES3 - help - Select the SOC for which you would like to install drivers. Please use the - chart at - http://processors.wiki.ti.com/index.php/OMAP35x_Graphics_SDK_Getting_Started_Guide - -config BR2_PACKAGE_TI_GFX_ES3 - bool "es3.x (OMAP35xx, AM35xx Rev 3.1+)" - help - OMAP35xx, AM35xx Rev 3.1+ - -config BR2_PACKAGE_TI_GFX_ES5 - bool "es5.x (AM37xx, DM37xx)" - help - AM37xx, DM37xx - -config BR2_PACKAGE_TI_GFX_ES6 - bool "es6.x (AM387x, DMA814x, AM389x, DM816x)" - help - AM387x, DM814x, AM389x, DM816x - -config BR2_PACKAGE_TI_GFX_ES8 - bool "es8.x (AM335x)" - help - AM335x - -endchoice - -endif - -comment "ti-gfx needs a glibc toolchain and a Linux kernel to be built" - depends on BR2_arm - depends on !(BR2_LINUX_KERNEL && BR2_TOOLCHAIN_USES_GLIBC) diff --git a/package.bak/ti-gfx/S80ti-gfx b/package.bak/ti-gfx/S80ti-gfx deleted file mode 100644 index fc5999a86d..0000000000 --- a/package.bak/ti-gfx/S80ti-gfx +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh - -start() { - echo "ti-gfx: starting pvr driver" - - BITSPERPIXEL="$(fbset | awk '/geom/ {print $6}')" - YRES="$(fbset | awk '/geom/ {print $3}')" - # Set RGBA ordering to something the drivers like - if [ "$BITSPERPIXEL" = "32" ] ; then - fbset -rgba 8/16,8/8,8/0,8/24 - fi - # Try to enable triple buffering when there's enough VRAM - fbset -vyres $(( YRES*3 )) - - modprobe pvrsrvkm - modprobe omaplfb - modprobe bufferclass_ti - - pvr_maj=$(awk '$2=="pvrsrvkm" { print $1; }' /proc/devices) - rm -f /dev/pvrsrvkm - - mknod /dev/pvrsrvkm c $pvr_maj 0 - chmod 600 /dev/pvrsrvkm - - if ! /usr/bin/pvrsrvctl --start --no-module; then - echo "ti-gfx: unable to start server" - fi -} - -stop() { - echo "ti-gfx: stopping pvr driver" - - rmmod bufferclass_ti - rmmod omaplfb - rmmod pvrsrvkm -} - -case "$1" in -start) - start -;; -stop) - stop -;; -restart) - stop - start -;; -*) - echo "ti-gfx: Please use start, stop, or restart." - exit 1 -;; -esac diff --git a/package.bak/ti-gfx/egl.pc b/package.bak/ti-gfx/egl.pc deleted file mode 100644 index 36ea41317b..0000000000 --- a/package.bak/ti-gfx/egl.pc +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/usr/ -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -Name: egl -Description: TI Graphics SDK implementation of EGL -Version: 1.9.2188537 -Requires: -Libs: -L${libdir} -lEGL -lGLESv2 -lIMGegl -Cflags: -I${includedir} diff --git a/package.bak/ti-gfx/esrev.sh b/package.bak/ti-gfx/esrev.sh deleted file mode 100644 index 6220d4477d..0000000000 --- a/package.bak/ti-gfx/esrev.sh +++ /dev/null @@ -1,59 +0,0 @@ -#!/bin/sh - -# Debug script to determine proper ES revision for the current board. The -# pvrsrvkm module must be insmoded before attempting to get the es rev. - -machine_id() { # return the machine ID - awk 'BEGIN { FS=": " } /Hardware/ \ - { gsub(" ", "_", $2); print tolower($2) } ' - -Index: b/Makefile -=================================================================== ---- a/Makefile -+++ b/Makefile -@@ -13,13 +13,11 @@ - all: - $(MAKE) -C src - $(MAKE) -C utils -- $(MAKE) -C doxygen - - .PHONY: clean - clean: - $(MAKE) -C src clean - $(MAKE) -C utils clean -- $(MAKE) -C doxygen clean - - .PHONY: install - install: -@@ -27,5 +25,3 @@ - cp -Ru include/tinyalsa $(DESTDIR)$(INCDIR)/ - $(MAKE) -C src install - $(MAKE) -C utils install -- $(MAKE) -C doxygen install -- diff --git a/package.bak/tinyalsa/Config.in b/package.bak/tinyalsa/Config.in deleted file mode 100644 index 9ee47676fc..0000000000 --- a/package.bak/tinyalsa/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_TINYALSA - bool "tinyalsa" - depends on !BR2_STATIC_LIBS - help - a small library to interface with ALSA in the Linux kernel - - The aims are: - - - Provide a basic pcm and mixer API - - If it's not absolutely needed, don't add it to the API - - Avoid supporting complex and unnecessary operations that could be dealt - with at a higher level - - https://github.com/tinyalsa/tinyalsa - -comment "tinyalsa needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/tinyalsa/tinyalsa.hash b/package.bak/tinyalsa/tinyalsa.hash deleted file mode 100644 index b6bea47eba..0000000000 --- a/package.bak/tinyalsa/tinyalsa.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 93f4ca1e6345974167dc5577e8151a31fa2e6a628727a72d59e18db2289e7a1c tinyalsa-1.1.0.tar.gz diff --git a/package.bak/tinyalsa/tinyalsa.mk b/package.bak/tinyalsa/tinyalsa.mk deleted file mode 100644 index d44155f94d..0000000000 --- a/package.bak/tinyalsa/tinyalsa.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# tinyalsa -# -################################################################################ - -TINYALSA_VERSION = 1.1.0 -TINYALSA_SITE = $(call github,tinyalsa,tinyalsa,$(TINYALSA_VERSION)) -TINYALSA_LICENSE = BSD-3c -TINYALSA_LICENSE_FILES = NOTICE -TINYALSA_INSTALL_STAGING = YES - -define TINYALSA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" -C $(@D) -endef - -define TINYALSA_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(STAGING_DIR)" install -endef - -define TINYALSA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) \ - -C $(@D) \ - PREFIX="/usr" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/tinycbor/0001-Update-cjson-include-path.patch b/package.bak/tinycbor/0001-Update-cjson-include-path.patch deleted file mode 100644 index 5eea937d91..0000000000 --- a/package.bak/tinycbor/0001-Update-cjson-include-path.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 9aa79d8e9e38b31b34d9933a266c698e79808a79 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 13 Nov 2016 15:43:40 +0100 -Subject: [PATCH] Update cjson include path - -Since cjson-v1.0.0 (https://github.com/DaveGamble/cJSON/releases), -cJSON.h is installed into cjson/cJSON.h and library has been renamed -from cJSON to cjson - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 4 ++-- - Makefile.configure | 4 ++-- - tools/json2cbor/json2cbor.c | 2 +- - 3 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/Makefile b/Makefile -index acd52eb..905fbdf 100644 ---- a/Makefile -+++ b/Makefile -@@ -82,12 +82,12 @@ ifeq ($(open_memstream-pass),) - endif - endif - --# json2cbor depends on an external library (cJSON) -+# json2cbor depends on an external library (cjson) - ifneq ($(cjson-pass)$(system-cjson-pass),) - JSON2CBOR_SOURCES = tools/json2cbor/json2cbor.c - INSTALL_TARGETS += $(bindir)/json2cbor - ifeq ($(system-cjson-pass),1) -- LDFLAGS_CJSON = -lcJSON -+ LDFLAGS_CJSON = -lcjson - else - JSON2CBOR_SOURCES += src/cjson/cJSON.c - json2cbor_CCFLAGS = -I$(SRCDIR)src/cjson -diff --git a/Makefile.configure b/Makefile.configure -index 28f4c92..424efb3 100644 ---- a/Makefile.configure -+++ b/Makefile.configure -@@ -10,11 +10,11 @@ PROGRAM-gc_sections = int main() {} - CCFLAGS-gc_sections = -Wl,--gc-sections - - PROGRAM-cjson = \#include \n --PROGRAM-cjson += \#include \n -+PROGRAM-cjson += \#include \n - PROGRAM-cjson += int main() { return cJSON_False; } - CCFLAGS-cjson = -I$(dir $(MAKEFILE))src/cjson - PROGRAM-system-cjson = $(PROGRAM-cjson) --CCFLAGS-system-cjson = -lcJSON -+CCFLAGS-system-cjson = -lcjson - - sink: - @echo >&2 Please run from the top-level Makefile. -diff --git a/tools/json2cbor/json2cbor.c b/tools/json2cbor/json2cbor.c -index 96d3ed1..e194299 100644 ---- a/tools/json2cbor/json2cbor.c -+++ b/tools/json2cbor/json2cbor.c -@@ -27,7 +27,7 @@ - #include "cbor.h" - #include "compilersupport_p.h" - --#include -+#include - - #include - #include --- -2.5.0 - diff --git a/package.bak/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch b/package.bak/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch deleted file mode 100644 index dfea4ca68f..0000000000 --- a/package.bak/tinycbor/0002-Fix-static-compilation-of-json2cbor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1be7da8d81bbd52d722ec60250567ea876f6f4b5 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sat, 3 Dec 2016 20:15:41 +0100 -Subject: [PATCH] Fix static compilation of json2cbor - -json2cbor depends on cjson so tools/json2cbor/json2cbor.o must before --lcjson - -Signed-off-by: Fabrice Fontaine ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 905fbdf..7b5fefc 100644 ---- a/Makefile -+++ b/Makefile -@@ -115,7 +115,7 @@ bin/cbordump: $(CBORDUMP_SOURCES:.c=.o) lib/libtinycbor.a | bin - $(CC) -o $@ $(LDFLAGS) $^ $(LDLIBS) -lm - - bin/json2cbor: $(JSON2CBOR_SOURCES:.c=.o) lib/libtinycbor.a | bin -- $(CC) -o $@ $(LDFLAGS) $(LDFLAGS_CJSON) $^ $(LDLIBS) -lm -+ $(CC) -o $@ $(LDFLAGS) $^ $(LDFLAGS_CJSON) $(LDLIBS) -lm - - tinycbor.pc: tinycbor.pc.in - $(SED) > $@ < $< \ --- -2.5.0 - diff --git a/package.bak/tinycbor/Config.in b/package.bak/tinycbor/Config.in deleted file mode 100644 index 41f0b5fac3..0000000000 --- a/package.bak/tinycbor/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_TINYCBOR - bool "tinycbor" - help - Concise Binary Object Representation (CBOR) Library - - https://github.com/01org/tinycbor diff --git a/package.bak/tinycbor/tinycbor.hash b/package.bak/tinycbor/tinycbor.hash deleted file mode 100644 index 88300e8e34..0000000000 --- a/package.bak/tinycbor/tinycbor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 302ac9de66f1048725040ccc9a99e03c20529ac2b150ccf35cfd1e2dafa81c4b tinycbor-v0.4.tar.gz diff --git a/package.bak/tinycbor/tinycbor.mk b/package.bak/tinycbor/tinycbor.mk deleted file mode 100644 index 65deacd22b..0000000000 --- a/package.bak/tinycbor/tinycbor.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# tinycbor -# -################################################################################ - -TINYCBOR_VERSION = v0.4 -TINYCBOR_SITE = $(call github,01org,tinycbor,$(TINYCBOR_VERSION)) -TINYCBOR_LICENSE = MIT -TINYCBOR_LICENSE_FILES = LICENSE - -TINYCBOR_DEPENDENCIES = host-pkgconf -TINYCBOR_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_CJSON),y) -TINYCBOR_DEPENDENCIES += cjson -endif - -TINYCBOR_MAKE_OPTS = $(TARGET_CONFIGURE_OPTS) V=1 - -# disabled parallel build because of build failures while -# producing the .config file -define TINYCBOR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) $(TINYCBOR_MAKE_OPTS) -C $(@D) -endef - -define TINYCBOR_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(STAGING_DIR) prefix=/usr install -endef - -define TINYCBOR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TINYCBOR_MAKE_OPTS) -C $(@D) \ - DESTDIR=$(TARGET_DIR) prefix=/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch b/package.bak/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch deleted file mode 100644 index 5e91f2ee5d..0000000000 --- a/package.bak/tinydtls/0001-Update-Makefile.in-to-allow-cross-compilation.patch +++ /dev/null @@ -1,170 +0,0 @@ -From a6f312dfb4497d5e72664c4772a8b122e25b81d8 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 26 Jul 2016 09:09:53 +0200 -Subject: [PATCH] Update Makefile.in to allow cross-compilation - -Use CC, CPP and DESTDIR environment variables passed to configure in Makefile.in files -Fix definition of LIBS and LDFLAGS (LDFLAGS was set to @LIBS@) - -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 13 ++++++++----- - aes/Makefile.in | 7 +++++-- - doc/Makefile.in | 4 ++-- - ecc/Makefile.in | 7 +++++-- - sha2/Makefile.in | 7 +++++-- - tests/Makefile.in | 4 +++- - 6 files changed, 28 insertions(+), 14 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 38cc665..7dcd424 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -40,7 +40,9 @@ OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) $(SUB_OBJECTS) - HEADERS:=dtls.h hmac.h dtls_debug.h dtls_config.h uthash.h numeric.h crypto.h global.h ccm.h \ - netq.h alert.h utlist.h prng.h peer.h state.h dtls_time.h session.h \ - tinydtls.h -+CC:=@CC@ - CFLAGS:=-Wall -pedantic -std=c99 @CFLAGS@ -+CPP:=@CPP@ - CPPFLAGS:=@CPPFLAGS@ -DDTLS_CHECK_CONTENTTYPE - SUBDIRS:=tests doc platform-specific sha2 aes ecc - DISTSUBDIRS:=$(SUBDIRS) -@@ -48,7 +50,8 @@ DISTDIR=$(top_builddir)/$(package) - FILES:=Makefile.in configure configure.in dtls_config.h.in tinydtls.h.in \ - Makefile.tinydtls $(SOURCES) $(HEADERS) - LIB:=libtinydtls.a --LDFLAGS:=@LIBS@ -+LDFLAGS:=@LDFLAGS@ -+LIBS:=@LIBS@ - ARFLAGS:=cru - doc:=doc - -@@ -100,10 +103,10 @@ dist: $(FILES) $(DISTSUBDIRS) - tar czf $(package).tar.gz $(DISTDIR) - - install: $(LIB) $(HEADERS) $(SUBDIRS) -- test -d $(libdir) || mkdir -p $(libdir) -- test -d $(includedir) || mkdir -p $(includedir) -- $(install) $(LIB) $(libdir)/ -- $(install) $(HEADERS) $(includedir)/ -+ test -d $(DESTDIR)$(libdir) || mkdir -p $(DESTDIR)$(libdir) -+ test -d $(DESTDIR)$(includedir) || mkdir -p $(DESTDIR)$(includedir) -+ $(install) $(LIB) $(DESTDIR)$(libdir)/ -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/ - for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir install="$(install)" includedir=$(includedir) install; \ - done -diff --git a/aes/Makefile.in b/aes/Makefile.in -index 7c9f6ef..9ff7799 100644 ---- a/aes/Makefile.in -+++ b/aes/Makefile.in -@@ -28,8 +28,11 @@ top_srcdir:= @top_srcdir@ - SOURCES:= rijndael.c - HEADERS:= rijndael.h - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - FILES:=Makefile.in $(SOURCES) $(HEADERS) - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -@@ -60,8 +63,8 @@ dist: $(FILES) - cp -p $(FILES) $(DISTDIR)/aes - - install: $(HEADERS) -- test -d $(includedir)/aes || mkdir -p $(includedir)/aes -- $(install) $(HEADERS) $(includedir)/aes -+ test -d $(DESTDIR)$(includedir)/aes || mkdir -p $(DESTDIR)$(includedir)/aes -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/aes - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/doc/Makefile.in b/doc/Makefile.in -index a07101e..5ab0a35 100644 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -32,5 +32,5 @@ dist: doc - cp -r $(FILES) $(DISTDIR)/doc - - install: $(doc) html -- test -d $(htmldir) || mkdir -p $(htmldir) -- cp -r html/* $(htmldir) -+ test -d $(DESTDIR)$(htmldir) || mkdir -p $(DESTDIR)$(htmldir) -+ cp -r html/* $(DESTDIR)$(htmldir) -diff --git a/ecc/Makefile.in b/ecc/Makefile.in -index 2ba17a1..2086d4f 100644 ---- a/ecc/Makefile.in -+++ b/ecc/Makefile.in -@@ -36,8 +36,11 @@ include Makefile.contiki - else - ECC_OBJECTS:= $(patsubst %.c, %.o, $(ECC_SOURCES)) ecc_test.o - PROGRAMS:= testecc testfield -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -DTEST_INCLUDE -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - - .PHONY: all dirs clean install distclean .gitignore doc -@@ -74,8 +77,8 @@ dist: $(FILES) - cp -p $(FILES) $(DISTDIR)/ecc - - install: $(HEADERS) -- test -d $(includedir)/ecc || mkdir -p $(includedir)/ecc -- $(install) $(HEADERS) $(includedir)/ecc -+ test -d $(DESTDIR)$(includedir)/ecc || mkdir -p $(DESTDIR)$(includedir)/ecc -+ $(install) $(ECC_HEADERS) $(DESTDIR)$(includedir)/ecc - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/sha2/Makefile.in b/sha2/Makefile.in -index 9f19314..69f8793 100644 ---- a/sha2/Makefile.in -+++ b/sha2/Makefile.in -@@ -28,8 +28,11 @@ top_srcdir:= @top_srcdir@ - SOURCES:= sha2.c - HEADERS:=sha2.h - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) -+CPP=@CPP@ - CPPFLAGS=@CPPFLAGS@ -I$(top_srcdir) -+CC=@CC@ - CFLAGS=-Wall -std=c99 -pedantic @CFLAGS@ -+LDFLAGS=@LDFLAGS@ - LDLIBS=@LIBS@ - FILES:=Makefile.in $(SOURCES) $(HEADERS) README sha2prog.c sha2speed.c sha2test.pl - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ -@@ -62,8 +65,8 @@ dist: $(FILES) - cp -pr testvectors $(DISTDIR)/sha2/testvectors - - install: $(HEADERS) -- test -d $(includedir)/sha2 || mkdir -p $(includedir)/sha2 -- $(install) $(HEADERS) $(includedir)/sha2 -+ test -d $(DESTDIR)$(includedir)/sha2 || mkdir -p $(DESTDIR)$(includedir)/sha2 -+ $(install) $(HEADERS) $(DESTDIR)$(includedir)/sha2 - - .gitignore: - echo "core\n*~\n*.[oa]\n*.gz\n*.cap\n$(PROGRAM)\n$(DISTDIR)\n.gitignore" >$@ -diff --git a/tests/Makefile.in b/tests/Makefile.in -index a8a2ed0..b45f440 100644 ---- a/tests/Makefile.in -+++ b/tests/Makefile.in -@@ -32,9 +32,11 @@ SOURCES:= dtls-server.c ccm-test.c prf-test.c \ - OBJECTS:= $(patsubst %.c, %.o, $(SOURCES)) - PROGRAMS:= $(patsubst %.c, %, $(SOURCES)) - HEADERS:= -+CC:=@CC@ - CFLAGS:=-Wall @CFLAGS@ -+CPP:=@CPP@ - CPPFLAGS:=-I$(top_srcdir) @CPPFLAGS@ --LDFLAGS:=-L$(top_builddir) -+LDFLAGS:=-L$(top_builddir) @LDFLAGS@ - LDLIBS:=-ltinydtls @LIBS@ - DISTDIR=$(top_builddir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@ - FILES:=Makefile.in $(SOURCES) ccm-testdata.c #cbc_aes128-testdata.c --- -2.7.4 - diff --git a/package.bak/tinydtls/0002-Fix-compilation-of-tests-directory.patch b/package.bak/tinydtls/0002-Fix-compilation-of-tests-directory.patch deleted file mode 100644 index 0ab579c45e..0000000000 --- a/package.bak/tinydtls/0002-Fix-compilation-of-tests-directory.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c629a108f5d03cd365c0ba71143ad507f6cd97f0 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Thu, 28 Jul 2016 08:36:06 +0200 -Subject: [PATCH] Fix compilation of tests directory - -binaries in tests subdirectory depends on libtinydtls so add $(LIB) dependency -for dirs target in Makefile.in - -Signed-off-by: Fabrice Fontaine ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7dcd424..c493705 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -68,8 +68,8 @@ check: - echo top_builddir: $(top_builddir) - $(MAKE) -C tests check - --dirs: $(SUBDIRS) -- for dir in $^; do \ -+dirs: $(LIB) $(SUBDIRS) -+ for dir in $(SUBDIRS); do \ - $(MAKE) -C $$dir ; \ - done - --- -2.7.4 - diff --git a/package.bak/tinydtls/Config.in b/package.bak/tinydtls/Config.in deleted file mode 100644 index 2f90eb2436..0000000000 --- a/package.bak/tinydtls/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_TINYDTLS - bool "tinydtls" - depends on BR2_TOOLCHAIN_HAS_THREADS - help - tinydtls is a library for Datagram Transport Layer Security - (DTLS) covering both the client and the server state - machine. It is implemented in C and provides support for - the mandatory cipher suites specified in CoAP. - - https://sourceforge.net/projects/tinydtls - -comment "tinydtls needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/tinydtls/tinydtls.hash b/package.bak/tinydtls/tinydtls.hash deleted file mode 100644 index 909c8d16f5..0000000000 --- a/package.bak/tinydtls/tinydtls.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 ccf6d8fbae03fb2e0ba32878ed8e57d8b4f73538b1064df90a3e764da5fac010 tinydtls-0.8.2.tar.gz diff --git a/package.bak/tinydtls/tinydtls.mk b/package.bak/tinydtls/tinydtls.mk deleted file mode 100644 index fe250014ca..0000000000 --- a/package.bak/tinydtls/tinydtls.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# tinydtls -# -################################################################################ - -TINYDTLS_REL = r5 -TINYDTLS_VERSION = 0.8.2 -TINYDTLS_SITE = http://downloads.sourceforge.net/project/tinydtls/$(TINYDTLS_REL) -TINYDTLS_LICENSE = MIT -TINYDTLS_LICENSE_FILES = tinydtls.h -TINYDTLS_INSTALL_STAGING = YES -TINYDTLS_STRIP_COMPONENTS = 2 -# use inttypes.h data types instead of u_intXX_t for musl compatibility -TINYDTLS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -DSHA2_USE_INTTYPES_H" - -$(eval $(autotools-package)) diff --git a/package.bak/tinyhttpd/0001-misc-fixes.patch b/package.bak/tinyhttpd/0001-misc-fixes.patch deleted file mode 100644 index 05d6e50a70..0000000000 --- a/package.bak/tinyhttpd/0001-misc-fixes.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -ur tinyhttpd-0.1.0/httpd.c tinyhttpd-0.1.0-patched/httpd.c ---- tinyhttpd-0.1.0/httpd.c 2001-04-21 19:13:13.000000000 -0500 -+++ tinyhttpd-0.1.0-patched/httpd.c 2007-07-02 09:19:27.000000000 -0500 -@@ -4,14 +4,6 @@ - * CSE 4344 (Network concepts), Prof. Zeigler - * University of Texas at Arlington - */ --/* This program compiles for Sparc Solaris 2.6. -- * To compile for Linux: -- * 1) Comment out the #include line. -- * 2) Comment out the line that defines the variable newthread. -- * 3) Comment out the two lines that run pthread_create(). -- * 4) Uncomment the line that runs accept_request(). -- * 5) Remove -lsocket from the Makefile. -- */ - #include - #include - #include -@@ -22,7 +14,6 @@ - #include - #include - #include --#include - #include - #include - -@@ -30,7 +21,6 @@ - - #define SERVER_STRING "Server: jdbhttpd/0.1.0\r\n" - --void accept_request(int); - void bad_request(int); - void cat(int, FILE *); - void cannot_execute(int); -@@ -102,7 +92,7 @@ - } - } - -- sprintf(path, "htdocs%s", url); -+ sprintf(path, "/var/www%s", url); - if (path[strlen(path) - 1] == '/') - strcat(path, "index.html"); - if (stat(path, &st) == -1) { -@@ -475,11 +465,10 @@ - int main(void) - { - int server_sock = -1; -- u_short port = 0; -+ u_short port = 80; - int client_sock = -1; - struct sockaddr_in client_name; - int client_name_len = sizeof(client_name); -- pthread_t newthread; - - server_sock = startup(&port); - printf("httpd running on port %d\n", port); -@@ -491,9 +480,7 @@ - &client_name_len); - if (client_sock == -1) - error_die("accept"); -- /* accept_request(client_sock); */ -- if (pthread_create(&newthread , NULL, accept_request, client_sock) != 0) -- perror("pthread_create"); -+ accept_request(client_sock); - } - - close(server_sock); -diff -ur tinyhttpd-0.1.0/Makefile tinyhttpd-0.1.0-patched/Makefile ---- tinyhttpd-0.1.0/Makefile 2001-04-21 17:03:39.000000000 -0500 -+++ tinyhttpd-0.1.0-patched/Makefile 2007-07-02 10:29:41.000000000 -0500 -@@ -1,7 +1,7 @@ - all: httpd - - httpd: httpd.c -- gcc -W -Wall -lsocket -lpthread -o httpd httpd.c -+ $(CC) $(CFLAGS) $(LDFLAGS) -W -Wall -o httpd httpd.c - - clean: -- rm httpd -+ rm -f httpd diff --git a/package.bak/tinyhttpd/Config.in b/package.bak/tinyhttpd/Config.in deleted file mode 100644 index f7365afa6f..0000000000 --- a/package.bak/tinyhttpd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_TINYHTTPD - bool "tinyhttpd" - depends on BR2_USE_MMU # fork() - help - A relatively simple webserver written as a school project. It is - exceedingly simple, threaded and handles basic CGI scripts. - - http://sourceforge.net/projects/tinyhttpd/ diff --git a/package.bak/tinyhttpd/S85tinyhttpd b/package.bak/tinyhttpd/S85tinyhttpd deleted file mode 100755 index fb512a0375..0000000000 --- a/package.bak/tinyhttpd/S85tinyhttpd +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh - -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -NAME=tinyhttpd - -test -x /usr/sbin/$NAME || exit 0 -mkdir -p /var/www - -case "$1" in - start) - printf "Starting $NAME: " - $NAME > /dev/null & - echo "done" - ;; - stop) - printf "Stopping $NAME: " - killall -9 $NAME - echo "done" - ;; - restart) - printf "Restarting $NAME: " - killall -9 $NAME - sleep 1 - $NAME > /dev/null & - echo "done" - ;; - *) - echo "Usage: /etc/init.d/S85tinyhttpd {start|stop|restart}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/tinyhttpd/tinyhttpd.hash b/package.bak/tinyhttpd/tinyhttpd.hash deleted file mode 100644 index 73255d5651..0000000000 --- a/package.bak/tinyhttpd/tinyhttpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 56609b82869c80ba71b2a2af166a0bcaffe21e7412f4594e04b9a5abf733435a tinyhttpd-0.1.0.tar.gz diff --git a/package.bak/tinyhttpd/tinyhttpd.mk b/package.bak/tinyhttpd/tinyhttpd.mk deleted file mode 100644 index 058f6bd186..0000000000 --- a/package.bak/tinyhttpd/tinyhttpd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# tinyhttpd -# -################################################################################ - -TINYHTTPD_VERSION = 0.1.0 -TINYHTTPD_SITE = http://downloads.sourceforge.net/project/tinyhttpd/tinyhttpd%20source/tinyhttpd%20$(TINYHTTPD_VERSION) -TINYHTTPD_LICENSE = GPL -TINYHTTPD_LICENSE_FILES = README - -define TINYHTTPD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" -endef - -define TINYHTTPD_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/httpd $(TARGET_DIR)/usr/sbin/tinyhttpd - mkdir -p $(TARGET_DIR)/var/www -endef - -define TINYHTTPD_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/tinyhttpd/S85tinyhttpd \ - $(TARGET_DIR)/etc/init.d/S85tinyhttpd -endef - -define TINYHTTPD_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/tinyhttpd/tinyhttpd.service \ - $(TARGET_DIR)/usr/lib/systemd/system/tinyhttpd.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/tinyhttpd.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/tinyhttpd.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/tinyhttpd/tinyhttpd.service b/package.bak/tinyhttpd/tinyhttpd.service deleted file mode 100644 index 0ae5bac943..0000000000 --- a/package.bak/tinyhttpd/tinyhttpd.service +++ /dev/null @@ -1,10 +0,0 @@ -[Unit] -Description=Tiny HTTP daemon -After=network.target - -[Service] -ExecStart=/usr/sbin/tinyhttpd -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch b/package.bak/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch deleted file mode 100644 index 88559ec012..0000000000 --- a/package.bak/tinymembench/0001-arm-fix-build-on-Thumb-only-architectures.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 034a3552e9700c6d424bd706db106f5bce1f5a5e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Fri, 11 Nov 2016 21:49:39 +0100 -Subject: [PATCH] arm: fix build on Thumb-only architectures - -Building tinymembench for ARM Cortex-M currently fails, because the -arm-neon.S file contains ARM code that doesn't build on Thumb-only -architectures. To account for this and fix the build for Cortex-M, -this patch adjusts the compile time condition to also verify that the -architecture supports the ARM instruction set, by testing the -__ARM_ARCH_ISA_ARM compiler define. - -Signed-off-by: Thomas Petazzoni ---- - arm-neon.S | 2 +- - asm-opt.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/arm-neon.S b/arm-neon.S -index 4db78ce..19c30ad 100644 ---- a/arm-neon.S -+++ b/arm-neon.S -@@ -21,7 +21,7 @@ - * DEALINGS IN THE SOFTWARE. - */ - --#ifdef __arm__ -+#if defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - .text - .fpu neon -diff --git a/asm-opt.c b/asm-opt.c -index 9da4596..eba1183 100644 ---- a/asm-opt.c -+++ b/asm-opt.c -@@ -202,7 +202,7 @@ bench_info *get_asm_framebuffer_benchmarks(void) - return empty; - } - --#elif defined(__arm__) -+#elif defined(__arm__) && defined(__ARM_ARCH_ISA_ARM) - - #include "arm-neon.h" - --- -2.7.4 - diff --git a/package.bak/tinymembench/Config.in b/package.bak/tinymembench/Config.in deleted file mode 100644 index 8f6e1a2b35..0000000000 --- a/package.bak/tinymembench/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TINYMEMBENCH - bool "tinymembench" - depends on !BR2_MIPS_NABI32 && !BR2_MIPS_NABI64 - help - Tinymembench is a simple memory benchmark program, which - tries to measure the peak bandwidth of sequential memory - accesses and the latency of random memory accesses. - Bandwidth is measured by running different assembly code for - the aligned memory blocks and attempting different prefetch - strategies. - - https://github.com/ssvb/tinymembench diff --git a/package.bak/tinymembench/tinymembench.hash b/package.bak/tinymembench/tinymembench.hash deleted file mode 100644 index 813a1df429..0000000000 --- a/package.bak/tinymembench/tinymembench.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 e8cfcf0817eb8430f736426bc7557273765cef0e8002a17cca51645114e723b7 tinymembench-v0.3.tar.gz diff --git a/package.bak/tinymembench/tinymembench.mk b/package.bak/tinymembench/tinymembench.mk deleted file mode 100644 index ab479d64e3..0000000000 --- a/package.bak/tinymembench/tinymembench.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tinymembench -# -################################################################################ - -TINYMEMBENCH_VERSION = v0.3 -TINYMEMBENCH_SITE = $(call github,ssvb,tinymembench,$(TINYMEMBENCH_VERSION)) -TINYMEMBENCH_LICENSE = MIT -TINYMEMBENCH_LICENSE_FILES = main.c - -define TINYMEMBENCH_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TINYMEMBENCH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tinymembench \ - $(TARGET_DIR)/usr/bin/tinymembench -endef - -$(eval $(generic-package)) diff --git a/package.bak/tinyxml/Config.in b/package.bak/tinyxml/Config.in deleted file mode 100644 index 061ff67146..0000000000 --- a/package.bak/tinyxml/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TINYXML - bool "tinyxml" - depends on BR2_INSTALL_LIBSTDCPP - help - TinyXML is a simple, small, C++ XML parser that can be - easily integrating into other programs. - - https://github.com/leethomason/tinyxml2 - -comment "tinyxml needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/tinyxml/tinyxml.hash b/package.bak/tinyxml/tinyxml.hash deleted file mode 100644 index 6aa37d9de3..0000000000 --- a/package.bak/tinyxml/tinyxml.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 8164c9ad48b9028667768a584d62f7760cfbfb90d0dd6214ad174403058da10c tinyxml-2.6.2_2.tar.gz diff --git a/package.bak/tinyxml/tinyxml.mk b/package.bak/tinyxml/tinyxml.mk deleted file mode 100644 index df7b29fefb..0000000000 --- a/package.bak/tinyxml/tinyxml.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# tinyxml -# -################################################################################ - -TINYXML_VERSION = 2.6.2_2 -TINYXML_SITE = http://mirrors.xbmc.org/build-deps/sources -# AUTORECONF is needed because the XBMC's version of TinyXML contains a -# configure.ac which is not present in mainline. -TINYXML_AUTORECONF = YES -TINYXML_INSTALL_STAGING = YES -TINYXML_LICENSE = zlib -TINYXML_LICENSE_FILES = README - -$(eval $(autotools-package)) diff --git a/package.bak/tinyxml2/Config.in b/package.bak/tinyxml2/Config.in deleted file mode 100644 index 25bc5941aa..0000000000 --- a/package.bak/tinyxml2/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TINYXML2 - bool "tinyxml2" - depends on BR2_INSTALL_LIBSTDCPP - help - TinyXML-2 is a simple, small, efficient, C++ XML parser that can be - easily integrating into other programs. - - http://www.grinninglizard.com/tinyxml2/index.html - -comment "tinyxml2 needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/tinyxml2/tinyxml2.hash b/package.bak/tinyxml2/tinyxml2.hash deleted file mode 100644 index acbee0931a..0000000000 --- a/package.bak/tinyxml2/tinyxml2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 128aa1553e88403833e0cccf1b651f45ce87bc207871f53fdcc8e7f9ec795747 tinyxml2-3.0.0.tar.gz diff --git a/package.bak/tinyxml2/tinyxml2.mk b/package.bak/tinyxml2/tinyxml2.mk deleted file mode 100644 index 053e46eaf8..0000000000 --- a/package.bak/tinyxml2/tinyxml2.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# tinyxml2 -# -################################################################################ - -TINYXML2_VERSION = 3.0.0 -TINYXML2_SITE = $(call github,leethomason,tinyxml2,$(TINYXML2_VERSION)) -TINYXML2_LICENSE = zlib -TINYXML2_LICENSE_FILES = readme.md -TINYXML2_INSTALL_STAGING = YES - -$(eval $(cmake-package)) diff --git a/package.bak/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch b/package.bak/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch deleted file mode 100644 index bddc2c720d..0000000000 --- a/package.bak/tmux/0001-compat-don-t-re-define-program_invocation_short_name.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9b18a98614a9f201b0883c2b15e7c7bde0aa0ff2 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 5 Feb 2017 17:12:00 +0100 -Subject: [PATCH] compat: don't re-define program_invocation_short_name - -program_invocation_short_name is defined in errno.h, and its definition -can differ between the various C libraries: glibc defines it as: - extern char *program_invocation_short_name; - -while uClibc defines it as: - extern const char *program_invocation_short_name; - -So there is not simple solution to know the prototype. - -But since it is defined in errno.h, there is no reason to try and define -it ourselves; let's just trust what the header provides. - -Signed-off-by: "Yann E. MORIN" ---- - compat/getprogname.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/compat/getprogname.c b/compat/getprogname.c -index 80a496d..ad619fc 100644 ---- a/compat/getprogname.c -+++ b/compat/getprogname.c -@@ -19,11 +19,10 @@ - #include "compat.h" - - #if defined(HAVE_PROGRAM_INVOCATION_SHORT_NAME) -+#include - const char * - getprogname(void) - { -- extern char *program_invocation_short_name; -- - return (program_invocation_short_name); - } - #elif defined(HAVE___PROGNAME) --- -2.7.4 - diff --git a/package.bak/tmux/Config.in b/package.bak/tmux/Config.in deleted file mode 100644 index 756f38a088..0000000000 --- a/package.bak/tmux/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_TMUX - bool "tmux" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # mbtowc() - depends on BR2_ENABLE_LOCALE # runtime - select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_NCURSES - help - tmux is a terminal multiplexer, it enables a number of - terminals (or windows) to be accessed and controlled from a - single terminal. - - NOTE: tmux needs a working UTF-8 locale (BR2_GENERATE_LOCALE) - - https://tmux.github.io/ - -comment "tmux needs a toolchain w/ wchar, locale" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_ENABLE_LOCALE diff --git a/package.bak/tmux/tmux.hash b/package.bak/tmux/tmux.hash deleted file mode 100644 index 9195a1689c..0000000000 --- a/package.bak/tmux/tmux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b tmux-2.3.tar.gz diff --git a/package.bak/tmux/tmux.mk b/package.bak/tmux/tmux.mk deleted file mode 100644 index f6dd1a9cc6..0000000000 --- a/package.bak/tmux/tmux.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# tmux -# -################################################################################ - -TMUX_VERSION = 2.3 -TMUX_SITE = https://github.com/tmux/tmux/releases/download/$(TMUX_VERSION) -TMUX_LICENSE = ISC -TMUX_LICENSE_FILES = README -TMUX_DEPENDENCIES = libevent ncurses host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/tn5250/0001-ssldir.patch b/package.bak/tn5250/0001-ssldir.patch deleted file mode 100644 index 6fc78deef2..0000000000 --- a/package.bak/tn5250/0001-ssldir.patch +++ /dev/null @@ -1,17 +0,0 @@ -Value is assigned to $with_ssl_dir but used from $with_ssl which is wrong. -Fix configure since it's a one-liner and avoid an autoreconf. - -Signed-off-by: Gustavo Zacarias - -diff -Nura tn5250-0.17.4.orig/configure tn5250-0.17.4/configure ---- tn5250-0.17.4.orig/configure 2014-09-10 08:33:15.689519554 -0300 -+++ tn5250-0.17.4/configure 2014-09-10 08:33:47.428613117 -0300 -@@ -23258,7 +23258,7 @@ - if test "${with_ssl_dir+set}" = set; then - withval=$with_ssl_dir; - if test "$with_ssl_dir" != "no"; then -- checksslinclude "$with_ssl" -+ checksslinclude "$with_ssl_dir" - else - for topdir in /usr/local /usr /usr/pkg /usr/lib /var/ssl /opt; do - for subdir in $topdir $topdir/openssl $topdir/ssl; do diff --git a/package.bak/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch b/package.bak/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch deleted file mode 100644 index 67f0fa63a1..0000000000 --- a/package.bak/tn5250/0002-Allow-building-against-OpenSSL-without-SSLv2_SSLv3.patch +++ /dev/null @@ -1,32 +0,0 @@ -$OpenBSD: patch-lib5250_sslstream_c,v 1.1 2015/10/07 16:09:04 jca Exp $ - -Allow building against OpenSSL without SSLv2/SSLv3 support. - -Download from: -http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/tn5250/patches/patch-lib5250_sslstream_c - -Signed-off-by: Peter Korsgaard ---- a/lib5250/sslstream.c.orig Fri Nov 21 09:12:21 2008 -+++ b/lib5250/sslstream.c Tue Oct 6 21:32:29 2015 -@@ -368,13 +368,19 @@ int tn5250_ssl_stream_init (Tn5250Stream *This) - methstr[4] = '\0'; - } - -+#ifndef OPENSSL_NO_SSL2 - if (!strcmp(methstr, "ssl2")) { - meth = SSLv2_client_method(); - TN5250_LOG(("SSL Method = SSLv2_client_method()\n")); -- } else if (!strcmp(methstr, "ssl3")) { -+ } else -+#endif -+#ifndef OPENSSL_NO_SSL3 -+ if (!strcmp(methstr, "ssl3")) { - meth = SSLv3_client_method(); - TN5250_LOG(("SSL Method = SSLv3_client_method()\n")); -- } else { -+ } else -+#endif -+ { - meth = SSLv23_client_method(); - TN5250_LOG(("SSL Method = SSLv23_client_method()\n")); - } diff --git a/package.bak/tn5250/Config.in b/package.bak/tn5250/Config.in deleted file mode 100644 index 01be40bb73..0000000000 --- a/package.bak/tn5250/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_TN5250 - bool "tn5250" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - Telnet client that emulates 5250 terminals and printers. - - http://tn5250.sourceforge.net/ diff --git a/package.bak/tn5250/tn5250.hash b/package.bak/tn5250/tn5250.hash deleted file mode 100644 index ae65beab50..0000000000 --- a/package.bak/tn5250/tn5250.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 354237d400dc46af887cb3ffa4ed1f2c371f5b8bee8be046a683a4ac9db4f9c5 tn5250-0.17.4.tar.gz diff --git a/package.bak/tn5250/tn5250.mk b/package.bak/tn5250/tn5250.mk deleted file mode 100644 index bbaa686d86..0000000000 --- a/package.bak/tn5250/tn5250.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# tn5250 -# -################################################################################ - -TN5250_VERSION = 0.17.4 -TN5250_SITE = http://downloads.sourceforge.net/project/tn5250/tn5250/$(TN5250_VERSION) -TN5250_MAKE_OPTS = CPPFLAGS="" -TN5250_DEPENDENCIES = ncurses -TN5250_LICENSE = LGPLv2.1+ -TN5250_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -TN5250_CONF_OPTS += --with-ssl-dir=$(STAGING_DIR)/usr -TN5250_CONF_ENV += LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs openssl`" -TN5250_DEPENDENCIES += openssl host-pkgconf -else -TN5250_CONF_OPTS += --without-ssl -endif - -define TN5250_INSTALL_FIXES - rm -f $(TARGET_DIR)/usr/bin/5250keys - rm -f $(TARGET_DIR)/usr/bin/xt5250 -endef - -TN5250_POST_INSTALL_TARGET_HOOKS += TN5250_INSTALL_FIXES - -$(eval $(autotools-package)) diff --git a/package.bak/tor/0001-openssl-libz.patch b/package.bak/tor/0001-openssl-libz.patch deleted file mode 100644 index 93fb942a40..0000000000 --- a/package.bak/tor/0001-openssl-libz.patch +++ /dev/null @@ -1,116 +0,0 @@ -Adjust link order of libz to solve bug with static linking -and remove host paths when looking for openssl. - -[Vincent: - - Adapt the patch to make it apply on the new version.] -[Bernd: rebased for tor-0.2.7.6, 0.2.8.10 & 0.2.9.9] - -Signed-off-by: Bernd Kuhls -Signed-off-by: Vicente Olivert Riera - -diff -uNr tor-0.2.7.6.org/configure.ac tor-0.2.7.6/configure.ac ---- tor-0.2.7.6.org/configure.ac 2015-12-10 16:15:25.000000000 +0100 -+++ tor-0.2.7.6/configure.ac 2016-01-31 20:21:34.850408145 +0100 -@@ -612,11 +612,11 @@ - fi - ]) - --TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI], -+TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto -lz $TOR_LIB_GDI], - [#include ], - [void RAND_add(const void *buf, int num, double entropy);], - [RAND_add((void*)0,0,0);], [], -- [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl]) -+ []) - - dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay() - -diff -uNr tor-0.2.7.6.org/src/or/include.am tor-0.2.7.6/src/or/include.am ---- tor-0.2.7.6.org/src/or/include.am 2015-12-08 18:35:17.000000000 +0100 -+++ tor-0.2.7.6/src/or/include.am 2016-01-31 20:22:09.322777527 +0100 -@@ -108,7 +108,7 @@ - src_or_tor_LDADD = src/or/libtor.a src/common/libor.a src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event.a src/trunnel/libor-trunnel.a \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ - - if COVERAGE_ENABLED -diff -uNr tor-0.2.7.6.org/src/test/include.am tor-0.2.7.6/src/test/include.am ---- tor-0.2.7.6.org/src/test/include.am 2015-12-08 18:35:17.000000000 +0100 -+++ tor-0.2.7.6/src/test/include.am 2016-01-31 20:25:59.673127854 +0100 -@@ -177,8 +177,8 @@ - src/common/libor-ctime-testing.a \ - src/common/libor-event-testing.a \ - src/trunnel/libor-trunnel-testing.a \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_SYSTEMD_LIBS@ - - src_test_test_slow_CPPFLAGS = $(src_test_test_CPPFLAGS) -@@ -200,8 +200,8 @@ - src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event.a src/trunnel/libor-trunnel.a \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ \ - @TOR_SYSTEMD_LIBS@ - - src_test_test_workqueue_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ \ -@@ -211,8 +211,8 @@ - src/common/libor-ctime-testing.a \ - src/common/libor-crypto-testing.a $(LIBKECCAK_TINY) $(LIBDONNA) \ - src/common/libor-event-testing.a \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ -+ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ - - src_test_test_timers_CPPFLAGS = $(src_test_test_CPPFLAGS) - src_test_test_timers_CFLAGS = $(src_test_test_CFLAGS) -@@ -245,8 +245,8 @@ - src_test_test_ntor_cl_LDADD = src/or/libtor.a src/common/libor.a \ - src/common/libor-ctime.a \ - src/common/libor-crypto.a $(LIBKECCAK_TINY) $(LIBDONNA) \ -- @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \ -- @TOR_OPENSSL_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ -+ @TOR_LIB_MATH@ \ -+ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ - src_test_test_ntor_cl_AM_CPPFLAGS = \ - -I"$(top_srcdir)/src/or" - -diff -uNr tor-0.2.7.6.org/src/tools/include.am tor-0.2.7.6/src/tools/include.am ---- tor-0.2.7.6.org/src/tools/include.am 2015-11-13 14:33:26.000000000 +0100 -+++ tor-0.2.7.6/src/tools/include.am 2016-01-31 20:27:29.954004495 +0100 -@@ -26,7 +26,7 @@ - src/common/libor-ctime.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ -- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ - - if COVERAGE_ENABLED -@@ -39,7 +39,7 @@ - src/common/libor-ctime-testing.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ -- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ - endif - -@@ -50,7 +50,7 @@ - src/common/libor-crypto.a \ - $(LIBKECCAK_TINY) \ - $(LIBDONNA) \ -- @TOR_LIB_MATH@ @TOR_ZLIB_LIBS@ @TOR_OPENSSL_LIBS@ \ -+ @TOR_LIB_MATH@ @TOR_OPENSSL_LIBS@ @TOR_ZLIB_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_GDI@ @CURVE25519_LIBS@ - - EXTRA_DIST += src/tools/tor-fw-helper/README diff --git a/package.bak/tor/Config.in b/package.bak/tor/Config.in deleted file mode 100644 index 52009267e2..0000000000 --- a/package.bak/tor/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_TOR - bool "tor" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_LIBEVENT - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - help - Tor is free software and an open network that helps you - defend against traffic analysis, a form of network - surveillance that threatens personal freedom and privacy, - confidential business activities and relationships, and - state security. - - https://www.torproject.org - -comment "tor needs a toolchain w/ NPTL" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/tor/tor.hash b/package.bak/tor/tor.hash deleted file mode 100644 index 470fc4829b..0000000000 --- a/package.bak/tor/tor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 33325d2b250fd047ba2ddc5d11c2190c4e2951f4b03ec48ebd8bf0666e990d43 tor-0.2.9.9.tar.gz diff --git a/package.bak/tor/tor.mk b/package.bak/tor/tor.mk deleted file mode 100644 index bb0fbb16b5..0000000000 --- a/package.bak/tor/tor.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# tor -# -################################################################################ - -TOR_VERSION = 0.2.9.9 -TOR_SITE = https://dist.torproject.org -TOR_LICENSE = BSD-3c -TOR_LICENSE_FILES = LICENSE -TOR_DEPENDENCIES = libevent openssl zlib -TOR_AUTORECONF = YES - -TOR_CONF_OPTS = \ - --disable-gcc-hardening \ - --disable-unittests \ - --with-libevent-dir=$(STAGING_DIR)/usr \ - --with-openssl-dir=$(STAGING_DIR)/usr \ - --with-zlib-dir=$(STAGING_DIR)/usr - -ifeq ($(BR2_STATIC_LIBS),y) -TOR_CONF_OPTS += \ - --enable-static-libevent \ - --enable-static-openssl \ - --enable-static-tor \ - --enable-static-zlib -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -TOR_DEPENDENCIES += libcap -endif - -ifeq ($(BR2_arm)$(BR2_armeb)$(BR2_i386)$(BR2_x86_64)$(BR2_PACKAGE_LIBSECCOMP),yy) -TOR_CONF_OPTS += --enable-seccomp -TOR_DEPENDENCIES += libseccomp -else -TOR_CONF_OPTS += --disable-seccomp -endif - -# uses gnu extensions -TOR_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' - -$(eval $(autotools-package)) diff --git a/package.bak/tovid/0001-manpage.patch b/package.bak/tovid/0001-manpage.patch deleted file mode 100644 index 21669c9d55..0000000000 --- a/package.bak/tovid/0001-manpage.patch +++ /dev/null @@ -1,25 +0,0 @@ -setup.py: disable man page to kill txt2tags SVN checkout dependency - -Signed-off-by: Steve Kenton - -+diff -pruN tovid-3534.ori/setup.py tovid-3534/setup.py ---- tovid-3534.ori/setup.py 2013-04-14 09:52:08.000000000 -0500 -+++ tovid-3534/setup.py 2015-03-21 09:39:14.880173176 -0500 -@@ -186,7 +186,7 @@ class BuildTovidInit (Command): - - # Build tovid-init with regular 'build' command - build.sub_commands.append(('build_tovid_init', None)) --build.sub_commands.append(('build_docs', None)) -+#build.sub_commands.append(('build_docs', None)) - - # The actual setup - setup( -@@ -244,8 +244,6 @@ setup( - 'src/tovid.ini', - ]), - # Manual page -- ('share/man/man1', -- ['docs/man/tovid.1']), - # Desktop shortcut - ('share/applications', - ['tovidgui.desktop', diff --git a/package.bak/tovid/Config.in b/package.bak/tovid/Config.in deleted file mode 100644 index d8052ea334..0000000000 --- a/package.bak/tovid/Config.in +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_TOVID - bool "tovid" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3 - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # mplayer - # The below dependencies are runtime dependencies only - select BR2_PACKAGE_BUSYBOX_SHOW_OTHERS # procps_ng - select BR2_PACKAGE_DVDAUTHOR - select BR2_PACKAGE_DVDRW_TOOLS - select BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_IMAGEMAGICK - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_MJPEGTOOLS - select BR2_PACKAGE_MPLAYER - select BR2_PACKAGE_PROCPS_NG # pgrep and pkill - select BR2_PACKAGE_SOX - help - The tovid suite, also known simply as tovid, is a collection - of shell and Python scripts for creating DVDs and - (S)VCDs. It is pronounced "to vid" (because it converts to - video disc formats). - - http://tovid.wikia.com/wiki/Installing_tovid - -comment "tovid needs a toolchain w/ threads, C++, wchar" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_USE_WCHAR - -comment "tovid depends on python or python3" - depends on !BR2_PACKAGE_PYTHON && !BR2_PACKAGE_PYTHON3 - depends on BR2_PACKAGE_FFMPEG_ARCH_SUPPORTS - depends on BR2_PACKAGE_MPLAYER_ARCH_SUPPORTS diff --git a/package.bak/tovid/tovid.hash b/package.bak/tovid/tovid.hash deleted file mode 100644 index 9ddd75037a..0000000000 --- a/package.bak/tovid/tovid.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 06f7cb00b213bbe83d72f4f2076b675a662697034e1d2cdc2dce987e35c827bc tovid-0.35.0.tar.gz diff --git a/package.bak/tovid/tovid.mk b/package.bak/tovid/tovid.mk deleted file mode 100644 index 3069d67e59..0000000000 --- a/package.bak/tovid/tovid.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# tovid -# -################################################################################ - -TOVID_VERSION = 0.35.0 -TOVID_SITE = https://github.com/tovid-suite/tovid/releases/download/v$(TOVID_VERSION) -TOVID_LICENSE = GPLv2+ -TOVID_LICENSE_FILES = COPYING -TOVID_SETUP_TYPE = distutils - -$(eval $(python-package)) diff --git a/package.bak/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch b/package.bak/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch deleted file mode 100644 index 35fd7632bd..0000000000 --- a/package.bak/tpm-tools/0001-tpm_nvread-include-sys-stat.h-for-open-modes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 5fedfd32a226e3ac8a6022227ec2d8fc6df26901 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 24 Dec 2015 08:57:09 +0100 -Subject: [PATCH] tpm_nvread: include for open() modes - -As the manual page of open(2) indicates, the header -should be included. Indeed, it is this header that provides the mode_t -macros such as S_IRUSR and S_IWUSR. - -While the build happens to work with glibc without this included -header, it fails with other C libraries such as uClibc, due to the -missing inclusion. - -Signed-off-by: Thomas Petazzoni ---- - src/tpm_mgmt/tpm_nvread.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/tpm_mgmt/tpm_nvread.c b/src/tpm_mgmt/tpm_nvread.c -index 35fe17c..92f047c 100644 ---- a/src/tpm_mgmt/tpm_nvread.c -+++ b/src/tpm_mgmt/tpm_nvread.c -@@ -23,6 +23,7 @@ - #include - #include - #include -+#include - - #include "tpm_nvcommon.h" - #include "tpm_tspi.h" --- -2.6.4 - diff --git a/package.bak/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch b/package.bak/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch deleted file mode 100644 index fac7b2cc9a..0000000000 --- a/package.bak/tpm-tools/0002-Makefile.am-make-sure-libintl-is-in-LDFLAGS-when-nee.patch +++ /dev/null @@ -1,104 +0,0 @@ -Fetched from: http://sourceforge.net/p/trousers/mailman/message/34728585/ -Upstream status: Submitted - -From 924cbdfc67ca405aa4df2f9d3787365618b58630 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Wed, 30 Dec 2015 00:06:33 +0100 -Subject: [PATCH] Makefile.am: make sure libintl is in LDFLAGS when needed - -The build-system internally builds a couple of static libraries used to -build the final programs. - -When linking these libraries and the final programs, we need to -explicitly tell libtool to link with libintl in order to resolve all the -missing symbols. - -This is done in the appropriate LDADD/LIBADD variables (or the per-target -*_LDADD/*_LIBADD ones when they do not default to LDADD or LIBADD), for -any sources using gettext/libintl functionalities. - -This change fixes build failures [2,3] in cross-compilation, triggered by -Buildroot buildfarms [1]. - -[1] http://autobuild.buildroot.org/ -[2] http://autobuild.buildroot.org/?reason=tpm-tools-1.3.8 -[3] http://autobuild.buildroot.org/results/c82/c82a6c1f41c561b15f10e7b7ffcaed15fa0ec895/build-end.log - -Signed-off-by: Samuel Martin ---- - lib/Makefile.am | 6 +++--- - src/cmds/Makefile.am | 2 +- - src/data_mgmt/Makefile.am | 2 +- - src/tpm_mgmt/Makefile.am | 2 +- - 4 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/lib/Makefile.am b/lib/Makefile.am -index cef6a2f..c1d7009 100644 ---- a/lib/Makefile.am -+++ b/lib/Makefile.am -@@ -44,7 +44,7 @@ libtpm_utils_la_SOURCES = tpm_utils.c \ - # - # TSPI interface library - libtpm_tspi_la_SOURCES = tpm_tspi.c --libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl -+libtpm_tspi_la_LIBADD = libtpm_utils.la -ldl @INTLLIBS@ - - # - # PKCS#11 interface library -@@ -52,7 +52,7 @@ if P11_SUPPORT - noinst_LTLIBRARIES += libtpm_pkcs11.la - - libtpm_pkcs11_la_SOURCES= tpm_pkcs11.c --libtpm_pkcs11_la_LIBADD = libtpm_utils.la -+libtpm_pkcs11_la_LIBADD = libtpm_utils.la @INTLLIBS@ - endif - - # -@@ -80,4 +80,4 @@ endif - # Unseal library - for addition to existing apps, counter part of seal cmd - libtpm_unseal_la_SOURCES = tpm_unseal.c - libtpm_unseal_la_LDFLAGS = -shared -version-info 1:0:0 --libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la -+libtpm_unseal_la_LIBADD = -ltspi libtpm_tspi.la @INTLLIBS@ -diff --git a/src/cmds/Makefile.am b/src/cmds/Makefile.am -index de73ecf..27fc9ef 100644 ---- a/src/cmds/Makefile.am -+++ b/src/cmds/Makefile.am -@@ -30,7 +30,7 @@ else - AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX - endif - --LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto -+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi $(top_builddir)/lib/libtpm_unseal.la -ltpm_unseal -lcrypto @INTLLIBS@ - - tpm_sealdata_SOURCES = tpm_sealdata.c - tpm_unsealdata_SOURCES = tpm_unsealdata.c -diff --git a/src/data_mgmt/Makefile.am b/src/data_mgmt/Makefile.am -index f8bf41c..de505e4 100644 ---- a/src/data_mgmt/Makefile.am -+++ b/src/data_mgmt/Makefile.am -@@ -38,7 +38,7 @@ noinst_HEADERS = data_common.h \ - # Common build flags - AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX - --LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl -+LDADD = $(top_builddir)/lib/libtpm_pkcs11.la -ltspi -ldl @INTLLIBS@ - - - # -diff --git a/src/tpm_mgmt/Makefile.am b/src/tpm_mgmt/Makefile.am -index 195fba9..7ca47c9 100644 ---- a/src/tpm_mgmt/Makefile.am -+++ b/src/tpm_mgmt/Makefile.am -@@ -55,7 +55,7 @@ else - AM_CPPFLAGS = -I$(top_srcdir)/include -D_LINUX - endif - --LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi -+LDADD = $(top_builddir)/lib/libtpm_tspi.la -ltspi @INTLLIBS@ - - tpm_startup_SOURCES = tpm_startup.c - tpm_reset_SOURCES = tpm_reset.c --- -2.6.4 - diff --git a/package.bak/tpm-tools/0002-configure.in-remove-Werror.patch b/package.bak/tpm-tools/0002-configure.in-remove-Werror.patch deleted file mode 100644 index c101a9517f..0000000000 --- a/package.bak/tpm-tools/0002-configure.in-remove-Werror.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b060873f444d79f3f5aa388427cb1ede6665834a Mon Sep 17 00:00:00 2001 -From: Kent Yoder -Date: Mon, 5 Nov 2012 14:58:31 -0600 -Subject: [PATCH] configure.in: remove -Werror - -Signed-off-by: Kent Yoder -Signed-off-by: Noe Rubinstein ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index da170d0..0f175be 100644 ---- a/configure.in -+++ b/configure.in -@@ -138,7 +138,7 @@ AC_TYPE_SIZE_T - AC_TYPE_SIGNAL - AC_TYPE_UID_T - --CFLAGS="$CFLAGS -Wall -Werror -Wreturn-type -Wsign-compare" -+CFLAGS="$CFLAGS -Wall -Wreturn-type -Wsign-compare" - - AC_CONFIG_FILES(./Makefile \ - po/Makefile.in \ --- -2.1.4 - diff --git a/package.bak/tpm-tools/Config.in b/package.bak/tpm-tools/Config.in deleted file mode 100644 index 83b65f3ae4..0000000000 --- a/package.bak/tpm-tools/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_TPM_TOOLS - bool "tpm-tools" - select BR2_PACKAGE_TROUSERS - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - depends on BR2_TOOLCHAIN_HAS_THREADS # trousers - depends on !BR2_STATIC_LIBS # trousers - depends on !BR2_arc # trousers - help - Tools to manage and diagnose a TPM - - http://trousers.sourceforge.net/ - -comment "tpm-tools needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !BR2_arc diff --git a/package.bak/tpm-tools/tpm-tools.hash b/package.bak/tpm-tools/tpm-tools.hash deleted file mode 100644 index 8c1ff899a9..0000000000 --- a/package.bak/tpm-tools/tpm-tools.hash +++ /dev/null @@ -1,3 +0,0 @@ -# http://sourceforge.net/projects/trousers/files/tpm-tools/1.3.8/ -sha1 f2c799ac8dc78f3537e1dbe4ae7c6e93f37e868c tpm-tools-1.3.8.tar.gz -md5 85a978c4e03fefd4b73cbeadde7c4d0b tpm-tools-1.3.8.tar.gz diff --git a/package.bak/tpm-tools/tpm-tools.mk b/package.bak/tpm-tools/tpm-tools.mk deleted file mode 100644 index c90edbb88c..0000000000 --- a/package.bak/tpm-tools/tpm-tools.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# tpm-tools -# -################################################################################ - -TPM_TOOLS_VERSION = 1.3.8 -TPM_TOOLS_SITE = http://downloads.sourceforge.net/project/trousers/tpm-tools/$(TPM_TOOLS_VERSION) -TPM_TOOLS_STRIP_COMPONENTS = 2 -TPM_TOOLS_LICENSE = Common Public License Version 1.0 -TPM_TOOLS_LICENSE_FILES = LICENSE -TPM_TOOLS_DEPENDENCIES = trousers openssl \ - $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) -# configure.in and lib/Makefile.am is patched -TPM_TOOLS_AUTORECONF = YES -TPM_TOOLS_GETTEXTIZE = YES - -TPM_TOOLS_CONF_OPTS = --disable-pkcs11-support - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -TPM_TOOLS_CONF_ENV += LIBS='-liconv' -endif - -$(eval $(autotools-package)) diff --git a/package.bak/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch b/package.bak/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch deleted file mode 100644 index 5f7d2bab71..0000000000 --- a/package.bak/trace-cmd/0001-trace-cmd-Fix-trace-record.c-with-non-ptrace-compile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bdfcddd4f135dc1d4fefb0373d9ebb93ef5110cb Mon Sep 17 00:00:00 2001 -From: "Steven Rostedt (Red Hat)" -Date: Mon, 7 Dec 2015 16:41:19 -0500 -Subject: [PATCH] trace-cmd: Fix trace-record.c with non ptrace compile - -Fix ptrace_wait() when NO_PTRACE=1 is defined. - -Status: upstream - -Signed-off-by: Steven Rostedt -[Romain backport to 2.6] -Signed-off-by: Romain Naour ---- - trace-record.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/trace-record.c b/trace-record.c -index df82883..f83ec4b 100644 ---- a/trace-record.c -+++ b/trace-record.c -@@ -1099,7 +1099,7 @@ static void ptrace_wait(enum trace_type type, int main_pid) - (!WIFEXITED(status) || pid != main_pid)); - } - #else --static inline void ptrace_wait(int main_pid) { } -+static inline void ptrace_wait(enum trace_type type, int main_pid) { } - static inline void enable_ptrace(void) { } - static inline void ptrace_attach(int pid) { } - --- -2.5.5 - diff --git a/package.bak/trace-cmd/Config.in b/package.bak/trace-cmd/Config.in deleted file mode 100644 index fcec1027e8..0000000000 --- a/package.bak/trace-cmd/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_TRACE_CMD - bool "trace-cmd" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen() - help - Command line reader for ftrace. - - To use this profiling tool, you should enable ftrace in your kernel - configuration. This command collect traces on your target. - You can analyse these traces on the target or on the host via the gui - "kernel shark" - - http://git.kernel.org/cgit/linux/kernel/git/rostedt/trace-cmd.git - -comment "trace-cmd needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/trace-cmd/trace-cmd.mk b/package.bak/trace-cmd/trace-cmd.mk deleted file mode 100644 index 2348155cb8..0000000000 --- a/package.bak/trace-cmd/trace-cmd.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# trace-cmd -# -################################################################################ - -TRACE_CMD_VERSION = trace-cmd-v2.6 -TRACE_CMD_SITE = $(BR2_KERNEL_MIRROR)/scm/linux/kernel/git/rostedt/trace-cmd.git -TRACE_CMD_SITE_METHOD = git -TRACE_CMD_INSTALL_STAGING = YES -TRACE_CMD_LICENSE = GPLv2, LGPLv2.1 -TRACE_CMD_LICENSE_FILES = COPYING COPYING.LIB - -TRACE_CMD_DEPENDENCIES = host-pkgconf - -ifeq ($(BR2_PACKAGE_AUDIT),y) -TRACE_CMD_DEPENDENCIES += audit -endif - -ifeq ($(BR2_PACKAGE_PYTHON),y) -TRACE_CMD_DEPENDENCIES += python host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python -else ifeq ($(BR2_PACKAGE_PYTHON3),y) -TRACE_CMD_DEPENDENCIES += python3 host-swig -TRACE_CMD_MAKE_OPTS = PYTHON_VERS=python3 -else -TRACE_CMD_MAKE_OPTS += NO_PYTHON=1 -endif - -# trace-cmd already defines _LARGEFILE64_SOURCE when necessary, -# redefining it on the command line causes build problems. -TRACE_CMD_CFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) - -# trace-cmd use CPPFLAGS to add some extra flags. -# But like for CFLAGS, $(TARGET_CPPFLAGS) contains _LARGEFILE64_SOURCE -# that causes build problems. -TRACE_CMD_CPPFLAGS = $(filter-out -D_LARGEFILE64_SOURCE,$(TARGET_CPPFLAGS)) - -define TRACE_CMD_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TRACE_CMD_CFLAGS)" \ - CPPFLAGS="$(TRACE_CMD_CPPFLAGS)" \ - $(TRACE_CMD_MAKE_OPTS) \ - -C $(@D) all -endef - -define TRACE_CMD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/trace-cmd $(TARGET_DIR)/usr/bin/trace-cmd - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/trace-cmd/plugins - $(INSTALL) -D -m 0755 $(@D)/plugin_*.so $(TARGET_DIR)/usr/lib/trace-cmd/plugins -endef - -$(eval $(generic-package)) diff --git a/package.bak/transmission/0001-fix-utypes.patch b/package.bak/transmission/0001-fix-utypes.patch deleted file mode 100644 index 96403a6c36..0000000000 --- a/package.bak/transmission/0001-fix-utypes.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix build error "conflicting types for 'UTP_Write'" - -Fetch from: http://www.adminsehow.com/2012/10/how-to-install-transmission-2-71-on-debian-6-0-squeeze/ - -The corresponding upstream bug report (unfixed) can be found here: -https://trac.transmissionbt.com/ticket/5232 - -Signed-off-by: Bernd Kuhls - ---- transmission-2.82.org/third-party/libutp/utypes.h 2013-08-09 04:47:43.000000000 +0200 -+++ transmission-2.82/third-party/libutp/utypes.h 2014-01-02 20:17:18.000000000 +0100 -@@ -35,8 +35,15 @@ - typedef const char * cstr; - typedef char * str; - --#ifndef __cplusplus --typedef uint8 bool; --#endif -+//#ifndef __cplusplus -+//typedef uint8 bool; -+//#endif -+#ifndef __cplusplus -+#ifdef HAVE_STDBOOL_H -+#include -+#else -+typedef uint8 bool; -+#endif -+#endif - - #endif //__UTYPES_H__ diff --git a/package.bak/transmission/0002-musl-missing-header.patch b/package.bak/transmission/0002-musl-missing-header.patch deleted file mode 100644 index ebb74cbffb..0000000000 --- a/package.bak/transmission/0002-musl-missing-header.patch +++ /dev/null @@ -1,36 +0,0 @@ -Fix musl build - -Downloaded from -https://cgit.gentoo.org/proj/musl.git/tree/net-p2p/transmission/files/transmission-2.84-musl-missing-header.patch - -Signed-off-by: Bernd Kuhls - - -libtransmission/transmission.h: add missing - -transmission.h and several files including it, like bitfield.c and fdlimits.h -make reference to ssize_t, off_t and other types defined in but -never include the header. By including in transmission.h, the -required type definitions are propagated to all files that need them. - -Not including on glibc and uClibc systems does not pose a problem -because of the way the headers stack in those C Standard Libraries, but on musl -excluding leads to compile time failure. - -For the POSIX specs, see - -http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/sys_types.h.html - -Signed-of-by: Anthony G. Basile - -diff -Naur transmission-2.84.orig/libtransmission/transmission.h transmission-2.84/libtransmission/transmission.h ---- transmission-2.84.orig/libtransmission/transmission.h 2014-07-01 13:09:01.682910744 -0400 -+++ transmission-2.84/libtransmission/transmission.h 2015-07-19 03:11:07.379219181 -0400 -@@ -28,6 +28,7 @@ - - #include /* uintN_t */ - #include /* time_t */ -+#include - - #ifdef WIN32 - #define __USE_MINGW_ANSI_STDIO 1 diff --git a/package.bak/transmission/0003-miniupnpc-cross.patch b/package.bak/transmission/0003-miniupnpc-cross.patch deleted file mode 100644 index 5037c2e67a..0000000000 --- a/package.bak/transmission/0003-miniupnpc-cross.patch +++ /dev/null @@ -1,31 +0,0 @@ -Fix libminiupnpc version detection - -Problem is known upstream: https://trac.transmissionbt.com/ticket/6140 - -For buildroot we know the libminiupnpc version so we hard-code 2.0. - -Signed-off-by: Bernd Kuhls - -diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac ---- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 -+++ transmission-2.92/configure.ac 2016-07-02 21:48:13.452385686 +0200 -@@ -386,18 +386,7 @@ - dnl MINIUPNPC_API_VERSION and we won't have to figure - dnl it out on our own - if test "x$upnp_version" = "xunknown" ; then -- AC_RUN_IFELSE( -- [AC_LANG_PROGRAM( -- [#include -- #include ], -- [#ifdef MINIUPNPC_API_VERSION -- return EXIT_SUCCESS; -- #else -- return EXIT_FAILURE; -- #endif] -- )], -- [upnp_version=">= 1.7"] -- ) -+ upnp_version="2.0" - fi - - dnl Or maybe it's miniupnp 1.6 diff --git a/package.bak/transmission/0004-fix-utp-include.patch b/package.bak/transmission/0004-fix-utp-include.patch deleted file mode 100644 index db8b5ab39b..0000000000 --- a/package.bak/transmission/0004-fix-utp-include.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix compilation when using system libminiupnpc with libutp disabled - -If transmission uses its own copy of libminiupnpc in third-party/ then -the configure script adds that path to CFLAGS: -https://trac.transmissionbt.com/browser/trunk/configure.ac#L455 - -This path is also added if transmission uses its own copy of libutp: -https://trac.transmissionbt.com/browser/trunk/configure.ac#L349 - -But if a system-provided libminiupnpc is used and utp-support is -disabled using --disable-utp the result is a build error, detected by -buildroot autobuilders: -http://autobuild.buildroot.net/results/b79/b79e51140cb0320554a58ce59dcb33f53cd9211a/build-end.log - -net.c:40:24: fatal error: libutp/utp.h: No such file or directory - -Patch proposed by Yann E. MORIN: -http://lists.busybox.net/pipermail/buildroot/2016-July/167896.html - -Patch sent upstream: https://trac.transmissionbt.com/ticket/6163 - -Signed-off-by: Bernd Kuhls - -diff -uNr transmission-2.92.org/configure.ac transmission-2.92/configure.ac ---- transmission-2.92.org/configure.ac 2016-03-06 21:23:45.336198393 +0100 -+++ transmission-2.92/configure.ac 2016-07-31 12:13:40.921660078 +0200 -@@ -358,6 +358,10 @@ - else - AC_MSG_ERROR("Unable to build uTP support -- C++ compiler not found") - fi -+else -+ # For the system libminiupnpc with UTC disabled, -+ # point to our bundled UTP headers -+ LIBUTP_CFLAGS="-I\$(top_srcdir)/third-party/" - fi - AC_SUBST(LIBUTP_CFLAGS) - AC_SUBST(LIBUTP_LIBS) -@@ -457,7 +461,7 @@ - LIBUPNP_LIBS_QT="\$\${TRANSMISSION_TOP}/third-party/miniupnp/libminiupnp.a" - else - AC_DEFINE([SYSTEM_MINIUPNP]) -- LIBUPNP_CFLAGS="" -+ LIBUPNP_CFLAGS="${LIBUTP_CFLAGS}" - LIBUPNP_LIBS="-lminiupnpc" - LIBUPNP_LIBS_QT="-lminiupnpc" - fi diff --git a/package.bak/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch b/package.bak/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch deleted file mode 100644 index 91a962a6d8..0000000000 --- a/package.bak/transmission/0005-uClibc-ng-since-1.0.18-has-sys-quota.h-synced-with-G.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8682fe1bad44acc06154003ca9c9163b917bf4e3 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 29 Sep 2016 19:52:49 +0200 -Subject: [PATCH] uClibc-ng since 1.0.18 has sys/quota.h synced with GNU libc - -Signed-off-by: Waldemar Brodkorb - -Pull Request: -https://github.com/transmission/transmission/pull/42 ---- - libtransmission/platform-quota.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libtransmission/platform-quota.c b/libtransmission/platform-quota.c -index 58c518a..57377ef 100644 ---- a/libtransmission/platform-quota.c -+++ b/libtransmission/platform-quota.c -@@ -284,7 +284,7 @@ getquota (const char * device) - spaceused = (int64_t) dq.dqb_curblocks >> 1; - #elif defined(__APPLE__) - spaceused = (int64_t) dq.dqb_curbytes; --#elif defined(__UCLIBC__) -+#elif defined(__UCLIBC__) && (__UCLIBC_MAJOR__ == 0 || (__UCLIBC_MAJOR__ == 1 && __UCLIBC_SUBLEVEL__ <= 17)) - spaceused = (int64_t) btodb(dq.dqb_curblocks); - #elif defined(__sun) || (defined(_LINUX_QUOTA_VERSION) && _LINUX_QUOTA_VERSION < 2) - spaceused = (int64_t) dq.dqb_curblocks >> 1; --- -2.1.4 - diff --git a/package.bak/transmission/0006-libsystemd.patch b/package.bak/transmission/0006-libsystemd.patch deleted file mode 100644 index b32aff211d..0000000000 --- a/package.bak/transmission/0006-libsystemd.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 0862099d0bf5a3ec8b2e9d538458d612897741a2 Mon Sep 17 00:00:00 2001 -From: Mike Gelfand -Date: Sat, 23 Apr 2016 16:13:25 +0000 -Subject: [PATCH] #5921: Use libsystemd instead of libsystemd-daemon (original - patches by Sandro Tosi and Mike Gilbert) - -In systemd v209, released over two years ago, the various libsystemd-* -libraries (libsystemd-journal.so, libsystemd-login.so, libsystem-daemon.so, -libsystemd-id128.so) were merged into a single libsystemd.so library to -reduce code duplication and avoid cyclic dependencies. - -Downloaded from upstream commit: -https://github.com/transmission/transmission/commit/0862099d0bf5a3ec8b2e9d538458d612897741a2 - -Signed-off-by: Bernd Kuhls ---- - CMakeLists.txt | 4 ++-- - configure.ac | 16 ++++++++-------- - daemon/CMakeLists.txt | 8 ++++---- - daemon/Makefile.am | 4 ++-- - daemon/daemon.c | 2 +- - 5 files changed, 17 insertions(+), 17 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8b324dc..356fc2f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -398,9 +398,9 @@ endif() - if(WITH_SYSTEMD) - tr_get_required_flag(WITH_SYSTEMD SYSTEMD_IS_REQUIRED) - -- pkg_check_modules(SYSTEMD_DAEMON ${SYSTEMD_IS_REQUIRED} libsystemd-daemon) -+ pkg_check_modules(SYSTEMD ${SYSTEMD_IS_REQUIRED} libsystemd) - -- tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_DAEMON_FOUND SYSTEMD_IS_REQUIRED) -+ tr_fixup_auto_option(WITH_SYSTEMD SYSTEMD_FOUND SYSTEMD_IS_REQUIRED) - endif() - - include_directories(${CMAKE_BINARY_DIR}) -diff --git a/configure.ac b/configure.ac -index 92e4372..b64f2a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -240,15 +240,15 @@ dnl - dnl file monitoring for the daemon - - # Check whether to enable systemd startup notification. --# This requires libsystemd-daemon. --AC_ARG_WITH([systemd-daemon], AS_HELP_STRING([--with-systemd-daemon], -+# This requires libsystemd. -+AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd], - [Add support for systemd startup notification (default is autodetected)]), -- [USE_SYSTEMD_DAEMON=$withval], [USE_SYSTEMD_DAEMON=auto]) --AS_IF([test "x$USE_SYSTEMD_DAEMON" != "xno"], [ -- PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [AC_DEFINE(USE_SYSTEMD_DAEMON,1,[Use systemd startup notification])], -- [AS_IF([test "x$USE_SYSTEMD_DAEMON" = "xyes"], -- [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd-daemon not found.])] -+ [USE_SYSTEMD=$withval], [USE_SYSTEMD=auto]) -+AS_IF([test "x$USE_SYSTEMD" != "xno"], [ -+ PKG_CHECK_MODULES([SYSTEMD], [libsystemd], -+ [AC_DEFINE(USE_SYSTEMD,1,[Use systemd startup notification])], -+ [AS_IF([test "x$USE_SYSTEMD" = "xyes"], -+ [AC_MSG_ERROR([systemd startup notification support requested, but libsystemd not found.])] - )] - ) - ]) -diff --git a/daemon/CMakeLists.txt b/daemon/CMakeLists.txt -index e8f8b34..8ec3b95 100644 ---- a/daemon/CMakeLists.txt -+++ b/daemon/CMakeLists.txt -@@ -1,7 +1,7 @@ - project(trdaemon) - - if(WITH_SYSTEMD) -- add_definitions(-DUSE_SYSTEMD_DAEMON) -+ add_definitions(-DUSE_SYSTEMD) - endif() - - include_directories( -@@ -37,14 +37,14 @@ add_executable(${TR_NAME}-daemon - ${${PROJECT_NAME}_WIN32_RC_FILE}) - - set_target_properties(${TR_NAME}-daemon PROPERTIES -- COMPILE_FLAGS "${SYSTEMD_DAEMON_CFLAGS}" -- LINK_FLAGS "${SYSTEMD_DAEMON_LDFLAGS}" -+ COMPILE_FLAGS "${SYSTEMD_CFLAGS}" -+ LINK_FLAGS "${SYSTEMD_LDFLAGS}" - ) - - target_link_libraries(${TR_NAME}-daemon - ${TR_NAME} - ${EVENT2_LIBRARIES} -- ${SYSTEMD_DAEMON_LIBRARIES} -+ ${SYSTEMD_LIBRARIES} - ) - - tr_win32_app_info(${PROJECT_NAME}_remote_WIN32_RC_FILE -diff --git a/daemon/Makefile.am b/daemon/Makefile.am -index 677f765..34d7076 100644 ---- a/daemon/Makefile.am -+++ b/daemon/Makefile.am -@@ -3,7 +3,7 @@ AM_CPPFLAGS = -I@top_srcdir@ -DEMBEDDED - AM_CFLAGS = \ - @LIBEVENT_CFLAGS@ \ - @LIBCURL_CFLAGS@ \ -- @SYSTEMD_DAEMON_CFLAGS@ \ -+ @SYSTEMD_CFLAGS@ \ - @ZLIB_CFLAGS@ \ - @PTHREAD_CFLAGS@ - -@@ -29,7 +29,7 @@ LDADD = \ - @LIBCURL_LIBS@ \ - @CRYPTO_LIBS@ \ - @INTLLIBS@ \ -- @SYSTEMD_DAEMON_LIBS@ \ -+ @SYSTEMD_LIBS@ \ - @ZLIB_LIBS@ \ - @PTHREAD_LIBS@ \ - ${LIBM} -diff --git a/daemon/daemon.c b/daemon/daemon.c -index 40ac5a6..62ac715 100644 ---- a/daemon/daemon.c -+++ b/daemon/daemon.c -@@ -33,7 +33,7 @@ - #include - #include - --#ifdef USE_SYSTEMD_DAEMON -+#ifdef USE_SYSTEMD - #include - #else - static void sd_notify (int status UNUSED, const char * str UNUSED) { } diff --git a/package.bak/transmission/Config.in b/package.bak/transmission/Config.in deleted file mode 100644 index b47c36fdd3..0000000000 --- a/package.bak/transmission/Config.in +++ /dev/null @@ -1,52 +0,0 @@ -config BR2_PACKAGE_TRANSMISSION - bool "transmission" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_ZLIB - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBCURL - select BR2_PACKAGE_LIBEVENT - help - Transmission is a cross-platform BitTorrent client. - - http://www.transmissionbt.com/ - -if BR2_PACKAGE_TRANSMISSION - -config BR2_PACKAGE_TRANSMISSION_UTP - bool "Transmission uTP support" - depends on BR2_INSTALL_LIBSTDCPP - help - Install support for uTorrent Transport Protocol - -comment "uTP needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_TRANSMISSION_CLI - bool "transmission-cli" - help - Install transmission command line interface. - -config BR2_PACKAGE_TRANSMISSION_DAEMON - bool "transmission-daemon" - help - Install transmission daemon. - -config BR2_PACKAGE_TRANSMISSION_REMOTE - bool "transmission-remote" - help - Install transmission remote management tool. - -config BR2_PACKAGE_TRANSMISSION_GTK - bool "transmission-gtk" - depends on BR2_PACKAGE_LIBGTK2 && BR2_ENABLE_LOCALE - help - Install transmission GTK-based GUI interface. - -comment "transmission-gtk needs a toolchain w/ locale" - depends on BR2_PACKAGE_LIBGTK2 && !BR2_ENABLE_LOCALE -endif - -comment "transmission needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/transmission/S92transmission b/package.bak/transmission/S92transmission deleted file mode 100644 index e5976b0cfb..0000000000 --- a/package.bak/transmission/S92transmission +++ /dev/null @@ -1,159 +0,0 @@ -#!/bin/sh - -# Original Author: Lennart A. Jtte, based on Rob Howell's script -# Modified by Maarten Van Coile & others (on IRC) - -# Changes for buildroot: -# USERNAME points to 'default' in standard installation -# TODO: set logfile with --logfile option - -# Do NOT "set -e" - -# -# ----- CONFIGURATION ----- -# -# For the default location Transmission uses, visit: -# http://trac.transmissionbt.com/wiki/ConfigFiles -# For a guide on how set the preferences, visit: -# http://trac.transmissionbt.com/wiki/EditConfigFiles -# For the available environement variables, visit: -# http://trac.transmissionbt.com/wiki/EnvironmentVariables -# -# The name of the user that should run Transmission. -# It's RECOMENDED to run Transmission in it's own user, -# by default, this is set to 'transmission'. -# For the sake of security you shouldn't set a password -# on this user -USERNAME=transmission - - -# ----- *ADVANCED* CONFIGURATION ----- -# Only change these options if you know what you are doing! -# -# The folder where Transmission stores the config & web files. -# ONLY change this you have it at a non-default location -#TRANSMISSION_HOME="/var/config/transmission-daemon" -#TRANSMISSION_WEB_HOME="/usr/share/transmission/web" -# -# The arguments passed on to transmission-daemon. -# ONLY change this you need to, otherwise use the -# settings file as per above. -#TRANSMISSION_ARGS="" - - -# ----- END OF CONFIGURATION ----- -# -# PATH should only include /usr/* if it runs after the mountnfs.sh script. -PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin -DESC="bittorrent client" -NAME=transmission-daemon -DAEMON=$(which $NAME) -PIDFILE=/var/run/$NAME.pid -SCRIPTNAME=/etc/init.d/$NAME - -# Exit if the package is not installed -[ -x "$DAEMON" ] || exit 0 - -# Read configuration variable file if it is present -[ -r /etc/default/$NAME ] && . /etc/default/$NAME - -# Load the VERBOSE setting and other rcS variables -[ -f /etc/default/rcS ] && . /etc/default/rcS - -# -# Function that starts the daemon/service -# - -start() -{ - # Export the configuration/web directory, if set - if [ -n "$TRANSMISSION_HOME" ]; then - export TRANSMISSION_HOME - fi - if [ -n "$TRANSMISSION_WEB_HOME" ]; then - export TRANSMISSION_WEB_HOME - fi - - # Return - # 0 if daemon has been started - # 1 if daemon was already running - # 2 if daemon could not be started - start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ - --exec $DAEMON --background --test -- -f $TRANSMISSION_ARGS > /dev/null \ - || return 1 - start-stop-daemon --chuid $USERNAME --start --pidfile $PIDFILE --make-pidfile \ - --exec $DAEMON --background -- -f $TRANSMISSION_ARGS \ - || return 2 -} - -# -# Function that stops the daemon/service -# -stop() -{ - # Return - # 0 if daemon has been stopped - # 1 if daemon was already stopped - # 2 if daemon could not be stopped - # other if a failure occurred - start-stop-daemon --stop --quiet --retry=TERM/10/KILL/5 --pidfile $PIDFILE --name $NAME - RETVAL="$?" - [ "$RETVAL" = 2 ] && return 2 - - # Wait for children to finish too if this is a daemon that forks - # and if the daemon is only ever run from this initscript. - # If the above conditions are not satisfied then add some other code - # that waits for the process to drop all resources that could be - # needed by services started subsequently. A last resort is to - # sleep for some time. - - start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON - [ "$?" = 2 ] && return 2 - - # Many daemons don't delete their pidfiles when they exit. - rm -f $PIDFILE - - return "$RETVAL" -} - -case "$1" in - start) - echo "Starting $DESC" "$NAME..." - start - case "$?" in - 0|1) echo " Starting $DESC $NAME succeeded" ;; - *) echo " Starting $DESC $NAME failed" ;; - esac - ;; - stop) - echo "Stopping $DESC $NAME..." - stop - case "$?" in - 0|1) echo " Stopping $DESC $NAME succeeded" ;; - *) echo " Stopping $DESC $NAME failed" ;; - esac - ;; - restart|force-reload) - # - # If the "reload" option is implemented then remove the - # 'force-reload' alias - # - echo "Restarting $DESC $NAME..." - stop - case "$?" in - 0|1) - start - case "$?" in - 0|1) echo " Restarting $DESC $NAME succeeded" ;; - *) echo " Restarting $DESC $NAME failed: couldn't start $NAME" ;; - esac - ;; - *) - echo " Restarting $DESC $NAME failed: couldn't stop $NAME" ;; - esac - ;; - *) - echo "Usage: $SCRIPTNAME {start|stop|restart|force-reload}" >&2 - exit 3 - ;; -esac diff --git a/package.bak/transmission/transmission.hash b/package.bak/transmission/transmission.hash deleted file mode 100644 index 849a722d2b..0000000000 --- a/package.bak/transmission/transmission.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3a8d045c306ad9acb7bf81126939b9594553a388482efa0ec1bfb67b22acd35f transmission-2.92.tar.xz diff --git a/package.bak/transmission/transmission.mk b/package.bak/transmission/transmission.mk deleted file mode 100644 index 923ba409d3..0000000000 --- a/package.bak/transmission/transmission.mk +++ /dev/null @@ -1,91 +0,0 @@ -################################################################################ -# -# transmission -# -################################################################################ - -TRANSMISSION_VERSION = 2.92 -TRANSMISSION_SITE = https://github.com/transmission/transmission-releases/raw/master -TRANSMISSION_SOURCE = transmission-$(TRANSMISSION_VERSION).tar.xz -TRANSMISSION_DEPENDENCIES = \ - host-pkgconf \ - host-intltool \ - libcurl \ - libevent \ - openssl \ - zlib -TRANSMISSION_AUTORECONF = YES -TRANSMISSION_CONF_OPTS = \ - --disable-libnotify \ - --enable-lightweight -TRANSMISSION_LICENSE = GPLv2 or GPLv3 with OpenSSL exception -TRANSMISSION_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBMINIUPNPC),y) -TRANSMISSION_DEPENDENCIES += libminiupnpc -endif - -ifeq ($(BR2_PACKAGE_LIBNATPMP),y) -TRANSMISSION_DEPENDENCIES += libnatpmp -TRANSMISSION_CONF_OPTS += --enable-external-natpmp -else -TRANSMISSION_CONF_OPTS += --disable-external-natpmp -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_UTP),y) -TRANSMISSION_CONF_OPTS += --enable-utp -else -TRANSMISSION_CONF_OPTS += --disable-utp -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_CLI),y) -TRANSMISSION_CONF_OPTS += --enable-cli -else -TRANSMISSION_CONF_OPTS += --disable-cli -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_DAEMON),y) -TRANSMISSION_CONF_OPTS += --enable-daemon - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -TRANSMISSION_DEPENDENCIES += systemd -TRANSMISSION_CONF_OPTS += --with-systemd-daemon -else -TRANSMISSION_CONF_OPTS += --without-systemd-daemon -endif - -define TRANSMISSION_USERS - transmission -1 transmission -1 * /var/lib/transmission - transmission Transmission Daemon -endef - -define TRANSMISSION_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/transmission/S92transmission \ - $(TARGET_DIR)/etc/init.d/S92transmission -endef - -define TRANSMISSION_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 0755 $(@D)/daemon/transmission-daemon.service \ - $(TARGET_DIR)/usr/lib/systemd/system/transmission-daemon.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -fs ../../../../usr/lib/systemd/system/transmission-daemon.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/transmission-daemon.service -endef - -else -TRANSMISSION_CONF_OPTS += --disable-daemon -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_REMOTE),y) -TRANSMISSION_CONF_OPTS += --enable-remote -else -TRANSMISSION_CONF_OPTS += --disable-remote -endif - -ifeq ($(BR2_PACKAGE_TRANSMISSION_GTK),y) -TRANSMISSION_CONF_OPTS += --enable-gtk -TRANSMISSION_DEPENDENCIES += libgtk2 -else -TRANSMISSION_CONF_OPTS += --disable-gtk -endif - -$(eval $(autotools-package)) diff --git a/package.bak/tree/Config.in b/package.bak/tree/Config.in deleted file mode 100644 index 234995f109..0000000000 --- a/package.bak/tree/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_TREE - bool "tree" - depends on BR2_USE_WCHAR - help - Tree is a recursive directory listing command that produces - a depth indented listing of files, which is colorized ala - dircolors if the LS_COLORS environment variable is set and - output is to tty. - - http://mama.indstate.edu/users/ice/tree/ - -comment "tree needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR diff --git a/package.bak/tree/tree.hash b/package.bak/tree/tree.hash deleted file mode 100644 index ab79df8e28..0000000000 --- a/package.bak/tree/tree.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12 tree-1.7.0.tgz diff --git a/package.bak/tree/tree.mk b/package.bak/tree/tree.mk deleted file mode 100644 index b8988bd4c1..0000000000 --- a/package.bak/tree/tree.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tree -# -################################################################################ - -TREE_VERSION = 1.7.0 -TREE_SOURCE = tree-$(TREE_VERSION).tgz -TREE_SITE = http://mama.indstate.edu/users/ice/tree/src -TREE_LICENSE = GPLv2+ -TREE_LICENSE_FILES = LICENSE - -define TREE_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define TREE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/tree $(TARGET_DIR)/usr/bin/tree -endef - -$(eval $(generic-package)) diff --git a/package.bak/tremor/Config.in b/package.bak/tremor/Config.in deleted file mode 100644 index 1a478c47a0..0000000000 --- a/package.bak/tremor/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_TREMOR - bool "tremor (fixed point vorbis decoder)" - select BR2_PACKAGE_LIBOGG - help - Tremor is a fixed point implementation of an Ogg Vorbis - decoder. It provides a decoding API similar to libvorbis, - but gives much better performance on systems without a - floating-point unit. diff --git a/package.bak/tremor/tremor.mk b/package.bak/tremor/tremor.mk deleted file mode 100644 index 2a791b6729..0000000000 --- a/package.bak/tremor/tremor.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# tremor -# -################################################################################ - -TREMOR_SITE = http://svn.xiph.org/trunk/Tremor -TREMOR_SITE_METHOD = svn -TREMOR_VERSION = 19427 -TREMOR_LICENSE = BSD-3c -TREMOR_LICENSE_FILES = COPYING - -TREMOR_AUTORECONF = YES -TREMOR_INSTALL_STAGING = YES -TREMOR_DEPENDENCIES = libogg - -# tremor has ARM assembly code that cannot be compiled in Thumb2 mode, -# so we must force the traditional ARM mode. -# However, some ARM architectures like ARNv7-M only supports Thumb -# instructions, but the tremor build configuration enables ARM assembly -# code unconditionally for all arm triplets by defining _ARM_ASSEM_. -# We are overriding this by undefining this macro for the ARM -# architectures not supporting ARM instructions. -ifeq ($(BR2_arm),y) -ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -TREMOR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -marm" -else -TREMOR_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -U_ARM_ASSEM_" -endif -endif - -$(eval $(autotools-package)) diff --git a/package.bak/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch b/package.bak/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch deleted file mode 100644 index 80f264037f..0000000000 --- a/package.bak/triggerhappy/0001-eventtable.h-use-correct-array-sizes-to-fix-building.patch +++ /dev/null @@ -1,66 +0,0 @@ -From d3cfa80631a7e314fee9b2e0822e403fcf2a5c5c Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sun, 31 Jul 2016 10:28:43 +0200 -Subject: [PATCH] eventtable.h: use correct array sizes to fix building against - 4.7+ headers -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -During the 4.7 development cycle, commit 9a9b6aa6a8 (Input: add -SW_PEN_INSERTED define) got added, which has the same numerical value as -SW_MAX: - -+#define SW_PEN_INSERTED 0x0f /* set = pen inserted */ -+#define SW_MAX 0x0f - -This breaks the build as the SW_NAME array is sized using the SW_MAX macro: - -In file included from eventtable.h:21:0, - from eventnames.c:11: -evtable_SW.inc:17:1: error: array index in initializer exceeds array bounds - EV_MAP(SW_PEN_INSERTED), - ^ -evtable_SW.inc:17:1: error: (near initialization for ‘SW_NAME’) - -The arrays should be sized using the _CNT (which is MAX+1) macros -instead of _MAX. These got added during the 2.6.24 development cycle, -so it should be safe to do so unconditially: - -commit 7b19ada2ed3c1eccb9fe94d74b05e1428224663d -Author: Jiri Slaby -Date: Thu Oct 18 23:40:32 2007 -0700 - - get rid of input BIT* duplicate defines - -Signed-off-by: Peter Korsgaard ---- - eventtable.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/eventtable.h b/eventtable.h -index 349d9d7..7cd99aa 100644 ---- a/eventtable.h -+++ b/eventtable.h -@@ -8,15 +8,15 @@ - - #define EV_MAP( N ) [ N ] = #N - --static const char *EV_NAME[EV_MAX] = { -+static const char *EV_NAME[EV_CNT] = { - #include "evtable_EV.inc" - }; - --static const char *KEY_NAME[KEY_MAX] = { -+static const char *KEY_NAME[KEY_CNT] = { - #include "evtable_KEY.inc" - #include "evtable_BTN.inc" - }; - --static const char *SW_NAME[SW_MAX] = { -+static const char *SW_NAME[SW_CNT] = { - #include "evtable_SW.inc" - }; --- -2.8.1 - diff --git a/package.bak/triggerhappy/Config.in b/package.bak/triggerhappy/Config.in deleted file mode 100644 index a7864b3717..0000000000 --- a/package.bak/triggerhappy/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_TRIGGERHAPPY - bool "triggerhappy" - depends on BR2_USE_MMU # fork() - help - Triggerhappy is a hotkey daemon developed with small and - embedded systems in mind, e.g. linux based routers. It - attaches to the input device files and interprets the event - data received and executes scripts configured in its - configuration. - - https://github.com/wertarbyte/triggerhappy diff --git a/package.bak/triggerhappy/S10triggerhappy b/package.bak/triggerhappy/S10triggerhappy deleted file mode 100755 index 3253e910b1..0000000000 --- a/package.bak/triggerhappy/S10triggerhappy +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -NAME=thd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid -DAEMON_ARGS="--daemon --triggers /etc/triggerhappy/triggers.d --socket /var/run/thd.socket --pidfile $PIDFILE --user nobody /dev/input/event*" - -# Sanity checks -test -x $DAEMON || exit 0 - -[ -r /etc/default/triggerhappy ] && . /etc/default/triggerhappy - -start() { - printf "Starting $NAME: " - start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- $DAEMON_ARGS \ - && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping $NAME: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - sleep 1 - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/triggerhappy/triggerhappy.hash b/package.bak/triggerhappy/triggerhappy.hash deleted file mode 100644 index 17eefdb248..0000000000 --- a/package.bak/triggerhappy/triggerhappy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 6b01497377e522c368818c5f6c726362f42530e3dc24a01c6d77b1b4d6068308 triggerhappy-7e5abc69f215678e93a6b999524981c8b40bdcd9.tar.gz diff --git a/package.bak/triggerhappy/triggerhappy.mk b/package.bak/triggerhappy/triggerhappy.mk deleted file mode 100644 index 5a29ca7773..0000000000 --- a/package.bak/triggerhappy/triggerhappy.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# triggerhappy -# -################################################################################ - -TRIGGERHAPPY_VERSION = 7e5abc69f215678e93a6b999524981c8b40bdcd9 -TRIGGERHAPPY_SITE = $(call github,wertarbyte,triggerhappy,$(TRIGGERHAPPY_VERSION)) -TRIGGERHAPPY_LICENSE = GPLv3+ -TRIGGERHAPPY_LICENSE_FILES = COPYING - -define TRIGGERHAPPY_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) thd th-cmd -endef - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -define TRIGGERHAPPY_INSTALL_UDEV_RULE - $(INSTALL) -D -m 0644 $(@D)/udev/triggerhappy-udev.rules \ - $(TARGET_DIR)/lib/udev/rules.d/triggerhappy.rules -endef -endif - -define TRIGGERHAPPY_INSTALL_TARGET_CMDS - $(INSTALL) -d $(TARGET_DIR)/etc/triggerhappy/triggers.d - $(INSTALL) -D -m 0755 $(@D)/thd $(TARGET_DIR)/usr/sbin/thd - $(INSTALL) -D -m 0755 $(@D)/th-cmd $(TARGET_DIR)/usr/sbin/th-cmd - $(TRIGGERHAPPY_INSTALL_UDEV_RULE) -endef - -define TRIGGERHAPPY_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/triggerhappy/S10triggerhappy \ - $(TARGET_DIR)/etc/init.d/S10triggerhappy -endef - -define TRIGGERHAPPY_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 package/triggerhappy/triggerhappy.service \ - $(TARGET_DIR)/usr/lib/systemd/system/triggerhappy.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/triggerhappy.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/triggerhappy.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/triggerhappy/triggerhappy.service b/package.bak/triggerhappy/triggerhappy.service deleted file mode 100644 index 8449c1c935..0000000000 --- a/package.bak/triggerhappy/triggerhappy.service +++ /dev/null @@ -1,9 +0,0 @@ -[Unit] -Description=Triggerhappy daemon - -[Service] -ExecStart=/usr/sbin/thd --triggers /etc/triggerhappy/triggers.d --socket /var/run/thd.socket --user nobody /dev/input/event* -Restart=always - -[Install] -WantedBy=multi-user.target diff --git a/package.bak/trinity/0001-mips-fix-prctl-s.patch b/package.bak/trinity/0001-mips-fix-prctl-s.patch deleted file mode 100644 index aacd8d5bf6..0000000000 --- a/package.bak/trinity/0001-mips-fix-prctl-s.patch +++ /dev/null @@ -1,39 +0,0 @@ -From d61dd102b95b9791e45d6bbf1e34814b8c6c1731 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 14 Dec 2015 14:46:37 +0000 -Subject: [PATCH] mips: fix prctl's - -It looks like a typo in the syscalls/prctl.c file. It's lacking the PR_ -preffix, and due to that is causing build failures like this one: - - CC syscalls/prctl.o -syscalls/prctl.c:37:2: error: 'GET_FP_MODE' undeclared here (not in a -function) - GET_FP_MODE, SET_FP_MODE, - ^ -syscalls/prctl.c:37:15: error: 'SET_FP_MODE' undeclared here (not -in a function) - GET_FP_MODE, SET_FP_MODE, - ^ - -Signed-off-by: Vicente Olivert Riera ---- - syscalls/prctl.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/syscalls/prctl.c b/syscalls/prctl.c -index 523f03e..5a64fb3 100644 ---- a/syscalls/prctl.c -+++ b/syscalls/prctl.c -@@ -34,7 +34,7 @@ static int prctl_opts[] = { - PR_GET_NO_NEW_PRIVS, PR_GET_TID_ADDRESS, PR_SET_THP_DISABLE, PR_GET_THP_DISABLE, - PR_MPX_ENABLE_MANAGEMENT, PR_MPX_DISABLE_MANAGEMENT, - #ifdef __mips__ -- GET_FP_MODE, SET_FP_MODE, -+ PR_GET_FP_MODE, PR_SET_FP_MODE, - #endif - PR_CAP_AMBIENT, - }; --- -2.4.10 - diff --git a/package.bak/trinity/Config.in b/package.bak/trinity/Config.in deleted file mode 100644 index 0ce1f9aa27..0000000000 --- a/package.bak/trinity/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_TRINITY_ARCH_SUPPORTS - bool - default y - depends on BR2_USE_MMU # fork() - depends on BR2_aarch64 || BR2_arm || BR2_armeb || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_powerpc || BR2_powerpc64 || \ - BR2_powerpc64le || BR2_sparc || BR2_x86_64 - -config BR2_PACKAGE_TRINITY - bool "trinity" - depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS - depends on !BR2_TOOLCHAIN_USES_MUSL # FTW_ACTIONRETVAL - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 # IPV6_UNICAST_IF - help - A Linux System call fuzz tester - - http://codemonkey.org.uk/projects/trinity/ - -comment "trinity needs a uClibc or glibc toolchain w/ headers >= 3.4" - depends on BR2_PACKAGE_TRINITY_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_USES_MUSL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_4 diff --git a/package.bak/trinity/trinity.hash b/package.bak/trinity/trinity.hash deleted file mode 100644 index e290a40920..0000000000 --- a/package.bak/trinity/trinity.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3ef7ae05dba14f8bb626121983a08bb09d1d51a19de38bd9a8e0f29b11d9e3c9 trinity-v1.6.tar.gz diff --git a/package.bak/trinity/trinity.mk b/package.bak/trinity/trinity.mk deleted file mode 100644 index 7596e92ba8..0000000000 --- a/package.bak/trinity/trinity.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# trinity -# -################################################################################ - -TRINITY_VERSION = v1.6 -TRINITY_SITE = $(call github,kernelslacker,trinity,$(TRINITY_VERSION)) -TRINITY_LICENSE = GPLv2 -TRINITY_LICENSE_FILES = COPYING - -define TRINITY_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) ./configure.sh) -endef - -define TRINITY_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -define TRINITY_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install -endef - -# Install helper scripts -define TRINITY_INSTALL_HELPER_SCRIPTS - mkdir -p $(TARGET_DIR)/usr/libexec/trinity - cp -p $(@D)/scripts/* $(TARGET_DIR)/usr/libexec/trinity/ -endef -TRINITY_POST_INSTALL_TARGET_HOOKS += TRINITY_INSTALL_HELPER_SCRIPTS - -$(eval $(generic-package)) diff --git a/package.bak/trousers/0001-Remove-inline-for-read_data-and-write_data.patch b/package.bak/trousers/0001-Remove-inline-for-read_data-and-write_data.patch deleted file mode 100644 index b0db70b49b..0000000000 --- a/package.bak/trousers/0001-Remove-inline-for-read_data-and-write_data.patch +++ /dev/null @@ -1,94 +0,0 @@ -From f03c7987c234a81f7e4274b26bab07318357a2a5 Mon Sep 17 00:00:00 2001 -From: Sergio Prado -Date: Fri, 25 Dec 2015 20:09:21 -0200 -Subject: [PATCH] Remove inline for read_data and write_data - -read_data and write_data functions are declared with inline, but -their definition is not in a .h file. This is causing errors when -linking: - -tcsps.c:(.text+0x4ac): undefined reference to `read_data' -tcsps.c:(.text+0x1888): undefined reference to `write_data' -... - -Partial backport of upstream commit -3297fcdf5ac0df868778e976b8b59e35542c1ee2. - -Signed-off-by: Sergio Prado ---- - src/include/tcsps.h | 5 ----- - src/tcs/ps/ps_utils.c | 8 -------- - src/tspi/ps/ps_utils.c | 4 ++-- - 3 files changed, 2 insertions(+), 15 deletions(-) - -diff --git a/src/include/tcsps.h b/src/include/tcsps.h -index 87542965877d..dcd5db469822 100644 ---- a/src/include/tcsps.h -+++ b/src/include/tcsps.h -@@ -23,13 +23,8 @@ int get_file(); - int put_file(int); - void close_file(int); - void ps_destroy(); --#ifdef SOLARIS - TSS_RESULT read_data(int, void *, UINT32); - TSS_RESULT write_data(int, void *, UINT32); --#else --inline TSS_RESULT read_data(int, void *, UINT32); --inline TSS_RESULT write_data(int, void *, UINT32); --#endif - int write_key_init(int, UINT32, UINT32, UINT32); - TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32); - TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *); -diff --git a/src/tcs/ps/ps_utils.c b/src/tcs/ps/ps_utils.c -index 2e7f502b9599..35ac89f8fc12 100644 ---- a/src/tcs/ps/ps_utils.c -+++ b/src/tcs/ps/ps_utils.c -@@ -42,11 +42,7 @@ - struct key_disk_cache *key_disk_cache_head = NULL; - - --#ifdef SOLARIS - TSS_RESULT --#else --inline TSS_RESULT --#endif - read_data(int fd, void *data, UINT32 size) - { - int rc; -@@ -64,11 +60,7 @@ read_data(int fd, void *data, UINT32 size) - } - - --#ifdef SOLARIS - TSS_RESULT --#else --inline TSS_RESULT --#endif - write_data(int fd, void *data, UINT32 size) - { - int rc; -diff --git a/src/tspi/ps/ps_utils.c b/src/tspi/ps/ps_utils.c -index aac40a147314..83259141d375 100644 ---- a/src/tspi/ps/ps_utils.c -+++ b/src/tspi/ps/ps_utils.c -@@ -22,7 +22,7 @@ - #include "tspps.h" - #include "tsplog.h" - --inline TSS_RESULT -+TSS_RESULT - read_data(int fd, void *data, UINT32 size) - { - int rc; -@@ -39,7 +39,7 @@ read_data(int fd, void *data, UINT32 size) - return TSS_SUCCESS; - } - --inline TSS_RESULT -+TSS_RESULT - write_data(int fd, void *data, UINT32 size) - { - int rc; --- -1.9.1 - diff --git a/package.bak/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch b/package.bak/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch deleted file mode 100644 index 3275b76a2c..0000000000 --- a/package.bak/trousers/0002-Check-if-the-compiler-understands-pie-and-relro-options.patch +++ /dev/null @@ -1,215 +0,0 @@ -From 9abda1bb380bdbef1affaec381742ced394ca118 Mon Sep 17 00:00:00 2001 -From: Lada Trimasova -Date: Mon, 18 Jan 2016 15:58:19 +0300 -Subject: [PATCH] Check if the compiler understands pie and relro options - --pie and -fpie enable the building of position-independent -executables, and -Wl,-z,relro turns on read-only relocation support in gcc. -Add checks to ensure that the compiler and linker understand these options. - -Signed-off-by: Lada Trimasova ---- - configure.in | 5 +++ - m4/ax_check_compile_flag.m4 | 72 ++++++++++++++++++++++++++++++++++++ - m4/ax_check_link_flag.m4 | 71 +++++++++++++++++++++++++++++++++++ - src/tcsd/Makefile.am | 4 +- - 4 files changed, 150 insertions(+), 2 deletions(-) - create mode 100644 m4/ax_check_compile_flag.m4 - create mode 100644 m4/ax_check_link_flag.m4 - -diff --git a/configure.in b/configure.in -index add23dc..9603353 100644 ---- a/configure.in -+++ b/configure.in -@@ -12,6 +12,7 @@ TSS_VER_MINOR=3 - # compute $target - AC_CANONICAL_TARGET - AM_INIT_AUTOMAKE([foreign 1.6]) -+AC_CONFIG_MACRO_DIR([m4]) - - # Debugging support - AC_ARG_ENABLE([debug], -@@ -383,6 +384,10 @@ elif test x"${prefix}" = x"NONE"; then - localstatedir="/usr/local/var" - fi - -+AX_CHECK_COMPILE_FLAG([-fPIE -DPIE], [PIE_CFLAGS="-fPIE -DPIE"]) -+AX_CHECK_LINK_FLAG([-pie], [PIE_LDFLAGS="$PIE_LDFLAGS -pie"]) -+AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS="$LDFLAGS -Wl,-z,relro"]) -+ - AC_OUTPUT(dist/tcsd.conf \ - dist/fedora/trousers.spec \ - dist/trousers.spec \ -diff --git a/m4/ax_check_compile_flag.m4 b/m4/ax_check_compile_flag.m4 -new file mode 100644 -index 0000000..c3a8d69 ---- /dev/null -+++ b/m4/ax_check_compile_flag.m4 -@@ -0,0 +1,72 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_check_compile_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_COMPILE_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the current language's compiler -+# or gives an error. (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the current language's default -+# flags (e.g. CFLAGS) when the check is done. The check is thus made with -+# the flags: "CFLAGS EXTRA-FLAGS FLAG". This can for example be used to -+# force the compiler to issue an error when a bad flag is given. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,LINK}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 2 -+ -+AC_DEFUN([AX_CHECK_COMPILE_FLAG], -+[AC_PREREQ(2.59)dnl for _AC_LANG_PREFIX -+AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_[]_AC_LANG_ABBREV[]flags_$4_$1])dnl -+AC_CACHE_CHECK([whether _AC_LANG compiler accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$[]_AC_LANG_PREFIX[]FLAGS -+ _AC_LANG_PREFIX[]FLAGS="$[]_AC_LANG_PREFIX[]FLAGS $4 $1" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM()], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ _AC_LANG_PREFIX[]FLAGS=$ax_check_save_flags]) -+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_COMPILE_FLAGS -diff --git a/m4/ax_check_link_flag.m4 b/m4/ax_check_link_flag.m4 -new file mode 100644 -index 0000000..e2d0d36 ---- /dev/null -+++ b/m4/ax_check_link_flag.m4 -@@ -0,0 +1,71 @@ -+# =========================================================================== -+# http://www.gnu.org/software/autoconf-archive/ax_check_link_flag.html -+# =========================================================================== -+# -+# SYNOPSIS -+# -+# AX_CHECK_LINK_FLAG(FLAG, [ACTION-SUCCESS], [ACTION-FAILURE], [EXTRA-FLAGS]) -+# -+# DESCRIPTION -+# -+# Check whether the given FLAG works with the linker or gives an error. -+# (Warnings, however, are ignored) -+# -+# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on -+# success/failure. -+# -+# If EXTRA-FLAGS is defined, it is added to the linker's default flags -+# when the check is done. The check is thus made with the flags: "LDFLAGS -+# EXTRA-FLAGS FLAG". This can for example be used to force the linker to -+# issue an error when a bad flag is given. -+# -+# NOTE: Implementation based on AX_CFLAGS_GCC_OPTION. Please keep this -+# macro in sync with AX_CHECK_{PREPROC,COMPILE}_FLAG. -+# -+# LICENSE -+# -+# Copyright (c) 2008 Guido U. Draheim -+# Copyright (c) 2011 Maarten Bosmans -+# -+# This program is free software: you can redistribute it and/or modify it -+# under the terms of the GNU General Public License as published by the -+# Free Software Foundation, either version 3 of the License, or (at your -+# option) any later version. -+# -+# This program is distributed in the hope that it will be useful, but -+# WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -+# Public License for more details. -+# -+# You should have received a copy of the GNU General Public License along -+# with this program. If not, see . -+# -+# As a special exception, the respective Autoconf Macro's copyright owner -+# gives unlimited permission to copy, distribute and modify the configure -+# scripts that are the output of Autoconf when processing the Macro. You -+# need not follow the terms of the GNU General Public License when using -+# or distributing such scripts, even though portions of the text of the -+# Macro appear in them. The GNU General Public License (GPL) does govern -+# all other use of the material that constitutes the Autoconf Macro. -+# -+# This special exception to the GPL applies to versions of the Autoconf -+# Macro released by the Autoconf Archive. When you make and distribute a -+# modified version of the Autoconf Macro, you may extend this special -+# exception to the GPL to apply to your modified version as well. -+ -+#serial 2 -+ -+AC_DEFUN([AX_CHECK_LINK_FLAG], -+[AS_VAR_PUSHDEF([CACHEVAR],[ax_cv_check_ldflags_$4_$1])dnl -+AC_CACHE_CHECK([whether the linker accepts $1], CACHEVAR, [ -+ ax_check_save_flags=$LDFLAGS -+ LDFLAGS="$LDFLAGS $4 $1" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM()], -+ [AS_VAR_SET(CACHEVAR,[yes])], -+ [AS_VAR_SET(CACHEVAR,[no])]) -+ LDFLAGS=$ax_check_save_flags]) -+AS_IF([test x"AS_VAR_GET(CACHEVAR)" = xyes], -+ [m4_default([$2], :)], -+ [m4_default([$3], :)]) -+AS_VAR_POPDEF([CACHEVAR])dnl -+])dnl AX_CHECK_LINK_FLAGS -diff --git a/src/tcsd/Makefile.am b/src/tcsd/Makefile.am -index 2210734..6640ab2 100644 ---- a/src/tcsd/Makefile.am -+++ b/src/tcsd/Makefile.am -@@ -1,8 +1,8 @@ - sbin_PROGRAMS=tcsd - --tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include -fPIE -DPIE -+tcsd_CFLAGS=-DAPPID=\"TCSD\" -DVAR_PREFIX=\"@localstatedir@\" -DETC_PREFIX=\"@sysconfdir@\" -I${top_srcdir}/src/include $(PIE_CFLAGS) - tcsd_LDADD=${top_builddir}/src/tcs/libtcs.a ${top_builddir}/src/tddl/libtddl.a -lpthread @CRYPTOLIB@ --tcsd_LDFLAGS=-pie -Wl,-z,relro -Wl,-z,now -+tcsd_LDFLAGS=$(PIE_LDFLAGS) $(RELRO_LDFLAGS) - - tcsd_SOURCES=svrside.c tcsd_conf.c tcsd_threads.c platform.c - --- -2.5.0 - diff --git a/package.bak/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch b/package.bak/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch deleted file mode 100644 index f88e47ac27..0000000000 --- a/package.bak/trousers/0003-tsp_tcsi_param-include-limits.h-to-fix-musl-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 66bbe0a87818a1e3c721780dc33b2d81fdf4a774 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sun, 21 Aug 2016 23:32:10 +0200 -Subject: [PATCH] tsp_tcsi_param: include limits.h to fix musl build - -The musl libc doesn't provide , use -instead. - -Signed-off-by: Romain Naour ---- - src/tspi/tsp_tcsi_param.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/tspi/tsp_tcsi_param.c b/src/tspi/tsp_tcsi_param.c -index 670f86f..8f2b4e4 100644 ---- a/src/tspi/tsp_tcsi_param.c -+++ b/src/tspi/tsp_tcsi_param.c -@@ -11,7 +11,7 @@ - #include - #include - #include --#include -+#include - #include "trousers/tss.h" - #include "trousers/trousers.h" - #include "trousers_types.h" --- -2.5.5 - diff --git a/package.bak/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch b/package.bak/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch deleted file mode 100644 index 7014ad7afb..0000000000 --- a/package.bak/trousers/0004-Check-that-getpwent_r-is-available-before-using-it.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 9e42c405f30d2b52d019598436ea346ef8586f43 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?No=C3=A9=20Rubinstein?= -Date: Wed, 24 Aug 2016 18:55:25 +0200 -Subject: [PATCH] Check that getpwent_r is available before using it - -This fixes building trousers with musl - -Signed-off-by: Noé Rubinstein ---- - configure.in | 4 ++++ - src/tspi/ps/tspps.c | 10 +++++----- - 2 files changed, 9 insertions(+), 5 deletions(-) - -diff --git a/configure.in b/configure.in -index fd3f5f1..e3d7acf 100644 ---- a/configure.in -+++ b/configure.in -@@ -145,6 +145,10 @@ else - AC_MSG_ERROR(["gtk", "openssl" and "none" are the only supported gui options for trousers]) - fi - -+# Look for getpwent_r. If it is not found, getpwent will be used instead, with -+# an additional mutex. -+AC_CHECK_FUNC(getpwent_r, [AC_DEFINE(HAVE_GETPWENT_R)]) -+ - # - # The default port that the TCS daemon listens on - # -diff --git a/src/tspi/ps/tspps.c b/src/tspi/ps/tspps.c -index c6f9c3d..9d00d2a 100644 ---- a/src/tspi/ps/tspps.c -+++ b/src/tspi/ps/tspps.c -@@ -45,7 +45,7 @@ - - static int user_ps_fd = -1; - static MUTEX_DECLARE_INIT(user_ps_lock); --#if (defined (__FreeBSD__) || defined (__OpenBSD__)) -+#ifndef HAVE_GETPWENT_R - static MUTEX_DECLARE_INIT(user_ps_path); - #endif - static struct flock fl; -@@ -60,7 +60,7 @@ get_user_ps_path(char **file) - TSS_RESULT result; - char *file_name = NULL, *home_dir = NULL; - struct passwd *pwp; --#if (defined (__linux) || defined (linux) || defined(__GLIBC__)) -+#ifdef HAVE_GETPWENT_R - struct passwd pw; - #endif - struct stat stat_buf; -@@ -72,7 +72,7 @@ get_user_ps_path(char **file) - *file = strdup(file_name); - return (*file) ? TSS_SUCCESS : TSPERR(TSS_E_OUTOFMEMORY); - } --#if (defined (__FreeBSD__) || defined (__OpenBSD__)) -+#ifndef HAVE_GETPWENT_R - MUTEX_LOCK(user_ps_path); - #endif - -@@ -90,7 +90,7 @@ get_user_ps_path(char **file) - #else - setpwent(); - while (1) { --#if (defined (__linux) || defined (linux) || defined(__GLIBC__)) -+#ifdef HAVE_GETPWENT_R - rc = getpwent_r(&pw, buf, PASSWD_BUFSIZE, &pwp); - if (rc) { - LogDebugFn("USER PS: Error getting path to home directory: getpwent_r: %s", -@@ -99,7 +99,7 @@ get_user_ps_path(char **file) - return TSPERR(TSS_E_INTERNAL_ERROR); - } - --#elif (defined (__FreeBSD__) || defined (__OpenBSD__)) -+#else - if ((pwp = getpwent()) == NULL) { - LogDebugFn("USER PS: Error getting path to home directory: getpwent: %s", - strerror(rc)); --- -2.1.4 - diff --git a/package.bak/trousers/Config.in b/package.bak/trousers/Config.in deleted file mode 100644 index de3b951958..0000000000 --- a/package.bak/trousers/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_TROUSERS - bool "trousers" - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_TOOLCHAIN_HAS_THREADS - # doesn't build properly in static only configurations - depends on !BR2_STATIC_LIBS - # ARC toolchain issue - depends on !BR2_arc - help - The open-source TCG Software Stack (TSS). - - This library enables the use of a Trusted Platform Module that - complies with the TPM specification, version 1.2. It implements the - TSS specification, version 1.2. - - http://trousers.sourceforge.net/ - -comment "trousers needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS - depends on !BR2_arc diff --git a/package.bak/trousers/trousers.hash b/package.bak/trousers/trousers.hash deleted file mode 100644 index 997cfa97c1..0000000000 --- a/package.bak/trousers/trousers.hash +++ /dev/null @@ -1,3 +0,0 @@ -# http://sourceforge.net/projects/trousers/files/trousers/0.3.13/ -sha1 d23f1a3df4febffc4174f5cca7d1c54230477bb2 trousers-0.3.13.tar.gz -md5 ad508f97b406f6e48cd90e85d78e7ca8 trousers-0.3.13.tar.gz diff --git a/package.bak/trousers/trousers.mk b/package.bak/trousers/trousers.mk deleted file mode 100644 index 41129eb053..0000000000 --- a/package.bak/trousers/trousers.mk +++ /dev/null @@ -1,35 +0,0 @@ -############################################################# -# -# trousers -# -############################################################## - -TROUSERS_VERSION = 0.3.13 -TROUSERS_SITE = http://downloads.sourceforge.net/project/trousers/trousers/$(TROUSERS_VERSION) -TROUSERS_LICENSE = BSD-3c -TROUSERS_LICENSE_FILES = LICENSE -TROUSERS_INSTALL_STAGING = YES -# Need autoreconf because of a patch touching configure.in and Makefile.am -TROUSERS_AUTORECONF = YES -TROUSERS_DEPENDENCIES = host-pkgconf openssl - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -TROUSERS_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_arc770d)$(BR2_arc750d),y) -TROUSERS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mno-compact-casesi" -endif - -# The TrouSerS build system attempts to create the tss user and group -# on the host system. Disable the user checking feature as a -# workaround. -TROUSERS_CONF_OPTS += --disable-usercheck - -ifeq ($(BR2_TOOLCHAIN_SUPPORTS_PIE),) -TROUSERS_CONF_ENV += \ - ax_cv_check_cflags___fPIE__DPIE=no \ - ax_cv_check_ldflags___pie=no -endif - -$(eval $(autotools-package)) diff --git a/package.bak/ts4900-fpga/Config.in b/package.bak/ts4900-fpga/Config.in deleted file mode 100644 index 7910631bc0..0000000000 --- a/package.bak/ts4900-fpga/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_TS4900_FPGA - bool "ts4900-fpga" - depends on BR2_arm - help - TS-4900's FPGA implements clocks, UART MUX, and GPIOs. One of these - GPIOs is used to enable the wifi module. - - It is loaded by U-Boot during the boot sequence, the default U-boot - script expects to find it in the /boot folder. - - http://wiki.embeddedarm.com/wiki/TS-4900#FPGA_Changelog - diff --git a/package.bak/ts4900-fpga/ts4900-fpga.hash b/package.bak/ts4900-fpga/ts4900-fpga.hash deleted file mode 100644 index 2147aeb3c2..0000000000 --- a/package.bak/ts4900-fpga/ts4900-fpga.hash +++ /dev/null @@ -1,5 +0,0 @@ -# From ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga/ts4900-fpga-20150930.bin.md5 -md5 bf93c03ef914cf008287c8cd60781cc8 ts4900-fpga-20150930.bin - -# Locally calculated -sha256 242ac6a90bea9a95c937ea8952cdc9b02f543cea24a0359bed66a408a6dd8bf9 ts4900-fpga-20150930.bin diff --git a/package.bak/ts4900-fpga/ts4900-fpga.mk b/package.bak/ts4900-fpga/ts4900-fpga.mk deleted file mode 100644 index ed951b8c8f..0000000000 --- a/package.bak/ts4900-fpga/ts4900-fpga.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# ts4900-fpga -# -################################################################################ - -TS4900_FPGA_VERSION = 20150930 -TS4900_FPGA_SOURCE = ts4900-fpga-$(TS4900_FPGA_VERSION).bin -TS4900_FPGA_SITE = ftp://ftp.embeddedarm.com/ts-socket-macrocontrollers/ts-4900-linux/fpga -# No license file provided, Yocto recipe from the vendor claims MIT. -# https://github.com/embeddedarm/meta-ts/blob/f31860f1204b64f765a5380d3b93a2cf18234f90/recipes-extras/ts4900-fpga/ts4900-fpga.bb#L6 - -define TS4900_FPGA_EXTRACT_CMDS - cp $(DL_DIR)/$(TS4900_FPGA_SOURCE) $(@D) -endef - -define TS4900_FPGA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0644 -D $(@D)/$(TS4900_FPGA_SOURCE) $(TARGET_DIR)/boot/ts4900-fpga.bin -endef - -$(eval $(generic-package)) diff --git a/package.bak/tslib/Config.in b/package.bak/tslib/Config.in deleted file mode 100644 index bc5d790188..0000000000 --- a/package.bak/tslib/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_TSLIB - bool "tslib" - depends on !BR2_STATIC_LIBS # dlopen - help - Tslib is a filtering layer for touchscreen panel events. - - https://github.com/kergoth/tslib - -comment "tslib needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/tslib/tslib.hash b/package.bak/tslib/tslib.hash deleted file mode 100644 index d7ae4dce55..0000000000 --- a/package.bak/tslib/tslib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# https://github.com/kergoth/tslib/releases/download/1.5/tslib-1.5.tar.xz.sha256 -sha256 94874fe72c5af5c9be642a2ce524f014eb1d59d15cf852f2d3b2cf380f04252d tslib-1.5.tar.xz diff --git a/package.bak/tslib/tslib.mk b/package.bak/tslib/tslib.mk deleted file mode 100644 index 08b1d26ac2..0000000000 --- a/package.bak/tslib/tslib.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tslib -# -################################################################################ - -TSLIB_VERSION = 1.5 -TSLIB_SITE = https://github.com/kergoth/tslib/releases/download/$(TSLIB_VERSION) -TSLIB_SOURCE = tslib-$(TSLIB_VERSION).tar.xz -TSLIB_LICENSE = GPL, LGPL -TSLIB_LICENSE_FILES = COPYING - -TSLIB_AUTORECONF = YES -TSLIB_INSTALL_STAGING = YES -TSLIB_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) LDFLAGS=-L$(STAGING_DIR)/usr/lib install - -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_6),) -TSLIB_CONF_OPTS += --disable-tools -endif - -$(eval $(autotools-package)) diff --git a/package.bak/tstools/0001-build-get-along-with-buildroot.patch b/package.bak/tstools/0001-build-get-along-with-buildroot.patch deleted file mode 100644 index 1e7a748262..0000000000 --- a/package.bak/tstools/0001-build-get-along-with-buildroot.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 44f80bce0914d4d9c5e7486c7cdb521ba637b324 Mon Sep 17 00:00:00 2001 -From: Tzu-Jung Lee -Date: Fri, 19 Jul 2013 22:45:18 +0800 -Subject: [PATCH] build: get along with buildroot - -Signed-off-by: Tzu-Jung Lee ---- - Makefile | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile b/Makefile -index 2c3568e..98bb994 100644 ---- a/Makefile -+++ b/Makefile -@@ -34,12 +34,6 @@ SHELL = /bin/sh - .SUFFIXES: - .SUFFIXES: .c .o - --ifdef CROSS_COMPILE --CC = $(CROSS_COMPILE)gcc --else --CC = gcc --endif -- - # Use WARN=1 periodically to get too many warnings... - ifdef WARN - WARNING_FLAGS = -Wall -W -Wfloat-equal -Wundef -Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wmissing-prototypes -Wmissing-declarations -Wunreachable-code -Winline -@@ -452,3 +446,9 @@ test_lists: $(BINDIR)/test_nal_unit_list $(BINDIR)/test_es_unit_list - @echo +++ Testing ES unit lists - $(BINDIR)/test_es_unit_list - @echo +++ Test succeeded -+ -+.PHONY: install -+install: -+ @for i in $(PROGS); do \ -+ cp -f $$i $(DESTDIR)/usr/bin/; \ -+ done --- -1.8.3.2 - diff --git a/package.bak/tstools/Config.in b/package.bak/tstools/Config.in deleted file mode 100644 index ca5f8fc2ca..0000000000 --- a/package.bak/tstools/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_TSTOOLS - bool "tstools" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - help - This is a set of cross-platform command line tools for working with - MPEG data. - - The emphasis is on relatively simple tools which concentrate on MPEG - (H.264 and H.262) data packaged according to H.222 (i.e., TS or PS), - with a particular interest in checking for conformance. - - Transport Stream (TS) is typically used for distribution of cable - and satellite data. Program Stream (PS) is typically used to store - data on DVDs. - - https://github.com/kynesim/tstools/ - -comment "tstools needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/tstools/tstools.hash b/package.bak/tstools/tstools.hash deleted file mode 100644 index 9b0f1c7cea..0000000000 --- a/package.bak/tstools/tstools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3d2b2375e2874933f9aa59d4f25bb6b334747219eb0d7a076974e61222d59bf6 tstools-08f6be304040e7b84760ac3920bcff4a563b6cd2.tar.gz diff --git a/package.bak/tstools/tstools.mk b/package.bak/tstools/tstools.mk deleted file mode 100644 index 3355db864b..0000000000 --- a/package.bak/tstools/tstools.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# tstools -# -################################################################################ - -# No releases or tags yet. Use the latest commit ID from master branch. -TSTOOLS_VERSION = 08f6be304040e7b84760ac3920bcff4a563b6cd2 -TSTOOLS_SITE = $(call github,kynesim,tstools,$(TSTOOLS_VERSION)) -# tstools upstream doesn't contain any license file so far. See: -# https://github.com/kynesim/tstools/issues/32 -TSTOOLS_LICENSE = MPLv1.1 -TSTOOLS_LICENSE_FILES = - -define TSTOOLS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LD="$(TARGET_CC)" $(TARGET_MAKE_ENV) \ - $(MAKE1) -C $(@D) -endef - -define TSTOOLS_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/tunctl/Config.in b/package.bak/tunctl/Config.in deleted file mode 100644 index 26eed4c31e..0000000000 --- a/package.bak/tunctl/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_TUNCTL - bool "tunctl" - help - Tunctl is a tool for controlling the TUN/TAP driver in Linux. - - https://sourceforge.net/projects/tunctl/ diff --git a/package.bak/tunctl/tunctl.hash b/package.bak/tunctl/tunctl.hash deleted file mode 100644 index d3aaeecef8..0000000000 --- a/package.bak/tunctl/tunctl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 aa2a6c4cc6bfacb11e0d9f62334a6638a0d435475c61230116f00b6af8b14fff tunctl-1.5.tar.gz diff --git a/package.bak/tunctl/tunctl.mk b/package.bak/tunctl/tunctl.mk deleted file mode 100644 index 30dbbd1340..0000000000 --- a/package.bak/tunctl/tunctl.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tunctl -# -################################################################################ - -TUNCTL_VERSION = 1.5 -TUNCTL_SITE = http://downloads.sourceforge.net/project/tunctl/tunctl/$(TUNCTL_VERSION) - -TUNCTL_LICENSE = GPLv2 -TUNCTL_LICENSE_FILES = tunctl.c - -define TUNCTL_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) tunctl -endef - -define TUNCTL_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/tunctl $(TARGET_DIR)/usr/sbin/tunctl -endef - -$(eval $(generic-package)) diff --git a/package.bak/turbolua/Config.in b/package.bak/turbolua/Config.in deleted file mode 100644 index 34f66ef131..0000000000 --- a/package.bak/turbolua/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_TURBOLUA - bool "turbolua" - depends on BR2_PACKAGE_LUAJIT - help - Turbo.lua is a framework built for LuaJIT 2 to simplify the - task of building fast and scalable network applications. It - uses a event-driven, non-blocking, no thread design to deliver - excellent performance and minimal footprint to high-load - applications while also providing excellent support for - embedded uses. The toolkit can be used for HTTP REST API’s, - traditional dynamic web pages through templating, open - connections like WebSockets, or just as high level building - blocks for native speed network applications. - - http://www.turbolua.org - -comment "turbolua needs LuaJIT" - depends on !BR2_PACKAGE_LUAJIT diff --git a/package.bak/turbolua/turbolua.hash b/package.bak/turbolua/turbolua.hash deleted file mode 100644 index d460b4f667..0000000000 --- a/package.bak/turbolua/turbolua.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bff771b6a670f764366eff50e1644f1c5d8d526324e0b6adfda42d9f69791833 turbolua-6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0.tar.gz diff --git a/package.bak/turbolua/turbolua.mk b/package.bak/turbolua/turbolua.mk deleted file mode 100644 index bf9e27f16c..0000000000 --- a/package.bak/turbolua/turbolua.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# turbolua -# -################################################################################ - -TURBOLUA_VERSION = 6fbc5cbfed1cc8c3820d4c1bfb55258c764040f0 -TURBOLUA_SITE = $(call github,kernelsauce,turbo,$(TURBOLUA_VERSION)) -TURBOLUA_DEPENDENCIES = luajit -TURBOLUA_LICENSE = Apache-2.0 -TURBOLUA_LICENSE_FILES = LICENSE - -TURBOLUA_MAKE_OPTS = \ - $(TARGET_CONFIGURE_OPTS) \ - LUAJIT_VERSION="$(LUAJIT_VERSION)" - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -TURBOLUA_MAKE_OPTS += SSL=openssl -TURBOLUA_DEPENDENCIES += openssl -else -TURBOLUA_MAKE_OPTS += SSL=none -endif - -define TURBOLUA_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TURBOLUA_MAKE_OPTS) -C $(@D) all -endef - -define TURBOLUA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TURBOLUA_MAKE_OPTS) LDCONFIG=true \ - PREFIX="$(TARGET_DIR)/usr" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/tvheadend/0001-no-check_config.patch b/package.bak/tvheadend/0001-no-check_config.patch deleted file mode 100644 index 361ebcd41c..0000000000 --- a/package.bak/tvheadend/0001-no-check_config.patch +++ /dev/null @@ -1,23 +0,0 @@ -Makefile: do not use check_config - -test(1) only uses the second to compare two files dates. -test(1) also does a strict comparison wrt. dates. - -But, on very fast systems, the configure and .config.mk -files may be created in the same second, and so would lead -to a false comparison of the files' dates. - -Signed-off-by: "Yann E. MORIN" - -diff -durN tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile ---- tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3.orig/Makefile 2014-03-09 14:47:43.780025330 +0100 -+++ tvheadend-c84bc2b72b462ef2dbed305f3fd0bb3fa5046fc3/Makefile 2014-03-09 14:48:40.836539093 +0100 -@@ -566,7 +566,7 @@ - $(ROOTDIR)/configure $(CONFIGURE_ARGS) - - # Binary --${PROG}: .config.mk make_webui $(OBJS) -+${PROG}: make_webui $(OBJS) - $(pCC) -o $@ $(OBJS) $(CFLAGS) $(LDFLAGS) - - # Object diff --git a/package.bak/tvheadend/Config.in b/package.bak/tvheadend/Config.in deleted file mode 100644 index fc39d6f486..0000000000 --- a/package.bak/tvheadend/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -comment "tvheadend needs a toolchain w/ NPTL, headers >= 3.2, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 || BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -config BR2_PACKAGE_TVHEADEND - bool "tvheadend" - depends on !BR2_STATIC_LIBS # dladdr() - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - select BR2_PACKAGE_DTV_SCAN_TABLES - select BR2_PACKAGE_FFMPEG_AVRESAMPLE if BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_FFMPEG_SWSCALE if BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_LIBVPX if BR2_PACKAGE_FFMPEG && !BR2_bfin # libvpx - select BR2_PACKAGE_X264 if BR2_PACKAGE_FFMPEG - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - select BR2_PACKAGE_OPENSSL - help - Tvheadend is a TV streaming server for Linux supporting DVB-S, - DVB-S2, DVB-C, DVB-T, ATSC, IPTV, and Analog video (V4L) as - input sources. - - https://www.lonelycoder.com/redmine/projects/tvheadend/ - - Note: - - on first run, tvheadend will start in wizard mode; the webUI - is available on port 9981. - - if you want Avahi support, you'll need to enable: - Avahi, D-Bus, libdaemon diff --git a/package.bak/tvheadend/S99tvheadend b/package.bak/tvheadend/S99tvheadend deleted file mode 100644 index 65669ce404..0000000000 --- a/package.bak/tvheadend/S99tvheadend +++ /dev/null @@ -1,59 +0,0 @@ -#! /bin/sh -# tvheadend startup script inspired by the Debian one in the package - -# Author: Yann E. MORIN - -PATH=/usr/sbin:/usr/bin:/sbin:/bin -NAME=tvheadend -DAEMON=/usr/bin/$NAME -PIDFILE=/var/run/$NAME.pid - -[ -f "${DAEMON}" -a -x "${DAEMON}" ] || exit 0 - -# Read configuration variable file if it is present -[ -r "/etc/default/${NAME}" ] && . "/etc/default/${NAME}" - -ARGS="-f" -[ -z "${TVH_USER}" ] || ARGS="${ARGS} -u ${TVH_USER}" -[ -z "${TVH_GROUP}" ] || ARGS="${ARGS} -g ${TVH_GROUP}" -[ -z "${TVH_ADAPTERS}" ] || ARGS="${ARGS} -a ${TVH_ADAPTERS}" -[ -z "${TVH_HTTP_PORT}" ] || ARGS="${ARGS} -w ${TVH_HTTP_PORT}" -[ -z "${TVH_HTSP_PORT}" ] || ARGS="${ARGS} -e ${TVH_HTSP_PORT}" -[ "${TVH_DEBUG}" = "1" ] && ARGS="${ARGS} -s" - -# If first run, start in wizard mode -if [ -z "$(ls -1 /home/tvheadend/.hts/tvheadend/accesscontrol/ 2>/dev/null)" ]; then - ARGS="${ARGS} -C" -fi - -case "$1" in - start) - printf "Starting TVHeadend daemon: " - if start-stop-daemon -S -q -p ${PIDFILE} -m --exec "${DAEMON}" -- ${ARGS}; then - printf "OK\n" - else - printf "failed\n" - fi - ;; - stop) - printf "Stopping TVHeadend daemon: " - start-stop-daemon -K -q -p ${PIDFILE} -s TERM - sleep 2 - if start-stop-daemon -K -q -p ${PIDFILE} -t; then - printf "failed, killing: " - start-stop-daemon -K -q -p ${PIDFILE} -s KILL -o - fi - printf "OK\n" - ;; - restart|force-reload) - "${0}" stop - sleep 2 - "${0}" start - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -: diff --git a/package.bak/tvheadend/etc.default.tvheadend b/package.bak/tvheadend/etc.default.tvheadend deleted file mode 100644 index 253f8320b1..0000000000 --- a/package.bak/tvheadend/etc.default.tvheadend +++ /dev/null @@ -1,6 +0,0 @@ -TVH_USER=tvheadend -TVH_GROUP=tvheadend -#TVH_ADAPTERS= -#TVH_HTTP_PORT=9981 -#TVH_HTSP_PORT=9982 -#TVH_DEBUG=1 diff --git a/package.bak/tvheadend/tvheadend.hash b/package.bak/tvheadend/tvheadend.hash deleted file mode 100644 index d34dbf1f4e..0000000000 --- a/package.bak/tvheadend/tvheadend.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 ac3c088654864781f2b2a2797e3a8b03a1b2e86db731c08cb5f296a04069560d tvheadend-e5f5a4278949afc96e26d6cd50cf968e0e92d7b6.tar.gz diff --git a/package.bak/tvheadend/tvheadend.mk b/package.bak/tvheadend/tvheadend.mk deleted file mode 100644 index 42c6767f60..0000000000 --- a/package.bak/tvheadend/tvheadend.mk +++ /dev/null @@ -1,125 +0,0 @@ -################################################################################ -# -# tvheadend -# -################################################################################ - -TVHEADEND_VERSION = e5f5a4278949afc96e26d6cd50cf968e0e92d7b6 -TVHEADEND_SITE = $(call github,tvheadend,tvheadend,$(TVHEADEND_VERSION)) -TVHEADEND_LICENSE = GPLv3+ -TVHEADEND_LICENSE_FILES = LICENSE.md -TVHEADEND_DEPENDENCIES = \ - host-gettext \ - host-pkgconf \ - $(if $(BR2_PACKAGE_PYTHON3),host-python3,host-python) \ - openssl - -ifeq ($(BR2_PACKAGE_AVAHI),y) -TVHEADEND_DEPENDENCIES += avahi -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -TVHEADEND_DEPENDENCIES += dbus -TVHEADEND_CONF_OPTS += --enable-dbus-1 -else -TVHEADEND_CONF_OPTS += --disable-dbus-1 -endif - -ifeq ($(BR2_PACKAGE_FFMPEG),y) -TVHEADEND_DEPENDENCIES += ffmpeg -TVHEADEND_CONF_OPTS += --enable-libav -else -TVHEADEND_CONF_OPTS += --disable-libav -endif - -ifeq ($(BR2_PACKAGE_LIBDVBCSA),y) -TVHEADEND_DEPENDENCIES += libdvbcsa -TVHEADEND_CONF_OPTS += --enable-dvbcsa -else -TVHEADEND_CONF_OPTS += --disable-dvbcsa -endif - -ifeq ($(BR2_PACKAGE_LIBHDHOMERUN),y) -TVHEADEND_DEPENDENCIES += libhdhomerun -TVHEADEND_CONF_OPTS += --enable-hdhomerun_client -else -TVHEADEND_CONF_OPTS += --disable-hdhomerun_client -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -TVHEADEND_DEPENDENCIES += libiconv -endif - -TVHEADEND_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_PACKAGE_LIBURIPARSER),y) -TVHEADEND_DEPENDENCIES += liburiparser -TVHEADEND_CFLAGS += $(if $(BR2_USE_WCHAR),,-DURI_NO_UNICODE) -endif - -TVHEADEND_DEPENDENCIES += dtv-scan-tables - -# The tvheadend build system expects the transponder data to be present inside -# its source tree. To prevent a download initiated by the build system just -# copy the data files in the right place and add the corresponding stamp file. -define TVHEADEND_INSTALL_DTV_SCAN_TABLES - $(INSTALL) -d $(@D)/data/dvb-scan - cp -r $(TARGET_DIR)/usr/share/dvb/* $(@D)/data/dvb-scan/ - touch $(@D)/data/dvb-scan/.stamp -endef -TVHEADEND_PRE_CONFIGURE_HOOKS += TVHEADEND_INSTALL_DTV_SCAN_TABLES - -define TVHEADEND_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - $(TARGET_CONFIGURE_ARGS) \ - CFLAGS="$(TVHEADEND_CFLAGS)" \ - ./configure \ - --prefix=/usr \ - --arch="$(ARCH)" \ - --cpu="$(BR2_GCC_TARGET_CPU)" \ - --nowerror \ - --python="$(HOST_DIR)/usr/bin/python" \ - --enable-dvbscan \ - --enable-bundle \ - --disable-ffmpeg_static \ - --disable-hdhomerun_static \ - $(TVHEADEND_CONF_OPTS) \ - ) -endef - -define TVHEADEND_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define TVHEADEND_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -# Remove documentation and source files that are not needed because we -# use the bundled web interface version. -define TVHEADEND_CLEAN_SHARE - rm -rf $(TARGET_DIR)/usr/share/tvheadend/docs - rm -rf $(TARGET_DIR)/usr/share/tvheadend/src -endef - -TVHEADEND_POST_INSTALL_TARGET_HOOKS += TVHEADEND_CLEAN_SHARE - -#---------------------------------------------------------------------------- -# To run tvheadend, we need: -# - a startup script, and its config file -# - a non-root user to run as, and a home for it that is not accessible -# to the other users (because there will be crendentials in there) - -define TVHEADEND_INSTALL_INIT_SYSV - $(INSTALL) -D package/tvheadend/etc.default.tvheadend $(TARGET_DIR)/etc/default/tvheadend - $(INSTALL) -D package/tvheadend/S99tvheadend $(TARGET_DIR)/etc/init.d/S99tvheadend -endef - -define TVHEADEND_USERS - tvheadend -1 tvheadend -1 * /home/tvheadend - video TVHeadend daemon -endef -define TVHEADEND_PERMISSIONS - /home/tvheadend r 0700 tvheadend tvheadend - - - - - -endef - -$(eval $(generic-package)) diff --git a/package.bak/twolame/Config.in b/package.bak/twolame/Config.in deleted file mode 100644 index 3d8f23d679..0000000000 --- a/package.bak/twolame/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_TWOLAME - bool "twolame" - select BR2_PACKAGE_LIBSNDFILE - help - TwoLAME is an optimised MPEG Audio Layer 2 (MP2) encoder based on - tooLAME by Mike Cheng, which in turn is based upon the ISO dist10 - code and portions of LAME. - - http://www.twolame.org/ diff --git a/package.bak/twolame/twolame.hash b/package.bak/twolame/twolame.hash deleted file mode 100644 index 647655bd15..0000000000 --- a/package.bak/twolame/twolame.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 98f332f48951f47f23f70fd0379463aff7d7fb26f07e1e24e42ddef22cc6112a twolame-0.3.13.tar.gz diff --git a/package.bak/twolame/twolame.mk b/package.bak/twolame/twolame.mk deleted file mode 100644 index a26491f4ed..0000000000 --- a/package.bak/twolame/twolame.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# twolame -# -################################################################################ - -TWOLAME_VERSION = 0.3.13 -TWOLAME_SITE = http://downloads.sourceforge.net/project/twolame/twolame/$(TWOLAME_VERSION) -TWOLAME_DEPENDENCIES = host-pkgconf libsndfile -TWOLAME_INSTALL_STAGING = YES -TWOLAME_LICENSE = LGPLv2.1+ -TWOLAME_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/tz/Config.in b/package.bak/tz/Config.in deleted file mode 100644 index 943dc5cc49..0000000000 --- a/package.bak/tz/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_TZ - bool - help - Timezone info for uClibc. diff --git a/package.bak/tz/tz.mk b/package.bak/tz/tz.mk deleted file mode 100644 index f0daf4658f..0000000000 --- a/package.bak/tz/tz.mk +++ /dev/null @@ -1,39 +0,0 @@ -################################################################################ -# -# tz -# -################################################################################ - -TZ_DEPENDENCIES = host-tzdata host-tzdump -TZ_LICENSE = Public domain - -TZ_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) - -define TZ_BUILD_CMDS - (cd $(HOST_DIR)/usr/share/zoneinfo/posix/; \ - for i in $$(find . -type f); do \ - mkdir -p $(@D)/output/$$(dirname $$i); \ - $(TZDUMP) -p . -q $${i#./} | sed '1d' > $(@D)/output/$$i; \ - done \ - ) -endef - -define TZ_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/zone.tab \ - $(TARGET_DIR)/usr/share/zoneinfo/zone.tab - $(INSTALL) -D -m 0644 $(HOST_DIR)/usr/share/zoneinfo/iso3166.tab \ - $(TARGET_DIR)/usr/share/zoneinfo/iso3166.tab - mkdir -p $(TARGET_DIR)/usr/share/zoneinfo/uclibc - cp -a $(@D)/output/* $(TARGET_DIR)/usr/share/zoneinfo/uclibc - if [ -n "$(TZ_LOCALTIME)" ]; then \ - if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) ]; then \ - printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \ - "$(TZDATA_LOCALTIME)"; \ - exit 1; \ - fi; \ - cd $(TARGET_DIR)/etc; \ - ln -sf ../usr/share/zoneinfo/uclibc/$(TZDATA_LOCALTIME) TZ; \ - fi -endef - -$(eval $(generic-package)) diff --git a/package.bak/tzdata/Config.in b/package.bak/tzdata/Config.in deleted file mode 100644 index 1e6cc0fc64..0000000000 --- a/package.bak/tzdata/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -# This package is not meant to be user-visible. -# It gets selected by BR2_TARGET_TZ in system/Config.in - -config BR2_PACKAGE_TZDATA - bool - help - Time zone database - - http://www.iana.org/time-zones/repository/tz-link.html diff --git a/package.bak/tzdata/tzdata.hash b/package.bak/tzdata/tzdata.hash deleted file mode 100644 index b98e579e3c..0000000000 --- a/package.bak/tzdata/tzdata.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html -sha512 ce0b9958b764479fac7df6b5ba0933fc4c6d815ebccc2537c75c4be105691cd58054704eebfb50ca755d7d48504480d4925ce8836eb499ae4798e3d5503d7e0e tzdata2016j.tar.gz diff --git a/package.bak/tzdata/tzdata.mk b/package.bak/tzdata/tzdata.mk deleted file mode 100644 index d6285145e8..0000000000 --- a/package.bak/tzdata/tzdata.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# tzdata -# -################################################################################ - -TZDATA_VERSION = 2016j -TZDATA_SOURCE = tzdata$(TZDATA_VERSION).tar.gz -TZDATA_SITE = http://www.iana.org/time-zones/repository/releases -TZDATA_STRIP_COMPONENTS = 0 -TZDATA_DEPENDENCIES = host-tzdata -HOST_TZDATA_DEPENDENCIES = host-zic -TZDATA_LICENSE = Public domain - -# Take care when re-ordering this list since this might break zone -# dependencies -TZDATA_DEFAULT_ZONELIST = \ - africa antarctica asia australasia europe northamerica \ - southamerica pacificnew etcetera backward systemv factory - -ifeq ($(call qstrip,$(BR2_TARGET_TZ_ZONELIST)),default) -TZDATA_ZONELIST = $(TZDATA_DEFAULT_ZONELIST) -else -TZDATA_ZONELIST = $(call qstrip,$(BR2_TARGET_TZ_ZONELIST)) -endif - -TZDATA_LOCALTIME = $(call qstrip,$(BR2_TARGET_LOCALTIME)) - -# No need to extract for target, we're using the host-installed files -TZDATA_EXTRACT_CMDS = - -define TZDATA_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/share/zoneinfo - cp -a $(HOST_DIR)/usr/share/zoneinfo/* $(TARGET_DIR)/usr/share/zoneinfo - cd $(TARGET_DIR)/usr/share/zoneinfo; \ - for zone in posix/*; do \ - ln -sfn "$${zone}" "$${zone##*/}"; \ - done - if [ -n "$(TZDATA_LOCALTIME)" ]; then \ - if [ ! -f $(TARGET_DIR)/usr/share/zoneinfo/$(TZDATA_LOCALTIME) ]; then \ - printf "Error: '%s' is not a valid timezone, check your BR2_TARGET_LOCALTIME setting\n" \ - "$(TZDATA_LOCALTIME)"; \ - exit 1; \ - fi; \ - cd $(TARGET_DIR)/etc; \ - ln -sf ../usr/share/zoneinfo/$(TZDATA_LOCALTIME) localtime; \ - echo "$(TZDATA_LOCALTIME)" >timezone; \ - fi -endef - -define HOST_TZDATA_BUILD_CMDS - (cd $(@D); \ - for zone in $(TZDATA_ZONELIST); do \ - $(ZIC) -d _output/posix -y yearistype.sh $$zone || exit 1; \ - $(ZIC) -d _output/right -L leapseconds -y yearistype.sh $$zone || exit 1; \ - done; \ - ) -endef - -define HOST_TZDATA_INSTALL_CMDS - $(INSTALL) -d -m 0755 $(HOST_DIR)/usr/share/zoneinfo - cp -a $(@D)/_output/* $(@D)/*.tab $(HOST_DIR)/usr/share/zoneinfo -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/tzdump/tzdump.hash b/package.bak/tzdump/tzdump.hash deleted file mode 100644 index 71114e0bed..0000000000 --- a/package.bak/tzdump/tzdump.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 403f22f9c3007a051f9dbccff48b396b8e04eb1afcc8d779e6b3d9b6d971e1fe tzdump-65a10105564801094b18c3fcacf4dde4c44e4ab8.tar.gz diff --git a/package.bak/tzdump/tzdump.mk b/package.bak/tzdump/tzdump.mk deleted file mode 100644 index 3f035a56cb..0000000000 --- a/package.bak/tzdump/tzdump.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# tzdump -# -################################################################################ - -TZDUMP_VERSION = 65a10105564801094b18c3fcacf4dde4c44e4ab8 -TZDUMP_SITE = $(call github,alexandrebelloni,tzdump,$(TZDUMP_VERSION)) -HOST_TZDUMP_DEPENDENCIES = host-zic - -define HOST_TZDUMP_BUILD_CMDS - cd $(@D) && $(HOSTCC) $(HOST_CFLAGS) $(HOST_LDFLAGS) -o tzdump tzdump.c -endef - -define HOST_TZDUMP_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/tzdump $(HOST_DIR)/usr/sbin/tzdump -endef - -$(eval $(host-generic-package)) - -TZDUMP = $(HOST_DIR)/usr/sbin/tzdump diff --git a/package.bak/uboot-tools/0001-drop-configh-from-tools.patch b/package.bak/uboot-tools/0001-drop-configh-from-tools.patch deleted file mode 100644 index fbc96084db..0000000000 --- a/package.bak/uboot-tools/0001-drop-configh-from-tools.patch +++ /dev/null @@ -1,44 +0,0 @@ -From b742c7590ac6d9ac72dd227679ccff79433b3512 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Tue, 4 Aug 2015 22:13:20 +0200 -Subject: [PATCH] drop configh from tools -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We need to build u-boot tools without a board configuration for the target. -fw_env just uses config.h to define the default environment of the created -image, so it really isn't mandatory. - -Signed-off-by: Gustavo Zacarias -[Jörg Krause: update for version 2015.07] -Signed-off-by: Jörg Krause ---- - tools/env/fw_env.h | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/tools/env/fw_env.h b/tools/env/fw_env.h -index 57149e7..50049fe 100644 ---- a/tools/env/fw_env.h -+++ b/tools/env/fw_env.h -@@ -8,17 +8,6 @@ - #include - #include - --/* Pull in the current config to define the default environment */ --#include -- --#ifndef __ASSEMBLY__ --#define __ASSEMBLY__ /* get only #defines from config.h */ --#include --#undef __ASSEMBLY__ --#else --#include --#endif -- - /* - * To build the utility with the static configuration - * comment out the next line. --- -2.7.4 - diff --git a/package.bak/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch b/package.bak/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch deleted file mode 100644 index c201bf749d..0000000000 --- a/package.bak/uboot-tools/0002-tools-only-in-no-dot-config-targets.patch +++ /dev/null @@ -1,42 +0,0 @@ -From b8110293d70c4f43035dfd6a0904d342be6a08e0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sun, 1 Feb 2015 21:53:47 +0100 -Subject: [PATCH] tools only in no dot config targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Revert upstream commit c7ad5cbb1ef2c33883f0fa7d0455095004fd306d: - - Makefile: drop "tools-only" from no-dot-config-targets - -This indirectly pulls in a build-dependency on libssl-dev used for FIT -image support, and possibly GPL/OpenSSL licensing incompatibility -issues. - -Based on Debian patch from u-boot-tools: -http://ftp.de.debian.org/debian/pool/main/u/u-boot/u-boot_2014.10+dfsg1-2.1.debian.tar.xz - -Signed-off-by: Jörg Krause -[fabio: adapt it to 2016.09] -Signed-off-by: Fabio Estevam ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1cf15ce..75e85eb 100644 ---- a/Makefile -+++ b/Makefile -@@ -425,7 +425,7 @@ timestamp_h := include/generated/timestamp_autogenerated.h - - no-dot-config-targets := clean clobber mrproper distclean \ - help %docs check% coccicheck \ -- ubootversion backup tests -+ ubootversion backup tests tools-only - - config-targets := 0 - mixed-targets := 0 --- -2.7.4 - diff --git a/package.bak/uboot-tools/0003-Make-FIT-support-really-optional.patch b/package.bak/uboot-tools/0003-Make-FIT-support-really-optional.patch deleted file mode 100644 index 8853198b43..0000000000 --- a/package.bak/uboot-tools/0003-Make-FIT-support-really-optional.patch +++ /dev/null @@ -1,96 +0,0 @@ -From d9d7d7cf8b27516d45c66daa1bf0a18c878c4e33 Mon Sep 17 00:00:00 2001 -From: Carlos Santos -Date: Sun, 8 May 2016 11:11:39 -0300 -Subject: [PATCH] Make FIT support really optional - -Due to some mistakes in the source code, it was not possible to really -turn FIT support off. This commit fixes the problem by means of the -following changes: - -- Enclose "bootm_host_load_image" and "bootm_host_load_images" between - checks for CONFIG_FIT_SIGNATURE, in common/bootm.c. - -- Enclose the declaration of "bootm_host_load_images" between checks for - CONFIG_FIT_SIGNATURE, in common/bootm.h. - -- Condition the compilation and linking of fit_common.o fit_image.o - image-host.o common/image-fit.o to CONFIG_FIT=y, in tools/Makefile. - -Signed-off-by: Carlos Santos -[fabio: adapt for 2016.07] -Signed-off-by: Fabio Estevam -[Ricardo: fix conditional compilation and linking of the files mentioned above -for 2016.07] -Signed-off-by: Ricardo Martincoski ---- - common/bootm.c | 2 ++ - include/bootm.h | 2 ++ - tools/Makefile | 6 ++---- - 3 files changed, 6 insertions(+), 4 deletions(-) - -diff --git a/common/bootm.c b/common/bootm.c -index 2431019..7e1adc8 100644 ---- a/common/bootm.c -+++ b/common/bootm.c -@@ -901,6 +901,7 @@ void memmove_wd(void *to, void *from, size_t len, ulong chunksz) - memmove(to, from, len); - } - -+#if defined(CONFIG_FIT_SIGNATURE) - static int bootm_host_load_image(const void *fit, int req_image_type) - { - const char *fit_uname_config = NULL; -@@ -965,5 +966,6 @@ int bootm_host_load_images(const void *fit, int cfg_noffset) - /* Return the first error we found */ - return err; - } -+#endif - - #endif /* ndef USE_HOSTCC */ -diff --git a/include/bootm.h b/include/bootm.h -index 4981377..94d62a1 100644 ---- a/include/bootm.h -+++ b/include/bootm.h -@@ -41,7 +41,9 @@ void lynxkdi_boot(image_header_t *hdr); - - boot_os_fn *bootm_os_get_boot_func(int os); - -+#if defined(CONFIG_FIT_SIGNATURE) - int bootm_host_load_images(const void *fit, int cfg_noffset); -+#endif - - int boot_selected_os(int argc, char * const argv[], int state, - bootm_headers_t *images, boot_os_fn *boot_fn); -diff --git a/tools/Makefile b/tools/Makefile -index f72294a..ccf5120 100644 ---- a/tools/Makefile -+++ b/tools/Makefile -@@ -54,6 +54,7 @@ mkenvimage-objs := mkenvimage.o os_support.o lib/crc32.o - hostprogs-y += dumpimage mkimage - hostprogs-$(CONFIG_FIT_SIGNATURE) += fit_info fit_check_sign - -+FIT_OBJS-$(CONFIG_FIT) := fit_common.o fit_image.o image-host.o common/image-fit.o - FIT_SIG_OBJS-$(CONFIG_FIT_SIGNATURE) := common/image-sig.o - # Flattened device tree objects - LIBFDT_OBJS := $(addprefix lib/libfdt/, \ -@@ -68,16 +69,13 @@ ROCKCHIP_OBS = lib/rc4.o rkcommon.o rkimage.o rksd.o rkspi.o - # common objs for dumpimage and mkimage - dumpimage-mkimage-objs := aisimage.o \ - atmelimage.o \ -+ $(FIT_OBJS-y) \ - $(FIT_SIG_OBJS-y) \ - common/bootm.o \ - lib/crc32.o \ - default_image.o \ - lib/fdtdec_common.o \ - lib/fdtdec.o \ -- fit_common.o \ -- fit_image.o \ -- common/image-fit.o \ -- image-host.o \ - common/image.o \ - imagetool.o \ - imximage.o \ --- -2.9.1 - diff --git a/package.bak/uboot-tools/Config.in b/package.bak/uboot-tools/Config.in deleted file mode 100644 index f55614bac5..0000000000 --- a/package.bak/uboot-tools/Config.in +++ /dev/null @@ -1,87 +0,0 @@ -config BR2_PACKAGE_UBOOT_TOOLS - bool "u-boot tools" - help - Companion tools for Das U-Boot bootloader. - - http://www.denx.de/wiki/U-Boot/WebHome - -if BR2_PACKAGE_UBOOT_TOOLS - -config BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT - bool "Flattened Image Tree (FIT) support" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_DTC - select BR2_PACKAGE_DTC_PROGRAMS - help - Enables support for Flattened Image Tree (FIT). - - This option allows to boot the new uImage structure, - Flattened Image Tree. FIT is formally a FDT, which can include - images of various types (kernel, FDT blob, ramdisk, etc.) - in a single blob. To boot this new uImage structure, - pass the address of the blob to the "bootm" command. - -comment "u-boot tools FIT support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -if BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT - -config BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT - bool "FIT signature verification support" - select BR2_PACKAGE_OPENSSL - help - Enables support for FIT Signature Verification. - - Flat Image Trees (FIT) supports hashing of images so that - these hashes can be checked on loading. This protects - against corruption of the image. However it does not prevent - the substitution of one image for another. - - The signature feature allows the hash to be signed with a - private key such that it can be verified using a public key - later. Provided that the private key is kept secret and the - public key is stored in a non-volatile place, any image can - be verified in this way. - - Enabling this option pulls in a dependency on libssl and - libcrypto, and possibly GPL/OpenSSL licensing - incompatibility issues. - -endif - -config BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE - bool "mkimage" - help - Install the mkimage tool on the target system - - The mkimage tool from Das U-Boot bootloader, which allows - generation of U-Boot images in various formats. - -config BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE - bool "mkenvimage" - help - Install the mkenvimage tool on the target system - - The mkenvimage tool from Das U-Boot bootloader, which allows - generation of a valid binary environment image from a text file - describing the key=value pairs of the environment. - -config BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV - bool "fw_printenv" - default y - help - Install the fw_printenv / fw_setenv tools on the target system - - The fw_printenv and fw_setenv tools from Das U-Boot - bootloader, which allows access to the U-Boot environment - from Linux. - -config BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE - bool "dumpimage" - help - Install the dumpimage tool on the target system - - The dumpimage tool from Das U-Boot bootloader, which allows - extraction of data from U-Boot images. - -endif diff --git a/package.bak/uboot-tools/Config.in.host b/package.bak/uboot-tools/Config.in.host deleted file mode 100644 index 52a4c2ec30..0000000000 --- a/package.bak/uboot-tools/Config.in.host +++ /dev/null @@ -1,42 +0,0 @@ -config BR2_PACKAGE_HOST_UBOOT_TOOLS - bool "host u-boot tools" - help - Companion tools for Das U-Boot bootloader. - - http://www.denx.de/wiki/U-Boot/WebHome - -if BR2_PACKAGE_HOST_UBOOT_TOOLS - -config BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - bool "Flattened Image Tree (FIT) support" - select BR2_PACKAGE_HOST_DTC - help - Enables support for Flattened Image Tree (FIT). - - This option allows to boot the new uImage structure, - Flattened Image Tree. FIT is formally a FDT, which can include - images of various types (kernel, FDT blob, ramdisk, etc.) - in a single blob. To boot this new uImage structure, - pass the address of the blob to the "bootm" command. - -if BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT - -config BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT - bool "FIT signature verification support" - help - Enables support for FIT Signature Verification. - - Flat Image Trees (FIT) supports hashing of images so that - these hashes can be checked on loading. This protects - against corruption of the image. However it does not prevent - the substitution of one image for another. - - The signature feature allows the hash to be signed with a - private key such that it can be verified using a public key - later. Provided that the private key is kept secret and the - public key is stored in a non-volatile place, any image can - be verified in this way. - -endif - -endif diff --git a/package.bak/uboot-tools/uboot-tools.hash b/package.bak/uboot-tools/uboot-tools.hash deleted file mode 100644 index 5473cfeab6..0000000000 --- a/package.bak/uboot-tools/uboot-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 6c425175f93a4bcf2ec9faf5658ef279633dbd7856a293d95bd1ff516528ecf2 u-boot-2017.01.tar.bz2 diff --git a/package.bak/uboot-tools/uboot-tools.mk b/package.bak/uboot-tools/uboot-tools.mk deleted file mode 100644 index fe363e7e78..0000000000 --- a/package.bak/uboot-tools/uboot-tools.mk +++ /dev/null @@ -1,128 +0,0 @@ -################################################################################ -# -# uboot-tools -# -################################################################################ - -UBOOT_TOOLS_VERSION = 2017.01 -UBOOT_TOOLS_SOURCE = u-boot-$(UBOOT_TOOLS_VERSION).tar.bz2 -UBOOT_TOOLS_SITE = ftp://ftp.denx.de/pub/u-boot -UBOOT_TOOLS_LICENSE = GPLv2+ -UBOOT_TOOLS_LICENSE_FILES = Licenses/gpl-2.0.txt -UBOOT_TOOLS_INSTALL_STAGING = YES - -define UBOOT_TOOLS_CONFIGURE_CMDS - mkdir -p $(@D)/include/config - touch $(@D)/include/config/auto.conf -endef - -UBOOT_TOOLS_MAKE_OPTS = CROSS_COMPILE="$(TARGET_CROSS)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - STRIP=$(TARGET_STRIP) - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SUPPORT),y) -UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y -UBOOT_TOOLS_DEPENDENCIES += dtc -endif - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) -UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y -UBOOT_TOOLS_DEPENDENCIES += openssl host-pkgconf -endif - -define UBOOT_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ - CROSS_BUILD_TOOLS=y tools-only - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(UBOOT_TOOLS_MAKE_OPTS) \ - env no-dot-config-targets=env -endef - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKIMAGE),y) -define UBOOT_TOOLS_INSTALL_MKIMAGE - $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(TARGET_DIR)/usr/bin/mkimage -endef -endif - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_MKENVIMAGE),y) -define UBOOT_TOOLS_INSTALL_MKENVIMAGE - $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(TARGET_DIR)/usr/bin/mkenvimage -endef -endif - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_FWPRINTENV),y) -define UBOOT_TOOLS_INSTALL_FWPRINTENV - $(INSTALL) -m 0755 -D $(@D)/tools/env/fw_printenv $(TARGET_DIR)/usr/sbin/fw_printenv - ln -sf fw_printenv $(TARGET_DIR)/usr/sbin/fw_setenv -endef -endif - -ifeq ($(BR2_PACKAGE_UBOOT_TOOLS_DUMPIMAGE),y) -define UBOOT_TOOLS_INSTALL_DUMPIMAGE - $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(TARGET_DIR)/usr/sbin/dumpimage -endef -endif - -define UBOOT_TOOLS_INSTALL_LIBUBOOTENV -endef - -define UBOOT_TOOLS_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 0755 $(@D)/tools/env/lib.a $(STAGING_DIR)/usr/lib/libubootenv.a - $(INSTALL) -D -m 0644 $(@D)/tools/env/fw_env.h $(STAGING_DIR)/usr/include/fw_env.h -endef - -define UBOOT_TOOLS_INSTALL_TARGET_CMDS - $(UBOOT_TOOLS_INSTALL_MKIMAGE) - $(UBOOT_TOOLS_INSTALL_MKENVIMAGE) - $(UBOOT_TOOLS_INSTALL_FWPRINTENV) - $(UBOOT_TOOLS_INSTALL_DUMPIMAGE) -endef - -define HOST_UBOOT_TOOLS_CONFIGURE_CMDS - mkdir -p $(@D)/include/config - touch $(@D)/include/config/auto.conf -endef - -HOST_UBOOT_TOOLS_MAKE_OPTS = HOSTCC="$(HOSTCC)" \ - HOSTCFLAGS="$(HOST_CFLAGS)" \ - HOSTLDFLAGS="$(HOST_LDFLAGS)" - -ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SUPPORT),y) -HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT=y -HOST_UBOOT_TOOLS_DEPENDENCIES += host-dtc -endif - -ifeq ($(BR2_PACKAGE_HOST_UBOOT_TOOLS_FIT_SIGNATURE_SUPPORT),y) -HOST_UBOOT_TOOLS_MAKE_OPTS += CONFIG_FIT_SIGNATURE=y -HOST_UBOOT_TOOLS_DEPENDENCIES += host-openssl -endif - -define HOST_UBOOT_TOOLS_BUILD_CMDS - $(MAKE1) -C $(@D) $(HOST_UBOOT_TOOLS_MAKE_OPTS) tools-only -endef - -define HOST_UBOOT_TOOLS_INSTALL_CMDS - $(INSTALL) -m 0755 -D $(@D)/tools/mkimage $(HOST_DIR)/usr/bin/mkimage - $(INSTALL) -m 0755 -D $(@D)/tools/mkenvimage $(HOST_DIR)/usr/bin/mkenvimage - $(INSTALL) -m 0755 -D $(@D)/tools/dumpimage $(HOST_DIR)/usr/bin/dumpimage -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) - -# Convenience variables for other mk files that make use of mkimage - -MKIMAGE = $(HOST_DIR)/usr/bin/mkimage - -# mkimage supports arm blackfin m68k microblaze mips mips64 nios2 powerpc ppc sh sparc sparc64 x86 -# KERNEL_ARCH can be arm64 arc arm blackfin m68k microblaze mips nios2 powerpc sh sparc i386 x86_64 xtensa -# For arm64, arc, xtensa we'll just keep KERNEL_ARCH -# For mips64, we'll just keep mips -# For i386 and x86_64, we need to convert -ifeq ($(KERNEL_ARCH),x86_64) -MKIMAGE_ARCH = x86 -else ifeq ($(KERNEL_ARCH),i386) -MKIMAGE_ARCH = x86 -else -MKIMAGE_ARCH = $(KERNEL_ARCH) -endif diff --git a/package.bak/ubus/0001-Install-server-and-client-examples.patch b/package.bak/ubus/0001-Install-server-and-client-examples.patch deleted file mode 100644 index 0ee4d3e64f..0000000000 --- a/package.bak/ubus/0001-Install-server-and-client-examples.patch +++ /dev/null @@ -1,23 +0,0 @@ -Install server and client examples - -Signed-off-by: Sergio Prado ---- - examples/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt -index 0279f6e66b50..2f8f4e026e20 100644 ---- a/examples/CMakeLists.txt -+++ b/examples/CMakeLists.txt -@@ -9,4 +9,8 @@ IF (BUILD_EXAMPLES) - - ADD_EXECUTABLE(client client.c count.c) - TARGET_LINK_LIBRARIES(client ubus ubox) -+ -+ INSTALL(TARGETS server client -+ RUNTIME DESTINATION sbin -+ ) - ENDIF() --- -1.9.1 - diff --git a/package.bak/ubus/Config.in b/package.bak/ubus/Config.in deleted file mode 100644 index c14f6a86e7..0000000000 --- a/package.bak/ubus/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -comment "ubus needs a toolchain w/ dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_UBUS - bool "ubus" - select BR2_PACKAGE_LIBUBOX - select BR2_PACKAGE_JSON_C - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on !BR2_STATIC_LIBS # libubox - help - IPC/RPC bus that allows communication between processes. - - It consists of few parts including a daemon (ubusd), a library - (libubus) and a command line interface (ubus). Although created - for the OpenWRT project, it can be used as a general IPC/RPC - mechanism in other projects. - - * Select BR2_PACKAGE_LUA_5_1 if you want to have Lua support. - - https://wiki.openwrt.org/doc/techref/ubus - -if BR2_PACKAGE_UBUS - -config BR2_PACKAGE_UBUS_EXAMPLES - bool "build and install ubus examples" - help - Build and install client and server ubus examples. - -endif diff --git a/package.bak/ubus/ubus.hash b/package.bak/ubus/ubus.hash deleted file mode 100644 index af9b652b0e..0000000000 --- a/package.bak/ubus/ubus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# No hash for this git snapshot -none xxx ubus-259450f414d8c9ee41896e8e6d6bc57ec00e2b63.tar.gz diff --git a/package.bak/ubus/ubus.mk b/package.bak/ubus/ubus.mk deleted file mode 100644 index cd66b868df..0000000000 --- a/package.bak/ubus/ubus.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# ubus -# -################################################################################ - -UBUS_VERSION = 259450f414d8c9ee41896e8e6d6bc57ec00e2b63 -UBUS_SITE = git://git.openwrt.org/project/ubus.git - -UBUS_LICENSE = LGPLv2.1 -UBUS_LICENSE_FILES = ubusd_acl.h - -UBUS_INSTALL_STAGING = YES - -UBUS_DEPENDENCIES = json-c libubox - -# package only compiles with Lua 5.1 -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -UBUS_DEPENDENCIES += lua -UBUS_CONF_OPTS += -DBUILD_LUA=ON \ - -DLUA_CFLAGS=-I$(STAGING_DIR)/usr/include \ - -DLUAPATH=/usr/lib/lua/$(LUAINTERPRETER_ABIVER) -else -UBUS_CONF_OPTS += -DBUILD_LUA=OFF -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -UBUS_DEPENDENCIES += systemd -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=ON -else -UBUS_CONF_OPTS += -DENABLE_SYSTEMD=OFF -endif - -ifeq ($(BR2_PACKAGE_UBUS_EXAMPLES),y) -UBUS_CONF_OPTS += -DBUILD_EXAMPLES=ON -else -UBUS_CONF_OPTS += -DBUILD_EXAMPLES=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/ucl/ucl.hash b/package.bak/ucl/ucl.hash deleted file mode 100644 index 6b1f41ed10..0000000000 --- a/package.bak/ucl/ucl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b865299ffd45d73412293369c9754b07637680e5c826915f097577cd27350348 ucl-1.03.tar.gz diff --git a/package.bak/ucl/ucl.mk b/package.bak/ucl/ucl.mk deleted file mode 100644 index b183a13b26..0000000000 --- a/package.bak/ucl/ucl.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# ucl -# -################################################################################ - -UCL_VERSION = 1.03 -UCL_SITE = http://www.oberhumer.com/opensource/ucl/download -UCL_LICENSE = GPLv2+ -UCL_LICENSE_FILES = COPYING - -# Fix ACC conformance test failure for host gcc 6.x -HOST_UCL_CONF_ENV += CPPFLAGS="$(HOST_CPPFLAGS) -std=iso9899:1990" - -$(eval $(host-autotools-package)) diff --git a/package.bak/uclibc-ng-test/Config.in b/package.bak/uclibc-ng-test/Config.in deleted file mode 100644 index 0f093d1d50..0000000000 --- a/package.bak/uclibc-ng-test/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_UCLIBC_NG_TEST - bool "uclibc-ng-test" - help - Enabling this option will compile and install the uClibc-ng - test suite. This is useful if you want to check if the - uClibc-ng library is working for your architecture and/or - help developing uClibc-ng. - - The test suite will be installed into - /usr/lib/uclibc-ng-test directory. To run the test suite - enter the /usr/lib/uclibc-ng-test/test directory and type - "sh uclibcng-testrunner.sh". - - See the /usr/lib/uclibc-ng-test/test/README for additional - information. - - This is not needed at all for normal builds, so you can - safely say no if you do not plan to dig into your C library. - - The tests can also be used for GNU libc or musl. - - http://www.uclibc-ng.org diff --git a/package.bak/uclibc-ng-test/uclibc-ng-test.mk b/package.bak/uclibc-ng-test/uclibc-ng-test.mk deleted file mode 100644 index 610ca010fb..0000000000 --- a/package.bak/uclibc-ng-test/uclibc-ng-test.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# uclibc-ng-test -# -################################################################################ - -UCLIBC_NG_TEST_VERSION = c9b9876cefc142a23aa622b821290ed16af80058 -UCLIBC_NG_TEST_SITE = git://uclibc-ng.org/git/uclibc-ng-test -UCLIBC_NG_TEST_LICENSE = LGPLv2.1+ -UCLIBC_NG_TEST_LICENSE_FILES = COPYING.LIB - -# the math tests are recently synced from glibc and need more adaption before -# regular testing is possible -UCLIBC_NG_TEST_MAKE_ENV += NO_MATH=1 - -# locale tests are not compatible with musl, yet -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -UCLIBC_NG_TEST_MAKE_ENV += NO_LOCALE=1 -endif -ifeq ($(BR2_USE_WCHAR),) -UCLIBC_NG_TEST_MAKE_ENV += NO_WCHAR=1 -endif -ifeq ($(BR2_ENABLE_LOCALE),) -UCLIBC_NG_TEST_MAKE_ENV += NO_LOCALE=1 -endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_THREADS=1 -endif -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS_NPTL),) -UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 -endif -# most NPTL/TLS tests use dlopen -ifeq ($(BR2_STATIC_LIBS),y) -UCLIBC_NG_TEST_MAKE_ENV += NO_TLS=1 NO_NPTL=1 NO_DL=1 -endif - -# to execute tests in a deterministic order, call test_gen separately -define UCLIBC_NG_TEST_BUILD_CMDS - $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - UCLIBC_EXTRA_LDFLAGS="$(TARGET_LDFLAGS)" \ - test_compile - $(TARGET_MAKE_ENV) $(UCLIBC_NG_TEST_MAKE_ENV) $(MAKE1) -C $(@D) \ - CC="$(TARGET_CC)" \ - UCLIBC_EXTRA_CFLAGS="$(TARGET_CFLAGS)" \ - test_gen -endef - -define UCLIBC_NG_TEST_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(generic-package)) diff --git a/package.bak/uclibc/0001-fstat-make-new-code-aarch64-specific.patch b/package.bak/uclibc/0001-fstat-make-new-code-aarch64-specific.patch deleted file mode 100644 index eb0198d44d..0000000000 --- a/package.bak/uclibc/0001-fstat-make-new-code-aarch64-specific.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 71127e5cc937878883e6021da3da337a7aa9c099 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 3 Feb 2017 06:04:16 +0100 -Subject: [PATCH 10229/10229] fstat: make new code aarch64 specific - -The new code get's used by MIPS64 N64 and fails. -Make the new code aarch64 specific. - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/common/fstat.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c -index ac77eb2..c27f926 100644 ---- a/libc/sysdeps/linux/common/fstat.c -+++ b/libc/sysdeps/linux/common/fstat.c -@@ -21,7 +21,7 @@ int fstat(int fd, struct stat *buf) - } - libc_hidden_def(fstat) - --#elif __WORDSIZE == 64 && defined __NR_newfstatat -+#elif __WORDSIZE == 64 && defined __NR_newfstatat && __aarch64__ - #include - - int fstat(int fd, struct stat *buf) --- -2.1.4 - diff --git a/package.bak/uclibc/0002-arm-fix-static-linking-issues.patch b/package.bak/uclibc/0002-arm-fix-static-linking-issues.patch deleted file mode 100644 index 5480b0dca7..0000000000 --- a/package.bak/uclibc/0002-arm-fix-static-linking-issues.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 94810a91c48ac62daed55b4aec70d04a44c10795 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Thu, 16 Feb 2017 20:22:21 +0100 -Subject: [PATCH] arm: fix static linking issues - -As reported by Buildroot developers these files causing static -linking issues. The original contribution with the ARM unwind-resume -rework and GNU libc sync was made before the combined libc change. -But the patch was applied later, after the libc change and -it seems the test coverage for static linking didn't catch it in -the regression testing. Remove the files. - -Signed-off-by: Waldemar Brodkorb ---- - libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c | 2 -- - libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c | 1 - - 2 files changed, 3 deletions(-) - delete mode 100644 libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c - delete mode 100644 libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c - -diff --git a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c -deleted file mode 100644 -index fd0cec4..0000000 ---- a/libpthread/nptl/sysdeps/arm/pt-arm-unwind-resume.c -+++ /dev/null -@@ -1,2 +0,0 @@ --__asm__ (".set __libgcc_s_init, pthread_cancel_init"); --#include -diff --git a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c b/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c -deleted file mode 100644 -index 2641dc5..0000000 ---- a/libpthread/nptl/sysdeps/arm/rt-arm-unwind-resume.c -+++ /dev/null -@@ -1 +0,0 @@ --#include --- -2.1.4 - diff --git a/package.bak/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch b/package.bak/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch deleted file mode 100644 index 7c6022818d..0000000000 --- a/package.bak/uclibc/0003-or1k-add-missing-definition-of-ucontext.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 228d03bf0032e5799e9bf04810170c0653ca846d Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 17 Feb 2017 22:33:49 +0100 -Subject: [PATCH] or1k: add missing definition of ucontext - -Signed-off-by: Waldemar Brodkorb ---- - libc/sysdeps/linux/or1k/sys/ucontext.h | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/libc/sysdeps/linux/or1k/sys/ucontext.h b/libc/sysdeps/linux/or1k/sys/ucontext.h -index b11928e..dd97b60 100644 ---- a/libc/sysdeps/linux/or1k/sys/ucontext.h -+++ b/libc/sysdeps/linux/or1k/sys/ucontext.h -@@ -20,6 +20,14 @@ - - #include - #include --#include -+#include -+ -+typedef struct ucontext { -+ unsigned long uc_flags; -+ struct ucontext *uc_link; -+ stack_t uc_stack; -+ struct sigcontext uc_mcontext; -+ sigset_t uc_sigmask; /* mask last for extensibility */ -+} ucontext_t; - - #endif /* sys/ucontext.h */ --- -2.1.4 - diff --git a/package.bak/uclibc/Config.in b/package.bak/uclibc/Config.in deleted file mode 100644 index 0628af309b..0000000000 --- a/package.bak/uclibc/Config.in +++ /dev/null @@ -1,167 +0,0 @@ -if BR2_TOOLCHAIN_BUILDROOT_UCLIBC - -comment "uClibc Options" - -config BR2_PACKAGE_UCLIBC - bool - default y - select BR2_PACKAGE_LINUX_HEADERS - -config BR2_UCLIBC_CONFIG - string "uClibc configuration file to use?" - default "package/uclibc/uClibc-ng.config" - help - Some people may wish to use their own modified uClibc configuration - file and will specify their config file location with this option. - See also docs/README in this package. - If unsure, use the default. - -config BR2_UCLIBC_CONFIG_FRAGMENT_FILES - string "Additional uClibc configuration fragment files" - help - A space-separated list of configuration fragment files, - that will be merged to the main uClibc configuration file. - -config BR2_TOOLCHAIN_BUILDROOT_INET_RPC - bool "Enable RPC support" - select BR2_TOOLCHAIN_HAS_NATIVE_RPC - help - Enable this option if you want your toolchain to support - RPC (needed for NFS, for example). - -config BR2_TOOLCHAIN_BUILDROOT_WCHAR - bool "Enable WCHAR support" - select BR2_USE_WCHAR - help - Enable this option if you want your toolchain to support - wide characters (i.e characters longer than 8 bits, needed - for locale support). - -config BR2_TOOLCHAIN_BUILDROOT_LOCALE - bool "Enable toolchain locale/i18n support" - select BR2_TOOLCHAIN_BUILDROOT_WCHAR - select BR2_ENABLE_LOCALE - select BR2_NEEDS_HOST_UTF8_LOCALE - help - Enable this option if you want your toolchain to support - localization and internationalization. - -choice - prompt "Thread library implementation" - help - Use this option to select the thread library implementation - that should be used in your toolchain. - - config BR2_PTHREADS_NATIVE - bool "Native POSIX Threading (NPTL)" - select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on BR2_USE_MMU - depends on !BR2_m68k && !BR2_microblaze && !BR2_or1k - - config BR2_PTHREADS - bool "linuxthreads" - select BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_bfin || BR2_m68k || BR2_microblaze || BR2_or1k || BR2_arm || BR2_armeb || BR2_xtensa - - config BR2_PTHREADS_NONE - bool "none" - -endchoice - -config BR2_PTHREAD_DEBUG - bool "Thread library debugging" - depends on BR2_PTHREADS || BR2_PTHREADS_NATIVE - select BR2_TOOLCHAIN_HAS_THREADS_DEBUG - help - Build the thread library with debugging enabled. - -config BR2_TOOLCHAIN_BUILDROOT_USE_SSP - bool "Enable stack protection support" - select BR2_TOOLCHAIN_HAS_SSP - help - Enable stack smashing protection support using GCCs - -fstack-protector-all option in uClibc. - - See http://www.linuxfromscratch.org/hints/downloads/files/ssp.txt - for details. - -config BR2_UCLIBC_INSTALL_UTILS - bool "Compile and install uClibc utilities" - default y - help - Enabling this option will compile and install the getconf, - ldconfig and ldd uClibc utilities for the target. - - You can save ~32 KiB in target space by disabling them since - they're normally not needed. - -# Mapping from the Buildroot architecture configuration options to the -# uClibc architecture names. -config BR2_UCLIBC_TARGET_ARCH - string - default "arc" if BR2_arcle || BR2_arceb - default "arm" if BR2_arm || BR2_armeb - default "bfin" if BR2_bfin - default "m68k" if BR2_m68k - default "microblaze" if BR2_microblaze - default "mips" if BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el - default "or1k" if BR2_or1k - default "powerpc" if BR2_powerpc - default "sh" if BR2_sh - default "sparc" if BR2_sparc - default "xtensa" if BR2_xtensa - default "i386" if BR2_i386 - default "x86_64" if BR2_x86_64 - -config BR2_UCLIBC_ARC_TYPE - string - depends on BR2_UCLIBC_TARGET_ARCH = "arc" - default "ARC_CPU_700" if BR2_arc750d - default "ARC_CPU_700" if BR2_arc770d - default "ARC_CPU_HS" if BR2_archs38 - -config BR2_UCLIBC_MIPS_ABI - string - depends on BR2_UCLIBC_TARGET_ARCH = "mips" - default "O32" if BR2_MIPS_OABI32 - default "N32" if BR2_MIPS_NABI32 - default "N64" if BR2_MIPS_NABI64 - -config BR2_UCLIBC_MIPS_NAN - string - depends on BR2_UCLIBC_TARGET_ARCH = "mips" - default "LEGACY" if BR2_MIPS_CPU_MIPS32 || BR2_MIPS_CPU_MIPS64 - default "2008" if BR2_MIPS_CPU_MIPS32R6 || BR2_MIPS_CPU_MIPS64R6 - -config BR2_UCLIBC_SH_TYPE - string - depends on BR2_UCLIBC_TARGET_ARCH = "sh" - default "SH2A" if BR2_sh2a - default "SH4" if BR2_sh4 || BR2_sh4eb - -config BR2_UCLIBC_SPARC_TYPE - string - depends on BR2_UCLIBC_TARGET_ARCH = "sparc" - default "V7" if BR2_sparc_v7 || BR2_sparc_sparchfleon || BR2_sparc_sparcsfleon - default "V8" if BR2_sparc_v8 || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleonv8 - -config BR2_UCLIBC_POWERPC_TYPE - string - depends on BR2_UCLIBC_TARGET_ARCH = "powerpc" - default "CLASSIC" if !BR2_powerpc_8540 && !BR2_powerpc_8548 - default "E500" if BR2_powerpc_8540 || BR2_powerpc_8548 - -config BR2_UCLIBC_X86_TYPE - string - depends on BR2_UCLIBC_TARGET_ARCH = "i386" - default "486" if BR2_x86_i486 - default "586" if BR2_x86_i586 - default "586MMX" if BR2_x86_pentium_mmx - default "686" if BR2_x86_i686 || BR2_x86_pentiumpro - default "PENTIUMII" if BR2_x86_pentium2 - default "PENTIUMIII" if BR2_x86_pentium3 - default "PENTIUM4" if BR2_x86_pentium4 || BR2_x86_pentium_m || \ - BR2_x86_nocona || BR2_x86_core2 || BR2_x86_corei7 - -endif # BR2_TOOLCHAIN_BUILDROOT_UCLIBC diff --git a/package.bak/uclibc/uClibc-ng.config b/package.bak/uclibc/uClibc-ng.config deleted file mode 100644 index 528bce9657..0000000000 --- a/package.bak/uclibc/uClibc-ng.config +++ /dev/null @@ -1,42 +0,0 @@ -DO_C99_MATH=y -DO_XSI_MATH=y -KERNEL_HEADERS="/usr/src/linux/include" -# LDSO_CACHE_SUPPORT is not set -# UCLIBC_STATIC_LDCONFIG is not set -LDSO_RUNPATH=y -LDSO_RUNPATH_OF_EXECUTABLE=y -UCLIBC_HAS_UTMPX=y -UCLIBC_HAS_UTMP=y -UCLIBC_SUSV2_LEGACY=y -UCLIBC_SUSV3_LEGACY=y -UCLIBC_HAS_CONTEXT_FUNCS=y -UCLIBC_SUSV4_LEGACY=y -UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y -UCLIBC_HAS_GETPT=y -UCLIBC_HAS_LIBUTIL=y -UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y -UCLIBC_HAS_SHA256_CRYPT_IMPL=y -UCLIBC_HAS_SHA512_CRYPT_IMPL=y -UCLIBC_USE_NETLINK=y -UCLIBC_SUPPORT_AI_ADDRCONFIG=y -UCLIBC_HAS_RESOLVER_SUPPORT=y -UCLIBC_HAS_LIBRESOLV_STUB=y -UCLIBC_HAS_LIBNSL_STUB=y -UCLIBC_HAS_CTYPE_CHECKED=y -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -# UCLIBC_HAS_REGEX_OLD is not set -# UCLIBC_HAS_FNMATCH_OLD is not set -UCLIBC_HAS_NFTW=y -UCLIBC_HAS_FTW=y -UCLIBC_HAS_GNU_GLOB=y -RUNTIME_PREFIX="/" -DEVEL_PREFIX="/usr/" -UCLIBC_HAS_SSP=y -UCLIBC_BUILD_NOW=y -# DOSTRIP is not set diff --git a/package.bak/uclibc/uclibc.hash b/package.bak/uclibc/uclibc.hash deleted file mode 100644 index d2fbd0aef4..0000000000 --- a/package.bak/uclibc/uclibc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.uclibc-ng.org/ -sha256 f2004c85db8e07e9f1c2e8b7c513fa7c237bc9f9685d8e1bfc89535b8a85449b uClibc-ng-1.0.22.tar.xz diff --git a/package.bak/uclibc/uclibc.mk b/package.bak/uclibc/uclibc.mk deleted file mode 100644 index 8f6035ec2f..0000000000 --- a/package.bak/uclibc/uclibc.mk +++ /dev/null @@ -1,497 +0,0 @@ -################################################################################ -# -# uclibc -# -################################################################################ - -UCLIBC_VERSION = 1.0.22 -UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz -UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION) -UCLIBC_LICENSE = LGPLv2.1+ -UCLIBC_LICENSE_FILES = COPYING.LIB -UCLIBC_INSTALL_STAGING = YES - -define UCLIBC_HELP_CMDS - @echo ' uclibc-menuconfig - Run uClibc menuconfig' -endef - -# uclibc is part of the toolchain so disable the toolchain dependency -UCLIBC_ADD_TOOLCHAIN_DEPENDENCY = NO - -# Before uClibc is configured, we must have the first stage -# cross-compiler and the kernel headers -UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers - -# specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config -# setting. -ifndef UCLIBC_CONFIG_FILE -UCLIBC_CONFIG_FILE = $(call qstrip,$(BR2_UCLIBC_CONFIG)) -endif - -UCLIBC_KCONFIG_FILE = $(UCLIBC_CONFIG_FILE) -UCLIBC_KCONFIG_FRAGMENT_FILES = $(call qstrip,$(BR2_UCLIBC_CONFIG_FRAGMENT_FILES)) - -UCLIBC_KCONFIG_OPTS = \ - $(UCLIBC_MAKE_FLAGS) \ - PREFIX=$(STAGING_DIR) \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=$(STAGING_DIR)/ \ - -UCLIBC_TARGET_ARCH = $(call qstrip,$(BR2_UCLIBC_TARGET_ARCH)) - -UCLIBC_GENERATE_LOCALES = $(call qstrip,$(BR2_GENERATE_LOCALE)) - -ifeq ($(UCLIBC_GENERATE_LOCALES),) -# We need at least one locale -UCLIBC_LOCALES = en_US -else -# Strip out the encoding part of locale names, if any -UCLIBC_LOCALES = \ - $(foreach locale,$(UCLIBC_GENERATE_LOCALES),\ - $(firstword $(subst .,$(space),$(locale)))) -endif - -# noMMU binary formats -ifeq ($(BR2_BINFMT_FDPIC),y) -define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) -endef -endif -ifeq ($(BR2_BINFMT_FLAT_ONE),y) -define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) -endef -endif -ifeq ($(BR2_BINFMT_FLAT_SEP_DATA),y) -define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) -endef -endif -ifeq ($(BR2_BINFMT_FLAT_SHARED),y) -define UCLIBC_BINFMT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FLAT_SEP_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_FORMAT_SHARED_FLAT,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_FORMAT_FDPIC_ELF,$(@D)/.config) -endef -endif - -# -# ARC definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),arc) -UCLIBC_ARC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_ARC_TYPE)) -define UCLIBC_ARC_TYPE_CONFIG - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_TYPE),$(@D)/.config) -endef - -UCLIBC_ARC_PAGE_SIZE = CONFIG_ARC_PAGE_SIZE_$(call qstrip,$(BR2_ARC_PAGE_SIZE)) -define UCLIBC_ARC_PAGE_SIZE_CONFIG - $(SED) '/CONFIG_ARC_PAGE_SIZE_*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_ARC_PAGE_SIZE),$(@D)/.config) -endef - -endif # arc - -# -# ARM definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),arm) -define UCLIBC_ARM_ABI_CONFIG - $(SED) '/CONFIG_ARM_.ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,CONFIG_ARM_EABI,$(@D)/.config) -endef - -# Thumb1 build is broken with threads with old gcc versions (< 4.8). Since -# all cores supporting Thumb1 also support ARM, we use ARM code in this case. -ifeq ($(BR2_GCC_VERSION_4_8_X)$(BR2_ARM_INSTRUCTIONS_THUMB)$(BR2_TOOLCHAIN_HAS_THREADS),yyy) -UCLIBC_EXTRA_CFLAGS += -marm -endif - -ifeq ($(BR2_BINFMT_FLAT),y) -define UCLIBC_ARM_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) -endef -endif - -# context functions are written with ARM instructions. Therefore, if -# we are using a Thumb2-only platform (i.e, Cortex-M), they must be -# disabled. Thumb1 platforms are not a problem, since they all also -# support the ARM instructions. -ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB2):$(BR2_ARM_CPU_HAS_ARM),y:) -define UCLIBC_ARM_NO_CONTEXT_FUNCS - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_CONTEXT_FUNCS,$(@D)/.config) -endef -endif - -endif # arm - -# -# m68k/coldfire definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),m68k) - -# disable DOPIC for flat without separate data -ifeq ($(BR2_BINFMT_FLAT_ONE),y) -define UCLIBC_M68K_BINFMT_FLAT - $(call KCONFIG_DISABLE_OPT,DOPIC,$(@D)/.config) -endef -endif - -endif # m68k/coldfire - -# -# MIPS definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),mips) -UCLIBC_MIPS_ABI = CONFIG_MIPS_$(call qstrip,$(BR2_UCLIBC_MIPS_ABI))_ABI -define UCLIBC_MIPS_ABI_CONFIG - $(SED) '/CONFIG_MIPS_[NO].._ABI/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_ABI),$(@D)/.config) -endef - -UCLIBC_MIPS_NAN = CONFIG_MIPS_NAN_$(call qstrip,$(BR2_UCLIBC_MIPS_NAN)) -define UCLIBC_MIPS_NAN_CONFIG - $(SED) '/CONFIG_MIPS_NAN_.*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_MIPS_NAN),$(@D)/.config) -endef -endif # mips - -# -# SH definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),sh) -UCLIBC_SH_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_SH_TYPE)) -define UCLIBC_SH_TYPE_CONFIG - $(SED) '/CONFIG_SH[234A]*/d' $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SH_TYPE),$(@D)/.config) -endef -endif # sh - -# -# SPARC definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),sparc) -UCLIBC_SPARC_TYPE = CONFIG_SPARC_$(call qstrip,$(BR2_UCLIBC_SPARC_TYPE)) -define UCLIBC_SPARC_TYPE_CONFIG - $(SED) 's/^\(CONFIG_[^_]*[_]*SPARC[^=]*\)=.*/# \1 is not set/g' \ - $(@D)/.config - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_SPARC_TYPE),$(@D)/.config) -endef -endif # sparc - -# -# PowerPC definitions -# - -ifeq ($(UCLIBC_TARGET_ARCH),powerpc) -UCLIBC_POWERPC_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_POWERPC_TYPE)) -define UCLIBC_POWERPC_TYPE_CONFIG - $(call KCONFIG_DISABLE_OPT,CONFIG_GENERIC,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,CONFIG_E500,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_POWERPC_TYPE),$(@D)/.config) -endef -endif # powerpc - -# -# x86 definitions -# -ifeq ($(UCLIBC_TARGET_ARCH),i386) -UCLIBC_X86_TYPE = CONFIG_$(call qstrip,$(BR2_UCLIBC_X86_TYPE)) -define UCLIBC_X86_TYPE_CONFIG - $(call KCONFIG_ENABLE_OPT,$(UCLIBC_X86_TYPE),$(@D)/.config) -endef -endif - -# -# Debug -# -ifeq ($(BR2_ENABLE_DEBUG),y) -define UCLIBC_DEBUG_CONFIG - $(call KCONFIG_ENABLE_OPT,DODEBUG,$(@D)/.config) -endef -endif - -# -# Endianness -# - -ifeq ($(call qstrip,$(BR2_ENDIAN)),BIG) -define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) -endef -else -define UCLIBC_ENDIAN_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,ARCH_WANTS_LITTLE_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_BIG_ENDIAN,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,ARCH_WANTS_BIG_ENDIAN,$(@D)/.config) -endef -endif - -# -# MMU -# - -ifeq ($(BR2_USE_MMU),y) -define UCLIBC_MMU_CONFIG - $(call KCONFIG_ENABLE_OPT,ARCH_USE_MMU,$(@D)/.config) -endef -else -define UCLIBC_MMU_CONFIG - $(call KCONFIG_DISABLE_OPT,ARCH_USE_MMU,$(@D)/.config) -endef -endif - -# -# IPv6 -# - -UCLIBC_IPV6_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_IPV6,$(@D)/.config) - -# -# RPC -# - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_INET_RPC),y) -define UCLIBC_RPC_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config) -endef -else -define UCLIBC_RPC_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_RPC,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FULL_RPC,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_REENTRANT_RPC,$(@D)/.config) -endef -endif - -# -# soft-float -# - -ifeq ($(BR2_SOFT_FLOAT),y) -define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,DO_C99_MATH,$(@D)/.config) -endef -else -define UCLIBC_FLOAT_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FPU,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_FLOATS,$(@D)/.config) -endef -endif - -# -# SSP -# -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_USE_SSP),y) -define UCLIBC_SSP_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) -endef -else -define UCLIBC_SSP_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_SSP,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_SSP,$(@D)/.config) -endef -endif - -# -# Threads -# -ifeq ($(BR2_PTHREADS_NONE),y) -define UCLIBC_THREAD_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) -endef -else ifeq ($(BR2_PTHREADS),y) -define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) -endef -else ifeq ($(BR2_PTHREADS_NATIVE),y) -define UCLIBC_THREAD_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LINUXTHREADS,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_THREADS_NATIVE,$(@D)/.config) -endef -endif - -# -# Thread debug -# - -ifeq ($(BR2_PTHREAD_DEBUG),y) -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_ENABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) -else -UCLIBC_THREAD_DEBUG_CONFIG = $(call KCONFIG_DISABLE_OPT,PTHREADS_DEBUG_SUPPORT,$(@D)/.config) -endif - -# -# Locale -# - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_LOCALE),y) -define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_BUILD_ALL_LOCALE,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_BUILD_MINIMAL_LOCALE,$(@D)/.config) - $(call KCONFIG_SET_OPT,UCLIBC_BUILD_MINIMAL_LOCALES,"$(UCLIBC_LOCALES)",$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,DOWNLOAD_PREGENERATED_LOCALE_DATA,$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_XLOCALE,$(@D)/.config) - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_GLIBC_DIGIT_GROUPING,$(@D)/.config) -endef -else -define UCLIBC_LOCALE_CONFIG - $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_LOCALE,$(@D)/.config) -endef -endif - -# -# wchar -# - -ifeq ($(BR2_TOOLCHAIN_BUILDROOT_WCHAR),y) -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_ENABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) -else -UCLIBC_WCHAR_CONFIG = $(call KCONFIG_DISABLE_OPT,UCLIBC_HAS_WCHAR,$(@D)/.config) -endif - -# -# static/shared libs -# - -ifeq ($(BR2_STATIC_LIBS),y) -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_DISABLE_OPT,HAVE_SHARED,$(@D)/.config) -else -UCLIBC_SHARED_LIBS_CONFIG = $(call KCONFIG_ENABLE_OPT,HAVE_SHARED,$(@D)/.config) -endif - -# -# Commands -# - -UCLIBC_MAKE_FLAGS = \ - ARCH="$(UCLIBC_TARGET_ARCH)" \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - UCLIBC_EXTRA_CFLAGS="$(UCLIBC_EXTRA_CFLAGS) $(TARGET_ABI)" \ - HOSTCC="$(HOSTCC)" - -define UCLIBC_KCONFIG_FIXUP_CMDS - $(call KCONFIG_SET_OPT,CROSS_COMPILER_PREFIX,"$(TARGET_CROSS)",$(@D)/.config) - $(call KCONFIG_ENABLE_OPT,TARGET_$(UCLIBC_TARGET_ARCH),$(@D)/.config) - $(call KCONFIG_SET_OPT,TARGET_ARCH,"$(UCLIBC_TARGET_ARCH)",$(@D)/.config) - $(call KCONFIG_SET_OPT,KERNEL_HEADERS,"$(LINUX_HEADERS_DIR)/usr/include",$(@D)/.config) - $(call KCONFIG_SET_OPT,RUNTIME_PREFIX,"/",$(@D)/.config) - $(call KCONFIG_SET_OPT,DEVEL_PREFIX,"/usr",$(@D)/.config) - $(call KCONFIG_SET_OPT,SHARED_LIB_LOADER_PREFIX,"/lib",$(@D)/.config) - $(UCLIBC_MMU_CONFIG) - $(UCLIBC_BINFMT_CONFIG) - $(UCLIBC_ARC_TYPE_CONFIG) - $(UCLIBC_ARC_PAGE_SIZE_CONFIG) - $(UCLIBC_ARM_ABI_CONFIG) - $(UCLIBC_ARM_BINFMT_FLAT) - $(UCLIBC_ARM_NO_CONTEXT_FUNCS) - $(UCLIBC_M68K_BINFMT_FLAT) - $(UCLIBC_MIPS_ABI_CONFIG) - $(UCLIBC_MIPS_NAN_CONFIG) - $(UCLIBC_SH_TYPE_CONFIG) - $(UCLIBC_SPARC_TYPE_CONFIG) - $(UCLIBC_POWERPC_TYPE_CONFIG) - $(UCLIBC_X86_TYPE_CONFIG) - $(UCLIBC_DEBUG_CONFIG) - $(UCLIBC_ENDIAN_CONFIG) - $(UCLIBC_LARGEFILE_CONFIG) - $(UCLIBC_IPV6_CONFIG) - $(UCLIBC_RPC_CONFIG) - $(UCLIBC_FLOAT_CONFIG) - $(UCLIBC_SSP_CONFIG) - $(UCLIBC_THREAD_CONFIG) - $(UCLIBC_THREAD_DEBUG_CONFIG) - $(UCLIBC_LOCALE_CONFIG) - $(UCLIBC_WCHAR_CONFIG) - $(UCLIBC_SHARED_LIBS_CONFIG) -endef - -define UCLIBC_BUILD_CMDS - $(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) headers - $(MAKE) -C $(@D) $(UCLIBC_MAKE_FLAGS) - $(MAKE) -C $(@D)/utils \ - PREFIX=$(HOST_DIR) \ - HOSTCC="$(HOSTCC)" hostutils -endef - -ifeq ($(BR2_UCLIBC_INSTALL_UTILS),y) -define UCLIBC_INSTALL_UTILS_TARGET - $(MAKE1) -C $(@D) \ - CC="$(TARGET_CC)" CPP="$(TARGET_CPP)" LD="$(TARGET_LD)" \ - ARCH="$(UCLIBC_TARGET_ARCH)" \ - PREFIX=$(TARGET_DIR) \ - utils install_utils -endef -endif - -define UCLIBC_INSTALL_TARGET_CMDS - $(MAKE1) -C $(@D) \ - $(UCLIBC_MAKE_FLAGS) \ - PREFIX=$(TARGET_DIR) \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - install_runtime - $(UCLIBC_INSTALL_UTILS_TARGET) - $(UCLIBC_INSTALL_LDSO_SYMLINKS) -endef - -# STATIC has no ld* tools, only getconf -ifeq ($(BR2_STATIC_LIBS),) -define UCLIBC_INSTALL_UTILS_STAGING - $(INSTALL) -D -m 0755 $(@D)/utils/ldd.host $(HOST_DIR)/usr/bin/ldd - ln -sf ldd $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldd - $(INSTALL) -D -m 0755 $(@D)/utils/ldconfig.host $(HOST_DIR)/usr/bin/ldconfig - ln -sf ldconfig $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-ldconfig -endef -endif - -define UCLIBC_INSTALL_STAGING_CMDS - $(MAKE1) -C $(@D) \ - $(UCLIBC_MAKE_FLAGS) \ - PREFIX=$(STAGING_DIR) \ - DEVEL_PREFIX=/usr/ \ - RUNTIME_PREFIX=/ \ - install_runtime install_dev - $(UCLIBC_INSTALL_UTILS_STAGING) -endef - -# Checks to give errors that the user can understand -# Must be before we call to kconfig-package -ifeq ($(BR2_PACKAGE_UCLIBC)$(BR_BUILDING),yy) -ifeq ($(call qstrip,$(BR2_UCLIBC_CONFIG)),) -$(error No uClibc configuration file specified, check your BR2_UCLIBC_CONFIG setting) -endif -endif - -$(eval $(kconfig-package)) diff --git a/package.bak/udev/Config.in b/package.bak/udev/Config.in deleted file mode 100644 index 941a5152ff..0000000000 --- a/package.bak/udev/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_HAS_UDEV - bool - -config BR2_PACKAGE_PROVIDES_UDEV - depends on BR2_PACKAGE_HAS_UDEV - string diff --git a/package.bak/udev/udev.mk b/package.bak/udev/udev.mk deleted file mode 100644 index cc4a6e3a26..0000000000 --- a/package.bak/udev/udev.mk +++ /dev/null @@ -1,7 +0,0 @@ -################################################################################ -# -# udev -# -################################################################################ - -$(eval $(virtual-package)) diff --git a/package.bak/udisks/0001-fix-build-with-newer-glibc-versions.patch b/package.bak/udisks/0001-fix-build-with-newer-glibc-versions.patch deleted file mode 100644 index 336fc440a6..0000000000 --- a/package.bak/udisks/0001-fix-build-with-newer-glibc-versions.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fix build with newer glibc versions - -This patch has been backported from upstream: - -http://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=9829152b12a8924d2e091a00133ed1a3a7ba75c0 - -Signed-off-by: Vicente Olivert Riera - -From 9829152b12a8924d2e091a00133ed1a3a7ba75c0 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Fri, 29 May 2015 21:09:39 -0400 -Subject: fix build with newer glibc versions - -https://bugs.freedesktop.org/show_bug.cgi?id=90778 - -diff --git a/src/helpers/job-drive-detach.c b/src/helpers/job-drive-detach.c -index eeafcab..d122a1f 100644 ---- a/src/helpers/job-drive-detach.c -+++ b/src/helpers/job-drive-detach.c -@@ -18,6 +18,7 @@ - * - */ - -+#include - #include - #include - #include --- -cgit v0.10.2 diff --git a/package.bak/udisks/0002-Fix-systemd-service-file.patch b/package.bak/udisks/0002-Fix-systemd-service-file.patch deleted file mode 100644 index ea347aef73..0000000000 --- a/package.bak/udisks/0002-Fix-systemd-service-file.patch +++ /dev/null @@ -1,33 +0,0 @@ -From bf8b4362cef24a6f747e4329305a4939c8f585d1 Mon Sep 17 00:00:00 2001 -From: David King -Date: Thu, 2 Jul 2015 13:49:22 +0100 -Subject: [PATCH] Fix systemd service file - -udisks-daemon is installed to $(libexecdir), not $(prefix)/lib/udisks. - -https://bugzilla.redhat.com/show_bug.cgi?id=1238664 -https://bugs.freedesktop.org/show_bug.cgi?id=91191 - -[This patch has been backported from upstream: -https://cgit.freedesktop.org/udisks/commit/?h=udisks1&id=bf8b4362cef24a6f747e4329305a4939c8f585d1] -Signed-off-by: Pieterjan Camerlynck ---- - data/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index 411ea0f..08af5f4 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -31,7 +31,7 @@ systemdservicedir = $(systemdsystemunitdir) - systemdservice_DATA = $(systemdservice_in_files:.service.in=.service) - - $(systemdservice_DATA): $(systemdservice_in_files) Makefile -- @sed -e "s|\@libexecdir\@|$(prefix)/lib/udisks|" $< > $@ -+ @sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - endif - - udevrulesdir = $(slashlibdir)/udev/rules.d --- -2.7.4 - diff --git a/package.bak/udisks/Config.in b/package.bak/udisks/Config.in deleted file mode 100644 index 029860fc5c..0000000000 --- a/package.bak/udisks/Config.in +++ /dev/null @@ -1,46 +0,0 @@ -config BR2_PACKAGE_UDISKS - bool "udisks" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus-glib -> glib2 - depends on BR2_USE_MMU # lvm2 - depends on !BR2_STATIC_LIBS # lvm2 - depends on !BR2_TOOLCHAIN_USES_MUSL # lvm2 - select BR2_PACKAGE_DBUS - select BR2_PACKAGE_DBUS_GLIB - depends on BR2_USE_WCHAR # dbus-glib -> glib2 - select BR2_PACKAGE_SG3_UTILS - select BR2_PACKAGE_POLKIT - select BR2_PACKAGE_PARTED - select BR2_PACKAGE_LVM2 - select BR2_PACKAGE_LIBATASMART - select BR2_PACKAGE_LIBGUDEV - help - The udisks project provides - - o A storage daemon that implements well-defined D-Bus - interfaces that can be used to query and manipulate - storage devices. - - o a command-line tool, udisks(1), that can be used to query - and use the daemon - - http://www.freedesktop.org/wiki/Software/udisks - -if BR2_PACKAGE_UDISKS - -config BR2_PACKAGE_UDISKS_LVM2 - bool "lvm2 support" - select BR2_PACKAGE_LVM2_APP_LIBRARY - help - Enable LVM2 support - -endif - -comment "udisks needs udev /dev management" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV - -comment "udisks needs a glibc or uClibc toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/udisks/udisks.hash b/package.bak/udisks/udisks.hash deleted file mode 100644 index 7ad4326b1c..0000000000 --- a/package.bak/udisks/udisks.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 f2ec82eb0ea7e01dc299b5b29b3c18cdf861236ec43dcff66b3552b4b31c6f71 udisks-1.0.5.tar.gz diff --git a/package.bak/udisks/udisks.mk b/package.bak/udisks/udisks.mk deleted file mode 100644 index 4d3ede71b1..0000000000 --- a/package.bak/udisks/udisks.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# udisks -# -################################################################################ - -UDISKS_VERSION = 1.0.5 -UDISKS_SITE = http://hal.freedesktop.org/releases -UDISKS_LICENSE = GPLv2+ -UDISKS_LICENSE_FILES = COPYING -# For 0002-Fix-systemd-service-file.patch -UDISKS_AUTORECONF = YES - -UDISKS_DEPENDENCIES = \ - sg3_utils \ - host-pkgconf \ - udev \ - dbus \ - dbus-glib \ - polkit \ - parted \ - lvm2 \ - libatasmart \ - libgudev - -UDISKS_CONF_OPTS = --disable-remote-access --disable-man-pages - -ifeq ($(BR2_PACKAGE_UDISKS_LVM2),y) -UDISKS_CONF_OPTS += --enable-lvm2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/udpcast/0001-select-h.patch b/package.bak/udpcast/0001-select-h.patch deleted file mode 100644 index 9a8cfc9d5e..0000000000 --- a/package.bak/udpcast/0001-select-h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- udpcast-20120424/console.h 2005-12-22 22:59:18.000000000 +0000 -+++ udpcast-20120424.mod/console.h 2013-05-22 22:22:19.835474140 +0100 -@@ -6,6 +6,8 @@ - #include - #endif /* __MINGW32__ */ - -+#include -+ - #define prepareConsole udpc_prepareConsole - #define getConsoleFd udpc_getConsoleFd - #define restoreConsole udpc_restoreConsole diff --git a/package.bak/udpcast/Config.in b/package.bak/udpcast/Config.in deleted file mode 100644 index ef94b30a99..0000000000 --- a/package.bak/udpcast/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -comment "udpcast needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_UDPCAST - bool "udpcast" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - A multicast protocol implementation which happens to - be very handy for imaging drives over the network. - - http://www.udpcast.linux.lu/ - -if BR2_PACKAGE_UDPCAST - -config BR2_PACKAGE_UDPCAST_SENDER - bool "sender" - help - The udpcast transmitter. - -config BR2_PACKAGE_UDPCAST_RECEIVER - bool "receiver" - help - The udpcast receiver. - -endif diff --git a/package.bak/udpcast/udpcast.hash b/package.bak/udpcast/udpcast.hash deleted file mode 100644 index 133e1db80b..0000000000 --- a/package.bak/udpcast/udpcast.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 ce9090ef80b6035a744a9b5ac335e61c99baa92c39ff53277266fbfcb836445a udpcast-20120424.tar.gz diff --git a/package.bak/udpcast/udpcast.mk b/package.bak/udpcast/udpcast.mk deleted file mode 100644 index b0ce6433d2..0000000000 --- a/package.bak/udpcast/udpcast.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# udpcast -# -################################################################################ - -UDPCAST_VERSION = 20120424 -UDPCAST_SITE = http://www.udpcast.linux.lu/download -UDPCAST_DEPENDENCIES = host-m4 -UDPCAST_LICENSE = BSD-2c, GPLv2+ -UDPCAST_LICENSE_FILES = COPYING - -define UDPCAST_REMOVE_UDP_SENDER - rm -f $(TARGET_DIR)/usr/sbin/udp-sender - rm -f $(TARGET_DIR)/usr/sbin/udp-sender.1 -endef - -ifneq ($(BR2_PACKAGE_UDPCAST_SENDER),y) -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_SENDER -endif - -define UDPCAST_REMOVE_UDP_RECEIVER - rm -f $(TARGET_DIR)/usr/sbin/udp-receiver - rm -f $(TARGET_DIR)/usr/sbin/udp-receiver.1 -endef - -ifneq ($(BR2_PACKAGE_UDPCAST_RECEIVER),y) -UDPCAST_POST_INSTALL_TARGET_HOOKS += UDPCAST_REMOVE_UDP_RECEIVER -endif - -$(eval $(autotools-package)) diff --git a/package.bak/udpxy/Config.in b/package.bak/udpxy/Config.in deleted file mode 100644 index f442a2f2fe..0000000000 --- a/package.bak/udpxy/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_UDPXY - bool "udpxy" - depends on BR2_USE_MMU - help - udpxy is a UDP-to-HTTP multicast traffic relay daemon: it - forwards UDP traffic from a given multicast subscription to - the requesting HTTP client. - - http://www.udpxy.com/ diff --git a/package.bak/udpxy/udpxy.hash b/package.bak/udpxy/udpxy.hash deleted file mode 100644 index 4042a41dd6..0000000000 --- a/package.bak/udpxy/udpxy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6ce33b1d14a1aeab4bd2566aca112e41943df4d002a7678d9a715108e6b714bd udpxy.1.0.23-9-prod.tar.gz diff --git a/package.bak/udpxy/udpxy.mk b/package.bak/udpxy/udpxy.mk deleted file mode 100644 index dd8c91fcbc..0000000000 --- a/package.bak/udpxy/udpxy.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# udpxy -# -################################################################################# - -UDPXY_VERSION = 1.0.23-9-prod -UDPXY_SOURCE = udpxy.$(UDPXY_VERSION).tar.gz -UDPXY_SITE = http://www.udpxy.com/download/1_23 -UDPXY_LICENSE = GPLv3+ -UDPXY_LICENSE_FILES = README - -define UDPXY_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define UDPXY_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr \ - -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/uemacs/01-clear-ixon-termios-flag.patch b/package.bak/uemacs/01-clear-ixon-termios-flag.patch deleted file mode 100644 index dde76420d4..0000000000 --- a/package.bak/uemacs/01-clear-ixon-termios-flag.patch +++ /dev/null @@ -1,29 +0,0 @@ -[PATCH] clear ixon termios flag on initialization - -Otherwise ctrl-S/Q gets intercepted by the tty layer instead of -handled by uemacs. - -Signed-off-by: Peter Korsgaard -diff --git a/posix.c b/posix.c -index 97edd9f052b1..352c4712b689 100644 ---- a/posix.c -+++ b/posix.c -@@ -53,17 +53,17 @@ void ttopen(void) - /* - * base new settings on old ones - don't change things - * we don't know about - */ - ntermios = otermios; - - /* raw CR/NL etc input handling, but keep ISTRIP if we're on a 7-bit line */ - ntermios.c_iflag &= ~(IGNBRK | BRKINT | IGNPAR | PARMRK -- | INPCK | INLCR | IGNCR | ICRNL); -+ | INPCK | INLCR | IGNCR | ICRNL | IXON); - - /* raw CR/NR etc output handling */ - ntermios.c_oflag &= - ~(OPOST | ONLCR | OLCUC | OCRNL | ONOCR | ONLRET); - - /* No signal handling, no echo etc */ - ntermios.c_lflag &= ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK - | ECHONL | NOFLSH | TOSTOP | ECHOCTL | diff --git a/package.bak/uemacs/02-skip-xcase-termios-flag.patch b/package.bak/uemacs/02-skip-xcase-termios-flag.patch deleted file mode 100644 index 2cc53579c7..0000000000 --- a/package.bak/uemacs/02-skip-xcase-termios-flag.patch +++ /dev/null @@ -1,16 +0,0 @@ -From termios(3): "XCASE (not in POSIX; not supported under Linux)". -musl does not define it, and even if defined it's a no-op. - -Signed-off-by: Alex Suykov - ---- a/posix.c -+++ b/posix.c -@@ -65,7 +65,7 @@ - ~(OPOST | ONLCR | OLCUC | OCRNL | ONOCR | ONLRET); - - /* No signal handling, no echo etc */ -- ntermios.c_lflag &= ~(ISIG | ICANON | XCASE | ECHO | ECHOE | ECHOK -+ ntermios.c_lflag &= ~(ISIG | ICANON | ECHO | ECHOE | ECHOK - | ECHONL | NOFLSH | TOSTOP | ECHOCTL | - ECHOPRT | ECHOKE | FLUSHO | PENDIN | IEXTEN); - diff --git a/package.bak/uemacs/Config.in b/package.bak/uemacs/Config.in deleted file mode 100644 index cfe9805946..0000000000 --- a/package.bak/uemacs/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_UEMACS - bool "uemacs" - select BR2_PACKAGE_NCURSES - help - A small emacs. - - https://git.kernel.org/cgit/editors/uemacs/uemacs.git/ diff --git a/package.bak/uemacs/uemacs.mk b/package.bak/uemacs/uemacs.mk deleted file mode 100644 index 19fda12467..0000000000 --- a/package.bak/uemacs/uemacs.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# uemacs -# -################################################################################ - -UEMACS_VERSION = 8841922689769960fa074fbb053cb8507f2f3ed9 -UEMACS_SITE = $(BR2_KERNEL_MIRROR)/scm/editors/uemacs/uemacs.git -UEMACS_SITE_METHOD = git -UEMACS_DEPENDENCIES = ncurses - -define UEMACS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - CC="$(TARGET_CC)" DEFINES="-DAUTOCONF -DPOSIX -DUSG" \ - CFLAGS+="$(TARGET_CFLAGS) " LIBS="$(TARGET_CFLAGS) -lncurses" -endef - -define UEMACS_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/em $(TARGET_DIR)/usr/bin/em -endef - -$(eval $(generic-package)) diff --git a/package.bak/uhttpd/0001-Remove-Werror.patch b/package.bak/uhttpd/0001-Remove-Werror.patch deleted file mode 100644 index 67028cfa2c..0000000000 --- a/package.bak/uhttpd/0001-Remove-Werror.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ac52380eeca27e1e2e7eb5fb9d39059dbe58b919 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 7 Dec 2016 22:48:27 +0100 -Subject: [PATCH] Remove -Werror - --Werror might cause build failures with newer versions of gcc or C - libraries, not tested by upstream, for example: - - # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - ^ -cc1: all warnings being treated as errors - -Signed-off-by: Thomas Petazzoni ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7ae8ba4..825342f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -5,7 +5,7 @@ PROJECT(uhttpd C) - INCLUDE (CheckFunctionExists) - - SET(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS "") --ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -Os -Wall -Werror -Wmissing-declarations --std=gnu99 -g3) -+ADD_DEFINITIONS(-D_FILE_OFFSET_BITS=64 -Os -Wall -Wmissing-declarations --std=gnu99 -g3) - - OPTION(TLS_SUPPORT "TLS support" ON) - OPTION(LUA_SUPPORT "Lua support" ON) --- -2.7.4 - diff --git a/package.bak/uhttpd/Config.in b/package.bak/uhttpd/Config.in deleted file mode 100644 index e463b9305c..0000000000 --- a/package.bak/uhttpd/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_UHTTPD - bool "uhttpd" - depends on !BR2_STATIC_LIBS # dlopen() - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # json-c - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBUBOX - select BR2_PACKAGE_JSON_C - help - uHTTPd is a tiny single threaded HTTP server with TLS, CGI and Lua - support. It is intended as a drop-in replacement for the Busybox - HTTP daemon. - - https://wiki.openwrt.org/doc/howto/http.uhttpd - -comment "uhttpd needs a toolchain w/ dynamic library" - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/uhttpd/uhttpd.hash b/package.bak/uhttpd/uhttpd.hash deleted file mode 100644 index 59e54ad49a..0000000000 --- a/package.bak/uhttpd/uhttpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# No hash for this git snapshot -none xxx uhttpd-59e0c739634f46a164d939e54416287b91ff8a9b.tar.gz diff --git a/package.bak/uhttpd/uhttpd.mk b/package.bak/uhttpd/uhttpd.mk deleted file mode 100644 index be0d7d63c6..0000000000 --- a/package.bak/uhttpd/uhttpd.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# uhttpd -# -################################################################################ - -UHTTPD_VERSION = 59e0c739634f46a164d939e54416287b91ff8a9b -UHTTPD_SITE = http://git.openwrt.org/project/uhttpd.git -UHTTPD_SITE_METHOD = git -UHTTPD_LICENSE = ISC -UHTTPD_LICENSE_FILES = uhttpd.h -UHTTPD_DEPENDENCIES = libubox json-c - -ifeq ($(BR2_PACKAGE_LUA_5_1),y) -UHTTPD_DEPENDENCIES += lua -UHTTPD_CONF_OPTS += -DLUA_SUPPORT=ON -else -UHTTPD_CONF_OPTS += -DLUA_SUPPORT=OFF -endif - -ifeq ($(BR2_PACKAGE_USTREAM_SSL),y) -UHTTPD_DEPENDENCIES += ustream-ssl -UHTTPD_CONF_OPTS += -DTLS_SUPPORT=ON -else -UHTTPD_CONF_OPTS += -DTLS_SUPPORT=OFF -endif - -ifeq ($(BR2_PACKAGE_UBUS),y) -UHTTPD_DEPENDENCIES += ubus -UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=ON -else -UHTTPD_CONF_OPTS += -DUBUS_SUPPORT=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch b/package.bak/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch deleted file mode 100644 index c7b284a0af..0000000000 --- a/package.bak/ulogd/0001-ulogd-Use-dev-null-as-dummy-logfile-when-logging-to-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 17:43:23 +0200 -Subject: [PATCH] ulogd: Use /dev/null as dummy logfile when logging to - syslog - -Fixes compilation error with musl libc: - -ulogd.c:86:13: error: storage size of 'syslog_dummy' isn't known - static FILE syslog_dummy; - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8] -Signed-off-by: Rahul Bedarkar ---- - src/ulogd.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/ulogd.c b/src/ulogd.c -index e7cde39..958c30a 100644 ---- a/src/ulogd.c -+++ b/src/ulogd.c -@@ -83,7 +83,7 @@ static char *ulogd_logfile = NULL; - static const char *ulogd_configfile = ULOGD_CONFIGFILE; - static const char *ulogd_pidfile = NULL; - static int ulogd_pidfile_fd = -1; --static FILE syslog_dummy; -+static FILE *syslog_dummy; - - static int info_mode = 0; - -@@ -427,7 +427,7 @@ void __ulogd_log(int level, char *file, int line, const char *format, ...) - if (level < loglevel_ce.u.value) - return; - -- if (logfile == &syslog_dummy) { -+ if (logfile == syslog_dummy) { - /* FIXME: this omits the 'file' string */ - va_start(ap, format); - vsyslog(ulogd2syslog_level(level), format, ap); -@@ -950,7 +950,7 @@ static int logfile_open(const char *name) - logfile = stdout; - } else if (!strcmp(name, "syslog")) { - openlog("ulogd", LOG_PID, LOG_DAEMON); -- logfile = &syslog_dummy; -+ logfile = syslog_dummy = fopen("/dev/null", "w"); - } else { - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { -@@ -1240,7 +1240,7 @@ static void sigterm_handler(int signal) - unload_plugins(); - #endif - -- if (logfile != NULL && logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != NULL && logfile != stdout) { - fclose(logfile); - logfile = NULL; - } -@@ -1262,7 +1262,7 @@ static void signal_handler(int signal) - switch (signal) { - case SIGHUP: - /* reopen logfile */ -- if (logfile != stdout && logfile != &syslog_dummy) { -+ if (logfile != stdout && logfile != syslog_dummy) { - fclose(logfile); - logfile = fopen(ulogd_logfile, "a"); - if (!logfile) { --- -2.6.2 - diff --git a/package.bak/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch b/package.bak/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch deleted file mode 100644 index 0fbef834e4..0000000000 --- a/package.bak/ulogd/0002-Define-_GNU_SOURCE-to-get-members-of-tcphdr.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 89263555143e3c0125320ca565b41805f27460c9 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Sat, 16 May 2015 15:44:32 +0200 -Subject: [PATCH] Define _GNU_SOURCE to get members of tcphdr - -The source uses linux names for members of tcphdr. For example -"source" instead of "th_sport", ... musl libc's headers need -_GNU_SOURCE defined in order to expose these. - -Signed-off-by: Felix Janda -[Rahul Bedarkar: Backported from https://git.netfilter.org/ulogd2/commit/?id=89263555143e3c0125320ca565b41805f27460c9] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 1 + - filter/ulogd_filter_PWSNIFF.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index c9d5227..ad894fc 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -35,6 +35,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - #include -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index 5169eee..a3e2b42 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#define _GNU_SOURCE - #include - #include - --- -2.6.2 - diff --git a/package.bak/ulogd/0003-Use-stdint-types-everywhere.patch b/package.bak/ulogd/0003-Use-stdint-types-everywhere.patch deleted file mode 100644 index 66408d6d0f..0000000000 --- a/package.bak/ulogd/0003-Use-stdint-types-everywhere.patch +++ /dev/null @@ -1,792 +0,0 @@ -From c9337b31f756cae85299c8275b21088ce02885e2 Mon Sep 17 00:00:00 2001 -From: Felix Janda -Date: Wed, 24 Jun 2015 19:53:34 +0200 -Subject: [PATCH] Use stdint types everywhere - -Signed-off-by: Felix Janda -[Rahul Bedarkar: - - backported from https://git.netfilter.org/ulogd2/commit/?id=c9337b31f756cae85299c8275b21088ce02885e2 - - remove hunk for output/ulogd_output_IPFIX.c as file doesn't exist in version we use] -Signed-off-by: Rahul Bedarkar ---- - filter/raw2packet/ulogd_raw2packet_BASE.c | 35 +++++++++++++------------- - filter/ulogd_filter_HWHDR.c | 6 ++--- - filter/ulogd_filter_IP2HBIN.c | 4 +-- - filter/ulogd_filter_IP2STR.c | 2 +- - filter/ulogd_filter_MARK.c | 4 +-- - filter/ulogd_filter_PWSNIFF.c | 4 +-- - include/libipulog/libipulog.h | 7 +++--- - include/ulogd/addr.h | 4 ++- - include/ulogd/conffile.h | 10 ++++---- - include/ulogd/ipfix_protocol.h | 38 +++++++++++++++------------- - include/ulogd/ulogd.h | 42 +++++++++++++++---------------- - input/packet/ulogd_inppkt_NFLOG.c | 16 ++++++------ - input/packet/ulogd_inppkt_UNIXSOCK.c | 34 ++++++++++++------------- - libipulog/libipulog.c | 8 +++--- - output/mysql/ulogd_output_MYSQL.c | 2 +- - output/ulogd_output_IPFIX.c | 20 +++++++-------- - src/addr.c | 4 +-- - util/db.c | 2 +- - util/printpkt.c | 6 ++--- - 19 files changed, 126 insertions(+), 122 deletions(-) - -diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c -index ad894fc..8a6180c 100644 ---- a/filter/raw2packet/ulogd_raw2packet_BASE.c -+++ b/filter/raw2packet/ulogd_raw2packet_BASE.c -@@ -44,6 +44,7 @@ - #include - #include - #include -+#include - - enum input_keys { - INKEY_RAW_PCKT, -@@ -538,7 +539,7 @@ static struct ulogd_key iphdr_rets[] = { - ***********************************************************************/ - - static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -573,7 +574,7 @@ static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, - ***********************************************************************/ - - static int _interp_udp(struct ulogd_pluginstance *pi, struct udphdr *udph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -602,7 +603,7 @@ typedef struct sctphdr { - } __attribute__((packed)) sctp_sctphdr_t; - - static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, -- u_int32_t len) -+ uint32_t len) - - { - struct ulogd_key *ret = pi->output.keys; -@@ -625,7 +626,7 @@ static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, - ***********************************************************************/ - - static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -663,7 +664,7 @@ static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, - ***********************************************************************/ - - static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph, -- u_int32_t len) -+ uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - -@@ -691,7 +692,7 @@ static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph - * IPSEC HEADER - ***********************************************************************/ - static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, -- u_int32_t len) -+ uint32_t len) - { - #if 0 - struct ulogd_key *ret = pi->output.keys; -@@ -711,14 +712,14 @@ static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, - * IP HEADER - ***********************************************************************/ - --static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_iphdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct iphdr *iph = - ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); -- void *nexthdr = (u_int32_t *)iph + iph->ihl; -+ void *nexthdr = (uint32_t *)iph + iph->ihl; - -- if (len < sizeof(struct iphdr) || len <= (u_int32_t)(iph->ihl * 4)) -+ if (len < sizeof(struct iphdr) || len <= (uint32_t)(iph->ihl * 4)) - return ULOGD_IRET_OK; - len -= iph->ihl * 4; - -@@ -759,7 +760,7 @@ static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) - * IPv6 HEADER - ***********************************************************************/ - --static int ip6_ext_hdr(u_int8_t nexthdr) -+static int ip6_ext_hdr(uint8_t nexthdr) - { - switch (nexthdr) { - case IPPROTO_HOPOPTS: -@@ -774,12 +775,12 @@ static int ip6_ext_hdr(u_int8_t nexthdr) - } - } - --static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - struct ip6_hdr *ipv6h = ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); - unsigned int ptr, hdrlen = 0; -- u_int8_t curhdr; -+ uint8_t curhdr; - int fragment = 0; - - if (len < sizeof(struct ip6_hdr)) -@@ -889,7 +890,7 @@ out: - /*********************************************************************** - * ARP HEADER - ***********************************************************************/ --static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_arp(struct ulogd_pluginstance *pi, uint32_t len) - { - struct ulogd_key *ret = pi->output.keys; - const struct ether_arp *arph = -@@ -914,9 +915,9 @@ static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) - * ETHER HEADER - ***********************************************************************/ - --static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) -+static int _interp_bridge(struct ulogd_pluginstance *pi, uint32_t len) - { -- const u_int16_t proto = -+ const uint16_t proto = - ikey_get_u16(&pi->input.keys[INKEY_OOB_PROTOCOL]); - - switch (proto) { -@@ -938,8 +939,8 @@ static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) - - static int _interp_pkt(struct ulogd_pluginstance *pi) - { -- u_int32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -- u_int8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); -+ uint32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); -+ uint8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); - struct ulogd_key *ret = pi->output.keys; - - okey_set_u16(&ret[KEY_OOB_PROTOCOL], -diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c -index 3b095c9..10c95c4 100644 ---- a/filter/ulogd_filter_HWHDR.c -+++ b/filter/ulogd_filter_HWHDR.c -@@ -143,10 +143,10 @@ static void *hwhdr_get_daddr(struct ulogd_key *inp) - return ikey_get_ptr(&inp[KEY_RAW_MAC]); - } - --static u_int16_t hwhdr_get_len(struct ulogd_key *inp) -+static uint16_t hwhdr_get_len(struct ulogd_key *inp) - { - void *len = ikey_get_ptr(&inp[KEY_RAW_MAC]) + 2 * ETH_ALEN; -- return ntohs(*(u_int16_t *) len); -+ return ntohs(*(uint16_t *) len); - } - static int parse_ethernet(struct ulogd_key *ret, struct ulogd_key *inp) - { -@@ -171,7 +171,7 @@ static int interp_mac2str(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int16_t type = 0; -+ uint16_t type = 0; - - if (pp_is_valid(inp, KEY_OOB_PROTOCOL)) - okey_set_u16(&ret[KEY_MAC_PROTOCOL], -diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c -index 4fd3ff1..087e824 100644 ---- a/filter/ulogd_filter_IP2HBIN.c -+++ b/filter/ulogd_filter_IP2HBIN.c -@@ -116,8 +116,8 @@ static int interp_ip2hbin(struct ulogd_pluginstance *pi) - { - struct ulogd_key *ret = pi->output.keys; - struct ulogd_key *inp = pi->input.keys; -- u_int8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -- u_int8_t convfamily = family; -+ uint8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); -+ uint8_t convfamily = family; - int i; - - switch (family) { -diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c -index 732e1ef..66324b0 100644 ---- a/filter/ulogd_filter_IP2STR.c -+++ b/filter/ulogd_filter_IP2STR.c -@@ -168,7 +168,7 @@ static int ip2str(struct ulogd_key *inp, int index, int oindex) - } - - switch (convfamily) { -- u_int32_t ip; -+ uint32_t ip; - case AF_INET6: - inet_ntop(AF_INET6, - ikey_get_u128(&inp[index]), -diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c -index 7807f63..149725d 100644 ---- a/filter/ulogd_filter_MARK.c -+++ b/filter/ulogd_filter_MARK.c -@@ -73,14 +73,14 @@ static int interp_mark(struct ulogd_pluginstance *pi) - if (pp_is_valid(inp, KEY_CT_MARK)) { - if ((ikey_get_u32(&inp[KEY_CT_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } - } else if (pp_is_valid(inp, KEY_OOB_MARK)) { - if ((ikey_get_u32(&inp[KEY_OOB_MARK]) & - pi->config_kset->ces[MARK_MASK].u.value) != -- (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value -+ (uint32_t) pi->config_kset->ces[MARK_MARK].u.value - ) { - return ULOGD_IRET_STOP; - } -diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c -index a3e2b42..934ff0e 100644 ---- a/filter/ulogd_filter_PWSNIFF.c -+++ b/filter/ulogd_filter_PWSNIFF.c -@@ -39,7 +39,7 @@ - #define PORT_POP3 110 - #define PORT_FTP 21 - --static u_int16_t pwsniff_ports[] = { -+static uint16_t pwsniff_ports[] = { - PORT_POP3, - PORT_FTP, - /* feel free to include any other ports here, provided that their -@@ -72,7 +72,7 @@ static int interp_pwsniff(struct ulogd_pluginstance *pi) - return ULOGD_IRET_STOP; - - iph = (struct iphdr *) pi->input.keys[0].u.value.ptr; -- protoh = (u_int32_t *)iph + iph->ihl; -+ protoh = (uint32_t *)iph + iph->ihl; - tcph = protoh; - tcplen = ntohs(iph->tot_len) - iph->ihl * 4; - -diff --git a/include/libipulog/libipulog.h b/include/libipulog/libipulog.h -index b3c9616..21b4315 100644 ---- a/include/libipulog/libipulog.h -+++ b/include/libipulog/libipulog.h -@@ -4,10 +4,9 @@ - #include - #include - #include --#include - #include - #include --#include -+#include - #include - #include - #include -@@ -20,9 +19,9 @@ - struct ipulog_handle; - extern int ipulog_errno; - --u_int32_t ipulog_group2gmask(u_int32_t group); -+uint32_t ipulog_group2gmask(uint32_t group); - --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem); - - void ipulog_destroy_handle(struct ipulog_handle *h); - -diff --git a/include/ulogd/addr.h b/include/ulogd/addr.h -index b4432e3..2259b6c 100644 ---- a/include/ulogd/addr.h -+++ b/include/ulogd/addr.h -@@ -8,7 +8,9 @@ - #ifndef _ADDR_H - #define _ADDR_H - --u_int32_t ulogd_bits2netmask(int bits); -+#include -+ -+uint32_t ulogd_bits2netmask(int bits); - void ulogd_ipv6_cidr2mask_host(uint8_t cidr, uint32_t *res); - void ulogd_ipv6_addr2addr_host(uint32_t *addr, uint32_t *res); - -diff --git a/include/ulogd/conffile.h b/include/ulogd/conffile.h -index 69a6f70..1f3d563 100644 ---- a/include/ulogd/conffile.h -+++ b/include/ulogd/conffile.h -@@ -7,7 +7,7 @@ - #ifndef _CONFFILE_H - #define _CONFFILE_H - --#include -+#include - - /* errors returned by config functions */ - enum { -@@ -45,10 +45,10 @@ enum { - - struct config_entry { - char key[CONFIG_KEY_LEN]; /* name of config directive */ -- u_int8_t type; /* type; see above */ -- u_int8_t options; /* options; see above */ -- u_int8_t hit; /* found? */ -- u_int8_t flag; /* tune setup of option */ -+ uint8_t type; /* type; see above */ -+ uint8_t options; /* options; see above */ -+ uint8_t hit; /* found? */ -+ uint8_t flag; /* tune setup of option */ - union { - char string[CONFIG_VAL_STRING_LEN]; - int value; -diff --git a/include/ulogd/ipfix_protocol.h b/include/ulogd/ipfix_protocol.h -index 5d7e46a..aef47f0 100644 ---- a/include/ulogd/ipfix_protocol.h -+++ b/include/ulogd/ipfix_protocol.h -@@ -1,6 +1,8 @@ - #ifndef _IPFIX_PROTOCOL_H - #define _IPFIX_PROTOCOL_H - -+#include -+ - /* This header file defines structures for the IPFIX protocol in accordance with - * draft-ietf-ipfix-protocol-19.txt */ - -@@ -11,29 +13,29 @@ - - /* Section 3.1 */ - struct ipfix_msg_hdr { -- u_int16_t version; -- u_int16_t length; -- u_int32_t export_time; -- u_int32_t seq; -- u_int32_t source_id; -+ uint16_t version; -+ uint16_t length; -+ uint32_t export_time; -+ uint32_t seq; -+ uint32_t source_id; - }; - - /* Section 3.4.1 */ - struct ipfix_templ_rec_hdr { -- u_int16_t templ_id; -- u_int16_t field_count; -+ uint16_t templ_id; -+ uint16_t field_count; - }; - - /* Section 3.2 */ - struct ipfix_ietf_field { -- u_int16_t type; -- u_int16_t length; -+ uint16_t type; -+ uint16_t length; - }; - - struct ipfix_vendor_field { -- u_int16_t type; -- u_int16_t length; -- u_int32_t enterprise_num; -+ uint16_t type; -+ uint16_t length; -+ uint32_t enterprise_num; - }; - - /* Information Element Identifiers as of draft-ietf-ipfix-info-11.txt */ -@@ -219,13 +221,13 @@ enum { - /* Information elements of the netfilter vendor id */ - enum { - IPFIX_NF_rawpacket = 1, /* pointer */ -- IPFIX_NF_rawpacket_length = 2, /* u_int32_t */ -+ IPFIX_NF_rawpacket_length = 2, /* uint32_t */ - IPFIX_NF_prefix = 3, /* string */ -- IPFIX_NF_mark = 4, /* u_int32_t */ -- IPFIX_NF_hook = 5, /* u_int8_t */ -- IPFIX_NF_conntrack_id = 6, /* u_int32_t */ -- IPFIX_NF_seq_local = 7, /* u_int32_t */ -- IPFIX_NF_seq_global = 8, /* u_int32_t */ -+ IPFIX_NF_mark = 4, /* uint32_t */ -+ IPFIX_NF_hook = 5, /* uint8_t */ -+ IPFIX_NF_conntrack_id = 6, /* uint32_t */ -+ IPFIX_NF_seq_local = 7, /* uint32_t */ -+ IPFIX_NF_seq_global = 8, /* uint32_t */ - }; - - #endif -diff --git a/include/ulogd/ulogd.h b/include/ulogd/ulogd.h -index cf26a15..2e38195 100644 ---- a/include/ulogd/ulogd.h -+++ b/include/ulogd/ulogd.h -@@ -85,17 +85,17 @@ enum ulogd_dtype { - /* structure describing an input / output parameter of a plugin */ - struct ulogd_key { - /* length of the returned value (only for lengthed types */ -- u_int32_t len; -+ uint32_t len; - /* type of the returned value (ULOGD_DTYPE_...) */ -- u_int16_t type; -+ uint16_t type; - /* flags (i.e. free, ...) */ -- u_int16_t flags; -+ uint16_t flags; - /* name of this key */ - char name[ULOGD_MAX_KEYLEN+1]; - /* IETF IPFIX attribute ID */ - struct { -- u_int32_t vendor; -- u_int16_t field_id; -+ uint32_t vendor; -+ uint16_t field_id; - } ipfix; - - /* Store field name for Common Information Model */ -@@ -104,12 +104,12 @@ struct ulogd_key { - union { - /* and finally the returned value */ - union { -- u_int8_t b; -- u_int8_t ui8; -- u_int16_t ui16; -- u_int32_t ui32; -- u_int64_t ui64; -- u_int32_t ui128[4]; -+ uint8_t b; -+ uint8_t ui8; -+ uint16_t ui16; -+ uint32_t ui32; -+ uint64_t ui64; -+ uint32_t ui128[4]; - int8_t i8; - int16_t i16; - int32_t i32; -@@ -130,31 +130,31 @@ struct ulogd_keyset { - unsigned int type; - }; - --static inline void okey_set_b(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_b(struct ulogd_key *key, uint8_t value) - { - key->u.value.b = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u8(struct ulogd_key *key, u_int8_t value) -+static inline void okey_set_u8(struct ulogd_key *key, uint8_t value) - { - key->u.value.ui8 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u16(struct ulogd_key *key, u_int16_t value) -+static inline void okey_set_u16(struct ulogd_key *key, uint16_t value) - { - key->u.value.ui16 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u32(struct ulogd_key *key, u_int32_t value) -+static inline void okey_set_u32(struct ulogd_key *key, uint32_t value) - { - key->u.value.ui32 = value; - key->flags |= ULOGD_RETF_VALID; - } - --static inline void okey_set_u64(struct ulogd_key *key, u_int64_t value) -+static inline void okey_set_u64(struct ulogd_key *key, uint64_t value) - { - key->u.value.ui64 = value; - key->flags |= ULOGD_RETF_VALID; -@@ -172,22 +172,22 @@ static inline void okey_set_ptr(struct ulogd_key *key, void *value) - key->flags |= ULOGD_RETF_VALID; - } - --static inline u_int8_t ikey_get_u8(struct ulogd_key *key) -+static inline uint8_t ikey_get_u8(struct ulogd_key *key) - { - return key->u.source->u.value.ui8; - } - --static inline u_int16_t ikey_get_u16(struct ulogd_key *key) -+static inline uint16_t ikey_get_u16(struct ulogd_key *key) - { - return key->u.source->u.value.ui16; - } - --static inline u_int32_t ikey_get_u32(struct ulogd_key *key) -+static inline uint32_t ikey_get_u32(struct ulogd_key *key) - { - return key->u.source->u.value.ui32; - } - --static inline u_int64_t ikey_get_u64(struct ulogd_key *key) -+static inline uint64_t ikey_get_u64(struct ulogd_key *key) - { - return key->u.source->u.value.ui64; - } -@@ -292,7 +292,7 @@ void ulogd_propagate_results(struct ulogd_pluginstance *pi); - void ulogd_register_plugin(struct ulogd_plugin *me); - - /* allocate a new ulogd_key */ --struct ulogd_key *alloc_ret(const u_int16_t type, const char*); -+struct ulogd_key *alloc_ret(const uint16_t type, const char*); - - /* write a message to the daemons' logfile */ - void __ulogd_log(int level, char *file, int line, const char *message, ...); -diff --git a/input/packet/ulogd_inppkt_NFLOG.c b/input/packet/ulogd_inppkt_NFLOG.c -index 6196626..a367959 100644 ---- a/input/packet/ulogd_inppkt_NFLOG.c -+++ b/input/packet/ulogd_inppkt_NFLOG.c -@@ -315,7 +315,7 @@ static struct ulogd_key output_keys[] = { - }; - - static inline int --interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, -+interp_packet(struct ulogd_pluginstance *upi, uint8_t pf_family, - struct nflog_data *ldata) - { - struct ulogd_key *ret = upi->output.keys; -@@ -326,12 +326,12 @@ interp_packet(struct ulogd_pluginstance *upi, u_int8_t pf_family, - int payload_len = nflog_get_payload(ldata, &payload); - char *prefix = nflog_get_prefix(ldata); - struct timeval ts; -- u_int32_t mark = nflog_get_nfmark(ldata); -- u_int32_t indev = nflog_get_indev(ldata); -- u_int32_t outdev = nflog_get_outdev(ldata); -- u_int32_t seq; -- u_int32_t uid; -- u_int32_t gid; -+ uint32_t mark = nflog_get_nfmark(ldata); -+ uint32_t indev = nflog_get_indev(ldata); -+ uint32_t outdev = nflog_get_outdev(ldata); -+ uint32_t seq; -+ uint32_t uid; -+ uint32_t gid; - - okey_set_u8(&ret[NFLOG_KEY_OOB_FAMILY], - pf_family); -@@ -493,7 +493,7 @@ static int configure(struct ulogd_pluginstance *upi, - return 0; - } - --static int become_system_logging(struct ulogd_pluginstance *upi, u_int8_t pf) -+static int become_system_logging(struct ulogd_pluginstance *upi, uint8_t pf) - { - struct nflog_input *ui = (struct nflog_input *) upi->private; - -diff --git a/input/packet/ulogd_inppkt_UNIXSOCK.c b/input/packet/ulogd_inppkt_UNIXSOCK.c -index e4009f3..39944bf 100644 ---- a/input/packet/ulogd_inppkt_UNIXSOCK.c -+++ b/input/packet/ulogd_inppkt_UNIXSOCK.c -@@ -336,10 +336,10 @@ enum ulogd2_option_type { - ULOGD2_OPT_PREFIX, /* log prefix (string) */ - ULOGD2_OPT_OOB_IN, /* input device (string) */ - ULOGD2_OPT_OOB_OUT, /* output device (string) */ -- ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (u_int32_t) */ -+ ULOGD2_OPT_OOB_TIME_SEC, /* packet arrival time (uint32_t) */ - - ULOGD2_OPT_USER=200, /* user name (string) */ -- ULOGD2_OPT_USERID, /* user id (u_int32_t) */ -+ ULOGD2_OPT_USERID, /* user id (uint32_t) */ - ULOGD2_OPT_OSNAME, /* OS name (string) */ - ULOGD2_OPT_OSREL, /* OS release (string) */ - ULOGD2_OPT_OSVERS, /* OS version (string) */ -@@ -367,15 +367,15 @@ struct ulogd_unixsock_option_t { - #define USOCK_ALIGNTO 8 - #define USOCK_ALIGN(len) ( ((len)+USOCK_ALIGNTO-1) & ~(USOCK_ALIGNTO-1) ) - --static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, u_int16_t total_len) -+static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_packet_t *pkt, uint16_t total_len) - { - char *data = NULL; - struct iphdr *ip; - struct ulogd_key *ret = upi->output.keys; -- u_int8_t oob_family; -- u_int16_t payload_len; -- u_int32_t option_number; -- u_int32_t option_length; -+ uint8_t oob_family; -+ uint16_t payload_len; -+ uint32_t option_number; -+ uint32_t option_length; - char *buf; - struct ulogd_unixsock_option_t *option; - int new_offset; -@@ -398,7 +398,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_u32(&ret[UNIXSOCK_KEY_RAW_PCKTLEN], payload_len); - - /* options */ -- if (total_len > payload_len + sizeof(u_int16_t)) { -+ if (total_len > payload_len + sizeof(uint16_t)) { - /* option starts at the next aligned address after the payload */ - new_offset = USOCK_ALIGN(payload_len); - options_start = (void*)ip + new_offset; -@@ -431,13 +431,13 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_OOB_OUT], buf); - break; - case ULOGD2_OPT_OOB_TIME_SEC: -- okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_OOB_TIME_SEC], *(uint32_t*)buf); - break; - case ULOGD2_OPT_USER: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_USER_NAME], buf); - break; - case ULOGD2_OPT_USERID: -- okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(u_int32_t*)buf); -+ okey_set_u32(&ret[UNIXSOCK_KEY_NUFW_USER_ID], *(uint32_t*)buf); - break; - case ULOGD2_OPT_OSNAME: - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_OS_NAME], buf); -@@ -452,7 +452,7 @@ static int handle_packet(struct ulogd_pluginstance *upi, struct ulogd_unixsock_p - okey_set_ptr(&ret[UNIXSOCK_KEY_NUFW_APP_NAME], buf); - break; - case ULOGD2_OPT_STATE: -- okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(u_int8_t*)buf); -+ okey_set_u8(&ret[UNIXSOCK_KEY_RAW_LABEL], *(uint8_t*)buf); - break; - default: - ulogd_log(ULOGD_NOTICE, -@@ -595,8 +595,8 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - struct ulogd_pluginstance *upi = param; - struct unixsock_input *ui = (struct unixsock_input*)upi->private; - int len; -- u_int16_t needed_len; -- u_int32_t packet_sig; -+ uint16_t needed_len; -+ uint32_t packet_sig; - struct ulogd_unixsock_packet_t *unixsock_packet; - - char buf[4096]; -@@ -642,7 +642,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - needed_len = ntohs(unixsock_packet->total_size); - -- if (ui->unixsock_buf_avail >= needed_len + sizeof(u_int32_t)) { -+ if (ui->unixsock_buf_avail >= needed_len + sizeof(uint32_t)) { - ulogd_log(ULOGD_DEBUG, - " We have enough data (%d bytes required), handling packet\n", - needed_len); -@@ -651,11 +651,11 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - return -1; - } - /* consume data */ -- ui->unixsock_buf_avail -= (sizeof(u_int32_t) + needed_len); -+ ui->unixsock_buf_avail -= (sizeof(uint32_t) + needed_len); - if (ui->unixsock_buf_avail > 0) { - /* we need to shift data .. */ - memmove(ui->unixsock_buf, -- ui->unixsock_buf + (sizeof(u_int32_t) + needed_len) , -+ ui->unixsock_buf + (sizeof(uint32_t) + needed_len) , - ui->unixsock_buf_avail); - } else { - /* input buffer is empty, do not loop */ -@@ -664,7 +664,7 @@ static int unixsock_instance_read_cb(int fd, unsigned int what, void *param) - - } else { - ulogd_log(ULOGD_DEBUG, " We have %d bytes, but need %d. Requesting more\n", -- ui->unixsock_buf_avail, needed_len + sizeof(u_int32_t)); -+ ui->unixsock_buf_avail, needed_len + sizeof(uint32_t)); - return 0; - } - -diff --git a/libipulog/libipulog.c b/libipulog/libipulog.c -index ab28bb4..b49f7f2 100644 ---- a/libipulog/libipulog.c -+++ b/libipulog/libipulog.c -@@ -33,7 +33,7 @@ - struct ipulog_handle - { - int fd; -- u_int8_t blocking; -+ uint8_t blocking; - struct sockaddr_nl local; - struct sockaddr_nl peer; - struct nlmsghdr* last_nlhdr; -@@ -112,7 +112,7 @@ char *ipulog_strerror(int errcode) - } - - /* convert a netlink group (1-32) to a group_mask suitable for create_handle */ --u_int32_t ipulog_group2gmask(u_int32_t group) -+uint32_t ipulog_group2gmask(uint32_t group) - { - if (group < 1 || group > 32) - { -@@ -123,8 +123,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group) - } - - /* create a ipulog handle for the reception of packets sent to gmask */ --struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, -- u_int32_t rcvbufsize) -+struct ipulog_handle *ipulog_create_handle(uint32_t gmask, -+ uint32_t rcvbufsize) - { - struct ipulog_handle *h; - int status; -diff --git a/output/mysql/ulogd_output_MYSQL.c b/output/mysql/ulogd_output_MYSQL.c -index 0a1ebfc..643320c 100644 ---- a/output/mysql/ulogd_output_MYSQL.c -+++ b/output/mysql/ulogd_output_MYSQL.c -@@ -174,7 +174,7 @@ static int open_db_mysql(struct ulogd_pluginstance *upi) - struct mysql_instance *mi = (struct mysql_instance *) upi->private; - unsigned int connect_timeout = timeout_ce(upi->config_kset).u.value; - char *server = host_ce(upi->config_kset).u.string; -- u_int16_t port = port_ce(upi->config_kset).u.value; -+ uint16_t port = port_ce(upi->config_kset).u.value; - char *user = user_ce(upi->config_kset).u.string; - char *pass = pass_ce(upi->config_kset).u.string; - char *db = db_ce(upi->config_kset).u.string; -diff --git a/src/addr.c b/src/addr.c -index 2672fab..41435dc 100644 ---- a/src/addr.c -+++ b/src/addr.c -@@ -22,9 +22,9 @@ - #include - #include - --u_int32_t ulogd_bits2netmask(int bits) -+uint32_t ulogd_bits2netmask(int bits) - { -- u_int32_t netmask, bm; -+ uint32_t netmask, bm; - - if (bits >= 32 || bits < 0) - return(~0); -diff --git a/util/db.c b/util/db.c -index 24966a5..c9aec41 100644 ---- a/util/db.c -+++ b/util/db.c -@@ -362,7 +362,7 @@ static void __format_query_db(struct ulogd_pluginstance *upi, char *start) - sprintf(stmt_ins, "%u,", res->u.value.ui16); - break; - case ULOGD_RET_IPADDR: -- /* fallthrough when logging IP as u_int32_t */ -+ /* fallthrough when logging IP as uint32_t */ - case ULOGD_RET_UINT32: - sprintf(stmt_ins, "%u,", res->u.value.ui32); - break; -diff --git a/util/printpkt.c b/util/printpkt.c -index eb6cfbf..69a47ca 100644 ---- a/util/printpkt.c -+++ b/util/printpkt.c -@@ -199,7 +199,7 @@ static int printpkt_ipv4(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; - char tmp[INET_ADDRSTRLEN]; -- u_int32_t paddr; -+ uint32_t paddr; - - if (pp_is_valid(res, KEY_IP_SADDR)) - buf_cur += sprintf(buf_cur, "SRC=%s ", -@@ -363,8 +363,8 @@ static int printpkt_ipv6(struct ulogd_key *res, char *buf) - int printpkt_arp(struct ulogd_key *res, char *buf) - { - char *buf_cur = buf; -- u_int16_t code = 0; -- u_int8_t *mac; -+ uint16_t code = 0; -+ uint8_t *mac; - - if (pp_is_valid(res, KEY_ARP_SPA)) - buf_cur += sprintf(buf_cur, "SRC=%s ", --- -2.6.2 - diff --git a/package.bak/ulogd/Config.in b/package.bak/ulogd/Config.in deleted file mode 100644 index dc36c0bc33..0000000000 --- a/package.bak/ulogd/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_ULOGD - bool "ulogd" - depends on !BR2_STATIC_LIBS - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBMNL - select BR2_PACKAGE_LIBNETFILTER_ACCT - select BR2_PACKAGE_LIBNETFILTER_CONNTRACK - select BR2_PACKAGE_LIBNETFILTER_LOG - select BR2_PACKAGE_LIBNFNETLINK - help - ulogd is a userspace logging daemon for netfilter/iptables related logging. - - http://www.netfilter.org/projects/ulogd/ - -comment "ulogd needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on BR2_USE_MMU diff --git a/package.bak/ulogd/ulogd.hash b/package.bak/ulogd/ulogd.hash deleted file mode 100644 index 16186c18c0..0000000000 --- a/package.bak/ulogd/ulogd.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From ftp://ftp.netfilter.org/pub/ulogd/ulogd-2.0.5.tar.bz2.{md5sum,sha1sum} -md5 f0f8fe1371fa28b5e06cb16aaa0111dd ulogd-2.0.5.tar.bz2 -sha1 828db7849d6788674ecf36b178f107c20e9ac1f0 ulogd-2.0.5.tar.bz2 diff --git a/package.bak/ulogd/ulogd.mk b/package.bak/ulogd/ulogd.mk deleted file mode 100644 index 4017edc7bf..0000000000 --- a/package.bak/ulogd/ulogd.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# ulogd -# -################################################################################ - -ULOGD_VERSION = 2.0.5 -ULOGD_SOURCE = ulogd-$(ULOGD_VERSION).tar.bz2 -ULOGD_SITE = http://www.netfilter.org/projects/ulogd/files -ULOGD_CONF_OPTS = --with-dbi=no --with-pgsql=no -ULOGD_DEPENDENCIES = host-pkgconf \ - libmnl libnetfilter_acct libnetfilter_conntrack libnetfilter_log \ - libnfnetlink -ULOGD_LICENSE = GPLv2 -ULOGD_LICENSE_FILES = COPYING - -# DB backends need threads -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -ifeq ($(BR2_PACKAGE_MYSQL),y) -ULOGD_CONF_OPTS += --with-mysql=$(STAGING_DIR)/usr -ULOGD_DEPENDENCIES += mysql -else -ULOGD_CONF_OPTS += --with-mysql=no -endif -ifeq ($(BR2_PACKAGE_SQLITE),y) -ULOGD_DEPENDENCIES += sqlite -endif -else -ULOGD_CONF_OPTS += --with-mysql=no --without-sqlite -endif - -ifeq ($(BR2_PACKAGE_LIBPCAP),y) -ULOGD_CONF_OPTS += --with-pcap -ULOGD_DEPENDENCIES += libpcap -else -ULOGD_CONF_OPTS += --without-pcap -endif - -ifeq ($(BR2_PACKAGE_JANSSON),y) -ULOGD_CONF_OPTS += --with-jansson -ULOGD_DEPENDENCIES += jansson -else -ULOGD_CONF_OPTS += --without-jansson -endif - -$(eval $(autotools-package)) diff --git a/package.bak/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch b/package.bak/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch deleted file mode 100644 index 228441b38a..0000000000 --- a/package.bak/unionfs/0001-Revert-to-old-pre-1.0-meta-directory.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 93c2f9bd8b058b28016e6db2421e5b38eac0606c Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Thu, 17 Dec 2015 15:06:38 +0100 -Subject: [PATCH] Revert to old pre-1.0 meta directory - -Unionfs changed its meta directory from .unionfs to .unionfs-fuse with the -unionfs -> unionfs-fuse rename. The rename later got reverted everywhere -but the meta directory, so now unionfs doesn't find the whiteout files from -older releases. - -Revert back to the pre-1.0 behaviour to fix this. - -Committed upstream: -https://github.com/rpodgorny/unionfs-fuse/commit/93c2f9bd8b058b28016e6db2421e5b38eac0606c - -Signed-off-by: Peter Korsgaard ---- - src/unionfs.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/unionfs.h b/src/unionfs.h -index c2b5ee3..74b824f 100644 ---- a/src/unionfs.h -+++ b/src/unionfs.h -@@ -10,7 +10,7 @@ - #define PATHLEN_MAX 1024 - #define HIDETAG "_HIDDEN~" - --#define METANAME ".unionfs-fuse" -+#define METANAME ".unionfs" - #define METADIR (METANAME "/") // string concetanation! - - // fuse meta files, we might want to hide those --- -2.1.4 - diff --git a/package.bak/unionfs/Config.in b/package.bak/unionfs/Config.in deleted file mode 100644 index ece83a5f79..0000000000 --- a/package.bak/unionfs/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_UNIONFS - bool "unionfs (FUSE)" - select BR2_PACKAGE_LIBFUSE - depends on BR2_TOOLCHAIN_HAS_THREADS # libfuse - depends on BR2_USE_MMU # libfuse - depends on !BR2_STATIC_LIBS # libfuse - help - A userspace unionfs implementation. - - https://github.com/rpodgorny/unionfs-fuse - -comment "unionfs needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/unionfs/unionfs.hash b/package.bak/unionfs/unionfs.hash deleted file mode 100644 index c843a0e8c1..0000000000 --- a/package.bak/unionfs/unionfs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha256 2ee80bd0634a61adb2159212e155d607a0a82ad659214ae6edb3530396cccc09 unionfs-1.0.tar.gz -sha256 c8526f80448f344fba0100e5510793b6de985b24a8b526d9a6803bcd713d9de2 0001-include-asm-ioctl.h-for-_IOC_SIZE.patch diff --git a/package.bak/unionfs/unionfs.mk b/package.bak/unionfs/unionfs.mk deleted file mode 100644 index 0fa9c940f9..0000000000 --- a/package.bak/unionfs/unionfs.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# unionfs -# -################################################################################ - -UNIONFS_VERSION = 1.0 -UNIONFS_SITE = $(call github,rpodgorny,unionfs-fuse,v$(UNIONFS_VERSION)) -UNIONFS_PATCH = \ - http://git.alpinelinux.org/cgit/aports/plain/main/unionfs-fuse/0001-include-asm-ioctl.h-for-_IOC_SIZE.patch -UNIONFS_DEPENDENCIES = libfuse host-pkgconf -UNIONFS_LICENSE = BSD-3c -UNIONFS_LICENSE_FILES = LICENSE - -$(eval $(cmake-package)) diff --git a/package.bak/unixodbc/0001-fix-nopthread.patch b/package.bak/unixodbc/0001-fix-nopthread.patch deleted file mode 100644 index 45933e54d6..0000000000 --- a/package.bak/unixodbc/0001-fix-nopthread.patch +++ /dev/null @@ -1,39 +0,0 @@ -Fix pthread detection - -configure.in always calls AC_CHECK_COMP_OPT(pthread) which succeeds with the -toolchain used although it does not contain thread support: - -checking for mutex_lock in -lthread ... no -checking for pthread_mutex_lock in -lpthread... no -checking for pthread_mutex_lock in -lc... no -checking if compiler accepts -pthread... yes -checking for pthread_mutex_lock in -lc... no -checking for pthread_mutex_lock in -lpthread... no - -This positive configure check leads to - - CFLAGS="$CFLAGS -pthread" - -in ./configure, line 15757 which causes a compilation bug -/home/br/br4/output/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/4.8.3/../../../../arm-buildroot-linux-uclibcgnueab - -using this defconfig -http://autobuild.buildroot.net/results/e86/e86e97ff7887f1bdc6bf913498392ff50f56ea88/defconfig - -This patch disables the freebsd-only code path. Patching configure directly -prevents the need for autoreconf. - -Signed-off-by: Bernd Kuhls - -diff -uNr unixODBC-2.3.2.org/configure unixODBC-2.3.2/configure ---- unixODBC-2.3.2.org/configure 2013-10-08 10:56:03.000000000 +0200 -+++ unixODBC-2.3.2/configure 2015-03-13 21:19:59.210429211 +0100 -@@ -15746,7 +15746,7 @@ - - fi - -- if test "x$gotthread" = "xno"; then -+ if test "x$gotthread" = "xnot_needed_for_buildroot"; then - if test "x$ac_cv_c_compiler_gnu" = "xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 - $as_echo_n "checking if compiler accepts -pthread... " >&6; } diff --git a/package.bak/unixodbc/Config.in b/package.bak/unixodbc/Config.in deleted file mode 100644 index c23e0a565c..0000000000 --- a/package.bak/unixodbc/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_UNIXODBC - bool "unixodbc" - help - The unixODBC Project goals are to develop and promote unixODBC - to be the definitive standard for ODBC on non MS Windows platforms. - - http://www.unixodbc.org diff --git a/package.bak/unixodbc/unixodbc.hash b/package.bak/unixodbc/unixodbc.hash deleted file mode 100644 index e99169c15d..0000000000 --- a/package.bak/unixodbc/unixodbc.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz.md5 -md5 bd25d261ca1808c947cb687e2034be81 unixODBC-2.3.4.tar.gz -# Locally computed -sha256 2e1509a96bb18d248bf08ead0d74804957304ff7c6f8b2e5965309c632421e39 unixODBC-2.3.4.tar.gz diff --git a/package.bak/unixodbc/unixodbc.mk b/package.bak/unixodbc/unixodbc.mk deleted file mode 100644 index 280fe57913..0000000000 --- a/package.bak/unixodbc/unixodbc.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# unixodbc -# -################################################################################ - -UNIXODBC_VERSION = 2.3.4 -UNIXODBC_SOURCE = unixODBC-$(UNIXODBC_VERSION).tar.gz -UNIXODBC_SITE = ftp://ftp.unixodbc.org/pub/unixODBC -UNIXODBC_INSTALL_STAGING = YES -UNIXODBC_LICENSE = LGPLv2.1+ (library), GPLv2+ (programs) -UNIXODBC_LICENSE_FILES = COPYING exe/COPYING - -UNIXODBC_CONF_OPTS = --enable-drivers --enable-driver-conf - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -UNIXODBC_CONF_OPTS += --enable-iconv -UNIXODBC_DEPENDENCIES += libiconv -else -UNIXODBC_CONF_OPTS += --disable-iconv -endif - -ifeq ($(BR2_PACKAGE_LIBTOOL),y) -UNIXODBC_CONF_OPTS += --without-included-ltdl -UNIXODBC_DEPENDENCIES += libtool -else -UNIXODBC_CONF_OPTS += --with-included-ltdl -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -UNIXODBC_CONF_OPTS += --enable-readline -UNIXODBC_DEPENDENCIES += readline -else -UNIXODBC_CONF_OPTS += --disable-readline -endif - -$(eval $(autotools-package)) diff --git a/package.bak/unrar/Config.in b/package.bak/unrar/Config.in deleted file mode 100644 index 29696c35aa..0000000000 --- a/package.bak/unrar/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_UNRAR - bool "unrar" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_WCHAR - help - RAR file uncompressor. - - http://www.rarlab.com/rar_add.htm - -comment "unrar needs a toolchain w/ C++, wchar, threads" - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP \ - || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/unrar/unrar.hash b/package.bak/unrar/unrar.hash deleted file mode 100644 index 36450e05e3..0000000000 --- a/package.bak/unrar/unrar.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e470c584332422893fb52e049f2cbd99e24dc6c6da971008b4e2ae4284f8796c unrarsrc-5.4.5.tar.gz diff --git a/package.bak/unrar/unrar.mk b/package.bak/unrar/unrar.mk deleted file mode 100644 index f5a95eacc5..0000000000 --- a/package.bak/unrar/unrar.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# unrar -# -################################################################################ - -UNRAR_VERSION = 5.4.5 -UNRAR_SOURCE = unrarsrc-$(UNRAR_VERSION).tar.gz -UNRAR_SITE = http://www.rarlab.com/rar -UNRAR_LICENSE = unrar -UNRAR_LICENSE_FILES = license.txt - -define UNRAR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CXX="$(TARGET_CXX)" STRIP="/bin/true" \ - CXXFLAGS="$(TARGET_CXXFLAGS) -pthread" \ - LDFLAGS="$(TARGET_LDFLAGS) -pthread" -C $(@D) -endef - -define UNRAR_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) diff --git a/package.bak/unscd/Config.in b/package.bak/unscd/Config.in deleted file mode 100644 index 23cc5a4fcb..0000000000 --- a/package.bak/unscd/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_UNSCD - bool "unscd" - depends on BR2_TOOLCHAIN_USES_GLIBC - help - Micro Name Service Caching Daemon - - A daemon which handles passwd, group and host lookups for - running programs and caches the results for the next query. - You only need this package if you are using slow Name Services - like LDAP, NIS or NIS+. - - This particular NSCD is a complete rewrite of the GNU glibc - nscd which is a single threaded server process which offloads - all NSS lookups to worker children; cache hits are handled by - the parent, and only cache misses start worker children, - making the parent immune to resource leaks, hangs, and crashes - in NSS libraries. - - It should mostly be a drop-in replacement for existing - installs using nscd. - - http://busybox.net/~vda/unscd - -comment "unscd needs a glibc toolchain" - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/unscd/S46unscd b/package.bak/unscd/S46unscd deleted file mode 100644 index 6a51eec130..0000000000 --- a/package.bak/unscd/S46unscd +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -NAME="nscd" -DAEMON="/usr/sbin/${NAME}" -PID_F="/var/run/nscd/${NAME}.pid" - -case "$1" in -start) - printf "Starting ${NAME}: " - start-stop-daemon -S -p ${PID_F} -x ${DAEMON} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -stop) - printf "Stopping ${NAME}: " - start-stop-daemon -K -p ${PID_F} - [ $? -eq 0 ] && echo "OK" || echo "FAIL" - ;; -restart|reload) - $0 stop - $0 start - ;; -*) - echo "Usage: $0 {start|stop|restart|reload}" - exit 1 -esac diff --git a/package.bak/unscd/nscd.conf b/package.bak/unscd/nscd.conf deleted file mode 100644 index 3eb08ab68a..0000000000 --- a/package.bak/unscd/nscd.conf +++ /dev/null @@ -1,33 +0,0 @@ -# /etc/nscd.conf -# -# An example Name Service Cache config file. This file is needed by nscd. -# -server-user unscd -debug-level 0 - -enable-cache passwd yes -positive-time-to-live passwd 600 -negative-time-to-live passwd 20 -suggested-size passwd 1001 -check-files passwd yes - -enable-cache group yes -positive-time-to-live group 3600 -negative-time-to-live group 60 -suggested-size group 1001 -check-files group yes - -# hosts caching is broken with gethostby* calls, hence is now disabled -# by default. Specifically, the caching does not obey DNS TTLs, and -# thus could lead to problems if the positive-time-to-live is -# significantly larger than the actual TTL. -# -# You should really use a caching nameserver instead of nscd for this -# sort of request. However, you can easily re-enable this by default. -enable-cache hosts no -positive-time-to-live hosts 3600 -negative-time-to-live hosts 20 -suggested-size hosts 1001 -check-files hosts yes - -# unscd does not support services caching diff --git a/package.bak/unscd/unscd.hash b/package.bak/unscd/unscd.hash deleted file mode 100644 index ab8ffdc0cf..0000000000 --- a/package.bak/unscd/unscd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 4c1f83dcd120469fceef749050cb29fa666fa4666bd308dfe92e933a4c200d55 nscd-0.52.c diff --git a/package.bak/unscd/unscd.mk b/package.bak/unscd/unscd.mk deleted file mode 100644 index 54caeb1f95..0000000000 --- a/package.bak/unscd/unscd.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# unscd -# -################################################################################ - -UNSCD_VERSION = 0.52 -UNSCD_SOURCE = nscd-$(UNSCD_VERSION).c -UNSCD_SITE = http://busybox.net/~vda/unscd -UNSCD_LICENSE = GPLv2 -UNSCD_LICENSE_FILES = $(UNSCD_SOURCE) - -define UNSCD_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ -endef - -define UNSCD_BUILD_CMDS - cd $(@D); \ - $(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -o nscd $(UNSCD_SOURCE) -endef - -define UNSCD_INSTALL_TARGET_CMDS - $(INSTALL) -m 755 -D $(@D)/nscd $(TARGET_DIR)/usr/sbin/nscd - $(INSTALL) -m 600 -D package/unscd/nscd.conf $(TARGET_DIR)/etc/nscd.conf -endef - -define UNSCD_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/unscd/S46unscd \ - $(TARGET_DIR)/etc/init.d/S46unscd -endef - -define UNSCD_USERS - unscd -1 unscd -1 * - - - unscd user -endef - -$(eval $(generic-package)) diff --git a/package.bak/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch b/package.bak/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch deleted file mode 100644 index cbc58e484b..0000000000 --- a/package.bak/unzip/0001-Add-a-CMakeFile.txt-to-ease-cross-compilation.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 992a497e9c5c421d3931e02a01e9d7c159f27135 Mon Sep 17 00:00:00 2001 -From: Luca Ceresoli -Date: Thu, 26 Nov 2015 12:49:10 +0100 -Subject: [PATCH] Add a CMakeFile.txt to ease cross-compilation - -Info-ZIP's UnZip 6.0 has a complex, hand-crafted Makefile with a -companion configure script which try to support an extremely wide -range of UNIX-like operating systems. The result is an overly complex -mass of code that does not support cross-compilation in several ways. - -Zip 3.0 has a similar build system, and has as many as 6 patches in -Buildroot to cross-compile [0]. UnZip fails at building even with -these patches adapted and a few more on top of them. - -Instead of tweaking and fixing a huge and complex build system, skip -it entirely and add a pretty simple CMakeLists.txt that cross-compiles -smoothly using CMake. It also preserves all of the Buildroot-provided -build options and flags as the original Makefile does. - -[0] http://git.buildroot.net/buildroot/tree/package/infozip?id=2015.11-rc3 - -Signed-off-by: Luca Ceresoli ---- - CMakeLists.txt | 17 +++++++++++++++++ - 1 file changed, 17 insertions(+) - create mode 100644 CMakeLists.txt - -diff --git a/CMakeLists.txt b/CMakeLists.txt -new file mode 100644 -index 0000000..27951b4 ---- /dev/null -+++ b/CMakeLists.txt -@@ -0,0 +1,17 @@ -+cmake_minimum_required(VERSION 2.8) -+INCLUDE(CheckFunctionExists) -+ -+project(unzip C) -+ -+CHECK_FUNCTION_EXISTS(lchmod HAVE_LCHMOD) -+if(NOT HAVE_LCHMOD) -+add_definitions("-DNO_LCHMOD") -+endif() -+ -+set(UNZIP_SOURCES unzip.c crc32.c crypt.c envargs.c explode.c -+ extract.c fileio.c globals.c inflate.c list.c match.c process.c -+ ttyio.c ubz2err.c unreduce.c unshrink.c zipinfo.c unix/unix.c) -+ -+include_directories(.) -+add_executable(unzip ${UNZIP_SOURCES}) -+install(TARGETS unzip DESTINATION bin) --- -1.9.1 - diff --git a/package.bak/unzip/Config.in b/package.bak/unzip/Config.in deleted file mode 100644 index da6902e4d7..0000000000 --- a/package.bak/unzip/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_UNZIP - bool "unzip" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - UnZip is an extraction utility for archives compressed in - .zip format (also called "zipfiles"). Although highly - compatible both with PKWARE's PKZIP and PKUNZIP utilities - for MS-DOS and with Info-ZIP's own Zip program, our primary - objectives have been portability and non-MSDOS - functionality. - - http://www.info-zip.org/UnZip.html diff --git a/package.bak/unzip/unzip.hash b/package.bak/unzip/unzip.hash deleted file mode 100644 index a138cc27c9..0000000000 --- a/package.bak/unzip/unzip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37 unzip60.tgz diff --git a/package.bak/unzip/unzip.mk b/package.bak/unzip/unzip.mk deleted file mode 100644 index 7d48d25309..0000000000 --- a/package.bak/unzip/unzip.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# unzip -# -################################################################################ - -UNZIP_VERSION = 60 -UNZIP_SOURCE = unzip$(UNZIP_VERSION).tgz -UNZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src -# take precedence over busybox implementation -UNZIP_DEPENDENCIES = $(if $(BR2_PACKAGE_BUSYBOX),busybox) -UNZIP_LICENSE = Info-ZIP -UNZIP_LICENSE_FILES = LICENSE - -$(eval $(cmake-package)) diff --git a/package.bak/upmpdcli/Config.in b/package.bak/upmpdcli/Config.in deleted file mode 100644 index 48720347fd..0000000000 --- a/package.bak/upmpdcli/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_UPMPDCLI - bool "upmpdcli" - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnpp, libmicrohttpd - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # C++11 - select BR2_PACKAGE_JSONCPP - select BR2_PACKAGE_LIBMICROHTTPD - select BR2_PACKAGE_LIBMPDCLIENT - select BR2_PACKAGE_LIBUPNPP - help - upmpdcli is a UPnP Media Renderer front-end for MPD, the Music - Player Daemon. It supports UPnP gapless track transitions and - the OpenHome ohMedia services. - - http://www.lesbonscomptes.com/upmpdcli/ - -comment "upmpdcli needs a toolchain w/ C++, threads, gcc >= 4.7" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package.bak/upmpdcli/S99upmpdcli b/package.bak/upmpdcli/S99upmpdcli deleted file mode 100644 index 71d19a58e5..0000000000 --- a/package.bak/upmpdcli/S99upmpdcli +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/sh - -NAME=upmpdcli -DAEMON=/usr/bin/$NAME -CONFFILE=/etc/$NAME.conf -PIDFILE=/var/run/$NAME.pid -DAEMON_ARGS="-D -c $CONFFILE" - -# Sanity checks -test -f $DAEMON || exit 0 - -start() { - printf "Starting $NAME: " - start-stop-daemon --start --quiet --background --exec $DAEMON \ - -- $DAEMON_ARGS \ - && echo "OK" || echo "FAIL" -} - -stop() { - printf "Stopping $NAME: " - start-stop-daemon --stop --quiet --pidfile $PIDFILE \ - && echo "OK" || echo "FAIL" -} - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - sleep 1 - start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 -esac diff --git a/package.bak/upmpdcli/upmpdcli.hash b/package.bak/upmpdcli/upmpdcli.hash deleted file mode 100644 index bcd78318cf..0000000000 --- a/package.bak/upmpdcli/upmpdcli.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.lesbonscomptes.com/upmpdcli/downloads/upmpdcli-1.2.12.tar.gz.sha256: -sha256 20d97c2e5ff6911e1e1538edb1487823479802cba6bd4f4c4a74035edf61cb26 upmpdcli-1.2.12.tar.gz diff --git a/package.bak/upmpdcli/upmpdcli.mk b/package.bak/upmpdcli/upmpdcli.mk deleted file mode 100644 index 83efa0530b..0000000000 --- a/package.bak/upmpdcli/upmpdcli.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# upmpdcli -# -################################################################################ - -UPMPDCLI_VERSION = 1.2.12 -UPMPDCLI_SITE = http://www.lesbonscomptes.com/upmpdcli/downloads -UPMPDCLI_LICENSE = GPLv2+ -UPMPDCLI_LICENSE_FILES = COPYING -UPMPDCLI_DEPENDENCIES = host-pkgconf libmpdclient libupnpp libmicrohttpd jsoncpp - -# Upmpdcli only runs if user upmpdcli exists -define UPMPDCLI_USERS - upmpdcli -1 upmpdcli -1 * - - - Upmpdcli MPD UPnP Renderer Front-End -endef - -define UPMPDCLI_INSTALL_INIT_SYSV - $(INSTALL) -D -m 0755 package/upmpdcli/S99upmpdcli $(TARGET_DIR)/etc/init.d/S99upmpdcli -endef - -define UPMPDCLI_INSTALL_INIT_SYSTEMD - $(INSTALL) -D -m 644 $(@D)/systemd/upmpdcli.service \ - $(TARGET_DIR)/usr/lib/systemd/system/upmpdcli.service - mkdir -p $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants - ln -sf ../../../../usr/lib/systemd/system/upmpdcli.service \ - $(TARGET_DIR)/etc/systemd/system/multi-user.target.wants/upmpdcli.service -endef - -define UPMPDCLI_INSTALL_CONF_FILE - $(INSTALL) -D -m 0755 $(@D)/src/upmpdcli.conf-dist $(TARGET_DIR)/etc/upmpdcli.conf -endef - -UPMPDCLI_POST_INSTALL_TARGET_HOOKS += UPMPDCLI_INSTALL_CONF_FILE - -$(eval $(autotools-package)) diff --git a/package.bak/upower/0001-daemon-fix-get_critical_action.patch b/package.bak/upower/0001-daemon-fix-get_critical_action.patch deleted file mode 100644 index 02fc55c484..0000000000 --- a/package.bak/upower/0001-daemon-fix-get_critical_action.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 28cee8e2845b094488c337c4ecfa84ada0b6be60 Mon Sep 17 00:00:00 2001 -From: Martin Pitt -Date: Tue, 23 Feb 2016 09:51:07 +0100 -Subject: [PATCH] daemon: fix get_critical_action() - -Fix copy&paste error from e7e9156f that called the wrong _complete_ function -for up_daemon_get_critical_action(). - -https://bugs.freedesktop.org/show_bug.cgi?id=94262 - -[rebase on 0.99.4] -Signed-off-by: Romain Naour ---- - src/up-daemon.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/up-daemon.c b/src/up-daemon.c -index be14cbe..e95f904 100644 ---- a/src/up-daemon.c -+++ b/src/up-daemon.c -@@ -435,8 +435,8 @@ up_daemon_get_critical_action (UpExportedDaemon *skeleton, - GDBusMethodInvocation *invocation, - UpDaemon *daemon) - { -- up_exported_daemon_complete_get_display_device (skeleton, invocation, -- up_backend_get_critical_action (daemon->priv->backend)); -+ up_exported_daemon_complete_get_critical_action (skeleton, invocation, -+ up_backend_get_critical_action (daemon->priv->backend)); - return TRUE; - } - --- -2.9.3 - diff --git a/package.bak/upower/Config.in b/package.bak/upower/Config.in deleted file mode 100644 index 8d9e84e694..0000000000 --- a/package.bak/upower/Config.in +++ /dev/null @@ -1,26 +0,0 @@ -config BR2_PACKAGE_UPOWER - bool "upower" - depends on BR2_PACKAGE_HAS_UDEV - depends on BR2_TOOLCHAIN_HAS_THREADS # libgudev, libusb - depends on BR2_USE_MMU # libgudev - depends on BR2_USE_WCHAR # libgudev - select BR2_PACKAGE_LIBGUDEV - select BR2_PACKAGE_LIBUSB - help - UPower is an abstraction for enumerating power devices, listening - to device events and querying history and statistics. Any - application or service on the system can access the - org.freedesktop.UPower service via the system message bus. - - Note: upowerd require CONFIG_TIMER_STATS enabled in the Linux - kernel. - - https://upower.freedesktop.org/ - -comment "upower needs udev /dev management" - depends on BR2_USE_MMU - depends on !BR2_PACKAGE_HAS_UDEV - -comment "upower needs a toolchain w/ threads, wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/upower/upower.hash b/package.bak/upower/upower.hash deleted file mode 100644 index 0df67b449d..0000000000 --- a/package.bak/upower/upower.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9ca325a6ccef505529b268ebbbd9becd0ce65a65f6ac7ee31e2e5b17648037b0 upower-0.99.4.tar.xz diff --git a/package.bak/upower/upower.mk b/package.bak/upower/upower.mk deleted file mode 100644 index 471eb419cc..0000000000 --- a/package.bak/upower/upower.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# upower -# -################################################################################ - -UPOWER_VERSION = 0.99.4 -UPOWER_SOURCE = upower-$(UPOWER_VERSION).tar.xz -UPOWER_SITE = https://upower.freedesktop.org/releases -UPOWER_LICENSE = GPLv2+ -UPOWER_LICENSE_FILES = COPYING - -# libupower-glib.so -UPOWER_INSTALL_STAGING = YES - -UPOWER_DEPENDENCIES = \ - host-intltool \ - host-pkgconf \ - libgudev \ - libusb \ - udev - -UPOWER_CONF_OPTS = --disable-man-pages --disable-tests - -$(eval $(autotools-package)) diff --git a/package.bak/upx/upx.hash b/package.bak/upx/upx.hash deleted file mode 100644 index bfcf9326f9..0000000000 --- a/package.bak/upx/upx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c upx-3.91-src.tar.bz2 diff --git a/package.bak/upx/upx.mk b/package.bak/upx/upx.mk deleted file mode 100644 index eaef27590a..0000000000 --- a/package.bak/upx/upx.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# upx -# -################################################################################ - -UPX_VERSION = 3.91 -UPX_SITE = http://upx.sourceforge.net/download -UPX_SOURCE = upx-$(UPX_VERSION)-src.tar.bz2 -UPX_LICENSE = GPLv2+ -UPX_LICENSE_FILES = COPYING - -HOST_UPX_DEPENDENCIES = host-ucl host-zlib - -# We need to specify all, otherwise the default target only prints a message -# stating to "please choose a target for 'make'"... :-( -define HOST_UPX_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) CPPFLAGS="$(HOST_CPPFLAGS)" \ - LDFLAGS="$(HOST_LDFLAGS)" UPX_UCLDIR=$(HOST_DIR)/usr \ - CXXFLAGS_WERROR= \ - -C $(@D) all -endef - -# UPX has no install procedure, so install it manually. -define HOST_UPX_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/src/upx.out $(HOST_DIR)/usr/bin/upx -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/urg/0001-select-h.patch b/package.bak/urg/0001-select-h.patch deleted file mode 100644 index 1d09bb57b2..0000000000 --- a/package.bak/urg/0001-select-h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 08c7ebec7c58fbc9c1cc0542863b34119c75c91f Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Thu, 15 Sep 2016 06:19:57 +0200 -Subject: [PATCH] Serial driver: add missing header to C and C++ serial driver - -Fixes: - http://autobuild.buildroot.net/results/cd7/cd76699188d2ee99b5f2d32b6a797de0d832a192/ - -Signed-off-by: Samuel Martin ---- - src/c/connection/serial_ctrl_lin.c | 1 + - src/cpp/connection/SerialDevice_lin.cpp | 1 + - 2 files changed, 2 insertions(+) - -Index: b/src/c/connection/serial_ctrl_lin.c -=================================================================== ---- a/src/c/connection/serial_ctrl_lin.c -+++ b/src/c/connection/serial_ctrl_lin.c -@@ -18,6 +18,7 @@ - #include - #include - -+#include - //#include - - enum { -Index: b/src/cpp/connection/SerialDevice_lin.cpp -=================================================================== ---- a/src/cpp/connection/SerialDevice_lin.cpp -+++ b/src/cpp/connection/SerialDevice_lin.cpp -@@ -13,7 +13,7 @@ - #include - #include - #include -- -+#include - - class RawSerialDevice - { diff --git a/package.bak/urg/0002-urg-gcc6-fix-narrowing-conversion.patch b/package.bak/urg/0002-urg-gcc6-fix-narrowing-conversion.patch deleted file mode 100644 index e3db898049..0000000000 --- a/package.bak/urg/0002-urg-gcc6-fix-narrowing-conversion.patch +++ /dev/null @@ -1,99 +0,0 @@ -urg: fix 'narrowing conversion' with gcc6 - -Fixes: - http://autobuild.buildroot.net/results/d0c/d0cd11163753db69a14c02e941dbda40e5f98bba/ - -Signed-off-by: Samuel Martin - ---- a/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:16.083995214 +0200 -+++ b/src/cpp/urg/ScipHandler.cpp 2016-09-11 16:11:24.380832543 +0200 -@@ -120,7 +120,7 @@ struct ScipHandler::pImpl - - // QT ̔s - int return_code = -1; -- char qt_expected_response[] = { 0, -1 }; -+ char qt_expected_response[] = { 0, (char)-1 }; - // return_code g߁AsetLaserOutput() p QT 𑗐M - if (response(return_code, "QT\n", qt_expected_response)) { - laser_state_ = LaserOff; -@@ -139,7 +139,7 @@ struct ScipHandler::pImpl - - } else if (return_code == Scip11Response) { - // SCIP1.1 vgȐꍇ̂݁ASCIP2.0 𑗐M -- char scip20_expected_response[] = { 0, -1 }; -+ char scip20_expected_response[] = { 0, (char)-1 }; - if (! response(return_code, "SCIP2.0\n", scip20_expected_response)) { - error_message_ = - "SCIP1.1 protocol is not supported. Please update URG firmware, or reconnect after a few seconds because sensor is booting."; -@@ -150,7 +150,7 @@ struct ScipHandler::pImpl - - } else if (return_code == 0xE) { - // TM [hƂ݂ȂATM2 𔭍s -- char tm2_expected_response[] = { 0, -1 }; -+ char tm2_expected_response[] = { 0, (char)-1 }; - if (response(return_code, "TM2\n", tm2_expected_response)) { - laser_state_ = LaserOff; - return changeBothBaudrate(baudrate); -@@ -202,7 +202,7 @@ struct ScipHandler::pImpl - snprintf(send_buffer, 10, "SS%06ld\n", baudrate); - int return_code = -1; - // !!! ɐݒΏۂ̃{[[gȀꍇ̖߂l ss_expected... ɒlj -- char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, -1 }; -+ char ss_expected_response[] = { 0, 0x3, 0x4, 0xf, (char)-1 }; - if (! response(return_code, send_buffer, ss_expected_response)) { - error_message_ = "Baudrate change fail."; - return false; -@@ -216,7 +216,7 @@ struct ScipHandler::pImpl - { - // PP ̑Mƃf[^̎M - int return_code = -1; -- char pp_expected_response[] = { 0, -1 }; -+ char pp_expected_response[] = { 0, (char)-1 }; - vector lines; - if (! response(return_code, "PP\n", pp_expected_response, &lines)) { - error_message_ = "PP fail."; -@@ -356,7 +356,7 @@ struct ScipHandler::pImpl - - if (on) { - int return_code = -1; -- char expected_response[] = { 0, -1 }; -+ char expected_response[] = { 0, (char)-1 }; - if (! response(return_code, "BM\n", expected_response)) { - error_message_ = "BM fail."; - return false; -@@ -369,7 +369,7 @@ struct ScipHandler::pImpl - if (! mx_capturing_) { - // 邽߂ QT ł́A҂‚ׂ - int return_code = -1; -- char qt_expected_response[] = { 0, -1 }; -+ char qt_expected_response[] = { 0, (char)-1 }; - if (! response(return_code, "QT\n", qt_expected_response)) { - return false; - } -@@ -777,7 +777,7 @@ bool ScipHandler::loadParameter(RangeSen - bool ScipHandler::versionLines(vector& lines) - { - int return_code = -1; -- char expected_response[] = { 0, -1 }; -+ char expected_response[] = { 0, (char)-1 }; - if (! pimpl->response(return_code, "VV\n", expected_response, &lines)) { - return false; - } -@@ -792,7 +792,7 @@ bool ScipHandler::setRawTimestampMode(bo - - // TM0 or TM2 ̑M - int return_code = -1; -- char expected_response[] = { 0, -1 }; -+ char expected_response[] = { 0, (char)-1 }; - if (! pimpl->response(return_code, send_command, expected_response)) { - pimpl->error_message_ = (on) ? "TM0 fail." : "TM2 fail."; - return false; -@@ -809,7 +809,7 @@ bool ScipHandler::rawTimestamp(int* time - { - // TM1 ̒lԂ - int return_code = -1; -- char expected_response[] = { 0, -1 }; -+ char expected_response[] = { 0, (char)-1 }; - vector lines; - if (! pimpl->response(return_code, "TM1\n", expected_response, &lines)) { - pimpl->error_message_ = "TM1 fail."; diff --git a/package.bak/urg/Config.in b/package.bak/urg/Config.in deleted file mode 100644 index c602624257..0000000000 --- a/package.bak/urg/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_URG - bool "urg" - depends on BR2_INSTALL_LIBSTDCPP - help - Library to control Hokuyo's URG series sensors. - - https://sourceforge.net/p/urgnetwork/wiki/Home/ - -comment "urg needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/urg/urg.hash b/package.bak/urg/urg.hash deleted file mode 100644 index 41749d7245..0000000000 --- a/package.bak/urg/urg.hash +++ /dev/null @@ -1,4 +0,0 @@ -# from http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/ -md5 93f90d2ccc36e784407c5282ef6bd2cb urg-0.8.18.zip -# Locally calculated -sha256 b2cab7e539c90c60fc99a2350a42b5d5390ff952b694b196c3cbb54623cfee7f urg-0.8.18.zip diff --git a/package.bak/urg/urg.mk b/package.bak/urg/urg.mk deleted file mode 100644 index 5d49aeb41d..0000000000 --- a/package.bak/urg/urg.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# urg -# -################################################################################ - -URG_VERSION = 0.8.18 -URG_SITE = http://pkgs.fedoraproject.org/repo/pkgs/urg/urg-0.8.18.zip/md5/93f90d2ccc36e784407c5282ef6bd2cb -URG_SOURCE = urg-$(URG_VERSION).zip -URG_LICENSE = LGPLv3 -URG_LICENSE_FILES = COPYING - -URG_INSTALL_STAGING = YES - -ifeq ($(BR2_PACKAGE_SDL)$(BR2_PACKAGE_SDL_NET),yy) -URG_DEPENDENCIES += sdl sdl_net -URG_CONF_OPTS += \ - --with-sdl-prefix=$(STAGING_DIR)/usr \ - --with-sdl-exec-prefix=$(STAGING_DIR)/usr -else -URG_CONF_OPTS = --without-sdl -URG_CONF_ENV += ac_cv_path_SDL_CONFIG="" -endif - -URG_CONFIG_SCRIPTS = c_urg-config urg-config - -define URG_EXTRACT_CMDS - $(RM) -rf $(URG_DIR) - $(UNZIP) -d $(BUILD_DIR)/ $(DL_DIR)/$(URG_SOURCE) - test -d $(URG_DIR) || \ - mv $(BUILD_DIR)/$(subst .zip,,$(URG_SOURCE)) $(URG_DIR) -endef - -$(eval $(autotools-package)) diff --git a/package.bak/usb_modeswitch/Config.in b/package.bak/usb_modeswitch/Config.in deleted file mode 100644 index f709a550c1..0000000000 --- a/package.bak/usb_modeswitch/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_USB_MODESWITCH - bool "usb_modeswitch" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - Some USB devices such as 3G/4G broadband modems power-up - in mass storage mode to provide access to drivers - for the device's application mode. usb_modeswitch - changes the mode of such devices from the initial power-up - mode to the application mode. - Specific configuration data for each device model is required. - - usb_modeswitch can be used with the usb_modeswitch_data - package and eudev/systemd for automatic mode switching - when devices are connected. - - For more information search the Internet for "Virtual CD-ROM - switching utility". - - http://www.draisberghof.de/usb_modeswitch/ - -comment "usb_modeswitch needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/usb_modeswitch/usb_modeswitch.hash b/package.bak/usb_modeswitch/usb_modeswitch.hash deleted file mode 100644 index 807b63f023..0000000000 --- a/package.bak/usb_modeswitch/usb_modeswitch.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 17dc32bf10df8e370f2369b5137d34dfd8f2347faaa51524c5f21c922f42e212 usb-modeswitch-2.4.0.tar.bz2 diff --git a/package.bak/usb_modeswitch/usb_modeswitch.mk b/package.bak/usb_modeswitch/usb_modeswitch.mk deleted file mode 100644 index e196db582d..0000000000 --- a/package.bak/usb_modeswitch/usb_modeswitch.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# usb_modeswitch -# -################################################################################ - -USB_MODESWITCH_VERSION = 2.4.0 -USB_MODESWITCH_SOURCE = usb-modeswitch-$(USB_MODESWITCH_VERSION).tar.bz2 -USB_MODESWITCH_SITE = http://www.draisberghof.de/usb_modeswitch -USB_MODESWITCH_DEPENDENCIES = libusb -USB_MODESWITCH_LICENSE = GPLv2+ -USB_MODESWITCH_LICENSE_FILES = COPYING - -USB_MODESWITCH_BUILD_TARGETS = static -USB_MODESWITCH_INSTALL_TARGETS = install-static - -ifeq ($(BR2_PACKAGE_TCL)$(BR2_PACKAGE_TCL_SHLIB_ONLY),y) -USB_MODESWITCH_DEPENDENCIES += tcl -USB_MODESWITCH_BUILD_TARGETS = script -USB_MODESWITCH_INSTALL_TARGETS = install-script -endif - -define USB_MODESWITCH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -Wall -I." \ - -C $(@D) $(USB_MODESWITCH_BUILD_TARGETS) -endef - -define USB_MODESWITCH_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - DESTDIR=$(TARGET_DIR) \ - -C $(@D) $(USB_MODESWITCH_INSTALL_TARGETS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/usb_modeswitch_data/0001-makefile.patch b/package.bak/usb_modeswitch_data/0001-makefile.patch deleted file mode 100644 index 28441fe003..0000000000 --- a/package.bak/usb_modeswitch_data/0001-makefile.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fixed Makefile install sections to not reload udev rules. In a -cross-compiler environment, it is not wanted to reload the host udev rules. - -Signed-off-by: J.C. Woltz -Signed-off-by: Patrick Ziegler ---- a/Makefile 2013-06-10 22:32:53.000000000 +0200 -+++ b/Makefile 2013-06-11 10:38:03.181161401 +0200 -@@ -13,9 +13,9 @@ - clean: - $(RM) 40-usb_modeswitch.rules - --install: all files-install db-install rules-reload -+install: all files-install db-install - --install-packed: files-install db-install-packed rules-reload -+install-packed: files-install db-install-packed - - files-install: - install -d $(PREFIX)/share/usb_modeswitch -@@ -54,7 +54,7 @@ - fi \ - fi - --uninstall: files-uninstall rules-reload -+uninstall: files-uninstall - - files-uninstall: - $(RM) $(RULESDIR)/40-usb_modeswitch.rules diff --git a/package.bak/usb_modeswitch_data/Config.in b/package.bak/usb_modeswitch_data/Config.in deleted file mode 100644 index ad96726ad6..0000000000 --- a/package.bak/usb_modeswitch_data/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_USB_MODESWITCH_DATA - bool "usb_modeswitch_data" - select BR2_PACKAGE_USB_MODESWITCH - depends on BR2_TOOLCHAIN_HAS_THREADS # usb_modeswitch -> libusb - help - USB mode switch data - Contains udev rules and events to allow usb_modeswitch to - function automatically - - http://www.draisberghof.de/usb_modeswitch/ - -comment "usb_modeswitch_data needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/usb_modeswitch_data/usb_modeswitch_data.hash b/package.bak/usb_modeswitch_data/usb_modeswitch_data.hash deleted file mode 100644 index 0df5475ea3..0000000000 --- a/package.bak/usb_modeswitch_data/usb_modeswitch_data.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d679a44a48b1d1f243fea6b4d2bd54e0e08010ff579dd81eaf698954c0c6dfa7 usb-modeswitch-data-20160112.tar.bz2 diff --git a/package.bak/usb_modeswitch_data/usb_modeswitch_data.mk b/package.bak/usb_modeswitch_data/usb_modeswitch_data.mk deleted file mode 100644 index a0cbc126df..0000000000 --- a/package.bak/usb_modeswitch_data/usb_modeswitch_data.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# usb_modeswitch_data -# -################################################################################ - -USB_MODESWITCH_DATA_VERSION = 20160112 -USB_MODESWITCH_DATA_SOURCE = usb-modeswitch-data-$(USB_MODESWITCH_DATA_VERSION).tar.bz2 -USB_MODESWITCH_DATA_SITE = http://www.draisberghof.de/usb_modeswitch -USB_MODESWITCH_DATA_DEPENDENCIES = usb_modeswitch -USB_MODESWITCH_DATA_LICENSE = GPLv2+ -USB_MODESWITCH_DATA_LICENSE_FILES = COPYING - -# Nothing to build, it is a pure data package - -define USB_MODESWITCH_DATA_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/usbmount/0001-rules-fix.patch b/package.bak/usbmount/0001-rules-fix.patch deleted file mode 100644 index c71b613c8a..0000000000 --- a/package.bak/usbmount/0001-rules-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -Signed-off-by: Yegor Yefremov ---- - usbmount.rules | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -Index: b/usbmount.rules -=================================================================== ---- a/usbmount.rules -+++ b/usbmount.rules -@@ -1,7 +1,7 @@ - # Rules for USBmount -*- conf -*- - - KERNEL=="sd*", DRIVERS=="sbp2", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" --KERNEL=="sd*", SUBSYSTEMS=="usb", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" --KERNEL=="ub*", SUBSYSTEMS=="usb", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" -+KERNEL=="sd*", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" -+KERNEL=="ub*", SUBSYSTEM=="block", ACTION=="add", RUN+="/usr/share/usbmount/usbmount add" - KERNEL=="sd*", ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove" - KERNEL=="ub*", ACTION=="remove", RUN+="/usr/share/usbmount/usbmount remove" diff --git a/package.bak/usbmount/0002-use-udev-environment-instead-of-blkid.patch b/package.bak/usbmount/0002-use-udev-environment-instead-of-blkid.patch deleted file mode 100644 index 27928b5d54..0000000000 --- a/package.bak/usbmount/0002-use-udev-environment-instead-of-blkid.patch +++ /dev/null @@ -1,71 +0,0 @@ -udev can provide all the values that usbmount determined using the -blkid binary. This patch drops use of blkid in favor of using the -environment variables set by udev. Thus it removes the dependency -on blkid from usbmount. - -Signed-off-by: Sven Neumann ---- usbmount-0.0.22/usbmount.orig 2013-06-18 14:44:40.143096147 +0200 -+++ usbmount-0.0.22/usbmount 2013-06-19 16:13:09.882434896 +0200 -@@ -59,11 +59,6 @@ - exit 0 - fi - --if [ ! -x /sbin/blkid ]; then -- log err "cannot execute /sbin/blkid" -- exit 1 --fi -- - # Per Policy 9.3.2, directories under /var/run have to be created - # after every reboot. - if [ ! -e /var/run/usbmount ]; then -@@ -83,15 +78,7 @@ - trap '( lockfile-remove /var/run/usbmount/.mount )' 0 - log debug "acquired lock /var/run/usbmount/.mount.lock" - -- # Grab device information from device and "divide it" -- # FIXME: improvement: implement mounting by label (notice that labels -- # can contain spaces, which makes things a little bit less comfortable). -- DEVINFO=$(/sbin/blkid -p $DEVNAME) -- FSTYPE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]TYPE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') -- UUID=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]UUID="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') -- USAGE=$(echo "$DEVINFO" | sed 's/.*[[:blank:]]USAGE="\([^"]*\)".*/\1/g; s/[[:blank:]]*//g;') -- -- if ! echo $USAGE | egrep -q "(filesystem|disklabel)"; then -+ if ! echo $ID_FS_USAGE | egrep -q "(filesystem|disklabel)"; then - log info "$DEVNAME does not contain a filesystem or disklabel" - exit 1 - fi -@@ -101,14 +88,14 @@ - log info "executing command: mount $DEVNAME" - mount $DEVNAME || log err "mount by DEVNAME with $DEVNAME wasn't successful; return code $?" - -- elif grep -q "^[[:blank:]]*UUID=$UUID" /etc/fstab; then -- log info "executing command: mount -U $UUID" -- mount -U $UUID || log err "mount by UUID with $UUID wasn't successful; return code $?" -+ elif grep -q "^[[:blank:]]*UUID=$ID_FS_UUID" /etc/fstab; then -+ log info "executing command: mount -U $ID_FS_UUID" -+ mount -U $ID_FS_UUID || log err "mount by UUID with $ID_FS_UUID wasn't successful; return code $?" - - else -- log debug "$DEVNAME contains filesystem type $FSTYPE" -+ log debug "$DEVNAME contains filesystem type $ID_FS_TYPE" - -- fstype=$FSTYPE -+ fstype=$ID_FS_TYPE - # Test if the filesystem type is in the list of filesystem - # types to mount. - if in_list "$fstype" "$FILESYSTEMS"; then -@@ -176,11 +163,13 @@ - - # Run hook scripts; ignore errors. - export UM_DEVICE="$DEVNAME" -+ export UM_UUID="$ID_FS_UUID" - export UM_MOUNTPOINT="$mountpoint" - export UM_FILESYSTEM="$fstype" - export UM_MOUNTOPTIONS="$options" - export UM_VENDOR="$vendor" - export UM_MODEL="$model" -+ export UM_LABEL="$ID_FS_LABEL" - log info "executing command: run-parts /etc/usbmount/mount.d" - run-parts /etc/usbmount/mount.d || : - else diff --git a/package.bak/usbmount/Config.in b/package.bak/usbmount/Config.in deleted file mode 100644 index 0bb8883b96..0000000000 --- a/package.bak/usbmount/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_USBMOUNT - bool "usbmount" - depends on BR2_PACKAGE_HAS_UDEV - select BR2_PACKAGE_LOCKFILE_PROGS - help - The usbmount package automatically mounts USB mass storage devices - when they are plugged in, and unmounts them when they are removed. - - http://usbmount.alioth.debian.org/ - -comment "usbmount requires udev to be enabled" - depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/usbmount/usbmount.hash b/package.bak/usbmount/usbmount.hash deleted file mode 100644 index 4a5c7f202d..0000000000 --- a/package.bak/usbmount/usbmount.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/u/usbmount/usbmount_0.0.22.dsc -sha256 a2b8581534b6c92f0376d202639dbc28862d3834dac64c35bde752f84975527d usbmount_0.0.22.tar.gz diff --git a/package.bak/usbmount/usbmount.mk b/package.bak/usbmount/usbmount.mk deleted file mode 100644 index 066cbb828a..0000000000 --- a/package.bak/usbmount/usbmount.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# usbmount -# -################################################################################ - -USBMOUNT_VERSION = 0.0.22 -USBMOUNT_SOURCE = usbmount_$(USBMOUNT_VERSION).tar.gz -USBMOUNT_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/u/usbmount -USBMOUNT_DEPENDENCIES = udev lockfile-progs -USBMOUNT_LICENSE = BSD-2c -USBMOUNT_LICENSE_FILES = debian/copyright - -define USBMOUNT_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/usbmount $(TARGET_DIR)/usr/share/usbmount/usbmount - - $(INSTALL) -m 0755 -D $(@D)/00_create_model_symlink \ - $(TARGET_DIR)/etc/usbmount/mount.d/00_create_model_symlink - $(INSTALL) -m 0755 -D $(@D)/00_remove_model_symlink \ - $(TARGET_DIR)/etc/usbmount/umount.d/00_remove_model_symlink - - $(INSTALL) -m 0644 -D $(@D)/usbmount.rules $(TARGET_DIR)/lib/udev/rules.d/usbmount.rules - $(INSTALL) -m 0644 -D $(@D)/usbmount.conf $(TARGET_DIR)/etc/usbmount/usbmount.conf - - mkdir -p $(addprefix $(TARGET_DIR)/media/usb,0 1 2 3 4 5 6 7) -endef - -$(eval $(generic-package)) diff --git a/package.bak/usbredir/Config.in b/package.bak/usbredir/Config.in deleted file mode 100644 index 2157f9ce67..0000000000 --- a/package.bak/usbredir/Config.in +++ /dev/null @@ -1,29 +0,0 @@ -comment "usbredir needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_USBREDIR - bool "usbredir" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - select BR2_PACKAGE_LIBUSB - help - usbredir is the name of a network protocol for sending usb device - traffic over a network connection. It is also the name of the - software package offering a parsing library, a usbredirhost library - and several utilities implementing this protocol. - - Note: only the library is installed, not the utilities. Say 'y' - below if you want the server too. - - http://www.spice-space.org/page/UsbRedir - -if BR2_PACKAGE_USBREDIR - -config BR2_PACKAGE_USBREDIR_SERVER - bool "usbredirserver on target" - help - If you want to serve usbredir requests on your target, say 'y' - here to have the usbredir server on the target. - - Note: the server is not required to use the library. - -endif diff --git a/package.bak/usbredir/usbredir.hash b/package.bak/usbredir/usbredir.hash deleted file mode 100644 index 9ba11771b4..0000000000 --- a/package.bak/usbredir/usbredir.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 407e9e27a1369f01264d5501ffbe88935ddd7d5de675f5835db05dc9c9ac56f3 usbredir-0.7.1.tar.bz2 diff --git a/package.bak/usbredir/usbredir.mk b/package.bak/usbredir/usbredir.mk deleted file mode 100644 index 6765a9baac..0000000000 --- a/package.bak/usbredir/usbredir.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# usbredir -# -################################################################################ - -USBREDIR_VERSION = 0.7.1 -USBREDIR_SOURCE = usbredir-$(USBREDIR_VERSION).tar.bz2 -USBREDIR_SITE = http://spice-space.org/download/usbredir -USBREDIR_LICENSE = LGPLv2.1+ (libraries) -USBREDIR_LICENSE_FILES = COPYING.LIB -USBREDIR_INSTALL_STAGING = YES -USBREDIR_DEPENDENCIES = host-pkgconf libusb - -ifeq ($(BR2_PACKAGE_USBREDIR_SERVER),y) - -USBREDIR_LICENSE := $(USBREDIR_LICENSE), GPLv2+ (program) -USBREDIR_LICENSE_FILES += COPYING - -else # BR2_PACKAGE_USBREDIR_SERVER != y - -define USBREDIR_POST_INSTALL_TARGET_RM_SERVER - rm -f $(TARGET_DIR)/usr/sbin/usbredirserver -endef -USBREDIR_POST_INSTALL_TARGET_HOOKS += USBREDIR_POST_INSTALL_TARGET_RM_SERVER - -endif # BR2_PACKAGE_USBREDIR_SERVER - -$(eval $(autotools-package)) diff --git a/package.bak/usbutils/Config.in b/package.bak/usbutils/Config.in deleted file mode 100644 index 923853af04..0000000000 --- a/package.bak/usbutils/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_USBUTILS - bool "usbutils" - depends on BR2_TOOLCHAIN_HAS_THREADS # libusb - depends on BR2_PACKAGE_HAS_UDEV # needs hwdb - select BR2_PACKAGE_LIBUSB - help - USB enumeration utilities - - http://linux-usb.sourceforge.net/ - -comment "usbutils needs udev /dev management and toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/usbutils/usbutils.hash b/package.bak/usbutils/usbutils.hash deleted file mode 100644 index 37c829a1ae..0000000000 --- a/package.bak/usbutils/usbutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/usb/usbutils/sha256sums.asc -sha256 44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c usbutils-008.tar.xz diff --git a/package.bak/usbutils/usbutils.mk b/package.bak/usbutils/usbutils.mk deleted file mode 100644 index c96a1f54ff..0000000000 --- a/package.bak/usbutils/usbutils.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# usbutils -# -################################################################################ - -USBUTILS_VERSION = 008 -USBUTILS_SOURCE = usbutils-$(USBUTILS_VERSION).tar.xz -USBUTILS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/usb/usbutils -USBUTILS_DEPENDENCIES = host-pkgconf libusb udev -USBUTILS_LICENSE = GPLv2+ -USBUTILS_LICENSE_FILES = COPYING - -# Build after busybox since it's got a lightweight lsusb -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -USBUTILS_DEPENDENCIES += busybox -endif - -# Nice lsusb.py script only if there's python -ifeq ($(BR2_PACKAGE_PYTHON),) -define USBUTILS_REMOVE_PYTHON - rm -f $(TARGET_DIR)/usr/bin/lsusb.py -endef - -USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_REMOVE_PYTHON -endif - -define USBUTILS_TARGET_CLEANUP - rm -f $(TARGET_DIR)/usr/bin/usb-devices -endef - -USBUTILS_POST_INSTALL_TARGET_HOOKS += USBUTILS_TARGET_CLEANUP - -$(eval $(autotools-package)) diff --git a/package.bak/ushare/0001-compile-fixes.patch b/package.bak/ushare/0001-compile-fixes.patch deleted file mode 100644 index cfdf5e3404..0000000000 --- a/package.bak/ushare/0001-compile-fixes.patch +++ /dev/null @@ -1,206 +0,0 @@ -Patch nixed from OpenWRT svn to fix build breakage. - -Signed-off-by: Gustavo Zacarias - ---- a/src/cds.c -+++ b/src/cds.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - ---- a/src/http.c -+++ b/src/http.c -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -77,8 +78,7 @@ set_info_file (struct File_Info *info, c - info->content_type = ixmlCloneDOMString (content_type); - } - --static int --http_get_info (const char *filename, struct File_Info *info) -+int http_get_info (const char *filename, struct File_Info *info) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -197,8 +197,7 @@ get_file_memory (const char *fullpath, c - return ((UpnpWebFileHandle) file); - } - --static UpnpWebFileHandle --http_open (const char *filename, enum UpnpOpenFileMode mode) -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode) - { - extern struct ushare_t *ut; - struct upnp_entry_t *entry = NULL; -@@ -251,8 +250,7 @@ http_open (const char *filename, enum Up - return ((UpnpWebFileHandle) file); - } - --static int --http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen) - { - struct web_file_t *file = (struct web_file_t *) fh; - ssize_t len = -1; -@@ -286,8 +284,7 @@ http_read (UpnpWebFileHandle fh, char *b - return len; - } - --static int --http_write (UpnpWebFileHandle fh __attribute__((unused)), -+int http_write (UpnpWebFileHandle fh __attribute__((unused)), - char *buf __attribute__((unused)), - size_t buflen __attribute__((unused))) - { -@@ -296,8 +293,7 @@ http_write (UpnpWebFileHandle fh __attri - return 0; - } - --static int --http_seek (UpnpWebFileHandle fh, off_t offset, int origin) -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin) - { - struct web_file_t *file = (struct web_file_t *) fh; - off_t newpos = -1; -@@ -371,8 +367,7 @@ http_seek (UpnpWebFileHandle fh, off_t o - return 0; - } - --static int --http_close (UpnpWebFileHandle fh) -+int http_close (UpnpWebFileHandle fh) - { - struct web_file_t *file = (struct web_file_t *) fh; - -@@ -402,13 +397,3 @@ http_close (UpnpWebFileHandle fh) - - return 0; - } -- --struct UpnpVirtualDirCallbacks virtual_dir_callbacks = -- { -- http_get_info, -- http_open, -- http_read, -- http_write, -- http_seek, -- http_close -- }; ---- a/src/http.h -+++ b/src/http.h -@@ -25,6 +25,18 @@ - #include - #include - --struct UpnpVirtualDirCallbacks virtual_dir_callbacks; -+int http_get_info (const char *filename, struct File_Info *info); -+ -+UpnpWebFileHandle http_open (const char *filename, enum UpnpOpenFileMode mode); -+ -+int http_read (UpnpWebFileHandle fh, char *buf, size_t buflen); -+ -+int http_seek (UpnpWebFileHandle fh, off_t offset, int origin); -+ -+int http_write (UpnpWebFileHandle fh __attribute__((unused)), -+ char *buf __attribute__((unused)), -+ size_t buflen __attribute__((unused))); -+ -+int http_close (UpnpWebFileHandle fh); - - #endif /* _HTTP_H_ */ ---- a/src/ushare.c -+++ b/src/ushare.c -@@ -188,7 +188,7 @@ handle_action_request (struct Upnp_Actio - if (strcmp (request->DevUDN + 5, ut->udn)) - return; - -- ip = request->CtrlPtIPAddr.s_addr; -+ ip = (*(struct sockaddr_in *)&request->CtrlPtIPAddr).sin_addr.s_addr; - ip = ntohl (ip); - sprintf (val, "%d.%d.%d.%d", - (ip >> 24) & 0xFF, (ip >> 16) & 0xFF, (ip >> 8) & 0xFF, ip & 0xFF); -@@ -348,13 +348,23 @@ init_upnp (struct ushare_t *ut) - - UpnpEnableWebserver (TRUE); - -- res = UpnpSetVirtualDirCallbacks (&virtual_dir_callbacks); -- if (res != UPNP_E_SUCCESS) -- { -- log_error (_("Cannot set virtual directory callbacks\n")); -- free (description); -- return -1; -- } -+#define upnp_set_callback(cb, func) \ -+ do { \ -+ res = UpnpVirtualDir_set_##cb##Callback(func); \ -+ if (res != UPNP_E_SUCCESS) \ -+ { \ -+ log_error (_("Cannot set virtual directory callbacks\n")); \ -+ free (description); \ -+ return -1; \ -+ } \ -+ } while(0) -+ -+ upnp_set_callback(GetInfo, http_get_info); -+ upnp_set_callback(Open, http_open); -+ upnp_set_callback(Read, http_read); -+ upnp_set_callback(Seek, http_seek); -+ upnp_set_callback(Write, http_write); -+ upnp_set_callback(Close, http_close); - - res = UpnpAddVirtualDir (VIRTUAL_DIR); - if (res != UPNP_E_SUCCESS) ---- a/src/cms.c -+++ b/src/cms.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - ---- a/src/mime.c -+++ b/src/mime.c -@@ -20,6 +20,7 @@ - */ - - #include -+#include - #include - - #include "mime.h" ---- a/src/presentation.c -+++ b/src/presentation.c -@@ -19,6 +19,8 @@ - */ - - #include -+#include -+#include - - #if HAVE_LANGINFO_CODESET - # include ---- a/src/services.c -+++ b/src/services.c -@@ -20,6 +20,8 @@ - */ - - #include -+#include -+#include - #include - #include - diff --git a/package.bak/ushare/0002-ushare-fix-building-with-gcc-5.x.patch b/package.bak/ushare/0002-ushare-fix-building-with-gcc-5.x.patch deleted file mode 100644 index abef81fe4d..0000000000 --- a/package.bak/ushare/0002-ushare-fix-building-with-gcc-5.x.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 6abc52190accc8d8b17455420e234a1d7dc7ba55 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Mon, 16 Nov 2015 23:15:27 +0100 -Subject: [PATCH] ushare: fix building with gcc 5.x - -GCC5 defaults to -std=gnu11, which has different semantics for inline than -previous versions: - -https://gcc.gnu.org/gcc-5/porting_to.html - -Which causes linker issues when display_headers() and start_log() are -referenced from other files. There's no real reason why these needs to be -inline, so just drop the keyword. - -Signed-off-by: Peter Korsgaard ---- - src/trace.c | 2 +- - src/ushare.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/trace.c b/src/trace.c -index 50729ef..4e314ef 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -57,7 +57,7 @@ print_log (log_level level, const char *format, ...) - va_end (va); - } - --inline void -+void - start_log (void) - { - openlog (PACKAGE_NAME, LOG_PID, LOG_DAEMON); -diff --git a/src/ushare.c b/src/ushare.c -index b64451e..af46e78 100644 ---- a/src/ushare.c -+++ b/src/ushare.c -@@ -496,7 +496,7 @@ reload_config (int s __attribute__ ((unused))) - } - } - --inline void -+void - display_headers (void) - { - printf (_("%s (version %s), a lightweight UPnP A/V and DLNA Media Server.\n"), --- -2.1.4 - diff --git a/package.bak/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch b/package.bak/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch deleted file mode 100644 index e97c3deabc..0000000000 --- a/package.bak/ushare/0003-ushare-c-include-config-h-before-checking-for-CONFIG-NLS.patch +++ /dev/null @@ -1,42 +0,0 @@ -ushare.c: include config.h before checking for CONFIG_NLS - -When NLS support is enabled, we get following build errors: - - ushare.c: In function 'setup_i18n': - ushare.c:745:3: warning: implicit declaration of function 'setlocale' [-Wimplicit-function-declaration] - setlocale (LC_ALL, ""); - ^ - ushare.c:745:14: error: 'LC_ALL' undeclared (first use in this function) - setlocale (LC_ALL, ""); - ^ - ushare.c:745:14: note: each undeclared identifier is reported only once for each function it appears in - make[2]: *** [ushare.o] Error 1 - -When NLS support is enabled, configure script creates macro in config.h. -We check for CONFIG_NLS before including config.h which results in above -build errors as locale.h doesn't get included. - -This patch fixes above build error by including config.h before we check for -CONFIG_NLS. - -This build error is detected by Buildroot autobuilder -http://autobuild.buildroot.net/results/19d/19d67dd43e5a313c77e4be97ecb9811ffa52f797/ - -Signed-off-by: Rahul Bedarkar - ---- ushare-1.1a/src/ushare.c.old 2016-09-20 19:04:00.915239326 +0530 -+++ ushare-1.1a/src/ushare.c 2016-09-20 19:04:24.707239276 +0530 -@@ -56,11 +56,12 @@ - #include - #include - -+#include "config.h" -+ - #if (defined(HAVE_SETLOCALE) && defined(CONFIG_NLS)) - # include - #endif - --#include "config.h" - #include "ushare.h" - #include "services.h" - #include "http.h" diff --git a/package.bak/ushare/Config.in b/package.bak/ushare/Config.in deleted file mode 100644 index eba7acf6c3..0000000000 --- a/package.bak/ushare/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_USHARE - bool "ushare" - depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp - select BR2_PACKAGE_LIBUPNP - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - # ushare has a completely custom configure script that does - # broken things with library ordering, which breaks static - # linking. - depends on !BR2_STATIC_LIBS - help - uShare is a UPnP (TM) A/V & DLNA Media Server. - It implements the server component that provides UPnP media devices - with information on available multimedia files. - - http://ushare.geexbox.org/ - -comment "ushare needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ushare/ushare.hash b/package.bak/ushare/ushare.hash deleted file mode 100644 index 77f0f0f85d..0000000000 --- a/package.bak/ushare/ushare.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 7b9b85c79968d4f4560f02a99e33c6a33ff58f9d41d8faea79e31cce2ee78665 ushare-1.1a.tar.bz2 diff --git a/package.bak/ushare/ushare.mk b/package.bak/ushare/ushare.mk deleted file mode 100644 index 62d269c476..0000000000 --- a/package.bak/ushare/ushare.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# ushare -# -################################################################################ - -USHARE_VERSION = 1.1a -USHARE_SOURCE = ushare-$(USHARE_VERSION).tar.bz2 -USHARE_SITE = http://ushare.geexbox.org/releases -USHARE_DEPENDENCIES = host-pkgconf libupnp -USHARE_LICENSE = GPLv2+ -USHARE_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -USHARE_DEPENDENCIES += gettext -USHARE_LDFLAGS += -lintl -endif - -define USHARE_CONFIGURE_CMDS - (cd $(@D); \ - $(TARGET_CONFIGURE_OPTS) \ - ./configure --prefix=/usr $(DISABLE_NLS) --cross-compile \ - --cross-prefix="$(TARGET_CROSS)" --sysconfdir=/etc \ - --disable-strip \ - ) -endef - -define USHARE_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) LDFLAGS="$(TARGET_LDFLAGS) $(USHARE_LDFLAGS)" -C $(@D) -endef - -define USHARE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - rm -f $(TARGET_DIR)/etc/init.d/ushare -endef - -# Even though configure is called it's not autoconf -$(eval $(generic-package)) diff --git a/package.bak/ussp-push/0001-fix-build-against-bluez-4.patch b/package.bak/ussp-push/0001-fix-build-against-bluez-4.patch deleted file mode 100644 index 0694bfbadd..0000000000 --- a/package.bak/ussp-push/0001-fix-build-against-bluez-4.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix build against bluez4. - -Signed-off-by: Samuel Martin - ---- ussp-push-0.11.orig/src/obex_socket.c 2012-11-01 09:58:51.049538708 +0100 -+++ ussp-push-0.11/src/obex_socket.c 2012-11-01 12:10:10.719506951 +0100 -@@ -197,7 +197,7 @@ static int bt_sock_name2bth(int devid, c - for (i = 0; i < niinf; i++) { - char devname[128]; - -- if (hci_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, -+ if (hci_read_remote_name(dd, &piinf[i].bdaddr, sizeof(devname) - 1, - devname, 100000) >= 0) { - if (strcasecmp(devname, btname) == 0) { - *btaddr = piinf[i].bdaddr; diff --git a/package.bak/ussp-push/Config.in b/package.bak/ussp-push/Config.in deleted file mode 100644 index e6695bb197..0000000000 --- a/package.bak/ussp-push/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_USSP_PUSH - bool "ussp-push" - depends on !BR2_STATIC_LIBS # bluez_utils - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # dbus, alsa-lib, libglib2 - depends on BR2_USE_MMU # dbus - select BR2_PACKAGE_OPENOBEX - select BR2_PACKAGE_OPENOBEX_BLUEZ - select BR2_PACKAGE_BLUEZ_UTILS - help - ussp-push is an OBEX object pusher for Linux, using the BlueZ - BlueTooth stack. - - http://www.xmailserver.org/ussp-push.html - -comment "ussp-push needs a toolchain w/ wchar, threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ussp-push/ussp-push.hash b/package.bak/ussp-push/ussp-push.hash deleted file mode 100644 index 91afb9d971..0000000000 --- a/package.bak/ussp-push/ussp-push.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 bb2748eaed6164812555b4a1e186c4f2820c5ef9ce30f12d7aac28a452719bbd ussp-push-0.11.tar.gz diff --git a/package.bak/ussp-push/ussp-push.mk b/package.bak/ussp-push/ussp-push.mk deleted file mode 100644 index c3d11f97bf..0000000000 --- a/package.bak/ussp-push/ussp-push.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# ussp-push -# -################################################################################ - -USSP_PUSH_VERSION = 0.11 -USSP_PUSH_SITE = http://www.xmailserver.org -USSP_PUSH_LICENSE = GPLv2+ -USSP_PUSH_LICENSE_FILES = COPYING - -USSP_PUSH_DEPENDENCIES = bluez_utils openobex - -$(eval $(autotools-package)) diff --git a/package.bak/ustr/Config.in b/package.bak/ustr/Config.in deleted file mode 100644 index 9d6561c343..0000000000 --- a/package.bak/ustr/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_USTR - bool "ustr" - # unconditionally builds a shared library - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # broken vsnprintf detection - help - A small, safe string library. - - http://www.and.org/ustr/ - -comment "ustr needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL diff --git a/package.bak/ustr/ustr.hash b/package.bak/ustr/ustr.hash deleted file mode 100644 index 214d37a77a..0000000000 --- a/package.bak/ustr/ustr.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally computed -sha256 3daf6eae9f78de1e872c0b2b83cce35515b94d4bb8a074e48f331fd99e1fc2c4 ustr-1.0.4.tar.bz2 -# From http://debian.gtisc.gatech.edu/debian/pool/main/u/ustr/ustr_1.0.4-5.dsc -sha256 a21e78acf82dcccef2893932ef7b85852419bfd9b18382e63c34e7710c1d7762 ustr_1.0.4-5.debian.tar.xz diff --git a/package.bak/ustr/ustr.mk b/package.bak/ustr/ustr.mk deleted file mode 100644 index 715914cab6..0000000000 --- a/package.bak/ustr/ustr.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# ustr -# -################################################################################ - -# When bumping the version to a new upstream release, be sure to remove -# the ldconfig hack, below. -USTR_VERSION = 1.0.4 -USTR_SOURCE = ustr-$(USTR_VERSION).tar.bz2 -USTR_SITE = http://www.and.org/ustr/$(USTR_VERSION) -USTR_LICENSE = BSD-2c, MIT, LGPLv2+ -USTR_LICENSE_FILES = LICENSE LICENSE_BSD LICENSE_LGPL LICENSE_MIT -USTR_AUTORECONF = YES -USTR_PATCH = \ - http://http.debian.net/debian/pool/main/u/ustr/ustr_$(USTR_VERSION)-5.debian.tar.xz - -USTR_INSTALL_STAGING = YES - -# ustr only builds the static library by default, but the default -# install rule will install both the static and the shared libraries, -# which means the shared one is build during the install step. :-( -# -# We can however instruct ustr to build both at build time, by adding -# 'all-shared' to the default 'all' rule. -USTR_MAKE_OPTS = all all-shared - -USTR_CONF_OPTS += LDCONFIG=/bin/true -HOST_USTR_CONF_OPTS += LDCONFIG=/bin/true - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/ustream-ssl/Config.in b/package.bak/ustream-ssl/Config.in deleted file mode 100644 index 540e43689f..0000000000 --- a/package.bak/ustream-ssl/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_USTREAM_SSL - bool "ustream-ssl" - depends on !BR2_STATIC_LIBS #libubox - select BR2_PACKAGE_LIBUBOX - select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_MBEDTLS - help - ustream SSL wrapper - - https://git.openwrt.org/?p=project/ustream-ssl.git;a=summary - -comment "ustream-ssl needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/ustream-ssl/ustream-ssl.mk b/package.bak/ustream-ssl/ustream-ssl.mk deleted file mode 100644 index b83d129a23..0000000000 --- a/package.bak/ustream-ssl/ustream-ssl.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# ustream-ssl -# -################################################################################ - -USTREAM_SSL_VERSION = ec80adaa1b47f28d426fa19c692011ce60b992d6 -USTREAM_SSL_SITE = git://git.openwrt.org/project/ustream-ssl.git -USTREAM_SSL_LICENSE = ISC -USTREAM_SSL_LICENSE_FILES = ustream-ssl.h -USTREAM_SSL_INSTALL_STAGING = YES -USTREAM_SSL_DEPENDENCIES = libubox - -ifeq ($(BR2_PACKAGE_MBEDTLS),y) -USTREAM_SSL_DEPENDENCIES += mbedtls -USTREAM_SSL_CONF_OPTS += -DMBEDTLS=ON -else -USTREAM_SSL_DEPENDENCIES += openssl -endif - -$(eval $(cmake-package)) diff --git a/package.bak/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch b/package.bak/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch deleted file mode 100644 index cbf1a81913..0000000000 --- a/package.bak/util-linux/0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 02283be90292b2f57183aa930c4d69375f1d905d Mon Sep 17 00:00:00 2001 -From: Karel Zak -Date: Wed, 18 Jan 2017 13:17:21 +0100 -Subject: [PATCH] build-sys: use -lm for scriptreplay if necessary - -Reported-by: Bert van Hall -Addresses: https://github.com/karelzak/util-linux/pull/397 -Signed-off-by: Karel Zak -(cherry picked from commit feda4342df1ced25df3d200ed23469e740196c86) -Signed-off-by: Carlos Santos ---- - term-utils/Makemodule.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/term-utils/Makemodule.am b/term-utils/Makemodule.am -index 1b7c5fc..ad1bb1f 100644 ---- a/term-utils/Makemodule.am -+++ b/term-utils/Makemodule.am -@@ -21,7 +21,7 @@ if BUILD_SCRIPTREPLAY - usrbin_exec_PROGRAMS += scriptreplay - dist_man_MANS += term-utils/scriptreplay.1 - scriptreplay_SOURCES = term-utils/scriptreplay.c --scriptreplay_LDADD = $(LDADD) libcommon.la -+scriptreplay_LDADD = $(LDADD) libcommon.la $(MATH_LIBS) - endif # BUILD_SCRIPTREPLAY - - --- -2.7.4 - diff --git a/package.bak/util-linux/Config.in b/package.bak/util-linux/Config.in deleted file mode 100644 index e957f848bb..0000000000 --- a/package.bak/util-linux/Config.in +++ /dev/null @@ -1,371 +0,0 @@ -menuconfig BR2_PACKAGE_UTIL_LINUX - bool "util-linux" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - Various useful/essential linux libraries and utilities. - - Things like mkfs, mkswap, swapon, fdisk, mount, dmesg, etc... - - http://www.kernel.org/pub/linux/utils/util-linux/ - -if BR2_PACKAGE_UTIL_LINUX - -config BR2_PACKAGE_UTIL_LINUX_LIBBLKID - bool "libblkid" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Install libblkid. - -config BR2_PACKAGE_UTIL_LINUX_LIBFDISK - bool "libfdisk" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Install libfdisk. - -config BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - bool "libmount" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - Install libmount. - -config BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - bool "libsmartcols" - depends on BR2_USE_MMU # fork() - help - Install libsmartcols. - -config BR2_PACKAGE_UTIL_LINUX_LIBUUID - bool "libuuid" - help - Install libuuid. - -config BR2_PACKAGE_UTIL_LINUX_BINARIES - bool "basic set" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBFDISK - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Install the basic set of util-linux binaries. - - blkdiscard, blkid, blockdev, chcpu, col, colcrt, colrm, - column, ctrlaltdel, dmesg, fdisk, findfs, findmnt, flock, - fsfreeze, fstrim, getopt, hexdump, ipcmk, isosize, ldattach, - look, lsblk, lscpu, lsipc, lslocks, lsns, mcookie, mkfs, - mkswap, namei, prlimit, readprofile, renice, rev, rtcwake, - script, scriptreplay, setarch, setsid, sfdisk, swaplabel, - swapoff, swapon, tailf, uuidgen, whereis, wipefs - - The setarch utility also installs architecture-specific - symlinks like linux32, linux64, uname26, i386 and x86_64. - -config BR2_PACKAGE_UTIL_LINUX_AGETTY - bool "agetty" - depends on BR2_USE_MMU # fork() - help - Alternative linux getty - -config BR2_PACKAGE_UTIL_LINUX_BFS - bool "bfs" - help - SCO bfs filesystem support - -config BR2_PACKAGE_UTIL_LINUX_CAL - bool "cal" - help - Display a calendar, or some part of it - -config BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH - bool "chfn/chsh" - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on BR2_USE_MMU # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - Change login shell, real user name and information - -comment "chfn/chsh needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_UTIL_LINUX_CRAMFS - bool "cramfs utilities" - select BR2_PACKAGE_ZLIB - help - Utilities for compressed ROM file system (fsck.cramfs, mkfs.cramfs) - -config BR2_PACKAGE_UTIL_LINUX_EJECT - bool "eject" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Eject removable media - -config BR2_PACKAGE_UTIL_LINUX_FALLOCATE - bool "fallocate" - help - Preallocate space to a file - -config BR2_PACKAGE_UTIL_LINUX_FDFORMAT - bool "fdformat" - help - Low-level format a floppy disk - -config BR2_PACKAGE_UTIL_LINUX_FSCK - bool "fsck" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Check and repair a linux filesystem - -config BR2_PACKAGE_UTIL_LINUX_HWCLOCK - bool "hwclock" - help - Query or set the hardware clock (RTC) - -config BR2_PACKAGE_UTIL_LINUX_IPCRM - bool "ipcrm" - help - Remove certain IPC resources - -config BR2_PACKAGE_UTIL_LINUX_IPCS - bool "ipcs" - help - Show information on IPC facilities - -config BR2_PACKAGE_UTIL_LINUX_KILL - bool "kill" - help - Send a signal to a process - -config BR2_PACKAGE_UTIL_LINUX_LAST - bool "last" - help - Show a listing of last logged in users - -config BR2_PACKAGE_UTIL_LINUX_LINE - bool "line" - help - Read one line - -config BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS - bool "login utilities" - depends on BR2_USE_MMU # fork() (login, runuser, su, sulogin) - depends on (BR2_ENABLE_LOCALE && BR2_USE_WCHAR) # linux-pam - depends on !BR2_STATIC_LIBS - depends on !BR2_TOOLCHAIN_USES_MUSL # linux-pam - depends on BR2_USE_MMU # linux-pam - select BR2_PACKAGE_LINUX_PAM - help - Login utilities (last, login, runuser, su, sulogin) - -comment "login utilities needs a uClibc or glibc toolchain w/ wchar, locale, dynamic library" - depends on !(BR2_ENABLE_LOCALE && BR2_USE_WCHAR) \ - || BR2_STATIC_LIBS || BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_UTIL_LINUX_LOGGER - bool "logger" - help - Enter messages into the system log - -config BR2_PACKAGE_UTIL_LINUX_LOSETUP - bool "losetup" - depends on BR2_USE_MMU # libsmartcols - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - help - Set up and control loop devices - -config BR2_PACKAGE_UTIL_LINUX_LSLOGINS - bool "lslogins" - depends on BR2_USE_MMU # libsmartcols - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - help - Display information about known users in the system - -config BR2_PACKAGE_UTIL_LINUX_MESG - bool "mesg" - help - Control write access to your terminal - -config BR2_PACKAGE_UTIL_LINUX_MINIX - bool "minix" - help - Minix filesystem support - -config BR2_PACKAGE_UTIL_LINUX_MORE - bool "more" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - File perusal filter for crt viewing - -config BR2_PACKAGE_UTIL_LINUX_MOUNT - bool "mount/umount" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Mount/unmount filesystems - -config BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT - bool "mountpoint" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBMOUNT - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - See if a directory is a mountpoint - -config BR2_PACKAGE_UTIL_LINUX_NEWGRP - bool "newgrp" - help - Log in to a new group - -config BR2_PACKAGE_UTIL_LINUX_NOLOGIN - bool "nologin" - help - Politely refuse a login - -config BR2_PACKAGE_UTIL_LINUX_NSENTER - bool "nsenter" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - help - Enter the namespaces of another process - -comment "nsenter needs a toolchain w/ headers >= 3.0" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - -config BR2_PACKAGE_UTIL_LINUX_PG - bool "pg" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_NCURSES - help - Browse pagewise through text files - -config BR2_PACKAGE_UTIL_LINUX_PARTX - bool "partition utilities" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - Partition utilities (addpart, delpart, partx) - -config BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT - bool "pivot_root" - help - Change the root filesystem - -config BR2_PACKAGE_UTIL_LINUX_RAW - bool "raw" - help - Build a linux raw character device - -config BR2_PACKAGE_UTIL_LINUX_RENAME - bool "rename" - help - Rename files - -config BR2_PACKAGE_UTIL_LINUX_RESET - bool "reset" - help - Reset the terminal - -config BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS - bool "scheduling utilities" - help - Scheduling utilities (chrt, ionice, taskset) - -config BR2_PACKAGE_UTIL_LINUX_SETPRIV - bool "setpriv" - select BR2_PACKAGE_LIBCAP_NG - help - Run a program with different Linux privilege settings - -config BR2_PACKAGE_UTIL_LINUX_SETTERM - bool "setterm" - select BR2_PACKAGE_NCURSES - help - Set terminal attributes - -config BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT - bool "switch_root" - depends on BR2_USE_MMU # fork() - help - Switch to another filesystem as the root of the mount tree - -config BR2_PACKAGE_UTIL_LINUX_TUNELP - bool "tunelp" - select BR2_PACKAGE_NCURSES - help - Set various parameters for the lp device - -config BR2_PACKAGE_UTIL_LINUX_UL - bool "ul" - select BR2_PACKAGE_NCURSES - help - Do underlining - -config BR2_PACKAGE_UTIL_LINUX_UNSHARE - bool "unshare" - depends on BR2_USE_MMU # fork() - help - Run program with some namespaces unshared from parent - -config BR2_PACKAGE_UTIL_LINUX_UTMPDUMP - bool "utmpdump" - help - Dump UTMP and WTMP files in raw format - -config BR2_PACKAGE_UTIL_LINUX_UUIDD - bool "uuidd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - UUID generation daemon - -config BR2_PACKAGE_UTIL_LINUX_VIPW - bool "vipw" - depends on BR2_USE_MMU # fork() - help - Edit the password, group, shadow-password or shadow-group file - -config BR2_PACKAGE_UTIL_LINUX_WALL - bool "wall" - depends on BR2_USE_MMU # fork() - help - Send a message to everybody's terminal - -config BR2_PACKAGE_UTIL_LINUX_WDCTL - bool "wdctl" - depends on BR2_USE_MMU # libsmartcols - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - help - Shows hardware watchdog status - -config BR2_PACKAGE_UTIL_LINUX_WRITE - bool "write" - help - Send a message to another user - -config BR2_PACKAGE_UTIL_LINUX_ZRAMCTL - bool "zramctl" - depends on BR2_USE_MMU # libsmartcols - select BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS - help - Set up and control zram devices - -endif diff --git a/package.bak/util-linux/Config.in.host b/package.bak/util-linux/Config.in.host deleted file mode 100644 index f73dc43dbc..0000000000 --- a/package.bak/util-linux/Config.in.host +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_HOST_UTIL_LINUX - bool "host util-linux" - help - Various useful/essential linux libraries and utilities. - - Things like mkfs, mkswap, swapon, fdisk, mount, dmesg, etc... - - http://www.kernel.org/pub/linux/utils/util-linux/ diff --git a/package.bak/util-linux/su.pam b/package.bak/util-linux/su.pam deleted file mode 100644 index 84b18605ce..0000000000 --- a/package.bak/util-linux/su.pam +++ /dev/null @@ -1,15 +0,0 @@ -auth sufficient pam_rootok.so -auth required pam_wheel.so use_uid -auth required pam_env.so -auth required pam_unix.so nullok - -account required pam_unix.so - -password required pam_unix.so nullok - -# session required pam_selinux.so close -session required pam_limits.so -session required pam_env.so -session required pam_unix.so -session optional pam_lastlog.so -# session required pam_selinux.so open diff --git a/package.bak/util-linux/util-linux.hash b/package.bak/util-linux/util-linux.hash deleted file mode 100644 index 71b4982f01..0000000000 --- a/package.bak/util-linux/util-linux.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/linux/utils/util-linux/v2.29/sha256sums.asc -sha256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 util-linux-2.29.2.tar.xz diff --git a/package.bak/util-linux/util-linux.mk b/package.bak/util-linux/util-linux.mk deleted file mode 100644 index 05e1398937..0000000000 --- a/package.bak/util-linux/util-linux.mk +++ /dev/null @@ -1,237 +0,0 @@ -################################################################################ -# -# util-linux -# -################################################################################ - -UTIL_LINUX_VERSION_MAJOR = 2.29 -UTIL_LINUX_VERSION = $(UTIL_LINUX_VERSION_MAJOR).2 -UTIL_LINUX_SOURCE = util-linux-$(UTIL_LINUX_VERSION).tar.xz -UTIL_LINUX_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/util-linux/v$(UTIL_LINUX_VERSION_MAJOR) - -# 0001-build-sys-use-lm-for-scriptreplay-if-necessary.patch -UTIL_LINUX_AUTORECONF = YES - -# README.licensing claims that some files are GPLv2-only, but this is not true. -# Some files are GPLv3+ but only in tests. -UTIL_LINUX_LICENSE = GPLv2+, BSD-4c, LGPLv2.1+ (libblkid, libfdisk, libmount), BSD-3c (libuuid) -UTIL_LINUX_LICENSE_FILES = README.licensing Documentation/licenses/COPYING.GPLv2 Documentation/licenses/COPYING.UCB Documentation/licenses/COPYING.LGPLv2.1 Documentation/licenses/COPYING.BSD-3 -UTIL_LINUX_INSTALL_STAGING = YES -UTIL_LINUX_DEPENDENCIES = host-pkgconf -# uClibc needs NTP_LEGACY for sys/timex.h -> ntp_gettime() support -# (used in logger.c), and the common default is N. -UTIL_LINUX_CONF_ENV = scanf_cv_type_modifier=no \ - $(if $(BR2_TOOLCHAIN_USES_UCLIBC),ac_cv_header_sys_timex_h=no) -UTIL_LINUX_CONF_OPTS += \ - --disable-rpath \ - --disable-makeinstall-chown - -# system depends on util-linux so we enable systemd support -# (which needs systemd to be installed) -UTIL_LINUX_CONF_OPTS += \ - --without-systemd \ - --with-systemdsystemunitdir=no - -# We don't want the host-busybox dependency to be added automatically -HOST_UTIL_LINUX_DEPENDENCIES = host-pkgconf - -# We also don't want the host-python dependency -HOST_UTIL_LINUX_CONF_OPTS = --without-python - -# If both util-linux and busybox are selected, make certain util-linux -# wins the fight over who gets to have their utils actually installed -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -UTIL_LINUX_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -UTIL_LINUX_DEPENDENCIES += ncurses -ifeq ($(BR2_PACKAGE_NCURSES_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --with-ncursesw -UTIL_LINUX_CONF_ENV += NCURSESW5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -else -UTIL_LINUX_CONF_OPTS += --without-ncursesw --with-ncurses --disable-widechar -UTIL_LINUX_CONF_ENV += NCURSES5_CONFIG=$(STAGING_DIR)/usr/bin/$(NCURSES_CONFIG_SCRIPTS) -endif -else -ifeq ($(BR2_USE_WCHAR),y) -UTIL_LINUX_CONF_OPTS += --enable-widechar -else -UTIL_LINUX_CONF_OPTS += --disable-widechar -endif -UTIL_LINUX_CONF_OPTS += --without-ncursesw --without-ncurses -endif - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) -UTIL_LINUX_DEPENDENCIES += gettext -UTIL_LINUX_LIBS += -lintl -endif - -ifeq ($(BR2_PACKAGE_LIBCAP_NG),y) -UTIL_LINUX_DEPENDENCIES += libcap-ng -endif - -# Unfortunately, the util-linux does LIBS="" at the end of its -# configure script. So we have to pass the proper LIBS value when -# calling the configure script to make configure tests pass properly, -# and then pass it again at build time. -UTIL_LINUX_CONF_ENV += LIBS="$(UTIL_LINUX_LIBS)" -UTIL_LINUX_MAKE_OPTS += LIBS="$(UTIL_LINUX_LIBS)" - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -UTIL_LINUX_DEPENDENCIES += libselinux -UTIL_LINUX_CONF_OPTS += --with-selinux -define UTIL_LINUX_SELINUX_PAMFILES_TWEAK - $(foreach f,su su-l, - $(SED) 's/^# \(.*pam_selinux.so.*\)$$/\1/' \ - $(TARGET_DIR)/etc/pam.d/$(f) - ) -endef -else -UTIL_LINUX_CONF_OPTS += --without-selinux -endif - -# Used by cramfs utils -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_ZLIB),zlib) - -# Used by login-utils -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_LINUX_PAM),linux-pam) - -# Disable/Enable utilities -UTIL_LINUX_CONF_OPTS += \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BINARIES),--enable-all-programs,--disable-all-programs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_AGETTY),--enable-agetty,--disable-agetty) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_BFS),--enable-bfs,--disable-bfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CAL),--enable-cal,--disable-cal) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CHFN_CHSH),--enable-chfn-chsh,--disable-chfn-chsh) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_CRAMFS),--enable-cramfs,--disable-cramfs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_EJECT),--enable-eject,--disable-eject) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FALLOCATE),--enable-fallocate,--disable-fallocate) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FDFORMAT),--enable-fdformat,--disable-fdformat) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_FSCK),--enable-fsck,--disable-fsck) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_HWCLOCK),--enable-hwclock,--disable-hwclock) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCRM),--enable-ipcrm,--disable-ipcrm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_IPCS),--enable-ipcs,--disable-ipcs) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_KILL),--enable-kill,--disable-kill) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LAST),--enable-last,--disable-last) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBBLKID),--enable-libblkid,--disable-libblkid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBFDISK),--enable-libfdisk,--disable-libfdisk) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),--enable-libmount,--disable-libmount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBSMARTCOLS),--enable-libsmartcols,--disable-libsmartcols) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LIBUUID),--enable-libuuid,--disable-libuuid) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LINE),--enable-line,--disable-line) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGGER),--enable-logger,--disable-logger) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),--enable-last --enable-login --enable-runuser --enable-su --enable-sulogin,--disable-last --disable-login --disable-runuser --disable-su --disable-sulogin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LOSETUP),--enable-losetup,--disable-losetup) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_LSLOGINS),--enable-lslogins,--disable-lslogins) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MESG),--enable-mesg,--disable-mesg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MINIX),--enable-minix,--disable-minix) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MORE),--enable-more,--disable-more) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNT),--enable-mount,--disable-mount) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_MOUNTPOINT),--enable-mountpoint,--disable-mountpoint) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NEWGRP),--enable-newgrp,--disable-newgrp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NOLOGIN),--enable-nologin,--disable-nologin) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_NSENTER),--enable-nsenter,--disable-nsenter) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PARTX),--enable-partx,--disable-partx) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PG),--enable-pg,--disable-pg) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT),--enable-pivot_root,--disable-pivot_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RAW),--enable-raw,--disable-raw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RENAME),--enable-rename,--disable-rename) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_RESET),--enable-reset,--disable-reset) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SCHEDUTILS),--enable-schedutils,--disable-schedutils) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETPRIV),--enable-setpriv,--disable-setpriv) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SETTERM),--enable-setterm,--disable-setterm) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_SWITCH_ROOT),--enable-switch_root,--disable-switch_root) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_TUNELP),--enable-tunelp,--disable-tunelp) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UL),--enable-ul,--disable-ul) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UNSHARE),--enable-unshare,--disable-unshare) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UTMPDUMP),--enable-utmpdump,--disable-utmpdump) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_UUIDD),--enable-uuidd,--disable-uuidd) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_VIPW),--enable-vipw,--disable-vipw) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WALL),--enable-wall,--disable-wall) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WDCTL),--enable-wdctl,--disable-wdctl) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_WRITE),--enable-write,--disable-write) \ - $(if $(BR2_PACKAGE_UTIL_LINUX_ZRAMCTL),--enable-zramctl,--disable-zramctl) - -# In the host version of util-linux, we only require libuuid and -# libmount (plus libblkid as an indirect dependency of libmount). -# So disable all of the programs, unless BR2_PACKAGE_HOST_UTIL_LINUX is set - -HOST_UTIL_LINUX_CONF_OPTS += \ - --enable-libblkid \ - --enable-libmount \ - --enable-libuuid \ - --without-ncurses \ - --without-ncursesw \ - --without-tinfo - -ifeq ($(BR2_PACKAGE_HOST_UTIL_LINUX),y) -HOST_UTIL_LINUX_CONF_OPTS += --disable-makeinstall-chown -# disable more command because of ncurses dependency -HOST_UTIL_LINUX_CONF_OPTS += --disable-more -else -HOST_UTIL_LINUX_CONF_OPTS += --disable-all-programs -endif - -# Install libmount Python bindings -ifeq ($(BR2_PACKAGE_PYTHON)$(BR2_PACKAGE_PYTHON3),y) -UTIL_LINUX_CONF_OPTS += --with-python -UTIL_LINUX_DEPENDENCIES += $(if $(BR2_PACKAGE_PYTHON),python,python3) -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBMOUNT),y) -UTIL_LINUX_CONF_OPTS += --enable-pylibmount -else -UTIL_LINUX_CONF_OPTS += --disable-pylibmount -endif -else -UTIL_LINUX_CONF_OPTS += --without-python -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -UTIL_LINUX_CONF_OPTS += --with-readline -UTIL_LINUX_LIBS += $(if $(BR2_STATIC_LIBS),-lcurses) -UTIL_LINUX_DEPENDENCIES += readline -else -UTIL_LINUX_CONF_OPTS += --without-readline -endif - -ifeq ($(BR2_PACKAGE_AUDIT),y) -UTIL_LINUX_CONF_OPTS += --with-audit -UTIL_LINUX_DEPENDENCIES += audit -else -UTIL_LINUX_CONF_OPTS += --without-audit -endif - -# Install PAM configuration files -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LOGIN_UTILS),y) -define UTIL_LINUX_INSTALL_PAMFILES - $(INSTALL) -m 0644 package/util-linux/su.pam \ - $(TARGET_DIR)/etc/pam.d/su - $(INSTALL) -m 0644 package/util-linux/su.pam \ - $(TARGET_DIR)/etc/pam.d/su-l - $(UTIL_LINUX_SELINUX_PAMFILES_TWEAK) -endef -endif - -UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_INSTALL_PAMFILES - -# Install agetty->getty symlink to avoid breakage when there's no busybox -ifeq ($(BR2_PACKAGE_UTIL_LINUX_AGETTY),y) -ifeq ($(BR2_PACKAGE_BUSYBOX),) -define UTIL_LINUX_GETTY_SYMLINK - ln -sf agetty $(TARGET_DIR)/sbin/getty -endef -endif -endif - -UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_GETTY_SYMLINK - -ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE)$(BR2_PACKAGE_UTIL_LINUX_LIBUUID),yy) -define UTIL_LINUX_TWEAK_UUID_PC - $(SED) '/Libs\.private: .*/d' $(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc - printf "Libs.private: -lintl\n" >>$(STAGING_DIR)/usr/lib/pkgconfig/uuid.pc -endef -UTIL_LINUX_POST_INSTALL_TARGET_HOOKS += UTIL_LINUX_TWEAK_UUID_PC -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/ux500-firmware/Config.in b/package.bak/ux500-firmware/Config.in deleted file mode 100644 index 7e8a94b2a4..0000000000 --- a/package.bak/ux500-firmware/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_UX500_FIRMWARE - bool "ux500-firmware" - help - This package provides various binary firmware files (closed binary blobs) - for the Azurewave AW-NH580 combo module (wifi, bt, gps). - - https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files/ diff --git a/package.bak/ux500-firmware/ux500-firmware.hash b/package.bak/ux500-firmware/ux500-firmware.hash deleted file mode 100644 index 1028cc0e12..0000000000 --- a/package.bak/ux500-firmware/ux500-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 81633274a9157c076e5e09b5addd81fbcef504b829fc801041cea50eea774bcd ux500-firmware_1.1.3-6linaro1.tar.gz diff --git a/package.bak/ux500-firmware/ux500-firmware.mk b/package.bak/ux500-firmware/ux500-firmware.mk deleted file mode 100644 index 428ed34277..0000000000 --- a/package.bak/ux500-firmware/ux500-firmware.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# ux500-firmware -# -################################################################################ - -UX500_FIRMWARE_VERSION = 1.1.3-6 -UX500_FIRMWARE_SOURCE = ux500-firmware_$(UX500_FIRMWARE_VERSION)linaro1.tar.gz -UX500_FIRMWARE_SITE = https://launchpad.net/~igloocommunity-maintainers/+archive/snowball/+files -UX500_FIRMWARE_LICENSE = Snowball click-wrap license -UX500_FIRMWARE_LICENSE_FILES = license.txt -UX500_FIRMWARE_REDISTRIBUTE = NO - -# The CG2900 linux driver has to load firmware named CG29XX_* but the firmware -# filenames contained in this package are CG2900_* hence the code below -define UX500_FIRMWARE_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install - for f in $(TARGET_DIR)/lib/firmware/CG2900* ; do \ - mv $$f $${f/CG2900/CG29XX}; \ - done -endef - -$(eval $(generic-package)) diff --git a/package.bak/v4l2grab/Config.in b/package.bak/v4l2grab/Config.in deleted file mode 100644 index ec3a7a8c54..0000000000 --- a/package.bak/v4l2grab/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_V4L2GRAB - bool "v4l2grab" - depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l - depends on BR2_USE_MMU # libv4l - depends on !BR2_STATIC_LIBS # libv4l - depends on BR2_INSTALL_LIBSTDCPP # libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBV4L - help - Utility for grabbing JPEGs form V4L2 devices. This tool is - similar to v4l2grab available from libv4l contrib directory, - but provides additional features such as JPEG output. - - http://www.twam.info/software/v4l2grab-grabbing-jpegs-from-v4l2-devices - -comment "v4l2grab needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/v4l2grab/v4l2grab.hash b/package.bak/v4l2grab/v4l2grab.hash deleted file mode 100644 index a59c8af320..0000000000 --- a/package.bak/v4l2grab/v4l2grab.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 9a8d0d1ca5ac9fb9f66e00300bb3265d156cf1cb67eb30f6e6637c83b0b507a1 v4l2grab-f8d8844d52387b3db7b8736f5e86156d9374f781.tar.gz diff --git a/package.bak/v4l2grab/v4l2grab.mk b/package.bak/v4l2grab/v4l2grab.mk deleted file mode 100644 index f3a8967dc4..0000000000 --- a/package.bak/v4l2grab/v4l2grab.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# v4l2grab -# -################################################################################ - -V4L2GRAB_VERSION = f8d8844d52387b3db7b8736f5e86156d9374f781 -V4L2GRAB_SITE = $(call github,twam,v4l2grab,$(V4L2GRAB_VERSION)) -V4L2GRAB_LICENSE = GPLv2+ -V4L2GRAB_LICENSE_FILES = LICENSE.md -# Fetched from github, no pre-generated configure script provided -V4L2GRAB_AUTORECONF = YES -V4L2GRAB_DEPENDENCIES = jpeg libv4l - -$(eval $(autotools-package)) diff --git a/package.bak/vala/0001-dont-add-dirty-to-valac-version.patch b/package.bak/vala/0001-dont-add-dirty-to-valac-version.patch deleted file mode 100644 index a2a0623369..0000000000 --- a/package.bak/vala/0001-dont-add-dirty-to-valac-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -valac: don't append -dirty to version - -Don't append -dirty to the valac version number if the Buildroot Git -tree has uncommited changes. - -The patched script is meant for the valac developers, but it also -activates if you build valac in a subdirectory of a Git tree (e.g. -as is commonly done in Buildroot). - -The effect is that valac gets built as being version x.y.z-dirty, which -breaks programs (such as Midori) that explicitly check for valac-x.y.z. - -Signed-off-by: Simon Dawson -diff -Nur a/build-aux/git-version-gen b/build-aux/git-version-gen ---- a/build-aux/git-version-gen 2010-08-15 12:49:03.000000000 +0100 -+++ b/build-aux/git-version-gen 2012-05-14 10:17:19.977204570 +0100 -@@ -135,7 +135,7 @@ - *) # Append the suffix only if there isn't one already. - case $v in - *-dirty) ;; -- *) v="$v-dirty" ;; -+ #*) v="$v-dirty" ;; - esac ;; - esac - diff --git a/package.bak/vala/vala-wrapper b/package.bak/vala/vala-wrapper deleted file mode 100644 index ae2f7ca671..0000000000 --- a/package.bak/vala/vala-wrapper +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -$0-@VALA_VERSION@ --vapidir=${STAGING_DIR}/usr/share/vala/vapi --girdir=${STAGING_DIR}/usr/share/gir-1.0 $@ diff --git a/package.bak/vala/vala.hash b/package.bak/vala/vala.hash deleted file mode 100644 index ca5873c5d3..0000000000 --- a/package.bak/vala/vala.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://download.gnome.org/sources/vala/0.34/vala-0.34.4.sha256sum -sha256 6b17bd339414563ebc51f64b0b837919ea7552d8a8ffa71cdc837d25c9696b83 vala-0.34.4.tar.xz diff --git a/package.bak/vala/vala.mk b/package.bak/vala/vala.mk deleted file mode 100644 index dadfdfc1a9..0000000000 --- a/package.bak/vala/vala.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# vala -# -################################################################################ - -VALA_VERSION_MAJOR = 0.34 -VALA_VERSION = $(VALA_VERSION_MAJOR).4 -VALA_SITE = http://download.gnome.org/sources/vala/$(VALA_VERSION_MAJOR) -VALA_SOURCE = vala-$(VALA_VERSION).tar.xz -VALA_LICENSE = LGPLv2.1+ -VALA_LICENSE_FILES = COPYING - -HOST_VALA_DEPENDENCIES = host-bison host-flex host-libglib2 -# Yes, the autoconf script understands ':' as "xsltproc is not -# available". -HOST_VALA_CONF_ENV = ac_cv_path_XSLTPROC=: - -# We wrap vala & valac to point to the proper gir and vapi data dirs -# Otherwise we'll get host directory data which isn't enough -define HOST_VALA_INSTALL_WRAPPER - $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ - $(HOST_DIR)/usr/bin/vala - $(INSTALL) -D -m 0755 package/vala/vala-wrapper \ - $(HOST_DIR)/usr/bin/valac - $(SED) 's,@VALA_VERSION@,$(VALA_VERSION_MAJOR),' \ - $(HOST_DIR)/usr/bin/vala \ - $(HOST_DIR)/usr/bin/valac -endef -HOST_VALA_POST_INSTALL_HOOKS += HOST_VALA_INSTALL_WRAPPER - -$(eval $(host-autotools-package)) diff --git a/package.bak/valgrind/0001-workaround-SIGSEGV-on-PPC.patch b/package.bak/valgrind/0001-workaround-SIGSEGV-on-PPC.patch deleted file mode 100644 index 8a6003cbae..0000000000 --- a/package.bak/valgrind/0001-workaround-SIGSEGV-on-PPC.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ff29b837f21a69c79289c3a87b03f8c23e05616e Mon Sep 17 00:00:00 2001 -From: Pierre Habouzit -Date: Tue, 10 May 2011 23:11:45 +0200 -Subject: [PATCH] workaround SIGSEGV on PPC. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Pierre Habouzit -Signed-off-by: Jérôme Pouiller ---- - coregrind/m_machine.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/coregrind/m_machine.c b/coregrind/m_machine.c -index 6110c93..298a00e 100644 ---- a/coregrind/m_machine.c -+++ b/coregrind/m_machine.c -@@ -27,6 +27,10 @@ - The GNU General Public License is contained in the file COPYING. - */ - -+#ifdef __powerpc__ -+# pragma GCC optimize ("-O0") -+#endif -+ - #include "pub_core_basics.h" - #include "pub_core_vki.h" - #include "pub_core_threadstate.h" --- -2.1.4 - diff --git a/package.bak/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch b/package.bak/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch deleted file mode 100644 index 44adfc4190..0000000000 --- a/package.bak/valgrind/0002-Define-PTRACE_GETSIGINFO-on-PowerPC-when-not-availab.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7311686d6286972ff97cc18b2416a4cdd7fc5c7e Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 31 Oct 2015 12:15:24 +0100 -Subject: [PATCH] Define PTRACE_GETSIGINFO on PowerPC when not available - -uClibc 0.9.33.2 does not define PTRACE_GETSIGINFO in PowerPC. Even -though Buildroot has a uClibc patch doing that, it doesn't solve the -case of external uClibc toolchain from other sources (such as -Crosstool-NG). Therefore, this patch modifies Valgrind to define -PTRACE_GETSIGINFO on PowerPC to the right value, when such definition -is not available from the C library. - -Signed-off-by: Thomas Petazzoni ---- - coregrind/vgdb-invoker-ptrace.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/coregrind/vgdb-invoker-ptrace.c b/coregrind/vgdb-invoker-ptrace.c -index d65f59a..bdefac2 100644 ---- a/coregrind/vgdb-invoker-ptrace.c -+++ b/coregrind/vgdb-invoker-ptrace.c -@@ -72,6 +72,12 @@ - # endif - #endif - -+#if defined(__powerpc__) -+# ifndef PTRACE_GETSIGINFO -+# define PTRACE_GETSIGINFO 0x4202 -+# endif -+#endif -+ - // 32-bit or 64-bit wide, depending on primary architecture. - typedef Addr CORE_ADDR; - typedef Addr PTRACE_XFER_TYPE; --- -2.1.4 - diff --git a/package.bak/valgrind/0004-Fixes-for-musl-libc.patch b/package.bak/valgrind/0004-Fixes-for-musl-libc.patch deleted file mode 100644 index d543728ac5..0000000000 --- a/package.bak/valgrind/0004-Fixes-for-musl-libc.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 50859f3577418cc42f76e1319e699202a615bbe1 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Sat, 31 Oct 2015 19:45:04 +0100 -Subject: [PATCH] Fixes for musl libc. - -- add musl libc detection (prevents configure error) -- adjust preload and symbol names (based on the OpenWrt - patch, see [1]) - -[1] https://dev.openwrt.org/browser/trunk/package/devel/valgrind/patches/200-musl_fix.patch?rev=46302 - -Signed-off-by: Peter Seiderer ---- - configure.ac | 16 ++++++++++++++-- - coregrind/vg_preloaded.c | 2 +- - include/pub_tool_redir.h | 9 ++++++++- - 3 files changed, 23 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8ab7f9b..e865bf5 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1009,6 +1009,13 @@ if test x$VGCONF_PLATFORM_PRI_CAPS = xX86_SOLARIS \ - GLIBC_VERSION="solaris" - fi - -+# GLIBC_VERSION is empty if a musl libc is used, so use the toolchain tuple -+# in this case. -+if test x$GLIBC_VERSION = x; then -+ if $CC -dumpmachine | grep -q musl; then -+ GLIBC_VERSION=musl -+ fi -+fi - - AC_MSG_CHECKING([the glibc version]) - -@@ -1064,10 +1071,15 @@ case "${GLIBC_VERSION}" in - # DEFAULT_SUPP set in host_os switch-case above. - # No other suppression file is used. - ;; -+ musl) -+ AC_MSG_RESULT(Musl) -+ AC_DEFINE([MUSL_LIBC], 1, [Define to 1 if you're using Musl libc]) -+ # no DEFAULT_SUPP file yet for musl libc. -+ ;; - 2.0|2.1|*) - AC_MSG_RESULT([unsupported version ${GLIBC_VERSION}]) -- AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later,]) -- AC_MSG_ERROR([Darwin libc, Bionic libc or Solaris libc]) -+ AC_MSG_ERROR([Valgrind requires glibc version 2.2 or later, uClibc,]) -+ AC_MSG_ERROR([musl libc, Darwin libc, Bionic libc or Solaris libc]) - ;; - esac - -diff --git a/coregrind/vg_preloaded.c b/coregrind/vg_preloaded.c -index 2ea7a7a..7b51aba 100644 ---- a/coregrind/vg_preloaded.c -+++ b/coregrind/vg_preloaded.c -@@ -56,7 +56,7 @@ - void VG_NOTIFY_ON_LOAD(freeres)( void ); - void VG_NOTIFY_ON_LOAD(freeres)( void ) - { --# if !defined(__UCLIBC__) \ -+# if !defined(__UCLIBC__) && !defined(MUSL_LIBC) \ - && !defined(VGPV_arm_linux_android) \ - && !defined(VGPV_x86_linux_android) \ - && !defined(VGPV_mips32_linux_android) \ -diff --git a/include/pub_tool_redir.h b/include/pub_tool_redir.h -index bac00d7..babcf9a 100644 ---- a/include/pub_tool_redir.h -+++ b/include/pub_tool_redir.h -@@ -242,8 +242,11 @@ - /* --- Soname of the standard C library. --- */ - - #if defined(VGO_linux) || defined(VGO_solaris) -+# if defined(MUSL_LIBC) -+# define VG_Z_LIBC_SONAME libcZdZa // libc.* -+#else - # define VG_Z_LIBC_SONAME libcZdsoZa // libc.so* -- -+#endif - #elif defined(VGO_darwin) && (DARWIN_VERS <= DARWIN_10_6) - # define VG_Z_LIBC_SONAME libSystemZdZaZddylib // libSystem.*.dylib - -@@ -274,7 +277,11 @@ - /* --- Soname of the pthreads library. --- */ - - #if defined(VGO_linux) -+# if defined(MUSL_LIBC) -+# define VG_Z_LIBPTHREAD_SONAME libcZdZa // libc.* -+#else - # define VG_Z_LIBPTHREAD_SONAME libpthreadZdsoZd0 // libpthread.so.0 -+#endif - #elif defined(VGO_darwin) - # define VG_Z_LIBPTHREAD_SONAME libSystemZdZaZddylib // libSystem.*.dylib - #elif defined(VGO_solaris) --- -2.1.4 - diff --git a/package.bak/valgrind/Config.in b/package.bak/valgrind/Config.in deleted file mode 100644 index 40e219d95a..0000000000 --- a/package.bak/valgrind/Config.in +++ /dev/null @@ -1,81 +0,0 @@ -comment "valgrind needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_VALGRIND - bool "valgrind" - depends on BR2_ARM_CPU_ARMV7A || BR2_i386 || \ - BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \ - BR2_powerpc || BR2_powerpc64 || BR2_powerpc64le || \ - BR2_x86_64 - depends on !BR2_STATIC_LIBS - depends on !BR2_MIPS_SOFT_FLOAT - help - Tool for debugging and profiling Linux programs. - - http://valgrind.org/ - -if BR2_PACKAGE_VALGRIND - -config BR2_PACKAGE_VALGRIND_MEMCHECK - bool "Memcheck: a memory error detector" - default y - help - This option allows to install the Memcheck tool - -config BR2_PACKAGE_VALGRIND_CACHEGRIND - bool "Cachegrind: a cache and branch-prediction profiler" - default y - help - This option allows to install the Cachegrind tool - -config BR2_PACKAGE_VALGRIND_CALLGRIND - bool "Callgrind: a call-graph generating cache and branch prediction profiler" - default y - help - This option allows to install the Callgrind tool - -config BR2_PACKAGE_VALGRIND_HELGRIND - bool "Helgrind: a thread error detector" - default y - help - This option allows to install the Helgrind tool - -config BR2_PACKAGE_VALGRIND_DRD - bool "DRD: a thread error detector" - default y - help - This option allows to install the DRD tool - -config BR2_PACKAGE_VALGRIND_MASSIF - bool "Massif: a heap profiler" - default y - help - This option allows to install the Massif tool - -config BR2_PACKAGE_VALGRIND_DHAT - bool "DHAT: a dynamic heap analysis tool" - default y - help - This option allows to install the DHAT tool - -config BR2_PACKAGE_VALGRIND_SGCHECK - bool "SGCheck: an experimental stack and global array overrun detector" - help - This option allows to install the SGCheck tool - -config BR2_PACKAGE_VALGRIND_BBV - bool "BBV: an experimental basic block vector generation tool" - help - This option allows to install the BBV tool - -config BR2_PACKAGE_VALGRIND_LACKEY - bool "Lackey: an example tool" - help - This option allows to install the Lackey tool - -config BR2_PACKAGE_VALGRIND_NULGRIND - bool "Nulgrind: the minimal Valgrind tool" - help - This option allows to install the Nulgrind tool - -endif diff --git a/package.bak/valgrind/uclibc.supp b/package.bak/valgrind/uclibc.supp deleted file mode 100644 index 179d27b7ac..0000000000 --- a/package.bak/valgrind/uclibc.supp +++ /dev/null @@ -1,212 +0,0 @@ -{ - - Memcheck:Addr1 - fun:_dl_strdup - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_malloc - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Cond - fun:_dl_get_ready_to_run - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_get_ready_to_run - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_get_ready_to_run - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_get_ready_to_run - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_add_elf_hash_table - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_add_elf_hash_table - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_add_elf_hash_table - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_check_if_named_library_is_loaded - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_check_if_named_library_is_loaded - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_check_hashed_files - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_check_hashed_files - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_load_elf_shared_library - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_load_elf_shared_library - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_load_elf_shared_library - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_load_shared_library - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr1 - fun:_dl_find_hash - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_find_hash - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_fixup - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_fixup - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_linux_resolve - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_linux_resolver - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - fun:_dl_parse_lazy_relocation_information - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr2 - obj:/lib/ld-uClibc* - fun:_dl_parse_lazy_relocation_information -} -{ - - Memcheck:Addr4 - fun:_dl_parse_lazy_relocation_information - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - obj:/lib/ld-uClibc* - obj:/lib/ld-uClibc* - fun:_dl_parse_lazy_relocation_information -} -{ - - Memcheck:Addr4 - obj:/lib/ld-uClibc* - fun:_dl_parse_lazy_relocation_information -} -{ - - Memcheck:Addr2 - obj:/lib/ld-uClibc* - fun:_dl_parse_relocation_information -} -{ - - Memcheck:Addr2 - fun:_dl_parse_relocation_information - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - fun:_dl_parse_relocation_information - obj:/lib/ld-uClibc* -} -{ - - Memcheck:Addr4 - obj:/lib/ld-uClibc* - fun:_dl_parse_relocation_information -} -{ - - Memcheck:Addr4 - obj:/lib/ld-uClibc* - obj:/lib/ld-uClibc* - fun:_dl_parse_relocation_information -} -{ - - Memcheck:Addr2 - obj:/lib/ld-uClibc-0.9.27.so - fun:* -} -{ - - Memcheck:Addr4 - obj:/lib/ld-uClibc-0.9.27.so - fun:* -} diff --git a/package.bak/valgrind/valgrind.hash b/package.bak/valgrind/valgrind.hash deleted file mode 100644 index 5d7da19a86..0000000000 --- a/package.bak/valgrind/valgrind.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://valgrind.org/downloads/current.html -md5 6eb03c0c10ea917013a7622e483d61bb valgrind-3.12.0.tar.bz2 diff --git a/package.bak/valgrind/valgrind.mk b/package.bak/valgrind/valgrind.mk deleted file mode 100644 index ccc6cc3905..0000000000 --- a/package.bak/valgrind/valgrind.mk +++ /dev/null @@ -1,153 +0,0 @@ -################################################################################ -# -# valgrind -# -################################################################################ - -VALGRIND_VERSION = 3.12.0 -VALGRIND_SITE = http://valgrind.org/downloads -VALGRIND_SOURCE = valgrind-$(VALGRIND_VERSION).tar.bz2 -VALGRIND_LICENSE = GPLv2, GFDLv1.2 -VALGRIND_LICENSE_FILES = COPYING COPYING.DOCS -VALGRIND_CONF_OPTS = \ - --disable-ubsan \ - --without-mpicc -VALGRIND_INSTALL_STAGING = YES - -# patch 0004-Fixes-for-musl-libc.patch touching configure.ac -VALGRIND_AUTORECONF = YES - -# Valgrind must be compiled with no stack protection, so forcefully -# pass -fno-stack-protector to override what Buildroot may have in -# TARGET_CFLAGS if BR2_SSP_* support is enabled. -VALGRIND_CFLAGS = \ - $(TARGET_CFLAGS) \ - -fno-stack-protector - -# When Valgrind detects a 32-bit MIPS architecture, it forcibly adds -# -march=mips32 to CFLAGS; when it detects a 64-bit MIPS architecture, -# it forcibly adds -march=mips64. This causes Valgrind to be built -# always for the first ISA revision level (R1), even when the user has -# configured Buildroot for the second ISA revision level (R2). -# -# Override the CFLAGS variable (which Valgrind appends to its CFLAGS) -# and pass the right -march option, so they take precedence over -# Valgrind's wrongfully detected value. -ifeq ($(BR2_mips)$(BR2_mipsel)$(BR2_mips64)$(BR2_mips64el),y) -VALGRIND_CFLAGS += -march=$(BR2_GCC_TARGET_ARCH) -endif - -VALGRIND_CONF_ENV = CFLAGS="$(VALGRIND_CFLAGS)" - -# On ARM, Valgrind only supports ARMv7, and uses the arch part of the -# host tuple to determine whether it's being built for ARMv7 or -# not. Therefore, we adjust the host tuple to specify we're on -# ARMv7. The valgrind package is guaranteed, through Config.in, to -# only be selected on ARMv7-A platforms. -ifeq ($(BR2_ARM_CPU_ARMV7A),y) -VALGRIND_CONF_OPTS += \ - --host=$(patsubst arm-%,armv7-%,$(GNU_TARGET_NAME)) -endif - -define VALGRIND_INSTALL_UCLIBC_SUPP - $(INSTALL) -D -m 0644 package/valgrind/uclibc.supp $(TARGET_DIR)/usr/lib/valgrind/uclibc.supp -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_INSTALL_UCLIBC_SUPP - -ifeq ($(BR2_PACKAGE_VALGRIND_MEMCHECK),) -define VALGRIND_REMOVE_MEMCHECK - rm -f $(TARGET_DIR)/usr/lib/valgrind/*memcheck* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MEMCHECK -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_CACHEGRIND),) -define VALGRIND_REMOVE_CACHEGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*cachegrind* - for i in cg_annotate cg_diff cg_merge; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CACHEGRIND -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_CALLGRIND),) -define VALGRIND_REMOVE_CALLGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*callgrind* - for i in callgrind_annotate callgrind_control ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_CALLGRIND -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_HELGRIND),) -define VALGRIND_REMOVE_HELGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*helgrind* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_HELGRIND -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_DRD),) -define VALGRIND_REMOVE_DRD - rm -f $(TARGET_DIR)/usr/lib/valgrind/*drd* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DRD -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_MASSIF),) -define VALGRIND_REMOVE_MASSIF - rm -f $(TARGET_DIR)/usr/lib/valgrind/*massif* - rm -f $(TARGET_DIR)/usr/bin/ms_script -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_MASSIF -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_DHAT),) -define VALGRIND_REMOVE_DHAT - rm -f $(TARGET_DIR)/usr/lib/valgrind/*dhat* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_DHAT -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_SGCHECK),) -define VALGRIND_REMOVE_SGCHECK - rm -f $(TARGET_DIR)/usr/lib/valgrind/*sgcheck* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_SGCHECK -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_BBV),) -define VALGRIND_REMOVE_BBV - rm -f $(TARGET_DIR)/usr/lib/valgrind/*bbv* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_BBV -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_LACKEY),) -define VALGRIND_REMOVE_LACKEY - rm -f $(TARGET_DIR)/usr/lib/valgrind/*lackey* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_LACKEY -endif - -ifeq ($(BR2_PACKAGE_VALGRIND_NULGRIND),) -define VALGRIND_REMOVE_NULGRIND - rm -f $(TARGET_DIR)/usr/lib/valgrind/*none* -endef - -VALGRIND_POST_INSTALL_TARGET_HOOKS += VALGRIND_REMOVE_NULGRIND -endif - -$(eval $(autotools-package)) diff --git a/package.bak/valijson/Config.in b/package.bak/valijson/Config.in deleted file mode 100644 index 10721b3703..0000000000 --- a/package.bak/valijson/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_VALIJSON - bool "valijson" - depends on BR2_USE_WCHAR - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_REGEX - help - Valijson is a header-only JSON Schema Validation library for - C++. Valijson provides a simple validation API that allows - you load JSON Schemas, and validate documents loaded by one - of several supported parser libraries like boost, jsoncpp, - rapidjson and picoJSON. - - https://github.com/tristanpenman/valijson - -comment "valijson needs a toolchain w/ C++, threads, wchar support" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/valijson/valijson.hash b/package.bak/valijson/valijson.hash deleted file mode 100644 index 79b3fb7d69..0000000000 --- a/package.bak/valijson/valijson.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally Computed: -sha256 f2346e995bd95c6b86b0b9e9dd228fe134d529565fa86db764c48496805dd9bc valijson-424b706f990a9eb96dfc19cc8e54f2cd6ce5e186.tar.gz diff --git a/package.bak/valijson/valijson.mk b/package.bak/valijson/valijson.mk deleted file mode 100644 index e0813b3880..0000000000 --- a/package.bak/valijson/valijson.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# valijson -# -################################################################################ - -VALIJSON_VERSION = 424b706f990a9eb96dfc19cc8e54f2cd6ce5e186 -VALIJSON_SITE = $(call github,tristanpenman,valijson,$(VALIJSON_VERSION)) -VALIJSON_LICENSE = BSD-2c -VALIJSON_LICENSE_FILES = LICENSE -VALIJSON_INSTALL_STAGING = YES -VALIJSON_INSTALL_TARGET = NO -VALIJSON_DEPENDENCIES = boost -VALIJSON_CONF_OPTS = -DINSTALL_HEADERS=TRUE - -$(eval $(cmake-package)) diff --git a/package.bak/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch b/package.bak/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch deleted file mode 100644 index 42410c8d13..0000000000 --- a/package.bak/vboot-utils/0001-Add-missing-definition-of-MTD_CHAR_MAJOR.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 1438211660e700b2c9505863aae1cc957236b7c8 Mon Sep 17 00:00:00 2001 -From: Alex Suykov -Date: Thu, 21 Jan 2016 21:59:46 +0100 -Subject: [PATCH] Add missing definition of MTD_CHAR_MAJOR - -This definition missing from for kernels <= 3.13 - -Signed-off-by: Alex Suykov ---- - cgpt/cgpt_wrapper.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/cgpt/cgpt_wrapper.c b/cgpt/cgpt_wrapper.c -index dcfaab9..4d07aad 100644 ---- a/cgpt/cgpt_wrapper.c -+++ b/cgpt/cgpt_wrapper.c -@@ -25,6 +25,10 @@ - #include "cgpt_nor.h" - #include "cryptolib.h" - -+#ifndef MTD_CHAR_MAJOR -+#define MTD_CHAR_MAJOR 90 -+#endif -+ - // Check if cmdline |argv| has "-D". "-D" signifies that GPT structs are stored - // off device, and hence we should not wrap around cgpt. - static bool has_dash_D(int argc, const char *const argv[]) { --- -2.6.4 - diff --git a/package.bak/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch b/package.bak/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch deleted file mode 100644 index 4d559eabaf..0000000000 --- a/package.bak/vboot-utils/0002-Add-missing-header-include-for-ssize_t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b6bed8d4e9453bc74ba021c8c17e20c3b5964c37 Mon Sep 17 00:00:00 2001 -From: Alex Suykov -Date: Thu, 21 Jan 2016 22:00:34 +0100 -Subject: [PATCH] Add missing header include for ssize_t - -The code uses ssize_t which is usually defined in . - -Signed-off-by: Alex Suykov ---- - host/lib/fmap.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/host/lib/fmap.c b/host/lib/fmap.c -index c95338d..e3db826 100644 ---- a/host/lib/fmap.c -+++ b/host/lib/fmap.c -@@ -6,6 +6,7 @@ - - #include - #include -+#include - - #include "fmap.h" - --- -2.6.4 - diff --git a/package.bak/vboot-utils/0003-Avoid-RSA-type-redefinition.patch b/package.bak/vboot-utils/0003-Avoid-RSA-type-redefinition.patch deleted file mode 100644 index 86374ca854..0000000000 --- a/package.bak/vboot-utils/0003-Avoid-RSA-type-redefinition.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 593407d2b3ea3b871d55ec399671e48c84b900a7 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 21 Jan 2016 22:01:37 +0100 -Subject: [PATCH] Avoid RSA type redefinition - -The host_key.h headers does: - - typedef struct rsa_st RSA; - -But this type definition is already done by the OpenSSL headers. - -While such a type redefinition is legal with recent gcc versions, it -doesn't build with older gcc versions such as gcc 4.4. - -To work around this problem, we instead use a forward declaration of -"struct rsa_st", and change the only place where the RSA type was used -by "struct rsa_st". - -Signed-off-by: Thomas Petazzoni ---- - host/lib/include/host_key.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/host/lib/include/host_key.h b/host/lib/include/host_key.h -index 9f98ccc..c2d01a5 100644 ---- a/host/lib/include/host_key.h -+++ b/host/lib/include/host_key.h -@@ -12,11 +12,11 @@ - #include "vboot_struct.h" - - --typedef struct rsa_st RSA; -+struct rsa_st; - - /* Private key data */ - typedef struct VbPrivateKey { -- RSA* rsa_private_key; /* Private key data */ -+ struct rsa_rt* rsa_private_key; /* Private key data */ - uint64_t algorithm; /* Algorithm to use when signing */ - } VbPrivateKey; - --- -2.6.4 - diff --git a/package.bak/vboot-utils/Config.in.host b/package.bak/vboot-utils/Config.in.host deleted file mode 100644 index aa0caef2e2..0000000000 --- a/package.bak/vboot-utils/Config.in.host +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_HOST_VBOOT_UTILS - bool "host vboot utils" - select BR2_PACKAGE_HOST_UTIL_LINUX - help - Chromium OS verified boot utilities: futility and cgpt. - - https://www.chromium.org/chromium-os/chromiumos-design-docs/verified-boot diff --git a/package.bak/vboot-utils/vboot-utils.hash b/package.bak/vboot-utils/vboot-utils.hash deleted file mode 100644 index e16142389b..0000000000 --- a/package.bak/vboot-utils/vboot-utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Git shapshot -none xxx bbdd62f9b030db7ad8eef789aaf58a7ff9a25656.tar.gz diff --git a/package.bak/vboot-utils/vboot-utils.mk b/package.bak/vboot-utils/vboot-utils.mk deleted file mode 100644 index a7592d6a4e..0000000000 --- a/package.bak/vboot-utils/vboot-utils.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# vboot-utils -# -################################################################################ - -VBOOT_UTILS_VERSION = bbdd62f9b030db7ad8eef789aaf58a7ff9a25656 -VBOOT_UTILS_SITE = https://chromium.googlesource.com/chromiumos/platform/vboot_reference -VBOOT_UTILS_SITE_METHOD = git -VBOOT_UTILS_LICENSE = BSD-3c -VBOOT_UTILS_LICENSE_FILES = LICENSE - -HOST_VBOOT_UTILS_DEPENDENCIES = host-openssl host-util-linux host-pkgconf - -# vboot_reference contains code that goes into bootloaders, -# utilities intended for the target system, and a bunch of scripts -# for Chromium OS build system. Most of that does not make sense -# in a buildroot host-package. -# -# We only need futility for signing images, the keys, and cgpt for boot -# media partitioning. -# -# make target for futility is "futil". - -define HOST_VBOOT_UTILS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - CC="$(HOSTCC)" \ - CFLAGS="$(HOST_CFLAGS) -D_LARGEFILE64_SOURCE -D_GNU_SOURCE" \ - LDFLAGS="$(HOST_LDFLAGS)" \ - futil cgpt -endef - -define HOST_VBOOT_UTILS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(HOST_DIR)/usr \ - futil_install cgpt_install devkeys_install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/vde2/0001-no-cxx.patch b/package.bak/vde2/0001-no-cxx.patch deleted file mode 100644 index 67cefa2bb8..0000000000 --- a/package.bak/vde2/0001-no-cxx.patch +++ /dev/null @@ -1,22 +0,0 @@ -configure: do not test for CXX, it's not needed - -There is no C++ source file, so no reason to require a C++ compiler. - -Reported-by: Peter Korsgaard -Signed-off-by: "Yann E. MORIN" - ---- -Patch sent upstream -( not yet in archives, awaits moderator approval... :-/ ) - -diff -durN vde2-2.3.2.orig/configure.ac vde2-2.3.2/configure.ac ---- vde2-2.3.2.orig/configure.ac 2011-11-23 17:41:19.000000000 +0100 -+++ vde2-2.3.2/configure.ac 2012-12-14 21:56:47.146319686 +0100 -@@ -11,7 +11,6 @@ - AC_CONFIG_LIBOBJ_DIR(src/common) - - # Checks for programs. --AC_PROG_CXX - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_LN_S diff --git a/package.bak/vde2/Config.in b/package.bak/vde2/Config.in deleted file mode 100644 index f640a4ae2a..0000000000 --- a/package.bak/vde2/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_VDE2 - bool "vde2" - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS # dlopen() - help - VDE is an ethernet compliant virtual network that can be - spawned over a set of physical computers over the Internet. - VDE is part of the virtualsquare project. - - http://vde.sourceforge.net/ - -comment "vde2 needs a toolchain w/ dynamic library" - depends on BR2_USE_MMU - depends on BR2_STATIC_LIBS diff --git a/package.bak/vde2/vde2.hash b/package.bak/vde2/vde2.hash deleted file mode 100644 index a56a1bbbe0..0000000000 --- a/package.bak/vde2/vde2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 cbea9b7e03097f87a6b5e98b07890d2275848f1fe4b9fcda77b8994148bc9542 vde2-2.3.2.tar.bz2 diff --git a/package.bak/vde2/vde2.mk b/package.bak/vde2/vde2.mk deleted file mode 100644 index 3bbfd5f5ca..0000000000 --- a/package.bak/vde2/vde2.mk +++ /dev/null @@ -1,52 +0,0 @@ -################################################################################ -# -# vde2 -# -################################################################################ - -VDE2_VERSION = 2.3.2 -VDE2_SOURCE = vde2-$(VDE2_VERSION).tar.bz2 -VDE2_SITE = http://downloads.sourceforge.net/project/vde/vde2/$(VDE2_VERSION) -VDE2_LICENSE = GPLv2+, LGPLv2.1+, BSD-3c -VDE2_LICENSE_FILES = COPYING COPYING.libvdeplug COPYING.slirpvde -VDE2_INSTALL_STAGING = YES - -# We touch configure.ac, so we need to autoreconf -VDE2_AUTORECONF = YES - -# Reasons for enabling/disabling stuff: -# - tuntap is enabled in the hope we're using a recent-enough toolchain -# that does have if_tun.h (virtually everything these days) -# - kvde_switch is disabled because it requires a patched kernel -# - cryptcab is disabled to not depend on openSSL -# - python is disabled to not depend on Python -# - pcap is disabled to not depend on libpcap -# - profiling is disabled because we do not want to debug/profile -# -# Note: disabled features can be added with corresponding dependencies -# in future commits. -VDE2_CONF_OPTS = \ - --disable-cryptcab \ - --disable-experimental \ - --disable-kernel-switch \ - --disable-pcap \ - --disable-profile \ - --disable-python \ - --enable-tuntap - -# Package does not build in parallel due to improper make rules -VDE2_MAKE = $(MAKE1) - -HOST_VDE2_CONF_OPTS = \ - --disable-cryptcab \ - --disable-experimental \ - --disable-kernel-switch \ - --disable-pcap \ - --disable-profile \ - --disable-python \ - --enable-tuntap - -HOST_VDE2_MAKE = $(MAKE1) - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/vdr-plugin-vnsiserver/Config.in b/package.bak/vdr-plugin-vnsiserver/Config.in deleted file mode 100644 index 0a0ab8d376..0000000000 --- a/package.bak/vdr-plugin-vnsiserver/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_VDR_PLUGIN_VNSISERVER - bool "vdr-plugin-vnsiserver" - depends on BR2_PACKAGE_VDR - help - VDR plugin to handle KODI clients. - The vdr-plugin-vnsiserver is able to handle serveral KODI - clients connecting via the VNSI addon. - - https://github.com/FernetMenta/vdr-plugin-vnsiserver diff --git a/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash b/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash deleted file mode 100644 index cf403f50c8..0000000000 --- a/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 fd00fb6d833cad6a32a0d8259bb125abdf1716680650ba24b34bca2201745877 vdr-plugin-vnsiserver-v1.5.0.tar.gz diff --git a/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk b/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk deleted file mode 100644 index aaa0859e58..0000000000 --- a/package.bak/vdr-plugin-vnsiserver/vdr-plugin-vnsiserver.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# vdr-plugin-vnsiserver -# -################################################################################ - -VDR_PLUGIN_VNSISERVER_VERSION = v1.5.0 -VDR_PLUGIN_VNSISERVER_SITE = $(call github,FernetMenta,vdr-plugin-vnsiserver,$(VDR_PLUGIN_VNSISERVER_VERSION)) -VDR_PLUGIN_VNSISERVER_LICENSE = GPLv2+ -VDR_PLUGIN_VNSISERVER_LICENSE_FILES = COPYING -VDR_PLUGIN_VNSISERVER_DEPENDENCIES = vdr - -VDR_PLUGIN_VNSISERVER_CXXFLAGS = CXXFLAGS="$(TARGET_CXXFLAGS) -std=c++11 -fPIC" - -define VDR_PLUGIN_VNSISERVER_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - $(VDR_PLUGIN_VNSISERVER_CXXFLAGS) -endef - -define VDR_PLUGIN_VNSISERVER_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - install DESTDIR=$(TARGET_DIR) LIBDIR=/usr/lib/vdr -endef - -$(eval $(generic-package)) diff --git a/package.bak/vdr/0001-getloadavg.patch b/package.bak/vdr/0001-getloadavg.patch deleted file mode 100644 index 3937c83dd8..0000000000 --- a/package.bak/vdr/0001-getloadavg.patch +++ /dev/null @@ -1,55 +0,0 @@ -Fix compilation with uClibc - -Ported from -https://github.com/stschake/buildroot-grasshopper/blob/master/package/torsmo/torsmo-0.18-uclibc-getloadavg.patch - -Signed-off-by: Bernd Kuhls - -diff -uwNr vdr-2.3.1.org/skinlcars.c vdr-2.3.1/skinlcars.c ---- vdr-2.3.1.org/skinlcars.c 2015-09-01 12:07:07.000000000 +0200 -+++ vdr-2.3.1/skinlcars.c 2016-07-31 21:00:11.000000000 +0200 -@@ -1099,6 +1099,44 @@ - } - } - -+/* uclibc and dietlibc do not have this junk -ReneR */ -+#if defined (__UCLIBC__) || defined (__dietlibc__) -+static int getloadavg (double loadavg[], int nelem) -+{ -+ int fd; -+ -+ fd = open ("/proc/loadavg", O_RDONLY); -+ if (fd < 0) -+ return -1; -+ else -+ { -+ char buf[65], *p; -+ ssize_t nread; -+ int i; -+ -+ nread = read (fd, buf, sizeof buf - 1); -+ close (fd); -+ if (nread <= 0) -+ return -1; -+ buf[nread - 1] = '\0'; -+ -+ if (nelem > 3) -+ nelem = 3; -+ p = buf; -+ for (i = 0; i < nelem; ++i) -+ { -+ char *endp; -+ loadavg[i] = strtod (p, &endp); -+ if (endp == p) -+ return -1; -+ p = endp; -+ } -+ -+ return i; -+ } -+} -+#endif -+ - void cSkinLCARSDisplayMenu::DrawLoad(void) - { - if (yb04) { diff --git a/package.bak/vdr/0002-libjpeg.patch b/package.bak/vdr/0002-libjpeg.patch deleted file mode 100644 index dbd1f12838..0000000000 --- a/package.bak/vdr/0002-libjpeg.patch +++ /dev/null @@ -1,40 +0,0 @@ -Fix compilation with libjpeg - -Patch inspired by upstream board: -http://www.vdr-portal.de/board16-video-disk-recorder/board4-vdr-installation/p1189959-vdr-2-05-mit-libjpeg-9a-kommt-nicht-aus/#post1189959 - -Signed-off-by: Bernd Kuhls - -diff -uNr vdr-2.3.1.org/tools.c vdr-2.3.1/tools.c ---- vdr-2.3.1.org/tools.c 2015-09-10 15:17:55.000000000 +0200 -+++ vdr-2.3.1/tools.c 2016-08-01 06:37:44.000000000 +0200 -@@ -1254,15 +1254,15 @@ - } - else { - esyslog("ERROR: out of memory"); -- return false; -+ return FALSE; - } - if (jcd->mem) { - cinfo->dest->next_output_byte = jcd->mem + Used; - cinfo->dest->free_in_buffer = jcd->size - Used; -- return true; -+ return TRUE; - } - } -- return false; -+ return FALSE; - } - - static void JpegCompressTermDestination(j_compress_ptr cinfo) -@@ -1307,8 +1307,8 @@ - cinfo.in_color_space = JCS_RGB; - - jpeg_set_defaults(&cinfo); -- jpeg_set_quality(&cinfo, Quality, true); -- jpeg_start_compress(&cinfo, true); -+ jpeg_set_quality(&cinfo, Quality, TRUE); -+ jpeg_start_compress(&cinfo, TRUE); - - int rs = Width * 3; - JSAMPROW rp[Height]; diff --git a/package.bak/vdr/Config.in b/package.bak/vdr/Config.in deleted file mode 100644 index d283b462b1..0000000000 --- a/package.bak/vdr/Config.in +++ /dev/null @@ -1,25 +0,0 @@ -config BR2_PACKAGE_VDR - bool "vdr" - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - depends on !BR2_TOOLCHAIN_USES_MUSL # _nl_msg_cat_cntr - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBCAP - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - This project describes how to build your own digital - satellite receiver and Video Disk Recorder. - - http://www.tvdr.de - -comment "vdr needs a glibc or uClibc toolchain w/ C++, dynamic library, NPTL, wchar" - depends on BR2_USE_MMU - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS_NPTL || \ - BR2_TOOLCHAIN_USES_MUSL || !BR2_USE_WCHAR diff --git a/package.bak/vdr/vdr.hash b/package.bak/vdr/vdr.hash deleted file mode 100644 index edbcd3fccd..0000000000 --- a/package.bak/vdr/vdr.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://www.linuxtv.org/pipermail/vdr/2016-December/029178.html -md5 6dbb208ea3d59658a18912b49af175b3 vdr-2.3.2.tar.bz2 -# Locally computed -sha256 6c6ab08cf4dadd296e5e4a1c13f793c2e9222ec23103ae7aa9d616619f1496c0 vdr-2.3.2.tar.bz2 diff --git a/package.bak/vdr/vdr.mk b/package.bak/vdr/vdr.mk deleted file mode 100644 index cdfa7e3af8..0000000000 --- a/package.bak/vdr/vdr.mk +++ /dev/null @@ -1,66 +0,0 @@ -################################################################################ -# -# vdr -# -################################################################################ - -VDR_VERSION = 2.3.2 -VDR_SOURCE = vdr-$(VDR_VERSION).tar.bz2 -VDR_SITE = ftp://ftp.tvdr.de/vdr/Developer -VDR_LICENSE = GPLv2+ -VDR_LICENSE_FILES = COPYING -VDR_INSTALL_STAGING = YES -VDR_DEPENDENCIES = \ - freetype \ - fontconfig \ - jpeg \ - libcap - -VDR_INCLUDE_DIRS = -I$(STAGING_DIR)/usr/include/freetype2 -VDR_MAKE_FLAGS = \ - NO_KBD=yes \ - PLUGINLIBDIR=/usr/lib/vdr \ - PREFIX=/usr \ - VIDEODIR=/var/lib/vdr - -ifeq ($(BR2_NEEDS_GETTEXT),y) -VDR_DEPENDENCIES += gettext -VDR_LDFLAGS += -lintl -endif - -ifeq ($(BR2_PACKAGE_LIBFRIBIDI),y) -VDR_DEPENDENCIES += libfribidi -VDR_INCLUDE_DIRS += -I$(STAGING_DIR)/usr/include/fribidi -VDR_LDFLAGS += -lfribidi -VDR_MAKE_FLAGS += BIDI=1 -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -VDR_DEPENDENCIES += libiconv -VDR_LDFLAGS += -liconv -endif - -VDR_MAKE_ENV = \ - INCLUDES="$(VDR_INCLUDE_DIRS)" \ - LDFLAGS="$(VDR_LDFLAGS)" \ - $(VDR_MAKE_FLAGS) - -define VDR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ - vdr vdr.pc include-dir -endef - -define VDR_INSTALL_STAGING_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ - DESTDIR=$(STAGING_DIR) \ - install-dirs install-bin install-conf install-includes \ - install-pc -endef - -define VDR_INSTALL_TARGET_CMDS - $(MAKE1) $(TARGET_CONFIGURE_OPTS) -C $(@D) $(VDR_MAKE_ENV) \ - DESTDIR=$(TARGET_DIR) \ - install-dirs install-bin install-conf -endef - -$(eval $(generic-package)) diff --git a/package.bak/vim/Config.in b/package.bak/vim/Config.in deleted file mode 100644 index b851627ca0..0000000000 --- a/package.bak/vim/Config.in +++ /dev/null @@ -1,27 +0,0 @@ -config BR2_PACKAGE_VIM - bool "vim" - depends on BR2_USE_MMU # uses fork() - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - VIM Text editor - - http://www.vim.org/ - -if BR2_PACKAGE_VIM - -config BR2_PACKAGE_VIM_RUNTIME - bool "install runtime" - default y - help - Install VIM runtime (syntax highlighing + macros). - This option adds about 11MB of data to /usr/share/ - -endif - -comment "vim needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_USE_MMU - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/vim/vim.hash b/package.bak/vim/vim.hash deleted file mode 100644 index 28c6b97e31..0000000000 --- a/package.bak/vim/vim.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 6fbe0ec1228f951ba598b48ac8033f41ca4934cc34689a6008685e7c26477ae2 vim-v8.0.0329.tar.gz diff --git a/package.bak/vim/vim.mk b/package.bak/vim/vim.mk deleted file mode 100644 index ec494608e7..0000000000 --- a/package.bak/vim/vim.mk +++ /dev/null @@ -1,78 +0,0 @@ -################################################################################ -# -# vim -# -################################################################################ - -VIM_VERSION = v8.0.0329 -VIM_SITE = $(call github,vim,vim,$(VIM_VERSION)) -# Win over busybox vi since vim is more feature-rich -VIM_DEPENDENCIES = \ - ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) \ - $(if $(BR2_PACKAGE_BUSYBOX),busybox) -VIM_SUBDIR = src -VIM_CONF_ENV = \ - vim_cv_toupper_broken=no \ - vim_cv_terminfo=yes \ - vim_cv_tty_group=world \ - vim_cv_tty_mode=0620 \ - vim_cv_getcwd_broken=no \ - vim_cv_stat_ignores_slash=yes \ - vim_cv_memmove_handles_overlap=yes \ - ac_cv_sizeof_int=4 \ - ac_cv_small_wchar_t=no -# GUI/X11 headers leak from the host so forcibly disable them -VIM_CONF_OPTS = --with-tlib=ncurses --enable-gui=no --without-x -VIM_LICENSE = Charityware -VIM_LICENSE_FILES = README.txt - -ifeq ($(BR2_PACKAGE_ACL),y) -VIM_CONF_OPTS += --enable-acl -VIM_DEPENDENCIES += acl -else -VIM_CONF_OPTS += --disable-acl -endif - -ifeq ($(BR2_PACKAGE_GPM),y) -VIM_CONF_OPTS += --enable-gpm -VIM_DEPENDENCIES += gpm -else -VIM_CONF_OPTS += --disable-gpm -endif - -ifeq ($(BR2_PACKAGE_LIBSELINUX),y) -VIM_CONF_OPTS += --enable-selinux -VIM_DEPENDENCIES += libselinux -else -VIM_CONF_OPTS += --disable-selinux -endif - -define VIM_INSTALL_TARGET_CMDS - cd $(@D)/src; \ - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installvimbin; \ - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installtools; \ - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installlinks -endef - -define VIM_INSTALL_RUNTIME_CMDS - cd $(@D)/src; \ - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installrtbase; \ - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) installmacros -endef - -define VIM_REMOVE_DOCS - $(RM) -rf $(TARGET_DIR)/usr/share/vim/vim*/doc/ -endef - -# Avoid oopses with vipw/vigr, lack of $EDITOR and 'vi' command expectation -define VIM_INSTALL_VI_SYMLINK - ln -sf /usr/bin/vim $(TARGET_DIR)/bin/vi -endef -VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_VI_SYMLINK - -ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y) -VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS -VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS -endif - -$(eval $(autotools-package)) diff --git a/package.bak/vlc/0001-vlc-static.patch b/package.bak/vlc/0001-vlc-static.patch deleted file mode 100644 index f9aa079a4c..0000000000 --- a/package.bak/vlc/0001-vlc-static.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -uNr vlc-2.1.5.org/bin/Makefile.am vlc-2.1.5/bin/Makefile.am ---- vlc-2.1.5.org/bin/Makefile.am 2013-12-03 10:12:34.000000000 +0100 -+++ vlc-2.1.5/bin/Makefile.am 2014-08-03 12:30:06.722154518 +0200 -@@ -1,7 +1,7 @@ - # Building vlc - # - bin_PROGRAMS = vlc --noinst_PROGRAMS = vlc-static -+noinst_PROGRAMS = - noinst_DATA = - vlclib_PROGRAMS = vlc-cache-gen - EXTRA_PROGRAMS = vlc-wrapper -diff -uNr vlc-2.1.5.org/Makefile.am vlc-2.1.5/Makefile.am ---- vlc-2.1.5.org/Makefile.am 2014-02-14 18:40:50.000000000 +0100 -+++ vlc-2.1.5/Makefile.am 2014-08-03 12:29:52.059010766 +0200 -@@ -932,7 +932,7 @@ - cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la - - core: libvlc vlc$(EXEEXT) -- cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT) -+ cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) - - doc: - cd doc && $(MAKE) $(AM_MAKEFLAGS) doc diff --git a/package.bak/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch b/package.bak/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch deleted file mode 100644 index e9a7315317..0000000000 --- a/package.bak/vlc/0002-configure.ac-add-check-for-libgcrypt-config-program.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 88bf3313850bc7f0e6db21daee2b8d8e607b7bb4 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sat, 8 Feb 2014 14:33:27 +0100 -Subject: [PATCH] configure.ac: add check for libgcrypt-config program - -This allows to override the default libgcrypt-config location (which is -useful when cross-compiling), instead of using the one from the host -system. - -Signed-off-by: Samuel Martin -[yann.morin.1998@free.fr: adapt from 2.1.6 to 2.2.0; fix quoting in - AC_PATH_PROG] -Signed-off-by: "Yann E. MORIN" ---- - configure.ac | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 02fb8aa..5a2267b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -4020,16 +4020,17 @@ - AC_ARG_ENABLE(libgcrypt, - [ --disable-libgcrypt gcrypt support (default enabled)]) - AS_IF([test "${enable_libgcrypt}" != "no"], [ -+ AC_PATH_PROG([GCRYPT_CONFIG],[libgcrypt-config],[libgcrypt-config]) - AC_CHECK_DECL([GCRYCTL_SET_THREAD_CBS], [ -- libgcrypt-config --version >/dev/null || \ -+ ${GCRYPT_CONFIG} --version >/dev/null || \ - AC_MSG_ERROR([gcrypt.h present but libgcrypt-config could not be found]) - AC_CHECK_LIB(gcrypt, gcry_control, [ - have_libgcrypt="yes" -- GCRYPT_CFLAGS="`libgcrypt-config --cflags`" -- GCRYPT_LIBS="`libgcrypt-config --libs`" -+ GCRYPT_CFLAGS="`${GCRYPT_CONFIG} --cflags`" -+ GCRYPT_LIBS="`${GCRYPT_CONFIG} --libs`" - ], [ - AC_MSG_ERROR([libgcrypt not found. Install libgcrypt or pass --disable-libgcrypt.]) -- ], [`libgcrypt-config --libs`]) -+ ], [`${GCRYPT_CONFIG} --libs`]) - ], [ - AC_MSG_ERROR([libgcrypt version 1.1.94 or higher not found. Install libgcrypt or pass --disable-libgcrypt.]) - ], [#include ] diff --git a/package.bak/vlc/0003-automake-add-subdir-objects-option.patch b/package.bak/vlc/0003-automake-add-subdir-objects-option.patch deleted file mode 100644 index cea6a38fea..0000000000 --- a/package.bak/vlc/0003-automake-add-subdir-objects-option.patch +++ /dev/null @@ -1,22 +0,0 @@ -automake: add subdir-objects option - -Our version of automake warns if this option is enabled and source files -in subdirectories are used. - -It doesn't really seems to have a noticable effect on the build, but it -does remove a lot of annoying warnings. - -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) - -diff -Nrup vlc-2.1.2.orig/configure.ac vlc-2.1.2/configure.ac ---- vlc-2.1.2.orig/configure.ac 2014-02-27 00:22:19.512944952 +0100 -+++ vlc-2.1.2/configure.ac 2014-02-27 00:24:21.360940651 +0100 -@@ -24,7 +24,7 @@ AC_CANONICAL_BUILD - AC_CANONICAL_HOST - AC_PRESERVE_HELP_ORDER - --AM_INIT_AUTOMAKE(tar-ustar color-tests foreign) -+AM_INIT_AUTOMAKE(tar-ustar color-tests foreign subdir-objects) - AC_CONFIG_HEADERS([config.h]) - - # Disable with "./configure --disable-silent-rules" or "make V=1" diff --git a/package.bak/vlc/0004-implicit-function-declaration.patch b/package.bak/vlc/0004-implicit-function-declaration.patch deleted file mode 100644 index 515453d1db..0000000000 --- a/package.bak/vlc/0004-implicit-function-declaration.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix compile warning being treated as error: - -codec/svg.c: In function 'DecodeBlock': -codec/svg.c:240:5: error: implicit declaration of function 'rsvg_handle_render_cairo' [-Werror=implicit-function-declaration] -cc1: some warnings being treated as errors - -Signed-off-by: Bernd Kuhls - -diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac ---- vlc-2.2.1.org/configure.ac 2015-04-13 09:57:54.000000000 +0200 -+++ vlc-2.2.1/configure.ac 2015-04-24 20:54:35.349039010 +0200 -@@ -864,7 +864,7 @@ - dnl Compiler warnings - dnl - --RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var error-implicit-function-declaration]) -+RDC_PROG_CC_WFLAGS([all extra sign-compare undef pointer-arith bad-function-cast write-strings missing-prototypes volatile-register-var]) - RDC_PROG_CC_FLAGS([-pipe]) - AC_LANG_PUSH([C++]) - RDC_PROG_CXX_WFLAGS([all extra sign-compare undef pointer-arith volatile-register-var]) diff --git a/package.bak/vlc/0005-libvorbisidec.patch b/package.bak/vlc/0005-libvorbisidec.patch deleted file mode 100644 index 155e069499..0000000000 --- a/package.bak/vlc/0005-libvorbisidec.patch +++ /dev/null @@ -1,18 +0,0 @@ -Fixes linking error with tremor due to wrong library name - -Downloaded from Gentoo package -https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-video/vlc/files/vlc-2.1.0-fix-libtremor-libs.patch?view=markup - -Signed-off-by: Bernd Kuhls - ---- a/modules/codec/Makefile.am -+++ b/modules/codec/Makefile.am -@@ -215,7 +215,7 @@ - libtremor_plugin_la_SOURCES = codec/vorbis.c - libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DMODULE_NAME_IS_tremor - libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)' --libtremor_plugin_la_LIBADD = -lvorbisdec -logg -+libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS) - EXTRA_LTLIBRARIES += libtremor_plugin.la - codec_LTLIBRARIES += $(LTLIBtremor) - diff --git a/package.bak/vlc/0006-qt-x11.patch b/package.bak/vlc/0006-qt-x11.patch deleted file mode 100644 index 316a31fd8f..0000000000 --- a/package.bak/vlc/0006-qt-x11.patch +++ /dev/null @@ -1,16 +0,0 @@ -libX11 is an optional dependency for the qt4 module - -Signed-off-by: Bernd Kuhls - -diff -uNr vlc-2.2.1.org/modules/gui/qt4/Makefile.am vlc-2.2.1/modules/gui/qt4/Makefile.am ---- vlc-2.2.1.org/modules/gui/qt4/Makefile.am 2014-11-29 12:34:15.000000000 +0100 -+++ vlc-2.2.1/modules/gui/qt4/Makefile.am 2015-04-27 18:53:36.968611490 +0200 -@@ -22,7 +22,7 @@ - if HAVE_WIN32 - libqt4_plugin_la_LIBADD += -lole32 -lcomctl32 -luuid - else --libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) -lX11 -+libqt4_plugin_la_LIBADD += $(X_LIBS) $(X_PRE_LIB) - endif - endif - if HAVE_DARWIN diff --git a/package.bak/vlc/0007-strerror.patch b/package.bak/vlc/0007-strerror.patch deleted file mode 100644 index e9f3141168..0000000000 --- a/package.bak/vlc/0007-strerror.patch +++ /dev/null @@ -1,43 +0,0 @@ -Fix compile error - - CCLD vlc -/home/br/br3/output/build/vlc-2.2.1/src/.libs/libvlccore.so: undefined reference to `strerror_l' - -Code for #else condition was taken from -http://patches.osdyson.org/patch/series/view/vlc/2.2.0~rc2-1+dyson2/dyson.patch - -Signed-off-by: Bernd Kuhls - -diff -uNr vlc-2.2.1.org/configure.ac vlc-2.2.1/configure.ac ---- vlc-2.2.1.org/configure.ac 2015-04-13 09:57:54.000000000 +0200 -+++ vlc-2.2.1/configure.ac 2015-05-02 16:13:22.800448380 +0200 -@@ -534,7 +534,7 @@ - - dnl Check for usual libc functions - AC_CHECK_DECLS([nanosleep],,,[#include ]) --AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale stricmp strnicmp strptime uselocale]) -+AC_CHECK_FUNCS([daemon fcntl fstatvfs fork getenv getpwuid_r isatty lstat memalign mmap open_memstream openat pread posix_fadvise posix_madvise setlocale strerror_l stricmp strnicmp strptime uselocale]) - AC_REPLACE_FUNCS([atof atoll dirfd fdopendir flockfile fsync getdelim getpid gmtime_r lldiv localtime_r nrand48 poll posix_memalign rewind setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strsep strtof strtok_r strtoll swab tdestroy strverscmp]) - AC_CHECK_FUNCS(fdatasync,, - [AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.]) -diff -uNr vlc-2.2.1.org/src/posix/error.c vlc-2.2.1/src/posix/error.c ---- vlc-2.2.1.org/src/posix/error.c 2014-08-14 09:20:04.000000000 +0200 -+++ vlc-2.2.1/src/posix/error.c 2015-05-02 16:25:24.075378369 +0200 -@@ -31,6 +31,7 @@ - - static const char *vlc_strerror_l(int errnum, const char *lname) - { -+#ifdef HAVE_STRERROR_L - int saved_errno = errno; - locale_t loc = newlocale(LC_MESSAGES_MASK, lname, (locale_t)0); - -@@ -51,6 +52,9 @@ - const char *buf = strerror_l(errnum, loc); - - freelocale(loc); -+#else -+ const char *buf = strerror(errnum); -+#endif - return buf; - } - diff --git a/package.bak/vlc/0008-fix-fallback-code-and-add-required-realtime-library.patch b/package.bak/vlc/0008-fix-fallback-code-and-add-required-realtime-library.patch deleted file mode 100644 index 43f197acfc..0000000000 --- a/package.bak/vlc/0008-fix-fallback-code-and-add-required-realtime-library.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 381bcb7cb03bb602351a323daf3b69b2d4f45e77 Mon Sep 17 00:00:00 2001 -From: Waldemar Brodkorb -Date: Fri, 26 Aug 2016 15:11:25 +0200 -Subject: [PATCH] fix fallback code and add required realtime library to link - command - -Signed-off-by: Waldemar Brodkorb ---- - configure.ac | 1 + - src/posix/thread.c | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index cb1de25..018c11c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -121,6 +121,7 @@ case "${host_os}" in - ;; - linux*) - SYS=linux -+ AC_CHECK_LIB([rt], [posix_spawnp], [VLC_ADD_LIBS([libvlccore],[-lrt])], [], []) - ;; - bsdi*) - SYS=bsdi -diff --git a/src/posix/thread.c b/src/posix/thread.c -index 07fa71e..8b8595f 100644 ---- a/src/posix/thread.c -+++ b/src/posix/thread.c -@@ -85,7 +85,7 @@ static clockid_t vlc_clock_id; - - static void vlc_clock_setup_once (void) - { --# if (_POSIX_MONOTONIC_CLOCK == 0) -+# if (_POSIX_MONOTONIC_CLOCK == 0) && (_POSIX_CLOCK_SELECTION > 0) - long val = sysconf (_SC_MONOTONIC_CLOCK); - assert (val != 0); - vlc_clock_id = (val < 0) ? CLOCK_REALTIME : CLOCK_MONOTONIC; --- -2.1.4 - diff --git a/package.bak/vlc/0009-ffmpeg-3.0.patch b/package.bak/vlc/0009-ffmpeg-3.0.patch deleted file mode 100644 index 892c625c94..0000000000 --- a/package.bak/vlc/0009-ffmpeg-3.0.patch +++ /dev/null @@ -1,283 +0,0 @@ -Changes for ffmpeg 3.0 - -This file is a copy of debian/patches/04_ffmpeg-3.0.diff, to be found in -http://www.deb-multimedia.org/pool/main/v/vlc-dmo/vlc-dmo_2.2.4.orig.tar.gz - -Signed-off-by: Bernd Kuhls - ---- a/configure.ac -+++ b/configure.ac -@@ -2324,7 +2324,7 @@ AC_ARG_ENABLE(avcodec, - AS_IF([test "${enable_avcodec}" != "no"], [ - PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [ - PKG_CHECK_EXISTS([libavutil < 55],, [ -- AC_MSG_ERROR([libavutil versions 55 and later are not supported.]) -+ AC_MSG_WARN([libavutil versions 55 and later are not supported.]) - ]) - VLC_SAVE_FLAGS - CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}" -@@ -2334,7 +2334,7 @@ AS_IF([test "${enable_avcodec}" != "no"] - VLC_RESTORE_FLAGS - have_avcodec="yes" - ],[ -- AC_MSG_ERROR([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) -+ AC_MSG_WARN([${AVCODEC_PKG_ERRORS}. Pass --disable-avcodec to ignore this error.]) - ]) - ], [ - have_avcodec="no" -@@ -2383,7 +2383,7 @@ AS_IF([test "${have_vaapi}" = "yes" -a " - case "${avfork}" in - ffmpeg) - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([VA API requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([VA API requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac -@@ -2417,7 +2417,7 @@ AS_IF([test "${enable_dxva2}" != "no"], - case "${avfork}" in - ffmpeg) - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([DXVA2 requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac -@@ -2509,7 +2509,7 @@ AS_IF([test "${enable_avformat}" != "no" - ]) - VLC_RESTORE_FLAGS - ],[ -- AC_MSG_ERROR([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) -+ AC_MSG_WARN([${AVFORMAT_PKG_ERRORS}. Pass --disable-avformat to ignore this error.]) - ]) - ]) - AM_CONDITIONAL([HAVE_AVFORMAT], [test "${enable_avformat}" != "no"]) -@@ -2538,7 +2538,7 @@ then - ]) - VLC_RESTORE_FLAGS - ],[ -- AC_MSG_ERROR([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) -+ AC_MSG_WARN([${SWSCALE_PKG_ERRORS}. Pass --disable-swscale to ignore this error. Proper software scaling and some video chroma conversion will be missing.]) - ]) - fi - -@@ -3181,7 +3181,7 @@ AS_IF([test "${have_vdpau}" = "yes" -a " - libav) av_vdpau_ver="55.26.0" ;; - ffmpeg) av_vdpau_ver="55.42.100" - PKG_CHECK_EXISTS([libavcodec >= 57.10.100], [ -- AC_MSG_ERROR([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) -+ AC_MSG_WARN([VDPAU requires FFmpeg libavcodec < 57.10 or libav.]) - ]) - ;; - esac ---- a/modules/codec/avcodec/audio.c -+++ b/modules/codec/avcodec/audio.c -@@ -39,7 +39,7 @@ - #include - #include - --#include -+#include - - #include "avcodec.h" - ---- a/modules/codec/avcodec/video.c -+++ b/modules/codec/avcodec/video.c -@@ -108,8 +108,8 @@ static int lavc_GetFrame(struct AVCodecC - static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * ); - static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * ); - #endif --static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *, -- const enum PixelFormat * ); -+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *, -+ const enum AVPixelFormat * ); - - static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc ) - { -@@ -234,7 +234,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo - p_sys->p_codec = p_codec; - p_sys->i_codec_id = i_codec_id; - p_sys->psz_namecodec = psz_namecodec; -- p_sys->p_ff_pic = avcodec_alloc_frame(); -+ p_sys->p_ff_pic = av_frame_alloc(); - p_sys->b_delayed_open = true; - p_sys->p_va = NULL; - vlc_sem_init( &p_sys->sem_mt, 0 ); -@@ -446,7 +446,7 @@ int InitVideoDec( decoder_t *p_dec, AVCo - if( ffmpeg_OpenCodec( p_dec ) < 0 ) - { - msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec ); -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - vlc_sem_destroy( &p_sys->sem_mt ); - free( p_sys ); - return VLC_EGENERIC; -@@ -826,7 +826,7 @@ void EndVideoDec( decoder_t *p_dec ) - wait_mt( p_sys ); - - if( p_sys->p_ff_pic ) -- avcodec_free_frame( &p_sys->p_ff_pic ); -+ av_frame_free( &p_sys->p_ff_pic ); - - if( p_sys->p_va ) - vlc_va_Delete( p_sys->p_va ); -@@ -1313,8 +1313,8 @@ static void ffmpeg_ReleaseFrameBuf( stru - } - #endif - --static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, -- const enum PixelFormat *pi_fmt ) -+static enum AVPixelFormat ffmpeg_GetFormat( AVCodecContext *p_context, -+ const enum AVPixelFormat *pi_fmt ) - { - decoder_t *p_dec = p_context->opaque; - decoder_sys_t *p_sys = p_dec->p_sys; ---- a/modules/codec/avcodec/encoder.c -+++ b/modules/codec/avcodec/encoder.c -@@ -41,7 +41,7 @@ - #include - - #include --#include -+#include - - #include "avcodec.h" - #include "avcommon.h" -@@ -311,7 +311,7 @@ int OpenEncoder( vlc_object_t *p_this ) - else if( !GetFfmpegCodec( p_enc->fmt_out.i_codec, &i_cat, &i_codec_id, - &psz_namecodec ) ) - { -- if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == PIX_FMT_NONE ) -+ if( FindFfmpegChroma( p_enc->fmt_out.i_codec ) == AV_PIX_FMT_NONE ) - return VLC_EGENERIC; /* handed chroma output */ - - i_cat = VIDEO_ES; -@@ -555,7 +555,7 @@ int OpenEncoder( vlc_object_t *p_this ) - - if( p_codec->pix_fmts ) - { -- const enum PixelFormat *p = p_codec->pix_fmts; -+ const enum AVPixelFormat *p = p_codec->pix_fmts; - for( ; *p != -1; p++ ) - { - if( *p == p_context->pix_fmt ) break; -@@ -1017,7 +1017,7 @@ errmsg: - } - } - -- p_sys->frame = avcodec_alloc_frame(); -+ p_sys->frame = av_frame_alloc(); - if( !p_sys->frame ) - { - goto error; -@@ -1048,7 +1048,7 @@ static void vlc_av_packet_Release(block_ - { - vlc_av_packet_t *b = (void *) block; - -- av_free_packet(&b->packet); -+ av_packet_unref(&b->packet); - free(b); - } - -@@ -1088,7 +1088,7 @@ static block_t *EncodeVideo( encoder_t * - AVFrame *frame = NULL; - if( likely(p_pict) ) { - frame = p_sys->frame; -- avcodec_get_frame_defaults( frame ); -+ av_frame_unref( frame ); - for( i_plane = 0; i_plane < p_pict->i_planes; i_plane++ ) - { - p_sys->frame->data[i_plane] = p_pict->p[i_plane].p_pixels; -@@ -1188,7 +1188,7 @@ static block_t *EncodeVideo( encoder_t * - av_pkt.duration / p_sys->p_context->time_base.den, p_sys->p_context ); - if( unlikely(p_block == NULL) ) - { -- av_free_packet( &av_pkt ); -+ av_packet_unref( &av_pkt ); - return NULL; - } - -@@ -1329,7 +1329,7 @@ static block_t *handle_delay_buffer( enc - //How much we need to copy from new packet - const int leftover = leftover_samples * p_sys->p_context->channels * p_sys->i_sample_bytes; - -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); - p_sys->frame->format = p_sys->p_context->sample_fmt; - p_sys->frame->nb_samples = leftover_samples + p_sys->i_samples_delay; - -@@ -1451,7 +1451,7 @@ static block_t *EncodeAudio( encoder_t * - while( ( p_aout_buf->i_nb_samples >= p_sys->i_frame_size ) || - ( p_sys->b_variable && p_aout_buf->i_nb_samples ) ) - { -- avcodec_get_frame_defaults( p_sys->frame ); -+ av_frame_unref( p_sys->frame ); - if( p_sys->b_variable ) - p_sys->frame->nb_samples = p_aout_buf->i_nb_samples; - else -@@ -1514,7 +1514,7 @@ void CloseEncoder( vlc_object_t *p_this - encoder_t *p_enc = (encoder_t *)p_this; - encoder_sys_t *p_sys = p_enc->p_sys; - -- /*FIXME: we should use avcodec_free_frame, but we don't require so new avcodec that has it*/ -+ /*FIXME: we should use av_frame_free, but we don't require so new avcodec that has it*/ - av_freep( &p_sys->frame ); - - vlc_avcodec_lock(); ---- a/modules/demux/avformat/demux.c -+++ b/modules/demux/avformat/demux.c -@@ -734,14 +734,14 @@ static int Demux( demux_t *p_demux ) - } - if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - const AVStream *p_stream = p_sys->ic->streams[pkt.stream_index]; - if( p_stream->time_base.den <= 0 ) - { - msg_Warn( p_demux, "Invalid time base for the stream %d", pkt.stream_index ); -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - if( p_stream->codec->codec_id == AV_CODEC_ID_SSA ) -@@ -749,7 +749,7 @@ static int Demux( demux_t *p_demux ) - p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ ); - if( !p_frame ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - } -@@ -757,7 +757,7 @@ static int Demux( demux_t *p_demux ) - { - if( ( p_frame = block_Alloc( pkt.size ) ) == NULL ) - { -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 0; - } - memcpy( p_frame->p_buffer, pkt.data, pkt.size ); -@@ -838,7 +838,7 @@ static int Demux( demux_t *p_demux ) - else - block_Release( p_frame ); - -- av_free_packet( &pkt ); -+ av_packet_unref( &pkt ); - return 1; - } - ---- a/modules/codec/avcodec/vaapi.c -+++ b/modules/codec/avcodec/vaapi.c -@@ -595,7 +595,7 @@ static int Create( vlc_va_t *p_va, AVCod - return err; - - /* Only VLD supported */ -- p_va->pix_fmt = PIX_FMT_VAAPI_VLD; -+ p_va->pix_fmt = AV_PIX_FMT_VAAPI_VLD; - p_va->setup = Setup; - p_va->get = Get; - p_va->release = Release; diff --git a/package.bak/vlc/0010-static-assert.patch b/package.bak/vlc/0010-static-assert.patch deleted file mode 100644 index 87fd56bda2..0000000000 --- a/package.bak/vlc/0010-static-assert.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Thomas Guillem -Date: Thu, 30 Apr 2015 13:29:50 +0000 (+0200) -Subject: Fix build when using C99 and C++11 -X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=51ce6cdaf598754e617900994c1943c6cba6d604 - -Fix build when using C99 and C++11 - -Indeed, C99 doesn't have static_assert and C++11 has it. - -Signed-off-by: Bernd Kuhls ---- - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index b949d24..ee168d7 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -239,7 +239,7 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) - } - #endif - --#if !defined (HAVE_STATIC_ASSERT) -+#if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) - # define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) - # define static_assert _Static_assert - #endif diff --git a/package.bak/vlc/0011-static-assert.patch b/package.bak/vlc/0011-static-assert.patch deleted file mode 100644 index 3ce23e1384..0000000000 --- a/package.bak/vlc/0011-static-assert.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Thomas Guillem -Date: Mon, 14 Dec 2015 09:08:25 +0000 (+0100) -Subject: compat: fix static_assert -X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=6faf9066670db6e0d241ead6a3926b2d9cc6a041 - -compat: fix static_assert - -It was not possible to use it outside of functions. - -Signed-off-by: Rémi Denis-Courmont -Signed-off-by: Bernd Kuhls ---- - -diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h -index 213d3f3..bd798d0 100644 ---- a/include/vlc_fixups.h -+++ b/include/vlc_fixups.h -@@ -273,7 +273,9 @@ static inline locale_t newlocale(int mask, const char * locale, locale_t base) - #endif - - #if !defined (HAVE_STATIC_ASSERT) && !defined(__cpp_static_assert) --# define _Static_assert(x, s) ((void) sizeof (struct { unsigned:-!(x); })) -+# define STATIC_ASSERT_CONCAT_(a, b) a##b -+# define STATIC_ASSERT_CONCAT(a, b) STATIC_ASSERT_CONCAT_(a, b) -+# define _Static_assert(x, s) extern char STATIC_ASSERT_CONCAT(static_assert_, __LINE__)[sizeof(struct { unsigned:-!(x); })] - # define static_assert _Static_assert - #endif - diff --git a/package.bak/vlc/Config.in b/package.bak/vlc/Config.in deleted file mode 100644 index 78023fb500..0000000000 --- a/package.bak/vlc/Config.in +++ /dev/null @@ -1,41 +0,0 @@ -if BR2_PACKAGE_VLC -comment "vlc is known not to work in all configurations" -comment "If you can fix it, please inform buildroot@buildroot.org" -endif - -config BR2_PACKAGE_VLC - bool "vlc" - depends on BR2_USE_MMU # fork() - depends on BR2_INSTALL_LIBSTDCPP - depends on !BR2_STATIC_LIBS - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - # ARC toolchain issue - depends on !BR2_arc - select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS - select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV - select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3 - select BR2_PACKAGE_ZLIB if BR2_PACKAGE_TAGLIB - help - VLC is a free and open source cross-platform multimedia player - and framework that plays most multimedia files as well as DVD, - Audio CD, VCD, and various streaming protocols. - - http://www.videolan.org/vlc/ - -config BR2_PACKAGE_VLC_OPENCV_BACKEND - bool - select BR2_PACKAGE_OPENCV_LIB_IMGPROC - select BR2_PACKAGE_OPENCV_LIB_OBJDETECT - -config BR2_PACKAGE_VLC_OPENCV3_BACKEND - bool - select BR2_PACKAGE_OPENCV3_LIB_IMGPROC - select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT - -comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7" - depends on BR2_USE_MMU - depends on !BR2_arc - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \ - || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 diff --git a/package.bak/vlc/vlc.hash b/package.bak/vlc/vlc.hash deleted file mode 100644 index efd4e27e74..0000000000 --- a/package.bak/vlc/vlc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://download.videolan.org/pub/videolan/vlc/2.2.3/vlc-2.2.3.tar.xz.sha256 -sha256 1632e91d2a0087e0ef4c3fb4c95c3c2890f7715a9d1d43ffd46329f428cf53be vlc-2.2.4.tar.xz diff --git a/package.bak/vlc/vlc.mk b/package.bak/vlc/vlc.mk deleted file mode 100644 index 583edf3659..0000000000 --- a/package.bak/vlc/vlc.mk +++ /dev/null @@ -1,430 +0,0 @@ -################################################################################ -# -# vlc -# -################################################################################ - -VLC_VERSION = 2.2.4 -VLC_SITE = http://get.videolan.org/vlc/$(VLC_VERSION) -VLC_SOURCE = vlc-$(VLC_VERSION).tar.xz -VLC_LICENSE = GPLv2+, LGPLv2.1+ -VLC_LICENSE_FILES = COPYING COPYING.LIB -VLC_DEPENDENCIES = host-pkgconf -VLC_AUTORECONF = YES - -# Install vlc libraries in staging. -VLC_INSTALL_STAGING = YES - -# gcc bug internal compiler error: in merge_overlapping_regs, at -# regrename.c:304. This bug is fixed since gcc 6. -ifeq ($(BR2_microblaze):$(BR2_TOOLCHAIN_GCC_AT_LEAST_6),y:) -VLC_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -O0" -VLC_CONF_OPTS += --disable-optimizations -endif - -# VLC defines two autoconf functions which are also defined by our own pkg.m4 -# from pkgconf. Unfortunately, they are defined in a different way: VLC adds -# --enable- options, but pkg.m4 adds --with- options. To make sure we use -# VLC's definition, rename these two functions. -define VLC_OVERRIDE_PKG_M4 - $(SED) 's/PKG_WITH_MODULES/VLC_PKG_WITH_MODULES/g' \ - -e 's/PKG_HAVE_WITH_MODULES/VLC_PKG_HAVE_WITH_MODULES/g' \ - $(@D)/configure.ac $(@D)/m4/with_pkg.m4 -endef -VLC_POST_PATCH_HOOKS += VLC_OVERRIDE_PKG_M4 - -VLC_CONF_OPTS += \ - --disable-gles1 \ - --disable-a52 \ - --disable-shout \ - --disable-twolame \ - --disable-dca \ - --disable-schroedinger \ - --disable-fluidsynth \ - --disable-zvbi \ - --disable-kate \ - --disable-caca \ - --disable-jack \ - --disable-samplerate \ - --disable-chromaprint \ - --disable-goom \ - --disable-projectm \ - --disable-vsxu \ - --disable-mtp \ - --disable-mmal-codec \ - --disable-mmal-vout \ - --disable-dvdnav \ - --disable-vpx \ - --disable-jpeg \ - --disable-x262 \ - --disable-x265 \ - --disable-mfx \ - --disable-vdpau \ - --disable-addonmanagermodules \ - --enable-run-as-root \ - -# Uses __atomic_fetch_add_4 -ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y) -VLC_CONF_ENV += LIBS="-latomic" -endif - -# Building static and shared doesn't work, so force static off. -ifeq ($(BR2_STATIC_LIBS),) -VLC_CONF_OPTS += --disable-static -endif - -ifeq ($(BR2_POWERPC_CPU_HAS_ALTIVEC),y) -VLC_CONF_OPTS += --enable-altivec -else -VLC_CONF_OPTS += --disable-altivec -endif - -ifeq ($(BR2_X86_CPU_HAS_SSE),y) -VLC_CONF_OPTS += --enable-sse -else -VLC_CONF_OPTS += --disable-sse -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB),y) -VLC_CONF_OPTS += --enable-alsa -VLC_DEPENDENCIES += alsa-lib -else -VLC_CONF_OPTS += --disable-alsa -endif - -# bonjour support needs avahi-client, which needs avahi-daemon and dbus -ifeq ($(BR2_PACKAGE_AVAHI)$(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yyy) -VLC_CONF_OPTS += --enable-bonjour -VLC_DEPENDENCIES += avahi dbus -else -VLC_CONF_OPTS += --disable-bonjour -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -VLC_CONF_OPTS += --enable-dbus -VLC_DEPENDENCIES += dbus -else -VLC_CONF_OPTS += --disable-dbus -endif - -ifeq ($(BR2_PACKAGE_DIRECTFB),y) -VLC_CONF_OPTS += --enable-directfb -VLC_CONF_ENV += ac_cv_path_DIRECTFB_CONFIG=$(STAGING_DIR)/usr/bin/directfb-config -VLC_DEPENDENCIES += directfb -else -VLC_CONF_OPTS += --disable-directfb -endif - -ifeq ($(BR2_PACKAGE_FAAD2),y) -VLC_CONF_OPTS += --enable-faad -VLC_DEPENDENCIES += faad2 -else -VLC_CONF_OPTS += --disable-faad -endif - -ifeq ($(BR2_PACKAGE_FFMPEG),y) -VLC_CONF_OPTS += --enable-avcodec -VLC_DEPENDENCIES += ffmpeg -else -VLC_CONF_OPTS += --disable-avcodec -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y) -VLC_CONF_OPTS += --enable-postproc -else -VLC_CONF_OPTS += --disable-postproc -endif - -ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y) -VLC_CONF_OPTS += --enable-swscale -else -VLC_CONF_OPTS += --disable-swscale -endif - -ifeq ($(BR2_PACKAGE_FLAC),y) -VLC_CONF_OPTS += --enable-flac -VLC_DEPENDENCIES += flac -else -VLC_CONF_OPTS += --disable-flac -endif - -ifeq ($(BR2_PACKAGE_FREERDP),y) -VLC_DEPENDENCIES += freerdp -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -VLC_DEPENDENCIES += libgl -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -VLC_CONF_OPTS += --enable-gles2 -VLC_DEPENDENCIES += libgles -else -VLC_CONF_OPTS += --disable-gles2 -endif - -ifeq ($(BR2_PACKAGE_OPENCV)$(BR2_PACKAGE_OPENCV3),y) -VLC_CONF_OPTS += --enable-opencv -ifeq ($(BR2_PACKAGE_OPENCV),y) -VLC_DEPENDENCIES += opencv -else -VLC_DEPENDENCIES += opencv3 -endif -else -VLC_CONF_OPTS += --disable-opencv -endif - -ifeq ($(BR2_PACKAGE_OPUS),y) -VLC_CONF_OPTS += --enable-opus -VLC_DEPENDENCIES += libvorbis opus -else -VLC_CONF_OPTS += --disable-opus -endif - -ifeq ($(BR2_PACKAGE_LIBASS),y) -VLC_CONF_OPTS += --enable-libass -VLC_DEPENDENCIES += libass -else -VLC_CONF_OPTS += --disable-libass -endif - -ifeq ($(BR2_PACKAGE_LIBBLURAY),y) -VLC_CONF_OPTS += --enable-bluray -VLC_DEPENDENCIES += libbluray -else -VLC_CONF_OPTS += --disable-bluray -endif - -ifeq ($(BR2_PACKAGE_LIBCDDB),y) -VLC_CONF_OPTS += --enable-libcddb -VLC_DEPENDENCIES += libcddb -else -VLC_CONF_OPTS += --disable-libcddb -endif - -ifeq ($(BR2_PACKAGE_LIBDVBPSI),y) -VLC_CONF_OPTS += --enable-dvbpsi -VLC_DEPENDENCIES += libdvbpsi -else -VLC_CONF_OPTS += --disable-dvbpsi -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -VLC_CONF_OPTS += --enable-libgcrypt -VLC_DEPENDENCIES += libgcrypt -VLC_CONF_ENV += \ - GCRYPT_CONFIG="$(STAGING_DIR)/usr/bin/libgcrypt-config" -else -VLC_CONF_OPTS += --disable-libgcrypt -endif - -ifeq ($(BR2_PACKAGE_LIBMAD),y) -VLC_CONF_OPTS += --enable-mad -VLC_DEPENDENCIES += libmad -else -VLC_CONF_OPTS += --disable-mad -endif - -ifeq ($(BR2_PACKAGE_LIBMATROSKA),y) -VLC_CONF_OPTS += --enable-mkv -VLC_DEPENDENCIES += libmatroska -else -VLC_CONF_OPTS += --disable-mkv -endif - -ifeq ($(BR2_PACKAGE_LIBMODPLUG),y) -VLC_CONF_OPTS += --enable-mod -VLC_DEPENDENCIES += libmodplug -else -VLC_CONF_OPTS += --disable-mod -endif - -ifeq ($(BR2_PACKAGE_LIBMPEG2),y) -VLC_CONF_OPTS += --enable-libmpeg2 -VLC_DEPENDENCIES += libmpeg2 -else -VLC_CONF_OPTS += --disable-libmpeg2 -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -VLC_CONF_OPTS += --enable-png -VLC_DEPENDENCIES += libpng -else -VLC_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_LIBRSVG),y) -VLC_CONF_OPTS += --enable-svg --enable-svgdec -VLC_DEPENDENCIES += librsvg -else -VLC_CONF_OPTS += --disable-svg --disable-svgdec -endif - -ifeq ($(BR2_PACKAGE_LIBSSH2),y) -VLC_CONF_OPTS += --enable-sftp -VLC_DEPENDENCIES += libssh2 -else -VLC_CONF_OPTS += --disable-sftp -endif - -ifeq ($(BR2_PACKAGE_LIBSIDPLAY2),y) -VLC_CONF_OPTS += --enable-sid -VLC_DEPENDENCIES += libsidplay2 -else -VLC_CONF_OPTS += --disable-sid -endif - -ifeq ($(BR2_PACKAGE_LIBTHEORA),y) -VLC_CONF_OPTS += --enable-theora -VLC_DEPENDENCIES += libtheora -else -VLC_CONF_OPTS += --disable-theora -endif - -ifeq ($(BR2_PACKAGE_LIBUPNP),y) -VLC_CONF_OPTS += --enable-upnp -VLC_DEPENDENCIES += libupnp -else -VLC_CONF_OPTS += --disable-upnp -endif - -ifeq ($(BR2_PACKAGE_LIBVNCSERVER),y) -VLC_CONF_OPTS += --enable-vnc -VLC_DEPENDENCIES += libvncserver -else -VLC_CONF_OPTS += --disable-vnc -endif - -ifeq ($(BR2_PACKAGE_LIBVORBIS),y) -VLC_CONF_OPTS += --enable-vorbis -VLC_DEPENDENCIES += libvorbis -else -VLC_CONF_OPTS += --disable-vorbis -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -VLC_CONF_OPTS += --enable-v4l2 -VLC_DEPENDENCIES += libv4l -else -VLC_CONF_OPTS += --disable-v4l2 -endif - -ifeq ($(BR2_PACKAGE_LIBXCB),y) -VLC_CONF_OPTS += --enable-xcb -VLC_DEPENDENCIES += libxcb -else -VLC_CONF_OPTS += --disable-xcb -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -VLC_CONF_OPTS += --enable-libxml2 -VLC_DEPENDENCIES += libxml2 -else -VLC_CONF_OPTS += --disable-libxml2 -endif - -ifeq ($(BR2_PACKAGE_LIVE555),y) -VLC_CONF_OPTS += --enable-live555 -VLC_DEPENDENCIES += live555 -VLC_CONF_ENV += \ - LIVE555_CFLAGS="\ - -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 -VLC_CONF_OPTS += --disable-live555 -endif - -ifeq ($(BR2_PACKAGE_LUA),y) -VLC_CONF_OPTS += --enable-lua -VLC_DEPENDENCIES += lua host-lua -else -VLC_CONF_OPTS += --disable-lua -endif - -ifeq ($(BR2_PACKAGE_MINIZIP),y) -VLC_DEPENDENCIES += minizip -endif - -ifeq ($(BR2_PACKAGE_MUSEPACK),y) -VLC_CONF_OPTS += --enable-mpc -VLC_DEPENDENCIES += musepack -else -VLC_CONF_OPTS += --disable-mpc -endif - -ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y) -VLC_CONF_OPTS += --enable-qt -VLC_CONF_ENV += \ - ac_cv_path_MOC=$(HOST_DIR)/usr/bin/moc \ - ac_cv_path_RCC=$(HOST_DIR)/usr/bin/rcc \ - ac_cv_path_UIC=$(HOST_DIR)/usr/bin/uic -VLC_DEPENDENCIES += qt -else -VLC_CONF_OPTS += --disable-qt -endif - -ifeq ($(BR2_PACKAGE_SDL_X11),y) -VLC_CONF_OPTS += --enable-sdl -VLC_DEPENDENCIES += sdl -else -VLC_CONF_OPTS += --disable-sdl -endif - -ifeq ($(BR2_PACKAGE_SDL_IMAGE),y) -VLC_CONF_OPTS += --enable-sdl-image -VLC_DEPENDENCIES += sdl_image -else -VLC_CONF_OPTS += --disable-sdl-image -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -VLC_CONF_OPTS += --enable-speex -VLC_DEPENDENCIES += speex -else -VLC_CONF_OPTS += --disable-speex -endif - -ifeq ($(BR2_PACKAGE_TAGLIB),y) -VLC_CONF_OPTS += --enable-taglib -VLC_DEPENDENCIES += taglib -else -VLC_CONF_OPTS += --disable-taglib -endif - -ifeq ($(BR2_PACKAGE_TREMOR),y) -VLC_CONF_OPTS += --enable-tremor -VLC_DEPENDENCIES += tremor -else -VLC_CONF_OPTS += --disable-tremor -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -VLC_CONF_OPTS += --enable-udev -VLC_DEPENDENCIES += udev -else -VLC_CONF_OPTS += --disable-udev -endif - -ifeq ($(BR2_PACKAGE_XCB_UTIL_KEYSYMS),y) -VLC_CONF_OPTS += --enable-xcb -VLC_DEPENDENCIES += xcb-util-keysyms -else -VLC_CONF_OPTS += --disable-xcb -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -VLC_CONF_OPTS += --with-x -VLC_DEPENDENCIES += xlib_libX11 -else -VLC_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -VLC_DEPENDENCIES += zlib -endif - -$(eval $(autotools-package)) diff --git a/package.bak/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch b/package.bak/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch deleted file mode 100644 index e46ef07888..0000000000 --- a/package.bak/vnstat/0001-configure.ac-add-option-to-disable-image-output.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 8a4a9b82d4f8fd39db8417fd06d969505fde9d0a Mon Sep 17 00:00:00 2001 -From: Rodrigo Rebello -Date: Tue, 22 Dec 2015 18:02:22 -0200 -Subject: [PATCH 1/1] configure.ac: add option to disable image output - -Even when the gd library is present, it may be desirable to not build -'vnstati' as image output is an optional feature. - -Also, when testing for the gd library, use gdImagePng() instead of -gdImageLine() since it's possible that the installed gd library doesn't -have PNG support. In such cases, the test in the configure script passed -(because gdImageLine() is always present), but the build failed with: - - src/vnstati.o: In function `writeoutput': - vnstati.c:(.text+0x3fc): undefined reference to `gdImagePng' - collect2: error: ld returned 1 exit status - -Upstream status: accepted, not yet released. -https://github.com/vergoh/vnstat/pull/35 - -Signed-off-by: Rodrigo Rebello ---- - configure.ac | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index be3d449..89f71ef 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -13,10 +13,16 @@ AM_PROG_CC_C_O - AC_PROG_MAKE_SET - AC_PROG_MKDIR_P - -+AC_ARG_ENABLE([image-output], [ -+AS_HELP_STRING([--disable-image-output], [disable PNG image output])]) -+ - # Checks for libraries. - AC_CHECK_LIB([m], [pow]) --AC_CHECK_LIB([gd], [gdImageLine], [IMAGELIBS=-lgd]) --AC_SUBST([IMAGELIBS]) -+ -+AS_IF([test "x$enable_image_output" != "xno"], [ -+AC_CHECK_LIB([gd], [gdImagePng], [IMAGELIBS=-lgd]) -+AC_SUBST([IMAGELIBS])]) -+ - AM_CONDITIONAL([HAVE_LIBGD], [test "$IMAGELIBS" = "-lgd"]) - PKG_CHECK_MODULES([CHECK], [check >= 0.9.6], [], [AC_MSG_NOTICE([testcases can not be execute without check installed])]) - AM_CONDITIONAL([HAVE_CHECK], [test "$CHECK_LIBS"]) --- -2.1.4 - diff --git a/package.bak/vnstat/Config.in b/package.bak/vnstat/Config.in deleted file mode 100644 index bb68c14462..0000000000 --- a/package.bak/vnstat/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_VNSTAT - bool "vnstat" - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # mbstowcs() - help - vnStat is a console-based network traffic monitor that keeps a - log of network traffic for the selected interface(s). It uses - the network interface statistics provided by the kernel as - information source. This means that vnStat won't actually be - sniffing any traffic and also ensures light use of system - resources. - - http://humdi.net/vnstat - -comment "vnstat needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/vnstat/vnstat.hash b/package.bak/vnstat/vnstat.hash deleted file mode 100644 index 82ee8c02ba..0000000000 --- a/package.bak/vnstat/vnstat.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c3814b5baa8b627198a8debfe1dce4b4346a342523818cc8668a5497971dbc39 vnstat-1.15.tar.gz diff --git a/package.bak/vnstat/vnstat.mk b/package.bak/vnstat/vnstat.mk deleted file mode 100644 index 576f240a28..0000000000 --- a/package.bak/vnstat/vnstat.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# vnstat -# -################################################################################ - -VNSTAT_VERSION = 1.15 -VNSTAT_SITE = http://humdi.net/vnstat -VNSTAT_LICENSE = GPLv2 -VNSTAT_LICENSE_FILES = COPYING -VNSTAT_DEPENDENCIES = host-pkgconf -# We're patching configure.ac, so we need to autoreconf -VNSTAT_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_GD)$(BR2_PACKAGE_LIBPNG),yy) -VNSTAT_DEPENDENCIES += gd -VNSTAT_CONF_OPTS = --enable-image-output -else -VNSTAT_CONF_OPTS = --disable-image-output -endif - -# vnStat declares an 'install-data-hook' rule that tries to run -# 'vnstat --showconfig' on the host to generate a default config file. -# That obviously doesn't work when cross-compiling, so avoid it -# entirely. -VNSTAT_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec - -$(eval $(autotools-package)) diff --git a/package.bak/vo-aacenc/Config.in b/package.bak/vo-aacenc/Config.in deleted file mode 100644 index b5487dc96d..0000000000 --- a/package.bak/vo-aacenc/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_VO_AACENC - bool "vo-aacenc" - help - This library contains an encoder implementation of the - Advanced Audio Coding (AAC) audio codec. The library is - based on a codec implementation by VisualOn as part of the - Stagefright framework from the Google Android project. - - http://sourceforge.net/projects/opencore-amr/ diff --git a/package.bak/vo-aacenc/vo-aacenc.hash b/package.bak/vo-aacenc/vo-aacenc.hash deleted file mode 100644 index 822f8424a7..0000000000 --- a/package.bak/vo-aacenc/vo-aacenc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 e51a7477a359f18df7c4f82d195dab4e14e7414cbd48cf79cc195fc446850f36 vo-aacenc-0.1.3.tar.gz diff --git a/package.bak/vo-aacenc/vo-aacenc.mk b/package.bak/vo-aacenc/vo-aacenc.mk deleted file mode 100644 index ecdd58492f..0000000000 --- a/package.bak/vo-aacenc/vo-aacenc.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# vo-aacenc -# -################################################################################ - -VO_AACENC_VERSION = 0.1.3 -VO_AACENC_SITE = http://downloads.sourceforge.net/project/opencore-amr/vo-aacenc -VO_AACENC_LICENSE = Apache-2.0 -VO_AACENC_LICENSE_FILES = COPYING -VO_AACENC_INSTALL_STAGING = YES - -VO_AACENC_CFLAGS = $(TARGET_CFLAGS) - -# arm specific asm optimizations -ifeq ($(BR2_arm),y) - -ifeq ($(BR2_ARM_CPU_HAS_ARM),y) -# vo-aacenc has ARM assembly code that cannot be compiled in Thumb2 -# mode, so we must force the traditional ARM mode. -VO_AACENC_CFLAGS += -marm - -ifeq ($(BR2_ARM_CPU_HAS_NEON),y) -VO_AACENC_CONF_OPTS += --enable-armv7neon -# mfpu=neon needed to assemble neon code -VO_AACENC_CFLAGS += -mfpu=neon -else -VO_AACENC_CONF_OPTS += --disable-armv7neon - -ifeq ($(BR2_ARM_CPU_ARMV4),) -VO_AACENC_CONF_OPTS += --enable-armv5e -else -VO_AACENC_CONF_OPTS += --disable-armv5e -endif - -endif # !neon - -else -VO_AACENC_CONF_OPTS += --disable-armv7neon --disable-armv5e -endif # has-arm -endif # arm - -VO_AACENC_CONF_ENV = \ - CFLAGS="$(VO_AACENC_CFLAGS)" - -$(eval $(autotools-package)) diff --git a/package.bak/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch b/package.bak/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch deleted file mode 100644 index 6df67869e5..0000000000 --- a/package.bak/vorbis-tools/0001-oggenc-Fix-large-alloca-on-bad-AIFF-input.patch +++ /dev/null @@ -1,37 +0,0 @@ -Fix CVE-2015-6749 - invalid AIFF file causes alloca() buffer overflow. -See https://trac.xiph.org/ticket/2212 -Status: upstream - -Signed-off-by: Gustavo Zacarias - -diff --git a/oggenc/audio.c b/oggenc/audio.c -index 477da8c..4921fb9 100644 ---- a/oggenc/audio.c -+++ b/oggenc/audio.c -@@ -245,8 +245,8 @@ static int aiff_permute_matrix[6][6] = - int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - { - int aifc; /* AIFC or AIFF? */ -- unsigned int len; -- unsigned char *buffer; -+ unsigned int len, readlen; -+ unsigned char buffer[22]; - unsigned char buf2[8]; - aiff_fmt format; - aifffile *aiff = malloc(sizeof(aifffile)); -@@ -269,9 +269,9 @@ int aiff_open(FILE *in, oe_enc_opt *opt, unsigned char *buf, int buflen) - return 0; /* Weird common chunk */ - } - -- buffer = alloca(len); -- -- if(fread(buffer,1,len,in) < len) -+ readlen = len < sizeof(buffer) ? len : sizeof(buffer); -+ if(fread(buffer,1,readlen,in) < readlen || -+ (len > readlen && !seek_forward(in, len-readlen))) - { - fprintf(stderr, _("Warning: Unexpected EOF in reading AIFF header\n")); - return 0; --- -2.5.0 - diff --git a/package.bak/vorbis-tools/Config.in b/package.bak/vorbis-tools/Config.in deleted file mode 100644 index 6092e01acc..0000000000 --- a/package.bak/vorbis-tools/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_VORBIS_TOOLS - bool "vorbis-tools" - select BR2_PACKAGE_LIBAO - select BR2_PACKAGE_LIBOGG - select BR2_PACKAGE_LIBVORBIS - select BR2_PACKAGE_LIBCURL - help - Standalone player, encoder and decoder for Ogg format files. - - Works also as a streaming player. - - http://www.vorbis.com/ diff --git a/package.bak/vorbis-tools/vorbis-tools.hash b/package.bak/vorbis-tools/vorbis-tools.hash deleted file mode 100644 index 8f40eda9d2..0000000000 --- a/package.bak/vorbis-tools/vorbis-tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.xiph.org/releases/vorbis/SHA256SUMS -sha256 a389395baa43f8e5a796c99daf62397e435a7e73531c9f44d9084055a05d22bc vorbis-tools-1.4.0.tar.gz diff --git a/package.bak/vorbis-tools/vorbis-tools.mk b/package.bak/vorbis-tools/vorbis-tools.mk deleted file mode 100644 index fc8e7dd107..0000000000 --- a/package.bak/vorbis-tools/vorbis-tools.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# vorbis-tools -# -################################################################################ - -VORBIS_TOOLS_VERSION = 1.4.0 -VORBIS_TOOLS_SITE = http://downloads.xiph.org/releases/vorbis -VORBIS_TOOLS_LICENSE = GPLv2 -VORBIS_TOOLS_LICENSE_FILES = COPYING -VORBIS_TOOLS_DEPENDENCIES = libao libogg libvorbis libcurl -VORBIS_TOOLS_CONF_OPTS = --program-transform-name='' -# ogg123 calls math functions but forgets to link with libm -VORBIS_TOOLS_CONF_ENV = LIBS=-lm - -ifeq ($(BR2_PACKAGE_FLAC),y) -VORBIS_TOOLS_DEPENDENCIES += flac -endif - -ifeq ($(BR2_PACKAGE_SPEEX),y) -VORBIS_TOOLS_DEPENDENCIES += speex -endif - -$(eval $(autotools-package)) diff --git a/package.bak/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch b/package.bak/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch deleted file mode 100644 index 49909ada5e..0000000000 --- a/package.bak/vpnc/0001-Makefile-allow-to-override-the-PREFIX-variable.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 7314d232f8e85879d8f4c311ced44ee5b21fb239 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:26:27 +0100 -Subject: [PATCH] Makefile: allow to override the PREFIX variable - -Some people may not want to install in /usr/local, so this commit -makes it possible to override the PREFIX variable from the make -command line. - -Signed-off-by: Thomas Petazzoni ---- - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 69f5aca..f9a6781 100644 ---- a/Makefile -+++ b/Makefile -@@ -20,7 +20,7 @@ - # $Id$ - - DESTDIR= --PREFIX=/usr/local -+PREFIX?=/usr/local - ETCDIR=/etc/vpnc - BINDIR=$(PREFIX)/bin - SBINDIR=$(PREFIX)/sbin --- -2.6.4 - diff --git a/package.bak/vpnc/0002-Makefile-allow-to-override-the-version.patch b/package.bak/vpnc/0002-Makefile-allow-to-override-the-version.patch deleted file mode 100644 index 9d0bae3d33..0000000000 --- a/package.bak/vpnc/0002-Makefile-allow-to-override-the-version.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8b035de4867db4fb8da41298224d92bf5b18e86f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:27:30 +0100 -Subject: [PATCH] Makefile: allow to override the version - -The mk-version script makes the assumption that the build process runs -from a SVN checkout or a Git clone of the vpnc source code. However, -this is not always the case, for example when you are building from a -tarball, but inside a larger project that is versioned with Git. - -This is typically the case when building vpnc under a tool like -Buildroot, or potentially other embedded Linux build system: the build -system tool itself is versioned in Git, downloads tarballs of software -components and builds them. - -In order to support such situations, this commit adjusts the Makefile -to allow the VERSION variable to be overriden from the make command -line. - -Signed-off-by: Thomas Petazzoni ---- - - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index f9a6781..e80ef17 100644 ---- a/Makefile -+++ b/Makefile -@@ -57,7 +57,7 @@ OBJS = $(addsuffix .o,$(basename $(SRCS))) - CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS))) - BINOBJS = $(addsuffix .o,$(BINS)) - BINSRCS = $(addsuffix .c,$(BINS)) --VERSION := $(shell sh mk-version) -+VERSION ?= $(shell sh mk-version) - RELEASE_VERSION := $(shell cat VERSION) - - CC ?= gcc --- -2.6.4 - diff --git a/package.bak/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch b/package.bak/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch deleted file mode 100644 index c232206ab4..0000000000 --- a/package.bak/vpnc/0003-Makefile-allow-passing-custom-CFLAGS-CPPFLAGS.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 014a8e04a0fa775b2ade78e5f7655a1453375884 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:31:12 +0100 -Subject: [PATCH] Makefile: allow passing custom CFLAGS/CPPFLAGS - -vpnc's Makefile specifies some CFLAGS and CPPFLAGS value, but it may -be needed to pass additional custom flags on the make command line. To -make this possible, we switch from a plain += operator to the -"override ... +=" operator. - -Signed-off-by: Thomas Petazzoni ---- - - Makefile | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index e80ef17..7ac225a 100644 ---- a/Makefile -+++ b/Makefile -@@ -62,9 +62,9 @@ RELEASE_VERSION := $(shell cat VERSION) - - CC ?= gcc - CFLAGS ?= -O3 -g --CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings --CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) --CPPFLAGS += -DVERSION=\"$(VERSION)\" -+override CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings -+override CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) -+override CPPFLAGS += -DVERSION=\"$(VERSION)\" - LDFLAGS ?= -g - LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) - -@@ -73,7 +73,7 @@ LIBS += -lnsl -lresolv -lsocket - endif - ifneq (,$(findstring Apple,$(shell $(CC) --version))) - # enabled in FSF GCC, disabled by default in Apple GCC --CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock -+override CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock - endif - - all : $(BINS) vpnc.8 --- -2.6.4 - diff --git a/package.bak/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch b/package.bak/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch deleted file mode 100644 index f767a59b78..0000000000 --- a/package.bak/vpnc/0004-Makefile-provide-an-option-to-not-build-manpages.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 3c16d0b7bf809a56affd6e1a4c0998027968b91a Mon Sep 17 00:00:00 2001 -From: Ulf Samuelsson -Date: Mon, 8 Feb 2016 23:03:48 +0100 -Subject: [PATCH] Makefile: provide an option to not build manpages - -The process of generating the vpnc.8 man page consists in running the -vpnc tool itself, and parse its --long-help output. While this is -perfectly fine when building natively, it fails completely when -cross-compiling: the vpnc binary that was built cannot be executed on -the build machine. - -In order to support such situations with minimal changes, this patch -adjusts the Makefile to make it understand a MANS variable. By -default, it's defined to "vpnc.8", which means the manpage continues -to be built as usual. However, if it's overriden to be empty, then no -manpage is built. - -Signed-off-by: Thomas Petazzoni ---- - - Makefile | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 7ac225a..ea2cd41 100644 ---- a/Makefile -+++ b/Makefile -@@ -54,6 +54,7 @@ endif - SRCS = sysdep.c vpnc-debug.c isakmp-pkt.c tunip.c config.c dh.c math_group.c supp.c decrypt-utils.c crypto.c $(CRYPTO_SRCS) - BINS = vpnc cisco-decrypt test-crypto - OBJS = $(addsuffix .o,$(basename $(SRCS))) -+MANS ?= vpnc.8 - CRYPTO_OBJS = $(addsuffix .o,$(basename $(CRYPTO_SRCS))) - BINOBJS = $(addsuffix .o,$(BINS)) - BINSRCS = $(addsuffix .c,$(BINS)) -@@ -76,7 +77,7 @@ ifneq (,$(findstring Apple,$(shell $(CC) --version))) - override CFLAGS += -fstrict-aliasing -freorder-blocks -fsched-interblock - endif - --all : $(BINS) vpnc.8 -+all : $(BINS) $(MANS) - - vpnc : $(OBJS) vpnc.o - $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) -@@ -136,7 +137,9 @@ install-common: all - install -m600 vpnc.conf $(DESTDIR)$(ETCDIR)/default.conf - install -m755 vpnc-disconnect $(DESTDIR)$(SBINDIR) - install -m755 pcf2vpnc $(DESTDIR)$(BINDIR) -+ifneq ($(MANS),) - install -m644 vpnc.8 $(DESTDIR)$(MANDIR)/man8 -+endif - install -m644 pcf2vpnc.1 $(DESTDIR)$(MANDIR)/man1 - install -m644 cisco-decrypt.1 $(DESTDIR)$(MANDIR)/man1 - install -m644 COPYING $(DESTDIR)$(DOCDIR) --- -2.6.4 - diff --git a/package.bak/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch b/package.bak/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch deleted file mode 100644 index 86239079a5..0000000000 --- a/package.bak/vpnc/0005-Makefile-allow-passing-a-custom-path-to-libgcrypt-co.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 6180ca780e3a792bd632d8899c2b35991822c93d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Mon, 8 Feb 2016 23:32:57 +0100 -Subject: [PATCH] Makefile: allow passing a custom path to libgcrypt-config - -The libgcrypt-config program may not be in the PATH, so this patch -adjusts the Makefile so that it understands a LIBGCRYPT_CONFIG -variable. By default, its value is libgcrypt-config so that the -behavior is unchanged. - -Signed-off-by: Thomas Petazzoni ---- - - Makefile | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index ea2cd41..649ddfb 100644 ---- a/Makefile -+++ b/Makefile -@@ -61,13 +61,14 @@ BINSRCS = $(addsuffix .c,$(BINS)) - VERSION ?= $(shell sh mk-version) - RELEASE_VERSION := $(shell cat VERSION) - -+LIBGCRYPT_CONFIG ?= libgcrypt-config - CC ?= gcc - CFLAGS ?= -O3 -g - override CFLAGS += -W -Wall -Wmissing-declarations -Wwrite-strings --override CFLAGS += $(shell libgcrypt-config --cflags) $(CRYPTO_CFLAGS) -+override CFLAGS += $(shell $(LIBGCRYPT_CONFIG) --cflags) $(CRYPTO_CFLAGS) - override CPPFLAGS += -DVERSION=\"$(VERSION)\" - LDFLAGS ?= -g --LIBS += $(shell libgcrypt-config --libs) $(CRYPTO_LDADD) -+LIBS += $(shell $(LIBGCRYPT_CONFIG) --libs) $(CRYPTO_LDADD) - - ifeq ($(shell uname -s), SunOS) - LIBS += -lnsl -lresolv -lsocket --- -2.6.4 - diff --git a/package.bak/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch b/package.bak/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch deleted file mode 100644 index 5efe303b7a..0000000000 --- a/package.bak/vpnc/0006-config.c-Replace-deprecated-SUSv3-functions-with-POS.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 627a45d88acf236cb36326919e4a2fa975c688bd Mon Sep 17 00:00:00 2001 -From: Bernhard Reutner-Fischer -Date: Mon, 8 Feb 2016 23:05:23 +0100 -Subject: [PATCH] config.c: Replace deprecated SUSv3 functions with POSIX - equivalents - -Replace the deprecated SUSv3 function index() by its POSIX equivalent -strchr(). This is necessary to successfully build vpnc with uClibc, -when SUSv3 compatibility functions are not compiled in. - -Patch originally from Bernhard Reutner-Fischer -. - -Signed-off-by: Thomas Petazzoni ---- - - config.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/config.c b/config.c -index 57778e3..11b363b 100644 ---- a/config.c -+++ b/config.c -@@ -657,8 +657,7 @@ static const struct config_names_s { - static char *get_config_filename(const char *name, int add_dot_conf) - { - char *realname; -- -- asprintf(&realname, "%s%s%s", index(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : ""); -+ asprintf(&realname, "%s%s%s", strchr(name, '/') ? "" : "/etc/vpnc/", name, add_dot_conf ? ".conf" : ""); - return realname; - } - --- -2.6.4 - diff --git a/package.bak/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch b/package.bak/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch deleted file mode 100644 index 41c6191ea3..0000000000 --- a/package.bak/vpnc/0007-sysdep.h-don-t-assume-error.h-is-available-on-all-Li.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 7f41ef32c8c887ee23ca83da4dfd7a4f27e01186 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:09:51 +0100 -Subject: [PATCH] sysdep.h: don't assume is available on all Linux - platforms - -The current logic in sysdep.h assumes that whenever you have __linux__ -or __GLIBC__ defined, then functionality is -available. However, the functionality is a glibc-ism, not -available in more standard-conformant C libraries such as the musl C -library. With musl, __linux__ is defined (but of course not -__GLIBC__). With the current logic, sysdep.h assumes that is -available, which isn't the case. - -This patch therefore changes the logic to only use when -__GLIBC__ is defined. It fixes the following build error: - -In file included from tunip.c:87:0: -sysdep.h:41:19: fatal error: error.h: No such file or directory - #include - -Original patch from -http://git.alpinelinux.org/cgit/aports/tree/testing/vpnc/working.patch. - -Signed-off-by: Thomas Petazzoni ---- - sysdep.h | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/sysdep.h b/sysdep.h -index 137bf6d..fb65b31 100644 ---- a/sysdep.h -+++ b/sysdep.h -@@ -38,11 +38,14 @@ int tun_get_hwaddr(int fd, char *dev, uint8_t *hwaddr); - - /***************************************************************************/ - #if defined(__linux__) || defined(__GLIBC__) -+ -+#ifdef __GLIBC__ - #include -+#define HAVE_ERROR 1 -+#endif - - #define HAVE_VASPRINTF 1 - #define HAVE_ASPRINTF 1 --#define HAVE_ERROR 1 - #define HAVE_UNSETENV 1 - #define HAVE_SETENV 1 - #endif --- -2.6.4 - diff --git a/package.bak/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch b/package.bak/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch deleted file mode 100644 index a4cfe11b35..0000000000 --- a/package.bak/vpnc/0008-sysdep.c-don-t-include-linux-if_tun.h-on-Linux.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 2e2eab070384834036c1458c669070ed17d81dbe Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:15:36 +0100 -Subject: [PATCH] sysdep.c: don't include on Linux -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Including in sysdep.c is not necessary since sysdep.h -already includes . And this is actually -potentially harmful since both files redefine the same 'struct -ethhdr', causing the following build failure with the musl C library: - -In file included from sysdep.h:28:0, - from sysdep.c:71: -.../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/netinet/if_ether.h:96:8: error: redefinition of ‘struct ethhdr’ - struct ethhdr { - ^ -In file included from .../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_tun.h:20:0, - from sysdep.c:62: -.../buildroot/output/host/usr/arm-buildroot-linux-musleabihf/sysroot/usr/include/linux/if_ether.h:138:8: note: originally defined here - struct ethhdr { - ^ - -Original patch from: -http://git.alpinelinux.org/cgit/aports/tree/testing/vpnc/working.patch - -Signed-off-by: Thomas Petazzoni ---- - sysdep.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/sysdep.c b/sysdep.c -index d8f181d..f83543d 100644 ---- a/sysdep.c -+++ b/sysdep.c -@@ -58,13 +58,11 @@ - - #if defined(__DragonFly__) - #include --#elif defined(__linux__) --#include - #elif defined(__APPLE__) - /* no header for tun */ - #elif defined(__CYGWIN__) - #include "tap-win32.h" --#else -+#elif !defined(__linux__) - #include - #endif - --- -2.6.4 - diff --git a/package.bak/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch b/package.bak/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch deleted file mode 100644 index bce552e55e..0000000000 --- a/package.bak/vpnc/0009-config.c-add-missing-sys-ttydefaults.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 17277915af703a4767de791916621d8f59aef516 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Wed, 10 Feb 2016 23:21:26 +0100 -Subject: [PATCH] config.c: add missing include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This include is needed to get the definition of CEOT, otherwise the -build fails with: - -config.c: In function ‘vpnc_getline’: -config.c:145:25: error: ‘CEOT’ undeclared (first use in this function) - if (llen == 0 && c == CEOT) - ^ - -Signed-off-by: Thomas Petazzoni ---- - config.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/config.c b/config.c -index 11b363b..f47a534 100644 ---- a/config.c -+++ b/config.c -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - #include - --- -2.6.4 - diff --git a/package.bak/vpnc/Config.in b/package.bak/vpnc/Config.in deleted file mode 100644 index 2049c45731..0000000000 --- a/package.bak/vpnc/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_VPNC - bool "vpnc" - depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt - depends on BR2_USE_MMU # fork() - depends on BR2_USE_WCHAR # gnutls - select BR2_PACKAGE_LIBGCRYPT - select BR2_PACKAGE_LIBGPG_ERROR - select BR2_PACKAGE_GNUTLS - help - Client for Cisco VPN concentrator - 3000 Series VPN Concentrator - IOS Routers - PIX/ASA Zecurity Appliances - Juniper/Netscreen - - http://www.unix-ag.uni-kl.de/~massar/vpnc - -comment "vpnc needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR diff --git a/package.bak/vpnc/vpnc.hash b/package.bak/vpnc/vpnc.hash deleted file mode 100644 index 98a98472e3..0000000000 --- a/package.bak/vpnc/vpnc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 c10a5c2c0813198ca2404dd36db380cdb6395b46338123b341775095cf61521d vpnc-b1243d29e0c00312ead038b04a2cf5e2fa31d740.tar.gz diff --git a/package.bak/vpnc/vpnc.mk b/package.bak/vpnc/vpnc.mk deleted file mode 100644 index 282a422508..0000000000 --- a/package.bak/vpnc/vpnc.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# vpnc -# -################################################################################ - -VPNC_VERSION = b1243d29e0c00312ead038b04a2cf5e2fa31d740 -VPNC_SITE = $(call github,ndpgroup,vpnc,$(VPNC_VERSION)) -VPNC_LICENSE = GPLv2+ -VPNC_LICENSE_FILES = COPYING - -VPNC_DEPENDENCIES = libgcrypt libgpg-error gnutls host-pkgconf - -define VPNC_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) \ - $(TARGET_CONFIGURE_OPTS) \ - LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config \ - VERSION=$(VPNC_VERSION) MANS= -endef - -define VPNC_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install $(TARGET_CONFIGURE_OPTS) \ - VERSION=$(VPNC_VERSION) MANS= \ - DESTDIR="$(TARGET_DIR)" PREFIX=/usr -endef - -$(eval $(generic-package)) diff --git a/package.bak/vsftpd/0001-utmpx-builddef.patch b/package.bak/vsftpd/0001-utmpx-builddef.patch deleted file mode 100644 index 07bf13c86d..0000000000 --- a/package.bak/vsftpd/0001-utmpx-builddef.patch +++ /dev/null @@ -1,49 +0,0 @@ -Add build option to disable utmpx update code - -On some embedded systems the libc may have utmpx support, but the -feature would be redundant. So add a build switch to disable utmpx -updating, similar to compiling on systems without utmpx support. - -Signed-off-by: Maarten ter Huurne - -diff -ru vsftpd-3.0.2.orig/builddefs.h vsftpd-3.0.2/builddefs.h ---- vsftpd-3.0.2.orig/builddefs.h 2012-04-05 05:24:56.000000000 +0200 -+++ vsftpd-3.0.2/builddefs.h 2014-09-16 14:23:36.128003245 +0200 -@@ -4,6 +4,7 @@ - #undef VSF_BUILD_TCPWRAPPERS - #define VSF_BUILD_PAM - #undef VSF_BUILD_SSL -+#define VSF_BUILD_UTMPX - - #endif /* VSF_BUILDDEFS_H */ - -diff -ru vsftpd-3.0.2.orig/sysdeputil.c vsftpd-3.0.2/sysdeputil.c ---- vsftpd-3.0.2.orig/sysdeputil.c 2012-09-16 06:18:04.000000000 +0200 -+++ vsftpd-3.0.2/sysdeputil.c 2014-09-16 14:26:42.686887724 +0200 -@@ -1158,7 +1158,7 @@ - - #endif /* !VSF_SYSDEP_NEED_OLD_FD_PASSING */ - --#ifndef VSF_SYSDEP_HAVE_UTMPX -+#if !defined(VSF_BUILD_UTMPX) || !defined(VSF_SYSDEP_HAVE_UTMPX) - - void - vsf_insert_uwtmp(const struct mystr* p_user_str, -@@ -1173,7 +1173,7 @@ - { - } - --#else /* !VSF_SYSDEP_HAVE_UTMPX */ -+#else /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */ - - /* IMHO, the pam_unix module REALLY should be doing this in its SM component */ - /* Statics */ -@@ -1238,7 +1238,7 @@ - updwtmpx(WTMPX_FILE, &s_utent); - } - --#endif /* !VSF_SYSDEP_HAVE_UTMPX */ -+#endif /* !VSF_BUILD_UTMPX || !VSF_SYSDEP_HAVE_UTMPX */ - - void - vsf_set_die_if_parent_dies() diff --git a/package.bak/vsftpd/0003-fix-CVE-2015-1419.patch b/package.bak/vsftpd/0003-fix-CVE-2015-1419.patch deleted file mode 100644 index 95ad017a1c..0000000000 --- a/package.bak/vsftpd/0003-fix-CVE-2015-1419.patch +++ /dev/null @@ -1,102 +0,0 @@ -Fix CVE-2015-1419 - config option deny_file is not handled correctly. -From SUSE: https://bugzilla.suse.com/show_bug.cgi?id=915522 - -Signed-off-by: Gustavo Zacarias - -Index: vsftpd-3.0.2/ls.c -=================================================================== ---- vsftpd-3.0.2.orig/ls.c -+++ vsftpd-3.0.2/ls.c -@@ -7,6 +7,7 @@ - * Would you believe, code to handle directory listing. - */ - -+#include - #include "ls.h" - #include "access.h" - #include "defs.h" -@@ -243,11 +244,42 @@ vsf_filename_passes_filter(const struct - struct mystr temp_str = INIT_MYSTR; - struct mystr brace_list_str = INIT_MYSTR; - struct mystr new_filter_str = INIT_MYSTR; -+ struct mystr normalize_filename_str = INIT_MYSTR; -+ const char *normname; -+ const char *path; - int ret = 0; - char last_token = 0; - int must_match_at_current_pos = 1; -+ - str_copy(&filter_remain_str, p_filter_str); -- str_copy(&name_remain_str, p_filename_str); -+ -+ /* normalize filepath */ -+ path = str_strdup(p_filename_str); -+ normname = realpath(path, NULL); -+ if (normname == NULL) -+ goto out; -+ str_alloc_text(&normalize_filename_str, normname); -+ -+ if (!str_isempty (&filter_remain_str) && !str_isempty(&normalize_filename_str)) { -+ if (str_get_char_at(p_filter_str, 0) == '/') { -+ if (str_get_char_at(&normalize_filename_str, 0) != '/') { -+ str_getcwd (&name_remain_str); -+ -+ if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */ -+ str_append_char (&name_remain_str, '/'); -+ -+ str_append_str (&name_remain_str, &normalize_filename_str); -+ } -+ else -+ str_copy (&name_remain_str, &normalize_filename_str); -+ } else { -+ if (str_get_char_at(p_filter_str, 0) != '{') -+ str_basename (&name_remain_str, &normalize_filename_str); -+ else -+ str_copy (&name_remain_str, &normalize_filename_str); -+ } -+ } else -+ str_copy(&name_remain_str, &normalize_filename_str); - - while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX) - { -@@ -360,6 +392,9 @@ vsf_filename_passes_filter(const struct - ret = 0; - } - out: -+ free(normname); -+ free(path); -+ str_free(&normalize_filename_str); - str_free(&filter_remain_str); - str_free(&name_remain_str); - str_free(&temp_str); -Index: vsftpd-3.0.2/str.c -=================================================================== ---- vsftpd-3.0.2.orig/str.c -+++ vsftpd-3.0.2/str.c -@@ -770,3 +770,14 @@ str_replace_unprintable(struct mystr* p_ - } - } - -+void -+str_basename (struct mystr* d_str, const struct mystr* path) -+{ -+ static struct mystr tmp; -+ -+ str_copy (&tmp, path); -+ str_split_char_reverse(&tmp, d_str, '/'); -+ -+ if (str_isempty(d_str)) -+ str_copy (d_str, path); -+} -Index: vsftpd-3.0.2/str.h -=================================================================== ---- vsftpd-3.0.2.orig/str.h -+++ vsftpd-3.0.2/str.h -@@ -101,6 +101,7 @@ void str_replace_unprintable(struct myst - int str_atoi(const struct mystr* p_str); - filesize_t str_a_to_filesize_t(const struct mystr* p_str); - unsigned int str_octal_to_uint(const struct mystr* p_str); -+void str_basename (struct mystr* d_str, const struct mystr* path); - - /* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string - * buffer, starting at character position 'p_pos'. The extracted line will diff --git a/package.bak/vsftpd/Config.in b/package.bak/vsftpd/Config.in deleted file mode 100644 index 464d6f27e3..0000000000 --- a/package.bak/vsftpd/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_VSFTPD - bool "vsftpd" - depends on BR2_USE_MMU # fork() - help - vsftpd is an ftp daemon written with security in mind. - http://vsftpd.beasts.org/ - -if BR2_PACKAGE_VSFTPD - -config BR2_PACKAGE_VSFTPD_UTMPX - bool "log vsftpd access to utmpx" - # musl 1.1.4 has an empty utmpx implementation and no WTMPX_FILE - depends on !BR2_TOOLCHAIN_USES_MUSL - help - Enable logging of vsftpd access to utmpx. - Note that Buildroot does not generate utmpx by default. - -endif diff --git a/package.bak/vsftpd/S70vsftpd b/package.bak/vsftpd/S70vsftpd deleted file mode 100755 index 38bcfd431f..0000000000 --- a/package.bak/vsftpd/S70vsftpd +++ /dev/null @@ -1,33 +0,0 @@ -#! /bin/sh - -set -e - -DESC="vsftpd" -NAME=vsftpd -DAEMON=/usr/sbin/$NAME - -case "$1" in - start) - printf "Starting $DESC: " - start-stop-daemon -S -b -x $NAME - echo "OK" - ;; - stop) - printf "Stopping $DESC: " - start-stop-daemon -K -x $NAME - echo "OK" - ;; - restart|force-reload) - echo "Restarting $DESC: " - $0 stop - sleep 1 - $0 start - echo "" - ;; - *) - echo "Usage: $0 {start|stop|restart|force-reload}" >&2 - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/vsftpd/vsftpd.hash b/package.bak/vsftpd/vsftpd.hash deleted file mode 100644 index a0cd55b6d1..0000000000 --- a/package.bak/vsftpd/vsftpd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7 vsftpd-3.0.3.tar.gz diff --git a/package.bak/vsftpd/vsftpd.mk b/package.bak/vsftpd/vsftpd.mk deleted file mode 100644 index fd92346064..0000000000 --- a/package.bak/vsftpd/vsftpd.mk +++ /dev/null @@ -1,67 +0,0 @@ -################################################################################ -# -# vsftpd -# -################################################################################ - -VSFTPD_VERSION = 3.0.3 -VSFTPD_SITE = https://security.appspot.com/downloads -VSFTPD_LIBS = -lcrypt -VSFTPD_LICENSE = GPLv2 -VSFTPD_LICENSE_FILES = COPYING - -define VSFTPD_DISABLE_UTMPX - $(SED) 's/.*VSF_BUILD_UTMPX/#undef VSF_BUILD_UTMPX/' $(@D)/builddefs.h -endef - -define VSFTPD_ENABLE_SSL - $(SED) 's/.*VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(@D)/builddefs.h -endef - -ifeq ($(BR2_PACKAGE_VSFTPD_UTMPX),) -VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_DISABLE_UTMPX -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -VSFTPD_DEPENDENCIES += openssl host-pkgconf -VSFTPD_LIBS += `$(PKG_CONFIG_HOST_BINARY) --libs libssl libcrypto` -VSFTPD_POST_CONFIGURE_HOOKS += VSFTPD_ENABLE_SSL -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -VSFTPD_DEPENDENCIES += libcap -VSFTPD_LIBS += -lcap -endif - -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -VSFTPD_DEPENDENCIES += linux-pam -VSFTPD_LIBS += -lpam -endif - -define VSFTPD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" LIBS="$(VSFTPD_LIBS)" -C $(@D) -endef - -define VSFTPD_USERS - ftp -1 ftp -1 * /home/ftp - - Anonymous FTP User -endef - -define VSFTPD_INSTALL_INIT_SYSV - $(INSTALL) -D -m 755 package/vsftpd/S70vsftpd $(TARGET_DIR)/etc/init.d/S70vsftpd -endef - -# vsftpd won't work if the jail directory is writable, it has to be -# readable only otherwise you get the following error: -# 500 OOPS: vsftpd: refusing to run with writable root inside chroot() -# That's why we have to adjust the permissions of /home/ftp -define VSFTPD_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 755 $(@D)/vsftpd $(TARGET_DIR)/usr/sbin/vsftpd - test -f $(TARGET_DIR)/etc/vsftpd.conf || \ - $(INSTALL) -D -m 644 $(@D)/vsftpd.conf \ - $(TARGET_DIR)/etc/vsftpd.conf - $(INSTALL) -d -m 700 $(TARGET_DIR)/usr/share/empty - $(INSTALL) -d -m 555 $(TARGET_DIR)/home/ftp -endef - -$(eval $(generic-package)) diff --git a/package.bak/vtun/0001-fix-installation.patch b/package.bak/vtun/0001-fix-installation.patch deleted file mode 100644 index d9659fa885..0000000000 --- a/package.bak/vtun/0001-fix-installation.patch +++ /dev/null @@ -1,44 +0,0 @@ -Makefile.in: fix installation steps - -Not sure what the reason for that patch is, but originally added by Ulf -Samuelsson , when upgrading from 2.6.x to 3.0.2. - -yann.morin.1998@free.fr: the initial commit in the Buildroot tree had the -SoB by Ulf, but it was not explicitly reproduced here in the patch; so I -added it here directly in the patch. - -Somewhat-signed-off-by: Ulf Samuelsson -Signed-off-by: "Yann E. MORIN" -diff -durN vtun-3.0.3.orig/Makefile.in vtun-3.0.3/Makefile.in ---- vtun-3.0.3.orig/Makefile.in 2012-07-09 06:55:38.000000000 +0200 -+++ vtun-3.0.3/Makefile.in 2013-02-16 23:28:47.034036869 +0100 -@@ -28,7 +28,7 @@ - LEXFLAGS = -t - - INSTALL = @INSTALL@ --INSTALL_OWNER = -o root -g 0 -+INSTALL_OWNER = - - prefix = @prefix@ - exec_prefix = @exec_prefix@ -@@ -89,16 +89,15 @@ - - install_config: - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(ETC_DIR) -- if [ ! -f $(ETC_DIR)/vtund.conf ]; then \ -- $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); \ -- fi -+ $(INSTALL) -m 600 $(INSTALL_OWNER) vtund.conf $(DESTDIR)$(ETC_DIR); -+ $(INSTALL) -m 600 $(INSTALL_OWNER) scripts/vtund-start.conf $(DESTDIR)$(ETC_DIR); - - install: vtund install_config install_man -- $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(VAR_DIR)/run - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(STAT_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(LOCK_DIR) - $(INSTALL) -d -m 755 $(INSTALL_OWNER) $(DESTDIR)$(SBIN_DIR) - $(INSTALL) -m 755 $(INSTALL_OWNER) vtund $(DESTDIR)$(SBIN_DIR) -- $(BIN_DIR)/strip $(DESTDIR)$(SBIN_DIR)/vtund -+ $(INSTALL) -m 755 -D $(INSTALL_OWNER) scripts/vtund.rc.debian \ -+ $(DESTDIR)$(ETC_DIR)/init.d/S90vtun - - # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/package.bak/vtun/0002-fix-ssl-headers-checks.patch b/package.bak/vtun/0002-fix-ssl-headers-checks.patch deleted file mode 100644 index 765411af84..0000000000 --- a/package.bak/vtun/0002-fix-ssl-headers-checks.patch +++ /dev/null @@ -1,47 +0,0 @@ -configure.in: do not hard-code search patch for SSL headers - -Do. Not. Do. That. It breaks cross-compilation. - -Also use the SSL headers dir to look for blowfish headers. - -Signed-off-by: "Yann E. MORIN" - -diff -durN vtun-3.0.3.orig/configure.in vtun-3.0.3/configure.in ---- vtun-3.0.3.orig/configure.in 2009-03-29 12:08:51.000000000 +0200 -+++ vtun-3.0.3/configure.in 2013-02-16 23:44:44.004339680 +0100 -@@ -166,7 +166,7 @@ - AC_MSG_RESULT() - AC_CHECKING( for md5 Library and Header files ... ) - AC_SEARCH_HEADERS(md5.h, -- $SSL_HDR_DIR /usr/include/openssl "" /usr/include /usr/include/ssl /usr/local/include /usr/local/ssl/include /usr/include/sys, -+ $SSL_HDR_DIR "" , - , - AC_MSG_ERROR( SSL headers not found. ) - ) -@@ -176,7 +176,7 @@ - AC_MSG_RESULT() - AC_CHECKING( for blowfish Library and Header files ... ) - AC_SEARCH_HEADERS(blowfish.h, -- $BLOWFISH_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, -+ $BLOWFISH_HDR_DIR $SSL_HDR_DIR, - AC_CHECK_LIB(crypto, BF_set_key, - [ - LIBS="$LIBS -lcrypto" -@@ -193,7 +193,7 @@ - AC_MSG_RESULT() - AC_CHECKING( for AES Library and Header files ... ) - AC_SEARCH_HEADERS(aes.h, -- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, -+ $SSL_HDR_DIR , - AC_CHECK_LIB(crypto, AES_set_encrypt_key, - [ - AC_DEFINE(HAVE_SSL_AES) -@@ -208,7 +208,7 @@ - AC_MSG_RESULT() - AC_CHECKING( for EVP Library and Header files ... ) - AC_SEARCH_HEADERS(evp.h, -- $SSL_HDR_DIR /usr/include/ssl /usr/include/openssl /usr/include /usr/local/include /usr/local/ssl/include /usr/include/crypto, -+ $SSL_HDR_DIR , - AC_CHECK_LIB(crypto, EVP_EncryptInit, - [ - AC_DEFINE(HAVE_SSL_EVP) diff --git a/package.bak/vtun/0003-fixup-configure.in.patch b/package.bak/vtun/0003-fixup-configure.in.patch deleted file mode 100644 index cb2ac67aa2..0000000000 --- a/package.bak/vtun/0003-fixup-configure.in.patch +++ /dev/null @@ -1,92 +0,0 @@ -configure.in: minimal syntax fixup for autoreconf - -This is the strictly minimal syntax fixups to make autoreconf happy... - -Signed-off-by: "Yann E. MORIN" - ---- -Note: configure.in is still full of incorrect syntax, but fixing it is -a task for another day, and would have to be upstreamed. But upstream -looks to be moribund at best, if not dead... :-( - -So, keep it for ourselves for now... Too bad, vtun is really helpfull. - ---- vtun-3.0.3.orig/configure.in 2013-02-16 23:54:52.582451817 +0100 -+++ vtun-3.0.3/configure.in 2013-02-17 00:03:13.640887353 +0100 -@@ -110,10 +110,10 @@ - AC_SEARCH_LIBS(nanosleep, rt posix4) - - dnl Check for setproctitle in libutil --AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE(HAVE_SETPROC_TITLE) ) -+AC_SEARCH_LIBS(setproctitle, util bsd, AC_DEFINE([HAVE_SETPROC_TITLE],[],[Define to set title in /proc]) ) - - if test "$SHAPER" = "yes"; then -- AC_DEFINE(HAVE_SHAPER) -+ AC_DEFINE([HAVE_SHAPER],[],[Define to use shapper]) - fi - - if test "$ZLIB" = "yes"; then -@@ -121,7 +121,7 @@ - AC_CHECKING( for ZLIB Library and Header files ... ) - AC_CHECK_LIB(z, deflate, - LIBS="$LIBS -lz" -- AC_DEFINE(HAVE_ZLIB), -+ AC_DEFINE([HAVE_ZLIB],[],[Define to use ZLIB]), - AC_MSG_ERROR( Zlib library not found.) - ) - fi -@@ -148,7 +148,7 @@ - AC_CHECK_LIB($I, lzo1x_decompress, - [ - LIBS="$LIBS -l"$I -- AC_DEFINE(HAVE_LZO) -+ AC_DEFINE([HAVE_LZO],[],[Define to use LZO]) - havelzo=1 - ] - ) -@@ -180,8 +180,8 @@ - AC_CHECK_LIB(crypto, BF_set_key, - [ - LIBS="$LIBS -lcrypto" -- AC_DEFINE(HAVE_SSL) -- AC_DEFINE(HAVE_SSL_BLOWFISH) -+ AC_DEFINE([HAVE_SSL],[],[Define to use SSL]) -+ AC_DEFINE([HAVE_SSL_BLOWFISH],[],[Define to use blowfish]) - ], - AC_MSG_ERROR( SSL library not found. ) - ), -@@ -196,7 +196,7 @@ - $SSL_HDR_DIR , - AC_CHECK_LIB(crypto, AES_set_encrypt_key, - [ -- AC_DEFINE(HAVE_SSL_AES) -+ AC_DEFINE([HAVE_SSL_AES],[],[Define to use AES]) - ], - AC_MSG_ERROR( AES library not found. ) - ), -@@ -211,7 +211,7 @@ - $SSL_HDR_DIR , - AC_CHECK_LIB(crypto, EVP_EncryptInit, - [ -- AC_DEFINE(HAVE_SSL_EVP) -+ AC_DEFINE([HAVE_SSL_EVP],[],Define to use EVP) - ], - AC_MSG_ERROR( EVP library not found. ) - ), -@@ -220,7 +220,7 @@ - fi - - if test "$NATHACK" = "yes"; then -- AC_DEFINE(ENABLE_NAT_HACK) -+ AC_DEFINE([ENABLE_NAT_HACK],[],[Define to use NAT hack]) - fi - - if test "$SOCKS" = "yes"; then -@@ -274,6 +274,6 @@ - REL=`echo 'BRANCH-3_X' | tr -d '$: \-' | sed 's/^[A-Za-z]*//' | sed 's/\_/\./'` - changequote([,]) - --AC_DEFINE_UNQUOTED(VTUN_VER, "$REL `date '+%m/%d/%Y'`") -+AC_DEFINE_UNQUOTED([VTUN_VER], ["$REL `date '+%m/%d/%Y'`"], [vtun version]) - - AC_OUTPUT(Makefile) diff --git a/package.bak/vtun/Config.in b/package.bak/vtun/Config.in deleted file mode 100644 index c1f6d384fc..0000000000 --- a/package.bak/vtun/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_VTUN - bool "vtun" - select BR2_PACKAGE_LZO - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_ZLIB - depends on BR2_USE_MMU # fork() - help - Tool for easily creating Virtual Tunnels over TCP/IP networks - with traffic shaping, compression, and encryption. - - It supports IP, PPP, SLIP, Ethernet and other tunnel types. - - NOTE: It uses start-stop-daemon in init script, so be sure - to enable that within busybox - - http://vtun.sourceforge.net/ diff --git a/package.bak/vtun/vtun.hash b/package.bak/vtun/vtun.hash deleted file mode 100644 index baa6381f70..0000000000 --- a/package.bak/vtun/vtun.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 69dcbe4f8c5ce7d91b4150a6309e536d03b61841169746ca5788413ac7edb9cb vtun-3.0.3.tar.gz diff --git a/package.bak/vtun/vtun.mk b/package.bak/vtun/vtun.mk deleted file mode 100644 index 5e0e266661..0000000000 --- a/package.bak/vtun/vtun.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# vtun -# -################################################################################ - -VTUN_VERSION = 3.0.3 -VTUN_SITE = http://downloads.sourceforge.net/project/vtun/vtun/$(VTUN_VERSION) -VTUN_LICENSE = GPLv2+ with OpenSSL exception -VTUN_LICENSE_FILES = README.OpenSSL -VTUN_DEPENDENCIES = host-bison host-flex zlib lzo openssl -VTUN_AUTORECONF = YES - -VTUN_CONF_OPTS = \ - --with-ssl-headers=$(STAGING_DIR)/usr/include/openssl \ - --with-lzo-headers=$(STAGING_DIR)/usr/include/lzo \ - --with-lzo-lib=$(STAGING_DIR)/usr/lib - -# Assumes old-style gcc inline symbol visibility rules -VTUN_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu89" - -$(eval $(autotools-package)) diff --git a/package.bak/w_scan/0001-musl.patch b/package.bak/w_scan/0001-musl.patch deleted file mode 100644 index 7633d551dd..0000000000 --- a/package.bak/w_scan/0001-musl.patch +++ /dev/null @@ -1,26 +0,0 @@ -Fix musl build - -Signed-off-by: Bernd Kuhls - -diff -uNr w_scan-20141122.org/descriptors.h w_scan-20141122/descriptors.h ---- w_scan-20141122.org/descriptors.h 2014-11-22 09:49:26.000000000 +0100 -+++ w_scan-20141122/descriptors.h 2016-01-24 14:05:21.000000000 +0100 -@@ -28,6 +28,7 @@ - #ifndef __DESCRIPTORS_H__ - #define __DESCRIPTORS_H__ - -+#include - #include "extended_frontend.h" - - /****************************************************************************** -diff -uNr w_scan-20141122.org/version.h w_scan-20141122/version.h ---- w_scan-20141122.org/version.h 2014-11-22 11:59:56.000000000 +0100 -+++ w_scan-20141122/version.h 2016-01-24 14:06:33.000000000 +0100 -@@ -1,6 +1,6 @@ - /* AUTOMATICALLY GENERATED - DO NOT EDIT MANUALLY */ - #ifndef W_SCAN_VERSION_H - #define W_SCAN_VERSION_H --uint version=20141122; -+unsigned int version=20141122; - #endif - diff --git a/package.bak/w_scan/Config.in b/package.bak/w_scan/Config.in deleted file mode 100644 index 2d4f63434e..0000000000 --- a/package.bak/w_scan/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "w_scan needs a toolchain w/ headers >= 3.7" - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - -config BR2_PACKAGE_W_SCAN - bool "w_scan" - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7 - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - w_scan is a small command line utility used to perform frequency - scans for DVB and ATSC transmissions. It is capable of creating - channels.conf files (in different output formats !) as well as - initial tuning data for scan. - - http://wirbel.htpc-forum.de/w_scan/index_en.html diff --git a/package.bak/w_scan/w_scan.hash b/package.bak/w_scan/w_scan.hash deleted file mode 100644 index 4c336f3d56..0000000000 --- a/package.bak/w_scan/w_scan.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b6d7c9ab997c53a0b0d92e8390f313cc3b82ee8ece1756b4e526119fd5ba09b4 w_scan-20141122.tar.bz2 diff --git a/package.bak/w_scan/w_scan.mk b/package.bak/w_scan/w_scan.mk deleted file mode 100644 index 3ec84ed8b6..0000000000 --- a/package.bak/w_scan/w_scan.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# w_scan -# -################################################################################ - -W_SCAN_VERSION = 20141122 -W_SCAN_SOURCE = w_scan-$(W_SCAN_VERSION).tar.bz2 -W_SCAN_SITE = http://wirbel.htpc-forum.de/w_scan -W_SCAN_LICENSE = GPLv2+ -W_SCAN_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -W_SCAN_DEPENDENCIES += libiconv -W_SCAN_CONF_ENV += LIBS=-liconv -endif - -$(eval $(autotools-package)) diff --git a/package.bak/waf/waf.hash b/package.bak/waf/waf.hash deleted file mode 100644 index 9d610b2c1e..0000000000 --- a/package.bak/waf/waf.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally computed -sha1 33d170c738ed8c92dda2945b445272972f558244 waf-1.9.5 -sha256 101f14e0f47a6410c00b8feda094948516cd3989491c56eb8268907fcd164909 waf-1.9.5 diff --git a/package.bak/waf/waf.mk b/package.bak/waf/waf.mk deleted file mode 100644 index 3d61f267e6..0000000000 --- a/package.bak/waf/waf.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# waf -# -################################################################################ - -WAF_VERSION = 1.9.5 -WAF_SOURCE = waf-$(WAF_VERSION) -WAF_SITE = https://waf.io/ - -define HOST_WAF_EXTRACT_CMDS - $(INSTALL) -D -m 0755 $(DL_DIR)/waf-$(WAF_VERSION) $(@D)/waf -endef - -define HOST_WAF_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/waf $(HOST_DIR)/usr/bin/waf -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/wavemon/Config.in b/package.bak/wavemon/Config.in deleted file mode 100644 index e073dee96f..0000000000 --- a/package.bak/wavemon/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_WAVEMON - bool "wavemon" - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_LIBNL - help - wavemon is a wireless device monitoring application that allows you - to watch signal and noise levels, packet statistics, device - configuration and network parameters of your wireless network - hardware. - - Note that you need a Linux Kernel configuration with wireless - extensions or with wireless extensions compatibility enabled. - - https://github.com/uoaerg/wavemon - -comment "wavemon needs a toolchain w/ NPTL" - depends on !BR2_TOOLCHAIN_HAS_THREADS_NPTL diff --git a/package.bak/wavemon/wavemon.hash b/package.bak/wavemon/wavemon.hash deleted file mode 100644 index 69bd2b4bf1..0000000000 --- a/package.bak/wavemon/wavemon.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 c9ea57da4f8161401bcaaca17b37bcdf16ffb88baad2370afed2e15a7f71af73 wavemon-v0.8.1.tar.gz diff --git a/package.bak/wavemon/wavemon.mk b/package.bak/wavemon/wavemon.mk deleted file mode 100644 index 5a1b7ee0d5..0000000000 --- a/package.bak/wavemon/wavemon.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# wavemon -# -################################################################################ - -WAVEMON_VERSION = v0.8.1 -WAVEMON_SITE = $(call github,uoaerg,wavemon,$(WAVEMON_VERSION)) -WAVEMON_LICENSE = GPLv3+ -WAVEMON_LICENSE_FILES = COPYING -WAVEMON_DEPENDENCIES = host-pkgconf libnl ncurses - -# Handwritten Makefile.in, automake isn't used -WAVEMON_MAKE_OPTS = CC="$(TARGET_CC)" - -$(eval $(autotools-package)) diff --git a/package.bak/wavpack/Config.in b/package.bak/wavpack/Config.in deleted file mode 100644 index db7b893413..0000000000 --- a/package.bak/wavpack/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_WAVPACK - bool "wavpack" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - WavPack is a completely open audio compression format - providing lossless, high-quality lossy, and a unique - hybrid compression mode. - - http://www.wavpack.com/ diff --git a/package.bak/wavpack/wavpack.hash b/package.bak/wavpack/wavpack.hash deleted file mode 100644 index 16ff08cc6c..0000000000 --- a/package.bak/wavpack/wavpack.hash +++ /dev/null @@ -1,3 +0,0 @@ -# locally computed hash -sha256 1939627d5358d1da62bc6158d63f7ed12905552f3a799c799ee90296a7612944 wavpack-5.1.0.tar.bz2 -sha256 3890ab081dc6f8ee02161ace180381327031cc24cc6c3d71668367b7e5f6e4be 876fc3f3907e871d0938ac6c8c5252f5f31abd1f.patch diff --git a/package.bak/wavpack/wavpack.mk b/package.bak/wavpack/wavpack.mk deleted file mode 100644 index a613506234..0000000000 --- a/package.bak/wavpack/wavpack.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# wavpack -# -################################################################################ - -WAVPACK_VERSION = 5.1.0 -WAVPACK_SITE = http://www.wavpack.com -WAVPACK_SOURCE = wavpack-$(WAVPACK_VERSION).tar.bz2 -WAVPACK_INSTALL_STAGING = YES -WAVPACK_DEPENDENCIES = $(if $(BR2_ENABLE_LOCALE),,libiconv) -WAVPACK_LICENSE = BSD-3c -WAVPACK_LICENSE_FILES = COPYING - -# Fetch patch from upstream to remove wchar dependency -WAVPACK_PATCH = https://github.com/dbry/WavPack/commit/876fc3f3907e871d0938ac6c8c5252f5f31abd1f.patch - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WAVPACK_CONF_OPTS += LIBS=-liconv -endif - -# WavPack "autodetects" CPU type to enable ASM code. However, the assembly code -# for ARM is written for ARMv7 only and building WavPack for an ARM-non-v7 -# architecture will fail. We explicitly enable ASM for the supported -# architectures x86, x64 and ARMv7 and disable it for all others. -ifeq ($(BR2_i386)$(BR2_x86_64)$(BR2_ARM_CPU_ARMV7A),y) -WAVPACK_CONF_OPTS += --enable-asm -else -WAVPACK_CONF_OPTS += --disable-asm -endif - -$(eval $(autotools-package)) diff --git a/package.bak/wayland-protocols/Config.in b/package.bak/wayland-protocols/Config.in deleted file mode 100644 index 8b4dedfd83..0000000000 --- a/package.bak/wayland-protocols/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_WAYLAND_PROTOCOLS - bool "wayland-protocols" - # Not really... but useless otherwise - depends on BR2_PACKAGE_WAYLAND - help - Wayland protocols that adds functionality not available in - the Wayland core protocol. - - http://wayland.freedesktop.org/ diff --git a/package.bak/wayland-protocols/wayland-protocols.hash b/package.bak/wayland-protocols/wayland-protocols.hash deleted file mode 100644 index a316698010..0000000000 --- a/package.bak/wayland-protocols/wayland-protocols.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-August/030606.html -sha256 635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f wayland-protocols-1.7.tar.xz diff --git a/package.bak/wayland-protocols/wayland-protocols.mk b/package.bak/wayland-protocols/wayland-protocols.mk deleted file mode 100644 index 54c2ec1386..0000000000 --- a/package.bak/wayland-protocols/wayland-protocols.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# wayland-protocols -# -################################################################################ - -WAYLAND_PROTOCOLS_VERSION = 1.7 -WAYLAND_PROTOCOLS_SITE = http://wayland.freedesktop.org/releases -WAYLAND_PROTOCOLS_SOURCE = wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION).tar.xz -WAYLAND_PROTOCOLS_LICENSE = MIT -WAYLAND_PROTOCOLS_LICENSE_FILES = COPYING -WAYLAND_PROTOCOLS_INSTALL_STAGING = YES -WAYLAND_PROTOCOLS_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/wayland/0001-Support-architectures-with-non-empty-__USER_LABEL_PR.patch b/package.bak/wayland/0001-Support-architectures-with-non-empty-__USER_LABEL_PR.patch deleted file mode 100644 index abefcff274..0000000000 --- a/package.bak/wayland/0001-Support-architectures-with-non-empty-__USER_LABEL_PR.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0a337328411d5b3f37b169a83b6fee3f1726130f Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 26 May 2016 15:57:33 +0200 -Subject: [PATCH] Support architectures with non-empty __USER_LABEL_PREFIX__ - -On some architectures (like Blackfin), a C symbol does not directly -match with assembly symbols. The C symbol references are in fact all -prefixed by a so-called "user label prefix". So when a symbol defined -in an assembly file needs to be referenced from C, this symbol should -be prefixed by the "user label prefix". - -This commit updates dtddata.S to take into account -__USER_LABEL_PREFIX__ when it exists. - -Signed-off-by: Thomas Petazzoni ---- - src/dtddata.S | 19 +++++++++++++------ - 1 file changed, 13 insertions(+), 6 deletions(-) - -diff --git a/src/dtddata.S b/src/dtddata.S -index ce51133..ad2a4db 100644 ---- a/src/dtddata.S -+++ b/src/dtddata.S -@@ -30,17 +30,24 @@ - - /* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */ - -+#ifdef __USER_LABEL_PREFIX__ -+#define CONCAT1(a, b) CONCAT2(a, b) -+#define CONCAT2(a, b) a ## b -+#define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x) -+#else -+#endif -+ - .macro binfile name file - .p2align 2 -- .globl \name\()_begin --\name\()_begin: -+ .globl SYM(\name\()_begin) -+SYM(\name\()_begin): - .incbin "\file" --\name\()_end: -+SYM(\name\()_end): - .byte 0 - .p2align 2 -- .globl \name\()_len --\name\()_len: -- .int (\name\()_end - \name\()_begin) -+ .globl SYM(\name\()_len) -+SYM(\name\()_len): -+ .int (SYM(\name\()_end) - SYM(\name\()_begin)) - .endm - - .section .rodata --- -2.7.4 - diff --git a/package.bak/wayland/Config.in b/package.bak/wayland/Config.in deleted file mode 100644 index 32718fc2b2..0000000000 --- a/package.bak/wayland/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_WAYLAND - bool "wayland" - depends on !BR2_STATIC_LIBS # dlfcn.h - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_LIBFFI - select BR2_PACKAGE_LIBXML2 - help - Wayland is a project to define a protocol for a compositor - to talk to its clients as well as a library implementation - of the protocol. - - http://wayland.freedesktop.org/ - -comment "wayland needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/wayland/wayland.hash b/package.bak/wayland/wayland.hash deleted file mode 100644 index 9a58c56b48..0000000000 --- a/package.bak/wayland/wayland.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031121.html -sha256 d6b4135cba0188abcb7275513c72dede751d6194f6edc5b82183a3ba8b821ab1 wayland-1.12.0.tar.xz diff --git a/package.bak/wayland/wayland.mk b/package.bak/wayland/wayland.mk deleted file mode 100644 index a86239437c..0000000000 --- a/package.bak/wayland/wayland.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# wayland -# -################################################################################ - -WAYLAND_VERSION = 1.12.0 -WAYLAND_SITE = http://wayland.freedesktop.org/releases -WAYLAND_SOURCE = wayland-$(WAYLAND_VERSION).tar.xz -WAYLAND_LICENSE = MIT -WAYLAND_LICENSE_FILES = COPYING -WAYLAND_INSTALL_STAGING = YES -WAYLAND_DEPENDENCIES = host-pkgconf host-wayland expat libffi libxml2 -HOST_WAYLAND_DEPENDENCIES = host-pkgconf host-expat host-libffi host-libxml2 - -# wayland-scanner is only needed for building, not on the target -WAYLAND_CONF_OPTS = --disable-scanner --with-host-scanner - -# Remove the DTD from the target, it's not needed at runtime -define WAYLAND_TARGET_CLEANUP - rm -rf $(TARGET_DIR)/usr/share/wayland -endef -WAYLAND_POST_INSTALL_TARGET_HOOKS += WAYLAND_TARGET_CLEANUP - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/webkitgtk/0001-fix-gcc6-builds.patch b/package.bak/webkitgtk/0001-fix-gcc6-builds.patch deleted file mode 100644 index 35487ad55a..0000000000 --- a/package.bak/webkitgtk/0001-fix-gcc6-builds.patch +++ /dev/null @@ -1,53 +0,0 @@ -[CMake] Build failure with GCC 6 (fatal error: stdlib.h: No such file or directory) - -https://bugs.webkit.org/show_bug.cgi?id=161697 - -Reviewed by Michael Catanzaro. - -Get the list of system includes from GCC and add it to the CMake -list of implicit includes. This way, CMake will filter any of this -directories from the list of includes when calling the compiler. - -This avoids an issue with GCC 6 that causes build failures when -including the default include path as a system include (-isystem). - -Upstream, from: https://trac.webkit.org/changeset/205672 - -Signed-off-by: Gustavo Zacarias - -Index: trunk/Source/cmake/OptionsCommon.cmake -=================================================================== ---- trunk/Source/cmake/OptionsCommon.cmake (revision 204084) -+++ trunk/Source/cmake/OptionsCommon.cmake (revision 205672) -@@ -36,4 +36,31 @@ - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics") -+endif () -+ -+# Ensure that the default include system directories are added to the list of CMake implicit includes. -+# This workarounds an issue that happens when using GCC 6 and using system includes (-isystem). -+# For more details check: https://bugs.webkit.org/show_bug.cgi?id=161697 -+macro(DETERMINE_GCC_SYSTEM_INCLUDE_DIRS _lang _compiler _flags _result) -+ file(WRITE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy" "\n") -+ separate_arguments(_buildFlags UNIX_COMMAND "${_flags}") -+ execute_process(COMMAND ${_compiler} ${_buildFlags} -v -E -x ${_lang} -dD dummy -+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/CMakeFiles OUTPUT_QUIET -+ ERROR_VARIABLE _gccOutput) -+ file(REMOVE "${CMAKE_BINARY_DIR}/CMakeFiles/dummy") -+ if ("${_gccOutput}" MATCHES "> search starts here[^\n]+\n *(.+) *\n *End of (search) list") -+ set(${_result} ${CMAKE_MATCH_1}) -+ string(REPLACE "\n" " " ${_result} "${${_result}}") -+ separate_arguments(${_result}) -+ endif () -+endmacro() -+ -+if (CMAKE_COMPILER_IS_GNUCC) -+ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c" "${CMAKE_C_COMPILER}" "${CMAKE_C_FLAGS}" SYSTEM_INCLUDE_DIRS) -+ set(CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) -+endif () -+ -+if (CMAKE_COMPILER_IS_GNUCXX) -+ DETERMINE_GCC_SYSTEM_INCLUDE_DIRS("c++" "${CMAKE_CXX_COMPILER}" "${CMAKE_CXX_FLAGS}" SYSTEM_INCLUDE_DIRS) -+ set(CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES ${CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES} ${SYSTEM_INCLUDE_DIRS}) - endif () - diff --git a/package.bak/webkitgtk/Config.in b/package.bak/webkitgtk/Config.in deleted file mode 100644 index 25f6fad49c..0000000000 --- a/package.bak/webkitgtk/Config.in +++ /dev/null @@ -1,77 +0,0 @@ -config BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - bool - # ARM needs BLX, so v5t+, BE completely untested so disabled - default y if BR2_arm && !BR2_ARM_CPU_ARMV4 - default y if BR2_i386 || BR2_x86_64 - # Disabled on MIPS big endian due to sigbus - default y if BR2_mipsel || BR2_mips64el - # Disabled on PowerPC pending runtime testing - # Disabled on SuperH because of segfault - depends on BR2_USE_MMU # libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - -comment "webkitgtk needs libgtk3 and a glibc toolchain w/ C++, gcc >= 4.9" - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - depends on !BR2_PACKAGE_LIBGTK3 || !BR2_INSTALL_LIBSTDCPP || \ - !BR2_TOOLCHAIN_USES_GLIBC || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on BR2_USE_MMU - -config BR2_PACKAGE_WEBKITGTK - bool "webkitgtk" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on BR2_TOOLCHAIN_USES_GLIBC - depends on BR2_PACKAGE_LIBGTK3 - depends on BR2_PACKAGE_WEBKITGTK_ARCH_SUPPORTS - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_ENCHANT - select BR2_PACKAGE_HARFBUZZ - select BR2_PACKAGE_ICU - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBSECRET - select BR2_PACKAGE_LIBSOUP - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_SQLITE - select BR2_PACKAGE_WEBP - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXRENDER if BR2_PACKAGE_LIBGTK3_X11 - select BR2_PACKAGE_XLIB_LIBXT if BR2_PACKAGE_LIBGTK3_X11 - help - WebKit is an open source, standards compliant web browser engine. - - http://www.webkitgtk.org/ - -if BR2_PACKAGE_WEBKITGTK - -config BR2_PACKAGE_WEBKITGTK_HTTPS - bool "HTTPS support" - select BR2_PACKAGE_CA_CERTIFICATES # runtime - select BR2_PACKAGE_LIBSOUP_SSL - help - Enable HTTPS protocol support. - -config BR2_PACKAGE_WEBKITGTK_MULTIMEDIA - bool "multimedia support" - select BR2_PACKAGE_GSTREAMER1 - select BR2_PACKAGE_GST1_PLUGINS_BASE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ALSA - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_APP - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_AUDIORESAMPLE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_PLAYBACK - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOCONVERT - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VIDEOSCALE - select BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_VOLUME - select BR2_PACKAGE_GST1_PLUGINS_GOOD - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_ISOMP4 - select BR2_PACKAGE_GST1_PLUGINS_GOOD_PLUGIN_RTSP - select BR2_PACKAGE_GST1_LIBAV - help - This option pulls in all of the required dependencies - to enable multimedia (video/audio) support. - -endif diff --git a/package.bak/webkitgtk/webkitgtk.hash b/package.bak/webkitgtk/webkitgtk.hash deleted file mode 100644 index f01c7f0c07..0000000000 --- a/package.bak/webkitgtk/webkitgtk.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.webkitgtk.org/releases/webkitgtk-2.12.5.tar.xz.sha1 -sha1 2d73fd5b47c68c73aea8b3d7b88acc8e62bdb99c webkitgtk-2.12.5.tar.xz -# Calculated based on the hash above -sha256 6b147854b864a5f115fadb97b2b6200b2f696db015216a34e7298d11c88b1c40 webkitgtk-2.12.5.tar.xz diff --git a/package.bak/webkitgtk/webkitgtk.mk b/package.bak/webkitgtk/webkitgtk.mk deleted file mode 100644 index 7843373995..0000000000 --- a/package.bak/webkitgtk/webkitgtk.mk +++ /dev/null @@ -1,89 +0,0 @@ -################################################################################ -# -# webkitgtk -# -################################################################################ - -WEBKITGTK_VERSION = 2.12.5 -WEBKITGTK_SITE = http://www.webkitgtk.org/releases -WEBKITGTK_SOURCE = webkitgtk-$(WEBKITGTK_VERSION).tar.xz -WEBKITGTK_INSTALL_STAGING = YES -WEBKITGTK_LICENSE = LGPLv2.1+, BSD-2c -WEBKITGTK_LICENSE_FILES = \ - Source/WebCore/LICENSE-APPLE \ - Source/WebCore/LICENSE-LGPL-2.1 -WEBKITGTK_DEPENDENCIES = host-ruby host-flex host-bison host-gperf \ - enchant harfbuzz icu jpeg libgtk3 libsecret libsoup \ - libxml2 libxslt sqlite webp -WEBKITGTK_CONF_OPTS = \ - -DENABLE_API_TESTS=OFF \ - -DENABLE_GEOLOCATION=OFF \ - -DENABLE_GTKDOC=OFF \ - -DENABLE_INTROSPECTION=OFF \ - -DENABLE_MINIBROWSER=ON \ - -DENABLE_SPELLCHECK=ON \ - -DPORT=GTK \ - -DUSE_LIBNOTIFY=OFF \ - -DUSE_LIBHYPHEN=OFF - -# ARM needs NEON for JIT -# i386 & x86_64 don't seem to have any special requirements -ifeq ($(BR2_ARM_CPU_HAS_NEON)$(BR2_i386)$(BR2_x86_64),y) -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=ON -else -WEBKITGTK_CONF_OPTS += -DENABLE_JIT=OFF -endif - -ifeq ($(BR2_PACKAGE_WEBKITGTK_MULTIMEDIA),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_VIDEO=ON \ - -DENABLE_WEB_AUDIO=ON -WEBKITGTK_DEPENDENCIES += gstreamer1 gst1-libav gst1-plugins-base gst1-plugins-good -else -WEBKITGTK_CONF_OPTS += \ - -DENABLE_VIDEO=OFF \ - -DENABLE_WEB_AUDIO=OFF -endif - -# Only one target platform can be built, assume X11 > Wayland - -# GTK3-X11 target gives OpenGL from newer libgtk3 versions -# Consider this better than EGL + maybe GLESv2 since both can't be built -# 2D CANVAS acceleration requires OpenGL proper with cairo-gl -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_ACCELERATED_2D_CANVAS=ON \ - -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=ON \ - -DENABLE_X11_TARGET=ON -WEBKITGTK_DEPENDENCIES += libgl \ - xlib_libXcomposite xlib_libXdamage xlib_libXrender xlib_libXt -# It can use libgtk2 for npapi plugins -ifeq ($(BR2_PACKAGE_LIBGTK2),y) -WEBKITGTK_CONF_OPTS += -DENABLE_PLUGIN_PROCESS_GTK2=ON -WEBKITGTK_DEPENDENCIES += libgtk2 -else -WEBKITGTK_CONF_OPTS += -DENABLE_PLUGIN_PROCESS_GTK2=OFF -endif -else # !X11 -# GTK3-BROADWAY/WAYLAND needs at least EGL -WEBKITGTK_DEPENDENCIES += libegl -# GLESv2 support is optional though -ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=ON \ - -DENABLE_OPENGL=ON -WEBKITGTK_DEPENDENCIES += libgles -else -# Disable general OpenGL (shading) if there's no GLESv2 -WEBKITGTK_CONF_OPTS += \ - -DENABLE_GLES2=OFF \ - -DENABLE_OPENGL=OFF -endif -# We must explicitly state the wayland target -ifeq ($(BR2_PACKAGE_LIBGTK3_WAYLAND),y) -WEBKITGTK_CONF_OPTS += -DENABLE_WAYLAND_TARGET=ON -endif -endif - -$(eval $(cmake-package)) diff --git a/package.bak/webp/Config.in b/package.bak/webp/Config.in deleted file mode 100644 index 646eb9ef5a..0000000000 --- a/package.bak/webp/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_WEBP - bool "webp" - help - WebP is a new image format that provides lossless and lossy - compression for images on the web - - https://developers.google.com/speed/webp/ - -if BR2_PACKAGE_WEBP - -config BR2_PACKAGE_WEBP_DEMUX - bool "webpdemux" - help - Demux is a part of WebPMux for extraction and manipulation - of an extended format WebP file, which can have features - like color profile, metadata and animation. - -endif diff --git a/package.bak/webp/webp.hash b/package.bak/webp/webp.hash deleted file mode 100644 index bf4ee8fbf9..0000000000 --- a/package.bak/webp/webp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 b75310c810b3eda222c77f6d6c26b061240e3d9060095de44b2c1bae291ecdef libwebp-0.5.2.tar.gz diff --git a/package.bak/webp/webp.mk b/package.bak/webp/webp.mk deleted file mode 100644 index d579d56c5e..0000000000 --- a/package.bak/webp/webp.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# webp -# -################################################################################ - -WEBP_VERSION = 0.5.2 -WEBP_SOURCE = libwebp-$(WEBP_VERSION).tar.gz -WEBP_SITE = http://downloads.webmproject.org/releases/webp -WEBP_LICENSE = BSD-3c -WEBP_LICENSE_FILES = COPYING -WEBP_INSTALL_STAGING = YES - -WEBP_CONF_OPTS += \ - --with-jpegincludedir=$(STAGING_DIR)/usr/include \ - --with-jpeglibdir=$(STAGING_DIR)/usr/lib \ - --with-tiffincludedir=$(STAGING_DIR)/usr/include \ - --with-tifflibdir=$(STAGING_DIR)/usr/lib - -ifeq ($(BR2_PACKAGE_WEBP_DEMUX),y) -WEBP_CONF_OPTS += --enable-libwebpdemux -else -WEBP_CONF_OPTS += --disable-libwebpdemux -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WEBP_DEPENDENCIES += libpng -WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=$(STAGING_DIR)/usr/bin/libpng-config -else -WEBP_CONF_ENV += ac_cv_path_LIBPNG_CONFIG=/bin/false -endif - -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_JPEG),jpeg) -WEBP_DEPENDENCIES += $(if $(BR2_PACKAGE_TIFF),tiff) - -$(eval $(autotools-package)) diff --git a/package.bak/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch b/package.bak/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch deleted file mode 100644 index d0ea4bd6bd..0000000000 --- a/package.bak/webrtc-audio-processing/0001-configure.ac-fix-architecture-detection.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 233413841882608c6d5b98b6ce89fcb8a292db82 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 Aug 2016 10:22:34 +0200 -Subject: [PATCH] configure.ac: fix architecture detection - -The current architecture detection, based on the "host_cpu" part of the -tuple does not work properly for a number of reason: - - - The code assumes that if host_cpu starts with "arm" then ARM - instructions are available, which is incorrect. Indeed, Cortex-M - platforms can run Linux, they are ARM platforms (so host_cpu = arm), - but they don't support ARM instructions: they support only the - Thumb-2 instruction set. - - - The armv7 case is also not very useful, as it is not standard at all - to pass armv7 as host_cpu even if the host system is actually ARMv7 - based. - - - For the same reason, the armv8 case is not very useful: armv8 is - never used as the host_cpu part of a tuple. - -So, this commit moves away from a host_cpu based logic, and instead -tests using AC_CHECK_DECLS() the built-in definitions of the compiler: - - - If we have __ARM_ARCH_ISA_ARM defined, then it's an ARM processor - that supports the ARM instruction set (this allows to exclude Thumb-2 - only processors). - - - If we have __ARM_ARCH_7A__, then we have an ARMv7-A processor, and - we can enable the corresponding optimizations - - - Same for __i386__ and __x86_64__. - -Signed-off-by: Thomas Petazzoni ---- -Submitted upstream, under a slightly different form so that it applies -on master: - - https://lists.freedesktop.org/archives/pulseaudio-discuss/2016-August/026600.html ---- - configure.ac | 27 +++++++++------------------ - 1 file changed, 9 insertions(+), 18 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6f9553b..836c6ad 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,24 +55,15 @@ AS_CASE(["${host}"], - ) - AC_SUBST(PLATFORM_CFLAGS) - --AS_CASE(["${host_cpu}"], -- [i?86|x86_64], -- [ -- HAVE_X86=1 -- ], -- [armv7*|armv8*], -- [ -- HAVE_ARM=1 -- HAVE_ARMV7=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM -DWEBRTC_ARCH_ARM_V7" -- ], -- [arm*], -- [ -- HAVE_ARM=1 -- ARCH_CFLAGS="-DWEBRTC_ARCH_ARM" -- ] -- # FIXME: Add MIPS support, see webrtc/BUILD.gn for defines --) -+# Testing __ARM_ARCH_ISA_ARM since the code contains ARM instructions, -+# which don't work on Thumb-2 only platforms (ARMv7-M). -+AC_CHECK_DECLS([__ARM_ARCH_ISA_ARM], -+ [HAVE_ARM=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM"]) -+AC_CHECK_DECLS([__ARM_ARCH_7A__], -+ [HAVE_ARMV7=1; ARCH_CFLAGS="${ARCH_CFLAGS} -DWEBRTC_ARCH_ARM_V7"]) -+AC_CHECK_DECLS([__i386__], [HAVE_X86=1]) -+AC_CHECK_DECLS([__x86_64__], [HAVE_X86=1]) -+ - AM_CONDITIONAL(HAVE_X86, [test "x${HAVE_X86}" = "x1"]) - AM_CONDITIONAL(HAVE_ARM, [test "x${HAVE_ARM}" = "x1"]) - AM_CONDITIONAL(HAVE_ARMV7, [test "x${HAVE_ARMV7}" = "x1"]) --- -2.7.4 - diff --git a/package.bak/webrtc-audio-processing/0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch b/package.bak/webrtc-audio-processing/0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch deleted file mode 100644 index a0332db8e7..0000000000 --- a/package.bak/webrtc-audio-processing/0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch +++ /dev/null @@ -1,63 +0,0 @@ -From b7a166acaddc4c78afa2b653e25114d9114699f3 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 6 Aug 2016 11:24:50 +0200 -Subject: [PATCH] Proper detection of cxxabi.h and execinfo.h - -The current code in webrtc/base/checks.cc assumes that if __GLIBCXX__ is -defined and __UCLIBC__ is not defined, then both cxxabi.h and execinfo.h -will be available. - -Unfortunately, this is not correct with the musl C library: - - - It defines __GLIBCXX__ - - It does not define __UCLIBC__ (it's not uClibc after all!) - - But it also doesn't provide execinfo.h - -Therefore, in order to make things work properly, we switch to proper -autoconf checks for cxxabi.h and execinfo.h, and only use the backtrace -functionality if both are provided. - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 ++ - webrtc/base/checks.cc | 4 ++-- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index acbb3e2..ff4c752 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -45,6 +45,8 @@ AC_SUBST(GNUSTL_CFLAGS) - # Borrowed from gst-plugins-bad - AC_CHECK_HEADER(MobileCoreServices/MobileCoreServices.h, HAVE_IOS="yes", HAVE_IOS="no", [-]) - -+AC_CHECK_HEADERS([cxxabi.h execinfo.h]) -+ - # Based on gst-plugins-bad configure.ac and defines in - # /build/config/BUILDCONFIG.gn and - # webrtc/BUILD.gn -diff --git a/webrtc/base/checks.cc b/webrtc/base/checks.cc -index 49a31f2..05d23a6 100644 ---- a/webrtc/base/checks.cc -+++ b/webrtc/base/checks.cc -@@ -16,7 +16,7 @@ - #include - #include - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(HAVE_CXX_ABI_H) && defined(HAVE_EXECINFO_H) - #include - #include - #endif -@@ -55,7 +55,7 @@ void PrintError(const char* format, ...) { - // to get usable symbols on Linux. This is copied from V8. Chromium has a more - // advanced stace trace system; also more difficult to copy. - void DumpBacktrace() { --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(HAVE_CXX_ABI_H) && defined(HAVE_EXECINFO_H) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); --- -2.7.4 - diff --git a/package.bak/webrtc-audio-processing/Config.in b/package.bak/webrtc-audio-processing/Config.in deleted file mode 100644 index 02715b080a..0000000000 --- a/package.bak/webrtc-audio-processing/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS - bool - default y if BR2_arm || BR2_i386 || BR2_x86_64 - -config BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING - bool "webrtc-audio-processing" - depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 - # pthread_condattr_setclock - depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL - help - AudioProcessing library based on Google's implementation of - WebRTC. - - http://freedesktop.org/software/pulseaudio/webrtc-audio-processing/ - -comment "webrtc-audio-processing needs a toolchain w/ C++, NPTL, gcc >= 4.8" - depends on BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING_ARCH_SUPPORTS - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS_NPTL \ - || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 diff --git a/package.bak/webrtc-audio-processing/webrtc-audio-processing.hash b/package.bak/webrtc-audio-processing/webrtc-audio-processing.hash deleted file mode 100644 index fe07119160..0000000000 --- a/package.bak/webrtc-audio-processing/webrtc-audio-processing.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 756e291d4f557d88cd50c4fe3b8454ec238362d22cedb3e6173240d90f0a80fa webrtc-audio-processing-0.3.tar.xz diff --git a/package.bak/webrtc-audio-processing/webrtc-audio-processing.mk b/package.bak/webrtc-audio-processing/webrtc-audio-processing.mk deleted file mode 100644 index 75e3c88374..0000000000 --- a/package.bak/webrtc-audio-processing/webrtc-audio-processing.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# webrtc-audio-processing -# -################################################################################ - -WEBRTC_AUDIO_PROCESSING_VERSION = 0.3 -WEBRTC_AUDIO_PROCESSING_SOURCE = webrtc-audio-processing-$(WEBRTC_AUDIO_PROCESSING_VERSION).tar.xz -WEBRTC_AUDIO_PROCESSING_SITE = http://freedesktop.org/software/pulseaudio/webrtc-audio-processing -WEBRTC_AUDIO_PROCESSING_INSTALL_STAGING = YES -WEBRTC_AUDIO_PROCESSING_LICENSE = BSD-3c -WEBRTC_AUDIO_PROCESSING_LICENSE_FILES = COPYING -# 0001-configure.ac-fix-architecture-detection.patch -# 0002-Proper-detection-of-cxxabi.h-and-execinfo.h.patch -WEBRTC_AUDIO_PROCESSING_AUTORECONF = YES - -ifeq ($(BR2_SOFT_FLOAT),y) -WEBRTC_AUDIO_PROCESSING_CONF_OPTS += --with-ns-mode=fixed -endif - -$(eval $(autotools-package)) diff --git a/package.bak/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch b/package.bak/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch deleted file mode 100644 index a7f2a34a88..0000000000 --- a/package.bak/weston/0001-os-compatibility-define-CLOCK_BOOTTIME-when-not-avai.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 66b71951f8ce66f02040f8814e1d89db34c34a87 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 22 Feb 2015 12:36:00 +0100 -Subject: [PATCH] os-compatibility: define CLOCK_BOOTTIME when not available - -CLOCK_BOOTTIME is supposed to be provided by the C library headers, -but uClibc 0.9.33.2 does not provide it. Instead of depending on an -uClibc patch, let's make Weston define it to the right value when not -already defined by the C library. - -Signed-off-by: Thomas Petazzoni ---- - shared/os-compatibility.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/shared/os-compatibility.h b/shared/os-compatibility.h -index 172bb7e..e369899 100644 ---- a/shared/os-compatibility.h -+++ b/shared/os-compatibility.h -@@ -26,6 +26,7 @@ - #include "config.h" - - #include -+#include - - #ifdef HAVE_EXECINFO_H - #include -@@ -37,6 +38,10 @@ backtrace(void **buffer, int size) - } - #endif - -+#ifndef CLOCK_BOOTTIME -+#define CLOCK_BOOTTIME 7 -+#endif -+ - int - os_socketpair_cloexec(int domain, int type, int protocol, int *sv); - --- -2.1.0 - diff --git a/package.bak/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch b/package.bak/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch deleted file mode 100644 index baa3a4fc84..0000000000 --- a/package.bak/weston/0002-shared-platform-include-weston-egl-ext.h-only-if-ENA.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e338ced1e04bf4b97322d5eed2b5bdf5b052095a Mon Sep 17 00:00:00 2001 -From: Krzysztof Konopko -Date: Thu, 15 Sep 2016 13:01:49 +0200 -Subject: [PATCH] shared/platform: include weston-egl-ext.h only if ENABLE_EGL - is defined - -Including `weston-egl-ext.h` causes compilation failure for configurations -with EGL disabled. - -Verified with `--disable-egl`, `--disable-x11-compositor` -and `--disable-drm-compositor`. - -Signed-off-by: Krzysztof Konopko -Reviewed-by: Pekka Paalanen -[yann.morin.1998@free.fr: backported from upstream] -Signed-off-by: "Yann E. MORIN" ---- - shared/platform.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/shared/platform.h b/shared/platform.h -index 1eb96fd..30db1a6 100644 ---- a/shared/platform.h -+++ b/shared/platform.h -@@ -33,9 +33,9 @@ - #include - #include - #include --#endif - - #include "weston-egl-ext.h" -+#endif - - #ifdef __cplusplus - extern "C" { --- -2.7.4 - diff --git a/package.bak/weston/0003-configure-search-for-lib-with-clock_getres.patch b/package.bak/weston/0003-configure-search-for-lib-with-clock_getres.patch deleted file mode 100644 index a8ad9eaa0b..0000000000 --- a/package.bak/weston/0003-configure-search-for-lib-with-clock_getres.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e269012c4b919624ca92d80afd1d6a6f5399e041 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Mon, 19 Dec 2016 18:07:07 +0100 -Subject: [PATCH] configure: search for lib with clock_getres() - -Like clock_gettime(), clock_getres() is in -lrt for glibc < 2.17. -Add a check for it, like is done for clock_gettime(). - -Signed-off-by: "Yann E. MORIN" ---- -Upstream status: submitted -https://lists.freedesktop.org/archives/wayland-devel/2016-December/032354.html ---- - Makefile.am | 1 + - configure.ac | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 2219e3d..53f8f51 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -190,6 +190,7 @@ weston_CFLAGS = $(AM_CFLAGS) $(COMPOSITOR_CFLAGS) $(LIBUNWIND_CFLAGS) - weston_LDADD = libshared.la libweston-@LIBWESTON_MAJOR@.la \ - $(COMPOSITOR_LIBS) $(LIBUNWIND_LIBS) \ - $(DLOPEN_LIBS) $(LIBINPUT_BACKEND_LIBS) \ -+ $(CLOCK_GETRES_LIBS) \ - -lm - - weston_SOURCES = \ -diff --git a/configure.ac b/configure.ac -index 1e251bf..604f51b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -88,8 +88,9 @@ PKG_PROG_PKG_CONFIG() - - WESTON_SEARCH_LIBS([DLOPEN], [dl], [dlopen]) - --# In old glibc versions (< 2.17) clock_gettime() is in librt -+# In old glibc versions (< 2.17) clock_gettime() and clock_getres() are in librt - WESTON_SEARCH_LIBS([CLOCK_GETTIME], [rt], [clock_gettime]) -+WESTON_SEARCH_LIBS([CLOCK_GETRES], [rt], [clock_getres]) - - AC_CHECK_DECL(SFD_CLOEXEC,[], - [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile weston")], --- -2.7.4 - diff --git a/package.bak/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch b/package.bak/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch deleted file mode 100644 index 9012f5f31f..0000000000 --- a/package.bak/weston/0004-libweston-include-weston-egl-ext.h-in-drm-x11-and-wa.patch +++ /dev/null @@ -1,58 +0,0 @@ -From c950667e87dc175bd2741a51460ebd3e29a57c92 Mon Sep 17 00:00:00 2001 -From: Vincent Abriou -Date: Wed, 5 Oct 2016 16:14:07 +0200 -Subject: [PATCH] libweston: include weston-egl-ext.h in drm, x11 and wayland - compositor - -As to what is done for gl-renderer.c, weston-egl-ext.h should be -include in compositor-drm.c, compositor-x11.c and compositor-wayland.c. -This fix building issue with GPU that does not have EGL_PLATFORM_xxx_KHR -in their extension header file eglext.h. - -Signed-off-by: Vincent Abriou -Reviewed-by: Daniel Stone ---- - libweston/compositor-drm.c | 1 + - libweston/compositor-wayland.c | 1 + - libweston/compositor-x11.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/libweston/compositor-drm.c b/libweston/compositor-drm.c -index 567240f..f61e3d9 100644 ---- a/libweston/compositor-drm.c -+++ b/libweston/compositor-drm.c -@@ -52,6 +52,7 @@ - #include "shared/helpers.h" - #include "shared/timespec-util.h" - #include "gl-renderer.h" -+#include "weston-egl-ext.h" - #include "pixman-renderer.h" - #include "libbacklight.h" - #include "libinput-seat.h" -diff --git a/libweston/compositor-wayland.c b/libweston/compositor-wayland.c -index 580c7b5..46fdde1 100644 ---- a/libweston/compositor-wayland.c -+++ b/libweston/compositor-wayland.c -@@ -44,6 +44,7 @@ - #include "compositor.h" - #include "compositor-wayland.h" - #include "gl-renderer.h" -+#include "weston-egl-ext.h" - #include "pixman-renderer.h" - #include "shared/helpers.h" - #include "shared/image-loader.h" -diff --git a/libweston/compositor-x11.c b/libweston/compositor-x11.c -index dadcd10..1c6de08 100644 ---- a/libweston/compositor-x11.c -+++ b/libweston/compositor-x11.c -@@ -56,6 +56,7 @@ - #include "shared/helpers.h" - #include "shared/image-loader.h" - #include "gl-renderer.h" -+#include "weston-egl-ext.h" - #include "pixman-renderer.h" - #include "presentation-time-server-protocol.h" - #include "linux-dmabuf.h" --- -2.7.4 - diff --git a/package.bak/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch b/package.bak/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch deleted file mode 100644 index 6a5b19263a..0000000000 --- a/package.bak/weston/0005-libweston-fix-building-issue-when-EGL-support-is-not.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 7327d5a7a29ad31af871e144ebe053cb1ab478f7 Mon Sep 17 00:00:00 2001 -From: Vincent Abriou -Date: Tue, 11 Oct 2016 13:47:03 +0200 -Subject: [PATCH] libweston: fix building issue when EGL support is not enabled - -weston-egl-ext.h has been include in compositor-xx.c file in order to -define EGL_PLATFORM_xxx_KHR extensions used by the compositors. -But in case EGL support is not enabled, all EGL related definition must -be skipped except EGL_PLATFORM_xxx_KHR that must be still defined to -allow compositor-xx.c to build. - -Signed-off-by: Vincent Abriou -Reviewed-by: Giulio Camuffo ---- - libweston/weston-egl-ext.h | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/libweston/weston-egl-ext.h b/libweston/weston-egl-ext.h -index 6e36996..70556fd 100644 ---- a/libweston/weston-egl-ext.h -+++ b/libweston/weston-egl-ext.h -@@ -28,6 +28,8 @@ - #ifndef WESTON_EGL_EXT_H - #define WESTON_EGL_EXT_H - -+#ifdef ENABLE_EGL -+ - #ifndef EGL_WL_bind_wayland_display - #define EGL_WL_bind_wayland_display 1 - -@@ -152,5 +154,13 @@ typedef EGLSurface (EGLAPIENTRYP PFNEGLCREATEPLATFORMPIXMAPSURFACEEXTPROC) (EGLD - #define EGL_PLATFORM_X11_KHR 0x31D5 - #endif - -+#else /* ENABLE_EGL */ -+ -+/* EGL platform definition are keept to allow compositor-xx.c to build */ -+#define EGL_PLATFORM_GBM_KHR 0x31D7 -+#define EGL_PLATFORM_WAYLAND_KHR 0x31D8 -+#define EGL_PLATFORM_X11_KHR 0x31D5 -+ -+#endif /* ENABLE_EGL */ - - #endif --- -2.7.4 - diff --git a/package.bak/weston/0006-tests-add-missing-include.patch b/package.bak/weston/0006-tests-add-missing-include.patch deleted file mode 100644 index 67dc3df258..0000000000 --- a/package.bak/weston/0006-tests-add-missing-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c9e149d641a9945c3a8e15707b8712834f08c4f Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 22 Jan 2017 14:46:28 +0100 -Subject: [PATCH] tests: add missing include - -The int32_t type is defined in stdint.h. - -The musl C library is very conservative in the headers that it -internally includes, and stdint.h is not included by any other header, -unlike with glibc or uClibc, which breaks the build. - -Add the missing header. - -Signed-off-by: "Yann E. MORIN" ---- -Status: sent upstream - https://lists.freedesktop.org/archives/wayland-devel/2017-January/032771.html ---- - tests/string-test.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tests/string-test.c b/tests/string-test.c -index a72ec30..5571b52 100644 ---- a/tests/string-test.c -+++ b/tests/string-test.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #include "shared/string-helpers.h" --- -2.7.4 - diff --git a/package.bak/weston/Config.in b/package.bak/weston/Config.in deleted file mode 100644 index b4e198d8f0..0000000000 --- a/package.bak/weston/Config.in +++ /dev/null @@ -1,107 +0,0 @@ -comment "weston needs udev and a toolchain w/ locale, threads, dynamic library, headers >= 3.0" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 || BR2_STATIC_LIBS || \ - !BR2_ENABLE_LOCALE - -config BR2_PACKAGE_WESTON - bool "weston" - select BR2_PACKAGE_WAYLAND - select BR2_PACKAGE_WAYLAND_PROTOCOLS - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_CAIRO_PNG - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_MTDEV - select BR2_PACKAGE_LIBINPUT - depends on BR2_ENABLE_LOCALE # libinput - depends on BR2_PACKAGE_HAS_UDEV - depends on !BR2_STATIC_LIBS # wayland - depends on BR2_TOOLCHAIN_HAS_THREADS # wayland - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 - # Runtime dependency - select BR2_PACKAGE_XKEYBOARD_CONFIG - # Make sure at least one compositor is selected. - select BR2_PACKAGE_WESTON_FBDEV if !BR2_PACKAGE_WESTON_HAS_COMPOSITOR - help - Weston is the reference implementation of a Wayland - compositor, and a useful compositor in its own right. - Weston has various backends that lets it run on Linux kernel - modesetting and evdev input as well as under X11. - - http://wayland.freedesktop.org/ - -if BR2_PACKAGE_WESTON - -# Helper to make sure at least one compositor is selected. -config BR2_PACKAGE_WESTON_HAS_COMPOSITOR - bool - -config BR2_PACKAGE_WESTON_DRM - bool "DRM compositor" - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR - -# Uses libgbm from mesa3d -comment "DRM compositor needs an OpenGL EGL backend provided by mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL - -config BR2_PACKAGE_WESTON_FBDEV - bool "fbdev compositor" - -# FreeRDP needs threads and !static, already the case for weston -config BR2_PACKAGE_WESTON_RDP - bool "RDP compositor" - depends on BR2_USE_MMU # freerdp, libglib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_WCHAR # freerdp - depends on BR2_INSTALL_LIBSTDCPP # freerdp - select BR2_PACKAGE_FREERDP - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR - help - This enables the RDP backend, which allows accessing weston - through the network with any RDP-compliant client. - - Please note that one must pass those options to weston for RDP - to be functional: - --rdp-tls-cert=/path/to/server.crt - --rdp-tls-key=/path/to/server.key - - By default, Buildroot installs such files in /etc/freerdp/server/ - so you may want to change them in a post-build script or a rootfs - overlay. - -comment "RDP compositor needs a toolchain w/ wchar, C++" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_WESTON_X11 - bool "X11 compositor" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_WESTON_HAS_COMPOSITOR - -comment "X11 compositor needs X.org enabled" - depends on !BR2_PACKAGE_XORG7 - -config BR2_PACKAGE_WESTON_XWAYLAND - bool "XWayland support" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_LIBEPOXY - select BR2_PACKAGE_CAIRO - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXCURSOR - -comment "XWayland support needs libepoxy and X.org enabled" - depends on !BR2_PACKAGE_XORG7 || !BR2_PACKAGE_LIBEPOXY - -config BR2_PACKAGE_WESTON_DEMO_CLIENTS - bool "demo clients" - help - This enables the installation of Weston's demo clients. - -endif diff --git a/package.bak/weston/weston.hash b/package.bak/weston/weston.hash deleted file mode 100644 index c966864036..0000000000 --- a/package.bak/weston/weston.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/wayland-devel/2016-September/031123.html -sha256 ac7ac2a32e3b9f50131fccded5d2326bd36b2226712d90b61999118a09af5033 weston-1.12.0.tar.xz diff --git a/package.bak/weston/weston.mk b/package.bak/weston/weston.mk deleted file mode 100644 index 9bd127c6d0..0000000000 --- a/package.bak/weston/weston.mk +++ /dev/null @@ -1,145 +0,0 @@ -################################################################################ -# -# weston -# -################################################################################ - -WESTON_VERSION = 1.12.0 -WESTON_SITE = http://wayland.freedesktop.org/releases -WESTON_SOURCE = weston-$(WESTON_VERSION).tar.xz -WESTON_LICENSE = MIT -WESTON_LICENSE_FILES = COPYING -# configure.ac patched by 0003-configure-search-for-lib-with-clock_getres.patch -WESTON_AUTORECONF = YES - -WESTON_DEPENDENCIES = host-pkgconf wayland wayland-protocols \ - libxkbcommon pixman libpng jpeg mtdev udev cairo libinput \ - $(if $(BR2_PACKAGE_WEBP),webp) - -WESTON_CONF_OPTS = \ - --with-dtddir=$(STAGING_DIR)/usr/share/wayland \ - --disable-headless-compositor \ - --disable-colord \ - --disable-devdocs \ - --disable-setuid-install - -WESTON_MAKE_OPTS = \ - WAYLAND_PROTOCOLS_DATADIR=$(STAGING_DIR)/usr/share/wayland-protocols - -# Uses VIDIOC_EXPBUF, only available from 3.8+ -ifeq ($(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_8),) -WESTON_CONF_OPTS += --disable-simple-dmabuf-v4l-client -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -WESTON_CONF_OPTS += --enable-dbus -WESTON_DEPENDENCIES += dbus -else -WESTON_CONF_OPTS += --disable-dbus -endif - -# weston-launch must be u+s root in order to work properly -ifeq ($(BR2_PACKAGE_LINUX_PAM),y) -define WESTON_PERMISSIONS - /usr/bin/weston-launch f 4755 0 0 - - - - - -endef -define WESTON_USERS - - - weston-launch -1 - - - - Weston launcher group -endef -WESTON_CONF_OPTS += --enable-weston-launch -WESTON_DEPENDENCIES += linux-pam -else -WESTON_CONF_OPTS += --disable-weston-launch -endif - -# Needs wayland-egl, which normally only mesa provides -ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL)$(BR2_PACKAGE_MESA3D_OPENGL_ES),yy) -WESTON_CONF_OPTS += --enable-egl -WESTON_DEPENDENCIES += libegl -else -WESTON_CONF_OPTS += \ - --disable-egl \ - --disable-simple-egl-clients -endif - -ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -WESTON_DEPENDENCIES += libunwind -else -WESTON_CONF_OPTS += --disable-libunwind -endif - -ifeq ($(BR2_PACKAGE_WESTON_RDP),y) -WESTON_DEPENDENCIES += freerdp -WESTON_CONF_OPTS += --enable-rdp-compositor -else -WESTON_CONF_OPTS += --disable-rdp-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_FBDEV),y) -WESTON_CONF_OPTS += \ - --enable-fbdev-compositor \ - WESTON_NATIVE_BACKEND=fbdev-backend.so -else -WESTON_CONF_OPTS += --disable-fbdev-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_DRM),y) -WESTON_CONF_OPTS += \ - --enable-drm-compositor \ - WESTON_NATIVE_BACKEND=drm-backend.so -WESTON_DEPENDENCIES += libdrm -else -WESTON_CONF_OPTS += --disable-drm-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_X11),y) -WESTON_CONF_OPTS += \ - --enable-x11-compositor \ - WESTON_NATIVE_BACKEND=x11-backend.so -WESTON_DEPENDENCIES += libxcb xlib_libX11 -else -WESTON_CONF_OPTS += --disable-x11-compositor -endif - -ifeq ($(BR2_PACKAGE_WESTON_XWAYLAND),y) -WESTON_CONF_OPTS += --enable-xwayland -WESTON_DEPENDENCIES += cairo libepoxy libxcb xlib_libX11 xlib_libXcursor -else -WESTON_CONF_OPTS += --disable-xwayland -endif - -ifeq ($(BR2_PACKAGE_LIBVA),y) -WESTON_CONF_OPTS += --enable-vaapi-recorder -WESTON_DEPENDENCIES += libva -else -WESTON_CONF_OPTS += --disable-vaapi-recorder -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -WESTON_CONF_OPTS += --enable-lcms -WESTON_DEPENDENCIES += lcms2 -else -WESTON_CONF_OPTS += --disable-lcms -endif - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -WESTON_CONF_OPTS += --enable-systemd-login --enable-systemd-notify -WESTON_DEPENDENCIES += systemd -else -WESTON_CONF_OPTS += --disable-systemd-login --disable-systemd-notify -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WESTON_CONF_OPTS += --enable-junit-xml -WESTON_DEPENDENCIES += libxml2 -else -WESTON_CONF_OPTS += --disable-junit-xml -endif - -ifeq ($(BR2_PACKAGE_WESTON_DEMO_CLIENTS),y) -WESTON_CONF_OPTS += --enable-demo-clients-install -else -WESTON_CONF_OPTS += --disable-demo-clients-install -endif - -$(eval $(autotools-package)) diff --git a/package.bak/wf111/Config.in b/package.bak/wf111/Config.in deleted file mode 100644 index cfce8b4c86..0000000000 --- a/package.bak/wf111/Config.in +++ /dev/null @@ -1,36 +0,0 @@ -config BR2_PACKAGE_WF111 - bool "wf111" - depends on BR2_LINUX_KERNEL - depends on BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV7A || BR2_i386 - # Binary tools are distributed alongside the driver, and are - # dynamically linked against the glibc. - depends on BR2_TOOLCHAIN_USES_GLIBC - help - BlueGiga WF111 WiFi driver and utilities. - - Warning: CONFIG_WIRELESS_EXT and CONFIG_WEXT_PRIV must be - selected in the Linux kernel configuration. These are blind - options (i.e. not selectable directly) so they cannot be - enabled by a change in linux/linux.mk. There are two choices - to enable these options: - - By making them non blind, with a "WF111 support" configuration - entry that selects them, for example. - - By enabling another random WiFi driver that select them. - - http://www.bluegiga.com/en-US/products/wifi-modules/wf111-wifi-module/ - -if BR2_PACKAGE_WF111 - -config BR2_PACKAGE_WF111_TARBALL_PATH - string "Local tarball location" - help - The WF111 tarball can be retrieved on the BlueGiga website - after registration. This option specifies the path where the - tarball is locally saved. - -endif - -comment "wf111 needs a glibc toolchain" - depends on BR2_LINUX_KERNEL - depends on BR2_ARM_CPU_ARMV5 || BR2_ARM_CPU_ARMV7A || BR2_i386 - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/wf111/wf111.mk b/package.bak/wf111/wf111.mk deleted file mode 100644 index ad9d89149d..0000000000 --- a/package.bak/wf111/wf111.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# wf111 -# -################################################################################ - -WF111_VERSION = 5.2.2-r2 -WF111_SITE_METHOD = file -WF111_SITE = $(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH)) -WF111_DEPENDENCIES = linux - -ifeq ($(BR2_PACKAGE_WF111)$(call qstrip,$(BR2_PACKAGE_WF111_TARBALL_PATH)),y) -$(error No tarball location specified, check BR2_PACKAGE_WF111_TARBALL_PATH) -endif - -ifeq ($(BR2_ARM_CPU_ARMV7A),y) -WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_armv7-a.tar.gz -else ifeq ($(BR2_ARM_CPU_ARMV5),y) -WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_armv5t.tar.gz -else ifeq ($(BR2_i386),y) -WF111_SOURCE = wf111-linux-driver_$(WF111_VERSION)_x86.tar.gz -endif - -# Due to the stupidity of the package Makefile, we can't invoke -# separately the build step and the install step and get a correct -# behavior. So we do everything in the install step. -define WF111_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PWD=$(@D) \ - $(LINUX_MAKE_FLAGS) KDIR=$(LINUX_DIR) \ - OUTPUT=$(TARGET_DIR) install_static -endef - -$(eval $(generic-package)) diff --git a/package.bak/wget/Config.in b/package.bak/wget/Config.in deleted file mode 100644 index acb20f8f09..0000000000 --- a/package.bak/wget/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_WGET - bool "wget" - # fork() - depends on BR2_USE_MMU - depends on BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - Network utility to retrieve files from http, https and ftp. - - http://www.gnu.org/software/wget/ - -comment "wget needs a toolchain w/ wchar" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/wget/wget.hash b/package.bak/wget/wget.hash deleted file mode 100644 index 5f22396b05..0000000000 --- a/package.bak/wget/wget.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 wget-1.19.1.tar.xz diff --git a/package.bak/wget/wget.mk b/package.bak/wget/wget.mk deleted file mode 100644 index 22e057dbae..0000000000 --- a/package.bak/wget/wget.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# wget -# -################################################################################ - -WGET_VERSION = 1.19.1 -WGET_SOURCE = wget-$(WGET_VERSION).tar.xz -WGET_SITE = $(BR2_GNU_MIRROR)/wget -WGET_DEPENDENCIES = host-pkgconf -WGET_LICENSE = GPLv3+ -WGET_LICENSE_FILES = COPYING - -# Prefer full-blown wget over busybox -ifeq ($(BR2_PACKAGE_BUSYBOX),y) -WGET_DEPENDENCIES += busybox -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -WGET_CONF_OPTS += --with-ssl=gnutls -WGET_DEPENDENCIES += gnutls -else ifeq ($(BR2_PACKAGE_OPENSSL),y) -WGET_CONF_OPTS += --with-ssl=openssl -WGET_DEPENDENCIES += openssl -else -WGET_CONF_OPTS += --without-ssl -endif - -ifeq ($(BR2_PACKAGE_UTIL_LINUX_LIBUUID),y) -WGET_DEPENDENCIES += util-linux -endif - -$(eval $(autotools-package)) diff --git a/package.bak/whetstone/Config.in b/package.bak/whetstone/Config.in deleted file mode 100644 index 7a68160da4..0000000000 --- a/package.bak/whetstone/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_WHETSTONE - bool "whetstone" - help - C Converted Whetstone Double Precision Benchmark - - http://www.netlib.org/benchmark/ diff --git a/package.bak/whetstone/whetstone.hash b/package.bak/whetstone/whetstone.hash deleted file mode 100644 index db9bbb4548..0000000000 --- a/package.bak/whetstone/whetstone.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 333e4ceca042c146f63eec605573d16ae8b07166cbc44a17bec1ea97c6f1efbf whetstone.c diff --git a/package.bak/whetstone/whetstone.mk b/package.bak/whetstone/whetstone.mk deleted file mode 100644 index d9b45638c5..0000000000 --- a/package.bak/whetstone/whetstone.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# whetstone -# -################################################################################ - -WHETSTONE_VERSION = 1.2 -WHETSTONE_SOURCE = whetstone.c -WHETSTONE_SITE = http://www.netlib.org/benchmark - -define WHETSTONE_EXTRACT_CMDS - cp $(DL_DIR)/$($(PKG)_SOURCE) $(@D)/ -endef - -define WHETSTONE_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) LDLIBS="-lm" -C $(@D) whetstone -endef - -define WHETSTONE_INSTALL_TARGET_CMDS - $(INSTALL) -D $(@D)/whetstone $(TARGET_DIR)/usr/bin/whetstone -endef - -$(eval $(generic-package)) diff --git a/package.bak/which/Config.in b/package.bak/which/Config.in deleted file mode 100644 index db090ea87a..0000000000 --- a/package.bak/which/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_WHICH - bool "which" - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - help - The standard 'which' utility. - - http://www.xs4all.nl/~carlo17/which/ diff --git a/package.bak/which/which.hash b/package.bak/which/which.hash deleted file mode 100644 index fe649ab019..0000000000 --- a/package.bak/which/which.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 f4a245b94124b377d8b49646bf421f9155d36aa7614b6ebf83705d3ffc76eaad which-2.21.tar.gz diff --git a/package.bak/which/which.mk b/package.bak/which/which.mk deleted file mode 100644 index 938b770e2f..0000000000 --- a/package.bak/which/which.mk +++ /dev/null @@ -1,12 +0,0 @@ -################################################################################ -# -# which -# -################################################################################ - -WHICH_VERSION = 2.21 -WHICH_SITE = $(BR2_GNU_MIRROR)/which -WHICH_LICENSE = GPLv3+ -WHICH_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/whois/Config.in b/package.bak/whois/Config.in deleted file mode 100644 index 0fbaf904d2..0000000000 --- a/package.bak/whois/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_WHOIS - bool "whois" - depends on BR2_USE_WCHAR # gettext - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - help - Improved whois client. - - http://www.linux.it/~md/software/ - -comment "whois needs a toolchain w/ wchar" - depends on !BR2_USE_WCHAR - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS diff --git a/package.bak/whois/whois.hash b/package.bak/whois/whois.hash deleted file mode 100644 index 6f65074c2c..0000000000 --- a/package.bak/whois/whois.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://ftp.debian.org/debian/pool/main/w/whois/whois_5.2.14.dsc -sha256 a41daf41abed0fbfa8c9c4b0e4a3f5f22d9876dd6feb9091aac12f8f4c38b0d2 whois_5.2.14.tar.xz diff --git a/package.bak/whois/whois.mk b/package.bak/whois/whois.mk deleted file mode 100644 index 29a18e3e1c..0000000000 --- a/package.bak/whois/whois.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# whois -# -################################################################################ - -WHOIS_VERSION = 5.2.14 -WHOIS_SITE = http://snapshot.debian.org/archive/debian/20161230T032015Z/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) -WHOIS_MAKE_ENV = $(TARGET_MAKE_ENV) -WHOIS_MAKE_OPTS = CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - LIBS="$(WHOIS_EXTRA_LIBS)" -WHOIS_LICENSE = GPLv2+ -WHOIS_LICENSE_FILES = COPYING - -ifeq ($(BR2_NEEDS_GETTEXT),y) -WHOIS_DEPENDENCIES += gettext -WHOIS_EXTRA_LIBS += -lintl -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -WHOIS_DEPENDENCIES += libiconv -WHOIS_EXTRA_LIBS += -liconv -WHOIS_MAKE_ENV += HAVE_ICONV=1 -endif - -ifeq ($(BR2_PACKAGE_LIBIDN),y) -WHOIS_DEPENDENCIES += libidn -WHOIS_MAKE_ENV += HAVE_LIBIDN=1 -endif - -define WHOIS_BUILD_CMDS - $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) -C $(@D) -endef - -define WHOIS_INSTALL_TARGET_CMDS - $(WHOIS_MAKE_ENV) $(MAKE) $(WHOIS_MAKE_OPTS) \ - BASEDIR="$(TARGET_DIR)" install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/wilc1000-firmware/Config.in b/package.bak/wilc1000-firmware/Config.in deleted file mode 100644 index df8a7a6b60..0000000000 --- a/package.bak/wilc1000-firmware/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_WILC1000_FIRMWARE - bool "wilc1000-firmware" - help - Firmware for Atmel Wilc1000 wireless device - - https://github.com/linux4sc/wireless-firmware.git diff --git a/package.bak/wilc1000-firmware/wilc1000-firmware.hash b/package.bak/wilc1000-firmware/wilc1000-firmware.hash deleted file mode 100644 index 5344efe517..0000000000 --- a/package.bak/wilc1000-firmware/wilc1000-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 a2e7a327dd545ba2051946f7613005cbde88fdd952afb8eecdd1dacda7e767d2 v14.1_Firmware.zip diff --git a/package.bak/wilc1000-firmware/wilc1000-firmware.mk b/package.bak/wilc1000-firmware/wilc1000-firmware.mk deleted file mode 100644 index 5dcf19045b..0000000000 --- a/package.bak/wilc1000-firmware/wilc1000-firmware.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# wilc1000-firmware -# -################################################################################ - -WILC1000_FIRMWARE_VERSION = 14.1 -WILC1000_FIRMWARE_SITE = https://github.com/linux4sc/wireless-firmware/archive -WILC1000_FIRMWARE_SOURCE = v$(WILC1000_FIRMWARE_VERSION)_Firmware.zip - -WILC1000_FIRMWARE_LICENSE = PROPRIETARY - -define WILC1000_FIRMWARE_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(WILC1000_FIRMWARE_SOURCE) - mv $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware/* $(@D) - rmdir $(BUILD_DIR)/wireless-firmware-$(WILC1000_FIRMWARE_VERSION)_Firmware -endef - -define WILC1000_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0644 $(@D)/wilc1003_firmware.bin \ - $(TARGET_DIR)/lib/firmware/atmel/wilc1003_firmware.bin -endef - -$(eval $(generic-package)) diff --git a/package.bak/wine/Config.in b/package.bak/wine/Config.in deleted file mode 100644 index c674288446..0000000000 --- a/package.bak/wine/Config.in +++ /dev/null @@ -1,23 +0,0 @@ -config BR2_PACKAGE_WINE - bool "wine" - depends on BR2_TOOLCHAIN_USES_GLIBC - # Wine only builds on certain architectures - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" || \ - BR2_HOSTARCH = "powerpc" || BR2_HOSTARCH = "arm" || \ - BR2_HOSTARCH = "aarch64" - # Wine has much CPU specific code and mostly makes sense on x86 - depends on BR2_i386 - help - Wine is a compatibility layer capable of running Windows - applications on Linux. Instead of simulating internal - Windows logic like a virtual machine or emulator, Wine - translates Windows API calls into POSIX calls on-the-fly, - eliminating the performance and memory penalties of other - methods. - - http://www.winehq.org - -comment "wine needs a glibc toolchain" - depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" - depends on BR2_i386 - depends on !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package.bak/wine/wine.hash b/package.bak/wine/wine.hash deleted file mode 100644 index b4b67cd907..0000000000 --- a/package.bak/wine/wine.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 9756f5a2129b6a83ba701e546173cbff86caa671b0af73eb8f72c03b20c066c6 wine-2.0.tar.bz2 diff --git a/package.bak/wine/wine.mk b/package.bak/wine/wine.mk deleted file mode 100644 index f9b2e1a3ff..0000000000 --- a/package.bak/wine/wine.mk +++ /dev/null @@ -1,380 +0,0 @@ -################################################################################ -# -# wine -# -################################################################################ - -WINE_VERSION = 2.0 -WINE_SOURCE = wine-$(WINE_VERSION).tar.bz2 -WINE_SITE = https://dl.winehq.org/wine/source/2.0 -WINE_LICENSE = LGPLv2.1+ -WINE_LICENSE_FILES = COPYING.LIB LICENSE -WINE_DEPENDENCIES = host-bison host-flex host-wine - -# Wine needs its own directory structure and tools for cross compiling -WINE_CONF_OPTS = \ - --with-wine-tools=../host-wine-$(WINE_VERSION) \ - --disable-tests \ - --disable-win64 \ - --without-capi \ - --without-coreaudio \ - --without-gettext \ - --without-gettextpo \ - --without-gphoto \ - --without-gsm \ - --without-hal \ - --without-opencl \ - --without-oss - -# Wine uses a wrapper around gcc, and uses the value of --host to -# construct the filename of the gcc to call. But for external -# toolchains, the GNU_TARGET_NAME tuple that we construct from our -# internal variables may differ from the actual gcc prefix for the -# external toolchains. So, we have to override whatever the gcc -# wrapper believes what the real gcc is named, and force the tuple of -# the external toolchain, not the one we compute in GNU_TARGET_NAME. -ifeq ($(BR2_TOOLCHAIN_EXTERNAL),y) -WINE_CONF_OPTS += TARGETFLAGS="-b $(TOOLCHAIN_EXTERNAL_PREFIX)" -endif - -ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_SEQ)$(BR2_PACKAGE_ALSA_LIB_RAWMIDI),yyy) -WINE_CONF_OPTS += --with-alsa -WINE_DEPENDENCIES += alsa-lib -else -WINE_CONF_OPTS += --without-alsa -endif - -ifeq ($(BR2_PACKAGE_CUPS),y) -WINE_CONF_OPTS += --with-cups -WINE_DEPENDENCIES += cups -WINE_CONF_ENV += CUPS_CONFIG=$(STAGING_DIR)/usr/bin/cups-config -else -WINE_CONF_OPTS += --without-cups -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -WINE_CONF_OPTS += --with-dbus -WINE_DEPENDENCIES += dbus -else -WINE_CONF_OPTS += --without-dbus -endif - -ifeq ($(BR2_PACKAGE_FONTCONFIG),y) -WINE_CONF_OPTS += --with-fontconfig -WINE_DEPENDENCIES += fontconfig -else -WINE_CONF_OPTS += --without-fontconfig -endif - -# To support freetype in wine we also need freetype in host-wine for the cross compiling tools -ifeq ($(BR2_PACKAGE_FREETYPE),y) -WINE_CONF_OPTS += --with-freetype -HOST_WINE_CONF_OPTS += --with-freetype -WINE_DEPENDENCIES += freetype -HOST_WINE_DEPENDENCIES += host-freetype -WINE_CONF_ENV += FREETYPE_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config -else -WINE_CONF_OPTS += --without-freetype -HOST_WINE_CONF_OPTS += --without-freetype -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -WINE_CONF_OPTS += --with-gnutls -WINE_DEPENDENCIES += gnutls -else -WINE_CONF_OPTS += --without-gnutls -endif - -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE),y) -WINE_CONF_OPTS += --with-gstreamer -WINE_DEPENDENCIES += gst1-plugins-base -else -WINE_CONF_OPTS += --without-gstreamer -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -WINE_CONF_OPTS += --with-jpeg -WINE_DEPENDENCIES += jpeg -else -WINE_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_LCMS2),y) -WINE_CONF_OPTS += --with-cms -WINE_DEPENDENCIES += lcms2 -else -WINE_CONF_OPTS += --without-cms -endif - -ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) -WINE_CONF_OPTS += --with-opengl -WINE_DEPENDENCIES += libgl -else -WINE_CONF_OPTS += --without-opengl -endif - -ifeq ($(BR2_PACKAGE_LIBGLU),y) -WINE_CONF_OPTS += --with-glu -WINE_DEPENDENCIES += libglu -else -WINE_CONF_OPTS += --without-glu -endif - -ifeq ($(BR2_PACKAGE_LIBPCAP),y) -WINE_CONF_OPTS += --with-pcap -WINE_DEPENDENCIES += libpcap -else -WINE_CONF_OPTS += --without-pcap -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -WINE_CONF_OPTS += --with-png -WINE_DEPENDENCIES += libpng -else -WINE_CONF_OPTS += --without-png -endif - -ifeq ($(BR2_PACKAGE_LIBV4L),y) -WINE_CONF_OPTS += --with-v4l -WINE_DEPENDENCIES += libv4l -else -WINE_CONF_OPTS += --without-v4l -endif - -ifeq ($(BR2_PACKAGE_LIBXML2),y) -WINE_CONF_OPTS += --with-xml -WINE_DEPENDENCIES += libxml2 -WINE_CONF_ENV += XML2_CONFIG=$(STAGING_DIR)/usr/bin/xml2-config -else -WINE_CONF_OPTS += --without-xml -endif - -ifeq ($(BR2_PACKAGE_LIBXSLT),y) -WINE_CONF_OPTS += --with-xslt -WINE_DEPENDENCIES += libxslt -WINE_CONF_ENV += XSLT_CONFIG=$(STAGING_DIR)/usr/bin/xslt-config -else -WINE_CONF_OPTS += --without-xslt -endif - -ifeq ($(BR2_PACKAGE_MPG123),y) -WINE_CONF_OPTS += --with-mpg123 -WINE_DEPENDENCIES += mpg123 -else -WINE_CONF_OPTS += --without-mpg123 -endif - -ifeq ($(BR2_PACKAGE_NCURSES),y) -WINE_CONF_OPTS += --with-curses -WINE_DEPENDENCIES += ncurses -else -WINE_CONF_OPTS += --without-curses -endif - -ifeq ($(BR2_PACKAGE_OPENAL),y) -WINE_CONF_OPTS += --with-openal -WINE_DEPENDENCIES += openal -else -WINE_CONF_OPTS += --without-openal -endif - -ifeq ($(BR2_PACKAGE_OPENLDAP),y) -WINE_CONF_OPTS += --with-ldap -WINE_DEPENDENCIES += openldap -else -WINE_CONF_OPTS += --without-ldap -endif - -ifeq ($(BR2_PACKAGE_MESA3D_OSMESA),y) -WINE_CONF_OPTS += --with-osmesa -WINE_DEPENDENCIES += mesa3d -else -WINE_CONF_OPTS += --without-osmesa -endif - -ifeq ($(BR2_PACKAGE_PULSEAUDIO),y) -WINE_CONF_OPTS += --with-pulse -WINE_DEPENDENCIES += pulseaudio -else -WINE_CONF_OPTS += --without-pulse -endif - -ifeq ($(BR2_PACKAGE_SAMBA4),y) -WINE_CONF_OPTS += --with-netapi -WINE_DEPENDENCIES += samba4 -else -WINE_CONF_OPTS += --without-netapi -endif - -ifeq ($(BR2_PACKAGE_SANE_BACKENDS),y) -WINE_CONF_OPTS += --with-sane -WINE_DEPENDENCIES += sane-backends -WINE_CONF_ENV += SANE_CONFIG=$(STAGING_DIR)/usr/bin/sane-config -else -WINE_CONF_OPTS += --without-sane -endif - -ifeq ($(BR2_PACKAGE_TIFF),y) -WINE_CONF_OPTS += --with-tiff -WINE_DEPENDENCIES += tiff -else -WINE_CONF_OPTS += --without-tiff -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -WINE_CONF_OPTS += --with-udev -WINE_DEPENDENCIES += udev -else -WINE_CONF_OPTS += --without-udev -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) -WINE_CONF_OPTS += --with-x -WINE_DEPENDENCIES += xlib_libX11 -else -WINE_CONF_OPTS += --without-x -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -WINE_CONF_OPTS += --with-xcomposite -WINE_DEPENDENCIES += xlib_libXcomposite -else -WINE_CONF_OPTS += --without-xcomposite -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) -WINE_CONF_OPTS += --with-xcursor -WINE_DEPENDENCIES += xlib_libXcursor -else -WINE_CONF_OPTS += --without-xcursor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXEXT),y) -WINE_CONF_OPTS += --with-xshape --with-xshm -WINE_DEPENDENCIES += xlib_libXext -else -WINE_CONF_OPTS += --without-xshape --without-xshm -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXI),y) -WINE_CONF_OPTS += --with-xinput --with-xinput2 -WINE_DEPENDENCIES += xlib_libXi -else -WINE_CONF_OPTS += --without-xinput --without-xinput2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -WINE_CONF_OPTS += --with-xinerama -WINE_DEPENDENCIES += xlib_libXinerama -else -WINE_CONF_OPTS += --without-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -WINE_CONF_OPTS += --with-xrandr -WINE_DEPENDENCIES += xlib_libXrandr -else -WINE_CONF_OPTS += --without-xrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y) -WINE_CONF_OPTS += --with-xrender -WINE_DEPENDENCIES += xlib_libXrender -else -WINE_CONF_OPTS += --without-xrender -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86VM),y) -WINE_CONF_OPTS += --with-xxf86vm -WINE_DEPENDENCIES += xlib_libXxf86vm -else -WINE_CONF_OPTS += --without-xxf86vm -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -WINE_CONF_OPTS += --with-zlib -WINE_DEPENDENCIES += zlib -else -WINE_CONF_OPTS += --without-zlib -endif - -# host-gettext is essential for .po file support in host-wine wrc -HOST_WINE_DEPENDENCIES += host-gettext -HOST_WINE_CONF_OPTS += --with-gettext --with-gettextpo - -# Wine needs to enable 64-bit build tools on 64-bit host -ifeq ($(HOSTARCH),x86_64) -HOST_WINE_CONF_OPTS += --enable-win64 -endif - -# Wine only needs the host tools to be built, so cut-down the -# build time by building just what we need. -define HOST_WINE_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) \ - tools \ - tools/sfnt2fon \ - tools/widl \ - tools/winebuild \ - tools/winegcc \ - tools/wmc \ - tools/wrc -endef - -# Wine only needs its host variant to be built, not that it is -# installed, as it uses the tools from the build directory. But -# we have no way in Buildroot to state that a host package should -# not be installed. So, just provide an noop install command. -define HOST_WINE_INSTALL_CMDS - : -endef - -# We are focused on the cross compiling tools, disable everything else -HOST_WINE_CONF_OPTS += \ - --disable-tests \ - --disable-win16 \ - --without-alsa \ - --without-capi \ - --without-cms \ - --without-coreaudio \ - --without-cups \ - --without-curses \ - --without-dbus \ - --without-fontconfig \ - --without-gphoto \ - --without-glu \ - --without-gnutls \ - --without-gsm \ - --without-gstreamer \ - --without-hal \ - --without-jpeg \ - --without-ldap \ - --without-mpg123 \ - --without-netapi \ - --without-openal \ - --without-opencl \ - --without-opengl \ - --without-osmesa \ - --without-oss \ - --without-pcap \ - --without-pulse \ - --without-png \ - --without-sane \ - --without-tiff \ - --without-v4l \ - --without-x \ - --without-xcomposite \ - --without-xcursor \ - --without-xinerama \ - --without-xinput \ - --without-xinput2 \ - --without-xml \ - --without-xrandr \ - --without-xrender \ - --without-xshape \ - --without-xshm \ - --without-xslt \ - --without-xxf86vm \ - --without-zlib - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/wipe/0001-musl.patch b/package.bak/wipe/0001-musl.patch deleted file mode 100644 index 35b3af80ff..0000000000 --- a/package.bak/wipe/0001-musl.patch +++ /dev/null @@ -1,28 +0,0 @@ -Fix musl build - -In file included from main.c:46:0: -rand.h:31:9: error: unknown type name ‘u_int32_t’ - typedef u_int32_t u_rand_t; - ^ -: recipe for target 'main.o' failed - -Patch sent upstream: https://sourceforge.net/p/wipe/patches/4/ - -Signed-off-by: Bernd Kuhls - -diff -uNr wipe-2.3.1.org/rand.h wipe-2.3.1/rand.h ---- wipe-2.3.1.org/rand.h 2003-12-03 04:01:02.000000000 +0100 -+++ wipe-2.3.1/rand.h 2016-01-31 21:39:54.000000000 +0100 -@@ -22,10 +22,9 @@ - - #ifdef HAVE_STDINT_H - # include "stdint.h" --#else --# ifndef LINUX -+#endif -+#if !defined(u_int32_t) - # define u_int32_t uint32_t --# endif - #endif - - typedef u_int32_t u_rand_t; diff --git a/package.bak/wipe/Config.in b/package.bak/wipe/Config.in deleted file mode 100644 index 0241c13715..0000000000 --- a/package.bak/wipe/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_WIPE - bool "wipe" - help - Wipe is a little command for securely erasing files - from magnetic media. It compiles under various unix platforms. - - http://wipe.sourceforge.net diff --git a/package.bak/wipe/wipe.hash b/package.bak/wipe/wipe.hash deleted file mode 100644 index 9bde2014dd..0000000000 --- a/package.bak/wipe/wipe.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 463916370f9b35bb34419c2c0ae3dc4c0a471db32e8595afa1d14c0337b61aa0 wipe-2.3.1.tar.bz2 diff --git a/package.bak/wipe/wipe.mk b/package.bak/wipe/wipe.mk deleted file mode 100644 index 9ec7faf6d7..0000000000 --- a/package.bak/wipe/wipe.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# wipe -# -################################################################################ - -WIPE_VERSION = 2.3.1 -WIPE_SITE = http://downloads.sourceforge.net/project/wipe/wipe/$(WIPE_VERSION) -WIPE_SOURCE = wipe-$(WIPE_VERSION).tar.bz2 -WIPE_LICENSE = GPLv2+ -WIPE_LICENSE_FILES = LICENSE - -define WIPE_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 0755 $(@D)/wipe $(TARGET_DIR)/usr/bin/wipe -endef - -$(eval $(autotools-package)) diff --git a/package.bak/wireless-regdb/Config.in b/package.bak/wireless-regdb/Config.in deleted file mode 100644 index d9c7b8d2d1..0000000000 --- a/package.bak/wireless-regdb/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_WIRELESS_REGDB - bool "wireless-regdb" - help - Wireless regulatory database. - - Wireless regulatory database for CRDA. The database lists the - allowed radio frequencies for each local jurisdiction. - - http://linuxwireless.org/en/developers/Regulatory diff --git a/package.bak/wireless-regdb/wireless-regdb.hash b/package.bak/wireless-regdb/wireless-regdb.hash deleted file mode 100644 index b8ca2e75a3..0000000000 --- a/package.bak/wireless-regdb/wireless-regdb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://www.kernel.org/pub/software/network/wireless-regdb/sha256sums.asc -sha256 cfedf1c3521b3c8f32602f25ed796e96e687c3441a00e7c050fedf7fd4f1b8b7 wireless-regdb-2016.06.10.tar.xz diff --git a/package.bak/wireless-regdb/wireless-regdb.mk b/package.bak/wireless-regdb/wireless-regdb.mk deleted file mode 100644 index 6ad42589e3..0000000000 --- a/package.bak/wireless-regdb/wireless-regdb.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# wireless-regdb -# -################################################################################ - -WIRELESS_REGDB_VERSION = 2016.06.10 -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 -WIRELESS_REGDB_LICENSE_FILES = LICENSE - -define WIRELESS_REGDB_INSTALL_TARGET_CMDS - $(INSTALL) -m 644 -D -T $(@D)/regulatory.bin \ - $(TARGET_DIR)/usr/lib/crda/regulatory.bin - $(INSTALL) -m 644 -D -T $(@D)/sforshee.key.pub.pem \ - $(TARGET_DIR)/etc/wireless-regdb/pubkeys/sforshee.key.pub.pem -endef - -$(eval $(generic-package)) diff --git a/package.bak/wireless_tools/0001-remove-bzero.patch b/package.bak/wireless_tools/0001-remove-bzero.patch deleted file mode 100644 index 53ef588675..0000000000 --- a/package.bak/wireless_tools/0001-remove-bzero.patch +++ /dev/null @@ -1,95 +0,0 @@ -Switch all instances of deprecated bzero() to memset() equivalent. - -Signed-off-by: Gustavo Zacarias - -diff -Nura wireless_tools.30/ifrename.c wireless_tools.30-bzero/ifrename.c ---- wireless_tools.30/ifrename.c 2007-10-16 20:12:41.000000000 -0300 -+++ wireless_tools.30-bzero/ifrename.c 2014-06-11 09:52:59.623741119 -0300 -@@ -541,7 +541,7 @@ - victimname, autoname); - - /* Prepare request */ -- bzero(&ifr, sizeof(struct ifreq)); -+ memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, victimname, IFNAMSIZ); - strncpy(ifr.ifr_newname, autoname, IFNAMSIZ); - -@@ -587,7 +587,7 @@ - } - - /* Prepare request */ -- bzero(&ifr, sizeof(struct ifreq)); -+ memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, oldname, IFNAMSIZ); - strncpy(ifr.ifr_newname, newname, IFNAMSIZ); - -@@ -747,7 +747,7 @@ - int i; - - /* Get MAC address */ -- bzero(&ifr, sizeof(struct ifreq)); -+ memset(&ifr, 0, sizeof(struct ifreq)); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - ret = ioctl(skfd, SIOCGIFHWADDR, &ifr); - if(ret < 0) -@@ -1040,8 +1040,8 @@ - return(0); - - /* Prepare request */ -- bzero(&ifr, sizeof(struct ifreq)); -- bzero(&drvinfo, sizeof(struct ethtool_drvinfo)); -+ memset(&ifr, 0, sizeof(struct ifreq)); -+ memset(&drvinfo, 0, sizeof(struct ethtool_drvinfo)); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - drvinfo.cmd = ETHTOOL_GDRVINFO; - ifr.ifr_data = (caddr_t) &drvinfo; -@@ -1206,8 +1206,8 @@ - return(0); - - /* Prepare request */ -- bzero(&ifr, sizeof(struct ifreq)); -- bzero(&map, sizeof(struct ifmap)); -+ memset(&ifr, 0, sizeof(struct ifreq)); -+ memset(&map, 0, sizeof(struct ifmap)); - strncpy(ifr.ifr_name, ifname, IFNAMSIZ); - - /* Do it */ -@@ -2050,7 +2050,7 @@ - struct add_extra extrainfo; - - /* Reset the list of filters */ -- bzero(selector_active, sizeof(selector_active)); -+ memset(selector_active, 0, sizeof(selector_active)); - - /* Check filename */ - if(!strcmp(filename, "-")) -diff -Nura wireless_tools.30/iwlib.c wireless_tools.30-bzero/iwlib.c ---- wireless_tools.30/iwlib.c 2009-11-23 23:28:59.000000000 -0300 -+++ wireless_tools.30-bzero/iwlib.c 2014-06-11 09:50:20.611371384 -0300 -@@ -484,7 +484,7 @@ - union iw_range_raw * range_raw; - - /* Cleanup */ -- bzero(buffer, sizeof(buffer)); -+ memset(buffer, 0, sizeof(buffer)); - - wrq.u.data.pointer = (caddr_t) buffer; - wrq.u.data.length = sizeof(buffer); -@@ -513,7 +513,7 @@ - else - { - /* Zero unknown fields */ -- bzero((char *) range, sizeof(struct iw_range)); -+ memset((char *) range, 0, sizeof(struct iw_range)); - - /* Initial part unmoved */ - memcpy((char *) range, -@@ -3064,7 +3064,7 @@ - oldwscan->next = wscan; - - /* Reset it */ -- bzero(wscan, sizeof(struct wireless_scan)); -+ memset(wscan, 0, sizeof(struct wireless_scan)); - - /* Save cell identifier */ - wscan->has_ap_addr = 1; diff --git a/package.bak/wireless_tools/Config.in b/package.bak/wireless_tools/Config.in deleted file mode 100644 index e33af25b86..0000000000 --- a/package.bak/wireless_tools/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_WIRELESS_TOOLS - bool "wireless tools" - help - A collection of tools to configure wireless lan cards. - - http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html - -if BR2_PACKAGE_WIRELESS_TOOLS - -config BR2_PACKAGE_WIRELESS_TOOLS_LIB - bool "Install shared library" - depends on !BR2_STATIC_LIBS - help - The shared library of wireless tools - -endif diff --git a/package.bak/wireless_tools/wireless_tools.hash b/package.bak/wireless_tools/wireless_tools.hash deleted file mode 100644 index 587c9772ef..0000000000 --- a/package.bak/wireless_tools/wireless_tools.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 abd9c5c98abf1fdd11892ac2f8a56737544fe101e1be27c6241a564948f34c63 wireless_tools.30.pre9.tar.gz diff --git a/package.bak/wireless_tools/wireless_tools.mk b/package.bak/wireless_tools/wireless_tools.mk deleted file mode 100644 index f4e0ffb440..0000000000 --- a/package.bak/wireless_tools/wireless_tools.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# wireless_tools -# -################################################################################ - -WIRELESS_TOOLS_VERSION_MAJOR = 30 -WIRELESS_TOOLS_VERSION = $(WIRELESS_TOOLS_VERSION_MAJOR).pre9 -WIRELESS_TOOLS_SITE = http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux -WIRELESS_TOOLS_SOURCE = wireless_tools.$(WIRELESS_TOOLS_VERSION).tar.gz -WIRELESS_TOOLS_LICENSE = GPLv2 -WIRELESS_TOOLS_LICENSE_FILES = COPYING -WIRELESS_TOOLS_INSTALL_STAGING = YES - -WIRELESS_TOOLS_BUILD_TARGETS = iwmulticall -WIRELESS_TOOLS_INSTALL_TARGETS = install-iwmulticall - -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y) -WIRELESS_TOOLS_BUILD_TARGETS += libiw.so.$(WIRELESS_TOOLS_VERSION_MAJOR) -WIRELESS_TOOLS_INSTALL_TARGETS += install-dynamic - -define WIRELESS_TOOLS_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)" LDCONFIG=/bin/true \ - install-dynamic - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(STAGING_DIR)/usr" install-hdr -endef - -endif - -define WIRELESS_TOOLS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \ - $(WIRELESS_TOOLS_BUILD_TARGETS) -endef - -define WIRELESS_TOOLS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) PREFIX="$(TARGET_DIR)" LDCONFIG=/bin/true \ - $(WIRELESS_TOOLS_INSTALL_TARGETS) -endef - -$(eval $(generic-package)) diff --git a/package.bak/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch b/package.bak/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch deleted file mode 100644 index 1e44ad0942..0000000000 --- a/package.bak/wireshark/0001-configure.ac-do-not-assume-broken-inet_pton-in-case-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 25d313275e87dc236e86c0e713cad08ea64253f8 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Thu, 8 Sep 2016 10:58:34 +0100 -Subject: [PATCH] configure.ac: do not assume broken inet_pton in case of cross - compiling - -Patch configure.ac to not assume broken inet_pton in case of cross -compiling. - -[Vincent: adapt the patch for 2.2.0] - -Signed-off-by: Peter Seiderer -Signed-off-by: Vicente Olivert Riera ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c43e366..9672831 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2373,8 +2373,8 @@ int main() - #endif - }], [AC_MSG_RESULT(ok); - have_inet_pton=yes], [AC_MSG_RESULT(broken); --have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken]); --have_inet_pton=no])], -+have_inet_pton=no], [AC_MSG_RESULT([cross compiling, assume it is broken... not here]); -+have_inet_pton=yes])], - have_inet_pton=no) - if test "$have_inet_pton" = no; then - AC_LIBOBJ(inet_pton) --- -2.7.3 - diff --git a/package.bak/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch b/package.bak/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch deleted file mode 100644 index ae1198018a..0000000000 --- a/package.bak/wireshark/0002-androiddump-add-missing-sys-time.h-header.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 1ab938e762ee6ebd3211c22ef25a7575e37791c4 Mon Sep 17 00:00:00 2001 -From: Baruch Siach -Date: Thu, 29 Dec 2016 20:16:53 +0200 -Subject: [PATCH] androiddump: add missing sys/time.h header - -struct timeval requires sys/time.h. Fixes the following musl libc build error: - -androiddump.c: In function 'useSndTimeout': -androiddump.c:262:18: error: variable 'socket_timeout' has initializer but incomplete type - const struct timeval socket_timeout = { - ^ - -Change-Id: I52e204f32a012aabea2e54877e564576c072fe08 -Signed-off-by: Baruch Siach ---- -Upstream status: https://code.wireshark.org/review/19460 ---- - extcap/androiddump.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/extcap/androiddump.c b/extcap/androiddump.c -index 8287c4bb1a76..fab7c10e05cc 100644 ---- a/extcap/androiddump.c -+++ b/extcap/androiddump.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #ifdef HAVE_NETINET_IN_H - # include --- -2.11.0 - diff --git a/package.bak/wireshark/Config.in b/package.bak/wireshark/Config.in deleted file mode 100644 index c5b5c3e3ae..0000000000 --- a/package.bak/wireshark/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_WIRESHARK - bool "wireshark" - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_USE_MMU # fork(), glib2 - depends on BR2_USE_WCHAR # glib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # glib2 - help - Network traffic sniffer and protocol decoder. - - https://www.wireshark.org - -if BR2_PACKAGE_WIRESHARK - -config BR2_PACKAGE_WIRESHARK_QT - bool - default y - depends on BR2_PACKAGE_QT5BASE_WIDGETS - depends on BR2_PACKAGE_QT5TOOLS - select BR2_PACKAGE_QT5TOOLS_LINGUIST_TOOLS - -config BR2_PACKAGE_WIRESHARK_GUI - bool - default y if BR2_PACKAGE_LIBGTK2 - default y if BR2_PACKAGE_LIBGTK3 - default y if BR2_PACKAGE_WIRESHARK_QT - -endif # BR2_PACKAGE_WIRESHARK - -comment "wireshark needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/wireshark/wireshark.hash b/package.bak/wireshark/wireshark.hash deleted file mode 100644 index e3eeef334e..0000000000 --- a/package.bak/wireshark/wireshark.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From: https://www.wireshark.org/download/src/all-versions/SIGNATURES-2.2.4.txt -sha256 42a7fb35eed5a32478153e24601a284bb50148b7ba919c3e8452652f4c2a3911 wireshark-2.2.4.tar.bz2 diff --git a/package.bak/wireshark/wireshark.mk b/package.bak/wireshark/wireshark.mk deleted file mode 100644 index edd830d80b..0000000000 --- a/package.bak/wireshark/wireshark.mk +++ /dev/null @@ -1,109 +0,0 @@ -################################################################################ -# -# wireshark -# -################################################################################ - -WIRESHARK_VERSION = 2.2.4 -WIRESHARK_SOURCE = wireshark-$(WIRESHARK_VERSION).tar.bz2 -WIRESHARK_SITE = https://www.wireshark.org/download/src/all-versions -WIRESHARK_LICENSE = wireshark license -WIRESHARK_LICENSE_FILES = COPYING -WIRESHARK_DEPENDENCIES = host-pkgconf libpcap libglib2 -WIRESHARK_CONF_ENV = \ - PCAP_CONFIG=$(STAGING_DIR)/usr/bin/pcap-config - -# patch touching configure.ac -WIRESHARK_AUTORECONF = YES - -# wireshark adds -I$includedir to CFLAGS, causing host/target headers mixup. -# Work around it by pointing includedir at staging -WIRESHARK_CONF_OPTS = \ - --without-krb5 \ - --enable-static=no \ - --with-libsmi=no \ - --with-lua=no \ - --with-pcap=$(STAGING_DIR)/usr \ - --includedir=$(STAGING_DIR)/usr/include - -# wireshark GUI options -ifeq ($(BR2_PACKAGE_LIBGTK3),y) -WIRESHARK_CONF_OPTS += --with-gtk=3 -WIRESHARK_DEPENDENCIES += libgtk3 -else ifeq ($(BR2_PACKAGE_LIBGTK2),y) -WIRESHARK_CONF_OPTS += --with-gtk=2 -WIRESHARK_DEPENDENCIES += libgtk2 -else -WIRESHARK_CONF_OPTS += --with-gtk=no -endif - -# Qt4 needs accessibility, we don't support it -ifeq ($(BR2_PACKAGE_WIRESHARK_QT),y) -WIRESHARK_CONF_OPTS += --with-qt=5 -WIRESHARK_DEPENDENCIES += qt5base qt5tools -WIRESHARK_CONF_ENV += ac_cv_path_QTCHOOSER="" -# Seems it expects wrappers and passes a -qt=X parameter for version -WIRESHARK_MAKE_OPTS += \ - MOC="$(HOST_DIR)/usr/bin/moc" \ - RCC="$(HOST_DIR)/usr/bin/rcc" \ - UIC="$(HOST_DIR)/usr/bin/uic" -else -WIRESHARK_CONF_OPTS += --with-qt=no -endif - -# No GUI at all -ifeq ($(BR2_PACKAGE_WIRESHARK_GUI),) -WIRESHARK_CONF_OPTS += --disable-wireshark -endif - -ifeq ($(BR2_PACKAGE_C_ARES),y) -WIRESHARK_CONF_OPTS += --with-c-ares=$(STAGING_DIR)/usr -WIRESHARK_DEPENDENCIES += c-ares -else -WIRESHARK_CONF_OPTS += --without-c-ares -endif - -ifeq ($(BR2_PACKAGE_GEOIP),y) -WIRESHARK_CONF_OPTS += --with-geoip=$(STAGING_DIR)/usr -WIRESHARK_DEPENDENCIES += geoip -else -WIRESHARK_CONF_OPTS += --without-geoip -endif - -ifeq ($(BR2_PACKAGE_GNUTLS),y) -WIRESHARK_CONF_OPTS += --with-gnutls=yes -WIRESHARK_DEPENDENCIES += gnutls -else -WIRESHARK_CONF_OPTS += --with-gnutls=no -endif - -ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -WIRESHARK_CONF_ENV += LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config -WIRESHARK_CONF_OPTS += --with-gcrypt=yes -WIRESHARK_DEPENDENCIES += libgcrypt -else -WIRESHARK_CONF_OPTS += --with-gcrypt=no -endif - -ifeq ($(BR2_PACKAGE_LIBNL),y) -WIRESHARK_CONF_OPTS += --with-libnl -WIRESHARK_DEPENDENCIES += libnl -else -WIRESHARK_CONF_OPTS += --without-libnl -endif - -ifeq ($(BR2_PACKAGE_SBC),y) -WIRESHARK_CONF_OPTS += --with-sbc=yes -WIRESHARK_DEPENDENCIES += sbc -else -WIRESHARK_CONF_OPTS += --with-sbc=no -endif - -define WIRESHARK_REMOVE_DOCS - find $(TARGET_DIR)/usr/share/wireshark -name '*.txt' -print0 \ - -o -name '*.html' -print0 | xargs -0 rm -f -endef - -WIRESHARK_POST_INSTALL_TARGET_HOOKS += WIRESHARK_REMOVE_DOCS - -$(eval $(autotools-package)) diff --git a/package.bak/wiringpi/0001-Adjust-for-buildroot-build.patch b/package.bak/wiringpi/0001-Adjust-for-buildroot-build.patch deleted file mode 100644 index 4fddc9951e..0000000000 --- a/package.bak/wiringpi/0001-Adjust-for-buildroot-build.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 10d5bde8d628a93993dd7305dc9a406da69f65a9 Mon Sep 17 00:00:00 2001 -From: Peter Seiderer -Date: Wed, 2 Dec 2015 00:22:26 +0100 -Subject: [PATCH] Adjust for buildroot build. - - - enable CC override - - fix devLib/gpio include path for local build (without installing first) - - change CFLAGS from '=' to '+=' to honour buildroot given flags - - add linker name link for libwiringPiDev and libwiringPi for local linking - (without installing first) - - fix install linker name link (do not link with absolute path) - - add gpio-static linking target - -Signed-off-by: Peter Seiderer ---- - devLib/Makefile | 9 +++++---- - gpio/Makefile | 14 +++++++++----- - wiringPi/Makefile | 7 ++++--- - 3 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/devLib/Makefile b/devLib/Makefile -index 1b1ebe0..84b4d2a 100644 ---- a/devLib/Makefile -+++ b/devLib/Makefile -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPiDev.so.$(VERSION) - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc --INCLUDE = -I. -+CC ?= gcc -+INCLUDE = -I../wiringPi - DEFS = -D_GNU_SOURCE --CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC -+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC - - LIBS = - -@@ -69,6 +69,7 @@ $(STATIC): $(OBJ) - $(DYNAMIC): $(OBJ) - $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPiDev.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPiDev.so.$(VERSION) -lpthread $(OBJ) -+ $Q ln -sf libwiringPiDev.so.$(VERSION) libwiringPiDev.so - - .c.o: - $Q echo [Compile] $< -@@ -93,7 +94,7 @@ install: $(DYNAMIC) - $Q echo "[Install Dynamic Lib]" - $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib - $Q install -m 0755 libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) -- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so.$(VERSION) $(DESTDIR)/lib/libwiringPiDev.so -+ $Q ln -sf libwiringPiDev.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPiDev.so - $Q $(LDCONFIG) - - .PHONY: install-static -diff --git a/gpio/Makefile b/gpio/Makefile -index 7dcd090..dc4be72 100644 ---- a/gpio/Makefile -+++ b/gpio/Makefile -@@ -32,11 +32,11 @@ endif - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc --INCLUDE = -I$(DESTDIR)$(PREFIX)/include --CFLAGS = $(DEBUG) -Wall $(INCLUDE) -Winline -pipe -+CC ?= gcc -+INCLUDE = -I../wiringPi -I../devLib -+CFLAGS += $(DEBUG) -Wall $(INCLUDE) -Winline -pipe - --LDFLAGS = -L$(DESTDIR)$(PREFIX)/lib -+LDFLAGS = -L../wiringPi -L../devLib - LIBS = -lwiringPi -lwiringPiDev -lpthread - - # May not need to alter anything below this line -@@ -52,9 +52,13 @@ version.h: ../VERSION - $Q echo Need to run newVersion above. - - gpio: $(OBJ) -- $Q echo [Link] -+ $Q echo "[Link (Dynamic)]" - $Q $(CC) -o $@ $(OBJ) $(LDFLAGS) $(LIBS) - -+gpio-static: $(OBJ) -+ $Q echo "[Link (Static)]" -+ $Q $(CC) -static -o gpio $(OBJ) ../wiringPi/libwiringPi.a ../devLib/libwiringPiDev.a -lpthread -+ - .c.o: - $Q echo [Compile] $< - $Q $(CC) -c $(CFLAGS) $< -o $@ -diff --git a/wiringPi/Makefile b/wiringPi/Makefile -index acb6e58..8b84dc6 100644 ---- a/wiringPi/Makefile -+++ b/wiringPi/Makefile -@@ -36,10 +36,10 @@ DYNAMIC=libwiringPi.so.$(VERSION) - - #DEBUG = -g -O0 - DEBUG = -O2 --CC = gcc -+CC ?= gcc - INCLUDE = -I. - DEFS = -D_GNU_SOURCE --CFLAGS = $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC -+CFLAGS += $(DEBUG) $(DEFS) -Wformat=2 -Wall -Winline $(INCLUDE) -pipe -fPIC - - LIBS = - -@@ -90,6 +90,7 @@ $(STATIC): $(OBJ) - $(DYNAMIC): $(OBJ) - $Q echo "[Link (Dynamic)]" - $Q $(CC) -shared -Wl,-soname,libwiringPi.so$(WIRINGPI_SONAME_SUFFIX) -o libwiringPi.so.$(VERSION) -lpthread $(OBJ) -+ $Q ln -sf libwiringPi.so.$(VERSION) libwiringPi.so - - .c.o: - $Q echo [Compile] $< -@@ -115,7 +116,7 @@ install: $(DYNAMIC) - $Q echo "[Install Dynamic Lib]" - $Q install -m 0755 -d $(DESTDIR)$(PREFIX)/lib - $Q install -m 0755 libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) -- $Q ln -sf $(DESTDIR)$(PREFIX)/lib/libwiringPi.so.$(VERSION) $(DESTDIR)/lib/libwiringPi.so -+ $Q ln -sf libwiringPi.so.$(VERSION) $(DESTDIR)$(PREFIX)/lib/libwiringPi.so - $Q $(LDCONFIG) - - .PHONY: install-static --- -2.11.0 - diff --git a/package.bak/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch b/package.bak/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch deleted file mode 100644 index 6480e3c444..0000000000 --- a/package.bak/wiringpi/0002-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 7f65eb37a82a6d9b095d9c8f262ad9dd205acd03 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 30 Jan 2016 16:57:38 -0800 -Subject: [PATCH] include directly for _IOC_SIZEBITS - -Fixes errors like -| wiringPiSPI.c: In function 'wiringPiSPIDataRW': -| wiringPiSPI.c:89:35: error: '_IOC_SIZEBITS' undeclared (first use in -this function) - -Signed-off-by: Khem Raj -[Patch from https://raw.githubusercontent.com/agherzan/meta-raspberrypi/master/recipes-devtools/wiringPi/wiringpi/0001-include-asm-ioctl.h-directly-for-_IOC_SIZEBITS.patch] -Signed-off-by: Peter Seiderere ---- -Upstream-Status: Submitted - - wiringPi/wiringPi.c | 1 + - wiringPi/wiringPiI2C.c | 1 + - wiringPi/wiringPiSPI.c | 1 + - 3 files changed, 3 insertions(+) - -diff --git a/wiringPi/wiringPi.c b/wiringPi/wiringPi.c -index 32e5100..cb5db9d 100644 ---- a/wiringPi/wiringPi.c -+++ b/wiringPi/wiringPi.c -@@ -64,6 +64,7 @@ - #include - #include - #include -+#include - #include - #include - #include -diff --git a/wiringPi/wiringPiI2C.c b/wiringPi/wiringPiI2C.c -index c787bce..efdf53c 100644 ---- a/wiringPi/wiringPiI2C.c -+++ b/wiringPi/wiringPiI2C.c -@@ -52,6 +52,7 @@ - #include - #include - #include -+#include - - #include "wiringPi.h" - #include "wiringPiI2C.h" -diff --git a/wiringPi/wiringPiSPI.c b/wiringPi/wiringPiSPI.c -index 453df31..ae3c7d9 100644 ---- a/wiringPi/wiringPiSPI.c -+++ b/wiringPi/wiringPiSPI.c -@@ -27,6 +27,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.7.0 - diff --git a/package.bak/wiringpi/Config.in b/package.bak/wiringpi/Config.in deleted file mode 100644 index 2062a6208e..0000000000 --- a/package.bak/wiringpi/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_WIRINGPI - bool "wiringpi" - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - help - wiringPi libraries (and gpio command) - - http://wiringpi.com/ - -comment "wiringpi needs a toolchain w/ threads" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/wiringpi/wiringpi.hash b/package.bak/wiringpi/wiringpi.hash deleted file mode 100644 index abddaf9b27..0000000000 --- a/package.bak/wiringpi/wiringpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 0775e3bfa2df2131746c75d611ad354e5c884661be0d9de9fd786fc96f6ad918 wiringPi-2.32.tar.gz diff --git a/package.bak/wiringpi/wiringpi.mk b/package.bak/wiringpi/wiringpi.mk deleted file mode 100644 index ce0819dace..0000000000 --- a/package.bak/wiringpi/wiringpi.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# wiringpi -# -################################################################################ - -WIRINGPI_VERSION = 2.32 -WIRINGPI_SITE = git://git.drogon.net/wiringPi - -WIRINGPI_LICENSE = LGPLv3+ -WIRINGPI_LICENSE_FILES = COPYING.LESSER -WIRINGPI_INSTALL_STAGING = YES - -ifeq ($(BR2_STATIC_LIBS),y) -WIRINGPI_LIB_BUILD_TARGETS = static -WIRINGPI_LIB_INSTALL_TARGETS = install-static -WIRINGPI_BIN_BUILD_TARGETS = gpio-static -else ifeq ($(BR2_SHARED_LIBS),y) -WIRINGPI_LIB_BUILD_TARGETS = all -WIRINGPI_LIB_INSTALL_TARGETS = install -WIRINGPI_BIN_BUILD_TARGETS = all -else -WIRINGPI_LIB_BUILD_TARGETS = all static -WIRINGPI_LIB_INSTALL_TARGETS = install install-static -WIRINGPI_BIN_BUILD_TARGETS = all -endif - -define WIRINGPI_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_BUILD_TARGETS) - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_BUILD_TARGETS) - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D)/gpio $(WIRINGPI_BIN_BUILD_TARGETS) -endef - -define WIRINGPI_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(STAGING_DIR) PREFIX=/usr LDCONFIG=true -endef - -define WIRINGPI_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/wiringPi $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/devLib $(WIRINGPI_LIB_INSTALL_TARGETS) DESTDIR=$(TARGET_DIR) PREFIX=/usr LDCONFIG=true - $(INSTALL) -D -m 0755 $(@D)/gpio/gpio $(TARGET_DIR)/usr/bin/gpio - $(INSTALL) -D -m 0755 $(@D)/gpio/pintest $(TARGET_DIR)/usr/bin/pintest -endef - -$(eval $(generic-package)) diff --git a/package.bak/wmctrl/Config.in b/package.bak/wmctrl/Config.in deleted file mode 100644 index bc09431ed4..0000000000 --- a/package.bak/wmctrl/Config.in +++ /dev/null @@ -1,24 +0,0 @@ -config BR2_PACKAGE_WMCTRL - bool "wmctrl" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_LIBGLIB2 - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_WCHAR # libglib2 - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_MMU # libglib2 - help - Provides command line access to almost all the features - defined in the EWMH specification. It can be used, for - example, to get information about the window manager, to get - a detailed list of desktops and managed windows, to switch - and resize desktops, to make windows full-screen, - always-above or sticky, and to activate, close, move, - resize, maximize and minimize them. - - https://sites.google.com/site/tstyblo/wmctrl/ - -comment "wmctrl needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on BR2_PACKAGE_XORG7 - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/wmctrl/wmctrl.hash b/package.bak/wmctrl/wmctrl.hash deleted file mode 100644 index a08c0e9e04..0000000000 --- a/package.bak/wmctrl/wmctrl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 wmctrl-1.07.tar.gz diff --git a/package.bak/wmctrl/wmctrl.mk b/package.bak/wmctrl/wmctrl.mk deleted file mode 100644 index f26b23e160..0000000000 --- a/package.bak/wmctrl/wmctrl.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# wmctrl -# -################################################################################ - -WMCTRL_VERSION = 1.07 -WMCTRL_SITE = https://sites.google.com/site/tstyblo/wmctrl -WMCTRL_LICENSE = GPLv2+ -WMCTRL_LICENSE_FILES = COPYING - -WMCTRL_DEPENDENCIES = libglib2 xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/wpa_supplicant/Config.in b/package.bak/wpa_supplicant/Config.in deleted file mode 100644 index 4b810bf1a8..0000000000 --- a/package.bak/wpa_supplicant/Config.in +++ /dev/null @@ -1,118 +0,0 @@ -config BR2_PACKAGE_WPA_SUPPLICANT - bool "wpa_supplicant" - depends on BR2_USE_MMU # fork() - help - WPA supplicant for secure wireless networks - - http://w1.fi/wpa_supplicant/ - -if BR2_PACKAGE_WPA_SUPPLICANT - -config BR2_PACKAGE_WPA_SUPPLICANT_NL80211 - bool "Enable nl80211 support" - default y - depends on BR2_TOOLCHAIN_HAS_THREADS # libnl - select BR2_PACKAGE_LIBNL - help - Enable support for nl80211. This is the current wireless - API for Linux, supported by all wireless drivers in vanilla - Linux, but may not be supported by some out-of-tree Linux - wireless drivers. wpa_supplicant will still fall back to - using the Wireless Extensions (wext) API with these drivers. - - If this option is disabled, then only the deprecated wext - API will be supported, with far less features. Linux may - supports using wext with modern drivers using a - compatibility layer, but it must be enabled in the kernel - configuration. - -comment "nl80211 support needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT - bool "Enable AP mode" - depends on BR2_PACKAGE_WPA_SUPPLICANT_NL80211 - help - With this option enabled, wpa_supplicant can act as an - access point much like hostapd does with a limited feature set. - This links in parts of hostapd functionality into wpa_supplicant, - making it bigger but dispensing the need for a separate hostapd - binary in some applications hence being smaller overall. - -config BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY - bool "Enable Wi-Fi Display" - depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT - help - Enable support for Wi-Fi Display - -config BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING - bool "Enable mesh networking" - depends on BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT - help - Enable support for open and secured mesh networking - (IEEE 802.11s) - -config BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN - bool "Enable autoscan" - help - Enable support for the autoscan feature (allow periodic scan) - -config BR2_PACKAGE_WPA_SUPPLICANT_EAP - bool "Enable EAP" - help - Enable support for EAP. - -config BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT - bool "Enable HS20" - help - Enable Hotspot 2.0 and IEEE 802.11u interworking functionality. - -config BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG - bool "Enable syslog support" - help - Enable support for sending debug messages to syslog. - -config BR2_PACKAGE_WPA_SUPPLICANT_WPS - bool "Enable WPS" - help - Enable support for Wi-Fi Protected Setup (WPS). - -config BR2_PACKAGE_WPA_SUPPLICANT_CLI - bool "Install wpa_cli binary" - help - Install wpa_cli command line utility - -config BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO - bool "Install wpa_client shared library" - depends on !BR2_STATIC_LIBS - help - Install libwpa_client.so. - -comment "wpa_client library needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE - bool "Install wpa_passphrase binary" - help - Install wpa_passphrase command line utility. - -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD - bool "Enable support for old DBus control interface" - depends on BR2_PACKAGE_DBUS - help - Enable support for old DBus control interface - (fi.epitest.hostap.WPASupplicant). - -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW - bool "Enable support for new DBus control interface" - depends on BR2_PACKAGE_DBUS - help - Enable support for new DBus control interface (fi.w1.wpa_supplicant1). - -config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION - bool "Introspection support" - depends on BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW - help - Add introspection support for new DBus control interface. - -endif diff --git a/package.bak/wpa_supplicant/wpa_supplicant.conf b/package.bak/wpa_supplicant/wpa_supplicant.conf deleted file mode 100644 index 1994a6c739..0000000000 --- a/package.bak/wpa_supplicant/wpa_supplicant.conf +++ /dev/null @@ -1,6 +0,0 @@ -ctrl_interface=/var/run/wpa_supplicant -ap_scan=1 - -network={ - key_mgmt=NONE -} diff --git a/package.bak/wpa_supplicant/wpa_supplicant.hash b/package.bak/wpa_supplicant/wpa_supplicant.hash deleted file mode 100644 index 65a6ae246f..0000000000 --- a/package.bak/wpa_supplicant/wpa_supplicant.hash +++ /dev/null @@ -1,9 +0,0 @@ -# Locally calculated -sha256 b4936d34c4e6cdd44954beba74296d964bc2c9668ecaa5255e499636fe2b1450 wpa_supplicant-2.6.tar.gz -sha256 529113cc81256c6178f3c1cf25dd8d3f33e6d770e4a180bd31c6ab7e4917f40b rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch -sha256 d86d47ab74170f3648b45b91bce780949ca92b09ab43df065178850ec0c335d7 rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch -sha256 d4535e36739a0cc7f3585e6bcba3c0bb8fc67cb3e729844e448c5dc751f47e81 rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch -sha256 793a54748161b5af430dd9de4a1988d19cb8e85ab29bc2340f886b0297cee20b rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch -sha256 596d4d3b63ea859ed7ea9791b3a21cb11b6173b04c0a14a2afa47edf1666afa6 rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch -sha256 c5a17af84aec2d88c56ce0da2d6945be398fe7cab5c0c340deb30973900c2736 rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch -sha256 c8840d857b9432f3b488113c85c1ff5d4a4b8d81078b7033388dae1e990843b1 rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch diff --git a/package.bak/wpa_supplicant/wpa_supplicant.mk b/package.bak/wpa_supplicant/wpa_supplicant.mk deleted file mode 100644 index 75ecbaa53c..0000000000 --- a/package.bak/wpa_supplicant/wpa_supplicant.mk +++ /dev/null @@ -1,232 +0,0 @@ -################################################################################ -# -# wpa_supplicant -# -################################################################################ - -WPA_SUPPLICANT_VERSION = 2.6 -WPA_SUPPLICANT_SITE = http://w1.fi/releases -WPA_SUPPLICANT_PATCH = \ - http://w1.fi/security/2017-1/rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0003-Extend-protection-of-GTK-IGTK-reinstallation-of-WNM-.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0004-Prevent-installation-of-an-all-zero-TK.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0006-TDLS-Reject-TPK-TK-reconfiguration.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0007-WNM-Ignore-WNM-Sleep-Mode-Response-without-pending-r.patch \ - http://w1.fi/security/2017-1/rebased-v2.6-0008-FT-Do-not-allow-multiple-Reassociation-Response-fram.patch -WPA_SUPPLICANT_LICENSE = BSD-3-Clause -WPA_SUPPLICANT_LICENSE_FILES = README -WPA_SUPPLICANT_CONFIG = $(WPA_SUPPLICANT_DIR)/wpa_supplicant/.config -WPA_SUPPLICANT_SUBDIR = wpa_supplicant -WPA_SUPPLICANT_DBUS_OLD_SERVICE = fi.epitest.hostap.WPASupplicant -WPA_SUPPLICANT_DBUS_NEW_SERVICE = fi.w1.wpa_supplicant1 -WPA_SUPPLICANT_CFLAGS = $(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/libnl3/ -WPA_SUPPLICANT_LDFLAGS = $(TARGET_LDFLAGS) - -# install the wpa_client library -WPA_SUPPLICANT_INSTALL_STAGING = YES - -WPA_SUPPLICANT_CONFIG_EDITS = - -# Add support for simple background scan -WPA_SUPPLICANT_CONFIG_SET = CONFIG_BGSCAN_SIMPLE - -WPA_SUPPLICANT_CONFIG_ENABLE = \ - CONFIG_IEEE80211AC \ - CONFIG_IEEE80211N \ - CONFIG_IEEE80211R \ - CONFIG_INTERNAL_LIBTOMMATH \ - CONFIG_DEBUG_FILE \ - CONFIG_MATCH_IFACE - -WPA_SUPPLICANT_CONFIG_DISABLE = \ - CONFIG_SMARTCARD - -# libnl-3 needs -lm (for rint) and -lpthread if linking statically -# And library order matters hence stick -lnl-3 first since it's appended -# in the wpa_supplicant Makefiles as in LIBS+=-lnl-3 ... thus failing -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_NL80211),y) -ifeq ($(BR2_STATIC_LIBS),y) -WPA_SUPPLICANT_LIBS += -lnl-3 -lm -lpthread -endif -WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf libnl -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_LIBNL32 -else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_DRIVER_NL80211 -endif - -# Trailing underscore on purpose to not enable CONFIG_EAPOL_TEST -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_EAP),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_EAP_ -# uses dlopen() -ifeq ($(BR2_STATIC_LIBS),y) -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_TNC -endif -else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_HS20 \ - CONFIG_INTERWORKING -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT),y) -WPA_SUPPLICANT_CONFIG_ENABLE += \ - CONFIG_AP \ - CONFIG_P2P -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WIFI_DISPLAY -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_MESH -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_IEEE80211W -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN),y) -WPA_SUPPLICANT_CONFIG_ENABLE += \ - CONFIG_AUTOSCAN_EXPONENTIAL \ - CONFIG_AUTOSCAN_PERIODIC -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPS),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_WPS -endif - -# Try to use openssl if it's already available -ifeq ($(BR2_PACKAGE_LIBOPENSSL),y) -WPA_SUPPLICANT_DEPENDENCIES += libopenssl -WPA_SUPPLICANT_LIBS += $(if $(BR2_STATIC_LIBS),-lcrypto -lz) -WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=openssl\)/\1/' -else -WPA_SUPPLICANT_CONFIG_DISABLE += CONFIG_EAP_PWD -WPA_SUPPLICANT_CONFIG_EDITS += 's/\#\(CONFIG_TLS=\).*/\1internal/' -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -WPA_SUPPLICANT_DEPENDENCIES += host-pkgconf dbus -WPA_SUPPLICANT_MAKE_ENV = \ - PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \ - PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig" - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS= -define WPA_SUPPLICANT_INSTALL_DBUS_OLD - $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_OLD_SERVICE).service -endef -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_NEW -define WPA_SUPPLICANT_INSTALL_DBUS_NEW - $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service \ - $(TARGET_DIR)/usr/share/dbus-1/system-services/$(WPA_SUPPLICANT_DBUS_NEW_SERVICE).service -endef -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_CTRL_IFACE_DBUS_INTRO -endif - -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG),y) -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_DEBUG_SYSLOG -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -WPA_SUPPLICANT_DEPENDENCIES += readline -WPA_SUPPLICANT_CONFIG_ENABLE += CONFIG_READLINE -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO),y) -WPA_SUPPLICANT_CONFIG_SET += CONFIG_BUILD_WPA_CLIENT_SO -define WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ - $(TARGET_DIR)/usr/lib/libwpa_client.so - $(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \ - $(TARGET_DIR)/usr/include/wpa_ctrl.h -endef -define WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/libwpa_client.so \ - $(STAGING_DIR)/usr/lib/libwpa_client.so - $(INSTALL) -m 0644 -D $(@D)/src/common/wpa_ctrl.h \ - $(STAGING_DIR)/usr/include/wpa_ctrl.h -endef -endif - -define WPA_SUPPLICANT_CONFIGURE_CMDS - cp $(@D)/wpa_supplicant/defconfig $(WPA_SUPPLICANT_CONFIG) - sed -i $(patsubst %,-e 's/^#\(%\)/\1/',$(WPA_SUPPLICANT_CONFIG_ENABLE)) \ - $(patsubst %,-e 's/^\(%\)/#\1/',$(WPA_SUPPLICANT_CONFIG_DISABLE)) \ - $(patsubst %,-e '1i%=y',$(WPA_SUPPLICANT_CONFIG_SET)) \ - $(patsubst %,-e %,$(WPA_SUPPLICANT_CONFIG_EDITS)) \ - $(WPA_SUPPLICANT_CONFIG) -endef - -# LIBS for wpa_supplicant, LIBS_c for wpa_cli, LIBS_p for wpa_passphrase -define WPA_SUPPLICANT_BUILD_CMDS - $(TARGET_MAKE_ENV) CFLAGS="$(WPA_SUPPLICANT_CFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" BINDIR=/usr/sbin \ - LIBS="$(WPA_SUPPLICANT_LIBS)" LIBS_c="$(WPA_SUPPLICANT_LIBS)" \ - LIBS_p="$(WPA_SUPPLICANT_LIBS)" \ - $(MAKE) CC="$(TARGET_CC)" -C $(@D)/$(WPA_SUPPLICANT_SUBDIR) -endef - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_CLI),y) -define WPA_SUPPLICANT_INSTALL_CLI - $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_cli \ - $(TARGET_DIR)/usr/sbin/wpa_cli -endef -endif - -ifeq ($(BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE),y) -define WPA_SUPPLICANT_INSTALL_PASSPHRASE - $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_passphrase \ - $(TARGET_DIR)/usr/sbin/wpa_passphrase -endef -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -define WPA_SUPPLICANT_INSTALL_DBUS - $(INSTALL) -m 0644 -D \ - $(@D)/wpa_supplicant/dbus/dbus-wpa_supplicant.conf \ - $(TARGET_DIR)/etc/dbus-1/system.d/wpa_supplicant.conf - $(WPA_SUPPLICANT_INSTALL_DBUS_OLD) - $(WPA_SUPPLICANT_INSTALL_DBUS_NEW) -endef -endif - -define WPA_SUPPLICANT_INSTALL_STAGING_CMDS - $(WPA_SUPPLICANT_INSTALL_STAGING_WPA_CLIENT_SO) -endef - -define WPA_SUPPLICANT_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/wpa_supplicant \ - $(TARGET_DIR)/usr/sbin/wpa_supplicant - $(INSTALL) -m 644 -D package/wpa_supplicant/wpa_supplicant.conf \ - $(TARGET_DIR)/etc/wpa_supplicant.conf - $(WPA_SUPPLICANT_INSTALL_CLI) - $(WPA_SUPPLICANT_INSTALL_PASSPHRASE) - $(WPA_SUPPLICANT_INSTALL_DBUS) - $(WPA_SUPPLICANT_INSTALL_WPA_CLIENT_SO) -endef - -define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant.service - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant@.service - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-nl80211@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service - $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ - $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service -endef - -$(eval $(generic-package)) diff --git a/package.bak/wpan-tools/0001-fix-build-with-newer-libnl.patch b/package.bak/wpan-tools/0001-fix-build-with-newer-libnl.patch deleted file mode 100644 index 03e1a03340..0000000000 --- a/package.bak/wpan-tools/0001-fix-build-with-newer-libnl.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 51ab69d76aa708c79aed971ee4083abb8cc07201 Mon Sep 17 00:00:00 2001 -From: Stefan Schmidt -Date: Mon, 9 Nov 2015 19:06:25 +0100 -Subject: [PATCH] build: avoid redefinition errors with libnl >= 3.2.27 - -From 3.2.17 onwards we have nla for s8, s16, etc defined directly in libnl. -If we keep including this file anyway we run into redefinition errors. Better -include use our own only for earlier versions. - -Happened to me on Fedora 22 after my last update. - -Signed-off-by: Stefan Schmidt -Acked-by: Alexander Aring -Signed-off-by: Gustavo Zacarias ---- -Patch status: upstream - - src/nl_extras.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/nl_extras.h b/src/nl_extras.h -index 9d841aa..c4d1d14 100644 ---- a/src/nl_extras.h -+++ b/src/nl_extras.h -@@ -1,6 +1,8 @@ - #ifndef __NL_EXTRAS_H - #define __NL_EXTRAS_H - -+#if LIBNL_VER_MIC <= 26 -+ - #ifndef NLA_S8 - - #define NLA_S8 13 -@@ -43,4 +45,6 @@ static inline int32_t nla_get_s32(struct nlattr *nla) - - #endif /* NLA_S64 */ - -+#endif /* LIBNL_VER_MIC */ -+ - #endif /* __NL_EXTRAS_H */ diff --git a/package.bak/wpan-tools/Config.in b/package.bak/wpan-tools/Config.in deleted file mode 100644 index 9e327420a0..0000000000 --- a/package.bak/wpan-tools/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_WPAN_TOOLS - bool "wpan-tools" - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_LIBNL - help - Userspace tools for Linux IEEE 802.15.4 stack. - - http://wpan.cakelab.org/ - -comment "wpan-tools needs a toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/wpan-tools/wpan-tools.hash b/package.bak/wpan-tools/wpan-tools.hash deleted file mode 100644 index fbcf64c081..0000000000 --- a/package.bak/wpan-tools/wpan-tools.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://wpan.cakelab.org/releases/md5sum -md5 c6356f7be4de2e9f2084283b9ed7e1ab wpan-tools-0.5.tar.gz -# Calculated based on the hash above -sha256 f381f24eb1962aa9e21751004560371bb9ad8bd0b735bc493930f50e8c1f3d99 wpan-tools-0.5.tar.gz diff --git a/package.bak/wpan-tools/wpan-tools.mk b/package.bak/wpan-tools/wpan-tools.mk deleted file mode 100644 index d223800449..0000000000 --- a/package.bak/wpan-tools/wpan-tools.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# wpan-tools -# -################################################################################ - -WPAN_TOOLS_VERSION = 0.5 -WPAN_TOOLS_SITE = http://wpan.cakelab.org/releases -WPAN_TOOLS_DEPENDENCIES = host-pkgconf libnl -WPAN_TOOLS_LICENSE = iw license -WPAN_TOOLS_LICENSE_FILES = COPYING - -$(eval $(autotools-package)) diff --git a/package.bak/wsapi/Config.in b/package.bak/wsapi/Config.in deleted file mode 100644 index 348a0404b6..0000000000 --- a/package.bak/wsapi/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_WSAPI - bool "wsapi" - # Runtime dependency only - select BR2_PACKAGE_COXPCALL - select BR2_PACKAGE_LUAFILESYSTEM - select BR2_PACKAGE_RINGS - help - API that abstracts the web server from Lua web applications. - - http://keplerproject.github.com/wsapi/ diff --git a/package.bak/wsapi/wsapi.hash b/package.bak/wsapi/wsapi.hash deleted file mode 100644 index 3abbfc979a..0000000000 --- a/package.bak/wsapi/wsapi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 f7f1b0ddc68c257965c42ac7155904d8ff7c2b7256f65ef1b82fda0039137d61 wsapi-1.6.1-1.src.rock diff --git a/package.bak/wsapi/wsapi.mk b/package.bak/wsapi/wsapi.mk deleted file mode 100644 index 0cca6cb4d6..0000000000 --- a/package.bak/wsapi/wsapi.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# wsapi -# -################################################################################ - -WSAPI_VERSION = 1.6.1-1 -WSAPI_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/x11r7/Config.in b/package.bak/x11r7/Config.in deleted file mode 100644 index c40a6438c5..0000000000 --- a/package.bak/x11r7/Config.in +++ /dev/null @@ -1,278 +0,0 @@ -menuconfig BR2_PACKAGE_XORG7 - bool "X.org X Window System" - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # dlopen in xlib_libX11 - help - Support for X11R7 libraries, servers, drivers, and/or - applications in the target. - - http://xorg.freedesktop.org - -if BR2_PACKAGE_XORG7 - menu "X11R7 Servers" - source package/x11r7/xserver_xorg-server/Config.in - endmenu - menu "X11R7 Libraries" - source package/x11r7/libxcb/Config.in - source package/x11r7/xcb-util/Config.in - source package/x11r7/xcb-util-cursor/Config.in - source package/x11r7/xcb-util-image/Config.in - source package/x11r7/xcb-util-keysyms/Config.in - source package/x11r7/xcb-util-renderutil/Config.in - source package/x11r7/xcb-util-wm/Config.in - source package/x11r7/xlib_libFS/Config.in - source package/x11r7/xlib_libICE/Config.in - source package/x11r7/xlib_libSM/Config.in - source package/x11r7/xlib_libX11/Config.in - source package/x11r7/xlib_libXScrnSaver/Config.in - source package/x11r7/xlib_libXau/Config.in - source package/x11r7/xlib_libXaw/Config.in - source package/x11r7/xlib_libXcomposite/Config.in - source package/x11r7/xlib_libXcursor/Config.in - source package/x11r7/xlib_libXdamage/Config.in - source package/x11r7/xlib_libXdmcp/Config.in - source package/x11r7/xlib_libXext/Config.in - source package/x11r7/xlib_libXfixes/Config.in - source package/x11r7/xlib_libXfont/Config.in - source package/x11r7/xlib_libXfont2/Config.in - source package/x11r7/xlib_libXft/Config.in - source package/x11r7/xlib_libXi/Config.in - source package/x11r7/xlib_libXinerama/Config.in - source package/x11r7/xlib_libXmu/Config.in - source package/x11r7/xlib_libXpm/Config.in - source package/x11r7/xlib_libXrandr/Config.in - source package/x11r7/xlib_libXrender/Config.in - source package/x11r7/xlib_libXres/Config.in - source package/x11r7/xlib_libXt/Config.in - source package/x11r7/xlib_libXtst/Config.in - source package/x11r7/xlib_libXv/Config.in - source package/x11r7/xlib_libXvMC/Config.in - source package/x11r7/xlib_libXxf86dga/Config.in - source package/x11r7/xlib_libXxf86vm/Config.in - source package/x11r7/xlib_libdmx/Config.in - source package/x11r7/xlib_libfontenc/Config.in - source package/x11r7/xlib_libxkbfile/Config.in - source package/x11r7/xlib_libxshmfence/Config.in - source package/x11r7/xlib_xtrans/Config.in - endmenu - menu "X11R7 Applications" - source package/x11r7/xapp_appres/Config.in - source package/x11r7/xapp_bdftopcf/Config.in - source package/x11r7/xapp_beforelight/Config.in - source package/x11r7/xapp_bitmap/Config.in - source package/x11r7/xapp_editres/Config.in - source package/x11r7/xapp_fonttosfnt/Config.in - source package/x11r7/xapp_fslsfonts/Config.in - source package/x11r7/xapp_fstobdf/Config.in - source package/x11r7/xapp_iceauth/Config.in - source package/x11r7/xapp_ico/Config.in - source package/x11r7/xapp_listres/Config.in - source package/x11r7/xapp_luit/Config.in - source package/x11r7/xapp_mkfontdir/Config.in - source package/x11r7/xapp_mkfontscale/Config.in - source package/x11r7/xapp_oclock/Config.in - source package/x11r7/xapp_rgb/Config.in - source package/x11r7/xapp_rstart/Config.in - source package/x11r7/xapp_scripts/Config.in - source package/x11r7/xapp_sessreg/Config.in - source package/x11r7/xapp_setxkbmap/Config.in - source package/x11r7/xapp_showfont/Config.in - source package/x11r7/xapp_smproxy/Config.in - source package/x11r7/xapp_twm/Config.in - source package/x11r7/xapp_viewres/Config.in - source package/x11r7/xapp_x11perf/Config.in - source package/x11r7/xapp_xauth/Config.in - source package/x11r7/xapp_xbacklight/Config.in - source package/x11r7/xapp_xbiff/Config.in - source package/x11r7/xapp_xcalc/Config.in - source package/x11r7/xapp_xclipboard/Config.in - source package/x11r7/xapp_xclock/Config.in - source package/x11r7/xapp_xcmsdb/Config.in - source package/x11r7/xapp_xcompmgr/Config.in - source package/x11r7/xapp_xconsole/Config.in - source package/x11r7/xapp_xcursorgen/Config.in - source package/x11r7/xapp_xdbedizzy/Config.in - source package/x11r7/xapp_xditview/Config.in - source package/x11r7/xapp_xdm/Config.in - source package/x11r7/xapp_xdpyinfo/Config.in - source package/x11r7/xapp_xdriinfo/Config.in - source package/x11r7/xapp_xedit/Config.in - source package/x11r7/xapp_xev/Config.in - source package/x11r7/xapp_xeyes/Config.in - source package/x11r7/xapp_xf86dga/Config.in - source package/x11r7/xapp_xfd/Config.in - source package/x11r7/xapp_xfindproxy/Config.in - source package/x11r7/xapp_xfontsel/Config.in - source package/x11r7/xapp_xfs/Config.in - source package/x11r7/xapp_xfsinfo/Config.in - source package/x11r7/xapp_xgamma/Config.in - source package/x11r7/xapp_xgc/Config.in - source package/x11r7/xapp_xhost/Config.in - source package/x11r7/xapp_xinit/Config.in - source package/x11r7/xapp_xinput/Config.in - source package/x11r7/xapp_xinput-calibrator/Config.in - source package/x11r7/xapp_xkbcomp/Config.in - source package/x11r7/xapp_xkbevd/Config.in - source package/x11r7/xapp_xkbprint/Config.in - source package/x11r7/xapp_xkbutils/Config.in - source package/x11r7/xapp_xkill/Config.in - source package/x11r7/xapp_xload/Config.in - source package/x11r7/xapp_xlogo/Config.in - source package/x11r7/xapp_xlsatoms/Config.in - source package/x11r7/xapp_xlsclients/Config.in - source package/x11r7/xapp_xlsfonts/Config.in - source package/x11r7/xapp_xmag/Config.in - source package/x11r7/xapp_xman/Config.in - source package/x11r7/xapp_xmessage/Config.in - source package/x11r7/xapp_xmh/Config.in - source package/x11r7/xapp_xmodmap/Config.in - source package/x11r7/xapp_xmore/Config.in - source package/x11r7/xapp_xpr/Config.in - source package/x11r7/xapp_xprop/Config.in - source package/x11r7/xapp_xrandr/Config.in - source package/x11r7/xapp_xrdb/Config.in - source package/x11r7/xapp_xrefresh/Config.in - source package/x11r7/xapp_xset/Config.in - source package/x11r7/xapp_xsetmode/Config.in - source package/x11r7/xapp_xsetpointer/Config.in - source package/x11r7/xapp_xsetroot/Config.in - source package/x11r7/xapp_xsm/Config.in - source package/x11r7/xapp_xstdcmap/Config.in - source package/x11r7/xapp_xvidtune/Config.in - source package/x11r7/xapp_xvinfo/Config.in - source package/x11r7/xapp_xwd/Config.in - source package/x11r7/xapp_xwininfo/Config.in - source package/x11r7/xapp_xwud/Config.in - endmenu - if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - menu "X11R7 Drivers" - source package/x11r7/xdriver_xf86-input-evdev/Config.in - source package/x11r7/xdriver_xf86-input-joystick/Config.in - source package/x11r7/xdriver_xf86-input-keyboard/Config.in - source package/x11r7/xdriver_xf86-input-libinput/Config.in - source package/x11r7/xdriver_xf86-input-mouse/Config.in - source package/x11r7/xdriver_xf86-input-synaptics/Config.in - source package/x11r7/xdriver_xf86-input-tslib/Config.in - source package/x11r7/xdriver_xf86-input-vmmouse/Config.in - source package/x11r7/xdriver_xf86-video-amdgpu/Config.in - source package/x11r7/xdriver_xf86-video-ark/Config.in - source package/x11r7/xdriver_xf86-video-ast/Config.in - source package/x11r7/xdriver_xf86-video-ati/Config.in - source package/x11r7/xdriver_xf86-video-cirrus/Config.in - source package/x11r7/xdriver_xf86-video-dummy/Config.in - source package/x11r7/xdriver_xf86-video-fbdev/Config.in - source package/x11r7/xdriver_xf86-video-fbturbo/Config.in - source package/x11r7/xdriver_xf86-video-geode/Config.in - source package/x11r7/xdriver_xf86-video-glide/Config.in - source package/x11r7/xdriver_xf86-video-glint/Config.in - source package/x11r7/xdriver_xf86-video-i128/Config.in - source package/x11r7/xdriver_xf86-video-imx/Config.in - source package/x11r7/xdriver_xf86-video-imx-viv/Config.in - source package/x11r7/xdriver_xf86-video-intel/Config.in - source package/x11r7/xdriver_xf86-video-mach64/Config.in - source package/x11r7/xdriver_xf86-video-mga/Config.in - source package/x11r7/xdriver_xf86-video-neomagic/Config.in - source package/x11r7/xdriver_xf86-video-nouveau/Config.in - source package/x11r7/xdriver_xf86-video-nv/Config.in - source package/x11r7/xdriver_xf86-video-openchrome/Config.in - source package/x11r7/xdriver_xf86-video-qxl/Config.in - source package/x11r7/xdriver_xf86-video-r128/Config.in - source package/x11r7/xdriver_xf86-video-savage/Config.in - source package/x11r7/xdriver_xf86-video-siliconmotion/Config.in - source package/x11r7/xdriver_xf86-video-sis/Config.in - source package/x11r7/xdriver_xf86-video-tdfx/Config.in - source package/x11r7/xdriver_xf86-video-tga/Config.in - source package/x11r7/xdriver_xf86-video-trident/Config.in - source package/x11r7/xdriver_xf86-video-v4l/Config.in - source package/x11r7/xdriver_xf86-video-vesa/Config.in - source package/x11r7/xdriver_xf86-video-vmware/Config.in - source package/x11r7/xdriver_xf86-video-voodoo/Config.in - source package/x11r7/xdriver_xf86-video-wsfb/Config.in - endmenu - endif - menu "X11R7 Fonts" - source package/x11r7/xfont_font-util/Config.in - source package/x11r7/xfont_encodings/Config.in - source package/x11r7/xfont_font-adobe-100dpi/Config.in - source package/x11r7/xfont_font-adobe-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-100dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-75dpi/Config.in - source package/x11r7/xfont_font-adobe-utopia-type1/Config.in - source package/x11r7/xfont_font-alias/Config.in - source package/x11r7/xfont_font-arabic-misc/Config.in - source package/x11r7/xfont_font-bh-100dpi/Config.in - source package/x11r7/xfont_font-bh-75dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in - source package/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in - source package/x11r7/xfont_font-bh-ttf/Config.in - source package/x11r7/xfont_font-bh-type1/Config.in - source package/x11r7/xfont_font-bitstream-100dpi/Config.in - source package/x11r7/xfont_font-bitstream-75dpi/Config.in - source package/x11r7/xfont_font-bitstream-type1/Config.in - source package/x11r7/xfont_font-cronyx-cyrillic/Config.in - source package/x11r7/xfont_font-cursor-misc/Config.in - source package/x11r7/xfont_font-daewoo-misc/Config.in - source package/x11r7/xfont_font-dec-misc/Config.in - source package/x11r7/xfont_font-ibm-type1/Config.in - source package/x11r7/xfont_font-isas-misc/Config.in - source package/x11r7/xfont_font-jis-misc/Config.in - source package/x11r7/xfont_font-micro-misc/Config.in - source package/x11r7/xfont_font-misc-cyrillic/Config.in - source package/x11r7/xfont_font-misc-ethiopic/Config.in - source package/x11r7/xfont_font-misc-meltho/Config.in - source package/x11r7/xfont_font-misc-misc/Config.in - source package/x11r7/xfont_font-mutt-misc/Config.in - source package/x11r7/xfont_font-schumacher-misc/Config.in - source package/x11r7/xfont_font-screen-cyrillic/Config.in - source package/x11r7/xfont_font-sony-misc/Config.in - source package/x11r7/xfont_font-sun-misc/Config.in - source package/x11r7/xfont_font-winitzki-cyrillic/Config.in - source package/x11r7/xfont_font-xfree86-type1/Config.in - endmenu - menu "X11R7 X protocols" - source package/x11r7/xcb-proto/Config.in - source package/x11r7/xproto_applewmproto/Config.in - source package/x11r7/xproto_bigreqsproto/Config.in - source package/x11r7/xproto_compositeproto/Config.in - source package/x11r7/xproto_damageproto/Config.in - source package/x11r7/xproto_dmxproto/Config.in - source package/x11r7/xproto_dri2proto/Config.in - source package/x11r7/xproto_dri3proto/Config.in - source package/x11r7/xproto_fixesproto/Config.in - source package/x11r7/xproto_fontcacheproto/Config.in - source package/x11r7/xproto_fontsproto/Config.in - source package/x11r7/xproto_glproto/Config.in - source package/x11r7/xproto_inputproto/Config.in - source package/x11r7/xproto_kbproto/Config.in - source package/x11r7/xproto_presentproto/Config.in - source package/x11r7/xproto_randrproto/Config.in - source package/x11r7/xproto_recordproto/Config.in - source package/x11r7/xproto_renderproto/Config.in - source package/x11r7/xproto_resourceproto/Config.in - source package/x11r7/xproto_scrnsaverproto/Config.in - source package/x11r7/xproto_videoproto/Config.in - source package/x11r7/xproto_windowswmproto/Config.in - source package/x11r7/xproto_xcmiscproto/Config.in - source package/x11r7/xproto_xextproto/Config.in - source package/x11r7/xproto_xf86bigfontproto/Config.in - source package/x11r7/xproto_xf86dgaproto/Config.in - source package/x11r7/xproto_xf86driproto/Config.in - source package/x11r7/xproto_xf86vidmodeproto/Config.in - source package/x11r7/xproto_xineramaproto/Config.in - source package/x11r7/xproto_xproto/Config.in - source package/x11r7/xproto_xproxymanagementprotocol/Config.in - endmenu - menu "X11R7 Utilities" - source package/x11r7/xutil_makedepend/Config.in - source package/x11r7/mcookie/Config.in - endmenu - menu "X11R7 Other data" - source package/x11r7/xdata_xbitmaps/Config.in - source package/x11r7/xdata_xcursor-themes/Config.in - source package/x11r7/xcursor-transparent-theme/Config.in - endmenu -endif - -comment "X.org needs a toolchain w/ wchar, threads, dynamic library" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/x11r7/libxcb/Config.in b/package.bak/x11r7/libxcb/Config.in deleted file mode 100644 index 32569f7918..0000000000 --- a/package.bak/x11r7/libxcb/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_LIBXCB - bool "libxcb" - select BR2_PACKAGE_LIBPTHREAD_STUBS - select BR2_PACKAGE_XCB_PROTO - select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXAU - help - The X protocol C-language Binding (XCB) is a replacement for - Xlib featuring a small footprint, latency hiding, direct access - to the protocol, improved threading support, and extensibility. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/libxcb/libxcb.hash b/package.bak/x11r7/libxcb/libxcb.hash deleted file mode 100644 index 6df7d01792..0000000000 --- a/package.bak/x11r7/libxcb/libxcb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002694.html -sha256 4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b libxcb-1.12.tar.bz2 diff --git a/package.bak/x11r7/libxcb/libxcb.mk b/package.bak/x11r7/libxcb/libxcb.mk deleted file mode 100644 index ba42418633..0000000000 --- a/package.bak/x11r7/libxcb/libxcb.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# libxcb -# -################################################################################ - -LIBXCB_VERSION = 1.12 -LIBXCB_SOURCE = libxcb-$(LIBXCB_VERSION).tar.bz2 -LIBXCB_SITE = http://xcb.freedesktop.org/dist -LIBXCB_LICENSE = MIT -LIBXCB_LICENSE_FILES = COPYING - -LIBXCB_INSTALL_STAGING = YES - -LIBXCB_DEPENDENCIES = \ - host-libxslt libpthread-stubs xcb-proto xlib_libXdmcp xlib_libXau \ - host-xcb-proto host-python host-pkgconf -HOST_LIBXCB_DEPENDENCIES = \ - host-libxslt host-libpthread-stubs host-xcb-proto host-xlib_libXdmcp \ - host-xlib_libXau host-python host-pkgconf - -LIBXCB_CONF_OPTS = --with-doxygen=no -HOST_LIBXCB_CONF_OPTS = --with-doxygen=no - -# libxcb is not python3 friendly, so force the python interpreter -HOST_LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2 -LIBXCB_CONF_OPTS += ac_cv_path_PYTHON=$(HOST_DIR)/usr/bin/python2 - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/mcookie/Config.in b/package.bak/x11r7/mcookie/Config.in deleted file mode 100644 index 2e9cfc76ea..0000000000 --- a/package.bak/x11r7/mcookie/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MCOOKIE - bool "mcookie" - help - cookie generator for X server - - http://www.x.org diff --git a/package.bak/x11r7/mcookie/mcookie.c b/package.bak/x11r7/mcookie/mcookie.c deleted file mode 100644 index 902d92fc47..0000000000 --- a/package.bak/x11r7/mcookie/mcookie.c +++ /dev/null @@ -1,425 +0,0 @@ -/* mcookie.c -- Generates random numbers for xauth - * Created: Fri Feb 3 10:42:48 1995 by faith@cs.unc.edu - * Revised: Fri Mar 19 07:48:01 1999 by faith@acm.org - * Public Domain 1995, 1999 Rickard E. Faith (faith@acm.org) - * This program comes with ABSOLUTELY NO WARRANTY. - * - * $Id: mcookie.c,v 1.5 1997/07/06 00:13:06 aebr Exp $ - * - * This program gathers some random bits of data and used the MD5 - * message-digest algorithm to generate a 128-bit hexadecimal number for - * use with xauth(1). - * - * NOTE: Unless /dev/random is available, this program does not actually - * gather 128 bits of random information, so the magic cookie generated - * will be considerably easier to guess than one might expect. - * - * 1999-02-22 Arkadiusz Mikiewicz - * - added Native Language Support - * 1999-03-21 aeb: Added some fragments of code from Colin Plumb. - * - */ - -#include -#include -#include -#include -#include -#include - -#define BUFFERSIZE 4096 - - -#ifndef MD5_H -#define MD5_H - -#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) -typedef unsigned int uint32; -#else -typedef unsigned long uint32; -#endif - -struct MD5Context { - uint32 buf[4]; - uint32 bits[2]; - unsigned char in[64]; -}; - -void MD5Init(struct MD5Context *context); -void MD5Update(struct MD5Context *context, unsigned char const *buf, - unsigned len); -void MD5Final(unsigned char digest[16], struct MD5Context *context); -void MD5Transform(uint32 buf[4], uint32 const in[16]); - -/* - * This is needed to make RSAREF happy on some MS-DOS compilers. - */ -typedef struct MD5Context MD5_CTX; - -#endif /* !MD5_H */ - - - -/* - * This code implements the MD5 message-digest algorithm. - * The algorithm is due to Ron Rivest. This code was - * written by Colin Plumb in 1993, no copyright is claimed. - * This code is in the public domain; do with it what you wish. - * - * Equivalent code is available from RSA Data Security, Inc. - * This code has been tested against that, and is equivalent, - * except that you don't need to include two pages of legalese - * with every copy. - * - * To compute the message digest of a chunk of bytes, declare an - * MD5Context structure, pass it to MD5Init, call MD5Update as - * needed on buffers full of bytes, and then call MD5Final, which - * will fill a supplied 16-byte array with the digest. - */ -#include /* for memcpy() */ -#include - -#if __BYTE_ORDER == __LITTLE_ENDIAN -#define byteReverse(buf, len) /* Nothing */ -#else -void byteReverse(unsigned char *buf, unsigned longs); - -/* - * Note: this code is harmless on little-endian machines. - */ -void byteReverse(unsigned char *buf, unsigned longs) -{ - uint32 t; - do { - t = (uint32) ((unsigned) buf[3] << 8 | buf[2]) << 16 | - ((unsigned) buf[1] << 8 | buf[0]); - *(uint32 *) buf = t; - buf += 4; - } while (--longs); -} -#endif - -/* - * Start MD5 accumulation. Set bit count to 0 and buffer to mysterious - * initialization constants. - */ -void MD5Init(struct MD5Context *ctx) -{ - ctx->buf[0] = 0x67452301; - ctx->buf[1] = 0xefcdab89; - ctx->buf[2] = 0x98badcfe; - ctx->buf[3] = 0x10325476; - - ctx->bits[0] = 0; - ctx->bits[1] = 0; -} - -/* - * Update context to reflect the concatenation of another buffer full - * of bytes. - */ -void MD5Update(struct MD5Context *ctx, unsigned char const *buf, unsigned len) -{ - uint32 t; - - /* Update bitcount */ - - t = ctx->bits[0]; - if ((ctx->bits[0] = t + ((uint32) len << 3)) < t) - ctx->bits[1]++; /* Carry from low to high */ - ctx->bits[1] += len >> 29; - - t = (t >> 3) & 0x3f; /* Bytes already in shsInfo->data */ - - /* Handle any leading odd-sized chunks */ - - if (t) { - unsigned char *p = (unsigned char *) ctx->in + t; - - t = 64 - t; - if (len < t) { - memcpy(p, buf, len); - return; - } - memcpy(p, buf, t); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32 *) ctx->in); - buf += t; - len -= t; - } - /* Process data in 64-byte chunks */ - - while (len >= 64) { - memcpy(ctx->in, buf, 64); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32 *) ctx->in); - buf += 64; - len -= 64; - } - - /* Handle any remaining bytes of data. */ - - memcpy(ctx->in, buf, len); -} - -/* - * Final wrapup - pad to 64-byte boundary with the bit pattern - * 1 0* (64-bit count of bits processed, MSB-first) - */ -void MD5Final(unsigned char digest[16], struct MD5Context *ctx) -{ - unsigned count; - unsigned char *p; - - /* Compute number of bytes mod 64 */ - count = (ctx->bits[0] >> 3) & 0x3F; - - /* Set the first char of padding to 0x80. This is safe since there is - always at least one byte free */ - p = ctx->in + count; - *p++ = 0x80; - - /* Bytes of padding needed to make 64 bytes */ - count = 64 - 1 - count; - - /* Pad out to 56 mod 64 */ - if (count < 8) { - /* Two lots of padding: Pad the first block to 64 bytes */ - memset(p, 0, count); - byteReverse(ctx->in, 16); - MD5Transform(ctx->buf, (uint32 *) ctx->in); - - /* Now fill the next block with 56 bytes */ - memset(ctx->in, 0, 56); - } else { - /* Pad block to 56 bytes */ - memset(p, 0, count - 8); - } - byteReverse(ctx->in, 14); - - /* Append length in bits and transform */ - ((uint32 *) ctx->in)[14] = ctx->bits[0]; - ((uint32 *) ctx->in)[15] = ctx->bits[1]; - - MD5Transform(ctx->buf, (uint32 *) ctx->in); - byteReverse((unsigned char *) ctx->buf, 4); - memcpy(digest, ctx->buf, 16); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ -} - -/* The four core functions - F1 is optimized somewhat */ - -/* #define F1(x, y, z) (x & y | ~x & z) */ -#define F1(x, y, z) (z ^ (x & (y ^ z))) -#define F2(x, y, z) F1(z, x, y) -#define F3(x, y, z) (x ^ y ^ z) -#define F4(x, y, z) (y ^ (x | ~z)) - -/* This is the central step in the MD5 algorithm. */ -#define MD5STEP(f, w, x, y, z, data, s) \ - ( w += f(x, y, z) + data, w = w<>(32-s), w += x ) - -/* - * The core of the MD5 algorithm, this alters an existing MD5 hash to - * reflect the addition of 16 longwords of new data. MD5Update blocks - * the data and converts bytes into longwords for this routine. - */ -void MD5Transform(uint32 buf[4], uint32 const in[16]) -{ - register uint32 a, b, c, d; - - a = buf[0]; - b = buf[1]; - c = buf[2]; - d = buf[3]; - - MD5STEP(F1, a, b, c, d, in[0] + 0xd76aa478, 7); - MD5STEP(F1, d, a, b, c, in[1] + 0xe8c7b756, 12); - MD5STEP(F1, c, d, a, b, in[2] + 0x242070db, 17); - MD5STEP(F1, b, c, d, a, in[3] + 0xc1bdceee, 22); - MD5STEP(F1, a, b, c, d, in[4] + 0xf57c0faf, 7); - MD5STEP(F1, d, a, b, c, in[5] + 0x4787c62a, 12); - MD5STEP(F1, c, d, a, b, in[6] + 0xa8304613, 17); - MD5STEP(F1, b, c, d, a, in[7] + 0xfd469501, 22); - MD5STEP(F1, a, b, c, d, in[8] + 0x698098d8, 7); - MD5STEP(F1, d, a, b, c, in[9] + 0x8b44f7af, 12); - MD5STEP(F1, c, d, a, b, in[10] + 0xffff5bb1, 17); - MD5STEP(F1, b, c, d, a, in[11] + 0x895cd7be, 22); - MD5STEP(F1, a, b, c, d, in[12] + 0x6b901122, 7); - MD5STEP(F1, d, a, b, c, in[13] + 0xfd987193, 12); - MD5STEP(F1, c, d, a, b, in[14] + 0xa679438e, 17); - MD5STEP(F1, b, c, d, a, in[15] + 0x49b40821, 22); - - MD5STEP(F2, a, b, c, d, in[1] + 0xf61e2562, 5); - MD5STEP(F2, d, a, b, c, in[6] + 0xc040b340, 9); - MD5STEP(F2, c, d, a, b, in[11] + 0x265e5a51, 14); - MD5STEP(F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20); - MD5STEP(F2, a, b, c, d, in[5] + 0xd62f105d, 5); - MD5STEP(F2, d, a, b, c, in[10] + 0x02441453, 9); - MD5STEP(F2, c, d, a, b, in[15] + 0xd8a1e681, 14); - MD5STEP(F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20); - MD5STEP(F2, a, b, c, d, in[9] + 0x21e1cde6, 5); - MD5STEP(F2, d, a, b, c, in[14] + 0xc33707d6, 9); - MD5STEP(F2, c, d, a, b, in[3] + 0xf4d50d87, 14); - MD5STEP(F2, b, c, d, a, in[8] + 0x455a14ed, 20); - MD5STEP(F2, a, b, c, d, in[13] + 0xa9e3e905, 5); - MD5STEP(F2, d, a, b, c, in[2] + 0xfcefa3f8, 9); - MD5STEP(F2, c, d, a, b, in[7] + 0x676f02d9, 14); - MD5STEP(F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20); - - MD5STEP(F3, a, b, c, d, in[5] + 0xfffa3942, 4); - MD5STEP(F3, d, a, b, c, in[8] + 0x8771f681, 11); - MD5STEP(F3, c, d, a, b, in[11] + 0x6d9d6122, 16); - MD5STEP(F3, b, c, d, a, in[14] + 0xfde5380c, 23); - MD5STEP(F3, a, b, c, d, in[1] + 0xa4beea44, 4); - MD5STEP(F3, d, a, b, c, in[4] + 0x4bdecfa9, 11); - MD5STEP(F3, c, d, a, b, in[7] + 0xf6bb4b60, 16); - MD5STEP(F3, b, c, d, a, in[10] + 0xbebfbc70, 23); - MD5STEP(F3, a, b, c, d, in[13] + 0x289b7ec6, 4); - MD5STEP(F3, d, a, b, c, in[0] + 0xeaa127fa, 11); - MD5STEP(F3, c, d, a, b, in[3] + 0xd4ef3085, 16); - MD5STEP(F3, b, c, d, a, in[6] + 0x04881d05, 23); - MD5STEP(F3, a, b, c, d, in[9] + 0xd9d4d039, 4); - MD5STEP(F3, d, a, b, c, in[12] + 0xe6db99e5, 11); - MD5STEP(F3, c, d, a, b, in[15] + 0x1fa27cf8, 16); - MD5STEP(F3, b, c, d, a, in[2] + 0xc4ac5665, 23); - - MD5STEP(F4, a, b, c, d, in[0] + 0xf4292244, 6); - MD5STEP(F4, d, a, b, c, in[7] + 0x432aff97, 10); - MD5STEP(F4, c, d, a, b, in[14] + 0xab9423a7, 15); - MD5STEP(F4, b, c, d, a, in[5] + 0xfc93a039, 21); - MD5STEP(F4, a, b, c, d, in[12] + 0x655b59c3, 6); - MD5STEP(F4, d, a, b, c, in[3] + 0x8f0ccc92, 10); - MD5STEP(F4, c, d, a, b, in[10] + 0xffeff47d, 15); - MD5STEP(F4, b, c, d, a, in[1] + 0x85845dd1, 21); - MD5STEP(F4, a, b, c, d, in[8] + 0x6fa87e4f, 6); - MD5STEP(F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10); - MD5STEP(F4, c, d, a, b, in[6] + 0xa3014314, 15); - MD5STEP(F4, b, c, d, a, in[13] + 0x4e0811a1, 21); - MD5STEP(F4, a, b, c, d, in[4] + 0xf7537e82, 6); - MD5STEP(F4, d, a, b, c, in[11] + 0xbd3af235, 10); - MD5STEP(F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15); - MD5STEP(F4, b, c, d, a, in[9] + 0xeb86d391, 21); - - buf[0] += a; - buf[1] += b; - buf[2] += c; - buf[3] += d; -} - - - - -struct rngs { - const char *path; - int minlength, maxlength; -} rngs[] = { - { "/dev/random", 16, 16 }, /* 16 bytes = 128 bits suffice */ - { "/proc/interrupts", 0, 0 }, - { "/proc/slabinfo", 0, 0 }, - { "/proc/stat", 0, 0 }, - { "/dev/urandom", 32, 64 }, -}; -#define RNGS (sizeof(rngs)/sizeof(struct rngs)) - -int Verbose = 0; - -/* The basic function to hash a file */ -static off_t -hash_file(struct MD5Context *ctx, int fd) -{ - off_t count = 0; - ssize_t r; - unsigned char buf[BUFFERSIZE]; - - while ((r = read(fd, buf, sizeof(buf))) > 0) { - MD5Update(ctx, buf, r); - count += r; - } - /* Separate files with a null byte */ - buf[0] = 0; - MD5Update(ctx, buf, 1); - return count; -} - -int main( int argc, char **argv ) -{ - int i; - struct MD5Context ctx; - unsigned char digest[16]; - unsigned char buf[BUFFERSIZE]; - int fd; - int c; - pid_t pid; - char *file = NULL; - int r; - struct timeval tv; - struct timezone tz; - - while ((c = getopt( argc, argv, "vf:" )) != -1) - switch (c) { - case 'v': ++Verbose; break; - case 'f': file = optarg; break; - } - - MD5Init( &ctx ); - - gettimeofday( &tv, &tz ); - MD5Update( &ctx, (unsigned char *)&tv, sizeof( tv ) ); - pid = getppid(); - MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid )); - pid = getpid(); - MD5Update( &ctx, (unsigned char *)&pid, sizeof( pid )); - - if (file) { - int count = 0; - - if (file[0] == '-' && !file[1]) - fd = fileno(stdin); - else - fd = open( file, O_RDONLY ); - - if (fd < 0) { - fprintf( stderr, "Could not open %s\n", file ); - } else { - count = hash_file( &ctx, fd ); - if (Verbose) - fprintf( stderr, "Got %d bytes from %s\n", count, file ); - - if (file[0] != '-' || file[1]) close( fd ); - } - } - - for (i = 0; i < RNGS; i++) { - if ((fd = open( rngs[i].path, O_RDONLY|O_NONBLOCK )) >= 0) { - int count = sizeof(buf); - - if (rngs[i].maxlength && count > rngs[i].maxlength) - count = rngs[i].maxlength; - r = read( fd, buf, count ); - if (r > 0) - MD5Update( &ctx, buf, r ); - else - r = 0; - close( fd ); - if (Verbose) - fprintf( stderr, "Got %d bytes from %s\n", r, rngs[i].path ); - if (rngs[i].minlength && r >= rngs[i].minlength) - break; - } else if (Verbose) - fprintf( stderr, "Could not open %s\n", rngs[i].path ); - } - - MD5Final( digest, &ctx ); - for (i = 0; i < 16; i++) printf( "%02x", digest[i] ); - putchar ( '\n' ); - - /* - * The following is important for cases like disk full, so shell scripts - * can bomb out properly rather than think they succeeded. - */ - if (fflush(stdout) < 0 || fclose(stdout) < 0) - return 1; - - return 0; -} diff --git a/package.bak/x11r7/mcookie/mcookie.mk b/package.bak/x11r7/mcookie/mcookie.mk deleted file mode 100644 index b14599d596..0000000000 --- a/package.bak/x11r7/mcookie/mcookie.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# mcookie -# -################################################################################ - -MCOOKIE_LICENSE = Public Domain - -define MCOOKIE_EXTRACT_CMDS - cp package/x11r7/mcookie/mcookie.c $(@D)/ -endef - -define MCOOKIE_BUILD_CMDS - (cd $(@D); $(TARGET_CC) -Wall -Os -s mcookie.c -o mcookie) -endef - -define MCOOKIE_INSTALL_TARGET_CMDS - install -m 0755 -D $(@D)/mcookie $(TARGET_DIR)/usr/bin/mcookie -endef - -$(eval $(generic-package)) diff --git a/package.bak/x11r7/x11r7.mk b/package.bak/x11r7/x11r7.mk deleted file mode 100644 index 85ecbc5968..0000000000 --- a/package.bak/x11r7/x11r7.mk +++ /dev/null @@ -1 +0,0 @@ -include $(sort $(wildcard package/x11r7/*/*.mk)) diff --git a/package.bak/x11r7/xapp_appres/Config.in b/package.bak/x11r7/xapp_appres/Config.in deleted file mode 100644 index 7574659a6a..0000000000 --- a/package.bak/x11r7/xapp_appres/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_APPRES - bool "appres" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - help - list X application resource database diff --git a/package.bak/x11r7/xapp_appres/xapp_appres.hash b/package.bak/x11r7/xapp_appres/xapp_appres.hash deleted file mode 100644 index a1cbf0b4b9..0000000000 --- a/package.bak/x11r7/xapp_appres/xapp_appres.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002211.html -sha256 9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d appres-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_appres/xapp_appres.mk b/package.bak/x11r7/xapp_appres/xapp_appres.mk deleted file mode 100644 index b84d7426c6..0000000000 --- a/package.bak/x11r7/xapp_appres/xapp_appres.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_appres -# -################################################################################ - -XAPP_APPRES_VERSION = 1.0.4 -XAPP_APPRES_SOURCE = appres-$(XAPP_APPRES_VERSION).tar.bz2 -XAPP_APPRES_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_APPRES_LICENSE = MIT -XAPP_APPRES_LICENSE_FILES = COPYING -XAPP_APPRES_DEPENDENCIES = xlib_libX11 xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_bdftopcf/Config.in b/package.bak/x11r7/xapp_bdftopcf/Config.in deleted file mode 100644 index a9caffa649..0000000000 --- a/package.bak/x11r7/xapp_bdftopcf/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_BDFTOPCF - bool "bdftopcf" - select BR2_PACKAGE_XLIB_LIBXFONT - help - X.Org bdftopcf application diff --git a/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash b/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash deleted file mode 100644 index 7bb7fd363e..0000000000 --- a/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002509.html -sha256 38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026 bdftopcf-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk b/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk deleted file mode 100644 index 489bbba4be..0000000000 --- a/package.bak/x11r7/xapp_bdftopcf/xapp_bdftopcf.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xapp_bdftopcf -# -################################################################################ - -XAPP_BDFTOPCF_VERSION = 1.0.5 -XAPP_BDFTOPCF_SOURCE = bdftopcf-$(XAPP_BDFTOPCF_VERSION).tar.bz2 -XAPP_BDFTOPCF_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_BDFTOPCF_LICENSE = MIT -XAPP_BDFTOPCF_LICENSE_FILES = COPYING -XAPP_BDFTOPCF_DEPENDENCIES = xlib_libXfont -HOST_XAPP_BDFTOPCF_DEPENDENCIES = host-xlib_libXfont - -# needed for linking against libXfont -XAPP_BDFTOPCF_MAKE_OPTS += LIBS=-ldl - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xapp_beforelight/Config.in b/package.bak/x11r7/xapp_beforelight/Config.in deleted file mode 100644 index 3a111897a9..0000000000 --- a/package.bak/x11r7/xapp_beforelight/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_BEFORELIGHT - bool "beforelight" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXSCRNSAVER - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXT - help - screen saver diff --git a/package.bak/x11r7/xapp_beforelight/xapp_beforelight.hash b/package.bak/x11r7/xapp_beforelight/xapp_beforelight.hash deleted file mode 100644 index 3586b36844..0000000000 --- a/package.bak/x11r7/xapp_beforelight/xapp_beforelight.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002131.html -sha256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 beforelight-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_beforelight/xapp_beforelight.mk b/package.bak/x11r7/xapp_beforelight/xapp_beforelight.mk deleted file mode 100644 index b39fe7870e..0000000000 --- a/package.bak/x11r7/xapp_beforelight/xapp_beforelight.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_beforelight -# -################################################################################ - -XAPP_BEFORELIGHT_VERSION = 1.0.5 -XAPP_BEFORELIGHT_SOURCE = beforelight-$(XAPP_BEFORELIGHT_VERSION).tar.bz2 -XAPP_BEFORELIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_BEFORELIGHT_LICENSE = MIT -XAPP_BEFORELIGHT_LICENSE_FILES = COPYING -XAPP_BEFORELIGHT_DEPENDENCIES = xlib_libX11 xlib_libXScrnSaver xlib_libXaw xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_bitmap/Config.in b/package.bak/x11r7/xapp_bitmap/Config.in deleted file mode 100644 index e5bb5e8344..0000000000 --- a/package.bak/x11r7/xapp_bitmap/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_BITMAP - bool "bitmap" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XDATA_XBITMAPS - help - X.Org bitmap application diff --git a/package.bak/x11r7/xapp_bitmap/xapp_bitmap.hash b/package.bak/x11r7/xapp_bitmap/xapp_bitmap.hash deleted file mode 100644 index cd64362084..0000000000 --- a/package.bak/x11r7/xapp_bitmap/xapp_bitmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002518.html -sha256 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d bitmap-1.0.8.tar.bz2 diff --git a/package.bak/x11r7/xapp_bitmap/xapp_bitmap.mk b/package.bak/x11r7/xapp_bitmap/xapp_bitmap.mk deleted file mode 100644 index 851af31382..0000000000 --- a/package.bak/x11r7/xapp_bitmap/xapp_bitmap.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_bitmap -# -################################################################################ - -XAPP_BITMAP_VERSION = 1.0.8 -XAPP_BITMAP_SOURCE = bitmap-$(XAPP_BITMAP_VERSION).tar.bz2 -XAPP_BITMAP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_BITMAP_LICENSE = MIT -XAPP_BITMAP_LICENSE_FILES = COPYING -XAPP_BITMAP_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xdata_xbitmaps - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_editres/Config.in b/package.bak/x11r7/xapp_editres/Config.in deleted file mode 100644 index 390ec4875a..0000000000 --- a/package.bak/x11r7/xapp_editres/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_EDITRES - bool "editres" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXT - help - a dynamic resource editor for X Toolkit applications diff --git a/package.bak/x11r7/xapp_editres/xapp_editres.hash b/package.bak/x11r7/xapp_editres/xapp_editres.hash deleted file mode 100644 index 74fc98d63c..0000000000 --- a/package.bak/x11r7/xapp_editres/xapp_editres.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002120.html -sha256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 editres-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_editres/xapp_editres.mk b/package.bak/x11r7/xapp_editres/xapp_editres.mk deleted file mode 100644 index 6cc4805f5f..0000000000 --- a/package.bak/x11r7/xapp_editres/xapp_editres.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_editres -# -################################################################################ - -XAPP_EDITRES_VERSION = 1.0.6 -XAPP_EDITRES_SOURCE = editres-$(XAPP_EDITRES_VERSION).tar.bz2 -XAPP_EDITRES_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_EDITRES_LICENSE = MIT -XAPP_EDITRES_LICENSE_FILES = COPYING -XAPP_EDITRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_fonttosfnt/Config.in b/package.bak/x11r7/xapp_fonttosfnt/Config.in deleted file mode 100644 index eb35710f0a..0000000000 --- a/package.bak/x11r7/xapp_fonttosfnt/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_FONTTOSFNT - bool "fonttosfnt" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBFONTENC - help - X.Org fonttosfnt application diff --git a/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash b/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash deleted file mode 100644 index e76c5c8856..0000000000 --- a/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2008-May/000543.html -sha1 a609fba513947e5267c924f85774c0e44a076a7d fonttosfnt-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk b/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk deleted file mode 100644 index 1571a3baf3..0000000000 --- a/package.bak/x11r7/xapp_fonttosfnt/xapp_fonttosfnt.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_fonttosfnt -# -################################################################################ - -XAPP_FONTTOSFNT_VERSION = 1.0.4 -XAPP_FONTTOSFNT_SOURCE = fonttosfnt-$(XAPP_FONTTOSFNT_VERSION).tar.bz2 -XAPP_FONTTOSFNT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_FONTTOSFNT_LICENSE = MIT -XAPP_FONTTOSFNT_LICENSE_FILES = COPYING -XAPP_FONTTOSFNT_DEPENDENCIES = freetype xlib_libX11 xlib_libfontenc - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_fslsfonts/Config.in b/package.bak/x11r7/xapp_fslsfonts/Config.in deleted file mode 100644 index 1917d615f2..0000000000 --- a/package.bak/x11r7/xapp_fslsfonts/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_FSLSFONTS - bool "fslsfonts" - select BR2_PACKAGE_XLIB_LIBFS - select BR2_PACKAGE_XLIB_LIBX11 - help - list fonts served by X font server diff --git a/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash b/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash deleted file mode 100644 index d1d2b65aa9..0000000000 --- a/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002510.html -sha256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 fslsfonts-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk b/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk deleted file mode 100644 index 27786a55c1..0000000000 --- a/package.bak/x11r7/xapp_fslsfonts/xapp_fslsfonts.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_fslsfonts -# -################################################################################ - -XAPP_FSLSFONTS_VERSION = 1.0.5 -XAPP_FSLSFONTS_SOURCE = fslsfonts-$(XAPP_FSLSFONTS_VERSION).tar.bz2 -XAPP_FSLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_FSLSFONTS_LICENSE = MIT -XAPP_FSLSFONTS_LICENSE_FILES = COPYING -XAPP_FSLSFONTS_DEPENDENCIES = xlib_libFS xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_fstobdf/Config.in b/package.bak/x11r7/xapp_fstobdf/Config.in deleted file mode 100644 index 0a1f62baa8..0000000000 --- a/package.bak/x11r7/xapp_fstobdf/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_FSTOBDF - bool "fstobdf" - select BR2_PACKAGE_XLIB_LIBFS - select BR2_PACKAGE_XLIB_LIBX11 - help - generate BDF font from X font server diff --git a/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.hash b/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.hash deleted file mode 100644 index d12e8e5c42..0000000000 --- a/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002511.html -sha256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e fstobdf-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.mk b/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.mk deleted file mode 100644 index e897514c80..0000000000 --- a/package.bak/x11r7/xapp_fstobdf/xapp_fstobdf.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_fstobdf -# -################################################################################ - -XAPP_FSTOBDF_VERSION = 1.0.6 -XAPP_FSTOBDF_SOURCE = fstobdf-$(XAPP_FSTOBDF_VERSION).tar.bz2 -XAPP_FSTOBDF_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_FSTOBDF_LICENSE = MIT -XAPP_FSTOBDF_LICENSE_FILES = COPYING -XAPP_FSTOBDF_DEPENDENCIES = xlib_libFS xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_iceauth/Config.in b/package.bak/x11r7/xapp_iceauth/Config.in deleted file mode 100644 index ce2db98865..0000000000 --- a/package.bak/x11r7/xapp_iceauth/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_ICEAUTH - bool "iceauth" - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_LIBX11 - help - ICE authority file utility diff --git a/package.bak/x11r7/xapp_iceauth/xapp_iceauth.hash b/package.bak/x11r7/xapp_iceauth/xapp_iceauth.hash deleted file mode 100644 index 90c5f70bfa..0000000000 --- a/package.bak/x11r7/xapp_iceauth/xapp_iceauth.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002519.html -sha256 1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a iceauth-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_iceauth/xapp_iceauth.mk b/package.bak/x11r7/xapp_iceauth/xapp_iceauth.mk deleted file mode 100644 index d30ff6f786..0000000000 --- a/package.bak/x11r7/xapp_iceauth/xapp_iceauth.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_iceauth -# -################################################################################ - -XAPP_ICEAUTH_VERSION = 1.0.7 -XAPP_ICEAUTH_SOURCE = iceauth-$(XAPP_ICEAUTH_VERSION).tar.bz2 -XAPP_ICEAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_ICEAUTH_LICENSE = MIT -XAPP_ICEAUTH_LICENSE_FILES = COPYING -XAPP_ICEAUTH_DEPENDENCIES = xlib_libICE xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_ico/Config.in b/package.bak/x11r7/xapp_ico/Config.in deleted file mode 100644 index 892f2be8e5..0000000000 --- a/package.bak/x11r7/xapp_ico/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_ICO - bool "ico" - select BR2_PACKAGE_XLIB_LIBX11 - help - animate an icosahedron or other polyhedron diff --git a/package.bak/x11r7/xapp_ico/xapp_ico.hash b/package.bak/x11r7/xapp_ico/xapp_ico.hash deleted file mode 100644 index 055e85ea67..0000000000 --- a/package.bak/x11r7/xapp_ico/xapp_ico.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002135.html -sha256 2932767098f95ca129a0c7f0fecb0a18c789a79c1747f7423fdfe9f4e0c53590 ico-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_ico/xapp_ico.mk b/package.bak/x11r7/xapp_ico/xapp_ico.mk deleted file mode 100644 index 621d1e489e..0000000000 --- a/package.bak/x11r7/xapp_ico/xapp_ico.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_ico -# -################################################################################ - -XAPP_ICO_VERSION = 1.0.4 -XAPP_ICO_SOURCE = ico-$(XAPP_ICO_VERSION).tar.bz2 -XAPP_ICO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_ICO_LICENSE = MIT -XAPP_ICO_LICENSE_FILES = COPYING -XAPP_ICO_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_listres/Config.in b/package.bak/x11r7/xapp_listres/Config.in deleted file mode 100644 index a3be6b3825..0000000000 --- a/package.bak/x11r7/xapp_listres/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_LISTRES - bool "listres" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXT - help - list resources in widgets diff --git a/package.bak/x11r7/xapp_listres/xapp_listres.hash b/package.bak/x11r7/xapp_listres/xapp_listres.hash deleted file mode 100644 index ffc9f7eecb..0000000000 --- a/package.bak/x11r7/xapp_listres/xapp_listres.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001838.html -sha256 c3d71e9a01650e3fd470189a749cd0202ef03d9e399350a7a7443d7595ed478e listres-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_listres/xapp_listres.mk b/package.bak/x11r7/xapp_listres/xapp_listres.mk deleted file mode 100644 index 88cdd4f033..0000000000 --- a/package.bak/x11r7/xapp_listres/xapp_listres.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_listres -# -################################################################################ - -XAPP_LISTRES_VERSION = 1.0.3 -XAPP_LISTRES_SOURCE = listres-$(XAPP_LISTRES_VERSION).tar.bz2 -XAPP_LISTRES_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_LISTRES_LICENSE = MIT -XAPP_LISTRES_LICENSE_FILES = COPYING -XAPP_LISTRES_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXmu xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_luit/0001-posix-openpt.patch b/package.bak/x11r7/xapp_luit/0001-posix-openpt.patch deleted file mode 100644 index c8ff8e4396..0000000000 --- a/package.bak/x11r7/xapp_luit/0001-posix-openpt.patch +++ /dev/null @@ -1,19 +0,0 @@ -Suggested workaround to build with recent gcc versions - -Upstream bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=47792 - -Signed-off-by: Markos Chandras - -Index: xapp_luit-1.1.1/sys.c -=================================================================== ---- xapp_luit-1.1.1.orig/sys.c -+++ xapp_luit-1.1.1/sys.c -@@ -20,6 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWAR - THE SOFTWARE. - */ - -+#define _XOPEN_SOURCE 600 -+ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif diff --git a/package.bak/x11r7/xapp_luit/Config.in b/package.bak/x11r7/xapp_luit/Config.in deleted file mode 100644 index 3e314de182..0000000000 --- a/package.bak/x11r7/xapp_luit/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_LUIT - bool "luit" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBFONTENC - depends on BR2_USE_MMU # fork() - help - Locale and ISO 2022 support for Unicode terminals diff --git a/package.bak/x11r7/xapp_luit/xapp_luit.hash b/package.bak/x11r7/xapp_luit/xapp_luit.hash deleted file mode 100644 index 4763b0d917..0000000000 --- a/package.bak/x11r7/xapp_luit/xapp_luit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001894.html -sha256 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 luit-1.1.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_luit/xapp_luit.mk b/package.bak/x11r7/xapp_luit/xapp_luit.mk deleted file mode 100644 index d3217fe581..0000000000 --- a/package.bak/x11r7/xapp_luit/xapp_luit.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_luit -# -################################################################################ - -XAPP_LUIT_VERSION = 1.1.1 -XAPP_LUIT_SOURCE = luit-$(XAPP_LUIT_VERSION).tar.bz2 -XAPP_LUIT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_LUIT_LICENSE = MIT -XAPP_LUIT_LICENSE_FILES = COPYING -XAPP_LUIT_DEPENDENCIES = xlib_libX11 xlib_libfontenc - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_mkfontdir/Config.in b/package.bak/x11r7/xapp_mkfontdir/Config.in deleted file mode 100644 index 155772d13b..0000000000 --- a/package.bak/x11r7/xapp_mkfontdir/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_MKFONTDIR - bool "mkfontdir" - select BR2_PACKAGE_XAPP_MKFONTSCALE - help - create an index of X font files in a directory diff --git a/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash b/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash deleted file mode 100644 index 7a218b98c3..0000000000 --- a/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001818.html -sha256 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530 mkfontdir-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk b/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk deleted file mode 100644 index f2227bdfdd..0000000000 --- a/package.bak/x11r7/xapp_mkfontdir/xapp_mkfontdir.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xapp_mkfontdir -# -################################################################################ - -XAPP_MKFONTDIR_VERSION = 1.0.7 -XAPP_MKFONTDIR_SOURCE = mkfontdir-$(XAPP_MKFONTDIR_VERSION).tar.bz2 -XAPP_MKFONTDIR_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_MKFONTDIR_LICENSE = MIT -XAPP_MKFONTDIR_LICENSE_FILES = COPYING -XAPP_MKFONTDIR_DEPENDENCIES = xapp_mkfontscale -HOST_XAPP_MKFONTDIR_DEPENDENCIES = host-xapp_mkfontscale - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xapp_mkfontscale/Config.in b/package.bak/x11r7/xapp_mkfontscale/Config.in deleted file mode 100644 index 540dd455ff..0000000000 --- a/package.bak/x11r7/xapp_mkfontscale/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_MKFONTSCALE - bool "mkfontscale" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBFONTENC - help - create an index of scalable font files for X diff --git a/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash b/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash deleted file mode 100644 index 0cab2b2d1b..0000000000 --- a/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002520.html -sha256 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20 mkfontscale-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk deleted file mode 100644 index d7abf6c5bb..0000000000 --- a/package.bak/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xapp_mkfontscale -# -################################################################################ - -XAPP_MKFONTSCALE_VERSION = 1.1.2 -XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2 -XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_MKFONTSCALE_LICENSE = MIT -XAPP_MKFONTSCALE_LICENSE_FILES = COPYING -XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto -HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \ - host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xapp_oclock/Config.in b/package.bak/x11r7/xapp_oclock/Config.in deleted file mode 100644 index 00cd4132c8..0000000000 --- a/package.bak/x11r7/xapp_oclock/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_OCLOCK - bool "oclock" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXMU - help - round X clock diff --git a/package.bak/x11r7/xapp_oclock/xapp_oclock.hash b/package.bak/x11r7/xapp_oclock/xapp_oclock.hash deleted file mode 100644 index ad54499c5e..0000000000 --- a/package.bak/x11r7/xapp_oclock/xapp_oclock.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-February/001820.html -sha256 54f5fb85f5828705683f457e559fb18753332db15ae82da561b0ae5a63915091 oclock-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_oclock/xapp_oclock.mk b/package.bak/x11r7/xapp_oclock/xapp_oclock.mk deleted file mode 100644 index 17d544ccc4..0000000000 --- a/package.bak/x11r7/xapp_oclock/xapp_oclock.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# xapp_oclock -# -################################################################################ - -XAPP_OCLOCK_VERSION = 1.0.3 -XAPP_OCLOCK_SOURCE = oclock-$(XAPP_OCLOCK_VERSION).tar.bz2 -XAPP_OCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_OCLOCK_LICENSE = MIT -XAPP_OCLOCK_LICENSE_FILES = COPYING -XAPP_OCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu - -ifeq ($(BR2_PACKAGE_XLIB_LIBXKBFILE),y) -XAPP_OCLOCK_CONF_OPTS += --with-xkb -XAPP_OCLOCK_DEPENDENCIES += xlib_libxkbfile -else -XAPP_OCLOCK_CONF_OPTS += --without-xkb -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_rgb/Config.in b/package.bak/x11r7/xapp_rgb/Config.in deleted file mode 100644 index 038b849d4b..0000000000 --- a/package.bak/x11r7/xapp_rgb/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_RGB - bool "rgb" - select BR2_PACKAGE_XPROTO_XPROTO - help - uncompile an rgb color-name database diff --git a/package.bak/x11r7/xapp_rgb/xapp_rgb.hash b/package.bak/x11r7/xapp_rgb/xapp_rgb.hash deleted file mode 100644 index 2b67bfc8e0..0000000000 --- a/package.bak/x11r7/xapp_rgb/xapp_rgb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-November/002494.html -sha256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 rgb-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_rgb/xapp_rgb.mk b/package.bak/x11r7/xapp_rgb/xapp_rgb.mk deleted file mode 100644 index 82878abad0..0000000000 --- a/package.bak/x11r7/xapp_rgb/xapp_rgb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_rgb -# -################################################################################ - -XAPP_RGB_VERSION = 1.0.6 -XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2 -XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_RGB_LICENSE = MIT -XAPP_RGB_LICENSE_FILES = COPYING -XAPP_RGB_DEPENDENCIES = xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_rstart/Config.in b/package.bak/x11r7/xapp_rstart/Config.in deleted file mode 100644 index 3c1d5a9e1e..0000000000 --- a/package.bak/x11r7/xapp_rstart/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_RSTART - bool "rstart" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - help - X.Org rstart application diff --git a/package.bak/x11r7/xapp_rstart/xapp_rstart.hash b/package.bak/x11r7/xapp_rstart/xapp_rstart.hash deleted file mode 100644 index 47b735302b..0000000000 --- a/package.bak/x11r7/xapp_rstart/xapp_rstart.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002168.html -sha256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb rstart-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_rstart/xapp_rstart.mk b/package.bak/x11r7/xapp_rstart/xapp_rstart.mk deleted file mode 100644 index 2bcc2923ac..0000000000 --- a/package.bak/x11r7/xapp_rstart/xapp_rstart.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_rstart -# -################################################################################ - -XAPP_RSTART_VERSION = 1.0.5 -XAPP_RSTART_SOURCE = rstart-$(XAPP_RSTART_VERSION).tar.bz2 -XAPP_RSTART_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_RSTART_LICENSE = MIT -XAPP_RSTART_LICENSE_FILES = COPYING -XAPP_RSTART_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_scripts/Config.in b/package.bak/x11r7/xapp_scripts/Config.in deleted file mode 100644 index 691f0e21b2..0000000000 --- a/package.bak/x11r7/xapp_scripts/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_SCRIPTS - bool "scripts" - select BR2_PACKAGE_XLIB_LIBX11 - help - start an X program on a remote machine diff --git a/package.bak/x11r7/xapp_scripts/xapp_scripts.hash b/package.bak/x11r7/xapp_scripts/xapp_scripts.hash deleted file mode 100644 index 79a43180c5..0000000000 --- a/package.bak/x11r7/xapp_scripts/xapp_scripts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136 scripts-1.0.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_scripts/xapp_scripts.mk b/package.bak/x11r7/xapp_scripts/xapp_scripts.mk deleted file mode 100644 index 5146db5708..0000000000 --- a/package.bak/x11r7/xapp_scripts/xapp_scripts.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_scripts -# -################################################################################ - -XAPP_SCRIPTS_VERSION = 1.0.1 -XAPP_SCRIPTS_SOURCE = scripts-$(XAPP_SCRIPTS_VERSION).tar.bz2 -XAPP_SCRIPTS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_SCRIPTS_LICENSE = MIT -XAPP_SCRIPTS_LICENSE_FILES = COPYING -XAPP_SCRIPTS_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch b/package.bak/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch deleted file mode 100644 index 5c3e91a491..0000000000 --- a/package.bak/x11r7/xapp_sessreg/0001-Pass-P-to-the-preprocessor-when-generating-filenames.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d Mon Sep 17 00:00:00 2001 -From: Stefan Dirsch -Date: Wed, 9 Sep 2015 23:44:06 +0200 -Subject: [PATCH] Pass -P to the preprocessor when generating filenames for the - manpage. - -Fixes build with GCC 5. Patch by Richard Biener - -Tested-by: Matt Turner -Signed-off-by: Matt Turner -[Thomas: backport from upstream commit 93f5d5abf6b214a4b36e00cd09174d24b2ed0a6d] -Signed-off-by: Thomas Petazzoni ---- - man/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/man/Makefile.am b/man/Makefile.am -index 665ace5..2e5f146 100644 ---- a/man/Makefile.am -+++ b/man/Makefile.am -@@ -9,7 +9,7 @@ SUFFIXES = .$(APP_MAN_SUFFIX) .man - - AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) - filenames.sed: filenames.sed.c -- $(AM_V_GEN)$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -+ $(AM_V_GEN)$(CPP) -P $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(srcdir)/filenames.sed.c | \ - $(SED) -n -e '/s|__/ p' -e '/^\/__/ p' > $@ - --- -2.6.3 - diff --git a/package.bak/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch b/package.bak/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch deleted file mode 100644 index 0be242c0b2..0000000000 --- a/package.bak/x11r7/xapp_sessreg/0002-missing_path_wtmpx.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix missing defines _PATH_WTMPX/_PATH_UTMPX in musl - -Downloaded from -https://cgit.gentoo.org/proj/musl.git/tree/x11-apps/sessreg/files/sessreg-1.1.0-missing_path_wtmpx.patch - -Signed-off-by: Bernd Kuhls - -diff -Naur sessreg-1.1.0.orig/sessreg.h sessreg-1.1.0/sessreg.h ---- sessreg-1.1.0.orig/sessreg.h 2015-01-20 05:00:27.000000000 +0000 -+++ sessreg-1.1.0/sessreg.h 2016-02-23 11:54:42.057000000 +0000 -@@ -103,6 +103,13 @@ - # define TTYS_FILE "/etc/ttys" - #endif - -+#ifndef _PATH_WTMPX -+# define _PATH_WTMPX "/var/log/wtmp" -+#endif -+#ifndef _PATH_UTMPX -+# define _PATH_UTMPX "/var/log/utmp" -+#endif -+ - #ifndef WTMPX_FILE - # define WTMPX_FILE _PATH_WTMPX - #endif diff --git a/package.bak/x11r7/xapp_sessreg/Config.in b/package.bak/x11r7/xapp_sessreg/Config.in deleted file mode 100644 index 0796bc1bca..0000000000 --- a/package.bak/x11r7/xapp_sessreg/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_SESSREG - bool "sessreg" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_XPROTO - help - manage utmp/wtmp entries for non-init clients diff --git a/package.bak/x11r7/xapp_sessreg/xapp_sessreg.hash b/package.bak/x11r7/xapp_sessreg/xapp_sessreg.hash deleted file mode 100644 index 9c1a8029b2..0000000000 --- a/package.bak/x11r7/xapp_sessreg/xapp_sessreg.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002522.html -sha256 551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c sessreg-1.1.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_sessreg/xapp_sessreg.mk b/package.bak/x11r7/xapp_sessreg/xapp_sessreg.mk deleted file mode 100644 index 08811c015e..0000000000 --- a/package.bak/x11r7/xapp_sessreg/xapp_sessreg.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_sessreg -# -################################################################################ - -XAPP_SESSREG_VERSION = 1.1.0 -XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2 -XAPP_SESSREG_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_SESSREG_LICENSE = MIT -XAPP_SESSREG_LICENSE_FILES = COPYING -XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_setxkbmap/Config.in b/package.bak/x11r7/xapp_setxkbmap/Config.in deleted file mode 100644 index 2b1389c753..0000000000 --- a/package.bak/x11r7/xapp_setxkbmap/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_SETXKBMAP - bool "setxkbmap" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - Controls the keyboard layout of a running X server. diff --git a/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash b/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash deleted file mode 100644 index bdc5f1cc78..0000000000 --- a/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002563.html -sha256 a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1 setxkbmap-1.3.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk b/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk deleted file mode 100644 index b923d60f53..0000000000 --- a/package.bak/x11r7/xapp_setxkbmap/xapp_setxkbmap.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_setxkbmap -# -################################################################################ - -XAPP_SETXKBMAP_VERSION = 1.3.1 -XAPP_SETXKBMAP_SOURCE = setxkbmap-$(XAPP_SETXKBMAP_VERSION).tar.bz2 -XAPP_SETXKBMAP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_SETXKBMAP_LICENSE = MIT -XAPP_SETXKBMAP_LICENSE_FILES = COPYING -XAPP_SETXKBMAP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_showfont/Config.in b/package.bak/x11r7/xapp_showfont/Config.in deleted file mode 100644 index edfab3fc85..0000000000 --- a/package.bak/x11r7/xapp_showfont/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_SHOWFONT - bool "showfont" - select BR2_PACKAGE_XLIB_LIBFS - help - font dumper for X font server diff --git a/package.bak/x11r7/xapp_showfont/xapp_showfont.hash b/package.bak/x11r7/xapp_showfont/xapp_showfont.hash deleted file mode 100644 index 0fff9ce01a..0000000000 --- a/package.bak/x11r7/xapp_showfont/xapp_showfont.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002513.html -sha256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 showfont-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_showfont/xapp_showfont.mk b/package.bak/x11r7/xapp_showfont/xapp_showfont.mk deleted file mode 100644 index c0b8c9a3a2..0000000000 --- a/package.bak/x11r7/xapp_showfont/xapp_showfont.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_showfont -# -################################################################################ - -XAPP_SHOWFONT_VERSION = 1.0.5 -XAPP_SHOWFONT_SOURCE = showfont-$(XAPP_SHOWFONT_VERSION).tar.bz2 -XAPP_SHOWFONT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_SHOWFONT_LICENSE = MIT -XAPP_SHOWFONT_LICENSE_FILES = COPYING -XAPP_SHOWFONT_DEPENDENCIES = xlib_libFS - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_smproxy/Config.in b/package.bak/x11r7/xapp_smproxy/Config.in deleted file mode 100644 index 80ab984eb9..0000000000 --- a/package.bak/x11r7/xapp_smproxy/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_SMPROXY - bool "smproxy" - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXT - help - Session Manager Proxy diff --git a/package.bak/x11r7/xapp_smproxy/xapp_smproxy.hash b/package.bak/x11r7/xapp_smproxy/xapp_smproxy.hash deleted file mode 100644 index 7bb7bdb3da..0000000000 --- a/package.bak/x11r7/xapp_smproxy/xapp_smproxy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002564.html -sha256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 smproxy-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_smproxy/xapp_smproxy.mk b/package.bak/x11r7/xapp_smproxy/xapp_smproxy.mk deleted file mode 100644 index f51c1ec090..0000000000 --- a/package.bak/x11r7/xapp_smproxy/xapp_smproxy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_smproxy -# -################################################################################ - -XAPP_SMPROXY_VERSION = 1.0.6 -XAPP_SMPROXY_SOURCE = smproxy-$(XAPP_SMPROXY_VERSION).tar.bz2 -XAPP_SMPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_SMPROXY_LICENSE = MIT -XAPP_SMPROXY_LICENSE_FILES = COPYING -XAPP_SMPROXY_DEPENDENCIES = xlib_libXmu xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_twm/Config.in b/package.bak/x11r7/xapp_twm/Config.in deleted file mode 100644 index 25bf800f6a..0000000000 --- a/package.bak/x11r7/xapp_twm/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_TWM - bool "twm" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXMU - help - No description available diff --git a/package.bak/x11r7/xapp_twm/xapp_twm.hash b/package.bak/x11r7/xapp_twm/xapp_twm.hash deleted file mode 100644 index eecc5c4e51..0000000000 --- a/package.bak/x11r7/xapp_twm/xapp_twm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002565.html -sha256 c575167ac33edf3bd1592f1bedfe0559debb128ed5fb4873c1278e3be166310a twm-1.0.9.tar.bz2 diff --git a/package.bak/x11r7/xapp_twm/xapp_twm.mk b/package.bak/x11r7/xapp_twm/xapp_twm.mk deleted file mode 100644 index 1f576e15bd..0000000000 --- a/package.bak/x11r7/xapp_twm/xapp_twm.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xapp_twm -# -################################################################################ - -XAPP_TWM_VERSION = 1.0.9 -XAPP_TWM_SOURCE = twm-$(XAPP_TWM_VERSION).tar.bz2 -XAPP_TWM_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_TWM_LICENSE = MIT -XAPP_TWM_LICENSE_FILES = COPYING -XAPP_TWM_DEPENDENCIES = \ - host-bison xlib_libX11 xlib_libXext xlib_libXt xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_viewres/Config.in b/package.bak/x11r7/xapp_viewres/Config.in deleted file mode 100644 index 32827c8003..0000000000 --- a/package.bak/x11r7/xapp_viewres/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_VIEWRES - bool "viewres" - select BR2_PACKAGE_XLIB_LIBXAW - help - graphical class browser for Xt diff --git a/package.bak/x11r7/xapp_viewres/xapp_viewres.hash b/package.bak/x11r7/xapp_viewres/xapp_viewres.hash deleted file mode 100644 index c45b1b25f7..0000000000 --- a/package.bak/x11r7/xapp_viewres/xapp_viewres.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002122.html -sha256 d9c11b44908d91926df8b33428ae04c86c85e4f8380e9b5e68326a651c872e59 viewres-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_viewres/xapp_viewres.mk b/package.bak/x11r7/xapp_viewres/xapp_viewres.mk deleted file mode 100644 index 3e1fd8ddca..0000000000 --- a/package.bak/x11r7/xapp_viewres/xapp_viewres.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_viewres -# -################################################################################ - -XAPP_VIEWRES_VERSION = 1.0.4 -XAPP_VIEWRES_SOURCE = viewres-$(XAPP_VIEWRES_VERSION).tar.bz2 -XAPP_VIEWRES_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_VIEWRES_LICENSE = MIT -XAPP_VIEWRES_LICENSE_FILES = COPYING -XAPP_VIEWRES_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_x11perf/Config.in b/package.bak/x11r7/xapp_x11perf/Config.in deleted file mode 100644 index 0f1eca8938..0000000000 --- a/package.bak/x11r7/xapp_x11perf/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_X11PERF - bool "x11perf" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXFT - help - summarize x11perf results diff --git a/package.bak/x11r7/xapp_x11perf/xapp_x11perf.hash b/package.bak/x11r7/xapp_x11perf/xapp_x11perf.hash deleted file mode 100644 index 8580993fdb..0000000000 --- a/package.bak/x11r7/xapp_x11perf/xapp_x11perf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002566.html -sha256 e87098dec1947572d70c62697a7b70bde1ab5668237d4660080eade6bc096751 x11perf-1.6.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_x11perf/xapp_x11perf.mk b/package.bak/x11r7/xapp_x11perf/xapp_x11perf.mk deleted file mode 100644 index 8cba79d97e..0000000000 --- a/package.bak/x11r7/xapp_x11perf/xapp_x11perf.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_x11perf -# -################################################################################ - -XAPP_X11PERF_VERSION = 1.6.0 -XAPP_X11PERF_SOURCE = x11perf-$(XAPP_X11PERF_VERSION).tar.bz2 -XAPP_X11PERF_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_X11PERF_LICENSE = MIT -XAPP_X11PERF_LICENSE_FILES = COPYING -XAPP_X11PERF_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXft - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xauth/Config.in b/package.bak/x11r7/xapp_xauth/Config.in deleted file mode 100644 index 919fd50bd8..0000000000 --- a/package.bak/x11r7/xapp_xauth/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XAUTH - bool "xauth" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXMU - help - X authority file utility diff --git a/package.bak/x11r7/xapp_xauth/xapp_xauth.hash b/package.bak/x11r7/xapp_xauth/xapp_xauth.hash deleted file mode 100644 index f6987c1c0c..0000000000 --- a/package.bak/x11r7/xapp_xauth/xapp_xauth.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002772.html -sha256 5afe42ce3cdf4f60520d1658d2b17face45c74050f39af45dccdc95e73fafc4d xauth-1.0.10.tar.bz2 diff --git a/package.bak/x11r7/xapp_xauth/xapp_xauth.mk b/package.bak/x11r7/xapp_xauth/xapp_xauth.mk deleted file mode 100644 index 80ac6a42d5..0000000000 --- a/package.bak/x11r7/xapp_xauth/xapp_xauth.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xauth -# -################################################################################ - -XAPP_XAUTH_VERSION = 1.0.10 -XAPP_XAUTH_SOURCE = xauth-$(XAPP_XAUTH_VERSION).tar.bz2 -XAPP_XAUTH_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XAUTH_LICENSE = MIT -XAPP_XAUTH_LICENSE_FILES = COPYING -XAPP_XAUTH_DEPENDENCIES = xlib_libX11 xlib_libXau xlib_libXext xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xbacklight/Config.in b/package.bak/x11r7/xapp_xbacklight/Config.in deleted file mode 100644 index 5764056d34..0000000000 --- a/package.bak/x11r7/xapp_xbacklight/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XBACKLIGHT - bool "xbacklight" - select BR2_PACKAGE_XCB_UTIL - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXRENDER - help - xbacklight diff --git a/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.hash b/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.hash deleted file mode 100644 index 058c53fca2..0000000000 --- a/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-October/002331.html -sha256 17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b xbacklight-1.2.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.mk b/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.mk deleted file mode 100644 index 88c4bc5dbe..0000000000 --- a/package.bak/x11r7/xapp_xbacklight/xapp_xbacklight.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xbacklight -# -################################################################################ - -XAPP_XBACKLIGHT_VERSION = 1.2.1 -XAPP_XBACKLIGHT_SOURCE = xbacklight-$(XAPP_XBACKLIGHT_VERSION).tar.bz2 -XAPP_XBACKLIGHT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XBACKLIGHT_LICENSE = MIT -XAPP_XBACKLIGHT_LICENSE_FILES = COPYING -XAPP_XBACKLIGHT_DEPENDENCIES = xlib_libX11 xlib_libXrandr xlib_libXrender xcb-util - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xbiff/Config.in b/package.bak/x11r7/xapp_xbiff/Config.in deleted file mode 100644 index ea4b58aa89..0000000000 --- a/package.bak/x11r7/xapp_xbiff/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XBIFF - bool "xbiff" - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XDATA_XBITMAPS - help - mailbox flag for X diff --git a/package.bak/x11r7/xapp_xbiff/xapp_xbiff.hash b/package.bak/x11r7/xapp_xbiff/xapp_xbiff.hash deleted file mode 100644 index 26bf0ae48d..0000000000 --- a/package.bak/x11r7/xapp_xbiff/xapp_xbiff.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2011-January/001595.html -sha1 17337a951264f0f96f6d03893f9dfd9cf8f12a5a xbiff-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xbiff/xapp_xbiff.mk b/package.bak/x11r7/xapp_xbiff/xapp_xbiff.mk deleted file mode 100644 index 73e0350afb..0000000000 --- a/package.bak/x11r7/xapp_xbiff/xapp_xbiff.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xbiff -# -################################################################################ - -XAPP_XBIFF_VERSION = 1.0.3 -XAPP_XBIFF_SOURCE = xbiff-$(XAPP_XBIFF_VERSION).tar.bz2 -XAPP_XBIFF_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XBIFF_LICENSE = MIT -XAPP_XBIFF_LICENSE_FILES = COPYING -XAPP_XBIFF_DEPENDENCIES = xlib_libXaw xdata_xbitmaps - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xcalc/Config.in b/package.bak/x11r7/xapp_xcalc/Config.in deleted file mode 100644 index 2552be0245..0000000000 --- a/package.bak/x11r7/xapp_xcalc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XCALC - bool "xcalc" - select BR2_PACKAGE_XLIB_LIBXAW - help - scientific calculator for X diff --git a/package.bak/x11r7/xapp_xcalc/xapp_xcalc.hash b/package.bak/x11r7/xapp_xcalc/xapp_xcalc.hash deleted file mode 100644 index e7967558f8..0000000000 --- a/package.bak/x11r7/xapp_xcalc/xapp_xcalc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002523.html -sha256 2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8 xcalc-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_xcalc/xapp_xcalc.mk b/package.bak/x11r7/xapp_xcalc/xapp_xcalc.mk deleted file mode 100644 index 58fbdf5710..0000000000 --- a/package.bak/x11r7/xapp_xcalc/xapp_xcalc.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xapp_xcalc -# -################################################################################ - -XAPP_XCALC_VERSION = 1.0.6 -XAPP_XCALC_SOURCE = xcalc-$(XAPP_XCALC_VERSION).tar.bz2 -XAPP_XCALC_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCALC_LICENSE = MIT -XAPP_XCALC_LICENSE_FILES = COPYING -XAPP_XCALC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec install-data -XAPP_XCALC_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xclipboard/Config.in b/package.bak/x11r7/xapp_xclipboard/Config.in deleted file mode 100644 index 941c219752..0000000000 --- a/package.bak/x11r7/xapp_xclipboard/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XCLIPBOARD - bool "xclipboard" - select BR2_PACKAGE_XLIB_LIBXAW - help - interchange between cut buffer and selection diff --git a/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.hash b/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.hash deleted file mode 100644 index 682c1f35da..0000000000 --- a/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002299.html -sha256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 xclipboard-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.mk b/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.mk deleted file mode 100644 index 3620f757d5..0000000000 --- a/package.bak/x11r7/xapp_xclipboard/xapp_xclipboard.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xclipboard -# -################################################################################ - -XAPP_XCLIPBOARD_VERSION = 1.1.3 -XAPP_XCLIPBOARD_SOURCE = xclipboard-$(XAPP_XCLIPBOARD_VERSION).tar.bz2 -XAPP_XCLIPBOARD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCLIPBOARD_LICENSE = MIT -XAPP_XCLIPBOARD_LICENSE_FILES = COPYING -XAPP_XCLIPBOARD_DEPENDENCIES = xlib_libXaw xlib_libXmu xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xclock/Config.in b/package.bak/x11r7/xapp_xclock/Config.in deleted file mode 100644 index 083a6d1e40..0000000000 --- a/package.bak/x11r7/xapp_xclock/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XAPP_XCLOCK - bool "xclock" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXFT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - analog / digital clock for X diff --git a/package.bak/x11r7/xapp_xclock/xapp_xclock.hash b/package.bak/x11r7/xapp_xclock/xapp_xclock.hash deleted file mode 100644 index 1469077c1b..0000000000 --- a/package.bak/x11r7/xapp_xclock/xapp_xclock.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002310.html -sha256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 xclock-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_xclock/xapp_xclock.mk b/package.bak/x11r7/xapp_xclock/xapp_xclock.mk deleted file mode 100644 index 282d753ffa..0000000000 --- a/package.bak/x11r7/xapp_xclock/xapp_xclock.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xclock -# -################################################################################ - -XAPP_XCLOCK_VERSION = 1.0.7 -XAPP_XCLOCK_SOURCE = xclock-$(XAPP_XCLOCK_VERSION).tar.bz2 -XAPP_XCLOCK_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCLOCK_LICENSE = MIT -XAPP_XCLOCK_LICENSE_FILES = COPYING -XAPP_XCLOCK_DEPENDENCIES = xlib_libX11 xlib_libXaw xlib_libXft xlib_libXrender xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xcmsdb/Config.in b/package.bak/x11r7/xapp_xcmsdb/Config.in deleted file mode 100644 index 99c9cbb4b9..0000000000 --- a/package.bak/x11r7/xapp_xcmsdb/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XCMSDB - bool "xcmsdb" - select BR2_PACKAGE_XLIB_LIBX11 - help - Device Color Characterization utility for X Color Management System diff --git a/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash b/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash deleted file mode 100644 index cc5bbcd07c..0000000000 --- a/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002567.html -sha256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 xcmsdb-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk b/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk deleted file mode 100644 index 3cccacc0b4..0000000000 --- a/package.bak/x11r7/xapp_xcmsdb/xapp_xcmsdb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xcmsdb -# -################################################################################ - -XAPP_XCMSDB_VERSION = 1.0.5 -XAPP_XCMSDB_SOURCE = xcmsdb-$(XAPP_XCMSDB_VERSION).tar.bz2 -XAPP_XCMSDB_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCMSDB_LICENSE = MIT -XAPP_XCMSDB_LICENSE_FILES = COPYING -XAPP_XCMSDB_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xcompmgr/Config.in b/package.bak/x11r7/xapp_xcompmgr/Config.in deleted file mode 100644 index b46014db98..0000000000 --- a/package.bak/x11r7/xapp_xcompmgr/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XAPP_XCOMPMGR - bool "xcompmgr" - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRENDER - help - xcompmgr is a sample compositing manager that enables basic - eye-candy effects. diff --git a/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash b/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash deleted file mode 100644 index 34c13c19d1..0000000000 --- a/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002568.html -sha256 c8049b1a2531313be7469ba9b198d334f0b91cc01efc2b20b9afcb117e4d6892 xcompmgr-1.1.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk b/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk deleted file mode 100644 index 918c1e50ae..0000000000 --- a/package.bak/x11r7/xapp_xcompmgr/xapp_xcompmgr.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xapp_xcompmgr -# -################################################################################ - -XAPP_XCOMPMGR_VERSION = 1.1.7 -XAPP_XCOMPMGR_SOURCE = xcompmgr-$(XAPP_XCOMPMGR_VERSION).tar.bz2 -XAPP_XCOMPMGR_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCOMPMGR_LICENSE = MIT -XAPP_XCOMPMGR_LICENSE_FILES = COPYING -XAPP_XCOMPMGR_DEPENDENCIES = \ - xlib_libXcomposite \ - xlib_libXdamage \ - xlib_libXext \ - xlib_libXfixes \ - xlib_libXrender - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xconsole/Config.in b/package.bak/x11r7/xapp_xconsole/Config.in deleted file mode 100644 index 1aaa118793..0000000000 --- a/package.bak/x11r7/xapp_xconsole/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XAPP_XCONSOLE - bool "xconsole" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XLIB_LIBXMU - depends on BR2_USE_MMU # fork() - help - xconsole - monitor system console messages with X diff --git a/package.bak/x11r7/xapp_xconsole/xapp_xconsole.hash b/package.bak/x11r7/xapp_xconsole/xapp_xconsole.hash deleted file mode 100644 index 364cdbe405..0000000000 --- a/package.bak/x11r7/xapp_xconsole/xapp_xconsole.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002774.html -sha256 d1144882df207378381bc83927906559defbf7b83a01d52c50ad44234c5851e0 xconsole-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_xconsole/xapp_xconsole.mk b/package.bak/x11r7/xapp_xconsole/xapp_xconsole.mk deleted file mode 100644 index 52656de83c..0000000000 --- a/package.bak/x11r7/xapp_xconsole/xapp_xconsole.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xapp_xconsole -# -################################################################################ - -XAPP_XCONSOLE_VERSION = 1.0.7 -XAPP_XCONSOLE_SOURCE = xconsole-$(XAPP_XCONSOLE_VERSION).tar.bz2 -XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCONSOLE_LICENSE = MIT -XAPP_XCONSOLE_LICENSE_FILES = COPYING -XAPP_XCONSOLE_DEPENDENCIES = \ - xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \ - xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xcursorgen/Config.in b/package.bak/x11r7/xapp_xcursorgen/Config.in deleted file mode 100644 index c47ec28f51..0000000000 --- a/package.bak/x11r7/xapp_xcursorgen/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XCURSORGEN - bool "xcursorgen" - select BR2_PACKAGE_LIBPNG - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXCURSOR - help - create an X cursor file from a collection of PNG images diff --git a/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash b/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash deleted file mode 100644 index b98d449c1f..0000000000 --- a/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-May/002438.html -sha256 31c8910f54eb175a8a74a60e7662697467e21a8bf948220a6048a93924b3f66c xcursorgen-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk b/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk deleted file mode 100644 index 4bee26b5dc..0000000000 --- a/package.bak/x11r7/xapp_xcursorgen/xapp_xcursorgen.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xapp_xcursorgen -# -################################################################################ - -XAPP_XCURSORGEN_VERSION = 1.0.6 -XAPP_XCURSORGEN_SOURCE = xcursorgen-$(XAPP_XCURSORGEN_VERSION).tar.bz2 -XAPP_XCURSORGEN_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XCURSORGEN_LICENSE = MIT -XAPP_XCURSORGEN_LICENSE_FILES = COPYING -XAPP_XCURSORGEN_DEPENDENCIES = libpng xlib_libX11 xlib_libXcursor -HOST_XAPP_XCURSORGEN_DEPENDENCIES = \ - host-libpng host-xlib_libX11 host-xlib_libXcursor - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xapp_xdbedizzy/Config.in b/package.bak/x11r7/xapp_xdbedizzy/Config.in deleted file mode 100644 index e4a5960fdd..0000000000 --- a/package.bak/x11r7/xapp_xdbedizzy/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XDBEDIZZY - bool "xdbedizzy" - select BR2_PACKAGE_XLIB_LIBXEXT - help - X.Org xdbedizzy application diff --git a/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash b/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash deleted file mode 100644 index 8fbe8b00eb..0000000000 --- a/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-October/001514.html -sha1 281bee72116311e2d8393ae53ea832e9d267eded xdbedizzy-1.1.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk b/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk deleted file mode 100644 index 72d04f8367..0000000000 --- a/package.bak/x11r7/xapp_xdbedizzy/xapp_xdbedizzy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xdbedizzy -# -################################################################################ - -XAPP_XDBEDIZZY_VERSION = 1.1.0 -XAPP_XDBEDIZZY_SOURCE = xdbedizzy-$(XAPP_XDBEDIZZY_VERSION).tar.bz2 -XAPP_XDBEDIZZY_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XDBEDIZZY_LICENSE = MIT -XAPP_XDBEDIZZY_LICENSE_FILES = COPYING -XAPP_XDBEDIZZY_DEPENDENCIES = xlib_libXext - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xditview/Config.in b/package.bak/x11r7/xapp_xditview/Config.in deleted file mode 100644 index 22944f70ce..0000000000 --- a/package.bak/x11r7/xapp_xditview/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XDITVIEW - bool "xditview" - select BR2_PACKAGE_XLIB_LIBXAW - help - display ditroff output diff --git a/package.bak/x11r7/xapp_xditview/xapp_xditview.hash b/package.bak/x11r7/xapp_xditview/xapp_xditview.hash deleted file mode 100644 index c8c1a0cb56..0000000000 --- a/package.bak/x11r7/xapp_xditview/xapp_xditview.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -sha256 307f8df1bc3e90a7fba74dfe16840891c365abc027fbd556027eb057e5d1ff73 xditview-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xditview/xapp_xditview.mk b/package.bak/x11r7/xapp_xditview/xapp_xditview.mk deleted file mode 100644 index 4744c1fefd..0000000000 --- a/package.bak/x11r7/xapp_xditview/xapp_xditview.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xditview -# -################################################################################ - -XAPP_XDITVIEW_VERSION = 1.0.4 -XAPP_XDITVIEW_SOURCE = xditview-$(XAPP_XDITVIEW_VERSION).tar.bz2 -XAPP_XDITVIEW_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XDITVIEW_LICENSE = MIT -XAPP_XDITVIEW_LICENSE_FILES = COPYING -XAPP_XDITVIEW_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xdm/Config.in b/package.bak/x11r7/xapp_xdm/Config.in deleted file mode 100644 index 69829701ca..0000000000 --- a/package.bak/x11r7/xapp_xdm/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XAPP_XDM - bool "xdm" - depends on BR2_USE_MMU # fork() - # Runtime dependency: can't start an X server unless there is one - depends on BR2_PACKAGE_XSERVER_XORG_SERVER - select BR2_PACKAGE_XAPP_SESSREG - select BR2_PACKAGE_XAPP_XRDB - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XPROTO_XINERAMAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org xdm application diff --git a/package.bak/x11r7/xapp_xdm/S99xdm b/package.bak/x11r7/xapp_xdm/S99xdm deleted file mode 100644 index a2c0a1de06..0000000000 --- a/package.bak/x11r7/xapp_xdm/S99xdm +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -XDM_BIN=/usr/bin/xdm - -case "$1" in - start) - printf "Starting XDM: " - $XDM_BIN - echo "done" - ;; - stop) - echo "Stopping XDM" - killall -q xdm - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/x11r7/xapp_xdm/xapp_xdm.hash b/package.bak/x11r7/xapp_xdm/xapp_xdm.hash deleted file mode 100644 index 207d769fbf..0000000000 --- a/package.bak/x11r7/xapp_xdm/xapp_xdm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2011-September/001737.html -sha256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 xdm-1.1.11.tar.bz2 diff --git a/package.bak/x11r7/xapp_xdm/xapp_xdm.mk b/package.bak/x11r7/xapp_xdm/xapp_xdm.mk deleted file mode 100644 index 8f846a82aa..0000000000 --- a/package.bak/x11r7/xapp_xdm/xapp_xdm.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# xapp_xdm -# -################################################################################ - -XAPP_XDM_VERSION = 1.1.11 -XAPP_XDM_SOURCE = xdm-$(XAPP_XDM_VERSION).tar.bz2 -XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XDM_LICENSE = MIT -XAPP_XDM_LICENSE_FILES = COPYING -XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes -XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto -XAPP_XDM_CONF_OPTS = \ - --with-utmp-file=/var/adm/utmpx \ - --with-wtmp-file=/var/adm/wtmpx - -define XAPP_XDM_INSTALL_INIT_SYSV - $(INSTALL) -m 0755 -D package/x11r7/xapp_xdm/S99xdm \ - $(TARGET_DIR)/etc/init.d/S99xdm -endef - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xdpyinfo/Config.in b/package.bak/x11r7/xapp_xdpyinfo/Config.in deleted file mode 100644 index 8527903855..0000000000 --- a/package.bak/x11r7/xapp_xdpyinfo/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XDPYINFO - bool "xdpyinfo" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXTST - help - display information utility for X diff --git a/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash b/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash deleted file mode 100644 index 7f9c4f5482..0000000000 --- a/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002569.html -sha256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 xdpyinfo-1.3.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk b/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk deleted file mode 100644 index cf94f70bcf..0000000000 --- a/package.bak/x11r7/xapp_xdpyinfo/xapp_xdpyinfo.mk +++ /dev/null @@ -1,37 +0,0 @@ -################################################################################ -# -# xapp_xdpyinfo -# -################################################################################ - -XAPP_XDPYINFO_VERSION = 1.3.2 -XAPP_XDPYINFO_SOURCE = xdpyinfo-$(XAPP_XDPYINFO_VERSION).tar.bz2 -XAPP_XDPYINFO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XDPYINFO_LICENSE = MIT -XAPP_XDPYINFO_LICENSE_FILES = COPYING -XAPP_XDPYINFO_CONF_OPTS = --without-xf86misc # not in BR -XAPP_XDPYINFO_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXtst \ - $(if $(BR2_PACKAGE_XLIB_LIBXI),xlib_libXi) \ - $(if $(BR2_PACKAGE_XLIB_LIBXRENDER),xlib_libXrender) \ - $(if $(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),xlib_libXcomposite) \ - $(if $(BR2_PACKAGE_XLIB_LIBXXF86VM),xlib_libXxf86vm) - -ifeq ($(BR2_PACKAGE_XLIB_LIBXXF86DGA),y) -XAPP_XDPYINFO_DEPENDENCIES += xlib_libXxf86dga -else -XAPP_XDPYINFO_CONF_OPTS += --without-dga -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBDMX),y) -XAPP_XDPYINFO_DEPENDENCIES += xlib_libdmx -else -XAPP_XDPYINFO_CONF_OPTS += --without-dmx -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -XAPP_XDPYINFO_DEPENDENCIES += xlib_libXinerama -else -XAPP_XDPYINFO_CONF_OPTS += --without-xinerama -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xdriinfo/Config.in b/package.bak/x11r7/xapp_xdriinfo/Config.in deleted file mode 100644 index 36dc5770e9..0000000000 --- a/package.bak/x11r7/xapp_xdriinfo/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XAPP_XDRIINFO - bool "xdriinfo" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_GLPROTO - depends on BR2_PACKAGE_HAS_LIBGL - help - query configuration information of DRI drivers - -comment "xdriinfo needs an OpenGL backend" - depends on !BR2_PACKAGE_HAS_LIBGL diff --git a/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash b/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash deleted file mode 100644 index 264ec9a016..0000000000 --- a/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002570.html -sha256 4cba3766ef89557422062287248adeb933999071bad6f3ef9c0a478a3c680119 xdriinfo-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk deleted file mode 100644 index bb00d3ba07..0000000000 --- a/package.bak/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xdriinfo -# -################################################################################ - -XAPP_XDRIINFO_VERSION = 1.0.5 -XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2 -XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XDRIINFO_LICENSE = MIT -XAPP_XDRIINFO_LICENSE_FILES = COPYING -XAPP_XDRIINFO_DEPENDENCIES = xlib_libX11 xproto_glproto mesa3d - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xedit/Config.in b/package.bak/x11r7/xapp_xedit/Config.in deleted file mode 100644 index feaea7486f..0000000000 --- a/package.bak/x11r7/xapp_xedit/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XEDIT - bool "xedit" - select BR2_PACKAGE_XLIB_LIBXAW - depends on BR2_USE_MMU # fork() - help - simple text editor for X diff --git a/package.bak/x11r7/xapp_xedit/xapp_xedit.hash b/package.bak/x11r7/xapp_xedit/xapp_xedit.hash deleted file mode 100644 index 5aedfb74c4..0000000000 --- a/package.bak/x11r7/xapp_xedit/xapp_xedit.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002535.html -sha1 f37b5d0f8ec461955f0419dbb1890d8cf63d179d xedit-1.2.2.tar.bz2 -sha256 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 xedit-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xedit/xapp_xedit.mk b/package.bak/x11r7/xapp_xedit/xapp_xedit.mk deleted file mode 100644 index 0f42e2cb0d..0000000000 --- a/package.bak/x11r7/xapp_xedit/xapp_xedit.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xapp_xedit -# -################################################################################ - -XAPP_XEDIT_VERSION = 1.2.2 -XAPP_XEDIT_SOURCE = xedit-$(XAPP_XEDIT_VERSION).tar.bz2 -XAPP_XEDIT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XEDIT_LICENSE = MIT -XAPP_XEDIT_LICENSE_FILES = COPYING -XAPP_XEDIT_DEPENDENCIES = xlib_libXaw - -XAPP_XEDIT_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xev/Config.in b/package.bak/x11r7/xapp_xev/Config.in deleted file mode 100644 index 864d6424da..0000000000 --- a/package.bak/x11r7/xapp_xev/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XEV - bool "xev" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXRANDR - help - print contents of X events diff --git a/package.bak/x11r7/xapp_xev/xapp_xev.hash b/package.bak/x11r7/xapp_xev/xapp_xev.hash deleted file mode 100644 index 4008ebafae..0000000000 --- a/package.bak/x11r7/xapp_xev/xapp_xev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002572.html -sha256 d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f xev-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xev/xapp_xev.mk b/package.bak/x11r7/xapp_xev/xapp_xev.mk deleted file mode 100644 index 2a798db555..0000000000 --- a/package.bak/x11r7/xapp_xev/xapp_xev.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xev -# -################################################################################ - -XAPP_XEV_VERSION = 1.2.2 -XAPP_XEV_SOURCE = xev-$(XAPP_XEV_VERSION).tar.bz2 -XAPP_XEV_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XEV_LICENSE = MIT -XAPP_XEV_LICENSE_FILES = COPYING -XAPP_XEV_DEPENDENCIES = xlib_libX11 xlib_libXrandr - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xeyes/Config.in b/package.bak/x11r7/xapp_xeyes/Config.in deleted file mode 100644 index 5cf7f6c052..0000000000 --- a/package.bak/x11r7/xapp_xeyes/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XAPP_XEYES - bool "xeyes" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXT - help - X.Org xeyes application diff --git a/package.bak/x11r7/xapp_xeyes/xapp_xeyes.hash b/package.bak/x11r7/xapp_xeyes/xapp_xeyes.hash deleted file mode 100644 index 02eb26b7b9..0000000000 --- a/package.bak/x11r7/xapp_xeyes/xapp_xeyes.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-November/001552.html -sha1 efe6116d31a7f69e4fb6038613e52b0960b9b61c xeyes-1.1.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_xeyes/xapp_xeyes.mk b/package.bak/x11r7/xapp_xeyes/xapp_xeyes.mk deleted file mode 100644 index 07c12002be..0000000000 --- a/package.bak/x11r7/xapp_xeyes/xapp_xeyes.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xeyes -# -################################################################################ - -XAPP_XEYES_VERSION = 1.1.1 -XAPP_XEYES_SOURCE = xeyes-$(XAPP_XEYES_VERSION).tar.bz2 -XAPP_XEYES_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XEYES_LICENSE = MIT -XAPP_XEYES_LICENSE_FILES = COPYING -XAPP_XEYES_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXmu xlib_libXrender xlib_libXt - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xf86dga/Config.in b/package.bak/x11r7/xapp_xf86dga/Config.in deleted file mode 100644 index 8a13bd4df1..0000000000 --- a/package.bak/x11r7/xapp_xf86dga/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XF86DGA - bool "xf86dga" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXXF86DGA - depends on BR2_USE_MMU # fork() - help - test program for the XFree86-DGA extension diff --git a/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.hash b/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.hash deleted file mode 100644 index b0c803e9ce..0000000000 --- a/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-October/001515.html -sha1 030659e3728f5f7142e1cf727f147aceeabe4b9e xf86dga-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.mk b/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.mk deleted file mode 100644 index fe8e427856..0000000000 --- a/package.bak/x11r7/xapp_xf86dga/xapp_xf86dga.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xapp_xf86dga -# -################################################################################ - -XAPP_XF86DGA_VERSION = 1.0.3 -XAPP_XF86DGA_SOURCE = xf86dga-$(XAPP_XF86DGA_VERSION).tar.bz2 -XAPP_XF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XF86DGA_LICENSE = MIT -XAPP_XF86DGA_LICENSE_FILES = COPYING -XAPP_XF86DGA_DEPENDENCIES = \ - host-pkgconf \ - xlib_libX11 \ - xlib_libXxf86dga - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xfd/Config.in b/package.bak/x11r7/xapp_xfd/Config.in deleted file mode 100644 index f006b1e488..0000000000 --- a/package.bak/x11r7/xapp_xfd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XFD - bool "xfd" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXFT - help - X.Org xfd application diff --git a/package.bak/x11r7/xapp_xfd/xapp_xfd.hash b/package.bak/x11r7/xapp_xfd/xapp_xfd.hash deleted file mode 100644 index 7b6824bec3..0000000000 --- a/package.bak/x11r7/xapp_xfd/xapp_xfd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002268.html -sha256 c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 xfd-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xfd/xapp_xfd.mk b/package.bak/x11r7/xapp_xfd/xapp_xfd.mk deleted file mode 100644 index e3c770b37c..0000000000 --- a/package.bak/x11r7/xapp_xfd/xapp_xfd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xfd -# -################################################################################ - -XAPP_XFD_VERSION = 1.1.2 -XAPP_XFD_SOURCE = xfd-$(XAPP_XFD_VERSION).tar.bz2 -XAPP_XFD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XFD_LICENSE = MIT -XAPP_XFD_LICENSE_FILES = COPYING -XAPP_XFD_DEPENDENCIES = freetype fontconfig xlib_libXaw xlib_libXft - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xfindproxy/Config.in b/package.bak/x11r7/xapp_xfindproxy/Config.in deleted file mode 100644 index b186ab65bc..0000000000 --- a/package.bak/x11r7/xapp_xfindproxy/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XAPP_XFINDPROXY - bool "xfindproxy" - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL - help - xfindproxy utilizes the Proxy Management Protocol to - communicate with a proxy manager to locate available X11 - proxy services. diff --git a/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash b/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash deleted file mode 100644 index 9263e46303..0000000000 --- a/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002573.html -sha256 5626bda27c7faa5cbe289a17f8552538fff08a96d542b85efdda1804ccf8a01f xfindproxy-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk deleted file mode 100644 index 7662a902a2..0000000000 --- a/package.bak/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# xapp_xfindproxy -# -################################################################################ - -XAPP_XFINDPROXY_VERSION = 1.0.4 -XAPP_XFINDPROXY_SOURCE = xfindproxy-$(XAPP_XFINDPROXY_VERSION).tar.bz2 -XAPP_XFINDPROXY_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XFINDPROXY_LICENSE = MIT -XAPP_XFINDPROXY_LICENSE_FILES = COPYING -XAPP_XFINDPROXY_DEPENDENCIES = \ - xlib_libICE \ - xlib_libXt \ - xproto_xproto \ - xproto_xproxymanagementprotocol - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xfontsel/Config.in b/package.bak/x11r7/xapp_xfontsel/Config.in deleted file mode 100644 index 0c6aa3792e..0000000000 --- a/package.bak/x11r7/xapp_xfontsel/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XFONTSEL - bool "xfontsel" - select BR2_PACKAGE_XLIB_LIBXAW - help - point and click selection of X11 font names diff --git a/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.hash b/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.hash deleted file mode 100644 index 40f55236f0..0000000000 --- a/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002213.html -sha256 170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf xfontsel-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.mk b/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.mk deleted file mode 100644 index 781b4d3542..0000000000 --- a/package.bak/x11r7/xapp_xfontsel/xapp_xfontsel.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xfontsel -# -################################################################################ - -XAPP_XFONTSEL_VERSION = 1.0.5 -XAPP_XFONTSEL_SOURCE = xfontsel-$(XAPP_XFONTSEL_VERSION).tar.bz2 -XAPP_XFONTSEL_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XFONTSEL_LICENSE = MIT -XAPP_XFONTSEL_LICENSE_FILES = COPYING -XAPP_XFONTSEL_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xfs/Config.in b/package.bak/x11r7/xapp_xfs/Config.in deleted file mode 100644 index 8b72445f8a..0000000000 --- a/package.bak/x11r7/xapp_xfs/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XFS - bool "xfs" - select BR2_PACKAGE_XLIB_LIBFS - select BR2_PACKAGE_XLIB_LIBXFONT - select BR2_PACKAGE_XPROTO_FONTSPROTO - depends on BR2_USE_MMU # fork() - help - X font server diff --git a/package.bak/x11r7/xapp_xfs/xapp_xfs.hash b/package.bak/x11r7/xapp_xfs/xapp_xfs.hash deleted file mode 100644 index 67823742b5..0000000000 --- a/package.bak/x11r7/xapp_xfs/xapp_xfs.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-August/002472.html -sha256 a40b75e674c091464f85739292b6bf24e2d153f4a2ac456d3ea6b8a64e269ffa xfs-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xfs/xapp_xfs.mk b/package.bak/x11r7/xapp_xfs/xapp_xfs.mk deleted file mode 100644 index 3e704554b2..0000000000 --- a/package.bak/x11r7/xapp_xfs/xapp_xfs.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xfs -# -################################################################################ - -XAPP_XFS_VERSION = 1.1.4 -XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2 -XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XFS_LICENSE = MIT -XAPP_XFS_LICENSE_FILES = COPYING -XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont xproto_fontsproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xfsinfo/Config.in b/package.bak/x11r7/xapp_xfsinfo/Config.in deleted file mode 100644 index 84c8ac134d..0000000000 --- a/package.bak/x11r7/xapp_xfsinfo/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XFSINFO - bool "xfsinfo" - select BR2_PACKAGE_XLIB_LIBFS - select BR2_PACKAGE_XLIB_LIBX11 - help - X font server information utility diff --git a/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash b/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash deleted file mode 100644 index b1bcc0bc8a..0000000000 --- a/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-December/002512.html -sha256 d38f4b6db4038f52ba1a09123ef497993194288454c0c13d16debe246f120d8f xfsinfo-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk b/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk deleted file mode 100644 index 38d01e4949..0000000000 --- a/package.bak/x11r7/xapp_xfsinfo/xapp_xfsinfo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xfsinfo -# -################################################################################ - -XAPP_XFSINFO_VERSION = 1.0.5 -XAPP_XFSINFO_SOURCE = xfsinfo-$(XAPP_XFSINFO_VERSION).tar.bz2 -XAPP_XFSINFO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XFSINFO_LICENSE = MIT -XAPP_XFSINFO_LICENSE_FILES = COPYING -XAPP_XFSINFO_DEPENDENCIES = xlib_libFS xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xgamma/Config.in b/package.bak/x11r7/xapp_xgamma/Config.in deleted file mode 100644 index b20a784097..0000000000 --- a/package.bak/x11r7/xapp_xgamma/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XGAMMA - bool "xgamma" - select BR2_PACKAGE_XLIB_LIBXXF86VM - help - Alter a monitor's gamma correction through the X server diff --git a/package.bak/x11r7/xapp_xgamma/xapp_xgamma.hash b/package.bak/x11r7/xapp_xgamma/xapp_xgamma.hash deleted file mode 100644 index 30480aadd8..0000000000 --- a/package.bak/x11r7/xapp_xgamma/xapp_xgamma.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002574.html -sha256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 xgamma-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_xgamma/xapp_xgamma.mk b/package.bak/x11r7/xapp_xgamma/xapp_xgamma.mk deleted file mode 100644 index a73a29e5a2..0000000000 --- a/package.bak/x11r7/xapp_xgamma/xapp_xgamma.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xgamma -# -################################################################################ - -XAPP_XGAMMA_VERSION = 1.0.6 -XAPP_XGAMMA_SOURCE = xgamma-$(XAPP_XGAMMA_VERSION).tar.bz2 -XAPP_XGAMMA_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XGAMMA_LICENSE = MIT -XAPP_XGAMMA_LICENSE_FILES = COPYING -XAPP_XGAMMA_DEPENDENCIES = xlib_libXxf86vm - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xgc/Config.in b/package.bak/x11r7/xapp_xgc/Config.in deleted file mode 100644 index 98faba8847..0000000000 --- a/package.bak/x11r7/xapp_xgc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XGC - bool "xgc" - select BR2_PACKAGE_XLIB_LIBXAW - help - X graphics demo diff --git a/package.bak/x11r7/xapp_xgc/xapp_xgc.hash b/package.bak/x11r7/xapp_xgc/xapp_xgc.hash deleted file mode 100644 index 7972a6fd3b..0000000000 --- a/package.bak/x11r7/xapp_xgc/xapp_xgc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002575.html -sha256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e xgc-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xgc/xapp_xgc.mk b/package.bak/x11r7/xapp_xgc/xapp_xgc.mk deleted file mode 100644 index 41d42c461e..0000000000 --- a/package.bak/x11r7/xapp_xgc/xapp_xgc.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xgc -# -################################################################################ - -XAPP_XGC_VERSION = 1.0.5 -XAPP_XGC_SOURCE = xgc-$(XAPP_XGC_VERSION).tar.bz2 -XAPP_XGC_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XGC_LICENSE = MIT -XAPP_XGC_LICENSE_FILES = COPYING -XAPP_XGC_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xhost/Config.in b/package.bak/x11r7/xapp_xhost/Config.in deleted file mode 100644 index 659b34deb1..0000000000 --- a/package.bak/x11r7/xapp_xhost/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XHOST - bool "xhost" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - Controls host and/or user access to a running X server. diff --git a/package.bak/x11r7/xapp_xhost/xapp_xhost.hash b/package.bak/x11r7/xapp_xhost/xapp_xhost.hash deleted file mode 100644 index b714eb65c3..0000000000 --- a/package.bak/x11r7/xapp_xhost/xapp_xhost.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002576.html -sha256 93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a xhost-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xapp_xhost/xapp_xhost.mk b/package.bak/x11r7/xapp_xhost/xapp_xhost.mk deleted file mode 100644 index a4bb16bae3..0000000000 --- a/package.bak/x11r7/xapp_xhost/xapp_xhost.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xhost -# -################################################################################ - -XAPP_XHOST_VERSION = 1.0.7 -XAPP_XHOST_SOURCE = xhost-$(XAPP_XHOST_VERSION).tar.bz2 -XAPP_XHOST_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XHOST_LICENSE = MIT -XAPP_XHOST_LICENSE_FILES = COPYING -XAPP_XHOST_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xinit/Config.in b/package.bak/x11r7/xapp_xinit/Config.in deleted file mode 100644 index d9fb1c5fc8..0000000000 --- a/package.bak/x11r7/xapp_xinit/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_XAPP_XINIT - bool "xinit" - depends on BR2_USE_MMU # fork() - # Runtime dependency: can't start an X server unless there is one - depends on BR2_PACKAGE_XSERVER_XORG_SERVER - # Runtime dependency; mcookie is also in util-linux - select BR2_PACKAGE_MCOOKIE if !BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_XAPP_XAUTH - select BR2_PACKAGE_XLIB_LIBX11 - help - X Window System initializer diff --git a/package.bak/x11r7/xapp_xinit/xapp_xinit.hash b/package.bak/x11r7/xapp_xinit/xapp_xinit.hash deleted file mode 100644 index f8bab9114c..0000000000 --- a/package.bak/x11r7/xapp_xinit/xapp_xinit.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-September/002477.html -sha256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 xinit-1.3.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xinit/xapp_xinit.mk b/package.bak/x11r7/xapp_xinit/xapp_xinit.mk deleted file mode 100644 index a796884f6b..0000000000 --- a/package.bak/x11r7/xapp_xinit/xapp_xinit.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xapp_xinit -# -################################################################################ - -XAPP_XINIT_VERSION = 1.3.4 -XAPP_XINIT_SOURCE = xinit-$(XAPP_XINIT_VERSION).tar.bz2 -XAPP_XINIT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XINIT_DEPENDENCIES = xapp_xauth xlib_libX11 -XAPP_XINIT_LICENSE = MIT -XAPP_XINIT_LICENSE_FILES = COPYING -XAPP_XINIT_CONF_OPTS = MCOOKIE=/usr/bin/mcookie - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xinput-calibrator/Config.in b/package.bak/x11r7/xapp_xinput-calibrator/Config.in deleted file mode 100644 index 76fbcd4305..0000000000 --- a/package.bak/x11r7/xapp_xinput-calibrator/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_XAPP_XINPUT_CALIBRATOR - bool "xinput-calibrator" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXI - help - A generic touchscreen calibration program for X.Org. - - http://www.freedesktop.org/wiki/Software/xinput_calibrator - -comment "xinput-calibrator needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash b/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash deleted file mode 100644 index c2d439fed6..0000000000 --- a/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971 xinput_calibrator-0.7.5.tar.gz diff --git a/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk b/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk deleted file mode 100644 index 974b83df2c..0000000000 --- a/package.bak/x11r7/xapp_xinput-calibrator/xapp_xinput-calibrator.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xinput-calibrator -# -################################################################################ - -XAPP_XINPUT_CALIBRATOR_VERSION = 0.7.5 -XAPP_XINPUT_CALIBRATOR_SOURCE = xinput_calibrator-$(XAPP_XINPUT_CALIBRATOR_VERSION).tar.gz -XAPP_XINPUT_CALIBRATOR_SITE = http://github.com/downloads/tias/xinput_calibrator -XAPP_XINPUT_CALIBRATOR_LICENSE = MIT -XAPP_XINPUT_CALIBRATOR_LICENSE_FILES = COPYING -XAPP_XINPUT_CALIBRATOR_DEPENDENCIES = xlib_libX11 xlib_libXi - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xinput/Config.in b/package.bak/x11r7/xapp_xinput/Config.in deleted file mode 100644 index e438a45bdb..0000000000 --- a/package.bak/x11r7/xapp_xinput/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XINPUT - bool "xinput" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXINERAMA - help - xinput diff --git a/package.bak/x11r7/xapp_xinput/xapp_xinput.hash b/package.bak/x11r7/xapp_xinput/xapp_xinput.hash deleted file mode 100644 index 724b2e2637..0000000000 --- a/package.bak/x11r7/xapp_xinput/xapp_xinput.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-October/002643.html -sha256 3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4 xinput-1.6.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xinput/xapp_xinput.mk b/package.bak/x11r7/xapp_xinput/xapp_xinput.mk deleted file mode 100644 index aaa7a80818..0000000000 --- a/package.bak/x11r7/xapp_xinput/xapp_xinput.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xinput -# -################################################################################ - -XAPP_XINPUT_VERSION = 1.6.2 -XAPP_XINPUT_SOURCE = xinput-$(XAPP_XINPUT_VERSION).tar.bz2 -XAPP_XINPUT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XINPUT_LICENSE = MIT -XAPP_XINPUT_LICENSE_FILES = COPYING -XAPP_XINPUT_DEPENDENCIES = xlib_libX11 xlib_libXi xlib_libXrandr xlib_libXinerama - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xkbcomp/Config.in b/package.bak/x11r7/xapp_xkbcomp/Config.in deleted file mode 100644 index 2b575b2523..0000000000 --- a/package.bak/x11r7/xapp_xkbcomp/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XKBCOMP - bool "xkbcomp" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - compile XKB keyboard description diff --git a/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash b/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash deleted file mode 100644 index bc85caa6ed..0000000000 --- a/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-November/002653.html -sha256 0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d xkbcomp-1.3.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk b/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk deleted file mode 100644 index 4fc4372fef..0000000000 --- a/package.bak/x11r7/xapp_xkbcomp/xapp_xkbcomp.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xapp_xkbcomp -# -################################################################################ - -XAPP_XKBCOMP_VERSION = 1.3.1 -XAPP_XKBCOMP_SOURCE = xkbcomp-$(XAPP_XKBCOMP_VERSION).tar.bz2 -XAPP_XKBCOMP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XKBCOMP_LICENSE = MIT -XAPP_XKBCOMP_LICENSE_FILES = COPYING -XAPP_XKBCOMP_DEPENDENCIES = xlib_libX11 xlib_libxkbfile -HOST_XAPP_XKBCOMP_DEPENDENCIES = host-xlib_libX11 host-xlib_libxkbfile -XAPP_XKBCOMP_CONF_ENV = ac_cv_file___xkbparse_c=yes - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xapp_xkbevd/Config.in b/package.bak/x11r7/xapp_xkbevd/Config.in deleted file mode 100644 index 0cbb9e4f19..0000000000 --- a/package.bak/x11r7/xapp_xkbevd/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XKBEVD - bool "xkbevd" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - XKB event daemon diff --git a/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.hash b/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.hash deleted file mode 100644 index b350d295d7..0000000000 --- a/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002577.html -sha256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a xkbevd-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.mk b/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.mk deleted file mode 100644 index 7a9a8fb18f..0000000000 --- a/package.bak/x11r7/xapp_xkbevd/xapp_xkbevd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xkbevd -# -################################################################################ - -XAPP_XKBEVD_VERSION = 1.1.4 -XAPP_XKBEVD_SOURCE = xkbevd-$(XAPP_XKBEVD_VERSION).tar.bz2 -XAPP_XKBEVD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XKBEVD_LICENSE = MIT -XAPP_XKBEVD_LICENSE_FILES = COPYING -XAPP_XKBEVD_DEPENDENCIES = xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xkbprint/Config.in b/package.bak/x11r7/xapp_xkbprint/Config.in deleted file mode 100644 index e7a4242caa..0000000000 --- a/package.bak/x11r7/xapp_xkbprint/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XKBPRINT - bool "xkbprint" - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - print an XKB keyboard description diff --git a/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.hash b/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.hash deleted file mode 100644 index 9ec83b6592..0000000000 --- a/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002578.html -sha256 0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12 xkbprint-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.mk b/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.mk deleted file mode 100644 index 5f2300f8be..0000000000 --- a/package.bak/x11r7/xapp_xkbprint/xapp_xkbprint.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xkbprint -# -################################################################################ - -XAPP_XKBPRINT_VERSION = 1.0.4 -XAPP_XKBPRINT_SOURCE = xkbprint-$(XAPP_XKBPRINT_VERSION).tar.bz2 -XAPP_XKBPRINT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XKBPRINT_LICENSE = MIT -XAPP_XKBPRINT_LICENSE_FILES = COPYING -XAPP_XKBPRINT_DEPENDENCIES = xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xkbutils/Config.in b/package.bak/x11r7/xapp_xkbutils/Config.in deleted file mode 100644 index 22a819b378..0000000000 --- a/package.bak/x11r7/xapp_xkbutils/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XKBUTILS - bool "xkbutils" - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXKBFILE - help - X.Org xkbutils application diff --git a/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.hash b/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.hash deleted file mode 100644 index 6660304602..0000000000 --- a/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002162.html -sha256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 xkbutils-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.mk b/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.mk deleted file mode 100644 index 96ca8a4093..0000000000 --- a/package.bak/x11r7/xapp_xkbutils/xapp_xkbutils.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xkbutils -# -################################################################################ - -XAPP_XKBUTILS_VERSION = 1.0.4 -XAPP_XKBUTILS_SOURCE = xkbutils-$(XAPP_XKBUTILS_VERSION).tar.bz2 -XAPP_XKBUTILS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XKBUTILS_LICENSE = MIT -XAPP_XKBUTILS_LICENSE_FILES = COPYING -XAPP_XKBUTILS_DEPENDENCIES = xlib_libXaw xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xkill/Config.in b/package.bak/x11r7/xapp_xkill/Config.in deleted file mode 100644 index fcab92a52d..0000000000 --- a/package.bak/x11r7/xapp_xkill/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XKILL - bool "xkill" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - kill a client by its X resource diff --git a/package.bak/x11r7/xapp_xkill/xapp_xkill.hash b/package.bak/x11r7/xapp_xkill/xapp_xkill.hash deleted file mode 100644 index 22c256d49d..0000000000 --- a/package.bak/x11r7/xapp_xkill/xapp_xkill.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002313.html -sha256 88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e xkill-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xkill/xapp_xkill.mk b/package.bak/x11r7/xapp_xkill/xapp_xkill.mk deleted file mode 100644 index 76af1b95cb..0000000000 --- a/package.bak/x11r7/xapp_xkill/xapp_xkill.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xkill -# -################################################################################ - -XAPP_XKILL_VERSION = 1.0.4 -XAPP_XKILL_SOURCE = xkill-$(XAPP_XKILL_VERSION).tar.bz2 -XAPP_XKILL_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XKILL_LICENSE = MIT -XAPP_XKILL_LICENSE_FILES = COPYING -XAPP_XKILL_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xload/Config.in b/package.bak/x11r7/xapp_xload/Config.in deleted file mode 100644 index 25c79d2c67..0000000000 --- a/package.bak/x11r7/xapp_xload/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XLOAD - bool "xload" - select BR2_PACKAGE_XLIB_LIBXAW - help - system load average display for X diff --git a/package.bak/x11r7/xapp_xload/xapp_xload.hash b/package.bak/x11r7/xapp_xload/xapp_xload.hash deleted file mode 100644 index 418ce55634..0000000000 --- a/package.bak/x11r7/xapp_xload/xapp_xload.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002285.html -sha256 83f8e6260435f1df2e2e5036bb3325688b79f0b33069ef445eff5058d127e078 xload-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xload/xapp_xload.mk b/package.bak/x11r7/xapp_xload/xapp_xload.mk deleted file mode 100644 index 364d247a95..0000000000 --- a/package.bak/x11r7/xapp_xload/xapp_xload.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xapp_xload -# -################################################################################ - -XAPP_XLOAD_VERSION = 1.1.2 -XAPP_XLOAD_SOURCE = xload-$(XAPP_XLOAD_VERSION).tar.bz2 -XAPP_XLOAD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XLOAD_LICENSE = MIT -XAPP_XLOAD_LICENSE_FILES = COPYING -XAPP_XLOAD_DEPENDENCIES = xlib_libXaw - -ifeq ($(BR2_TOOLCHAIN_USES_MUSL),y) -# musl doesn't have rwhod.h, but xload can replace it with stubs -XAPP_XLOAD_CONF_OPTS += CFLAGS="$(TARGET_CFLAGS) -DRLOADSTUB" -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xlogo/Config.in b/package.bak/x11r7/xapp_xlogo/Config.in deleted file mode 100644 index aacb75ffb0..0000000000 --- a/package.bak/x11r7/xapp_xlogo/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XLOGO - bool "xlogo" - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXFT - help - X Window System logo diff --git a/package.bak/x11r7/xapp_xlogo/xapp_xlogo.hash b/package.bak/x11r7/xapp_xlogo/xapp_xlogo.hash deleted file mode 100644 index 861cd596a4..0000000000 --- a/package.bak/x11r7/xapp_xlogo/xapp_xlogo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001905.html -sha256 17af6f4fb73e7310e087fbfe5d773bab2b0d6f37a894ae5ee32de4693af6ba92 xlogo-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xlogo/xapp_xlogo.mk b/package.bak/x11r7/xapp_xlogo/xapp_xlogo.mk deleted file mode 100644 index 380acfc404..0000000000 --- a/package.bak/x11r7/xapp_xlogo/xapp_xlogo.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xapp_xlogo -# -################################################################################ - -XAPP_XLOGO_VERSION = 1.0.4 -XAPP_XLOGO_SOURCE = xlogo-$(XAPP_XLOGO_VERSION).tar.bz2 -XAPP_XLOGO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XLOGO_LICENSE = MIT -XAPP_XLOGO_LICENSE_FILES = COPYING -XAPP_XLOGO_DEPENDENCIES = \ - xlib_libXaw xlib_libXrender \ - xlib_libXft host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xlsatoms/Config.in b/package.bak/x11r7/xapp_xlsatoms/Config.in deleted file mode 100644 index 2ad8484508..0000000000 --- a/package.bak/x11r7/xapp_xlsatoms/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XLSATOMS - bool "xlsatoms" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - list interned atoms defined on server diff --git a/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash b/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash deleted file mode 100644 index 58d0737b9d..0000000000 --- a/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002579.html -sha256 47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4 xlsatoms-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk b/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk deleted file mode 100644 index d6d9338013..0000000000 --- a/package.bak/x11r7/xapp_xlsatoms/xapp_xlsatoms.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xlsatoms -# -################################################################################ - -XAPP_XLSATOMS_VERSION = 1.1.2 -XAPP_XLSATOMS_SOURCE = xlsatoms-$(XAPP_XLSATOMS_VERSION).tar.bz2 -XAPP_XLSATOMS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XLSATOMS_LICENSE = MIT -XAPP_XLSATOMS_LICENSE_FILES = COPYING -XAPP_XLSATOMS_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xlsclients/Config.in b/package.bak/x11r7/xapp_xlsclients/Config.in deleted file mode 100644 index a934af45e9..0000000000 --- a/package.bak/x11r7/xapp_xlsclients/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XLSCLIENTS - bool "xlsclients" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XCB_UTIL - help - X.Org xlsclients application diff --git a/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.hash b/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.hash deleted file mode 100644 index e1cb80b7fa..0000000000 --- a/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002314.html -sha256 5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d xlsclients-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.mk b/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.mk deleted file mode 100644 index 798dce029c..0000000000 --- a/package.bak/x11r7/xapp_xlsclients/xapp_xlsclients.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xlsclients -# -################################################################################ - -XAPP_XLSCLIENTS_VERSION = 1.1.3 -XAPP_XLSCLIENTS_SOURCE = xlsclients-$(XAPP_XLSCLIENTS_VERSION).tar.bz2 -XAPP_XLSCLIENTS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XLSCLIENTS_LICENSE = MIT -XAPP_XLSCLIENTS_LICENSE_FILES = COPYING -XAPP_XLSCLIENTS_DEPENDENCIES = xlib_libX11 xlib_libXmu libxcb xcb-util - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xlsfonts/Config.in b/package.bak/x11r7/xapp_xlsfonts/Config.in deleted file mode 100644 index dab61ebf54..0000000000 --- a/package.bak/x11r7/xapp_xlsfonts/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XLSFONTS - bool "xlsfonts" - select BR2_PACKAGE_XLIB_LIBX11 - help - X.Org xlsfonts application diff --git a/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash b/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash deleted file mode 100644 index f3a2603171..0000000000 --- a/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002580.html -sha256 40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa xlsfonts-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk b/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk deleted file mode 100644 index 1c42a61a97..0000000000 --- a/package.bak/x11r7/xapp_xlsfonts/xapp_xlsfonts.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xlsfonts -# -################################################################################ - -XAPP_XLSFONTS_VERSION = 1.0.5 -XAPP_XLSFONTS_SOURCE = xlsfonts-$(XAPP_XLSFONTS_VERSION).tar.bz2 -XAPP_XLSFONTS_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XLSFONTS_LICENSE = MIT -XAPP_XLSFONTS_LICENSE_FILES = COPYING -XAPP_XLSFONTS_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xmag/Config.in b/package.bak/x11r7/xapp_xmag/Config.in deleted file mode 100644 index 44d2c8e1ea..0000000000 --- a/package.bak/x11r7/xapp_xmag/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XMAG - bool "xmag" - select BR2_PACKAGE_XLIB_LIBXAW - help - X.Org xmag application diff --git a/package.bak/x11r7/xapp_xmag/xapp_xmag.hash b/package.bak/x11r7/xapp_xmag/xapp_xmag.hash deleted file mode 100644 index ccfeb32b64..0000000000 --- a/package.bak/x11r7/xapp_xmag/xapp_xmag.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002581.html -sha256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 xmag-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_xmag/xapp_xmag.mk b/package.bak/x11r7/xapp_xmag/xapp_xmag.mk deleted file mode 100644 index bfc60c3ef0..0000000000 --- a/package.bak/x11r7/xapp_xmag/xapp_xmag.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xmag -# -################################################################################ - -XAPP_XMAG_VERSION = 1.0.6 -XAPP_XMAG_SOURCE = xmag-$(XAPP_XMAG_VERSION).tar.bz2 -XAPP_XMAG_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMAG_LICENSE = MIT -XAPP_XMAG_LICENSE_FILES = COPYING -XAPP_XMAG_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xman/Config.in b/package.bak/x11r7/xapp_xman/Config.in deleted file mode 100644 index 4f4f067e31..0000000000 --- a/package.bak/x11r7/xapp_xman/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XMAN - bool "xman" - select BR2_PACKAGE_XLIB_LIBXAW - help - Manual page display program for the X Window System diff --git a/package.bak/x11r7/xapp_xman/xapp_xman.hash b/package.bak/x11r7/xapp_xman/xapp_xman.hash deleted file mode 100644 index 00a4d85bba..0000000000 --- a/package.bak/x11r7/xapp_xman/xapp_xman.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002541.html -sha1 b64516dab2b1c407b28ce3822a98b93178e29f02 xman-1.1.4.tar.bz2 -sha256 b3fa9d2e3f3745c529eb0b6ee4f0e00d936457d11e5221b2efad06ff7c84df29 xman-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xman/xapp_xman.mk b/package.bak/x11r7/xapp_xman/xapp_xman.mk deleted file mode 100644 index bca6bbff8d..0000000000 --- a/package.bak/x11r7/xapp_xman/xapp_xman.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xapp_xman -# -################################################################################ - -XAPP_XMAN_VERSION = 1.1.4 -XAPP_XMAN_SOURCE = xman-$(XAPP_XMAN_VERSION).tar.bz2 -XAPP_XMAN_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMAN_LICENSE = MIT -XAPP_XMAN_LICENSE_FILES = COPYING -XAPP_XMAN_DEPENDENCIES = xlib_libXaw - -XAPP_XMAN_CONF_ENV = \ - ac_cv_file__etc_man_conf=no \ - ac_cv_file__etc_man_config=no \ - ac_cv_file__etc_manpath_config=no \ - ac_cv_file__usr_share_misc_man_conf=no - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xmessage/Config.in b/package.bak/x11r7/xapp_xmessage/Config.in deleted file mode 100644 index e80562ffa6..0000000000 --- a/package.bak/x11r7/xapp_xmessage/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XMESSAGE - bool "xmessage" - select BR2_PACKAGE_XLIB_LIBXAW - help - display a message or query in a window (X-based /bin/echo) diff --git a/package.bak/x11r7/xapp_xmessage/xapp_xmessage.hash b/package.bak/x11r7/xapp_xmessage/xapp_xmessage.hash deleted file mode 100644 index 5e1f199bd1..0000000000 --- a/package.bak/x11r7/xapp_xmessage/xapp_xmessage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002128.html -sha256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 xmessage-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xmessage/xapp_xmessage.mk b/package.bak/x11r7/xapp_xmessage/xapp_xmessage.mk deleted file mode 100644 index 9c855638e1..0000000000 --- a/package.bak/x11r7/xapp_xmessage/xapp_xmessage.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xmessage -# -################################################################################ - -XAPP_XMESSAGE_VERSION = 1.0.4 -XAPP_XMESSAGE_SOURCE = xmessage-$(XAPP_XMESSAGE_VERSION).tar.bz2 -XAPP_XMESSAGE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMESSAGE_LICENSE = MIT -XAPP_XMESSAGE_LICENSE_FILES = COPYING -XAPP_XMESSAGE_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xmh/Config.in b/package.bak/x11r7/xapp_xmh/Config.in deleted file mode 100644 index 4e86d0f426..0000000000 --- a/package.bak/x11r7/xapp_xmh/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XMH - bool "xmh" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XDATA_XBITMAPS - help - send and read mail with an X interface to MH diff --git a/package.bak/x11r7/xapp_xmh/xapp_xmh.hash b/package.bak/x11r7/xapp_xmh/xapp_xmh.hash deleted file mode 100644 index 0358b3d95a..0000000000 --- a/package.bak/x11r7/xapp_xmh/xapp_xmh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002582.html -sha256 b92f4f912a5fb6346d52cc2b639aea087b347f3b2e4e1a4fc7a165b1345f5689 xmh-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xmh/xapp_xmh.mk b/package.bak/x11r7/xapp_xmh/xapp_xmh.mk deleted file mode 100644 index c18bbfe5da..0000000000 --- a/package.bak/x11r7/xapp_xmh/xapp_xmh.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xmh -# -################################################################################ - -XAPP_XMH_VERSION = 1.0.3 -XAPP_XMH_SOURCE = xmh-$(XAPP_XMH_VERSION).tar.bz2 -XAPP_XMH_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMH_LICENSE = MIT -XAPP_XMH_LICENSE_FILES = COPYING -XAPP_XMH_DEPENDENCIES = xlib_libXaw xdata_xbitmaps - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xmodmap/Config.in b/package.bak/x11r7/xapp_xmodmap/Config.in deleted file mode 100644 index 9be79abfa9..0000000000 --- a/package.bak/x11r7/xapp_xmodmap/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XMODMAP - bool "xmodmap" - select BR2_PACKAGE_XLIB_LIBX11 - help - utility for modifying keymaps and pointer button mappings in X diff --git a/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.hash b/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.hash deleted file mode 100644 index aad981522d..0000000000 --- a/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002583.html -sha256 b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478 xmodmap-1.0.9.tar.bz2 diff --git a/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.mk b/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.mk deleted file mode 100644 index 670bf9f41f..0000000000 --- a/package.bak/x11r7/xapp_xmodmap/xapp_xmodmap.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xmodmap -# -################################################################################ - -XAPP_XMODMAP_VERSION = 1.0.9 -XAPP_XMODMAP_SOURCE = xmodmap-$(XAPP_XMODMAP_VERSION).tar.bz2 -XAPP_XMODMAP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMODMAP_LICENSE = MIT -XAPP_XMODMAP_LICENSE_FILES = COPYING -XAPP_XMODMAP_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xmore/Config.in b/package.bak/x11r7/xapp_xmore/Config.in deleted file mode 100644 index 80c3950bb0..0000000000 --- a/package.bak/x11r7/xapp_xmore/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XMORE - bool "xmore" - select BR2_PACKAGE_XLIB_LIBXAW - help - plain text display program for the X Window System diff --git a/package.bak/x11r7/xapp_xmore/xapp_xmore.hash b/package.bak/x11r7/xapp_xmore/xapp_xmore.hash deleted file mode 100644 index f2b7d1a694..0000000000 --- a/package.bak/x11r7/xapp_xmore/xapp_xmore.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-July/001360.html -sha1 7db4e5feb82d5d05038722d3af00d28e103bed18 xmore-1.0.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xmore/xapp_xmore.mk b/package.bak/x11r7/xapp_xmore/xapp_xmore.mk deleted file mode 100644 index b0b0edf23b..0000000000 --- a/package.bak/x11r7/xapp_xmore/xapp_xmore.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xmore -# -################################################################################ - -XAPP_XMORE_VERSION = 1.0.2 -XAPP_XMORE_SOURCE = xmore-$(XAPP_XMORE_VERSION).tar.bz2 -XAPP_XMORE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XMORE_LICENSE = MIT -XAPP_XMORE_LICENSE_FILES = COPYING -XAPP_XMORE_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xpr/Config.in b/package.bak/x11r7/xapp_xpr/Config.in deleted file mode 100644 index 0710d62a9e..0000000000 --- a/package.bak/x11r7/xapp_xpr/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XPR - bool "xpr" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - X.Org xpr application diff --git a/package.bak/x11r7/xapp_xpr/xapp_xpr.hash b/package.bak/x11r7/xapp_xpr/xapp_xpr.hash deleted file mode 100644 index eaab288ced..0000000000 --- a/package.bak/x11r7/xapp_xpr/xapp_xpr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001926.html -sha256 fed98df31eb93d3dca4688cb535aabad06be572e70ace3b1685679c18dd86cb5 xpr-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xpr/xapp_xpr.mk b/package.bak/x11r7/xapp_xpr/xapp_xpr.mk deleted file mode 100644 index b2c4e040c3..0000000000 --- a/package.bak/x11r7/xapp_xpr/xapp_xpr.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xpr -# -################################################################################ - -XAPP_XPR_VERSION = 1.0.4 -XAPP_XPR_SOURCE = xpr-$(XAPP_XPR_VERSION).tar.bz2 -XAPP_XPR_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XPR_LICENSE = MIT -XAPP_XPR_LICENSE_FILES = COPYING -XAPP_XPR_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xprop/Config.in b/package.bak/x11r7/xapp_xprop/Config.in deleted file mode 100644 index 314e79f6d0..0000000000 --- a/package.bak/x11r7/xapp_xprop/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XPROP - bool "xprop" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - property displayer for X diff --git a/package.bak/x11r7/xapp_xprop/xapp_xprop.hash b/package.bak/x11r7/xapp_xprop/xapp_xprop.hash deleted file mode 100644 index 4758979c44..0000000000 --- a/package.bak/x11r7/xapp_xprop/xapp_xprop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002290.html -sha256 9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6 xprop-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xapp_xprop/xapp_xprop.mk b/package.bak/x11r7/xapp_xprop/xapp_xprop.mk deleted file mode 100644 index 40a8577304..0000000000 --- a/package.bak/x11r7/xapp_xprop/xapp_xprop.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xprop -# -################################################################################ - -XAPP_XPROP_VERSION = 1.2.2 -XAPP_XPROP_SOURCE = xprop-$(XAPP_XPROP_VERSION).tar.bz2 -XAPP_XPROP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XPROP_LICENSE = MIT -XAPP_XPROP_LICENSE_FILES = COPYING -XAPP_XPROP_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xrandr/Config.in b/package.bak/x11r7/xapp_xrandr/Config.in deleted file mode 100644 index fe9bd4e913..0000000000 --- a/package.bak/x11r7/xapp_xrandr/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XRANDR - bool "xrandr" - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBX11 - help - primitive command line interface to RandR extension diff --git a/package.bak/x11r7/xapp_xrandr/xapp_xrandr.hash b/package.bak/x11r7/xapp_xrandr/xapp_xrandr.hash deleted file mode 100644 index b1db30dcd8..0000000000 --- a/package.bak/x11r7/xapp_xrandr/xapp_xrandr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2016-February/002677.html -sha256 c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd xrandr-1.5.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_xrandr/xapp_xrandr.mk b/package.bak/x11r7/xapp_xrandr/xapp_xrandr.mk deleted file mode 100644 index 583a501e4a..0000000000 --- a/package.bak/x11r7/xapp_xrandr/xapp_xrandr.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xapp_xrandr -# -################################################################################ - -XAPP_XRANDR_VERSION = 1.5.0 -XAPP_XRANDR_SOURCE = xrandr-$(XAPP_XRANDR_VERSION).tar.bz2 -XAPP_XRANDR_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XRANDR_LICENSE = MIT -XAPP_XRANDR_LICENSE_FILES = COPYING -XAPP_XRANDR_DEPENDENCIES = xlib_libXrandr xlib_libX11 -XAPP_XRANDR_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xrdb/Config.in b/package.bak/x11r7/xapp_xrdb/Config.in deleted file mode 100644 index 8c07857018..0000000000 --- a/package.bak/x11r7/xapp_xrdb/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XRDB - bool "xrdb" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - X server resource database utility diff --git a/package.bak/x11r7/xapp_xrdb/xapp_xrdb.hash b/package.bak/x11r7/xapp_xrdb/xapp_xrdb.hash deleted file mode 100644 index 4844a09b4a..0000000000 --- a/package.bak/x11r7/xapp_xrdb/xapp_xrdb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002316.html -sha256 73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b xrdb-1.1.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_xrdb/xapp_xrdb.mk b/package.bak/x11r7/xapp_xrdb/xapp_xrdb.mk deleted file mode 100644 index f32afa45ab..0000000000 --- a/package.bak/x11r7/xapp_xrdb/xapp_xrdb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xrdb -# -################################################################################ - -XAPP_XRDB_VERSION = 1.1.0 -XAPP_XRDB_SOURCE = xrdb-$(XAPP_XRDB_VERSION).tar.bz2 -XAPP_XRDB_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XRDB_LICENSE = MIT -XAPP_XRDB_LICENSE_FILES = COPYING -XAPP_XRDB_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xrefresh/Config.in b/package.bak/x11r7/xapp_xrefresh/Config.in deleted file mode 100644 index 16b1e50b32..0000000000 --- a/package.bak/x11r7/xapp_xrefresh/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XREFRESH - bool "xrefresh" - select BR2_PACKAGE_XLIB_LIBX11 - help - refresh all or part of an X screen diff --git a/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.hash b/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.hash deleted file mode 100644 index 6d5a53b009..0000000000 --- a/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002214.html -sha256 3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6 xrefresh-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.mk b/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.mk deleted file mode 100644 index 8403762c8e..0000000000 --- a/package.bak/x11r7/xapp_xrefresh/xapp_xrefresh.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xrefresh -# -################################################################################ - -XAPP_XREFRESH_VERSION = 1.0.5 -XAPP_XREFRESH_SOURCE = xrefresh-$(XAPP_XREFRESH_VERSION).tar.bz2 -XAPP_XREFRESH_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XREFRESH_LICENSE = MIT -XAPP_XREFRESH_LICENSE_FILES = COPYING -XAPP_XREFRESH_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xset/Config.in b/package.bak/x11r7/xapp_xset/Config.in deleted file mode 100644 index 71497ab7da..0000000000 --- a/package.bak/x11r7/xapp_xset/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XSET - bool "xset" - select BR2_PACKAGE_XLIB_LIBXMU - help - X.Org xset application diff --git a/package.bak/x11r7/xapp_xset/xapp_xset.hash b/package.bak/x11r7/xapp_xset/xapp_xset.hash deleted file mode 100644 index f9ff3920c6..0000000000 --- a/package.bak/x11r7/xapp_xset/xapp_xset.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002291.html -sha256 4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063 xset-1.2.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xset/xapp_xset.mk b/package.bak/x11r7/xapp_xset/xapp_xset.mk deleted file mode 100644 index 157cd229a7..0000000000 --- a/package.bak/x11r7/xapp_xset/xapp_xset.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xset -# -################################################################################ - -XAPP_XSET_VERSION = 1.2.3 -XAPP_XSET_SOURCE = xset-$(XAPP_XSET_VERSION).tar.bz2 -XAPP_XSET_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSET_LICENSE = MIT -XAPP_XSET_LICENSE_FILES = COPYING -XAPP_XSET_DEPENDENCIES = xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xsetmode/Config.in b/package.bak/x11r7/xapp_xsetmode/Config.in deleted file mode 100644 index a08e02d728..0000000000 --- a/package.bak/x11r7/xapp_xsetmode/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XSETMODE - bool "xsetmode" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXI - help - set the mode for an X Input device diff --git a/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.hash b/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.hash deleted file mode 100644 index c393ad4dfc..0000000000 --- a/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa xsetmode-1.0.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.mk b/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.mk deleted file mode 100644 index c4599a9be1..0000000000 --- a/package.bak/x11r7/xapp_xsetmode/xapp_xsetmode.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xsetmode -# -################################################################################ - -XAPP_XSETMODE_VERSION = 1.0.0 -XAPP_XSETMODE_SOURCE = xsetmode-$(XAPP_XSETMODE_VERSION).tar.bz2 -XAPP_XSETMODE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSETMODE_LICENSE = MIT -XAPP_XSETMODE_LICENSE_FILES = COPYING -XAPP_XSETMODE_DEPENDENCIES = xlib_libX11 xlib_libXi - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xsetpointer/Config.in b/package.bak/x11r7/xapp_xsetpointer/Config.in deleted file mode 100644 index 2b0b4624e8..0000000000 --- a/package.bak/x11r7/xapp_xsetpointer/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XSETPOINTER - bool "xsetpointer" - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXI - help - set an X Input device as the main pointer diff --git a/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash b/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash deleted file mode 100644 index 6e6a37e90d..0000000000 --- a/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 7d65f450420b4f764dcf38e4ccee9d608b5a5874706e716cb861bfe2586b7d4a xsetpointer-1.0.0.tar.bz2 diff --git a/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk deleted file mode 100644 index f56cdd58a1..0000000000 --- a/package.bak/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xsetpointer -# -################################################################################ - -XAPP_XSETPOINTER_VERSION = 1.0.0 -XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2 -XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSETPOINTER_LICENSE = MIT -XAPP_XSETPOINTER_LICENSE_FILES = COPYING -XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xsetroot/Config.in b/package.bak/x11r7/xapp_xsetroot/Config.in deleted file mode 100644 index a70df80d91..0000000000 --- a/package.bak/x11r7/xapp_xsetroot/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XAPP_XSETROOT - bool "xsetroot" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XDATA_XBITMAPS - help - X.Org xsetroot application diff --git a/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.hash b/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.hash deleted file mode 100644 index 89a1abe454..0000000000 --- a/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002149.html -sha256 ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9 xsetroot-1.1.1.tar.bz2 diff --git a/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.mk b/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.mk deleted file mode 100644 index 9000867c84..0000000000 --- a/package.bak/x11r7/xapp_xsetroot/xapp_xsetroot.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xsetroot -# -################################################################################ - -XAPP_XSETROOT_VERSION = 1.1.1 -XAPP_XSETROOT_SOURCE = xsetroot-$(XAPP_XSETROOT_VERSION).tar.bz2 -XAPP_XSETROOT_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSETROOT_LICENSE = MIT -XAPP_XSETROOT_LICENSE_FILES = COPYING -XAPP_XSETROOT_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libXcursor xdata_xbitmaps - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xsm/Config.in b/package.bak/x11r7/xapp_xsm/Config.in deleted file mode 100644 index 88f20cf65e..0000000000 --- a/package.bak/x11r7/xapp_xsm/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XSM - bool "xsm" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXAW - help - X Session Manager diff --git a/package.bak/x11r7/xapp_xsm/xapp_xsm.hash b/package.bak/x11r7/xapp_xsm/xapp_xsm.hash deleted file mode 100644 index aef9e558ba..0000000000 --- a/package.bak/x11r7/xapp_xsm/xapp_xsm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002163.html -sha256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a xsm-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xsm/xapp_xsm.mk b/package.bak/x11r7/xapp_xsm/xapp_xsm.mk deleted file mode 100644 index d4d240774e..0000000000 --- a/package.bak/x11r7/xapp_xsm/xapp_xsm.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xsm -# -################################################################################ - -XAPP_XSM_VERSION = 1.0.3 -XAPP_XSM_SOURCE = xsm-$(XAPP_XSM_VERSION).tar.bz2 -XAPP_XSM_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSM_LICENSE = MIT -XAPP_XSM_LICENSE_FILES = COPYING -XAPP_XSM_DEPENDENCIES = xlib_libXaw - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xstdcmap/Config.in b/package.bak/x11r7/xapp_xstdcmap/Config.in deleted file mode 100644 index f15c36b82b..0000000000 --- a/package.bak/x11r7/xapp_xstdcmap/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XSTDCMAP - bool "xstdcmap" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - X standard colormap utility diff --git a/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash b/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash deleted file mode 100644 index 6d8b35fae1..0000000000 --- a/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-February/002164.html -sha256 f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1 xstdcmap-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk b/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk deleted file mode 100644 index a4d6dc34f6..0000000000 --- a/package.bak/x11r7/xapp_xstdcmap/xapp_xstdcmap.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xstdcmap -# -################################################################################ - -XAPP_XSTDCMAP_VERSION = 1.0.3 -XAPP_XSTDCMAP_SOURCE = xstdcmap-$(XAPP_XSTDCMAP_VERSION).tar.bz2 -XAPP_XSTDCMAP_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XSTDCMAP_LICENSE = MIT -XAPP_XSTDCMAP_LICENSE_FILES = COPYING -XAPP_XSTDCMAP_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xvidtune/Config.in b/package.bak/x11r7/xapp_xvidtune/Config.in deleted file mode 100644 index b1902cd974..0000000000 --- a/package.bak/x11r7/xapp_xvidtune/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XVIDTUNE - bool "xvidtune" - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXXF86VM - help - video mode tuner for Xorg diff --git a/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.hash b/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.hash deleted file mode 100644 index 5c9e25484f..0000000000 --- a/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-January/002129.html -sha256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 xvidtune-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.mk b/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.mk deleted file mode 100644 index d7c4d5bf56..0000000000 --- a/package.bak/x11r7/xapp_xvidtune/xapp_xvidtune.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xvidtune -# -################################################################################ - -XAPP_XVIDTUNE_VERSION = 1.0.3 -XAPP_XVIDTUNE_SOURCE = xvidtune-$(XAPP_XVIDTUNE_VERSION).tar.bz2 -XAPP_XVIDTUNE_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XVIDTUNE_LICENSE = MIT -XAPP_XVIDTUNE_LICENSE_FILES = COPYING -XAPP_XVIDTUNE_DEPENDENCIES = xlib_libXaw xlib_libXxf86vm - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xvinfo/Config.in b/package.bak/x11r7/xapp_xvinfo/Config.in deleted file mode 100644 index 2612c047c1..0000000000 --- a/package.bak/x11r7/xapp_xvinfo/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XVINFO - bool "xvinfo" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXV - help - Print out X-Video extension adaptor information diff --git a/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.hash b/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.hash deleted file mode 100644 index 2077730fc9..0000000000 --- a/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002596.html -sha256 9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb xvinfo-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.mk b/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.mk deleted file mode 100644 index 5b05a63233..0000000000 --- a/package.bak/x11r7/xapp_xvinfo/xapp_xvinfo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xvinfo -# -################################################################################ - -XAPP_XVINFO_VERSION = 1.1.3 -XAPP_XVINFO_SOURCE = xvinfo-$(XAPP_XVINFO_VERSION).tar.bz2 -XAPP_XVINFO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XVINFO_LICENSE = MIT -XAPP_XVINFO_LICENSE_FILES = COPYING -XAPP_XVINFO_DEPENDENCIES = xlib_libX11 xlib_libXv - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xwd/Config.in b/package.bak/x11r7/xapp_xwd/Config.in deleted file mode 100644 index ada4820f5c..0000000000 --- a/package.bak/x11r7/xapp_xwd/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XAPP_XWD - bool "xwd" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXKBFILE - select BR2_PACKAGE_XLIB_LIBXMU - help - dump an image of an X window diff --git a/package.bak/x11r7/xapp_xwd/xapp_xwd.hash b/package.bak/x11r7/xapp_xwd/xapp_xwd.hash deleted file mode 100644 index 1d9b4d5cff..0000000000 --- a/package.bak/x11r7/xapp_xwd/xapp_xwd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-August/002292.html -sha256 3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79 xwd-1.0.6.tar.bz2 diff --git a/package.bak/x11r7/xapp_xwd/xapp_xwd.mk b/package.bak/x11r7/xapp_xwd/xapp_xwd.mk deleted file mode 100644 index 0cda34ee26..0000000000 --- a/package.bak/x11r7/xapp_xwd/xapp_xwd.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xwd -# -################################################################################ - -XAPP_XWD_VERSION = 1.0.6 -XAPP_XWD_SOURCE = xwd-$(XAPP_XWD_VERSION).tar.bz2 -XAPP_XWD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XWD_LICENSE = MIT -XAPP_XWD_LICENSE_FILES = COPYING -XAPP_XWD_DEPENDENCIES = xlib_libX11 xlib_libXmu xlib_libxkbfile - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xwininfo/Config.in b/package.bak/x11r7/xapp_xwininfo/Config.in deleted file mode 100644 index 4e095707ec..0000000000 --- a/package.bak/x11r7/xapp_xwininfo/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XAPP_XWININFO - bool "xwininfo" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXMU - help - window information utility for X diff --git a/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.hash b/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.hash deleted file mode 100644 index 4b891a2084..0000000000 --- a/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002215.html -sha256 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 xwininfo-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.mk b/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.mk deleted file mode 100644 index 8ae5961ee4..0000000000 --- a/package.bak/x11r7/xapp_xwininfo/xapp_xwininfo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xwininfo -# -################################################################################ - -XAPP_XWININFO_VERSION = 1.1.3 -XAPP_XWININFO_SOURCE = xwininfo-$(XAPP_XWININFO_VERSION).tar.bz2 -XAPP_XWININFO_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XWININFO_LICENSE = MIT -XAPP_XWININFO_LICENSE_FILES = COPYING -XAPP_XWININFO_DEPENDENCIES = xlib_libX11 xlib_libXmu - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xapp_xwud/Config.in b/package.bak/x11r7/xapp_xwud/Config.in deleted file mode 100644 index cb8337e982..0000000000 --- a/package.bak/x11r7/xapp_xwud/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XAPP_XWUD - bool "xwud" - select BR2_PACKAGE_XLIB_LIBX11 - help - image displayer for X diff --git a/package.bak/x11r7/xapp_xwud/xapp_xwud.hash b/package.bak/x11r7/xapp_xwud/xapp_xwud.hash deleted file mode 100644 index 44e9c60753..0000000000 --- a/package.bak/x11r7/xapp_xwud/xapp_xwud.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-March/001927.html -sha256 d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd xwud-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xapp_xwud/xapp_xwud.mk b/package.bak/x11r7/xapp_xwud/xapp_xwud.mk deleted file mode 100644 index 60afd86287..0000000000 --- a/package.bak/x11r7/xapp_xwud/xapp_xwud.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xapp_xwud -# -################################################################################ - -XAPP_XWUD_VERSION = 1.0.4 -XAPP_XWUD_SOURCE = xwud-$(XAPP_XWUD_VERSION).tar.bz2 -XAPP_XWUD_SITE = http://xorg.freedesktop.org/releases/individual/app -XAPP_XWUD_LICENSE = MIT -XAPP_XWUD_LICENSE_FILES = COPYING -XAPP_XWUD_DEPENDENCIES = xlib_libX11 - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch b/package.bak/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch deleted file mode 100644 index 67adada505..0000000000 --- a/package.bak/x11r7/xcb-proto/0001-Make-whitespace-use-consistent.patch +++ /dev/null @@ -1,212 +0,0 @@ -From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 19 May 2016 17:30:04 +0200 -Subject: [PATCH] Make whitespace use consistent. - -At least python-3.5.x complains about this forcefully. - -Signed-off-by: Thomas Klausner -Signed-off-by: Uli Schlachter -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) ---- - xcbgen/align.py | 96 ++++++++++++++++++++++++++++----------------------------- - 1 file changed, 48 insertions(+), 48 deletions(-) - -diff --git a/xcbgen/align.py b/xcbgen/align.py -index 5e31838..d4c12ee 100644 ---- a/xcbgen/align.py -+++ b/xcbgen/align.py -@@ -16,12 +16,12 @@ class Alignment(object): - return self.align == other.align and self.offset == other.offset - - def __str__(self): -- return "(align=%d, offset=%d)" % (self.align, self.offset) -+ return "(align=%d, offset=%d)" % (self.align, self.offset) - - @staticmethod - def for_primitive_type(size): -- # compute the required start_alignment based on the size of the type -- if size % 8 == 0: -+ # compute the required start_alignment based on the size of the type -+ if size % 8 == 0: - # do 8-byte primitives require 8-byte alignment in X11? - return Alignment(8,0) - elif size % 4 == 0: -@@ -33,7 +33,7 @@ class Alignment(object): - - - def align_after_fixed_size(self, size): -- new_offset = (self.offset + size) % self.align -+ new_offset = (self.offset + size) % self.align - return Alignment(self.align, new_offset) - - -@@ -41,7 +41,7 @@ class Alignment(object): - ''' - Assuming the given external_align, checks whether - self is fulfilled for all cases. -- Returns True if yes, False otherwise. -+ Returns True if yes, False otherwise. - ''' - if self.align == 1 and self.offset == 0: - # alignment 1 with offset 0 is always fulfilled -@@ -55,9 +55,9 @@ class Alignment(object): - # the external align guarantees less alignment -> not guaranteed - return False - -- if external_align.align % self.align != 0: -+ if external_align.align % self.align != 0: - # the external align cannot be divided by our align -- # -> not guaranteed -+ # -> not guaranteed - # (this can only happen if there are alignments that are not - # a power of 2, which is highly discouraged. But better be - # safe and check for it) -@@ -72,7 +72,7 @@ class Alignment(object): - - def combine_with(self, other): - # returns the alignment that is guaranteed when -- # both, self or other, can happen -+ # both, self or other, can happen - new_align = gcd(self.align, other.align) - new_offset_candidate1 = self.offset % new_align - new_offset_candidate2 = other.offset % new_align -@@ -83,8 +83,8 @@ class Alignment(object): - new_align = gcd(new_align, offset_diff) - new_offset_candidate1 = self.offset % new_align - new_offset_candidate2 = other.offset % new_align -- assert new_offset_candidate1 == new_offset_candidate2 -- new_offset = new_offset_candidate1 -+ assert new_offset_candidate1 == new_offset_candidate2 -+ new_offset = new_offset_candidate1 - # return the result - return Alignment(new_align, new_offset) - -@@ -92,44 +92,44 @@ class Alignment(object): - class AlignmentLog(object): - - def __init__(self): -- self.ok_list = [] -- self.fail_list = [] -- self.verbosity = 1 -+ self.ok_list = [] -+ self.fail_list = [] -+ self.verbosity = 1 - - def __str__(self): -- result = "" -+ result = "" - -- # output the OK-list -- for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: -- stacksize = len(callstack) -+ # output the OK-list -+ for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: -+ stacksize = len(callstack) - indent = ' ' * stacksize -- if self.ok_callstack_is_relevant(callstack): -+ if self.ok_callstack_is_relevant(callstack): - if field_name is None or field_name == "": -- result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" -- % (indent, str(type_obj), indent, str(align_before), str(align_after))) -- else: -- result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" -- % (indent, str(field_name), str(type_obj), -- indent, str(align_before), str(align_after))) -+ result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" -+ % (indent, str(type_obj), indent, str(align_before), str(align_after))) -+ else: -+ result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" -+ % (indent, str(field_name), str(type_obj), -+ indent, str(align_before), str(align_after))) - if self.verbosity >= 1: -- result += self.callstack_to_str(indent, callstack) -+ result += self.callstack_to_str(indent, callstack) - -- # output the fail-list -- for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: -- stacksize = len(callstack) -+ # output the fail-list -+ for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: -+ stacksize = len(callstack) - indent = ' ' * stacksize -- if field_name is None or field_name == "": -- result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" -- % (indent, str(align_before), indent, str(type_obj), indent, reason)) -- else: -- result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" -- % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) -+ if field_name is None or field_name == "": -+ result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" -+ % (indent, str(align_before), indent, str(type_obj), indent, reason)) -+ else: -+ result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" -+ % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) - - if self.verbosity >= 1: -- result += self.callstack_to_str(indent, callstack) -+ result += self.callstack_to_str(indent, callstack) - - -- return result -+ return result - - - def callstack_to_str(self, indent, callstack): -@@ -137,41 +137,41 @@ class AlignmentLog(object): - for stack_elem in callstack: - result += "\t %s%s\n" % (indent, str(stack_elem)) - result += "\t%s]\n" % indent -- return result -+ return result - - - def ok_callstack_is_relevant(self, ok_callstack): - # determine whether an ok callstack is relevant for logging -- if self.verbosity >= 2: -- return True -+ if self.verbosity >= 2: -+ return True - - # empty callstacks are always relevant -- if len(ok_callstack) == 0: -+ if len(ok_callstack) == 0: - return True - -- # check whether the ok_callstack is a subset or equal to a fail_callstack -+ # check whether the ok_callstack is a subset or equal to a fail_callstack - for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list: - if len(ok_callstack) <= len(fail_callstack): - zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)]) -- is_subset = all([i == j for i, j in zipped]) -- if is_subset: -+ is_subset = all([i == j for i, j in zipped]) -+ if is_subset: - return True - - return False - - - def ok(self, align_before, field_name, type_obj, callstack, align_after): -- self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) -+ self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) - - def fail(self, align_before, field_name, type_obj, callstack, reason): -- self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) -+ self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) - - def append(self, other): -- self.ok_list.extend(other.ok_list) -- self.fail_list.extend(other.fail_list) -+ self.ok_list.extend(other.ok_list) -+ self.fail_list.extend(other.fail_list) - - def ok_count(self): -- return len(self.ok_list) -+ return len(self.ok_list) - - - --- -2.8.1 - diff --git a/package.bak/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch b/package.bak/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch deleted file mode 100644 index 6fa5d48de2..0000000000 --- a/package.bak/x11r7/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch +++ /dev/null @@ -1,70 +0,0 @@ -From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001 -From: Thomas Klausner -Date: Thu, 19 May 2016 17:30:05 +0200 -Subject: print() is a function and needs parentheses. - -Fixes build with python-3.x. - -Signed-off-by: Thomas Klausner -Signed-off-by: Uli Schlachter -[yann.morin.1998@free.fr: backport from upstream] -Signed-off-by: "Yann E. MORIN" - -diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py -index c3b5758..b83b119 100644 ---- a/xcbgen/xtypes.py -+++ b/xcbgen/xtypes.py -@@ -501,7 +501,7 @@ class ComplexType(Type): - int(required_start_align_element.get('align', "4"), 0), - int(required_start_align_element.get('offset', "0"), 0)) - if verbose_align_log: -- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align) -+ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align)) - - def resolve(self, module): - if self.resolved: -@@ -592,7 +592,7 @@ class ComplexType(Type): - if verbose_align_log: - print ("calc_required_start_align: %s has start-align %s" - % (str(self), str(self.required_start_align))) -- print "Details:\n" + str(log) -+ print ("Details:\n" + str(log)) - if self.required_start_align.offset != 0: - print (("WARNING: %s\n\thas start-align with non-zero offset: %s" - + "\n\tsuggest to add explicit definition with:" -@@ -619,12 +619,12 @@ class ComplexType(Type): - for offset in range(0,align): - align_candidate = Alignment(align, offset) - if verbose_align_log: -- print "trying %s for %s" % (str(align_candidate), str(self)) -+ print ("trying %s for %s" % (str(align_candidate), str(self))) - my_log = AlignmentLog() - if self.is_possible_start_align(align_candidate, callstack, my_log): - log.append(my_log) - if verbose_align_log: -- print "found start-align %s for %s" % (str(align_candidate), str(self)) -+ print ("found start-align %s for %s" % (str(align_candidate), str(self))) - return align_candidate - else: - my_ok_count = my_log.ok_count() -@@ -641,7 +641,7 @@ class ComplexType(Type): - # none of the candidates applies - # this type has illegal internal aligns for all possible start_aligns - if verbose_align_log: -- print "didn't find start-align for %s" % str(self) -+ print ("didn't find start-align for %s" % str(self)) - log.append(best_log) - return None - -@@ -900,7 +900,7 @@ class SwitchType(ComplexType): - # aux function for unchecked_get_alignment_after - def get_align_for_selected_case_field(self, case_field, start_align, callstack, log): - if verbose_align_log: -- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)) -+ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))) - total_align = start_align - for field in self.bitcases: - my_callstack = callstack[:] --- -cgit v0.10.2 - diff --git a/package.bak/x11r7/xcb-proto/Config.in b/package.bak/x11r7/xcb-proto/Config.in deleted file mode 100644 index 1d66372dee..0000000000 --- a/package.bak/x11r7/xcb-proto/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XCB_PROTO - bool "xcb-proto" - help - The protocol headers that define XCB. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-proto/xcb-proto.hash b/package.bak/x11r7/xcb-proto/xcb-proto.hash deleted file mode 100644 index 3f43485492..0000000000 --- a/package.bak/x11r7/xcb-proto/xcb-proto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002693.html -sha256 5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906 xcb-proto-1.12.tar.bz2 diff --git a/package.bak/x11r7/xcb-proto/xcb-proto.mk b/package.bak/x11r7/xcb-proto/xcb-proto.mk deleted file mode 100644 index 84555d07f0..0000000000 --- a/package.bak/x11r7/xcb-proto/xcb-proto.mk +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################ -# -# xcb-proto -# -################################################################################ - -XCB_PROTO_VERSION = 1.12 -XCB_PROTO_SOURCE = xcb-proto-$(XCB_PROTO_VERSION).tar.bz2 -XCB_PROTO_SITE = http://xcb.freedesktop.org/dist -XCB_PROTO_LICENSE = MIT -XCB_PROTO_LICENSE_FILES = COPYING - -XCB_PROTO_INSTALL_STAGING = YES - -XCB_PROTO_DEPENDENCIES = host-python -HOST_XCB_PROTO_DEPENDENCIES = host-python - -# xcbincludedir/pythondir is used by E.G. libxcb at build time to find the -# xml / python files, so ensure these expand to their full (host) paths -define XCB_PROTO_FIXUP_PC_FILE - $(SED) 's|^\(xcbincludedir=\)|\1$(STAGING_DIR)|' \ - -e 's|^\(pythondir=\)|\1$(STAGING_DIR)|' \ - $(STAGING_DIR)/usr/lib/pkgconfig/xcb-proto.pc -endef - -XCB_PROTO_POST_INSTALL_STAGING_HOOKS += XCB_PROTO_FIXUP_PC_FILE - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xcb-util-cursor/Config.in b/package.bak/x11r7/xcb-util-cursor/Config.in deleted file mode 100644 index ca304941b7..0000000000 --- a/package.bak/x11r7/xcb-util-cursor/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL_CURSOR - bool "xcb-util-cursor" - select BR2_PACKAGE_XCB_UTIL - select BR2_PACKAGE_XCB_UTIL_IMAGE - select BR2_PACKAGE_XCB_UTIL_RENDERUTIL - depends on BR2_PACKAGE_LIBXCB - help - The XCB util modules provides a number of libraries which - sit on top of libxcb, the core X protocol library, and some - of the extension libraries. These experimental libraries - provide convenience functions and interfaces which make the - raw X protocol more usable. Some of the libraries also - provide client-side code which is not strictly part of the X - protocol but which have traditionally been provided by Xlib. - - XCB util-cursor module provides the following libraries: - - cursor: port of libxcursor - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.hash b/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.hash deleted file mode 100644 index 36f2258dcb..0000000000 --- a/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-May/002691.html -sha1 26562eb6d4151307f7b6a53453d360ecfc0563ac xcb-util-cursor-0.1.3.tar.bz2 diff --git a/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.mk b/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.mk deleted file mode 100644 index 07b37c5e47..0000000000 --- a/package.bak/x11r7/xcb-util-cursor/xcb-util-cursor.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xcb-util-cursor -# -################################################################################ - -XCB_UTIL_CURSOR_VERSION = 0.1.3 -XCB_UTIL_CURSOR_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_CURSOR_SOURCE = xcb-util-cursor-$(XCB_UTIL_CURSOR_VERSION).tar.bz2 -XCB_UTIL_CURSOR_LICENSE = MIT -XCB_UTIL_CURSOR_LICENSE_FILES = COPYING -XCB_UTIL_CURSOR_INSTALL_STAGING = YES -XCB_UTIL_CURSOR_DEPENDENCIES = xcb-util xcb-util-image xcb-util-renderutil - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-util-image/Config.in b/package.bak/x11r7/xcb-util-image/Config.in deleted file mode 100644 index 31fc61a50c..0000000000 --- a/package.bak/x11r7/xcb-util-image/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL_IMAGE - bool "xcb-util-image" - select BR2_PACKAGE_XCB_UTIL - help - The XCB util modules provides a number of libraries which sit on top - of libxcb, the core X protocol library, and some of the extension - libraries. These experimental libraries provide convenience functions - and interfaces which make the raw X protocol more usable. Some of the - libraries also provide client-side code which is not strictly part of - the X protocol but which have traditionally been provided by Xlib. - - XCB util-image module provides the following library: - - image: Port of Xlib's XImage and XShmImage functions. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util-image/xcb-util-image.hash b/package.bak/x11r7/xcb-util-image/xcb-util-image.hash deleted file mode 100644 index 1cc82ac9b2..0000000000 --- a/package.bak/x11r7/xcb-util-image/xcb-util-image.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002489.html -sha256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc xcb-util-image-0.4.0.tar.bz2 diff --git a/package.bak/x11r7/xcb-util-image/xcb-util-image.mk b/package.bak/x11r7/xcb-util-image/xcb-util-image.mk deleted file mode 100644 index 705b8a7671..0000000000 --- a/package.bak/x11r7/xcb-util-image/xcb-util-image.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xcb-util-image -# -################################################################################ - -XCB_UTIL_IMAGE_VERSION = 0.4.0 -XCB_UTIL_IMAGE_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_IMAGE_SOURCE = xcb-util-image-$(XCB_UTIL_IMAGE_VERSION).tar.bz2 -XCB_UTIL_IMAGE_INSTALL_STAGING = YES -XCB_UTIL_IMAGE_LICENSE = MIT -XCB_UTIL_IMAGE_DEPENDENCIES = xcb-util - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-util-keysyms/Config.in b/package.bak/x11r7/xcb-util-keysyms/Config.in deleted file mode 100644 index 0c1d8cc474..0000000000 --- a/package.bak/x11r7/xcb-util-keysyms/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL_KEYSYMS - bool "xcb-util-keysyms" - select BR2_PACKAGE_LIBXCB - help - The XCB util modules provides a number of libraries which sit on top - of libxcb, the core X protocol library, and some of the extension - libraries. These experimental libraries provide convenience functions - and interfaces which make the raw X protocol more usable. Some of the - libraries also provide client-side code which is not strictly part of - the X protocol but which have traditionally been provided by Xlib. - - XCB util-keysyms module provides the following library: keysyms: - Standard X key constants and conversion to/from keycodes. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash b/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash deleted file mode 100644 index a25a263d22..0000000000 --- a/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-October/002485.html -sha256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 xcb-util-keysyms-0.4.0.tar.bz2 diff --git a/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk b/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk deleted file mode 100644 index 9036b06fe8..0000000000 --- a/package.bak/x11r7/xcb-util-keysyms/xcb-util-keysyms.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# xcb-util-keysyms -# -################################################################################ - -XCB_UTIL_KEYSYMS_VERSION = 0.4.0 -XCB_UTIL_KEYSYMS_SOURCE = xcb-util-keysyms-$(XCB_UTIL_KEYSYMS_VERSION).tar.bz2 -XCB_UTIL_KEYSYMS_SITE = http://xcb.freedesktop.org/dist - -# unfortunately, no license file -XCB_UTIL_KEYSYMS_LICENSE = MIT - -XCB_UTIL_KEYSYMS_INSTALL_STAGING = YES - -XCB_UTIL_KEYSYMS_DEPENDENCIES = host-pkgconf libxcb - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-util-renderutil/Config.in b/package.bak/x11r7/xcb-util-renderutil/Config.in deleted file mode 100644 index 53b2a8c417..0000000000 --- a/package.bak/x11r7/xcb-util-renderutil/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL_RENDERUTIL - bool "xcb-util-renderutil" - select BR2_PACKAGE_XCB_UTIL - depends on BR2_PACKAGE_LIBXCB # xcb-util - help - The XCB util modules provides a number of libraries which - sit on top of libxcb, the core X protocol library, and some - of the extension libraries. These experimental libraries - provide convenience functions and interfaces which make the - raw X protocol more usable. Some of the libraries also - provide client-side code which is not strictly part of the X - protocol but which have traditionally been provided by Xlib. - - XCB util-renderutil module provides the following library: - - renderutil: Convenience functions for the Render - extension. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash b/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash deleted file mode 100644 index 1a1ad3e8a5..0000000000 --- a/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002446.html -sha256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b xcb-util-renderutil-0.3.9.tar.bz2 diff --git a/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk b/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk deleted file mode 100644 index 9e6683bf3a..0000000000 --- a/package.bak/x11r7/xcb-util-renderutil/xcb-util-renderutil.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xcb-util-renderutil -# -################################################################################ - -XCB_UTIL_RENDERUTIL_VERSION = 0.3.9 -XCB_UTIL_RENDERUTIL_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_RENDERUTIL_SOURCE = xcb-util-renderutil-$(XCB_UTIL_RENDERUTIL_VERSION).tar.bz2 -XCB_UTIL_RENDERUTIL_LICENSE = MIT -XCB_UTIL_RENDERUTIL_LICENSE_FILES = COPYING -XCB_UTIL_RENDERUTIL_INSTALL_STAGING = YES -XCB_UTIL_RENDERUTIL_DEPENDENCIES = xcb-util - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-util-wm/Config.in b/package.bak/x11r7/xcb-util-wm/Config.in deleted file mode 100644 index 5e7d94e1d2..0000000000 --- a/package.bak/x11r7/xcb-util-wm/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL_WM - bool "xcb-util-wm" - select BR2_PACKAGE_LIBXCB - help - The XCB util modules provides a number of libraries which sit on top - of libxcb, the core X protocol library, and some of the extension - libraries. These experimental libraries provide convenience functions - and interfaces which make the raw X protocol more usable. Some of the - libraries also provide client-side code which is not strictly part of - the X protocol but which have traditionally been provided by Xlib. - - XCB util-wm module provides the following libraries: - - ewmh: Both client and window-manager helpers for EWMH. - - icccm: Both client and window-manager helpers for ICCCM. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util-wm/xcb-util-wm.hash b/package.bak/x11r7/xcb-util-wm/xcb-util-wm.hash deleted file mode 100644 index 45a6c95e10..0000000000 --- a/package.bak/x11r7/xcb-util-wm/xcb-util-wm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-February/002401.html -sha256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f xcb-util-wm-0.4.1.tar.bz2 diff --git a/package.bak/x11r7/xcb-util-wm/xcb-util-wm.mk b/package.bak/x11r7/xcb-util-wm/xcb-util-wm.mk deleted file mode 100644 index 95aeb22aa6..0000000000 --- a/package.bak/x11r7/xcb-util-wm/xcb-util-wm.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xcb-util-wm -# -################################################################################ - -XCB_UTIL_WM_VERSION = 0.4.1 -XCB_UTIL_WM_SITE = http://xcb.freedesktop.org/dist -XCB_UTIL_WM_SOURCE = xcb-util-wm-$(XCB_UTIL_WM_VERSION).tar.bz2 -XCB_UTIL_WM_INSTALL_STAGING = YES -XCB_UTIL_WM_LICENSE = MIT -XCB_UTIL_WM_DEPENDENCIES = libxcb - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcb-util/Config.in b/package.bak/x11r7/xcb-util/Config.in deleted file mode 100644 index dd77b1d9d4..0000000000 --- a/package.bak/x11r7/xcb-util/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XCB_UTIL - bool "xcb-util" - depends on BR2_PACKAGE_LIBXCB - help - Libraries which sit on top of libxcb, the core X protocol library, - and some of the extension libraries. - - http://xcb.freedesktop.org/ diff --git a/package.bak/x11r7/xcb-util/xcb-util.hash b/package.bak/x11r7/xcb-util/xcb-util.hash deleted file mode 100644 index a9b8be25ab..0000000000 --- a/package.bak/x11r7/xcb-util/xcb-util.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4 xcb-util-0.3.9.tar.bz2 diff --git a/package.bak/x11r7/xcb-util/xcb-util.mk b/package.bak/x11r7/xcb-util/xcb-util.mk deleted file mode 100644 index 7b913e2bb5..0000000000 --- a/package.bak/x11r7/xcb-util/xcb-util.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xcb-util -# -################################################################################ - -XCB_UTIL_VERSION = 0.3.9 -XCB_UTIL_SOURCE = xcb-util-$(XCB_UTIL_VERSION).tar.bz2 -XCB_UTIL_SITE = http://xcb.freedesktop.org/dist - -# unfortunately, no license file -XCB_UTIL_LICENSE = MIT - -XCB_UTIL_INSTALL_STAGING = YES -XCB_UTIL_DEPENDENCIES = libxcb - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch b/package.bak/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch deleted file mode 100644 index 9cf351f238..0000000000 --- a/package.bak/x11r7/xcursor-transparent-theme/0001-fix-symlink.patch +++ /dev/null @@ -1,37 +0,0 @@ -Do not symlink to a host directory - -The installation of xcursor-transparent-theme creates many symbolic -links to the 'transp' cursor file, but it does so using an absolute -directory, that happens to point to the installation location, which -is incorrect when cross-compiling. - -Also add the -f option so that the package can be reinstalled even if -it has already been installed. - -Signed-off-by: Thomas Petazzoni - -Index: b/cursors/Makefile.am -=================================================================== ---- a/cursors/Makefile.am -+++ b/cursors/Makefile.am -@@ -91,6 +91,6 @@ - $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ - for CURSOR in $(CURSOR_NAMES); do \ - echo '-- Installing cursor '$$CURSOR; \ -- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ -+ ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ - done - -Index: b/cursors/Makefile.in -=================================================================== ---- a/cursors/Makefile.in -+++ b/cursors/Makefile.in -@@ -177,7 +177,7 @@ - $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ - for CURSOR in $(CURSOR_NAMES); do \ - echo '-- Installing cursor '$$CURSOR; \ -- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ -+ ln -sf transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ - done - - # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/package.bak/x11r7/xcursor-transparent-theme/Config.in b/package.bak/x11r7/xcursor-transparent-theme/Config.in deleted file mode 100644 index 8282db897a..0000000000 --- a/package.bak/x11r7/xcursor-transparent-theme/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XCURSOR_TRANSPARENT_THEME - bool "xcursor-transparent-theme" - select BR2_PACKAGE_XLIB_LIBXCURSOR - help - Completely transparent theme for hiding the X11 cursor. - - No upstream site. diff --git a/package.bak/x11r7/xcursor-transparent-theme/index.theme b/package.bak/x11r7/xcursor-transparent-theme/index.theme deleted file mode 100644 index 5300850fba..0000000000 --- a/package.bak/x11r7/xcursor-transparent-theme/index.theme +++ /dev/null @@ -1,2 +0,0 @@ -[Icon Theme] -Inherits=xcursor-transparent diff --git a/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash b/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash deleted file mode 100644 index 19f0de2eaa..0000000000 --- a/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4 xcursor-transparent-theme-0.1.1.tar.gz diff --git a/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk b/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk deleted file mode 100644 index 5c6f2d27a7..0000000000 --- a/package.bak/x11r7/xcursor-transparent-theme/xcursor-transparent-theme.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xcursor-transparent-theme -# -################################################################################ - -XCURSOR_TRANSPARENT_THEME_VERSION = 0.1.1 -XCURSOR_TRANSPARENT_THEME_SITE = http://downloads.yoctoproject.org/releases/matchbox/utils -XCURSOR_TRANSPARENT_THEME_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen -XCURSOR_TRANSPARENT_THEME_LICENSE = GPLv2 -XCURSOR_TRANSPARENT_THEME_LICENSE_FILES = COPYING - -define ICONS_DEFAULT_CONFIG_INSTALL - $(INSTALL) -m 0755 -D package/x11r7/xcursor-transparent-theme/index.theme \ - $(TARGET_DIR)/usr/share/icons/default/index.theme -endef - -XCURSOR_TRANSPARENT_THEME_POST_INSTALL_TARGET_HOOKS += ICONS_DEFAULT_CONFIG_INSTALL - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdata_xbitmaps/Config.in b/package.bak/x11r7/xdata_xbitmaps/Config.in deleted file mode 100644 index 2308caecaa..0000000000 --- a/package.bak/x11r7/xdata_xbitmaps/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XDATA_XBITMAPS - bool "xbitmaps" - help - No description available diff --git a/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash b/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash deleted file mode 100644 index 3e5fb32896..0000000000 --- a/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-December/001563.html -sha1 578afff7e4912192b524c25254cf7f54c16e57d8 xbitmaps-1.1.1.tar.bz2 diff --git a/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk b/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk deleted file mode 100644 index 9767f2c143..0000000000 --- a/package.bak/x11r7/xdata_xbitmaps/xdata_xbitmaps.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdata_xbitmaps -# -################################################################################ - -XDATA_XBITMAPS_VERSION = 1.1.1 -XDATA_XBITMAPS_SOURCE = xbitmaps-$(XDATA_XBITMAPS_VERSION).tar.bz2 -XDATA_XBITMAPS_SITE = http://xorg.freedesktop.org/releases/individual/data -XDATA_XBITMAPS_LICENSE = MIT -XDATA_XBITMAPS_LICENSE_FILES = COPYING - -XDATA_XBITMAPS_INSTALL_STAGING = YES - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdata_xcursor-themes/Config.in b/package.bak/x11r7/xdata_xcursor-themes/Config.in deleted file mode 100644 index 78d10209f3..0000000000 --- a/package.bak/x11r7/xdata_xcursor-themes/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XDATA_XCURSOR_THEMES - bool "xdata_xcursor-themes" - select BR2_PACKAGE_XLIB_LIBXCURSOR - help - No description available diff --git a/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash b/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash deleted file mode 100644 index e59c848641..0000000000 --- a/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-July/002271.html -sha256 e3fd2c05b9df0d88a3d1192c02143295744685f4f9a03db116e206698331bb86 xcursor-themes-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk b/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk deleted file mode 100644 index a2987a0ff2..0000000000 --- a/package.bak/x11r7/xdata_xcursor-themes/xdata_xcursor-themes.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xdata_xcursor-themes -# -################################################################################ - -XDATA_XCURSOR_THEMES_VERSION = 1.0.4 -XDATA_XCURSOR_THEMES_SOURCE = xcursor-themes-$(XDATA_XCURSOR_THEMES_VERSION).tar.bz2 -XDATA_XCURSOR_THEMES_SITE = http://xorg.freedesktop.org/releases/individual/data -XDATA_XCURSOR_THEMES_LICENSE = MIT -XDATA_XCURSOR_THEMES_LICENSE_FILES = COPYING - -XDATA_XCURSOR_THEMES_INSTALL_STAGING = YES -XDATA_XCURSOR_THEMES_DEPENDENCIES = xlib_libXcursor host-xapp_xcursorgen - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch b/package.bak/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch deleted file mode 100644 index b342295440..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-evdev/0001-build-get-rid-of-sdkdir.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 1ad5e1593556f767150c2ca75176453bee4771e6 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 23 Oct 2016 22:00:10 +0200 -Subject: [PATCH] build: get rid of sdkdir - -Use of sdkdir causes problems during cross-compilation, where the full -path is then appended to the DESTDIR, leading to host paths being -appended in the target: - https://bugs.busybox.net/show_bug.cgi?id=8696 - -Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. - -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 4 ---- - configure.ac | 9 --------- - include/Makefile.am | 5 ++++- - xorg-evdev.pc.in | 10 ++++++++-- - 4 files changed, 12 insertions(+), 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 1cc3ea6..1ae042a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,10 +18,6 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -- --# Provide an sdk location that is writable by the evdev module --DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' -- - SUBDIRS = src man include - MAINTAINERCLEANFILES = ChangeLog INSTALL - -diff --git a/configure.ac b/configure.ac -index e4887a3..4adfa43 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-conf-dir, - [xorgconfdir="$prefix/share/X11/xorg.conf.d"]) - AC_SUBST(xorgconfdir) - --# X Server SDK location is required to install evdev header files --# This location is also relayed in the xorg-evdev.pc file --sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` -- --# Workaround overriding sdkdir to be able to create a tarball when user has no --# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am --AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) --AC_SUBST([sdkdir]) -- - DRIVER_NAME=evdev - AC_SUBST([DRIVER_NAME]) - -diff --git a/include/Makefile.am b/include/Makefile.am -index 0e3fc1b..afc96ed 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -1 +1,4 @@ --sdk_HEADERS = evdev-properties.h -+# location formerly known as 'sdkdir': -+xorgincludedir = $(includedir)/xorg -+ -+xorginclude_HEADERS = evdev-properties.h -diff --git a/xorg-evdev.pc.in b/xorg-evdev.pc.in -index 20710a6..fcbf511 100644 ---- a/xorg-evdev.pc.in -+++ b/xorg-evdev.pc.in -@@ -1,6 +1,12 @@ --sdkdir=@sdkdir@ -+prefix=@prefix@ -+exec_prefix=@exec_prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+datarootdir=@datarootdir@ -+moduledir=@moduledir@ -+sysconfigdir=@sysconfigdir@ - - Name: xorg-evdev - Description: X.Org evdev input driver. - Version: @PACKAGE_VERSION@ --Cflags: -I${sdkdir} -+Cflags: -I${includedir}/xorg --- -2.7.4 - diff --git a/package.bak/x11r7/xdriver_xf86-input-evdev/Config.in b/package.bak/x11r7/xdriver_xf86-input-evdev/Config.in deleted file mode 100644 index 70e950dc74..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-evdev/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV - bool "xf86-input-evdev" - depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency - select BR2_PACKAGE_LIBEVDEV - select BR2_PACKAGE_MTDEV - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Generic Linux input driver - -comment "xf86-input-evdev requires udev to be enabled" - depends on !BR2_PACKAGE_HAS_UDEV diff --git a/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash b/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash deleted file mode 100644 index bf9a2cd256..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002767.html -sha256 9edaa6205baf6d2922cc4db3d8e54a7e7773b5f733b0ae90f6be7725f983b70d xf86-input-evdev-2.10.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk deleted file mode 100644 index 4933c42fda..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-evdev -# -################################################################################ - -XDRIVER_XF86_INPUT_EVDEV_VERSION = 2.10.5 -XDRIVER_XF86_INPUT_EVDEV_SOURCE = xf86-input-evdev-$(XDRIVER_XF86_INPUT_EVDEV_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_EVDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_EVDEV_LICENSE = MIT -XDRIVER_XF86_INPUT_EVDEV_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_EVDEV_AUTORECONF = YES - -XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = \ - host-pkgconf \ - libevdev \ - mtdev \ - xproto_inputproto \ - xserver_xorg-server \ - xproto_randrproto \ - xproto_xproto \ - udev - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch b/package.bak/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch deleted file mode 100644 index a611f1536d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-joystick/0001-build-get-rid-of-sdkdir.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 2826691dcd01f470d30dc8eb3bbd24a96cd3a93c Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 23 Oct 2016 22:29:29 +0200 -Subject: [PATCH] build: get rid of sdkdir - -Use of sdkdir causes problems during cross-compilation, where the full -path is then appended to the DESTDIR, leading to host paths being -appended in the target: - https://bugs.busybox.net/show_bug.cgi?id=8696 - -Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. - -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 1 - - configure.ac | 9 --------- - include/Makefile.am | 5 ++++- - xorg-joystick.pc.in | 2 +- - 4 files changed, 5 insertions(+), 12 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 13946b8..c1567ae 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,7 +18,6 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir=\$${includedir}/xorg - SUBDIRS = src man config include - MAINTAINERCLEANFILES = ChangeLog INSTALL - -diff --git a/configure.ac b/configure.ac -index b5834a5..44b9d27 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -66,15 +66,6 @@ AC_ARG_WITH(xorg-module-dir, - inputdir=${moduledir}/input - AC_SUBST(inputdir) - --# Define a configure option for an alternate X Server SDK Headers --# X Server SDK location is required to install joystick header files --AC_ARG_WITH(sdkdir, -- AS_HELP_STRING([--with-sdkdir=], -- [Xorg X Server sdk headers (default is autodetected)]), -- [sdkdir="$withval"], -- [sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server`]) --AC_SUBST(sdkdir) -- - # Define a configure option to enable code debugging - AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug], - [Disable debugging code (default: enabled)]), -diff --git a/include/Makefile.am b/include/Makefile.am -index ed618c2..d656568 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -18,4 +18,7 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --sdk_HEADERS = joystick-properties.h -+# Location formerly known as 'sdkdir' -+xorgincludedir = $(includedir)/xorg -+ -+xorginclude_HEADERS = joystick-properties.h -diff --git a/xorg-joystick.pc.in b/xorg-joystick.pc.in -index 76bb92f..a5972c7 100644 ---- a/xorg-joystick.pc.in -+++ b/xorg-joystick.pc.in -@@ -4,4 +4,4 @@ includedir=@includedir@ - Name: xorg-joystick - Description: X.Org joystick input driver. - Version: @PACKAGE_VERSION@ --Cflags: -I${includedir} -+Cflags: -I${includedir}/xorg --- -2.7.4 - diff --git a/package.bak/x11r7/xdriver_xf86-input-joystick/50-joystick.conf b/package.bak/x11r7/xdriver_xf86-input-joystick/50-joystick.conf deleted file mode 100644 index 95a295ab00..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-joystick/50-joystick.conf +++ /dev/null @@ -1,6 +0,0 @@ -Section "InputClass" - Identifier "joystick catchall" - MatchIsJoystick "on" - MatchDevicePath "/dev/input/event*" - Driver "joystick" -EndSection diff --git a/package.bak/x11r7/xdriver_xf86-input-joystick/Config.in b/package.bak/x11r7/xdriver_xf86-input-joystick/Config.in deleted file mode 100644 index ff9f25f549..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-joystick/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_JOYSTICK - bool "xf86-input-joystick" - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for joystick input devices diff --git a/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash b/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash deleted file mode 100644 index feec2d3777..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002742.html -sha256 9e7669ecf0f23b8e5dc39d5397cf28296f692aa4c0e4255f5e02816612c18eab xf86-input-joystick-1.6.3.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk deleted file mode 100644 index 5bc2a5cafb..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-joystick -# -################################################################################ - -XDRIVER_XF86_INPUT_JOYSTICK_VERSION = 1.6.3 -XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JOYSTICK_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT -XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto -XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES - -define XDRIVER_XF86_INPUT_JOYSTICK_CONF - $(INSTALL) -m 0644 -D \ - $(XDRIVER_XF86_INPUT_JOYSTICK_PKGDIR)/50-joystick.conf \ - $(TARGET_DIR)/usr/share/X11/xorg.conf.d/50-joystick.conf -endef -XDRIVER_XF86_INPUT_JOYSTICK_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_INPUT_JOYSTICK_CONF - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-keyboard/Config.in b/package.bak/x11r7/xdriver_xf86-input-keyboard/Config.in deleted file mode 100644 index 0a0352424e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-keyboard/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD - bool "xf86-input-keyboard" - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Keyboard input driver diff --git a/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash b/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash deleted file mode 100644 index eccfa74dc8..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002739.html -sha256 f7c900f21752683402992b288d5a2826de7a6c0c0abac2aadd7e8a409e170388 xf86-input-keyboard-1.9.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk deleted file mode 100644 index 01a6859cd4..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-keyboard -# -################################################################################ - -XDRIVER_XF86_INPUT_KEYBOARD_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KEYBOARD_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT -XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto -XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch b/package.bak/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch deleted file mode 100644 index 2f9784c283..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-libinput/0001-build-get-rid-of-sdkdir.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1b2cf6e6c2640e08166af36eee775542a45325af Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 23 Oct 2016 22:36:40 +0200 -Subject: [PATCH] build: get rid of sdkdir - -Use of sdkdir causes problems during cross-compilation, where the full -path is then appended to the DESTDIR, leading to host paths being -appended in the target: - https://bugs.busybox.net/show_bug.cgi?id=8696 - -Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. - -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 2 -- - configure.ac | 8 -------- - include/Makefile.am | 4 +++- - xorg-libinput.pc.in | 5 +++-- - 4 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index a447d61..7aa5523 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -19,8 +19,6 @@ - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - --DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' -- - SUBDIRS = src include man test - MAINTAINERCLEANFILES = ChangeLog INSTALL - -diff --git a/configure.ac b/configure.ac -index 9894817..fe198cb 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -63,14 +63,6 @@ AC_ARG_WITH(xorg-conf-dir, - [xorgconfdir='${prefix}/share/X11/xorg.conf.d']) - AC_SUBST(xorgconfdir) - --# X Server SDK location is required to install header files --sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` -- --# Workaround overriding sdkdir to be able to create a tarball when user has no --# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am --AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) --AC_SUBST([sdkdir]) -- - DRIVER_NAME=libinput - AC_SUBST([DRIVER_NAME]) - -diff --git a/include/Makefile.am b/include/Makefile.am -index 0d52b9b..271ffac 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -1 +1,3 @@ --sdk_HEADERS = libinput-properties.h -+# Location formerly known as 'sdkdir' -+xorgincludedir = $(includedir)/xorg -+xorginclude_HEADERS = libinput-properties.h -diff --git a/xorg-libinput.pc.in b/xorg-libinput.pc.in -index ff98189..9c0f506 100644 ---- a/xorg-libinput.pc.in -+++ b/xorg-libinput.pc.in -@@ -1,6 +1,7 @@ --sdkdir=@sdkdir@ -+prefix=@prefix@ -+includedir=@includedir@ - - Name: xorg-libinput - Description: X.Org libinput input driver. - Version: @PACKAGE_VERSION@ --Cflags: -I${sdkdir} -+Cflags: -I${includedir}/xorg --- -2.7.4 - diff --git a/package.bak/x11r7/xdriver_xf86-input-libinput/Config.in b/package.bak/x11r7/xdriver_xf86-input-libinput/Config.in deleted file mode 100644 index 69697ed046..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-libinput/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT - bool "xf86-input-libinput" - depends on BR2_ENABLE_LOCALE # libinput - depends on BR2_PACKAGE_HAS_UDEV # libinput - select BR2_PACKAGE_LIBINPUT - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - This is an X driver based on libinput. It is a thin wrapper around - libinput, so while it does provide all features that libinput supports - it does little beyond. - -comment "xf86-input-libinput needs udev /dev management and a toolchain w/ locale" - depends on !BR2_PACKAGE_HAS_UDEV || !BR2_ENABLE_LOCALE diff --git a/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash b/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash deleted file mode 100644 index 0d35294937..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-February/002776.html -sha256 ddcb07350aed59b2996a92a1b4ff64d1c0b0c86a3f0ddca15b2b1c8c8bb13628 xf86-input-libinput-0.24.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk deleted file mode 100644 index e293b4e80b..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-libinput -# -################################################################################ - -XDRIVER_XF86_INPUT_LIBINPUT_VERSION = 0.24.0 -XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LIBINPUT_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT -XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xproto_inputproto xproto_xproto -XDRIVER_XF86_INPUT_LIBINPUT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch b/package.bak/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch deleted file mode 100644 index d5f97f98c1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-mouse/0001-build-get-rid-of-sdkdir.patch +++ /dev/null @@ -1,81 +0,0 @@ -From aef3d9bca4d77db833f71d50b1c84b16c69d7deb Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 23 Oct 2016 22:53:21 +0200 -Subject: [PATCH] build: get rid of sdkdir - -Use of sdkdir causes problems during cross-compilation, where the full -path is then appended to the DESTDIR, leading to host paths being -appended in the target: - https://bugs.busybox.net/show_bug.cgi?id=8696 - -Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. - -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 3 --- - configure.ac | 10 ---------- - include/Makefile.am | 4 +++- - xorg-mouse.pc.in | 3 +-- - 4 files changed, 4 insertions(+), 16 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 7142485..efe66cb 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -34,9 +34,6 @@ ChangeLog: - - dist-hook: ChangeLog INSTALL - --# Provide an sdk location that is writable by this module --DISTCHECK_CONFIGURE_FLAGS = --with-sdkdir='$${includedir}/xorg' -- - if LINT - # Check source code with tools like lint & sparse - lint: -diff --git a/configure.ac b/configure.ac -index 15d9047..515681d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,16 +60,6 @@ AC_ARG_WITH(xorg-module-dir, - inputdir=${moduledir}/input - AC_SUBST(inputdir) - --# X Server SDK location is required to install xf86-mouse-properties.h --# This location is also relayed in the xorg-mouse.pc file --sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` -- --# Workaround overriding sdkdir to be able to create a tarball when user has no --# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am --AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) --AC_SUBST([sdkdir]) -- -- - # Work out which OS mouse driver we need to build - case $host_os in - linux*) -diff --git a/include/Makefile.am b/include/Makefile.am -index 27ce0fb..2b85e4e 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -1 +1,3 @@ --sdk_HEADERS = xf86-mouse-properties.h -+# Location formerly known as 'sdkdir' -+xorgincludedir = $(includedir)/xorg -+xorginclude_HEADERS = xf86-mouse-properties.h -diff --git a/xorg-mouse.pc.in b/xorg-mouse.pc.in -index 57df596..8355e61 100644 ---- a/xorg-mouse.pc.in -+++ b/xorg-mouse.pc.in -@@ -1,6 +1,7 @@ prefix=@prefix@ --sdkdir=@sdkdir@ -+prefix=@prefix@ -+includedir=@includedir@ - - Name: xorg-mouse - Description: X.Org mouse input driver for non-evdev OS'es - Version: @PACKAGE_VERSION@ --Cflags: -I${sdkdir} -+Cflags: -I${includedir}/xorg --- -2.7.4 - diff --git a/package.bak/x11r7/xdriver_xf86-input-mouse/Config.in b/package.bak/x11r7/xdriver_xf86-input-mouse/Config.in deleted file mode 100644 index 20e1803a99..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-mouse/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE - bool "xf86-input-mouse" - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for mouse input devices diff --git a/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash deleted file mode 100644 index caba427b22..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002740.html -sha256 f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f xf86-input-mouse-1.9.2.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk deleted file mode 100644 index 5bcbeb70fd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-mouse -# -################################################################################ - -XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.2 -XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT -XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto -XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch b/package.bak/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch deleted file mode 100644 index 62950b0667..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-synaptics/0001-build-get-rid-of-sdkdir.patch +++ /dev/null @@ -1,88 +0,0 @@ -From 231a35e99fee8aba23f18cce21dfb5fa8bef0c36 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 23 Oct 2016 23:07:33 +0200 -Subject: [PATCH] build: get rid of sdkdir - -Use of sdkdir causes problems during cross-compilation, where the full -path is then appended to the DESTDIR, leading to host paths being -appended in the target: - https://bugs.busybox.net/show_bug.cgi?id=8696 - -Other drivers (e.g. keyboard) got rid of sdkdir. Do the same. - -Signed-off-by: "Yann E. MORIN" ---- - Makefile.am | 1 - - configure.ac | 9 --------- - include/Makefile.am | 4 +++- - xorg-synaptics.pc.in | 5 +++-- - 4 files changed, 6 insertions(+), 13 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 678124c..c48c5c8 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -21,7 +21,6 @@ - # During distcheck, system locations (as provided by pkg-config) may - # not be writable; provide instead relative locations. - DISTCHECK_CONFIGURE_FLAGS = \ -- --with-sdkdir='$${includedir}/xorg' \ - --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' - - SUBDIRS = include src man tools conf -diff --git a/configure.ac b/configure.ac -index 970dd5f..574353b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,11 +55,6 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) - # Obtain compiler/linker options for the Synaptics driver dependencies - PKG_CHECK_MODULES(XORG, [inputproto >= 2.1.99.3] [xorg-server >= 1.12] xproto inputproto $REQUIRED_MODULES) - --# X Server SDK location is required to install Synaptics header files --# This location is also relayed in the xorg-synaptics.pc file --sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` --AC_SUBST([sdkdir]) -- - # ----------------------------------------------------------------------------- - # Configuration options - # ----------------------------------------------------------------------------- -@@ -154,10 +149,6 @@ if test "x$have_libxtst" = "xyes" ; then - fi - # ----------------------------------------------------------------------------- - --# Workaround overriding sdkdir to be able to create a tarball when user has no --# write permission in sdkdir. See DISTCHECK_CONFIGURE_FLAGS in Makefile.am --AC_ARG_WITH([sdkdir], [], [sdkdir="$withval"]) -- - AC_CONFIG_FILES([Makefile - src/Makefile - man/Makefile -diff --git a/include/Makefile.am b/include/Makefile.am -index 8234020..565868b 100644 ---- a/include/Makefile.am -+++ b/include/Makefile.am -@@ -18,4 +18,6 @@ - # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - --sdk_HEADERS = synaptics-properties.h -+# Location formerly known as 'sdkdir' -+xorgincludedir = $(includedir)/xorg -+xorginclude_HEADERS = synaptics-properties.h -diff --git a/xorg-synaptics.pc.in b/xorg-synaptics.pc.in -index 159cfbf..68e0fbe 100644 ---- a/xorg-synaptics.pc.in -+++ b/xorg-synaptics.pc.in -@@ -1,6 +1,7 @@ --sdkdir=@sdkdir@ -+prefix=@prefix@ -+includedir=@includedir@ - - Name: synaptics - Description: X.Org synaptics input driver. - Version: @PACKAGE_VERSION@ --Cflags: -I${sdkdir} -+Cflags: -I${includedir}/xorg --- -2.7.4 - diff --git a/package.bak/x11r7/xdriver_xf86-input-synaptics/Config.in b/package.bak/x11r7/xdriver_xf86-input-synaptics/Config.in deleted file mode 100644 index ffe1a2a448..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-synaptics/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS - bool "xf86-input-synaptics" - select BR2_PACKAGE_LIBEVDEV - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_MTDEV - help - X.Org driver for synaptics input devices diff --git a/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash b/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash deleted file mode 100644 index 2c31600b0a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002744.html -sha256 afba3289d7a40217a19d90db98ce181772f9ca6d77e1898727b0afcf02073b5a xf86-input-synaptics-1.9.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk deleted file mode 100644 index 6bd9cc49c5..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-synaptics -# -################################################################################ - -XDRIVER_XF86_INPUT_SYNAPTICS_VERSION = 1.9.0 -XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_SYNAPTICS_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT -XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev -XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch b/package.bak/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch deleted file mode 100644 index adef18b302..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-tslib/0001-fix-segfault.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz - -Signed-off-by: Jesper Baekdahl ---- ---- xf86-input-tslib-0.0.6/src/tslib.c 2009-10-19 18:07:18.000000000 +0300 -+++ xf86-input-tslib-0.0.6.new/src/tslib.c 2010-02-12 16:15:05.000000000 +0200 -@@ -103,8 +103,6 @@ - static void - PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl) - { -- ErrorF("%s\n", __FUNCTION__); -- return; - } - - static Bool -@@ -406,7 +404,9 @@ - xf86MotionHistoryAllocate(pInfo); - #endif - -- break; -+ if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc)) -+ return !Success; -+ break; - - case DEVICE_ON: - AddEnabledDevice(pInfo->fd); -@@ -435,6 +435,7 @@ - xf86TslibControlProc(pInfo->dev, DEVICE_OFF); - ts_close(priv->ts); - xfree(pInfo->private); -+ pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); - } - diff --git a/package.bak/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch b/package.bak/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch deleted file mode 100644 index eb8fb542fd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-tslib/0002-port-abi-12.patch +++ /dev/null @@ -1,196 +0,0 @@ -Fetch from: https://launchpad.net/ubuntu/+archive/primary/+files/xf86-input-tslib_0.0.6-7build3.debian.tar.gz -Fixes build against newer versions of xorg. - -Signed-off-by: Jesper Baekdahl ---- -Index: xf86-input-tslib-trunk/src/tslib.c -=================================================================== ---- xf86-input-tslib-trunk/src/tslib.c (revision 48) -+++ xf86-input-tslib-trunk/src/tslib.c (working copy) -@@ -69,6 +69,13 @@ - #define DEFAULT_HEIGHT 240 - #define DEFAULT_WIDTH 320 - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 -+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options), NULL) -+#else -+#define COLLECT_INPUT_OPTIONS(pInfo, options) xf86CollectInputOptions((pInfo), (options)) -+#endif -+ -+ - enum { TSLIB_ROTATE_NONE=0, TSLIB_ROTATE_CW=270, TSLIB_ROTATE_UD=180, TSLIB_ROTATE_CCW=90 }; - - enum button_state { BUTTON_NOT_PRESSED = 0, BUTTON_1_PRESSED = 1, BUTTON_3_CLICK = 3, BUTTON_3_CLICKED=4, BUTTON_EMULATION_OFF=-1 }; -@@ -106,7 +113,7 @@ - } - - static Bool --ConvertProc( LocalDevicePtr local, -+ConvertProc( InputInfoPtr local, - int first, - int num, - int v0, -@@ -135,7 +142,7 @@ - return t; - } - --static void ReadInput (LocalDevicePtr local) -+static void ReadInput (InputInfoPtr local) - { - struct ts_priv *priv = (struct ts_priv *) (local->private); - struct ts_sample samp; -@@ -382,7 +389,11 @@ - axiswidth - 1, /* max val */ - axiswidth, /* resolution */ - 0, /* min_res */ -- axiswidth); /* max_res */ -+ axiswidth /* max_res */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+ ,Absolute -+#endif -+ ); - - InitValuatorAxisStruct(device, 1, - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 -@@ -392,7 +403,11 @@ - axisheight - 1, /* max val */ - axisheight, /* resolution */ - 0, /* min_res */ -- axisheight); /* max_res */ -+ axisheight /* max_res */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+ ,Absolute -+#endif -+ ); - - if (InitProximityClassDeviceStruct (device) == FALSE) { - ErrorF ("Unable to allocate EVTouch touchscreen ProximityClassDeviceStruct\n"); -@@ -434,7 +449,7 @@ - ErrorF("%s\n", __FUNCTION__); - xf86TslibControlProc(pInfo->dev, DEVICE_OFF); - ts_close(priv->ts); -- xfree(pInfo->private); -+ free(pInfo->private); - pInfo->private = NULL; - xf86DeleteInput(pInfo, 0); - } -@@ -444,47 +459,57 @@ - * - * called when the module subsection is found in XF86Config - */ -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12 -+static int -+xf86TslibInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) -+#else - static InputInfoPtr - xf86TslibInit(InputDriverPtr drv, IDevPtr dev, int flags) -+#endif - { - struct ts_priv *priv; - char *s; -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - InputInfoPtr pInfo; -+#endif - -- priv = xcalloc (1, sizeof (struct ts_priv)); -+ priv = calloc (1, sizeof (struct ts_priv)); - if (!priv) -- return NULL; -+ return BadValue; - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - if (!(pInfo = xf86AllocateInput(drv, 0))) { -- xfree(priv); -- return NULL; -+ free(priv); -+ return BadValue; - } - - /* Initialise the InputInfoRec. */ - pInfo->name = dev->identifier; -- pInfo->type_name = XI_TOUCHSCREEN; - pInfo->flags = - XI86_KEYBOARD_CAPABLE | XI86_POINTER_CAPABLE | - XI86_SEND_DRAG_EVENTS; -- pInfo->device_control = xf86TslibControlProc; -- pInfo->read_input = ReadInput; - #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0 - pInfo->motion_history_proc = xf86GetMotionEvents; - pInfo->history_size = 0; - #endif -- pInfo->control_proc = NULL; -+ pInfo->conf_idev = dev; - pInfo->close_proc = NULL; -- pInfo->switch_mode = NULL; - pInfo->conversion_proc = ConvertProc; - pInfo->reverse_conversion_proc = NULL; -- pInfo->dev = NULL; - pInfo->private_flags = 0; - pInfo->always_core_feedback = 0; -- pInfo->conf_idev = dev; -+#endif -+ -+ pInfo->type_name = XI_TOUCHSCREEN; -+ pInfo->control_proc = NULL; -+ pInfo->read_input = ReadInput; -+ pInfo->device_control = xf86TslibControlProc; -+ pInfo->switch_mode = NULL; - pInfo->private = priv; -+ pInfo->dev = NULL; - - /* Collect the options, and process the common options. */ -- xf86CollectInputOptions(pInfo, NULL, NULL); -+ COLLECT_INPUT_OPTIONS(pInfo, NULL); - xf86ProcessCommonOptions(pInfo, pInfo->options); - - priv->screen_num = xf86SetIntOption(pInfo->options, "ScreenNumber", 0 ); -@@ -510,23 +535,31 @@ - priv->rotate = TSLIB_ROTATE_NONE; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - s = xf86CheckStrOption(dev->commonOptions, "path", NULL); -+#else -+ s = xf86CheckStrOption(pInfo->options, "path", NULL); -+#endif - if (!s) -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - s = xf86CheckStrOption(dev->commonOptions, "Device", NULL); -+#else -+ s = xf86CheckStrOption(pInfo->options, "Device", NULL); -+#endif - - priv->ts = ts_open(s, 1); -- xfree(s); -+ free(s); - - if (!priv->ts) { - ErrorF("ts_open failed (device=%s)\n",s); - xf86DeleteInput(pInfo, 0); -- return NULL; -+ return BadValue; - } - - if (ts_config(priv->ts)) { - ErrorF("ts_config failed\n"); - xf86DeleteInput(pInfo, 0); -- return NULL; -+ return BadValue; - } - - pInfo->fd = ts_fd(priv->ts); -@@ -536,11 +569,13 @@ - priv->state = BUTTON_EMULATION_OFF; - } - -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12 - /* Mark the device configured */ - pInfo->flags |= XI86_CONFIGURED; -+#endif - - /* Return the configured device */ -- return (pInfo); -+ return Success; - } - - _X_EXPORT InputDriverRec TSLIB = { diff --git a/package.bak/x11r7/xdriver_xf86-input-tslib/Config.in b/package.bak/x11r7/xdriver_xf86-input-tslib/Config.in deleted file mode 100644 index 9c6e296153..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-tslib/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB - bool "xf86-input-tslib" - depends on !BR2_STATIC_LIBS # tslib - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_TSLIB - help - Touch screen library input driver - - http://www.ptxdist.org/software/xf86-input-tslib/index_en.html - -comment "xf86-input-tslib needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS diff --git a/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash b/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash deleted file mode 100644 index 9eb3f1de8f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 5f46fdef095a6e44a69e0f0b57c7d665224b26d990d006611236d8332e85b105 xf86-input-tslib-0.0.6.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk deleted file mode 100644 index cd8c10adad..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-tslib -# -################################################################################ - -XDRIVER_XF86_INPUT_TSLIB_VERSION = 0.0.6 -XDRIVER_XF86_INPUT_TSLIB_SOURCE = xf86-input-tslib-$(XDRIVER_XF86_INPUT_TSLIB_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_TSLIB_SITE = http://www.pengutronix.de/software/xf86-input-tslib/download -XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT -XDRIVER_XF86_INPUT_TSLIB_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \ - xproto_inputproto \ - xserver_xorg-server \ - xproto_randrproto \ - xproto_xproto \ - tslib - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-input-vmmouse/Config.in b/package.bak/x11r7/xdriver_xf86-input-vmmouse/Config.in deleted file mode 100644 index de989eb34a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-vmmouse/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE - bool "xf86-input-vmmouse" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - VMWare mouse input driver diff --git a/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash b/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash deleted file mode 100644 index 302b1cd450..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002616.html -sha256 0af558957ac1be1b2863712c2475de8f4d7f14921fd01ded2e2fde4921b19319 xf86-input-vmmouse-13.1.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk deleted file mode 100644 index 6e9cf8b785..0000000000 --- a/package.bak/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# xdriver_xf86-input-vmmouse -# -################################################################################ - -XDRIVER_XF86_INPUT_VMMOUSE_VERSION = 13.1.0 -XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMOUSE_VERSION).tar.bz2 -XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT -XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING -XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -XDRIVER_XF86_INPUT_VMMOUSE_CONF_OPTS += --with-libudev -XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES += udev -else -XDRIVER_XF86_INPUT_VMMOUSE_CONF_OPTS += --without-libudev -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package.bak/x11r7/xdriver_xf86-video-amdgpu/Config.in deleted file mode 100644 index 968c5e767c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU - bool "xf86-video-amdgpu" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBDRM_AMDGPU - select BR2_PACKAGE_LIBEPOXY - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XPROTO_DRI3PROTO - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - AMD GPU video driver - -comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_DRI_DRIVER diff --git a/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash deleted file mode 100644 index 32ff1646d1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002741.html -sha256 275b1aac5f127f55ba3d7480a1df89eace1d02650e24e46908067fc875e76c8f xf86-video-amdgpu-1.2.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk deleted file mode 100644 index d858e14096..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-amdgpu -# -################################################################################ - -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 1.2.0 -XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT -XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ - libdrm \ - xlib_libXcomposite \ - xproto_dri3proto \ - xproto_fontsproto \ - xproto_glproto \ - xproto_randrproto \ - xproto_videoproto \ - xproto_xextproto \ - xproto_xf86driproto \ - xproto_xproto \ - xserver_xorg-server - -# xdriver_xf86-video-amdgpu requires O_CLOEXEC -XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch b/package.bak/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch deleted file mode 100644 index fa3e68596a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ark/0001-mibstore.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3a3eb72baec46f48e6cf15a834271c3d3386deac Mon Sep 17 00:00:00 2001 -From: Gaetan Nadon -Date: Tue, 17 Sep 2013 19:55:37 +0000 -Subject: Remove usage of mibstore.h (removed from server) - -The module had a compile error for this missing header file. - -Changes similar to vmware commit -23d87c92b7211cc5249eefe4ab3a2c7f370e279e - -Reviewed-by: Alex Deucher -Signed-off-by: Gaetan Nadon ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-ark/commit/?id=3a3eb72baec46f48e6cf15a834271c3d3386deac - -Signed-off-by: Bernd Kuhls - -diff --git a/src/ark_driver.c b/src/ark_driver.c -index b7c287c..65cfe84 100644 ---- a/src/ark_driver.c -+++ b/src/ark_driver.c -@@ -39,7 +39,6 @@ - #include "compiler.h" - #include "mipointer.h" - #include "micmap.h" --#include "mibstore.h" - #include "fb.h" - #include "ark.h" - -@@ -538,7 +537,6 @@ static Bool ARKScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - if (!pARK->NoAccel) { --- -cgit v0.9.0.2-2-gbebe diff --git a/package.bak/x11r7/xdriver_xf86-video-ark/Config.in b/package.bak/x11r7/xdriver_xf86-video-ark/Config.in deleted file mode 100644 index cecedde024..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ark/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ARK - bool "xf86-video-ark" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for ark cards diff --git a/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash b/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash deleted file mode 100644 index 30953ef7fb..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002007.html -sha256 c690e046f34a393aac1c8d9616b4790e93cda60a460b00b9597d322175dbe51e xf86-video-ark-0.7.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk deleted file mode 100644 index c0b905b8dd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-ark -# -################################################################################ - -XDRIVER_XF86_VIDEO_ARK_VERSION = 0.7.5 -XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT -XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-ast/Config.in b/package.bak/x11r7/xdriver_xf86-video-ast/Config.in deleted file mode 100644 index 5dfe95e537..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ast/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AST - bool "xf86-video-ast" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - No description available diff --git a/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash b/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash deleted file mode 100644 index cf877d5b3f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 1edbbc55d47d3fd71dec99b15c2483e22738c642623a0fb86ef4a81a9067a2de xf86-video-ast-1.1.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk deleted file mode 100644 index 3c9eb91159..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-ast -# -################################################################################ - -XDRIVER_XF86_VIDEO_AST_VERSION = 1.1.5 -XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_AST_LICENSE = MIT -XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xproto_fontsproto xproto_xproto xserver_xorg-server - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-ati/Config.in b/package.bak/x11r7/xdriver_xf86-video-ati/Config.in deleted file mode 100644 index 00d91bda51..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ati/Config.in +++ /dev/null @@ -1,20 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI - bool "xf86-video-ati" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XINERAMAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - ATI video driver - -comment "xf86-video-ati needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash b/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash deleted file mode 100644 index fe5ae0ea70..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002738.html -sha256 401f5de772928f3dc4ce43a885adb0a47a2f61aa4a9e45d2ab3d184136a9d6fa xf86-video-ati-7.8.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk deleted file mode 100644 index ea701672c2..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-ati -# -################################################################################ - -XDRIVER_XF86_VIDEO_ATI_VERSION = 7.8.0 -XDRIVER_XF86_VIDEO_ATI_SOURCE = xf86-video-ati-$(XDRIVER_XF86_VIDEO_ATI_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_ATI_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT -XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ - libdrm \ - xlib_libXcomposite \ - xproto_fontsproto \ - xproto_glproto \ - xproto_randrproto \ - xproto_videoproto \ - xproto_xextproto \ - xproto_xf86driproto \ - xproto_xineramaproto \ - xproto_xproto \ - xserver_xorg-server - -ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO)$(BR2_PACKAGE_LIBEPOXY),yy) -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor -else -XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor -endif - -# xdriver_xf86-video-ati requires O_CLOEXEC -XDRIVER_XF86_VIDEO_ATI_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-cirrus/Config.in b/package.bak/x11r7/xdriver_xf86-video-cirrus/Config.in deleted file mode 100644 index 11c9df8e0e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-cirrus/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS - bool "xf86-video-cirrus" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Cirrus Logic video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash b/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash deleted file mode 100644 index 86ef09e210..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002600.html -sha256 edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab xf86-video-cirrus-1.5.3.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk deleted file mode 100644 index 78e8a9c05d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-cirrus -# -################################################################################ - -XDRIVER_XF86_VIDEO_CIRRUS_VERSION = 1.5.3 -XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_CIRRUS_LICENSE = MIT -XDRIVER_XF86_VIDEO_CIRRUS_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-dummy/Config.in b/package.bak/x11r7/xdriver_xf86-video-dummy/Config.in deleted file mode 100644 index 00f7e1df40..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-dummy/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY - bool "xf86-video-dummy" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for dummy cards diff --git a/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash b/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash deleted file mode 100644 index f26ddd4b5f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002751.html -sha256 3712bb869307233491e4c570732d6073c0dc3d99adfdb9977396a3fdf84e95b9 xf86-video-dummy-0.3.8.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk deleted file mode 100644 index fff1495ef5..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-dummy -# -################################################################################ - -XDRIVER_XF86_VIDEO_DUMMY_VERSION = 0.3.8 -XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT -XDRIVER_XF86_VIDEO_DUMMY_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-fbdev/Config.in b/package.bak/x11r7/xdriver_xf86-video-fbdev/Config.in deleted file mode 100644 index 9f7c5402b8..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbdev/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV - bool "xf86-video-fbdev" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - video driver for framebuffer device diff --git a/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash b/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash deleted file mode 100644 index 0f34e5178e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002324.html -sha256 9dd4b326498223abbfdf786089a46ea3db4fa6bbd341308eb48a9e00bc3fd51b xf86-video-fbdev-0.4.4.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk deleted file mode 100644 index 7d08c7da18..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-fbdev -# -################################################################################ - -XDRIVER_XF86_VIDEO_FBDEV_VERSION = 0.4.4 -XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT -XDRIVER_XF86_VIDEO_FBDEV_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch b/package.bak/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch deleted file mode 100644 index 8b4e817bf2..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbturbo/0001-sunxi_x_g2d-drop-unused-dri2-include.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 232c5b6924652f65ef5c047754e84b87b5fc6ac8 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Sat, 3 Oct 2015 19:01:38 +0200 -Subject: [PATCH] sunxi_x_g2d: drop unused dri2 include - -The driver doesn't use DRI for anything. - -[Upstream-status: submitted (https://github.com/ssvb/xf86-video-fbturbo/pull/45)] -Signed-off-by: Peter Korsgaard ---- - src/sunxi_x_g2d.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/sunxi_x_g2d.c b/src/sunxi_x_g2d.c -index d826027..8888abe 100644 ---- a/src/sunxi_x_g2d.c -+++ b/src/sunxi_x_g2d.c -@@ -31,7 +31,6 @@ - #include "xf86_OSproc.h" - #include "xf86.h" - #include "xf86drm.h" --#include "dri2.h" - #include "damage.h" - #include "fb.h" - #include "gcstruct.h" --- -2.1.4 - diff --git a/package.bak/x11r7/xdriver_xf86-video-fbturbo/Config.in b/package.bak/x11r7/xdriver_xf86-video-fbturbo/Config.in deleted file mode 100644 index 7825901e98..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbturbo/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBTURBO - bool "xf86-video-fbturbo" - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_LIBUMP - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - help - video driver, primarily optimized for the devices powered - by the Allwinner SoC (A10, A13, A20). It can use some of - the 2D/3D hardware acceleration features. - - https://github.com/ssvb/xf86-video-fbturbo diff --git a/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash b/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash deleted file mode 100644 index 0370216283..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 10411686de0a9d8b2cde300b0d68e9f1d22e3611470d357ef3afc337f123ca0f xdriver_xf86-video-fbturbo-0.4.0.tar.gz diff --git a/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk deleted file mode 100644 index 15f4cd1093..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-fbturbo -# -################################################################################ - -XDRIVER_XF86_VIDEO_FBTURBO_VERSION = 0.4.0 -XDRIVER_XF86_VIDEO_FBTURBO_SITE = $(call github,ssvb,xf86-video-fbturbo,$(XDRIVER_XF86_VIDEO_FBTURBO_VERSION)) -XDRIVER_XF86_VIDEO_FBTURBO_LICENSE = MIT -XDRIVER_XF86_VIDEO_FBTURBO_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES = \ - xserver_xorg-server \ - libdrm \ - pixman \ - xproto_fontsproto \ - xproto_randrproto \ - xproto_renderproto \ - xproto_videoproto \ - xproto_xproto \ - xproto_xf86driproto - -ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y) -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libpciaccess -XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --enable-pciaccess -else -XDRIVER_XF86_VIDEO_FBTURBO_CONF_OPTS += --disable-pciaccess -endif - -ifeq ($(BR2_PACKAGE_LIBUMP),y) -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump -endif - -ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) -XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += xproto_dri2proto -endif - -define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE - $(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf -endef - -XDRIVER_XF86_VIDEO_FBTURBO_POST_INSTALL_TARGET_HOOKS += XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-geode/Config.in b/package.bak/x11r7/xdriver_xf86-video-geode/Config.in deleted file mode 100644 index 0b45fb165d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-geode/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE - bool "xf86-video-geode" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - depends on BR2_i386 - help - video driver for geode device diff --git a/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash b/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash deleted file mode 100644 index 8c567cbb3d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002750.html -sha256 c6694c21ee3d9560f6e925925ef1d3818b1988e899b6a0592dbae597c87ac97e xf86-video-geode-2.11.19.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk deleted file mode 100644 index 9138abdbee..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-geode -# -################################################################################ - -XDRIVER_XF86_VIDEO_GEODE_VERSION = 2.11.19 -XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT -XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-glide/Config.in b/package.bak/x11r7/xdriver_xf86-video-glide/Config.in deleted file mode 100644 index 413acce02c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glide/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLIDE - bool "xf86-video-glide" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - depends on BROKEN # needs glide library from http://glide.sourceforge.net/ - help - video driver for glide device diff --git a/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash b/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash deleted file mode 100644 index e5b344afca..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-September/002323.html -sha256 9eb04477ee559cd114917936916303f4ded95695163fae1cc10058d2a7d94aed xf86-video-glide-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk b/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk deleted file mode 100644 index 3518789148..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glide/xdriver_xf86-video-glide.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-glide -# -################################################################################ - -XDRIVER_XF86_VIDEO_GLIDE_VERSION = 1.2.2 -XDRIVER_XF86_VIDEO_GLIDE_SOURCE = xf86-video-glide-$(XDRIVER_XF86_VIDEO_GLIDE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GLIDE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLIDE_LICENSE = MIT -XDRIVER_XF86_VIDEO_GLIDE_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLIDE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-glint/Config.in b/package.bak/x11r7/xdriver_xf86-video-glint/Config.in deleted file mode 100644 index acae30b0b0..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glint/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT - bool "xf86-video-glint" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - GLINT/Permedia video driver - -comment "xf86-video-glint needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash b/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash deleted file mode 100644 index f4e42bf4c6..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002759.html -sha256 852833ab2ea9ce519195dfd061a6c7aa5945a093cdc19546d1e9e69df7d577d2 xf86-video-glint-1.2.9.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk deleted file mode 100644 index 52bc567e59..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-glint -# -################################################################################ - -XDRIVER_XF86_VIDEO_GLINT_VERSION = 1.2.9 -XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT -XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch b/package.bak/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch deleted file mode 100644 index 40bb1ea2bd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-i128/0001-mbstring.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c87753733a6e1f85d1d037dced0b47ce0cf41658 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:54:40 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-i128/commit/?id=c87753733a6e1f85d1d037dced0b47ce0cf41658 - -Signed-off-by: Bernd Kuhls - -diff --git a/src/i128_driver.c b/src/i128_driver.c -index a0f08c0..51a4135 100644 ---- a/src/i128_driver.c -+++ b/src/i128_driver.c -@@ -50,8 +50,6 @@ - /* All drivers initialising the SW cursor need this */ - #include "mipointer.h" - --/* All drivers implementing backing store need this */ --#include "mibstore.h" - #include "micmap.h" - - #include "xf86DDC.h" -@@ -1556,7 +1554,6 @@ I128ScreenInit(SCREEN_INIT_ARGS_DECL) - return FALSE; - } - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package.bak/x11r7/xdriver_xf86-video-i128/Config.in b/package.bak/x11r7/xdriver_xf86-video-i128/Config.in deleted file mode 100644 index 30b240cc1f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-i128/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128 - bool "xf86-video-i128" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Number 9 I128 video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash b/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash deleted file mode 100644 index 9600c4565f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002012.html -sha256 f8827e4c988f90cf5a677554b30d61f0a07eb86d872478751cdc94dc17452b9c xf86-video-i128-1.3.6.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk deleted file mode 100644 index 1bb760cee3..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-i128 -# -################################################################################ - -XDRIVER_XF86_VIDEO_I128_VERSION = 1.3.6 -XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_I128_LICENSE = MIT -XDRIVER_XF86_VIDEO_I128_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch b/package.bak/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch deleted file mode 100644 index 2117e725cd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx-viv/0001-Stop-using-Git-to-write-local-version.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 69a92f4576a1e789ba2fcf957164d2c4013020c5 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Wed, 2 Dec 2015 13:36:25 +0000 -Subject: [PATCH] Stop using Git to write local version -Organization: O.S. Systems Software LTDA. - -The standard version does not use a Git repository so we should not -use Git to identify the commit of the build as it can end getting the -version from a wrong repository and can be misleading. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador -[Downloaded from -https://github.com/Freescale/meta-fsl-arm/blob/master/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/Stop-using-Git-to-write-local-version.patch] -Signed-off-by: Andrew Webster ---- - EXA/src/makefile.tc | 6 +++--- - FslExt/src/makefile.tc | 6 +++--- - util/autohdmi/makefile.tc | 6 +++--- - util/pandisplay/makefile.tc | 6 +++--- - 4 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/EXA/src/makefile.tc b/EXA/src/makefile.tc -index 0b9a9e6..ec6e68d 100644 ---- a/EXA/src/makefile.tc -+++ b/EXA/src/makefile.tc -@@ -52,8 +52,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/FslExt/src/makefile.tc b/FslExt/src/makefile.tc -index 0b9a9e6..ec6e68d 100644 ---- a/FslExt/src/makefile.tc -+++ b/FslExt/src/makefile.tc -@@ -52,8 +52,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/util/autohdmi/makefile.tc b/util/autohdmi/makefile.tc -index c9de0a6..d0a468c 100644 ---- a/util/autohdmi/makefile.tc -+++ b/util/autohdmi/makefile.tc -@@ -64,8 +64,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - -diff --git a/util/pandisplay/makefile.tc b/util/pandisplay/makefile.tc -index 28732b9..bf54c20 100644 ---- a/util/pandisplay/makefile.tc -+++ b/util/pandisplay/makefile.tc -@@ -64,8 +64,8 @@ prefix ?= /usr - sysroot ?= / - - # get git commit number --COMMITNR := `git log -n 1 --format=%H` --DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` --LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" -+#COMMITNR := `git log -n 1 --format=%H` -+#DIRTY := `git diff-index --quiet HEAD || echo '-dirty'` -+#LOCAL_CFLAGS += -DCOMMIT="${COMMITNR}${DIRTY}" - - --- -2.1.4 - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package.bak/x11r7/xdriver_xf86-video-imx-viv/Config.in deleted file mode 100644 index fb64d06524..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ /dev/null @@ -1,33 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV - bool "xf86-video-imx-viv" - depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - help - X.Org driver for iMX6 GPU (Vivante) - - Notice EGL and GLes2 APIs are correctly supported. This driver should - also be able to provide Desktop OpenGL implementation but, this - feature seems broken since quite some time. - - To use this driver, add correct configuration to your - /etc/X11/xorg.conf: - - Section "Device" - [...] - Driver "vivante" - Option "vivante_fbdev" "/dev/fbX" - EndSection - - Don't forget to load galcore.ko and create /dev/galcore before using - this driver (else, Xorg will exit with an obscur message like - "Segmentation fault at address 0xc"). - -comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" - depends on BR2_arm - depends on !BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 - depends on BR2_TOOLCHAIN_HAS_SYNC_1 diff --git a/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash b/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash deleted file mode 100644 index 7d7da84e6b..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.hash +++ /dev/null @@ -1 +0,0 @@ -sha256 3eed38193e31bb5ba8d2c817bd9b4f6e2fe7540d2cab36de9098cb4f11946a9f xserver-xorg-video-imx-viv-5.0.11.p8.6.tar.gz diff --git a/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk deleted file mode 100644 index 2a3e99745a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk +++ /dev/null @@ -1,36 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-imx-viv -# -################################################################################ - -XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = 5.0.11.p8.6 -XDRIVER_XF86_VIDEO_IMX_VIV_SITE = $(FREESCALE_IMX_SITE) -XDRIVER_XF86_VIDEO_IMX_VIV_SOURCE = xserver-xorg-video-imx-viv-$(XDRIVER_XF86_VIDEO_IMX_VIV_VERSION).tar.gz -XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv xserver_xorg-server \ - xproto_xproto xproto_xf86driproto libdrm -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT -XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT -XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES -XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD = $(TARGET_CONFIGURE_OPTS) $(MAKE1) -C $(@D)/EXA/src -f makefile.linux - -define XDRIVER_XF86_VIDEO_IMX_VIV_BUILD_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) sysroot=$(STAGING_DIR) \ - BUSID_HAS_NUMBER=1 BUILD_IN_YOCTO=1 XSERVER_GREATER_THAN_13=1 \ - CFLAGS="$(TARGET_CFLAGS) -I$(@D)/DRI_1.10.4/src" -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(STAGING_DIR)/usr install - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_priv.h \ - $(STAGING_DIR)/usr/include/vivante_priv.h - $(INSTALL) -D -m 644 $(@D)/EXA/src/vivante_gal/vivante_gal.h \ - $(STAGING_DIR)/usr/include/vivante_gal.h -endef - -define XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_TARGET_CMDS - $(XDRIVER_XF86_VIDEO_IMX_VIV_MAKE_CMD) prefix=$(TARGET_DIR)/usr install -endef - -$(eval $(generic-package)) - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch deleted file mode 100644 index 05be6b32ac..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0001-Update-to-newer-swap-macros.patch +++ /dev/null @@ -1,65 +0,0 @@ -From fc7f191a1a0f290a4e808dd8f9bd58ba1dbd2be4 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Sat, 29 Dec 2012 18:00:36 -0200 -Subject: [PATCH 1/2] ext: Update to newer swap macros - -The swap macros now use an internal temporary variable so we need to -adapt the code according. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - src/imx_ext.c | 16 ++++++---------- - 1 file changed, 6 insertions(+), 10 deletions(-) - -diff --git a/src/imx_ext.c b/src/imx_ext.c -index f12469a..710cba4 100644 ---- a/src/imx_ext.c -+++ b/src/imx_ext.c -@@ -57,8 +57,6 @@ void imxExtInit() - static int - Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) - { -- int n; -- - REQUEST(xIMX_EXT_GetPixmapPhysAddrReq); - REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq); - -@@ -96,10 +94,10 @@ Proc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) - /* Check if any reply values need byte swapping */ - if (client->swapped) { - -- swaps(&rep.sequenceNumber, n); -- swapl(&rep.length, n); -- swapl(&rep.pixmapPhysAddr, n); -- swapl(&rep.pixmapPitch, n); -+ swaps(&rep.sequenceNumber); -+ swapl(&rep.length); -+ swapl(&rep.pixmapPhysAddr); -+ swapl(&rep.pixmapPitch); - } - - /* Reply to client */ -@@ -123,16 +121,14 @@ Proc_IMX_EXT_Dispatch(ClientPtr client) - static int - SProc_IMX_EXT_GetPixmapPhysAddr(ClientPtr client) - { -- int n; -- - REQUEST(xIMX_EXT_GetPixmapPhysAddrReq); - - /* Swap request message length and verify it is correct. */ -- swaps(&stuff->length, n); -+ swaps(&stuff->length); - REQUEST_SIZE_MATCH(xIMX_EXT_GetPixmapPhysAddrReq); - - /* Swap remaining request message parameters. */ -- swapl(&stuff->pixmap, n); -+ swapl(&stuff->pixmap); - - return Proc_IMX_EXT_GetPixmapPhysAddr(client); - } --- -1.7.10.4 - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch deleted file mode 100644 index 6a2fcdf44e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0002-Fix-error-unknown-type-name-uint.patch +++ /dev/null @@ -1,33 +0,0 @@ -From ccdfce5e75ba707deacdd5808a8f3de8744848d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Eric=20B=C3=A9nard?= -Date: Tue, 5 Feb 2013 10:57:47 +0100 -Subject: [PATCH] Fix "error: unknown type name 'uint'" -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -In file included from imx_driver.c:33:0: -.../sysroots/imx53qsb/usr/src/kernel/include/linux/mxcfb.h:107:2: error: unknown type name 'uint' - -Upstream-Status: Pending - -Signed-off-by: Eric Bénard ---- - src/imx_driver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/imx_driver.c b/src/imx_driver.c -index f4b3e38..4cf662d 100644 ---- a/src/imx_driver.c -+++ b/src/imx_driver.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - #include - #include - --- -1.7.10.4 - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch deleted file mode 100644 index 3b1b84d1cd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0003-support-glibc-2.20.patch +++ /dev/null @@ -1,57 +0,0 @@ -Fix build errors seen with glibc 2.20 - -/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/imx53qsb/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - ^ - -Signed-off-by: Khem Raj -Upstream-Status: Pending -Index: xserver-xorg-video-imx-11.09.01/src/imx_accel.c -=================================================================== ---- xserver-xorg-video-imx-11.09.01.orig/src/imx_accel.c 2011-07-26 14:22:47.000000000 -0700 -+++ xserver-xorg-video-imx-11.09.01/src/imx_accel.c 2014-08-29 15:54:43.648070587 -0700 -@@ -21,6 +21,7 @@ - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -+#include - - #include - #include "xf86.h" -Index: xserver-xorg-video-imx-11.09.01/src/imx_exa_offscreen.c -=================================================================== ---- xserver-xorg-video-imx-11.09.01.orig/src/imx_exa_offscreen.c 2014-08-29 15:26:31.992070587 -0700 -+++ xserver-xorg-video-imx-11.09.01/src/imx_exa_offscreen.c 2014-08-29 15:54:54.632070587 -0700 -@@ -53,7 +53,7 @@ - * When allocating, the contiguous block of areas with the minimum eviction - * cost is found and evicted in order to make room for the new allocation. - */ -- -+#include - - #include "xf86.h" - #include "exa.h" -Index: xserver-xorg-video-imx-11.09.01/src/imx_exa_z160.c -=================================================================== ---- xserver-xorg-video-imx-11.09.01.orig/src/imx_exa_z160.c 2014-08-29 15:26:31.992070587 -0700 -+++ xserver-xorg-video-imx-11.09.01/src/imx_exa_z160.c 2014-08-29 15:54:36.056070587 -0700 -@@ -21,6 +21,7 @@ - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -+#include - - #include "xf86.h" - #include "xf86_OSproc.h" -Index: xserver-xorg-video-imx-11.09.01/src/imx_ext.c -=================================================================== ---- xserver-xorg-video-imx-11.09.01.orig/src/imx_ext.c 2014-08-29 15:26:32.064070587 -0700 -+++ xserver-xorg-video-imx-11.09.01/src/imx_ext.c 2014-08-29 15:55:18.048070587 -0700 -@@ -21,6 +21,7 @@ - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -+#include - - #include - #include diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch deleted file mode 100644 index 2ac6311fb1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-compatible.patch +++ /dev/null @@ -1,787 +0,0 @@ -From 5216cb0f14414b5451f58df48a36c1c62c035276 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Sat, 29 Dec 2012 18:02:11 -0200 -Subject: [PATCH] Make video API forward and backward compatible - -This updates the video API in a forward and backward compatible way -using the "compat-api.h" as used in Xorg maintained drivers. - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador ---- - src/compat-api.h | 106 +++++++++++++++++++++++++++++++++++++++++++++++ - src/imx_display.c | 22 +++++----- - src/imx_display.h | 8 ++-- - src/imx_driver.c | 60 ++++++++++++++------------- - src/imx_exa_offscreen.c | 12 +++--- - src/imx_exa_z160.c | 53 ++++++++++++------------ - src/imx_xv_ipu.c | 4 +- - 7 files changed, 188 insertions(+), 77 deletions(-) - create mode 100644 src/compat-api.h - -diff --git a/src/compat-api.h b/src/compat-api.h -new file mode 100644 -index 0000000..73ac8a2 ---- /dev/null -+++ b/src/compat-api.h -@@ -0,0 +1,106 @@ -+/* -+ * Copyright 2012 Red Hat, Inc. -+ * -+ * Permission is hereby granted, free of charge, to any person obtaining a -+ * copy of this software and associated documentation files (the "Software"), -+ * to deal in the Software without restriction, including without limitation -+ * the rights to use, copy, modify, merge, publish, distribute, sublicense, -+ * and/or sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following conditions: -+ * -+ * The above copyright notice and this permission notice (including the next -+ * paragraph) shall be included in all copies or substantial portions of the -+ * Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL -+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -+ * DEALINGS IN THE SOFTWARE. -+ * -+ * Author: Dave Airlie -+ */ -+ -+/* this file provides API compat between server post 1.13 and pre it, -+ it should be reused inside as many drivers as possible */ -+#ifndef COMPAT_API_H -+#define COMPAT_API_H -+ -+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR -+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum] -+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p -+#endif -+ -+#ifndef XF86_HAS_SCRN_CONV -+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum] -+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex] -+#endif -+ -+#ifndef XF86_SCRN_INTERFACE -+ -+#define SCRN_ARG_TYPE int -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)] -+ -+#define SCREEN_ARG_TYPE int -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)] -+ -+#define SCREEN_INIT_ARGS_DECL int index, ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen -+#define CLOSE_SCREEN_DECL_ScrnInfoPtr ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ -+#define FBDEVHWADJUSTFRAME_ARGS(x, y) scrnIndex, (x), (y), 0 -+ -+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags -+ -+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags -+ -+#define FREE_SCREEN_ARGS_DECL int arg, int flags -+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0 -+ -+#define VT_FUNC_ARGS_DECL int arg, int flags -+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags) -+ -+#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn->scrnIndex, b -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex) -+#else -+#define SCRN_ARG_TYPE ScrnInfoPtr -+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1) -+ -+#define SCREEN_ARG_TYPE ScreenPtr -+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1) -+ -+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv -+ -+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask -+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask -+ -+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen -+#define CLOSE_SCREEN_ARGS pScreen -+#define CLOSE_SCREEN_DECL_ScrnInfoPtr ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ -+#define FBDEVHWADJUSTFRAME_ARGS(x, y) pScrn, (x), (y) -+ -+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y -+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode -+ -+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg -+#define FREE_SCREEN_ARGS(x) (x) -+ -+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg -+#define VT_FUNC_ARGS(flags) pScrn -+ -+#define ENABLE_DISABLE_FB_ACCESS_ARGS(pScrn, b) pScrn, b -+ -+#define XF86_ENABLEDISABLEFB_ARG(x) (x) -+ -+#endif -+ -+#endif -diff --git a/src/imx_display.c b/src/imx_display.c -index fcb8195..e2dc36a 100644 ---- a/src/imx_display.c -+++ b/src/imx_display.c -@@ -42,6 +42,8 @@ - #include "imx.h" - #include "imx_display.h" - -+#include "compat-api.h" -+ - #include - - #if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,7,6,0,0) -@@ -1373,19 +1375,19 @@ imxDisplayPreInit(ScrnInfoPtr pScrn) - Bool - imxDisplayStartScreenInit(int scrnIndex, ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr fPtr = IMXPTR(pScrn); - - if (!xf86SetDesiredModes(pScrn)) { - -- xf86DrvMsg(scrnIndex, X_ERROR, "mode initialization failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n"); - return FALSE; - } - - #if 0 - if (!fbdevHWModeInit(pScrn, pScrn->currentMode)) { - -- xf86DrvMsg(scrnIndex, X_ERROR, "mode initialization failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "mode initialization failed\n"); - return FALSE; - } - pScrn->displayWidth = -@@ -1463,29 +1465,29 @@ imxDisplayFinishScreenInit(int scrnIndex, ScreenPtr pScreen) - /* -------------------------------------------------------------------- */ - - Bool --imxDisplaySwitchMode(int scrnIndex, DisplayModePtr mode, int flags) -+imxDisplaySwitchMode(SWITCH_MODE_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetSingleMode(pScrn, mode, RR_Rotate_0); - } - - void --imxDisplayAdjustFrame(int scrnIndex, int x, int y, int flags) -+imxDisplayAdjustFrame(ADJUST_FRAME_ARGS_DECL) - { --// fbdevHWAdjustFrame(scrnIndex, x, y, flags); -+// fbdevHWAdjustFrame(pScrn->scrnIndex, x, y, flags); - } - - Bool --imxDisplayEnterVT(int scrnIndex, int flags) -+imxDisplayEnterVT(VT_FUNC_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - return xf86SetDesiredModes(pScrn); - } - - void --imxDisplayLeaveVT(int scrnIndex, int flags) -+imxDisplayLeaveVT(VT_FUNC_ARGS_DECL) - { - } - -diff --git a/src/imx_display.h b/src/imx_display.h -index 4a5d5aa..3a3d43a 100644 ---- a/src/imx_display.h -+++ b/src/imx_display.h -@@ -59,16 +59,16 @@ imxDisplayValidMode(int scrnIndex, DisplayModePtr mode, - Bool verbose, int flags); - - extern Bool --imxDisplaySwitchMode(int scrnIndex, DisplayModePtr mode, int flags); -+imxDisplaySwitchMode(SWITCH_MODE_ARGS_DECL); - - extern void --imxDisplayAdjustFrame(int scrnIndex, int x, int y, int flags); -+imxDisplayAdjustFrame(ADJUST_FRAME_ARGS_DECL); - - extern Bool --imxDisplayEnterVT(int scrnIndex, int flags); -+imxDisplayEnterVT(VT_FUNC_ARGS_DECL); - - extern void --imxDisplayLeaveVT(int scrnIndex, int flags); -+imxDisplayLeaveVT(VT_FUNC_ARGS_DECL); - - extern Bool - imxDisplayChangeFrameBufferRotateEPDC(int scrnIndex, int fbRotate); -diff --git a/src/imx_driver.c b/src/imx_driver.c -index 178e36e..f4b3e38 100644 ---- a/src/imx_driver.c -+++ b/src/imx_driver.c -@@ -46,6 +46,8 @@ - #include "fb.h" - #include "fbdevhw.h" - -+#include "compat-api.h" -+ - #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 - #include "xf86Resources.h" - #include "xf86RAC.h" -@@ -435,17 +437,17 @@ errorPreInit: - } - - static void --imxFreeScreen(int scrnIndex, int flags) -+imxFreeScreen(FREE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ SCRN_INFO_PTR(arg); - - imxFreeRec(pScrn); - } - - static Bool --imxCloseScreen(int scrnIndex, ScreenPtr pScreen) -+imxCloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ CLOSE_SCREEN_DECL_ScrnInfoPtr; - ImxPtr fPtr = IMXPTR(pScrn); - - fbdevHWRestore(pScrn); -@@ -453,7 +455,7 @@ imxCloseScreen(int scrnIndex, ScreenPtr pScreen) - pScrn->vtSema = FALSE; - - pScreen->CloseScreen = fPtr->saveCloseScreen; -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - static int -@@ -488,9 +490,9 @@ LCM(a, b) - } - - static Bool --imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) -+imxScreenInit(SCREEN_INIT_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr fPtr = IMXPTR(pScrn); - VisualPtr visual; - int init_picture = 0; -@@ -514,7 +516,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* Map frame buffer memory */ - fPtr->fbMemoryBase = fbdevHWMapVidmem(pScrn); - if (NULL == fPtr->fbMemoryBase) { -- xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory" -+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory" - " failed\n"); - return FALSE; - } -@@ -558,7 +560,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - const int fbOffsetScreen2 = - IMX_ALIGN(fbMaxScreenSize, fbMaxAlignOffset); - fPtr->fbMemoryScreenReserve = fbMaxScreenSize; -- xf86DrvMsg(scrnIndex, X_INFO, -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "reserve %d bytes of frame buffer for screen\n", - fPtr->fbMemoryScreenReserve); - fPtr->fbMemoryStart2 = NULL; -@@ -568,12 +570,12 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - - fPtr->fbMemoryScreenReserve += fbOffsetScreen2; - -- xf86DrvMsg(scrnIndex, X_INFO, -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "reserve same number of bytes for XRandR rotated screen at offset %d\n", - fbOffsetScreen2); - } - -- if (!imxDisplayStartScreenInit(scrnIndex, pScreen)) { -+ if (!imxDisplayStartScreenInit(pScrn->scrnIndex, pScreen)) { - - return FALSE; - } -@@ -582,7 +584,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - miClearVisualTypes(); - if (pScrn->bitsPerPixel > 8) { - if (!miSetVisualTypes(pScrn->depth, TrueColorMask, pScrn->rgbBits, TrueColor)) { -- xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed" -+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed" - " for %d bits per pixel [1]\n", - pScrn->bitsPerPixel); - return FALSE; -@@ -591,14 +593,14 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) { -- xf86DrvMsg(scrnIndex,X_ERROR,"visual type setup failed" -+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"visual type setup failed" - " for %d bits per pixel [2]\n", - pScrn->bitsPerPixel); - return FALSE; - } - } - if (!miSetPixmapDepths()) { -- xf86DrvMsg(scrnIndex,X_ERROR,"pixmap depth setup failed\n"); -+ xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"pixmap depth setup failed\n"); - return FALSE; - } - -@@ -607,10 +609,10 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - has a padding which is independent from the depth (controlfb) */ - pScrn->displayWidth = fbdevHWGetLineLength(pScrn) / - (pScrn->bitsPerPixel / 8); -- xf86DrvMsg(scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth); -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "displayWidth = %d\n", pScrn->displayWidth); - - if (pScrn->displayWidth != pScrn->virtualX) { -- xf86DrvMsg(scrnIndex, X_INFO, -+ xf86DrvMsg(pScrn->scrnIndex, X_INFO, - "Pitch updated to %d after ModeInit\n", - pScrn->displayWidth); - } -@@ -633,7 +635,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - init_picture = 1; - break; - default: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: invalid number of bits per" - " pixel (%d) encountered in" - " imxScreenInit()\n", pScrn->bitsPerPixel); -@@ -644,7 +646,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - case FBDEVHW_INTERLEAVED_PLANES: - /* This should never happen ... - * we should check for this much much earlier ... */ -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: interleaved planes are not yet " - "supported by the imx driver\n"); - ret = FALSE; -@@ -652,20 +654,20 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - case FBDEVHW_TEXT: - /* This should never happen ... - * we should check for this much much earlier ... */ -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: text mode is not supported by the " - "imx driver\n"); - ret = FALSE; - break; - case FBDEVHW_VGA_PLANES: - /* Not supported yet */ -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: EGA/VGA Planes are not yet " - "supported by the imx driver\n"); - ret = FALSE; - break; - default: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: unrecognised hardware type (%d) " - "encountered in imxScreenInit()\n", type); - ret = FALSE; -@@ -699,7 +701,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* INIT ACCELERATION BEFORE INIT FOR BACKING STORE & SOFTWARE CURSOR */ - if (fPtr->useAccel) { - -- if (!imxExaZ160Setup(scrnIndex, pScreen)) { -+ if (!imxExaZ160Setup(pScrn->scrnIndex, pScreen)) { - - fPtr->useAccel = FALSE; - } -@@ -731,29 +733,29 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - /* XXX It would be simpler to use miCreateDefColormap() in all cases. */ - case FBDEVHW_PACKED_PIXELS: - if (!miCreateDefColormap(pScreen)) { -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: miCreateDefColormap failed " - "in imxScreenInit()\n"); - return FALSE; - } - break; - case FBDEVHW_INTERLEAVED_PLANES: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: interleaved planes are not yet " - "supported by the imx driver\n"); - return FALSE; - case FBDEVHW_TEXT: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: text mode is not supported by " - "the imx driver\n"); - return FALSE; - case FBDEVHW_VGA_PLANES: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: EGA/VGA planes are not yet " - "supported by the imx driver\n"); - return FALSE; - default: -- xf86DrvMsg(scrnIndex, X_ERROR, -+ xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "internal error: unrecognised imx hardware type " - "(%d) encountered in imxScreenInit()\n", type); - return FALSE; -@@ -782,7 +784,7 @@ imxScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) - } - #endif - -- if (!imxDisplayFinishScreenInit(scrnIndex, pScreen)) { -+ if (!imxDisplayFinishScreenInit(pScrn->scrnIndex, pScreen)) { - return FALSE; - } - -@@ -810,7 +812,7 @@ IMXGetPixmapProperties( - } - - /* Access screen associated with this pixmap. */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Check if the screen associated with this pixmap has IMX driver. */ - if (0 != strcmp(IMX_DRIVER_NAME, pScrn->driverName)) { -diff --git a/src/imx_exa_offscreen.c b/src/imx_exa_offscreen.c -index 3a5c24d..0fbe2fc 100644 ---- a/src/imx_exa_offscreen.c -+++ b/src/imx_exa_offscreen.c -@@ -79,7 +79,7 @@ static void - imxExaOffscreenValidate (ScreenPtr pScreen) - { - /* Access the driver specific data. */ -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - ExaOffscreenArea *prev = 0, *area; -@@ -135,7 +135,7 @@ imxExaOffscreenMerge (ImxExaPtr imxExaPtr, ExaOffscreenArea *area) - ExaOffscreenArea * - imxExaOffscreenFree (ScreenPtr pScreen, ExaOffscreenArea *area) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - ExaOffscreenArea *next = area->next; -@@ -281,7 +281,7 @@ imxExaOffscreenAlloc (ScreenPtr pScreen, int size, int align, - pointer privData) - { - ExaOffscreenArea *area; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - int real_size = 0, largest_avail = 0; -@@ -418,7 +418,7 @@ imxExaOffscreenSwapIn (ScreenPtr pScreen) - Bool - imxExaOffscreenInit (ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - ExaOffscreenArea *area; -@@ -453,7 +453,7 @@ imxExaOffscreenInit (ScreenPtr pScreen) - void - imxExaOffscreenFini (ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - ExaOffscreenArea *area; -@@ -472,7 +472,7 @@ imxExaOffscreenFini (ScreenPtr pScreen) - void - imxExaOffscreenSwapOut (ScreenPtr pScreen) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaPtr imxExaPtr = IMXEXAPTR(imxPtr); - -diff --git a/src/imx_exa_z160.c b/src/imx_exa_z160.c -index fb718e0..3d0bc96 100644 ---- a/src/imx_exa_z160.c -+++ b/src/imx_exa_z160.c -@@ -32,6 +32,7 @@ - #include - #include - -+#include "compat-api.h" - - /* Set if handles pixmap allocation and migration, i.e, EXA_HANDLES_PIXMAPS */ - #define IMX_EXA_ENABLE_HANDLES_PIXMAPS \ -@@ -299,7 +300,7 @@ imxExaZ160GetPixmapAddress(PixmapPtr pPixmap) - return fPixmapPtr->ptr; - #else - /* Access screen associated with this pixmap. */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -344,7 +345,7 @@ imxExaZ160GetPixmapProperties( - #else - - /* Access screen associated with this pixmap. */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Make sure pixmap is in framebuffer */ - if (!exaDrawableIsOffscreen(&(pPixmap->drawable))) { -@@ -856,7 +857,7 @@ imxExaZ160SyncIfBusyPixmap(PixmapPtr pPixmap) - { - /* Access screen associated with this pixmap. */ - ScreenPtr pScreen = pPixmap->drawable.pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - /* Access driver specific data for screen. */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -924,7 +925,7 @@ imxExaZ160CreatePixmap2(ScreenPtr pScreen, int width, int height, - } - - /* Access the driver specific data. */ -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaZ160Ptr fPtr = IMXEXAZ160PTR(imxPtr); - -@@ -1028,7 +1029,7 @@ imxExaZ160DestroyPixmap(ScreenPtr pScreen, void *driverPriv) - ImxExaPixmapPtr fPixmapPtr = (ImxExaPixmapPtr)driverPriv; - - /* Access the driver specific data. */ -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - ImxExaZ160Ptr fPtr = IMXEXAZ160PTR(imxPtr); - -@@ -1068,7 +1069,7 @@ imxExaZ160ModifyPixmapHeader(PixmapPtr pPixmap, int width, int height, - } - - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1194,7 +1195,7 @@ imxExaZ160TrackBusyPixmap(ImxExaZ160Ptr fPtr, PixmapPtr pPixmap) - static void - imxExaZ160WaitMarker(ScreenPtr pScreen, int marker) - { -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - /* Access driver specific data associated with the screen. */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1249,7 +1250,7 @@ imxExaZ160PrepareSolid(PixmapPtr pPixmap, int alu, Pixel planemask, Pixel fg) - } - - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1352,7 +1353,7 @@ static void - imxExaZ160Solid(PixmapPtr pPixmap, int x1, int y1, int x2, int y2) - { - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1423,7 +1424,7 @@ static void - imxExaZ160DoneSolid(PixmapPtr pPixmap) - { - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmap->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmap->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1485,7 +1486,7 @@ imxExaZ160PrepareCopy( - } - - /* Access the screen associated with this pixmap. */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1599,7 +1600,7 @@ static void - imxExaZ160Copy(PixmapPtr pPixmapDst, int srcX, int srcY, int dstX, int dstY, int width, int height) - { - /* Access screen associated with dst pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1661,7 +1662,7 @@ static void - imxExaZ160DoneCopy(PixmapPtr pPixmapDst) - { - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -1770,7 +1771,7 @@ imxExaZ160CheckComposite(int op, PicturePtr pPictureSrc, PicturePtr pPictureMask - } - - /* Access screen associated with dst pixmap (same screen as for src pixmap). */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Check the number of entities, and fail if it isn't one. */ - if (pScrn->numEntities != 1) { -@@ -1987,7 +1988,7 @@ imxExaZ160PrepareComposite( - { - /* Access screen associated with dst pixmap. */ - /* Should be same screen as for src pixmap. */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* NOTE - many preconditions already verified in CheckComposite. */ - -@@ -2196,7 +2197,7 @@ imxExaZ160Composite( - int height) - { - /* Access screen associated with dst pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -2275,7 +2276,7 @@ static void - imxExaZ160DoneComposite(PixmapPtr pPixmapDst) - { - /* Access screen associated with this pixmap */ -- ScrnInfoPtr pScrn = xf86Screens[pPixmapDst->drawable.pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pPixmapDst->drawable.pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -2323,7 +2324,7 @@ imxExaZ160UploadToScreen( - - /* Access screen associated with this pixmap */ - ScreenPtr pScreen = pPixmapDst->drawable.pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -2381,7 +2382,7 @@ imxExaZ160DownloadFromScreen( - - /* Access screen associated with this pixmap */ - ScreenPtr pScreen = pPixmapSrc->drawable.pScreen; -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - - /* Access driver specific data */ - ImxPtr imxPtr = IMXPTR(pScrn); -@@ -2412,9 +2413,9 @@ imxExaZ160DownloadFromScreen( - } - - Bool --imxExaZ160CloseScreen(int scrnIndex, ScreenPtr pScreen) -+imxExaZ160CloseScreen(CLOSE_SCREEN_ARGS_DECL) - { -- ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; -+ CLOSE_SCREEN_DECL_ScrnInfoPtr; - ImxPtr imxPtr = IMXPTR(pScrn); - - ImxExaZ160Ptr fPtr = IMXEXAZ160PTR(imxPtr); -@@ -2504,7 +2505,7 @@ imxExaZ160CloseScreen(int scrnIndex, ScreenPtr pScreen) - /* Install our CloseScreen function so that it gets called. */ - if (NULL != pScreen->CloseScreen) { - -- return (*pScreen->CloseScreen)(scrnIndex, pScreen); -+ return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS); - } - - return TRUE; -@@ -2514,7 +2515,7 @@ Bool - imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen) - { - /* Access the screen info and then private data structures. */ -- ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; -+ ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen); - ImxPtr imxPtr = IMXPTR(pScrn); - - /* Private data structure must not already be in use. */ -@@ -2582,7 +2583,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen) - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Initialize Z160 interfaces failed.\n"); -- imxExaZ160CloseScreen(scrnIndex, pScreen); -+ imxExaZ160CloseScreen(CLOSE_SCREEN_ARGS); - return FALSE; - } - -@@ -2592,7 +2593,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen) - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, - "Allocate EXA driver structure.\n"); -- imxExaZ160CloseScreen(scrnIndex, pScreen); -+ imxExaZ160CloseScreen(CLOSE_SCREEN_ARGS); - return FALSE; - } - -@@ -2657,7 +2658,7 @@ imxExaZ160Setup(int scrnIndex, ScreenPtr pScreen) - if (!exaDriverInit(pScreen, exaDriverPtr)) { - - xf86DrvMsg(pScrn->scrnIndex, X_ERROR, "EXA initialization failed.\n"); -- imxExaZ160CloseScreen(scrnIndex, pScreen); -+ imxExaZ160CloseScreen(CLOSE_SCREEN_ARGS); - return FALSE; - } - fPtr->imxExaRec.exaDriverPtr = exaDriverPtr; -diff --git a/src/imx_xv_ipu.c b/src/imx_xv_ipu.c -index a517742..fc8a827 100644 ---- a/src/imx_xv_ipu.c -+++ b/src/imx_xv_ipu.c -@@ -398,7 +398,7 @@ xf86XVFillKeyHelper1 (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes) - xRectangle *rects; - GCPtr gc; - -- if(!xf86Screens[pScreen->myNum]->vtSema) return; -+ if(!xf86ScreenToScrn(pScreen)->vtSema) return; - - gc = GetScratchGC(root->depth, pScreen); - pval[0] = key; -@@ -771,7 +771,7 @@ MXXVInitializeAdaptor - XF86VideoAdaptorPtr **pppAdaptor - ) - { -- ScreenPtr pScreen = screenInfo.screens[pScreenInfo->scrnIndex]; -+ ScreenPtr pScreen = xf86ScrnToScreen(pScreenInfo); - XF86VideoAdaptorPtr *ppAdaptor = NULL; - IMXPtr fPtr = IMXPTR(pScreenInfo); - int nAdaptor; --- -1.7.10.4 - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch deleted file mode 100644 index 64af7732ae..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5b348e7be67957f4be6fcfa4942128c04f6db905 Mon Sep 17 00:00:00 2001 -From: Adrian Alonso -Date: Thu, 4 Aug 2011 14:24:26 -0500 -Subject: [PATCH] xf86-video-imxfb: fix m4 hardcodded paths - -* Fix m4 macros lookup location; remove /usr/share/aclocal path - -Signed-off-by: Adrian Alonso ---- - Makefile.am | 2 +- - Makefile.in | 2 +- - configure.ac | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 6752256..e205657 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,4 +20,4 @@ - - AUTOMAKE_OPTIONS = foreign - SUBDIRS = src --ACLOCAL_AMFLAGS = -I /usr/share/aclocal -+ACLOCAL_AMFLAGS = -I m4 -diff --git a/Makefile.in b/Makefile.in -index 5c0ba0e..f829db7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -243,7 +243,7 @@ top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = foreign - SUBDIRS = src --ACLOCAL_AMFLAGS = -I /usr/share/aclocal -+ACLOCAL_AMFLAGS = -I m4 - all: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -diff --git a/configure.ac b/configure.ac -index a1ac73b..0078b86 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -29,7 +29,7 @@ AC_INIT([xf86-video-imx], - AC_CONFIG_SRCDIR([Makefile.am]) - AM_CONFIG_HEADER([config.h]) - AC_CONFIG_AUX_DIR(.) --AC_CONFIG_MACRO_DIR([/usr/share/aclocal]) -+AC_CONFIG_MACRO_DIR([m4]) - - AM_INIT_AUTOMAKE([dist-bzip2]) - --- -1.7.4.1 - diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch b/package.bak/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch deleted file mode 100644 index 14ccbbf98a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch +++ /dev/null @@ -1,34 +0,0 @@ -Fix building using new Xorg 1.14 - -mibstore functions are no longer supported. This patch removes them -from this driver, following the pattern in -http://patches.openembedded.org/patch/46133/ - -This checkin shows when/where the changes to the X server were made -that deleted the header mibstore.h and mentions the reasons. -http://lists.x.org/archives/xorg-devel/2012-September/033575.html - -Upstream-Status: Pending - -Signed-off-by: Otavio Salvador - -Index: xserver-xorg-video-imx-11.09.01/src/imx_driver.c -=================================================================== ---- xserver-xorg-video-imx-11.09.01.orig/src/imx_driver.c -+++ xserver-xorg-video-imx-11.09.01/src/imx_driver.c -@@ -37,7 +37,6 @@ - #include "xf86_OSproc.h" - - #include "mipointer.h" --#include "mibstore.h" - #include "micmap.h" - #include "colormapst.h" - #include "xf86cmap.h" -@@ -722,7 +721,6 @@ imxScreenInit(SCREEN_INIT_ARGS_DECL) - /* Initialize for X extensions. */ - imxExtInit(); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - - /* software cursor */ diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/Config.in b/package.bak/x11r7/xdriver_xf86-video-imx/Config.in deleted file mode 100644 index 398d49e1f0..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/Config.in +++ /dev/null @@ -1,32 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX - bool "xf86-video-imx" - depends on BR2_ARM_EABI # libz160 - depends on BR2_TOOLCHAIN_USES_GLIBC # libz160 - depends on BR2_LINUX_KERNEL # linux/mxcfb.h - depends on BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11 - select BR2_PACKAGE_LIBZ160 - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for iMX5 GPU - - To use this driver, add the correct configuration to your - /etc/X11/xorg.conf, as follows: - - Section "Device" - [...] - Driver "imx" - Option "fbdev" "/dev/fb0" - EndSection - -comment "xf86-video-imx needs an EABI toolchain w/ glibc" - depends on BR2_arm - depends on !BR2_ARM_EABI || !BR2_TOOLCHAIN_USES_GLIBC - -comment "xf86-video-imx needs gpu-amd-bin-mx51 with X11 output and a Linux kernel to be built" - depends on BR2_arm - depends on !BR2_LINUX_KERNEL || !BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11 diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash b/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash deleted file mode 100644 index e2a36c5563..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d7d85e9f13c6dd58addab89847f3a8a67f6382a54135c7978c9a95368af024d4 xserver-xorg-video-imx-11.09.01.tar.gz diff --git a/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk b/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk deleted file mode 100644 index 5684a6db18..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-imx -# -################################################################################ - -XDRIVER_XF86_VIDEO_IMX_VERSION = 11.09.01 -XDRIVER_XF86_VIDEO_IMX_SOURCE = xserver-xorg-video-imx-$(XDRIVER_XF86_VIDEO_IMX_VERSION).tar.gz -XDRIVER_XF86_VIDEO_IMX_SITE = $(FREESCALE_IMX_SITE) -XDRIVER_XF86_VIDEO_IMX_DEPENDENCIES = linux libz160 xserver_xorg-server \ - xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto \ - xproto_xf86dgaproto xproto_xproto -XDRIVER_XF86_VIDEO_IMX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include" - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-intel/Config.in b/package.bak/x11r7/xdriver_xf86-video-intel/Config.in deleted file mode 100644 index dc2fabf404..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-intel/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL - bool "xf86-video-intel" - depends on (BR2_i386 || BR2_x86_64) - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBDRM_INTEL - select BR2_PACKAGE_XLIB_LIBXRANDR - help - Intel video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package.bak/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk deleted file mode 100644 index 29228bbf77..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ /dev/null @@ -1,53 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-intel -# -################################################################################ - -XDRIVER_XF86_VIDEO_INTEL_VERSION = 9ac7a3370ab265d4cbdbbf3dc588af88c37048e1 -XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel -XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT -XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_INTEL_AUTORECONF = YES - -# -D_GNU_SOURCE fixes a getline-related compile error in src/sna/kgem.c -# We force -O2 regardless of the optimization level chosen by the user, -# as compiling this package is known to be broken with -Os. -XDRIVER_XF86_VIDEO_INTEL_CONF_ENV = \ - CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE -O2" - -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS = \ - --disable-xvmc \ - --enable-sna \ - --disable-glamor \ - --disable-xaa \ - --disable-dga \ - --disable-async-swap - -XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ - libdrm \ - libpciaccess \ - xlib_libXrandr \ - xproto_fontsproto \ - xproto_xproto \ - xserver_xorg-server - -# X.org server support for DRI depends on a Mesa3D DRI driver -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri --enable-dri1 -# quote from configure.ac: "UXA doesn't build without DRI2 headers" -ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri2 --enable-uxa -else -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri2 --disable-uxa -endif -ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri3 -else -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri3 -endif -else -XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch b/package.bak/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch deleted file mode 100644 index d27617606e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 -+++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 -@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo - AC_HEADER_STDC - - if test "$DRI" != no; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -+ if test "$cross_compiling" = "no" ; then -+ AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -+ AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -+ AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -- AC_CHECK_FILE([${sdkdir}/damage.h], -+ AC_CHECK_FILE([${sdkdir}/damage.h], - [have_damage_h="yes"], [have_damage_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package.bak/x11r7/xdriver_xf86-video-mach64/Config.in b/package.bak/x11r7/xdriver_xf86-video-mach64/Config.in deleted file mode 100644 index 82de826ad7..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mach64/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64 - bool "xf86-video-mach64" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - mach64 video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash b/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash deleted file mode 100644 index 43a7fa707e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002599.html -sha256 3e98985b6e044189efd42342862208f472881c25debf22230a1d54a96d71b41f xf86-video-mach64-6.9.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk deleted file mode 100644 index 599036033d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-mach64 -# -################################################################################ - -XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.5 -XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT -XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES -XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch b/package.bak/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch deleted file mode 100644 index 5707bd1b3a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mga/0001-misc-fixes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-mga-1.4.9/configure.ac.orig 2007-06-10 11:55:24.000000000 +0200 -+++ xf86-video-mga-1.4.9/configure.ac 2007-06-10 12:00:37.000000000 +0200 -@@ -77,12 +77,18 @@ - AC_HEADER_STDC - - if test "x$DRI" != xno; then -+ if test "$cross_compiling" = no; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package.bak/x11r7/xdriver_xf86-video-mga/Config.in b/package.bak/x11r7/xdriver_xf86-video-mga/Config.in deleted file mode 100644 index a504ec0c25..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mga/Config.in +++ /dev/null @@ -1,17 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA - bool "xf86-video-mga" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Matrox video driver - -comment "xf86-video-mga needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash b/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash deleted file mode 100644 index 0187e6fbb5..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002765.html -sha256 b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422 xf86-video-mga-1.6.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk deleted file mode 100644 index 065a68ea67..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-mga -# -################################################################################ - -XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.5 -XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver -XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT -XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES -XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-neomagic/Config.in b/package.bak/x11r7/xdriver_xf86-video-neomagic/Config.in deleted file mode 100644 index f8c8c47fce..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-neomagic/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC - bool "xf86-video-neomagic" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Neomagic video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash b/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash deleted file mode 100644 index fc830661b4..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002602.html -sha256 72f89396b10527549337cb72a7eafb1194cf140144f9236a94ad2becdf140bf2 xf86-video-neomagic-1.2.9.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk deleted file mode 100644 index cfd55361e7..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-neomagic -# -################################################################################ - -XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION = 1.2.9 -XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NEOMAGIC_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT -XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-nouveau/Config.in b/package.bak/x11r7/xdriver_xf86-video-nouveau/Config.in deleted file mode 100644 index 7e756e2107..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nouveau/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU - bool "xf86-video-nouveau" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_LIBDRM_NOUVEAU - select BR2_PACKAGE_XPROTO_DRI2PROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - help - Nouveau video driver - - http://nouveau.freedesktop.org - -comment "xf86-video-nouveau needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash deleted file mode 100644 index cfba3a00ba..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash +++ /dev/null @@ -1,4 +0,0 @@ -# Locally computed -sha256 6d9242ba139c3df7afefffb455573b52f4427920b978161c00483c64a6da47cb xf86-video-nouveau-1.0.13.tar.bz2 -# From http://www.linuxfromscratch.org/blfs/view/svn/x/x7driver.html#xorg-nouveau-driver -md5 2d7b2917ef18c6e97a6f3817c3e9387b xf86-video-nouveau-1.0.13.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk deleted file mode 100644 index 70a7d87991..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-nouveau -# -################################################################################ - -XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.13 -XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT -XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_NOUVEAU_DEPENDENCIES = \ - host-pkgconf \ - libdrm \ - xproto_dri2proto \ - xproto_randrproto \ - xproto_renderproto \ - xproto_videoproto \ - xproto_xextproto \ - xserver_xorg-server - -# xdriver_xf86-video-nouveau requires O_CLOEXEC -XDRIVER_XF86_VIDEO_NOUVEAU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-nv/Config.in b/package.bak/x11r7/xdriver_xf86-video-nv/Config.in deleted file mode 100644 index 8898f56729..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nv/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV - bool "xf86-video-nv" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - NVIDIA video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash b/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash deleted file mode 100644 index fe91307a62..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002761.html -sha256 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d xf86-video-nv-2.1.21.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk deleted file mode 100644 index 430ce4a1d1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-nv -# -################################################################################ - -XDRIVER_XF86_VIDEO_NV_VERSION = 2.1.21 -XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_NV_LICENSE = MIT -XDRIVER_XF86_VIDEO_NV_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-openchrome/Config.in b/package.bak/x11r7/xdriver_xf86-video-openchrome/Config.in deleted file mode 100644 index c970b9e252..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-openchrome/Config.in +++ /dev/null @@ -1,21 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME - bool "xf86-video-openchrome" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXCOMPOSITE - select BR2_PACKAGE_XLIB_LIBXVMC - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Openchrome, A free and Open Source video driver for the VIA/S3G - UniChrome and UniChrome Pro graphics chipsets. - - https://www.freedesktop.org/wiki/Openchrome/ - -comment "xf86-video-openchrome needs a DRI driver from mesa3d" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER diff --git a/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash deleted file mode 100644 index 2d29fae3a7..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/openchrome-devel/2016-July/002890.html -sha1 9c7ad349de6dd350252ccda8da56fa1e2a6afa32 xf86-video-openchrome-0.5.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk deleted file mode 100644 index 9ab032b6bc..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-openchrome -# -################################################################################ - -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.5.0 -XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver -XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT -XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE_FILES = COPYING - -XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \ - xserver_xorg-server \ - libdrm \ - xlib_libX11 \ - xlib_libXcomposite \ - xlib_libXvMC \ - xproto_fontsproto \ - xproto_glproto \ - xproto_randrproto \ - xproto_renderproto \ - xproto_xextproto \ - xproto_xf86driproto \ - xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-qxl/Config.in b/package.bak/x11r7/xdriver_xf86-video-qxl/Config.in deleted file mode 100644 index 967ecaf527..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-qxl/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL - bool "xf86-video-qxl" - depends on (BR2_i386 || BR2_x86_64) - select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_UDEV # for KMS - select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_SPICE_PROTOCOL - select BR2_PACKAGE_XLIB_LIBXFONT2 if !BR2_PACKAGE_XLIB_LIBXFONT - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - QEMU QXL paravirt video driver - - http://www.spice-space.org/page/XorgQXL diff --git a/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash b/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash deleted file mode 100644 index 7a09821084..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002753.html -sha256 b18682e04503c6326f7bf7190f3ee50a3d4d69758a2a3cc9af102a6b3f114c92 xf86-video-qxl-0.1.5.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk deleted file mode 100644 index f410f8e95f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk +++ /dev/null @@ -1,38 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-qxl -# -################################################################################ - -XDRIVER_XF86_VIDEO_QXL_VERSION = 0.1.5 -XDRIVER_XF86_VIDEO_QXL_SOURCE = xf86-video-qxl-$(XDRIVER_XF86_VIDEO_QXL_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_QXL_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_QXL_LICENSE = MIT -XDRIVER_XF86_VIDEO_QXL_LICENSE_FILES = COPYING - -XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \ - --enable-xspice=no - -XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \ - libpciaccess \ - spice-protocol \ - xproto_fontsproto \ - xproto_xproto \ - xserver_xorg-server - -# configure doesn't look for drm headers in the appropiate place, so help it -# libdrm is only useful with udev for KMS -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -XDRIVER_XF86_VIDEO_QXL_CONF_ENV += REQUIRED_MODULES=libdrm -XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += libdrm -else -XDRIVER_XF86_VIDEO_QXL_CONF_OPTS += --disable-kms -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) -XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont2 -else -XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES += xlib_libXfont -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-r128/0001-cross-compile.patch b/package.bak/x11r7/xdriver_xf86-video-r128/0001-cross-compile.patch deleted file mode 100644 index 7b2ebd4b80..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-r128/0001-cross-compile.patch +++ /dev/null @@ -1,50 +0,0 @@ -Fix cross-compile - -Original patch for DRI -http://git.buildroot.net/buildroot/commit/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128-cross-compile.patch?id=c0726391523da6a17ffa8e62681ffa0cc895da8e - -Signed-off-by: Paulius Zaleckas -(Added exa.h fix) -Signed-off-by: Bernd Kuhls - ---- a/configure.ac 2008-06-23 10:39:28.000000000 -0400 -+++ b/configure.ac 2008-06-23 10:40:46.000000000 -0400 -@@ -85,14 +85,20 @@ sdkdir=$(pkg-config --variable=sdkdir xo - AC_HEADER_STDC - - if test "$DRI" != no; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -+ if test "$cross_compiling" = "no" ; then -+ AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -+ AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -+ AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -- AC_CHECK_FILE([${sdkdir}/damage.h], -+ AC_CHECK_FILE([${sdkdir}/damage.h], - [have_damage_h="yes"], [have_damage_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) -@@ -121,7 +127,12 @@ - AC_MSG_CHECKING([whether to enable EXA support]) - if test "x$EXA" = xyes; then - AC_MSG_RESULT(yes) -- AC_CHECK_FILE(${sdkdir}/exa.h, [have_exa_h="yes"], [have_exa_h="no"]) -+ if test "$cross_compiling" = "no" ; then -+ AC_CHECK_FILE(${sdkdir}/exa.h, -+ [have_exa_h="yes"], [have_exa_h="no"]) -+ else -+ have_exa_h="yes" -+ fi - else - AC_MSG_RESULT(no) - fi diff --git a/package.bak/x11r7/xdriver_xf86-video-r128/Config.in b/package.bak/x11r7/xdriver_xf86-video-r128/Config.in deleted file mode 100644 index 22ba4931e6..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-r128/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128 - bool "xf86-video-r128" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - R128 video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash b/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash deleted file mode 100644 index b6d8bd8197..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002764.html -sha256 84da21517f3af7617fdf341e84ccb22444d6cdab1647e4808fa631528b9a77de xf86-video-r128-6.10.2.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk deleted file mode 100644 index 344b48415c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-r128 -# -################################################################################ - -XDRIVER_XF86_VIDEO_R128_VERSION = 6.10.2 -XDRIVER_XF86_VIDEO_R128_SOURCE = xf86-video-r128-$(XDRIVER_XF86_VIDEO_R128_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_R128_LICENSE = MIT -XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES -XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch b/package.bak/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch deleted file mode 100644 index b9c296b6b5..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-savage/0001-cross-compile.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- a/configure.ac 2008-05-21 16:04:23.000000000 -0400 -+++ b/configure.ac 2008-06-23 11:41:50.000000000 -0400 -@@ -68,12 +68,18 @@ sdkdir=$(pkg-config --variable=sdkdir xo - AC_HEADER_STDC - - if test "$DRI" != no; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -- [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -- [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -- [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ if test "$cross_compiling" = "no" ; then -+ AC_CHECK_FILE([${sdkdir}/dri.h], -+ [have_dri_h="yes"], [have_dri_h="no"]) -+ AC_CHECK_FILE([${sdkdir}/sarea.h], -+ [have_sarea_h="yes"], [have_sarea_h="no"]) -+ AC_CHECK_FILE([${sdkdir}/dristruct.h], -+ [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package.bak/x11r7/xdriver_xf86-video-savage/Config.in b/package.bak/x11r7/xdriver_xf86-video-savage/Config.in deleted file mode 100644 index 77dde87619..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-savage/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE - bool "xf86-video-savage" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - S3 Savage video driver - -comment "xf86-video-savage needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash b/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash deleted file mode 100644 index 4f155359a1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002760.html -sha256 2c93c4db1f71e725dda0caee5821253129d4b52d7aa0fd720593e7769bceec86 xf86-video-savage-2.3.9.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk deleted file mode 100644 index ae1dea34ae..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-savage -# -################################################################################ - -XDRIVER_XF86_VIDEO_SAVAGE_VERSION = 2.3.9 -XDRIVER_XF86_VIDEO_SAVAGE_SOURCE = xf86-video-savage-$(XDRIVER_XF86_VIDEO_SAVAGE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SAVAGE_LICENSE = MIT -XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES -XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/Config.in b/package.bak/x11r7/xdriver_xf86-video-siliconmotion/Config.in deleted file mode 100644 index 727004a55a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SILICONMOTION - bool "xf86-video-siliconmotion" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Silicon Motion video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash b/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash deleted file mode 100644 index 819698c611..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002763.html -sha256 d0f3c691e71108d27a061beb62bf78b36ec35bd755905692734dd68cfb3359bc xf86-video-siliconmotion-1.7.9.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk deleted file mode 100644 index 53b19f9fea..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-siliconmotion -# -################################################################################ - -XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION = 1.7.9 -XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF86_VIDEO_SILICONMOTION_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE = MIT -XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto - -XDRIVER_XF86_VIDEO_SILICONMOTION_CONF_OPTS = --disable-selective-werror - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-sis/0001-cross.patch b/package.bak/x11r7/xdriver_xf86-video-sis/0001-cross.patch deleted file mode 100644 index 9e06480d40..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-sis/0001-cross.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- xf86-video-sis-0.9.3/configure.ac.orig 2007-06-10 21:00:29.000000000 +0200 -+++ xf86-video-sis-0.9.3/configure.ac 2007-06-10 21:00:45.000000000 +0200 -@@ -71,12 +71,18 @@ - AC_HEADER_STDC - - if test "$DRI" != no; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package.bak/x11r7/xdriver_xf86-video-sis/0003-xi.patch b/package.bak/x11r7/xdriver_xf86-video-sis/0003-xi.patch deleted file mode 100644 index 7905248163..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-sis/0003-xi.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fetch from: -https://projects.archlinux.org/svntogit/packages.git/commit/trunk?h=packages/xf86-video-sis&id=7aaa7a9786ce5654df877311909244e0a6c42fd1 - -Signed-off-by: Bernd Kuhls - ---- xf86-video-sis-0.10.7/src/sis_driver.c 2013-03-10 13:57:50.000000000 +0100 -+++ xf86-video-sis-0.10.7/src/sis_driver.c.new 2013-03-10 13:54:48.645203559 +0100 -@@ -9378,7 +9378,15 @@ - } - if(doit) { - sigstate = xf86BlockSIGIO(); --#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 -+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 18 -+ { -+ double dx = x, dy = y; -+ miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy, -+ NULL, NULL); -+ x = (int)dx; -+ y = (int)dy; -+ } -+#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 15 - { - double dx = x, dy = y; - miPointerSetPosition(inputInfo.pointer, Absolute, &dx, &dy); diff --git a/package.bak/x11r7/xdriver_xf86-video-sis/Config.in b/package.bak/x11r7/xdriver_xf86-video-sis/Config.in deleted file mode 100644 index 3c86bd403e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-sis/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS - bool "xf86-video-sis" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XINERAMAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - SiS and XGI video driver - -comment "xf86-video-sis needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash b/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash deleted file mode 100644 index 98ea8b1e4c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002756.html -sha256 5226b7407c601afa32d6cbf155f9182da95d92cdc89c1f83471e1927e552c10d xf86-video-sis-0.10.9.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk deleted file mode 100644 index 833246e35e..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-sis -# -################################################################################ - -XDRIVER_XF86_VIDEO_SIS_VERSION = 0.10.9 -XDRIVER_XF86_VIDEO_SIS_SOURCE = xf86-video-sis-$(XDRIVER_XF86_VIDEO_SIS_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT -XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES -XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch b/package.bak/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch deleted file mode 100644 index e53591bb0b..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xf86-video-tdfx-1.3.0/configure.ac.orig 2007-06-10 21:01:54.000000000 +0200 -+++ xf86-video-tdfx-1.3.0/configure.ac 2007-06-10 21:02:06.000000000 +0200 -@@ -67,13 +67,20 @@ - # Checks for header files. - AC_HEADER_STDC - --if test "$DRI" != no; then -+if test "x$DRI" != xno; then -+ if test "$cross_compiling" = "no" ; then - AC_CHECK_FILE([${sdkdir}/dri.h], - [have_dri_h="yes"], [have_dri_h="no"]) - AC_CHECK_FILE([${sdkdir}/sarea.h], - [have_sarea_h="yes"], [have_sarea_h="no"]) - AC_CHECK_FILE([${sdkdir}/dristruct.h], - [have_dristruct_h="yes"], [have_dristruct_h="no"]) -+ AC_CHECK_HEADER -+ else -+ have_dri_h="yes" -+ have_sarea_h="yes" -+ have_dristruct_h="yes" -+ fi - fi - - AC_MSG_CHECKING([whether to include DRI support]) diff --git a/package.bak/x11r7/xdriver_xf86-video-tdfx/Config.in b/package.bak/x11r7/xdriver_xf86-video-tdfx/Config.in deleted file mode 100644 index 96a69ba25c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tdfx/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX - bool "xf86-video-tdfx" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DRIPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - 3Dfx video driver - -comment "xf86-video-tdfx needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash deleted file mode 100644 index 84885596f6..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002755.html -sha256 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 xf86-video-tdfx-1.4.7.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk deleted file mode 100644 index 471e6cf4d2..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-tdfx -# -################################################################################ - -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.7 -XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT -XDRIVER_XF86_VIDEO_TDFX_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES -XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ - libdrm \ - xproto_fontsproto \ - xproto_randrproto \ - xproto_renderproto \ - xproto_videoproto \ - xproto_xextproto \ - xproto_xf86driproto \ - xproto_xproto \ - xserver_xorg-server - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS = --disable-dri -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch b/package.bak/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch deleted file mode 100644 index 07bcd04f25..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tga/0001-mibstore.patch +++ /dev/null @@ -1,47 +0,0 @@ -From b7022db0559cd1b6cd3eb6b5abf6896a607b478d Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Tue, 25 Sep 2012 12:55:00 +0000 -Subject: Remove mibstore.h - -Signed-off-by: Adam Jackson ---- -Fetch from: -http://cgit.freedesktop.org/xorg/driver/xf86-video-tga/commit/?id=b7022db0559cd1b6cd3eb6b5abf6896a607b478d - -Signed-off-by: Bernd Kuhls - -diff --git a/src/tga_accel.c b/src/tga_accel.c -index 35af1a4..b414df5 100644 ---- a/src/tga_accel.c -+++ b/src/tga_accel.c -@@ -37,7 +37,6 @@ - #include "xf86cmap.h" - #include "mipointer.h" - --#include "mibstore.h" - #include "miline.h" - - #include "tga_regs.h" -diff --git a/src/tga_driver.c b/src/tga_driver.c -index dd4f3e6..90d2660 100644 ---- a/src/tga_driver.c -+++ b/src/tga_driver.c -@@ -46,8 +46,6 @@ - - /* software cursor */ - #include "mipointer.h" --/* backing store */ --#include "mibstore.h" - - /* #include "mibank.h" */ - /* colormap manipulation */ -@@ -1451,7 +1449,6 @@ TGAScreenInit(SCREEN_INIT_ARGS_DECL) - - fbPictureInit (pScreen, 0, 0); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - --- -cgit v0.9.0.2-2-gbebe diff --git a/package.bak/x11r7/xdriver_xf86-video-tga/Config.in b/package.bak/x11r7/xdriver_xf86-video-tga/Config.in deleted file mode 100644 index 9d03db3b38..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tga/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA - bool "xf86-video-tga" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org driver for tga cards diff --git a/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash b/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash deleted file mode 100644 index a32fdc75a9..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-July/002025.html -sha256 2023818000200eb50a59476e36d59b07a361b110e73b1d9cc526beb669306131 xf86-video-tga-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk deleted file mode 100644 index 8af5ac81e1..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-tga -# -################################################################################ - -XDRIVER_XF86_VIDEO_TGA_VERSION = 1.2.2 -XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT -XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-trident/Config.in b/package.bak/x11r7/xdriver_xf86-video-trident/Config.in deleted file mode 100644 index 15ac3ea726..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-trident/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TRIDENT - bool "xf86-video-trident" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Trident video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash deleted file mode 100644 index 04a559ac5d..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk deleted file mode 100644 index 727744c532..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-trident -# -################################################################################ - -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT -XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-v4l/Config.in b/package.bak/x11r7/xdriver_xf86-video-v4l/Config.in deleted file mode 100644 index 27ffd87113..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-v4l/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L - bool "xf86-video-v4l" - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - depends on BROKEN # Fails to build with xorg xserver >= 1.17 - help - video4linux driver diff --git a/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash b/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash deleted file mode 100644 index c4bcfadc4b..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2008-March/000504.html -sha1 7f2212c529a5bcc34f67858a9d0167a0d4848aaa xf86-video-v4l-0.2.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk b/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk deleted file mode 100644 index 607b605f80..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-v4l/xdriver_xf86-video-v4l.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-v4l -# -################################################################################ - -XDRIVER_XF86_VIDEO_V4L_VERSION = 0.2.0 -XDRIVER_XF86_VIDEO_V4L_SOURCE = xf86-video-v4l-$(XDRIVER_XF86_VIDEO_V4L_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_V4L_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_V4L_LICENSE = MIT -XDRIVER_XF86_VIDEO_V4L_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_V4L_DEPENDENCIES = xserver_xorg-server xproto_randrproto xproto_videoproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-vesa/Config.in b/package.bak/x11r7/xdriver_xf86-video-vesa/Config.in deleted file mode 100644 index 98f434704f..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vesa/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA - bool "xf86-video-vesa" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Generic VESA video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash b/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash deleted file mode 100644 index 84c0b08a92..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-June/002615.html -sha256 7bddf4d879dd6f67088ecb203a31e12334aab980174bd0909930a21f32e251c1 xf86-video-vesa-2.3.4.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk deleted file mode 100644 index 1184821d9c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-vesa -# -################################################################################ - -XDRIVER_XF86_VIDEO_VESA_VERSION = 2.3.4 -XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT -XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-vmware/Config.in b/package.bak/x11r7/xdriver_xf86-video-vmware/Config.in deleted file mode 100644 index a3382d7346..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vmware/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE - bool "xf86-video-vmware" - depends on BR2_PACKAGE_MESA3D - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XINERAMAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - VMware SVGA video driver - -comment "xf86-video-vmware needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash deleted file mode 100644 index 8d948a7d4c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-November/002743.html -sha256 e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b xf86-video-vmware-13.2.1.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk deleted file mode 100644 index ef262f8942..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-vmware -# -################################################################################ - -XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.2.1 -XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT -XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-voodoo/Config.in b/package.bak/x11r7/xdriver_xf86-video-voodoo/Config.in deleted file mode 100644 index f531676dab..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-voodoo/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO - bool "xf86-video-voodoo" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - Voodoo video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package.bak/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk deleted file mode 100644 index e1ef0c6ca3..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-voodoo -# -################################################################################ - -XDRIVER_XF86_VIDEO_VOODOO_VERSION = 9172ae566a0e85313fc80ab62b4455393eefe593 -XDRIVER_XF86_VIDEO_VOODOO_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-voodoo -XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT -XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES -XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xdriver_xf86-video-wsfb/Config.in b/package.bak/x11r7/xdriver_xf86-video-wsfb/Config.in deleted file mode 100644 index 968ee10c8c..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-wsfb/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XDRIVER_XF86_VIDEO_WSFB - bool "xf86-video-wsfb" - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - depends on BROKEN # Fails to build. Actually this is OpenBSD/NetBSD stuff. - help - WSFB based chips video driver diff --git a/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash b/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash deleted file mode 100644 index 1258b719dd..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2012-January/001786.html -sha256 975ce3e5a063168ec6fe8f3fac50c30d0fae6cc6d81dc260f00bb4cb4f1a2843 xf86-video-wsfb-0.4.0.tar.bz2 diff --git a/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk b/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk deleted file mode 100644 index c2d7d4df3a..0000000000 --- a/package.bak/x11r7/xdriver_xf86-video-wsfb/xdriver_xf86-video-wsfb.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# xdriver_xf86-video-wsfb -# -################################################################################ - -XDRIVER_XF86_VIDEO_WSFB_VERSION = 0.4.0 -XDRIVER_XF86_VIDEO_WSFB_SOURCE = xf86-video-wsfb-$(XDRIVER_XF86_VIDEO_WSFB_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_WSFB_SITE = http://xorg.freedesktop.org/releases/individual/driver -XDRIVER_XF86_VIDEO_WSFB_LICENSE = MIT -XDRIVER_XF86_VIDEO_WSFB_LICENSE_FILES = COPYING -XDRIVER_XF86_VIDEO_WSFB_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_encodings/Config.in b/package.bak/x11r7/xfont_encodings/Config.in deleted file mode 100644 index d771ffb9cb..0000000000 --- a/package.bak/x11r7/xfont_encodings/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_ENCODINGS - bool "encodings" - select BR2_PACKAGE_XUTIL_UTIL_MACROS - help - No description available diff --git a/package.bak/x11r7/xfont_encodings/xfont_encodings.hash b/package.bak/x11r7/xfont_encodings/xfont_encodings.hash deleted file mode 100644 index 56c1ad2737..0000000000 --- a/package.bak/x11r7/xfont_encodings/xfont_encodings.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-October/001466.html -sha1 24ace2470403f85a0d393769204029bd8247992a encodings-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_encodings/xfont_encodings.mk b/package.bak/x11r7/xfont_encodings/xfont_encodings.mk deleted file mode 100644 index 9c5c9f30bf..0000000000 --- a/package.bak/x11r7/xfont_encodings/xfont_encodings.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# xfont_encodings -# -################################################################################ - -XFONT_ENCODINGS_VERSION = 1.0.4 -XFONT_ENCODINGS_SOURCE = encodings-$(XFONT_ENCODINGS_VERSION).tar.bz2 -XFONT_ENCODINGS_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_ENCODINGS_LICENSE = Public Domain -XFONT_ENCODINGS_LICENSE_FILES = COPYING - -XFONT_ENCODINGS_DEPENDENCIES = host-xapp_mkfontscale host-pkgconf xutil_util-macros -HOST_XFONT_ENCODINGS_DEPENDENCIES = \ - host-xapp_mkfontscale host-pkgconf host-xutil_util-macros - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xfont_font-adobe-100dpi/Config.in b/package.bak/x11r7/xfont_font-adobe-100dpi/Config.in deleted file mode 100644 index 766c06e74c..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-100dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ADOBE_100DPI - bool "font-adobe-100dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash b/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash deleted file mode 100644 index 04809f5dda..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 b2c08433eab5cb202470aa9f779efefce8d9cab2534f34f3aa4a31d05671c054 font-adobe-100dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk b/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk deleted file mode 100644 index 85a6884aee..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-100dpi/xfont_font-adobe-100dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-adobe-100dpi -# -################################################################################ - -XFONT_FONT_ADOBE_100DPI_VERSION = 1.0.3 -XFONT_FONT_ADOBE_100DPI_SOURCE = font-adobe-100dpi-$(XFONT_FONT_ADOBE_100DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ADOBE_100DPI_LICENSE = MIT -XFONT_FONT_ADOBE_100DPI_LICENSE_FILES = COPYING - -XFONT_FONT_ADOBE_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ADOBE_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ADOBE_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-adobe-75dpi/Config.in b/package.bak/x11r7/xfont_font-adobe-75dpi/Config.in deleted file mode 100644 index 1d79f416cc..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-75dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ADOBE_75DPI - bool "font-adobe-75dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash b/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash deleted file mode 100644 index abd48d6bb6..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 c6024a1e4a1e65f413f994dd08b734efd393ce0a502eb465deb77b9a36db4d09 font-adobe-75dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk b/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk deleted file mode 100644 index bb0a184322..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-75dpi/xfont_font-adobe-75dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-adobe-75dpi -# -################################################################################ - -XFONT_FONT_ADOBE_75DPI_VERSION = 1.0.3 -XFONT_FONT_ADOBE_75DPI_SOURCE = font-adobe-75dpi-$(XFONT_FONT_ADOBE_75DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ADOBE_75DPI_LICENSE = MIT -XFONT_FONT_ADOBE_75DPI_LICENSE_FILES = COPYING - -XFONT_FONT_ADOBE_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ADOBE_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ADOBE_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/Config.in b/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/Config.in deleted file mode 100644 index a31ee5dab6..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ADOBE_UTOPIA_100DPI - bool "font-adobe-utopia-100dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash b/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash deleted file mode 100644 index f20f4a7174..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 d16f5e3f227cc6dd07a160a71f443559682dbc35f1c056a5385085aaec4fada5 font-adobe-utopia-100dpi-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk b/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk deleted file mode 100644 index 390ca6784a..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-100dpi/xfont_font-adobe-utopia-100dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-adobe-utopia-100dpi -# -################################################################################ - -XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION = 1.0.4 -XFONT_FONT_ADOBE_UTOPIA_100DPI_SOURCE = font-adobe-utopia-100dpi-$(XFONT_FONT_ADOBE_UTOPIA_100DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_UTOPIA_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE = Adobe License (no modification allowed) -XFONT_FONT_ADOBE_UTOPIA_100DPI_LICENSE_FILES = COPYING - -XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ADOBE_UTOPIA_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/Config.in b/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/Config.in deleted file mode 100644 index 22797230a6..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ADOBE_UTOPIA_75DPI - bool "font-adobe-utopia-75dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash b/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash deleted file mode 100644 index 1a60af6196..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 8732719c61f3661c8bad63804ebfd54fc7de21ab848e9a26a19b1778ef8b5c94 font-adobe-utopia-75dpi-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk b/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk deleted file mode 100644 index 7ecd46ef11..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-75dpi/xfont_font-adobe-utopia-75dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-adobe-utopia-75dpi -# -################################################################################ - -XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION = 1.0.4 -XFONT_FONT_ADOBE_UTOPIA_75DPI_SOURCE = font-adobe-utopia-75dpi-$(XFONT_FONT_ADOBE_UTOPIA_75DPI_VERSION).tar.bz2 -XFONT_FONT_ADOBE_UTOPIA_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE = Adobe License (no modification allowed) -XFONT_FONT_ADOBE_UTOPIA_75DPI_LICENSE_FILES = COPYING - -XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ADOBE_UTOPIA_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-type1/Config.in b/package.bak/x11r7/xfont_font-adobe-utopia-type1/Config.in deleted file mode 100644 index 60b631ede7..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-type1/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ADOBE_UTOPIA_TYPE1 - bool "font-adobe-utopia-type1" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash b/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash deleted file mode 100644 index 4da2a4ff8c..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 979435105f897a70f8993fa02c8362160b0513366c2ab896965416f96dbb8077 font-adobe-utopia-type1-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk b/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk deleted file mode 100644 index 6c780e20dc..0000000000 --- a/package.bak/x11r7/xfont_font-adobe-utopia-type1/xfont_font-adobe-utopia-type1.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-adobe-utopia-type1 -# -################################################################################ - -XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION = 1.0.4 -XFONT_FONT_ADOBE_UTOPIA_TYPE1_SOURCE = font-adobe-utopia-type1-$(XFONT_FONT_ADOBE_UTOPIA_TYPE1_VERSION).tar.bz2 -XFONT_FONT_ADOBE_UTOPIA_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE = Adobe License (no modification allowed) -XFONT_FONT_ADOBE_UTOPIA_TYPE1_LICENSE_FILES = COPYING - -XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ADOBE_UTOPIA_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ADOBE_UTOPIA_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-alias/Config.in b/package.bak/x11r7/xfont_font-alias/Config.in deleted file mode 100644 index b30e2221da..0000000000 --- a/package.bak/x11r7/xfont_font-alias/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ALIAS - bool "font-alias" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-alias/xfont_font-alias.hash b/package.bak/x11r7/xfont_font-alias/xfont_font-alias.hash deleted file mode 100644 index 7f1efe8e0b..0000000000 --- a/package.bak/x11r7/xfont_font-alias/xfont_font-alias.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 8b453b2aae1cfa8090009ca037037b8c5e333550651d5a158b7264ce1d472c9a font-alias-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-alias/xfont_font-alias.mk b/package.bak/x11r7/xfont_font-alias/xfont_font-alias.mk deleted file mode 100644 index e2ac2363df..0000000000 --- a/package.bak/x11r7/xfont_font-alias/xfont_font-alias.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-alias -# -################################################################################ - -XFONT_FONT_ALIAS_VERSION = 1.0.3 -XFONT_FONT_ALIAS_SOURCE = font-alias-$(XFONT_FONT_ALIAS_VERSION).tar.bz2 -XFONT_FONT_ALIAS_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ALIAS_LICENSE = MIT -XFONT_FONT_ALIAS_LICENSE_FILES = COPYING - -XFONT_FONT_ALIAS_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ALIAS_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ALIAS_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-arabic-misc/Config.in b/package.bak/x11r7/xfont_font-arabic-misc/Config.in deleted file mode 100644 index 1ec50901a0..0000000000 --- a/package.bak/x11r7/xfont_font-arabic-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ARABIC_MISC - bool "font-arabic-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash b/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash deleted file mode 100644 index 03950039d8..0000000000 --- a/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 505d9b12a7093389e67a925dfda6346bde26d114c67f0cdca7aeda6e5d3344f4 font-arabic-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk b/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk deleted file mode 100644 index fa1269b41d..0000000000 --- a/package.bak/x11r7/xfont_font-arabic-misc/xfont_font-arabic-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-arabic-misc -# -################################################################################ - -XFONT_FONT_ARABIC_MISC_VERSION = 1.0.3 -XFONT_FONT_ARABIC_MISC_SOURCE = font-arabic-misc-$(XFONT_FONT_ARABIC_MISC_VERSION).tar.bz2 -XFONT_FONT_ARABIC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ARABIC_MISC_LICENSE = MIT -XFONT_FONT_ARABIC_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_ARABIC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ARABIC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ARABIC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-100dpi/Config.in b/package.bak/x11r7/xfont_font-bh-100dpi/Config.in deleted file mode 100644 index 3bfb0b8fcd..0000000000 --- a/package.bak/x11r7/xfont_font-bh-100dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_100DPI - bool "font-bh-100dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash b/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash deleted file mode 100644 index 3a9d4c78b1..0000000000 --- a/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 23c07162708e4b79eb33095c8bfa62c783717a9431254bbf44863734ea239481 font-bh-100dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk b/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk deleted file mode 100644 index fb1665898f..0000000000 --- a/package.bak/x11r7/xfont_font-bh-100dpi/xfont_font-bh-100dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-100dpi -# -################################################################################ - -XFONT_FONT_BH_100DPI_VERSION = 1.0.3 -XFONT_FONT_BH_100DPI_SOURCE = font-bh-100dpi-$(XFONT_FONT_BH_100DPI_VERSION).tar.bz2 -XFONT_FONT_BH_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_100DPI_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_100DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BH_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-75dpi/Config.in b/package.bak/x11r7/xfont_font-bh-75dpi/Config.in deleted file mode 100644 index 0fe93bb65e..0000000000 --- a/package.bak/x11r7/xfont_font-bh-75dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_75DPI - bool "font-bh-75dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash b/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash deleted file mode 100644 index ee24538e6e..0000000000 --- a/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 3486aa51ac92c646a448fe899c5c3dae0024b1fef724d5100d52640d1cac721c font-bh-75dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk b/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk deleted file mode 100644 index c8ade590b8..0000000000 --- a/package.bak/x11r7/xfont_font-bh-75dpi/xfont_font-bh-75dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-75dpi -# -################################################################################ - -XFONT_FONT_BH_75DPI_VERSION = 1.0.3 -XFONT_FONT_BH_75DPI_SOURCE = font-bh-75dpi-$(XFONT_FONT_BH_75DPI_VERSION).tar.bz2 -XFONT_FONT_BH_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_75DPI_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_75DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BH_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in deleted file mode 100644 index 0005cc11bd..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI - bool "font-bh-lucidatypewriter-100dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash deleted file mode 100644 index 6e9c7e3c78..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 62a83363c2536095fda49d260d21e0847675676e4e3415054064cbdffa641fbb font-bh-lucidatypewriter-100dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk deleted file mode 100644 index a1b61db4c8..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-100dpi/xfont_font-bh-lucidatypewriter-100dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-lucidatypewriter-100dpi -# -################################################################################ - -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION = 1.0.3 -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SOURCE = font-bh-lucidatypewriter-100dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_VERSION).tar.bz2 -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in deleted file mode 100644 index 60dfb952e8..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI - bool "font-bh-lucidatypewriter-75dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash deleted file mode 100644 index 374b8f6f01..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 4ac16afbe205480cc5572e2977ea63488c543d05be0ea8e5a94c845a6eebcb31 font-bh-lucidatypewriter-75dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk b/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk deleted file mode 100644 index 00a6bd6dc7..0000000000 --- a/package.bak/x11r7/xfont_font-bh-lucidatypewriter-75dpi/xfont_font-bh-lucidatypewriter-75dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-lucidatypewriter-75dpi -# -################################################################################ - -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION = 1.0.3 -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SOURCE = font-bh-lucidatypewriter-75dpi-$(XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_VERSION).tar.bz2 -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_LUCIDATYPEWRITER_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-ttf/Config.in b/package.bak/x11r7/xfont_font-bh-ttf/Config.in deleted file mode 100644 index d747989bf0..0000000000 --- a/package.bak/x11r7/xfont_font-bh-ttf/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_TTF - bool "font-bh-ttf" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash b/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash deleted file mode 100644 index 8df8e4b937..0000000000 --- a/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2010-November/001537.html -sha1 f42ebd527096011040a312e0f9cdf78d64177419 font-bh-ttf-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk b/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk deleted file mode 100644 index f393dd3244..0000000000 --- a/package.bak/x11r7/xfont_font-bh-ttf/xfont_font-bh-ttf.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-ttf -# -################################################################################ - -XFONT_FONT_BH_TTF_VERSION = 1.0.3 -XFONT_FONT_BH_TTF_SOURCE = font-bh-ttf-$(XFONT_FONT_BH_TTF_VERSION).tar.bz2 -XFONT_FONT_BH_TTF_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_TTF_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_TTF_LICENSE_FILES = COPYING - -XFONT_FONT_BH_TTF_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_TTF_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_TTF_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bh-type1/Config.in b/package.bak/x11r7/xfont_font-bh-type1/Config.in deleted file mode 100644 index 0a3ab18643..0000000000 --- a/package.bak/x11r7/xfont_font-bh-type1/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BH_TYPE1 - bool "font-bh-type1" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash b/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash deleted file mode 100644 index 89303dbc91..0000000000 --- a/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 761455a297486f3927a85d919b5c948d1d324181d4bea6c95d542504b68a63c1 font-bh-type1-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk b/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk deleted file mode 100644 index bf418d52cb..0000000000 --- a/package.bak/x11r7/xfont_font-bh-type1/xfont_font-bh-type1.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bh-type1 -# -################################################################################ - -XFONT_FONT_BH_TYPE1_VERSION = 1.0.3 -XFONT_FONT_BH_TYPE1_SOURCE = font-bh-type1-$(XFONT_FONT_BH_TYPE1_VERSION).tar.bz2 -XFONT_FONT_BH_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BH_TYPE1_LICENSE = Bigelow & Holmes License (no modification) -XFONT_FONT_BH_TYPE1_LICENSE_FILES = COPYING - -XFONT_FONT_BH_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BH_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BH_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bitstream-100dpi/Config.in b/package.bak/x11r7/xfont_font-bitstream-100dpi/Config.in deleted file mode 100644 index 5363fae365..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-100dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BITSTREAM_100DPI - bool "font-bitstream-100dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash b/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash deleted file mode 100644 index 09186ae57a..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ebe0d7444e3d7c8da7642055ac2206f0190ee060700d99cd876f8fc9964cb6ce font-bitstream-100dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk b/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk deleted file mode 100644 index 5ddca73e7c..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-100dpi/xfont_font-bitstream-100dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bitstream-100dpi -# -################################################################################ - -XFONT_FONT_BITSTREAM_100DPI_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_100DPI_SOURCE = font-bitstream-100dpi-$(XFONT_FONT_BITSTREAM_100DPI_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_100DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BITSTREAM_100DPI_LICENSE = MIT -XFONT_FONT_BITSTREAM_100DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BITSTREAM_100DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BITSTREAM_100DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_100DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bitstream-75dpi/Config.in b/package.bak/x11r7/xfont_font-bitstream-75dpi/Config.in deleted file mode 100644 index 34a4a19ef6..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-75dpi/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BITSTREAM_75DPI - bool "font-bitstream-75dpi" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash b/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash deleted file mode 100644 index 7ec889406b..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 ba3f5e4610c07bd5859881660753ec6d75d179f26fc967aa776dbb3d5d5cf48e font-bitstream-75dpi-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk b/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk deleted file mode 100644 index d7fea275bc..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-75dpi/xfont_font-bitstream-75dpi.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bitstream-75dpi -# -################################################################################ - -XFONT_FONT_BITSTREAM_75DPI_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_75DPI_SOURCE = font-bitstream-75dpi-$(XFONT_FONT_BITSTREAM_75DPI_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_75DPI_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BITSTREAM_75DPI_LICENSE = MIT -XFONT_FONT_BITSTREAM_75DPI_LICENSE_FILES = COPYING - -XFONT_FONT_BITSTREAM_75DPI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BITSTREAM_75DPI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_75DPI_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-bitstream-type1/Config.in b/package.bak/x11r7/xfont_font-bitstream-type1/Config.in deleted file mode 100644 index c8cbc90840..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-type1/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_BITSTREAM_TYPE1 - bool "font-bitstream-type1" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash b/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash deleted file mode 100644 index 7e958b349e..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 c6ea0569adad2c577f140328dc3302e729cb1b1ea90cd0025caf380625f8a688 font-bitstream-type1-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk b/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk deleted file mode 100644 index 813e3cb5a8..0000000000 --- a/package.bak/x11r7/xfont_font-bitstream-type1/xfont_font-bitstream-type1.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-bitstream-type1 -# -################################################################################ - -XFONT_FONT_BITSTREAM_TYPE1_VERSION = 1.0.3 -XFONT_FONT_BITSTREAM_TYPE1_SOURCE = font-bitstream-type1-$(XFONT_FONT_BITSTREAM_TYPE1_VERSION).tar.bz2 -XFONT_FONT_BITSTREAM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_BITSTREAM_TYPE1_LICENSE = MIT -XFONT_FONT_BITSTREAM_TYPE1_LICENSE_FILES = COPYING - -XFONT_FONT_BITSTREAM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_BITSTREAM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_BITSTREAM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-cronyx-cyrillic/Config.in b/package.bak/x11r7/xfont_font-cronyx-cyrillic/Config.in deleted file mode 100644 index e92ab836c8..0000000000 --- a/package.bak/x11r7/xfont_font-cronyx-cyrillic/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_CRONYX_CYRILLIC - bool "font-cronyx-cyrillic" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash b/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash deleted file mode 100644 index 7fc295fdc2..0000000000 --- a/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 6e8631936157677c77ba032b5c7b1fb3cb2ee872dbcea0444f12cd602cd9212a font-cronyx-cyrillic-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk b/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk deleted file mode 100644 index 6dc9015236..0000000000 --- a/package.bak/x11r7/xfont_font-cronyx-cyrillic/xfont_font-cronyx-cyrillic.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-cronyx-cyrillic -# -################################################################################ - -XFONT_FONT_CRONYX_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_CRONYX_CYRILLIC_SOURCE = font-cronyx-cyrillic-$(XFONT_FONT_CRONYX_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_CRONYX_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_CRONYX_CYRILLIC_LICENSE = MIT -XFONT_FONT_CRONYX_CYRILLIC_LICENSE_FILES = COPYING - -XFONT_FONT_CRONYX_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_CRONYX_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_CRONYX_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-cursor-misc/Config.in b/package.bak/x11r7/xfont_font-cursor-misc/Config.in deleted file mode 100644 index 0e10da6a53..0000000000 --- a/package.bak/x11r7/xfont_font-cursor-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_CURSOR_MISC - bool "font-cursor-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash b/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash deleted file mode 100644 index 90a032b7c0..0000000000 --- a/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 17363eb35eece2e08144da5f060c70103b59d0972b4f4d77fd84c9a7a2dba635 font-cursor-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk b/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk deleted file mode 100644 index 59d6a84003..0000000000 --- a/package.bak/x11r7/xfont_font-cursor-misc/xfont_font-cursor-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-cursor-misc -# -################################################################################ - -XFONT_FONT_CURSOR_MISC_VERSION = 1.0.3 -XFONT_FONT_CURSOR_MISC_SOURCE = font-cursor-misc-$(XFONT_FONT_CURSOR_MISC_VERSION).tar.bz2 -XFONT_FONT_CURSOR_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_CURSOR_MISC_LICENSE = unencumbered -XFONT_FONT_CURSOR_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_CURSOR_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_CURSOR_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_CURSOR_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-daewoo-misc/Config.in b/package.bak/x11r7/xfont_font-daewoo-misc/Config.in deleted file mode 100644 index cffe81deb5..0000000000 --- a/package.bak/x11r7/xfont_font-daewoo-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_DAEWOO_MISC - bool "font-daewoo-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash b/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash deleted file mode 100644 index 1b4ebe9d9f..0000000000 --- a/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 bc65de70bee12698caa95b523d3b652c056347e17b68cc8b5d6bbdff235c4be8 font-daewoo-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk b/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk deleted file mode 100644 index 59a84c701c..0000000000 --- a/package.bak/x11r7/xfont_font-daewoo-misc/xfont_font-daewoo-misc.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xfont_font-daewoo-misc -# -################################################################################ - -XFONT_FONT_DAEWOO_MISC_VERSION = 1.0.3 -XFONT_FONT_DAEWOO_MISC_SOURCE = font-daewoo-misc-$(XFONT_FONT_DAEWOO_MISC_VERSION).tar.bz2 -XFONT_FONT_DAEWOO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_DAEWOO_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_DAEWOO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_DAEWOO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_DAEWOO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-dec-misc/Config.in b/package.bak/x11r7/xfont_font-dec-misc/Config.in deleted file mode 100644 index a926d9f9c7..0000000000 --- a/package.bak/x11r7/xfont_font-dec-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_DEC_MISC - bool "font-dec-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash b/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash deleted file mode 100644 index 50c6136bf5..0000000000 --- a/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e19ddf8b5f8de914d81675358fdfe37762e9ce524887cc983adef34f2850ff7b font-dec-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk b/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk deleted file mode 100644 index b26296d2d0..0000000000 --- a/package.bak/x11r7/xfont_font-dec-misc/xfont_font-dec-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-dec-misc -# -################################################################################ - -XFONT_FONT_DEC_MISC_VERSION = 1.0.3 -XFONT_FONT_DEC_MISC_SOURCE = font-dec-misc-$(XFONT_FONT_DEC_MISC_VERSION).tar.bz2 -XFONT_FONT_DEC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_DEC_MISC_LICENSE = MIT -XFONT_FONT_DEC_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_DEC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_DEC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_DEC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-ibm-type1/Config.in b/package.bak/x11r7/xfont_font-ibm-type1/Config.in deleted file mode 100644 index d4ac1ae470..0000000000 --- a/package.bak/x11r7/xfont_font-ibm-type1/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_IBM_TYPE1 - bool "font-ibm-type1" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash b/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash deleted file mode 100644 index 11aa890877..0000000000 --- a/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 fddb28d3db5a07f4b4ca15388488a9680a10e1367a18f358f903b2a608a5d2df font-ibm-type1-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk b/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk deleted file mode 100644 index 6cec198686..0000000000 --- a/package.bak/x11r7/xfont_font-ibm-type1/xfont_font-ibm-type1.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-ibm-type1 -# -################################################################################ - -XFONT_FONT_IBM_TYPE1_VERSION = 1.0.3 -XFONT_FONT_IBM_TYPE1_SOURCE = font-ibm-type1-$(XFONT_FONT_IBM_TYPE1_VERSION).tar.bz2 -XFONT_FONT_IBM_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_IBM_TYPE1_LICENSE = IBM/MIT X Consortium Courier Typefont agreement (no modification) -XFONT_FONT_IBM_TYPE1_LICENSE_FILES = COPYING - -XFONT_FONT_IBM_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_IBM_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_IBM_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-isas-misc/Config.in b/package.bak/x11r7/xfont_font-isas-misc/Config.in deleted file mode 100644 index 4dddaf7507..0000000000 --- a/package.bak/x11r7/xfont_font-isas-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_ISAS_MISC - bool "font-isas-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash b/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash deleted file mode 100644 index 35324d4350..0000000000 --- a/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 5824ab4b485951107dd245b8f7717d2822f1a6dbf6cea98f1ac7f49905c0a867 font-isas-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk b/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk deleted file mode 100644 index 4ac4b9b14d..0000000000 --- a/package.bak/x11r7/xfont_font-isas-misc/xfont_font-isas-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-isas-misc -# -################################################################################ - -XFONT_FONT_ISAS_MISC_VERSION = 1.0.3 -XFONT_FONT_ISAS_MISC_SOURCE = font-isas-misc-$(XFONT_FONT_ISAS_MISC_VERSION).tar.bz2 -XFONT_FONT_ISAS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_ISAS_MISC_LICENSE = MIT -XFONT_FONT_ISAS_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_ISAS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_ISAS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_ISAS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-jis-misc/Config.in b/package.bak/x11r7/xfont_font-jis-misc/Config.in deleted file mode 100644 index 1874ad8204..0000000000 --- a/package.bak/x11r7/xfont_font-jis-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_JIS_MISC - bool "font-jis-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash b/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash deleted file mode 100644 index c39db36061..0000000000 --- a/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 2b18ce10b367ebafe95a17de799b6db9a24e2337188d124adaf68af05b1fac65 font-jis-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk b/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk deleted file mode 100644 index 5f8b00161a..0000000000 --- a/package.bak/x11r7/xfont_font-jis-misc/xfont_font-jis-misc.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xfont_font-jis-misc -# -################################################################################ - -XFONT_FONT_JIS_MISC_VERSION = 1.0.3 -XFONT_FONT_JIS_MISC_SOURCE = font-jis-misc-$(XFONT_FONT_JIS_MISC_VERSION).tar.bz2 -XFONT_FONT_JIS_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_JIS_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_JIS_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_JIS_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_JIS_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-micro-misc/Config.in b/package.bak/x11r7/xfont_font-micro-misc/Config.in deleted file mode 100644 index 2062e16e59..0000000000 --- a/package.bak/x11r7/xfont_font-micro-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MICRO_MISC - bool "font-micro-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash b/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash deleted file mode 100644 index 223ca0f86f..0000000000 --- a/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9a3381c10f32d9511f0ad4179df395914c50779103c16cddf7017f5220ed8db6 font-micro-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk b/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk deleted file mode 100644 index 11b4199e4b..0000000000 --- a/package.bak/x11r7/xfont_font-micro-misc/xfont_font-micro-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-micro-misc -# -################################################################################ - -XFONT_FONT_MICRO_MISC_VERSION = 1.0.3 -XFONT_FONT_MICRO_MISC_SOURCE = font-micro-misc-$(XFONT_FONT_MICRO_MISC_VERSION).tar.bz2 -XFONT_FONT_MICRO_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MICRO_MISC_LICENSE = Public Domain -XFONT_FONT_MICRO_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_MICRO_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MICRO_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MICRO_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-misc-cyrillic/Config.in b/package.bak/x11r7/xfont_font-misc-cyrillic/Config.in deleted file mode 100644 index 58702c1484..0000000000 --- a/package.bak/x11r7/xfont_font-misc-cyrillic/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MISC_CYRILLIC - bool "font-misc-cyrillic" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash b/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash deleted file mode 100644 index 1627112282..0000000000 --- a/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e40fe3e3323c62b738550795457ad555c70c008aa91b5912dfd46f8e745f5e60 font-misc-cyrillic-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk b/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk deleted file mode 100644 index 16fd46b09d..0000000000 --- a/package.bak/x11r7/xfont_font-misc-cyrillic/xfont_font-misc-cyrillic.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-misc-cyrillic -# -################################################################################ - -XFONT_FONT_MISC_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_MISC_CYRILLIC_SOURCE = font-misc-cyrillic-$(XFONT_FONT_MISC_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_MISC_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MISC_CYRILLIC_LICENSE = MIT / Public Domain -XFONT_FONT_MISC_CYRILLIC_LICENSE_FILES = COPYING - -XFONT_FONT_MISC_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MISC_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MISC_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-misc-ethiopic/Config.in b/package.bak/x11r7/xfont_font-misc-ethiopic/Config.in deleted file mode 100644 index af62ddc385..0000000000 --- a/package.bak/x11r7/xfont_font-misc-ethiopic/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MISC_ETHIOPIC - bool "font-misc-ethiopic" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash b/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash deleted file mode 100644 index c75816a856..0000000000 --- a/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 53cb1fd83afdbe7939c0eac34003676ee0e6023216892d98054db90b703c98a5 font-misc-ethiopic-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk b/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk deleted file mode 100644 index 7d0825ee5c..0000000000 --- a/package.bak/x11r7/xfont_font-misc-ethiopic/xfont_font-misc-ethiopic.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-misc-ethiopic -# -################################################################################ - -XFONT_FONT_MISC_ETHIOPIC_VERSION = 1.0.3 -XFONT_FONT_MISC_ETHIOPIC_SOURCE = font-misc-ethiopic-$(XFONT_FONT_MISC_ETHIOPIC_VERSION).tar.bz2 -XFONT_FONT_MISC_ETHIOPIC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MISC_ETHIOPIC_LICENSE = MIT -XFONT_FONT_MISC_ETHIOPIC_LICENSE_FILES = COPYING - -XFONT_FONT_MISC_ETHIOPIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MISC_ETHIOPIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MISC_ETHIOPIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-misc-meltho/Config.in b/package.bak/x11r7/xfont_font-misc-meltho/Config.in deleted file mode 100644 index dd2d87d9ea..0000000000 --- a/package.bak/x11r7/xfont_font-misc-meltho/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MISC_MELTHO - bool "font-misc-meltho" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash b/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash deleted file mode 100644 index 7a7ca92ea5..0000000000 --- a/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 3721323f13855cf7ca609115a1f7b182491e9b2b9c6e01eb1a2c7f8edd480791 font-misc-meltho-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk b/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk deleted file mode 100644 index 5667869951..0000000000 --- a/package.bak/x11r7/xfont_font-misc-meltho/xfont_font-misc-meltho.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-misc-meltho -# -################################################################################ - -XFONT_FONT_MISC_MELTHO_VERSION = 1.0.3 -XFONT_FONT_MISC_MELTHO_SOURCE = font-misc-meltho-$(XFONT_FONT_MISC_MELTHO_VERSION).tar.bz2 -XFONT_FONT_MISC_MELTHO_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MISC_MELTHO_LICENSE = Meltho License -XFONT_FONT_MISC_MELTHO_LICENSE_FILES = COPYING - -XFONT_FONT_MISC_MELTHO_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MISC_MELTHO_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MISC_MELTHO_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-misc-misc/Config.in b/package.bak/x11r7/xfont_font-misc-misc/Config.in deleted file mode 100644 index fc379a6ed2..0000000000 --- a/package.bak/x11r7/xfont_font-misc-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MISC_MISC - bool "font-misc-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash b/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash deleted file mode 100644 index fc4ae58712..0000000000 --- a/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 b8e77940e4e1769dc47ef1805918d8c9be37c708735832a07204258bacc11794 font-misc-misc-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk b/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk deleted file mode 100644 index 700837c1ed..0000000000 --- a/package.bak/x11r7/xfont_font-misc-misc/xfont_font-misc-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-misc-misc -# -################################################################################ - -XFONT_FONT_MISC_MISC_VERSION = 1.1.2 -XFONT_FONT_MISC_MISC_SOURCE = font-misc-misc-$(XFONT_FONT_MISC_MISC_VERSION).tar.bz2 -XFONT_FONT_MISC_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MISC_MISC_LICENSE = Public Domain -XFONT_FONT_MISC_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_MISC_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MISC_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MISC_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-mutt-misc/Config.in b/package.bak/x11r7/xfont_font-mutt-misc/Config.in deleted file mode 100644 index 563dc9f2d4..0000000000 --- a/package.bak/x11r7/xfont_font-mutt-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_MUTT_MISC - bool "font-mutt-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash b/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash deleted file mode 100644 index 45a6fc1be9..0000000000 --- a/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 bd5f7adb34367c197773a9801df5bce7b019664941900b2a31fbfe1ff2830f8f font-mutt-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk b/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk deleted file mode 100644 index 53fc192a9a..0000000000 --- a/package.bak/x11r7/xfont_font-mutt-misc/xfont_font-mutt-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-mutt-misc -# -################################################################################ - -XFONT_FONT_MUTT_MISC_VERSION = 1.0.3 -XFONT_FONT_MUTT_MISC_SOURCE = font-mutt-misc-$(XFONT_FONT_MUTT_MISC_VERSION).tar.bz2 -XFONT_FONT_MUTT_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_MUTT_MISC_LICENSE = MIT -XFONT_FONT_MUTT_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_MUTT_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_MUTT_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_MUTT_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-schumacher-misc/Config.in b/package.bak/x11r7/xfont_font-schumacher-misc/Config.in deleted file mode 100644 index e30940a6d5..0000000000 --- a/package.bak/x11r7/xfont_font-schumacher-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_SCHUMACHER_MISC - bool "font-schumacher-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash b/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash deleted file mode 100644 index 6da0963d47..0000000000 --- a/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 e444028656e0767e2eddc6d9aca462b16a2be75a47244dbc199b2c44eca87e5a font-schumacher-misc-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk b/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk deleted file mode 100644 index 0fa4d39616..0000000000 --- a/package.bak/x11r7/xfont_font-schumacher-misc/xfont_font-schumacher-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-schumacher-misc -# -################################################################################ - -XFONT_FONT_SCHUMACHER_MISC_VERSION = 1.1.2 -XFONT_FONT_SCHUMACHER_MISC_SOURCE = font-schumacher-misc-$(XFONT_FONT_SCHUMACHER_MISC_VERSION).tar.bz2 -XFONT_FONT_SCHUMACHER_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_SCHUMACHER_MISC_LICENSE = MIT -XFONT_FONT_SCHUMACHER_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_SCHUMACHER_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_SCHUMACHER_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_SCHUMACHER_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-screen-cyrillic/Config.in b/package.bak/x11r7/xfont_font-screen-cyrillic/Config.in deleted file mode 100644 index 67f4ae6cbe..0000000000 --- a/package.bak/x11r7/xfont_font-screen-cyrillic/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_SCREEN_CYRILLIC - bool "font-screen-cyrillic" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash b/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash deleted file mode 100644 index 0de78d8974..0000000000 --- a/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 824231e8dffe15299454e47259f29d98001c9cf8ad3d6b5171399e4d71705e79 font-screen-cyrillic-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk b/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk deleted file mode 100644 index 8158ce5614..0000000000 --- a/package.bak/x11r7/xfont_font-screen-cyrillic/xfont_font-screen-cyrillic.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-screen-cyrillic -# -################################################################################ - -XFONT_FONT_SCREEN_CYRILLIC_VERSION = 1.0.4 -XFONT_FONT_SCREEN_CYRILLIC_SOURCE = font-screen-cyrillic-$(XFONT_FONT_SCREEN_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_SCREEN_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_SCREEN_CYRILLIC_LICENSE = MIT -XFONT_FONT_SCREEN_CYRILLIC_LICENSE_FILES = COPYING - -XFONT_FONT_SCREEN_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_SCREEN_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_SCREEN_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-sony-misc/Config.in b/package.bak/x11r7/xfont_font-sony-misc/Config.in deleted file mode 100644 index df558c4311..0000000000 --- a/package.bak/x11r7/xfont_font-sony-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_SONY_MISC - bool "font-sony-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash b/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash deleted file mode 100644 index aef4b6fe47..0000000000 --- a/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 2043a326ba347c9da5ca1e9bc363e2521c3ea40b43b1f9662d333efd4867cff5 font-sony-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk b/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk deleted file mode 100644 index 035255f77a..0000000000 --- a/package.bak/x11r7/xfont_font-sony-misc/xfont_font-sony-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-sony-misc -# -################################################################################ - -XFONT_FONT_SONY_MISC_VERSION = 1.0.3 -XFONT_FONT_SONY_MISC_SOURCE = font-sony-misc-$(XFONT_FONT_SONY_MISC_VERSION).tar.bz2 -XFONT_FONT_SONY_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_SONY_MISC_LICENSE = MIT -XFONT_FONT_SONY_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_SONY_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_SONY_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_SONY_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-sun-misc/Config.in b/package.bak/x11r7/xfont_font-sun-misc/Config.in deleted file mode 100644 index accc764a6b..0000000000 --- a/package.bak/x11r7/xfont_font-sun-misc/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_SUN_MISC - bool "font-sun-misc" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash b/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash deleted file mode 100644 index 9d3697814d..0000000000 --- a/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 481f4fcbbf7005658b080b3cf342c8c76de752e77f47958b2b383de73266d2e0 font-sun-misc-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk b/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk deleted file mode 100644 index 395cb87e76..0000000000 --- a/package.bak/x11r7/xfont_font-sun-misc/xfont_font-sun-misc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-sun-misc -# -################################################################################ - -XFONT_FONT_SUN_MISC_VERSION = 1.0.3 -XFONT_FONT_SUN_MISC_SOURCE = font-sun-misc-$(XFONT_FONT_SUN_MISC_VERSION).tar.bz2 -XFONT_FONT_SUN_MISC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_SUN_MISC_LICENSE = MIT -XFONT_FONT_SUN_MISC_LICENSE_FILES = COPYING - -XFONT_FONT_SUN_MISC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_SUN_MISC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_SUN_MISC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-util/Config.in b/package.bak/x11r7/xfont_font-util/Config.in deleted file mode 100644 index 4edeffdd30..0000000000 --- a/package.bak/x11r7/xfont_font-util/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_UTIL - bool "font-util" - help - No description available diff --git a/package.bak/x11r7/xfont_font-util/xfont_font-util.hash b/package.bak/x11r7/xfont_font-util/xfont_font-util.hash deleted file mode 100644 index 04ada91da1..0000000000 --- a/package.bak/x11r7/xfont_font-util/xfont_font-util.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002546.html -sha1 0b16add3637c64b0bbaf1dd223b71b0421100c20 font-util-1.3.1.tar.bz2 -sha256 aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921 font-util-1.3.1.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-util/xfont_font-util.mk b/package.bak/x11r7/xfont_font-util/xfont_font-util.mk deleted file mode 100644 index 36853770ef..0000000000 --- a/package.bak/x11r7/xfont_font-util/xfont_font-util.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xfont_font-util -# -################################################################################ - -XFONT_FONT_UTIL_VERSION = 1.3.1 -XFONT_FONT_UTIL_SOURCE = font-util-$(XFONT_FONT_UTIL_VERSION).tar.bz2 -XFONT_FONT_UTIL_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_UTIL_LICENSE = MIT/BSD-2c -XFONT_FONT_UTIL_LICENSE_FILES = COPYING - -XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf -HOST_XFONT_FONT_UTIL_DEPENDENCIES = host-pkgconf -XFONT_FONT_UTIL_INSTALL_STAGING = YES -XFONT_FONT_UTIL_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xfont_font-winitzki-cyrillic/Config.in b/package.bak/x11r7/xfont_font-winitzki-cyrillic/Config.in deleted file mode 100644 index ccfb080291..0000000000 --- a/package.bak/x11r7/xfont_font-winitzki-cyrillic/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_WINITZKI_CYRILLIC - bool "font-winitzki-cyrillic" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash b/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash deleted file mode 100644 index 89fbda9acf..0000000000 --- a/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 abd13b63d02fcaec488686c23683e5cf640b43bd32f8ca22eeae6f84df0a36a0 font-winitzki-cyrillic-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk b/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk deleted file mode 100644 index 665fb90896..0000000000 --- a/package.bak/x11r7/xfont_font-winitzki-cyrillic/xfont_font-winitzki-cyrillic.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-winitzki-cyrillic -# -################################################################################ - -XFONT_FONT_WINITZKI_CYRILLIC_VERSION = 1.0.3 -XFONT_FONT_WINITZKI_CYRILLIC_SOURCE = font-winitzki-cyrillic-$(XFONT_FONT_WINITZKI_CYRILLIC_VERSION).tar.bz2 -XFONT_FONT_WINITZKI_CYRILLIC_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_WINITZKI_CYRILLIC_LICENSE = Public Domain -XFONT_FONT_WINITZKI_CYRILLIC_LICENSE_FILES = COPYING - -XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_WINITZKI_CYRILLIC_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_WINITZKI_CYRILLIC_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xfont_font-xfree86-type1/Config.in b/package.bak/x11r7/xfont_font-xfree86-type1/Config.in deleted file mode 100644 index 1a897b2443..0000000000 --- a/package.bak/x11r7/xfont_font-xfree86-type1/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XFONT_FONT_XFREE86_TYPE1 - bool "font-xfree86-type1" - select BR2_PACKAGE_XFONT_FONT_UTIL - help - No description available diff --git a/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash b/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash deleted file mode 100644 index 38be53bf52..0000000000 --- a/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 caebf42aec7be7f3bd40e0f232d6f34881b853dc84acfcdf7458358701fbe34a font-xfree86-type1-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk b/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk deleted file mode 100644 index e1a2ef6067..0000000000 --- a/package.bak/x11r7/xfont_font-xfree86-type1/xfont_font-xfree86-type1.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xfont_font-xfree86-type1 -# -################################################################################ - -XFONT_FONT_XFREE86_TYPE1_VERSION = 1.0.4 -XFONT_FONT_XFREE86_TYPE1_SOURCE = font-xfree86-type1-$(XFONT_FONT_XFREE86_TYPE1_VERSION).tar.bz2 -XFONT_FONT_XFREE86_TYPE1_SITE = http://xorg.freedesktop.org/releases/individual/font -XFONT_FONT_XFREE86_TYPE1_LICENSE = MIT -XFONT_FONT_XFREE86_TYPE1_LICENSE_FILES = COPYING - -XFONT_FONT_XFREE86_TYPE1_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install -XFONT_FONT_XFREE86_TYPE1_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) MKFONTSCALE=$(HOST_DIR)/usr/bin/mkfontscale MKFONTDIR=$(HOST_DIR)/usr/bin/mkfontdir install-data -XFONT_FONT_XFREE86_TYPE1_DEPENDENCIES = xfont_font-util host-xfont_font-util host-xapp_mkfontscale host-xapp_mkfontdir host-xapp_bdftopcf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xkeyboard-config/Config.in b/package.bak/x11r7/xkeyboard-config/Config.in deleted file mode 100644 index 5d1d6a72ed..0000000000 --- a/package.bak/x11r7/xkeyboard-config/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XKEYBOARD_CONFIG - bool "xkeyboard-config" - # Runtime dependencies - select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7 - help - keyboard configuration database for X - - http://xlibs.freedesktop.org/xkbdesc diff --git a/package.bak/x11r7/xkeyboard-config/xkeyboard-config.hash b/package.bak/x11r7/xkeyboard-config/xkeyboard-config.hash deleted file mode 100644 index 104a5aba1c..0000000000 --- a/package.bak/x11r7/xkeyboard-config/xkeyboard-config.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-February/002775.html -sha256 d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134 xkeyboard-config-2.20.tar.bz2 diff --git a/package.bak/x11r7/xkeyboard-config/xkeyboard-config.mk b/package.bak/x11r7/xkeyboard-config/xkeyboard-config.mk deleted file mode 100644 index bdaf0268db..0000000000 --- a/package.bak/x11r7/xkeyboard-config/xkeyboard-config.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xkeyboard-config -# -################################################################################ - -XKEYBOARD_CONFIG_VERSION = 2.20 -XKEYBOARD_CONFIG_SOURCE = xkeyboard-config-$(XKEYBOARD_CONFIG_VERSION).tar.bz2 -XKEYBOARD_CONFIG_SITE = http://www.x.org/releases/individual/data/xkeyboard-config -XKEYBOARD_CONFIG_LICENSE = MIT -XKEYBOARD_CONFIG_LICENSE_FILES = COPYING - -XKEYBOARD_CONFIG_CONF_OPTS = --disable-runtime-deps -XKEYBOARD_CONFIG_DEPENDENCIES = host-gettext host-intltool host-xapp_xkbcomp - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libFS/Config.in b/package.bak/x11r7/xlib_libFS/Config.in deleted file mode 100644 index 0c8a7290c1..0000000000 --- a/package.bak/x11r7/xlib_libFS/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBFS - bool "libFS" - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_FONTSPROTO - help - X.Org FS library diff --git a/package.bak/x11r7/xlib_libFS/xlib_libFS.hash b/package.bak/x11r7/xlib_libFS/xlib_libFS.hash deleted file mode 100644 index 786d147b37..0000000000 --- a/package.bak/x11r7/xlib_libFS/xlib_libFS.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002588.html -sha256 2e9d4c07026a7401d4fa4ffae86e6ac7fec83f50f3268fa85f52718e479dc4f3 libFS-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xlib_libFS/xlib_libFS.mk b/package.bak/x11r7/xlib_libFS/xlib_libFS.mk deleted file mode 100644 index a3c58b90d9..0000000000 --- a/package.bak/x11r7/xlib_libFS/xlib_libFS.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libFS -# -################################################################################ - -XLIB_LIBFS_VERSION = 1.0.7 -XLIB_LIBFS_SOURCE = libFS-$(XLIB_LIBFS_VERSION).tar.bz2 -XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBFS_LICENSE = MIT -XLIB_LIBFS_LICENSE_FILES = COPYING -XLIB_LIBFS_INSTALL_STAGING = YES -XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto host-pkgconf -XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libICE/Config.in b/package.bak/x11r7/xlib_libICE/Config.in deleted file mode 100644 index d63f935602..0000000000 --- a/package.bak/x11r7/xlib_libICE/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBICE - bool "libICE" - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org ICE library diff --git a/package.bak/x11r7/xlib_libICE/xlib_libICE.hash b/package.bak/x11r7/xlib_libICE/xlib_libICE.hash deleted file mode 100644 index 1b006ce36b..0000000000 --- a/package.bak/x11r7/xlib_libICE/xlib_libICE.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2014-June/056671.html -sha256 8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202 libICE-1.0.9.tar.bz2 diff --git a/package.bak/x11r7/xlib_libICE/xlib_libICE.mk b/package.bak/x11r7/xlib_libICE/xlib_libICE.mk deleted file mode 100644 index e2a4e7d387..0000000000 --- a/package.bak/x11r7/xlib_libICE/xlib_libICE.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libICE -# -################################################################################ - -XLIB_LIBICE_VERSION = 1.0.9 -XLIB_LIBICE_SOURCE = libICE-$(XLIB_LIBICE_VERSION).tar.bz2 -XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBICE_LICENSE = MIT -XLIB_LIBICE_LICENSE_FILES = COPYING -XLIB_LIBICE_INSTALL_STAGING = YES -XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto host-pkgconf - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libSM/Config.in b/package.bak/x11r7/xlib_libSM/Config.in deleted file mode 100644 index ef83b531f8..0000000000 --- a/package.bak/x11r7/xlib_libSM/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBSM - bool "libSM" - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org SM library diff --git a/package.bak/x11r7/xlib_libSM/xlib_libSM.hash b/package.bak/x11r7/xlib_libSM/xlib_libSM.hash deleted file mode 100644 index 79dc25c226..0000000000 --- a/package.bak/x11r7/xlib_libSM/xlib_libSM.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-September/056013.html -sha256 0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd libSM-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libSM/xlib_libSM.mk b/package.bak/x11r7/xlib_libSM/xlib_libSM.mk deleted file mode 100644 index 30640bd101..0000000000 --- a/package.bak/x11r7/xlib_libSM/xlib_libSM.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libSM -# -################################################################################ - -XLIB_LIBSM_VERSION = 1.2.2 -XLIB_LIBSM_SOURCE = libSM-$(XLIB_LIBSM_VERSION).tar.bz2 -XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBSM_LICENSE = MIT -XLIB_LIBSM_LICENSE_FILES = COPYING -XLIB_LIBSM_INSTALL_STAGING = YES -XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto -XLIB_LIBSM_CONF_OPTS = --without-libuuid - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libX11/Config.in b/package.bak/x11r7/xlib_libX11/Config.in deleted file mode 100644 index 3ad8d00ae5..0000000000 --- a/package.bak/x11r7/xlib_libX11/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBX11 - bool "libX11" - select BR2_PACKAGE_LIBXCB - select BR2_PACKAGE_XUTIL_UTIL_MACROS - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO - help - X.Org X11 library diff --git a/package.bak/x11r7/xlib_libX11/xlib_libX11.hash b/package.bak/x11r7/xlib_libX11/xlib_libX11.hash deleted file mode 100644 index aeb0e9d74a..0000000000 --- a/package.bak/x11r7/xlib_libX11/xlib_libX11.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002721.html -sha256 b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441 libX11-1.6.4.tar.bz2 diff --git a/package.bak/x11r7/xlib_libX11/xlib_libX11.mk b/package.bak/x11r7/xlib_libX11/xlib_libX11.mk deleted file mode 100644 index 80e89b4830..0000000000 --- a/package.bak/x11r7/xlib_libX11/xlib_libX11.mk +++ /dev/null @@ -1,61 +0,0 @@ -################################################################################ -# -# xlib_libX11 -# -################################################################################ - -XLIB_LIBX11_VERSION = 1.6.4 -XLIB_LIBX11_SOURCE = libX11-$(XLIB_LIBX11_VERSION).tar.bz2 -XLIB_LIBX11_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBX11_LICENSE = MIT -XLIB_LIBX11_LICENSE_FILES = COPYING -XLIB_LIBX11_INSTALL_STAGING = YES -XLIB_LIBX11_DEPENDENCIES = \ - libxcb \ - xutil_util-macros \ - xlib_xtrans \ - xlib_libXau \ - xlib_libXdmcp \ - xproto_kbproto \ - xproto_xproto \ - xproto_xextproto \ - xproto_inputproto \ - xproto_xf86bigfontproto \ - host-xproto_xproto - -HOST_XLIB_LIBX11_DEPENDENCIES = \ - host-libxcb \ - host-xutil_util-macros \ - host-xlib_xtrans \ - host-xlib_libXau \ - host-xlib_libXdmcp \ - host-xproto_kbproto \ - host-xproto_xproto \ - host-xproto_xextproto \ - host-xproto_inputproto \ - host-xproto_xf86bigfontproto - -XLIB_LIBX11_CONF_OPTS = \ - --disable-malloc0returnsnull \ - --with-xcb \ - --disable-specs \ - --without-perl - -HOST_XLIB_LIBX11_CONF_OPTS = \ - --disable-specs \ - --without-perl - -# src/util/makekeys is executed at build time to generate ks_tables.h, so -# it should get compiled for the host. The libX11 makefile unfortunately -# doesn't have X11_CFLAGS_FOR_BUILD so this doesn't work. For buildroot, -# we know the X11 includes are in $(HOST_DIR)/usr/include, which are already -# in the CFLAGS_FOR_BUILD, so we can just remove the X11_CFLAGS -define XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS - $(SED) '/X11_CFLAGS/d' $(@D)/src/util/Makefile* -endef - -XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS -HOST_XLIB_LIBX11_POST_PATCH_HOOKS += XLIB_LIBX11_DISABLE_MAKEKEYS_X11_CFLAGS - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXScrnSaver/Config.in b/package.bak/x11r7/xlib_libXScrnSaver/Config.in deleted file mode 100644 index 5df9a00c72..0000000000 --- a/package.bak/x11r7/xlib_libXScrnSaver/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXSCRNSAVER - bool "libXScrnSaver" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_SCRNSAVERPROTO - help - X.Org XScrnSaver library diff --git a/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash b/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash deleted file mode 100644 index d5340baf1e..0000000000 --- a/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2012-March/054015.html -sha256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d libXScrnSaver-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk deleted file mode 100644 index f22ee983c0..0000000000 --- a/package.bak/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXScrnSaver -# -################################################################################ - -XLIB_LIBXSCRNSAVER_VERSION = 1.2.2 -XLIB_LIBXSCRNSAVER_SOURCE = libXScrnSaver-$(XLIB_LIBXSCRNSAVER_VERSION).tar.bz2 -XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXSCRNSAVER_LICENSE = MIT -XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING -XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES -XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto -XLIB_LIBXSCRNSAVER_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXau/Config.in b/package.bak/x11r7/xlib_libXau/Config.in deleted file mode 100644 index a220f01970..0000000000 --- a/package.bak/x11r7/xlib_libXau/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXAU - bool "libXau" - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XUTIL_UTIL_MACROS - help - X.Org Xau library diff --git a/package.bak/x11r7/xlib_libXau/xlib_libXau.hash b/package.bak/x11r7/xlib_libXau/xlib_libXau.hash deleted file mode 100644 index b6c8de73c1..0000000000 --- a/package.bak/x11r7/xlib_libXau/xlib_libXau.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-May/055728.html -sha256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 libXau-1.0.8.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXau/xlib_libXau.mk b/package.bak/x11r7/xlib_libXau/xlib_libXau.mk deleted file mode 100644 index 1c50cb2e4e..0000000000 --- a/package.bak/x11r7/xlib_libXau/xlib_libXau.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# xlib_libXau -# -################################################################################ - -XLIB_LIBXAU_VERSION = 1.0.8 -XLIB_LIBXAU_SOURCE = libXau-$(XLIB_LIBXAU_VERSION).tar.bz2 -XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXAU_LICENSE = MIT -XLIB_LIBXAU_LICENSE_FILES = COPYING -XLIB_LIBXAU_INSTALL_STAGING = YES -XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xproto_xproto -HOST_XLIB_LIBXAU_DEPENDENCIES = \ - host-pkgconf host-xutil_util-macros host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXaw/Config.in b/package.bak/x11r7/xlib_libXaw/Config.in deleted file mode 100644 index 3695bb679f..0000000000 --- a/package.bak/x11r7/xlib_libXaw/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXAW - bool "libXaw" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXPM - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xaw library diff --git a/package.bak/x11r7/xlib_libXaw/xlib_libXaw.hash b/package.bak/x11r7/xlib_libXaw/xlib_libXaw.hash deleted file mode 100644 index a948e8fd9b..0000000000 --- a/package.bak/x11r7/xlib_libXaw/xlib_libXaw.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002591.html -sha256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd libXaw-1.0.13.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXaw/xlib_libXaw.mk b/package.bak/x11r7/xlib_libXaw/xlib_libXaw.mk deleted file mode 100644 index d78adffeda..0000000000 --- a/package.bak/x11r7/xlib_libXaw/xlib_libXaw.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libXaw -# -################################################################################ - -XLIB_LIBXAW_VERSION = 1.0.13 -XLIB_LIBXAW_SOURCE = libXaw-$(XLIB_LIBXAW_VERSION).tar.bz2 -XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXAW_LICENSE = MIT -XLIB_LIBXAW_LICENSE_FILES = COPYING -XLIB_LIBXAW_INSTALL_STAGING = YES -XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXcomposite/Config.in b/package.bak/x11r7/xlib_libXcomposite/Config.in deleted file mode 100644 index 14da977af0..0000000000 --- a/package.bak/x11r7/xlib_libXcomposite/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXCOMPOSITE - bool "libXcomposite" - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xcomposite library diff --git a/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash b/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash deleted file mode 100644 index b0c3211f12..0000000000 --- a/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055221.html -sha256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 libXcomposite-0.4.4.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk deleted file mode 100644 index f0e59cba1d..0000000000 --- a/package.bak/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libXcomposite -# -################################################################################ - -XLIB_LIBXCOMPOSITE_VERSION = 0.4.4 -XLIB_LIBXCOMPOSITE_SOURCE = libXcomposite-$(XLIB_LIBXCOMPOSITE_VERSION).tar.bz2 -XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXCOMPOSITE_LICENSE = MIT -XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING -XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES -XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXcursor/Config.in b/package.bak/x11r7/xlib_libXcursor/Config.in deleted file mode 100644 index 6519cc7667..0000000000 --- a/package.bak/x11r7/xlib_libXcursor/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXCURSOR - bool "libXcursor" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xcursor library diff --git a/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.hash b/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.hash deleted file mode 100644 index 0135ac9dd0..0000000000 --- a/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002229.html -sha256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df libXcursor-1.1.14.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.mk deleted file mode 100644 index c59c01a51f..0000000000 --- a/package.bak/x11r7/xlib_libXcursor/xlib_libXcursor.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xlib_libXcursor -# -################################################################################ - -XLIB_LIBXCURSOR_VERSION = 1.1.14 -XLIB_LIBXCURSOR_SOURCE = libXcursor-$(XLIB_LIBXCURSOR_VERSION).tar.bz2 -XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXCURSOR_LICENSE = MIT -XLIB_LIBXCURSOR_LICENSE_FILES = COPYING -XLIB_LIBXCURSOR_INSTALL_STAGING = YES -XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto -HOST_XLIB_LIBXCURSOR_DEPENDENCIES = \ - host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender \ - host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXdamage/Config.in b/package.bak/x11r7/xlib_libXdamage/Config.in deleted file mode 100644 index 242748663c..0000000000 --- a/package.bak/x11r7/xlib_libXdamage/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXDAMAGE - bool "libXdamage" - select BR2_PACKAGE_XPROTO_DAMAGEPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xdamage library diff --git a/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.hash b/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.hash deleted file mode 100644 index 343cbf4a68..0000000000 --- a/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-January/055220.html -sha256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad libXdamage-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.mk deleted file mode 100644 index 9f982eef10..0000000000 --- a/package.bak/x11r7/xlib_libXdamage/xlib_libXdamage.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libXdamage -# -################################################################################ - -XLIB_LIBXDAMAGE_VERSION = 1.1.4 -XLIB_LIBXDAMAGE_SOURCE = libXdamage-$(XLIB_LIBXDAMAGE_VERSION).tar.bz2 -XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXDAMAGE_LICENSE = MIT -XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING -XLIB_LIBXDAMAGE_INSTALL_STAGING = YES -XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXdmcp/Config.in b/package.bak/x11r7/xlib_libXdmcp/Config.in deleted file mode 100644 index 218ff1598b..0000000000 --- a/package.bak/x11r7/xlib_libXdmcp/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXDMCP - bool "libXdmcp" - select BR2_PACKAGE_XUTIL_UTIL_MACROS - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xdmcp library diff --git a/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash b/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash deleted file mode 100644 index 6b50cb1c79..0000000000 --- a/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-March/002554.html -sha256 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2 libXdmcp-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk deleted file mode 100644 index ec1b861b92..0000000000 --- a/package.bak/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xlib_libXdmcp -# -################################################################################ - -XLIB_LIBXDMCP_VERSION = 1.1.2 -XLIB_LIBXDMCP_SOURCE = libXdmcp-$(XLIB_LIBXDMCP_VERSION).tar.bz2 -XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXDMCP_LICENSE = MIT -XLIB_LIBXDMCP_LICENSE_FILES = COPYING -XLIB_LIBXDMCP_INSTALL_STAGING = YES -XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto -HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXext/Config.in b/package.bak/x11r7/xlib_libXext/Config.in deleted file mode 100644 index 823a165bf2..0000000000 --- a/package.bak/x11r7/xlib_libXext/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXEXT - bool "libXext" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xext library diff --git a/package.bak/x11r7/xlib_libXext/xlib_libXext.hash b/package.bak/x11r7/xlib_libXext/xlib_libXext.hash deleted file mode 100644 index 45b754448c..0000000000 --- a/package.bak/x11r7/xlib_libXext/xlib_libXext.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2014-July/056771.html -sha256 b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35 libXext-1.3.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXext/xlib_libXext.mk b/package.bak/x11r7/xlib_libXext/xlib_libXext.mk deleted file mode 100644 index 211c85360a..0000000000 --- a/package.bak/x11r7/xlib_libXext/xlib_libXext.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXext -# -################################################################################ - -XLIB_LIBXEXT_VERSION = 1.3.3 -XLIB_LIBXEXT_SOURCE = libXext-$(XLIB_LIBXEXT_VERSION).tar.bz2 -XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXEXT_LICENSE = MIT -XLIB_LIBXEXT_LICENSE_FILES = COPYING -XLIB_LIBXEXT_INSTALL_STAGING = YES -XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto -XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXfixes/Config.in b/package.bak/x11r7/xlib_libXfixes/Config.in deleted file mode 100644 index 9bbabb2558..0000000000 --- a/package.bak/x11r7/xlib_libXfixes/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXFIXES - bool "libXfixes" - select BR2_PACKAGE_XPROTO_FIXESPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xfixes library diff --git a/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.hash b/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.hash deleted file mode 100644 index d96e5c6a70..0000000000 --- a/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002722.html -sha256 de1cd33aff226e08cefd0e6759341c2c8e8c9faf8ce9ac6ec38d43e287b22ad6 libXfixes-5.0.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.mk deleted file mode 100644 index b7d835bb30..0000000000 --- a/package.bak/x11r7/xlib_libXfixes/xlib_libXfixes.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# xlib_libXfixes -# -################################################################################ - -XLIB_LIBXFIXES_VERSION = 5.0.3 -XLIB_LIBXFIXES_SOURCE = libXfixes-$(XLIB_LIBXFIXES_VERSION).tar.bz2 -XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFIXES_LICENSE = MIT -XLIB_LIBXFIXES_LICENSE_FILES = COPYING -XLIB_LIBXFIXES_INSTALL_STAGING = YES -XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto -HOST_XLIB_LIBXFIXES_DEPENDENCIES = \ - host-xproto_fixesproto host-xlib_libX11 host-xproto_xextproto \ - host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXfont/Config.in b/package.bak/x11r7/xlib_libXfont/Config.in deleted file mode 100644 index cc1da0ea39..0000000000 --- a/package.bak/x11r7/xlib_libXfont/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXFONT - bool "libXfont" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XLIB_LIBFONTENC - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XFONT_ENCODINGS - help - X.Org Xfont library diff --git a/package.bak/x11r7/xlib_libXfont/xlib_libXfont.hash b/package.bak/x11r7/xlib_libXfont/xlib_libXfont.hash deleted file mode 100644 index 6db8339ce4..0000000000 --- a/package.bak/x11r7/xlib_libXfont/xlib_libXfont.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-August/002702.html -sha256 02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71 libXfont-1.5.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXfont/xlib_libXfont.mk b/package.bak/x11r7/xlib_libXfont/xlib_libXfont.mk deleted file mode 100644 index 422c01d152..0000000000 --- a/package.bak/x11r7/xlib_libXfont/xlib_libXfont.mk +++ /dev/null @@ -1,35 +0,0 @@ -################################################################################ -# -# xlib_libXfont -# -################################################################################ - -XLIB_LIBXFONT_VERSION = 1.5.2 -XLIB_LIBXFONT_SOURCE = libXfont-$(XLIB_LIBXFONT_VERSION).tar.bz2 -XLIB_LIBXFONT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFONT_LICENSE = MIT -XLIB_LIBXFONT_LICENSE_FILES = COPYING -XLIB_LIBXFONT_AUTORECONF = YES -XLIB_LIBXFONT_INSTALL_STAGING = YES - -XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings - -HOST_XLIB_LIBXFONT_DEPENDENCIES = \ - host-freetype host-xlib_libfontenc host-xlib_xtrans \ - host-xproto_fontsproto host-xproto_xproto host-xfont_encodings - -XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs -HOST_XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs - -ifeq ($(BR2_microblaze),y) -# The microblaze toolchains don't define the __ELF__ preprocessor -# symbol even though they do use the elf format. LibXfont checks for -# this symbol to know if weak symbols are supported, and otherwise -# falls back to emulation code using dlopen - Causing linker issues -# for stuff using libXfont. -# Work around it by defining the symbol here as well. -XLIB_LIBXFONT_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D__ELF__" -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXfont2/Config.in b/package.bak/x11r7/xlib_libXfont2/Config.in deleted file mode 100644 index 6cba46586b..0000000000 --- a/package.bak/x11r7/xlib_libXfont2/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXFONT2 - bool "libXfont2" - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XLIB_LIBFONTENC - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XFONT_ENCODINGS - help - X.Org Xfont library diff --git a/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.hash b/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.hash deleted file mode 100644 index 81a3c9f1ea..0000000000 --- a/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2015-December/002663.html -sha256 e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e libXfont2-2.0.1.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.mk deleted file mode 100644 index fef1e68323..0000000000 --- a/package.bak/x11r7/xlib_libXfont2/xlib_libXfont2.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# xlib_libXfont2 -# -################################################################################ - -XLIB_LIBXFONT2_VERSION = 2.0.1 -XLIB_LIBXFONT2_SOURCE = libXfont2-$(XLIB_LIBXFONT2_VERSION).tar.bz2 -XLIB_LIBXFONT2_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFONT2_LICENSE = MIT -XLIB_LIBXFONT2_LICENSE_FILES = COPYING -XLIB_LIBXFONT2_INSTALL_STAGING = YES -XLIB_LIBXFONT2_DEPENDENCIES = \ - freetype \ - xlib_libfontenc \ - xlib_xtrans \ - xproto_fontsproto \ - xproto_xproto \ - xfont_encodings - -HOST_XLIB_LIBXFONT2_DEPENDENCIES = \ - host-freetype \ - host-xlib_libfontenc \ - host-xlib_xtrans \ - host-xproto_fontsproto \ - host-xproto_xproto \ - host-xfont_encodings - -XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs -HOST_XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXft/Config.in b/package.bak/x11r7/xlib_libXft/Config.in deleted file mode 100644 index 6eef170177..0000000000 --- a/package.bak/x11r7/xlib_libXft/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXFT - bool "libXft" - select BR2_PACKAGE_FONTCONFIG - select BR2_PACKAGE_FREETYPE - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xft library diff --git a/package.bak/x11r7/xlib_libXft/xlib_libXft.hash b/package.bak/x11r7/xlib_libXft/xlib_libXft.hash deleted file mode 100644 index 6eacf06ef1..0000000000 --- a/package.bak/x11r7/xlib_libXft/xlib_libXft.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2014-June/056668.html -sha256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c libXft-2.3.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXft/xlib_libXft.mk b/package.bak/x11r7/xlib_libXft/xlib_libXft.mk deleted file mode 100644 index de9b47093b..0000000000 --- a/package.bak/x11r7/xlib_libXft/xlib_libXft.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXft -# -################################################################################ - -XLIB_LIBXFT_VERSION = 2.3.2 -XLIB_LIBXFT_SOURCE = libXft-$(XLIB_LIBXFT_VERSION).tar.bz2 -XLIB_LIBXFT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXFT_LICENSE = MIT -XLIB_LIBXFT_LICENSE_FILES = COPYING -XLIB_LIBXFT_AUTORECONF = YES -XLIB_LIBXFT_INSTALL_STAGING = YES -XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXi/Config.in b/package.bak/x11r7/xlib_libXi/Config.in deleted file mode 100644 index 3ae22d6305..0000000000 --- a/package.bak/x11r7/xlib_libXi/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXI - bool "libXi" - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - help - X.Org Xi library diff --git a/package.bak/x11r7/xlib_libXi/xlib_libXi.hash b/package.bak/x11r7/xlib_libXi/xlib_libXi.hash deleted file mode 100644 index 9f2c3e30b7..0000000000 --- a/package.bak/x11r7/xlib_libXi/xlib_libXi.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002768.html -sha256 c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45 libXi-1.7.9.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXi/xlib_libXi.mk b/package.bak/x11r7/xlib_libXi/xlib_libXi.mk deleted file mode 100644 index d593c1e95a..0000000000 --- a/package.bak/x11r7/xlib_libXi/xlib_libXi.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# xlib_libXi -# -################################################################################ - -XLIB_LIBXI_VERSION = 1.7.9 -XLIB_LIBXI_SOURCE = libXi-$(XLIB_LIBXI_VERSION).tar.bz2 -XLIB_LIBXI_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXI_LICENSE = MIT -XLIB_LIBXI_LICENSE_FILES = COPYING -XLIB_LIBXI_INSTALL_STAGING = YES -XLIB_LIBXI_DEPENDENCIES = \ - host-pkgconf \ - xproto_inputproto \ - xproto_xproto \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXfixes - -XLIB_LIBXI_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXinerama/Config.in b/package.bak/x11r7/xlib_libXinerama/Config.in deleted file mode 100644 index 5a79b4eb76..0000000000 --- a/package.bak/x11r7/xlib_libXinerama/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXINERAMA - bool "libXinerama" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_XINERAMAPROTO - help - X.Org Xinerama library diff --git a/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.hash b/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.hash deleted file mode 100644 index 6dfd7770d2..0000000000 --- a/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002231.html -sha256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 libXinerama-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.mk deleted file mode 100644 index ee8bf55602..0000000000 --- a/package.bak/x11r7/xlib_libXinerama/xlib_libXinerama.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXinerama -# -################################################################################ - -XLIB_LIBXINERAMA_VERSION = 1.1.3 -XLIB_LIBXINERAMA_SOURCE = libXinerama-$(XLIB_LIBXINERAMA_VERSION).tar.bz2 -XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXINERAMA_LICENSE = MIT -XLIB_LIBXINERAMA_LICENSE_FILES = COPYING -XLIB_LIBXINERAMA_INSTALL_STAGING = YES -XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto -XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXmu/Config.in b/package.bak/x11r7/xlib_libXmu/Config.in deleted file mode 100644 index ed239dc11c..0000000000 --- a/package.bak/x11r7/xlib_libXmu/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXMU - bool "libXmu" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xmu library diff --git a/package.bak/x11r7/xlib_libXmu/xlib_libXmu.hash b/package.bak/x11r7/xlib_libXmu/xlib_libXmu.hash deleted file mode 100644 index 2c96d960b4..0000000000 --- a/package.bak/x11r7/xlib_libXmu/xlib_libXmu.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2013-September/056009.html -sha256 756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b libXmu-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXmu/xlib_libXmu.mk b/package.bak/x11r7/xlib_libXmu/xlib_libXmu.mk deleted file mode 100644 index 261f871387..0000000000 --- a/package.bak/x11r7/xlib_libXmu/xlib_libXmu.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libXmu -# -################################################################################ - -XLIB_LIBXMU_VERSION = 1.1.2 -XLIB_LIBXMU_SOURCE = libXmu-$(XLIB_LIBXMU_VERSION).tar.bz2 -XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXMU_LICENSE = MIT -XLIB_LIBXMU_LICENSE_FILES = COPYING -XLIB_LIBXMU_INSTALL_STAGING = YES -XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXpm/0001-fork-check.patch b/package.bak/x11r7/xlib_libXpm/0001-fork-check.patch deleted file mode 100644 index fb4fb7d133..0000000000 --- a/package.bak/x11r7/xlib_libXpm/0001-fork-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -Allow usage when fork() is not available - -When fork() is not available, we need to define NO_ZPIPE so that -libXpm doesn't try to fork/exec to use a pipe to uncompress compressed -.xpm files. There is obviously a loss of functionality, but loading -uncompressed .xpm files should continue to work. - -Signed-off-by: Thomas Petazzoni - -Index: b/configure.ac -=================================================================== ---- a/configure.ac -+++ b/configure.ac -@@ -22,6 +22,7 @@ - - # Checks for library functions - AC_CHECK_FUNCS([strlcat]) -+AC_CHECK_FUNC([fork],[], AC_DEFINE(NO_ZPIPE)) - - # Obtain compiler/linker options for dependencies - PKG_CHECK_MODULES(XPM, xproto x11) diff --git a/package.bak/x11r7/xlib_libXpm/Config.in b/package.bak/x11r7/xlib_libXpm/Config.in deleted file mode 100644 index 528498cb43..0000000000 --- a/package.bak/x11r7/xlib_libXpm/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXPM - bool "libXpm" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xpm library diff --git a/package.bak/x11r7/xlib_libXpm/xlib_libXpm.hash b/package.bak/x11r7/xlib_libXpm/xlib_libXpm.hash deleted file mode 100644 index d94a902682..0000000000 --- a/package.bak/x11r7/xlib_libXpm/xlib_libXpm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-December/002752.html -sha256 fd6a6de3da48de8d1bb738ab6be4ad67f7cb0986c39bd3f7d51dd24f7854bdec libXpm-3.5.12.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXpm/xlib_libXpm.mk b/package.bak/x11r7/xlib_libXpm/xlib_libXpm.mk deleted file mode 100644 index c8c5496514..0000000000 --- a/package.bak/x11r7/xlib_libXpm/xlib_libXpm.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libXpm -# -################################################################################ - -XLIB_LIBXPM_VERSION = 3.5.12 -XLIB_LIBXPM_SOURCE = libXpm-$(XLIB_LIBXPM_VERSION).tar.bz2 -XLIB_LIBXPM_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXPM_LICENSE = MIT -XLIB_LIBXPM_LICENSE_FILES = COPYING -XLIB_LIBXPM_INSTALL_STAGING = YES -# we patch configure.ac -XLIB_LIBXPM_AUTORECONF = YES -XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) \ - host-gettext - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXrandr/Config.in b/package.bak/x11r7/xlib_libXrandr/Config.in deleted file mode 100644 index 3b3ebd5790..0000000000 --- a/package.bak/x11r7/xlib_libXrandr/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXRANDR - bool "libXrandr" - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xrandr library diff --git a/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.hash b/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.hash deleted file mode 100644 index 84a50cb5de..0000000000 --- a/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002724.html -sha256 1ff9e7fa0e4adea912b16a5f0cfa7c1d35b0dcda0e216831f7715c8a3abcf51a libXrandr-1.5.1.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.mk deleted file mode 100644 index 0fd298c50d..0000000000 --- a/package.bak/x11r7/xlib_libXrandr/xlib_libXrandr.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXrandr -# -################################################################################ - -XLIB_LIBXRANDR_VERSION = 1.5.1 -XLIB_LIBXRANDR_SOURCE = libXrandr-$(XLIB_LIBXRANDR_VERSION).tar.bz2 -XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXRANDR_LICENSE = MIT -XLIB_LIBXRANDR_LICENSE_FILES = COPYING -XLIB_LIBXRANDR_INSTALL_STAGING = YES -XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto -XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXrender/Config.in b/package.bak/x11r7/xlib_libXrender/Config.in deleted file mode 100644 index c723e4df46..0000000000 --- a/package.bak/x11r7/xlib_libXrender/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXRENDER - bool "libXrender" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xrender library diff --git a/package.bak/x11r7/xlib_libXrender/xlib_libXrender.hash b/package.bak/x11r7/xlib_libXrender/xlib_libXrender.hash deleted file mode 100644 index bbc5b898b3..0000000000 --- a/package.bak/x11r7/xlib_libXrender/xlib_libXrender.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002725.html -sha256 c06d5979f86e64cabbde57c223938db0b939dff49fdb5a793a1d3d0396650949 libXrender-0.9.10.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXrender/xlib_libXrender.mk b/package.bak/x11r7/xlib_libXrender/xlib_libXrender.mk deleted file mode 100644 index 6134c45386..0000000000 --- a/package.bak/x11r7/xlib_libXrender/xlib_libXrender.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libXrender -# -################################################################################ - -XLIB_LIBXRENDER_VERSION = 0.9.10 -XLIB_LIBXRENDER_SOURCE = libXrender-$(XLIB_LIBXRENDER_VERSION).tar.bz2 -XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXRENDER_LICENSE = MIT -XLIB_LIBXRENDER_LICENSE_FILES = COPYING -XLIB_LIBXRENDER_INSTALL_STAGING = YES -XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto -HOST_XLIB_LIBXRENDER_DEPENDENCIES = \ - host-xlib_libX11 host-xproto_renderproto host-xproto_xproto - -XLIB_LIBXRENDER_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libXres/Config.in b/package.bak/x11r7/xlib_libXres/Config.in deleted file mode 100644 index 39abbbfd33..0000000000 --- a/package.bak/x11r7/xlib_libXres/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXRES - bool "libXres" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_RESOURCEPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org XRes library diff --git a/package.bak/x11r7/xlib_libXres/xlib_libXres.hash b/package.bak/x11r7/xlib_libXres/xlib_libXres.hash deleted file mode 100644 index 063df8e954..0000000000 --- a/package.bak/x11r7/xlib_libXres/xlib_libXres.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002233.html -sha256 26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5 libXres-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXres/xlib_libXres.mk b/package.bak/x11r7/xlib_libXres/xlib_libXres.mk deleted file mode 100644 index 853f54205e..0000000000 --- a/package.bak/x11r7/xlib_libXres/xlib_libXres.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXres -# -################################################################################ - -XLIB_LIBXRES_VERSION = 1.0.7 -XLIB_LIBXRES_SOURCE = libXres-$(XLIB_LIBXRES_VERSION).tar.bz2 -XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXRES_LICENSE = MIT -XLIB_LIBXRES_LICENSE_FILES = COPYING -XLIB_LIBXRES_INSTALL_STAGING = YES -XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto -XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch b/package.bak/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch deleted file mode 100644 index ccc684fc73..0000000000 --- a/package.bak/x11r7/xlib_libXt/0001-util-don-t-link-makestrs-with-target-cflags.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 3f064076c783914cafdff028db303681dae4291d Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Thu, 15 Nov 2012 18:31:53 +0100 -Subject: [PATCH] libXt: util: don't link makestrs with target cflags - -The line: - -AM_CFLAGS = $(XT_CFLAGS) - -in util/Makefile.am is wrong because it adds target cflags to the -compilation of makestrs, which is built for the build machine, which -leads to build failures when cross-compiling. - -Signed-off-by: Thomas Petazzoni ---- - util/Makefile.am | 1 - - util/makestrs.c | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/util/Makefile.am b/util/Makefile.am -index dedfa6b..cc6f3fc 100644 ---- a/util/Makefile.am -+++ b/util/Makefile.am -@@ -10,7 +10,6 @@ EXTRA_DIST = \ - StrDefs.ht \ - string.list - --AM_CFLAGS = $(XT_CFLAGS) - makestrs_SOURCES = makestrs.c - - --- -1.7.9.5 diff --git a/package.bak/x11r7/xlib_libXt/Config.in b/package.bak/x11r7/xlib_libXt/Config.in deleted file mode 100644 index 6557e20bcd..0000000000 --- a/package.bak/x11r7/xlib_libXt/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXT - bool "libXt" - select BR2_PACKAGE_XLIB_LIBSM - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XCB_PROTO - select BR2_PACKAGE_LIBXCB - help - X.Org Xt library diff --git a/package.bak/x11r7/xlib_libXt/xlib_libXt.hash b/package.bak/x11r7/xlib_libXt/xlib_libXt.hash deleted file mode 100644 index 751c370986..0000000000 --- a/package.bak/x11r7/xlib_libXt/xlib_libXt.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002594.html -sha256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a libXt-1.1.5.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXt/xlib_libXt.mk b/package.bak/x11r7/xlib_libXt/xlib_libXt.mk deleted file mode 100644 index 4715ac642f..0000000000 --- a/package.bak/x11r7/xlib_libXt/xlib_libXt.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xlib_libXt -# -################################################################################ - -XLIB_LIBXT_VERSION = 1.1.5 -XLIB_LIBXT_SOURCE = libXt-$(XLIB_LIBXT_VERSION).tar.bz2 -XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXT_LICENSE = MIT -XLIB_LIBXT_LICENSE_FILES = COPYING -XLIB_LIBXT_INSTALL_STAGING = YES -XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto -XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull --disable-install-makestrs -XLIB_LIBXT_AUTORECONF = YES - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXtst/Config.in b/package.bak/x11r7/xlib_libXtst/Config.in deleted file mode 100644 index 8853bde8d4..0000000000 --- a/package.bak/x11r7/xlib_libXtst/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXTST - bool "libXtst" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_RECORDPROTO - help - X.Org Xtst library diff --git a/package.bak/x11r7/xlib_libXtst/xlib_libXtst.hash b/package.bak/x11r7/xlib_libXtst/xlib_libXtst.hash deleted file mode 100644 index 7e55a75e27..0000000000 --- a/package.bak/x11r7/xlib_libXtst/xlib_libXtst.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002726.html -sha256 4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204 libXtst-1.2.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXtst/xlib_libXtst.mk b/package.bak/x11r7/xlib_libXtst/xlib_libXtst.mk deleted file mode 100644 index d71290ae40..0000000000 --- a/package.bak/x11r7/xlib_libXtst/xlib_libXtst.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xlib_libXtst -# -################################################################################ - -XLIB_LIBXTST_VERSION = 1.2.3 -XLIB_LIBXTST_SOURCE = libXtst-$(XLIB_LIBXTST_VERSION).tar.bz2 -XLIB_LIBXTST_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXTST_LICENSE = MIT -XLIB_LIBXTST_LICENSE_FILES = COPYING -XLIB_LIBXTST_INSTALL_STAGING = YES - -XLIB_LIBXTST_DEPENDENCIES = \ - xlib_libX11 \ - xlib_libXext \ - xlib_libXi \ - xproto_recordproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXv/Config.in b/package.bak/x11r7/xlib_libXv/Config.in deleted file mode 100644 index 90f07f34be..0000000000 --- a/package.bak/x11r7/xlib_libXv/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXV - bool "libXv" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xv library diff --git a/package.bak/x11r7/xlib_libXv/xlib_libXv.hash b/package.bak/x11r7/xlib_libXv/xlib_libXv.hash deleted file mode 100644 index 4cb26eac71..0000000000 --- a/package.bak/x11r7/xlib_libXv/xlib_libXv.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002727.html -sha256 d26c13eac99ac4504c532e8e76a1c8e4bd526471eb8a0a4ff2a88db60cb0b088 libXv-1.0.11.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXv/xlib_libXv.mk b/package.bak/x11r7/xlib_libXv/xlib_libXv.mk deleted file mode 100644 index 26f8badc5c..0000000000 --- a/package.bak/x11r7/xlib_libXv/xlib_libXv.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXv -# -################################################################################ - -XLIB_LIBXV_VERSION = 1.0.11 -XLIB_LIBXV_SOURCE = libXv-$(XLIB_LIBXV_VERSION).tar.bz2 -XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXV_LICENSE = MIT -XLIB_LIBXV_LICENSE_FILES = COPYING -XLIB_LIBXV_INSTALL_STAGING = YES -XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto -XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXvMC/Config.in b/package.bak/x11r7/xlib_libXvMC/Config.in deleted file mode 100644 index 90c0e74e45..0000000000 --- a/package.bak/x11r7/xlib_libXvMC/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXVMC - bool "libXvMC" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXV - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org XvMC library diff --git a/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.hash b/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.hash deleted file mode 100644 index 380c811989..0000000000 --- a/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-October/002728.html -sha256 e501a079b5dfaef0897c56152770c77e05e362065cec58910289aa567277ee2e libXvMC-1.0.10.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.mk deleted file mode 100644 index cb39c29f21..0000000000 --- a/package.bak/x11r7/xlib_libXvMC/xlib_libXvMC.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXvMC -# -################################################################################ - -XLIB_LIBXVMC_VERSION = 1.0.10 -XLIB_LIBXVMC_SOURCE = libXvMC-$(XLIB_LIBXVMC_VERSION).tar.bz2 -XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXVMC_LICENSE = MIT -XLIB_LIBXVMC_LICENSE_FILES = COPYING -XLIB_LIBXVMC_INSTALL_STAGING = YES -XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto -XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXxf86dga/Config.in b/package.bak/x11r7/xlib_libXxf86dga/Config.in deleted file mode 100644 index 8276b7178f..0000000000 --- a/package.bak/x11r7/xlib_libXxf86dga/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXXF86DGA - bool "libXxf86dga" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xxf86dga library diff --git a/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash b/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash deleted file mode 100644 index 29560b7e8d..0000000000 --- a/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2013-May/002235.html -sha256 8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e libXxf86dga-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk deleted file mode 100644 index eea756bdb2..0000000000 --- a/package.bak/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXxf86dga -# -################################################################################ - -XLIB_LIBXXF86DGA_VERSION = 1.1.4 -XLIB_LIBXXF86DGA_SOURCE = libXxf86dga-$(XLIB_LIBXXF86DGA_VERSION).tar.bz2 -XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXXF86DGA_LICENSE = MIT -XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING -XLIB_LIBXXF86DGA_INSTALL_STAGING = YES -XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto -XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libXxf86vm/Config.in b/package.bak/x11r7/xlib_libXxf86vm/Config.in deleted file mode 100644 index 9e32188ec8..0000000000 --- a/package.bak/x11r7/xlib_libXxf86vm/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXXF86VM - bool "libXxf86vm" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org Xxf86vm library diff --git a/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash b/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash deleted file mode 100644 index cece6b56d0..0000000000 --- a/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002539.html -sha1 78ef18ca2be157131899e01c62679e247409a13f libXxf86vm-1.1.4.tar.bz2 -sha256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 libXxf86vm-1.1.4.tar.bz2 diff --git a/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk deleted file mode 100644 index f650fe4e2a..0000000000 --- a/package.bak/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libXxf86vm -# -################################################################################ - -XLIB_LIBXXF86VM_VERSION = 1.1.4 -XLIB_LIBXXF86VM_SOURCE = libXxf86vm-$(XLIB_LIBXXF86VM_VERSION).tar.bz2 -XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXXF86VM_LICENSE = MIT -XLIB_LIBXXF86VM_LICENSE_FILES = COPYING -XLIB_LIBXXF86VM_INSTALL_STAGING = YES -XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto -XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libdmx/Config.in b/package.bak/x11r7/xlib_libdmx/Config.in deleted file mode 100644 index 879f6895c3..0000000000 --- a/package.bak/x11r7/xlib_libdmx/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBDMX - bool "libdmx" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XPROTO_DMXPROTO - help - X.Org dmx library diff --git a/package.bak/x11r7/xlib_libdmx/xlib_libdmx.hash b/package.bak/x11r7/xlib_libdmx/xlib_libdmx.hash deleted file mode 100644 index 9f715359be..0000000000 --- a/package.bak/x11r7/xlib_libdmx/xlib_libdmx.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg-announce/2013-May/002225.html -sha256 c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 libdmx-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libdmx/xlib_libdmx.mk b/package.bak/x11r7/xlib_libdmx/xlib_libdmx.mk deleted file mode 100644 index fbe3067fe1..0000000000 --- a/package.bak/x11r7/xlib_libdmx/xlib_libdmx.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xlib_libdmx -# -################################################################################ - -XLIB_LIBDMX_VERSION = 1.1.3 -XLIB_LIBDMX_SOURCE = libdmx-$(XLIB_LIBDMX_VERSION).tar.bz2 -XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBDMX_LICENSE = MIT -XLIB_LIBDMX_LICENSE_FILES = COPYING -XLIB_LIBDMX_INSTALL_STAGING = YES -XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto -XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_libfontenc/Config.in b/package.bak/x11r7/xlib_libfontenc/Config.in deleted file mode 100644 index d25e96a5a5..0000000000 --- a/package.bak/x11r7/xlib_libfontenc/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBFONTENC - bool "libfontenc" - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_ZLIB - help - X.Org fontenc library diff --git a/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.hash b/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.hash deleted file mode 100644 index 251a1d686f..0000000000 --- a/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002589.html -sha256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 libfontenc-1.1.3.tar.bz2 diff --git a/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.mk deleted file mode 100644 index e2c4c6e8d9..0000000000 --- a/package.bak/x11r7/xlib_libfontenc/xlib_libfontenc.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xlib_libfontenc -# -################################################################################ - -XLIB_LIBFONTENC_VERSION = 1.1.3 -XLIB_LIBFONTENC_SOURCE = libfontenc-$(XLIB_LIBFONTENC_VERSION).tar.bz2 -XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBFONTENC_LICENSE = MIT -XLIB_LIBFONTENC_LICENSE_FILES = COPYING -XLIB_LIBFONTENC_INSTALL_STAGING = YES -XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto -HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libxkbfile/Config.in b/package.bak/x11r7/xlib_libxkbfile/Config.in deleted file mode 100644 index ccd35fa10f..0000000000 --- a/package.bak/x11r7/xlib_libxkbfile/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXKBFILE - bool "libxkbfile" - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XPROTO_KBPROTO - help - X.Org xkbfile library diff --git a/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash b/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash deleted file mode 100644 index 759b2aef83..0000000000 --- a/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002592.html -sha256 51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a libxkbfile-1.0.9.tar.bz2 diff --git a/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk deleted file mode 100644 index c69d73118f..0000000000 --- a/package.bak/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xlib_libxkbfile -# -################################################################################ - -XLIB_LIBXKBFILE_VERSION = 1.0.9 -XLIB_LIBXKBFILE_SOURCE = libxkbfile-$(XLIB_LIBXKBFILE_VERSION).tar.bz2 -XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXKBFILE_LICENSE = MIT -XLIB_LIBXKBFILE_LICENSE_FILES = COPYING -XLIB_LIBXKBFILE_INSTALL_STAGING = YES -XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto -HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xlib_libxshmfence/Config.in b/package.bak/x11r7/xlib_libxshmfence/Config.in deleted file mode 100644 index d0595f6d67..0000000000 --- a/package.bak/x11r7/xlib_libxshmfence/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XLIB_LIBXSHMFENCE - bool "libxshmfence" - select BR2_PACKAGE_XPROTO_XPROTO - help - X.Org shmfence library diff --git a/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash b/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash deleted file mode 100644 index 05eb07111b..0000000000 --- a/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-January/002515.html -sha256 d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c libxshmfence-1.2.tar.bz2 diff --git a/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk deleted file mode 100644 index 3a2f32623a..0000000000 --- a/package.bak/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_libxshmfence -# -################################################################################ - -XLIB_LIBXSHMFENCE_VERSION = 1.2 -XLIB_LIBXSHMFENCE_SOURCE = libxshmfence-$(XLIB_LIBXSHMFENCE_VERSION).tar.bz2 -XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_LIBXSHMFENCE_LICENSE = MIT -XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING -XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES -XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xlib_xtrans/Config.in b/package.bak/x11r7/xlib_xtrans/Config.in deleted file mode 100644 index 7c8bae7912..0000000000 --- a/package.bak/x11r7/xlib_xtrans/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XLIB_XTRANS - bool "xtrans" - help - X.Org xtrans library diff --git a/package.bak/x11r7/xlib_xtrans/xlib_xtrans.hash b/package.bak/x11r7/xlib_xtrans/xlib_xtrans.hash deleted file mode 100644 index 26c69a0c83..0000000000 --- a/package.bak/x11r7/xlib_xtrans/xlib_xtrans.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-September/002481.html -sha1 2d3ae1839d841f568bc481c6116af7d2a9f9ba59 xtrans-1.3.5.tar.bz2 -sha256 adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 xtrans-1.3.5.tar.bz2 diff --git a/package.bak/x11r7/xlib_xtrans/xlib_xtrans.mk b/package.bak/x11r7/xlib_xtrans/xlib_xtrans.mk deleted file mode 100644 index 40f613cc35..0000000000 --- a/package.bak/x11r7/xlib_xtrans/xlib_xtrans.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xlib_xtrans -# -################################################################################ - -XLIB_XTRANS_VERSION = 1.3.5 -XLIB_XTRANS_SOURCE = xtrans-$(XLIB_XTRANS_VERSION).tar.bz2 -XLIB_XTRANS_SITE = http://xorg.freedesktop.org/releases/individual/lib -XLIB_XTRANS_LICENSE = MIT -XLIB_XTRANS_LICENSE_FILES = COPYING -XLIB_XTRANS_INSTALL_STAGING = YES - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_applewmproto/Config.in b/package.bak/x11r7/xproto_applewmproto/Config.in deleted file mode 100644 index 51a5fd5ce6..0000000000 --- a/package.bak/x11r7/xproto_applewmproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_APPLEWMPROTO - bool "applewmproto" - help - No description available diff --git a/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.hash b/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.hash deleted file mode 100644 index 695de3cd14..0000000000 --- a/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1371 -md5 c1d50749c3ac5215a1a9425818e856c1 applewmproto-1.4.2.tar.bz2 -sha1 71dd2374e745a7db7ae0e94410e55ba721683d10 applewmproto-1.4.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.mk deleted file mode 100644 index 998d0aa33b..0000000000 --- a/package.bak/x11r7/xproto_applewmproto/xproto_applewmproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_applewmproto -# -################################################################################ - -XPROTO_APPLEWMPROTO_VERSION = 1.4.2 -XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2 -XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_APPLEWMPROTO_LICENSE = MIT -XPROTO_APPLEWMPROTO_LICENSE_FILES = COPYING -XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES -XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_bigreqsproto/Config.in b/package.bak/x11r7/xproto_bigreqsproto/Config.in deleted file mode 100644 index c431ef2bbb..0000000000 --- a/package.bak/x11r7/xproto_bigreqsproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_BIGREQSPROTO - bool "bigreqsproto" - help - X.Org BigReqs protocol headers diff --git a/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash b/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash deleted file mode 100644 index 7d70dca8cc..0000000000 --- a/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e bigreqsproto-1.1.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk deleted file mode 100644 index bca5a3cdfd..0000000000 --- a/package.bak/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_bigreqsproto -# -################################################################################ - -XPROTO_BIGREQSPROTO_VERSION = 1.1.2 -XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2 -XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_BIGREQSPROTO_LICENSE = MIT -XPROTO_BIGREQSPROTO_LICENSE_FILES = COPYING -XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES -XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_compositeproto/Config.in b/package.bak/x11r7/xproto_compositeproto/Config.in deleted file mode 100644 index 136900a07d..0000000000 --- a/package.bak/x11r7/xproto_compositeproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_COMPOSITEPROTO - bool "compositeproto" - help - X.Org Composite protocol headers diff --git a/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.hash b/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.hash deleted file mode 100644 index c6ef73c213..0000000000 --- a/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1193 -md5 98482f65ba1e74a08bf5b056a4031ef0 compositeproto-0.4.2.tar.bz2 -sha1 aa7b5abcfd5bbfad7cb681ce89dc1d6e381e3044 compositeproto-0.4.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.mk deleted file mode 100644 index 21613582ec..0000000000 --- a/package.bak/x11r7/xproto_compositeproto/xproto_compositeproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_compositeproto -# -################################################################################ - -XPROTO_COMPOSITEPROTO_VERSION = 0.4.2 -XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2 -XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_COMPOSITEPROTO_LICENSE = MIT -XPROTO_COMPOSITEPROTO_LICENSE_FILES = COPYING -XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES -XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_damageproto/Config.in b/package.bak/x11r7/xproto_damageproto/Config.in deleted file mode 100644 index 068ed2b406..0000000000 --- a/package.bak/x11r7/xproto_damageproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_DAMAGEPROTO - bool "damageproto" - help - X.Org Damage protocol headers diff --git a/package.bak/x11r7/xproto_damageproto/xproto_damageproto.hash b/package.bak/x11r7/xproto_damageproto/xproto_damageproto.hash deleted file mode 100644 index e5064b62a5..0000000000 --- a/package.bak/x11r7/xproto_damageproto/xproto_damageproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1194 -md5 998e5904764b82642cc63d97b4ba9e95 damageproto-1.2.1.tar.bz2 -sha1 bd0f0f4dc8f37eaabd9279d10fe2889710507358 damageproto-1.2.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_damageproto/xproto_damageproto.mk b/package.bak/x11r7/xproto_damageproto/xproto_damageproto.mk deleted file mode 100644 index 0311ea4901..0000000000 --- a/package.bak/x11r7/xproto_damageproto/xproto_damageproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_damageproto -# -################################################################################ - -XPROTO_DAMAGEPROTO_VERSION = 1.2.1 -XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2 -XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_DAMAGEPROTO_LICENSE = MIT -XPROTO_DAMAGEPROTO_LICENSE_FILES = COPYING -XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES -XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_dmxproto/Config.in b/package.bak/x11r7/xproto_dmxproto/Config.in deleted file mode 100644 index dc048b1fd1..0000000000 --- a/package.bak/x11r7/xproto_dmxproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_DMXPROTO - bool "dmxproto" - help - X.Org DMX protocol headers diff --git a/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.hash b/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.hash deleted file mode 100644 index 041f580e47..0000000000 --- a/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1306 -md5 4ee175bbd44d05c34d43bb129be5098a dmxproto-2.3.1.tar.bz2 -sha1 3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91 dmxproto-2.3.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.mk deleted file mode 100644 index 4cc795c212..0000000000 --- a/package.bak/x11r7/xproto_dmxproto/xproto_dmxproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_dmxproto -# -################################################################################ - -XPROTO_DMXPROTO_VERSION = 2.3.1 -XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2 -XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_DMXPROTO_LICENSE = MIT -XPROTO_DMXPROTO_LICENSE_FILES = COPYING -XPROTO_DMXPROTO_INSTALL_STAGING = YES -XPROTO_DMXPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_dri2proto/Config.in b/package.bak/x11r7/xproto_dri2proto/Config.in deleted file mode 100644 index 3fe5aa1ad1..0000000000 --- a/package.bak/x11r7/xproto_dri2proto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_DRI2PROTO - bool "dri2proto" - help - X.Org DRI2 protocol headers diff --git a/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.hash b/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.hash deleted file mode 100644 index e3ea0bc1e9..0000000000 --- a/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1731 -sha256 f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 dri2proto-2.8.tar.bz2 diff --git a/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.mk deleted file mode 100644 index e4ed7d8bf8..0000000000 --- a/package.bak/x11r7/xproto_dri2proto/xproto_dri2proto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_dri2proto -# -################################################################################ - -XPROTO_DRI2PROTO_VERSION = 2.8 -XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2 -XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_DRI2PROTO_LICENSE = MIT -XPROTO_DRI2PROTO_LICENSE_FILES = COPYING -XPROTO_DRI2PROTO_INSTALL_STAGING = YES -XPROTO_DRI2PROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_dri3proto/Config.in b/package.bak/x11r7/xproto_dri3proto/Config.in deleted file mode 100644 index eead7d4784..0000000000 --- a/package.bak/x11r7/xproto_dri3proto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_DRI3PROTO - bool "dri3proto" - help - X.Org DRI3 protocol headers diff --git a/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.hash b/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.hash deleted file mode 100644 index 6e1da4d3f2..0000000000 --- a/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2079 -sha256 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 dri3proto-1.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.mk b/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.mk deleted file mode 100644 index bdbff74ffc..0000000000 --- a/package.bak/x11r7/xproto_dri3proto/xproto_dri3proto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_dri3proto -# -################################################################################ - -XPROTO_DRI3PROTO_VERSION = 1.0 -XPROTO_DRI3PROTO_SOURCE = dri3proto-$(XPROTO_DRI3PROTO_VERSION).tar.bz2 -XPROTO_DRI3PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_DRI3PROTO_LICENSE = MIT -XPROTO_DRI3PROTO_INSTALL_STAGING = YES -# this package does not contain any binary files -XPROTO_DRI3PROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_fixesproto/Config.in b/package.bak/x11r7/xproto_fixesproto/Config.in deleted file mode 100644 index d419fa13d1..0000000000 --- a/package.bak/x11r7/xproto_fixesproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_FIXESPROTO - bool "fixesproto" - help - X.Org Fixes protocol headers diff --git a/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.hash b/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.hash deleted file mode 100644 index d19f392442..0000000000 --- a/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1352 -md5 e7431ab84d37b2678af71e29355e101d fixesproto-5.0.tar.bz2 -sha1 ab605af5da8c98c0c2f8b2c578fed7c864ee996a fixesproto-5.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.mk deleted file mode 100644 index 55212b2678..0000000000 --- a/package.bak/x11r7/xproto_fixesproto/xproto_fixesproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_fixesproto -# -################################################################################ - -XPROTO_FIXESPROTO_VERSION = 5.0 -XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2 -XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_FIXESPROTO_LICENSE = MIT -XPROTO_FIXESPROTO_LICENSE_FILES = COPYING -XPROTO_FIXESPROTO_INSTALL_STAGING = YES -XPROTO_FIXESPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_fontcacheproto/Config.in b/package.bak/x11r7/xproto_fontcacheproto/Config.in deleted file mode 100644 index daa6c7f20b..0000000000 --- a/package.bak/x11r7/xproto_fontcacheproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_FONTCACHEPROTO - bool "fontcacheproto" - help - X.Org Fontcache protocol headers diff --git a/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash b/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash deleted file mode 100644 index 7363e224bb..0000000000 --- a/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/834 -md5 a8a50e5e995bfacb0359575faf7f6906 fontcacheproto-0.1.3.tar.bz2 -sha1 07f6ab3e1e1efe71c51f50e95851d93d2a1de773 fontcacheproto-0.1.3.tar.bz2 diff --git a/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk deleted file mode 100644 index 0cb205ad59..0000000000 --- a/package.bak/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_fontcacheproto -# -################################################################################ - -XPROTO_FONTCACHEPROTO_VERSION = 0.1.3 -XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2 -XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_FONTCACHEPROTO_LICENSE = MIT -XPROTO_FONTCACHEPROTO_LICENSE_FILES = COPYING -XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES -XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_fontsproto/Config.in b/package.bak/x11r7/xproto_fontsproto/Config.in deleted file mode 100644 index b00220c277..0000000000 --- a/package.bak/x11r7/xproto_fontsproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_FONTSPROTO - bool "fontsproto" - help - X.Org Fonts protocol headers diff --git a/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.hash b/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.hash deleted file mode 100644 index 6a21058b91..0000000000 --- a/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/archives/xorg/2014-April/056540.html -sha256 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8 fontsproto-2.1.3.tar.bz2 diff --git a/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.mk deleted file mode 100644 index b4e6d6a848..0000000000 --- a/package.bak/x11r7/xproto_fontsproto/xproto_fontsproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_fontsproto -# -################################################################################ - -XPROTO_FONTSPROTO_VERSION = 2.1.3 -XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2 -XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_FONTSPROTO_LICENSE = MIT -XPROTO_FONTSPROTO_LICENSE_FILES = COPYING -XPROTO_FONTSPROTO_INSTALL_STAGING = YES -XPROTO_FONTSPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_glproto/Config.in b/package.bak/x11r7/xproto_glproto/Config.in deleted file mode 100644 index 28ceb9cc80..0000000000 --- a/package.bak/x11r7/xproto_glproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_GLPROTO - bool "glproto" - help - X.Org GL protocol headers diff --git a/package.bak/x11r7/xproto_glproto/xproto_glproto.hash b/package.bak/x11r7/xproto_glproto/xproto_glproto.hash deleted file mode 100644 index fce6a22222..0000000000 --- a/package.bak/x11r7/xproto_glproto/xproto_glproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 glproto-1.4.17.tar.bz2 diff --git a/package.bak/x11r7/xproto_glproto/xproto_glproto.mk b/package.bak/x11r7/xproto_glproto/xproto_glproto.mk deleted file mode 100644 index ccfc6de666..0000000000 --- a/package.bak/x11r7/xproto_glproto/xproto_glproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_glproto -# -################################################################################ - -XPROTO_GLPROTO_VERSION = 1.4.17 -XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2 -XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_GLPROTO_LICENSE = MIT -XPROTO_GLPROTO_LICENSE_FILES = COPYING -XPROTO_GLPROTO_INSTALL_STAGING = YES -XPROTO_GLPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_inputproto/Config.in b/package.bak/x11r7/xproto_inputproto/Config.in deleted file mode 100644 index fcccb26cac..0000000000 --- a/package.bak/x11r7/xproto_inputproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_INPUTPROTO - bool "inputproto" - help - X.Org Input protocol headers diff --git a/package.bak/x11r7/xproto_inputproto/xproto_inputproto.hash b/package.bak/x11r7/xproto_inputproto/xproto_inputproto.hash deleted file mode 100644 index 4ecdddc56d..0000000000 --- a/package.bak/x11r7/xproto_inputproto/xproto_inputproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2016-April/002682.html -sha256 893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d inputproto-2.3.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_inputproto/xproto_inputproto.mk b/package.bak/x11r7/xproto_inputproto/xproto_inputproto.mk deleted file mode 100644 index 20169b5c46..0000000000 --- a/package.bak/x11r7/xproto_inputproto/xproto_inputproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_inputproto -# -################################################################################ - -XPROTO_INPUTPROTO_VERSION = 2.3.2 -XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2 -XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_INPUTPROTO_LICENSE = MIT -XPROTO_INPUTPROTO_LICENSE_FILES = COPYING -XPROTO_INPUTPROTO_INSTALL_STAGING = YES -XPROTO_INPUTPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_kbproto/Config.in b/package.bak/x11r7/xproto_kbproto/Config.in deleted file mode 100644 index ce568d7ad8..0000000000 --- a/package.bak/x11r7/xproto_kbproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_KBPROTO - bool "kbproto" - help - X.Org KB protocol headers diff --git a/package.bak/x11r7/xproto_kbproto/xproto_kbproto.hash b/package.bak/x11r7/xproto_kbproto/xproto_kbproto.hash deleted file mode 100644 index c98e595a16..0000000000 --- a/package.bak/x11r7/xproto_kbproto/xproto_kbproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-April/002595.html -sha256 f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857 kbproto-1.0.7.tar.bz2 diff --git a/package.bak/x11r7/xproto_kbproto/xproto_kbproto.mk b/package.bak/x11r7/xproto_kbproto/xproto_kbproto.mk deleted file mode 100644 index b6c818f705..0000000000 --- a/package.bak/x11r7/xproto_kbproto/xproto_kbproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_kbproto -# -################################################################################ - -XPROTO_KBPROTO_VERSION = 1.0.7 -XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2 -XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_KBPROTO_LICENSE = MIT -XPROTO_KBPROTO_LICENSE_FILES = COPYING -XPROTO_KBPROTO_INSTALL_STAGING = YES -XPROTO_KBPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_presentproto/Config.in b/package.bak/x11r7/xproto_presentproto/Config.in deleted file mode 100644 index 586008df4a..0000000000 --- a/package.bak/x11r7/xproto_presentproto/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_XPROTO_PRESENTPROTO - bool "presentproto" - select BR2_PACKAGE_XUTIL_UTIL_MACROS - help - X.Org Present extension headers diff --git a/package.bak/x11r7/xproto_presentproto/xproto_presentproto.hash b/package.bak/x11r7/xproto_presentproto/xproto_presentproto.hash deleted file mode 100644 index aa45d9167e..0000000000 --- a/package.bak/x11r7/xproto_presentproto/xproto_presentproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002770.html -sha256 f69b23a8869f78a5898aaf53938b829c8165e597cda34f06024d43ee1e6d26b9 presentproto-1.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_presentproto/xproto_presentproto.mk b/package.bak/x11r7/xproto_presentproto/xproto_presentproto.mk deleted file mode 100644 index 0097b9cddb..0000000000 --- a/package.bak/x11r7/xproto_presentproto/xproto_presentproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_presentproto -# -################################################################################ - -XPROTO_PRESENTPROTO_VERSION = 1.1 -XPROTO_PRESENTPROTO_SOURCE = presentproto-$(XPROTO_PRESENTPROTO_VERSION).tar.bz2 -XPROTO_PRESENTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_PRESENTPROTO_LICENSE = MIT -XPROTO_PRESENTPROTO_LICENSE_FILES = presentproto.h -XPROTO_PRESENTPROTO_DEPENDENCIES = host-pkgconf xutil_util-macros -XPROTO_PRESENTPROTO_INSTALL_STAGING = YES -XPROTO_PRESENTPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_randrproto/Config.in b/package.bak/x11r7/xproto_randrproto/Config.in deleted file mode 100644 index 097ec8f220..0000000000 --- a/package.bak/x11r7/xproto_randrproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_RANDRPROTO - bool "randrproto" - help - X.Org Randr protocol headers diff --git a/package.bak/x11r7/xproto_randrproto/xproto_randrproto.hash b/package.bak/x11r7/xproto_randrproto/xproto_randrproto.hash deleted file mode 100644 index c71df7f8a0..0000000000 --- a/package.bak/x11r7/xproto_randrproto/xproto_randrproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2015-May/002605.html -sha1 bc420745dc4af011988e9dcabdadf8829cbc2374 randrproto-1.5.0.tar.bz2 -sha256 4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468 randrproto-1.5.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_randrproto/xproto_randrproto.mk b/package.bak/x11r7/xproto_randrproto/xproto_randrproto.mk deleted file mode 100644 index f6c4878104..0000000000 --- a/package.bak/x11r7/xproto_randrproto/xproto_randrproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_randrproto -# -################################################################################ - -XPROTO_RANDRPROTO_VERSION = 1.5.0 -XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2 -XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_RANDRPROTO_LICENSE = MIT -XPROTO_RANDRPROTO_LICENSE_FILES = COPYING -XPROTO_RANDRPROTO_INSTALL_STAGING = YES -XPROTO_RANDRPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_recordproto/Config.in b/package.bak/x11r7/xproto_recordproto/Config.in deleted file mode 100644 index 9fd5b884f8..0000000000 --- a/package.bak/x11r7/xproto_recordproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_RECORDPROTO - bool "recordproto" - help - X.Org Record protocol headers diff --git a/package.bak/x11r7/xproto_recordproto/xproto_recordproto.hash b/package.bak/x11r7/xproto_recordproto/xproto_recordproto.hash deleted file mode 100644 index bc03f8c4b5..0000000000 --- a/package.bak/x11r7/xproto_recordproto/xproto_recordproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 recordproto-1.14.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_recordproto/xproto_recordproto.mk b/package.bak/x11r7/xproto_recordproto/xproto_recordproto.mk deleted file mode 100644 index 2d2cceac22..0000000000 --- a/package.bak/x11r7/xproto_recordproto/xproto_recordproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_recordproto -# -################################################################################ - -XPROTO_RECORDPROTO_VERSION = 1.14.2 -XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2 -XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_RECORDPROTO_LICENSE = MIT -XPROTO_RECORDPROTO_LICENSE_FILES = COPYING -XPROTO_RECORDPROTO_INSTALL_STAGING = YES -XPROTO_RECORDPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_renderproto/Config.in b/package.bak/x11r7/xproto_renderproto/Config.in deleted file mode 100644 index 5b5806fa47..0000000000 --- a/package.bak/x11r7/xproto_renderproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_RENDERPROTO - bool "renderproto" - help - X.Org Render protocol headers diff --git a/package.bak/x11r7/xproto_renderproto/xproto_renderproto.hash b/package.bak/x11r7/xproto_renderproto/xproto_renderproto.hash deleted file mode 100644 index 92763da921..0000000000 --- a/package.bak/x11r7/xproto_renderproto/xproto_renderproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537 renderproto-0.11.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_renderproto/xproto_renderproto.mk b/package.bak/x11r7/xproto_renderproto/xproto_renderproto.mk deleted file mode 100644 index 41a8445409..0000000000 --- a/package.bak/x11r7/xproto_renderproto/xproto_renderproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_renderproto -# -################################################################################ - -XPROTO_RENDERPROTO_VERSION = 0.11.1 -XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2 -XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_RENDERPROTO_LICENSE = MIT -XPROTO_RENDERPROTO_LICENSE_FILES = COPYING -XPROTO_RENDERPROTO_INSTALL_STAGING = YES -XPROTO_RENDERPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_resourceproto/Config.in b/package.bak/x11r7/xproto_resourceproto/Config.in deleted file mode 100644 index 4aec708c4a..0000000000 --- a/package.bak/x11r7/xproto_resourceproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_RESOURCEPROTO - bool "resourceproto" - help - X.Org Resource protocol headers diff --git a/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.hash b/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.hash deleted file mode 100644 index 5ceb1c04ae..0000000000 --- a/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1404 -md5 cfdb57dae221b71b2703f8e2980eaaf4 resourceproto-1.2.0.tar.bz2 -sha1 9ff9bb9243b0474330959dc3853973523c9dd9ce resourceproto-1.2.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.mk deleted file mode 100644 index 960ca13372..0000000000 --- a/package.bak/x11r7/xproto_resourceproto/xproto_resourceproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_resourceproto -# -################################################################################ - -XPROTO_RESOURCEPROTO_VERSION = 1.2.0 -XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2 -XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_RESOURCEPROTO_LICENSE = MIT -XPROTO_RESOURCEPROTO_LICENSE_FILES = COPYING -XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES -XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_scrnsaverproto/Config.in b/package.bak/x11r7/xproto_scrnsaverproto/Config.in deleted file mode 100644 index 83176a0d56..0000000000 --- a/package.bak/x11r7/xproto_scrnsaverproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO - bool "scrnsaverproto" - help - X.Org ScrnSaver protocol headers diff --git a/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash b/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash deleted file mode 100644 index 36c10362b2..0000000000 --- a/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65 scrnsaverproto-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk deleted file mode 100644 index 57047cf5a7..0000000000 --- a/package.bak/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_scrnsaverproto -# -################################################################################ - -XPROTO_SCRNSAVERPROTO_VERSION = 1.2.2 -XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2 -XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_SCRNSAVERPROTO_LICENSE = MIT -XPROTO_SCRNSAVERPROTO_LICENSE_FILES = COPYING -XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES -XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_videoproto/Config.in b/package.bak/x11r7/xproto_videoproto/Config.in deleted file mode 100644 index 271c78f39d..0000000000 --- a/package.bak/x11r7/xproto_videoproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_VIDEOPROTO - bool "videoproto" - help - X.Org Video protocol headers diff --git a/package.bak/x11r7/xproto_videoproto/xproto_videoproto.hash b/package.bak/x11r7/xproto_videoproto/xproto_videoproto.hash deleted file mode 100644 index 471a0a394b..0000000000 --- a/package.bak/x11r7/xproto_videoproto/xproto_videoproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.freedesktop.org/archives/xorg-announce/2016-March/002680.html -sha256 c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702 videoproto-2.3.3.tar.bz2 diff --git a/package.bak/x11r7/xproto_videoproto/xproto_videoproto.mk b/package.bak/x11r7/xproto_videoproto/xproto_videoproto.mk deleted file mode 100644 index 896398fc7b..0000000000 --- a/package.bak/x11r7/xproto_videoproto/xproto_videoproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_videoproto -# -################################################################################ - -XPROTO_VIDEOPROTO_VERSION = 2.3.3 -XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2 -XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_VIDEOPROTO_LICENSE = MIT -XPROTO_VIDEOPROTO_LICENSE_FILES = COPYING -XPROTO_VIDEOPROTO_INSTALL_STAGING = YES -XPROTO_VIDEOPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_windowswmproto/Config.in b/package.bak/x11r7/xproto_windowswmproto/Config.in deleted file mode 100644 index d1a36acc51..0000000000 --- a/package.bak/x11r7/xproto_windowswmproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO - bool "windowswmproto" - help - No description available diff --git a/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash b/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash deleted file mode 100644 index eb96c5fa96..0000000000 --- a/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/835 -md5 e74b2ff3172a6117f2a62b655ef99064 windowswmproto-1.0.4.tar.bz2 -sha1 1c9b522c66325f08bb989700b4b31911b6ae60ae windowswmproto-1.0.4.tar.bz2 diff --git a/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk deleted file mode 100644 index 067bccf01a..0000000000 --- a/package.bak/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_windowswmproto -# -################################################################################ - -XPROTO_WINDOWSWMPROTO_VERSION = 1.0.4 -XPROTO_WINDOWSWMPROTO_SOURCE = windowswmproto-$(XPROTO_WINDOWSWMPROTO_VERSION).tar.bz2 -XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_WINDOWSWMPROTO_LICENSE = MIT -XPROTO_WINDOWSWMPROTO_LICENSE_FILES = COPYING -XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES -XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_xcmiscproto/Config.in b/package.bak/x11r7/xproto_xcmiscproto/Config.in deleted file mode 100644 index f7ba153499..0000000000 --- a/package.bak/x11r7/xproto_xcmiscproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XCMISCPROTO - bool "xcmiscproto" - help - X.Org XCMisc protocol headers diff --git a/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash b/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash deleted file mode 100644 index 08eb58bd39..0000000000 --- a/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.x.org/archive/current/src/everything/CHECKSUMS -sha256 b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df xcmiscproto-1.2.2.tar.bz2 diff --git a/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk deleted file mode 100644 index 3bef2e9792..0000000000 --- a/package.bak/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xproto_xcmiscproto -# -################################################################################ - -XPROTO_XCMISCPROTO_VERSION = 1.2.2 -XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2 -XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XCMISCPROTO_LICENSE = MIT -XPROTO_XCMISCPROTO_LICENSE_FILES = COPYING -XPROTO_XCMISCPROTO_INSTALL_STAGING = YES -XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs -HOST_XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_xextproto/Config.in b/package.bak/x11r7/xproto_xextproto/Config.in deleted file mode 100644 index d80d76ceed..0000000000 --- a/package.bak/x11r7/xproto_xextproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XEXTPROTO - bool "xextproto" - help - X.Org XExt protocol headers diff --git a/package.bak/x11r7/xproto_xextproto/xproto_xextproto.hash b/package.bak/x11r7/xproto_xextproto/xproto_xextproto.hash deleted file mode 100644 index 258c4ec7e5..0000000000 --- a/package.bak/x11r7/xproto_xextproto/xproto_xextproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.freedesktop.org/pipermail/xorg/2013-December/056256.html -sha256 f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 xextproto-7.3.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_xextproto/xproto_xextproto.mk b/package.bak/x11r7/xproto_xextproto/xproto_xextproto.mk deleted file mode 100644 index c17dd938b7..0000000000 --- a/package.bak/x11r7/xproto_xextproto/xproto_xextproto.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xproto_xextproto -# -################################################################################ - -XPROTO_XEXTPROTO_VERSION = 7.3.0 -XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2 -XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XEXTPROTO_LICENSE = MIT -XPROTO_XEXTPROTO_LICENSE_FILES = COPYING -XPROTO_XEXTPROTO_INSTALL_STAGING = YES -XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs -HOST_XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_xf86bigfontproto/Config.in b/package.bak/x11r7/xproto_xf86bigfontproto/Config.in deleted file mode 100644 index 7af30d03d7..0000000000 --- a/package.bak/x11r7/xproto_xf86bigfontproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO - bool "xf86bigfontproto" - help - X.Org XF86BigFont protocol headers diff --git a/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash b/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash deleted file mode 100644 index b0ab8aeb20..0000000000 --- a/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/734 -md5 120e226ede5a4687b25dd357cc9b8efe xf86bigfontproto-1.2.0.tar.bz2 -sha1 312a2ea708b257520c1af4393b69d73a393a478f xf86bigfontproto-1.2.0.tar.bz2 diff --git a/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk deleted file mode 100644 index f88f5ecace..0000000000 --- a/package.bak/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_xf86bigfontproto -# -################################################################################ - -XPROTO_XF86BIGFONTPROTO_VERSION = 1.2.0 -XPROTO_XF86BIGFONTPROTO_SOURCE = xf86bigfontproto-$(XPROTO_XF86BIGFONTPROTO_VERSION).tar.bz2 -XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XF86BIGFONTPROTO_LICENSE = MIT -XPROTO_XF86BIGFONTPROTO_LICENSE_FILES = COPYING -XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES -XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_xf86dgaproto/Config.in b/package.bak/x11r7/xproto_xf86dgaproto/Config.in deleted file mode 100644 index 7561b8a6dc..0000000000 --- a/package.bak/x11r7/xproto_xf86dgaproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XF86DGAPROTO - bool "xf86dgaproto" - help - X.Org XF86DGA protocol headers diff --git a/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash b/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash deleted file mode 100644 index 36284fcd52..0000000000 --- a/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/817 -md5 a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2 -sha1 97a06120e7195c968875e8ba42e82c90ab54948b xf86dgaproto-2.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk deleted file mode 100644 index d671bf0094..0000000000 --- a/package.bak/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_xf86dgaproto -# -################################################################################ - -XPROTO_XF86DGAPROTO_VERSION = 2.1 -XPROTO_XF86DGAPROTO_SOURCE = xf86dgaproto-$(XPROTO_XF86DGAPROTO_VERSION).tar.bz2 -XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XF86DGAPROTO_LICENSE = MIT -XPROTO_XF86DGAPROTO_LICENSE_FILES = COPYING -XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES -XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_xf86driproto/Config.in b/package.bak/x11r7/xproto_xf86driproto/Config.in deleted file mode 100644 index 8aeac87286..0000000000 --- a/package.bak/x11r7/xproto_xf86driproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XF86DRIPROTO - bool "xf86driproto" - help - X.Org XF86DRI protocol headers diff --git a/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash b/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash deleted file mode 100644 index 85d4bfcc9e..0000000000 --- a/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1310 -md5 1d716d0dac3b664e5ee20c69d34bc10e xf86driproto-2.1.1.tar.bz2 -sha1 23e861f40ba0f0cbbfd7db7ba2ef623762ffca17 xf86driproto-2.1.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk deleted file mode 100644 index e6bb0f12f1..0000000000 --- a/package.bak/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_xf86driproto -# -################################################################################ - -XPROTO_XF86DRIPROTO_VERSION = 2.1.1 -XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2 -XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XF86DRIPROTO_LICENSE = MIT -XPROTO_XF86DRIPROTO_LICENSE_FILES = COPYING -XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES -XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_xf86vidmodeproto/Config.in b/package.bak/x11r7/xproto_xf86vidmodeproto/Config.in deleted file mode 100644 index 395c175861..0000000000 --- a/package.bak/x11r7/xproto_xf86vidmodeproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO - bool "xf86vidmodeproto" - help - X.Org XF86VidMode protocol headers diff --git a/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash b/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash deleted file mode 100644 index d80749be60..0000000000 --- a/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1311 -md5 e793ecefeaecfeabd1aed6a01095174e xf86vidmodeproto-2.3.1.tar.bz2 -sha1 11d54c3210887631ea71e8f8030a77692e964fc4 xf86vidmodeproto-2.3.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk deleted file mode 100644 index 41637983a6..0000000000 --- a/package.bak/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_xf86vidmodeproto -# -################################################################################ - -XPROTO_XF86VIDMODEPROTO_VERSION = 2.3.1 -XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2 -XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XF86VIDMODEPROTO_LICENSE = MIT -XPROTO_XF86VIDMODEPROTO_LICENSE_FILES = COPYING -XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES -XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_xineramaproto/Config.in b/package.bak/x11r7/xproto_xineramaproto/Config.in deleted file mode 100644 index 12c8e05b16..0000000000 --- a/package.bak/x11r7/xproto_xineramaproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XINERAMAPROTO - bool "xineramaproto" - help - X.Org Xinerama protocol headers diff --git a/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash b/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash deleted file mode 100644 index 162c994898..0000000000 --- a/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1312 -md5 9959fe0bfb22a0e7260433b8d199590a xineramaproto-1.2.1.tar.bz2 -sha1 818bffc16139d6e3de4344c83f00c495d3536753 xineramaproto-1.2.1.tar.bz2 diff --git a/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk deleted file mode 100644 index 4c9ae11d28..0000000000 --- a/package.bak/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_xineramaproto -# -################################################################################ - -XPROTO_XINERAMAPROTO_VERSION = 1.2.1 -XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2 -XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XINERAMAPROTO_LICENSE = MIT -XPROTO_XINERAMAPROTO_LICENSE_FILES = COPYING -XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES -XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xproto_xproto/Config.in b/package.bak/x11r7/xproto_xproto/Config.in deleted file mode 100644 index a5f88ef7c2..0000000000 --- a/package.bak/x11r7/xproto_xproto/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XPROTO_XPROTO - bool "xproto" - help - X.Org xproto protocol headers diff --git a/package.bak/x11r7/xproto_xproto/xproto_xproto.hash b/package.bak/x11r7/xproto_xproto/xproto_xproto.hash deleted file mode 100644 index 4b77d256af..0000000000 --- a/package.bak/x11r7/xproto_xproto/xproto_xproto.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2016-September/002713.html -sha256 c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 xproto-7.0.31.tar.bz2 diff --git a/package.bak/x11r7/xproto_xproto/xproto_xproto.mk b/package.bak/x11r7/xproto_xproto/xproto_xproto.mk deleted file mode 100644 index 76f9d32b19..0000000000 --- a/package.bak/x11r7/xproto_xproto/xproto_xproto.mk +++ /dev/null @@ -1,16 +0,0 @@ -################################################################################ -# -# xproto_xproto -# -################################################################################ - -XPROTO_XPROTO_VERSION = 7.0.31 -XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2 -XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XPROTO_LICENSE = MIT -XPROTO_XPROTO_LICENSE_FILES = COPYING -XPROTO_XPROTO_INSTALL_STAGING = YES -XPROTO_XPROTO_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11r7/xproto_xproxymanagementprotocol/Config.in b/package.bak/x11r7/xproto_xproxymanagementprotocol/Config.in deleted file mode 100644 index bb31f03065..0000000000 --- a/package.bak/x11r7/xproto_xproxymanagementprotocol/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL - bool "xproxymanagementprotocol" - help - The Proxy Management Protocol is an ICE based protocol that - provides a way for application servers to easily locate - proxy services available to them. diff --git a/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash b/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash deleted file mode 100644 index 27a9dfa8a4..0000000000 --- a/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2009-October/001150.html -sha1 4abb036371670ecc25d32e48b3277fe203ae5203 xproxymanagementprotocol-1.0.3.tar.bz2 diff --git a/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk b/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk deleted file mode 100644 index a48269aa13..0000000000 --- a/package.bak/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk +++ /dev/null @@ -1,15 +0,0 @@ -################################################################################ -# -# xproto_xproxymanagementprotocol -# -################################################################################ - -XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION = 1.0.3 -XPROTO_XPROXYMANAGEMENTPROTOCOL_SOURCE = xproxymanagementprotocol-$(XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION).tar.bz2 -XPROTO_XPROXYMANAGEMENTPROTOCOL_SITE = http://xorg.freedesktop.org/releases/individual/proto -XPROTO_XPROXYMANAGEMENTPROTOCOL_LICENSE = MIT -XPROTO_XPROXYMANAGEMENTPROTOCOL_LICENSE_FILES = COPYING -XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_STAGING = YES -XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_TARGET = NO - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch b/package.bak/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch deleted file mode 100644 index 4ef95efc3e..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/1.17.4/0001-modesettings-needs-dri2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Kernel modesettings support also depends on dri2, see -http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46 - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584 - -Signed-off-by: Bernd Kuhls - -diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac ---- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200 -+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200 -@@ -2036,7 +2036,7 @@ - XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS" - fi - -- if test "x$DRM" = xyes; then -+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. - PKG_CHECK_EXISTS(libdrm >= 2.4.46) - XORG_DRIVER_MODESETTING=yes diff --git a/package.bak/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch b/package.bak/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch deleted file mode 100644 index 4ef95efc3e..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/1.19.1/0001-modesettings-needs-dri2.patch +++ /dev/null @@ -1,19 +0,0 @@ -Kernel modesettings support also depends on dri2, see -http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Makefile.am#n46 - -Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584 - -Signed-off-by: Bernd Kuhls - -diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac ---- xorg-server-1.17.2.org/configure.ac 2015-06-16 17:42:40.000000000 +0200 -+++ xorg-server-1.17.2/configure.ac 2015-08-08 10:44:59.702382624 +0200 -@@ -2036,7 +2036,7 @@ - XORG_SYS_LIBS="$XORG_SYS_LIBS $XORG_MODULES_LIBS" - fi - -- if test "x$DRM" = xyes; then -+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. - PKG_CHECK_EXISTS(libdrm >= 2.4.46) - XORG_DRIVER_MODESETTING=yes diff --git a/package.bak/x11r7/xserver_xorg-server/1.19.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package.bak/x11r7/xserver_xorg-server/1.19.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch deleted file mode 100644 index c5f04bf251..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/1.19.1/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch +++ /dev/null @@ -1,66 +0,0 @@ -Discover monotonic clock using compile-time check - -monotonic clock check does not work when cross-compiling. - -Upstream-Status: Denied [Does not work on OpenBSD] -Signed-off-by: Jussi Kukkonen - - - -Original patch follows: - -When xorg-xserver is being cross-compiled, there is currently no way -for us to detect whether the monotonic clock is available on the -target system, because we aren't able to run a test program on the host -system. Currently, in this situation, we default to not use the -monotonic clock. One problem with this situation is that the user will -be treated as idle when the date is updated. - -To fix this situation, we now use a compile-time check to detect whether the -monotonic clock is available. This check can run just fine when we are -cross-compiling. - -Signed-off-by: David James - -Downloaded from -https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch - -Signed-off-by: Bernd Kuhls ---- - configure.ac | 17 +++++++---------- - 1 file changed, 7 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f7ab48c..26e85cd 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1048,19 +1048,16 @@ if ! test "x$have_clock_gettime" = xno; then - CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=200112L" - fi - -- AC_RUN_IFELSE([AC_LANG_SOURCE([ -+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include -- --int main(int argc, char *argv[[]]) { -- struct timespec tp; -- -- if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0) -+#include -+int main() { -+#if !(defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0 && defined(CLOCK_MONOTONIC)) -+ #error No monotonic clock -+#endif - return 0; -- else -- return 1; - } -- ])], [MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no], -- [MONOTONIC_CLOCK="cross compiling"]) -+]])],[MONOTONIC_CLOCK=yes], [MONOTONIC_CLOCK=no]) - - LIBS="$LIBS_SAVE" - CPPFLAGS="$CPPFLAGS_SAVE" --- -2.1.4 - diff --git a/package.bak/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch b/package.bak/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch deleted file mode 100644 index d4f0cca67e..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/1.19.1/0003-Remove-check-for-useSIGIO-option.patch +++ /dev/null @@ -1,53 +0,0 @@ -From cf407b16cd65ad6e26a9c8e5984e163409a5c0f7 Mon Sep 17 00:00:00 2001 -From: Prabhu Sundararaj -Date: Mon, 30 Jan 2017 16:32:06 -0600 -Subject: [PATCH] Remove check for useSIGIO option - -Original patch follows: -Commit 6a5a4e60373c1386b311b2a8bb666c32d68a9d99 removes the configure of useSIGIO -option. - -As the xfree86 SIGIO support is reworked to use internal versions of OsBlockSIGIO -and OsReleaseSIGIO. - -No longer the check for useSIGIO is needed - -Upstream-Status: Pending - -Signed-off-by: Prabhu Sundararaj - -Downloaded from -https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-graphics/xorg-xserver/xserver-xorg/0003-Remove-check-for-useSIGIO-option.patch - -Signed-off-by: Mylène Josserand ---- - hw/xfree86/os-support/shared/sigio.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/hw/xfree86/os-support/shared/sigio.c b/hw/xfree86/os-support/shared/sigio.c -index 884a71c..be76498 100644 ---- a/hw/xfree86/os-support/shared/sigio.c -+++ b/hw/xfree86/os-support/shared/sigio.c -@@ -185,9 +185,6 @@ xf86InstallSIGIOHandler(int fd, void (*f) (int, void *), void *closure) - int i; - int installed = FALSE; - -- if (!xf86Info.useSIGIO) -- return 0; -- - for (i = 0; i < MAX_FUNCS; i++) { - if (!xf86SigIOFuncs[i].f) { - if (xf86IsPipe(fd)) -@@ -256,9 +253,6 @@ xf86RemoveSIGIOHandler(int fd) - int max; - int ret; - -- if (!xf86Info.useSIGIO) -- return 0; -- - max = 0; - ret = 0; - for (i = 0; i < MAX_FUNCS; i++) { --- -2.7.4 - diff --git a/package.bak/x11r7/xserver_xorg-server/Config.in b/package.bak/x11r7/xserver_xorg-server/Config.in deleted file mode 100644 index 1c8f8cfdbf..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/Config.in +++ /dev/null @@ -1,181 +0,0 @@ -comment "xorg-server needs a glibc or uClibc toolchain" - depends on BR2_arm && BR2_TOOLCHAIN_USES_MUSL - -config BR2_PACKAGE_XSERVER_XORG_SERVER - bool "xorg-server" - depends on BR2_USE_MMU # fork() - # xserver uses inb/outb on arm, which aren't available with musl - depends on !(BR2_arm && BR2_TOOLCHAIN_USES_MUSL) - # We need a SHA1 implementation. If either openssl or - # libgcrypt are already part of the build, we'll use one of - # them, otherwise, use the small libsha1 library. - select BR2_PACKAGE_LIBSHA1 if (!BR2_PACKAGE_OPENSSL && !BR2_PACKAGE_LIBGCRYPT) - select BR2_PACKAGE_MCOOKIE - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_XFONT_FONT_ALIAS if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - select BR2_PACKAGE_XFONT_FONT_MISC_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXCURSOR - select BR2_PACKAGE_XLIB_LIBXDAMAGE - select BR2_PACKAGE_XLIB_LIBXDMCP - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXFIXES - select BR2_PACKAGE_XLIB_LIBXFT - select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_XLIB_LIBXRANDR - select BR2_PACKAGE_XLIB_LIBXRENDER - select BR2_PACKAGE_XLIB_LIBXRES - select BR2_PACKAGE_XLIB_LIBXXF86VM - select BR2_PACKAGE_XLIB_LIBXKBFILE - select BR2_PACKAGE_XLIB_XTRANS - select BR2_PACKAGE_XDATA_XBITMAPS - select BR2_PACKAGE_XPROTO_BIGREQSPROTO - select BR2_PACKAGE_XPROTO_COMPOSITEPROTO - select BR2_PACKAGE_XPROTO_DAMAGEPROTO - select BR2_PACKAGE_XPROTO_FIXESPROTO - select BR2_PACKAGE_XPROTO_FONTSPROTO - select BR2_PACKAGE_XPROTO_GLPROTO - select BR2_PACKAGE_XPROTO_INPUTPROTO - select BR2_PACKAGE_XPROTO_KBPROTO - select BR2_PACKAGE_XPROTO_RANDRPROTO - select BR2_PACKAGE_XPROTO_RENDERPROTO - select BR2_PACKAGE_XPROTO_RESOURCEPROTO - select BR2_PACKAGE_XPROTO_VIDEOPROTO - select BR2_PACKAGE_XPROTO_XCMISCPROTO - select BR2_PACKAGE_XPROTO_XEXTPROTO - select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO - select BR2_PACKAGE_XPROTO_XF86DGAPROTO - select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO - select BR2_PACKAGE_XPROTO_XPROTO - select BR2_PACKAGE_XUTIL_UTIL_MACROS - select BR2_PACKAGE_XKEYBOARD_CONFIG - select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD - help - X.Org X server - - http://xorg.freedesktop.org - -if BR2_PACKAGE_XSERVER_XORG_SERVER - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 - bool - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI - int - default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 - -choice - bool "X Window System server version" - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - bool "1.19.1" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23 - select BR2_PACKAGE_XLIB_LIBXFONT2 - select BR2_PACKAGE_XPROTO_PRESENTPROTO - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - bool "1.17.4" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19 - select BR2_PACKAGE_XLIB_LIBXFONT - select BR2_PACKAGE_XPROTO_PRESENTPROTO - -config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - bool "1.14.7" - select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14 - select BR2_PACKAGE_XLIB_LIBXFONT - -endchoice - -config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION - string - default "1.19.1" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19 - default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 - -choice - prompt "X Window System server type" - help - Select the X Window System server to use - -config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR - bool "Modular X.org" - depends on BR2_INSTALL_LIBSTDCPP - select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \ - BR2_PACKAGE_XPROTO_DRI2PROTO) - select BR2_PACKAGE_LIBPCIACCESS - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO - help - This variant of the X.org server is the full-blown variant, - as used by desktop GNU/Linux distributions. The drivers (for - input and graphics) are built separately from the X.org - server (see the xdriver* packages). - -comment "Modular X.org needs a toolchain w/ C++" - depends on !BR2_INSTALL_LIBSTDCPP - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE - bool "KDrive / TinyX" - help - This variant of the X.org server is a lightweight version - intended for embedded systems. The drivers (for input and - graphics) are built into the server. It is generally used - directly on top of the Linux framebuffer without DRM or - video card specific drivers. - -endchoice - -config BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX - bool "Enable AIGLX Extension" - # AIGLX Extension removed in 1.19.0 - depends on BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14 || BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17 - help - Enable/Use AIGLX extension. - -if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV - bool "Enable KDrive/TinyX evdev input driver" - help - Enable evdev input driver in KDrive. This allows KDrive to - use input devices that are integrated in the Linux input - subsystem, i.e have a /dev/input/eventX device file. This is - most likely the input driver you want to use. - - This driver can then be enabled by running the X server - using: - - Xfbdev -keybd evdev,,device=/dev/input/eventX -mouse evdev,,device=/dev/input/eventY. - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD - bool "Enable KDrive/TinyX kbd input driver" - help - Enable kbd input driver in KDrive. It uses the console - keyboard as input device. - -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE - bool "Enable KDrive/TinyX mouse input driver" - help - Enable mouse input driver in KDrive. It supports PS/2 mice - and serial port mice. - -endif - -comment "Optional Servers" - -config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB - bool "Xvfb server" - help - Virtual frame buffer X server. - -endif diff --git a/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.hash deleted file mode 100644 index 2f13ca6419..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ /dev/null @@ -1,7 +0,0 @@ -# From http://lists.x.org/archives/xorg-announce/2014-June/002440.html -sha1 7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2 -sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html -sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2 -# From https://lists.x.org/archives/xorg-announce/2017-January/002754.html -sha256 79ae2cf39d3f6c4a91201d8dad549d1d774b3420073c5a70d390040aa965a7fb xorg-server-1.19.1.tar.bz2 diff --git a/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.mk deleted file mode 100644 index 7aebbc1d2d..0000000000 --- a/package.bak/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ /dev/null @@ -1,261 +0,0 @@ -################################################################################ -# -# xserver_xorg-server -# -################################################################################ - -XSERVER_XORG_SERVER_VERSION = $(call qstrip,$(BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION)) -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 -XSERVER_XORG_SERVER_LICENSE_FILES = COPYING -XSERVER_XORG_SERVER_INSTALL_STAGING = YES -# xfont_font-util is needed only for autoreconf -XSERVER_XORG_SERVER_AUTORECONF = YES -XSERVER_XORG_SERVER_DEPENDENCIES = \ - xfont_font-util \ - xutil_util-macros \ - xlib_libX11 \ - xlib_libXau \ - xlib_libXdmcp \ - xlib_libXext \ - xlib_libXfixes \ - xlib_libXi \ - xlib_libXrender \ - xlib_libXres \ - xlib_libXft \ - xlib_libXcursor \ - xlib_libXinerama \ - xlib_libXrandr \ - xlib_libXdamage \ - xlib_libXxf86vm \ - xlib_libxkbfile \ - xlib_xtrans \ - xdata_xbitmaps \ - xproto_bigreqsproto \ - xproto_compositeproto \ - xproto_damageproto \ - xproto_fixesproto \ - xproto_fontsproto \ - xproto_glproto \ - xproto_inputproto \ - xproto_kbproto \ - xproto_randrproto \ - xproto_renderproto \ - xproto_resourceproto \ - xproto_videoproto \ - xproto_xcmiscproto \ - xproto_xextproto \ - xproto_xf86bigfontproto \ - xproto_xf86dgaproto \ - xproto_xf86vidmodeproto \ - xproto_xproto \ - xkeyboard-config \ - pixman \ - mcookie \ - host-pkgconf - -# We force -O2 regardless of the optimization level chosen by the -# user, as the X.org server is known to trigger some compiler bugs at -# -Os on several architectures. -XSERVER_XORG_SERVER_CONF_OPTS = \ - --disable-config-hal \ - --disable-xnest \ - --disable-xephyr \ - --disable-dmx \ - --with-builder-addr=buildroot@buildroot.org \ - CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/usr/include/pixman-1 -O2" \ - --with-fontrootdir=/usr/share/fonts/X11/ \ - --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb - -ifeq ($(BR2_PACKAGE_SYSTEMD),y) -XSERVER_XORG_SERVER_CONF_OPTS += \ - --with-systemd-daemon \ - --enable-systemd-logind -XSERVER_XORG_SERVER_DEPENDENCIES += \ - systemd \ - xproto_dri2proto -else -XSERVER_XORG_SERVER_CONF_OPTS += \ - --without-systemd-daemon \ - --disable-systemd-logind -endif - -# Xwayland support needs libdrm, libepoxy, wayland and libxcomposite -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_LIBEPOXY)$(BR2_PACKAGE_WAYLAND)$(BR2_PACKAGE_WAYLAND_PROTOCOLS)$(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),yyyyy) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-xwayland -XSERVER_XORG_SERVER_DEPENDENCIES += libdrm libepoxy wayland wayland-protocols xlib_libXcomposite -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland -endif - -# Present protocol only required for xserver 1.15+, but does not matter if -# enabled for older versions as they don't use it (not even optionally). -ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xproto_presentproto -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg -XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess -ifeq ($(BR2_PACKAGE_LIBDRM),y) -XSERVER_XORG_SERVER_DEPENDENCIES += libdrm -XSERVER_XORG_SERVER_CONF_OPTS += --enable-libdrm -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-libdrm -endif -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-xorg -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y) -XSERVER_XORG_SERVER_CONF_OPTS += \ - --enable-kdrive \ - --enable-xfbdev \ - --disable-glx \ - --disable-dri \ - --disable-xsdl -define XSERVER_CREATE_X_SYMLINK - ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X -endef -XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse -endif - -else # modular -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev -endif - -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx -XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_AIGLX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-aiglx -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-aiglx -endif - -# Optional packages -ifeq ($(BR2_PACKAGE_TSLIB),y) -XSERVER_XORG_SERVER_DEPENDENCIES += tslib -XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts" -endif - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -XSERVER_XORG_SERVER_DEPENDENCIES += udev -XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev -# udev kms support depends on libdrm and dri2 -ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy) -XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms -endif -endif - -ifeq ($(BR2_PACKAGE_DBUS),y) -XSERVER_XORG_SERVER_DEPENDENCIES += dbus -XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus -endif - -ifeq ($(BR2_PACKAGE_FREETYPE),y) -XSERVER_XORG_SERVER_DEPENDENCIES += freetype -endif - -ifeq ($(BR2_PACKAGE_LIBUNWIND),y) -XSERVER_XORG_SERVER_DEPENDENCIES += libunwind -XSERVER_XORG_SERVER_CONF_OPTS += --enable-libunwind -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind -endif - -ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto -XSERVER_XORG_SERVER_CONF_OPTS += --enable-record -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-record -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2 -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont -endif - -ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) -XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXcomposite -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite -endif - -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) -ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto -XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2 -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 -endif -ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto -XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3 -ifeq ($(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yy) -XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy -XSERVER_XORG_SERVER_CONF_OPTS += --enable-glamor -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-glamor -endif -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri3 --disable-glamor -endif -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2 --disable-dri3 --disable-glamor -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXSCRNSAVER),y) -XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXScrnSaver -XSERVER_XORG_SERVER_CONF_OPTS += --enable-screensaver -else -XSERVER_XORG_SERVER_CONF_OPTS += --disable-screensaver -endif - -ifneq ($(BR2_PACKAGE_XLIB_LIBDMX),y) -XSERVER_XORG_SERVER_CONF_OPTS += --disable-dmx -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libcrypto -XSERVER_XORG_SERVER_DEPENDENCIES += openssl -else ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) -XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libgcrypt -XSERVER_XORG_SERVER_DEPENDENCIES += libgcrypt -else -XSERVER_XORG_SERVER_CONF_OPTS += --with-sha1=libsha1 -XSERVER_XORG_SERVER_DEPENDENCIES += libsha1 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/x11r7/xutil_makedepend/Config.in b/package.bak/x11r7/xutil_makedepend/Config.in deleted file mode 100644 index 0b091b0e34..0000000000 --- a/package.bak/x11r7/xutil_makedepend/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XUTIL_MAKEDEPEND - bool "makedepend" - help - No description available diff --git a/package.bak/x11r7/xutil_makedepend/xutil_makedepend.hash b/package.bak/x11r7/xutil_makedepend/xutil_makedepend.hash deleted file mode 100644 index 596551155c..0000000000 --- a/package.bak/x11r7/xutil_makedepend/xutil_makedepend.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2007 -sha256 f7a80575f3724ac3d9b19eaeab802892ece7e4b0061dd6425b4b789353e25425 makedepend-1.0.5.tar.bz2 diff --git a/package.bak/x11r7/xutil_makedepend/xutil_makedepend.mk b/package.bak/x11r7/xutil_makedepend/xutil_makedepend.mk deleted file mode 100644 index 6fd3c1ae36..0000000000 --- a/package.bak/x11r7/xutil_makedepend/xutil_makedepend.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xutil_makedepend -# -################################################################################ - -XUTIL_MAKEDEPEND_VERSION = 1.0.5 -XUTIL_MAKEDEPEND_SOURCE = makedepend-$(XUTIL_MAKEDEPEND_VERSION).tar.bz2 -XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util -XUTIL_MAKEDEPEND_LICENSE = MIT -XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING - -XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto -HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/x11vnc/Config.in b/package.bak/x11vnc/Config.in deleted file mode 100644 index 0909b9aec4..0000000000 --- a/package.bak/x11vnc/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_X11VNC - bool "x11vnc" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXTST - help - VNC server for X11 display - - http://www.karlrunge.com/x11vnc/ diff --git a/package.bak/x11vnc/x11vnc.hash b/package.bak/x11vnc/x11vnc.hash deleted file mode 100644 index 5828b12cd8..0000000000 --- a/package.bak/x11vnc/x11vnc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b x11vnc-0.9.13.tar.gz diff --git a/package.bak/x11vnc/x11vnc.mk b/package.bak/x11vnc/x11vnc.mk deleted file mode 100644 index cdb323788c..0000000000 --- a/package.bak/x11vnc/x11vnc.mk +++ /dev/null @@ -1,65 +0,0 @@ -################################################################################ -# -# x11vnc -# -################################################################################ - -X11VNC_VERSION = 0.9.13 -X11VNC_SITE = http://downloads.sourceforge.net/project/libvncserver/x11vnc/$(X11VNC_VERSION) -# sdl support is not used in x11vnc, but host include / library search paths -# leak in if host has sdl-config -X11VNC_CONF_OPTS = --without-sdl -X11VNC_DEPENDENCIES = xlib_libXt xlib_libXext xlib_libXtst -X11VNC_LICENSE = GPLv2+ -X11VNC_LICENSE_FILES = COPYING - -ifeq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_DBUS),yy) -X11VNC_DEPENDENCIES += avahi dbus -else -X11VNC_CONF_OPTS += --without-avahi -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -X11VNC_DEPENDENCIES += jpeg -else -X11VNC_CONF_OPTS += --without-jpeg -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -X11VNC_DEPENDENCIES += openssl -else -X11VNC_CONF_OPTS += --without-ssl --without-crypto -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -X11VNC_DEPENDENCIES += xlib_libXinerama -else -X11VNC_CONF_OPTS += --without-xinerama -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXRANDR),y) -X11VNC_DEPENDENCIES += xlib_libXrandr -else -X11VNC_CONF_OPTS += --without-xrandr -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFIXES),y) -X11VNC_DEPENDENCIES += xlib_libXfixes -else -X11VNC_CONF_OPTS += --without-xfixes -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXDAMAGE),y) -X11VNC_DEPENDENCIES += xlib_libXdamage -else -X11VNC_CONF_OPTS += --without-xdamage -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -X11VNC_DEPENDENCIES += zlib -else -X11VNC_CONF_OPTS += --without-zlib -endif - - -$(eval $(autotools-package)) diff --git a/package.bak/x264/Config.in b/package.bak/x264/Config.in deleted file mode 100644 index be3ab3f3e2..0000000000 --- a/package.bak/x264/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -config BR2_PACKAGE_X264 - bool "x264" - help - x264 is a free software library and application for - encoding video streams into the H.264/MPEG-4 AVC - compression format, and is released under the terms - of the GNU GPL. - - https://www.videolan.org/developers/x264.html - -if BR2_PACKAGE_X264 - -config BR2_PACKAGE_X264_CLI - bool "CLI" - help - Command-line tool to encode video streams into the - H.264/MPEG-4 AVC compression format. - -endif diff --git a/package.bak/x264/x264.hash b/package.bak/x264/x264.hash deleted file mode 100644 index 95510938e0..0000000000 --- a/package.bak/x264/x264.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 9fc4651981453d0428a2ad16889b6b63d1f2e7347ea321f20347fc3a021ee912 x264-97eaef2ab82a46d13ea5e00270712d6475fbe42b.tar.gz diff --git a/package.bak/x264/x264.mk b/package.bak/x264/x264.mk deleted file mode 100644 index 80437c408c..0000000000 --- a/package.bak/x264/x264.mk +++ /dev/null @@ -1,64 +0,0 @@ -################################################################################ -# -# x264 -# -################################################################################ - -X264_VERSION = 97eaef2ab82a46d13ea5e00270712d6475fbe42b -X264_SITE = git://git.videolan.org/x264.git -X264_LICENSE = GPLv2+ -X264_DEPENDENCIES = host-pkgconf -X264_LICENSE_FILES = COPYING -X264_INSTALL_STAGING = YES -X264_CONF_OPTS = --disable-avs - -ifeq ($(BR2_i386)$(BR2_x86_64),y) -# yasm needed for assembly files -X264_DEPENDENCIES += host-yasm -X264_CONF_ENV += AS="$(HOST_DIR)/usr/bin/yasm" -else ifeq ($(BR2_ARM_CPU_ARMV7A)$(BR2_aarch64),y) -# We need to pass gcc as AS, because the ARM assembly files have to be -# preprocessed -X264_CONF_ENV += AS="$(TARGET_CC)" -else -X264_CONF_OPTS += --disable-asm -endif - -ifeq ($(BR2_STATIC_LIBS),) -X264_CONF_OPTS += --enable-pic --enable-shared -endif - -ifeq ($(BR2_PACKAGE_X264_CLI),) -X264_CONF_OPTS += --disable-cli -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),) -X264_CONF_OPTS += --disable-thread -endif - -# the configure script is not generated by autoconf -define X264_CONFIGURE_CMDS - (cd $(@D); $(TARGET_CONFIGURE_OPTS) $(X264_CONF_ENV) ./configure \ - --prefix=/usr \ - --host="$(GNU_TARGET_NAME)" \ - --cross-prefix="$(TARGET_CROSS)" \ - --disable-ffms \ - --enable-static \ - --disable-opencl \ - $(X264_CONF_OPTS) \ - ) -endef - -define X264_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define X264_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(STAGING_DIR)" -C $(@D) install -endef - -define X264_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) DESTDIR="$(TARGET_DIR)" -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/x265/0001-fix-gcc-options.patch b/package.bak/x265/0001-fix-gcc-options.patch deleted file mode 100644 index 81518212b4..0000000000 --- a/package.bak/x265/0001-fix-gcc-options.patch +++ /dev/null @@ -1,52 +0,0 @@ -# HG changeset patch -# User Bertrand Jacquin -# Date 1444431941 -3600 -# Node ID 5c6d2a6f2f9a0534933cc999b3845be4344e1af0 -# Parent b6156a08b1def3584647f26096866c1a0c11e54a -build: Disable -march selection from CMakeLists.txt - -x32 arch as defined on https://sites.google.com/site/x32abi is neither -X86 nor X64, then forcing -march=i686 leads to build failure as wrong --march is used. - -Forcing -march, -mfloat-abi and -mfpu for ARM is also wrong - -As a global sanity sake, disable all forced -march in CMakeLists - -Backported from upstream pull request: -https://bitbucket.org/multicoreware/x265/pull-requests/21 - -Signed-off-by: Bernd Kuhls - -diff -r 58dddcf01b7d source/CMakeLists.txt ---- a/source/CMakeLists.txt Mon Jan 23 09:50:33 2017 +0530 -+++ b/source/CMakeLists.txt Mon Jan 23 21:03:10 2017 +0100 -@@ -194,28 +194,6 @@ - if(NATIVE_BUILD) - if(INTEL_CXX) - add_definitions(-xhost) -- else() -- add_definitions(-march=native) -- endif() -- elseif(X86 AND NOT X64) -- string(FIND "${CMAKE_CXX_FLAGS}" "-march" marchPos) -- if(marchPos LESS "0") -- add_definitions(-march=i686) -- if(WIN32 AND NOT INTEL_CXX AND NOT CLANG AND -- CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.0 AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 7.0) -- add_definitions(-mpreferred-stack-boundary=2) -- endif() -- endif() -- endif() -- if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- elseif(ARM) -- find_package(Neon) -- if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -- add_definitions(-DHAVE_NEON) -- else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) - endif() - endif() - add_definitions(${ARM_ARGS}) diff --git a/package.bak/x265/Config.in b/package.bak/x265/Config.in deleted file mode 100644 index 1d6eda2049..0000000000 --- a/package.bak/x265/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config BR2_PACKAGE_X265 - bool "x265" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # dlfcn - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - help - x265 is an open source free software and library for encoding video - using the High Efficiency Video Coding (HEVC/H.265) standard. x265 is - offered under either the GNU General Public License (GPL) 2 license or - a commercial license, similar to the x264 project. - - http://x265.org - -if BR2_PACKAGE_X265 - -config BR2_PACKAGE_X265_CLI - bool "CLI" - help - Command-line tool to encode video streams into the - H.265/HEVC compression format. - -endif - -comment "x265 needs a toolchain w/ C++, threads, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_TOOLCHAIN_HAS_SYNC_4 diff --git a/package.bak/x265/x265.hash b/package.bak/x265/x265.hash deleted file mode 100644 index 5672d79e0c..0000000000 --- a/package.bak/x265/x265.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally generated -sha256 b872552535e41fbffa03ba7cbcd3479c42c4053868309292e78e147b7773ac4b x265_2.2.tar.gz diff --git a/package.bak/x265/x265.mk b/package.bak/x265/x265.mk deleted file mode 100644 index 0fbdb01071..0000000000 --- a/package.bak/x265/x265.mk +++ /dev/null @@ -1,31 +0,0 @@ -################################################################################ -# -# x265 -# -################################################################################ - -X265_VERSION = 2.2 -X265_SOURCE = x265_$(X265_VERSION).tar.gz -X265_SITE = https://bitbucket.org/multicoreware/x265/downloads -X265_LICENSE = GPLv2+ -X265_LICENSE_FILES = COPYING -X265_SUBDIR = source -X265_INSTALL_STAGING = YES - -ifeq ($(BR2_i386)$(BR2_x86_64),y) -X265_DEPENDENCIES += host-yasm -endif - -ifeq ($(BR2_SHARED_LIBS)$(BR2_SHARED_STATIC_LIBS),y) -X265_CONF_OPTS += -DENABLE_SHARED=ON -DENABLE_PIC=ON -else -X265_CONF_OPTS += -DENABLE_SHARED=OFF -endif - -ifeq ($(BR2_PACKAGE_X265_CLI),y) -X265_CONF_OPTS += -DENABLE_CLI=ON -else -X265_CONF_OPTS += -DENABLE_CLI=OFF -endif - -$(eval $(cmake-package)) diff --git a/package.bak/xavante/Config.in b/package.bak/xavante/Config.in deleted file mode 100644 index be8e6d905d..0000000000 --- a/package.bak/xavante/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_XAVANTE - bool "xavante" - # Runtime dependency only - select BR2_PACKAGE_CGILUA - select BR2_PACKAGE_COPAS - select BR2_PACKAGE_COXPCALL - select BR2_PACKAGE_LUAFILESYSTEM - select BR2_PACKAGE_LUASOCKET - select BR2_PACKAGE_WSAPI - help - Xavante is a Lua HTTP 1.1 Web server that uses a modular - architecture based on URI mapped handlers. - - http://keplerproject.github.com/xavante/ diff --git a/package.bak/xavante/xavante.hash b/package.bak/xavante/xavante.hash deleted file mode 100644 index d960c2d064..0000000000 --- a/package.bak/xavante/xavante.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 d683bebdb3e1b497dc04ceb3fb8f1c8c67a6486ab0c6da0c23f281cc07a63657 xavante-2.3.0-1.src.rock diff --git a/package.bak/xavante/xavante.mk b/package.bak/xavante/xavante.mk deleted file mode 100644 index 07f9ee6fde..0000000000 --- a/package.bak/xavante/xavante.mk +++ /dev/null @@ -1,10 +0,0 @@ -################################################################################ -# -# xavante -# -################################################################################ - -XAVANTE_VERSION = 2.3.0-1 -XAVANTE_LICENSE = MIT - -$(eval $(luarocks-package)) diff --git a/package.bak/xdotool/Config.in b/package.bak/xdotool/Config.in deleted file mode 100644 index 4fb8a49502..0000000000 --- a/package.bak/xdotool/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_XDOTOOL - bool "xdotool" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_XLIB_LIBXTST - select BR2_PACKAGE_XLIB_LIBXINERAMA - select BR2_PACKAGE_LIBXKBCOMMON - select BR2_PACKAGE_XLIB_LIBX11 - help - Command-line X11 automation tool - - http://www.semicomplete.com/projects/xdotool diff --git a/package.bak/xdotool/xdotool.hash b/package.bak/xdotool/xdotool.hash deleted file mode 100644 index f8adcd5953..0000000000 --- a/package.bak/xdotool/xdotool.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed hash -sha256 b097ef0e3897d1a24e3f45f0faed58329742d3d9434b9b46eb97eb1040f999bf xdotool-v3.20150503.1.tar.gz diff --git a/package.bak/xdotool/xdotool.mk b/package.bak/xdotool/xdotool.mk deleted file mode 100644 index a799ea470f..0000000000 --- a/package.bak/xdotool/xdotool.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# xdotool -# -################################################################################ - -XDOTOOL_VERSION = v3.20150503.1 -XDOTOOL_SITE = $(call github,jordansissel,xdotool,$(XDOTOOL_VERSION)) -XDOTOOL_LICENSE = BSD-3c -XDOTOOL_LICENSE_FILES = COPYRIGHT -XDOTOOL_DEPENDENCIES = xlib_libXtst xlib_libXinerama libxkbcommon xlib_libX11 - -define XDOTOOL_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) -endef - -# Avoid 'install' target to skip 'post-install' which runs ldconfig on host -define XDOTOOL_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) \ - pre-install installlib installprog installheader \ - PREFIX="$(TARGET_DIR)/usr" -endef - -$(eval $(generic-package)) diff --git a/package.bak/xen/0001-Remove-hardcoded-strict-Werror-checking.patch b/package.bak/xen/0001-Remove-hardcoded-strict-Werror-checking.patch deleted file mode 100644 index ca772ddfb1..0000000000 --- a/package.bak/xen/0001-Remove-hardcoded-strict-Werror-checking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 234847440a5d3cf95540ea79f7a08d50cccfef73 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Tue, 13 Sep 2016 10:48:31 -0700 -Subject: [PATCH] Remove hardcoded strict -Werror checking - -Signed-off-by: Alistair Francis ---- - Config.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Config.mk b/Config.mk -index bd991c6..e7ac662 100644 ---- a/Config.mk -+++ b/Config.mk -@@ -36,7 +36,7 @@ CONFIG_$(XEN_OS) := y - SHELL ?= /bin/sh - - # Tools to run on system hosting the build --HOSTCFLAGS = -Wall -Werror -Wstrict-prototypes -O2 -fomit-frame-pointer -+HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer - HOSTCFLAGS += -fno-strict-aliasing - - DISTDIR ?= $(XEN_ROOT)/dist --- -2.7.4 - diff --git a/package.bak/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch b/package.bak/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch deleted file mode 100644 index 0d4e581af6..0000000000 --- a/package.bak/xen/0002-xen-Rules.mk-fix-build-with-CFLAGS-from-environment.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 2a310549aaeaba05f640ade43488bb893101ce4a Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sat, 29 Oct 2016 16:35:26 +0200 -Subject: [PATCH] xen/Rules.mk: fix build with CFLAGS from environment - -When CFLAGS are passed from the environment, the first-level make -invocation will append -D__OBJECT_FILE__ to it, then call a second -make invocation, that will have those new CFLAGS in its environment, -but will also append -D__OBJECT_FILE__ to those. - -Then, the compiler fails because __OBEJECT_FILE__ is defined twice. - -Just undefine it before defining it again, as a *workaround* to this -issue. - -Signed-off-by: "Yann E. MORIN" ---- - xen/Rules.mk | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xen/Rules.mk b/xen/Rules.mk -index a9fda71..09ccbfa 100644 ---- a/xen/Rules.mk -+++ b/xen/Rules.mk -@@ -49,7 +49,7 @@ ALL_OBJS-$(CONFIG_CRYPTO) += $(BASEDIR)/crypto/built_in.o - CFLAGS += -nostdinc -fno-builtin -fno-common - CFLAGS += -Werror -Wredundant-decls -Wno-pointer-arith - CFLAGS += -pipe -g -D__XEN__ -include $(BASEDIR)/include/xen/config.h --CFLAGS += '-D__OBJECT_FILE__="$@"' -+CFLAGS += -U__OBJECT_FILE__ '-D__OBJECT_FILE__="$@"' - - ifneq ($(clang),y) - # Clang doesn't understand this command line argument, and doesn't appear to --- -2.7.4 - diff --git a/package.bak/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch b/package.bak/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch deleted file mode 100644 index 80c0b3225e..0000000000 --- a/package.bak/xen/0003-tools-libxl-Disable-strict-Werror-checking.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 19f1e70041044fde1542109a0525424cc6d5d053 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Wed, 7 Dec 2016 11:35:10 -0800 -Subject: [PATCH] tools/libxl: Disable strict Werror checking - -Signed-off-by: Alistair Francis ---- - tools/libxl/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile -index defeb40..239faf3 100644 ---- a/tools/libxl/Makefile -+++ b/tools/libxl/Makefile -@@ -11,7 +11,7 @@ MINOR = 0 - XLUMAJOR = 4.7 - XLUMINOR = 0 - --CFLAGS += -Werror -Wno-format-zero-length -Wmissing-declarations \ -+CFLAGS += -Wno-format-zero-length -Wmissing-declarations \ - -Wno-declaration-after-statement -Wformat-nonliteral - CFLAGS += -I. -fPIC - --- -2.7.4 - diff --git a/package.bak/xen/Config.in b/package.bak/xen/Config.in deleted file mode 100644 index b5dcbf2592..0000000000 --- a/package.bak/xen/Config.in +++ /dev/null @@ -1,44 +0,0 @@ -config BR2_PACKAGE_XEN - bool "xen" - # needs "dmb" on ARM, so ARM >= v7 - depends on BR2_ARM_CPU_ARMV7A || BR2_aarch64 - select BR2_PACKAGE_XEN_HYPERVISOR if !BR2_PACKAGE_XEN_TOOLS - help - This package builds the Xen hypervisor and toolstack. - - http://www.xenproject.org/ - -if BR2_PACKAGE_XEN - -config BR2_PACKAGE_XEN_HYPERVISOR - bool "Xen hypervisor" - help - The Xen binaries are avaliable in /usr/lib/xen/ - See http://wiki.xenproject.org/wiki/Getting_Started for using the - Xen hypervisor. - -config BR2_PACKAGE_XEN_TOOLS - bool "Xen tools" - depends on !BR2_STATIC_LIBS # dtc (libfdt) - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2 - depends on BR2_USE_WCHAR # libglib2 - select BR2_PACKAGE_DTC - select BR2_PACKAGE_LIBAIO - select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_OPENSSL - select BR2_PACKAGE_PIXMAN - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_YAJL - select BR2_PACKAGE_ARGP_STANDALONE if !BR2_TOOLCHAIN_USES_GLIBC - help - The Xen tools can be accessed by the xl command. - -comment "xen tools need a toolchain w/ wchar, threads, dynamic library" - depends on BR2_PACKAGE_LIBAIO_ARCH_SUPPORTS - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \ - BR2_STATIC_LIBS - -endif diff --git a/package.bak/xen/xen.hash b/package.bak/xen/xen.hash deleted file mode 100644 index c3df2431e8..0000000000 --- a/package.bak/xen/xen.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 e87f4b0575e78657ee23d31470a15ecf1ce8c3a92a771cda46bbcd4d0d671ffe xen-4.7.1.tar.gz diff --git a/package.bak/xen/xen.mk b/package.bak/xen/xen.mk deleted file mode 100644 index 7d32e52702..0000000000 --- a/package.bak/xen/xen.mk +++ /dev/null @@ -1,56 +0,0 @@ -################################################################################ -# -# Xen -# -################################################################################ - -XEN_VERSION = 4.7.1 -XEN_SITE = http://bits.xensource.com/oss-xen/release/$(XEN_VERSION) -XEN_LICENSE = GPLv2 -XEN_LICENSE_FILES = COPYING -XEN_DEPENDENCIES = host-python - -# Calculate XEN_ARCH -ifeq ($(ARCH),aarch64) -XEN_ARCH = arm64 -else ifeq ($(ARCH),arm) -XEN_ARCH = arm32 -endif - -XEN_CONF_OPTS = --disable-ocamltools - -XEN_CONF_ENV = PYTHON=$(HOST_DIR)/usr/bin/python2 -XEN_MAKE_ENV = \ - XEN_TARGET_ARCH=$(XEN_ARCH) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - $(TARGET_CONFIGURE_OPTS) - -ifeq ($(BR2_PACKAGE_XEN_HYPERVISOR),y) -XEN_MAKE_OPTS += dist-xen -XEN_INSTALL_IMAGES = YES -define XEN_INSTALL_IMAGES_CMDS - cp $(@D)/xen/xen $(BINARIES_DIR) -endef -else -XEN_CONF_OPTS += --disable-xen -endif - -ifeq ($(BR2_PACKAGE_XEN_TOOLS),y) -XEN_DEPENDENCIES += dtc libaio libglib2 ncurses openssl pixman util-linux yajl -ifeq ($(BR2_PACKAGE_ARGP_STANDALONE),y) -XEN_DEPENDENCIES += argp-standalone -endif -XEN_INSTALL_TARGET_OPTS += DESTDIR=$(TARGET_DIR) install-tools -XEN_MAKE_OPTS += dist-tools - -define XEN_INSTALL_INIT_SYSV - mv $(TARGET_DIR)/etc/init.d/xencommons $(TARGET_DIR)/etc/init.d/S50xencommons - mv $(TARGET_DIR)/etc/init.d/xen-watchdog $(TARGET_DIR)/etc/init.d/S50xen-watchdog - mv $(TARGET_DIR)/etc/init.d/xendomains $(TARGET_DIR)/etc/init.d/S60xendomains -endef -else -XEN_INSTALL_TARGET = NO -XEN_CONF_OPTS += --disable-tools -endif - -$(eval $(autotools-package)) diff --git a/package.bak/xenomai/0001-bfin-remove-inline-keyword.patch b/package.bak/xenomai/0001-bfin-remove-inline-keyword.patch deleted file mode 100644 index 376bd21c37..0000000000 --- a/package.bak/xenomai/0001-bfin-remove-inline-keyword.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 2a96c8bbe19a193d9ae6d0780fc274abc4df03e3 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 5 Nov 2016 19:09:00 +0100 -Subject: [PATCH] bfin: remove inline keyword - -Xenomai user space tools fail to build for bfin target since it's -provide it's own pthread_atfork(), shm_open() and shm_unlink() -definition using the inline keyword and weak attribute. - -With gcc 5+ the weak attribute is discarded by the inline keyword, -so each symbol are global and are redefined several time while -linking. - -Fixes: -http://autobuild.buildroot.net/results/0c2/0c2e5eb4edd4f9427f61d3c9b67a12a7a0e24140 - -Patch status: upstream, -https://git.xenomai.org/xenomai-2.6.git/commit/?id=917dcebb26ec492f276cdc3b55867aa90e01fa12 - -Signed-off-by: Romain Naour ---- - include/asm-blackfin/syscall.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/include/asm-blackfin/syscall.h b/include/asm-blackfin/syscall.h -index 9eda8b9..b5728b5 100644 ---- a/include/asm-blackfin/syscall.h -+++ b/include/asm-blackfin/syscall.h -@@ -132,9 +132,9 @@ static inline int __xn_interrupted_p(struct pt_regs *regs) - #define XENOMAI_SKINCALL5(id,op,a1,a2,a3,a4,a5) XENOMAI_DO_SYSCALL(5,id,op,a1,a2,a3,a4,a5) - - /* uClibc does not provide pthread_atfork() for this arch; provide it -- here. Note: let the compiler decides whether it wants to actually -- inline this routine, i.e. do not force always_inline. */ --inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void), -+ here. -+*/ -+__attribute__((weak)) int pthread_atfork(void (*prepare)(void), - void (*parent)(void), - void (*child)(void)) - { -@@ -143,7 +143,7 @@ inline __attribute__((weak)) int pthread_atfork(void (*prepare)(void), - - #include - --inline __attribute__((weak)) int shm_open(const char *name, -+__attribute__((weak)) int shm_open(const char *name, - int oflag, - mode_t mode) - { -@@ -151,7 +151,7 @@ inline __attribute__((weak)) int shm_open(const char *name, - return -1; - } - --inline __attribute__((weak)) int shm_unlink(const char *name) -+__attribute__((weak)) int shm_unlink(const char *name) - { - errno = ENOSYS; - return -1; --- -2.5.5 - diff --git a/package.bak/xenomai/Config.in b/package.bak/xenomai/Config.in deleted file mode 100644 index 32c5124ef5..0000000000 --- a/package.bak/xenomai/Config.in +++ /dev/null @@ -1,107 +0,0 @@ -config BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS - bool - default y - depends on BR2_i386 || BR2_x86_64 || (BR2_arm && !BR2_ARM_CPU_ARMV7M) || \ - BR2_bfin || BR2_powerpc || BR2_sh4 - -comment "xenomai needs an glibc or uClibc toolchain w/ threads" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_MUSL - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS - -config BR2_PACKAGE_XENOMAI - bool "Xenomai Userspace" - depends on BR2_PACKAGE_XENOMAI_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_HAS_THREADS - # uses , __WORDSIZE and bits/local_lim.h - depends on !BR2_TOOLCHAIN_USES_MUSL - help - Real-Time Framework for Linux - http://www.xenomai.org - - Xenomai is split in two parts: a kernel part and an - userspace part. - - This package contains the userspace part, which consists - mainly in libraries to write userspace real-time programs - that interact with the in-kernel Xenomai real-time core. - - For those libraries to work, you need a Xenomai-enabled - kernel. This is possible in two ways: - - if you compile your kernel with Buildroot, you need to go - to Linux Kernel -> Linux Kernel Extensions to enable the - Xenomai extension. - - if you compile your kernel outside of Buildroot, you need - to make sure that it is Xenomai-enabled. - - Finally, if you are using a static /dev, make sure to - uncomment the Xenomai entries listed in - target/generic/device_table_dev.txt. - -if BR2_PACKAGE_XENOMAI - -config BR2_PACKAGE_XENOMAI_VERSION - string "Custom Xenomai version" - help - Manually select Xenomai version. If left empty, the default - version will be used. - - Make sure that the selected version has a patch for your - selected Linux kernel. If it does not, download and select - a patch manually with - BR2_LINUX_KERNEL_EXT_XENOMAI_ADEOS_PATCH, in the Linux - Kernel -> Linux Kernel Extensions menu. - -config BR2_PACKAGE_XENOMAI_TESTSUITE - bool "Install testsuite" - help - This option allows to install the Xenomai test programs. - -config BR2_PACKAGE_XENOMAI_RTCAN - bool "RTCan utilities" - help - This option allows to install the Xenomai RT-CAN utilities. - -config BR2_PACKAGE_XENOMAI_ANALOGY - bool "Analogy libs and utils" - help - This option allows to install the Xenomai Analogy utilities - and libraries - -config BR2_PACKAGE_XENOMAI_NATIVE_SKIN - bool "Native skin library" - default y - help - This option allows to install the Native Xenomai skin - -config BR2_PACKAGE_XENOMAI_POSIX_SKIN - bool "POSIX skin library" - default y - help - This option allows to install the POSIX Xenomai skin - -config BR2_PACKAGE_XENOMAI_VXWORKS_SKIN - bool "VX-Works skin library" - help - This option allows to install the VX-Works Xenomai skin - -config BR2_PACKAGE_XENOMAI_PSOS_SKIN - bool "PSOS skin library" - help - This option allows to install the PSOS Xenomai skin - -config BR2_PACKAGE_XENOMAI_RTAI_SKIN - bool "RTAI skin library" - help - This option allows to install the RTAI Xenomai skin - -config BR2_PACKAGE_XENOMAI_UITRON_SKIN - bool "uiTron skin library" - help - This option allows to install the uiTron Xenomai skin - -config BR2_PACKAGE_XENOMAI_VRTX_SKIN - bool "VRTX skin library" - help - This option allows to install the VRTX Xenomai skin - -endif diff --git a/package.bak/xenomai/xenomai.hash b/package.bak/xenomai/xenomai.hash deleted file mode 100644 index 4d74472ee3..0000000000 --- a/package.bak/xenomai/xenomai.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed; -sha256 b6ff723cb0f3b1c2c4e15bccfd114b248dea1b4164a0ac0e612815379ce7caf8 xenomai-2.6.4.tar.bz2 diff --git a/package.bak/xenomai/xenomai.mk b/package.bak/xenomai/xenomai.mk deleted file mode 100644 index 6e0e441636..0000000000 --- a/package.bak/xenomai/xenomai.mk +++ /dev/null @@ -1,112 +0,0 @@ -################################################################################ -# -# xenomai -# -################################################################################ - -XENOMAI_VERSION = $(call qstrip,$(BR2_PACKAGE_XENOMAI_VERSION)) -ifeq ($(XENOMAI_VERSION),) -XENOMAI_VERSION = 2.6.4 -else -BR_NO_CHECK_HASH_FOR += $(XENOMAI_SOURCE) -endif - -XENOMAI_SITE = https://xenomai.org/downloads/xenomai/stable -XENOMAI_SOURCE = xenomai-$(XENOMAI_VERSION).tar.bz2 -XENOMAI_LICENSE = GPLv2+ with exception (headers), LGPLv2.1+ (libraries), GPLv2+ (kernel), GFDLv1.2+ (docs), GPLv2 (ipipe patch, can driver) -# GFDL is not included but refers to gnu.org -XENOMAI_LICENSE_FILES = debian/copyright include/COPYING src/skins/native/COPYING ksrc/nucleus/COPYING - -XENOMAI_INSTALL_STAGING = YES -XENOMAI_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-user -XENOMAI_INSTALL_STAGING_OPTS = DESTDIR=$(STAGING_DIR) install-user - -XENOMAI_CONF_OPTS += --includedir=/usr/include/xenomai/ --disable-doc-install - -define XENOMAI_REMOVE_DEVFILES - for i in xeno-config xeno-info wrap-link.sh ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_DEVFILES - -ifeq ($(BR2_PACKAGE_XENOMAI_TESTSUITE),) -define XENOMAI_REMOVE_TESTSUITE - rm -rf $(TARGET_DIR)/usr/share/xenomai/ - for i in klatency rtdm xeno xeno-load check-vdso \ - irqloop cond-torture-posix switchtest arith \ - sigtest clocktest cyclictest latency wakeup-time \ - xeno-test cond-torture-native mutex-torture-posix \ - mutex-torture-native ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_TESTSUITE -endif - -ifeq ($(BR2_PACKAGE_XENOMAI_RTCAN),) -define XENOMAI_REMOVE_RTCAN_PROGS - for i in rtcanrecv rtcansend ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done - rm -f $(TARGET_DIR)/usr/sbin/rtcanconfig -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_RTCAN_PROGS -endif - -ifeq ($(BR2_PACKAGE_XENOMAI_ANALOGY),) -define XENOMAI_REMOVE_ANALOGY - for i in cmd_bits cmd_read cmd_write insn_write \ - insn_bits insn_read ; do \ - rm -f $(TARGET_DIR)/usr/bin/$$i ; \ - done - rm -f $(TARGET_DIR)/usr/sbin/analogy_config - rm -f $(TARGET_DIR)/usr/lib/libanalogy.* -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_ANALOGY -endif - -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_NATIVE_SKIN),,native) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_POSIX_SKIN),,posix) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VXWORKS_SKIN),,vxworks) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_PSOS_SKIN),,psos) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_RTAI_SKIN),,rtai) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_UITRON_SKIN),,uitron) -XENOMAI_REMOVE_SKIN_LIST += $(if $(BR2_PACKAGE_XENOMAI_VRTX_SKIN),,vrtx) - -define XENOMAI_REMOVE_SKINS - for i in $(XENOMAI_REMOVE_SKIN_LIST) ; do \ - rm -f $(TARGET_DIR)/usr/lib/lib$$i.* ; \ - if [ $$i == "posix" ] ; then \ - rm -f $(TARGET_DIR)/usr/lib/posix.wrappers ; \ - fi ; \ - done -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_REMOVE_SKINS - -define XENOMAI_DEVICES -/dev/rtheap c 666 0 0 10 254 0 0 - -/dev/rtscope c 666 0 0 10 253 0 0 - -/dev/rtp c 666 0 0 150 0 0 1 32 -endef - -ifeq ($(BR2_PACKAGE_HAS_UDEV),y) -XENOMAI_DEPENDENCIES += udev - -define XENOMAI_INSTALL_UDEV_RULES - if test -d $(TARGET_DIR)/etc/udev/rules.d ; then \ - for f in $(@D)/ksrc/nucleus/udev/*.rules ; do \ - cp $$f $(TARGET_DIR)/etc/udev/rules.d/ || exit 1 ; \ - done ; \ - fi; -endef - -XENOMAI_POST_INSTALL_TARGET_HOOKS += XENOMAI_INSTALL_UDEV_RULES -endif # udev - -$(eval $(autotools-package)) diff --git a/package.bak/xerces/Config.in b/package.bak/xerces/Config.in deleted file mode 100644 index 8d55a5cbc2..0000000000 --- a/package.bak/xerces/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_XERCES - bool "xerces-c++" - depends on BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR - help - Xerces-C++ is a validating XML parser written in portable C++. - - http://xml.apache.org/xerces-c/ - -comment "xerces-c++ needs a toolchain w/ C++, wchar" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) diff --git a/package.bak/xerces/xerces.hash b/package.bak/xerces/xerces.hash deleted file mode 100644 index c621f5cd56..0000000000 --- a/package.bak/xerces/xerces.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.4.tar.xz.sha256 -sha256 9973cc79481803f8b6652c52faf5195d963f50d209d4f681ec97e2aa014b6241 xerces-c-3.1.4.tar.xz diff --git a/package.bak/xerces/xerces.mk b/package.bak/xerces/xerces.mk deleted file mode 100644 index a25641fb45..0000000000 --- a/package.bak/xerces/xerces.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# xerces -# -################################################################################ - -XERCES_VERSION = 3.1.4 -XERCES_SOURCE = xerces-c-$(XERCES_VERSION).tar.xz -XERCES_SITE = http://archive.apache.org/dist/xerces/c/3/sources -XERCES_LICENSE = Apache-2.0 -XERCES_LICENSE_FILES = LICENSE -XERCES_INSTALL_STAGING = YES -XERCES_CONF_OPTS = \ - --disable-threads \ - --with-gnu-ld - -define XERCES_DISABLE_SAMPLES - $(SED) 's/ samples//' $(@D)/Makefile.in -endef - -XERCES_POST_PATCH_HOOKS += XERCES_DISABLE_SAMPLES - -ifeq ($(BR2_PACKAGE_ICU),y) -XERCES_CONF_OPTS += --with-icu=$(STAGING_DIR)/usr -XERCES_DEPENDENCIES += icu -else -XERCES_CONF_OPTS += --without-icu -endif - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -XERCES_CONF_ENV += LIBS=-liconv -XERCES_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBCURL),y) -XERCES_CONF_OPTS += --enable-netaccessor-curl --with-curl=$(STAGING_DIR)/usr/lib -XERCES_DEPENDENCIES += libcurl -else -XERCES_CONF_OPTS += --disable-network -endif - -$(eval $(autotools-package)) diff --git a/package.bak/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch b/package.bak/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch deleted file mode 100644 index 4e4160fb40..0000000000 --- a/package.bak/xfsprogs/0001-mdrestore-do-not-do-dynamic-linking-of-libtool-libra.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 770902a0a29fb4ac62358f7eacb3a83d0d9af1c7 Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 25 Nov 2015 10:50:00 +0000 -Subject: [PATCH] mdrestore: do not do dynamic linking of libtool libraries - -As explained in commit ece49daeff1a3cad765e106d678c608925c9d768, use --static-libtool-libs instead of -static to allow fallback to the dynamic -linking for libuuid only. Otherwise the build will fail like this: - -ld: attempted static link of dynamic object `/usr/lib/libuuid.so' - -Signed-off-by: Vicente Olivert Riera -[Sent upstream: http://oss.sgi.com/pipermail/xfs/2015-November/045136.html] ---- - mdrestore/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mdrestore/Makefile b/mdrestore/Makefile -index 5171306..1b34a0e 100644 ---- a/mdrestore/Makefile -+++ b/mdrestore/Makefile -@@ -10,7 +10,7 @@ CFILES = xfs_mdrestore.c - - LLDLIBS = $(LIBXFS) $(LIBRT) $(LIBPTHREAD) $(LIBUUID) - LTDEPENDENCIES = $(LIBXFS) --LLDFLAGS = -static -+LLDFLAGS = -static-libtool-libs - - default: depend $(LTCOMMAND) - --- -2.7.4 - diff --git a/package.bak/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch b/package.bak/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch deleted file mode 100644 index 372a5301bd..0000000000 --- a/package.bak/xfsprogs/0002-libxfs-do-not-try-to-run-the-crc32selftest.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3a77dfc54271059dcac305384bf6ace34fe1f3d3 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 18 Dec 2016 15:37:27 +0100 -Subject: [PATCH] libxfs: do not try to run the crc32selftest - -Even though the crc32selftest is natively compiled (because it is to be -executed), it fails in cross-compilation as the host may lack the -required headers, like uuid/uuid.h (e.g. in a minimal environment). - -Moreover, running the crc32selftest natively is completely wrong, -because it passing on the host does not mean it would still pass n the -target (because endianness or bitness or alignment differences). - -So, just disable running the crc32selftest altogether. - -Note that there's a remaining bug-in-hiding, because the crc32 table -generator is natively built, but with the target CFLAGS. - -Signed-off-by: "Yann E. MORIN" ---- - libxfs/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index 62608bd..e021625 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -112,9 +112,9 @@ LTLIBS = $(LIBPTHREAD) $(LIBRT) - # don't try linking xfs_repair with a debug libxfs. - DEBUG = -DNDEBUG - --LDIRT = gen_crc32table crc32table.h crc32selftest -+LDIRT = gen_crc32table crc32table.h - --default: crc32selftest ltdepend $(LTLIBRARY) -+default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" --- -2.7.4 - diff --git a/package.bak/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch b/package.bak/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch deleted file mode 100644 index 36896b5b95..0000000000 --- a/package.bak/xfsprogs/0003-xfsprogs-don-t-use-CFLAGS-with-BUILD_CC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From b981adb6769f6b7d80f6c98627391398a007a25b Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Tue, 15 Dec 2015 20:51:35 -0300 -Subject: [PATCH] xfsprogs: don't use CFLAGS with BUILD_CC - -When cross-compiling CFLAGS might not be suitable for the host -(BUILD_CC) compiler since it might contain arch-specific options. - -Signed-off-by: Gustavo Zacarias ---- - libxfs/Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/libxfs/Makefile b/libxfs/Makefile -index e021625..ad76a04 100644 ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -118,7 +118,7 @@ default: ltdepend $(LTLIBRARY) - - crc32table.h: gen_crc32table.c - @echo " [CC] gen_crc32table" -- $(Q) $(BUILD_CC) $(CFLAGS) -o gen_crc32table $< -+ $(Q) $(BUILD_CC) -o gen_crc32table $< - @echo " [GENERATE] $@" - $(Q) ./gen_crc32table > crc32table.h - -@@ -129,7 +129,7 @@ crc32table.h: gen_crc32table.c - # disk. - crc32selftest: gen_crc32table.c crc32table.h crc32.c - @echo " [TEST] CRC32" -- $(Q) $(BUILD_CC) $(CFLAGS) -D CRC32_SELFTEST=1 crc32.c -o $@ -+ $(Q) $(BUILD_CC) -D CRC32_SELFTEST=1 crc32.c -o $@ - $(Q) ./$@ - - # set up include/xfs header directory --- -2.7.4 - diff --git a/package.bak/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch b/package.bak/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch deleted file mode 100644 index 8ff0580f6b..0000000000 --- a/package.bak/xfsprogs/0004-build-add-EXTRALIBS-to-link-with.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1e9bb2fba94bc508659f1667bf95501324849bb9 Mon Sep 17 00:00:00 2001 -From: "Yann E. MORIN" -Date: Sun, 26 Feb 2017 12:04:54 +0100 -Subject: [PATCH] build: add EXTRALIBS to link with - -When doing a uClibc static build, the build fails to link: - http://autobuild.buildroot.org/results/503/50314716a9f72e8bb238e52e9dc342c68f7e0b8b/build-end.log - -The cause is due to: - - xfsprogs links dome programs with util-linux' libblkid - - util-linux' libblkid is linked to util-linux' libuuid - - util-linux' libuuid uses i18n functions when locales are enabled - - uClibc does not provide i18n functions - - i18n functions are provided by libintl from libintl from gettext - -util-linux installs pkg-config files for thos two libs. However, -xfsprogs does not use pkg-config to find libblkid or libuuid, thus it -misses the Libs.private field from libuid. - -In this case, it is necessary to pass LIBS=-lintl at configure time, so -that configure correctly finds libblkid. - -Still, this is not enough, because the build will not use LIBS during -the link phase. - -We fix that last bit by adding EXTRALIBS to the libraries to link with, -so that it is possible to pass EXTRALIBS=-lintl at build time: - - $ ./configure [...] LIBS=-lintl - $ make EXTRALIBS=-lintl - -Signed-off-by: "Yann E. MORIN" -Cc: Waldemar Brodkorb ---- - include/buildmacros | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/buildmacros b/include/buildmacros -index a7c5d8a..dd62d80 100644 ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -11,7 +11,7 @@ BUILDRULES = $(TOPDIR)/include/buildrules - - LDFLAGS += $(LOADERFLAGS) $(LLDFLAGS) - LTLDFLAGS += $(LOADERFLAGS) --LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) -+LDLIBS = $(LLDLIBS) $(PLDLIBS) $(MALLOCLIB) $(EXTRALIBS) - - MAKEOPTS = --no-print-directory Q=$(Q) - SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES) --- -2.7.4 - diff --git a/package.bak/xfsprogs/Config.in b/package.bak/xfsprogs/Config.in deleted file mode 100644 index 9f0d2509c0..0000000000 --- a/package.bak/xfsprogs/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -comment "xfsprogs needs a glibc or uClibc toolchain w/ threads" - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_USES_MUSL || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_XFSPROGS - bool "xfsprogs" - depends on BR2_USE_MMU # fork() - depends on !BR2_TOOLCHAIN_USES_MUSL - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - select BR2_PACKAGE_UTIL_LINUX_LIBBLKID - help - The XFS file system utilities and libraries - - http://oss.sgi.com/projects/xfs/ diff --git a/package.bak/xfsprogs/xfsprogs.hash b/package.bak/xfsprogs/xfsprogs.hash deleted file mode 100644 index e990b78d77..0000000000 --- a/package.bak/xfsprogs/xfsprogs.hash +++ /dev/null @@ -1,3 +0,0 @@ -# Locally calculated after checking pgp signature: -# https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-4.8.0.tar.sign -sha256 82ce9cb3a55f4e208e8fe3471ff0aff0602b8300f3e50bdf05cc7e11549686f9 xfsprogs-4.8.0.tar.xz diff --git a/package.bak/xfsprogs/xfsprogs.mk b/package.bak/xfsprogs/xfsprogs.mk deleted file mode 100644 index c110733c83..0000000000 --- a/package.bak/xfsprogs/xfsprogs.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# xfsprogs -# -################################################################################ - -XFSPROGS_VERSION = 4.8.0 -XFSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/fs/xfs/xfsprogs -XFSPROGS_SOURCE = xfsprogs-$(XFSPROGS_VERSION).tar.xz - -XFSPROGS_DEPENDENCIES = util-linux - -XFSPROGS_CONF_ENV = ac_cv_header_aio_h=yes ac_cv_lib_rt_lio_listio=yes -XFSPROGS_CONF_OPTS = \ - --enable-lib64=no \ - --enable-gettext=no \ - INSTALL_USER=root \ - INSTALL_GROUP=root \ - --enable-static - -# xfsprogs links some of its programs to libs from util-linux, which use -# i18n functions. For shared-only builds, that's automatically pulled in. -# Static builds need some help, though... -# -# No need to depend on gettext in this case: xfsprogs does not use it for -# itself; util-linux does need it and has it in its own dependencies. -# -# xfsprogs' buildsystem uses hand-made Makefiles, not automake, and they -# do not use the LIBS variable set by configure. So we use EXTRALIBS that -# is added by our patch. -# -# It is not needed to propagate the EXTRALIBS to the install step. -ifeq ($(BR2_STATIC_LIBS)$(BR2_SHARED_STATIC_LIBS)$(BR2_NEEDS_GETTEXT_IF_LOCALE),yy) -XFSPROGS_CONF_OPTS += LIBS=-lintl -XFSPROGS_MAKE_OPTS = EXTRALIBS=-lintl -endif - -XFSPROGS_INSTALL_TARGET_OPTS = DIST_ROOT=$(TARGET_DIR) install - -$(eval $(autotools-package)) diff --git a/package.bak/xinetd/0001-ar.patch b/package.bak/xinetd/0001-ar.patch deleted file mode 100644 index 566f2f75ee..0000000000 --- a/package.bak/xinetd/0001-ar.patch +++ /dev/null @@ -1,74 +0,0 @@ -This patch changes all of the hard-coded invocations of "ar" to $(AR), to -support a cross-compilation toolchain. - -The content of this patch was copied from the OpenWrt project: -https://dev.openwrt.org/browser/packages/net/xinetd/patches/001-ar.patch - -Signed-off-by: Danomi Manchego - ---- a/libs/src/misc/Makefile.in -+++ b/libs/src/misc/Makefile.in -@@ -62,7 +62,7 @@ - - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - install: $(LIBNAME) ---- a/libs/src/portable/Makefile.in -+++ b/libs/src/portable/Makefile.in -@@ -57,7 +57,7 @@ - - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - install: $(LIBNAME) ---- a/libs/src/pset/Makefile.in -+++ b/libs/src/pset/Makefile.in -@@ -53,7 +53,7 @@ - mv $(LIBNAME) $(LIBDIR)/optimized - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - install: $(LIBNAME) ---- a/libs/src/sio/Makefile.in -+++ b/libs/src/sio/Makefile.in -@@ -52,7 +52,7 @@ - $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - install: $(LIBNAME) ---- a/libs/src/str/Makefile.in -+++ b/libs/src/str/Makefile.in -@@ -63,7 +63,7 @@ - $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)-O - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - LINT_IGNORE=possible pointer alignment|RCSid unused ---- a/libs/src/xlog/Makefile.in -+++ b/libs/src/xlog/Makefile.in -@@ -58,7 +58,7 @@ - $(INSTALL) $(FMODE) $(LIBNAME) $(LIBDIR)/optimized - - $(LIBNAME): $(OBJECTS) -- ar r $@ $? -+ $(AR) r $@ $? - $(RANLIB) $@ - - install: $(LIBNAME) diff --git a/package.bak/xinetd/0002-destdir.patch b/package.bak/xinetd/0002-destdir.patch deleted file mode 100644 index 7a323eb68a..0000000000 --- a/package.bak/xinetd/0002-destdir.patch +++ /dev/null @@ -1,55 +0,0 @@ -This patch adds $(DESTDIR) to xinetd's installation paths, to support -installation to a cross-compiled RFS area. - -The content of this patch was inspired by the OpenWrt project: -https://dev.openwrt.org/browser/packages/net/xinetd/patches/002-destdir.patch - -Signed-off-by: Danomi Manchego - -diff -urN xinetd-2.3.15.ORIG/Makefile.in xinetd-2.3.15/Makefile.in ---- xinetd-2.3.15.ORIG/Makefile.in 2007-09-20 13:01:52.000000000 -0400 -+++ xinetd-2.3.15/Makefile.in 2012-06-18 10:20:00.540864388 -0400 -@@ -75,27 +75,27 @@ - - install: build - for i in $(DAEMONDIR) $(BINDIR) $(MANDIR)/man5 $(MANDIR)/man8 ; do \ -- test -d $$i || mkdir -p $$i ; done -- $(INSTALL_CMD) -m 755 xinetd/xinetd $(DAEMONDIR) -- $(INSTALL_CMD) -m 755 xinetd/itox $(DAEMONDIR) -- $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DAEMONDIR) -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(MANDIR)/man5/xinetd.conf.5 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(MANDIR)/man8/xinetd.log.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(MANDIR)/man8/xinetd.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(MANDIR)/man8/itox.8 -- $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(MANDIR)/man8/xconv.pl.8 -+ test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i ; done -+ $(INSTALL_CMD) -m 755 xinetd/xinetd $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 755 xinetd/itox $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 755 $(SRCDIR)/xinetd/xconv.pl $(DESTDIR)$(DAEMONDIR) -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.conf.man $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.log.man $(DESTDIR)$(MANDIR)/man8/xinetd.log.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xinetd.man $(DESTDIR)$(MANDIR)/man8/xinetd.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/itox.8 $(DESTDIR)$(MANDIR)/man8/itox.8 -+ $(INSTALL_CMD) -m 644 $(SRCDIR)/xinetd/xconv.pl.8 $(DESTDIR)$(MANDIR)/man8/xconv.pl.8 - @echo "You must put your xinetd.conf in /etc/xinetd.conf" - @echo "There is a sample config file in xinetd/sample.conf and you can" - @echo "use xconv.pl to convert your old inetd.conf file to an xinetd format" - - uninstall: -- rm -f $(DAEMONDIR)/xinetd -- rm -f $(DAEMONDIR)/itox -- rm -f $(DAEMONDIR)/xconv.pl -- rm -f $(MANDIR)/man5/xinetd.conf.5 -- rm -f $(MANDIR)/man8/xinetd.log.8 -- rm -f $(MANDIR)/man8/xinetd.8 -- rm -f $(MANDIR)/man8/itox.8 -+ rm -f $(DESTDIR)$(DAEMONDIR)/xinetd -+ rm -f $(DESTDIR)$(DAEMONDIR)/itox -+ rm -f $(DESTDIR)$(DAEMONDIR)/xconv.pl -+ rm -f $(DESTDIR)$(MANDIR)/man5/xinetd.conf.5 -+ rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.log.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/xinetd.8 -+ rm -f $(DESTDIR)$(MANDIR)/man8/itox.8 - - distclean: clean - rm -f config.cache config.log Makefile config.status xinetd/itox diff --git a/package.bak/xinetd/0003-rpc-fix.patch b/package.bak/xinetd/0003-rpc-fix.patch deleted file mode 100644 index 6c32b7291e..0000000000 --- a/package.bak/xinetd/0003-rpc-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -This patch fixes compiling xinetd without RPC support. - -The content of this patch was copied from the OpenWrt project: -https://dev.openwrt.org/browser/packages/net/xinetd/patches/003-rpc_fix.patch - -Signed-off-by: Danomi Manchego - ---- a/xinetd/confparse.c -+++ b/xinetd/confparse.c -@@ -745,7 +745,7 @@ static status_e check_entry( struct serv - } - } - --/* #ifndef NO_RPC */ -+#ifndef NO_RPC - #if defined(HAVE_RPC_RPCENT_H) || defined(HAVE_NETDB_H) - if ( SC_IS_RPC( scp ) && !SC_IS_UNLISTED( scp ) ) - { -@@ -759,6 +759,7 @@ static status_e check_entry( struct serv - SC_RPCDATA( scp )->rd_program_number = rep->r_number ; - } - else -+#endif - #endif /* ! NO_RPC */ - { - if ( !SC_IS_UNLISTED( scp ) ) diff --git a/package.bak/xinetd/0004-configure-rlim_t.patch b/package.bak/xinetd/0004-configure-rlim_t.patch deleted file mode 100644 index e1cb48ac6a..0000000000 --- a/package.bak/xinetd/0004-configure-rlim_t.patch +++ /dev/null @@ -1,18 +0,0 @@ -Have the configure script look for rlim_t in - -That's where POSIX says it should be. Some libcs will include its -definition via as well, but musl doesn't. - -Signed-off-by: Maarten ter Huurne - ---- xinetd-2.3.15.orig/configure 2007-09-20 16:58:27.000000000 +0200 -+++ xinetd-2.3.15/configure 2014-09-16 17:20:22.787665449 +0200 -@@ -7909,7 +7909,7 @@ - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ --#include -+#include - #if STDC_HEADERS - #include - #endif diff --git a/package.bak/xinetd/Config.in b/package.bak/xinetd/Config.in deleted file mode 100644 index 7f3575cedb..0000000000 --- a/package.bak/xinetd/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_XINETD - bool "xinetd" - depends on BR2_USE_MMU # fork() - help - xinetd is a secure replacement for inetd. It was originally written by - panos@cs.colorado.edu. - - http://www.xinetd.org diff --git a/package.bak/xinetd/xinetd.hash b/package.bak/xinetd/xinetd.hash deleted file mode 100644 index 051436613c..0000000000 --- a/package.bak/xinetd/xinetd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 620b25f4ab4d72fdf32b13797156ea40df2049f1c07e640177e5fec544e9a94c xinetd-xinetd-2-3-15.tar.gz diff --git a/package.bak/xinetd/xinetd.mk b/package.bak/xinetd/xinetd.mk deleted file mode 100644 index 98185122ce..0000000000 --- a/package.bak/xinetd/xinetd.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# xinetd -# -################################################################################ - -XINETD_VERSION = xinetd-2-3-15 -XINETD_SITE = $(call github,xinetd-org,xinetd,$(XINETD_VERSION)) -XINETD_LICENSE = xinetd license -XINETD_LICENSE_FILES = COPYRIGHT - -XINETD_CFLAGS = $(TARGET_CFLAGS) - -# Three cases here: -# 1. We have libtirpc, use it by passing special flags -# 2. We have native RPC support, use it, no need to pass special -# flags (so this case 2 is implicit and not visible below) -# 3. We don't have RPC support, pass -DNO_RPC to disable it -ifeq ($(BR2_PACKAGE_LIBTIRPC),y) -XINETD_DEPENDENCIES += libtirpc host-pkgconf -XINETD_CFLAGS += "`$(PKG_CONFIG_HOST_BINARY) --cflags libtirpc`" -XINETD_LIBS += "`$(PKG_CONFIG_HOST_BINARY) --libs libtirpc`" -else ifeq ($(BR2_TOOLCHAIN_HAS_NATIVE_RPC),) -XINETD_CFLAGS += -DNO_RPC -endif - -XINETD_CONF_ENV += \ - CFLAGS="$(XINETD_CFLAGS)" \ - LIBS="$(XINETD_LIBS)" - -XINETD_MAKE_OPTS = AR="$(TARGET_AR)" - -$(eval $(autotools-package)) diff --git a/package.bak/xl2tp/0001-legacy.patch b/package.bak/xl2tp/0001-legacy.patch deleted file mode 100644 index 5279fd7079..0000000000 --- a/package.bak/xl2tp/0001-legacy.patch +++ /dev/null @@ -1,17 +0,0 @@ -Replace SUSV3-specific functions index, bcopy, bzero and bcmp by their -POSIX variants. - ---- l2tpd-0.70-pre20031121.oorig/osport.h 2004-07-08 22:47:52.000000000 +0200 -+++ l2tpd-0.70-pre20031121/osport.h 2006-12-28 15:32:50.000000000 +0100 -@@ -37,4 +37,11 @@ - - #endif /* defined(SOLARIS) */ - -+#if defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS -+# define index(x, y) strchr(x, y) -+# define bcopy(S1, S2, LEN) ((void)memmove(S2, S1, LEN)) -+# define bzero(S1, LEN) ((void)memset(S1, 0, LEN)) -+# define bcmp(S1,S2,LEN) ((memcmp(S2, S1, LEN)==0)?0:1) -+#endif /* defined __UCLIBC__ && !defined UCLIBC_SUSV3_LEGACY_MACROS */ -+ - #endif /* _OSPORT_H_ */ diff --git a/package.bak/xl2tp/Config.in b/package.bak/xl2tp/Config.in deleted file mode 100644 index f0b1e834ae..0000000000 --- a/package.bak/xl2tp/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_XL2TP - bool "xl2tp" - depends on BR2_USE_MMU # fork() - select BR2_PACKAGE_LIBPCAP - select BR2_PACKAGE_OPENSSL - help - Layer 2 Tunnelling Protocol (RFC2661). - - xl2tpd is an open source implementation of the L2TP tunneling - protocol. xl2tpd is forked from l2tpd and is maintained by - Xelerance Corporation. - - http://www.xelerance.com/software/xl2tpd/ diff --git a/package.bak/xl2tp/xl2tp.hash b/package.bak/xl2tp/xl2tp.hash deleted file mode 100644 index 152d615a2e..0000000000 --- a/package.bak/xl2tp/xl2tp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 1164b574e93a44c2a2e76c0c68d8d60437bd884a6c964d9c68be1556278e3d2d xl2tp-v1.3.8.tar.gz diff --git a/package.bak/xl2tp/xl2tp.mk b/package.bak/xl2tp/xl2tp.mk deleted file mode 100644 index ff802a4e97..0000000000 --- a/package.bak/xl2tp/xl2tp.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# xl2tp -# -################################################################################ - -XL2TP_VERSION = v1.3.8 -XL2TP_SITE = $(call github,xelerance,xl2tpd,$(XL2TP_VERSION)) -XL2TP_DEPENDENCIES = libpcap openssl -XL2TP_LICENSE = GPLv2 -XL2TP_LICENSE_FILES = LICENSE - -ifeq ($(BR2_STATIC_LIBS),y) -XL2TP_LDLIBS = LDLIBS="`$(STAGING_DIR)/usr/bin/pcap-config --static --additional-libs`" -endif - -define XL2TP_BUILD_CMDS - $(SED) 's/ -O2 //' $(@D)/Makefile - $(TARGET_CONFIGURE_OPTS) $(MAKE) $(XL2TP_LDLIBS) -C $(@D) -endef - -define XL2TP_INSTALL_TARGET_CMDS - $(TARGET_CONFIGURE_OPTS) $(MAKE) DESTDIR=$(TARGET_DIR) PREFIX=/usr -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/xl2tp/xl2tpd b/package.bak/xl2tp/xl2tpd deleted file mode 100755 index 36c12a23f2..0000000000 --- a/package.bak/xl2tp/xl2tpd +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# -PATH=/bin:/usr/bin:/sbin:/usr/sbin -DAEMON=/usr/sbin/xl2tpd -PIDFILE=/var/run/xl2tpd.pid - -test -f $DAEMON || exit 0 - -case "$1" in - start) - start-stop-daemon -S -p $PIDFILE -x $DAEMON -- -D & - ;; - stop) - start-stop-daemon -K -p $PIDFILE -x $DAEMON - ;; - restart|force-reload) - start-stop-daemon -K -p $PIDFILE -x $DAEMON - sleep 1 - start-stop-daemon -S -p $PIDFILE -x $DAEMON - ;; - *) - echo "Usage: /etc/init.d/xl2tdp {start|stop|restart|force-reload}" - exit 1 - ;; -esac - -exit 0 diff --git a/package.bak/xmlstarlet/Config.in b/package.bak/xmlstarlet/Config.in deleted file mode 100644 index 99762b8761..0000000000 --- a/package.bak/xmlstarlet/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -config BR2_PACKAGE_XMLSTARLET - bool "xmlstarlet" - select BR2_PACKAGE_LIBXML2 - select BR2_PACKAGE_LIBXSLT - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - help - Command Line XML Toolkit - - http://xmlstar.sourceforge.net/ diff --git a/package.bak/xmlstarlet/xmlstarlet.hash b/package.bak/xmlstarlet/xmlstarlet.hash deleted file mode 100644 index ca9aecfec8..0000000000 --- a/package.bak/xmlstarlet/xmlstarlet.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From https://sourceforge.net/projects/xmlstar/files/xmlstarlet/1.6.1/ -sha1 87bb104f546caca71b9540807c5b2738944cb219 xmlstarlet-1.6.1.tar.gz -md5 f3c5dfa3b1a2ee06cd57c255cc8b70a0 xmlstarlet-1.6.1.tar.gz diff --git a/package.bak/xmlstarlet/xmlstarlet.mk b/package.bak/xmlstarlet/xmlstarlet.mk deleted file mode 100644 index 61d38f29ff..0000000000 --- a/package.bak/xmlstarlet/xmlstarlet.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# xmlstarlet -# -################################################################################ - -XMLSTARLET_VERSION = 1.6.1 -XMLSTARLET_SITE = http://downloads.sourceforge.net/project/xmlstar/xmlstarlet/$(XMLSTARLET_VERSION) -XMLSTARLET_LICENSE = MIT -XMLSTARLET_LICENSE_FILES = COPYING - -XMLSTARLET_DEPENDENCIES += libxml2 libxslt \ - $(if $(BR2_PACKAGE_LIBICONV),libiconv) - -XMLSTARLET_CONF_OPTS += \ - --with-libxml-prefix=$(STAGING_DIR)/usr \ - --with-libxslt-prefix=$(STAGING_DIR)/usr \ - --with-libiconv-prefix=$(STAGING_DIR)/usr - -ifeq ($(BR2_STATIC_LIBS),y) -XMLSTARLET_CONF_OPTS += --enable-static-libs -XMLSTARLET_CONF_ENV = LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libxml-2.0 libexslt` $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),-lintl)" -else -XMLSTARLET_CONF_OPTS += --disable-static-libs -endif - -$(eval $(autotools-package)) diff --git a/package.bak/xorriso/0001-fix-musl-build.patch b/package.bak/xorriso/0001-fix-musl-build.patch deleted file mode 100644 index 86d251d747..0000000000 --- a/package.bak/xorriso/0001-fix-musl-build.patch +++ /dev/null @@ -1,20 +0,0 @@ -Fix musl build - -Add missing header needed for ssize_t. - -Signed-off-by: Baruch Siach ---- -Patch status: posted upstream -(http://lists.gnu.org/archive/html/bug-xorriso/2016-05/msg00000.html) - -diff -Nuar xorriso-1.4.2-orig/libisofs/aaip_0_2.h xorriso-1.4.2/libisofs/aaip_0_2.h ---- xorriso-1.4.2-orig/libisofs/aaip_0_2.h 2015-11-28 16:41:33.000000000 +0200 -+++ xorriso-1.4.2/libisofs/aaip_0_2.h 2016-05-24 11:40:43.874191174 +0300 -@@ -16,6 +16,7 @@ - #ifndef Aaip_h_is_includeD - #define Aaip_h_is_includeD yes - -+#include - - /* --------------------------------- Encoder ---------------------------- */ - diff --git a/package.bak/xorriso/Config.in b/package.bak/xorriso/Config.in deleted file mode 100644 index f9bb10ac9c..0000000000 --- a/package.bak/xorriso/Config.in +++ /dev/null @@ -1,22 +0,0 @@ -config BR2_PACKAGE_XORRISO - bool "xorriso" - select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE - depends on BR2_USE_WCHAR - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_USE_MMU # fork() - help - xorriso copies file objects from POSIX compliant - filesystems into Rock Ridge enhanced ISO 9660 filesystems - and allows session-wise manipulation of such filesystems. - It can load the management information of existing ISO - images and it writes the session results to optical media - or to filesystem objects. - - Vice versa xorriso is able to copy file objects out of ISO - 9660 filesystems. - - https://www.gnu.org/software/xorriso - -comment "xorriso needs a toolchain w/ wchar, threads" - depends on BR2_USE_MMU - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package.bak/xorriso/Config.in.host b/package.bak/xorriso/Config.in.host deleted file mode 100644 index 2baa043748..0000000000 --- a/package.bak/xorriso/Config.in.host +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_HOST_XORRISO - bool "host xorriso" - help - xorriso copies file objects from POSIX compliant - filesystems into Rock Ridge enhanced ISO 9660 filesystems - and allows session-wise manipulation of such filesystems. - It can load the management information of existing ISO - images and it writes the session results to optical media - or to filesystem objects. - - Vice versa xorriso is able to copy file objects out of ISO - 9660 filesystems. - - https://www.gnu.org/software/xorriso diff --git a/package.bak/xorriso/xorriso.hash b/package.bak/xorriso/xorriso.hash deleted file mode 100644 index 3c2a726eff..0000000000 --- a/package.bak/xorriso/xorriso.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 2843beded1aa4c678706e96fdf9cc5e4b34430b559bdf5bc35df5202125004b3 xorriso-1.4.2.tar.gz diff --git a/package.bak/xorriso/xorriso.mk b/package.bak/xorriso/xorriso.mk deleted file mode 100644 index be193221ec..0000000000 --- a/package.bak/xorriso/xorriso.mk +++ /dev/null @@ -1,76 +0,0 @@ -################################################################################ -# -# xorriso -# -################################################################################ - -XORRISO_VERSION = 1.4.2 -XORRISO_SITE = $(BR2_GNU_MIRROR)/xorriso -XORRISO_LICENSE = GPLv3+ -XORRISO_LICENSE_FILES = COPYING COPYRIGHT -# Disable everything until we actually need those features, and add the correct -# host libraries -HOST_XORRISO_CONF_OPTS = \ - --disable-zlib \ - --disable-bzip2 \ - --disable-libcdio \ - --disable-libreadline \ - --disable-libedit \ - --disable-libacl - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -XORRISO_DEPENDENCIES += libiconv -endif - -ifeq ($(BR2_PACKAGE_LIBCDIO),y) -XORRISO_DEPENDENCIES += host-pkgconf libcdio -XORRISO_CONF_OPTS += \ - --enable-pkg-check-modules \ - --enable-libcdio -else -XORRISO_CONF_OPTS += --disable-libcdio -endif - -ifeq ($(BR2_PACKAGE_READLINE),y) -XORRISO_DEPENDENCIES += readline -XORRISO_CONF_OPTS += --enable-libreadline -else -XORRISO_CONF_OPTS += --disable-libreadline -endif - -ifeq ($(BR2_PACKAGE_ACL),y) -XORRISO_DEPENDENCIES += acl -XORRISO_CONF_OPTS += --enable-libacl -else -XORRISO_CONF_OPTS += --disable-libacl -endif - -ifeq ($(BR2_PACKAGE_ATTR),y) -XORRISO_DEPENDENCIES += attr -XORRISO_CONF_OPTS += --enable-xattr -else -XORRISO_CONF_OPTS += --disable-xattr -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -XORRISO_DEPENDENCIES += zlib -XORRISO_CONF_OPTS += --enable-zlib -else -XORRISO_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_BZIP2),y) -XORRISO_DEPENDENCIES += bzip2 -XORRISO_CONF_OPTS += --enable-libbz2 -else -XORRISO_CONF_OPTS += --disable-libbz2 -endif - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XORRISO_CONF_OPTS += --enable-jtethreads -else -XORRISO_CONF_OPTS += --disable-jtethreads -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch b/package.bak/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch deleted file mode 100644 index 6da9419e08..0000000000 --- a/package.bak/xscreensaver/0001-fix-cross-compile-ansi-c-bailout.patch +++ /dev/null @@ -1,19 +0,0 @@ -The configure bails out when cross-compiling, because it is over-cautious -about ANSI support in the C compiler. Work around this by disabling the -bail-out code. - -[Peter: updated for 5.32] -Signed-off-by: Simon Dawson -Signed-off-by: Peter Korsgaard - -diff -Nurp a/configure b/configure ---- a/configure 2013-07-16 10:23:32.000000000 +0100 -+++ b/configure 2013-09-22 14:50:07.186953454 +0100 -@@ -4374,7 +4374,6 @@ $as_echo "Solaris: adding -D__EXTENSIONS - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler works on ANSI C" >&5 - $as_echo_n "checking whether the compiler works on ANSI C... " >&6; } - if test "$cross_compiling" = yes; then : -- as_fn_error $? "Couldn't build even a trivial ANSI C program: check CC." "$LINENO" 5 - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ diff --git a/package.bak/xscreensaver/Config.in b/package.bak/xscreensaver/Config.in deleted file mode 100644 index 5213ce3695..0000000000 --- a/package.bak/xscreensaver/Config.in +++ /dev/null @@ -1,30 +0,0 @@ -config BR2_PACKAGE_XSCREENSAVER - bool "xscreensaver" - depends on BR2_PACKAGE_XORG7 - depends on BR2_INSTALL_LIBSTDCPP # libgtk2 -> pango - depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> glib2 - depends on BR2_USE_WCHAR # libgtk2 -> glib2 - depends on BR2_USE_MMU # libgtk2 -> glib2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 # libgtk2 -> pango -> harfbuzz - select BR2_PACKAGE_LIBGTK2 - select BR2_PACKAGE_LIBGLADE - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE - help - XScreenSaver is the standard screen saver collection shipped on most - Linux and Unix systems running the X11 Window System. - - On X11 systems, XScreenSaver is two things: it is both a large - collection of screen savers; and it is also the framework for - blanking and locking the screen. - - http://www.jwz.org/xscreensaver/ - -comment "xscreensaver needs a toolchain w/ wchar, C++, threads" - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_USE_WCHAR diff --git a/package.bak/xscreensaver/xscreensaver.hash b/package.bak/xscreensaver/xscreensaver.hash deleted file mode 100644 index 7e7a07e3e3..0000000000 --- a/package.bak/xscreensaver/xscreensaver.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 4252a6079d2d2f5b342e8bdd172cbad5f0af73daf4e412b61a68344d91ca93bd xscreensaver-5.32.tar.gz diff --git a/package.bak/xscreensaver/xscreensaver.mk b/package.bak/xscreensaver/xscreensaver.mk deleted file mode 100644 index 831349be4c..0000000000 --- a/package.bak/xscreensaver/xscreensaver.mk +++ /dev/null @@ -1,25 +0,0 @@ -################################################################################ -# -# xscreensaver -# -################################################################################ - -XSCREENSAVER_VERSION = 5.32 -XSCREENSAVER_SITE = http://www.jwz.org/xscreensaver - -# N.B. GPLv2+ code (in the hacks/glx subdirectory) is not currently built. -XSCREENSAVER_LICENSE = MIT-like, GPLv2+ -XSCREENSAVER_LICENSE_FILES = hacks/screenhack.h hacks/glx/chessmodels.h - -XSCREENSAVER_DEPENDENCIES = jpeg libglade libgtk2 xlib_libX11 xlib_libXt \ - $(if $(BR2_PACKAGE_GETTEXT),gettext) host-intltool - -# otherwise we end up with host include/library dirs passed to the -# compiler/linker -XSCREENSAVER_CONF_OPTS = \ - --includedir=$(STAGING_DIR)/usr/include \ - --libdir=$(STAGING_DIR)/usr/lib - -XSCREENSAVER_INSTALL_TARGET_OPTS = install_prefix="$(TARGET_DIR)" install - -$(eval $(autotools-package)) diff --git a/package.bak/xtables-addons/Config.in b/package.bak/xtables-addons/Config.in deleted file mode 100644 index 4538519609..0000000000 --- a/package.bak/xtables-addons/Config.in +++ /dev/null @@ -1,19 +0,0 @@ -comment "xtables-addons needs a Linux kernel to be built" - depends on !BR2_LINUX_KERNEL - -comment "xtables-addons needs a toolchain w/ dynamic library, threads" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS - -config BR2_PACKAGE_XTABLES_ADDONS - bool "xtables-addons" - depends on BR2_LINUX_KERNEL - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS # extensions are .so - select BR2_PACKAGE_IPTABLES - select BR2_LINUX_NEEDS_MODULES # not using kernel-module infra - help - Xtables-addons is the successor to patch-o-matic(-ng). - Likewise, it contains extensions that were not, or are not yet, - accepted in the main kernel/iptables packages. - - http://xtables-addons.sourceforge.net/ diff --git a/package.bak/xtables-addons/xtables-addons.hash b/package.bak/xtables-addons/xtables-addons.hash deleted file mode 100644 index 9aa9c0e539..0000000000 --- a/package.bak/xtables-addons/xtables-addons.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://sourceforge.net/projects/xtables-addons/files/Xtables-addons/ -sha1 70ace437ec84d9ec1970505cecf270ed0cbd273e xtables-addons-2.12.tar.xz -# Calculated based on the hash above -sha256 c4865aa1c64c5ff173ff7b5d69425466c71f0f9b5eb5299c52c68bdcd46fa63b xtables-addons-2.12.tar.xz diff --git a/package.bak/xtables-addons/xtables-addons.mk b/package.bak/xtables-addons/xtables-addons.mk deleted file mode 100644 index 274e681818..0000000000 --- a/package.bak/xtables-addons/xtables-addons.mk +++ /dev/null @@ -1,33 +0,0 @@ -################################################################################ -# -# xtables-addons -# -################################################################################ - -XTABLES_ADDONS_VERSION = 2.12 -XTABLES_ADDONS_SOURCE = xtables-addons-$(XTABLES_ADDONS_VERSION).tar.xz -XTABLES_ADDONS_SITE = http://downloads.sourceforge.net/project/xtables-addons/Xtables-addons -XTABLES_ADDONS_DEPENDENCIES = iptables linux host-pkgconf -XTABLES_ADDONS_LICENSE = GPLv2+ -XTABLES_ADDONS_LICENSE_FILES = LICENSE - -XTABLES_ADDONS_CONF_OPTS = \ - --with-kbuild="$(LINUX_DIR)" \ - --with-xtables="$(STAGING_DIR)/usr" \ - --with-xtlibdir="/usr/lib/xtables" - -# geoip helpers need perl with modules and unzip so disable -define XTABLES_DISABLE_GEOIP_HELPERS - $(SED) 's/ geoip//' $(@D)/Makefile.in -endef -XTABLES_ADDONS_POST_PATCH_HOOKS += XTABLES_DISABLE_GEOIP_HELPERS - -define XTABLES_ADDONS_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) -endef - -define XTABLES_ADDONS_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(LINUX_MAKE_FLAGS) DESTDIR="$(TARGET_DIR)" install -endef - -$(eval $(autotools-package)) diff --git a/package.bak/xterm/Config.in b/package.bak/xterm/Config.in deleted file mode 100644 index f11aafad7a..0000000000 --- a/package.bak/xterm/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_XTERM - bool "xterm" - select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_XLIB_LIBXAW - depends on BR2_PACKAGE_XORG7 - depends on BR2_USE_MMU # fork() - # ARC toolchain issue - depends on !BR2_TOOLCHAIN_EXTERNAL_SYNOPSYS_ARC - help - xterm terminal emulator - - http://invisible-island.net/xterm/ diff --git a/package.bak/xterm/xterm.hash b/package.bak/xterm/xterm.hash deleted file mode 100644 index bbd0e11002..0000000000 --- a/package.bak/xterm/xterm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 66fb2f6c35b342148f549c276b12a3aa3fb408e27ab6360ddec513e14376150b xterm-327.tgz diff --git a/package.bak/xterm/xterm.mk b/package.bak/xterm/xterm.mk deleted file mode 100644 index 645de92e22..0000000000 --- a/package.bak/xterm/xterm.mk +++ /dev/null @@ -1,32 +0,0 @@ -################################################################################ -# -# xterm -# -################################################################################ - -XTERM_VERSION = 327 -XTERM_SOURCE = xterm-$(XTERM_VERSION).tgz -XTERM_SITE = http://invisible-mirror.net/archives/xterm -XTERM_DEPENDENCIES = ncurses xlib_libXaw host-pkgconf -XTERM_LICENSE = MIT -XTERM_LICENSE_FILES = version.c -XTERM_CONF_OPTS = --enable-256-color \ - --x-includes=$(STAGING_DIR)/usr/include \ - --x-libraries=$(STAGING_DIR)/usr/lib - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -XTERM_DEPENDENCIES += xlib_libXft -XTERM_CONF_OPTS += --enable-freetype \ - --with-freetype-config=auto -else -XTERM_CONF_OPTS += --disable-freetype -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXINERAMA),y) -XTERM_DEPENDENCIES += xlib_libXinerama -XTERM_CONF_OPTS += --with-xinerama -else -XTERM_CONF_OPTS += --without-xinerama -endif - -$(eval $(autotools-package)) diff --git a/package.bak/xutil_util-macros/Config.in b/package.bak/xutil_util-macros/Config.in deleted file mode 100644 index 10b1a59a36..0000000000 --- a/package.bak/xutil_util-macros/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_XUTIL_UTIL_MACROS - bool "util-macros" - help - No description available diff --git a/package.bak/xutil_util-macros/xutil_util-macros.hash b/package.bak/xutil_util-macros/xutil_util-macros.hash deleted file mode 100644 index 0f0509a132..0000000000 --- a/package.bak/xutil_util-macros/xutil_util-macros.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002773.html -sha256 18d459400558f4ea99527bc9786c033965a3db45bf4c6a32eefdc07aa9e306a6 util-macros-1.19.1.tar.bz2 diff --git a/package.bak/xutil_util-macros/xutil_util-macros.mk b/package.bak/xutil_util-macros/xutil_util-macros.mk deleted file mode 100644 index d01b3e0d24..0000000000 --- a/package.bak/xutil_util-macros/xutil_util-macros.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# xutil_util-macros -# -################################################################################ - -XUTIL_UTIL_MACROS_VERSION = 1.19.1 -XUTIL_UTIL_MACROS_SOURCE = util-macros-$(XUTIL_UTIL_MACROS_VERSION).tar.bz2 -XUTIL_UTIL_MACROS_SITE = http://xorg.freedesktop.org/releases/individual/util -XUTIL_UTIL_MACROS_LICENSE = MIT -XUTIL_UTIL_MACROS_LICENSE_FILES = COPYING - -XUTIL_UTIL_MACROS_INSTALL_STAGING = YES -XUTIL_UTIL_MACROS_INSTALL_TARGET = NO - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch b/package.bak/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch deleted file mode 100644 index f056625470..0000000000 --- a/package.bak/xvisor/0001-Makefile-Fix-oldconfig-make-target.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 99bbdc042ee4c92a13edcfeaf336aa755a199d0f Mon Sep 17 00:00:00 2001 -From: Anup Patel -Date: Sun, 11 Sep 2016 19:53:40 +0530 -Subject: [PATCH] Makefile: Fix oldconfig make target - -Use "-s" instead of "-o" option of "openconf/conf" tool because -the "-o" option does not generate all required openconf files. - -Signed-off-by: Anup Patel -Signed-off-by: Eric Le Bihan ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 149a682..e05e801 100644 ---- a/Makefile -+++ b/Makefile -@@ -434,7 +434,7 @@ menuconfig: - oldconfig: - $(V)mkdir -p $(OPENCONF_TMPDIR) - $(V)$(MAKE) -C tools/openconf oldconfig -- ./tools/openconf/conf -o $(OPENCONF_INPUT) -+ ./tools/openconf/conf -s $(OPENCONF_INPUT) - - # Rule for "make savedefconfig" - .PHONY: savedefconfig --- -2.4.11 - diff --git a/package.bak/xvisor/0002-openconf-do-not-check-stdin.patch b/package.bak/xvisor/0002-openconf-do-not-check-stdin.patch deleted file mode 100644 index 34b350de42..0000000000 --- a/package.bak/xvisor/0002-openconf-do-not-check-stdin.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 6b49c1dbe0ac43e39eec97a7e79cf5fb995747dc Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Mon, 12 Sep 2016 21:49:55 +0530 -Subject: [PATCH] openconf: do not check stdin - -Do not check if stdin is redirected when ask_silent is true, so the -`yes` program can be used to answer the questions about new values. - -Example: - - yes "" | make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- oldconfig - -Signed-off-by: Eric Le Bihan -Signed-off-by: Anup Patel ---- - tools/openconf/conf.c | 12 ------------ - 1 file changed, 12 deletions(-) - -diff --git a/tools/openconf/conf.c b/tools/openconf/conf.c -index a428058..711cf0b 100644 ---- a/tools/openconf/conf.c -+++ b/tools/openconf/conf.c -@@ -65,16 +65,6 @@ static void strip(char *str) - *p-- = 0; - } - --static void check_stdin(void) --{ -- if (!valid_stdin) { -- printf("aborted!\n\n"); -- printf("Console input/output is redirected. "); -- printf("Run 'make oldconfig' to update configuration.\n\n"); -- exit(1); -- } --} -- - static int conf_askvalue(struct symbol *sym, const char *def) - { - char *ret; -@@ -100,7 +90,6 @@ static int conf_askvalue(struct symbol *sym, const char *def) - printf("%s\n", def); - return 0; - } -- check_stdin(); - case ask_all: - fflush(stdout); - ret = fgets(line, 128, stdin); -@@ -306,7 +295,6 @@ static int conf_choice(struct menu *menu) - printf("%d\n", cnt); - break; - } -- check_stdin(); - case ask_all: - fflush(stdout); - ret = fgets(line, 128, stdin); --- -2.4.11 - diff --git a/package.bak/xvisor/Config.in b/package.bak/xvisor/Config.in deleted file mode 100644 index 996d37afbe..0000000000 --- a/package.bak/xvisor/Config.in +++ /dev/null @@ -1,68 +0,0 @@ -config BR2_PACKAGE_XVISOR_ARCH_SUPPORTS - bool - default y - depends on BR2_USE_MMU - depends on BR2_arm || BR2_aarch64 || BR2_x86_64 - depends on !BR2_ARM_CPU_ARMV4 && !BR2_ARM_CPU_ARMV7M - -menuconfig BR2_PACKAGE_XVISOR - bool "xvisor" - depends on BR2_PACKAGE_XVISOR_ARCH_SUPPORTS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - help - Xvisor is an open-source type-1 hypervisor, which aims at providing - a monolithic, light-weight, portable, and flexible virtualization - solution. - - http://www.xhypervisor.org/ - -if BR2_PACKAGE_XVISOR - -choice - prompt "Xvisor configuration" - default BR2_PACKAGE_XVISOR_USE_DEFCONFIG - -config BR2_PACKAGE_XVISOR_USE_DEFCONFIG - bool "Using an in-tree defconfig file" - -config BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG - bool "Using a custom (def)config file" - -endchoice - -config BR2_PACKAGE_XVISOR_DEFCONFIG - string "Defconfig name" - depends on BR2_PACKAGE_XVISOR_USE_DEFCONFIG - default "generic-v5" if BR2_ARM_CPU_ARMV5 - default "generic-v6" if BR2_ARM_CPU_ARMV6 - default "generic-v7" if BR2_ARM_CPU_ARMV7A - default "generic-v8" if BR2_AARCH64 - default "x86_64_generic" if BR2_x86_64 - help - Name of the Xvisor defconfig file to use, without the - trailing -defconfig. The defconfig is located in - arch//configs in the source tree. - -config BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE - string "Configuration file path" - depends on BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG - help - Path to the Xvisor configuration file - -config BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE - bool "Create U-Boot image of Xvisor" - depends on BR2_arm - select BR2_PACKAGE_HOST_UBOOT_TOOLS - help - Create an image file of Xvisor loadable from Das U-Boot. - -config BR2_PACKAGE_XVISOR_BUILD_TEST_DTB - bool "Build test device-tree blobs" - help - Build test device-tree blobs for popular boards. - -endif - -comment "xvisor needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 - depends on BR2_PACKAGE_XVISOR_ARCH_SUPPORTS diff --git a/package.bak/xvisor/xvisor.hash b/package.bak/xvisor/xvisor.hash deleted file mode 100644 index 13335beb6d..0000000000 --- a/package.bak/xvisor/xvisor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally generated -sha256 9347080c3481fb8586d196dd51a580a57084bfea1bc425e89f7fa0da7170708a xvisor-0.2.8.tar.gz diff --git a/package.bak/xvisor/xvisor.mk b/package.bak/xvisor/xvisor.mk deleted file mode 100644 index a9a5dbfaec..0000000000 --- a/package.bak/xvisor/xvisor.mk +++ /dev/null @@ -1,72 +0,0 @@ -################################################################################ -# -# xvisor -# -################################################################################ - -XVISOR_VERSION = 0.2.8 -XVISOR_SITE = http://www.xhypervisor.org/tarball -XVISOR_LICENSE = GPLv2+ -XVISOR_LICENSE_FILES = COPYING -XVISOR_INSTALL_IMAGES = YES -XVISOR_INSTALL_TARGET = NO - -XVISOR_MAKE_TARGETS = all - -ifeq ($(BR2_PACKAGE_XVISOR_BUILD_TEST_DTB),y) -XVISOR_MAKE_TARGETS += dtbs -endif - -XVISOR_KCONFIG_DOTCONFIG = build/openconf/.config - -ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y) -XVISOR_KCONFIG_DEFCONFIG = $(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG))-defconfig -else ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y) -XVISOR_KCONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE)) -endif -XVISOR_KCONFIG_EDITORS = menuconfig - -XVISOR_MAKE_ENV = \ - ARCH=$(if $(BR2_x86_64),x86,$(BR2_ARCH)) \ - CROSS_COMPILE=$(TARGET_CROSS) - -XVISOR_MAKE_OPTS = $(if $(VERBOSE),VERBOSE=1) - -define XVISOR_BUILD_CMDS - $(TARGET_MAKE_ENV) $(XVISOR_MAKE_ENV) $(MAKE) $(XVISOR_MAKE_OPTS) \ - -C $(@D) $(XVISOR_MAKE_TARGETS) -endef - -define XVISOR_INSTALL_IMAGES_CMDS - $(INSTALL) -m 0644 -D $(@D)/build/vmm.bin $(BINARIES_DIR)/vmm.bin -endef - -ifeq ($(BR2_PACKAGE_XVISOR_CREATE_UBOOT_IMAGE),y) -XVISOR_DEPENDENCIES += host-uboot-tools -define XVISOR_CREATE_UBOOT_IMAGE - $(MKIMAGE) -A $(MKIMAGE_ARCH) -O linux -T kernel -C none \ - -a 0x00008000 -e 0x00008000 \ - -n Xvisor -d $(BINARIES_DIR)/vmm.bin $(BINARIES_DIR)/uvmm.bin -endef -endif - -XVISOR_POST_INSTALL_IMAGES_HOOKS += XVISOR_CREATE_UBOOT_IMAGE - -# Checks to give errors that the user can understand -ifeq ($(BR_BUILDING),y) - -ifeq ($(BR2_PACKAGE_XVISOR_USE_DEFCONFIG),y) -ifeq ($(call qstrip,$(BR2_PACKAGE_XVISOR_DEFCONFIG)),) -$(error No Xvisor defconfig name specified, check your BR2_PACKAGE_XVISOR_DEFCONFIG setting) -endif -endif - -ifeq ($(BR2_PACKAGE_XVISOR_USE_CUSTOM_CONFIG),y) -ifeq ($(BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE),) -$(error No Xvisor configuration file specified, check your BR2_PACKAGE_XVISOR_CUSTOM_CONFIG_FILE setting) -endif -endif - -endif - -$(eval $(kconfig-package)) diff --git a/package.bak/xvkbd/0001-makefile.patch b/package.bak/xvkbd/0001-makefile.patch deleted file mode 100644 index a8f6577387..0000000000 --- a/package.bak/xvkbd/0001-makefile.patch +++ /dev/null @@ -1,2400 +0,0 @@ ---- a/Makefile 2008-03-04 06:14:55.425005441 -0500 -+++ b/Makefile 2008-03-05 08:40:50.000000000 -0500 -@@ -0,0 +1,2397 @@ -+# Makefile generated by imake - do not edit! -+# $Xorg: imake.c,v 1.6 2001/02/09 02:03:15 xorgcvs Exp $ -+ -+# ---------------------------------------------------------------------- -+# Makefile generated from "Imake.tmpl" and -+# $Xorg: Imake.tmpl,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -+# $XdotOrg: util/cf/Imake.tmpl,v 1.17 2006/04/15 15:55:25 herrb Exp $ -+# -+# -+# -+# -+# $XFree86: xc/config/cf/Imake.tmpl,v 3.155 2003/12/24 18:58:41 dickey Exp $ -+# ---------------------------------------------------------------------- -+ -+all:: -+ -+.SUFFIXES: .i -+ -+# $XdotOrg: util/cf/Imake.cf,v 1.12 2005/11/08 06:33:24 jkj Exp $ -+# $Xorg: Imake.cf,v 1.4 2000/08/17 19:41:45 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/Imake.cf,v 3.88 2003/12/16 21:30:21 herrb Exp $ -+ -+# Keep cpp from replacing path elements containing i486/i586/i686 -+ -+# ----------------------------------------------------------------------- -+# site-specific configuration parameters that need to come before -+# the platform-specific parameters - edit site.def to change -+ -+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -+ -+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ -+ -+# $XFree86: xc/config/cf/xf86site.def,v 3.186 2003/06/25 18:06:22 eich Exp $ -+ -+# ---------------------------------------------------------------------- -+# platform-specific configuration parameters - edit linux.cf to change -+ -+# $XdotOrg: util/cf/linux.cf,v 1.31 2005/10/21 19:10:27 ajax Exp $ -+# platform: $Xorg: linux.cf,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+ -+# platform: $XFree86: xc/config/cf/linux.cf,v 3.220 2003/12/30 22:38:33 tsi Exp $ -+ -+# operating system: Linux 2.6.23.8-63.fc8 i686 [ELF] (2.6.23) -+# libc: (6.7.0) -+# binutils: (217) -+ -+# $Xorg: lnxLib.rules,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+# $XFree86: xc/config/cf/lnxLib.rules,v 3.52 2003/10/31 20:49:03 herrb Exp $ -+ -+# $XdotOrg: util/cf/xorg.cf,v 1.53 2005/10/03 16:08:44 alanc Exp $ -+ -+# $Xorg: xfree86.cf,v 1.4 2000/08/17 19:41:49 cpqbld Exp $ -+ -+XORG_VERSION_CURRENT = (((6) * 10000000) + ((8) * 100000) + ((99) * 1000) + 903) -+RELEASE_VERSION = RELEASE-1 -+ -+AFB_DEFS = -DUSE_AFB -+ -+DRIVERSDKDIR = $(USRLIBDIR)/Server -+DRIVERSDKMODULEDIR = $(USRLIBDIR)/Server/modules -+DRIVERSDKINCLUDEDIR = $(USRLIBDIR)/Server/include -+ -+ XF86SRC = $(SERVERSRC)/hw/xfree86 -+ XF86COMSRC = $(XF86SRC)/common -+ XF86PARSERSRC = $(XF86SRC)/parser -+ XF86OSSRC = $(XF86SRC)/os-support -+ XF86DRIVERSRC = $(XF86SRC)/drivers -+ DRIVERSRC = $(XF86DRIVERSRC) -+ -+ XFREE86DOCDIR = $(DOCDIR) -+ XFREE86PSDOCDIR = $(DOCPSDIR) -+ XFREE86PDFDOCDIR = $(DOCPDFDIR) -+ XFREE86HTMLDOCDIR = $(DOCHTMLDIR) -+XFREE86JAPANESEDOCDIR = $(DOCDIR)/Japanese -+ -+# $Xorg: xf86.rules,v 1.3 2000/08/17 19:41:48 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/xf86.rules,v 3.34tsi Exp $ -+ -+# ---------------------------------------------------------------------- -+# site-specific configuration parameters that go after -+# the platform-specific parameters - edit site.def to change -+ -+# site: $TOG: site.sample /main/r64_final/1 1998/02/05 16:28:49 kaleb $ -+ -+# site: $XFree86: xc/config/cf/site.def,v 3.24 2000/06/25 20:17:29 dawes Exp $ -+ -+# --------------------------------------------------------------------- -+# Imake rules for building libraries, programs, scripts, and data files -+# rules: $Xorg: Imake.rules,v 1.3 2000/08/17 19:41:46 cpqbld Exp $ -+# rules: $XdotOrg: util/cf/Imake.rules,v 1.11 2005/11/08 06:33:24 jkj Exp $ -+# -+# -+# -+# -+# rules: $XFree86: xc/config/cf/Imake.rules,v 3.128 2003/11/15 03:25:17 dawes Exp $ -+ -+.PHONY: all interfaces install install.man install.lib install.sdk depend includes cleandir -+ -+ _NULLCMD_ = @ echo -n -+ -+X_BYTE_ORDER = X_LITTLE_ENDIAN -+ -+GLIDE2INCDIR = -+ -+GLIDE3INCDIR = -+ -+GLIDE3LIBNAME = -+ -+TKLIBNAME = -+ -+TKLIBDIR = -+ -+TCLLIBNAME = -+ -+TCLIBDIR = -+ -+ PATHSEP = / -+ SHELL = /bin/sh -e -+ -+ TOP = . -+ CURRENT_DIR = . -+ -+ IMAKE = imake -+ DEPEND = gccmakedep -+ MKDIRHIER = mkdir -p -+ REVPATH = revpath -+ EXPORTLISTGEN = -+ RMAN = RmanCmd -+ RMANBASENAME = rman -+ RMANOPTIONS = RmanOptions -+ CONFIGSRC = $(TOP)/config -+ IMAKESRC = $(CONFIGSRC)/imake -+ DEPENDSRC = $(CONFIGSRC)/util -+ -+ INCROOT = /usr/include -+ USRLIBDIR = /usr/lib -+ VARDIR = /var -+ VARLIBDIR = $(VARDIR)/lib -+ SYSTEMUSRLIBDIR = /usr/lib -+ SYSTEMUSRINCDIR = /usr/include -+ SHLIBDIR = /usr/lib -+ LINTLIBDIR = $(USRLIBDIR)/lint -+ MANPATH = /usr/share/man -+ MANSOURCEPATH = $(MANPATH)/man -+ MANDIR = $(MANSOURCEPATH)1 -+ LIBMANDIR = $(MANSOURCEPATH)3 -+ FILEMANDIR = $(MANSOURCEPATH)5 -+ MISCMANDIR = $(MANSOURCEPATH)$(MISCMANSUFFIX) -+ DRIVERMANDIR = $(MANSOURCEPATH)$(DRIVERMANSUFFIX) -+ LOGDIRECTORY = $(VARDIR)/log -+ -+ VARRUNDIR = $(VARDIR)/run -+ -+ VARDBDIR = $(VARDIR)/lib -+ -+ AR = ar clq -+ -+# Nice try but useless: make will inherit BOOTSTRAPCFLAGS -+# from top Makefile -+ BOOTSTRAPCFLAGS = -+ -+ CC = gcc -m32 -+ AS = gcc -m32 -c -x assembler -+ -+.SUFFIXES: .cc -+ -+ CXX = c++ -m32 -+ -+ CXXFILT = c++filt -+ -+ CXXLIB = -lstdc++ -+ -+ CXXDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing -+CXXDEPENDINCLUDES = -+ CXXEXTRA_DEFINES = -+CXXEXTRA_INCLUDES = -+ CXXSTD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(CXXPROJECT_DEFINES) -+ CXXOPTIONS = -+ CXXINCLUDES = $(INCLUDES) $(TOP_INCLUDES) $(CXXEXTRA_INCLUDES) -+ CXXDEFINES = $(CXXINCLUDES) $(CXXSTD_DEFINES) $(THREADS_CXXDEFINES) $(DEFINES) $(CXXEXTRA_DEFINES) -+ CXXFLAGS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(THREADS_CXXFLAGS) $(CXXDEFINES) -+ -+ COMPRESS = compress -+ GZIPCMD = gzip -+ -+ CPP = cpp $(STD_CPP_DEFINES) -+ RAWCPP = cpp -undef $(STD_CPP_OPTIONS) -+ PREPROCESSCMD = gcc -m32 -E $(STD_CPP_DEFINES) -+ -+ INSTALL = install -+ INSTALLFLAGS = -c -+ -+ LD = gcc -m32 -nostdlib -+ -+ LEX = flex -l -+ M4 = m4 -+ M4FLAGS = -+ LEXLIB = -lfl -+ YACC = bison -y -+ CCYACC = bison -y -+ -+ LINT = lint -+ -+ LINTLIBFLAG = -C -+ LINTOPTS = -axz -+ LN = ln -s -+ MAKE = make -+ MV = mv -f -+ CP = cp -+ -+ RANLIB = ranlib -+ -+ RANLIBINSTFLAGS = -+ -+ RM = rm -f -+ PERL = perl -+ PERLOPTS = -+ PERLENVSETUP = env LC_ALL=C -+ MANSUFFIX = 1x -+ LIBMANSUFFIX = 3x -+ FILEMANSUFFIX = 5x -+ MISCMANSUFFIX = 7 -+ DRIVERMANSUFFIX = 4 -+ ADMINMANSUFFIX = 8 -+ MANSRCSUFFIX = man -+ MANNEWSUFFIX = _man -+ MANDEFS = -D__apploaddir__=$(XAPPLOADDIR) -D__appmansuffix__=$(MANSUFFIX) -D__filemansuffix__=$(FILEMANSUFFIX) -D__libmansuffix__=$(LIBMANSUFFIX) -D__miscmansuffix__=$(MISCMANSUFFIX) -D__drivermansuffix__=$(DRIVERMANSUFFIX) -D__adminmansuffix__=$(ADMINMANSUFFIX) -D__projectroot__=$(PROJECTROOT) -D__xconfigfile__=$(XCONFIGFILE) -D__xconfigdir__=$(XCONFIGDIR) -D__xlogfile__=$(XLOGFILE) -D__xservername__=$(XSERVERNAME) $(XORGMANDEFS) $(VENDORMANDEFS) -+ -+ COMPRESSMANCMD = gzip -n -+ -+ TROFF = groff -Tps -+ NROFF = nroff -+ -+ MSMACROS = -ms -+ MANMACROS = -man -+ TBL = tbl -+ EQN = eqn -+ NEQN = neqn -+ COL = col -+ COLFLAGS = -b -+ -+ MODCC = gcc -m32 -+ -+ MODCPP = cpp -+ MODCFLAGS = $(CFLAGS) -+ MODAS = gcc -m32 -c -x assembler -+ MODASFLAGS = -+ -+ MODLD = gcc -m32 -nostdlib -+ -+ MODLDFLAGS = -+MODLDCOMBINEFLAGS = -r -+ MODAR = ar clq -+ -+ MODRANLIB = ranlib -+ -+ STD_INCLUDES = -+ STD_CPP_OPTIONS = -traditional -+ STD_CPP_DEFINES = -traditional -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) -+ STD_DEFINES = -Dlinux -D__i386__ -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(PROJECT_DEFINES) -+ EXTRA_LOAD_FLAGS = -+ EXTRA_LDOPTIONS = -+ EXTRA_LIBRARIES = -+ TAGS = ctags -+ -+ PARALLELMFLAGS = -+ -+ SHAREDCODEDEF = -+ SHLIBDEF = -+ -+ SHLIBLDFLAGS = -shared $(SHLIBGLOBALSFLAGS) -+ -+ NOSTDLIB = -nostdlib -+ POSTNOSTDLIB = -Wl,-Bstatic -lgcc -Wl,-Bdynamic -+ -+ PICFLAGS = -fPIC -+ -+ CXXPICFLAGS = -fPIC -+ -+ PROTO_DEFINES = -DFUNCPROTO=15 -DNARROWPROTO -+ -+ INSTPGMFLAGS = -+ -+ INSTBINFLAGS = -m 0755 -+ INSTUIDFLAGS = -m 4711 -+ INSTLIBFLAGS = -m 0644 -+ INSTINCFLAGS = -m 0444 -+ INSTMANFLAGS = -m 0444 -+ INSTDATFLAGS = -m 0444 -+ INSTKMEMFLAGS = -m 4711 -+ -+ PROJECTROOT = /usr -+ -+ CDEBUGFLAGS = -O2 -fno-strength-reduce -fno-strict-aliasing -+ CCOPTIONS = -+ -+ ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) -+ ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) -+ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) -+ LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) -+ LDPRELIB = -L$(USRLIBDIR) $(INSTALLED_LIBS) -+ LDPOSTLIB = -+ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) -+ -+ LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) -+ -+ CCLINK = $(CC) -+ -+ CXXLINK = $(CXX) -+ -+ LDSTRIPFLAGS = -x -+ LDCOMBINEFLAGS = -r -+ DEPENDFLAGS = -+ DEPEND_DEFINES = -+ -+# Not sure this belongs here -+ TKLIBDIR = -+ TKINCDIR = -+ TKLIBNAME = -+ TKLIBRARY = -L$(TKLIBDIR) -l$(TKLIBNAME) -+ TCLLIBDIR = -+ TCLINCDIR = -+ TCLLIBNAME = -+ TCLLIBRARY = -L$(TCLLIBDIR) -l$(TCLLIBNAME) -+ -+ MACROFILE = linux.cf -+ RM_CMD = $(RM) -+ -+ IMAKE_DEFINES = -+ IMAKE_WARNINGS = -Wundef -+ -+ IRULESRC = $(CONFIGDIR) -+ IMAKE_CMD = $(IMAKE) -DUseInstalled -I$(IRULESRC) $(IMAKE_DEFINES) $(IMAKE_WARNINGS) -+ -+ ICONFIGFILES = $(IRULESRC)/Imake.tmpl $(IRULESRC)/X11.tmpl $(IRULESRC)/site.def $(IRULESRC)/$(MACROFILE) $(IRULESRC)/xfree86.cf $(IRULESRC)/xf86.rules $(IRULESRC)/xorgsite.def $(IRULESRC)/host.def $(EXTRA_ICONFIGFILES) -+ -+# $Xorg: X11.rules,v 1.4 2000/08/17 19:41:46 cpqbld Exp $ -+ -+# $XFree86: xc/config/cf/X11.rules,v 1.6 2001/01/17 16:22:31 dawes Exp $ -+ -+# ---------------------------------------------------------------------- -+# X Window System Build Parameters and Rules -+# $XdotOrg: util/cf/X11.tmpl,v 1.54 2006/04/15 15:55:25 herrb Exp $ -+# $Xorg: X11.tmpl,v 1.6 2000/08/17 19:41:46 cpqbld Exp $ -+# -+# -+# -+# -+# $XFree86: xc/config/cf/X11.tmpl,v 1.248 2004/02/16 04:07:37 dawes Exp $ -+ -+XORGRELSTRING = `echo 6 8 99 903 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -+ XORGMANNAME = X Version 11 -+ -+STICKY_DEFINES = -DHAS_STICKY_DIR_BIT -+ -+FCHOWN_DEFINES = -DHAS_FCHOWN -+ -+# ----------------------------------------------------------------------- -+# X Window System make variables; these need to be coordinated with rules -+ -+ XTOP = $(TOP) -+ BINDIR = /usr/bin -+ BUILDINCROOT = $(TOP)/exports -+ BUILDINCDIR = $(BUILDINCROOT)/include -+ BUILDINCTOP = ../.. -+ BUILDLIBDIR = $(TOP)/exports/lib -+ BUILDLIBTOP = ../.. -+ BUILDBINDIR = $(TOP)/exports/bin -+ BUILDBINTOP = ../.. -+ BUILDMODULEDIR = $(BUILDLIBDIR)/modules -+ BUILDI18NDIR = $(BUILDLIBDIR)/locale -+ BUILDMODULETOP = $(BUILDLIBTOP)/.. -+ XBUILDINCROOT = $(XTOP)/exports -+ XBUILDINCDIR = $(XBUILDINCROOT)/include/X11 -+ XBUILDINCTOP = ../../.. -+ XBUILDBINDIR = $(XBUILDINCROOT)/bin -+ INCDIR = $(INCROOT) -+ ADMDIR = /usr/adm -+ LIBDIR = /usr/lib/X11 -+ SHAREDIR = /usr/share/X11 -+ LIBEXECDIR = /usr/libexec -+ MODULEDIR = $(USRLIBDIR)/modules -+ TOP_X_INCLUDES = -+ XBINDIR = $(PROJECTROOT)/bin -+ -+ INSTSRCDIR = /usr/src -+ -+ ETCX11DIR = /etc/X11 -+ -+ CONFDIR = $(ETCX11DIR) -+ -+ DOCDIR = $(LIBDIR)/doc -+ DOCHTMLDIR = $(DOCDIR)/html -+ DOCPSDIR = $(DOCDIR)/PostScript -+ DOCPDFDIR = $(DOCDIR)/PDF -+ FONTDIR = $(LIBDIR)/fonts -+ ENCODINGSDIR = $(LIBDIR)/fonts/encodings -+ XINITDIR = $(LIBDIR)/xinit -+ XDMDIR = $(LIBDIR)/xdm -+ XDMVARDIR = $(VARLIBDIR)/xdm -+ TWMDIR = $(LIBDIR)/twm -+ XSMDIR = $(LIBDIR)/xsm -+ NLSDIR = $(LIBDIR)/nls -+ XLOCALEDIR = $(LIBDIR)/locale -+ LBXPROXYDIR = $(LIBDIR)/lbxproxy -+ PROXYMANAGERDIR = $(LIBDIR)/proxymngr -+ XPRINTDIR = $(LIBDIR)/xserver -+ XAPPLOADDIR = /usr/share/X11/app-defaults -+ FONTCFLAGS = -t -+ -+ INSTAPPFLAGS = $(INSTDATFLAGS) -+ -+ RGB = $(XBINDIR)/rgb -+ FONTC = $(XBINDIR)/bdftopcf -+ MKFONTSCALE = $(XBINDIR)/mkfontscale -+ MKFONTDIR = $(XBINDIR)/mkfontdir -+ MKHTMLINDEX = $(XBINDIR)/mkhtmlindex -+ UCS2ANY = $(XBINDIR)/ucs2any -+ BDFTRUNCATE = $(XBINDIR)/bdftruncate -+ UCSMAPPREFIX = $(FONTDIR)/util/map- -+ XCURSORGEN = $(XBINDIR)/xcursorgen -+ -+ HTMLINDEXCMD = HtmlIndexCmd -+ -+ DOCUTILSRC = $(XTOP)/doc/util -+ CLIENTSRC = $(TOP)/clients -+ DEMOSRC = $(TOP)/demos -+ XDOCMACROS = $(DOCUTILSRC)/macros.t -+ XIDXMACROS = $(DOCUTILSRC)/indexmacros.t -+ PROGRAMSRC = $(TOP)/programs -+ LIBSRC = $(XTOP)/lib -+ FONTSRC = $(XTOP)/fonts -+ ENCODINGSSRC = $(FONTSRC)/encodings -+ INCLUDESRC = $(BUILDINCROOT)/include -+ XINCLUDESRC = $(INCLUDESRC)/X11 -+ SERVERSRC = $(XTOP)/programs/Xserver -+ CONTRIBSRC = $(XTOP)/../contrib -+ UNSUPPORTEDSRC = $(XTOP)/unsupported -+ DOCSRC = $(XTOP)/doc -+ RGBSRC = $(XTOP)/programs/rgb -+ BDFTOPCFSRC = $(PROGRAMSRC)/bdftopcf -+ MKFONTDIRSRC = $(PROGRAMSRC)/mkfontdir -+ FONTSERVERSRC = $(PROGRAMSRC)/xfs -+ FONTINCSRC = $(XTOP)/include/fonts -+ EXTINCSRC = $(XTOP)/include/extensions -+ FTSOURCEDIR = FreeTypeSrcDir -+ DRMSRCDIR = $(TOP)/extras/drm -+ MESASRCDIR = $(TOP)/extras/Mesa -+ OGLSAMPLESRCDIR = $(TOP)/extras/ogl-sample -+ PSWRAPSRC = $(XTOP)/config/pswrap -+ TRANSCOMMSRC = $(LIBSRC)/xtrans -+ TRANS_INCLUDES = -I$(TRANSCOMMSRC) -+ CONNECTION_FLAGS = -DUNIXCONN -DTCPCONN $(STICKY_DEFINES) $(FCHOWN_DEFINES) -DIPv6 -+XTRANS_FAILDEFINES = -DFAIL_HARD -+ -+ VENDORMANNAME = X.Org -+ VENDORMANVERSION = `echo 6 8 99 903 | sed -e 's/ /./g' -e 's/^/Version\\\ /'` -+ XORGMANDEFS = -D__xorgversion__="\"$(XORGRELSTRING)\" \"$(XORGMANNAME)\"" -+ VENDORMANDEFS = -D__vendorversion__="$(VENDORMANVERSION) $(VENDORMANNAME)" -+ VENDORNAME = The X.Org Foundation -+ VENDORNAMESHORT = X.Org -+ -+ VENDORWEBSUPPORT = http://wiki.X.Org -+ -+VENDORSUPPORTDEFS = -D__VENDORDWEBSUPPORT__='"$(VENDORWEBSUPPORT)"' -+ -+ XKBDEFRULES = xorg -+ XKBDEFRULESDEFS = -D__XKBDEFRULES__='"$(XKBDEFRULES)"' -+ -+ XCONFIGFILE = xorg.conf -+ XCONFIGDIR = $(LIBDIR) -+ XLOGFILE = Xorg -+ XSERVERNAME = Xorg -+ -+ XENVLIBDIR = $(USRLIBDIR) -+ CLIENTENVSETUP = LD_LIBRARY_PATH=$(XENVLIBDIR) XLOCALEDIR=$(BUILDLIBDIR)/locale -+ -+# $Xorg: lnxLib.tmpl,v 1.3 2000/08/17 19:41:47 cpqbld Exp $ -+# $XFree86: xc/config/cf/lnxLib.tmpl,v 3.19 2003/10/15 22:47:48 herrb Exp $ -+ -+ XLIBSRC = $(LIBSRC)/X11 -+ -+SOXLIBREV = 6.2 -+DEPXONLYLIB = -+XONLYLIB = -lX11 -+ -+LINTXONLY = $(LINTLIBDIR)/llib-lX11.ln -+ -+ DEPXLIBONLY = $(DEPXONLYLIB) -+ XLIBONLY = $(XONLYLIB) -+ LINTXONLYLIB = $(LINTXONLY) -+ -+ XEXTLIBSRC = $(LIBSRC)/Xext -+ -+SOXEXTREV = 6.4 -+DEPEXTENSIONLIB = -+EXTENSIONLIB = -lXext -+ -+LINTEXTENSION = $(LINTLIBDIR)/llib-lXext.ln -+ -+LINTEXTENSIONLIB = $(LINTEXTENSION) -+ DEPXLIB = $(DEPEXTENSIONLIB) $(DEPXONLYLIB) -+ XLIB = $(EXTENSIONLIB) $(XONLYLIB) -+ LINTXLIB = $(LINTXONLYLIB) -+ -+ XSSLIBSRC = $(LIBSRC)/Xss -+ -+SOXSSREV = 1.0 -+DEPXSSLIB = -+XSSLIB = -lXss -+ -+LINTXSS = $(LINTLIBDIR)/llib-lXss.ln -+ -+ XXF86MISCLIBSRC = $(LIBSRC)/Xxf86misc -+ -+SOXXF86MISCREV = 1.1 -+DEPXXF86MISCLIB = -+XXF86MISCLIB = -lXxf86misc -+ -+LINTXXF86MISC = $(LINTLIBDIR)/llib-lXxf86misc.ln -+ -+ XXF86VMLIBSRC = $(LIBSRC)/Xxf86vm -+ -+SOXXF86VMREV = 1.0 -+DEPXXF86VMLIB = -+XXF86VMLIB = -lXxf86vm -+ -+LINTXXF86VM = $(LINTLIBDIR)/llib-lXxf86vm.ln -+ -+ XXF86DGALIBSRC = $(LIBSRC)/Xxf86dga -+ -+SOXXF86DGAREV = 1.0 -+DEPXXF86DGALIB = -+XXF86DGALIB = -lXxf86dga -+ -+LINTXXF86DGA = $(LINTLIBDIR)/llib-lXxf86dga.ln -+ -+ XXF86RUSHLIBSRC = $(LIBSRC)/Xxf86rush -+ -+SOXXF86RUSHREV = 1.0 -+DEPXXF86RUSHLIB = -+XXF86RUSHLIB = -lXxf86rush -+ -+LINTXXF86RUSH = $(LINTLIBDIR)/llib-lXxf86rush.ln -+ -+ XVLIBSRC = $(LIBSRC)/Xv -+ -+SOXVREV = 1.0 -+DEPXVLIB = -+XVLIB = -lXv -+ -+LINTXV = $(LINTLIBDIR)/llib-lXv.ln -+ -+ XVMCLIBSRC = $(LIBSRC)/XvMC -+ -+SOXVMCREV = 1.0 -+DEPXVMCLIB = -+XVMCLIB = -lXvMC -+ -+LINTXVMC = $(LINTLIBDIR)/llib-lXvMC.ln -+ -+ XINERAMALIBSRC = $(LIBSRC)/Xinerama -+ -+SOXINERAMAREV = 1.0 -+DEPXINERAMALIB = -+XINERAMALIB = -lXinerama -+ -+LINTXINERAMA = $(LINTLIBDIR)/llib-lXinerama.ln -+ -+ XRESLIBSRC = $(LIBSRC)/XRes -+ -+SOXRESREV = 1.0 -+DEPXRESLIB = -+XRESLIB = -lXRes -+ -+LINTXRES = $(LINTLIBDIR)/llib-lXRes.ln -+ -+ DMXLIBSRC = $(LIBSRC)/dmx -+ -+DEPDMXLIB = $(USRLIBDIR)/libdmx.a -+DMXLIB = -ldmx -+ -+LINTDMX = $(LINTLIBDIR)/llib-ldmx.ln -+ -+ DPSLIBSRC = $(LIBSRC)/dps -+ -+DEPDPSLIB = $(USRLIBDIR)/libdps.a -+DPSLIB = -ldps -+ -+LINTDPS = $(LINTLIBDIR)/llib-ldps.ln -+ -+ DPSTKLIBSRC = $(LIBSRC)/dpstk -+ -+DEPDPSTKLIB = $(USRLIBDIR)/libdpstk.a -+DPSTKLIB = -ldpstk -+ -+LINTDPSTK = $(LINTLIBDIR)/llib-ldpstk.ln -+ -+ PSRESLIBSRC = $(LIBSRC)/psres -+ -+DEPPSRESLIB = $(USRLIBDIR)/libpsres.a -+PSRESLIB = -lpsres -+ -+LINTPSRES = $(LINTLIBDIR)/llib-lpsres.ln -+ -+ GLULIBSRC = $(LIBSRC)/GLU -+ -+SOGLUREV = 1.3 -+DEPGLULIB = -+GLULIB = -lGLU -+ -+LINTGLU = $(LINTLIBDIR)/llib-lGLU.ln -+ -+ GLXLIBSRC = $(LIBSRC)/GL -+ -+SOGLREV = 1.2 -+DEPGLXLIB = -+GLXLIB = -lGL -+ -+LINTGLX = $(LINTLIBDIR)/llib-lGL.ln -+ -+ GLWIDGETSRC = $(LIBSRC)/GLw -+ -+SOGLWREV = 1.0 -+DEPGLWLIB = -+GLWLIB = -lGLw -+ -+LINTGLW = $(LINTLIBDIR)/llib-lGLw.ln -+ -+ XRENDERLIBSRC = $(LIBSRC)/Xrender -+ -+SOXRENDERREV = 1.2.2 -+DEPXRENDERLIB = -+XRENDERLIB = -lXrender -+ -+LINTXRENDER = $(LINTLIBDIR)/llib-lXrender.ln -+ -+ XRANDRLIBSRC = $(LIBSRC)/Xrandr -+ -+SOXRANDRREV = 2.0 -+DEPXRANDRLIB = -+XRANDRLIB = -lXrandr -+ -+LINTXRANDR = $(LINTLIBDIR)/llib-lXrandr.ln -+ -+ XFIXESLIBSRC = $(LIBSRC)/Xfixes -+ -+SOXFIXESREV = 3.0 -+DEPXFIXESLIB = -+XFIXESLIB = -lXfixes -+ -+LINTXFIXES = $(LINTLIBDIR)/llib-lXfixes.ln -+ -+ XDAMAGELIBSRC = $(LIBSRC)/Xdamage -+ -+SOXDAMAGEREV = 1.0 -+DEPXDAMAGELIB = -+XDAMAGELIB = -lXdamage -+ -+LINTXDAMAGE = $(LINTLIBDIR)/llib-lXdamage.ln -+ -+XCOMPOSITELIBSRC = $(LIBSRC)/Xcomposite -+ -+SOXCOMPOSITEREV = 1.0 -+DEPXCOMPOSITELIB = -+XCOMPOSITELIB = -lXcomposite -+ -+LINTXCOMPOSITE = $(LINTLIBDIR)/llib-lXcomposite.ln -+ -+XEVIELIBSRC = $(LIBSRC)/Xevie -+ -+SOXEVIEREV = 1.0 -+DEPXEVIELIB = -+XEVIELIB = -lXevie -+ -+LINTXEVIE = $(LINTLIBDIR)/llib-lXevie.ln -+ -+ XCURSORLIBSRC = $(LIBSRC)/Xcursor -+ -+SOXCURSORREV = 1.0.2 -+DEPXCURSORLIB = -+XCURSORLIB = -lXcursor -+ -+LINTXCURSOR = $(LINTLIBDIR)/llib-lXcursor.ln -+ -+ APPLEWMLIBSRC = $(LIBSRC)/apple -+ -+DEPAPPLEWMLIB = $(USRLIBDIR)/libAppleWM.a -+APPLEWMLIB = -lAppleWM -+ -+LINTAPPLEWM = $(LINTLIBDIR)/llib-lAppleWM.ln -+ -+ WINDOWSWMLIBSRC = $(LIBSRC)/windows -+ -+DEPWINDOWSWMLIB = $(USRLIBDIR)/libWindowsWM.a -+WINDOWSWMLIB = -lWindowsWM -+ -+LINTWINDOWSWM = $(LINTLIBDIR)/llib-lWindowsWM.ln -+ -+ XFONTCACHELIBSRC = $(LIBSRC)/Xfontcache -+ -+SOXFONTCACHEREV = 1.2 -+DEPXFONTCACHELIB = -+XFONTCACHELIB = -lXfontcache -+ -+LINTXFONTCACHE = $(LINTLIBDIR)/llib-lXfontcache.ln -+ -+ XAUTHSRC = $(LIBSRC)/Xau -+ -+SOXAUTHREV = 6.0 -+DEPXAUTHLIB = -+XAUTHLIB = -lXau -+ -+LINTXAUTH = $(LINTLIBDIR)/llib-lXau.ln -+ -+ XDMCPLIBSRC = $(LIBSRC)/Xdmcp -+ -+SOXDMCPREV = 6.0 -+DEPXDMCPLIB = -+XDMCPLIB = -lXdmcp -+ -+LINTXDMCP = $(LINTLIBDIR)/llib-lXdmcp.ln -+ -+ XMUSRC = $(LIBSRC)/Xmu -+ -+SOXMUREV = 6.2 -+DEPXMULIB = -+XMULIB = -lXmu -+ -+LINTXMU = $(LINTLIBDIR)/llib-lXmu.ln -+ -+ XMUUSRC = $(LIBSRC)/Xmuu -+ -+SOXMUUREV = 1.0 -+DEPXMUULIB = -+XMUULIB = -lXmuu -+ -+LINTXMUU = $(LINTLIBDIR)/llib-lXmuu.ln -+ -+ OLDXLIBSRC = $(LIBSRC)/oldX -+ -+DEPOLDXLIB = $(USRLIBDIR)/liboldX.a -+OLDXLIB = -loldX -+ -+LINTOLDX = $(LINTLIBDIR)/llib-loldX.ln -+ -+ XPLIBSRC = $(LIBSRC)/Xp -+ -+SOXPREV = 6.2 -+DEPXPLIB = -+XPLIB = -lXp -+ -+LINTXP = $(LINTLIBDIR)/llib-lXp.ln -+ -+ TOOLKITSRC = $(LIBSRC)/Xt -+ -+SOXTREV = 6.0 -+DEPXTOOLONLYLIB = -+XTOOLONLYLIB = -lXt -+ -+LINTXTOOLONLY = $(LINTLIBDIR)/llib-lXt.ln -+ -+ DEPXTOOLLIB = $(DEPXTOOLONLYLIB) $(DEPSMLIB) $(DEPICELIB) -+ XTOOLLIB = $(XTOOLONLYLIB) $(SMLIB) $(ICELIB) -+ LINTXTOOLLIB = $(LINTXTOOLONLYLIB) -+ -+ XALIBSRC = $(LIBSRC)/Xa -+ -+SOXAREV = 1.0 -+DEPXALIB = -+XALIB = -lXa -+ -+LINTXA = $(LINTLIBDIR)/llib-lXa.ln -+ -+ AWIDGETSRC = $(LIBSRC)/Xaw -+ -+SOXAWREV = 8.0 -+DEPXAWLIB = -+XAWLIB = -lXaw -+ -+LINTXAW = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ AWIDGET7SRC = $(LIBSRC)/Xaw7 -+ -+SOXAW7REV = 7.0 -+DEPXAW7LIB = -+XAW7LIB = -lXaw -+ -+LINTXAW7 = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ AWIDGET6SRC = $(LIBSRC)/Xaw6 -+ -+SOXAW6REV = 6.1 -+DEPXAW6LIB = -+XAW6LIB = -lXaw -+ -+LINTXAW6 = $(LINTLIBDIR)/llib-lXaw.ln -+ -+ XILIBSRC = $(LIBSRC)/Xi -+ -+SOXINPUTREV = 6.0 -+DEPXILIB = -+XILIB = -lXi -+ -+LINTXI = $(LINTLIBDIR)/llib-lXi.ln -+ -+ XTESTLIBSRC = $(LIBSRC)/Xtst -+ -+SOXTESTREV = 6.1 -+DEPXTESTLIB = -+XTESTLIB = -lXtst -+ -+LINTXTEST = $(LINTLIBDIR)/llib-lXtst.ln -+ -+DEPXBSDLIB = $(USRLIBDIR)/libXbsd.a -+XBSDLIB = -lXbsd -+ -+LINTXBSD = $(LINTLIBDIR)/llib-lXbsd.ln -+ -+ ICESRC = $(LIBSRC)/ICE -+ -+SOICEREV = 6.4 -+DEPICELIB = -+ICELIB = -lICE -+ -+LINTICE = $(LINTLIBDIR)/llib-lICE.ln -+ -+ SMSRC = $(LIBSRC)/SM -+ -+SOSMREV = 6.0 -+DEPSMLIB = -+SMLIB = -lSM -+ -+LINTSM = $(LINTLIBDIR)/llib-lSM.ln -+ -+ XKEYSRC = $(LIBSRC)/Xkey -+ -+SOXKEYREV = 6.0 -+DEPXKEYLIB = -+XKEYLIB = -lXkey -+ -+LINTXKEY = $(LINTLIBDIR)/llib-lXkey.ln -+ -+ FSLIBSRC = $(LIBSRC)/FS -+ -+SOFSREV = 6.0 -+DEPFSLIB = -+FSLIB = -lFS -+ -+LINTFS = $(LINTLIBDIR)/llib-lFS.ln -+ -+ FONTLIBSRC = $(LIBSRC)/font -+ -+SOFONTREV = 1.5 -+DEPFONTLIB = -+FONTLIB = -L$(FREETYPELIBDIR) -L$(FONTLIBSRC) -lXfont -+ -+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln -+# -+SOFONTREV = 1.5 -+DEPXFONTLIB = -+XFONTLIB = -lXfont -+ -+LINTXFONT = $(LINTLIBDIR)/llib-lXfont.ln -+ -+ FONTSTUBLIBSRC = $(FONTLIBSRC)/stubs -+ -+DEPFONTSTUBLIB = $(USRLIBDIR)/libfntstubs.a -+FONTSTUBLIB = -lfntstubs -+ -+LINTFONTSTUB = $(LINTLIBDIR)/llib-lfntstubs.ln -+ DEPFONTLIB = $(DEPXFONTLIB) $(DEPFONTSTUBLIB) -+ FONTLIB = $(XFONTLIB) $(FONTSTUBLIB) $(FREETYPE2LIB) -+ -+ FONTENCLIBSRC = $(LIBSRC)/fontenc -+ -+SOFONTENCREV = 1.0 -+DEPXFONTENCLIB = -+XFONTENCLIB = -lfontenc -+ -+LINTXFONTENC = $(LINTLIBDIR)/llib-lfontenc.ln -+ -+ XPMLIBSRC = $(LIBSRC)/Xpm -+ -+SOXPMREV = 4.11 -+DEPXPMLIB = -+XPMLIB = -lXpm -+ -+LINTXPM = $(LINTLIBDIR)/llib-lXpm.ln -+ -+FREETYPE2DIR = /usr -+FREETYPE2LIBDIR = /usr/lib -+FREETYPE2INCDIR = /usr/include -+ -+FREETYPE2LIB = -lfreetype -+ -+FREETYPE2INCLUDES = -I$(FREETYPE2INCDIR)/freetype2 -I$(FREETYPE2INCDIR)/freetype2/config -+ -+FREETYPE2DEFINES = -DFREETYPE2 -+ -+ EXPATLIBSRC = $(LIBSRC)/expat -+ -+SOEXPATREV = 0.4 -+DEPEXPATLIB = -+EXPATLIB = -lexpat -+ -+LINTEXPAT = $(LINTLIBDIR)/llib-lexpat.ln -+ -+EXPATDIR = /usr -+EXPATLIBDIR = /usr/lib -+EXPATINCDIR = /usr/include -+ -+EXPATINCLUDES = -+ -+EXPATLIB = -lexpat -+ -+EXPATDEFINES = -DEXPAT -+ -+ XFT1LIBSRC = $(LIBSRC)/Xft1 -+ -+SOXFT1REV = 1.1 -+DEPXFT1LIB = -+XFT1LIB = -lXft -+ -+LINTXFT1 = $(LINTLIBDIR)/llib-lXft.ln -+ -+ XFTLIBSRC = $(LIBSRC)/Xft -+ -+SOXFTREV = 2.1.2 -+DEPXFTLIB = -+XFTLIB = -lXft -+ -+LINTXFT = $(LINTLIBDIR)/llib-lXft.ln -+ -+ FONTCONFIGLIBSRC = $(LIBSRC)/fontconfig -+ -+SOFONTCONFIGREV = 1.0.4 -+DEPFONTCONFIGLIB = -+FONTCONFIGLIB = -lfontconfig -+ -+LINTFONTCONFIG = $(LINTLIBDIR)/llib-lfontconfig.ln -+ -+FONTCONFIGINCDIR=$(INCDIR) -+ -+FONTCONFIGINCLUDES = -I$(FONTCONFIGINCDIR) -+ -+FCCACHE = $(BINDIR)/fc-cache -+ -+FONTCONFIGDEFINES = -DFONTCONFIG -+ -+XFTINCLUDES=$(FONTCONFIGINCLUDES) $(FREETYPE2INCLUDES) -+ -+LIBPNGINCDIR = /usr/include -+ -+LIBPNGINC= -+ -+LIBPNGDIR = /usr -+LIBPNGLIBDIR = /usr/lib -+LIBPNGINCDIR = /usr/include -+ -+LIBPNGLIB = -lpng -+ -+ XKBFILELIBSRC = $(LIBSRC)/xkbfile -+ -+SOXKBFILEREV = 1.0 -+DEPXKBFILELIB = -+XKBFILELIB = -lxkbfile -+ -+LINTXKBFILE = $(LINTLIBDIR)/llib-lxkbfile.ln -+ -+ XKBCOMPCMD = $(XBINDIR)/xkbcomp -+ -+ XKBUILIBSRC = $(LIBSRC)/xkbui -+ -+SOXKBUIREV = 1.0 -+DEPXKBUILIB = -+XKBUILIB = -lxkbui -+ -+LINTXKBUI = $(LINTLIBDIR)/llib-lxkbui.ln -+ -+EXTRAXAWREQS = -+ -+EXTRAXAWCLIENTDEPLIBS = -+ -+EXTRAXAWCLIENTLIBS = -+ -+ XTRAPLIBSRC = $(LIBSRC)/XTrap -+ -+SOXTRAPREV = 6.4 -+DEPXTRAPLIB = -+XTRAPLIB = -lXTrap -+ -+LINTXTRAP = $(LINTLIBDIR)/llib-lXTrap.ln -+ -+ DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXLIB) -+ -+ DEPLIBS1 = $(DEPLIBS) -+ DEPLIBS2 = $(DEPLIBS) -+ DEPLIBS3 = $(DEPLIBS) -+ DEPLIBS4 = $(DEPLIBS) -+ DEPLIBS5 = $(DEPLIBS) -+ DEPLIBS6 = $(DEPLIBS) -+ DEPLIBS7 = $(DEPLIBS) -+ DEPLIBS8 = $(DEPLIBS) -+ DEPLIBS9 = $(DEPLIBS) -+ DEPLIBS10 = $(DEPLIBS) -+ -+ FCPRELOADPATTERN = libfontconfig.so.? -+ -+ XFTPRELOADPATTERN = libXft.so.? -+ XRENDERPRELOADPATTERN = libXrender.so.? -+ XFONTPRELOADPATTERN = libXfont*.so.? -+ -+XMULIBONLY = -lXmu -+XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB) -+ -+ CONFIGDIR = /usr/share/X11/config -+ -+ USRLIBDIRPATH = $(USRLIBDIR) -+ LDPRELIBS = -L$(USRLIBDIR) $(INSTALLED_LIBS) -+ LDPOSTLIBS = -+ TOP_INCLUDES = -I$(INCROOT) $(TOP_X_INCLUDES) -+ PROJECT_DEFINES = -+ VENDOR_DEFINES = -DXVENDORNAME='"$(VENDORNAME)"' -DXVENDORNAMESHORT='"$(VENDORNAMESHORT)"' -+ -+CXXPROJECT_DEFINES = -+ -+# ---------------------------------------------------------------------- -+# start of Imakefile -+ -+# Remove the next line if you want genuine Xaw instead of Xaw3d -+ -+# Remove the next line if you don't want to enable XTEST support -+ -+# Remove the next line if you want to disable internationalization -+ -+SRCS = xvkbd.c findwidget.c -+OBJS = xvkbd.o findwidget.o -+DEPLIBS = $(DEPXAWLIB) $(DEPXMULIB) $(DEPXTOOLLIB) $(DEPXPMLIB) $(EXTRAXAWCLIENTDEPLIBS) $(DEPXLIB) -+SYS_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) -+ -+D_XTEST = -DUSE_XTEST -+SYS_LIBRARIES = $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB) -lXtst -+ -+D_I18N = -DUSE_I18N -+ -+DEFINES = $(D_XAW3D) $(D_XTEST) $(D_I18N) -+ -+xvkbd.o: xvkbd.c resources.h XVkbd-common.h -+ $(RM) $@ -+ $(CC) -c $(CFLAGS) $*.c -+ -+ PROGRAM = xvkbd -+ -+all:: xvkbd -+ -+xvkbd: $(OBJS) $(DEPLIBS) -+ $(RM) $@ -+ $(CCLINK) -o $@ $(LDOPTIONS) $(OBJS) $(LOCAL_LIBRARIES) $(LDLIBS) $(EXTRA_LOAD_FLAGS) -+ -+install:: xvkbd -+ @if [ -d $(DESTDIR)$(BINDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(BINDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(BINDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(BINDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTPGMFLAGS) xvkbd $(DESTDIR)$(BINDIR)/xvkbd -+ -+all:: xvkbd.$(MANNEWSUFFIX) -+ -+xvkbd.$(MANNEWSUFFIX): xvkbd.$(MANSRCSUFFIX) -+ $(RM) $@ -+ if test -z "$(PREPROCESSMANPAGES)" ; then \ -+ cd `dirname xvkbd` && \ -+ $(LN) `basename xvkbd.$(MANSRCSUFFIX)` `basename $@`; \ -+ else \ -+ $(RAWCPP) $(MANDEFS) $(EXTRAMANDEFS) \ -+ < xvkbd.$(MANSRCSUFFIX) | sed -e '/^# *[0-9][0-9]* *.*$$/d' -e '/^#line *[0-9][0-9]* *.*$$/d' -e '/^[ ]*XCOMM$$/s/XCOMM/#/' -e '/^[ ]*XCOMM[^a-zA-Z0-9_]/s/XCOMM/#/' -e '/^[ ]*XHASH/s/XHASH/#/' -e '/\@\@$$/s/\@\@$$/\\/' >$@; \ -+ fi -+ -+cleandir:: -+ $(RM) xvkbd.$(MANNEWSUFFIX) -+ -+install.man:: xvkbd.$(MANNEWSUFFIX) -+ @if [ -d $(DESTDIR)$(MANDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(MANDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(MANDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTMANFLAGS) xvkbd.$(MANNEWSUFFIX) $(DESTDIR)$(MANDIR)/xvkbd.$(MANSUFFIX) -+ -+depend:: -+ $(DEPEND) $(DEPENDFLAGS) -- $(ALLDEFINES) $(DEPEND_DEFINES) -- $(SRCS) -+ -+lint: -+ $(LINT) $(LINTFLAGS) $(SRCS) $(LINTLIBS) -+lint1: -+ $(LINT) $(LINTFLAGS) $(FILE) $(LINTLIBS) -+ -+cleandir:: -+ $(RM) xvkbd -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-belgian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-belgian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-belgian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-common.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-common.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-common -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-danish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-danish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-danish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-fitaly.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-fitaly.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-fitaly -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-french.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-french.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-french -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-french2.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-french2.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-french2 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-german.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-german.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-german -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-greek.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-greek.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-greek -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-hebrew.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-hebrew.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-hebrew -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-icelandic.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-icelandic.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-icelandic -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-italian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-italian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-italian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-jisx6002.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-jisx6002.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-jisx6002 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-jisx6004.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-jisx6004.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-jisx6004 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-korean.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-korean.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-korean -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-latin1.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-latin1.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-latin1 -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-norwegian.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-norwegian.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-norwegian -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-portuguese.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-portuguese.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-portuguese -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-slovene.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-slovene.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-slovene -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-small.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-small.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-small -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-spanish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-spanish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-spanish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-swedish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-swedish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-swedish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-swissgerman.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-swissgerman.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-swissgerman -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-turkish.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-turkish.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-turkish -+ -+install:: -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ $(RM) $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ fi -+ @if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(LIBDIR)/. ]; then \ -+ (set -x; rm -f $(DESTDIR)$(LIBDIR)/.); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(LIBDIR)/.); \ -+ fi -+ @if [ -d $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(CONFDIR)/app-defaults ]; then \ -+ (set -x; rm -f $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(CONFDIR)/app-defaults); \ -+ fi -+ @for flag in ${MAKEFLAGS} ''; do \ -+ case "$$flag" in *=*) ;; --*) ;; *[i]*) set +e;; esac; done; \ -+ if [ -d $(DESTDIR)$(LIBDIR)/. ]; then \ -+ RELPATH=`echo $(LIBDIR)/. | \ -+ sed -e 's:^/::' -e 's:[^/.][^/]*:..:'g -e 's:/\.$$::'`; \ -+ cd $(DESTDIR)$(LIBDIR)/.; \ -+ if [ -d app-defaults -a ! -h app-defaults ]; then \ -+ (cd app-defaults; tar cf - . | \ -+ (cd $(DESTDIR)$(CONFDIR)/app-defaults; \ -+ tar xf -; exit 0); exit 0); \ -+ fi; \ -+ $(RM) -r app-defaults; \ -+ $(LN) $${RELPATH}$(CONFDIR)/app-defaults .; \ -+ fi -+ -+install:: XVkbd-uk.ad -+ @if [ -d $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ set +x; \ -+ else \ -+ if [ -h $(DESTDIR)$(XAPPLOADDIR) ]; then \ -+ (set -x; rm -f $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi; \ -+ (set -x; $(MKDIRHIER) $(DESTDIR)$(XAPPLOADDIR)); \ -+ fi -+ $(INSTALL) $(INSTALLFLAGS) $(INSTAPPFLAGS) XVkbd-uk.ad $(DESTDIR)$(XAPPLOADDIR)/XVkbd-uk -+ -+# ============================ -+# These rules are only for me -+ -+_distclean: cleandir -+ -rm Makefile -+ -+XVkbd-common.h: XVkbd-common.ad -+ -which ad2c > /dev/null && ad2c XVkbd-common.ad > XVkbd-common.h -+ -+HTML = $(HOME)/public_html/homepage3.nifty.com/xvkbd/index.html -+_readme: -+ -[ -f $(HTML) ] && html2man $(HTML) > xvkbd.man -+ ( echo ".pl 10000"; echo ".ll 75"; echo ".hy 0"; echo ".ad l" ) | cat - xvkbd.man | groff -Tascii -man | sed 's/.//g' | head -9000 | cat -s | tail +3 > README -+ -+# ============================ -+ -+# ---------------------------------------------------------------------- -+# common rules for all Makefiles - do not edit -+ -+.c.i: -+ $(RM) $@ -+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.c > $@ -+ -+.SUFFIXES: .ii -+ -+.cc.ii: -+ $(RM) $@ -+ $(CC) -E $(CFLAGS) $(_NOOP_) $*.cc > $@ -+ -+.SUFFIXES: .s -+ -+.c.s: -+ $(RM) $@ -+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.c -+ -+.cc.s: -+ $(RM) $@ -+ $(CC) -S $(CFLAGS) $(_NOOP_) $*.cc -+ -+emptyrule:: -+ -+cleandir:: -+ $(RM) *.CKP *.ln *.BAK *.bak *.o core errs ,* *~ *.a .emacs_* tags TAGS make.log MakeOut "#"* -+ -+Makefile:: -+ -@if [ -f Makefile ]; then set -x; \ -+ $(RM) Makefile.bak; $(MV) Makefile Makefile.bak; \ -+ else exit 0; fi -+ $(IMAKE_CMD) -DTOPDIR=$(TOP) -DCURDIR=$(CURRENT_DIR) -+ -+tags:: -+ $(TAGS) -w *.[ch] -+ $(TAGS) -xw *.[ch] > TAGS -+ -+man_keywords:: -+ -+html_index:: -+ -+clean:: cleandir -+ -+distclean:: cleandir -+ -+# ---------------------------------------------------------------------- -+# empty rules for directories that do not have SUBDIRS - do not edit -+ -+install:: -+ @echo "install in $(CURRENT_DIR) done" -+ -+install.man:: -+ @echo "install.man in $(CURRENT_DIR) done" -+ -+install.sdk:: -+ @echo "install.sdk in $(CURRENT_DIR) done" -+ -+Makefiles:: -+ -+includes:: -+ -+depend:: -+ -+distclean:: -+ $(RM) Makefile Makefile.dep -+ -+# ---------------------------------------------------------------------- -+# dependencies generated by makedepend -+ diff --git a/package.bak/xvkbd/Config.in b/package.bak/xvkbd/Config.in deleted file mode 100644 index 464a6ef723..0000000000 --- a/package.bak/xvkbd/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_XVKBD - bool "xvkbd" - depends on BR2_PACKAGE_XORG7 - select BR2_PACKAGE_XLIB_LIBICE - select BR2_PACKAGE_XLIB_LIBSM - select BR2_PACKAGE_XLIB_LIBX11 - select BR2_PACKAGE_XLIB_LIBXAW - select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXPM - select BR2_PACKAGE_XLIB_LIBXT - select BR2_PACKAGE_XLIB_LIBXTST - help - on-screen keyboard for X - - http://t-sato.in.coocan.jp/xvkbd diff --git a/package.bak/xvkbd/xvkbd.hash b/package.bak/xvkbd/xvkbd.hash deleted file mode 100644 index 18148e5e09..0000000000 --- a/package.bak/xvkbd/xvkbd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 895f768269820e7c0379b0daac3687bda0c670d192ebb7e61e5613a5939ec90b xvkbd-3.7.tar.gz diff --git a/package.bak/xvkbd/xvkbd.mk b/package.bak/xvkbd/xvkbd.mk deleted file mode 100644 index 14e3f42f67..0000000000 --- a/package.bak/xvkbd/xvkbd.mk +++ /dev/null @@ -1,34 +0,0 @@ -################################################################################ -# -# xvkbd -# -################################################################################ - -XVKBD_VERSION = 3.7 -XVKBD_SITE = http://t-sato.in.coocan.jp/xvkbd -XVKBD_LICENSE = GPLv2+ -XVKBD_LICENSE_FILES = README - -# Passing USRLIBDIR ensures that the stupid Makefile doesn't add -# /usr/lib to the library search path. -define XVKBD_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) $(TARGET_CONFIGURE_OPTS) \ - USRLIBDIR="$(STAGING_DIR)/usr/lib" -endef - -define XVKBD_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) -C $(@D) DESTDIR=$(TARGET_DIR) install -endef - -XVKBD_DEPENDENCIES = \ - xlib_libICE \ - xlib_libSM \ - xlib_libX11 \ - xlib_libXaw \ - xlib_libXext \ - xlib_libXmu \ - xlib_libXpm \ - xlib_libXt \ - xlib_libXtst - -$(eval $(generic-package)) diff --git a/package.bak/xxhash/Config.in b/package.bak/xxhash/Config.in deleted file mode 100644 index f2cccda2c5..0000000000 --- a/package.bak/xxhash/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_XXHASH - bool "xxhash" - help - xxHash is an extremely fast hash algorithm, running at RAM - speed limits. - - https://github.com/Cyan4973/xxHash diff --git a/package.bak/xxhash/xxhash.hash b/package.bak/xxhash/xxhash.hash deleted file mode 100644 index 31081c01d8..0000000000 --- a/package.bak/xxhash/xxhash.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9743539ed787ea9bd5bb348265cebdd5adcbf820ad329bf44c28bc69ab4c7cd8 xxhash-r40.tar.gz diff --git a/package.bak/xxhash/xxhash.mk b/package.bak/xxhash/xxhash.mk deleted file mode 100644 index 47ead7507e..0000000000 --- a/package.bak/xxhash/xxhash.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# xxhash -# -################################################################################ - -XXHASH_VERSION = r40 -XXHASH_SITE = $(call github,Cyan4973,xxHash,$(XXHASH_VERSION)) -XXHASH_LICENSE = BSD-2c, GPLv2+ -XXHASH_LICENSE_FILES = LICENSE xxhsum.c - -define XXHASH_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(@D) xxhsum -endef - -define XXHASH_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/xxhsum $(TARGET_DIR)/usr/bin/xxhsum -endef - -$(eval $(generic-package)) diff --git a/package.bak/xz/Config.in b/package.bak/xz/Config.in deleted file mode 100644 index 50116f2995..0000000000 --- a/package.bak/xz/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_XZ - bool "xz-utils" - help - XZ is the successor to the Lempel-Ziv/Markov-chain Algorithm - compression format, which provides memory-hungry but powerful - compression (often better than bzip2) and fast, easy decompression. - - This package provides the command line tools for working with XZ - compression, including xz, unxz, xzcat, xzgrep, and so on. They can - also handle the older LZMA format, and if invoked via appropriate - symlinks will emulate the behavior of the commands in the lzma - package. - - http://tukaani.org/xz/ diff --git a/package.bak/xz/xz.hash b/package.bak/xz/xz.hash deleted file mode 100644 index 20a4a47432..0000000000 --- a/package.bak/xz/xz.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated after checking pgp signature -sha256 fd9ca16de1052aac899ad3495ad20dfa906c27b4a5070102a2ec35ca3a4740c1 xz-5.2.3.tar.bz2 diff --git a/package.bak/xz/xz.mk b/package.bak/xz/xz.mk deleted file mode 100644 index 40adb3d107..0000000000 --- a/package.bak/xz/xz.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# xz -# -################################################################################ - -XZ_VERSION = 5.2.3 -XZ_SOURCE = xz-$(XZ_VERSION).tar.bz2 -XZ_SITE = http://tukaani.org/xz -XZ_INSTALL_STAGING = YES -XZ_CONF_ENV = ac_cv_prog_cc_c99='-std=gnu99' -XZ_LICENSE = GPLv2+, GPLv3+, LGPLv2.1+ -XZ_LICENSE_FILES = COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 - -ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),y) -XZ_CONF_OPTS = --enable-threads -else -XZ_CONF_OPTS = --disable-threads -endif - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/yad/Config.in b/package.bak/yad/Config.in deleted file mode 100644 index 50b97c59ab..0000000000 --- a/package.bak/yad/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_YAD - bool "yad" - depends on BR2_PACKAGE_XORG7 - depends on BR2_PACKAGE_LIBGTK2 || BR2_PACKAGE_LIBGTK3_X11 - help - YAD (yet another dialog) is a tool for create graphical dialogs - from shell scripts. - - http://sourceforge.net/projects/yad-dialog/ - -comment "yad needs libgtk2 or libgtk3 w/ X11 backend" - depends on BR2_PACKAGE_XORG7 - depends on !BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_LIBGTK3_X11 diff --git a/package.bak/yad/yad.hash b/package.bak/yad/yad.hash deleted file mode 100644 index 18392829e8..0000000000 --- a/package.bak/yad/yad.hash +++ /dev/null @@ -1,3 +0,0 @@ -# From http://sourceforge.net/projects/yad-dialog/files/ -md5 4e24888712be1e95fd3cea815f19c6cb yad-0.33.1.tar.xz -sha1 b39977128678ca67bf4649929510f729c9cf1e67 yad-0.33.1.tar.xz diff --git a/package.bak/yad/yad.mk b/package.bak/yad/yad.mk deleted file mode 100644 index a7f5ba2589..0000000000 --- a/package.bak/yad/yad.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# yad -# -################################################################################ - -YAD_VERSION = 0.33.1 -YAD_SOURCE = yad-$(YAD_VERSION).tar.xz -YAD_SITE = http://sourceforge.net/projects/yad-dialog/files -YAD_LICENSE = GPLv3 -YAD_LICENSE_FILES = COPYING -YAD_DEPENDENCIES = host-intltool host-pkgconf -YAD_CONF_OPTS = --enable-html=no - -ifeq ($(BR2_PACKAGE_LIBGTK3_X11),y) -YAD_DEPENDENCIES += libgtk3 -YAD_CONF_OPTS += --with-gtk=gtk3 -else -YAD_DEPENDENCIES += libgtk2 -YAD_CONF_OPTS += --with-gtk=gtk2 -endif - -$(eval $(autotools-package)) diff --git a/package.bak/yaffs2utils/yaffs2utils.hash b/package.bak/yaffs2utils/yaffs2utils.hash deleted file mode 100644 index 4e5846e065..0000000000 --- a/package.bak/yaffs2utils/yaffs2utils.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 9b0912bf683eb839b6e57c9255c83894c3b700d16489a49d319c54c1abf8f6d7 0.2.9.tar.gz diff --git a/package.bak/yaffs2utils/yaffs2utils.mk b/package.bak/yaffs2utils/yaffs2utils.mk deleted file mode 100644 index fdd5f67e45..0000000000 --- a/package.bak/yaffs2utils/yaffs2utils.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# yaffs2utils -# -################################################################################ - -YAFFS2UTILS_VERSION = 0.2.9 -YAFFS2UTILS_SOURCE = $(YAFFS2UTILS_VERSION).tar.gz -YAFFS2UTILS_SITE = https://yaffs2utils.googlecode.com/files -YAFFS2UTILS_LICENSE = GPLv2 -YAFFS2UTILS_LICENSE_FILES = COPYING - -define HOST_YAFFS2UTILS_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) -endef - -define HOST_YAFFS2UTILS_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) INSTALLDIR=$(HOST_DIR)/usr/bin install -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch b/package.bak/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch deleted file mode 100644 index 0023a1da43..0000000000 --- a/package.bak/yajl/0001-Let-the-shared-and-the-static-library-have-the-same-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b08fe001e3d3f3564ef298e62342f07080807f7a Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Wed, 28 Oct 2015 15:45:10 +0000 -Subject: [PATCH] Let the shared and the static library have the same name -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The will be differentiated by the extension (.so or .a). - -Fetched from: -https://github.com/vriera/yajl/commit/6d09f11b8fd358cab0e31b965327e64a599f9ce9 - -Signed-off-by: Vicente Olivert Riera -Signed-off-by: Jörg Krause ---- - src/CMakeLists.txt | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 99cf9e9..1a900d3 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -36,6 +36,7 @@ SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig) - SET(LIBRARY_OUTPUT_PATH ${libDir}) - - ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) -+SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) - - ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) - --- -2.8.0 - diff --git a/package.bak/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch b/package.bak/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch deleted file mode 100644 index 53decca649..0000000000 --- a/package.bak/yajl/0002-cmake-disable-shared-library-build-when-BUILD_SHARED.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b3cddf92adacfe5ca40574afb3e323cc7cdebc5c Mon Sep 17 00:00:00 2001 -From: Maxime Hadjinlian -Date: Tue, 2 Feb 2016 15:46:09 +0100 -Subject: [PATCH] cmake: Add shared library conditonnal build - -When BUILD_SHARED_LIBS is off, you don't want to build the shared -library. - -Signed-off-by: Samuel Martin ---- - src/CMakeLists.txt | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 99cf9e9..9e9c77d 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -37,6 +37,7 @@ SET(LIBRARY_OUTPUT_PATH ${libDir}) - - ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) - -+IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) - - #### setup shared library version number -@@ -51,6 +52,7 @@ IF(APPLE) - SET_TARGET_PROPERTIES(yajl PROPERTIES - INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib") - ENDIF(APPLE) -+ENDIF(BUILD_SHARED_LIBS) - - #### build up an sdk as a post build step - -@@ -77,10 +79,12 @@ INCLUDE_DIRECTORIES(${incDir}/..) - - # at build time you may specify the cmake variable LIB_SUFFIX to handle - # 64-bit systems which use 'lib64' -+IF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl - RUNTIME DESTINATION lib${LIB_SUFFIX} - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX}) -+ENDIF(BUILD_SHARED_LIBS) - INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX}) - INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl) - INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl) --- -2.7.0 - diff --git a/package.bak/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch b/package.bak/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch deleted file mode 100644 index d3c91f2b9e..0000000000 --- a/package.bak/yajl/0003-Link-with-shared-libyajl-in-a-shared-build.patch +++ /dev/null @@ -1,127 +0,0 @@ -From 425b25993ef58d07aa18c5d4938876a90e22c47a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Sat, 9 Apr 2016 23:24:27 +0200 -Subject: [PATCH] Link with shared libyajl in a shared build -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Building yajl in a static context fails in a parallel build: - -[ 21%] Linking C executable gen-extra-close -[ 26%] Building C object src/CMakeFiles/yajl_s.dir/yajl_buf.c.o -/home/test/autobuild/instance-3/output/host/opt/ext-toolchain/bfin-uclinux/bfin-uclinux/bin/ld.real: cannot find -lyajl - -Fix this issue by linking against the shared libyail in a shared build. Apply -this fix also to all other build targets who are linking against the library. - -Upstream status: Pending -https://github.com/lloyd/yajl/pull/187 - -[Update: align with commit 302563539dacb284576a443401cdfd061eb2e1e8 and remove - linking with libm from test/api/CMakeLists.txt] -Signed-off-by: Jörg Krause ---- - example/CMakeLists.txt | 7 ++++++- - perf/CMakeLists.txt | 6 +++++- - reformatter/CMakeLists.txt | 6 +++++- - test/api/CMakeLists.txt | 6 +++++- - test/parsing/CMakeLists.txt | 6 +++++- - verify/CMakeLists.txt | 6 +++++- - 6 files changed, 31 insertions(+), 6 deletions(-) - -diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt -index 0a7f622..8cfcef8 100644 ---- a/example/CMakeLists.txt -+++ b/example/CMakeLists.txt -@@ -20,4 +20,9 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(parse_config ${SRCS}) - --TARGET_LINK_LIBRARIES(parse_config yajl_s) -+IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(parse_config yajl) -+ELSE() -+ TARGET_LINK_LIBRARIES(parse_config yajl_s) -+ENDIF() -+ -diff --git a/perf/CMakeLists.txt b/perf/CMakeLists.txt -index b438d7a..40ba363 100644 ---- a/perf/CMakeLists.txt -+++ b/perf/CMakeLists.txt -@@ -20,4 +20,8 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(perftest ${SRCS}) - --TARGET_LINK_LIBRARIES(perftest yajl_s) -+IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(perftest yajl) -+ELSE() -+ TARGET_LINK_LIBRARIES(perftest yajl_s) -+ENDIF() -diff --git a/reformatter/CMakeLists.txt b/reformatter/CMakeLists.txt -index 52a9bee..7629094 100644 ---- a/reformatter/CMakeLists.txt -+++ b/reformatter/CMakeLists.txt -@@ -26,7 +26,11 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(json_reformat ${SRCS}) - --TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(json_reformat yajl) -+ELSE() -+ TARGET_LINK_LIBRARIES(json_reformat yajl_s) -+ENDIF() - - # In some environments, we must explicitly link libm (like qnx, - # thanks @shahbag) -diff --git a/test/api/CMakeLists.txt b/test/api/CMakeLists.txt -index cd65a54..0c9debf 100644 ---- a/test/api/CMakeLists.txt -+++ b/test/api/CMakeLists.txt -@@ -21,5 +21,9 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) - FOREACH (test ${TESTS}) - GET_FILENAME_COMPONENT(testProg ${test} NAME_WE) - ADD_EXECUTABLE(${testProg} ${test}) -- TARGET_LINK_LIBRARIES(${testProg} yajl) -+ IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(${testProg} yajl) -+ ELSE() -+ TARGET_LINK_LIBRARIES(${testProg} yajl_s) -+ ENDIF() - ENDFOREACH() -diff --git a/test/parsing/CMakeLists.txt b/test/parsing/CMakeLists.txt -index c22a388..285f048 100644 ---- a/test/parsing/CMakeLists.txt -+++ b/test/parsing/CMakeLists.txt -@@ -20,4 +20,8 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(yajl_test ${SRCS}) - --TARGET_LINK_LIBRARIES(yajl_test yajl_s) -+IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(yajl_test yajl) -+ELSE() -+ TARGET_LINK_LIBRARIES(yajl_test yajl_s) -+ENDIF() -diff --git a/verify/CMakeLists.txt b/verify/CMakeLists.txt -index 967fca1..06cb2dc 100644 ---- a/verify/CMakeLists.txt -+++ b/verify/CMakeLists.txt -@@ -26,7 +26,11 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/lib) - - ADD_EXECUTABLE(json_verify ${SRCS}) - --TARGET_LINK_LIBRARIES(json_verify yajl_s) -+IF(BUILD_SHARED_LIBS) -+ TARGET_LINK_LIBRARIES(json_verify yajl) -+ELSE() -+ TARGET_LINK_LIBRARIES(json_verify yajl_s) -+ENDIF() - - # copy in the binary - GET_TARGET_PROPERTY(binPath json_verify LOCATION) --- -2.8.0 - diff --git a/package.bak/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch b/package.bak/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch deleted file mode 100644 index 71cf2958ee..0000000000 --- a/package.bak/yajl/0004-Link-libyajl-_s-with-libm-when-isnan-is-not-brought-.patch +++ /dev/null @@ -1,64 +0,0 @@ -From b47f6a50925efb8c8707b1faed5561a4b66ffdb1 Mon Sep 17 00:00:00 2001 -From: Samuel Martin -Date: Sun, 24 Apr 2016 18:45:27 +0200 -Subject: [PATCH] Link libyajl{,_s} with libm when isnan is not brought by the - libc - -Check whether isnan is provided by the libc library, otherwise make sure -yajl libraries are link against libm. - -Note that setting libm as PUBLIC link libraries enable the transitivity -[1, 2]; therefore it will be automatically passed to target linking -against libyajl{,_s}. - -This patch also makes sure the link libraries will appear in the yajl.pc -file. - -[1] https://cmake.org/cmake/help/v3.5/command/target_link_libraries.html -[2] https://cmake.org/cmake/help/v3.5/manual/cmake-buildsystem.7.html#target-usage-requirements - -Signed-off-by: Samuel Martin ---- - src/CMakeLists.txt | 10 ++++++++++ - src/yajl.pc.cmake | 2 +- - 2 files changed, 11 insertions(+), 1 deletion(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index b487bfd..a88698f 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -35,11 +35,21 @@ SET (shareDir ${CMAKE_CURRENT_BINARY_DIR}/../${YAJL_DIST_NAME}/share/pkgconfig) - # set the output path for libraries - SET(LIBRARY_OUTPUT_PATH ${libDir}) - -+SET(yajl_lib_link) -+INCLUDE(CheckLibraryExists) -+CHECK_LIBRARY_EXISTS(c isnan "" HAVE_LIBC_ISNAN) -+ -+IF(NOT HAVE_LIBC_ISNAN) -+ LIST(APPEND yajl_lib_link "-lm") -+ENDIF(NOT HAVE_LIBC_ISNAN) -+ - ADD_LIBRARY(yajl_s STATIC ${SRCS} ${HDRS} ${PUB_HDRS}) - SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) -+TARGET_LINK_LIBRARIES(yajl_s PUBLIC ${yajl_lib_link}) - - IF(BUILD_SHARED_LIBS) - ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS}) -+TARGET_LINK_LIBRARIES(yajl PUBLIC ${yajl_lib_link}) - - #### setup shared library version number - SET_TARGET_PROPERTIES(yajl PROPERTIES -diff --git a/src/yajl.pc.cmake b/src/yajl.pc.cmake -index 6eaca14..4681dd4 100644 ---- a/src/yajl.pc.cmake -+++ b/src/yajl.pc.cmake -@@ -6,4 +6,4 @@ Name: Yet Another JSON Library - Description: A Portable JSON parsing and serialization library in ANSI C - Version: ${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO} - Cflags: -I${dollar}{includedir} --Libs: -L${dollar}{libdir} -lyajl -+Libs: -L${dollar}{libdir} -lyajl ${yajl_lib_link} --- -2.8.0 - diff --git a/package.bak/yajl/Config.in b/package.bak/yajl/Config.in deleted file mode 100644 index be2c133f43..0000000000 --- a/package.bak/yajl/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_YAJL - bool "yajl" - help - Yet Another JSON Library. YAJL is a small event-driven - (SAX-style) JSON parser written in ANSI C, and a small - validating JSON generator. - - http://lloyd.github.com/yajl/ diff --git a/package.bak/yajl/yajl.hash b/package.bak/yajl/yajl.hash deleted file mode 100644 index ed4a0502fe..0000000000 --- a/package.bak/yajl/yajl.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 3fb73364a5a30efe615046d07e6db9d09fd2b41c763c5f7d3bfb121cd5c5ac5a yajl-2.1.0.tar.gz diff --git a/package.bak/yajl/yajl.mk b/package.bak/yajl/yajl.mk deleted file mode 100644 index 1fb16f50e9..0000000000 --- a/package.bak/yajl/yajl.mk +++ /dev/null @@ -1,13 +0,0 @@ -################################################################################ -# -# yajl -# -################################################################################ - -YAJL_VERSION = 2.1.0 -YAJL_SITE = $(call github,lloyd,yajl,$(YAJL_VERSION)) -YAJL_INSTALL_STAGING = YES -YAJL_LICENSE = ISC -YAJL_LICENSE_FILES = COPYING - -$(eval $(cmake-package)) diff --git a/package.bak/yaml-cpp/Config.in b/package.bak/yaml-cpp/Config.in deleted file mode 100644 index c1ba410a6b..0000000000 --- a/package.bak/yaml-cpp/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -config BR2_PACKAGE_YAML_CPP - bool "yaml-cpp" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_USE_WCHAR # boost - select BR2_PACKAGE_BOOST - help - yaml-cpp is a YAML parser and emitter in C++ matching - the YAML 1.2 spec. - - https://code.google.com/p/yaml-cpp/ - -comment "yaml-cpp needs a toolchain w/ C++, threads, wchar" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR diff --git a/package.bak/yaml-cpp/yaml-cpp.hash b/package.bak/yaml-cpp/yaml-cpp.hash deleted file mode 100644 index 7d6753732c..0000000000 --- a/package.bak/yaml-cpp/yaml-cpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 6fb92f6f5925e0af918ffbb90acf19b7b88706ebcd40fc186b7caa76609b6350 yaml-cpp-0.5.2.tar.gz diff --git a/package.bak/yaml-cpp/yaml-cpp.mk b/package.bak/yaml-cpp/yaml-cpp.mk deleted file mode 100644 index 6a01b02a3b..0000000000 --- a/package.bak/yaml-cpp/yaml-cpp.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# yaml-cpp -# -################################################################################ - -YAML_CPP_VERSION = 0.5.2 -YAML_CPP_SITE = $(call github,jbeder,yaml-cpp,release-$(YAML_CPP_VERSION)) -YAML_CPP_INSTALL_STAGING = YES -YAML_CPP_LICENSE = MIT -YAML_CPP_LICENSE_FILES = license.txt - -YAML_CPP_DEPENDENCIES = boost - -# Disable testing and parse tools -YAML_CPP_CONF_OPTS += -DYAML_CPP_BUILD_TOOLS=OFF - -$(eval $(cmake-package)) diff --git a/package.bak/yasm/Config.in b/package.bak/yasm/Config.in deleted file mode 100644 index 2dc25aadb2..0000000000 --- a/package.bak/yasm/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_YASM - bool "yasm" - depends on BR2_i386 || BR2_x86_64 - help - Yasm is a complete rewrite of the NASM-2.10.01 assembler. - It supports the x86 and AMD64 instruction sets, accepts NASM - and GAS assembler syntaxes and outputs binary, ELF32 and ELF64 - object formats. - - http://www.tortall.net/projects/yasm/ diff --git a/package.bak/yasm/yasm.hash b/package.bak/yasm/yasm.hash deleted file mode 100644 index 016c15b90a..0000000000 --- a/package.bak/yasm/yasm.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f yasm-1.3.0.tar.gz diff --git a/package.bak/yasm/yasm.mk b/package.bak/yasm/yasm.mk deleted file mode 100644 index 1980034429..0000000000 --- a/package.bak/yasm/yasm.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# yasm -# -################################################################################ - -YASM_VERSION = 1.3.0 -YASM_SITE = http://www.tortall.net/projects/yasm/releases -YASM_LICENSE = BSD-2c, BSD-3c, Artistic, GPLv2, LGPLv2 -YASM_LICENSE_FILES = COPYING BSD.txt Artistic.txt GNU_GPL-2.0 GNU_LGPL-2.0 - -# This sed prevents it compiling 2 programs (vsyasm and ytasm) -# that are only of use on Microsoft Windows. -define YASM_PRE_CONFIGURE_FIXUP - $(SED) 's#) ytasm.*#)#' $(@D)/Makefile.in -endef - -YASM_PRE_CONFIGURE_HOOKS += YASM_PRE_CONFIGURE_FIXUP -HOST_YASM_PRE_CONFIGURE_HOOKS += YASM_PRE_CONFIGURE_FIXUP - -$(eval $(autotools-package)) -$(eval $(host-autotools-package)) diff --git a/package.bak/yavta/Config.in b/package.bak/yavta/Config.in deleted file mode 100644 index 6a42a944d6..0000000000 --- a/package.bak/yavta/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_YAVTA - bool "yavta" - help - Yet Another V4L2 Test Application - - http://git.ideasonboard.org/yavta.git diff --git a/package.bak/yavta/yavta.mk b/package.bak/yavta/yavta.mk deleted file mode 100644 index 04af2a63c1..0000000000 --- a/package.bak/yavta/yavta.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# yavta -# -################################################################################ - -YAVTA_VERSION = 82ff2efdb9787737b9f21b6f4759f077c827b238 -YAVTA_SITE = git://git.ideasonboard.org/yavta.git -YAVTA_LICENSE = GPLv2+ -YAVTA_LICENSE_FILES = COPYING.GPL - -define YAVTA_BUILD_CMDS - $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -endef - -define YAVTA_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -D $(@D)/yavta $(TARGET_DIR)/usr/bin/yavta -endef - -$(eval $(generic-package)) diff --git a/package.bak/ympd/0002-only-c-language.patch b/package.bak/ympd/0002-only-c-language.patch deleted file mode 100644 index df5734c35e..0000000000 --- a/package.bak/ympd/0002-only-c-language.patch +++ /dev/null @@ -1,21 +0,0 @@ -ympd is implemented only in C - -By default, CMake assumes that the project is using both C and C++. By -explicitly passing 'C' as argument of the project() macro, we tell -CMake that only C is used, which prevents CMake from checking if a C++ -compiler exists. - -Signed-off-by: Thomas Petazzoni - -Index: b/CMakeLists.txt -=================================================================== ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 2.6) - --project (ympd) -+project (ympd C) - set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") - set(CPACK_PACKAGE_VERSION_MAJOR "1") - set(CPACK_PACKAGE_VERSION_MINOR "2") diff --git a/package.bak/ympd/Config.in b/package.bak/ympd/Config.in deleted file mode 100644 index d0901c71ef..0000000000 --- a/package.bak/ympd/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_YMPD - bool "ympd" - select BR2_PACKAGE_LIBMPDCLIENT - depends on BR2_USE_MMU # fork() - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - ympd, a standalone MPD Web GUI written in C, utilizing - Websockets and Bootstrap/JS - -comment "ympd needs a toolchain w/ threads, dynamic library" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/ympd/ympd.hash b/package.bak/ympd/ympd.hash deleted file mode 100644 index 7483083b4d..0000000000 --- a/package.bak/ympd/ympd.hash +++ /dev/null @@ -1,2 +0,0 @@ -# locally computed -sha256 092c26c51166d1d1f025cd06742981783dea7e42bfe4f73f10c4418fc003de94 ympd-v1.2.3.tar.gz diff --git a/package.bak/ympd/ympd.mk b/package.bak/ympd/ympd.mk deleted file mode 100644 index 61e9cab8b8..0000000000 --- a/package.bak/ympd/ympd.mk +++ /dev/null @@ -1,21 +0,0 @@ -################################################################################ -# -# ympd -# -################################################################################ - -YMPD_VERSION = v1.2.3 -YMPD_SITE = $(call github,notandy,ympd,$(YMPD_VERSION)) -YMPD_LICENSE = GPLv2 -YMPD_LICENSE_FILES = LICENSE -YMPD_DEPENDENCIES = libmpdclient - -define YMPD_MAKE_HOST_TOOL - $(HOSTCC) $(HOST_CFLAGS) $(@D)/htdocs/mkdata.c -o $(@D)/mkdata -endef - -YMPD_PRE_BUILD_HOOKS += YMPD_MAKE_HOST_TOOL - -YMPD_CONF_OPTS += -DMKDATA_EXE=$(@D)/mkdata - -$(eval $(cmake-package)) diff --git a/package.bak/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch b/package.bak/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch deleted file mode 100644 index 57fbeb1e77..0000000000 --- a/package.bak/zbar/0001-Fix-autoreconf-by-reducing-the-warning-error-checkin.patch +++ /dev/null @@ -1,26 +0,0 @@ -From e593d6529cff515d94d80a24b5f3a953fd46004c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sat, 19 Dec 2015 18:56:36 +0100 -Subject: [PATCH] Fix autoreconf by reducing the warning/error checking - -Signed-off-by: Thomas Petazzoni ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 256aedb..e0b6046 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -3,7 +3,7 @@ AC_PREREQ([2.61]) - AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net]) - AC_CONFIG_AUX_DIR(config) - AC_CONFIG_MACRO_DIR(config) --AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2]) -+AM_INIT_AUTOMAKE([1.10 foreign subdir-objects std-options dist-bzip2]) - AC_CONFIG_HEADERS([include/config.h]) - AC_CONFIG_SRCDIR(zbar/scanner.c) - LT_PREREQ([2.2]) --- -2.6.4 - diff --git a/package.bak/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch b/package.bak/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch deleted file mode 100644 index 82dd4e96ea..0000000000 --- a/package.bak/zbar/0002-Fix-function-protoype-to-be-compatible-with-recent-l.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5dc8322b4f9a3de29b3da70b69e16356a2a1764c Mon Sep 17 00:00:00 2001 -From: Viacheslav Volkov -Date: Sat, 19 Dec 2015 19:07:09 +0100 -Subject: [PATCH] Fix function protoype to be compatible with recent libjpeg - -Signed-off-by: Viacheslav Volkov -Signed-off-by: Thomas Petazzoni ---- - zbar/jpeg.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/zbar/jpeg.c b/zbar/jpeg.c -index 972bfea..fdd1619 100644 ---- a/zbar/jpeg.c -+++ b/zbar/jpeg.c -@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo) - cinfo->src->bytes_in_buffer = img->datalen; - } - --int fill_input_buffer (j_decompress_ptr cinfo) -+boolean fill_input_buffer (j_decompress_ptr cinfo) - { - /* buffer underrun error case */ - cinfo->src->next_input_byte = fake_eoi; --- -2.6.4 - diff --git a/package.bak/zbar/0003-Disable-building-documentation.patch b/package.bak/zbar/0003-Disable-building-documentation.patch deleted file mode 100644 index 729f926cc8..0000000000 --- a/package.bak/zbar/0003-Disable-building-documentation.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 58027d5bb0492142a5b72ded772d3a1be9fa8d87 Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni -Date: Sun, 20 Dec 2015 12:05:57 +0100 -Subject: [PATCH] Disable building documentation - -The documentation requires xmlto, and we don't need it in Buildroot. - -Signed-off-by: Thomas Petazzoni ---- - Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index e18499a..db4411f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -45,7 +45,6 @@ if HAVE_NPAPI - include $(srcdir)/plugin/Makefile.am.inc - endif - include $(srcdir)/test/Makefile.am.inc --include $(srcdir)/doc/Makefile.am.inc - - EXTRA_DIST += zbar.ico zbar.nsi - --- -2.6.4 - diff --git a/package.bak/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch b/package.bak/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch deleted file mode 100644 index 6d39b1bd96..0000000000 --- a/package.bak/zbar/0004-Wrap-logical-not-operations-into-parentheses.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 7e69cdc8dfdf07701ba551985ee49d48e64d730f Mon Sep 17 00:00:00 2001 -From: Vicente Olivert Riera -Date: Mon, 25 Jan 2016 11:58:59 +0000 -Subject: [PATCH] Wrap logical not operations into parentheses - -Otherwise it fails like this: - -zbar/decoder/ean.c: In function 'ean_part_end4': -zbar/decoder/ean.c:297:13: error: logical not is only applied to the -left hand side of comparison [-Werror=logical-not-parentheses] - if(!par == fwd) { - -This patch has been sent upstream as a pull request: - - https://github.com/ZBar/ZBar/pull/9 - -Signed-off-by: Vicente Olivert Riera ---- - zbar/decoder/ean.c | 4 ++-- - zbar/qrcode/qrdec.c | 8 ++++---- - 2 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/zbar/decoder/ean.c b/zbar/decoder/ean.c -index c20f538..41d1493 100644 ---- a/zbar/decoder/ean.c -+++ b/zbar/decoder/ean.c -@@ -294,7 +294,7 @@ static inline zbar_symbol_type_t ean_part_end4 (ean_pass_t *pass, - /* invalid parity combination */ - return(ZBAR_NONE); - -- if(!par == fwd) { -+ if((!par) == fwd) { - /* reverse sampled digits */ - unsigned char tmp = pass->raw[1]; - pass->state |= STATE_REV; -@@ -380,7 +380,7 @@ static inline zbar_symbol_type_t ean_part_end7 (ean_decoder_t *ean, - /* invalid parity combination */ - return(ZBAR_NONE); - -- if(!par == fwd) { -+ if((!par) == fwd) { - unsigned char i; - pass->state |= STATE_REV; - /* reverse sampled digits */ -diff --git a/zbar/qrcode/qrdec.c b/zbar/qrcode/qrdec.c -index d8fa802..5d3d265 100644 ---- a/zbar/qrcode/qrdec.c -+++ b/zbar/qrcode/qrdec.c -@@ -1219,8 +1219,8 @@ static int qr_finder_quick_crossing_check(const unsigned char *_img, - _x1<0||_x1>=_width||_y1<0||_y1>=_height){ - return -1; - } -- if(!_img[_y0*_width+_x0]!=_v||!_img[_y1*_width+_x1]!=_v)return 1; -- if(!_img[(_y0+_y1>>1)*_width+(_x0+_x1>>1)]==_v)return -1; -+ if((!_img[_y0*_width+_x0])!=_v||(!_img[_y1*_width+_x1])!=_v)return 1; -+ if((!_img[(_y0+_y1>>1)*_width+(_x0+_x1>>1)])==_v)return -1; - return 0; - } - -@@ -1261,7 +1261,7 @@ static int qr_finder_locate_crossing(const unsigned char *_img, - x0[1-steep]+=step[1-steep]; - err-=dx[steep]; - } -- if(!_img[x0[1]*_width+x0[0]]!=_v)break; -+ if((!_img[x0[1]*_width+x0[0]])!=_v)break; - } - /*Find the last crossing from _v to !_v.*/ - err=0; -@@ -1273,7 +1273,7 @@ static int qr_finder_locate_crossing(const unsigned char *_img, - x1[1-steep]-=step[1-steep]; - err-=dx[steep]; - } -- if(!_img[x1[1]*_width+x1[0]]!=_v)break; -+ if((!_img[x1[1]*_width+x1[0]])!=_v)break; - } - /*Return the midpoint of the _v segment.*/ - _p[0]=(x0[0]+x1[0]+1<>1; --- -2.4.10 - diff --git a/package.bak/zbar/Config.in b/package.bak/zbar/Config.in deleted file mode 100644 index 5097f57439..0000000000 --- a/package.bak/zbar/Config.in +++ /dev/null @@ -1,18 +0,0 @@ -config BR2_PACKAGE_ZBAR - bool "zbar" - depends on BR2_TOOLCHAIN_HAS_THREADS # libv4l - depends on BR2_USE_MMU # libv4l - depends on !BR2_STATIC_LIBS # libv4l - depends on BR2_INSTALL_LIBSTDCPP # libv4l - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # libv4l - select BR2_PACKAGE_JPEG - select BR2_PACKAGE_LIBV4L - help - QR and barcode scanner - - http://zbar.sourceforge.net/ - -comment "zbar needs a toolchain w/ threads, dynamic library, C++ and headers >= 3.0" - depends on BR2_USE_MMU - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS \ - || !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 diff --git a/package.bak/zbar/zbar.hash b/package.bak/zbar/zbar.hash deleted file mode 100644 index 54441a8f3e..0000000000 --- a/package.bak/zbar/zbar.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 38f8535a3c4c526ecaa968a992efcbf7392623e68db45dc2f181d4c9d3002d69 zbar-854a5d97059e395807091ac4d80c53f7968abb8f.tar.gz diff --git a/package.bak/zbar/zbar.mk b/package.bak/zbar/zbar.mk deleted file mode 100644 index aba78d1be0..0000000000 --- a/package.bak/zbar/zbar.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# zbar -# -################################################################################ - -# github have some additional commits for compiling with recent kernel -ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f -ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION)) -ZBAR_LICENSE = LGPLv2.1+ -ZBAR_LICENSE_FILES = LICENSE -ZBAR_INSTALL_STAGING = YES -ZBAR_AUTORECONF = YES -ZBAR_DEPENDENCIES = libv4l jpeg -# add host-gettext for AM_ICONV macro -ZBAR_DEPENDENCIES += host-gettext -ZBAR_CONF_OPTS = \ - --without-imagemagick \ - --without-qt \ - --without-gtk \ - --without-python \ - --without-x - -$(eval $(autotools-package)) diff --git a/package.bak/zd1211-firmware/Config.in b/package.bak/zd1211-firmware/Config.in deleted file mode 100644 index 4469533b0a..0000000000 --- a/package.bak/zd1211-firmware/Config.in +++ /dev/null @@ -1,4 +0,0 @@ -config BR2_PACKAGE_ZD1211_FIRMWARE - bool "zd1211-firmware" - help - Firmware for the ZyDAS ZD1211 / Atheros AR5007UG wifi devices. diff --git a/package.bak/zd1211-firmware/zd1211-firmware.hash b/package.bak/zd1211-firmware/zd1211-firmware.hash deleted file mode 100644 index d26858b2dc..0000000000 --- a/package.bak/zd1211-firmware/zd1211-firmware.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed: -sha256 866308f6f59f7075f075d4959dff2ede47735c751251fecd1496df1ba4d338e1 zd1211-firmware-1.4.tar.bz2 diff --git a/package.bak/zd1211-firmware/zd1211-firmware.mk b/package.bak/zd1211-firmware/zd1211-firmware.mk deleted file mode 100644 index 59ea2199c4..0000000000 --- a/package.bak/zd1211-firmware/zd1211-firmware.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# zd1211-firmware -# -################################################################################ - -ZD1211_FIRMWARE_VERSION = 1.4 -ZD1211_FIRMWARE_SITE = http://downloads.sourceforge.net/project/zd1211/zd1211-firmware/$(ZD1211_FIRMWARE_VERSION) -ZD1211_FIRMWARE_SOURCE = zd1211-firmware-$(ZD1211_FIRMWARE_VERSION).tar.bz2 -ZD1211_FIRMWARE_LICENSE = GPLv2 -ZD1211_FIRMWARE_LICENSE_FILES = COPYING - -# Not all of the firmware files are used -define ZD1211_FIRMWARE_INSTALL_TARGET_CMDS - $(INSTALL) -d -m 0755 $(TARGET_DIR)/lib/firmware/zd1211/ - cp -dpf $(@D)/zd1211*{ub,uphr,ur} $(TARGET_DIR)/lib/firmware/zd1211 -endef - -$(eval $(generic-package)) diff --git a/package.bak/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch b/package.bak/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch deleted file mode 100644 index ff225d3592..0000000000 --- a/package.bak/zeromq/0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch +++ /dev/null @@ -1,199 +0,0 @@ -commit 9daf6dd7c4947ce74ca729de5c3cfe8cbc304702 -Author: Lionel Orry -Date: Fri Feb 6 15:11:07 2015 +0100 - - acinclude.m4: make kernel-specific flags cacheable - - Specifically when cross-compiling, one can be willing to force these - variable values using the environment of a config.cache file. This - commit makes this possible. - - The affected variables are: - - * libzmq_cv_sock_cloexec - * libzmq_cv_so_keepalive - * libzmq_cv_tcp_keepcnt - * libzmq_cv_tcp_keepidle - * libzmq_cv_tcp_keepintvl - * libzmq_cv_tcp_keepalive - - Signed-off-by: Lionel Orry - -diff --git a/acinclude.m4 b/acinclude.m4 -index 4bbd19e..456740d 100644 ---- a/acinclude.m4 -+++ b/acinclude.m4 -@@ -586,8 +586,8 @@ dnl # LIBZMQ_CHECK_SOCK_CLOEXEC([action-if-found], [action-if-not-found]) - dnl # Check if SOCK_CLOEXEC is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SOCK_CLOEXEC], [{ -- AC_MSG_CHECKING(whether SOCK_CLOEXEC is supported) -- AC_TRY_RUN([/* SOCK_CLOEXEC test */ -+ AC_CACHE_CHECK([whether SOCK_CLOEXEC is supported], [libzmq_cv_sock_cloexec], -+ [AC_TRY_RUN([/* SOCK_CLOEXEC test */ - #include - #include - -@@ -596,11 +596,13 @@ int main (int argc, char *argv []) - int s = socket (PF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0); - return (s == -1); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_sock_cloexec="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_sock_cloexec="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_sock_cloexec="no"] -+ ], -+ [libzmq_cv_sock_cloexec="yes"], -+ [libzmq_cv_sock_cloexec="no"], -+ [libzmq_cv_sock_cloexec="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_sock_cloexec" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -628,8 +630,8 @@ dnl # LIBZMQ_CHECK_SO_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if SO_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_SO_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether SO_KEEPALIVE is supported) -- AC_TRY_RUN([/* SO_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether SO_KEEPALIVE is supported], [libzmq_cv_so_keepalive], -+ [AC_TRY_RUN([/* SO_KEEPALIVE test */ - #include - #include - -@@ -641,11 +643,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, SOL_SOCKET, SO_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_so_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_so_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_so_keepalive="no"] -+ ], -+ [libzmq_cv_so_keepalive="yes"], -+ [libzmq_cv_so_keepalive="no"], -+ [libzmq_cv_so_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_so_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -653,8 +657,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPCNT([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPCNT is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPCNT], [{ -- AC_MSG_CHECKING(whether TCP_KEEPCNT is supported) -- AC_TRY_RUN([/* TCP_KEEPCNT test */ -+ AC_CACHE_CHECK([whether TCP_KEEPCNT is supported], [libzmq_cv_tcp_keepcnt], -+ [AC_TRY_RUN([/* TCP_KEEPCNT test */ - #include - #include - #include -@@ -669,11 +673,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPCNT, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepcnt="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepcnt="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepcnt="no"] -+ ], -+ [libzmq_cv_tcp_keepcnt="yes"], -+ [libzmq_cv_tcp_keepcnt="no"], -+ [libzmq_cv_tcp_keepcnt="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepcnt" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -681,8 +687,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPIDLE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPIDLE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPIDLE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPIDLE is supported) -- AC_TRY_RUN([/* TCP_KEEPIDLE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPIDLE is supported], [libzmq_cv_tcp_keepidle], -+ [AC_TRY_RUN([/* TCP_KEEPIDLE test */ - #include - #include - #include -@@ -697,11 +703,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPIDLE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepidle="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepidle="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepidle="no"] -+ ], -+ [libzmq_cv_tcp_keepidle="yes"], -+ [libzmq_cv_tcp_keepidle="no"], -+ [libzmq_cv_tcp_keepidle="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepidle" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -709,8 +717,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPINTVL([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPINTVL is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPINTVL], [{ -- AC_MSG_CHECKING(whether TCP_KEEPINTVL is supported) -- AC_TRY_RUN([/* TCP_KEEPINTVL test */ -+ AC_CACHE_CHECK([whether TCP_KEEPINTVL is supported], [libzmq_cv_tcp_keepintvl], -+ [AC_TRY_RUN([/* TCP_KEEPINTVL test */ - #include - #include - #include -@@ -725,11 +733,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPINTVL, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepintvl="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepintvl="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepintvl="no"] -+ ], -+ [libzmq_cv_tcp_keepintvl="yes"], -+ [libzmq_cv_tcp_keepintvl="no"], -+ [libzmq_cv_tcp_keepintvl="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepintvl" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ -@@ -737,8 +747,8 @@ dnl # LIBZMQ_CHECK_TCP_KEEPALIVE([action-if-found], [action-if-not-found]) - dnl # Check if TCP_KEEPALIVE is supported # - dnl ################################################################################ - AC_DEFUN([LIBZMQ_CHECK_TCP_KEEPALIVE], [{ -- AC_MSG_CHECKING(whether TCP_KEEPALIVE is supported) -- AC_TRY_RUN([/* TCP_KEEPALIVE test */ -+ AC_CACHE_CHECK([whether TCP_KEEPALIVE is supported], [libzmq_cv_tcp_keepalive], -+ [AC_TRY_RUN([/* TCP_KEEPALIVE test */ - #include - #include - #include -@@ -753,11 +763,13 @@ int main (int argc, char *argv []) - ((rc = setsockopt (s, IPPROTO_TCP, TCP_KEEPALIVE, (char*) &opt, sizeof (int))) == -1) - ); - } -- ], -- [AC_MSG_RESULT(yes) ; libzmq_cv_tcp_keepalive="yes" ; $1], -- [AC_MSG_RESULT(no) ; libzmq_cv_tcp_keepalive="no" ; $2], -- [AC_MSG_RESULT(not during cross-compile) ; libzmq_cv_tcp_keepalive="no"] -+ ], -+ [libzmq_cv_tcp_keepalive="yes"], -+ [libzmq_cv_tcp_keepalive="no"], -+ [libzmq_cv_tcp_keepalive="not during cross-compile"] -+ )] - ) -+ AS_IF([test "x$libzmq_cv_tcp_keepalive" = "xyes"], [$1], [$2]) - }]) - - dnl ################################################################################ diff --git a/package.bak/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch b/package.bak/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch deleted file mode 100644 index 11acec26ae..0000000000 --- a/package.bak/zeromq/0002-libzmq-Fix-pkg-config-files-for-static-linking.patch +++ /dev/null @@ -1,29 +0,0 @@ -From e89577d30c278fba0f9e40266ceb6fb2821907d5 Mon Sep 17 00:00:00 2001 -From: Peter Korsgaard -Date: Wed, 13 May 2015 08:01:34 +0200 -Subject: [PATCH] libzmq: Fix pkg-config files for static linking - -Libzmq uses C++ standard library features, so users of it should link -against that as well when statically linking. - -Add it to Libs.private so users using pkg-config automatically gets the -correct linker flags. - -Signed-off-by: Peter Korsgaard ---- - src/libzmq.pc.in | 1 + - 1 file changed, 1 insertions(+) - -diff --git a/src/libzmq.pc.in b/src/libzmq.pc.in -index ba155a3..52a39f7 100644 ---- a/src/libzmq.pc.in -+++ b/src/libzmq.pc.in -@@ -7,4 +7,5 @@ Name: libzmq - Description: 0MQ c++ library - Version: @VERSION@ - Libs: -L${libdir} -lzmq -+Libs.private: -lstdc++ - Cflags: -I${includedir} --- -2.1.4 - diff --git a/package.bak/zeromq/Config.in b/package.bak/zeromq/Config.in deleted file mode 100644 index 53cbbb8fb2..0000000000 --- a/package.bak/zeromq/Config.in +++ /dev/null @@ -1,55 +0,0 @@ -comment "zeromq needs a toolchain w/ C++, threads" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) - -config BR2_PACKAGE_ZEROMQ - bool "zeromq" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_UTIL_LINUX - select BR2_PACKAGE_UTIL_LINUX_LIBUUID - help - ØMQ (ZeroMQ, 0MQ, zmq) looks like an embeddable networking - library but acts like a concurrency framework. It gives you - sockets that carry whole messages across various transports - like in-process, inter- process, TCP, and multicast. You can - connect sockets N-to-N with patterns like fanout, pub-sub, - task distribution, and request-reply. It's fast enough to - be the fabric for clustered products. Its asynchronous I/O - model gives you scalable multicore applications, built as - asynchronous message-processing tasks. It has a score of - language APIs and runs on most operating systems. - - ØMQ is from iMatix and is LGPL open source. - - http://www.zeromq.org/ - -if BR2_PACKAGE_ZEROMQ - -comment "norm support needs a toolchain w/ dynamic library" - depends on BR2_STATIC_LIBS - -config BR2_PACKAGE_ZEROMQ_NORM - bool "NORM support" - depends on !BR2_STATIC_LIBS - select BR2_PACKAGE_NORM - help - Add support for NACK-Oriented Reliable Multicast (RFC 5740) - protocol. - -comment "PGM/EPGM support needs a toolchain w/ wchar" - depends on BR2_TOOLCHAIN_HAS_SYNC_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on !BR2_USE_WCHAR - -config BR2_PACKAGE_ZEROMQ_PGM - bool "PGM/EPGM support" - depends on BR2_TOOLCHAIN_HAS_SYNC_2 - depends on BR2_TOOLCHAIN_HAS_SYNC_4 - depends on BR2_USE_WCHAR # openpgm - select BR2_PACKAGE_OPENPGM - help - Add support for Pragmatic General Multicast protocol (RFC 3208) - implemented either over raw IP packets or UDP datagrams - (encapsulated PGM). - -endif diff --git a/package.bak/zeromq/zeromq.hash b/package.bak/zeromq/zeromq.hash deleted file mode 100644 index 76067d93f5..0000000000 --- a/package.bak/zeromq/zeromq.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/zeromq/zeromq4-1/releases -sha1 2b7490b77860be3060b1b1f92cd73184d309ca69 zeromq-4.1.5.tar.gz -# Calculated based on the hash above -sha256 04aac57f081ffa3a2ee5ed04887be9e205df3a7ddade0027460b8042432bdbcf zeromq-4.1.5.tar.gz diff --git a/package.bak/zeromq/zeromq.mk b/package.bak/zeromq/zeromq.mk deleted file mode 100644 index 5c99983b53..0000000000 --- a/package.bak/zeromq/zeromq.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# zeromq -# -################################################################################ - -ZEROMQ_VERSION = 4.1.5 -ZEROMQ_SITE = https://github.com/zeromq/zeromq4-1/releases/download/v$(ZEROMQ_VERSION) -ZEROMQ_INSTALL_STAGING = YES -ZEROMQ_DEPENDENCIES = util-linux -ZEROMQ_CONF_OPTS = --without-documentation -ZEROMQ_LICENSE = LGPLv3+ with exceptions -ZEROMQ_LICENSE_FILES = COPYING COPYING.LESSER -# For 0001-acinclude.m4-make-kernel-specific-flags-cacheable.patch -ZEROMQ_AUTORECONF = YES - -# Assume these flags are always available. It is true, at least for -# SOCK_CLOEXEC, since linux v2.6.27. -# Note: the flag TCP_KEEPALIVE is NOT available so we do not include it. -ZEROMQ_CONF_ENV = libzmq_cv_sock_cloexec=yes \ - libzmq_cv_so_keepalive=yes \ - libzmq_cv_tcp_keepcnt=yes \ - libzmq_cv_tcp_keepidle=yes \ - libzmq_cv_tcp_keepintvl=yes - -# Only tools/curve_keygen.c needs this, but it doesn't hurt to pass it -# for the rest of the build as well (which automatically includes stdc++). -ifeq ($(BR2_STATIC_LIBS),y) -ZEROMQ_CONF_OPTS += LIBS=-lstdc++ -endif - -ifeq ($(BR2_PACKAGE_ZEROMQ_NORM),y) -ZEROMQ_CONF_OPTS += --with-norm -ZEROMQ_DEPENDENCIES += norm -else -ZEROMQ_CONF_OPTS += --without-norm -endif - -ifeq ($(BR2_PACKAGE_ZEROMQ_PGM),y) -ZEROMQ_DEPENDENCIES += host-pkgconf openpgm -ZEROMQ_CONF_OPTS += --with-pgm -else -ZEROMQ_CONF_OPTS += --without-pgm -endif - -# ZeroMQ uses libsodium if it's available. -ifeq ($(BR2_PACKAGE_LIBSODIUM),y) -ZEROMQ_DEPENDENCIES += libsodium -ZEROMQ_CONF_OPTS += --with-libsodium="$(STAGING_DIR)/usr" -else -ZEROMQ_CONF_OPTS += --without-libsodium -endif - -$(eval $(autotools-package)) diff --git a/package.bak/zic/0001-remove-dependency-check-on-version-file.patch b/package.bak/zic/0001-remove-dependency-check-on-version-file.patch deleted file mode 100644 index f4b2590525..0000000000 --- a/package.bak/zic/0001-remove-dependency-check-on-version-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4ad8932f93c490d15586b1def3863e9580e6eceb Mon Sep 17 00:00:00 2001 -From: Martin Bark -Date: Sat, 3 Dec 2016 13:51:50 +0000 -Subject: [PATCH] remove dependency check on version file - -$(VERSION_DEPS) includes dependencies from tzdata meaning applications -such as zic can't build from tzcode on their own. Remove the dependency -to $(VERSION_DEPS) since it is not necessary to check for version updates -in released code. This solves building zic from tzcode without needing -tzdata. - -Signed-off-by: Martin Bark ---- - Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 1b714a8..00d2c09 100644 ---- a/Makefile -+++ b/Makefile -@@ -437,7 +437,7 @@ INSTALL: ALL install date.1 - cp date $(DESTDIR)$(BINDIR)/. - cp -f date.1 $(DESTDIR)$(MANDIR)/man1/. - --version: $(VERSION_DEPS) -+version: - { (type git) >/dev/null 2>&1 && \ - V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \ - --abbrev=7 --dirty` || \ --- -2.7.4 - diff --git a/package.bak/zic/zic.hash b/package.bak/zic/zic.hash deleted file mode 100644 index 6fe27bd2fc..0000000000 --- a/package.bak/zic/zic.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://mm.icann.org/pipermail/tz-announce/2016-November/000044.html -sha512 cac19dded22ff80cd784641ac239358c28cce535ac1eb60b52b7e51c6e9e5fe5f795ea0252daf32c949dddb9c5b24d7e4456d7869aa2725d49c5af58b564822a tzcode2016j.tar.gz diff --git a/package.bak/zic/zic.mk b/package.bak/zic/zic.mk deleted file mode 100644 index ed7b04eb94..0000000000 --- a/package.bak/zic/zic.mk +++ /dev/null @@ -1,24 +0,0 @@ -################################################################################ -# -# zic -# -################################################################################ - -ZIC_VERSION = 2016j -ZIC_SOURCE = tzcode$(ZIC_VERSION).tar.gz -ZIC_SITE = http://www.iana.org/time-zones/repository/releases -ZIC_STRIP_COMPONENTS = 0 -ZIC_LICENSE = Public domain - -define HOST_ZIC_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) -C $(@D) zic -endef - -define HOST_ZIC_INSTALL_CMDS - $(INSTALL) -D -m 755 $(@D)/zic $(HOST_DIR)/usr/sbin/zic - $(INSTALL) -D -m 644 $(@D)/tzfile.h $(HOST_DIR)/usr/include/tzfile.h -endef - -$(eval $(host-generic-package)) - -ZIC = $(HOST_DIR)/usr/sbin/zic diff --git a/package.bak/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch b/package.bak/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch deleted file mode 100644 index 591b178aaa..0000000000 --- a/package.bak/zip/0001-configure-Remove-Check-C-compiler-type-optimization-.patch +++ /dev/null @@ -1,130 +0,0 @@ -From 0f5e1658c05746b17f05a1bade263cad19b37e79 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 22 Jan 2015 15:20:25 +0100 -Subject: [PATCH 1/6] configure: Remove "Check C compiler type (optimization - options)" - -This test force optimization to -O3 -while it is already set in CFLAGS - -Signed-off-by: Romain Naour ---- - unix/configure | 98 ---------------------------------------------------------- - 1 file changed, 98 deletions(-) - -diff --git a/unix/configure b/unix/configure -index 73ba803..4185fee 100644 ---- a/unix/configure -+++ b/unix/configure -@@ -22,108 +22,10 @@ LFLAGS1='' - LFLAGS2='' - LN="ln -s" - --CFLAGS_OPT='' -- - # bzip2 - IZ_BZIP2=${3-} - CFLAGS_BZ='' - -- --echo 'Check C compiler type (optimization options)' --# Sun C? --cat > conftest.c << _EOF_ --int main() --{ --#ifndef __SUNPRO_C -- bad code --#endif -- return 0; --} --_EOF_ --$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null --if test $? -eq 0; then -- CFLAGS_OPT='-xO3' -- echo " Sun C ($CFLAGS_OPT)" --else -- # Tru64 DEC/Compaq/HP C? -- cat > conftest.c << _EOF_ --int main() --{ --#ifndef __DECC -- bad code --#endif -- return 0; --} --_EOF_ -- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null -- if test $? -eq 0; then -- CFLAGS_OPT='-O3' -- echo " DEC C ($CFLAGS_OPT)" -- else -- # HP-UX HP C? -- cat > conftest.c << _EOF_ --int main() --{ --#ifdef __GNUC__ -- bad code --#endif --#ifndef __hpux -- bad code --#endif -- return 0; --} --_EOF_ -- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null -- if test $? -eq 0; then -- # HP-UX, not GCC. Lame bundled or real ANSI compiler? -- CFLAGS_OPT_TRY="+O3 +Onolimit" -- $CC $CFLAGS $CFLAGS_OPT_TRY -c conftest.c 2>&1 | \ -- grep '(Bundled)' > /dev/null -- if test $? -ne 0; then -- CFLAGS_OPT="$CFLAGS_OPT_TRY" -- echo " HP-UX ANSI C ($CFLAGS_OPT)" -- else -- echo ' HP-UX Bundled C (no opt)' -- fi -- else -- # GNU C? -- cat > conftest.c << _EOF_ --int main() --{ --#ifndef __GNUC__ -- bad code --#endif -- return 0; --} --_EOF_ -- $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null -- if test $? -eq 0; then -- CFLAGS_OPT='-O3' -- echo " GNU C ($CFLAGS_OPT)" -- # Special Mac OS X shared library "ld" option? -- if test ` uname -s 2> /dev/null ` = 'Darwin'; then -- lf='-Wl,-search_paths_first' -- $CC $CFLAGS $lf conftest.c > /dev/null 2>/dev/null -- if test $? -eq 0; then -- LFLAGS2="${LFLAGS2} ${lf}" -- fi -- rm -f conftest -- fi -- else -- CFLAGS_OPT='-O' -- echo " Other-unknown C ($CFLAGS_OPT)" -- fi -- fi -- fi --fi -- --# optimization flags --if test -n "${CFLAGS_OPT}"; then -- CFLAGS="${CFLAGS} ${CFLAGS_OPT}" -- CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}" --fi -- -- - # bzip2 - - echo "Check bzip2 support" --- -1.9.3 - diff --git a/package.bak/zip/0002-configure-Don-t-use-host-CPP.patch b/package.bak/zip/0002-configure-Don-t-use-host-CPP.patch deleted file mode 100644 index 8504912722..0000000000 --- a/package.bak/zip/0002-configure-Don-t-use-host-CPP.patch +++ /dev/null @@ -1,37 +0,0 @@ -From fc5c889131ff6270e1028cc7edd87e7f10a7da6d Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 22 Jan 2015 15:21:31 +0100 -Subject: [PATCH 2/6] configure: Don't use host CPP - -CPP is redefined if a cpp binary (/lib/cpp) is found on the host. - -Use the CPP="${CC} -E" allows to pass the following checks: -Check if we can use asm code (for -DASMV) -Check if compiler generates underlines (for -DASM_CRC) - -Signed-off-by: Romain Naour ---- - unix/configure | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/unix/configure b/unix/configure -index 4185fee..489009f 100644 ---- a/unix/configure -+++ b/unix/configure -@@ -122,13 +122,6 @@ fi - echo Check for the C preprocessor - # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp. - CPP="${CC} -E" --# solaris as(1) needs -P, maybe others as well ? --[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P" --[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp --[ -f /lib/cpp ] && CPP=/lib/cpp --[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp --[ -f /xenix ] && CPP="${CC} -E" --[ -f /lynx.os ] && CPP="${CC} -E" - - echo "#include " > conftest.c - $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E" --- -1.9.3 - diff --git a/package.bak/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch b/package.bak/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch deleted file mode 100644 index 104b7e8d89..0000000000 --- a/package.bak/zip/0003-Makefile-Use-CFLAGS-from-command-line.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 93189390de7322da78bc5b807f4cadaff46393c9 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 22 Jan 2015 22:45:30 +0100 -Subject: [PATCH 3/6] Makefile: Use CFLAGS from command line - -Replace CFLAGS_NOOPT by CFLAGS when calling unix/configure script -to create 'flags' file which contains all variables used to build -zip binary. - -Signed-off-by: Romain Naour ---- - unix/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/unix/Makefile b/unix/Makefile -index abd0c44..db62368 100644 ---- a/unix/Makefile -+++ b/unix/Makefile -@@ -177,7 +177,7 @@ uninstall: - - - flags: unix/configure -- sh unix/configure "${CC}" "${CFLAGS_NOOPT}" "${IZ_BZIP2}" -+ sh unix/configure "${CC}" "${CFLAGS}" "${IZ_BZIP2}" - - # These symbols, when #defined using -D have these effects on compilation: - # ZMEM - includes C language versions of memset(), memcpy(), --- -1.9.3 - diff --git a/package.bak/zip/0004-configure-use-LDFLAGS-from-command-line.patch b/package.bak/zip/0004-configure-use-LDFLAGS-from-command-line.patch deleted file mode 100644 index 35d3860215..0000000000 --- a/package.bak/zip/0004-configure-use-LDFLAGS-from-command-line.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 5c58b8737dc9ccf9407f6725f6f07b764d6abb22 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Thu, 22 Jan 2015 23:47:55 +0100 -Subject: [PATCH 4/6] configure: use LDFLAGS from command line - -The bzip2 support may not enabled due to a build error -during the checking for bzip2 library. -The library path (-L) to bzip2 library is missing. - -Signed-off-by: Romain Naour ---- - unix/configure | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/unix/configure b/unix/configure -index 489009f..de9fd68 100644 ---- a/unix/configure -+++ b/unix/configure -@@ -106,11 +106,11 @@ int main() - return 0; - } - _EOF_ -- $CC $CFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null -+ $CC $CFLAGS $LDFLAGS -o conftest conftest.c -lbz2 > /dev/null 2>/dev/null - if test $? -eq 0; then - echo "-- OS supports bzip2 - linking in bzip2" - CFLAGS="${CFLAGS} -DBZIP2_SUPPORT" -- LFLAGS2="${LFLAGS2} -lbz2" -+ LFLAGS2="${LFLAGS2} ${LDFLAGS} -lbz2" - else - echo "-- Either bzlib.h or libbz2.a not found - no bzip2" - fi --- -1.9.3 - diff --git a/package.bak/zip/0005-unix-configure-remove-GID-UID-size-check.patch b/package.bak/zip/0005-unix-configure-remove-GID-UID-size-check.patch deleted file mode 100644 index 38d8d730e1..0000000000 --- a/package.bak/zip/0005-unix-configure-remove-GID-UID-size-check.patch +++ /dev/null @@ -1,85 +0,0 @@ -From d8da4e5f0ebed000f880e60b6cca7c575f7ed1c7 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 23 Jan 2015 22:13:14 +0100 -Subject: [PATCH 5/6] unix/configure: remove GID/UID size check - -This check can't work for cross-compilation since it -try to run a target's binary on the host system. - -Reported-by: Richard Genoud -Signed-off-by: Romain Naour ---- - unix/configure | 57 --------------------------------------------------------- - 1 file changed, 57 deletions(-) - -diff --git a/unix/configure b/unix/configure -index de9fd68..7bfc9eb 100644 ---- a/unix/configure -+++ b/unix/configure -@@ -237,63 +237,6 @@ _EOF_ - $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null - [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_OFF_T" - -- --echo Check size of UIDs and GIDs --echo "(Now zip stores variable size UIDs/GIDs using a new extra field. This" --echo " tests if this OS uses 16-bit UIDs/GIDs and so if the old 16-bit storage" --echo " should also be used for backward compatibility.)" --# Added 2008-04-15 CS --cat > conftest.c << _EOF_ --# define _LARGEFILE_SOURCE /* some OSes need this for fseeko */ --# define _LARGEFILE64_SOURCE --# define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */ --# define _LARGE_FILES /* some OSes need this for 64-bit off_t */ --#include --#include --#include --#include --int main() --{ -- struct stat s; -- -- printf(" s.st_uid is %u bytes\n", sizeof(s.st_uid)); -- printf(" s.st_gid is %u bytes\n", sizeof(s.st_gid)); -- -- /* see if have 16-bit UID */ -- if (sizeof(s.st_uid) != 2) { -- return 1; -- } -- /* see if have 16-bit GID */ -- if (sizeof(s.st_gid) != 2) { -- return 2; -- } -- return 3; --} --_EOF_ --# compile it --$CC -o conftest conftest.c >/dev/null 2>/dev/null --if [ $? -ne 0 ]; then -- echo -- UID/GID test failed on compile - disabling old 16-bit UID/GID support -- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" --else --# run it -- ./conftest -- r=$? -- if [ $r -eq 1 ]; then -- echo -- UID not 2 bytes - disabling old 16-bit UID/GID support -- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" -- elif [ $r -eq 2 ]; then -- echo -- GID not 2 bytes - disabling old 16-bit UID/GID support -- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" -- elif [ $r -eq 3 ]; then -- echo -- 16-bit UIDs and GIDs - keeping old 16-bit UID/GID support -- else -- echo -- test failed - conftest returned $r - disabling old 16-bit UID/GID support -- CFLAGS="${CFLAGS} -DUIDGID_NOT_16BIT" -- fi --fi -- -- - # Now we set the 64-bit file environment and check the size of off_t - # Added 11/4/2003 EG - # Revised 8/12/2004 EG --- -1.9.3 - diff --git a/package.bak/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch b/package.bak/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch deleted file mode 100644 index a4e99dbc8c..0000000000 --- a/package.bak/zip/0006-unix-configure-borrow-the-LFS-test-from-autotools.patch +++ /dev/null @@ -1,101 +0,0 @@ -From fc392c939b9a18959482f588aff0afc29dd6d30a Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Fri, 23 Jan 2015 22:20:18 +0100 -Subject: [PATCH 6/6] unix/configure: borrow the LFS test from autotools. - -Infozip's LFS check can't work for cross-compilation -since it try to run a target's binary on the host system. - -Instead, use to LFS test used by autotools which is a -compilation test. -(see autotools/lib/autoconf/specific.m4) - -Reported-by: Richard Genoud -Signed-off-by: Romain Naour ---- - unix/configure | 51 ++++++++++++++++++--------------------------------- - 1 file changed, 18 insertions(+), 33 deletions(-) - -diff --git a/unix/configure b/unix/configure -index 7bfc9eb..588f269 100644 ---- a/unix/configure -+++ b/unix/configure -@@ -237,9 +237,8 @@ _EOF_ - $CC $CFLAGS -c conftest.c >/dev/null 2>/dev/null - [ $? -ne 0 ] && CFLAGS="${CFLAGS} -DNO_OFF_T" - --# Now we set the 64-bit file environment and check the size of off_t --# Added 11/4/2003 EG --# Revised 8/12/2004 EG -+# LFS check borrowed from autotools sources -+# lib/autoconf/specific.m4 - - echo Check for Large File Support - cat > conftest.c << _EOF_ -@@ -247,24 +246,22 @@ cat > conftest.c << _EOF_ - # define _LARGEFILE64_SOURCE - # define _FILE_OFFSET_BITS 64 /* select default interface as 64 bit */ - # define _LARGE_FILES /* some OSes need this for 64-bit off_t */ -+ - #include --#include --#include --#include --int main() -+ /* Check that off_t can represent 2**63 - 1 correctly. -+ We can't simply define LARGE_OFF_T to be 9223372036854775807, -+ since some C++ compilers masquerading as C compilers -+ incorrectly reject 9223372036854775807. */ -+#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) -+ int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 -+ && LARGE_OFF_T % 2147483647 == 1) -+ ? 1 : -1]; -+int -+main () - { -- off_t offset; -- struct stat s; -- /* see if have 64-bit off_t */ -- if (sizeof(offset) < 8) -- return 1; -- printf(" off_t is %d bytes\n", sizeof(off_t)); -- /* see if have 64-bit stat */ -- if (sizeof(s.st_size) < 8) { -- printf(" s.st_size is %d bytes\n", sizeof(s.st_size)); -- return 2; -- } -- return 3; -+ -+ ; -+ return 0; - } - _EOF_ - # compile it -@@ -272,22 +269,10 @@ $CC -o conftest conftest.c >/dev/null 2>/dev/null - if [ $? -ne 0 ]; then - echo -- no Large File Support - else --# run it -- ./conftest -- r=$? -- if [ $r -eq 1 ]; then -- echo -- no Large File Support - no 64-bit off_t -- elif [ $r -eq 2 ]; then -- echo -- no Large File Support - no 64-bit stat -- elif [ $r -eq 3 ]; then -- echo -- yes we have Large File Support! -- CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" -- else -- echo -- no Large File Support - conftest returned $r -- fi -+ echo -- yes we have Large File Support! -+ CFLAGS="${CFLAGS} -DLARGE_FILE_SUPPORT" - fi - -- - # Check for wide char for Unicode support - # Added 11/24/2005 EG - --- -1.9.3 - diff --git a/package.bak/zip/Config.in b/package.bak/zip/Config.in deleted file mode 100644 index 4b6360a456..0000000000 --- a/package.bak/zip/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_ZIP - bool "zip" - help - Zip is a compression and file packaging/archive utility. - Although highly compatible both with PKWARE's PKZIP and - PKUNZIP utilities for MS-DOS and with Info-ZIP's own UnZip, - our primary objectives have been portability and - other-than-MSDOS functionality. - - http://infozip.sourceforge.net/Zip.html diff --git a/package.bak/zip/Config.in.host b/package.bak/zip/Config.in.host deleted file mode 100644 index b14ce55dbd..0000000000 --- a/package.bak/zip/Config.in.host +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_HOST_ZIP - bool "host zip" - help - Zip is a compression and file packaging/archive utility. - Although highly compatible both with PKWARE's PKZIP and - PKUNZIP utilities for MS-DOS and with Info-ZIP's own UnZip, - our primary objectives have been portability and - other-than-MSDOS functionality. - - http://infozip.sourceforge.net/Zip.html diff --git a/package.bak/zip/zip.hash b/package.bak/zip/zip.hash deleted file mode 100644 index 782ae5ec96..0000000000 --- a/package.bak/zip/zip.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated from download (no sig, hash) -sha256 f0e8bb1f9b7eb0b01285495a2699df3a4b766784c1765a8f1aeedf63c0806369 zip30.tgz diff --git a/package.bak/zip/zip.mk b/package.bak/zip/zip.mk deleted file mode 100644 index 66d94b3c68..0000000000 --- a/package.bak/zip/zip.mk +++ /dev/null @@ -1,54 +0,0 @@ -################################################################################ -# -# zip -# -################################################################################ - -ZIP_VERSION = 30 -ZIP_SOURCE = zip$(ZIP_VERSION).tgz -ZIP_SITE = ftp://ftp.info-zip.org/pub/infozip/src -ZIP_LICENSE = Info-ZIP -ZIP_LICENSE_FILES = LICENSE - -ifeq ($(BR2_PACKAGE_BZIP2),y) -ZIP_DEPENDENCIES += bzip2 -endif - -# Infozip's default CFLAGS. -ZIP_CFLAGS = -I. -DUNIX - -# Disable the support of 16-bit UIDs/GIDs, the test in unix/configure was -# removed since it can't work for cross-compilation. -ZIP_CFLAGS += -DUIDGID_NOT_16BIT - -# infozip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when -# necessary, redefining it on the command line causes some warnings. -ZIP_TARGET_CFLAGS = \ - $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS)) - -define ZIP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) \ - CFLAGS="$(ZIP_TARGET_CFLAGS) $(ZIP_CFLAGS)" \ - AS="$(TARGET_CC) -c" \ - -f unix/Makefile generic -endef - -define ZIP_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(TARGET_DIR)/usr -endef - -define HOST_ZIP_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) \ - CFLAGS="$(HOST_CFLAGS) $(ZIP_CFLAGS)" \ - AS="$(HOSTCC) -c" \ - -f unix/Makefile generic -endef - -define HOST_ZIP_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE) $(HOST_CONFIGURE_OPTS) -C $(@D) -f unix/Makefile install \ - prefix=$(HOST_DIR)/usr -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/zlib/Config.in b/package.bak/zlib/Config.in deleted file mode 100644 index 6201aba142..0000000000 --- a/package.bak/zlib/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -config BR2_PACKAGE_ZLIB - bool "zlib" - help - Standard (de)compression library. Used by things like - gzip and libpng. - - http://www.zlib.net diff --git a/package.bak/zlib/zlib.hash b/package.bak/zlib/zlib.hash deleted file mode 100644 index 81cb64ef62..0000000000 --- a/package.bak/zlib/zlib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://www.zlib.net/ -sha256 4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066 zlib-1.2.11.tar.xz diff --git a/package.bak/zlib/zlib.mk b/package.bak/zlib/zlib.mk deleted file mode 100644 index deea5a5ee7..0000000000 --- a/package.bak/zlib/zlib.mk +++ /dev/null @@ -1,77 +0,0 @@ -################################################################################ -# -# zlib -# -################################################################################ - -ZLIB_VERSION = 1.2.11 -ZLIB_SOURCE = zlib-$(ZLIB_VERSION).tar.xz -ZLIB_SITE = http://www.zlib.net -ZLIB_LICENSE = zlib license -ZLIB_LICENSE_FILES = README -ZLIB_INSTALL_STAGING = YES - -# It is not possible to build only a shared version of zlib, so we build both -# shared and static, unless we only want the static libs, and we eventually -# selectively remove what we do not want -ifeq ($(BR2_STATIC_LIBS),y) -ZLIB_PIC = -ZLIB_SHARED = --static -else -ZLIB_PIC = -fPIC -ZLIB_SHARED = --shared -endif - -define ZLIB_CONFIGURE_CMDS - (cd $(@D); rm -rf config.cache; \ - $(TARGET_CONFIGURE_ARGS) \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS) $(ZLIB_PIC)" \ - ./configure \ - $(ZLIB_SHARED) \ - --prefix=/usr \ - ) -endef - -define HOST_ZLIB_CONFIGURE_CMDS - (cd $(@D); rm -rf config.cache; \ - $(HOST_CONFIGURE_ARGS) \ - $(HOST_CONFIGURE_OPTS) \ - ./configure \ - --prefix="$(HOST_DIR)/usr" \ - --sysconfdir="$(HOST_DIR)/etc" \ - ) -endef - -define ZLIB_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) -endef - -define HOST_ZLIB_BUILD_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) -endef - -define ZLIB_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(STAGING_DIR) LDCONFIG=true install -endef - -define ZLIB_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) -C $(@D) DESTDIR=$(TARGET_DIR) LDCONFIG=true install -endef - -# We don't care removing the .a from target, since it not used at link -# time to build other packages, and it is anyway removed later before -# assembling the filesystem images anyway. -ifeq ($(BR2_SHARED_LIBS),y) -define ZLIB_RM_STATIC_STAGING - rm -f $(STAGING_DIR)/usr/lib/libz.a -endef -ZLIB_POST_INSTALL_STAGING_HOOKS += ZLIB_RM_STATIC_STAGING -endif - -define HOST_ZLIB_INSTALL_CMDS - $(HOST_MAKE_ENV) $(MAKE1) -C $(@D) LDCONFIG=true install -endef - -$(eval $(generic-package)) -$(eval $(host-generic-package)) diff --git a/package.bak/zlog/0001-fix-compiling-on-Buildroot.patch b/package.bak/zlog/0001-fix-compiling-on-Buildroot.patch deleted file mode 100644 index 32aa7d6db7..0000000000 --- a/package.bak/zlog/0001-fix-compiling-on-Buildroot.patch +++ /dev/null @@ -1,32 +0,0 @@ -From a9f6a55bdb29a2bebc96a68ab53077906c25a9df Mon Sep 17 00:00:00 2001 -From: Yegor Yefremov -Date: Wed, 22 Jan 2014 15:04:42 +0100 -Subject: [PATCH] Fix compiling on Buildroot - -Buildroot always specifies -D_LARGEFILE_SOURCE, -D_LARGEFILE64_SOURCE, --D_FILE_OFFSET_BITS=64, so define them only if they are not already -defined. - -Signed-off-by: Yegor Yefremov ---- - src/fmacros.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) - -diff --git a/src/fmacros.h b/src/fmacros.h -index fa37948..059dfeb 100644 ---- a/src/fmacros.h -+++ b/src/fmacros.h -@@ -14,7 +14,11 @@ - #define _XOPEN_SOURCE - #endif - -+#ifndef _LARGEFILE_SOURCE - #define _LARGEFILE_SOURCE -+#endif -+#ifndef _FILE_OFFSET_BITS - #define _FILE_OFFSET_BITS 64 -+#endif - - #endif --- -1.7.7 diff --git a/package.bak/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch b/package.bak/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch deleted file mode 100644 index 0f1b912387..0000000000 --- a/package.bak/zlog/0002-compile-Remove-Werror-and-avoid-build-failures-becau.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 4a08c9e07fa8b7a1d6a76b927ea97e3eaa784845 Mon Sep 17 00:00:00 2001 -From: Ezequiel Garcia -Date: Sun, 26 Oct 2014 16:16:25 -0300 -Subject: [PATCH] compile: Remove -Werror and avoid build failures because of - warnings - -Using -Werror on production is a bad idea, as otherwise harmless warnings -get treated as errors breaking builds. This is currently the case with -Nios-II architecture toolchain, warning about a deprecated macro: - -../usr/nios2-buildroot-linux-gnu/sysroot/usr/include/features.h:148:3: -error: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" [-Werror=cpp] - # warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" - -Instead of trying to fix the macro, let's fix the real issue here, -and remove -Werror. - -Signed-off-by: Ezequiel Garcia ---- - src/makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/makefile b/src/makefile -index 294dc08..4ac4c43 100644 ---- a/src/makefile -+++ b/src/makefile -@@ -32,7 +32,7 @@ ZLOG_MINOR=2 - # Fallback to gcc when $CC is not in $PATH. - CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc') - OPTIMIZATION?=-O2 --WARNINGS=-Wall -Werror -Wstrict-prototypes -fwrapv -+WARNINGS=-Wall -Wstrict-prototypes -fwrapv - DEBUG?= -g -ggdb - REAL_CFLAGS=$(OPTIMIZATION) -fPIC -pthread $(CFLAGS) $(WARNINGS) $(DEBUG) - REAL_LDFLAGS=$(LDFLAGS) -pthread --- -2.1.0 - diff --git a/package.bak/zlog/Config.in b/package.bak/zlog/Config.in deleted file mode 100644 index cf86a26174..0000000000 --- a/package.bak/zlog/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_ZLOG - bool "zlog" - depends on BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_STATIC_LIBS - help - zlog is a reliable, high-performance, thread safe, flexible, - clear-model, pure C logging library. - - https://github.com/HardySimpson/zlog - -comment "zlog needs a toolchain w/ threads, dynamic library" - depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS diff --git a/package.bak/zlog/zlog.hash b/package.bak/zlog/zlog.hash deleted file mode 100644 index 1de23c9a71..0000000000 --- a/package.bak/zlog/zlog.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 d3afb1f0ce67df29f759da74235949370ac2818faf242f3f674cb48f9f4c57d3 zlog-6ddb9bbf3ff0123e701bf60996f351576ebe9c00.tar.gz diff --git a/package.bak/zlog/zlog.mk b/package.bak/zlog/zlog.mk deleted file mode 100644 index 4f7f46928d..0000000000 --- a/package.bak/zlog/zlog.mk +++ /dev/null @@ -1,26 +0,0 @@ -################################################################################ -# -# zlog -# -################################################################################ - -ZLOG_VERSION = 6ddb9bbf3ff0123e701bf60996f351576ebe9c00 -ZLOG_SITE = $(call github,HardySimpson,zlog,$(ZLOG_VERSION)) -ZLOG_LICENSE = LGPLv2.1 -ZLOG_LICENSE_FILES = COPYING -ZLOG_INSTALL_STAGING = YES - -define ZLOG_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE1) CC="$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS)" \ - -C $(@D) all -endef - -define ZLOG_INSTALL_STAGING_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(STAGING_DIR)/usr -C $(@D) install -endef - -define ZLOG_INSTALL_TARGET_CMDS - $(TARGET_MAKE_ENV) $(MAKE) PREFIX=$(TARGET_DIR)/usr -C $(@D) install -endef - -$(eval $(generic-package)) diff --git a/package.bak/zmqpp/0001-Allow-building-shared-or-static-library-only.patch b/package.bak/zmqpp/0001-Allow-building-shared-or-static-library-only.patch deleted file mode 100644 index 70caee8162..0000000000 --- a/package.bak/zmqpp/0001-Allow-building-shared-or-static-library-only.patch +++ /dev/null @@ -1,83 +0,0 @@ -From 02ad67e60ef698ee47f6ee53b36e5b89c2fd71e7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Wed, 24 Feb 2016 10:07:11 -0300 -Subject: [PATCH 1/2] Allow building shared or static library only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[Gustavo: update for 4.1.2] - -Signed-off-by: Jörg Krause -Signed-off-by: Gustavo Zacarias ---- - Makefile | 19 +++++++++++++++---- - 1 file changed, 15 insertions(+), 4 deletions(-) - -diff --git a/Makefile b/Makefile -index 9df5996..86c8fac 100644 ---- a/Makefile -+++ b/Makefile -@@ -79,6 +79,8 @@ ifeq ($(UNAME_S),Darwin) - endif - - -+BUILD_SHARED ?= yes -+ - CONFIG_FLAGS = - ifeq ($(CONFIG),debug) - CONFIG_FLAGS = -g -fno-inline -ftemplate-depth-1000 -@@ -93,13 +95,22 @@ ifneq (,$(findstring $(CONFIG),release loadtest)) - CONFIG_FLAGS = -O3 -funroll-loops -ffast-math -finline-functions -fomit-frame-pointer -DNO_DEBUG_LOG -DNO_TRACE_LOG -DNDEBUG - endif - --COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall -fPIC \ -+COMMON_FLAGS = -MMD -std=c++11 -pipe -Wall \ - -DBUILD_ENV=$(CONFIG) \ - -DBUILD_DATESTAMP='$(APP_DATESTAMP)' \ - -DBUILD_LIBRARY_NAME='"$(LIBRARY_NAME)"' \ - -DBUILD_CLIENT_NAME='"$(CLIENT_TARGET)"' \ - -I$(SRC_PATH) $(CUSTOM_INCLUDE_PATH) - -+ifeq ($(BUILD_SHARED),yes) -+COMMON_FLAGS += -fPIC -+LIBRARY_TARGETS += $(LIBRARY_SHARED) -+endif -+ -+ifeq ($(BUILD_STATIC),yes) -+LIBRARY_TARGETS += $(LIBRARY_ARCHIVE) -+endif -+ - COMMON_LIBS = -lzmq - - LIBRARY_LIBS = -@@ -147,10 +158,11 @@ install: - mkdir -p $(INCLUDEDIR)/$(LIBRARY_DIR) - mkdir -p $(LIBDIR) - install -m 644 $(ALL_LIBRARY_INCLUDES) $(INCLUDEDIR)/$(LIBRARY_DIR) -+ifeq ($(BUILD_SHARED),yes) - install -m 755 $(BUILD_PATH)/$(LIBRARY_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_FULL_VERSION_SHARED) -- install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) -+endif - if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi - $(LDCONFIG) - @echo "use make installcheck to test the install" -@@ -172,7 +184,7 @@ clean: - - client: $(CLIENT_TARGET) - --library: $(LIBRARY_SHARED) $(LIBRARY_ARCHIVE) -+library: $(LIBRARY_TARGETS) - - # - # BUILD Targets -@@ -211,4 +223,3 @@ test: $(TESTS_TARGET) - $(OBJECT_PATH)/%.o: $(SRC_PATH)/%.cpp - -mkdir -p $(dir $@) - $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(COMMON_FLAGS) $(CONFIG_FLAGS) -c -o $@ $< -- --- -2.4.10 - diff --git a/package.bak/zmqpp/0002-Install-static-library-for-static-builds.patch b/package.bak/zmqpp/0002-Install-static-library-for-static-builds.patch deleted file mode 100644 index 402f85e263..0000000000 --- a/package.bak/zmqpp/0002-Install-static-library-for-static-builds.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 283676e2e8f15bedca20c3d94caeecfdebe11ffd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=B6rg=20Krause?= -Date: Mon, 23 Nov 2015 22:53:09 +0100 -Subject: [PATCH 2/2] Install static library for static builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -[Gustavo: update for 4.1.2] - -Signed-off-by: Jörg Krause -Signed-off-by: Gustavo Zacarias ---- - Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/Makefile b/Makefile -index 86c8fac..fbaff63 100644 ---- a/Makefile -+++ b/Makefile -@@ -163,6 +163,9 @@ ifeq ($(BUILD_SHARED),yes) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_VERSION_SHARED) - ln -sf $(LIBRARY_FULL_VERSION_SHARED) $(LIBDIR)/$(LIBRARY_SHARED) - endif -+ifeq ($(BUILD_STATIC),yes) -+ install -m 755 $(BUILD_PATH)/$(LIBRARY_ARCHIVE) $(LIBDIR)/$(LIBRARY_ARCHIVE) -+endif - if [ -f $(BUILD_PATH)/$(CLIENT_TARGET) ]; then install -m 755 $(BUILD_PATH)/$(CLIENT_TARGET) $(BINDIR); fi - $(LDCONFIG) - @echo "use make installcheck to test the install" --- -2.4.10 - diff --git a/package.bak/zmqpp/Config.in b/package.bak/zmqpp/Config.in deleted file mode 100644 index 04a6d24100..0000000000 --- a/package.bak/zmqpp/Config.in +++ /dev/null @@ -1,37 +0,0 @@ -config BR2_PACKAGE_ZMQPP - bool "zmqpp" - # c++1x support - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - select BR2_PACKAGE_ZEROMQ - help - C++ binding for zeromq (ZeroMQ, 0MQ, zmq). - - This C++ binding is a 'high-level' library that hides most of the - C-style interface core zeromq provides. - - http://github.com/benjamg/zmqpp - -comment "zmqpp needs a toolchain w/ C++, threads, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - -if BR2_PACKAGE_ZMQPP - -config BR2_PACKAGE_ZMQPP_CLIENT - bool "zmqpp client" - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_HAS_THREADS # boost - depends on BR2_USE_WCHAR # boost - select BR2_PACKAGE_BOOST - select BR2_PACKAGE_BOOST_PROGRAM_OPTIONS - help - Build and install the zmqpp client, a command line tool that can be - used to listen or send to zeromq sockets. - -comment "zmqpp client needs a toolchain w/ dynamic library, threads, wchar" - depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS \ - || !BR2_USE_WCHAR - -endif diff --git a/package.bak/zmqpp/zmqpp.hash b/package.bak/zmqpp/zmqpp.hash deleted file mode 100644 index 63c6a34f0c..0000000000 --- a/package.bak/zmqpp/zmqpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 831ad02df64034268d910c30f9fb1b1e631ad810182951af9d7d622650831eb5 zmqpp-4.1.2.tar.gz diff --git a/package.bak/zmqpp/zmqpp.mk b/package.bak/zmqpp/zmqpp.mk deleted file mode 100644 index 18da709691..0000000000 --- a/package.bak/zmqpp/zmqpp.mk +++ /dev/null @@ -1,46 +0,0 @@ -################################################################################ -# -# zmqpp -# -################################################################################ - -ZMQPP_VERSION = 4.1.2 -ZMQPP_SITE = $(call github,zeromq,zmqpp,$(ZMQPP_VERSION)) -ZMQPP_INSTALL_STAGING = YES -ZMQPP_DEPENDENCIES = zeromq -ZMQPP_LICENSE = MIT -ZMQPP_LICENSE_FILES = LICENSE -ZMQPP_MAKE_OPTS = LD="$(TARGET_CXX)" BUILD_PATH=./build PREFIX=/usr -ZMQPP_LDFLAGS = $(TARGET_LDFLAGS) -lpthread - -ifeq ($(BR2_PACKAGE_ZMQPP_CLIENT),y) -ZMQPP_DEPENDENCIES += boost -endif - -ifeq ($(BR2_STATIC_LIBS),y) -ZMQPP_MAKE_OPTS += BUILD_STATIC=yes BUILD_SHARED=no -else ifeq ($(BR2_SHARED_STATIC_LIBS),y) -ZMQPP_MAKE_OPTS += BUILD_STATIC=yes BUILD_SHARED=yes -else ifeq ($(BR2_SHARED_LIBS),y) -ZMQPP_MAKE_OPTS += BUILD_STATIC=no BUILD_SHARED=yes -endif - -define ZMQPP_BUILD_CMDS - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - LDFLAGS="$(ZMQPP_LDFLAGS)" \ - $(ZMQPP_MAKE_OPTS) $(if $(BR2_PACKAGE_ZMQPP_CLIENT),client,library) -C $(@D) -endef - -define ZMQPP_INSTALL_TARGET_CMDS - $(INSTALL) -m 0755 -d $(TARGET_DIR)/usr/include/zmqpp - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(ZMQPP_MAKE_OPTS) DESTDIR=$(TARGET_DIR) install -C $(@D) -endef - -define ZMQPP_INSTALL_STAGING_CMDS - $(INSTALL) -m 0755 -d $(STAGING_DIR)/usr/include/zmqpp - $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ - $(ZMQPP_MAKE_OPTS) DESTDIR=$(STAGING_DIR) install -C $(@D) -endef - -$(eval $(generic-package)) diff --git a/package.bak/znc/0001-Add-time.h-includes-where-appropiate.patch b/package.bak/znc/0001-Add-time.h-includes-where-appropiate.patch deleted file mode 100644 index c8ba6d450a..0000000000 --- a/package.bak/znc/0001-Add-time.h-includes-where-appropiate.patch +++ /dev/null @@ -1,194 +0,0 @@ -From 9a51195e916f14a36c2a2a809f2393e5ed2424a3 Mon Sep 17 00:00:00 2001 -From: Gustavo Zacarias -Date: Thu, 6 Aug 2015 11:20:54 -0300 -Subject: [PATCH] Add includes where appropiate - -Signed-off-by: Gustavo Zacarias ---- - modules/adminlog.cpp | 1 + - modules/ctcpflood.cpp | 1 + - modules/flooddetach.cpp | 1 + - modules/lastseen.cpp | 1 + - modules/log.cpp | 1 + - modules/simple_away.cpp | 1 + - src/Buffer.cpp | 1 + - src/FileUtils.cpp | 1 + - src/IRCSock.cpp | 1 + - src/User.cpp | 1 + - src/WebModules.cpp | 1 + - src/ZNCDebug.cpp | 1 + - src/main.cpp | 1 + - src/znc.cpp | 1 + - 14 files changed, 14 insertions(+) - -diff --git a/modules/adminlog.cpp b/modules/adminlog.cpp -index d08369e..1636799 100644 ---- a/modules/adminlog.cpp -+++ b/modules/adminlog.cpp -@@ -20,6 +20,7 @@ - #include - - #include -+#include - - class CAdminLogMod : public CModule { - public: -diff --git a/modules/ctcpflood.cpp b/modules/ctcpflood.cpp -index 7697ef8..c105ef7 100644 ---- a/modules/ctcpflood.cpp -+++ b/modules/ctcpflood.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - class CCtcpFloodMod : public CModule { - public: -diff --git a/modules/flooddetach.cpp b/modules/flooddetach.cpp -index 9c41734..cd88bd2 100644 ---- a/modules/flooddetach.cpp -+++ b/modules/flooddetach.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - using std::map; - -diff --git a/modules/lastseen.cpp b/modules/lastseen.cpp -index 416a111..414310f 100644 ---- a/modules/lastseen.cpp -+++ b/modules/lastseen.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - using std::map; - using std::pair; -diff --git a/modules/log.cpp b/modules/log.cpp -index 2f3124a..e238bb1 100644 ---- a/modules/log.cpp -+++ b/modules/log.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - - using std::vector; -diff --git a/modules/simple_away.cpp b/modules/simple_away.cpp -index 57d6e7a..2f73b0a 100644 ---- a/modules/simple_away.cpp -+++ b/modules/simple_away.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #define SIMPLE_AWAY_DEFAULT_REASON "Auto away at %s" - #define SIMPLE_AWAY_DEFAULT_TIME 60 -diff --git a/src/Buffer.cpp b/src/Buffer.cpp -index 4715f76..dc14642 100644 ---- a/src/Buffer.cpp -+++ b/src/Buffer.cpp -@@ -17,6 +17,7 @@ - #include - #include - #include -+#include - - CBufLine::CBufLine(const CString& sFormat, const CString& sText, const timeval* ts) : m_sFormat(sFormat), m_sText(sText), m_time() { - if (ts == nullptr) -diff --git a/src/FileUtils.cpp b/src/FileUtils.cpp -index d358aa4..92218f3 100644 ---- a/src/FileUtils.cpp -+++ b/src/FileUtils.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - - #ifndef HAVE_LSTAT - # define lstat(a, b) stat(a, b) -diff --git a/src/IRCSock.cpp b/src/IRCSock.cpp -index 738b5bf..c97b8fe 100644 ---- a/src/IRCSock.cpp -+++ b/src/IRCSock.cpp -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - - using std::set; - using std::vector; -diff --git a/src/User.cpp b/src/User.cpp -index f3b5b91..580b52d 100644 ---- a/src/User.cpp -+++ b/src/User.cpp -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - - using std::vector; -diff --git a/src/WebModules.cpp b/src/WebModules.cpp -index 832a2e1..74e56de 100644 ---- a/src/WebModules.cpp -+++ b/src/WebModules.cpp -@@ -19,6 +19,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/src/ZNCDebug.cpp b/src/ZNCDebug.cpp -index 6e36b57..be2f77f 100644 ---- a/src/ZNCDebug.cpp -+++ b/src/ZNCDebug.cpp -@@ -18,6 +18,7 @@ - #include - #include - #include -+#include - - bool CDebug::stdoutIsTTY = true; - bool CDebug::debug = -diff --git a/src/main.cpp b/src/main.cpp -index 465e1a0..cbe72bf 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #if defined(HAVE_LIBSSL) && defined(HAVE_PTHREAD) - #include -diff --git a/src/znc.cpp b/src/znc.cpp -index 624b92c..4c1ffcd 100644 ---- a/src/znc.cpp -+++ b/src/znc.cpp -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - --- -2.4.6 - diff --git a/package.bak/znc/0002-csocket-timeh.patch b/package.bak/znc/0002-csocket-timeh.patch deleted file mode 100644 index cbd435fc82..0000000000 --- a/package.bak/znc/0002-csocket-timeh.patch +++ /dev/null @@ -1,19 +0,0 @@ -Include time.h since time_t is used. - -Status: not upstream, seems to be fixed in newer CSocket versions in a -different way but it hasn't been updated/bundled in znc yet. - -Signed-off-by: Gustavo Zacarias - -diff -Nura znc-1.6.1.orig/src/Csocket.cpp znc-1.6.1.cs/src/Csocket.cpp ---- znc-1.6.1.orig/src/Csocket.cpp 2015-08-06 10:14:45.256246307 -0300 -+++ znc-1.6.1.cs/src/Csocket.cpp 2015-08-06 10:27:25.380446888 -0300 -@@ -54,6 +54,8 @@ - #include - #endif /* HAVE_ICU */ - -+#include -+ - #include - - #define CS_SRANDBUFFER 128 diff --git a/package.bak/znc/Config.in b/package.bak/znc/Config.in deleted file mode 100644 index 154d4b0789..0000000000 --- a/package.bak/znc/Config.in +++ /dev/null @@ -1,15 +0,0 @@ -config BR2_PACKAGE_ZNC - bool "znc" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_USE_MMU # fork() - depends on !BR2_STATIC_LIBS - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - help - Advanced IRC bouncer - - http://www.znc.in - -comment "znc needs a toolchain w/ C++, dynamic library, gcc >= 4.7" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || \ - !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 - depends on BR2_USE_MMU diff --git a/package.bak/znc/znc.hash b/package.bak/znc/znc.hash deleted file mode 100644 index 368235141b..0000000000 --- a/package.bak/znc/znc.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 431097eb17860bfc980f3e68fdd75f98af4bdeecd793c84835c6cb11c3320d1c znc-1.6.4.tar.gz diff --git a/package.bak/znc/znc.mk b/package.bak/znc/znc.mk deleted file mode 100644 index 5b96ee529d..0000000000 --- a/package.bak/znc/znc.mk +++ /dev/null @@ -1,42 +0,0 @@ -################################################################################ -# -# znc -# -################################################################################ - -ZNC_VERSION = 1.6.4 -ZNC_SITE = http://znc.in/releases -ZNC_LICENSE = Apache-2.0 -ZNC_LICENSE_FILES = LICENSE -ZNC_DEPENDENCIES = host-pkgconf -ZNC_CONF_OPTS = --disable-perl - -ifeq ($(BR2_PACKAGE_ICU),y) -ZNC_DEPENDENCIES += icu -ZNC_CONF_OPTS += --enable-charset -else -ZNC_CONF_OPTS += --disable-charset -endif - -ifeq ($(BR2_PACKAGE_OPENSSL),y) -ZNC_DEPENDENCIES += openssl -ZNC_CONF_OPTS += --enable-openssl -else -ZNC_CONF_OPTS += --disable-openssl -endif - -ifeq ($(BR2_PACKAGE_ZLIB),y) -ZNC_DEPENDENCIES += zlib -ZNC_CONF_OPTS += --enable-zlib -else -ZNC_CONF_OPTS += --disable-zlib -endif - -ifeq ($(BR2_PACKAGE_PYTHON3),y) -ZNC_DEPENDENCIES += python3 host-swig -ZNC_CONF_OPTS += --enable-python=python3 -else -ZNC_CONF_OPTS += --disable-python -endif - -$(eval $(autotools-package)) diff --git a/package.bak/zsh/Config.in b/package.bak/zsh/Config.in deleted file mode 100644 index ed8cf678de..0000000000 --- a/package.bak/zsh/Config.in +++ /dev/null @@ -1,12 +0,0 @@ -config BR2_PACKAGE_ZSH - bool "zsh" - depends on BR2_USE_MMU # fork() - depends on BR2_PACKAGE_BUSYBOX_SHOW_OTHERS - select BR2_PACKAGE_NCURSES - help - zsh is a shell designed for interactive use, although it is also - a powerful scripting language. Many of the useful features of bash, - ksh, and tcsh were incorporated into zsh; many original features - were added. - - http://www.zsh.org/ diff --git a/package.bak/zsh/zsh.hash b/package.bak/zsh/zsh.hash deleted file mode 100644 index 0eeebd43f4..0000000000 --- a/package.bak/zsh/zsh.hash +++ /dev/null @@ -1,4 +0,0 @@ -# From http://www.zsh.org/pub/MD5SUM -md5 c5ba34e68fcf62a2e78adc56bf3d328a zsh-5.3.tar.xz -# Calculated based on the hash above -sha256 76f82cfd5ce373cf799a03b6f395283f128430db49202e3e3f512fb5a19d6f8a zsh-5.3.tar.xz diff --git a/package.bak/zsh/zsh.mk b/package.bak/zsh/zsh.mk deleted file mode 100644 index 9d11b9713d..0000000000 --- a/package.bak/zsh/zsh.mk +++ /dev/null @@ -1,43 +0,0 @@ -################################################################################ -# -# zsh -# -################################################################################ - -ZSH_VERSION = 5.3 -ZSH_SITE = http://www.zsh.org/pub -ZSH_SOURCE = zsh-$(ZSH_VERSION).tar.xz -ZSH_DEPENDENCIES = ncurses -ZSH_CONF_OPTS = --bindir=/bin -ZSH_LICENSE = MIT-like -ZSH_LICENSE_FILES = LICENCE - -ifeq ($(BR2_PACKAGE_GDBM),y) -ZSH_CONF_OPTS += --enable-gdbm -ZSH_DEPENDENCIES += gdbm -else -ZSH_CONF_OPTS += --disable-gdbm -endif - -ifeq ($(BR2_PACKAGE_LIBCAP),y) -ZSH_CONF_OPTS += --enable-cap -ZSH_DEPENDENCIES += libcap -else -ZSH_CONF_OPTS += --disable-cap -endif - -ifeq ($(BR2_PACKAGE_PCRE),y) -ZSH_CONF_OPTS += --enable-pcre -ZSH_CONF_ENV += ac_cv_prog_PCRECONF=$(STAGING_DIR)/usr/bin/pcre-config -ZSH_DEPENDENCIES += pcre -else -ZSH_CONF_OPTS += --disable-pcre -endif - -# Remove versioned zsh-x.y.z binary taking up space -define ZSH_TARGET_INSTALL_FIXUPS - rm -f $(TARGET_DIR)/bin/zsh-$(ZSH_VERSION) -endef -ZSH_POST_INSTALL_TARGET_HOOKS += ZSH_TARGET_INSTALL_FIXUPS - -$(eval $(autotools-package)) diff --git a/package.bak/zxing-cpp/Config.in b/package.bak/zxing-cpp/Config.in deleted file mode 100644 index c1109219a0..0000000000 --- a/package.bak/zxing-cpp/Config.in +++ /dev/null @@ -1,14 +0,0 @@ -comment "zxing-cpp needs a toolchain w/ C++, dynamic library" - depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS - -config BR2_PACKAGE_ZXING_CPP - bool "zxing-cpp" - depends on !BR2_STATIC_LIBS - depends on BR2_INSTALL_LIBSTDCPP - help - ZXing-cpp (pronounced "zebra crossing") is an open-source, - multi-format 1D/2D barcode image processing library - implemented in Java, with ports to other languages. This - compiles the C++ port. - - https://github.com/glassechidna/zxing-cpp diff --git a/package.bak/zxing-cpp/zxing-cpp.hash b/package.bak/zxing-cpp/zxing-cpp.hash deleted file mode 100644 index 4625fbf61c..0000000000 --- a/package.bak/zxing-cpp/zxing-cpp.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally calculated -sha256 643c931a35c363109cd38c5a1526505b75f57c0634907cb7b6bc24f6f48eb32b zxing-cpp-0db7f855135222becff193671faae79c083424b6.tar.gz diff --git a/package.bak/zxing-cpp/zxing-cpp.mk b/package.bak/zxing-cpp/zxing-cpp.mk deleted file mode 100644 index 7113ae2b06..0000000000 --- a/package.bak/zxing-cpp/zxing-cpp.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# zxing-cpp -# -################################################################################ - -ZXING_CPP_VERSION = 0db7f855135222becff193671faae79c083424b6 -ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) -ZXING_CPP_LICENSE = Apache-2.0 -ZXING_CPP_LICENSE_FILES = COPYING -ZXING_CPP_INSTALL_STAGING = YES -ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO - -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_CPP_DEPENDENCIES += libiconv -endif - -$(eval $(cmake-package)) diff --git a/package.bak/zynq-boot-bin/zynq-boot-bin.hash b/package.bak/zynq-boot-bin/zynq-boot-bin.hash deleted file mode 100644 index 0bc23de197..0000000000 --- a/package.bak/zynq-boot-bin/zynq-boot-bin.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From https://raw.githubusercontent.com/Xilinx/u-boot-xlnx -sha1 940331ee02b0007099effa61e382fe7ea4174054 zynq-boot-bin.py diff --git a/package.bak/zynq-boot-bin/zynq-boot-bin.mk b/package.bak/zynq-boot-bin/zynq-boot-bin.mk deleted file mode 100644 index 46051fb8a6..0000000000 --- a/package.bak/zynq-boot-bin/zynq-boot-bin.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# zynq-boot-bin -# -################################################################################ - -ZYNQ_BOOT_BIN_VERSION = xilinx-v2015.1 -ZYNQ_BOOT_BIN_SOURCE = zynq-boot-bin.py -ZYNQ_BOOT_BIN_SITE = https://raw.githubusercontent.com/Xilinx/u-boot-xlnx/$(ZYNQ_BOOT_BIN_VERSION)/tools -ZYNQ_BOOT_BIN_LICENSE = GPLv3+ - -HOST_ZYNQ_BOOT_BIN_DEPENDENCIES = host-python - -define HOST_ZYNQ_BOOT_BIN_EXTRACT_CMDS - cp $(DL_DIR)/$(ZYNQ_BOOT_BIN_SOURCE) $(@D) -endef - -define HOST_ZYNQ_BOOT_BIN_INSTALL_CMDS - $(INSTALL) -D -m 0755 $(@D)/$(ZYNQ_BOOT_BIN_SOURCE) $(HOST_DIR)/usr/bin/$(ZYNQ_BOOT_BIN_SOURCE) -endef - -$(eval $(host-generic-package)) diff --git a/package.bak/zyre/Config.in b/package.bak/zyre/Config.in deleted file mode 100644 index 21a0884ec6..0000000000 --- a/package.bak/zyre/Config.in +++ /dev/null @@ -1,16 +0,0 @@ -config BR2_PACKAGE_ZYRE - bool "zyre" - depends on BR2_INSTALL_LIBSTDCPP # zeromq - depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq - depends on BR2_USE_MMU # czmq - select BR2_PACKAGE_CZMQ - select BR2_PACKAGE_ZEROMQ - help - An open-source framework for proximity-based peer-to-peer - applications. - - http://zyre.org - -comment "zyre needs a toolchain w/ C++, threads" - depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package.bak/zyre/zyre.hash b/package.bak/zyre/zyre.hash deleted file mode 100644 index 5b38b8039d..0000000000 --- a/package.bak/zyre/zyre.hash +++ /dev/null @@ -1,2 +0,0 @@ -# Locally computed -sha256 0ce8328a2b9fe46aafc4627fc4ebd4d815f4d9f7d9708088459306c87bf5fb4b zyre-1d949e4bf79b694ea883c325f5813e87ddc2a687.tar.gz diff --git a/package.bak/zyre/zyre.mk b/package.bak/zyre/zyre.mk deleted file mode 100644 index e47da975af..0000000000 --- a/package.bak/zyre/zyre.mk +++ /dev/null @@ -1,22 +0,0 @@ -################################################################################ -# -# zyre -# -################################################################################ - -ZYRE_VERSION = 1d949e4bf79b694ea883c325f5813e87ddc2a687 -ZYRE_SITE = $(call github,zeromq,zyre,$(ZYRE_VERSION)) -ZYRE_LICENSE = MPLv2.0 -ZYRE_LICENSE_FILES = LICENSE -ZYRE_INSTALL_STAGING = YES -ZYRE_DEPENDENCIES = czmq zeromq host-pkgconf -ZYRE_AUTORECONF = YES -ZYRE_CONF_OPTS = --without-docs - -define ZYRE_CREATE_CONFIG_DIR - mkdir -p $(@D)/config -endef - -ZYRE_POST_PATCH_HOOKS += ZYRE_CREATE_CONFIG_DIR - -$(eval $(autotools-package))